# HG changeset patch # User Marcin Kuzminski # Date 1370102624 -7200 # Node ID 8ddf35e02d05fb25941a0a61ce35aa819432f755 # Parent 14afe4d1363dab296756ad0ffed99d03f0a397e6 updated translations and added transifex link diff -r 14afe4d1363d -r 8ddf35e02d05 rhodecode/i18n/en/LC_MESSAGES/rhodecode.mo Binary file rhodecode/i18n/en/LC_MESSAGES/rhodecode.mo has changed diff -r 14afe4d1363d -r 8ddf35e02d05 rhodecode/i18n/en/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/en/LC_MESSAGES/rhodecode.po Sat Jun 01 01:03:31 2013 +0200 +++ b/rhodecode/i18n/en/LC_MESSAGES/rhodecode.po Sat Jun 01 18:03:44 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-04-05 10:19-0700\n" +"POT-Creation-Date: 2013-06-01 18:02+0200\n" "PO-Revision-Date: 2011-02-25 19:13+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: en \n" @@ -17,38 +17,37 @@ "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -#: rhodecode/controllers/changelog.py:95 +#: rhodecode/controllers/changelog.py:149 msgid "All Branches" msgstr "" -#: rhodecode/controllers/changeset.py:83 +#: rhodecode/controllers/changeset.py:84 msgid "Show white space" msgstr "" -#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97 +#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98 msgid "Ignore white space" msgstr "" -#: rhodecode/controllers/changeset.py:163 +#: rhodecode/controllers/changeset.py:164 #, python-format msgid "%s line context" msgstr "" -#: rhodecode/controllers/changeset.py:329 -#: rhodecode/controllers/pullrequests.py:438 +#: rhodecode/controllers/changeset.py:345 +#: rhodecode/controllers/pullrequests.py:481 #, python-format msgid "Status change -> %s" msgstr "" -#: rhodecode/controllers/changeset.py:360 +#: rhodecode/controllers/changeset.py:376 msgid "" "Changing status on a changeset associated with a closed pull request is " "not allowed" msgstr "" #: rhodecode/controllers/compare.py:74 -#: rhodecode/controllers/pullrequests.py:167 -#: rhodecode/controllers/shortlog.py:100 +#: rhodecode/controllers/pullrequests.py:259 msgid "There are no changesets yet" msgstr "" @@ -89,8 +88,8 @@ msgstr "" #: rhodecode/controllers/feed.py:86 -#: rhodecode/templates/changeset/changeset.html:134 -#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/changeset/changeset.html:141 +#: rhodecode/templates/changeset/changeset.html:153 #: rhodecode/templates/compare/compare_diff.html:58 #: rhodecode/templates/compare/compare_diff.html:69 #: rhodecode/templates/pullrequests/pullrequest_show.html:131 @@ -98,115 +97,116 @@ msgid "Changeset was too big and was cut off..." msgstr "" -#: rhodecode/controllers/feed.py:91 +#: rhodecode/controllers/feed.py:90 #, 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 +msgid "Click here to add new file" +msgstr "" + +#: rhodecode/controllers/files.py:90 #, python-format msgid "There are no files yet %s" msgstr "" -#: rhodecode/controllers/files.py:267 rhodecode/controllers/files.py:335 +#: rhodecode/controllers/files.py:271 rhodecode/controllers/files.py:339 #, python-format msgid "This repository is has been locked by %s on %s" msgstr "" -#: rhodecode/controllers/files.py:279 +#: rhodecode/controllers/files.py:283 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: rhodecode/controllers/files.py:293 +#: rhodecode/controllers/files.py:297 #, python-format msgid "Edited file %s via RhodeCode" msgstr "" -#: rhodecode/controllers/files.py:309 +#: rhodecode/controllers/files.py:313 msgid "No changes" msgstr "" -#: rhodecode/controllers/files.py:318 rhodecode/controllers/files.py:388 +#: rhodecode/controllers/files.py:322 rhodecode/controllers/files.py:394 #, python-format msgid "Successfully committed to %s" msgstr "" -#: rhodecode/controllers/files.py:323 rhodecode/controllers/files.py:394 +#: rhodecode/controllers/files.py:327 rhodecode/controllers/files.py:405 msgid "Error occurred during commit" msgstr "" -#: rhodecode/controllers/files.py:347 +#: rhodecode/controllers/files.py:351 msgid "Added file via RhodeCode" msgstr "" -#: rhodecode/controllers/files.py:364 -msgid "No content" -msgstr "" - #: rhodecode/controllers/files.py:368 -msgid "No filename" +msgid "No content" msgstr "" #: rhodecode/controllers/files.py:372 +msgid "No filename" +msgstr "" + +#: rhodecode/controllers/files.py:397 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 +msgid "Downloads disabled" +msgstr "" + +#: rhodecode/controllers/files.py:442 #, python-format msgid "Unknown revision %s" msgstr "" -#: rhodecode/controllers/files.py:433 +#: rhodecode/controllers/files.py:444 msgid "Empty repository" msgstr "" -#: rhodecode/controllers/files.py:435 +#: rhodecode/controllers/files.py:446 msgid "Unknown archive type" msgstr "" -#: rhodecode/controllers/files.py:617 +#: rhodecode/controllers/files.py:631 #: rhodecode/templates/changeset/changeset_range.html:9 +#: rhodecode/templates/email_templates/pull_request.html:12 +#: rhodecode/templates/pullrequests/pullrequest.html:124 msgid "Changesets" msgstr "" -#: rhodecode/controllers/files.py:618 rhodecode/controllers/pullrequests.py:131 -#: rhodecode/controllers/summary.py:247 rhodecode/model/scm.py:606 +#: rhodecode/controllers/files.py:632 rhodecode/controllers/pullrequests.py:152 +#: rhodecode/controllers/summary.py:76 rhodecode/model/scm.py:682 #: rhodecode/templates/switch_to_list.html:3 #: rhodecode/templates/branches/branches.html:10 msgid "Branches" msgstr "" -#: rhodecode/controllers/files.py:619 rhodecode/controllers/pullrequests.py:132 -#: rhodecode/controllers/summary.py:248 rhodecode/model/scm.py:617 +#: rhodecode/controllers/files.py:633 rhodecode/controllers/pullrequests.py:153 +#: rhodecode/controllers/summary.py:77 rhodecode/model/scm.py:693 #: 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:175 +#: rhodecode/controllers/forks.py:176 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: rhodecode/controllers/forks.py:189 +#: rhodecode/controllers/forks.py:190 #, python-format msgid "An error occurred during repository forking %s" msgstr "" -#: rhodecode/controllers/journal.py:275 rhodecode/controllers/journal.py:318 +#: rhodecode/controllers/journal.py:110 rhodecode/controllers/journal.py:153 msgid "public journal" msgstr "" -#: rhodecode/controllers/journal.py:279 rhodecode/controllers/journal.py:322 +#: rhodecode/controllers/journal.py:114 rhodecode/controllers/journal.py:157 #: rhodecode/templates/journal/journal.html:12 msgid "journal" msgstr "" @@ -225,71 +225,71 @@ "email" msgstr "" -#: rhodecode/controllers/pullrequests.py:118 +#: rhodecode/controllers/pullrequests.py:139 #: rhodecode/templates/changeset/changeset.html:10 -#: rhodecode/templates/email_templates/changeset_comment.html:15 +#: rhodecode/templates/email_templates/changeset_comment.html:8 msgid "Changeset" msgstr "" -#: rhodecode/controllers/pullrequests.py:128 +#: rhodecode/controllers/pullrequests.py:149 msgid "Special" msgstr "" -#: rhodecode/controllers/pullrequests.py:129 +#: rhodecode/controllers/pullrequests.py:150 msgid "Peer branches" msgstr "" -#: rhodecode/controllers/pullrequests.py:130 rhodecode/model/scm.py:612 +#: rhodecode/controllers/pullrequests.py:151 rhodecode/model/scm.py:688 #: rhodecode/templates/switch_to_list.html:28 #: rhodecode/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "" -#: rhodecode/controllers/pullrequests.py:228 +#: rhodecode/controllers/pullrequests.py:324 msgid "Pull request requires a title with min. 3 chars" msgstr "" -#: rhodecode/controllers/pullrequests.py:230 +#: rhodecode/controllers/pullrequests.py:326 msgid "Error creating pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:251 +#: rhodecode/controllers/pullrequests.py:346 msgid "Successfully opened new pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:254 +#: rhodecode/controllers/pullrequests.py:349 msgid "Error occurred during sending pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:287 +#: rhodecode/controllers/pullrequests.py:388 msgid "Successfully deleted pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:441 +#: rhodecode/controllers/pullrequests.py:484 msgid "Closing with" msgstr "" -#: rhodecode/controllers/pullrequests.py:478 +#: rhodecode/controllers/pullrequests.py:521 msgid "Closing pull request on other statuses than rejected or approved forbidden" msgstr "" -#: rhodecode/controllers/search.py:134 +#: rhodecode/controllers/search.py:132 msgid "Invalid search query. Try quoting it." msgstr "" -#: rhodecode/controllers/search.py:139 +#: rhodecode/controllers/search.py:137 msgid "There is no index to search in. Please run whoosh indexer" msgstr "" -#: rhodecode/controllers/search.py:143 +#: rhodecode/controllers/search.py:141 msgid "An error occurred during this search operation" msgstr "" -#: rhodecode/controllers/summary.py:141 +#: rhodecode/controllers/summary.py:182 msgid "No data loaded yet" msgstr "" -#: rhodecode/controllers/summary.py:147 +#: rhodecode/controllers/summary.py:188 #: rhodecode/templates/summary/summary.html:149 msgid "Statistics are disabled for this repository" msgstr "" @@ -302,6 +302,43 @@ msgid "Error occurred during update of defaults" msgstr "" +#: rhodecode/controllers/admin/gists.py:56 +msgid "forever" +msgstr "" + +#: rhodecode/controllers/admin/gists.py:57 +#, fuzzy +msgid "5 minutes" +msgstr "" + +#: rhodecode/controllers/admin/gists.py:58 +#, fuzzy +msgid "1 hour" +msgstr "" + +#: rhodecode/controllers/admin/gists.py:59 +#, fuzzy +msgid "1 day" +msgstr "" + +#: rhodecode/controllers/admin/gists.py:60 +#, fuzzy +msgid "1 month" +msgstr "" + +#: rhodecode/controllers/admin/gists.py:62 +msgid "Lifetime" +msgstr "" + +#: rhodecode/controllers/admin/gists.py:127 +msgid "Error occurred during gist creation" +msgstr "" + +#: rhodecode/controllers/admin/gists.py:165 +#, python-format +msgid "Deleted gist %s" +msgstr "" + #: rhodecode/controllers/admin/ldap_settings.py:50 msgid "BASE" msgstr "" @@ -346,35 +383,39 @@ msgid "START_TLS on LDAP connection" msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:126 +#: rhodecode/controllers/admin/ldap_settings.py:124 msgid "LDAP settings updated successfully" msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:130 +#: rhodecode/controllers/admin/ldap_settings.py:128 msgid "Unable to activate ldap. The \"python-ldap\" library is missing." msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:147 +#: rhodecode/controllers/admin/ldap_settings.py:145 msgid "Error occurred during update of ldap settings" msgstr "" +#: rhodecode/controllers/admin/permissions.py:58 +#: rhodecode/controllers/admin/permissions.py:62 +#: rhodecode/controllers/admin/permissions.py:66 +msgid "None" +msgstr "" + +#: rhodecode/controllers/admin/permissions.py:59 +#: rhodecode/controllers/admin/permissions.py:63 +#: rhodecode/controllers/admin/permissions.py:67 +msgid "Read" +msgstr "" + #: rhodecode/controllers/admin/permissions.py:60 #: rhodecode/controllers/admin/permissions.py:64 -msgid "None" +#: rhodecode/controllers/admin/permissions.py:68 +msgid "Write" msgstr "" #: rhodecode/controllers/admin/permissions.py:61 #: rhodecode/controllers/admin/permissions.py:65 -msgid "Read" -msgstr "" - -#: rhodecode/controllers/admin/permissions.py:62 -#: rhodecode/controllers/admin/permissions.py:66 -msgid "Write" -msgstr "" - -#: rhodecode/controllers/admin/permissions.py:63 -#: rhodecode/controllers/admin/permissions.py:67 +#: rhodecode/controllers/admin/permissions.py:69 #: rhodecode/templates/admin/defaults/defaults.html:9 #: rhodecode/templates/admin/ldap/ldap.html:9 #: rhodecode/templates/admin/permissions/permissions.html:9 @@ -395,41 +436,55 @@ #: 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:292 -#: rhodecode/templates/base/base.html:293 -#: rhodecode/templates/base/base.html:299 -#: rhodecode/templates/base/base.html:300 +#: rhodecode/templates/base/base.html:317 +#: rhodecode/templates/base/base.html:318 +#: rhodecode/templates/base/base.html:324 +#: rhodecode/templates/base/base.html:325 msgid "Admin" msgstr "" -#: rhodecode/controllers/admin/permissions.py:70 -#: 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" +#: rhodecode/controllers/admin/permissions.py:83 +#: rhodecode/controllers/admin/permissions.py:86 +#: rhodecode/controllers/admin/permissions.py:89 +#: rhodecode/controllers/admin/permissions.py:92 +msgid "Disabled" msgstr "" #: rhodecode/controllers/admin/permissions.py:74 +msgid "Allowed with manual account activation" +msgstr "" + +#: rhodecode/controllers/admin/permissions.py:76 msgid "Allowed with automatic account activation" msgstr "" -#: rhodecode/controllers/admin/permissions.py:77 +#: rhodecode/controllers/admin/permissions.py:79 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1439 rhodecode/model/db.py:1444 +msgid "Manual activation of external account" +msgstr "" + #: rhodecode/controllers/admin/permissions.py:80 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1440 rhodecode/model/db.py:1445 +msgid "Automatic activation of external account" +msgstr "" + +#: rhodecode/controllers/admin/permissions.py:84 +#: rhodecode/controllers/admin/permissions.py:87 +#: rhodecode/controllers/admin/permissions.py:90 +#: rhodecode/controllers/admin/permissions.py:93 msgid "Enabled" msgstr "" -#: rhodecode/controllers/admin/permissions.py:128 +#: rhodecode/controllers/admin/permissions.py:138 msgid "Default permissions updated successfully" msgstr "" -#: rhodecode/controllers/admin/permissions.py:142 +#: rhodecode/controllers/admin/permissions.py:152 msgid "Error occurred during update of permissions" msgstr "" -#: rhodecode/controllers/admin/repos.py:127 +#: rhodecode/controllers/admin/repos.py:128 msgid "--REMOVE FORK--" msgstr "" @@ -448,230 +503,223 @@ msgid "Error creating repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:266 +#: rhodecode/controllers/admin/repos.py:270 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: rhodecode/controllers/admin/repos.py:284 +#: rhodecode/controllers/admin/repos.py:288 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:311 -#: rhodecode/controllers/api/api.py:877 +#: rhodecode/controllers/admin/repos.py:315 #, python-format msgid "Detached %s forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:314 -#: rhodecode/controllers/api/api.py:879 +#: rhodecode/controllers/admin/repos.py:318 #, python-format msgid "Deleted %s forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:319 +#: rhodecode/controllers/admin/repos.py:323 #, python-format msgid "Deleted repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:322 +#: rhodecode/controllers/admin/repos.py:326 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:327 +#: rhodecode/controllers/admin/repos.py:331 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:365 +#: rhodecode/controllers/admin/repos.py:345 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:403 -msgid "An error occurred during deletion of repository user groups" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:421 +#: rhodecode/controllers/admin/repos.py:375 +#: rhodecode/controllers/admin/repos_groups.py:332 +#: rhodecode/controllers/admin/users_groups.py:312 +msgid "An error occurred during revoking of permission" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:392 msgid "An error occurred during deletion of repository stats" msgstr "" -#: rhodecode/controllers/admin/repos.py:438 +#: rhodecode/controllers/admin/repos.py:409 msgid "An error occurred during cache invalidation" msgstr "" -#: rhodecode/controllers/admin/repos.py:458 -#: rhodecode/controllers/admin/repos.py:485 +#: rhodecode/controllers/admin/repos.py:429 +#: rhodecode/controllers/admin/repos.py:456 msgid "An error occurred during unlocking" msgstr "" +#: rhodecode/controllers/admin/repos.py:447 +msgid "Unlocked" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:450 +msgid "Locked" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:452 +#, python-format +msgid "Repository has been %s" +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:509 +#: rhodecode/controllers/admin/repos.py:480 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:514 rhodecode/model/validators.py:302 +#: rhodecode/controllers/admin/repos.py:485 rhodecode/model/validators.py:302 msgid "Token mismatch" msgstr "" -#: rhodecode/controllers/admin/repos.py:527 +#: rhodecode/controllers/admin/repos.py:498 msgid "Pulled from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:529 +#: rhodecode/controllers/admin/repos.py:501 msgid "An error occurred during pull from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:545 +#: rhodecode/controllers/admin/repos.py:517 msgid "Nothing" msgstr "" -#: rhodecode/controllers/admin/repos.py:547 +#: rhodecode/controllers/admin/repos.py:519 #, python-format msgid "Marked repo %s as fork of %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:551 +#: rhodecode/controllers/admin/repos.py:523 msgid "An error occurred during this operation" msgstr "" -#: rhodecode/controllers/admin/repos.py:590 +#: rhodecode/controllers/admin/repos.py:562 msgid "An error occurred during creation of field" msgstr "" -#: rhodecode/controllers/admin/repos.py:604 +#: rhodecode/controllers/admin/repos.py:576 msgid "An error occurred during removal of field" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:145 +#: rhodecode/controllers/admin/repos_groups.py:147 #, python-format msgid "Created repository group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:157 +#: rhodecode/controllers/admin/repos_groups.py:159 #, python-format 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 +#: rhodecode/controllers/admin/repos_groups.py:217 #, python-format msgid "Updated repository group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:235 +#: rhodecode/controllers/admin/repos_groups.py:232 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:253 +#: rhodecode/controllers/admin/repos_groups.py:250 #, python-format msgid "This group contains %s repositores and cannot be deleted" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:260 +#: rhodecode/controllers/admin/repos_groups.py:257 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:266 +#: rhodecode/controllers/admin/repos_groups.py:263 #, python-format msgid "Removed repository group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:271 +#: rhodecode/controllers/admin/repos_groups.py:268 #, python-format 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:318 -msgid "An error occurred during deletion of group user groups" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:126 +#: rhodecode/controllers/admin/repos_groups.py:279 +#: rhodecode/controllers/admin/repos_groups.py:314 +#: rhodecode/controllers/admin/users_groups.py:300 +msgid "Cannot revoke permission for yourself as admin" +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:294 +msgid "Repository Group permissions updated" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:123 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "" -#: rhodecode/controllers/admin/settings.py:135 +#: rhodecode/controllers/admin/settings.py:132 msgid "Whoosh reindex task scheduled" msgstr "" -#: rhodecode/controllers/admin/settings.py:166 +#: rhodecode/controllers/admin/settings.py:163 msgid "Updated application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:170 -#: rhodecode/controllers/admin/settings.py:301 +#: rhodecode/controllers/admin/settings.py:167 +#: rhodecode/controllers/admin/settings.py:304 msgid "Error occurred during updating application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:216 +#: rhodecode/controllers/admin/settings.py:219 msgid "Updated visualisation settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:221 +#: rhodecode/controllers/admin/settings.py:224 msgid "Error occurred during updating visualisation settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:297 +#: rhodecode/controllers/admin/settings.py:300 msgid "Updated VCS settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:311 +#: rhodecode/controllers/admin/settings.py:314 msgid "Added new hook" msgstr "" -#: rhodecode/controllers/admin/settings.py:323 +#: rhodecode/controllers/admin/settings.py:326 msgid "Updated hooks" msgstr "" -#: rhodecode/controllers/admin/settings.py:327 +#: rhodecode/controllers/admin/settings.py:330 msgid "Error occurred during hook creation" msgstr "" -#: rhodecode/controllers/admin/settings.py:346 +#: rhodecode/controllers/admin/settings.py:349 msgid "Email task created" msgstr "" -#: rhodecode/controllers/admin/settings.py:410 +#: rhodecode/controllers/admin/settings.py:413 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/controllers/admin/settings.py:452 +#: rhodecode/controllers/admin/settings.py:455 msgid "Your account was updated successfully" msgstr "" -#: rhodecode/controllers/admin/settings.py:467 +#: rhodecode/controllers/admin/settings.py:470 #: rhodecode/controllers/admin/users.py:198 #, python-format msgid "Error occurred during update of user %s" @@ -699,111 +747,92 @@ msgid "An error occurred during deletion of user" msgstr "" -#: rhodecode/controllers/admin/users.py:233 +#: rhodecode/controllers/admin/users.py:234 msgid "You can't edit this user" msgstr "" -#: rhodecode/controllers/admin/users.py:276 -msgid "Granted 'repository create' permission to user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:281 -msgid "Revoked 'repository create' permission to user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:287 -msgid "Granted 'repository fork' permission to user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:292 -msgid "Revoked 'repository fork' permission to user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:298 -#: rhodecode/controllers/admin/users_groups.py:281 +#: rhodecode/controllers/admin/users.py:293 +#: rhodecode/controllers/admin/users_groups.py:372 +msgid "Updated permissions" +msgstr "" + +#: rhodecode/controllers/admin/users.py:297 +#: rhodecode/controllers/admin/users_groups.py:376 msgid "An error occurred during permissions saving" msgstr "" -#: rhodecode/controllers/admin/users.py:312 +#: rhodecode/controllers/admin/users.py:311 #, python-format msgid "Added email %s to user" msgstr "" -#: rhodecode/controllers/admin/users.py:318 +#: rhodecode/controllers/admin/users.py:317 msgid "An error occurred during email saving" msgstr "" -#: rhodecode/controllers/admin/users.py:328 +#: rhodecode/controllers/admin/users.py:327 msgid "Removed email from user" msgstr "" -#: rhodecode/controllers/admin/users.py:341 +#: rhodecode/controllers/admin/users.py:340 #, python-format msgid "Added ip %s to user" msgstr "" -#: rhodecode/controllers/admin/users.py:347 +#: rhodecode/controllers/admin/users.py:346 msgid "An error occurred during ip saving" msgstr "" -#: rhodecode/controllers/admin/users.py:359 +#: rhodecode/controllers/admin/users.py:358 msgid "Removed ip from user" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:86 +#: rhodecode/controllers/admin/users_groups.py:162 #, python-format msgid "Created user group %s" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:97 +#: rhodecode/controllers/admin/users_groups.py:173 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:166 -#, python-format -msgid "Updated user group %s" -msgstr "" - -#: rhodecode/controllers/admin/users_groups.py:188 -#, python-format -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 +#, python-format +msgid "Updated user group %s" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:232 +#, python-format +msgid "Error occurred during update of user group %s" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:250 +msgid "Successfully deleted user group" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:255 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 +#: rhodecode/controllers/admin/users_groups.py:274 +msgid "Target group cannot be the same" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:280 +msgid "User Group permissions updated" +msgstr "" + +#: rhodecode/lib/auth.py:544 #, python-format msgid "IP %s not allowed" msgstr "" -#: rhodecode/lib/auth.py:579 +#: rhodecode/lib/auth.py:593 msgid "You need to be a registered user to perform this action" msgstr "" -#: rhodecode/lib/auth.py:620 +#: rhodecode/lib/auth.py:634 msgid "You need to be a signed in to view this page" msgstr "" @@ -819,152 +848,176 @@ msgid "No changes detected" msgstr "" -#: rhodecode/lib/helpers.py:394 +#: rhodecode/lib/helpers.py:428 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "" -#: rhodecode/lib/helpers.py:506 +#: rhodecode/lib/helpers.py:539 msgid "True" msgstr "" -#: rhodecode/lib/helpers.py:509 +#: rhodecode/lib/helpers.py:542 msgid "False" msgstr "" -#: rhodecode/lib/helpers.py:547 +#: rhodecode/lib/helpers.py:580 #, python-format msgid "Deleted branch: %s" msgstr "" -#: rhodecode/lib/helpers.py:550 +#: rhodecode/lib/helpers.py:583 #, python-format msgid "Created tag: %s" msgstr "" -#: rhodecode/lib/helpers.py:563 +#: rhodecode/lib/helpers.py:596 msgid "Changeset not found" msgstr "" -#: rhodecode/lib/helpers.py:615 +#: rhodecode/lib/helpers.py:646 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: rhodecode/lib/helpers.py:621 +#: rhodecode/lib/helpers.py:652 msgid "compare view" msgstr "" -#: rhodecode/lib/helpers.py:641 +#: rhodecode/lib/helpers.py:672 msgid "and" msgstr "" -#: rhodecode/lib/helpers.py:642 +#: rhodecode/lib/helpers.py:673 #, python-format msgid "%s more" msgstr "" -#: rhodecode/lib/helpers.py:643 rhodecode/templates/changelog/changelog.html:44 +#: rhodecode/lib/helpers.py:674 rhodecode/templates/changelog/changelog.html:53 msgid "revisions" msgstr "" -#: rhodecode/lib/helpers.py:667 +#: rhodecode/lib/helpers.py:698 #, python-format msgid "fork name %s" msgstr "" -#: rhodecode/lib/helpers.py:684 +#: rhodecode/lib/helpers.py:715 #: rhodecode/templates/pullrequests/pullrequest_show.html:8 #, python-format msgid "Pull request #%s" msgstr "" -#: rhodecode/lib/helpers.py:690 +#: rhodecode/lib/helpers.py:725 msgid "[deleted] repository" msgstr "" -#: rhodecode/lib/helpers.py:692 rhodecode/lib/helpers.py:702 +#: rhodecode/lib/helpers.py:727 rhodecode/lib/helpers.py:739 msgid "[created] repository" msgstr "" -#: rhodecode/lib/helpers.py:694 +#: rhodecode/lib/helpers.py:729 msgid "[created] repository as fork" msgstr "" -#: rhodecode/lib/helpers.py:696 rhodecode/lib/helpers.py:704 +#: rhodecode/lib/helpers.py:731 rhodecode/lib/helpers.py:741 msgid "[forked] repository" msgstr "" -#: rhodecode/lib/helpers.py:698 rhodecode/lib/helpers.py:706 +#: rhodecode/lib/helpers.py:733 rhodecode/lib/helpers.py:743 msgid "[updated] repository" msgstr "" -#: rhodecode/lib/helpers.py:700 +#: rhodecode/lib/helpers.py:735 +msgid "[downloaded] archive from repository" +msgstr "" + +#: rhodecode/lib/helpers.py:737 msgid "[delete] repository" msgstr "" -#: rhodecode/lib/helpers.py:708 +#: rhodecode/lib/helpers.py:745 msgid "[created] user" msgstr "" -#: rhodecode/lib/helpers.py:710 +#: rhodecode/lib/helpers.py:747 msgid "[updated] user" msgstr "" -#: rhodecode/lib/helpers.py:712 +#: rhodecode/lib/helpers.py:749 msgid "[created] user group" msgstr "" -#: rhodecode/lib/helpers.py:714 +#: rhodecode/lib/helpers.py:751 msgid "[updated] user group" msgstr "" -#: rhodecode/lib/helpers.py:716 +#: rhodecode/lib/helpers.py:753 msgid "[commented] on revision in repository" msgstr "" -#: rhodecode/lib/helpers.py:718 +#: rhodecode/lib/helpers.py:755 msgid "[commented] on pull request for" msgstr "" -#: rhodecode/lib/helpers.py:720 +#: rhodecode/lib/helpers.py:757 msgid "[closed] pull request for" msgstr "" -#: rhodecode/lib/helpers.py:722 +#: rhodecode/lib/helpers.py:759 msgid "[pushed] into" msgstr "" -#: rhodecode/lib/helpers.py:724 +#: rhodecode/lib/helpers.py:761 msgid "[committed via RhodeCode] into repository" msgstr "" -#: rhodecode/lib/helpers.py:726 +#: rhodecode/lib/helpers.py:763 msgid "[pulled from remote] into repository" msgstr "" -#: rhodecode/lib/helpers.py:728 +#: rhodecode/lib/helpers.py:765 msgid "[pulled] from" msgstr "" -#: rhodecode/lib/helpers.py:730 +#: rhodecode/lib/helpers.py:767 msgid "[started following] repository" msgstr "" -#: rhodecode/lib/helpers.py:732 +#: rhodecode/lib/helpers.py:769 msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/helpers.py:910 +#: rhodecode/lib/helpers.py:1088 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:914 +#: rhodecode/lib/helpers.py:1092 msgid "No Files" msgstr "" -#: rhodecode/lib/helpers.py:1198 +#: rhodecode/lib/helpers.py:1158 +msgid "new file" +msgstr "" + +#: rhodecode/lib/helpers.py:1161 +msgid "mod" +msgstr "" + +#: rhodecode/lib/helpers.py:1164 +msgid "del" +msgstr "" + +#: rhodecode/lib/helpers.py:1167 +msgid "rename" +msgstr "" + +#: rhodecode/lib/helpers.py:1172 +msgid "chmod" +msgstr "" + +#: rhodecode/lib/helpers.py:1404 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -976,221 +1029,299 @@ msgid "cannot create new union repository" msgstr "" -#: rhodecode/lib/utils2.py:411 +#: rhodecode/lib/utils2.py:410 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:412 +#: rhodecode/lib/utils2.py:411 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" +#: rhodecode/lib/utils2.py:412 +#, python-format +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "" +msgstr[1] "" + #: rhodecode/lib/utils2.py:413 #, python-format -msgid "%d day" -msgid_plural "%d days" +msgid "%d hour" +msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" #: rhodecode/lib/utils2.py:414 #, python-format -msgid "%d hour" -msgid_plural "%d hours" +msgid "%d minute" +msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" #: rhodecode/lib/utils2.py:415 #, python-format -msgid "%d minute" -msgid_plural "%d minutes" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/lib/utils2.py:416 -#, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:432 +#: rhodecode/lib/utils2.py:431 #, python-format msgid "in %s" msgstr "" -#: rhodecode/lib/utils2.py:434 +#: rhodecode/lib/utils2.py:433 #, python-format msgid "%s ago" msgstr "" -#: rhodecode/lib/utils2.py:436 +#: rhodecode/lib/utils2.py:435 #, python-format msgid "in %s and %s" msgstr "" -#: rhodecode/lib/utils2.py:439 +#: rhodecode/lib/utils2.py:438 #, python-format msgid "%s and %s ago" msgstr "" -#: rhodecode/lib/utils2.py:442 +#: rhodecode/lib/utils2.py:441 msgid "just now" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 #: 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 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1303 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1388 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1408 rhodecode/model/db.py:1413 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/lib/dbmigrate/schema/db_1_5_2.py:1290 rhodecode/model/db.py:1389 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1389 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1409 rhodecode/model/db.py:1414 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/lib/dbmigrate/schema/db_1_5_2.py:1291 rhodecode/model/db.py:1390 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1390 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1410 rhodecode/model/db.py:1415 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/lib/dbmigrate/schema/db_1_5_2.py:1292 rhodecode/model/db.py:1391 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1306 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1391 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1411 rhodecode/model/db.py:1416 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/lib/dbmigrate/schema/db_1_5_2.py:1294 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1308 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/lib/dbmigrate/schema/db_1_5_2.py:1295 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1309 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/lib/dbmigrate/schema/db_1_5_2.py:1296 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1310 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/lib/dbmigrate/schema/db_1_5_2.py:1297 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1311 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/lib/dbmigrate/schema/db_1_5_2.py:1299 rhodecode/model/db.py:1398 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1313 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1398 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1406 rhodecode/model/db.py:1411 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/lib/dbmigrate/schema/db_1_5_2.py:1300 rhodecode/model/db.py:1399 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1314 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1399 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1429 rhodecode/model/db.py:1434 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/lib/dbmigrate/schema/db_1_5_2.py:1301 rhodecode/model/db.py:1400 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1315 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1400 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1430 rhodecode/model/db.py:1435 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/lib/dbmigrate/schema/db_1_5_2.py:1302 rhodecode/model/db.py:1401 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1316 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1401 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1432 rhodecode/model/db.py:1437 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/lib/dbmigrate/schema/db_1_5_2.py:1303 rhodecode/model/db.py:1402 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1317 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1402 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1433 rhodecode/model/db.py:1438 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/lib/dbmigrate/schema/db_1_5_2.py:1304 rhodecode/model/db.py:1403 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1318 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.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/lib/dbmigrate/schema/db_1_5_2.py:1305 rhodecode/model/db.py:1404 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1319 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.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/lib/dbmigrate/schema/db_1_5_2.py:1308 rhodecode/model/db.py:1407 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1322 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.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/lib/dbmigrate/schema/db_1_5_2.py:1749 rhodecode/model/db.py:1838 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1763 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1838 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1934 rhodecode/model/db.py:1939 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/lib/dbmigrate/schema/db_1_5_2.py:1750 rhodecode/model/db.py:1839 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1764 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1839 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1935 rhodecode/model/db.py:1940 msgid "Approved" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 #: 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 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1765 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1840 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1936 rhodecode/model/db.py:1941 msgid "Rejected" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 #: 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 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1766 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1841 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1937 rhodecode/model/db.py:1942 msgid "Under Review" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1252 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1270 rhodecode/model/db.py:1275 +msgid "top level" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1393 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1413 rhodecode/model/db.py:1418 +msgid "Repository group no access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1394 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1414 rhodecode/model/db.py:1419 +msgid "Repository group read access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1395 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1415 rhodecode/model/db.py:1420 +msgid "Repository group write access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1396 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1416 rhodecode/model/db.py:1421 +msgid "Repository group admin access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1418 rhodecode/model/db.py:1423 +msgid "User group no access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1419 rhodecode/model/db.py:1424 +msgid "User group read access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1420 rhodecode/model/db.py:1425 +msgid "User group write access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1421 rhodecode/model/db.py:1426 +msgid "User group admin access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1423 rhodecode/model/db.py:1428 +msgid "Repository Group creation disabled" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1424 rhodecode/model/db.py:1429 +msgid "Repository Group creation enabled" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1426 rhodecode/model/db.py:1431 +msgid "User Group creation disabled" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1427 rhodecode/model/db.py:1432 +msgid "User Group creation enabled" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1435 rhodecode/model/db.py:1440 +msgid "Registration disabled" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1436 rhodecode/model/db.py:1441 +msgid "User Registration with manual account activation" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1437 rhodecode/model/db.py:1442 +msgid "User Registration with automatic account activation" +msgstr "" + #: rhodecode/model/comment.py:75 #, python-format msgid "on line %s" msgstr "" -#: rhodecode/model/comment.py:219 +#: rhodecode/model/comment.py:220 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 "" @@ -1209,42 +1340,42 @@ msgid "Enter %(min)i characters or more" msgstr "" -#: rhodecode/model/notification.py:224 +#: rhodecode/model/notification.py:228 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "" -#: rhodecode/model/notification.py:225 -#, python-format -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 opened new pull request at %(when)s" -msgstr "" - #: rhodecode/model/notification.py:229 #, python-format +msgid "%(user)s sent message at %(when)s" +msgstr "" + +#: rhodecode/model/notification.py:230 +#, python-format +msgid "%(user)s mentioned you at %(when)s" +msgstr "" + +#: rhodecode/model/notification.py:231 +#, python-format +msgid "%(user)s registered in RhodeCode at %(when)s" +msgstr "" + +#: rhodecode/model/notification.py:232 +#, python-format +msgid "%(user)s opened new pull request at %(when)s" +msgstr "" + +#: rhodecode/model/notification.py:233 +#, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "" -#: rhodecode/model/pull_request.py:104 +#: rhodecode/model/pull_request.py:98 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" msgstr "" -#: rhodecode/model/scm.py:598 +#: rhodecode/model/scm.py:674 msgid "latest tip" msgstr "" @@ -1297,7 +1428,7 @@ #: rhodecode/model/validators.py:89 msgid "" "Username may only contain alphanumeric characters underscores, periods or" -" dashes and must begin with alphanumeric character" +" dashes and must begin with alphanumeric character or underscore" msgstr "" #: rhodecode/model/validators.py:117 @@ -1398,47 +1529,51 @@ msgid "You don't have permissions to create a group in this location" msgstr "" -#: rhodecode/model/validators.py:557 +#: rhodecode/model/validators.py:559 msgid "This username or user group name is not valid" msgstr "" -#: rhodecode/model/validators.py:650 +#: rhodecode/model/validators.py:652 msgid "This is not a valid path" msgstr "" -#: rhodecode/model/validators.py:665 +#: rhodecode/model/validators.py:667 msgid "This e-mail address is already taken" msgstr "" -#: rhodecode/model/validators.py:685 +#: rhodecode/model/validators.py:687 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "" -#: rhodecode/model/validators.py:722 +#: rhodecode/model/validators.py:724 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:735 +#: rhodecode/model/validators.py:737 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" -#: rhodecode/model/validators.py:767 +#: rhodecode/model/validators.py:769 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "" -#: rhodecode/model/validators.py:768 +#: rhodecode/model/validators.py:770 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: rhodecode/model/validators.py:800 +#: rhodecode/model/validators.py:803 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" +#: rhodecode/model/validators.py:817 +msgid "Filename cannot be inside a directory" +msgstr "" + #: rhodecode/templates/index.html:5 msgid "Dashboard" msgstr "" @@ -1484,29 +1619,28 @@ msgstr "" #: 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 +#: rhodecode/templates/admin/users_groups/users_groups.html:37 msgid "Group name" msgstr "" #: 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:270 +#: rhodecode/templates/index_base.html:123 #: rhodecode/templates/admin/repos/repo_add_base.html:56 -#: rhodecode/templates/admin/repos/repo_edit.html:75 +#: rhodecode/templates/admin/repos/repo_edit.html:68 #: rhodecode/templates/admin/repos/repos.html:73 #: 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/email_templates/changeset_comment.html:9 +#: rhodecode/templates/email_templates/pull_request.html:9 #: rhodecode/templates/forks/fork.html:56 -#: rhodecode/templates/pullrequests/pullrequest.html:101 +#: rhodecode/templates/pullrequests/pullrequest.html:43 +#: rhodecode/templates/pullrequests/pullrequest_show.html:81 #: rhodecode/templates/summary/summary.html:106 msgid "Description" msgstr "" @@ -1514,27 +1648,25 @@ #: 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/repo_edit.html:50 #: 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/index_base.html:121 #: 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_my_account.html:172 -#: rhodecode/templates/base/perms_summary.html:14 -#: rhodecode/templates/bookmarks/bookmarks.html:34 +#: rhodecode/templates/base/perms_summary.html:37 +#: rhodecode/templates/bookmarks/bookmarks.html:48 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 #: 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:193 -#: rhodecode/templates/journal/journal.html:296 +#: rhodecode/templates/journal/journal.html:283 #: rhodecode/templates/summary/summary.html:55 #: rhodecode/templates/summary/summary.html:124 #: rhodecode/templates/tags/tags.html:48 @@ -1542,109 +1674,78 @@ msgid "Name" 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/index_base.html:124 +msgid "Last Change" +msgstr "" + +#: rhodecode/templates/index_base.html:126 #: 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 +#: rhodecode/templates/journal/journal.html:285 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/index_base.html:128 +#: rhodecode/templates/admin/repos/repo_edit.html:114 #: 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:209 -#: rhodecode/templates/index_base.html:296 -#: rhodecode/templates/admin/repos/repos.html:97 -#: rhodecode/templates/admin/users/user_edit_my_account.html:196 +#: rhodecode/templates/index_base.html:136 +#: rhodecode/templates/admin/repos/repos.html:84 +#: rhodecode/templates/admin/users/user_edit_my_account.html:183 #: rhodecode/templates/admin/users/users.html:107 -#: rhodecode/templates/bookmarks/bookmarks.html:58 +#: rhodecode/templates/bookmarks/bookmarks.html:74 #: rhodecode/templates/branches/branches.html:73 -#: rhodecode/templates/journal/journal.html:217 -#: rhodecode/templates/journal/journal.html:320 +#: rhodecode/templates/journal/journal.html:204 +#: rhodecode/templates/journal/journal.html:294 #: rhodecode/templates/tags/tags.html:74 msgid "Click to sort ascending" msgstr "" -#: 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:197 +#: rhodecode/templates/index_base.html:137 +#: rhodecode/templates/admin/repos/repos.html:85 +#: rhodecode/templates/admin/users/user_edit_my_account.html:184 #: rhodecode/templates/admin/users/users.html:108 -#: rhodecode/templates/bookmarks/bookmarks.html:59 +#: rhodecode/templates/bookmarks/bookmarks.html:75 #: rhodecode/templates/branches/branches.html:74 -#: rhodecode/templates/journal/journal.html:218 -#: rhodecode/templates/journal/journal.html:321 +#: rhodecode/templates/journal/journal.html:205 +#: rhodecode/templates/journal/journal.html:295 #: rhodecode/templates/tags/tags.html:75 msgid "Click to sort descending" msgstr "" -#: rhodecode/templates/index_base.html:181 -#: 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/index_base.html:138 +msgid "No repositories found." +msgstr "" + +#: rhodecode/templates/index_base.html:139 +#: rhodecode/templates/admin/repos/repos.html:87 +#: rhodecode/templates/admin/users/user_edit_my_account.html:186 #: rhodecode/templates/admin/users/users.html:110 -#: rhodecode/templates/bookmarks/bookmarks.html:61 +#: rhodecode/templates/bookmarks/bookmarks.html:77 #: rhodecode/templates/branches/branches.html:76 -#: rhodecode/templates/journal/journal.html:220 -#: rhodecode/templates/journal/journal.html:323 +#: rhodecode/templates/journal/journal.html:207 +#: rhodecode/templates/journal/journal.html:297 #: rhodecode/templates/tags/tags.html:77 msgid "Data error." msgstr "" -#: rhodecode/templates/index_base.html:213 -#: rhodecode/templates/index_base.html:300 -#: rhodecode/templates/admin/repos/repos.html:101 +#: rhodecode/templates/index_base.html:140 +#: rhodecode/templates/admin/repos/repos.html:88 #: rhodecode/templates/admin/users/user_edit_my_account.html:58 -#: rhodecode/templates/admin/users/user_edit_my_account.html:200 +#: rhodecode/templates/admin/users/user_edit_my_account.html:187 #: rhodecode/templates/admin/users/users.html:111 -#: rhodecode/templates/bookmarks/bookmarks.html:62 +#: rhodecode/templates/bookmarks/bookmarks.html:78 #: rhodecode/templates/branches/branches.html:77 -#: rhodecode/templates/journal/journal.html:221 -#: rhodecode/templates/journal/journal.html:324 +#: rhodecode/templates/journal/journal.html:208 +#: rhodecode/templates/journal/journal.html:298 #: rhodecode/templates/tags/tags.html:78 msgid "Loading..." msgstr "" -#: rhodecode/templates/index_base.html:298 -msgid "No repositories found." -msgstr "" - -#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:227 +#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:239 msgid "Log In" msgstr "" @@ -1659,7 +1760,7 @@ #: 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/base/base.html:215 #: rhodecode/templates/summary/summary.html:123 msgid "Username" msgstr "" @@ -1667,7 +1768,7 @@ #: 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:212 +#: rhodecode/templates/base/base.html:224 msgid "Password" msgstr "" @@ -1683,7 +1784,7 @@ msgid "Forgot your password ?" msgstr "" -#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:223 +#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:235 msgid "Don't have an account ?" msgstr "" @@ -1752,7 +1853,7 @@ #: 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/admin/repos/repo_edit.html:78 #: rhodecode/templates/data_table/_dt_elements.html:61 #: rhodecode/templates/summary/summary.html:77 msgid "Private repository" @@ -1775,13 +1876,13 @@ msgstr "" #: rhodecode/templates/switch_to_list.html:35 -#: rhodecode/templates/bookmarks/bookmarks_data.html:32 +#: rhodecode/templates/bookmarks/bookmarks_data.html:37 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 +#: rhodecode/templates/base/base.html:73 msgid "Admin journal" msgstr "" @@ -1807,9 +1908,9 @@ #: 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/admin/users_groups/users_groups.html:40 #: rhodecode/templates/journal/journal.html:197 -#: rhodecode/templates/journal/journal.html:300 +#: rhodecode/templates/journal/journal.html:287 msgid "Action" msgstr "" @@ -1819,7 +1920,7 @@ msgstr "" #: rhodecode/templates/admin/admin_log.html:8 -#: rhodecode/templates/bookmarks/bookmarks.html:35 +#: rhodecode/templates/bookmarks/bookmarks.html:49 #: rhodecode/templates/bookmarks/bookmarks_data.html:7 #: rhodecode/templates/branches/branches.html:48 #: rhodecode/templates/branches/branches_data.html:7 @@ -1842,19 +1943,18 @@ msgstr "" #: rhodecode/templates/admin/defaults/defaults.html:11 -#: rhodecode/templates/base/base.html:75 +#: rhodecode/templates/base/base.html:80 msgid "Defaults" msgstr "" #: rhodecode/templates/admin/defaults/defaults.html:35 #: rhodecode/templates/admin/repos/repo_add_base.html:38 -#: rhodecode/templates/admin/repos/repo_edit.html:58 msgid "Type" msgstr "" #: rhodecode/templates/admin/defaults/defaults.html:48 #: rhodecode/templates/admin/repos/repo_add_base.html:69 -#: rhodecode/templates/admin/repos/repo_edit.html:89 +#: rhodecode/templates/admin/repos/repo_edit.html:82 #: rhodecode/templates/forks/fork.html:69 msgid "" "Private repositories are only visible to people explicitly added as " @@ -1862,60 +1962,185 @@ msgstr "" #: rhodecode/templates/admin/defaults/defaults.html:55 -#: rhodecode/templates/admin/repos/repo_edit.html:94 +#: rhodecode/templates/admin/repos/repo_edit.html:87 msgid "Enable statistics" msgstr "" #: rhodecode/templates/admin/defaults/defaults.html:59 -#: rhodecode/templates/admin/repos/repo_edit.html:98 +#: rhodecode/templates/admin/repos/repo_edit.html:91 msgid "Enable statistics window on summary page." msgstr "" #: rhodecode/templates/admin/defaults/defaults.html:65 -#: rhodecode/templates/admin/repos/repo_edit.html:103 +#: rhodecode/templates/admin/repos/repo_edit.html:96 msgid "Enable downloads" msgstr "" #: rhodecode/templates/admin/defaults/defaults.html:69 -#: rhodecode/templates/admin/repos/repo_edit.html:107 +#: rhodecode/templates/admin/repos/repo_edit.html:100 msgid "Enable download menu on summary page." msgstr "" #: rhodecode/templates/admin/defaults/defaults.html:75 -#: rhodecode/templates/admin/repos/repo_edit.html:112 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72 +#: rhodecode/templates/admin/repos/repo_edit.html:105 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:64 msgid "Enable locking" msgstr "" #: rhodecode/templates/admin/defaults/defaults.html:79 -#: rhodecode/templates/admin/repos/repo_edit.html:116 +#: rhodecode/templates/admin/repos/repo_edit.html:109 msgid "Enable lock-by-pulling on repository." msgstr "" #: rhodecode/templates/admin/defaults/defaults.html:84 #: rhodecode/templates/admin/ldap/ldap.html:89 -#: rhodecode/templates/admin/permissions/permissions.html:92 -#: 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/permissions/permissions.html:122 +#: rhodecode/templates/admin/repos/repo_edit.html:141 +#: rhodecode/templates/admin/repos/repo_edit.html:166 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:96 #: rhodecode/templates/admin/settings/hooks.html:73 #: 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/admin/users_groups/users_group_edit.html:143 +#: rhodecode/templates/base/default_perms_box.html:53 msgid "Save" msgstr "" +#: rhodecode/templates/admin/gists/index.html:5 +#: rhodecode/templates/base/base.html:299 +msgid "Gists" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:10 +#, python-format +msgid "Private Gists for user %s" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:12 +#, python-format +msgid "Public Gists for user %s" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:14 +msgid "Public Gists" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:31 +#: rhodecode/templates/admin/gists/show.html:24 +#: rhodecode/templates/base/base.html:302 +msgid "Create new gist" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:48 +msgid "Created" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:51 +#: rhodecode/templates/admin/gists/index.html:53 +#: rhodecode/templates/admin/gists/show.html:43 +#: rhodecode/templates/admin/gists/show.html:45 +msgid "Expires" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:51 +#: rhodecode/templates/admin/gists/show.html:43 +msgid "never" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:68 +msgid "There are no gists yet" +msgstr "" + +#: rhodecode/templates/admin/gists/new.html:5 +#: rhodecode/templates/admin/gists/new.html:16 +msgid "New gist" +msgstr "" + +#: rhodecode/templates/admin/gists/new.html:37 +msgid "Gist description ..." +msgstr "" + +#: rhodecode/templates/admin/gists/new.html:52 +msgid "Create private gist" +msgstr "" + +#: rhodecode/templates/admin/gists/new.html:53 +msgid "Create public gist" +msgstr "" + +#: rhodecode/templates/admin/gists/new.html:54 +#: rhodecode/templates/admin/permissions/permissions.html:123 +#: rhodecode/templates/admin/permissions/permissions.html:185 +#: rhodecode/templates/admin/repos/repo_edit.html:142 +#: rhodecode/templates/admin/repos/repo_edit.html:167 +#: rhodecode/templates/admin/repos/repo_edit.html:381 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:73 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:97 +#: rhodecode/templates/admin/settings/settings.html:115 +#: rhodecode/templates/admin/settings/settings.html:196 +#: rhodecode/templates/admin/settings/settings.html:288 +#: rhodecode/templates/admin/users/user_edit.html:141 +#: rhodecode/templates/admin/users/user_edit.html:198 +#: rhodecode/templates/admin/users/user_edit.html:246 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:89 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:144 +#: rhodecode/templates/base/default_perms_box.html:54 +#: rhodecode/templates/files/files_add.html:80 +#: rhodecode/templates/files/files_edit.html:66 +#: rhodecode/templates/pullrequests/pullrequest.html:86 +msgid "Reset" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:5 +msgid "gist" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:9 +msgid "Gist" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:36 +msgid "Public gist" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:38 +msgid "Private gist" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:54 +#: rhodecode/templates/admin/repos/repo_edit.html:299 +#: rhodecode/templates/changeset/changeset_file_comment.html:40 +msgid "Delete" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:54 +#, fuzzy +msgid "Confirm to delete this gist" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:63 +#: rhodecode/templates/admin/gists/show.html:84 +#: 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/admin/gists/show.html:71 +msgid "created" +msgstr "" + #: rhodecode/templates/admin/ldap/ldap.html:5 msgid "LDAP administration" msgstr "" #: rhodecode/templates/admin/ldap/ldap.html:11 #: rhodecode/templates/admin/users/users.html:86 -#: rhodecode/templates/base/base.html:74 +#: rhodecode/templates/base/base.html:79 msgid "LDAP" msgstr "" @@ -2016,7 +2241,7 @@ msgstr "" #: rhodecode/templates/admin/notifications/show_notification.html:9 -#: rhodecode/templates/base/base.html:241 +#: rhodecode/templates/base/base.html:253 msgid "Notifications" msgstr "" @@ -2025,12 +2250,14 @@ msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:11 +#: rhodecode/templates/admin/repos/repo_edit.html:151 #: 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/repos_groups/repos_groups_edit.html:81 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:88 #: rhodecode/templates/admin/users/user_edit.html:150 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:100 -#: rhodecode/templates/base/base.html:73 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:129 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:136 +#: rhodecode/templates/base/base.html:78 msgid "Permissions" msgstr "" @@ -2051,6 +2278,7 @@ #: rhodecode/templates/admin/permissions/permissions.html:50 #: rhodecode/templates/admin/permissions/permissions.html:63 +#: rhodecode/templates/admin/permissions/permissions.html:77 msgid "Overwrite existing settings" msgstr "" @@ -2062,86 +2290,85 @@ msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:69 -msgid "Registration" -msgstr "" - -#: rhodecode/templates/admin/permissions/permissions.html:77 +msgid "User group" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.html:76 +msgid "" +"All default permissions on each user 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:83 msgid "Repository creation" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:85 +#: rhodecode/templates/admin/permissions/permissions.html:91 +msgid "User group creation" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.html:99 msgid "Repository forking" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:93 -#: 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:80 -#: rhodecode/templates/files/files_edit.html:66 -#: rhodecode/templates/pullrequests/pullrequest.html:110 -msgid "Reset" -msgstr "" - -#: rhodecode/templates/admin/permissions/permissions.html:103 +#: rhodecode/templates/admin/permissions/permissions.html:107 +msgid "Registration" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.html:115 +msgid "External auth account activation" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.html:133 msgid "Default User Permissions" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:113 -#: rhodecode/templates/admin/users/user_edit.html:244 +#: rhodecode/templates/admin/permissions/permissions.html:144 +#: rhodecode/templates/admin/users/user_edit.html:207 msgid "Allowed IP addresses" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:127 -#: rhodecode/templates/admin/repos/repo_edit.html:347 +#: rhodecode/templates/admin/permissions/permissions.html:158 +#: rhodecode/templates/admin/repos/repo_edit.html:340 #: 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/admin/users/user_edit.html:175 +#: rhodecode/templates/admin/users/user_edit.html:220 +#: rhodecode/templates/admin/users_groups/users_groups.html:54 #: rhodecode/templates/data_table/_dt_elements.html:122 -#: rhodecode/templates/data_table/_dt_elements.html:130 +#: rhodecode/templates/data_table/_dt_elements.html:136 msgid "delete" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:128 -#: rhodecode/templates/admin/users/user_edit.html:258 +#: rhodecode/templates/admin/permissions/permissions.html:159 +#: rhodecode/templates/admin/users/user_edit.html:221 #, fuzzy, python-format msgid "Confirm to delete this ip: %s" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:134 -#: rhodecode/templates/admin/users/user_edit.html:264 +#: rhodecode/templates/admin/permissions/permissions.html:165 +#: rhodecode/templates/admin/users/user_edit.html:227 msgid "All IP addresses are allowed" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:145 -#: rhodecode/templates/admin/users/user_edit.html:275 +#: rhodecode/templates/admin/permissions/permissions.html:176 +#: rhodecode/templates/admin/users/user_edit.html:238 msgid "New ip address" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:153 +#: rhodecode/templates/admin/permissions/permissions.html:184 #: 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 +#: rhodecode/templates/admin/repos/repo_edit.html:380 +#: rhodecode/templates/admin/users/user_edit.html:197 +#: rhodecode/templates/admin/users/user_edit.html:245 msgid "Add" msgstr "" #: 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 +#: rhodecode/templates/base/base.html:74 rhodecode/templates/base/base.html:88 +#: rhodecode/templates/base/base.html:116 +#: rhodecode/templates/base/base.html:275 msgid "Repositories" msgstr "" @@ -2156,7 +2383,7 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:24 -#: rhodecode/templates/admin/repos/repo_edit.html:44 +#: rhodecode/templates/admin/repos/repo_edit.html:45 msgid "Optional http[s] url from which repository should be cloned." msgstr "" @@ -2170,19 +2397,19 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:47 -#: rhodecode/templates/admin/repos/repo_edit.html:66 +#: rhodecode/templates/admin/repos/repo_edit.html:59 #: 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/admin/repos/repo_edit.html:63 #: 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/admin/repos/repo_edit.html:72 #: rhodecode/templates/forks/fork.html:60 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" @@ -2194,245 +2421,249 @@ #: 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/base/base.html:81 rhodecode/templates/base/base.html:134 #: rhodecode/templates/summary/summary.html:212 msgid "Settings" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:40 +#: rhodecode/templates/admin/repos/repo_edit.html:36 +msgid "Non-changeable id" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:41 msgid "Clone uri" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:53 +#: rhodecode/templates/admin/repos/repo_edit.html:54 msgid "Optional select a group to put this repository into." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:126 +#: rhodecode/templates/admin/repos/repo_edit.html:119 msgid "Change owner of this repository." msgstr "" +#: rhodecode/templates/admin/repos/repo_edit.html:177 +msgid "Advanced settings" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:180 +msgid "Statistics" +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit.html:184 -msgid "Advanced settings" +msgid "Reset current statistics" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:184 +msgid "Confirm to remove current statistics" msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:187 -msgid "Statistics" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:191 -msgid "Reset current statistics" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:191 -msgid "Confirm to remove current statistics" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:194 msgid "Fetched to rev" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:195 +#: rhodecode/templates/admin/repos/repo_edit.html:188 msgid "Stats gathered" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:203 +#: rhodecode/templates/admin/repos/repo_edit.html:196 msgid "Remote" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:207 +#: rhodecode/templates/admin/repos/repo_edit.html:200 msgid "Pull changes from remote location" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:207 +#: rhodecode/templates/admin/repos/repo_edit.html:200 msgid "Confirm to pull changes from remote side" msgstr "" +#: rhodecode/templates/admin/repos/repo_edit.html:211 +msgid "Cache" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:215 +msgid "Invalidate repository cache" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:215 +msgid "Confirm to invalidate repository cache" +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit.html:218 -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 +#: rhodecode/templates/admin/repos/repo_edit.html:223 msgid "List of cached values" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:233 +#: rhodecode/templates/admin/repos/repo_edit.html:226 msgid "Prefix" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:234 +#: rhodecode/templates/admin/repos/repo_edit.html:227 msgid "Key" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:235 +#: rhodecode/templates/admin/repos/repo_edit.html:228 #: 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 +#: rhodecode/templates/admin/users_groups/users_groups.html:39 msgid "Active" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:250 -#: rhodecode/templates/base/base.html:280 -#: rhodecode/templates/base/base.html:281 +#: rhodecode/templates/admin/repos/repo_edit.html:243 +#: rhodecode/templates/base/base.html:292 +#: rhodecode/templates/base/base.html:293 msgid "Public journal" msgstr "" +#: rhodecode/templates/admin/repos/repo_edit.html:249 +msgid "Remove from public journal" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:251 +msgid "Add to public journal" +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit.html:256 -msgid "Remove from public journal" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:258 -msgid "Add to public journal" -msgstr "" - -#: 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:270 +#: rhodecode/templates/admin/repos/repo_edit.html:263 msgid "Locking" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:275 +#: rhodecode/templates/admin/repos/repo_edit.html:268 msgid "Unlock locked repo" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:275 +#: rhodecode/templates/admin/repos/repo_edit.html:268 msgid "Confirm to unlock repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:278 -msgid "lock repo" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:278 +#: rhodecode/templates/admin/repos/repo_edit.html:271 +msgid "Lock repo" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:271 msgid "Confirm to lock repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:279 +#: rhodecode/templates/admin/repos/repo_edit.html:272 msgid "Repository is not locked" msgstr "" +#: rhodecode/templates/admin/repos/repo_edit.html:277 +msgid "Force locking on repository. Works only when anonymous access is disabled" +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 +#: rhodecode/templates/admin/repos/repo_edit.html:289 +msgid "Set" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:293 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 +#: rhodecode/templates/admin/repos/repo_edit.html:308 msgid "Remove this repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:315 +#: rhodecode/templates/admin/repos/repo_edit.html:308 msgid "Confirm to delete this repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:317 +#: rhodecode/templates/admin/repos/repo_edit.html:310 #, 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 +#: rhodecode/templates/admin/repos/repo_edit.html:311 msgid "Detach forks" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:319 +#: rhodecode/templates/admin/repos/repo_edit.html:312 msgid "Delete forks" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:322 +#: rhodecode/templates/admin/repos/repo_edit.html:315 msgid "" "This repository will be renamed in a special way in order to be " "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 +#: rhodecode/templates/admin/repos/repo_edit.html:329 msgid "Extra fields" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:348 +#: rhodecode/templates/admin/repos/repo_edit.html:341 #, fuzzy, python-format msgid "Confirm to delete this field: %s" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:362 +#: rhodecode/templates/admin/repos/repo_edit.html:355 msgid "New field key" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:370 +#: rhodecode/templates/admin/repos/repo_edit.html:363 msgid "New field label" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:373 +#: rhodecode/templates/admin/repos/repo_edit.html:366 msgid "Enter short label" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:379 +#: rhodecode/templates/admin/repos/repo_edit.html:372 msgid "New field description" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:382 +#: rhodecode/templates/admin/repos/repo_edit.html:375 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 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:3 msgid "none" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:4 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:4 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:4 msgid "read" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:5 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:5 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:5 msgid "write" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:6 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:6 msgid "admin" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:7 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:7 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:7 msgid "member" msgstr "" @@ -2444,6 +2675,8 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:28 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:20 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:35 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:20 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:35 msgid "default" msgstr "" @@ -2451,33 +2684,37 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:58 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:25 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:55 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:25 +#: rhodecode/templates/admin/users_groups/user_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:80 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:81 msgid "Add another member" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:97 -#: 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: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:86 -msgid "apply to children" +#: rhodecode/templates/admin/repos/repos.html:86 +#: rhodecode/templates/admin/users/user_edit_my_account.html:185 +#: rhodecode/templates/admin/users/users.html:109 +#: rhodecode/templates/bookmarks/bookmarks.html:76 +#: rhodecode/templates/branches/branches.html:75 +#: rhodecode/templates/journal/journal.html:206 +#: rhodecode/templates/journal/journal.html:296 +#: rhodecode/templates/tags/tags.html:76 +msgid "No records found." msgstr "" #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 +msgid "apply to children" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:88 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups" @@ -2503,7 +2740,7 @@ #: 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 +#: rhodecode/templates/base/base.html:75 rhodecode/templates/base/base.html:91 msgid "Repository groups" msgstr "" @@ -2533,7 +2770,7 @@ msgid "Add child group" msgstr "" -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:76 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:68 msgid "" "Enable lock-by-pulling on group. This option will be applied to all other" " groups and repositories inside" @@ -2548,15 +2785,21 @@ msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:64 +#: rhodecode/templates/admin/users_groups/users_groups.html:48 +#: rhodecode/templates/changeset/changeset_file_comment.html:73 +#: rhodecode/templates/changeset/changeset_file_comment.html:171 msgid "Edit" msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:65 +#: rhodecode/templates/admin/users_groups/users_groups.html:49 #: rhodecode/templates/base/perms_summary.html:29 -#: rhodecode/templates/base/perms_summary.html:48 -#: rhodecode/templates/base/perms_summary.html:50 +#: rhodecode/templates/base/perms_summary.html:60 +#: rhodecode/templates/base/perms_summary.html:62 #: rhodecode/templates/data_table/_dt_elements.html:116 #: rhodecode/templates/data_table/_dt_elements.html:117 +#: rhodecode/templates/data_table/_dt_elements.html:130 +#: rhodecode/templates/data_table/_dt_elements.html:131 msgid "edit" msgstr "" @@ -2654,8 +2897,8 @@ msgstr "" #: rhodecode/templates/admin/settings/settings.html:114 -#: rhodecode/templates/admin/settings/settings.html:186 -#: rhodecode/templates/admin/settings/settings.html:277 +#: rhodecode/templates/admin/settings/settings.html:195 +#: rhodecode/templates/admin/settings/settings.html:287 msgid "Save settings" msgstr "" @@ -2668,133 +2911,154 @@ msgstr "" #: rhodecode/templates/admin/settings/settings.html:134 -msgid "Use lightweight dashboard" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:140 msgid "Use repository extra fields" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:147 +#: rhodecode/templates/admin/settings/settings.html:136 +msgid "Allows storing additional customized fields per repository." +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:139 +msgid "Show RhodeCode version" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:141 +msgid "Shows or hides displayed version of RhodeCode in the footer" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:146 +msgid "Dashboard items" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:150 +msgid "" +"Number of items displayed in lightweight dashboard before pagination is " +"shown." +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:155 msgid "Icons" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:152 +#: rhodecode/templates/admin/settings/settings.html:160 msgid "Show public repo icon on repositories" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:156 +#: rhodecode/templates/admin/settings/settings.html:164 msgid "Show private repo icon on repositories" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:163 +#: rhodecode/templates/admin/settings/settings.html:166 +msgid "Show public/private icons next to repositories names" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:172 msgid "Meta-Tagging" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:168 +#: rhodecode/templates/admin/settings/settings.html:177 msgid "Stylify recognised metatags:" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:195 -msgid "VCS settings" -msgstr "" - #: rhodecode/templates/admin/settings/settings.html:204 +msgid "VCS settings" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:213 msgid "Web" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:209 +#: rhodecode/templates/admin/settings/settings.html:218 msgid "Require SSL for vcs operations" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:211 +#: rhodecode/templates/admin/settings/settings.html:220 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:222 -msgid "Update repository after push (hg update)" -msgstr "" - #: rhodecode/templates/admin/settings/settings.html:226 +msgid "Hooks" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:231 +msgid "Update repository after push (hg update)" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:235 msgid "Show repository size after push" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:230 +#: rhodecode/templates/admin/settings/settings.html:239 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:248 -msgid "Enable largefiles extension" +msgid "Log user pull commands" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:247 +msgid "Advanced setup" msgstr "" #: rhodecode/templates/admin/settings/settings.html:252 +msgid "Mercurial Extensions" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:257 +msgid "Enable largefiles extension" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:261 msgid "Enable hgsubversion extension" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:254 +#: rhodecode/templates/admin/settings/settings.html:263 msgid "" "Requires hgsubversion library installed. Allows cloning from svn remote " "locations" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:264 +#: rhodecode/templates/admin/settings/settings.html:274 msgid "Repositories location" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:269 +#: rhodecode/templates/admin/settings/settings.html:279 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:270 -#: rhodecode/templates/base/base.html:131 +"Click to unlock. You must restart RhodeCode in order to make this setting" +" take effect." +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:280 +#: rhodecode/templates/base/base.html:143 msgid "Unlock" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:272 +#: rhodecode/templates/admin/settings/settings.html:282 msgid "" "Location where repositories are stored. After changing this value a " "restart, and rescan is required" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:292 +#: rhodecode/templates/admin/settings/settings.html:303 msgid "Test Email" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:300 +#: rhodecode/templates/admin/settings/settings.html:311 msgid "Email to" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:308 +#: rhodecode/templates/admin/settings/settings.html:319 msgid "Send" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:314 +#: rhodecode/templates/admin/settings/settings.html:325 msgid "System Info and Packages" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:317 -#: rhodecode/templates/changelog/changelog.html:42 +#: rhodecode/templates/admin/settings/settings.html:328 +#: rhodecode/templates/changelog/changelog.html:51 msgid "Show" msgstr "" @@ -2804,7 +3068,7 @@ #: rhodecode/templates/admin/users/user_add.html:10 #: rhodecode/templates/admin/users/user_edit.html:11 -#: rhodecode/templates/base/base.html:71 +#: rhodecode/templates/base/base.html:76 msgid "Users" msgstr "" @@ -2861,44 +3125,21 @@ msgid "New password confirmation" msgstr "" -#: 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:163 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:113 -#, python-format -msgid "" -"Select to inherit permissions from %s settings. With this selected below " -"options does not have any action" -msgstr "" - -#: 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:177 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:127 -msgid "Fork repositories" -msgstr "" - -#: rhodecode/templates/admin/users/user_edit.html:200 msgid "Email addresses" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:213 +#: rhodecode/templates/admin/users/user_edit.html:176 #, python-format msgid "Confirm to delete this email: %s" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:227 +#: rhodecode/templates/admin/users/user_edit.html:190 msgid "New email address" msgstr "" #: rhodecode/templates/admin/users/user_edit_my_account.html:5 -#: rhodecode/templates/base/base.html:242 +#: rhodecode/templates/base/base.html:254 msgid "My account" msgstr "" @@ -2935,7 +3176,7 @@ #: 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_data.html:11 #: rhodecode/templates/pullrequests/pullrequest_show.html:27 #: rhodecode/templates/pullrequests/pullrequest_show.html:42 msgid "Closed" @@ -2955,7 +3196,7 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:42 -#: rhodecode/templates/pullrequests/pullrequest_data.html:11 +#: rhodecode/templates/pullrequests/pullrequest_data.html:8 #, python-format msgid "Pull request #%s opened by %s on %s" msgstr "" @@ -2986,12 +3227,12 @@ #: rhodecode/templates/admin/users_groups/users_group_add.html:10 #: rhodecode/templates/admin/users_groups/users_groups.html:11 -#: rhodecode/templates/base/base.html:72 +#: rhodecode/templates/base/base.html:77 rhodecode/templates/base/base.html:94 msgid "User groups" msgstr "" #: rhodecode/templates/admin/users_groups/users_group_add.html:12 -#: rhodecode/templates/admin/users_groups/users_groups.html:25 +#: rhodecode/templates/admin/users_groups/users_groups.html:26 msgid "Add new user group" msgstr "" @@ -3004,7 +3245,7 @@ msgstr "" #: rhodecode/templates/admin/users_groups/users_group_edit.html:50 -#: rhodecode/templates/admin/users_groups/users_groups.html:35 +#: rhodecode/templates/admin/users_groups/users_groups.html:38 msgid "Members" msgstr "" @@ -3024,45 +3265,53 @@ msgid "Add all elements" msgstr "" -#: rhodecode/templates/admin/users_groups/users_group_edit.html:150 -msgid "Group members" -msgstr "" - -#: rhodecode/templates/admin/users_groups/users_group_edit.html:167 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:109 msgid "No members yet" msgstr "" +#: rhodecode/templates/admin/users_groups/users_group_edit.html:117 +msgid "Global Permissions" +msgstr "" + #: rhodecode/templates/admin/users_groups/users_groups.html:5 msgid "User groups administration" msgstr "" -#: rhodecode/templates/admin/users_groups/users_groups.html:47 +#: rhodecode/templates/admin/users_groups/users_groups.html:55 #, fuzzy, python-format msgid "Confirm to delete this user group: %s" msgstr "" +#: rhodecode/templates/admin/users_groups/users_groups.html:62 +msgid "There are no user groups yet" +msgstr "" + #: rhodecode/templates/base/base.html:42 -msgid "Submit a bug" -msgstr "" - -#: rhodecode/templates/base/base.html:108 +#, python-format +msgid "Server instance: %s" +msgstr "" + +#: rhodecode/templates/base/base.html:52 +msgid "Report a bug" +msgstr "" + +#: rhodecode/templates/base/base.html:121 #: 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:109 -#: rhodecode/templates/changelog/changelog.html:11 +#: rhodecode/templates/base/base.html:122 +#: rhodecode/templates/changelog/changelog.html:15 #: 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:110 +#: rhodecode/templates/base/base.html:123 #: rhodecode/templates/data_table/_dt_elements.html:25 #: rhodecode/templates/data_table/_dt_elements.html:27 #: rhodecode/templates/data_table/_dt_elements.html:29 @@ -3070,48 +3319,44 @@ msgid "Files" msgstr "" -#: rhodecode/templates/base/base.html:112 +#: rhodecode/templates/base/base.html:125 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: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/base/base.html:279 +msgid "loading..." +msgstr "" + +#: rhodecode/templates/base/base.html:131 +msgid "Options" +msgstr "" + +#: rhodecode/templates/base/base.html:137 +#: rhodecode/templates/forks/forks_data.html:21 +msgid "Compare fork" +msgstr "" + +#: rhodecode/templates/base/base.html:139 +#: rhodecode/templates/base/base.html:312 #: rhodecode/templates/search/search.html:14 #: rhodecode/templates/search/search.html:54 msgid "Search" msgstr "" -#: rhodecode/templates/base/base.html:133 +#: rhodecode/templates/base/base.html:145 msgid "Lock" msgstr "" -#: rhodecode/templates/base/base.html:141 +#: rhodecode/templates/base/base.html:153 msgid "Follow" msgstr "" -#: rhodecode/templates/base/base.html:142 +#: rhodecode/templates/base/base.html:154 msgid "Unfollow" msgstr "" -#: rhodecode/templates/base/base.html:145 +#: rhodecode/templates/base/base.html:157 #: rhodecode/templates/data_table/_dt_elements.html:33 #: rhodecode/templates/data_table/_dt_elements.html:35 #: rhodecode/templates/data_table/_dt_elements.html:37 @@ -3120,60 +3365,113 @@ msgid "Fork" msgstr "" -#: rhodecode/templates/base/base.html:147 +#: rhodecode/templates/base/base.html:159 msgid "Create Pull Request" msgstr "" -#: rhodecode/templates/base/base.html:153 +#: rhodecode/templates/base/base.html:165 msgid "Show Pull Requests" msgstr "" -#: rhodecode/templates/base/base.html:153 +#: rhodecode/templates/base/base.html:165 msgid "Pull Requests" msgstr "" -#: rhodecode/templates/base/base.html:190 +#: rhodecode/templates/base/base.html:202 msgid "Not logged in" msgstr "" -#: rhodecode/templates/base/base.html:197 +#: rhodecode/templates/base/base.html:209 msgid "Login to your account" msgstr "" -#: rhodecode/templates/base/base.html:220 +#: rhodecode/templates/base/base.html:232 msgid "Forgot password ?" msgstr "" -#: rhodecode/templates/base/base.html:243 +#: rhodecode/templates/base/base.html:255 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" +msgid "Switch repository" msgstr "" #: rhodecode/templates/base/base.html:286 +msgid "Show recent activity" +msgstr "" + +#: rhodecode/templates/base/base.html:287 +#: rhodecode/templates/journal/journal.html:4 +msgid "Journal" +msgstr "" + +#: rhodecode/templates/base/base.html:298 +msgid "Show public gists" +msgstr "" + +#: rhodecode/templates/base/base.html:303 +msgid "All public gists" +msgstr "" + +#: rhodecode/templates/base/base.html:305 +msgid "My public gists" +msgstr "" + +#: rhodecode/templates/base/base.html:306 +msgid "My private gists" +msgstr "" + +#: rhodecode/templates/base/base.html:311 msgid "Search in repositories" msgstr "" -#: rhodecode/templates/base/perms_summary.html:8 +#: rhodecode/templates/base/default_perms_box.html:14 +msgid "Inherit default permissions" +msgstr "" + +#: rhodecode/templates/base/default_perms_box.html:18 +#, python-format +msgid "" +"Select to inherit permissions from %s settings. With this selected below " +"options does not apply." +msgstr "" + +#: rhodecode/templates/base/default_perms_box.html:26 +msgid "Create repositories" +msgstr "" + +#: rhodecode/templates/base/default_perms_box.html:30 +msgid "Select this option to allow repository creation for this user" +msgstr "" + +#: rhodecode/templates/base/default_perms_box.html:35 +msgid "Create user groups" +msgstr "" + +#: rhodecode/templates/base/default_perms_box.html:39 +msgid "Select this option to allow user group creation for this user" +msgstr "" + +#: rhodecode/templates/base/default_perms_box.html:44 +msgid "Fork repositories" +msgstr "" + +#: rhodecode/templates/base/default_perms_box.html:48 +msgid "Select this option to allow repository forking for this user" +msgstr "" + +#: rhodecode/templates/base/perms_summary.html:11 msgid "No permissions defined yet" msgstr "" -#: rhodecode/templates/base/perms_summary.html:15 +#: rhodecode/templates/base/perms_summary.html:19 +#: rhodecode/templates/base/perms_summary.html:38 msgid "Permission" msgstr "" -#: rhodecode/templates/base/perms_summary.html:16 +#: rhodecode/templates/base/perms_summary.html:20 +#: rhodecode/templates/base/perms_summary.html:39 msgid "Edit Permission" msgstr "" @@ -3183,7 +3481,7 @@ msgstr "" #: rhodecode/templates/base/root.html:44 -#: rhodecode/templates/data_table/_dt_elements.html:140 +#: rhodecode/templates/data_table/_dt_elements.html:147 msgid "Stop following this repository" msgstr "" @@ -3200,7 +3498,7 @@ msgstr "" #: rhodecode/templates/base/root.html:48 -#: rhodecode/templates/pullrequests/pullrequest.html:181 +#: rhodecode/templates/pullrequests/pullrequest.html:203 msgid "Loading ..." msgstr "" @@ -3213,7 +3511,7 @@ msgstr "" #: rhodecode/templates/base/root.html:51 -#: rhodecode/templates/changelog/changelog.html:36 +#: rhodecode/templates/changelog/changelog.html:45 msgid "Open new pull request" msgstr "" @@ -3242,31 +3540,48 @@ msgid "Expand diff" msgstr "" +#: rhodecode/templates/base/root.html:58 +msgid "Failed to remoke permission" +msgstr "" + #: rhodecode/templates/bookmarks/bookmarks.html:5 #, python-format msgid "%s Bookmarks" msgstr "" -#: rhodecode/templates/bookmarks/bookmarks.html:37 +#: rhodecode/templates/bookmarks/bookmarks.html:26 +msgid "Compare bookmarks" +msgstr "" + +#: rhodecode/templates/bookmarks/bookmarks.html:51 #: rhodecode/templates/bookmarks/bookmarks_data.html:8 #: rhodecode/templates/branches/branches.html:50 #: rhodecode/templates/branches/branches_data.html:8 -#: rhodecode/templates/shortlog/shortlog_data.html:8 +#: rhodecode/templates/changelog/changelog_summary_data.html:8 #: rhodecode/templates/tags/tags.html:51 #: rhodecode/templates/tags/tags_data.html:8 msgid "Author" msgstr "" -#: rhodecode/templates/bookmarks/bookmarks.html:38 +#: rhodecode/templates/bookmarks/bookmarks.html:52 #: rhodecode/templates/bookmarks/bookmarks_data.html:9 #: rhodecode/templates/branches/branches.html:51 #: rhodecode/templates/branches/branches_data.html:9 -#: rhodecode/templates/shortlog/shortlog_data.html:5 +#: rhodecode/templates/changelog/changelog_summary_data.html:5 #: rhodecode/templates/tags/tags.html:52 #: rhodecode/templates/tags/tags_data.html:9 msgid "Revision" msgstr "" +#: rhodecode/templates/bookmarks/bookmarks.html:54 +#: rhodecode/templates/bookmarks/bookmarks_data.html:10 +#: rhodecode/templates/branches/branches.html:53 +#: rhodecode/templates/branches/branches_data.html:10 +#: rhodecode/templates/tags/tags.html:54 +#: rhodecode/templates/tags/tags_data.html:10 +msgid "Compare" +msgstr "" + #: rhodecode/templates/branches/branches.html:5 #, python-format msgid "%s Branches" @@ -3276,65 +3591,68 @@ msgid "Compare branches" msgstr "" -#: rhodecode/templates/branches/branches.html:53 -#: rhodecode/templates/branches/branches_data.html:10 -#: rhodecode/templates/tags/tags.html:54 -#: rhodecode/templates/tags/tags_data.html:10 -msgid "Compare" -msgstr "" - #: rhodecode/templates/changelog/changelog.html:6 #, python-format msgid "%s Changelog" msgstr "" -#: rhodecode/templates/changelog/changelog.html:11 +#: rhodecode/templates/changelog/changelog.html:19 #, 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:30 +#: rhodecode/templates/changelog/changelog.html:39 msgid "Clear selection" msgstr "" -#: rhodecode/templates/changelog/changelog.html:33 +#: rhodecode/templates/changelog/changelog.html:42 #: rhodecode/templates/forks/forks_data.html:19 #, python-format msgid "Compare fork with %s" msgstr "" -#: rhodecode/templates/changelog/changelog.html:33 +#: rhodecode/templates/changelog/changelog.html:42 msgid "Compare fork with parent" msgstr "" -#: rhodecode/templates/changelog/changelog.html:76 -#: rhodecode/templates/summary/summary.html:404 +#: rhodecode/templates/changelog/changelog.html:78 +#: rhodecode/templates/changelog/changelog_summary_data.html:28 +#, python-format +msgid "Click to open associated pull request #%s" +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:102 +#: rhodecode/templates/summary/summary.html:403 msgid "Show more" msgstr "" -#: rhodecode/templates/changelog/changelog.html:89 +#: rhodecode/templates/changelog/changelog.html:115 +#: rhodecode/templates/changelog/changelog_summary_data.html:50 +#: rhodecode/templates/changeset/changeset.html:107 #: rhodecode/templates/changeset/changeset_range.html:86 #, python-format msgid "Bookmark %s" msgstr "" -#: rhodecode/templates/changelog/changelog.html:95 -#: rhodecode/templates/changeset/changeset.html:111 +#: rhodecode/templates/changelog/changelog.html:121 +#: rhodecode/templates/changelog/changelog_summary_data.html:56 +#: rhodecode/templates/changeset/changeset.html:113 #: 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:80 +#: rhodecode/templates/changelog/changelog.html:126 +#: rhodecode/templates/changelog/changelog_summary_data.html:61 +#: rhodecode/templates/changeset/changeset.html:117 +#: rhodecode/templates/changeset/changeset_range.html:96 #, python-format msgid "Branch %s" msgstr "" -#: rhodecode/templates/changelog/changelog.html:258 +#: rhodecode/templates/changelog/changelog.html:286 msgid "There are no changes yet" msgstr "" @@ -3364,6 +3682,38 @@ msgid "Affected %s files" msgstr "" +#: rhodecode/templates/changelog/changelog_summary_data.html:6 +#: rhodecode/templates/files/files_add.html:75 +#: rhodecode/templates/files/files_edit.html:61 +msgid "Commit message" +msgstr "" + +#: rhodecode/templates/changelog/changelog_summary_data.html:7 +msgid "Age" +msgstr "" + +#: rhodecode/templates/changelog/changelog_summary_data.html:9 +msgid "Refs" +msgstr "" + +#: rhodecode/templates/changelog/changelog_summary_data.html:86 +msgid "Add or upload files directly via RhodeCode" +msgstr "" + +#: rhodecode/templates/changelog/changelog_summary_data.html:89 +#: rhodecode/templates/files/files_add.html:38 +#: rhodecode/templates/files/files_browser.html:31 +msgid "Add new file" +msgstr "" + +#: rhodecode/templates/changelog/changelog_summary_data.html:95 +msgid "Push new repo" +msgstr "" + +#: rhodecode/templates/changelog/changelog_summary_data.html:103 +msgid "Existing repository?" +msgstr "" + #: rhodecode/templates/changeset/changeset.html:6 #, python-format msgid "%s Changeset" @@ -3384,7 +3734,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset.html:67 -#: rhodecode/templates/changeset/diff_block.html:23 +#: rhodecode/templates/changeset/diff_block.html:22 msgid "Raw diff" msgstr "" @@ -3393,12 +3743,12 @@ msgstr "" #: rhodecode/templates/changeset/changeset.html:69 -#: rhodecode/templates/changeset/diff_block.html:24 +#: rhodecode/templates/changeset/diff_block.html:23 msgid "Download diff" msgstr "" #: rhodecode/templates/changeset/changeset.html:73 -#: rhodecode/templates/changeset/changeset_file_comment.html:97 +#: rhodecode/templates/changeset/changeset_file_comment.html:103 #, python-format msgid "%d comment" msgid_plural "%d comments" @@ -3406,7 +3756,7 @@ msgstr[1] "" #: rhodecode/templates/changeset/changeset.html:73 -#: rhodecode/templates/changeset/changeset_file_comment.html:97 +#: rhodecode/templates/changeset/changeset_file_comment.html:103 #, python-format msgid "(%d inline)" msgid_plural "(%d inline)" @@ -3414,11 +3764,11 @@ msgstr[1] "" #: rhodecode/templates/changeset/changeset.html:103 -#: rhodecode/templates/changeset/changeset_range.html:77 +#: rhodecode/templates/changeset/changeset_range.html:82 msgid "merge" msgstr "" -#: rhodecode/templates/changeset/changeset.html:119 +#: rhodecode/templates/changeset/changeset.html:126 #: rhodecode/templates/compare/compare_diff.html:40 #: rhodecode/templates/pullrequests/pullrequest_show.html:113 #, python-format @@ -3427,7 +3777,7 @@ msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/changeset/changeset.html:121 +#: rhodecode/templates/changeset/changeset.html:128 #: rhodecode/templates/compare/compare_diff.html:42 #: rhodecode/templates/pullrequests/pullrequest_show.html:115 #, python-format @@ -3436,15 +3786,15 @@ msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/changeset/changeset.html:134 -#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/changeset/changeset.html:141 +#: rhodecode/templates/changeset/changeset.html:153 #: 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/changeset/changeset.html:141 +#: rhodecode/templates/changeset/changeset.html:153 #: rhodecode/templates/compare/compare_diff.html:58 #: rhodecode/templates/compare/compare_diff.html:69 #: rhodecode/templates/pullrequests/pullrequest_show.html:131 @@ -3462,51 +3812,64 @@ msgid "Comment on pull request #%s" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:57 +#: rhodecode/templates/changeset/changeset_file_comment.html:55 msgid "Submitting..." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:60 +#: rhodecode/templates/changeset/changeset_file_comment.html:58 msgid "Commenting on line {1}." msgstr "" +#: rhodecode/templates/changeset/changeset_file_comment.html:59 +#: rhodecode/templates/changeset/changeset_file_comment.html:145 +#, python-format +msgid "Comments parsed using %s syntax with %s support." +msgstr "" + #: rhodecode/templates/changeset/changeset_file_comment.html:61 -#: 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:141 +#: rhodecode/templates/changeset/changeset_file_comment.html:147 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:161 +#: rhodecode/templates/changeset/changeset_file_comment.html:65 +#: rhodecode/templates/changeset/changeset_file_comment.html:152 +#, fuzzy +msgid "Preview" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:72 +#: rhodecode/templates/changeset/changeset_file_comment.html:170 +msgid "Comment preview" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:80 +#: rhodecode/templates/changeset/changeset_file_comment.html:177 +#: rhodecode/templates/email_templates/changeset_comment.html:16 +#: rhodecode/templates/email_templates/pull_request_comment.html:16 msgid "Comment" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:75 +#: rhodecode/templates/changeset/changeset_file_comment.html:81 msgid "Cancel" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:82 +#: rhodecode/templates/changeset/changeset_file_comment.html:88 msgid "You need to be logged in to comment." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:82 +#: rhodecode/templates/changeset/changeset_file_comment.html:88 msgid "Login now" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:86 +#: rhodecode/templates/changeset/changeset_file_comment.html:92 msgid "Hide" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:143 +#: rhodecode/templates/changeset/changeset_file_comment.html:149 msgid "Change status" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:163 +#: rhodecode/templates/changeset/changeset_file_comment.html:179 msgid "Comment and close" msgstr "" @@ -3519,19 +3882,19 @@ msgid "Files affected" msgstr "" -#: rhodecode/templates/changeset/diff_block.html:22 +#: rhodecode/templates/changeset/diff_block.html:21 msgid "Show full diff for this file" msgstr "" -#: rhodecode/templates/changeset/diff_block.html:30 +#: rhodecode/templates/changeset/diff_block.html:29 msgid "Show inline comments" msgstr "" -#: rhodecode/templates/changeset/diff_block.html:55 +#: rhodecode/templates/changeset/diff_block.html:53 msgid "Show file at latest version in this repo" msgstr "" -#: rhodecode/templates/changeset/diff_block.html:56 +#: rhodecode/templates/changeset/diff_block.html:54 msgid "Show file at initial version in this repo" msgstr "" @@ -3606,27 +3969,24 @@ msgid "Confirm to delete this repository: %s" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.html:131 +#: rhodecode/templates/data_table/_dt_elements.html:137 #, python-format msgid "Confirm to delete this user: %s" 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" +#: rhodecode/templates/email_templates/changeset_comment.html:4 +#: rhodecode/templates/email_templates/pull_request.html:4 +#: rhodecode/templates/email_templates/pull_request_comment.html:4 +msgid "URL" +msgstr "" + +#: rhodecode/templates/email_templates/changeset_comment.html:6 +#, python-format +msgid "%s commented on a %s changeset." msgstr "" #: rhodecode/templates/email_templates/changeset_comment.html:14 -msgid "Repo" -msgstr "" - -#: rhodecode/templates/email_templates/changeset_comment.html:16 -msgid "desc" +msgid "The changeset status was changed to" msgstr "" #: rhodecode/templates/email_templates/main.html:8 @@ -3646,47 +4006,38 @@ msgid "You can generate it by clicking following URL" msgstr "" -#: 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 -#, python-format -msgid "" -"User %s opened pull request for repository %s and wants you to review " -"changes." -msgstr "" - -#: rhodecode/templates/email_templates/pull_request.html:5 -msgid "View this pull request here" +#: rhodecode/templates/email_templates/password_reset.html:10 +msgid "Please ignore this email if you did not request a new password ." msgstr "" #: rhodecode/templates/email_templates/pull_request.html:6 -msgid "title" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request.html:7 -msgid "description" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request.html:12 -msgid "revisions for reviewing" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.html:3 #, python-format -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 -msgid "A new user have registered in RhodeCode" -msgstr "" - -#: rhodecode/templates/email_templates/registration.html:9 +msgid "" +"%s opened a pull request for repository %s and wants you to review " +"changes." +msgstr "" + +#: rhodecode/templates/email_templates/pull_request.html:8 +#: rhodecode/templates/pullrequests/pullrequest.html:34 +#: rhodecode/templates/pullrequests/pullrequest_data.html:14 +#: rhodecode/templates/pullrequests/pullrequest_show.html:25 +msgid "Title" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.html:6 +#, python-format +msgid "%s commented on pull request \"%s\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.html:10 +msgid "Pull request was closed with status" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.html:12 +msgid "Pull request changed status" +msgstr "" + +#: rhodecode/templates/email_templates/registration.html:6 msgid "View this user here" msgstr "" @@ -3713,7 +4064,6 @@ #: 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 "" @@ -3726,12 +4076,6 @@ 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:43 msgid "File Name" msgstr "" @@ -3760,12 +4104,6 @@ msgid "use / to separate directories" msgstr "" -#: 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:79 #: rhodecode/templates/files/files_edit.html:65 msgid "Commit changes" @@ -3829,12 +4167,6 @@ 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:26 msgid "Download as raw" @@ -4024,36 +4356,47 @@ msgid "New pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:52 -msgid "Detailed compare view" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest.html:56 +#: rhodecode/templates/pullrequests/pullrequest.html:25 +msgid "Create new pull request" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest.html:47 +msgid "Write a short description on this pull request" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest.html:53 +msgid "Changeset flow" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest.html:60 +#: rhodecode/templates/pullrequests/pullrequest_show.html:65 +msgid "Origin repository" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest.html:85 +msgid "Send pull request" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest.html:94 #: rhodecode/templates/pullrequests/pullrequest_show.html:137 msgid "Pull request reviewers" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:65 +#: rhodecode/templates/pullrequests/pullrequest.html:103 #: rhodecode/templates/pullrequests/pullrequest_show.html:149 msgid "owner" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:77 +#: rhodecode/templates/pullrequests/pullrequest.html:115 msgid "Add reviewer to this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:83 -msgid "Create new pull request" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest.html:92 -#: rhodecode/templates/pullrequests/pullrequest_data.html:14 -#: rhodecode/templates/pullrequests/pullrequest_show.html:25 -msgid "Title" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest.html:109 -msgid "Send pull request" +#: rhodecode/templates/pullrequests/pullrequest.html:129 +msgid "Detailed compare view" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest.html:150 +msgid "Destination repository" msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.html:4 @@ -4084,10 +4427,6 @@ 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:89 msgid "Created on" msgstr "" @@ -4150,37 +4489,6 @@ msgid "Permission denied" msgstr "" -#: rhodecode/templates/shortlog/shortlog.html:5 -#, fuzzy, python-format -msgid "%s Lightweight Changelog" -msgstr "" - -#: rhodecode/templates/shortlog/shortlog.html:11 -#: rhodecode/templates/shortlog/shortlog.html:15 -msgid "Lightweight Changelog" -msgstr "" - -#: rhodecode/templates/shortlog/shortlog_data.html:7 -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" -msgstr "" - -#: rhodecode/templates/shortlog/shortlog_data.html:84 -msgid "Push new repo" -msgstr "" - -#: rhodecode/templates/shortlog/shortlog_data.html:92 -msgid "Existing repository?" -msgstr "" - #: rhodecode/templates/summary/summary.html:4 #, python-format msgid "%s Summary" @@ -4219,7 +4527,7 @@ msgid "Fork of" msgstr "" -#: rhodecode/templates/summary/summary.html:96 +#: rhodecode/templates/summary/summary.html:97 msgid "Remote clone" msgstr "" @@ -4245,8 +4553,7 @@ #: rhodecode/templates/summary/summary.html:151 #: rhodecode/templates/summary/summary.html:167 -#: rhodecode/templates/summary/summary.html:232 -msgid "enable" +msgid "Enable" msgstr "" #: rhodecode/templates/summary/summary.html:159 @@ -4261,7 +4568,7 @@ msgid "Downloads are disabled for this repository" msgstr "" -#: rhodecode/templates/summary/summary.html:171 +#: rhodecode/templates/summary/summary.html:170 msgid "Download as zip" msgstr "" @@ -4286,6 +4593,10 @@ msgid "Commit activity by day / author" msgstr "" +#: rhodecode/templates/summary/summary.html:232 +msgid "enable" +msgstr "" + #: rhodecode/templates/summary/summary.html:235 msgid "Stats gathered: " msgstr "" @@ -4300,51 +4611,47 @@ #: rhodecode/templates/summary/summary.html:272 #, python-format -msgid "Readme file at revision '%s'" -msgstr "" - -#: rhodecode/templates/summary/summary.html:275 -msgid "Permalink to this readme" -msgstr "" - -#: rhodecode/templates/summary/summary.html:333 +msgid "Readme file from revision %s" +msgstr "" + +#: rhodecode/templates/summary/summary.html:332 #, python-format msgid "Download %s as %s" msgstr "" -#: rhodecode/templates/summary/summary.html:380 +#: rhodecode/templates/summary/summary.html:379 msgid "files" msgstr "" +#: rhodecode/templates/summary/summary.html:689 +msgid "commits" +msgstr "" + #: rhodecode/templates/summary/summary.html:690 -msgid "commits" +msgid "files added" msgstr "" #: rhodecode/templates/summary/summary.html:691 -msgid "files added" +msgid "files changed" msgstr "" #: rhodecode/templates/summary/summary.html:692 -msgid "files changed" -msgstr "" - -#: rhodecode/templates/summary/summary.html:693 msgid "files removed" msgstr "" +#: rhodecode/templates/summary/summary.html:694 +msgid "commit" +msgstr "" + #: rhodecode/templates/summary/summary.html:695 -msgid "commit" +msgid "file added" msgstr "" #: rhodecode/templates/summary/summary.html:696 -msgid "file added" +msgid "file changed" msgstr "" #: rhodecode/templates/summary/summary.html:697 -msgid "file changed" -msgstr "" - -#: rhodecode/templates/summary/summary.html:698 msgid "file removed" msgstr "" diff -r 14afe4d1363d -r 8ddf35e02d05 rhodecode/i18n/fr/LC_MESSAGES/rhodecode.mo Binary file rhodecode/i18n/fr/LC_MESSAGES/rhodecode.mo has changed diff -r 14afe4d1363d -r 8ddf35e02d05 rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po Sat Jun 01 01:03:31 2013 +0200 +++ b/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po Sat Jun 01 18:03:44 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-04-05 10:19-0700\n" +"POT-Creation-Date: 2013-06-01 18:02+0200\n" "PO-Revision-Date: 2012-10-02 11:32+0100\n" "Last-Translator: Vincent Duvert \n" "Language-Team: fr \n" @@ -17,32 +17,32 @@ "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -#: rhodecode/controllers/changelog.py:95 +#: rhodecode/controllers/changelog.py:149 msgid "All Branches" msgstr "Toutes les branches" -#: rhodecode/controllers/changeset.py:83 +#: rhodecode/controllers/changeset.py:84 #, fuzzy msgid "Show white space" msgstr "Afficher les espaces et tabulations" -#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97 +#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98 #, fuzzy msgid "Ignore white space" msgstr "Ignorer les espaces et tabulations" -#: rhodecode/controllers/changeset.py:163 +#: rhodecode/controllers/changeset.py:164 #, python-format msgid "%s line context" msgstr "Afficher %s lignes de contexte" -#: rhodecode/controllers/changeset.py:329 -#: rhodecode/controllers/pullrequests.py:438 +#: rhodecode/controllers/changeset.py:345 +#: rhodecode/controllers/pullrequests.py:481 #, python-format msgid "Status change -> %s" msgstr "Changement de statut -> %s" -#: rhodecode/controllers/changeset.py:360 +#: rhodecode/controllers/changeset.py:376 #, fuzzy msgid "" "Changing status on a changeset associated with a closed pull request is " @@ -52,8 +52,7 @@ "n’est pas autorisé." #: rhodecode/controllers/compare.py:74 -#: rhodecode/controllers/pullrequests.py:167 -#: rhodecode/controllers/shortlog.py:100 +#: rhodecode/controllers/pullrequests.py:259 msgid "There are no changesets yet" msgstr "Il n’y a aucun changement pour le moment" @@ -98,8 +97,8 @@ msgstr "Flux %s de %s" #: rhodecode/controllers/feed.py:86 -#: rhodecode/templates/changeset/changeset.html:134 -#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/changeset/changeset.html:141 +#: rhodecode/templates/changeset/changeset.html:153 #: rhodecode/templates/compare/compare_diff.html:58 #: rhodecode/templates/compare/compare_diff.html:69 #: rhodecode/templates/pullrequests/pullrequest_show.html:131 @@ -107,118 +106,119 @@ 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:91 +#: rhodecode/controllers/feed.py:90 #, fuzzy, python-format msgid "%s committed on %s" msgstr "%s a commité, le %s" -#: rhodecode/controllers/files.py:88 +#: rhodecode/controllers/files.py:89 #, fuzzy msgid "Click here to add new file" msgstr "Ajouter un nouveau fichier" -#: rhodecode/controllers/files.py:89 +#: rhodecode/controllers/files.py:90 #, python-format msgid "There are no files yet %s" msgstr "Il n’y a pas encore de fichiers %s" -#: rhodecode/controllers/files.py:267 rhodecode/controllers/files.py:335 +#: rhodecode/controllers/files.py:271 rhodecode/controllers/files.py:339 #, 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:279 +#: rhodecode/controllers/files.py:283 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: rhodecode/controllers/files.py:293 +#: rhodecode/controllers/files.py:297 #, fuzzy, python-format msgid "Edited file %s via RhodeCode" msgstr "%s édité via RhodeCode" -#: rhodecode/controllers/files.py:309 +#: rhodecode/controllers/files.py:313 msgid "No changes" msgstr "Aucun changement" -#: rhodecode/controllers/files.py:318 rhodecode/controllers/files.py:388 +#: rhodecode/controllers/files.py:322 rhodecode/controllers/files.py:394 #, python-format msgid "Successfully committed to %s" msgstr "Commit réalisé avec succès sur %s" -#: rhodecode/controllers/files.py:323 rhodecode/controllers/files.py:394 +#: rhodecode/controllers/files.py:327 rhodecode/controllers/files.py:405 msgid "Error occurred during commit" msgstr "Une erreur est survenue durant le commit" -#: rhodecode/controllers/files.py:347 +#: rhodecode/controllers/files.py:351 #, fuzzy msgid "Added file via RhodeCode" msgstr "%s ajouté par RhodeCode" -#: rhodecode/controllers/files.py:364 +#: rhodecode/controllers/files.py:368 msgid "No content" msgstr "Aucun contenu" -#: rhodecode/controllers/files.py:368 +#: rhodecode/controllers/files.py:372 msgid "No filename" msgstr "Aucun nom de fichier" -#: rhodecode/controllers/files.py:372 +#: rhodecode/controllers/files.py:397 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: rhodecode/controllers/files.py:420 +#: rhodecode/controllers/files.py:431 #, fuzzy msgid "Downloads disabled" msgstr "Les téléchargements sont désactivés" -#: rhodecode/controllers/files.py:431 +#: rhodecode/controllers/files.py:442 #, python-format msgid "Unknown revision %s" msgstr "Révision %s inconnue." -#: rhodecode/controllers/files.py:433 +#: rhodecode/controllers/files.py:444 msgid "Empty repository" msgstr "Dépôt vide." -#: rhodecode/controllers/files.py:435 +#: rhodecode/controllers/files.py:446 msgid "Unknown archive type" msgstr "Type d’archive inconnu" -#: rhodecode/controllers/files.py:617 +#: rhodecode/controllers/files.py:631 #: rhodecode/templates/changeset/changeset_range.html:9 +#: rhodecode/templates/email_templates/pull_request.html:12 +#: rhodecode/templates/pullrequests/pullrequest.html:124 msgid "Changesets" msgstr "Changesets" -#: rhodecode/controllers/files.py:618 rhodecode/controllers/pullrequests.py:131 -#: rhodecode/controllers/summary.py:247 rhodecode/model/scm.py:606 +#: rhodecode/controllers/files.py:632 rhodecode/controllers/pullrequests.py:152 +#: rhodecode/controllers/summary.py:76 rhodecode/model/scm.py:682 #: rhodecode/templates/switch_to_list.html:3 #: rhodecode/templates/branches/branches.html:10 msgid "Branches" msgstr "Branches" -#: rhodecode/controllers/files.py:619 rhodecode/controllers/pullrequests.py:132 -#: rhodecode/controllers/summary.py:248 rhodecode/model/scm.py:617 +#: rhodecode/controllers/files.py:633 rhodecode/controllers/pullrequests.py:153 +#: rhodecode/controllers/summary.py:77 rhodecode/model/scm.py:693 #: 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:175 +#: rhodecode/controllers/forks.py:176 #, fuzzy, python-format msgid "Forked repository %s as %s" msgstr "dépôt %s forké en tant que %s" -#: rhodecode/controllers/forks.py:189 +#: rhodecode/controllers/forks.py:190 #, python-format msgid "An error occurred during repository forking %s" msgstr "Une erreur est survenue durant le fork du dépôt %s." -#: rhodecode/controllers/journal.py:275 rhodecode/controllers/journal.py:318 +#: rhodecode/controllers/journal.py:110 rhodecode/controllers/journal.py:153 msgid "public journal" msgstr "Journal public" -#: rhodecode/controllers/journal.py:279 rhodecode/controllers/journal.py:322 +#: rhodecode/controllers/journal.py:114 rhodecode/controllers/journal.py:157 #: rhodecode/templates/journal/journal.html:12 msgid "journal" msgstr "Journal" @@ -240,75 +240,75 @@ "Votre mot de passe a été réinitialisé. Votre nouveau mot de passe vous a " "été envoyé par e-mail." -#: rhodecode/controllers/pullrequests.py:118 +#: rhodecode/controllers/pullrequests.py:139 #: rhodecode/templates/changeset/changeset.html:10 -#: rhodecode/templates/email_templates/changeset_comment.html:15 +#: rhodecode/templates/email_templates/changeset_comment.html:8 msgid "Changeset" msgstr "Changements" -#: rhodecode/controllers/pullrequests.py:128 +#: rhodecode/controllers/pullrequests.py:149 msgid "Special" msgstr "" -#: rhodecode/controllers/pullrequests.py:129 +#: rhodecode/controllers/pullrequests.py:150 #, fuzzy msgid "Peer branches" msgstr "Branches" -#: rhodecode/controllers/pullrequests.py:130 rhodecode/model/scm.py:612 +#: rhodecode/controllers/pullrequests.py:151 rhodecode/model/scm.py:688 #: rhodecode/templates/switch_to_list.html:28 #: rhodecode/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "Signets" -#: rhodecode/controllers/pullrequests.py:228 +#: rhodecode/controllers/pullrequests.py:324 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:230 +#: rhodecode/controllers/pullrequests.py:326 #, 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:251 +#: rhodecode/controllers/pullrequests.py:346 msgid "Successfully opened new pull request" msgstr "La requête de pull a été ouverte avec succès." -#: rhodecode/controllers/pullrequests.py:254 +#: rhodecode/controllers/pullrequests.py:349 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:287 +#: rhodecode/controllers/pullrequests.py:388 msgid "Successfully deleted pull request" msgstr "La requête de pull a été supprimée avec succès." -#: rhodecode/controllers/pullrequests.py:441 +#: rhodecode/controllers/pullrequests.py:484 msgid "Closing with" msgstr "" -#: rhodecode/controllers/pullrequests.py:478 +#: rhodecode/controllers/pullrequests.py:521 msgid "Closing pull request on other statuses than rejected or approved forbidden" msgstr "" -#: rhodecode/controllers/search.py:134 +#: rhodecode/controllers/search.py:132 msgid "Invalid search query. Try quoting it." msgstr "Requête invalide. Essayer de la mettre entre guillemets." -#: rhodecode/controllers/search.py:139 +#: rhodecode/controllers/search.py:137 msgid "There is no index to search in. Please run whoosh indexer" msgstr "" "L’index de recherche n’est pas présent. Veuillez exécuter l’indexeur de " "code Whoosh." -#: rhodecode/controllers/search.py:143 +#: rhodecode/controllers/search.py:141 msgid "An error occurred during this search operation" msgstr "Une erreur est survenue durant l’opération de recherche." -#: rhodecode/controllers/summary.py:141 +#: rhodecode/controllers/summary.py:182 msgid "No data loaded yet" msgstr "Aucune donnée actuellement disponible." -#: rhodecode/controllers/summary.py:147 +#: rhodecode/controllers/summary.py:188 #: 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." @@ -323,6 +323,45 @@ msgid "Error occurred during update of defaults" msgstr "Une erreur est survenue durant la mise à jour de l’utilisateur %s." +#: rhodecode/controllers/admin/gists.py:56 +#, fuzzy +msgid "forever" +msgstr "%d relecteur" + +#: rhodecode/controllers/admin/gists.py:57 +#, fuzzy +msgid "5 minutes" +msgstr "%d minute" + +#: rhodecode/controllers/admin/gists.py:58 +#, fuzzy +msgid "1 hour" +msgstr "%d heure" + +#: rhodecode/controllers/admin/gists.py:59 +#, fuzzy +msgid "1 day" +msgstr "%d jour" + +#: rhodecode/controllers/admin/gists.py:60 +#, fuzzy +msgid "1 month" +msgstr "%d mois" + +#: rhodecode/controllers/admin/gists.py:62 +msgid "Lifetime" +msgstr "" + +#: rhodecode/controllers/admin/gists.py:127 +#, fuzzy +msgid "Error occurred during gist creation" +msgstr "Une erreur est survenue durant la création du hook." + +#: rhodecode/controllers/admin/gists.py:165 +#, fuzzy, python-format +msgid "Deleted gist %s" +msgstr "Dépôt %s supprimé" + #: rhodecode/controllers/admin/ldap_settings.py:50 msgid "BASE" msgstr "Base" @@ -367,36 +406,40 @@ msgid "START_TLS on LDAP connection" msgstr "START_TLS à la connexion" -#: rhodecode/controllers/admin/ldap_settings.py:126 +#: rhodecode/controllers/admin/ldap_settings.py:124 msgid "LDAP settings updated successfully" msgstr "Mise à jour réussie des réglages LDAP" -#: rhodecode/controllers/admin/ldap_settings.py:130 +#: rhodecode/controllers/admin/ldap_settings.py:128 msgid "Unable to activate ldap. The \"python-ldap\" library is missing." msgstr "Impossible d’activer LDAP. La bibliothèque « python-ldap » est manquante." -#: rhodecode/controllers/admin/ldap_settings.py:147 +#: rhodecode/controllers/admin/ldap_settings.py:145 #, 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:58 +#: rhodecode/controllers/admin/permissions.py:62 +#: rhodecode/controllers/admin/permissions.py:66 +msgid "None" +msgstr "Aucun" + +#: rhodecode/controllers/admin/permissions.py:59 +#: rhodecode/controllers/admin/permissions.py:63 +#: rhodecode/controllers/admin/permissions.py:67 +msgid "Read" +msgstr "Lire" + #: rhodecode/controllers/admin/permissions.py:60 #: rhodecode/controllers/admin/permissions.py:64 -msgid "None" -msgstr "Aucun" +#: rhodecode/controllers/admin/permissions.py:68 +msgid "Write" +msgstr "Écrire" #: rhodecode/controllers/admin/permissions.py:61 #: rhodecode/controllers/admin/permissions.py:65 -msgid "Read" -msgstr "Lire" - -#: rhodecode/controllers/admin/permissions.py:62 -#: rhodecode/controllers/admin/permissions.py:66 -msgid "Write" -msgstr "Écrire" - -#: rhodecode/controllers/admin/permissions.py:63 -#: rhodecode/controllers/admin/permissions.py:67 +#: rhodecode/controllers/admin/permissions.py:69 #: rhodecode/templates/admin/defaults/defaults.html:9 #: rhodecode/templates/admin/ldap/ldap.html:9 #: rhodecode/templates/admin/permissions/permissions.html:9 @@ -417,44 +460,58 @@ #: 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:292 -#: rhodecode/templates/base/base.html:293 -#: rhodecode/templates/base/base.html:299 -#: rhodecode/templates/base/base.html:300 +#: rhodecode/templates/base/base.html:317 +#: rhodecode/templates/base/base.html:318 +#: rhodecode/templates/base/base.html:324 +#: rhodecode/templates/base/base.html:325 msgid "Admin" msgstr "Administration" -#: rhodecode/controllers/admin/permissions.py:70 -#: rhodecode/controllers/admin/permissions.py:76 -#: rhodecode/controllers/admin/permissions.py:79 +#: rhodecode/controllers/admin/permissions.py:72 +#: rhodecode/controllers/admin/permissions.py:83 +#: rhodecode/controllers/admin/permissions.py:86 +#: rhodecode/controllers/admin/permissions.py:89 +#: rhodecode/controllers/admin/permissions.py:92 msgid "Disabled" msgstr "Interdite" -#: rhodecode/controllers/admin/permissions.py:72 +#: rhodecode/controllers/admin/permissions.py:74 #, fuzzy msgid "Allowed with manual account activation" msgstr "Autorisé avec activation manuelle du compte" -#: rhodecode/controllers/admin/permissions.py:74 +#: rhodecode/controllers/admin/permissions.py:76 #, 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:79 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1439 rhodecode/model/db.py:1444 +msgid "Manual activation of external account" +msgstr "" + #: rhodecode/controllers/admin/permissions.py:80 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1440 rhodecode/model/db.py:1445 +msgid "Automatic activation of external account" +msgstr "" + +#: rhodecode/controllers/admin/permissions.py:84 +#: rhodecode/controllers/admin/permissions.py:87 +#: rhodecode/controllers/admin/permissions.py:90 +#: rhodecode/controllers/admin/permissions.py:93 msgid "Enabled" msgstr "Autorisée" -#: rhodecode/controllers/admin/permissions.py:128 +#: rhodecode/controllers/admin/permissions.py:138 msgid "Default permissions updated successfully" msgstr "Permissions par défaut mises à jour avec succès" -#: rhodecode/controllers/admin/permissions.py:142 +#: rhodecode/controllers/admin/permissions.py:152 #, fuzzy msgid "Error occurred during update of permissions" msgstr "erreur pendant la mise à jour des permissions" -#: rhodecode/controllers/admin/repos.py:127 +#: rhodecode/controllers/admin/repos.py:128 msgid "--REMOVE FORK--" msgstr "[Pas un fork]" @@ -473,250 +530,237 @@ msgid "Error creating repository %s" msgstr "Le dépôt %s a été créé." -#: rhodecode/controllers/admin/repos.py:266 +#: rhodecode/controllers/admin/repos.py:270 #, python-format msgid "Repository %s updated successfully" msgstr "Dépôt %s mis à jour avec succès." -#: rhodecode/controllers/admin/repos.py:284 +#: rhodecode/controllers/admin/repos.py:288 #, 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 +#: rhodecode/controllers/admin/repos.py:315 #, python-format msgid "Detached %s forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:314 -#: rhodecode/controllers/api/api.py:879 +#: rhodecode/controllers/admin/repos.py:318 #, fuzzy, python-format msgid "Deleted %s forks" msgstr "Dépôt %s supprimé" -#: rhodecode/controllers/admin/repos.py:319 +#: rhodecode/controllers/admin/repos.py:323 #, fuzzy, python-format msgid "Deleted repository %s" msgstr "Dépôt %s supprimé" -#: rhodecode/controllers/admin/repos.py:322 +#: rhodecode/controllers/admin/repos.py:326 #, 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:327 +#: rhodecode/controllers/admin/repos.py:331 #, python-format msgid "An error occurred during deletion of %s" msgstr "Erreur pendant la suppression de %s" -#: rhodecode/controllers/admin/repos.py:365 +#: rhodecode/controllers/admin/repos.py:345 #, 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: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:421 +#: rhodecode/controllers/admin/repos.py:375 +#: rhodecode/controllers/admin/repos_groups.py:332 +#: rhodecode/controllers/admin/users_groups.py:312 +#, fuzzy +msgid "An error occurred during revoking of permission" +msgstr "erreur pendant la mise à jour des permissions" + +#: rhodecode/controllers/admin/repos.py:392 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:438 +#: rhodecode/controllers/admin/repos.py:409 msgid "An error occurred during cache invalidation" msgstr "Une erreur est survenue durant l’invalidation du cache." -#: rhodecode/controllers/admin/repos.py:458 -#: rhodecode/controllers/admin/repos.py:485 +#: rhodecode/controllers/admin/repos.py:429 +#: rhodecode/controllers/admin/repos.py:456 msgid "An error occurred during unlocking" msgstr "Une erreur est survenue durant le déverrouillage." -#: rhodecode/controllers/admin/repos.py:476 +#: rhodecode/controllers/admin/repos.py:447 #, fuzzy msgid "Unlocked" msgstr "déverrouillé" -#: rhodecode/controllers/admin/repos.py:479 +#: rhodecode/controllers/admin/repos.py:450 #, fuzzy msgid "Locked" msgstr "verrouillé" -#: rhodecode/controllers/admin/repos.py:481 +#: rhodecode/controllers/admin/repos.py:452 #, python-format msgid "Repository has been %s" msgstr "Le dépôt a été %s." -#: rhodecode/controllers/admin/repos.py:505 +#: rhodecode/controllers/admin/repos.py:476 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:509 +#: rhodecode/controllers/admin/repos.py:480 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:514 rhodecode/model/validators.py:302 +#: rhodecode/controllers/admin/repos.py:485 rhodecode/model/validators.py:302 msgid "Token mismatch" msgstr "Jeton d’authentification incorrect." -#: rhodecode/controllers/admin/repos.py:527 +#: rhodecode/controllers/admin/repos.py:498 msgid "Pulled from remote location" msgstr "Les changements distants ont été récupérés." -#: rhodecode/controllers/admin/repos.py:529 +#: rhodecode/controllers/admin/repos.py:501 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:545 +#: rhodecode/controllers/admin/repos.py:517 msgid "Nothing" msgstr "[Aucun dépôt]" -#: rhodecode/controllers/admin/repos.py:547 +#: rhodecode/controllers/admin/repos.py:519 #, 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:551 +#: rhodecode/controllers/admin/repos.py:523 msgid "An error occurred during this operation" msgstr "Une erreur est survenue durant cette opération." -#: rhodecode/controllers/admin/repos.py:590 +#: rhodecode/controllers/admin/repos.py:562 #, 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 +#: rhodecode/controllers/admin/repos.py:576 #, 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 +#: rhodecode/controllers/admin/repos_groups.py:147 #, 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:157 +#: rhodecode/controllers/admin/repos_groups.py:159 #, 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:214 -#: rhodecode/controllers/admin/repos_groups.py:286 -msgid "Cannot revoke permission for yourself as admin" -msgstr "" - -#: rhodecode/controllers/admin/repos_groups.py:220 +#: rhodecode/controllers/admin/repos_groups.py:217 #, 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 +#: rhodecode/controllers/admin/repos_groups.py:232 #, 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:253 +#: rhodecode/controllers/admin/repos_groups.py:250 #, 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:260 +#: rhodecode/controllers/admin/repos_groups.py:257 #, 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 +#: rhodecode/controllers/admin/repos_groups.py:263 #, 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:271 +#: rhodecode/controllers/admin/repos_groups.py:268 #, 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:297 -msgid "An error occurred during deletion of group user" +#: rhodecode/controllers/admin/repos_groups.py:279 +#: rhodecode/controllers/admin/repos_groups.py:314 +#: rhodecode/controllers/admin/users_groups.py:300 +msgid "Cannot revoke permission for yourself as admin" msgstr "" -"Une erreur est survenue durant la suppression de l’utilisateur du groupe " -"de dépôts." - -#: 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:126 + +#: rhodecode/controllers/admin/repos_groups.py:294 +#, fuzzy +msgid "Repository Group permissions updated" +msgstr "Création de dépôt désactivée" + +#: rhodecode/controllers/admin/settings.py:123 #, 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:135 +#: rhodecode/controllers/admin/settings.py:132 msgid "Whoosh reindex task scheduled" msgstr "La tâche de réindexation Whoosh a été planifiée." -#: rhodecode/controllers/admin/settings.py:166 +#: rhodecode/controllers/admin/settings.py:163 msgid "Updated application settings" msgstr "Réglages mis à jour" -#: rhodecode/controllers/admin/settings.py:170 -#: rhodecode/controllers/admin/settings.py:301 +#: rhodecode/controllers/admin/settings.py:167 +#: rhodecode/controllers/admin/settings.py:304 #, fuzzy msgid "Error occurred during updating application settings" msgstr "Une erreur est survenue durant la mise à jour des options." -#: rhodecode/controllers/admin/settings.py:216 +#: rhodecode/controllers/admin/settings.py:219 msgid "Updated visualisation settings" msgstr "Réglages d’affichage mis à jour." -#: rhodecode/controllers/admin/settings.py:221 +#: rhodecode/controllers/admin/settings.py:224 #, 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 +#: rhodecode/controllers/admin/settings.py:300 msgid "Updated VCS settings" msgstr "Réglages des gestionnaires de versions mis à jour." -#: rhodecode/controllers/admin/settings.py:311 +#: rhodecode/controllers/admin/settings.py:314 msgid "Added new hook" msgstr "Le nouveau hook a été ajouté." -#: rhodecode/controllers/admin/settings.py:323 +#: rhodecode/controllers/admin/settings.py:326 msgid "Updated hooks" msgstr "Hooks mis à jour" -#: rhodecode/controllers/admin/settings.py:327 +#: rhodecode/controllers/admin/settings.py:330 #, fuzzy msgid "Error occurred during hook creation" msgstr "Une erreur est survenue durant la création du hook." -#: rhodecode/controllers/admin/settings.py:346 +#: rhodecode/controllers/admin/settings.py:349 msgid "Email task created" msgstr "La tâche d’e-mail a été créée." -#: rhodecode/controllers/admin/settings.py:410 +#: rhodecode/controllers/admin/settings.py:413 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:452 +#: rhodecode/controllers/admin/settings.py:455 msgid "Your account was updated successfully" msgstr "Votre compte a été mis à jour avec succès" -#: rhodecode/controllers/admin/settings.py:467 +#: rhodecode/controllers/admin/settings.py:470 #: rhodecode/controllers/admin/users.py:198 #, fuzzy, python-format msgid "Error occurred during update of user %s" @@ -745,123 +789,98 @@ msgid "An error occurred during deletion of user" msgstr "Une erreur est survenue durant la suppression de l’utilisateur." -#: rhodecode/controllers/admin/users.py:233 +#: rhodecode/controllers/admin/users.py:234 msgid "You can't edit this user" msgstr "Vous ne pouvez pas éditer cet utilisateur" -#: rhodecode/controllers/admin/users.py:276 -msgid "Granted 'repository create' permission to user" -msgstr "La permission de création de dépôts a été accordée à l’utilisateur." - -#: rhodecode/controllers/admin/users.py:281 -msgid "Revoked 'repository create' permission to user" -msgstr "La permission de création de dépôts a été révoquée à l’utilisateur." - -#: rhodecode/controllers/admin/users.py:287 -msgid "Granted 'repository fork' permission to user" -msgstr "La permission de fork de dépôts a été accordée à l’utilisateur." - -#: rhodecode/controllers/admin/users.py:292 -msgid "Revoked 'repository fork' permission to user" -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:281 +#: rhodecode/controllers/admin/users.py:293 +#: rhodecode/controllers/admin/users_groups.py:372 +#, fuzzy +msgid "Updated permissions" +msgstr "Copier les permissions" + +#: rhodecode/controllers/admin/users.py:297 +#: rhodecode/controllers/admin/users_groups.py:376 msgid "An error occurred during permissions saving" msgstr "Une erreur est survenue durant l’enregistrement des permissions." -#: rhodecode/controllers/admin/users.py:312 +#: rhodecode/controllers/admin/users.py:311 #, python-format msgid "Added email %s to user" msgstr "L’e-mail « %s » a été ajouté à l’utilisateur." -#: rhodecode/controllers/admin/users.py:318 +#: rhodecode/controllers/admin/users.py:317 msgid "An error occurred during email saving" msgstr "Une erreur est survenue durant l’enregistrement de l’e-mail." -#: rhodecode/controllers/admin/users.py:328 +#: rhodecode/controllers/admin/users.py:327 msgid "Removed email from user" msgstr "L’e-mail a été enlevé de l’utilisateur." -#: rhodecode/controllers/admin/users.py:341 +#: rhodecode/controllers/admin/users.py:340 #, fuzzy, python-format msgid "Added ip %s to user" msgstr "L’e-mail « %s » a été ajouté à l’utilisateur." -#: rhodecode/controllers/admin/users.py:347 +#: rhodecode/controllers/admin/users.py:346 #, fuzzy msgid "An error occurred during ip saving" msgstr "Une erreur est survenue durant l’enregistrement de l’e-mail." -#: rhodecode/controllers/admin/users.py:359 +#: rhodecode/controllers/admin/users.py:358 #, fuzzy msgid "Removed ip from user" msgstr "L’e-mail a été enlevé de l’utilisateur." -#: rhodecode/controllers/admin/users_groups.py:86 +#: rhodecode/controllers/admin/users_groups.py:162 #, fuzzy, python-format msgid "Created user group %s" msgstr "Le groupe d’utilisateurs %s a été créé." -#: rhodecode/controllers/admin/users_groups.py:97 +#: rhodecode/controllers/admin/users_groups.py:173 #, 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:166 +#: rhodecode/controllers/admin/users_groups.py:210 #, fuzzy, python-format msgid "Updated user group %s" msgstr "Le groupe d’utilisateurs %s a été mis à jour." -#: rhodecode/controllers/admin/users_groups.py:188 +#: rhodecode/controllers/admin/users_groups.py:232 #, 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:205 +#: rhodecode/controllers/admin/users_groups.py:250 #, fuzzy msgid "Successfully deleted user group" msgstr "Le groupe d’utilisateurs a été supprimé avec succès." -#: rhodecode/controllers/admin/users_groups.py:210 +#: rhodecode/controllers/admin/users_groups.py:255 #, 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: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:264 -#, fuzzy -msgid "Revoked 'repository create' permission to user group" +#: rhodecode/controllers/admin/users_groups.py:274 +msgid "Target group cannot be the same" 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: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: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:530 + +#: rhodecode/controllers/admin/users_groups.py:280 +#, fuzzy +msgid "User Group permissions updated" +msgstr "Création de dépôt désactivée" + +#: rhodecode/lib/auth.py:544 #, fuzzy, python-format msgid "IP %s not allowed" msgstr "Followers de %s" -#: rhodecode/lib/auth.py:579 +#: rhodecode/lib/auth.py:593 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:620 +#: rhodecode/lib/auth.py:634 msgid "You need to be a signed in to view this page" msgstr "Vous devez être connecté pour visualiser cette page." @@ -880,154 +899,183 @@ msgid "No changes detected" msgstr "Aucun changement détecté." -#: rhodecode/lib/helpers.py:394 +#: rhodecode/lib/helpers.py:428 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "%d/%m/%Y à %H:%M:%S" -#: rhodecode/lib/helpers.py:506 +#: rhodecode/lib/helpers.py:539 msgid "True" msgstr "Vrai" -#: rhodecode/lib/helpers.py:509 +#: rhodecode/lib/helpers.py:542 msgid "False" msgstr "Faux" -#: rhodecode/lib/helpers.py:547 +#: rhodecode/lib/helpers.py:580 #, fuzzy, python-format msgid "Deleted branch: %s" msgstr "Dépôt %s supprimé" -#: rhodecode/lib/helpers.py:550 +#: rhodecode/lib/helpers.py:583 #, fuzzy, python-format msgid "Created tag: %s" msgstr "utilisateur %s créé" -#: rhodecode/lib/helpers.py:563 +#: rhodecode/lib/helpers.py:596 msgid "Changeset not found" msgstr "Ensemble de changements non trouvé" -#: rhodecode/lib/helpers.py:615 +#: rhodecode/lib/helpers.py:646 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Afficher les changements combinés %s->%s" -#: rhodecode/lib/helpers.py:621 +#: rhodecode/lib/helpers.py:652 msgid "compare view" msgstr "vue de comparaison" -#: rhodecode/lib/helpers.py:641 +#: rhodecode/lib/helpers.py:672 msgid "and" msgstr "et" -#: rhodecode/lib/helpers.py:642 +#: rhodecode/lib/helpers.py:673 #, python-format msgid "%s more" msgstr "%s de plus" -#: rhodecode/lib/helpers.py:643 rhodecode/templates/changelog/changelog.html:44 +#: rhodecode/lib/helpers.py:674 rhodecode/templates/changelog/changelog.html:53 msgid "revisions" msgstr "révisions" -#: rhodecode/lib/helpers.py:667 +#: rhodecode/lib/helpers.py:698 #, fuzzy, python-format msgid "fork name %s" msgstr "Nom du fork %s" -#: rhodecode/lib/helpers.py:684 +#: rhodecode/lib/helpers.py:715 #: rhodecode/templates/pullrequests/pullrequest_show.html:8 #, python-format msgid "Pull request #%s" msgstr "Requête de pull #%s" -#: rhodecode/lib/helpers.py:690 +#: rhodecode/lib/helpers.py:725 msgid "[deleted] repository" msgstr "[a supprimé] le dépôt" -#: rhodecode/lib/helpers.py:692 rhodecode/lib/helpers.py:702 +#: rhodecode/lib/helpers.py:727 rhodecode/lib/helpers.py:739 msgid "[created] repository" msgstr "[a créé] le dépôt" -#: rhodecode/lib/helpers.py:694 +#: rhodecode/lib/helpers.py:729 msgid "[created] repository as fork" msgstr "[a créé] le dépôt en tant que fork" -#: rhodecode/lib/helpers.py:696 rhodecode/lib/helpers.py:704 +#: rhodecode/lib/helpers.py:731 rhodecode/lib/helpers.py:741 msgid "[forked] repository" msgstr "[a forké] le dépôt" -#: rhodecode/lib/helpers.py:698 rhodecode/lib/helpers.py:706 +#: rhodecode/lib/helpers.py:733 rhodecode/lib/helpers.py:743 msgid "[updated] repository" msgstr "[a mis à jour] le dépôt" -#: rhodecode/lib/helpers.py:700 +#: rhodecode/lib/helpers.py:735 +#, fuzzy +msgid "[downloaded] archive from repository" +msgstr "Les téléchargements sont désactivés pour ce dépôt." + +#: rhodecode/lib/helpers.py:737 msgid "[delete] repository" msgstr "[a supprimé] le dépôt" -#: rhodecode/lib/helpers.py:708 +#: rhodecode/lib/helpers.py:745 msgid "[created] user" msgstr "[a créé] l’utilisateur" -#: rhodecode/lib/helpers.py:710 +#: rhodecode/lib/helpers.py:747 msgid "[updated] user" msgstr "[a mis à jour] l’utilisateur" -#: rhodecode/lib/helpers.py:712 +#: rhodecode/lib/helpers.py:749 #, fuzzy msgid "[created] user group" msgstr "[a créé] le groupe d’utilisateurs" -#: rhodecode/lib/helpers.py:714 +#: rhodecode/lib/helpers.py:751 #, fuzzy msgid "[updated] user group" msgstr "[a mis à jour] le groupe d’utilisateurs" -#: rhodecode/lib/helpers.py:716 +#: rhodecode/lib/helpers.py:753 msgid "[commented] on revision in repository" msgstr "[a commenté] une révision du dépôt" -#: rhodecode/lib/helpers.py:718 +#: rhodecode/lib/helpers.py:755 msgid "[commented] on pull request for" msgstr "[a commenté] la requête de pull pour" -#: rhodecode/lib/helpers.py:720 +#: rhodecode/lib/helpers.py:757 msgid "[closed] pull request for" msgstr "[a fermé] la requête de pull de" -#: rhodecode/lib/helpers.py:722 +#: rhodecode/lib/helpers.py:759 msgid "[pushed] into" msgstr "[a pushé] dans" -#: rhodecode/lib/helpers.py:724 +#: rhodecode/lib/helpers.py:761 msgid "[committed via RhodeCode] into repository" msgstr "[a commité via RhodeCode] dans le dépôt" -#: rhodecode/lib/helpers.py:726 +#: rhodecode/lib/helpers.py:763 msgid "[pulled from remote] into repository" msgstr "[a pullé depuis un site distant] dans le dépôt" -#: rhodecode/lib/helpers.py:728 +#: rhodecode/lib/helpers.py:765 msgid "[pulled] from" msgstr "[a pullé] depuis" -#: rhodecode/lib/helpers.py:730 +#: rhodecode/lib/helpers.py:767 msgid "[started following] repository" msgstr "[suit maintenant] le dépôt" -#: rhodecode/lib/helpers.py:732 +#: rhodecode/lib/helpers.py:769 msgid "[stopped following] repository" msgstr "[ne suit plus] le dépôt" -#: rhodecode/lib/helpers.py:910 +#: rhodecode/lib/helpers.py:1088 #, python-format msgid " and %s more" msgstr "et %s de plus" -#: rhodecode/lib/helpers.py:914 +#: rhodecode/lib/helpers.py:1092 msgid "No Files" msgstr "Aucun fichier" -#: rhodecode/lib/helpers.py:1198 +#: rhodecode/lib/helpers.py:1158 +#, fuzzy +msgid "new file" +msgstr "Ajouter un nouveau fichier" + +#: rhodecode/lib/helpers.py:1161 +#, fuzzy +msgid "mod" +msgstr "Supprimés" + +#: rhodecode/lib/helpers.py:1164 +#, fuzzy +msgid "del" +msgstr "Supprimer" + +#: rhodecode/lib/helpers.py:1167 +#, fuzzy +msgid "rename" +msgstr "Nom d’utilisateur" + +#: rhodecode/lib/helpers.py:1172 +msgid "chmod" +msgstr "" + +#: rhodecode/lib/helpers.py:1404 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1043,225 +1091,314 @@ msgid "cannot create new union repository" msgstr "[a créé] le dépôt" -#: rhodecode/lib/utils2.py:411 +#: rhodecode/lib/utils2.py:410 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d an" msgstr[1] "%d ans" -#: rhodecode/lib/utils2.py:412 +#: rhodecode/lib/utils2.py:411 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d mois" msgstr[1] "%d mois" -#: rhodecode/lib/utils2.py:413 +#: rhodecode/lib/utils2.py:412 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d jour" msgstr[1] "%d jours" -#: rhodecode/lib/utils2.py:414 +#: rhodecode/lib/utils2.py:413 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d heure" msgstr[1] "%d heures" -#: rhodecode/lib/utils2.py:415 +#: rhodecode/lib/utils2.py:414 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minute" msgstr[1] "%d minutes" -#: rhodecode/lib/utils2.py:416 +#: rhodecode/lib/utils2.py:415 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d seconde" msgstr[1] "%d secondes" -#: rhodecode/lib/utils2.py:432 +#: rhodecode/lib/utils2.py:431 #, fuzzy, python-format msgid "in %s" msgstr "à la ligne %s" -#: rhodecode/lib/utils2.py:434 +#: rhodecode/lib/utils2.py:433 #, python-format msgid "%s ago" msgstr "Il y a %s" -#: rhodecode/lib/utils2.py:436 +#: rhodecode/lib/utils2.py:435 #, fuzzy, python-format msgid "in %s and %s" msgstr "Il y a %s et %s" -#: rhodecode/lib/utils2.py:439 +#: rhodecode/lib/utils2.py:438 #, python-format msgid "%s and %s ago" msgstr "Il y a %s et %s" -#: rhodecode/lib/utils2.py:442 +#: rhodecode/lib/utils2.py:441 msgid "just now" msgstr "à l’instant" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 #: 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 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1303 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1388 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1408 rhodecode/model/db.py:1413 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/lib/dbmigrate/schema/db_1_5_2.py:1290 rhodecode/model/db.py:1389 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1389 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1409 rhodecode/model/db.py:1414 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/lib/dbmigrate/schema/db_1_5_2.py:1291 rhodecode/model/db.py:1390 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1390 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1410 rhodecode/model/db.py:1415 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/lib/dbmigrate/schema/db_1_5_2.py:1292 rhodecode/model/db.py:1391 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1306 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1391 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1411 rhodecode/model/db.py:1416 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/lib/dbmigrate/schema/db_1_5_2.py:1294 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1308 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/lib/dbmigrate/schema/db_1_5_2.py:1295 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1309 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/lib/dbmigrate/schema/db_1_5_2.py:1296 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1310 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/lib/dbmigrate/schema/db_1_5_2.py:1297 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1311 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/lib/dbmigrate/schema/db_1_5_2.py:1299 rhodecode/model/db.py:1398 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1313 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1398 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1406 rhodecode/model/db.py:1411 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/lib/dbmigrate/schema/db_1_5_2.py:1300 rhodecode/model/db.py:1399 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1314 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1399 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1429 rhodecode/model/db.py:1434 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/lib/dbmigrate/schema/db_1_5_2.py:1301 rhodecode/model/db.py:1400 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1315 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1400 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1430 rhodecode/model/db.py:1435 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/lib/dbmigrate/schema/db_1_5_2.py:1302 rhodecode/model/db.py:1401 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1316 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1401 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1432 rhodecode/model/db.py:1437 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/lib/dbmigrate/schema/db_1_5_2.py:1303 rhodecode/model/db.py:1402 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1317 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1402 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1433 rhodecode/model/db.py:1438 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/lib/dbmigrate/schema/db_1_5_2.py:1304 rhodecode/model/db.py:1403 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1318 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.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/lib/dbmigrate/schema/db_1_5_2.py:1305 rhodecode/model/db.py:1404 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1319 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.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/lib/dbmigrate/schema/db_1_5_2.py:1308 rhodecode/model/db.py:1407 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1322 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.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/lib/dbmigrate/schema/db_1_5_2.py:1749 rhodecode/model/db.py:1838 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1763 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1838 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1934 rhodecode/model/db.py:1939 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/lib/dbmigrate/schema/db_1_5_2.py:1750 rhodecode/model/db.py:1839 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1764 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1839 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1935 rhodecode/model/db.py:1940 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/lib/dbmigrate/schema/db_1_5_2.py:1751 rhodecode/model/db.py:1840 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1765 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1840 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1936 rhodecode/model/db.py:1941 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/lib/dbmigrate/schema/db_1_5_2.py:1752 rhodecode/model/db.py:1841 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1766 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1841 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1937 rhodecode/model/db.py:1942 msgid "Under Review" msgstr "En cours de relecture" +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1252 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1270 rhodecode/model/db.py:1275 +msgid "top level" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1393 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1413 rhodecode/model/db.py:1418 +#, fuzzy +msgid "Repository group no access" +msgstr "Aucun accès au groupe de dépôts" + +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1394 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1414 rhodecode/model/db.py:1419 +#, fuzzy +msgid "Repository group read access" +msgstr "Accès en lecture au groupe de dépôts" + +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1395 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1415 rhodecode/model/db.py:1420 +#, fuzzy +msgid "Repository group write access" +msgstr "Accès en écriture au groupe de dépôts" + +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1396 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1416 rhodecode/model/db.py:1421 +#, fuzzy +msgid "Repository group admin access" +msgstr "Accès administrateur au groupe de dépôts" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1418 rhodecode/model/db.py:1423 +#, fuzzy +msgid "User group no access" +msgstr "Aucun accès au groupe de dépôts" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1419 rhodecode/model/db.py:1424 +#, fuzzy +msgid "User group read access" +msgstr "Accès en lecture au groupe de dépôts" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1420 rhodecode/model/db.py:1425 +#, fuzzy +msgid "User group write access" +msgstr "Accès en écriture au groupe de dépôts" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1421 rhodecode/model/db.py:1426 +#, fuzzy +msgid "User group admin access" +msgstr "Accès administrateur au groupe de dépôts" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1423 rhodecode/model/db.py:1428 +#, fuzzy +msgid "Repository Group creation disabled" +msgstr "Création de dépôt désactivée" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1424 rhodecode/model/db.py:1429 +#, fuzzy +msgid "Repository Group creation enabled" +msgstr "Création de dépôt activée" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1426 rhodecode/model/db.py:1431 +#, fuzzy +msgid "User Group creation disabled" +msgstr "Création de dépôt désactivée" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1427 rhodecode/model/db.py:1432 +#, fuzzy +msgid "User Group creation enabled" +msgstr "Création de dépôt activée" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1435 rhodecode/model/db.py:1440 +#, fuzzy +msgid "Registration disabled" +msgstr "Enregistrement désactivé" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1436 rhodecode/model/db.py:1441 +#, fuzzy +msgid "User Registration with manual account activation" +msgstr "Autorisé avec activation manuelle du compte" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1437 rhodecode/model/db.py:1442 +#, fuzzy +msgid "User Registration with automatic account activation" +msgstr "Autorisé avec activation automatique du compte" + #: rhodecode/model/comment.py:75 #, python-format msgid "on line %s" msgstr "à la ligne %s" -#: rhodecode/model/comment.py:219 +#: rhodecode/model/comment.py:220 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" @@ -1280,44 +1417,44 @@ msgid "Enter %(min)i characters or more" msgstr "Entrez au moins %(min)i caractères" -#: rhodecode/model/notification.py:224 +#: rhodecode/model/notification.py:228 #, fuzzy, python-format 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 +#: rhodecode/model/notification.py:229 #, fuzzy, python-format msgid "%(user)s sent message at %(when)s" msgstr "%(user)s a envoyé un message %(when)s" -#: rhodecode/model/notification.py:226 +#: rhodecode/model/notification.py:230 #, fuzzy, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "%(user)s vous a mentioné %(when)s" -#: rhodecode/model/notification.py:227 +#: rhodecode/model/notification.py:231 #, 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 +#: rhodecode/model/notification.py:232 #, 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 +#: rhodecode/model/notification.py:233 #, 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 +#: rhodecode/model/pull_request.py:98 #, 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 +#: rhodecode/model/scm.py:674 msgid "latest tip" msgstr "Dernier sommet" @@ -1377,9 +1514,10 @@ msgstr "Le nom d’utilisateur « %(username)s » n’est pas autorisé" #: rhodecode/model/validators.py:89 +#, fuzzy msgid "" "Username may only contain alphanumeric characters underscores, periods or" -" dashes and must begin with alphanumeric character" +" dashes and must begin with alphanumeric character or underscore" msgstr "" "Le nom d’utilisateur peut contenir uniquement des caractères alpha-" "numériques ainsi que les caractères suivants : « _ . - ». Il doit " @@ -1492,25 +1630,25 @@ 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:557 +#: rhodecode/model/validators.py:559 #, 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:650 +#: rhodecode/model/validators.py:652 msgid "This is not a valid path" msgstr "Ceci n’est pas un chemin valide" -#: rhodecode/model/validators.py:665 +#: rhodecode/model/validators.py:667 msgid "This e-mail address is already taken" msgstr "Cette adresse e-mail est déjà enregistrée" -#: rhodecode/model/validators.py:685 +#: rhodecode/model/validators.py:687 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "L’adresse e-mail « %(email)s » n’existe pas" -#: rhodecode/model/validators.py:722 +#: rhodecode/model/validators.py:724 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" @@ -1518,26 +1656,30 @@ "L’attribut Login du CN doit être spécifié. Cet attribut correspond au nom" " d’utilisateur." -#: rhodecode/model/validators.py:735 +#: rhodecode/model/validators.py:737 #, 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:767 +#: rhodecode/model/validators.py:769 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "" -#: rhodecode/model/validators.py:768 +#: rhodecode/model/validators.py:770 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: rhodecode/model/validators.py:800 +#: rhodecode/model/validators.py:803 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" +#: rhodecode/model/validators.py:817 +msgid "Filename cannot be inside a directory" +msgstr "" + #: rhodecode/templates/index.html:5 msgid "Dashboard" msgstr "Tableau de bord" @@ -1585,29 +1727,28 @@ msgstr "" #: 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 +#: rhodecode/templates/admin/users_groups/users_groups.html:37 msgid "Group name" msgstr "Nom de groupe" #: 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:270 +#: rhodecode/templates/index_base.html:123 #: rhodecode/templates/admin/repos/repo_add_base.html:56 -#: rhodecode/templates/admin/repos/repo_edit.html:75 +#: rhodecode/templates/admin/repos/repo_edit.html:68 #: rhodecode/templates/admin/repos/repos.html:73 #: 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/email_templates/changeset_comment.html:9 +#: rhodecode/templates/email_templates/pull_request.html:9 #: rhodecode/templates/forks/fork.html:56 -#: rhodecode/templates/pullrequests/pullrequest.html:101 +#: rhodecode/templates/pullrequests/pullrequest.html:43 +#: rhodecode/templates/pullrequests/pullrequest_show.html:81 #: rhodecode/templates/summary/summary.html:106 msgid "Description" msgstr "Description" @@ -1615,27 +1756,25 @@ #: 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/repo_edit.html:50 #: 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:268 +#: rhodecode/templates/index_base.html:121 #: 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_my_account.html:172 -#: rhodecode/templates/base/perms_summary.html:14 -#: rhodecode/templates/bookmarks/bookmarks.html:34 +#: rhodecode/templates/base/perms_summary.html:37 +#: rhodecode/templates/bookmarks/bookmarks.html:48 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 #: 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:193 -#: rhodecode/templates/journal/journal.html:296 +#: rhodecode/templates/journal/journal.html:283 #: rhodecode/templates/summary/summary.html:55 #: rhodecode/templates/summary/summary.html:124 #: rhodecode/templates/tags/tags.html:48 @@ -1643,110 +1782,79 @@ msgid "Name" msgstr "Nom" -#: rhodecode/templates/index_base.html:84 -msgid "Last change" +#: rhodecode/templates/index_base.html:124 +msgid "Last Change" msgstr "Dernière modification" -#: rhodecode/templates/index_base.html:85 -#: rhodecode/templates/index_base.html:183 -#: rhodecode/templates/index_base.html:273 +#: rhodecode/templates/index_base.html:126 #: 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 +#: rhodecode/templates/journal/journal.html:285 msgid "Tip" msgstr "Sommet" -#: 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/index_base.html:128 +#: rhodecode/templates/admin/repos/repo_edit.html:114 #: rhodecode/templates/admin/repos/repos.html:76 msgid "Owner" msgstr "Propriétaire" -#: rhodecode/templates/index_base.html:87 -msgid "Atom" -msgstr "Atom" - -#: 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:196 +#: rhodecode/templates/index_base.html:136 +#: rhodecode/templates/admin/repos/repos.html:84 +#: rhodecode/templates/admin/users/user_edit_my_account.html:183 #: rhodecode/templates/admin/users/users.html:107 -#: rhodecode/templates/bookmarks/bookmarks.html:58 +#: rhodecode/templates/bookmarks/bookmarks.html:74 #: rhodecode/templates/branches/branches.html:73 -#: rhodecode/templates/journal/journal.html:217 -#: rhodecode/templates/journal/journal.html:320 +#: rhodecode/templates/journal/journal.html:204 +#: rhodecode/templates/journal/journal.html:294 #: 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:210 -#: rhodecode/templates/index_base.html:297 -#: rhodecode/templates/admin/repos/repos.html:98 -#: rhodecode/templates/admin/users/user_edit_my_account.html:197 +#: rhodecode/templates/index_base.html:137 +#: rhodecode/templates/admin/repos/repos.html:85 +#: rhodecode/templates/admin/users/user_edit_my_account.html:184 #: rhodecode/templates/admin/users/users.html:108 -#: rhodecode/templates/bookmarks/bookmarks.html:59 +#: rhodecode/templates/bookmarks/bookmarks.html:75 #: rhodecode/templates/branches/branches.html:74 -#: rhodecode/templates/journal/journal.html:218 -#: rhodecode/templates/journal/journal.html:321 +#: rhodecode/templates/journal/journal.html:205 +#: rhodecode/templates/journal/journal.html:295 #: 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:271 -msgid "Last Change" -msgstr "Dernière modification" - -#: 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 "Aucun élément n’a été trouvé." - -#: 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/index_base.html:138 +#, fuzzy +msgid "No repositories found." +msgstr "Groupes de dépôts" + +#: rhodecode/templates/index_base.html:139 +#: rhodecode/templates/admin/repos/repos.html:87 +#: rhodecode/templates/admin/users/user_edit_my_account.html:186 #: rhodecode/templates/admin/users/users.html:110 -#: rhodecode/templates/bookmarks/bookmarks.html:61 +#: rhodecode/templates/bookmarks/bookmarks.html:77 #: rhodecode/templates/branches/branches.html:76 -#: rhodecode/templates/journal/journal.html:220 -#: rhodecode/templates/journal/journal.html:323 +#: rhodecode/templates/journal/journal.html:207 +#: rhodecode/templates/journal/journal.html:297 #: rhodecode/templates/tags/tags.html:77 msgid "Data error." msgstr "Erreur d’intégrité des données." -#: rhodecode/templates/index_base.html:213 -#: rhodecode/templates/index_base.html:300 -#: rhodecode/templates/admin/repos/repos.html:101 +#: rhodecode/templates/index_base.html:140 +#: rhodecode/templates/admin/repos/repos.html:88 #: rhodecode/templates/admin/users/user_edit_my_account.html:58 -#: rhodecode/templates/admin/users/user_edit_my_account.html:200 +#: rhodecode/templates/admin/users/user_edit_my_account.html:187 #: rhodecode/templates/admin/users/users.html:111 -#: rhodecode/templates/bookmarks/bookmarks.html:62 +#: rhodecode/templates/bookmarks/bookmarks.html:78 #: rhodecode/templates/branches/branches.html:77 -#: rhodecode/templates/journal/journal.html:221 -#: rhodecode/templates/journal/journal.html:324 +#: rhodecode/templates/journal/journal.html:208 +#: rhodecode/templates/journal/journal.html:298 #: rhodecode/templates/tags/tags.html:78 msgid "Loading..." msgstr "Chargement…" -#: 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 +#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:239 msgid "Log In" msgstr "Connexion" @@ -1761,7 +1869,7 @@ #: 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/base/base.html:215 #: rhodecode/templates/summary/summary.html:123 msgid "Username" msgstr "Nom d’utilisateur" @@ -1769,7 +1877,7 @@ #: 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:212 +#: rhodecode/templates/base/base.html:224 msgid "Password" msgstr "Mot de passe" @@ -1785,7 +1893,7 @@ msgid "Forgot your password ?" msgstr "Mot de passe oublié ?" -#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:223 +#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:235 msgid "Don't have an account ?" msgstr "Vous n’avez pas de compte ?" @@ -1855,7 +1963,7 @@ #: 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/admin/repos/repo_edit.html:78 #: rhodecode/templates/data_table/_dt_elements.html:61 #: rhodecode/templates/summary/summary.html:77 msgid "Private repository" @@ -1878,13 +1986,13 @@ msgstr "Aucun tag n’a été créé pour le moment." #: rhodecode/templates/switch_to_list.html:35 -#: rhodecode/templates/bookmarks/bookmarks_data.html:32 +#: rhodecode/templates/bookmarks/bookmarks_data.html:37 msgid "There are no bookmarks yet" msgstr "Aucun signet n’a été créé." #: rhodecode/templates/admin/admin.html:5 #: rhodecode/templates/admin/admin.html:13 -#: rhodecode/templates/base/base.html:68 +#: rhodecode/templates/base/base.html:73 msgid "Admin journal" msgstr "Historique d’administration" @@ -1912,9 +2020,9 @@ #: 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/admin/users_groups/users_groups.html:40 #: rhodecode/templates/journal/journal.html:197 -#: rhodecode/templates/journal/journal.html:300 +#: rhodecode/templates/journal/journal.html:287 msgid "Action" msgstr "Action" @@ -1924,7 +2032,7 @@ msgstr "Dépôt" #: rhodecode/templates/admin/admin_log.html:8 -#: rhodecode/templates/bookmarks/bookmarks.html:35 +#: rhodecode/templates/bookmarks/bookmarks.html:49 #: rhodecode/templates/bookmarks/bookmarks_data.html:7 #: rhodecode/templates/branches/branches.html:48 #: rhodecode/templates/branches/branches_data.html:7 @@ -1948,20 +2056,19 @@ msgstr "Groupes de dépôts" #: rhodecode/templates/admin/defaults/defaults.html:11 -#: rhodecode/templates/base/base.html:75 +#: rhodecode/templates/base/base.html:80 #, fuzzy msgid "Defaults" msgstr "[Par défaut]" #: rhodecode/templates/admin/defaults/defaults.html:35 #: rhodecode/templates/admin/repos/repo_add_base.html:38 -#: rhodecode/templates/admin/repos/repo_edit.html:58 msgid "Type" msgstr "Type" #: rhodecode/templates/admin/defaults/defaults.html:48 #: rhodecode/templates/admin/repos/repo_add_base.html:69 -#: rhodecode/templates/admin/repos/repo_edit.html:89 +#: rhodecode/templates/admin/repos/repo_edit.html:82 #: rhodecode/templates/forks/fork.html:69 msgid "" "Private repositories are only visible to people explicitly added as " @@ -1971,60 +2078,194 @@ "comme collaborateurs." #: rhodecode/templates/admin/defaults/defaults.html:55 -#: rhodecode/templates/admin/repos/repo_edit.html:94 +#: rhodecode/templates/admin/repos/repo_edit.html:87 msgid "Enable statistics" msgstr "Activer les statistiques" #: rhodecode/templates/admin/defaults/defaults.html:59 -#: rhodecode/templates/admin/repos/repo_edit.html:98 +#: rhodecode/templates/admin/repos/repo_edit.html:91 msgid "Enable statistics window on summary page." msgstr "Afficher les statistiques sur la page du dépôt." #: rhodecode/templates/admin/defaults/defaults.html:65 -#: rhodecode/templates/admin/repos/repo_edit.html:103 +#: rhodecode/templates/admin/repos/repo_edit.html:96 msgid "Enable downloads" msgstr "Activer les téléchargements" #: rhodecode/templates/admin/defaults/defaults.html:69 -#: rhodecode/templates/admin/repos/repo_edit.html:107 +#: rhodecode/templates/admin/repos/repo_edit.html:100 msgid "Enable download menu on summary page." msgstr "Afficher le menu de téléchargements sur la page du dépôt." #: rhodecode/templates/admin/defaults/defaults.html:75 -#: rhodecode/templates/admin/repos/repo_edit.html:112 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72 +#: rhodecode/templates/admin/repos/repo_edit.html:105 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:64 msgid "Enable locking" msgstr "Activer le verrouillage" #: rhodecode/templates/admin/defaults/defaults.html:79 -#: rhodecode/templates/admin/repos/repo_edit.html:116 +#: rhodecode/templates/admin/repos/repo_edit.html:109 msgid "Enable lock-by-pulling on repository." msgstr "Activer le verrouillage lors d’un pull sur le dépôt." #: rhodecode/templates/admin/defaults/defaults.html:84 #: rhodecode/templates/admin/ldap/ldap.html:89 -#: rhodecode/templates/admin/permissions/permissions.html:92 -#: 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/permissions/permissions.html:122 +#: rhodecode/templates/admin/repos/repo_edit.html:141 +#: rhodecode/templates/admin/repos/repo_edit.html:166 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:96 #: rhodecode/templates/admin/settings/hooks.html:73 #: 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/admin/users_groups/users_group_edit.html:143 +#: rhodecode/templates/base/default_perms_box.html:53 msgid "Save" msgstr "Enregistrer" +#: rhodecode/templates/admin/gists/index.html:5 +#: rhodecode/templates/base/base.html:299 +msgid "Gists" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:10 +#, fuzzy, python-format +msgid "Private Gists for user %s" +msgstr "utilisateur %s créé" + +#: rhodecode/templates/admin/gists/index.html:12 +#, python-format +msgid "Public Gists for user %s" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:14 +msgid "Public Gists" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:31 +#: rhodecode/templates/admin/gists/show.html:24 +#: rhodecode/templates/base/base.html:302 +#, fuzzy +msgid "Create new gist" +msgstr "Créer un nouveau fichier" + +#: rhodecode/templates/admin/gists/index.html:48 +#, fuzzy +msgid "Created" +msgstr "Lecture" + +#: rhodecode/templates/admin/gists/index.html:51 +#: rhodecode/templates/admin/gists/index.html:53 +#: rhodecode/templates/admin/gists/show.html:43 +#: rhodecode/templates/admin/gists/show.html:45 +#, fuzzy +msgid "Expires" +msgstr "Dépôts" + +#: rhodecode/templates/admin/gists/index.html:51 +#: rhodecode/templates/admin/gists/show.html:43 +#, fuzzy +msgid "never" +msgstr "%d relecteur" + +#: rhodecode/templates/admin/gists/index.html:68 +#, fuzzy +msgid "There are no gists yet" +msgstr "Aucun tag n’a été créé pour le moment." + +#: rhodecode/templates/admin/gists/new.html:5 +#: rhodecode/templates/admin/gists/new.html:16 +msgid "New gist" +msgstr "" + +#: rhodecode/templates/admin/gists/new.html:37 +#, fuzzy +msgid "Gist description ..." +msgstr "Description" + +#: rhodecode/templates/admin/gists/new.html:52 +msgid "Create private gist" +msgstr "" + +#: rhodecode/templates/admin/gists/new.html:53 +msgid "Create public gist" +msgstr "" + +#: rhodecode/templates/admin/gists/new.html:54 +#: rhodecode/templates/admin/permissions/permissions.html:123 +#: rhodecode/templates/admin/permissions/permissions.html:185 +#: rhodecode/templates/admin/repos/repo_edit.html:142 +#: rhodecode/templates/admin/repos/repo_edit.html:167 +#: rhodecode/templates/admin/repos/repo_edit.html:381 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:73 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:97 +#: rhodecode/templates/admin/settings/settings.html:115 +#: rhodecode/templates/admin/settings/settings.html:196 +#: rhodecode/templates/admin/settings/settings.html:288 +#: rhodecode/templates/admin/users/user_edit.html:141 +#: rhodecode/templates/admin/users/user_edit.html:198 +#: rhodecode/templates/admin/users/user_edit.html:246 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:89 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:144 +#: rhodecode/templates/base/default_perms_box.html:54 +#: rhodecode/templates/files/files_add.html:80 +#: rhodecode/templates/files/files_edit.html:66 +#: rhodecode/templates/pullrequests/pullrequest.html:86 +msgid "Reset" +msgstr "Réinitialiser" + +#: rhodecode/templates/admin/gists/show.html:5 +msgid "gist" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:9 +msgid "Gist" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:36 +msgid "Public gist" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:38 +#, fuzzy +msgid "Private gist" +msgstr "Dépôt privé" + +#: rhodecode/templates/admin/gists/show.html:54 +#: rhodecode/templates/admin/repos/repo_edit.html:299 +#: rhodecode/templates/changeset/changeset_file_comment.html:40 +msgid "Delete" +msgstr "Supprimer" + +#: rhodecode/templates/admin/gists/show.html:54 +#, fuzzy +msgid "Confirm to delete this gist" +msgstr "Veuillez confirmer la suppression de l’e-mail : %s" + +#: rhodecode/templates/admin/gists/show.html:63 +#: rhodecode/templates/admin/gists/show.html:84 +#: rhodecode/templates/files/files_edit.html:48 +#: rhodecode/templates/files/files_source.html:25 +#: rhodecode/templates/files/files_source.html:55 +#, fuzzy +msgid "Show as raw" +msgstr "montrer le fichier brut" + +#: rhodecode/templates/admin/gists/show.html:71 +#, fuzzy +msgid "created" +msgstr "Lecture" + #: rhodecode/templates/admin/ldap/ldap.html:5 msgid "LDAP administration" msgstr "Administration LDAP" #: rhodecode/templates/admin/ldap/ldap.html:11 #: rhodecode/templates/admin/users/users.html:86 -#: rhodecode/templates/base/base.html:74 +#: rhodecode/templates/base/base.html:79 #, fuzzy msgid "LDAP" msgstr "LDAP" @@ -2125,7 +2366,7 @@ msgstr "Notification" #: rhodecode/templates/admin/notifications/show_notification.html:9 -#: rhodecode/templates/base/base.html:241 +#: rhodecode/templates/base/base.html:253 msgid "Notifications" msgstr "Notifications" @@ -2134,12 +2375,14 @@ msgstr "Gestion des permissions" #: rhodecode/templates/admin/permissions/permissions.html:11 +#: rhodecode/templates/admin/repos/repo_edit.html:151 #: 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/repos_groups/repos_groups_edit.html:81 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:88 #: rhodecode/templates/admin/users/user_edit.html:150 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:100 -#: rhodecode/templates/base/base.html:73 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:129 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:136 +#: rhodecode/templates/base/base.html:78 msgid "Permissions" msgstr "Permissions" @@ -2164,6 +2407,7 @@ #: rhodecode/templates/admin/permissions/permissions.html:50 #: rhodecode/templates/admin/permissions/permissions.html:63 +#: rhodecode/templates/admin/permissions/permissions.html:77 #, fuzzy msgid "Overwrite existing settings" msgstr "Écraser les permissions existantes" @@ -2180,89 +2424,95 @@ "perdues." #: rhodecode/templates/admin/permissions/permissions.html:69 -msgid "Registration" -msgstr "Enregistrement" - -#: rhodecode/templates/admin/permissions/permissions.html:77 +#, fuzzy +msgid "User group" +msgstr "Groupes d’utilisateurs" + +#: rhodecode/templates/admin/permissions/permissions.html:76 +#, fuzzy +msgid "" +"All default permissions on each user 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 " +"perdues." + +#: rhodecode/templates/admin/permissions/permissions.html:83 msgid "Repository creation" msgstr "Création de dépôt" -#: rhodecode/templates/admin/permissions/permissions.html:85 +#: rhodecode/templates/admin/permissions/permissions.html:91 +#, fuzzy +msgid "User group creation" +msgstr "Gestion des groupes d’utilisateurs" + +#: rhodecode/templates/admin/permissions/permissions.html:99 msgid "Repository forking" msgstr "Fork de dépôt" -#: rhodecode/templates/admin/permissions/permissions.html:93 -#: 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:80 -#: rhodecode/templates/files/files_edit.html:66 -#: rhodecode/templates/pullrequests/pullrequest.html:110 -msgid "Reset" -msgstr "Réinitialiser" - -#: rhodecode/templates/admin/permissions/permissions.html:103 +#: rhodecode/templates/admin/permissions/permissions.html:107 +msgid "Registration" +msgstr "Enregistrement" + +#: rhodecode/templates/admin/permissions/permissions.html:115 +#, fuzzy +msgid "External auth account activation" +msgstr "Autorisé avec activation automatique du compte" + +#: rhodecode/templates/admin/permissions/permissions.html:133 #, fuzzy msgid "Default User Permissions" msgstr "Permissions par défaut" -#: rhodecode/templates/admin/permissions/permissions.html:113 -#: rhodecode/templates/admin/users/user_edit.html:244 +#: rhodecode/templates/admin/permissions/permissions.html:144 +#: rhodecode/templates/admin/users/user_edit.html:207 #, fuzzy msgid "Allowed IP addresses" msgstr "Adresses e-mail" -#: rhodecode/templates/admin/permissions/permissions.html:127 -#: rhodecode/templates/admin/repos/repo_edit.html:347 +#: rhodecode/templates/admin/permissions/permissions.html:158 +#: rhodecode/templates/admin/repos/repo_edit.html:340 #: 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/admin/users/user_edit.html:175 +#: rhodecode/templates/admin/users/user_edit.html:220 +#: rhodecode/templates/admin/users_groups/users_groups.html:54 #: rhodecode/templates/data_table/_dt_elements.html:122 -#: rhodecode/templates/data_table/_dt_elements.html:130 +#: rhodecode/templates/data_table/_dt_elements.html:136 msgid "delete" msgstr "Supprimer" -#: rhodecode/templates/admin/permissions/permissions.html:128 -#: rhodecode/templates/admin/users/user_edit.html:258 +#: rhodecode/templates/admin/permissions/permissions.html:159 +#: rhodecode/templates/admin/users/user_edit.html:221 #, 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:134 -#: rhodecode/templates/admin/users/user_edit.html:264 +#: rhodecode/templates/admin/permissions/permissions.html:165 +#: rhodecode/templates/admin/users/user_edit.html:227 msgid "All IP addresses are allowed" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:145 -#: rhodecode/templates/admin/users/user_edit.html:275 +#: rhodecode/templates/admin/permissions/permissions.html:176 +#: rhodecode/templates/admin/users/user_edit.html:238 #, fuzzy msgid "New ip address" msgstr "Nouvelle adrese" -#: rhodecode/templates/admin/permissions/permissions.html:153 +#: rhodecode/templates/admin/permissions/permissions.html:184 #: 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 +#: rhodecode/templates/admin/repos/repo_edit.html:380 +#: rhodecode/templates/admin/users/user_edit.html:197 +#: rhodecode/templates/admin/users/user_edit.html:245 msgid "Add" msgstr "Ajouter" #: 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 +#: rhodecode/templates/base/base.html:74 rhodecode/templates/base/base.html:88 +#: rhodecode/templates/base/base.html:116 +#: rhodecode/templates/base/base.html:275 msgid "Repositories" msgstr "Dépôts" @@ -2278,7 +2528,7 @@ msgstr "Cloner depuis" #: rhodecode/templates/admin/repos/repo_add_base.html:24 -#: rhodecode/templates/admin/repos/repo_edit.html:44 +#: rhodecode/templates/admin/repos/repo_edit.html:45 msgid "Optional http[s] url from which repository should be cloned." msgstr "URL http(s) depuis laquelle le dépôt doit être cloné." @@ -2292,13 +2542,13 @@ msgstr "Type de dépôt à créer." #: rhodecode/templates/admin/repos/repo_add_base.html:47 -#: rhodecode/templates/admin/repos/repo_edit.html:66 +#: rhodecode/templates/admin/repos/repo_edit.html:59 #: 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/admin/repos/repo_edit.html:63 #: rhodecode/templates/forks/fork.html:42 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" @@ -2306,7 +2556,7 @@ "recherche et de documentation." #: rhodecode/templates/admin/repos/repo_add_base.html:60 -#: rhodecode/templates/admin/repos/repo_edit.html:79 +#: rhodecode/templates/admin/repos/repo_edit.html:72 #: rhodecode/templates/forks/fork.html:60 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" @@ -2320,73 +2570,78 @@ #: 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/base/base.html:81 rhodecode/templates/base/base.html:134 #: rhodecode/templates/summary/summary.html:212 msgid "Settings" msgstr "Options" -#: rhodecode/templates/admin/repos/repo_edit.html:40 +#: rhodecode/templates/admin/repos/repo_edit.html:36 +#, fuzzy +msgid "Non-changeable id" +msgstr "Identifiant permanent : %s" + +#: rhodecode/templates/admin/repos/repo_edit.html:41 msgid "Clone uri" msgstr "URL de clone" -#: rhodecode/templates/admin/repos/repo_edit.html:53 +#: rhodecode/templates/admin/repos/repo_edit.html:54 msgid "Optional select a group to put this repository into." msgstr "Sélectionnez un groupe (optionel) dans lequel sera placé le dépôt." -#: rhodecode/templates/admin/repos/repo_edit.html:126 +#: rhodecode/templates/admin/repos/repo_edit.html:119 msgid "Change owner of this repository." msgstr "Changer le propriétaire de ce dépôt." -#: rhodecode/templates/admin/repos/repo_edit.html:184 +#: rhodecode/templates/admin/repos/repo_edit.html:177 #, fuzzy msgid "Advanced settings" msgstr "Enregister les options" -#: rhodecode/templates/admin/repos/repo_edit.html:187 +#: rhodecode/templates/admin/repos/repo_edit.html:180 msgid "Statistics" msgstr "Statistiques" -#: rhodecode/templates/admin/repos/repo_edit.html:191 +#: rhodecode/templates/admin/repos/repo_edit.html:184 msgid "Reset current statistics" msgstr "Réinitialiser les statistiques" -#: rhodecode/templates/admin/repos/repo_edit.html:191 +#: rhodecode/templates/admin/repos/repo_edit.html:184 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:194 +#: rhodecode/templates/admin/repos/repo_edit.html:187 msgid "Fetched to rev" msgstr "Parcouru jusqu’à la révision" -#: rhodecode/templates/admin/repos/repo_edit.html:195 +#: rhodecode/templates/admin/repos/repo_edit.html:188 msgid "Stats gathered" msgstr "Statistiques obtenues" -#: rhodecode/templates/admin/repos/repo_edit.html:203 +#: rhodecode/templates/admin/repos/repo_edit.html:196 msgid "Remote" msgstr "Dépôt distant" -#: rhodecode/templates/admin/repos/repo_edit.html:207 +#: rhodecode/templates/admin/repos/repo_edit.html:200 msgid "Pull changes from remote location" msgstr "Récupérer les changements depuis le site distant" -#: rhodecode/templates/admin/repos/repo_edit.html:207 +#: rhodecode/templates/admin/repos/repo_edit.html:200 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:218 +#: rhodecode/templates/admin/repos/repo_edit.html:211 msgid "Cache" msgstr "Cache" -#: rhodecode/templates/admin/repos/repo_edit.html:222 +#: rhodecode/templates/admin/repos/repo_edit.html:215 msgid "Invalidate repository cache" msgstr "Invalider le cache du dépôt" -#: rhodecode/templates/admin/repos/repo_edit.html:222 +#: rhodecode/templates/admin/repos/repo_edit.html:215 msgid "Confirm to invalidate repository cache" msgstr "Voulez-vous vraiment invalider le cache du dépôt ?" -#: rhodecode/templates/admin/repos/repo_edit.html:225 +#: rhodecode/templates/admin/repos/repo_edit.html:218 msgid "" "Manually invalidate cache for this repository. On first access repository" " will be cached again" @@ -2394,44 +2649,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:230 +#: rhodecode/templates/admin/repos/repo_edit.html:223 msgid "List of cached values" msgstr "Liste des valeurs en cache" -#: rhodecode/templates/admin/repos/repo_edit.html:233 +#: rhodecode/templates/admin/repos/repo_edit.html:226 msgid "Prefix" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:234 +#: rhodecode/templates/admin/repos/repo_edit.html:227 #, fuzzy msgid "Key" msgstr "Clé d’API" -#: rhodecode/templates/admin/repos/repo_edit.html:235 +#: rhodecode/templates/admin/repos/repo_edit.html:228 #: 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 +#: rhodecode/templates/admin/users_groups/users_groups.html:39 msgid "Active" msgstr "Actif" -#: rhodecode/templates/admin/repos/repo_edit.html:250 -#: rhodecode/templates/base/base.html:280 -#: rhodecode/templates/base/base.html:281 +#: rhodecode/templates/admin/repos/repo_edit.html:243 +#: rhodecode/templates/base/base.html:292 +#: rhodecode/templates/base/base.html:293 msgid "Public journal" msgstr "Journal public" -#: rhodecode/templates/admin/repos/repo_edit.html:256 +#: rhodecode/templates/admin/repos/repo_edit.html:249 msgid "Remove from public journal" msgstr "Supprimer du journal public" -#: rhodecode/templates/admin/repos/repo_edit.html:258 +#: rhodecode/templates/admin/repos/repo_edit.html:251 msgid "Add to public journal" msgstr "Ajouter le dépôt au journal public" -#: rhodecode/templates/admin/repos/repo_edit.html:263 +#: rhodecode/templates/admin/repos/repo_edit.html:256 msgid "" "All actions made on this repository will be accessible to everyone in " "public journal" @@ -2439,79 +2694,76 @@ "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:270 +#: rhodecode/templates/admin/repos/repo_edit.html:263 msgid "Locking" msgstr "Verrouillage" -#: rhodecode/templates/admin/repos/repo_edit.html:275 +#: rhodecode/templates/admin/repos/repo_edit.html:268 msgid "Unlock locked repo" msgstr "Déverrouiller le dépôt" -#: rhodecode/templates/admin/repos/repo_edit.html:275 +#: rhodecode/templates/admin/repos/repo_edit.html:268 msgid "Confirm to unlock repository" msgstr "Veuillez confirmer le déverrouillage de ce dépôt." -#: rhodecode/templates/admin/repos/repo_edit.html:278 -msgid "lock repo" +#: rhodecode/templates/admin/repos/repo_edit.html:271 +#, fuzzy +msgid "Lock repo" msgstr "Verrouiller le dépôt" -#: rhodecode/templates/admin/repos/repo_edit.html:278 +#: rhodecode/templates/admin/repos/repo_edit.html:271 msgid "Confirm to lock repository" msgstr "Veuillez confirmer le verrouillage de ce dépôt." -#: rhodecode/templates/admin/repos/repo_edit.html:279 +#: rhodecode/templates/admin/repos/repo_edit.html:272 msgid "Repository is not locked" msgstr "Ce dépôt n’est pas verrouillé." -#: rhodecode/templates/admin/repos/repo_edit.html:284 +#: rhodecode/templates/admin/repos/repo_edit.html:277 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:291 +#: rhodecode/templates/admin/repos/repo_edit.html:284 msgid "Set as fork of" msgstr "Indiquer comme fork" -#: rhodecode/templates/admin/repos/repo_edit.html:296 -msgid "set" +#: rhodecode/templates/admin/repos/repo_edit.html:289 +#, fuzzy +msgid "Set" msgstr "Définir" -#: rhodecode/templates/admin/repos/repo_edit.html:300 +#: rhodecode/templates/admin/repos/repo_edit.html:293 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:306 -#: rhodecode/templates/changeset/changeset_file_comment.html:41 -msgid "Delete" -msgstr "Supprimer" - -#: rhodecode/templates/admin/repos/repo_edit.html:315 +#: rhodecode/templates/admin/repos/repo_edit.html:308 msgid "Remove this repository" msgstr "Supprimer ce dépôt" -#: rhodecode/templates/admin/repos/repo_edit.html:315 +#: rhodecode/templates/admin/repos/repo_edit.html:308 msgid "Confirm to delete this repository" msgstr "Voulez-vous vraiment supprimer ce dépôt ?" -#: rhodecode/templates/admin/repos/repo_edit.html:317 +#: rhodecode/templates/admin/repos/repo_edit.html:310 #, 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 +#: rhodecode/templates/admin/repos/repo_edit.html:311 #, fuzzy msgid "Detach forks" msgstr "Indiquer comme fork" -#: rhodecode/templates/admin/repos/repo_edit.html:319 +#: rhodecode/templates/admin/repos/repo_edit.html:312 #, fuzzy msgid "Delete forks" msgstr "Supprimer" -#: rhodecode/templates/admin/repos/repo_edit.html:322 +#: rhodecode/templates/admin/repos/repo_edit.html:315 #, fuzzy msgid "" "This repository will be renamed in a special way in order to be " @@ -2526,59 +2778,64 @@ "Si vous voulez le supprimer complètement, effectuez la suppression " "manuellement." -#: rhodecode/templates/admin/repos/repo_edit.html:336 +#: rhodecode/templates/admin/repos/repo_edit.html:329 msgid "Extra fields" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:348 +#: rhodecode/templates/admin/repos/repo_edit.html:341 #, 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 +#: rhodecode/templates/admin/repos/repo_edit.html:355 #, fuzzy msgid "New field key" msgstr "Ajouter un fichier" -#: rhodecode/templates/admin/repos/repo_edit.html:370 +#: rhodecode/templates/admin/repos/repo_edit.html:363 msgid "New field label" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:373 +#: rhodecode/templates/admin/repos/repo_edit.html:366 msgid "Enter short label" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:379 +#: rhodecode/templates/admin/repos/repo_edit.html:372 #, fuzzy msgid "New field description" msgstr "Description" -#: rhodecode/templates/admin/repos/repo_edit.html:382 +#: rhodecode/templates/admin/repos/repo_edit.html:375 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 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:3 msgid "none" msgstr "Aucune" #: rhodecode/templates/admin/repos/repo_edit_perms.html:4 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:4 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:4 msgid "read" msgstr "Lecture" #: rhodecode/templates/admin/repos/repo_edit_perms.html:5 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:5 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:5 msgid "write" msgstr "Écriture" #: rhodecode/templates/admin/repos/repo_edit_perms.html:6 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:6 msgid "admin" msgstr "Administration" #: rhodecode/templates/admin/repos/repo_edit_perms.html:7 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:7 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:7 msgid "member" msgstr "Membre" @@ -2590,6 +2847,8 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:28 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:20 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:35 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:20 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:35 msgid "default" msgstr "[Par défaut]" @@ -2597,34 +2856,37 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:58 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:25 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:55 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:25 +#: rhodecode/templates/admin/users_groups/user_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:80 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:81 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: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: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:86 +#: rhodecode/templates/admin/repos/repos.html:86 +#: rhodecode/templates/admin/users/user_edit_my_account.html:185 +#: rhodecode/templates/admin/users/users.html:109 +#: rhodecode/templates/bookmarks/bookmarks.html:76 +#: rhodecode/templates/branches/branches.html:75 +#: rhodecode/templates/journal/journal.html:206 +#: rhodecode/templates/journal/journal.html:296 +#: rhodecode/templates/tags/tags.html:76 +msgid "No records found." +msgstr "Aucun élément n’a été trouvé." + +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 msgid "apply to children" msgstr "Appliquer aux enfants" -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:88 #, fuzzy msgid "" "Set or revoke permission to all children of that group, including non-" @@ -2654,7 +2916,7 @@ #: 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 +#: rhodecode/templates/base/base.html:75 rhodecode/templates/base/base.html:91 #, fuzzy msgid "Repository groups" msgstr "Groupe de dépôt" @@ -2688,7 +2950,7 @@ msgid "Add child group" msgstr "Ajouter un nouveau groupe" -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:76 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:68 msgid "" "Enable lock-by-pulling on group. This option will be applied to all other" " groups and repositories inside" @@ -2706,16 +2968,22 @@ msgstr "Nombre de sous-dépôts" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:64 +#: rhodecode/templates/admin/users_groups/users_groups.html:48 +#: rhodecode/templates/changeset/changeset_file_comment.html:73 +#: rhodecode/templates/changeset/changeset_file_comment.html:171 #, fuzzy msgid "Edit" msgstr "éditer" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:65 +#: rhodecode/templates/admin/users_groups/users_groups.html:49 #: rhodecode/templates/base/perms_summary.html:29 -#: rhodecode/templates/base/perms_summary.html:48 -#: rhodecode/templates/base/perms_summary.html:50 +#: rhodecode/templates/base/perms_summary.html:60 +#: rhodecode/templates/base/perms_summary.html:62 #: rhodecode/templates/data_table/_dt_elements.html:116 #: rhodecode/templates/data_table/_dt_elements.html:117 +#: rhodecode/templates/data_table/_dt_elements.html:130 +#: rhodecode/templates/data_table/_dt_elements.html:131 msgid "edit" msgstr "éditer" @@ -2823,8 +3091,8 @@ msgstr "" #: rhodecode/templates/admin/settings/settings.html:114 -#: rhodecode/templates/admin/settings/settings.html:186 -#: rhodecode/templates/admin/settings/settings.html:277 +#: rhodecode/templates/admin/settings/settings.html:195 +#: rhodecode/templates/admin/settings/settings.html:287 msgid "Save settings" msgstr "Enregister les options" @@ -2838,48 +3106,72 @@ msgstr "Activer" #: rhodecode/templates/admin/settings/settings.html:134 -msgid "Use lightweight dashboard" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:140 #, fuzzy msgid "Use repository extra fields" msgstr "Dépôts" -#: rhodecode/templates/admin/settings/settings.html:147 +#: rhodecode/templates/admin/settings/settings.html:136 +msgid "Allows storing additional customized fields per repository." +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:139 +msgid "Show RhodeCode version" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:141 +msgid "Shows or hides displayed version of RhodeCode in the footer" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:146 +#, fuzzy +msgid "Dashboard items" +msgstr "Tableau de bord" + +#: rhodecode/templates/admin/settings/settings.html:150 +msgid "" +"Number of items displayed in lightweight dashboard before pagination is " +"shown." +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:155 msgid "Icons" msgstr "Icônes" -#: rhodecode/templates/admin/settings/settings.html:152 +#: rhodecode/templates/admin/settings/settings.html:160 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:156 +#: rhodecode/templates/admin/settings/settings.html:164 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:163 +#: rhodecode/templates/admin/settings/settings.html:166 +#, fuzzy +msgid "Show public/private icons next to repositories names" +msgstr "Afficher l’icône de dépôt public sur les dépôts" + +#: rhodecode/templates/admin/settings/settings.html:172 msgid "Meta-Tagging" msgstr "Meta-Tagging" -#: rhodecode/templates/admin/settings/settings.html:168 +#: rhodecode/templates/admin/settings/settings.html:177 msgid "Stylify recognised metatags:" msgstr "Styliser les méta-tags reconnus :" -#: rhodecode/templates/admin/settings/settings.html:195 +#: rhodecode/templates/admin/settings/settings.html:204 msgid "VCS settings" msgstr "Réglages de gestionnaire de version" -#: rhodecode/templates/admin/settings/settings.html:204 +#: rhodecode/templates/admin/settings/settings.html:213 msgid "Web" msgstr "Web" -#: rhodecode/templates/admin/settings/settings.html:209 +#: rhodecode/templates/admin/settings/settings.html:218 #, fuzzy msgid "Require SSL for vcs operations" msgstr "SSL requis pour les opérations de push/pull" -#: rhodecode/templates/admin/settings/settings.html:211 +#: rhodecode/templates/admin/settings/settings.html:220 msgid "" "RhodeCode will require SSL for pushing or pulling. If SSL is missing it " "will return HTTP Error 406: Not Acceptable" @@ -2887,46 +3179,46 @@ "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:217 +#: rhodecode/templates/admin/settings/settings.html:226 msgid "Hooks" msgstr "Hooks" -#: rhodecode/templates/admin/settings/settings.html:222 +#: rhodecode/templates/admin/settings/settings.html:231 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:226 +#: rhodecode/templates/admin/settings/settings.html:235 msgid "Show repository size after push" msgstr "Afficher la taille du dépôt après un push" -#: rhodecode/templates/admin/settings/settings.html:230 +#: rhodecode/templates/admin/settings/settings.html:239 msgid "Log user push commands" msgstr "Journaliser les commandes de push" -#: rhodecode/templates/admin/settings/settings.html:234 +#: rhodecode/templates/admin/settings/settings.html:243 msgid "Log user pull commands" msgstr "Journaliser les commandes de pull" -#: rhodecode/templates/admin/settings/settings.html:238 +#: rhodecode/templates/admin/settings/settings.html:247 #, fuzzy msgid "Advanced setup" msgstr "Avancé" -#: rhodecode/templates/admin/settings/settings.html:243 +#: rhodecode/templates/admin/settings/settings.html:252 msgid "Mercurial Extensions" msgstr "Extensions Mercurial" -#: rhodecode/templates/admin/settings/settings.html:248 +#: rhodecode/templates/admin/settings/settings.html:257 #, fuzzy msgid "Enable largefiles extension" msgstr "Extensions largefiles" -#: rhodecode/templates/admin/settings/settings.html:252 +#: rhodecode/templates/admin/settings/settings.html:261 #, fuzzy msgid "Enable hgsubversion extension" msgstr "Extensions hgsubversion" -#: rhodecode/templates/admin/settings/settings.html:254 +#: rhodecode/templates/admin/settings/settings.html:263 #, fuzzy msgid "" "Requires hgsubversion library installed. Allows cloning from svn remote " @@ -2935,27 +3227,23 @@ "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:264 +#: rhodecode/templates/admin/settings/settings.html:274 msgid "Repositories location" msgstr "Emplacement des dépôts" -#: rhodecode/templates/admin/settings/settings.html:269 +#: rhodecode/templates/admin/settings/settings.html:279 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." +"Click to unlock. You must restart RhodeCode in order to make this setting" +" take effect." msgstr "" -"Ce réglage ne devrait pas être modifié en temps normal. Si vous devez " -"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:270 -#: rhodecode/templates/base/base.html:131 + +#: rhodecode/templates/admin/settings/settings.html:280 +#: rhodecode/templates/base/base.html:143 #, fuzzy msgid "Unlock" msgstr "Déverrouiller" -#: rhodecode/templates/admin/settings/settings.html:272 +#: rhodecode/templates/admin/settings/settings.html:282 msgid "" "Location where repositories are stored. After changing this value a " "restart, and rescan is required" @@ -2963,24 +3251,24 @@ "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:292 +#: rhodecode/templates/admin/settings/settings.html:303 msgid "Test Email" msgstr "E-mail de test" -#: rhodecode/templates/admin/settings/settings.html:300 +#: rhodecode/templates/admin/settings/settings.html:311 msgid "Email to" msgstr "Envoyer l’e-mail à" -#: rhodecode/templates/admin/settings/settings.html:308 +#: rhodecode/templates/admin/settings/settings.html:319 msgid "Send" msgstr "Envoyer" -#: rhodecode/templates/admin/settings/settings.html:314 +#: rhodecode/templates/admin/settings/settings.html:325 msgid "System Info and Packages" msgstr "Information système et paquets" -#: rhodecode/templates/admin/settings/settings.html:317 -#: rhodecode/templates/changelog/changelog.html:42 +#: rhodecode/templates/admin/settings/settings.html:328 +#: rhodecode/templates/changelog/changelog.html:51 msgid "Show" msgstr "Afficher" @@ -2990,7 +3278,7 @@ #: rhodecode/templates/admin/users/user_add.html:10 #: rhodecode/templates/admin/users/user_edit.html:11 -#: rhodecode/templates/base/base.html:71 +#: rhodecode/templates/base/base.html:76 msgid "Users" msgstr "Utilisateurs" @@ -3048,46 +3336,21 @@ msgid "New password confirmation" msgstr "Confirmation du nouveau mot de passe" -#: 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:163 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:113 -#, python-format -msgid "" -"Select to inherit permissions from %s settings. With this selected below " -"options does not have any action" -msgstr "" -"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: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: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:200 msgid "Email addresses" msgstr "Adresses e-mail" -#: rhodecode/templates/admin/users/user_edit.html:213 +#: rhodecode/templates/admin/users/user_edit.html:176 #, 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:227 +#: rhodecode/templates/admin/users/user_edit.html:190 msgid "New email address" msgstr "Nouvelle adrese" #: rhodecode/templates/admin/users/user_edit_my_account.html:5 -#: rhodecode/templates/base/base.html:242 +#: rhodecode/templates/base/base.html:254 msgid "My account" msgstr "Mon compte" @@ -3125,7 +3388,7 @@ #: 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_data.html:11 #: rhodecode/templates/pullrequests/pullrequest_show.html:27 #: rhodecode/templates/pullrequests/pullrequest_show.html:42 msgid "Closed" @@ -3145,7 +3408,7 @@ msgstr "Je participe à" #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:42 -#: rhodecode/templates/pullrequests/pullrequest_data.html:11 +#: rhodecode/templates/pullrequests/pullrequest_data.html:8 #, python-format msgid "Pull request #%s opened by %s on %s" msgstr "Requête de pull nº%s ouverte par %s le %s" @@ -3180,13 +3443,13 @@ #: rhodecode/templates/admin/users_groups/users_group_add.html:10 #: rhodecode/templates/admin/users_groups/users_groups.html:11 -#: rhodecode/templates/base/base.html:72 +#: rhodecode/templates/base/base.html:77 rhodecode/templates/base/base.html:94 #, fuzzy msgid "User groups" msgstr "Groupes d’utilisateurs" #: rhodecode/templates/admin/users_groups/users_group_add.html:12 -#: rhodecode/templates/admin/users_groups/users_groups.html:25 +#: rhodecode/templates/admin/users_groups/users_groups.html:26 #, fuzzy msgid "Add new user group" msgstr "Ajouter un nouveau groupe" @@ -3202,7 +3465,7 @@ msgstr "Groupes d’utilisateurs" #: rhodecode/templates/admin/users_groups/users_group_edit.html:50 -#: rhodecode/templates/admin/users_groups/users_groups.html:35 +#: rhodecode/templates/admin/users_groups/users_groups.html:38 msgid "Members" msgstr "Membres" @@ -3223,47 +3486,57 @@ msgid "Add all elements" msgstr "Tout ajouter" -#: 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:167 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:109 #, fuzzy msgid "No members yet" msgstr "Membres" +#: rhodecode/templates/admin/users_groups/users_group_edit.html:117 +#, fuzzy +msgid "Global Permissions" +msgstr "Copier les permissions" + #: rhodecode/templates/admin/users_groups/users_groups.html:5 #, fuzzy msgid "User groups administration" msgstr "Gestion des groupes d’utilisateurs" -#: rhodecode/templates/admin/users_groups/users_groups.html:47 +#: rhodecode/templates/admin/users_groups/users_groups.html:55 #, fuzzy, python-format msgid "Confirm to delete this user group: %s" msgstr "Voulez-vous vraiment supprimer le groupe d‘utilisateurs « %s » ?" +#: rhodecode/templates/admin/users_groups/users_groups.html:62 +#, fuzzy +msgid "There are no user groups yet" +msgstr "Aucun groupe de dépôts n’a été créé pour le moment." + #: rhodecode/templates/base/base.html:42 -msgid "Submit a bug" -msgstr "Signaler un bogue" - -#: rhodecode/templates/base/base.html:108 +#, python-format +msgid "Server instance: %s" +msgstr "" + +#: rhodecode/templates/base/base.html:52 +msgid "Report a bug" +msgstr "" + +#: rhodecode/templates/base/base.html:121 #: 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:109 -#: rhodecode/templates/changelog/changelog.html:11 +#: rhodecode/templates/base/base.html:122 +#: rhodecode/templates/changelog/changelog.html:15 #: 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:110 +#: rhodecode/templates/base/base.html:123 #: rhodecode/templates/data_table/_dt_elements.html:25 #: rhodecode/templates/data_table/_dt_elements.html:27 #: rhodecode/templates/data_table/_dt_elements.html:29 @@ -3271,52 +3544,48 @@ msgid "Files" msgstr "Fichiers" -#: rhodecode/templates/base/base.html:112 +#: rhodecode/templates/base/base.html:125 #, fuzzy msgid "Switch To" msgstr "Aller" -#: rhodecode/templates/base/base.html:114 -#: rhodecode/templates/base/base.html:267 +#: rhodecode/templates/base/base.html:127 +#: rhodecode/templates/base/base.html:279 msgid "loading..." msgstr "Chargement…" -#: rhodecode/templates/base/base.html:118 +#: rhodecode/templates/base/base.html:131 msgid "Options" msgstr "Options" -#: rhodecode/templates/base/base.html:124 +#: rhodecode/templates/base/base.html:137 #: 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/base/base.html:139 +#: rhodecode/templates/base/base.html:312 #: rhodecode/templates/search/search.html:14 #: rhodecode/templates/search/search.html:54 msgid "Search" msgstr "Rechercher" -#: rhodecode/templates/base/base.html:133 +#: rhodecode/templates/base/base.html:145 #, fuzzy msgid "Lock" msgstr "Verrouiller" -#: rhodecode/templates/base/base.html:141 +#: rhodecode/templates/base/base.html:153 #, fuzzy msgid "Follow" msgstr "followers" -#: rhodecode/templates/base/base.html:142 +#: rhodecode/templates/base/base.html:154 #, fuzzy msgid "Unfollow" msgstr "followers" -#: rhodecode/templates/base/base.html:145 +#: rhodecode/templates/base/base.html:157 #: rhodecode/templates/data_table/_dt_elements.html:33 #: rhodecode/templates/data_table/_dt_elements.html:35 #: rhodecode/templates/data_table/_dt_elements.html:37 @@ -3325,66 +3594,122 @@ msgid "Fork" msgstr "Fork" -#: rhodecode/templates/base/base.html:147 +#: rhodecode/templates/base/base.html:159 #, fuzzy msgid "Create Pull Request" msgstr "Nouvelle requête de pull" -#: rhodecode/templates/base/base.html:153 +#: rhodecode/templates/base/base.html:165 #, fuzzy msgid "Show Pull Requests" msgstr "Nouvelle requête de pull" -#: rhodecode/templates/base/base.html:153 +#: rhodecode/templates/base/base.html:165 #, fuzzy msgid "Pull Requests" msgstr "Requêtes de pull" -#: rhodecode/templates/base/base.html:190 +#: rhodecode/templates/base/base.html:202 #, fuzzy msgid "Not logged in" msgstr "Dernière connexion" -#: rhodecode/templates/base/base.html:197 +#: rhodecode/templates/base/base.html:209 msgid "Login to your account" msgstr "Connexion à votre compte" -#: rhodecode/templates/base/base.html:220 +#: rhodecode/templates/base/base.html:232 msgid "Forgot password ?" msgstr "Mot de passe oublié ?" -#: rhodecode/templates/base/base.html:243 +#: rhodecode/templates/base/base.html:255 msgid "Log Out" msgstr "Se déconnecter" -#: rhodecode/templates/base/base.html:262 +#: rhodecode/templates/base/base.html:274 msgid "Switch repository" msgstr "Aller au dépôt" -#: rhodecode/templates/base/base.html:274 +#: rhodecode/templates/base/base.html:286 msgid "Show recent activity" msgstr "" -#: rhodecode/templates/base/base.html:275 +#: rhodecode/templates/base/base.html:287 #: rhodecode/templates/journal/journal.html:4 msgid "Journal" msgstr "Historique" -#: rhodecode/templates/base/base.html:286 +#: rhodecode/templates/base/base.html:298 +msgid "Show public gists" +msgstr "" + +#: rhodecode/templates/base/base.html:303 +msgid "All public gists" +msgstr "" + +#: rhodecode/templates/base/base.html:305 +msgid "My public gists" +msgstr "" + +#: rhodecode/templates/base/base.html:306 +msgid "My private gists" +msgstr "" + +#: rhodecode/templates/base/base.html:311 #, fuzzy msgid "Search in repositories" msgstr "Rechercher dans tous les dépôts" -#: rhodecode/templates/base/perms_summary.html:8 +#: rhodecode/templates/base/default_perms_box.html:14 +msgid "Inherit default permissions" +msgstr "Utiliser les permissions par défaut" + +#: rhodecode/templates/base/default_perms_box.html:18 +#, fuzzy, python-format +msgid "" +"Select to inherit permissions from %s settings. With this selected below " +"options does not apply." +msgstr "" +"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/base/default_perms_box.html:26 +msgid "Create repositories" +msgstr "Création de dépôts" + +#: rhodecode/templates/base/default_perms_box.html:30 +msgid "Select this option to allow repository creation for this user" +msgstr "" + +#: rhodecode/templates/base/default_perms_box.html:35 +#, fuzzy +msgid "Create user groups" +msgstr "[a créé] le groupe d’utilisateurs" + +#: rhodecode/templates/base/default_perms_box.html:39 +msgid "Select this option to allow user group creation for this user" +msgstr "" + +#: rhodecode/templates/base/default_perms_box.html:44 +msgid "Fork repositories" +msgstr "Forker les dépôts" + +#: rhodecode/templates/base/default_perms_box.html:48 +msgid "Select this option to allow repository forking for this user" +msgstr "" + +#: rhodecode/templates/base/perms_summary.html:11 #, fuzzy msgid "No permissions defined yet" msgstr "Copier les permissions" -#: rhodecode/templates/base/perms_summary.html:15 +#: rhodecode/templates/base/perms_summary.html:19 +#: rhodecode/templates/base/perms_summary.html:38 msgid "Permission" msgstr "Permission" -#: rhodecode/templates/base/perms_summary.html:16 +#: rhodecode/templates/base/perms_summary.html:20 +#: rhodecode/templates/base/perms_summary.html:39 msgid "Edit Permission" msgstr "Éditer" @@ -3394,7 +3719,7 @@ msgstr "Nouveau commentaire" #: rhodecode/templates/base/root.html:44 -#: rhodecode/templates/data_table/_dt_elements.html:140 +#: rhodecode/templates/data_table/_dt_elements.html:147 msgid "Stop following this repository" msgstr "Arrêter de suivre ce dépôt" @@ -3411,7 +3736,7 @@ msgstr "Membres" #: rhodecode/templates/base/root.html:48 -#: rhodecode/templates/pullrequests/pullrequest.html:181 +#: rhodecode/templates/pullrequests/pullrequest.html:203 #, fuzzy msgid "Loading ..." msgstr "Chargement…" @@ -3427,7 +3752,7 @@ msgstr "Aucun fichier ne correspond" #: rhodecode/templates/base/root.html:51 -#: rhodecode/templates/changelog/changelog.html:36 +#: rhodecode/templates/changelog/changelog.html:45 msgid "Open new pull request" msgstr "Nouvelle requête de pull" @@ -3461,31 +3786,50 @@ msgid "Expand diff" msgstr "Diff brut" +#: rhodecode/templates/base/root.html:58 +#, fuzzy +msgid "Failed to remoke permission" +msgstr "Échec de suppression de l’utilisateur" + #: rhodecode/templates/bookmarks/bookmarks.html:5 #, python-format msgid "%s Bookmarks" msgstr "Signets de %s" -#: rhodecode/templates/bookmarks/bookmarks.html:37 +#: rhodecode/templates/bookmarks/bookmarks.html:26 +#, fuzzy +msgid "Compare bookmarks" +msgstr "Comparer le fork" + +#: rhodecode/templates/bookmarks/bookmarks.html:51 #: rhodecode/templates/bookmarks/bookmarks_data.html:8 #: rhodecode/templates/branches/branches.html:50 #: rhodecode/templates/branches/branches_data.html:8 -#: rhodecode/templates/shortlog/shortlog_data.html:8 +#: rhodecode/templates/changelog/changelog_summary_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:38 +#: rhodecode/templates/bookmarks/bookmarks.html:52 #: rhodecode/templates/bookmarks/bookmarks_data.html:9 #: rhodecode/templates/branches/branches.html:51 #: rhodecode/templates/branches/branches_data.html:9 -#: rhodecode/templates/shortlog/shortlog_data.html:5 +#: rhodecode/templates/changelog/changelog_summary_data.html:5 #: rhodecode/templates/tags/tags.html:52 #: rhodecode/templates/tags/tags_data.html:9 msgid "Revision" msgstr "Révision" +#: rhodecode/templates/bookmarks/bookmarks.html:54 +#: rhodecode/templates/bookmarks/bookmarks_data.html:10 +#: rhodecode/templates/branches/branches.html:53 +#: rhodecode/templates/branches/branches_data.html:10 +#: rhodecode/templates/tags/tags.html:54 +#: rhodecode/templates/tags/tags_data.html:10 +msgid "Compare" +msgstr "Comparer" + #: rhodecode/templates/branches/branches.html:5 #, python-format msgid "%s Branches" @@ -3495,68 +3839,71 @@ msgid "Compare branches" msgstr "Comparer les branches" -#: rhodecode/templates/branches/branches.html:53 -#: rhodecode/templates/branches/branches_data.html:10 -#: rhodecode/templates/tags/tags.html:54 -#: rhodecode/templates/tags/tags_data.html:10 -msgid "Compare" -msgstr "Comparer" - #: rhodecode/templates/changelog/changelog.html:6 #, python-format msgid "%s Changelog" msgstr "Historique de %s" -#: rhodecode/templates/changelog/changelog.html:11 +#: rhodecode/templates/changelog/changelog.html:19 #, 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:30 +#: rhodecode/templates/changelog/changelog.html:39 #, fuzzy msgid "Clear selection" msgstr "Réglages de recherche" -#: rhodecode/templates/changelog/changelog.html:33 +#: rhodecode/templates/changelog/changelog.html:42 #: rhodecode/templates/forks/forks_data.html:19 #, fuzzy, python-format msgid "Compare fork with %s" msgstr "Comparer le fork avec %s" -#: rhodecode/templates/changelog/changelog.html:33 +#: rhodecode/templates/changelog/changelog.html:42 #, fuzzy msgid "Compare fork with parent" msgstr "Comparer le fork avec %s" -#: rhodecode/templates/changelog/changelog.html:76 -#: rhodecode/templates/summary/summary.html:404 +#: rhodecode/templates/changelog/changelog.html:78 +#: rhodecode/templates/changelog/changelog_summary_data.html:28 +#, 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:102 +#: rhodecode/templates/summary/summary.html:403 #, fuzzy msgid "Show more" msgstr "montrer plus" -#: rhodecode/templates/changelog/changelog.html:89 +#: rhodecode/templates/changelog/changelog.html:115 +#: rhodecode/templates/changelog/changelog_summary_data.html:50 +#: rhodecode/templates/changeset/changeset.html:107 #: 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/changelog/changelog.html:121 +#: rhodecode/templates/changelog/changelog_summary_data.html:56 +#: rhodecode/templates/changeset/changeset.html:113 #: 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:80 +#: rhodecode/templates/changelog/changelog.html:126 +#: rhodecode/templates/changelog/changelog_summary_data.html:61 +#: rhodecode/templates/changeset/changeset.html:117 +#: rhodecode/templates/changeset/changeset_range.html:96 #, fuzzy, python-format msgid "Branch %s" msgstr "Branches %s" -#: rhodecode/templates/changelog/changelog.html:258 +#: rhodecode/templates/changelog/changelog.html:286 msgid "There are no changes yet" msgstr "Il n’y a aucun changement pour le moment" @@ -3588,6 +3935,40 @@ msgid "Affected %s files" msgstr "%s fichiers affectés" +#: rhodecode/templates/changelog/changelog_summary_data.html:6 +#: rhodecode/templates/files/files_add.html:75 +#: rhodecode/templates/files/files_edit.html:61 +#, fuzzy +msgid "Commit message" +msgstr "Message de commit" + +#: rhodecode/templates/changelog/changelog_summary_data.html:7 +#, fuzzy +msgid "Age" +msgstr "Âge" + +#: rhodecode/templates/changelog/changelog_summary_data.html:9 +msgid "Refs" +msgstr "" + +#: rhodecode/templates/changelog/changelog_summary_data.html:86 +msgid "Add or upload files directly via RhodeCode" +msgstr "Ajouter ou téléverser des fichiers directement via RhodeCode…" + +#: rhodecode/templates/changelog/changelog_summary_data.html:89 +#: rhodecode/templates/files/files_add.html:38 +#: rhodecode/templates/files/files_browser.html:31 +msgid "Add new file" +msgstr "Ajouter un nouveau fichier" + +#: rhodecode/templates/changelog/changelog_summary_data.html:95 +msgid "Push new repo" +msgstr "Pusher le nouveau dépôt" + +#: rhodecode/templates/changelog/changelog_summary_data.html:103 +msgid "Existing repository?" +msgstr "Le dépôt existe déjà ?" + #: rhodecode/templates/changeset/changeset.html:6 #, python-format msgid "%s Changeset" @@ -3609,7 +3990,7 @@ msgstr "Statut du changeset" #: rhodecode/templates/changeset/changeset.html:67 -#: rhodecode/templates/changeset/diff_block.html:23 +#: rhodecode/templates/changeset/diff_block.html:22 #, fuzzy msgid "Raw diff" msgstr "Diff brut" @@ -3620,13 +4001,13 @@ msgstr "Diff brut" #: rhodecode/templates/changeset/changeset.html:69 -#: rhodecode/templates/changeset/diff_block.html:24 +#: rhodecode/templates/changeset/diff_block.html:23 #, fuzzy msgid "Download diff" msgstr "Télécharger le diff" #: rhodecode/templates/changeset/changeset.html:73 -#: rhodecode/templates/changeset/changeset_file_comment.html:97 +#: rhodecode/templates/changeset/changeset_file_comment.html:103 #, python-format msgid "%d comment" msgid_plural "%d comments" @@ -3634,7 +4015,7 @@ msgstr[1] "%d commentaires" #: rhodecode/templates/changeset/changeset.html:73 -#: rhodecode/templates/changeset/changeset_file_comment.html:97 +#: rhodecode/templates/changeset/changeset_file_comment.html:103 #, python-format msgid "(%d inline)" msgid_plural "(%d inline)" @@ -3642,11 +4023,11 @@ msgstr[1] "(et %d en ligne)" #: rhodecode/templates/changeset/changeset.html:103 -#: rhodecode/templates/changeset/changeset_range.html:77 +#: rhodecode/templates/changeset/changeset_range.html:82 msgid "merge" msgstr "Fusion" -#: rhodecode/templates/changeset/changeset.html:119 +#: rhodecode/templates/changeset/changeset.html:126 #: rhodecode/templates/compare/compare_diff.html:40 #: rhodecode/templates/pullrequests/pullrequest_show.html:113 #, fuzzy, python-format @@ -3655,7 +4036,7 @@ msgstr[0] "%s fichié modifié" msgstr[1] "%s fichié modifié" -#: rhodecode/templates/changeset/changeset.html:121 +#: rhodecode/templates/changeset/changeset.html:128 #: rhodecode/templates/compare/compare_diff.html:42 #: rhodecode/templates/pullrequests/pullrequest_show.html:115 #, fuzzy, python-format @@ -3664,15 +4045,15 @@ 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/changeset/changeset.html:141 +#: rhodecode/templates/changeset/changeset.html:153 #: 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/changeset/changeset.html:141 +#: rhodecode/templates/changeset/changeset.html:153 #: rhodecode/templates/compare/compare_diff.html:58 #: rhodecode/templates/compare/compare_diff.html:69 #: rhodecode/templates/pullrequests/pullrequest_show.html:131 @@ -3691,57 +4072,71 @@ msgid "Comment on pull request #%s" msgstr "[a commenté] la requête de pull pour %s" -#: rhodecode/templates/changeset/changeset_file_comment.html:57 +#: rhodecode/templates/changeset/changeset_file_comment.html:55 msgid "Submitting..." msgstr "Envoi…" -#: rhodecode/templates/changeset/changeset_file_comment.html:60 +#: rhodecode/templates/changeset/changeset_file_comment.html:58 msgid "Commenting on line {1}." msgstr "Commentaire sur la ligne {1}." -#: rhodecode/templates/changeset/changeset_file_comment.html:61 -#: rhodecode/templates/changeset/changeset_file_comment.html:139 +#: rhodecode/templates/changeset/changeset_file_comment.html:59 +#: rhodecode/templates/changeset/changeset_file_comment.html:145 #, python-format msgid "Comments parsed using %s syntax with %s support." msgstr "" "Les commentaires sont analysés avec la syntaxe %s, avec le support de la " "commande %s." -#: rhodecode/templates/changeset/changeset_file_comment.html:63 -#: rhodecode/templates/changeset/changeset_file_comment.html:141 +#: rhodecode/templates/changeset/changeset_file_comment.html:61 +#: rhodecode/templates/changeset/changeset_file_comment.html:147 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:161 +#: rhodecode/templates/changeset/changeset_file_comment.html:65 +#: rhodecode/templates/changeset/changeset_file_comment.html:152 +#, fuzzy +msgid "Preview" +msgstr "%d relecteur" + +#: rhodecode/templates/changeset/changeset_file_comment.html:72 +#: rhodecode/templates/changeset/changeset_file_comment.html:170 +#, fuzzy +msgid "Comment preview" +msgstr "vue de comparaison" + +#: rhodecode/templates/changeset/changeset_file_comment.html:80 +#: rhodecode/templates/changeset/changeset_file_comment.html:177 +#: rhodecode/templates/email_templates/changeset_comment.html:16 +#: rhodecode/templates/email_templates/pull_request_comment.html:16 msgid "Comment" msgstr "Commentaire" -#: rhodecode/templates/changeset/changeset_file_comment.html:75 +#: rhodecode/templates/changeset/changeset_file_comment.html:81 #, fuzzy msgid "Cancel" msgstr "Modifiés" -#: rhodecode/templates/changeset/changeset_file_comment.html:82 +#: rhodecode/templates/changeset/changeset_file_comment.html:88 msgid "You need to be logged in to comment." msgstr "Vous devez être connecté pour poster des commentaires." -#: rhodecode/templates/changeset/changeset_file_comment.html:82 +#: rhodecode/templates/changeset/changeset_file_comment.html:88 msgid "Login now" msgstr "Se connecter maintenant" -#: rhodecode/templates/changeset/changeset_file_comment.html:86 +#: rhodecode/templates/changeset/changeset_file_comment.html:92 msgid "Hide" msgstr "Masquer" -#: rhodecode/templates/changeset/changeset_file_comment.html:143 +#: rhodecode/templates/changeset/changeset_file_comment.html:149 #, fuzzy msgid "Change status" msgstr "Modifier le statut" -#: rhodecode/templates/changeset/changeset_file_comment.html:163 +#: rhodecode/templates/changeset/changeset_file_comment.html:179 msgid "Comment and close" msgstr "Commenter et fermer" @@ -3754,20 +4149,20 @@ msgid "Files affected" msgstr "Fichiers affectés" -#: rhodecode/templates/changeset/diff_block.html:22 +#: rhodecode/templates/changeset/diff_block.html:21 msgid "Show full diff for this file" msgstr "" -#: rhodecode/templates/changeset/diff_block.html:30 +#: rhodecode/templates/changeset/diff_block.html:29 #, fuzzy msgid "Show inline comments" msgstr "Afficher les commentaires" -#: rhodecode/templates/changeset/diff_block.html:55 +#: rhodecode/templates/changeset/diff_block.html:53 msgid "Show file at latest version in this repo" msgstr "" -#: rhodecode/templates/changeset/diff_block.html:56 +#: rhodecode/templates/changeset/diff_block.html:54 msgid "Show file at initial version in this repo" msgstr "" @@ -3845,29 +4240,25 @@ msgid "Confirm to delete this repository: %s" msgstr "Voulez-vous vraiment supprimer le dépôt %s ?" -#: rhodecode/templates/data_table/_dt_elements.html:131 +#: rhodecode/templates/data_table/_dt_elements.html:137 #, python-format msgid "Confirm to delete this user: %s" msgstr "Voulez-vous vraiment supprimer l’utilisateur « %s » ?" -#: rhodecode/templates/email_templates/changeset_comment.html:9 -#: rhodecode/templates/email_templates/pull_request_comment.html:15 -#, fuzzy -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:4 +#: rhodecode/templates/email_templates/pull_request.html:4 +#: rhodecode/templates/email_templates/pull_request_comment.html:4 +#, fuzzy +msgid "URL" +msgstr "Journal" + +#: rhodecode/templates/email_templates/changeset_comment.html:6 +#, fuzzy, python-format +msgid "%s commented on a %s changeset." +msgstr "%s a posté un commentaire sur le commit %s" #: 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" +msgid "The changeset status was changed to" msgstr "" #: rhodecode/templates/email_templates/main.html:8 @@ -3888,51 +4279,40 @@ msgid "You can generate it by clicking following URL" msgstr "" -#: rhodecode/templates/email_templates/password_reset.html:11 -msgid "If you did not request new password please ignore this email." +#: rhodecode/templates/email_templates/password_reset.html:10 +msgid "Please ignore this email if you did not request a new password ." msgstr "" -#: rhodecode/templates/email_templates/pull_request.html:4 -#, python-format -msgid "" -"User %s opened pull request for repository %s and wants you to review " -"changes." -msgstr "" - -#: rhodecode/templates/email_templates/pull_request.html:5 -#, fuzzy -msgid "View this pull request here" -msgstr "Ajouter un relecteur à cette requête de pull." - #: rhodecode/templates/email_templates/pull_request.html:6 -#, fuzzy -msgid "title" +#, python-format +msgid "" +"%s opened a pull request for repository %s and wants you to review " +"changes." +msgstr "" + +#: rhodecode/templates/email_templates/pull_request.html:8 +#: rhodecode/templates/pullrequests/pullrequest.html:34 +#: rhodecode/templates/pullrequests/pullrequest_data.html:14 +#: rhodecode/templates/pullrequests/pullrequest_show.html:25 +msgid "Title" msgstr "Titre" -#: rhodecode/templates/email_templates/pull_request.html:7 -msgid "description" -msgstr "Description" - -#: rhodecode/templates/email_templates/pull_request.html:12 -msgid "revisions for reviewing" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.html:3 +#: rhodecode/templates/email_templates/pull_request_comment.html:6 #, fuzzy, python-format -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 "Closing pull request with status" +msgid "%s commented on pull request \"%s\"" +msgstr "%s [a commenté] la requête de pull pour %s" + +#: rhodecode/templates/email_templates/pull_request_comment.html:10 +#, fuzzy +msgid "Pull request was closed with status" msgstr "Statut de la requête de pull" -#: rhodecode/templates/email_templates/registration.html:4 -#, fuzzy -msgid "A new user have registered in RhodeCode" -msgstr "Vous vous êtes inscrits avec succès à RhodeCode" - -#: rhodecode/templates/email_templates/registration.html:9 +#: rhodecode/templates/email_templates/pull_request_comment.html:12 +#, fuzzy +msgid "Pull request changed status" +msgstr "Statut de la requête de pull" + +#: rhodecode/templates/email_templates/registration.html:6 msgid "View this user here" msgstr "" @@ -3959,7 +4339,6 @@ #: 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" @@ -3974,12 +4353,6 @@ msgid "Add file" msgstr "Ajouter un fichier" -#: 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:43 msgid "File Name" msgstr "Nom de fichier" @@ -4008,13 +4381,6 @@ msgid "use / to separate directories" msgstr "Utilisez / pour séparer les répertoires" -#: rhodecode/templates/files/files_add.html:75 -#: rhodecode/templates/files/files_edit.html:61 -#: rhodecode/templates/shortlog/shortlog_data.html:6 -#, fuzzy -msgid "Commit message" -msgstr "Message de commit" - #: rhodecode/templates/files/files_add.html:79 #: rhodecode/templates/files/files_edit.html:65 msgid "Commit changes" @@ -4085,13 +4451,6 @@ msgid "Show annotation" msgstr "Afficher les annotations" -#: rhodecode/templates/files/files_edit.html:48 -#: rhodecode/templates/files/files_source.html:25 -#: rhodecode/templates/files/files_source.html:55 -#, fuzzy -msgid "Show as raw" -msgstr "montrer le fichier brut" - #: rhodecode/templates/files/files_edit.html:49 #: rhodecode/templates/files/files_source.html:26 #, fuzzy @@ -4290,37 +4649,52 @@ msgid "New pull request" msgstr "Nouvelle requête de pull" -#: rhodecode/templates/pullrequests/pullrequest.html:52 -msgid "Detailed compare view" -msgstr "Comparaison détaillée" - -#: rhodecode/templates/pullrequests/pullrequest.html:56 +#: rhodecode/templates/pullrequests/pullrequest.html:25 +msgid "Create new pull request" +msgstr "Nouvelle requête de pull" + +#: rhodecode/templates/pullrequests/pullrequest.html:47 +#, fuzzy +msgid "Write a short description on this pull request" +msgstr "Veuillez confirmer la suppression de cette requête de pull." + +#: rhodecode/templates/pullrequests/pullrequest.html:53 +#, fuzzy +msgid "Changeset flow" +msgstr "Changements" + +#: rhodecode/templates/pullrequests/pullrequest.html:60 +#: rhodecode/templates/pullrequests/pullrequest_show.html:65 +#, fuzzy +msgid "Origin repository" +msgstr "Dépôt Git" + +#: rhodecode/templates/pullrequests/pullrequest.html:85 +msgid "Send pull request" +msgstr "Envoyer la requête de pull" + +#: rhodecode/templates/pullrequests/pullrequest.html:94 #: rhodecode/templates/pullrequests/pullrequest_show.html:137 msgid "Pull request reviewers" msgstr "Relecteurs de la requête de pull" -#: rhodecode/templates/pullrequests/pullrequest.html:65 +#: rhodecode/templates/pullrequests/pullrequest.html:103 #: rhodecode/templates/pullrequests/pullrequest_show.html:149 msgid "owner" msgstr "Propriétaire" -#: rhodecode/templates/pullrequests/pullrequest.html:77 +#: rhodecode/templates/pullrequests/pullrequest.html:115 msgid "Add reviewer to this pull request." msgstr "Ajouter un relecteur à cette requête de pull." -#: rhodecode/templates/pullrequests/pullrequest.html:83 -msgid "Create new pull request" -msgstr "Nouvelle requête de pull" - -#: rhodecode/templates/pullrequests/pullrequest.html:92 -#: rhodecode/templates/pullrequests/pullrequest_data.html:14 -#: rhodecode/templates/pullrequests/pullrequest_show.html:25 -msgid "Title" -msgstr "Titre" - -#: rhodecode/templates/pullrequests/pullrequest.html:109 -msgid "Send pull request" -msgstr "Envoyer la requête de pull" +#: rhodecode/templates/pullrequests/pullrequest.html:129 +msgid "Detailed compare view" +msgstr "Comparaison détaillée" + +#: rhodecode/templates/pullrequests/pullrequest.html:150 +#, fuzzy +msgid "Destination repository" +msgstr "Éditer le dépôt" #: rhodecode/templates/pullrequests/pullrequest_show.html:4 #, fuzzy, python-format @@ -4352,11 +4726,6 @@ 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:65 -#, fuzzy -msgid "Origin repository" -msgstr "Dépôt Git" - #: rhodecode/templates/pullrequests/pullrequest_show.html:89 msgid "Created on" msgstr "Créé le" @@ -4421,38 +4790,6 @@ msgid "Permission denied" msgstr "Permission refusée" -#: rhodecode/templates/shortlog/shortlog.html:5 -#, fuzzy, python-format -msgid "%s Lightweight Changelog" -msgstr "%s fichié modifié" - -#: rhodecode/templates/shortlog/shortlog.html:11 -#: rhodecode/templates/shortlog/shortlog.html:15 -msgid "Lightweight Changelog" -msgstr "" - -#: rhodecode/templates/shortlog/shortlog_data.html:7 -#, fuzzy -msgid "Age" -msgstr "Âge" - -#: 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" -msgstr "Ajouter ou téléverser des fichiers directement via RhodeCode…" - -#: rhodecode/templates/shortlog/shortlog_data.html:84 -msgid "Push new repo" -msgstr "Pusher le nouveau dépôt" - -#: rhodecode/templates/shortlog/shortlog_data.html:92 -msgid "Existing repository?" -msgstr "Le dépôt existe déjà ?" - #: rhodecode/templates/summary/summary.html:4 #, python-format msgid "%s Summary" @@ -4493,7 +4830,7 @@ msgid "Fork of" msgstr "Fork de" -#: rhodecode/templates/summary/summary.html:96 +#: rhodecode/templates/summary/summary.html:97 #, fuzzy msgid "Remote clone" msgstr "Clone distant" @@ -4520,8 +4857,8 @@ #: rhodecode/templates/summary/summary.html:151 #: rhodecode/templates/summary/summary.html:167 -#: rhodecode/templates/summary/summary.html:232 -msgid "enable" +#, fuzzy +msgid "Enable" msgstr "Activer" #: rhodecode/templates/summary/summary.html:159 @@ -4536,7 +4873,7 @@ 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:171 +#: rhodecode/templates/summary/summary.html:170 msgid "Download as zip" msgstr "Télécharger en ZIP" @@ -4563,6 +4900,10 @@ msgid "Commit activity by day / author" msgstr "Activité de commit par jour et par auteur" +#: rhodecode/templates/summary/summary.html:232 +msgid "enable" +msgstr "Activer" + #: rhodecode/templates/summary/summary.html:235 msgid "Stats gathered: " msgstr "Statistiques obtenues :" @@ -4577,52 +4918,48 @@ msgstr "Démarrage rapide" #: rhodecode/templates/summary/summary.html:272 -#, python-format -msgid "Readme file at revision '%s'" +#, fuzzy, python-format +msgid "Readme file from revision %s" msgstr "Fichier « Lisez-moi » à la révision « %s »" -#: rhodecode/templates/summary/summary.html:275 -msgid "Permalink to this readme" -msgstr "Lien permanent vers ce fichier « Lisez-moi »" - -#: rhodecode/templates/summary/summary.html:333 +#: rhodecode/templates/summary/summary.html:332 #, python-format msgid "Download %s as %s" msgstr "Télécharger %s comme archive %s" -#: rhodecode/templates/summary/summary.html:380 +#: rhodecode/templates/summary/summary.html:379 msgid "files" msgstr "Fichiers" -#: rhodecode/templates/summary/summary.html:690 +#: rhodecode/templates/summary/summary.html:689 msgid "commits" msgstr "commits" -#: rhodecode/templates/summary/summary.html:691 +#: rhodecode/templates/summary/summary.html:690 msgid "files added" msgstr "fichiers ajoutés" -#: rhodecode/templates/summary/summary.html:692 +#: rhodecode/templates/summary/summary.html:691 msgid "files changed" msgstr "fichiers modifiés" -#: rhodecode/templates/summary/summary.html:693 +#: rhodecode/templates/summary/summary.html:692 msgid "files removed" msgstr "fichiers supprimés" -#: rhodecode/templates/summary/summary.html:695 +#: rhodecode/templates/summary/summary.html:694 msgid "commit" msgstr "commit" +#: rhodecode/templates/summary/summary.html:695 +msgid "file added" +msgstr "fichier ajouté" + #: rhodecode/templates/summary/summary.html:696 -msgid "file added" -msgstr "fichier ajouté" +msgid "file changed" +msgstr "fichié modifié" #: rhodecode/templates/summary/summary.html:697 -msgid "file changed" -msgstr "fichié modifié" - -#: rhodecode/templates/summary/summary.html:698 msgid "file removed" msgstr "fichier supprimé" diff -r 14afe4d1363d -r 8ddf35e02d05 rhodecode/i18n/how_to --- a/rhodecode/i18n/how_to Sat Jun 01 01:03:31 2013 +0200 +++ b/rhodecode/i18n/how_to Sat Jun 01 18:03:44 2013 +0200 @@ -2,7 +2,11 @@ # to create new language # ########################## -#this needs to be done on source codes, preferable default/stable branches +Translations are also available on transifex under:: + + https://www.transifex.com/projects/p/RhodeCode/ + +#this needs to be done on source codes, preferable on default/stable branches python setup.py extract_messages <- get messages from project python setup.py init_catalog -l pl <- create a language directory for lang @@ -27,4 +31,4 @@ `lang=pl` -in the .ini file \ No newline at end of file +in the .ini file diff -r 14afe4d1363d -r 8ddf35e02d05 rhodecode/i18n/ja/LC_MESSAGES/rhodecode.mo Binary file rhodecode/i18n/ja/LC_MESSAGES/rhodecode.mo has changed diff -r 14afe4d1363d -r 8ddf35e02d05 rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po Sat Jun 01 01:03:31 2013 +0200 +++ b/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po Sat Jun 01 18:03:44 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-04-05 10:19-0700\n" +"POT-Creation-Date: 2013-06-01 18:02+0200\n" "PO-Revision-Date: 2013-04-06 21:38+0900\n" "Last-Translator: FULL NAME \n" "Language-Team: ja \n" @@ -22,38 +22,37 @@ "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -#: rhodecode/controllers/changelog.py:95 +#: rhodecode/controllers/changelog.py:149 msgid "All Branches" msgstr "すべてのブランチ" -#: rhodecode/controllers/changeset.py:83 +#: rhodecode/controllers/changeset.py:84 msgid "Show white space" msgstr "空白を表示" -#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97 +#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98 msgid "Ignore white space" msgstr "空白を無視" -#: rhodecode/controllers/changeset.py:163 +#: rhodecode/controllers/changeset.py:164 #, python-format msgid "%s line context" msgstr "" -#: rhodecode/controllers/changeset.py:329 -#: rhodecode/controllers/pullrequests.py:438 +#: rhodecode/controllers/changeset.py:345 +#: rhodecode/controllers/pullrequests.py:481 #, python-format msgid "Status change -> %s" msgstr "ステータス変更 -> %s" -#: rhodecode/controllers/changeset.py:360 +#: rhodecode/controllers/changeset.py:376 msgid "" "Changing status on a changeset associated with a closed pull request is " "not allowed" msgstr "クローズしたプルリクエストに関連するチェンジセットのステータスを変更することは許可されていません" #: rhodecode/controllers/compare.py:74 -#: rhodecode/controllers/pullrequests.py:167 -#: rhodecode/controllers/shortlog.py:100 +#: rhodecode/controllers/pullrequests.py:259 msgid "There are no changesets yet" msgstr "まだ変更がありません" @@ -94,8 +93,8 @@ msgstr "%s %s フィード" #: rhodecode/controllers/feed.py:86 -#: rhodecode/templates/changeset/changeset.html:134 -#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/changeset/changeset.html:141 +#: rhodecode/templates/changeset/changeset.html:153 #: rhodecode/templates/compare/compare_diff.html:58 #: rhodecode/templates/compare/compare_diff.html:69 #: rhodecode/templates/pullrequests/pullrequest_show.html:131 @@ -103,115 +102,116 @@ msgid "Changeset was too big and was cut off..." msgstr "チェンジセットが大きすぎるため、省略しました" -#: rhodecode/controllers/feed.py:91 +#: rhodecode/controllers/feed.py:90 #, python-format msgid "%s committed on %s" msgstr "%s コミット %s" -#: rhodecode/controllers/files.py:88 +#: rhodecode/controllers/files.py:89 msgid "Click here to add new file" msgstr "新しいファイルを追加" -#: rhodecode/controllers/files.py:89 +#: rhodecode/controllers/files.py:90 #, python-format msgid "There are no files yet %s" msgstr "まだファイルがありません %s" -#: rhodecode/controllers/files.py:267 rhodecode/controllers/files.py:335 +#: rhodecode/controllers/files.py:271 rhodecode/controllers/files.py:339 #, python-format msgid "This repository is has been locked by %s on %s" msgstr "このリポジトリは %s によって %s にロックされました" -#: rhodecode/controllers/files.py:279 +#: rhodecode/controllers/files.py:283 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: rhodecode/controllers/files.py:293 +#: rhodecode/controllers/files.py:297 #, python-format msgid "Edited file %s via RhodeCode" msgstr "RhodeCode経由で %s を変更" -#: rhodecode/controllers/files.py:309 +#: rhodecode/controllers/files.py:313 msgid "No changes" msgstr "変更点なし" -#: rhodecode/controllers/files.py:318 rhodecode/controllers/files.py:388 +#: rhodecode/controllers/files.py:322 rhodecode/controllers/files.py:394 #, python-format msgid "Successfully committed to %s" msgstr "%s へのコミットが成功しました" -#: rhodecode/controllers/files.py:323 rhodecode/controllers/files.py:394 +#: rhodecode/controllers/files.py:327 rhodecode/controllers/files.py:405 msgid "Error occurred during commit" msgstr "コミット中にエラーが発生しました" -#: rhodecode/controllers/files.py:347 +#: rhodecode/controllers/files.py:351 msgid "Added file via RhodeCode" msgstr "RhodeCode経由でファイルを追加" -#: rhodecode/controllers/files.py:364 -msgid "No content" -msgstr "内容がありません" - #: rhodecode/controllers/files.py:368 +msgid "No content" +msgstr "内容がありません" + +#: rhodecode/controllers/files.py:372 msgid "No filename" msgstr "ファイル名がありません" -#: rhodecode/controllers/files.py:372 +#: rhodecode/controllers/files.py:397 msgid "Location must be relative path and must not contain .. in path" msgstr "場所には相対パスかつ .. を含まないパスを入力してください" -#: rhodecode/controllers/files.py:420 +#: rhodecode/controllers/files.py:431 msgid "Downloads disabled" msgstr "ダウンロードは無効化されています" -#: rhodecode/controllers/files.py:431 +#: rhodecode/controllers/files.py:442 #, python-format msgid "Unknown revision %s" msgstr "%s は未知のリビジョンです" -#: rhodecode/controllers/files.py:433 +#: rhodecode/controllers/files.py:444 msgid "Empty repository" msgstr "空のリポジトリ" -#: rhodecode/controllers/files.py:435 +#: rhodecode/controllers/files.py:446 msgid "Unknown archive type" msgstr "未知のアーカイブ種別です" -#: rhodecode/controllers/files.py:617 +#: rhodecode/controllers/files.py:631 #: rhodecode/templates/changeset/changeset_range.html:9 +#: rhodecode/templates/email_templates/pull_request.html:12 +#: rhodecode/templates/pullrequests/pullrequest.html:124 msgid "Changesets" msgstr "チェンジセット" -#: rhodecode/controllers/files.py:618 rhodecode/controllers/pullrequests.py:131 -#: rhodecode/controllers/summary.py:247 rhodecode/model/scm.py:606 +#: rhodecode/controllers/files.py:632 rhodecode/controllers/pullrequests.py:152 +#: rhodecode/controllers/summary.py:76 rhodecode/model/scm.py:682 #: rhodecode/templates/switch_to_list.html:3 #: rhodecode/templates/branches/branches.html:10 msgid "Branches" msgstr "ブランチ" -#: rhodecode/controllers/files.py:619 rhodecode/controllers/pullrequests.py:132 -#: rhodecode/controllers/summary.py:248 rhodecode/model/scm.py:617 +#: rhodecode/controllers/files.py:633 rhodecode/controllers/pullrequests.py:153 +#: rhodecode/controllers/summary.py:77 rhodecode/model/scm.py:693 #: 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:175 +#: rhodecode/controllers/forks.py:176 #, python-format msgid "Forked repository %s as %s" msgstr "リポジトリ %s を %s としてフォークしました" -#: rhodecode/controllers/forks.py:189 +#: rhodecode/controllers/forks.py:190 #, python-format msgid "An error occurred during repository forking %s" msgstr "リポジトリ %s のフォーク中にエラーが発生しました" -#: rhodecode/controllers/journal.py:275 rhodecode/controllers/journal.py:318 +#: rhodecode/controllers/journal.py:110 rhodecode/controllers/journal.py:153 msgid "public journal" msgstr "公開ジャーナル" -#: rhodecode/controllers/journal.py:279 rhodecode/controllers/journal.py:322 +#: rhodecode/controllers/journal.py:114 rhodecode/controllers/journal.py:157 #: rhodecode/templates/journal/journal.html:12 msgid "journal" msgstr "ジャーナル" @@ -230,71 +230,71 @@ "email" msgstr "パスワードをリセットしました。新しいパスワードをあなたのメールアドレスに送りました" -#: rhodecode/controllers/pullrequests.py:118 +#: rhodecode/controllers/pullrequests.py:139 #: rhodecode/templates/changeset/changeset.html:10 -#: rhodecode/templates/email_templates/changeset_comment.html:15 +#: rhodecode/templates/email_templates/changeset_comment.html:8 msgid "Changeset" msgstr "チェンジセット" -#: rhodecode/controllers/pullrequests.py:128 +#: rhodecode/controllers/pullrequests.py:149 msgid "Special" msgstr "" -#: rhodecode/controllers/pullrequests.py:129 +#: rhodecode/controllers/pullrequests.py:150 msgid "Peer branches" msgstr "相手のブランチ" -#: rhodecode/controllers/pullrequests.py:130 rhodecode/model/scm.py:612 +#: rhodecode/controllers/pullrequests.py:151 rhodecode/model/scm.py:688 #: rhodecode/templates/switch_to_list.html:28 #: rhodecode/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "ブックマーク" -#: rhodecode/controllers/pullrequests.py:228 +#: rhodecode/controllers/pullrequests.py:324 msgid "Pull request requires a title with min. 3 chars" msgstr "プルリクエストには3文字以上のタイトルが必要です" -#: rhodecode/controllers/pullrequests.py:230 +#: rhodecode/controllers/pullrequests.py:326 msgid "Error creating pull request" msgstr "プルリクエストの作成中にエラーが発生しました" -#: rhodecode/controllers/pullrequests.py:251 +#: rhodecode/controllers/pullrequests.py:346 msgid "Successfully opened new pull request" msgstr "新しいプルリクエストを作成しました" -#: rhodecode/controllers/pullrequests.py:254 +#: rhodecode/controllers/pullrequests.py:349 msgid "Error occurred during sending pull request" msgstr "プルリクエストの作成中にエラーが発生しました" -#: rhodecode/controllers/pullrequests.py:287 +#: rhodecode/controllers/pullrequests.py:388 msgid "Successfully deleted pull request" msgstr "プルリクエストを削除しました" -#: rhodecode/controllers/pullrequests.py:441 +#: rhodecode/controllers/pullrequests.py:484 msgid "Closing with" msgstr "" -#: rhodecode/controllers/pullrequests.py:478 +#: rhodecode/controllers/pullrequests.py:521 msgid "Closing pull request on other statuses than rejected or approved forbidden" msgstr "" -#: rhodecode/controllers/search.py:134 +#: rhodecode/controllers/search.py:132 msgid "Invalid search query. Try quoting it." msgstr "無効な検索クエリーです。\\\"で囲んで下さい" -#: rhodecode/controllers/search.py:139 +#: rhodecode/controllers/search.py:137 msgid "There is no index to search in. Please run whoosh indexer" msgstr "検索するためのインデックスがありません。whooshでインデックスを作成して下さい" -#: rhodecode/controllers/search.py:143 +#: rhodecode/controllers/search.py:141 msgid "An error occurred during this search operation" msgstr "検索を実行する際にエラーがおきました" -#: rhodecode/controllers/summary.py:141 +#: rhodecode/controllers/summary.py:182 msgid "No data loaded yet" msgstr "まだデータが読み込まれていません" -#: rhodecode/controllers/summary.py:147 +#: rhodecode/controllers/summary.py:188 #: rhodecode/templates/summary/summary.html:149 msgid "Statistics are disabled for this repository" msgstr "このリポジトリの統計は無効化されています" @@ -307,6 +307,45 @@ msgid "Error occurred during update of defaults" msgstr "デフォルト設定の更新中にエラーが発生しました" +#: rhodecode/controllers/admin/gists.py:56 +#, fuzzy +msgid "forever" +msgstr "レビュアー" + +#: rhodecode/controllers/admin/gists.py:57 +#, fuzzy +msgid "5 minutes" +msgstr "%d 分" + +#: rhodecode/controllers/admin/gists.py:58 +#, fuzzy +msgid "1 hour" +msgstr "%d 時間" + +#: rhodecode/controllers/admin/gists.py:59 +#, fuzzy +msgid "1 day" +msgstr "%d 日" + +#: rhodecode/controllers/admin/gists.py:60 +#, fuzzy +msgid "1 month" +msgstr "%d ヶ月" + +#: rhodecode/controllers/admin/gists.py:62 +msgid "Lifetime" +msgstr "" + +#: rhodecode/controllers/admin/gists.py:127 +#, fuzzy +msgid "Error occurred during gist creation" +msgstr "フックの作成中にエラーが発生しました" + +#: rhodecode/controllers/admin/gists.py:165 +#, fuzzy, python-format +msgid "Deleted gist %s" +msgstr "リポジトリ %s を削除しました" + #: rhodecode/controllers/admin/ldap_settings.py:50 msgid "BASE" msgstr "BASE" @@ -351,35 +390,39 @@ msgid "START_TLS on LDAP connection" msgstr "LDAP接続でSTART_TLSを使用" -#: rhodecode/controllers/admin/ldap_settings.py:126 +#: rhodecode/controllers/admin/ldap_settings.py:124 msgid "LDAP settings updated successfully" msgstr "LDAP設定を更新しました" -#: rhodecode/controllers/admin/ldap_settings.py:130 +#: rhodecode/controllers/admin/ldap_settings.py:128 msgid "Unable to activate ldap. The \"python-ldap\" library is missing." msgstr "LDAPを有効にできませんでした。\"python-ldap\"ライブラリがありません。" -#: rhodecode/controllers/admin/ldap_settings.py:147 +#: rhodecode/controllers/admin/ldap_settings.py:145 msgid "Error occurred during update of ldap settings" msgstr "LDAP設定の更新中にエラーが発生しました" +#: rhodecode/controllers/admin/permissions.py:58 +#: rhodecode/controllers/admin/permissions.py:62 +#: rhodecode/controllers/admin/permissions.py:66 +msgid "None" +msgstr "なし" + +#: rhodecode/controllers/admin/permissions.py:59 +#: rhodecode/controllers/admin/permissions.py:63 +#: rhodecode/controllers/admin/permissions.py:67 +msgid "Read" +msgstr "読込" + #: rhodecode/controllers/admin/permissions.py:60 #: rhodecode/controllers/admin/permissions.py:64 -msgid "None" -msgstr "なし" +#: rhodecode/controllers/admin/permissions.py:68 +msgid "Write" +msgstr "書込" #: rhodecode/controllers/admin/permissions.py:61 #: rhodecode/controllers/admin/permissions.py:65 -msgid "Read" -msgstr "読込" - -#: rhodecode/controllers/admin/permissions.py:62 -#: rhodecode/controllers/admin/permissions.py:66 -msgid "Write" -msgstr "書込" - -#: rhodecode/controllers/admin/permissions.py:63 -#: rhodecode/controllers/admin/permissions.py:67 +#: rhodecode/controllers/admin/permissions.py:69 #: rhodecode/templates/admin/defaults/defaults.html:9 #: rhodecode/templates/admin/ldap/ldap.html:9 #: rhodecode/templates/admin/permissions/permissions.html:9 @@ -400,41 +443,55 @@ #: 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:292 -#: rhodecode/templates/base/base.html:293 -#: rhodecode/templates/base/base.html:299 -#: rhodecode/templates/base/base.html:300 +#: rhodecode/templates/base/base.html:317 +#: rhodecode/templates/base/base.html:318 +#: rhodecode/templates/base/base.html:324 +#: rhodecode/templates/base/base.html:325 msgid "Admin" msgstr "管理" -#: rhodecode/controllers/admin/permissions.py:70 -#: rhodecode/controllers/admin/permissions.py:76 -#: rhodecode/controllers/admin/permissions.py:79 +#: rhodecode/controllers/admin/permissions.py:72 +#: rhodecode/controllers/admin/permissions.py:83 +#: rhodecode/controllers/admin/permissions.py:86 +#: rhodecode/controllers/admin/permissions.py:89 +#: rhodecode/controllers/admin/permissions.py:92 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 manual account activation" +msgstr "手動でアカウントを有効にする" + +#: rhodecode/controllers/admin/permissions.py:76 msgid "Allowed with automatic account activation" msgstr "自動でアカウントを有効にする" -#: rhodecode/controllers/admin/permissions.py:77 +#: rhodecode/controllers/admin/permissions.py:79 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1439 rhodecode/model/db.py:1444 +msgid "Manual activation of external account" +msgstr "" + #: rhodecode/controllers/admin/permissions.py:80 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1440 rhodecode/model/db.py:1445 +msgid "Automatic activation of external account" +msgstr "" + +#: rhodecode/controllers/admin/permissions.py:84 +#: rhodecode/controllers/admin/permissions.py:87 +#: rhodecode/controllers/admin/permissions.py:90 +#: rhodecode/controllers/admin/permissions.py:93 msgid "Enabled" msgstr "有効" -#: rhodecode/controllers/admin/permissions.py:128 +#: rhodecode/controllers/admin/permissions.py:138 msgid "Default permissions updated successfully" msgstr "デフォルトの権限を更新しました" -#: rhodecode/controllers/admin/permissions.py:142 +#: rhodecode/controllers/admin/permissions.py:152 msgid "Error occurred during update of permissions" msgstr "権限の更新中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:127 +#: rhodecode/controllers/admin/repos.py:128 msgid "--REMOVE FORK--" msgstr "--フォーク元を削除--" @@ -453,230 +510,225 @@ msgid "Error creating repository %s" msgstr "リポジトリ %s の作成中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:266 +#: rhodecode/controllers/admin/repos.py:270 #, python-format msgid "Repository %s updated successfully" msgstr "リポジトリ %s の更新に成功しました" -#: rhodecode/controllers/admin/repos.py:284 +#: rhodecode/controllers/admin/repos.py:288 #, python-format msgid "Error occurred during update of repository %s" msgstr "リポジトリ %s の更新中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:311 -#: rhodecode/controllers/api/api.py:877 +#: rhodecode/controllers/admin/repos.py:315 #, python-format msgid "Detached %s forks" msgstr "%s 個のフォークを切り離しました" -#: rhodecode/controllers/admin/repos.py:314 -#: rhodecode/controllers/api/api.py:879 +#: rhodecode/controllers/admin/repos.py:318 #, python-format msgid "Deleted %s forks" msgstr "%s 個のフォークを削除しました" -#: rhodecode/controllers/admin/repos.py:319 +#: rhodecode/controllers/admin/repos.py:323 #, python-format msgid "Deleted repository %s" msgstr "リポジトリ %s を削除しました" -#: rhodecode/controllers/admin/repos.py:322 +#: rhodecode/controllers/admin/repos.py:326 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "フォークしたリポジトリが存在するため、 %s は削除できません" -#: rhodecode/controllers/admin/repos.py:327 +#: rhodecode/controllers/admin/repos.py:331 #, python-format msgid "An error occurred during deletion of %s" msgstr "リポジトリ %s の削除中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:365 +#: rhodecode/controllers/admin/repos.py:345 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:403 -msgid "An error occurred during deletion of repository user groups" -msgstr "リポジトリユーザーグループの削除中にエラーが発生しました" - -#: rhodecode/controllers/admin/repos.py:421 +#: rhodecode/controllers/admin/repos.py:375 +#: rhodecode/controllers/admin/repos_groups.py:332 +#: rhodecode/controllers/admin/users_groups.py:312 +#, fuzzy +msgid "An error occurred during revoking of permission" +msgstr "権限の更新中にエラーが発生しました" + +#: rhodecode/controllers/admin/repos.py:392 msgid "An error occurred during deletion of repository stats" msgstr "リポジトリステートの削除中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:438 +#: rhodecode/controllers/admin/repos.py:409 msgid "An error occurred during cache invalidation" msgstr "キャッシュの無効化中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:458 -#: rhodecode/controllers/admin/repos.py:485 +#: rhodecode/controllers/admin/repos.py:429 +#: rhodecode/controllers/admin/repos.py:456 msgid "An error occurred during unlocking" msgstr "アンロック中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:476 +#: rhodecode/controllers/admin/repos.py:447 msgid "Unlocked" msgstr "アンロック" -#: rhodecode/controllers/admin/repos.py:479 +#: rhodecode/controllers/admin/repos.py:450 msgid "Locked" msgstr "ロック" -#: rhodecode/controllers/admin/repos.py:481 +#: rhodecode/controllers/admin/repos.py:452 #, python-format msgid "Repository has been %s" msgstr "リポジトリは %s されています" -#: rhodecode/controllers/admin/repos.py:505 +#: rhodecode/controllers/admin/repos.py:476 msgid "Updated repository visibility in public journal" msgstr "公開ジャーナルでのリポジトリの可視性を更新しました" -#: rhodecode/controllers/admin/repos.py:509 +#: rhodecode/controllers/admin/repos.py:480 msgid "An error occurred during setting this repository in public journal" msgstr "このリポジトリの公開ジャーナルの設定中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:514 rhodecode/model/validators.py:302 +#: rhodecode/controllers/admin/repos.py:485 rhodecode/model/validators.py:302 msgid "Token mismatch" msgstr "トークンが合いません" -#: rhodecode/controllers/admin/repos.py:527 +#: rhodecode/controllers/admin/repos.py:498 msgid "Pulled from remote location" msgstr "リモートから取得" -#: rhodecode/controllers/admin/repos.py:529 +#: rhodecode/controllers/admin/repos.py:501 msgid "An error occurred during pull from remote location" msgstr "リモートから取得中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:545 +#: rhodecode/controllers/admin/repos.py:517 msgid "Nothing" msgstr "ありません" -#: rhodecode/controllers/admin/repos.py:547 +#: rhodecode/controllers/admin/repos.py:519 #, python-format msgid "Marked repo %s as fork of %s" msgstr "%s リポジトリを %s のフォークとして印をつける" -#: rhodecode/controllers/admin/repos.py:551 +#: rhodecode/controllers/admin/repos.py:523 msgid "An error occurred during this operation" msgstr "操作中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:590 +#: rhodecode/controllers/admin/repos.py:562 msgid "An error occurred during creation of field" msgstr "フィールドの作成中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:604 +#: rhodecode/controllers/admin/repos.py:576 msgid "An error occurred during removal of field" msgstr "フィールドの削除中にエラーが発生しました" -#: rhodecode/controllers/admin/repos_groups.py:145 +#: rhodecode/controllers/admin/repos_groups.py:147 #, python-format msgid "Created repository group %s" msgstr "リポジトリグループ %s を作成しました" -#: rhodecode/controllers/admin/repos_groups.py:157 +#: rhodecode/controllers/admin/repos_groups.py:159 #, 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 +#: rhodecode/controllers/admin/repos_groups.py:217 #, python-format msgid "Updated repository group %s" msgstr "リポジトリグループ %s を更新しました" -#: rhodecode/controllers/admin/repos_groups.py:235 +#: rhodecode/controllers/admin/repos_groups.py:232 #, python-format msgid "Error occurred during update of repository group %s" msgstr "リポジトリグループ %s の更新中にエラーが発生しました" -#: rhodecode/controllers/admin/repos_groups.py:253 +#: rhodecode/controllers/admin/repos_groups.py:250 #, python-format msgid "This group contains %s repositores and cannot be deleted" msgstr "このグループは %s リポジトリを含んでいるため削除出来ません" -#: rhodecode/controllers/admin/repos_groups.py:260 +#: rhodecode/controllers/admin/repos_groups.py:257 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "このグループは %s サブグループを含んでいるため削除出来ません" -#: rhodecode/controllers/admin/repos_groups.py:266 +#: rhodecode/controllers/admin/repos_groups.py:263 #, python-format msgid "Removed repository group %s" msgstr "リポジトリグループ %s を削除しました" -#: rhodecode/controllers/admin/repos_groups.py:271 +#: rhodecode/controllers/admin/repos_groups.py:268 #, 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:318 -msgid "An error occurred during deletion of group user groups" -msgstr "グループユーザーのグループの削除中にエラーが発生しました" - -#: rhodecode/controllers/admin/settings.py:126 +#: rhodecode/controllers/admin/repos_groups.py:279 +#: rhodecode/controllers/admin/repos_groups.py:314 +#: rhodecode/controllers/admin/users_groups.py:300 +msgid "Cannot revoke permission for yourself as admin" +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:294 +#, fuzzy +msgid "Repository Group permissions updated" +msgstr "リポジトリ権限を更新しました" + +#: rhodecode/controllers/admin/settings.py:123 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "リポジトリの再スキャンに成功しました。 追加: %s 削除: %s" -#: rhodecode/controllers/admin/settings.py:135 +#: rhodecode/controllers/admin/settings.py:132 msgid "Whoosh reindex task scheduled" msgstr "Whooshの再インデックスタスクを予定に入れました" -#: rhodecode/controllers/admin/settings.py:166 +#: rhodecode/controllers/admin/settings.py:163 msgid "Updated application settings" msgstr "アプリケーション設定を更新しました" -#: rhodecode/controllers/admin/settings.py:170 -#: rhodecode/controllers/admin/settings.py:301 +#: rhodecode/controllers/admin/settings.py:167 +#: rhodecode/controllers/admin/settings.py:304 msgid "Error occurred during updating application settings" msgstr "アプリケーション設定の更新中にエラーが発生しました" -#: rhodecode/controllers/admin/settings.py:216 +#: rhodecode/controllers/admin/settings.py:219 msgid "Updated visualisation settings" msgstr "表示設定を更新しました" -#: rhodecode/controllers/admin/settings.py:221 +#: rhodecode/controllers/admin/settings.py:224 msgid "Error occurred during updating visualisation settings" msgstr "表示設定の更新中にエラーが発生しました" -#: rhodecode/controllers/admin/settings.py:297 +#: rhodecode/controllers/admin/settings.py:300 msgid "Updated VCS settings" msgstr "VCS設定を更新しました" -#: rhodecode/controllers/admin/settings.py:311 +#: rhodecode/controllers/admin/settings.py:314 msgid "Added new hook" msgstr "新しいフックを追加しました" -#: rhodecode/controllers/admin/settings.py:323 +#: rhodecode/controllers/admin/settings.py:326 msgid "Updated hooks" msgstr "フックを更新しました" -#: rhodecode/controllers/admin/settings.py:327 +#: rhodecode/controllers/admin/settings.py:330 msgid "Error occurred during hook creation" msgstr "フックの作成中にエラーが発生しました" -#: rhodecode/controllers/admin/settings.py:346 +#: rhodecode/controllers/admin/settings.py:349 msgid "Email task created" msgstr "メールのタスクを作成しました" -#: rhodecode/controllers/admin/settings.py:410 +#: rhodecode/controllers/admin/settings.py:413 msgid "You can't edit this user since it's crucial for entire application" msgstr "このユーザーを編集出来ません。このユーザーはアプリケーションにとって必要不可欠です。" -#: rhodecode/controllers/admin/settings.py:452 +#: rhodecode/controllers/admin/settings.py:455 msgid "Your account was updated successfully" msgstr "アカウントを更新しました" -#: rhodecode/controllers/admin/settings.py:467 +#: rhodecode/controllers/admin/settings.py:470 #: rhodecode/controllers/admin/users.py:198 #, python-format msgid "Error occurred during update of user %s" @@ -704,111 +756,94 @@ msgid "An error occurred during deletion of user" msgstr "ユーザーの削除中にエラーが発生しました" -#: rhodecode/controllers/admin/users.py:233 +#: rhodecode/controllers/admin/users.py:234 msgid "You can't edit this user" msgstr "このユーザーは編集できません" -#: rhodecode/controllers/admin/users.py:276 -msgid "Granted 'repository create' permission to user" -msgstr "ユーザーに 'リポジトリ作成' 権限を与えました" - -#: rhodecode/controllers/admin/users.py:281 -msgid "Revoked 'repository create' permission to user" -msgstr "ユーザーの 'リポジトリ作成' 権限を取り消しました" - -#: rhodecode/controllers/admin/users.py:287 -msgid "Granted 'repository fork' permission to user" -msgstr "ユーザーに 'リポジトリフォーク' 権限を与えました" - -#: rhodecode/controllers/admin/users.py:292 -msgid "Revoked 'repository fork' permission to user" -msgstr "ユーザーの 'リポジトリフォーク' 権限を取り消しました" - -#: rhodecode/controllers/admin/users.py:298 -#: rhodecode/controllers/admin/users_groups.py:281 +#: rhodecode/controllers/admin/users.py:293 +#: rhodecode/controllers/admin/users_groups.py:372 +#, fuzzy +msgid "Updated permissions" +msgstr "権限のコピー" + +#: rhodecode/controllers/admin/users.py:297 +#: rhodecode/controllers/admin/users_groups.py:376 msgid "An error occurred during permissions saving" msgstr "権限の保存時にエラーが発生しました" -#: rhodecode/controllers/admin/users.py:312 +#: rhodecode/controllers/admin/users.py:311 #, python-format msgid "Added email %s to user" msgstr "ユーザーにメール %s を追加しました" -#: rhodecode/controllers/admin/users.py:318 +#: rhodecode/controllers/admin/users.py:317 msgid "An error occurred during email saving" msgstr "メールの保存時にエラーが発生しました" -#: rhodecode/controllers/admin/users.py:328 +#: rhodecode/controllers/admin/users.py:327 msgid "Removed email from user" msgstr "ユーザーからメールを削除しました" -#: rhodecode/controllers/admin/users.py:341 +#: rhodecode/controllers/admin/users.py:340 #, python-format msgid "Added ip %s to user" msgstr "ユーザーにIPアドレス %s を追加しました" -#: rhodecode/controllers/admin/users.py:347 +#: rhodecode/controllers/admin/users.py:346 msgid "An error occurred during ip saving" msgstr "IPアドレスの保存中にエラーが発生しました" -#: rhodecode/controllers/admin/users.py:359 +#: rhodecode/controllers/admin/users.py:358 msgid "Removed ip from user" msgstr "ユーザーからIPアドレスを削除しました" -#: rhodecode/controllers/admin/users_groups.py:86 +#: rhodecode/controllers/admin/users_groups.py:162 #, python-format msgid "Created user group %s" msgstr "ユーザーグループ %s を作成しました" -#: rhodecode/controllers/admin/users_groups.py:97 +#: rhodecode/controllers/admin/users_groups.py:173 #, python-format msgid "Error occurred during creation of user group %s" msgstr "ユーザーグループ %s の作成中にエラーが発生しました" -#: rhodecode/controllers/admin/users_groups.py:166 +#: rhodecode/controllers/admin/users_groups.py:210 #, python-format msgid "Updated user group %s" msgstr "ユーザーグループ %s を更新しました" -#: rhodecode/controllers/admin/users_groups.py:188 +#: rhodecode/controllers/admin/users_groups.py:232 #, python-format msgid "Error occurred during update of user group %s" msgstr "ユーザーグループ %s の更新中にエラーが発生しました" -#: rhodecode/controllers/admin/users_groups.py:205 +#: rhodecode/controllers/admin/users_groups.py:250 msgid "Successfully deleted user group" msgstr "ユーザーグループの削除に成功しました" -#: rhodecode/controllers/admin/users_groups.py:210 +#: rhodecode/controllers/admin/users_groups.py:255 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 +#: rhodecode/controllers/admin/users_groups.py:274 +msgid "Target group cannot be the same" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:280 +#, fuzzy +msgid "User Group permissions updated" +msgstr "リポジトリ権限を更新しました" + +#: rhodecode/lib/auth.py:544 #, python-format msgid "IP %s not allowed" msgstr "IPアドレス %s は許可されません" -#: rhodecode/lib/auth.py:579 +#: rhodecode/lib/auth.py:593 msgid "You need to be a registered user to perform this action" msgstr "このアクションを実行するためには登録ユーザーである必要があります" -#: rhodecode/lib/auth.py:620 +#: rhodecode/lib/auth.py:634 msgid "You need to be a signed in to view this page" msgstr "このページを閲覧するためにはサインインが必要です" @@ -824,152 +859,181 @@ msgid "No changes detected" msgstr "検出された変更はありません" -#: rhodecode/lib/helpers.py:394 +#: rhodecode/lib/helpers.py:428 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "%a, %d %b %Y %H:%M:%S" -#: rhodecode/lib/helpers.py:506 +#: rhodecode/lib/helpers.py:539 msgid "True" msgstr "True" -#: rhodecode/lib/helpers.py:509 +#: rhodecode/lib/helpers.py:542 msgid "False" msgstr "False" -#: rhodecode/lib/helpers.py:547 +#: rhodecode/lib/helpers.py:580 #, python-format msgid "Deleted branch: %s" msgstr "削除されたブランチ: %s" -#: rhodecode/lib/helpers.py:550 +#: rhodecode/lib/helpers.py:583 #, python-format msgid "Created tag: %s" msgstr "作成したタグ: %s" -#: rhodecode/lib/helpers.py:563 +#: rhodecode/lib/helpers.py:596 msgid "Changeset not found" msgstr "リビジョンが見つかりません" -#: rhodecode/lib/helpers.py:615 +#: rhodecode/lib/helpers.py:646 #, python-format msgid "Show all combined changesets %s->%s" msgstr "%s から %s までのすべてのチェンジセットを表示" -#: rhodecode/lib/helpers.py:621 +#: rhodecode/lib/helpers.py:652 msgid "compare view" msgstr "比較の表示" -#: rhodecode/lib/helpers.py:641 +#: rhodecode/lib/helpers.py:672 msgid "and" msgstr "と" -#: rhodecode/lib/helpers.py:642 +#: rhodecode/lib/helpers.py:673 #, python-format msgid "%s more" msgstr "%s 以上" -#: rhodecode/lib/helpers.py:643 rhodecode/templates/changelog/changelog.html:44 +#: rhodecode/lib/helpers.py:674 rhodecode/templates/changelog/changelog.html:53 msgid "revisions" msgstr "リビジョン" -#: rhodecode/lib/helpers.py:667 +#: rhodecode/lib/helpers.py:698 #, python-format msgid "fork name %s" msgstr "フォーク名 %s" -#: rhodecode/lib/helpers.py:684 +#: rhodecode/lib/helpers.py:715 #: rhodecode/templates/pullrequests/pullrequest_show.html:8 #, python-format msgid "Pull request #%s" msgstr "プルリクエスト #%s" -#: rhodecode/lib/helpers.py:690 +#: rhodecode/lib/helpers.py:725 msgid "[deleted] repository" msgstr "リポジトリを[削除]" -#: rhodecode/lib/helpers.py:692 rhodecode/lib/helpers.py:702 +#: rhodecode/lib/helpers.py:727 rhodecode/lib/helpers.py:739 msgid "[created] repository" msgstr "リポジトリを[作成]" -#: rhodecode/lib/helpers.py:694 +#: rhodecode/lib/helpers.py:729 msgid "[created] repository as fork" msgstr "フォークしてリポジトリを[作成]" -#: rhodecode/lib/helpers.py:696 rhodecode/lib/helpers.py:704 +#: rhodecode/lib/helpers.py:731 rhodecode/lib/helpers.py:741 msgid "[forked] repository" msgstr "リポジトリを[フォーク]" -#: rhodecode/lib/helpers.py:698 rhodecode/lib/helpers.py:706 +#: rhodecode/lib/helpers.py:733 rhodecode/lib/helpers.py:743 msgid "[updated] repository" msgstr "リポジトリを[更新]" -#: rhodecode/lib/helpers.py:700 +#: rhodecode/lib/helpers.py:735 +#, fuzzy +msgid "[downloaded] archive from repository" +msgstr "このリポジトリのダウンロードは無効化されています" + +#: rhodecode/lib/helpers.py:737 msgid "[delete] repository" msgstr "リポジトリを[削除]" -#: rhodecode/lib/helpers.py:708 +#: rhodecode/lib/helpers.py:745 msgid "[created] user" msgstr "ユーザーを[作成]" -#: rhodecode/lib/helpers.py:710 +#: rhodecode/lib/helpers.py:747 msgid "[updated] user" msgstr "ユーザーを[更新]" -#: rhodecode/lib/helpers.py:712 +#: rhodecode/lib/helpers.py:749 msgid "[created] user group" msgstr "ユーザーグループを[作成]" -#: rhodecode/lib/helpers.py:714 +#: rhodecode/lib/helpers.py:751 msgid "[updated] user group" msgstr "ユーザーグループを[更新]" -#: rhodecode/lib/helpers.py:716 +#: rhodecode/lib/helpers.py:753 msgid "[commented] on revision in repository" msgstr "リポジトリのリビジョンに[コメント]" -#: rhodecode/lib/helpers.py:718 +#: rhodecode/lib/helpers.py:755 msgid "[commented] on pull request for" msgstr "プルリクエストに[コメント]" -#: rhodecode/lib/helpers.py:720 +#: rhodecode/lib/helpers.py:757 msgid "[closed] pull request for" msgstr "プルリクエストを[クローズ]" -#: rhodecode/lib/helpers.py:722 +#: rhodecode/lib/helpers.py:759 msgid "[pushed] into" msgstr "[プッシュ]" -#: rhodecode/lib/helpers.py:724 +#: rhodecode/lib/helpers.py:761 msgid "[committed via RhodeCode] into repository" msgstr "リポジトリに[RhodeCode経由でコミット]" -#: rhodecode/lib/helpers.py:726 +#: rhodecode/lib/helpers.py:763 msgid "[pulled from remote] into repository" msgstr "リポジトリに[リモートからプル]" -#: rhodecode/lib/helpers.py:728 +#: rhodecode/lib/helpers.py:765 msgid "[pulled] from" msgstr "[プル]" -#: rhodecode/lib/helpers.py:730 +#: rhodecode/lib/helpers.py:767 msgid "[started following] repository" msgstr "リポジトリの[フォローを開始]" -#: rhodecode/lib/helpers.py:732 +#: rhodecode/lib/helpers.py:769 msgid "[stopped following] repository" msgstr "リポジトリの[フォローを停止]" -#: rhodecode/lib/helpers.py:910 +#: rhodecode/lib/helpers.py:1088 #, python-format msgid " and %s more" msgstr " と %s 以上" -#: rhodecode/lib/helpers.py:914 +#: rhodecode/lib/helpers.py:1092 msgid "No Files" msgstr "ファイルなし" -#: rhodecode/lib/helpers.py:1198 +#: rhodecode/lib/helpers.py:1158 +#, fuzzy +msgid "new file" +msgstr "新しいファイルを追加" + +#: rhodecode/lib/helpers.py:1161 +#, fuzzy +msgid "mod" +msgstr "削除" + +#: rhodecode/lib/helpers.py:1164 +#, fuzzy +msgid "del" +msgstr "削除" + +#: rhodecode/lib/helpers.py:1167 +#, fuzzy +msgid "rename" +msgstr "ユーザー名" + +#: rhodecode/lib/helpers.py:1172 +msgid "chmod" +msgstr "" + +#: rhodecode/lib/helpers.py:1404 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -983,215 +1047,302 @@ msgid "cannot create new union repository" msgstr "新しいユニオンリポジトリは作成できません" -#: rhodecode/lib/utils2.py:411 +#: rhodecode/lib/utils2.py:410 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d 年" -#: rhodecode/lib/utils2.py:412 +#: rhodecode/lib/utils2.py:411 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d ヶ月" -#: rhodecode/lib/utils2.py:413 +#: rhodecode/lib/utils2.py:412 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d 日" -#: rhodecode/lib/utils2.py:414 +#: rhodecode/lib/utils2.py:413 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d 時間" -#: rhodecode/lib/utils2.py:415 +#: rhodecode/lib/utils2.py:414 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d 分" -#: rhodecode/lib/utils2.py:416 +#: rhodecode/lib/utils2.py:415 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d 秒" -#: rhodecode/lib/utils2.py:432 +#: rhodecode/lib/utils2.py:431 #, python-format msgid "in %s" msgstr "" -#: rhodecode/lib/utils2.py:434 +#: rhodecode/lib/utils2.py:433 #, python-format msgid "%s ago" msgstr "%s 前" -#: rhodecode/lib/utils2.py:436 +#: rhodecode/lib/utils2.py:435 #, python-format msgid "in %s and %s" msgstr "" -#: rhodecode/lib/utils2.py:439 +#: rhodecode/lib/utils2.py:438 #, python-format msgid "%s and %s ago" msgstr "%s と %s 前" -#: rhodecode/lib/utils2.py:442 +#: rhodecode/lib/utils2.py:441 msgid "just now" msgstr "ちょうどいま" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 #: 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 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1303 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1388 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1408 rhodecode/model/db.py:1413 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/lib/dbmigrate/schema/db_1_5_2.py:1290 rhodecode/model/db.py:1389 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1389 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1409 rhodecode/model/db.py:1414 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/lib/dbmigrate/schema/db_1_5_2.py:1291 rhodecode/model/db.py:1390 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1390 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1410 rhodecode/model/db.py:1415 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/lib/dbmigrate/schema/db_1_5_2.py:1292 rhodecode/model/db.py:1391 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1306 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1391 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1411 rhodecode/model/db.py:1416 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/lib/dbmigrate/schema/db_1_5_2.py:1294 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1308 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/lib/dbmigrate/schema/db_1_5_2.py:1295 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1309 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/lib/dbmigrate/schema/db_1_5_2.py:1296 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1310 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/lib/dbmigrate/schema/db_1_5_2.py:1297 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1311 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/lib/dbmigrate/schema/db_1_5_2.py:1299 rhodecode/model/db.py:1398 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1313 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1398 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1406 rhodecode/model/db.py:1411 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/lib/dbmigrate/schema/db_1_5_2.py:1300 rhodecode/model/db.py:1399 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1314 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1399 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1429 rhodecode/model/db.py:1434 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/lib/dbmigrate/schema/db_1_5_2.py:1301 rhodecode/model/db.py:1400 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1315 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1400 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1430 rhodecode/model/db.py:1435 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/lib/dbmigrate/schema/db_1_5_2.py:1302 rhodecode/model/db.py:1401 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1316 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1401 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1432 rhodecode/model/db.py:1437 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/lib/dbmigrate/schema/db_1_5_2.py:1303 rhodecode/model/db.py:1402 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1317 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1402 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1433 rhodecode/model/db.py:1438 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/lib/dbmigrate/schema/db_1_5_2.py:1304 rhodecode/model/db.py:1403 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1318 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.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/lib/dbmigrate/schema/db_1_5_2.py:1305 rhodecode/model/db.py:1404 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1319 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.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/lib/dbmigrate/schema/db_1_5_2.py:1308 rhodecode/model/db.py:1407 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1322 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.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/lib/dbmigrate/schema/db_1_5_2.py:1749 rhodecode/model/db.py:1838 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1763 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1838 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1934 rhodecode/model/db.py:1939 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/lib/dbmigrate/schema/db_1_5_2.py:1750 rhodecode/model/db.py:1839 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1764 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1839 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1935 rhodecode/model/db.py:1940 msgid "Approved" msgstr "承認" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 #: 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 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1765 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1840 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1936 rhodecode/model/db.py:1941 msgid "Rejected" msgstr "却下" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 #: 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 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1766 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1841 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1937 rhodecode/model/db.py:1942 msgid "Under Review" msgstr "レビュー中" +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1252 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1270 rhodecode/model/db.py:1275 +msgid "top level" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1393 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1413 rhodecode/model/db.py:1418 +msgid "Repository group no access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1394 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1414 rhodecode/model/db.py:1419 +msgid "Repository group read access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1395 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1415 rhodecode/model/db.py:1420 +msgid "Repository group write access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1396 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1416 rhodecode/model/db.py:1421 +msgid "Repository group admin access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1418 rhodecode/model/db.py:1423 +#, fuzzy +msgid "User group no access" +msgstr "不正なユーザーグループ名です" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1419 rhodecode/model/db.py:1424 +#, fuzzy +msgid "User group read access" +msgstr "ユーザーグループ" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1420 rhodecode/model/db.py:1425 +msgid "User group write access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1421 rhodecode/model/db.py:1426 +#, fuzzy +msgid "User group admin access" +msgstr "ユーザーグループ管理" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1423 rhodecode/model/db.py:1428 +#, fuzzy +msgid "Repository Group creation disabled" +msgstr "リポジトリ作成" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1424 rhodecode/model/db.py:1429 +#, fuzzy +msgid "Repository Group creation enabled" +msgstr "リポジトリ作成" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1426 rhodecode/model/db.py:1431 +msgid "User Group creation disabled" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1427 rhodecode/model/db.py:1432 +#, fuzzy +msgid "User Group creation enabled" +msgstr "ユーザーグループ管理" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1435 rhodecode/model/db.py:1440 +#, fuzzy +msgid "Registration disabled" +msgstr "登録" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1436 rhodecode/model/db.py:1441 +#, fuzzy +msgid "User Registration with manual account activation" +msgstr "手動でアカウントを有効にする" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1437 rhodecode/model/db.py:1442 +#, fuzzy +msgid "User Registration with automatic account activation" +msgstr "自動でアカウントを有効にする" + #: rhodecode/model/comment.py:75 #, python-format msgid "on line %s" msgstr "" -#: rhodecode/model/comment.py:219 +#: rhodecode/model/comment.py:220 msgid "[Mention]" msgstr "[Mention]" -#: 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 "ログイン名を入力してください" @@ -1210,42 +1361,42 @@ msgid "Enter %(min)i characters or more" msgstr "%(min)i 文字以上必要です" -#: rhodecode/model/notification.py:224 +#: rhodecode/model/notification.py:228 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "%(user)s がコミットにコメント %(when)s" -#: rhodecode/model/notification.py:225 +#: rhodecode/model/notification.py:229 #, python-format msgid "%(user)s sent message at %(when)s" msgstr "%(user)s がメッセージを送信 %(when)s" -#: rhodecode/model/notification.py:226 +#: rhodecode/model/notification.py:230 #, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "%(user)s があなたにメンション %(when)s" -#: rhodecode/model/notification.py:227 +#: rhodecode/model/notification.py:231 #, python-format msgid "%(user)s registered in RhodeCode at %(when)s" msgstr "%(user)s がRhodeCodeに登録 %(when)s" -#: rhodecode/model/notification.py:228 +#: rhodecode/model/notification.py:232 #, python-format msgid "%(user)s opened new pull request at %(when)s" msgstr "%(user)s が新しいプルリクエストを作成 %(when)s" -#: rhodecode/model/notification.py:229 +#: rhodecode/model/notification.py:233 #, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "%(user)s がプルリクエストにコメント %(when)s" -#: rhodecode/model/pull_request.py:104 +#: rhodecode/model/pull_request.py:98 #, 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 +#: rhodecode/model/scm.py:674 msgid "latest tip" msgstr "最新のtip" @@ -1296,9 +1447,10 @@ msgstr "ユーザー名 \"%(username)s\" は許可されていません" #: rhodecode/model/validators.py:89 +#, fuzzy msgid "" "Username may only contain alphanumeric characters underscores, periods or" -" dashes and must begin with alphanumeric character" +" dashes and must begin with alphanumeric character or underscore" msgstr "ユーザー名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットから始まる必要があります" #: rhodecode/model/validators.py:117 @@ -1401,47 +1553,51 @@ msgid "You don't have permissions to create a group in this location" msgstr "この場所にグループを作成する権限がありません" -#: rhodecode/model/validators.py:557 +#: rhodecode/model/validators.py:559 msgid "This username or user group name is not valid" msgstr "ユーザー名かユーザーグループが不正です" -#: rhodecode/model/validators.py:650 +#: rhodecode/model/validators.py:652 msgid "This is not a valid path" msgstr "不正なパスです" -#: rhodecode/model/validators.py:665 +#: rhodecode/model/validators.py:667 msgid "This e-mail address is already taken" msgstr "このメールアドレスはすでに取得されています" -#: rhodecode/model/validators.py:685 +#: rhodecode/model/validators.py:687 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "メールアドレス \"%(email)s\" は存在しません" -#: rhodecode/model/validators.py:722 +#: rhodecode/model/validators.py:724 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:735 +#: rhodecode/model/validators.py:737 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" -msgstr "リビジョン %(revs) はすでにプルリクエストの一部かステータスが設定されています" - -#: rhodecode/model/validators.py:767 +msgstr "リビジョン %(revs)s はすでにプルリクエストの一部かステータスが設定されています" + +#: rhodecode/model/validators.py:769 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "有効なIPv4かIPv6のアドレスを入力してください" -#: rhodecode/model/validators.py:768 +#: rhodecode/model/validators.py:770 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: rhodecode/model/validators.py:800 +#: rhodecode/model/validators.py:803 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "キー名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)、数字しか使えません。" +#: rhodecode/model/validators.py:817 +msgid "Filename cannot be inside a directory" +msgstr "" + #: rhodecode/templates/index.html:5 msgid "Dashboard" msgstr "ダッシュボード" @@ -1487,29 +1643,28 @@ msgstr "" #: 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 +#: rhodecode/templates/admin/users_groups/users_groups.html:37 msgid "Group name" msgstr "グループ名" #: 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:270 +#: rhodecode/templates/index_base.html:123 #: rhodecode/templates/admin/repos/repo_add_base.html:56 -#: rhodecode/templates/admin/repos/repo_edit.html:75 +#: rhodecode/templates/admin/repos/repo_edit.html:68 #: rhodecode/templates/admin/repos/repos.html:73 #: 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/email_templates/changeset_comment.html:9 +#: rhodecode/templates/email_templates/pull_request.html:9 #: rhodecode/templates/forks/fork.html:56 -#: rhodecode/templates/pullrequests/pullrequest.html:101 +#: rhodecode/templates/pullrequests/pullrequest.html:43 +#: rhodecode/templates/pullrequests/pullrequest_show.html:81 #: rhodecode/templates/summary/summary.html:106 msgid "Description" msgstr "説明" @@ -1517,27 +1672,25 @@ #: 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/repo_edit.html:50 #: 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/index_base.html:121 #: 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_my_account.html:172 -#: rhodecode/templates/base/perms_summary.html:14 -#: rhodecode/templates/bookmarks/bookmarks.html:34 +#: rhodecode/templates/base/perms_summary.html:37 +#: rhodecode/templates/bookmarks/bookmarks.html:48 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 #: 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:193 -#: rhodecode/templates/journal/journal.html:296 +#: rhodecode/templates/journal/journal.html:283 #: rhodecode/templates/summary/summary.html:55 #: rhodecode/templates/summary/summary.html:124 #: rhodecode/templates/tags/tags.html:48 @@ -1545,109 +1698,78 @@ msgid "Name" 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/index_base.html:124 +msgid "Last Change" +msgstr "最後の変更点" + +#: rhodecode/templates/index_base.html:126 #: 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 +#: rhodecode/templates/journal/journal.html:285 msgid "Tip" msgstr "Tip" -#: 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/index_base.html:128 +#: rhodecode/templates/admin/repos/repo_edit.html:114 #: rhodecode/templates/admin/repos/repos.html:76 msgid "Owner" msgstr "所有者" -#: rhodecode/templates/index_base.html:87 -msgid "Atom" -msgstr "Atom" - -#: 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:196 +#: rhodecode/templates/index_base.html:136 +#: rhodecode/templates/admin/repos/repos.html:84 +#: rhodecode/templates/admin/users/user_edit_my_account.html:183 #: rhodecode/templates/admin/users/users.html:107 -#: rhodecode/templates/bookmarks/bookmarks.html:58 +#: rhodecode/templates/bookmarks/bookmarks.html:74 #: rhodecode/templates/branches/branches.html:73 -#: rhodecode/templates/journal/journal.html:217 -#: rhodecode/templates/journal/journal.html:320 +#: rhodecode/templates/journal/journal.html:204 +#: rhodecode/templates/journal/journal.html:294 #: rhodecode/templates/tags/tags.html:74 msgid "Click to sort ascending" msgstr "昇順で並び換え" -#: 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:197 +#: rhodecode/templates/index_base.html:137 +#: rhodecode/templates/admin/repos/repos.html:85 +#: rhodecode/templates/admin/users/user_edit_my_account.html:184 #: rhodecode/templates/admin/users/users.html:108 -#: rhodecode/templates/bookmarks/bookmarks.html:59 +#: rhodecode/templates/bookmarks/bookmarks.html:75 #: rhodecode/templates/branches/branches.html:74 -#: rhodecode/templates/journal/journal.html:218 -#: rhodecode/templates/journal/journal.html:321 +#: rhodecode/templates/journal/journal.html:205 +#: rhodecode/templates/journal/journal.html:295 #: rhodecode/templates/tags/tags.html:75 msgid "Click to sort descending" msgstr "降順で並び替え" -#: rhodecode/templates/index_base.html:181 -#: 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/index_base.html:138 +msgid "No repositories found." +msgstr "リポジトリが見つかりません" + +#: rhodecode/templates/index_base.html:139 +#: rhodecode/templates/admin/repos/repos.html:87 +#: rhodecode/templates/admin/users/user_edit_my_account.html:186 #: rhodecode/templates/admin/users/users.html:110 -#: rhodecode/templates/bookmarks/bookmarks.html:61 +#: rhodecode/templates/bookmarks/bookmarks.html:77 #: rhodecode/templates/branches/branches.html:76 -#: rhodecode/templates/journal/journal.html:220 -#: rhodecode/templates/journal/journal.html:323 +#: rhodecode/templates/journal/journal.html:207 +#: rhodecode/templates/journal/journal.html:297 #: rhodecode/templates/tags/tags.html:77 msgid "Data error." msgstr "データエラー" -#: rhodecode/templates/index_base.html:213 -#: rhodecode/templates/index_base.html:300 -#: rhodecode/templates/admin/repos/repos.html:101 +#: rhodecode/templates/index_base.html:140 +#: rhodecode/templates/admin/repos/repos.html:88 #: rhodecode/templates/admin/users/user_edit_my_account.html:58 -#: rhodecode/templates/admin/users/user_edit_my_account.html:200 +#: rhodecode/templates/admin/users/user_edit_my_account.html:187 #: rhodecode/templates/admin/users/users.html:111 -#: rhodecode/templates/bookmarks/bookmarks.html:62 +#: rhodecode/templates/bookmarks/bookmarks.html:78 #: rhodecode/templates/branches/branches.html:77 -#: rhodecode/templates/journal/journal.html:221 -#: rhodecode/templates/journal/journal.html:324 +#: rhodecode/templates/journal/journal.html:208 +#: rhodecode/templates/journal/journal.html:298 #: rhodecode/templates/tags/tags.html:78 msgid "Loading..." msgstr "読み込み中..." -#: rhodecode/templates/index_base.html:298 -msgid "No repositories found." -msgstr "リポジトリが見つかりません" - -#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:227 +#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:239 msgid "Log In" msgstr "ログイン" @@ -1662,7 +1784,7 @@ #: 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/base/base.html:215 #: rhodecode/templates/summary/summary.html:123 msgid "Username" msgstr "ユーザー名" @@ -1670,7 +1792,7 @@ #: 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:212 +#: rhodecode/templates/base/base.html:224 msgid "Password" msgstr "パスワード" @@ -1686,7 +1808,7 @@ msgid "Forgot your password ?" msgstr "パスワードを忘れた場合はこちら" -#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:223 +#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:235 msgid "Don't have an account ?" msgstr "アカウントを持っていない場合はこちら" @@ -1755,7 +1877,7 @@ #: 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/admin/repos/repo_edit.html:78 #: rhodecode/templates/data_table/_dt_elements.html:61 #: rhodecode/templates/summary/summary.html:77 msgid "Private repository" @@ -1778,13 +1900,13 @@ msgstr "まだタグがありません" #: rhodecode/templates/switch_to_list.html:35 -#: rhodecode/templates/bookmarks/bookmarks_data.html:32 +#: rhodecode/templates/bookmarks/bookmarks_data.html:37 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 +#: rhodecode/templates/base/base.html:73 msgid "Admin journal" msgstr "管理者ジャーナル" @@ -1809,9 +1931,9 @@ #: 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/admin/users_groups/users_groups.html:40 #: rhodecode/templates/journal/journal.html:197 -#: rhodecode/templates/journal/journal.html:300 +#: rhodecode/templates/journal/journal.html:287 msgid "Action" msgstr "アクション" @@ -1821,7 +1943,7 @@ msgstr "リポジトリ" #: rhodecode/templates/admin/admin_log.html:8 -#: rhodecode/templates/bookmarks/bookmarks.html:35 +#: rhodecode/templates/bookmarks/bookmarks.html:49 #: rhodecode/templates/bookmarks/bookmarks_data.html:7 #: rhodecode/templates/branches/branches.html:48 #: rhodecode/templates/branches/branches_data.html:7 @@ -1844,19 +1966,18 @@ msgstr "リポジトリのデフォルト設定" #: rhodecode/templates/admin/defaults/defaults.html:11 -#: rhodecode/templates/base/base.html:75 +#: rhodecode/templates/base/base.html:80 msgid "Defaults" msgstr "デフォルト設定" #: rhodecode/templates/admin/defaults/defaults.html:35 #: rhodecode/templates/admin/repos/repo_add_base.html:38 -#: rhodecode/templates/admin/repos/repo_edit.html:58 msgid "Type" msgstr "リポジトリのタイプ" #: rhodecode/templates/admin/defaults/defaults.html:48 #: rhodecode/templates/admin/repos/repo_add_base.html:69 -#: rhodecode/templates/admin/repos/repo_edit.html:89 +#: rhodecode/templates/admin/repos/repo_edit.html:82 #: rhodecode/templates/forks/fork.html:69 msgid "" "Private repositories are only visible to people explicitly added as " @@ -1864,60 +1985,193 @@ msgstr "非公開リポジトリはコラボレーターとして明示的に追加された人でないと見つけられません" #: rhodecode/templates/admin/defaults/defaults.html:55 -#: rhodecode/templates/admin/repos/repo_edit.html:94 +#: rhodecode/templates/admin/repos/repo_edit.html:87 msgid "Enable statistics" msgstr "統計を有効にする" #: rhodecode/templates/admin/defaults/defaults.html:59 -#: rhodecode/templates/admin/repos/repo_edit.html:98 +#: rhodecode/templates/admin/repos/repo_edit.html:91 msgid "Enable statistics window on summary page." msgstr "概要ページの統計ウィンドウを有効にします" #: rhodecode/templates/admin/defaults/defaults.html:65 -#: rhodecode/templates/admin/repos/repo_edit.html:103 +#: rhodecode/templates/admin/repos/repo_edit.html:96 msgid "Enable downloads" msgstr "ダウンロードを有効にする" #: rhodecode/templates/admin/defaults/defaults.html:69 -#: rhodecode/templates/admin/repos/repo_edit.html:107 +#: rhodecode/templates/admin/repos/repo_edit.html:100 msgid "Enable download menu on summary page." msgstr "概要ページのダウンロードメニューを有効にします" #: rhodecode/templates/admin/defaults/defaults.html:75 -#: rhodecode/templates/admin/repos/repo_edit.html:112 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72 +#: rhodecode/templates/admin/repos/repo_edit.html:105 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:64 msgid "Enable locking" msgstr "ロックを有効にする" #: rhodecode/templates/admin/defaults/defaults.html:79 -#: rhodecode/templates/admin/repos/repo_edit.html:116 +#: rhodecode/templates/admin/repos/repo_edit.html:109 msgid "Enable lock-by-pulling on repository." msgstr "リポジトリのpullのロックを有効にします" #: 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:148 -#: rhodecode/templates/admin/repos/repo_edit.html:173 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:80 +#: rhodecode/templates/admin/permissions/permissions.html:122 +#: rhodecode/templates/admin/repos/repo_edit.html:141 +#: rhodecode/templates/admin/repos/repo_edit.html:166 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:96 #: rhodecode/templates/admin/settings/hooks.html:73 #: 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/admin/users_groups/users_group_edit.html:143 +#: rhodecode/templates/base/default_perms_box.html:53 msgid "Save" msgstr "保存" +#: rhodecode/templates/admin/gists/index.html:5 +#: rhodecode/templates/base/base.html:299 +msgid "Gists" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:10 +#, fuzzy, python-format +msgid "Private Gists for user %s" +msgstr "ユーザー %s を作成しました" + +#: rhodecode/templates/admin/gists/index.html:12 +#, python-format +msgid "Public Gists for user %s" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:14 +msgid "Public Gists" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:31 +#: rhodecode/templates/admin/gists/show.html:24 +#: rhodecode/templates/base/base.html:302 +#, fuzzy +msgid "Create new gist" +msgstr "新しいファイルを作成" + +#: rhodecode/templates/admin/gists/index.html:48 +#, fuzzy +msgid "Created" +msgstr "読込" + +#: rhodecode/templates/admin/gists/index.html:51 +#: rhodecode/templates/admin/gists/index.html:53 +#: rhodecode/templates/admin/gists/show.html:43 +#: rhodecode/templates/admin/gists/show.html:45 +#, fuzzy +msgid "Expires" +msgstr "リポジトリ" + +#: rhodecode/templates/admin/gists/index.html:51 +#: rhodecode/templates/admin/gists/show.html:43 +#, fuzzy +msgid "never" +msgstr "レビュアー" + +#: rhodecode/templates/admin/gists/index.html:68 +#, fuzzy +msgid "There are no gists yet" +msgstr "まだタグがありません" + +#: rhodecode/templates/admin/gists/new.html:5 +#: rhodecode/templates/admin/gists/new.html:16 +msgid "New gist" +msgstr "" + +#: rhodecode/templates/admin/gists/new.html:37 +#, fuzzy +msgid "Gist description ..." +msgstr "説明" + +#: rhodecode/templates/admin/gists/new.html:52 +msgid "Create private gist" +msgstr "" + +#: rhodecode/templates/admin/gists/new.html:53 +msgid "Create public gist" +msgstr "" + +#: rhodecode/templates/admin/gists/new.html:54 +#: rhodecode/templates/admin/permissions/permissions.html:123 +#: rhodecode/templates/admin/permissions/permissions.html:185 +#: rhodecode/templates/admin/repos/repo_edit.html:142 +#: rhodecode/templates/admin/repos/repo_edit.html:167 +#: rhodecode/templates/admin/repos/repo_edit.html:381 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:73 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:97 +#: rhodecode/templates/admin/settings/settings.html:115 +#: rhodecode/templates/admin/settings/settings.html:196 +#: rhodecode/templates/admin/settings/settings.html:288 +#: rhodecode/templates/admin/users/user_edit.html:141 +#: rhodecode/templates/admin/users/user_edit.html:198 +#: rhodecode/templates/admin/users/user_edit.html:246 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:89 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:144 +#: rhodecode/templates/base/default_perms_box.html:54 +#: rhodecode/templates/files/files_add.html:80 +#: rhodecode/templates/files/files_edit.html:66 +#: rhodecode/templates/pullrequests/pullrequest.html:86 +msgid "Reset" +msgstr "リセット" + +#: rhodecode/templates/admin/gists/show.html:5 +msgid "gist" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:9 +msgid "Gist" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:36 +msgid "Public gist" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:38 +#, fuzzy +msgid "Private gist" +msgstr "非公開リポジトリ" + +#: rhodecode/templates/admin/gists/show.html:54 +#: rhodecode/templates/admin/repos/repo_edit.html:299 +#: rhodecode/templates/changeset/changeset_file_comment.html:40 +msgid "Delete" +msgstr "削除" + +#: rhodecode/templates/admin/gists/show.html:54 +#, fuzzy +msgid "Confirm to delete this gist" +msgstr "このIPアドレスを削除してよろしいですか: %s" + +#: rhodecode/templates/admin/gists/show.html:63 +#: rhodecode/templates/admin/gists/show.html:84 +#: 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/admin/gists/show.html:71 +#, fuzzy +msgid "created" +msgstr "読込" + #: rhodecode/templates/admin/ldap/ldap.html:5 msgid "LDAP administration" msgstr "LDAP管理" #: rhodecode/templates/admin/ldap/ldap.html:11 #: rhodecode/templates/admin/users/users.html:86 -#: rhodecode/templates/base/base.html:74 +#: rhodecode/templates/base/base.html:79 msgid "LDAP" msgstr "LDAP" @@ -2017,7 +2271,7 @@ msgstr "通知を表示" #: rhodecode/templates/admin/notifications/show_notification.html:9 -#: rhodecode/templates/base/base.html:241 +#: rhodecode/templates/base/base.html:253 msgid "Notifications" msgstr "通知" @@ -2026,12 +2280,14 @@ msgstr "権限管理" #: rhodecode/templates/admin/permissions/permissions.html:11 +#: rhodecode/templates/admin/repos/repo_edit.html:151 #: 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/repos_groups/repos_groups_edit.html:81 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:88 #: rhodecode/templates/admin/users/user_edit.html:150 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:100 -#: rhodecode/templates/base/base.html:73 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:129 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:136 +#: rhodecode/templates/base/base.html:78 msgid "Permissions" msgstr "権限設定" @@ -2052,6 +2308,7 @@ #: rhodecode/templates/admin/permissions/permissions.html:50 #: rhodecode/templates/admin/permissions/permissions.html:63 +#: rhodecode/templates/admin/permissions/permissions.html:77 msgid "Overwrite existing settings" msgstr "現在の設定を上書きする" @@ -2063,86 +2320,88 @@ msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:69 -msgid "Registration" -msgstr "登録" - -#: rhodecode/templates/admin/permissions/permissions.html:77 +#, fuzzy +msgid "User group" +msgstr "ユーザーグループ" + +#: rhodecode/templates/admin/permissions/permissions.html:76 +msgid "" +"All default permissions on each user 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:83 msgid "Repository creation" msgstr "リポジトリ作成" -#: rhodecode/templates/admin/permissions/permissions.html:85 +#: rhodecode/templates/admin/permissions/permissions.html:91 +#, fuzzy +msgid "User group creation" +msgstr "ユーザーグループ管理" + +#: rhodecode/templates/admin/permissions/permissions.html:99 msgid "Repository forking" msgstr "リポジトリフォーク" -#: rhodecode/templates/admin/permissions/permissions.html:93 -#: 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:80 -#: rhodecode/templates/files/files_edit.html:66 -#: rhodecode/templates/pullrequests/pullrequest.html:110 -msgid "Reset" -msgstr "リセット" - -#: rhodecode/templates/admin/permissions/permissions.html:103 +#: rhodecode/templates/admin/permissions/permissions.html:107 +msgid "Registration" +msgstr "登録" + +#: rhodecode/templates/admin/permissions/permissions.html:115 +#, fuzzy +msgid "External auth account activation" +msgstr "自動でアカウントを有効にする" + +#: rhodecode/templates/admin/permissions/permissions.html:133 msgid "Default User Permissions" msgstr "デフォルトのユーザー権限" -#: rhodecode/templates/admin/permissions/permissions.html:113 -#: rhodecode/templates/admin/users/user_edit.html:244 +#: rhodecode/templates/admin/permissions/permissions.html:144 +#: rhodecode/templates/admin/users/user_edit.html:207 msgid "Allowed IP addresses" msgstr "許可するIPアドレス" -#: rhodecode/templates/admin/permissions/permissions.html:127 -#: rhodecode/templates/admin/repos/repo_edit.html:347 +#: rhodecode/templates/admin/permissions/permissions.html:158 +#: rhodecode/templates/admin/repos/repo_edit.html:340 #: 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/admin/users/user_edit.html:175 +#: rhodecode/templates/admin/users/user_edit.html:220 +#: rhodecode/templates/admin/users_groups/users_groups.html:54 #: rhodecode/templates/data_table/_dt_elements.html:122 -#: rhodecode/templates/data_table/_dt_elements.html:130 +#: rhodecode/templates/data_table/_dt_elements.html:136 msgid "delete" msgstr "削除" -#: rhodecode/templates/admin/permissions/permissions.html:128 -#: rhodecode/templates/admin/users/user_edit.html:258 +#: rhodecode/templates/admin/permissions/permissions.html:159 +#: rhodecode/templates/admin/users/user_edit.html:221 #, python-format msgid "Confirm to delete this ip: %s" msgstr "このIPアドレスを削除してよろしいですか: %s" -#: rhodecode/templates/admin/permissions/permissions.html:134 -#: rhodecode/templates/admin/users/user_edit.html:264 +#: rhodecode/templates/admin/permissions/permissions.html:165 +#: rhodecode/templates/admin/users/user_edit.html:227 msgid "All IP addresses are allowed" msgstr "すべてのIPアドレスが許可されています" -#: rhodecode/templates/admin/permissions/permissions.html:145 -#: rhodecode/templates/admin/users/user_edit.html:275 +#: rhodecode/templates/admin/permissions/permissions.html:176 +#: rhodecode/templates/admin/users/user_edit.html:238 msgid "New ip address" msgstr "新しいIPアドレス" -#: rhodecode/templates/admin/permissions/permissions.html:153 +#: rhodecode/templates/admin/permissions/permissions.html:184 #: 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 +#: rhodecode/templates/admin/repos/repo_edit.html:380 +#: rhodecode/templates/admin/users/user_edit.html:197 +#: rhodecode/templates/admin/users/user_edit.html:245 msgid "Add" msgstr "追加" #: 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 +#: rhodecode/templates/base/base.html:74 rhodecode/templates/base/base.html:88 +#: rhodecode/templates/base/base.html:116 +#: rhodecode/templates/base/base.html:275 msgid "Repositories" msgstr "リポジトリ" @@ -2157,7 +2416,7 @@ msgstr "クローン元" #: rhodecode/templates/admin/repos/repo_add_base.html:24 -#: rhodecode/templates/admin/repos/repo_edit.html:44 +#: rhodecode/templates/admin/repos/repo_edit.html:45 msgid "Optional http[s] url from which repository should be cloned." msgstr "オプション：クローンするリポジトリのHTTP[S]のURLを指定します" @@ -2171,19 +2430,19 @@ msgstr "作成するリポジトリのタイプを指定します" #: rhodecode/templates/admin/repos/repo_add_base.html:47 -#: rhodecode/templates/admin/repos/repo_edit.html:66 +#: rhodecode/templates/admin/repos/repo_edit.html:59 #: 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/admin/repos/repo_edit.html:63 #: 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/admin/repos/repo_edit.html:72 #: rhodecode/templates/forks/fork.html:60 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "短く要点を絞ってください。長い説明にはREADMEファイルを利用してください。" @@ -2195,187 +2454,189 @@ #: 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/base/base.html:81 rhodecode/templates/base/base.html:134 #: rhodecode/templates/summary/summary.html:212 msgid "Settings" msgstr "設定" -#: rhodecode/templates/admin/repos/repo_edit.html:40 +#: rhodecode/templates/admin/repos/repo_edit.html:36 +#, fuzzy +msgid "Non-changeable id" +msgstr "変更不能ID %s" + +#: rhodecode/templates/admin/repos/repo_edit.html:41 msgid "Clone uri" msgstr "クローンURI" -#: rhodecode/templates/admin/repos/repo_edit.html:53 +#: rhodecode/templates/admin/repos/repo_edit.html:54 msgid "Optional select a group to put this repository into." msgstr "オプション: このリポジトリを配置するグループを選択します" -#: rhodecode/templates/admin/repos/repo_edit.html:126 +#: rhodecode/templates/admin/repos/repo_edit.html:119 msgid "Change owner of this repository." msgstr "リポジトリの所有者を変更" -#: rhodecode/templates/admin/repos/repo_edit.html:184 +#: rhodecode/templates/admin/repos/repo_edit.html:177 msgid "Advanced settings" msgstr "高度な設定" -#: rhodecode/templates/admin/repos/repo_edit.html:187 +#: rhodecode/templates/admin/repos/repo_edit.html:180 msgid "Statistics" msgstr "統計" -#: rhodecode/templates/admin/repos/repo_edit.html:191 +#: rhodecode/templates/admin/repos/repo_edit.html:184 msgid "Reset current statistics" msgstr "現在の統計情報をリセットする" -#: rhodecode/templates/admin/repos/repo_edit.html:191 +#: rhodecode/templates/admin/repos/repo_edit.html:184 msgid "Confirm to remove current statistics" msgstr "現在の統計情報をリセットしてもよろしいですか？" -#: rhodecode/templates/admin/repos/repo_edit.html:194 +#: rhodecode/templates/admin/repos/repo_edit.html:187 msgid "Fetched to rev" msgstr "収集するリビジョン" -#: rhodecode/templates/admin/repos/repo_edit.html:195 +#: rhodecode/templates/admin/repos/repo_edit.html:188 msgid "Stats gathered" msgstr "収集した統計情報" -#: rhodecode/templates/admin/repos/repo_edit.html:203 +#: rhodecode/templates/admin/repos/repo_edit.html:196 msgid "Remote" msgstr "リモート" -#: rhodecode/templates/admin/repos/repo_edit.html:207 +#: rhodecode/templates/admin/repos/repo_edit.html:200 msgid "Pull changes from remote location" msgstr "リモートから変更を取り込む" -#: rhodecode/templates/admin/repos/repo_edit.html:207 +#: rhodecode/templates/admin/repos/repo_edit.html:200 msgid "Confirm to pull changes from remote side" msgstr "リモートから変更を取り込んでもよろしいですか？" -#: rhodecode/templates/admin/repos/repo_edit.html:218 +#: rhodecode/templates/admin/repos/repo_edit.html:211 msgid "Cache" msgstr "キャッシュ" -#: rhodecode/templates/admin/repos/repo_edit.html:222 +#: rhodecode/templates/admin/repos/repo_edit.html:215 msgid "Invalidate repository cache" msgstr "リポジトリのキャッシュを無効化" -#: rhodecode/templates/admin/repos/repo_edit.html:222 +#: rhodecode/templates/admin/repos/repo_edit.html:215 msgid "Confirm to invalidate repository cache" msgstr "リポジトリのキャッシュを無効化してもよろしいですか？" -#: rhodecode/templates/admin/repos/repo_edit.html:225 +#: rhodecode/templates/admin/repos/repo_edit.html:218 msgid "" "Manually invalidate cache for this repository. On first access repository" " will be cached again" msgstr "このリポジトリのキャッシュを手動で無効化します。リポジトリへの初回アクセス時に再びキャッシュされます。" -#: rhodecode/templates/admin/repos/repo_edit.html:230 +#: rhodecode/templates/admin/repos/repo_edit.html:223 msgid "List of cached values" msgstr "キャッシュしている値の一覧" -#: rhodecode/templates/admin/repos/repo_edit.html:233 +#: rhodecode/templates/admin/repos/repo_edit.html:226 msgid "Prefix" msgstr "プレフィックス" -#: rhodecode/templates/admin/repos/repo_edit.html:234 +#: rhodecode/templates/admin/repos/repo_edit.html:227 msgid "Key" msgstr "キー" -#: rhodecode/templates/admin/repos/repo_edit.html:235 +#: rhodecode/templates/admin/repos/repo_edit.html:228 #: 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 +#: rhodecode/templates/admin/users_groups/users_groups.html:39 msgid "Active" msgstr "アクティブ" -#: rhodecode/templates/admin/repos/repo_edit.html:250 -#: rhodecode/templates/base/base.html:280 -#: rhodecode/templates/base/base.html:281 +#: rhodecode/templates/admin/repos/repo_edit.html:243 +#: rhodecode/templates/base/base.html:292 +#: rhodecode/templates/base/base.html:293 msgid "Public journal" msgstr "公開ジャーナル" -#: rhodecode/templates/admin/repos/repo_edit.html:256 +#: rhodecode/templates/admin/repos/repo_edit.html:249 msgid "Remove from public journal" msgstr "公開ジャーナルから削除する" -#: rhodecode/templates/admin/repos/repo_edit.html:258 +#: rhodecode/templates/admin/repos/repo_edit.html:251 msgid "Add to public journal" msgstr "公開ジャーナルに追加する" -#: rhodecode/templates/admin/repos/repo_edit.html:263 +#: rhodecode/templates/admin/repos/repo_edit.html:256 msgid "" "All actions made on this repository will be accessible to everyone in " "public journal" msgstr "公開ジャーナルでは、このリポジトリに対して行った操作のすべてが公開されます" -#: rhodecode/templates/admin/repos/repo_edit.html:270 +#: rhodecode/templates/admin/repos/repo_edit.html:263 msgid "Locking" msgstr "ロック" -#: rhodecode/templates/admin/repos/repo_edit.html:275 +#: rhodecode/templates/admin/repos/repo_edit.html:268 msgid "Unlock locked repo" msgstr "リポジトリのアンロック" -#: rhodecode/templates/admin/repos/repo_edit.html:275 +#: rhodecode/templates/admin/repos/repo_edit.html:268 msgid "Confirm to unlock repository" msgstr "このリポジトリのロックを外しますか？" -#: rhodecode/templates/admin/repos/repo_edit.html:278 -msgid "lock repo" +#: rhodecode/templates/admin/repos/repo_edit.html:271 +#, fuzzy +msgid "Lock repo" msgstr "リポジトリのロック" -#: rhodecode/templates/admin/repos/repo_edit.html:278 +#: rhodecode/templates/admin/repos/repo_edit.html:271 msgid "Confirm to lock repository" msgstr "このリポジトリをロックしますか？" -#: rhodecode/templates/admin/repos/repo_edit.html:279 +#: rhodecode/templates/admin/repos/repo_edit.html:272 msgid "Repository is not locked" msgstr "リポジトリはロックされていません" -#: rhodecode/templates/admin/repos/repo_edit.html:284 +#: rhodecode/templates/admin/repos/repo_edit.html:277 msgid "Force locking on repository. Works only when anonymous access is disabled" msgstr "リポジトリを強制ロックします。匿名アクセスが無効になっている場合のみ動作します。" -#: rhodecode/templates/admin/repos/repo_edit.html:291 +#: rhodecode/templates/admin/repos/repo_edit.html:284 msgid "Set as fork of" msgstr "フォーク元の設定" -#: rhodecode/templates/admin/repos/repo_edit.html:296 -msgid "set" +#: rhodecode/templates/admin/repos/repo_edit.html:289 +#, fuzzy +msgid "Set" msgstr "保存" -#: rhodecode/templates/admin/repos/repo_edit.html:300 +#: rhodecode/templates/admin/repos/repo_edit.html:293 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 +#: rhodecode/templates/admin/repos/repo_edit.html:308 msgid "Remove this repository" msgstr "このリポジトリを削除" -#: rhodecode/templates/admin/repos/repo_edit.html:315 +#: rhodecode/templates/admin/repos/repo_edit.html:308 msgid "Confirm to delete this repository" msgstr "このリポジトリを削除しますか？" -#: rhodecode/templates/admin/repos/repo_edit.html:317 +#: rhodecode/templates/admin/repos/repo_edit.html:310 #, 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 +#: rhodecode/templates/admin/repos/repo_edit.html:311 msgid "Detach forks" msgstr "フォークの切り離し" -#: rhodecode/templates/admin/repos/repo_edit.html:319 +#: rhodecode/templates/admin/repos/repo_edit.html:312 msgid "Delete forks" msgstr "フォークも削除" -#: rhodecode/templates/admin/repos/repo_edit.html:322 +#: rhodecode/templates/admin/repos/repo_edit.html:315 msgid "" "This repository will be renamed in a special way in order to be " "unaccesible for RhodeCode and VCS systems. If you need to fully delete it" @@ -2384,57 +2645,62 @@ "このリポジトリはRhodeCodeとVCSシステムからアクセス出来ないようにするために特別な方法でリネームされます。\n" "完全な削除が必要な場合はファイルシステムから手動で削除してください" -#: rhodecode/templates/admin/repos/repo_edit.html:336 +#: rhodecode/templates/admin/repos/repo_edit.html:329 msgid "Extra fields" msgstr "拡張フィールド" -#: rhodecode/templates/admin/repos/repo_edit.html:348 +#: rhodecode/templates/admin/repos/repo_edit.html:341 #, python-format msgid "Confirm to delete this field: %s" msgstr "このフィールドを削除してよろしいですか: %s" -#: rhodecode/templates/admin/repos/repo_edit.html:362 +#: rhodecode/templates/admin/repos/repo_edit.html:355 msgid "New field key" msgstr "新しいフィールドのキー" -#: rhodecode/templates/admin/repos/repo_edit.html:370 +#: rhodecode/templates/admin/repos/repo_edit.html:363 msgid "New field label" msgstr "新しいフィールドのラベル" -#: rhodecode/templates/admin/repos/repo_edit.html:373 +#: rhodecode/templates/admin/repos/repo_edit.html:366 msgid "Enter short label" msgstr "ラベルを入力してください" -#: rhodecode/templates/admin/repos/repo_edit.html:379 +#: rhodecode/templates/admin/repos/repo_edit.html:372 msgid "New field description" msgstr "新しいフィールドの説明" -#: rhodecode/templates/admin/repos/repo_edit.html:382 +#: rhodecode/templates/admin/repos/repo_edit.html:375 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 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:3 msgid "none" msgstr "なし" #: rhodecode/templates/admin/repos/repo_edit_perms.html:4 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:4 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:4 msgid "read" msgstr "読込" #: rhodecode/templates/admin/repos/repo_edit_perms.html:5 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:5 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:5 msgid "write" msgstr "書込" #: rhodecode/templates/admin/repos/repo_edit_perms.html:6 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:6 msgid "admin" msgstr "管理" #: rhodecode/templates/admin/repos/repo_edit_perms.html:7 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:7 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:7 msgid "member" msgstr "メンバー" @@ -2446,6 +2712,8 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:28 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:20 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:35 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:20 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:35 msgid "default" msgstr "default" @@ -2453,33 +2721,37 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:58 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:25 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:55 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:25 +#: rhodecode/templates/admin/users_groups/user_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:80 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:81 msgid "Add another member" msgstr "別のメンバーを追加" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:97 -#: 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: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:86 +#: rhodecode/templates/admin/repos/repos.html:86 +#: rhodecode/templates/admin/users/user_edit_my_account.html:185 +#: rhodecode/templates/admin/users/users.html:109 +#: rhodecode/templates/bookmarks/bookmarks.html:76 +#: rhodecode/templates/branches/branches.html:75 +#: rhodecode/templates/journal/journal.html:206 +#: rhodecode/templates/journal/journal.html:296 +#: rhodecode/templates/tags/tags.html:76 +msgid "No records found." +msgstr "レコードが見つかりません" + +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 msgid "apply to children" msgstr "子リポジトリにも適用" -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:88 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups" @@ -2505,7 +2777,7 @@ #: 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 +#: rhodecode/templates/base/base.html:75 rhodecode/templates/base/base.html:91 msgid "Repository groups" msgstr "リポジトリグループ" @@ -2535,7 +2807,7 @@ msgid "Add child group" msgstr "子グループの追加" -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:76 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:68 msgid "" "Enable lock-by-pulling on group. This option will be applied to all other" " groups and repositories inside" @@ -2550,15 +2822,21 @@ msgstr "トップレベルリポジトリの数" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:64 +#: rhodecode/templates/admin/users_groups/users_groups.html:48 +#: rhodecode/templates/changeset/changeset_file_comment.html:73 +#: rhodecode/templates/changeset/changeset_file_comment.html:171 msgid "Edit" msgstr "編集" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:65 +#: rhodecode/templates/admin/users_groups/users_groups.html:49 #: rhodecode/templates/base/perms_summary.html:29 -#: rhodecode/templates/base/perms_summary.html:48 -#: rhodecode/templates/base/perms_summary.html:50 +#: rhodecode/templates/base/perms_summary.html:60 +#: rhodecode/templates/base/perms_summary.html:62 #: rhodecode/templates/data_table/_dt_elements.html:116 #: rhodecode/templates/data_table/_dt_elements.html:117 +#: rhodecode/templates/data_table/_dt_elements.html:130 +#: rhodecode/templates/data_table/_dt_elements.html:131 msgid "edit" msgstr "編集" @@ -2655,8 +2933,8 @@ msgstr "Google Analyticsコード" #: rhodecode/templates/admin/settings/settings.html:114 -#: rhodecode/templates/admin/settings/settings.html:186 -#: rhodecode/templates/admin/settings/settings.html:277 +#: rhodecode/templates/admin/settings/settings.html:195 +#: rhodecode/templates/admin/settings/settings.html:287 msgid "Save settings" msgstr "設定を保存" @@ -2669,46 +2947,70 @@ msgstr "一般" #: rhodecode/templates/admin/settings/settings.html:134 -msgid "Use lightweight dashboard" -msgstr "軽量ダッシュボードを使用" - -#: rhodecode/templates/admin/settings/settings.html:140 msgid "Use repository extra fields" msgstr "リポジトリの拡張フィールドを使用" -#: rhodecode/templates/admin/settings/settings.html:147 +#: rhodecode/templates/admin/settings/settings.html:136 +msgid "Allows storing additional customized fields per repository." +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:139 +msgid "Show RhodeCode version" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:141 +msgid "Shows or hides displayed version of RhodeCode in the footer" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:146 +#, fuzzy +msgid "Dashboard items" +msgstr "ダッシュボード" + +#: rhodecode/templates/admin/settings/settings.html:150 +msgid "" +"Number of items displayed in lightweight dashboard before pagination is " +"shown." +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:155 msgid "Icons" msgstr "アイコン" -#: rhodecode/templates/admin/settings/settings.html:152 +#: rhodecode/templates/admin/settings/settings.html:160 msgid "Show public repo icon on repositories" msgstr "公開リポジトリのアイコンを表示" -#: rhodecode/templates/admin/settings/settings.html:156 +#: rhodecode/templates/admin/settings/settings.html:164 msgid "Show private repo icon on repositories" msgstr "非公開リポジトリのアイコンを表示" -#: rhodecode/templates/admin/settings/settings.html:163 +#: rhodecode/templates/admin/settings/settings.html:166 +#, fuzzy +msgid "Show public/private icons next to repositories names" +msgstr "公開リポジトリのアイコンを表示" + +#: rhodecode/templates/admin/settings/settings.html:172 msgid "Meta-Tagging" msgstr "メタタグ" -#: rhodecode/templates/admin/settings/settings.html:168 +#: rhodecode/templates/admin/settings/settings.html:177 msgid "Stylify recognised metatags:" msgstr "次のメタタグを変換する" -#: rhodecode/templates/admin/settings/settings.html:195 +#: rhodecode/templates/admin/settings/settings.html:204 msgid "VCS settings" msgstr "VCSの設定" -#: rhodecode/templates/admin/settings/settings.html:204 +#: rhodecode/templates/admin/settings/settings.html:213 msgid "Web" msgstr "Web" -#: rhodecode/templates/admin/settings/settings.html:209 +#: rhodecode/templates/admin/settings/settings.html:218 msgid "Require SSL for vcs operations" msgstr "VCSの操作にSSLを必須とする" -#: rhodecode/templates/admin/settings/settings.html:211 +#: rhodecode/templates/admin/settings/settings.html:220 msgid "" "RhodeCode will require SSL for pushing or pulling. If SSL is missing it " "will return HTTP Error 406: Not Acceptable" @@ -2716,88 +3018,87 @@ "RhodeCodeはPushとPullにSSLを要求します。もしSSLでない場合、HTTP Error 406: Not " "Acceptalbeを返します" -#: rhodecode/templates/admin/settings/settings.html:217 +#: rhodecode/templates/admin/settings/settings.html:226 msgid "Hooks" msgstr "フック" -#: rhodecode/templates/admin/settings/settings.html:222 +#: rhodecode/templates/admin/settings/settings.html:231 msgid "Update repository after push (hg update)" msgstr "プッシュ後にリポジトリをを更新する (hg update)" -#: rhodecode/templates/admin/settings/settings.html:226 +#: rhodecode/templates/admin/settings/settings.html:235 msgid "Show repository size after push" msgstr "プッシュ後にリポジトリのサイズを表示する" -#: rhodecode/templates/admin/settings/settings.html:230 +#: rhodecode/templates/admin/settings/settings.html:239 msgid "Log user push commands" msgstr "ユーザーのプッシュコマンドを記録する" -#: rhodecode/templates/admin/settings/settings.html:234 +#: rhodecode/templates/admin/settings/settings.html:243 msgid "Log user pull commands" msgstr "ユーザーのプルコマンドを記録する" -#: rhodecode/templates/admin/settings/settings.html:238 +#: rhodecode/templates/admin/settings/settings.html:247 msgid "Advanced setup" msgstr "高度な設定" -#: rhodecode/templates/admin/settings/settings.html:243 +#: rhodecode/templates/admin/settings/settings.html:252 msgid "Mercurial Extensions" msgstr "Mercurialエクステンション" -#: rhodecode/templates/admin/settings/settings.html:248 +#: rhodecode/templates/admin/settings/settings.html:257 msgid "Enable largefiles extension" msgstr "largefilesエクステンションを有効化" -#: rhodecode/templates/admin/settings/settings.html:252 +#: rhodecode/templates/admin/settings/settings.html:261 msgid "Enable hgsubversion extension" msgstr "hgsubversionエクステンションを有効化" -#: rhodecode/templates/admin/settings/settings.html:254 +#: rhodecode/templates/admin/settings/settings.html:263 msgid "" "Requires hgsubversion library installed. Allows cloning from svn remote " "locations" msgstr "hgsubversion のインストールが必要です。リモートロケーションのsvnからクローン出来るようになります" -#: rhodecode/templates/admin/settings/settings.html:264 +#: rhodecode/templates/admin/settings/settings.html:274 msgid "Repositories location" msgstr "リポジトリロケーション" -#: rhodecode/templates/admin/settings/settings.html:269 +#: rhodecode/templates/admin/settings/settings.html:279 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:270 -#: rhodecode/templates/base/base.html:131 +"Click to unlock. You must restart RhodeCode in order to make this setting" +" take effect." +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:280 +#: rhodecode/templates/base/base.html:143 msgid "Unlock" msgstr "アンロック" -#: rhodecode/templates/admin/settings/settings.html:272 +#: rhodecode/templates/admin/settings/settings.html:282 msgid "" "Location where repositories are stored. After changing this value a " "restart, and rescan is required" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:292 +#: rhodecode/templates/admin/settings/settings.html:303 msgid "Test Email" msgstr "テストメール" -#: rhodecode/templates/admin/settings/settings.html:300 +#: rhodecode/templates/admin/settings/settings.html:311 msgid "Email to" msgstr "送信先" -#: rhodecode/templates/admin/settings/settings.html:308 +#: rhodecode/templates/admin/settings/settings.html:319 msgid "Send" msgstr "送る" -#: rhodecode/templates/admin/settings/settings.html:314 +#: rhodecode/templates/admin/settings/settings.html:325 msgid "System Info and Packages" msgstr "システム情報とパッケージ" -#: rhodecode/templates/admin/settings/settings.html:317 -#: rhodecode/templates/changelog/changelog.html:42 +#: rhodecode/templates/admin/settings/settings.html:328 +#: rhodecode/templates/changelog/changelog.html:51 msgid "Show" msgstr "表示" @@ -2807,7 +3108,7 @@ #: rhodecode/templates/admin/users/user_add.html:10 #: rhodecode/templates/admin/users/user_edit.html:11 -#: rhodecode/templates/base/base.html:71 +#: rhodecode/templates/base/base.html:76 msgid "Users" msgstr "ユーザー" @@ -2864,44 +3165,21 @@ msgid "New password confirmation" msgstr "新しいパスワード 再入力" -#: 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:163 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:113 -#, python-format -msgid "" -"Select to inherit permissions from %s settings. With this selected below " -"options does not have any action" -msgstr "" - -#: 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:177 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:127 -msgid "Fork repositories" -msgstr "リポジトリをフォークする" - -#: rhodecode/templates/admin/users/user_edit.html:200 msgid "Email addresses" msgstr "メールアドレス" -#: rhodecode/templates/admin/users/user_edit.html:213 +#: rhodecode/templates/admin/users/user_edit.html:176 #, python-format msgid "Confirm to delete this email: %s" msgstr "このメールを削除してよろしいですか: %s" -#: rhodecode/templates/admin/users/user_edit.html:227 +#: rhodecode/templates/admin/users/user_edit.html:190 msgid "New email address" msgstr "新しいメールアドレス" #: rhodecode/templates/admin/users/user_edit_my_account.html:5 -#: rhodecode/templates/base/base.html:242 +#: rhodecode/templates/base/base.html:254 msgid "My account" msgstr "アカウント" @@ -2938,7 +3216,7 @@ #: 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_data.html:11 #: rhodecode/templates/pullrequests/pullrequest_show.html:27 #: rhodecode/templates/pullrequests/pullrequest_show.html:42 msgid "Closed" @@ -2958,7 +3236,7 @@ msgstr "レビュアーとして参加" #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:42 -#: rhodecode/templates/pullrequests/pullrequest_data.html:11 +#: rhodecode/templates/pullrequests/pullrequest_data.html:8 #, python-format msgid "Pull request #%s opened by %s on %s" msgstr "プルリクエスト #%s %s によって %s に作成" @@ -2989,12 +3267,12 @@ #: rhodecode/templates/admin/users_groups/users_group_add.html:10 #: rhodecode/templates/admin/users_groups/users_groups.html:11 -#: rhodecode/templates/base/base.html:72 +#: rhodecode/templates/base/base.html:77 rhodecode/templates/base/base.html:94 msgid "User groups" msgstr "ユーザーグループ" #: rhodecode/templates/admin/users_groups/users_group_add.html:12 -#: rhodecode/templates/admin/users_groups/users_groups.html:25 +#: rhodecode/templates/admin/users_groups/users_groups.html:26 msgid "Add new user group" msgstr "新しいユーザーグループの追加" @@ -3007,7 +3285,7 @@ msgstr "ユーザーグループ" #: rhodecode/templates/admin/users_groups/users_group_edit.html:50 -#: rhodecode/templates/admin/users_groups/users_groups.html:35 +#: rhodecode/templates/admin/users_groups/users_groups.html:38 msgid "Members" msgstr "メンバー" @@ -3027,45 +3305,55 @@ msgid "Add all elements" msgstr "全ての要素を追加" -#: rhodecode/templates/admin/users_groups/users_group_edit.html:150 -msgid "Group members" -msgstr "グループメンバー" - -#: rhodecode/templates/admin/users_groups/users_group_edit.html:167 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:109 msgid "No members yet" msgstr "まだメンバーがいません" +#: rhodecode/templates/admin/users_groups/users_group_edit.html:117 +#, fuzzy +msgid "Global Permissions" +msgstr "権限のコピー" + #: rhodecode/templates/admin/users_groups/users_groups.html:5 msgid "User groups administration" msgstr "ユーザーグループ管理" -#: rhodecode/templates/admin/users_groups/users_groups.html:47 +#: rhodecode/templates/admin/users_groups/users_groups.html:55 #, python-format msgid "Confirm to delete this user group: %s" msgstr "ユーザグループを削除しますか？: %s" +#: rhodecode/templates/admin/users_groups/users_groups.html:62 +#, fuzzy +msgid "There are no user groups yet" +msgstr "まだリポジトリグループがありません" + #: rhodecode/templates/base/base.html:42 -msgid "Submit a bug" -msgstr "バグレポート" - -#: rhodecode/templates/base/base.html:108 +#, python-format +msgid "Server instance: %s" +msgstr "" + +#: rhodecode/templates/base/base.html:52 +msgid "Report a bug" +msgstr "" + +#: rhodecode/templates/base/base.html:121 #: 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:109 -#: rhodecode/templates/changelog/changelog.html:11 +#: rhodecode/templates/base/base.html:122 +#: rhodecode/templates/changelog/changelog.html:15 #: 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:110 +#: rhodecode/templates/base/base.html:123 #: rhodecode/templates/data_table/_dt_elements.html:25 #: rhodecode/templates/data_table/_dt_elements.html:27 #: rhodecode/templates/data_table/_dt_elements.html:29 @@ -3073,48 +3361,44 @@ msgid "Files" msgstr "ファイル" -#: rhodecode/templates/base/base.html:112 +#: rhodecode/templates/base/base.html:125 msgid "Switch To" msgstr "ブランチの切り替え" -#: rhodecode/templates/base/base.html:114 -#: rhodecode/templates/base/base.html:267 +#: rhodecode/templates/base/base.html:127 +#: rhodecode/templates/base/base.html:279 msgid "loading..." msgstr "読み込み中..." -#: rhodecode/templates/base/base.html:118 +#: rhodecode/templates/base/base.html:131 msgid "Options" msgstr "オプション" -#: rhodecode/templates/base/base.html:124 +#: rhodecode/templates/base/base.html:137 #: 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/base/base.html:139 +#: rhodecode/templates/base/base.html:312 #: rhodecode/templates/search/search.html:14 #: rhodecode/templates/search/search.html:54 msgid "Search" msgstr "検索" -#: rhodecode/templates/base/base.html:133 +#: rhodecode/templates/base/base.html:145 msgid "Lock" msgstr "ロック" -#: rhodecode/templates/base/base.html:141 +#: rhodecode/templates/base/base.html:153 msgid "Follow" msgstr "フォロー" -#: rhodecode/templates/base/base.html:142 +#: rhodecode/templates/base/base.html:154 msgid "Unfollow" msgstr "アンフォロー" -#: rhodecode/templates/base/base.html:145 +#: rhodecode/templates/base/base.html:157 #: rhodecode/templates/data_table/_dt_elements.html:33 #: rhodecode/templates/data_table/_dt_elements.html:35 #: rhodecode/templates/data_table/_dt_elements.html:37 @@ -3123,60 +3407,114 @@ msgid "Fork" msgstr "フォーク" -#: rhodecode/templates/base/base.html:147 +#: rhodecode/templates/base/base.html:159 msgid "Create Pull Request" msgstr "プルリクエストを作成" -#: rhodecode/templates/base/base.html:153 +#: rhodecode/templates/base/base.html:165 msgid "Show Pull Requests" msgstr "プルリクエストを表示" -#: rhodecode/templates/base/base.html:153 +#: rhodecode/templates/base/base.html:165 msgid "Pull Requests" msgstr "プルリクエスト" -#: rhodecode/templates/base/base.html:190 +#: rhodecode/templates/base/base.html:202 msgid "Not logged in" msgstr "ログインしていません" -#: rhodecode/templates/base/base.html:197 +#: rhodecode/templates/base/base.html:209 msgid "Login to your account" msgstr "ログイン" -#: rhodecode/templates/base/base.html:220 +#: rhodecode/templates/base/base.html:232 msgid "Forgot password ?" msgstr "パスワードを忘れた場合はこちら" -#: rhodecode/templates/base/base.html:243 +#: rhodecode/templates/base/base.html:255 msgid "Log Out" msgstr "ログアウト" -#: rhodecode/templates/base/base.html:262 +#: rhodecode/templates/base/base.html:274 msgid "Switch repository" msgstr "リポジトリの切り替え" -#: rhodecode/templates/base/base.html:274 +#: rhodecode/templates/base/base.html:286 msgid "Show recent activity" msgstr "最近の活動を表示" -#: rhodecode/templates/base/base.html:275 +#: rhodecode/templates/base/base.html:287 #: rhodecode/templates/journal/journal.html:4 msgid "Journal" msgstr "ジャーナル" -#: rhodecode/templates/base/base.html:286 +#: rhodecode/templates/base/base.html:298 +msgid "Show public gists" +msgstr "" + +#: rhodecode/templates/base/base.html:303 +msgid "All public gists" +msgstr "" + +#: rhodecode/templates/base/base.html:305 +msgid "My public gists" +msgstr "" + +#: rhodecode/templates/base/base.html:306 +msgid "My private gists" +msgstr "" + +#: rhodecode/templates/base/base.html:311 msgid "Search in repositories" msgstr "全てのリポジトリから検索" -#: rhodecode/templates/base/perms_summary.html:8 +#: rhodecode/templates/base/default_perms_box.html:14 +msgid "Inherit default permissions" +msgstr "デフォルトの権限を継承する" + +#: rhodecode/templates/base/default_perms_box.html:18 +#, python-format +msgid "" +"Select to inherit permissions from %s settings. With this selected below " +"options does not apply." +msgstr "" + +#: rhodecode/templates/base/default_perms_box.html:26 +msgid "Create repositories" +msgstr "リポジトリを作成する" + +#: rhodecode/templates/base/default_perms_box.html:30 +msgid "Select this option to allow repository creation for this user" +msgstr "" + +#: rhodecode/templates/base/default_perms_box.html:35 +#, fuzzy +msgid "Create user groups" +msgstr "ユーザーグループを[作成]" + +#: rhodecode/templates/base/default_perms_box.html:39 +msgid "Select this option to allow user group creation for this user" +msgstr "" + +#: rhodecode/templates/base/default_perms_box.html:44 +msgid "Fork repositories" +msgstr "リポジトリをフォークする" + +#: rhodecode/templates/base/default_perms_box.html:48 +msgid "Select this option to allow repository forking for this user" +msgstr "" + +#: rhodecode/templates/base/perms_summary.html:11 msgid "No permissions defined yet" msgstr "まだ権限設定がありません" -#: rhodecode/templates/base/perms_summary.html:15 +#: rhodecode/templates/base/perms_summary.html:19 +#: rhodecode/templates/base/perms_summary.html:38 msgid "Permission" msgstr "権限" -#: rhodecode/templates/base/perms_summary.html:16 +#: rhodecode/templates/base/perms_summary.html:20 +#: rhodecode/templates/base/perms_summary.html:39 msgid "Edit Permission" msgstr "権限の編集" @@ -3185,7 +3523,7 @@ msgstr "別のコメントを追加" #: rhodecode/templates/base/root.html:44 -#: rhodecode/templates/data_table/_dt_elements.html:140 +#: rhodecode/templates/data_table/_dt_elements.html:147 msgid "Stop following this repository" msgstr "このリポジトリのフォローをやめる" @@ -3202,7 +3540,7 @@ msgstr "メンバー" #: rhodecode/templates/base/root.html:48 -#: rhodecode/templates/pullrequests/pullrequest.html:181 +#: rhodecode/templates/pullrequests/pullrequest.html:203 msgid "Loading ..." msgstr "読み込み中..." @@ -3215,7 +3553,7 @@ msgstr "マッチするファイルはありません" #: rhodecode/templates/base/root.html:51 -#: rhodecode/templates/changelog/changelog.html:36 +#: rhodecode/templates/changelog/changelog.html:45 msgid "Open new pull request" msgstr "新しいプルリクエストを作成" @@ -3244,31 +3582,50 @@ msgid "Expand diff" msgstr "差分を表示" +#: rhodecode/templates/base/root.html:58 +#, fuzzy +msgid "Failed to remoke permission" +msgstr "ユーザーの削除に失敗しました" + #: rhodecode/templates/bookmarks/bookmarks.html:5 #, python-format msgid "%s Bookmarks" msgstr "%s ブックマーク" -#: rhodecode/templates/bookmarks/bookmarks.html:37 +#: rhodecode/templates/bookmarks/bookmarks.html:26 +#, fuzzy +msgid "Compare bookmarks" +msgstr "フォークを比較" + +#: rhodecode/templates/bookmarks/bookmarks.html:51 #: rhodecode/templates/bookmarks/bookmarks_data.html:8 #: rhodecode/templates/branches/branches.html:50 #: rhodecode/templates/branches/branches_data.html:8 -#: rhodecode/templates/shortlog/shortlog_data.html:8 +#: rhodecode/templates/changelog/changelog_summary_data.html:8 #: rhodecode/templates/tags/tags.html:51 #: rhodecode/templates/tags/tags_data.html:8 msgid "Author" msgstr "作成者" -#: rhodecode/templates/bookmarks/bookmarks.html:38 +#: rhodecode/templates/bookmarks/bookmarks.html:52 #: rhodecode/templates/bookmarks/bookmarks_data.html:9 #: rhodecode/templates/branches/branches.html:51 #: rhodecode/templates/branches/branches_data.html:9 -#: rhodecode/templates/shortlog/shortlog_data.html:5 +#: rhodecode/templates/changelog/changelog_summary_data.html:5 #: rhodecode/templates/tags/tags.html:52 #: rhodecode/templates/tags/tags_data.html:9 msgid "Revision" msgstr "リビジョン" +#: rhodecode/templates/bookmarks/bookmarks.html:54 +#: rhodecode/templates/bookmarks/bookmarks_data.html:10 +#: rhodecode/templates/branches/branches.html:53 +#: rhodecode/templates/branches/branches_data.html:10 +#: rhodecode/templates/tags/tags.html:54 +#: rhodecode/templates/tags/tags_data.html:10 +msgid "Compare" +msgstr "比較" + #: rhodecode/templates/branches/branches.html:5 #, python-format msgid "%s Branches" @@ -3278,64 +3635,67 @@ msgid "Compare branches" msgstr "ブランチの比較" -#: rhodecode/templates/branches/branches.html:53 -#: rhodecode/templates/branches/branches_data.html:10 -#: rhodecode/templates/tags/tags.html:54 -#: rhodecode/templates/tags/tags_data.html:10 -msgid "Compare" -msgstr "比較" - #: rhodecode/templates/changelog/changelog.html:6 #, python-format msgid "%s Changelog" msgstr "%s チェンジログ" -#: rhodecode/templates/changelog/changelog.html:11 +#: rhodecode/templates/changelog/changelog.html:19 #, 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:30 +#: rhodecode/templates/changelog/changelog.html:39 msgid "Clear selection" msgstr "選択を解除" -#: rhodecode/templates/changelog/changelog.html:33 +#: rhodecode/templates/changelog/changelog.html:42 #: rhodecode/templates/forks/forks_data.html:19 #, python-format msgid "Compare fork with %s" msgstr "%s とフォークを比較" -#: rhodecode/templates/changelog/changelog.html:33 +#: rhodecode/templates/changelog/changelog.html:42 msgid "Compare fork with parent" msgstr "フォークを比較" -#: rhodecode/templates/changelog/changelog.html:76 -#: rhodecode/templates/summary/summary.html:404 +#: rhodecode/templates/changelog/changelog.html:78 +#: rhodecode/templates/changelog/changelog_summary_data.html:28 +#, python-format +msgid "Click to open associated pull request #%s" +msgstr "関連するプルリクエストを開く #%s" + +#: rhodecode/templates/changelog/changelog.html:102 +#: rhodecode/templates/summary/summary.html:403 msgid "Show more" msgstr "もっと表示" -#: rhodecode/templates/changelog/changelog.html:89 +#: rhodecode/templates/changelog/changelog.html:115 +#: rhodecode/templates/changelog/changelog_summary_data.html:50 +#: rhodecode/templates/changeset/changeset.html:107 #: rhodecode/templates/changeset/changeset_range.html:86 #, python-format msgid "Bookmark %s" msgstr "ブックマーク %s" -#: rhodecode/templates/changelog/changelog.html:95 -#: rhodecode/templates/changeset/changeset.html:111 +#: rhodecode/templates/changelog/changelog.html:121 +#: rhodecode/templates/changelog/changelog_summary_data.html:56 +#: rhodecode/templates/changeset/changeset.html:113 #: rhodecode/templates/changeset/changeset_range.html:92 #, 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:80 +#: rhodecode/templates/changelog/changelog.html:126 +#: rhodecode/templates/changelog/changelog_summary_data.html:61 +#: rhodecode/templates/changeset/changeset.html:117 +#: rhodecode/templates/changeset/changeset_range.html:96 #, python-format msgid "Branch %s" msgstr "ブランチ %s" -#: rhodecode/templates/changelog/changelog.html:258 +#: rhodecode/templates/changelog/changelog.html:286 msgid "There are no changes yet" msgstr "まだ変更がありません" @@ -3364,6 +3724,39 @@ msgid "Affected %s files" msgstr "%s ファイルに影響" +#: rhodecode/templates/changelog/changelog_summary_data.html:6 +#: rhodecode/templates/files/files_add.html:75 +#: rhodecode/templates/files/files_edit.html:61 +msgid "Commit message" +msgstr "コミットメッセージ" + +#: rhodecode/templates/changelog/changelog_summary_data.html:7 +msgid "Age" +msgstr "経過時間" + +#: rhodecode/templates/changelog/changelog_summary_data.html:9 +#, fuzzy +msgid "Refs" +msgstr "プレフィックス" + +#: rhodecode/templates/changelog/changelog_summary_data.html:86 +msgid "Add or upload files directly via RhodeCode" +msgstr "RhodeCode経由で直接ファイルを追加またはアップロード" + +#: rhodecode/templates/changelog/changelog_summary_data.html:89 +#: rhodecode/templates/files/files_add.html:38 +#: rhodecode/templates/files/files_browser.html:31 +msgid "Add new file" +msgstr "新しいファイルを追加" + +#: rhodecode/templates/changelog/changelog_summary_data.html:95 +msgid "Push new repo" +msgstr "新しいリポジトリをプッシュ" + +#: rhodecode/templates/changelog/changelog_summary_data.html:103 +msgid "Existing repository?" +msgstr "存在するリポジトリをプッシュ" + #: rhodecode/templates/changeset/changeset.html:6 #, python-format msgid "%s Changeset" @@ -3384,7 +3777,7 @@ msgstr "リビジョンステータス" #: rhodecode/templates/changeset/changeset.html:67 -#: rhodecode/templates/changeset/diff_block.html:23 +#: rhodecode/templates/changeset/diff_block.html:22 msgid "Raw diff" msgstr "diffとして差分を表示" @@ -3393,30 +3786,30 @@ msgstr "パッチとして差分を表示" #: rhodecode/templates/changeset/changeset.html:69 -#: rhodecode/templates/changeset/diff_block.html:24 +#: rhodecode/templates/changeset/diff_block.html:23 msgid "Download diff" msgstr "差分をダウンロード" #: rhodecode/templates/changeset/changeset.html:73 -#: rhodecode/templates/changeset/changeset_file_comment.html:97 +#: rhodecode/templates/changeset/changeset_file_comment.html:103 #, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "%d コメント" #: rhodecode/templates/changeset/changeset.html:73 -#: rhodecode/templates/changeset/changeset_file_comment.html:97 +#: rhodecode/templates/changeset/changeset_file_comment.html:103 #, python-format msgid "(%d inline)" msgid_plural "(%d inline)" msgstr[0] "(%d インライン)" #: rhodecode/templates/changeset/changeset.html:103 -#: rhodecode/templates/changeset/changeset_range.html:77 +#: rhodecode/templates/changeset/changeset_range.html:82 msgid "merge" msgstr "マージ" -#: rhodecode/templates/changeset/changeset.html:119 +#: rhodecode/templates/changeset/changeset.html:126 #: rhodecode/templates/compare/compare_diff.html:40 #: rhodecode/templates/pullrequests/pullrequest_show.html:113 #, python-format @@ -3424,7 +3817,7 @@ msgid_plural "%s files changed" msgstr[0] "%s ファイルに影響" -#: rhodecode/templates/changeset/changeset.html:121 +#: rhodecode/templates/changeset/changeset.html:128 #: rhodecode/templates/compare/compare_diff.html:42 #: rhodecode/templates/pullrequests/pullrequest_show.html:115 #, python-format @@ -3432,15 +3825,15 @@ 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/changeset/changeset.html:141 +#: rhodecode/templates/changeset/changeset.html:153 #: 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/changeset/changeset.html:141 +#: rhodecode/templates/changeset/changeset.html:153 #: rhodecode/templates/compare/compare_diff.html:58 #: rhodecode/templates/compare/compare_diff.html:69 #: rhodecode/templates/pullrequests/pullrequest_show.html:131 @@ -3458,51 +3851,65 @@ msgid "Comment on pull request #%s" msgstr "プルリクエストにコメント #%s" -#: rhodecode/templates/changeset/changeset_file_comment.html:57 +#: rhodecode/templates/changeset/changeset_file_comment.html:55 msgid "Submitting..." msgstr "サブミット中..." -#: rhodecode/templates/changeset/changeset_file_comment.html:60 +#: rhodecode/templates/changeset/changeset_file_comment.html:58 msgid "Commenting on line {1}." msgstr "{1} 行目にコメント" -#: rhodecode/templates/changeset/changeset_file_comment.html:61 -#: rhodecode/templates/changeset/changeset_file_comment.html:139 +#: rhodecode/templates/changeset/changeset_file_comment.html:59 +#: rhodecode/templates/changeset/changeset_file_comment.html:145 #, 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:141 +#: rhodecode/templates/changeset/changeset_file_comment.html:61 +#: rhodecode/templates/changeset/changeset_file_comment.html:147 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:161 +#: rhodecode/templates/changeset/changeset_file_comment.html:65 +#: rhodecode/templates/changeset/changeset_file_comment.html:152 +#, fuzzy +msgid "Preview" +msgstr "レビュアー" + +#: rhodecode/templates/changeset/changeset_file_comment.html:72 +#: rhodecode/templates/changeset/changeset_file_comment.html:170 +#, fuzzy +msgid "Comment preview" +msgstr "比較の表示" + +#: rhodecode/templates/changeset/changeset_file_comment.html:80 +#: rhodecode/templates/changeset/changeset_file_comment.html:177 +#: rhodecode/templates/email_templates/changeset_comment.html:16 +#: rhodecode/templates/email_templates/pull_request_comment.html:16 msgid "Comment" msgstr "コメント" -#: rhodecode/templates/changeset/changeset_file_comment.html:75 +#: rhodecode/templates/changeset/changeset_file_comment.html:81 msgid "Cancel" msgstr "キャンセル" -#: rhodecode/templates/changeset/changeset_file_comment.html:82 +#: rhodecode/templates/changeset/changeset_file_comment.html:88 msgid "You need to be logged in to comment." msgstr "コメントするにはログインが必要です" -#: rhodecode/templates/changeset/changeset_file_comment.html:82 +#: rhodecode/templates/changeset/changeset_file_comment.html:88 msgid "Login now" msgstr "今すぐログインする" -#: rhodecode/templates/changeset/changeset_file_comment.html:86 +#: rhodecode/templates/changeset/changeset_file_comment.html:92 msgid "Hide" msgstr "隠す" -#: rhodecode/templates/changeset/changeset_file_comment.html:143 +#: rhodecode/templates/changeset/changeset_file_comment.html:149 msgid "Change status" msgstr "ステータスを変更する" -#: rhodecode/templates/changeset/changeset_file_comment.html:163 +#: rhodecode/templates/changeset/changeset_file_comment.html:179 msgid "Comment and close" msgstr "コメントしてクローズ" @@ -3515,19 +3922,19 @@ msgid "Files affected" msgstr "影響のあるファイル" -#: rhodecode/templates/changeset/diff_block.html:22 +#: rhodecode/templates/changeset/diff_block.html:21 msgid "Show full diff for this file" msgstr "このファイルのすべての差分を表示" -#: rhodecode/templates/changeset/diff_block.html:30 +#: rhodecode/templates/changeset/diff_block.html:29 msgid "Show inline comments" msgstr "インラインコメントを表示" -#: rhodecode/templates/changeset/diff_block.html:55 +#: rhodecode/templates/changeset/diff_block.html:53 msgid "Show file at latest version in this repo" msgstr "このリポジトリの最新バージョンのファイルを表示" -#: rhodecode/templates/changeset/diff_block.html:56 +#: rhodecode/templates/changeset/diff_block.html:54 msgid "Show file at initial version in this repo" msgstr "このリポジトリの初期バージョンのファイルを表示" @@ -3601,28 +4008,26 @@ msgid "Confirm to delete this repository: %s" msgstr "このリポジトリを削除しますか？ : %s" -#: rhodecode/templates/data_table/_dt_elements.html:131 +#: rhodecode/templates/data_table/_dt_elements.html:137 #, python-format msgid "Confirm to delete this user: %s" msgstr "このユーザーを本当に削除してよろしいですか？: %s" -#: 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:4 +#: rhodecode/templates/email_templates/pull_request.html:4 +#: rhodecode/templates/email_templates/pull_request_comment.html:4 +#, fuzzy +msgid "URL" +msgstr "ジャーナル" + +#: rhodecode/templates/email_templates/changeset_comment.html:6 +#, fuzzy, python-format +msgid "%s commented on a %s changeset." +msgstr "%s がコミットにコメント %s" #: rhodecode/templates/email_templates/changeset_comment.html:14 -msgid "Repo" -msgstr "リポジトリ" - -#: rhodecode/templates/email_templates/changeset_comment.html:16 -msgid "desc" -msgstr "説明" +msgid "The changeset status was changed to" +msgstr "" #: rhodecode/templates/email_templates/main.html:8 msgid "This is a notification from RhodeCode." @@ -3641,47 +4046,40 @@ msgid "You can generate it by clicking following URL" msgstr "下のURLをクリックすることで再生成が行えます。" -#: 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 -#, python-format -msgid "" -"User %s opened pull request for repository %s and wants you to review " -"changes." -msgstr "ユーザ %s がリポジトリ %s で新しいプルリクエストを作成しました。変更をレビューしてください。" - -#: rhodecode/templates/email_templates/pull_request.html:5 -msgid "View this pull request here" -msgstr "このプルリクエストを閲覧する" +#: rhodecode/templates/email_templates/password_reset.html:10 +msgid "Please ignore this email if you did not request a new password ." +msgstr "" #: rhodecode/templates/email_templates/pull_request.html:6 -msgid "title" +#, python-format +msgid "" +"%s opened a pull request for repository %s and wants you to review " +"changes." +msgstr "ユーザ %s がリポジトリ %s で新しいプルリクエストを作成しました。変更をレビューしてください。" + +#: rhodecode/templates/email_templates/pull_request.html:8 +#: rhodecode/templates/pullrequests/pullrequest.html:34 +#: rhodecode/templates/pullrequests/pullrequest_data.html:14 +#: rhodecode/templates/pullrequests/pullrequest_show.html:25 +msgid "Title" msgstr "タイトル" -#: rhodecode/templates/email_templates/pull_request.html:7 -msgid "description" -msgstr "説明" - -#: rhodecode/templates/email_templates/pull_request.html:12 -msgid "revisions for reviewing" -msgstr "レビュー対象のリビジョン" - -#: rhodecode/templates/email_templates/pull_request_comment.html:3 -#, python-format -msgid "Pull request #%s for repository %s" -msgstr "プルリクエスト #%s (リポジトリ %s)" - -#: rhodecode/templates/email_templates/pull_request_comment.html:13 -msgid "Closing pull request with status" +#: rhodecode/templates/email_templates/pull_request_comment.html:6 +#, fuzzy, python-format +msgid "%s commented on pull request \"%s\"" +msgstr "%s プルリクエストにコメント #%s" + +#: rhodecode/templates/email_templates/pull_request_comment.html:10 +#, fuzzy +msgid "Pull request was closed with status" msgstr "このステータスでプルリクエストをクローズ" -#: rhodecode/templates/email_templates/registration.html:4 -msgid "A new user have registered in RhodeCode" -msgstr "新しいユーザがRhodeCodeへ登録しました" - -#: rhodecode/templates/email_templates/registration.html:9 +#: rhodecode/templates/email_templates/pull_request_comment.html:12 +#, fuzzy +msgid "Pull request changed status" +msgstr "プルリクエストステータス" + +#: rhodecode/templates/email_templates/registration.html:6 msgid "View this user here" msgstr "このユーザを閲覧する" @@ -3708,7 +4106,6 @@ #: 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 "ブランチ" @@ -3721,12 +4118,6 @@ 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:43 msgid "File Name" msgstr "ファイル名" @@ -3755,12 +4146,6 @@ msgid "use / to separate directories" msgstr "ディレクトリの区切りには / を使います" -#: 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:79 #: rhodecode/templates/files/files_edit.html:65 msgid "Commit changes" @@ -3824,12 +4209,6 @@ 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:26 msgid "Download as raw" @@ -4017,37 +4396,51 @@ msgid "New pull request" msgstr "新しいプルリクエスト" -#: rhodecode/templates/pullrequests/pullrequest.html:52 -msgid "Detailed compare view" -msgstr "比較ビュー詳細" - -#: rhodecode/templates/pullrequests/pullrequest.html:56 +#: rhodecode/templates/pullrequests/pullrequest.html:25 +msgid "Create new pull request" +msgstr "新しいプルリクエストを作成" + +#: rhodecode/templates/pullrequests/pullrequest.html:47 +#, fuzzy +msgid "Write a short description on this pull request" +msgstr "このプルリクエストを削除しますか？" + +#: rhodecode/templates/pullrequests/pullrequest.html:53 +#, fuzzy +msgid "Changeset flow" +msgstr "チェンジセット" + +#: rhodecode/templates/pullrequests/pullrequest.html:60 +#: rhodecode/templates/pullrequests/pullrequest_show.html:65 +msgid "Origin repository" +msgstr "Originリポジトリ" + +#: rhodecode/templates/pullrequests/pullrequest.html:85 +msgid "Send pull request" +msgstr "プルリクエストを送る" + +#: rhodecode/templates/pullrequests/pullrequest.html:94 #: rhodecode/templates/pullrequests/pullrequest_show.html:137 msgid "Pull request reviewers" msgstr "プルリクエストレビュアー" -#: rhodecode/templates/pullrequests/pullrequest.html:65 +#: rhodecode/templates/pullrequests/pullrequest.html:103 #: rhodecode/templates/pullrequests/pullrequest_show.html:149 msgid "owner" msgstr "所有者" -#: rhodecode/templates/pullrequests/pullrequest.html:77 +#: rhodecode/templates/pullrequests/pullrequest.html:115 msgid "Add reviewer to this pull request." msgstr "このプルリクエストにレビュアーを追加" -#: rhodecode/templates/pullrequests/pullrequest.html:83 -msgid "Create new pull request" -msgstr "新しいプルリクエストを作成" - -#: rhodecode/templates/pullrequests/pullrequest.html:92 -#: rhodecode/templates/pullrequests/pullrequest_data.html:14 -#: rhodecode/templates/pullrequests/pullrequest_show.html:25 -msgid "Title" -msgstr "タイトル" - -#: rhodecode/templates/pullrequests/pullrequest.html:109 -msgid "Send pull request" -msgstr "プルリクエストを送る" +#: rhodecode/templates/pullrequests/pullrequest.html:129 +msgid "Detailed compare view" +msgstr "比較ビュー詳細" + +#: rhodecode/templates/pullrequests/pullrequest.html:150 +#, fuzzy +msgid "Destination repository" +msgstr "リポジトリを編集" #: rhodecode/templates/pullrequests/pullrequest_show.html:4 #, python-format @@ -4076,10 +4469,6 @@ msgid "Pull request was reviewed by all reviewers" msgstr "プルリクエストはすべてのレビュアーにレビューされました" -#: rhodecode/templates/pullrequests/pullrequest_show.html:65 -msgid "Origin repository" -msgstr "Originリポジトリ" - #: rhodecode/templates/pullrequests/pullrequest_show.html:89 msgid "Created on" msgstr "作成日" @@ -4140,37 +4529,6 @@ msgid "Permission denied" msgstr "権限がありません" -#: rhodecode/templates/shortlog/shortlog.html:5 -#, python-format -msgid "%s Lightweight Changelog" -msgstr "%s 軽量履歴" - -#: rhodecode/templates/shortlog/shortlog.html:11 -#: rhodecode/templates/shortlog/shortlog.html:15 -msgid "Lightweight Changelog" -msgstr "軽量履歴" - -#: rhodecode/templates/shortlog/shortlog_data.html:7 -msgid "Age" -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" -msgstr "RhodeCode経由で直接ファイルを追加またはアップロード" - -#: rhodecode/templates/shortlog/shortlog_data.html:84 -msgid "Push new repo" -msgstr "新しいリポジトリをプッシュ" - -#: rhodecode/templates/shortlog/shortlog_data.html:92 -msgid "Existing repository?" -msgstr "存在するリポジトリをプッシュ" - #: rhodecode/templates/summary/summary.html:4 #, python-format msgid "%s Summary" @@ -4209,7 +4567,7 @@ msgid "Fork of" msgstr "フォーク元: " -#: rhodecode/templates/summary/summary.html:96 +#: rhodecode/templates/summary/summary.html:97 msgid "Remote clone" msgstr "リモートクローン" @@ -4235,8 +4593,8 @@ #: rhodecode/templates/summary/summary.html:151 #: rhodecode/templates/summary/summary.html:167 -#: rhodecode/templates/summary/summary.html:232 -msgid "enable" +#, fuzzy +msgid "Enable" msgstr "有効にする" #: rhodecode/templates/summary/summary.html:159 @@ -4251,7 +4609,7 @@ msgid "Downloads are disabled for this repository" msgstr "このリポジトリのダウンロードは無効化されています" -#: rhodecode/templates/summary/summary.html:171 +#: rhodecode/templates/summary/summary.html:170 msgid "Download as zip" msgstr "ZIPとしてダウンロード" @@ -4276,6 +4634,10 @@ msgid "Commit activity by day / author" msgstr "コミットアクティビティ 日/作成者" +#: rhodecode/templates/summary/summary.html:232 +msgid "enable" +msgstr "有効にする" + #: rhodecode/templates/summary/summary.html:235 msgid "Stats gathered: " msgstr "収集した統計情報: " @@ -4289,52 +4651,48 @@ msgstr "クイックスタート" #: rhodecode/templates/summary/summary.html:272 -#, python-format -msgid "Readme file at revision '%s'" +#, fuzzy, python-format +msgid "Readme file from revision %s" msgstr "リビジョン '%s' のReadmeファイル" -#: rhodecode/templates/summary/summary.html:275 -msgid "Permalink to this readme" -msgstr "パーマリンク" - -#: rhodecode/templates/summary/summary.html:333 +#: rhodecode/templates/summary/summary.html:332 #, python-format msgid "Download %s as %s" msgstr "%s を %sとしてダウンロード" -#: rhodecode/templates/summary/summary.html:380 +#: rhodecode/templates/summary/summary.html:379 msgid "files" msgstr "ファイル" -#: rhodecode/templates/summary/summary.html:690 +#: rhodecode/templates/summary/summary.html:689 msgid "commits" msgstr "コミット" -#: rhodecode/templates/summary/summary.html:691 +#: rhodecode/templates/summary/summary.html:690 msgid "files added" msgstr "追加されたファイル" -#: rhodecode/templates/summary/summary.html:692 +#: rhodecode/templates/summary/summary.html:691 msgid "files changed" msgstr "変更されたファイル" -#: rhodecode/templates/summary/summary.html:693 +#: rhodecode/templates/summary/summary.html:692 msgid "files removed" msgstr "削除されたファイル" -#: rhodecode/templates/summary/summary.html:695 +#: rhodecode/templates/summary/summary.html:694 msgid "commit" msgstr "コミット" +#: rhodecode/templates/summary/summary.html:695 +msgid "file added" +msgstr "追加されたファイル" + #: rhodecode/templates/summary/summary.html:696 -msgid "file added" -msgstr "追加されたファイル" +msgid "file changed" +msgstr "変更されたファイル" #: rhodecode/templates/summary/summary.html:697 -msgid "file changed" -msgstr "変更されたファイル" - -#: rhodecode/templates/summary/summary.html:698 msgid "file removed" msgstr "削除されたファイル" diff -r 14afe4d1363d -r 8ddf35e02d05 rhodecode/i18n/pl/LC_MESSAGES/rhodecode.mo Binary file rhodecode/i18n/pl/LC_MESSAGES/rhodecode.mo has changed diff -r 14afe4d1363d -r 8ddf35e02d05 rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po Sat Jun 01 01:03:31 2013 +0200 +++ b/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po Sat Jun 01 18:03:44 2013 +0200 @@ -8,9 +8,9 @@ msgstr "" "Project-Id-Version: rhodecode 0.1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-04-05 10:19-0700\n" -"PO-Revision-Date: 2013-01-20 03:44+0100\n" -"Last-Translator: Nemcio \n" +"POT-Creation-Date: 2013-06-01 18:02+0200\n" +"PO-Revision-Date: 2013-05-30 23:50+0200\n" +"Last-Translator: Nemo \n" "Language-Team: Test\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && " "(n%100<10 || n%100>=20) ? 1 : 2)\n" @@ -19,32 +19,32 @@ "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -#: rhodecode/controllers/changelog.py:95 +#: rhodecode/controllers/changelog.py:149 msgid "All Branches" msgstr "Wszystkie gałęzie" -#: rhodecode/controllers/changeset.py:83 +#: rhodecode/controllers/changeset.py:84 #, fuzzy msgid "Show white space" msgstr "pokazuj spacje" -#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97 +#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98 #, fuzzy msgid "Ignore white space" msgstr "ignoruj pokazywanie spacji" -#: rhodecode/controllers/changeset.py:163 +#: rhodecode/controllers/changeset.py:164 #, python-format msgid "%s line context" msgstr "%s linia w kontekście" -#: rhodecode/controllers/changeset.py:329 -#: rhodecode/controllers/pullrequests.py:438 +#: rhodecode/controllers/changeset.py:345 +#: rhodecode/controllers/pullrequests.py:481 #, python-format msgid "Status change -> %s" msgstr "Zmiana statusu -> %s" -#: rhodecode/controllers/changeset.py:360 +#: rhodecode/controllers/changeset.py:376 msgid "" "Changing status on a changeset associated with a closed pull request is " "not allowed" @@ -53,8 +53,7 @@ "niedozwolona" #: rhodecode/controllers/compare.py:74 -#: rhodecode/controllers/pullrequests.py:167 -#: rhodecode/controllers/shortlog.py:100 +#: rhodecode/controllers/pullrequests.py:259 msgid "There are no changesets yet" msgstr "Brak zestawienia zmian" @@ -99,8 +98,8 @@ msgstr "%s %s zasilać" #: rhodecode/controllers/feed.py:86 -#: rhodecode/templates/changeset/changeset.html:134 -#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/changeset/changeset.html:141 +#: rhodecode/templates/changeset/changeset.html:153 #: rhodecode/templates/compare/compare_diff.html:58 #: rhodecode/templates/compare/compare_diff.html:69 #: rhodecode/templates/pullrequests/pullrequest_show.html:131 @@ -108,118 +107,119 @@ 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:91 +#: rhodecode/controllers/feed.py:90 #, fuzzy, python-format msgid "%s committed on %s" msgstr "%s zakomitowal w %s" -#: rhodecode/controllers/files.py:88 +#: rhodecode/controllers/files.py:89 #, fuzzy msgid "Click here to add new file" msgstr "Kliknij tutaj, by dodać nowy plik" -#: rhodecode/controllers/files.py:89 +#: rhodecode/controllers/files.py:90 #, python-format msgid "There are no files yet %s" msgstr "Brak plików %s" -#: rhodecode/controllers/files.py:267 rhodecode/controllers/files.py:335 +#: rhodecode/controllers/files.py:271 rhodecode/controllers/files.py:339 #, 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:279 +#: rhodecode/controllers/files.py:283 msgid "You can only edit files with revision being a valid branch " -msgstr "" - -#: rhodecode/controllers/files.py:293 +msgstr "Można tylko edytować pliki z rewizji obecnej gałęzi" + +#: rhodecode/controllers/files.py:297 #, fuzzy, python-format msgid "Edited file %s via RhodeCode" msgstr "Edytowanie %s w RhodeCode" -#: rhodecode/controllers/files.py:309 +#: rhodecode/controllers/files.py:313 msgid "No changes" msgstr "Bez zmian" -#: rhodecode/controllers/files.py:318 rhodecode/controllers/files.py:388 +#: rhodecode/controllers/files.py:322 rhodecode/controllers/files.py:394 #, python-format msgid "Successfully committed to %s" msgstr "Committ wykonany do %s" -#: rhodecode/controllers/files.py:323 rhodecode/controllers/files.py:394 +#: rhodecode/controllers/files.py:327 rhodecode/controllers/files.py:405 msgid "Error occurred during commit" msgstr "Wystąpił błąd w trakcie zatwierdzania" -#: rhodecode/controllers/files.py:347 +#: rhodecode/controllers/files.py:351 #, fuzzy msgid "Added file via RhodeCode" msgstr "Dodano %s poprzez RhodeCode" -#: rhodecode/controllers/files.py:364 +#: rhodecode/controllers/files.py:368 msgid "No content" msgstr "Brak treści" -#: rhodecode/controllers/files.py:368 +#: rhodecode/controllers/files.py:372 msgid "No filename" msgstr "Brak nazwy pliku" -#: rhodecode/controllers/files.py:372 +#: rhodecode/controllers/files.py:397 msgid "Location must be relative path and must not contain .. in path" -msgstr "" - -#: rhodecode/controllers/files.py:420 +msgstr "Lokalizacja musi być ścieżką względną i nie może zawierać .. ścieżki" + +#: rhodecode/controllers/files.py:431 #, fuzzy msgid "Downloads disabled" msgstr "Pobieranie wyłączone" -#: rhodecode/controllers/files.py:431 +#: rhodecode/controllers/files.py:442 #, python-format msgid "Unknown revision %s" msgstr "Nieznana wersja %s" -#: rhodecode/controllers/files.py:433 +#: rhodecode/controllers/files.py:444 msgid "Empty repository" msgstr "Puste repozytorium" -#: rhodecode/controllers/files.py:435 +#: rhodecode/controllers/files.py:446 msgid "Unknown archive type" msgstr "Nieznany typ archiwum" -#: rhodecode/controllers/files.py:617 +#: rhodecode/controllers/files.py:631 #: rhodecode/templates/changeset/changeset_range.html:9 +#: rhodecode/templates/email_templates/pull_request.html:12 +#: rhodecode/templates/pullrequests/pullrequest.html:124 msgid "Changesets" msgstr "Różnice" -#: rhodecode/controllers/files.py:618 rhodecode/controllers/pullrequests.py:131 -#: rhodecode/controllers/summary.py:247 rhodecode/model/scm.py:606 +#: rhodecode/controllers/files.py:632 rhodecode/controllers/pullrequests.py:152 +#: rhodecode/controllers/summary.py:76 rhodecode/model/scm.py:682 #: rhodecode/templates/switch_to_list.html:3 #: rhodecode/templates/branches/branches.html:10 msgid "Branches" msgstr "Gałęzie" -#: rhodecode/controllers/files.py:619 rhodecode/controllers/pullrequests.py:132 -#: rhodecode/controllers/summary.py:248 rhodecode/model/scm.py:617 +#: rhodecode/controllers/files.py:633 rhodecode/controllers/pullrequests.py:153 +#: rhodecode/controllers/summary.py:77 rhodecode/model/scm.py:693 #: 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:175 +#: rhodecode/controllers/forks.py:176 #, fuzzy, python-format msgid "Forked repository %s as %s" msgstr "gałęzi %s w repozytorium %s" -#: rhodecode/controllers/forks.py:189 +#: rhodecode/controllers/forks.py:190 #, python-format msgid "An error occurred during repository forking %s" msgstr "Wystąpił błąd podczas rozgałęzienia %s repozytorium" -#: rhodecode/controllers/journal.py:275 rhodecode/controllers/journal.py:318 +#: rhodecode/controllers/journal.py:110 rhodecode/controllers/journal.py:153 msgid "public journal" msgstr "Dziennik publiczny" -#: rhodecode/controllers/journal.py:279 rhodecode/controllers/journal.py:322 +#: rhodecode/controllers/journal.py:114 rhodecode/controllers/journal.py:157 #: rhodecode/templates/journal/journal.html:12 msgid "journal" msgstr "dziennik" @@ -239,76 +239,76 @@ "email" msgstr "Twoje hasło zostało zresetowane, nowe hasło zostanie wysłane na e-mail" -#: rhodecode/controllers/pullrequests.py:118 +#: rhodecode/controllers/pullrequests.py:139 #: rhodecode/templates/changeset/changeset.html:10 -#: rhodecode/templates/email_templates/changeset_comment.html:15 +#: rhodecode/templates/email_templates/changeset_comment.html:8 msgid "Changeset" msgstr "Grupy zmian" -#: rhodecode/controllers/pullrequests.py:128 +#: rhodecode/controllers/pullrequests.py:149 msgid "Special" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:129 +msgstr "Specjalne" + +#: rhodecode/controllers/pullrequests.py:150 #, fuzzy msgid "Peer branches" msgstr "gałęzie" -#: rhodecode/controllers/pullrequests.py:130 rhodecode/model/scm.py:612 +#: rhodecode/controllers/pullrequests.py:151 rhodecode/model/scm.py:688 #: rhodecode/templates/switch_to_list.html:28 #: rhodecode/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "Zakładki" -#: rhodecode/controllers/pullrequests.py:228 +#: rhodecode/controllers/pullrequests.py:324 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:230 +#: rhodecode/controllers/pullrequests.py:326 #, fuzzy msgid "Error creating pull request" msgstr "błąd podczas tworzenia prośby o łączenie gałęzi" -#: rhodecode/controllers/pullrequests.py:251 +#: rhodecode/controllers/pullrequests.py:346 msgid "Successfully opened new pull request" msgstr "Prośba o wykonanie połączenia gałęzi została wykonana prawidłowo" -#: rhodecode/controllers/pullrequests.py:254 +#: rhodecode/controllers/pullrequests.py:349 msgid "Error occurred during sending pull request" msgstr "Wystąpił błąd podczas prośby o połączenie gałęzi" -#: rhodecode/controllers/pullrequests.py:287 +#: rhodecode/controllers/pullrequests.py:388 msgid "Successfully deleted pull request" msgstr "Prośba o skasowanie połączenia gałęzi została wykonana prawidłowo" -#: rhodecode/controllers/pullrequests.py:441 +#: rhodecode/controllers/pullrequests.py:484 msgid "Closing with" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:478 +msgstr "Zamykanie" + +#: rhodecode/controllers/pullrequests.py:521 #, fuzzy msgid "Closing pull request on other statuses than rejected or approved forbidden" msgstr "" "Zamknij wszystkie wnioski połączenia gałęzi innych stanów niż odrzucony, " "zatwierdzony lub zabroniony" -#: rhodecode/controllers/search.py:134 +#: rhodecode/controllers/search.py:132 msgid "Invalid search query. Try quoting it." msgstr "Nieprawidłowe zapytania. Spróbuj zacytować go." -#: rhodecode/controllers/search.py:139 +#: rhodecode/controllers/search.py:137 msgid "There is no index to search in. Please run whoosh indexer" msgstr "Nie ma szukanego indeksu. Proszę uruchomić indeksowanie whoosh" -#: rhodecode/controllers/search.py:143 +#: rhodecode/controllers/search.py:141 msgid "An error occurred during this search operation" msgstr "Wystąpił błąd podczas wyszukiwania tej operacji" -#: rhodecode/controllers/summary.py:141 +#: rhodecode/controllers/summary.py:182 msgid "No data loaded yet" msgstr "Żadne dane nie zostały załadowane" -#: rhodecode/controllers/summary.py:147 +#: rhodecode/controllers/summary.py:188 #: rhodecode/templates/summary/summary.html:149 msgid "Statistics are disabled for this repository" msgstr "Statystyki są wyłączone dla tego repozytorium" @@ -322,6 +322,45 @@ msgid "Error occurred during update of defaults" msgstr "wystąpił błąd podczas aktualizacji wartości domyślnych" +#: rhodecode/controllers/admin/gists.py:56 +#, fuzzy +msgid "forever" +msgstr "recenzent" + +#: rhodecode/controllers/admin/gists.py:57 +#, fuzzy +msgid "5 minutes" +msgstr "%d minuta" + +#: rhodecode/controllers/admin/gists.py:58 +#, fuzzy +msgid "1 hour" +msgstr "%d godzina" + +#: rhodecode/controllers/admin/gists.py:59 +#, fuzzy +msgid "1 day" +msgstr "%d dzień" + +#: rhodecode/controllers/admin/gists.py:60 +#, fuzzy +msgid "1 month" +msgstr "%d miesiąc" + +#: rhodecode/controllers/admin/gists.py:62 +msgid "Lifetime" +msgstr "" + +#: rhodecode/controllers/admin/gists.py:127 +#, fuzzy +msgid "Error occurred during gist creation" +msgstr "Wystąpił błąd podczas tworzenia hooku" + +#: rhodecode/controllers/admin/gists.py:165 +#, fuzzy, python-format +msgid "Deleted gist %s" +msgstr "usunięte repozytorium %s" + #: rhodecode/controllers/admin/ldap_settings.py:50 msgid "BASE" msgstr "PODSTAWA" @@ -366,36 +405,40 @@ msgid "START_TLS on LDAP connection" msgstr "START_TLS dla połączenia LDAP" -#: rhodecode/controllers/admin/ldap_settings.py:126 +#: rhodecode/controllers/admin/ldap_settings.py:124 msgid "LDAP settings updated successfully" msgstr "Ustawienia LDAP zostały zaktualizowane" -#: rhodecode/controllers/admin/ldap_settings.py:130 +#: rhodecode/controllers/admin/ldap_settings.py:128 msgid "Unable to activate ldap. The \"python-ldap\" library is missing." msgstr "Nie można uaktywnić ldap.\"Python-ldap\" brakuje library." -#: rhodecode/controllers/admin/ldap_settings.py:147 +#: rhodecode/controllers/admin/ldap_settings.py:145 #, fuzzy msgid "Error occurred during update of ldap settings" msgstr "Wystąpił błąd podczas aktualizacji ustawień ldap" +#: rhodecode/controllers/admin/permissions.py:58 +#: rhodecode/controllers/admin/permissions.py:62 +#: rhodecode/controllers/admin/permissions.py:66 +msgid "None" +msgstr "Brak" + +#: rhodecode/controllers/admin/permissions.py:59 +#: rhodecode/controllers/admin/permissions.py:63 +#: rhodecode/controllers/admin/permissions.py:67 +msgid "Read" +msgstr "Odczyt" + #: rhodecode/controllers/admin/permissions.py:60 #: rhodecode/controllers/admin/permissions.py:64 -msgid "None" -msgstr "Brak" +#: rhodecode/controllers/admin/permissions.py:68 +msgid "Write" +msgstr "Zapis" #: rhodecode/controllers/admin/permissions.py:61 #: rhodecode/controllers/admin/permissions.py:65 -msgid "Read" -msgstr "Odczyt" - -#: rhodecode/controllers/admin/permissions.py:62 -#: rhodecode/controllers/admin/permissions.py:66 -msgid "Write" -msgstr "Zapis" - -#: rhodecode/controllers/admin/permissions.py:63 -#: rhodecode/controllers/admin/permissions.py:67 +#: rhodecode/controllers/admin/permissions.py:69 #: rhodecode/templates/admin/defaults/defaults.html:9 #: rhodecode/templates/admin/ldap/ldap.html:9 #: rhodecode/templates/admin/permissions/permissions.html:9 @@ -416,44 +459,58 @@ #: 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:292 -#: rhodecode/templates/base/base.html:293 -#: rhodecode/templates/base/base.html:299 -#: rhodecode/templates/base/base.html:300 +#: rhodecode/templates/base/base.html:317 +#: rhodecode/templates/base/base.html:318 +#: rhodecode/templates/base/base.html:324 +#: rhodecode/templates/base/base.html:325 msgid "Admin" msgstr "Administracja" -#: rhodecode/controllers/admin/permissions.py:70 -#: rhodecode/controllers/admin/permissions.py:76 -#: rhodecode/controllers/admin/permissions.py:79 +#: rhodecode/controllers/admin/permissions.py:72 +#: rhodecode/controllers/admin/permissions.py:83 +#: rhodecode/controllers/admin/permissions.py:86 +#: rhodecode/controllers/admin/permissions.py:89 +#: rhodecode/controllers/admin/permissions.py:92 msgid "Disabled" msgstr "Wyłączone" -#: rhodecode/controllers/admin/permissions.py:72 +#: rhodecode/controllers/admin/permissions.py:74 #, fuzzy msgid "Allowed with manual account activation" msgstr "dozwolona z ręczną aktywacją konta" -#: rhodecode/controllers/admin/permissions.py:74 +#: rhodecode/controllers/admin/permissions.py:76 #, fuzzy msgid "Allowed with automatic account activation" msgstr "dozwolona z automatyczną aktywacją konta" -#: rhodecode/controllers/admin/permissions.py:77 +#: rhodecode/controllers/admin/permissions.py:79 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1439 rhodecode/model/db.py:1444 +msgid "Manual activation of external account" +msgstr "" + #: rhodecode/controllers/admin/permissions.py:80 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1440 rhodecode/model/db.py:1445 +msgid "Automatic activation of external account" +msgstr "" + +#: rhodecode/controllers/admin/permissions.py:84 +#: rhodecode/controllers/admin/permissions.py:87 +#: rhodecode/controllers/admin/permissions.py:90 +#: rhodecode/controllers/admin/permissions.py:93 msgid "Enabled" msgstr "Włączone" -#: rhodecode/controllers/admin/permissions.py:128 +#: rhodecode/controllers/admin/permissions.py:138 msgid "Default permissions updated successfully" msgstr "Domyślne uprawnienia zaktualizowane pomyślnie" -#: rhodecode/controllers/admin/permissions.py:142 +#: rhodecode/controllers/admin/permissions.py:152 #, fuzzy msgid "Error occurred during update of permissions" msgstr "wystąpił błąd podczas aktualizacji uprawnień" -#: rhodecode/controllers/admin/repos.py:127 +#: rhodecode/controllers/admin/repos.py:128 msgid "--REMOVE FORK--" msgstr "--USUŃ ROZGAŁĘZIENIE--" @@ -472,244 +529,237 @@ msgid "Error creating repository %s" msgstr "utworzone repozytorium %s" -#: rhodecode/controllers/admin/repos.py:266 +#: rhodecode/controllers/admin/repos.py:270 #, python-format msgid "Repository %s updated successfully" msgstr "Repozytorium %s zostało pomyślnie zaktualizowane" -#: rhodecode/controllers/admin/repos.py:284 +#: rhodecode/controllers/admin/repos.py:288 #, 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 +#: rhodecode/controllers/admin/repos.py:315 #, python-format msgid "Detached %s forks" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:314 -#: rhodecode/controllers/api/api.py:879 +msgstr "Oderwane rozgałęzienie %s" + +#: rhodecode/controllers/admin/repos.py:318 #, fuzzy, python-format msgid "Deleted %s forks" msgstr "usunięte repozytorium %s" -#: rhodecode/controllers/admin/repos.py:319 +#: rhodecode/controllers/admin/repos.py:323 #, fuzzy, python-format msgid "Deleted repository %s" msgstr "usunięte repozytorium %s" -#: rhodecode/controllers/admin/repos.py:322 +#: rhodecode/controllers/admin/repos.py:326 #, 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:327 +#: rhodecode/controllers/admin/repos.py:331 #, python-format msgid "An error occurred during deletion of %s" msgstr "Wystąpił błąd podczas usuwania %s" -#: rhodecode/controllers/admin/repos.py:365 +#: rhodecode/controllers/admin/repos.py:345 #, 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: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:421 +#: rhodecode/controllers/admin/repos.py:375 +#: rhodecode/controllers/admin/repos_groups.py:332 +#: rhodecode/controllers/admin/users_groups.py:312 +#, fuzzy +msgid "An error occurred during revoking of permission" +msgstr "wystąpił błąd podczas aktualizacji uprawnień" + +#: rhodecode/controllers/admin/repos.py:392 msgid "An error occurred during deletion of repository stats" msgstr "Wystąpił błąd podczas usuwania z repozytorium statystyk" -#: rhodecode/controllers/admin/repos.py:438 +#: rhodecode/controllers/admin/repos.py:409 msgid "An error occurred during cache invalidation" msgstr "Wystąpił błąd podczas unieważniania cache" -#: rhodecode/controllers/admin/repos.py:458 -#: rhodecode/controllers/admin/repos.py:485 +#: rhodecode/controllers/admin/repos.py:429 +#: rhodecode/controllers/admin/repos.py:456 msgid "An error occurred during unlocking" msgstr "Wystąpił błąd podczas odblokowywania" -#: rhodecode/controllers/admin/repos.py:476 +#: rhodecode/controllers/admin/repos.py:447 #, fuzzy msgid "Unlocked" msgstr "Odblokowany" -#: rhodecode/controllers/admin/repos.py:479 +#: rhodecode/controllers/admin/repos.py:450 #, fuzzy msgid "Locked" msgstr "zablokowany" -#: rhodecode/controllers/admin/repos.py:481 +#: rhodecode/controllers/admin/repos.py:452 #, python-format msgid "Repository has been %s" msgstr "Repozytoriów jest %s" -#: rhodecode/controllers/admin/repos.py:505 +#: rhodecode/controllers/admin/repos.py:476 msgid "Updated repository visibility in public journal" msgstr "Zaktualizowano widoczność stron w publicznym dzienniku" -#: rhodecode/controllers/admin/repos.py:509 +#: rhodecode/controllers/admin/repos.py:480 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:514 rhodecode/model/validators.py:302 +#: rhodecode/controllers/admin/repos.py:485 rhodecode/model/validators.py:302 msgid "Token mismatch" msgstr "Niezgodność tokenu" -#: rhodecode/controllers/admin/repos.py:527 +#: rhodecode/controllers/admin/repos.py:498 msgid "Pulled from remote location" msgstr "Pobieranie z lokalizacji zdalnej" -#: rhodecode/controllers/admin/repos.py:529 +#: rhodecode/controllers/admin/repos.py:501 msgid "An error occurred during pull from remote location" msgstr "Wystąpił błąd podczas pobierania z lokalizacji zdalnej" -#: rhodecode/controllers/admin/repos.py:545 +#: rhodecode/controllers/admin/repos.py:517 msgid "Nothing" msgstr "Brak" -#: rhodecode/controllers/admin/repos.py:547 +#: rhodecode/controllers/admin/repos.py:519 #, python-format msgid "Marked repo %s as fork of %s" msgstr "Oznaczono %s repo jako rozwidlenie %s" -#: rhodecode/controllers/admin/repos.py:551 +#: rhodecode/controllers/admin/repos.py:523 msgid "An error occurred during this operation" msgstr "Wystąpił błąd podczas tej operacji" -#: rhodecode/controllers/admin/repos.py:590 +#: rhodecode/controllers/admin/repos.py:562 #, 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 +#: rhodecode/controllers/admin/repos.py:576 #, 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 +#: rhodecode/controllers/admin/repos_groups.py:147 #, fuzzy, python-format msgid "Created repository group %s" msgstr "utworzono grupę repo %s" -#: rhodecode/controllers/admin/repos_groups.py:157 +#: rhodecode/controllers/admin/repos_groups.py:159 #, 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:214 -#: rhodecode/controllers/admin/repos_groups.py:286 -msgid "Cannot revoke permission for yourself as admin" -msgstr "" - -#: rhodecode/controllers/admin/repos_groups.py:220 +#: rhodecode/controllers/admin/repos_groups.py:217 #, fuzzy, python-format msgid "Updated repository group %s" msgstr "zaktualizowano grupę repo %s" -#: rhodecode/controllers/admin/repos_groups.py:235 +#: rhodecode/controllers/admin/repos_groups.py:232 #, 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:253 +#: rhodecode/controllers/admin/repos_groups.py:250 #, 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:260 +#: rhodecode/controllers/admin/repos_groups.py:257 #, 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 +#: rhodecode/controllers/admin/repos_groups.py:263 #, fuzzy, python-format msgid "Removed repository group %s" msgstr "usunięto grupę repo %s" -#: rhodecode/controllers/admin/repos_groups.py:271 +#: rhodecode/controllers/admin/repos_groups.py:268 #, 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: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: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:126 +#: rhodecode/controllers/admin/repos_groups.py:279 +#: rhodecode/controllers/admin/repos_groups.py:314 +#: rhodecode/controllers/admin/users_groups.py:300 +msgid "Cannot revoke permission for yourself as admin" +msgstr "Nie można cofnąć zezwolenia dla admina jako admin" + +#: rhodecode/controllers/admin/repos_groups.py:294 +#, fuzzy +msgid "Repository Group permissions updated" +msgstr "Repozytorium wyłączone" + +#: rhodecode/controllers/admin/settings.py:123 #, 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:135 +#: rhodecode/controllers/admin/settings.py:132 msgid "Whoosh reindex task scheduled" msgstr "Zadanie ponownej indeksacji whoosh zostało zaplanowane" -#: rhodecode/controllers/admin/settings.py:166 +#: rhodecode/controllers/admin/settings.py:163 msgid "Updated application settings" msgstr "Aktualizacja ustawień aplikacji" -#: rhodecode/controllers/admin/settings.py:170 -#: rhodecode/controllers/admin/settings.py:301 +#: rhodecode/controllers/admin/settings.py:167 +#: rhodecode/controllers/admin/settings.py:304 #, fuzzy msgid "Error occurred during updating application settings" msgstr "wystąpił błąd podczas aktualizacji ustawień aplikacji" -#: rhodecode/controllers/admin/settings.py:216 +#: rhodecode/controllers/admin/settings.py:219 msgid "Updated visualisation settings" msgstr "Aktualizacja ustawień wizualizacji" -#: rhodecode/controllers/admin/settings.py:221 +#: rhodecode/controllers/admin/settings.py:224 #, fuzzy msgid "Error occurred during updating visualisation settings" msgstr "Wystąpił błąd podczas aktualizacji ustawień wizualizacji" -#: rhodecode/controllers/admin/settings.py:297 +#: rhodecode/controllers/admin/settings.py:300 msgid "Updated VCS settings" msgstr "Aktualizacja ustawień VCS" -#: rhodecode/controllers/admin/settings.py:311 +#: rhodecode/controllers/admin/settings.py:314 msgid "Added new hook" msgstr "Dodano nowy hook" -#: rhodecode/controllers/admin/settings.py:323 +#: rhodecode/controllers/admin/settings.py:326 msgid "Updated hooks" msgstr "Aktualizacja hooku" -#: rhodecode/controllers/admin/settings.py:327 +#: rhodecode/controllers/admin/settings.py:330 #, fuzzy msgid "Error occurred during hook creation" msgstr "Wystąpił błąd podczas tworzenia hooku" -#: rhodecode/controllers/admin/settings.py:346 +#: rhodecode/controllers/admin/settings.py:349 msgid "Email task created" msgstr "E-mail został wysłany" -#: rhodecode/controllers/admin/settings.py:410 +#: rhodecode/controllers/admin/settings.py:413 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:452 +#: rhodecode/controllers/admin/settings.py:455 msgid "Your account was updated successfully" msgstr "Twoje konto zostało pomyślnie zaktualizowane" -#: rhodecode/controllers/admin/settings.py:467 +#: rhodecode/controllers/admin/settings.py:470 #: rhodecode/controllers/admin/users.py:198 #, fuzzy, python-format msgid "Error occurred during update of user %s" @@ -738,119 +788,98 @@ msgid "An error occurred during deletion of user" msgstr "Wystąpił błąd podczas usuwania użytkownika" -#: rhodecode/controllers/admin/users.py:233 +#: rhodecode/controllers/admin/users.py:234 msgid "You can't edit this user" msgstr "Nie możesz edytować tego użytkownika" -#: rhodecode/controllers/admin/users.py:276 -msgid "Granted 'repository create' permission to user" -msgstr "Przyznano użytkownikowi uprawnienie do 'tworzenia repozytorium'" - -#: rhodecode/controllers/admin/users.py:281 -msgid "Revoked 'repository create' permission to user" -msgstr "Cofnięto użytkownikowi uprawnienie do 'tworzenia repozytorium'" - -#: rhodecode/controllers/admin/users.py:287 -msgid "Granted 'repository fork' permission to user" -msgstr "Przyznano użytkownikowi uprawnienie do 'tworzenia rozgałęzień'" - -#: rhodecode/controllers/admin/users.py:292 -msgid "Revoked 'repository fork' permission to user" -msgstr "Cofnięto użytkownikowi uprawnienie do 'tworzenia rozgałęzień'" - -#: rhodecode/controllers/admin/users.py:298 -#: rhodecode/controllers/admin/users_groups.py:281 +#: rhodecode/controllers/admin/users.py:293 +#: rhodecode/controllers/admin/users_groups.py:372 +#, fuzzy +msgid "Updated permissions" +msgstr "Skopiuj uprawnienia" + +#: rhodecode/controllers/admin/users.py:297 +#: rhodecode/controllers/admin/users_groups.py:376 msgid "An error occurred during permissions saving" msgstr "Wystąpił błąd podczas zapisywania uprawnień" -#: rhodecode/controllers/admin/users.py:312 +#: rhodecode/controllers/admin/users.py:311 #, python-format msgid "Added email %s to user" msgstr "Dodano e-mail %s do użytkownika" -#: rhodecode/controllers/admin/users.py:318 +#: rhodecode/controllers/admin/users.py:317 msgid "An error occurred during email saving" msgstr "Wystąpił błąd podczas zapisywania e-maila" -#: rhodecode/controllers/admin/users.py:328 +#: rhodecode/controllers/admin/users.py:327 msgid "Removed email from user" msgstr "Usunięto e-mail użytkownikowi" -#: rhodecode/controllers/admin/users.py:341 +#: rhodecode/controllers/admin/users.py:340 #, fuzzy, python-format msgid "Added ip %s to user" msgstr "Dodano e-mail %s do użytkownika" -#: rhodecode/controllers/admin/users.py:347 +#: rhodecode/controllers/admin/users.py:346 #, fuzzy msgid "An error occurred during ip saving" msgstr "Wystąpił błąd podczas zapisywania e-maila" -#: rhodecode/controllers/admin/users.py:359 +#: rhodecode/controllers/admin/users.py:358 #, fuzzy msgid "Removed ip from user" msgstr "Usunięto e-mail użytkownikowi" -#: rhodecode/controllers/admin/users_groups.py:86 +#: rhodecode/controllers/admin/users_groups.py:162 #, fuzzy, python-format msgid "Created user group %s" msgstr "utworzono grupę użytkowników %s" -#: rhodecode/controllers/admin/users_groups.py:97 +#: rhodecode/controllers/admin/users_groups.py:173 #, 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:166 +#: rhodecode/controllers/admin/users_groups.py:210 #, fuzzy, python-format msgid "Updated user group %s" msgstr "zaktualizowano grupę użytkowników %s" -#: rhodecode/controllers/admin/users_groups.py:188 +#: rhodecode/controllers/admin/users_groups.py:232 #, 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:205 +#: rhodecode/controllers/admin/users_groups.py:250 #, fuzzy msgid "Successfully deleted user group" msgstr "grupa użytkowników została usunięta z powodzeniem" -#: rhodecode/controllers/admin/users_groups.py:210 +#: rhodecode/controllers/admin/users_groups.py:255 #, 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: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: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: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: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:530 +#: rhodecode/controllers/admin/users_groups.py:274 +msgid "Target group cannot be the same" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:280 +#, fuzzy +msgid "User Group permissions updated" +msgstr "Repozytorium wyłączone" + +#: rhodecode/lib/auth.py:544 #, fuzzy, python-format msgid "IP %s not allowed" msgstr "Obserwatorzy %s" -#: rhodecode/lib/auth.py:579 +#: rhodecode/lib/auth.py:593 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:620 +#: rhodecode/lib/auth.py:634 msgid "You need to be a signed in to view this page" msgstr "Musisz być zalogowany, żeby oglądać stronę" @@ -869,154 +898,183 @@ msgid "No changes detected" msgstr "Nie wykryto zmian" -#: rhodecode/lib/helpers.py:394 +#: rhodecode/lib/helpers.py:428 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "%d.%m.%Y, %H:%M:%S" -#: rhodecode/lib/helpers.py:506 +#: rhodecode/lib/helpers.py:539 msgid "True" msgstr "Prawda" -#: rhodecode/lib/helpers.py:509 +#: rhodecode/lib/helpers.py:542 msgid "False" msgstr "Fałsz" -#: rhodecode/lib/helpers.py:547 +#: rhodecode/lib/helpers.py:580 #, python-format msgid "Deleted branch: %s" msgstr "Usunięta gałąź: %s" -#: rhodecode/lib/helpers.py:550 +#: rhodecode/lib/helpers.py:583 #, python-format msgid "Created tag: %s" msgstr "Utworzony tag: %s" -#: rhodecode/lib/helpers.py:563 +#: rhodecode/lib/helpers.py:596 msgid "Changeset not found" msgstr "Nie znaleziono changeset" -#: rhodecode/lib/helpers.py:615 +#: rhodecode/lib/helpers.py:646 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Pokaż wszystkie zestawienia zmian changesets %s->%s" -#: rhodecode/lib/helpers.py:621 +#: rhodecode/lib/helpers.py:652 msgid "compare view" msgstr "Wyświetl porównanie" -#: rhodecode/lib/helpers.py:641 +#: rhodecode/lib/helpers.py:672 msgid "and" msgstr "i" -#: rhodecode/lib/helpers.py:642 +#: rhodecode/lib/helpers.py:673 #, python-format msgid "%s more" msgstr "%s więcej" -#: rhodecode/lib/helpers.py:643 rhodecode/templates/changelog/changelog.html:44 +#: rhodecode/lib/helpers.py:674 rhodecode/templates/changelog/changelog.html:53 msgid "revisions" msgstr "rewizja" -#: rhodecode/lib/helpers.py:667 +#: rhodecode/lib/helpers.py:698 #, python-format msgid "fork name %s" msgstr "nazwa rozgałęzienia %s" -#: rhodecode/lib/helpers.py:684 +#: rhodecode/lib/helpers.py:715 #: rhodecode/templates/pullrequests/pullrequest_show.html:8 #, python-format msgid "Pull request #%s" msgstr "Połączonych gałęzi #%s" -#: rhodecode/lib/helpers.py:690 +#: rhodecode/lib/helpers.py:725 msgid "[deleted] repository" msgstr "[usunięte] repozytorium" -#: rhodecode/lib/helpers.py:692 rhodecode/lib/helpers.py:702 +#: rhodecode/lib/helpers.py:727 rhodecode/lib/helpers.py:739 msgid "[created] repository" msgstr "[utworzone] repozytorium" -#: rhodecode/lib/helpers.py:694 +#: rhodecode/lib/helpers.py:729 msgid "[created] repository as fork" msgstr "[utworzone] repozytorium jako rozgałęzienie" -#: rhodecode/lib/helpers.py:696 rhodecode/lib/helpers.py:704 +#: rhodecode/lib/helpers.py:731 rhodecode/lib/helpers.py:741 msgid "[forked] repository" msgstr "[rozgałęzione] repozytorium" -#: rhodecode/lib/helpers.py:698 rhodecode/lib/helpers.py:706 +#: rhodecode/lib/helpers.py:733 rhodecode/lib/helpers.py:743 msgid "[updated] repository" msgstr "[zaktualizowane] repozytorium" -#: rhodecode/lib/helpers.py:700 +#: rhodecode/lib/helpers.py:735 +#, fuzzy +msgid "[downloaded] archive from repository" +msgstr "Pliki do pobrania są zostały wyłączone dla tego repozytorium" + +#: rhodecode/lib/helpers.py:737 msgid "[delete] repository" msgstr "[skasowane] repozytorium" -#: rhodecode/lib/helpers.py:708 +#: rhodecode/lib/helpers.py:745 msgid "[created] user" msgstr "[utworzony] użytkownik" -#: rhodecode/lib/helpers.py:710 +#: rhodecode/lib/helpers.py:747 msgid "[updated] user" msgstr "[zaktualizowany] użytkownik" -#: rhodecode/lib/helpers.py:712 +#: rhodecode/lib/helpers.py:749 #, fuzzy msgid "[created] user group" msgstr "[utworzona] grupa użytkowników" -#: rhodecode/lib/helpers.py:714 +#: rhodecode/lib/helpers.py:751 #, fuzzy msgid "[updated] user group" msgstr "[zaktualizowana] grupa użytkowników" -#: rhodecode/lib/helpers.py:716 +#: rhodecode/lib/helpers.py:753 msgid "[commented] on revision in repository" msgstr "[komentarz] do zmiany w repozytorium" -#: rhodecode/lib/helpers.py:718 +#: rhodecode/lib/helpers.py:755 msgid "[commented] on pull request for" msgstr "[komentarz] wniosek o połączenie gałęzi" -#: rhodecode/lib/helpers.py:720 +#: rhodecode/lib/helpers.py:757 msgid "[closed] pull request for" msgstr "[zamknięty] wniosek o połączenie gałęzi" -#: rhodecode/lib/helpers.py:722 +#: rhodecode/lib/helpers.py:759 msgid "[pushed] into" msgstr "[wysłane zmiany] w" -#: rhodecode/lib/helpers.py:724 +#: rhodecode/lib/helpers.py:761 msgid "[committed via RhodeCode] into repository" msgstr "[committed przez RhodeCode] do repozytorium" -#: rhodecode/lib/helpers.py:726 +#: rhodecode/lib/helpers.py:763 msgid "[pulled from remote] into repository" msgstr "[pobieranie z zdalnego] do repozytorium" -#: rhodecode/lib/helpers.py:728 +#: rhodecode/lib/helpers.py:765 msgid "[pulled] from" msgstr "[pobrano] z" -#: rhodecode/lib/helpers.py:730 +#: rhodecode/lib/helpers.py:767 msgid "[started following] repository" msgstr "[start następnego] repozytorium" -#: rhodecode/lib/helpers.py:732 +#: rhodecode/lib/helpers.py:769 msgid "[stopped following] repository" msgstr "[zatrzymany po] repozytorium" -#: rhodecode/lib/helpers.py:910 +#: rhodecode/lib/helpers.py:1088 #, python-format msgid " and %s more" msgstr "i %s więcej" -#: rhodecode/lib/helpers.py:914 +#: rhodecode/lib/helpers.py:1092 msgid "No Files" msgstr "Brak Plików" -#: rhodecode/lib/helpers.py:1198 +#: rhodecode/lib/helpers.py:1158 +#, fuzzy +msgid "new file" +msgstr "Dodaj nowy plik" + +#: rhodecode/lib/helpers.py:1161 +#, fuzzy +msgid "mod" +msgstr "usunięto" + +#: rhodecode/lib/helpers.py:1164 +#, fuzzy +msgid "del" +msgstr "usuń" + +#: rhodecode/lib/helpers.py:1167 +#, fuzzy +msgid "rename" +msgstr "Nazwa użytkownika" + +#: rhodecode/lib/helpers.py:1172 +msgid "chmod" +msgstr "" + +#: rhodecode/lib/helpers.py:1404 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1032,7 +1090,7 @@ msgid "cannot create new union repository" msgstr "[utworzone] repozytorium" -#: rhodecode/lib/utils2.py:411 +#: rhodecode/lib/utils2.py:410 #, python-format msgid "%d year" msgid_plural "%d years" @@ -1040,7 +1098,7 @@ msgstr[1] "%d lata" msgstr[2] "%d lat" -#: rhodecode/lib/utils2.py:412 +#: rhodecode/lib/utils2.py:411 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1048,7 +1106,7 @@ msgstr[1] "%d miesięcy" msgstr[2] "%d miesięcy" -#: rhodecode/lib/utils2.py:413 +#: rhodecode/lib/utils2.py:412 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1056,7 +1114,7 @@ msgstr[1] "%d dni" msgstr[2] "%d dni" -#: rhodecode/lib/utils2.py:414 +#: rhodecode/lib/utils2.py:413 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1064,7 +1122,7 @@ msgstr[1] "%d godziny" msgstr[2] "%d godzin" -#: rhodecode/lib/utils2.py:415 +#: rhodecode/lib/utils2.py:414 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1072,7 +1130,7 @@ msgstr[1] "%d minuty" msgstr[2] "%d minut" -#: rhodecode/lib/utils2.py:416 +#: rhodecode/lib/utils2.py:415 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -1080,183 +1138,272 @@ msgstr[1] "%d sekund" msgstr[2] "%d sekund" -#: rhodecode/lib/utils2.py:432 +#: rhodecode/lib/utils2.py:431 #, python-format msgid "in %s" msgstr "w %s" -#: rhodecode/lib/utils2.py:434 +#: rhodecode/lib/utils2.py:433 #, python-format msgid "%s ago" msgstr "%s temu" -#: rhodecode/lib/utils2.py:436 +#: rhodecode/lib/utils2.py:435 #, python-format msgid "in %s and %s" msgstr "w %s i %s" -#: rhodecode/lib/utils2.py:439 +#: rhodecode/lib/utils2.py:438 #, python-format msgid "%s and %s ago" msgstr "%s i %s temu" -#: rhodecode/lib/utils2.py:442 +#: rhodecode/lib/utils2.py:441 msgid "just now" msgstr "przed chwilą" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 #: 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 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1303 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1388 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1408 rhodecode/model/db.py:1413 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/lib/dbmigrate/schema/db_1_5_2.py:1290 rhodecode/model/db.py:1389 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1389 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1409 rhodecode/model/db.py:1414 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/lib/dbmigrate/schema/db_1_5_2.py:1291 rhodecode/model/db.py:1390 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1390 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1410 rhodecode/model/db.py:1415 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/lib/dbmigrate/schema/db_1_5_2.py:1292 rhodecode/model/db.py:1391 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1306 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1391 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1411 rhodecode/model/db.py:1416 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/lib/dbmigrate/schema/db_1_5_2.py:1294 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1308 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/lib/dbmigrate/schema/db_1_5_2.py:1295 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1309 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/lib/dbmigrate/schema/db_1_5_2.py:1296 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1310 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/lib/dbmigrate/schema/db_1_5_2.py:1297 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1311 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/lib/dbmigrate/schema/db_1_5_2.py:1299 rhodecode/model/db.py:1398 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1313 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1398 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1406 rhodecode/model/db.py:1411 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/lib/dbmigrate/schema/db_1_5_2.py:1300 rhodecode/model/db.py:1399 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1314 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1399 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1429 rhodecode/model/db.py:1434 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/lib/dbmigrate/schema/db_1_5_2.py:1301 rhodecode/model/db.py:1400 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1315 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1400 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1430 rhodecode/model/db.py:1435 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/lib/dbmigrate/schema/db_1_5_2.py:1302 rhodecode/model/db.py:1401 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1316 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1401 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1432 rhodecode/model/db.py:1437 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/lib/dbmigrate/schema/db_1_5_2.py:1303 rhodecode/model/db.py:1402 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1317 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1402 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1433 rhodecode/model/db.py:1438 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/lib/dbmigrate/schema/db_1_5_2.py:1304 rhodecode/model/db.py:1403 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1318 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.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/lib/dbmigrate/schema/db_1_5_2.py:1305 rhodecode/model/db.py:1404 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1319 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.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/lib/dbmigrate/schema/db_1_5_2.py:1308 rhodecode/model/db.py:1407 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1322 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.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/lib/dbmigrate/schema/db_1_5_2.py:1749 rhodecode/model/db.py:1838 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1763 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1838 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1934 rhodecode/model/db.py:1939 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/lib/dbmigrate/schema/db_1_5_2.py:1750 rhodecode/model/db.py:1839 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1764 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1839 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1935 rhodecode/model/db.py:1940 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/lib/dbmigrate/schema/db_1_5_2.py:1751 rhodecode/model/db.py:1840 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1765 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1840 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1936 rhodecode/model/db.py:1941 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/lib/dbmigrate/schema/db_1_5_2.py:1752 rhodecode/model/db.py:1841 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1766 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1841 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1937 rhodecode/model/db.py:1942 msgid "Under Review" msgstr "Objęty Przeglądem" +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1252 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1270 rhodecode/model/db.py:1275 +msgid "top level" +msgstr "najwyższy poziom" + +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1393 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1413 rhodecode/model/db.py:1418 +#, fuzzy +msgid "Repository group no access" +msgstr "Grupy repozytoriów brak dostępu" + +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1394 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1414 rhodecode/model/db.py:1419 +#, fuzzy +msgid "Repository group read access" +msgstr "Grupy repozytoriów dostęp do odczytu" + +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1395 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1415 rhodecode/model/db.py:1420 +#, fuzzy +msgid "Repository group write access" +msgstr "Grupy repozytoriów dostęp do zapisu" + +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1396 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1416 rhodecode/model/db.py:1421 +#, fuzzy +msgid "Repository group admin access" +msgstr "Repozytoria Grupy dostęp administratora" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1418 rhodecode/model/db.py:1423 +#, fuzzy +msgid "User group no access" +msgstr "Grupy repozytoriów brak dostępu" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1419 rhodecode/model/db.py:1424 +#, fuzzy +msgid "User group read access" +msgstr "Grupy repozytoriów dostęp do odczytu" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1420 rhodecode/model/db.py:1425 +#, fuzzy +msgid "User group write access" +msgstr "Grupy repozytoriów dostęp do zapisu" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1421 rhodecode/model/db.py:1426 +#, fuzzy +msgid "User group admin access" +msgstr "Repozytoria Grupy dostęp administratora" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1423 rhodecode/model/db.py:1428 +#, fuzzy +msgid "Repository Group creation disabled" +msgstr "Repozytorium wyłączone" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1424 rhodecode/model/db.py:1429 +#, fuzzy +msgid "Repository Group creation enabled" +msgstr "Repozytorium włączone" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1426 rhodecode/model/db.py:1431 +#, fuzzy +msgid "User Group creation disabled" +msgstr "Repozytorium wyłączone" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1427 rhodecode/model/db.py:1432 +#, fuzzy +msgid "User Group creation enabled" +msgstr "Repozytorium włączone" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1435 rhodecode/model/db.py:1440 +#, fuzzy +msgid "Registration disabled" +msgstr "Rejestracja wyłączona" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1436 rhodecode/model/db.py:1441 +#, fuzzy +msgid "User Registration with manual account activation" +msgstr "dozwolona z ręczną aktywacją konta" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1437 rhodecode/model/db.py:1442 +#, fuzzy +msgid "User Registration with automatic account activation" +msgstr "dozwolona z automatyczną aktywacją konta" + #: rhodecode/model/comment.py:75 #, python-format msgid "on line %s" msgstr "widziany %s" -#: rhodecode/model/comment.py:219 +#: rhodecode/model/comment.py:220 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" @@ -1275,42 +1422,42 @@ msgid "Enter %(min)i characters or more" msgstr "Wpisz %(min)i lub więcej znaków" -#: rhodecode/model/notification.py:224 +#: rhodecode/model/notification.py:228 #, fuzzy, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "%(user)s skomentował zatwierdzenie %(when)s" -#: rhodecode/model/notification.py:225 +#: rhodecode/model/notification.py:229 #, 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 +#: rhodecode/model/notification.py:230 #, 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 +#: rhodecode/model/notification.py:231 #, 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 +#: rhodecode/model/notification.py:232 #, 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 +#: rhodecode/model/notification.py:233 #, 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 +#: rhodecode/model/pull_request.py:98 #, 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 +#: rhodecode/model/scm.py:674 msgid "latest tip" msgstr "ostatni tip" @@ -1353,7 +1500,7 @@ #: rhodecode/model/user.py:367 #, python-format msgid "Your new RhodeCode password:%s" -msgstr "" +msgstr "Nowe hasło do strony: %s" #: rhodecode/model/validators.py:38 rhodecode/model/validators.py:39 msgid "Value cannot be an empty list" @@ -1370,12 +1517,14 @@ msgstr "Nazwa użytkownika \"%(username)s\" jest zabroniona" #: rhodecode/model/validators.py:89 +#, fuzzy msgid "" "Username may only contain alphanumeric characters underscores, periods or" -" dashes and must begin with alphanumeric character" +" dashes and must begin with alphanumeric character or underscore" msgstr "" "Nazwa użytkownika może zawierać tylko znaki alfanumeryczne, podkreślenia," -" kropki lub myślniki i musi zaczynać się znakiem alfanumerycznym" +" kropki lub myślniki i musi zaczynać się znakiem alfanumerycznym lub " +"podkreśleniem" #: rhodecode/model/validators.py:117 #, python-format @@ -1481,25 +1630,25 @@ 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:557 +#: rhodecode/model/validators.py:559 #, 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:650 +#: rhodecode/model/validators.py:652 msgid "This is not a valid path" msgstr "To nie jest prawidłowa ścieżka" -#: rhodecode/model/validators.py:665 +#: rhodecode/model/validators.py:667 msgid "This e-mail address is already taken" msgstr "Ten adres e-mail jest już zajęty" -#: rhodecode/model/validators.py:685 +#: rhodecode/model/validators.py:687 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "e-mail \"%(email)s\" nie istnieje." -#: rhodecode/model/validators.py:722 +#: rhodecode/model/validators.py:724 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" @@ -1507,22 +1656,28 @@ "Atrybut logowania CN do LDAP należy określić, jest to nazwa atrybutu, " "który jest odpowiednikiem \"username\"" -#: rhodecode/model/validators.py:735 +#: rhodecode/model/validators.py:737 #, 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:767 +#: rhodecode/model/validators.py:769 msgid "Please enter a valid IPv4 or IpV6 address" -msgstr "" - -#: rhodecode/model/validators.py:768 +msgstr "Proszę podać poprawny adres IPv4 lub IPv6" + +#: rhodecode/model/validators.py:770 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" +msgstr "Rozmiar sieci (bity) może mieścić się w zakresie od 0-32 (nie %(bits)r)" + +#: rhodecode/model/validators.py:803 +msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" - -#: rhodecode/model/validators.py:800 -msgid "Key name can only consist of letters, underscore, dash or numbers" +"Klucz nazwy może składać się tylko z liter, podkreślenia, myślnika lub " +"numerów" + +#: rhodecode/model/validators.py:817 +msgid "Filename cannot be inside a directory" msgstr "" #: rhodecode/templates/index.html:5 @@ -1569,32 +1724,31 @@ #: rhodecode/templates/index_base.html:27 msgid "You have admin right to this group, and can edit it" -msgstr "" +msgstr "Jako administrator uprawnienia tej grupy, i możesz je edytować" #: 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 +#: rhodecode/templates/admin/users_groups/users_groups.html:37 msgid "Group name" msgstr "Nazwa grupy" #: 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:270 +#: rhodecode/templates/index_base.html:123 #: rhodecode/templates/admin/repos/repo_add_base.html:56 -#: rhodecode/templates/admin/repos/repo_edit.html:75 +#: rhodecode/templates/admin/repos/repo_edit.html:68 #: rhodecode/templates/admin/repos/repos.html:73 #: 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/email_templates/changeset_comment.html:9 +#: rhodecode/templates/email_templates/pull_request.html:9 #: rhodecode/templates/forks/fork.html:56 -#: rhodecode/templates/pullrequests/pullrequest.html:101 +#: rhodecode/templates/pullrequests/pullrequest.html:43 +#: rhodecode/templates/pullrequests/pullrequest_show.html:81 #: rhodecode/templates/summary/summary.html:106 msgid "Description" msgstr "Opis" @@ -1602,27 +1756,25 @@ #: 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/repo_edit.html:50 #: 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:268 +#: rhodecode/templates/index_base.html:121 #: 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_my_account.html:172 -#: rhodecode/templates/base/perms_summary.html:14 -#: rhodecode/templates/bookmarks/bookmarks.html:34 +#: rhodecode/templates/base/perms_summary.html:37 +#: rhodecode/templates/bookmarks/bookmarks.html:48 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 #: 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:193 -#: rhodecode/templates/journal/journal.html:296 +#: rhodecode/templates/journal/journal.html:283 #: rhodecode/templates/summary/summary.html:55 #: rhodecode/templates/summary/summary.html:124 #: rhodecode/templates/tags/tags.html:48 @@ -1630,117 +1782,86 @@ msgid "Name" msgstr "Nazwa" -#: rhodecode/templates/index_base.html:84 -msgid "Last change" -msgstr "Ostatnia aktywność" - -#: rhodecode/templates/index_base.html:85 -#: rhodecode/templates/index_base.html:183 -#: rhodecode/templates/index_base.html:273 +#: rhodecode/templates/index_base.html:124 +msgid "Last Change" +msgstr "Ostatnia akytwność" + +#: rhodecode/templates/index_base.html:126 #: 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 +#: rhodecode/templates/journal/journal.html:285 msgid "Tip" msgstr "Ostatnia zmiana" -#: 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/index_base.html:128 +#: rhodecode/templates/admin/repos/repo_edit.html:114 #: rhodecode/templates/admin/repos/repos.html:76 msgid "Owner" msgstr "Właściciel" -#: rhodecode/templates/index_base.html:87 -msgid "Atom" -msgstr "Atom" - -#: 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:196 +#: rhodecode/templates/index_base.html:136 +#: rhodecode/templates/admin/repos/repos.html:84 +#: rhodecode/templates/admin/users/user_edit_my_account.html:183 #: rhodecode/templates/admin/users/users.html:107 -#: rhodecode/templates/bookmarks/bookmarks.html:58 +#: rhodecode/templates/bookmarks/bookmarks.html:74 #: rhodecode/templates/branches/branches.html:73 -#: rhodecode/templates/journal/journal.html:217 -#: rhodecode/templates/journal/journal.html:320 +#: rhodecode/templates/journal/journal.html:204 +#: rhodecode/templates/journal/journal.html:294 #: 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:210 -#: rhodecode/templates/index_base.html:297 -#: rhodecode/templates/admin/repos/repos.html:98 -#: rhodecode/templates/admin/users/user_edit_my_account.html:197 +#: rhodecode/templates/index_base.html:137 +#: rhodecode/templates/admin/repos/repos.html:85 +#: rhodecode/templates/admin/users/user_edit_my_account.html:184 #: rhodecode/templates/admin/users/users.html:108 -#: rhodecode/templates/bookmarks/bookmarks.html:59 +#: rhodecode/templates/bookmarks/bookmarks.html:75 #: rhodecode/templates/branches/branches.html:74 -#: rhodecode/templates/journal/journal.html:218 -#: rhodecode/templates/journal/journal.html:321 +#: rhodecode/templates/journal/journal.html:205 +#: rhodecode/templates/journal/journal.html:295 #: 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:271 -msgid "Last Change" -msgstr "Ostatnia akytwność" - -#: 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 "Nie znaleziono rekordów." - -#: 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/index_base.html:138 +#, fuzzy +msgid "No repositories found." +msgstr "grupy w repozytorium" + +#: rhodecode/templates/index_base.html:139 +#: rhodecode/templates/admin/repos/repos.html:87 +#: rhodecode/templates/admin/users/user_edit_my_account.html:186 #: rhodecode/templates/admin/users/users.html:110 -#: rhodecode/templates/bookmarks/bookmarks.html:61 +#: rhodecode/templates/bookmarks/bookmarks.html:77 #: rhodecode/templates/branches/branches.html:76 -#: rhodecode/templates/journal/journal.html:220 -#: rhodecode/templates/journal/journal.html:323 +#: rhodecode/templates/journal/journal.html:207 +#: rhodecode/templates/journal/journal.html:297 #: rhodecode/templates/tags/tags.html:77 msgid "Data error." msgstr "Błąd danych." -#: rhodecode/templates/index_base.html:213 -#: rhodecode/templates/index_base.html:300 -#: rhodecode/templates/admin/repos/repos.html:101 +#: rhodecode/templates/index_base.html:140 +#: rhodecode/templates/admin/repos/repos.html:88 #: rhodecode/templates/admin/users/user_edit_my_account.html:58 -#: rhodecode/templates/admin/users/user_edit_my_account.html:200 +#: rhodecode/templates/admin/users/user_edit_my_account.html:187 #: rhodecode/templates/admin/users/users.html:111 -#: rhodecode/templates/bookmarks/bookmarks.html:62 +#: rhodecode/templates/bookmarks/bookmarks.html:78 #: rhodecode/templates/branches/branches.html:77 -#: rhodecode/templates/journal/journal.html:221 -#: rhodecode/templates/journal/journal.html:324 +#: rhodecode/templates/journal/journal.html:208 +#: rhodecode/templates/journal/journal.html:298 #: rhodecode/templates/tags/tags.html:78 msgid "Loading..." msgstr "Wczytywanie..." -#: 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 +#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:239 msgid "Log In" msgstr "Zaloguj się" #: rhodecode/templates/login.html:21 #, python-format msgid "Log In to %s" -msgstr "" +msgstr "Zaloguj się do %s" #: rhodecode/templates/login.html:31 rhodecode/templates/register.html:20 #: rhodecode/templates/admin/admin_log.html:5 @@ -1748,7 +1869,7 @@ #: 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/base/base.html:215 #: rhodecode/templates/summary/summary.html:123 msgid "Username" msgstr "Nazwa użytkownika" @@ -1756,7 +1877,7 @@ #: 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:212 +#: rhodecode/templates/base/base.html:224 msgid "Password" msgstr "Hasło" @@ -1772,7 +1893,7 @@ msgid "Forgot your password ?" msgstr "Zapomniałeś hasła?" -#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:223 +#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:235 msgid "Don't have an account ?" msgstr "Nie masz konta?" @@ -1842,7 +1963,7 @@ #: 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/admin/repos/repo_edit.html:78 #: rhodecode/templates/data_table/_dt_elements.html:61 #: rhodecode/templates/summary/summary.html:77 msgid "Private repository" @@ -1865,13 +1986,13 @@ msgstr "Nie ma jeszcze tagów" #: rhodecode/templates/switch_to_list.html:35 -#: rhodecode/templates/bookmarks/bookmarks_data.html:32 +#: rhodecode/templates/bookmarks/bookmarks_data.html:37 msgid "There are no bookmarks yet" msgstr "Nie ma jeszcze zakładek" #: rhodecode/templates/admin/admin.html:5 #: rhodecode/templates/admin/admin.html:13 -#: rhodecode/templates/base/base.html:68 +#: rhodecode/templates/base/base.html:73 msgid "Admin journal" msgstr "Dziennik administratora" @@ -1898,9 +2019,9 @@ #: 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/admin/users_groups/users_groups.html:40 #: rhodecode/templates/journal/journal.html:197 -#: rhodecode/templates/journal/journal.html:300 +#: rhodecode/templates/journal/journal.html:287 msgid "Action" msgstr "Działanie" @@ -1910,7 +2031,7 @@ msgstr "Repozytorium" #: rhodecode/templates/admin/admin_log.html:8 -#: rhodecode/templates/bookmarks/bookmarks.html:35 +#: rhodecode/templates/bookmarks/bookmarks.html:49 #: rhodecode/templates/bookmarks/bookmarks_data.html:7 #: rhodecode/templates/branches/branches.html:48 #: rhodecode/templates/branches/branches_data.html:7 @@ -1933,19 +2054,18 @@ msgstr "Repozytoria domyślne" #: rhodecode/templates/admin/defaults/defaults.html:11 -#: rhodecode/templates/base/base.html:75 +#: rhodecode/templates/base/base.html:80 msgid "Defaults" msgstr "Domyślne" #: rhodecode/templates/admin/defaults/defaults.html:35 #: rhodecode/templates/admin/repos/repo_add_base.html:38 -#: rhodecode/templates/admin/repos/repo_edit.html:58 msgid "Type" msgstr "Typ" #: rhodecode/templates/admin/defaults/defaults.html:48 #: rhodecode/templates/admin/repos/repo_add_base.html:69 -#: rhodecode/templates/admin/repos/repo_edit.html:89 +#: rhodecode/templates/admin/repos/repo_edit.html:82 #: rhodecode/templates/forks/fork.html:69 msgid "" "Private repositories are only visible to people explicitly added as " @@ -1955,60 +2075,194 @@ "jako współpracownicy." #: rhodecode/templates/admin/defaults/defaults.html:55 -#: rhodecode/templates/admin/repos/repo_edit.html:94 +#: rhodecode/templates/admin/repos/repo_edit.html:87 msgid "Enable statistics" msgstr "Włącz statystyki" #: rhodecode/templates/admin/defaults/defaults.html:59 -#: rhodecode/templates/admin/repos/repo_edit.html:98 +#: rhodecode/templates/admin/repos/repo_edit.html:91 msgid "Enable statistics window on summary page." msgstr "Włącz okno statystyk na stronie podsumowania." #: rhodecode/templates/admin/defaults/defaults.html:65 -#: rhodecode/templates/admin/repos/repo_edit.html:103 +#: rhodecode/templates/admin/repos/repo_edit.html:96 msgid "Enable downloads" msgstr "Włącz pobieranie" #: rhodecode/templates/admin/defaults/defaults.html:69 -#: rhodecode/templates/admin/repos/repo_edit.html:107 +#: rhodecode/templates/admin/repos/repo_edit.html:100 msgid "Enable download menu on summary page." msgstr "Włącz menu pobierania na stronie podsumowania." #: rhodecode/templates/admin/defaults/defaults.html:75 -#: rhodecode/templates/admin/repos/repo_edit.html:112 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72 +#: rhodecode/templates/admin/repos/repo_edit.html:105 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:64 msgid "Enable locking" msgstr "Włącz blokowanie" #: rhodecode/templates/admin/defaults/defaults.html:79 -#: rhodecode/templates/admin/repos/repo_edit.html:116 +#: rhodecode/templates/admin/repos/repo_edit.html:109 msgid "Enable lock-by-pulling on repository." msgstr "Włącz blokowanie pobierania w repozytorium." #: rhodecode/templates/admin/defaults/defaults.html:84 #: rhodecode/templates/admin/ldap/ldap.html:89 -#: rhodecode/templates/admin/permissions/permissions.html:92 -#: 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/permissions/permissions.html:122 +#: rhodecode/templates/admin/repos/repo_edit.html:141 +#: rhodecode/templates/admin/repos/repo_edit.html:166 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:96 #: rhodecode/templates/admin/settings/hooks.html:73 #: 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/admin/users_groups/users_group_edit.html:143 +#: rhodecode/templates/base/default_perms_box.html:53 msgid "Save" msgstr "Zapisz" +#: rhodecode/templates/admin/gists/index.html:5 +#: rhodecode/templates/base/base.html:299 +msgid "Gists" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:10 +#, fuzzy, python-format +msgid "Private Gists for user %s" +msgstr "utworzono użytkownika %s" + +#: rhodecode/templates/admin/gists/index.html:12 +#, python-format +msgid "Public Gists for user %s" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:14 +msgid "Public Gists" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:31 +#: rhodecode/templates/admin/gists/show.html:24 +#: rhodecode/templates/base/base.html:302 +#, fuzzy +msgid "Create new gist" +msgstr "Utwórz nowy plik" + +#: rhodecode/templates/admin/gists/index.html:48 +#, fuzzy +msgid "Created" +msgstr "odczyt" + +#: rhodecode/templates/admin/gists/index.html:51 +#: rhodecode/templates/admin/gists/index.html:53 +#: rhodecode/templates/admin/gists/show.html:43 +#: rhodecode/templates/admin/gists/show.html:45 +#, fuzzy +msgid "Expires" +msgstr "Repozytoria" + +#: rhodecode/templates/admin/gists/index.html:51 +#: rhodecode/templates/admin/gists/show.html:43 +#, fuzzy +msgid "never" +msgstr "recenzent" + +#: rhodecode/templates/admin/gists/index.html:68 +#, fuzzy +msgid "There are no gists yet" +msgstr "Nie ma jeszcze tagów" + +#: rhodecode/templates/admin/gists/new.html:5 +#: rhodecode/templates/admin/gists/new.html:16 +msgid "New gist" +msgstr "" + +#: rhodecode/templates/admin/gists/new.html:37 +#, fuzzy +msgid "Gist description ..." +msgstr "opis" + +#: rhodecode/templates/admin/gists/new.html:52 +msgid "Create private gist" +msgstr "" + +#: rhodecode/templates/admin/gists/new.html:53 +msgid "Create public gist" +msgstr "" + +#: rhodecode/templates/admin/gists/new.html:54 +#: rhodecode/templates/admin/permissions/permissions.html:123 +#: rhodecode/templates/admin/permissions/permissions.html:185 +#: rhodecode/templates/admin/repos/repo_edit.html:142 +#: rhodecode/templates/admin/repos/repo_edit.html:167 +#: rhodecode/templates/admin/repos/repo_edit.html:381 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:73 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:97 +#: rhodecode/templates/admin/settings/settings.html:115 +#: rhodecode/templates/admin/settings/settings.html:196 +#: rhodecode/templates/admin/settings/settings.html:288 +#: rhodecode/templates/admin/users/user_edit.html:141 +#: rhodecode/templates/admin/users/user_edit.html:198 +#: rhodecode/templates/admin/users/user_edit.html:246 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:89 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:144 +#: rhodecode/templates/base/default_perms_box.html:54 +#: rhodecode/templates/files/files_add.html:80 +#: rhodecode/templates/files/files_edit.html:66 +#: rhodecode/templates/pullrequests/pullrequest.html:86 +msgid "Reset" +msgstr "Zresetuj" + +#: rhodecode/templates/admin/gists/show.html:5 +msgid "gist" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:9 +msgid "Gist" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:36 +msgid "Public gist" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:38 +#, fuzzy +msgid "Private gist" +msgstr "prywatne repozytorium" + +#: rhodecode/templates/admin/gists/show.html:54 +#: rhodecode/templates/admin/repos/repo_edit.html:299 +#: rhodecode/templates/changeset/changeset_file_comment.html:40 +msgid "Delete" +msgstr "Usuń" + +#: rhodecode/templates/admin/gists/show.html:54 +#, fuzzy +msgid "Confirm to delete this gist" +msgstr "Potwierdź, aby usunąć ten e-mail: %s" + +#: rhodecode/templates/admin/gists/show.html:63 +#: rhodecode/templates/admin/gists/show.html:84 +#: rhodecode/templates/files/files_edit.html:48 +#: rhodecode/templates/files/files_source.html:25 +#: rhodecode/templates/files/files_source.html:55 +#, fuzzy +msgid "Show as raw" +msgstr "wyświetl jako raw" + +#: rhodecode/templates/admin/gists/show.html:71 +#, fuzzy +msgid "created" +msgstr "odczyt" + #: rhodecode/templates/admin/ldap/ldap.html:5 msgid "LDAP administration" msgstr "Administracja LDAP" #: rhodecode/templates/admin/ldap/ldap.html:11 #: rhodecode/templates/admin/users/users.html:86 -#: rhodecode/templates/base/base.html:74 +#: rhodecode/templates/base/base.html:79 #, fuzzy msgid "LDAP" msgstr "ldap" @@ -2109,7 +2363,7 @@ msgstr "Pokaż powiadomienia" #: rhodecode/templates/admin/notifications/show_notification.html:9 -#: rhodecode/templates/base/base.html:241 +#: rhodecode/templates/base/base.html:253 msgid "Notifications" msgstr "Powiadomienia" @@ -2118,12 +2372,14 @@ msgstr "Uprawnienia administracji" #: rhodecode/templates/admin/permissions/permissions.html:11 +#: rhodecode/templates/admin/repos/repo_edit.html:151 #: 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/repos_groups/repos_groups_edit.html:81 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:88 #: rhodecode/templates/admin/users/user_edit.html:150 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:100 -#: rhodecode/templates/base/base.html:73 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:129 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:136 +#: rhodecode/templates/base/base.html:78 msgid "Permissions" msgstr "Uprawnienia" @@ -2148,6 +2404,7 @@ #: rhodecode/templates/admin/permissions/permissions.html:50 #: rhodecode/templates/admin/permissions/permissions.html:63 +#: rhodecode/templates/admin/permissions/permissions.html:77 #, fuzzy msgid "Overwrite existing settings" msgstr "Nadpisz ustawienia" @@ -2164,89 +2421,95 @@ "niestandardowe uprawnienia w repozytoriach zostaną utracone." #: rhodecode/templates/admin/permissions/permissions.html:69 -msgid "Registration" -msgstr "Rejestracja" - -#: rhodecode/templates/admin/permissions/permissions.html:77 +#, fuzzy +msgid "User group" +msgstr "grupy użytkowników" + +#: rhodecode/templates/admin/permissions/permissions.html:76 +#, fuzzy +msgid "" +"All default permissions on each user 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 " +"niestandardowe uprawnienia w repozytoriach zostaną utracone." + +#: rhodecode/templates/admin/permissions/permissions.html:83 msgid "Repository creation" msgstr "Tworzenie repozytorium" -#: rhodecode/templates/admin/permissions/permissions.html:85 +#: rhodecode/templates/admin/permissions/permissions.html:91 +#, fuzzy +msgid "User group creation" +msgstr "Użytkownicy grupy administracji" + +#: rhodecode/templates/admin/permissions/permissions.html:99 msgid "Repository forking" msgstr "Rozwidlanie repozytorium" -#: rhodecode/templates/admin/permissions/permissions.html:93 -#: 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:80 -#: rhodecode/templates/files/files_edit.html:66 -#: rhodecode/templates/pullrequests/pullrequest.html:110 -msgid "Reset" -msgstr "Zresetuj" - -#: rhodecode/templates/admin/permissions/permissions.html:103 +#: rhodecode/templates/admin/permissions/permissions.html:107 +msgid "Registration" +msgstr "Rejestracja" + +#: rhodecode/templates/admin/permissions/permissions.html:115 +#, fuzzy +msgid "External auth account activation" +msgstr "dozwolona z automatyczną aktywacją konta" + +#: rhodecode/templates/admin/permissions/permissions.html:133 #, fuzzy msgid "Default User Permissions" msgstr "Domyślne uprawnienia" -#: rhodecode/templates/admin/permissions/permissions.html:113 -#: rhodecode/templates/admin/users/user_edit.html:244 +#: rhodecode/templates/admin/permissions/permissions.html:144 +#: rhodecode/templates/admin/users/user_edit.html:207 #, fuzzy msgid "Allowed IP addresses" msgstr "Adresy e-mail" -#: rhodecode/templates/admin/permissions/permissions.html:127 -#: rhodecode/templates/admin/repos/repo_edit.html:347 +#: rhodecode/templates/admin/permissions/permissions.html:158 +#: rhodecode/templates/admin/repos/repo_edit.html:340 #: 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/admin/users/user_edit.html:175 +#: rhodecode/templates/admin/users/user_edit.html:220 +#: rhodecode/templates/admin/users_groups/users_groups.html:54 #: rhodecode/templates/data_table/_dt_elements.html:122 -#: rhodecode/templates/data_table/_dt_elements.html:130 +#: rhodecode/templates/data_table/_dt_elements.html:136 msgid "delete" msgstr "usuń" -#: rhodecode/templates/admin/permissions/permissions.html:128 -#: rhodecode/templates/admin/users/user_edit.html:258 +#: rhodecode/templates/admin/permissions/permissions.html:159 +#: rhodecode/templates/admin/users/user_edit.html:221 #, fuzzy, python-format msgid "Confirm to delete this ip: %s" msgstr "Potwierdź, aby usunąć ten e-mail: %s" -#: rhodecode/templates/admin/permissions/permissions.html:134 -#: rhodecode/templates/admin/users/user_edit.html:264 +#: rhodecode/templates/admin/permissions/permissions.html:165 +#: rhodecode/templates/admin/users/user_edit.html:227 msgid "All IP addresses are allowed" -msgstr "" - -#: rhodecode/templates/admin/permissions/permissions.html:145 -#: rhodecode/templates/admin/users/user_edit.html:275 +msgstr "Wszystkie adresy IP są dozwolone" + +#: rhodecode/templates/admin/permissions/permissions.html:176 +#: rhodecode/templates/admin/users/user_edit.html:238 #, fuzzy msgid "New ip address" -msgstr "Nowy adres e-mail" - -#: rhodecode/templates/admin/permissions/permissions.html:153 +msgstr "Nowy adres ip" + +#: rhodecode/templates/admin/permissions/permissions.html:184 #: 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 +#: rhodecode/templates/admin/repos/repo_edit.html:380 +#: rhodecode/templates/admin/users/user_edit.html:197 +#: rhodecode/templates/admin/users/user_edit.html:245 msgid "Add" msgstr "Dodaj" #: 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 +#: rhodecode/templates/base/base.html:74 rhodecode/templates/base/base.html:88 +#: rhodecode/templates/base/base.html:116 +#: rhodecode/templates/base/base.html:275 msgid "Repositories" msgstr "Repozytoria" @@ -2262,7 +2525,7 @@ msgstr "Klonuj z" #: rhodecode/templates/admin/repos/repo_add_base.html:24 -#: rhodecode/templates/admin/repos/repo_edit.html:44 +#: rhodecode/templates/admin/repos/repo_edit.html:45 msgid "Optional http[s] url from which repository should be cloned." msgstr "Opcjonalnie http[s] url z którego repozytorium powinno być klonowane." @@ -2276,19 +2539,19 @@ msgstr "Rodzaj repozytorium do stworzenia." #: rhodecode/templates/admin/repos/repo_add_base.html:47 -#: rhodecode/templates/admin/repos/repo_edit.html:66 +#: rhodecode/templates/admin/repos/repo_edit.html:59 #: 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/admin/repos/repo_edit.html:63 #: 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/admin/repos/repo_edit.html:72 #: 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." @@ -2300,73 +2563,78 @@ #: 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/base/base.html:81 rhodecode/templates/base/base.html:134 #: rhodecode/templates/summary/summary.html:212 msgid "Settings" msgstr "Ustawienia" -#: rhodecode/templates/admin/repos/repo_edit.html:40 +#: rhodecode/templates/admin/repos/repo_edit.html:36 +#, fuzzy +msgid "Non-changeable id" +msgstr "Brak ID pełnej zmiany %s" + +#: rhodecode/templates/admin/repos/repo_edit.html:41 msgid "Clone uri" msgstr "Klonowane uri" -#: rhodecode/templates/admin/repos/repo_edit.html:53 +#: rhodecode/templates/admin/repos/repo_edit.html:54 msgid "Optional select a group to put this repository into." msgstr "Opcjonalnie wybierz grupę do wprowadzenia tego repozytorium." -#: rhodecode/templates/admin/repos/repo_edit.html:126 +#: rhodecode/templates/admin/repos/repo_edit.html:119 msgid "Change owner of this repository." msgstr "Zmiana właściciela tego repozytorium." -#: rhodecode/templates/admin/repos/repo_edit.html:184 +#: rhodecode/templates/admin/repos/repo_edit.html:177 #, fuzzy msgid "Advanced settings" msgstr "Zapisz ustawienia" -#: rhodecode/templates/admin/repos/repo_edit.html:187 +#: rhodecode/templates/admin/repos/repo_edit.html:180 msgid "Statistics" msgstr "Statystyki" -#: rhodecode/templates/admin/repos/repo_edit.html:191 +#: rhodecode/templates/admin/repos/repo_edit.html:184 msgid "Reset current statistics" msgstr "Zresetuj bieżące statystyki" -#: rhodecode/templates/admin/repos/repo_edit.html:191 +#: rhodecode/templates/admin/repos/repo_edit.html:184 msgid "Confirm to remove current statistics" msgstr "Potwierdź usunięcie aktualnych statystyk" -#: rhodecode/templates/admin/repos/repo_edit.html:194 +#: rhodecode/templates/admin/repos/repo_edit.html:187 msgid "Fetched to rev" msgstr "Ściągnięte do rev" -#: rhodecode/templates/admin/repos/repo_edit.html:195 +#: rhodecode/templates/admin/repos/repo_edit.html:188 msgid "Stats gathered" msgstr "statystyki zgromadzone" -#: rhodecode/templates/admin/repos/repo_edit.html:203 +#: rhodecode/templates/admin/repos/repo_edit.html:196 msgid "Remote" msgstr "Zdalnie" -#: rhodecode/templates/admin/repos/repo_edit.html:207 +#: rhodecode/templates/admin/repos/repo_edit.html:200 msgid "Pull changes from remote location" msgstr "Pobierz z zdalnej lokalizacji" -#: rhodecode/templates/admin/repos/repo_edit.html:207 +#: rhodecode/templates/admin/repos/repo_edit.html:200 msgid "Confirm to pull changes from remote side" msgstr "Potwierdź pull z zdalnej strony" -#: rhodecode/templates/admin/repos/repo_edit.html:218 +#: rhodecode/templates/admin/repos/repo_edit.html:211 msgid "Cache" msgstr "Pamięć podręczna" -#: rhodecode/templates/admin/repos/repo_edit.html:222 +#: rhodecode/templates/admin/repos/repo_edit.html:215 msgid "Invalidate repository cache" msgstr "Unieważnij pamięć podręczną repozytorium" -#: rhodecode/templates/admin/repos/repo_edit.html:222 +#: rhodecode/templates/admin/repos/repo_edit.html:215 msgid "Confirm to invalidate repository cache" msgstr "Potwierdź unieważnienie pamięci podręcznej repozytorium" -#: rhodecode/templates/admin/repos/repo_edit.html:225 +#: rhodecode/templates/admin/repos/repo_edit.html:218 msgid "" "Manually invalidate cache for this repository. On first access repository" " will be cached again" @@ -2374,43 +2642,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:230 +#: rhodecode/templates/admin/repos/repo_edit.html:223 msgid "List of cached values" msgstr "Lista buforowanych wartości" -#: rhodecode/templates/admin/repos/repo_edit.html:233 +#: rhodecode/templates/admin/repos/repo_edit.html:226 msgid "Prefix" msgstr "Prefiks" -#: rhodecode/templates/admin/repos/repo_edit.html:234 +#: rhodecode/templates/admin/repos/repo_edit.html:227 msgid "Key" msgstr "Klucz" -#: rhodecode/templates/admin/repos/repo_edit.html:235 +#: rhodecode/templates/admin/repos/repo_edit.html:228 #: 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 +#: rhodecode/templates/admin/users_groups/users_groups.html:39 msgid "Active" msgstr "Aktywny" -#: rhodecode/templates/admin/repos/repo_edit.html:250 -#: rhodecode/templates/base/base.html:280 -#: rhodecode/templates/base/base.html:281 +#: rhodecode/templates/admin/repos/repo_edit.html:243 +#: rhodecode/templates/base/base.html:292 +#: rhodecode/templates/base/base.html:293 msgid "Public journal" msgstr "Dziennik publiczny" -#: rhodecode/templates/admin/repos/repo_edit.html:256 +#: rhodecode/templates/admin/repos/repo_edit.html:249 msgid "Remove from public journal" msgstr "Usuń z dziennika publicznego" -#: rhodecode/templates/admin/repos/repo_edit.html:258 +#: rhodecode/templates/admin/repos/repo_edit.html:251 msgid "Add to public journal" msgstr "Dodaj do dziennika publicznego" -#: rhodecode/templates/admin/repos/repo_edit.html:263 +#: rhodecode/templates/admin/repos/repo_edit.html:256 msgid "" "All actions made on this repository will be accessible to everyone in " "public journal" @@ -2418,62 +2686,59 @@ "Wszystkie działania wykonywane na tym repozytorium będą dostępne dla " "wszystkich w dzienniku publicznym" -#: rhodecode/templates/admin/repos/repo_edit.html:270 +#: rhodecode/templates/admin/repos/repo_edit.html:263 msgid "Locking" msgstr "Blokuj" -#: rhodecode/templates/admin/repos/repo_edit.html:275 +#: rhodecode/templates/admin/repos/repo_edit.html:268 msgid "Unlock locked repo" msgstr "Odblokuj zablokowane repo" -#: rhodecode/templates/admin/repos/repo_edit.html:275 +#: rhodecode/templates/admin/repos/repo_edit.html:268 msgid "Confirm to unlock repository" msgstr "Potwierdź odblokowanie repozytorium" -#: rhodecode/templates/admin/repos/repo_edit.html:278 -msgid "lock repo" +#: rhodecode/templates/admin/repos/repo_edit.html:271 +#, fuzzy +msgid "Lock repo" msgstr "blokada repo" -#: rhodecode/templates/admin/repos/repo_edit.html:278 +#: rhodecode/templates/admin/repos/repo_edit.html:271 msgid "Confirm to lock repository" msgstr "Potwierdź blokowanie repozytorium" -#: rhodecode/templates/admin/repos/repo_edit.html:279 +#: rhodecode/templates/admin/repos/repo_edit.html:272 msgid "Repository is not locked" msgstr "Repozytorium nie jest zablokowane" -#: rhodecode/templates/admin/repos/repo_edit.html:284 +#: rhodecode/templates/admin/repos/repo_edit.html:277 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:291 +#: rhodecode/templates/admin/repos/repo_edit.html:284 msgid "Set as fork of" msgstr "Ustaw jako rozwidlenie" -#: rhodecode/templates/admin/repos/repo_edit.html:296 -msgid "set" +#: rhodecode/templates/admin/repos/repo_edit.html:289 +#, fuzzy +msgid "Set" msgstr "ustaw" -#: rhodecode/templates/admin/repos/repo_edit.html:300 +#: rhodecode/templates/admin/repos/repo_edit.html:293 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:306 -#: rhodecode/templates/changeset/changeset_file_comment.html:41 -msgid "Delete" -msgstr "Usuń" - -#: rhodecode/templates/admin/repos/repo_edit.html:315 +#: rhodecode/templates/admin/repos/repo_edit.html:308 msgid "Remove this repository" msgstr "Usuń to repozytorium" -#: rhodecode/templates/admin/repos/repo_edit.html:315 +#: rhodecode/templates/admin/repos/repo_edit.html:308 msgid "Confirm to delete this repository" msgstr "Potwierdź, aby usunąć repozytorium" -#: rhodecode/templates/admin/repos/repo_edit.html:317 +#: rhodecode/templates/admin/repos/repo_edit.html:310 #, fuzzy, python-format msgid "this repository has %s fork" msgid_plural "this repository has %s forks" @@ -2481,17 +2746,17 @@ msgstr[1] "to repozytorium ma %s forki" msgstr[2] "to repozytorium ma %s forków" -#: rhodecode/templates/admin/repos/repo_edit.html:318 +#: rhodecode/templates/admin/repos/repo_edit.html:311 #, fuzzy msgid "Detach forks" msgstr "Ustaw jako rozwidlenie" -#: rhodecode/templates/admin/repos/repo_edit.html:319 +#: rhodecode/templates/admin/repos/repo_edit.html:312 #, fuzzy msgid "Delete forks" msgstr "usuń" -#: rhodecode/templates/admin/repos/repo_edit.html:322 +#: rhodecode/templates/admin/repos/repo_edit.html:315 #, fuzzy msgid "" "This repository will be renamed in a special way in order to be " @@ -2502,59 +2767,64 @@ "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 +#: rhodecode/templates/admin/repos/repo_edit.html:329 msgid "Extra fields" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:348 +msgstr "Dodatkowe pola" + +#: rhodecode/templates/admin/repos/repo_edit.html:341 #, 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 +#: rhodecode/templates/admin/repos/repo_edit.html:355 #, fuzzy msgid "New field key" msgstr "dodaj nowy plik" -#: rhodecode/templates/admin/repos/repo_edit.html:370 +#: rhodecode/templates/admin/repos/repo_edit.html:363 msgid "New field label" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:373 +msgstr "Nowa etykieta pola" + +#: rhodecode/templates/admin/repos/repo_edit.html:366 msgid "Enter short label" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:379 +msgstr "Wpisz krótką etykietę" + +#: rhodecode/templates/admin/repos/repo_edit.html:372 #, fuzzy msgid "New field description" msgstr "opis" -#: rhodecode/templates/admin/repos/repo_edit.html:382 +#: rhodecode/templates/admin/repos/repo_edit.html:375 msgid "Enter description of a field" -msgstr "" +msgstr "Wprowadź opis pola" #: rhodecode/templates/admin/repos/repo_edit_perms.html:3 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:3 msgid "none" msgstr "brak" #: rhodecode/templates/admin/repos/repo_edit_perms.html:4 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:4 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:4 msgid "read" msgstr "odczyt" #: rhodecode/templates/admin/repos/repo_edit_perms.html:5 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:5 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:5 msgid "write" msgstr "zapis" #: rhodecode/templates/admin/repos/repo_edit_perms.html:6 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:6 msgid "admin" msgstr "administracja" #: rhodecode/templates/admin/repos/repo_edit_perms.html:7 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:7 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:7 msgid "member" msgstr "użytkownik" @@ -2566,6 +2836,8 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:28 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:20 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:35 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:20 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:35 msgid "default" msgstr "domyślne" @@ -2573,35 +2845,38 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:58 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:25 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:55 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:25 +#: rhodecode/templates/admin/users_groups/user_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:80 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:81 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: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: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:86 +#: rhodecode/templates/admin/repos/repos.html:86 +#: rhodecode/templates/admin/users/user_edit_my_account.html:185 +#: rhodecode/templates/admin/users/users.html:109 +#: rhodecode/templates/bookmarks/bookmarks.html:76 +#: rhodecode/templates/branches/branches.html:75 +#: rhodecode/templates/journal/journal.html:206 +#: rhodecode/templates/journal/journal.html:296 +#: rhodecode/templates/tags/tags.html:76 +msgid "No records found." +msgstr "Nie znaleziono rekordów." + +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 #, fuzzy msgid "apply to children" msgstr "dotyczy dzieci" -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:88 #, fuzzy msgid "" "Set or revoke permission to all children of that group, including non-" @@ -2631,7 +2906,7 @@ #: 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 +#: rhodecode/templates/base/base.html:75 rhodecode/templates/base/base.html:91 #, fuzzy msgid "Repository groups" msgstr "Repozytorium grupy" @@ -2665,7 +2940,7 @@ msgid "Add child group" msgstr "dodaj nową grupę użytkowników" -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:76 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:68 msgid "" "Enable lock-by-pulling on group. This option will be applied to all other" " groups and repositories inside" @@ -2683,16 +2958,22 @@ msgstr "Liczba najwyższego poziomu repozytorium" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:64 +#: rhodecode/templates/admin/users_groups/users_groups.html:48 +#: rhodecode/templates/changeset/changeset_file_comment.html:73 +#: rhodecode/templates/changeset/changeset_file_comment.html:171 #, fuzzy msgid "Edit" msgstr "edycja" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:65 +#: rhodecode/templates/admin/users_groups/users_groups.html:49 #: rhodecode/templates/base/perms_summary.html:29 -#: rhodecode/templates/base/perms_summary.html:48 -#: rhodecode/templates/base/perms_summary.html:50 +#: rhodecode/templates/base/perms_summary.html:60 +#: rhodecode/templates/base/perms_summary.html:62 #: rhodecode/templates/data_table/_dt_elements.html:116 #: rhodecode/templates/data_table/_dt_elements.html:117 +#: rhodecode/templates/data_table/_dt_elements.html:130 +#: rhodecode/templates/data_table/_dt_elements.html:131 msgid "edit" msgstr "edycja" @@ -2790,19 +3071,19 @@ #: rhodecode/templates/admin/settings/settings.html:88 msgid "Site branding" -msgstr "" +msgstr "Branding strony" #: rhodecode/templates/admin/settings/settings.html:97 msgid "HTTP authentication realm" -msgstr "" +msgstr "Sfera uwierzytelniania HTTP" #: rhodecode/templates/admin/settings/settings.html:106 msgid "Google Analytics code" -msgstr "" +msgstr "Kod Google Analytics" #: rhodecode/templates/admin/settings/settings.html:114 -#: rhodecode/templates/admin/settings/settings.html:186 -#: rhodecode/templates/admin/settings/settings.html:277 +#: rhodecode/templates/admin/settings/settings.html:195 +#: rhodecode/templates/admin/settings/settings.html:287 msgid "Save settings" msgstr "Zapisz ustawienia" @@ -2815,48 +3096,72 @@ msgstr "Główne" #: rhodecode/templates/admin/settings/settings.html:134 -msgid "Use lightweight dashboard" -msgstr "Użyj lekkiego pulpitu" - -#: rhodecode/templates/admin/settings/settings.html:140 #, fuzzy msgid "Use repository extra fields" msgstr "repozytoria" -#: rhodecode/templates/admin/settings/settings.html:147 +#: rhodecode/templates/admin/settings/settings.html:136 +msgid "Allows storing additional customized fields per repository." +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:139 +msgid "Show RhodeCode version" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:141 +msgid "Shows or hides displayed version of RhodeCode in the footer" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:146 +#, fuzzy +msgid "Dashboard items" +msgstr "Repozytorium" + +#: rhodecode/templates/admin/settings/settings.html:150 +msgid "" +"Number of items displayed in lightweight dashboard before pagination is " +"shown." +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:155 msgid "Icons" msgstr "Ikony" -#: rhodecode/templates/admin/settings/settings.html:152 +#: rhodecode/templates/admin/settings/settings.html:160 msgid "Show public repo icon on repositories" msgstr "Pokazuj w publicznym repo ikonę w repozytoriach" -#: rhodecode/templates/admin/settings/settings.html:156 +#: rhodecode/templates/admin/settings/settings.html:164 msgid "Show private repo icon on repositories" msgstr "Pokazuj w prywatnym repo ikonę w repozytoriach" -#: rhodecode/templates/admin/settings/settings.html:163 +#: rhodecode/templates/admin/settings/settings.html:166 +#, fuzzy +msgid "Show public/private icons next to repositories names" +msgstr "Pokazuj w publicznym repo ikonę w repozytoriach" + +#: rhodecode/templates/admin/settings/settings.html:172 msgid "Meta-Tagging" msgstr "Tagowanie meta" -#: rhodecode/templates/admin/settings/settings.html:168 +#: rhodecode/templates/admin/settings/settings.html:177 msgid "Stylify recognised metatags:" msgstr "Stylizacja rozpoznanych meta tagów:" -#: rhodecode/templates/admin/settings/settings.html:195 +#: rhodecode/templates/admin/settings/settings.html:204 msgid "VCS settings" msgstr "VCS ustawienia" -#: rhodecode/templates/admin/settings/settings.html:204 +#: rhodecode/templates/admin/settings/settings.html:213 msgid "Web" msgstr "www" -#: rhodecode/templates/admin/settings/settings.html:209 +#: rhodecode/templates/admin/settings/settings.html:218 #, fuzzy msgid "Require SSL for vcs operations" msgstr "wymagaj ssl dla operacji vcs" -#: rhodecode/templates/admin/settings/settings.html:211 +#: rhodecode/templates/admin/settings/settings.html:220 msgid "" "RhodeCode will require SSL for pushing or pulling. If SSL is missing it " "will return HTTP Error 406: Not Acceptable" @@ -2864,46 +3169,46 @@ "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:217 +#: rhodecode/templates/admin/settings/settings.html:226 msgid "Hooks" msgstr "Aktualizacja" -#: rhodecode/templates/admin/settings/settings.html:222 +#: rhodecode/templates/admin/settings/settings.html:231 msgid "Update repository after push (hg update)" msgstr "Aktualizacja repozytorium po wysłaniu zmian (aktualizacja hg)" -#: rhodecode/templates/admin/settings/settings.html:226 +#: rhodecode/templates/admin/settings/settings.html:235 msgid "Show repository size after push" msgstr "Pokaż rozmiar repozytorium po wysłaniu zmian" -#: rhodecode/templates/admin/settings/settings.html:230 +#: rhodecode/templates/admin/settings/settings.html:239 msgid "Log user push commands" msgstr "Logi poleceń wysłania zmian użytkowników" -#: rhodecode/templates/admin/settings/settings.html:234 +#: rhodecode/templates/admin/settings/settings.html:243 msgid "Log user pull commands" msgstr "Logi poleceń połączenia gałęzi użytkowników" -#: rhodecode/templates/admin/settings/settings.html:238 +#: rhodecode/templates/admin/settings/settings.html:247 #, fuzzy msgid "Advanced setup" msgstr "zaawansowane ustawienia" -#: rhodecode/templates/admin/settings/settings.html:243 +#: rhodecode/templates/admin/settings/settings.html:252 msgid "Mercurial Extensions" msgstr "Rozszerzenia Mercurial" -#: rhodecode/templates/admin/settings/settings.html:248 +#: rhodecode/templates/admin/settings/settings.html:257 #, fuzzy msgid "Enable largefiles extension" msgstr "rozszerzenia dużych pliów" -#: rhodecode/templates/admin/settings/settings.html:252 +#: rhodecode/templates/admin/settings/settings.html:261 #, fuzzy msgid "Enable hgsubversion extension" msgstr "rozszerzenia hgsubversion" -#: rhodecode/templates/admin/settings/settings.html:254 +#: rhodecode/templates/admin/settings/settings.html:263 #, fuzzy msgid "" "Requires hgsubversion library installed. Allows cloning from svn remote " @@ -2912,27 +3217,23 @@ "Wymaga biblioteki hgsubversion zainstalowanej. Umożliwia klonowanie z " "zdalnych lokalizacji svn" -#: rhodecode/templates/admin/settings/settings.html:264 +#: rhodecode/templates/admin/settings/settings.html:274 msgid "Repositories location" msgstr "Położenie repozytorium" -#: rhodecode/templates/admin/settings/settings.html:269 +#: rhodecode/templates/admin/settings/settings.html:279 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." +"Click to unlock. You must restart RhodeCode in order to make this setting" +" take effect." msgstr "" -"To kluczowe ustawienia aplikacji. Jeśli jesteś pewny, że chcesz to " -"zmienić, należy ponownie uruchomić aplikację w celu zaktualizowania " -"lokalizacji. Kliknij tą etykietę, żeby odblokować." - -#: rhodecode/templates/admin/settings/settings.html:270 -#: rhodecode/templates/base/base.html:131 + +#: rhodecode/templates/admin/settings/settings.html:280 +#: rhodecode/templates/base/base.html:143 #, fuzzy msgid "Unlock" msgstr "odblokowany" -#: rhodecode/templates/admin/settings/settings.html:272 +#: rhodecode/templates/admin/settings/settings.html:282 msgid "" "Location where repositories are stored. After changing this value a " "restart, and rescan is required" @@ -2940,24 +3241,24 @@ "Miejsce, w którym przechowywane są repozytoria. Po zmianie tej wartości " "jest wymagany restart i ponowne skanowanie" -#: rhodecode/templates/admin/settings/settings.html:292 +#: rhodecode/templates/admin/settings/settings.html:303 msgid "Test Email" msgstr "Test e-maila" -#: rhodecode/templates/admin/settings/settings.html:300 +#: rhodecode/templates/admin/settings/settings.html:311 msgid "Email to" msgstr "E-mail do" -#: rhodecode/templates/admin/settings/settings.html:308 +#: rhodecode/templates/admin/settings/settings.html:319 msgid "Send" msgstr "Wyślij" -#: rhodecode/templates/admin/settings/settings.html:314 +#: rhodecode/templates/admin/settings/settings.html:325 msgid "System Info and Packages" msgstr "Informacje Systemowe i pakiety" -#: rhodecode/templates/admin/settings/settings.html:317 -#: rhodecode/templates/changelog/changelog.html:42 +#: rhodecode/templates/admin/settings/settings.html:328 +#: rhodecode/templates/changelog/changelog.html:51 msgid "Show" msgstr "Wyświetl" @@ -2967,7 +3268,7 @@ #: rhodecode/templates/admin/users/user_add.html:10 #: rhodecode/templates/admin/users/user_edit.html:11 -#: rhodecode/templates/base/base.html:71 +#: rhodecode/templates/base/base.html:76 msgid "Users" msgstr "Użytkownicy" @@ -3009,7 +3310,7 @@ #: rhodecode/templates/admin/users/user_edit.html:50 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:25 msgid "Current IP" -msgstr "" +msgstr "Obecny IP" #: rhodecode/templates/admin/users/user_edit.html:70 msgid "LDAP DN" @@ -3025,46 +3326,21 @@ msgid "New password confirmation" msgstr "Potwierdzenie nowego hasła" -#: 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:163 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:113 -#, python-format -msgid "" -"Select to inherit permissions from %s settings. With this selected below " -"options does not have any action" -msgstr "" -"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: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:177 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:127 -msgid "Fork repositories" -msgstr "Rozwidlenie repozytorium" - -#: rhodecode/templates/admin/users/user_edit.html:200 msgid "Email addresses" msgstr "Adresy e-mail" -#: rhodecode/templates/admin/users/user_edit.html:213 +#: rhodecode/templates/admin/users/user_edit.html:176 #, python-format msgid "Confirm to delete this email: %s" msgstr "Potwierdź, aby usunąć ten e-mail: %s" -#: rhodecode/templates/admin/users/user_edit.html:227 +#: rhodecode/templates/admin/users/user_edit.html:190 msgid "New email address" msgstr "Nowy adres e-mail" #: rhodecode/templates/admin/users/user_edit_my_account.html:5 -#: rhodecode/templates/base/base.html:242 +#: rhodecode/templates/base/base.html:254 msgid "My account" msgstr "Moje konto" @@ -3102,7 +3378,7 @@ #: 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_data.html:11 #: rhodecode/templates/pullrequests/pullrequest_show.html:27 #: rhodecode/templates/pullrequests/pullrequest_show.html:42 msgid "Closed" @@ -3122,7 +3398,7 @@ msgstr "Biorę udział w" #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:42 -#: rhodecode/templates/pullrequests/pullrequest_data.html:11 +#: rhodecode/templates/pullrequests/pullrequest_data.html:8 #, python-format msgid "Pull request #%s opened by %s on %s" msgstr "Wniosek połączenia gałęzi #%s otwarty %s dnia %s" @@ -3157,13 +3433,13 @@ #: rhodecode/templates/admin/users_groups/users_group_add.html:10 #: rhodecode/templates/admin/users_groups/users_groups.html:11 -#: rhodecode/templates/base/base.html:72 +#: rhodecode/templates/base/base.html:77 rhodecode/templates/base/base.html:94 #, fuzzy msgid "User groups" msgstr "grupy użytkowników" #: rhodecode/templates/admin/users_groups/users_group_add.html:12 -#: rhodecode/templates/admin/users_groups/users_groups.html:25 +#: rhodecode/templates/admin/users_groups/users_groups.html:26 #, fuzzy msgid "Add new user group" msgstr "dodaj nową grupę użytkowników" @@ -3179,7 +3455,7 @@ msgstr "grupy użytkowników" #: rhodecode/templates/admin/users_groups/users_group_edit.html:50 -#: rhodecode/templates/admin/users_groups/users_groups.html:35 +#: rhodecode/templates/admin/users_groups/users_groups.html:38 msgid "Members" msgstr "Użytkownik" @@ -3200,46 +3476,56 @@ msgid "Add all elements" msgstr "Dodaj wszystkie elementy" -#: 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:167 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:109 msgid "No members yet" msgstr "Nie ma jeszcze żadnego użytkownika" +#: rhodecode/templates/admin/users_groups/users_group_edit.html:117 +#, fuzzy +msgid "Global Permissions" +msgstr "Skopiuj uprawnienia" + #: rhodecode/templates/admin/users_groups/users_groups.html:5 #, fuzzy msgid "User groups administration" msgstr "Użytkownicy grupy administracji" -#: rhodecode/templates/admin/users_groups/users_groups.html:47 +#: rhodecode/templates/admin/users_groups/users_groups.html:55 #, fuzzy, python-format msgid "Confirm to delete this user group: %s" msgstr "Potwierdź usunięcie grupy użytkowników: %s" +#: rhodecode/templates/admin/users_groups/users_groups.html:62 +#, fuzzy +msgid "There are no user groups yet" +msgstr "Nie ma jeszcze grup repozytoriów" + #: rhodecode/templates/base/base.html:42 -msgid "Submit a bug" -msgstr "Prześlij błąd" - -#: rhodecode/templates/base/base.html:108 +#, python-format +msgid "Server instance: %s" +msgstr "" + +#: rhodecode/templates/base/base.html:52 +msgid "Report a bug" +msgstr "" + +#: rhodecode/templates/base/base.html:121 #: 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:109 -#: rhodecode/templates/changelog/changelog.html:11 +#: rhodecode/templates/base/base.html:122 +#: rhodecode/templates/changelog/changelog.html:15 #: 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:110 +#: rhodecode/templates/base/base.html:123 #: rhodecode/templates/data_table/_dt_elements.html:25 #: rhodecode/templates/data_table/_dt_elements.html:27 #: rhodecode/templates/data_table/_dt_elements.html:29 @@ -3247,53 +3533,48 @@ msgid "Files" msgstr "Pliki" -#: rhodecode/templates/base/base.html:112 +#: rhodecode/templates/base/base.html:125 #, fuzzy msgid "Switch To" msgstr "Przełącz do" -#: rhodecode/templates/base/base.html:114 -#: rhodecode/templates/base/base.html:267 +#: rhodecode/templates/base/base.html:127 +#: rhodecode/templates/base/base.html:279 msgid "loading..." msgstr "wczytywanie..." -#: rhodecode/templates/base/base.html:118 +#: rhodecode/templates/base/base.html:131 msgid "Options" msgstr "Opcje" -#: rhodecode/templates/base/base.html:124 +#: rhodecode/templates/base/base.html:137 #: rhodecode/templates/forks/forks_data.html:21 msgid "Compare fork" msgstr "Porównaj rozwidlenie" -#: rhodecode/templates/base/base.html:126 -#, fuzzy -msgid "Lightweight changelog" -msgstr "Użyj lekkiego pulpitu" - -#: rhodecode/templates/base/base.html:127 -#: rhodecode/templates/base/base.html:287 +#: rhodecode/templates/base/base.html:139 +#: rhodecode/templates/base/base.html:312 #: rhodecode/templates/search/search.html:14 #: rhodecode/templates/search/search.html:54 msgid "Search" msgstr "Szukaj" -#: rhodecode/templates/base/base.html:133 +#: rhodecode/templates/base/base.html:145 #, fuzzy msgid "Lock" msgstr "zablokowane" -#: rhodecode/templates/base/base.html:141 +#: rhodecode/templates/base/base.html:153 #, fuzzy msgid "Follow" msgstr "obserwatorzy" -#: rhodecode/templates/base/base.html:142 +#: rhodecode/templates/base/base.html:154 #, fuzzy msgid "Unfollow" msgstr "obserwatorzy" -#: rhodecode/templates/base/base.html:145 +#: rhodecode/templates/base/base.html:157 #: rhodecode/templates/data_table/_dt_elements.html:33 #: rhodecode/templates/data_table/_dt_elements.html:35 #: rhodecode/templates/data_table/_dt_elements.html:37 @@ -3302,66 +3583,124 @@ msgid "Fork" msgstr "Gałąź" -#: rhodecode/templates/base/base.html:147 +#: rhodecode/templates/base/base.html:159 #, fuzzy msgid "Create Pull Request" msgstr "Stwórz nowe żądanie połączenia gałęzi" -#: rhodecode/templates/base/base.html:153 +#: rhodecode/templates/base/base.html:165 #, fuzzy msgid "Show Pull Requests" msgstr "Nowa prośba o połączenie gałęzi" -#: rhodecode/templates/base/base.html:153 +#: rhodecode/templates/base/base.html:165 #, fuzzy msgid "Pull Requests" msgstr "Połączone gałęzie" -#: rhodecode/templates/base/base.html:190 +#: rhodecode/templates/base/base.html:202 #, fuzzy msgid "Not logged in" msgstr "ostatnio zalogowany" -#: rhodecode/templates/base/base.html:197 +#: rhodecode/templates/base/base.html:209 msgid "Login to your account" msgstr "Zaloguj się do swojego konta" -#: rhodecode/templates/base/base.html:220 +#: rhodecode/templates/base/base.html:232 msgid "Forgot password ?" msgstr "Nie pamiętasz hasła?" -#: rhodecode/templates/base/base.html:243 +#: rhodecode/templates/base/base.html:255 msgid "Log Out" msgstr "Wyloguj się" -#: rhodecode/templates/base/base.html:262 +#: rhodecode/templates/base/base.html:274 msgid "Switch repository" msgstr "Przełącz repozytorium" -#: rhodecode/templates/base/base.html:274 +#: rhodecode/templates/base/base.html:286 msgid "Show recent activity" -msgstr "" - -#: rhodecode/templates/base/base.html:275 +msgstr "Pokaż ostatnią aktywność" + +#: rhodecode/templates/base/base.html:287 #: rhodecode/templates/journal/journal.html:4 msgid "Journal" msgstr "Dziennik" -#: rhodecode/templates/base/base.html:286 +#: rhodecode/templates/base/base.html:298 +msgid "Show public gists" +msgstr "" + +#: rhodecode/templates/base/base.html:303 +msgid "All public gists" +msgstr "" + +#: rhodecode/templates/base/base.html:305 +msgid "My public gists" +msgstr "" + +#: rhodecode/templates/base/base.html:306 +msgid "My private gists" +msgstr "" + +#: rhodecode/templates/base/base.html:311 #, fuzzy msgid "Search in repositories" msgstr "Szukaj we wszystkich repozytoriach" -#: rhodecode/templates/base/perms_summary.html:8 +#: rhodecode/templates/base/default_perms_box.html:14 +msgid "Inherit default permissions" +msgstr "Dziedziczą uprawnienia domyślne" + +#: rhodecode/templates/base/default_perms_box.html:18 +#, python-format +msgid "" +"Select to inherit permissions from %s settings. With this selected below " +"options does not apply." +msgstr "" +"Zaznacz, żeby dziedziczyć uprawnienia z %s ustawień. Po wybraniu tej " +"opcji, poniżej nie ma żadnych działań" + +#: rhodecode/templates/base/default_perms_box.html:26 +msgid "Create repositories" +msgstr "Utwórz repozytorium" + +#: rhodecode/templates/base/default_perms_box.html:30 +msgid "Select this option to allow repository creation for this user" +msgstr "" +"Wybierz tą opcje aby zezwolnic na tworzenie repozytoriów dla tego " +"użytkownika" + +#: rhodecode/templates/base/default_perms_box.html:35 +#, fuzzy +msgid "Create user groups" +msgstr "[utworzona] grupa użytkowników" + +#: rhodecode/templates/base/default_perms_box.html:39 +msgid "Select this option to allow user group creation for this user" +msgstr "" + +#: rhodecode/templates/base/default_perms_box.html:44 +msgid "Fork repositories" +msgstr "Rozwidlenie repozytorium" + +#: rhodecode/templates/base/default_perms_box.html:48 +msgid "Select this option to allow repository forking for this user" +msgstr "" + +#: rhodecode/templates/base/perms_summary.html:11 #, fuzzy msgid "No permissions defined yet" msgstr "Nie ma jeszcze ustawionych uprawnień" -#: rhodecode/templates/base/perms_summary.html:15 +#: rhodecode/templates/base/perms_summary.html:19 +#: rhodecode/templates/base/perms_summary.html:38 msgid "Permission" msgstr "Uprawnienia" -#: rhodecode/templates/base/perms_summary.html:16 +#: rhodecode/templates/base/perms_summary.html:20 +#: rhodecode/templates/base/perms_summary.html:39 msgid "Edit Permission" msgstr "Edycja Uprawnień" @@ -3371,7 +3710,7 @@ msgstr "dodaj kolejny komentarz" #: rhodecode/templates/base/root.html:44 -#: rhodecode/templates/data_table/_dt_elements.html:140 +#: rhodecode/templates/data_table/_dt_elements.html:147 msgid "Stop following this repository" msgstr "Zakończyć obserwację tego repozytorium" @@ -3388,7 +3727,7 @@ msgstr "użytkownik" #: rhodecode/templates/base/root.html:48 -#: rhodecode/templates/pullrequests/pullrequest.html:181 +#: rhodecode/templates/pullrequests/pullrequest.html:203 #, fuzzy msgid "Loading ..." msgstr "wczytywanie..." @@ -3404,7 +3743,7 @@ msgstr "nie ma plików pasujących" #: rhodecode/templates/base/root.html:51 -#: rhodecode/templates/changelog/changelog.html:36 +#: rhodecode/templates/changelog/changelog.html:45 msgid "Open new pull request" msgstr "Otwórz nową prośbę o połączenie gałęzi" @@ -3437,31 +3776,50 @@ msgid "Expand diff" msgstr "poprawka różnic" +#: rhodecode/templates/base/root.html:58 +#, fuzzy +msgid "Failed to remoke permission" +msgstr "Nie udało się usunąć użytkownika" + #: rhodecode/templates/bookmarks/bookmarks.html:5 #, python-format msgid "%s Bookmarks" msgstr "%s Zakładki" -#: rhodecode/templates/bookmarks/bookmarks.html:37 +#: rhodecode/templates/bookmarks/bookmarks.html:26 +#, fuzzy +msgid "Compare bookmarks" +msgstr "Porównaj rozwidlenie" + +#: rhodecode/templates/bookmarks/bookmarks.html:51 #: rhodecode/templates/bookmarks/bookmarks_data.html:8 #: rhodecode/templates/branches/branches.html:50 #: rhodecode/templates/branches/branches_data.html:8 -#: rhodecode/templates/shortlog/shortlog_data.html:8 +#: rhodecode/templates/changelog/changelog_summary_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:38 +#: rhodecode/templates/bookmarks/bookmarks.html:52 #: rhodecode/templates/bookmarks/bookmarks_data.html:9 #: rhodecode/templates/branches/branches.html:51 #: rhodecode/templates/branches/branches_data.html:9 -#: rhodecode/templates/shortlog/shortlog_data.html:5 +#: rhodecode/templates/changelog/changelog_summary_data.html:5 #: rhodecode/templates/tags/tags.html:52 #: rhodecode/templates/tags/tags_data.html:9 msgid "Revision" msgstr "Rewizja" +#: rhodecode/templates/bookmarks/bookmarks.html:54 +#: rhodecode/templates/bookmarks/bookmarks_data.html:10 +#: rhodecode/templates/branches/branches.html:53 +#: rhodecode/templates/branches/branches_data.html:10 +#: rhodecode/templates/tags/tags.html:54 +#: rhodecode/templates/tags/tags_data.html:10 +msgid "Compare" +msgstr "Porównaj" + #: rhodecode/templates/branches/branches.html:5 #, python-format msgid "%s Branches" @@ -3471,19 +3829,12 @@ msgid "Compare branches" msgstr "porównaj gałęzie" -#: rhodecode/templates/branches/branches.html:53 -#: rhodecode/templates/branches/branches_data.html:10 -#: rhodecode/templates/tags/tags.html:54 -#: rhodecode/templates/tags/tags_data.html:10 -msgid "Compare" -msgstr "Porównaj" - #: rhodecode/templates/changelog/changelog.html:6 #, python-format msgid "%s Changelog" msgstr "%s Dziennik zmian" -#: rhodecode/templates/changelog/changelog.html:11 +#: rhodecode/templates/changelog/changelog.html:19 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" @@ -3491,47 +3842,57 @@ msgstr[1] "pokazano %d w rewizjach %d" msgstr[2] "pokazano %d w rewizjach %d" -#: rhodecode/templates/changelog/changelog.html:30 +#: rhodecode/templates/changelog/changelog.html:39 msgid "Clear selection" msgstr "Wyczyść zaznaczenie" -#: rhodecode/templates/changelog/changelog.html:33 +#: rhodecode/templates/changelog/changelog.html:42 #: rhodecode/templates/forks/forks_data.html:19 #, fuzzy, python-format msgid "Compare fork with %s" msgstr "porównaj gałęzie %s" -#: rhodecode/templates/changelog/changelog.html:33 +#: rhodecode/templates/changelog/changelog.html:42 msgid "Compare fork with parent" msgstr "porównaj gałąź w rodzicem" -#: rhodecode/templates/changelog/changelog.html:76 -#: rhodecode/templates/summary/summary.html:404 +#: rhodecode/templates/changelog/changelog.html:78 +#: rhodecode/templates/changelog/changelog_summary_data.html:28 +#, 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:102 +#: rhodecode/templates/summary/summary.html:403 #, fuzzy msgid "Show more" msgstr "Pokaż więcej" -#: rhodecode/templates/changelog/changelog.html:89 +#: rhodecode/templates/changelog/changelog.html:115 +#: rhodecode/templates/changelog/changelog_summary_data.html:50 +#: rhodecode/templates/changeset/changeset.html:107 #: rhodecode/templates/changeset/changeset_range.html:86 #, fuzzy, python-format msgid "Bookmark %s" msgstr "Zakładki %s" -#: rhodecode/templates/changelog/changelog.html:95 -#: rhodecode/templates/changeset/changeset.html:111 +#: rhodecode/templates/changelog/changelog.html:121 +#: rhodecode/templates/changelog/changelog_summary_data.html:56 +#: rhodecode/templates/changeset/changeset.html:113 #: 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:80 +#: rhodecode/templates/changelog/changelog.html:126 +#: rhodecode/templates/changelog/changelog_summary_data.html:61 +#: rhodecode/templates/changeset/changeset.html:117 +#: rhodecode/templates/changeset/changeset_range.html:96 #, fuzzy, python-format msgid "Branch %s" msgstr "Gałęzie %s" -#: rhodecode/templates/changelog/changelog.html:258 +#: rhodecode/templates/changelog/changelog.html:286 msgid "There are no changes yet" msgstr "Nie ma jeszcze zmian" @@ -3563,6 +3924,41 @@ msgid "Affected %s files" msgstr "zarażone pliki %s" +#: rhodecode/templates/changelog/changelog_summary_data.html:6 +#: rhodecode/templates/files/files_add.html:75 +#: rhodecode/templates/files/files_edit.html:61 +#, fuzzy +msgid "Commit message" +msgstr "komentarz" + +#: rhodecode/templates/changelog/changelog_summary_data.html:7 +#, fuzzy +msgid "Age" +msgstr "ostatnia zmiana" + +#: rhodecode/templates/changelog/changelog_summary_data.html:9 +#, fuzzy +msgid "Refs" +msgstr "Prefiks" + +#: rhodecode/templates/changelog/changelog_summary_data.html:86 +msgid "Add or upload files directly via RhodeCode" +msgstr "Dodaj lub prześlij pliki bezpośrednio przez stronę" + +#: rhodecode/templates/changelog/changelog_summary_data.html:89 +#: rhodecode/templates/files/files_add.html:38 +#: rhodecode/templates/files/files_browser.html:31 +msgid "Add new file" +msgstr "Dodaj nowy plik" + +#: rhodecode/templates/changelog/changelog_summary_data.html:95 +msgid "Push new repo" +msgstr "Wyślij zmiany do nowego repo" + +#: rhodecode/templates/changelog/changelog_summary_data.html:103 +msgid "Existing repository?" +msgstr "Istniejące repozytorium?" + #: rhodecode/templates/changeset/changeset.html:6 #, python-format msgid "%s Changeset" @@ -3584,7 +3980,7 @@ msgstr "Status grupy zmian" #: rhodecode/templates/changeset/changeset.html:67 -#: rhodecode/templates/changeset/diff_block.html:23 +#: rhodecode/templates/changeset/diff_block.html:22 #, fuzzy msgid "Raw diff" msgstr "raw różnic" @@ -3595,13 +3991,13 @@ msgstr "poprawka różnic" #: rhodecode/templates/changeset/changeset.html:69 -#: rhodecode/templates/changeset/diff_block.html:24 +#: rhodecode/templates/changeset/diff_block.html:23 #, fuzzy msgid "Download diff" msgstr "pobierz różnice" #: rhodecode/templates/changeset/changeset.html:73 -#: rhodecode/templates/changeset/changeset_file_comment.html:97 +#: rhodecode/templates/changeset/changeset_file_comment.html:103 #, python-format msgid "%d comment" msgid_plural "%d comments" @@ -3610,7 +4006,7 @@ msgstr[2] "%d komentarzy" #: rhodecode/templates/changeset/changeset.html:73 -#: rhodecode/templates/changeset/changeset_file_comment.html:97 +#: rhodecode/templates/changeset/changeset_file_comment.html:103 #, python-format msgid "(%d inline)" msgid_plural "(%d inline)" @@ -3619,11 +4015,11 @@ msgstr[2] "(%d linii)" #: rhodecode/templates/changeset/changeset.html:103 -#: rhodecode/templates/changeset/changeset_range.html:77 +#: rhodecode/templates/changeset/changeset_range.html:82 msgid "merge" msgstr "połącz" -#: rhodecode/templates/changeset/changeset.html:119 +#: rhodecode/templates/changeset/changeset.html:126 #: rhodecode/templates/compare/compare_diff.html:40 #: rhodecode/templates/pullrequests/pullrequest_show.html:113 #, python-format @@ -3633,7 +4029,7 @@ msgstr[1] "%s pliki zostały zmienione" msgstr[2] "%s plików zostało zmienionych" -#: rhodecode/templates/changeset/changeset.html:121 +#: rhodecode/templates/changeset/changeset.html:128 #: rhodecode/templates/compare/compare_diff.html:42 #: rhodecode/templates/pullrequests/pullrequest_show.html:115 #, python-format @@ -3643,15 +4039,15 @@ 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/changeset/changeset.html:141 +#: rhodecode/templates/changeset/changeset.html:153 #: 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 +msgstr "Pokazuje pełną edycję, może zająć to trochę czasu i zasobów" + +#: rhodecode/templates/changeset/changeset.html:141 +#: rhodecode/templates/changeset/changeset.html:153 #: rhodecode/templates/compare/compare_diff.html:58 #: rhodecode/templates/compare/compare_diff.html:69 #: rhodecode/templates/pullrequests/pullrequest_show.html:131 @@ -3670,55 +4066,69 @@ msgid "Comment on pull request #%s" msgstr "[komentarz] wniosek o połączenie gałęzi %s" -#: rhodecode/templates/changeset/changeset_file_comment.html:57 +#: rhodecode/templates/changeset/changeset_file_comment.html:55 msgid "Submitting..." msgstr "Przesyłanie..." -#: rhodecode/templates/changeset/changeset_file_comment.html:60 +#: rhodecode/templates/changeset/changeset_file_comment.html:58 msgid "Commenting on line {1}." msgstr "Komentując linię {1}." -#: rhodecode/templates/changeset/changeset_file_comment.html:61 -#: rhodecode/templates/changeset/changeset_file_comment.html:139 +#: rhodecode/templates/changeset/changeset_file_comment.html:59 +#: rhodecode/templates/changeset/changeset_file_comment.html:145 #, 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:141 +#: rhodecode/templates/changeset/changeset_file_comment.html:61 +#: rhodecode/templates/changeset/changeset_file_comment.html:147 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:161 +#: rhodecode/templates/changeset/changeset_file_comment.html:65 +#: rhodecode/templates/changeset/changeset_file_comment.html:152 +#, fuzzy +msgid "Preview" +msgstr "recenzent" + +#: rhodecode/templates/changeset/changeset_file_comment.html:72 +#: rhodecode/templates/changeset/changeset_file_comment.html:170 +#, fuzzy +msgid "Comment preview" +msgstr "Wyświetl porównanie" + +#: rhodecode/templates/changeset/changeset_file_comment.html:80 +#: rhodecode/templates/changeset/changeset_file_comment.html:177 +#: rhodecode/templates/email_templates/changeset_comment.html:16 +#: rhodecode/templates/email_templates/pull_request_comment.html:16 msgid "Comment" msgstr "Komentarz" -#: rhodecode/templates/changeset/changeset_file_comment.html:75 +#: rhodecode/templates/changeset/changeset_file_comment.html:81 #, fuzzy msgid "Cancel" msgstr "zmiana" -#: rhodecode/templates/changeset/changeset_file_comment.html:82 +#: rhodecode/templates/changeset/changeset_file_comment.html:88 msgid "You need to be logged in to comment." msgstr "Musisz być zalogowany żeby komentarz." -#: rhodecode/templates/changeset/changeset_file_comment.html:82 +#: rhodecode/templates/changeset/changeset_file_comment.html:88 msgid "Login now" msgstr "Zaloguj się teraz" -#: rhodecode/templates/changeset/changeset_file_comment.html:86 +#: rhodecode/templates/changeset/changeset_file_comment.html:92 msgid "Hide" msgstr "Ukryj" -#: rhodecode/templates/changeset/changeset_file_comment.html:143 +#: rhodecode/templates/changeset/changeset_file_comment.html:149 #, fuzzy msgid "Change status" msgstr "zmień status" -#: rhodecode/templates/changeset/changeset_file_comment.html:163 +#: rhodecode/templates/changeset/changeset_file_comment.html:179 msgid "Comment and close" msgstr "Skomentuj i zamknij" @@ -3731,23 +4141,23 @@ msgid "Files affected" msgstr "pliki naruszone" -#: rhodecode/templates/changeset/diff_block.html:22 +#: rhodecode/templates/changeset/diff_block.html:21 #, fuzzy msgid "Show full diff for this file" msgstr "pokaż pełną edycja tego pliku" -#: rhodecode/templates/changeset/diff_block.html:30 +#: rhodecode/templates/changeset/diff_block.html:29 #, fuzzy msgid "Show inline comments" msgstr "pokaż online komentarz" -#: rhodecode/templates/changeset/diff_block.html:55 +#: rhodecode/templates/changeset/diff_block.html:53 msgid "Show file at latest version in this repo" -msgstr "" - -#: rhodecode/templates/changeset/diff_block.html:56 +msgstr "Pokaż plik w najnowszej wersji, w tym repo" + +#: rhodecode/templates/changeset/diff_block.html:54 msgid "Show file at initial version in this repo" -msgstr "" +msgstr "Pokaż plik w pierwotnej wersji w repo" #: rhodecode/templates/compare/compare_cs.html:4 msgid "No changesets" @@ -3785,7 +4195,7 @@ #: rhodecode/templates/compare/compare_diff.html:58 #: rhodecode/templates/compare/compare_diff.html:69 msgid "confirm to show potentially huge diff" -msgstr "" +msgstr "potwierdź pokazanie pełnej edycji" #: rhodecode/templates/data_table/_dt_elements.html:54 #: rhodecode/templates/summary/summary.html:69 @@ -3823,28 +4233,25 @@ msgid "Confirm to delete this repository: %s" msgstr "Potwierdź usunięcie repozytorium: %s" -#: rhodecode/templates/data_table/_dt_elements.html:131 +#: rhodecode/templates/data_table/_dt_elements.html:137 #, python-format msgid "Confirm to delete this user: %s" msgstr "Potwierdź usunięcie tego użytkownika: %s" -#: 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:4 +#: rhodecode/templates/email_templates/pull_request.html:4 +#: rhodecode/templates/email_templates/pull_request_comment.html:4 +#, fuzzy +msgid "URL" +msgstr "dziennik" + +#: rhodecode/templates/email_templates/changeset_comment.html:6 +#, fuzzy, python-format +msgid "%s commented on a %s changeset." +msgstr "%s skomentował na zmianie %s" #: rhodecode/templates/email_templates/changeset_comment.html:14 -#, fuzzy -msgid "Repo" -msgstr "Moje repo" - -#: rhodecode/templates/email_templates/changeset_comment.html:16 -msgid "desc" +msgid "The changeset status was changed to" msgstr "" #: rhodecode/templates/email_templates/main.html:8 @@ -3864,51 +4271,42 @@ 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: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 -#, python-format +#: rhodecode/templates/email_templates/password_reset.html:10 +msgid "Please ignore this email if you did not request a new password ." +msgstr "" + +#: rhodecode/templates/email_templates/pull_request.html:6 +#, fuzzy, python-format msgid "" -"User %s opened pull request for repository %s and wants you to review " +"%s opened a pull request for repository %s and wants you to review " "changes." msgstr "" "Użytkownik %s zgłosił wniosek połączenia w repozytorium %s i chce żeby " "sprawdzić zmiany." -#: rhodecode/templates/email_templates/pull_request.html:5 -msgid "View this pull request here" -msgstr "Wyświetl prośby pobrania tutaj" - -#: rhodecode/templates/email_templates/pull_request.html:6 -msgid "title" -msgstr "tytuł" - -#: rhodecode/templates/email_templates/pull_request.html:7 -msgid "description" -msgstr "opis" - -#: 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:3 +#: rhodecode/templates/email_templates/pull_request.html:8 +#: rhodecode/templates/pullrequests/pullrequest.html:34 +#: rhodecode/templates/pullrequests/pullrequest_data.html:14 +#: rhodecode/templates/pullrequests/pullrequest_show.html:25 +msgid "Title" +msgstr "Tytuł" + +#: rhodecode/templates/email_templates/pull_request_comment.html:6 #, 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" +msgid "%s commented on pull request \"%s\"" +msgstr "%s zostawił komentarz na wniosku o połączenie gałęzi %s" + +#: rhodecode/templates/email_templates/pull_request_comment.html:10 +#, fuzzy +msgid "Pull request was closed with status" msgstr "Żądanie statusu połączenia gałęzi" -#: rhodecode/templates/email_templates/registration.html:4 -msgid "A new user have registered in RhodeCode" -msgstr "Nowy użytkownik został zarejestrowany na stronie" - -#: rhodecode/templates/email_templates/registration.html:9 +#: rhodecode/templates/email_templates/pull_request_comment.html:12 +#, fuzzy +msgid "Pull request changed status" +msgstr "Żądanie statusu połączenia gałęzi" + +#: rhodecode/templates/email_templates/registration.html:6 msgid "View this user here" msgstr "Zobacz tego użytkownika tutaj" @@ -3935,7 +4333,6 @@ #: 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łąź" @@ -3950,12 +4347,6 @@ msgid "Add file" msgstr "dodaj plik" -#: 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:43 msgid "File Name" msgstr "Nazwa Pliku" @@ -3984,13 +4375,6 @@ msgid "use / to separate directories" msgstr "Użyj / do oddzielenia katalogów" -#: rhodecode/templates/files/files_add.html:75 -#: rhodecode/templates/files/files_edit.html:61 -#: rhodecode/templates/shortlog/shortlog_data.html:6 -#, fuzzy -msgid "Commit message" -msgstr "komentarz" - #: rhodecode/templates/files/files_add.html:79 #: rhodecode/templates/files/files_edit.html:65 msgid "Commit changes" @@ -4061,13 +4445,6 @@ msgid "Show annotation" msgstr "pokaż adnotacje" -#: rhodecode/templates/files/files_edit.html:48 -#: rhodecode/templates/files/files_source.html:25 -#: rhodecode/templates/files/files_source.html:55 -#, fuzzy -msgid "Show as raw" -msgstr "wyświetl jako raw" - #: rhodecode/templates/files/files_edit.html:49 #: rhodecode/templates/files/files_source.html:26 #, fuzzy @@ -4132,6 +4509,8 @@ #: rhodecode/templates/files/files_source.html:31 msgid "Editing files allowed only when on branch head revision" msgstr "" +"Edycja plików dozwolona tylko wtedy, gdy rewizja jest w trakcie rewizji " +"głównej gałęzi" #: rhodecode/templates/files/files_source.html:46 #, python-format @@ -4266,37 +4645,52 @@ msgid "New pull request" msgstr "Nowa prośba o połączenie gałęzi" -#: rhodecode/templates/pullrequests/pullrequest.html:52 -msgid "Detailed compare view" -msgstr "Szczegółowe porównanie widoku" - -#: rhodecode/templates/pullrequests/pullrequest.html:56 +#: rhodecode/templates/pullrequests/pullrequest.html:25 +msgid "Create new pull request" +msgstr "Stwórz nowe żądanie połączenia gałęzi" + +#: rhodecode/templates/pullrequests/pullrequest.html:47 +#, fuzzy +msgid "Write a short description on this pull request" +msgstr "Potwierdź usunięcie połączenia gałęzi" + +#: rhodecode/templates/pullrequests/pullrequest.html:53 +#, fuzzy +msgid "Changeset flow" +msgstr "Grupy zmian" + +#: rhodecode/templates/pullrequests/pullrequest.html:60 +#: rhodecode/templates/pullrequests/pullrequest_show.html:65 +#, fuzzy +msgid "Origin repository" +msgstr "Repozytorium git" + +#: rhodecode/templates/pullrequests/pullrequest.html:85 +msgid "Send pull request" +msgstr "Wyślij prośbę o połączenie gałęzi" + +#: rhodecode/templates/pullrequests/pullrequest.html:94 #: rhodecode/templates/pullrequests/pullrequest_show.html:137 msgid "Pull request reviewers" msgstr "Recenzje wniosków połączenia gałęzi" -#: rhodecode/templates/pullrequests/pullrequest.html:65 +#: rhodecode/templates/pullrequests/pullrequest.html:103 #: rhodecode/templates/pullrequests/pullrequest_show.html:149 msgid "owner" msgstr "właściciel" -#: rhodecode/templates/pullrequests/pullrequest.html:77 +#: rhodecode/templates/pullrequests/pullrequest.html:115 msgid "Add reviewer to this pull request." msgstr "Pokarz wszystkie zmiany" -#: 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:92 -#: rhodecode/templates/pullrequests/pullrequest_data.html:14 -#: rhodecode/templates/pullrequests/pullrequest_show.html:25 -msgid "Title" -msgstr "Tytuł" - -#: rhodecode/templates/pullrequests/pullrequest.html:109 -msgid "Send pull request" -msgstr "Wyślij prośbę o połączenie gałęzi" +#: rhodecode/templates/pullrequests/pullrequest.html:129 +msgid "Detailed compare view" +msgstr "Szczegółowe porównanie widoku" + +#: rhodecode/templates/pullrequests/pullrequest.html:150 +#, fuzzy +msgid "Destination repository" +msgstr "Edytuj repozytorium" #: rhodecode/templates/pullrequests/pullrequest_show.html:4 #, fuzzy, python-format @@ -4328,11 +4722,6 @@ 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:65 -#, fuzzy -msgid "Origin repository" -msgstr "Repozytorium git" - #: rhodecode/templates/pullrequests/pullrequest_show.html:89 msgid "Created on" msgstr "Utworzono" @@ -4396,38 +4785,6 @@ msgid "Permission denied" msgstr "Brak uprawnień" -#: rhodecode/templates/shortlog/shortlog.html:5 -#, fuzzy, python-format -msgid "%s Lightweight Changelog" -msgstr "%s Prosta lista zmian" - -#: rhodecode/templates/shortlog/shortlog.html:11 -#: rhodecode/templates/shortlog/shortlog.html:15 -msgid "Lightweight Changelog" -msgstr "Użyj lekkiego pulpitu" - -#: rhodecode/templates/shortlog/shortlog_data.html:7 -#, fuzzy -msgid "Age" -msgstr "ostatnia zmiana" - -#: 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" -msgstr "Dodaj lub prześlij pliki bezpośrednio przez stronę" - -#: rhodecode/templates/shortlog/shortlog_data.html:84 -msgid "Push new repo" -msgstr "Wyślij zmiany do nowego repo" - -#: rhodecode/templates/shortlog/shortlog_data.html:92 -msgid "Existing repository?" -msgstr "Istniejące repozytorium?" - #: rhodecode/templates/summary/summary.html:4 #, python-format msgid "%s Summary" @@ -4467,7 +4824,7 @@ msgid "Fork of" msgstr "Gałąź z" -#: rhodecode/templates/summary/summary.html:96 +#: rhodecode/templates/summary/summary.html:97 #, fuzzy msgid "Remote clone" msgstr "zdalne klonowanie" @@ -4494,8 +4851,8 @@ #: rhodecode/templates/summary/summary.html:151 #: rhodecode/templates/summary/summary.html:167 -#: rhodecode/templates/summary/summary.html:232 -msgid "enable" +#, fuzzy +msgid "Enable" msgstr "włącz" #: rhodecode/templates/summary/summary.html:159 @@ -4510,7 +4867,7 @@ msgid "Downloads are disabled for this repository" msgstr "Pliki do pobrania są zostały wyłączone dla tego repozytorium" -#: rhodecode/templates/summary/summary.html:171 +#: rhodecode/templates/summary/summary.html:170 msgid "Download as zip" msgstr "Pobierz jako zip" @@ -4537,6 +4894,10 @@ msgid "Commit activity by day / author" msgstr "komunikaty aktywne w ciągu dnia / autor" +#: rhodecode/templates/summary/summary.html:232 +msgid "enable" +msgstr "włącz" + #: rhodecode/templates/summary/summary.html:235 msgid "Stats gathered: " msgstr "Statystyki zebrane: " @@ -4551,52 +4912,48 @@ msgstr "Szybki start" #: rhodecode/templates/summary/summary.html:272 -#, python-format -msgid "Readme file at revision '%s'" +#, fuzzy, python-format +msgid "Readme file from revision %s" msgstr "Plik readme w rewizji '%s'" -#: rhodecode/templates/summary/summary.html:275 -msgid "Permalink to this readme" -msgstr "Link do tego readme" - -#: rhodecode/templates/summary/summary.html:333 +#: rhodecode/templates/summary/summary.html:332 #, python-format msgid "Download %s as %s" msgstr "Pobierz %s jak %s" -#: rhodecode/templates/summary/summary.html:380 +#: rhodecode/templates/summary/summary.html:379 msgid "files" msgstr "pliki" -#: rhodecode/templates/summary/summary.html:690 +#: rhodecode/templates/summary/summary.html:689 msgid "commits" msgstr "komunikaty" -#: rhodecode/templates/summary/summary.html:691 +#: rhodecode/templates/summary/summary.html:690 msgid "files added" msgstr "pliki dodane" -#: rhodecode/templates/summary/summary.html:692 +#: rhodecode/templates/summary/summary.html:691 msgid "files changed" msgstr "pliki zmienione" -#: rhodecode/templates/summary/summary.html:693 +#: rhodecode/templates/summary/summary.html:692 msgid "files removed" msgstr "pliki usunięte" -#: rhodecode/templates/summary/summary.html:695 +#: rhodecode/templates/summary/summary.html:694 msgid "commit" msgstr "komunikaty" +#: rhodecode/templates/summary/summary.html:695 +msgid "file added" +msgstr "plik dodany" + #: rhodecode/templates/summary/summary.html:696 -msgid "file added" -msgstr "plik dodany" +msgid "file changed" +msgstr "plik zmieniony" #: rhodecode/templates/summary/summary.html:697 -msgid "file changed" -msgstr "plik zmieniony" - -#: rhodecode/templates/summary/summary.html:698 msgid "file removed" msgstr "plik usunięty" diff -r 14afe4d1363d -r 8ddf35e02d05 rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po Sat Jun 01 01:03:31 2013 +0200 +++ b/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po Sat Jun 01 18:03:44 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-04-05 10:19-0700\n" +"POT-Creation-Date: 2013-06-01 18:02+0200\n" "PO-Revision-Date: 2012-05-22 16:47-0300\n" "Last-Translator: Augusto Herrmann \n" "Language-Team: pt_BR \n" @@ -17,40 +17,39 @@ "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -#: rhodecode/controllers/changelog.py:95 +#: rhodecode/controllers/changelog.py:149 msgid "All Branches" msgstr "Todos os Ramos" -#: rhodecode/controllers/changeset.py:83 +#: rhodecode/controllers/changeset.py:84 #, fuzzy msgid "Show white space" msgstr "mostrar espaços em branco" -#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97 +#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98 #, fuzzy msgid "Ignore white space" msgstr "ignorar espaços em branco" -#: rhodecode/controllers/changeset.py:163 +#: rhodecode/controllers/changeset.py:164 #, python-format msgid "%s line context" msgstr "contexto de %s linhas" -#: rhodecode/controllers/changeset.py:329 -#: rhodecode/controllers/pullrequests.py:438 +#: rhodecode/controllers/changeset.py:345 +#: rhodecode/controllers/pullrequests.py:481 #, fuzzy, python-format msgid "Status change -> %s" msgstr "Última alteração" -#: rhodecode/controllers/changeset.py:360 +#: rhodecode/controllers/changeset.py:376 msgid "" "Changing status on a changeset associated with a closed pull request is " "not allowed" msgstr "" #: rhodecode/controllers/compare.py:74 -#: rhodecode/controllers/pullrequests.py:167 -#: rhodecode/controllers/shortlog.py:100 +#: rhodecode/controllers/pullrequests.py:259 #, fuzzy msgid "There are no changesets yet" msgstr "Ainda não há alteações" @@ -96,8 +95,8 @@ msgstr "%s - feed %s" #: rhodecode/controllers/feed.py:86 -#: rhodecode/templates/changeset/changeset.html:134 -#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/changeset/changeset.html:141 +#: rhodecode/templates/changeset/changeset.html:153 #: rhodecode/templates/compare/compare_diff.html:58 #: rhodecode/templates/compare/compare_diff.html:69 #: rhodecode/templates/pullrequests/pullrequest_show.html:131 @@ -105,119 +104,120 @@ msgid "Changeset was too big and was cut off..." msgstr "Conjunto de mudanças era grande demais e foi cortado..." -#: rhodecode/controllers/feed.py:91 +#: rhodecode/controllers/feed.py:90 #, fuzzy, python-format msgid "%s committed on %s" msgstr "commit" -#: rhodecode/controllers/files.py:88 +#: rhodecode/controllers/files.py:89 #, fuzzy msgid "Click here to add new file" msgstr "adicionar novo arquivo" -#: rhodecode/controllers/files.py:89 +#: rhodecode/controllers/files.py:90 #, python-format msgid "There are no files yet %s" msgstr "Ainda não há arquivos %s" -#: rhodecode/controllers/files.py:267 rhodecode/controllers/files.py:335 +#: rhodecode/controllers/files.py:271 rhodecode/controllers/files.py:339 #, python-format msgid "This repository is has been locked by %s on %s" msgstr "" -#: rhodecode/controllers/files.py:279 +#: rhodecode/controllers/files.py:283 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: rhodecode/controllers/files.py:293 +#: rhodecode/controllers/files.py:297 #, fuzzy, python-format msgid "Edited file %s via RhodeCode" msgstr "Editado %s via RhodeCode" -#: rhodecode/controllers/files.py:309 +#: rhodecode/controllers/files.py:313 msgid "No changes" msgstr "Sem alterações" -#: rhodecode/controllers/files.py:318 rhodecode/controllers/files.py:388 +#: rhodecode/controllers/files.py:322 rhodecode/controllers/files.py:394 #, python-format msgid "Successfully committed to %s" msgstr "Commit realizado com sucesso para %s" -#: rhodecode/controllers/files.py:323 rhodecode/controllers/files.py:394 +#: rhodecode/controllers/files.py:327 rhodecode/controllers/files.py:405 msgid "Error occurred during commit" msgstr "Ocorreu um erro ao realizar commit" -#: rhodecode/controllers/files.py:347 +#: rhodecode/controllers/files.py:351 #, fuzzy msgid "Added file via RhodeCode" msgstr "Adicionado %s via RhodeCode" -#: rhodecode/controllers/files.py:364 +#: rhodecode/controllers/files.py:368 msgid "No content" msgstr "Nenhum conteúdo" -#: rhodecode/controllers/files.py:368 +#: rhodecode/controllers/files.py:372 msgid "No filename" msgstr "Nenhum nomes de arquivo" -#: rhodecode/controllers/files.py:372 +#: rhodecode/controllers/files.py:397 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: rhodecode/controllers/files.py:420 +#: rhodecode/controllers/files.py:431 #, fuzzy msgid "Downloads disabled" msgstr "downloads desabilitados" -#: rhodecode/controllers/files.py:431 +#: rhodecode/controllers/files.py:442 #, python-format msgid "Unknown revision %s" msgstr "Revisão desconhecida %s" -#: rhodecode/controllers/files.py:433 +#: rhodecode/controllers/files.py:444 msgid "Empty repository" msgstr "Repositório vazio" -#: rhodecode/controllers/files.py:435 +#: rhodecode/controllers/files.py:446 msgid "Unknown archive type" msgstr "Arquivo de tipo desconhecido" -#: rhodecode/controllers/files.py:617 +#: rhodecode/controllers/files.py:631 #: rhodecode/templates/changeset/changeset_range.html:9 +#: rhodecode/templates/email_templates/pull_request.html:12 +#: rhodecode/templates/pullrequests/pullrequest.html:124 msgid "Changesets" msgstr "Conjuntos de mudanças" -#: rhodecode/controllers/files.py:618 rhodecode/controllers/pullrequests.py:131 -#: rhodecode/controllers/summary.py:247 rhodecode/model/scm.py:606 +#: rhodecode/controllers/files.py:632 rhodecode/controllers/pullrequests.py:152 +#: rhodecode/controllers/summary.py:76 rhodecode/model/scm.py:682 #: rhodecode/templates/switch_to_list.html:3 #: rhodecode/templates/branches/branches.html:10 msgid "Branches" msgstr "Ramos" -#: rhodecode/controllers/files.py:619 rhodecode/controllers/pullrequests.py:132 -#: rhodecode/controllers/summary.py:248 rhodecode/model/scm.py:617 +#: rhodecode/controllers/files.py:633 rhodecode/controllers/pullrequests.py:153 +#: rhodecode/controllers/summary.py:77 rhodecode/model/scm.py:693 #: 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:175 +#: rhodecode/controllers/forks.py:176 #, fuzzy, python-format msgid "Forked repository %s as %s" msgstr "bifurcado repositório %s como %s" -#: rhodecode/controllers/forks.py:189 +#: rhodecode/controllers/forks.py:190 #, python-format msgid "An error occurred during repository forking %s" msgstr "Ocorreu um erro ao bifurcar o repositório %s" -#: rhodecode/controllers/journal.py:275 rhodecode/controllers/journal.py:318 +#: rhodecode/controllers/journal.py:110 rhodecode/controllers/journal.py:153 #, fuzzy msgid "public journal" msgstr "Diário público" -#: rhodecode/controllers/journal.py:279 rhodecode/controllers/journal.py:322 +#: rhodecode/controllers/journal.py:114 rhodecode/controllers/journal.py:157 #: rhodecode/templates/journal/journal.html:12 msgid "journal" msgstr "diário" @@ -239,76 +239,76 @@ "Sua reinicialização de senha foi bem sucedida, sua senha foi enviada ao " "seu e-mail" -#: rhodecode/controllers/pullrequests.py:118 +#: rhodecode/controllers/pullrequests.py:139 #: rhodecode/templates/changeset/changeset.html:10 -#: rhodecode/templates/email_templates/changeset_comment.html:15 +#: rhodecode/templates/email_templates/changeset_comment.html:8 msgid "Changeset" msgstr "Conjunto de Mudanças" -#: rhodecode/controllers/pullrequests.py:128 +#: rhodecode/controllers/pullrequests.py:149 msgid "Special" msgstr "" -#: rhodecode/controllers/pullrequests.py:129 +#: rhodecode/controllers/pullrequests.py:150 #, fuzzy msgid "Peer branches" msgstr "ramos" -#: rhodecode/controllers/pullrequests.py:130 rhodecode/model/scm.py:612 +#: rhodecode/controllers/pullrequests.py:151 rhodecode/model/scm.py:688 #: rhodecode/templates/switch_to_list.html:28 #: rhodecode/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "Marcadores" -#: rhodecode/controllers/pullrequests.py:228 +#: rhodecode/controllers/pullrequests.py:324 msgid "Pull request requires a title with min. 3 chars" msgstr "" -#: rhodecode/controllers/pullrequests.py:230 +#: rhodecode/controllers/pullrequests.py:326 #, fuzzy msgid "Error creating pull request" msgstr "ocorreu um erro ao criar o usuário %s" -#: rhodecode/controllers/pullrequests.py:251 +#: rhodecode/controllers/pullrequests.py:346 #, fuzzy msgid "Successfully opened new pull request" msgstr "usuário excluído com sucesso" -#: rhodecode/controllers/pullrequests.py:254 +#: rhodecode/controllers/pullrequests.py:349 #, fuzzy msgid "Error occurred during sending pull request" msgstr "ocorreu um erro ao criar o repositório %s" -#: rhodecode/controllers/pullrequests.py:287 +#: rhodecode/controllers/pullrequests.py:388 #, fuzzy msgid "Successfully deleted pull request" msgstr "usuário excluído com sucesso" -#: rhodecode/controllers/pullrequests.py:441 +#: rhodecode/controllers/pullrequests.py:484 msgid "Closing with" msgstr "" -#: rhodecode/controllers/pullrequests.py:478 +#: rhodecode/controllers/pullrequests.py:521 msgid "Closing pull request on other statuses than rejected or approved forbidden" msgstr "" -#: rhodecode/controllers/search.py:134 +#: rhodecode/controllers/search.py:132 msgid "Invalid search query. Try quoting it." msgstr "Consulta de busca inválida. Tente usar aspas." -#: rhodecode/controllers/search.py:139 +#: rhodecode/controllers/search.py:137 msgid "There is no index to search in. Please run whoosh indexer" msgstr "Não há índice onde pesquisa. Por favor execute o indexador whoosh" -#: rhodecode/controllers/search.py:143 +#: rhodecode/controllers/search.py:141 msgid "An error occurred during this search operation" msgstr "Ocorreu um erro durante essa operação de busca" -#: rhodecode/controllers/summary.py:141 +#: rhodecode/controllers/summary.py:182 msgid "No data loaded yet" msgstr "Ainda não há dados carregados" -#: rhodecode/controllers/summary.py:147 +#: rhodecode/controllers/summary.py:188 #: rhodecode/templates/summary/summary.html:149 msgid "Statistics are disabled for this repository" msgstr "As estatísticas estão desabillitadas para este repositório" @@ -323,6 +323,56 @@ msgid "Error occurred during update of defaults" msgstr "ocorreu um erro ao atualizar o usuário %s" +#: rhodecode/controllers/admin/gists.py:56 +#, fuzzy +#| msgid "revoke" +msgid "forever" +msgstr "revogar" + +#: rhodecode/controllers/admin/gists.py:57 +#, fuzzy, python-format +#| msgid "%d minute" +#| msgid_plural "%d minutes" +msgid "5 minutes" +msgstr "%d minuto" + +#: rhodecode/controllers/admin/gists.py:58 +#, fuzzy, python-format +#| msgid "%d hour" +#| msgid_plural "%d hours" +msgid "1 hour" +msgstr "%d hora" + +#: rhodecode/controllers/admin/gists.py:59 +#, fuzzy, python-format +#| msgid "%d day" +#| msgid_plural "%d days" +msgid "1 day" +msgstr "%d dia" + +#: rhodecode/controllers/admin/gists.py:60 +#, fuzzy, python-format +#| msgid "%d month" +#| msgid_plural "%d months" +msgid "1 month" +msgstr "%d mês" + +#: rhodecode/controllers/admin/gists.py:62 +msgid "Lifetime" +msgstr "" + +#: rhodecode/controllers/admin/gists.py:127 +#, fuzzy +#| msgid "Error occurred during hook creation" +msgid "Error occurred during gist creation" +msgstr "ocorreu um erro ao criar gancho" + +#: rhodecode/controllers/admin/gists.py:165 +#, fuzzy, python-format +#| msgid "Deleted repository %s" +msgid "Deleted gist %s" +msgstr "excluído o repositório %s" + #: rhodecode/controllers/admin/ldap_settings.py:50 msgid "BASE" msgstr "BASE" @@ -367,36 +417,40 @@ msgid "START_TLS on LDAP connection" msgstr "START_TLS na conexão LDAP" -#: rhodecode/controllers/admin/ldap_settings.py:126 +#: rhodecode/controllers/admin/ldap_settings.py:124 msgid "LDAP settings updated successfully" msgstr "Configurações de LDAP atualizadas com sucesso" -#: rhodecode/controllers/admin/ldap_settings.py:130 +#: rhodecode/controllers/admin/ldap_settings.py:128 msgid "Unable to activate ldap. The \"python-ldap\" library is missing." msgstr "Não foi possível ativar LDAP. A biblioteca \"python-ldap\" está faltando." -#: rhodecode/controllers/admin/ldap_settings.py:147 +#: rhodecode/controllers/admin/ldap_settings.py:145 #, 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:58 +#: rhodecode/controllers/admin/permissions.py:62 +#: rhodecode/controllers/admin/permissions.py:66 +msgid "None" +msgstr "Nenhum" + +#: rhodecode/controllers/admin/permissions.py:59 +#: rhodecode/controllers/admin/permissions.py:63 +#: rhodecode/controllers/admin/permissions.py:67 +msgid "Read" +msgstr "Ler" + #: rhodecode/controllers/admin/permissions.py:60 #: rhodecode/controllers/admin/permissions.py:64 -msgid "None" -msgstr "Nenhum" +#: rhodecode/controllers/admin/permissions.py:68 +msgid "Write" +msgstr "Gravar" #: rhodecode/controllers/admin/permissions.py:61 #: rhodecode/controllers/admin/permissions.py:65 -msgid "Read" -msgstr "Ler" - -#: rhodecode/controllers/admin/permissions.py:62 -#: rhodecode/controllers/admin/permissions.py:66 -msgid "Write" -msgstr "Gravar" - -#: rhodecode/controllers/admin/permissions.py:63 -#: rhodecode/controllers/admin/permissions.py:67 +#: rhodecode/controllers/admin/permissions.py:69 #: rhodecode/templates/admin/defaults/defaults.html:9 #: rhodecode/templates/admin/ldap/ldap.html:9 #: rhodecode/templates/admin/permissions/permissions.html:9 @@ -417,44 +471,58 @@ #: 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:292 -#: rhodecode/templates/base/base.html:293 -#: rhodecode/templates/base/base.html:299 -#: rhodecode/templates/base/base.html:300 +#: rhodecode/templates/base/base.html:317 +#: rhodecode/templates/base/base.html:318 +#: rhodecode/templates/base/base.html:324 +#: rhodecode/templates/base/base.html:325 msgid "Admin" msgstr "Administrador" -#: rhodecode/controllers/admin/permissions.py:70 -#: rhodecode/controllers/admin/permissions.py:76 -#: rhodecode/controllers/admin/permissions.py:79 +#: rhodecode/controllers/admin/permissions.py:72 +#: rhodecode/controllers/admin/permissions.py:83 +#: rhodecode/controllers/admin/permissions.py:86 +#: rhodecode/controllers/admin/permissions.py:89 +#: rhodecode/controllers/admin/permissions.py:92 msgid "Disabled" msgstr "Desabilitado" -#: rhodecode/controllers/admin/permissions.py:72 +#: rhodecode/controllers/admin/permissions.py:74 #, fuzzy msgid "Allowed with manual account activation" msgstr "permitido com ativação manual de conta" -#: rhodecode/controllers/admin/permissions.py:74 +#: rhodecode/controllers/admin/permissions.py:76 #, 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:79 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1439 rhodecode/model/db.py:1444 +msgid "Manual activation of external account" +msgstr "" + #: rhodecode/controllers/admin/permissions.py:80 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1440 rhodecode/model/db.py:1445 +msgid "Automatic activation of external account" +msgstr "" + +#: rhodecode/controllers/admin/permissions.py:84 +#: rhodecode/controllers/admin/permissions.py:87 +#: rhodecode/controllers/admin/permissions.py:90 +#: rhodecode/controllers/admin/permissions.py:93 msgid "Enabled" msgstr "Habilitado" -#: rhodecode/controllers/admin/permissions.py:128 +#: rhodecode/controllers/admin/permissions.py:138 msgid "Default permissions updated successfully" msgstr "Permissões padrões atualizadas com sucesso" -#: rhodecode/controllers/admin/permissions.py:142 +#: rhodecode/controllers/admin/permissions.py:152 #, fuzzy msgid "Error occurred during update of permissions" msgstr "ocorreu um erro ao atualizar as permissões" -#: rhodecode/controllers/admin/repos.py:127 +#: rhodecode/controllers/admin/repos.py:128 msgid "--REMOVE FORK--" msgstr "--REMOVER BIFURCAÇÂO--" @@ -473,243 +541,238 @@ msgid "Error creating repository %s" msgstr "repositório %s criado" -#: rhodecode/controllers/admin/repos.py:266 +#: rhodecode/controllers/admin/repos.py:270 #, python-format msgid "Repository %s updated successfully" msgstr "Repositório %s atualizado com sucesso" -#: rhodecode/controllers/admin/repos.py:284 +#: rhodecode/controllers/admin/repos.py:288 #, 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 +#: rhodecode/controllers/admin/repos.py:315 #, python-format msgid "Detached %s forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:314 -#: rhodecode/controllers/api/api.py:879 +#: rhodecode/controllers/admin/repos.py:318 #, fuzzy, python-format msgid "Deleted %s forks" msgstr "excluído o repositório %s" -#: rhodecode/controllers/admin/repos.py:319 +#: rhodecode/controllers/admin/repos.py:323 #, fuzzy, python-format msgid "Deleted repository %s" msgstr "excluído o repositório %s" -#: rhodecode/controllers/admin/repos.py:322 +#: rhodecode/controllers/admin/repos.py:326 #, 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:327 +#: rhodecode/controllers/admin/repos.py:331 #, 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 +#: rhodecode/controllers/admin/repos.py:345 #, 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: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:421 +#: rhodecode/controllers/admin/repos.py:375 +#: rhodecode/controllers/admin/repos_groups.py:332 +#: rhodecode/controllers/admin/users_groups.py:312 +#, fuzzy +#| msgid "Error occurred during update of permissions" +msgid "An error occurred during revoking of permission" +msgstr "ocorreu um erro ao atualizar as permissões" + +#: rhodecode/controllers/admin/repos.py:392 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:438 +#: rhodecode/controllers/admin/repos.py:409 msgid "An error occurred during cache invalidation" msgstr "Ocorreu um erro ao invalidar o cache" -#: rhodecode/controllers/admin/repos.py:458 -#: rhodecode/controllers/admin/repos.py:485 +#: rhodecode/controllers/admin/repos.py:429 +#: rhodecode/controllers/admin/repos.py:456 #, fuzzy msgid "An error occurred during unlocking" msgstr "Ocorreu um erro durante essa operação" -#: rhodecode/controllers/admin/repos.py:476 +#: rhodecode/controllers/admin/repos.py:447 #, fuzzy msgid "Unlocked" msgstr "destravar" -#: rhodecode/controllers/admin/repos.py:479 +#: rhodecode/controllers/admin/repos.py:450 #, fuzzy msgid "Locked" msgstr "destravar" -#: rhodecode/controllers/admin/repos.py:481 +#: rhodecode/controllers/admin/repos.py:452 #, fuzzy, python-format msgid "Repository has been %s" msgstr "bifurcado repositório %s como %s" -#: rhodecode/controllers/admin/repos.py:505 +#: rhodecode/controllers/admin/repos.py:476 msgid "Updated repository visibility in public journal" msgstr "Atualizada a visibilidade do repositório no diário público" -#: rhodecode/controllers/admin/repos.py:509 +#: rhodecode/controllers/admin/repos.py:480 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:514 rhodecode/model/validators.py:302 +#: rhodecode/controllers/admin/repos.py:485 rhodecode/model/validators.py:302 msgid "Token mismatch" msgstr "Descompasso de Token" -#: rhodecode/controllers/admin/repos.py:527 +#: rhodecode/controllers/admin/repos.py:498 msgid "Pulled from remote location" msgstr "Realizado pull de localização remota" -#: rhodecode/controllers/admin/repos.py:529 +#: rhodecode/controllers/admin/repos.py:501 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:545 +#: rhodecode/controllers/admin/repos.py:517 msgid "Nothing" msgstr "Nada" -#: rhodecode/controllers/admin/repos.py:547 +#: rhodecode/controllers/admin/repos.py:519 #, 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:551 +#: rhodecode/controllers/admin/repos.py:523 msgid "An error occurred during this operation" msgstr "Ocorreu um erro durante essa operação" -#: rhodecode/controllers/admin/repos.py:590 +#: rhodecode/controllers/admin/repos.py:562 #, 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 +#: rhodecode/controllers/admin/repos.py:576 #, fuzzy msgid "An error occurred during removal of field" msgstr "Ocorreu um erro durante essa operação" -#: rhodecode/controllers/admin/repos_groups.py:145 +#: rhodecode/controllers/admin/repos_groups.py:147 #, fuzzy, python-format msgid "Created repository group %s" msgstr "criado grupo de repositórios %s" -#: rhodecode/controllers/admin/repos_groups.py:157 +#: rhodecode/controllers/admin/repos_groups.py:159 #, 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:214 -#: rhodecode/controllers/admin/repos_groups.py:286 -msgid "Cannot revoke permission for yourself as admin" -msgstr "" - -#: rhodecode/controllers/admin/repos_groups.py:220 +#: rhodecode/controllers/admin/repos_groups.py:217 #, fuzzy, python-format msgid "Updated repository group %s" msgstr "atualizado grupo de repositórios %s" -#: rhodecode/controllers/admin/repos_groups.py:235 +#: rhodecode/controllers/admin/repos_groups.py:232 #, 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:253 +#: rhodecode/controllers/admin/repos_groups.py:250 #, 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:260 +#: rhodecode/controllers/admin/repos_groups.py:257 #, 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 +#: rhodecode/controllers/admin/repos_groups.py:263 #, fuzzy, python-format msgid "Removed repository group %s" msgstr "removido grupo de repositórios %s" -#: rhodecode/controllers/admin/repos_groups.py:271 +#: rhodecode/controllers/admin/repos_groups.py:268 #, 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: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: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:126 +#: rhodecode/controllers/admin/repos_groups.py:279 +#: rhodecode/controllers/admin/repos_groups.py:314 +#: rhodecode/controllers/admin/users_groups.py:300 +msgid "Cannot revoke permission for yourself as admin" +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:294 +#, fuzzy +#| msgid "Repository permissions updated" +msgid "Repository Group permissions updated" +msgstr "Criação de repositório" + +#: rhodecode/controllers/admin/settings.py:123 #, 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:135 +#: rhodecode/controllers/admin/settings.py:132 msgid "Whoosh reindex task scheduled" msgstr "Tarefa de reindexação do whoosh agendada" -#: rhodecode/controllers/admin/settings.py:166 +#: rhodecode/controllers/admin/settings.py:163 msgid "Updated application settings" msgstr "Configurações da aplicação atualizadas" -#: rhodecode/controllers/admin/settings.py:170 -#: rhodecode/controllers/admin/settings.py:301 +#: rhodecode/controllers/admin/settings.py:167 +#: rhodecode/controllers/admin/settings.py:304 #, 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:216 +#: rhodecode/controllers/admin/settings.py:219 #, fuzzy msgid "Updated visualisation settings" msgstr "Configurações da aplicação atualizadas" -#: rhodecode/controllers/admin/settings.py:221 +#: rhodecode/controllers/admin/settings.py:224 #, 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 +#: rhodecode/controllers/admin/settings.py:300 #, fuzzy msgid "Updated VCS settings" msgstr "Atualizadas as configurações do mercurial" -#: rhodecode/controllers/admin/settings.py:311 +#: rhodecode/controllers/admin/settings.py:314 msgid "Added new hook" msgstr "Adicionado novo gancho" -#: rhodecode/controllers/admin/settings.py:323 +#: rhodecode/controllers/admin/settings.py:326 msgid "Updated hooks" msgstr "Atualizados os ganchos" -#: rhodecode/controllers/admin/settings.py:327 +#: rhodecode/controllers/admin/settings.py:330 #, fuzzy msgid "Error occurred during hook creation" msgstr "ocorreu um erro ao criar gancho" -#: rhodecode/controllers/admin/settings.py:346 +#: rhodecode/controllers/admin/settings.py:349 msgid "Email task created" msgstr "Tarefa de e-mail criada" -#: rhodecode/controllers/admin/settings.py:410 +#: rhodecode/controllers/admin/settings.py:413 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:452 +#: rhodecode/controllers/admin/settings.py:455 msgid "Your account was updated successfully" msgstr "Sua conta foi atualizada com sucesso" -#: rhodecode/controllers/admin/settings.py:467 +#: rhodecode/controllers/admin/settings.py:470 #: rhodecode/controllers/admin/users.py:198 #, fuzzy, python-format msgid "Error occurred during update of user %s" @@ -738,124 +801,103 @@ msgid "An error occurred during deletion of user" msgstr "Ocorreu um erro ao excluir o usuário" -#: rhodecode/controllers/admin/users.py:233 +#: rhodecode/controllers/admin/users.py:234 msgid "You can't edit this user" msgstr "Você não pode editar esse usuário" -#: rhodecode/controllers/admin/users.py:276 -msgid "Granted 'repository create' permission to user" -msgstr "Concedida permissão de 'criar repositório' ao usuário" - -#: rhodecode/controllers/admin/users.py:281 -msgid "Revoked 'repository create' permission to user" -msgstr "Revogada permissão de 'criar repositório' ao usuário" - -#: rhodecode/controllers/admin/users.py:287 -#, fuzzy -msgid "Granted 'repository fork' permission to user" -msgstr "Concedida permissão de 'criar repositório' ao usuário" - -#: rhodecode/controllers/admin/users.py:292 -#, fuzzy -msgid "Revoked 'repository fork' permission to user" -msgstr "Revogada permissão de 'criar repositório' ao usuário" - -#: rhodecode/controllers/admin/users.py:298 -#: rhodecode/controllers/admin/users_groups.py:281 +#: rhodecode/controllers/admin/users.py:293 +#: rhodecode/controllers/admin/users_groups.py:372 +#, fuzzy +#| msgid "Copy permissions" +msgid "Updated permissions" +msgstr "Copiar permissões" + +#: rhodecode/controllers/admin/users.py:297 +#: rhodecode/controllers/admin/users_groups.py:376 #, fuzzy msgid "An error occurred during permissions saving" msgstr "Ocorreu um erro durante essa operação" -#: rhodecode/controllers/admin/users.py:312 +#: rhodecode/controllers/admin/users.py:311 #, python-format msgid "Added email %s to user" msgstr "" -#: rhodecode/controllers/admin/users.py:318 +#: rhodecode/controllers/admin/users.py:317 #, fuzzy msgid "An error occurred during email saving" msgstr "Ocorreu um erro durante essa operação" -#: rhodecode/controllers/admin/users.py:328 +#: rhodecode/controllers/admin/users.py:327 #, fuzzy msgid "Removed email from user" msgstr "removido grupo de repositórios %s" -#: rhodecode/controllers/admin/users.py:341 +#: rhodecode/controllers/admin/users.py:340 #, python-format msgid "Added ip %s to user" msgstr "" -#: rhodecode/controllers/admin/users.py:347 +#: rhodecode/controllers/admin/users.py:346 #, fuzzy msgid "An error occurred during ip saving" msgstr "Ocorreu um erro durante essa operação" -#: rhodecode/controllers/admin/users.py:359 +#: rhodecode/controllers/admin/users.py:358 #, fuzzy msgid "Removed ip from user" msgstr "removido grupo de repositórios %s" -#: rhodecode/controllers/admin/users_groups.py:86 +#: rhodecode/controllers/admin/users_groups.py:162 #, fuzzy, python-format msgid "Created user group %s" msgstr "criado grupo de usuários %s" -#: rhodecode/controllers/admin/users_groups.py:97 +#: rhodecode/controllers/admin/users_groups.py:173 #, 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:166 +#: rhodecode/controllers/admin/users_groups.py:210 #, fuzzy, python-format msgid "Updated user group %s" msgstr "grupo de usuários %s atualizado" -#: rhodecode/controllers/admin/users_groups.py:188 +#: rhodecode/controllers/admin/users_groups.py:232 #, 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:205 +#: rhodecode/controllers/admin/users_groups.py:250 #, fuzzy msgid "Successfully deleted user group" msgstr "grupo de usuários excluído com sucesso" -#: rhodecode/controllers/admin/users_groups.py:210 +#: rhodecode/controllers/admin/users_groups.py:255 #, 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: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: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: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: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:530 +#: rhodecode/controllers/admin/users_groups.py:274 +msgid "Target group cannot be the same" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:280 +#, fuzzy +#| msgid "Repository permissions updated" +msgid "User Group permissions updated" +msgstr "Criação de repositório" + +#: rhodecode/lib/auth.py:544 #, fuzzy, python-format msgid "IP %s not allowed" msgstr "seguidores" -#: rhodecode/lib/auth.py:579 +#: rhodecode/lib/auth.py:593 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:620 +#: rhodecode/lib/auth.py:634 msgid "You need to be a signed in to view this page" msgstr "Você precisa estar logado para ver essa página" @@ -874,161 +916,195 @@ msgid "No changes detected" msgstr "Nenhuma alteração detectada" -#: rhodecode/lib/helpers.py:394 +#: rhodecode/lib/helpers.py:428 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "" -#: rhodecode/lib/helpers.py:506 +#: rhodecode/lib/helpers.py:539 msgid "True" msgstr "Verdadeiro" -#: rhodecode/lib/helpers.py:509 +#: rhodecode/lib/helpers.py:542 msgid "False" msgstr "Falso" -#: rhodecode/lib/helpers.py:547 +#: rhodecode/lib/helpers.py:580 #, fuzzy, python-format msgid "Deleted branch: %s" msgstr "excluído o repositório %s" -#: rhodecode/lib/helpers.py:550 +#: rhodecode/lib/helpers.py:583 #, fuzzy, python-format msgid "Created tag: %s" msgstr "usuário %s criado" -#: rhodecode/lib/helpers.py:563 +#: rhodecode/lib/helpers.py:596 msgid "Changeset not found" msgstr "Conjunto de alterações não encontrado" -#: rhodecode/lib/helpers.py:615 +#: rhodecode/lib/helpers.py:646 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Ver todos os conjuntos de mudanças combinados %s->%s" -#: rhodecode/lib/helpers.py:621 +#: rhodecode/lib/helpers.py:652 msgid "compare view" msgstr "comparar exibir" -#: rhodecode/lib/helpers.py:641 +#: rhodecode/lib/helpers.py:672 msgid "and" msgstr "e" -#: rhodecode/lib/helpers.py:642 +#: rhodecode/lib/helpers.py:673 #, python-format msgid "%s more" msgstr "%s mais" -#: rhodecode/lib/helpers.py:643 rhodecode/templates/changelog/changelog.html:44 +#: rhodecode/lib/helpers.py:674 rhodecode/templates/changelog/changelog.html:53 msgid "revisions" msgstr "revisões" -#: rhodecode/lib/helpers.py:667 +#: rhodecode/lib/helpers.py:698 #, fuzzy, python-format msgid "fork name %s" msgstr "nome da bifurcação" -#: rhodecode/lib/helpers.py:684 +#: rhodecode/lib/helpers.py:715 #: rhodecode/templates/pullrequests/pullrequest_show.html:8 #, python-format msgid "Pull request #%s" msgstr "" -#: rhodecode/lib/helpers.py:690 +#: rhodecode/lib/helpers.py:725 msgid "[deleted] repository" msgstr "repositório [excluído]" -#: rhodecode/lib/helpers.py:692 rhodecode/lib/helpers.py:702 +#: rhodecode/lib/helpers.py:727 rhodecode/lib/helpers.py:739 msgid "[created] repository" msgstr "repositório [criado]" -#: rhodecode/lib/helpers.py:694 +#: rhodecode/lib/helpers.py:729 msgid "[created] repository as fork" msgstr "repositório [criado] como uma bifurcação" -#: rhodecode/lib/helpers.py:696 rhodecode/lib/helpers.py:704 +#: rhodecode/lib/helpers.py:731 rhodecode/lib/helpers.py:741 msgid "[forked] repository" msgstr "repositório [bifurcado]" -#: rhodecode/lib/helpers.py:698 rhodecode/lib/helpers.py:706 +#: rhodecode/lib/helpers.py:733 rhodecode/lib/helpers.py:743 msgid "[updated] repository" msgstr "repositório [atualizado]" -#: rhodecode/lib/helpers.py:700 +#: rhodecode/lib/helpers.py:735 +#, fuzzy +#| msgid "Downloads are disabled for this repository" +msgid "[downloaded] archive from repository" +msgstr "Downloads estão desabilitados para este repositório" + +#: rhodecode/lib/helpers.py:737 msgid "[delete] repository" msgstr "[excluir] repositório" -#: rhodecode/lib/helpers.py:708 +#: rhodecode/lib/helpers.py:745 #, fuzzy msgid "[created] user" msgstr "usuário %s criado" -#: rhodecode/lib/helpers.py:710 +#: rhodecode/lib/helpers.py:747 #, fuzzy msgid "[updated] user" msgstr "grupo de usuários %s atualizado" -#: rhodecode/lib/helpers.py:712 +#: rhodecode/lib/helpers.py:749 #, fuzzy msgid "[created] user group" msgstr "criado grupo de usuários %s" -#: rhodecode/lib/helpers.py:714 +#: rhodecode/lib/helpers.py:751 #, fuzzy msgid "[updated] user group" msgstr "grupo de usuários %s atualizado" -#: rhodecode/lib/helpers.py:716 +#: rhodecode/lib/helpers.py:753 #, fuzzy msgid "[commented] on revision in repository" msgstr "repositório [criado]" -#: rhodecode/lib/helpers.py:718 +#: rhodecode/lib/helpers.py:755 #, fuzzy msgid "[commented] on pull request for" msgstr "repositório [criado]" -#: rhodecode/lib/helpers.py:720 +#: rhodecode/lib/helpers.py:757 #, fuzzy msgid "[closed] pull request for" msgstr "repositório [criado]" -#: rhodecode/lib/helpers.py:722 +#: rhodecode/lib/helpers.py:759 msgid "[pushed] into" msgstr "[realizado push] para" -#: rhodecode/lib/helpers.py:724 +#: rhodecode/lib/helpers.py:761 #, fuzzy msgid "[committed via RhodeCode] into repository" msgstr "[realizado commit via RhodeCode] para" -#: rhodecode/lib/helpers.py:726 +#: rhodecode/lib/helpers.py:763 #, fuzzy msgid "[pulled from remote] into repository" msgstr "[realizado pull remoto] para" -#: rhodecode/lib/helpers.py:728 +#: rhodecode/lib/helpers.py:765 msgid "[pulled] from" msgstr "[realizado pull] a partir de" -#: rhodecode/lib/helpers.py:730 +#: rhodecode/lib/helpers.py:767 msgid "[started following] repository" msgstr "[passou a seguir] o repositório" -#: rhodecode/lib/helpers.py:732 +#: rhodecode/lib/helpers.py:769 msgid "[stopped following] repository" msgstr "[parou de seguir] o repositório" -#: rhodecode/lib/helpers.py:910 +#: rhodecode/lib/helpers.py:1088 #, python-format msgid " and %s more" msgstr " e mais %s" -#: rhodecode/lib/helpers.py:914 +#: rhodecode/lib/helpers.py:1092 msgid "No Files" msgstr "Nenhum Arquivo" -#: rhodecode/lib/helpers.py:1198 +#: rhodecode/lib/helpers.py:1158 +#, fuzzy +#| msgid "Add new file" +msgid "new file" +msgstr "Adicionar novo arquivo" + +#: rhodecode/lib/helpers.py:1161 +#, fuzzy +#| msgid "Removed" +msgid "mod" +msgstr "removidos" + +#: rhodecode/lib/helpers.py:1164 +#, fuzzy +#| msgid "delete" +msgid "del" +msgstr "excluir" + +#: rhodecode/lib/helpers.py:1167 +#, fuzzy +#| msgid "Username" +msgid "rename" +msgstr "Nome de usuário" + +#: rhodecode/lib/helpers.py:1172 +msgid "chmod" +msgstr "" + +#: rhodecode/lib/helpers.py:1404 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1044,240 +1120,340 @@ msgid "cannot create new union repository" msgstr "repositório [criado]" -#: rhodecode/lib/utils2.py:411 +#: rhodecode/lib/utils2.py:410 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d ano" msgstr[1] "%d anos" -#: rhodecode/lib/utils2.py:412 +#: rhodecode/lib/utils2.py:411 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d mês" msgstr[1] "%d meses" -#: rhodecode/lib/utils2.py:413 +#: rhodecode/lib/utils2.py:412 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dia" msgstr[1] "%d dias" -#: rhodecode/lib/utils2.py:414 +#: rhodecode/lib/utils2.py:413 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: rhodecode/lib/utils2.py:415 +#: rhodecode/lib/utils2.py:414 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: rhodecode/lib/utils2.py:416 +#: rhodecode/lib/utils2.py:415 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d segundo" msgstr[1] "%d segundos" -#: rhodecode/lib/utils2.py:432 +#: rhodecode/lib/utils2.py:431 #, fuzzy, python-format msgid "in %s" msgstr "na linha %s" -#: rhodecode/lib/utils2.py:434 +#: rhodecode/lib/utils2.py:433 #, python-format msgid "%s ago" msgstr "%s atrás" -#: rhodecode/lib/utils2.py:436 +#: rhodecode/lib/utils2.py:435 #, fuzzy, python-format msgid "in %s and %s" msgstr "%s e %s atrás" -#: rhodecode/lib/utils2.py:439 +#: rhodecode/lib/utils2.py:438 #, python-format msgid "%s and %s ago" msgstr "%s e %s atrás" -#: rhodecode/lib/utils2.py:442 +#: rhodecode/lib/utils2.py:441 msgid "just now" msgstr "agora há pouco" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 #: 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 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1303 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1388 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1408 rhodecode/model/db.py:1413 #, 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/lib/dbmigrate/schema/db_1_5_2.py:1290 rhodecode/model/db.py:1389 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1389 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1409 rhodecode/model/db.py:1414 #, 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/lib/dbmigrate/schema/db_1_5_2.py:1291 rhodecode/model/db.py:1390 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1390 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1410 rhodecode/model/db.py:1415 #, 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/lib/dbmigrate/schema/db_1_5_2.py:1292 rhodecode/model/db.py:1391 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1306 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1391 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1411 rhodecode/model/db.py:1416 #, 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/lib/dbmigrate/schema/db_1_5_2.py:1294 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1308 #, 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/lib/dbmigrate/schema/db_1_5_2.py:1295 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1309 #, 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/lib/dbmigrate/schema/db_1_5_2.py:1296 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1310 #, 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/lib/dbmigrate/schema/db_1_5_2.py:1297 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1311 #, 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/lib/dbmigrate/schema/db_1_5_2.py:1299 rhodecode/model/db.py:1398 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1313 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1398 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1406 rhodecode/model/db.py:1411 #, 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/lib/dbmigrate/schema/db_1_5_2.py:1300 rhodecode/model/db.py:1399 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1314 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1399 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1429 rhodecode/model/db.py:1434 #, 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/lib/dbmigrate/schema/db_1_5_2.py:1301 rhodecode/model/db.py:1400 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1315 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1400 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1430 rhodecode/model/db.py:1435 #, 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/lib/dbmigrate/schema/db_1_5_2.py:1302 rhodecode/model/db.py:1401 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1316 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1401 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1432 rhodecode/model/db.py:1437 #, 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/lib/dbmigrate/schema/db_1_5_2.py:1303 rhodecode/model/db.py:1402 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1317 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1402 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1433 rhodecode/model/db.py:1438 #, 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/lib/dbmigrate/schema/db_1_5_2.py:1304 rhodecode/model/db.py:1403 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1318 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.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/lib/dbmigrate/schema/db_1_5_2.py:1305 rhodecode/model/db.py:1404 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1319 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.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/lib/dbmigrate/schema/db_1_5_2.py:1308 rhodecode/model/db.py:1407 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1322 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.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/lib/dbmigrate/schema/db_1_5_2.py:1749 rhodecode/model/db.py:1838 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1763 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1838 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1934 rhodecode/model/db.py:1939 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/lib/dbmigrate/schema/db_1_5_2.py:1750 rhodecode/model/db.py:1839 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1764 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1839 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1935 rhodecode/model/db.py:1940 #, 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/lib/dbmigrate/schema/db_1_5_2.py:1751 rhodecode/model/db.py:1840 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1765 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1840 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1936 rhodecode/model/db.py:1941 msgid "Rejected" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 #: 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 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1766 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1841 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1937 rhodecode/model/db.py:1942 msgid "Under Review" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1252 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1270 rhodecode/model/db.py:1275 +msgid "top level" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1393 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1413 rhodecode/model/db.py:1418 +#, fuzzy +msgid "Repository group no access" +msgstr "grupos de repositórios" + +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1394 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1414 rhodecode/model/db.py:1419 +#, fuzzy +msgid "Repository group read access" +msgstr "grupos de repositórios" + +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1395 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1415 rhodecode/model/db.py:1420 +#, fuzzy +msgid "Repository group write access" +msgstr "grupos de repositórios" + +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1396 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1416 rhodecode/model/db.py:1421 +#, fuzzy +msgid "Repository group admin access" +msgstr "grupos de repositórios" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1418 rhodecode/model/db.py:1423 +#, fuzzy +#| msgid "Repository group no access" +msgid "User group no access" +msgstr "grupos de repositórios" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1419 rhodecode/model/db.py:1424 +#, fuzzy +#| msgid "Repository group read access" +msgid "User group read access" +msgstr "grupos de repositórios" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1420 rhodecode/model/db.py:1425 +#, fuzzy +#| msgid "Repository group write access" +msgid "User group write access" +msgstr "grupos de repositórios" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1421 rhodecode/model/db.py:1426 +#, fuzzy +#| msgid "Repository group admin access" +msgid "User group admin access" +msgstr "grupos de repositórios" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1423 rhodecode/model/db.py:1428 +#, fuzzy +#| msgid "Repository creation disabled" +msgid "Repository Group creation disabled" +msgstr "Criação de repositório" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1424 rhodecode/model/db.py:1429 +#, fuzzy +#| msgid "Repository creation enabled" +msgid "Repository Group creation enabled" +msgstr "Criação de repositório" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1426 rhodecode/model/db.py:1431 +#, fuzzy +#| msgid "Repository creation disabled" +msgid "User Group creation disabled" +msgstr "Criação de repositório" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1427 rhodecode/model/db.py:1432 +#, fuzzy +#| msgid "Repository creation enabled" +msgid "User Group creation enabled" +msgstr "Criação de repositório" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1435 rhodecode/model/db.py:1440 +#, fuzzy +#| msgid "Register disabled" +msgid "Registration disabled" +msgstr "desabilitado" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1436 rhodecode/model/db.py:1441 +#, fuzzy +#| msgid "Allowed with manual account activation" +msgid "User Registration with manual account activation" +msgstr "permitido com ativação manual de conta" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1437 rhodecode/model/db.py:1442 +#, fuzzy +#| msgid "Allowed with automatic account activation" +msgid "User Registration with automatic account activation" +msgstr "permitido com ativação automática de conta" + #: rhodecode/model/comment.py:75 #, python-format msgid "on line %s" msgstr "na linha %s" -#: rhodecode/model/comment.py:219 +#: rhodecode/model/comment.py:220 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" @@ -1296,42 +1472,42 @@ msgid "Enter %(min)i characters or more" msgstr "Entre com %(min)i caracteres ou mais" -#: rhodecode/model/notification.py:224 +#: rhodecode/model/notification.py:228 #, fuzzy, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "comentado no commit" -#: rhodecode/model/notification.py:225 -#, fuzzy, python-format -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/notification.py:229 #, fuzzy, python-format +msgid "%(user)s sent message at %(when)s" +msgstr "mensagem enviada" + +#: rhodecode/model/notification.py:230 +#, fuzzy, python-format +msgid "%(user)s mentioned you at %(when)s" +msgstr "mencionou você" + +#: rhodecode/model/notification.py:231 +#, fuzzy, python-format +msgid "%(user)s registered in RhodeCode at %(when)s" +msgstr "registrado no RhodeCode" + +#: rhodecode/model/notification.py:232 +#, fuzzy, python-format +msgid "%(user)s opened new pull request at %(when)s" +msgstr "comentado no commit" + +#: rhodecode/model/notification.py:233 +#, fuzzy, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "comentado no commit" -#: rhodecode/model/pull_request.py:104 +#: rhodecode/model/pull_request.py:98 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" msgstr "" -#: rhodecode/model/scm.py:598 +#: rhodecode/model/scm.py:674 #, fuzzy msgid "latest tip" msgstr "último login" @@ -1392,9 +1568,12 @@ msgstr "" #: rhodecode/model/validators.py:89 +#, fuzzy +#| msgid "" "Username may only contain alphanumeric characters underscores, +#| periods or" " dashes and must begin with alphanumeric character" msgid "" "Username may only contain alphanumeric characters underscores, periods or" -" dashes and must begin with alphanumeric character" +" dashes and must begin with alphanumeric character or underscore" msgstr "" "Nome de usuário pode conter somente caracteres alfanuméricos, sublinha, " "pontos e hífens e deve iniciar com caractere alfanumérico" @@ -1508,25 +1687,25 @@ 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:557 +#: rhodecode/model/validators.py:559 #, 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:650 +#: rhodecode/model/validators.py:652 msgid "This is not a valid path" msgstr "Esse não é um caminho válido" -#: rhodecode/model/validators.py:665 +#: rhodecode/model/validators.py:667 msgid "This e-mail address is already taken" msgstr "Esse endereço de e-mail já está tomado" -#: rhodecode/model/validators.py:685 +#: rhodecode/model/validators.py:687 #, 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:722 +#: rhodecode/model/validators.py:724 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" @@ -1534,24 +1713,28 @@ "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:735 +#: rhodecode/model/validators.py:737 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" -#: rhodecode/model/validators.py:767 +#: rhodecode/model/validators.py:769 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "" -#: rhodecode/model/validators.py:768 +#: rhodecode/model/validators.py:770 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: rhodecode/model/validators.py:800 +#: rhodecode/model/validators.py:803 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" +#: rhodecode/model/validators.py:817 +msgid "Filename cannot be inside a directory" +msgstr "" + #: rhodecode/templates/index.html:5 msgid "Dashboard" msgstr "Painel de Controle" @@ -1599,29 +1782,28 @@ msgstr "" #: 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 +#: rhodecode/templates/admin/users_groups/users_groups.html:37 msgid "Group name" msgstr "Nome do grupo" #: 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:270 +#: rhodecode/templates/index_base.html:123 #: rhodecode/templates/admin/repos/repo_add_base.html:56 -#: rhodecode/templates/admin/repos/repo_edit.html:75 +#: rhodecode/templates/admin/repos/repo_edit.html:68 #: rhodecode/templates/admin/repos/repos.html:73 #: 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/email_templates/changeset_comment.html:9 +#: rhodecode/templates/email_templates/pull_request.html:9 #: rhodecode/templates/forks/fork.html:56 -#: rhodecode/templates/pullrequests/pullrequest.html:101 +#: rhodecode/templates/pullrequests/pullrequest.html:43 +#: rhodecode/templates/pullrequests/pullrequest_show.html:81 #: rhodecode/templates/summary/summary.html:106 msgid "Description" msgstr "Descrição" @@ -1629,27 +1811,25 @@ #: 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/repo_edit.html:50 #: 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:82 -#: rhodecode/templates/index_base.html:178 -#: rhodecode/templates/index_base.html:268 +#: rhodecode/templates/index_base.html:121 #: 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_my_account.html:172 -#: rhodecode/templates/base/perms_summary.html:14 -#: rhodecode/templates/bookmarks/bookmarks.html:34 +#: rhodecode/templates/base/perms_summary.html:37 +#: rhodecode/templates/bookmarks/bookmarks.html:48 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 #: 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:193 -#: rhodecode/templates/journal/journal.html:296 +#: rhodecode/templates/journal/journal.html:283 #: rhodecode/templates/summary/summary.html:55 #: rhodecode/templates/summary/summary.html:124 #: rhodecode/templates/tags/tags.html:48 @@ -1657,110 +1837,79 @@ msgid "Name" msgstr "Nome" -#: rhodecode/templates/index_base.html:84 -msgid "Last change" -msgstr "Última alteração" - -#: rhodecode/templates/index_base.html:85 -#: rhodecode/templates/index_base.html:183 -#: rhodecode/templates/index_base.html:273 +#: rhodecode/templates/index_base.html:124 +msgid "Last Change" +msgstr "Última Alteração" + +#: rhodecode/templates/index_base.html:126 #: 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 +#: rhodecode/templates/journal/journal.html:285 msgid "Tip" msgstr "Ponta" -#: 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/index_base.html:128 +#: rhodecode/templates/admin/repos/repo_edit.html:114 #: rhodecode/templates/admin/repos/repos.html:76 msgid "Owner" msgstr "Dono" -#: rhodecode/templates/index_base.html:87 -msgid "Atom" -msgstr "Atom" - -#: 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:196 +#: rhodecode/templates/index_base.html:136 +#: rhodecode/templates/admin/repos/repos.html:84 +#: rhodecode/templates/admin/users/user_edit_my_account.html:183 #: rhodecode/templates/admin/users/users.html:107 -#: rhodecode/templates/bookmarks/bookmarks.html:58 +#: rhodecode/templates/bookmarks/bookmarks.html:74 #: rhodecode/templates/branches/branches.html:73 -#: rhodecode/templates/journal/journal.html:217 -#: rhodecode/templates/journal/journal.html:320 +#: rhodecode/templates/journal/journal.html:204 +#: rhodecode/templates/journal/journal.html:294 #: 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:210 -#: rhodecode/templates/index_base.html:297 -#: rhodecode/templates/admin/repos/repos.html:98 -#: rhodecode/templates/admin/users/user_edit_my_account.html:197 +#: rhodecode/templates/index_base.html:137 +#: rhodecode/templates/admin/repos/repos.html:85 +#: rhodecode/templates/admin/users/user_edit_my_account.html:184 #: rhodecode/templates/admin/users/users.html:108 -#: rhodecode/templates/bookmarks/bookmarks.html:59 +#: rhodecode/templates/bookmarks/bookmarks.html:75 #: rhodecode/templates/branches/branches.html:74 -#: rhodecode/templates/journal/journal.html:218 -#: rhodecode/templates/journal/journal.html:321 +#: rhodecode/templates/journal/journal.html:205 +#: rhodecode/templates/journal/journal.html:295 #: 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:271 -msgid "Last Change" -msgstr "Última Alteração" - -#: 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 "Nenhum registro encontrado." - -#: 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/index_base.html:138 +#, fuzzy +msgid "No repositories found." +msgstr "grupos de repositórios" + +#: rhodecode/templates/index_base.html:139 +#: rhodecode/templates/admin/repos/repos.html:87 +#: rhodecode/templates/admin/users/user_edit_my_account.html:186 #: rhodecode/templates/admin/users/users.html:110 -#: rhodecode/templates/bookmarks/bookmarks.html:61 +#: rhodecode/templates/bookmarks/bookmarks.html:77 #: rhodecode/templates/branches/branches.html:76 -#: rhodecode/templates/journal/journal.html:220 -#: rhodecode/templates/journal/journal.html:323 +#: rhodecode/templates/journal/journal.html:207 +#: rhodecode/templates/journal/journal.html:297 #: rhodecode/templates/tags/tags.html:77 msgid "Data error." msgstr "Erro de dados." -#: rhodecode/templates/index_base.html:213 -#: rhodecode/templates/index_base.html:300 -#: rhodecode/templates/admin/repos/repos.html:101 +#: rhodecode/templates/index_base.html:140 +#: rhodecode/templates/admin/repos/repos.html:88 #: rhodecode/templates/admin/users/user_edit_my_account.html:58 -#: rhodecode/templates/admin/users/user_edit_my_account.html:200 +#: rhodecode/templates/admin/users/user_edit_my_account.html:187 #: rhodecode/templates/admin/users/users.html:111 -#: rhodecode/templates/bookmarks/bookmarks.html:62 +#: rhodecode/templates/bookmarks/bookmarks.html:78 #: rhodecode/templates/branches/branches.html:77 -#: rhodecode/templates/journal/journal.html:221 -#: rhodecode/templates/journal/journal.html:324 +#: rhodecode/templates/journal/journal.html:208 +#: rhodecode/templates/journal/journal.html:298 #: rhodecode/templates/tags/tags.html:78 msgid "Loading..." msgstr "Carregando..." -#: 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 +#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:239 msgid "Log In" msgstr "Entrar" @@ -1775,7 +1924,7 @@ #: 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/base/base.html:215 #: rhodecode/templates/summary/summary.html:123 msgid "Username" msgstr "Nome de usuário" @@ -1783,7 +1932,7 @@ #: 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:212 +#: rhodecode/templates/base/base.html:224 msgid "Password" msgstr "Senha" @@ -1799,7 +1948,7 @@ msgid "Forgot your password ?" msgstr "Esqueceu sua senha ?" -#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:223 +#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:235 msgid "Don't have an account ?" msgstr "Não possui uma conta ?" @@ -1871,7 +2020,7 @@ #: 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/admin/repos/repo_edit.html:78 #: rhodecode/templates/data_table/_dt_elements.html:61 #: rhodecode/templates/summary/summary.html:77 msgid "Private repository" @@ -1894,13 +2043,13 @@ msgstr "Ainda não há etiquetas" #: rhodecode/templates/switch_to_list.html:35 -#: rhodecode/templates/bookmarks/bookmarks_data.html:32 +#: rhodecode/templates/bookmarks/bookmarks_data.html:37 msgid "There are no bookmarks yet" msgstr "Ainda não há marcadores" #: rhodecode/templates/admin/admin.html:5 #: rhodecode/templates/admin/admin.html:13 -#: rhodecode/templates/base/base.html:68 +#: rhodecode/templates/base/base.html:73 msgid "Admin journal" msgstr "Diário do administrador" @@ -1928,9 +2077,9 @@ #: 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/admin/users_groups/users_groups.html:40 #: rhodecode/templates/journal/journal.html:197 -#: rhodecode/templates/journal/journal.html:300 +#: rhodecode/templates/journal/journal.html:287 msgid "Action" msgstr "Ação" @@ -1940,7 +2089,7 @@ msgstr "Repositório" #: rhodecode/templates/admin/admin_log.html:8 -#: rhodecode/templates/bookmarks/bookmarks.html:35 +#: rhodecode/templates/bookmarks/bookmarks.html:49 #: rhodecode/templates/bookmarks/bookmarks_data.html:7 #: rhodecode/templates/branches/branches.html:48 #: rhodecode/templates/branches/branches_data.html:7 @@ -1964,20 +2113,19 @@ msgstr "grupos de repositórios" #: rhodecode/templates/admin/defaults/defaults.html:11 -#: rhodecode/templates/base/base.html:75 +#: rhodecode/templates/base/base.html:80 #, fuzzy msgid "Defaults" msgstr "excluir" #: rhodecode/templates/admin/defaults/defaults.html:35 #: rhodecode/templates/admin/repos/repo_add_base.html:38 -#: rhodecode/templates/admin/repos/repo_edit.html:58 msgid "Type" msgstr "Tipo" #: rhodecode/templates/admin/defaults/defaults.html:48 #: rhodecode/templates/admin/repos/repo_add_base.html:69 -#: rhodecode/templates/admin/repos/repo_edit.html:89 +#: rhodecode/templates/admin/repos/repo_edit.html:82 #: rhodecode/templates/forks/fork.html:69 msgid "" "Private repositories are only visible to people explicitly added as " @@ -1987,61 +2135,205 @@ "adicionadas como colaboradores." #: rhodecode/templates/admin/defaults/defaults.html:55 -#: rhodecode/templates/admin/repos/repo_edit.html:94 +#: rhodecode/templates/admin/repos/repo_edit.html:87 msgid "Enable statistics" msgstr "Habilitar estatísticas" #: rhodecode/templates/admin/defaults/defaults.html:59 -#: rhodecode/templates/admin/repos/repo_edit.html:98 +#: rhodecode/templates/admin/repos/repo_edit.html:91 msgid "Enable statistics window on summary page." msgstr "Habilitar janela de estatísticas na página de sumário." #: rhodecode/templates/admin/defaults/defaults.html:65 -#: rhodecode/templates/admin/repos/repo_edit.html:103 +#: rhodecode/templates/admin/repos/repo_edit.html:96 msgid "Enable downloads" msgstr "Habilitar downloads" #: rhodecode/templates/admin/defaults/defaults.html:69 -#: rhodecode/templates/admin/repos/repo_edit.html:107 +#: rhodecode/templates/admin/repos/repo_edit.html:100 msgid "Enable download menu on summary page." msgstr "Habilitar menu de descarregar na página de sumário." #: rhodecode/templates/admin/defaults/defaults.html:75 -#: rhodecode/templates/admin/repos/repo_edit.html:112 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72 +#: rhodecode/templates/admin/repos/repo_edit.html:105 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:64 #, fuzzy msgid "Enable locking" msgstr "habilitar" #: rhodecode/templates/admin/defaults/defaults.html:79 -#: rhodecode/templates/admin/repos/repo_edit.html:116 +#: rhodecode/templates/admin/repos/repo_edit.html:109 msgid "Enable lock-by-pulling on repository." msgstr "" #: rhodecode/templates/admin/defaults/defaults.html:84 #: rhodecode/templates/admin/ldap/ldap.html:89 -#: rhodecode/templates/admin/permissions/permissions.html:92 -#: 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/permissions/permissions.html:122 +#: rhodecode/templates/admin/repos/repo_edit.html:141 +#: rhodecode/templates/admin/repos/repo_edit.html:166 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:96 #: rhodecode/templates/admin/settings/hooks.html:73 #: 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/admin/users_groups/users_group_edit.html:143 +#: rhodecode/templates/base/default_perms_box.html:53 msgid "Save" msgstr "Salvar" +#: rhodecode/templates/admin/gists/index.html:5 +#: rhodecode/templates/base/base.html:299 +msgid "Gists" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:10 +#, fuzzy, python-format +#| msgid "Created user %s" +msgid "Private Gists for user %s" +msgstr "usuário %s criado" + +#: rhodecode/templates/admin/gists/index.html:12 +#, python-format +msgid "Public Gists for user %s" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:14 +msgid "Public Gists" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:31 +#: rhodecode/templates/admin/gists/show.html:24 +#: rhodecode/templates/base/base.html:302 +#, fuzzy +#| msgid "Create new file" +msgid "Create new gist" +msgstr "Criar novo arquivo" + +#: rhodecode/templates/admin/gists/index.html:48 +#, fuzzy +#| msgid "read" +msgid "Created" +msgstr "ler" + +#: rhodecode/templates/admin/gists/index.html:51 +#: rhodecode/templates/admin/gists/index.html:53 +#: rhodecode/templates/admin/gists/show.html:43 +#: rhodecode/templates/admin/gists/show.html:45 +#, fuzzy +#| msgid "Repositories" +msgid "Expires" +msgstr "Repositórios" + +#: rhodecode/templates/admin/gists/index.html:51 +#: rhodecode/templates/admin/gists/show.html:43 +#, fuzzy +#| msgid "owner" +msgid "never" +msgstr "Dono" + +#: rhodecode/templates/admin/gists/index.html:68 +#, fuzzy +#| msgid "There are no tags yet" +msgid "There are no gists yet" +msgstr "Ainda não há etiquetas" + +#: rhodecode/templates/admin/gists/new.html:5 +#: rhodecode/templates/admin/gists/new.html:16 +msgid "New gist" +msgstr "" + +#: rhodecode/templates/admin/gists/new.html:37 +#, fuzzy +#| msgid "description" +msgid "Gist description ..." +msgstr "Descrição" + +#: rhodecode/templates/admin/gists/new.html:52 +msgid "Create private gist" +msgstr "" + +#: rhodecode/templates/admin/gists/new.html:53 +msgid "Create public gist" +msgstr "" + +#: rhodecode/templates/admin/gists/new.html:54 +#: rhodecode/templates/admin/permissions/permissions.html:123 +#: rhodecode/templates/admin/permissions/permissions.html:185 +#: rhodecode/templates/admin/repos/repo_edit.html:142 +#: rhodecode/templates/admin/repos/repo_edit.html:167 +#: rhodecode/templates/admin/repos/repo_edit.html:381 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:73 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:97 +#: rhodecode/templates/admin/settings/settings.html:115 +#: rhodecode/templates/admin/settings/settings.html:196 +#: rhodecode/templates/admin/settings/settings.html:288 +#: rhodecode/templates/admin/users/user_edit.html:141 +#: rhodecode/templates/admin/users/user_edit.html:198 +#: rhodecode/templates/admin/users/user_edit.html:246 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:89 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:144 +#: rhodecode/templates/base/default_perms_box.html:54 +#: rhodecode/templates/files/files_add.html:80 +#: rhodecode/templates/files/files_edit.html:66 +#: rhodecode/templates/pullrequests/pullrequest.html:86 +msgid "Reset" +msgstr "Limpar" + +#: rhodecode/templates/admin/gists/show.html:5 +msgid "gist" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:9 +msgid "Gist" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:36 +msgid "Public gist" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:38 +#, fuzzy +#| msgid "private repository" +msgid "Private gist" +msgstr "repositório privado" + +#: rhodecode/templates/admin/gists/show.html:54 +#: rhodecode/templates/admin/repos/repo_edit.html:299 +#: rhodecode/templates/changeset/changeset_file_comment.html:40 +msgid "Delete" +msgstr "Excluir" + +#: rhodecode/templates/admin/gists/show.html:54 +#, fuzzy, python-format +#| msgid "Confirm to delete this ip: %s" +msgid "Confirm to delete this gist" +msgstr "Confirma excluir este usuário: %s" + +#: rhodecode/templates/admin/gists/show.html:63 +#: rhodecode/templates/admin/gists/show.html:84 +#: rhodecode/templates/files/files_edit.html:48 +#: rhodecode/templates/files/files_source.html:25 +#: rhodecode/templates/files/files_source.html:55 +#, fuzzy +msgid "Show as raw" +msgstr "mostrar como bruto" + +#: rhodecode/templates/admin/gists/show.html:71 +#, fuzzy +#| msgid "read" +msgid "created" +msgstr "ler" + #: rhodecode/templates/admin/ldap/ldap.html:5 msgid "LDAP administration" msgstr "Administração de LDAP" #: rhodecode/templates/admin/ldap/ldap.html:11 #: rhodecode/templates/admin/users/users.html:86 -#: rhodecode/templates/base/base.html:74 +#: rhodecode/templates/base/base.html:79 #, fuzzy msgid "LDAP" msgstr "ldap" @@ -2143,7 +2435,7 @@ msgstr "Mostrar notificação" #: rhodecode/templates/admin/notifications/show_notification.html:9 -#: rhodecode/templates/base/base.html:241 +#: rhodecode/templates/base/base.html:253 msgid "Notifications" msgstr "Notificações" @@ -2152,12 +2444,14 @@ msgstr "Administração de permissões" #: rhodecode/templates/admin/permissions/permissions.html:11 +#: rhodecode/templates/admin/repos/repo_edit.html:151 #: 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/repos_groups/repos_groups_edit.html:81 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:88 #: rhodecode/templates/admin/users/user_edit.html:150 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:100 -#: rhodecode/templates/base/base.html:73 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:129 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:136 +#: rhodecode/templates/base/base.html:78 msgid "Permissions" msgstr "Permissões" @@ -2182,6 +2476,7 @@ #: rhodecode/templates/admin/permissions/permissions.html:50 #: rhodecode/templates/admin/permissions/permissions.html:63 +#: rhodecode/templates/admin/permissions/permissions.html:77 #, fuzzy msgid "Overwrite existing settings" msgstr "sobrescrever configurações existentes" @@ -2198,91 +2493,103 @@ "customizadas nos repositórios serão perdidas" #: rhodecode/templates/admin/permissions/permissions.html:69 -msgid "Registration" -msgstr "Registro" - -#: rhodecode/templates/admin/permissions/permissions.html:77 +#, fuzzy +#| msgid "User groups" +msgid "User group" +msgstr "grupos de usuários" + +#: rhodecode/templates/admin/permissions/permissions.html:76 +#, fuzzy +#| msgid "" "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" +msgid "" +"All default permissions on each user 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 " +"customizadas nos repositórios serão perdidas" + +#: rhodecode/templates/admin/permissions/permissions.html:83 msgid "Repository creation" msgstr "Criação de repositório" -#: rhodecode/templates/admin/permissions/permissions.html:85 +#: rhodecode/templates/admin/permissions/permissions.html:91 +#, fuzzy +#| msgid "User groups administration" +msgid "User group creation" +msgstr "Administração de grupos de usuários" + +#: rhodecode/templates/admin/permissions/permissions.html:99 #, fuzzy msgid "Repository forking" msgstr "Criação de repositório" -#: rhodecode/templates/admin/permissions/permissions.html:93 -#: 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:80 -#: rhodecode/templates/files/files_edit.html:66 -#: rhodecode/templates/pullrequests/pullrequest.html:110 -msgid "Reset" -msgstr "Limpar" - -#: rhodecode/templates/admin/permissions/permissions.html:103 +#: rhodecode/templates/admin/permissions/permissions.html:107 +msgid "Registration" +msgstr "Registro" + +#: rhodecode/templates/admin/permissions/permissions.html:115 +#, fuzzy +#| msgid "Allowed with automatic account activation" +msgid "External auth account activation" +msgstr "permitido com ativação automática de conta" + +#: rhodecode/templates/admin/permissions/permissions.html:133 #, fuzzy msgid "Default User Permissions" msgstr "Permissões padrão" -#: rhodecode/templates/admin/permissions/permissions.html:113 -#: rhodecode/templates/admin/users/user_edit.html:244 +#: rhodecode/templates/admin/permissions/permissions.html:144 +#: rhodecode/templates/admin/users/user_edit.html:207 #, fuzzy msgid "Allowed IP addresses" msgstr "Endereço de e-mail" -#: rhodecode/templates/admin/permissions/permissions.html:127 -#: rhodecode/templates/admin/repos/repo_edit.html:347 +#: rhodecode/templates/admin/permissions/permissions.html:158 +#: rhodecode/templates/admin/repos/repo_edit.html:340 #: 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/admin/users/user_edit.html:175 +#: rhodecode/templates/admin/users/user_edit.html:220 +#: rhodecode/templates/admin/users_groups/users_groups.html:54 #: rhodecode/templates/data_table/_dt_elements.html:122 -#: rhodecode/templates/data_table/_dt_elements.html:130 +#: rhodecode/templates/data_table/_dt_elements.html:136 msgid "delete" msgstr "excluir" -#: rhodecode/templates/admin/permissions/permissions.html:128 -#: rhodecode/templates/admin/users/user_edit.html:258 +#: rhodecode/templates/admin/permissions/permissions.html:159 +#: rhodecode/templates/admin/users/user_edit.html:221 #, fuzzy, python-format msgid "Confirm to delete this ip: %s" msgstr "Confirma excluir este usuário: %s" -#: rhodecode/templates/admin/permissions/permissions.html:134 -#: rhodecode/templates/admin/users/user_edit.html:264 +#: rhodecode/templates/admin/permissions/permissions.html:165 +#: rhodecode/templates/admin/users/user_edit.html:227 msgid "All IP addresses are allowed" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:145 -#: rhodecode/templates/admin/users/user_edit.html:275 +#: rhodecode/templates/admin/permissions/permissions.html:176 +#: rhodecode/templates/admin/users/user_edit.html:238 #, fuzzy msgid "New ip address" msgstr "Endereço de e-mail" -#: rhodecode/templates/admin/permissions/permissions.html:153 +#: rhodecode/templates/admin/permissions/permissions.html:184 #: 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 +#: rhodecode/templates/admin/repos/repo_edit.html:380 +#: rhodecode/templates/admin/users/user_edit.html:197 +#: rhodecode/templates/admin/users/user_edit.html:245 #, fuzzy msgid "Add" msgstr "adicionar" #: 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 +#: rhodecode/templates/base/base.html:74 rhodecode/templates/base/base.html:88 +#: rhodecode/templates/base/base.html:116 +#: rhodecode/templates/base/base.html:275 msgid "Repositories" msgstr "Repositórios" @@ -2298,7 +2605,7 @@ msgstr "Clonar de" #: rhodecode/templates/admin/repos/repo_add_base.html:24 -#: rhodecode/templates/admin/repos/repo_edit.html:44 +#: rhodecode/templates/admin/repos/repo_edit.html:45 msgid "Optional http[s] url from which repository should be cloned." msgstr "URL opcional http[s] da qual o repositório deve ser clonado." @@ -2313,20 +2620,20 @@ msgstr "Tipo de repositório a criar." #: rhodecode/templates/admin/repos/repo_add_base.html:47 -#: rhodecode/templates/admin/repos/repo_edit.html:66 +#: rhodecode/templates/admin/repos/repo_edit.html:59 #: 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/admin/repos/repo_edit.html:63 #: 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/admin/repos/repo_edit.html:72 #: rhodecode/templates/forks/fork.html:60 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" @@ -2340,116 +2647,122 @@ #: 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/base/base.html:81 rhodecode/templates/base/base.html:134 #: rhodecode/templates/summary/summary.html:212 msgid "Settings" msgstr "Configurações" -#: rhodecode/templates/admin/repos/repo_edit.html:40 +#: rhodecode/templates/admin/repos/repo_edit.html:36 +#, fuzzy, python-format +#| msgid "Non changable ID %s" +msgid "Non-changeable id" +msgstr "ID não alterável %s" + +#: rhodecode/templates/admin/repos/repo_edit.html:41 msgid "Clone uri" msgstr "URI de clonagem" -#: rhodecode/templates/admin/repos/repo_edit.html:53 +#: rhodecode/templates/admin/repos/repo_edit.html:54 msgid "Optional select a group to put this repository into." msgstr "Opcionalmente selecione um grupo no qual colocar esse repositório." -#: rhodecode/templates/admin/repos/repo_edit.html:126 +#: rhodecode/templates/admin/repos/repo_edit.html:119 msgid "Change owner of this repository." msgstr "Mudar o dono desse repositório." -#: rhodecode/templates/admin/repos/repo_edit.html:184 +#: rhodecode/templates/admin/repos/repo_edit.html:177 #, fuzzy msgid "Advanced settings" msgstr "Salvar configurações" -#: rhodecode/templates/admin/repos/repo_edit.html:187 +#: rhodecode/templates/admin/repos/repo_edit.html:180 msgid "Statistics" msgstr "Estatísticas" -#: rhodecode/templates/admin/repos/repo_edit.html:191 +#: rhodecode/templates/admin/repos/repo_edit.html:184 msgid "Reset current statistics" msgstr "Reinicializar estatísticas atuais" -#: rhodecode/templates/admin/repos/repo_edit.html:191 +#: rhodecode/templates/admin/repos/repo_edit.html:184 msgid "Confirm to remove current statistics" msgstr "Confirma remover atuais estatísticas" -#: rhodecode/templates/admin/repos/repo_edit.html:194 +#: rhodecode/templates/admin/repos/repo_edit.html:187 msgid "Fetched to rev" msgstr "Trazida à rev" -#: rhodecode/templates/admin/repos/repo_edit.html:195 +#: rhodecode/templates/admin/repos/repo_edit.html:188 msgid "Stats gathered" msgstr "Estatísticas coletadas" -#: rhodecode/templates/admin/repos/repo_edit.html:203 +#: rhodecode/templates/admin/repos/repo_edit.html:196 msgid "Remote" msgstr "Remoto" -#: rhodecode/templates/admin/repos/repo_edit.html:207 +#: rhodecode/templates/admin/repos/repo_edit.html:200 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:207 +#: rhodecode/templates/admin/repos/repo_edit.html:200 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:218 +#: rhodecode/templates/admin/repos/repo_edit.html:211 msgid "Cache" msgstr "Cache" -#: rhodecode/templates/admin/repos/repo_edit.html:222 +#: rhodecode/templates/admin/repos/repo_edit.html:215 msgid "Invalidate repository cache" msgstr "Invalidar cache do repositório" -#: rhodecode/templates/admin/repos/repo_edit.html:222 +#: rhodecode/templates/admin/repos/repo_edit.html:215 msgid "Confirm to invalidate repository cache" msgstr "Confirma invalidar cache do repositório" -#: rhodecode/templates/admin/repos/repo_edit.html:225 +#: rhodecode/templates/admin/repos/repo_edit.html:218 msgid "" "Manually invalidate cache for this repository. On first access repository" " will be cached again" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:230 +#: rhodecode/templates/admin/repos/repo_edit.html:223 msgid "List of cached values" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:233 +#: rhodecode/templates/admin/repos/repo_edit.html:226 msgid "Prefix" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:234 +#: rhodecode/templates/admin/repos/repo_edit.html:227 #, fuzzy msgid "Key" msgstr "Chave de API" -#: rhodecode/templates/admin/repos/repo_edit.html:235 +#: rhodecode/templates/admin/repos/repo_edit.html:228 #: 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 +#: rhodecode/templates/admin/users_groups/users_groups.html:39 msgid "Active" msgstr "Ativo" -#: rhodecode/templates/admin/repos/repo_edit.html:250 -#: rhodecode/templates/base/base.html:280 -#: rhodecode/templates/base/base.html:281 +#: rhodecode/templates/admin/repos/repo_edit.html:243 +#: rhodecode/templates/base/base.html:292 +#: rhodecode/templates/base/base.html:293 msgid "Public journal" msgstr "Diário público" -#: rhodecode/templates/admin/repos/repo_edit.html:256 +#: rhodecode/templates/admin/repos/repo_edit.html:249 msgid "Remove from public journal" msgstr "Remover do diário público" -#: rhodecode/templates/admin/repos/repo_edit.html:258 +#: rhodecode/templates/admin/repos/repo_edit.html:251 msgid "Add to public journal" msgstr "Adicionar ao diário público" -#: rhodecode/templates/admin/repos/repo_edit.html:263 +#: rhodecode/templates/admin/repos/repo_edit.html:256 msgid "" "All actions made on this repository will be accessible to everyone in " "public journal" @@ -2457,83 +2770,80 @@ "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:270 +#: rhodecode/templates/admin/repos/repo_edit.html:263 #, fuzzy msgid "Locking" msgstr "destravar" -#: rhodecode/templates/admin/repos/repo_edit.html:275 +#: rhodecode/templates/admin/repos/repo_edit.html:268 msgid "Unlock locked repo" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:275 +#: rhodecode/templates/admin/repos/repo_edit.html:268 #, fuzzy msgid "Confirm to unlock repository" msgstr "Confirma excluir este repositório" -#: rhodecode/templates/admin/repos/repo_edit.html:278 -msgid "lock repo" +#: rhodecode/templates/admin/repos/repo_edit.html:271 +msgid "Lock repo" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:278 +#: rhodecode/templates/admin/repos/repo_edit.html:271 #, fuzzy msgid "Confirm to lock repository" msgstr "Confirma excluir este repositório" -#: rhodecode/templates/admin/repos/repo_edit.html:279 +#: rhodecode/templates/admin/repos/repo_edit.html:272 #, fuzzy msgid "Repository is not locked" msgstr "repositórios" -#: rhodecode/templates/admin/repos/repo_edit.html:284 +#: rhodecode/templates/admin/repos/repo_edit.html:277 msgid "Force locking on repository. Works only when anonymous access is disabled" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:291 +#: rhodecode/templates/admin/repos/repo_edit.html:284 #, fuzzy msgid "Set as fork of" msgstr "Marcar como bifurcação" -#: rhodecode/templates/admin/repos/repo_edit.html:296 -msgid "set" +#: rhodecode/templates/admin/repos/repo_edit.html:289 +#, fuzzy +#| msgid "set" +msgid "Set" msgstr "ajustar" -#: rhodecode/templates/admin/repos/repo_edit.html:300 +#: rhodecode/templates/admin/repos/repo_edit.html:293 #, 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:306 -#: rhodecode/templates/changeset/changeset_file_comment.html:41 -msgid "Delete" -msgstr "Excluir" - -#: rhodecode/templates/admin/repos/repo_edit.html:315 +#: rhodecode/templates/admin/repos/repo_edit.html:308 msgid "Remove this repository" msgstr "Remover deste repositório" -#: rhodecode/templates/admin/repos/repo_edit.html:315 +#: rhodecode/templates/admin/repos/repo_edit.html:308 msgid "Confirm to delete this repository" msgstr "Confirma excluir este repositório" -#: rhodecode/templates/admin/repos/repo_edit.html:317 +#: rhodecode/templates/admin/repos/repo_edit.html:310 #, 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 +#: rhodecode/templates/admin/repos/repo_edit.html:311 #, fuzzy msgid "Detach forks" msgstr "Marcar como bifurcação" -#: rhodecode/templates/admin/repos/repo_edit.html:319 +#: rhodecode/templates/admin/repos/repo_edit.html:312 #, fuzzy msgid "Delete forks" msgstr "excluir" -#: rhodecode/templates/admin/repos/repo_edit.html:322 +#: rhodecode/templates/admin/repos/repo_edit.html:315 #, fuzzy msgid "" "This repository will be renamed in a special way in order to be " @@ -2545,59 +2855,64 @@ " Se você precisa exclui-lo completamente do " "sistema de arquivos, por favor faça-o manualmente" -#: rhodecode/templates/admin/repos/repo_edit.html:336 +#: rhodecode/templates/admin/repos/repo_edit.html:329 msgid "Extra fields" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:348 +#: rhodecode/templates/admin/repos/repo_edit.html:341 #, 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 +#: rhodecode/templates/admin/repos/repo_edit.html:355 #, fuzzy msgid "New field key" msgstr "adicionar novo arquivo" -#: rhodecode/templates/admin/repos/repo_edit.html:370 +#: rhodecode/templates/admin/repos/repo_edit.html:363 msgid "New field label" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:373 +#: rhodecode/templates/admin/repos/repo_edit.html:366 msgid "Enter short label" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:379 +#: rhodecode/templates/admin/repos/repo_edit.html:372 #, fuzzy msgid "New field description" msgstr "Descrição" -#: rhodecode/templates/admin/repos/repo_edit.html:382 +#: rhodecode/templates/admin/repos/repo_edit.html:375 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 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:3 msgid "none" msgstr "nenhum" #: rhodecode/templates/admin/repos/repo_edit_perms.html:4 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:4 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:4 msgid "read" msgstr "ler" #: rhodecode/templates/admin/repos/repo_edit_perms.html:5 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:5 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:5 msgid "write" msgstr "escrever" #: rhodecode/templates/admin/repos/repo_edit_perms.html:6 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:6 msgid "admin" msgstr "administrador" #: rhodecode/templates/admin/repos/repo_edit_perms.html:7 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:7 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:7 msgid "member" msgstr "membro" @@ -2609,6 +2924,8 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:28 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:20 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:35 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:20 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:35 #, fuzzy msgid "default" msgstr "excluir" @@ -2617,34 +2934,37 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:58 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:25 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:55 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:25 +#: rhodecode/templates/admin/users_groups/user_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:80 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:81 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: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: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:86 +#: rhodecode/templates/admin/repos/repos.html:86 +#: rhodecode/templates/admin/users/user_edit_my_account.html:185 +#: rhodecode/templates/admin/users/users.html:109 +#: rhodecode/templates/bookmarks/bookmarks.html:76 +#: rhodecode/templates/branches/branches.html:75 +#: rhodecode/templates/journal/journal.html:206 +#: rhodecode/templates/journal/journal.html:296 +#: rhodecode/templates/tags/tags.html:76 +msgid "No records found." +msgstr "Nenhum registro encontrado." + +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 msgid "apply to children" msgstr "" -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:88 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups" @@ -2671,7 +2991,7 @@ #: 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 +#: rhodecode/templates/base/base.html:75 rhodecode/templates/base/base.html:91 #, fuzzy msgid "Repository groups" msgstr "Grupo de repositórios" @@ -2705,7 +3025,7 @@ msgid "Add child group" msgstr "Adicionar novo grupo de usuários" -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:76 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:68 msgid "" "Enable lock-by-pulling on group. This option will be applied to all other" " groups and repositories inside" @@ -2721,16 +3041,22 @@ msgstr "Número de repositórios de nível superior" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:64 +#: rhodecode/templates/admin/users_groups/users_groups.html:48 +#: rhodecode/templates/changeset/changeset_file_comment.html:73 +#: rhodecode/templates/changeset/changeset_file_comment.html:171 #, fuzzy msgid "Edit" msgstr "editar" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:65 +#: rhodecode/templates/admin/users_groups/users_groups.html:49 #: rhodecode/templates/base/perms_summary.html:29 -#: rhodecode/templates/base/perms_summary.html:48 -#: rhodecode/templates/base/perms_summary.html:50 +#: rhodecode/templates/base/perms_summary.html:60 +#: rhodecode/templates/base/perms_summary.html:62 #: rhodecode/templates/data_table/_dt_elements.html:116 #: rhodecode/templates/data_table/_dt_elements.html:117 +#: rhodecode/templates/data_table/_dt_elements.html:130 +#: rhodecode/templates/data_table/_dt_elements.html:131 msgid "edit" msgstr "editar" @@ -2836,8 +3162,8 @@ msgstr "" #: rhodecode/templates/admin/settings/settings.html:114 -#: rhodecode/templates/admin/settings/settings.html:186 -#: rhodecode/templates/admin/settings/settings.html:277 +#: rhodecode/templates/admin/settings/settings.html:195 +#: rhodecode/templates/admin/settings/settings.html:287 msgid "Save settings" msgstr "Salvar configurações" @@ -2852,145 +3178,167 @@ msgstr "habilitar" #: rhodecode/templates/admin/settings/settings.html:134 -msgid "Use lightweight dashboard" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:140 #, fuzzy msgid "Use repository extra fields" msgstr "repositórios" -#: rhodecode/templates/admin/settings/settings.html:147 +#: rhodecode/templates/admin/settings/settings.html:136 +msgid "Allows storing additional customized fields per repository." +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:139 +msgid "Show RhodeCode version" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:141 +msgid "Shows or hides displayed version of RhodeCode in the footer" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:146 +#, fuzzy +#| msgid "Dashboard" +msgid "Dashboard items" +msgstr "Painel de Controle" + +#: rhodecode/templates/admin/settings/settings.html:150 +msgid "" +"Number of items displayed in lightweight dashboard before pagination is " +"shown." +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:155 #, fuzzy msgid "Icons" msgstr "Opções" -#: rhodecode/templates/admin/settings/settings.html:152 +#: rhodecode/templates/admin/settings/settings.html:160 msgid "Show public repo icon on repositories" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:156 +#: rhodecode/templates/admin/settings/settings.html:164 #, fuzzy msgid "Show private repo icon on repositories" msgstr "repositório privado" -#: rhodecode/templates/admin/settings/settings.html:163 +#: rhodecode/templates/admin/settings/settings.html:166 +#, fuzzy +#| msgid "Show private repo icon on repositories" +msgid "Show public/private icons next to repositories names" +msgstr "repositório privado" + +#: rhodecode/templates/admin/settings/settings.html:172 #, fuzzy msgid "Meta-Tagging" msgstr "configurações" -#: rhodecode/templates/admin/settings/settings.html:168 +#: rhodecode/templates/admin/settings/settings.html:177 msgid "Stylify recognised metatags:" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:195 +#: rhodecode/templates/admin/settings/settings.html:204 #, fuzzy msgid "VCS settings" msgstr "configurações" -#: rhodecode/templates/admin/settings/settings.html:204 +#: rhodecode/templates/admin/settings/settings.html:213 msgid "Web" msgstr "Web" -#: rhodecode/templates/admin/settings/settings.html:209 +#: rhodecode/templates/admin/settings/settings.html:218 #, fuzzy msgid "Require SSL for vcs operations" msgstr "exigir ssl para realizar push" -#: rhodecode/templates/admin/settings/settings.html:211 +#: rhodecode/templates/admin/settings/settings.html:220 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 +#: rhodecode/templates/admin/settings/settings.html:226 msgid "Hooks" msgstr "Ganchos" -#: rhodecode/templates/admin/settings/settings.html:222 +#: rhodecode/templates/admin/settings/settings.html:231 msgid "Update repository after push (hg update)" msgstr "Atualizar repositório após realizar push (hg update)" -#: rhodecode/templates/admin/settings/settings.html:226 +#: rhodecode/templates/admin/settings/settings.html:235 msgid "Show repository size after push" msgstr "Mostrar tamanho do repositório após o push" -#: rhodecode/templates/admin/settings/settings.html:230 +#: rhodecode/templates/admin/settings/settings.html:239 msgid "Log user push commands" msgstr "Armazenar registro de comandos de push dos usuários" -#: rhodecode/templates/admin/settings/settings.html:234 +#: rhodecode/templates/admin/settings/settings.html:243 msgid "Log user pull commands" msgstr "Armazenar registro de comandos de pull dos usuários" -#: rhodecode/templates/admin/settings/settings.html:238 +#: rhodecode/templates/admin/settings/settings.html:247 #, fuzzy msgid "Advanced setup" msgstr "confirguações avançadas" -#: rhodecode/templates/admin/settings/settings.html:243 +#: rhodecode/templates/admin/settings/settings.html:252 #, fuzzy msgid "Mercurial Extensions" msgstr "Repositório Mercurial" -#: rhodecode/templates/admin/settings/settings.html:248 +#: rhodecode/templates/admin/settings/settings.html:257 msgid "Enable largefiles extension" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:252 +#: rhodecode/templates/admin/settings/settings.html:261 msgid "Enable hgsubversion extension" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:254 +#: rhodecode/templates/admin/settings/settings.html:263 msgid "" "Requires hgsubversion library installed. Allows cloning from svn remote " "locations" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:264 +#: rhodecode/templates/admin/settings/settings.html:274 msgid "Repositories location" msgstr "Localização dos repositórios" -#: rhodecode/templates/admin/settings/settings.html:269 +#: rhodecode/templates/admin/settings/settings.html:279 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." +"Click to unlock. You must restart RhodeCode in order to make this setting" +" take effect." msgstr "" -"Essa é uma configuração crucial da aplicação. Se você realmente tem " -"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:270 -#: rhodecode/templates/base/base.html:131 + +#: rhodecode/templates/admin/settings/settings.html:280 +#: rhodecode/templates/base/base.html:143 #, fuzzy msgid "Unlock" msgstr "destravar" -#: rhodecode/templates/admin/settings/settings.html:272 +#: rhodecode/templates/admin/settings/settings.html:282 msgid "" "Location where repositories are stored. After changing this value a " "restart, and rescan is required" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:292 +#: rhodecode/templates/admin/settings/settings.html:303 msgid "Test Email" msgstr "Testar E-mail" -#: rhodecode/templates/admin/settings/settings.html:300 +#: rhodecode/templates/admin/settings/settings.html:311 msgid "Email to" msgstr "E-mail para" -#: rhodecode/templates/admin/settings/settings.html:308 +#: rhodecode/templates/admin/settings/settings.html:319 msgid "Send" msgstr "Enviar" -#: rhodecode/templates/admin/settings/settings.html:314 +#: rhodecode/templates/admin/settings/settings.html:325 msgid "System Info and Packages" msgstr "Informações de Sistema e Pacotes" -#: rhodecode/templates/admin/settings/settings.html:317 -#: rhodecode/templates/changelog/changelog.html:42 +#: rhodecode/templates/admin/settings/settings.html:328 +#: rhodecode/templates/changelog/changelog.html:51 msgid "Show" msgstr "Mostrar" @@ -3000,7 +3348,7 @@ #: rhodecode/templates/admin/users/user_add.html:10 #: rhodecode/templates/admin/users/user_edit.html:11 -#: rhodecode/templates/base/base.html:71 +#: rhodecode/templates/base/base.html:76 msgid "Users" msgstr "Usuários" @@ -3058,48 +3406,23 @@ msgid "New password confirmation" msgstr "Confirmação de nova senha" -#: 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:163 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:113 -#, python-format -msgid "" -"Select to inherit permissions from %s settings. With this selected below " -"options does not have any action" -msgstr "" - -#: 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: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:200 #, fuzzy msgid "Email addresses" msgstr "Endereço de e-mail" -#: rhodecode/templates/admin/users/user_edit.html:213 +#: rhodecode/templates/admin/users/user_edit.html:176 #, fuzzy, python-format msgid "Confirm to delete this email: %s" msgstr "Confirma excluir este usuário: %s" -#: rhodecode/templates/admin/users/user_edit.html:227 +#: rhodecode/templates/admin/users/user_edit.html:190 #, 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:242 +#: rhodecode/templates/base/base.html:254 msgid "My account" msgstr "Minha conta" @@ -3138,7 +3461,7 @@ #: 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_data.html:11 #: rhodecode/templates/pullrequests/pullrequest_show.html:27 #: rhodecode/templates/pullrequests/pullrequest_show.html:42 msgid "Closed" @@ -3160,7 +3483,7 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:42 -#: rhodecode/templates/pullrequests/pullrequest_data.html:11 +#: rhodecode/templates/pullrequests/pullrequest_data.html:8 #, python-format msgid "Pull request #%s opened by %s on %s" msgstr "" @@ -3195,13 +3518,13 @@ #: rhodecode/templates/admin/users_groups/users_group_add.html:10 #: rhodecode/templates/admin/users_groups/users_groups.html:11 -#: rhodecode/templates/base/base.html:72 +#: rhodecode/templates/base/base.html:77 rhodecode/templates/base/base.html:94 #, fuzzy msgid "User groups" msgstr "grupos de usuários" #: rhodecode/templates/admin/users_groups/users_group_add.html:12 -#: rhodecode/templates/admin/users_groups/users_groups.html:25 +#: rhodecode/templates/admin/users_groups/users_groups.html:26 #, fuzzy msgid "Add new user group" msgstr "Adicionar novo grupo de usuários" @@ -3217,7 +3540,7 @@ msgstr "grupos de usuários" #: rhodecode/templates/admin/users_groups/users_group_edit.html:50 -#: rhodecode/templates/admin/users_groups/users_groups.html:35 +#: rhodecode/templates/admin/users_groups/users_groups.html:38 msgid "Members" msgstr "Membros" @@ -3238,47 +3561,59 @@ msgid "Add all elements" msgstr "Adicionar todos os elementos" -#: 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:167 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:109 #, fuzzy msgid "No members yet" msgstr "membros" +#: rhodecode/templates/admin/users_groups/users_group_edit.html:117 +#, fuzzy +#| msgid "Copy permissions" +msgid "Global Permissions" +msgstr "Copiar permissões" + #: rhodecode/templates/admin/users_groups/users_groups.html:5 #, fuzzy msgid "User groups administration" msgstr "Administração de grupos de usuários" -#: rhodecode/templates/admin/users_groups/users_groups.html:47 +#: rhodecode/templates/admin/users_groups/users_groups.html:55 #, fuzzy, python-format msgid "Confirm to delete this user group: %s" msgstr "Confirme para excluir este grupo de usuários: %s" +#: rhodecode/templates/admin/users_groups/users_groups.html:62 +#, fuzzy +#| msgid "There are no repository groups yet" +msgid "There are no user groups yet" +msgstr "Ainda não há grupos de repositórios" + #: rhodecode/templates/base/base.html:42 -msgid "Submit a bug" -msgstr "Encaminhe um bug" - -#: rhodecode/templates/base/base.html:108 +#, python-format +msgid "Server instance: %s" +msgstr "" + +#: rhodecode/templates/base/base.html:52 +msgid "Report a bug" +msgstr "" + +#: rhodecode/templates/base/base.html:121 #: 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:109 -#: rhodecode/templates/changelog/changelog.html:11 +#: rhodecode/templates/base/base.html:122 +#: rhodecode/templates/changelog/changelog.html:15 #: 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:110 +#: rhodecode/templates/base/base.html:123 #: rhodecode/templates/data_table/_dt_elements.html:25 #: rhodecode/templates/data_table/_dt_elements.html:27 #: rhodecode/templates/data_table/_dt_elements.html:29 @@ -3286,53 +3621,49 @@ msgid "Files" msgstr "Arquivos" -#: rhodecode/templates/base/base.html:112 +#: rhodecode/templates/base/base.html:125 #, fuzzy msgid "Switch To" msgstr "Trocar para" -#: rhodecode/templates/base/base.html:114 -#: rhodecode/templates/base/base.html:267 +#: rhodecode/templates/base/base.html:127 +#: rhodecode/templates/base/base.html:279 msgid "loading..." msgstr "carregando..." -#: rhodecode/templates/base/base.html:118 +#: rhodecode/templates/base/base.html:131 msgid "Options" msgstr "Opções" -#: rhodecode/templates/base/base.html:124 +#: rhodecode/templates/base/base.html:137 #: 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/base/base.html:139 +#: rhodecode/templates/base/base.html:312 #: rhodecode/templates/search/search.html:14 #: rhodecode/templates/search/search.html:54 msgid "Search" msgstr "Pesquisar" -#: rhodecode/templates/base/base.html:133 +#: rhodecode/templates/base/base.html:145 #, fuzzy msgid "Lock" msgstr "destravar" -#: rhodecode/templates/base/base.html:141 +#: rhodecode/templates/base/base.html:153 #, fuzzy msgid "Follow" msgstr "seguidores" -#: rhodecode/templates/base/base.html:142 +#: rhodecode/templates/base/base.html:154 #, fuzzy msgid "Unfollow" msgstr "seguidores" -#: rhodecode/templates/base/base.html:145 +#: rhodecode/templates/base/base.html:157 #: rhodecode/templates/data_table/_dt_elements.html:33 #: rhodecode/templates/data_table/_dt_elements.html:35 #: rhodecode/templates/data_table/_dt_elements.html:37 @@ -3341,66 +3672,123 @@ msgid "Fork" msgstr "Bifurcação" -#: rhodecode/templates/base/base.html:147 +#: rhodecode/templates/base/base.html:159 #, fuzzy msgid "Create Pull Request" msgstr "Criar novo arquivo" -#: rhodecode/templates/base/base.html:153 +#: rhodecode/templates/base/base.html:165 #, fuzzy msgid "Show Pull Requests" msgstr "comentado no commit" -#: rhodecode/templates/base/base.html:153 +#: rhodecode/templates/base/base.html:165 #, fuzzy msgid "Pull Requests" msgstr "comentado no commit" -#: rhodecode/templates/base/base.html:190 +#: rhodecode/templates/base/base.html:202 #, fuzzy msgid "Not logged in" msgstr "último login" -#: rhodecode/templates/base/base.html:197 +#: rhodecode/templates/base/base.html:209 msgid "Login to your account" msgstr "Entrar com sua conta" -#: rhodecode/templates/base/base.html:220 +#: rhodecode/templates/base/base.html:232 msgid "Forgot password ?" msgstr "Esqueceu a senha ?" -#: rhodecode/templates/base/base.html:243 +#: rhodecode/templates/base/base.html:255 msgid "Log Out" msgstr "Sair" -#: rhodecode/templates/base/base.html:262 +#: rhodecode/templates/base/base.html:274 msgid "Switch repository" msgstr "Trocar repositório" -#: rhodecode/templates/base/base.html:274 +#: rhodecode/templates/base/base.html:286 msgid "Show recent activity" msgstr "" -#: rhodecode/templates/base/base.html:275 +#: rhodecode/templates/base/base.html:287 #: rhodecode/templates/journal/journal.html:4 msgid "Journal" msgstr "Diário" -#: rhodecode/templates/base/base.html:286 +#: rhodecode/templates/base/base.html:298 +msgid "Show public gists" +msgstr "" + +#: rhodecode/templates/base/base.html:303 +msgid "All public gists" +msgstr "" + +#: rhodecode/templates/base/base.html:305 +msgid "My public gists" +msgstr "" + +#: rhodecode/templates/base/base.html:306 +msgid "My private gists" +msgstr "" + +#: rhodecode/templates/base/base.html:311 #, fuzzy msgid "Search in repositories" msgstr "em todos os repositórios" -#: rhodecode/templates/base/perms_summary.html:8 +#: rhodecode/templates/base/default_perms_box.html:14 +#, fuzzy +msgid "Inherit default permissions" +msgstr "Permissões padrão" + +#: rhodecode/templates/base/default_perms_box.html:18 +#, python-format +msgid "" +"Select to inherit permissions from %s settings. With this selected below " +"options does not apply." +msgstr "" + +#: rhodecode/templates/base/default_perms_box.html:26 +msgid "Create repositories" +msgstr "Criar repositórios" + +#: rhodecode/templates/base/default_perms_box.html:30 +msgid "Select this option to allow repository creation for this user" +msgstr "" + +#: rhodecode/templates/base/default_perms_box.html:35 +#, fuzzy +#| msgid "[created] user group" +msgid "Create user groups" +msgstr "criado grupo de usuários %s" + +#: rhodecode/templates/base/default_perms_box.html:39 +msgid "Select this option to allow user group creation for this user" +msgstr "" + +#: rhodecode/templates/base/default_perms_box.html:44 +#, fuzzy +msgid "Fork repositories" +msgstr "repositórios" + +#: rhodecode/templates/base/default_perms_box.html:48 +msgid "Select this option to allow repository forking for this user" +msgstr "" + +#: rhodecode/templates/base/perms_summary.html:11 #, fuzzy msgid "No permissions defined yet" msgstr "Copiar permissões" -#: rhodecode/templates/base/perms_summary.html:15 +#: rhodecode/templates/base/perms_summary.html:19 +#: rhodecode/templates/base/perms_summary.html:38 msgid "Permission" msgstr "Permissão" -#: rhodecode/templates/base/perms_summary.html:16 +#: rhodecode/templates/base/perms_summary.html:20 +#: rhodecode/templates/base/perms_summary.html:39 #, fuzzy msgid "Edit Permission" msgstr "Permissão de repositório" @@ -3411,7 +3799,7 @@ msgstr "adicionar outro comentário" #: rhodecode/templates/base/root.html:44 -#: rhodecode/templates/data_table/_dt_elements.html:140 +#: rhodecode/templates/data_table/_dt_elements.html:147 msgid "Stop following this repository" msgstr "Parar de seguir este repositório" @@ -3428,7 +3816,7 @@ msgstr "membros" #: rhodecode/templates/base/root.html:48 -#: rhodecode/templates/pullrequests/pullrequest.html:181 +#: rhodecode/templates/pullrequests/pullrequest.html:203 #, fuzzy msgid "Loading ..." msgstr "carregando..." @@ -3444,7 +3832,7 @@ msgstr "nenhum arquivo corresponde" #: rhodecode/templates/base/root.html:51 -#: rhodecode/templates/changelog/changelog.html:36 +#: rhodecode/templates/changelog/changelog.html:45 msgid "Open new pull request" msgstr "" @@ -3477,31 +3865,53 @@ msgid "Expand diff" msgstr "diff bruto" +#: rhodecode/templates/base/root.html:58 +#, fuzzy +#| msgid "Failed to remove user" +msgid "Failed to remoke permission" +msgstr "Falha ao reomver usuário" + #: rhodecode/templates/bookmarks/bookmarks.html:5 #, fuzzy, python-format msgid "%s Bookmarks" msgstr "marcadores" -#: rhodecode/templates/bookmarks/bookmarks.html:37 +#: rhodecode/templates/bookmarks/bookmarks.html:26 +#, fuzzy +#| msgid "Compare fork" +msgid "Compare bookmarks" +msgstr "comparar exibir" + +#: rhodecode/templates/bookmarks/bookmarks.html:51 #: rhodecode/templates/bookmarks/bookmarks_data.html:8 #: rhodecode/templates/branches/branches.html:50 #: rhodecode/templates/branches/branches_data.html:8 -#: rhodecode/templates/shortlog/shortlog_data.html:8 +#: rhodecode/templates/changelog/changelog_summary_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:38 +#: rhodecode/templates/bookmarks/bookmarks.html:52 #: rhodecode/templates/bookmarks/bookmarks_data.html:9 #: rhodecode/templates/branches/branches.html:51 #: rhodecode/templates/branches/branches_data.html:9 -#: rhodecode/templates/shortlog/shortlog_data.html:5 +#: rhodecode/templates/changelog/changelog_summary_data.html:5 #: rhodecode/templates/tags/tags.html:52 #: rhodecode/templates/tags/tags_data.html:9 msgid "Revision" msgstr "Revisão" +#: rhodecode/templates/bookmarks/bookmarks.html:54 +#: rhodecode/templates/bookmarks/bookmarks_data.html:10 +#: rhodecode/templates/branches/branches.html:53 +#: rhodecode/templates/branches/branches_data.html:10 +#: rhodecode/templates/tags/tags.html:54 +#: rhodecode/templates/tags/tags_data.html:10 +#, fuzzy +msgid "Compare" +msgstr "comparar exibir" + #: rhodecode/templates/branches/branches.html:5 #, fuzzy, python-format msgid "%s Branches" @@ -3512,69 +3922,71 @@ msgid "Compare branches" msgstr "ramos" -#: rhodecode/templates/branches/branches.html:53 -#: rhodecode/templates/branches/branches_data.html:10 -#: rhodecode/templates/tags/tags.html:54 -#: rhodecode/templates/tags/tags_data.html:10 -#, fuzzy -msgid "Compare" -msgstr "comparar exibir" - #: rhodecode/templates/changelog/changelog.html:6 #, fuzzy, python-format msgid "%s Changelog" msgstr "Registro de alterações" -#: rhodecode/templates/changelog/changelog.html:11 +#: rhodecode/templates/changelog/changelog.html:19 #, 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:30 +#: rhodecode/templates/changelog/changelog.html:39 #, fuzzy msgid "Clear selection" msgstr "Configurações de busca" -#: rhodecode/templates/changelog/changelog.html:33 +#: rhodecode/templates/changelog/changelog.html:42 #: rhodecode/templates/forks/forks_data.html:19 #, fuzzy, python-format msgid "Compare fork with %s" msgstr "comparar exibir" -#: rhodecode/templates/changelog/changelog.html:33 +#: rhodecode/templates/changelog/changelog.html:42 #, fuzzy msgid "Compare fork with parent" msgstr "comparar exibir" -#: rhodecode/templates/changelog/changelog.html:76 -#: rhodecode/templates/summary/summary.html:404 +#: rhodecode/templates/changelog/changelog.html:78 +#: rhodecode/templates/changelog/changelog_summary_data.html:28 +#, fuzzy, python-format +msgid "Click to open associated pull request #%s" +msgstr "repositório [criado]" + +#: rhodecode/templates/changelog/changelog.html:102 +#: rhodecode/templates/summary/summary.html:403 #, fuzzy msgid "Show more" msgstr "mostrar mais" -#: rhodecode/templates/changelog/changelog.html:89 +#: rhodecode/templates/changelog/changelog.html:115 +#: rhodecode/templates/changelog/changelog_summary_data.html:50 +#: rhodecode/templates/changeset/changeset.html:107 #: rhodecode/templates/changeset/changeset_range.html:86 #, fuzzy, python-format msgid "Bookmark %s" msgstr "marcadores" -#: rhodecode/templates/changelog/changelog.html:95 -#: rhodecode/templates/changeset/changeset.html:111 +#: rhodecode/templates/changelog/changelog.html:121 +#: rhodecode/templates/changelog/changelog_summary_data.html:56 +#: rhodecode/templates/changeset/changeset.html:113 #: 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:80 +#: rhodecode/templates/changelog/changelog.html:126 +#: rhodecode/templates/changelog/changelog_summary_data.html:61 +#: rhodecode/templates/changeset/changeset.html:117 +#: rhodecode/templates/changeset/changeset_range.html:96 #, fuzzy, python-format msgid "Branch %s" msgstr "ramos" -#: rhodecode/templates/changelog/changelog.html:258 +#: rhodecode/templates/changelog/changelog.html:286 msgid "There are no changes yet" msgstr "Ainda não há alteações" @@ -3606,6 +4018,40 @@ msgid "Affected %s files" msgstr "%s arquivos afetados" +#: rhodecode/templates/changelog/changelog_summary_data.html:6 +#: rhodecode/templates/files/files_add.html:75 +#: rhodecode/templates/files/files_edit.html:61 +#, fuzzy +msgid "Commit message" +msgstr "mensagem de commit" + +#: rhodecode/templates/changelog/changelog_summary_data.html:7 +#, fuzzy +msgid "Age" +msgstr "idade" + +#: rhodecode/templates/changelog/changelog_summary_data.html:9 +msgid "Refs" +msgstr "" + +#: rhodecode/templates/changelog/changelog_summary_data.html:86 +msgid "Add or upload files directly via RhodeCode" +msgstr "Adicionar ou enviar arquivos diretamente pelo RhodeCode" + +#: rhodecode/templates/changelog/changelog_summary_data.html:89 +#: rhodecode/templates/files/files_add.html:38 +#: rhodecode/templates/files/files_browser.html:31 +msgid "Add new file" +msgstr "Adicionar novo arquivo" + +#: rhodecode/templates/changelog/changelog_summary_data.html:95 +msgid "Push new repo" +msgstr "Fazer push de novo repositório" + +#: rhodecode/templates/changelog/changelog_summary_data.html:103 +msgid "Existing repository?" +msgstr "Repositório existente?" + #: rhodecode/templates/changeset/changeset.html:6 #, fuzzy, python-format msgid "%s Changeset" @@ -3627,7 +4073,7 @@ msgstr "Conjuntos de mudanças" #: rhodecode/templates/changeset/changeset.html:67 -#: rhodecode/templates/changeset/diff_block.html:23 +#: rhodecode/templates/changeset/diff_block.html:22 #, fuzzy msgid "Raw diff" msgstr "diff bruto" @@ -3638,13 +4084,13 @@ msgstr "diff bruto" #: rhodecode/templates/changeset/changeset.html:69 -#: rhodecode/templates/changeset/diff_block.html:24 +#: rhodecode/templates/changeset/diff_block.html:23 #, fuzzy msgid "Download diff" msgstr "descarregar diff" #: rhodecode/templates/changeset/changeset.html:73 -#: rhodecode/templates/changeset/changeset_file_comment.html:97 +#: rhodecode/templates/changeset/changeset_file_comment.html:103 #, python-format msgid "%d comment" msgid_plural "%d comments" @@ -3652,7 +4098,7 @@ msgstr[1] "%d comentários" #: rhodecode/templates/changeset/changeset.html:73 -#: rhodecode/templates/changeset/changeset_file_comment.html:97 +#: rhodecode/templates/changeset/changeset_file_comment.html:103 #, python-format msgid "(%d inline)" msgid_plural "(%d inline)" @@ -3660,11 +4106,11 @@ msgstr[1] "(%d em linha)" #: rhodecode/templates/changeset/changeset.html:103 -#: rhodecode/templates/changeset/changeset_range.html:77 +#: rhodecode/templates/changeset/changeset_range.html:82 msgid "merge" msgstr "mesclar" -#: rhodecode/templates/changeset/changeset.html:119 +#: rhodecode/templates/changeset/changeset.html:126 #: rhodecode/templates/compare/compare_diff.html:40 #: rhodecode/templates/pullrequests/pullrequest_show.html:113 #, fuzzy, python-format @@ -3673,7 +4119,7 @@ msgstr[0] "arquivo alterado" msgstr[1] "" -#: rhodecode/templates/changeset/changeset.html:121 +#: rhodecode/templates/changeset/changeset.html:128 #: rhodecode/templates/compare/compare_diff.html:42 #: rhodecode/templates/pullrequests/pullrequest_show.html:115 #, fuzzy, python-format @@ -3682,15 +4128,15 @@ 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/changeset/changeset.html:141 +#: rhodecode/templates/changeset/changeset.html:153 #: 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/changeset/changeset.html:141 +#: rhodecode/templates/changeset/changeset.html:153 #: rhodecode/templates/compare/compare_diff.html:58 #: rhodecode/templates/compare/compare_diff.html:69 #: rhodecode/templates/pullrequests/pullrequest_show.html:131 @@ -3709,55 +4155,71 @@ msgid "Comment on pull request #%s" msgstr "repositório [criado]" -#: rhodecode/templates/changeset/changeset_file_comment.html:57 +#: rhodecode/templates/changeset/changeset_file_comment.html:55 msgid "Submitting..." msgstr "Enviando..." -#: rhodecode/templates/changeset/changeset_file_comment.html:60 +#: rhodecode/templates/changeset/changeset_file_comment.html:58 msgid "Commenting on line {1}." msgstr "Comentando a linha {1}." -#: rhodecode/templates/changeset/changeset_file_comment.html:61 -#: rhodecode/templates/changeset/changeset_file_comment.html:139 +#: rhodecode/templates/changeset/changeset_file_comment.html:59 +#: rhodecode/templates/changeset/changeset_file_comment.html:145 #, 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:141 +#: rhodecode/templates/changeset/changeset_file_comment.html:61 +#: rhodecode/templates/changeset/changeset_file_comment.html:147 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:161 +#: rhodecode/templates/changeset/changeset_file_comment.html:65 +#: rhodecode/templates/changeset/changeset_file_comment.html:152 +#, fuzzy +#| msgid "compare view" +msgid "Preview" +msgstr "comparar exibir" + +#: rhodecode/templates/changeset/changeset_file_comment.html:72 +#: rhodecode/templates/changeset/changeset_file_comment.html:170 +#, fuzzy +#| msgid "compare view" +msgid "Comment preview" +msgstr "comparar exibir" + +#: rhodecode/templates/changeset/changeset_file_comment.html:80 +#: rhodecode/templates/changeset/changeset_file_comment.html:177 +#: rhodecode/templates/email_templates/changeset_comment.html:16 +#: rhodecode/templates/email_templates/pull_request_comment.html:16 msgid "Comment" msgstr "Comentário" -#: rhodecode/templates/changeset/changeset_file_comment.html:75 +#: rhodecode/templates/changeset/changeset_file_comment.html:81 #, fuzzy msgid "Cancel" msgstr "alterados" -#: rhodecode/templates/changeset/changeset_file_comment.html:82 +#: rhodecode/templates/changeset/changeset_file_comment.html:88 msgid "You need to be logged in to comment." msgstr "Você precisa estar logado para comentar." -#: rhodecode/templates/changeset/changeset_file_comment.html:82 +#: rhodecode/templates/changeset/changeset_file_comment.html:88 msgid "Login now" msgstr "Entrar agora" -#: rhodecode/templates/changeset/changeset_file_comment.html:86 +#: rhodecode/templates/changeset/changeset_file_comment.html:92 msgid "Hide" msgstr "Ocultar" -#: rhodecode/templates/changeset/changeset_file_comment.html:143 +#: rhodecode/templates/changeset/changeset_file_comment.html:149 #, fuzzy msgid "Change status" msgstr "Conjuntos de mudanças" -#: rhodecode/templates/changeset/changeset_file_comment.html:163 +#: rhodecode/templates/changeset/changeset_file_comment.html:179 msgid "Comment and close" msgstr "" @@ -3770,20 +4232,20 @@ msgid "Files affected" msgstr "Arquivos afetados" -#: rhodecode/templates/changeset/diff_block.html:22 +#: rhodecode/templates/changeset/diff_block.html:21 msgid "Show full diff for this file" msgstr "" -#: rhodecode/templates/changeset/diff_block.html:30 +#: rhodecode/templates/changeset/diff_block.html:29 #, fuzzy msgid "Show inline comments" msgstr "mostrar comentários em linha" -#: rhodecode/templates/changeset/diff_block.html:55 +#: rhodecode/templates/changeset/diff_block.html:53 msgid "Show file at latest version in this repo" msgstr "" -#: rhodecode/templates/changeset/diff_block.html:56 +#: rhodecode/templates/changeset/diff_block.html:54 msgid "Show file at initial version in this repo" msgstr "" @@ -3862,29 +4324,27 @@ msgid "Confirm to delete this repository: %s" msgstr "Confirma excluir esse repositório: %s" -#: rhodecode/templates/data_table/_dt_elements.html:131 +#: rhodecode/templates/data_table/_dt_elements.html:137 #, python-format msgid "Confirm to delete this user: %s" msgstr "Confirma excluir este usuário: %s" -#: 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:4 +#: rhodecode/templates/email_templates/pull_request.html:4 +#: rhodecode/templates/email_templates/pull_request_comment.html:4 +#, fuzzy +#| msgid "journal" +msgid "URL" +msgstr "diário" + +#: rhodecode/templates/email_templates/changeset_comment.html:6 +#, fuzzy, python-format +#| msgid "%(user)s commented on changeset at %(when)s" +msgid "%s commented on a %s changeset." +msgstr "comentado no commit" #: 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" +msgid "The changeset status was changed to" msgstr "" #: rhodecode/templates/email_templates/main.html:8 @@ -3905,52 +4365,44 @@ msgid "You can generate it by clicking following URL" msgstr "" -#: rhodecode/templates/email_templates/password_reset.html:11 -msgid "If you did not request new password please ignore this email." +#: rhodecode/templates/email_templates/password_reset.html:10 +msgid "Please ignore this email if you did not request a new password ." msgstr "" -#: rhodecode/templates/email_templates/pull_request.html:4 -#, python-format -msgid "" -"User %s opened pull request for repository %s and wants you to review " -"changes." -msgstr "" - -#: rhodecode/templates/email_templates/pull_request.html:5 -#, fuzzy -msgid "View this pull request here" -msgstr "Confirma excluir este repositório" - #: rhodecode/templates/email_templates/pull_request.html:6 -#, fuzzy -msgid "title" +#, python-format +msgid "" +"%s opened a pull request for repository %s and wants you to review " +"changes." +msgstr "" + +#: rhodecode/templates/email_templates/pull_request.html:8 +#: rhodecode/templates/pullrequests/pullrequest.html:34 +#: rhodecode/templates/pullrequests/pullrequest_data.html:14 +#: rhodecode/templates/pullrequests/pullrequest_show.html:25 +#, fuzzy +msgid "Title" msgstr "escrever" -#: rhodecode/templates/email_templates/pull_request.html:7 -#, fuzzy -msgid "description" -msgstr "Descrição" - -#: rhodecode/templates/email_templates/pull_request.html:12 -msgid "revisions for reviewing" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.html:3 +#: rhodecode/templates/email_templates/pull_request_comment.html:6 #, fuzzy, python-format -msgid "Pull request #%s for repository %s" +#| msgid "Comment on pull request #%s" +msgid "%s commented on pull request \"%s\"" msgstr "repositório [criado]" -#: rhodecode/templates/email_templates/pull_request_comment.html:13 -#, fuzzy -msgid "Closing pull request with status" +#: rhodecode/templates/email_templates/pull_request_comment.html:10 +#, fuzzy +#| msgid "Closing pull request with status" +msgid "Pull request was closed with status" msgstr "repositório [criado]" -#: rhodecode/templates/email_templates/registration.html:4 -#, fuzzy -msgid "A new user have registered in RhodeCode" -msgstr "Você se registrou com sucesso no rhodecode" - -#: rhodecode/templates/email_templates/registration.html:9 +#: rhodecode/templates/email_templates/pull_request_comment.html:12 +#, fuzzy +#| msgid "Closing pull request with status" +msgid "Pull request changed status" +msgstr "repositório [criado]" + +#: rhodecode/templates/email_templates/registration.html:6 msgid "View this user here" msgstr "" @@ -3977,7 +4429,6 @@ #: 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" @@ -3992,12 +4443,6 @@ msgid "Add file" msgstr "adicionar arquivo" -#: 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:43 msgid "File Name" msgstr "Nome de Arquivo" @@ -4026,13 +4471,6 @@ msgid "use / to separate directories" msgstr "use / para separar diretórios" -#: rhodecode/templates/files/files_add.html:75 -#: rhodecode/templates/files/files_edit.html:61 -#: rhodecode/templates/shortlog/shortlog_data.html:6 -#, fuzzy -msgid "Commit message" -msgstr "mensagem de commit" - #: rhodecode/templates/files/files_add.html:79 #: rhodecode/templates/files/files_edit.html:65 msgid "Commit changes" @@ -4103,13 +4541,6 @@ msgid "Show annotation" msgstr "mostrar anotação" -#: rhodecode/templates/files/files_edit.html:48 -#: rhodecode/templates/files/files_source.html:25 -#: rhodecode/templates/files/files_source.html:55 -#, fuzzy -msgid "Show as raw" -msgstr "mostrar como bruto" - #: rhodecode/templates/files/files_edit.html:49 #: rhodecode/templates/files/files_source.html:26 #, fuzzy @@ -4313,41 +4744,58 @@ msgid "New pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:52 -#, fuzzy -msgid "Detailed compare view" -msgstr "comparar exibir" - -#: rhodecode/templates/pullrequests/pullrequest.html:56 +#: rhodecode/templates/pullrequests/pullrequest.html:25 +#, fuzzy +msgid "Create new pull request" +msgstr "Criar novo arquivo" + +#: rhodecode/templates/pullrequests/pullrequest.html:47 +#, fuzzy +#| msgid "Confirm to delete this pull request" +msgid "Write a short description on this pull request" +msgstr "Confirma excluir este repositório" + +#: rhodecode/templates/pullrequests/pullrequest.html:53 +#, fuzzy +#| msgid "Changeset" +msgid "Changeset flow" +msgstr "Conjunto de Mudanças" + +#: rhodecode/templates/pullrequests/pullrequest.html:60 +#: rhodecode/templates/pullrequests/pullrequest_show.html:65 +#, fuzzy +msgid "Origin repository" +msgstr "Repositório Git" + +#: rhodecode/templates/pullrequests/pullrequest.html:85 +msgid "Send pull request" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest.html:94 #: rhodecode/templates/pullrequests/pullrequest_show.html:137 msgid "Pull request reviewers" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:65 +#: rhodecode/templates/pullrequests/pullrequest.html:103 #: rhodecode/templates/pullrequests/pullrequest_show.html:149 #, fuzzy msgid "owner" msgstr "Dono" -#: rhodecode/templates/pullrequests/pullrequest.html:77 +#: rhodecode/templates/pullrequests/pullrequest.html:115 msgid "Add reviewer to this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:83 -#, fuzzy -msgid "Create new pull request" -msgstr "Criar novo arquivo" - -#: rhodecode/templates/pullrequests/pullrequest.html:92 -#: rhodecode/templates/pullrequests/pullrequest_data.html:14 -#: rhodecode/templates/pullrequests/pullrequest_show.html:25 -#, fuzzy -msgid "Title" -msgstr "escrever" - -#: rhodecode/templates/pullrequests/pullrequest.html:109 -msgid "Send pull request" -msgstr "" +#: rhodecode/templates/pullrequests/pullrequest.html:129 +#, fuzzy +msgid "Detailed compare view" +msgstr "comparar exibir" + +#: rhodecode/templates/pullrequests/pullrequest.html:150 +#, fuzzy +#| msgid "Edit repository" +msgid "Destination repository" +msgstr "Editar repositório" #: rhodecode/templates/pullrequests/pullrequest_show.html:4 #, fuzzy, python-format @@ -4378,11 +4826,6 @@ msgid "Pull request was reviewed by all reviewers" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:65 -#, fuzzy -msgid "Origin repository" -msgstr "Repositório Git" - #: rhodecode/templates/pullrequests/pullrequest_show.html:89 #, fuzzy msgid "Created on" @@ -4451,38 +4894,6 @@ msgid "Permission denied" msgstr "Permissão negada" -#: rhodecode/templates/shortlog/shortlog.html:5 -#, fuzzy, python-format -msgid "%s Lightweight Changelog" -msgstr "arquivo alterado" - -#: rhodecode/templates/shortlog/shortlog.html:11 -#: rhodecode/templates/shortlog/shortlog.html:15 -msgid "Lightweight Changelog" -msgstr "" - -#: rhodecode/templates/shortlog/shortlog_data.html:7 -#, fuzzy -msgid "Age" -msgstr "idade" - -#: 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" -msgstr "Adicionar ou enviar arquivos diretamente pelo RhodeCode" - -#: rhodecode/templates/shortlog/shortlog_data.html:84 -msgid "Push new repo" -msgstr "Fazer push de novo repositório" - -#: rhodecode/templates/shortlog/shortlog_data.html:92 -msgid "Existing repository?" -msgstr "Repositório existente?" - #: rhodecode/templates/summary/summary.html:4 #, fuzzy, python-format msgid "%s Summary" @@ -4523,7 +4934,7 @@ msgid "Fork of" msgstr "Bifurcação de" -#: rhodecode/templates/summary/summary.html:96 +#: rhodecode/templates/summary/summary.html:97 #, fuzzy msgid "Remote clone" msgstr "clone remoto" @@ -4550,8 +4961,9 @@ #: rhodecode/templates/summary/summary.html:151 #: rhodecode/templates/summary/summary.html:167 -#: rhodecode/templates/summary/summary.html:232 -msgid "enable" +#, fuzzy +#| msgid "enable" +msgid "Enable" msgstr "habilitar" #: rhodecode/templates/summary/summary.html:159 @@ -4566,7 +4978,7 @@ msgid "Downloads are disabled for this repository" msgstr "Downloads estão desabilitados para este repositório" -#: rhodecode/templates/summary/summary.html:171 +#: rhodecode/templates/summary/summary.html:170 #, fuzzy msgid "Download as zip" msgstr "descarregar como bruto" @@ -4594,6 +5006,10 @@ msgid "Commit activity by day / author" msgstr "Atividade de commit por dia / autor" +#: rhodecode/templates/summary/summary.html:232 +msgid "enable" +msgstr "habilitar" + #: rhodecode/templates/summary/summary.html:235 msgid "Stats gathered: " msgstr "Estatísticas coletadas:" @@ -4609,51 +5025,47 @@ #: rhodecode/templates/summary/summary.html:272 #, python-format -msgid "Readme file at revision '%s'" +msgid "Readme file from revision %s" msgstr "" -#: rhodecode/templates/summary/summary.html:275 -msgid "Permalink to this readme" -msgstr "" - -#: rhodecode/templates/summary/summary.html:333 +#: rhodecode/templates/summary/summary.html:332 #, python-format msgid "Download %s as %s" msgstr "Descarregar %s como %s" -#: rhodecode/templates/summary/summary.html:380 +#: rhodecode/templates/summary/summary.html:379 msgid "files" msgstr "arquivos" -#: rhodecode/templates/summary/summary.html:690 +#: rhodecode/templates/summary/summary.html:689 msgid "commits" msgstr "commits" -#: rhodecode/templates/summary/summary.html:691 +#: rhodecode/templates/summary/summary.html:690 msgid "files added" msgstr "arquivos adicionados" -#: rhodecode/templates/summary/summary.html:692 +#: rhodecode/templates/summary/summary.html:691 msgid "files changed" msgstr "arquivos alterados" -#: rhodecode/templates/summary/summary.html:693 +#: rhodecode/templates/summary/summary.html:692 msgid "files removed" msgstr "arquivos removidos" -#: rhodecode/templates/summary/summary.html:695 +#: rhodecode/templates/summary/summary.html:694 msgid "commit" msgstr "commit" +#: rhodecode/templates/summary/summary.html:695 +msgid "file added" +msgstr "arquivo adicionado" + #: rhodecode/templates/summary/summary.html:696 -msgid "file added" -msgstr "arquivo adicionado" +msgid "file changed" +msgstr "arquivo alterado" #: rhodecode/templates/summary/summary.html:697 -msgid "file changed" -msgstr "arquivo alterado" - -#: rhodecode/templates/summary/summary.html:698 msgid "file removed" msgstr "arquivo removido" @@ -4667,3 +5079,132 @@ msgid "Compare tags" msgstr "comparar exibir" +#~ msgid "An error occurred during deletion of repository user" +#~ msgstr "Ocorreu um erro ao excluir usuário de repositório" + +#~ msgid "An error occurred during deletion of repository user groups" +#~ msgstr "Ocorreu um erro ao excluir grupo de usuário de repositório" + +#~ msgid "An error occurred during deletion of group user" +#~ msgstr "Ocorreu um erro ao excluir o usuário de grupo" + +#~ msgid "An error occurred during deletion of group user groups" +#~ msgstr "Ocorreu um erro ao excluir o grupo do grupo de usuários" + +#~ msgid "Granted 'repository create' permission to user" +#~ msgstr "Concedida permissão de 'criar repositório' ao usuário" + +#~ msgid "Revoked 'repository create' permission to user" +#~ msgstr "Revogada permissão de 'criar repositório' ao usuário" + +#~ msgid "Granted 'repository fork' permission to user" +#~ msgstr "Concedida permissão de 'criar repositório' ao usuário" + +#~ msgid "Revoked 'repository fork' permission to user" +#~ msgstr "Revogada permissão de 'criar repositório' ao usuário" + +#~ msgid "Granted 'repository create' permission to user group" +#~ msgstr "Concedida permissão de 'criar repositório' ao usuário" + +#~ msgid "Revoked 'repository create' permission to user group" +#~ msgstr "Revogada permissão de 'criar repositório' ao usuário" + +#~ msgid "Granted 'repository fork' permission to user group" +#~ msgstr "Concedida permissão de 'criar repositório' ao usuário" + +#~ msgid "Revoked 'repository fork' permission to user group" +#~ msgstr "Revogada permissão de 'criar repositório' ao usuário" + +#~ msgid "Last change" +#~ msgstr "Última alteração" + +#~ msgid "Atom" +#~ msgstr "Atom" + +#~ msgid "lock repo" +#~ msgstr "" + +#~ msgid "Failed to remove user group" +#~ msgstr "Falha ao remover grupo de usuários" + +#~ msgid "Use lightweight dashboard" +#~ msgstr "" + +#~ 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 "" +#~ "Essa é uma configuração crucial da " +#~ "aplicação. Se você realmente tem 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." + +#~ msgid "" +#~ "Select to inherit permissions from %s" +#~ " settings. With this selected below " +#~ "options does not have any action" +#~ msgstr "" + +#~ msgid "Group members" +#~ msgstr "Membros do grupo" + +#~ msgid "Submit a bug" +#~ msgstr "Encaminhe um bug" + +#~ msgid "Lightweight changelog" +#~ msgstr "" + +#~ msgid "New status" +#~ msgstr "Conjuntos de mudanças" + +#~ msgid "View this comment here" +#~ msgstr "" + +#~ msgid "Repo" +#~ msgstr "Meus repositórios" + +#~ msgid "desc" +#~ msgstr "" + +#~ msgid "If you did not request new password please ignore this email." +#~ msgstr "" + +#~ msgid "" +#~ "User %s opened pull request for " +#~ "repository %s and wants you to " +#~ "review changes." +#~ msgstr "" + +#~ msgid "View this pull request here" +#~ msgstr "Confirma excluir este repositório" + +#~ msgid "title" +#~ msgstr "escrever" + +#~ msgid "revisions for reviewing" +#~ msgstr "" + +#~ msgid "Pull request #%s for repository %s" +#~ msgstr "repositório [criado]" + +#~ msgid "A new user have registered in RhodeCode" +#~ msgstr "Você se registrou com sucesso no rhodecode" + +#~ msgid "%s Lightweight Changelog" +#~ msgstr "arquivo alterado" + +#~ msgid "Lightweight Changelog" +#~ msgstr "" + +#~ msgid "Readme file at revision '%s'" +#~ msgstr "" + +#~ msgid "Permalink to this readme" +#~ msgstr "" + diff -r 14afe4d1363d -r 8ddf35e02d05 rhodecode/i18n/rhodecode.pot --- a/rhodecode/i18n/rhodecode.pot Sat Jun 01 01:03:31 2013 +0200 +++ b/rhodecode/i18n/rhodecode.pot Sat Jun 01 18:03:44 2013 +0200 @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: RhodeCode 1.6.0b\n" +"Project-Id-Version: RhodeCode 1.7.0dev\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-04-05 10:19-0700\n" +"POT-Creation-Date: 2013-06-01 18:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,36 +17,35 @@ "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -#: rhodecode/controllers/changelog.py:95 +#: rhodecode/controllers/changelog.py:149 msgid "All Branches" msgstr "" -#: rhodecode/controllers/changeset.py:83 +#: rhodecode/controllers/changeset.py:84 msgid "Show white space" msgstr "" -#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97 +#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98 msgid "Ignore white space" msgstr "" -#: rhodecode/controllers/changeset.py:163 +#: rhodecode/controllers/changeset.py:164 #, python-format msgid "%s line context" msgstr "" -#: rhodecode/controllers/changeset.py:329 rhodecode/controllers/pullrequests.py:438 +#: rhodecode/controllers/changeset.py:345 rhodecode/controllers/pullrequests.py:481 #, python-format msgid "Status change -> %s" msgstr "" -#: rhodecode/controllers/changeset.py:360 +#: rhodecode/controllers/changeset.py:376 msgid "" "Changing status on a changeset associated with a closed pull request is not " "allowed" msgstr "" -#: rhodecode/controllers/compare.py:74 rhodecode/controllers/pullrequests.py:167 -#: rhodecode/controllers/shortlog.py:100 +#: rhodecode/controllers/compare.py:74 rhodecode/controllers/pullrequests.py:259 msgid "There are no changesets yet" msgstr "" @@ -87,8 +86,8 @@ msgstr "" #: rhodecode/controllers/feed.py:86 -#: rhodecode/templates/changeset/changeset.html:134 -#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/changeset/changeset.html:141 +#: rhodecode/templates/changeset/changeset.html:153 #: rhodecode/templates/compare/compare_diff.html:58 #: rhodecode/templates/compare/compare_diff.html:69 #: rhodecode/templates/pullrequests/pullrequest_show.html:131 @@ -96,115 +95,115 @@ msgid "Changeset was too big and was cut off..." msgstr "" -#: rhodecode/controllers/feed.py:91 +#: rhodecode/controllers/feed.py:90 #, 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 +msgid "Click here to add new file" +msgstr "" + +#: rhodecode/controllers/files.py:90 #, python-format msgid "There are no files yet %s" msgstr "" -#: rhodecode/controllers/files.py:267 rhodecode/controllers/files.py:335 +#: rhodecode/controllers/files.py:271 rhodecode/controllers/files.py:339 #, python-format msgid "This repository is has been locked by %s on %s" msgstr "" -#: rhodecode/controllers/files.py:279 +#: rhodecode/controllers/files.py:283 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: rhodecode/controllers/files.py:293 +#: rhodecode/controllers/files.py:297 #, python-format msgid "Edited file %s via RhodeCode" msgstr "" -#: rhodecode/controllers/files.py:309 +#: rhodecode/controllers/files.py:313 msgid "No changes" msgstr "" -#: rhodecode/controllers/files.py:318 rhodecode/controllers/files.py:388 +#: rhodecode/controllers/files.py:322 rhodecode/controllers/files.py:394 #, python-format msgid "Successfully committed to %s" msgstr "" -#: rhodecode/controllers/files.py:323 rhodecode/controllers/files.py:394 +#: rhodecode/controllers/files.py:327 rhodecode/controllers/files.py:405 msgid "Error occurred during commit" msgstr "" -#: rhodecode/controllers/files.py:347 +#: rhodecode/controllers/files.py:351 msgid "Added file via RhodeCode" msgstr "" -#: rhodecode/controllers/files.py:364 -msgid "No content" -msgstr "" - #: rhodecode/controllers/files.py:368 -msgid "No filename" +msgid "No content" msgstr "" #: rhodecode/controllers/files.py:372 +msgid "No filename" +msgstr "" + +#: rhodecode/controllers/files.py:397 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 +msgid "Downloads disabled" +msgstr "" + +#: rhodecode/controllers/files.py:442 #, python-format msgid "Unknown revision %s" msgstr "" -#: rhodecode/controllers/files.py:433 +#: rhodecode/controllers/files.py:444 msgid "Empty repository" msgstr "" -#: rhodecode/controllers/files.py:435 +#: rhodecode/controllers/files.py:446 msgid "Unknown archive type" msgstr "" -#: rhodecode/controllers/files.py:617 +#: rhodecode/controllers/files.py:631 #: rhodecode/templates/changeset/changeset_range.html:9 +#: rhodecode/templates/email_templates/pull_request.html:12 +#: rhodecode/templates/pullrequests/pullrequest.html:124 msgid "Changesets" msgstr "" -#: rhodecode/controllers/files.py:618 rhodecode/controllers/pullrequests.py:131 -#: rhodecode/controllers/summary.py:247 rhodecode/model/scm.py:606 +#: rhodecode/controllers/files.py:632 rhodecode/controllers/pullrequests.py:152 +#: rhodecode/controllers/summary.py:76 rhodecode/model/scm.py:682 #: rhodecode/templates/switch_to_list.html:3 #: rhodecode/templates/branches/branches.html:10 msgid "Branches" msgstr "" -#: 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 +#: rhodecode/controllers/files.py:633 rhodecode/controllers/pullrequests.py:153 +#: rhodecode/controllers/summary.py:77 rhodecode/model/scm.py:693 +#: rhodecode/templates/switch_to_list.html:15 rhodecode/templates/tags/tags.html:10 msgid "Tags" msgstr "" -#: rhodecode/controllers/forks.py:175 +#: rhodecode/controllers/forks.py:176 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: rhodecode/controllers/forks.py:189 +#: rhodecode/controllers/forks.py:190 #, python-format msgid "An error occurred during repository forking %s" msgstr "" -#: rhodecode/controllers/journal.py:275 rhodecode/controllers/journal.py:318 +#: rhodecode/controllers/journal.py:110 rhodecode/controllers/journal.py:153 msgid "public journal" msgstr "" -#: rhodecode/controllers/journal.py:279 rhodecode/controllers/journal.py:322 +#: rhodecode/controllers/journal.py:114 rhodecode/controllers/journal.py:157 #: rhodecode/templates/journal/journal.html:12 msgid "journal" msgstr "" @@ -221,71 +220,71 @@ msgid "Your password reset was successful, new password has been sent to your email" msgstr "" -#: rhodecode/controllers/pullrequests.py:118 +#: rhodecode/controllers/pullrequests.py:139 #: rhodecode/templates/changeset/changeset.html:10 -#: rhodecode/templates/email_templates/changeset_comment.html:15 +#: rhodecode/templates/email_templates/changeset_comment.html:8 msgid "Changeset" msgstr "" -#: rhodecode/controllers/pullrequests.py:128 +#: rhodecode/controllers/pullrequests.py:149 msgid "Special" msgstr "" -#: rhodecode/controllers/pullrequests.py:129 +#: rhodecode/controllers/pullrequests.py:150 msgid "Peer branches" msgstr "" -#: rhodecode/controllers/pullrequests.py:130 rhodecode/model/scm.py:612 +#: rhodecode/controllers/pullrequests.py:151 rhodecode/model/scm.py:688 #: rhodecode/templates/switch_to_list.html:28 #: rhodecode/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "" -#: rhodecode/controllers/pullrequests.py:228 +#: rhodecode/controllers/pullrequests.py:324 msgid "Pull request requires a title with min. 3 chars" msgstr "" -#: rhodecode/controllers/pullrequests.py:230 +#: rhodecode/controllers/pullrequests.py:326 msgid "Error creating pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:251 +#: rhodecode/controllers/pullrequests.py:346 msgid "Successfully opened new pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:254 +#: rhodecode/controllers/pullrequests.py:349 msgid "Error occurred during sending pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:287 +#: rhodecode/controllers/pullrequests.py:388 msgid "Successfully deleted pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:441 +#: rhodecode/controllers/pullrequests.py:484 msgid "Closing with" msgstr "" -#: rhodecode/controllers/pullrequests.py:478 +#: rhodecode/controllers/pullrequests.py:521 msgid "Closing pull request on other statuses than rejected or approved forbidden" msgstr "" -#: rhodecode/controllers/search.py:134 +#: rhodecode/controllers/search.py:132 msgid "Invalid search query. Try quoting it." msgstr "" -#: rhodecode/controllers/search.py:139 +#: rhodecode/controllers/search.py:137 msgid "There is no index to search in. Please run whoosh indexer" msgstr "" -#: rhodecode/controllers/search.py:143 +#: rhodecode/controllers/search.py:141 msgid "An error occurred during this search operation" msgstr "" -#: rhodecode/controllers/summary.py:141 +#: rhodecode/controllers/summary.py:182 msgid "No data loaded yet" msgstr "" -#: rhodecode/controllers/summary.py:147 +#: rhodecode/controllers/summary.py:188 #: rhodecode/templates/summary/summary.html:149 msgid "Statistics are disabled for this repository" msgstr "" @@ -298,6 +297,39 @@ msgid "Error occurred during update of defaults" msgstr "" +#: rhodecode/controllers/admin/gists.py:56 +msgid "forever" +msgstr "" + +#: rhodecode/controllers/admin/gists.py:57 +msgid "5 minutes" +msgstr "" + +#: rhodecode/controllers/admin/gists.py:58 +msgid "1 hour" +msgstr "" + +#: rhodecode/controllers/admin/gists.py:59 +msgid "1 day" +msgstr "" + +#: rhodecode/controllers/admin/gists.py:60 +msgid "1 month" +msgstr "" + +#: rhodecode/controllers/admin/gists.py:62 +msgid "Lifetime" +msgstr "" + +#: rhodecode/controllers/admin/gists.py:127 +msgid "Error occurred during gist creation" +msgstr "" + +#: rhodecode/controllers/admin/gists.py:165 +#, python-format +msgid "Deleted gist %s" +msgstr "" + #: rhodecode/controllers/admin/ldap_settings.py:50 msgid "BASE" msgstr "" @@ -342,35 +374,39 @@ msgid "START_TLS on LDAP connection" msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:126 +#: rhodecode/controllers/admin/ldap_settings.py:124 msgid "LDAP settings updated successfully" msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:130 +#: rhodecode/controllers/admin/ldap_settings.py:128 msgid "Unable to activate ldap. The \"python-ldap\" library is missing." msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:147 +#: rhodecode/controllers/admin/ldap_settings.py:145 msgid "Error occurred during update of ldap settings" msgstr "" +#: rhodecode/controllers/admin/permissions.py:58 +#: rhodecode/controllers/admin/permissions.py:62 +#: rhodecode/controllers/admin/permissions.py:66 +msgid "None" +msgstr "" + +#: rhodecode/controllers/admin/permissions.py:59 +#: rhodecode/controllers/admin/permissions.py:63 +#: rhodecode/controllers/admin/permissions.py:67 +msgid "Read" +msgstr "" + #: rhodecode/controllers/admin/permissions.py:60 #: rhodecode/controllers/admin/permissions.py:64 -msgid "None" +#: rhodecode/controllers/admin/permissions.py:68 +msgid "Write" msgstr "" #: rhodecode/controllers/admin/permissions.py:61 #: rhodecode/controllers/admin/permissions.py:65 -msgid "Read" -msgstr "" - -#: rhodecode/controllers/admin/permissions.py:62 -#: rhodecode/controllers/admin/permissions.py:66 -msgid "Write" -msgstr "" - -#: rhodecode/controllers/admin/permissions.py:63 -#: rhodecode/controllers/admin/permissions.py:67 +#: rhodecode/controllers/admin/permissions.py:69 #: rhodecode/templates/admin/defaults/defaults.html:9 #: rhodecode/templates/admin/ldap/ldap.html:9 #: rhodecode/templates/admin/permissions/permissions.html:9 @@ -391,39 +427,53 @@ #: 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:292 rhodecode/templates/base/base.html:293 -#: rhodecode/templates/base/base.html:299 rhodecode/templates/base/base.html:300 +#: rhodecode/templates/base/base.html:317 rhodecode/templates/base/base.html:318 +#: rhodecode/templates/base/base.html:324 rhodecode/templates/base/base.html:325 msgid "Admin" msgstr "" -#: rhodecode/controllers/admin/permissions.py:70 -#: 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" +#: rhodecode/controllers/admin/permissions.py:83 +#: rhodecode/controllers/admin/permissions.py:86 +#: rhodecode/controllers/admin/permissions.py:89 +#: rhodecode/controllers/admin/permissions.py:92 +msgid "Disabled" msgstr "" #: rhodecode/controllers/admin/permissions.py:74 +msgid "Allowed with manual account activation" +msgstr "" + +#: rhodecode/controllers/admin/permissions.py:76 msgid "Allowed with automatic account activation" msgstr "" -#: rhodecode/controllers/admin/permissions.py:77 +#: rhodecode/controllers/admin/permissions.py:79 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1439 rhodecode/model/db.py:1444 +msgid "Manual activation of external account" +msgstr "" + #: rhodecode/controllers/admin/permissions.py:80 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1440 rhodecode/model/db.py:1445 +msgid "Automatic activation of external account" +msgstr "" + +#: rhodecode/controllers/admin/permissions.py:84 +#: rhodecode/controllers/admin/permissions.py:87 +#: rhodecode/controllers/admin/permissions.py:90 +#: rhodecode/controllers/admin/permissions.py:93 msgid "Enabled" msgstr "" -#: rhodecode/controllers/admin/permissions.py:128 +#: rhodecode/controllers/admin/permissions.py:138 msgid "Default permissions updated successfully" msgstr "" -#: rhodecode/controllers/admin/permissions.py:142 +#: rhodecode/controllers/admin/permissions.py:152 msgid "Error occurred during update of permissions" msgstr "" -#: rhodecode/controllers/admin/repos.py:127 +#: rhodecode/controllers/admin/repos.py:128 msgid "--REMOVE FORK--" msgstr "" @@ -442,228 +492,223 @@ msgid "Error creating repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:266 +#: rhodecode/controllers/admin/repos.py:270 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: rhodecode/controllers/admin/repos.py:284 +#: rhodecode/controllers/admin/repos.py:288 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:311 rhodecode/controllers/api/api.py:877 +#: rhodecode/controllers/admin/repos.py:315 #, python-format msgid "Detached %s forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:314 rhodecode/controllers/api/api.py:879 +#: rhodecode/controllers/admin/repos.py:318 #, python-format msgid "Deleted %s forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:319 +#: rhodecode/controllers/admin/repos.py:323 #, python-format msgid "Deleted repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:322 +#: rhodecode/controllers/admin/repos.py:326 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:327 +#: rhodecode/controllers/admin/repos.py:331 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:365 +#: rhodecode/controllers/admin/repos.py:345 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:403 -msgid "An error occurred during deletion of repository user groups" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:421 +#: rhodecode/controllers/admin/repos.py:375 +#: rhodecode/controllers/admin/repos_groups.py:332 +#: rhodecode/controllers/admin/users_groups.py:312 +msgid "An error occurred during revoking of permission" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:392 msgid "An error occurred during deletion of repository stats" msgstr "" -#: rhodecode/controllers/admin/repos.py:438 +#: rhodecode/controllers/admin/repos.py:409 msgid "An error occurred during cache invalidation" msgstr "" -#: rhodecode/controllers/admin/repos.py:458 -#: rhodecode/controllers/admin/repos.py:485 +#: rhodecode/controllers/admin/repos.py:429 +#: rhodecode/controllers/admin/repos.py:456 msgid "An error occurred during unlocking" msgstr "" +#: rhodecode/controllers/admin/repos.py:447 +msgid "Unlocked" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:450 +msgid "Locked" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:452 +#, python-format +msgid "Repository has been %s" +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:509 +#: rhodecode/controllers/admin/repos.py:480 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:514 rhodecode/model/validators.py:302 +#: rhodecode/controllers/admin/repos.py:485 rhodecode/model/validators.py:302 msgid "Token mismatch" msgstr "" -#: rhodecode/controllers/admin/repos.py:527 +#: rhodecode/controllers/admin/repos.py:498 msgid "Pulled from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:529 +#: rhodecode/controllers/admin/repos.py:501 msgid "An error occurred during pull from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:545 +#: rhodecode/controllers/admin/repos.py:517 msgid "Nothing" msgstr "" -#: rhodecode/controllers/admin/repos.py:547 +#: rhodecode/controllers/admin/repos.py:519 #, python-format msgid "Marked repo %s as fork of %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:551 +#: rhodecode/controllers/admin/repos.py:523 msgid "An error occurred during this operation" msgstr "" -#: rhodecode/controllers/admin/repos.py:590 +#: rhodecode/controllers/admin/repos.py:562 msgid "An error occurred during creation of field" msgstr "" -#: rhodecode/controllers/admin/repos.py:604 +#: rhodecode/controllers/admin/repos.py:576 msgid "An error occurred during removal of field" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:145 +#: rhodecode/controllers/admin/repos_groups.py:147 #, python-format msgid "Created repository group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:157 +#: rhodecode/controllers/admin/repos_groups.py:159 #, python-format 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 +#: rhodecode/controllers/admin/repos_groups.py:217 #, python-format msgid "Updated repository group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:235 +#: rhodecode/controllers/admin/repos_groups.py:232 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:253 +#: rhodecode/controllers/admin/repos_groups.py:250 #, python-format msgid "This group contains %s repositores and cannot be deleted" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:260 +#: rhodecode/controllers/admin/repos_groups.py:257 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:266 +#: rhodecode/controllers/admin/repos_groups.py:263 #, python-format msgid "Removed repository group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:271 +#: rhodecode/controllers/admin/repos_groups.py:268 #, python-format 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:318 -msgid "An error occurred during deletion of group user groups" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:126 +#: rhodecode/controllers/admin/repos_groups.py:279 +#: rhodecode/controllers/admin/repos_groups.py:314 +#: rhodecode/controllers/admin/users_groups.py:300 +msgid "Cannot revoke permission for yourself as admin" +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:294 +msgid "Repository Group permissions updated" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:123 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "" -#: rhodecode/controllers/admin/settings.py:135 +#: rhodecode/controllers/admin/settings.py:132 msgid "Whoosh reindex task scheduled" msgstr "" -#: rhodecode/controllers/admin/settings.py:166 +#: rhodecode/controllers/admin/settings.py:163 msgid "Updated application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:170 -#: rhodecode/controllers/admin/settings.py:301 +#: rhodecode/controllers/admin/settings.py:167 +#: rhodecode/controllers/admin/settings.py:304 msgid "Error occurred during updating application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:216 +#: rhodecode/controllers/admin/settings.py:219 msgid "Updated visualisation settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:221 +#: rhodecode/controllers/admin/settings.py:224 msgid "Error occurred during updating visualisation settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:297 +#: rhodecode/controllers/admin/settings.py:300 msgid "Updated VCS settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:311 +#: rhodecode/controllers/admin/settings.py:314 msgid "Added new hook" msgstr "" -#: rhodecode/controllers/admin/settings.py:323 +#: rhodecode/controllers/admin/settings.py:326 msgid "Updated hooks" msgstr "" -#: rhodecode/controllers/admin/settings.py:327 +#: rhodecode/controllers/admin/settings.py:330 msgid "Error occurred during hook creation" msgstr "" -#: rhodecode/controllers/admin/settings.py:346 +#: rhodecode/controllers/admin/settings.py:349 msgid "Email task created" msgstr "" -#: rhodecode/controllers/admin/settings.py:410 +#: rhodecode/controllers/admin/settings.py:413 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/controllers/admin/settings.py:452 +#: rhodecode/controllers/admin/settings.py:455 msgid "Your account was updated successfully" msgstr "" -#: rhodecode/controllers/admin/settings.py:467 +#: rhodecode/controllers/admin/settings.py:470 #: rhodecode/controllers/admin/users.py:198 #, python-format msgid "Error occurred during update of user %s" @@ -691,111 +736,92 @@ msgid "An error occurred during deletion of user" msgstr "" -#: rhodecode/controllers/admin/users.py:233 +#: rhodecode/controllers/admin/users.py:234 msgid "You can't edit this user" msgstr "" -#: rhodecode/controllers/admin/users.py:276 -msgid "Granted 'repository create' permission to user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:281 -msgid "Revoked 'repository create' permission to user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:287 -msgid "Granted 'repository fork' permission to user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:292 -msgid "Revoked 'repository fork' permission to user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:298 -#: rhodecode/controllers/admin/users_groups.py:281 +#: rhodecode/controllers/admin/users.py:293 +#: rhodecode/controllers/admin/users_groups.py:372 +msgid "Updated permissions" +msgstr "" + +#: rhodecode/controllers/admin/users.py:297 +#: rhodecode/controllers/admin/users_groups.py:376 msgid "An error occurred during permissions saving" msgstr "" -#: rhodecode/controllers/admin/users.py:312 +#: rhodecode/controllers/admin/users.py:311 #, python-format msgid "Added email %s to user" msgstr "" -#: rhodecode/controllers/admin/users.py:318 +#: rhodecode/controllers/admin/users.py:317 msgid "An error occurred during email saving" msgstr "" -#: rhodecode/controllers/admin/users.py:328 +#: rhodecode/controllers/admin/users.py:327 msgid "Removed email from user" msgstr "" -#: rhodecode/controllers/admin/users.py:341 +#: rhodecode/controllers/admin/users.py:340 #, python-format msgid "Added ip %s to user" msgstr "" -#: rhodecode/controllers/admin/users.py:347 +#: rhodecode/controllers/admin/users.py:346 msgid "An error occurred during ip saving" msgstr "" -#: rhodecode/controllers/admin/users.py:359 +#: rhodecode/controllers/admin/users.py:358 msgid "Removed ip from user" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:86 +#: rhodecode/controllers/admin/users_groups.py:162 #, python-format msgid "Created user group %s" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:97 +#: rhodecode/controllers/admin/users_groups.py:173 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:166 -#, python-format -msgid "Updated user group %s" -msgstr "" - -#: rhodecode/controllers/admin/users_groups.py:188 -#, python-format -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 +#, python-format +msgid "Updated user group %s" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:232 +#, python-format +msgid "Error occurred during update of user group %s" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:250 +msgid "Successfully deleted user group" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:255 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 +#: rhodecode/controllers/admin/users_groups.py:274 +msgid "Target group cannot be the same" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:280 +msgid "User Group permissions updated" +msgstr "" + +#: rhodecode/lib/auth.py:544 #, python-format msgid "IP %s not allowed" msgstr "" -#: rhodecode/lib/auth.py:579 +#: rhodecode/lib/auth.py:593 msgid "You need to be a registered user to perform this action" msgstr "" -#: rhodecode/lib/auth.py:620 +#: rhodecode/lib/auth.py:634 msgid "You need to be a signed in to view this page" msgstr "" @@ -811,152 +837,176 @@ msgid "No changes detected" msgstr "" -#: rhodecode/lib/helpers.py:394 +#: rhodecode/lib/helpers.py:428 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "" -#: rhodecode/lib/helpers.py:506 +#: rhodecode/lib/helpers.py:539 msgid "True" msgstr "" -#: rhodecode/lib/helpers.py:509 +#: rhodecode/lib/helpers.py:542 msgid "False" msgstr "" -#: rhodecode/lib/helpers.py:547 +#: rhodecode/lib/helpers.py:580 #, python-format msgid "Deleted branch: %s" msgstr "" -#: rhodecode/lib/helpers.py:550 +#: rhodecode/lib/helpers.py:583 #, python-format msgid "Created tag: %s" msgstr "" -#: rhodecode/lib/helpers.py:563 +#: rhodecode/lib/helpers.py:596 msgid "Changeset not found" msgstr "" -#: rhodecode/lib/helpers.py:615 +#: rhodecode/lib/helpers.py:646 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: rhodecode/lib/helpers.py:621 +#: rhodecode/lib/helpers.py:652 msgid "compare view" msgstr "" -#: rhodecode/lib/helpers.py:641 +#: rhodecode/lib/helpers.py:672 msgid "and" msgstr "" -#: rhodecode/lib/helpers.py:642 +#: rhodecode/lib/helpers.py:673 #, python-format msgid "%s more" msgstr "" -#: rhodecode/lib/helpers.py:643 rhodecode/templates/changelog/changelog.html:44 +#: rhodecode/lib/helpers.py:674 rhodecode/templates/changelog/changelog.html:53 msgid "revisions" msgstr "" -#: rhodecode/lib/helpers.py:667 +#: rhodecode/lib/helpers.py:698 #, python-format msgid "fork name %s" msgstr "" -#: rhodecode/lib/helpers.py:684 +#: rhodecode/lib/helpers.py:715 #: rhodecode/templates/pullrequests/pullrequest_show.html:8 #, python-format msgid "Pull request #%s" msgstr "" -#: rhodecode/lib/helpers.py:690 +#: rhodecode/lib/helpers.py:725 msgid "[deleted] repository" msgstr "" -#: rhodecode/lib/helpers.py:692 rhodecode/lib/helpers.py:702 +#: rhodecode/lib/helpers.py:727 rhodecode/lib/helpers.py:739 msgid "[created] repository" msgstr "" -#: rhodecode/lib/helpers.py:694 +#: rhodecode/lib/helpers.py:729 msgid "[created] repository as fork" msgstr "" -#: rhodecode/lib/helpers.py:696 rhodecode/lib/helpers.py:704 +#: rhodecode/lib/helpers.py:731 rhodecode/lib/helpers.py:741 msgid "[forked] repository" msgstr "" -#: rhodecode/lib/helpers.py:698 rhodecode/lib/helpers.py:706 +#: rhodecode/lib/helpers.py:733 rhodecode/lib/helpers.py:743 msgid "[updated] repository" msgstr "" -#: rhodecode/lib/helpers.py:700 +#: rhodecode/lib/helpers.py:735 +msgid "[downloaded] archive from repository" +msgstr "" + +#: rhodecode/lib/helpers.py:737 msgid "[delete] repository" msgstr "" -#: rhodecode/lib/helpers.py:708 +#: rhodecode/lib/helpers.py:745 msgid "[created] user" msgstr "" -#: rhodecode/lib/helpers.py:710 +#: rhodecode/lib/helpers.py:747 msgid "[updated] user" msgstr "" -#: rhodecode/lib/helpers.py:712 +#: rhodecode/lib/helpers.py:749 msgid "[created] user group" msgstr "" -#: rhodecode/lib/helpers.py:714 +#: rhodecode/lib/helpers.py:751 msgid "[updated] user group" msgstr "" -#: rhodecode/lib/helpers.py:716 +#: rhodecode/lib/helpers.py:753 msgid "[commented] on revision in repository" msgstr "" -#: rhodecode/lib/helpers.py:718 +#: rhodecode/lib/helpers.py:755 msgid "[commented] on pull request for" msgstr "" -#: rhodecode/lib/helpers.py:720 +#: rhodecode/lib/helpers.py:757 msgid "[closed] pull request for" msgstr "" -#: rhodecode/lib/helpers.py:722 +#: rhodecode/lib/helpers.py:759 msgid "[pushed] into" msgstr "" -#: rhodecode/lib/helpers.py:724 +#: rhodecode/lib/helpers.py:761 msgid "[committed via RhodeCode] into repository" msgstr "" -#: rhodecode/lib/helpers.py:726 +#: rhodecode/lib/helpers.py:763 msgid "[pulled from remote] into repository" msgstr "" -#: rhodecode/lib/helpers.py:728 +#: rhodecode/lib/helpers.py:765 msgid "[pulled] from" msgstr "" -#: rhodecode/lib/helpers.py:730 +#: rhodecode/lib/helpers.py:767 msgid "[started following] repository" msgstr "" -#: rhodecode/lib/helpers.py:732 +#: rhodecode/lib/helpers.py:769 msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/helpers.py:910 +#: rhodecode/lib/helpers.py:1088 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:914 +#: rhodecode/lib/helpers.py:1092 msgid "No Files" msgstr "" -#: rhodecode/lib/helpers.py:1198 +#: rhodecode/lib/helpers.py:1158 +msgid "new file" +msgstr "" + +#: rhodecode/lib/helpers.py:1161 +msgid "mod" +msgstr "" + +#: rhodecode/lib/helpers.py:1164 +msgid "del" +msgstr "" + +#: rhodecode/lib/helpers.py:1167 +msgid "rename" +msgstr "" + +#: rhodecode/lib/helpers.py:1172 +msgid "chmod" +msgstr "" + +#: rhodecode/lib/helpers.py:1404 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from the " @@ -967,221 +1017,299 @@ msgid "cannot create new union repository" msgstr "" -#: rhodecode/lib/utils2.py:411 +#: rhodecode/lib/utils2.py:410 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:412 +#: rhodecode/lib/utils2.py:411 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" +#: rhodecode/lib/utils2.py:412 +#, python-format +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "" +msgstr[1] "" + #: rhodecode/lib/utils2.py:413 #, python-format -msgid "%d day" -msgid_plural "%d days" +msgid "%d hour" +msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" #: rhodecode/lib/utils2.py:414 #, python-format -msgid "%d hour" -msgid_plural "%d hours" +msgid "%d minute" +msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" #: rhodecode/lib/utils2.py:415 #, python-format -msgid "%d minute" -msgid_plural "%d minutes" -msgstr[0] "" -msgstr[1] "" - -#: rhodecode/lib/utils2.py:416 -#, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:432 +#: rhodecode/lib/utils2.py:431 #, python-format msgid "in %s" msgstr "" -#: rhodecode/lib/utils2.py:434 +#: rhodecode/lib/utils2.py:433 #, python-format msgid "%s ago" msgstr "" -#: rhodecode/lib/utils2.py:436 +#: rhodecode/lib/utils2.py:435 #, python-format msgid "in %s and %s" msgstr "" -#: rhodecode/lib/utils2.py:439 +#: rhodecode/lib/utils2.py:438 #, python-format msgid "%s and %s ago" msgstr "" -#: rhodecode/lib/utils2.py:442 +#: rhodecode/lib/utils2.py:441 msgid "just now" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 #: 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 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1303 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1388 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1408 rhodecode/model/db.py:1413 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/lib/dbmigrate/schema/db_1_5_2.py:1290 rhodecode/model/db.py:1389 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1389 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1409 rhodecode/model/db.py:1414 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/lib/dbmigrate/schema/db_1_5_2.py:1291 rhodecode/model/db.py:1390 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1390 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1410 rhodecode/model/db.py:1415 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/lib/dbmigrate/schema/db_1_5_2.py:1292 rhodecode/model/db.py:1391 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1306 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1391 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1411 rhodecode/model/db.py:1416 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/lib/dbmigrate/schema/db_1_5_2.py:1294 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1308 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/lib/dbmigrate/schema/db_1_5_2.py:1295 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1309 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/lib/dbmigrate/schema/db_1_5_2.py:1296 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1310 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/lib/dbmigrate/schema/db_1_5_2.py:1297 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1311 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/lib/dbmigrate/schema/db_1_5_2.py:1299 rhodecode/model/db.py:1398 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1313 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1398 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1406 rhodecode/model/db.py:1411 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/lib/dbmigrate/schema/db_1_5_2.py:1300 rhodecode/model/db.py:1399 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1314 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1399 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1429 rhodecode/model/db.py:1434 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/lib/dbmigrate/schema/db_1_5_2.py:1301 rhodecode/model/db.py:1400 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1315 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1400 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1430 rhodecode/model/db.py:1435 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/lib/dbmigrate/schema/db_1_5_2.py:1302 rhodecode/model/db.py:1401 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1316 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1401 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1432 rhodecode/model/db.py:1437 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/lib/dbmigrate/schema/db_1_5_2.py:1303 rhodecode/model/db.py:1402 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1317 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1402 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1433 rhodecode/model/db.py:1438 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/lib/dbmigrate/schema/db_1_5_2.py:1304 rhodecode/model/db.py:1403 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1318 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.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/lib/dbmigrate/schema/db_1_5_2.py:1305 rhodecode/model/db.py:1404 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1319 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.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/lib/dbmigrate/schema/db_1_5_2.py:1308 rhodecode/model/db.py:1407 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1322 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.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/lib/dbmigrate/schema/db_1_5_2.py:1749 rhodecode/model/db.py:1838 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1763 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1838 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1934 rhodecode/model/db.py:1939 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/lib/dbmigrate/schema/db_1_5_2.py:1750 rhodecode/model/db.py:1839 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1764 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1839 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1935 rhodecode/model/db.py:1940 msgid "Approved" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 #: 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 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1765 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1840 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1936 rhodecode/model/db.py:1941 msgid "Rejected" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 #: 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 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1766 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1841 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1937 rhodecode/model/db.py:1942 msgid "Under Review" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1252 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1270 rhodecode/model/db.py:1275 +msgid "top level" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1393 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1413 rhodecode/model/db.py:1418 +msgid "Repository group no access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1394 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1414 rhodecode/model/db.py:1419 +msgid "Repository group read access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1395 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1415 rhodecode/model/db.py:1420 +msgid "Repository group write access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1396 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1416 rhodecode/model/db.py:1421 +msgid "Repository group admin access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1418 rhodecode/model/db.py:1423 +msgid "User group no access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1419 rhodecode/model/db.py:1424 +msgid "User group read access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1420 rhodecode/model/db.py:1425 +msgid "User group write access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1421 rhodecode/model/db.py:1426 +msgid "User group admin access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1423 rhodecode/model/db.py:1428 +msgid "Repository Group creation disabled" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1424 rhodecode/model/db.py:1429 +msgid "Repository Group creation enabled" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1426 rhodecode/model/db.py:1431 +msgid "User Group creation disabled" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1427 rhodecode/model/db.py:1432 +msgid "User Group creation enabled" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1435 rhodecode/model/db.py:1440 +msgid "Registration disabled" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1436 rhodecode/model/db.py:1441 +msgid "User Registration with manual account activation" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1437 rhodecode/model/db.py:1442 +msgid "User Registration with automatic account activation" +msgstr "" + #: rhodecode/model/comment.py:75 #, python-format msgid "on line %s" msgstr "" -#: rhodecode/model/comment.py:219 +#: rhodecode/model/comment.py:220 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 "" @@ -1200,42 +1328,42 @@ msgid "Enter %(min)i characters or more" msgstr "" -#: rhodecode/model/notification.py:224 +#: rhodecode/model/notification.py:228 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "" -#: rhodecode/model/notification.py:225 -#, python-format -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 opened new pull request at %(when)s" -msgstr "" - #: rhodecode/model/notification.py:229 #, python-format +msgid "%(user)s sent message at %(when)s" +msgstr "" + +#: rhodecode/model/notification.py:230 +#, python-format +msgid "%(user)s mentioned you at %(when)s" +msgstr "" + +#: rhodecode/model/notification.py:231 +#, python-format +msgid "%(user)s registered in RhodeCode at %(when)s" +msgstr "" + +#: rhodecode/model/notification.py:232 +#, python-format +msgid "%(user)s opened new pull request at %(when)s" +msgstr "" + +#: rhodecode/model/notification.py:233 +#, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "" -#: rhodecode/model/pull_request.py:104 +#: rhodecode/model/pull_request.py:98 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" msgstr "" -#: rhodecode/model/scm.py:598 +#: rhodecode/model/scm.py:674 msgid "latest tip" msgstr "" @@ -1288,7 +1416,7 @@ #: rhodecode/model/validators.py:89 msgid "" "Username may only contain alphanumeric characters underscores, periods or " -"dashes and must begin with alphanumeric character" +"dashes and must begin with alphanumeric character or underscore" msgstr "" #: rhodecode/model/validators.py:117 @@ -1389,47 +1517,51 @@ msgid "You don't have permissions to create a group in this location" msgstr "" -#: rhodecode/model/validators.py:557 +#: rhodecode/model/validators.py:559 msgid "This username or user group name is not valid" msgstr "" -#: rhodecode/model/validators.py:650 +#: rhodecode/model/validators.py:652 msgid "This is not a valid path" msgstr "" -#: rhodecode/model/validators.py:665 +#: rhodecode/model/validators.py:667 msgid "This e-mail address is already taken" msgstr "" -#: rhodecode/model/validators.py:685 +#: rhodecode/model/validators.py:687 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "" -#: rhodecode/model/validators.py:722 +#: rhodecode/model/validators.py:724 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:735 +#: rhodecode/model/validators.py:737 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" -#: rhodecode/model/validators.py:767 +#: rhodecode/model/validators.py:769 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "" -#: rhodecode/model/validators.py:768 +#: rhodecode/model/validators.py:770 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: rhodecode/model/validators.py:800 +#: rhodecode/model/validators.py:803 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" +#: rhodecode/model/validators.py:817 +msgid "Filename cannot be inside a directory" +msgstr "" + #: rhodecode/templates/index.html:5 msgid "Dashboard" msgstr "" @@ -1471,27 +1603,28 @@ msgid "You have admin right to this group, and can edit it" msgstr "" -#: rhodecode/templates/index_base.html:40 rhodecode/templates/index_base.html:140 +#: rhodecode/templates/index_base.html:40 #: 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 +#: rhodecode/templates/admin/users_groups/users_groups.html:37 msgid "Group name" msgstr "" -#: 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:270 +#: rhodecode/templates/index_base.html:41 rhodecode/templates/index_base.html:123 #: rhodecode/templates/admin/repos/repo_add_base.html:56 -#: rhodecode/templates/admin/repos/repo_edit.html:75 +#: rhodecode/templates/admin/repos/repo_edit.html:68 #: rhodecode/templates/admin/repos/repos.html:73 #: 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/email_templates/changeset_comment.html:9 +#: rhodecode/templates/email_templates/pull_request.html:9 #: rhodecode/templates/forks/fork.html:56 -#: rhodecode/templates/pullrequests/pullrequest.html:101 +#: rhodecode/templates/pullrequests/pullrequest.html:43 +#: rhodecode/templates/pullrequests/pullrequest_show.html:81 #: rhodecode/templates/summary/summary.html:106 msgid "Description" msgstr "" @@ -1499,128 +1632,103 @@ #: 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/repo_edit.html:50 #: 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/index_base.html:121 #: 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_my_account.html:172 -#: rhodecode/templates/base/perms_summary.html:14 -#: rhodecode/templates/bookmarks/bookmarks.html:34 +#: rhodecode/templates/base/perms_summary.html:37 +#: rhodecode/templates/bookmarks/bookmarks.html:48 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 #: 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:193 -#: rhodecode/templates/journal/journal.html:296 +#: rhodecode/templates/journal/journal.html:283 #: 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: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/index_base.html:124 +msgid "Last Change" +msgstr "" + +#: rhodecode/templates/index_base.html:126 #: 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 +#: rhodecode/templates/journal/journal.html:285 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/index_base.html:128 +#: rhodecode/templates/admin/repos/repo_edit.html:114 #: 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:209 -#: rhodecode/templates/index_base.html:296 -#: rhodecode/templates/admin/repos/repos.html:97 -#: rhodecode/templates/admin/users/user_edit_my_account.html:196 +#: rhodecode/templates/index_base.html:136 +#: rhodecode/templates/admin/repos/repos.html:84 +#: rhodecode/templates/admin/users/user_edit_my_account.html:183 #: rhodecode/templates/admin/users/users.html:107 -#: rhodecode/templates/bookmarks/bookmarks.html:58 +#: rhodecode/templates/bookmarks/bookmarks.html:74 #: rhodecode/templates/branches/branches.html:73 -#: rhodecode/templates/journal/journal.html:217 -#: rhodecode/templates/journal/journal.html:320 +#: rhodecode/templates/journal/journal.html:204 +#: rhodecode/templates/journal/journal.html:294 #: rhodecode/templates/tags/tags.html:74 msgid "Click to sort ascending" msgstr "" -#: 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:197 +#: rhodecode/templates/index_base.html:137 +#: rhodecode/templates/admin/repos/repos.html:85 +#: rhodecode/templates/admin/users/user_edit_my_account.html:184 #: rhodecode/templates/admin/users/users.html:108 -#: rhodecode/templates/bookmarks/bookmarks.html:59 +#: rhodecode/templates/bookmarks/bookmarks.html:75 #: rhodecode/templates/branches/branches.html:74 -#: rhodecode/templates/journal/journal.html:218 -#: rhodecode/templates/journal/journal.html:321 +#: rhodecode/templates/journal/journal.html:205 +#: rhodecode/templates/journal/journal.html:295 #: rhodecode/templates/tags/tags.html:75 msgid "Click to sort descending" msgstr "" -#: rhodecode/templates/index_base.html:181 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/index_base.html:138 +msgid "No repositories found." +msgstr "" + +#: rhodecode/templates/index_base.html:139 +#: rhodecode/templates/admin/repos/repos.html:87 +#: rhodecode/templates/admin/users/user_edit_my_account.html:186 #: rhodecode/templates/admin/users/users.html:110 -#: rhodecode/templates/bookmarks/bookmarks.html:61 +#: rhodecode/templates/bookmarks/bookmarks.html:77 #: rhodecode/templates/branches/branches.html:76 -#: rhodecode/templates/journal/journal.html:220 -#: rhodecode/templates/journal/journal.html:323 +#: rhodecode/templates/journal/journal.html:207 +#: rhodecode/templates/journal/journal.html:297 #: rhodecode/templates/tags/tags.html:77 msgid "Data error." msgstr "" -#: rhodecode/templates/index_base.html:213 rhodecode/templates/index_base.html:300 -#: rhodecode/templates/admin/repos/repos.html:101 +#: rhodecode/templates/index_base.html:140 +#: rhodecode/templates/admin/repos/repos.html:88 #: rhodecode/templates/admin/users/user_edit_my_account.html:58 -#: rhodecode/templates/admin/users/user_edit_my_account.html:200 +#: rhodecode/templates/admin/users/user_edit_my_account.html:187 #: rhodecode/templates/admin/users/users.html:111 -#: rhodecode/templates/bookmarks/bookmarks.html:62 +#: rhodecode/templates/bookmarks/bookmarks.html:78 #: rhodecode/templates/branches/branches.html:77 -#: rhodecode/templates/journal/journal.html:221 -#: rhodecode/templates/journal/journal.html:324 +#: rhodecode/templates/journal/journal.html:208 +#: rhodecode/templates/journal/journal.html:298 #: rhodecode/templates/tags/tags.html:78 msgid "Loading..." msgstr "" -#: rhodecode/templates/index_base.html:298 -msgid "No repositories found." -msgstr "" - -#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:227 +#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:239 msgid "Log In" msgstr "" @@ -1635,7 +1743,7 @@ #: 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/base/base.html:215 #: rhodecode/templates/summary/summary.html:123 msgid "Username" msgstr "" @@ -1643,7 +1751,7 @@ #: 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:212 +#: rhodecode/templates/base/base.html:224 msgid "Password" msgstr "" @@ -1659,7 +1767,7 @@ msgid "Forgot your password ?" msgstr "" -#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:223 +#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:235 msgid "Don't have an account ?" msgstr "" @@ -1728,7 +1836,7 @@ #: 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/admin/repos/repo_edit.html:78 #: rhodecode/templates/data_table/_dt_elements.html:61 #: rhodecode/templates/summary/summary.html:77 msgid "Private repository" @@ -1751,12 +1859,12 @@ msgstr "" #: rhodecode/templates/switch_to_list.html:35 -#: rhodecode/templates/bookmarks/bookmarks_data.html:32 +#: rhodecode/templates/bookmarks/bookmarks_data.html:37 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 +#: rhodecode/templates/base/base.html:73 msgid "Admin journal" msgstr "" @@ -1782,9 +1890,9 @@ #: 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/admin/users_groups/users_groups.html:40 #: rhodecode/templates/journal/journal.html:197 -#: rhodecode/templates/journal/journal.html:300 +#: rhodecode/templates/journal/journal.html:287 msgid "Action" msgstr "" @@ -1794,7 +1902,7 @@ msgstr "" #: rhodecode/templates/admin/admin_log.html:8 -#: rhodecode/templates/bookmarks/bookmarks.html:35 +#: rhodecode/templates/bookmarks/bookmarks.html:49 #: rhodecode/templates/bookmarks/bookmarks_data.html:7 #: rhodecode/templates/branches/branches.html:48 #: rhodecode/templates/branches/branches_data.html:7 @@ -1816,19 +1924,18 @@ msgstr "" #: rhodecode/templates/admin/defaults/defaults.html:11 -#: rhodecode/templates/base/base.html:75 +#: rhodecode/templates/base/base.html:80 msgid "Defaults" msgstr "" #: rhodecode/templates/admin/defaults/defaults.html:35 #: rhodecode/templates/admin/repos/repo_add_base.html:38 -#: rhodecode/templates/admin/repos/repo_edit.html:58 msgid "Type" msgstr "" #: rhodecode/templates/admin/defaults/defaults.html:48 #: rhodecode/templates/admin/repos/repo_add_base.html:69 -#: rhodecode/templates/admin/repos/repo_edit.html:89 +#: rhodecode/templates/admin/repos/repo_edit.html:82 #: rhodecode/templates/forks/fork.html:69 msgid "" "Private repositories are only visible to people explicitly added as " @@ -1836,60 +1943,184 @@ msgstr "" #: rhodecode/templates/admin/defaults/defaults.html:55 -#: rhodecode/templates/admin/repos/repo_edit.html:94 +#: rhodecode/templates/admin/repos/repo_edit.html:87 msgid "Enable statistics" msgstr "" #: rhodecode/templates/admin/defaults/defaults.html:59 -#: rhodecode/templates/admin/repos/repo_edit.html:98 +#: rhodecode/templates/admin/repos/repo_edit.html:91 msgid "Enable statistics window on summary page." msgstr "" #: rhodecode/templates/admin/defaults/defaults.html:65 -#: rhodecode/templates/admin/repos/repo_edit.html:103 +#: rhodecode/templates/admin/repos/repo_edit.html:96 msgid "Enable downloads" msgstr "" #: rhodecode/templates/admin/defaults/defaults.html:69 -#: rhodecode/templates/admin/repos/repo_edit.html:107 +#: rhodecode/templates/admin/repos/repo_edit.html:100 msgid "Enable download menu on summary page." msgstr "" #: rhodecode/templates/admin/defaults/defaults.html:75 -#: rhodecode/templates/admin/repos/repo_edit.html:112 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72 +#: rhodecode/templates/admin/repos/repo_edit.html:105 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:64 msgid "Enable locking" msgstr "" #: rhodecode/templates/admin/defaults/defaults.html:79 -#: rhodecode/templates/admin/repos/repo_edit.html:116 +#: rhodecode/templates/admin/repos/repo_edit.html:109 msgid "Enable lock-by-pulling on repository." msgstr "" #: rhodecode/templates/admin/defaults/defaults.html:84 #: rhodecode/templates/admin/ldap/ldap.html:89 -#: rhodecode/templates/admin/permissions/permissions.html:92 -#: 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/permissions/permissions.html:122 +#: rhodecode/templates/admin/repos/repo_edit.html:141 +#: rhodecode/templates/admin/repos/repo_edit.html:166 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:96 #: rhodecode/templates/admin/settings/hooks.html:73 #: 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/admin/users_groups/users_group_edit.html:143 +#: rhodecode/templates/base/default_perms_box.html:53 msgid "Save" msgstr "" +#: rhodecode/templates/admin/gists/index.html:5 +#: rhodecode/templates/base/base.html:299 +msgid "Gists" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:10 +#, python-format +msgid "Private Gists for user %s" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:12 +#, python-format +msgid "Public Gists for user %s" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:14 +msgid "Public Gists" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:31 +#: rhodecode/templates/admin/gists/show.html:24 +#: rhodecode/templates/base/base.html:302 +msgid "Create new gist" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:48 +msgid "Created" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:51 +#: rhodecode/templates/admin/gists/index.html:53 +#: rhodecode/templates/admin/gists/show.html:43 +#: rhodecode/templates/admin/gists/show.html:45 +msgid "Expires" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:51 +#: rhodecode/templates/admin/gists/show.html:43 +msgid "never" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:68 +msgid "There are no gists yet" +msgstr "" + +#: rhodecode/templates/admin/gists/new.html:5 +#: rhodecode/templates/admin/gists/new.html:16 +msgid "New gist" +msgstr "" + +#: rhodecode/templates/admin/gists/new.html:37 +msgid "Gist description ..." +msgstr "" + +#: rhodecode/templates/admin/gists/new.html:52 +msgid "Create private gist" +msgstr "" + +#: rhodecode/templates/admin/gists/new.html:53 +msgid "Create public gist" +msgstr "" + +#: rhodecode/templates/admin/gists/new.html:54 +#: rhodecode/templates/admin/permissions/permissions.html:123 +#: rhodecode/templates/admin/permissions/permissions.html:185 +#: rhodecode/templates/admin/repos/repo_edit.html:142 +#: rhodecode/templates/admin/repos/repo_edit.html:167 +#: rhodecode/templates/admin/repos/repo_edit.html:381 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:73 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:97 +#: rhodecode/templates/admin/settings/settings.html:115 +#: rhodecode/templates/admin/settings/settings.html:196 +#: rhodecode/templates/admin/settings/settings.html:288 +#: rhodecode/templates/admin/users/user_edit.html:141 +#: rhodecode/templates/admin/users/user_edit.html:198 +#: rhodecode/templates/admin/users/user_edit.html:246 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:89 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:144 +#: rhodecode/templates/base/default_perms_box.html:54 +#: rhodecode/templates/files/files_add.html:80 +#: rhodecode/templates/files/files_edit.html:66 +#: rhodecode/templates/pullrequests/pullrequest.html:86 +msgid "Reset" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:5 +msgid "gist" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:9 +msgid "Gist" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:36 +msgid "Public gist" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:38 +msgid "Private gist" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:54 +#: rhodecode/templates/admin/repos/repo_edit.html:299 +#: rhodecode/templates/changeset/changeset_file_comment.html:40 +msgid "Delete" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:54 +msgid "Confirm to delete this gist" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:63 +#: rhodecode/templates/admin/gists/show.html:84 +#: 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/admin/gists/show.html:71 +msgid "created" +msgstr "" + #: rhodecode/templates/admin/ldap/ldap.html:5 msgid "LDAP administration" msgstr "" #: rhodecode/templates/admin/ldap/ldap.html:11 #: rhodecode/templates/admin/users/users.html:86 -#: rhodecode/templates/base/base.html:74 +#: rhodecode/templates/base/base.html:79 msgid "LDAP" msgstr "" @@ -1989,7 +2220,7 @@ msgstr "" #: rhodecode/templates/admin/notifications/show_notification.html:9 -#: rhodecode/templates/base/base.html:241 +#: rhodecode/templates/base/base.html:253 msgid "Notifications" msgstr "" @@ -1998,12 +2229,14 @@ msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:11 +#: rhodecode/templates/admin/repos/repo_edit.html:151 #: 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/repos_groups/repos_groups_edit.html:81 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:88 #: rhodecode/templates/admin/users/user_edit.html:150 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:100 -#: rhodecode/templates/base/base.html:73 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:129 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:136 +#: rhodecode/templates/base/base.html:78 msgid "Permissions" msgstr "" @@ -2024,6 +2257,7 @@ #: rhodecode/templates/admin/permissions/permissions.html:50 #: rhodecode/templates/admin/permissions/permissions.html:63 +#: rhodecode/templates/admin/permissions/permissions.html:77 msgid "Overwrite existing settings" msgstr "" @@ -2035,86 +2269,84 @@ msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:69 -msgid "Registration" -msgstr "" - -#: rhodecode/templates/admin/permissions/permissions.html:77 +msgid "User group" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.html:76 +msgid "" +"All default permissions on each user 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:83 msgid "Repository creation" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:85 +#: rhodecode/templates/admin/permissions/permissions.html:91 +msgid "User group creation" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.html:99 msgid "Repository forking" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:93 -#: 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:80 -#: rhodecode/templates/files/files_edit.html:66 -#: rhodecode/templates/pullrequests/pullrequest.html:110 -msgid "Reset" -msgstr "" - -#: rhodecode/templates/admin/permissions/permissions.html:103 +#: rhodecode/templates/admin/permissions/permissions.html:107 +msgid "Registration" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.html:115 +msgid "External auth account activation" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.html:133 msgid "Default User Permissions" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:113 -#: rhodecode/templates/admin/users/user_edit.html:244 +#: rhodecode/templates/admin/permissions/permissions.html:144 +#: rhodecode/templates/admin/users/user_edit.html:207 msgid "Allowed IP addresses" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:127 -#: rhodecode/templates/admin/repos/repo_edit.html:347 +#: rhodecode/templates/admin/permissions/permissions.html:158 +#: rhodecode/templates/admin/repos/repo_edit.html:340 #: 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/admin/users/user_edit.html:175 +#: rhodecode/templates/admin/users/user_edit.html:220 +#: rhodecode/templates/admin/users_groups/users_groups.html:54 #: rhodecode/templates/data_table/_dt_elements.html:122 -#: rhodecode/templates/data_table/_dt_elements.html:130 +#: rhodecode/templates/data_table/_dt_elements.html:136 msgid "delete" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:128 -#: rhodecode/templates/admin/users/user_edit.html:258 +#: rhodecode/templates/admin/permissions/permissions.html:159 +#: rhodecode/templates/admin/users/user_edit.html:221 #, python-format msgid "Confirm to delete this ip: %s" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:134 -#: rhodecode/templates/admin/users/user_edit.html:264 +#: rhodecode/templates/admin/permissions/permissions.html:165 +#: rhodecode/templates/admin/users/user_edit.html:227 msgid "All IP addresses are allowed" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:145 -#: rhodecode/templates/admin/users/user_edit.html:275 +#: rhodecode/templates/admin/permissions/permissions.html:176 +#: rhodecode/templates/admin/users/user_edit.html:238 msgid "New ip address" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:153 +#: rhodecode/templates/admin/permissions/permissions.html:184 #: 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 +#: rhodecode/templates/admin/repos/repo_edit.html:380 +#: rhodecode/templates/admin/users/user_edit.html:197 +#: rhodecode/templates/admin/users/user_edit.html:245 msgid "Add" msgstr "" #: 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 +#: rhodecode/templates/base/base.html:74 rhodecode/templates/base/base.html:88 +#: rhodecode/templates/base/base.html:116 rhodecode/templates/base/base.html:275 msgid "Repositories" msgstr "" @@ -2129,7 +2361,7 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:24 -#: rhodecode/templates/admin/repos/repo_edit.html:44 +#: rhodecode/templates/admin/repos/repo_edit.html:45 msgid "Optional http[s] url from which repository should be cloned." msgstr "" @@ -2143,19 +2375,19 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:47 -#: rhodecode/templates/admin/repos/repo_edit.html:66 +#: rhodecode/templates/admin/repos/repo_edit.html:59 #: 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/admin/repos/repo_edit.html:63 #: 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/admin/repos/repo_edit.html:72 #: rhodecode/templates/forks/fork.html:60 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" @@ -2167,244 +2399,248 @@ #: 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/base/base.html:81 rhodecode/templates/base/base.html:134 #: rhodecode/templates/summary/summary.html:212 msgid "Settings" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:40 +#: rhodecode/templates/admin/repos/repo_edit.html:36 +msgid "Non-changeable id" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:41 msgid "Clone uri" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:53 +#: rhodecode/templates/admin/repos/repo_edit.html:54 msgid "Optional select a group to put this repository into." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:126 +#: rhodecode/templates/admin/repos/repo_edit.html:119 msgid "Change owner of this repository." msgstr "" +#: rhodecode/templates/admin/repos/repo_edit.html:177 +msgid "Advanced settings" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:180 +msgid "Statistics" +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit.html:184 -msgid "Advanced settings" +msgid "Reset current statistics" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:184 +msgid "Confirm to remove current statistics" msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:187 -msgid "Statistics" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:191 -msgid "Reset current statistics" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:191 -msgid "Confirm to remove current statistics" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:194 msgid "Fetched to rev" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:195 +#: rhodecode/templates/admin/repos/repo_edit.html:188 msgid "Stats gathered" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:203 +#: rhodecode/templates/admin/repos/repo_edit.html:196 msgid "Remote" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:207 +#: rhodecode/templates/admin/repos/repo_edit.html:200 msgid "Pull changes from remote location" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:207 +#: rhodecode/templates/admin/repos/repo_edit.html:200 msgid "Confirm to pull changes from remote side" msgstr "" +#: rhodecode/templates/admin/repos/repo_edit.html:211 +msgid "Cache" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:215 +msgid "Invalidate repository cache" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:215 +msgid "Confirm to invalidate repository cache" +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit.html:218 -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 +#: rhodecode/templates/admin/repos/repo_edit.html:223 msgid "List of cached values" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:233 +#: rhodecode/templates/admin/repos/repo_edit.html:226 msgid "Prefix" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:234 +#: rhodecode/templates/admin/repos/repo_edit.html:227 msgid "Key" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:235 +#: rhodecode/templates/admin/repos/repo_edit.html:228 #: 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 +#: rhodecode/templates/admin/users_groups/users_groups.html:39 msgid "Active" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:250 -#: rhodecode/templates/base/base.html:280 rhodecode/templates/base/base.html:281 +#: rhodecode/templates/admin/repos/repo_edit.html:243 +#: rhodecode/templates/base/base.html:292 rhodecode/templates/base/base.html:293 msgid "Public journal" msgstr "" +#: rhodecode/templates/admin/repos/repo_edit.html:249 +msgid "Remove from public journal" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:251 +msgid "Add to public journal" +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit.html:256 -msgid "Remove from public journal" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:258 -msgid "Add to public journal" -msgstr "" - -#: 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:270 +#: rhodecode/templates/admin/repos/repo_edit.html:263 msgid "Locking" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:275 +#: rhodecode/templates/admin/repos/repo_edit.html:268 msgid "Unlock locked repo" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:275 +#: rhodecode/templates/admin/repos/repo_edit.html:268 msgid "Confirm to unlock repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:278 -msgid "lock repo" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:278 +#: rhodecode/templates/admin/repos/repo_edit.html:271 +msgid "Lock repo" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:271 msgid "Confirm to lock repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:279 +#: rhodecode/templates/admin/repos/repo_edit.html:272 msgid "Repository is not locked" msgstr "" +#: rhodecode/templates/admin/repos/repo_edit.html:277 +msgid "Force locking on repository. Works only when anonymous access is disabled" +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 +#: rhodecode/templates/admin/repos/repo_edit.html:289 +msgid "Set" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:293 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 +#: rhodecode/templates/admin/repos/repo_edit.html:308 msgid "Remove this repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:315 +#: rhodecode/templates/admin/repos/repo_edit.html:308 msgid "Confirm to delete this repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:317 +#: rhodecode/templates/admin/repos/repo_edit.html:310 #, 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 +#: rhodecode/templates/admin/repos/repo_edit.html:311 msgid "Detach forks" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:319 +#: rhodecode/templates/admin/repos/repo_edit.html:312 msgid "Delete forks" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:322 +#: rhodecode/templates/admin/repos/repo_edit.html:315 msgid "" "This repository will be renamed in a special way in order to be 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 +#: rhodecode/templates/admin/repos/repo_edit.html:329 msgid "Extra fields" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:348 +#: rhodecode/templates/admin/repos/repo_edit.html:341 #, python-format msgid "Confirm to delete this field: %s" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:362 +#: rhodecode/templates/admin/repos/repo_edit.html:355 msgid "New field key" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:370 +#: rhodecode/templates/admin/repos/repo_edit.html:363 msgid "New field label" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:373 +#: rhodecode/templates/admin/repos/repo_edit.html:366 msgid "Enter short label" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:379 +#: rhodecode/templates/admin/repos/repo_edit.html:372 msgid "New field description" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:382 +#: rhodecode/templates/admin/repos/repo_edit.html:375 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 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:3 msgid "none" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:4 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:4 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:4 msgid "read" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:5 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:5 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:5 msgid "write" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:6 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:6 msgid "admin" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:7 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:7 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:7 msgid "member" msgstr "" @@ -2416,6 +2652,8 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:28 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:20 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:35 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:20 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:35 msgid "default" msgstr "" @@ -2423,33 +2661,37 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:58 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:25 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:55 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:25 +#: rhodecode/templates/admin/users_groups/user_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:80 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:81 msgid "Add another member" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:97 -#: 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: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:86 -msgid "apply to children" +#: rhodecode/templates/admin/repos/repos.html:86 +#: rhodecode/templates/admin/users/user_edit_my_account.html:185 +#: rhodecode/templates/admin/users/users.html:109 +#: rhodecode/templates/bookmarks/bookmarks.html:76 +#: rhodecode/templates/branches/branches.html:75 +#: rhodecode/templates/journal/journal.html:206 +#: rhodecode/templates/journal/journal.html:296 +#: rhodecode/templates/tags/tags.html:76 +msgid "No records found." msgstr "" #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 +msgid "apply to children" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:88 msgid "" "Set or revoke permission to all children of that group, including non-private" " repositories and other groups" @@ -2475,7 +2717,7 @@ #: 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 +#: rhodecode/templates/base/base.html:75 rhodecode/templates/base/base.html:91 msgid "Repository groups" msgstr "" @@ -2505,7 +2747,7 @@ msgid "Add child group" msgstr "" -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:76 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:68 msgid "" "Enable lock-by-pulling on group. This option will be applied to all other " "groups and repositories inside" @@ -2520,15 +2762,21 @@ msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:64 +#: rhodecode/templates/admin/users_groups/users_groups.html:48 +#: rhodecode/templates/changeset/changeset_file_comment.html:73 +#: rhodecode/templates/changeset/changeset_file_comment.html:171 msgid "Edit" msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:65 +#: rhodecode/templates/admin/users_groups/users_groups.html:49 #: rhodecode/templates/base/perms_summary.html:29 -#: rhodecode/templates/base/perms_summary.html:48 -#: rhodecode/templates/base/perms_summary.html:50 +#: rhodecode/templates/base/perms_summary.html:60 +#: rhodecode/templates/base/perms_summary.html:62 #: rhodecode/templates/data_table/_dt_elements.html:116 #: rhodecode/templates/data_table/_dt_elements.html:117 +#: rhodecode/templates/data_table/_dt_elements.html:130 +#: rhodecode/templates/data_table/_dt_elements.html:131 msgid "edit" msgstr "" @@ -2626,8 +2874,8 @@ msgstr "" #: rhodecode/templates/admin/settings/settings.html:114 -#: rhodecode/templates/admin/settings/settings.html:186 -#: rhodecode/templates/admin/settings/settings.html:277 +#: rhodecode/templates/admin/settings/settings.html:195 +#: rhodecode/templates/admin/settings/settings.html:287 msgid "Save settings" msgstr "" @@ -2640,133 +2888,152 @@ msgstr "" #: rhodecode/templates/admin/settings/settings.html:134 -msgid "Use lightweight dashboard" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:140 msgid "Use repository extra fields" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:147 +#: rhodecode/templates/admin/settings/settings.html:136 +msgid "Allows storing additional customized fields per repository." +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:139 +msgid "Show RhodeCode version" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:141 +msgid "Shows or hides displayed version of RhodeCode in the footer" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:146 +msgid "Dashboard items" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:150 +msgid "Number of items displayed in lightweight dashboard before pagination is shown." +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:155 msgid "Icons" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:152 +#: rhodecode/templates/admin/settings/settings.html:160 msgid "Show public repo icon on repositories" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:156 +#: rhodecode/templates/admin/settings/settings.html:164 msgid "Show private repo icon on repositories" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:163 +#: rhodecode/templates/admin/settings/settings.html:166 +msgid "Show public/private icons next to repositories names" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:172 msgid "Meta-Tagging" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:168 +#: rhodecode/templates/admin/settings/settings.html:177 msgid "Stylify recognised metatags:" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:195 -msgid "VCS settings" -msgstr "" - #: rhodecode/templates/admin/settings/settings.html:204 +msgid "VCS settings" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:213 msgid "Web" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:209 +#: rhodecode/templates/admin/settings/settings.html:218 msgid "Require SSL for vcs operations" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:211 +#: rhodecode/templates/admin/settings/settings.html:220 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:222 -msgid "Update repository after push (hg update)" -msgstr "" - #: rhodecode/templates/admin/settings/settings.html:226 +msgid "Hooks" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:231 +msgid "Update repository after push (hg update)" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:235 msgid "Show repository size after push" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:230 +#: rhodecode/templates/admin/settings/settings.html:239 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:248 -msgid "Enable largefiles extension" +msgid "Log user pull commands" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:247 +msgid "Advanced setup" msgstr "" #: rhodecode/templates/admin/settings/settings.html:252 +msgid "Mercurial Extensions" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:257 +msgid "Enable largefiles extension" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:261 msgid "Enable hgsubversion extension" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:254 +#: rhodecode/templates/admin/settings/settings.html:263 msgid "" "Requires hgsubversion library installed. Allows cloning from svn remote " "locations" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:264 +#: rhodecode/templates/admin/settings/settings.html:274 msgid "Repositories location" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:269 +#: rhodecode/templates/admin/settings/settings.html:279 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:270 -#: rhodecode/templates/base/base.html:131 +"Click to unlock. You must restart RhodeCode in order to make this setting " +"take effect." +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:280 +#: rhodecode/templates/base/base.html:143 msgid "Unlock" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:272 +#: rhodecode/templates/admin/settings/settings.html:282 msgid "" "Location where repositories are stored. After changing this value a restart, " "and rescan is required" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:292 +#: rhodecode/templates/admin/settings/settings.html:303 msgid "Test Email" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:300 +#: rhodecode/templates/admin/settings/settings.html:311 msgid "Email to" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:308 +#: rhodecode/templates/admin/settings/settings.html:319 msgid "Send" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:314 +#: rhodecode/templates/admin/settings/settings.html:325 msgid "System Info and Packages" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:317 -#: rhodecode/templates/changelog/changelog.html:42 +#: rhodecode/templates/admin/settings/settings.html:328 +#: rhodecode/templates/changelog/changelog.html:51 msgid "Show" msgstr "" @@ -2776,7 +3043,7 @@ #: rhodecode/templates/admin/users/user_add.html:10 #: rhodecode/templates/admin/users/user_edit.html:11 -#: rhodecode/templates/base/base.html:71 +#: rhodecode/templates/base/base.html:76 msgid "Users" msgstr "" @@ -2833,44 +3100,21 @@ msgid "New password confirmation" msgstr "" -#: 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:163 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:113 -#, python-format -msgid "" -"Select to inherit permissions from %s settings. With this selected below " -"options does not have any action" -msgstr "" - -#: 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:177 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:127 -msgid "Fork repositories" -msgstr "" - -#: rhodecode/templates/admin/users/user_edit.html:200 msgid "Email addresses" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:213 +#: rhodecode/templates/admin/users/user_edit.html:176 #, python-format msgid "Confirm to delete this email: %s" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:227 +#: rhodecode/templates/admin/users/user_edit.html:190 msgid "New email address" msgstr "" #: rhodecode/templates/admin/users/user_edit_my_account.html:5 -#: rhodecode/templates/base/base.html:242 +#: rhodecode/templates/base/base.html:254 msgid "My account" msgstr "" @@ -2907,7 +3151,7 @@ #: 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_data.html:11 #: rhodecode/templates/pullrequests/pullrequest_show.html:27 #: rhodecode/templates/pullrequests/pullrequest_show.html:42 msgid "Closed" @@ -2927,7 +3171,7 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:42 -#: rhodecode/templates/pullrequests/pullrequest_data.html:11 +#: rhodecode/templates/pullrequests/pullrequest_data.html:8 #, python-format msgid "Pull request #%s opened by %s on %s" msgstr "" @@ -2958,12 +3202,12 @@ #: rhodecode/templates/admin/users_groups/users_group_add.html:10 #: rhodecode/templates/admin/users_groups/users_groups.html:11 -#: rhodecode/templates/base/base.html:72 +#: rhodecode/templates/base/base.html:77 rhodecode/templates/base/base.html:94 msgid "User groups" msgstr "" #: rhodecode/templates/admin/users_groups/users_group_add.html:12 -#: rhodecode/templates/admin/users_groups/users_groups.html:25 +#: rhodecode/templates/admin/users_groups/users_groups.html:26 msgid "Add new user group" msgstr "" @@ -2976,7 +3220,7 @@ msgstr "" #: rhodecode/templates/admin/users_groups/users_group_edit.html:50 -#: rhodecode/templates/admin/users_groups/users_groups.html:35 +#: rhodecode/templates/admin/users_groups/users_groups.html:38 msgid "Members" msgstr "" @@ -2996,45 +3240,53 @@ msgid "Add all elements" msgstr "" -#: rhodecode/templates/admin/users_groups/users_group_edit.html:150 -msgid "Group members" -msgstr "" - -#: rhodecode/templates/admin/users_groups/users_group_edit.html:167 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:109 msgid "No members yet" msgstr "" +#: rhodecode/templates/admin/users_groups/users_group_edit.html:117 +msgid "Global Permissions" +msgstr "" + #: rhodecode/templates/admin/users_groups/users_groups.html:5 msgid "User groups administration" msgstr "" -#: rhodecode/templates/admin/users_groups/users_groups.html:47 +#: rhodecode/templates/admin/users_groups/users_groups.html:55 #, python-format msgid "Confirm to delete this user group: %s" msgstr "" +#: rhodecode/templates/admin/users_groups/users_groups.html:62 +msgid "There are no user groups yet" +msgstr "" + #: rhodecode/templates/base/base.html:42 -msgid "Submit a bug" -msgstr "" - -#: rhodecode/templates/base/base.html:108 +#, python-format +msgid "Server instance: %s" +msgstr "" + +#: rhodecode/templates/base/base.html:52 +msgid "Report a bug" +msgstr "" + +#: rhodecode/templates/base/base.html:121 #: 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:109 -#: rhodecode/templates/changelog/changelog.html:11 +#: rhodecode/templates/base/base.html:122 +#: rhodecode/templates/changelog/changelog.html:15 #: 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:110 +#: rhodecode/templates/base/base.html:123 #: rhodecode/templates/data_table/_dt_elements.html:25 #: rhodecode/templates/data_table/_dt_elements.html:27 #: rhodecode/templates/data_table/_dt_elements.html:29 @@ -3042,46 +3294,42 @@ msgid "Files" msgstr "" -#: rhodecode/templates/base/base.html:112 +#: rhodecode/templates/base/base.html:125 msgid "Switch To" msgstr "" -#: rhodecode/templates/base/base.html:114 rhodecode/templates/base/base.html:267 +#: rhodecode/templates/base/base.html:127 rhodecode/templates/base/base.html:279 msgid "loading..." msgstr "" -#: rhodecode/templates/base/base.html:118 +#: rhodecode/templates/base/base.html:131 msgid "Options" msgstr "" -#: rhodecode/templates/base/base.html:124 +#: rhodecode/templates/base/base.html:137 #: 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/base/base.html:139 rhodecode/templates/base/base.html:312 #: rhodecode/templates/search/search.html:14 #: rhodecode/templates/search/search.html:54 msgid "Search" msgstr "" -#: rhodecode/templates/base/base.html:133 +#: rhodecode/templates/base/base.html:145 msgid "Lock" msgstr "" -#: rhodecode/templates/base/base.html:141 +#: rhodecode/templates/base/base.html:153 msgid "Follow" msgstr "" -#: rhodecode/templates/base/base.html:142 +#: rhodecode/templates/base/base.html:154 msgid "Unfollow" msgstr "" -#: rhodecode/templates/base/base.html:145 +#: rhodecode/templates/base/base.html:157 #: rhodecode/templates/data_table/_dt_elements.html:33 #: rhodecode/templates/data_table/_dt_elements.html:35 #: rhodecode/templates/data_table/_dt_elements.html:37 @@ -3090,60 +3338,113 @@ msgid "Fork" msgstr "" -#: rhodecode/templates/base/base.html:147 +#: rhodecode/templates/base/base.html:159 msgid "Create Pull Request" msgstr "" -#: rhodecode/templates/base/base.html:153 +#: rhodecode/templates/base/base.html:165 msgid "Show Pull Requests" msgstr "" -#: rhodecode/templates/base/base.html:153 +#: rhodecode/templates/base/base.html:165 msgid "Pull Requests" msgstr "" -#: rhodecode/templates/base/base.html:190 +#: rhodecode/templates/base/base.html:202 msgid "Not logged in" msgstr "" -#: rhodecode/templates/base/base.html:197 +#: rhodecode/templates/base/base.html:209 msgid "Login to your account" msgstr "" -#: rhodecode/templates/base/base.html:220 +#: rhodecode/templates/base/base.html:232 msgid "Forgot password ?" msgstr "" -#: rhodecode/templates/base/base.html:243 +#: rhodecode/templates/base/base.html:255 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" +msgid "Switch repository" msgstr "" #: rhodecode/templates/base/base.html:286 +msgid "Show recent activity" +msgstr "" + +#: rhodecode/templates/base/base.html:287 +#: rhodecode/templates/journal/journal.html:4 +msgid "Journal" +msgstr "" + +#: rhodecode/templates/base/base.html:298 +msgid "Show public gists" +msgstr "" + +#: rhodecode/templates/base/base.html:303 +msgid "All public gists" +msgstr "" + +#: rhodecode/templates/base/base.html:305 +msgid "My public gists" +msgstr "" + +#: rhodecode/templates/base/base.html:306 +msgid "My private gists" +msgstr "" + +#: rhodecode/templates/base/base.html:311 msgid "Search in repositories" msgstr "" -#: rhodecode/templates/base/perms_summary.html:8 +#: rhodecode/templates/base/default_perms_box.html:14 +msgid "Inherit default permissions" +msgstr "" + +#: rhodecode/templates/base/default_perms_box.html:18 +#, python-format +msgid "" +"Select to inherit permissions from %s settings. With this selected below " +"options does not apply." +msgstr "" + +#: rhodecode/templates/base/default_perms_box.html:26 +msgid "Create repositories" +msgstr "" + +#: rhodecode/templates/base/default_perms_box.html:30 +msgid "Select this option to allow repository creation for this user" +msgstr "" + +#: rhodecode/templates/base/default_perms_box.html:35 +msgid "Create user groups" +msgstr "" + +#: rhodecode/templates/base/default_perms_box.html:39 +msgid "Select this option to allow user group creation for this user" +msgstr "" + +#: rhodecode/templates/base/default_perms_box.html:44 +msgid "Fork repositories" +msgstr "" + +#: rhodecode/templates/base/default_perms_box.html:48 +msgid "Select this option to allow repository forking for this user" +msgstr "" + +#: rhodecode/templates/base/perms_summary.html:11 msgid "No permissions defined yet" msgstr "" -#: rhodecode/templates/base/perms_summary.html:15 +#: rhodecode/templates/base/perms_summary.html:19 +#: rhodecode/templates/base/perms_summary.html:38 msgid "Permission" msgstr "" -#: rhodecode/templates/base/perms_summary.html:16 +#: rhodecode/templates/base/perms_summary.html:20 +#: rhodecode/templates/base/perms_summary.html:39 msgid "Edit Permission" msgstr "" @@ -3152,7 +3453,7 @@ msgstr "" #: rhodecode/templates/base/root.html:44 -#: rhodecode/templates/data_table/_dt_elements.html:140 +#: rhodecode/templates/data_table/_dt_elements.html:147 msgid "Stop following this repository" msgstr "" @@ -3169,7 +3470,7 @@ msgstr "" #: rhodecode/templates/base/root.html:48 -#: rhodecode/templates/pullrequests/pullrequest.html:181 +#: rhodecode/templates/pullrequests/pullrequest.html:203 msgid "Loading ..." msgstr "" @@ -3182,7 +3483,7 @@ msgstr "" #: rhodecode/templates/base/root.html:51 -#: rhodecode/templates/changelog/changelog.html:36 +#: rhodecode/templates/changelog/changelog.html:45 msgid "Open new pull request" msgstr "" @@ -3211,29 +3512,45 @@ msgid "Expand diff" msgstr "" +#: rhodecode/templates/base/root.html:58 +msgid "Failed to remoke permission" +msgstr "" + #: rhodecode/templates/bookmarks/bookmarks.html:5 #, python-format msgid "%s Bookmarks" msgstr "" -#: rhodecode/templates/bookmarks/bookmarks.html:37 +#: rhodecode/templates/bookmarks/bookmarks.html:26 +msgid "Compare bookmarks" +msgstr "" + +#: rhodecode/templates/bookmarks/bookmarks.html:51 #: rhodecode/templates/bookmarks/bookmarks_data.html:8 #: rhodecode/templates/branches/branches.html:50 #: rhodecode/templates/branches/branches_data.html:8 -#: rhodecode/templates/shortlog/shortlog_data.html:8 +#: rhodecode/templates/changelog/changelog_summary_data.html:8 #: rhodecode/templates/tags/tags.html:51 rhodecode/templates/tags/tags_data.html:8 msgid "Author" msgstr "" -#: rhodecode/templates/bookmarks/bookmarks.html:38 +#: rhodecode/templates/bookmarks/bookmarks.html:52 #: rhodecode/templates/bookmarks/bookmarks_data.html:9 #: rhodecode/templates/branches/branches.html:51 #: rhodecode/templates/branches/branches_data.html:9 -#: rhodecode/templates/shortlog/shortlog_data.html:5 +#: rhodecode/templates/changelog/changelog_summary_data.html:5 #: rhodecode/templates/tags/tags.html:52 rhodecode/templates/tags/tags_data.html:9 msgid "Revision" msgstr "" +#: rhodecode/templates/bookmarks/bookmarks.html:54 +#: rhodecode/templates/bookmarks/bookmarks_data.html:10 +#: rhodecode/templates/branches/branches.html:53 +#: rhodecode/templates/branches/branches_data.html:10 +#: rhodecode/templates/tags/tags.html:54 rhodecode/templates/tags/tags_data.html:10 +msgid "Compare" +msgstr "" + #: rhodecode/templates/branches/branches.html:5 #, python-format msgid "%s Branches" @@ -3243,64 +3560,68 @@ msgid "Compare branches" msgstr "" -#: rhodecode/templates/branches/branches.html:53 -#: rhodecode/templates/branches/branches_data.html:10 -#: rhodecode/templates/tags/tags.html:54 rhodecode/templates/tags/tags_data.html:10 -msgid "Compare" -msgstr "" - #: rhodecode/templates/changelog/changelog.html:6 #, python-format msgid "%s Changelog" msgstr "" -#: rhodecode/templates/changelog/changelog.html:11 +#: rhodecode/templates/changelog/changelog.html:19 #, 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:30 +#: rhodecode/templates/changelog/changelog.html:39 msgid "Clear selection" msgstr "" -#: rhodecode/templates/changelog/changelog.html:33 +#: rhodecode/templates/changelog/changelog.html:42 #: rhodecode/templates/forks/forks_data.html:19 #, python-format msgid "Compare fork with %s" msgstr "" -#: rhodecode/templates/changelog/changelog.html:33 +#: rhodecode/templates/changelog/changelog.html:42 msgid "Compare fork with parent" msgstr "" -#: rhodecode/templates/changelog/changelog.html:76 -#: rhodecode/templates/summary/summary.html:404 +#: rhodecode/templates/changelog/changelog.html:78 +#: rhodecode/templates/changelog/changelog_summary_data.html:28 +#, python-format +msgid "Click to open associated pull request #%s" +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:102 +#: rhodecode/templates/summary/summary.html:403 msgid "Show more" msgstr "" -#: rhodecode/templates/changelog/changelog.html:89 +#: rhodecode/templates/changelog/changelog.html:115 +#: rhodecode/templates/changelog/changelog_summary_data.html:50 +#: rhodecode/templates/changeset/changeset.html:107 #: rhodecode/templates/changeset/changeset_range.html:86 #, python-format msgid "Bookmark %s" msgstr "" -#: rhodecode/templates/changelog/changelog.html:95 -#: rhodecode/templates/changeset/changeset.html:111 +#: rhodecode/templates/changelog/changelog.html:121 +#: rhodecode/templates/changelog/changelog_summary_data.html:56 +#: rhodecode/templates/changeset/changeset.html:113 #: 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:80 +#: rhodecode/templates/changelog/changelog.html:126 +#: rhodecode/templates/changelog/changelog_summary_data.html:61 +#: rhodecode/templates/changeset/changeset.html:117 +#: rhodecode/templates/changeset/changeset_range.html:96 #, python-format msgid "Branch %s" msgstr "" -#: rhodecode/templates/changelog/changelog.html:258 +#: rhodecode/templates/changelog/changelog.html:286 msgid "There are no changes yet" msgstr "" @@ -3329,6 +3650,38 @@ msgid "Affected %s files" msgstr "" +#: rhodecode/templates/changelog/changelog_summary_data.html:6 +#: rhodecode/templates/files/files_add.html:75 +#: rhodecode/templates/files/files_edit.html:61 +msgid "Commit message" +msgstr "" + +#: rhodecode/templates/changelog/changelog_summary_data.html:7 +msgid "Age" +msgstr "" + +#: rhodecode/templates/changelog/changelog_summary_data.html:9 +msgid "Refs" +msgstr "" + +#: rhodecode/templates/changelog/changelog_summary_data.html:86 +msgid "Add or upload files directly via RhodeCode" +msgstr "" + +#: rhodecode/templates/changelog/changelog_summary_data.html:89 +#: rhodecode/templates/files/files_add.html:38 +#: rhodecode/templates/files/files_browser.html:31 +msgid "Add new file" +msgstr "" + +#: rhodecode/templates/changelog/changelog_summary_data.html:95 +msgid "Push new repo" +msgstr "" + +#: rhodecode/templates/changelog/changelog_summary_data.html:103 +msgid "Existing repository?" +msgstr "" + #: rhodecode/templates/changeset/changeset.html:6 #, python-format msgid "%s Changeset" @@ -3349,7 +3702,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset.html:67 -#: rhodecode/templates/changeset/diff_block.html:23 +#: rhodecode/templates/changeset/diff_block.html:22 msgid "Raw diff" msgstr "" @@ -3358,12 +3711,12 @@ msgstr "" #: rhodecode/templates/changeset/changeset.html:69 -#: rhodecode/templates/changeset/diff_block.html:24 +#: rhodecode/templates/changeset/diff_block.html:23 msgid "Download diff" msgstr "" #: rhodecode/templates/changeset/changeset.html:73 -#: rhodecode/templates/changeset/changeset_file_comment.html:97 +#: rhodecode/templates/changeset/changeset_file_comment.html:103 #, python-format msgid "%d comment" msgid_plural "%d comments" @@ -3371,7 +3724,7 @@ msgstr[1] "" #: rhodecode/templates/changeset/changeset.html:73 -#: rhodecode/templates/changeset/changeset_file_comment.html:97 +#: rhodecode/templates/changeset/changeset_file_comment.html:103 #, python-format msgid "(%d inline)" msgid_plural "(%d inline)" @@ -3379,11 +3732,11 @@ msgstr[1] "" #: rhodecode/templates/changeset/changeset.html:103 -#: rhodecode/templates/changeset/changeset_range.html:77 +#: rhodecode/templates/changeset/changeset_range.html:82 msgid "merge" msgstr "" -#: rhodecode/templates/changeset/changeset.html:119 +#: rhodecode/templates/changeset/changeset.html:126 #: rhodecode/templates/compare/compare_diff.html:40 #: rhodecode/templates/pullrequests/pullrequest_show.html:113 #, python-format @@ -3392,7 +3745,7 @@ msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/changeset/changeset.html:121 +#: rhodecode/templates/changeset/changeset.html:128 #: rhodecode/templates/compare/compare_diff.html:42 #: rhodecode/templates/pullrequests/pullrequest_show.html:115 #, python-format @@ -3401,15 +3754,15 @@ msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/changeset/changeset.html:134 -#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/changeset/changeset.html:141 +#: rhodecode/templates/changeset/changeset.html:153 #: 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/changeset/changeset.html:141 +#: rhodecode/templates/changeset/changeset.html:153 #: rhodecode/templates/compare/compare_diff.html:58 #: rhodecode/templates/compare/compare_diff.html:69 #: rhodecode/templates/pullrequests/pullrequest_show.html:131 @@ -3427,51 +3780,63 @@ msgid "Comment on pull request #%s" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:57 +#: rhodecode/templates/changeset/changeset_file_comment.html:55 msgid "Submitting..." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:60 +#: rhodecode/templates/changeset/changeset_file_comment.html:58 msgid "Commenting on line {1}." msgstr "" +#: rhodecode/templates/changeset/changeset_file_comment.html:59 +#: rhodecode/templates/changeset/changeset_file_comment.html:145 +#, python-format +msgid "Comments parsed using %s syntax with %s support." +msgstr "" + #: rhodecode/templates/changeset/changeset_file_comment.html:61 -#: 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:141 +#: rhodecode/templates/changeset/changeset_file_comment.html:147 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:161 +#: rhodecode/templates/changeset/changeset_file_comment.html:65 +#: rhodecode/templates/changeset/changeset_file_comment.html:152 +msgid "Preview" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:72 +#: rhodecode/templates/changeset/changeset_file_comment.html:170 +msgid "Comment preview" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:80 +#: rhodecode/templates/changeset/changeset_file_comment.html:177 +#: rhodecode/templates/email_templates/changeset_comment.html:16 +#: rhodecode/templates/email_templates/pull_request_comment.html:16 msgid "Comment" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:75 +#: rhodecode/templates/changeset/changeset_file_comment.html:81 msgid "Cancel" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:82 +#: rhodecode/templates/changeset/changeset_file_comment.html:88 msgid "You need to be logged in to comment." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:82 +#: rhodecode/templates/changeset/changeset_file_comment.html:88 msgid "Login now" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:86 +#: rhodecode/templates/changeset/changeset_file_comment.html:92 msgid "Hide" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:143 +#: rhodecode/templates/changeset/changeset_file_comment.html:149 msgid "Change status" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:163 +#: rhodecode/templates/changeset/changeset_file_comment.html:179 msgid "Comment and close" msgstr "" @@ -3484,19 +3849,19 @@ msgid "Files affected" msgstr "" -#: rhodecode/templates/changeset/diff_block.html:22 +#: rhodecode/templates/changeset/diff_block.html:21 msgid "Show full diff for this file" msgstr "" -#: rhodecode/templates/changeset/diff_block.html:30 +#: rhodecode/templates/changeset/diff_block.html:29 msgid "Show inline comments" msgstr "" -#: rhodecode/templates/changeset/diff_block.html:55 +#: rhodecode/templates/changeset/diff_block.html:53 msgid "Show file at latest version in this repo" msgstr "" -#: rhodecode/templates/changeset/diff_block.html:56 +#: rhodecode/templates/changeset/diff_block.html:54 msgid "Show file at initial version in this repo" msgstr "" @@ -3571,27 +3936,24 @@ msgid "Confirm to delete this repository: %s" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.html:131 +#: rhodecode/templates/data_table/_dt_elements.html:137 #, python-format msgid "Confirm to delete this user: %s" 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" +#: rhodecode/templates/email_templates/changeset_comment.html:4 +#: rhodecode/templates/email_templates/pull_request.html:4 +#: rhodecode/templates/email_templates/pull_request_comment.html:4 +msgid "URL" +msgstr "" + +#: rhodecode/templates/email_templates/changeset_comment.html:6 +#, python-format +msgid "%s commented on a %s changeset." msgstr "" #: rhodecode/templates/email_templates/changeset_comment.html:14 -msgid "Repo" -msgstr "" - -#: rhodecode/templates/email_templates/changeset_comment.html:16 -msgid "desc" +msgid "The changeset status was changed to" msgstr "" #: rhodecode/templates/email_templates/main.html:8 @@ -3611,45 +3973,36 @@ msgid "You can generate it by clicking following URL" msgstr "" -#: 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 -#, python-format -msgid "User %s opened pull request for repository %s and wants you to review changes." -msgstr "" - -#: rhodecode/templates/email_templates/pull_request.html:5 -msgid "View this pull request here" +#: rhodecode/templates/email_templates/password_reset.html:10 +msgid "Please ignore this email if you did not request a new password ." msgstr "" #: rhodecode/templates/email_templates/pull_request.html:6 -msgid "title" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request.html:7 -msgid "description" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request.html:12 -msgid "revisions for reviewing" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.html:3 +#, python-format +msgid "%s opened a pull request for repository %s and wants you to review changes." +msgstr "" + +#: rhodecode/templates/email_templates/pull_request.html:8 +#: rhodecode/templates/pullrequests/pullrequest.html:34 +#: rhodecode/templates/pullrequests/pullrequest_data.html:14 +#: rhodecode/templates/pullrequests/pullrequest_show.html:25 +msgid "Title" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.html:6 #, python-format -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 -msgid "A new user have registered in RhodeCode" -msgstr "" - -#: rhodecode/templates/email_templates/registration.html:9 +msgid "%s commented on pull request \"%s\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.html:10 +msgid "Pull request was closed with status" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.html:12 +msgid "Pull request changed status" +msgstr "" + +#: rhodecode/templates/email_templates/registration.html:6 msgid "View this user here" msgstr "" @@ -3675,7 +4028,6 @@ #: 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 "" @@ -3688,12 +4040,6 @@ 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:43 msgid "File Name" msgstr "" @@ -3722,12 +4068,6 @@ msgid "use / to separate directories" msgstr "" -#: 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:79 #: rhodecode/templates/files/files_edit.html:65 msgid "Commit changes" @@ -3791,12 +4131,6 @@ 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:26 msgid "Download as raw" @@ -3985,36 +4319,47 @@ msgid "New pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:52 -msgid "Detailed compare view" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest.html:56 +#: rhodecode/templates/pullrequests/pullrequest.html:25 +msgid "Create new pull request" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest.html:47 +msgid "Write a short description on this pull request" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest.html:53 +msgid "Changeset flow" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest.html:60 +#: rhodecode/templates/pullrequests/pullrequest_show.html:65 +msgid "Origin repository" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest.html:85 +msgid "Send pull request" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest.html:94 #: rhodecode/templates/pullrequests/pullrequest_show.html:137 msgid "Pull request reviewers" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:65 +#: rhodecode/templates/pullrequests/pullrequest.html:103 #: rhodecode/templates/pullrequests/pullrequest_show.html:149 msgid "owner" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:77 +#: rhodecode/templates/pullrequests/pullrequest.html:115 msgid "Add reviewer to this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:83 -msgid "Create new pull request" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest.html:92 -#: rhodecode/templates/pullrequests/pullrequest_data.html:14 -#: rhodecode/templates/pullrequests/pullrequest_show.html:25 -msgid "Title" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest.html:109 -msgid "Send pull request" +#: rhodecode/templates/pullrequests/pullrequest.html:129 +msgid "Detailed compare view" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest.html:150 +msgid "Destination repository" msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.html:4 @@ -4045,10 +4390,6 @@ 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:89 msgid "Created on" msgstr "" @@ -4109,37 +4450,6 @@ msgid "Permission denied" msgstr "" -#: rhodecode/templates/shortlog/shortlog.html:5 -#, python-format -msgid "%s Lightweight Changelog" -msgstr "" - -#: rhodecode/templates/shortlog/shortlog.html:11 -#: rhodecode/templates/shortlog/shortlog.html:15 -msgid "Lightweight Changelog" -msgstr "" - -#: rhodecode/templates/shortlog/shortlog_data.html:7 -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" -msgstr "" - -#: rhodecode/templates/shortlog/shortlog_data.html:84 -msgid "Push new repo" -msgstr "" - -#: rhodecode/templates/shortlog/shortlog_data.html:92 -msgid "Existing repository?" -msgstr "" - #: rhodecode/templates/summary/summary.html:4 #, python-format msgid "%s Summary" @@ -4178,7 +4488,7 @@ msgid "Fork of" msgstr "" -#: rhodecode/templates/summary/summary.html:96 +#: rhodecode/templates/summary/summary.html:97 msgid "Remote clone" msgstr "" @@ -4204,8 +4514,7 @@ #: rhodecode/templates/summary/summary.html:151 #: rhodecode/templates/summary/summary.html:167 -#: rhodecode/templates/summary/summary.html:232 -msgid "enable" +msgid "Enable" msgstr "" #: rhodecode/templates/summary/summary.html:159 @@ -4220,7 +4529,7 @@ msgid "Downloads are disabled for this repository" msgstr "" -#: rhodecode/templates/summary/summary.html:171 +#: rhodecode/templates/summary/summary.html:170 msgid "Download as zip" msgstr "" @@ -4245,6 +4554,10 @@ msgid "Commit activity by day / author" msgstr "" +#: rhodecode/templates/summary/summary.html:232 +msgid "enable" +msgstr "" + #: rhodecode/templates/summary/summary.html:235 msgid "Stats gathered: " msgstr "" @@ -4259,51 +4572,47 @@ #: rhodecode/templates/summary/summary.html:272 #, python-format -msgid "Readme file at revision '%s'" -msgstr "" - -#: rhodecode/templates/summary/summary.html:275 -msgid "Permalink to this readme" -msgstr "" - -#: rhodecode/templates/summary/summary.html:333 +msgid "Readme file from revision %s" +msgstr "" + +#: rhodecode/templates/summary/summary.html:332 #, python-format msgid "Download %s as %s" msgstr "" -#: rhodecode/templates/summary/summary.html:380 +#: rhodecode/templates/summary/summary.html:379 msgid "files" msgstr "" +#: rhodecode/templates/summary/summary.html:689 +msgid "commits" +msgstr "" + #: rhodecode/templates/summary/summary.html:690 -msgid "commits" +msgid "files added" msgstr "" #: rhodecode/templates/summary/summary.html:691 -msgid "files added" +msgid "files changed" msgstr "" #: rhodecode/templates/summary/summary.html:692 -msgid "files changed" -msgstr "" - -#: rhodecode/templates/summary/summary.html:693 msgid "files removed" msgstr "" +#: rhodecode/templates/summary/summary.html:694 +msgid "commit" +msgstr "" + #: rhodecode/templates/summary/summary.html:695 -msgid "commit" +msgid "file added" msgstr "" #: rhodecode/templates/summary/summary.html:696 -msgid "file added" +msgid "file changed" msgstr "" #: rhodecode/templates/summary/summary.html:697 -msgid "file changed" -msgstr "" - -#: rhodecode/templates/summary/summary.html:698 msgid "file removed" msgstr "" diff -r 14afe4d1363d -r 8ddf35e02d05 rhodecode/model/validators.py --- a/rhodecode/model/validators.py Sat Jun 01 01:03:31 2013 +0200 +++ b/rhodecode/model/validators.py Sat Jun 01 18:03:44 2013 +0200 @@ -87,8 +87,8 @@ _(u'Username "%(username)s" is forbidden'), 'invalid_username': _(u'Username may only contain alphanumeric characters ' - 'underscores, periods or dashes and must begin with ' - 'alphanumeric character or underscore') + 'underscores, periods or dashes and must begin with ' + 'alphanumeric character or underscore') } def validate_python(self, value, state):