Mercurial > kallithea
changeset 3033:0cbbbad17a7e beta
General translation updates.
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Tue, 27 Nov 2012 20:56:57 +0100 |
| parents | 133b117efe0e |
| children | a8ea7cbc6a87 |
| files | rhodecode/i18n/en/LC_MESSAGES/rhodecode.po rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po rhodecode/i18n/rhodecode.pot rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po |
| diffstat | 8 files changed, 9602 insertions(+), 8312 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/i18n/en/LC_MESSAGES/rhodecode.po Mon Nov 26 20:39:45 2012 +0100 +++ b/rhodecode/i18n/en/LC_MESSAGES/rhodecode.po Tue Nov 27 20:56:57 2012 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: rhodecode 0.1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-09-02 20:30+0200\n" +"POT-Creation-Date: 2012-11-27 20:56+0100\n" "PO-Revision-Date: 2011-02-25 19:13+0100\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: en <LL@li.org>\n" @@ -17,35 +17,37 @@ "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -#: rhodecode/controllers/changelog.py:94 +#: rhodecode/controllers/changelog.py:95 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:157 +#: rhodecode/controllers/changeset.py:164 #, python-format msgid "%s line context" msgstr "" -#: rhodecode/controllers/changeset.py:333 -#: rhodecode/controllers/changeset.py:348 rhodecode/lib/diffs.py:70 -msgid "binary file" -msgstr "" - -#: rhodecode/controllers/changeset.py:408 +#: rhodecode/controllers/changeset.py:315 +#: rhodecode/controllers/pullrequests.py:411 +#, python-format +msgid "Status change -> %s" +msgstr "" + +#: rhodecode/controllers/changeset.py:346 msgid "" "Changing status on a changeset associated witha closed pull request is " "not allowed" msgstr "" -#: rhodecode/controllers/compare.py:69 +#: rhodecode/controllers/compare.py:75 +#: rhodecode/controllers/pullrequests.py:117 msgid "There are no changesets yet" msgstr "" @@ -75,99 +77,109 @@ "fulfilling the request." msgstr "" -#: rhodecode/controllers/feed.py:49 +#: rhodecode/controllers/feed.py:52 #, python-format msgid "Changes on %s repository" msgstr "" -#: rhodecode/controllers/feed.py:50 +#: rhodecode/controllers/feed.py:53 #, python-format msgid "%s %s feed" msgstr "" -#: rhodecode/controllers/feed.py:75 +#: rhodecode/controllers/feed.py:86 +#: rhodecode/templates/changeset/changeset.html:126 +#: rhodecode/templates/changeset/changeset.html:138 +#: rhodecode/templates/compare/compare_diff.html:62 +#: rhodecode/templates/compare/compare_diff.html:73 +#: rhodecode/templates/pullrequests/pullrequest_show.html:94 +#: rhodecode/templates/pullrequests/pullrequest_show.html:153 +msgid "Changeset was too big and was cut off..." +msgstr "" + +#: rhodecode/controllers/feed.py:92 msgid "commited on" msgstr "" -#: rhodecode/controllers/files.py:84 +#: rhodecode/controllers/files.py:86 msgid "click here to add new file" msgstr "" -#: rhodecode/controllers/files.py:85 +#: rhodecode/controllers/files.py:87 #, python-format msgid "There are no files yet %s" msgstr "" -#: rhodecode/controllers/files.py:239 rhodecode/controllers/files.py:299 +#: rhodecode/controllers/files.py:265 rhodecode/controllers/files.py:325 #, python-format msgid "This repository is has been locked by %s on %s" msgstr "" -#: rhodecode/controllers/files.py:266 +#: rhodecode/controllers/files.py:292 #, python-format msgid "Edited %s via RhodeCode" msgstr "" -#: rhodecode/controllers/files.py:271 +#: rhodecode/controllers/files.py:297 msgid "No changes" msgstr "" -#: rhodecode/controllers/files.py:282 rhodecode/controllers/files.py:346 +#: rhodecode/controllers/files.py:308 rhodecode/controllers/files.py:372 #, python-format msgid "Successfully committed to %s" msgstr "" -#: rhodecode/controllers/files.py:287 rhodecode/controllers/files.py:352 +#: rhodecode/controllers/files.py:313 rhodecode/controllers/files.py:378 msgid "Error occurred during commit" msgstr "" -#: rhodecode/controllers/files.py:318 +#: rhodecode/controllers/files.py:344 #, python-format msgid "Added %s via RhodeCode" msgstr "" -#: rhodecode/controllers/files.py:332 +#: rhodecode/controllers/files.py:358 msgid "No content" msgstr "" -#: rhodecode/controllers/files.py:336 +#: rhodecode/controllers/files.py:362 msgid "No filename" msgstr "" -#: rhodecode/controllers/files.py:378 +#: rhodecode/controllers/files.py:404 msgid "downloads disabled" msgstr "" -#: rhodecode/controllers/files.py:389 +#: rhodecode/controllers/files.py:415 #, python-format msgid "Unknown revision %s" msgstr "" -#: rhodecode/controllers/files.py:391 +#: rhodecode/controllers/files.py:417 msgid "Empty repository" msgstr "" -#: rhodecode/controllers/files.py:393 +#: rhodecode/controllers/files.py:419 msgid "Unknown archive type" msgstr "" -#: rhodecode/controllers/files.py:494 +#: rhodecode/controllers/files.py:564 #: rhodecode/templates/changeset/changeset_range.html:13 #: rhodecode/templates/changeset/changeset_range.html:31 msgid "Changesets" msgstr "" -#: rhodecode/controllers/files.py:495 rhodecode/controllers/pullrequests.py:72 -#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:543 +#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:76 +#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:550 msgid "Branches" msgstr "" -#: rhodecode/controllers/files.py:496 rhodecode/controllers/pullrequests.py:76 -#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:554 +#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:80 +#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:561 msgid "Tags" msgstr "" -#: rhodecode/controllers/forks.py:73 rhodecode/controllers/admin/repos.py:90 +#: rhodecode/controllers/forks.py:74 rhodecode/controllers/admin/repos.py:91 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -175,7 +187,7 @@ "repositories" msgstr "" -#: rhodecode/controllers/forks.py:133 rhodecode/controllers/settings.py:72 +#: rhodecode/controllers/forks.py:134 rhodecode/controllers/settings.py:73 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -183,22 +195,22 @@ "repositories" msgstr "" -#: rhodecode/controllers/forks.py:167 +#: rhodecode/controllers/forks.py:168 #, python-format msgid "forked %s repository as %s" msgstr "" -#: rhodecode/controllers/forks.py:181 +#: rhodecode/controllers/forks.py:182 #, python-format msgid "An error occurred during repository forking %s" msgstr "" -#: rhodecode/controllers/journal.py:202 rhodecode/controllers/journal.py:239 -msgid "public journal" -msgstr "" - #: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243 -#: rhodecode/templates/base/base.html:220 +msgid "public journal" +msgstr "" + +#: rhodecode/controllers/journal.py:210 rhodecode/controllers/journal.py:247 +#: rhodecode/templates/base/base.html:232 msgid "journal" msgstr "" @@ -216,56 +228,56 @@ "email" msgstr "" -#: rhodecode/controllers/pullrequests.py:74 rhodecode/model/scm.py:549 +#: rhodecode/controllers/pullrequests.py:78 rhodecode/model/scm.py:556 msgid "Bookmarks" msgstr "" -#: rhodecode/controllers/pullrequests.py:158 +#: rhodecode/controllers/pullrequests.py:186 msgid "Pull request requires a title with min. 3 chars" msgstr "" -#: rhodecode/controllers/pullrequests.py:160 +#: rhodecode/controllers/pullrequests.py:188 msgid "error during creation of pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:181 +#: rhodecode/controllers/pullrequests.py:220 msgid "Successfully opened new pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:184 +#: rhodecode/controllers/pullrequests.py:223 msgid "Error occurred during sending pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:217 +#: rhodecode/controllers/pullrequests.py:256 msgid "Successfully deleted pull request" msgstr "" -#: rhodecode/controllers/search.py:131 +#: rhodecode/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "" -#: rhodecode/controllers/search.py:136 +#: rhodecode/controllers/search.py:139 msgid "There is no index to search in. Please run whoosh indexer" msgstr "" -#: rhodecode/controllers/search.py:140 +#: rhodecode/controllers/search.py:143 msgid "An error occurred during this search operation" msgstr "" -#: rhodecode/controllers/settings.py:107 -#: rhodecode/controllers/admin/repos.py:266 +#: rhodecode/controllers/settings.py:108 +#: rhodecode/controllers/admin/repos.py:267 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: rhodecode/controllers/settings.py:125 -#: rhodecode/controllers/admin/repos.py:284 +#: rhodecode/controllers/settings.py:126 +#: rhodecode/controllers/admin/repos.py:285 #, python-format msgid "error occurred during update of repository %s" msgstr "" -#: rhodecode/controllers/settings.py:143 -#: rhodecode/controllers/admin/repos.py:302 +#: rhodecode/controllers/settings.py:144 +#: rhodecode/controllers/admin/repos.py:303 #, python-format msgid "" "%s repository is not mapped to db perhaps it was moved or renamed from " @@ -273,25 +285,43 @@ "repositories" msgstr "" -#: rhodecode/controllers/settings.py:155 -#: rhodecode/controllers/admin/repos.py:314 +#: rhodecode/controllers/settings.py:156 +#: rhodecode/controllers/admin/repos.py:315 #, python-format msgid "deleted repository %s" msgstr "" -#: rhodecode/controllers/settings.py:159 -#: rhodecode/controllers/admin/repos.py:324 -#: rhodecode/controllers/admin/repos.py:330 +#: rhodecode/controllers/settings.py:160 +#: rhodecode/controllers/admin/repos.py:325 +#: rhodecode/controllers/admin/repos.py:331 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: rhodecode/controllers/summary.py:138 +#: rhodecode/controllers/settings.py:179 +msgid "unlocked" +msgstr "" + +#: rhodecode/controllers/settings.py:182 +msgid "locked" +msgstr "" + +#: rhodecode/controllers/settings.py:184 +#, python-format +msgid "Repository has been %s" +msgstr "" + +#: rhodecode/controllers/settings.py:188 +#: rhodecode/controllers/admin/repos.py:423 +msgid "An error occurred during unlocking" +msgstr "" + +#: rhodecode/controllers/summary.py:140 msgid "No data loaded yet" msgstr "" -#: rhodecode/controllers/summary.py:142 -#: rhodecode/templates/summary/summary.html:148 +#: rhodecode/controllers/summary.py:144 +#: rhodecode/templates/summary/summary.html:157 msgid "Statistics are disabled for this repository" msgstr "" @@ -376,15 +406,15 @@ #: rhodecode/templates/admin/settings/settings.html:9 #: rhodecode/templates/admin/users/user_add.html:8 #: rhodecode/templates/admin/users/user_edit.html:9 -#: rhodecode/templates/admin/users/user_edit.html:122 +#: rhodecode/templates/admin/users/user_edit.html:126 #: rhodecode/templates/admin/users/users.html:9 #: rhodecode/templates/admin/users_groups/users_group_add.html:8 #: rhodecode/templates/admin/users_groups/users_group_edit.html:9 #: rhodecode/templates/admin/users_groups/users_groups.html:9 #: rhodecode/templates/base/base.html:197 -#: rhodecode/templates/base/base.html:337 -#: rhodecode/templates/base/base.html:339 -#: rhodecode/templates/base/base.html:341 +#: rhodecode/templates/base/base.html:349 +#: rhodecode/templates/base/base.html:351 +#: rhodecode/templates/base/base.html:353 msgid "Admin" msgstr "" @@ -418,187 +448,183 @@ msgid "error occurred during update of permissions" msgstr "" -#: rhodecode/controllers/admin/repos.py:123 +#: rhodecode/controllers/admin/repos.py:124 msgid "--REMOVE FORK--" msgstr "" -#: rhodecode/controllers/admin/repos.py:192 +#: rhodecode/controllers/admin/repos.py:193 #, python-format msgid "created repository %s from %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:196 +#: rhodecode/controllers/admin/repos.py:197 #, python-format msgid "created repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:227 +#: rhodecode/controllers/admin/repos.py:228 #, python-format msgid "error occurred during creation of repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:319 +#: rhodecode/controllers/admin/repos.py:320 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:348 +#: rhodecode/controllers/admin/repos.py:349 msgid "An error occurred during deletion of repository user" msgstr "" -#: rhodecode/controllers/admin/repos.py:367 +#: rhodecode/controllers/admin/repos.py:368 msgid "An error occurred during deletion of repository users groups" msgstr "" -#: rhodecode/controllers/admin/repos.py:385 +#: rhodecode/controllers/admin/repos.py:386 msgid "An error occurred during deletion of repository stats" msgstr "" -#: rhodecode/controllers/admin/repos.py:402 +#: rhodecode/controllers/admin/repos.py:403 msgid "An error occurred during cache invalidation" msgstr "" -#: rhodecode/controllers/admin/repos.py:422 -msgid "An error occurred during unlocking" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:442 +#: rhodecode/controllers/admin/repos.py:443 msgid "Updated repository visibility in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:446 +#: rhodecode/controllers/admin/repos.py:447 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:451 rhodecode/model/validators.py:299 +#: rhodecode/controllers/admin/repos.py:452 rhodecode/model/validators.py:300 msgid "Token mismatch" msgstr "" -#: rhodecode/controllers/admin/repos.py:464 +#: rhodecode/controllers/admin/repos.py:465 msgid "Pulled from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:466 +#: rhodecode/controllers/admin/repos.py:467 msgid "An error occurred during pull from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:482 +#: rhodecode/controllers/admin/repos.py:483 msgid "Nothing" msgstr "" -#: rhodecode/controllers/admin/repos.py:484 +#: rhodecode/controllers/admin/repos.py:485 #, python-format msgid "Marked repo %s as fork of %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:488 +#: rhodecode/controllers/admin/repos.py:489 msgid "An error occurred during this operation" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:116 +#: rhodecode/controllers/admin/repos_groups.py:120 #, python-format msgid "created repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:129 +#: rhodecode/controllers/admin/repos_groups.py:133 #, python-format msgid "error occurred during creation of repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:163 +#: rhodecode/controllers/admin/repos_groups.py:167 #, python-format msgid "updated repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:176 +#: rhodecode/controllers/admin/repos_groups.py:180 #, python-format msgid "error occurred during update of repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:194 +#: rhodecode/controllers/admin/repos_groups.py:198 #, python-format msgid "This group contains %s repositores and cannot be deleted" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:202 +#: rhodecode/controllers/admin/repos_groups.py:206 #, python-format msgid "removed repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:208 +#: rhodecode/controllers/admin/repos_groups.py:212 msgid "Cannot delete this group it still contains subgroups" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:213 -#: rhodecode/controllers/admin/repos_groups.py:218 +#: rhodecode/controllers/admin/repos_groups.py:217 +#: rhodecode/controllers/admin/repos_groups.py:222 #, python-format msgid "error occurred during deletion of repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:238 +#: rhodecode/controllers/admin/repos_groups.py:243 msgid "An error occurred during deletion of group user" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:258 +#: rhodecode/controllers/admin/repos_groups.py:264 msgid "An error occurred during deletion of group users groups" msgstr "" -#: rhodecode/controllers/admin/settings.py:121 +#: rhodecode/controllers/admin/settings.py:123 #, python-format msgid "Repositories successfully rescanned added: %s,removed: %s" msgstr "" -#: rhodecode/controllers/admin/settings.py:129 +#: rhodecode/controllers/admin/settings.py:131 msgid "Whoosh reindex task scheduled" msgstr "" -#: rhodecode/controllers/admin/settings.py:160 +#: rhodecode/controllers/admin/settings.py:162 msgid "Updated application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:164 -#: rhodecode/controllers/admin/settings.py:275 +#: rhodecode/controllers/admin/settings.py:166 +#: rhodecode/controllers/admin/settings.py:299 msgid "error occurred during updating application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:200 +#: rhodecode/controllers/admin/settings.py:207 msgid "Updated visualisation settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:205 +#: rhodecode/controllers/admin/settings.py:212 msgid "error occurred during updating visualisation settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:271 +#: rhodecode/controllers/admin/settings.py:295 msgid "Updated VCS settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:285 +#: rhodecode/controllers/admin/settings.py:309 msgid "Added new hook" msgstr "" -#: rhodecode/controllers/admin/settings.py:297 +#: rhodecode/controllers/admin/settings.py:321 msgid "Updated hooks" msgstr "" -#: rhodecode/controllers/admin/settings.py:301 +#: rhodecode/controllers/admin/settings.py:325 msgid "error occurred during hook creation" msgstr "" -#: rhodecode/controllers/admin/settings.py:320 +#: rhodecode/controllers/admin/settings.py:344 msgid "Email task created" msgstr "" -#: rhodecode/controllers/admin/settings.py:375 +#: rhodecode/controllers/admin/settings.py:399 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/controllers/admin/settings.py:406 +#: rhodecode/controllers/admin/settings.py:430 msgid "Your account was updated successfully" msgstr "" -#: rhodecode/controllers/admin/settings.py:421 -#: rhodecode/controllers/admin/users.py:191 +#: rhodecode/controllers/admin/settings.py:445 +#: rhodecode/controllers/admin/users.py:196 #, python-format msgid "error occurred during update of user %s" msgstr "" @@ -613,97 +639,97 @@ msgid "error occurred during creation of user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:171 +#: rhodecode/controllers/admin/users.py:176 msgid "User updated successfully" msgstr "" -#: rhodecode/controllers/admin/users.py:207 -msgid "successfully deleted user" -msgstr "" - #: rhodecode/controllers/admin/users.py:212 +msgid "successfully deleted user" +msgstr "" + +#: rhodecode/controllers/admin/users.py:217 msgid "An error occurred during deletion of user" msgstr "" -#: rhodecode/controllers/admin/users.py:226 +#: rhodecode/controllers/admin/users.py:231 msgid "You can't edit this user" msgstr "" -#: rhodecode/controllers/admin/users.py:266 +#: rhodecode/controllers/admin/users.py:272 msgid "Granted 'repository create' permission to user" msgstr "" -#: rhodecode/controllers/admin/users.py:271 -msgid "Revoked 'repository create' permission to user" -msgstr "" - #: rhodecode/controllers/admin/users.py:277 +msgid "Revoked 'repository create' permission to user" +msgstr "" + +#: rhodecode/controllers/admin/users.py:283 msgid "Granted 'repository fork' permission to user" msgstr "" -#: rhodecode/controllers/admin/users.py:282 -msgid "Revoked 'repository fork' permission to user" -msgstr "" - #: rhodecode/controllers/admin/users.py:288 -#: rhodecode/controllers/admin/users_groups.py:255 +msgid "Revoked 'repository fork' permission to user" +msgstr "" + +#: rhodecode/controllers/admin/users.py:294 +#: rhodecode/controllers/admin/users_groups.py:279 msgid "An error occurred during permissions saving" msgstr "" -#: rhodecode/controllers/admin/users.py:303 -#, python-format -msgid "Added email %s to user" -msgstr "" - #: rhodecode/controllers/admin/users.py:309 +#, python-format +msgid "Added email %s to user" +msgstr "" + +#: rhodecode/controllers/admin/users.py:315 msgid "An error occurred during email saving" msgstr "" -#: rhodecode/controllers/admin/users.py:319 +#: rhodecode/controllers/admin/users.py:325 msgid "Removed email from user" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:84 +#: rhodecode/controllers/admin/users_groups.py:86 #, python-format msgid "created users group %s" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:95 +#: rhodecode/controllers/admin/users_groups.py:97 #, python-format msgid "error occurred during creation of users group %s" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:135 +#: rhodecode/controllers/admin/users_groups.py:164 #, python-format msgid "updated users group %s" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:157 +#: rhodecode/controllers/admin/users_groups.py:186 #, python-format msgid "error occurred during update of users group %s" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:174 +#: rhodecode/controllers/admin/users_groups.py:203 msgid "successfully deleted users group" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:179 +#: rhodecode/controllers/admin/users_groups.py:208 msgid "An error occurred during deletion of users group" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:233 +#: rhodecode/controllers/admin/users_groups.py:257 msgid "Granted 'repository create' permission to users group" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:238 +#: rhodecode/controllers/admin/users_groups.py:262 msgid "Revoked 'repository create' permission to users group" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:244 +#: rhodecode/controllers/admin/users_groups.py:268 msgid "Granted 'repository fork' permission to users group" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:249 +#: rhodecode/controllers/admin/users_groups.py:273 msgid "Revoked 'repository fork' permission to users group" msgstr "" @@ -715,206 +741,231 @@ msgid "You need to be a signed in to view this page" msgstr "" -#: rhodecode/lib/diffs.py:86 +#: rhodecode/lib/diffs.py:74 +msgid "binary file" +msgstr "" + +#: rhodecode/lib/diffs.py:90 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: rhodecode/lib/diffs.py:96 +#: rhodecode/lib/diffs.py:100 msgid "No changes detected" msgstr "" -#: rhodecode/lib/helpers.py:372 +#: rhodecode/lib/helpers.py:373 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "" -#: rhodecode/lib/helpers.py:484 +#: rhodecode/lib/helpers.py:485 msgid "True" msgstr "" -#: rhodecode/lib/helpers.py:488 +#: rhodecode/lib/helpers.py:489 msgid "False" msgstr "" +#: rhodecode/lib/helpers.py:529 +#, python-format +msgid "Deleted branch: %s" +msgstr "" + #: rhodecode/lib/helpers.py:532 +#, python-format +msgid "Created tag: %s" +msgstr "" + +#: rhodecode/lib/helpers.py:545 msgid "Changeset not found" msgstr "" -#: rhodecode/lib/helpers.py:555 +#: rhodecode/lib/helpers.py:588 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: rhodecode/lib/helpers.py:561 +#: rhodecode/lib/helpers.py:594 msgid "compare view" msgstr "" -#: rhodecode/lib/helpers.py:581 +#: rhodecode/lib/helpers.py:614 msgid "and" msgstr "" -#: rhodecode/lib/helpers.py:582 +#: rhodecode/lib/helpers.py:615 #, python-format msgid "%s more" msgstr "" -#: rhodecode/lib/helpers.py:583 rhodecode/templates/changelog/changelog.html:48 +#: rhodecode/lib/helpers.py:616 rhodecode/templates/changelog/changelog.html:51 msgid "revisions" msgstr "" -#: rhodecode/lib/helpers.py:606 -msgid "fork name " -msgstr "" - -#: rhodecode/lib/helpers.py:620 +#: rhodecode/lib/helpers.py:640 +#, python-format +msgid "fork name %s" +msgstr "" + +#: rhodecode/lib/helpers.py:653 #: rhodecode/templates/pullrequests/pullrequest_show.html:4 #: rhodecode/templates/pullrequests/pullrequest_show.html:12 #, python-format msgid "Pull request #%s" msgstr "" -#: rhodecode/lib/helpers.py:626 +#: rhodecode/lib/helpers.py:659 msgid "[deleted] repository" msgstr "" -#: rhodecode/lib/helpers.py:628 rhodecode/lib/helpers.py:638 +#: rhodecode/lib/helpers.py:661 rhodecode/lib/helpers.py:671 msgid "[created] repository" msgstr "" -#: rhodecode/lib/helpers.py:630 +#: rhodecode/lib/helpers.py:663 msgid "[created] repository as fork" msgstr "" -#: rhodecode/lib/helpers.py:632 rhodecode/lib/helpers.py:640 +#: rhodecode/lib/helpers.py:665 rhodecode/lib/helpers.py:673 msgid "[forked] repository" msgstr "" -#: rhodecode/lib/helpers.py:634 rhodecode/lib/helpers.py:642 +#: rhodecode/lib/helpers.py:667 rhodecode/lib/helpers.py:675 msgid "[updated] repository" msgstr "" -#: rhodecode/lib/helpers.py:636 +#: rhodecode/lib/helpers.py:669 msgid "[delete] repository" msgstr "" -#: rhodecode/lib/helpers.py:644 +#: rhodecode/lib/helpers.py:677 msgid "[created] user" msgstr "" -#: rhodecode/lib/helpers.py:646 +#: rhodecode/lib/helpers.py:679 msgid "[updated] user" msgstr "" -#: rhodecode/lib/helpers.py:648 +#: rhodecode/lib/helpers.py:681 msgid "[created] users group" msgstr "" -#: rhodecode/lib/helpers.py:650 +#: rhodecode/lib/helpers.py:683 msgid "[updated] users group" msgstr "" -#: rhodecode/lib/helpers.py:652 +#: rhodecode/lib/helpers.py:685 msgid "[commented] on revision in repository" msgstr "" -#: rhodecode/lib/helpers.py:654 +#: rhodecode/lib/helpers.py:687 msgid "[commented] on pull request for" msgstr "" -#: rhodecode/lib/helpers.py:656 +#: rhodecode/lib/helpers.py:689 msgid "[closed] pull request for" msgstr "" -#: rhodecode/lib/helpers.py:658 +#: rhodecode/lib/helpers.py:691 msgid "[pushed] into" msgstr "" -#: rhodecode/lib/helpers.py:660 +#: rhodecode/lib/helpers.py:693 msgid "[committed via RhodeCode] into repository" msgstr "" -#: rhodecode/lib/helpers.py:662 +#: rhodecode/lib/helpers.py:695 msgid "[pulled from remote] into repository" msgstr "" -#: rhodecode/lib/helpers.py:664 +#: rhodecode/lib/helpers.py:697 msgid "[pulled] from" msgstr "" -#: rhodecode/lib/helpers.py:666 +#: rhodecode/lib/helpers.py:699 msgid "[started following] repository" msgstr "" -#: rhodecode/lib/helpers.py:668 +#: rhodecode/lib/helpers.py:701 msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/helpers.py:840 +#: rhodecode/lib/helpers.py:877 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:844 +#: rhodecode/lib/helpers.py:881 msgid "No Files" msgstr "" -#: rhodecode/lib/utils2.py:335 +#: rhodecode/lib/utils2.py:403 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:336 +#: rhodecode/lib/utils2.py:404 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:337 +#: rhodecode/lib/utils2.py:405 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:338 +#: rhodecode/lib/utils2.py:406 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:339 +#: rhodecode/lib/utils2.py:407 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:340 +#: rhodecode/lib/utils2.py:408 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:355 +#: rhodecode/lib/utils2.py:424 +#, python-format +msgid "in %s" +msgstr "" + +#: rhodecode/lib/utils2.py:426 #, python-format msgid "%s ago" msgstr "" -#: rhodecode/lib/utils2.py:357 +#: rhodecode/lib/utils2.py:428 +#, python-format +msgid "in %s and %s" +msgstr "" + +#: rhodecode/lib/utils2.py:431 #, python-format msgid "%s and %s ago" msgstr "" -#: rhodecode/lib/utils2.py:360 +#: rhodecode/lib/utils2.py:434 msgid "just now" msgstr "" -#: rhodecode/lib/celerylib/tasks.py:269 +#: rhodecode/lib/celerylib/tasks.py:270 msgid "password reset link" msgstr "" @@ -923,87 +974,87 @@ msgid "on line %s" msgstr "" -#: rhodecode/model/comment.py:157 +#: rhodecode/model/comment.py:173 msgid "[Mention]" msgstr "" -#: rhodecode/model/db.py:1140 +#: rhodecode/model/db.py:1163 msgid "Repository no access" msgstr "" -#: rhodecode/model/db.py:1141 +#: rhodecode/model/db.py:1164 msgid "Repository read access" msgstr "" -#: rhodecode/model/db.py:1142 +#: rhodecode/model/db.py:1165 msgid "Repository write access" msgstr "" -#: rhodecode/model/db.py:1143 +#: rhodecode/model/db.py:1166 msgid "Repository admin access" msgstr "" -#: rhodecode/model/db.py:1145 +#: rhodecode/model/db.py:1168 msgid "Repositories Group no access" msgstr "" -#: rhodecode/model/db.py:1146 +#: rhodecode/model/db.py:1169 msgid "Repositories Group read access" msgstr "" -#: rhodecode/model/db.py:1147 +#: rhodecode/model/db.py:1170 msgid "Repositories Group write access" msgstr "" -#: rhodecode/model/db.py:1148 +#: rhodecode/model/db.py:1171 msgid "Repositories Group admin access" msgstr "" -#: rhodecode/model/db.py:1150 +#: rhodecode/model/db.py:1173 msgid "RhodeCode Administrator" msgstr "" -#: rhodecode/model/db.py:1151 +#: rhodecode/model/db.py:1174 msgid "Repository creation disabled" msgstr "" -#: rhodecode/model/db.py:1152 +#: rhodecode/model/db.py:1175 msgid "Repository creation enabled" msgstr "" -#: rhodecode/model/db.py:1153 +#: rhodecode/model/db.py:1176 msgid "Repository forking disabled" msgstr "" -#: rhodecode/model/db.py:1154 +#: rhodecode/model/db.py:1177 msgid "Repository forking enabled" msgstr "" -#: rhodecode/model/db.py:1155 +#: rhodecode/model/db.py:1178 msgid "Register disabled" msgstr "" -#: rhodecode/model/db.py:1156 +#: rhodecode/model/db.py:1179 msgid "Register new user with RhodeCode with manual activation" msgstr "" -#: rhodecode/model/db.py:1159 +#: rhodecode/model/db.py:1182 msgid "Register new user with RhodeCode with auto activation" msgstr "" -#: rhodecode/model/db.py:1579 +#: rhodecode/model/db.py:1623 msgid "Not Reviewed" msgstr "" -#: rhodecode/model/db.py:1580 +#: rhodecode/model/db.py:1624 msgid "Approved" msgstr "" -#: rhodecode/model/db.py:1581 +#: rhodecode/model/db.py:1625 msgid "Rejected" msgstr "" -#: rhodecode/model/db.py:1582 +#: rhodecode/model/db.py:1626 msgid "Under Review" msgstr "" @@ -1026,35 +1077,41 @@ msgstr "" #: rhodecode/model/notification.py:220 -msgid "commented on commit" +#, python-format +msgid "commented on commit at %(when)s" msgstr "" #: rhodecode/model/notification.py:221 -msgid "sent message" +#, python-format +msgid "sent message at %(when)s" msgstr "" #: rhodecode/model/notification.py:222 -msgid "mentioned you" +#, python-format +msgid "mentioned you at %(when)s" msgstr "" #: rhodecode/model/notification.py:223 -msgid "registered in RhodeCode" +#, python-format +msgid "registered in RhodeCode at %(when)s" msgstr "" #: rhodecode/model/notification.py:224 -msgid "opened new pull request" +#, python-format +msgid "opened new pull request at %(when)s" msgstr "" #: rhodecode/model/notification.py:225 -msgid "commented on pull request" -msgstr "" - -#: rhodecode/model/pull_request.py:84 +#, python-format +msgid "commented on pull request at %(when)s" +msgstr "" + +#: rhodecode/model/pull_request.py:90 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s" msgstr "" -#: rhodecode/model/scm.py:535 +#: rhodecode/model/scm.py:542 msgid "latest tip" msgstr "" @@ -1062,152 +1119,156 @@ msgid "new user registration" msgstr "" -#: rhodecode/model/user.py:255 rhodecode/model/user.py:277 -#: rhodecode/model/user.py:299 +#: rhodecode/model/user.py:255 rhodecode/model/user.py:279 +#: rhodecode/model/user.py:301 msgid "You can't Edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:323 +#: rhodecode/model/user.py:325 msgid "You can't remove this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:329 +#: rhodecode/model/user.py:331 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories. %s" msgstr "" -#: rhodecode/model/validators.py:35 rhodecode/model/validators.py:36 +#: rhodecode/model/validators.py:36 rhodecode/model/validators.py:37 msgid "Value cannot be an empty list" msgstr "" -#: rhodecode/model/validators.py:82 +#: rhodecode/model/validators.py:83 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "" -#: rhodecode/model/validators.py:84 +#: rhodecode/model/validators.py:85 #, python-format msgid "Username \"%(username)s\" is forbidden" msgstr "" -#: rhodecode/model/validators.py:86 +#: rhodecode/model/validators.py:87 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with alphanumeric character" msgstr "" -#: rhodecode/model/validators.py:114 +#: rhodecode/model/validators.py:115 #, python-format msgid "Username %(username)s is not valid" msgstr "" -#: rhodecode/model/validators.py:133 -msgid "Invalid users group name" -msgstr "" - #: rhodecode/model/validators.py:134 +msgid "Invalid users group name" +msgstr "" + +#: rhodecode/model/validators.py:135 #, python-format msgid "Users group \"%(usersgroup)s\" already exists" msgstr "" -#: rhodecode/model/validators.py:136 +#: rhodecode/model/validators.py:137 msgid "" "users group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" -#: rhodecode/model/validators.py:174 +#: rhodecode/model/validators.py:175 msgid "Cannot assign this group as parent" msgstr "" -#: rhodecode/model/validators.py:175 +#: rhodecode/model/validators.py:176 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "" -#: rhodecode/model/validators.py:177 +#: rhodecode/model/validators.py:178 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: rhodecode/model/validators.py:235 +#: rhodecode/model/validators.py:236 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: rhodecode/model/validators.py:250 +#: rhodecode/model/validators.py:251 msgid "Passwords do not match" msgstr "" -#: rhodecode/model/validators.py:267 -msgid "invalid password" -msgstr "" - #: rhodecode/model/validators.py:268 -msgid "invalid user name" +msgid "invalid password" msgstr "" #: rhodecode/model/validators.py:269 +msgid "invalid user name" +msgstr "" + +#: rhodecode/model/validators.py:270 msgid "Your account is disabled" msgstr "" -#: rhodecode/model/validators.py:313 +#: rhodecode/model/validators.py:314 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "" -#: rhodecode/model/validators.py:315 -#, python-format -msgid "Repository named %(repo)s already exists" -msgstr "" - #: rhodecode/model/validators.py:316 #, python-format +msgid "Repository named %(repo)s already exists" +msgstr "" + +#: rhodecode/model/validators.py:317 +#, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: rhodecode/model/validators.py:318 +#: rhodecode/model/validators.py:319 #, python-format msgid "Repositories group with name \"%(repo)s\" already exists" msgstr "" -#: rhodecode/model/validators.py:431 -msgid "invalid clone url" -msgstr "" - #: rhodecode/model/validators.py:432 +msgid "invalid clone url" +msgstr "" + +#: rhodecode/model/validators.py:433 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" msgstr "" -#: rhodecode/model/validators.py:457 +#: rhodecode/model/validators.py:458 msgid "Fork have to be the same type as parent" msgstr "" -#: rhodecode/model/validators.py:478 +#: rhodecode/model/validators.py:473 +msgid "You don't have permissions to create repository in this group" +msgstr "" + +#: rhodecode/model/validators.py:498 msgid "This username or users group name is not valid" msgstr "" -#: rhodecode/model/validators.py:562 +#: rhodecode/model/validators.py:582 msgid "This is not a valid path" msgstr "" -#: rhodecode/model/validators.py:577 -msgid "This e-mail address is already taken" -msgstr "" - #: rhodecode/model/validators.py:597 +msgid "This e-mail address is already taken" +msgstr "" + +#: rhodecode/model/validators.py:617 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "" -#: rhodecode/model/validators.py:634 +#: rhodecode/model/validators.py:654 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:653 +#: rhodecode/model/validators.py:673 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" @@ -1230,7 +1291,7 @@ #: rhodecode/templates/index_base.html:6 #: rhodecode/templates/admin/repos/repos.html:9 -#: rhodecode/templates/base/base.html:221 +#: rhodecode/templates/base/base.html:233 msgid "repositories" msgstr "" @@ -1241,6 +1302,7 @@ msgstr "" #: rhodecode/templates/index_base.html:29 +#: rhodecode/templates/index_base.html:136 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:32 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:32 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:33 @@ -1250,9 +1312,10 @@ msgstr "" #: rhodecode/templates/index_base.html:30 -#: rhodecode/templates/index_base.html:71 -#: rhodecode/templates/index_base.html:142 -#: rhodecode/templates/index_base.html:168 +#: rhodecode/templates/index_base.html:72 +#: rhodecode/templates/index_base.html:138 +#: rhodecode/templates/index_base.html:176 +#: rhodecode/templates/index_base.html:266 #: rhodecode/templates/admin/repos/repo_add_base.html:56 #: rhodecode/templates/admin/repos/repo_edit.html:75 #: rhodecode/templates/admin/repos/repos.html:72 @@ -1261,142 +1324,137 @@ #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34 #: rhodecode/templates/forks/fork.html:59 #: rhodecode/templates/settings/repo_settings.html:66 -#: rhodecode/templates/summary/summary.html:105 +#: rhodecode/templates/summary/summary.html:114 msgid "Description" msgstr "" #: rhodecode/templates/index_base.html:40 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:47 msgid "Repositories group" msgstr "" -#: rhodecode/templates/index_base.html:70 -#: rhodecode/templates/index_base.html:166 +#: rhodecode/templates/index_base.html:71 +#: rhodecode/templates/index_base.html:174 +#: rhodecode/templates/index_base.html:264 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:32 #: rhodecode/templates/admin/repos/repos.html:70 -#: rhodecode/templates/admin/users/user_edit.html:192 +#: rhodecode/templates/admin/users/user_edit.html:196 #: rhodecode/templates/admin/users/user_edit_my_account.html:59 -#: rhodecode/templates/admin/users/user_edit_my_account.html:157 -#: rhodecode/templates/admin/users/user_edit_my_account.html:193 +#: rhodecode/templates/admin/users/user_edit_my_account.html:180 +#: rhodecode/templates/admin/users/user_edit_my_account.html:216 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:184 #: rhodecode/templates/bookmarks/bookmarks.html:36 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 -#: rhodecode/templates/branches/branches.html:51 +#: rhodecode/templates/branches/branches.html:50 +#: rhodecode/templates/branches/branches_data.html:6 #: rhodecode/templates/files/files_browser.html:47 -#: rhodecode/templates/journal/journal.html:59 -#: rhodecode/templates/journal/journal.html:107 -#: rhodecode/templates/journal/journal.html:186 +#: rhodecode/templates/journal/journal.html:62 +#: rhodecode/templates/journal/journal.html:168 +#: rhodecode/templates/journal/journal_page_repos.html:7 #: rhodecode/templates/settings/repo_settings.html:31 #: rhodecode/templates/summary/summary.html:43 -#: rhodecode/templates/summary/summary.html:123 -#: rhodecode/templates/tags/tags.html:36 +#: rhodecode/templates/summary/summary.html:132 +#: rhodecode/templates/tags/tags.html:51 #: rhodecode/templates/tags/tags_data.html:6 msgid "Name" msgstr "" -#: rhodecode/templates/index_base.html:72 -msgid "Last change" -msgstr "" - #: rhodecode/templates/index_base.html:73 -#: rhodecode/templates/index_base.html:171 -#: rhodecode/templates/admin/users/user_edit_my_account.html:159 -#: rhodecode/templates/journal/journal.html:188 -msgid "Tip" +msgid "Last change" msgstr "" #: rhodecode/templates/index_base.html:74 -#: rhodecode/templates/index_base.html:173 +#: rhodecode/templates/index_base.html:179 +#: rhodecode/templates/admin/users/user_edit_my_account.html:182 +#: rhodecode/templates/journal/journal.html:170 +msgid "Tip" +msgstr "" + +#: rhodecode/templates/index_base.html:75 +#: rhodecode/templates/index_base.html:181 +#: rhodecode/templates/index_base.html:269 #: rhodecode/templates/admin/repos/repo_edit.html:121 #: rhodecode/templates/admin/repos/repos.html:73 msgid "Owner" msgstr "" -#: rhodecode/templates/index_base.html:75 -#: rhodecode/templates/summary/summary.html:48 -#: rhodecode/templates/summary/summary.html:51 -msgid "RSS" -msgstr "" - #: rhodecode/templates/index_base.html:76 +#: rhodecode/templates/summary/summary.html:48 +#: rhodecode/templates/summary/summary.html:51 +msgid "RSS" +msgstr "" + +#: rhodecode/templates/index_base.html:77 msgid "Atom" msgstr "" -#: rhodecode/templates/index_base.html:110 -#: rhodecode/templates/index_base.html:112 -#, python-format -msgid "Subscribe to %s rss feed" -msgstr "" - -#: rhodecode/templates/index_base.html:117 -#: rhodecode/templates/index_base.html:119 -#, python-format -msgid "Subscribe to %s atom feed" -msgstr "" - -#: rhodecode/templates/index_base.html:140 -msgid "Group Name" -msgstr "" - -#: rhodecode/templates/index_base.html:158 -#: rhodecode/templates/index_base.html:198 +#: rhodecode/templates/index_base.html:167 +#: rhodecode/templates/index_base.html:207 +#: rhodecode/templates/index_base.html:291 #: rhodecode/templates/admin/repos/repos.html:94 -#: rhodecode/templates/admin/users/user_edit_my_account.html:179 +#: rhodecode/templates/admin/users/user_edit_my_account.html:202 #: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:60 -#: rhodecode/templates/branches/branches.html:77 -#: rhodecode/templates/journal/journal.html:211 -#: rhodecode/templates/tags/tags.html:60 +#: rhodecode/templates/branches/branches.html:76 +#: rhodecode/templates/journal/journal.html:193 +#: rhodecode/templates/tags/tags.html:77 msgid "Click to sort ascending" msgstr "" -#: rhodecode/templates/index_base.html:159 -#: rhodecode/templates/index_base.html:199 +#: rhodecode/templates/index_base.html:168 +#: rhodecode/templates/index_base.html:208 +#: rhodecode/templates/index_base.html:292 #: rhodecode/templates/admin/repos/repos.html:95 -#: rhodecode/templates/admin/users/user_edit_my_account.html:180 +#: rhodecode/templates/admin/users/user_edit_my_account.html:203 #: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:61 -#: rhodecode/templates/branches/branches.html:78 -#: rhodecode/templates/journal/journal.html:212 -#: rhodecode/templates/tags/tags.html:61 +#: rhodecode/templates/branches/branches.html:77 +#: rhodecode/templates/journal/journal.html:194 +#: rhodecode/templates/tags/tags.html:78 msgid "Click to sort descending" msgstr "" -#: rhodecode/templates/index_base.html:169 +#: rhodecode/templates/index_base.html:177 +#: rhodecode/templates/index_base.html:267 msgid "Last Change" msgstr "" -#: rhodecode/templates/index_base.html:200 +#: rhodecode/templates/index_base.html:209 +#: rhodecode/templates/index_base.html:293 #: rhodecode/templates/admin/repos/repos.html:96 -#: rhodecode/templates/admin/users/user_edit_my_account.html:181 +#: rhodecode/templates/admin/users/user_edit_my_account.html:204 #: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:62 -#: rhodecode/templates/branches/branches.html:79 -#: rhodecode/templates/journal/journal.html:213 -#: rhodecode/templates/tags/tags.html:62 +#: rhodecode/templates/branches/branches.html:78 +#: rhodecode/templates/journal/journal.html:195 +#: rhodecode/templates/tags/tags.html:79 msgid "No records found." msgstr "" -#: rhodecode/templates/index_base.html:201 +#: rhodecode/templates/index_base.html:210 +#: rhodecode/templates/index_base.html:294 #: rhodecode/templates/admin/repos/repos.html:97 -#: rhodecode/templates/admin/users/user_edit_my_account.html:182 +#: rhodecode/templates/admin/users/user_edit_my_account.html:205 #: rhodecode/templates/admin/users/users.html:110 #: rhodecode/templates/bookmarks/bookmarks.html:63 -#: rhodecode/templates/branches/branches.html:80 -#: rhodecode/templates/journal/journal.html:214 -#: rhodecode/templates/tags/tags.html:63 +#: rhodecode/templates/branches/branches.html:79 +#: rhodecode/templates/journal/journal.html:196 +#: rhodecode/templates/tags/tags.html:80 msgid "Data error." msgstr "" -#: rhodecode/templates/index_base.html:202 +#: rhodecode/templates/index_base.html:211 +#: rhodecode/templates/index_base.html:295 #: rhodecode/templates/admin/repos/repos.html:98 -#: rhodecode/templates/admin/users/user_edit_my_account.html:183 +#: rhodecode/templates/admin/users/user_edit_my_account.html:206 #: rhodecode/templates/admin/users/users.html:111 #: rhodecode/templates/bookmarks/bookmarks.html:64 -#: rhodecode/templates/branches/branches.html:81 -#: rhodecode/templates/journal/journal.html:215 -#: rhodecode/templates/tags/tags.html:64 +#: rhodecode/templates/branches/branches.html:80 +#: rhodecode/templates/journal/journal.html:54 +#: rhodecode/templates/journal/journal.html:197 +#: rhodecode/templates/tags/tags.html:81 msgid "Loading..." msgstr "" @@ -1414,7 +1472,7 @@ #: rhodecode/templates/admin/users/user_edit.html:50 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:26 #: rhodecode/templates/base/base.html:83 -#: rhodecode/templates/summary/summary.html:122 +#: rhodecode/templates/summary/summary.html:131 msgid "Username" msgstr "" @@ -1471,23 +1529,23 @@ #: rhodecode/templates/register.html:47 #: rhodecode/templates/admin/users/user_add.html:59 -#: rhodecode/templates/admin/users/user_edit.html:86 +#: rhodecode/templates/admin/users/user_edit.html:90 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:53 msgid "First Name" msgstr "" #: rhodecode/templates/register.html:56 #: rhodecode/templates/admin/users/user_add.html:68 -#: rhodecode/templates/admin/users/user_edit.html:95 +#: rhodecode/templates/admin/users/user_edit.html:99 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:62 msgid "Last Name" msgstr "" #: rhodecode/templates/register.html:65 #: rhodecode/templates/admin/users/user_add.html:77 -#: rhodecode/templates/admin/users/user_edit.html:104 +#: rhodecode/templates/admin/users/user_edit.html:108 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:71 -#: rhodecode/templates/summary/summary.html:124 +#: rhodecode/templates/summary/summary.html:133 msgid "Email" msgstr "" @@ -1527,7 +1585,7 @@ msgstr "" #: rhodecode/templates/switch_to_list.html:22 -#: rhodecode/templates/tags/tags_data.html:33 +#: rhodecode/templates/tags/tags_data.html:38 msgid "There are no tags yet" msgstr "" @@ -1550,8 +1608,8 @@ #: rhodecode/templates/admin/repos/repos.html:74 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:9 -#: rhodecode/templates/journal/journal.html:61 -#: rhodecode/templates/journal/journal.html:62 +#: rhodecode/templates/journal/journal_page_repos.html:9 +#: rhodecode/templates/journal/journal_page_repos.html:10 msgid "Action" msgstr "" @@ -1562,8 +1620,9 @@ #: rhodecode/templates/admin/admin_log.html:8 #: rhodecode/templates/bookmarks/bookmarks.html:37 #: rhodecode/templates/bookmarks/bookmarks_data.html:7 -#: rhodecode/templates/branches/branches.html:52 -#: rhodecode/templates/tags/tags.html:37 +#: rhodecode/templates/branches/branches.html:51 +#: rhodecode/templates/branches/branches_data.html:7 +#: rhodecode/templates/tags/tags.html:52 #: rhodecode/templates/tags/tags_data.html:7 msgid "Date" msgstr "" @@ -1572,7 +1631,7 @@ msgid "From IP" msgstr "" -#: rhodecode/templates/admin/admin_log.html:53 +#: rhodecode/templates/admin/admin_log.html:57 msgid "No actions yet" msgstr "" @@ -1652,8 +1711,8 @@ #: rhodecode/templates/admin/repos/repo_edit.html:141 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74 #: rhodecode/templates/admin/settings/hooks.html:73 -#: rhodecode/templates/admin/users/user_edit.html:129 -#: rhodecode/templates/admin/users/user_edit.html:174 +#: rhodecode/templates/admin/users/user_edit.html:133 +#: rhodecode/templates/admin/users/user_edit.html:178 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:79 #: rhodecode/templates/admin/users_groups/users_group_edit.html:135 #: rhodecode/templates/settings/repo_settings.html:93 @@ -1675,8 +1734,8 @@ msgstr "" #: rhodecode/templates/admin/notifications/notifications.html:31 -#: rhodecode/templates/base/base.html:254 -#: rhodecode/templates/base/base.html:256 +#: rhodecode/templates/base/base.html:266 +#: rhodecode/templates/base/base.html:268 msgid "Pull requests" msgstr "" @@ -1704,7 +1763,7 @@ #: rhodecode/templates/admin/permissions/permissions.html:11 #: rhodecode/templates/admin/repos/repo_edit.html:134 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58 -#: rhodecode/templates/admin/users/user_edit.html:139 +#: rhodecode/templates/admin/users/user_edit.html:143 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100 #: rhodecode/templates/settings/repo_settings.html:86 msgid "Permissions" @@ -1746,7 +1805,7 @@ msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:78 -#: rhodecode/templates/admin/repos/repo_edit.html:241 +#: rhodecode/templates/admin/repos/repo_edit.html:264 msgid "set" msgstr "" @@ -1766,8 +1825,8 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:20 -#: rhodecode/templates/summary/summary.html:95 -#: rhodecode/templates/summary/summary.html:96 +#: rhodecode/templates/summary/summary.html:104 +#: rhodecode/templates/summary/summary.html:105 msgid "Clone from" msgstr "" @@ -1843,12 +1902,14 @@ #: rhodecode/templates/admin/repos/repo_edit.html:13 #: rhodecode/templates/admin/users/user_edit.html:13 -#: rhodecode/templates/admin/users/user_edit.html:224 -#: rhodecode/templates/admin/users/user_edit.html:226 +#: rhodecode/templates/admin/users/user_edit.html:228 +#: rhodecode/templates/admin/users/user_edit.html:230 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13 -#: rhodecode/templates/files/files_source.html:44 -#: rhodecode/templates/journal/journal.html:81 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:207 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:209 +#: rhodecode/templates/files/files_source.html:29 +#: rhodecode/templates/journal/journal_page_repos.html:29 msgid "edit" msgstr "" @@ -1894,11 +1955,11 @@ #: rhodecode/templates/admin/repos/repo_edit.html:142 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75 #: rhodecode/templates/admin/settings/settings.html:113 -#: rhodecode/templates/admin/settings/settings.html:168 -#: rhodecode/templates/admin/settings/settings.html:258 -#: rhodecode/templates/admin/users/user_edit.html:130 -#: rhodecode/templates/admin/users/user_edit.html:175 -#: rhodecode/templates/admin/users/user_edit.html:278 +#: rhodecode/templates/admin/settings/settings.html:179 +#: rhodecode/templates/admin/settings/settings.html:269 +#: rhodecode/templates/admin/users/user_edit.html:134 +#: rhodecode/templates/admin/users/user_edit.html:179 +#: rhodecode/templates/admin/users/user_edit.html:282 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:80 #: rhodecode/templates/admin/users_groups/users_group_edit.html:136 #: rhodecode/templates/files/files_add.html:82 @@ -1956,78 +2017,103 @@ msgid "Confirm to invalidate repository cache" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:195 -#: rhodecode/templates/base/base.html:318 -#: rhodecode/templates/base/base.html:320 -#: rhodecode/templates/base/base.html:322 -msgid "Public journal" +#: rhodecode/templates/admin/repos/repo_edit.html:193 +msgid "" +"Manually invalidate cache for this repository. On first access repository" +" will be cached again" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:198 +msgid "List of cached values" msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:201 -msgid "Remove from public journal" +msgid "Prefix" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:202 +msgid "Key" msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:203 +#: rhodecode/templates/admin/users/user_add.html:86 +#: rhodecode/templates/admin/users/user_edit.html:117 +#: rhodecode/templates/admin/users_groups/users_group_add.html:41 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:42 +msgid "Active" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:218 +#: rhodecode/templates/base/base.html:330 +#: rhodecode/templates/base/base.html:332 +#: rhodecode/templates/base/base.html:334 +msgid "Public journal" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:224 +msgid "Remove from public journal" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:226 msgid "Add to public journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:208 +#: rhodecode/templates/admin/repos/repo_edit.html:231 msgid "" "All actions made on this repository will be accessible to everyone in " "public journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:215 +#: rhodecode/templates/admin/repos/repo_edit.html:238 msgid "Locking" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:220 +#: rhodecode/templates/admin/repos/repo_edit.html:243 msgid "Unlock locked repo" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:220 +#: rhodecode/templates/admin/repos/repo_edit.html:243 msgid "Confirm to unlock repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:223 +#: rhodecode/templates/admin/repos/repo_edit.html:246 msgid "lock repo" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:223 +#: rhodecode/templates/admin/repos/repo_edit.html:246 msgid "Confirm to lock repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:224 +#: rhodecode/templates/admin/repos/repo_edit.html:247 msgid "Repository is not locked" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:229 +#: rhodecode/templates/admin/repos/repo_edit.html:252 msgid "Force locking on repository. Works only when anonymous access is disabled" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:236 -msgid "Set as fork of" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:245 -msgid "Manually set this repository as a fork of another from the list" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:251 -#: rhodecode/templates/changeset/changeset_file_comment.html:26 -msgid "Delete" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:255 -msgid "Remove this repository" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:255 -#: rhodecode/templates/journal/journal.html:84 -msgid "Confirm to delete this repository" -msgstr "" - #: rhodecode/templates/admin/repos/repo_edit.html:259 +msgid "Set as fork of" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:268 +msgid "Manually set this repository as a fork of another from the list" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:274 +#: rhodecode/templates/changeset/changeset_file_comment.html:26 +msgid "Delete" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:278 +msgid "Remove this repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:278 +msgid "Confirm to delete this repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:282 msgid "" "This repository will be renamed in a special way in order to be " "unaccesible for RhodeCode and VCS systems.\n" @@ -2053,7 +2139,7 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:6 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6 #: rhodecode/templates/admin/users/users.html:85 -#: rhodecode/templates/base/base.html:217 +#: rhodecode/templates/base/base.html:229 msgid "admin" msgstr "" @@ -2064,8 +2150,8 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:16 #: rhodecode/templates/data_table/_dt_elements.html:67 -#: rhodecode/templates/journal/journal.html:132 -#: rhodecode/templates/summary/summary.html:76 +#: rhodecode/templates/journal/journal.html:87 +#: rhodecode/templates/summary/summary.html:85 msgid "private repository" msgstr "" @@ -2088,12 +2174,12 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:97 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 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:96 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:103 msgid "Failed to remove users group" msgstr "" @@ -2101,11 +2187,44 @@ msgid "Repositories administration" msgstr "" -#: rhodecode/templates/admin/repos_groups/repos_groups.html:8 -msgid "Groups" -msgstr "" - -#: rhodecode/templates/admin/repos_groups/repos_groups.html:12 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:73 +msgid "apply to children" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:74 +msgid "" +"Set or revoke permission to all children of that group, including " +"repositories and other groups" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_groups.html:9 +#: rhodecode/templates/base/base.html:122 +#: rhodecode/templates/base/base.html:312 +#: rhodecode/templates/base/base.html:314 +#: rhodecode/templates/base/base.html:316 +#: rhodecode/templates/bookmarks/bookmarks.html:11 +#: rhodecode/templates/branches/branches.html:10 +#: rhodecode/templates/changelog/changelog.html:10 +#: rhodecode/templates/changeset/changeset.html:10 +#: rhodecode/templates/changeset/changeset_range.html:9 +#: rhodecode/templates/compare/compare_diff.html:9 +#: rhodecode/templates/files/file_diff.html:8 +#: rhodecode/templates/files/files.html:8 +#: rhodecode/templates/files/files_add.html:15 +#: rhodecode/templates/files/files_edit.html:15 +#: rhodecode/templates/followers/followers.html:9 +#: rhodecode/templates/forks/fork.html:9 rhodecode/templates/forks/forks.html:9 +#: rhodecode/templates/pullrequests/pullrequest.html:8 +#: rhodecode/templates/pullrequests/pullrequest_show.html:8 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 +#: rhodecode/templates/settings/repo_settings.html:9 +#: rhodecode/templates/shortlog/shortlog.html:10 +#: rhodecode/templates/summary/summary.html:8 +#: rhodecode/templates/tags/tags.html:11 +msgid "Home" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_groups.html:13 msgid "with" msgstr "" @@ -2131,7 +2250,7 @@ #: rhodecode/templates/admin/users/user_add.html:94 #: rhodecode/templates/admin/users_groups/users_group_add.html:49 #: rhodecode/templates/admin/users_groups/users_group_edit.html:90 -#: rhodecode/templates/pullrequests/pullrequest_show.html:113 +#: rhodecode/templates/pullrequests/pullrequest_show.html:131 msgid "save" msgstr "" @@ -2167,20 +2286,22 @@ msgid "action" msgstr "" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 -#: rhodecode/templates/admin/users/user_edit.html:255 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55 +#: rhodecode/templates/admin/users/user_edit.html:259 #: rhodecode/templates/admin/users_groups/users_groups.html:44 #: rhodecode/templates/data_table/_dt_elements.html:7 -#: rhodecode/templates/data_table/_dt_elements.html:103 +#: rhodecode/templates/data_table/_dt_elements.html:121 msgid "delete" msgstr "" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55 #, python-format -msgid "Confirm to delete this group: %s" -msgstr "" - -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:62 +msgid "Confirm to delete this group: %s with %s repository" +msgid_plural "Confirm to delete this group: %s with %s repositories" +msgstr[0] "" +msgstr[1] "" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:63 msgid "There are no repositories groups yet" msgstr "" @@ -2273,8 +2394,8 @@ msgstr "" #: rhodecode/templates/admin/settings/settings.html:112 -#: rhodecode/templates/admin/settings/settings.html:167 -#: rhodecode/templates/admin/settings/settings.html:257 +#: rhodecode/templates/admin/settings/settings.html:178 +#: rhodecode/templates/admin/settings/settings.html:268 msgid "Save settings" msgstr "" @@ -2282,124 +2403,133 @@ msgid "Visualisation settings" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:128 +#: rhodecode/templates/admin/settings/settings.html:127 +msgid "General" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:132 +msgid "Use lightweight dashboard" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:139 msgid "Icons" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:133 -msgid "Show public repo icon on repositories" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:137 -msgid "Show private repo icon on repositories" -msgstr "" - #: rhodecode/templates/admin/settings/settings.html:144 +msgid "Show public repo icon on repositories" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:148 +msgid "Show private repo icon on repositories" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:155 msgid "Meta-Tagging" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:149 +#: rhodecode/templates/admin/settings/settings.html:160 msgid "Stylify recognised metatags:" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:176 +#: rhodecode/templates/admin/settings/settings.html:187 msgid "VCS settings" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:185 +#: rhodecode/templates/admin/settings/settings.html:196 msgid "Web" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:190 +#: rhodecode/templates/admin/settings/settings.html:201 msgid "require ssl for vcs operations" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:192 -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:198 -msgid "Hooks" -msgstr "" - #: rhodecode/templates/admin/settings/settings.html:203 +msgid "" +"RhodeCode will require SSL for pushing or pulling. If SSL is missing it " +"will return HTTP Error 406: Not Acceptable" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:209 +msgid "Hooks" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:214 msgid "Update repository after push (hg update)" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:207 +#: rhodecode/templates/admin/settings/settings.html:218 msgid "Show repository size after push" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:211 +#: rhodecode/templates/admin/settings/settings.html:222 msgid "Log user push commands" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:215 +#: rhodecode/templates/admin/settings/settings.html:226 msgid "Log user pull commands" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:219 +#: rhodecode/templates/admin/settings/settings.html:230 msgid "advanced setup" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:224 -msgid "Mercurial Extensions" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:229 -msgid "largefiles extensions" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:233 -msgid "hgsubversion extensions" -msgstr "" - #: rhodecode/templates/admin/settings/settings.html:235 +msgid "Mercurial Extensions" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:240 +msgid "largefiles extensions" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:244 +msgid "hgsubversion extensions" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:246 msgid "" "Requires hgsubversion library installed. Allows clonning from svn remote " "locations" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:245 +#: rhodecode/templates/admin/settings/settings.html:256 msgid "Repositories location" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:250 +#: rhodecode/templates/admin/settings/settings.html:261 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:251 +#: rhodecode/templates/admin/settings/settings.html:262 +#: rhodecode/templates/base/base.html:221 msgid "unlock" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:252 +#: rhodecode/templates/admin/settings/settings.html:263 msgid "" "Location where repositories are stored. After changing this value a " "restart, and rescan is required" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:272 +#: rhodecode/templates/admin/settings/settings.html:283 msgid "Test Email" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:280 +#: rhodecode/templates/admin/settings/settings.html:291 msgid "Email to" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:288 +#: rhodecode/templates/admin/settings/settings.html:299 msgid "Send" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:294 +#: rhodecode/templates/admin/settings/settings.html:305 msgid "System Info and Packages" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:297 +#: rhodecode/templates/admin/settings/settings.html:308 msgid "show" msgstr "" @@ -2420,13 +2550,6 @@ msgid "Password confirmation" msgstr "" -#: rhodecode/templates/admin/users/user_add.html:86 -#: rhodecode/templates/admin/users/user_edit.html:113 -#: rhodecode/templates/admin/users_groups/users_group_add.html:41 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:42 -msgid "Active" -msgstr "" - #: rhodecode/templates/admin/users/user_edit.html:5 msgid "Edit user" msgstr "" @@ -2446,26 +2569,26 @@ msgid "API key" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:59 +#: rhodecode/templates/admin/users/user_edit.html:63 msgid "LDAP DN" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:68 +#: rhodecode/templates/admin/users/user_edit.html:72 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:35 msgid "New password" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:77 +#: rhodecode/templates/admin/users/user_edit.html:81 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:44 msgid "New password confirmation" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:147 +#: rhodecode/templates/admin/users/user_edit.html:151 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108 msgid "Inherit default permissions" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:152 +#: rhodecode/templates/admin/users/user_edit.html:156 #: rhodecode/templates/admin/users_groups/users_group_edit.html:113 #, python-format msgid "" @@ -2473,46 +2596,48 @@ "options does not have any action" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:158 +#: rhodecode/templates/admin/users/user_edit.html:162 #: rhodecode/templates/admin/users_groups/users_group_edit.html:119 msgid "Create repositories" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:166 +#: rhodecode/templates/admin/users/user_edit.html:170 #: rhodecode/templates/admin/users_groups/users_group_edit.html:127 msgid "Fork repositories" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:186 +#: rhodecode/templates/admin/users/user_edit.html:190 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39 msgid "Nothing here yet" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:193 +#: rhodecode/templates/admin/users/user_edit.html:197 #: rhodecode/templates/admin/users/user_edit_my_account.html:60 -#: rhodecode/templates/admin/users/user_edit_my_account.html:194 +#: rhodecode/templates/admin/users/user_edit_my_account.html:217 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:185 msgid "Permission" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:194 +#: rhodecode/templates/admin/users/user_edit.html:198 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:186 msgid "Edit Permission" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:243 +#: rhodecode/templates/admin/users/user_edit.html:247 msgid "Email addresses" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:256 +#: rhodecode/templates/admin/users/user_edit.html:260 #, python-format msgid "Confirm to delete this email: %s" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:270 +#: rhodecode/templates/admin/users/user_edit.html:274 msgid "New email address" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:277 +#: rhodecode/templates/admin/users/user_edit.html:281 msgid "Add" msgstr "" @@ -2568,31 +2693,33 @@ #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:7 #: rhodecode/templates/bookmarks/bookmarks.html:40 #: rhodecode/templates/bookmarks/bookmarks_data.html:9 -#: rhodecode/templates/branches/branches.html:55 -#: rhodecode/templates/journal/journal.html:60 -#: rhodecode/templates/tags/tags.html:40 +#: rhodecode/templates/branches/branches.html:54 +#: rhodecode/templates/branches/branches_data.html:9 +#: rhodecode/templates/journal/journal_page_repos.html:8 +#: rhodecode/templates/tags/tags.html:55 #: rhodecode/templates/tags/tags_data.html:9 msgid "Revision" msgstr "" #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28 -#: rhodecode/templates/journal/journal.html:81 +#: rhodecode/templates/journal/journal_page_repos.html:29 msgid "private" msgstr "" #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:31 #: rhodecode/templates/data_table/_dt_elements.html:7 +#: rhodecode/templates/journal/journal_page_repos.html:32 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:38 -#: rhodecode/templates/journal/journal.html:94 +#: rhodecode/templates/journal/journal_page_repos.html:42 msgid "No repositories yet" msgstr "" #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:40 -#: rhodecode/templates/journal/journal.html:96 +#: rhodecode/templates/journal/journal_page_repos.html:44 msgid "create one now" msgstr "" @@ -2601,7 +2728,7 @@ msgstr "" #: rhodecode/templates/admin/users/users.html:9 -#: rhodecode/templates/base/base.html:223 +#: rhodecode/templates/base/base.html:235 msgid "users" msgstr "" @@ -2631,7 +2758,7 @@ msgstr "" #: rhodecode/templates/admin/users/users.html:86 -#: rhodecode/templates/base/base.html:226 +#: rhodecode/templates/base/base.html:238 msgid "ldap" msgstr "" @@ -2680,6 +2807,18 @@ msgid "Group members" msgstr "" +#: rhodecode/templates/admin/users_groups/users_group_edit.html:163 +msgid "No members yet" +msgstr "" + +#: rhodecode/templates/admin/users_groups/users_group_edit.html:171 +msgid "Permissions defined for this group" +msgstr "" + +#: rhodecode/templates/admin/users_groups/users_group_edit.html:178 +msgid "No permissions set yet" +msgstr "" + #: rhodecode/templates/admin/users_groups/users_groups.html:5 msgid "Users groups administration" msgstr "" @@ -2722,36 +2861,10 @@ msgid "Inbox" msgstr "" -#: rhodecode/templates/base/base.html:122 -#: rhodecode/templates/base/base.html:300 -#: rhodecode/templates/base/base.html:302 -#: rhodecode/templates/base/base.html:304 -#: rhodecode/templates/bookmarks/bookmarks.html:11 -#: rhodecode/templates/branches/branches.html:10 -#: rhodecode/templates/changelog/changelog.html:10 -#: rhodecode/templates/changeset/changeset.html:10 -#: rhodecode/templates/changeset/changeset_range.html:9 -#: rhodecode/templates/compare/compare_diff.html:9 -#: rhodecode/templates/files/file_diff.html:8 -#: rhodecode/templates/files/files.html:8 -#: rhodecode/templates/files/files_add.html:15 -#: rhodecode/templates/files/files_edit.html:15 -#: rhodecode/templates/followers/followers.html:9 -#: rhodecode/templates/forks/fork.html:9 rhodecode/templates/forks/forks.html:9 -#: rhodecode/templates/pullrequests/pullrequest.html:8 -#: rhodecode/templates/pullrequests/pullrequest_show.html:8 -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 -#: rhodecode/templates/settings/repo_settings.html:9 -#: rhodecode/templates/shortlog/shortlog.html:10 -#: rhodecode/templates/summary/summary.html:8 -#: rhodecode/templates/tags/tags.html:11 -msgid "Home" -msgstr "" - #: rhodecode/templates/base/base.html:123 -#: rhodecode/templates/base/base.html:309 -#: rhodecode/templates/base/base.html:311 -#: rhodecode/templates/base/base.html:313 +#: rhodecode/templates/base/base.html:321 +#: rhodecode/templates/base/base.html:323 +#: rhodecode/templates/base/base.html:325 #: rhodecode/templates/journal/journal.html:4 #: rhodecode/templates/journal/journal.html:21 #: rhodecode/templates/journal/public_journal.html:4 @@ -2771,7 +2884,7 @@ msgstr "" #: rhodecode/templates/base/base.html:152 -#: rhodecode/templates/base/base.html:182 +#: rhodecode/templates/base/base.html:182 rhodecode/templates/base/root.html:47 msgid "loading..." msgstr "" @@ -2816,50 +2929,62 @@ #: rhodecode/templates/base/base.html:204 #: rhodecode/templates/base/base.html:206 -#: rhodecode/templates/base/base.html:227 -msgid "settings" -msgstr "" - -#: rhodecode/templates/base/base.html:209 +msgid "repository settings" +msgstr "" + +#: rhodecode/templates/base/base.html:210 #: rhodecode/templates/data_table/_dt_elements.html:80 #: rhodecode/templates/forks/fork.html:13 msgid "fork" msgstr "" -#: rhodecode/templates/base/base.html:211 -#: rhodecode/templates/changelog/changelog.html:40 +#: rhodecode/templates/base/base.html:212 rhodecode/templates/base/root.html:50 +#: rhodecode/templates/changelog/changelog.html:43 msgid "Open new pull request" msgstr "" -#: rhodecode/templates/base/base.html:213 +#: rhodecode/templates/base/base.html:215 +#: rhodecode/templates/forks/forks_data.html:21 +msgid "Compare fork" +msgstr "" + +#: rhodecode/templates/base/base.html:217 msgid "search" msgstr "" -#: rhodecode/templates/base/base.html:222 +#: rhodecode/templates/base/base.html:223 +msgid "lock" +msgstr "" + +#: rhodecode/templates/base/base.html:234 msgid "repositories groups" msgstr "" -#: rhodecode/templates/base/base.html:224 +#: rhodecode/templates/base/base.html:236 msgid "users groups" msgstr "" -#: rhodecode/templates/base/base.html:225 +#: rhodecode/templates/base/base.html:237 msgid "permissions" msgstr "" -#: rhodecode/templates/base/base.html:238 -#: rhodecode/templates/base/base.html:240 +#: rhodecode/templates/base/base.html:239 +msgid "settings" +msgstr "" + +#: rhodecode/templates/base/base.html:250 +#: rhodecode/templates/base/base.html:252 msgid "Followers" msgstr "" -#: rhodecode/templates/base/base.html:246 -#: rhodecode/templates/base/base.html:248 +#: rhodecode/templates/base/base.html:258 +#: rhodecode/templates/base/base.html:260 msgid "Forks" msgstr "" -#: rhodecode/templates/base/base.html:327 -#: rhodecode/templates/base/base.html:329 -#: rhodecode/templates/base/base.html:331 +#: rhodecode/templates/base/base.html:339 +#: rhodecode/templates/base/base.html:341 +#: rhodecode/templates/base/base.html:343 #: rhodecode/templates/search/search.html:52 msgid "Search" msgstr "" @@ -2869,7 +2994,7 @@ msgstr "" #: rhodecode/templates/base/root.html:43 -#: rhodecode/templates/journal/journal.html:120 +#: rhodecode/templates/journal/journal.html:75 #: rhodecode/templates/summary/summary.html:57 msgid "Stop following this repository" msgstr "" @@ -2883,14 +3008,26 @@ msgid "Group" msgstr "" -#: rhodecode/templates/base/root.html:47 +#: rhodecode/templates/base/root.html:48 msgid "search truncated" msgstr "" -#: rhodecode/templates/base/root.html:48 +#: rhodecode/templates/base/root.html:49 msgid "no matching files" msgstr "" +#: rhodecode/templates/base/root.html:51 +msgid "Open new pull request for selected changesets" +msgstr "" + +#: rhodecode/templates/base/root.html:52 +msgid "Show selected changes __S -> __E" +msgstr "" + +#: rhodecode/templates/base/root.html:53 +msgid "Selection link" +msgstr "" + #: rhodecode/templates/bookmarks/bookmarks.html:5 #, python-format msgid "%s Bookmarks" @@ -2898,8 +3035,9 @@ #: rhodecode/templates/bookmarks/bookmarks.html:39 #: rhodecode/templates/bookmarks/bookmarks_data.html:8 -#: rhodecode/templates/branches/branches.html:54 -#: rhodecode/templates/tags/tags.html:39 +#: rhodecode/templates/branches/branches.html:53 +#: rhodecode/templates/branches/branches_data.html:8 +#: rhodecode/templates/tags/tags.html:54 #: rhodecode/templates/tags/tags_data.html:8 msgid "Author" msgstr "" @@ -2913,34 +3051,15 @@ msgid "Compare branches" msgstr "" -#: rhodecode/templates/branches/branches.html:57 +#: rhodecode/templates/branches/branches.html:56 +#: rhodecode/templates/branches/branches_data.html:10 #: rhodecode/templates/compare/compare_diff.html:5 #: rhodecode/templates/compare/compare_diff.html:13 +#: rhodecode/templates/tags/tags.html:57 +#: rhodecode/templates/tags/tags_data.html:10 msgid "Compare" msgstr "" -#: rhodecode/templates/branches/branches_data.html:6 -msgid "name" -msgstr "" - -#: rhodecode/templates/branches/branches_data.html:7 -msgid "date" -msgstr "" - -#: rhodecode/templates/branches/branches_data.html:8 -#: rhodecode/templates/shortlog/shortlog_data.html:8 -msgid "author" -msgstr "" - -#: rhodecode/templates/branches/branches_data.html:9 -#: rhodecode/templates/shortlog/shortlog_data.html:5 -msgid "revision" -msgstr "" - -#: rhodecode/templates/branches/branches_data.html:10 -msgid "compare" -msgstr "" - #: rhodecode/templates/changelog/changelog.html:6 #, python-format msgid "%s Changelog" @@ -2954,57 +3073,63 @@ msgstr[1] "" #: rhodecode/templates/changelog/changelog.html:37 +msgid "Clear selection" +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:40 #: rhodecode/templates/forks/forks_data.html:19 #, python-format msgid "compare fork with %s" msgstr "" -#: rhodecode/templates/changelog/changelog.html:37 -#: rhodecode/templates/forks/forks_data.html:21 -msgid "Compare fork" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:46 +#: rhodecode/templates/changelog/changelog.html:40 +msgid "Compare fork with parent" +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:49 msgid "Show" msgstr "" -#: rhodecode/templates/changelog/changelog.html:72 -#: rhodecode/templates/summary/summary.html:364 +#: rhodecode/templates/changelog/changelog.html:74 +#: rhodecode/templates/summary/summary.html:375 msgid "show more" msgstr "" -#: rhodecode/templates/changelog/changelog.html:76 +#: rhodecode/templates/changelog/changelog.html:78 msgid "Affected number of files, click to show more details" msgstr "" -#: rhodecode/templates/changelog/changelog.html:89 -#: rhodecode/templates/changeset/changeset.html:38 +#: rhodecode/templates/changelog/changelog.html:91 +#: rhodecode/templates/changeset/changeset.html:44 #: rhodecode/templates/changeset/changeset_file_comment.html:20 #: rhodecode/templates/changeset/changeset_range.html:46 msgid "Changeset status" msgstr "" -#: rhodecode/templates/changelog/changelog.html:92 +#: rhodecode/templates/changelog/changelog.html:94 +#: rhodecode/templates/shortlog/shortlog_data.html:20 msgid "Click to open associated pull request" msgstr "" -#: rhodecode/templates/changelog/changelog.html:102 -#: rhodecode/templates/changeset/changeset.html:78 +#: rhodecode/templates/changelog/changelog.html:104 +#: rhodecode/templates/changeset/changeset.html:85 msgid "Parent" msgstr "" -#: rhodecode/templates/changelog/changelog.html:108 -#: rhodecode/templates/changeset/changeset.html:84 +#: rhodecode/templates/changelog/changelog.html:110 +#: rhodecode/templates/changeset/changeset.html:91 msgid "No parents" msgstr "" -#: rhodecode/templates/changelog/changelog.html:113 -#: rhodecode/templates/changeset/changeset.html:88 +#: rhodecode/templates/changelog/changelog.html:115 +#: rhodecode/templates/changeset/changeset.html:95 +#: rhodecode/templates/changeset/changeset_range.html:79 msgid "merge" msgstr "" -#: rhodecode/templates/changelog/changelog.html:116 -#: rhodecode/templates/changeset/changeset.html:91 +#: rhodecode/templates/changelog/changelog.html:118 +#: rhodecode/templates/changeset/changeset.html:98 +#: rhodecode/templates/changeset/changeset_range.html:82 #: rhodecode/templates/files/files.html:29 #: rhodecode/templates/files/files_add.html:33 #: rhodecode/templates/files/files_edit.html:33 @@ -3012,44 +3137,42 @@ msgid "branch" msgstr "" -#: rhodecode/templates/changelog/changelog.html:122 +#: rhodecode/templates/changelog/changelog.html:124 +#: rhodecode/templates/changeset/changeset_range.html:88 msgid "bookmark" msgstr "" -#: rhodecode/templates/changelog/changelog.html:128 -#: rhodecode/templates/changeset/changeset.html:96 +#: rhodecode/templates/changelog/changelog.html:130 +#: rhodecode/templates/changeset/changeset.html:103 +#: rhodecode/templates/changeset/changeset_range.html:94 msgid "tag" msgstr "" -#: rhodecode/templates/changelog/changelog.html:164 -msgid "Show selected changes __S -> __E" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:255 +#: rhodecode/templates/changelog/changelog.html:301 msgid "There are no changes yet" msgstr "" #: rhodecode/templates/changelog/changelog_details.html:4 -#: rhodecode/templates/changeset/changeset.html:66 +#: rhodecode/templates/changeset/changeset.html:73 msgid "removed" msgstr "" #: rhodecode/templates/changelog/changelog_details.html:5 -#: rhodecode/templates/changeset/changeset.html:67 +#: rhodecode/templates/changeset/changeset.html:74 msgid "changed" msgstr "" #: rhodecode/templates/changelog/changelog_details.html:6 -#: rhodecode/templates/changeset/changeset.html:68 +#: rhodecode/templates/changeset/changeset.html:75 msgid "added" msgstr "" #: rhodecode/templates/changelog/changelog_details.html:8 #: rhodecode/templates/changelog/changelog_details.html:9 #: rhodecode/templates/changelog/changelog_details.html:10 -#: rhodecode/templates/changeset/changeset.html:70 -#: rhodecode/templates/changeset/changeset.html:71 -#: rhodecode/templates/changeset/changeset.html:72 +#: rhodecode/templates/changeset/changeset.html:77 +#: rhodecode/templates/changeset/changeset.html:78 +#: rhodecode/templates/changeset/changeset.html:79 #, python-format msgid "affected %s files" msgstr "" @@ -3063,17 +3186,21 @@ msgid "Changeset" msgstr "" -#: rhodecode/templates/changeset/changeset.html:43 +#: rhodecode/templates/changeset/changeset.html:49 #: rhodecode/templates/changeset/diff_block.html:20 msgid "raw diff" msgstr "" -#: rhodecode/templates/changeset/changeset.html:44 +#: rhodecode/templates/changeset/changeset.html:50 +msgid "patch diff" +msgstr "" + +#: rhodecode/templates/changeset/changeset.html:51 #: rhodecode/templates/changeset/diff_block.html:21 msgid "download diff" msgstr "" -#: rhodecode/templates/changeset/changeset.html:48 +#: rhodecode/templates/changeset/changeset.html:55 #: rhodecode/templates/changeset/changeset_file_comment.html:82 #, python-format msgid "%d comment" @@ -3081,7 +3208,7 @@ msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/changeset/changeset.html:48 +#: rhodecode/templates/changeset/changeset.html:55 #: rhodecode/templates/changeset/changeset_file_comment.html:82 #, python-format msgid "(%d inline)" @@ -3089,14 +3216,23 @@ msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/changeset/changeset.html:103 +#: rhodecode/templates/changeset/changeset.html:111 +#: rhodecode/templates/compare/compare_diff.html:44 +#: rhodecode/templates/pullrequests/pullrequest_show.html:76 #, python-format -msgid "%s files affected with %s insertions and %s deletions:" -msgstr "" - -#: rhodecode/templates/changeset/changeset.html:119 -msgid "Changeset was too big and was cut off..." -msgstr "" +msgid "%s file changed" +msgid_plural "%s files changed" +msgstr[0] "" +msgstr[1] "" + +#: rhodecode/templates/changeset/changeset.html:113 +#: rhodecode/templates/compare/compare_diff.html:46 +#: rhodecode/templates/pullrequests/pullrequest_show.html:78 +#, python-format +msgid "%s file changed with %s insertions and %s deletions" +msgid_plural "%s files changed with %s insertions and %s deletions" +msgstr[0] "" +msgstr[1] "" #: rhodecode/templates/changeset/changeset_file_comment.html:42 msgid "Submitting..." @@ -3161,14 +3297,16 @@ msgid "Compare View" msgstr "" +#: rhodecode/templates/changeset/changeset_range.html:29 +msgid "Show combined compare" +msgstr "" + #: rhodecode/templates/changeset/changeset_range.html:54 -#: rhodecode/templates/compare/compare_diff.html:41 -#: rhodecode/templates/pullrequests/pullrequest_show.html:69 msgid "Files affected" msgstr "" #: rhodecode/templates/changeset/diff_block.html:19 -msgid "diff" +msgid "show full diff for this file" msgstr "" #: rhodecode/templates/changeset/diff_block.html:27 @@ -3180,7 +3318,16 @@ msgstr "" #: rhodecode/templates/compare/compare_diff.html:37 -msgid "Outgoing changesets" +#: rhodecode/templates/pullrequests/pullrequest_show.html:69 +#, python-format +msgid "Showing %s commit" +msgid_plural "Showing %s commits" +msgstr[0] "" +msgstr[1] "" + +#: rhodecode/templates/compare/compare_diff.html:52 +#: rhodecode/templates/pullrequests/pullrequest_show.html:84 +msgid "No files" msgstr "" #: rhodecode/templates/data_table/_dt_elements.html:39 @@ -3190,40 +3337,52 @@ msgstr "" #: rhodecode/templates/data_table/_dt_elements.html:60 -#: rhodecode/templates/journal/journal.html:126 -#: rhodecode/templates/summary/summary.html:68 +#: rhodecode/templates/journal/journal.html:81 +#: rhodecode/templates/summary/summary.html:77 msgid "Mercurial repository" msgstr "" #: rhodecode/templates/data_table/_dt_elements.html:62 -#: rhodecode/templates/journal/journal.html:128 -#: rhodecode/templates/summary/summary.html:71 +#: rhodecode/templates/journal/journal.html:83 +#: rhodecode/templates/summary/summary.html:80 msgid "Git repository" msgstr "" #: rhodecode/templates/data_table/_dt_elements.html:69 -#: rhodecode/templates/journal/journal.html:134 -#: rhodecode/templates/summary/summary.html:78 +#: rhodecode/templates/journal/journal.html:89 +#: rhodecode/templates/summary/summary.html:87 msgid "public repository" msgstr "" #: rhodecode/templates/data_table/_dt_elements.html:80 -#: rhodecode/templates/summary/summary.html:87 -#: rhodecode/templates/summary/summary.html:88 +#: rhodecode/templates/summary/summary.html:96 +#: rhodecode/templates/summary/summary.html:97 msgid "Fork of" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.html:92 +#: rhodecode/templates/data_table/_dt_elements.html:94 msgid "No changesets yet" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.html:104 +#: rhodecode/templates/data_table/_dt_elements.html:101 +#: rhodecode/templates/data_table/_dt_elements.html:103 +#, python-format +msgid "Subscribe to %s rss feed" +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.html:109 +#: rhodecode/templates/data_table/_dt_elements.html:111 +#, python-format +msgid "Subscribe to %s atom feed" +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.html:122 #, python-format msgid "Confirm to delete this user: %s" msgstr "" #: rhodecode/templates/email_templates/main.html:8 -msgid "This is an notification from RhodeCode." +msgid "This is a notification from RhodeCode." msgstr "" #: rhodecode/templates/errors/error_document.html:46 @@ -3241,13 +3400,13 @@ msgstr "" #: rhodecode/templates/files/files.html:4 -#: rhodecode/templates/files/files.html:72 +#: rhodecode/templates/files/files.html:74 #, python-format msgid "%s files" msgstr "" #: rhodecode/templates/files/files.html:12 -#: rhodecode/templates/summary/summary.html:340 +#: rhodecode/templates/summary/summary.html:351 msgid "files" msgstr "" @@ -3325,7 +3484,7 @@ msgstr "" #: rhodecode/templates/files/files_browser.html:31 -#: rhodecode/templates/shortlog/shortlog_data.html:65 +#: rhodecode/templates/shortlog/shortlog_data.html:80 msgid "add new file" msgstr "" @@ -3358,18 +3517,18 @@ msgstr "" #: rhodecode/templates/files/files_edit.html:49 -#: rhodecode/templates/files/files_source.html:38 +#: rhodecode/templates/files/files_source.html:23 msgid "show annotation" msgstr "" #: rhodecode/templates/files/files_edit.html:50 -#: rhodecode/templates/files/files_source.html:40 -#: rhodecode/templates/files/files_source.html:68 +#: rhodecode/templates/files/files_source.html:25 +#: rhodecode/templates/files/files_source.html:53 msgid "show as raw" msgstr "" #: rhodecode/templates/files/files_edit.html:51 -#: rhodecode/templates/files/files_source.html:41 +#: rhodecode/templates/files/files_source.html:26 msgid "download as raw" msgstr "" @@ -3381,43 +3540,43 @@ msgid "Editing file" msgstr "" -#: rhodecode/templates/files/files_source.html:2 +#: rhodecode/templates/files/files_history_box.html:2 msgid "History" msgstr "" -#: rhodecode/templates/files/files_source.html:9 +#: rhodecode/templates/files/files_history_box.html:9 msgid "diff to revision" msgstr "" -#: rhodecode/templates/files/files_source.html:10 +#: rhodecode/templates/files/files_history_box.html:10 #, fuzzy msgid "show at revision" msgstr "" -#: rhodecode/templates/files/files_source.html:14 +#: rhodecode/templates/files/files_history_box.html:15 #, fuzzy, python-format msgid "%s author" msgid_plural "%s authors" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/files/files_source.html:36 +#: rhodecode/templates/files/files_source.html:6 +msgid "Load file history" +msgstr "" + +#: rhodecode/templates/files/files_source.html:21 msgid "show source" msgstr "" -#: rhodecode/templates/files/files_source.html:59 +#: rhodecode/templates/files/files_source.html:44 #, python-format msgid "Binary file (%s)" msgstr "" -#: rhodecode/templates/files/files_source.html:68 +#: rhodecode/templates/files/files_source.html:53 msgid "File is too big to display" msgstr "" -#: rhodecode/templates/files/files_source.html:124 -msgid "Selection link" -msgstr "" - #: rhodecode/templates/files/files_ypjax.html:5 msgid "annotation" msgstr "" @@ -3489,7 +3648,7 @@ msgid "forked" msgstr "" -#: rhodecode/templates/forks/forks_data.html:38 +#: rhodecode/templates/forks/forks_data.html:42 msgid "There are no forks yet" msgstr "" @@ -3502,7 +3661,7 @@ msgstr "" #: rhodecode/templates/journal/journal.html:24 -#: rhodecode/templates/pullrequests/pullrequest.html:27 +#: rhodecode/templates/pullrequests/pullrequest.html:55 msgid "Refresh" msgstr "" @@ -3524,19 +3683,19 @@ msgid "ADD" msgstr "" -#: rhodecode/templates/journal/journal.html:114 +#: rhodecode/templates/journal/journal.html:69 msgid "following user" msgstr "" -#: rhodecode/templates/journal/journal.html:114 +#: rhodecode/templates/journal/journal.html:69 msgid "user" msgstr "" -#: rhodecode/templates/journal/journal.html:147 +#: rhodecode/templates/journal/journal.html:102 msgid "You are not following any users or repositories" msgstr "" -#: rhodecode/templates/journal/journal_data.html:47 +#: rhodecode/templates/journal/journal_data.html:51 msgid "No entries yet" msgstr "" @@ -3557,7 +3716,7 @@ msgid "New pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:28 +#: rhodecode/templates/pullrequests/pullrequest.html:54 msgid "refresh overview" msgstr "" @@ -3566,17 +3725,17 @@ msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:70 -#: rhodecode/templates/pullrequests/pullrequest_show.html:82 +#: rhodecode/templates/pullrequests/pullrequest_show.html:100 msgid "Pull request reviewers" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:79 -#: rhodecode/templates/pullrequests/pullrequest_show.html:94 +#: rhodecode/templates/pullrequests/pullrequest_show.html:112 msgid "owner" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:91 -#: rhodecode/templates/pullrequests/pullrequest_show.html:109 +#: rhodecode/templates/pullrequests/pullrequest_show.html:127 msgid "Add reviewer to this pull request." msgstr "" @@ -3603,6 +3762,11 @@ msgid "Closed %s" msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_show.html:23 +#, python-format +msgid "with status %s" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_show.html:31 msgid "Status" msgstr "" @@ -3615,23 +3779,23 @@ msgid "Still not reviewed by" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:47 +#: rhodecode/templates/pullrequests/pullrequest_show.html:48 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:54 +#: rhodecode/templates/pullrequests/pullrequest_show.html:50 +msgid "pull request was reviewed by all reviewers" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:58 msgid "Created on" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:61 -msgid "Compare view" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.html:65 -msgid "Incoming changesets" +msgid "Compare view" msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 @@ -3707,23 +3871,31 @@ msgid "shortlog" msgstr "" +#: rhodecode/templates/shortlog/shortlog_data.html:5 +msgid "revision" +msgstr "" + #: rhodecode/templates/shortlog/shortlog_data.html:7 msgid "age" msgstr "" -#: rhodecode/templates/shortlog/shortlog_data.html:18 +#: rhodecode/templates/shortlog/shortlog_data.html:8 +msgid "author" +msgstr "" + +#: rhodecode/templates/shortlog/shortlog_data.html:33 msgid "No commit message" msgstr "" -#: rhodecode/templates/shortlog/shortlog_data.html:62 +#: rhodecode/templates/shortlog/shortlog_data.html:77 msgid "Add or upload files directly via RhodeCode" msgstr "" -#: rhodecode/templates/shortlog/shortlog_data.html:71 +#: rhodecode/templates/shortlog/shortlog_data.html:86 msgid "Push new repo" msgstr "" -#: rhodecode/templates/shortlog/shortlog_data.html:79 +#: rhodecode/templates/shortlog/shortlog_data.html:94 msgid "Existing repository?" msgstr "" @@ -3751,128 +3923,137 @@ msgid "ATOM" msgstr "" -#: rhodecode/templates/summary/summary.html:82 +#: rhodecode/templates/summary/summary.html:70 +#, python-format +msgid "Repository locked by %s" +msgstr "" + +#: rhodecode/templates/summary/summary.html:72 +msgid "Repository unlocked" +msgstr "" + +#: rhodecode/templates/summary/summary.html:91 #, python-format msgid "Non changable ID %s" msgstr "" -#: rhodecode/templates/summary/summary.html:87 +#: rhodecode/templates/summary/summary.html:96 msgid "public" msgstr "" -#: rhodecode/templates/summary/summary.html:95 +#: rhodecode/templates/summary/summary.html:104 msgid "remote clone" msgstr "" -#: rhodecode/templates/summary/summary.html:116 +#: rhodecode/templates/summary/summary.html:125 msgid "Contact" msgstr "" -#: rhodecode/templates/summary/summary.html:130 +#: rhodecode/templates/summary/summary.html:139 msgid "Clone url" msgstr "" -#: rhodecode/templates/summary/summary.html:133 -msgid "Show by Name" -msgstr "" - -#: rhodecode/templates/summary/summary.html:134 -msgid "Show by ID" -msgstr "" - #: rhodecode/templates/summary/summary.html:142 +msgid "Show by Name" +msgstr "" + +#: rhodecode/templates/summary/summary.html:143 +msgid "Show by ID" +msgstr "" + +#: rhodecode/templates/summary/summary.html:151 msgid "Trending files" msgstr "" -#: rhodecode/templates/summary/summary.html:150 -#: rhodecode/templates/summary/summary.html:166 -#: rhodecode/templates/summary/summary.html:194 +#: rhodecode/templates/summary/summary.html:159 +#: rhodecode/templates/summary/summary.html:175 +#: rhodecode/templates/summary/summary.html:203 msgid "enable" msgstr "" -#: rhodecode/templates/summary/summary.html:158 +#: rhodecode/templates/summary/summary.html:167 msgid "Download" msgstr "" -#: rhodecode/templates/summary/summary.html:162 +#: rhodecode/templates/summary/summary.html:171 msgid "There are no downloads yet" msgstr "" -#: rhodecode/templates/summary/summary.html:164 -msgid "Downloads are disabled for this repository" -msgstr "" - -#: rhodecode/templates/summary/summary.html:170 -msgid "Download as zip" -msgstr "" - -#: rhodecode/templates/summary/summary.html:173 -msgid "Check this to download archive with subrepos" -msgstr "" - #: rhodecode/templates/summary/summary.html:173 +msgid "Downloads are disabled for this repository" +msgstr "" + +#: rhodecode/templates/summary/summary.html:179 +msgid "Download as zip" +msgstr "" + +#: rhodecode/templates/summary/summary.html:182 +msgid "Check this to download archive with subrepos" +msgstr "" + +#: rhodecode/templates/summary/summary.html:182 msgid "with subrepos" msgstr "" -#: rhodecode/templates/summary/summary.html:186 +#: rhodecode/templates/summary/summary.html:195 msgid "Commit activity by day / author" msgstr "" -#: rhodecode/templates/summary/summary.html:197 +#: rhodecode/templates/summary/summary.html:206 msgid "Stats gathered: " msgstr "" -#: rhodecode/templates/summary/summary.html:218 +#: rhodecode/templates/summary/summary.html:227 msgid "Shortlog" msgstr "" -#: rhodecode/templates/summary/summary.html:220 +#: rhodecode/templates/summary/summary.html:229 msgid "Quick start" msgstr "" -#: rhodecode/templates/summary/summary.html:233 +#: rhodecode/templates/summary/summary.html:243 #, python-format msgid "Readme file at revision '%s'" msgstr "" -#: rhodecode/templates/summary/summary.html:236 +#: rhodecode/templates/summary/summary.html:246 msgid "Permalink to this readme" msgstr "" -#: rhodecode/templates/summary/summary.html:293 +#: rhodecode/templates/summary/summary.html:304 #, python-format msgid "Download %s as %s" msgstr "" -#: rhodecode/templates/summary/summary.html:650 +#: rhodecode/templates/summary/summary.html:661 msgid "commits" msgstr "" -#: rhodecode/templates/summary/summary.html:651 +#: rhodecode/templates/summary/summary.html:662 msgid "files added" msgstr "" -#: rhodecode/templates/summary/summary.html:652 +#: rhodecode/templates/summary/summary.html:663 msgid "files changed" msgstr "" -#: rhodecode/templates/summary/summary.html:653 +#: rhodecode/templates/summary/summary.html:664 msgid "files removed" msgstr "" -#: rhodecode/templates/summary/summary.html:656 +#: rhodecode/templates/summary/summary.html:667 msgid "commit" msgstr "" -#: rhodecode/templates/summary/summary.html:657 +#: rhodecode/templates/summary/summary.html:668 msgid "file added" msgstr "" -#: rhodecode/templates/summary/summary.html:658 +#: rhodecode/templates/summary/summary.html:669 msgid "file changed" msgstr "" -#: rhodecode/templates/summary/summary.html:659 +#: rhodecode/templates/summary/summary.html:670 msgid "file removed" msgstr "" @@ -3881,3 +4062,7 @@ msgid "%s Tags" msgstr "" +#: rhodecode/templates/tags/tags.html:29 +msgid "Compare tags" +msgstr "" +
--- a/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po Mon Nov 26 20:39:45 2012 +0100 +++ b/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po Tue Nov 27 20:56:57 2012 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: RhodeCode 1.1.5\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-10-02 11:23+0200\n" +"POT-Creation-Date: 2012-11-27 20:56+0100\n" "PO-Revision-Date: 2012-10-02 11:32+0100\n" "Last-Translator: Vincent Duvert <vincent@duvert.net>\n" "Language-Team: fr <LL@li.org>\n" @@ -21,38 +21,35 @@ msgid "All Branches" msgstr "Toutes les branches" -#: rhodecode/controllers/changeset.py:83 +#: rhodecode/controllers/changeset.py:84 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 msgid "ignore white space" msgstr "Ignorer les espaces et tabulations" -#: rhodecode/controllers/changeset.py:157 +#: rhodecode/controllers/changeset.py:164 #, python-format msgid "%s line context" msgstr "Afficher %s lignes de contexte" -#: rhodecode/controllers/changeset.py:333 -#: rhodecode/controllers/changeset.py:348 -#: rhodecode/lib/diffs.py:71 -msgid "binary file" -msgstr "Fichier binaire" - -#: rhodecode/controllers/changeset.py:381 -#: rhodecode/controllers/pullrequests.py:376 +#: rhodecode/controllers/changeset.py:315 +#: rhodecode/controllers/pullrequests.py:411 #, python-format msgid "Status change -> %s" msgstr "Changement de statut -> %s" -#: rhodecode/controllers/changeset.py:412 -msgid "Changing status on a changeset associated witha closed pull request is not allowed" -msgstr "Le changement de statut d’un changeset associé à une pull request fermée n’est pas autorisé." - -#: rhodecode/controllers/compare.py:72 -#: rhodecode/controllers/pullrequests.py:114 +#: rhodecode/controllers/changeset.py:346 +msgid "" +"Changing status on a changeset associated witha closed pull request is " +"not allowed" +msgstr "" +"Le changement de statut d’un changeset associé à une pull request fermée " +"n’est pas autorisé." + +#: rhodecode/controllers/compare.py:75 +#: rhodecode/controllers/pullrequests.py:117 msgid "There are no changesets yet" msgstr "Il n’y a aucun changement pour le moment" @@ -62,7 +59,9 @@ #: rhodecode/controllers/error.py:98 msgid "The request could not be understood by the server due to malformed syntax." -msgstr "Le serveur n’a pas pu interpréter la requête à cause d’une erreur de syntaxe" +msgstr "" +"Le serveur n’a pas pu interpréter la requête à cause d’une erreur de " +"syntaxe" #: rhodecode/controllers/error.py:101 msgid "Unauthorized access to resource" @@ -77,124 +76,136 @@ msgstr "Ressource introuvable" #: rhodecode/controllers/error.py:107 -msgid "The server encountered an unexpected condition which prevented it from fulfilling the request." -msgstr "La requête n’a pu être traitée en raison d’une erreur survenue sur le serveur." - -#: rhodecode/controllers/feed.py:49 +msgid "" +"The server encountered an unexpected condition which prevented it from " +"fulfilling the request." +msgstr "" +"La requête n’a pu être traitée en raison d’une erreur survenue sur le " +"serveur." + +#: rhodecode/controllers/feed.py:52 #, python-format msgid "Changes on %s repository" msgstr "Changements sur le dépôt %s" -#: rhodecode/controllers/feed.py:50 +#: rhodecode/controllers/feed.py:53 #, python-format msgid "%s %s feed" msgstr "Flux %s de %s" -#: rhodecode/controllers/feed.py:67 -#: rhodecode/templates/changeset/changeset.html:119 +#: rhodecode/controllers/feed.py:86 +#: rhodecode/templates/changeset/changeset.html:126 +#: rhodecode/templates/changeset/changeset.html:138 +#: rhodecode/templates/compare/compare_diff.html:62 +#: rhodecode/templates/compare/compare_diff.html:73 +#: rhodecode/templates/pullrequests/pullrequest_show.html:94 +#: rhodecode/templates/pullrequests/pullrequest_show.html:153 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:81 +#: rhodecode/controllers/feed.py:92 msgid "commited on" msgstr "a commité, le" -#: rhodecode/controllers/files.py:84 +#: rhodecode/controllers/files.py:86 msgid "click here to add new file" msgstr "Ajouter un nouveau fichier" -#: rhodecode/controllers/files.py:85 +#: rhodecode/controllers/files.py:87 #, python-format msgid "There are no files yet %s" msgstr "Il n’y a pas encore de fichiers %s" -#: rhodecode/controllers/files.py:239 -#: rhodecode/controllers/files.py:299 +#: rhodecode/controllers/files.py:265 rhodecode/controllers/files.py:325 #, 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:266 +#: rhodecode/controllers/files.py:292 #, python-format msgid "Edited %s via RhodeCode" msgstr "%s édité via RhodeCode" -#: rhodecode/controllers/files.py:271 +#: rhodecode/controllers/files.py:297 msgid "No changes" msgstr "Aucun changement" -#: rhodecode/controllers/files.py:282 -#: rhodecode/controllers/files.py:346 +#: rhodecode/controllers/files.py:308 rhodecode/controllers/files.py:372 #, python-format msgid "Successfully committed to %s" msgstr "Commit réalisé avec succès sur %s" -#: rhodecode/controllers/files.py:287 -#: rhodecode/controllers/files.py:352 +#: rhodecode/controllers/files.py:313 rhodecode/controllers/files.py:378 msgid "Error occurred during commit" msgstr "Une erreur est survenue durant le commit" -#: rhodecode/controllers/files.py:318 +#: rhodecode/controllers/files.py:344 #, python-format msgid "Added %s via RhodeCode" msgstr "%s ajouté par RhodeCode" -#: rhodecode/controllers/files.py:332 +#: rhodecode/controllers/files.py:358 msgid "No content" msgstr "Aucun contenu" -#: rhodecode/controllers/files.py:336 +#: rhodecode/controllers/files.py:362 msgid "No filename" msgstr "Aucun nom de fichier" -#: rhodecode/controllers/files.py:378 +#: rhodecode/controllers/files.py:404 msgid "downloads disabled" msgstr "Les téléchargements sont désactivés" -#: rhodecode/controllers/files.py:389 +#: rhodecode/controllers/files.py:415 #, python-format msgid "Unknown revision %s" msgstr "Révision %s inconnue." -#: rhodecode/controllers/files.py:391 +#: rhodecode/controllers/files.py:417 msgid "Empty repository" msgstr "Dépôt vide." -#: rhodecode/controllers/files.py:393 +#: rhodecode/controllers/files.py:419 msgid "Unknown archive type" msgstr "Type d’archive inconnu" -#: rhodecode/controllers/files.py:494 +#: rhodecode/controllers/files.py:564 #: rhodecode/templates/changeset/changeset_range.html:13 #: rhodecode/templates/changeset/changeset_range.html:31 msgid "Changesets" msgstr "Changesets" -#: rhodecode/controllers/files.py:495 -#: rhodecode/controllers/pullrequests.py:73 -#: rhodecode/controllers/summary.py:236 -#: rhodecode/model/scm.py:543 +#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:76 +#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:550 msgid "Branches" msgstr "Branches" -#: rhodecode/controllers/files.py:496 -#: rhodecode/controllers/pullrequests.py:77 -#: rhodecode/controllers/summary.py:237 -#: rhodecode/model/scm.py:554 +#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:80 +#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:561 msgid "Tags" msgstr "Tags" -#: rhodecode/controllers/forks.py:74 -#: rhodecode/controllers/admin/repos.py:90 +#: rhodecode/controllers/forks.py:74 rhodecode/controllers/admin/repos.py:91 #, python-format -msgid "%s repository is not mapped to db perhaps it was created or renamed from the filesystem please run the application again in order to rescan repositories" -msgstr "Le dépôt %s n’est pas représenté dans la base de données. Il a probablement été créé ou renommé manuellement. Veuillez relancer l’application pour rescanner les dépôts." - -#: rhodecode/controllers/forks.py:134 -#: rhodecode/controllers/settings.py:73 +msgid "" +"%s repository is not mapped to db perhaps it was created or renamed from " +"the filesystem please run the application again in order to rescan " +"repositories" +msgstr "" +"Le dépôt %s n’est pas représenté dans la base de données. Il a " +"probablement été créé ou renommé manuellement. Veuillez relancer " +"l’application pour rescanner les dépôts." + +#: rhodecode/controllers/forks.py:134 rhodecode/controllers/settings.py:73 #, python-format -msgid "%s repository is not mapped to db perhaps it was created or renamed from the file system please run the application again in order to rescan repositories" -msgstr "Le dépôt %s n’est pas représenté dans la base de données. Il a probablement été créé ou renommé manuellement. Veuillez relancer l’application pour rescanner les dépôts." +msgid "" +"%s repository is not mapped to db perhaps it was created or renamed from " +"the file system please run the application again in order to rescan " +"repositories" +msgstr "" +"Le dépôt %s n’est pas représenté dans la base de données. Il a " +"probablement été créé ou renommé manuellement. Veuillez relancer " +"l’application pour rescanner les dépôts." #: rhodecode/controllers/forks.py:168 #, python-format @@ -206,14 +217,12 @@ 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:203 -#: rhodecode/controllers/journal.py:240 +#: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243 msgid "public journal" msgstr "Journal public" -#: rhodecode/controllers/journal.py:207 -#: rhodecode/controllers/journal.py:244 -#: rhodecode/templates/base/base.html:229 +#: rhodecode/controllers/journal.py:210 rhodecode/controllers/journal.py:247 +#: rhodecode/templates/base/base.html:232 msgid "journal" msgstr "Journal" @@ -226,95 +235,103 @@ msgstr "Un lien de rénitialisation de votre mot de passe vous a été envoyé." #: rhodecode/controllers/login.py:184 -msgid "Your password reset was successful, new password has been sent to your email" -msgstr "Votre mot de passe a été réinitialisé. Votre nouveau mot de passe vous a été envoyé par e-mail." - -#: rhodecode/controllers/pullrequests.py:75 -#: rhodecode/model/scm.py:549 +msgid "" +"Your password reset was successful, new password has been sent to your " +"email" +msgstr "" +"Votre mot de passe a été réinitialisé. Votre nouveau mot de passe vous a " +"été envoyé par e-mail." + +#: rhodecode/controllers/pullrequests.py:78 rhodecode/model/scm.py:556 msgid "Bookmarks" msgstr "Signets" -#: rhodecode/controllers/pullrequests.py:182 +#: rhodecode/controllers/pullrequests.py:186 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:184 +#: rhodecode/controllers/pullrequests.py:188 msgid "error during creation of pull request" msgstr "Une erreur est survenue lors de la création de la requête de pull." -#: rhodecode/controllers/pullrequests.py:205 +#: rhodecode/controllers/pullrequests.py:220 msgid "Successfully opened new pull request" msgstr "La requête de pull a été ouverte avec succès." -#: rhodecode/controllers/pullrequests.py:208 +#: rhodecode/controllers/pullrequests.py:223 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:241 +#: rhodecode/controllers/pullrequests.py:256 msgid "Successfully deleted pull request" msgstr "La requête de pull a été supprimée avec succès." -#: rhodecode/controllers/search.py:132 +#: rhodecode/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "Requête invalide. Essayer de la mettre entre guillemets." -#: rhodecode/controllers/search.py:137 +#: rhodecode/controllers/search.py:139 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:141 +msgstr "" +"L’index de recherche n’est pas présent. Veuillez exécuter l’indexeur de " +"code Whoosh." + +#: rhodecode/controllers/search.py:143 msgid "An error occurred during this search operation" msgstr "Une erreur est survenue durant l’opération de recherche." #: rhodecode/controllers/settings.py:108 -#: rhodecode/controllers/admin/repos.py:266 +#: rhodecode/controllers/admin/repos.py:267 #, python-format msgid "Repository %s updated successfully" msgstr "Dépôt %s mis à jour avec succès." #: rhodecode/controllers/settings.py:126 -#: rhodecode/controllers/admin/repos.py:284 +#: rhodecode/controllers/admin/repos.py:285 #, python-format msgid "error occurred during update of repository %s" msgstr "Une erreur est survenue lors de la mise à jour du dépôt %s." #: rhodecode/controllers/settings.py:144 -#: rhodecode/controllers/admin/repos.py:302 +#: rhodecode/controllers/admin/repos.py:303 #, python-format -msgid "%s repository is not mapped to db perhaps it was moved or renamed from the filesystem please run the application again in order to rescan repositories" -msgstr "Le dépôt %s n’est pas représenté dans la base de données. Il a probablement été déplacé ou renommé manuellement. Veuillez relancer l’application pour rescanner les dépôts." +msgid "" +"%s repository is not mapped to db perhaps it was moved or renamed from " +"the filesystem please run the application again in order to rescan " +"repositories" +msgstr "" +"Le dépôt %s n’est pas représenté dans la base de données. Il a " +"probablement été déplacé ou renommé manuellement. Veuillez relancer " +"l’application pour rescanner les dépôts." #: rhodecode/controllers/settings.py:156 -#: rhodecode/controllers/admin/repos.py:314 +#: rhodecode/controllers/admin/repos.py:315 #, python-format msgid "deleted repository %s" msgstr "Dépôt %s supprimé" #: rhodecode/controllers/settings.py:160 -#: rhodecode/controllers/admin/repos.py:324 -#: rhodecode/controllers/admin/repos.py:330 +#: rhodecode/controllers/admin/repos.py:325 +#: 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/settings.py:179 -#| msgid "unlock" msgid "unlocked" msgstr "déverrouillé" #: rhodecode/controllers/settings.py:182 -#| msgid "unlock" msgid "locked" msgstr "verrouillé" #: rhodecode/controllers/settings.py:184 #, python-format -#| msgid "forked %s repository as %s" msgid "Repository has been %s" msgstr "Le dépôt a été %s." #: rhodecode/controllers/settings.py:188 -#: rhodecode/controllers/admin/repos.py:422 +#: rhodecode/controllers/admin/repos.py:423 msgid "An error occurred during unlocking" msgstr "Une erreur est survenue durant le déverrouillage." @@ -323,7 +340,7 @@ msgstr "Aucune donnée actuellement disponible." #: rhodecode/controllers/summary.py:144 -#: rhodecode/templates/summary/summary.html:148 +#: rhodecode/templates/summary/summary.html:157 msgid "Statistics are disabled for this repository" msgstr "La mise à jour des statistiques est désactivée pour ce dépôt." @@ -408,15 +425,15 @@ #: rhodecode/templates/admin/settings/settings.html:9 #: rhodecode/templates/admin/users/user_add.html:8 #: rhodecode/templates/admin/users/user_edit.html:9 -#: rhodecode/templates/admin/users/user_edit.html:122 +#: rhodecode/templates/admin/users/user_edit.html:126 #: rhodecode/templates/admin/users/users.html:9 #: rhodecode/templates/admin/users_groups/users_group_add.html:8 #: rhodecode/templates/admin/users_groups/users_group_edit.html:9 #: rhodecode/templates/admin/users_groups/users_groups.html:9 #: rhodecode/templates/base/base.html:197 -#: rhodecode/templates/base/base.html:346 -#: rhodecode/templates/base/base.html:348 -#: rhodecode/templates/base/base.html:350 +#: rhodecode/templates/base/base.html:349 +#: rhodecode/templates/base/base.html:351 +#: rhodecode/templates/base/base.html:353 msgid "Admin" msgstr "Administration" @@ -450,184 +467,193 @@ msgid "error occurred during update of permissions" msgstr "erreur pendant la mise à jour des permissions" -#: rhodecode/controllers/admin/repos.py:123 +#: rhodecode/controllers/admin/repos.py:124 msgid "--REMOVE FORK--" msgstr "[Pas un fork]" -#: rhodecode/controllers/admin/repos.py:192 +#: rhodecode/controllers/admin/repos.py:193 #, python-format msgid "created repository %s from %s" msgstr "Le dépôt %s a été créé depuis %s." -#: rhodecode/controllers/admin/repos.py:196 +#: rhodecode/controllers/admin/repos.py:197 #, python-format msgid "created repository %s" msgstr "Le dépôt %s a été créé." -#: rhodecode/controllers/admin/repos.py:227 +#: rhodecode/controllers/admin/repos.py:228 #, python-format msgid "error occurred during creation of repository %s" msgstr "Une erreur est survenue durant la création du dépôt %s." -#: rhodecode/controllers/admin/repos.py:319 +#: rhodecode/controllers/admin/repos.py:320 #, 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:348 +#: rhodecode/controllers/admin/repos.py:349 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:367 +#: rhodecode/controllers/admin/repos.py:368 msgid "An error occurred during deletion of repository users groups" -msgstr "Une erreur est survenue durant la suppression du groupe d’utilisateurs de ce dépôt." - -#: rhodecode/controllers/admin/repos.py:385 +msgstr "" +"Une erreur est survenue durant la suppression du groupe d’utilisateurs de" +" ce dépôt." + +#: rhodecode/controllers/admin/repos.py:386 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:402 +#: rhodecode/controllers/admin/repos.py:403 msgid "An error occurred during cache invalidation" msgstr "Une erreur est survenue durant l’invalidation du cache." -#: rhodecode/controllers/admin/repos.py:442 +#: rhodecode/controllers/admin/repos.py:443 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:446 +#: rhodecode/controllers/admin/repos.py:447 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:451 -#: rhodecode/model/validators.py:300 +msgstr "" +"Une erreur est survenue durant la configuration du journal public pour ce" +" dépôt." + +#: rhodecode/controllers/admin/repos.py:452 rhodecode/model/validators.py:300 msgid "Token mismatch" msgstr "Jeton d’authentification incorrect." -#: rhodecode/controllers/admin/repos.py:464 +#: rhodecode/controllers/admin/repos.py:465 msgid "Pulled from remote location" msgstr "Les changements distants ont été récupérés." -#: rhodecode/controllers/admin/repos.py:466 +#: rhodecode/controllers/admin/repos.py:467 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:482 +#: rhodecode/controllers/admin/repos.py:483 msgid "Nothing" msgstr "[Aucun dépôt]" -#: rhodecode/controllers/admin/repos.py:484 +#: rhodecode/controllers/admin/repos.py:485 #, 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:488 +#: rhodecode/controllers/admin/repos.py:489 msgid "An error occurred during this operation" msgstr "Une erreur est survenue durant cette opération." -#: rhodecode/controllers/admin/repos_groups.py:117 +#: rhodecode/controllers/admin/repos_groups.py:120 #, python-format msgid "created repos group %s" msgstr "Le groupe de dépôts %s a été créé." -#: rhodecode/controllers/admin/repos_groups.py:130 +#: rhodecode/controllers/admin/repos_groups.py:133 #, python-format msgid "error occurred during creation of repos group %s" msgstr "Une erreur est survenue durant la création du groupe de dépôts %s." -#: rhodecode/controllers/admin/repos_groups.py:164 +#: rhodecode/controllers/admin/repos_groups.py:167 #, python-format msgid "updated repos group %s" msgstr "Le groupe de dépôts %s a été mis à jour." -#: rhodecode/controllers/admin/repos_groups.py:177 +#: rhodecode/controllers/admin/repos_groups.py:180 #, python-format msgid "error occurred during update of repos group %s" msgstr "Une erreur est survenue durant la mise à jour du groupe de dépôts %s." -#: rhodecode/controllers/admin/repos_groups.py:195 +#: rhodecode/controllers/admin/repos_groups.py:198 #, 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:203 +#: rhodecode/controllers/admin/repos_groups.py:206 #, python-format msgid "removed repos group %s" msgstr "Le groupe de dépôts %s a été supprimé." -#: rhodecode/controllers/admin/repos_groups.py:209 +#: rhodecode/controllers/admin/repos_groups.py:212 msgid "Cannot delete this group it still contains subgroups" msgstr "Impossible de supprimer ce groupe : Il contient des sous-groupes." -#: rhodecode/controllers/admin/repos_groups.py:214 -#: rhodecode/controllers/admin/repos_groups.py:219 +#: rhodecode/controllers/admin/repos_groups.py:217 +#: rhodecode/controllers/admin/repos_groups.py:222 #, 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:240 +#: rhodecode/controllers/admin/repos_groups.py:243 msgid "An error occurred during deletion of group user" -msgstr "Une erreur est survenue durant la suppression de l’utilisateur du groupe de dépôts." - -#: rhodecode/controllers/admin/repos_groups.py:261 +msgstr "" +"Une erreur est survenue durant la suppression de l’utilisateur du groupe " +"de dépôts." + +#: rhodecode/controllers/admin/repos_groups.py:264 msgid "An error occurred during deletion of group users groups" -msgstr "Une erreur est survenue durant la suppression du groupe d’utilisateurs du groupe de dépôts." - -#: rhodecode/controllers/admin/settings.py:122 +msgstr "" +"Une erreur est survenue durant la suppression du groupe d’utilisateurs du" +" groupe de dépôts." + +#: rhodecode/controllers/admin/settings.py:123 #, 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:130 +#: rhodecode/controllers/admin/settings.py:131 msgid "Whoosh reindex task scheduled" msgstr "La tâche de réindexation Whoosh a été planifiée." -#: rhodecode/controllers/admin/settings.py:161 +#: rhodecode/controllers/admin/settings.py:162 msgid "Updated application settings" msgstr "Réglages mis à jour" -#: rhodecode/controllers/admin/settings.py:165 -#: rhodecode/controllers/admin/settings.py:293 +#: rhodecode/controllers/admin/settings.py:166 +#: rhodecode/controllers/admin/settings.py:299 msgid "error occurred during updating application settings" msgstr "Une erreur est survenue durant la mise à jour des options." -#: rhodecode/controllers/admin/settings.py:201 +#: rhodecode/controllers/admin/settings.py:207 msgid "Updated visualisation settings" msgstr "Réglages d’affichage mis à jour." -#: rhodecode/controllers/admin/settings.py:206 +#: rhodecode/controllers/admin/settings.py:212 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:289 +#: rhodecode/controllers/admin/settings.py:295 msgid "Updated VCS settings" msgstr "Réglages des gestionnaires de versions mis à jour." -#: rhodecode/controllers/admin/settings.py:303 +#: rhodecode/controllers/admin/settings.py:309 msgid "Added new hook" msgstr "Le nouveau hook a été ajouté." -#: rhodecode/controllers/admin/settings.py:315 +#: rhodecode/controllers/admin/settings.py:321 msgid "Updated hooks" msgstr "Hooks mis à jour" -#: rhodecode/controllers/admin/settings.py:319 +#: rhodecode/controllers/admin/settings.py:325 msgid "error occurred during hook creation" msgstr "Une erreur est survenue durant la création du hook." -#: rhodecode/controllers/admin/settings.py:338 +#: rhodecode/controllers/admin/settings.py:344 msgid "Email task created" msgstr "La tâche d’e-mail a été créée." -#: rhodecode/controllers/admin/settings.py:393 +#: rhodecode/controllers/admin/settings.py:399 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:424 +msgstr "" +"Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon" +" fonctionnement de l’application." + +#: rhodecode/controllers/admin/settings.py:430 msgid "Your account was updated successfully" msgstr "Votre compte a été mis à jour avec succès" -#: rhodecode/controllers/admin/settings.py:439 -#: rhodecode/controllers/admin/users.py:191 +#: rhodecode/controllers/admin/settings.py:445 +#: rhodecode/controllers/admin/users.py:196 #, python-format msgid "error occurred during update of user %s" msgstr "Une erreur est survenue durant la mise à jour de l’utilisateur %s." @@ -642,97 +668,101 @@ msgid "error occurred during creation of user %s" msgstr "Une erreur est survenue durant la création de l’utilisateur %s." -#: rhodecode/controllers/admin/users.py:171 +#: rhodecode/controllers/admin/users.py:176 msgid "User updated successfully" msgstr "L’utilisateur a été mis à jour avec succès." -#: rhodecode/controllers/admin/users.py:207 -msgid "successfully deleted user" -msgstr "L’utilisateur a été supprimé avec succès." - #: rhodecode/controllers/admin/users.py:212 +msgid "successfully deleted user" +msgstr "L’utilisateur a été supprimé avec succès." + +#: rhodecode/controllers/admin/users.py:217 msgid "An error occurred during deletion of user" msgstr "Une erreur est survenue durant la suppression de l’utilisateur." -#: rhodecode/controllers/admin/users.py:226 +#: rhodecode/controllers/admin/users.py:231 msgid "You can't edit this user" msgstr "Vous ne pouvez pas éditer cet utilisateur" -#: rhodecode/controllers/admin/users.py:266 +#: rhodecode/controllers/admin/users.py:272 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:271 +#: rhodecode/controllers/admin/users.py:277 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:277 +#: rhodecode/controllers/admin/users.py:283 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:282 +#: rhodecode/controllers/admin/users.py:288 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:288 -#: rhodecode/controllers/admin/users_groups.py:255 +#: rhodecode/controllers/admin/users.py:294 +#: rhodecode/controllers/admin/users_groups.py:279 msgid "An error occurred during permissions saving" msgstr "Une erreur est survenue durant l’enregistrement des permissions." -#: rhodecode/controllers/admin/users.py:303 +#: rhodecode/controllers/admin/users.py:309 #, python-format msgid "Added email %s to user" msgstr "L’e-mail « %s » a été ajouté à l’utilisateur." -#: rhodecode/controllers/admin/users.py:309 +#: rhodecode/controllers/admin/users.py:315 msgid "An error occurred during email saving" msgstr "Une erreur est survenue durant l’enregistrement de l’e-mail." -#: rhodecode/controllers/admin/users.py:319 +#: rhodecode/controllers/admin/users.py:325 msgid "Removed email from user" msgstr "L’e-mail a été enlevé de l’utilisateur." -#: rhodecode/controllers/admin/users_groups.py:84 +#: rhodecode/controllers/admin/users_groups.py:86 #, python-format msgid "created users group %s" msgstr "Le groupe d’utilisateurs %s a été créé." -#: rhodecode/controllers/admin/users_groups.py:95 +#: rhodecode/controllers/admin/users_groups.py:97 #, python-format msgid "error occurred during creation of users group %s" msgstr "Une erreur est survenue durant la création du groupe d’utilisateurs %s." -#: rhodecode/controllers/admin/users_groups.py:135 +#: rhodecode/controllers/admin/users_groups.py:164 #, python-format msgid "updated users group %s" msgstr "Le groupe d’utilisateurs %s a été mis à jour." -#: rhodecode/controllers/admin/users_groups.py:157 +#: rhodecode/controllers/admin/users_groups.py:186 #, python-format msgid "error occurred during update of users group %s" msgstr "Une erreur est survenue durant la mise à jour du groupe d’utilisateurs %s." -#: rhodecode/controllers/admin/users_groups.py:174 +#: rhodecode/controllers/admin/users_groups.py:203 msgid "successfully deleted users group" msgstr "Le groupe d’utilisateurs a été supprimé avec succès." -#: rhodecode/controllers/admin/users_groups.py:179 +#: rhodecode/controllers/admin/users_groups.py:208 msgid "An error occurred during deletion of users group" msgstr "Une erreur est survenue lors de la suppression du groupe d’utilisateurs." -#: rhodecode/controllers/admin/users_groups.py:233 +#: rhodecode/controllers/admin/users_groups.py:257 msgid "Granted 'repository create' permission to users 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:238 +msgstr "" +"La permission de création de dépôts a été accordée au groupe " +"d’utilisateurs." + +#: rhodecode/controllers/admin/users_groups.py:262 msgid "Revoked 'repository create' permission to users group" -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:244 +msgstr "" +"La permission de création de dépôts a été révoquée au groupe " +"d’utilisateurs." + +#: rhodecode/controllers/admin/users_groups.py:268 msgid "Granted 'repository fork' permission to users group" msgstr "La permission de fork de dépôts a été accordée au groupe d’utilisateur." -#: rhodecode/controllers/admin/users_groups.py:249 +#: rhodecode/controllers/admin/users_groups.py:273 msgid "Revoked 'repository fork' permission to users group" msgstr "La permission de fork de dépôts a été révoquée au groupe d’utilisateurs." @@ -744,11 +774,17 @@ msgid "You need to be a signed in to view this page" msgstr "Vous devez être connecté pour visualiser cette page." -#: rhodecode/lib/diffs.py:87 +#: rhodecode/lib/diffs.py:74 +msgid "binary file" +msgstr "Fichier binaire" + +#: rhodecode/lib/diffs.py:90 msgid "Changeset was too big and was cut off, use diff menu to display this diff" -msgstr "Cet ensemble de changements était trop gros pour être affiché et a été découpé, utilisez le menu « Diff » pour afficher les différences." - -#: rhodecode/lib/diffs.py:97 +msgstr "" +"Cet ensemble de changements était trop gros pour être affiché et a été " +"découpé, utilisez le menu « Diff » pour afficher les différences." + +#: rhodecode/lib/diffs.py:100 msgid "No changes detected" msgstr "Aucun changement détecté." @@ -765,189 +801,206 @@ msgid "False" msgstr "Faux" -#: rhodecode/lib/helpers.py:533 +#: rhodecode/lib/helpers.py:529 +#, fuzzy, python-format +msgid "Deleted branch: %s" +msgstr "Dépôt %s supprimé" + +#: rhodecode/lib/helpers.py:532 +#, fuzzy, python-format +msgid "Created tag: %s" +msgstr "utilisateur %s créé" + +#: rhodecode/lib/helpers.py:545 msgid "Changeset not found" msgstr "Ensemble de changements non trouvé" -#: rhodecode/lib/helpers.py:556 +#: rhodecode/lib/helpers.py:588 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Afficher les changements combinés %s->%s" -#: rhodecode/lib/helpers.py:562 +#: rhodecode/lib/helpers.py:594 msgid "compare view" msgstr "vue de comparaison" -#: rhodecode/lib/helpers.py:582 +#: rhodecode/lib/helpers.py:614 msgid "and" msgstr "et" -#: rhodecode/lib/helpers.py:583 +#: rhodecode/lib/helpers.py:615 #, python-format msgid "%s more" msgstr "%s de plus" -#: rhodecode/lib/helpers.py:584 -#: rhodecode/templates/changelog/changelog.html:49 +#: rhodecode/lib/helpers.py:616 rhodecode/templates/changelog/changelog.html:51 msgid "revisions" msgstr "révisions" -#: rhodecode/lib/helpers.py:607 -msgid "fork name " +#: rhodecode/lib/helpers.py:640 +#, fuzzy, python-format +msgid "fork name %s" msgstr "Nom du fork" -#: rhodecode/lib/helpers.py:621 +#: rhodecode/lib/helpers.py:653 #: rhodecode/templates/pullrequests/pullrequest_show.html:4 #: rhodecode/templates/pullrequests/pullrequest_show.html:12 #, python-format msgid "Pull request #%s" msgstr "Requête de pull nº%s" -#: rhodecode/lib/helpers.py:627 +#: rhodecode/lib/helpers.py:659 msgid "[deleted] repository" msgstr "[a supprimé] le dépôt" -#: rhodecode/lib/helpers.py:629 -#: rhodecode/lib/helpers.py:639 +#: rhodecode/lib/helpers.py:661 rhodecode/lib/helpers.py:671 msgid "[created] repository" msgstr "[a créé] le dépôt" -#: rhodecode/lib/helpers.py:631 +#: rhodecode/lib/helpers.py:663 msgid "[created] repository as fork" msgstr "[a créé] le dépôt en tant que fork" -#: rhodecode/lib/helpers.py:633 -#: rhodecode/lib/helpers.py:641 +#: rhodecode/lib/helpers.py:665 rhodecode/lib/helpers.py:673 msgid "[forked] repository" msgstr "[a forké] le dépôt" -#: rhodecode/lib/helpers.py:635 -#: rhodecode/lib/helpers.py:643 +#: rhodecode/lib/helpers.py:667 rhodecode/lib/helpers.py:675 msgid "[updated] repository" msgstr "[a mis à jour] le dépôt" -#: rhodecode/lib/helpers.py:637 +#: rhodecode/lib/helpers.py:669 msgid "[delete] repository" msgstr "[a supprimé] le dépôt" -#: rhodecode/lib/helpers.py:645 +#: rhodecode/lib/helpers.py:677 msgid "[created] user" msgstr "[a créé] l’utilisateur" -#: rhodecode/lib/helpers.py:647 +#: rhodecode/lib/helpers.py:679 msgid "[updated] user" msgstr "[a mis à jour] l’utilisateur" -#: rhodecode/lib/helpers.py:649 +#: rhodecode/lib/helpers.py:681 msgid "[created] users group" msgstr "[a créé] le groupe d’utilisateurs" -#: rhodecode/lib/helpers.py:651 +#: rhodecode/lib/helpers.py:683 msgid "[updated] users group" msgstr "[a mis à jour] le groupe d’utilisateurs" -#: rhodecode/lib/helpers.py:653 +#: rhodecode/lib/helpers.py:685 msgid "[commented] on revision in repository" msgstr "[a commenté] une révision du dépôt" -#: rhodecode/lib/helpers.py:655 +#: rhodecode/lib/helpers.py:687 msgid "[commented] on pull request for" msgstr "[a commenté] la requête de pull pour" -#: rhodecode/lib/helpers.py:657 +#: rhodecode/lib/helpers.py:689 msgid "[closed] pull request for" msgstr "[a fermé] la requête de pull de" -#: rhodecode/lib/helpers.py:659 +#: rhodecode/lib/helpers.py:691 msgid "[pushed] into" msgstr "[a pushé] dans" -#: rhodecode/lib/helpers.py:661 +#: rhodecode/lib/helpers.py:693 msgid "[committed via RhodeCode] into repository" msgstr "[a commité via RhodeCode] dans le dépôt" -#: rhodecode/lib/helpers.py:663 +#: rhodecode/lib/helpers.py:695 msgid "[pulled from remote] into repository" msgstr "[a pullé depuis un site distant] dans le dépôt" -#: rhodecode/lib/helpers.py:665 +#: rhodecode/lib/helpers.py:697 msgid "[pulled] from" msgstr "[a pullé] depuis" -#: rhodecode/lib/helpers.py:667 +#: rhodecode/lib/helpers.py:699 msgid "[started following] repository" msgstr "[suit maintenant] le dépôt" -#: rhodecode/lib/helpers.py:669 +#: rhodecode/lib/helpers.py:701 msgid "[stopped following] repository" msgstr "[ne suit plus] le dépôt" -#: rhodecode/lib/helpers.py:845 +#: rhodecode/lib/helpers.py:877 #, python-format msgid " and %s more" msgstr "et %s de plus" -#: rhodecode/lib/helpers.py:849 +#: rhodecode/lib/helpers.py:881 msgid "No Files" msgstr "Aucun fichier" -#: rhodecode/lib/utils2.py:352 +#: rhodecode/lib/utils2.py:403 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d an" msgstr[1] "%d ans" -#: rhodecode/lib/utils2.py:353 +#: rhodecode/lib/utils2.py:404 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d mois" msgstr[1] "%d mois" -#: rhodecode/lib/utils2.py:354 +#: rhodecode/lib/utils2.py:405 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d jour" msgstr[1] "%d jours" -#: rhodecode/lib/utils2.py:355 +#: rhodecode/lib/utils2.py:406 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d heure" msgstr[1] "%d heures" -#: rhodecode/lib/utils2.py:356 +#: rhodecode/lib/utils2.py:407 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minute" msgstr[1] "%d minutes" -#: rhodecode/lib/utils2.py:357 +#: rhodecode/lib/utils2.py:408 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d seconde" msgstr[1] "%d secondes" -#: rhodecode/lib/utils2.py:372 +#: rhodecode/lib/utils2.py:424 +#, fuzzy, python-format +msgid "in %s" +msgstr "à la ligne %s" + +#: rhodecode/lib/utils2.py:426 #, python-format msgid "%s ago" msgstr "Il y a %s" -#: rhodecode/lib/utils2.py:374 +#: rhodecode/lib/utils2.py:428 +#, fuzzy, python-format +msgid "in %s and %s" +msgstr "Il y a %s et %s" + +#: rhodecode/lib/utils2.py:431 #, python-format msgid "%s and %s ago" msgstr "Il y a %s et %s" -#: rhodecode/lib/utils2.py:377 +#: rhodecode/lib/utils2.py:434 msgid "just now" msgstr "à l’instant" -#: rhodecode/lib/celerylib/tasks.py:269 +#: rhodecode/lib/celerylib/tasks.py:270 msgid "password reset link" msgstr "Réinitialisation du mot de passe" @@ -960,83 +1013,83 @@ msgid "[Mention]" msgstr "[Mention]" -#: rhodecode/model/db.py:1164 +#: rhodecode/model/db.py:1163 msgid "Repository no access" msgstr "Aucun accès au dépôt" -#: rhodecode/model/db.py:1165 +#: rhodecode/model/db.py:1164 msgid "Repository read access" msgstr "Accès en lecture au dépôt" +#: rhodecode/model/db.py:1165 +msgid "Repository write access" +msgstr "Accès en écriture au dépôt" + #: rhodecode/model/db.py:1166 -msgid "Repository write access" -msgstr "Accès en écriture au dépôt" - -#: rhodecode/model/db.py:1167 msgid "Repository admin access" msgstr "Accès administrateur au dépôt" -#: rhodecode/model/db.py:1169 +#: rhodecode/model/db.py:1168 msgid "Repositories Group no access" msgstr "Aucun accès au groupe de dépôts" -#: rhodecode/model/db.py:1170 +#: rhodecode/model/db.py:1169 msgid "Repositories Group read access" msgstr "Accès en lecture au groupe de dépôts" -#: rhodecode/model/db.py:1171 +#: rhodecode/model/db.py:1170 msgid "Repositories Group write access" msgstr "Accès en écriture au groupe de dépôts" -#: rhodecode/model/db.py:1172 +#: rhodecode/model/db.py:1171 msgid "Repositories Group admin access" msgstr "Accès administrateur au groupe de dépôts" +#: rhodecode/model/db.py:1173 +msgid "RhodeCode Administrator" +msgstr "Administrateur RhodeCode" + #: rhodecode/model/db.py:1174 -msgid "RhodeCode Administrator" -msgstr "Administrateur RhodeCode" - -#: rhodecode/model/db.py:1175 msgid "Repository creation disabled" msgstr "Création de dépôt désactivée" -#: rhodecode/model/db.py:1176 +#: rhodecode/model/db.py:1175 msgid "Repository creation enabled" msgstr "Création de dépôt activée" -#: rhodecode/model/db.py:1177 +#: rhodecode/model/db.py:1176 msgid "Repository forking disabled" msgstr "Fork de dépôt désactivé" +#: rhodecode/model/db.py:1177 +msgid "Repository forking enabled" +msgstr "Fork de dépôt activé" + #: rhodecode/model/db.py:1178 -msgid "Repository forking enabled" -msgstr "Fork de dépôt activé" +msgid "Register disabled" +msgstr "Enregistrement désactivé" #: rhodecode/model/db.py:1179 -msgid "Register disabled" -msgstr "Enregistrement désactivé" - -#: rhodecode/model/db.py:1180 msgid "Register new user with RhodeCode with manual activation" msgstr "Enregistrer un nouvel utilisateur Rhodecode manuellement activé" -#: rhodecode/model/db.py:1183 +#: rhodecode/model/db.py:1182 msgid "Register new user with RhodeCode with auto activation" msgstr "Enregistrer un nouvel utilisateur Rhodecode auto-activé" -#: rhodecode/model/db.py:1611 +#: rhodecode/model/db.py:1623 msgid "Not Reviewed" msgstr "Pas encore relue" -#: rhodecode/model/db.py:1612 +#: rhodecode/model/db.py:1624 msgid "Approved" msgstr "Approuvée " -#: rhodecode/model/db.py:1613 +#: rhodecode/model/db.py:1625 msgid "Rejected" msgstr "Rejetée" -#: rhodecode/model/db.py:1614 +#: rhodecode/model/db.py:1626 msgid "Under Review" msgstr "En cours de relecture" @@ -1059,35 +1112,41 @@ msgstr "Entrez au moins %(min)i caractères" #: rhodecode/model/notification.py:220 -msgid "commented on commit" +#, fuzzy, python-format +msgid "commented on commit at %(when)s" msgstr "a posté un commentaire sur le commit" #: rhodecode/model/notification.py:221 -msgid "sent message" +#, fuzzy, python-format +msgid "sent message at %(when)s" msgstr "a envoyé un message" #: rhodecode/model/notification.py:222 -msgid "mentioned you" +#, fuzzy, python-format +msgid "mentioned you at %(when)s" msgstr "vous a mentioné" #: rhodecode/model/notification.py:223 -msgid "registered in RhodeCode" +#, fuzzy, python-format +msgid "registered in RhodeCode at %(when)s" msgstr "s’est enregistré sur RhodeCode" #: rhodecode/model/notification.py:224 -msgid "opened new pull request" +#, fuzzy, python-format +msgid "opened new pull request at %(when)s" msgstr "a ouvert une nouvelle requête de pull" #: rhodecode/model/notification.py:225 -msgid "commented on pull request" +#, fuzzy, python-format +msgid "commented on pull request at %(when)s" msgstr "a commenté sur la requête de pull" -#: rhodecode/model/pull_request.py:89 +#: rhodecode/model/pull_request.py:90 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s" msgstr "%(user)s voudrait que vous examiniez sa requête de pull nº%(pr_id)s" -#: rhodecode/model/scm.py:535 +#: rhodecode/model/scm.py:542 msgid "latest tip" msgstr "Dernier sommet" @@ -1095,23 +1154,29 @@ msgid "new user registration" msgstr "Nouveau compte utilisateur enregistré" -#: rhodecode/model/user.py:255 -#: rhodecode/model/user.py:277 -#: rhodecode/model/user.py:299 +#: rhodecode/model/user.py:255 rhodecode/model/user.py:279 +#: rhodecode/model/user.py:301 msgid "You can't Edit this user since it's crucial for entire application" -msgstr "Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon fonctionnement de l’application." - -#: rhodecode/model/user.py:323 +msgstr "" +"Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon" +" fonctionnement de l’application." + +#: rhodecode/model/user.py:325 msgid "You can't remove this user since it's crucial for entire application" -msgstr "Vous ne pouvez pas supprimer cet utilisateur ; il est nécessaire pour le bon fonctionnement de l’application." - -#: rhodecode/model/user.py:329 +msgstr "" +"Vous ne pouvez pas supprimer cet utilisateur ; il est nécessaire pour le " +"bon fonctionnement de l’application." + +#: rhodecode/model/user.py:331 #, python-format -msgid "user \"%s\" still owns %s repositories and cannot be removed. Switch owners or remove those repositories. %s" -msgstr "L’utilisateur « %s » possède %s dépôts et ne peut être supprimé. Changez les propriétaires de ces dépôts. %s" - -#: rhodecode/model/validators.py:36 -#: rhodecode/model/validators.py:37 +msgid "" +"user \"%s\" still owns %s repositories and cannot be removed. Switch " +"owners or remove those repositories. %s" +msgstr "" +"L’utilisateur « %s » possède %s dépôts et ne peut être supprimé. Changez " +"les propriétaires de ces dépôts. %s" + +#: rhodecode/model/validators.py:36 rhodecode/model/validators.py:37 msgid "Value cannot be an empty list" msgstr "Cette valeur ne peut être une liste vide." @@ -1126,8 +1191,13 @@ msgstr "Le nom d’utilisateur « %(username)s » n’est pas autorisé" #: rhodecode/model/validators.py:87 -msgid "Username may only contain alphanumeric characters underscores, periods or dashes and must begin with alphanumeric character" -msgstr "Le nom d’utilisateur peut contenir uniquement des caractères alpha-numériques ainsi que les caractères suivants : « _ . - ». Il doit commencer par un caractère alpha-numérique." +msgid "" +"Username may only contain alphanumeric characters underscores, periods or" +" dashes and must begin with alphanumeric character" +msgstr "" +"Le nom d’utilisateur peut contenir uniquement des caractères alpha-" +"numériques ainsi que les caractères suivants : « _ . - ». Il doit " +"commencer par un caractère alpha-numérique." #: rhodecode/model/validators.py:115 #, python-format @@ -1144,8 +1214,13 @@ msgstr "Le groupe d’utilisateurs « %(usersgroup)s » existe déjà." #: rhodecode/model/validators.py:137 -msgid "users group name may only contain alphanumeric characters underscores, periods or dashes and must begin with alphanumeric character" -msgstr "Le nom de groupe d’utilisateurs peut contenir uniquement des caractères alpha-numériques ainsi que les caractères suivants : « _ . - ». Il doit commencer par un caractère alpha-numérique." +msgid "" +"users group name may only contain alphanumeric characters underscores, " +"periods or dashes and must begin with alphanumeric character" +msgstr "" +"Le nom de groupe d’utilisateurs peut contenir uniquement des caractères " +"alpha-numériques ainsi que les caractères suivants : « _ . - ». Il doit " +"commencer par un caractère alpha-numérique." #: rhodecode/model/validators.py:175 msgid "Cannot assign this group as parent" @@ -1207,14 +1282,15 @@ #: rhodecode/model/validators.py:433 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" -msgstr "URL à cloner invalide. Veuillez fournir une URL valide en http(s) ou svn+http(s)." +msgstr "" +"URL à cloner invalide. Veuillez fournir une URL valide en http(s) ou " +"svn+http(s)." #: rhodecode/model/validators.py:458 msgid "Fork have to be the same type as parent" msgstr "Le fork doit être du même type que le parent." #: rhodecode/model/validators.py:473 -#| msgid "You don't have permission to view this page" msgid "You don't have permissions to create repository in this group" msgstr "Vous n’avez pas la permission de créer un dépôt dans ce groupe." @@ -1236,13 +1312,19 @@ msgstr "L’adresse e-mail « %(email)s » n’existe pas" #: rhodecode/model/validators.py:654 -msgid "The LDAP Login attribute of the CN must be specified - this is the name of the attribute that is equivalent to \"username\"" -msgstr "L’attribut Login du CN doit être spécifié. Cet attribut correspond au nom d’utilisateur." +msgid "" +"The LDAP Login attribute of the CN must be specified - this is the name " +"of the attribute that is equivalent to \"username\"" +msgstr "" +"L’attribut Login du CN doit être spécifié. Cet attribut correspond au nom" +" d’utilisateur." #: rhodecode/model/validators.py:673 #, 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." +msgstr "" +"Les révisions %(revs)s font déjà partie de la requête de pull ou on des " +"statuts définis." #: rhodecode/templates/index.html:3 msgid "Dashboard" @@ -1262,7 +1344,7 @@ #: rhodecode/templates/index_base.html:6 #: rhodecode/templates/admin/repos/repos.html:9 -#: rhodecode/templates/base/base.html:230 +#: rhodecode/templates/base/base.html:233 msgid "repositories" msgstr "Dépôts" @@ -1273,6 +1355,7 @@ msgstr "AJOUTER UN DÉPÔT" #: rhodecode/templates/index_base.html:29 +#: rhodecode/templates/index_base.html:136 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:32 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:32 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:33 @@ -1282,9 +1365,10 @@ msgstr "Nom de groupe" #: rhodecode/templates/index_base.html:30 -#: rhodecode/templates/index_base.html:71 -#: rhodecode/templates/index_base.html:142 -#: rhodecode/templates/index_base.html:168 +#: rhodecode/templates/index_base.html:72 +#: rhodecode/templates/index_base.html:138 +#: rhodecode/templates/index_base.html:176 +#: rhodecode/templates/index_base.html:266 #: rhodecode/templates/admin/repos/repo_add_base.html:56 #: rhodecode/templates/admin/repos/repo_edit.html:75 #: rhodecode/templates/admin/repos/repos.html:72 @@ -1293,147 +1377,141 @@ #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34 #: rhodecode/templates/forks/fork.html:59 #: rhodecode/templates/settings/repo_settings.html:66 -#: rhodecode/templates/summary/summary.html:105 +#: rhodecode/templates/summary/summary.html:114 msgid "Description" msgstr "Description" #: rhodecode/templates/index_base.html:40 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:47 msgid "Repositories group" msgstr "Groupe de dépôts" -#: rhodecode/templates/index_base.html:70 -#: rhodecode/templates/index_base.html:166 +#: rhodecode/templates/index_base.html:71 +#: rhodecode/templates/index_base.html:174 +#: rhodecode/templates/index_base.html:264 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:32 #: rhodecode/templates/admin/repos/repos.html:70 -#: rhodecode/templates/admin/users/user_edit.html:192 +#: rhodecode/templates/admin/users/user_edit.html:196 #: rhodecode/templates/admin/users/user_edit_my_account.html:59 -#: rhodecode/templates/admin/users/user_edit_my_account.html:181 -#: rhodecode/templates/admin/users/user_edit_my_account.html:217 +#: rhodecode/templates/admin/users/user_edit_my_account.html:180 +#: rhodecode/templates/admin/users/user_edit_my_account.html:216 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:184 #: rhodecode/templates/bookmarks/bookmarks.html:36 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 -#: rhodecode/templates/branches/branches.html:51 +#: rhodecode/templates/branches/branches.html:50 +#: rhodecode/templates/branches/branches_data.html:6 #: rhodecode/templates/files/files_browser.html:47 -#: rhodecode/templates/journal/journal.html:59 -#: rhodecode/templates/journal/journal.html:107 -#: rhodecode/templates/journal/journal.html:186 +#: rhodecode/templates/journal/journal.html:62 +#: rhodecode/templates/journal/journal.html:168 +#: rhodecode/templates/journal/journal_page_repos.html:7 #: rhodecode/templates/settings/repo_settings.html:31 #: rhodecode/templates/summary/summary.html:43 -#: rhodecode/templates/summary/summary.html:123 -#: rhodecode/templates/tags/tags.html:36 +#: rhodecode/templates/summary/summary.html:132 +#: rhodecode/templates/tags/tags.html:51 #: rhodecode/templates/tags/tags_data.html:6 msgid "Name" msgstr "Nom" -#: rhodecode/templates/index_base.html:72 +#: rhodecode/templates/index_base.html:73 msgid "Last change" msgstr "Dernière modification" -#: rhodecode/templates/index_base.html:73 -#: rhodecode/templates/index_base.html:171 -#: rhodecode/templates/admin/users/user_edit_my_account.html:183 -#: rhodecode/templates/journal/journal.html:188 +#: rhodecode/templates/index_base.html:74 +#: rhodecode/templates/index_base.html:179 +#: rhodecode/templates/admin/users/user_edit_my_account.html:182 +#: rhodecode/templates/journal/journal.html:170 msgid "Tip" msgstr "Sommet" -#: rhodecode/templates/index_base.html:74 -#: rhodecode/templates/index_base.html:173 +#: rhodecode/templates/index_base.html:75 +#: rhodecode/templates/index_base.html:181 +#: rhodecode/templates/index_base.html:269 #: rhodecode/templates/admin/repos/repo_edit.html:121 #: rhodecode/templates/admin/repos/repos.html:73 msgid "Owner" msgstr "Propriétaire" -#: rhodecode/templates/index_base.html:75 +#: rhodecode/templates/index_base.html:76 #: rhodecode/templates/summary/summary.html:48 #: rhodecode/templates/summary/summary.html:51 msgid "RSS" msgstr "RSS" -#: rhodecode/templates/index_base.html:76 +#: rhodecode/templates/index_base.html:77 msgid "Atom" msgstr "Atom" -#: rhodecode/templates/index_base.html:110 -#: rhodecode/templates/index_base.html:112 -#, python-format -msgid "Subscribe to %s rss feed" -msgstr "S’abonner au flux RSS de %s" - -#: rhodecode/templates/index_base.html:117 -#: rhodecode/templates/index_base.html:119 -#, python-format -msgid "Subscribe to %s atom feed" -msgstr "S’abonner au flux ATOM de %s" - -#: rhodecode/templates/index_base.html:140 -msgid "Group Name" -msgstr "Nom du groupe" - -#: rhodecode/templates/index_base.html:158 -#: rhodecode/templates/index_base.html:198 +#: rhodecode/templates/index_base.html:167 +#: rhodecode/templates/index_base.html:207 +#: rhodecode/templates/index_base.html:291 #: rhodecode/templates/admin/repos/repos.html:94 -#: rhodecode/templates/admin/users/user_edit_my_account.html:203 +#: rhodecode/templates/admin/users/user_edit_my_account.html:202 #: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:60 -#: rhodecode/templates/branches/branches.html:77 -#: rhodecode/templates/journal/journal.html:211 -#: rhodecode/templates/tags/tags.html:60 +#: rhodecode/templates/branches/branches.html:76 +#: rhodecode/templates/journal/journal.html:193 +#: rhodecode/templates/tags/tags.html:77 msgid "Click to sort ascending" msgstr "Tri ascendant" -#: rhodecode/templates/index_base.html:159 -#: rhodecode/templates/index_base.html:199 +#: rhodecode/templates/index_base.html:168 +#: rhodecode/templates/index_base.html:208 +#: rhodecode/templates/index_base.html:292 #: rhodecode/templates/admin/repos/repos.html:95 -#: rhodecode/templates/admin/users/user_edit_my_account.html:204 +#: rhodecode/templates/admin/users/user_edit_my_account.html:203 #: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:61 -#: rhodecode/templates/branches/branches.html:78 -#: rhodecode/templates/journal/journal.html:212 -#: rhodecode/templates/tags/tags.html:61 +#: rhodecode/templates/branches/branches.html:77 +#: rhodecode/templates/journal/journal.html:194 +#: rhodecode/templates/tags/tags.html:78 msgid "Click to sort descending" msgstr "Tri descendant" -#: rhodecode/templates/index_base.html:169 +#: rhodecode/templates/index_base.html:177 +#: rhodecode/templates/index_base.html:267 msgid "Last Change" msgstr "Dernière modification" -#: rhodecode/templates/index_base.html:200 +#: rhodecode/templates/index_base.html:209 +#: rhodecode/templates/index_base.html:293 #: rhodecode/templates/admin/repos/repos.html:96 -#: rhodecode/templates/admin/users/user_edit_my_account.html:205 +#: rhodecode/templates/admin/users/user_edit_my_account.html:204 #: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:62 -#: rhodecode/templates/branches/branches.html:79 -#: rhodecode/templates/journal/journal.html:213 -#: rhodecode/templates/tags/tags.html:62 +#: rhodecode/templates/branches/branches.html:78 +#: rhodecode/templates/journal/journal.html:195 +#: rhodecode/templates/tags/tags.html:79 msgid "No records found." msgstr "Aucun élément n’a été trouvé." -#: rhodecode/templates/index_base.html:201 +#: rhodecode/templates/index_base.html:210 +#: rhodecode/templates/index_base.html:294 #: rhodecode/templates/admin/repos/repos.html:97 -#: rhodecode/templates/admin/users/user_edit_my_account.html:206 +#: rhodecode/templates/admin/users/user_edit_my_account.html:205 #: rhodecode/templates/admin/users/users.html:110 #: rhodecode/templates/bookmarks/bookmarks.html:63 -#: rhodecode/templates/branches/branches.html:80 -#: rhodecode/templates/journal/journal.html:214 -#: rhodecode/templates/tags/tags.html:63 +#: rhodecode/templates/branches/branches.html:79 +#: rhodecode/templates/journal/journal.html:196 +#: rhodecode/templates/tags/tags.html:80 msgid "Data error." msgstr "Erreur d’intégrité des données." -#: rhodecode/templates/index_base.html:202 +#: rhodecode/templates/index_base.html:211 +#: rhodecode/templates/index_base.html:295 #: rhodecode/templates/admin/repos/repos.html:98 -#: rhodecode/templates/admin/users/user_edit_my_account.html:207 +#: rhodecode/templates/admin/users/user_edit_my_account.html:206 #: rhodecode/templates/admin/users/users.html:111 #: rhodecode/templates/bookmarks/bookmarks.html:64 -#: rhodecode/templates/branches/branches.html:81 -#: rhodecode/templates/journal/journal.html:215 -#: rhodecode/templates/tags/tags.html:64 +#: rhodecode/templates/branches/branches.html:80 +#: rhodecode/templates/journal/journal.html:54 +#: rhodecode/templates/journal/journal.html:197 +#: rhodecode/templates/tags/tags.html:81 msgid "Loading..." msgstr "Chargement…" -#: rhodecode/templates/login.html:5 -#: rhodecode/templates/login.html:54 +#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:54 msgid "Sign In" msgstr "Connexion" @@ -1441,19 +1519,17 @@ msgid "Sign In to" msgstr "Connexion à" -#: rhodecode/templates/login.html:31 -#: rhodecode/templates/register.html:20 +#: rhodecode/templates/login.html:31 rhodecode/templates/register.html:20 #: rhodecode/templates/admin/admin_log.html:5 #: rhodecode/templates/admin/users/user_add.html:32 #: rhodecode/templates/admin/users/user_edit.html:50 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:26 #: rhodecode/templates/base/base.html:83 -#: rhodecode/templates/summary/summary.html:122 +#: rhodecode/templates/summary/summary.html:131 msgid "Username" msgstr "Nom d’utilisateur" -#: rhodecode/templates/login.html:40 -#: rhodecode/templates/register.html:29 +#: 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:92 @@ -1468,8 +1544,7 @@ msgid "Forgot your password ?" msgstr "Mot de passe oublié ?" -#: rhodecode/templates/login.html:63 -#: rhodecode/templates/base/base.html:103 +#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:103 msgid "Don't have an account ?" msgstr "Vous n’avez pas de compte ?" @@ -1493,8 +1568,7 @@ msgid "Password reset link will be send to matching email address" msgstr "Votre nouveau mot de passe sera envoyé à l’adresse correspondante." -#: rhodecode/templates/register.html:5 -#: rhodecode/templates/register.html:74 +#: rhodecode/templates/register.html:5 rhodecode/templates/register.html:74 msgid "Sign Up" msgstr "Inscription" @@ -1508,23 +1582,23 @@ #: rhodecode/templates/register.html:47 #: rhodecode/templates/admin/users/user_add.html:59 -#: rhodecode/templates/admin/users/user_edit.html:86 +#: rhodecode/templates/admin/users/user_edit.html:90 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:53 msgid "First Name" msgstr "Prénom" #: rhodecode/templates/register.html:56 #: rhodecode/templates/admin/users/user_add.html:68 -#: rhodecode/templates/admin/users/user_edit.html:95 +#: rhodecode/templates/admin/users/user_edit.html:99 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:62 msgid "Last Name" msgstr "Nom" #: rhodecode/templates/register.html:65 #: rhodecode/templates/admin/users/user_add.html:77 -#: rhodecode/templates/admin/users/user_edit.html:104 +#: rhodecode/templates/admin/users/user_edit.html:108 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:71 -#: rhodecode/templates/summary/summary.html:124 +#: rhodecode/templates/summary/summary.html:133 msgid "Email" msgstr "E-mail" @@ -1564,7 +1638,7 @@ msgstr "Tags" #: rhodecode/templates/switch_to_list.html:22 -#: rhodecode/templates/tags/tags_data.html:33 +#: rhodecode/templates/tags/tags_data.html:38 msgid "There are no tags yet" msgstr "Aucun tag n’a été créé pour le moment." @@ -1587,8 +1661,8 @@ #: rhodecode/templates/admin/repos/repos.html:74 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:9 -#: rhodecode/templates/journal/journal.html:61 -#: rhodecode/templates/journal/journal.html:62 +#: rhodecode/templates/journal/journal_page_repos.html:9 +#: rhodecode/templates/journal/journal_page_repos.html:10 msgid "Action" msgstr "Action" @@ -1599,8 +1673,9 @@ #: rhodecode/templates/admin/admin_log.html:8 #: rhodecode/templates/bookmarks/bookmarks.html:37 #: rhodecode/templates/bookmarks/bookmarks_data.html:7 -#: rhodecode/templates/branches/branches.html:52 -#: rhodecode/templates/tags/tags.html:37 +#: rhodecode/templates/branches/branches.html:51 +#: rhodecode/templates/branches/branches_data.html:7 +#: rhodecode/templates/tags/tags.html:52 #: rhodecode/templates/tags/tags_data.html:7 msgid "Date" msgstr "Date" @@ -1609,7 +1684,7 @@ msgid "From IP" msgstr "Depuis l’adresse IP" -#: rhodecode/templates/admin/admin_log.html:53 +#: rhodecode/templates/admin/admin_log.html:57 msgid "No actions yet" msgstr "Aucune action n’a été enregistrée pour le moment." @@ -1689,8 +1764,8 @@ #: rhodecode/templates/admin/repos/repo_edit.html:141 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74 #: rhodecode/templates/admin/settings/hooks.html:73 -#: rhodecode/templates/admin/users/user_edit.html:129 -#: rhodecode/templates/admin/users/user_edit.html:174 +#: rhodecode/templates/admin/users/user_edit.html:133 +#: rhodecode/templates/admin/users/user_edit.html:178 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:79 #: rhodecode/templates/admin/users_groups/users_group_edit.html:135 #: rhodecode/templates/settings/repo_settings.html:93 @@ -1711,8 +1786,8 @@ msgstr "Commentaires" #: rhodecode/templates/admin/notifications/notifications.html:31 -#: rhodecode/templates/base/base.html:263 -#: rhodecode/templates/base/base.html:265 +#: rhodecode/templates/base/base.html:266 +#: rhodecode/templates/base/base.html:268 msgid "Pull requests" msgstr "Requêtes de pull" @@ -1740,7 +1815,7 @@ #: rhodecode/templates/admin/permissions/permissions.html:11 #: rhodecode/templates/admin/repos/repo_edit.html:134 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58 -#: rhodecode/templates/admin/users/user_edit.html:139 +#: rhodecode/templates/admin/users/user_edit.html:143 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100 #: rhodecode/templates/settings/repo_settings.html:86 msgid "Permissions" @@ -1759,8 +1834,14 @@ msgstr "Permissions du dépôt" #: rhodecode/templates/admin/permissions/permissions.html:49 -msgid "All default permissions on each repository will be reset to choosen permission, note that all custom default permission on repositories 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." +msgid "" +"All default permissions on each repository will be reset to choosen " +"permission, note that all custom default permission on repositories 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:50 msgid "overwrite existing settings" @@ -1779,7 +1860,7 @@ msgstr "Fork de dépôt" #: rhodecode/templates/admin/permissions/permissions.html:78 -#: rhodecode/templates/admin/repos/repo_edit.html:255 +#: rhodecode/templates/admin/repos/repo_edit.html:264 msgid "set" msgstr "Définir" @@ -1799,8 +1880,8 @@ msgstr "ajouter un nouveau" #: rhodecode/templates/admin/repos/repo_add_base.html:20 -#: rhodecode/templates/summary/summary.html:95 -#: rhodecode/templates/summary/summary.html:96 +#: rhodecode/templates/summary/summary.html:104 +#: rhodecode/templates/summary/summary.html:105 msgid "Clone from" msgstr "Cloner depuis" @@ -1844,21 +1925,29 @@ #: rhodecode/templates/forks/fork.html:45 #: rhodecode/templates/settings/repo_settings.html:61 msgid "Default revision for files page, downloads, whoosh and readme" -msgstr "Révision par défaut pour les pages de fichiers, de téléchargements, de recherche et de documentation." +msgstr "" +"Révision par défaut pour les pages de fichiers, de téléchargements, de " +"recherche et de documentation." #: rhodecode/templates/admin/repos/repo_add_base.html:60 #: rhodecode/templates/admin/repos/repo_edit.html:79 #: rhodecode/templates/forks/fork.html:63 #: rhodecode/templates/settings/repo_settings.html:70 msgid "Keep it short and to the point. Use a README file for longer descriptions." -msgstr "Gardez cette description précise et concise. Utilisez un fichier README pour des descriptions plus détaillées." +msgstr "" +"Gardez cette description précise et concise. Utilisez un fichier README " +"pour des descriptions plus détaillées." #: rhodecode/templates/admin/repos/repo_add_base.html:69 #: rhodecode/templates/admin/repos/repo_edit.html:89 #: rhodecode/templates/forks/fork.html:72 #: rhodecode/templates/settings/repo_settings.html:80 -msgid "Private repositories are only visible to people explicitly added as collaborators." -msgstr "Les dépôts privés sont visibles seulement par les utilisateurs ajoutés comme collaborateurs." +msgid "" +"Private repositories are only visible to people explicitly added as " +"collaborators." +msgstr "" +"Les dépôts privés sont visibles seulement par les utilisateurs ajoutés " +"comme collaborateurs." #: rhodecode/templates/admin/repos/repo_add_base.html:73 msgid "add" @@ -1874,12 +1963,14 @@ #: rhodecode/templates/admin/repos/repo_edit.html:13 #: rhodecode/templates/admin/users/user_edit.html:13 -#: rhodecode/templates/admin/users/user_edit.html:224 -#: rhodecode/templates/admin/users/user_edit.html:226 +#: rhodecode/templates/admin/users/user_edit.html:228 +#: rhodecode/templates/admin/users/user_edit.html:230 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13 -#: rhodecode/templates/files/files_source.html:44 -#: rhodecode/templates/journal/journal.html:81 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:207 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:209 +#: rhodecode/templates/files/files_source.html:29 +#: rhodecode/templates/journal/journal_page_repos.html:29 msgid "edit" msgstr "éditer" @@ -1925,16 +2016,16 @@ #: rhodecode/templates/admin/repos/repo_edit.html:142 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75 #: rhodecode/templates/admin/settings/settings.html:113 -#: rhodecode/templates/admin/settings/settings.html:168 -#: rhodecode/templates/admin/settings/settings.html:258 -#: rhodecode/templates/admin/users/user_edit.html:130 -#: rhodecode/templates/admin/users/user_edit.html:175 -#: rhodecode/templates/admin/users/user_edit.html:278 +#: rhodecode/templates/admin/settings/settings.html:179 +#: rhodecode/templates/admin/settings/settings.html:269 +#: rhodecode/templates/admin/users/user_edit.html:134 +#: rhodecode/templates/admin/users/user_edit.html:179 +#: rhodecode/templates/admin/users/user_edit.html:282 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:80 #: rhodecode/templates/admin/users_groups/users_group_edit.html:136 #: rhodecode/templates/files/files_add.html:82 #: rhodecode/templates/files/files_edit.html:68 -#: rhodecode/templates/pullrequests/pullrequest.html:122 +#: rhodecode/templates/pullrequests/pullrequest.html:124 #: rhodecode/templates/settings/repo_settings.html:94 msgid "Reset" msgstr "Réinitialiser" @@ -1988,90 +2079,122 @@ msgstr "Voulez-vous vraiment invalider le cache du dépôt ?" #: rhodecode/templates/admin/repos/repo_edit.html:193 -msgid "Manually invalidate cache for this repository. On first access repository will be cached again" -msgstr "Invalide manuellement le cache de ce dépôt. Au prochain accès sur ce dépôt, il sera à nouveau mis en cache." +msgid "" +"Manually invalidate cache for this repository. On first access repository" +" will be cached again" +msgstr "" +"Invalide manuellement le cache de ce dépôt. Au prochain accès sur ce " +"dépôt, il sera à nouveau mis en cache." #: rhodecode/templates/admin/repos/repo_edit.html:198 msgid "List of cached values" msgstr "Liste des valeurs en cache" -#: rhodecode/templates/admin/repos/repo_edit.html:209 -#: rhodecode/templates/base/base.html:327 -#: rhodecode/templates/base/base.html:329 -#: rhodecode/templates/base/base.html:331 +#: rhodecode/templates/admin/repos/repo_edit.html:201 +msgid "Prefix" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:202 +#, fuzzy +msgid "Key" +msgstr "Clé d’API" + +#: rhodecode/templates/admin/repos/repo_edit.html:203 +#: rhodecode/templates/admin/users/user_add.html:86 +#: rhodecode/templates/admin/users/user_edit.html:117 +#: rhodecode/templates/admin/users_groups/users_group_add.html:41 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:42 +msgid "Active" +msgstr "Actif" + +#: rhodecode/templates/admin/repos/repo_edit.html:218 +#: rhodecode/templates/base/base.html:330 +#: rhodecode/templates/base/base.html:332 +#: rhodecode/templates/base/base.html:334 msgid "Public journal" msgstr "Journal public" -#: rhodecode/templates/admin/repos/repo_edit.html:215 +#: rhodecode/templates/admin/repos/repo_edit.html:224 msgid "Remove from public journal" msgstr "Supprimer du journal public" -#: rhodecode/templates/admin/repos/repo_edit.html:217 +#: rhodecode/templates/admin/repos/repo_edit.html:226 msgid "Add to public journal" msgstr "Ajouter le dépôt au journal public" -#: rhodecode/templates/admin/repos/repo_edit.html:222 -msgid "All actions made on this repository will be accessible to everyone in public journal" -msgstr "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:229 +#: rhodecode/templates/admin/repos/repo_edit.html:231 +msgid "" +"All actions made on this repository will be accessible to everyone in " +"public journal" +msgstr "" +"Le descriptif des actions réalisées sur ce dépôt sera visible à tous " +"depuis le journal public." + +#: rhodecode/templates/admin/repos/repo_edit.html:238 msgid "Locking" msgstr "Verrouillage" -#: rhodecode/templates/admin/repos/repo_edit.html:234 +#: rhodecode/templates/admin/repos/repo_edit.html:243 msgid "Unlock locked repo" msgstr "Déverrouiller le dépôt" -#: rhodecode/templates/admin/repos/repo_edit.html:234 +#: rhodecode/templates/admin/repos/repo_edit.html:243 msgid "Confirm to unlock repository" msgstr "Veuillez confirmer le déverrouillage de ce dépôt." -#: rhodecode/templates/admin/repos/repo_edit.html:237 +#: rhodecode/templates/admin/repos/repo_edit.html:246 msgid "lock repo" msgstr "Verrouiller le dépôt" -#: rhodecode/templates/admin/repos/repo_edit.html:237 +#: rhodecode/templates/admin/repos/repo_edit.html:246 msgid "Confirm to lock repository" msgstr "Veuillez confirmer le verrouillage de ce dépôt." -#: rhodecode/templates/admin/repos/repo_edit.html:238 +#: rhodecode/templates/admin/repos/repo_edit.html:247 msgid "Repository is not locked" msgstr "Ce dépôt n’est pas verrouillé." -#: rhodecode/templates/admin/repos/repo_edit.html:243 +#: rhodecode/templates/admin/repos/repo_edit.html:252 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:250 +msgstr "" +"Forcer le verrouillage du dépôt. Ce réglage fonctionne uniquement quand " +"l‘accès anonyme est désactivé." + +#: rhodecode/templates/admin/repos/repo_edit.html:259 msgid "Set as fork of" msgstr "Indiquer comme fork" -#: rhodecode/templates/admin/repos/repo_edit.html:259 +#: rhodecode/templates/admin/repos/repo_edit.html:268 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:265 +#: rhodecode/templates/admin/repos/repo_edit.html:274 #: rhodecode/templates/changeset/changeset_file_comment.html:26 msgid "Delete" msgstr "Supprimer" -#: rhodecode/templates/admin/repos/repo_edit.html:269 +#: rhodecode/templates/admin/repos/repo_edit.html:278 msgid "Remove this repository" msgstr "Supprimer ce dépôt" -#: rhodecode/templates/admin/repos/repo_edit.html:269 -#: rhodecode/templates/journal/journal.html:84 +#: rhodecode/templates/admin/repos/repo_edit.html:278 msgid "Confirm to delete this repository" msgstr "Voulez-vous vraiment supprimer ce dépôt ?" -#: rhodecode/templates/admin/repos/repo_edit.html:273 +#: rhodecode/templates/admin/repos/repo_edit.html:282 msgid "" -"This repository will be renamed in a special way in order to be unaccesible for RhodeCode and VCS systems.\n" -" If you need fully delete it from filesystem please do it manually" +"This repository will be renamed in a special way in order to be " +"unaccesible for RhodeCode and VCS systems.\n" +" If you need fully delete it from filesystem " +"please do it manually" msgstr "" -"Ce dépôt sera renommé de manière à le rendre inaccessible à RhodeCode et au système de gestion de versions.\n" -"Si vous voulez le supprimer complètement, effectuez la suppression manuellement. Ce dépôt sera renommé de manière à le rendre inaccessible à RhodeCode et au système de gestion de versions.\n" -"Si vous voulez le supprimer complètement, effectuez la suppression manuellement." +"Ce dépôt sera renommé de manière à le rendre inaccessible à RhodeCode et " +"au système de gestion de versions.\n" +"Si vous voulez le supprimer complètement, effectuez la suppression " +"manuellement. Ce dépôt sera renommé de manière à le rendre inaccessible à" +" RhodeCode et au système de gestion de versions.\n" +"Si vous voulez le supprimer complètement, effectuez la suppression " +"manuellement." #: rhodecode/templates/admin/repos/repo_edit_perms.html:3 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3 @@ -2091,7 +2214,7 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:6 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6 #: rhodecode/templates/admin/users/users.html:85 -#: rhodecode/templates/base/base.html:226 +#: rhodecode/templates/base/base.html:229 msgid "admin" msgstr "Administration" @@ -2102,8 +2225,8 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:16 #: rhodecode/templates/data_table/_dt_elements.html:67 -#: rhodecode/templates/journal/journal.html:132 -#: rhodecode/templates/summary/summary.html:76 +#: rhodecode/templates/journal/journal.html:87 +#: rhodecode/templates/summary/summary.html:85 msgid "private repository" msgstr "Dépôt privé" @@ -2144,14 +2267,18 @@ msgstr "Appliquer aux enfants" #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:74 -msgid "Set or revoke permission to all children of that group, including repositories and other groups" -msgstr "Applique ou révoque les permissions sur tous les éléments de ce groupe, notamment les dépôts et sous-groupes." +msgid "" +"Set or revoke permission to all children of that group, including " +"repositories and other groups" +msgstr "" +"Applique ou révoque les permissions sur tous les éléments de ce groupe, " +"notamment les dépôts et sous-groupes." #: rhodecode/templates/admin/repos_groups/repos_groups.html:9 #: rhodecode/templates/base/base.html:122 -#: rhodecode/templates/base/base.html:309 -#: rhodecode/templates/base/base.html:311 -#: rhodecode/templates/base/base.html:313 +#: rhodecode/templates/base/base.html:312 +#: rhodecode/templates/base/base.html:314 +#: rhodecode/templates/base/base.html:316 #: rhodecode/templates/bookmarks/bookmarks.html:11 #: rhodecode/templates/branches/branches.html:10 #: rhodecode/templates/changelog/changelog.html:10 @@ -2163,8 +2290,7 @@ #: rhodecode/templates/files/files_add.html:15 #: rhodecode/templates/files/files_edit.html:15 #: rhodecode/templates/followers/followers.html:9 -#: rhodecode/templates/forks/fork.html:9 -#: rhodecode/templates/forks/forks.html:9 +#: rhodecode/templates/forks/fork.html:9 rhodecode/templates/forks/forks.html:9 #: rhodecode/templates/pullrequests/pullrequest.html:8 #: rhodecode/templates/pullrequests/pullrequest_show.html:8 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 @@ -2201,7 +2327,7 @@ #: rhodecode/templates/admin/users/user_add.html:94 #: rhodecode/templates/admin/users_groups/users_group_add.html:49 #: rhodecode/templates/admin/users_groups/users_group_edit.html:90 -#: rhodecode/templates/pullrequests/pullrequest_show.html:117 +#: rhodecode/templates/pullrequests/pullrequest_show.html:131 msgid "save" msgstr "Enregistrer" @@ -2214,8 +2340,12 @@ msgstr "Édition du groupe de dépôt" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:70 -msgid "Enable lock-by-pulling on group. This option will be applied to all other groups and repositories inside" -msgstr "Activer le verrou lors d’un pull sur le groupe. Cette option sera appliquée à tous les sous-groupes et dépôts de ce groupe." +msgid "" +"Enable lock-by-pulling on group. This option will be applied to all other" +" groups and repositories inside" +msgstr "" +"Activer le verrou lors d’un pull sur le groupe. Cette option sera " +"appliquée à tous les sous-groupes et dépôts de ce groupe." #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5 msgid "Repositories groups administration" @@ -2235,20 +2365,22 @@ msgid "action" msgstr "Action" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 -#: rhodecode/templates/admin/users/user_edit.html:255 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55 +#: rhodecode/templates/admin/users/user_edit.html:259 #: rhodecode/templates/admin/users_groups/users_groups.html:44 #: rhodecode/templates/data_table/_dt_elements.html:7 -#: rhodecode/templates/data_table/_dt_elements.html:103 +#: rhodecode/templates/data_table/_dt_elements.html:121 msgid "delete" msgstr "Supprimer" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 -#, python-format -msgid "Confirm to delete this group: %s" -msgstr "Voulez-vous vraiment supprimer le groupe « %s » ?" - -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:62 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55 +#, fuzzy, python-format +msgid "Confirm to delete this group: %s with %s repository" +msgid_plural "Confirm to delete this group: %s with %s repositories" +msgstr[0] "Voulez-vous vraiment supprimer ce dépôt ?" +msgstr[1] "" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:63 msgid "There are no repositories groups yet" msgstr "Aucun groupe de dépôts n’a été créé pour le moment." @@ -2288,16 +2420,26 @@ msgstr "Option de re-scan" #: rhodecode/templates/admin/settings/settings.html:38 -msgid "In case a repository was deleted from filesystem and there are leftovers in the database check this option to scan obsolete data in database and remove it." -msgstr "Cochez cette option pour supprimer d’éventuelles données obsolètes (concernant des dépôts manuellement supprimés) de la base de données." +msgid "" +"In case a repository was deleted from filesystem and there are leftovers " +"in the database check this option to scan obsolete data in database and " +"remove it." +msgstr "" +"Cochez cette option pour supprimer d’éventuelles données obsolètes " +"(concernant des dépôts manuellement supprimés) de la base de données." #: rhodecode/templates/admin/settings/settings.html:39 msgid "destroy old data" msgstr "Supprimer les données obsolètes" #: rhodecode/templates/admin/settings/settings.html:41 -msgid "Rescan repositories location for new repositories. Also deletes obsolete if `destroy` flag is checked " -msgstr "Rescanner le dossier contenant les dépôts pour en trouver de nouveaux. Supprime égalements les entrées de dépôts obsolètes si « Supprimer les données obsolètes » est coché." +msgid "" +"Rescan repositories location for new repositories. Also deletes obsolete " +"if `destroy` flag is checked " +msgstr "" +"Rescanner le dossier contenant les dépôts pour en trouver de nouveaux. " +"Supprime égalements les entrées de dépôts obsolètes si « Supprimer les " +"données obsolètes » est coché." #: rhodecode/templates/admin/settings/settings.html:46 msgid "Rescan repositories" @@ -2336,8 +2478,8 @@ msgstr "Code GA" #: rhodecode/templates/admin/settings/settings.html:112 -#: rhodecode/templates/admin/settings/settings.html:167 -#: rhodecode/templates/admin/settings/settings.html:257 +#: rhodecode/templates/admin/settings/settings.html:178 +#: rhodecode/templates/admin/settings/settings.html:268 msgid "Save settings" msgstr "Enregister les options" @@ -2345,116 +2487,143 @@ msgid "Visualisation settings" msgstr "Réglages d’affichage" -#: rhodecode/templates/admin/settings/settings.html:128 +#: rhodecode/templates/admin/settings/settings.html:127 +#, fuzzy +msgid "General" +msgstr "Activer" + +#: rhodecode/templates/admin/settings/settings.html:132 +msgid "Use lightweight dashboard" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:139 msgid "Icons" msgstr "Icônes" -#: rhodecode/templates/admin/settings/settings.html:133 -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:137 -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:144 +msgid "Show public repo icon on repositories" +msgstr "Afficher l’icône de dépôt public sur les dépôts" + +#: rhodecode/templates/admin/settings/settings.html:148 +msgid "Show private repo icon on repositories" +msgstr "Afficher l’icône de dépôt privé sur les dépôts" + +#: rhodecode/templates/admin/settings/settings.html:155 msgid "Meta-Tagging" msgstr "Meta-Tagging" -#: rhodecode/templates/admin/settings/settings.html:149 +#: rhodecode/templates/admin/settings/settings.html:160 msgid "Stylify recognised metatags:" msgstr "Styliser les méta-tags reconnus :" -#: rhodecode/templates/admin/settings/settings.html:176 +#: rhodecode/templates/admin/settings/settings.html:187 msgid "VCS settings" msgstr "Réglages de gestionnaire de version" -#: rhodecode/templates/admin/settings/settings.html:185 +#: rhodecode/templates/admin/settings/settings.html:196 msgid "Web" msgstr "Web" -#: rhodecode/templates/admin/settings/settings.html:190 +#: rhodecode/templates/admin/settings/settings.html:201 msgid "require ssl for vcs operations" msgstr "SSL requis pour les opérations de push/pull" -#: rhodecode/templates/admin/settings/settings.html:192 -msgid "RhodeCode will require SSL for pushing or pulling. If SSL is missing it will return HTTP Error 406: Not Acceptable" -msgstr "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:198 -msgid "Hooks" -msgstr "Hooks" - #: rhodecode/templates/admin/settings/settings.html:203 +msgid "" +"RhodeCode will require SSL for pushing or pulling. If SSL is missing it " +"will return HTTP Error 406: Not Acceptable" +msgstr "" +"RhodeCode requièrera SSL pour les pushs et pulls. Si le SSL n’est pas " +"utilisé l’erreur HTTP 406 (Non Acceptable) sera renvoyée." + +#: rhodecode/templates/admin/settings/settings.html:209 +msgid "Hooks" +msgstr "Hooks" + +#: rhodecode/templates/admin/settings/settings.html:214 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:207 +#: rhodecode/templates/admin/settings/settings.html:218 msgid "Show repository size after push" msgstr "Afficher la taille du dépôt après un push" -#: rhodecode/templates/admin/settings/settings.html:211 +#: rhodecode/templates/admin/settings/settings.html:222 msgid "Log user push commands" msgstr "Journaliser les commandes de push" -#: rhodecode/templates/admin/settings/settings.html:215 +#: rhodecode/templates/admin/settings/settings.html:226 msgid "Log user pull commands" msgstr "Journaliser les commandes de pull" -#: rhodecode/templates/admin/settings/settings.html:219 +#: rhodecode/templates/admin/settings/settings.html:230 msgid "advanced setup" msgstr "Avancé" -#: rhodecode/templates/admin/settings/settings.html:224 +#: rhodecode/templates/admin/settings/settings.html:235 msgid "Mercurial Extensions" msgstr "Extensions Mercurial" -#: rhodecode/templates/admin/settings/settings.html:229 +#: rhodecode/templates/admin/settings/settings.html:240 msgid "largefiles extensions" msgstr "Extensions largefiles" -#: rhodecode/templates/admin/settings/settings.html:233 +#: rhodecode/templates/admin/settings/settings.html:244 msgid "hgsubversion extensions" msgstr "Extensions hgsubversion" -#: rhodecode/templates/admin/settings/settings.html:235 -msgid "Requires hgsubversion library installed. Allows clonning from svn remote locations" -msgstr "Ceci nécessite l’installation de la bibliothèque hgsubversion. Permet de clôner à partir de dépôts Suversion." - -#: rhodecode/templates/admin/settings/settings.html:245 +#: rhodecode/templates/admin/settings/settings.html:246 +msgid "" +"Requires hgsubversion library installed. Allows clonning from svn remote " +"locations" +msgstr "" +"Ceci nécessite l’installation de la bibliothèque hgsubversion. Permet de " +"clôner à partir de dépôts Suversion." + +#: rhodecode/templates/admin/settings/settings.html:256 msgid "Repositories location" msgstr "Emplacement des dépôts" -#: rhodecode/templates/admin/settings/settings.html:250 -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 "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:251 -#: rhodecode/templates/base/base.html:218 +#: rhodecode/templates/admin/settings/settings.html:261 +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 "" +"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:262 +#: rhodecode/templates/base/base.html:221 msgid "unlock" msgstr "Déverrouiller" -#: rhodecode/templates/admin/settings/settings.html:252 -msgid "Location where repositories are stored. After changing this value a restart, and rescan is required" -msgstr "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:272 +#: rhodecode/templates/admin/settings/settings.html:263 +msgid "" +"Location where repositories are stored. After changing this value a " +"restart, and rescan is required" +msgstr "" +"Emplacement de stockage des dépôts. Si cette valeur est changée, " +"Rhodecode devra être redémarré les les dépôts rescannés." + +#: rhodecode/templates/admin/settings/settings.html:283 msgid "Test Email" msgstr "E-mail de test" -#: rhodecode/templates/admin/settings/settings.html:280 +#: rhodecode/templates/admin/settings/settings.html:291 msgid "Email to" msgstr "Envoyer l’e-mail à" -#: rhodecode/templates/admin/settings/settings.html:288 +#: rhodecode/templates/admin/settings/settings.html:299 msgid "Send" msgstr "Envoyer" -#: rhodecode/templates/admin/settings/settings.html:294 +#: rhodecode/templates/admin/settings/settings.html:305 msgid "System Info and Packages" msgstr "Information système et paquets" -#: rhodecode/templates/admin/settings/settings.html:297 +#: rhodecode/templates/admin/settings/settings.html:308 msgid "show" msgstr "Montrer" @@ -2475,13 +2644,6 @@ msgid "Password confirmation" msgstr "Confirmation" -#: rhodecode/templates/admin/users/user_add.html:86 -#: rhodecode/templates/admin/users/user_edit.html:113 -#: rhodecode/templates/admin/users_groups/users_group_add.html:41 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:42 -msgid "Active" -msgstr "Actif" - #: rhodecode/templates/admin/users/user_edit.html:5 msgid "Edit user" msgstr "Éditer l'utilisateur" @@ -2501,71 +2663,77 @@ msgid "API key" msgstr "Clé d’API" -#: rhodecode/templates/admin/users/user_edit.html:59 +#: rhodecode/templates/admin/users/user_edit.html:63 msgid "LDAP DN" msgstr "DN LDAP" -#: rhodecode/templates/admin/users/user_edit.html:68 +#: rhodecode/templates/admin/users/user_edit.html:72 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:35 msgid "New password" msgstr "Nouveau mot de passe" -#: rhodecode/templates/admin/users/user_edit.html:77 +#: rhodecode/templates/admin/users/user_edit.html:81 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:44 msgid "New password confirmation" msgstr "Confirmation du nouveau mot de passe" -#: rhodecode/templates/admin/users/user_edit.html:147 +#: rhodecode/templates/admin/users/user_edit.html:151 #: 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:152 +#: rhodecode/templates/admin/users/user_edit.html:156 #: 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:158 +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:162 #: 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:166 +#: rhodecode/templates/admin/users/user_edit.html:170 #: 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:186 +#: rhodecode/templates/admin/users/user_edit.html:190 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39 msgid "Nothing here yet" msgstr "Rien ici pour le moment" -#: rhodecode/templates/admin/users/user_edit.html:193 +#: rhodecode/templates/admin/users/user_edit.html:197 #: rhodecode/templates/admin/users/user_edit_my_account.html:60 -#: rhodecode/templates/admin/users/user_edit_my_account.html:218 +#: rhodecode/templates/admin/users/user_edit_my_account.html:217 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:185 msgid "Permission" msgstr "Permission" -#: rhodecode/templates/admin/users/user_edit.html:194 +#: rhodecode/templates/admin/users/user_edit.html:198 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:186 msgid "Edit Permission" msgstr "Éditer" -#: rhodecode/templates/admin/users/user_edit.html:243 +#: rhodecode/templates/admin/users/user_edit.html:247 msgid "Email addresses" msgstr "Adresses e-mail" -#: rhodecode/templates/admin/users/user_edit.html:256 +#: rhodecode/templates/admin/users/user_edit.html:260 #, 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:270 +#: rhodecode/templates/admin/users/user_edit.html:274 msgid "New email address" msgstr "Nouvelle adrese" -#: rhodecode/templates/admin/users/user_edit.html:277 +#: rhodecode/templates/admin/users/user_edit.html:281 msgid "Add" msgstr "Ajouter" @@ -2621,31 +2789,33 @@ #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:7 #: rhodecode/templates/bookmarks/bookmarks.html:40 #: rhodecode/templates/bookmarks/bookmarks_data.html:9 -#: rhodecode/templates/branches/branches.html:55 -#: rhodecode/templates/journal/journal.html:60 -#: rhodecode/templates/tags/tags.html:40 +#: rhodecode/templates/branches/branches.html:54 +#: rhodecode/templates/branches/branches_data.html:9 +#: rhodecode/templates/journal/journal_page_repos.html:8 +#: rhodecode/templates/tags/tags.html:55 #: rhodecode/templates/tags/tags_data.html:9 msgid "Revision" msgstr "Révision" #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28 -#: rhodecode/templates/journal/journal.html:81 +#: rhodecode/templates/journal/journal_page_repos.html:29 msgid "private" msgstr "privé" #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:31 #: rhodecode/templates/data_table/_dt_elements.html:7 +#: rhodecode/templates/journal/journal_page_repos.html:32 #, python-format msgid "Confirm to delete this repository: %s" msgstr "Voulez-vous vraiment supprimer le dépôt %s ?" #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:38 -#: rhodecode/templates/journal/journal.html:94 +#: rhodecode/templates/journal/journal_page_repos.html:42 msgid "No repositories yet" msgstr "Aucun dépôt pour le moment" #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:40 -#: rhodecode/templates/journal/journal.html:96 +#: rhodecode/templates/journal/journal_page_repos.html:44 msgid "create one now" msgstr "En créer un maintenant" @@ -2654,7 +2824,7 @@ msgstr "Administration des utilisateurs" #: rhodecode/templates/admin/users/users.html:9 -#: rhodecode/templates/base/base.html:232 +#: rhodecode/templates/base/base.html:235 msgid "users" msgstr "Utilisateurs" @@ -2684,7 +2854,7 @@ msgstr "Actif" #: rhodecode/templates/admin/users/users.html:86 -#: rhodecode/templates/base/base.html:235 +#: rhodecode/templates/base/base.html:238 msgid "ldap" msgstr "LDAP" @@ -2733,6 +2903,21 @@ msgid "Group members" msgstr "Membres du groupe" +#: rhodecode/templates/admin/users_groups/users_group_edit.html:163 +#, fuzzy +msgid "No members yet" +msgstr "Membres" + +#: rhodecode/templates/admin/users_groups/users_group_edit.html:171 +#, fuzzy +msgid "Permissions defined for this group" +msgstr "Gestion des permissions" + +#: rhodecode/templates/admin/users_groups/users_group_edit.html:178 +#, fuzzy +msgid "No permissions set yet" +msgstr "Copier les permissions" + #: rhodecode/templates/admin/users_groups/users_groups.html:5 msgid "Users groups administration" msgstr "Gestion des groupes d’utilisateurs" @@ -2776,9 +2961,9 @@ msgstr "Boîte de réception" #: rhodecode/templates/base/base.html:123 -#: rhodecode/templates/base/base.html:318 -#: rhodecode/templates/base/base.html:320 -#: rhodecode/templates/base/base.html:322 +#: rhodecode/templates/base/base.html:321 +#: rhodecode/templates/base/base.html:323 +#: rhodecode/templates/base/base.html:325 #: rhodecode/templates/journal/journal.html:4 #: rhodecode/templates/journal/journal.html:21 #: rhodecode/templates/journal/public_journal.html:4 @@ -2798,7 +2983,7 @@ msgstr "Produits" #: rhodecode/templates/base/base.html:152 -#: rhodecode/templates/base/base.html:182 +#: rhodecode/templates/base/base.html:182 rhodecode/templates/base/root.html:47 msgid "loading..." msgstr "Chargement…" @@ -2843,7 +3028,6 @@ #: rhodecode/templates/base/base.html:204 #: rhodecode/templates/base/base.html:206 -#| msgid "Repository creation" msgid "repository settings" msgstr "Réglages de dépôt" @@ -2853,49 +3037,53 @@ msgid "fork" msgstr "Fork" -#: rhodecode/templates/base/base.html:212 -#: rhodecode/templates/changelog/changelog.html:41 +#: rhodecode/templates/base/base.html:212 rhodecode/templates/base/root.html:50 +#: rhodecode/templates/changelog/changelog.html:43 msgid "Open new pull request" msgstr "Nouvelle requête de pull" -#: rhodecode/templates/base/base.html:214 +#: rhodecode/templates/base/base.html:215 +#: rhodecode/templates/forks/forks_data.html:21 +msgid "Compare fork" +msgstr "Comparer le fork" + +#: rhodecode/templates/base/base.html:217 msgid "search" msgstr "Rechercher" -#: rhodecode/templates/base/base.html:220 -#| msgid "unlock" +#: rhodecode/templates/base/base.html:223 msgid "lock" msgstr "Verrouiller" -#: rhodecode/templates/base/base.html:231 +#: rhodecode/templates/base/base.html:234 msgid "repositories groups" msgstr "Groupes de dépôts" -#: rhodecode/templates/base/base.html:233 +#: rhodecode/templates/base/base.html:236 msgid "users groups" msgstr "Groupes d’utilisateurs" -#: rhodecode/templates/base/base.html:234 +#: rhodecode/templates/base/base.html:237 msgid "permissions" msgstr "Permissions" -#: rhodecode/templates/base/base.html:236 +#: rhodecode/templates/base/base.html:239 msgid "settings" msgstr "Réglages" -#: rhodecode/templates/base/base.html:247 -#: rhodecode/templates/base/base.html:249 +#: rhodecode/templates/base/base.html:250 +#: rhodecode/templates/base/base.html:252 msgid "Followers" msgstr "Followers" -#: rhodecode/templates/base/base.html:255 -#: rhodecode/templates/base/base.html:257 +#: rhodecode/templates/base/base.html:258 +#: rhodecode/templates/base/base.html:260 msgid "Forks" msgstr "Forks" -#: rhodecode/templates/base/base.html:336 -#: rhodecode/templates/base/base.html:338 -#: rhodecode/templates/base/base.html:340 +#: rhodecode/templates/base/base.html:339 +#: rhodecode/templates/base/base.html:341 +#: rhodecode/templates/base/base.html:343 #: rhodecode/templates/search/search.html:52 msgid "Search" msgstr "Rechercher" @@ -2905,7 +3093,7 @@ msgstr "Nouveau commentaire" #: rhodecode/templates/base/root.html:43 -#: rhodecode/templates/journal/journal.html:120 +#: rhodecode/templates/journal/journal.html:75 #: rhodecode/templates/summary/summary.html:57 msgid "Stop following this repository" msgstr "Arrêter de suivre ce dépôt" @@ -2919,14 +3107,27 @@ msgid "Group" msgstr "Groupe" -#: rhodecode/templates/base/root.html:47 +#: rhodecode/templates/base/root.html:48 msgid "search truncated" msgstr "Résultats tronqués" -#: rhodecode/templates/base/root.html:48 +#: rhodecode/templates/base/root.html:49 msgid "no matching files" msgstr "Aucun fichier ne correspond" +#: rhodecode/templates/base/root.html:51 +#, fuzzy +msgid "Open new pull request for selected changesets" +msgstr "a ouvert une nouvelle requête de pull" + +#: rhodecode/templates/base/root.html:52 +msgid "Show selected changes __S -> __E" +msgstr "Afficher les changements sélections de __S à __E" + +#: rhodecode/templates/base/root.html:53 +msgid "Selection link" +msgstr "Lien vers la sélection" + #: rhodecode/templates/bookmarks/bookmarks.html:5 #, python-format msgid "%s Bookmarks" @@ -2934,8 +3135,9 @@ #: rhodecode/templates/bookmarks/bookmarks.html:39 #: rhodecode/templates/bookmarks/bookmarks_data.html:8 -#: rhodecode/templates/branches/branches.html:54 -#: rhodecode/templates/tags/tags.html:39 +#: rhodecode/templates/branches/branches.html:53 +#: rhodecode/templates/branches/branches_data.html:8 +#: rhodecode/templates/tags/tags.html:54 #: rhodecode/templates/tags/tags_data.html:8 msgid "Author" msgstr "Auteur" @@ -2949,34 +3151,15 @@ msgid "Compare branches" msgstr "Comparer les branches" -#: rhodecode/templates/branches/branches.html:57 +#: rhodecode/templates/branches/branches.html:56 +#: rhodecode/templates/branches/branches_data.html:10 #: rhodecode/templates/compare/compare_diff.html:5 #: rhodecode/templates/compare/compare_diff.html:13 +#: rhodecode/templates/tags/tags.html:57 +#: rhodecode/templates/tags/tags_data.html:10 msgid "Compare" msgstr "Comparer" -#: rhodecode/templates/branches/branches_data.html:6 -msgid "name" -msgstr "Prénom" - -#: rhodecode/templates/branches/branches_data.html:7 -msgid "date" -msgstr "Date" - -#: rhodecode/templates/branches/branches_data.html:8 -#: rhodecode/templates/shortlog/shortlog_data.html:8 -msgid "author" -msgstr "Auteur" - -#: rhodecode/templates/branches/branches_data.html:9 -#: rhodecode/templates/shortlog/shortlog_data.html:5 -msgid "revision" -msgstr "Révision" - -#: rhodecode/templates/branches/branches_data.html:10 -msgid "compare" -msgstr "Comparer" - #: rhodecode/templates/changelog/changelog.html:6 #, python-format msgid "%s Changelog" @@ -2989,59 +3172,66 @@ msgstr[0] "Affichage de %d révision sur %d" msgstr[1] "Affichage de %d révisions sur %d" -#: rhodecode/templates/changelog/changelog.html:38 +#: rhodecode/templates/changelog/changelog.html:37 +#, fuzzy +msgid "Clear selection" +msgstr "Réglages de recherche" + +#: rhodecode/templates/changelog/changelog.html:40 #: rhodecode/templates/forks/forks_data.html:19 #, python-format msgid "compare fork with %s" msgstr "Comparer le fork avec %s" -#: rhodecode/templates/changelog/changelog.html:38 -#: rhodecode/templates/forks/forks_data.html:21 -msgid "Compare fork" -msgstr "Comparer le fork" - -#: rhodecode/templates/changelog/changelog.html:47 +#: rhodecode/templates/changelog/changelog.html:40 +#, fuzzy +msgid "Compare fork with parent" +msgstr "Comparer le fork avec %s" + +#: rhodecode/templates/changelog/changelog.html:49 msgid "Show" msgstr "Afficher" -#: rhodecode/templates/changelog/changelog.html:72 -#: rhodecode/templates/summary/summary.html:364 +#: rhodecode/templates/changelog/changelog.html:74 +#: rhodecode/templates/summary/summary.html:375 msgid "show more" msgstr "montrer plus" -#: rhodecode/templates/changelog/changelog.html:76 +#: rhodecode/templates/changelog/changelog.html:78 msgid "Affected number of files, click to show more details" msgstr "Nombre de fichiers modifiés, cliquez pour plus de détails" -#: rhodecode/templates/changelog/changelog.html:89 -#: rhodecode/templates/changeset/changeset.html:38 +#: rhodecode/templates/changelog/changelog.html:91 +#: rhodecode/templates/changeset/changeset.html:44 #: rhodecode/templates/changeset/changeset_file_comment.html:20 #: rhodecode/templates/changeset/changeset_range.html:46 msgid "Changeset status" msgstr "Statut du changeset" -#: rhodecode/templates/changelog/changelog.html:92 +#: rhodecode/templates/changelog/changelog.html:94 #: rhodecode/templates/shortlog/shortlog_data.html:20 msgid "Click to open associated pull request" msgstr "Cliquez ici pour ouvrir la requête de pull associée." -#: rhodecode/templates/changelog/changelog.html:102 -#: rhodecode/templates/changeset/changeset.html:78 +#: rhodecode/templates/changelog/changelog.html:104 +#: rhodecode/templates/changeset/changeset.html:85 msgid "Parent" msgstr "Parent" -#: rhodecode/templates/changelog/changelog.html:108 -#: rhodecode/templates/changeset/changeset.html:84 +#: rhodecode/templates/changelog/changelog.html:110 +#: rhodecode/templates/changeset/changeset.html:91 msgid "No parents" msgstr "Aucun parent" -#: rhodecode/templates/changelog/changelog.html:113 -#: rhodecode/templates/changeset/changeset.html:88 +#: rhodecode/templates/changelog/changelog.html:115 +#: rhodecode/templates/changeset/changeset.html:95 +#: rhodecode/templates/changeset/changeset_range.html:79 msgid "merge" msgstr "Fusion" -#: rhodecode/templates/changelog/changelog.html:116 -#: rhodecode/templates/changeset/changeset.html:91 +#: rhodecode/templates/changelog/changelog.html:118 +#: rhodecode/templates/changeset/changeset.html:98 +#: rhodecode/templates/changeset/changeset_range.html:82 #: rhodecode/templates/files/files.html:29 #: rhodecode/templates/files/files_add.html:33 #: rhodecode/templates/files/files_edit.html:33 @@ -3049,44 +3239,42 @@ msgid "branch" msgstr "Branche" -#: rhodecode/templates/changelog/changelog.html:122 +#: rhodecode/templates/changelog/changelog.html:124 +#: rhodecode/templates/changeset/changeset_range.html:88 msgid "bookmark" msgstr "Signet" -#: rhodecode/templates/changelog/changelog.html:128 -#: rhodecode/templates/changeset/changeset.html:96 +#: rhodecode/templates/changelog/changelog.html:130 +#: rhodecode/templates/changeset/changeset.html:103 +#: rhodecode/templates/changeset/changeset_range.html:94 msgid "tag" msgstr "Tag" -#: rhodecode/templates/changelog/changelog.html:164 -msgid "Show selected changes __S -> __E" -msgstr "Afficher les changements sélections de __S à __E" - -#: rhodecode/templates/changelog/changelog.html:255 +#: rhodecode/templates/changelog/changelog.html:301 msgid "There are no changes yet" msgstr "Il n’y a aucun changement pour le moment" #: rhodecode/templates/changelog/changelog_details.html:4 -#: rhodecode/templates/changeset/changeset.html:66 +#: rhodecode/templates/changeset/changeset.html:73 msgid "removed" msgstr "Supprimés" #: rhodecode/templates/changelog/changelog_details.html:5 -#: rhodecode/templates/changeset/changeset.html:67 +#: rhodecode/templates/changeset/changeset.html:74 msgid "changed" msgstr "Modifiés" #: rhodecode/templates/changelog/changelog_details.html:6 -#: rhodecode/templates/changeset/changeset.html:68 +#: rhodecode/templates/changeset/changeset.html:75 msgid "added" msgstr "Ajoutés" #: rhodecode/templates/changelog/changelog_details.html:8 #: rhodecode/templates/changelog/changelog_details.html:9 #: rhodecode/templates/changelog/changelog_details.html:10 -#: rhodecode/templates/changeset/changeset.html:70 -#: rhodecode/templates/changeset/changeset.html:71 -#: rhodecode/templates/changeset/changeset.html:72 +#: rhodecode/templates/changeset/changeset.html:77 +#: rhodecode/templates/changeset/changeset.html:78 +#: rhodecode/templates/changeset/changeset.html:79 #, python-format msgid "affected %s files" msgstr "%s fichiers affectés" @@ -3100,17 +3288,22 @@ msgid "Changeset" msgstr "Changements" -#: rhodecode/templates/changeset/changeset.html:43 +#: rhodecode/templates/changeset/changeset.html:49 #: rhodecode/templates/changeset/diff_block.html:20 msgid "raw diff" msgstr "Diff brut" -#: rhodecode/templates/changeset/changeset.html:44 +#: rhodecode/templates/changeset/changeset.html:50 +#, fuzzy +msgid "patch diff" +msgstr "Diff brut" + +#: rhodecode/templates/changeset/changeset.html:51 #: rhodecode/templates/changeset/diff_block.html:21 msgid "download diff" msgstr "Télécharger le diff" -#: rhodecode/templates/changeset/changeset.html:48 +#: rhodecode/templates/changeset/changeset.html:55 #: rhodecode/templates/changeset/changeset_file_comment.html:82 #, python-format msgid "%d comment" @@ -3118,7 +3311,7 @@ msgstr[0] "%d commentaire" msgstr[1] "%d commentaires" -#: rhodecode/templates/changeset/changeset.html:48 +#: rhodecode/templates/changeset/changeset.html:55 #: rhodecode/templates/changeset/changeset_file_comment.html:82 #, python-format msgid "(%d inline)" @@ -3126,10 +3319,23 @@ msgstr[0] "(et %d en ligne)" msgstr[1] "(et %d en ligne)" -#: rhodecode/templates/changeset/changeset.html:103 -#, python-format -msgid "%s files affected with %s insertions and %s deletions:" -msgstr "%s fichiers affectés avec %s insertions et %s suppressions :" +#: rhodecode/templates/changeset/changeset.html:111 +#: rhodecode/templates/compare/compare_diff.html:44 +#: rhodecode/templates/pullrequests/pullrequest_show.html:76 +#, fuzzy, python-format +msgid "%s file changed" +msgid_plural "%s files changed" +msgstr[0] "fichié modifié" +msgstr[1] "" + +#: rhodecode/templates/changeset/changeset.html:113 +#: rhodecode/templates/compare/compare_diff.html:46 +#: rhodecode/templates/pullrequests/pullrequest_show.html:78 +#, fuzzy, python-format +msgid "%s file changed with %s insertions and %s deletions" +msgid_plural "%s files changed with %s insertions and %s deletions" +msgstr[0] "%s fichiers affectés avec %s insertions et %s suppressions :" +msgstr[1] "" #: rhodecode/templates/changeset/changeset_file_comment.html:42 msgid "Submitting..." @@ -3143,12 +3349,16 @@ #: rhodecode/templates/changeset/changeset_file_comment.html:121 #, 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." +msgstr "" +"Les commentaires sont analysés avec la syntaxe %s, avec le support de la " +"commande %s." #: rhodecode/templates/changeset/changeset_file_comment.html:48 #: rhodecode/templates/changeset/changeset_file_comment.html:123 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." +msgstr "" +"Utilisez @nomutilisateur dans ce texte pour envoyer une notification à " +"l’utilisateur RhodeCode en question." #: rhodecode/templates/changeset/changeset_file_comment.html:59 #: rhodecode/templates/changeset/changeset_file_comment.html:138 @@ -3194,15 +3404,18 @@ msgid "Compare View" msgstr "Comparaison" +#: rhodecode/templates/changeset/changeset_range.html:29 +#, fuzzy +msgid "Show combined compare" +msgstr "Afficher les commentaires" + #: rhodecode/templates/changeset/changeset_range.html:54 -#: rhodecode/templates/compare/compare_diff.html:41 -#: rhodecode/templates/pullrequests/pullrequest_show.html:73 msgid "Files affected" msgstr "Fichiers affectés" #: rhodecode/templates/changeset/diff_block.html:19 -msgid "diff" -msgstr "Diff" +msgid "show full diff for this file" +msgstr "" #: rhodecode/templates/changeset/diff_block.html:27 msgid "show inline comments" @@ -3213,8 +3426,18 @@ msgstr "Aucun changeset" #: rhodecode/templates/compare/compare_diff.html:37 -msgid "Outgoing changesets" -msgstr "Changesets sortants" +#: rhodecode/templates/pullrequests/pullrequest_show.html:69 +#, fuzzy, python-format +msgid "Showing %s commit" +msgid_plural "Showing %s commits" +msgstr[0] "Afficher les commentaires" +msgstr[1] "" + +#: rhodecode/templates/compare/compare_diff.html:52 +#: rhodecode/templates/pullrequests/pullrequest_show.html:84 +#, fuzzy +msgid "No files" +msgstr "Fichiers" #: rhodecode/templates/data_table/_dt_elements.html:39 #: rhodecode/templates/data_table/_dt_elements.html:41 @@ -3223,40 +3446,53 @@ msgstr "Fork" #: rhodecode/templates/data_table/_dt_elements.html:60 -#: rhodecode/templates/journal/journal.html:126 -#: rhodecode/templates/summary/summary.html:68 +#: rhodecode/templates/journal/journal.html:81 +#: rhodecode/templates/summary/summary.html:77 msgid "Mercurial repository" msgstr "Dépôt Mercurial" #: rhodecode/templates/data_table/_dt_elements.html:62 -#: rhodecode/templates/journal/journal.html:128 -#: rhodecode/templates/summary/summary.html:71 +#: rhodecode/templates/journal/journal.html:83 +#: rhodecode/templates/summary/summary.html:80 msgid "Git repository" msgstr "Dépôt Git" #: rhodecode/templates/data_table/_dt_elements.html:69 -#: rhodecode/templates/journal/journal.html:134 -#: rhodecode/templates/summary/summary.html:78 +#: rhodecode/templates/journal/journal.html:89 +#: rhodecode/templates/summary/summary.html:87 msgid "public repository" msgstr "Dépôt public" #: rhodecode/templates/data_table/_dt_elements.html:80 -#: rhodecode/templates/summary/summary.html:87 -#: rhodecode/templates/summary/summary.html:88 +#: rhodecode/templates/summary/summary.html:96 +#: rhodecode/templates/summary/summary.html:97 msgid "Fork of" msgstr "Fork de" -#: rhodecode/templates/data_table/_dt_elements.html:92 +#: rhodecode/templates/data_table/_dt_elements.html:94 msgid "No changesets yet" msgstr "Dépôt vide" -#: rhodecode/templates/data_table/_dt_elements.html:104 +#: rhodecode/templates/data_table/_dt_elements.html:101 +#: rhodecode/templates/data_table/_dt_elements.html:103 +#, python-format +msgid "Subscribe to %s rss feed" +msgstr "S’abonner au flux RSS de %s" + +#: rhodecode/templates/data_table/_dt_elements.html:109 +#: rhodecode/templates/data_table/_dt_elements.html:111 +#, python-format +msgid "Subscribe to %s atom feed" +msgstr "S’abonner au flux ATOM de %s" + +#: rhodecode/templates/data_table/_dt_elements.html:122 #, python-format msgid "Confirm to delete this user: %s" msgstr "Voulez-vous vraiment supprimer l’utilisateur « %s » ?" #: rhodecode/templates/email_templates/main.html:8 -msgid "This is an notification from RhodeCode." +#, fuzzy +msgid "This is a notification from RhodeCode." msgstr "Ceci est une notification de RhodeCode." #: rhodecode/templates/errors/error_document.html:46 @@ -3274,21 +3510,16 @@ msgstr "Diff de fichier" #: rhodecode/templates/files/files.html:4 -#: rhodecode/templates/files/files.html:72 +#: rhodecode/templates/files/files.html:74 #, python-format msgid "%s files" msgstr "Fichiers de %s" #: rhodecode/templates/files/files.html:12 -#: rhodecode/templates/summary/summary.html:340 +#: rhodecode/templates/summary/summary.html:351 msgid "files" msgstr "Fichiers" -#: rhodecode/templates/files/files.html:92 -#: rhodecode/templates/files/files_source.html:124 -msgid "Selection link" -msgstr "Lien vers la sélection" - #: rhodecode/templates/files/files_add.html:4 #: rhodecode/templates/files/files_edit.html:4 #, python-format @@ -3396,18 +3627,18 @@ msgstr "Éditer le fichier" #: rhodecode/templates/files/files_edit.html:49 -#: rhodecode/templates/files/files_source.html:38 +#: rhodecode/templates/files/files_source.html:23 msgid "show annotation" msgstr "Afficher les annotations" #: rhodecode/templates/files/files_edit.html:50 -#: rhodecode/templates/files/files_source.html:40 -#: rhodecode/templates/files/files_source.html:68 +#: rhodecode/templates/files/files_source.html:25 +#: rhodecode/templates/files/files_source.html:53 msgid "show as raw" msgstr "montrer le fichier brut" #: rhodecode/templates/files/files_edit.html:51 -#: rhodecode/templates/files/files_source.html:41 +#: rhodecode/templates/files/files_source.html:26 msgid "download as raw" msgstr "télécharger le fichier brut" @@ -3419,35 +3650,40 @@ msgid "Editing file" msgstr "Édition du fichier" -#: rhodecode/templates/files/files_source.html:2 +#: rhodecode/templates/files/files_history_box.html:2 msgid "History" msgstr "Historique" -#: rhodecode/templates/files/files_source.html:9 +#: rhodecode/templates/files/files_history_box.html:9 msgid "diff to revision" msgstr "Diff avec la révision" -#: rhodecode/templates/files/files_source.html:10 +#: rhodecode/templates/files/files_history_box.html:10 msgid "show at revision" msgstr "Afficher à la révision" -#: rhodecode/templates/files/files_source.html:14 +#: rhodecode/templates/files/files_history_box.html:15 #, python-format msgid "%s author" msgid_plural "%s authors" msgstr[0] "%s auteur" msgstr[1] "%s auteurs" -#: rhodecode/templates/files/files_source.html:36 +#: rhodecode/templates/files/files_source.html:6 +#, fuzzy +msgid "Load file history" +msgstr "Chargement de la liste des fichiers…" + +#: rhodecode/templates/files/files_source.html:21 msgid "show source" msgstr "montrer les sources" -#: rhodecode/templates/files/files_source.html:59 +#: rhodecode/templates/files/files_source.html:44 #, python-format msgid "Binary file (%s)" msgstr "Fichier binaire (%s)" -#: rhodecode/templates/files/files_source.html:68 +#: rhodecode/templates/files/files_source.html:53 msgid "File is too big to display" msgstr "Ce fichier est trop gros pour être affiché." @@ -3522,7 +3758,7 @@ msgid "forked" msgstr "forké" -#: rhodecode/templates/forks/forks_data.html:38 +#: rhodecode/templates/forks/forks_data.html:42 msgid "There are no forks yet" msgstr "Il n’y a pas encore de forks." @@ -3535,7 +3771,7 @@ msgstr "Flux RSS du journal" #: rhodecode/templates/journal/journal.html:24 -#: rhodecode/templates/pullrequests/pullrequest.html:53 +#: rhodecode/templates/pullrequests/pullrequest.html:55 msgid "Refresh" msgstr "Rafraîchir" @@ -3557,19 +3793,19 @@ msgid "ADD" msgstr "AJOUTER" -#: rhodecode/templates/journal/journal.html:114 +#: rhodecode/templates/journal/journal.html:69 msgid "following user" msgstr "utilisateur suivant" -#: rhodecode/templates/journal/journal.html:114 +#: rhodecode/templates/journal/journal.html:69 msgid "user" msgstr "utilisateur" -#: rhodecode/templates/journal/journal.html:147 +#: rhodecode/templates/journal/journal.html:102 msgid "You are not following any users or repositories" msgstr "Vous ne suivez aucun utilisateur ou dépôt" -#: rhodecode/templates/journal/journal_data.html:47 +#: rhodecode/templates/journal/journal_data.html:51 msgid "No entries yet" msgstr "Aucune entrée pour le moment" @@ -3590,44 +3826,44 @@ msgid "New pull request" msgstr "Nouvelle requête de pull" -#: rhodecode/templates/pullrequests/pullrequest.html:52 +#: rhodecode/templates/pullrequests/pullrequest.html:54 msgid "refresh overview" msgstr "Rafraîchir les informations" -#: rhodecode/templates/pullrequests/pullrequest.html:64 +#: rhodecode/templates/pullrequests/pullrequest.html:66 msgid "Detailed compare view" msgstr "Comparaison détaillée" -#: rhodecode/templates/pullrequests/pullrequest.html:68 -#: rhodecode/templates/pullrequests/pullrequest_show.html:86 +#: rhodecode/templates/pullrequests/pullrequest.html:70 +#: rhodecode/templates/pullrequests/pullrequest_show.html:100 msgid "Pull request reviewers" msgstr "Relecteurs de la requête de pull" -#: rhodecode/templates/pullrequests/pullrequest.html:77 -#: rhodecode/templates/pullrequests/pullrequest_show.html:98 +#: rhodecode/templates/pullrequests/pullrequest.html:79 +#: rhodecode/templates/pullrequests/pullrequest_show.html:112 msgid "owner" msgstr "Propriétaire" -#: rhodecode/templates/pullrequests/pullrequest.html:89 -#: rhodecode/templates/pullrequests/pullrequest_show.html:113 +#: rhodecode/templates/pullrequests/pullrequest.html:91 +#: rhodecode/templates/pullrequests/pullrequest_show.html:127 msgid "Add reviewer to this pull request." msgstr "Ajouter un relecteur à cette requête de pull." -#: rhodecode/templates/pullrequests/pullrequest.html:95 +#: rhodecode/templates/pullrequests/pullrequest.html:97 msgid "Create new pull request" msgstr "Nouvelle requête de pull" -#: rhodecode/templates/pullrequests/pullrequest.html:104 +#: rhodecode/templates/pullrequests/pullrequest.html:106 #: rhodecode/templates/pullrequests/pullrequest_show.html:25 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:33 msgid "Title" msgstr "Titre" -#: rhodecode/templates/pullrequests/pullrequest.html:113 +#: rhodecode/templates/pullrequests/pullrequest.html:115 msgid "description" msgstr "Description" -#: rhodecode/templates/pullrequests/pullrequest.html:121 +#: rhodecode/templates/pullrequests/pullrequest.html:123 msgid "Send pull request" msgstr "Envoyer la requête de pull" @@ -3661,7 +3897,6 @@ msgstr[1] "%d relecteurs" #: rhodecode/templates/pullrequests/pullrequest_show.html:50 -#| msgid "Pull request reviewers" msgid "pull request was reviewed by all reviewers" msgstr "La requête de pull a été relue par tous les relecteurs." @@ -3673,10 +3908,6 @@ msgid "Compare view" msgstr "Vue de comparaison" -#: rhodecode/templates/pullrequests/pullrequest_show.html:69 -msgid "Incoming changesets" -msgstr "Changesets entrants" - #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 msgid "all pull requests" msgstr "Requêtes de pull" @@ -3750,10 +3981,18 @@ msgid "shortlog" msgstr "Résumé" +#: rhodecode/templates/shortlog/shortlog_data.html:5 +msgid "revision" +msgstr "Révision" + #: rhodecode/templates/shortlog/shortlog_data.html:7 msgid "age" msgstr "Âge" +#: rhodecode/templates/shortlog/shortlog_data.html:8 +msgid "author" +msgstr "Auteur" + #: rhodecode/templates/shortlog/shortlog_data.html:33 msgid "No commit message" msgstr "Pas de message de commit" @@ -3794,128 +4033,138 @@ msgid "ATOM" msgstr "ATOM" -#: rhodecode/templates/summary/summary.html:82 +#: rhodecode/templates/summary/summary.html:70 +#, fuzzy, python-format +msgid "Repository locked by %s" +msgstr "Ce dépôt n’est pas verrouillé." + +#: rhodecode/templates/summary/summary.html:72 +#, fuzzy +msgid "Repository unlocked" +msgstr "Ce dépôt n’est pas verrouillé." + +#: rhodecode/templates/summary/summary.html:91 #, python-format msgid "Non changable ID %s" msgstr "Identifiant permanent : %s" -#: rhodecode/templates/summary/summary.html:87 +#: rhodecode/templates/summary/summary.html:96 msgid "public" msgstr "publique" -#: rhodecode/templates/summary/summary.html:95 +#: rhodecode/templates/summary/summary.html:104 msgid "remote clone" msgstr "Clone distant" -#: rhodecode/templates/summary/summary.html:116 +#: rhodecode/templates/summary/summary.html:125 msgid "Contact" msgstr "Contact" -#: rhodecode/templates/summary/summary.html:130 +#: rhodecode/templates/summary/summary.html:139 msgid "Clone url" msgstr "URL de clone" -#: rhodecode/templates/summary/summary.html:133 +#: rhodecode/templates/summary/summary.html:142 msgid "Show by Name" msgstr "Afficher par nom" -#: rhodecode/templates/summary/summary.html:134 +#: rhodecode/templates/summary/summary.html:143 msgid "Show by ID" msgstr "Afficher par ID" -#: rhodecode/templates/summary/summary.html:142 +#: rhodecode/templates/summary/summary.html:151 msgid "Trending files" msgstr "Populaires" -#: rhodecode/templates/summary/summary.html:150 -#: rhodecode/templates/summary/summary.html:166 -#: rhodecode/templates/summary/summary.html:194 +#: rhodecode/templates/summary/summary.html:159 +#: rhodecode/templates/summary/summary.html:175 +#: rhodecode/templates/summary/summary.html:203 msgid "enable" msgstr "Activer" -#: rhodecode/templates/summary/summary.html:158 +#: rhodecode/templates/summary/summary.html:167 msgid "Download" msgstr "Téléchargements" -#: rhodecode/templates/summary/summary.html:162 +#: rhodecode/templates/summary/summary.html:171 msgid "There are no downloads yet" msgstr "Il n’y a pas encore de téléchargements proposés." -#: rhodecode/templates/summary/summary.html:164 +#: rhodecode/templates/summary/summary.html:173 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:170 +#: rhodecode/templates/summary/summary.html:179 msgid "Download as zip" msgstr "Télécharger en ZIP" -#: rhodecode/templates/summary/summary.html:173 +#: rhodecode/templates/summary/summary.html:182 msgid "Check this to download archive with subrepos" msgstr "Télécharger une archive contenant également les sous-dépôts éventuels" -#: rhodecode/templates/summary/summary.html:173 +#: rhodecode/templates/summary/summary.html:182 msgid "with subrepos" msgstr "avec les sous-dépôts" -#: rhodecode/templates/summary/summary.html:186 +#: rhodecode/templates/summary/summary.html:195 msgid "Commit activity by day / author" msgstr "Activité de commit par jour et par auteur" -#: rhodecode/templates/summary/summary.html:197 +#: rhodecode/templates/summary/summary.html:206 msgid "Stats gathered: " msgstr "Statistiques obtenues :" -#: rhodecode/templates/summary/summary.html:218 +#: rhodecode/templates/summary/summary.html:227 msgid "Shortlog" msgstr "Résumé des changements" -#: rhodecode/templates/summary/summary.html:220 +#: rhodecode/templates/summary/summary.html:229 msgid "Quick start" msgstr "Démarrage rapide" -#: rhodecode/templates/summary/summary.html:233 +#: rhodecode/templates/summary/summary.html:243 #, python-format msgid "Readme file at revision '%s'" msgstr "Fichier « Lisez-moi » à la révision « %s »" -#: rhodecode/templates/summary/summary.html:236 +#: rhodecode/templates/summary/summary.html:246 msgid "Permalink to this readme" msgstr "Lien permanent vers ce fichier « Lisez-moi »" -#: rhodecode/templates/summary/summary.html:293 +#: rhodecode/templates/summary/summary.html:304 #, python-format msgid "Download %s as %s" msgstr "Télécharger %s comme archive %s" -#: rhodecode/templates/summary/summary.html:650 +#: rhodecode/templates/summary/summary.html:661 msgid "commits" msgstr "commits" -#: rhodecode/templates/summary/summary.html:651 +#: rhodecode/templates/summary/summary.html:662 msgid "files added" msgstr "fichiers ajoutés" -#: rhodecode/templates/summary/summary.html:652 +#: rhodecode/templates/summary/summary.html:663 msgid "files changed" msgstr "fichiers modifiés" -#: rhodecode/templates/summary/summary.html:653 +#: rhodecode/templates/summary/summary.html:664 msgid "files removed" msgstr "fichiers supprimés" -#: rhodecode/templates/summary/summary.html:656 +#: rhodecode/templates/summary/summary.html:667 msgid "commit" msgstr "commit" -#: rhodecode/templates/summary/summary.html:657 +#: rhodecode/templates/summary/summary.html:668 msgid "file added" msgstr "fichier ajouté" -#: rhodecode/templates/summary/summary.html:658 +#: rhodecode/templates/summary/summary.html:669 msgid "file changed" msgstr "fichié modifié" -#: rhodecode/templates/summary/summary.html:659 +#: rhodecode/templates/summary/summary.html:670 msgid "file removed" msgstr "fichier supprimé" @@ -3924,5 +4173,8 @@ msgid "%s Tags" msgstr "Tags de %s" -#~ msgid "Groups" -#~ msgstr "Groupes" +#: rhodecode/templates/tags/tags.html:29 +#, fuzzy +msgid "Compare tags" +msgstr "Comparer" +
--- a/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po Mon Nov 26 20:39:45 2012 +0100 +++ b/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po Tue Nov 27 20:56:57 2012 +0100 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: RhodeCode 1.2.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-09-02 20:30+0200\n" +"POT-Creation-Date: 2012-11-27 20:56+0100\n" "PO-Revision-Date: 2012-10-27 15:06+0900\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: ja <LL@li.org>\n" @@ -22,35 +22,37 @@ "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -#: rhodecode/controllers/changelog.py:94 +#: rhodecode/controllers/changelog.py:95 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:157 +#: rhodecode/controllers/changeset.py:164 #, python-format msgid "%s line context" msgstr "" -#: rhodecode/controllers/changeset.py:333 -#: rhodecode/controllers/changeset.py:348 rhodecode/lib/diffs.py:70 -msgid "binary file" -msgstr "バイナリファイル" - -#: rhodecode/controllers/changeset.py:408 +#: rhodecode/controllers/changeset.py:315 +#: rhodecode/controllers/pullrequests.py:411 +#, fuzzy, python-format +msgid "Status change -> %s" +msgstr "最後の変更時刻" + +#: rhodecode/controllers/changeset.py:346 msgid "" "Changing status on a changeset associated witha closed pull request is " "not allowed" msgstr "" -#: rhodecode/controllers/compare.py:69 +#: rhodecode/controllers/compare.py:75 +#: rhodecode/controllers/pullrequests.py:117 msgid "There are no changesets yet" msgstr "まだ変更がありません" @@ -80,99 +82,109 @@ "fulfilling the request." msgstr "" -#: rhodecode/controllers/feed.py:49 +#: rhodecode/controllers/feed.py:52 #, python-format msgid "Changes on %s repository" msgstr "%s リポジトリでの変更" -#: rhodecode/controllers/feed.py:50 +#: rhodecode/controllers/feed.py:53 #, python-format msgid "%s %s feed" msgstr "%s %s フィード" -#: rhodecode/controllers/feed.py:75 +#: rhodecode/controllers/feed.py:86 +#: rhodecode/templates/changeset/changeset.html:126 +#: rhodecode/templates/changeset/changeset.html:138 +#: rhodecode/templates/compare/compare_diff.html:62 +#: rhodecode/templates/compare/compare_diff.html:73 +#: rhodecode/templates/pullrequests/pullrequest_show.html:94 +#: rhodecode/templates/pullrequests/pullrequest_show.html:153 +msgid "Changeset was too big and was cut off..." +msgstr "チェンジセットが大きすぎるため、省略しました" + +#: rhodecode/controllers/feed.py:92 msgid "commited on" msgstr "コミット" -#: rhodecode/controllers/files.py:84 +#: rhodecode/controllers/files.py:86 msgid "click here to add new file" msgstr "新しいファイルを追加" -#: rhodecode/controllers/files.py:85 +#: rhodecode/controllers/files.py:87 #, python-format msgid "There are no files yet %s" msgstr "まだファイルがありません %s" -#: rhodecode/controllers/files.py:239 rhodecode/controllers/files.py:299 +#: rhodecode/controllers/files.py:265 rhodecode/controllers/files.py:325 #, python-format msgid "This repository is has been locked by %s on %s" msgstr "このリポジトリは %s によって %s にロックされました" -#: rhodecode/controllers/files.py:266 +#: rhodecode/controllers/files.py:292 #, python-format msgid "Edited %s via RhodeCode" msgstr "RhodeCode経由で %s を変更" -#: rhodecode/controllers/files.py:271 +#: rhodecode/controllers/files.py:297 msgid "No changes" msgstr "変更点なし" -#: rhodecode/controllers/files.py:282 rhodecode/controllers/files.py:346 +#: rhodecode/controllers/files.py:308 rhodecode/controllers/files.py:372 #, python-format msgid "Successfully committed to %s" msgstr "%s へのコミットが成功しました" -#: rhodecode/controllers/files.py:287 rhodecode/controllers/files.py:352 +#: rhodecode/controllers/files.py:313 rhodecode/controllers/files.py:378 msgid "Error occurred during commit" msgstr "コミット中にエラーが発生しました" -#: rhodecode/controllers/files.py:318 +#: rhodecode/controllers/files.py:344 #, python-format msgid "Added %s via RhodeCode" msgstr "RhodeCode経由で %s を追加" -#: rhodecode/controllers/files.py:332 +#: rhodecode/controllers/files.py:358 msgid "No content" msgstr "内容がありません" -#: rhodecode/controllers/files.py:336 +#: rhodecode/controllers/files.py:362 msgid "No filename" msgstr "ファイル名がありません" -#: rhodecode/controllers/files.py:378 +#: rhodecode/controllers/files.py:404 msgid "downloads disabled" msgstr "ダウンロードは無効化されています" -#: rhodecode/controllers/files.py:389 +#: rhodecode/controllers/files.py:415 #, python-format msgid "Unknown revision %s" msgstr "%s は未知のリビジョンです" -#: rhodecode/controllers/files.py:391 +#: rhodecode/controllers/files.py:417 msgid "Empty repository" msgstr "空のリポジトリ" -#: rhodecode/controllers/files.py:393 +#: rhodecode/controllers/files.py:419 msgid "Unknown archive type" msgstr "未知のアーカイブ種別です" -#: rhodecode/controllers/files.py:494 +#: rhodecode/controllers/files.py:564 #: rhodecode/templates/changeset/changeset_range.html:13 #: rhodecode/templates/changeset/changeset_range.html:31 msgid "Changesets" msgstr "チェンジセット" -#: rhodecode/controllers/files.py:495 rhodecode/controllers/pullrequests.py:72 -#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:543 +#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:76 +#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:550 msgid "Branches" msgstr "ブランチ" -#: rhodecode/controllers/files.py:496 rhodecode/controllers/pullrequests.py:76 -#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:554 +#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:80 +#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:561 msgid "Tags" msgstr "タグ" -#: rhodecode/controllers/forks.py:73 rhodecode/controllers/admin/repos.py:90 +#: rhodecode/controllers/forks.py:74 rhodecode/controllers/admin/repos.py:91 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -182,7 +194,7 @@ "%s " "リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。" -#: rhodecode/controllers/forks.py:133 rhodecode/controllers/settings.py:72 +#: rhodecode/controllers/forks.py:134 rhodecode/controllers/settings.py:73 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -192,22 +204,22 @@ "%s " "リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。" -#: rhodecode/controllers/forks.py:167 +#: rhodecode/controllers/forks.py:168 #, python-format msgid "forked %s repository as %s" msgstr "リポジトリ %s を %s としてフォーク" -#: rhodecode/controllers/forks.py:181 +#: rhodecode/controllers/forks.py:182 #, python-format msgid "An error occurred during repository forking %s" msgstr "リポジトリ %s のフォーク中にエラーが発生しました" -#: rhodecode/controllers/journal.py:202 rhodecode/controllers/journal.py:239 +#: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243 msgid "public journal" msgstr "公開ジャーナル" -#: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243 -#: rhodecode/templates/base/base.html:220 +#: rhodecode/controllers/journal.py:210 rhodecode/controllers/journal.py:247 +#: rhodecode/templates/base/base.html:232 msgid "journal" msgstr "ジャーナル" @@ -225,56 +237,56 @@ "email" msgstr "パスワードをリセットしました。新しいパスワードをあなたのメールアドレスに送りました" -#: rhodecode/controllers/pullrequests.py:74 rhodecode/model/scm.py:549 +#: rhodecode/controllers/pullrequests.py:78 rhodecode/model/scm.py:556 msgid "Bookmarks" msgstr "ブックマーク" -#: rhodecode/controllers/pullrequests.py:158 +#: rhodecode/controllers/pullrequests.py:186 msgid "Pull request requires a title with min. 3 chars" msgstr "プルリクエストには3文字以上のタイトルが必要です" -#: rhodecode/controllers/pullrequests.py:160 +#: rhodecode/controllers/pullrequests.py:188 msgid "error during creation of pull request" msgstr "プルリクエストの作成中にエラーが発生しました" -#: rhodecode/controllers/pullrequests.py:181 +#: rhodecode/controllers/pullrequests.py:220 msgid "Successfully opened new pull request" msgstr "新しいプルリクエストを作成しました" -#: rhodecode/controllers/pullrequests.py:184 +#: rhodecode/controllers/pullrequests.py:223 msgid "Error occurred during sending pull request" msgstr "プルリクエストの作成中にエラーが発生しました" -#: rhodecode/controllers/pullrequests.py:217 +#: rhodecode/controllers/pullrequests.py:256 msgid "Successfully deleted pull request" msgstr "プルリクエストを削除しました" -#: rhodecode/controllers/search.py:131 +#: rhodecode/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "無効な検索クエリーです。\\\"で囲んで下さい" -#: rhodecode/controllers/search.py:136 +#: rhodecode/controllers/search.py:139 msgid "There is no index to search in. Please run whoosh indexer" msgstr "検索するためのインデックスがありません。whooshでインデックスを作成して下さい" -#: rhodecode/controllers/search.py:140 +#: rhodecode/controllers/search.py:143 msgid "An error occurred during this search operation" msgstr "検索を実行する際にエラーがおきました" -#: rhodecode/controllers/settings.py:107 -#: rhodecode/controllers/admin/repos.py:266 +#: rhodecode/controllers/settings.py:108 +#: rhodecode/controllers/admin/repos.py:267 #, python-format msgid "Repository %s updated successfully" msgstr "リポジトリ %s の更新に成功しました" -#: rhodecode/controllers/settings.py:125 -#: rhodecode/controllers/admin/repos.py:284 +#: rhodecode/controllers/settings.py:126 +#: rhodecode/controllers/admin/repos.py:285 #, python-format msgid "error occurred during update of repository %s" msgstr "リポジトリ %s の更新中にエラーが発生しました" -#: rhodecode/controllers/settings.py:143 -#: rhodecode/controllers/admin/repos.py:302 +#: rhodecode/controllers/settings.py:144 +#: rhodecode/controllers/admin/repos.py:303 #, python-format msgid "" "%s repository is not mapped to db perhaps it was moved or renamed from " @@ -284,25 +296,45 @@ "%s " "リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。" -#: rhodecode/controllers/settings.py:155 -#: rhodecode/controllers/admin/repos.py:314 +#: rhodecode/controllers/settings.py:156 +#: rhodecode/controllers/admin/repos.py:315 #, python-format msgid "deleted repository %s" msgstr "リポジトリ %s を削除しました" -#: rhodecode/controllers/settings.py:159 -#: rhodecode/controllers/admin/repos.py:324 -#: rhodecode/controllers/admin/repos.py:330 +#: rhodecode/controllers/settings.py:160 +#: rhodecode/controllers/admin/repos.py:325 +#: rhodecode/controllers/admin/repos.py:331 #, python-format msgid "An error occurred during deletion of %s" msgstr "リポジトリ %s の削除中にエラーが発生しました" -#: rhodecode/controllers/summary.py:138 +#: rhodecode/controllers/settings.py:179 +#, fuzzy +msgid "unlocked" +msgstr "変更可能にする" + +#: rhodecode/controllers/settings.py:182 +#, fuzzy +msgid "locked" +msgstr "変更可能にする" + +#: rhodecode/controllers/settings.py:184 +#, fuzzy, python-format +msgid "Repository has been %s" +msgstr "リポジトリ %s を %s としてフォーク" + +#: rhodecode/controllers/settings.py:188 +#: rhodecode/controllers/admin/repos.py:423 +msgid "An error occurred during unlocking" +msgstr "アンロック時にエラーが発生しました" + +#: rhodecode/controllers/summary.py:140 msgid "No data loaded yet" msgstr "まだデータが読み込まれていません" -#: rhodecode/controllers/summary.py:142 -#: rhodecode/templates/summary/summary.html:148 +#: rhodecode/controllers/summary.py:144 +#: rhodecode/templates/summary/summary.html:157 msgid "Statistics are disabled for this repository" msgstr "このリポジトリの統計は無効化されています" @@ -387,15 +419,15 @@ #: rhodecode/templates/admin/settings/settings.html:9 #: rhodecode/templates/admin/users/user_add.html:8 #: rhodecode/templates/admin/users/user_edit.html:9 -#: rhodecode/templates/admin/users/user_edit.html:122 +#: rhodecode/templates/admin/users/user_edit.html:126 #: rhodecode/templates/admin/users/users.html:9 #: rhodecode/templates/admin/users_groups/users_group_add.html:8 #: rhodecode/templates/admin/users_groups/users_group_edit.html:9 #: rhodecode/templates/admin/users_groups/users_groups.html:9 #: rhodecode/templates/base/base.html:197 -#: rhodecode/templates/base/base.html:337 -#: rhodecode/templates/base/base.html:339 -#: rhodecode/templates/base/base.html:341 +#: rhodecode/templates/base/base.html:349 +#: rhodecode/templates/base/base.html:351 +#: rhodecode/templates/base/base.html:353 msgid "Admin" msgstr "管理" @@ -429,187 +461,183 @@ msgid "error occurred during update of permissions" msgstr "権限の更新中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:123 +#: rhodecode/controllers/admin/repos.py:124 msgid "--REMOVE FORK--" msgstr "--フォーク元を削除--" -#: rhodecode/controllers/admin/repos.py:192 +#: rhodecode/controllers/admin/repos.py:193 #, python-format msgid "created repository %s from %s" msgstr "リポジトリ %s を %s から作成" -#: rhodecode/controllers/admin/repos.py:196 +#: rhodecode/controllers/admin/repos.py:197 #, python-format msgid "created repository %s" msgstr "リポジトリ %s を作成しました" -#: rhodecode/controllers/admin/repos.py:227 +#: rhodecode/controllers/admin/repos.py:228 #, python-format msgid "error occurred during creation of repository %s" msgstr "リポジトリ %s を作成中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:319 +#: rhodecode/controllers/admin/repos.py:320 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:348 +#: rhodecode/controllers/admin/repos.py:349 msgid "An error occurred during deletion of repository user" msgstr "リポジトリユーザーの削除中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:367 +#: rhodecode/controllers/admin/repos.py:368 msgid "An error occurred during deletion of repository users groups" msgstr "リポジトリユーザーグループの削除中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:385 +#: rhodecode/controllers/admin/repos.py:386 msgid "An error occurred during deletion of repository stats" msgstr "リポジトリステートの削除中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:402 +#: rhodecode/controllers/admin/repos.py:403 msgid "An error occurred during cache invalidation" msgstr "キャッシュの無効化時にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:422 -msgid "An error occurred during unlocking" -msgstr "アンロック時にエラーが発生しました" - -#: rhodecode/controllers/admin/repos.py:442 +#: rhodecode/controllers/admin/repos.py:443 msgid "Updated repository visibility in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:446 +#: rhodecode/controllers/admin/repos.py:447 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:451 rhodecode/model/validators.py:299 +#: rhodecode/controllers/admin/repos.py:452 rhodecode/model/validators.py:300 msgid "Token mismatch" msgstr "トークンが合いません" -#: rhodecode/controllers/admin/repos.py:464 +#: rhodecode/controllers/admin/repos.py:465 msgid "Pulled from remote location" msgstr "リモートから取得" -#: rhodecode/controllers/admin/repos.py:466 +#: rhodecode/controllers/admin/repos.py:467 msgid "An error occurred during pull from remote location" msgstr "リモートから取得中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:482 +#: rhodecode/controllers/admin/repos.py:483 msgid "Nothing" msgstr "ありません" -#: rhodecode/controllers/admin/repos.py:484 +#: rhodecode/controllers/admin/repos.py:485 #, python-format msgid "Marked repo %s as fork of %s" msgstr "%s リポジトリを %s のフォークとして印をつける" -#: rhodecode/controllers/admin/repos.py:488 +#: rhodecode/controllers/admin/repos.py:489 msgid "An error occurred during this operation" msgstr "操作中にエラーが発生しました" -#: rhodecode/controllers/admin/repos_groups.py:116 +#: rhodecode/controllers/admin/repos_groups.py:120 #, python-format msgid "created repos group %s" msgstr "リポジトリグループ %s を作成しました" -#: rhodecode/controllers/admin/repos_groups.py:129 +#: rhodecode/controllers/admin/repos_groups.py:133 #, python-format msgid "error occurred during creation of repos group %s" msgstr "リポジトリグループ %s を作成中にエラーが発生しました" -#: rhodecode/controllers/admin/repos_groups.py:163 +#: rhodecode/controllers/admin/repos_groups.py:167 #, python-format msgid "updated repos group %s" msgstr "リポジトリグループ %s を更新しました" -#: rhodecode/controllers/admin/repos_groups.py:176 +#: rhodecode/controllers/admin/repos_groups.py:180 #, python-format msgid "error occurred during update of repos group %s" msgstr "リポジトリグループ %s を更新中にエラーが発生しました" -#: rhodecode/controllers/admin/repos_groups.py:194 +#: rhodecode/controllers/admin/repos_groups.py:198 #, python-format msgid "This group contains %s repositores and cannot be deleted" msgstr "このグループは %s リポジトリを含んでいるため削除出来ません" -#: rhodecode/controllers/admin/repos_groups.py:202 +#: rhodecode/controllers/admin/repos_groups.py:206 #, python-format msgid "removed repos group %s" msgstr "リポジトリグループ %s を削除しました" -#: rhodecode/controllers/admin/repos_groups.py:208 +#: rhodecode/controllers/admin/repos_groups.py:212 msgid "Cannot delete this group it still contains subgroups" msgstr "サブグループを含んでいるため、このグループを削除できません" -#: rhodecode/controllers/admin/repos_groups.py:213 -#: rhodecode/controllers/admin/repos_groups.py:218 +#: rhodecode/controllers/admin/repos_groups.py:217 +#: rhodecode/controllers/admin/repos_groups.py:222 #, python-format msgid "error occurred during deletion of repos group %s" msgstr "リポジトリグループ %s の削除中にエラーが発生しました" -#: rhodecode/controllers/admin/repos_groups.py:238 +#: rhodecode/controllers/admin/repos_groups.py:243 msgid "An error occurred during deletion of group user" msgstr "グループユーザーを削除中にエラーが発生しました" -#: rhodecode/controllers/admin/repos_groups.py:258 +#: rhodecode/controllers/admin/repos_groups.py:264 msgid "An error occurred during deletion of group users groups" msgstr "グループユーザーのグループを削除中にエラーが発生しました" -#: rhodecode/controllers/admin/settings.py:121 +#: rhodecode/controllers/admin/settings.py:123 #, python-format msgid "Repositories successfully rescanned added: %s,removed: %s" msgstr "リポジトリを再度スキャンしました。 追加: %s 削除: %s" -#: rhodecode/controllers/admin/settings.py:129 +#: rhodecode/controllers/admin/settings.py:131 msgid "Whoosh reindex task scheduled" msgstr "Whooshの再インデックスタスクを予定に入れました" -#: rhodecode/controllers/admin/settings.py:160 +#: rhodecode/controllers/admin/settings.py:162 msgid "Updated application settings" msgstr "アプリケーション設定を更新しました" -#: rhodecode/controllers/admin/settings.py:164 -#: rhodecode/controllers/admin/settings.py:275 +#: rhodecode/controllers/admin/settings.py:166 +#: rhodecode/controllers/admin/settings.py:299 msgid "error occurred during updating application settings" msgstr "アプリケーション設定を更新中にエラーが発生しました" -#: rhodecode/controllers/admin/settings.py:200 +#: rhodecode/controllers/admin/settings.py:207 msgid "Updated visualisation settings" msgstr "表示の設定を更新しました" -#: rhodecode/controllers/admin/settings.py:205 +#: rhodecode/controllers/admin/settings.py:212 msgid "error occurred during updating visualisation settings" msgstr "表示の設定を更新中にエラーが発生しました" -#: rhodecode/controllers/admin/settings.py:271 +#: rhodecode/controllers/admin/settings.py:295 msgid "Updated VCS settings" msgstr "VCSの設定を更新しました" -#: rhodecode/controllers/admin/settings.py:285 +#: rhodecode/controllers/admin/settings.py:309 msgid "Added new hook" msgstr "新しいフックを追加しました" -#: rhodecode/controllers/admin/settings.py:297 +#: rhodecode/controllers/admin/settings.py:321 msgid "Updated hooks" msgstr "フックを更新しました" -#: rhodecode/controllers/admin/settings.py:301 +#: rhodecode/controllers/admin/settings.py:325 msgid "error occurred during hook creation" msgstr "フックの作成時にエラーが発生しました" -#: rhodecode/controllers/admin/settings.py:320 +#: rhodecode/controllers/admin/settings.py:344 msgid "Email task created" msgstr "メールのタスクを作成しました" -#: rhodecode/controllers/admin/settings.py:375 +#: rhodecode/controllers/admin/settings.py:399 msgid "You can't edit this user since it's crucial for entire application" msgstr "このユーザーを編集出来ません。このユーザーはアプリケーションにとって必要不可欠です。" -#: rhodecode/controllers/admin/settings.py:406 +#: rhodecode/controllers/admin/settings.py:430 msgid "Your account was updated successfully" msgstr "アカウントを更新しました" -#: rhodecode/controllers/admin/settings.py:421 -#: rhodecode/controllers/admin/users.py:191 +#: rhodecode/controllers/admin/settings.py:445 +#: rhodecode/controllers/admin/users.py:196 #, python-format msgid "error occurred during update of user %s" msgstr "ユーザー %s の更新中にエラーが発生しました" @@ -624,97 +652,97 @@ msgid "error occurred during creation of user %s" msgstr "ユーザー %s の作成中にエラーが発生しました" -#: rhodecode/controllers/admin/users.py:171 +#: rhodecode/controllers/admin/users.py:176 msgid "User updated successfully" msgstr "ユーザーの更新に成功しました" -#: rhodecode/controllers/admin/users.py:207 -msgid "successfully deleted user" -msgstr "ユーザーの削除に成功しました" - #: rhodecode/controllers/admin/users.py:212 +msgid "successfully deleted user" +msgstr "ユーザーの削除に成功しました" + +#: rhodecode/controllers/admin/users.py:217 msgid "An error occurred during deletion of user" msgstr "ユーザーの削除中にエラーが発生しました" -#: rhodecode/controllers/admin/users.py:226 +#: rhodecode/controllers/admin/users.py:231 msgid "You can't edit this user" msgstr "このユーザーは編集できません" -#: rhodecode/controllers/admin/users.py:266 +#: rhodecode/controllers/admin/users.py:272 msgid "Granted 'repository create' permission to user" msgstr "ユーザーに 'リポジトリ作成' 権限を与えました" -#: rhodecode/controllers/admin/users.py:271 +#: rhodecode/controllers/admin/users.py:277 msgid "Revoked 'repository create' permission to user" msgstr "ユーザーの 'リポジトリ作成' 権限を取り消しました" -#: rhodecode/controllers/admin/users.py:277 +#: rhodecode/controllers/admin/users.py:283 msgid "Granted 'repository fork' permission to user" msgstr "ユーザーに 'リポジトリフォーク' 権限を与えました" -#: rhodecode/controllers/admin/users.py:282 +#: rhodecode/controllers/admin/users.py:288 msgid "Revoked 'repository fork' permission to user" msgstr "ユーザーの 'リポジトリフォーク' 権限を取り消しました" -#: rhodecode/controllers/admin/users.py:288 -#: rhodecode/controllers/admin/users_groups.py:255 +#: rhodecode/controllers/admin/users.py:294 +#: rhodecode/controllers/admin/users_groups.py:279 msgid "An error occurred during permissions saving" msgstr "権限の保存時にエラーが発生しました" -#: rhodecode/controllers/admin/users.py:303 +#: rhodecode/controllers/admin/users.py:309 #, python-format msgid "Added email %s to user" msgstr "ユーザーにメール %s を追加しました" -#: rhodecode/controllers/admin/users.py:309 +#: rhodecode/controllers/admin/users.py:315 msgid "An error occurred during email saving" msgstr "メールの保存時にエラーが発生しました" -#: rhodecode/controllers/admin/users.py:319 +#: rhodecode/controllers/admin/users.py:325 msgid "Removed email from user" msgstr "ユーザーからメールを削除しました" -#: rhodecode/controllers/admin/users_groups.py:84 +#: rhodecode/controllers/admin/users_groups.py:86 #, python-format msgid "created users group %s" msgstr "ユーザーグループ %s を作成しました" -#: rhodecode/controllers/admin/users_groups.py:95 +#: rhodecode/controllers/admin/users_groups.py:97 #, python-format msgid "error occurred during creation of users group %s" msgstr "ユーザーグループ %s の作成中にエラーが発生しました" -#: rhodecode/controllers/admin/users_groups.py:135 +#: rhodecode/controllers/admin/users_groups.py:164 #, python-format msgid "updated users group %s" msgstr "ユーザーグループ %s を更新しました" -#: rhodecode/controllers/admin/users_groups.py:157 +#: rhodecode/controllers/admin/users_groups.py:186 #, python-format msgid "error occurred during update of users group %s" msgstr "ユーザーグループ %s の更新中にエラーが発生しました" -#: rhodecode/controllers/admin/users_groups.py:174 +#: rhodecode/controllers/admin/users_groups.py:203 msgid "successfully deleted users group" msgstr "ユーザーグループ" -#: rhodecode/controllers/admin/users_groups.py:179 +#: rhodecode/controllers/admin/users_groups.py:208 msgid "An error occurred during deletion of users group" msgstr "ユーザーグループの削除中にエラーが発生しました" -#: rhodecode/controllers/admin/users_groups.py:233 +#: rhodecode/controllers/admin/users_groups.py:257 msgid "Granted 'repository create' permission to users group" msgstr "ユーザーグループに 'リポジトリ作成' 権限を与えました" -#: rhodecode/controllers/admin/users_groups.py:238 +#: rhodecode/controllers/admin/users_groups.py:262 msgid "Revoked 'repository create' permission to users group" msgstr "ユーザーグループの 'リポジトリ作成' 権限を取り消しました" -#: rhodecode/controllers/admin/users_groups.py:244 +#: rhodecode/controllers/admin/users_groups.py:268 msgid "Granted 'repository fork' permission to users group" msgstr "ユーザーグループに 'リポジトリフォーク' 権限を与えました" -#: rhodecode/controllers/admin/users_groups.py:249 +#: rhodecode/controllers/admin/users_groups.py:273 msgid "Revoked 'repository fork' permission to users group" msgstr "ユーザーグループの 'リポジトリフォーク' 権限を取り消しました" @@ -726,200 +754,225 @@ msgid "You need to be a signed in to view this page" msgstr "このページを閲覧するためにはサインインが必要です" -#: rhodecode/lib/diffs.py:86 +#: rhodecode/lib/diffs.py:74 +msgid "binary file" +msgstr "バイナリファイル" + +#: rhodecode/lib/diffs.py:90 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: rhodecode/lib/diffs.py:96 +#: rhodecode/lib/diffs.py:100 msgid "No changes detected" msgstr "検出された変更はありません" -#: rhodecode/lib/helpers.py:372 +#: rhodecode/lib/helpers.py:373 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "%a, %d %b %Y %H:%M:%S" -#: rhodecode/lib/helpers.py:484 +#: rhodecode/lib/helpers.py:485 msgid "True" msgstr "True" -#: rhodecode/lib/helpers.py:488 +#: rhodecode/lib/helpers.py:489 msgid "False" msgstr "False" +#: rhodecode/lib/helpers.py:529 +#, fuzzy, python-format +msgid "Deleted branch: %s" +msgstr "リポジトリ %s を削除しました" + #: rhodecode/lib/helpers.py:532 +#, fuzzy, python-format +msgid "Created tag: %s" +msgstr "ユーザー %s を作成しました" + +#: rhodecode/lib/helpers.py:545 msgid "Changeset not found" msgstr "リビジョンが見つかりません" -#: rhodecode/lib/helpers.py:555 +#: rhodecode/lib/helpers.py:588 #, python-format msgid "Show all combined changesets %s->%s" msgstr "%s から %s までのすべてのチェンジセットを表示" -#: rhodecode/lib/helpers.py:561 +#: rhodecode/lib/helpers.py:594 msgid "compare view" msgstr "比較の表示" -#: rhodecode/lib/helpers.py:581 +#: rhodecode/lib/helpers.py:614 msgid "and" msgstr "" -#: rhodecode/lib/helpers.py:582 +#: rhodecode/lib/helpers.py:615 #, python-format msgid "%s more" msgstr "" -#: rhodecode/lib/helpers.py:583 rhodecode/templates/changelog/changelog.html:48 +#: rhodecode/lib/helpers.py:616 rhodecode/templates/changelog/changelog.html:51 msgid "revisions" msgstr "リビジョン" -#: rhodecode/lib/helpers.py:606 -msgid "fork name " +#: rhodecode/lib/helpers.py:640 +#, fuzzy, python-format +msgid "fork name %s" msgstr "フォーク名 " -#: rhodecode/lib/helpers.py:620 +#: rhodecode/lib/helpers.py:653 #: rhodecode/templates/pullrequests/pullrequest_show.html:4 #: rhodecode/templates/pullrequests/pullrequest_show.html:12 #, python-format msgid "Pull request #%s" msgstr "プルリクエスト #%s" -#: rhodecode/lib/helpers.py:626 +#: rhodecode/lib/helpers.py:659 msgid "[deleted] repository" msgstr "リポジトリを[削除]" -#: rhodecode/lib/helpers.py:628 rhodecode/lib/helpers.py:638 +#: rhodecode/lib/helpers.py:661 rhodecode/lib/helpers.py:671 msgid "[created] repository" msgstr "リポジトリを[作成]" -#: rhodecode/lib/helpers.py:630 +#: rhodecode/lib/helpers.py:663 msgid "[created] repository as fork" msgstr "フォークしてリポジトリを[作成]" -#: rhodecode/lib/helpers.py:632 rhodecode/lib/helpers.py:640 +#: rhodecode/lib/helpers.py:665 rhodecode/lib/helpers.py:673 msgid "[forked] repository" msgstr "リポジトリを[フォーク]" -#: rhodecode/lib/helpers.py:634 rhodecode/lib/helpers.py:642 +#: rhodecode/lib/helpers.py:667 rhodecode/lib/helpers.py:675 msgid "[updated] repository" msgstr "リポジトリを[更新]" -#: rhodecode/lib/helpers.py:636 +#: rhodecode/lib/helpers.py:669 msgid "[delete] repository" msgstr "リポジトリを[削除]" -#: rhodecode/lib/helpers.py:644 +#: rhodecode/lib/helpers.py:677 msgid "[created] user" msgstr "ユーザーを[作成]" -#: rhodecode/lib/helpers.py:646 +#: rhodecode/lib/helpers.py:679 msgid "[updated] user" msgstr "ユーザーを[更新]" -#: rhodecode/lib/helpers.py:648 +#: rhodecode/lib/helpers.py:681 msgid "[created] users group" msgstr "ユーザーグループを[作成]" -#: rhodecode/lib/helpers.py:650 +#: rhodecode/lib/helpers.py:683 msgid "[updated] users group" msgstr "ユーザーグループを[更新]" -#: rhodecode/lib/helpers.py:652 +#: rhodecode/lib/helpers.py:685 msgid "[commented] on revision in repository" msgstr "リポジトリのリビジョンに[コメント]" -#: rhodecode/lib/helpers.py:654 +#: rhodecode/lib/helpers.py:687 msgid "[commented] on pull request for" msgstr "プルリクエストに[コメント]" -#: rhodecode/lib/helpers.py:656 +#: rhodecode/lib/helpers.py:689 msgid "[closed] pull request for" msgstr "プルリクエストを[クローズ]" -#: rhodecode/lib/helpers.py:658 +#: rhodecode/lib/helpers.py:691 msgid "[pushed] into" msgstr "[プッシュ]" -#: rhodecode/lib/helpers.py:660 +#: rhodecode/lib/helpers.py:693 msgid "[committed via RhodeCode] into repository" msgstr "リポジトリに[RhodeCode経由でコミット]" -#: rhodecode/lib/helpers.py:662 +#: rhodecode/lib/helpers.py:695 msgid "[pulled from remote] into repository" msgstr "リポジトリに[リモートからプル]" -#: rhodecode/lib/helpers.py:664 +#: rhodecode/lib/helpers.py:697 msgid "[pulled] from" msgstr "[プル]" -#: rhodecode/lib/helpers.py:666 +#: rhodecode/lib/helpers.py:699 msgid "[started following] repository" msgstr "リポジトリの[フォローを開始]" -#: rhodecode/lib/helpers.py:668 +#: rhodecode/lib/helpers.py:701 msgid "[stopped following] repository" msgstr "リポジトリの[フォローを停止]" -#: rhodecode/lib/helpers.py:840 +#: rhodecode/lib/helpers.py:877 #, python-format msgid " and %s more" msgstr " と %s 以上" -#: rhodecode/lib/helpers.py:844 +#: rhodecode/lib/helpers.py:881 msgid "No Files" msgstr "ファイルなし" -#: rhodecode/lib/utils2.py:335 +#: rhodecode/lib/utils2.py:403 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d 年" -#: rhodecode/lib/utils2.py:336 +#: rhodecode/lib/utils2.py:404 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d ヶ月" -#: rhodecode/lib/utils2.py:337 +#: rhodecode/lib/utils2.py:405 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d 日" -#: rhodecode/lib/utils2.py:338 +#: rhodecode/lib/utils2.py:406 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d 時間" -#: rhodecode/lib/utils2.py:339 +#: rhodecode/lib/utils2.py:407 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d 分" -#: rhodecode/lib/utils2.py:340 +#: rhodecode/lib/utils2.py:408 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d 秒" -#: rhodecode/lib/utils2.py:355 +#: rhodecode/lib/utils2.py:424 +#, python-format +msgid "in %s" +msgstr "" + +#: rhodecode/lib/utils2.py:426 #, python-format msgid "%s ago" msgstr "%s 前" -#: rhodecode/lib/utils2.py:357 +#: rhodecode/lib/utils2.py:428 +#, fuzzy, python-format +msgid "in %s and %s" +msgstr "%s と %s 前" + +#: rhodecode/lib/utils2.py:431 #, python-format msgid "%s and %s ago" msgstr "%s と %s 前" -#: rhodecode/lib/utils2.py:360 +#: rhodecode/lib/utils2.py:434 msgid "just now" msgstr "ちょうどいま" -#: rhodecode/lib/celerylib/tasks.py:269 +#: rhodecode/lib/celerylib/tasks.py:270 msgid "password reset link" msgstr "パスワードリセットのリンク" @@ -928,87 +981,87 @@ msgid "on line %s" msgstr "" -#: rhodecode/model/comment.py:157 +#: rhodecode/model/comment.py:173 msgid "[Mention]" msgstr "[Mention]" -#: rhodecode/model/db.py:1140 +#: rhodecode/model/db.py:1163 msgid "Repository no access" msgstr "" -#: rhodecode/model/db.py:1141 +#: rhodecode/model/db.py:1164 msgid "Repository read access" msgstr "" -#: rhodecode/model/db.py:1142 +#: rhodecode/model/db.py:1165 msgid "Repository write access" msgstr "" -#: rhodecode/model/db.py:1143 +#: rhodecode/model/db.py:1166 msgid "Repository admin access" msgstr "" -#: rhodecode/model/db.py:1145 +#: rhodecode/model/db.py:1168 msgid "Repositories Group no access" msgstr "" -#: rhodecode/model/db.py:1146 +#: rhodecode/model/db.py:1169 msgid "Repositories Group read access" msgstr "" -#: rhodecode/model/db.py:1147 +#: rhodecode/model/db.py:1170 msgid "Repositories Group write access" msgstr "" -#: rhodecode/model/db.py:1148 +#: rhodecode/model/db.py:1171 msgid "Repositories Group admin access" msgstr "" -#: rhodecode/model/db.py:1150 +#: rhodecode/model/db.py:1173 msgid "RhodeCode Administrator" msgstr "" -#: rhodecode/model/db.py:1151 +#: rhodecode/model/db.py:1174 msgid "Repository creation disabled" msgstr "" -#: rhodecode/model/db.py:1152 +#: rhodecode/model/db.py:1175 msgid "Repository creation enabled" msgstr "" -#: rhodecode/model/db.py:1153 +#: rhodecode/model/db.py:1176 msgid "Repository forking disabled" msgstr "" -#: rhodecode/model/db.py:1154 +#: rhodecode/model/db.py:1177 msgid "Repository forking enabled" msgstr "" -#: rhodecode/model/db.py:1155 +#: rhodecode/model/db.py:1178 msgid "Register disabled" msgstr "" -#: rhodecode/model/db.py:1156 +#: rhodecode/model/db.py:1179 msgid "Register new user with RhodeCode with manual activation" msgstr "" -#: rhodecode/model/db.py:1159 +#: rhodecode/model/db.py:1182 msgid "Register new user with RhodeCode with auto activation" msgstr "" -#: rhodecode/model/db.py:1579 +#: rhodecode/model/db.py:1623 msgid "Not Reviewed" msgstr "未レビュー" -#: rhodecode/model/db.py:1580 +#: rhodecode/model/db.py:1624 msgid "Approved" msgstr "承認" -#: rhodecode/model/db.py:1581 +#: rhodecode/model/db.py:1625 msgid "Rejected" msgstr "却下" -#: rhodecode/model/db.py:1582 +#: rhodecode/model/db.py:1626 msgid "Under Review" msgstr "レビュー中" @@ -1031,35 +1084,41 @@ msgstr "%(min)i 文字以上必要です" #: rhodecode/model/notification.py:220 -msgid "commented on commit" +#, fuzzy, python-format +msgid "commented on commit at %(when)s" msgstr "コミットに対するコメント" #: rhodecode/model/notification.py:221 -msgid "sent message" +#, python-format +msgid "sent message at %(when)s" msgstr "" #: rhodecode/model/notification.py:222 -msgid "mentioned you" +#, python-format +msgid "mentioned you at %(when)s" msgstr "" #: rhodecode/model/notification.py:223 -msgid "registered in RhodeCode" +#, python-format +msgid "registered in RhodeCode at %(when)s" msgstr "" #: rhodecode/model/notification.py:224 -msgid "opened new pull request" -msgstr "" +#, fuzzy, python-format +msgid "opened new pull request at %(when)s" +msgstr "新しいプルリクエストを作成" #: rhodecode/model/notification.py:225 -msgid "commented on pull request" -msgstr "" - -#: rhodecode/model/pull_request.py:84 +#, fuzzy, python-format +msgid "commented on pull request at %(when)s" +msgstr "プルリクエストに[コメント]" + +#: rhodecode/model/pull_request.py:90 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s" msgstr "" -#: rhodecode/model/scm.py:535 +#: rhodecode/model/scm.py:542 msgid "latest tip" msgstr "最新のtip" @@ -1067,57 +1126,57 @@ msgid "new user registration" msgstr "新規ユーザー登録" -#: rhodecode/model/user.py:255 rhodecode/model/user.py:277 -#: rhodecode/model/user.py:299 +#: rhodecode/model/user.py:255 rhodecode/model/user.py:279 +#: rhodecode/model/user.py:301 msgid "You can't Edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:323 +#: rhodecode/model/user.py:325 msgid "You can't remove this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:329 +#: rhodecode/model/user.py:331 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories. %s" msgstr "" -#: rhodecode/model/validators.py:35 rhodecode/model/validators.py:36 +#: rhodecode/model/validators.py:36 rhodecode/model/validators.py:37 msgid "Value cannot be an empty list" msgstr "" -#: rhodecode/model/validators.py:82 +#: rhodecode/model/validators.py:83 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "ユーザー名 \"%(username)s\" はすでに使われています" -#: rhodecode/model/validators.py:84 +#: rhodecode/model/validators.py:85 #, python-format msgid "Username \"%(username)s\" is forbidden" msgstr "ユーザー名 \"%(username)s\" は許可されていません" -#: rhodecode/model/validators.py:86 +#: rhodecode/model/validators.py:87 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with alphanumeric character" msgstr "ユーザー名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットから始まる必要があります" -#: rhodecode/model/validators.py:114 +#: rhodecode/model/validators.py:115 #, python-format msgid "Username %(username)s is not valid" msgstr "ユーザー名 %(username)s は不正です" -#: rhodecode/model/validators.py:133 +#: rhodecode/model/validators.py:134 msgid "Invalid users group name" msgstr "不正なユーザーグループ名です" -#: rhodecode/model/validators.py:134 +#: rhodecode/model/validators.py:135 #, python-format msgid "Users group \"%(usersgroup)s\" already exists" msgstr "ユーザーグループ \"%(usersgroup)s\" はすでに存在します" -#: rhodecode/model/validators.py:136 +#: rhodecode/model/validators.py:137 msgid "" "users group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -1125,96 +1184,101 @@ "ユーザーグループ名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットから始まる必要があります" " " -#: rhodecode/model/validators.py:174 +#: rhodecode/model/validators.py:175 msgid "Cannot assign this group as parent" msgstr "このグループは親にできません" -#: rhodecode/model/validators.py:175 +#: rhodecode/model/validators.py:176 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "グループ \"%(group_name)s\" はすでに存在します" -#: rhodecode/model/validators.py:177 +#: rhodecode/model/validators.py:178 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "グループ名 \"%(group_name)s\" を持つリポジトリはすでに存在します" -#: rhodecode/model/validators.py:235 +#: rhodecode/model/validators.py:236 msgid "Invalid characters (non-ascii) in password" msgstr "パスワードに利用出来ない文字列(non-ascii)です" -#: rhodecode/model/validators.py:250 +#: rhodecode/model/validators.py:251 msgid "Passwords do not match" msgstr "パスワードが一致しません" -#: rhodecode/model/validators.py:267 +#: rhodecode/model/validators.py:268 msgid "invalid password" msgstr "不正なパスワードです" -#: rhodecode/model/validators.py:268 +#: rhodecode/model/validators.py:269 msgid "invalid user name" msgstr "不正なユーザー名です" -#: rhodecode/model/validators.py:269 +#: rhodecode/model/validators.py:270 msgid "Your account is disabled" msgstr "アカウントは無効です" -#: rhodecode/model/validators.py:313 +#: rhodecode/model/validators.py:314 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "リポジトリ名 %(repo)s は許可されていません" -#: rhodecode/model/validators.py:315 +#: rhodecode/model/validators.py:316 #, python-format msgid "Repository named %(repo)s already exists" msgstr "リポジトリ %(repo)s はすでに存在します" -#: rhodecode/model/validators.py:316 +#: rhodecode/model/validators.py:317 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "リポジトリ \"%(repo)s\" は グループ \"%(group)s\" にすでに存在します" -#: rhodecode/model/validators.py:318 +#: rhodecode/model/validators.py:319 #, python-format msgid "Repositories group with name \"%(repo)s\" already exists" msgstr "リポジトリグループ名 \"%(repo)s\" はすでに存在します" -#: rhodecode/model/validators.py:431 +#: rhodecode/model/validators.py:432 msgid "invalid clone url" msgstr "無効なクローンURIです" -#: rhodecode/model/validators.py:432 +#: rhodecode/model/validators.py:433 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" msgstr "" -#: rhodecode/model/validators.py:457 +#: rhodecode/model/validators.py:458 msgid "Fork have to be the same type as parent" msgstr "フォークは親と同じタイプの必要があります" -#: rhodecode/model/validators.py:478 +#: rhodecode/model/validators.py:473 +#, fuzzy +msgid "You don't have permissions to create repository in this group" +msgstr "このページを見る権限がありません" + +#: rhodecode/model/validators.py:498 msgid "This username or users group name is not valid" msgstr "ユーザー名かユーザーグループが不正です" -#: rhodecode/model/validators.py:562 +#: rhodecode/model/validators.py:582 msgid "This is not a valid path" msgstr "不正なパスです" -#: rhodecode/model/validators.py:577 +#: rhodecode/model/validators.py:597 msgid "This e-mail address is already taken" msgstr "このメールアドレスはすでに取得されています" -#: rhodecode/model/validators.py:597 +#: rhodecode/model/validators.py:617 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "メールアドレス \"%(email)s\" は存在しません" -#: rhodecode/model/validators.py:634 +#: rhodecode/model/validators.py:654 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:653 +#: rhodecode/model/validators.py:673 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" @@ -1237,7 +1301,7 @@ #: rhodecode/templates/index_base.html:6 #: rhodecode/templates/admin/repos/repos.html:9 -#: rhodecode/templates/base/base.html:221 +#: rhodecode/templates/base/base.html:233 msgid "repositories" msgstr "リポジトリ" @@ -1248,6 +1312,7 @@ msgstr "リポジトリの追加" #: rhodecode/templates/index_base.html:29 +#: rhodecode/templates/index_base.html:136 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:32 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:32 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:33 @@ -1257,9 +1322,10 @@ msgstr "グループ名" #: rhodecode/templates/index_base.html:30 -#: rhodecode/templates/index_base.html:71 -#: rhodecode/templates/index_base.html:142 -#: rhodecode/templates/index_base.html:168 +#: rhodecode/templates/index_base.html:72 +#: rhodecode/templates/index_base.html:138 +#: rhodecode/templates/index_base.html:176 +#: rhodecode/templates/index_base.html:266 #: rhodecode/templates/admin/repos/repo_add_base.html:56 #: rhodecode/templates/admin/repos/repo_edit.html:75 #: rhodecode/templates/admin/repos/repos.html:72 @@ -1268,142 +1334,137 @@ #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34 #: rhodecode/templates/forks/fork.html:59 #: rhodecode/templates/settings/repo_settings.html:66 -#: rhodecode/templates/summary/summary.html:105 +#: rhodecode/templates/summary/summary.html:114 msgid "Description" msgstr "説明" #: rhodecode/templates/index_base.html:40 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:47 msgid "Repositories group" msgstr "リポジトリグループ" -#: rhodecode/templates/index_base.html:70 -#: rhodecode/templates/index_base.html:166 +#: rhodecode/templates/index_base.html:71 +#: rhodecode/templates/index_base.html:174 +#: rhodecode/templates/index_base.html:264 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:32 #: rhodecode/templates/admin/repos/repos.html:70 -#: rhodecode/templates/admin/users/user_edit.html:192 +#: rhodecode/templates/admin/users/user_edit.html:196 #: rhodecode/templates/admin/users/user_edit_my_account.html:59 -#: rhodecode/templates/admin/users/user_edit_my_account.html:157 -#: rhodecode/templates/admin/users/user_edit_my_account.html:193 +#: rhodecode/templates/admin/users/user_edit_my_account.html:180 +#: rhodecode/templates/admin/users/user_edit_my_account.html:216 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:184 #: rhodecode/templates/bookmarks/bookmarks.html:36 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 -#: rhodecode/templates/branches/branches.html:51 +#: rhodecode/templates/branches/branches.html:50 +#: rhodecode/templates/branches/branches_data.html:6 #: rhodecode/templates/files/files_browser.html:47 -#: rhodecode/templates/journal/journal.html:59 -#: rhodecode/templates/journal/journal.html:107 -#: rhodecode/templates/journal/journal.html:186 +#: rhodecode/templates/journal/journal.html:62 +#: rhodecode/templates/journal/journal.html:168 +#: rhodecode/templates/journal/journal_page_repos.html:7 #: rhodecode/templates/settings/repo_settings.html:31 #: rhodecode/templates/summary/summary.html:43 -#: rhodecode/templates/summary/summary.html:123 -#: rhodecode/templates/tags/tags.html:36 +#: rhodecode/templates/summary/summary.html:132 +#: rhodecode/templates/tags/tags.html:51 #: rhodecode/templates/tags/tags_data.html:6 msgid "Name" msgstr "名前" -#: rhodecode/templates/index_base.html:72 +#: rhodecode/templates/index_base.html:73 msgid "Last change" msgstr "最後の変更時刻" -#: rhodecode/templates/index_base.html:73 -#: rhodecode/templates/index_base.html:171 -#: rhodecode/templates/admin/users/user_edit_my_account.html:159 -#: rhodecode/templates/journal/journal.html:188 +#: rhodecode/templates/index_base.html:74 +#: rhodecode/templates/index_base.html:179 +#: rhodecode/templates/admin/users/user_edit_my_account.html:182 +#: rhodecode/templates/journal/journal.html:170 msgid "Tip" msgstr "Tip" -#: rhodecode/templates/index_base.html:74 -#: rhodecode/templates/index_base.html:173 +#: rhodecode/templates/index_base.html:75 +#: rhodecode/templates/index_base.html:181 +#: rhodecode/templates/index_base.html:269 #: rhodecode/templates/admin/repos/repo_edit.html:121 #: rhodecode/templates/admin/repos/repos.html:73 msgid "Owner" msgstr "所有者" -#: rhodecode/templates/index_base.html:75 +#: rhodecode/templates/index_base.html:76 #: rhodecode/templates/summary/summary.html:48 #: rhodecode/templates/summary/summary.html:51 msgid "RSS" msgstr "RSS" -#: rhodecode/templates/index_base.html:76 +#: rhodecode/templates/index_base.html:77 msgid "Atom" msgstr "Atom" -#: rhodecode/templates/index_base.html:110 -#: rhodecode/templates/index_base.html:112 -#, python-format -msgid "Subscribe to %s rss feed" -msgstr "%s の RSS フィードを購読" - -#: rhodecode/templates/index_base.html:117 -#: rhodecode/templates/index_base.html:119 -#, python-format -msgid "Subscribe to %s atom feed" -msgstr "%s の ATOM フィードを購読" - -#: rhodecode/templates/index_base.html:140 -msgid "Group Name" -msgstr "グループ名" - -#: rhodecode/templates/index_base.html:158 -#: rhodecode/templates/index_base.html:198 +#: rhodecode/templates/index_base.html:167 +#: rhodecode/templates/index_base.html:207 +#: rhodecode/templates/index_base.html:291 #: rhodecode/templates/admin/repos/repos.html:94 -#: rhodecode/templates/admin/users/user_edit_my_account.html:179 +#: rhodecode/templates/admin/users/user_edit_my_account.html:202 #: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:60 -#: rhodecode/templates/branches/branches.html:77 -#: rhodecode/templates/journal/journal.html:211 -#: rhodecode/templates/tags/tags.html:60 +#: rhodecode/templates/branches/branches.html:76 +#: rhodecode/templates/journal/journal.html:193 +#: rhodecode/templates/tags/tags.html:77 msgid "Click to sort ascending" msgstr "昇順で並び換え" -#: rhodecode/templates/index_base.html:159 -#: rhodecode/templates/index_base.html:199 +#: rhodecode/templates/index_base.html:168 +#: rhodecode/templates/index_base.html:208 +#: rhodecode/templates/index_base.html:292 #: rhodecode/templates/admin/repos/repos.html:95 -#: rhodecode/templates/admin/users/user_edit_my_account.html:180 +#: rhodecode/templates/admin/users/user_edit_my_account.html:203 #: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:61 -#: rhodecode/templates/branches/branches.html:78 -#: rhodecode/templates/journal/journal.html:212 -#: rhodecode/templates/tags/tags.html:61 +#: rhodecode/templates/branches/branches.html:77 +#: rhodecode/templates/journal/journal.html:194 +#: rhodecode/templates/tags/tags.html:78 msgid "Click to sort descending" msgstr "降順で並び替え" -#: rhodecode/templates/index_base.html:169 +#: rhodecode/templates/index_base.html:177 +#: rhodecode/templates/index_base.html:267 msgid "Last Change" msgstr "最後の変更点" -#: rhodecode/templates/index_base.html:200 +#: rhodecode/templates/index_base.html:209 +#: rhodecode/templates/index_base.html:293 #: rhodecode/templates/admin/repos/repos.html:96 -#: rhodecode/templates/admin/users/user_edit_my_account.html:181 +#: rhodecode/templates/admin/users/user_edit_my_account.html:204 #: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:62 -#: rhodecode/templates/branches/branches.html:79 -#: rhodecode/templates/journal/journal.html:213 -#: rhodecode/templates/tags/tags.html:62 +#: rhodecode/templates/branches/branches.html:78 +#: rhodecode/templates/journal/journal.html:195 +#: rhodecode/templates/tags/tags.html:79 msgid "No records found." msgstr "レコードが見つかりません" -#: rhodecode/templates/index_base.html:201 +#: rhodecode/templates/index_base.html:210 +#: rhodecode/templates/index_base.html:294 #: rhodecode/templates/admin/repos/repos.html:97 -#: rhodecode/templates/admin/users/user_edit_my_account.html:182 +#: rhodecode/templates/admin/users/user_edit_my_account.html:205 #: rhodecode/templates/admin/users/users.html:110 #: rhodecode/templates/bookmarks/bookmarks.html:63 -#: rhodecode/templates/branches/branches.html:80 -#: rhodecode/templates/journal/journal.html:214 -#: rhodecode/templates/tags/tags.html:63 +#: rhodecode/templates/branches/branches.html:79 +#: rhodecode/templates/journal/journal.html:196 +#: rhodecode/templates/tags/tags.html:80 msgid "Data error." msgstr "データエラー" -#: rhodecode/templates/index_base.html:202 +#: rhodecode/templates/index_base.html:211 +#: rhodecode/templates/index_base.html:295 #: rhodecode/templates/admin/repos/repos.html:98 -#: rhodecode/templates/admin/users/user_edit_my_account.html:183 +#: rhodecode/templates/admin/users/user_edit_my_account.html:206 #: rhodecode/templates/admin/users/users.html:111 #: rhodecode/templates/bookmarks/bookmarks.html:64 -#: rhodecode/templates/branches/branches.html:81 -#: rhodecode/templates/journal/journal.html:215 -#: rhodecode/templates/tags/tags.html:64 +#: rhodecode/templates/branches/branches.html:80 +#: rhodecode/templates/journal/journal.html:54 +#: rhodecode/templates/journal/journal.html:197 +#: rhodecode/templates/tags/tags.html:81 msgid "Loading..." msgstr "読み込み中..." @@ -1421,7 +1482,7 @@ #: rhodecode/templates/admin/users/user_edit.html:50 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:26 #: rhodecode/templates/base/base.html:83 -#: rhodecode/templates/summary/summary.html:122 +#: rhodecode/templates/summary/summary.html:131 msgid "Username" msgstr "ユーザー名" @@ -1478,23 +1539,23 @@ #: rhodecode/templates/register.html:47 #: rhodecode/templates/admin/users/user_add.html:59 -#: rhodecode/templates/admin/users/user_edit.html:86 +#: rhodecode/templates/admin/users/user_edit.html:90 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:53 msgid "First Name" msgstr "名前" #: rhodecode/templates/register.html:56 #: rhodecode/templates/admin/users/user_add.html:68 -#: rhodecode/templates/admin/users/user_edit.html:95 +#: rhodecode/templates/admin/users/user_edit.html:99 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:62 msgid "Last Name" msgstr "名字" #: rhodecode/templates/register.html:65 #: rhodecode/templates/admin/users/user_add.html:77 -#: rhodecode/templates/admin/users/user_edit.html:104 +#: rhodecode/templates/admin/users/user_edit.html:108 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:71 -#: rhodecode/templates/summary/summary.html:124 +#: rhodecode/templates/summary/summary.html:133 msgid "Email" msgstr "メールアドレス" @@ -1534,7 +1595,7 @@ msgstr "タグ" #: rhodecode/templates/switch_to_list.html:22 -#: rhodecode/templates/tags/tags_data.html:33 +#: rhodecode/templates/tags/tags_data.html:38 msgid "There are no tags yet" msgstr "まだタグがありません" @@ -1557,8 +1618,8 @@ #: rhodecode/templates/admin/repos/repos.html:74 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:9 -#: rhodecode/templates/journal/journal.html:61 -#: rhodecode/templates/journal/journal.html:62 +#: rhodecode/templates/journal/journal_page_repos.html:9 +#: rhodecode/templates/journal/journal_page_repos.html:10 msgid "Action" msgstr "アクション" @@ -1569,8 +1630,9 @@ #: rhodecode/templates/admin/admin_log.html:8 #: rhodecode/templates/bookmarks/bookmarks.html:37 #: rhodecode/templates/bookmarks/bookmarks_data.html:7 -#: rhodecode/templates/branches/branches.html:52 -#: rhodecode/templates/tags/tags.html:37 +#: rhodecode/templates/branches/branches.html:51 +#: rhodecode/templates/branches/branches_data.html:7 +#: rhodecode/templates/tags/tags.html:52 #: rhodecode/templates/tags/tags_data.html:7 msgid "Date" msgstr "日時" @@ -1579,7 +1641,7 @@ msgid "From IP" msgstr "アクセス元IPアドレス" -#: rhodecode/templates/admin/admin_log.html:53 +#: rhodecode/templates/admin/admin_log.html:57 msgid "No actions yet" msgstr "まだアクションがありません" @@ -1659,8 +1721,8 @@ #: rhodecode/templates/admin/repos/repo_edit.html:141 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74 #: rhodecode/templates/admin/settings/hooks.html:73 -#: rhodecode/templates/admin/users/user_edit.html:129 -#: rhodecode/templates/admin/users/user_edit.html:174 +#: rhodecode/templates/admin/users/user_edit.html:133 +#: rhodecode/templates/admin/users/user_edit.html:178 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:79 #: rhodecode/templates/admin/users_groups/users_group_edit.html:135 #: rhodecode/templates/settings/repo_settings.html:93 @@ -1681,8 +1743,8 @@ msgstr "コメント" #: rhodecode/templates/admin/notifications/notifications.html:31 -#: rhodecode/templates/base/base.html:254 -#: rhodecode/templates/base/base.html:256 +#: rhodecode/templates/base/base.html:266 +#: rhodecode/templates/base/base.html:268 msgid "Pull requests" msgstr "プルリクエスト" @@ -1710,7 +1772,7 @@ #: rhodecode/templates/admin/permissions/permissions.html:11 #: rhodecode/templates/admin/repos/repo_edit.html:134 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58 -#: rhodecode/templates/admin/users/user_edit.html:139 +#: rhodecode/templates/admin/users/user_edit.html:143 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100 #: rhodecode/templates/settings/repo_settings.html:86 msgid "Permissions" @@ -1752,7 +1814,7 @@ msgstr "リポジトリフォーク" #: rhodecode/templates/admin/permissions/permissions.html:78 -#: rhodecode/templates/admin/repos/repo_edit.html:241 +#: rhodecode/templates/admin/repos/repo_edit.html:264 msgid "set" msgstr "保存" @@ -1772,8 +1834,8 @@ msgstr "新規追加" #: rhodecode/templates/admin/repos/repo_add_base.html:20 -#: rhodecode/templates/summary/summary.html:95 -#: rhodecode/templates/summary/summary.html:96 +#: rhodecode/templates/summary/summary.html:104 +#: rhodecode/templates/summary/summary.html:105 msgid "Clone from" msgstr "クローン元" @@ -1849,12 +1911,14 @@ #: rhodecode/templates/admin/repos/repo_edit.html:13 #: rhodecode/templates/admin/users/user_edit.html:13 -#: rhodecode/templates/admin/users/user_edit.html:224 -#: rhodecode/templates/admin/users/user_edit.html:226 +#: rhodecode/templates/admin/users/user_edit.html:228 +#: rhodecode/templates/admin/users/user_edit.html:230 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13 -#: rhodecode/templates/files/files_source.html:44 -#: rhodecode/templates/journal/journal.html:81 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:207 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:209 +#: rhodecode/templates/files/files_source.html:29 +#: rhodecode/templates/journal/journal_page_repos.html:29 msgid "edit" msgstr "編集" @@ -1900,11 +1964,11 @@ #: rhodecode/templates/admin/repos/repo_edit.html:142 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75 #: rhodecode/templates/admin/settings/settings.html:113 -#: rhodecode/templates/admin/settings/settings.html:168 -#: rhodecode/templates/admin/settings/settings.html:258 -#: rhodecode/templates/admin/users/user_edit.html:130 -#: rhodecode/templates/admin/users/user_edit.html:175 -#: rhodecode/templates/admin/users/user_edit.html:278 +#: rhodecode/templates/admin/settings/settings.html:179 +#: rhodecode/templates/admin/settings/settings.html:269 +#: rhodecode/templates/admin/users/user_edit.html:134 +#: rhodecode/templates/admin/users/user_edit.html:179 +#: rhodecode/templates/admin/users/user_edit.html:282 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:80 #: rhodecode/templates/admin/users_groups/users_group_edit.html:136 #: rhodecode/templates/files/files_add.html:82 @@ -1962,78 +2026,104 @@ msgid "Confirm to invalidate repository cache" msgstr "リポジトリのキャッシュを無効化してもよろしいですか？" -#: rhodecode/templates/admin/repos/repo_edit.html:195 -#: rhodecode/templates/base/base.html:318 -#: rhodecode/templates/base/base.html:320 -#: rhodecode/templates/base/base.html:322 -msgid "Public journal" -msgstr "公開ジャーナル" +#: rhodecode/templates/admin/repos/repo_edit.html:193 +msgid "" +"Manually invalidate cache for this repository. On first access repository" +" will be cached again" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:198 +msgid "List of cached values" +msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:201 -msgid "Remove from public journal" -msgstr "公開ジャーナルから削除する" +msgid "Prefix" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:202 +#, fuzzy +msgid "Key" +msgstr "APIキー" #: rhodecode/templates/admin/repos/repo_edit.html:203 +#: rhodecode/templates/admin/users/user_add.html:86 +#: rhodecode/templates/admin/users/user_edit.html:117 +#: rhodecode/templates/admin/users_groups/users_group_add.html:41 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:42 +msgid "Active" +msgstr "アクティブ" + +#: rhodecode/templates/admin/repos/repo_edit.html:218 +#: rhodecode/templates/base/base.html:330 +#: rhodecode/templates/base/base.html:332 +#: rhodecode/templates/base/base.html:334 +msgid "Public journal" +msgstr "公開ジャーナル" + +#: rhodecode/templates/admin/repos/repo_edit.html:224 +msgid "Remove from public journal" +msgstr "公開ジャーナルから削除する" + +#: rhodecode/templates/admin/repos/repo_edit.html:226 msgid "Add to public journal" msgstr "公開ジャーナルに追加する" -#: rhodecode/templates/admin/repos/repo_edit.html:208 +#: rhodecode/templates/admin/repos/repo_edit.html:231 msgid "" "All actions made on this repository will be accessible to everyone in " "public journal" msgstr "公開ジャーナルでは、このリポジトリに対して行った操作のすべてが公開されます" -#: rhodecode/templates/admin/repos/repo_edit.html:215 +#: rhodecode/templates/admin/repos/repo_edit.html:238 msgid "Locking" msgstr "ロック" -#: rhodecode/templates/admin/repos/repo_edit.html:220 +#: rhodecode/templates/admin/repos/repo_edit.html:243 msgid "Unlock locked repo" msgstr "リポジトリのアンロック" -#: rhodecode/templates/admin/repos/repo_edit.html:220 +#: rhodecode/templates/admin/repos/repo_edit.html:243 msgid "Confirm to unlock repository" msgstr "このリポジトリのロックを外しますか？" -#: rhodecode/templates/admin/repos/repo_edit.html:223 +#: rhodecode/templates/admin/repos/repo_edit.html:246 msgid "lock repo" msgstr "リポジトリのロック" -#: rhodecode/templates/admin/repos/repo_edit.html:223 +#: rhodecode/templates/admin/repos/repo_edit.html:246 msgid "Confirm to lock repository" msgstr "このリポジトリをロックしますか？" -#: rhodecode/templates/admin/repos/repo_edit.html:224 +#: rhodecode/templates/admin/repos/repo_edit.html:247 msgid "Repository is not locked" msgstr "リポジトリはロックされていません" -#: rhodecode/templates/admin/repos/repo_edit.html:229 +#: rhodecode/templates/admin/repos/repo_edit.html:252 msgid "Force locking on repository. Works only when anonymous access is disabled" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:236 +#: rhodecode/templates/admin/repos/repo_edit.html:259 msgid "Set as fork of" msgstr "フォーク元の設定" -#: rhodecode/templates/admin/repos/repo_edit.html:245 +#: rhodecode/templates/admin/repos/repo_edit.html:268 msgid "Manually set this repository as a fork of another from the list" msgstr "このリポジトリをリスト中の他のリポジトリのフォークとして、手動で設定します" -#: rhodecode/templates/admin/repos/repo_edit.html:251 +#: rhodecode/templates/admin/repos/repo_edit.html:274 #: rhodecode/templates/changeset/changeset_file_comment.html:26 msgid "Delete" msgstr "削除" -#: rhodecode/templates/admin/repos/repo_edit.html:255 +#: rhodecode/templates/admin/repos/repo_edit.html:278 msgid "Remove this repository" msgstr "このリポジトリを削除" -#: rhodecode/templates/admin/repos/repo_edit.html:255 -#: rhodecode/templates/journal/journal.html:84 +#: rhodecode/templates/admin/repos/repo_edit.html:278 msgid "Confirm to delete this repository" msgstr "このリポジトリを削除しますか？" -#: rhodecode/templates/admin/repos/repo_edit.html:259 +#: rhodecode/templates/admin/repos/repo_edit.html:282 msgid "" "This repository will be renamed in a special way in order to be " "unaccesible for RhodeCode and VCS systems.\n" @@ -2061,7 +2151,7 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:6 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6 #: rhodecode/templates/admin/users/users.html:85 -#: rhodecode/templates/base/base.html:217 +#: rhodecode/templates/base/base.html:229 msgid "admin" msgstr "管理" @@ -2072,8 +2162,8 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:16 #: rhodecode/templates/data_table/_dt_elements.html:67 -#: rhodecode/templates/journal/journal.html:132 -#: rhodecode/templates/summary/summary.html:76 +#: rhodecode/templates/journal/journal.html:87 +#: rhodecode/templates/summary/summary.html:85 msgid "private repository" msgstr "非公開リポジトリ" @@ -2096,12 +2186,12 @@ msgstr "別のメンバーを追加" #: rhodecode/templates/admin/repos/repo_edit_perms.html:97 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 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:96 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:103 msgid "Failed to remove users group" msgstr "ユーザーグループの削除に失敗しました" @@ -2109,11 +2199,44 @@ msgid "Repositories administration" msgstr "リポジトリ管理" -#: rhodecode/templates/admin/repos_groups/repos_groups.html:8 -msgid "Groups" -msgstr "グループ" - -#: rhodecode/templates/admin/repos_groups/repos_groups.html:12 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:73 +msgid "apply to children" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:74 +msgid "" +"Set or revoke permission to all children of that group, including " +"repositories and other groups" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_groups.html:9 +#: rhodecode/templates/base/base.html:122 +#: rhodecode/templates/base/base.html:312 +#: rhodecode/templates/base/base.html:314 +#: rhodecode/templates/base/base.html:316 +#: rhodecode/templates/bookmarks/bookmarks.html:11 +#: rhodecode/templates/branches/branches.html:10 +#: rhodecode/templates/changelog/changelog.html:10 +#: rhodecode/templates/changeset/changeset.html:10 +#: rhodecode/templates/changeset/changeset_range.html:9 +#: rhodecode/templates/compare/compare_diff.html:9 +#: rhodecode/templates/files/file_diff.html:8 +#: rhodecode/templates/files/files.html:8 +#: rhodecode/templates/files/files_add.html:15 +#: rhodecode/templates/files/files_edit.html:15 +#: rhodecode/templates/followers/followers.html:9 +#: rhodecode/templates/forks/fork.html:9 rhodecode/templates/forks/forks.html:9 +#: rhodecode/templates/pullrequests/pullrequest.html:8 +#: rhodecode/templates/pullrequests/pullrequest_show.html:8 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 +#: rhodecode/templates/settings/repo_settings.html:9 +#: rhodecode/templates/shortlog/shortlog.html:10 +#: rhodecode/templates/summary/summary.html:8 +#: rhodecode/templates/tags/tags.html:11 +msgid "Home" +msgstr "ホーム" + +#: rhodecode/templates/admin/repos_groups/repos_groups.html:13 msgid "with" msgstr "と" @@ -2139,7 +2262,7 @@ #: rhodecode/templates/admin/users/user_add.html:94 #: rhodecode/templates/admin/users_groups/users_group_add.html:49 #: rhodecode/templates/admin/users_groups/users_group_edit.html:90 -#: rhodecode/templates/pullrequests/pullrequest_show.html:113 +#: rhodecode/templates/pullrequests/pullrequest_show.html:131 msgid "save" msgstr "保存" @@ -2175,20 +2298,21 @@ msgid "action" msgstr "アクション" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 -#: rhodecode/templates/admin/users/user_edit.html:255 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55 +#: rhodecode/templates/admin/users/user_edit.html:259 #: rhodecode/templates/admin/users_groups/users_groups.html:44 #: rhodecode/templates/data_table/_dt_elements.html:7 -#: rhodecode/templates/data_table/_dt_elements.html:103 +#: rhodecode/templates/data_table/_dt_elements.html:121 msgid "delete" msgstr "削除" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 -#, python-format -msgid "Confirm to delete this group: %s" -msgstr "グループ %s を削除してもよろしいですか？" - -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:62 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55 +#, fuzzy, python-format +msgid "Confirm to delete this group: %s with %s repository" +msgid_plural "Confirm to delete this group: %s with %s repositories" +msgstr[0] "このリポジトリを削除しますか？" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:63 msgid "There are no repositories groups yet" msgstr "まだリポジトリグループがありません" @@ -2281,8 +2405,8 @@ msgstr "GAコード" #: rhodecode/templates/admin/settings/settings.html:112 -#: rhodecode/templates/admin/settings/settings.html:167 -#: rhodecode/templates/admin/settings/settings.html:257 +#: rhodecode/templates/admin/settings/settings.html:178 +#: rhodecode/templates/admin/settings/settings.html:268 msgid "Save settings" msgstr "設定を保存" @@ -2290,126 +2414,134 @@ msgid "Visualisation settings" msgstr "表示の設定" -#: rhodecode/templates/admin/settings/settings.html:128 +#: rhodecode/templates/admin/settings/settings.html:127 +#, fuzzy +msgid "General" +msgstr "有効にする" + +#: rhodecode/templates/admin/settings/settings.html:132 +msgid "Use lightweight dashboard" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:139 msgid "Icons" msgstr "アイコン" -#: rhodecode/templates/admin/settings/settings.html:133 +#: rhodecode/templates/admin/settings/settings.html:144 msgid "Show public repo icon on repositories" msgstr "公開リポジトリのアイコンを表示" -#: rhodecode/templates/admin/settings/settings.html:137 +#: rhodecode/templates/admin/settings/settings.html:148 msgid "Show private repo icon on repositories" msgstr "非公開リポジトリのアイコンを表示" -#: rhodecode/templates/admin/settings/settings.html:144 +#: rhodecode/templates/admin/settings/settings.html:155 msgid "Meta-Tagging" msgstr "メタタグ" -#: rhodecode/templates/admin/settings/settings.html:149 +#: rhodecode/templates/admin/settings/settings.html:160 msgid "Stylify recognised metatags:" msgstr "次のメタタグを変換する" -#: rhodecode/templates/admin/settings/settings.html:176 +#: rhodecode/templates/admin/settings/settings.html:187 msgid "VCS settings" msgstr "VCSの設定" -#: rhodecode/templates/admin/settings/settings.html:185 +#: rhodecode/templates/admin/settings/settings.html:196 msgid "Web" msgstr "Web" -#: rhodecode/templates/admin/settings/settings.html:190 +#: rhodecode/templates/admin/settings/settings.html:201 msgid "require ssl for vcs operations" msgstr "VCSの操作にSSLを必須とする" -#: rhodecode/templates/admin/settings/settings.html:192 +#: rhodecode/templates/admin/settings/settings.html:203 msgid "" "RhodeCode will require SSL for pushing or pulling. If SSL is missing it " "will return HTTP Error 406: Not Acceptable" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:198 +#: rhodecode/templates/admin/settings/settings.html:209 msgid "Hooks" msgstr "フック" -#: rhodecode/templates/admin/settings/settings.html:203 +#: rhodecode/templates/admin/settings/settings.html:214 msgid "Update repository after push (hg update)" msgstr "プッシュ後にリポジトリをを更新する (hg update)" -#: rhodecode/templates/admin/settings/settings.html:207 +#: rhodecode/templates/admin/settings/settings.html:218 msgid "Show repository size after push" msgstr "プッシュ後にリポジトリのサイズを表示する" -#: rhodecode/templates/admin/settings/settings.html:211 +#: rhodecode/templates/admin/settings/settings.html:222 msgid "Log user push commands" msgstr "ユーザーのプッシュコマンドを記録する" -#: rhodecode/templates/admin/settings/settings.html:215 +#: rhodecode/templates/admin/settings/settings.html:226 msgid "Log user pull commands" msgstr "ユーザーのプルコマンドを記録する" -#: rhodecode/templates/admin/settings/settings.html:219 +#: rhodecode/templates/admin/settings/settings.html:230 msgid "advanced setup" msgstr "高度な設定" -#: rhodecode/templates/admin/settings/settings.html:224 +#: rhodecode/templates/admin/settings/settings.html:235 msgid "Mercurial Extensions" msgstr "Mercurialエクステンション" -#: rhodecode/templates/admin/settings/settings.html:229 +#: rhodecode/templates/admin/settings/settings.html:240 msgid "largefiles extensions" msgstr "largefilesエクステンション" -#: rhodecode/templates/admin/settings/settings.html:233 +#: rhodecode/templates/admin/settings/settings.html:244 msgid "hgsubversion extensions" msgstr "hgsubversionエクステンション" -#: rhodecode/templates/admin/settings/settings.html:235 +#: rhodecode/templates/admin/settings/settings.html:246 msgid "" "Requires hgsubversion library installed. Allows clonning from svn remote " "locations" -msgstr "" -"hgsubversion のインストールが必要です。" -"リモートロケーションのsvnからクローン出来るようになります" - -#: rhodecode/templates/admin/settings/settings.html:245 +msgstr "hgsubversion のインストールが必要です。リモートロケーションのsvnからクローン出来るようになります" + +#: rhodecode/templates/admin/settings/settings.html:256 msgid "Repositories location" msgstr "リポジトリロケーション" -#: rhodecode/templates/admin/settings/settings.html:250 +#: rhodecode/templates/admin/settings/settings.html:261 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:251 +#: rhodecode/templates/admin/settings/settings.html:262 +#: rhodecode/templates/base/base.html:221 msgid "unlock" msgstr "変更可能にする" -#: rhodecode/templates/admin/settings/settings.html:252 +#: rhodecode/templates/admin/settings/settings.html:263 msgid "" "Location where repositories are stored. After changing this value a " "restart, and rescan is required" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:272 +#: rhodecode/templates/admin/settings/settings.html:283 msgid "Test Email" msgstr "テストメール" -#: rhodecode/templates/admin/settings/settings.html:280 +#: rhodecode/templates/admin/settings/settings.html:291 msgid "Email to" msgstr "送信先" -#: rhodecode/templates/admin/settings/settings.html:288 +#: rhodecode/templates/admin/settings/settings.html:299 msgid "Send" msgstr "送る" -#: rhodecode/templates/admin/settings/settings.html:294 +#: rhodecode/templates/admin/settings/settings.html:305 msgid "System Info and Packages" msgstr "システム情報とパッケージ" -#: rhodecode/templates/admin/settings/settings.html:297 +#: rhodecode/templates/admin/settings/settings.html:308 msgid "show" msgstr "表示" @@ -2430,13 +2562,6 @@ msgid "Password confirmation" msgstr "パスワード再入力" -#: rhodecode/templates/admin/users/user_add.html:86 -#: rhodecode/templates/admin/users/user_edit.html:113 -#: rhodecode/templates/admin/users_groups/users_group_add.html:41 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:42 -msgid "Active" -msgstr "アクティブ" - #: rhodecode/templates/admin/users/user_edit.html:5 msgid "Edit user" msgstr "ユーザー編集" @@ -2456,26 +2581,26 @@ msgid "API key" msgstr "APIキー" -#: rhodecode/templates/admin/users/user_edit.html:59 +#: rhodecode/templates/admin/users/user_edit.html:63 msgid "LDAP DN" msgstr "LDAP DN" -#: rhodecode/templates/admin/users/user_edit.html:68 +#: rhodecode/templates/admin/users/user_edit.html:72 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:35 msgid "New password" msgstr "新しいパスワード" -#: rhodecode/templates/admin/users/user_edit.html:77 +#: rhodecode/templates/admin/users/user_edit.html:81 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:44 msgid "New password confirmation" msgstr "新しいパスワード 再入力" -#: rhodecode/templates/admin/users/user_edit.html:147 +#: rhodecode/templates/admin/users/user_edit.html:151 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108 msgid "Inherit default permissions" msgstr "デフォルトの権限を継承する" -#: rhodecode/templates/admin/users/user_edit.html:152 +#: rhodecode/templates/admin/users/user_edit.html:156 #: rhodecode/templates/admin/users_groups/users_group_edit.html:113 #, python-format msgid "" @@ -2483,46 +2608,48 @@ "options does not have any action" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:158 +#: rhodecode/templates/admin/users/user_edit.html:162 #: rhodecode/templates/admin/users_groups/users_group_edit.html:119 msgid "Create repositories" msgstr "リポジトリを作成する" -#: rhodecode/templates/admin/users/user_edit.html:166 +#: rhodecode/templates/admin/users/user_edit.html:170 #: rhodecode/templates/admin/users_groups/users_group_edit.html:127 msgid "Fork repositories" msgstr "リポジトリをフォークする" -#: rhodecode/templates/admin/users/user_edit.html:186 +#: rhodecode/templates/admin/users/user_edit.html:190 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39 msgid "Nothing here yet" msgstr "まだありません" -#: rhodecode/templates/admin/users/user_edit.html:193 +#: rhodecode/templates/admin/users/user_edit.html:197 #: rhodecode/templates/admin/users/user_edit_my_account.html:60 -#: rhodecode/templates/admin/users/user_edit_my_account.html:194 +#: rhodecode/templates/admin/users/user_edit_my_account.html:217 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:185 msgid "Permission" msgstr "権限" -#: rhodecode/templates/admin/users/user_edit.html:194 +#: rhodecode/templates/admin/users/user_edit.html:198 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:186 msgid "Edit Permission" msgstr "権限の編集" -#: rhodecode/templates/admin/users/user_edit.html:243 +#: rhodecode/templates/admin/users/user_edit.html:247 msgid "Email addresses" msgstr "メールアドレス" -#: rhodecode/templates/admin/users/user_edit.html:256 +#: rhodecode/templates/admin/users/user_edit.html:260 #, python-format msgid "Confirm to delete this email: %s" msgstr "このメールを削除してよろしいですか: %s" -#: rhodecode/templates/admin/users/user_edit.html:270 +#: rhodecode/templates/admin/users/user_edit.html:274 msgid "New email address" msgstr "新しいメールアドレス" -#: rhodecode/templates/admin/users/user_edit.html:277 +#: rhodecode/templates/admin/users/user_edit.html:281 msgid "Add" msgstr "追加" @@ -2578,31 +2705,33 @@ #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:7 #: rhodecode/templates/bookmarks/bookmarks.html:40 #: rhodecode/templates/bookmarks/bookmarks_data.html:9 -#: rhodecode/templates/branches/branches.html:55 -#: rhodecode/templates/journal/journal.html:60 -#: rhodecode/templates/tags/tags.html:40 +#: rhodecode/templates/branches/branches.html:54 +#: rhodecode/templates/branches/branches_data.html:9 +#: rhodecode/templates/journal/journal_page_repos.html:8 +#: rhodecode/templates/tags/tags.html:55 #: rhodecode/templates/tags/tags_data.html:9 msgid "Revision" msgstr "リビジョン" #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28 -#: rhodecode/templates/journal/journal.html:81 +#: rhodecode/templates/journal/journal_page_repos.html:29 msgid "private" msgstr "非公開" #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:31 #: rhodecode/templates/data_table/_dt_elements.html:7 +#: rhodecode/templates/journal/journal_page_repos.html:32 #, python-format msgid "Confirm to delete this repository: %s" msgstr "このリポジトリを削除しますか？ : %s" #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:38 -#: rhodecode/templates/journal/journal.html:94 +#: rhodecode/templates/journal/journal_page_repos.html:42 msgid "No repositories yet" msgstr "まだリポジトリがありません" #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:40 -#: rhodecode/templates/journal/journal.html:96 +#: rhodecode/templates/journal/journal_page_repos.html:44 msgid "create one now" msgstr "今すぐ作成する" @@ -2611,7 +2740,7 @@ msgstr "ユーザー管理" #: rhodecode/templates/admin/users/users.html:9 -#: rhodecode/templates/base/base.html:223 +#: rhodecode/templates/base/base.html:235 msgid "users" msgstr "ユーザー" @@ -2641,7 +2770,7 @@ msgstr "アクティブ" #: rhodecode/templates/admin/users/users.html:86 -#: rhodecode/templates/base/base.html:226 +#: rhodecode/templates/base/base.html:238 msgid "ldap" msgstr "LDAP" @@ -2690,6 +2819,21 @@ msgid "Group members" msgstr "グループメンバー" +#: rhodecode/templates/admin/users_groups/users_group_edit.html:163 +#, fuzzy +msgid "No members yet" +msgstr "メンバー" + +#: rhodecode/templates/admin/users_groups/users_group_edit.html:171 +#, fuzzy +msgid "Permissions defined for this group" +msgstr "権限管理" + +#: rhodecode/templates/admin/users_groups/users_group_edit.html:178 +#, fuzzy +msgid "No permissions set yet" +msgstr "権限のコピー" + #: rhodecode/templates/admin/users_groups/users_groups.html:5 msgid "Users groups administration" msgstr "ユーザーグループ管理" @@ -2732,36 +2876,10 @@ msgid "Inbox" msgstr "受信箱" -#: rhodecode/templates/base/base.html:122 -#: rhodecode/templates/base/base.html:300 -#: rhodecode/templates/base/base.html:302 -#: rhodecode/templates/base/base.html:304 -#: rhodecode/templates/bookmarks/bookmarks.html:11 -#: rhodecode/templates/branches/branches.html:10 -#: rhodecode/templates/changelog/changelog.html:10 -#: rhodecode/templates/changeset/changeset.html:10 -#: rhodecode/templates/changeset/changeset_range.html:9 -#: rhodecode/templates/compare/compare_diff.html:9 -#: rhodecode/templates/files/file_diff.html:8 -#: rhodecode/templates/files/files.html:8 -#: rhodecode/templates/files/files_add.html:15 -#: rhodecode/templates/files/files_edit.html:15 -#: rhodecode/templates/followers/followers.html:9 -#: rhodecode/templates/forks/fork.html:9 rhodecode/templates/forks/forks.html:9 -#: rhodecode/templates/pullrequests/pullrequest.html:8 -#: rhodecode/templates/pullrequests/pullrequest_show.html:8 -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 -#: rhodecode/templates/settings/repo_settings.html:9 -#: rhodecode/templates/shortlog/shortlog.html:10 -#: rhodecode/templates/summary/summary.html:8 -#: rhodecode/templates/tags/tags.html:11 -msgid "Home" -msgstr "ホーム" - #: rhodecode/templates/base/base.html:123 -#: rhodecode/templates/base/base.html:309 -#: rhodecode/templates/base/base.html:311 -#: rhodecode/templates/base/base.html:313 +#: rhodecode/templates/base/base.html:321 +#: rhodecode/templates/base/base.html:323 +#: rhodecode/templates/base/base.html:325 #: rhodecode/templates/journal/journal.html:4 #: rhodecode/templates/journal/journal.html:21 #: rhodecode/templates/journal/public_journal.html:4 @@ -2781,7 +2899,7 @@ msgstr "" #: rhodecode/templates/base/base.html:152 -#: rhodecode/templates/base/base.html:182 +#: rhodecode/templates/base/base.html:182 rhodecode/templates/base/root.html:47 msgid "loading..." msgstr "読み込み中..." @@ -2826,50 +2944,64 @@ #: rhodecode/templates/base/base.html:204 #: rhodecode/templates/base/base.html:206 -#: rhodecode/templates/base/base.html:227 -msgid "settings" -msgstr "設定" - -#: rhodecode/templates/base/base.html:209 +#, fuzzy +msgid "repository settings" +msgstr "リポジトリ作成" + +#: rhodecode/templates/base/base.html:210 #: rhodecode/templates/data_table/_dt_elements.html:80 #: rhodecode/templates/forks/fork.html:13 msgid "fork" msgstr "フォーク" -#: rhodecode/templates/base/base.html:211 -#: rhodecode/templates/changelog/changelog.html:40 +#: rhodecode/templates/base/base.html:212 rhodecode/templates/base/root.html:50 +#: rhodecode/templates/changelog/changelog.html:43 msgid "Open new pull request" msgstr "新しいプルリクエストを作成" -#: rhodecode/templates/base/base.html:213 +#: rhodecode/templates/base/base.html:215 +#: rhodecode/templates/forks/forks_data.html:21 +msgid "Compare fork" +msgstr "フォークを比較" + +#: rhodecode/templates/base/base.html:217 msgid "search" msgstr "検索" -#: rhodecode/templates/base/base.html:222 +#: rhodecode/templates/base/base.html:223 +#, fuzzy +msgid "lock" +msgstr "変更可能にする" + +#: rhodecode/templates/base/base.html:234 msgid "repositories groups" msgstr "リポジトリグループ" -#: rhodecode/templates/base/base.html:224 +#: rhodecode/templates/base/base.html:236 msgid "users groups" msgstr "ユーザーグループ" -#: rhodecode/templates/base/base.html:225 +#: rhodecode/templates/base/base.html:237 msgid "permissions" msgstr "権限" -#: rhodecode/templates/base/base.html:238 -#: rhodecode/templates/base/base.html:240 +#: rhodecode/templates/base/base.html:239 +msgid "settings" +msgstr "設定" + +#: rhodecode/templates/base/base.html:250 +#: rhodecode/templates/base/base.html:252 msgid "Followers" msgstr "フォロワー" -#: rhodecode/templates/base/base.html:246 -#: rhodecode/templates/base/base.html:248 +#: rhodecode/templates/base/base.html:258 +#: rhodecode/templates/base/base.html:260 msgid "Forks" msgstr "フォーク" -#: rhodecode/templates/base/base.html:327 -#: rhodecode/templates/base/base.html:329 -#: rhodecode/templates/base/base.html:331 +#: rhodecode/templates/base/base.html:339 +#: rhodecode/templates/base/base.html:341 +#: rhodecode/templates/base/base.html:343 #: rhodecode/templates/search/search.html:52 msgid "Search" msgstr "検索" @@ -2879,7 +3011,7 @@ msgstr "別のコメントを追加" #: rhodecode/templates/base/root.html:43 -#: rhodecode/templates/journal/journal.html:120 +#: rhodecode/templates/journal/journal.html:75 #: rhodecode/templates/summary/summary.html:57 msgid "Stop following this repository" msgstr "このリポジトリのフォローをやめる" @@ -2893,14 +3025,27 @@ msgid "Group" msgstr "グループ" -#: rhodecode/templates/base/root.html:47 +#: rhodecode/templates/base/root.html:48 msgid "search truncated" msgstr "検索結果は省略されています" -#: rhodecode/templates/base/root.html:48 +#: rhodecode/templates/base/root.html:49 msgid "no matching files" msgstr "マッチするファイルはありません" +#: rhodecode/templates/base/root.html:51 +#, fuzzy +msgid "Open new pull request for selected changesets" +msgstr "新しいプルリクエストを作成" + +#: rhodecode/templates/base/root.html:52 +msgid "Show selected changes __S -> __E" +msgstr "" + +#: rhodecode/templates/base/root.html:53 +msgid "Selection link" +msgstr "" + #: rhodecode/templates/bookmarks/bookmarks.html:5 #, python-format msgid "%s Bookmarks" @@ -2908,8 +3053,9 @@ #: rhodecode/templates/bookmarks/bookmarks.html:39 #: rhodecode/templates/bookmarks/bookmarks_data.html:8 -#: rhodecode/templates/branches/branches.html:54 -#: rhodecode/templates/tags/tags.html:39 +#: rhodecode/templates/branches/branches.html:53 +#: rhodecode/templates/branches/branches_data.html:8 +#: rhodecode/templates/tags/tags.html:54 #: rhodecode/templates/tags/tags_data.html:8 msgid "Author" msgstr "作成者" @@ -2923,34 +3069,15 @@ msgid "Compare branches" msgstr "ブランチの比較" -#: rhodecode/templates/branches/branches.html:57 +#: rhodecode/templates/branches/branches.html:56 +#: rhodecode/templates/branches/branches_data.html:10 #: rhodecode/templates/compare/compare_diff.html:5 #: rhodecode/templates/compare/compare_diff.html:13 +#: rhodecode/templates/tags/tags.html:57 +#: rhodecode/templates/tags/tags_data.html:10 msgid "Compare" msgstr "比較" -#: rhodecode/templates/branches/branches_data.html:6 -msgid "name" -msgstr "名前" - -#: rhodecode/templates/branches/branches_data.html:7 -msgid "date" -msgstr "日付" - -#: rhodecode/templates/branches/branches_data.html:8 -#: rhodecode/templates/shortlog/shortlog_data.html:8 -msgid "author" -msgstr "作成者" - -#: rhodecode/templates/branches/branches_data.html:9 -#: rhodecode/templates/shortlog/shortlog_data.html:5 -msgid "revision" -msgstr "リビジョン" - -#: rhodecode/templates/branches/branches_data.html:10 -msgid "compare" -msgstr "比較" - #: rhodecode/templates/changelog/changelog.html:6 #, python-format msgid "%s Changelog" @@ -2963,57 +3090,65 @@ msgstr[0] "" #: rhodecode/templates/changelog/changelog.html:37 +#, fuzzy +msgid "Clear selection" +msgstr "検索設定" + +#: rhodecode/templates/changelog/changelog.html:40 #: rhodecode/templates/forks/forks_data.html:19 #, python-format msgid "compare fork with %s" msgstr "%s とフォークを比較" -#: rhodecode/templates/changelog/changelog.html:37 -#: rhodecode/templates/forks/forks_data.html:21 -msgid "Compare fork" -msgstr "フォークを比較" - -#: rhodecode/templates/changelog/changelog.html:46 +#: rhodecode/templates/changelog/changelog.html:40 +#, fuzzy +msgid "Compare fork with parent" +msgstr "%s とフォークを比較" + +#: rhodecode/templates/changelog/changelog.html:49 msgid "Show" msgstr "表示" -#: rhodecode/templates/changelog/changelog.html:72 -#: rhodecode/templates/summary/summary.html:364 +#: rhodecode/templates/changelog/changelog.html:74 +#: rhodecode/templates/summary/summary.html:375 msgid "show more" msgstr "もっと表示" -#: rhodecode/templates/changelog/changelog.html:76 +#: rhodecode/templates/changelog/changelog.html:78 msgid "Affected number of files, click to show more details" msgstr "" -#: rhodecode/templates/changelog/changelog.html:89 -#: rhodecode/templates/changeset/changeset.html:38 +#: rhodecode/templates/changelog/changelog.html:91 +#: rhodecode/templates/changeset/changeset.html:44 #: rhodecode/templates/changeset/changeset_file_comment.html:20 #: rhodecode/templates/changeset/changeset_range.html:46 msgid "Changeset status" msgstr "リビジョンステータス" -#: rhodecode/templates/changelog/changelog.html:92 +#: rhodecode/templates/changelog/changelog.html:94 +#: rhodecode/templates/shortlog/shortlog_data.html:20 msgid "Click to open associated pull request" msgstr "関連するプルリクエストを開く" -#: rhodecode/templates/changelog/changelog.html:102 -#: rhodecode/templates/changeset/changeset.html:78 +#: rhodecode/templates/changelog/changelog.html:104 +#: rhodecode/templates/changeset/changeset.html:85 msgid "Parent" msgstr "親リビジョン" -#: rhodecode/templates/changelog/changelog.html:108 -#: rhodecode/templates/changeset/changeset.html:84 +#: rhodecode/templates/changelog/changelog.html:110 +#: rhodecode/templates/changeset/changeset.html:91 msgid "No parents" msgstr "親リビジョンはありません" -#: rhodecode/templates/changelog/changelog.html:113 -#: rhodecode/templates/changeset/changeset.html:88 +#: rhodecode/templates/changelog/changelog.html:115 +#: rhodecode/templates/changeset/changeset.html:95 +#: rhodecode/templates/changeset/changeset_range.html:79 msgid "merge" msgstr "マージ" -#: rhodecode/templates/changelog/changelog.html:116 -#: rhodecode/templates/changeset/changeset.html:91 +#: rhodecode/templates/changelog/changelog.html:118 +#: rhodecode/templates/changeset/changeset.html:98 +#: rhodecode/templates/changeset/changeset_range.html:82 #: rhodecode/templates/files/files.html:29 #: rhodecode/templates/files/files_add.html:33 #: rhodecode/templates/files/files_edit.html:33 @@ -3021,44 +3156,42 @@ msgid "branch" msgstr "ブランチ" -#: rhodecode/templates/changelog/changelog.html:122 +#: rhodecode/templates/changelog/changelog.html:124 +#: rhodecode/templates/changeset/changeset_range.html:88 msgid "bookmark" msgstr "ブックマーク" -#: rhodecode/templates/changelog/changelog.html:128 -#: rhodecode/templates/changeset/changeset.html:96 +#: rhodecode/templates/changelog/changelog.html:130 +#: rhodecode/templates/changeset/changeset.html:103 +#: rhodecode/templates/changeset/changeset_range.html:94 msgid "tag" msgstr "タグ" -#: rhodecode/templates/changelog/changelog.html:164 -msgid "Show selected changes __S -> __E" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:255 +#: rhodecode/templates/changelog/changelog.html:301 msgid "There are no changes yet" msgstr "まだ変更がありません" #: rhodecode/templates/changelog/changelog_details.html:4 -#: rhodecode/templates/changeset/changeset.html:66 +#: rhodecode/templates/changeset/changeset.html:73 msgid "removed" msgstr "削除" #: rhodecode/templates/changelog/changelog_details.html:5 -#: rhodecode/templates/changeset/changeset.html:67 +#: rhodecode/templates/changeset/changeset.html:74 msgid "changed" msgstr "変更" #: rhodecode/templates/changelog/changelog_details.html:6 -#: rhodecode/templates/changeset/changeset.html:68 +#: rhodecode/templates/changeset/changeset.html:75 msgid "added" msgstr "追加" #: rhodecode/templates/changelog/changelog_details.html:8 #: rhodecode/templates/changelog/changelog_details.html:9 #: rhodecode/templates/changelog/changelog_details.html:10 -#: rhodecode/templates/changeset/changeset.html:70 -#: rhodecode/templates/changeset/changeset.html:71 -#: rhodecode/templates/changeset/changeset.html:72 +#: rhodecode/templates/changeset/changeset.html:77 +#: rhodecode/templates/changeset/changeset.html:78 +#: rhodecode/templates/changeset/changeset.html:79 #, python-format msgid "affected %s files" msgstr "%s ファイルに影響" @@ -3072,38 +3205,50 @@ msgid "Changeset" msgstr "チェンジセット" -#: rhodecode/templates/changeset/changeset.html:43 +#: rhodecode/templates/changeset/changeset.html:49 #: rhodecode/templates/changeset/diff_block.html:20 msgid "raw diff" msgstr "差分を表示" -#: rhodecode/templates/changeset/changeset.html:44 +#: rhodecode/templates/changeset/changeset.html:50 +#, fuzzy +msgid "patch diff" +msgstr "差分を表示" + +#: rhodecode/templates/changeset/changeset.html:51 #: rhodecode/templates/changeset/diff_block.html:21 msgid "download diff" msgstr "差分をダウンロード" -#: rhodecode/templates/changeset/changeset.html:48 +#: rhodecode/templates/changeset/changeset.html:55 #: rhodecode/templates/changeset/changeset_file_comment.html:82 #, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "%d コメント" -#: rhodecode/templates/changeset/changeset.html:48 +#: rhodecode/templates/changeset/changeset.html:55 #: rhodecode/templates/changeset/changeset_file_comment.html:82 #, python-format msgid "(%d inline)" msgid_plural "(%d inline)" msgstr[0] "(%d インライン)" -#: rhodecode/templates/changeset/changeset.html:103 -#, python-format -msgid "%s files affected with %s insertions and %s deletions:" -msgstr "%s ファイルに影響。 %s 個の追加と %s 個の削除:" - -#: rhodecode/templates/changeset/changeset.html:119 -msgid "Changeset was too big and was cut off..." -msgstr "チェンジセットが大きすぎるため、省略しました" +#: rhodecode/templates/changeset/changeset.html:111 +#: rhodecode/templates/compare/compare_diff.html:44 +#: rhodecode/templates/pullrequests/pullrequest_show.html:76 +#, fuzzy, python-format +msgid "%s file changed" +msgid_plural "%s files changed" +msgstr[0] "変更されたファイル" + +#: rhodecode/templates/changeset/changeset.html:113 +#: rhodecode/templates/compare/compare_diff.html:46 +#: rhodecode/templates/pullrequests/pullrequest_show.html:78 +#, fuzzy, python-format +msgid "%s file changed with %s insertions and %s deletions" +msgid_plural "%s files changed with %s insertions and %s deletions" +msgstr[0] "%s ファイルに影響。 %s 個の追加と %s 個の削除:" #: rhodecode/templates/changeset/changeset_file_comment.html:42 msgid "Submitting..." @@ -3168,15 +3313,18 @@ msgid "Compare View" msgstr "比較ビュー" +#: rhodecode/templates/changeset/changeset_range.html:29 +#, fuzzy +msgid "Show combined compare" +msgstr "インラインコメントを表示" + #: rhodecode/templates/changeset/changeset_range.html:54 -#: rhodecode/templates/compare/compare_diff.html:41 -#: rhodecode/templates/pullrequests/pullrequest_show.html:69 msgid "Files affected" msgstr "影響のあるファイル" #: rhodecode/templates/changeset/diff_block.html:19 -msgid "diff" -msgstr "差分" +msgid "show full diff for this file" +msgstr "" #: rhodecode/templates/changeset/diff_block.html:27 msgid "show inline comments" @@ -3187,8 +3335,17 @@ msgstr "チェンジセットはありません" #: rhodecode/templates/compare/compare_diff.html:37 -msgid "Outgoing changesets" -msgstr "送信可能なチェンジセット" +#: rhodecode/templates/pullrequests/pullrequest_show.html:69 +#, fuzzy, python-format +msgid "Showing %s commit" +msgid_plural "Showing %s commits" +msgstr[0] "インラインコメントを表示" + +#: rhodecode/templates/compare/compare_diff.html:52 +#: rhodecode/templates/pullrequests/pullrequest_show.html:84 +#, fuzzy +msgid "No files" +msgstr "ファイル" #: rhodecode/templates/data_table/_dt_elements.html:39 #: rhodecode/templates/data_table/_dt_elements.html:41 @@ -3197,40 +3354,53 @@ msgstr "フォーク" #: rhodecode/templates/data_table/_dt_elements.html:60 -#: rhodecode/templates/journal/journal.html:126 -#: rhodecode/templates/summary/summary.html:68 +#: rhodecode/templates/journal/journal.html:81 +#: rhodecode/templates/summary/summary.html:77 msgid "Mercurial repository" msgstr "Mercurialリポジトリ" #: rhodecode/templates/data_table/_dt_elements.html:62 -#: rhodecode/templates/journal/journal.html:128 -#: rhodecode/templates/summary/summary.html:71 +#: rhodecode/templates/journal/journal.html:83 +#: rhodecode/templates/summary/summary.html:80 msgid "Git repository" msgstr "Gitリポジトリ" #: rhodecode/templates/data_table/_dt_elements.html:69 -#: rhodecode/templates/journal/journal.html:134 -#: rhodecode/templates/summary/summary.html:78 +#: rhodecode/templates/journal/journal.html:89 +#: rhodecode/templates/summary/summary.html:87 msgid "public repository" msgstr "公開リポジトリ" #: rhodecode/templates/data_table/_dt_elements.html:80 -#: rhodecode/templates/summary/summary.html:87 -#: rhodecode/templates/summary/summary.html:88 +#: rhodecode/templates/summary/summary.html:96 +#: rhodecode/templates/summary/summary.html:97 msgid "Fork of" msgstr "フォーク元: " -#: rhodecode/templates/data_table/_dt_elements.html:92 +#: rhodecode/templates/data_table/_dt_elements.html:94 msgid "No changesets yet" msgstr "まだチェンジセットがありません" -#: rhodecode/templates/data_table/_dt_elements.html:104 +#: rhodecode/templates/data_table/_dt_elements.html:101 +#: rhodecode/templates/data_table/_dt_elements.html:103 +#, python-format +msgid "Subscribe to %s rss feed" +msgstr "%s の RSS フィードを購読" + +#: rhodecode/templates/data_table/_dt_elements.html:109 +#: rhodecode/templates/data_table/_dt_elements.html:111 +#, python-format +msgid "Subscribe to %s atom feed" +msgstr "%s の ATOM フィードを購読" + +#: rhodecode/templates/data_table/_dt_elements.html:122 #, python-format msgid "Confirm to delete this user: %s" msgstr "このユーザーを本当に削除してよろしいですか？: %s" #: rhodecode/templates/email_templates/main.html:8 -msgid "This is an notification from RhodeCode." +#, fuzzy +msgid "This is a notification from RhodeCode." msgstr "RhodeCodeからの通知があります" #: rhodecode/templates/errors/error_document.html:46 @@ -3248,13 +3418,13 @@ msgstr "ファイル差分" #: rhodecode/templates/files/files.html:4 -#: rhodecode/templates/files/files.html:72 +#: rhodecode/templates/files/files.html:74 #, python-format msgid "%s files" msgstr "%s ファイル" #: rhodecode/templates/files/files.html:12 -#: rhodecode/templates/summary/summary.html:340 +#: rhodecode/templates/summary/summary.html:351 msgid "files" msgstr "ファイル" @@ -3332,7 +3502,7 @@ msgstr "ファイル一覧を検索" #: rhodecode/templates/files/files_browser.html:31 -#: rhodecode/templates/shortlog/shortlog_data.html:65 +#: rhodecode/templates/shortlog/shortlog_data.html:80 msgid "add new file" msgstr "新しいファイルを追加" @@ -3365,18 +3535,18 @@ msgstr "ファイルを編集" #: rhodecode/templates/files/files_edit.html:49 -#: rhodecode/templates/files/files_source.html:38 +#: rhodecode/templates/files/files_source.html:23 msgid "show annotation" msgstr "アノテーションを表示" #: rhodecode/templates/files/files_edit.html:50 -#: rhodecode/templates/files/files_source.html:40 -#: rhodecode/templates/files/files_source.html:68 +#: rhodecode/templates/files/files_source.html:25 +#: rhodecode/templates/files/files_source.html:53 msgid "show as raw" msgstr "元のファイルを表示" #: rhodecode/templates/files/files_edit.html:51 -#: rhodecode/templates/files/files_source.html:41 +#: rhodecode/templates/files/files_source.html:26 msgid "download as raw" msgstr "元のファイルをダウンロード" @@ -3388,41 +3558,42 @@ msgid "Editing file" msgstr "ファイルを編集" -#: rhodecode/templates/files/files_source.html:2 +#: rhodecode/templates/files/files_history_box.html:2 msgid "History" msgstr "変更履歴" -#: rhodecode/templates/files/files_source.html:9 +#: rhodecode/templates/files/files_history_box.html:9 msgid "diff to revision" msgstr "このリビジョンの差分を見る" -#: rhodecode/templates/files/files_source.html:10 +#: rhodecode/templates/files/files_history_box.html:10 msgid "show at revision" msgstr "このリビジョンを見る" -#: rhodecode/templates/files/files_source.html:14 +#: rhodecode/templates/files/files_history_box.html:15 #, python-format msgid "%s author" msgid_plural "%s authors" msgstr[0] "%s 作成者" -#: rhodecode/templates/files/files_source.html:36 +#: rhodecode/templates/files/files_source.html:6 +#, fuzzy +msgid "Load file history" +msgstr "ファイル一覧を読み込み中..." + +#: rhodecode/templates/files/files_source.html:21 msgid "show source" msgstr "ソースを表示" -#: rhodecode/templates/files/files_source.html:59 +#: rhodecode/templates/files/files_source.html:44 #, python-format msgid "Binary file (%s)" msgstr "バイナリファイル (%s)" -#: rhodecode/templates/files/files_source.html:68 +#: rhodecode/templates/files/files_source.html:53 msgid "File is too big to display" msgstr "表示するには大きすぎるファイルです" -#: rhodecode/templates/files/files_source.html:124 -msgid "Selection link" -msgstr "" - #: rhodecode/templates/files/files_ypjax.html:5 msgid "annotation" msgstr "アノテーション" @@ -3494,7 +3665,7 @@ msgid "forked" msgstr "フォークしました" -#: rhodecode/templates/forks/forks_data.html:38 +#: rhodecode/templates/forks/forks_data.html:42 msgid "There are no forks yet" msgstr "まだフォークがありません" @@ -3507,7 +3678,7 @@ msgstr "RSS ジャーナルフィード" #: rhodecode/templates/journal/journal.html:24 -#: rhodecode/templates/pullrequests/pullrequest.html:27 +#: rhodecode/templates/pullrequests/pullrequest.html:55 msgid "Refresh" msgstr "更新" @@ -3529,19 +3700,19 @@ msgid "ADD" msgstr "追加" -#: rhodecode/templates/journal/journal.html:114 +#: rhodecode/templates/journal/journal.html:69 msgid "following user" msgstr "フォローしているユーザー" -#: rhodecode/templates/journal/journal.html:114 +#: rhodecode/templates/journal/journal.html:69 msgid "user" msgstr "ユーザー" -#: rhodecode/templates/journal/journal.html:147 +#: rhodecode/templates/journal/journal.html:102 msgid "You are not following any users or repositories" msgstr "まだどのユーザーもリポジトリもフォローしていません" -#: rhodecode/templates/journal/journal_data.html:47 +#: rhodecode/templates/journal/journal_data.html:51 msgid "No entries yet" msgstr "まだエントリがありません" @@ -3562,7 +3733,7 @@ msgid "New pull request" msgstr "新しいプルリクエスト" -#: rhodecode/templates/pullrequests/pullrequest.html:28 +#: rhodecode/templates/pullrequests/pullrequest.html:54 msgid "refresh overview" msgstr "概要の更新" @@ -3571,17 +3742,17 @@ msgstr "比較ビュー詳細" #: rhodecode/templates/pullrequests/pullrequest.html:70 -#: rhodecode/templates/pullrequests/pullrequest_show.html:82 +#: rhodecode/templates/pullrequests/pullrequest_show.html:100 msgid "Pull request reviewers" msgstr "プルリクエストレビュアー" #: rhodecode/templates/pullrequests/pullrequest.html:79 -#: rhodecode/templates/pullrequests/pullrequest_show.html:94 +#: rhodecode/templates/pullrequests/pullrequest_show.html:112 msgid "owner" msgstr "所有者" #: rhodecode/templates/pullrequests/pullrequest.html:91 -#: rhodecode/templates/pullrequests/pullrequest_show.html:109 +#: rhodecode/templates/pullrequests/pullrequest_show.html:127 msgid "Add reviewer to this pull request." msgstr "このプルリクエストにレビュアーを追加" @@ -3608,6 +3779,11 @@ msgid "Closed %s" msgstr "%s にクローズ" +#: rhodecode/templates/pullrequests/pullrequest_show.html:23 +#, python-format +msgid "with status %s" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_show.html:31 msgid "Status" msgstr "ステータス" @@ -3620,24 +3796,25 @@ msgid "Still not reviewed by" msgstr "未レビュー" -#: rhodecode/templates/pullrequests/pullrequest_show.html:47 +#: rhodecode/templates/pullrequests/pullrequest_show.html:48 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" msgstr[0] "%d レビュアー" -#: rhodecode/templates/pullrequests/pullrequest_show.html:54 +#: rhodecode/templates/pullrequests/pullrequest_show.html:50 +#, fuzzy +msgid "pull request was reviewed by all reviewers" +msgstr "プルリクエストレビュアー" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:58 msgid "Created on" msgstr "作成日" -#: rhodecode/templates/pullrequests/pullrequest_show.html:61 +#: rhodecode/templates/pullrequests/pullrequest_show.html:65 msgid "Compare view" msgstr "比較ビュー" -#: rhodecode/templates/pullrequests/pullrequest_show.html:65 -msgid "Incoming changesets" -msgstr "取り込み候補リビジョン" - #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 msgid "all pull requests" msgstr "すべてのプルリクエスト" @@ -3711,23 +3888,31 @@ msgid "shortlog" msgstr "ログ" +#: rhodecode/templates/shortlog/shortlog_data.html:5 +msgid "revision" +msgstr "リビジョン" + #: rhodecode/templates/shortlog/shortlog_data.html:7 msgid "age" msgstr "経過時間" -#: rhodecode/templates/shortlog/shortlog_data.html:18 +#: rhodecode/templates/shortlog/shortlog_data.html:8 +msgid "author" +msgstr "作成者" + +#: rhodecode/templates/shortlog/shortlog_data.html:33 msgid "No commit message" msgstr "コミットメッセージが有りません" -#: rhodecode/templates/shortlog/shortlog_data.html:62 +#: rhodecode/templates/shortlog/shortlog_data.html:77 msgid "Add or upload files directly via RhodeCode" msgstr "RhodeCode経由で直接ファイルを追加またはアップロード" -#: rhodecode/templates/shortlog/shortlog_data.html:71 +#: rhodecode/templates/shortlog/shortlog_data.html:86 msgid "Push new repo" msgstr "新しいリポジトリをプッシュ" -#: rhodecode/templates/shortlog/shortlog_data.html:79 +#: rhodecode/templates/shortlog/shortlog_data.html:94 msgid "Existing repository?" msgstr "存在するリポジトリをプッシュ" @@ -3755,128 +3940,138 @@ msgid "ATOM" msgstr "ATOM" -#: rhodecode/templates/summary/summary.html:82 +#: rhodecode/templates/summary/summary.html:70 +#, fuzzy, python-format +msgid "Repository locked by %s" +msgstr "リポジトリはロックされていません" + +#: rhodecode/templates/summary/summary.html:72 +#, fuzzy +msgid "Repository unlocked" +msgstr "リポジトリはロックされていません" + +#: rhodecode/templates/summary/summary.html:91 #, python-format msgid "Non changable ID %s" msgstr "" -#: rhodecode/templates/summary/summary.html:87 +#: rhodecode/templates/summary/summary.html:96 msgid "public" msgstr "公開" -#: rhodecode/templates/summary/summary.html:95 +#: rhodecode/templates/summary/summary.html:104 msgid "remote clone" msgstr "" -#: rhodecode/templates/summary/summary.html:116 +#: rhodecode/templates/summary/summary.html:125 msgid "Contact" msgstr "コンタクト" -#: rhodecode/templates/summary/summary.html:130 +#: rhodecode/templates/summary/summary.html:139 msgid "Clone url" msgstr "クローンURL" -#: rhodecode/templates/summary/summary.html:133 +#: rhodecode/templates/summary/summary.html:142 msgid "Show by Name" msgstr "名前で表示" -#: rhodecode/templates/summary/summary.html:134 +#: rhodecode/templates/summary/summary.html:143 msgid "Show by ID" msgstr "IDで表示" -#: rhodecode/templates/summary/summary.html:142 +#: rhodecode/templates/summary/summary.html:151 msgid "Trending files" msgstr "トレンドファイル" -#: rhodecode/templates/summary/summary.html:150 -#: rhodecode/templates/summary/summary.html:166 -#: rhodecode/templates/summary/summary.html:194 +#: rhodecode/templates/summary/summary.html:159 +#: rhodecode/templates/summary/summary.html:175 +#: rhodecode/templates/summary/summary.html:203 msgid "enable" msgstr "有効にする" -#: rhodecode/templates/summary/summary.html:158 +#: rhodecode/templates/summary/summary.html:167 msgid "Download" msgstr "ダウンロード" -#: rhodecode/templates/summary/summary.html:162 +#: rhodecode/templates/summary/summary.html:171 msgid "There are no downloads yet" msgstr "まだダウンロードがありません" -#: rhodecode/templates/summary/summary.html:164 +#: rhodecode/templates/summary/summary.html:173 msgid "Downloads are disabled for this repository" msgstr "このリポジトリのダウンロードは無効化されています" -#: rhodecode/templates/summary/summary.html:170 +#: rhodecode/templates/summary/summary.html:179 msgid "Download as zip" msgstr "ZIPとしてダウンロード" -#: rhodecode/templates/summary/summary.html:173 +#: rhodecode/templates/summary/summary.html:182 msgid "Check this to download archive with subrepos" msgstr "チェックするとダウンロードアーカイブにサブリポジトリが含まれます" -#: rhodecode/templates/summary/summary.html:173 +#: rhodecode/templates/summary/summary.html:182 msgid "with subrepos" msgstr "サブリポジトリを含む" -#: rhodecode/templates/summary/summary.html:186 +#: rhodecode/templates/summary/summary.html:195 msgid "Commit activity by day / author" msgstr "コミットアクティビティ 日/作成者" -#: rhodecode/templates/summary/summary.html:197 +#: rhodecode/templates/summary/summary.html:206 msgid "Stats gathered: " msgstr "収集した統計情報: " -#: rhodecode/templates/summary/summary.html:218 +#: rhodecode/templates/summary/summary.html:227 msgid "Shortlog" msgstr "ログ" -#: rhodecode/templates/summary/summary.html:220 +#: rhodecode/templates/summary/summary.html:229 msgid "Quick start" msgstr "クイックスタート" -#: rhodecode/templates/summary/summary.html:233 +#: rhodecode/templates/summary/summary.html:243 #, python-format msgid "Readme file at revision '%s'" msgstr "" -#: rhodecode/templates/summary/summary.html:236 +#: rhodecode/templates/summary/summary.html:246 msgid "Permalink to this readme" msgstr "パーマリンク" -#: rhodecode/templates/summary/summary.html:293 +#: rhodecode/templates/summary/summary.html:304 #, python-format msgid "Download %s as %s" msgstr "%s を %sとしてダウンロード" -#: rhodecode/templates/summary/summary.html:650 +#: rhodecode/templates/summary/summary.html:661 msgid "commits" msgstr "コミット" -#: rhodecode/templates/summary/summary.html:651 +#: rhodecode/templates/summary/summary.html:662 msgid "files added" msgstr "追加されたファイル" -#: rhodecode/templates/summary/summary.html:652 +#: rhodecode/templates/summary/summary.html:663 msgid "files changed" msgstr "変更されたファイル" -#: rhodecode/templates/summary/summary.html:653 +#: rhodecode/templates/summary/summary.html:664 msgid "files removed" msgstr "削除されたファイル" -#: rhodecode/templates/summary/summary.html:656 +#: rhodecode/templates/summary/summary.html:667 msgid "commit" msgstr "コミット" -#: rhodecode/templates/summary/summary.html:657 +#: rhodecode/templates/summary/summary.html:668 msgid "file added" msgstr "追加されたファイル" -#: rhodecode/templates/summary/summary.html:658 +#: rhodecode/templates/summary/summary.html:669 msgid "file changed" msgstr "変更されたファイル" -#: rhodecode/templates/summary/summary.html:659 +#: rhodecode/templates/summary/summary.html:670 msgid "file removed" msgstr "削除されたファイル" @@ -3885,3 +4080,8 @@ msgid "%s Tags" msgstr "%s タグ" +#: rhodecode/templates/tags/tags.html:29 +#, fuzzy +msgid "Compare tags" +msgstr "比較" +
--- a/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po Mon Nov 26 20:39:45 2012 +0100 +++ b/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po Tue Nov 27 20:56:57 2012 +0100 @@ -1,4013 +1,4159 @@ -# English translations for rhodecode. -# Copyright (C) 2010 ORGANIZATION -# This file is distributed under the same license as the rhodecode project. -# FIRST AUTHOR <EMAIL@ADDRESS>, 2010. -# Nemcio <bogdan114@g.pl>, 2012. -# Nemo <areczek01@gmail.com>, 2012. -msgid "" -msgstr "" -"Project-Id-Version: rhodecode 0.1\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-09-02 20:30+0200\n" -"PO-Revision-Date: 2012-11-25 03:42+0200\n" -"Last-Translator: Nemo <areczek01@gmail.com>\n" -"Language-Team: Test\n" -"Language: pl\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" -"X-Generator: Virtaal 0.7.1\n" -"Generated-By: Babel 0.9.6\n" - -#: rhodecode/controllers/changelog.py:94 -msgid "All Branches" -msgstr "Wszystkie gałęzie" - -#: rhodecode/controllers/changeset.py:83 -msgid "show white space" -msgstr "pokazuj spacje" - -#: rhodecode/controllers/changeset.py:90 -#: rhodecode/controllers/changeset.py:97 -msgid "ignore white space" -msgstr "ignoruj pokazywanie spacji" - -#: rhodecode/controllers/changeset.py:157 -#, python-format -msgid "%s line context" -msgstr "%s linia w kontekście" - -#: rhodecode/controllers/changeset.py:333 -#: rhodecode/controllers/changeset.py:348 -#: rhodecode/lib/diffs.py:70 -msgid "binary file" -msgstr "plik binarny" - -#: rhodecode/controllers/changeset.py:408 -msgid "Changing status on a changeset associated witha closed pull request is not allowed" -msgstr "" -"Zmiana statusu na grupy zmian powiązania łączy zamkniętego wniosku jest " -"niedozwolona" - -#: rhodecode/controllers/compare.py:69 -msgid "There are no changesets yet" -msgstr "Brak zestawienia zmian" - -#: rhodecode/controllers/error.py:69 -msgid "Home page" -msgstr "Strona główna" - -#: rhodecode/controllers/error.py:98 -msgid "The request could not be understood by the server due to malformed syntax." -msgstr "Wniosek nie może być rozumiany przez serwer z powodu zniekształconej składni." - -#: rhodecode/controllers/error.py:101 -msgid "Unauthorized access to resource" -msgstr "Nieautoryzowany dostęp do zasobów" - -#: rhodecode/controllers/error.py:103 -msgid "You don't have permission to view this page" -msgstr "Nie masz uprawnień do przeglądania tej strony" - -#: rhodecode/controllers/error.py:105 -msgid "The resource could not be found" -msgstr "Zasób nie został znaleziony" - -#: rhodecode/controllers/error.py:107 -msgid "The server encountered an unexpected condition which prevented it from fulfilling the request." -msgstr "Serwer napotkał niespodziewany warunek, który uniemożliwia jej spełnienie żądania." - -#: rhodecode/controllers/feed.py:49 -#, python-format -msgid "Changes on %s repository" -msgstr "Zmiany w %s repozytorium" - -#: rhodecode/controllers/feed.py:50 -#, python-format -msgid "%s %s feed" -msgstr "%s %s zasilać" - -#: rhodecode/controllers/feed.py:75 -msgid "commited on" -msgstr "komunikaty w" - -#: rhodecode/controllers/files.py:84 -msgid "click here to add new file" -msgstr "Kliknij tutaj, by dodać nowy plik" - -#: rhodecode/controllers/files.py:85 -#, python-format -msgid "There are no files yet %s" -msgstr "Brak plików %s" - -#: rhodecode/controllers/files.py:239 -#: rhodecode/controllers/files.py:299 -#, 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:266 -#, python-format -msgid "Edited %s via RhodeCode" -msgstr "Edytowanie %s w RhodeCode" - -#: rhodecode/controllers/files.py:271 -msgid "No changes" -msgstr "Bez zmian" - -#: rhodecode/controllers/files.py:282 -#: rhodecode/controllers/files.py:346 -#, python-format -msgid "Successfully committed to %s" -msgstr "Committ wykonany do %s" - -#: rhodecode/controllers/files.py:287 -#: rhodecode/controllers/files.py:352 -msgid "Error occurred during commit" -msgstr "Wystąpił błąd w trakcie zatwierdzania" - -#: rhodecode/controllers/files.py:318 -#, python-format -msgid "Added %s via RhodeCode" -msgstr "Dodano %s poprzez RhodeCode" - -#: rhodecode/controllers/files.py:332 -msgid "No content" -msgstr "Brak treści" - -#: rhodecode/controllers/files.py:336 -msgid "No filename" -msgstr "Brak nazwy pliku" - -#: rhodecode/controllers/files.py:378 -msgid "downloads disabled" -msgstr "Pobieranie wyłączone" - -#: rhodecode/controllers/files.py:389 -#, python-format -msgid "Unknown revision %s" -msgstr "Nieznana wersja %s" - -#: rhodecode/controllers/files.py:391 -msgid "Empty repository" -msgstr "Puste repozytorium" - -#: rhodecode/controllers/files.py:393 -msgid "Unknown archive type" -msgstr "Nieznany typ archiwum" - -#: rhodecode/controllers/files.py:494 -#: rhodecode/templates/changeset/changeset_range.html:13 -#: rhodecode/templates/changeset/changeset_range.html:31 -msgid "Changesets" -msgstr "Różnice" - -#: rhodecode/controllers/files.py:495 -#: rhodecode/controllers/pullrequests.py:72 -#: rhodecode/controllers/summary.py:232 -#: rhodecode/model/scm.py:543 -msgid "Branches" -msgstr "Gałęzie" - -#: rhodecode/controllers/files.py:496 -#: rhodecode/controllers/pullrequests.py:76 -#: rhodecode/controllers/summary.py:233 -#: rhodecode/model/scm.py:554 -msgid "Tags" -msgstr "Etykiety" - -#: rhodecode/controllers/forks.py:73 -#: rhodecode/controllers/admin/repos.py:90 -#, python-format -msgid "%s repository is not mapped to db perhaps it was created or renamed from the filesystem please run the application again in order to rescan repositories" -msgstr "%s repozytorium nie jest mapowane do db może zostało utworzone lub zmienione z systemie plików proszę uruchomić aplikację ponownie, aby ponownie przeskanować repozytoria" - -#: rhodecode/controllers/forks.py:133 -#: rhodecode/controllers/settings.py:72 -#, python-format -msgid "%s repository is not mapped to db perhaps it was created or renamed from the file system please run the application again in order to rescan repositories" -msgstr "%s repozytorium nie jest mapowane do db może zostało utworzone lub zmienione z systemu plików proszę uruchomić aplikację ponownie, aby ponownie przeskanować repozytoria" - -#: rhodecode/controllers/forks.py:167 -#, python-format -msgid "forked %s repository as %s" -msgstr "gałęzi %s w repozytorium %s" - -#: rhodecode/controllers/forks.py:181 -#, python-format -msgid "An error occurred during repository forking %s" -msgstr "Wystąpił błąd podczas rozgałęzienia %s repozytorium" - -#: rhodecode/controllers/journal.py:202 -#: rhodecode/controllers/journal.py:239 -msgid "public journal" -msgstr "Dziennik publiczny" - -#: rhodecode/controllers/journal.py:206 -#: rhodecode/controllers/journal.py:243 -#: rhodecode/templates/base/base.html:220 -msgid "journal" -msgstr "dziennik" - -#: rhodecode/controllers/login.py:143 -msgid "You have successfully registered into rhodecode" -msgstr "Udało Ci się zarejestrować na stronie" - -#: rhodecode/controllers/login.py:164 -msgid "Your password reset link was sent" -msgstr "Twój link zresetowania hasła został wysłany" - -#: rhodecode/controllers/login.py:184 -msgid "Your password reset was successful, new password has been sent to your email" -msgstr "Twoje hasło zostało zresetowane, nowe hasło zostanie wysłane na e-mail" - -#: rhodecode/controllers/pullrequests.py:74 -#: rhodecode/model/scm.py:549 -msgid "Bookmarks" -msgstr "Zakładki" - -#: rhodecode/controllers/pullrequests.py:158 -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:160 -msgid "error during creation of pull request" -msgstr "błąd podczas tworzenia prośby o łączenie gałęzi" - -#: rhodecode/controllers/pullrequests.py:181 -msgid "Successfully opened new pull request" -msgstr "Prośba o wykonanie połączenia gałęzi została wykonana prawidłowo" - -#: rhodecode/controllers/pullrequests.py:184 -msgid "Error occurred during sending pull request" -msgstr "Wystąpił błąd podczas prośby o połączenie gałęzi" - -#: rhodecode/controllers/pullrequests.py:217 -msgid "Successfully deleted pull request" -msgstr "Prośba o skasowanie połączenia gałęzi została wykonana prawidłowo" - -#: rhodecode/controllers/search.py:131 -msgid "Invalid search query. Try quoting it." -msgstr "Nieprawidłowe zapytania. Spróbuj zacytować go." - -#: rhodecode/controllers/search.py:136 -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:140 -msgid "An error occurred during this search operation" -msgstr "Wystąpił błąd podczas wyszukiwania tej operacji" - -#: rhodecode/controllers/settings.py:107 -#: rhodecode/controllers/admin/repos.py:266 -#, python-format -msgid "Repository %s updated successfully" -msgstr "Repozytorium %s zostało pomyślnie zaktualizowane" - -#: rhodecode/controllers/settings.py:125 -#: rhodecode/controllers/admin/repos.py:284 -#, python-format -msgid "error occurred during update of repository %s" -msgstr "wystąpił błąd podczas aktualizacji repozytorium %s" - -#: rhodecode/controllers/settings.py:143 -#: rhodecode/controllers/admin/repos.py:302 -#, python-format -msgid "%s repository is not mapped to db perhaps it was moved or renamed from the filesystem please run the application again in order to rescan repositories" -msgstr "%s repozytorium nie jest mapowane do db może zostało przeniesione lub zmienione w systemie plików proszę uruchomić aplikację ponownie, aby ponownie przeskanować repozytoria" - -#: rhodecode/controllers/settings.py:155 -#: rhodecode/controllers/admin/repos.py:314 -#, python-format -msgid "deleted repository %s" -msgstr "usunięte repozytorium %s" - -#: rhodecode/controllers/settings.py:159 -#: rhodecode/controllers/admin/repos.py:324 -#: rhodecode/controllers/admin/repos.py:330 -#, python-format -msgid "An error occurred during deletion of %s" -msgstr "Wystąpił błąd podczas usuwania %s" - -#: rhodecode/controllers/summary.py:138 -msgid "No data loaded yet" -msgstr "Żadne dane nie zostały załadowane" - -#: rhodecode/controllers/summary.py:142 -#: rhodecode/templates/summary/summary.html:148 -msgid "Statistics are disabled for this repository" -msgstr "Statystyki są wyłączone dla tego repozytorium" - -#: rhodecode/controllers/admin/ldap_settings.py:50 -msgid "BASE" -msgstr "PODSTAWA" - -#: rhodecode/controllers/admin/ldap_settings.py:51 -msgid "ONELEVEL" -msgstr "JEDEN POZIOM" - -#: rhodecode/controllers/admin/ldap_settings.py:52 -msgid "SUBTREE" -msgstr "DRZEWO PODRZĘDNE" - -#: rhodecode/controllers/admin/ldap_settings.py:56 -msgid "NEVER" -msgstr "NIGDY" - -#: rhodecode/controllers/admin/ldap_settings.py:57 -msgid "ALLOW" -msgstr "POZWÓL" - -#: rhodecode/controllers/admin/ldap_settings.py:58 -msgid "TRY" -msgstr "WYPRÓBUJ" - -#: rhodecode/controllers/admin/ldap_settings.py:59 -msgid "DEMAND" -msgstr "ZAPYTANIE" - -#: rhodecode/controllers/admin/ldap_settings.py:60 -msgid "HARD" -msgstr "TWARDY" - -#: rhodecode/controllers/admin/ldap_settings.py:64 -msgid "No encryption" -msgstr "Bez szyfrowania" - -#: rhodecode/controllers/admin/ldap_settings.py:65 -msgid "LDAPS connection" -msgstr "Połączenie LDAP" - -#: rhodecode/controllers/admin/ldap_settings.py:66 -msgid "START_TLS on LDAP connection" -msgstr "START_TLS dla połączenia LDAP" - -#: rhodecode/controllers/admin/ldap_settings.py:126 -msgid "Ldap settings updated successfully" -msgstr "Ustawienia LDAP zostały zaktualizowane" - -#: rhodecode/controllers/admin/ldap_settings.py:130 -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 -msgid "error occurred during update of ldap settings" -msgstr "Wystąpił błąd podczas aktualizacji ustawień ldap" - -#: rhodecode/controllers/admin/permissions.py:59 -msgid "None" -msgstr "Brak" - -#: rhodecode/controllers/admin/permissions.py:60 -msgid "Read" -msgstr "Odczyt" - -#: rhodecode/controllers/admin/permissions.py:61 -msgid "Write" -msgstr "Zapis" - -#: rhodecode/controllers/admin/permissions.py:62 -#: rhodecode/templates/admin/ldap/ldap.html:9 -#: rhodecode/templates/admin/permissions/permissions.html:9 -#: rhodecode/templates/admin/repos/repo_add.html:9 -#: rhodecode/templates/admin/repos/repo_edit.html:9 -#: rhodecode/templates/admin/repos/repos.html:9 -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:8 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:8 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 -#: rhodecode/templates/admin/settings/hooks.html:9 -#: rhodecode/templates/admin/settings/settings.html:9 -#: rhodecode/templates/admin/users/user_add.html:8 -#: rhodecode/templates/admin/users/user_edit.html:9 -#: rhodecode/templates/admin/users/user_edit.html:122 -#: rhodecode/templates/admin/users/users.html:9 -#: rhodecode/templates/admin/users_groups/users_group_add.html:8 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:9 -#: rhodecode/templates/admin/users_groups/users_groups.html:9 -#: rhodecode/templates/base/base.html:197 -#: rhodecode/templates/base/base.html:337 -#: rhodecode/templates/base/base.html:339 -#: rhodecode/templates/base/base.html:341 -msgid "Admin" -msgstr "Administracja" - -#: rhodecode/controllers/admin/permissions.py:65 -msgid "disabled" -msgstr "wyłączona" - -#: rhodecode/controllers/admin/permissions.py:67 -msgid "allowed with manual account activation" -msgstr "dozwolona z ręczną aktywacją konta" - -#: rhodecode/controllers/admin/permissions.py:69 -msgid "allowed with automatic account activation" -msgstr "dozwolona z automatyczną aktywacją konta" - -#: rhodecode/controllers/admin/permissions.py:71 -#: rhodecode/controllers/admin/permissions.py:74 -msgid "Disabled" -msgstr "Wyłączone" - -#: rhodecode/controllers/admin/permissions.py:72 -#: rhodecode/controllers/admin/permissions.py:75 -msgid "Enabled" -msgstr "Włączone" - -#: rhodecode/controllers/admin/permissions.py:116 -msgid "Default permissions updated successfully" -msgstr "Domyślne uprawnienia zaktualizowane pomyślnie" - -#: rhodecode/controllers/admin/permissions.py:130 -msgid "error occurred during update of permissions" -msgstr "wystąpił błąd podczas aktualizacji uprawnień" - -#: rhodecode/controllers/admin/repos.py:123 -msgid "--REMOVE FORK--" -msgstr "--USUŃ ROZGAŁĘZIENIE--" - -#: rhodecode/controllers/admin/repos.py:192 -#, python-format -msgid "created repository %s from %s" -msgstr "utworzone repozytorium %s z %s" - -#: rhodecode/controllers/admin/repos.py:196 -#, python-format -msgid "created repository %s" -msgstr "utworzone repozytorium %s" - -#: rhodecode/controllers/admin/repos.py:227 -#, python-format -msgid "error occurred during creation of repository %s" -msgstr "wystąpił błąd podczas tworzenia repozytorium %s" - -#: rhodecode/controllers/admin/repos.py:319 -#, 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:348 -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:367 -msgid "An error occurred during deletion of repository users groups" -msgstr "Wystąpił błąd podczas usunięcia grupy użytkowników z repozytorium" - -#: rhodecode/controllers/admin/repos.py:385 -msgid "An error occurred during deletion of repository stats" -msgstr "Wystąpił błąd podczas usuwania z repozytorium statystyk" - -#: rhodecode/controllers/admin/repos.py:402 -msgid "An error occurred during cache invalidation" -msgstr "Wystąpił błąd podczas unieważniania cache" - -#: rhodecode/controllers/admin/repos.py:422 -msgid "An error occurred during unlocking" -msgstr "Wystąpił błąd podczas odblokowywania" - -#: rhodecode/controllers/admin/repos.py:442 -msgid "Updated repository visibility in public journal" -msgstr "Zaktualizowano widoczność stron w publicznym dzienniku" - -#: rhodecode/controllers/admin/repos.py:446 -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:451 -#: rhodecode/model/validators.py:299 -msgid "Token mismatch" -msgstr "Niezgodność tokenu" - -#: rhodecode/controllers/admin/repos.py:464 -msgid "Pulled from remote location" -msgstr "Pobieranie z lokalizacji zdalnej" - -#: rhodecode/controllers/admin/repos.py:466 -msgid "An error occurred during pull from remote location" -msgstr "Wystąpił błąd podczas pobierania z lokalizacji zdalnej" - -#: rhodecode/controllers/admin/repos.py:482 -msgid "Nothing" -msgstr "Brak" - -#: rhodecode/controllers/admin/repos.py:484 -#, python-format -msgid "Marked repo %s as fork of %s" -msgstr "Oznaczono %s repo jako rozwidlenie %s" - -#: rhodecode/controllers/admin/repos.py:488 -msgid "An error occurred during this operation" -msgstr "Wystąpił błąd podczas tej operacji" - -#: rhodecode/controllers/admin/repos_groups.py:116 -#, python-format -msgid "created repos group %s" -msgstr "utworzono grupę repo %s" - -#: rhodecode/controllers/admin/repos_groups.py:129 -#, python-format -msgid "error occurred during creation of repos group %s" -msgstr "Wystąpił błąd podczas tworzenia grupy repo %s" - -#: rhodecode/controllers/admin/repos_groups.py:163 -#, python-format -msgid "updated repos group %s" -msgstr "zaktualizowano grupę repo %s" - -#: rhodecode/controllers/admin/repos_groups.py:176 -#, python-format -msgid "error occurred during update of repos group %s" -msgstr "wystąpił błąd podczas aktualizacji grupy repo %s" - -#: rhodecode/controllers/admin/repos_groups.py:194 -#, 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:202 -#, python-format -msgid "removed repos group %s" -msgstr "usunięto grupę repo %s" - -#: rhodecode/controllers/admin/repos_groups.py:208 -msgid "Cannot delete this group it still contains subgroups" -msgstr "Nie można usunąć tej grupy ponieważ nadal zawiera podgrupy" - -#: rhodecode/controllers/admin/repos_groups.py:213 -#: rhodecode/controllers/admin/repos_groups.py:218 -#, 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:238 -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:258 -msgid "An error occurred during deletion of group users groups" -msgstr "Wystąpił błąd podczas usuwania grup i grup użytkowników" - -#: rhodecode/controllers/admin/settings.py:121 -#, 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:129 -msgid "Whoosh reindex task scheduled" -msgstr "Zadanie ponownej indeksacji whoosh zostało zaplanowane" - -#: rhodecode/controllers/admin/settings.py:160 -msgid "Updated application settings" -msgstr "Aktualizacja ustawień aplikacji" - -#: rhodecode/controllers/admin/settings.py:164 -#: rhodecode/controllers/admin/settings.py:275 -msgid "error occurred during updating application settings" -msgstr "wystąpił błąd podczas aktualizacji ustawień aplikacji" - -#: rhodecode/controllers/admin/settings.py:200 -msgid "Updated visualisation settings" -msgstr "Aktualizacja ustawień wizualizacji" - -#: rhodecode/controllers/admin/settings.py:205 -msgid "error occurred during updating visualisation settings" -msgstr "Wystąpił błąd podczas aktualizacji ustawień wizualizacji" - -#: rhodecode/controllers/admin/settings.py:271 -msgid "Updated VCS settings" -msgstr "Aktualizacja ustawień VCS" - -#: rhodecode/controllers/admin/settings.py:285 -msgid "Added new hook" -msgstr "Dodano nowy hook" - -#: rhodecode/controllers/admin/settings.py:297 -msgid "Updated hooks" -msgstr "Aktualizacja hooku" - -#: rhodecode/controllers/admin/settings.py:301 -msgid "error occurred during hook creation" -msgstr "Wystąpił błąd podczas tworzenia hooku" - -#: rhodecode/controllers/admin/settings.py:320 -msgid "Email task created" -msgstr "E-mail został wysłany" - -#: rhodecode/controllers/admin/settings.py:375 -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:406 -msgid "Your account was updated successfully" -msgstr "Twoje konto zostało pomyślnie zaktualizowane" - -#: rhodecode/controllers/admin/settings.py:421 -#: rhodecode/controllers/admin/users.py:191 -#, python-format -msgid "error occurred during update of user %s" -msgstr "wystąpił błąd podczas aktualizacji użytkownika %s" - -#: rhodecode/controllers/admin/users.py:130 -#, python-format -msgid "created user %s" -msgstr "utworzono użytkownika %s" - -#: rhodecode/controllers/admin/users.py:142 -#, python-format -msgid "error occurred during creation of user %s" -msgstr "wystąpił błąd podczas tworzenia użytkownika %s" - -#: rhodecode/controllers/admin/users.py:171 -msgid "User updated successfully" -msgstr "Użytkownik został zaktualizowany" - -#: rhodecode/controllers/admin/users.py:207 -msgid "successfully deleted user" -msgstr "użytkownik został usunięty" - -#: rhodecode/controllers/admin/users.py:212 -msgid "An error occurred during deletion of user" -msgstr "Wystąpił błąd podczas usuwania użytkownika" - -#: rhodecode/controllers/admin/users.py:226 -msgid "You can't edit this user" -msgstr "Nie możesz edytować tego użytkownika" - -#: rhodecode/controllers/admin/users.py:266 -msgid "Granted 'repository create' permission to user" -msgstr "Przyznano użytkownikowi uprawnienie do 'tworzenia repozytorium'" - -#: rhodecode/controllers/admin/users.py:271 -msgid "Revoked 'repository create' permission to user" -msgstr "Cofnięto użytkownikowi uprawnienie do 'tworzenia repozytorium'" - -#: rhodecode/controllers/admin/users.py:277 -msgid "Granted 'repository fork' permission to user" -msgstr "Przyznano użytkownikowi uprawnienie do 'tworzenia rozgałęzień'" - -#: rhodecode/controllers/admin/users.py:282 -msgid "Revoked 'repository fork' permission to user" -msgstr "Cofnięto użytkownikowi uprawnienie do 'tworzenia rozgałęzień'" - -#: rhodecode/controllers/admin/users.py:288 -#: rhodecode/controllers/admin/users_groups.py:255 -msgid "An error occurred during permissions saving" -msgstr "Wystąpił błąd podczas zapisywania uprawnień" - -#: rhodecode/controllers/admin/users.py:303 -#, python-format -msgid "Added email %s to user" -msgstr "Dodano e-mail %s do użytkownika" - -#: rhodecode/controllers/admin/users.py:309 -msgid "An error occurred during email saving" -msgstr "Wystąpił błąd podczas zapisywania e-maila" - -#: rhodecode/controllers/admin/users.py:319 -msgid "Removed email from user" -msgstr "Usunięto e-mail użytkownikowi" - -#: rhodecode/controllers/admin/users_groups.py:84 -#, python-format -msgid "created users group %s" -msgstr "utworzono grupę użytkowników %s" - -#: rhodecode/controllers/admin/users_groups.py:95 -#, python-format -msgid "error occurred during creation of users group %s" -msgstr "wystąpił błąd podczas tworzenia grupy użytkowników %s" - -#: rhodecode/controllers/admin/users_groups.py:135 -#, python-format -msgid "updated users group %s" -msgstr "zaktualizowano grupę użytkowników %s" - -#: rhodecode/controllers/admin/users_groups.py:157 -#, python-format -msgid "error occurred during update of users group %s" -msgstr "wystąpił błąd podczas aktualizacji grupy użytkowników %s" - -#: rhodecode/controllers/admin/users_groups.py:174 -msgid "successfully deleted users group" -msgstr "grupa użytkowników została usunięta z powodzeniem" - -#: rhodecode/controllers/admin/users_groups.py:179 -msgid "An error occurred during deletion of users group" -msgstr "Wystąpił błąd podczas usuwania grupy użytkowników" - -#: rhodecode/controllers/admin/users_groups.py:233 -msgid "Granted 'repository create' permission to users group" -msgstr "Przyznano grupie użytkowników uprawnienia do 'tworzenia repozytorium'" - -#: rhodecode/controllers/admin/users_groups.py:238 -msgid "Revoked 'repository create' permission to users group" -msgstr "Cofnięto grupie użytkowników uprawnienia do 'tworzenia repozytorium'" - -#: rhodecode/controllers/admin/users_groups.py:244 -msgid "Granted 'repository fork' permission to users group" -msgstr "Przyznano grupie użytkowników uprawnienia do 'tworzenia rozgałęzień'" - -#: rhodecode/controllers/admin/users_groups.py:249 -msgid "Revoked 'repository fork' permission to users group" -msgstr "Cofnięto grupie użytkowników uprawnienia do 'tworzenia rozgałęzień'" - -#: rhodecode/lib/auth.py:499 -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:540 -msgid "You need to be a signed in to view this page" -msgstr "Musisz być zalogowany, żeby oglądać stronę" - -#: rhodecode/lib/diffs.py:86 -msgid "Changeset was too big and was cut off, use diff menu to display this diff" -msgstr "Lista zmian była zbyt duża i została obcięta, użyj menu porównań żeby wyświetlić różnice" - -#: rhodecode/lib/diffs.py:96 -msgid "No changes detected" -msgstr "Nie wykryto zmian" - -#: rhodecode/lib/helpers.py:372 -#, python-format -msgid "%a, %d %b %Y %H:%M:%S" -msgstr "%d.%m.%Y, %H:%M:%S" - -#: rhodecode/lib/helpers.py:484 -msgid "True" -msgstr "Prawda" - -#: rhodecode/lib/helpers.py:488 -msgid "False" -msgstr "Fałsz" - -#: rhodecode/lib/helpers.py:532 -msgid "Changeset not found" -msgstr "Nie znaleziono changeset" - -#: rhodecode/lib/helpers.py:555 -#, python-format -msgid "Show all combined changesets %s->%s" -msgstr "Pokaż wszystkie zestawienia zmian changesets %s->%s" - -#: rhodecode/lib/helpers.py:561 -msgid "compare view" -msgstr "Wyświetl porównanie" - -#: rhodecode/lib/helpers.py:581 -msgid "and" -msgstr "i" - -#: rhodecode/lib/helpers.py:582 -#, python-format -msgid "%s more" -msgstr "%s więcej" - -#: rhodecode/lib/helpers.py:583 -#: rhodecode/templates/changelog/changelog.html:48 -msgid "revisions" -msgstr "rewizja" - -#: rhodecode/lib/helpers.py:606 -msgid "fork name " -msgstr "nazwa rozgałęzienia " - -#: rhodecode/lib/helpers.py:620 -#: rhodecode/templates/pullrequests/pullrequest_show.html:4 -#: rhodecode/templates/pullrequests/pullrequest_show.html:12 -#, python-format -msgid "Pull request #%s" -msgstr "Połączonych gałęzi #%s" - -#: rhodecode/lib/helpers.py:626 -msgid "[deleted] repository" -msgstr "[usunięte] repozytorium" - -#: rhodecode/lib/helpers.py:628 -#: rhodecode/lib/helpers.py:638 -msgid "[created] repository" -msgstr "[utworzone] repozytorium" - -#: rhodecode/lib/helpers.py:630 -msgid "[created] repository as fork" -msgstr "[utworzone] repozytorium jako rozgałęzienie" - -#: rhodecode/lib/helpers.py:632 -#: rhodecode/lib/helpers.py:640 -msgid "[forked] repository" -msgstr "[rozgałęzione] repozytorium" - -#: rhodecode/lib/helpers.py:634 -#: rhodecode/lib/helpers.py:642 -msgid "[updated] repository" -msgstr "[zaktualizowane] repozytorium" - -#: rhodecode/lib/helpers.py:636 -msgid "[delete] repository" -msgstr "[skasowane] repozytorium" - -#: rhodecode/lib/helpers.py:644 -msgid "[created] user" -msgstr "[utworzony] użytkownik" - -#: rhodecode/lib/helpers.py:646 -msgid "[updated] user" -msgstr "[zaktualizowany] użytkownik" - -#: rhodecode/lib/helpers.py:648 -msgid "[created] users group" -msgstr "[utworzona] grupa użytkowników" - -#: rhodecode/lib/helpers.py:650 -msgid "[updated] users group" -msgstr "[zaktualizowana] grupa użytkowników" - -#: rhodecode/lib/helpers.py:652 -msgid "[commented] on revision in repository" -msgstr "[komentarz] do zmiany w repozytorium" - -#: rhodecode/lib/helpers.py:654 -msgid "[commented] on pull request for" -msgstr "[komentarz] wniosek o połączenie gałęzi" - -#: rhodecode/lib/helpers.py:656 -msgid "[closed] pull request for" -msgstr "[zamknięty] wniosek o połączenie gałęzi" - -#: rhodecode/lib/helpers.py:658 -msgid "[pushed] into" -msgstr "[wysłane zmiany] w" - -#: rhodecode/lib/helpers.py:660 -msgid "[committed via RhodeCode] into repository" -msgstr "[committed przez RhodeCode] do repozytorium" - -#: rhodecode/lib/helpers.py:662 -msgid "[pulled from remote] into repository" -msgstr "[pobieranie z zdalnego] do repozytorium" - -#: rhodecode/lib/helpers.py:664 -msgid "[pulled] from" -msgstr "[pobrano] z" - -#: rhodecode/lib/helpers.py:666 -msgid "[started following] repository" -msgstr "[start następnego] repozytorium" - -#: rhodecode/lib/helpers.py:668 -msgid "[stopped following] repository" -msgstr "[zatrzymany po] repozytorium" - -#: rhodecode/lib/helpers.py:840 -#, python-format -msgid " and %s more" -msgstr "i %s więcej" - -#: rhodecode/lib/helpers.py:844 -msgid "No Files" -msgstr "Brak Plików" - -#: rhodecode/lib/utils2.py:335 -#, python-format -msgid "%d year" -msgid_plural "%d years" -msgstr[0] "%d rok" -msgstr[1] "%d lata" -msgstr[2] "%d lat" - -#: rhodecode/lib/utils2.py:336 -#, python-format -msgid "%d month" -msgid_plural "%d months" -msgstr[0] "%d miesiąc" -msgstr[1] "%d miesięcy" -msgstr[2] "%d miesięcy" - -#: rhodecode/lib/utils2.py:337 -#, python-format -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "%d dzień" -msgstr[1] "%d dni" -msgstr[2] "%d dni" - -#: rhodecode/lib/utils2.py:338 -#, python-format -msgid "%d hour" -msgid_plural "%d hours" -msgstr[0] "%d godzina" -msgstr[1] "%d godziny" -msgstr[2] "%d godzin" - -#: rhodecode/lib/utils2.py:339 -#, python-format -msgid "%d minute" -msgid_plural "%d minutes" -msgstr[0] "%d minuta" -msgstr[1] "%d minuty" -msgstr[2] "%d minut" - -#: rhodecode/lib/utils2.py:340 -#, python-format -msgid "%d second" -msgid_plural "%d seconds" -msgstr[0] "%d sekunda" -msgstr[1] "%d sekund" -msgstr[2] "%d sekund" - -#: rhodecode/lib/utils2.py:355 -#, python-format -msgid "%s ago" -msgstr "%s temu" - -#: rhodecode/lib/utils2.py:357 -#, python-format -msgid "%s and %s ago" -msgstr "%s i %s temu" - -#: rhodecode/lib/utils2.py:360 -msgid "just now" -msgstr "przed chwilą" - -#: rhodecode/lib/celerylib/tasks.py:269 -msgid "password reset link" -msgstr "łącze resetowania hasła" - -#: rhodecode/model/comment.py:110 -#, python-format -msgid "on line %s" -msgstr "widziany %s" - -#: rhodecode/model/comment.py:157 -msgid "[Mention]" -msgstr "[Wymieniony]" - -#: rhodecode/model/db.py:1140 -msgid "Repository no access" -msgstr "Brak dostępu do repozytorium" - -#: rhodecode/model/db.py:1141 -msgid "Repository read access" -msgstr "Repozytorium do odczytu" - -#: rhodecode/model/db.py:1142 -msgid "Repository write access" -msgstr "Repozytorium do zapisu" - -#: rhodecode/model/db.py:1143 -msgid "Repository admin access" -msgstr "Administracja dostępu do repozytorium" - -#: rhodecode/model/db.py:1145 -msgid "Repositories Group no access" -msgstr "Grupy repozytoriów brak dostępu" - -#: rhodecode/model/db.py:1146 -msgid "Repositories Group read access" -msgstr "Grupy repozytoriów dostęp do odczytu" - -#: rhodecode/model/db.py:1147 -msgid "Repositories Group write access" -msgstr "Grupy repozytoriów dostęp do zapisu" - -#: rhodecode/model/db.py:1148 -msgid "Repositories Group admin access" -msgstr "Repozytoria Grupy dostęp administratora" - -#: rhodecode/model/db.py:1150 -msgid "RhodeCode Administrator" -msgstr "Administrator Repo" - -#: rhodecode/model/db.py:1151 -msgid "Repository creation disabled" -msgstr "Repozytorium wyłączone" - -#: rhodecode/model/db.py:1152 -msgid "Repository creation enabled" -msgstr "Repozytorium włączone" - -#: rhodecode/model/db.py:1153 -msgid "Repository forking disabled" -msgstr "Rozwidlenie repozytorium wyłączone" - -#: rhodecode/model/db.py:1154 -msgid "Repository forking enabled" -msgstr "Rozwidlenie repozytorium włączone" - -#: rhodecode/model/db.py:1155 -msgid "Register disabled" -msgstr "Rejestracja wyłączona" - -#: rhodecode/model/db.py:1156 -msgid "Register new user with RhodeCode with manual activation" -msgstr "Rejestracja nowego użytkownika na stronie z ręczną aktywacją" - -#: rhodecode/model/db.py:1159 -msgid "Register new user with RhodeCode with auto activation" -msgstr "Rejestracja nowego użytkownika na stronie z automatyczną aktywacją" - -#: rhodecode/model/db.py:1579 -msgid "Not Reviewed" -msgstr "Brak Korekty" - -#: rhodecode/model/db.py:1580 -msgid "Approved" -msgstr "Zaakceptowano" - -#: rhodecode/model/db.py:1581 -msgid "Rejected" -msgstr "Odrzucono" - -#: rhodecode/model/db.py:1582 -msgid "Under Review" -msgstr "Objęty Przeglądem" - -#: rhodecode/model/forms.py:43 -msgid "Please enter a login" -msgstr "Wpisz login" - -#: rhodecode/model/forms.py:44 -#, python-format -msgid "Enter a value %(min)i characters long or more" -msgstr "Wprowadź wartość %(min)i znaków lub więcej" - -#: rhodecode/model/forms.py:52 -msgid "Please enter a password" -msgstr "Wpisz hasło" - -#: rhodecode/model/forms.py:53 -#, python-format -msgid "Enter %(min)i characters or more" -msgstr "Wpisz %(min)i lub więcej znaków" - -#: rhodecode/model/notification.py:220 -msgid "commented on commit" -msgstr "dodał komentarz" - -#: rhodecode/model/notification.py:221 -msgid "sent message" -msgstr "wysłano wiadomość" - -#: rhodecode/model/notification.py:222 -msgid "mentioned you" -msgstr "wspomniał o Tobie" - -#: rhodecode/model/notification.py:223 -msgid "registered in RhodeCode" -msgstr "zarejestrował się" - -#: rhodecode/model/notification.py:224 -msgid "opened new pull request" -msgstr "otwarto nowe połączenie gałęzi" - -#: rhodecode/model/notification.py:225 -msgid "commented on pull request" -msgstr "skomentował nowe połączenie gałęzi" - -#: rhodecode/model/pull_request.py:84 -#, python-format -msgid "%(user)s wants you to review pull request #%(pr_id)s" -msgstr "%(user)s chce żeby przejrzeć nowe gałęzie #%(pr_id)s" - -#: rhodecode/model/scm.py:535 -msgid "latest tip" -msgstr "ostatni tip" - -#: rhodecode/model/user.py:230 -msgid "new user registration" -msgstr "nowy użytkownik się zarejestrował" - -#: rhodecode/model/user.py:255 -#: rhodecode/model/user.py:277 -#: rhodecode/model/user.py:299 -msgid "You can't Edit this user since it's crucial for entire application" -msgstr "Nie możesz edytować tego użytkownika ponieważ jest kluczowy dla całej aplikacji" - -#: rhodecode/model/user.py:323 -msgid "You can't remove this user since it's crucial for entire application" -msgstr "Nie możesz usunąć tego użytkownika ponieważ jest kluczowy dla całej aplikacji" - -#: rhodecode/model/user.py:329 -#, python-format -msgid "user \"%s\" still owns %s repositories and cannot be removed. Switch owners or remove those repositories. %s" -msgstr "użytkownik \"%s\" wciąż posiada repozytoria następujące %s i nie może zostać usunięty. Zmień właściciela lub usuń te repozytoria. %s" - -#: rhodecode/model/validators.py:35 -#: rhodecode/model/validators.py:36 -msgid "Value cannot be an empty list" -msgstr "Wartość listy nie może być pusta" - -#: rhodecode/model/validators.py:82 -#, python-format -msgid "Username \"%(username)s\" already exists" -msgstr "Użytkownik \"%(username)s\" już istnieje" - -#: rhodecode/model/validators.py:84 -#, python-format -msgid "Username \"%(username)s\" is forbidden" -msgstr "Nazwa użytkownika \"%(username)s\" jest zabroniona" - -#: rhodecode/model/validators.py:86 -msgid "Username may only contain alphanumeric characters underscores, periods or dashes and must begin with alphanumeric character" -msgstr "Nazwa użytkownika może zawierać tylko znaki alfanumeryczne, podkreślenia, kropki lub myślniki i musi zaczynać się znakiem alfanumerycznym" - -#: rhodecode/model/validators.py:114 -#, python-format -msgid "Username %(username)s is not valid" -msgstr "Nazwa użytkownika %(username)s jest nieprawidłowa" - -#: rhodecode/model/validators.py:133 -msgid "Invalid users group name" -msgstr "Niewłaściwa nazwa grupy" - -#: rhodecode/model/validators.py:134 -#, python-format -msgid "Users group \"%(usersgroup)s\" already exists" -msgstr "Nazwa grupy \"%(usersgroup)s\" już istnieje" - -#: rhodecode/model/validators.py:136 -msgid "users group name may only contain alphanumeric characters underscores, periods or dashes and must begin with alphanumeric character" -msgstr "Nazwa grupy może zawierać tylko znaki alfanumeryczne, podkreślenia, kropki lub myślniki i musi zaczynać się znakiem alfanumerycznym" - -#: rhodecode/model/validators.py:174 -msgid "Cannot assign this group as parent" -msgstr "Nie można przypisać do tej grupy jako rodzic" - -#: rhodecode/model/validators.py:175 -#, python-format -msgid "Group \"%(group_name)s\" already exists" -msgstr "Nazwa grupy \"%(group_name)s\" już istnieje" - -#: rhodecode/model/validators.py:177 -#, python-format -msgid "Repository with name \"%(group_name)s\" already exists" -msgstr "Repozytorium o nazwie \"%(group_name)s\" już istnieje" - -#: rhodecode/model/validators.py:235 -msgid "Invalid characters (non-ascii) in password" -msgstr "Nieprawidłowe znaki (nie-ascii) w haśle" - -#: rhodecode/model/validators.py:250 -msgid "Passwords do not match" -msgstr "Hasła różnią się" - -#: rhodecode/model/validators.py:267 -msgid "invalid password" -msgstr "nieprawidłowe hasło" - -#: rhodecode/model/validators.py:268 -msgid "invalid user name" -msgstr "niepoprawna nazwa użytkownika" - -#: rhodecode/model/validators.py:269 -msgid "Your account is disabled" -msgstr "Twoje konto jest wyłączone" - -#: rhodecode/model/validators.py:313 -#, python-format -msgid "Repository name %(repo)s is disallowed" -msgstr "Nazwa repozytorium %(repo)s jest zabroniona" - -#: rhodecode/model/validators.py:315 -#, python-format -msgid "Repository named %(repo)s already exists" -msgstr "Repozytorium o nazwie %(repo)s już istnieje" - -#: rhodecode/model/validators.py:316 -#, python-format -msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" -msgstr "Repozytorium \"%(repo)s\" już istnieje w grupie \"%(group)s\"" - -#: rhodecode/model/validators.py:318 -#, python-format -msgid "Repositories group with name \"%(repo)s\" already exists" -msgstr "Grupa repozytoriów z nazwą \"%(repo)s\" już istnieje" - -#: rhodecode/model/validators.py:431 -msgid "invalid clone url" -msgstr "nieprawidłowe url klonowania" - -#: rhodecode/model/validators.py:432 -msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" -msgstr "Nieprawidłowe url klonowania, wstaw prawidłowy url http(s)/svn+http(s)" - -#: rhodecode/model/validators.py:457 -msgid "Fork have to be the same type as parent" -msgstr "Fork musi być tego samego typu, jak rodzic" - -#: rhodecode/model/validators.py:478 -msgid "This username or users group name is not valid" -msgstr "Ta nazwa użytkownika lub grupy użytkowników nie jest prawidłowa" - -#: rhodecode/model/validators.py:562 -msgid "This is not a valid path" -msgstr "To nie jest prawidłowa ścieżka" - -#: rhodecode/model/validators.py:577 -msgid "This e-mail address is already taken" -msgstr "Ten adres e-mail jest już zajęty" - -#: rhodecode/model/validators.py:597 -#, python-format -msgid "e-mail \"%(email)s\" does not exist." -msgstr "e-mail \"%(email)s\" nie istnieje." - -#: rhodecode/model/validators.py:634 -msgid "The LDAP Login attribute of the CN must be specified - this is the name of the attribute that is equivalent to \"username\"" -msgstr "Atrybut logowania CN do LDAP należy określić, jest to nazwa atrybutu, który jest odpowiednikiem \"username\"" - -#: rhodecode/model/validators.py:653 -#, 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/templates/index.html:3 -msgid "Dashboard" -msgstr "Repozytorium" - -#: rhodecode/templates/index_base.html:6 -#: rhodecode/templates/repo_switcher_list.html:4 -#: rhodecode/templates/admin/repos/repos.html:9 -#: rhodecode/templates/admin/users/user_edit_my_account.html:31 -#: rhodecode/templates/admin/users/users.html:9 -#: rhodecode/templates/bookmarks/bookmarks.html:10 -#: rhodecode/templates/branches/branches.html:9 -#: rhodecode/templates/journal/journal.html:40 -#: rhodecode/templates/tags/tags.html:10 -msgid "quick filter..." -msgstr "szybki filtr..." - -#: rhodecode/templates/index_base.html:6 -#: rhodecode/templates/admin/repos/repos.html:9 -#: rhodecode/templates/base/base.html:221 -msgid "repositories" -msgstr "repozytoria" - -#: rhodecode/templates/index_base.html:13 -#: rhodecode/templates/index_base.html:15 -#: rhodecode/templates/admin/repos/repos.html:21 -msgid "ADD REPOSITORY" -msgstr "DODAJ REPOZYTORIUM" - -#: rhodecode/templates/index_base.html:29 -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:32 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:32 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:33 -#: rhodecode/templates/admin/users_groups/users_group_add.html:32 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:33 -msgid "Group name" -msgstr "Nazwa grupy" - -#: rhodecode/templates/index_base.html:30 -#: rhodecode/templates/index_base.html:71 -#: rhodecode/templates/index_base.html:142 -#: rhodecode/templates/index_base.html:168 -#: rhodecode/templates/admin/repos/repo_add_base.html:56 -#: rhodecode/templates/admin/repos/repo_edit.html:75 -#: rhodecode/templates/admin/repos/repos.html:72 -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:41 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:41 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34 -#: rhodecode/templates/forks/fork.html:59 -#: rhodecode/templates/settings/repo_settings.html:66 -#: rhodecode/templates/summary/summary.html:105 -msgid "Description" -msgstr "Opis" - -#: rhodecode/templates/index_base.html:40 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46 -msgid "Repositories group" -msgstr "Grupy w repozytorium" - -#: rhodecode/templates/index_base.html:70 -#: rhodecode/templates/index_base.html:166 -#: rhodecode/templates/admin/repos/repo_add_base.html:9 -#: rhodecode/templates/admin/repos/repo_edit.html:32 -#: rhodecode/templates/admin/repos/repos.html:70 -#: rhodecode/templates/admin/users/user_edit.html:192 -#: rhodecode/templates/admin/users/user_edit_my_account.html:59 -#: rhodecode/templates/admin/users/user_edit_my_account.html:157 -#: rhodecode/templates/admin/users/user_edit_my_account.html:193 -#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6 -#: rhodecode/templates/bookmarks/bookmarks.html:36 -#: rhodecode/templates/bookmarks/bookmarks_data.html:6 -#: rhodecode/templates/branches/branches.html:51 -#: rhodecode/templates/files/files_browser.html:47 -#: rhodecode/templates/journal/journal.html:59 -#: rhodecode/templates/journal/journal.html:107 -#: rhodecode/templates/journal/journal.html:186 -#: rhodecode/templates/settings/repo_settings.html:31 -#: rhodecode/templates/summary/summary.html:43 -#: rhodecode/templates/summary/summary.html:123 -#: rhodecode/templates/tags/tags.html:36 -#: rhodecode/templates/tags/tags_data.html:6 -msgid "Name" -msgstr "Nazwa" - -#: rhodecode/templates/index_base.html:72 -msgid "Last change" -msgstr "Ostatnia aktywność" - -#: rhodecode/templates/index_base.html:73 -#: rhodecode/templates/index_base.html:171 -#: rhodecode/templates/admin/users/user_edit_my_account.html:159 -#: rhodecode/templates/journal/journal.html:188 -msgid "Tip" -msgstr "Ostatnia zmiana" - -#: rhodecode/templates/index_base.html:74 -#: rhodecode/templates/index_base.html:173 -#: rhodecode/templates/admin/repos/repo_edit.html:121 -#: rhodecode/templates/admin/repos/repos.html:73 -msgid "Owner" -msgstr "Właściciel" - -#: rhodecode/templates/index_base.html:75 -#: rhodecode/templates/summary/summary.html:48 -#: rhodecode/templates/summary/summary.html:51 -msgid "RSS" -msgstr "RSS" - -#: rhodecode/templates/index_base.html:76 -msgid "Atom" -msgstr "Atom" - -#: rhodecode/templates/index_base.html:110 -#: rhodecode/templates/index_base.html:112 -#, python-format -msgid "Subscribe to %s rss feed" -msgstr "Subskrybuj %s kanał rss" - -#: rhodecode/templates/index_base.html:117 -#: rhodecode/templates/index_base.html:119 -#, python-format -msgid "Subscribe to %s atom feed" -msgstr "Subskrybuj %s kanał atom" - -#: rhodecode/templates/index_base.html:140 -msgid "Group Name" -msgstr "Nazwa Grupy" - -#: rhodecode/templates/index_base.html:158 -#: rhodecode/templates/index_base.html:198 -#: rhodecode/templates/admin/repos/repos.html:94 -#: rhodecode/templates/admin/users/user_edit_my_account.html:179 -#: rhodecode/templates/admin/users/users.html:107 -#: rhodecode/templates/bookmarks/bookmarks.html:60 -#: rhodecode/templates/branches/branches.html:77 -#: rhodecode/templates/journal/journal.html:211 -#: rhodecode/templates/tags/tags.html:60 -msgid "Click to sort ascending" -msgstr "Kliknij, aby posortować rosnąco" - -#: rhodecode/templates/index_base.html:159 -#: rhodecode/templates/index_base.html:199 -#: rhodecode/templates/admin/repos/repos.html:95 -#: rhodecode/templates/admin/users/user_edit_my_account.html:180 -#: rhodecode/templates/admin/users/users.html:108 -#: rhodecode/templates/bookmarks/bookmarks.html:61 -#: rhodecode/templates/branches/branches.html:78 -#: rhodecode/templates/journal/journal.html:212 -#: rhodecode/templates/tags/tags.html:61 -msgid "Click to sort descending" -msgstr "Kliknij, aby posortować malejąco" - -#: rhodecode/templates/index_base.html:169 -msgid "Last Change" -msgstr "Ostatnia akytwność" - -#: rhodecode/templates/index_base.html:200 -#: rhodecode/templates/admin/repos/repos.html:96 -#: rhodecode/templates/admin/users/user_edit_my_account.html:181 -#: rhodecode/templates/admin/users/users.html:109 -#: rhodecode/templates/bookmarks/bookmarks.html:62 -#: rhodecode/templates/branches/branches.html:79 -#: rhodecode/templates/journal/journal.html:213 -#: rhodecode/templates/tags/tags.html:62 -msgid "No records found." -msgstr "Nie znaleziono rekordów." - -#: rhodecode/templates/index_base.html:201 -#: rhodecode/templates/admin/repos/repos.html:97 -#: rhodecode/templates/admin/users/user_edit_my_account.html:182 -#: rhodecode/templates/admin/users/users.html:110 -#: rhodecode/templates/bookmarks/bookmarks.html:63 -#: rhodecode/templates/branches/branches.html:80 -#: rhodecode/templates/journal/journal.html:214 -#: rhodecode/templates/tags/tags.html:63 -msgid "Data error." -msgstr "Błąd danych." - -#: rhodecode/templates/index_base.html:202 -#: rhodecode/templates/admin/repos/repos.html:98 -#: rhodecode/templates/admin/users/user_edit_my_account.html:183 -#: rhodecode/templates/admin/users/users.html:111 -#: rhodecode/templates/bookmarks/bookmarks.html:64 -#: rhodecode/templates/branches/branches.html:81 -#: rhodecode/templates/journal/journal.html:215 -#: rhodecode/templates/tags/tags.html:64 -msgid "Loading..." -msgstr "Wczytywanie..." - -#: rhodecode/templates/login.html:5 -#: rhodecode/templates/login.html:54 -msgid "Sign In" -msgstr "Zaloguj się" - -#: rhodecode/templates/login.html:21 -msgid "Sign In to" -msgstr "Zarejestruj się" - -#: rhodecode/templates/login.html:31 -#: rhodecode/templates/register.html:20 -#: rhodecode/templates/admin/admin_log.html:5 -#: rhodecode/templates/admin/users/user_add.html:32 -#: rhodecode/templates/admin/users/user_edit.html:50 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:26 -#: rhodecode/templates/base/base.html:83 -#: rhodecode/templates/summary/summary.html:122 -msgid "Username" -msgstr "Nazwa użytkownika" - -#: rhodecode/templates/login.html:40 -#: rhodecode/templates/register.html:29 -#: rhodecode/templates/admin/ldap/ldap.html:46 -#: rhodecode/templates/admin/users/user_add.html:41 -#: rhodecode/templates/base/base.html:92 -msgid "Password" -msgstr "Hasło" - -#: rhodecode/templates/login.html:50 -msgid "Remember me" -msgstr "Zapamiętaj mnie" - -#: rhodecode/templates/login.html:60 -msgid "Forgot your password ?" -msgstr "Zapomniałeś hasła?" - -#: rhodecode/templates/login.html:63 -#: rhodecode/templates/base/base.html:103 -msgid "Don't have an account ?" -msgstr "Nie masz konta?" - -#: rhodecode/templates/password_reset.html:5 -msgid "Reset your password" -msgstr "Zresetuj swoje hasło" - -#: rhodecode/templates/password_reset.html:11 -msgid "Reset your password to" -msgstr "Resetowanie hasła dla" - -#: rhodecode/templates/password_reset.html:21 -msgid "Email address" -msgstr "Adres e-mail" - -#: rhodecode/templates/password_reset.html:30 -msgid "Reset my password" -msgstr "Zresetuj swoje hasło" - -#: rhodecode/templates/password_reset.html:31 -msgid "Password reset link will be send to matching email address" -msgstr "Link do zresetowania hasła zostanie wysłany na adres e-mail" - -#: rhodecode/templates/register.html:5 -#: rhodecode/templates/register.html:74 -msgid "Sign Up" -msgstr "Zarejestruj się" - -#: rhodecode/templates/register.html:11 -msgid "Sign Up to" -msgstr "Zarejestruj się do" - -#: rhodecode/templates/register.html:38 -msgid "Re-enter password" -msgstr "Ponownie wprowadź hasło" - -#: rhodecode/templates/register.html:47 -#: rhodecode/templates/admin/users/user_add.html:59 -#: rhodecode/templates/admin/users/user_edit.html:86 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:53 -msgid "First Name" -msgstr "Imię" - -#: rhodecode/templates/register.html:56 -#: rhodecode/templates/admin/users/user_add.html:68 -#: rhodecode/templates/admin/users/user_edit.html:95 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:62 -msgid "Last Name" -msgstr "Nazwisko" - -#: rhodecode/templates/register.html:65 -#: rhodecode/templates/admin/users/user_add.html:77 -#: rhodecode/templates/admin/users/user_edit.html:104 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:71 -#: rhodecode/templates/summary/summary.html:124 -msgid "Email" -msgstr "E-mail" - -#: rhodecode/templates/register.html:76 -msgid "Your account will be activated right after registration" -msgstr "Twoje konto zostanie aktywowane zaraz po rejestracji" - -#: rhodecode/templates/register.html:78 -msgid "Your account must wait for activation by administrator" -msgstr "Twoje konto musi zostać aktywowane przez administratora" - -#: rhodecode/templates/repo_switcher_list.html:11 -#: rhodecode/templates/admin/repos/repo_add_base.html:65 -#: rhodecode/templates/admin/repos/repo_edit.html:85 -#: rhodecode/templates/settings/repo_settings.html:76 -msgid "Private repository" -msgstr "Prywatne repozytorium" - -#: rhodecode/templates/repo_switcher_list.html:16 -msgid "Public repository" -msgstr "Publiczne repozytorium" - -#: rhodecode/templates/switch_to_list.html:3 -#: rhodecode/templates/branches/branches.html:14 -msgid "branches" -msgstr "gałęzie" - -#: rhodecode/templates/switch_to_list.html:10 -#: rhodecode/templates/branches/branches_data.html:57 -msgid "There are no branches yet" -msgstr "Nie ma jeszcze gałęzi" - -#: rhodecode/templates/switch_to_list.html:15 -#: rhodecode/templates/shortlog/shortlog_data.html:10 -#: rhodecode/templates/tags/tags.html:15 -msgid "tags" -msgstr "Tagi" - -#: rhodecode/templates/switch_to_list.html:22 -#: rhodecode/templates/tags/tags_data.html:33 -msgid "There are no tags yet" -msgstr "Nie ma jeszcze tagów" - -#: rhodecode/templates/switch_to_list.html:28 -#: rhodecode/templates/bookmarks/bookmarks.html:15 -msgid "bookmarks" -msgstr "zakładki" - -#: rhodecode/templates/switch_to_list.html:35 -#: rhodecode/templates/bookmarks/bookmarks_data.html:32 -msgid "There are no bookmarks yet" -msgstr "Nie ma jeszcze zakładek" - -#: rhodecode/templates/admin/admin.html:5 -#: rhodecode/templates/admin/admin.html:9 -msgid "Admin journal" -msgstr "Dziennik administratora" - -#: rhodecode/templates/admin/admin_log.html:6 -#: rhodecode/templates/admin/repos/repos.html:74 -#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8 -#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:9 -#: rhodecode/templates/journal/journal.html:61 -#: rhodecode/templates/journal/journal.html:62 -msgid "Action" -msgstr "Działanie" - -#: rhodecode/templates/admin/admin_log.html:7 -msgid "Repository" -msgstr "Repozytorium" - -#: rhodecode/templates/admin/admin_log.html:8 -#: rhodecode/templates/bookmarks/bookmarks.html:37 -#: rhodecode/templates/bookmarks/bookmarks_data.html:7 -#: rhodecode/templates/branches/branches.html:52 -#: rhodecode/templates/tags/tags.html:37 -#: rhodecode/templates/tags/tags_data.html:7 -msgid "Date" -msgstr "Data" - -#: rhodecode/templates/admin/admin_log.html:9 -msgid "From IP" -msgstr "z IP" - -#: rhodecode/templates/admin/admin_log.html:53 -msgid "No actions yet" -msgstr "Brak akcji" - -#: rhodecode/templates/admin/ldap/ldap.html:5 -msgid "LDAP administration" -msgstr "Administracja LDAP" - -#: rhodecode/templates/admin/ldap/ldap.html:11 -msgid "Ldap" -msgstr "Ldap" - -#: rhodecode/templates/admin/ldap/ldap.html:28 -msgid "Connection settings" -msgstr "Ustawienia połączeń" - -#: rhodecode/templates/admin/ldap/ldap.html:30 -msgid "Enable LDAP" -msgstr "Włącz LDAP" - -#: rhodecode/templates/admin/ldap/ldap.html:34 -msgid "Host" -msgstr "Host" - -#: rhodecode/templates/admin/ldap/ldap.html:38 -msgid "Port" -msgstr "Port" - -#: rhodecode/templates/admin/ldap/ldap.html:42 -msgid "Account" -msgstr "Konto" - -#: rhodecode/templates/admin/ldap/ldap.html:50 -msgid "Connection security" -msgstr "Zabezpieczenie połączenia" - -#: rhodecode/templates/admin/ldap/ldap.html:54 -msgid "Certificate Checks" -msgstr "Kontrola certyfikatów" - -#: rhodecode/templates/admin/ldap/ldap.html:57 -msgid "Search settings" -msgstr "Ustawienia wyszukiwania" - -#: rhodecode/templates/admin/ldap/ldap.html:59 -msgid "Base DN" -msgstr "Bazowy DN" - -#: rhodecode/templates/admin/ldap/ldap.html:63 -msgid "LDAP Filter" -msgstr "Filtr LDAP" - -#: rhodecode/templates/admin/ldap/ldap.html:67 -msgid "LDAP Search Scope" -msgstr "Zakres wyszukiwania LDAP" - -#: rhodecode/templates/admin/ldap/ldap.html:70 -msgid "Attribute mappings" -msgstr "Mapowanie atrybutów" - -#: rhodecode/templates/admin/ldap/ldap.html:72 -msgid "Login Attribute" -msgstr "Atrybuty logowania" - -#: rhodecode/templates/admin/ldap/ldap.html:76 -msgid "First Name Attribute" -msgstr "Atrybut Nazwiska" - -#: rhodecode/templates/admin/ldap/ldap.html:80 -msgid "Last Name Attribute" -msgstr "Atrybut Imienia" - -#: rhodecode/templates/admin/ldap/ldap.html:84 -msgid "E-mail Attribute" -msgstr "Atrybut E-maila" - -#: rhodecode/templates/admin/ldap/ldap.html:89 -#: rhodecode/templates/admin/repos/repo_edit.html:141 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74 -#: rhodecode/templates/admin/settings/hooks.html:73 -#: rhodecode/templates/admin/users/user_edit.html:129 -#: rhodecode/templates/admin/users/user_edit.html:174 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:79 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:135 -#: rhodecode/templates/settings/repo_settings.html:93 -msgid "Save" -msgstr "Zapisz" - -#: rhodecode/templates/admin/notifications/notifications.html:5 -#: rhodecode/templates/admin/notifications/notifications.html:9 -msgid "My Notifications" -msgstr "Opcje powiadomień" - -#: rhodecode/templates/admin/notifications/notifications.html:29 -msgid "All" -msgstr "Wszystkie" - -#: rhodecode/templates/admin/notifications/notifications.html:30 -msgid "Comments" -msgstr "Komentarze" - -#: rhodecode/templates/admin/notifications/notifications.html:31 -#: rhodecode/templates/base/base.html:254 -#: rhodecode/templates/base/base.html:256 -msgid "Pull requests" -msgstr "Połączone gałęzie" - -#: rhodecode/templates/admin/notifications/notifications.html:35 -msgid "Mark all read" -msgstr "Oznacz wszystko jako przeczytane" - -#: rhodecode/templates/admin/notifications/notifications_data.html:39 -msgid "No notifications here yet" -msgstr "Brak powiadomień" - -#: rhodecode/templates/admin/notifications/show_notification.html:5 -#: rhodecode/templates/admin/notifications/show_notification.html:11 -msgid "Show notification" -msgstr "Pokaż powiadomienia" - -#: rhodecode/templates/admin/notifications/show_notification.html:9 -msgid "Notifications" -msgstr "Powiadomienia" - -#: rhodecode/templates/admin/permissions/permissions.html:5 -msgid "Permissions administration" -msgstr "Uprawnienia administracji" - -#: rhodecode/templates/admin/permissions/permissions.html:11 -#: rhodecode/templates/admin/repos/repo_edit.html:134 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58 -#: rhodecode/templates/admin/users/user_edit.html:139 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:100 -#: rhodecode/templates/settings/repo_settings.html:86 -msgid "Permissions" -msgstr "Uprawnienia" - -#: rhodecode/templates/admin/permissions/permissions.html:24 -msgid "Default permissions" -msgstr "Domyślne uprawnienia" - -#: rhodecode/templates/admin/permissions/permissions.html:31 -msgid "Anonymous access" -msgstr "Dostęp anonimowy" - -#: rhodecode/templates/admin/permissions/permissions.html:41 -msgid "Repository permission" -msgstr "Uprawnienia repozytorium" - -#: rhodecode/templates/admin/permissions/permissions.html:49 -msgid "All default permissions on each repository will be reset to choosen permission, note that all custom default permission on repositories 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:50 -msgid "overwrite existing settings" -msgstr "Nadpisz ustawienia" - -#: rhodecode/templates/admin/permissions/permissions.html:55 -msgid "Registration" -msgstr "Rejestracja" - -#: rhodecode/templates/admin/permissions/permissions.html:63 -msgid "Repository creation" -msgstr "Tworzenie repozytorium" - -#: rhodecode/templates/admin/permissions/permissions.html:71 -msgid "Repository forking" -msgstr "Rozwidlanie repozytorium" - -#: rhodecode/templates/admin/permissions/permissions.html:78 -#: rhodecode/templates/admin/repos/repo_edit.html:241 -msgid "set" -msgstr "ustaw" - -#: rhodecode/templates/admin/repos/repo_add.html:5 -#: rhodecode/templates/admin/repos/repo_add_create_repository.html:5 -msgid "Add repository" -msgstr "Dodaj repozytorium" - -#: rhodecode/templates/admin/repos/repo_add.html:11 -#: rhodecode/templates/admin/repos/repo_edit.html:11 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 -msgid "Repositories" -msgstr "Repozytoria" - -#: rhodecode/templates/admin/repos/repo_add.html:13 -msgid "add new" -msgstr "dodaj nowe" - -#: rhodecode/templates/admin/repos/repo_add_base.html:20 -#: rhodecode/templates/summary/summary.html:95 -#: rhodecode/templates/summary/summary.html:96 -msgid "Clone from" -msgstr "Klonuj z" - -#: rhodecode/templates/admin/repos/repo_add_base.html:24 -#: rhodecode/templates/admin/repos/repo_edit.html:44 -#: rhodecode/templates/settings/repo_settings.html:43 -msgid "Optional http[s] url from which repository should be cloned." -msgstr "Opcjonalnie http[s] url z którego repozytorium powinno być klonowane." - -#: rhodecode/templates/admin/repos/repo_add_base.html:29 -#: rhodecode/templates/admin/repos/repo_edit.html:49 -#: rhodecode/templates/admin/repos_groups/repos_groups.html:4 -#: rhodecode/templates/forks/fork.html:50 -#: rhodecode/templates/settings/repo_settings.html:48 -msgid "Repository group" -msgstr "Repozytorium grupy" - -#: rhodecode/templates/admin/repos/repo_add_base.html:33 -#: rhodecode/templates/forks/fork.html:54 -msgid "Optionaly select a group to put this repository into." -msgstr "Opcjonalnie wybierz grupę do wprowadzenia tego repozytorium." - -#: rhodecode/templates/admin/repos/repo_add_base.html:38 -#: rhodecode/templates/admin/repos/repo_edit.html:58 -msgid "Type" -msgstr "Typ" - -#: rhodecode/templates/admin/repos/repo_add_base.html:42 -msgid "Type of repository to create." -msgstr "Rodzaj repozytorium do stworzenia." - -#: rhodecode/templates/admin/repos/repo_add_base.html:47 -#: rhodecode/templates/admin/repos/repo_edit.html:66 -#: rhodecode/templates/forks/fork.html:41 -#: rhodecode/templates/settings/repo_settings.html:57 -msgid "Landing revision" -msgstr "Docelowa rewizja" - -#: rhodecode/templates/admin/repos/repo_add_base.html:51 -#: rhodecode/templates/admin/repos/repo_edit.html:70 -#: rhodecode/templates/forks/fork.html:45 -#: rhodecode/templates/settings/repo_settings.html:61 -msgid "Default revision for files page, downloads, whoosh and readme" -msgstr "Wersja domyślna dla plików stronicowania, pobierania plików, readme" - -#: rhodecode/templates/admin/repos/repo_add_base.html:60 -#: rhodecode/templates/admin/repos/repo_edit.html:79 -#: rhodecode/templates/forks/fork.html:63 -#: rhodecode/templates/settings/repo_settings.html:70 -msgid "Keep it short and to the point. Use a README file for longer descriptions." -msgstr "Powinna być krótka i na temat. Użyj pliku README dla dłuższych opisów." - -#: rhodecode/templates/admin/repos/repo_add_base.html:69 -#: rhodecode/templates/admin/repos/repo_edit.html:89 -#: rhodecode/templates/forks/fork.html:72 -#: rhodecode/templates/settings/repo_settings.html:80 -msgid "Private repositories are only visible to people explicitly added as collaborators." -msgstr "Prywatne repozytoria są widoczne tylko dla osób bezpośrednio dodanych jako współpracownicy." - -#: rhodecode/templates/admin/repos/repo_add_base.html:73 -msgid "add" -msgstr "dodaj" - -#: rhodecode/templates/admin/repos/repo_add_create_repository.html:9 -msgid "add new repository" -msgstr "dodaj nowe repozytorium" - -#: rhodecode/templates/admin/repos/repo_edit.html:5 -msgid "Edit repository" -msgstr "Edytuj repozytorium" - -#: rhodecode/templates/admin/repos/repo_edit.html:13 -#: rhodecode/templates/admin/users/user_edit.html:13 -#: rhodecode/templates/admin/users/user_edit.html:224 -#: rhodecode/templates/admin/users/user_edit.html:226 -#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:13 -#: rhodecode/templates/files/files_source.html:44 -#: rhodecode/templates/journal/journal.html:81 -msgid "edit" -msgstr "edycja" - -#: rhodecode/templates/admin/repos/repo_edit.html:40 -#: rhodecode/templates/settings/repo_settings.html:39 -msgid "Clone uri" -msgstr "Klonowane uri" - -#: rhodecode/templates/admin/repos/repo_edit.html:53 -#: rhodecode/templates/settings/repo_settings.html:52 -msgid "Optional select a group to put this repository into." -msgstr "Opcjonalnie wybierz grupę do wprowadzenia tego repozytorium." - -#: rhodecode/templates/admin/repos/repo_edit.html:94 -msgid "Enable statistics" -msgstr "Włącz statystyki" - -#: rhodecode/templates/admin/repos/repo_edit.html:98 -msgid "Enable statistics window on summary page." -msgstr "Włącz okno statystyk na stronie podsumowania." - -#: rhodecode/templates/admin/repos/repo_edit.html:103 -msgid "Enable downloads" -msgstr "Włącz pobieranie" - -#: rhodecode/templates/admin/repos/repo_edit.html:107 -msgid "Enable download menu on summary page." -msgstr "Włącz menu pobierania na stronie podsumowania." - -#: rhodecode/templates/admin/repos/repo_edit.html:112 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66 -msgid "Enable locking" -msgstr "Włącz blokowanie" - -#: rhodecode/templates/admin/repos/repo_edit.html:116 -msgid "Enable lock-by-pulling on repository." -msgstr "Włącz blokowanie pobierania w repozytorium." - -#: rhodecode/templates/admin/repos/repo_edit.html:126 -msgid "Change owner of this repository." -msgstr "Zmiana właściciela tego repozytorium." - -#: rhodecode/templates/admin/repos/repo_edit.html:142 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75 -#: rhodecode/templates/admin/settings/settings.html:113 -#: rhodecode/templates/admin/settings/settings.html:168 -#: rhodecode/templates/admin/settings/settings.html:258 -#: rhodecode/templates/admin/users/user_edit.html:130 -#: rhodecode/templates/admin/users/user_edit.html:175 -#: rhodecode/templates/admin/users/user_edit.html:278 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:80 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:136 -#: rhodecode/templates/files/files_add.html:82 -#: rhodecode/templates/files/files_edit.html:68 -#: rhodecode/templates/pullrequests/pullrequest.html:124 -#: rhodecode/templates/settings/repo_settings.html:94 -msgid "Reset" -msgstr "Zresetuj" - -#: rhodecode/templates/admin/repos/repo_edit.html:152 -msgid "Administration" -msgstr "Administracja" - -#: rhodecode/templates/admin/repos/repo_edit.html:155 -msgid "Statistics" -msgstr "Statystyki" - -#: rhodecode/templates/admin/repos/repo_edit.html:159 -msgid "Reset current statistics" -msgstr "Zresetuj bieżące statystyki" - -#: rhodecode/templates/admin/repos/repo_edit.html:159 -msgid "Confirm to remove current statistics" -msgstr "Potwierdź usunięcie aktualnych statystyk" - -#: rhodecode/templates/admin/repos/repo_edit.html:162 -msgid "Fetched to rev" -msgstr "Ściągnięte do rev" - -#: rhodecode/templates/admin/repos/repo_edit.html:163 -msgid "Stats gathered" -msgstr "statystyki zgromadzone" - -#: rhodecode/templates/admin/repos/repo_edit.html:171 -msgid "Remote" -msgstr "Zdalnie" - -#: rhodecode/templates/admin/repos/repo_edit.html:175 -msgid "Pull changes from remote location" -msgstr "Prożba połączenia zmian z lokalizacji zdalnej" - -#: rhodecode/templates/admin/repos/repo_edit.html:175 -msgid "Confirm to pull changes from remote side" -msgstr "Potwierdź pull z zdalnej strony" - -#: rhodecode/templates/admin/repos/repo_edit.html:186 -msgid "Cache" -msgstr "Pamięć podręczna" - -#: rhodecode/templates/admin/repos/repo_edit.html:190 -msgid "Invalidate repository cache" -msgstr "Unieważnij pamięć podręczną repozytorium" - -#: rhodecode/templates/admin/repos/repo_edit.html:190 -msgid "Confirm to invalidate repository cache" -msgstr "Potwierdź unieważnienie pamięci podręcznej repozytorium" - -#: rhodecode/templates/admin/repos/repo_edit.html:195 -#: rhodecode/templates/base/base.html:318 -#: rhodecode/templates/base/base.html:320 -#: rhodecode/templates/base/base.html:322 -msgid "Public journal" -msgstr "Dziennik publiczny" - -#: rhodecode/templates/admin/repos/repo_edit.html:201 -msgid "Remove from public journal" -msgstr "Usuń z dziennika publicznego" - -#: rhodecode/templates/admin/repos/repo_edit.html:203 -msgid "Add to public journal" -msgstr "Dodaj do dziennika publicznego" - -#: rhodecode/templates/admin/repos/repo_edit.html:208 -msgid "All actions made on this repository will be accessible to everyone in public journal" -msgstr "Wszystkie działania wykonywane na tym repozytorium będą dostępne dla wszystkich w dzienniku publicznym" - -#: rhodecode/templates/admin/repos/repo_edit.html:215 -msgid "Locking" -msgstr "Blokuj" - -#: rhodecode/templates/admin/repos/repo_edit.html:220 -msgid "Unlock locked repo" -msgstr "Odblokuj zablokowane repo" - -#: rhodecode/templates/admin/repos/repo_edit.html:220 -msgid "Confirm to unlock repository" -msgstr "Potwierdź odblokowanie repozytorium" - -#: rhodecode/templates/admin/repos/repo_edit.html:223 -msgid "lock repo" -msgstr "blokada repo" - -#: rhodecode/templates/admin/repos/repo_edit.html:223 -msgid "Confirm to lock repository" -msgstr "Potwierdź blokowanie repozytorium" - -#: rhodecode/templates/admin/repos/repo_edit.html:224 -msgid "Repository is not locked" -msgstr "Repozytorium nie jest zablokowane" - -#: rhodecode/templates/admin/repos/repo_edit.html:229 -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:236 -msgid "Set as fork of" -msgstr "Ustaw jako rozwidlenie" - -#: rhodecode/templates/admin/repos/repo_edit.html:245 -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:251 -#: rhodecode/templates/changeset/changeset_file_comment.html:26 -msgid "Delete" -msgstr "Usuń" - -#: rhodecode/templates/admin/repos/repo_edit.html:255 -msgid "Remove this repository" -msgstr "Usuń to repozytorium" - -#: rhodecode/templates/admin/repos/repo_edit.html:255 -#: rhodecode/templates/journal/journal.html:84 -msgid "Confirm to delete this repository" -msgstr "Potwierdź, aby usunąć repozytorium" - -#: rhodecode/templates/admin/repos/repo_edit.html:259 -msgid "" -"This repository will be renamed in a special way in order to be unaccesible for RhodeCode and VCS systems.\n" -" If you need fully delete it from filesystem please do it manually" -msgstr "" -"To repozytorium zostanie zmienione w sposób szczególny, żeby było niedostępne dla strony i systemów VCS.\n" -" Jeśli chcesz całkowicie usunąć go z systemu plików prosimy zrobić to ręcznie" - -#: rhodecode/templates/admin/repos/repo_edit_perms.html:3 -#: rhodecode/templates/admin/repos_groups/repos_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 -msgid "read" -msgstr "odczyt" - -#: rhodecode/templates/admin/repos/repo_edit_perms.html:5 -#: rhodecode/templates/admin/repos_groups/repos_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/users.html:85 -#: rhodecode/templates/base/base.html:217 -msgid "admin" -msgstr "administracja" - -#: rhodecode/templates/admin/repos/repo_edit_perms.html:7 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:7 -msgid "member" -msgstr "użytkownik" - -#: rhodecode/templates/admin/repos/repo_edit_perms.html:16 -#: rhodecode/templates/data_table/_dt_elements.html:67 -#: rhodecode/templates/journal/journal.html:132 -#: rhodecode/templates/summary/summary.html:76 -msgid "private repository" -msgstr "prywatne repozytorium" - -#: rhodecode/templates/admin/repos/repo_edit_perms.html:19 -#: rhodecode/templates/admin/repos/repo_edit_perms.html:28 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:18 -msgid "default" -msgstr "domyślne" - -#: rhodecode/templates/admin/repos/repo_edit_perms.html:33 -#: rhodecode/templates/admin/repos/repo_edit_perms.html:58 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:23 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:42 -msgid "revoke" -msgstr "odwołane" - -#: rhodecode/templates/admin/repos/repo_edit_perms.html:83 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:67 -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:81 -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:96 -msgid "Failed to remove users 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_groups.html:8 -msgid "Groups" -msgstr "Grupy" - -#: rhodecode/templates/admin/repos_groups/repos_groups.html:12 -msgid "with" -msgstr "używając" - -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5 -msgid "Add repos group" -msgstr "Dodaj grupę repos" - -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:10 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:10 -msgid "Repos groups" -msgstr "Grupy repos" - -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:12 -msgid "add new repos group" -msgstr "dodaj nową grupę repozytorium" - -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:50 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:50 -msgid "Group parent" -msgstr "Dominująca grupa" - -#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:58 -#: rhodecode/templates/admin/users/user_add.html:94 -#: rhodecode/templates/admin/users_groups/users_group_add.html:49 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:90 -#: rhodecode/templates/pullrequests/pullrequest_show.html:113 -msgid "save" -msgstr "zapisz" - -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:5 -msgid "Edit repos group" -msgstr "Edytuj grupy repo" - -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:12 -msgid "edit repos group" -msgstr "edytuj grupy repo" - -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:70 -msgid "Enable lock-by-pulling on group. This option will be applied to all other groups and repositories inside" -msgstr "Włącz blokowanie pulling przez grupy. Opcja ta będzie stosowana do wszystkich innych grup i repozytoriów wewnątrz" - -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5 -msgid "Repositories groups administration" -msgstr "Repozytoria grup administracyjnych" - -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:22 -msgid "ADD NEW GROUP" -msgstr "DODAJ NOWĄ GRUPĘ" - -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:35 -msgid "Number of toplevel repositories" -msgstr "Liczba najwyższego poziomu repozytorium" - -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36 -#: rhodecode/templates/admin/users/users.html:87 -#: rhodecode/templates/admin/users_groups/users_groups.html:35 -msgid "action" -msgstr "działanie" - -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 -#: rhodecode/templates/admin/users/user_edit.html:255 -#: rhodecode/templates/admin/users_groups/users_groups.html:44 -#: rhodecode/templates/data_table/_dt_elements.html:7 -#: rhodecode/templates/data_table/_dt_elements.html:103 -msgid "delete" -msgstr "usuń" - -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 -#, python-format -msgid "Confirm to delete this group: %s" -msgstr "Potwierdź, aby usunąć tą grupę: %s" - -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:62 -msgid "There are no repositories groups yet" -msgstr "Nie ma jeszcze grup repozytoriów" - -#: rhodecode/templates/admin/settings/hooks.html:5 -#: rhodecode/templates/admin/settings/settings.html:5 -msgid "Settings administration" -msgstr "Ustawienia administracji" - -#: rhodecode/templates/admin/settings/hooks.html:9 -#: rhodecode/templates/admin/settings/settings.html:9 -#: rhodecode/templates/settings/repo_settings.html:13 -msgid "Settings" -msgstr "Ustawienia" - -#: rhodecode/templates/admin/settings/hooks.html:24 -msgid "Built in hooks - read only" -msgstr "Wbudowana w aktualizację - tylko do odczytu" - -#: rhodecode/templates/admin/settings/hooks.html:40 -msgid "Custom hooks" -msgstr "Niestandardowa aktualizacja" - -#: rhodecode/templates/admin/settings/hooks.html:56 -msgid "remove" -msgstr "usuń" - -#: rhodecode/templates/admin/settings/hooks.html:88 -msgid "Failed to remove hook" -msgstr "Nie udało się usunąć hooka" - -#: rhodecode/templates/admin/settings/settings.html:24 -msgid "Remap and rescan repositories" -msgstr "Mapowanie i skanowanie repozytorów" - -#: rhodecode/templates/admin/settings/settings.html:32 -msgid "rescan option" -msgstr "ponowne skanowanie opcji" - -#: rhodecode/templates/admin/settings/settings.html:38 -msgid "In case a repository was deleted from filesystem and there are leftovers in the database check this option to scan obsolete data in database and remove it." -msgstr "" -"W przypadku repozytoriów zostaną usunięte systemy plików i jeśli są " -"pozostałości w bazie danych to ta opcja sprawdzi ją oraz przeskanuje, a " -"następnie usunie je z bazy danych." - -#: rhodecode/templates/admin/settings/settings.html:39 -msgid "destroy old data" -msgstr "zniszcz stare dane" - -#: rhodecode/templates/admin/settings/settings.html:41 -msgid "Rescan repositories location for new repositories. Also deletes obsolete if `destroy` flag is checked " -msgstr "Skanowanie ponowne lokalizacji dla nowych repozytoriów. Usuwa również nieaktualne jeśli została zaznaczona flaga `zniszcz` do sprawdzana" - -#: rhodecode/templates/admin/settings/settings.html:46 -msgid "Rescan repositories" -msgstr "Skanuj ponownie repozytoria" - -#: rhodecode/templates/admin/settings/settings.html:52 -msgid "Whoosh indexing" -msgstr "indeksowanie Whoosh" - -#: rhodecode/templates/admin/settings/settings.html:60 -msgid "index build option" -msgstr "opcja budowania indeksowania" - -#: rhodecode/templates/admin/settings/settings.html:65 -msgid "build from scratch" -msgstr "buduj od podstaw" - -#: rhodecode/templates/admin/settings/settings.html:71 -msgid "Reindex" -msgstr "Indeksuj ponownie" - -#: rhodecode/templates/admin/settings/settings.html:77 -msgid "Global application settings" -msgstr "Globalne ustawienia aplikacji" - -#: rhodecode/templates/admin/settings/settings.html:86 -msgid "Application name" -msgstr "Nazwa aplikacji" - -#: rhodecode/templates/admin/settings/settings.html:95 -msgid "Realm text" -msgstr "Realny tekst" - -#: rhodecode/templates/admin/settings/settings.html:104 -msgid "GA code" -msgstr "GA kod" - -#: rhodecode/templates/admin/settings/settings.html:112 -#: rhodecode/templates/admin/settings/settings.html:167 -#: rhodecode/templates/admin/settings/settings.html:257 -msgid "Save settings" -msgstr "Zapisz ustawienia" - -#: rhodecode/templates/admin/settings/settings.html:119 -msgid "Visualisation settings" -msgstr "Ustawienia wizualizacji" - -#: rhodecode/templates/admin/settings/settings.html:128 -msgid "Icons" -msgstr "Ikony" - -#: rhodecode/templates/admin/settings/settings.html:133 -msgid "Show public repo icon on repositories" -msgstr "Pokazuj w publicznym repo ikonę w repozytoriach" - -#: rhodecode/templates/admin/settings/settings.html:137 -msgid "Show private repo icon on repositories" -msgstr "Pokazuj w prywatnym repo ikonę w repozytoriach" - -#: rhodecode/templates/admin/settings/settings.html:144 -msgid "Meta-Tagging" -msgstr "Tagowanie meta" - -#: rhodecode/templates/admin/settings/settings.html:149 -msgid "Stylify recognised metatags:" -msgstr "Stylizacja rozpoznanych meta tagów:" - -#: rhodecode/templates/admin/settings/settings.html:176 -msgid "VCS settings" -msgstr "VCS ustawienia" - -#: rhodecode/templates/admin/settings/settings.html:185 -msgid "Web" -msgstr "www" - -#: rhodecode/templates/admin/settings/settings.html:190 -msgid "require ssl for vcs operations" -msgstr "wymagaj ssl dla operacji vcs" - -#: rhodecode/templates/admin/settings/settings.html:192 -msgid "RhodeCode will require SSL for pushing or pulling. If SSL is missing it will return HTTP Error 406: Not Acceptable" -msgstr "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:198 -msgid "Hooks" -msgstr "Aktualizacja" - -#: rhodecode/templates/admin/settings/settings.html:203 -msgid "Update repository after push (hg update)" -msgstr "Aktualizacja repozytorium po wysłaniu zmian (aktualizacja hg)" - -#: rhodecode/templates/admin/settings/settings.html:207 -msgid "Show repository size after push" -msgstr "Pokaż rozmiar repozytorium po wysłaniu zmian" - -#: rhodecode/templates/admin/settings/settings.html:211 -msgid "Log user push commands" -msgstr "Logi poleceń wysłania zmian użytkowników" - -#: rhodecode/templates/admin/settings/settings.html:215 -msgid "Log user pull commands" -msgstr "Logi poleceń połączenia gałęzi użytkowników" - -#: rhodecode/templates/admin/settings/settings.html:219 -msgid "advanced setup" -msgstr "zaawansowane ustawienia" - -#: rhodecode/templates/admin/settings/settings.html:224 -msgid "Mercurial Extensions" -msgstr "Rozszerzenia Mercurial" - -#: rhodecode/templates/admin/settings/settings.html:229 -msgid "largefiles extensions" -msgstr "rozszerzenia dużych pliów" - -#: rhodecode/templates/admin/settings/settings.html:233 -msgid "hgsubversion extensions" -msgstr "rozszerzenia hgsubversion" - -#: rhodecode/templates/admin/settings/settings.html:235 -msgid "Requires hgsubversion library installed. Allows clonning from svn remote locations" -msgstr "Wymaga biblioteki hgsubversion zainstalowanej. Umożliwia klonowanie z zdalnych lokalizacji svn" - -#: rhodecode/templates/admin/settings/settings.html:245 -msgid "Repositories location" -msgstr "Położenie repozytorium" - -#: rhodecode/templates/admin/settings/settings.html:250 -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 "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:251 -msgid "unlock" -msgstr "odblokowany" - -#: rhodecode/templates/admin/settings/settings.html:252 -msgid "Location where repositories are stored. After changing this value a restart, and rescan is required" -msgstr "Miejsce, w którym przechowywane są repozytoria. Po zmianie tej wartości jest wymagany restart i ponowne skanowanie" - -#: rhodecode/templates/admin/settings/settings.html:272 -msgid "Test Email" -msgstr "Test e-maila" - -#: rhodecode/templates/admin/settings/settings.html:280 -msgid "Email to" -msgstr "E-mail do" - -#: rhodecode/templates/admin/settings/settings.html:288 -msgid "Send" -msgstr "Wyślij" - -#: rhodecode/templates/admin/settings/settings.html:294 -msgid "System Info and Packages" -msgstr "Informacje Systemowe i pakiety" - -#: rhodecode/templates/admin/settings/settings.html:297 -msgid "show" -msgstr "pokaż" - -#: rhodecode/templates/admin/users/user_add.html:5 -msgid "Add user" -msgstr "Dodaj użytkownika" - -#: rhodecode/templates/admin/users/user_add.html:10 -#: rhodecode/templates/admin/users/user_edit.html:11 -msgid "Users" -msgstr "Użytkownicy" - -#: rhodecode/templates/admin/users/user_add.html:12 -msgid "add new user" -msgstr "dodaj nowego użytkownika" - -#: rhodecode/templates/admin/users/user_add.html:50 -msgid "Password confirmation" -msgstr "Potwierdzenie hasła" - -#: rhodecode/templates/admin/users/user_add.html:86 -#: rhodecode/templates/admin/users/user_edit.html:113 -#: rhodecode/templates/admin/users_groups/users_group_add.html:41 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:42 -msgid "Active" -msgstr "Aktywny" - -#: rhodecode/templates/admin/users/user_edit.html:5 -msgid "Edit user" -msgstr "Edytuj użytkownika" - -#: rhodecode/templates/admin/users/user_edit.html:34 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:10 -msgid "Change your avatar at" -msgstr "Zmiana awataru na" - -#: rhodecode/templates/admin/users/user_edit.html:35 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:11 -msgid "Using" -msgstr "Używa:" - -#: rhodecode/templates/admin/users/user_edit.html:43 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:20 -msgid "API key" -msgstr "Klucz API" - -#: rhodecode/templates/admin/users/user_edit.html:59 -msgid "LDAP DN" -msgstr "LDAP DN" - -#: rhodecode/templates/admin/users/user_edit.html:68 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:35 -msgid "New password" -msgstr "Nowe hasło" - -#: rhodecode/templates/admin/users/user_edit.html:77 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:44 -msgid "New password confirmation" -msgstr "Potwierdzenie nowego hasła" - -#: rhodecode/templates/admin/users/user_edit.html:147 -#: 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:152 -#: 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:158 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:119 -msgid "Create repositories" -msgstr "Utwórz repozytorium" - -#: rhodecode/templates/admin/users/user_edit.html:166 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:127 -msgid "Fork repositories" -msgstr "Rozwidlenie repozytorium" - -#: rhodecode/templates/admin/users/user_edit.html:186 -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22 -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39 -msgid "Nothing here yet" -msgstr "Nic tu nie ma jeszcze" - -#: rhodecode/templates/admin/users/user_edit.html:193 -#: rhodecode/templates/admin/users/user_edit_my_account.html:60 -#: rhodecode/templates/admin/users/user_edit_my_account.html:194 -msgid "Permission" -msgstr "Uprawnienia" - -#: rhodecode/templates/admin/users/user_edit.html:194 -msgid "Edit Permission" -msgstr "Edycja Uprawnień" - -#: rhodecode/templates/admin/users/user_edit.html:243 -msgid "Email addresses" -msgstr "Adresy e-mail" - -#: rhodecode/templates/admin/users/user_edit.html:256 -#, python-format -msgid "Confirm to delete this email: %s" -msgstr "Potwierdź, aby usunąć ten e-mail: %s" - -#: rhodecode/templates/admin/users/user_edit.html:270 -msgid "New email address" -msgstr "Nowy adres e-mail" - -#: rhodecode/templates/admin/users/user_edit.html:277 -msgid "Add" -msgstr "Dodaj" - -#: rhodecode/templates/admin/users/user_edit_my_account.html:5 -#: rhodecode/templates/base/base.html:124 -msgid "My account" -msgstr "Moje konto" - -#: rhodecode/templates/admin/users/user_edit_my_account.html:9 -msgid "My Account" -msgstr "Moje konto" - -#: rhodecode/templates/admin/users/user_edit_my_account.html:35 -msgid "My permissions" -msgstr "Moje uprawnienia" - -#: rhodecode/templates/admin/users/user_edit_my_account.html:38 -#: rhodecode/templates/journal/journal.html:41 -msgid "My repos" -msgstr "Moje repo" - -#: rhodecode/templates/admin/users/user_edit_my_account.html:41 -msgid "My pull requests" -msgstr "Moje prośby połączenia gałęzi" - -#: rhodecode/templates/admin/users/user_edit_my_account.html:45 -msgid "Add repo" -msgstr "Dodaj repo" - -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2 -msgid "Opened by me" -msgstr "Otwarty przez mnie" - -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:10 -#, python-format -msgid "Pull request #%s opened on %s" -msgstr "Wniosek połączenia gałęzi #%s otwarty %s" - -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15 -msgid "Confirm to delete this pull request" -msgstr "Potwierdź usunięcie połączenia gałęzi" - -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:26 -msgid "I participate in" -msgstr "Biorę udział w" - -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:33 -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:30 -#, python-format -msgid "Pull request #%s opened by %s on %s" -msgstr "Wniosek połączenia gałęzi #%s otwarty %s dnia %s" - -#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:7 -#: rhodecode/templates/bookmarks/bookmarks.html:40 -#: rhodecode/templates/bookmarks/bookmarks_data.html:9 -#: rhodecode/templates/branches/branches.html:55 -#: rhodecode/templates/journal/journal.html:60 -#: rhodecode/templates/tags/tags.html:40 -#: rhodecode/templates/tags/tags_data.html:9 -msgid "Revision" -msgstr "Rewizja" - -#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28 -#: rhodecode/templates/journal/journal.html:81 -msgid "private" -msgstr "prywatny" - -#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:31 -#: rhodecode/templates/data_table/_dt_elements.html:7 -#, python-format -msgid "Confirm to delete this repository: %s" -msgstr "Potwierdź usunięcie repozytorium: %s" - -#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:38 -#: rhodecode/templates/journal/journal.html:94 -msgid "No repositories yet" -msgstr "Nie ma jeszcze repozytoriów" - -#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:40 -#: rhodecode/templates/journal/journal.html:96 -msgid "create one now" -msgstr "utwórz je teraz" - -#: rhodecode/templates/admin/users/users.html:5 -msgid "Users administration" -msgstr "Administracja użytkownikami" - -#: rhodecode/templates/admin/users/users.html:9 -#: rhodecode/templates/base/base.html:223 -msgid "users" -msgstr "użytkownicy" - -#: rhodecode/templates/admin/users/users.html:23 -msgid "ADD NEW USER" -msgstr "DODAJ NOWEGO UŻYTKOWNIKA" - -#: rhodecode/templates/admin/users/users.html:77 -msgid "username" -msgstr "nazwa użytkownika" - -#: rhodecode/templates/admin/users/users.html:80 -msgid "firstname" -msgstr "imię" - -#: rhodecode/templates/admin/users/users.html:81 -msgid "lastname" -msgstr "nazwisko" - -#: rhodecode/templates/admin/users/users.html:82 -msgid "last login" -msgstr "ostatnio zalogowany" - -#: rhodecode/templates/admin/users/users.html:84 -#: rhodecode/templates/admin/users_groups/users_groups.html:34 -msgid "active" -msgstr "aktywny" - -#: rhodecode/templates/admin/users/users.html:86 -#: rhodecode/templates/base/base.html:226 -msgid "ldap" -msgstr "ldap" - -#: rhodecode/templates/admin/users_groups/users_group_add.html:5 -msgid "Add users group" -msgstr "Dodaj grupę użytkowników" - -#: rhodecode/templates/admin/users_groups/users_group_add.html:10 -#: rhodecode/templates/admin/users_groups/users_groups.html:9 -msgid "Users groups" -msgstr "Grupy użytkowników" - -#: rhodecode/templates/admin/users_groups/users_group_add.html:12 -msgid "add new users group" -msgstr "dodaj nową grupę użytkowników" - -#: rhodecode/templates/admin/users_groups/users_group_edit.html:5 -msgid "Edit users group" -msgstr "Edytuj grupę użytkowników" - -#: rhodecode/templates/admin/users_groups/users_group_edit.html:11 -msgid "UsersGroups" -msgstr "Grupy użytkowników" - -#: rhodecode/templates/admin/users_groups/users_group_edit.html:50 -msgid "Members" -msgstr "Użytkownik" - -#: rhodecode/templates/admin/users_groups/users_group_edit.html:58 -msgid "Choosen group members" -msgstr "Wybrane grupy użytkowników" - -#: rhodecode/templates/admin/users_groups/users_group_edit.html:61 -msgid "Remove all elements" -msgstr "Usuń wszystkie elementy" - -#: rhodecode/templates/admin/users_groups/users_group_edit.html:75 -msgid "Available members" -msgstr "Dostępni użytkownicy" - -#: rhodecode/templates/admin/users_groups/users_group_edit.html:79 -msgid "Add all elements" -msgstr "Dodaj wszystkie elementy" - -#: rhodecode/templates/admin/users_groups/users_group_edit.html:146 -msgid "Group members" -msgstr "Grupy użytkowników" - -#: rhodecode/templates/admin/users_groups/users_groups.html:5 -msgid "Users groups administration" -msgstr "Użytkownicy grupy administracji" - -#: rhodecode/templates/admin/users_groups/users_groups.html:23 -msgid "ADD NEW USER GROUP" -msgstr "DODAJ NOWĄ GRUPĘ UŻYTKOWNIKÓW" - -#: rhodecode/templates/admin/users_groups/users_groups.html:32 -msgid "group name" -msgstr "nazwa grupy" - -#: rhodecode/templates/admin/users_groups/users_groups.html:33 -#: rhodecode/templates/base/root.html:46 -msgid "members" -msgstr "użytkownik" - -#: rhodecode/templates/admin/users_groups/users_groups.html:45 -#, python-format -msgid "Confirm to delete this users group: %s" -msgstr "Potwierdź usunięcie grupy użytkowników: %s" - -#: rhodecode/templates/base/base.html:41 -msgid "Submit a bug" -msgstr "Prześlij błąd" - -#: rhodecode/templates/base/base.html:77 -msgid "Login to your account" -msgstr "Zaloguj się do swojego konta" - -#: rhodecode/templates/base/base.html:100 -msgid "Forgot password ?" -msgstr "Nie pamiętasz hasła?" - -#: rhodecode/templates/base/base.html:107 -msgid "Log In" -msgstr "Zaloguj się" - -#: rhodecode/templates/base/base.html:118 -msgid "Inbox" -msgstr "Odebrana poczta" - -#: rhodecode/templates/base/base.html:122 -#: rhodecode/templates/base/base.html:300 -#: rhodecode/templates/base/base.html:302 -#: rhodecode/templates/base/base.html:304 -#: rhodecode/templates/bookmarks/bookmarks.html:11 -#: rhodecode/templates/branches/branches.html:10 -#: rhodecode/templates/changelog/changelog.html:10 -#: rhodecode/templates/changeset/changeset.html:10 -#: rhodecode/templates/changeset/changeset_range.html:9 -#: rhodecode/templates/compare/compare_diff.html:9 -#: rhodecode/templates/files/file_diff.html:8 -#: rhodecode/templates/files/files.html:8 -#: rhodecode/templates/files/files_add.html:15 -#: rhodecode/templates/files/files_edit.html:15 -#: rhodecode/templates/followers/followers.html:9 -#: rhodecode/templates/forks/fork.html:9 -#: rhodecode/templates/forks/forks.html:9 -#: rhodecode/templates/pullrequests/pullrequest.html:8 -#: rhodecode/templates/pullrequests/pullrequest_show.html:8 -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 -#: rhodecode/templates/settings/repo_settings.html:9 -#: rhodecode/templates/shortlog/shortlog.html:10 -#: rhodecode/templates/summary/summary.html:8 -#: rhodecode/templates/tags/tags.html:11 -msgid "Home" -msgstr "Strona Główna" - -#: rhodecode/templates/base/base.html:123 -#: rhodecode/templates/base/base.html:309 -#: rhodecode/templates/base/base.html:311 -#: rhodecode/templates/base/base.html:313 -#: rhodecode/templates/journal/journal.html:4 -#: rhodecode/templates/journal/journal.html:21 -#: rhodecode/templates/journal/public_journal.html:4 -msgid "Journal" -msgstr "Dziennik" - -#: rhodecode/templates/base/base.html:125 -msgid "Log Out" -msgstr "Wyloguj się" - -#: rhodecode/templates/base/base.html:144 -msgid "Switch repository" -msgstr "Przełącz repozytorium" - -#: rhodecode/templates/base/base.html:146 -msgid "Products" -msgstr "Produkty" - -#: rhodecode/templates/base/base.html:152 -#: rhodecode/templates/base/base.html:182 -msgid "loading..." -msgstr "wczytywanie..." - -#: rhodecode/templates/base/base.html:158 -#: rhodecode/templates/base/base.html:160 -#: rhodecode/templates/base/base.html:162 -#: rhodecode/templates/data_table/_dt_elements.html:15 -#: rhodecode/templates/data_table/_dt_elements.html:17 -#: rhodecode/templates/data_table/_dt_elements.html:19 -msgid "Summary" -msgstr "Podsumowanie" - -#: rhodecode/templates/base/base.html:166 -#: rhodecode/templates/base/base.html:168 -#: rhodecode/templates/base/base.html:170 -#: rhodecode/templates/changelog/changelog.html:15 -#: rhodecode/templates/data_table/_dt_elements.html:23 -#: rhodecode/templates/data_table/_dt_elements.html:25 -#: rhodecode/templates/data_table/_dt_elements.html:27 -msgid "Changelog" -msgstr "Dziennik zmian" - -#: rhodecode/templates/base/base.html:175 -#: rhodecode/templates/base/base.html:177 -#: rhodecode/templates/base/base.html:179 -msgid "Switch to" -msgstr "Przełącz do" - -#: rhodecode/templates/base/base.html:186 -#: rhodecode/templates/base/base.html:188 -#: rhodecode/templates/base/base.html:190 -#: rhodecode/templates/data_table/_dt_elements.html:31 -#: rhodecode/templates/data_table/_dt_elements.html:33 -#: rhodecode/templates/data_table/_dt_elements.html:35 -msgid "Files" -msgstr "Pliki" - -#: rhodecode/templates/base/base.html:195 -#: rhodecode/templates/base/base.html:199 -msgid "Options" -msgstr "Opcje" - -#: rhodecode/templates/base/base.html:204 -#: rhodecode/templates/base/base.html:206 -#: rhodecode/templates/base/base.html:227 -msgid "settings" -msgstr "ustawienia" - -#: rhodecode/templates/base/base.html:209 -#: rhodecode/templates/data_table/_dt_elements.html:80 -#: rhodecode/templates/forks/fork.html:13 -msgid "fork" -msgstr "gałąż" - -#: rhodecode/templates/base/base.html:211 -#: rhodecode/templates/changelog/changelog.html:40 -msgid "Open new pull request" -msgstr "Otwórz nową prośbę o połączenie gałęzi" - -#: rhodecode/templates/base/base.html:213 -msgid "search" -msgstr "szukaj" - -#: rhodecode/templates/base/base.html:222 -msgid "repositories groups" -msgstr "grupy w repozytorium" - -#: rhodecode/templates/base/base.html:224 -msgid "users groups" -msgstr "grupy użytkowników" - -#: rhodecode/templates/base/base.html:225 -msgid "permissions" -msgstr "uprawnienia" - -#: rhodecode/templates/base/base.html:238 -#: rhodecode/templates/base/base.html:240 -msgid "Followers" -msgstr "Obserwowane" - -#: rhodecode/templates/base/base.html:246 -#: rhodecode/templates/base/base.html:248 -msgid "Forks" -msgstr "Gałęzie" - -#: rhodecode/templates/base/base.html:327 -#: rhodecode/templates/base/base.html:329 -#: rhodecode/templates/base/base.html:331 -#: rhodecode/templates/search/search.html:52 -msgid "Search" -msgstr "Szukaj" - -#: rhodecode/templates/base/root.html:42 -msgid "add another comment" -msgstr "dodaj kolejny komentarz" - -#: rhodecode/templates/base/root.html:43 -#: rhodecode/templates/journal/journal.html:120 -#: rhodecode/templates/summary/summary.html:57 -msgid "Stop following this repository" -msgstr "Zakończyć obserwację tego repozytorium" - -#: rhodecode/templates/base/root.html:44 -#: rhodecode/templates/summary/summary.html:61 -msgid "Start following this repository" -msgstr "Zacznij obserwację tego repozytorium" - -#: rhodecode/templates/base/root.html:45 -msgid "Group" -msgstr "Grupa" - -#: rhodecode/templates/base/root.html:47 -msgid "search truncated" -msgstr "wyszukaj obcięte" - -#: rhodecode/templates/base/root.html:48 -msgid "no matching files" -msgstr "nie ma plików pasujących" - -#: rhodecode/templates/bookmarks/bookmarks.html:5 -#, python-format -msgid "%s Bookmarks" -msgstr "%s Zakładki" - -#: rhodecode/templates/bookmarks/bookmarks.html:39 -#: rhodecode/templates/bookmarks/bookmarks_data.html:8 -#: rhodecode/templates/branches/branches.html:54 -#: rhodecode/templates/tags/tags.html:39 -#: rhodecode/templates/tags/tags_data.html:8 -msgid "Author" -msgstr "Autor" - -#: rhodecode/templates/branches/branches.html:5 -#, python-format -msgid "%s Branches" -msgstr "%s Gałęzie" - -#: rhodecode/templates/branches/branches.html:29 -msgid "Compare branches" -msgstr "porównaj gałęzie" - -#: rhodecode/templates/branches/branches.html:57 -#: rhodecode/templates/compare/compare_diff.html:5 -#: rhodecode/templates/compare/compare_diff.html:13 -msgid "Compare" -msgstr "Porównaj" - -#: rhodecode/templates/branches/branches_data.html:6 -msgid "name" -msgstr "nazwa" - -#: rhodecode/templates/branches/branches_data.html:7 -msgid "date" -msgstr "data" - -#: rhodecode/templates/branches/branches_data.html:8 -#: rhodecode/templates/shortlog/shortlog_data.html:8 -msgid "author" -msgstr "autor" - -#: rhodecode/templates/branches/branches_data.html:9 -#: rhodecode/templates/shortlog/shortlog_data.html:5 -msgid "revision" -msgstr "rewizja" - -#: rhodecode/templates/branches/branches_data.html:10 -msgid "compare" -msgstr "porównanie" - -#: rhodecode/templates/changelog/changelog.html:6 -#, python-format -msgid "%s Changelog" -msgstr "%s Dziennik zmian" - -#: rhodecode/templates/changelog/changelog.html:15 -#, python-format -msgid "showing %d out of %d revision" -msgid_plural "showing %d out of %d revisions" -msgstr[0] "pokazano %d z rewizji %d" -msgstr[1] "pokazano %d w rewizjach %d" -msgstr[2] "pokazano %d w rewizjach %d" - -#: rhodecode/templates/changelog/changelog.html:37 -#: rhodecode/templates/forks/forks_data.html:19 -#, python-format -msgid "compare fork with %s" -msgstr "porównaj gałęzie %s" - -#: rhodecode/templates/changelog/changelog.html:37 -#: rhodecode/templates/forks/forks_data.html:21 -msgid "Compare fork" -msgstr "Porównaj rozwidlenie" - -#: rhodecode/templates/changelog/changelog.html:46 -msgid "Show" -msgstr "Wyświetl" - -#: rhodecode/templates/changelog/changelog.html:72 -#: rhodecode/templates/summary/summary.html:364 -msgid "show more" -msgstr "pokaż więcej" - -#: rhodecode/templates/changelog/changelog.html:76 -msgid "Affected number of files, click to show more details" -msgstr "Dotyczy liczby plików, kliknij, aby zobaczyć więcej szczegółów" - -#: rhodecode/templates/changelog/changelog.html:89 -#: rhodecode/templates/changeset/changeset.html:38 -#: rhodecode/templates/changeset/changeset_file_comment.html:20 -#: rhodecode/templates/changeset/changeset_range.html:46 -msgid "Changeset status" -msgstr "Status grupy zmian" - -#: rhodecode/templates/changelog/changelog.html:92 -msgid "Click to open associated pull request" -msgstr "Kliknij żeby otworzyć prośbę o połączenie gałęzi" - -#: rhodecode/templates/changelog/changelog.html:102 -#: rhodecode/templates/changeset/changeset.html:78 -msgid "Parent" -msgstr "Rewizja" - -#: rhodecode/templates/changelog/changelog.html:108 -#: rhodecode/templates/changeset/changeset.html:84 -msgid "No parents" -msgstr "Brak rewizji" - -#: rhodecode/templates/changelog/changelog.html:113 -#: rhodecode/templates/changeset/changeset.html:88 -msgid "merge" -msgstr "połącz" - -#: rhodecode/templates/changelog/changelog.html:116 -#: rhodecode/templates/changeset/changeset.html:91 -#: rhodecode/templates/files/files.html:29 -#: rhodecode/templates/files/files_add.html:33 -#: rhodecode/templates/files/files_edit.html:33 -#: rhodecode/templates/shortlog/shortlog_data.html:9 -msgid "branch" -msgstr "gałąź" - -#: rhodecode/templates/changelog/changelog.html:122 -msgid "bookmark" -msgstr "zakładka" - -#: rhodecode/templates/changelog/changelog.html:128 -#: rhodecode/templates/changeset/changeset.html:96 -msgid "tag" -msgstr "etykieta" - -#: rhodecode/templates/changelog/changelog.html:164 -msgid "Show selected changes __S -> __E" -msgstr "Pokaż wybrane zmiany __S -> __E" - -#: rhodecode/templates/changelog/changelog.html:255 -msgid "There are no changes yet" -msgstr "Nie ma jeszcze zmian" - -#: rhodecode/templates/changelog/changelog_details.html:4 -#: rhodecode/templates/changeset/changeset.html:66 -msgid "removed" -msgstr "usunięto" - -#: rhodecode/templates/changelog/changelog_details.html:5 -#: rhodecode/templates/changeset/changeset.html:67 -msgid "changed" -msgstr "zmiana" - -#: rhodecode/templates/changelog/changelog_details.html:6 -#: rhodecode/templates/changeset/changeset.html:68 -msgid "added" -msgstr "dodana" - -#: rhodecode/templates/changelog/changelog_details.html:8 -#: rhodecode/templates/changelog/changelog_details.html:9 -#: rhodecode/templates/changelog/changelog_details.html:10 -#: rhodecode/templates/changeset/changeset.html:70 -#: rhodecode/templates/changeset/changeset.html:71 -#: rhodecode/templates/changeset/changeset.html:72 -#, python-format -msgid "affected %s files" -msgstr "zarażone pliki %s" - -#: rhodecode/templates/changeset/changeset.html:6 -#, python-format -msgid "%s Changeset" -msgstr "%s Grupy zmian" - -#: rhodecode/templates/changeset/changeset.html:14 -msgid "Changeset" -msgstr "Grupy zmian" - -#: rhodecode/templates/changeset/changeset.html:43 -#: rhodecode/templates/changeset/diff_block.html:20 -msgid "raw diff" -msgstr "raw różnic" - -#: rhodecode/templates/changeset/changeset.html:44 -#: rhodecode/templates/changeset/diff_block.html:21 -msgid "download diff" -msgstr "pobierz różnice" - -#: rhodecode/templates/changeset/changeset.html:48 -#: rhodecode/templates/changeset/changeset_file_comment.html:82 -#, python-format -msgid "%d comment" -msgid_plural "%d comments" -msgstr[0] "%d komentarz" -msgstr[1] "%d komentarzy" -msgstr[2] "%d komentarzy" - -#: rhodecode/templates/changeset/changeset.html:48 -#: rhodecode/templates/changeset/changeset_file_comment.html:82 -#, python-format -msgid "(%d inline)" -msgid_plural "(%d inline)" -msgstr[0] "(%d linii)" -msgstr[1] "(%d linii)" -msgstr[2] "(%d linii)" - -#: rhodecode/templates/changeset/changeset.html:103 -#, python-format -msgid "%s files affected with %s insertions and %s deletions:" -msgstr "%s plików rejestru do %s inercji i %s delecji:" - -#: rhodecode/templates/changeset/changeset.html:119 -msgid "Changeset was too big and was cut off..." -msgstr "Lista zmian była zbyt duża i została ucięta..." - -#: rhodecode/templates/changeset/changeset_file_comment.html:42 -msgid "Submitting..." -msgstr "Przesyłanie..." - -#: rhodecode/templates/changeset/changeset_file_comment.html:45 -msgid "Commenting on line {1}." -msgstr "Komentując linię {1}." - -#: rhodecode/templates/changeset/changeset_file_comment.html:46 -#: rhodecode/templates/changeset/changeset_file_comment.html:121 -#, 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:48 -#: rhodecode/templates/changeset/changeset_file_comment.html:123 -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:59 -#: rhodecode/templates/changeset/changeset_file_comment.html:138 -msgid "Comment" -msgstr "Komentarz" - -#: rhodecode/templates/changeset/changeset_file_comment.html:60 -#: rhodecode/templates/changeset/changeset_file_comment.html:71 -msgid "Hide" -msgstr "Ukryj" - -#: rhodecode/templates/changeset/changeset_file_comment.html:67 -msgid "You need to be logged in to comment." -msgstr "Musisz być zalogowany żeby komentarz." - -#: rhodecode/templates/changeset/changeset_file_comment.html:67 -msgid "Login now" -msgstr "Zaloguj się teraz" - -#: rhodecode/templates/changeset/changeset_file_comment.html:118 -msgid "Leave a comment" -msgstr "Napisz komentarz" - -#: rhodecode/templates/changeset/changeset_file_comment.html:124 -msgid "Check this to change current status of code-review for this changeset" -msgstr "Zaznacz to, aby zmienić bieżący stan code przeglądu tego zestawienia zmian" - -#: rhodecode/templates/changeset/changeset_file_comment.html:124 -msgid "change status" -msgstr "zmień status" - -#: rhodecode/templates/changeset/changeset_file_comment.html:140 -msgid "Comment and close" -msgstr "Skomentuj i zamknij" - -#: rhodecode/templates/changeset/changeset_range.html:5 -#, python-format -msgid "%s Changesets" -msgstr "%s Zestawienie zmian" - -#: rhodecode/templates/changeset/changeset_range.html:29 -#: rhodecode/templates/compare/compare_diff.html:29 -msgid "Compare View" -msgstr "Wyświetl Porównanie" - -#: rhodecode/templates/changeset/changeset_range.html:54 -#: rhodecode/templates/compare/compare_diff.html:41 -#: rhodecode/templates/pullrequests/pullrequest_show.html:69 -msgid "Files affected" -msgstr "pliki naruszone" - -#: rhodecode/templates/changeset/diff_block.html:19 -msgid "diff" -msgstr "różnica" - -#: rhodecode/templates/changeset/diff_block.html:27 -msgid "show inline comments" -msgstr "pokaż online komentarz" - -#: rhodecode/templates/compare/compare_cs.html:5 -msgid "No changesets" -msgstr "Brak zestawienia zmian" - -#: rhodecode/templates/compare/compare_diff.html:37 -msgid "Outgoing changesets" -msgstr "Wychodzące zestawienie zmian" - -#: rhodecode/templates/data_table/_dt_elements.html:39 -#: rhodecode/templates/data_table/_dt_elements.html:41 -#: rhodecode/templates/data_table/_dt_elements.html:43 -msgid "Fork" -msgstr "Gałąź" - -#: rhodecode/templates/data_table/_dt_elements.html:60 -#: rhodecode/templates/journal/journal.html:126 -#: rhodecode/templates/summary/summary.html:68 -msgid "Mercurial repository" -msgstr "Repozytorium mercurial" - -#: rhodecode/templates/data_table/_dt_elements.html:62 -#: rhodecode/templates/journal/journal.html:128 -#: rhodecode/templates/summary/summary.html:71 -msgid "Git repository" -msgstr "Repozytorium git" - -#: rhodecode/templates/data_table/_dt_elements.html:69 -#: rhodecode/templates/journal/journal.html:134 -#: rhodecode/templates/summary/summary.html:78 -msgid "public repository" -msgstr "Publiczne repozytorium" - -#: rhodecode/templates/data_table/_dt_elements.html:80 -#: rhodecode/templates/summary/summary.html:87 -#: rhodecode/templates/summary/summary.html:88 -msgid "Fork of" -msgstr "Gałąź z" - -#: rhodecode/templates/data_table/_dt_elements.html:92 -msgid "No changesets yet" -msgstr "Nie ma jeszcze zestawienia zmian" - -#: rhodecode/templates/data_table/_dt_elements.html:104 -#, python-format -msgid "Confirm to delete this user: %s" -msgstr "Potwierdź usunięcie tego użytkownika: %s" - -#: rhodecode/templates/email_templates/main.html:8 -msgid "This is an notification from RhodeCode." -msgstr "To jest powiadomienie z strony" - -#: rhodecode/templates/errors/error_document.html:46 -#, python-format -msgid "You will be redirected to %s in %s seconds" -msgstr "Zostaniesz przekierowany do %s za %s sekund" - -#: rhodecode/templates/files/file_diff.html:4 -#, python-format -msgid "%s File diff" -msgstr "%s Pliki różnic" - -#: rhodecode/templates/files/file_diff.html:12 -msgid "File diff" -msgstr "Pliki różnic" - -#: rhodecode/templates/files/files.html:4 -#: rhodecode/templates/files/files.html:72 -#, python-format -msgid "%s files" -msgstr "Pliki %s" - -#: rhodecode/templates/files/files.html:12 -#: rhodecode/templates/summary/summary.html:340 -msgid "files" -msgstr "pliki" - -#: rhodecode/templates/files/files_add.html:4 -#: rhodecode/templates/files/files_edit.html:4 -#, python-format -msgid "%s Edit file" -msgstr "Edytuj plik %s" - -#: rhodecode/templates/files/files_add.html:19 -msgid "add file" -msgstr "dodaj plik" - -#: rhodecode/templates/files/files_add.html:40 -msgid "Add new file" -msgstr "Dodaj nowy plik" - -#: rhodecode/templates/files/files_add.html:45 -msgid "File Name" -msgstr "Nazwa Pliku" - -#: rhodecode/templates/files/files_add.html:49 -#: rhodecode/templates/files/files_add.html:58 -msgid "or" -msgstr "lub" - -#: rhodecode/templates/files/files_add.html:49 -#: rhodecode/templates/files/files_add.html:54 -msgid "Upload file" -msgstr "Dodaj plik" - -#: rhodecode/templates/files/files_add.html:58 -msgid "Create new file" -msgstr "Utwórz nowy plik" - -#: rhodecode/templates/files/files_add.html:63 -#: rhodecode/templates/files/files_edit.html:39 -#: rhodecode/templates/files/files_ypjax.html:3 -msgid "Location" -msgstr "Położenie" - -#: rhodecode/templates/files/files_add.html:67 -msgid "use / to separate directories" -msgstr "Użyj / do oddzielenia katalogów" - -#: rhodecode/templates/files/files_add.html:77 -#: rhodecode/templates/files/files_edit.html:63 -#: rhodecode/templates/shortlog/shortlog_data.html:6 -msgid "commit message" -msgstr "komentarz" - -#: rhodecode/templates/files/files_add.html:81 -#: rhodecode/templates/files/files_edit.html:67 -msgid "Commit changes" -msgstr "Zatwierdź zmiany" - -#: rhodecode/templates/files/files_browser.html:13 -msgid "view" -msgstr "widok" - -#: rhodecode/templates/files/files_browser.html:14 -msgid "previous revision" -msgstr "poprzednia wersja" - -#: rhodecode/templates/files/files_browser.html:16 -msgid "next revision" -msgstr "następna wersja" - -#: rhodecode/templates/files/files_browser.html:23 -msgid "follow current branch" -msgstr "śledź mierzącą gałąź" - -#: rhodecode/templates/files/files_browser.html:27 -msgid "search file list" -msgstr "lista szukanych plików" - -#: rhodecode/templates/files/files_browser.html:31 -#: rhodecode/templates/shortlog/shortlog_data.html:65 -msgid "add new file" -msgstr "dodaj nowy plik" - -#: rhodecode/templates/files/files_browser.html:35 -msgid "Loading file list..." -msgstr "Wczytywanie listy plików..." - -#: rhodecode/templates/files/files_browser.html:48 -msgid "Size" -msgstr "Rozmiar" - -#: rhodecode/templates/files/files_browser.html:49 -msgid "Mimetype" -msgstr "Typ MIME" - -#: rhodecode/templates/files/files_browser.html:50 -msgid "Last Revision" -msgstr "Rewizja" - -#: rhodecode/templates/files/files_browser.html:51 -msgid "Last modified" -msgstr "Ostatnio modyfikowany" - -#: rhodecode/templates/files/files_browser.html:52 -msgid "Last commiter" -msgstr "Autor" - -#: rhodecode/templates/files/files_edit.html:19 -msgid "edit file" -msgstr "edytuj plik" - -#: rhodecode/templates/files/files_edit.html:49 -#: rhodecode/templates/files/files_source.html:38 -msgid "show annotation" -msgstr "pokaż adnotacje" - -#: rhodecode/templates/files/files_edit.html:50 -#: rhodecode/templates/files/files_source.html:40 -#: rhodecode/templates/files/files_source.html:68 -msgid "show as raw" -msgstr "wyświetl jako raw" - -#: rhodecode/templates/files/files_edit.html:51 -#: rhodecode/templates/files/files_source.html:41 -msgid "download as raw" -msgstr "Pobierz jako raw" - -#: rhodecode/templates/files/files_edit.html:54 -msgid "source" -msgstr "źródło" - -#: rhodecode/templates/files/files_edit.html:59 -msgid "Editing file" -msgstr "Edycja pliku" - -#: rhodecode/templates/files/files_source.html:2 -msgid "History" -msgstr "Historia" - -#: rhodecode/templates/files/files_source.html:9 -msgid "diff to revision" -msgstr "różnice do rewizji" - -#: rhodecode/templates/files/files_source.html:10 -msgid "show at revision" -msgstr "wskaż zmiany" - -#: rhodecode/templates/files/files_source.html:14 -#, python-format -msgid "%s author" -msgid_plural "%s authors" -msgstr[0] "%s autor" -msgstr[1] "%s autorzy" -msgstr[2] "%s autorzy" - -#: rhodecode/templates/files/files_source.html:36 -msgid "show source" -msgstr "pokaż źródło" - -#: rhodecode/templates/files/files_source.html:59 -#, python-format -msgid "Binary file (%s)" -msgstr "Plik binarny (%s)" - -#: rhodecode/templates/files/files_source.html:68 -msgid "File is too big to display" -msgstr "Plik jest za duży do wyświetlenia" - -#: rhodecode/templates/files/files_source.html:124 -msgid "Selection link" -msgstr "Wybór linku" - -#: rhodecode/templates/files/files_ypjax.html:5 -msgid "annotation" -msgstr "adnotacja" - -#: rhodecode/templates/files/files_ypjax.html:15 -msgid "Go back" -msgstr "Idź wstecz" - -#: rhodecode/templates/files/files_ypjax.html:16 -msgid "No files at given path" -msgstr "Brak plików w danej ścieżce" - -#: rhodecode/templates/followers/followers.html:5 -#, python-format -msgid "%s Followers" -msgstr "Obserwatorzy %s" - -#: rhodecode/templates/followers/followers.html:13 -msgid "followers" -msgstr "obserwatorzy" - -#: rhodecode/templates/followers/followers_data.html:12 -msgid "Started following -" -msgstr "Rozpoczęto obserwację -" - -#: rhodecode/templates/forks/fork.html:5 -#, python-format -msgid "%s Fork" -msgstr "Gałęzi %s" - -#: rhodecode/templates/forks/fork.html:31 -msgid "Fork name" -msgstr "Nazwa rozgałęzienia" - -#: rhodecode/templates/forks/fork.html:68 -msgid "Private" -msgstr "Prywatny" - -#: rhodecode/templates/forks/fork.html:77 -msgid "Copy permissions" -msgstr "Skopiuj uprawnienia" - -#: rhodecode/templates/forks/fork.html:81 -msgid "Copy permissions from forked repository" -msgstr "Skopiuj zezwolenia z rozwidlenia repozytorium" - -#: rhodecode/templates/forks/fork.html:86 -msgid "Update after clone" -msgstr "Aktualizuj po klonowaniu" - -#: rhodecode/templates/forks/fork.html:90 -msgid "Checkout source after making a clone" -msgstr "Sprawdź źródło po wykonaniu klonowania" - -#: rhodecode/templates/forks/fork.html:94 -msgid "fork this repository" -msgstr "gałąź tego repozytorium" - -#: rhodecode/templates/forks/forks.html:5 -#, python-format -msgid "%s Forks" -msgstr "Gałęzi %s" - -#: rhodecode/templates/forks/forks.html:13 -msgid "forks" -msgstr "gałąź" - -#: rhodecode/templates/forks/forks_data.html:17 -msgid "forked" -msgstr "rozgałęziony" - -#: rhodecode/templates/forks/forks_data.html:38 -msgid "There are no forks yet" -msgstr "Nie ma jeszcze gałęzi" - -#: rhodecode/templates/journal/journal.html:13 -msgid "ATOM journal feed" -msgstr "Dziennik kanału ATOM" - -#: rhodecode/templates/journal/journal.html:14 -msgid "RSS journal feed" -msgstr "Dziennik kanału RSS" - -#: rhodecode/templates/journal/journal.html:24 -#: rhodecode/templates/pullrequests/pullrequest.html:27 -msgid "Refresh" -msgstr "Odśwież" - -#: rhodecode/templates/journal/journal.html:27 -#: rhodecode/templates/journal/public_journal.html:24 -msgid "RSS feed" -msgstr "Kanał RSS" - -#: rhodecode/templates/journal/journal.html:30 -#: rhodecode/templates/journal/public_journal.html:27 -msgid "ATOM feed" -msgstr "Kanał ATOM" - -#: rhodecode/templates/journal/journal.html:41 -msgid "Watched" -msgstr "Obserwowane" - -#: rhodecode/templates/journal/journal.html:46 -msgid "ADD" -msgstr "DODAJ" - -#: rhodecode/templates/journal/journal.html:114 -msgid "following user" -msgstr "następujący użytkownik" - -#: rhodecode/templates/journal/journal.html:114 -msgid "user" -msgstr "użytkownik" - -#: rhodecode/templates/journal/journal.html:147 -msgid "You are not following any users or repositories" -msgstr "Nie obserwujesz żadnych użytkowników lub repozytoriów" - -#: rhodecode/templates/journal/journal_data.html:47 -msgid "No entries yet" -msgstr "Brak wpisów jeszcze" - -#: rhodecode/templates/journal/public_journal.html:13 -msgid "ATOM public journal feed" -msgstr "Publiczny dziennik kanału ATOM" - -#: rhodecode/templates/journal/public_journal.html:14 -msgid "RSS public journal feed" -msgstr "Publiczny dziennik kanału RSS" - -#: rhodecode/templates/journal/public_journal.html:21 -msgid "Public Journal" -msgstr "Dziennik Publiczny" - -#: rhodecode/templates/pullrequests/pullrequest.html:4 -#: rhodecode/templates/pullrequests/pullrequest.html:12 -msgid "New pull request" -msgstr "Nowa prośba o połączenie gałęzi" - -#: rhodecode/templates/pullrequests/pullrequest.html:28 -msgid "refresh overview" -msgstr "odśwież informacje" - -#: rhodecode/templates/pullrequests/pullrequest.html:66 -msgid "Detailed compare view" -msgstr "Szczegółowe porównanie widoku" - -#: rhodecode/templates/pullrequests/pullrequest.html:70 -#: rhodecode/templates/pullrequests/pullrequest_show.html:82 -msgid "Pull request reviewers" -msgstr "Recenzje wniosków połączenia gałęzi" - -#: rhodecode/templates/pullrequests/pullrequest.html:79 -#: rhodecode/templates/pullrequests/pullrequest_show.html:94 -msgid "owner" -msgstr "właściciel" - -#: rhodecode/templates/pullrequests/pullrequest.html:91 -#: rhodecode/templates/pullrequests/pullrequest_show.html:109 -msgid "Add reviewer to this pull request." -msgstr "Pokarz wszystkie zmiany" - -#: rhodecode/templates/pullrequests/pullrequest.html:97 -msgid "Create new pull request" -msgstr "Stwórz nowe żądanie połączenia gałęzi" - -#: rhodecode/templates/pullrequests/pullrequest.html:106 -#: rhodecode/templates/pullrequests/pullrequest_show.html:25 -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:33 -msgid "Title" -msgstr "Tytuł" - -#: rhodecode/templates/pullrequests/pullrequest.html:115 -msgid "description" -msgstr "opis" - -#: rhodecode/templates/pullrequests/pullrequest.html:123 -msgid "Send pull request" -msgstr "Wyślij prośbę o połączenie gałęzi" - -#: rhodecode/templates/pullrequests/pullrequest_show.html:23 -#, python-format -msgid "Closed %s" -msgstr "Zamknięty %s" - -#: rhodecode/templates/pullrequests/pullrequest_show.html:31 -msgid "Status" -msgstr "Status" - -#: rhodecode/templates/pullrequests/pullrequest_show.html:36 -msgid "Pull request status" -msgstr "Żądanie statusu połączenia gałęzi" - -#: rhodecode/templates/pullrequests/pullrequest_show.html:44 -msgid "Still not reviewed by" -msgstr "Nie ma jeszcze recenzenta" - -#: rhodecode/templates/pullrequests/pullrequest_show.html:47 -#, python-format -msgid "%d reviewer" -msgid_plural "%d reviewers" -msgstr[0] "%d recenzent" -msgstr[1] "%d recenzenci" -msgstr[2] "%d recenzentów" - -#: rhodecode/templates/pullrequests/pullrequest_show.html:54 -msgid "Created on" -msgstr "Utworzono" - -#: rhodecode/templates/pullrequests/pullrequest_show.html:61 -msgid "Compare view" -msgstr "Wyświetl porównanie" - -#: rhodecode/templates/pullrequests/pullrequest_show.html:65 -msgid "Incoming changesets" -msgstr "Przychodzące zestawienie zmian" - -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 -msgid "all pull requests" -msgstr "wszystkie prośby połączenia gałęzi" - -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:12 -msgid "All pull requests" -msgstr "Wszystkie prośby połączenia gałęzi" - -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:27 -msgid "Closed" -msgstr "Zamknięte" - -#: rhodecode/templates/search/search.html:6 -#, python-format -msgid "Search \"%s\" in repository: %s" -msgstr "Wyszukiwanie \"%s\" w repozytorium: %s" - -#: rhodecode/templates/search/search.html:8 -#, python-format -msgid "Search \"%s\" in all repositories" -msgstr "Wyszukiwanie \"%s\" w wszystkich repozytoriach" - -#: rhodecode/templates/search/search.html:12 -#: rhodecode/templates/search/search.html:32 -#, python-format -msgid "Search in repository: %s" -msgstr "Szukaj w repozytorium: %s" - -#: rhodecode/templates/search/search.html:14 -#: rhodecode/templates/search/search.html:34 -msgid "Search in all repositories" -msgstr "Szukaj we wszystkich repozytoriach" - -#: rhodecode/templates/search/search.html:48 -msgid "Search term" -msgstr "Szukana fraza" - -#: rhodecode/templates/search/search.html:60 -msgid "Search in" -msgstr "Szukaj w" - -#: rhodecode/templates/search/search.html:63 -msgid "File contents" -msgstr "Zawartość pliku" - -#: rhodecode/templates/search/search.html:64 -msgid "Commit messages" -msgstr "Komunikaty" - -#: rhodecode/templates/search/search.html:65 -msgid "File names" -msgstr "Nazwy plików" - -#: rhodecode/templates/search/search_commit.html:35 -#: rhodecode/templates/search/search_content.html:21 -#: rhodecode/templates/search/search_path.html:15 -msgid "Permission denied" -msgstr "Brak uprawnień" - -#: rhodecode/templates/settings/repo_settings.html:5 -#, python-format -msgid "%s Settings" -msgstr "Ustawienia %s" - -#: rhodecode/templates/shortlog/shortlog.html:5 -#, python-format -msgid "%s Shortlog" -msgstr "%s Lista zmian" - -#: rhodecode/templates/shortlog/shortlog.html:14 -msgid "shortlog" -msgstr "lista zmian" - -#: rhodecode/templates/shortlog/shortlog_data.html:7 -msgid "age" -msgstr "ostatnia zmiana" - -#: rhodecode/templates/shortlog/shortlog_data.html:18 -msgid "No commit message" -msgstr "Brak komunikatów" - -#: rhodecode/templates/shortlog/shortlog_data.html:62 -msgid "Add or upload files directly via RhodeCode" -msgstr "Dodaj lub prześlij pliki bezpośrednio przez stronę" - -#: rhodecode/templates/shortlog/shortlog_data.html:71 -msgid "Push new repo" -msgstr "Wyślij zmiany do nowego repo" - -#: rhodecode/templates/shortlog/shortlog_data.html:79 -msgid "Existing repository?" -msgstr "Istniejące repozytorium?" - -#: rhodecode/templates/summary/summary.html:4 -#, python-format -msgid "%s Summary" -msgstr "Podsumowanie %s" - -#: rhodecode/templates/summary/summary.html:12 -msgid "summary" -msgstr "Podsumowanie" - -#: rhodecode/templates/summary/summary.html:20 -#, python-format -msgid "repo %s ATOM feed" -msgstr "repo %s kanał ATOM" - -#: rhodecode/templates/summary/summary.html:21 -#, python-format -msgid "repo %s RSS feed" -msgstr "repo %s kanał RSS" - -#: rhodecode/templates/summary/summary.html:49 -#: rhodecode/templates/summary/summary.html:52 -msgid "ATOM" -msgstr "ATOM" - -#: rhodecode/templates/summary/summary.html:82 -#, python-format -msgid "Non changable ID %s" -msgstr "Brak ID pełnej zmiany %s" - -#: rhodecode/templates/summary/summary.html:87 -msgid "public" -msgstr "publiczny" - -#: rhodecode/templates/summary/summary.html:95 -msgid "remote clone" -msgstr "zdalne klonowanie" - -#: rhodecode/templates/summary/summary.html:116 -msgid "Contact" -msgstr "Kontakt" - -#: rhodecode/templates/summary/summary.html:130 -msgid "Clone url" -msgstr "Url klonowania" - -#: rhodecode/templates/summary/summary.html:133 -msgid "Show by Name" -msgstr "Pokaż nazwę" - -#: rhodecode/templates/summary/summary.html:134 -msgid "Show by ID" -msgstr "Pokaż ID" - -#: rhodecode/templates/summary/summary.html:142 -msgid "Trending files" -msgstr "Statystyki" - -#: rhodecode/templates/summary/summary.html:150 -#: rhodecode/templates/summary/summary.html:166 -#: rhodecode/templates/summary/summary.html:194 -msgid "enable" -msgstr "włącz" - -#: rhodecode/templates/summary/summary.html:158 -msgid "Download" -msgstr "Pobierz" - -#: rhodecode/templates/summary/summary.html:162 -msgid "There are no downloads yet" -msgstr "Nie pobrano jeszcze plików" - -#: rhodecode/templates/summary/summary.html:164 -msgid "Downloads are disabled for this repository" -msgstr "Pliki do pobrania są zostały wyłączone dla tego repozytorium" - -#: rhodecode/templates/summary/summary.html:170 -msgid "Download as zip" -msgstr "Pobierz jako zip" - -#: rhodecode/templates/summary/summary.html:173 -msgid "Check this to download archive with subrepos" -msgstr "Zaznacz tu żeby pobrać archiwum z subrepozytorium" - -#: rhodecode/templates/summary/summary.html:173 -msgid "with subrepos" -msgstr "z subrepozytorium" - -#: rhodecode/templates/summary/summary.html:186 -msgid "Commit activity by day / author" -msgstr "komunikaty aktywne w ciągu dnia / autor" - -#: rhodecode/templates/summary/summary.html:197 -msgid "Stats gathered: " -msgstr "Statystyki zebrane: " - -#: rhodecode/templates/summary/summary.html:218 -msgid "Shortlog" -msgstr "Lista zmian" - -#: rhodecode/templates/summary/summary.html:220 -msgid "Quick start" -msgstr "Szybki start" - -#: rhodecode/templates/summary/summary.html:233 -#, python-format -msgid "Readme file at revision '%s'" -msgstr "Plik readme w rewizji '%s'" - -#: rhodecode/templates/summary/summary.html:236 -msgid "Permalink to this readme" -msgstr "Link do tego readme" - -#: rhodecode/templates/summary/summary.html:293 -#, python-format -msgid "Download %s as %s" -msgstr "Pobierz %s jak %s" - -#: rhodecode/templates/summary/summary.html:650 -msgid "commits" -msgstr "komunikaty" - -#: rhodecode/templates/summary/summary.html:651 -msgid "files added" -msgstr "pliki dodane" - -#: rhodecode/templates/summary/summary.html:652 -msgid "files changed" -msgstr "pliki zmienione" - -#: rhodecode/templates/summary/summary.html:653 -msgid "files removed" -msgstr "pliki usunięte" - -#: rhodecode/templates/summary/summary.html:656 -msgid "commit" -msgstr "komunikaty" - -#: rhodecode/templates/summary/summary.html:657 -msgid "file added" -msgstr "plik dodany" - -#: rhodecode/templates/summary/summary.html:658 -msgid "file changed" -msgstr "plik zmieniony" - -#: rhodecode/templates/summary/summary.html:659 -msgid "file removed" -msgstr "plik usunięty" - -#: rhodecode/templates/tags/tags.html:5 -#, python-format -msgid "%s Tags" -msgstr "Etykiety pliku %s" - -msgid "repository settings" -msgstr "ustawienia repozytorium" - -#, python-format -msgid "Status change -> %s" -msgstr "Zmiana statusu -> %s" - -msgid "unlocked" -msgstr "Odblokowany" - -msgid "locked" -msgstr "zablokowany" - -#, python-format -msgid "Repository has been %s" -msgstr "Repozytoriów jest %s" - -#, python-format -msgid "Deleted branch: %s" -msgstr "Usunięta gałąź: %s" - -#, python-format -msgid "Created tag: %s" -msgstr "Utworzony tag: %s" - -#, python-format -msgid "fork name %s" -msgstr "nazwa rozgałęzienia %s" - -#, python-format -msgid "in %s" -msgstr "w %s" - -#, python-format -msgid "in %s and %s" -msgstr "w %s i %s" - -#, python-format -msgid "commented on commit at %(when)s" -msgstr "skomentował zatwierdzenie %(when)s" - -#, python-format -msgid "sent message at %(when)s" -msgstr "wysłano wiadomość do %(when)s" - -#, python-format -msgid "mentioned you at %(when)s" -msgstr "wspomniał o Tobie w %(when)s" - -#, python-format -msgid "registered in RhodeCode at %(when)s" -msgstr "zarejestrowany na stronie w %(when)s" - -#, python-format -msgid "opened new pull request at %(when)s" -msgstr "otworzył nowe połączenie gałęzi w %(when)s" - -#, python-format -msgid "commented on pull request at %(when)s" -msgstr "skomentował nowe połączenie gałęzi w %(when)s" - -msgid "You don't have permissions to create repository in this group" -msgstr "Nie masz uprawnień do tworzenia repozytorium w tej grupie" - -msgid "Manually invalidate cache for this repository. On first access repository will be cached again" -msgstr "Ręcznie unieważnienie cache dla tego repozytorium. Przy pierwszym dostępie do repozytorium zostanie dodany do bufora ponownie" - -msgid "List of cached values" -msgstr "Lista buforowanych wartości" - -msgid "Use lightweight dashboard" -msgstr "Użyj lekkiego pulpitu" - -msgid "No members yet" -msgstr "Nie ma jeszcze żadnego użytkownika" - -msgid "Permissions defined for this group" -msgstr "Uprawnienia określone dla tej grupy" - -msgid "No permissions set yet" -msgstr "Nie ma jeszcze ustawionych uprawnień" - -msgid "lock" -msgstr "zablokowane" - -msgid "Open new pull request for selected changesets" -msgstr "Otwórz nową prośbę o połączenie gałęzi w zestawieniu zmian" - -msgid "Clear selection" -msgstr "Wyczyść zaznaczenie" - -msgid "patch diff" -msgstr "poprawka różnic" - -msgid "show full diff for this file" -msgstr "pokaż pełną edycja tego pliku" - -#, python-format -msgid "with status %s" -msgstr "stanu z %s" - -msgid "pull request was reviewed by all reviewers" -msgstr "połączenie gałęzi zostało zweryfikowane przez wszystkich recenzentów" - -msgid "Click to load diff details" -msgstr "kliknij żeby załadować szczegóły różnic" - -#, python-format -msgid "Repository locked by %s" -msgstr "Repozytorium zablokowane przez %s" - -msgid "Repository unlocked" -msgstr "Repozytorium odblokowane" - -#~ msgid "apply to children" -#~ msgstr "dotyczy dzieci" - -#~ msgid "Set or revoke permission to all children of that group, including repositories and other groups" -#~ msgstr "Ustawienia lub cofnięcia uprawnień do wszystkich dzieci z tej grupy, w tym repozytoriów i innych grup" - -#, python-format -#~ msgid "Confirm to delete this group: %s with %s repository" -#~ msgid_plural "Confirm to delete this group: %s with %s repositories" -#~ msgstr[0] "Potwierdź usunięcie grupy %s z repozytorium %s" -#~ msgstr[1] "Potwierdź usunięcie grupy %s z repozytoriów %s" -#~ msgstr[2] "Potwierdź usunięcie grupy %s z repozytoriów %s" - -#~ msgid "General" -#~ msgstr "Główne" - -#, python-format -#~ msgid "%s files affected:" -#~ msgstr "%s pliki naruszone:" +# English translations for rhodecode. +# Copyright (C) 2010 ORGANIZATION +# This file is distributed under the same license as the rhodecode project. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2010. +# Nemcio <bogdan114@g.pl>, 2012. +# Nemo <areczek01@gmail.com>, 2012. +msgid "" +msgstr "" +"Project-Id-Version: rhodecode 0.1\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2012-11-27 20:56+0100\n" +"PO-Revision-Date: 2012-11-25 03:42+0200\n" +"Last-Translator: Nemo <areczek01@gmail.com>\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" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" + +#: rhodecode/controllers/changelog.py:95 +msgid "All Branches" +msgstr "Wszystkie gałęzie" + +#: rhodecode/controllers/changeset.py:84 +msgid "show white space" +msgstr "pokazuj spacje" + +#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98 +msgid "ignore white space" +msgstr "ignoruj pokazywanie spacji" + +#: rhodecode/controllers/changeset.py:164 +#, python-format +msgid "%s line context" +msgstr "%s linia w kontekście" + +#: rhodecode/controllers/changeset.py:315 +#: rhodecode/controllers/pullrequests.py:411 +#, python-format +msgid "Status change -> %s" +msgstr "Zmiana statusu -> %s" + +#: rhodecode/controllers/changeset.py:346 +msgid "" +"Changing status on a changeset associated witha closed pull request is " +"not allowed" +msgstr "" +"Zmiana statusu na grupy zmian powiązania łączy zamkniętego wniosku jest " +"niedozwolona" + +#: rhodecode/controllers/compare.py:75 +#: rhodecode/controllers/pullrequests.py:117 +msgid "There are no changesets yet" +msgstr "Brak zestawienia zmian" + +#: rhodecode/controllers/error.py:69 +msgid "Home page" +msgstr "Strona główna" + +#: rhodecode/controllers/error.py:98 +msgid "The request could not be understood by the server due to malformed syntax." +msgstr "" +"Wniosek nie może być rozumiany przez serwer z powodu zniekształconej " +"składni." + +#: rhodecode/controllers/error.py:101 +msgid "Unauthorized access to resource" +msgstr "Nieautoryzowany dostęp do zasobów" + +#: rhodecode/controllers/error.py:103 +msgid "You don't have permission to view this page" +msgstr "Nie masz uprawnień do przeglądania tej strony" + +#: rhodecode/controllers/error.py:105 +msgid "The resource could not be found" +msgstr "Zasób nie został znaleziony" + +#: rhodecode/controllers/error.py:107 +msgid "" +"The server encountered an unexpected condition which prevented it from " +"fulfilling the request." +msgstr "" +"Serwer napotkał niespodziewany warunek, który uniemożliwia jej spełnienie" +" żądania." + +#: rhodecode/controllers/feed.py:52 +#, python-format +msgid "Changes on %s repository" +msgstr "Zmiany w %s repozytorium" + +#: rhodecode/controllers/feed.py:53 +#, python-format +msgid "%s %s feed" +msgstr "%s %s zasilać" + +#: rhodecode/controllers/feed.py:86 +#: rhodecode/templates/changeset/changeset.html:126 +#: rhodecode/templates/changeset/changeset.html:138 +#: rhodecode/templates/compare/compare_diff.html:62 +#: rhodecode/templates/compare/compare_diff.html:73 +#: rhodecode/templates/pullrequests/pullrequest_show.html:94 +#: rhodecode/templates/pullrequests/pullrequest_show.html:153 +msgid "Changeset was too big and was cut off..." +msgstr "Lista zmian była zbyt duża i została ucięta..." + +#: rhodecode/controllers/feed.py:92 +msgid "commited on" +msgstr "komunikaty w" + +#: rhodecode/controllers/files.py:86 +msgid "click here to add new file" +msgstr "Kliknij tutaj, by dodać nowy plik" + +#: rhodecode/controllers/files.py:87 +#, python-format +msgid "There are no files yet %s" +msgstr "Brak plików %s" + +#: rhodecode/controllers/files.py:265 rhodecode/controllers/files.py:325 +#, 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:292 +#, python-format +msgid "Edited %s via RhodeCode" +msgstr "Edytowanie %s w RhodeCode" + +#: rhodecode/controllers/files.py:297 +msgid "No changes" +msgstr "Bez zmian" + +#: rhodecode/controllers/files.py:308 rhodecode/controllers/files.py:372 +#, python-format +msgid "Successfully committed to %s" +msgstr "Committ wykonany do %s" + +#: rhodecode/controllers/files.py:313 rhodecode/controllers/files.py:378 +msgid "Error occurred during commit" +msgstr "Wystąpił błąd w trakcie zatwierdzania" + +#: rhodecode/controllers/files.py:344 +#, python-format +msgid "Added %s via RhodeCode" +msgstr "Dodano %s poprzez RhodeCode" + +#: rhodecode/controllers/files.py:358 +msgid "No content" +msgstr "Brak treści" + +#: rhodecode/controllers/files.py:362 +msgid "No filename" +msgstr "Brak nazwy pliku" + +#: rhodecode/controllers/files.py:404 +msgid "downloads disabled" +msgstr "Pobieranie wyłączone" + +#: rhodecode/controllers/files.py:415 +#, python-format +msgid "Unknown revision %s" +msgstr "Nieznana wersja %s" + +#: rhodecode/controllers/files.py:417 +msgid "Empty repository" +msgstr "Puste repozytorium" + +#: rhodecode/controllers/files.py:419 +msgid "Unknown archive type" +msgstr "Nieznany typ archiwum" + +#: rhodecode/controllers/files.py:564 +#: rhodecode/templates/changeset/changeset_range.html:13 +#: rhodecode/templates/changeset/changeset_range.html:31 +msgid "Changesets" +msgstr "Różnice" + +#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:76 +#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:550 +msgid "Branches" +msgstr "Gałęzie" + +#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:80 +#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:561 +msgid "Tags" +msgstr "Etykiety" + +#: rhodecode/controllers/forks.py:74 rhodecode/controllers/admin/repos.py:91 +#, python-format +msgid "" +"%s repository is not mapped to db perhaps it was created or renamed from " +"the filesystem please run the application again in order to rescan " +"repositories" +msgstr "" +"%s repozytorium nie jest mapowane do db może zostało utworzone lub " +"zmienione z systemie plików proszę uruchomić aplikację ponownie, aby " +"ponownie przeskanować repozytoria" + +#: rhodecode/controllers/forks.py:134 rhodecode/controllers/settings.py:73 +#, python-format +msgid "" +"%s repository is not mapped to db perhaps it was created or renamed from " +"the file system please run the application again in order to rescan " +"repositories" +msgstr "" +"%s repozytorium nie jest mapowane do db może zostało utworzone lub " +"zmienione z systemu plików proszę uruchomić aplikację ponownie, aby " +"ponownie przeskanować repozytoria" + +#: rhodecode/controllers/forks.py:168 +#, python-format +msgid "forked %s repository as %s" +msgstr "gałęzi %s w repozytorium %s" + +#: rhodecode/controllers/forks.py:182 +#, python-format +msgid "An error occurred during repository forking %s" +msgstr "Wystąpił błąd podczas rozgałęzienia %s repozytorium" + +#: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243 +msgid "public journal" +msgstr "Dziennik publiczny" + +#: rhodecode/controllers/journal.py:210 rhodecode/controllers/journal.py:247 +#: rhodecode/templates/base/base.html:232 +msgid "journal" +msgstr "dziennik" + +#: rhodecode/controllers/login.py:143 +msgid "You have successfully registered into rhodecode" +msgstr "Udało Ci się zarejestrować na stronie" + +#: rhodecode/controllers/login.py:164 +msgid "Your password reset link was sent" +msgstr "Twój link zresetowania hasła został wysłany" + +#: rhodecode/controllers/login.py:184 +msgid "" +"Your password reset was successful, new password has been sent to your " +"email" +msgstr "Twoje hasło zostało zresetowane, nowe hasło zostanie wysłane na e-mail" + +#: rhodecode/controllers/pullrequests.py:78 rhodecode/model/scm.py:556 +msgid "Bookmarks" +msgstr "Zakładki" + +#: rhodecode/controllers/pullrequests.py:186 +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:188 +msgid "error during creation of pull request" +msgstr "błąd podczas tworzenia prośby o łączenie gałęzi" + +#: rhodecode/controllers/pullrequests.py:220 +msgid "Successfully opened new pull request" +msgstr "Prośba o wykonanie połączenia gałęzi została wykonana prawidłowo" + +#: rhodecode/controllers/pullrequests.py:223 +msgid "Error occurred during sending pull request" +msgstr "Wystąpił błąd podczas prośby o połączenie gałęzi" + +#: rhodecode/controllers/pullrequests.py:256 +msgid "Successfully deleted pull request" +msgstr "Prośba o skasowanie połączenia gałęzi została wykonana prawidłowo" + +#: rhodecode/controllers/search.py:134 +msgid "Invalid search query. Try quoting it." +msgstr "Nieprawidłowe zapytania. Spróbuj zacytować go." + +#: rhodecode/controllers/search.py:139 +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 +msgid "An error occurred during this search operation" +msgstr "Wystąpił błąd podczas wyszukiwania tej operacji" + +#: rhodecode/controllers/settings.py:108 +#: rhodecode/controllers/admin/repos.py:267 +#, python-format +msgid "Repository %s updated successfully" +msgstr "Repozytorium %s zostało pomyślnie zaktualizowane" + +#: rhodecode/controllers/settings.py:126 +#: rhodecode/controllers/admin/repos.py:285 +#, python-format +msgid "error occurred during update of repository %s" +msgstr "wystąpił błąd podczas aktualizacji repozytorium %s" + +#: rhodecode/controllers/settings.py:144 +#: rhodecode/controllers/admin/repos.py:303 +#, python-format +msgid "" +"%s repository is not mapped to db perhaps it was moved or renamed from " +"the filesystem please run the application again in order to rescan " +"repositories" +msgstr "" +"%s repozytorium nie jest mapowane do db może zostało przeniesione lub " +"zmienione w systemie plików proszę uruchomić aplikację ponownie, aby " +"ponownie przeskanować repozytoria" + +#: rhodecode/controllers/settings.py:156 +#: rhodecode/controllers/admin/repos.py:315 +#, python-format +msgid "deleted repository %s" +msgstr "usunięte repozytorium %s" + +#: rhodecode/controllers/settings.py:160 +#: rhodecode/controllers/admin/repos.py:325 +#: rhodecode/controllers/admin/repos.py:331 +#, python-format +msgid "An error occurred during deletion of %s" +msgstr "Wystąpił błąd podczas usuwania %s" + +#: rhodecode/controllers/settings.py:179 +msgid "unlocked" +msgstr "Odblokowany" + +#: rhodecode/controllers/settings.py:182 +msgid "locked" +msgstr "zablokowany" + +#: rhodecode/controllers/settings.py:184 +#, python-format +msgid "Repository has been %s" +msgstr "Repozytoriów jest %s" + +#: rhodecode/controllers/settings.py:188 +#: rhodecode/controllers/admin/repos.py:423 +msgid "An error occurred during unlocking" +msgstr "Wystąpił błąd podczas odblokowywania" + +#: rhodecode/controllers/summary.py:140 +msgid "No data loaded yet" +msgstr "Żadne dane nie zostały załadowane" + +#: rhodecode/controllers/summary.py:144 +#: rhodecode/templates/summary/summary.html:157 +msgid "Statistics are disabled for this repository" +msgstr "Statystyki są wyłączone dla tego repozytorium" + +#: rhodecode/controllers/admin/ldap_settings.py:50 +msgid "BASE" +msgstr "PODSTAWA" + +#: rhodecode/controllers/admin/ldap_settings.py:51 +msgid "ONELEVEL" +msgstr "JEDEN POZIOM" + +#: rhodecode/controllers/admin/ldap_settings.py:52 +msgid "SUBTREE" +msgstr "DRZEWO PODRZĘDNE" + +#: rhodecode/controllers/admin/ldap_settings.py:56 +msgid "NEVER" +msgstr "NIGDY" + +#: rhodecode/controllers/admin/ldap_settings.py:57 +msgid "ALLOW" +msgstr "POZWÓL" + +#: rhodecode/controllers/admin/ldap_settings.py:58 +msgid "TRY" +msgstr "WYPRÓBUJ" + +#: rhodecode/controllers/admin/ldap_settings.py:59 +msgid "DEMAND" +msgstr "ZAPYTANIE" + +#: rhodecode/controllers/admin/ldap_settings.py:60 +msgid "HARD" +msgstr "TWARDY" + +#: rhodecode/controllers/admin/ldap_settings.py:64 +msgid "No encryption" +msgstr "Bez szyfrowania" + +#: rhodecode/controllers/admin/ldap_settings.py:65 +msgid "LDAPS connection" +msgstr "Połączenie LDAP" + +#: rhodecode/controllers/admin/ldap_settings.py:66 +msgid "START_TLS on LDAP connection" +msgstr "START_TLS dla połączenia LDAP" + +#: rhodecode/controllers/admin/ldap_settings.py:126 +msgid "Ldap settings updated successfully" +msgstr "Ustawienia LDAP zostały zaktualizowane" + +#: rhodecode/controllers/admin/ldap_settings.py:130 +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 +msgid "error occurred during update of ldap settings" +msgstr "Wystąpił błąd podczas aktualizacji ustawień ldap" + +#: rhodecode/controllers/admin/permissions.py:59 +msgid "None" +msgstr "Brak" + +#: rhodecode/controllers/admin/permissions.py:60 +msgid "Read" +msgstr "Odczyt" + +#: rhodecode/controllers/admin/permissions.py:61 +msgid "Write" +msgstr "Zapis" + +#: rhodecode/controllers/admin/permissions.py:62 +#: rhodecode/templates/admin/ldap/ldap.html:9 +#: rhodecode/templates/admin/permissions/permissions.html:9 +#: rhodecode/templates/admin/repos/repo_add.html:9 +#: rhodecode/templates/admin/repos/repo_edit.html:9 +#: rhodecode/templates/admin/repos/repos.html:9 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:8 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:8 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 +#: rhodecode/templates/admin/settings/hooks.html:9 +#: rhodecode/templates/admin/settings/settings.html:9 +#: rhodecode/templates/admin/users/user_add.html:8 +#: rhodecode/templates/admin/users/user_edit.html:9 +#: rhodecode/templates/admin/users/user_edit.html:126 +#: rhodecode/templates/admin/users/users.html:9 +#: rhodecode/templates/admin/users_groups/users_group_add.html:8 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:9 +#: rhodecode/templates/admin/users_groups/users_groups.html:9 +#: rhodecode/templates/base/base.html:197 +#: rhodecode/templates/base/base.html:349 +#: rhodecode/templates/base/base.html:351 +#: rhodecode/templates/base/base.html:353 +msgid "Admin" +msgstr "Administracja" + +#: rhodecode/controllers/admin/permissions.py:65 +msgid "disabled" +msgstr "wyłączona" + +#: rhodecode/controllers/admin/permissions.py:67 +msgid "allowed with manual account activation" +msgstr "dozwolona z ręczną aktywacją konta" + +#: rhodecode/controllers/admin/permissions.py:69 +msgid "allowed with automatic account activation" +msgstr "dozwolona z automatyczną aktywacją konta" + +#: rhodecode/controllers/admin/permissions.py:71 +#: rhodecode/controllers/admin/permissions.py:74 +msgid "Disabled" +msgstr "Wyłączone" + +#: rhodecode/controllers/admin/permissions.py:72 +#: rhodecode/controllers/admin/permissions.py:75 +msgid "Enabled" +msgstr "Włączone" + +#: rhodecode/controllers/admin/permissions.py:116 +msgid "Default permissions updated successfully" +msgstr "Domyślne uprawnienia zaktualizowane pomyślnie" + +#: rhodecode/controllers/admin/permissions.py:130 +msgid "error occurred during update of permissions" +msgstr "wystąpił błąd podczas aktualizacji uprawnień" + +#: rhodecode/controllers/admin/repos.py:124 +msgid "--REMOVE FORK--" +msgstr "--USUŃ ROZGAŁĘZIENIE--" + +#: rhodecode/controllers/admin/repos.py:193 +#, python-format +msgid "created repository %s from %s" +msgstr "utworzone repozytorium %s z %s" + +#: rhodecode/controllers/admin/repos.py:197 +#, python-format +msgid "created repository %s" +msgstr "utworzone repozytorium %s" + +#: rhodecode/controllers/admin/repos.py:228 +#, python-format +msgid "error occurred during creation of repository %s" +msgstr "wystąpił błąd podczas tworzenia repozytorium %s" + +#: rhodecode/controllers/admin/repos.py:320 +#, python-format +msgid "Cannot delete %s it still contains attached forks" +msgstr "Nie można usunąć %s nadal zawiera załączniki rozgałęzienia" + +#: rhodecode/controllers/admin/repos.py:349 +msgid "An error occurred during deletion of repository user" +msgstr "Wystąpił błąd podczas usunięcia użytkownika z repozytorium" + +#: rhodecode/controllers/admin/repos.py:368 +msgid "An error occurred during deletion of repository users groups" +msgstr "Wystąpił błąd podczas usunięcia grupy użytkowników z repozytorium" + +#: rhodecode/controllers/admin/repos.py:386 +msgid "An error occurred during deletion of repository stats" +msgstr "Wystąpił błąd podczas usuwania z repozytorium statystyk" + +#: rhodecode/controllers/admin/repos.py:403 +msgid "An error occurred during cache invalidation" +msgstr "Wystąpił błąd podczas unieważniania cache" + +#: rhodecode/controllers/admin/repos.py:443 +msgid "Updated repository visibility in public journal" +msgstr "Zaktualizowano widoczność stron w publicznym dzienniku" + +#: rhodecode/controllers/admin/repos.py:447 +msgid "An error occurred during setting this repository in public journal" +msgstr "Wystąpił błąd podczas ustawiania tego repozytorium w dzienniku publicznym" + +#: rhodecode/controllers/admin/repos.py:452 rhodecode/model/validators.py:300 +msgid "Token mismatch" +msgstr "Niezgodność tokenu" + +#: rhodecode/controllers/admin/repos.py:465 +msgid "Pulled from remote location" +msgstr "Pobieranie z lokalizacji zdalnej" + +#: rhodecode/controllers/admin/repos.py:467 +msgid "An error occurred during pull from remote location" +msgstr "Wystąpił błąd podczas pobierania z lokalizacji zdalnej" + +#: rhodecode/controllers/admin/repos.py:483 +msgid "Nothing" +msgstr "Brak" + +#: rhodecode/controllers/admin/repos.py:485 +#, python-format +msgid "Marked repo %s as fork of %s" +msgstr "Oznaczono %s repo jako rozwidlenie %s" + +#: rhodecode/controllers/admin/repos.py:489 +msgid "An error occurred during this operation" +msgstr "Wystąpił błąd podczas tej operacji" + +#: rhodecode/controllers/admin/repos_groups.py:120 +#, python-format +msgid "created repos group %s" +msgstr "utworzono grupę repo %s" + +#: rhodecode/controllers/admin/repos_groups.py:133 +#, python-format +msgid "error occurred during creation of repos group %s" +msgstr "Wystąpił błąd podczas tworzenia grupy repo %s" + +#: rhodecode/controllers/admin/repos_groups.py:167 +#, python-format +msgid "updated repos group %s" +msgstr "zaktualizowano grupę repo %s" + +#: rhodecode/controllers/admin/repos_groups.py:180 +#, python-format +msgid "error occurred during update of repos group %s" +msgstr "wystąpił błąd podczas aktualizacji grupy repo %s" + +#: rhodecode/controllers/admin/repos_groups.py:198 +#, 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:206 +#, python-format +msgid "removed repos group %s" +msgstr "usunięto grupę repo %s" + +#: rhodecode/controllers/admin/repos_groups.py:212 +msgid "Cannot delete this group it still contains subgroups" +msgstr "Nie można usunąć tej grupy ponieważ nadal zawiera podgrupy" + +#: rhodecode/controllers/admin/repos_groups.py:217 +#: rhodecode/controllers/admin/repos_groups.py:222 +#, 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:243 +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:264 +msgid "An error occurred during deletion of group users groups" +msgstr "Wystąpił błąd podczas usuwania grup i grup użytkowników" + +#: rhodecode/controllers/admin/settings.py:123 +#, 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:131 +msgid "Whoosh reindex task scheduled" +msgstr "Zadanie ponownej indeksacji whoosh zostało zaplanowane" + +#: rhodecode/controllers/admin/settings.py:162 +msgid "Updated application settings" +msgstr "Aktualizacja ustawień aplikacji" + +#: rhodecode/controllers/admin/settings.py:166 +#: rhodecode/controllers/admin/settings.py:299 +msgid "error occurred during updating application settings" +msgstr "wystąpił błąd podczas aktualizacji ustawień aplikacji" + +#: rhodecode/controllers/admin/settings.py:207 +msgid "Updated visualisation settings" +msgstr "Aktualizacja ustawień wizualizacji" + +#: rhodecode/controllers/admin/settings.py:212 +msgid "error occurred during updating visualisation settings" +msgstr "Wystąpił błąd podczas aktualizacji ustawień wizualizacji" + +#: rhodecode/controllers/admin/settings.py:295 +msgid "Updated VCS settings" +msgstr "Aktualizacja ustawień VCS" + +#: rhodecode/controllers/admin/settings.py:309 +msgid "Added new hook" +msgstr "Dodano nowy hook" + +#: rhodecode/controllers/admin/settings.py:321 +msgid "Updated hooks" +msgstr "Aktualizacja hooku" + +#: rhodecode/controllers/admin/settings.py:325 +msgid "error occurred during hook creation" +msgstr "Wystąpił błąd podczas tworzenia hooku" + +#: rhodecode/controllers/admin/settings.py:344 +msgid "Email task created" +msgstr "E-mail został wysłany" + +#: rhodecode/controllers/admin/settings.py:399 +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:430 +msgid "Your account was updated successfully" +msgstr "Twoje konto zostało pomyślnie zaktualizowane" + +#: rhodecode/controllers/admin/settings.py:445 +#: rhodecode/controllers/admin/users.py:196 +#, python-format +msgid "error occurred during update of user %s" +msgstr "wystąpił błąd podczas aktualizacji użytkownika %s" + +#: rhodecode/controllers/admin/users.py:130 +#, python-format +msgid "created user %s" +msgstr "utworzono użytkownika %s" + +#: rhodecode/controllers/admin/users.py:142 +#, python-format +msgid "error occurred during creation of user %s" +msgstr "wystąpił błąd podczas tworzenia użytkownika %s" + +#: rhodecode/controllers/admin/users.py:176 +msgid "User updated successfully" +msgstr "Użytkownik został zaktualizowany" + +#: rhodecode/controllers/admin/users.py:212 +msgid "successfully deleted user" +msgstr "użytkownik został usunięty" + +#: rhodecode/controllers/admin/users.py:217 +msgid "An error occurred during deletion of user" +msgstr "Wystąpił błąd podczas usuwania użytkownika" + +#: rhodecode/controllers/admin/users.py:231 +msgid "You can't edit this user" +msgstr "Nie możesz edytować tego użytkownika" + +#: rhodecode/controllers/admin/users.py:272 +msgid "Granted 'repository create' permission to user" +msgstr "Przyznano użytkownikowi uprawnienie do 'tworzenia repozytorium'" + +#: rhodecode/controllers/admin/users.py:277 +msgid "Revoked 'repository create' permission to user" +msgstr "Cofnięto użytkownikowi uprawnienie do 'tworzenia repozytorium'" + +#: rhodecode/controllers/admin/users.py:283 +msgid "Granted 'repository fork' permission to user" +msgstr "Przyznano użytkownikowi uprawnienie do 'tworzenia rozgałęzień'" + +#: rhodecode/controllers/admin/users.py:288 +msgid "Revoked 'repository fork' permission to user" +msgstr "Cofnięto użytkownikowi uprawnienie do 'tworzenia rozgałęzień'" + +#: rhodecode/controllers/admin/users.py:294 +#: rhodecode/controllers/admin/users_groups.py:279 +msgid "An error occurred during permissions saving" +msgstr "Wystąpił błąd podczas zapisywania uprawnień" + +#: rhodecode/controllers/admin/users.py:309 +#, python-format +msgid "Added email %s to user" +msgstr "Dodano e-mail %s do użytkownika" + +#: rhodecode/controllers/admin/users.py:315 +msgid "An error occurred during email saving" +msgstr "Wystąpił błąd podczas zapisywania e-maila" + +#: rhodecode/controllers/admin/users.py:325 +msgid "Removed email from user" +msgstr "Usunięto e-mail użytkownikowi" + +#: rhodecode/controllers/admin/users_groups.py:86 +#, python-format +msgid "created users group %s" +msgstr "utworzono grupę użytkowników %s" + +#: rhodecode/controllers/admin/users_groups.py:97 +#, python-format +msgid "error occurred during creation of users group %s" +msgstr "wystąpił błąd podczas tworzenia grupy użytkowników %s" + +#: rhodecode/controllers/admin/users_groups.py:164 +#, python-format +msgid "updated users group %s" +msgstr "zaktualizowano grupę użytkowników %s" + +#: rhodecode/controllers/admin/users_groups.py:186 +#, python-format +msgid "error occurred during update of users group %s" +msgstr "wystąpił błąd podczas aktualizacji grupy użytkowników %s" + +#: rhodecode/controllers/admin/users_groups.py:203 +msgid "successfully deleted users group" +msgstr "grupa użytkowników została usunięta z powodzeniem" + +#: rhodecode/controllers/admin/users_groups.py:208 +msgid "An error occurred during deletion of users group" +msgstr "Wystąpił błąd podczas usuwania grupy użytkowników" + +#: rhodecode/controllers/admin/users_groups.py:257 +msgid "Granted 'repository create' permission to users group" +msgstr "Przyznano grupie użytkowników uprawnienia do 'tworzenia repozytorium'" + +#: rhodecode/controllers/admin/users_groups.py:262 +msgid "Revoked 'repository create' permission to users group" +msgstr "Cofnięto grupie użytkowników uprawnienia do 'tworzenia repozytorium'" + +#: rhodecode/controllers/admin/users_groups.py:268 +msgid "Granted 'repository fork' permission to users group" +msgstr "Przyznano grupie użytkowników uprawnienia do 'tworzenia rozgałęzień'" + +#: rhodecode/controllers/admin/users_groups.py:273 +msgid "Revoked 'repository fork' permission to users group" +msgstr "Cofnięto grupie użytkowników uprawnienia do 'tworzenia rozgałęzień'" + +#: rhodecode/lib/auth.py:499 +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:540 +msgid "You need to be a signed in to view this page" +msgstr "Musisz być zalogowany, żeby oglądać stronę" + +#: rhodecode/lib/diffs.py:74 +msgid "binary file" +msgstr "plik binarny" + +#: rhodecode/lib/diffs.py:90 +msgid "Changeset was too big and was cut off, use diff menu to display this diff" +msgstr "" +"Lista zmian była zbyt duża i została obcięta, użyj menu porównań żeby " +"wyświetlić różnice" + +#: rhodecode/lib/diffs.py:100 +msgid "No changes detected" +msgstr "Nie wykryto zmian" + +#: rhodecode/lib/helpers.py:373 +#, python-format +msgid "%a, %d %b %Y %H:%M:%S" +msgstr "%d.%m.%Y, %H:%M:%S" + +#: rhodecode/lib/helpers.py:485 +msgid "True" +msgstr "Prawda" + +#: rhodecode/lib/helpers.py:489 +msgid "False" +msgstr "Fałsz" + +#: rhodecode/lib/helpers.py:529 +#, python-format +msgid "Deleted branch: %s" +msgstr "Usunięta gałąź: %s" + +#: rhodecode/lib/helpers.py:532 +#, python-format +msgid "Created tag: %s" +msgstr "Utworzony tag: %s" + +#: rhodecode/lib/helpers.py:545 +msgid "Changeset not found" +msgstr "Nie znaleziono changeset" + +#: rhodecode/lib/helpers.py:588 +#, python-format +msgid "Show all combined changesets %s->%s" +msgstr "Pokaż wszystkie zestawienia zmian changesets %s->%s" + +#: rhodecode/lib/helpers.py:594 +msgid "compare view" +msgstr "Wyświetl porównanie" + +#: rhodecode/lib/helpers.py:614 +msgid "and" +msgstr "i" + +#: rhodecode/lib/helpers.py:615 +#, python-format +msgid "%s more" +msgstr "%s więcej" + +#: rhodecode/lib/helpers.py:616 rhodecode/templates/changelog/changelog.html:51 +msgid "revisions" +msgstr "rewizja" + +#: rhodecode/lib/helpers.py:640 +#, python-format +msgid "fork name %s" +msgstr "nazwa rozgałęzienia %s" + +#: rhodecode/lib/helpers.py:653 +#: rhodecode/templates/pullrequests/pullrequest_show.html:4 +#: rhodecode/templates/pullrequests/pullrequest_show.html:12 +#, python-format +msgid "Pull request #%s" +msgstr "Połączonych gałęzi #%s" + +#: rhodecode/lib/helpers.py:659 +msgid "[deleted] repository" +msgstr "[usunięte] repozytorium" + +#: rhodecode/lib/helpers.py:661 rhodecode/lib/helpers.py:671 +msgid "[created] repository" +msgstr "[utworzone] repozytorium" + +#: rhodecode/lib/helpers.py:663 +msgid "[created] repository as fork" +msgstr "[utworzone] repozytorium jako rozgałęzienie" + +#: rhodecode/lib/helpers.py:665 rhodecode/lib/helpers.py:673 +msgid "[forked] repository" +msgstr "[rozgałęzione] repozytorium" + +#: rhodecode/lib/helpers.py:667 rhodecode/lib/helpers.py:675 +msgid "[updated] repository" +msgstr "[zaktualizowane] repozytorium" + +#: rhodecode/lib/helpers.py:669 +msgid "[delete] repository" +msgstr "[skasowane] repozytorium" + +#: rhodecode/lib/helpers.py:677 +msgid "[created] user" +msgstr "[utworzony] użytkownik" + +#: rhodecode/lib/helpers.py:679 +msgid "[updated] user" +msgstr "[zaktualizowany] użytkownik" + +#: rhodecode/lib/helpers.py:681 +msgid "[created] users group" +msgstr "[utworzona] grupa użytkowników" + +#: rhodecode/lib/helpers.py:683 +msgid "[updated] users group" +msgstr "[zaktualizowana] grupa użytkowników" + +#: rhodecode/lib/helpers.py:685 +msgid "[commented] on revision in repository" +msgstr "[komentarz] do zmiany w repozytorium" + +#: rhodecode/lib/helpers.py:687 +msgid "[commented] on pull request for" +msgstr "[komentarz] wniosek o połączenie gałęzi" + +#: rhodecode/lib/helpers.py:689 +msgid "[closed] pull request for" +msgstr "[zamknięty] wniosek o połączenie gałęzi" + +#: rhodecode/lib/helpers.py:691 +msgid "[pushed] into" +msgstr "[wysłane zmiany] w" + +#: rhodecode/lib/helpers.py:693 +msgid "[committed via RhodeCode] into repository" +msgstr "[committed przez RhodeCode] do repozytorium" + +#: rhodecode/lib/helpers.py:695 +msgid "[pulled from remote] into repository" +msgstr "[pobieranie z zdalnego] do repozytorium" + +#: rhodecode/lib/helpers.py:697 +msgid "[pulled] from" +msgstr "[pobrano] z" + +#: rhodecode/lib/helpers.py:699 +msgid "[started following] repository" +msgstr "[start następnego] repozytorium" + +#: rhodecode/lib/helpers.py:701 +msgid "[stopped following] repository" +msgstr "[zatrzymany po] repozytorium" + +#: rhodecode/lib/helpers.py:877 +#, python-format +msgid " and %s more" +msgstr "i %s więcej" + +#: rhodecode/lib/helpers.py:881 +msgid "No Files" +msgstr "Brak Plików" + +#: rhodecode/lib/utils2.py:403 +#, python-format +msgid "%d year" +msgid_plural "%d years" +msgstr[0] "%d rok" +msgstr[1] "%d lata" +msgstr[2] "%d lat" + +#: rhodecode/lib/utils2.py:404 +#, python-format +msgid "%d month" +msgid_plural "%d months" +msgstr[0] "%d miesiąc" +msgstr[1] "%d miesięcy" +msgstr[2] "%d miesięcy" + +#: rhodecode/lib/utils2.py:405 +#, python-format +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d dzień" +msgstr[1] "%d dni" +msgstr[2] "%d dni" + +#: rhodecode/lib/utils2.py:406 +#, python-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d godzina" +msgstr[1] "%d godziny" +msgstr[2] "%d godzin" + +#: rhodecode/lib/utils2.py:407 +#, python-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d minuta" +msgstr[1] "%d minuty" +msgstr[2] "%d minut" + +#: rhodecode/lib/utils2.py:408 +#, python-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d sekunda" +msgstr[1] "%d sekund" +msgstr[2] "%d sekund" + +#: rhodecode/lib/utils2.py:424 +#, python-format +msgid "in %s" +msgstr "w %s" + +#: rhodecode/lib/utils2.py:426 +#, python-format +msgid "%s ago" +msgstr "%s temu" + +#: rhodecode/lib/utils2.py:428 +#, python-format +msgid "in %s and %s" +msgstr "w %s i %s" + +#: rhodecode/lib/utils2.py:431 +#, python-format +msgid "%s and %s ago" +msgstr "%s i %s temu" + +#: rhodecode/lib/utils2.py:434 +msgid "just now" +msgstr "przed chwilą" + +#: rhodecode/lib/celerylib/tasks.py:270 +msgid "password reset link" +msgstr "łącze resetowania hasła" + +#: rhodecode/model/comment.py:110 +#, python-format +msgid "on line %s" +msgstr "widziany %s" + +#: rhodecode/model/comment.py:173 +msgid "[Mention]" +msgstr "[Wymieniony]" + +#: rhodecode/model/db.py:1163 +msgid "Repository no access" +msgstr "Brak dostępu do repozytorium" + +#: rhodecode/model/db.py:1164 +msgid "Repository read access" +msgstr "Repozytorium do odczytu" + +#: rhodecode/model/db.py:1165 +msgid "Repository write access" +msgstr "Repozytorium do zapisu" + +#: rhodecode/model/db.py:1166 +msgid "Repository admin access" +msgstr "Administracja dostępu do repozytorium" + +#: rhodecode/model/db.py:1168 +msgid "Repositories Group no access" +msgstr "Grupy repozytoriów brak dostępu" + +#: rhodecode/model/db.py:1169 +msgid "Repositories Group read access" +msgstr "Grupy repozytoriów dostęp do odczytu" + +#: rhodecode/model/db.py:1170 +msgid "Repositories Group write access" +msgstr "Grupy repozytoriów dostęp do zapisu" + +#: rhodecode/model/db.py:1171 +msgid "Repositories Group admin access" +msgstr "Repozytoria Grupy dostęp administratora" + +#: rhodecode/model/db.py:1173 +msgid "RhodeCode Administrator" +msgstr "Administrator Repo" + +#: rhodecode/model/db.py:1174 +msgid "Repository creation disabled" +msgstr "Repozytorium wyłączone" + +#: rhodecode/model/db.py:1175 +msgid "Repository creation enabled" +msgstr "Repozytorium włączone" + +#: rhodecode/model/db.py:1176 +msgid "Repository forking disabled" +msgstr "Rozwidlenie repozytorium wyłączone" + +#: rhodecode/model/db.py:1177 +msgid "Repository forking enabled" +msgstr "Rozwidlenie repozytorium włączone" + +#: rhodecode/model/db.py:1178 +msgid "Register disabled" +msgstr "Rejestracja wyłączona" + +#: rhodecode/model/db.py:1179 +msgid "Register new user with RhodeCode with manual activation" +msgstr "Rejestracja nowego użytkownika na stronie z ręczną aktywacją" + +#: rhodecode/model/db.py:1182 +msgid "Register new user with RhodeCode with auto activation" +msgstr "Rejestracja nowego użytkownika na stronie z automatyczną aktywacją" + +#: rhodecode/model/db.py:1623 +msgid "Not Reviewed" +msgstr "Brak Korekty" + +#: rhodecode/model/db.py:1624 +msgid "Approved" +msgstr "Zaakceptowano" + +#: rhodecode/model/db.py:1625 +msgid "Rejected" +msgstr "Odrzucono" + +#: rhodecode/model/db.py:1626 +msgid "Under Review" +msgstr "Objęty Przeglądem" + +#: rhodecode/model/forms.py:43 +msgid "Please enter a login" +msgstr "Wpisz login" + +#: rhodecode/model/forms.py:44 +#, python-format +msgid "Enter a value %(min)i characters long or more" +msgstr "Wprowadź wartość %(min)i znaków lub więcej" + +#: rhodecode/model/forms.py:52 +msgid "Please enter a password" +msgstr "Wpisz hasło" + +#: rhodecode/model/forms.py:53 +#, python-format +msgid "Enter %(min)i characters or more" +msgstr "Wpisz %(min)i lub więcej znaków" + +#: rhodecode/model/notification.py:220 +#, python-format +msgid "commented on commit at %(when)s" +msgstr "skomentował zatwierdzenie %(when)s" + +#: rhodecode/model/notification.py:221 +#, python-format +msgid "sent message at %(when)s" +msgstr "wysłano wiadomość do %(when)s" + +#: rhodecode/model/notification.py:222 +#, python-format +msgid "mentioned you at %(when)s" +msgstr "wspomniał o Tobie w %(when)s" + +#: rhodecode/model/notification.py:223 +#, python-format +msgid "registered in RhodeCode at %(when)s" +msgstr "zarejestrowany na stronie w %(when)s" + +#: rhodecode/model/notification.py:224 +#, python-format +msgid "opened new pull request at %(when)s" +msgstr "otworzył nowe połączenie gałęzi w %(when)s" + +#: rhodecode/model/notification.py:225 +#, python-format +msgid "commented on pull request at %(when)s" +msgstr "skomentował nowe połączenie gałęzi w %(when)s" + +#: rhodecode/model/pull_request.py:90 +#, python-format +msgid "%(user)s wants you to review pull request #%(pr_id)s" +msgstr "%(user)s chce żeby przejrzeć nowe gałęzie #%(pr_id)s" + +#: rhodecode/model/scm.py:542 +msgid "latest tip" +msgstr "ostatni tip" + +#: rhodecode/model/user.py:230 +msgid "new user registration" +msgstr "nowy użytkownik się zarejestrował" + +#: rhodecode/model/user.py:255 rhodecode/model/user.py:279 +#: rhodecode/model/user.py:301 +msgid "You can't Edit this user since it's crucial for entire application" +msgstr "" +"Nie możesz edytować tego użytkownika ponieważ jest kluczowy dla całej " +"aplikacji" + +#: rhodecode/model/user.py:325 +msgid "You can't remove this user since it's crucial for entire application" +msgstr "" +"Nie możesz usunąć tego użytkownika ponieważ jest kluczowy dla całej " +"aplikacji" + +#: rhodecode/model/user.py:331 +#, python-format +msgid "" +"user \"%s\" still owns %s repositories and cannot be removed. Switch " +"owners or remove those repositories. %s" +msgstr "" +"użytkownik \"%s\" wciąż posiada repozytoria następujące %s i nie może " +"zostać usunięty. Zmień właściciela lub usuń te repozytoria. %s" + +#: rhodecode/model/validators.py:36 rhodecode/model/validators.py:37 +msgid "Value cannot be an empty list" +msgstr "Wartość listy nie może być pusta" + +#: rhodecode/model/validators.py:83 +#, python-format +msgid "Username \"%(username)s\" already exists" +msgstr "Użytkownik \"%(username)s\" już istnieje" + +#: rhodecode/model/validators.py:85 +#, python-format +msgid "Username \"%(username)s\" is forbidden" +msgstr "Nazwa użytkownika \"%(username)s\" jest zabroniona" + +#: rhodecode/model/validators.py:87 +msgid "" +"Username may only contain alphanumeric characters underscores, periods or" +" dashes and must begin with alphanumeric character" +msgstr "" +"Nazwa użytkownika może zawierać tylko znaki alfanumeryczne, podkreślenia," +" kropki lub myślniki i musi zaczynać się znakiem alfanumerycznym" + +#: rhodecode/model/validators.py:115 +#, python-format +msgid "Username %(username)s is not valid" +msgstr "Nazwa użytkownika %(username)s jest nieprawidłowa" + +#: rhodecode/model/validators.py:134 +msgid "Invalid users group name" +msgstr "Niewłaściwa nazwa grupy" + +#: rhodecode/model/validators.py:135 +#, python-format +msgid "Users group \"%(usersgroup)s\" already exists" +msgstr "Nazwa grupy \"%(usersgroup)s\" już istnieje" + +#: rhodecode/model/validators.py:137 +msgid "" +"users group name may only contain alphanumeric characters underscores, " +"periods or dashes and must begin with alphanumeric character" +msgstr "" +"Nazwa grupy może zawierać tylko znaki alfanumeryczne, podkreślenia, " +"kropki lub myślniki i musi zaczynać się znakiem alfanumerycznym" + +#: rhodecode/model/validators.py:175 +msgid "Cannot assign this group as parent" +msgstr "Nie można przypisać do tej grupy jako rodzic" + +#: rhodecode/model/validators.py:176 +#, python-format +msgid "Group \"%(group_name)s\" already exists" +msgstr "Nazwa grupy \"%(group_name)s\" już istnieje" + +#: rhodecode/model/validators.py:178 +#, python-format +msgid "Repository with name \"%(group_name)s\" already exists" +msgstr "Repozytorium o nazwie \"%(group_name)s\" już istnieje" + +#: rhodecode/model/validators.py:236 +msgid "Invalid characters (non-ascii) in password" +msgstr "Nieprawidłowe znaki (nie-ascii) w haśle" + +#: rhodecode/model/validators.py:251 +msgid "Passwords do not match" +msgstr "Hasła różnią się" + +#: rhodecode/model/validators.py:268 +msgid "invalid password" +msgstr "nieprawidłowe hasło" + +#: rhodecode/model/validators.py:269 +msgid "invalid user name" +msgstr "niepoprawna nazwa użytkownika" + +#: rhodecode/model/validators.py:270 +msgid "Your account is disabled" +msgstr "Twoje konto jest wyłączone" + +#: rhodecode/model/validators.py:314 +#, python-format +msgid "Repository name %(repo)s is disallowed" +msgstr "Nazwa repozytorium %(repo)s jest zabroniona" + +#: rhodecode/model/validators.py:316 +#, python-format +msgid "Repository named %(repo)s already exists" +msgstr "Repozytorium o nazwie %(repo)s już istnieje" + +#: rhodecode/model/validators.py:317 +#, python-format +msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" +msgstr "Repozytorium \"%(repo)s\" już istnieje w grupie \"%(group)s\"" + +#: rhodecode/model/validators.py:319 +#, python-format +msgid "Repositories group with name \"%(repo)s\" already exists" +msgstr "Grupa repozytoriów z nazwą \"%(repo)s\" już istnieje" + +#: rhodecode/model/validators.py:432 +msgid "invalid clone url" +msgstr "nieprawidłowe url klonowania" + +#: rhodecode/model/validators.py:433 +msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" +msgstr "Nieprawidłowe url klonowania, wstaw prawidłowy url http(s)/svn+http(s)" + +#: rhodecode/model/validators.py:458 +msgid "Fork have to be the same type as parent" +msgstr "Fork musi być tego samego typu, jak rodzic" + +#: rhodecode/model/validators.py:473 +msgid "You don't have permissions to create repository in this group" +msgstr "Nie masz uprawnień do tworzenia repozytorium w tej grupie" + +#: rhodecode/model/validators.py:498 +msgid "This username or users group name is not valid" +msgstr "Ta nazwa użytkownika lub grupy użytkowników nie jest prawidłowa" + +#: rhodecode/model/validators.py:582 +msgid "This is not a valid path" +msgstr "To nie jest prawidłowa ścieżka" + +#: rhodecode/model/validators.py:597 +msgid "This e-mail address is already taken" +msgstr "Ten adres e-mail jest już zajęty" + +#: rhodecode/model/validators.py:617 +#, python-format +msgid "e-mail \"%(email)s\" does not exist." +msgstr "e-mail \"%(email)s\" nie istnieje." + +#: rhodecode/model/validators.py:654 +msgid "" +"The LDAP Login attribute of the CN must be specified - this is the name " +"of the attribute that is equivalent to \"username\"" +msgstr "" +"Atrybut logowania CN do LDAP należy określić, jest to nazwa atrybutu, " +"który jest odpowiednikiem \"username\"" + +#: rhodecode/model/validators.py:673 +#, 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/templates/index.html:3 +msgid "Dashboard" +msgstr "Repozytorium" + +#: rhodecode/templates/index_base.html:6 +#: rhodecode/templates/repo_switcher_list.html:4 +#: rhodecode/templates/admin/repos/repos.html:9 +#: rhodecode/templates/admin/users/user_edit_my_account.html:31 +#: rhodecode/templates/admin/users/users.html:9 +#: rhodecode/templates/bookmarks/bookmarks.html:10 +#: rhodecode/templates/branches/branches.html:9 +#: rhodecode/templates/journal/journal.html:40 +#: rhodecode/templates/tags/tags.html:10 +msgid "quick filter..." +msgstr "szybki filtr..." + +#: rhodecode/templates/index_base.html:6 +#: rhodecode/templates/admin/repos/repos.html:9 +#: rhodecode/templates/base/base.html:233 +msgid "repositories" +msgstr "repozytoria" + +#: rhodecode/templates/index_base.html:13 +#: rhodecode/templates/index_base.html:15 +#: rhodecode/templates/admin/repos/repos.html:21 +msgid "ADD REPOSITORY" +msgstr "DODAJ REPOZYTORIUM" + +#: rhodecode/templates/index_base.html:29 +#: rhodecode/templates/index_base.html:136 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:32 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:32 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:33 +#: rhodecode/templates/admin/users_groups/users_group_add.html:32 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:33 +msgid "Group name" +msgstr "Nazwa grupy" + +#: rhodecode/templates/index_base.html:30 +#: rhodecode/templates/index_base.html:72 +#: rhodecode/templates/index_base.html:138 +#: rhodecode/templates/index_base.html:176 +#: rhodecode/templates/index_base.html:266 +#: rhodecode/templates/admin/repos/repo_add_base.html:56 +#: rhodecode/templates/admin/repos/repo_edit.html:75 +#: rhodecode/templates/admin/repos/repos.html:72 +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:41 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:41 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34 +#: rhodecode/templates/forks/fork.html:59 +#: rhodecode/templates/settings/repo_settings.html:66 +#: rhodecode/templates/summary/summary.html:114 +msgid "Description" +msgstr "Opis" + +#: rhodecode/templates/index_base.html:40 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:47 +msgid "Repositories group" +msgstr "Grupy w repozytorium" + +#: rhodecode/templates/index_base.html:71 +#: rhodecode/templates/index_base.html:174 +#: rhodecode/templates/index_base.html:264 +#: rhodecode/templates/admin/repos/repo_add_base.html:9 +#: rhodecode/templates/admin/repos/repo_edit.html:32 +#: rhodecode/templates/admin/repos/repos.html:70 +#: rhodecode/templates/admin/users/user_edit.html:196 +#: rhodecode/templates/admin/users/user_edit_my_account.html:59 +#: rhodecode/templates/admin/users/user_edit_my_account.html:180 +#: rhodecode/templates/admin/users/user_edit_my_account.html:216 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:184 +#: rhodecode/templates/bookmarks/bookmarks.html:36 +#: rhodecode/templates/bookmarks/bookmarks_data.html:6 +#: rhodecode/templates/branches/branches.html:50 +#: rhodecode/templates/branches/branches_data.html:6 +#: rhodecode/templates/files/files_browser.html:47 +#: rhodecode/templates/journal/journal.html:62 +#: rhodecode/templates/journal/journal.html:168 +#: rhodecode/templates/journal/journal_page_repos.html:7 +#: rhodecode/templates/settings/repo_settings.html:31 +#: rhodecode/templates/summary/summary.html:43 +#: rhodecode/templates/summary/summary.html:132 +#: rhodecode/templates/tags/tags.html:51 +#: rhodecode/templates/tags/tags_data.html:6 +msgid "Name" +msgstr "Nazwa" + +#: rhodecode/templates/index_base.html:73 +msgid "Last change" +msgstr "Ostatnia aktywność" + +#: rhodecode/templates/index_base.html:74 +#: rhodecode/templates/index_base.html:179 +#: rhodecode/templates/admin/users/user_edit_my_account.html:182 +#: rhodecode/templates/journal/journal.html:170 +msgid "Tip" +msgstr "Ostatnia zmiana" + +#: rhodecode/templates/index_base.html:75 +#: rhodecode/templates/index_base.html:181 +#: rhodecode/templates/index_base.html:269 +#: rhodecode/templates/admin/repos/repo_edit.html:121 +#: rhodecode/templates/admin/repos/repos.html:73 +msgid "Owner" +msgstr "Właściciel" + +#: rhodecode/templates/index_base.html:76 +#: rhodecode/templates/summary/summary.html:48 +#: rhodecode/templates/summary/summary.html:51 +msgid "RSS" +msgstr "RSS" + +#: rhodecode/templates/index_base.html:77 +msgid "Atom" +msgstr "Atom" + +#: rhodecode/templates/index_base.html:167 +#: rhodecode/templates/index_base.html:207 +#: rhodecode/templates/index_base.html:291 +#: rhodecode/templates/admin/repos/repos.html:94 +#: rhodecode/templates/admin/users/user_edit_my_account.html:202 +#: rhodecode/templates/admin/users/users.html:107 +#: rhodecode/templates/bookmarks/bookmarks.html:60 +#: rhodecode/templates/branches/branches.html:76 +#: rhodecode/templates/journal/journal.html:193 +#: rhodecode/templates/tags/tags.html:77 +msgid "Click to sort ascending" +msgstr "Kliknij, aby posortować rosnąco" + +#: rhodecode/templates/index_base.html:168 +#: rhodecode/templates/index_base.html:208 +#: rhodecode/templates/index_base.html:292 +#: rhodecode/templates/admin/repos/repos.html:95 +#: rhodecode/templates/admin/users/user_edit_my_account.html:203 +#: rhodecode/templates/admin/users/users.html:108 +#: rhodecode/templates/bookmarks/bookmarks.html:61 +#: rhodecode/templates/branches/branches.html:77 +#: rhodecode/templates/journal/journal.html:194 +#: rhodecode/templates/tags/tags.html:78 +msgid "Click to sort descending" +msgstr "Kliknij, aby posortować malejąco" + +#: rhodecode/templates/index_base.html:177 +#: rhodecode/templates/index_base.html:267 +msgid "Last Change" +msgstr "Ostatnia akytwność" + +#: rhodecode/templates/index_base.html:209 +#: rhodecode/templates/index_base.html:293 +#: rhodecode/templates/admin/repos/repos.html:96 +#: rhodecode/templates/admin/users/user_edit_my_account.html:204 +#: rhodecode/templates/admin/users/users.html:109 +#: rhodecode/templates/bookmarks/bookmarks.html:62 +#: rhodecode/templates/branches/branches.html:78 +#: rhodecode/templates/journal/journal.html:195 +#: rhodecode/templates/tags/tags.html:79 +msgid "No records found." +msgstr "Nie znaleziono rekordów." + +#: rhodecode/templates/index_base.html:210 +#: rhodecode/templates/index_base.html:294 +#: rhodecode/templates/admin/repos/repos.html:97 +#: rhodecode/templates/admin/users/user_edit_my_account.html:205 +#: rhodecode/templates/admin/users/users.html:110 +#: rhodecode/templates/bookmarks/bookmarks.html:63 +#: rhodecode/templates/branches/branches.html:79 +#: rhodecode/templates/journal/journal.html:196 +#: rhodecode/templates/tags/tags.html:80 +msgid "Data error." +msgstr "Błąd danych." + +#: rhodecode/templates/index_base.html:211 +#: rhodecode/templates/index_base.html:295 +#: rhodecode/templates/admin/repos/repos.html:98 +#: rhodecode/templates/admin/users/user_edit_my_account.html:206 +#: rhodecode/templates/admin/users/users.html:111 +#: rhodecode/templates/bookmarks/bookmarks.html:64 +#: rhodecode/templates/branches/branches.html:80 +#: rhodecode/templates/journal/journal.html:54 +#: rhodecode/templates/journal/journal.html:197 +#: rhodecode/templates/tags/tags.html:81 +msgid "Loading..." +msgstr "Wczytywanie..." + +#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:54 +msgid "Sign In" +msgstr "Zaloguj się" + +#: rhodecode/templates/login.html:21 +msgid "Sign In to" +msgstr "Zarejestruj się" + +#: rhodecode/templates/login.html:31 rhodecode/templates/register.html:20 +#: rhodecode/templates/admin/admin_log.html:5 +#: rhodecode/templates/admin/users/user_add.html:32 +#: rhodecode/templates/admin/users/user_edit.html:50 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:26 +#: rhodecode/templates/base/base.html:83 +#: rhodecode/templates/summary/summary.html:131 +msgid "Username" +msgstr "Nazwa użytkownika" + +#: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29 +#: rhodecode/templates/admin/ldap/ldap.html:46 +#: rhodecode/templates/admin/users/user_add.html:41 +#: rhodecode/templates/base/base.html:92 +msgid "Password" +msgstr "Hasło" + +#: rhodecode/templates/login.html:50 +msgid "Remember me" +msgstr "Zapamiętaj mnie" + +#: rhodecode/templates/login.html:60 +msgid "Forgot your password ?" +msgstr "Zapomniałeś hasła?" + +#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:103 +msgid "Don't have an account ?" +msgstr "Nie masz konta?" + +#: rhodecode/templates/password_reset.html:5 +msgid "Reset your password" +msgstr "Zresetuj swoje hasło" + +#: rhodecode/templates/password_reset.html:11 +msgid "Reset your password to" +msgstr "Resetowanie hasła dla" + +#: rhodecode/templates/password_reset.html:21 +msgid "Email address" +msgstr "Adres e-mail" + +#: rhodecode/templates/password_reset.html:30 +msgid "Reset my password" +msgstr "Zresetuj swoje hasło" + +#: rhodecode/templates/password_reset.html:31 +msgid "Password reset link will be send to matching email address" +msgstr "Link do zresetowania hasła zostanie wysłany na adres e-mail" + +#: rhodecode/templates/register.html:5 rhodecode/templates/register.html:74 +msgid "Sign Up" +msgstr "Zarejestruj się" + +#: rhodecode/templates/register.html:11 +msgid "Sign Up to" +msgstr "Zarejestruj się do" + +#: rhodecode/templates/register.html:38 +msgid "Re-enter password" +msgstr "Ponownie wprowadź hasło" + +#: rhodecode/templates/register.html:47 +#: rhodecode/templates/admin/users/user_add.html:59 +#: rhodecode/templates/admin/users/user_edit.html:90 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:53 +msgid "First Name" +msgstr "Imię" + +#: rhodecode/templates/register.html:56 +#: rhodecode/templates/admin/users/user_add.html:68 +#: rhodecode/templates/admin/users/user_edit.html:99 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:62 +msgid "Last Name" +msgstr "Nazwisko" + +#: rhodecode/templates/register.html:65 +#: rhodecode/templates/admin/users/user_add.html:77 +#: rhodecode/templates/admin/users/user_edit.html:108 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:71 +#: rhodecode/templates/summary/summary.html:133 +msgid "Email" +msgstr "E-mail" + +#: rhodecode/templates/register.html:76 +msgid "Your account will be activated right after registration" +msgstr "Twoje konto zostanie aktywowane zaraz po rejestracji" + +#: rhodecode/templates/register.html:78 +msgid "Your account must wait for activation by administrator" +msgstr "Twoje konto musi zostać aktywowane przez administratora" + +#: rhodecode/templates/repo_switcher_list.html:11 +#: rhodecode/templates/admin/repos/repo_add_base.html:65 +#: rhodecode/templates/admin/repos/repo_edit.html:85 +#: rhodecode/templates/settings/repo_settings.html:76 +msgid "Private repository" +msgstr "Prywatne repozytorium" + +#: rhodecode/templates/repo_switcher_list.html:16 +msgid "Public repository" +msgstr "Publiczne repozytorium" + +#: rhodecode/templates/switch_to_list.html:3 +#: rhodecode/templates/branches/branches.html:14 +msgid "branches" +msgstr "gałęzie" + +#: rhodecode/templates/switch_to_list.html:10 +#: rhodecode/templates/branches/branches_data.html:57 +msgid "There are no branches yet" +msgstr "Nie ma jeszcze gałęzi" + +#: rhodecode/templates/switch_to_list.html:15 +#: rhodecode/templates/shortlog/shortlog_data.html:10 +#: rhodecode/templates/tags/tags.html:15 +msgid "tags" +msgstr "Tagi" + +#: rhodecode/templates/switch_to_list.html:22 +#: rhodecode/templates/tags/tags_data.html:38 +msgid "There are no tags yet" +msgstr "Nie ma jeszcze tagów" + +#: rhodecode/templates/switch_to_list.html:28 +#: rhodecode/templates/bookmarks/bookmarks.html:15 +msgid "bookmarks" +msgstr "zakładki" + +#: rhodecode/templates/switch_to_list.html:35 +#: rhodecode/templates/bookmarks/bookmarks_data.html:32 +msgid "There are no bookmarks yet" +msgstr "Nie ma jeszcze zakładek" + +#: rhodecode/templates/admin/admin.html:5 +#: rhodecode/templates/admin/admin.html:9 +msgid "Admin journal" +msgstr "Dziennik administratora" + +#: rhodecode/templates/admin/admin_log.html:6 +#: rhodecode/templates/admin/repos/repos.html:74 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:9 +#: rhodecode/templates/journal/journal_page_repos.html:9 +#: rhodecode/templates/journal/journal_page_repos.html:10 +msgid "Action" +msgstr "Działanie" + +#: rhodecode/templates/admin/admin_log.html:7 +msgid "Repository" +msgstr "Repozytorium" + +#: rhodecode/templates/admin/admin_log.html:8 +#: rhodecode/templates/bookmarks/bookmarks.html:37 +#: rhodecode/templates/bookmarks/bookmarks_data.html:7 +#: rhodecode/templates/branches/branches.html:51 +#: rhodecode/templates/branches/branches_data.html:7 +#: rhodecode/templates/tags/tags.html:52 +#: rhodecode/templates/tags/tags_data.html:7 +msgid "Date" +msgstr "Data" + +#: rhodecode/templates/admin/admin_log.html:9 +msgid "From IP" +msgstr "z IP" + +#: rhodecode/templates/admin/admin_log.html:57 +msgid "No actions yet" +msgstr "Brak akcji" + +#: rhodecode/templates/admin/ldap/ldap.html:5 +msgid "LDAP administration" +msgstr "Administracja LDAP" + +#: rhodecode/templates/admin/ldap/ldap.html:11 +msgid "Ldap" +msgstr "Ldap" + +#: rhodecode/templates/admin/ldap/ldap.html:28 +msgid "Connection settings" +msgstr "Ustawienia połączeń" + +#: rhodecode/templates/admin/ldap/ldap.html:30 +msgid "Enable LDAP" +msgstr "Włącz LDAP" + +#: rhodecode/templates/admin/ldap/ldap.html:34 +msgid "Host" +msgstr "Host" + +#: rhodecode/templates/admin/ldap/ldap.html:38 +msgid "Port" +msgstr "Port" + +#: rhodecode/templates/admin/ldap/ldap.html:42 +msgid "Account" +msgstr "Konto" + +#: rhodecode/templates/admin/ldap/ldap.html:50 +msgid "Connection security" +msgstr "Zabezpieczenie połączenia" + +#: rhodecode/templates/admin/ldap/ldap.html:54 +msgid "Certificate Checks" +msgstr "Kontrola certyfikatów" + +#: rhodecode/templates/admin/ldap/ldap.html:57 +msgid "Search settings" +msgstr "Ustawienia wyszukiwania" + +#: rhodecode/templates/admin/ldap/ldap.html:59 +msgid "Base DN" +msgstr "Bazowy DN" + +#: rhodecode/templates/admin/ldap/ldap.html:63 +msgid "LDAP Filter" +msgstr "Filtr LDAP" + +#: rhodecode/templates/admin/ldap/ldap.html:67 +msgid "LDAP Search Scope" +msgstr "Zakres wyszukiwania LDAP" + +#: rhodecode/templates/admin/ldap/ldap.html:70 +msgid "Attribute mappings" +msgstr "Mapowanie atrybutów" + +#: rhodecode/templates/admin/ldap/ldap.html:72 +msgid "Login Attribute" +msgstr "Atrybuty logowania" + +#: rhodecode/templates/admin/ldap/ldap.html:76 +msgid "First Name Attribute" +msgstr "Atrybut Nazwiska" + +#: rhodecode/templates/admin/ldap/ldap.html:80 +msgid "Last Name Attribute" +msgstr "Atrybut Imienia" + +#: rhodecode/templates/admin/ldap/ldap.html:84 +msgid "E-mail Attribute" +msgstr "Atrybut E-maila" + +#: rhodecode/templates/admin/ldap/ldap.html:89 +#: rhodecode/templates/admin/repos/repo_edit.html:141 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74 +#: rhodecode/templates/admin/settings/hooks.html:73 +#: rhodecode/templates/admin/users/user_edit.html:133 +#: rhodecode/templates/admin/users/user_edit.html:178 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:79 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:135 +#: rhodecode/templates/settings/repo_settings.html:93 +msgid "Save" +msgstr "Zapisz" + +#: rhodecode/templates/admin/notifications/notifications.html:5 +#: rhodecode/templates/admin/notifications/notifications.html:9 +msgid "My Notifications" +msgstr "Opcje powiadomień" + +#: rhodecode/templates/admin/notifications/notifications.html:29 +msgid "All" +msgstr "Wszystkie" + +#: rhodecode/templates/admin/notifications/notifications.html:30 +msgid "Comments" +msgstr "Komentarze" + +#: rhodecode/templates/admin/notifications/notifications.html:31 +#: rhodecode/templates/base/base.html:266 +#: rhodecode/templates/base/base.html:268 +msgid "Pull requests" +msgstr "Połączone gałęzie" + +#: rhodecode/templates/admin/notifications/notifications.html:35 +msgid "Mark all read" +msgstr "Oznacz wszystko jako przeczytane" + +#: rhodecode/templates/admin/notifications/notifications_data.html:39 +msgid "No notifications here yet" +msgstr "Brak powiadomień" + +#: rhodecode/templates/admin/notifications/show_notification.html:5 +#: rhodecode/templates/admin/notifications/show_notification.html:11 +msgid "Show notification" +msgstr "Pokaż powiadomienia" + +#: rhodecode/templates/admin/notifications/show_notification.html:9 +msgid "Notifications" +msgstr "Powiadomienia" + +#: rhodecode/templates/admin/permissions/permissions.html:5 +msgid "Permissions administration" +msgstr "Uprawnienia administracji" + +#: rhodecode/templates/admin/permissions/permissions.html:11 +#: rhodecode/templates/admin/repos/repo_edit.html:134 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58 +#: rhodecode/templates/admin/users/user_edit.html:143 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:100 +#: rhodecode/templates/settings/repo_settings.html:86 +msgid "Permissions" +msgstr "Uprawnienia" + +#: rhodecode/templates/admin/permissions/permissions.html:24 +msgid "Default permissions" +msgstr "Domyślne uprawnienia" + +#: rhodecode/templates/admin/permissions/permissions.html:31 +msgid "Anonymous access" +msgstr "Dostęp anonimowy" + +#: rhodecode/templates/admin/permissions/permissions.html:41 +msgid "Repository permission" +msgstr "Uprawnienia repozytorium" + +#: rhodecode/templates/admin/permissions/permissions.html:49 +msgid "" +"All default permissions on each repository will be reset to choosen " +"permission, note that all custom default permission on repositories 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:50 +msgid "overwrite existing settings" +msgstr "Nadpisz ustawienia" + +#: rhodecode/templates/admin/permissions/permissions.html:55 +msgid "Registration" +msgstr "Rejestracja" + +#: rhodecode/templates/admin/permissions/permissions.html:63 +msgid "Repository creation" +msgstr "Tworzenie repozytorium" + +#: rhodecode/templates/admin/permissions/permissions.html:71 +msgid "Repository forking" +msgstr "Rozwidlanie repozytorium" + +#: rhodecode/templates/admin/permissions/permissions.html:78 +#: rhodecode/templates/admin/repos/repo_edit.html:264 +msgid "set" +msgstr "ustaw" + +#: rhodecode/templates/admin/repos/repo_add.html:5 +#: rhodecode/templates/admin/repos/repo_add_create_repository.html:5 +msgid "Add repository" +msgstr "Dodaj repozytorium" + +#: rhodecode/templates/admin/repos/repo_add.html:11 +#: rhodecode/templates/admin/repos/repo_edit.html:11 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 +msgid "Repositories" +msgstr "Repozytoria" + +#: rhodecode/templates/admin/repos/repo_add.html:13 +msgid "add new" +msgstr "dodaj nowe" + +#: rhodecode/templates/admin/repos/repo_add_base.html:20 +#: rhodecode/templates/summary/summary.html:104 +#: rhodecode/templates/summary/summary.html:105 +msgid "Clone from" +msgstr "Klonuj z" + +#: rhodecode/templates/admin/repos/repo_add_base.html:24 +#: rhodecode/templates/admin/repos/repo_edit.html:44 +#: rhodecode/templates/settings/repo_settings.html:43 +msgid "Optional http[s] url from which repository should be cloned." +msgstr "Opcjonalnie http[s] url z którego repozytorium powinno być klonowane." + +#: rhodecode/templates/admin/repos/repo_add_base.html:29 +#: rhodecode/templates/admin/repos/repo_edit.html:49 +#: rhodecode/templates/admin/repos_groups/repos_groups.html:4 +#: rhodecode/templates/forks/fork.html:50 +#: rhodecode/templates/settings/repo_settings.html:48 +msgid "Repository group" +msgstr "Repozytorium grupy" + +#: rhodecode/templates/admin/repos/repo_add_base.html:33 +#: rhodecode/templates/forks/fork.html:54 +msgid "Optionaly select a group to put this repository into." +msgstr "Opcjonalnie wybierz grupę do wprowadzenia tego repozytorium." + +#: rhodecode/templates/admin/repos/repo_add_base.html:38 +#: rhodecode/templates/admin/repos/repo_edit.html:58 +msgid "Type" +msgstr "Typ" + +#: rhodecode/templates/admin/repos/repo_add_base.html:42 +msgid "Type of repository to create." +msgstr "Rodzaj repozytorium do stworzenia." + +#: rhodecode/templates/admin/repos/repo_add_base.html:47 +#: rhodecode/templates/admin/repos/repo_edit.html:66 +#: rhodecode/templates/forks/fork.html:41 +#: rhodecode/templates/settings/repo_settings.html:57 +msgid "Landing revision" +msgstr "Docelowa rewizja" + +#: rhodecode/templates/admin/repos/repo_add_base.html:51 +#: rhodecode/templates/admin/repos/repo_edit.html:70 +#: rhodecode/templates/forks/fork.html:45 +#: rhodecode/templates/settings/repo_settings.html:61 +msgid "Default revision for files page, downloads, whoosh and readme" +msgstr "Wersja domyślna dla plików stronicowania, pobierania plików, readme" + +#: rhodecode/templates/admin/repos/repo_add_base.html:60 +#: rhodecode/templates/admin/repos/repo_edit.html:79 +#: rhodecode/templates/forks/fork.html:63 +#: rhodecode/templates/settings/repo_settings.html:70 +msgid "Keep it short and to the point. Use a README file for longer descriptions." +msgstr "Powinna być krótka i na temat. Użyj pliku README dla dłuższych opisów." + +#: rhodecode/templates/admin/repos/repo_add_base.html:69 +#: rhodecode/templates/admin/repos/repo_edit.html:89 +#: rhodecode/templates/forks/fork.html:72 +#: rhodecode/templates/settings/repo_settings.html:80 +msgid "" +"Private repositories are only visible to people explicitly added as " +"collaborators." +msgstr "" +"Prywatne repozytoria są widoczne tylko dla osób bezpośrednio dodanych " +"jako współpracownicy." + +#: rhodecode/templates/admin/repos/repo_add_base.html:73 +msgid "add" +msgstr "dodaj" + +#: rhodecode/templates/admin/repos/repo_add_create_repository.html:9 +msgid "add new repository" +msgstr "dodaj nowe repozytorium" + +#: rhodecode/templates/admin/repos/repo_edit.html:5 +msgid "Edit repository" +msgstr "Edytuj repozytorium" + +#: rhodecode/templates/admin/repos/repo_edit.html:13 +#: rhodecode/templates/admin/users/user_edit.html:13 +#: rhodecode/templates/admin/users/user_edit.html:228 +#: rhodecode/templates/admin/users/user_edit.html:230 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:13 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:207 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:209 +#: rhodecode/templates/files/files_source.html:29 +#: rhodecode/templates/journal/journal_page_repos.html:29 +msgid "edit" +msgstr "edycja" + +#: rhodecode/templates/admin/repos/repo_edit.html:40 +#: rhodecode/templates/settings/repo_settings.html:39 +msgid "Clone uri" +msgstr "Klonowane uri" + +#: rhodecode/templates/admin/repos/repo_edit.html:53 +#: rhodecode/templates/settings/repo_settings.html:52 +msgid "Optional select a group to put this repository into." +msgstr "Opcjonalnie wybierz grupę do wprowadzenia tego repozytorium." + +#: rhodecode/templates/admin/repos/repo_edit.html:94 +msgid "Enable statistics" +msgstr "Włącz statystyki" + +#: rhodecode/templates/admin/repos/repo_edit.html:98 +msgid "Enable statistics window on summary page." +msgstr "Włącz okno statystyk na stronie podsumowania." + +#: rhodecode/templates/admin/repos/repo_edit.html:103 +msgid "Enable downloads" +msgstr "Włącz pobieranie" + +#: rhodecode/templates/admin/repos/repo_edit.html:107 +msgid "Enable download menu on summary page." +msgstr "Włącz menu pobierania na stronie podsumowania." + +#: rhodecode/templates/admin/repos/repo_edit.html:112 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66 +msgid "Enable locking" +msgstr "Włącz blokowanie" + +#: rhodecode/templates/admin/repos/repo_edit.html:116 +msgid "Enable lock-by-pulling on repository." +msgstr "Włącz blokowanie pobierania w repozytorium." + +#: rhodecode/templates/admin/repos/repo_edit.html:126 +msgid "Change owner of this repository." +msgstr "Zmiana właściciela tego repozytorium." + +#: rhodecode/templates/admin/repos/repo_edit.html:142 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75 +#: rhodecode/templates/admin/settings/settings.html:113 +#: rhodecode/templates/admin/settings/settings.html:179 +#: rhodecode/templates/admin/settings/settings.html:269 +#: rhodecode/templates/admin/users/user_edit.html:134 +#: rhodecode/templates/admin/users/user_edit.html:179 +#: rhodecode/templates/admin/users/user_edit.html:282 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:80 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:136 +#: rhodecode/templates/files/files_add.html:82 +#: rhodecode/templates/files/files_edit.html:68 +#: rhodecode/templates/pullrequests/pullrequest.html:124 +#: rhodecode/templates/settings/repo_settings.html:94 +msgid "Reset" +msgstr "Zresetuj" + +#: rhodecode/templates/admin/repos/repo_edit.html:152 +msgid "Administration" +msgstr "Administracja" + +#: rhodecode/templates/admin/repos/repo_edit.html:155 +msgid "Statistics" +msgstr "Statystyki" + +#: rhodecode/templates/admin/repos/repo_edit.html:159 +msgid "Reset current statistics" +msgstr "Zresetuj bieżące statystyki" + +#: rhodecode/templates/admin/repos/repo_edit.html:159 +msgid "Confirm to remove current statistics" +msgstr "Potwierdź usunięcie aktualnych statystyk" + +#: rhodecode/templates/admin/repos/repo_edit.html:162 +msgid "Fetched to rev" +msgstr "Ściągnięte do rev" + +#: rhodecode/templates/admin/repos/repo_edit.html:163 +msgid "Stats gathered" +msgstr "statystyki zgromadzone" + +#: rhodecode/templates/admin/repos/repo_edit.html:171 +msgid "Remote" +msgstr "Zdalnie" + +#: rhodecode/templates/admin/repos/repo_edit.html:175 +msgid "Pull changes from remote location" +msgstr "Prożba połączenia zmian z lokalizacji zdalnej" + +#: rhodecode/templates/admin/repos/repo_edit.html:175 +msgid "Confirm to pull changes from remote side" +msgstr "Potwierdź pull z zdalnej strony" + +#: rhodecode/templates/admin/repos/repo_edit.html:186 +msgid "Cache" +msgstr "Pamięć podręczna" + +#: rhodecode/templates/admin/repos/repo_edit.html:190 +msgid "Invalidate repository cache" +msgstr "Unieważnij pamięć podręczną repozytorium" + +#: rhodecode/templates/admin/repos/repo_edit.html:190 +msgid "Confirm to invalidate repository cache" +msgstr "Potwierdź unieważnienie pamięci podręcznej repozytorium" + +#: rhodecode/templates/admin/repos/repo_edit.html:193 +msgid "" +"Manually invalidate cache for this repository. On first access repository" +" will be cached again" +msgstr "" +"Ręcznie unieważnienie cache dla tego repozytorium. Przy pierwszym " +"dostępie do repozytorium zostanie dodany do bufora ponownie" + +#: rhodecode/templates/admin/repos/repo_edit.html:198 +msgid "List of cached values" +msgstr "Lista buforowanych wartości" + +#: rhodecode/templates/admin/repos/repo_edit.html:201 +msgid "Prefix" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:202 +#, fuzzy +msgid "Key" +msgstr "Klucz API" + +#: rhodecode/templates/admin/repos/repo_edit.html:203 +#: rhodecode/templates/admin/users/user_add.html:86 +#: rhodecode/templates/admin/users/user_edit.html:117 +#: rhodecode/templates/admin/users_groups/users_group_add.html:41 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:42 +msgid "Active" +msgstr "Aktywny" + +#: rhodecode/templates/admin/repos/repo_edit.html:218 +#: rhodecode/templates/base/base.html:330 +#: rhodecode/templates/base/base.html:332 +#: rhodecode/templates/base/base.html:334 +msgid "Public journal" +msgstr "Dziennik publiczny" + +#: rhodecode/templates/admin/repos/repo_edit.html:224 +msgid "Remove from public journal" +msgstr "Usuń z dziennika publicznego" + +#: rhodecode/templates/admin/repos/repo_edit.html:226 +msgid "Add to public journal" +msgstr "Dodaj do dziennika publicznego" + +#: rhodecode/templates/admin/repos/repo_edit.html:231 +msgid "" +"All actions made on this repository will be accessible to everyone in " +"public journal" +msgstr "" +"Wszystkie działania wykonywane na tym repozytorium będą dostępne dla " +"wszystkich w dzienniku publicznym" + +#: rhodecode/templates/admin/repos/repo_edit.html:238 +msgid "Locking" +msgstr "Blokuj" + +#: rhodecode/templates/admin/repos/repo_edit.html:243 +msgid "Unlock locked repo" +msgstr "Odblokuj zablokowane repo" + +#: rhodecode/templates/admin/repos/repo_edit.html:243 +msgid "Confirm to unlock repository" +msgstr "Potwierdź odblokowanie repozytorium" + +#: rhodecode/templates/admin/repos/repo_edit.html:246 +msgid "lock repo" +msgstr "blokada repo" + +#: rhodecode/templates/admin/repos/repo_edit.html:246 +msgid "Confirm to lock repository" +msgstr "Potwierdź blokowanie repozytorium" + +#: rhodecode/templates/admin/repos/repo_edit.html:247 +msgid "Repository is not locked" +msgstr "Repozytorium nie jest zablokowane" + +#: rhodecode/templates/admin/repos/repo_edit.html:252 +msgid "Force locking on repository. Works only when anonymous access is disabled" +msgstr "" +"Wymuś blokowanie na repozytorium. Działa tylko wtedy, gdy dostęp " +"anonimowy jest wyłączony" + +#: rhodecode/templates/admin/repos/repo_edit.html:259 +msgid "Set as fork of" +msgstr "Ustaw jako rozwidlenie" + +#: rhodecode/templates/admin/repos/repo_edit.html:268 +msgid "Manually set this repository as a fork of another from the list" +msgstr "Ręczne ustawienie rozwidlenia z listy" + +#: rhodecode/templates/admin/repos/repo_edit.html:274 +#: rhodecode/templates/changeset/changeset_file_comment.html:26 +msgid "Delete" +msgstr "Usuń" + +#: rhodecode/templates/admin/repos/repo_edit.html:278 +msgid "Remove this repository" +msgstr "Usuń to repozytorium" + +#: rhodecode/templates/admin/repos/repo_edit.html:278 +msgid "Confirm to delete this repository" +msgstr "Potwierdź, aby usunąć repozytorium" + +#: rhodecode/templates/admin/repos/repo_edit.html:282 +msgid "" +"This repository will be renamed in a special way in order to be " +"unaccesible for RhodeCode and VCS systems.\n" +" If you need fully delete it from filesystem " +"please do it manually" +msgstr "" +"To repozytorium zostanie zmienione w sposób szczególny, żeby było " +"niedostępne dla strony i systemów VCS.\n" +" Jeśli chcesz całkowicie usunąć go z systemu " +"plików prosimy zrobić to ręcznie" + +#: rhodecode/templates/admin/repos/repo_edit_perms.html:3 +#: rhodecode/templates/admin/repos_groups/repos_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 +msgid "read" +msgstr "odczyt" + +#: rhodecode/templates/admin/repos/repo_edit_perms.html:5 +#: rhodecode/templates/admin/repos_groups/repos_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/users.html:85 +#: rhodecode/templates/base/base.html:229 +msgid "admin" +msgstr "administracja" + +#: rhodecode/templates/admin/repos/repo_edit_perms.html:7 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:7 +msgid "member" +msgstr "użytkownik" + +#: rhodecode/templates/admin/repos/repo_edit_perms.html:16 +#: rhodecode/templates/data_table/_dt_elements.html:67 +#: rhodecode/templates/journal/journal.html:87 +#: rhodecode/templates/summary/summary.html:85 +msgid "private repository" +msgstr "prywatne repozytorium" + +#: rhodecode/templates/admin/repos/repo_edit_perms.html:19 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:28 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:18 +msgid "default" +msgstr "domyślne" + +#: rhodecode/templates/admin/repos/repo_edit_perms.html:33 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:58 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:23 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:42 +msgid "revoke" +msgstr "odwołane" + +#: rhodecode/templates/admin/repos/repo_edit_perms.html:83 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:67 +msgid "Add another member" +msgstr "Dodaj kolejnego użytkownika" + +#: rhodecode/templates/admin/repos/repo_edit_perms.html:97 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 +msgid "Failed to remove user" +msgstr "Nie udało się usunąć użytkownika" + +#: rhodecode/templates/admin/repos/repo_edit_perms.html:112 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:103 +msgid "Failed to remove users group" +msgstr "Nie udało się usunąć grupy użytkowników" + +#: rhodecode/templates/admin/repos/repos.html:5 +msgid "Repositories administration" +msgstr "Administracja repozytoriami" + +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:73 +msgid "apply to children" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:74 +msgid "" +"Set or revoke permission to all children of that group, including " +"repositories and other groups" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_groups.html:9 +#: rhodecode/templates/base/base.html:122 +#: rhodecode/templates/base/base.html:312 +#: rhodecode/templates/base/base.html:314 +#: rhodecode/templates/base/base.html:316 +#: rhodecode/templates/bookmarks/bookmarks.html:11 +#: rhodecode/templates/branches/branches.html:10 +#: rhodecode/templates/changelog/changelog.html:10 +#: rhodecode/templates/changeset/changeset.html:10 +#: rhodecode/templates/changeset/changeset_range.html:9 +#: rhodecode/templates/compare/compare_diff.html:9 +#: rhodecode/templates/files/file_diff.html:8 +#: rhodecode/templates/files/files.html:8 +#: rhodecode/templates/files/files_add.html:15 +#: rhodecode/templates/files/files_edit.html:15 +#: rhodecode/templates/followers/followers.html:9 +#: rhodecode/templates/forks/fork.html:9 rhodecode/templates/forks/forks.html:9 +#: rhodecode/templates/pullrequests/pullrequest.html:8 +#: rhodecode/templates/pullrequests/pullrequest_show.html:8 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 +#: rhodecode/templates/settings/repo_settings.html:9 +#: rhodecode/templates/shortlog/shortlog.html:10 +#: rhodecode/templates/summary/summary.html:8 +#: rhodecode/templates/tags/tags.html:11 +msgid "Home" +msgstr "Strona Główna" + +#: rhodecode/templates/admin/repos_groups/repos_groups.html:13 +msgid "with" +msgstr "używając" + +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5 +msgid "Add repos group" +msgstr "Dodaj grupę repos" + +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:10 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:10 +msgid "Repos groups" +msgstr "Grupy repos" + +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:12 +msgid "add new repos group" +msgstr "dodaj nową grupę repozytorium" + +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:50 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:50 +msgid "Group parent" +msgstr "Dominująca grupa" + +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:58 +#: rhodecode/templates/admin/users/user_add.html:94 +#: rhodecode/templates/admin/users_groups/users_group_add.html:49 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:90 +#: rhodecode/templates/pullrequests/pullrequest_show.html:131 +msgid "save" +msgstr "zapisz" + +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:5 +msgid "Edit repos group" +msgstr "Edytuj grupy repo" + +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:12 +msgid "edit repos group" +msgstr "edytuj grupy repo" + +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:70 +msgid "" +"Enable lock-by-pulling on group. This option will be applied to all other" +" groups and repositories inside" +msgstr "" +"Włącz blokowanie pulling przez grupy. Opcja ta będzie stosowana do " +"wszystkich innych grup i repozytoriów wewnątrz" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5 +msgid "Repositories groups administration" +msgstr "Repozytoria grup administracyjnych" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:22 +msgid "ADD NEW GROUP" +msgstr "DODAJ NOWĄ GRUPĘ" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:35 +msgid "Number of toplevel repositories" +msgstr "Liczba najwyższego poziomu repozytorium" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36 +#: rhodecode/templates/admin/users/users.html:87 +#: rhodecode/templates/admin/users_groups/users_groups.html:35 +msgid "action" +msgstr "działanie" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55 +#: rhodecode/templates/admin/users/user_edit.html:259 +#: rhodecode/templates/admin/users_groups/users_groups.html:44 +#: rhodecode/templates/data_table/_dt_elements.html:7 +#: rhodecode/templates/data_table/_dt_elements.html:121 +msgid "delete" +msgstr "usuń" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55 +#, fuzzy, python-format +msgid "Confirm to delete this group: %s with %s repository" +msgid_plural "Confirm to delete this group: %s with %s repositories" +msgstr[0] "Potwierdz aby usunąć grupę %s wraz z %s repozytorium" +msgstr[1] "Potwierdz aby usunąć grupę %s wraz z %s repozytoriami" +msgstr[2] "Potwierdz aby usunąć grupę %s wraz z %s repozytoriami" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:63 +msgid "There are no repositories groups yet" +msgstr "Nie ma jeszcze grup repozytoriów" + +#: rhodecode/templates/admin/settings/hooks.html:5 +#: rhodecode/templates/admin/settings/settings.html:5 +msgid "Settings administration" +msgstr "Ustawienia administracji" + +#: rhodecode/templates/admin/settings/hooks.html:9 +#: rhodecode/templates/admin/settings/settings.html:9 +#: rhodecode/templates/settings/repo_settings.html:13 +msgid "Settings" +msgstr "Ustawienia" + +#: rhodecode/templates/admin/settings/hooks.html:24 +msgid "Built in hooks - read only" +msgstr "Wbudowana w aktualizację - tylko do odczytu" + +#: rhodecode/templates/admin/settings/hooks.html:40 +msgid "Custom hooks" +msgstr "Niestandardowa aktualizacja" + +#: rhodecode/templates/admin/settings/hooks.html:56 +msgid "remove" +msgstr "usuń" + +#: rhodecode/templates/admin/settings/hooks.html:88 +msgid "Failed to remove hook" +msgstr "Nie udało się usunąć hooka" + +#: rhodecode/templates/admin/settings/settings.html:24 +msgid "Remap and rescan repositories" +msgstr "Mapowanie i skanowanie repozytorów" + +#: rhodecode/templates/admin/settings/settings.html:32 +msgid "rescan option" +msgstr "ponowne skanowanie opcji" + +#: rhodecode/templates/admin/settings/settings.html:38 +msgid "" +"In case a repository was deleted from filesystem and there are leftovers " +"in the database check this option to scan obsolete data in database and " +"remove it." +msgstr "" +"W przypadku repozytoriów zostaną usunięte systemy plików i jeśli są " +"pozostałości w bazie danych to ta opcja sprawdzi ją oraz przeskanuje, a " +"następnie usunie je z bazy danych." + +#: rhodecode/templates/admin/settings/settings.html:39 +msgid "destroy old data" +msgstr "zniszcz stare dane" + +#: rhodecode/templates/admin/settings/settings.html:41 +msgid "" +"Rescan repositories location for new repositories. Also deletes obsolete " +"if `destroy` flag is checked " +msgstr "" +"Skanowanie ponowne lokalizacji dla nowych repozytoriów. Usuwa również " +"nieaktualne jeśli została zaznaczona flaga `zniszcz` do sprawdzana" + +#: rhodecode/templates/admin/settings/settings.html:46 +msgid "Rescan repositories" +msgstr "Skanuj ponownie repozytoria" + +#: rhodecode/templates/admin/settings/settings.html:52 +msgid "Whoosh indexing" +msgstr "indeksowanie Whoosh" + +#: rhodecode/templates/admin/settings/settings.html:60 +msgid "index build option" +msgstr "opcja budowania indeksowania" + +#: rhodecode/templates/admin/settings/settings.html:65 +msgid "build from scratch" +msgstr "buduj od podstaw" + +#: rhodecode/templates/admin/settings/settings.html:71 +msgid "Reindex" +msgstr "Indeksuj ponownie" + +#: rhodecode/templates/admin/settings/settings.html:77 +msgid "Global application settings" +msgstr "Globalne ustawienia aplikacji" + +#: rhodecode/templates/admin/settings/settings.html:86 +msgid "Application name" +msgstr "Nazwa aplikacji" + +#: rhodecode/templates/admin/settings/settings.html:95 +msgid "Realm text" +msgstr "Realny tekst" + +#: rhodecode/templates/admin/settings/settings.html:104 +msgid "GA code" +msgstr "GA kod" + +#: rhodecode/templates/admin/settings/settings.html:112 +#: rhodecode/templates/admin/settings/settings.html:178 +#: rhodecode/templates/admin/settings/settings.html:268 +msgid "Save settings" +msgstr "Zapisz ustawienia" + +#: rhodecode/templates/admin/settings/settings.html:119 +msgid "Visualisation settings" +msgstr "Ustawienia wizualizacji" + +#: rhodecode/templates/admin/settings/settings.html:127 +#, fuzzy +msgid "General" +msgstr "włącz" + +#: rhodecode/templates/admin/settings/settings.html:132 +msgid "Use lightweight dashboard" +msgstr "Użyj lekkiego pulpitu" + +#: rhodecode/templates/admin/settings/settings.html:139 +msgid "Icons" +msgstr "Ikony" + +#: rhodecode/templates/admin/settings/settings.html:144 +msgid "Show public repo icon on repositories" +msgstr "Pokazuj w publicznym repo ikonę w repozytoriach" + +#: rhodecode/templates/admin/settings/settings.html:148 +msgid "Show private repo icon on repositories" +msgstr "Pokazuj w prywatnym repo ikonę w repozytoriach" + +#: rhodecode/templates/admin/settings/settings.html:155 +msgid "Meta-Tagging" +msgstr "Tagowanie meta" + +#: rhodecode/templates/admin/settings/settings.html:160 +msgid "Stylify recognised metatags:" +msgstr "Stylizacja rozpoznanych meta tagów:" + +#: rhodecode/templates/admin/settings/settings.html:187 +msgid "VCS settings" +msgstr "VCS ustawienia" + +#: rhodecode/templates/admin/settings/settings.html:196 +msgid "Web" +msgstr "www" + +#: rhodecode/templates/admin/settings/settings.html:201 +msgid "require ssl for vcs operations" +msgstr "wymagaj ssl dla operacji vcs" + +#: rhodecode/templates/admin/settings/settings.html:203 +msgid "" +"RhodeCode will require SSL for pushing or pulling. If SSL is missing it " +"will return HTTP Error 406: Not Acceptable" +msgstr "" +"RhodeCode wymaga SSL do wysłania zmian lub pobierania. Jeśli brakuje SSL " +"zwróci błąd HTTP 406: Not Acceptable" + +#: rhodecode/templates/admin/settings/settings.html:209 +msgid "Hooks" +msgstr "Aktualizacja" + +#: rhodecode/templates/admin/settings/settings.html:214 +msgid "Update repository after push (hg update)" +msgstr "Aktualizacja repozytorium po wysłaniu zmian (aktualizacja hg)" + +#: rhodecode/templates/admin/settings/settings.html:218 +msgid "Show repository size after push" +msgstr "Pokaż rozmiar repozytorium po wysłaniu zmian" + +#: rhodecode/templates/admin/settings/settings.html:222 +msgid "Log user push commands" +msgstr "Logi poleceń wysłania zmian użytkowników" + +#: rhodecode/templates/admin/settings/settings.html:226 +msgid "Log user pull commands" +msgstr "Logi poleceń połączenia gałęzi użytkowników" + +#: rhodecode/templates/admin/settings/settings.html:230 +msgid "advanced setup" +msgstr "zaawansowane ustawienia" + +#: rhodecode/templates/admin/settings/settings.html:235 +msgid "Mercurial Extensions" +msgstr "Rozszerzenia Mercurial" + +#: rhodecode/templates/admin/settings/settings.html:240 +msgid "largefiles extensions" +msgstr "rozszerzenia dużych pliów" + +#: rhodecode/templates/admin/settings/settings.html:244 +msgid "hgsubversion extensions" +msgstr "rozszerzenia hgsubversion" + +#: rhodecode/templates/admin/settings/settings.html:246 +msgid "" +"Requires hgsubversion library installed. Allows clonning from svn remote " +"locations" +msgstr "" +"Wymaga biblioteki hgsubversion zainstalowanej. Umożliwia klonowanie z " +"zdalnych lokalizacji svn" + +#: rhodecode/templates/admin/settings/settings.html:256 +msgid "Repositories location" +msgstr "Położenie repozytorium" + +#: rhodecode/templates/admin/settings/settings.html:261 +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 "" +"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:262 +#: rhodecode/templates/base/base.html:221 +msgid "unlock" +msgstr "odblokowany" + +#: rhodecode/templates/admin/settings/settings.html:263 +msgid "" +"Location where repositories are stored. After changing this value a " +"restart, and rescan is required" +msgstr "" +"Miejsce, w którym przechowywane są repozytoria. Po zmianie tej wartości " +"jest wymagany restart i ponowne skanowanie" + +#: rhodecode/templates/admin/settings/settings.html:283 +msgid "Test Email" +msgstr "Test e-maila" + +#: rhodecode/templates/admin/settings/settings.html:291 +msgid "Email to" +msgstr "E-mail do" + +#: rhodecode/templates/admin/settings/settings.html:299 +msgid "Send" +msgstr "Wyślij" + +#: rhodecode/templates/admin/settings/settings.html:305 +msgid "System Info and Packages" +msgstr "Informacje Systemowe i pakiety" + +#: rhodecode/templates/admin/settings/settings.html:308 +msgid "show" +msgstr "pokaż" + +#: rhodecode/templates/admin/users/user_add.html:5 +msgid "Add user" +msgstr "Dodaj użytkownika" + +#: rhodecode/templates/admin/users/user_add.html:10 +#: rhodecode/templates/admin/users/user_edit.html:11 +msgid "Users" +msgstr "Użytkownicy" + +#: rhodecode/templates/admin/users/user_add.html:12 +msgid "add new user" +msgstr "dodaj nowego użytkownika" + +#: rhodecode/templates/admin/users/user_add.html:50 +msgid "Password confirmation" +msgstr "Potwierdzenie hasła" + +#: rhodecode/templates/admin/users/user_edit.html:5 +msgid "Edit user" +msgstr "Edytuj użytkownika" + +#: rhodecode/templates/admin/users/user_edit.html:34 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:10 +msgid "Change your avatar at" +msgstr "Zmiana awataru na" + +#: rhodecode/templates/admin/users/user_edit.html:35 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:11 +msgid "Using" +msgstr "Używa:" + +#: rhodecode/templates/admin/users/user_edit.html:43 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:20 +msgid "API key" +msgstr "Klucz API" + +#: rhodecode/templates/admin/users/user_edit.html:63 +msgid "LDAP DN" +msgstr "LDAP DN" + +#: rhodecode/templates/admin/users/user_edit.html:72 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:35 +msgid "New password" +msgstr "Nowe hasło" + +#: rhodecode/templates/admin/users/user_edit.html:81 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:44 +msgid "New password confirmation" +msgstr "Potwierdzenie nowego hasła" + +#: rhodecode/templates/admin/users/user_edit.html:151 +#: 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:156 +#: 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:162 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:119 +msgid "Create repositories" +msgstr "Utwórz repozytorium" + +#: rhodecode/templates/admin/users/user_edit.html:170 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:127 +msgid "Fork repositories" +msgstr "Rozwidlenie repozytorium" + +#: rhodecode/templates/admin/users/user_edit.html:190 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39 +msgid "Nothing here yet" +msgstr "Nic tu nie ma jeszcze" + +#: rhodecode/templates/admin/users/user_edit.html:197 +#: rhodecode/templates/admin/users/user_edit_my_account.html:60 +#: rhodecode/templates/admin/users/user_edit_my_account.html:217 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:185 +msgid "Permission" +msgstr "Uprawnienia" + +#: rhodecode/templates/admin/users/user_edit.html:198 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:186 +msgid "Edit Permission" +msgstr "Edycja Uprawnień" + +#: rhodecode/templates/admin/users/user_edit.html:247 +msgid "Email addresses" +msgstr "Adresy e-mail" + +#: rhodecode/templates/admin/users/user_edit.html:260 +#, python-format +msgid "Confirm to delete this email: %s" +msgstr "Potwierdź, aby usunąć ten e-mail: %s" + +#: rhodecode/templates/admin/users/user_edit.html:274 +msgid "New email address" +msgstr "Nowy adres e-mail" + +#: rhodecode/templates/admin/users/user_edit.html:281 +msgid "Add" +msgstr "Dodaj" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:5 +#: rhodecode/templates/base/base.html:124 +msgid "My account" +msgstr "Moje konto" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:9 +msgid "My Account" +msgstr "Moje konto" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:35 +msgid "My permissions" +msgstr "Moje uprawnienia" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:38 +#: rhodecode/templates/journal/journal.html:41 +msgid "My repos" +msgstr "Moje repo" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:41 +msgid "My pull requests" +msgstr "Moje prośby połączenia gałęzi" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:45 +msgid "Add repo" +msgstr "Dodaj repo" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2 +msgid "Opened by me" +msgstr "Otwarty przez mnie" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:10 +#, python-format +msgid "Pull request #%s opened on %s" +msgstr "Wniosek połączenia gałęzi #%s otwarty %s" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15 +msgid "Confirm to delete this pull request" +msgstr "Potwierdź usunięcie połączenia gałęzi" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:26 +msgid "I participate in" +msgstr "Biorę udział w" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:33 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:30 +#, python-format +msgid "Pull request #%s opened by %s on %s" +msgstr "Wniosek połączenia gałęzi #%s otwarty %s dnia %s" + +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:7 +#: rhodecode/templates/bookmarks/bookmarks.html:40 +#: rhodecode/templates/bookmarks/bookmarks_data.html:9 +#: rhodecode/templates/branches/branches.html:54 +#: rhodecode/templates/branches/branches_data.html:9 +#: rhodecode/templates/journal/journal_page_repos.html:8 +#: rhodecode/templates/tags/tags.html:55 +#: rhodecode/templates/tags/tags_data.html:9 +msgid "Revision" +msgstr "Rewizja" + +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28 +#: rhodecode/templates/journal/journal_page_repos.html:29 +msgid "private" +msgstr "prywatny" + +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:31 +#: rhodecode/templates/data_table/_dt_elements.html:7 +#: rhodecode/templates/journal/journal_page_repos.html:32 +#, python-format +msgid "Confirm to delete this repository: %s" +msgstr "Potwierdź usunięcie repozytorium: %s" + +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:38 +#: rhodecode/templates/journal/journal_page_repos.html:42 +msgid "No repositories yet" +msgstr "Nie ma jeszcze repozytoriów" + +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:40 +#: rhodecode/templates/journal/journal_page_repos.html:44 +msgid "create one now" +msgstr "utwórz je teraz" + +#: rhodecode/templates/admin/users/users.html:5 +msgid "Users administration" +msgstr "Administracja użytkownikami" + +#: rhodecode/templates/admin/users/users.html:9 +#: rhodecode/templates/base/base.html:235 +msgid "users" +msgstr "użytkownicy" + +#: rhodecode/templates/admin/users/users.html:23 +msgid "ADD NEW USER" +msgstr "DODAJ NOWEGO UŻYTKOWNIKA" + +#: rhodecode/templates/admin/users/users.html:77 +msgid "username" +msgstr "nazwa użytkownika" + +#: rhodecode/templates/admin/users/users.html:80 +msgid "firstname" +msgstr "imię" + +#: rhodecode/templates/admin/users/users.html:81 +msgid "lastname" +msgstr "nazwisko" + +#: rhodecode/templates/admin/users/users.html:82 +msgid "last login" +msgstr "ostatnio zalogowany" + +#: rhodecode/templates/admin/users/users.html:84 +#: rhodecode/templates/admin/users_groups/users_groups.html:34 +msgid "active" +msgstr "aktywny" + +#: rhodecode/templates/admin/users/users.html:86 +#: rhodecode/templates/base/base.html:238 +msgid "ldap" +msgstr "ldap" + +#: rhodecode/templates/admin/users_groups/users_group_add.html:5 +msgid "Add users group" +msgstr "Dodaj grupę użytkowników" + +#: rhodecode/templates/admin/users_groups/users_group_add.html:10 +#: rhodecode/templates/admin/users_groups/users_groups.html:9 +msgid "Users groups" +msgstr "Grupy użytkowników" + +#: rhodecode/templates/admin/users_groups/users_group_add.html:12 +msgid "add new users group" +msgstr "dodaj nową grupę użytkowników" + +#: rhodecode/templates/admin/users_groups/users_group_edit.html:5 +msgid "Edit users group" +msgstr "Edytuj grupę użytkowników" + +#: rhodecode/templates/admin/users_groups/users_group_edit.html:11 +msgid "UsersGroups" +msgstr "Grupy użytkowników" + +#: rhodecode/templates/admin/users_groups/users_group_edit.html:50 +msgid "Members" +msgstr "Użytkownik" + +#: rhodecode/templates/admin/users_groups/users_group_edit.html:58 +msgid "Choosen group members" +msgstr "Wybrane grupy użytkowników" + +#: rhodecode/templates/admin/users_groups/users_group_edit.html:61 +msgid "Remove all elements" +msgstr "Usuń wszystkie elementy" + +#: rhodecode/templates/admin/users_groups/users_group_edit.html:75 +msgid "Available members" +msgstr "Dostępni użytkownicy" + +#: rhodecode/templates/admin/users_groups/users_group_edit.html:79 +msgid "Add all elements" +msgstr "Dodaj wszystkie elementy" + +#: rhodecode/templates/admin/users_groups/users_group_edit.html:146 +msgid "Group members" +msgstr "Grupy użytkowników" + +#: rhodecode/templates/admin/users_groups/users_group_edit.html:163 +msgid "No members yet" +msgstr "Nie ma jeszcze żadnego użytkownika" + +#: rhodecode/templates/admin/users_groups/users_group_edit.html:171 +msgid "Permissions defined for this group" +msgstr "Uprawnienia określone dla tej grupy" + +#: rhodecode/templates/admin/users_groups/users_group_edit.html:178 +msgid "No permissions set yet" +msgstr "Nie ma jeszcze ustawionych uprawnień" + +#: rhodecode/templates/admin/users_groups/users_groups.html:5 +msgid "Users groups administration" +msgstr "Użytkownicy grupy administracji" + +#: rhodecode/templates/admin/users_groups/users_groups.html:23 +msgid "ADD NEW USER GROUP" +msgstr "DODAJ NOWĄ GRUPĘ UŻYTKOWNIKÓW" + +#: rhodecode/templates/admin/users_groups/users_groups.html:32 +msgid "group name" +msgstr "nazwa grupy" + +#: rhodecode/templates/admin/users_groups/users_groups.html:33 +#: rhodecode/templates/base/root.html:46 +msgid "members" +msgstr "użytkownik" + +#: rhodecode/templates/admin/users_groups/users_groups.html:45 +#, python-format +msgid "Confirm to delete this users group: %s" +msgstr "Potwierdź usunięcie grupy użytkowników: %s" + +#: rhodecode/templates/base/base.html:41 +msgid "Submit a bug" +msgstr "Prześlij błąd" + +#: rhodecode/templates/base/base.html:77 +msgid "Login to your account" +msgstr "Zaloguj się do swojego konta" + +#: rhodecode/templates/base/base.html:100 +msgid "Forgot password ?" +msgstr "Nie pamiętasz hasła?" + +#: rhodecode/templates/base/base.html:107 +msgid "Log In" +msgstr "Zaloguj się" + +#: rhodecode/templates/base/base.html:118 +msgid "Inbox" +msgstr "Odebrana poczta" + +#: rhodecode/templates/base/base.html:123 +#: rhodecode/templates/base/base.html:321 +#: rhodecode/templates/base/base.html:323 +#: rhodecode/templates/base/base.html:325 +#: rhodecode/templates/journal/journal.html:4 +#: rhodecode/templates/journal/journal.html:21 +#: rhodecode/templates/journal/public_journal.html:4 +msgid "Journal" +msgstr "Dziennik" + +#: rhodecode/templates/base/base.html:125 +msgid "Log Out" +msgstr "Wyloguj się" + +#: rhodecode/templates/base/base.html:144 +msgid "Switch repository" +msgstr "Przełącz repozytorium" + +#: rhodecode/templates/base/base.html:146 +msgid "Products" +msgstr "Produkty" + +#: rhodecode/templates/base/base.html:152 +#: rhodecode/templates/base/base.html:182 rhodecode/templates/base/root.html:47 +msgid "loading..." +msgstr "wczytywanie..." + +#: rhodecode/templates/base/base.html:158 +#: rhodecode/templates/base/base.html:160 +#: rhodecode/templates/base/base.html:162 +#: rhodecode/templates/data_table/_dt_elements.html:15 +#: rhodecode/templates/data_table/_dt_elements.html:17 +#: rhodecode/templates/data_table/_dt_elements.html:19 +msgid "Summary" +msgstr "Podsumowanie" + +#: rhodecode/templates/base/base.html:166 +#: rhodecode/templates/base/base.html:168 +#: rhodecode/templates/base/base.html:170 +#: rhodecode/templates/changelog/changelog.html:15 +#: rhodecode/templates/data_table/_dt_elements.html:23 +#: rhodecode/templates/data_table/_dt_elements.html:25 +#: rhodecode/templates/data_table/_dt_elements.html:27 +msgid "Changelog" +msgstr "Dziennik zmian" + +#: rhodecode/templates/base/base.html:175 +#: rhodecode/templates/base/base.html:177 +#: rhodecode/templates/base/base.html:179 +msgid "Switch to" +msgstr "Przełącz do" + +#: rhodecode/templates/base/base.html:186 +#: rhodecode/templates/base/base.html:188 +#: rhodecode/templates/base/base.html:190 +#: rhodecode/templates/data_table/_dt_elements.html:31 +#: rhodecode/templates/data_table/_dt_elements.html:33 +#: rhodecode/templates/data_table/_dt_elements.html:35 +msgid "Files" +msgstr "Pliki" + +#: rhodecode/templates/base/base.html:195 +#: rhodecode/templates/base/base.html:199 +msgid "Options" +msgstr "Opcje" + +#: rhodecode/templates/base/base.html:204 +#: rhodecode/templates/base/base.html:206 +msgid "repository settings" +msgstr "ustawienia repozytorium" + +#: rhodecode/templates/base/base.html:210 +#: rhodecode/templates/data_table/_dt_elements.html:80 +#: rhodecode/templates/forks/fork.html:13 +msgid "fork" +msgstr "gałąż" + +#: rhodecode/templates/base/base.html:212 rhodecode/templates/base/root.html:50 +#: rhodecode/templates/changelog/changelog.html:43 +msgid "Open new pull request" +msgstr "Otwórz nową prośbę o połączenie gałęzi" + +#: rhodecode/templates/base/base.html:215 +#: rhodecode/templates/forks/forks_data.html:21 +msgid "Compare fork" +msgstr "Porównaj rozwidlenie" + +#: rhodecode/templates/base/base.html:217 +msgid "search" +msgstr "szukaj" + +#: rhodecode/templates/base/base.html:223 +msgid "lock" +msgstr "zablokowane" + +#: rhodecode/templates/base/base.html:234 +msgid "repositories groups" +msgstr "grupy w repozytorium" + +#: rhodecode/templates/base/base.html:236 +msgid "users groups" +msgstr "grupy użytkowników" + +#: rhodecode/templates/base/base.html:237 +msgid "permissions" +msgstr "uprawnienia" + +#: rhodecode/templates/base/base.html:239 +msgid "settings" +msgstr "ustawienia" + +#: rhodecode/templates/base/base.html:250 +#: rhodecode/templates/base/base.html:252 +msgid "Followers" +msgstr "Obserwowane" + +#: rhodecode/templates/base/base.html:258 +#: rhodecode/templates/base/base.html:260 +msgid "Forks" +msgstr "Gałęzie" + +#: rhodecode/templates/base/base.html:339 +#: rhodecode/templates/base/base.html:341 +#: rhodecode/templates/base/base.html:343 +#: rhodecode/templates/search/search.html:52 +msgid "Search" +msgstr "Szukaj" + +#: rhodecode/templates/base/root.html:42 +msgid "add another comment" +msgstr "dodaj kolejny komentarz" + +#: rhodecode/templates/base/root.html:43 +#: rhodecode/templates/journal/journal.html:75 +#: rhodecode/templates/summary/summary.html:57 +msgid "Stop following this repository" +msgstr "Zakończyć obserwację tego repozytorium" + +#: rhodecode/templates/base/root.html:44 +#: rhodecode/templates/summary/summary.html:61 +msgid "Start following this repository" +msgstr "Zacznij obserwację tego repozytorium" + +#: rhodecode/templates/base/root.html:45 +msgid "Group" +msgstr "Grupa" + +#: rhodecode/templates/base/root.html:48 +msgid "search truncated" +msgstr "wyszukaj obcięte" + +#: rhodecode/templates/base/root.html:49 +msgid "no matching files" +msgstr "nie ma plików pasujących" + +#: rhodecode/templates/base/root.html:51 +msgid "Open new pull request for selected changesets" +msgstr "Otwórz nową prośbę o połączenie gałęzi w zestawieniu zmian" + +#: rhodecode/templates/base/root.html:52 +msgid "Show selected changes __S -> __E" +msgstr "Pokaż wybrane zmiany __S -> __E" + +#: rhodecode/templates/base/root.html:53 +msgid "Selection link" +msgstr "Wybór linku" + +#: rhodecode/templates/bookmarks/bookmarks.html:5 +#, python-format +msgid "%s Bookmarks" +msgstr "%s Zakładki" + +#: rhodecode/templates/bookmarks/bookmarks.html:39 +#: rhodecode/templates/bookmarks/bookmarks_data.html:8 +#: rhodecode/templates/branches/branches.html:53 +#: rhodecode/templates/branches/branches_data.html:8 +#: rhodecode/templates/tags/tags.html:54 +#: rhodecode/templates/tags/tags_data.html:8 +msgid "Author" +msgstr "Autor" + +#: rhodecode/templates/branches/branches.html:5 +#, python-format +msgid "%s Branches" +msgstr "%s Gałęzie" + +#: rhodecode/templates/branches/branches.html:29 +msgid "Compare branches" +msgstr "porównaj gałęzie" + +#: rhodecode/templates/branches/branches.html:56 +#: rhodecode/templates/branches/branches_data.html:10 +#: rhodecode/templates/compare/compare_diff.html:5 +#: rhodecode/templates/compare/compare_diff.html:13 +#: rhodecode/templates/tags/tags.html:57 +#: rhodecode/templates/tags/tags_data.html:10 +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:15 +#, python-format +msgid "showing %d out of %d revision" +msgid_plural "showing %d out of %d revisions" +msgstr[0] "pokazano %d z rewizji %d" +msgstr[1] "pokazano %d w rewizjach %d" +msgstr[2] "pokazano %d w rewizjach %d" + +#: rhodecode/templates/changelog/changelog.html:37 +msgid "Clear selection" +msgstr "Wyczyść zaznaczenie" + +#: rhodecode/templates/changelog/changelog.html:40 +#: rhodecode/templates/forks/forks_data.html:19 +#, python-format +msgid "compare fork with %s" +msgstr "porównaj gałęzie %s" + +#: rhodecode/templates/changelog/changelog.html:40 +#, fuzzy +msgid "Compare fork with parent" +msgstr "porównaj fork w rodzicem" + +#: rhodecode/templates/changelog/changelog.html:49 +msgid "Show" +msgstr "Wyświetl" + +#: rhodecode/templates/changelog/changelog.html:74 +#: rhodecode/templates/summary/summary.html:375 +msgid "show more" +msgstr "pokaż więcej" + +#: rhodecode/templates/changelog/changelog.html:78 +msgid "Affected number of files, click to show more details" +msgstr "Dotyczy liczby plików, kliknij, aby zobaczyć więcej szczegółów" + +#: rhodecode/templates/changelog/changelog.html:91 +#: rhodecode/templates/changeset/changeset.html:44 +#: rhodecode/templates/changeset/changeset_file_comment.html:20 +#: rhodecode/templates/changeset/changeset_range.html:46 +msgid "Changeset status" +msgstr "Status grupy zmian" + +#: rhodecode/templates/changelog/changelog.html:94 +#: rhodecode/templates/shortlog/shortlog_data.html:20 +msgid "Click to open associated pull request" +msgstr "Kliknij żeby otworzyć prośbę o połączenie gałęzi" + +#: rhodecode/templates/changelog/changelog.html:104 +#: rhodecode/templates/changeset/changeset.html:85 +msgid "Parent" +msgstr "Rewizja" + +#: rhodecode/templates/changelog/changelog.html:110 +#: rhodecode/templates/changeset/changeset.html:91 +msgid "No parents" +msgstr "Brak rewizji" + +#: rhodecode/templates/changelog/changelog.html:115 +#: rhodecode/templates/changeset/changeset.html:95 +#: rhodecode/templates/changeset/changeset_range.html:79 +msgid "merge" +msgstr "połącz" + +#: rhodecode/templates/changelog/changelog.html:118 +#: rhodecode/templates/changeset/changeset.html:98 +#: rhodecode/templates/changeset/changeset_range.html:82 +#: rhodecode/templates/files/files.html:29 +#: rhodecode/templates/files/files_add.html:33 +#: rhodecode/templates/files/files_edit.html:33 +#: rhodecode/templates/shortlog/shortlog_data.html:9 +msgid "branch" +msgstr "gałąź" + +#: rhodecode/templates/changelog/changelog.html:124 +#: rhodecode/templates/changeset/changeset_range.html:88 +msgid "bookmark" +msgstr "zakładka" + +#: rhodecode/templates/changelog/changelog.html:130 +#: rhodecode/templates/changeset/changeset.html:103 +#: rhodecode/templates/changeset/changeset_range.html:94 +msgid "tag" +msgstr "etykieta" + +#: rhodecode/templates/changelog/changelog.html:301 +msgid "There are no changes yet" +msgstr "Nie ma jeszcze zmian" + +#: rhodecode/templates/changelog/changelog_details.html:4 +#: rhodecode/templates/changeset/changeset.html:73 +msgid "removed" +msgstr "usunięto" + +#: rhodecode/templates/changelog/changelog_details.html:5 +#: rhodecode/templates/changeset/changeset.html:74 +msgid "changed" +msgstr "zmiana" + +#: rhodecode/templates/changelog/changelog_details.html:6 +#: rhodecode/templates/changeset/changeset.html:75 +msgid "added" +msgstr "dodana" + +#: rhodecode/templates/changelog/changelog_details.html:8 +#: rhodecode/templates/changelog/changelog_details.html:9 +#: rhodecode/templates/changelog/changelog_details.html:10 +#: rhodecode/templates/changeset/changeset.html:77 +#: rhodecode/templates/changeset/changeset.html:78 +#: rhodecode/templates/changeset/changeset.html:79 +#, python-format +msgid "affected %s files" +msgstr "zarażone pliki %s" + +#: rhodecode/templates/changeset/changeset.html:6 +#, python-format +msgid "%s Changeset" +msgstr "%s Grupy zmian" + +#: rhodecode/templates/changeset/changeset.html:14 +msgid "Changeset" +msgstr "Grupy zmian" + +#: rhodecode/templates/changeset/changeset.html:49 +#: rhodecode/templates/changeset/diff_block.html:20 +msgid "raw diff" +msgstr "raw różnic" + +#: rhodecode/templates/changeset/changeset.html:50 +msgid "patch diff" +msgstr "poprawka różnic" + +#: rhodecode/templates/changeset/changeset.html:51 +#: rhodecode/templates/changeset/diff_block.html:21 +msgid "download diff" +msgstr "pobierz różnice" + +#: rhodecode/templates/changeset/changeset.html:55 +#: rhodecode/templates/changeset/changeset_file_comment.html:82 +#, python-format +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "%d komentarz" +msgstr[1] "%d komentarzy" +msgstr[2] "%d komentarzy" + +#: rhodecode/templates/changeset/changeset.html:55 +#: rhodecode/templates/changeset/changeset_file_comment.html:82 +#, python-format +msgid "(%d inline)" +msgid_plural "(%d inline)" +msgstr[0] "(%d linii)" +msgstr[1] "(%d linii)" +msgstr[2] "(%d linii)" + +#: rhodecode/templates/changeset/changeset.html:111 +#: rhodecode/templates/compare/compare_diff.html:44 +#: rhodecode/templates/pullrequests/pullrequest_show.html:76 +#, fuzzy, python-format +msgid "%s file changed" +msgid_plural "%s files changed" +msgstr[0] "%s plik zmieniony" +msgstr[1] "%s plików zmienionych" +msgstr[2] "%s plików zmienionych" + +#: rhodecode/templates/changeset/changeset.html:113 +#: rhodecode/templates/compare/compare_diff.html:46 +#: rhodecode/templates/pullrequests/pullrequest_show.html:78 +#, fuzzy, python-format +msgid "%s file changed with %s insertions and %s deletions" +msgid_plural "%s files changed with %s insertions and %s deletions" +msgstr[0] "%s plik zmieniony z %s inserjcami i %s usunieciami" +msgstr[1] "%s plików zmienionych z %s inserjcami i %s usunieciami" +msgstr[2] "%s plików zmienionych z %s inserjcami i %s usunieciami" + +#: rhodecode/templates/changeset/changeset_file_comment.html:42 +msgid "Submitting..." +msgstr "Przesyłanie..." + +#: rhodecode/templates/changeset/changeset_file_comment.html:45 +msgid "Commenting on line {1}." +msgstr "Komentując linię {1}." + +#: rhodecode/templates/changeset/changeset_file_comment.html:46 +#: rhodecode/templates/changeset/changeset_file_comment.html:121 +#, 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:48 +#: rhodecode/templates/changeset/changeset_file_comment.html:123 +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:59 +#: rhodecode/templates/changeset/changeset_file_comment.html:138 +msgid "Comment" +msgstr "Komentarz" + +#: rhodecode/templates/changeset/changeset_file_comment.html:60 +#: rhodecode/templates/changeset/changeset_file_comment.html:71 +msgid "Hide" +msgstr "Ukryj" + +#: rhodecode/templates/changeset/changeset_file_comment.html:67 +msgid "You need to be logged in to comment." +msgstr "Musisz być zalogowany żeby komentarz." + +#: rhodecode/templates/changeset/changeset_file_comment.html:67 +msgid "Login now" +msgstr "Zaloguj się teraz" + +#: rhodecode/templates/changeset/changeset_file_comment.html:118 +msgid "Leave a comment" +msgstr "Napisz komentarz" + +#: rhodecode/templates/changeset/changeset_file_comment.html:124 +msgid "Check this to change current status of code-review for this changeset" +msgstr "Zaznacz to, aby zmienić bieżący stan code przeglądu tego zestawienia zmian" + +#: rhodecode/templates/changeset/changeset_file_comment.html:124 +msgid "change status" +msgstr "zmień status" + +#: rhodecode/templates/changeset/changeset_file_comment.html:140 +msgid "Comment and close" +msgstr "Skomentuj i zamknij" + +#: rhodecode/templates/changeset/changeset_range.html:5 +#, python-format +msgid "%s Changesets" +msgstr "%s Zestawienie zmian" + +#: rhodecode/templates/changeset/changeset_range.html:29 +#: rhodecode/templates/compare/compare_diff.html:29 +msgid "Compare View" +msgstr "Wyświetl Porównanie" + +#: rhodecode/templates/changeset/changeset_range.html:29 +#, fuzzy +msgid "Show combined compare" +msgstr "pokaż online komentarz" + +#: rhodecode/templates/changeset/changeset_range.html:54 +msgid "Files affected" +msgstr "pliki naruszone" + +#: rhodecode/templates/changeset/diff_block.html:19 +msgid "show full diff for this file" +msgstr "pokaż pełną edycja tego pliku" + +#: rhodecode/templates/changeset/diff_block.html:27 +msgid "show inline comments" +msgstr "pokaż online komentarz" + +#: rhodecode/templates/compare/compare_cs.html:5 +msgid "No changesets" +msgstr "Brak zestawienia zmian" + +#: rhodecode/templates/compare/compare_diff.html:37 +#: rhodecode/templates/pullrequests/pullrequest_show.html:69 +#, fuzzy, python-format +msgid "Showing %s commit" +msgid_plural "Showing %s commits" +msgstr[0] "Wyswietlane %s commit" +msgstr[1] "Wyswietlane %s commits" +msgstr[2] "Wyswietlane %s commits" + +#: rhodecode/templates/compare/compare_diff.html:52 +#: rhodecode/templates/pullrequests/pullrequest_show.html:84 +#, fuzzy +msgid "No files" +msgstr "pliki" + +#: rhodecode/templates/data_table/_dt_elements.html:39 +#: rhodecode/templates/data_table/_dt_elements.html:41 +#: rhodecode/templates/data_table/_dt_elements.html:43 +msgid "Fork" +msgstr "Gałąź" + +#: rhodecode/templates/data_table/_dt_elements.html:60 +#: rhodecode/templates/journal/journal.html:81 +#: rhodecode/templates/summary/summary.html:77 +msgid "Mercurial repository" +msgstr "Repozytorium mercurial" + +#: rhodecode/templates/data_table/_dt_elements.html:62 +#: rhodecode/templates/journal/journal.html:83 +#: rhodecode/templates/summary/summary.html:80 +msgid "Git repository" +msgstr "Repozytorium git" + +#: rhodecode/templates/data_table/_dt_elements.html:69 +#: rhodecode/templates/journal/journal.html:89 +#: rhodecode/templates/summary/summary.html:87 +msgid "public repository" +msgstr "Publiczne repozytorium" + +#: rhodecode/templates/data_table/_dt_elements.html:80 +#: rhodecode/templates/summary/summary.html:96 +#: rhodecode/templates/summary/summary.html:97 +msgid "Fork of" +msgstr "Gałąź z" + +#: rhodecode/templates/data_table/_dt_elements.html:94 +msgid "No changesets yet" +msgstr "Nie ma jeszcze zestawienia zmian" + +#: rhodecode/templates/data_table/_dt_elements.html:101 +#: rhodecode/templates/data_table/_dt_elements.html:103 +#, python-format +msgid "Subscribe to %s rss feed" +msgstr "Subskrybuj %s kanał rss" + +#: rhodecode/templates/data_table/_dt_elements.html:109 +#: rhodecode/templates/data_table/_dt_elements.html:111 +#, python-format +msgid "Subscribe to %s atom feed" +msgstr "Subskrybuj %s kanał atom" + +#: rhodecode/templates/data_table/_dt_elements.html:122 +#, python-format +msgid "Confirm to delete this user: %s" +msgstr "Potwierdź usunięcie tego użytkownika: %s" + +#: rhodecode/templates/email_templates/main.html:8 +#, fuzzy +msgid "This is a notification from RhodeCode." +msgstr "To jest powiadomienie z strony" + +#: rhodecode/templates/errors/error_document.html:46 +#, python-format +msgid "You will be redirected to %s in %s seconds" +msgstr "Zostaniesz przekierowany do %s za %s sekund" + +#: rhodecode/templates/files/file_diff.html:4 +#, python-format +msgid "%s File diff" +msgstr "%s Pliki różnic" + +#: rhodecode/templates/files/file_diff.html:12 +msgid "File diff" +msgstr "Pliki różnic" + +#: rhodecode/templates/files/files.html:4 +#: rhodecode/templates/files/files.html:74 +#, python-format +msgid "%s files" +msgstr "Pliki %s" + +#: rhodecode/templates/files/files.html:12 +#: rhodecode/templates/summary/summary.html:351 +msgid "files" +msgstr "pliki" + +#: rhodecode/templates/files/files_add.html:4 +#: rhodecode/templates/files/files_edit.html:4 +#, python-format +msgid "%s Edit file" +msgstr "Edytuj plik %s" + +#: rhodecode/templates/files/files_add.html:19 +msgid "add file" +msgstr "dodaj plik" + +#: rhodecode/templates/files/files_add.html:40 +msgid "Add new file" +msgstr "Dodaj nowy plik" + +#: rhodecode/templates/files/files_add.html:45 +msgid "File Name" +msgstr "Nazwa Pliku" + +#: rhodecode/templates/files/files_add.html:49 +#: rhodecode/templates/files/files_add.html:58 +msgid "or" +msgstr "lub" + +#: rhodecode/templates/files/files_add.html:49 +#: rhodecode/templates/files/files_add.html:54 +msgid "Upload file" +msgstr "Dodaj plik" + +#: rhodecode/templates/files/files_add.html:58 +msgid "Create new file" +msgstr "Utwórz nowy plik" + +#: rhodecode/templates/files/files_add.html:63 +#: rhodecode/templates/files/files_edit.html:39 +#: rhodecode/templates/files/files_ypjax.html:3 +msgid "Location" +msgstr "Położenie" + +#: rhodecode/templates/files/files_add.html:67 +msgid "use / to separate directories" +msgstr "Użyj / do oddzielenia katalogów" + +#: rhodecode/templates/files/files_add.html:77 +#: rhodecode/templates/files/files_edit.html:63 +#: rhodecode/templates/shortlog/shortlog_data.html:6 +msgid "commit message" +msgstr "komentarz" + +#: rhodecode/templates/files/files_add.html:81 +#: rhodecode/templates/files/files_edit.html:67 +msgid "Commit changes" +msgstr "Zatwierdź zmiany" + +#: rhodecode/templates/files/files_browser.html:13 +msgid "view" +msgstr "widok" + +#: rhodecode/templates/files/files_browser.html:14 +msgid "previous revision" +msgstr "poprzednia wersja" + +#: rhodecode/templates/files/files_browser.html:16 +msgid "next revision" +msgstr "następna wersja" + +#: rhodecode/templates/files/files_browser.html:23 +msgid "follow current branch" +msgstr "śledź mierzącą gałąź" + +#: rhodecode/templates/files/files_browser.html:27 +msgid "search file list" +msgstr "lista szukanych plików" + +#: rhodecode/templates/files/files_browser.html:31 +#: rhodecode/templates/shortlog/shortlog_data.html:80 +msgid "add new file" +msgstr "dodaj nowy plik" + +#: rhodecode/templates/files/files_browser.html:35 +msgid "Loading file list..." +msgstr "Wczytywanie listy plików..." + +#: rhodecode/templates/files/files_browser.html:48 +msgid "Size" +msgstr "Rozmiar" + +#: rhodecode/templates/files/files_browser.html:49 +msgid "Mimetype" +msgstr "Typ MIME" + +#: rhodecode/templates/files/files_browser.html:50 +msgid "Last Revision" +msgstr "Rewizja" + +#: rhodecode/templates/files/files_browser.html:51 +msgid "Last modified" +msgstr "Ostatnio modyfikowany" + +#: rhodecode/templates/files/files_browser.html:52 +msgid "Last commiter" +msgstr "Autor" + +#: rhodecode/templates/files/files_edit.html:19 +msgid "edit file" +msgstr "edytuj plik" + +#: rhodecode/templates/files/files_edit.html:49 +#: rhodecode/templates/files/files_source.html:23 +msgid "show annotation" +msgstr "pokaż adnotacje" + +#: rhodecode/templates/files/files_edit.html:50 +#: rhodecode/templates/files/files_source.html:25 +#: rhodecode/templates/files/files_source.html:53 +msgid "show as raw" +msgstr "wyświetl jako raw" + +#: rhodecode/templates/files/files_edit.html:51 +#: rhodecode/templates/files/files_source.html:26 +msgid "download as raw" +msgstr "Pobierz jako raw" + +#: rhodecode/templates/files/files_edit.html:54 +msgid "source" +msgstr "źródło" + +#: rhodecode/templates/files/files_edit.html:59 +msgid "Editing file" +msgstr "Edycja pliku" + +#: rhodecode/templates/files/files_history_box.html:2 +msgid "History" +msgstr "Historia" + +#: rhodecode/templates/files/files_history_box.html:9 +msgid "diff to revision" +msgstr "różnice do rewizji" + +#: rhodecode/templates/files/files_history_box.html:10 +msgid "show at revision" +msgstr "wskaż zmiany" + +#: rhodecode/templates/files/files_history_box.html:15 +#, python-format +msgid "%s author" +msgid_plural "%s authors" +msgstr[0] "%s autor" +msgstr[1] "%s autorzy" +msgstr[2] "%s autorzy" + +#: rhodecode/templates/files/files_source.html:6 +#, fuzzy +msgid "Load file history" +msgstr "Wczytywanie listy plików..." + +#: rhodecode/templates/files/files_source.html:21 +msgid "show source" +msgstr "pokaż źródło" + +#: rhodecode/templates/files/files_source.html:44 +#, python-format +msgid "Binary file (%s)" +msgstr "Plik binarny (%s)" + +#: rhodecode/templates/files/files_source.html:53 +msgid "File is too big to display" +msgstr "Plik jest za duży do wyświetlenia" + +#: rhodecode/templates/files/files_ypjax.html:5 +msgid "annotation" +msgstr "adnotacja" + +#: rhodecode/templates/files/files_ypjax.html:15 +msgid "Go back" +msgstr "Idź wstecz" + +#: rhodecode/templates/files/files_ypjax.html:16 +msgid "No files at given path" +msgstr "Brak plików w danej ścieżce" + +#: rhodecode/templates/followers/followers.html:5 +#, python-format +msgid "%s Followers" +msgstr "Obserwatorzy %s" + +#: rhodecode/templates/followers/followers.html:13 +msgid "followers" +msgstr "obserwatorzy" + +#: rhodecode/templates/followers/followers_data.html:12 +msgid "Started following -" +msgstr "Rozpoczęto obserwację -" + +#: rhodecode/templates/forks/fork.html:5 +#, python-format +msgid "%s Fork" +msgstr "Gałęzi %s" + +#: rhodecode/templates/forks/fork.html:31 +msgid "Fork name" +msgstr "Nazwa rozgałęzienia" + +#: rhodecode/templates/forks/fork.html:68 +msgid "Private" +msgstr "Prywatny" + +#: rhodecode/templates/forks/fork.html:77 +msgid "Copy permissions" +msgstr "Skopiuj uprawnienia" + +#: rhodecode/templates/forks/fork.html:81 +msgid "Copy permissions from forked repository" +msgstr "Skopiuj zezwolenia z rozwidlenia repozytorium" + +#: rhodecode/templates/forks/fork.html:86 +msgid "Update after clone" +msgstr "Aktualizuj po klonowaniu" + +#: rhodecode/templates/forks/fork.html:90 +msgid "Checkout source after making a clone" +msgstr "Sprawdź źródło po wykonaniu klonowania" + +#: rhodecode/templates/forks/fork.html:94 +msgid "fork this repository" +msgstr "gałąź tego repozytorium" + +#: rhodecode/templates/forks/forks.html:5 +#, python-format +msgid "%s Forks" +msgstr "Gałęzi %s" + +#: rhodecode/templates/forks/forks.html:13 +msgid "forks" +msgstr "gałąź" + +#: rhodecode/templates/forks/forks_data.html:17 +msgid "forked" +msgstr "rozgałęziony" + +#: rhodecode/templates/forks/forks_data.html:42 +msgid "There are no forks yet" +msgstr "Nie ma jeszcze gałęzi" + +#: rhodecode/templates/journal/journal.html:13 +msgid "ATOM journal feed" +msgstr "Dziennik kanału ATOM" + +#: rhodecode/templates/journal/journal.html:14 +msgid "RSS journal feed" +msgstr "Dziennik kanału RSS" + +#: rhodecode/templates/journal/journal.html:24 +#: rhodecode/templates/pullrequests/pullrequest.html:55 +msgid "Refresh" +msgstr "Odśwież" + +#: rhodecode/templates/journal/journal.html:27 +#: rhodecode/templates/journal/public_journal.html:24 +msgid "RSS feed" +msgstr "Kanał RSS" + +#: rhodecode/templates/journal/journal.html:30 +#: rhodecode/templates/journal/public_journal.html:27 +msgid "ATOM feed" +msgstr "Kanał ATOM" + +#: rhodecode/templates/journal/journal.html:41 +msgid "Watched" +msgstr "Obserwowane" + +#: rhodecode/templates/journal/journal.html:46 +msgid "ADD" +msgstr "DODAJ" + +#: rhodecode/templates/journal/journal.html:69 +msgid "following user" +msgstr "następujący użytkownik" + +#: rhodecode/templates/journal/journal.html:69 +msgid "user" +msgstr "użytkownik" + +#: rhodecode/templates/journal/journal.html:102 +msgid "You are not following any users or repositories" +msgstr "Nie obserwujesz żadnych użytkowników lub repozytoriów" + +#: rhodecode/templates/journal/journal_data.html:51 +msgid "No entries yet" +msgstr "Brak wpisów jeszcze" + +#: rhodecode/templates/journal/public_journal.html:13 +msgid "ATOM public journal feed" +msgstr "Publiczny dziennik kanału ATOM" + +#: rhodecode/templates/journal/public_journal.html:14 +msgid "RSS public journal feed" +msgstr "Publiczny dziennik kanału RSS" + +#: rhodecode/templates/journal/public_journal.html:21 +msgid "Public Journal" +msgstr "Dziennik Publiczny" + +#: rhodecode/templates/pullrequests/pullrequest.html:4 +#: rhodecode/templates/pullrequests/pullrequest.html:12 +msgid "New pull request" +msgstr "Nowa prośba o połączenie gałęzi" + +#: rhodecode/templates/pullrequests/pullrequest.html:54 +msgid "refresh overview" +msgstr "odśwież informacje" + +#: rhodecode/templates/pullrequests/pullrequest.html:66 +msgid "Detailed compare view" +msgstr "Szczegółowe porównanie widoku" + +#: rhodecode/templates/pullrequests/pullrequest.html:70 +#: rhodecode/templates/pullrequests/pullrequest_show.html:100 +msgid "Pull request reviewers" +msgstr "Recenzje wniosków połączenia gałęzi" + +#: rhodecode/templates/pullrequests/pullrequest.html:79 +#: rhodecode/templates/pullrequests/pullrequest_show.html:112 +msgid "owner" +msgstr "właściciel" + +#: rhodecode/templates/pullrequests/pullrequest.html:91 +#: rhodecode/templates/pullrequests/pullrequest_show.html:127 +msgid "Add reviewer to this pull request." +msgstr "Pokarz wszystkie zmiany" + +#: rhodecode/templates/pullrequests/pullrequest.html:97 +msgid "Create new pull request" +msgstr "Stwórz nowe żądanie połączenia gałęzi" + +#: rhodecode/templates/pullrequests/pullrequest.html:106 +#: rhodecode/templates/pullrequests/pullrequest_show.html:25 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:33 +msgid "Title" +msgstr "Tytuł" + +#: rhodecode/templates/pullrequests/pullrequest.html:115 +msgid "description" +msgstr "opis" + +#: rhodecode/templates/pullrequests/pullrequest.html:123 +msgid "Send pull request" +msgstr "Wyślij prośbę o połączenie gałęzi" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:23 +#, python-format +msgid "Closed %s" +msgstr "Zamknięty %s" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:23 +#, python-format +msgid "with status %s" +msgstr "stanu z %s" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:31 +msgid "Status" +msgstr "Status" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:36 +msgid "Pull request status" +msgstr "Żądanie statusu połączenia gałęzi" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:44 +msgid "Still not reviewed by" +msgstr "Nie ma jeszcze recenzenta" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:48 +#, python-format +msgid "%d reviewer" +msgid_plural "%d reviewers" +msgstr[0] "%d recenzent" +msgstr[1] "%d recenzenci" +msgstr[2] "%d recenzentów" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:50 +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:58 +msgid "Created on" +msgstr "Utworzono" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:65 +msgid "Compare view" +msgstr "Wyświetl porównanie" + +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 +msgid "all pull requests" +msgstr "wszystkie prośby połączenia gałęzi" + +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:12 +msgid "All pull requests" +msgstr "Wszystkie prośby połączenia gałęzi" + +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:27 +msgid "Closed" +msgstr "Zamknięte" + +#: rhodecode/templates/search/search.html:6 +#, python-format +msgid "Search \"%s\" in repository: %s" +msgstr "Wyszukiwanie \"%s\" w repozytorium: %s" + +#: rhodecode/templates/search/search.html:8 +#, python-format +msgid "Search \"%s\" in all repositories" +msgstr "Wyszukiwanie \"%s\" w wszystkich repozytoriach" + +#: rhodecode/templates/search/search.html:12 +#: rhodecode/templates/search/search.html:32 +#, python-format +msgid "Search in repository: %s" +msgstr "Szukaj w repozytorium: %s" + +#: rhodecode/templates/search/search.html:14 +#: rhodecode/templates/search/search.html:34 +msgid "Search in all repositories" +msgstr "Szukaj we wszystkich repozytoriach" + +#: rhodecode/templates/search/search.html:48 +msgid "Search term" +msgstr "Szukana fraza" + +#: rhodecode/templates/search/search.html:60 +msgid "Search in" +msgstr "Szukaj w" + +#: rhodecode/templates/search/search.html:63 +msgid "File contents" +msgstr "Zawartość pliku" + +#: rhodecode/templates/search/search.html:64 +msgid "Commit messages" +msgstr "Komunikaty" + +#: rhodecode/templates/search/search.html:65 +msgid "File names" +msgstr "Nazwy plików" + +#: rhodecode/templates/search/search_commit.html:35 +#: rhodecode/templates/search/search_content.html:21 +#: rhodecode/templates/search/search_path.html:15 +msgid "Permission denied" +msgstr "Brak uprawnień" + +#: rhodecode/templates/settings/repo_settings.html:5 +#, python-format +msgid "%s Settings" +msgstr "Ustawienia %s" + +#: rhodecode/templates/shortlog/shortlog.html:5 +#, python-format +msgid "%s Shortlog" +msgstr "%s Lista zmian" + +#: rhodecode/templates/shortlog/shortlog.html:14 +msgid "shortlog" +msgstr "lista zmian" + +#: rhodecode/templates/shortlog/shortlog_data.html:5 +msgid "revision" +msgstr "rewizja" + +#: rhodecode/templates/shortlog/shortlog_data.html:7 +msgid "age" +msgstr "ostatnia zmiana" + +#: rhodecode/templates/shortlog/shortlog_data.html:8 +msgid "author" +msgstr "autor" + +#: rhodecode/templates/shortlog/shortlog_data.html:33 +msgid "No commit message" +msgstr "Brak komunikatów" + +#: rhodecode/templates/shortlog/shortlog_data.html:77 +msgid "Add or upload files directly via RhodeCode" +msgstr "Dodaj lub prześlij pliki bezpośrednio przez stronę" + +#: rhodecode/templates/shortlog/shortlog_data.html:86 +msgid "Push new repo" +msgstr "Wyślij zmiany do nowego repo" + +#: rhodecode/templates/shortlog/shortlog_data.html:94 +msgid "Existing repository?" +msgstr "Istniejące repozytorium?" + +#: rhodecode/templates/summary/summary.html:4 +#, python-format +msgid "%s Summary" +msgstr "Podsumowanie %s" + +#: rhodecode/templates/summary/summary.html:12 +msgid "summary" +msgstr "Podsumowanie" + +#: rhodecode/templates/summary/summary.html:20 +#, python-format +msgid "repo %s ATOM feed" +msgstr "repo %s kanał ATOM" + +#: rhodecode/templates/summary/summary.html:21 +#, python-format +msgid "repo %s RSS feed" +msgstr "repo %s kanał RSS" + +#: rhodecode/templates/summary/summary.html:49 +#: rhodecode/templates/summary/summary.html:52 +msgid "ATOM" +msgstr "ATOM" + +#: rhodecode/templates/summary/summary.html:70 +#, python-format +msgid "Repository locked by %s" +msgstr "Repozytorium zablokowane przez %s" + +#: rhodecode/templates/summary/summary.html:72 +msgid "Repository unlocked" +msgstr "Repozytorium odblokowane" + +#: rhodecode/templates/summary/summary.html:91 +#, python-format +msgid "Non changable ID %s" +msgstr "Brak ID pełnej zmiany %s" + +#: rhodecode/templates/summary/summary.html:96 +msgid "public" +msgstr "publiczny" + +#: rhodecode/templates/summary/summary.html:104 +msgid "remote clone" +msgstr "zdalne klonowanie" + +#: rhodecode/templates/summary/summary.html:125 +msgid "Contact" +msgstr "Kontakt" + +#: rhodecode/templates/summary/summary.html:139 +msgid "Clone url" +msgstr "Url klonowania" + +#: rhodecode/templates/summary/summary.html:142 +msgid "Show by Name" +msgstr "Pokaż nazwę" + +#: rhodecode/templates/summary/summary.html:143 +msgid "Show by ID" +msgstr "Pokaż ID" + +#: rhodecode/templates/summary/summary.html:151 +msgid "Trending files" +msgstr "Statystyki" + +#: rhodecode/templates/summary/summary.html:159 +#: rhodecode/templates/summary/summary.html:175 +#: rhodecode/templates/summary/summary.html:203 +msgid "enable" +msgstr "włącz" + +#: rhodecode/templates/summary/summary.html:167 +msgid "Download" +msgstr "Pobierz" + +#: rhodecode/templates/summary/summary.html:171 +msgid "There are no downloads yet" +msgstr "Nie pobrano jeszcze plików" + +#: rhodecode/templates/summary/summary.html:173 +msgid "Downloads are disabled for this repository" +msgstr "Pliki do pobrania są zostały wyłączone dla tego repozytorium" + +#: rhodecode/templates/summary/summary.html:179 +msgid "Download as zip" +msgstr "Pobierz jako zip" + +#: rhodecode/templates/summary/summary.html:182 +msgid "Check this to download archive with subrepos" +msgstr "Zaznacz tu żeby pobrać archiwum z subrepozytorium" + +#: rhodecode/templates/summary/summary.html:182 +msgid "with subrepos" +msgstr "z subrepozytorium" + +#: rhodecode/templates/summary/summary.html:195 +msgid "Commit activity by day / author" +msgstr "komunikaty aktywne w ciągu dnia / autor" + +#: rhodecode/templates/summary/summary.html:206 +msgid "Stats gathered: " +msgstr "Statystyki zebrane: " + +#: rhodecode/templates/summary/summary.html:227 +msgid "Shortlog" +msgstr "Lista zmian" + +#: rhodecode/templates/summary/summary.html:229 +msgid "Quick start" +msgstr "Szybki start" + +#: rhodecode/templates/summary/summary.html:243 +#, python-format +msgid "Readme file at revision '%s'" +msgstr "Plik readme w rewizji '%s'" + +#: rhodecode/templates/summary/summary.html:246 +msgid "Permalink to this readme" +msgstr "Link do tego readme" + +#: rhodecode/templates/summary/summary.html:304 +#, python-format +msgid "Download %s as %s" +msgstr "Pobierz %s jak %s" + +#: rhodecode/templates/summary/summary.html:661 +msgid "commits" +msgstr "komunikaty" + +#: rhodecode/templates/summary/summary.html:662 +msgid "files added" +msgstr "pliki dodane" + +#: rhodecode/templates/summary/summary.html:663 +msgid "files changed" +msgstr "pliki zmienione" + +#: rhodecode/templates/summary/summary.html:664 +msgid "files removed" +msgstr "pliki usunięte" + +#: rhodecode/templates/summary/summary.html:667 +msgid "commit" +msgstr "komunikaty" + +#: rhodecode/templates/summary/summary.html:668 +msgid "file added" +msgstr "plik dodany" + +#: rhodecode/templates/summary/summary.html:669 +msgid "file changed" +msgstr "plik zmieniony" + +#: rhodecode/templates/summary/summary.html:670 +msgid "file removed" +msgstr "plik usunięty" + +#: rhodecode/templates/tags/tags.html:5 +#, python-format +msgid "%s Tags" +msgstr "Etykiety pliku %s" + +#: rhodecode/templates/tags/tags.html:29 +#, fuzzy +msgid "Compare tags" +msgstr "porównanie" +
--- a/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po Mon Nov 26 20:39:45 2012 +0100 +++ b/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po Tue Nov 27 20:56:57 2012 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: RhodeCode 1.2.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-09-02 20:30+0200\n" +"POT-Creation-Date: 2012-11-27 20:56+0100\n" "PO-Revision-Date: 2012-05-22 16:47-0300\n" "Last-Translator: Augusto Herrmann <augusto.herrmann@gmail.com>\n" "Language-Team: pt_BR <LL@li.org>\n" @@ -17,35 +17,37 @@ "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -#: rhodecode/controllers/changelog.py:94 +#: rhodecode/controllers/changelog.py:95 msgid "All Branches" msgstr "Todos os Ramos" -#: rhodecode/controllers/changeset.py:83 +#: rhodecode/controllers/changeset.py:84 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 msgid "ignore white space" msgstr "ignorar espaços em branco" -#: rhodecode/controllers/changeset.py:157 +#: rhodecode/controllers/changeset.py:164 #, python-format msgid "%s line context" msgstr "contexto de %s linhas" -#: rhodecode/controllers/changeset.py:333 -#: rhodecode/controllers/changeset.py:348 rhodecode/lib/diffs.py:70 -msgid "binary file" -msgstr "arquivo binário" - -#: rhodecode/controllers/changeset.py:408 +#: rhodecode/controllers/changeset.py:315 +#: rhodecode/controllers/pullrequests.py:411 +#, fuzzy, python-format +msgid "Status change -> %s" +msgstr "Última alteração" + +#: rhodecode/controllers/changeset.py:346 msgid "" "Changing status on a changeset associated witha closed pull request is " "not allowed" msgstr "" -#: rhodecode/controllers/compare.py:69 +#: rhodecode/controllers/compare.py:75 +#: rhodecode/controllers/pullrequests.py:117 #, fuzzy msgid "There are no changesets yet" msgstr "Ainda não há alteações" @@ -80,101 +82,111 @@ "O servidor encontrou uma condição inesperada que o impediu de satisfazer " "a requisição" -#: rhodecode/controllers/feed.py:49 +#: rhodecode/controllers/feed.py:52 #, python-format msgid "Changes on %s repository" msgstr "Alterações no repositório %s" -#: rhodecode/controllers/feed.py:50 +#: rhodecode/controllers/feed.py:53 #, python-format msgid "%s %s feed" msgstr "%s - feed %s" -#: rhodecode/controllers/feed.py:75 +#: rhodecode/controllers/feed.py:86 +#: rhodecode/templates/changeset/changeset.html:126 +#: rhodecode/templates/changeset/changeset.html:138 +#: rhodecode/templates/compare/compare_diff.html:62 +#: rhodecode/templates/compare/compare_diff.html:73 +#: rhodecode/templates/pullrequests/pullrequest_show.html:94 +#: rhodecode/templates/pullrequests/pullrequest_show.html:153 +msgid "Changeset was too big and was cut off..." +msgstr "Conjunto de mudanças era grande demais e foi cortado..." + +#: rhodecode/controllers/feed.py:92 #, fuzzy msgid "commited on" msgstr "commit" -#: rhodecode/controllers/files.py:84 +#: rhodecode/controllers/files.py:86 #, fuzzy msgid "click here to add new file" msgstr "adicionar novo arquivo" -#: rhodecode/controllers/files.py:85 +#: rhodecode/controllers/files.py:87 #, python-format msgid "There are no files yet %s" msgstr "Ainda não há arquivos %s" -#: rhodecode/controllers/files.py:239 rhodecode/controllers/files.py:299 +#: rhodecode/controllers/files.py:265 rhodecode/controllers/files.py:325 #, python-format msgid "This repository is has been locked by %s on %s" msgstr "" -#: rhodecode/controllers/files.py:266 +#: rhodecode/controllers/files.py:292 #, python-format msgid "Edited %s via RhodeCode" msgstr "Editado %s via RhodeCode" -#: rhodecode/controllers/files.py:271 +#: rhodecode/controllers/files.py:297 msgid "No changes" msgstr "Sem alterações" -#: rhodecode/controllers/files.py:282 rhodecode/controllers/files.py:346 +#: rhodecode/controllers/files.py:308 rhodecode/controllers/files.py:372 #, python-format msgid "Successfully committed to %s" msgstr "Commit realizado com sucesso para %s" -#: rhodecode/controllers/files.py:287 rhodecode/controllers/files.py:352 +#: rhodecode/controllers/files.py:313 rhodecode/controllers/files.py:378 msgid "Error occurred during commit" msgstr "Ocorreu um erro ao realizar commit" -#: rhodecode/controllers/files.py:318 +#: rhodecode/controllers/files.py:344 #, python-format msgid "Added %s via RhodeCode" msgstr "Adicionado %s via RhodeCode" -#: rhodecode/controllers/files.py:332 +#: rhodecode/controllers/files.py:358 msgid "No content" msgstr "Nenhum conteúdo" -#: rhodecode/controllers/files.py:336 +#: rhodecode/controllers/files.py:362 msgid "No filename" msgstr "Nenhum nomes de arquivo" -#: rhodecode/controllers/files.py:378 +#: rhodecode/controllers/files.py:404 msgid "downloads disabled" msgstr "downloads desabilitados" -#: rhodecode/controllers/files.py:389 +#: rhodecode/controllers/files.py:415 #, python-format msgid "Unknown revision %s" msgstr "Revisão desconhecida %s" -#: rhodecode/controllers/files.py:391 +#: rhodecode/controllers/files.py:417 msgid "Empty repository" msgstr "Repositório vazio" -#: rhodecode/controllers/files.py:393 +#: rhodecode/controllers/files.py:419 msgid "Unknown archive type" msgstr "Arquivo de tipo desconhecido" -#: rhodecode/controllers/files.py:494 +#: rhodecode/controllers/files.py:564 #: rhodecode/templates/changeset/changeset_range.html:13 #: rhodecode/templates/changeset/changeset_range.html:31 msgid "Changesets" msgstr "Conjuntos de mudanças" -#: rhodecode/controllers/files.py:495 rhodecode/controllers/pullrequests.py:72 -#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:543 +#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:76 +#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:550 msgid "Branches" msgstr "Ramos" -#: rhodecode/controllers/files.py:496 rhodecode/controllers/pullrequests.py:76 -#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:554 +#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:80 +#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:561 msgid "Tags" msgstr "Etiquetas" -#: rhodecode/controllers/forks.py:73 rhodecode/controllers/admin/repos.py:90 +#: rhodecode/controllers/forks.py:74 rhodecode/controllers/admin/repos.py:91 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -185,7 +197,7 @@ "renomeado a partir do sistema de arquivos. Por favor execute a aplicação " "outra vez para varrer novamente por repositórios" -#: rhodecode/controllers/forks.py:133 rhodecode/controllers/settings.py:72 +#: rhodecode/controllers/forks.py:134 rhodecode/controllers/settings.py:73 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -196,23 +208,23 @@ "renomeado a partir do sistema de arquivos. Por favor execute a aplicação " "outra vez para varrer novamente por repositórios" -#: rhodecode/controllers/forks.py:167 +#: rhodecode/controllers/forks.py:168 #, python-format msgid "forked %s repository as %s" msgstr "bifurcado repositório %s como %s" -#: rhodecode/controllers/forks.py:181 +#: rhodecode/controllers/forks.py:182 #, python-format msgid "An error occurred during repository forking %s" msgstr "Ocorreu um erro ao bifurcar o repositório %s" -#: rhodecode/controllers/journal.py:202 rhodecode/controllers/journal.py:239 +#: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243 #, fuzzy msgid "public journal" msgstr "Diário público" -#: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243 -#: rhodecode/templates/base/base.html:220 +#: rhodecode/controllers/journal.py:210 rhodecode/controllers/journal.py:247 +#: rhodecode/templates/base/base.html:232 msgid "journal" msgstr "diário" @@ -232,60 +244,60 @@ "Sua reinicialização de senha foi bem sucedida, sua senha foi enviada ao " "seu e-mail" -#: rhodecode/controllers/pullrequests.py:74 rhodecode/model/scm.py:549 +#: rhodecode/controllers/pullrequests.py:78 rhodecode/model/scm.py:556 msgid "Bookmarks" msgstr "Marcadores" -#: rhodecode/controllers/pullrequests.py:158 +#: rhodecode/controllers/pullrequests.py:186 msgid "Pull request requires a title with min. 3 chars" msgstr "" -#: rhodecode/controllers/pullrequests.py:160 +#: rhodecode/controllers/pullrequests.py:188 #, fuzzy msgid "error during creation of pull request" msgstr "ocorreu um erro ao criar o usuário %s" -#: rhodecode/controllers/pullrequests.py:181 +#: rhodecode/controllers/pullrequests.py:220 #, fuzzy msgid "Successfully opened new pull request" msgstr "usuário excluído com sucesso" -#: rhodecode/controllers/pullrequests.py:184 +#: rhodecode/controllers/pullrequests.py:223 #, fuzzy msgid "Error occurred during sending pull request" msgstr "ocorreu um erro ao criar o repositório %s" -#: rhodecode/controllers/pullrequests.py:217 +#: rhodecode/controllers/pullrequests.py:256 #, fuzzy msgid "Successfully deleted pull request" msgstr "usuário excluído com sucesso" -#: rhodecode/controllers/search.py:131 +#: rhodecode/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "Consulta de busca inválida. Tente usar aspas." -#: rhodecode/controllers/search.py:136 +#: rhodecode/controllers/search.py:139 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:140 +#: rhodecode/controllers/search.py:143 msgid "An error occurred during this search operation" msgstr "Ocorreu um erro durante essa operação de busca" -#: rhodecode/controllers/settings.py:107 -#: rhodecode/controllers/admin/repos.py:266 +#: rhodecode/controllers/settings.py:108 +#: rhodecode/controllers/admin/repos.py:267 #, python-format msgid "Repository %s updated successfully" msgstr "Repositório %s atualizado com sucesso" -#: rhodecode/controllers/settings.py:125 -#: rhodecode/controllers/admin/repos.py:284 +#: rhodecode/controllers/settings.py:126 +#: rhodecode/controllers/admin/repos.py:285 #, python-format msgid "error occurred during update of repository %s" msgstr "ocorreu um erro ao atualizar o repositório %s" -#: rhodecode/controllers/settings.py:143 -#: rhodecode/controllers/admin/repos.py:302 +#: rhodecode/controllers/settings.py:144 +#: rhodecode/controllers/admin/repos.py:303 #, python-format msgid "" "%s repository is not mapped to db perhaps it was moved or renamed from " @@ -296,25 +308,46 @@ "renomeado a partir do sistema de arquivos. Por favor execute a aplicação " "outra vez para varrer novamente por repositórios" -#: rhodecode/controllers/settings.py:155 -#: rhodecode/controllers/admin/repos.py:314 +#: rhodecode/controllers/settings.py:156 +#: rhodecode/controllers/admin/repos.py:315 #, python-format msgid "deleted repository %s" msgstr "excluído o repositório %s" -#: rhodecode/controllers/settings.py:159 -#: rhodecode/controllers/admin/repos.py:324 -#: rhodecode/controllers/admin/repos.py:330 +#: rhodecode/controllers/settings.py:160 +#: rhodecode/controllers/admin/repos.py:325 +#: 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/summary.py:138 +#: rhodecode/controllers/settings.py:179 +#, fuzzy +msgid "unlocked" +msgstr "destravar" + +#: rhodecode/controllers/settings.py:182 +#, fuzzy +msgid "locked" +msgstr "destravar" + +#: rhodecode/controllers/settings.py:184 +#, fuzzy, python-format +msgid "Repository has been %s" +msgstr "bifurcado repositório %s como %s" + +#: rhodecode/controllers/settings.py:188 +#: rhodecode/controllers/admin/repos.py:423 +#, fuzzy +msgid "An error occurred during unlocking" +msgstr "Ocorreu um erro durante essa operação" + +#: rhodecode/controllers/summary.py:140 msgid "No data loaded yet" msgstr "Ainda não há dados carregados" -#: rhodecode/controllers/summary.py:142 -#: rhodecode/templates/summary/summary.html:148 +#: rhodecode/controllers/summary.py:144 +#: rhodecode/templates/summary/summary.html:157 msgid "Statistics are disabled for this repository" msgstr "As estatísticas estão desabillitadas para este repositório" @@ -399,15 +432,15 @@ #: rhodecode/templates/admin/settings/settings.html:9 #: rhodecode/templates/admin/users/user_add.html:8 #: rhodecode/templates/admin/users/user_edit.html:9 -#: rhodecode/templates/admin/users/user_edit.html:122 +#: rhodecode/templates/admin/users/user_edit.html:126 #: rhodecode/templates/admin/users/users.html:9 #: rhodecode/templates/admin/users_groups/users_group_add.html:8 #: rhodecode/templates/admin/users_groups/users_group_edit.html:9 #: rhodecode/templates/admin/users_groups/users_groups.html:9 #: rhodecode/templates/base/base.html:197 -#: rhodecode/templates/base/base.html:337 -#: rhodecode/templates/base/base.html:339 -#: rhodecode/templates/base/base.html:341 +#: rhodecode/templates/base/base.html:349 +#: rhodecode/templates/base/base.html:351 +#: rhodecode/templates/base/base.html:353 msgid "Admin" msgstr "Administrador" @@ -441,191 +474,186 @@ msgid "error occurred during update of permissions" msgstr "ocorreu um erro ao atualizar as permissões" -#: rhodecode/controllers/admin/repos.py:123 +#: rhodecode/controllers/admin/repos.py:124 msgid "--REMOVE FORK--" msgstr "--REMOVER BIFURCAÇÂO--" -#: rhodecode/controllers/admin/repos.py:192 +#: rhodecode/controllers/admin/repos.py:193 #, python-format msgid "created repository %s from %s" msgstr "repositório %s criado a partir de %s" -#: rhodecode/controllers/admin/repos.py:196 +#: rhodecode/controllers/admin/repos.py:197 #, python-format msgid "created repository %s" msgstr "repositório %s criado" -#: rhodecode/controllers/admin/repos.py:227 +#: rhodecode/controllers/admin/repos.py:228 #, python-format msgid "error occurred during creation of repository %s" msgstr "ocorreu um erro ao criar o repositório %s" -#: rhodecode/controllers/admin/repos.py:319 +#: rhodecode/controllers/admin/repos.py:320 #, 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:348 +#: rhodecode/controllers/admin/repos.py:349 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:367 +#: rhodecode/controllers/admin/repos.py:368 msgid "An error occurred during deletion of repository users groups" msgstr "Ocorreu um erro ao excluir grupo de usuário de repositório" -#: rhodecode/controllers/admin/repos.py:385 +#: rhodecode/controllers/admin/repos.py:386 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:402 +#: rhodecode/controllers/admin/repos.py:403 msgid "An error occurred during cache invalidation" msgstr "Ocorreu um erro ao invalidar o cache" -#: rhodecode/controllers/admin/repos.py:422 -#, fuzzy -msgid "An error occurred during unlocking" -msgstr "Ocorreu um erro durante essa operação" - -#: rhodecode/controllers/admin/repos.py:442 +#: rhodecode/controllers/admin/repos.py:443 msgid "Updated repository visibility in public journal" msgstr "Atualizada a visibilidade do repositório no diário público" -#: rhodecode/controllers/admin/repos.py:446 +#: rhodecode/controllers/admin/repos.py:447 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:451 rhodecode/model/validators.py:299 +#: rhodecode/controllers/admin/repos.py:452 rhodecode/model/validators.py:300 msgid "Token mismatch" msgstr "Descompasso de Token" -#: rhodecode/controllers/admin/repos.py:464 +#: rhodecode/controllers/admin/repos.py:465 msgid "Pulled from remote location" msgstr "Realizado pull de localização remota" -#: rhodecode/controllers/admin/repos.py:466 +#: rhodecode/controllers/admin/repos.py:467 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:482 +#: rhodecode/controllers/admin/repos.py:483 msgid "Nothing" msgstr "Nada" -#: rhodecode/controllers/admin/repos.py:484 +#: rhodecode/controllers/admin/repos.py:485 #, 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:488 +#: rhodecode/controllers/admin/repos.py:489 msgid "An error occurred during this operation" msgstr "Ocorreu um erro durante essa operação" -#: rhodecode/controllers/admin/repos_groups.py:116 +#: rhodecode/controllers/admin/repos_groups.py:120 #, python-format msgid "created repos group %s" msgstr "criado grupo de repositórios %s" -#: rhodecode/controllers/admin/repos_groups.py:129 +#: rhodecode/controllers/admin/repos_groups.py:133 #, python-format msgid "error occurred during creation of repos group %s" msgstr "ccorreu um erro ao criar grupo de repositório %s" -#: rhodecode/controllers/admin/repos_groups.py:163 +#: rhodecode/controllers/admin/repos_groups.py:167 #, python-format msgid "updated repos group %s" msgstr "atualizado grupo de repositórios %s" -#: rhodecode/controllers/admin/repos_groups.py:176 +#: rhodecode/controllers/admin/repos_groups.py:180 #, python-format msgid "error occurred during update of repos group %s" msgstr "ocorreu um erro ao atualizar grupo de repositórios %s" -#: rhodecode/controllers/admin/repos_groups.py:194 +#: rhodecode/controllers/admin/repos_groups.py:198 #, 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:202 +#: rhodecode/controllers/admin/repos_groups.py:206 #, python-format msgid "removed repos group %s" msgstr "removido grupo de repositórios %s" -#: rhodecode/controllers/admin/repos_groups.py:208 +#: rhodecode/controllers/admin/repos_groups.py:212 msgid "Cannot delete this group it still contains subgroups" msgstr "Nao é possível excluir este grupo pois ele ainda contém subgrupos" -#: rhodecode/controllers/admin/repos_groups.py:213 -#: rhodecode/controllers/admin/repos_groups.py:218 +#: rhodecode/controllers/admin/repos_groups.py:217 +#: rhodecode/controllers/admin/repos_groups.py:222 #, 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:238 +#: rhodecode/controllers/admin/repos_groups.py:243 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:258 +#: rhodecode/controllers/admin/repos_groups.py:264 msgid "An error occurred during deletion of group users groups" msgstr "Ocorreu um erro ao excluir o grupo do grupo de usuários" -#: rhodecode/controllers/admin/settings.py:121 +#: rhodecode/controllers/admin/settings.py:123 #, 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:129 +#: rhodecode/controllers/admin/settings.py:131 msgid "Whoosh reindex task scheduled" msgstr "Tarefa de reindexação do whoosh agendada" -#: rhodecode/controllers/admin/settings.py:160 +#: rhodecode/controllers/admin/settings.py:162 msgid "Updated application settings" msgstr "Configurações da aplicação atualizadas" -#: rhodecode/controllers/admin/settings.py:164 -#: rhodecode/controllers/admin/settings.py:275 +#: rhodecode/controllers/admin/settings.py:166 +#: rhodecode/controllers/admin/settings.py:299 msgid "error occurred during updating application settings" msgstr "ocorreu um erro ao atualizar as configurações da aplicação" -#: rhodecode/controllers/admin/settings.py:200 +#: rhodecode/controllers/admin/settings.py:207 #, fuzzy msgid "Updated visualisation settings" msgstr "Configurações da aplicação atualizadas" -#: rhodecode/controllers/admin/settings.py:205 +#: rhodecode/controllers/admin/settings.py:212 #, 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:271 +#: rhodecode/controllers/admin/settings.py:295 #, fuzzy msgid "Updated VCS settings" msgstr "Atualizadas as configurações do mercurial" -#: rhodecode/controllers/admin/settings.py:285 +#: rhodecode/controllers/admin/settings.py:309 msgid "Added new hook" msgstr "Adicionado novo gancho" -#: rhodecode/controllers/admin/settings.py:297 +#: rhodecode/controllers/admin/settings.py:321 msgid "Updated hooks" msgstr "Atualizados os ganchos" -#: rhodecode/controllers/admin/settings.py:301 +#: rhodecode/controllers/admin/settings.py:325 msgid "error occurred during hook creation" msgstr "ocorreu um erro ao criar gancho" -#: rhodecode/controllers/admin/settings.py:320 +#: rhodecode/controllers/admin/settings.py:344 msgid "Email task created" msgstr "Tarefa de e-mail criada" -#: rhodecode/controllers/admin/settings.py:375 +#: rhodecode/controllers/admin/settings.py:399 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:406 +#: rhodecode/controllers/admin/settings.py:430 msgid "Your account was updated successfully" msgstr "Sua conta foi atualizada com sucesso" -#: rhodecode/controllers/admin/settings.py:421 -#: rhodecode/controllers/admin/users.py:191 +#: rhodecode/controllers/admin/settings.py:445 +#: rhodecode/controllers/admin/users.py:196 #, python-format msgid "error occurred during update of user %s" msgstr "ocorreu um erro ao atualizar o usuário %s" @@ -640,105 +668,105 @@ msgid "error occurred during creation of user %s" msgstr "ocorreu um erro ao criar o usuário %s" -#: rhodecode/controllers/admin/users.py:171 +#: rhodecode/controllers/admin/users.py:176 msgid "User updated successfully" msgstr "Usuário atualizado com sucesso" -#: rhodecode/controllers/admin/users.py:207 +#: rhodecode/controllers/admin/users.py:212 msgid "successfully deleted user" msgstr "usuário excluído com sucesso" -#: rhodecode/controllers/admin/users.py:212 +#: rhodecode/controllers/admin/users.py:217 msgid "An error occurred during deletion of user" msgstr "Ocorreu um erro ao excluir o usuário" -#: rhodecode/controllers/admin/users.py:226 +#: rhodecode/controllers/admin/users.py:231 msgid "You can't edit this user" msgstr "Você não pode editar esse usuário" -#: rhodecode/controllers/admin/users.py:266 +#: rhodecode/controllers/admin/users.py:272 msgid "Granted 'repository create' permission to user" msgstr "Concedida permissão de 'criar repositório' ao usuário" -#: rhodecode/controllers/admin/users.py:271 +#: rhodecode/controllers/admin/users.py:277 msgid "Revoked 'repository create' permission to user" msgstr "Revogada permissão de 'criar repositório' ao usuário" -#: rhodecode/controllers/admin/users.py:277 +#: rhodecode/controllers/admin/users.py:283 #, fuzzy msgid "Granted 'repository fork' permission to user" msgstr "Concedida permissão de 'criar repositório' ao usuário" -#: rhodecode/controllers/admin/users.py:282 +#: rhodecode/controllers/admin/users.py:288 #, fuzzy msgid "Revoked 'repository fork' permission to user" msgstr "Revogada permissão de 'criar repositório' ao usuário" -#: rhodecode/controllers/admin/users.py:288 -#: rhodecode/controllers/admin/users_groups.py:255 +#: rhodecode/controllers/admin/users.py:294 +#: rhodecode/controllers/admin/users_groups.py:279 #, fuzzy msgid "An error occurred during permissions saving" msgstr "Ocorreu um erro durante essa operação" -#: rhodecode/controllers/admin/users.py:303 +#: rhodecode/controllers/admin/users.py:309 #, python-format msgid "Added email %s to user" msgstr "" -#: rhodecode/controllers/admin/users.py:309 +#: rhodecode/controllers/admin/users.py:315 #, fuzzy msgid "An error occurred during email saving" msgstr "Ocorreu um erro durante essa operação" -#: rhodecode/controllers/admin/users.py:319 +#: rhodecode/controllers/admin/users.py:325 #, fuzzy msgid "Removed email from user" msgstr "removido grupo de repositórios %s" -#: rhodecode/controllers/admin/users_groups.py:84 +#: rhodecode/controllers/admin/users_groups.py:86 #, python-format msgid "created users group %s" msgstr "criado grupo de usuários %s" -#: rhodecode/controllers/admin/users_groups.py:95 +#: rhodecode/controllers/admin/users_groups.py:97 #, python-format msgid "error occurred during creation of users group %s" msgstr "ocorreu um erro ao criar o grupo de usuários %s" -#: rhodecode/controllers/admin/users_groups.py:135 +#: rhodecode/controllers/admin/users_groups.py:164 #, python-format msgid "updated users group %s" msgstr "grupo de usuários %s atualizado" -#: rhodecode/controllers/admin/users_groups.py:157 +#: rhodecode/controllers/admin/users_groups.py:186 #, python-format msgid "error occurred during update of users group %s" msgstr "ocorreu um erro ao atualizar o grupo de usuários %s" -#: rhodecode/controllers/admin/users_groups.py:174 +#: rhodecode/controllers/admin/users_groups.py:203 msgid "successfully deleted users group" msgstr "grupo de usuários excluído com sucesso" -#: rhodecode/controllers/admin/users_groups.py:179 +#: rhodecode/controllers/admin/users_groups.py:208 msgid "An error occurred during deletion of users group" msgstr "Ocorreu um erro ao excluir o grupo de usuários" -#: rhodecode/controllers/admin/users_groups.py:233 +#: rhodecode/controllers/admin/users_groups.py:257 #, fuzzy msgid "Granted 'repository create' permission to users group" msgstr "Concedida permissão de 'criar repositório' ao usuário" -#: rhodecode/controllers/admin/users_groups.py:238 +#: rhodecode/controllers/admin/users_groups.py:262 #, fuzzy msgid "Revoked 'repository create' permission to users group" msgstr "Revogada permissão de 'criar repositório' ao usuário" -#: rhodecode/controllers/admin/users_groups.py:244 +#: rhodecode/controllers/admin/users_groups.py:268 #, fuzzy msgid "Granted 'repository fork' permission to users group" msgstr "Concedida permissão de 'criar repositório' ao usuário" -#: rhodecode/controllers/admin/users_groups.py:249 +#: rhodecode/controllers/admin/users_groups.py:273 #, fuzzy msgid "Revoked 'repository fork' permission to users group" msgstr "Revogada permissão de 'criar repositório' ao usuário" @@ -751,217 +779,242 @@ msgid "You need to be a signed in to view this page" msgstr "Você precisa estar logado para ver essa página" -#: rhodecode/lib/diffs.py:86 +#: rhodecode/lib/diffs.py:74 +msgid "binary file" +msgstr "arquivo binário" + +#: rhodecode/lib/diffs.py:90 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" "Conjunto de mudanças é grande demais e foi cortado, use o menu de " "diferenças para ver as diferenças" -#: rhodecode/lib/diffs.py:96 +#: rhodecode/lib/diffs.py:100 msgid "No changes detected" msgstr "Nenhuma alteração detectada" -#: rhodecode/lib/helpers.py:372 +#: rhodecode/lib/helpers.py:373 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "" -#: rhodecode/lib/helpers.py:484 +#: rhodecode/lib/helpers.py:485 msgid "True" msgstr "Verdadeiro" -#: rhodecode/lib/helpers.py:488 +#: rhodecode/lib/helpers.py:489 msgid "False" msgstr "Falso" +#: rhodecode/lib/helpers.py:529 +#, fuzzy, python-format +msgid "Deleted branch: %s" +msgstr "excluído o repositório %s" + #: rhodecode/lib/helpers.py:532 +#, fuzzy, python-format +msgid "Created tag: %s" +msgstr "usuário %s criado" + +#: rhodecode/lib/helpers.py:545 msgid "Changeset not found" msgstr "Conjunto de alterações não encontrado" -#: rhodecode/lib/helpers.py:555 +#: rhodecode/lib/helpers.py:588 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Ver todos os conjuntos de mudanças combinados %s->%s" -#: rhodecode/lib/helpers.py:561 +#: rhodecode/lib/helpers.py:594 msgid "compare view" msgstr "comparar exibir" -#: rhodecode/lib/helpers.py:581 +#: rhodecode/lib/helpers.py:614 msgid "and" msgstr "e" -#: rhodecode/lib/helpers.py:582 +#: rhodecode/lib/helpers.py:615 #, python-format msgid "%s more" msgstr "%s mais" -#: rhodecode/lib/helpers.py:583 rhodecode/templates/changelog/changelog.html:48 +#: rhodecode/lib/helpers.py:616 rhodecode/templates/changelog/changelog.html:51 msgid "revisions" msgstr "revisões" -#: rhodecode/lib/helpers.py:606 -msgid "fork name " +#: rhodecode/lib/helpers.py:640 +#, fuzzy, python-format +msgid "fork name %s" msgstr "nome da bifurcação" -#: rhodecode/lib/helpers.py:620 +#: rhodecode/lib/helpers.py:653 #: rhodecode/templates/pullrequests/pullrequest_show.html:4 #: rhodecode/templates/pullrequests/pullrequest_show.html:12 #, python-format msgid "Pull request #%s" msgstr "" -#: rhodecode/lib/helpers.py:626 +#: rhodecode/lib/helpers.py:659 msgid "[deleted] repository" msgstr "repositório [excluído]" -#: rhodecode/lib/helpers.py:628 rhodecode/lib/helpers.py:638 +#: rhodecode/lib/helpers.py:661 rhodecode/lib/helpers.py:671 msgid "[created] repository" msgstr "repositório [criado]" -#: rhodecode/lib/helpers.py:630 +#: rhodecode/lib/helpers.py:663 msgid "[created] repository as fork" msgstr "repositório [criado] como uma bifurcação" -#: rhodecode/lib/helpers.py:632 rhodecode/lib/helpers.py:640 +#: rhodecode/lib/helpers.py:665 rhodecode/lib/helpers.py:673 msgid "[forked] repository" msgstr "repositório [bifurcado]" -#: rhodecode/lib/helpers.py:634 rhodecode/lib/helpers.py:642 +#: rhodecode/lib/helpers.py:667 rhodecode/lib/helpers.py:675 msgid "[updated] repository" msgstr "repositório [atualizado]" -#: rhodecode/lib/helpers.py:636 +#: rhodecode/lib/helpers.py:669 msgid "[delete] repository" msgstr "[excluir] repositório" -#: rhodecode/lib/helpers.py:644 +#: rhodecode/lib/helpers.py:677 #, fuzzy msgid "[created] user" msgstr "usuário %s criado" -#: rhodecode/lib/helpers.py:646 +#: rhodecode/lib/helpers.py:679 #, fuzzy msgid "[updated] user" msgstr "grupo de usuários %s atualizado" -#: rhodecode/lib/helpers.py:648 +#: rhodecode/lib/helpers.py:681 #, fuzzy msgid "[created] users group" msgstr "criado grupo de usuários %s" -#: rhodecode/lib/helpers.py:650 +#: rhodecode/lib/helpers.py:683 #, fuzzy msgid "[updated] users group" msgstr "grupo de usuários %s atualizado" -#: rhodecode/lib/helpers.py:652 +#: rhodecode/lib/helpers.py:685 #, fuzzy msgid "[commented] on revision in repository" msgstr "repositório [criado]" -#: rhodecode/lib/helpers.py:654 +#: rhodecode/lib/helpers.py:687 #, fuzzy msgid "[commented] on pull request for" msgstr "repositório [criado]" -#: rhodecode/lib/helpers.py:656 +#: rhodecode/lib/helpers.py:689 #, fuzzy msgid "[closed] pull request for" msgstr "repositório [criado]" -#: rhodecode/lib/helpers.py:658 +#: rhodecode/lib/helpers.py:691 msgid "[pushed] into" msgstr "[realizado push] para" -#: rhodecode/lib/helpers.py:660 +#: rhodecode/lib/helpers.py:693 #, fuzzy msgid "[committed via RhodeCode] into repository" msgstr "[realizado commit via RhodeCode] para" -#: rhodecode/lib/helpers.py:662 +#: rhodecode/lib/helpers.py:695 #, fuzzy msgid "[pulled from remote] into repository" msgstr "[realizado pull remoto] para" -#: rhodecode/lib/helpers.py:664 +#: rhodecode/lib/helpers.py:697 msgid "[pulled] from" msgstr "[realizado pull] a partir de" -#: rhodecode/lib/helpers.py:666 +#: rhodecode/lib/helpers.py:699 msgid "[started following] repository" msgstr "[passou a seguir] o repositório" -#: rhodecode/lib/helpers.py:668 +#: rhodecode/lib/helpers.py:701 msgid "[stopped following] repository" msgstr "[parou de seguir] o repositório" -#: rhodecode/lib/helpers.py:840 +#: rhodecode/lib/helpers.py:877 #, python-format msgid " and %s more" msgstr " e mais %s" -#: rhodecode/lib/helpers.py:844 +#: rhodecode/lib/helpers.py:881 msgid "No Files" msgstr "Nenhum Arquivo" -#: rhodecode/lib/utils2.py:335 +#: rhodecode/lib/utils2.py:403 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d ano" msgstr[1] "%d anos" -#: rhodecode/lib/utils2.py:336 +#: rhodecode/lib/utils2.py:404 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d mês" msgstr[1] "%d meses" -#: rhodecode/lib/utils2.py:337 +#: rhodecode/lib/utils2.py:405 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dia" msgstr[1] "%d dias" -#: rhodecode/lib/utils2.py:338 +#: rhodecode/lib/utils2.py:406 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: rhodecode/lib/utils2.py:339 +#: rhodecode/lib/utils2.py:407 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: rhodecode/lib/utils2.py:340 +#: rhodecode/lib/utils2.py:408 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d segundo" msgstr[1] "%d segundos" -#: rhodecode/lib/utils2.py:355 +#: rhodecode/lib/utils2.py:424 +#, fuzzy, python-format +msgid "in %s" +msgstr "na linha %s" + +#: rhodecode/lib/utils2.py:426 #, python-format msgid "%s ago" msgstr "%s atrás" -#: rhodecode/lib/utils2.py:357 +#: rhodecode/lib/utils2.py:428 +#, fuzzy, python-format +msgid "in %s and %s" +msgstr "%s e %s atrás" + +#: rhodecode/lib/utils2.py:431 #, python-format msgid "%s and %s ago" msgstr "%s e %s atrás" -#: rhodecode/lib/utils2.py:360 +#: rhodecode/lib/utils2.py:434 msgid "just now" msgstr "agora há pouco" -#: rhodecode/lib/celerylib/tasks.py:269 +#: rhodecode/lib/celerylib/tasks.py:270 msgid "password reset link" msgstr "link de reinicialização de senha" @@ -970,102 +1023,102 @@ msgid "on line %s" msgstr "na linha %s" -#: rhodecode/model/comment.py:157 +#: rhodecode/model/comment.py:173 msgid "[Mention]" msgstr "[Menção]" -#: rhodecode/model/db.py:1140 +#: rhodecode/model/db.py:1163 #, fuzzy msgid "Repository no access" msgstr "repositórios" -#: rhodecode/model/db.py:1141 +#: rhodecode/model/db.py:1164 #, fuzzy msgid "Repository read access" msgstr "Esse repositório já existe" -#: rhodecode/model/db.py:1142 +#: rhodecode/model/db.py:1165 #, fuzzy msgid "Repository write access" msgstr "repositórios" -#: rhodecode/model/db.py:1143 +#: rhodecode/model/db.py:1166 #, fuzzy msgid "Repository admin access" msgstr "repositórios" -#: rhodecode/model/db.py:1145 +#: rhodecode/model/db.py:1168 #, fuzzy msgid "Repositories Group no access" msgstr "grupos de repositórios" -#: rhodecode/model/db.py:1146 +#: rhodecode/model/db.py:1169 #, fuzzy msgid "Repositories Group read access" msgstr "grupos de repositórios" -#: rhodecode/model/db.py:1147 +#: rhodecode/model/db.py:1170 #, fuzzy msgid "Repositories Group write access" msgstr "grupos de repositórios" -#: rhodecode/model/db.py:1148 +#: rhodecode/model/db.py:1171 #, fuzzy msgid "Repositories Group admin access" msgstr "grupos de repositórios" -#: rhodecode/model/db.py:1150 +#: rhodecode/model/db.py:1173 #, fuzzy msgid "RhodeCode Administrator" msgstr "Administração de usuários" -#: rhodecode/model/db.py:1151 +#: rhodecode/model/db.py:1174 #, fuzzy msgid "Repository creation disabled" msgstr "Criação de repositório" -#: rhodecode/model/db.py:1152 +#: rhodecode/model/db.py:1175 #, fuzzy msgid "Repository creation enabled" msgstr "Criação de repositório" -#: rhodecode/model/db.py:1153 +#: rhodecode/model/db.py:1176 #, fuzzy msgid "Repository forking disabled" msgstr "Criação de repositório" -#: rhodecode/model/db.py:1154 +#: rhodecode/model/db.py:1177 #, fuzzy msgid "Repository forking enabled" msgstr "Criação de repositório" -#: rhodecode/model/db.py:1155 +#: rhodecode/model/db.py:1178 #, fuzzy msgid "Register disabled" msgstr "desabilitado" -#: rhodecode/model/db.py:1156 +#: rhodecode/model/db.py:1179 msgid "Register new user with RhodeCode with manual activation" msgstr "" -#: rhodecode/model/db.py:1159 +#: rhodecode/model/db.py:1182 msgid "Register new user with RhodeCode with auto activation" msgstr "" -#: rhodecode/model/db.py:1579 +#: rhodecode/model/db.py:1623 msgid "Not Reviewed" msgstr "" -#: rhodecode/model/db.py:1580 +#: rhodecode/model/db.py:1624 #, fuzzy msgid "Approved" msgstr "removidos" -#: rhodecode/model/db.py:1581 +#: rhodecode/model/db.py:1625 msgid "Rejected" msgstr "" -#: rhodecode/model/db.py:1582 +#: rhodecode/model/db.py:1626 msgid "Under Review" msgstr "" @@ -1088,36 +1141,41 @@ msgstr "Entre com %(min)i caracteres ou mais" #: rhodecode/model/notification.py:220 -msgid "commented on commit" +#, fuzzy, python-format +msgid "commented on commit at %(when)s" msgstr "comentado no commit" #: rhodecode/model/notification.py:221 -msgid "sent message" +#, fuzzy, python-format +msgid "sent message at %(when)s" msgstr "mensagem enviada" #: rhodecode/model/notification.py:222 -msgid "mentioned you" +#, fuzzy, python-format +msgid "mentioned you at %(when)s" msgstr "mencionou você" #: rhodecode/model/notification.py:223 -msgid "registered in RhodeCode" +#, fuzzy, python-format +msgid "registered in RhodeCode at %(when)s" msgstr "registrado no RhodeCode" #: rhodecode/model/notification.py:224 -msgid "opened new pull request" -msgstr "" +#, fuzzy, python-format +msgid "opened new pull request at %(when)s" +msgstr "comentado no commit" #: rhodecode/model/notification.py:225 -#, fuzzy -msgid "commented on pull request" +#, fuzzy, python-format +msgid "commented on pull request at %(when)s" msgstr "comentado no commit" -#: rhodecode/model/pull_request.py:84 +#: rhodecode/model/pull_request.py:90 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s" msgstr "" -#: rhodecode/model/scm.py:535 +#: rhodecode/model/scm.py:542 #, fuzzy msgid "latest tip" msgstr "último login" @@ -1126,20 +1184,20 @@ msgid "new user registration" msgstr "registro de novo usuário" -#: rhodecode/model/user.py:255 rhodecode/model/user.py:277 -#: rhodecode/model/user.py:299 +#: rhodecode/model/user.py:255 rhodecode/model/user.py:279 +#: rhodecode/model/user.py:301 msgid "You can't Edit this user since it's crucial for entire application" msgstr "" "Você não pode Editar esse usuário, pois ele é crucial para toda a " "aplicação" -#: rhodecode/model/user.py:323 +#: rhodecode/model/user.py:325 msgid "You can't remove this user since it's crucial for entire application" msgstr "" "Você não pode remover esse usuário, pois ele é crucial para toda a " "aplicação" -#: rhodecode/model/user.py:329 +#: rhodecode/model/user.py:331 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -1148,21 +1206,21 @@ "usuário \"%s\" ainda é dono de %s repositórios e não pode ser removido. " "Troque os donos ou remova esses repositórios. %s" -#: rhodecode/model/validators.py:35 rhodecode/model/validators.py:36 +#: rhodecode/model/validators.py:36 rhodecode/model/validators.py:37 msgid "Value cannot be an empty list" msgstr "" -#: rhodecode/model/validators.py:82 +#: rhodecode/model/validators.py:83 #, fuzzy, python-format msgid "Username \"%(username)s\" already exists" msgstr "Esse nome de usuário já existe" -#: rhodecode/model/validators.py:84 +#: rhodecode/model/validators.py:85 #, python-format msgid "Username \"%(username)s\" is forbidden" msgstr "" -#: rhodecode/model/validators.py:86 +#: rhodecode/model/validators.py:87 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with alphanumeric character" @@ -1170,22 +1228,22 @@ "Nome de usuário pode conter somente caracteres alfanuméricos, sublinha, " "pontos e hífens e deve iniciar com caractere alfanumérico" -#: rhodecode/model/validators.py:114 +#: rhodecode/model/validators.py:115 #, fuzzy, python-format msgid "Username %(username)s is not valid" msgstr "Esse nome de usuário ou nome de grupo de usuários não é válido" -#: rhodecode/model/validators.py:133 +#: rhodecode/model/validators.py:134 #, fuzzy msgid "Invalid users group name" msgstr "nome de usuário inválido" -#: rhodecode/model/validators.py:134 +#: rhodecode/model/validators.py:135 #, fuzzy, python-format msgid "Users group \"%(usersgroup)s\" already exists" msgstr "Esse grupo de usuários já existe" -#: rhodecode/model/validators.py:136 +#: rhodecode/model/validators.py:137 msgid "" "users group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -1194,93 +1252,98 @@ "alfanuméricos, sublinha, pontos e hífens e deve iniciar com caractere " "alfanumérico" -#: rhodecode/model/validators.py:174 +#: rhodecode/model/validators.py:175 msgid "Cannot assign this group as parent" msgstr "Não é possível associar esse grupo como progenitor" -#: rhodecode/model/validators.py:175 +#: rhodecode/model/validators.py:176 #, fuzzy, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "Esse nome de usuário já existe" -#: rhodecode/model/validators.py:177 +#: rhodecode/model/validators.py:178 #, fuzzy, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "Já existe um repositório com esse nome" -#: rhodecode/model/validators.py:235 +#: rhodecode/model/validators.py:236 #, fuzzy msgid "Invalid characters (non-ascii) in password" msgstr "Caracteres inválidos na senha" -#: rhodecode/model/validators.py:250 +#: rhodecode/model/validators.py:251 msgid "Passwords do not match" msgstr "Senhas não conferem" -#: rhodecode/model/validators.py:267 -msgid "invalid password" -msgstr "senha inválida" - #: rhodecode/model/validators.py:268 -msgid "invalid user name" -msgstr "nome de usuário inválido" +msgid "invalid password" +msgstr "senha inválida" #: rhodecode/model/validators.py:269 +msgid "invalid user name" +msgstr "nome de usuário inválido" + +#: rhodecode/model/validators.py:270 msgid "Your account is disabled" msgstr "Sua conta está desabilitada" -#: rhodecode/model/validators.py:313 +#: rhodecode/model/validators.py:314 #, fuzzy, python-format msgid "Repository name %(repo)s is disallowed" msgstr "Esse nome de repositório não é permitido" -#: rhodecode/model/validators.py:315 +#: rhodecode/model/validators.py:316 #, fuzzy, python-format msgid "Repository named %(repo)s already exists" msgstr "Já existe um repositório com esse nome" -#: rhodecode/model/validators.py:316 +#: rhodecode/model/validators.py:317 #, fuzzy, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "Esse repositório já existe em um grupo \"%s\"" -#: rhodecode/model/validators.py:318 +#: rhodecode/model/validators.py:319 #, fuzzy, python-format msgid "Repositories group with name \"%(repo)s\" already exists" msgstr "Já existe um repositório com esse nome" -#: rhodecode/model/validators.py:431 +#: rhodecode/model/validators.py:432 msgid "invalid clone url" msgstr "URL de clonagem inválida" -#: rhodecode/model/validators.py:432 +#: rhodecode/model/validators.py:433 #, fuzzy msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" msgstr "URL de clonagem inválida, forneça uma URL válida de clonagem http\\s" -#: rhodecode/model/validators.py:457 +#: rhodecode/model/validators.py:458 #, fuzzy msgid "Fork have to be the same type as parent" msgstr "Bifurcação precisa ser do mesmo tipo que o original" -#: rhodecode/model/validators.py:478 +#: rhodecode/model/validators.py:473 +#, fuzzy +msgid "You don't have permissions to create repository in this group" +msgstr "Você não tem permissão para ver esta página" + +#: rhodecode/model/validators.py:498 msgid "This username or users 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:562 +#: rhodecode/model/validators.py:582 msgid "This is not a valid path" msgstr "Esse não é um caminho válido" -#: rhodecode/model/validators.py:577 +#: rhodecode/model/validators.py:597 msgid "This e-mail address is already taken" msgstr "Esse endereço de e-mail já está tomado" -#: rhodecode/model/validators.py:597 +#: rhodecode/model/validators.py:617 #, 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:634 +#: rhodecode/model/validators.py:654 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" @@ -1288,7 +1351,7 @@ "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:653 +#: rhodecode/model/validators.py:673 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" @@ -1311,7 +1374,7 @@ #: rhodecode/templates/index_base.html:6 #: rhodecode/templates/admin/repos/repos.html:9 -#: rhodecode/templates/base/base.html:221 +#: rhodecode/templates/base/base.html:233 msgid "repositories" msgstr "repositórios" @@ -1322,6 +1385,7 @@ msgstr "ADICIONAR REPOSITÓRIO" #: rhodecode/templates/index_base.html:29 +#: rhodecode/templates/index_base.html:136 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:32 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:32 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:33 @@ -1331,9 +1395,10 @@ msgstr "Nome do grupo" #: rhodecode/templates/index_base.html:30 -#: rhodecode/templates/index_base.html:71 -#: rhodecode/templates/index_base.html:142 -#: rhodecode/templates/index_base.html:168 +#: rhodecode/templates/index_base.html:72 +#: rhodecode/templates/index_base.html:138 +#: rhodecode/templates/index_base.html:176 +#: rhodecode/templates/index_base.html:266 #: rhodecode/templates/admin/repos/repo_add_base.html:56 #: rhodecode/templates/admin/repos/repo_edit.html:75 #: rhodecode/templates/admin/repos/repos.html:72 @@ -1342,142 +1407,137 @@ #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34 #: rhodecode/templates/forks/fork.html:59 #: rhodecode/templates/settings/repo_settings.html:66 -#: rhodecode/templates/summary/summary.html:105 +#: rhodecode/templates/summary/summary.html:114 msgid "Description" msgstr "Descrição" #: rhodecode/templates/index_base.html:40 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:47 msgid "Repositories group" msgstr "Grupo de repositórios" -#: rhodecode/templates/index_base.html:70 -#: rhodecode/templates/index_base.html:166 +#: rhodecode/templates/index_base.html:71 +#: rhodecode/templates/index_base.html:174 +#: rhodecode/templates/index_base.html:264 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:32 #: rhodecode/templates/admin/repos/repos.html:70 -#: rhodecode/templates/admin/users/user_edit.html:192 +#: rhodecode/templates/admin/users/user_edit.html:196 #: rhodecode/templates/admin/users/user_edit_my_account.html:59 -#: rhodecode/templates/admin/users/user_edit_my_account.html:157 -#: rhodecode/templates/admin/users/user_edit_my_account.html:193 +#: rhodecode/templates/admin/users/user_edit_my_account.html:180 +#: rhodecode/templates/admin/users/user_edit_my_account.html:216 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:184 #: rhodecode/templates/bookmarks/bookmarks.html:36 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 -#: rhodecode/templates/branches/branches.html:51 +#: rhodecode/templates/branches/branches.html:50 +#: rhodecode/templates/branches/branches_data.html:6 #: rhodecode/templates/files/files_browser.html:47 -#: rhodecode/templates/journal/journal.html:59 -#: rhodecode/templates/journal/journal.html:107 -#: rhodecode/templates/journal/journal.html:186 +#: rhodecode/templates/journal/journal.html:62 +#: rhodecode/templates/journal/journal.html:168 +#: rhodecode/templates/journal/journal_page_repos.html:7 #: rhodecode/templates/settings/repo_settings.html:31 #: rhodecode/templates/summary/summary.html:43 -#: rhodecode/templates/summary/summary.html:123 -#: rhodecode/templates/tags/tags.html:36 +#: rhodecode/templates/summary/summary.html:132 +#: rhodecode/templates/tags/tags.html:51 #: rhodecode/templates/tags/tags_data.html:6 msgid "Name" msgstr "Nome" -#: rhodecode/templates/index_base.html:72 +#: rhodecode/templates/index_base.html:73 msgid "Last change" msgstr "Última alteração" -#: rhodecode/templates/index_base.html:73 -#: rhodecode/templates/index_base.html:171 -#: rhodecode/templates/admin/users/user_edit_my_account.html:159 -#: rhodecode/templates/journal/journal.html:188 +#: rhodecode/templates/index_base.html:74 +#: rhodecode/templates/index_base.html:179 +#: rhodecode/templates/admin/users/user_edit_my_account.html:182 +#: rhodecode/templates/journal/journal.html:170 msgid "Tip" msgstr "Ponta" -#: rhodecode/templates/index_base.html:74 -#: rhodecode/templates/index_base.html:173 +#: rhodecode/templates/index_base.html:75 +#: rhodecode/templates/index_base.html:181 +#: rhodecode/templates/index_base.html:269 #: rhodecode/templates/admin/repos/repo_edit.html:121 #: rhodecode/templates/admin/repos/repos.html:73 msgid "Owner" msgstr "Dono" -#: rhodecode/templates/index_base.html:75 +#: rhodecode/templates/index_base.html:76 #: rhodecode/templates/summary/summary.html:48 #: rhodecode/templates/summary/summary.html:51 msgid "RSS" msgstr "RSS" -#: rhodecode/templates/index_base.html:76 +#: rhodecode/templates/index_base.html:77 msgid "Atom" msgstr "Atom" -#: rhodecode/templates/index_base.html:110 -#: rhodecode/templates/index_base.html:112 -#, python-format -msgid "Subscribe to %s rss feed" -msgstr "Assinar o feed rss de %s" - -#: rhodecode/templates/index_base.html:117 -#: rhodecode/templates/index_base.html:119 -#, python-format -msgid "Subscribe to %s atom feed" -msgstr "Assinar o feed atom de %s" - -#: rhodecode/templates/index_base.html:140 -msgid "Group Name" -msgstr "Nome do Grupo" - -#: rhodecode/templates/index_base.html:158 -#: rhodecode/templates/index_base.html:198 +#: rhodecode/templates/index_base.html:167 +#: rhodecode/templates/index_base.html:207 +#: rhodecode/templates/index_base.html:291 #: rhodecode/templates/admin/repos/repos.html:94 -#: rhodecode/templates/admin/users/user_edit_my_account.html:179 +#: rhodecode/templates/admin/users/user_edit_my_account.html:202 #: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:60 -#: rhodecode/templates/branches/branches.html:77 -#: rhodecode/templates/journal/journal.html:211 -#: rhodecode/templates/tags/tags.html:60 +#: rhodecode/templates/branches/branches.html:76 +#: rhodecode/templates/journal/journal.html:193 +#: rhodecode/templates/tags/tags.html:77 msgid "Click to sort ascending" msgstr "Clique para ordenar em ordem crescente" -#: rhodecode/templates/index_base.html:159 -#: rhodecode/templates/index_base.html:199 +#: rhodecode/templates/index_base.html:168 +#: rhodecode/templates/index_base.html:208 +#: rhodecode/templates/index_base.html:292 #: rhodecode/templates/admin/repos/repos.html:95 -#: rhodecode/templates/admin/users/user_edit_my_account.html:180 +#: rhodecode/templates/admin/users/user_edit_my_account.html:203 #: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:61 -#: rhodecode/templates/branches/branches.html:78 -#: rhodecode/templates/journal/journal.html:212 -#: rhodecode/templates/tags/tags.html:61 +#: rhodecode/templates/branches/branches.html:77 +#: rhodecode/templates/journal/journal.html:194 +#: rhodecode/templates/tags/tags.html:78 msgid "Click to sort descending" msgstr "Clique para ordenar em ordem descrescente" -#: rhodecode/templates/index_base.html:169 +#: rhodecode/templates/index_base.html:177 +#: rhodecode/templates/index_base.html:267 msgid "Last Change" msgstr "Última Alteração" -#: rhodecode/templates/index_base.html:200 +#: rhodecode/templates/index_base.html:209 +#: rhodecode/templates/index_base.html:293 #: rhodecode/templates/admin/repos/repos.html:96 -#: rhodecode/templates/admin/users/user_edit_my_account.html:181 +#: rhodecode/templates/admin/users/user_edit_my_account.html:204 #: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:62 -#: rhodecode/templates/branches/branches.html:79 -#: rhodecode/templates/journal/journal.html:213 -#: rhodecode/templates/tags/tags.html:62 +#: rhodecode/templates/branches/branches.html:78 +#: rhodecode/templates/journal/journal.html:195 +#: rhodecode/templates/tags/tags.html:79 msgid "No records found." msgstr "Nenhum registro encontrado." -#: rhodecode/templates/index_base.html:201 +#: rhodecode/templates/index_base.html:210 +#: rhodecode/templates/index_base.html:294 #: rhodecode/templates/admin/repos/repos.html:97 -#: rhodecode/templates/admin/users/user_edit_my_account.html:182 +#: rhodecode/templates/admin/users/user_edit_my_account.html:205 #: rhodecode/templates/admin/users/users.html:110 #: rhodecode/templates/bookmarks/bookmarks.html:63 -#: rhodecode/templates/branches/branches.html:80 -#: rhodecode/templates/journal/journal.html:214 -#: rhodecode/templates/tags/tags.html:63 +#: rhodecode/templates/branches/branches.html:79 +#: rhodecode/templates/journal/journal.html:196 +#: rhodecode/templates/tags/tags.html:80 msgid "Data error." msgstr "Erro de dados." -#: rhodecode/templates/index_base.html:202 +#: rhodecode/templates/index_base.html:211 +#: rhodecode/templates/index_base.html:295 #: rhodecode/templates/admin/repos/repos.html:98 -#: rhodecode/templates/admin/users/user_edit_my_account.html:183 +#: rhodecode/templates/admin/users/user_edit_my_account.html:206 #: rhodecode/templates/admin/users/users.html:111 #: rhodecode/templates/bookmarks/bookmarks.html:64 -#: rhodecode/templates/branches/branches.html:81 -#: rhodecode/templates/journal/journal.html:215 -#: rhodecode/templates/tags/tags.html:64 +#: rhodecode/templates/branches/branches.html:80 +#: rhodecode/templates/journal/journal.html:54 +#: rhodecode/templates/journal/journal.html:197 +#: rhodecode/templates/tags/tags.html:81 msgid "Loading..." msgstr "Carregando..." @@ -1495,7 +1555,7 @@ #: rhodecode/templates/admin/users/user_edit.html:50 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:26 #: rhodecode/templates/base/base.html:83 -#: rhodecode/templates/summary/summary.html:122 +#: rhodecode/templates/summary/summary.html:131 msgid "Username" msgstr "Nome de usuário" @@ -1554,23 +1614,23 @@ #: rhodecode/templates/register.html:47 #: rhodecode/templates/admin/users/user_add.html:59 -#: rhodecode/templates/admin/users/user_edit.html:86 +#: rhodecode/templates/admin/users/user_edit.html:90 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:53 msgid "First Name" msgstr "Primeiro Nome" #: rhodecode/templates/register.html:56 #: rhodecode/templates/admin/users/user_add.html:68 -#: rhodecode/templates/admin/users/user_edit.html:95 +#: rhodecode/templates/admin/users/user_edit.html:99 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:62 msgid "Last Name" msgstr "Último Nome" #: rhodecode/templates/register.html:65 #: rhodecode/templates/admin/users/user_add.html:77 -#: rhodecode/templates/admin/users/user_edit.html:104 +#: rhodecode/templates/admin/users/user_edit.html:108 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:71 -#: rhodecode/templates/summary/summary.html:124 +#: rhodecode/templates/summary/summary.html:133 msgid "Email" msgstr "E-mail" @@ -1610,7 +1670,7 @@ msgstr "etiquetas" #: rhodecode/templates/switch_to_list.html:22 -#: rhodecode/templates/tags/tags_data.html:33 +#: rhodecode/templates/tags/tags_data.html:38 msgid "There are no tags yet" msgstr "Ainda não há etiquetas" @@ -1633,8 +1693,8 @@ #: rhodecode/templates/admin/repos/repos.html:74 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:9 -#: rhodecode/templates/journal/journal.html:61 -#: rhodecode/templates/journal/journal.html:62 +#: rhodecode/templates/journal/journal_page_repos.html:9 +#: rhodecode/templates/journal/journal_page_repos.html:10 msgid "Action" msgstr "Ação" @@ -1645,8 +1705,9 @@ #: rhodecode/templates/admin/admin_log.html:8 #: rhodecode/templates/bookmarks/bookmarks.html:37 #: rhodecode/templates/bookmarks/bookmarks_data.html:7 -#: rhodecode/templates/branches/branches.html:52 -#: rhodecode/templates/tags/tags.html:37 +#: rhodecode/templates/branches/branches.html:51 +#: rhodecode/templates/branches/branches_data.html:7 +#: rhodecode/templates/tags/tags.html:52 #: rhodecode/templates/tags/tags_data.html:7 msgid "Date" msgstr "Data" @@ -1655,7 +1716,7 @@ msgid "From IP" msgstr "A partir do IP" -#: rhodecode/templates/admin/admin_log.html:53 +#: rhodecode/templates/admin/admin_log.html:57 msgid "No actions yet" msgstr "Ainda não há ações" @@ -1735,8 +1796,8 @@ #: rhodecode/templates/admin/repos/repo_edit.html:141 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74 #: rhodecode/templates/admin/settings/hooks.html:73 -#: rhodecode/templates/admin/users/user_edit.html:129 -#: rhodecode/templates/admin/users/user_edit.html:174 +#: rhodecode/templates/admin/users/user_edit.html:133 +#: rhodecode/templates/admin/users/user_edit.html:178 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:79 #: rhodecode/templates/admin/users_groups/users_group_edit.html:135 #: rhodecode/templates/settings/repo_settings.html:93 @@ -1758,8 +1819,8 @@ msgstr "commits" #: rhodecode/templates/admin/notifications/notifications.html:31 -#: rhodecode/templates/base/base.html:254 -#: rhodecode/templates/base/base.html:256 +#: rhodecode/templates/base/base.html:266 +#: rhodecode/templates/base/base.html:268 msgid "Pull requests" msgstr "" @@ -1787,7 +1848,7 @@ #: rhodecode/templates/admin/permissions/permissions.html:11 #: rhodecode/templates/admin/repos/repo_edit.html:134 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58 -#: rhodecode/templates/admin/users/user_edit.html:139 +#: rhodecode/templates/admin/users/user_edit.html:143 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100 #: rhodecode/templates/settings/repo_settings.html:86 msgid "Permissions" @@ -1833,7 +1894,7 @@ msgstr "Criação de repositório" #: rhodecode/templates/admin/permissions/permissions.html:78 -#: rhodecode/templates/admin/repos/repo_edit.html:241 +#: rhodecode/templates/admin/repos/repo_edit.html:264 msgid "set" msgstr "ajustar" @@ -1853,8 +1914,8 @@ msgstr "adicionar novo" #: rhodecode/templates/admin/repos/repo_add_base.html:20 -#: rhodecode/templates/summary/summary.html:95 -#: rhodecode/templates/summary/summary.html:96 +#: rhodecode/templates/summary/summary.html:104 +#: rhodecode/templates/summary/summary.html:105 msgid "Clone from" msgstr "Clonar de" @@ -1936,12 +1997,14 @@ #: rhodecode/templates/admin/repos/repo_edit.html:13 #: rhodecode/templates/admin/users/user_edit.html:13 -#: rhodecode/templates/admin/users/user_edit.html:224 -#: rhodecode/templates/admin/users/user_edit.html:226 +#: rhodecode/templates/admin/users/user_edit.html:228 +#: rhodecode/templates/admin/users/user_edit.html:230 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13 -#: rhodecode/templates/files/files_source.html:44 -#: rhodecode/templates/journal/journal.html:81 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:207 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:209 +#: rhodecode/templates/files/files_source.html:29 +#: rhodecode/templates/journal/journal_page_repos.html:29 msgid "edit" msgstr "editar" @@ -1988,11 +2051,11 @@ #: rhodecode/templates/admin/repos/repo_edit.html:142 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75 #: rhodecode/templates/admin/settings/settings.html:113 -#: rhodecode/templates/admin/settings/settings.html:168 -#: rhodecode/templates/admin/settings/settings.html:258 -#: rhodecode/templates/admin/users/user_edit.html:130 -#: rhodecode/templates/admin/users/user_edit.html:175 -#: rhodecode/templates/admin/users/user_edit.html:278 +#: rhodecode/templates/admin/settings/settings.html:179 +#: rhodecode/templates/admin/settings/settings.html:269 +#: rhodecode/templates/admin/users/user_edit.html:134 +#: rhodecode/templates/admin/users/user_edit.html:179 +#: rhodecode/templates/admin/users/user_edit.html:282 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:80 #: rhodecode/templates/admin/users_groups/users_group_edit.html:136 #: rhodecode/templates/files/files_add.html:82 @@ -2050,22 +2113,49 @@ msgid "Confirm to invalidate repository cache" msgstr "Confirma invalidar cache do repositório" -#: rhodecode/templates/admin/repos/repo_edit.html:195 -#: rhodecode/templates/base/base.html:318 -#: rhodecode/templates/base/base.html:320 -#: rhodecode/templates/base/base.html:322 -msgid "Public journal" -msgstr "Diário público" +#: rhodecode/templates/admin/repos/repo_edit.html:193 +msgid "" +"Manually invalidate cache for this repository. On first access repository" +" will be cached again" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:198 +msgid "List of cached values" +msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:201 -msgid "Remove from public journal" -msgstr "Remover do diário público" +msgid "Prefix" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:202 +#, fuzzy +msgid "Key" +msgstr "Chave de API" #: rhodecode/templates/admin/repos/repo_edit.html:203 +#: rhodecode/templates/admin/users/user_add.html:86 +#: rhodecode/templates/admin/users/user_edit.html:117 +#: rhodecode/templates/admin/users_groups/users_group_add.html:41 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:42 +msgid "Active" +msgstr "Ativo" + +#: rhodecode/templates/admin/repos/repo_edit.html:218 +#: rhodecode/templates/base/base.html:330 +#: rhodecode/templates/base/base.html:332 +#: rhodecode/templates/base/base.html:334 +msgid "Public journal" +msgstr "Diário público" + +#: rhodecode/templates/admin/repos/repo_edit.html:224 +msgid "Remove from public journal" +msgstr "Remover do diário público" + +#: rhodecode/templates/admin/repos/repo_edit.html:226 msgid "Add to public journal" msgstr "Adicionar ao diário público" -#: rhodecode/templates/admin/repos/repo_edit.html:208 +#: rhodecode/templates/admin/repos/repo_edit.html:231 msgid "" "All actions made on this repository will be accessible to everyone in " "public journal" @@ -2073,63 +2163,62 @@ "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:215 +#: rhodecode/templates/admin/repos/repo_edit.html:238 #, fuzzy msgid "Locking" msgstr "destravar" -#: rhodecode/templates/admin/repos/repo_edit.html:220 +#: rhodecode/templates/admin/repos/repo_edit.html:243 msgid "Unlock locked repo" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:220 +#: rhodecode/templates/admin/repos/repo_edit.html:243 #, fuzzy msgid "Confirm to unlock repository" msgstr "Confirma excluir este repositório" -#: rhodecode/templates/admin/repos/repo_edit.html:223 +#: rhodecode/templates/admin/repos/repo_edit.html:246 msgid "lock repo" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:223 +#: rhodecode/templates/admin/repos/repo_edit.html:246 #, fuzzy msgid "Confirm to lock repository" msgstr "Confirma excluir este repositório" -#: rhodecode/templates/admin/repos/repo_edit.html:224 +#: rhodecode/templates/admin/repos/repo_edit.html:247 #, fuzzy msgid "Repository is not locked" msgstr "repositórios" -#: rhodecode/templates/admin/repos/repo_edit.html:229 +#: rhodecode/templates/admin/repos/repo_edit.html:252 msgid "Force locking on repository. Works only when anonymous access is disabled" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:236 +#: rhodecode/templates/admin/repos/repo_edit.html:259 #, fuzzy msgid "Set as fork of" msgstr "Marcar como bifurcação" -#: rhodecode/templates/admin/repos/repo_edit.html:245 +#: rhodecode/templates/admin/repos/repo_edit.html:268 #, 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:251 +#: rhodecode/templates/admin/repos/repo_edit.html:274 #: rhodecode/templates/changeset/changeset_file_comment.html:26 msgid "Delete" msgstr "Excluir" -#: rhodecode/templates/admin/repos/repo_edit.html:255 +#: rhodecode/templates/admin/repos/repo_edit.html:278 msgid "Remove this repository" msgstr "Remover deste repositório" -#: rhodecode/templates/admin/repos/repo_edit.html:255 -#: rhodecode/templates/journal/journal.html:84 +#: rhodecode/templates/admin/repos/repo_edit.html:278 msgid "Confirm to delete this repository" msgstr "Confirma excluir este repositório" -#: rhodecode/templates/admin/repos/repo_edit.html:259 +#: rhodecode/templates/admin/repos/repo_edit.html:282 msgid "" "This repository will be renamed in a special way in order to be " "unaccesible for RhodeCode and VCS systems.\n" @@ -2159,7 +2248,7 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:6 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6 #: rhodecode/templates/admin/users/users.html:85 -#: rhodecode/templates/base/base.html:217 +#: rhodecode/templates/base/base.html:229 msgid "admin" msgstr "administrador" @@ -2170,8 +2259,8 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:16 #: rhodecode/templates/data_table/_dt_elements.html:67 -#: rhodecode/templates/journal/journal.html:132 -#: rhodecode/templates/summary/summary.html:76 +#: rhodecode/templates/journal/journal.html:87 +#: rhodecode/templates/summary/summary.html:85 msgid "private repository" msgstr "repositório privado" @@ -2195,12 +2284,12 @@ msgstr "Adicionar outro membro" #: rhodecode/templates/admin/repos/repo_edit_perms.html:97 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 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:96 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:103 msgid "Failed to remove users group" msgstr "Falha ao remover grupo de usuários" @@ -2208,11 +2297,44 @@ msgid "Repositories administration" msgstr "Administração de repositórios" -#: rhodecode/templates/admin/repos_groups/repos_groups.html:8 -msgid "Groups" -msgstr "Grupos" - -#: rhodecode/templates/admin/repos_groups/repos_groups.html:12 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:73 +msgid "apply to children" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:74 +msgid "" +"Set or revoke permission to all children of that group, including " +"repositories and other groups" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_groups.html:9 +#: rhodecode/templates/base/base.html:122 +#: rhodecode/templates/base/base.html:312 +#: rhodecode/templates/base/base.html:314 +#: rhodecode/templates/base/base.html:316 +#: rhodecode/templates/bookmarks/bookmarks.html:11 +#: rhodecode/templates/branches/branches.html:10 +#: rhodecode/templates/changelog/changelog.html:10 +#: rhodecode/templates/changeset/changeset.html:10 +#: rhodecode/templates/changeset/changeset_range.html:9 +#: rhodecode/templates/compare/compare_diff.html:9 +#: rhodecode/templates/files/file_diff.html:8 +#: rhodecode/templates/files/files.html:8 +#: rhodecode/templates/files/files_add.html:15 +#: rhodecode/templates/files/files_edit.html:15 +#: rhodecode/templates/followers/followers.html:9 +#: rhodecode/templates/forks/fork.html:9 rhodecode/templates/forks/forks.html:9 +#: rhodecode/templates/pullrequests/pullrequest.html:8 +#: rhodecode/templates/pullrequests/pullrequest_show.html:8 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 +#: rhodecode/templates/settings/repo_settings.html:9 +#: rhodecode/templates/shortlog/shortlog.html:10 +#: rhodecode/templates/summary/summary.html:8 +#: rhodecode/templates/tags/tags.html:11 +msgid "Home" +msgstr "Início" + +#: rhodecode/templates/admin/repos_groups/repos_groups.html:13 msgid "with" msgstr "com" @@ -2238,7 +2360,7 @@ #: rhodecode/templates/admin/users/user_add.html:94 #: rhodecode/templates/admin/users_groups/users_group_add.html:49 #: rhodecode/templates/admin/users_groups/users_group_edit.html:90 -#: rhodecode/templates/pullrequests/pullrequest_show.html:113 +#: rhodecode/templates/pullrequests/pullrequest_show.html:131 msgid "save" msgstr "salvar" @@ -2274,20 +2396,22 @@ msgid "action" msgstr "ação" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 -#: rhodecode/templates/admin/users/user_edit.html:255 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55 +#: rhodecode/templates/admin/users/user_edit.html:259 #: rhodecode/templates/admin/users_groups/users_groups.html:44 #: rhodecode/templates/data_table/_dt_elements.html:7 -#: rhodecode/templates/data_table/_dt_elements.html:103 +#: rhodecode/templates/data_table/_dt_elements.html:121 msgid "delete" msgstr "excluir" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 -#, python-format -msgid "Confirm to delete this group: %s" -msgstr "Confirme para excluir esse grupo: %s" - -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:62 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55 +#, fuzzy, python-format +msgid "Confirm to delete this group: %s with %s repository" +msgid_plural "Confirm to delete this group: %s with %s repositories" +msgstr[0] "Confirma excluir este repositório" +msgstr[1] "" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:63 msgid "There are no repositories groups yet" msgstr "Ainda não há grupos de repositórios" @@ -2383,8 +2507,8 @@ msgstr "Código GA" #: rhodecode/templates/admin/settings/settings.html:112 -#: rhodecode/templates/admin/settings/settings.html:167 -#: rhodecode/templates/admin/settings/settings.html:257 +#: rhodecode/templates/admin/settings/settings.html:178 +#: rhodecode/templates/admin/settings/settings.html:268 msgid "Save settings" msgstr "Salvar configurações" @@ -2393,97 +2517,106 @@ msgid "Visualisation settings" msgstr "Configurações globais da aplicação" -#: rhodecode/templates/admin/settings/settings.html:128 +#: rhodecode/templates/admin/settings/settings.html:127 +#, fuzzy +msgid "General" +msgstr "habilitar" + +#: rhodecode/templates/admin/settings/settings.html:132 +msgid "Use lightweight dashboard" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:139 #, fuzzy msgid "Icons" msgstr "Opções" -#: rhodecode/templates/admin/settings/settings.html:133 +#: rhodecode/templates/admin/settings/settings.html:144 msgid "Show public repo icon on repositories" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:137 +#: rhodecode/templates/admin/settings/settings.html:148 #, fuzzy msgid "Show private repo icon on repositories" msgstr "repositório privado" -#: rhodecode/templates/admin/settings/settings.html:144 +#: rhodecode/templates/admin/settings/settings.html:155 #, fuzzy msgid "Meta-Tagging" msgstr "configurações" -#: rhodecode/templates/admin/settings/settings.html:149 +#: rhodecode/templates/admin/settings/settings.html:160 msgid "Stylify recognised metatags:" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:176 +#: rhodecode/templates/admin/settings/settings.html:187 #, fuzzy msgid "VCS settings" msgstr "configurações" -#: rhodecode/templates/admin/settings/settings.html:185 +#: rhodecode/templates/admin/settings/settings.html:196 msgid "Web" msgstr "Web" -#: rhodecode/templates/admin/settings/settings.html:190 +#: rhodecode/templates/admin/settings/settings.html:201 #, fuzzy msgid "require ssl for vcs operations" msgstr "exigir ssl para realizar push" -#: rhodecode/templates/admin/settings/settings.html:192 +#: rhodecode/templates/admin/settings/settings.html:203 msgid "" "RhodeCode will require SSL for pushing or pulling. If SSL is missing it " "will return HTTP Error 406: Not Acceptable" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:198 +#: rhodecode/templates/admin/settings/settings.html:209 msgid "Hooks" msgstr "Ganchos" -#: rhodecode/templates/admin/settings/settings.html:203 +#: rhodecode/templates/admin/settings/settings.html:214 msgid "Update repository after push (hg update)" msgstr "Atualizar repositório após realizar push (hg update)" -#: rhodecode/templates/admin/settings/settings.html:207 +#: rhodecode/templates/admin/settings/settings.html:218 msgid "Show repository size after push" msgstr "Mostrar tamanho do repositório após o push" -#: rhodecode/templates/admin/settings/settings.html:211 +#: rhodecode/templates/admin/settings/settings.html:222 msgid "Log user push commands" msgstr "Armazenar registro de comandos de push dos usuários" -#: rhodecode/templates/admin/settings/settings.html:215 +#: rhodecode/templates/admin/settings/settings.html:226 msgid "Log user pull commands" msgstr "Armazenar registro de comandos de pull dos usuários" -#: rhodecode/templates/admin/settings/settings.html:219 +#: rhodecode/templates/admin/settings/settings.html:230 msgid "advanced setup" msgstr "confirguações avançadas" -#: rhodecode/templates/admin/settings/settings.html:224 +#: rhodecode/templates/admin/settings/settings.html:235 #, fuzzy msgid "Mercurial Extensions" msgstr "Repositório Mercurial" -#: rhodecode/templates/admin/settings/settings.html:229 +#: rhodecode/templates/admin/settings/settings.html:240 msgid "largefiles extensions" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:233 +#: rhodecode/templates/admin/settings/settings.html:244 msgid "hgsubversion extensions" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:235 +#: rhodecode/templates/admin/settings/settings.html:246 msgid "" "Requires hgsubversion library installed. Allows clonning from svn remote " "locations" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:245 +#: rhodecode/templates/admin/settings/settings.html:256 msgid "Repositories location" msgstr "Localização dos repositórios" -#: rhodecode/templates/admin/settings/settings.html:250 +#: rhodecode/templates/admin/settings/settings.html:261 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 " @@ -2493,33 +2626,34 @@ "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:251 +#: rhodecode/templates/admin/settings/settings.html:262 +#: rhodecode/templates/base/base.html:221 msgid "unlock" msgstr "destravar" -#: rhodecode/templates/admin/settings/settings.html:252 +#: rhodecode/templates/admin/settings/settings.html:263 msgid "" "Location where repositories are stored. After changing this value a " "restart, and rescan is required" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:272 +#: rhodecode/templates/admin/settings/settings.html:283 msgid "Test Email" msgstr "Testar E-mail" -#: rhodecode/templates/admin/settings/settings.html:280 +#: rhodecode/templates/admin/settings/settings.html:291 msgid "Email to" msgstr "E-mail para" -#: rhodecode/templates/admin/settings/settings.html:288 +#: rhodecode/templates/admin/settings/settings.html:299 msgid "Send" msgstr "Enviar" -#: rhodecode/templates/admin/settings/settings.html:294 +#: rhodecode/templates/admin/settings/settings.html:305 msgid "System Info and Packages" msgstr "Informações de Sistema e Pacotes" -#: rhodecode/templates/admin/settings/settings.html:297 +#: rhodecode/templates/admin/settings/settings.html:308 msgid "show" msgstr "mostrar" @@ -2540,13 +2674,6 @@ msgid "Password confirmation" msgstr "Confirmação de senha" -#: rhodecode/templates/admin/users/user_add.html:86 -#: rhodecode/templates/admin/users/user_edit.html:113 -#: rhodecode/templates/admin/users_groups/users_group_add.html:41 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:42 -msgid "Active" -msgstr "Ativo" - #: rhodecode/templates/admin/users/user_edit.html:5 msgid "Edit user" msgstr "Editar usuário" @@ -2566,27 +2693,27 @@ msgid "API key" msgstr "Chave de API" -#: rhodecode/templates/admin/users/user_edit.html:59 +#: rhodecode/templates/admin/users/user_edit.html:63 msgid "LDAP DN" msgstr "DN LDAP" -#: rhodecode/templates/admin/users/user_edit.html:68 +#: rhodecode/templates/admin/users/user_edit.html:72 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:35 msgid "New password" msgstr "Nova senha" -#: rhodecode/templates/admin/users/user_edit.html:77 +#: rhodecode/templates/admin/users/user_edit.html:81 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:44 msgid "New password confirmation" msgstr "Confirmação de nova senha" -#: rhodecode/templates/admin/users/user_edit.html:147 +#: rhodecode/templates/admin/users/user_edit.html:151 #: 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:152 +#: rhodecode/templates/admin/users/user_edit.html:156 #: rhodecode/templates/admin/users_groups/users_group_edit.html:113 #, python-format msgid "" @@ -2594,51 +2721,53 @@ "options does not have any action" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:158 +#: rhodecode/templates/admin/users/user_edit.html:162 #: rhodecode/templates/admin/users_groups/users_group_edit.html:119 msgid "Create repositories" msgstr "Criar repositórios" -#: rhodecode/templates/admin/users/user_edit.html:166 +#: rhodecode/templates/admin/users/user_edit.html:170 #: rhodecode/templates/admin/users_groups/users_group_edit.html:127 #, fuzzy msgid "Fork repositories" msgstr "repositórios" -#: rhodecode/templates/admin/users/user_edit.html:186 +#: rhodecode/templates/admin/users/user_edit.html:190 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39 #, fuzzy msgid "Nothing here yet" msgstr "Ainda não há notificações aqui" -#: rhodecode/templates/admin/users/user_edit.html:193 +#: rhodecode/templates/admin/users/user_edit.html:197 #: rhodecode/templates/admin/users/user_edit_my_account.html:60 -#: rhodecode/templates/admin/users/user_edit_my_account.html:194 +#: rhodecode/templates/admin/users/user_edit_my_account.html:217 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:185 msgid "Permission" msgstr "Permissão" -#: rhodecode/templates/admin/users/user_edit.html:194 +#: rhodecode/templates/admin/users/user_edit.html:198 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:186 #, fuzzy msgid "Edit Permission" msgstr "Permissão de repositório" -#: rhodecode/templates/admin/users/user_edit.html:243 +#: rhodecode/templates/admin/users/user_edit.html:247 #, fuzzy msgid "Email addresses" msgstr "Endereço de e-mail" -#: rhodecode/templates/admin/users/user_edit.html:256 +#: rhodecode/templates/admin/users/user_edit.html:260 #, fuzzy, python-format msgid "Confirm to delete this email: %s" msgstr "Confirma excluir este usuário: %s" -#: rhodecode/templates/admin/users/user_edit.html:270 +#: rhodecode/templates/admin/users/user_edit.html:274 #, fuzzy msgid "New email address" msgstr "Endereço de e-mail" -#: rhodecode/templates/admin/users/user_edit.html:277 +#: rhodecode/templates/admin/users/user_edit.html:281 #, fuzzy msgid "Add" msgstr "adicionar" @@ -2698,31 +2827,33 @@ #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:7 #: rhodecode/templates/bookmarks/bookmarks.html:40 #: rhodecode/templates/bookmarks/bookmarks_data.html:9 -#: rhodecode/templates/branches/branches.html:55 -#: rhodecode/templates/journal/journal.html:60 -#: rhodecode/templates/tags/tags.html:40 +#: rhodecode/templates/branches/branches.html:54 +#: rhodecode/templates/branches/branches_data.html:9 +#: rhodecode/templates/journal/journal_page_repos.html:8 +#: rhodecode/templates/tags/tags.html:55 #: rhodecode/templates/tags/tags_data.html:9 msgid "Revision" msgstr "Revisão" #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28 -#: rhodecode/templates/journal/journal.html:81 +#: rhodecode/templates/journal/journal_page_repos.html:29 msgid "private" msgstr "privado" #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:31 #: rhodecode/templates/data_table/_dt_elements.html:7 +#: rhodecode/templates/journal/journal_page_repos.html:32 #, python-format msgid "Confirm to delete this repository: %s" msgstr "Confirma excluir esse repositório: %s" #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:38 -#: rhodecode/templates/journal/journal.html:94 +#: rhodecode/templates/journal/journal_page_repos.html:42 msgid "No repositories yet" msgstr "Ainda não há repositórios" #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:40 -#: rhodecode/templates/journal/journal.html:96 +#: rhodecode/templates/journal/journal_page_repos.html:44 msgid "create one now" msgstr "criar um agora" @@ -2731,7 +2862,7 @@ msgstr "Administração de usuários" #: rhodecode/templates/admin/users/users.html:9 -#: rhodecode/templates/base/base.html:223 +#: rhodecode/templates/base/base.html:235 msgid "users" msgstr "usuários" @@ -2762,7 +2893,7 @@ msgstr "ativo" #: rhodecode/templates/admin/users/users.html:86 -#: rhodecode/templates/base/base.html:226 +#: rhodecode/templates/base/base.html:238 msgid "ldap" msgstr "ldap" @@ -2811,6 +2942,21 @@ msgid "Group members" msgstr "Membros do grupo" +#: rhodecode/templates/admin/users_groups/users_group_edit.html:163 +#, fuzzy +msgid "No members yet" +msgstr "membros" + +#: rhodecode/templates/admin/users_groups/users_group_edit.html:171 +#, fuzzy +msgid "Permissions defined for this group" +msgstr "Administração de permissões" + +#: rhodecode/templates/admin/users_groups/users_group_edit.html:178 +#, fuzzy +msgid "No permissions set yet" +msgstr "Copiar permissões" + #: rhodecode/templates/admin/users_groups/users_groups.html:5 msgid "Users groups administration" msgstr "Administração de grupos de usuários" @@ -2853,36 +2999,10 @@ msgid "Inbox" msgstr "Caixa de Entrada" -#: rhodecode/templates/base/base.html:122 -#: rhodecode/templates/base/base.html:300 -#: rhodecode/templates/base/base.html:302 -#: rhodecode/templates/base/base.html:304 -#: rhodecode/templates/bookmarks/bookmarks.html:11 -#: rhodecode/templates/branches/branches.html:10 -#: rhodecode/templates/changelog/changelog.html:10 -#: rhodecode/templates/changeset/changeset.html:10 -#: rhodecode/templates/changeset/changeset_range.html:9 -#: rhodecode/templates/compare/compare_diff.html:9 -#: rhodecode/templates/files/file_diff.html:8 -#: rhodecode/templates/files/files.html:8 -#: rhodecode/templates/files/files_add.html:15 -#: rhodecode/templates/files/files_edit.html:15 -#: rhodecode/templates/followers/followers.html:9 -#: rhodecode/templates/forks/fork.html:9 rhodecode/templates/forks/forks.html:9 -#: rhodecode/templates/pullrequests/pullrequest.html:8 -#: rhodecode/templates/pullrequests/pullrequest_show.html:8 -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 -#: rhodecode/templates/settings/repo_settings.html:9 -#: rhodecode/templates/shortlog/shortlog.html:10 -#: rhodecode/templates/summary/summary.html:8 -#: rhodecode/templates/tags/tags.html:11 -msgid "Home" -msgstr "Início" - #: rhodecode/templates/base/base.html:123 -#: rhodecode/templates/base/base.html:309 -#: rhodecode/templates/base/base.html:311 -#: rhodecode/templates/base/base.html:313 +#: rhodecode/templates/base/base.html:321 +#: rhodecode/templates/base/base.html:323 +#: rhodecode/templates/base/base.html:325 #: rhodecode/templates/journal/journal.html:4 #: rhodecode/templates/journal/journal.html:21 #: rhodecode/templates/journal/public_journal.html:4 @@ -2902,7 +3022,7 @@ msgstr "Produtos" #: rhodecode/templates/base/base.html:152 -#: rhodecode/templates/base/base.html:182 +#: rhodecode/templates/base/base.html:182 rhodecode/templates/base/root.html:47 msgid "loading..." msgstr "carregando..." @@ -2947,50 +3067,65 @@ #: rhodecode/templates/base/base.html:204 #: rhodecode/templates/base/base.html:206 -#: rhodecode/templates/base/base.html:227 -msgid "settings" -msgstr "configurações" - -#: rhodecode/templates/base/base.html:209 +#, fuzzy +msgid "repository settings" +msgstr "Criação de repositório" + +#: rhodecode/templates/base/base.html:210 #: rhodecode/templates/data_table/_dt_elements.html:80 #: rhodecode/templates/forks/fork.html:13 msgid "fork" msgstr "bifurcação" -#: rhodecode/templates/base/base.html:211 -#: rhodecode/templates/changelog/changelog.html:40 +#: rhodecode/templates/base/base.html:212 rhodecode/templates/base/root.html:50 +#: rhodecode/templates/changelog/changelog.html:43 msgid "Open new pull request" msgstr "" -#: rhodecode/templates/base/base.html:213 +#: rhodecode/templates/base/base.html:215 +#: rhodecode/templates/forks/forks_data.html:21 +#, fuzzy +msgid "Compare fork" +msgstr "comparar exibir" + +#: rhodecode/templates/base/base.html:217 msgid "search" msgstr "pesquisar" -#: rhodecode/templates/base/base.html:222 +#: rhodecode/templates/base/base.html:223 +#, fuzzy +msgid "lock" +msgstr "destravar" + +#: rhodecode/templates/base/base.html:234 msgid "repositories groups" msgstr "grupos de repositórios" -#: rhodecode/templates/base/base.html:224 +#: rhodecode/templates/base/base.html:236 msgid "users groups" msgstr "grupos de usuários" -#: rhodecode/templates/base/base.html:225 +#: rhodecode/templates/base/base.html:237 msgid "permissions" msgstr "permissões" -#: rhodecode/templates/base/base.html:238 -#: rhodecode/templates/base/base.html:240 +#: rhodecode/templates/base/base.html:239 +msgid "settings" +msgstr "configurações" + +#: rhodecode/templates/base/base.html:250 +#: rhodecode/templates/base/base.html:252 msgid "Followers" msgstr "Seguidores" -#: rhodecode/templates/base/base.html:246 -#: rhodecode/templates/base/base.html:248 +#: rhodecode/templates/base/base.html:258 +#: rhodecode/templates/base/base.html:260 msgid "Forks" msgstr "Bifurcações" -#: rhodecode/templates/base/base.html:327 -#: rhodecode/templates/base/base.html:329 -#: rhodecode/templates/base/base.html:331 +#: rhodecode/templates/base/base.html:339 +#: rhodecode/templates/base/base.html:341 +#: rhodecode/templates/base/base.html:343 #: rhodecode/templates/search/search.html:52 msgid "Search" msgstr "Pesquisar" @@ -3000,7 +3135,7 @@ msgstr "adicionar outro comentário" #: rhodecode/templates/base/root.html:43 -#: rhodecode/templates/journal/journal.html:120 +#: rhodecode/templates/journal/journal.html:75 #: rhodecode/templates/summary/summary.html:57 msgid "Stop following this repository" msgstr "Parar de seguir este repositório" @@ -3014,14 +3149,26 @@ msgid "Group" msgstr "Grupo" -#: rhodecode/templates/base/root.html:47 +#: rhodecode/templates/base/root.html:48 msgid "search truncated" msgstr "pesquisa truncada" -#: rhodecode/templates/base/root.html:48 +#: rhodecode/templates/base/root.html:49 msgid "no matching files" msgstr "nenhum arquivo corresponde" +#: rhodecode/templates/base/root.html:51 +msgid "Open new pull request for selected changesets" +msgstr "" + +#: rhodecode/templates/base/root.html:52 +msgid "Show selected changes __S -> __E" +msgstr "Mostrar alterações selecionadas __S -> __E" + +#: rhodecode/templates/base/root.html:53 +msgid "Selection link" +msgstr "Link da seleção" + #: rhodecode/templates/bookmarks/bookmarks.html:5 #, fuzzy, python-format msgid "%s Bookmarks" @@ -3029,8 +3176,9 @@ #: rhodecode/templates/bookmarks/bookmarks.html:39 #: rhodecode/templates/bookmarks/bookmarks_data.html:8 -#: rhodecode/templates/branches/branches.html:54 -#: rhodecode/templates/tags/tags.html:39 +#: rhodecode/templates/branches/branches.html:53 +#: rhodecode/templates/branches/branches_data.html:8 +#: rhodecode/templates/tags/tags.html:54 #: rhodecode/templates/tags/tags_data.html:8 msgid "Author" msgstr "Autor" @@ -3045,36 +3193,16 @@ msgid "Compare branches" msgstr "ramos" -#: rhodecode/templates/branches/branches.html:57 +#: rhodecode/templates/branches/branches.html:56 +#: rhodecode/templates/branches/branches_data.html:10 #: rhodecode/templates/compare/compare_diff.html:5 #: rhodecode/templates/compare/compare_diff.html:13 +#: rhodecode/templates/tags/tags.html:57 +#: rhodecode/templates/tags/tags_data.html:10 #, fuzzy msgid "Compare" msgstr "comparar exibir" -#: rhodecode/templates/branches/branches_data.html:6 -msgid "name" -msgstr "nome" - -#: rhodecode/templates/branches/branches_data.html:7 -msgid "date" -msgstr "data" - -#: rhodecode/templates/branches/branches_data.html:8 -#: rhodecode/templates/shortlog/shortlog_data.html:8 -msgid "author" -msgstr "autor" - -#: rhodecode/templates/branches/branches_data.html:9 -#: rhodecode/templates/shortlog/shortlog_data.html:5 -msgid "revision" -msgstr "revisão" - -#: rhodecode/templates/branches/branches_data.html:10 -#, fuzzy -msgid "compare" -msgstr "comparar exibir" - #: rhodecode/templates/changelog/changelog.html:6 #, fuzzy, python-format msgid "%s Changelog" @@ -3088,59 +3216,66 @@ msgstr[1] "mostrando %d de %d revisões" #: rhodecode/templates/changelog/changelog.html:37 +#, fuzzy +msgid "Clear selection" +msgstr "Configurações de busca" + +#: rhodecode/templates/changelog/changelog.html:40 #: rhodecode/templates/forks/forks_data.html:19 #, python-format msgid "compare fork with %s" msgstr "" -#: rhodecode/templates/changelog/changelog.html:37 -#: rhodecode/templates/forks/forks_data.html:21 +#: rhodecode/templates/changelog/changelog.html:40 #, fuzzy -msgid "Compare fork" +msgid "Compare fork with parent" msgstr "comparar exibir" -#: rhodecode/templates/changelog/changelog.html:46 +#: rhodecode/templates/changelog/changelog.html:49 msgid "Show" msgstr "Mostrar" -#: rhodecode/templates/changelog/changelog.html:72 -#: rhodecode/templates/summary/summary.html:364 +#: rhodecode/templates/changelog/changelog.html:74 +#: rhodecode/templates/summary/summary.html:375 msgid "show more" msgstr "mostrar mais" -#: rhodecode/templates/changelog/changelog.html:76 +#: rhodecode/templates/changelog/changelog.html:78 msgid "Affected number of files, click to show more details" msgstr "Número de arquivos afetados, clique para mostrar mais detalhes" -#: rhodecode/templates/changelog/changelog.html:89 -#: rhodecode/templates/changeset/changeset.html:38 +#: rhodecode/templates/changelog/changelog.html:91 +#: rhodecode/templates/changeset/changeset.html:44 #: rhodecode/templates/changeset/changeset_file_comment.html:20 #: rhodecode/templates/changeset/changeset_range.html:46 #, fuzzy msgid "Changeset status" msgstr "Conjuntos de mudanças" -#: rhodecode/templates/changelog/changelog.html:92 +#: rhodecode/templates/changelog/changelog.html:94 +#: rhodecode/templates/shortlog/shortlog_data.html:20 msgid "Click to open associated pull request" msgstr "" -#: rhodecode/templates/changelog/changelog.html:102 -#: rhodecode/templates/changeset/changeset.html:78 +#: rhodecode/templates/changelog/changelog.html:104 +#: rhodecode/templates/changeset/changeset.html:85 msgid "Parent" msgstr "Progenitor" -#: rhodecode/templates/changelog/changelog.html:108 -#: rhodecode/templates/changeset/changeset.html:84 +#: rhodecode/templates/changelog/changelog.html:110 +#: rhodecode/templates/changeset/changeset.html:91 msgid "No parents" msgstr "Sem progenitores" -#: rhodecode/templates/changelog/changelog.html:113 -#: rhodecode/templates/changeset/changeset.html:88 +#: rhodecode/templates/changelog/changelog.html:115 +#: rhodecode/templates/changeset/changeset.html:95 +#: rhodecode/templates/changeset/changeset_range.html:79 msgid "merge" msgstr "mesclar" -#: rhodecode/templates/changelog/changelog.html:116 -#: rhodecode/templates/changeset/changeset.html:91 +#: rhodecode/templates/changelog/changelog.html:118 +#: rhodecode/templates/changeset/changeset.html:98 +#: rhodecode/templates/changeset/changeset_range.html:82 #: rhodecode/templates/files/files.html:29 #: rhodecode/templates/files/files_add.html:33 #: rhodecode/templates/files/files_edit.html:33 @@ -3148,44 +3283,42 @@ msgid "branch" msgstr "ramo" -#: rhodecode/templates/changelog/changelog.html:122 +#: rhodecode/templates/changelog/changelog.html:124 +#: rhodecode/templates/changeset/changeset_range.html:88 msgid "bookmark" msgstr "marcador" -#: rhodecode/templates/changelog/changelog.html:128 -#: rhodecode/templates/changeset/changeset.html:96 +#: rhodecode/templates/changelog/changelog.html:130 +#: rhodecode/templates/changeset/changeset.html:103 +#: rhodecode/templates/changeset/changeset_range.html:94 msgid "tag" msgstr "etiqueta" -#: rhodecode/templates/changelog/changelog.html:164 -msgid "Show selected changes __S -> __E" -msgstr "Mostrar alterações selecionadas __S -> __E" - -#: rhodecode/templates/changelog/changelog.html:255 +#: rhodecode/templates/changelog/changelog.html:301 msgid "There are no changes yet" msgstr "Ainda não há alteações" #: rhodecode/templates/changelog/changelog_details.html:4 -#: rhodecode/templates/changeset/changeset.html:66 +#: rhodecode/templates/changeset/changeset.html:73 msgid "removed" msgstr "removidos" #: rhodecode/templates/changelog/changelog_details.html:5 -#: rhodecode/templates/changeset/changeset.html:67 +#: rhodecode/templates/changeset/changeset.html:74 msgid "changed" msgstr "alterados" #: rhodecode/templates/changelog/changelog_details.html:6 -#: rhodecode/templates/changeset/changeset.html:68 +#: rhodecode/templates/changeset/changeset.html:75 msgid "added" msgstr "adicionados" #: rhodecode/templates/changelog/changelog_details.html:8 #: rhodecode/templates/changelog/changelog_details.html:9 #: rhodecode/templates/changelog/changelog_details.html:10 -#: rhodecode/templates/changeset/changeset.html:70 -#: rhodecode/templates/changeset/changeset.html:71 -#: rhodecode/templates/changeset/changeset.html:72 +#: rhodecode/templates/changeset/changeset.html:77 +#: rhodecode/templates/changeset/changeset.html:78 +#: rhodecode/templates/changeset/changeset.html:79 #, python-format msgid "affected %s files" msgstr "%s arquivos afetados" @@ -3199,17 +3332,22 @@ msgid "Changeset" msgstr "Conjunto de Mudanças" -#: rhodecode/templates/changeset/changeset.html:43 +#: rhodecode/templates/changeset/changeset.html:49 #: rhodecode/templates/changeset/diff_block.html:20 msgid "raw diff" msgstr "diff bruto" -#: rhodecode/templates/changeset/changeset.html:44 +#: rhodecode/templates/changeset/changeset.html:50 +#, fuzzy +msgid "patch diff" +msgstr "diff bruto" + +#: rhodecode/templates/changeset/changeset.html:51 #: rhodecode/templates/changeset/diff_block.html:21 msgid "download diff" msgstr "descarregar diff" -#: rhodecode/templates/changeset/changeset.html:48 +#: rhodecode/templates/changeset/changeset.html:55 #: rhodecode/templates/changeset/changeset_file_comment.html:82 #, python-format msgid "%d comment" @@ -3217,7 +3355,7 @@ msgstr[0] "%d comentário" msgstr[1] "%d comentários" -#: rhodecode/templates/changeset/changeset.html:48 +#: rhodecode/templates/changeset/changeset.html:55 #: rhodecode/templates/changeset/changeset_file_comment.html:82 #, python-format msgid "(%d inline)" @@ -3225,14 +3363,23 @@ msgstr[0] "(%d em linha)" msgstr[1] "(%d em linha)" -#: rhodecode/templates/changeset/changeset.html:103 -#, python-format -msgid "%s files affected with %s insertions and %s deletions:" -msgstr "%s arquivos afetados com %s inserções e %s exclusões" - -#: rhodecode/templates/changeset/changeset.html:119 -msgid "Changeset was too big and was cut off..." -msgstr "Conjunto de mudanças era grande demais e foi cortado..." +#: rhodecode/templates/changeset/changeset.html:111 +#: rhodecode/templates/compare/compare_diff.html:44 +#: rhodecode/templates/pullrequests/pullrequest_show.html:76 +#, fuzzy, python-format +msgid "%s file changed" +msgid_plural "%s files changed" +msgstr[0] "arquivo alterado" +msgstr[1] "" + +#: rhodecode/templates/changeset/changeset.html:113 +#: rhodecode/templates/compare/compare_diff.html:46 +#: rhodecode/templates/pullrequests/pullrequest_show.html:78 +#, fuzzy, python-format +msgid "%s file changed with %s insertions and %s deletions" +msgid_plural "%s files changed with %s insertions and %s deletions" +msgstr[0] "%s arquivos afetados com %s inserções e %s exclusões" +msgstr[1] "" #: rhodecode/templates/changeset/changeset_file_comment.html:42 msgid "Submitting..." @@ -3300,15 +3447,18 @@ msgid "Compare View" msgstr "Exibir Comparação" +#: rhodecode/templates/changeset/changeset_range.html:29 +#, fuzzy +msgid "Show combined compare" +msgstr "mostrar comentários em linha" + #: rhodecode/templates/changeset/changeset_range.html:54 -#: rhodecode/templates/compare/compare_diff.html:41 -#: rhodecode/templates/pullrequests/pullrequest_show.html:69 msgid "Files affected" msgstr "Arquivos afetados" #: rhodecode/templates/changeset/diff_block.html:19 -msgid "diff" -msgstr "diff" +msgid "show full diff for this file" +msgstr "" #: rhodecode/templates/changeset/diff_block.html:27 msgid "show inline comments" @@ -3320,9 +3470,18 @@ msgstr "Nenhum conjunto de alterações ainda." #: rhodecode/templates/compare/compare_diff.html:37 +#: rhodecode/templates/pullrequests/pullrequest_show.html:69 +#, fuzzy, python-format +msgid "Showing %s commit" +msgid_plural "Showing %s commits" +msgstr[0] "mostrar comentários em linha" +msgstr[1] "" + +#: rhodecode/templates/compare/compare_diff.html:52 +#: rhodecode/templates/pullrequests/pullrequest_show.html:84 #, fuzzy -msgid "Outgoing changesets" -msgstr "Nenhum conjunto de alterações ainda." +msgid "No files" +msgstr "arquivos" #: rhodecode/templates/data_table/_dt_elements.html:39 #: rhodecode/templates/data_table/_dt_elements.html:41 @@ -3331,40 +3490,53 @@ msgstr "Bifurcação" #: rhodecode/templates/data_table/_dt_elements.html:60 -#: rhodecode/templates/journal/journal.html:126 -#: rhodecode/templates/summary/summary.html:68 +#: rhodecode/templates/journal/journal.html:81 +#: rhodecode/templates/summary/summary.html:77 msgid "Mercurial repository" msgstr "Repositório Mercurial" #: rhodecode/templates/data_table/_dt_elements.html:62 -#: rhodecode/templates/journal/journal.html:128 -#: rhodecode/templates/summary/summary.html:71 +#: rhodecode/templates/journal/journal.html:83 +#: rhodecode/templates/summary/summary.html:80 msgid "Git repository" msgstr "Repositório Git" #: rhodecode/templates/data_table/_dt_elements.html:69 -#: rhodecode/templates/journal/journal.html:134 -#: rhodecode/templates/summary/summary.html:78 +#: rhodecode/templates/journal/journal.html:89 +#: rhodecode/templates/summary/summary.html:87 msgid "public repository" msgstr "repositório público" #: rhodecode/templates/data_table/_dt_elements.html:80 -#: rhodecode/templates/summary/summary.html:87 -#: rhodecode/templates/summary/summary.html:88 +#: rhodecode/templates/summary/summary.html:96 +#: rhodecode/templates/summary/summary.html:97 msgid "Fork of" msgstr "Bifurcação de" -#: rhodecode/templates/data_table/_dt_elements.html:92 +#: rhodecode/templates/data_table/_dt_elements.html:94 msgid "No changesets yet" msgstr "Nenhum conjunto de alterações ainda." -#: rhodecode/templates/data_table/_dt_elements.html:104 +#: rhodecode/templates/data_table/_dt_elements.html:101 +#: rhodecode/templates/data_table/_dt_elements.html:103 +#, python-format +msgid "Subscribe to %s rss feed" +msgstr "Assinar o feed rss de %s" + +#: rhodecode/templates/data_table/_dt_elements.html:109 +#: rhodecode/templates/data_table/_dt_elements.html:111 +#, python-format +msgid "Subscribe to %s atom feed" +msgstr "Assinar o feed atom de %s" + +#: rhodecode/templates/data_table/_dt_elements.html:122 #, python-format msgid "Confirm to delete this user: %s" msgstr "Confirma excluir este usuário: %s" #: rhodecode/templates/email_templates/main.html:8 -msgid "This is an notification from RhodeCode." +#, fuzzy +msgid "This is a notification from RhodeCode." msgstr "Esta é uma notificação do RhodeCode." #: rhodecode/templates/errors/error_document.html:46 @@ -3382,13 +3554,13 @@ msgstr "Diff do arquivo" #: rhodecode/templates/files/files.html:4 -#: rhodecode/templates/files/files.html:72 +#: rhodecode/templates/files/files.html:74 #, fuzzy, python-format msgid "%s files" msgstr "arquivos" #: rhodecode/templates/files/files.html:12 -#: rhodecode/templates/summary/summary.html:340 +#: rhodecode/templates/summary/summary.html:351 msgid "files" msgstr "arquivos" @@ -3466,7 +3638,7 @@ msgstr "pesquisar lista de arquivos" #: rhodecode/templates/files/files_browser.html:31 -#: rhodecode/templates/shortlog/shortlog_data.html:65 +#: rhodecode/templates/shortlog/shortlog_data.html:80 msgid "add new file" msgstr "adicionar novo arquivo" @@ -3499,18 +3671,18 @@ msgstr "editar arquivo" #: rhodecode/templates/files/files_edit.html:49 -#: rhodecode/templates/files/files_source.html:38 +#: rhodecode/templates/files/files_source.html:23 msgid "show annotation" msgstr "mostrar anotação" #: rhodecode/templates/files/files_edit.html:50 -#: rhodecode/templates/files/files_source.html:40 -#: rhodecode/templates/files/files_source.html:68 +#: rhodecode/templates/files/files_source.html:25 +#: rhodecode/templates/files/files_source.html:53 msgid "show as raw" msgstr "mostrar como bruto" #: rhodecode/templates/files/files_edit.html:51 -#: rhodecode/templates/files/files_source.html:41 +#: rhodecode/templates/files/files_source.html:26 msgid "download as raw" msgstr "descarregar como bruto" @@ -3522,44 +3694,45 @@ msgid "Editing file" msgstr "Editando arquivo" -#: rhodecode/templates/files/files_source.html:2 +#: rhodecode/templates/files/files_history_box.html:2 msgid "History" msgstr "Histórico" -#: rhodecode/templates/files/files_source.html:9 +#: rhodecode/templates/files/files_history_box.html:9 #, fuzzy msgid "diff to revision" msgstr "próxima revisão" -#: rhodecode/templates/files/files_source.html:10 +#: rhodecode/templates/files/files_history_box.html:10 #, fuzzy msgid "show at revision" msgstr "próxima revisão" -#: rhodecode/templates/files/files_source.html:14 +#: rhodecode/templates/files/files_history_box.html:15 #, fuzzy, python-format msgid "%s author" msgid_plural "%s authors" msgstr[0] "autor" msgstr[1] "autors" -#: rhodecode/templates/files/files_source.html:36 +#: rhodecode/templates/files/files_source.html:6 +#, fuzzy +msgid "Load file history" +msgstr "Carregando lista de arquivos..." + +#: rhodecode/templates/files/files_source.html:21 msgid "show source" msgstr "mostrar fonte" -#: rhodecode/templates/files/files_source.html:59 +#: rhodecode/templates/files/files_source.html:44 #, python-format msgid "Binary file (%s)" msgstr "Arquivo binário (%s)" -#: rhodecode/templates/files/files_source.html:68 +#: rhodecode/templates/files/files_source.html:53 msgid "File is too big to display" msgstr "Arquivo é grande demais para exibir" -#: rhodecode/templates/files/files_source.html:124 -msgid "Selection link" -msgstr "Link da seleção" - #: rhodecode/templates/files/files_ypjax.html:5 msgid "annotation" msgstr "anotação" @@ -3632,7 +3805,7 @@ msgid "forked" msgstr "bifurcado" -#: rhodecode/templates/forks/forks_data.html:38 +#: rhodecode/templates/forks/forks_data.html:42 msgid "There are no forks yet" msgstr "Ainda não há bifurcações" @@ -3647,7 +3820,7 @@ msgstr "diário público de %s - feed %s" #: rhodecode/templates/journal/journal.html:24 -#: rhodecode/templates/pullrequests/pullrequest.html:27 +#: rhodecode/templates/pullrequests/pullrequest.html:55 msgid "Refresh" msgstr "Atualizar" @@ -3670,19 +3843,19 @@ msgid "ADD" msgstr "ADICIONAR" -#: rhodecode/templates/journal/journal.html:114 +#: rhodecode/templates/journal/journal.html:69 msgid "following user" msgstr "seguindo usuário" -#: rhodecode/templates/journal/journal.html:114 +#: rhodecode/templates/journal/journal.html:69 msgid "user" msgstr "usuário" -#: rhodecode/templates/journal/journal.html:147 +#: rhodecode/templates/journal/journal.html:102 msgid "You are not following any users or repositories" msgstr "Você não está seguindo quaisquer usuários ou repositórios" -#: rhodecode/templates/journal/journal_data.html:47 +#: rhodecode/templates/journal/journal_data.html:51 msgid "No entries yet" msgstr "Ainda não há entradas" @@ -3705,7 +3878,7 @@ msgid "New pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:28 +#: rhodecode/templates/pullrequests/pullrequest.html:54 msgid "refresh overview" msgstr "" @@ -3715,18 +3888,18 @@ msgstr "comparar exibir" #: rhodecode/templates/pullrequests/pullrequest.html:70 -#: rhodecode/templates/pullrequests/pullrequest_show.html:82 +#: rhodecode/templates/pullrequests/pullrequest_show.html:100 msgid "Pull request reviewers" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:79 -#: rhodecode/templates/pullrequests/pullrequest_show.html:94 +#: rhodecode/templates/pullrequests/pullrequest_show.html:112 #, fuzzy msgid "owner" msgstr "Dono" #: rhodecode/templates/pullrequests/pullrequest.html:91 -#: rhodecode/templates/pullrequests/pullrequest_show.html:109 +#: rhodecode/templates/pullrequests/pullrequest_show.html:127 msgid "Add reviewer to this pull request." msgstr "" @@ -3756,6 +3929,11 @@ msgid "Closed %s" msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_show.html:23 +#, python-format +msgid "with status %s" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_show.html:31 #, fuzzy msgid "Status" @@ -3769,28 +3947,27 @@ msgid "Still not reviewed by" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:47 +#: rhodecode/templates/pullrequests/pullrequest_show.html:48 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:54 +#: rhodecode/templates/pullrequests/pullrequest_show.html:50 +msgid "pull request was reviewed by all reviewers" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:58 #, fuzzy msgid "Created on" msgstr "criar um agora" -#: rhodecode/templates/pullrequests/pullrequest_show.html:61 +#: rhodecode/templates/pullrequests/pullrequest_show.html:65 #, fuzzy msgid "Compare view" msgstr "comparar exibir" -#: rhodecode/templates/pullrequests/pullrequest_show.html:65 -#, fuzzy -msgid "Incoming changesets" -msgstr "Nenhum conjunto de alterações ainda." - #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 #, fuzzy msgid "all pull requests" @@ -3867,23 +4044,31 @@ msgid "shortlog" msgstr "log resumido" +#: rhodecode/templates/shortlog/shortlog_data.html:5 +msgid "revision" +msgstr "revisão" + #: rhodecode/templates/shortlog/shortlog_data.html:7 msgid "age" msgstr "idade" -#: rhodecode/templates/shortlog/shortlog_data.html:18 +#: rhodecode/templates/shortlog/shortlog_data.html:8 +msgid "author" +msgstr "autor" + +#: rhodecode/templates/shortlog/shortlog_data.html:33 msgid "No commit message" msgstr "Nenhuma mensagem de commit" -#: rhodecode/templates/shortlog/shortlog_data.html:62 +#: rhodecode/templates/shortlog/shortlog_data.html:77 msgid "Add or upload files directly via RhodeCode" msgstr "Adicionar ou enviar arquivos diretamente pelo RhodeCode" -#: rhodecode/templates/shortlog/shortlog_data.html:71 +#: rhodecode/templates/shortlog/shortlog_data.html:86 msgid "Push new repo" msgstr "Fazer push de novo repositório" -#: rhodecode/templates/shortlog/shortlog_data.html:79 +#: rhodecode/templates/shortlog/shortlog_data.html:94 msgid "Existing repository?" msgstr "Repositório existente?" @@ -3911,129 +4096,139 @@ msgid "ATOM" msgstr "ATOM" -#: rhodecode/templates/summary/summary.html:82 +#: rhodecode/templates/summary/summary.html:70 +#, fuzzy, python-format +msgid "Repository locked by %s" +msgstr "repositórios" + +#: rhodecode/templates/summary/summary.html:72 +#, fuzzy +msgid "Repository unlocked" +msgstr "repositórios" + +#: rhodecode/templates/summary/summary.html:91 #, python-format msgid "Non changable ID %s" msgstr "ID não alterável %s" -#: rhodecode/templates/summary/summary.html:87 +#: rhodecode/templates/summary/summary.html:96 msgid "public" msgstr "público" -#: rhodecode/templates/summary/summary.html:95 +#: rhodecode/templates/summary/summary.html:104 msgid "remote clone" msgstr "clone remoto" -#: rhodecode/templates/summary/summary.html:116 +#: rhodecode/templates/summary/summary.html:125 msgid "Contact" msgstr "Contato" -#: rhodecode/templates/summary/summary.html:130 +#: rhodecode/templates/summary/summary.html:139 msgid "Clone url" msgstr "URL de clonagem" -#: rhodecode/templates/summary/summary.html:133 +#: rhodecode/templates/summary/summary.html:142 msgid "Show by Name" msgstr "Mostrar por Nome" -#: rhodecode/templates/summary/summary.html:134 +#: rhodecode/templates/summary/summary.html:143 msgid "Show by ID" msgstr "Mostrar por ID" -#: rhodecode/templates/summary/summary.html:142 +#: rhodecode/templates/summary/summary.html:151 msgid "Trending files" msgstr "Tendências em arquivos" -#: rhodecode/templates/summary/summary.html:150 -#: rhodecode/templates/summary/summary.html:166 -#: rhodecode/templates/summary/summary.html:194 +#: rhodecode/templates/summary/summary.html:159 +#: rhodecode/templates/summary/summary.html:175 +#: rhodecode/templates/summary/summary.html:203 msgid "enable" msgstr "habilitar" -#: rhodecode/templates/summary/summary.html:158 +#: rhodecode/templates/summary/summary.html:167 msgid "Download" msgstr "Download" -#: rhodecode/templates/summary/summary.html:162 +#: rhodecode/templates/summary/summary.html:171 msgid "There are no downloads yet" msgstr "Ainda não há downloads" -#: rhodecode/templates/summary/summary.html:164 +#: rhodecode/templates/summary/summary.html:173 msgid "Downloads are disabled for this repository" msgstr "Downloads estão desabilitados para este repositório" -#: rhodecode/templates/summary/summary.html:170 +#: rhodecode/templates/summary/summary.html:179 #, fuzzy msgid "Download as zip" msgstr "descarregar como bruto" -#: rhodecode/templates/summary/summary.html:173 +#: rhodecode/templates/summary/summary.html:182 msgid "Check this to download archive with subrepos" msgstr "Marque isto para descarregar arquivo com subrepositórios" -#: rhodecode/templates/summary/summary.html:173 +#: rhodecode/templates/summary/summary.html:182 msgid "with subrepos" msgstr "com subrepositórios" -#: rhodecode/templates/summary/summary.html:186 +#: rhodecode/templates/summary/summary.html:195 msgid "Commit activity by day / author" msgstr "Atividade de commit por dia / autor" -#: rhodecode/templates/summary/summary.html:197 +#: rhodecode/templates/summary/summary.html:206 msgid "Stats gathered: " msgstr "Estatísticas coletadas:" -#: rhodecode/templates/summary/summary.html:218 +#: rhodecode/templates/summary/summary.html:227 msgid "Shortlog" msgstr "Log resumido" -#: rhodecode/templates/summary/summary.html:220 +#: rhodecode/templates/summary/summary.html:229 msgid "Quick start" msgstr "Início rápido" -#: rhodecode/templates/summary/summary.html:233 +#: rhodecode/templates/summary/summary.html:243 #, python-format msgid "Readme file at revision '%s'" msgstr "" -#: rhodecode/templates/summary/summary.html:236 +#: rhodecode/templates/summary/summary.html:246 msgid "Permalink to this readme" msgstr "" -#: rhodecode/templates/summary/summary.html:293 +#: rhodecode/templates/summary/summary.html:304 #, python-format msgid "Download %s as %s" msgstr "Descarregar %s como %s" -#: rhodecode/templates/summary/summary.html:650 +#: rhodecode/templates/summary/summary.html:661 msgid "commits" msgstr "commits" -#: rhodecode/templates/summary/summary.html:651 +#: rhodecode/templates/summary/summary.html:662 msgid "files added" msgstr "arquivos adicionados" -#: rhodecode/templates/summary/summary.html:652 +#: rhodecode/templates/summary/summary.html:663 msgid "files changed" msgstr "arquivos alterados" -#: rhodecode/templates/summary/summary.html:653 +#: rhodecode/templates/summary/summary.html:664 msgid "files removed" msgstr "arquivos removidos" -#: rhodecode/templates/summary/summary.html:656 +#: rhodecode/templates/summary/summary.html:667 msgid "commit" msgstr "commit" -#: rhodecode/templates/summary/summary.html:657 +#: rhodecode/templates/summary/summary.html:668 msgid "file added" msgstr "arquivo adicionado" -#: rhodecode/templates/summary/summary.html:658 +#: rhodecode/templates/summary/summary.html:669 msgid "file changed" msgstr "arquivo alterado" -#: rhodecode/templates/summary/summary.html:659 +#: rhodecode/templates/summary/summary.html:670 msgid "file removed" msgstr "arquivo removido" @@ -4042,3 +4237,8 @@ msgid "%s Tags" msgstr "%s atrás" +#: rhodecode/templates/tags/tags.html:29 +#, fuzzy +msgid "Compare tags" +msgstr "comparar exibir" +
--- a/rhodecode/i18n/rhodecode.pot Mon Nov 26 20:39:45 2012 +0100 +++ b/rhodecode/i18n/rhodecode.pot Tue Nov 27 20:56:57 2012 +0100 @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: RhodeCode 1.4.0b\n" +"Project-Id-Version: RhodeCode 1.5.0b\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-09-02 20:30+0200\n" +"POT-Creation-Date: 2012-11-27 20:56+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,35 +17,35 @@ "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -#: rhodecode/controllers/changelog.py:94 +#: rhodecode/controllers/changelog.py:95 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:157 +#: rhodecode/controllers/changeset.py:164 #, python-format msgid "%s line context" msgstr "" -#: rhodecode/controllers/changeset.py:333 rhodecode/controllers/changeset.py:348 -#: rhodecode/lib/diffs.py:70 -msgid "binary file" -msgstr "" - -#: rhodecode/controllers/changeset.py:408 +#: rhodecode/controllers/changeset.py:315 rhodecode/controllers/pullrequests.py:411 +#, python-format +msgid "Status change -> %s" +msgstr "" + +#: rhodecode/controllers/changeset.py:346 msgid "" "Changing status on a changeset associated witha closed pull request is not " "allowed" msgstr "" -#: rhodecode/controllers/compare.py:69 +#: rhodecode/controllers/compare.py:75 rhodecode/controllers/pullrequests.py:117 msgid "There are no changesets yet" msgstr "" @@ -75,128 +75,138 @@ "fulfilling the request." msgstr "" -#: rhodecode/controllers/feed.py:49 +#: rhodecode/controllers/feed.py:52 #, python-format msgid "Changes on %s repository" msgstr "" -#: rhodecode/controllers/feed.py:50 +#: rhodecode/controllers/feed.py:53 #, python-format msgid "%s %s feed" msgstr "" -#: rhodecode/controllers/feed.py:75 +#: rhodecode/controllers/feed.py:86 +#: rhodecode/templates/changeset/changeset.html:126 +#: rhodecode/templates/changeset/changeset.html:138 +#: rhodecode/templates/compare/compare_diff.html:62 +#: rhodecode/templates/compare/compare_diff.html:73 +#: rhodecode/templates/pullrequests/pullrequest_show.html:94 +#: rhodecode/templates/pullrequests/pullrequest_show.html:153 +msgid "Changeset was too big and was cut off..." +msgstr "" + +#: rhodecode/controllers/feed.py:92 msgid "commited on" msgstr "" -#: rhodecode/controllers/files.py:84 +#: rhodecode/controllers/files.py:86 msgid "click here to add new file" msgstr "" -#: rhodecode/controllers/files.py:85 +#: rhodecode/controllers/files.py:87 #, python-format msgid "There are no files yet %s" msgstr "" -#: rhodecode/controllers/files.py:239 rhodecode/controllers/files.py:299 +#: rhodecode/controllers/files.py:265 rhodecode/controllers/files.py:325 #, python-format msgid "This repository is has been locked by %s on %s" msgstr "" -#: rhodecode/controllers/files.py:266 +#: rhodecode/controllers/files.py:292 #, python-format msgid "Edited %s via RhodeCode" msgstr "" -#: rhodecode/controllers/files.py:271 +#: rhodecode/controllers/files.py:297 msgid "No changes" msgstr "" -#: rhodecode/controllers/files.py:282 rhodecode/controllers/files.py:346 +#: rhodecode/controllers/files.py:308 rhodecode/controllers/files.py:372 #, python-format msgid "Successfully committed to %s" msgstr "" -#: rhodecode/controllers/files.py:287 rhodecode/controllers/files.py:352 +#: rhodecode/controllers/files.py:313 rhodecode/controllers/files.py:378 msgid "Error occurred during commit" msgstr "" -#: rhodecode/controllers/files.py:318 +#: rhodecode/controllers/files.py:344 #, python-format msgid "Added %s via RhodeCode" msgstr "" -#: rhodecode/controllers/files.py:332 +#: rhodecode/controllers/files.py:358 msgid "No content" msgstr "" -#: rhodecode/controllers/files.py:336 +#: rhodecode/controllers/files.py:362 msgid "No filename" msgstr "" -#: rhodecode/controllers/files.py:378 +#: rhodecode/controllers/files.py:404 msgid "downloads disabled" msgstr "" -#: rhodecode/controllers/files.py:389 +#: rhodecode/controllers/files.py:415 #, python-format msgid "Unknown revision %s" msgstr "" -#: rhodecode/controllers/files.py:391 +#: rhodecode/controllers/files.py:417 msgid "Empty repository" msgstr "" -#: rhodecode/controllers/files.py:393 +#: rhodecode/controllers/files.py:419 msgid "Unknown archive type" msgstr "" -#: rhodecode/controllers/files.py:494 +#: rhodecode/controllers/files.py:564 #: rhodecode/templates/changeset/changeset_range.html:13 #: rhodecode/templates/changeset/changeset_range.html:31 msgid "Changesets" msgstr "" -#: rhodecode/controllers/files.py:495 rhodecode/controllers/pullrequests.py:72 -#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:543 +#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:76 +#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:550 msgid "Branches" msgstr "" -#: rhodecode/controllers/files.py:496 rhodecode/controllers/pullrequests.py:76 -#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:554 +#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:80 +#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:561 msgid "Tags" msgstr "" -#: rhodecode/controllers/forks.py:73 rhodecode/controllers/admin/repos.py:90 +#: rhodecode/controllers/forks.py:74 rhodecode/controllers/admin/repos.py:91 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from the " "filesystem please run the application again in order to rescan repositories" msgstr "" -#: rhodecode/controllers/forks.py:133 rhodecode/controllers/settings.py:72 +#: rhodecode/controllers/forks.py:134 rhodecode/controllers/settings.py:73 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from the " "file system please run the application again in order to rescan repositories" msgstr "" -#: rhodecode/controllers/forks.py:167 +#: rhodecode/controllers/forks.py:168 #, python-format msgid "forked %s repository as %s" msgstr "" -#: rhodecode/controllers/forks.py:181 +#: rhodecode/controllers/forks.py:182 #, python-format msgid "An error occurred during repository forking %s" msgstr "" -#: rhodecode/controllers/journal.py:202 rhodecode/controllers/journal.py:239 -msgid "public journal" -msgstr "" - #: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243 -#: rhodecode/templates/base/base.html:220 +msgid "public journal" +msgstr "" + +#: rhodecode/controllers/journal.py:210 rhodecode/controllers/journal.py:247 +#: rhodecode/templates/base/base.html:232 msgid "journal" msgstr "" @@ -212,76 +222,93 @@ msgid "Your password reset was successful, new password has been sent to your email" msgstr "" -#: rhodecode/controllers/pullrequests.py:74 rhodecode/model/scm.py:549 +#: rhodecode/controllers/pullrequests.py:78 rhodecode/model/scm.py:556 msgid "Bookmarks" msgstr "" -#: rhodecode/controllers/pullrequests.py:158 +#: rhodecode/controllers/pullrequests.py:186 msgid "Pull request requires a title with min. 3 chars" msgstr "" -#: rhodecode/controllers/pullrequests.py:160 +#: rhodecode/controllers/pullrequests.py:188 msgid "error during creation of pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:181 +#: rhodecode/controllers/pullrequests.py:220 msgid "Successfully opened new pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:184 +#: rhodecode/controllers/pullrequests.py:223 msgid "Error occurred during sending pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:217 +#: rhodecode/controllers/pullrequests.py:256 msgid "Successfully deleted pull request" msgstr "" -#: rhodecode/controllers/search.py:131 +#: rhodecode/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "" -#: rhodecode/controllers/search.py:136 +#: rhodecode/controllers/search.py:139 msgid "There is no index to search in. Please run whoosh indexer" msgstr "" -#: rhodecode/controllers/search.py:140 +#: rhodecode/controllers/search.py:143 msgid "An error occurred during this search operation" msgstr "" -#: rhodecode/controllers/settings.py:107 rhodecode/controllers/admin/repos.py:266 +#: rhodecode/controllers/settings.py:108 rhodecode/controllers/admin/repos.py:267 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: rhodecode/controllers/settings.py:125 rhodecode/controllers/admin/repos.py:284 +#: rhodecode/controllers/settings.py:126 rhodecode/controllers/admin/repos.py:285 #, python-format msgid "error occurred during update of repository %s" msgstr "" -#: rhodecode/controllers/settings.py:143 rhodecode/controllers/admin/repos.py:302 +#: rhodecode/controllers/settings.py:144 rhodecode/controllers/admin/repos.py:303 #, python-format msgid "" "%s repository is not mapped to db perhaps it was moved or renamed from the " "filesystem please run the application again in order to rescan repositories" msgstr "" -#: rhodecode/controllers/settings.py:155 rhodecode/controllers/admin/repos.py:314 +#: rhodecode/controllers/settings.py:156 rhodecode/controllers/admin/repos.py:315 #, python-format msgid "deleted repository %s" msgstr "" -#: rhodecode/controllers/settings.py:159 rhodecode/controllers/admin/repos.py:324 -#: rhodecode/controllers/admin/repos.py:330 +#: rhodecode/controllers/settings.py:160 rhodecode/controllers/admin/repos.py:325 +#: rhodecode/controllers/admin/repos.py:331 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: rhodecode/controllers/summary.py:138 +#: rhodecode/controllers/settings.py:179 +msgid "unlocked" +msgstr "" + +#: rhodecode/controllers/settings.py:182 +msgid "locked" +msgstr "" + +#: rhodecode/controllers/settings.py:184 +#, python-format +msgid "Repository has been %s" +msgstr "" + +#: rhodecode/controllers/settings.py:188 rhodecode/controllers/admin/repos.py:423 +msgid "An error occurred during unlocking" +msgstr "" + +#: rhodecode/controllers/summary.py:140 msgid "No data loaded yet" msgstr "" -#: rhodecode/controllers/summary.py:142 -#: rhodecode/templates/summary/summary.html:148 +#: rhodecode/controllers/summary.py:144 +#: rhodecode/templates/summary/summary.html:157 msgid "Statistics are disabled for this repository" msgstr "" @@ -366,13 +393,13 @@ #: rhodecode/templates/admin/settings/settings.html:9 #: rhodecode/templates/admin/users/user_add.html:8 #: rhodecode/templates/admin/users/user_edit.html:9 -#: rhodecode/templates/admin/users/user_edit.html:122 +#: rhodecode/templates/admin/users/user_edit.html:126 #: rhodecode/templates/admin/users/users.html:9 #: rhodecode/templates/admin/users_groups/users_group_add.html:8 #: rhodecode/templates/admin/users_groups/users_group_edit.html:9 #: rhodecode/templates/admin/users_groups/users_groups.html:9 -#: rhodecode/templates/base/base.html:197 rhodecode/templates/base/base.html:337 -#: rhodecode/templates/base/base.html:339 rhodecode/templates/base/base.html:341 +#: rhodecode/templates/base/base.html:197 rhodecode/templates/base/base.html:349 +#: rhodecode/templates/base/base.html:351 rhodecode/templates/base/base.html:353 msgid "Admin" msgstr "" @@ -406,187 +433,183 @@ msgid "error occurred during update of permissions" msgstr "" -#: rhodecode/controllers/admin/repos.py:123 +#: rhodecode/controllers/admin/repos.py:124 msgid "--REMOVE FORK--" msgstr "" -#: rhodecode/controllers/admin/repos.py:192 +#: rhodecode/controllers/admin/repos.py:193 #, python-format msgid "created repository %s from %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:196 +#: rhodecode/controllers/admin/repos.py:197 #, python-format msgid "created repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:227 +#: rhodecode/controllers/admin/repos.py:228 #, python-format msgid "error occurred during creation of repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:319 +#: rhodecode/controllers/admin/repos.py:320 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:348 +#: rhodecode/controllers/admin/repos.py:349 msgid "An error occurred during deletion of repository user" msgstr "" -#: rhodecode/controllers/admin/repos.py:367 +#: rhodecode/controllers/admin/repos.py:368 msgid "An error occurred during deletion of repository users groups" msgstr "" -#: rhodecode/controllers/admin/repos.py:385 +#: rhodecode/controllers/admin/repos.py:386 msgid "An error occurred during deletion of repository stats" msgstr "" -#: rhodecode/controllers/admin/repos.py:402 +#: rhodecode/controllers/admin/repos.py:403 msgid "An error occurred during cache invalidation" msgstr "" -#: rhodecode/controllers/admin/repos.py:422 -msgid "An error occurred during unlocking" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:442 +#: rhodecode/controllers/admin/repos.py:443 msgid "Updated repository visibility in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:446 +#: rhodecode/controllers/admin/repos.py:447 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:451 rhodecode/model/validators.py:299 +#: rhodecode/controllers/admin/repos.py:452 rhodecode/model/validators.py:300 msgid "Token mismatch" msgstr "" -#: rhodecode/controllers/admin/repos.py:464 +#: rhodecode/controllers/admin/repos.py:465 msgid "Pulled from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:466 +#: rhodecode/controllers/admin/repos.py:467 msgid "An error occurred during pull from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:482 +#: rhodecode/controllers/admin/repos.py:483 msgid "Nothing" msgstr "" -#: rhodecode/controllers/admin/repos.py:484 +#: rhodecode/controllers/admin/repos.py:485 #, python-format msgid "Marked repo %s as fork of %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:488 +#: rhodecode/controllers/admin/repos.py:489 msgid "An error occurred during this operation" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:116 +#: rhodecode/controllers/admin/repos_groups.py:120 #, python-format msgid "created repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:129 +#: rhodecode/controllers/admin/repos_groups.py:133 #, python-format msgid "error occurred during creation of repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:163 +#: rhodecode/controllers/admin/repos_groups.py:167 #, python-format msgid "updated repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:176 +#: rhodecode/controllers/admin/repos_groups.py:180 #, python-format msgid "error occurred during update of repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:194 +#: rhodecode/controllers/admin/repos_groups.py:198 #, python-format msgid "This group contains %s repositores and cannot be deleted" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:202 +#: rhodecode/controllers/admin/repos_groups.py:206 #, python-format msgid "removed repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:208 +#: rhodecode/controllers/admin/repos_groups.py:212 msgid "Cannot delete this group it still contains subgroups" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:213 -#: rhodecode/controllers/admin/repos_groups.py:218 +#: rhodecode/controllers/admin/repos_groups.py:217 +#: rhodecode/controllers/admin/repos_groups.py:222 #, python-format msgid "error occurred during deletion of repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:238 +#: rhodecode/controllers/admin/repos_groups.py:243 msgid "An error occurred during deletion of group user" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:258 +#: rhodecode/controllers/admin/repos_groups.py:264 msgid "An error occurred during deletion of group users groups" msgstr "" -#: rhodecode/controllers/admin/settings.py:121 +#: rhodecode/controllers/admin/settings.py:123 #, python-format msgid "Repositories successfully rescanned added: %s,removed: %s" msgstr "" -#: rhodecode/controllers/admin/settings.py:129 +#: rhodecode/controllers/admin/settings.py:131 msgid "Whoosh reindex task scheduled" msgstr "" -#: rhodecode/controllers/admin/settings.py:160 +#: rhodecode/controllers/admin/settings.py:162 msgid "Updated application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:164 -#: rhodecode/controllers/admin/settings.py:275 +#: rhodecode/controllers/admin/settings.py:166 +#: rhodecode/controllers/admin/settings.py:299 msgid "error occurred during updating application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:200 +#: rhodecode/controllers/admin/settings.py:207 msgid "Updated visualisation settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:205 +#: rhodecode/controllers/admin/settings.py:212 msgid "error occurred during updating visualisation settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:271 +#: rhodecode/controllers/admin/settings.py:295 msgid "Updated VCS settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:285 +#: rhodecode/controllers/admin/settings.py:309 msgid "Added new hook" msgstr "" -#: rhodecode/controllers/admin/settings.py:297 +#: rhodecode/controllers/admin/settings.py:321 msgid "Updated hooks" msgstr "" -#: rhodecode/controllers/admin/settings.py:301 +#: rhodecode/controllers/admin/settings.py:325 msgid "error occurred during hook creation" msgstr "" -#: rhodecode/controllers/admin/settings.py:320 +#: rhodecode/controllers/admin/settings.py:344 msgid "Email task created" msgstr "" -#: rhodecode/controllers/admin/settings.py:375 +#: rhodecode/controllers/admin/settings.py:399 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/controllers/admin/settings.py:406 +#: rhodecode/controllers/admin/settings.py:430 msgid "Your account was updated successfully" msgstr "" -#: rhodecode/controllers/admin/settings.py:421 -#: rhodecode/controllers/admin/users.py:191 +#: rhodecode/controllers/admin/settings.py:445 +#: rhodecode/controllers/admin/users.py:196 #, python-format msgid "error occurred during update of user %s" msgstr "" @@ -601,97 +624,97 @@ msgid "error occurred during creation of user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:171 +#: rhodecode/controllers/admin/users.py:176 msgid "User updated successfully" msgstr "" -#: rhodecode/controllers/admin/users.py:207 -msgid "successfully deleted user" -msgstr "" - #: rhodecode/controllers/admin/users.py:212 +msgid "successfully deleted user" +msgstr "" + +#: rhodecode/controllers/admin/users.py:217 msgid "An error occurred during deletion of user" msgstr "" -#: rhodecode/controllers/admin/users.py:226 +#: rhodecode/controllers/admin/users.py:231 msgid "You can't edit this user" msgstr "" -#: rhodecode/controllers/admin/users.py:266 +#: rhodecode/controllers/admin/users.py:272 msgid "Granted 'repository create' permission to user" msgstr "" -#: rhodecode/controllers/admin/users.py:271 -msgid "Revoked 'repository create' permission to user" -msgstr "" - #: rhodecode/controllers/admin/users.py:277 +msgid "Revoked 'repository create' permission to user" +msgstr "" + +#: rhodecode/controllers/admin/users.py:283 msgid "Granted 'repository fork' permission to user" msgstr "" -#: rhodecode/controllers/admin/users.py:282 -msgid "Revoked 'repository fork' permission to user" -msgstr "" - #: rhodecode/controllers/admin/users.py:288 -#: rhodecode/controllers/admin/users_groups.py:255 +msgid "Revoked 'repository fork' permission to user" +msgstr "" + +#: rhodecode/controllers/admin/users.py:294 +#: rhodecode/controllers/admin/users_groups.py:279 msgid "An error occurred during permissions saving" msgstr "" -#: rhodecode/controllers/admin/users.py:303 -#, python-format -msgid "Added email %s to user" -msgstr "" - #: rhodecode/controllers/admin/users.py:309 +#, python-format +msgid "Added email %s to user" +msgstr "" + +#: rhodecode/controllers/admin/users.py:315 msgid "An error occurred during email saving" msgstr "" -#: rhodecode/controllers/admin/users.py:319 +#: rhodecode/controllers/admin/users.py:325 msgid "Removed email from user" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:84 +#: rhodecode/controllers/admin/users_groups.py:86 #, python-format msgid "created users group %s" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:95 +#: rhodecode/controllers/admin/users_groups.py:97 #, python-format msgid "error occurred during creation of users group %s" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:135 +#: rhodecode/controllers/admin/users_groups.py:164 #, python-format msgid "updated users group %s" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:157 +#: rhodecode/controllers/admin/users_groups.py:186 #, python-format msgid "error occurred during update of users group %s" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:174 +#: rhodecode/controllers/admin/users_groups.py:203 msgid "successfully deleted users group" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:179 +#: rhodecode/controllers/admin/users_groups.py:208 msgid "An error occurred during deletion of users group" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:233 +#: rhodecode/controllers/admin/users_groups.py:257 msgid "Granted 'repository create' permission to users group" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:238 +#: rhodecode/controllers/admin/users_groups.py:262 msgid "Revoked 'repository create' permission to users group" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:244 +#: rhodecode/controllers/admin/users_groups.py:268 msgid "Granted 'repository fork' permission to users group" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:249 +#: rhodecode/controllers/admin/users_groups.py:273 msgid "Revoked 'repository fork' permission to users group" msgstr "" @@ -703,206 +726,231 @@ msgid "You need to be a signed in to view this page" msgstr "" -#: rhodecode/lib/diffs.py:86 +#: rhodecode/lib/diffs.py:74 +msgid "binary file" +msgstr "" + +#: rhodecode/lib/diffs.py:90 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: rhodecode/lib/diffs.py:96 +#: rhodecode/lib/diffs.py:100 msgid "No changes detected" msgstr "" -#: rhodecode/lib/helpers.py:372 +#: rhodecode/lib/helpers.py:373 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "" -#: rhodecode/lib/helpers.py:484 +#: rhodecode/lib/helpers.py:485 msgid "True" msgstr "" -#: rhodecode/lib/helpers.py:488 +#: rhodecode/lib/helpers.py:489 msgid "False" msgstr "" +#: rhodecode/lib/helpers.py:529 +#, python-format +msgid "Deleted branch: %s" +msgstr "" + #: rhodecode/lib/helpers.py:532 +#, python-format +msgid "Created tag: %s" +msgstr "" + +#: rhodecode/lib/helpers.py:545 msgid "Changeset not found" msgstr "" -#: rhodecode/lib/helpers.py:555 +#: rhodecode/lib/helpers.py:588 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: rhodecode/lib/helpers.py:561 +#: rhodecode/lib/helpers.py:594 msgid "compare view" msgstr "" -#: rhodecode/lib/helpers.py:581 +#: rhodecode/lib/helpers.py:614 msgid "and" msgstr "" -#: rhodecode/lib/helpers.py:582 +#: rhodecode/lib/helpers.py:615 #, python-format msgid "%s more" msgstr "" -#: rhodecode/lib/helpers.py:583 rhodecode/templates/changelog/changelog.html:48 +#: rhodecode/lib/helpers.py:616 rhodecode/templates/changelog/changelog.html:51 msgid "revisions" msgstr "" -#: rhodecode/lib/helpers.py:606 -msgid "fork name " -msgstr "" - -#: rhodecode/lib/helpers.py:620 +#: rhodecode/lib/helpers.py:640 +#, python-format +msgid "fork name %s" +msgstr "" + +#: rhodecode/lib/helpers.py:653 #: rhodecode/templates/pullrequests/pullrequest_show.html:4 #: rhodecode/templates/pullrequests/pullrequest_show.html:12 #, python-format msgid "Pull request #%s" msgstr "" -#: rhodecode/lib/helpers.py:626 +#: rhodecode/lib/helpers.py:659 msgid "[deleted] repository" msgstr "" -#: rhodecode/lib/helpers.py:628 rhodecode/lib/helpers.py:638 +#: rhodecode/lib/helpers.py:661 rhodecode/lib/helpers.py:671 msgid "[created] repository" msgstr "" -#: rhodecode/lib/helpers.py:630 +#: rhodecode/lib/helpers.py:663 msgid "[created] repository as fork" msgstr "" -#: rhodecode/lib/helpers.py:632 rhodecode/lib/helpers.py:640 +#: rhodecode/lib/helpers.py:665 rhodecode/lib/helpers.py:673 msgid "[forked] repository" msgstr "" -#: rhodecode/lib/helpers.py:634 rhodecode/lib/helpers.py:642 +#: rhodecode/lib/helpers.py:667 rhodecode/lib/helpers.py:675 msgid "[updated] repository" msgstr "" -#: rhodecode/lib/helpers.py:636 +#: rhodecode/lib/helpers.py:669 msgid "[delete] repository" msgstr "" -#: rhodecode/lib/helpers.py:644 +#: rhodecode/lib/helpers.py:677 msgid "[created] user" msgstr "" -#: rhodecode/lib/helpers.py:646 +#: rhodecode/lib/helpers.py:679 msgid "[updated] user" msgstr "" -#: rhodecode/lib/helpers.py:648 +#: rhodecode/lib/helpers.py:681 msgid "[created] users group" msgstr "" -#: rhodecode/lib/helpers.py:650 +#: rhodecode/lib/helpers.py:683 msgid "[updated] users group" msgstr "" -#: rhodecode/lib/helpers.py:652 +#: rhodecode/lib/helpers.py:685 msgid "[commented] on revision in repository" msgstr "" -#: rhodecode/lib/helpers.py:654 +#: rhodecode/lib/helpers.py:687 msgid "[commented] on pull request for" msgstr "" -#: rhodecode/lib/helpers.py:656 +#: rhodecode/lib/helpers.py:689 msgid "[closed] pull request for" msgstr "" -#: rhodecode/lib/helpers.py:658 +#: rhodecode/lib/helpers.py:691 msgid "[pushed] into" msgstr "" -#: rhodecode/lib/helpers.py:660 +#: rhodecode/lib/helpers.py:693 msgid "[committed via RhodeCode] into repository" msgstr "" -#: rhodecode/lib/helpers.py:662 +#: rhodecode/lib/helpers.py:695 msgid "[pulled from remote] into repository" msgstr "" -#: rhodecode/lib/helpers.py:664 +#: rhodecode/lib/helpers.py:697 msgid "[pulled] from" msgstr "" -#: rhodecode/lib/helpers.py:666 +#: rhodecode/lib/helpers.py:699 msgid "[started following] repository" msgstr "" -#: rhodecode/lib/helpers.py:668 +#: rhodecode/lib/helpers.py:701 msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/helpers.py:840 +#: rhodecode/lib/helpers.py:877 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:844 +#: rhodecode/lib/helpers.py:881 msgid "No Files" msgstr "" -#: rhodecode/lib/utils2.py:335 +#: rhodecode/lib/utils2.py:403 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:336 +#: rhodecode/lib/utils2.py:404 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:337 +#: rhodecode/lib/utils2.py:405 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:338 +#: rhodecode/lib/utils2.py:406 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:339 +#: rhodecode/lib/utils2.py:407 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:340 +#: rhodecode/lib/utils2.py:408 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: rhodecode/lib/utils2.py:355 +#: rhodecode/lib/utils2.py:424 +#, python-format +msgid "in %s" +msgstr "" + +#: rhodecode/lib/utils2.py:426 #, python-format msgid "%s ago" msgstr "" -#: rhodecode/lib/utils2.py:357 +#: rhodecode/lib/utils2.py:428 +#, python-format +msgid "in %s and %s" +msgstr "" + +#: rhodecode/lib/utils2.py:431 #, python-format msgid "%s and %s ago" msgstr "" -#: rhodecode/lib/utils2.py:360 +#: rhodecode/lib/utils2.py:434 msgid "just now" msgstr "" -#: rhodecode/lib/celerylib/tasks.py:269 +#: rhodecode/lib/celerylib/tasks.py:270 msgid "password reset link" msgstr "" @@ -911,87 +959,87 @@ msgid "on line %s" msgstr "" -#: rhodecode/model/comment.py:157 +#: rhodecode/model/comment.py:173 msgid "[Mention]" msgstr "" -#: rhodecode/model/db.py:1140 +#: rhodecode/model/db.py:1163 msgid "Repository no access" msgstr "" -#: rhodecode/model/db.py:1141 +#: rhodecode/model/db.py:1164 msgid "Repository read access" msgstr "" -#: rhodecode/model/db.py:1142 +#: rhodecode/model/db.py:1165 msgid "Repository write access" msgstr "" -#: rhodecode/model/db.py:1143 +#: rhodecode/model/db.py:1166 msgid "Repository admin access" msgstr "" -#: rhodecode/model/db.py:1145 +#: rhodecode/model/db.py:1168 msgid "Repositories Group no access" msgstr "" -#: rhodecode/model/db.py:1146 +#: rhodecode/model/db.py:1169 msgid "Repositories Group read access" msgstr "" -#: rhodecode/model/db.py:1147 +#: rhodecode/model/db.py:1170 msgid "Repositories Group write access" msgstr "" -#: rhodecode/model/db.py:1148 +#: rhodecode/model/db.py:1171 msgid "Repositories Group admin access" msgstr "" -#: rhodecode/model/db.py:1150 +#: rhodecode/model/db.py:1173 msgid "RhodeCode Administrator" msgstr "" -#: rhodecode/model/db.py:1151 +#: rhodecode/model/db.py:1174 msgid "Repository creation disabled" msgstr "" -#: rhodecode/model/db.py:1152 +#: rhodecode/model/db.py:1175 msgid "Repository creation enabled" msgstr "" -#: rhodecode/model/db.py:1153 +#: rhodecode/model/db.py:1176 msgid "Repository forking disabled" msgstr "" -#: rhodecode/model/db.py:1154 +#: rhodecode/model/db.py:1177 msgid "Repository forking enabled" msgstr "" -#: rhodecode/model/db.py:1155 +#: rhodecode/model/db.py:1178 msgid "Register disabled" msgstr "" -#: rhodecode/model/db.py:1156 +#: rhodecode/model/db.py:1179 msgid "Register new user with RhodeCode with manual activation" msgstr "" -#: rhodecode/model/db.py:1159 +#: rhodecode/model/db.py:1182 msgid "Register new user with RhodeCode with auto activation" msgstr "" -#: rhodecode/model/db.py:1579 +#: rhodecode/model/db.py:1623 msgid "Not Reviewed" msgstr "" -#: rhodecode/model/db.py:1580 +#: rhodecode/model/db.py:1624 msgid "Approved" msgstr "" -#: rhodecode/model/db.py:1581 +#: rhodecode/model/db.py:1625 msgid "Rejected" msgstr "" -#: rhodecode/model/db.py:1582 +#: rhodecode/model/db.py:1626 msgid "Under Review" msgstr "" @@ -1014,35 +1062,41 @@ msgstr "" #: rhodecode/model/notification.py:220 -msgid "commented on commit" +#, python-format +msgid "commented on commit at %(when)s" msgstr "" #: rhodecode/model/notification.py:221 -msgid "sent message" +#, python-format +msgid "sent message at %(when)s" msgstr "" #: rhodecode/model/notification.py:222 -msgid "mentioned you" +#, python-format +msgid "mentioned you at %(when)s" msgstr "" #: rhodecode/model/notification.py:223 -msgid "registered in RhodeCode" +#, python-format +msgid "registered in RhodeCode at %(when)s" msgstr "" #: rhodecode/model/notification.py:224 -msgid "opened new pull request" +#, python-format +msgid "opened new pull request at %(when)s" msgstr "" #: rhodecode/model/notification.py:225 -msgid "commented on pull request" -msgstr "" - -#: rhodecode/model/pull_request.py:84 +#, python-format +msgid "commented on pull request at %(when)s" +msgstr "" + +#: rhodecode/model/pull_request.py:90 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s" msgstr "" -#: rhodecode/model/scm.py:535 +#: rhodecode/model/scm.py:542 msgid "latest tip" msgstr "" @@ -1050,152 +1104,156 @@ msgid "new user registration" msgstr "" -#: rhodecode/model/user.py:255 rhodecode/model/user.py:277 -#: rhodecode/model/user.py:299 +#: rhodecode/model/user.py:255 rhodecode/model/user.py:279 +#: rhodecode/model/user.py:301 msgid "You can't Edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:323 +#: rhodecode/model/user.py:325 msgid "You can't remove this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:329 +#: rhodecode/model/user.py:331 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch owners " "or remove those repositories. %s" msgstr "" -#: rhodecode/model/validators.py:35 rhodecode/model/validators.py:36 +#: rhodecode/model/validators.py:36 rhodecode/model/validators.py:37 msgid "Value cannot be an empty list" msgstr "" -#: rhodecode/model/validators.py:82 +#: rhodecode/model/validators.py:83 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "" -#: rhodecode/model/validators.py:84 +#: rhodecode/model/validators.py:85 #, python-format msgid "Username \"%(username)s\" is forbidden" msgstr "" -#: rhodecode/model/validators.py:86 +#: rhodecode/model/validators.py:87 msgid "" "Username may only contain alphanumeric characters underscores, periods or " "dashes and must begin with alphanumeric character" msgstr "" -#: rhodecode/model/validators.py:114 +#: rhodecode/model/validators.py:115 #, python-format msgid "Username %(username)s is not valid" msgstr "" -#: rhodecode/model/validators.py:133 -msgid "Invalid users group name" -msgstr "" - #: rhodecode/model/validators.py:134 +msgid "Invalid users group name" +msgstr "" + +#: rhodecode/model/validators.py:135 #, python-format msgid "Users group \"%(usersgroup)s\" already exists" msgstr "" -#: rhodecode/model/validators.py:136 +#: rhodecode/model/validators.py:137 msgid "" "users group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" -#: rhodecode/model/validators.py:174 +#: rhodecode/model/validators.py:175 msgid "Cannot assign this group as parent" msgstr "" -#: rhodecode/model/validators.py:175 +#: rhodecode/model/validators.py:176 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "" -#: rhodecode/model/validators.py:177 +#: rhodecode/model/validators.py:178 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: rhodecode/model/validators.py:235 +#: rhodecode/model/validators.py:236 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: rhodecode/model/validators.py:250 +#: rhodecode/model/validators.py:251 msgid "Passwords do not match" msgstr "" -#: rhodecode/model/validators.py:267 -msgid "invalid password" -msgstr "" - #: rhodecode/model/validators.py:268 -msgid "invalid user name" +msgid "invalid password" msgstr "" #: rhodecode/model/validators.py:269 +msgid "invalid user name" +msgstr "" + +#: rhodecode/model/validators.py:270 msgid "Your account is disabled" msgstr "" -#: rhodecode/model/validators.py:313 +#: rhodecode/model/validators.py:314 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "" -#: rhodecode/model/validators.py:315 -#, python-format -msgid "Repository named %(repo)s already exists" -msgstr "" - #: rhodecode/model/validators.py:316 #, python-format +msgid "Repository named %(repo)s already exists" +msgstr "" + +#: rhodecode/model/validators.py:317 +#, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: rhodecode/model/validators.py:318 +#: rhodecode/model/validators.py:319 #, python-format msgid "Repositories group with name \"%(repo)s\" already exists" msgstr "" -#: rhodecode/model/validators.py:431 -msgid "invalid clone url" -msgstr "" - #: rhodecode/model/validators.py:432 +msgid "invalid clone url" +msgstr "" + +#: rhodecode/model/validators.py:433 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" msgstr "" -#: rhodecode/model/validators.py:457 +#: rhodecode/model/validators.py:458 msgid "Fork have to be the same type as parent" msgstr "" -#: rhodecode/model/validators.py:478 +#: rhodecode/model/validators.py:473 +msgid "You don't have permissions to create repository in this group" +msgstr "" + +#: rhodecode/model/validators.py:498 msgid "This username or users group name is not valid" msgstr "" -#: rhodecode/model/validators.py:562 +#: rhodecode/model/validators.py:582 msgid "This is not a valid path" msgstr "" -#: rhodecode/model/validators.py:577 -msgid "This e-mail address is already taken" -msgstr "" - #: rhodecode/model/validators.py:597 +msgid "This e-mail address is already taken" +msgstr "" + +#: rhodecode/model/validators.py:617 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "" -#: rhodecode/model/validators.py:634 +#: rhodecode/model/validators.py:654 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:653 +#: rhodecode/model/validators.py:673 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" @@ -1218,7 +1276,7 @@ #: rhodecode/templates/index_base.html:6 #: rhodecode/templates/admin/repos/repos.html:9 -#: rhodecode/templates/base/base.html:221 +#: rhodecode/templates/base/base.html:233 msgid "repositories" msgstr "" @@ -1227,7 +1285,7 @@ msgid "ADD REPOSITORY" msgstr "" -#: rhodecode/templates/index_base.html:29 +#: rhodecode/templates/index_base.html:29 rhodecode/templates/index_base.html:136 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:32 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:32 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:33 @@ -1236,8 +1294,9 @@ msgid "Group name" msgstr "" -#: rhodecode/templates/index_base.html:30 rhodecode/templates/index_base.html:71 -#: rhodecode/templates/index_base.html:142 rhodecode/templates/index_base.html:168 +#: rhodecode/templates/index_base.html:30 rhodecode/templates/index_base.html:72 +#: rhodecode/templates/index_base.html:138 rhodecode/templates/index_base.html:176 +#: rhodecode/templates/index_base.html:266 #: rhodecode/templates/admin/repos/repo_add_base.html:56 #: rhodecode/templates/admin/repos/repo_edit.html:75 #: rhodecode/templates/admin/repos/repos.html:72 @@ -1246,134 +1305,127 @@ #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34 #: rhodecode/templates/forks/fork.html:59 #: rhodecode/templates/settings/repo_settings.html:66 -#: rhodecode/templates/summary/summary.html:105 +#: rhodecode/templates/summary/summary.html:114 msgid "Description" msgstr "" #: rhodecode/templates/index_base.html:40 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:47 msgid "Repositories group" msgstr "" -#: rhodecode/templates/index_base.html:70 rhodecode/templates/index_base.html:166 +#: rhodecode/templates/index_base.html:71 rhodecode/templates/index_base.html:174 +#: rhodecode/templates/index_base.html:264 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:32 #: rhodecode/templates/admin/repos/repos.html:70 -#: rhodecode/templates/admin/users/user_edit.html:192 +#: rhodecode/templates/admin/users/user_edit.html:196 #: rhodecode/templates/admin/users/user_edit_my_account.html:59 -#: rhodecode/templates/admin/users/user_edit_my_account.html:157 -#: rhodecode/templates/admin/users/user_edit_my_account.html:193 +#: rhodecode/templates/admin/users/user_edit_my_account.html:180 +#: rhodecode/templates/admin/users/user_edit_my_account.html:216 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:184 #: rhodecode/templates/bookmarks/bookmarks.html:36 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 -#: rhodecode/templates/branches/branches.html:51 +#: rhodecode/templates/branches/branches.html:50 +#: rhodecode/templates/branches/branches_data.html:6 #: rhodecode/templates/files/files_browser.html:47 -#: rhodecode/templates/journal/journal.html:59 -#: rhodecode/templates/journal/journal.html:107 -#: rhodecode/templates/journal/journal.html:186 +#: rhodecode/templates/journal/journal.html:62 +#: rhodecode/templates/journal/journal.html:168 +#: rhodecode/templates/journal/journal_page_repos.html:7 #: rhodecode/templates/settings/repo_settings.html:31 #: rhodecode/templates/summary/summary.html:43 -#: rhodecode/templates/summary/summary.html:123 -#: rhodecode/templates/tags/tags.html:36 rhodecode/templates/tags/tags_data.html:6 +#: rhodecode/templates/summary/summary.html:132 +#: rhodecode/templates/tags/tags.html:51 rhodecode/templates/tags/tags_data.html:6 msgid "Name" msgstr "" -#: rhodecode/templates/index_base.html:72 +#: rhodecode/templates/index_base.html:73 msgid "Last change" msgstr "" -#: rhodecode/templates/index_base.html:73 rhodecode/templates/index_base.html:171 -#: rhodecode/templates/admin/users/user_edit_my_account.html:159 -#: rhodecode/templates/journal/journal.html:188 +#: rhodecode/templates/index_base.html:74 rhodecode/templates/index_base.html:179 +#: rhodecode/templates/admin/users/user_edit_my_account.html:182 +#: rhodecode/templates/journal/journal.html:170 msgid "Tip" msgstr "" -#: rhodecode/templates/index_base.html:74 rhodecode/templates/index_base.html:173 +#: rhodecode/templates/index_base.html:75 rhodecode/templates/index_base.html:181 +#: rhodecode/templates/index_base.html:269 #: rhodecode/templates/admin/repos/repo_edit.html:121 #: rhodecode/templates/admin/repos/repos.html:73 msgid "Owner" msgstr "" -#: rhodecode/templates/index_base.html:75 -#: rhodecode/templates/summary/summary.html:48 -#: rhodecode/templates/summary/summary.html:51 -msgid "RSS" -msgstr "" - #: rhodecode/templates/index_base.html:76 +#: rhodecode/templates/summary/summary.html:48 +#: rhodecode/templates/summary/summary.html:51 +msgid "RSS" +msgstr "" + +#: rhodecode/templates/index_base.html:77 msgid "Atom" msgstr "" -#: rhodecode/templates/index_base.html:110 rhodecode/templates/index_base.html:112 -#, python-format -msgid "Subscribe to %s rss feed" -msgstr "" - -#: rhodecode/templates/index_base.html:117 rhodecode/templates/index_base.html:119 -#, python-format -msgid "Subscribe to %s atom feed" -msgstr "" - -#: rhodecode/templates/index_base.html:140 -msgid "Group Name" -msgstr "" - -#: rhodecode/templates/index_base.html:158 rhodecode/templates/index_base.html:198 +#: rhodecode/templates/index_base.html:167 rhodecode/templates/index_base.html:207 +#: rhodecode/templates/index_base.html:291 #: rhodecode/templates/admin/repos/repos.html:94 -#: rhodecode/templates/admin/users/user_edit_my_account.html:179 +#: rhodecode/templates/admin/users/user_edit_my_account.html:202 #: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:60 -#: rhodecode/templates/branches/branches.html:77 -#: rhodecode/templates/journal/journal.html:211 -#: rhodecode/templates/tags/tags.html:60 +#: rhodecode/templates/branches/branches.html:76 +#: rhodecode/templates/journal/journal.html:193 +#: rhodecode/templates/tags/tags.html:77 msgid "Click to sort ascending" msgstr "" -#: rhodecode/templates/index_base.html:159 rhodecode/templates/index_base.html:199 +#: rhodecode/templates/index_base.html:168 rhodecode/templates/index_base.html:208 +#: rhodecode/templates/index_base.html:292 #: rhodecode/templates/admin/repos/repos.html:95 -#: rhodecode/templates/admin/users/user_edit_my_account.html:180 +#: rhodecode/templates/admin/users/user_edit_my_account.html:203 #: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:61 -#: rhodecode/templates/branches/branches.html:78 -#: rhodecode/templates/journal/journal.html:212 -#: rhodecode/templates/tags/tags.html:61 +#: rhodecode/templates/branches/branches.html:77 +#: rhodecode/templates/journal/journal.html:194 +#: rhodecode/templates/tags/tags.html:78 msgid "Click to sort descending" msgstr "" -#: rhodecode/templates/index_base.html:169 +#: rhodecode/templates/index_base.html:177 rhodecode/templates/index_base.html:267 msgid "Last Change" msgstr "" -#: rhodecode/templates/index_base.html:200 +#: rhodecode/templates/index_base.html:209 rhodecode/templates/index_base.html:293 #: rhodecode/templates/admin/repos/repos.html:96 -#: rhodecode/templates/admin/users/user_edit_my_account.html:181 +#: rhodecode/templates/admin/users/user_edit_my_account.html:204 #: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:62 -#: rhodecode/templates/branches/branches.html:79 -#: rhodecode/templates/journal/journal.html:213 -#: rhodecode/templates/tags/tags.html:62 +#: rhodecode/templates/branches/branches.html:78 +#: rhodecode/templates/journal/journal.html:195 +#: rhodecode/templates/tags/tags.html:79 msgid "No records found." msgstr "" -#: rhodecode/templates/index_base.html:201 +#: rhodecode/templates/index_base.html:210 rhodecode/templates/index_base.html:294 #: rhodecode/templates/admin/repos/repos.html:97 -#: rhodecode/templates/admin/users/user_edit_my_account.html:182 +#: rhodecode/templates/admin/users/user_edit_my_account.html:205 #: rhodecode/templates/admin/users/users.html:110 #: rhodecode/templates/bookmarks/bookmarks.html:63 -#: rhodecode/templates/branches/branches.html:80 -#: rhodecode/templates/journal/journal.html:214 -#: rhodecode/templates/tags/tags.html:63 +#: rhodecode/templates/branches/branches.html:79 +#: rhodecode/templates/journal/journal.html:196 +#: rhodecode/templates/tags/tags.html:80 msgid "Data error." msgstr "" -#: rhodecode/templates/index_base.html:202 +#: rhodecode/templates/index_base.html:211 rhodecode/templates/index_base.html:295 #: rhodecode/templates/admin/repos/repos.html:98 -#: rhodecode/templates/admin/users/user_edit_my_account.html:183 +#: rhodecode/templates/admin/users/user_edit_my_account.html:206 #: rhodecode/templates/admin/users/users.html:111 #: rhodecode/templates/bookmarks/bookmarks.html:64 -#: rhodecode/templates/branches/branches.html:81 -#: rhodecode/templates/journal/journal.html:215 -#: rhodecode/templates/tags/tags.html:64 +#: rhodecode/templates/branches/branches.html:80 +#: rhodecode/templates/journal/journal.html:54 +#: rhodecode/templates/journal/journal.html:197 +#: rhodecode/templates/tags/tags.html:81 msgid "Loading..." msgstr "" @@ -1391,7 +1443,7 @@ #: rhodecode/templates/admin/users/user_edit.html:50 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:26 #: rhodecode/templates/base/base.html:83 -#: rhodecode/templates/summary/summary.html:122 +#: rhodecode/templates/summary/summary.html:131 msgid "Username" msgstr "" @@ -1448,23 +1500,23 @@ #: rhodecode/templates/register.html:47 #: rhodecode/templates/admin/users/user_add.html:59 -#: rhodecode/templates/admin/users/user_edit.html:86 +#: rhodecode/templates/admin/users/user_edit.html:90 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:53 msgid "First Name" msgstr "" #: rhodecode/templates/register.html:56 #: rhodecode/templates/admin/users/user_add.html:68 -#: rhodecode/templates/admin/users/user_edit.html:95 +#: rhodecode/templates/admin/users/user_edit.html:99 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:62 msgid "Last Name" msgstr "" #: rhodecode/templates/register.html:65 #: rhodecode/templates/admin/users/user_add.html:77 -#: rhodecode/templates/admin/users/user_edit.html:104 +#: rhodecode/templates/admin/users/user_edit.html:108 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:71 -#: rhodecode/templates/summary/summary.html:124 +#: rhodecode/templates/summary/summary.html:133 msgid "Email" msgstr "" @@ -1504,7 +1556,7 @@ msgstr "" #: rhodecode/templates/switch_to_list.html:22 -#: rhodecode/templates/tags/tags_data.html:33 +#: rhodecode/templates/tags/tags_data.html:38 msgid "There are no tags yet" msgstr "" @@ -1526,8 +1578,8 @@ #: rhodecode/templates/admin/repos/repos.html:74 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:9 -#: rhodecode/templates/journal/journal.html:61 -#: rhodecode/templates/journal/journal.html:62 +#: rhodecode/templates/journal/journal_page_repos.html:9 +#: rhodecode/templates/journal/journal_page_repos.html:10 msgid "Action" msgstr "" @@ -1538,8 +1590,9 @@ #: rhodecode/templates/admin/admin_log.html:8 #: rhodecode/templates/bookmarks/bookmarks.html:37 #: rhodecode/templates/bookmarks/bookmarks_data.html:7 -#: rhodecode/templates/branches/branches.html:52 -#: rhodecode/templates/tags/tags.html:37 rhodecode/templates/tags/tags_data.html:7 +#: rhodecode/templates/branches/branches.html:51 +#: rhodecode/templates/branches/branches_data.html:7 +#: rhodecode/templates/tags/tags.html:52 rhodecode/templates/tags/tags_data.html:7 msgid "Date" msgstr "" @@ -1547,7 +1600,7 @@ msgid "From IP" msgstr "" -#: rhodecode/templates/admin/admin_log.html:53 +#: rhodecode/templates/admin/admin_log.html:57 msgid "No actions yet" msgstr "" @@ -1627,8 +1680,8 @@ #: rhodecode/templates/admin/repos/repo_edit.html:141 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74 #: rhodecode/templates/admin/settings/hooks.html:73 -#: rhodecode/templates/admin/users/user_edit.html:129 -#: rhodecode/templates/admin/users/user_edit.html:174 +#: rhodecode/templates/admin/users/user_edit.html:133 +#: rhodecode/templates/admin/users/user_edit.html:178 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:79 #: rhodecode/templates/admin/users_groups/users_group_edit.html:135 #: rhodecode/templates/settings/repo_settings.html:93 @@ -1649,7 +1702,7 @@ msgstr "" #: rhodecode/templates/admin/notifications/notifications.html:31 -#: rhodecode/templates/base/base.html:254 rhodecode/templates/base/base.html:256 +#: rhodecode/templates/base/base.html:266 rhodecode/templates/base/base.html:268 msgid "Pull requests" msgstr "" @@ -1677,7 +1730,7 @@ #: rhodecode/templates/admin/permissions/permissions.html:11 #: rhodecode/templates/admin/repos/repo_edit.html:134 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58 -#: rhodecode/templates/admin/users/user_edit.html:139 +#: rhodecode/templates/admin/users/user_edit.html:143 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100 #: rhodecode/templates/settings/repo_settings.html:86 msgid "Permissions" @@ -1719,7 +1772,7 @@ msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:78 -#: rhodecode/templates/admin/repos/repo_edit.html:241 +#: rhodecode/templates/admin/repos/repo_edit.html:264 msgid "set" msgstr "" @@ -1739,8 +1792,8 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:20 -#: rhodecode/templates/summary/summary.html:95 -#: rhodecode/templates/summary/summary.html:96 +#: rhodecode/templates/summary/summary.html:104 +#: rhodecode/templates/summary/summary.html:105 msgid "Clone from" msgstr "" @@ -1816,12 +1869,14 @@ #: rhodecode/templates/admin/repos/repo_edit.html:13 #: rhodecode/templates/admin/users/user_edit.html:13 -#: rhodecode/templates/admin/users/user_edit.html:224 -#: rhodecode/templates/admin/users/user_edit.html:226 +#: rhodecode/templates/admin/users/user_edit.html:228 +#: rhodecode/templates/admin/users/user_edit.html:230 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13 -#: rhodecode/templates/files/files_source.html:44 -#: rhodecode/templates/journal/journal.html:81 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:207 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:209 +#: rhodecode/templates/files/files_source.html:29 +#: rhodecode/templates/journal/journal_page_repos.html:29 msgid "edit" msgstr "" @@ -1867,11 +1922,11 @@ #: rhodecode/templates/admin/repos/repo_edit.html:142 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75 #: rhodecode/templates/admin/settings/settings.html:113 -#: rhodecode/templates/admin/settings/settings.html:168 -#: rhodecode/templates/admin/settings/settings.html:258 -#: rhodecode/templates/admin/users/user_edit.html:130 -#: rhodecode/templates/admin/users/user_edit.html:175 -#: rhodecode/templates/admin/users/user_edit.html:278 +#: rhodecode/templates/admin/settings/settings.html:179 +#: rhodecode/templates/admin/settings/settings.html:269 +#: rhodecode/templates/admin/users/user_edit.html:134 +#: rhodecode/templates/admin/users/user_edit.html:179 +#: rhodecode/templates/admin/users/user_edit.html:282 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:80 #: rhodecode/templates/admin/users_groups/users_group_edit.html:136 #: rhodecode/templates/files/files_add.html:82 @@ -1929,77 +1984,102 @@ msgid "Confirm to invalidate repository cache" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:195 -#: rhodecode/templates/base/base.html:318 rhodecode/templates/base/base.html:320 -#: rhodecode/templates/base/base.html:322 -msgid "Public journal" +#: rhodecode/templates/admin/repos/repo_edit.html:193 +msgid "" +"Manually invalidate cache for this repository. On first access repository " +"will be cached again" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:198 +msgid "List of cached values" msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:201 -msgid "Remove from public journal" +msgid "Prefix" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:202 +msgid "Key" msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:203 +#: rhodecode/templates/admin/users/user_add.html:86 +#: rhodecode/templates/admin/users/user_edit.html:117 +#: rhodecode/templates/admin/users_groups/users_group_add.html:41 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:42 +msgid "Active" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:218 +#: rhodecode/templates/base/base.html:330 rhodecode/templates/base/base.html:332 +#: rhodecode/templates/base/base.html:334 +msgid "Public journal" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:224 +msgid "Remove from public journal" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:226 msgid "Add to public journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:208 +#: rhodecode/templates/admin/repos/repo_edit.html:231 msgid "" "All actions made on this repository will be accessible to everyone in public " "journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:215 +#: rhodecode/templates/admin/repos/repo_edit.html:238 msgid "Locking" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:220 +#: rhodecode/templates/admin/repos/repo_edit.html:243 msgid "Unlock locked repo" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:220 +#: rhodecode/templates/admin/repos/repo_edit.html:243 msgid "Confirm to unlock repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:223 +#: rhodecode/templates/admin/repos/repo_edit.html:246 msgid "lock repo" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:223 +#: rhodecode/templates/admin/repos/repo_edit.html:246 msgid "Confirm to lock repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:224 +#: rhodecode/templates/admin/repos/repo_edit.html:247 msgid "Repository is not locked" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:229 +#: rhodecode/templates/admin/repos/repo_edit.html:252 msgid "Force locking on repository. Works only when anonymous access is disabled" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:236 -msgid "Set as fork of" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:245 -msgid "Manually set this repository as a fork of another from the list" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:251 -#: rhodecode/templates/changeset/changeset_file_comment.html:26 -msgid "Delete" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:255 -msgid "Remove this repository" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:255 -#: rhodecode/templates/journal/journal.html:84 -msgid "Confirm to delete this repository" -msgstr "" - #: rhodecode/templates/admin/repos/repo_edit.html:259 +msgid "Set as fork of" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:268 +msgid "Manually set this repository as a fork of another from the list" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:274 +#: rhodecode/templates/changeset/changeset_file_comment.html:26 +msgid "Delete" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:278 +msgid "Remove this repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:278 +msgid "Confirm to delete this repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:282 msgid "" "This repository will be renamed in a special way in order to be unaccesible " "for RhodeCode and VCS systems.\n" @@ -2025,7 +2105,7 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:6 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6 #: rhodecode/templates/admin/users/users.html:85 -#: rhodecode/templates/base/base.html:217 +#: rhodecode/templates/base/base.html:229 msgid "admin" msgstr "" @@ -2036,8 +2116,8 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:16 #: rhodecode/templates/data_table/_dt_elements.html:67 -#: rhodecode/templates/journal/journal.html:132 -#: rhodecode/templates/summary/summary.html:76 +#: rhodecode/templates/journal/journal.html:87 +#: rhodecode/templates/summary/summary.html:85 msgid "private repository" msgstr "" @@ -2060,12 +2140,12 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:97 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 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:96 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:103 msgid "Failed to remove users group" msgstr "" @@ -2073,11 +2153,41 @@ msgid "Repositories administration" msgstr "" -#: rhodecode/templates/admin/repos_groups/repos_groups.html:8 -msgid "Groups" -msgstr "" - -#: rhodecode/templates/admin/repos_groups/repos_groups.html:12 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:73 +msgid "apply to children" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:74 +msgid "" +"Set or revoke permission to all children of that group, including " +"repositories and other groups" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_groups.html:9 +#: rhodecode/templates/base/base.html:122 rhodecode/templates/base/base.html:312 +#: rhodecode/templates/base/base.html:314 rhodecode/templates/base/base.html:316 +#: rhodecode/templates/bookmarks/bookmarks.html:11 +#: rhodecode/templates/branches/branches.html:10 +#: rhodecode/templates/changelog/changelog.html:10 +#: rhodecode/templates/changeset/changeset.html:10 +#: rhodecode/templates/changeset/changeset_range.html:9 +#: rhodecode/templates/compare/compare_diff.html:9 +#: rhodecode/templates/files/file_diff.html:8 +#: rhodecode/templates/files/files.html:8 +#: rhodecode/templates/files/files_add.html:15 +#: rhodecode/templates/files/files_edit.html:15 +#: rhodecode/templates/followers/followers.html:9 +#: rhodecode/templates/forks/fork.html:9 rhodecode/templates/forks/forks.html:9 +#: rhodecode/templates/pullrequests/pullrequest.html:8 +#: rhodecode/templates/pullrequests/pullrequest_show.html:8 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 +#: rhodecode/templates/settings/repo_settings.html:9 +#: rhodecode/templates/shortlog/shortlog.html:10 +#: rhodecode/templates/summary/summary.html:8 rhodecode/templates/tags/tags.html:11 +msgid "Home" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_groups.html:13 msgid "with" msgstr "" @@ -2103,7 +2213,7 @@ #: rhodecode/templates/admin/users/user_add.html:94 #: rhodecode/templates/admin/users_groups/users_group_add.html:49 #: rhodecode/templates/admin/users_groups/users_group_edit.html:90 -#: rhodecode/templates/pullrequests/pullrequest_show.html:113 +#: rhodecode/templates/pullrequests/pullrequest_show.html:131 msgid "save" msgstr "" @@ -2139,20 +2249,22 @@ msgid "action" msgstr "" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 -#: rhodecode/templates/admin/users/user_edit.html:255 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55 +#: rhodecode/templates/admin/users/user_edit.html:259 #: rhodecode/templates/admin/users_groups/users_groups.html:44 #: rhodecode/templates/data_table/_dt_elements.html:7 -#: rhodecode/templates/data_table/_dt_elements.html:103 +#: rhodecode/templates/data_table/_dt_elements.html:121 msgid "delete" msgstr "" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55 #, python-format -msgid "Confirm to delete this group: %s" -msgstr "" - -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:62 +msgid "Confirm to delete this group: %s with %s repository" +msgid_plural "Confirm to delete this group: %s with %s repositories" +msgstr[0] "" +msgstr[1] "" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:63 msgid "There are no repositories groups yet" msgstr "" @@ -2245,8 +2357,8 @@ msgstr "" #: rhodecode/templates/admin/settings/settings.html:112 -#: rhodecode/templates/admin/settings/settings.html:167 -#: rhodecode/templates/admin/settings/settings.html:257 +#: rhodecode/templates/admin/settings/settings.html:178 +#: rhodecode/templates/admin/settings/settings.html:268 msgid "Save settings" msgstr "" @@ -2254,124 +2366,133 @@ msgid "Visualisation settings" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:128 +#: rhodecode/templates/admin/settings/settings.html:127 +msgid "General" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:132 +msgid "Use lightweight dashboard" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:139 msgid "Icons" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:133 -msgid "Show public repo icon on repositories" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:137 -msgid "Show private repo icon on repositories" -msgstr "" - #: rhodecode/templates/admin/settings/settings.html:144 +msgid "Show public repo icon on repositories" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:148 +msgid "Show private repo icon on repositories" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:155 msgid "Meta-Tagging" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:149 +#: rhodecode/templates/admin/settings/settings.html:160 msgid "Stylify recognised metatags:" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:176 +#: rhodecode/templates/admin/settings/settings.html:187 msgid "VCS settings" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:185 +#: rhodecode/templates/admin/settings/settings.html:196 msgid "Web" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:190 +#: rhodecode/templates/admin/settings/settings.html:201 msgid "require ssl for vcs operations" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:192 -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:198 -msgid "Hooks" -msgstr "" - #: rhodecode/templates/admin/settings/settings.html:203 +msgid "" +"RhodeCode will require SSL for pushing or pulling. If SSL is missing it will " +"return HTTP Error 406: Not Acceptable" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:209 +msgid "Hooks" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:214 msgid "Update repository after push (hg update)" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:207 +#: rhodecode/templates/admin/settings/settings.html:218 msgid "Show repository size after push" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:211 +#: rhodecode/templates/admin/settings/settings.html:222 msgid "Log user push commands" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:215 +#: rhodecode/templates/admin/settings/settings.html:226 msgid "Log user pull commands" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:219 +#: rhodecode/templates/admin/settings/settings.html:230 msgid "advanced setup" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:224 -msgid "Mercurial Extensions" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:229 -msgid "largefiles extensions" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:233 -msgid "hgsubversion extensions" -msgstr "" - #: rhodecode/templates/admin/settings/settings.html:235 +msgid "Mercurial Extensions" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:240 +msgid "largefiles extensions" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:244 +msgid "hgsubversion extensions" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:246 msgid "" "Requires hgsubversion library installed. Allows clonning from svn remote " "locations" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:245 +#: rhodecode/templates/admin/settings/settings.html:256 msgid "Repositories location" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:250 +#: rhodecode/templates/admin/settings/settings.html:261 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:251 +#: rhodecode/templates/admin/settings/settings.html:262 +#: rhodecode/templates/base/base.html:221 msgid "unlock" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:252 +#: rhodecode/templates/admin/settings/settings.html:263 msgid "" "Location where repositories are stored. After changing this value a restart, " "and rescan is required" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:272 +#: rhodecode/templates/admin/settings/settings.html:283 msgid "Test Email" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:280 +#: rhodecode/templates/admin/settings/settings.html:291 msgid "Email to" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:288 +#: rhodecode/templates/admin/settings/settings.html:299 msgid "Send" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:294 +#: rhodecode/templates/admin/settings/settings.html:305 msgid "System Info and Packages" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:297 +#: rhodecode/templates/admin/settings/settings.html:308 msgid "show" msgstr "" @@ -2392,13 +2513,6 @@ msgid "Password confirmation" msgstr "" -#: rhodecode/templates/admin/users/user_add.html:86 -#: rhodecode/templates/admin/users/user_edit.html:113 -#: rhodecode/templates/admin/users_groups/users_group_add.html:41 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:42 -msgid "Active" -msgstr "" - #: rhodecode/templates/admin/users/user_edit.html:5 msgid "Edit user" msgstr "" @@ -2418,26 +2532,26 @@ msgid "API key" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:59 +#: rhodecode/templates/admin/users/user_edit.html:63 msgid "LDAP DN" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:68 +#: rhodecode/templates/admin/users/user_edit.html:72 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:35 msgid "New password" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:77 +#: rhodecode/templates/admin/users/user_edit.html:81 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:44 msgid "New password confirmation" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:147 +#: rhodecode/templates/admin/users/user_edit.html:151 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108 msgid "Inherit default permissions" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:152 +#: rhodecode/templates/admin/users/user_edit.html:156 #: rhodecode/templates/admin/users_groups/users_group_edit.html:113 #, python-format msgid "" @@ -2445,46 +2559,48 @@ "options does not have any action" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:158 +#: rhodecode/templates/admin/users/user_edit.html:162 #: rhodecode/templates/admin/users_groups/users_group_edit.html:119 msgid "Create repositories" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:166 +#: rhodecode/templates/admin/users/user_edit.html:170 #: rhodecode/templates/admin/users_groups/users_group_edit.html:127 msgid "Fork repositories" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:186 +#: rhodecode/templates/admin/users/user_edit.html:190 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39 msgid "Nothing here yet" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:193 +#: rhodecode/templates/admin/users/user_edit.html:197 #: rhodecode/templates/admin/users/user_edit_my_account.html:60 -#: rhodecode/templates/admin/users/user_edit_my_account.html:194 +#: rhodecode/templates/admin/users/user_edit_my_account.html:217 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:185 msgid "Permission" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:194 +#: rhodecode/templates/admin/users/user_edit.html:198 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:186 msgid "Edit Permission" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:243 +#: rhodecode/templates/admin/users/user_edit.html:247 msgid "Email addresses" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:256 +#: rhodecode/templates/admin/users/user_edit.html:260 #, python-format msgid "Confirm to delete this email: %s" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:270 +#: rhodecode/templates/admin/users/user_edit.html:274 msgid "New email address" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:277 +#: rhodecode/templates/admin/users/user_edit.html:281 msgid "Add" msgstr "" @@ -2540,30 +2656,32 @@ #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:7 #: rhodecode/templates/bookmarks/bookmarks.html:40 #: rhodecode/templates/bookmarks/bookmarks_data.html:9 -#: rhodecode/templates/branches/branches.html:55 -#: rhodecode/templates/journal/journal.html:60 -#: rhodecode/templates/tags/tags.html:40 rhodecode/templates/tags/tags_data.html:9 +#: rhodecode/templates/branches/branches.html:54 +#: rhodecode/templates/branches/branches_data.html:9 +#: rhodecode/templates/journal/journal_page_repos.html:8 +#: rhodecode/templates/tags/tags.html:55 rhodecode/templates/tags/tags_data.html:9 msgid "Revision" msgstr "" #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28 -#: rhodecode/templates/journal/journal.html:81 +#: rhodecode/templates/journal/journal_page_repos.html:29 msgid "private" msgstr "" #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:31 #: rhodecode/templates/data_table/_dt_elements.html:7 +#: rhodecode/templates/journal/journal_page_repos.html:32 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:38 -#: rhodecode/templates/journal/journal.html:94 +#: rhodecode/templates/journal/journal_page_repos.html:42 msgid "No repositories yet" msgstr "" #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:40 -#: rhodecode/templates/journal/journal.html:96 +#: rhodecode/templates/journal/journal_page_repos.html:44 msgid "create one now" msgstr "" @@ -2572,7 +2690,7 @@ msgstr "" #: rhodecode/templates/admin/users/users.html:9 -#: rhodecode/templates/base/base.html:223 +#: rhodecode/templates/base/base.html:235 msgid "users" msgstr "" @@ -2602,7 +2720,7 @@ msgstr "" #: rhodecode/templates/admin/users/users.html:86 -#: rhodecode/templates/base/base.html:226 +#: rhodecode/templates/base/base.html:238 msgid "ldap" msgstr "" @@ -2651,6 +2769,18 @@ msgid "Group members" msgstr "" +#: rhodecode/templates/admin/users_groups/users_group_edit.html:163 +msgid "No members yet" +msgstr "" + +#: rhodecode/templates/admin/users_groups/users_group_edit.html:171 +msgid "Permissions defined for this group" +msgstr "" + +#: rhodecode/templates/admin/users_groups/users_group_edit.html:178 +msgid "No permissions set yet" +msgstr "" + #: rhodecode/templates/admin/users_groups/users_groups.html:5 msgid "Users groups administration" msgstr "" @@ -2693,31 +2823,8 @@ msgid "Inbox" msgstr "" -#: rhodecode/templates/base/base.html:122 rhodecode/templates/base/base.html:300 -#: rhodecode/templates/base/base.html:302 rhodecode/templates/base/base.html:304 -#: rhodecode/templates/bookmarks/bookmarks.html:11 -#: rhodecode/templates/branches/branches.html:10 -#: rhodecode/templates/changelog/changelog.html:10 -#: rhodecode/templates/changeset/changeset.html:10 -#: rhodecode/templates/changeset/changeset_range.html:9 -#: rhodecode/templates/compare/compare_diff.html:9 -#: rhodecode/templates/files/file_diff.html:8 -#: rhodecode/templates/files/files.html:8 -#: rhodecode/templates/files/files_add.html:15 -#: rhodecode/templates/files/files_edit.html:15 -#: rhodecode/templates/followers/followers.html:9 -#: rhodecode/templates/forks/fork.html:9 rhodecode/templates/forks/forks.html:9 -#: rhodecode/templates/pullrequests/pullrequest.html:8 -#: rhodecode/templates/pullrequests/pullrequest_show.html:8 -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 -#: rhodecode/templates/settings/repo_settings.html:9 -#: rhodecode/templates/shortlog/shortlog.html:10 -#: rhodecode/templates/summary/summary.html:8 rhodecode/templates/tags/tags.html:11 -msgid "Home" -msgstr "" - -#: rhodecode/templates/base/base.html:123 rhodecode/templates/base/base.html:309 -#: rhodecode/templates/base/base.html:311 rhodecode/templates/base/base.html:313 +#: rhodecode/templates/base/base.html:123 rhodecode/templates/base/base.html:321 +#: rhodecode/templates/base/base.html:323 rhodecode/templates/base/base.html:325 #: rhodecode/templates/journal/journal.html:4 #: rhodecode/templates/journal/journal.html:21 #: rhodecode/templates/journal/public_journal.html:4 @@ -2737,6 +2844,7 @@ msgstr "" #: rhodecode/templates/base/base.html:152 rhodecode/templates/base/base.html:182 +#: rhodecode/templates/base/root.html:47 msgid "loading..." msgstr "" @@ -2775,47 +2883,59 @@ msgstr "" #: rhodecode/templates/base/base.html:204 rhodecode/templates/base/base.html:206 -#: rhodecode/templates/base/base.html:227 -msgid "settings" -msgstr "" - -#: rhodecode/templates/base/base.html:209 +msgid "repository settings" +msgstr "" + +#: rhodecode/templates/base/base.html:210 #: rhodecode/templates/data_table/_dt_elements.html:80 #: rhodecode/templates/forks/fork.html:13 msgid "fork" msgstr "" -#: rhodecode/templates/base/base.html:211 -#: rhodecode/templates/changelog/changelog.html:40 +#: rhodecode/templates/base/base.html:212 rhodecode/templates/base/root.html:50 +#: rhodecode/templates/changelog/changelog.html:43 msgid "Open new pull request" msgstr "" -#: rhodecode/templates/base/base.html:213 +#: rhodecode/templates/base/base.html:215 +#: rhodecode/templates/forks/forks_data.html:21 +msgid "Compare fork" +msgstr "" + +#: rhodecode/templates/base/base.html:217 msgid "search" msgstr "" -#: rhodecode/templates/base/base.html:222 +#: rhodecode/templates/base/base.html:223 +msgid "lock" +msgstr "" + +#: rhodecode/templates/base/base.html:234 msgid "repositories groups" msgstr "" -#: rhodecode/templates/base/base.html:224 +#: rhodecode/templates/base/base.html:236 msgid "users groups" msgstr "" -#: rhodecode/templates/base/base.html:225 +#: rhodecode/templates/base/base.html:237 msgid "permissions" msgstr "" -#: rhodecode/templates/base/base.html:238 rhodecode/templates/base/base.html:240 +#: rhodecode/templates/base/base.html:239 +msgid "settings" +msgstr "" + +#: rhodecode/templates/base/base.html:250 rhodecode/templates/base/base.html:252 msgid "Followers" msgstr "" -#: rhodecode/templates/base/base.html:246 rhodecode/templates/base/base.html:248 +#: rhodecode/templates/base/base.html:258 rhodecode/templates/base/base.html:260 msgid "Forks" msgstr "" -#: rhodecode/templates/base/base.html:327 rhodecode/templates/base/base.html:329 -#: rhodecode/templates/base/base.html:331 rhodecode/templates/search/search.html:52 +#: rhodecode/templates/base/base.html:339 rhodecode/templates/base/base.html:341 +#: rhodecode/templates/base/base.html:343 rhodecode/templates/search/search.html:52 msgid "Search" msgstr "" @@ -2824,7 +2944,7 @@ msgstr "" #: rhodecode/templates/base/root.html:43 -#: rhodecode/templates/journal/journal.html:120 +#: rhodecode/templates/journal/journal.html:75 #: rhodecode/templates/summary/summary.html:57 msgid "Stop following this repository" msgstr "" @@ -2838,14 +2958,26 @@ msgid "Group" msgstr "" -#: rhodecode/templates/base/root.html:47 +#: rhodecode/templates/base/root.html:48 msgid "search truncated" msgstr "" -#: rhodecode/templates/base/root.html:48 +#: rhodecode/templates/base/root.html:49 msgid "no matching files" msgstr "" +#: rhodecode/templates/base/root.html:51 +msgid "Open new pull request for selected changesets" +msgstr "" + +#: rhodecode/templates/base/root.html:52 +msgid "Show selected changes __S -> __E" +msgstr "" + +#: rhodecode/templates/base/root.html:53 +msgid "Selection link" +msgstr "" + #: rhodecode/templates/bookmarks/bookmarks.html:5 #, python-format msgid "%s Bookmarks" @@ -2853,8 +2985,9 @@ #: rhodecode/templates/bookmarks/bookmarks.html:39 #: rhodecode/templates/bookmarks/bookmarks_data.html:8 -#: rhodecode/templates/branches/branches.html:54 -#: rhodecode/templates/tags/tags.html:39 rhodecode/templates/tags/tags_data.html:8 +#: rhodecode/templates/branches/branches.html:53 +#: rhodecode/templates/branches/branches_data.html:8 +#: rhodecode/templates/tags/tags.html:54 rhodecode/templates/tags/tags_data.html:8 msgid "Author" msgstr "" @@ -2867,34 +3000,14 @@ msgid "Compare branches" msgstr "" -#: rhodecode/templates/branches/branches.html:57 +#: rhodecode/templates/branches/branches.html:56 +#: rhodecode/templates/branches/branches_data.html:10 #: rhodecode/templates/compare/compare_diff.html:5 #: rhodecode/templates/compare/compare_diff.html:13 +#: rhodecode/templates/tags/tags.html:57 rhodecode/templates/tags/tags_data.html:10 msgid "Compare" msgstr "" -#: rhodecode/templates/branches/branches_data.html:6 -msgid "name" -msgstr "" - -#: rhodecode/templates/branches/branches_data.html:7 -msgid "date" -msgstr "" - -#: rhodecode/templates/branches/branches_data.html:8 -#: rhodecode/templates/shortlog/shortlog_data.html:8 -msgid "author" -msgstr "" - -#: rhodecode/templates/branches/branches_data.html:9 -#: rhodecode/templates/shortlog/shortlog_data.html:5 -msgid "revision" -msgstr "" - -#: rhodecode/templates/branches/branches_data.html:10 -msgid "compare" -msgstr "" - #: rhodecode/templates/changelog/changelog.html:6 #, python-format msgid "%s Changelog" @@ -2908,57 +3021,63 @@ msgstr[1] "" #: rhodecode/templates/changelog/changelog.html:37 +msgid "Clear selection" +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:40 #: rhodecode/templates/forks/forks_data.html:19 #, python-format msgid "compare fork with %s" msgstr "" -#: rhodecode/templates/changelog/changelog.html:37 -#: rhodecode/templates/forks/forks_data.html:21 -msgid "Compare fork" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:46 +#: rhodecode/templates/changelog/changelog.html:40 +msgid "Compare fork with parent" +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:49 msgid "Show" msgstr "" -#: rhodecode/templates/changelog/changelog.html:72 -#: rhodecode/templates/summary/summary.html:364 +#: rhodecode/templates/changelog/changelog.html:74 +#: rhodecode/templates/summary/summary.html:375 msgid "show more" msgstr "" -#: rhodecode/templates/changelog/changelog.html:76 +#: rhodecode/templates/changelog/changelog.html:78 msgid "Affected number of files, click to show more details" msgstr "" -#: rhodecode/templates/changelog/changelog.html:89 -#: rhodecode/templates/changeset/changeset.html:38 +#: rhodecode/templates/changelog/changelog.html:91 +#: rhodecode/templates/changeset/changeset.html:44 #: rhodecode/templates/changeset/changeset_file_comment.html:20 #: rhodecode/templates/changeset/changeset_range.html:46 msgid "Changeset status" msgstr "" -#: rhodecode/templates/changelog/changelog.html:92 +#: rhodecode/templates/changelog/changelog.html:94 +#: rhodecode/templates/shortlog/shortlog_data.html:20 msgid "Click to open associated pull request" msgstr "" -#: rhodecode/templates/changelog/changelog.html:102 -#: rhodecode/templates/changeset/changeset.html:78 +#: rhodecode/templates/changelog/changelog.html:104 +#: rhodecode/templates/changeset/changeset.html:85 msgid "Parent" msgstr "" -#: rhodecode/templates/changelog/changelog.html:108 -#: rhodecode/templates/changeset/changeset.html:84 +#: rhodecode/templates/changelog/changelog.html:110 +#: rhodecode/templates/changeset/changeset.html:91 msgid "No parents" msgstr "" -#: rhodecode/templates/changelog/changelog.html:113 -#: rhodecode/templates/changeset/changeset.html:88 +#: rhodecode/templates/changelog/changelog.html:115 +#: rhodecode/templates/changeset/changeset.html:95 +#: rhodecode/templates/changeset/changeset_range.html:79 msgid "merge" msgstr "" -#: rhodecode/templates/changelog/changelog.html:116 -#: rhodecode/templates/changeset/changeset.html:91 +#: rhodecode/templates/changelog/changelog.html:118 +#: rhodecode/templates/changeset/changeset.html:98 +#: rhodecode/templates/changeset/changeset_range.html:82 #: rhodecode/templates/files/files.html:29 #: rhodecode/templates/files/files_add.html:33 #: rhodecode/templates/files/files_edit.html:33 @@ -2966,44 +3085,42 @@ msgid "branch" msgstr "" -#: rhodecode/templates/changelog/changelog.html:122 +#: rhodecode/templates/changelog/changelog.html:124 +#: rhodecode/templates/changeset/changeset_range.html:88 msgid "bookmark" msgstr "" -#: rhodecode/templates/changelog/changelog.html:128 -#: rhodecode/templates/changeset/changeset.html:96 +#: rhodecode/templates/changelog/changelog.html:130 +#: rhodecode/templates/changeset/changeset.html:103 +#: rhodecode/templates/changeset/changeset_range.html:94 msgid "tag" msgstr "" -#: rhodecode/templates/changelog/changelog.html:164 -msgid "Show selected changes __S -> __E" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:255 +#: rhodecode/templates/changelog/changelog.html:301 msgid "There are no changes yet" msgstr "" #: rhodecode/templates/changelog/changelog_details.html:4 -#: rhodecode/templates/changeset/changeset.html:66 +#: rhodecode/templates/changeset/changeset.html:73 msgid "removed" msgstr "" #: rhodecode/templates/changelog/changelog_details.html:5 -#: rhodecode/templates/changeset/changeset.html:67 +#: rhodecode/templates/changeset/changeset.html:74 msgid "changed" msgstr "" #: rhodecode/templates/changelog/changelog_details.html:6 -#: rhodecode/templates/changeset/changeset.html:68 +#: rhodecode/templates/changeset/changeset.html:75 msgid "added" msgstr "" #: rhodecode/templates/changelog/changelog_details.html:8 #: rhodecode/templates/changelog/changelog_details.html:9 #: rhodecode/templates/changelog/changelog_details.html:10 -#: rhodecode/templates/changeset/changeset.html:70 -#: rhodecode/templates/changeset/changeset.html:71 -#: rhodecode/templates/changeset/changeset.html:72 +#: rhodecode/templates/changeset/changeset.html:77 +#: rhodecode/templates/changeset/changeset.html:78 +#: rhodecode/templates/changeset/changeset.html:79 #, python-format msgid "affected %s files" msgstr "" @@ -3017,17 +3134,21 @@ msgid "Changeset" msgstr "" -#: rhodecode/templates/changeset/changeset.html:43 +#: rhodecode/templates/changeset/changeset.html:49 #: rhodecode/templates/changeset/diff_block.html:20 msgid "raw diff" msgstr "" -#: rhodecode/templates/changeset/changeset.html:44 +#: rhodecode/templates/changeset/changeset.html:50 +msgid "patch diff" +msgstr "" + +#: rhodecode/templates/changeset/changeset.html:51 #: rhodecode/templates/changeset/diff_block.html:21 msgid "download diff" msgstr "" -#: rhodecode/templates/changeset/changeset.html:48 +#: rhodecode/templates/changeset/changeset.html:55 #: rhodecode/templates/changeset/changeset_file_comment.html:82 #, python-format msgid "%d comment" @@ -3035,7 +3156,7 @@ msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/changeset/changeset.html:48 +#: rhodecode/templates/changeset/changeset.html:55 #: rhodecode/templates/changeset/changeset_file_comment.html:82 #, python-format msgid "(%d inline)" @@ -3043,14 +3164,23 @@ msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/changeset/changeset.html:103 +#: rhodecode/templates/changeset/changeset.html:111 +#: rhodecode/templates/compare/compare_diff.html:44 +#: rhodecode/templates/pullrequests/pullrequest_show.html:76 #, python-format -msgid "%s files affected with %s insertions and %s deletions:" -msgstr "" - -#: rhodecode/templates/changeset/changeset.html:119 -msgid "Changeset was too big and was cut off..." -msgstr "" +msgid "%s file changed" +msgid_plural "%s files changed" +msgstr[0] "" +msgstr[1] "" + +#: rhodecode/templates/changeset/changeset.html:113 +#: rhodecode/templates/compare/compare_diff.html:46 +#: rhodecode/templates/pullrequests/pullrequest_show.html:78 +#, python-format +msgid "%s file changed with %s insertions and %s deletions" +msgid_plural "%s files changed with %s insertions and %s deletions" +msgstr[0] "" +msgstr[1] "" #: rhodecode/templates/changeset/changeset_file_comment.html:42 msgid "Submitting..." @@ -3115,14 +3245,16 @@ msgid "Compare View" msgstr "" +#: rhodecode/templates/changeset/changeset_range.html:29 +msgid "Show combined compare" +msgstr "" + #: rhodecode/templates/changeset/changeset_range.html:54 -#: rhodecode/templates/compare/compare_diff.html:41 -#: rhodecode/templates/pullrequests/pullrequest_show.html:69 msgid "Files affected" msgstr "" #: rhodecode/templates/changeset/diff_block.html:19 -msgid "diff" +msgid "show full diff for this file" msgstr "" #: rhodecode/templates/changeset/diff_block.html:27 @@ -3134,7 +3266,16 @@ msgstr "" #: rhodecode/templates/compare/compare_diff.html:37 -msgid "Outgoing changesets" +#: rhodecode/templates/pullrequests/pullrequest_show.html:69 +#, python-format +msgid "Showing %s commit" +msgid_plural "Showing %s commits" +msgstr[0] "" +msgstr[1] "" + +#: rhodecode/templates/compare/compare_diff.html:52 +#: rhodecode/templates/pullrequests/pullrequest_show.html:84 +msgid "No files" msgstr "" #: rhodecode/templates/data_table/_dt_elements.html:39 @@ -3144,40 +3285,52 @@ msgstr "" #: rhodecode/templates/data_table/_dt_elements.html:60 -#: rhodecode/templates/journal/journal.html:126 -#: rhodecode/templates/summary/summary.html:68 +#: rhodecode/templates/journal/journal.html:81 +#: rhodecode/templates/summary/summary.html:77 msgid "Mercurial repository" msgstr "" #: rhodecode/templates/data_table/_dt_elements.html:62 -#: rhodecode/templates/journal/journal.html:128 -#: rhodecode/templates/summary/summary.html:71 +#: rhodecode/templates/journal/journal.html:83 +#: rhodecode/templates/summary/summary.html:80 msgid "Git repository" msgstr "" #: rhodecode/templates/data_table/_dt_elements.html:69 -#: rhodecode/templates/journal/journal.html:134 -#: rhodecode/templates/summary/summary.html:78 +#: rhodecode/templates/journal/journal.html:89 +#: rhodecode/templates/summary/summary.html:87 msgid "public repository" msgstr "" #: rhodecode/templates/data_table/_dt_elements.html:80 -#: rhodecode/templates/summary/summary.html:87 -#: rhodecode/templates/summary/summary.html:88 +#: rhodecode/templates/summary/summary.html:96 +#: rhodecode/templates/summary/summary.html:97 msgid "Fork of" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.html:92 +#: rhodecode/templates/data_table/_dt_elements.html:94 msgid "No changesets yet" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.html:104 +#: rhodecode/templates/data_table/_dt_elements.html:101 +#: rhodecode/templates/data_table/_dt_elements.html:103 +#, python-format +msgid "Subscribe to %s rss feed" +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.html:109 +#: rhodecode/templates/data_table/_dt_elements.html:111 +#, python-format +msgid "Subscribe to %s atom feed" +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.html:122 #, python-format msgid "Confirm to delete this user: %s" msgstr "" #: rhodecode/templates/email_templates/main.html:8 -msgid "This is an notification from RhodeCode." +msgid "This is a notification from RhodeCode." msgstr "" #: rhodecode/templates/errors/error_document.html:46 @@ -3194,13 +3347,13 @@ msgid "File diff" msgstr "" -#: rhodecode/templates/files/files.html:4 rhodecode/templates/files/files.html:72 +#: rhodecode/templates/files/files.html:4 rhodecode/templates/files/files.html:74 #, python-format msgid "%s files" msgstr "" #: rhodecode/templates/files/files.html:12 -#: rhodecode/templates/summary/summary.html:340 +#: rhodecode/templates/summary/summary.html:351 msgid "files" msgstr "" @@ -3278,7 +3431,7 @@ msgstr "" #: rhodecode/templates/files/files_browser.html:31 -#: rhodecode/templates/shortlog/shortlog_data.html:65 +#: rhodecode/templates/shortlog/shortlog_data.html:80 msgid "add new file" msgstr "" @@ -3311,18 +3464,18 @@ msgstr "" #: rhodecode/templates/files/files_edit.html:49 -#: rhodecode/templates/files/files_source.html:38 +#: rhodecode/templates/files/files_source.html:23 msgid "show annotation" msgstr "" #: rhodecode/templates/files/files_edit.html:50 -#: rhodecode/templates/files/files_source.html:40 -#: rhodecode/templates/files/files_source.html:68 +#: rhodecode/templates/files/files_source.html:25 +#: rhodecode/templates/files/files_source.html:53 msgid "show as raw" msgstr "" #: rhodecode/templates/files/files_edit.html:51 -#: rhodecode/templates/files/files_source.html:41 +#: rhodecode/templates/files/files_source.html:26 msgid "download as raw" msgstr "" @@ -3334,42 +3487,42 @@ msgid "Editing file" msgstr "" -#: rhodecode/templates/files/files_source.html:2 +#: rhodecode/templates/files/files_history_box.html:2 msgid "History" msgstr "" -#: rhodecode/templates/files/files_source.html:9 +#: rhodecode/templates/files/files_history_box.html:9 msgid "diff to revision" msgstr "" -#: rhodecode/templates/files/files_source.html:10 +#: rhodecode/templates/files/files_history_box.html:10 msgid "show at revision" msgstr "" -#: rhodecode/templates/files/files_source.html:14 +#: rhodecode/templates/files/files_history_box.html:15 #, python-format msgid "%s author" msgid_plural "%s authors" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/files/files_source.html:36 +#: rhodecode/templates/files/files_source.html:6 +msgid "Load file history" +msgstr "" + +#: rhodecode/templates/files/files_source.html:21 msgid "show source" msgstr "" -#: rhodecode/templates/files/files_source.html:59 +#: rhodecode/templates/files/files_source.html:44 #, python-format msgid "Binary file (%s)" msgstr "" -#: rhodecode/templates/files/files_source.html:68 +#: rhodecode/templates/files/files_source.html:53 msgid "File is too big to display" msgstr "" -#: rhodecode/templates/files/files_source.html:124 -msgid "Selection link" -msgstr "" - #: rhodecode/templates/files/files_ypjax.html:5 msgid "annotation" msgstr "" @@ -3441,7 +3594,7 @@ msgid "forked" msgstr "" -#: rhodecode/templates/forks/forks_data.html:38 +#: rhodecode/templates/forks/forks_data.html:42 msgid "There are no forks yet" msgstr "" @@ -3454,7 +3607,7 @@ msgstr "" #: rhodecode/templates/journal/journal.html:24 -#: rhodecode/templates/pullrequests/pullrequest.html:27 +#: rhodecode/templates/pullrequests/pullrequest.html:55 msgid "Refresh" msgstr "" @@ -3476,19 +3629,19 @@ msgid "ADD" msgstr "" -#: rhodecode/templates/journal/journal.html:114 +#: rhodecode/templates/journal/journal.html:69 msgid "following user" msgstr "" -#: rhodecode/templates/journal/journal.html:114 +#: rhodecode/templates/journal/journal.html:69 msgid "user" msgstr "" -#: rhodecode/templates/journal/journal.html:147 +#: rhodecode/templates/journal/journal.html:102 msgid "You are not following any users or repositories" msgstr "" -#: rhodecode/templates/journal/journal_data.html:47 +#: rhodecode/templates/journal/journal_data.html:51 msgid "No entries yet" msgstr "" @@ -3509,7 +3662,7 @@ msgid "New pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:28 +#: rhodecode/templates/pullrequests/pullrequest.html:54 msgid "refresh overview" msgstr "" @@ -3518,17 +3671,17 @@ msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:70 -#: rhodecode/templates/pullrequests/pullrequest_show.html:82 +#: rhodecode/templates/pullrequests/pullrequest_show.html:100 msgid "Pull request reviewers" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:79 -#: rhodecode/templates/pullrequests/pullrequest_show.html:94 +#: rhodecode/templates/pullrequests/pullrequest_show.html:112 msgid "owner" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:91 -#: rhodecode/templates/pullrequests/pullrequest_show.html:109 +#: rhodecode/templates/pullrequests/pullrequest_show.html:127 msgid "Add reviewer to this pull request." msgstr "" @@ -3555,6 +3708,11 @@ msgid "Closed %s" msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_show.html:23 +#, python-format +msgid "with status %s" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_show.html:31 msgid "Status" msgstr "" @@ -3567,23 +3725,23 @@ msgid "Still not reviewed by" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:47 +#: rhodecode/templates/pullrequests/pullrequest_show.html:48 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:54 +#: rhodecode/templates/pullrequests/pullrequest_show.html:50 +msgid "pull request was reviewed by all reviewers" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:58 msgid "Created on" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:61 -msgid "Compare view" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.html:65 -msgid "Incoming changesets" +msgid "Compare view" msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 @@ -3659,23 +3817,31 @@ msgid "shortlog" msgstr "" +#: rhodecode/templates/shortlog/shortlog_data.html:5 +msgid "revision" +msgstr "" + #: rhodecode/templates/shortlog/shortlog_data.html:7 msgid "age" msgstr "" -#: rhodecode/templates/shortlog/shortlog_data.html:18 +#: rhodecode/templates/shortlog/shortlog_data.html:8 +msgid "author" +msgstr "" + +#: rhodecode/templates/shortlog/shortlog_data.html:33 msgid "No commit message" msgstr "" -#: rhodecode/templates/shortlog/shortlog_data.html:62 +#: rhodecode/templates/shortlog/shortlog_data.html:77 msgid "Add or upload files directly via RhodeCode" msgstr "" -#: rhodecode/templates/shortlog/shortlog_data.html:71 +#: rhodecode/templates/shortlog/shortlog_data.html:86 msgid "Push new repo" msgstr "" -#: rhodecode/templates/shortlog/shortlog_data.html:79 +#: rhodecode/templates/shortlog/shortlog_data.html:94 msgid "Existing repository?" msgstr "" @@ -3703,128 +3869,137 @@ msgid "ATOM" msgstr "" -#: rhodecode/templates/summary/summary.html:82 +#: rhodecode/templates/summary/summary.html:70 +#, python-format +msgid "Repository locked by %s" +msgstr "" + +#: rhodecode/templates/summary/summary.html:72 +msgid "Repository unlocked" +msgstr "" + +#: rhodecode/templates/summary/summary.html:91 #, python-format msgid "Non changable ID %s" msgstr "" -#: rhodecode/templates/summary/summary.html:87 +#: rhodecode/templates/summary/summary.html:96 msgid "public" msgstr "" -#: rhodecode/templates/summary/summary.html:95 +#: rhodecode/templates/summary/summary.html:104 msgid "remote clone" msgstr "" -#: rhodecode/templates/summary/summary.html:116 +#: rhodecode/templates/summary/summary.html:125 msgid "Contact" msgstr "" -#: rhodecode/templates/summary/summary.html:130 +#: rhodecode/templates/summary/summary.html:139 msgid "Clone url" msgstr "" -#: rhodecode/templates/summary/summary.html:133 -msgid "Show by Name" -msgstr "" - -#: rhodecode/templates/summary/summary.html:134 -msgid "Show by ID" -msgstr "" - #: rhodecode/templates/summary/summary.html:142 +msgid "Show by Name" +msgstr "" + +#: rhodecode/templates/summary/summary.html:143 +msgid "Show by ID" +msgstr "" + +#: rhodecode/templates/summary/summary.html:151 msgid "Trending files" msgstr "" -#: rhodecode/templates/summary/summary.html:150 -#: rhodecode/templates/summary/summary.html:166 -#: rhodecode/templates/summary/summary.html:194 +#: rhodecode/templates/summary/summary.html:159 +#: rhodecode/templates/summary/summary.html:175 +#: rhodecode/templates/summary/summary.html:203 msgid "enable" msgstr "" -#: rhodecode/templates/summary/summary.html:158 +#: rhodecode/templates/summary/summary.html:167 msgid "Download" msgstr "" -#: rhodecode/templates/summary/summary.html:162 +#: rhodecode/templates/summary/summary.html:171 msgid "There are no downloads yet" msgstr "" -#: rhodecode/templates/summary/summary.html:164 -msgid "Downloads are disabled for this repository" -msgstr "" - -#: rhodecode/templates/summary/summary.html:170 -msgid "Download as zip" -msgstr "" - -#: rhodecode/templates/summary/summary.html:173 -msgid "Check this to download archive with subrepos" -msgstr "" - #: rhodecode/templates/summary/summary.html:173 +msgid "Downloads are disabled for this repository" +msgstr "" + +#: rhodecode/templates/summary/summary.html:179 +msgid "Download as zip" +msgstr "" + +#: rhodecode/templates/summary/summary.html:182 +msgid "Check this to download archive with subrepos" +msgstr "" + +#: rhodecode/templates/summary/summary.html:182 msgid "with subrepos" msgstr "" -#: rhodecode/templates/summary/summary.html:186 +#: rhodecode/templates/summary/summary.html:195 msgid "Commit activity by day / author" msgstr "" -#: rhodecode/templates/summary/summary.html:197 +#: rhodecode/templates/summary/summary.html:206 msgid "Stats gathered: " msgstr "" -#: rhodecode/templates/summary/summary.html:218 +#: rhodecode/templates/summary/summary.html:227 msgid "Shortlog" msgstr "" -#: rhodecode/templates/summary/summary.html:220 +#: rhodecode/templates/summary/summary.html:229 msgid "Quick start" msgstr "" -#: rhodecode/templates/summary/summary.html:233 +#: rhodecode/templates/summary/summary.html:243 #, python-format msgid "Readme file at revision '%s'" msgstr "" -#: rhodecode/templates/summary/summary.html:236 +#: rhodecode/templates/summary/summary.html:246 msgid "Permalink to this readme" msgstr "" -#: rhodecode/templates/summary/summary.html:293 +#: rhodecode/templates/summary/summary.html:304 #, python-format msgid "Download %s as %s" msgstr "" -#: rhodecode/templates/summary/summary.html:650 +#: rhodecode/templates/summary/summary.html:661 msgid "commits" msgstr "" -#: rhodecode/templates/summary/summary.html:651 +#: rhodecode/templates/summary/summary.html:662 msgid "files added" msgstr "" -#: rhodecode/templates/summary/summary.html:652 +#: rhodecode/templates/summary/summary.html:663 msgid "files changed" msgstr "" -#: rhodecode/templates/summary/summary.html:653 +#: rhodecode/templates/summary/summary.html:664 msgid "files removed" msgstr "" -#: rhodecode/templates/summary/summary.html:656 +#: rhodecode/templates/summary/summary.html:667 msgid "commit" msgstr "" -#: rhodecode/templates/summary/summary.html:657 +#: rhodecode/templates/summary/summary.html:668 msgid "file added" msgstr "" -#: rhodecode/templates/summary/summary.html:658 +#: rhodecode/templates/summary/summary.html:669 msgid "file changed" msgstr "" -#: rhodecode/templates/summary/summary.html:659 +#: rhodecode/templates/summary/summary.html:670 msgid "file removed" msgstr "" @@ -3833,3 +4008,7 @@ msgid "%s Tags" msgstr "" +#: rhodecode/templates/tags/tags.html:29 +msgid "Compare tags" +msgstr "" +
--- a/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po Mon Nov 26 20:39:45 2012 +0100 +++ b/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po Tue Nov 27 20:56:57 2012 +0100 @@ -8,17 +8,15 @@ msgstr "" "Project-Id-Version: RhodeCode 1.4.4\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-11-26 14:41+0800\n" +"POT-Creation-Date: 2012-11-27 20:56+0100\n" "PO-Revision-Date: 2012-11-26 15:19+0800\n" "Last-Translator: xpol <xpolife@gmail.com>\n" "Language-Team: mikespook\n" -"Plural-Forms: nplurals=1; plural=0;\n" +"Plural-Forms: nplurals=1; plural=0\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -"X-Generator: Poedit 1.5.4\n" -"X-Poedit-Basepath: ../../../..\n" #: rhodecode/controllers/changelog.py:95 msgid "All Branches" @@ -40,14 +38,13 @@ #: rhodecode/controllers/changeset.py:315 #: rhodecode/controllers/pullrequests.py:411 #, python-format -#| msgid "Last change" msgid "Status change -> %s" msgstr "状态修改为%s" #: rhodecode/controllers/changeset.py:346 msgid "" -"Changing status on a changeset associated witha closed pull request is not " -"allowed" +"Changing status on a changeset associated witha closed pull request is " +"not allowed" msgstr "不允许修改已关闭拉取请求的修订集状态" #: rhodecode/controllers/compare.py:75 @@ -60,8 +57,7 @@ msgstr "主页" #: rhodecode/controllers/error.py:98 -msgid "" -"The request could not be understood by the server due to malformed syntax." +msgid "The request could not be understood by the server due to malformed syntax." msgstr "由于错误的语法，服务器无法对请求进行响应。" #: rhodecode/controllers/error.py:101 @@ -82,17 +78,17 @@ "fulfilling the request." msgstr "服务进入非预期的混乱状态，这会阻止它对请求进行响应。" -#: rhodecode/controllers/feed.py:51 +#: rhodecode/controllers/feed.py:52 #, python-format msgid "Changes on %s repository" msgstr "%s库的修改" -#: rhodecode/controllers/feed.py:52 +#: rhodecode/controllers/feed.py:53 #, python-format msgid "%s %s feed" msgstr "%s %s订阅" -#: rhodecode/controllers/feed.py:82 +#: rhodecode/controllers/feed.py:86 #: rhodecode/templates/changeset/changeset.html:126 #: rhodecode/templates/changeset/changeset.html:138 #: rhodecode/templates/compare/compare_diff.html:62 @@ -102,7 +98,7 @@ msgid "Changeset was too big and was cut off..." msgstr "修订集太大已被截断......" -#: rhodecode/controllers/feed.py:88 +#: rhodecode/controllers/feed.py:92 msgid "commited on" msgstr "提交于" @@ -187,20 +183,18 @@ #: rhodecode/controllers/forks.py:74 rhodecode/controllers/admin/repos.py:91 #, python-format msgid "" -"%s repository is not mapped to db perhaps it was created or renamed from the " -"filesystem please run the application again in order to rescan repositories" -msgstr "" -"版本库%s没有映射到数据库，可能是从文件系统创建或者重命名，请重启RhodeCode以重" -"新扫描版本库" +"%s repository is not mapped to db perhaps it was created or renamed from " +"the filesystem please run the application again in order to rescan " +"repositories" +msgstr "版本库%s没有映射到数据库，可能是从文件系统创建或者重命名，请重启RhodeCode以重新扫描版本库" #: rhodecode/controllers/forks.py:134 rhodecode/controllers/settings.py:73 #, python-format msgid "" -"%s repository is not mapped to db perhaps it was created or renamed from the " -"file system please run the application again in order to rescan repositories" -msgstr "" -" 版本库%s没有映射到数据库，可能是从文件系统创建或者重命名，请重启RhodeCode以" -"重新扫描版本库" +"%s repository is not mapped to db perhaps it was created or renamed from " +"the file system please run the application again in order to rescan " +"repositories" +msgstr " 版本库%s没有映射到数据库，可能是从文件系统创建或者重命名，请重启RhodeCode以重新扫描版本库" #: rhodecode/controllers/forks.py:168 #, python-format @@ -231,7 +225,8 @@ #: rhodecode/controllers/login.py:184 msgid "" -"Your password reset was successful, new password has been sent to your email" +"Your password reset was successful, new password has been sent to your " +"email" msgstr "密码已经成功重置，新密码已经发送到你的邮箱" #: rhodecode/controllers/pullrequests.py:78 rhodecode/model/scm.py:556 @@ -286,11 +281,10 @@ #: rhodecode/controllers/admin/repos.py:303 #, python-format msgid "" -"%s repository is not mapped to db perhaps it was moved or renamed from the " -"filesystem please run the application again in order to rescan repositories" -msgstr "" -"版本库%s没有映射到数据库，可能是从文件系统创建或者重命名，请重启RhodeCode以重" -"新扫描版本库" +"%s repository is not mapped to db perhaps it was moved or renamed from " +"the filesystem please run the application again in order to rescan " +"repositories" +msgstr "版本库%s没有映射到数据库，可能是从文件系统创建或者重命名，请重启RhodeCode以重新扫描版本库" #: rhodecode/controllers/settings.py:156 #: rhodecode/controllers/admin/repos.py:315 @@ -306,18 +300,15 @@ msgstr "在删除%s的时候发生错误" #: rhodecode/controllers/settings.py:179 -#| msgid "unlock" msgid "unlocked" msgstr "未锁" #: rhodecode/controllers/settings.py:182 -#| msgid "unlock" msgid "locked" msgstr "已锁" #: rhodecode/controllers/settings.py:184 #, python-format -#| msgid "forked %s repository as %s" msgid "Repository has been %s" msgstr "版本库已被%s" @@ -756,8 +747,7 @@ msgstr "二进制文件" #: rhodecode/lib/diffs.py:90 -msgid "" -"Changeset was too big and was cut off, use diff menu to display this diff" +msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "修订集因过大而被截断，可查看原始修订集作为替代" #: rhodecode/lib/diffs.py:100 @@ -779,13 +769,11 @@ #: rhodecode/lib/helpers.py:529 #, python-format -#| msgid "deleted repository %s" msgid "Deleted branch: %s" msgstr "已经删除分支%s" #: rhodecode/lib/helpers.py:532 #, python-format -#| msgid "created user %s" msgid "Created tag: %s" msgstr "创建标签%s" @@ -811,14 +799,12 @@ msgid "%s more" msgstr "%s个" -#: rhodecode/lib/helpers.py:616 -#: rhodecode/templates/changelog/changelog.html:51 +#: rhodecode/lib/helpers.py:616 rhodecode/templates/changelog/changelog.html:51 msgid "revisions" msgstr "修订" #: rhodecode/lib/helpers.py:640 #, python-format -#| msgid "fork name " msgid "fork name %s" msgstr "复刻名称%s" @@ -952,7 +938,6 @@ #: rhodecode/lib/utils2.py:424 #, python-format -#| msgid "on line %s" msgid "in %s" msgstr "%s" @@ -963,7 +948,6 @@ #: rhodecode/lib/utils2.py:428 #, python-format -#| msgid "%s and %s ago" msgid "in %s and %s" msgstr "%s零%s" @@ -1089,37 +1073,31 @@ #: rhodecode/model/notification.py:220 #, python-format -#| msgid "commented on commit" msgid "commented on commit at %(when)s" msgstr "在%(when)s评论了提交" #: rhodecode/model/notification.py:221 #, python-format -#| msgid "sent message" msgid "sent message at %(when)s" msgstr "在%(when)s发送信息" #: rhodecode/model/notification.py:222 #, python-format -#| msgid "mentioned you" msgid "mentioned you at %(when)s" msgstr "在%(when)s提到了你" #: rhodecode/model/notification.py:223 #, python-format -#| msgid "registered in RhodeCode" msgid "registered in RhodeCode at %(when)s" msgstr "在%(when)s注册到RhodeCode" #: rhodecode/model/notification.py:224 #, python-format -#| msgid "opened new pull request" msgid "opened new pull request at %(when)s" msgstr "在%(when)s创建新的拉取请求" #: rhodecode/model/notification.py:225 #, python-format -#| msgid "commented on pull request" msgid "commented on pull request at %(when)s" msgstr "在%(when)s评论了拉取请求" @@ -1148,10 +1126,9 @@ #: rhodecode/model/user.py:331 #, python-format msgid "" -"user \"%s\" still owns %s repositories and cannot be removed. Switch owners " -"or remove those repositories. %s" -msgstr "" -"由于用户 \"%s\" 拥有版本库%s因而无法删除，请修改版本库所有者或删除版本库。%s" +"user \"%s\" still owns %s repositories and cannot be removed. Switch " +"owners or remove those repositories. %s" +msgstr "由于用户 \"%s\" 拥有版本库%s因而无法删除，请修改版本库所有者或删除版本库。%s" #: rhodecode/model/validators.py:36 rhodecode/model/validators.py:37 msgid "Value cannot be an empty list" @@ -1169,10 +1146,9 @@ #: rhodecode/model/validators.py:87 msgid "" -"Username may only contain alphanumeric characters underscores, periods or " -"dashes and must begin with alphanumeric character" -msgstr "" -"只能使用字母、数字、下划线、小数点或减号作为用户名，且必须由数字或字母开头" +"Username may only contain alphanumeric characters underscores, periods or" +" dashes and must begin with alphanumeric character" +msgstr "只能使用字母、数字、下划线、小数点或减号作为用户名，且必须由数字或字母开头" #: rhodecode/model/validators.py:115 #, python-format @@ -1192,8 +1168,7 @@ msgid "" "users group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" -msgstr "" -"只能使用字母、数字、下划线、小数点或减号作为用户组名，且必须由数字或字母开头" +msgstr "只能使用字母、数字、下划线、小数点或减号作为用户组名，且必须由数字或字母开头" #: rhodecode/model/validators.py:175 msgid "Cannot assign this group as parent" @@ -1262,7 +1237,6 @@ msgstr "复刻版本库必须和父版本库类型相同" #: rhodecode/model/validators.py:473 -#| msgid "You don't have permission to view this page" msgid "You don't have permissions to create repository in this group" msgstr "没有在该版本库组中创建版本库的权限" @@ -1285,8 +1259,8 @@ #: rhodecode/model/validators.py:654 msgid "" -"The LDAP Login attribute of the CN must be specified - this is the name of " -"the attribute that is equivalent to \"username\"" +"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:673 @@ -1804,10 +1778,9 @@ #: rhodecode/templates/admin/permissions/permissions.html:49 msgid "" "All default permissions on each repository will be reset to choosen " -"permission, note that all custom default permission on repositories will be " -"lost" -msgstr "" -"所有版本库的默认权限将被重置到选择的权限，所有版本库的自定义权限将被丢弃" +"permission, note that all custom default permission on repositories will " +"be lost" +msgstr "所有版本库的默认权限将被重置到选择的权限，所有版本库的自定义权限将被丢弃" #: rhodecode/templates/admin/permissions/permissions.html:50 msgid "overwrite existing settings" @@ -1897,8 +1870,7 @@ #: rhodecode/templates/admin/repos/repo_edit.html:79 #: rhodecode/templates/forks/fork.html:63 #: rhodecode/templates/settings/repo_settings.html:70 -msgid "" -"Keep it short and to the point. Use a README file for longer descriptions." +msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "保持简短。用README文件来写更长的描述。" #: rhodecode/templates/admin/repos/repo_add_base.html:69 @@ -2041,8 +2013,8 @@ #: rhodecode/templates/admin/repos/repo_edit.html:193 msgid "" -"Manually invalidate cache for this repository. On first access repository " -"will be cached again" +"Manually invalidate cache for this repository. On first access repository" +" will be cached again" msgstr "手动清除版本库缓存。之后第一次访问的时候将重建缓存" #: rhodecode/templates/admin/repos/repo_edit.html:198 @@ -2054,7 +2026,6 @@ msgstr "前缀" #: rhodecode/templates/admin/repos/repo_edit.html:202 -#| msgid "API key" msgid "Key" msgstr "键" @@ -2083,8 +2054,8 @@ #: rhodecode/templates/admin/repos/repo_edit.html:231 msgid "" -"All actions made on this repository will be accessible to everyone in public " -"journal" +"All actions made on this repository will be accessible to everyone in " +"public journal" msgstr "任何人都可以在公共日志上看到这个版本库上的所有动作" #: rhodecode/templates/admin/repos/repo_edit.html:238 @@ -2112,8 +2083,7 @@ msgstr "版本库未锁定" #: rhodecode/templates/admin/repos/repo_edit.html:252 -msgid "" -"Force locking on repository. Works only when anonymous access is disabled" +msgid "Force locking on repository. Works only when anonymous access is disabled" msgstr "强制锁定版本库。只有在禁止匿名访问时候才有效" #: rhodecode/templates/admin/repos/repo_edit.html:259 @@ -2139,10 +2109,10 @@ #: rhodecode/templates/admin/repos/repo_edit.html:282 msgid "" -"This repository will be renamed in a special way in order to be unaccesible " -"for RhodeCode and VCS systems.\n" -" If you need fully delete it from filesystem please " -"do it manually" +"This repository will be renamed in a special way in order to be " +"unaccesible for RhodeCode and VCS systems.\n" +" If you need fully delete it from filesystem " +"please do it manually" msgstr "" "这个版本库将以特殊的方式重命名这样RhodeCode和版本控制系统将不能访问它。\n" " 如果需要从文件系统完全删除，你需要手动操作" @@ -2239,8 +2209,7 @@ #: rhodecode/templates/files/files_add.html:15 #: rhodecode/templates/files/files_edit.html:15 #: rhodecode/templates/followers/followers.html:9 -#: rhodecode/templates/forks/fork.html:9 -#: rhodecode/templates/forks/forks.html:9 +#: rhodecode/templates/forks/fork.html:9 rhodecode/templates/forks/forks.html:9 #: rhodecode/templates/pullrequests/pullrequest.html:8 #: rhodecode/templates/pullrequests/pullrequest_show.html:8 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 @@ -2291,8 +2260,8 @@ #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:70 msgid "" -"Enable lock-by-pulling on group. This option will be applied to all other " -"groups and repositories inside" +"Enable lock-by-pulling on group. This option will be applied to all other" +" groups and repositories inside" msgstr "启用组的拉取锁定。这个选项将应用到组内的其他组和版本库" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5 @@ -2323,7 +2292,6 @@ #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55 #, python-format -#| msgid "Confirm to delete this repository" msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" msgstr[0] "确认删除这个版本库组：%s包含%s个版本库" @@ -2369,11 +2337,10 @@ #: rhodecode/templates/admin/settings/settings.html:38 msgid "" -"In case a repository was deleted from filesystem and there are leftovers in " -"the database check this option to scan obsolete data in database and remove " -"it." -msgstr "" -"如果版本库已经从文件系统删除，但数据库仍然有遗留信息，请勾选该项进行清理" +"In case a repository was deleted from filesystem and there are leftovers " +"in the database check this option to scan obsolete data in database and " +"remove it." +msgstr "如果版本库已经从文件系统删除，但数据库仍然有遗留信息，请勾选该项进行清理" #: rhodecode/templates/admin/settings/settings.html:39 msgid "destroy old data" @@ -2381,10 +2348,9 @@ #: rhodecode/templates/admin/settings/settings.html:41 msgid "" -"Rescan repositories location for new repositories. Also deletes obsolete if " -"`destroy` flag is checked " -msgstr "" -"重新扫描版本库路径以发现新版本库。 同时删除过时的，如果设置有 `destroy` 标志" +"Rescan repositories location for new repositories. Also deletes obsolete " +"if `destroy` flag is checked " +msgstr "重新扫描版本库路径以发现新版本库。 同时删除过时的，如果设置有 `destroy` 标志" #: rhodecode/templates/admin/settings/settings.html:46 msgid "Rescan repositories" @@ -2433,7 +2399,6 @@ msgstr "可视化设置" #: rhodecode/templates/admin/settings/settings.html:127 -#| msgid "enable" msgid "General" msgstr "通用" @@ -2475,11 +2440,9 @@ #: rhodecode/templates/admin/settings/settings.html:203 msgid "" -"RhodeCode will require SSL for pushing or pulling. If SSL is missing it will " -"return HTTP Error 406: Not Acceptable" -msgstr "" -"勾选后RhodeCode将要求使用SSL进行推送和拉取。如果没有使用SSL将返回HTTP 406错" -"误：Not Acceptable" +"RhodeCode will require SSL for pushing or pulling. If SSL is missing it " +"will return HTTP Error 406: Not Acceptable" +msgstr "勾选后RhodeCode将要求使用SSL进行推送和拉取。如果没有使用SSL将返回HTTP 406错误：Not Acceptable" #: rhodecode/templates/admin/settings/settings.html:209 msgid "Hooks" @@ -2530,8 +2493,8 @@ #: rhodecode/templates/admin/settings/settings.html:261 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." +"change this, you must restart application in order to make this setting " +"take effect. Click this label to unlock." msgstr "这是一个关键设置。如果确认修改该项设置，请重启服务以便设置生效。" #: rhodecode/templates/admin/settings/settings.html:262 @@ -2541,8 +2504,8 @@ #: rhodecode/templates/admin/settings/settings.html:263 msgid "" -"Location where repositories are stored. After changing this value a restart, " -"and rescan is required" +"Location where repositories are stored. After changing this value a " +"restart, and rescan is required" msgstr "版本库存储路径。 修改后需要重启和重新扫描" #: rhodecode/templates/admin/settings/settings.html:283 @@ -2840,17 +2803,14 @@ msgstr "拥护者成员" #: rhodecode/templates/admin/users_groups/users_group_edit.html:163 -#| msgid "members" msgid "No members yet" msgstr "还没有成员" #: rhodecode/templates/admin/users_groups/users_group_edit.html:171 -#| msgid "Permissions administration" msgid "Permissions defined for this group" msgstr "这个组的权限" #: rhodecode/templates/admin/users_groups/users_group_edit.html:178 -#| msgid "Copy permissions" msgid "No permissions set yet" msgstr "还未设置权限" @@ -2919,8 +2879,7 @@ msgstr "产品" #: rhodecode/templates/base/base.html:152 -#: rhodecode/templates/base/base.html:182 -#: rhodecode/templates/base/root.html:47 +#: rhodecode/templates/base/base.html:182 rhodecode/templates/base/root.html:47 msgid "loading..." msgstr "载入中..." @@ -2965,7 +2924,6 @@ #: rhodecode/templates/base/base.html:204 #: rhodecode/templates/base/base.html:206 -#| msgid "Repository creation" msgid "repository settings" msgstr "版本库选项" @@ -2975,8 +2933,7 @@ msgid "fork" msgstr "复刻" -#: rhodecode/templates/base/base.html:212 -#: rhodecode/templates/base/root.html:50 +#: rhodecode/templates/base/base.html:212 rhodecode/templates/base/root.html:50 #: rhodecode/templates/changelog/changelog.html:43 msgid "Open new pull request" msgstr "新建拉取请求" @@ -2991,7 +2948,6 @@ msgstr "搜索" #: rhodecode/templates/base/base.html:223 -#| msgid "unlock" msgid "lock" msgstr "锁定" @@ -3056,7 +3012,6 @@ msgstr "没有符合的文件" #: rhodecode/templates/base/root.html:51 -#| msgid "opened new pull request" msgid "Open new pull request for selected changesets" msgstr "为选择的变更集创建新的拉取请求" @@ -3112,7 +3067,6 @@ msgstr[0] "显示%d/%d个版本" #: rhodecode/templates/changelog/changelog.html:37 -#| msgid "Search settings" msgid "Clear selection" msgstr "清除选择" @@ -3123,8 +3077,6 @@ msgstr "比较复刻和%s" #: rhodecode/templates/changelog/changelog.html:40 -#, python-format -#| msgid "compare fork with %s" msgid "Compare fork with parent" msgstr "比较复刻和源版本库" @@ -3234,7 +3186,6 @@ msgstr "原始diff" #: rhodecode/templates/changeset/changeset.html:50 -#| msgid "raw diff" msgid "patch diff" msgstr "原始diff" @@ -3261,7 +3212,6 @@ #: rhodecode/templates/compare/compare_diff.html:44 #: rhodecode/templates/pullrequests/pullrequest_show.html:76 #, python-format -#| msgid "file changed" msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "修改%s个文件" @@ -3270,7 +3220,6 @@ #: rhodecode/templates/compare/compare_diff.html:46 #: rhodecode/templates/pullrequests/pullrequest_show.html:78 #, python-format -#| msgid "%s files affected with %s insertions and %s deletions:" msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "修改%s个文件包括%s行插入和%s行删除" @@ -3291,8 +3240,7 @@ #: rhodecode/templates/changeset/changeset_file_comment.html:48 #: rhodecode/templates/changeset/changeset_file_comment.html:123 -msgid "" -"Use @username inside this text to send notification to this RhodeCode user" +msgid "Use @username inside this text to send notification to this RhodeCode user" msgstr "在文本中使用 @用户名 以发送通知到该RhodeCode用户" #: rhodecode/templates/changeset/changeset_file_comment.html:59 @@ -3340,7 +3288,6 @@ msgstr "比较显示" #: rhodecode/templates/changeset/changeset_range.html:29 -#| msgid "show inline comments" msgid "Show combined compare" msgstr "显示紧凑比较" @@ -3363,14 +3310,12 @@ #: rhodecode/templates/compare/compare_diff.html:37 #: rhodecode/templates/pullrequests/pullrequest_show.html:69 #, python-format -#| msgid "show inline comments" msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "显示%s个提交" #: rhodecode/templates/compare/compare_diff.html:52 #: rhodecode/templates/pullrequests/pullrequest_show.html:84 -#| msgid "files" msgid "No files" msgstr "无文件" @@ -3426,7 +3371,6 @@ msgstr "确认删除用户：%s" #: rhodecode/templates/email_templates/main.html:8 -#| msgid "This is an notification from RhodeCode." msgid "This is a notification from RhodeCode." msgstr "这是一个RhodeCode通知。" @@ -3604,7 +3548,6 @@ msgstr[0] "%s个作者" #: rhodecode/templates/files/files_source.html:6 -#| msgid "Loading file list..." msgid "Load file history" msgstr "加载文件历史记录..." @@ -3830,7 +3773,6 @@ msgstr[0] "%d个检视者" #: rhodecode/templates/pullrequests/pullrequest_show.html:50 -#| msgid "Pull request reviewers" msgid "pull request was reviewed by all reviewers" msgstr "拉取请求已经由所有检视人员检视" @@ -3969,12 +3911,10 @@ #: rhodecode/templates/summary/summary.html:70 #, python-format -#| msgid "Repository is not locked" msgid "Repository locked by %s" msgstr "版本库由%s锁定" #: rhodecode/templates/summary/summary.html:72 -#| msgid "Repository is not locked" msgid "Repository unlocked" msgstr "版本库未锁定" @@ -4109,9 +4049,6 @@ msgstr "%s标签" #: rhodecode/templates/tags/tags.html:29 -#| msgid "compare" msgid "Compare tags" msgstr "比较标签" -#~ msgid "Group Name" -#~ msgstr "组名"
--- a/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po Mon Nov 26 20:39:45 2012 +0100 +++ b/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po Tue Nov 27 20:56:57 2012 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: RhodeCode 1.2.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-09-02 20:30+0200\n" +"POT-Creation-Date: 2012-11-27 20:56+0100\n" "PO-Revision-Date: 2012-05-09 22:23+0800\n" "Last-Translator: Nansen <nansenat16@gmail.com>\n" "Language-Team: zh_TW <LL@li.org>\n" @@ -17,36 +17,38 @@ "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -#: rhodecode/controllers/changelog.py:94 +#: rhodecode/controllers/changelog.py:95 #, fuzzy 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:157 +#: rhodecode/controllers/changeset.py:164 #, fuzzy, python-format msgid "%s line context" msgstr "文件內容" -#: rhodecode/controllers/changeset.py:333 -#: rhodecode/controllers/changeset.py:348 rhodecode/lib/diffs.py:70 -msgid "binary file" -msgstr "二進位檔" - -#: rhodecode/controllers/changeset.py:408 +#: rhodecode/controllers/changeset.py:315 +#: rhodecode/controllers/pullrequests.py:411 +#, fuzzy, python-format +msgid "Status change -> %s" +msgstr "最後修改" + +#: rhodecode/controllers/changeset.py:346 msgid "" "Changing status on a changeset associated witha closed pull request is " "not allowed" msgstr "" -#: rhodecode/controllers/compare.py:69 +#: rhodecode/controllers/compare.py:75 +#: rhodecode/controllers/pullrequests.py:117 #, fuzzy msgid "There are no changesets yet" msgstr "尚未有任何變更" @@ -77,103 +79,113 @@ "fulfilling the request." msgstr "" -#: rhodecode/controllers/feed.py:49 +#: rhodecode/controllers/feed.py:52 #, python-format msgid "Changes on %s repository" msgstr "修改於版本庫 %s" -#: rhodecode/controllers/feed.py:50 +#: rhodecode/controllers/feed.py:53 #, python-format msgid "%s %s feed" msgstr "" -#: rhodecode/controllers/feed.py:75 +#: rhodecode/controllers/feed.py:86 +#: rhodecode/templates/changeset/changeset.html:126 +#: rhodecode/templates/changeset/changeset.html:138 +#: rhodecode/templates/compare/compare_diff.html:62 +#: rhodecode/templates/compare/compare_diff.html:73 +#: rhodecode/templates/pullrequests/pullrequest_show.html:94 +#: rhodecode/templates/pullrequests/pullrequest_show.html:153 +msgid "Changeset was too big and was cut off..." +msgstr "" + +#: rhodecode/controllers/feed.py:92 #, fuzzy msgid "commited on" msgstr "遞交" -#: rhodecode/controllers/files.py:84 +#: rhodecode/controllers/files.py:86 #, fuzzy msgid "click here to add new file" msgstr "新增使用者" -#: rhodecode/controllers/files.py:85 +#: rhodecode/controllers/files.py:87 #, fuzzy, python-format msgid "There are no files yet %s" msgstr "尚未有任何檔案" -#: rhodecode/controllers/files.py:239 rhodecode/controllers/files.py:299 +#: rhodecode/controllers/files.py:265 rhodecode/controllers/files.py:325 #, python-format msgid "This repository is has been locked by %s on %s" msgstr "" -#: rhodecode/controllers/files.py:266 +#: rhodecode/controllers/files.py:292 #, python-format msgid "Edited %s via RhodeCode" msgstr "使用 RhodeCode 編輯 %s" -#: rhodecode/controllers/files.py:271 +#: rhodecode/controllers/files.py:297 msgid "No changes" msgstr "沒有修改" -#: rhodecode/controllers/files.py:282 rhodecode/controllers/files.py:346 +#: rhodecode/controllers/files.py:308 rhodecode/controllers/files.py:372 #, python-format msgid "Successfully committed to %s" msgstr "成功遞交至 %s" -#: rhodecode/controllers/files.py:287 rhodecode/controllers/files.py:352 +#: rhodecode/controllers/files.py:313 rhodecode/controllers/files.py:378 msgid "Error occurred during commit" msgstr "" -#: rhodecode/controllers/files.py:318 +#: rhodecode/controllers/files.py:344 #, fuzzy, python-format msgid "Added %s via RhodeCode" msgstr "使用 RhodeCode 編輯 %s" -#: rhodecode/controllers/files.py:332 +#: rhodecode/controllers/files.py:358 #, fuzzy msgid "No content" msgstr "文件內容" -#: rhodecode/controllers/files.py:336 +#: rhodecode/controllers/files.py:362 #, fuzzy msgid "No filename" msgstr "檔案名稱" -#: rhodecode/controllers/files.py:378 +#: rhodecode/controllers/files.py:404 msgid "downloads disabled" msgstr "下載已關閉" -#: rhodecode/controllers/files.py:389 +#: rhodecode/controllers/files.py:415 #, python-format msgid "Unknown revision %s" msgstr "未知修訂 %s" -#: rhodecode/controllers/files.py:391 +#: rhodecode/controllers/files.py:417 msgid "Empty repository" msgstr "空的版本庫" -#: rhodecode/controllers/files.py:393 +#: rhodecode/controllers/files.py:419 msgid "Unknown archive type" msgstr "未知的存檔類型" -#: rhodecode/controllers/files.py:494 +#: rhodecode/controllers/files.py:564 #: rhodecode/templates/changeset/changeset_range.html:13 #: rhodecode/templates/changeset/changeset_range.html:31 msgid "Changesets" msgstr "變更" -#: rhodecode/controllers/files.py:495 rhodecode/controllers/pullrequests.py:72 -#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:543 +#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:76 +#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:550 msgid "Branches" msgstr "分支" -#: rhodecode/controllers/files.py:496 rhodecode/controllers/pullrequests.py:76 -#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:554 +#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:80 +#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:561 msgid "Tags" msgstr "標籤" -#: rhodecode/controllers/forks.py:73 rhodecode/controllers/admin/repos.py:90 +#: rhodecode/controllers/forks.py:74 rhodecode/controllers/admin/repos.py:91 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -181,7 +193,7 @@ "repositories" msgstr "" -#: rhodecode/controllers/forks.py:133 rhodecode/controllers/settings.py:72 +#: rhodecode/controllers/forks.py:134 rhodecode/controllers/settings.py:73 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -189,23 +201,23 @@ "repositories" msgstr "" -#: rhodecode/controllers/forks.py:167 +#: rhodecode/controllers/forks.py:168 #, python-format msgid "forked %s repository as %s" msgstr "forked %s 版本庫為 %s" -#: rhodecode/controllers/forks.py:181 +#: rhodecode/controllers/forks.py:182 #, python-format msgid "An error occurred during repository forking %s" msgstr "" -#: rhodecode/controllers/journal.py:202 rhodecode/controllers/journal.py:239 +#: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243 #, fuzzy msgid "public journal" msgstr "公開日誌" -#: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243 -#: rhodecode/templates/base/base.html:220 +#: rhodecode/controllers/journal.py:210 rhodecode/controllers/journal.py:247 +#: rhodecode/templates/base/base.html:232 msgid "journal" msgstr "日誌" @@ -223,59 +235,59 @@ "email" msgstr "您的密碼重設動作已完成，新的密碼已寄至您的信箱" -#: rhodecode/controllers/pullrequests.py:74 rhodecode/model/scm.py:549 +#: rhodecode/controllers/pullrequests.py:78 rhodecode/model/scm.py:556 msgid "Bookmarks" msgstr "" -#: rhodecode/controllers/pullrequests.py:158 +#: rhodecode/controllers/pullrequests.py:186 msgid "Pull request requires a title with min. 3 chars" msgstr "" -#: rhodecode/controllers/pullrequests.py:160 +#: rhodecode/controllers/pullrequests.py:188 #, fuzzy msgid "error during creation of pull request" msgstr "建立使用者 %s" -#: rhodecode/controllers/pullrequests.py:181 +#: rhodecode/controllers/pullrequests.py:220 #, fuzzy msgid "Successfully opened new pull request" msgstr "成功刪除使用者" -#: rhodecode/controllers/pullrequests.py:184 +#: rhodecode/controllers/pullrequests.py:223 msgid "Error occurred during sending pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:217 +#: rhodecode/controllers/pullrequests.py:256 #, fuzzy msgid "Successfully deleted pull request" msgstr "成功刪除使用者" -#: rhodecode/controllers/search.py:131 +#: rhodecode/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "無效的查詢。請使用跳脫字元" -#: rhodecode/controllers/search.py:136 +#: rhodecode/controllers/search.py:139 msgid "There is no index to search in. Please run whoosh indexer" msgstr "沒有任何索引可以搜尋。請執行 whoosh 建立索引" -#: rhodecode/controllers/search.py:140 +#: rhodecode/controllers/search.py:143 msgid "An error occurred during this search operation" msgstr "" -#: rhodecode/controllers/settings.py:107 -#: rhodecode/controllers/admin/repos.py:266 +#: rhodecode/controllers/settings.py:108 +#: rhodecode/controllers/admin/repos.py:267 #, python-format msgid "Repository %s updated successfully" msgstr "版本庫 %s 更新完成" -#: rhodecode/controllers/settings.py:125 -#: rhodecode/controllers/admin/repos.py:284 +#: rhodecode/controllers/settings.py:126 +#: rhodecode/controllers/admin/repos.py:285 #, python-format msgid "error occurred during update of repository %s" msgstr "" -#: rhodecode/controllers/settings.py:143 -#: rhodecode/controllers/admin/repos.py:302 +#: rhodecode/controllers/settings.py:144 +#: rhodecode/controllers/admin/repos.py:303 #, python-format msgid "" "%s repository is not mapped to db perhaps it was moved or renamed from " @@ -283,25 +295,45 @@ "repositories" msgstr "" -#: rhodecode/controllers/settings.py:155 -#: rhodecode/controllers/admin/repos.py:314 +#: rhodecode/controllers/settings.py:156 +#: rhodecode/controllers/admin/repos.py:315 #, python-format msgid "deleted repository %s" msgstr "刪除版本庫 %s" -#: rhodecode/controllers/settings.py:159 -#: rhodecode/controllers/admin/repos.py:324 -#: rhodecode/controllers/admin/repos.py:330 +#: rhodecode/controllers/settings.py:160 +#: rhodecode/controllers/admin/repos.py:325 +#: rhodecode/controllers/admin/repos.py:331 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: rhodecode/controllers/summary.py:138 +#: rhodecode/controllers/settings.py:179 +#, fuzzy +msgid "unlocked" +msgstr "解鎖" + +#: rhodecode/controllers/settings.py:182 +#, fuzzy +msgid "locked" +msgstr "解鎖" + +#: rhodecode/controllers/settings.py:184 +#, fuzzy, python-format +msgid "Repository has been %s" +msgstr "forked %s 版本庫為 %s" + +#: rhodecode/controllers/settings.py:188 +#: rhodecode/controllers/admin/repos.py:423 +msgid "An error occurred during unlocking" +msgstr "" + +#: rhodecode/controllers/summary.py:140 msgid "No data loaded yet" msgstr "" -#: rhodecode/controllers/summary.py:142 -#: rhodecode/templates/summary/summary.html:148 +#: rhodecode/controllers/summary.py:144 +#: rhodecode/templates/summary/summary.html:157 msgid "Statistics are disabled for this repository" msgstr "這個版本庫的統計功能已停用" @@ -386,15 +418,15 @@ #: rhodecode/templates/admin/settings/settings.html:9 #: rhodecode/templates/admin/users/user_add.html:8 #: rhodecode/templates/admin/users/user_edit.html:9 -#: rhodecode/templates/admin/users/user_edit.html:122 +#: rhodecode/templates/admin/users/user_edit.html:126 #: rhodecode/templates/admin/users/users.html:9 #: rhodecode/templates/admin/users_groups/users_group_add.html:8 #: rhodecode/templates/admin/users_groups/users_group_edit.html:9 #: rhodecode/templates/admin/users_groups/users_groups.html:9 #: rhodecode/templates/base/base.html:197 -#: rhodecode/templates/base/base.html:337 -#: rhodecode/templates/base/base.html:339 -#: rhodecode/templates/base/base.html:341 +#: rhodecode/templates/base/base.html:349 +#: rhodecode/templates/base/base.html:351 +#: rhodecode/templates/base/base.html:353 msgid "Admin" msgstr "管理" @@ -428,189 +460,185 @@ msgid "error occurred during update of permissions" msgstr "" -#: rhodecode/controllers/admin/repos.py:123 +#: rhodecode/controllers/admin/repos.py:124 msgid "--REMOVE FORK--" msgstr "" -#: rhodecode/controllers/admin/repos.py:192 +#: rhodecode/controllers/admin/repos.py:193 #, python-format msgid "created repository %s from %s" msgstr "建立版本庫 %s 到 %s" -#: rhodecode/controllers/admin/repos.py:196 +#: rhodecode/controllers/admin/repos.py:197 #, python-format msgid "created repository %s" msgstr "建立版本庫 %s" -#: rhodecode/controllers/admin/repos.py:227 +#: rhodecode/controllers/admin/repos.py:228 #, python-format msgid "error occurred during creation of repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:319 +#: rhodecode/controllers/admin/repos.py:320 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:348 +#: rhodecode/controllers/admin/repos.py:349 msgid "An error occurred during deletion of repository user" msgstr "" -#: rhodecode/controllers/admin/repos.py:367 +#: rhodecode/controllers/admin/repos.py:368 msgid "An error occurred during deletion of repository users groups" msgstr "" -#: rhodecode/controllers/admin/repos.py:385 +#: rhodecode/controllers/admin/repos.py:386 msgid "An error occurred during deletion of repository stats" msgstr "" -#: rhodecode/controllers/admin/repos.py:402 +#: rhodecode/controllers/admin/repos.py:403 msgid "An error occurred during cache invalidation" msgstr "" -#: rhodecode/controllers/admin/repos.py:422 -msgid "An error occurred during unlocking" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:442 +#: rhodecode/controllers/admin/repos.py:443 msgid "Updated repository visibility in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:446 +#: rhodecode/controllers/admin/repos.py:447 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:451 rhodecode/model/validators.py:299 +#: rhodecode/controllers/admin/repos.py:452 rhodecode/model/validators.py:300 msgid "Token mismatch" msgstr "" -#: rhodecode/controllers/admin/repos.py:464 +#: rhodecode/controllers/admin/repos.py:465 msgid "Pulled from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:466 +#: rhodecode/controllers/admin/repos.py:467 msgid "An error occurred during pull from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:482 +#: rhodecode/controllers/admin/repos.py:483 msgid "Nothing" msgstr "" -#: rhodecode/controllers/admin/repos.py:484 +#: rhodecode/controllers/admin/repos.py:485 #, fuzzy, python-format msgid "Marked repo %s as fork of %s" msgstr "建立版本庫 %s 到 %s" -#: rhodecode/controllers/admin/repos.py:488 +#: rhodecode/controllers/admin/repos.py:489 msgid "An error occurred during this operation" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:116 +#: rhodecode/controllers/admin/repos_groups.py:120 #, python-format msgid "created repos group %s" msgstr "建立版本庫群組 %s" -#: rhodecode/controllers/admin/repos_groups.py:129 +#: rhodecode/controllers/admin/repos_groups.py:133 #, python-format msgid "error occurred during creation of repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:163 +#: rhodecode/controllers/admin/repos_groups.py:167 #, python-format msgid "updated repos group %s" msgstr "更新版本庫群組 %s" -#: rhodecode/controllers/admin/repos_groups.py:176 +#: rhodecode/controllers/admin/repos_groups.py:180 #, python-format msgid "error occurred during update of repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:194 +#: rhodecode/controllers/admin/repos_groups.py:198 #, python-format msgid "This group contains %s repositores and cannot be deleted" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:202 +#: rhodecode/controllers/admin/repos_groups.py:206 #, python-format msgid "removed repos group %s" msgstr "移除版本庫群組 %s" -#: rhodecode/controllers/admin/repos_groups.py:208 +#: rhodecode/controllers/admin/repos_groups.py:212 msgid "Cannot delete this group it still contains subgroups" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:213 -#: rhodecode/controllers/admin/repos_groups.py:218 +#: rhodecode/controllers/admin/repos_groups.py:217 +#: rhodecode/controllers/admin/repos_groups.py:222 #, python-format msgid "error occurred during deletion of repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:238 +#: rhodecode/controllers/admin/repos_groups.py:243 msgid "An error occurred during deletion of group user" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:258 +#: rhodecode/controllers/admin/repos_groups.py:264 msgid "An error occurred during deletion of group users groups" msgstr "" -#: rhodecode/controllers/admin/settings.py:121 +#: rhodecode/controllers/admin/settings.py:123 #, python-format msgid "Repositories successfully rescanned added: %s,removed: %s" msgstr "" -#: rhodecode/controllers/admin/settings.py:129 +#: rhodecode/controllers/admin/settings.py:131 msgid "Whoosh reindex task scheduled" msgstr "Whoosh 重新索引工作排程" -#: rhodecode/controllers/admin/settings.py:160 +#: rhodecode/controllers/admin/settings.py:162 msgid "Updated application settings" msgstr "更新應用設定" -#: rhodecode/controllers/admin/settings.py:164 -#: rhodecode/controllers/admin/settings.py:275 +#: rhodecode/controllers/admin/settings.py:166 +#: rhodecode/controllers/admin/settings.py:299 msgid "error occurred during updating application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:200 +#: rhodecode/controllers/admin/settings.py:207 #, fuzzy msgid "Updated visualisation settings" msgstr "更新應用設定" -#: rhodecode/controllers/admin/settings.py:205 +#: rhodecode/controllers/admin/settings.py:212 msgid "error occurred during updating visualisation settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:271 +#: rhodecode/controllers/admin/settings.py:295 #, fuzzy msgid "Updated VCS settings" msgstr "更新 mercurial 設定" -#: rhodecode/controllers/admin/settings.py:285 +#: rhodecode/controllers/admin/settings.py:309 msgid "Added new hook" msgstr "新增hook" -#: rhodecode/controllers/admin/settings.py:297 +#: rhodecode/controllers/admin/settings.py:321 msgid "Updated hooks" msgstr "更新hook" -#: rhodecode/controllers/admin/settings.py:301 +#: rhodecode/controllers/admin/settings.py:325 msgid "error occurred during hook creation" msgstr "" -#: rhodecode/controllers/admin/settings.py:320 +#: rhodecode/controllers/admin/settings.py:344 msgid "Email task created" msgstr "" -#: rhodecode/controllers/admin/settings.py:375 +#: rhodecode/controllers/admin/settings.py:399 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/controllers/admin/settings.py:406 +#: rhodecode/controllers/admin/settings.py:430 msgid "Your account was updated successfully" msgstr "您的帳號已更新完成" -#: rhodecode/controllers/admin/settings.py:421 -#: rhodecode/controllers/admin/users.py:191 +#: rhodecode/controllers/admin/settings.py:445 +#: rhodecode/controllers/admin/users.py:196 #, python-format msgid "error occurred during update of user %s" msgstr "" @@ -625,100 +653,100 @@ msgid "error occurred during creation of user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:171 +#: rhodecode/controllers/admin/users.py:176 msgid "User updated successfully" msgstr "使用者更新完成" -#: rhodecode/controllers/admin/users.py:207 -msgid "successfully deleted user" -msgstr "成功刪除使用者" - #: rhodecode/controllers/admin/users.py:212 +msgid "successfully deleted user" +msgstr "成功刪除使用者" + +#: rhodecode/controllers/admin/users.py:217 msgid "An error occurred during deletion of user" msgstr "" -#: rhodecode/controllers/admin/users.py:226 +#: rhodecode/controllers/admin/users.py:231 msgid "You can't edit this user" msgstr "您無法編輯這位使用者" -#: rhodecode/controllers/admin/users.py:266 +#: rhodecode/controllers/admin/users.py:272 msgid "Granted 'repository create' permission to user" msgstr "" -#: rhodecode/controllers/admin/users.py:271 -msgid "Revoked 'repository create' permission to user" -msgstr "" - #: rhodecode/controllers/admin/users.py:277 +msgid "Revoked 'repository create' permission to user" +msgstr "" + +#: rhodecode/controllers/admin/users.py:283 #, fuzzy msgid "Granted 'repository fork' permission to user" msgstr "版本庫權限" -#: rhodecode/controllers/admin/users.py:282 +#: rhodecode/controllers/admin/users.py:288 #, fuzzy msgid "Revoked 'repository fork' permission to user" msgstr "版本庫權限" -#: rhodecode/controllers/admin/users.py:288 -#: rhodecode/controllers/admin/users_groups.py:255 +#: rhodecode/controllers/admin/users.py:294 +#: rhodecode/controllers/admin/users_groups.py:279 msgid "An error occurred during permissions saving" msgstr "" -#: rhodecode/controllers/admin/users.py:303 -#, python-format -msgid "Added email %s to user" -msgstr "" - #: rhodecode/controllers/admin/users.py:309 +#, python-format +msgid "Added email %s to user" +msgstr "" + +#: rhodecode/controllers/admin/users.py:315 msgid "An error occurred during email saving" msgstr "" -#: rhodecode/controllers/admin/users.py:319 +#: rhodecode/controllers/admin/users.py:325 #, fuzzy msgid "Removed email from user" msgstr "移除版本庫群組 %s" -#: rhodecode/controllers/admin/users_groups.py:84 +#: rhodecode/controllers/admin/users_groups.py:86 #, python-format msgid "created users group %s" msgstr "建立使用者群組 %s" -#: rhodecode/controllers/admin/users_groups.py:95 +#: rhodecode/controllers/admin/users_groups.py:97 #, python-format msgid "error occurred during creation of users group %s" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:135 +#: rhodecode/controllers/admin/users_groups.py:164 #, python-format msgid "updated users group %s" msgstr "更新使用者群組 %s" -#: rhodecode/controllers/admin/users_groups.py:157 +#: rhodecode/controllers/admin/users_groups.py:186 #, python-format msgid "error occurred during update of users group %s" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:174 +#: rhodecode/controllers/admin/users_groups.py:203 msgid "successfully deleted users group" msgstr "成功移除使用者群組" -#: rhodecode/controllers/admin/users_groups.py:179 +#: rhodecode/controllers/admin/users_groups.py:208 msgid "An error occurred during deletion of users group" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:233 +#: rhodecode/controllers/admin/users_groups.py:257 msgid "Granted 'repository create' permission to users group" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:238 +#: rhodecode/controllers/admin/users_groups.py:262 msgid "Revoked 'repository create' permission to users group" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:244 +#: rhodecode/controllers/admin/users_groups.py:268 msgid "Granted 'repository fork' permission to users group" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:249 +#: rhodecode/controllers/admin/users_groups.py:273 msgid "Revoked 'repository fork' permission to users group" msgstr "" @@ -730,207 +758,232 @@ msgid "You need to be a signed in to view this page" msgstr "您必須登入後才能瀏覽這個頁面" -#: rhodecode/lib/diffs.py:86 +#: rhodecode/lib/diffs.py:74 +msgid "binary file" +msgstr "二進位檔" + +#: rhodecode/lib/diffs.py:90 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: rhodecode/lib/diffs.py:96 +#: rhodecode/lib/diffs.py:100 msgid "No changes detected" msgstr "尚未有任何變更" -#: rhodecode/lib/helpers.py:372 +#: rhodecode/lib/helpers.py:373 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "" -#: rhodecode/lib/helpers.py:484 +#: rhodecode/lib/helpers.py:485 msgid "True" msgstr "真" -#: rhodecode/lib/helpers.py:488 +#: rhodecode/lib/helpers.py:489 msgid "False" msgstr "假" +#: rhodecode/lib/helpers.py:529 +#, fuzzy, python-format +msgid "Deleted branch: %s" +msgstr "刪除版本庫 %s" + #: rhodecode/lib/helpers.py:532 +#, fuzzy, python-format +msgid "Created tag: %s" +msgstr "建立使用者 %s" + +#: rhodecode/lib/helpers.py:545 #, fuzzy msgid "Changeset not found" msgstr "修改" -#: rhodecode/lib/helpers.py:555 +#: rhodecode/lib/helpers.py:588 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: rhodecode/lib/helpers.py:561 +#: rhodecode/lib/helpers.py:594 msgid "compare view" msgstr "" -#: rhodecode/lib/helpers.py:581 +#: rhodecode/lib/helpers.py:614 msgid "and" msgstr "和" -#: rhodecode/lib/helpers.py:582 +#: rhodecode/lib/helpers.py:615 #, python-format msgid "%s more" msgstr "" -#: rhodecode/lib/helpers.py:583 rhodecode/templates/changelog/changelog.html:48 +#: rhodecode/lib/helpers.py:616 rhodecode/templates/changelog/changelog.html:51 msgid "revisions" msgstr "修訂" -#: rhodecode/lib/helpers.py:606 -msgid "fork name " +#: rhodecode/lib/helpers.py:640 +#, fuzzy, python-format +msgid "fork name %s" msgstr "fork 名稱" -#: rhodecode/lib/helpers.py:620 +#: rhodecode/lib/helpers.py:653 #: rhodecode/templates/pullrequests/pullrequest_show.html:4 #: rhodecode/templates/pullrequests/pullrequest_show.html:12 #, python-format msgid "Pull request #%s" msgstr "" -#: rhodecode/lib/helpers.py:626 +#: rhodecode/lib/helpers.py:659 msgid "[deleted] repository" msgstr "" -#: rhodecode/lib/helpers.py:628 rhodecode/lib/helpers.py:638 +#: rhodecode/lib/helpers.py:661 rhodecode/lib/helpers.py:671 msgid "[created] repository" msgstr "" -#: rhodecode/lib/helpers.py:630 +#: rhodecode/lib/helpers.py:663 #, fuzzy msgid "[created] repository as fork" msgstr "建立版本庫 %s" -#: rhodecode/lib/helpers.py:632 rhodecode/lib/helpers.py:640 +#: rhodecode/lib/helpers.py:665 rhodecode/lib/helpers.py:673 msgid "[forked] repository" msgstr "" -#: rhodecode/lib/helpers.py:634 rhodecode/lib/helpers.py:642 +#: rhodecode/lib/helpers.py:667 rhodecode/lib/helpers.py:675 msgid "[updated] repository" msgstr "" -#: rhodecode/lib/helpers.py:636 +#: rhodecode/lib/helpers.py:669 msgid "[delete] repository" msgstr "" -#: rhodecode/lib/helpers.py:644 +#: rhodecode/lib/helpers.py:677 #, fuzzy msgid "[created] user" msgstr "建立使用者 %s" -#: rhodecode/lib/helpers.py:646 +#: rhodecode/lib/helpers.py:679 #, fuzzy msgid "[updated] user" msgstr "更新使用者群組 %s" -#: rhodecode/lib/helpers.py:648 +#: rhodecode/lib/helpers.py:681 #, fuzzy msgid "[created] users group" msgstr "建立使用者群組 %s" -#: rhodecode/lib/helpers.py:650 +#: rhodecode/lib/helpers.py:683 #, fuzzy msgid "[updated] users group" msgstr "更新使用者群組 %s" -#: rhodecode/lib/helpers.py:652 +#: rhodecode/lib/helpers.py:685 msgid "[commented] on revision in repository" msgstr "" -#: rhodecode/lib/helpers.py:654 +#: rhodecode/lib/helpers.py:687 #, fuzzy msgid "[commented] on pull request for" msgstr "建立使用者 %s" -#: rhodecode/lib/helpers.py:656 +#: rhodecode/lib/helpers.py:689 msgid "[closed] pull request for" msgstr "" -#: rhodecode/lib/helpers.py:658 +#: rhodecode/lib/helpers.py:691 msgid "[pushed] into" msgstr "" -#: rhodecode/lib/helpers.py:660 +#: rhodecode/lib/helpers.py:693 msgid "[committed via RhodeCode] into repository" msgstr "" -#: rhodecode/lib/helpers.py:662 +#: rhodecode/lib/helpers.py:695 msgid "[pulled from remote] into repository" msgstr "" -#: rhodecode/lib/helpers.py:664 +#: rhodecode/lib/helpers.py:697 msgid "[pulled] from" msgstr "" -#: rhodecode/lib/helpers.py:666 +#: rhodecode/lib/helpers.py:699 msgid "[started following] repository" msgstr "" -#: rhodecode/lib/helpers.py:668 +#: rhodecode/lib/helpers.py:701 msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/helpers.py:840 +#: rhodecode/lib/helpers.py:877 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:844 +#: rhodecode/lib/helpers.py:881 msgid "No Files" msgstr "沒有檔案" -#: rhodecode/lib/utils2.py:335 +#: rhodecode/lib/utils2.py:403 #, fuzzy, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "年" -#: rhodecode/lib/utils2.py:336 +#: rhodecode/lib/utils2.py:404 #, fuzzy, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "月" -#: rhodecode/lib/utils2.py:337 +#: rhodecode/lib/utils2.py:405 #, fuzzy, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "日" -#: rhodecode/lib/utils2.py:338 +#: rhodecode/lib/utils2.py:406 #, fuzzy, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "時" -#: rhodecode/lib/utils2.py:339 +#: rhodecode/lib/utils2.py:407 #, fuzzy, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "分" -#: rhodecode/lib/utils2.py:340 +#: rhodecode/lib/utils2.py:408 #, fuzzy, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "秒" -#: rhodecode/lib/utils2.py:355 +#: rhodecode/lib/utils2.py:424 +#, python-format +msgid "in %s" +msgstr "" + +#: rhodecode/lib/utils2.py:426 #, fuzzy, python-format msgid "%s ago" msgstr "之前" -#: rhodecode/lib/utils2.py:357 +#: rhodecode/lib/utils2.py:428 +#, fuzzy, python-format +msgid "in %s and %s" +msgstr "下載 %s 為 %s" + +#: rhodecode/lib/utils2.py:431 #, python-format msgid "%s and %s ago" msgstr "" -#: rhodecode/lib/utils2.py:360 +#: rhodecode/lib/utils2.py:434 msgid "just now" msgstr "現在" -#: rhodecode/lib/celerylib/tasks.py:269 +#: rhodecode/lib/celerylib/tasks.py:270 #, fuzzy msgid "password reset link" msgstr "您的密碼重設連結已寄出" @@ -940,102 +993,102 @@ msgid "on line %s" msgstr "" -#: rhodecode/model/comment.py:157 +#: rhodecode/model/comment.py:173 msgid "[Mention]" msgstr "" -#: rhodecode/model/db.py:1140 +#: rhodecode/model/db.py:1163 #, fuzzy msgid "Repository no access" msgstr "個版本庫" -#: rhodecode/model/db.py:1141 +#: rhodecode/model/db.py:1164 #, fuzzy msgid "Repository read access" msgstr "這個版本庫已經存在" -#: rhodecode/model/db.py:1142 +#: rhodecode/model/db.py:1165 #, fuzzy msgid "Repository write access" msgstr "個版本庫" -#: rhodecode/model/db.py:1143 +#: rhodecode/model/db.py:1166 #, fuzzy msgid "Repository admin access" msgstr "個版本庫" -#: rhodecode/model/db.py:1145 +#: rhodecode/model/db.py:1168 #, fuzzy msgid "Repositories Group no access" msgstr "版本庫群組" -#: rhodecode/model/db.py:1146 +#: rhodecode/model/db.py:1169 #, fuzzy msgid "Repositories Group read access" msgstr "版本庫群組" -#: rhodecode/model/db.py:1147 +#: rhodecode/model/db.py:1170 #, fuzzy msgid "Repositories Group write access" msgstr "版本庫群組" -#: rhodecode/model/db.py:1148 +#: rhodecode/model/db.py:1171 #, fuzzy msgid "Repositories Group admin access" msgstr "版本庫群組" -#: rhodecode/model/db.py:1150 +#: rhodecode/model/db.py:1173 #, fuzzy msgid "RhodeCode Administrator" msgstr "使用者管理員" -#: rhodecode/model/db.py:1151 +#: rhodecode/model/db.py:1174 #, fuzzy msgid "Repository creation disabled" msgstr "版本庫建立" -#: rhodecode/model/db.py:1152 +#: rhodecode/model/db.py:1175 #, fuzzy msgid "Repository creation enabled" msgstr "版本庫建立" -#: rhodecode/model/db.py:1153 +#: rhodecode/model/db.py:1176 #, fuzzy msgid "Repository forking disabled" msgstr "版本庫建立" -#: rhodecode/model/db.py:1154 +#: rhodecode/model/db.py:1177 #, fuzzy msgid "Repository forking enabled" msgstr "版本庫建立" -#: rhodecode/model/db.py:1155 +#: rhodecode/model/db.py:1178 #, fuzzy msgid "Register disabled" msgstr "停用" -#: rhodecode/model/db.py:1156 +#: rhodecode/model/db.py:1179 msgid "Register new user with RhodeCode with manual activation" msgstr "" -#: rhodecode/model/db.py:1159 +#: rhodecode/model/db.py:1182 msgid "Register new user with RhodeCode with auto activation" msgstr "" -#: rhodecode/model/db.py:1579 +#: rhodecode/model/db.py:1623 msgid "Not Reviewed" msgstr "" -#: rhodecode/model/db.py:1580 +#: rhodecode/model/db.py:1624 #, fuzzy msgid "Approved" msgstr "移除" -#: rhodecode/model/db.py:1581 +#: rhodecode/model/db.py:1625 msgid "Rejected" msgstr "" -#: rhodecode/model/db.py:1582 +#: rhodecode/model/db.py:1626 msgid "Under Review" msgstr "" @@ -1058,37 +1111,41 @@ msgstr "" #: rhodecode/model/notification.py:220 -msgid "commented on commit" +#, python-format +msgid "commented on commit at %(when)s" msgstr "" #: rhodecode/model/notification.py:221 -#, fuzzy -msgid "sent message" +#, fuzzy, python-format +msgid "sent message at %(when)s" msgstr "遞交資訊" #: rhodecode/model/notification.py:222 -msgid "mentioned you" +#, python-format +msgid "mentioned you at %(when)s" msgstr "" #: rhodecode/model/notification.py:223 -#, fuzzy -msgid "registered in RhodeCode" +#, fuzzy, python-format +msgid "registered in RhodeCode at %(when)s" msgstr "您已經成功註冊rhodecode" #: rhodecode/model/notification.py:224 -msgid "opened new pull request" -msgstr "" +#, fuzzy, python-format +msgid "opened new pull request at %(when)s" +msgstr "建立使用者 %s" #: rhodecode/model/notification.py:225 -msgid "commented on pull request" -msgstr "" - -#: rhodecode/model/pull_request.py:84 +#, fuzzy, python-format +msgid "commented on pull request at %(when)s" +msgstr "建立使用者 %s" + +#: rhodecode/model/pull_request.py:90 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s" msgstr "" -#: rhodecode/model/scm.py:535 +#: rhodecode/model/scm.py:542 #, fuzzy msgid "latest tip" msgstr "最後登入" @@ -1098,155 +1155,160 @@ msgid "new user registration" msgstr "[RhodeCode] 新使用者註冊" -#: rhodecode/model/user.py:255 rhodecode/model/user.py:277 -#: rhodecode/model/user.py:299 +#: rhodecode/model/user.py:255 rhodecode/model/user.py:279 +#: rhodecode/model/user.py:301 msgid "You can't Edit this user since it's crucial for entire application" msgstr "您無法編輯這個使用者，因為他是系統帳號" -#: rhodecode/model/user.py:323 +#: rhodecode/model/user.py:325 msgid "You can't remove this user since it's crucial for entire application" msgstr "您無法移除這個使用者，因為他是系統帳號" -#: rhodecode/model/user.py:329 +#: rhodecode/model/user.py:331 #, fuzzy, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories. %s" msgstr "這個使用者擁有 %s 個版本庫所以無法移除，請先變更版本庫擁有者或者刪除版本庫" -#: rhodecode/model/validators.py:35 rhodecode/model/validators.py:36 +#: rhodecode/model/validators.py:36 rhodecode/model/validators.py:37 msgid "Value cannot be an empty list" msgstr "" -#: rhodecode/model/validators.py:82 +#: rhodecode/model/validators.py:83 #, fuzzy, python-format msgid "Username \"%(username)s\" already exists" msgstr "使用者名稱已存在" -#: rhodecode/model/validators.py:84 +#: rhodecode/model/validators.py:85 #, python-format msgid "Username \"%(username)s\" is forbidden" msgstr "" -#: rhodecode/model/validators.py:86 +#: rhodecode/model/validators.py:87 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with alphanumeric character" msgstr "使用者名稱只能使用字母數字、底線、小數點或破折號，且必須使用數字或字母開頭" -#: rhodecode/model/validators.py:114 +#: rhodecode/model/validators.py:115 #, fuzzy, python-format msgid "Username %(username)s is not valid" msgstr "使用者名稱或群組名稱無效" -#: rhodecode/model/validators.py:133 +#: rhodecode/model/validators.py:134 #, fuzzy msgid "Invalid users group name" msgstr "無效的使用者名稱" -#: rhodecode/model/validators.py:134 +#: rhodecode/model/validators.py:135 #, fuzzy, python-format msgid "Users group \"%(usersgroup)s\" already exists" msgstr "這個使用者群組已存在" -#: rhodecode/model/validators.py:136 +#: rhodecode/model/validators.py:137 msgid "" "users group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "群組名稱只能使用字母數字、底線、小數點或破折號，且必須使用數字或字母開頭" -#: rhodecode/model/validators.py:174 +#: rhodecode/model/validators.py:175 msgid "Cannot assign this group as parent" msgstr "" -#: rhodecode/model/validators.py:175 +#: rhodecode/model/validators.py:176 #, fuzzy, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "使用者名稱已存在" -#: rhodecode/model/validators.py:177 +#: rhodecode/model/validators.py:178 #, fuzzy, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "這個版本庫已經存在" -#: rhodecode/model/validators.py:235 +#: rhodecode/model/validators.py:236 #, fuzzy msgid "Invalid characters (non-ascii) in password" msgstr "無效的字元在密碼中" -#: rhodecode/model/validators.py:250 +#: rhodecode/model/validators.py:251 msgid "Passwords do not match" msgstr "密碼不相符" -#: rhodecode/model/validators.py:267 -msgid "invalid password" -msgstr "無效的密碼" - #: rhodecode/model/validators.py:268 -msgid "invalid user name" -msgstr "無效的使用者名稱" +msgid "invalid password" +msgstr "無效的密碼" #: rhodecode/model/validators.py:269 +msgid "invalid user name" +msgstr "無效的使用者名稱" + +#: rhodecode/model/validators.py:270 msgid "Your account is disabled" msgstr "您的帳號已被停用" -#: rhodecode/model/validators.py:313 +#: rhodecode/model/validators.py:314 #, fuzzy, python-format msgid "Repository name %(repo)s is disallowed" msgstr "不允許的版本庫名稱" -#: rhodecode/model/validators.py:315 +#: rhodecode/model/validators.py:316 #, fuzzy, python-format msgid "Repository named %(repo)s already exists" msgstr "這個版本庫已經存在" -#: rhodecode/model/validators.py:316 +#: rhodecode/model/validators.py:317 #, fuzzy, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "這個版本庫已存在於群組 \"%s\"" -#: rhodecode/model/validators.py:318 +#: rhodecode/model/validators.py:319 #, fuzzy, python-format msgid "Repositories group with name \"%(repo)s\" already exists" msgstr "這個版本庫已經存在" -#: rhodecode/model/validators.py:431 +#: rhodecode/model/validators.py:432 msgid "invalid clone url" msgstr "無效的複製URL" -#: rhodecode/model/validators.py:432 +#: rhodecode/model/validators.py:433 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" msgstr "" -#: rhodecode/model/validators.py:457 +#: rhodecode/model/validators.py:458 #, fuzzy msgid "Fork have to be the same type as parent" msgstr "Fork 必須使用相同的版本庫類型" -#: rhodecode/model/validators.py:478 +#: rhodecode/model/validators.py:473 +#, fuzzy +msgid "You don't have permissions to create repository in this group" +msgstr "您沒有權限瀏覽這個頁面" + +#: rhodecode/model/validators.py:498 msgid "This username or users group name is not valid" msgstr "使用者名稱或群組名稱無效" -#: rhodecode/model/validators.py:562 +#: rhodecode/model/validators.py:582 msgid "This is not a valid path" msgstr "不是一個有效的路徑" -#: rhodecode/model/validators.py:577 +#: rhodecode/model/validators.py:597 msgid "This e-mail address is already taken" msgstr "這個郵件位址已經使用了" -#: rhodecode/model/validators.py:597 +#: rhodecode/model/validators.py:617 #, fuzzy, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "這個郵件位址不存在" -#: rhodecode/model/validators.py:634 +#: rhodecode/model/validators.py:654 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:653 +#: rhodecode/model/validators.py:673 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" @@ -1269,7 +1331,7 @@ #: rhodecode/templates/index_base.html:6 #: rhodecode/templates/admin/repos/repos.html:9 -#: rhodecode/templates/base/base.html:221 +#: rhodecode/templates/base/base.html:233 msgid "repositories" msgstr "個版本庫" @@ -1280,6 +1342,7 @@ msgstr "新增版本庫" #: rhodecode/templates/index_base.html:29 +#: rhodecode/templates/index_base.html:136 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:32 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:32 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:33 @@ -1289,9 +1352,10 @@ msgstr "群組名稱" #: rhodecode/templates/index_base.html:30 -#: rhodecode/templates/index_base.html:71 -#: rhodecode/templates/index_base.html:142 -#: rhodecode/templates/index_base.html:168 +#: rhodecode/templates/index_base.html:72 +#: rhodecode/templates/index_base.html:138 +#: rhodecode/templates/index_base.html:176 +#: rhodecode/templates/index_base.html:266 #: rhodecode/templates/admin/repos/repo_add_base.html:56 #: rhodecode/templates/admin/repos/repo_edit.html:75 #: rhodecode/templates/admin/repos/repos.html:72 @@ -1300,144 +1364,138 @@ #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34 #: rhodecode/templates/forks/fork.html:59 #: rhodecode/templates/settings/repo_settings.html:66 -#: rhodecode/templates/summary/summary.html:105 +#: rhodecode/templates/summary/summary.html:114 msgid "Description" msgstr "描述" #: rhodecode/templates/index_base.html:40 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:47 msgid "Repositories group" msgstr "版本庫群組" -#: rhodecode/templates/index_base.html:70 -#: rhodecode/templates/index_base.html:166 +#: rhodecode/templates/index_base.html:71 +#: rhodecode/templates/index_base.html:174 +#: rhodecode/templates/index_base.html:264 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:32 #: rhodecode/templates/admin/repos/repos.html:70 -#: rhodecode/templates/admin/users/user_edit.html:192 +#: rhodecode/templates/admin/users/user_edit.html:196 #: rhodecode/templates/admin/users/user_edit_my_account.html:59 -#: rhodecode/templates/admin/users/user_edit_my_account.html:157 -#: rhodecode/templates/admin/users/user_edit_my_account.html:193 +#: rhodecode/templates/admin/users/user_edit_my_account.html:180 +#: rhodecode/templates/admin/users/user_edit_my_account.html:216 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:184 #: rhodecode/templates/bookmarks/bookmarks.html:36 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 -#: rhodecode/templates/branches/branches.html:51 +#: rhodecode/templates/branches/branches.html:50 +#: rhodecode/templates/branches/branches_data.html:6 #: rhodecode/templates/files/files_browser.html:47 -#: rhodecode/templates/journal/journal.html:59 -#: rhodecode/templates/journal/journal.html:107 -#: rhodecode/templates/journal/journal.html:186 +#: rhodecode/templates/journal/journal.html:62 +#: rhodecode/templates/journal/journal.html:168 +#: rhodecode/templates/journal/journal_page_repos.html:7 #: rhodecode/templates/settings/repo_settings.html:31 #: rhodecode/templates/summary/summary.html:43 -#: rhodecode/templates/summary/summary.html:123 -#: rhodecode/templates/tags/tags.html:36 +#: rhodecode/templates/summary/summary.html:132 +#: rhodecode/templates/tags/tags.html:51 #: rhodecode/templates/tags/tags_data.html:6 msgid "Name" msgstr "名稱" -#: rhodecode/templates/index_base.html:72 +#: rhodecode/templates/index_base.html:73 msgid "Last change" msgstr "最後修改" -#: rhodecode/templates/index_base.html:73 -#: rhodecode/templates/index_base.html:171 -#: rhodecode/templates/admin/users/user_edit_my_account.html:159 -#: rhodecode/templates/journal/journal.html:188 +#: rhodecode/templates/index_base.html:74 +#: rhodecode/templates/index_base.html:179 +#: rhodecode/templates/admin/users/user_edit_my_account.html:182 +#: rhodecode/templates/journal/journal.html:170 msgid "Tip" msgstr "" -#: rhodecode/templates/index_base.html:74 -#: rhodecode/templates/index_base.html:173 +#: rhodecode/templates/index_base.html:75 +#: rhodecode/templates/index_base.html:181 +#: rhodecode/templates/index_base.html:269 #: rhodecode/templates/admin/repos/repo_edit.html:121 #: rhodecode/templates/admin/repos/repos.html:73 msgid "Owner" msgstr "擁有者" -#: rhodecode/templates/index_base.html:75 +#: rhodecode/templates/index_base.html:76 #: rhodecode/templates/summary/summary.html:48 #: rhodecode/templates/summary/summary.html:51 msgid "RSS" msgstr "" -#: rhodecode/templates/index_base.html:76 +#: rhodecode/templates/index_base.html:77 msgid "Atom" msgstr "" -#: rhodecode/templates/index_base.html:110 -#: rhodecode/templates/index_base.html:112 -#, python-format -msgid "Subscribe to %s rss feed" -msgstr "訂閱 %s rss" - -#: rhodecode/templates/index_base.html:117 -#: rhodecode/templates/index_base.html:119 -#, python-format -msgid "Subscribe to %s atom feed" -msgstr "訂閱 %s atom" - -#: rhodecode/templates/index_base.html:140 -#, fuzzy -msgid "Group Name" -msgstr "群組名稱" - -#: rhodecode/templates/index_base.html:158 -#: rhodecode/templates/index_base.html:198 +#: rhodecode/templates/index_base.html:167 +#: rhodecode/templates/index_base.html:207 +#: rhodecode/templates/index_base.html:291 #: rhodecode/templates/admin/repos/repos.html:94 -#: rhodecode/templates/admin/users/user_edit_my_account.html:179 +#: rhodecode/templates/admin/users/user_edit_my_account.html:202 #: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:60 -#: rhodecode/templates/branches/branches.html:77 -#: rhodecode/templates/journal/journal.html:211 -#: rhodecode/templates/tags/tags.html:60 +#: rhodecode/templates/branches/branches.html:76 +#: rhodecode/templates/journal/journal.html:193 +#: rhodecode/templates/tags/tags.html:77 msgid "Click to sort ascending" msgstr "" -#: rhodecode/templates/index_base.html:159 -#: rhodecode/templates/index_base.html:199 +#: rhodecode/templates/index_base.html:168 +#: rhodecode/templates/index_base.html:208 +#: rhodecode/templates/index_base.html:292 #: rhodecode/templates/admin/repos/repos.html:95 -#: rhodecode/templates/admin/users/user_edit_my_account.html:180 +#: rhodecode/templates/admin/users/user_edit_my_account.html:203 #: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:61 -#: rhodecode/templates/branches/branches.html:78 -#: rhodecode/templates/journal/journal.html:212 -#: rhodecode/templates/tags/tags.html:61 +#: rhodecode/templates/branches/branches.html:77 +#: rhodecode/templates/journal/journal.html:194 +#: rhodecode/templates/tags/tags.html:78 msgid "Click to sort descending" msgstr "" -#: rhodecode/templates/index_base.html:169 +#: rhodecode/templates/index_base.html:177 +#: rhodecode/templates/index_base.html:267 #, fuzzy msgid "Last Change" msgstr "最後修改" -#: rhodecode/templates/index_base.html:200 +#: rhodecode/templates/index_base.html:209 +#: rhodecode/templates/index_base.html:293 #: rhodecode/templates/admin/repos/repos.html:96 -#: rhodecode/templates/admin/users/user_edit_my_account.html:181 +#: rhodecode/templates/admin/users/user_edit_my_account.html:204 #: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:62 -#: rhodecode/templates/branches/branches.html:79 -#: rhodecode/templates/journal/journal.html:213 -#: rhodecode/templates/tags/tags.html:62 +#: rhodecode/templates/branches/branches.html:78 +#: rhodecode/templates/journal/journal.html:195 +#: rhodecode/templates/tags/tags.html:79 msgid "No records found." msgstr "" -#: rhodecode/templates/index_base.html:201 +#: rhodecode/templates/index_base.html:210 +#: rhodecode/templates/index_base.html:294 #: rhodecode/templates/admin/repos/repos.html:97 -#: rhodecode/templates/admin/users/user_edit_my_account.html:182 +#: rhodecode/templates/admin/users/user_edit_my_account.html:205 #: rhodecode/templates/admin/users/users.html:110 #: rhodecode/templates/bookmarks/bookmarks.html:63 -#: rhodecode/templates/branches/branches.html:80 -#: rhodecode/templates/journal/journal.html:214 -#: rhodecode/templates/tags/tags.html:63 +#: rhodecode/templates/branches/branches.html:79 +#: rhodecode/templates/journal/journal.html:196 +#: rhodecode/templates/tags/tags.html:80 msgid "Data error." msgstr "" -#: rhodecode/templates/index_base.html:202 +#: rhodecode/templates/index_base.html:211 +#: rhodecode/templates/index_base.html:295 #: rhodecode/templates/admin/repos/repos.html:98 -#: rhodecode/templates/admin/users/user_edit_my_account.html:183 +#: rhodecode/templates/admin/users/user_edit_my_account.html:206 #: rhodecode/templates/admin/users/users.html:111 #: rhodecode/templates/bookmarks/bookmarks.html:64 -#: rhodecode/templates/branches/branches.html:81 -#: rhodecode/templates/journal/journal.html:215 -#: rhodecode/templates/tags/tags.html:64 +#: rhodecode/templates/branches/branches.html:80 +#: rhodecode/templates/journal/journal.html:54 +#: rhodecode/templates/journal/journal.html:197 +#: rhodecode/templates/tags/tags.html:81 #, fuzzy msgid "Loading..." msgstr "載入中..." @@ -1456,7 +1514,7 @@ #: rhodecode/templates/admin/users/user_edit.html:50 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:26 #: rhodecode/templates/base/base.html:83 -#: rhodecode/templates/summary/summary.html:122 +#: rhodecode/templates/summary/summary.html:131 msgid "Username" msgstr "帳號" @@ -1514,23 +1572,23 @@ #: rhodecode/templates/register.html:47 #: rhodecode/templates/admin/users/user_add.html:59 -#: rhodecode/templates/admin/users/user_edit.html:86 +#: rhodecode/templates/admin/users/user_edit.html:90 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:53 msgid "First Name" msgstr "名" #: rhodecode/templates/register.html:56 #: rhodecode/templates/admin/users/user_add.html:68 -#: rhodecode/templates/admin/users/user_edit.html:95 +#: rhodecode/templates/admin/users/user_edit.html:99 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:62 msgid "Last Name" msgstr "姓" #: rhodecode/templates/register.html:65 #: rhodecode/templates/admin/users/user_add.html:77 -#: rhodecode/templates/admin/users/user_edit.html:104 +#: rhodecode/templates/admin/users/user_edit.html:108 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:71 -#: rhodecode/templates/summary/summary.html:124 +#: rhodecode/templates/summary/summary.html:133 msgid "Email" msgstr "電子郵件" @@ -1570,7 +1628,7 @@ msgstr "標籤" #: rhodecode/templates/switch_to_list.html:22 -#: rhodecode/templates/tags/tags_data.html:33 +#: rhodecode/templates/tags/tags_data.html:38 msgid "There are no tags yet" msgstr "沒有任何標籤" @@ -1594,8 +1652,8 @@ #: rhodecode/templates/admin/repos/repos.html:74 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:9 -#: rhodecode/templates/journal/journal.html:61 -#: rhodecode/templates/journal/journal.html:62 +#: rhodecode/templates/journal/journal_page_repos.html:9 +#: rhodecode/templates/journal/journal_page_repos.html:10 msgid "Action" msgstr "動作" @@ -1606,8 +1664,9 @@ #: rhodecode/templates/admin/admin_log.html:8 #: rhodecode/templates/bookmarks/bookmarks.html:37 #: rhodecode/templates/bookmarks/bookmarks_data.html:7 -#: rhodecode/templates/branches/branches.html:52 -#: rhodecode/templates/tags/tags.html:37 +#: rhodecode/templates/branches/branches.html:51 +#: rhodecode/templates/branches/branches_data.html:7 +#: rhodecode/templates/tags/tags.html:52 #: rhodecode/templates/tags/tags_data.html:7 msgid "Date" msgstr "時間" @@ -1616,7 +1675,7 @@ msgid "From IP" msgstr "來源IP" -#: rhodecode/templates/admin/admin_log.html:53 +#: rhodecode/templates/admin/admin_log.html:57 msgid "No actions yet" msgstr "" @@ -1696,8 +1755,8 @@ #: rhodecode/templates/admin/repos/repo_edit.html:141 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74 #: rhodecode/templates/admin/settings/hooks.html:73 -#: rhodecode/templates/admin/users/user_edit.html:129 -#: rhodecode/templates/admin/users/user_edit.html:174 +#: rhodecode/templates/admin/users/user_edit.html:133 +#: rhodecode/templates/admin/users/user_edit.html:178 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:79 #: rhodecode/templates/admin/users_groups/users_group_edit.html:135 #: rhodecode/templates/settings/repo_settings.html:93 @@ -1719,8 +1778,8 @@ msgstr "遞交" #: rhodecode/templates/admin/notifications/notifications.html:31 -#: rhodecode/templates/base/base.html:254 -#: rhodecode/templates/base/base.html:256 +#: rhodecode/templates/base/base.html:266 +#: rhodecode/templates/base/base.html:268 msgid "Pull requests" msgstr "" @@ -1750,7 +1809,7 @@ #: rhodecode/templates/admin/permissions/permissions.html:11 #: rhodecode/templates/admin/repos/repo_edit.html:134 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58 -#: rhodecode/templates/admin/users/user_edit.html:139 +#: rhodecode/templates/admin/users/user_edit.html:143 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100 #: rhodecode/templates/settings/repo_settings.html:86 msgid "Permissions" @@ -1793,7 +1852,7 @@ msgstr "版本庫建立" #: rhodecode/templates/admin/permissions/permissions.html:78 -#: rhodecode/templates/admin/repos/repo_edit.html:241 +#: rhodecode/templates/admin/repos/repo_edit.html:264 msgid "set" msgstr "設定" @@ -1813,8 +1872,8 @@ msgstr "新增" #: rhodecode/templates/admin/repos/repo_add_base.html:20 -#: rhodecode/templates/summary/summary.html:95 -#: rhodecode/templates/summary/summary.html:96 +#: rhodecode/templates/summary/summary.html:104 +#: rhodecode/templates/summary/summary.html:105 msgid "Clone from" msgstr "複製由" @@ -1892,12 +1951,14 @@ #: rhodecode/templates/admin/repos/repo_edit.html:13 #: rhodecode/templates/admin/users/user_edit.html:13 -#: rhodecode/templates/admin/users/user_edit.html:224 -#: rhodecode/templates/admin/users/user_edit.html:226 +#: rhodecode/templates/admin/users/user_edit.html:228 +#: rhodecode/templates/admin/users/user_edit.html:230 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13 -#: rhodecode/templates/files/files_source.html:44 -#: rhodecode/templates/journal/journal.html:81 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:207 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:209 +#: rhodecode/templates/files/files_source.html:29 +#: rhodecode/templates/journal/journal_page_repos.html:29 msgid "edit" msgstr "編輯" @@ -1945,11 +2006,11 @@ #: rhodecode/templates/admin/repos/repo_edit.html:142 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75 #: rhodecode/templates/admin/settings/settings.html:113 -#: rhodecode/templates/admin/settings/settings.html:168 -#: rhodecode/templates/admin/settings/settings.html:258 -#: rhodecode/templates/admin/users/user_edit.html:130 -#: rhodecode/templates/admin/users/user_edit.html:175 -#: rhodecode/templates/admin/users/user_edit.html:278 +#: rhodecode/templates/admin/settings/settings.html:179 +#: rhodecode/templates/admin/settings/settings.html:269 +#: rhodecode/templates/admin/users/user_edit.html:134 +#: rhodecode/templates/admin/users/user_edit.html:179 +#: rhodecode/templates/admin/users/user_edit.html:282 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:80 #: rhodecode/templates/admin/users_groups/users_group_edit.html:136 #: rhodecode/templates/files/files_add.html:82 @@ -2007,82 +2068,107 @@ msgid "Confirm to invalidate repository cache" msgstr "確認廢止版本庫快取" -#: rhodecode/templates/admin/repos/repo_edit.html:195 -#: rhodecode/templates/base/base.html:318 -#: rhodecode/templates/base/base.html:320 -#: rhodecode/templates/base/base.html:322 -msgid "Public journal" -msgstr "公開日誌" +#: rhodecode/templates/admin/repos/repo_edit.html:193 +msgid "" +"Manually invalidate cache for this repository. On first access repository" +" will be cached again" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:198 +msgid "List of cached values" +msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:201 -msgid "Remove from public journal" -msgstr "從公開日誌移除" +msgid "Prefix" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:202 +msgid "Key" +msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:203 +#: rhodecode/templates/admin/users/user_add.html:86 +#: rhodecode/templates/admin/users/user_edit.html:117 +#: rhodecode/templates/admin/users_groups/users_group_add.html:41 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:42 +msgid "Active" +msgstr "啟用" + +#: rhodecode/templates/admin/repos/repo_edit.html:218 +#: rhodecode/templates/base/base.html:330 +#: rhodecode/templates/base/base.html:332 +#: rhodecode/templates/base/base.html:334 +msgid "Public journal" +msgstr "公開日誌" + +#: rhodecode/templates/admin/repos/repo_edit.html:224 +msgid "Remove from public journal" +msgstr "從公開日誌移除" + +#: rhodecode/templates/admin/repos/repo_edit.html:226 msgid "Add to public journal" msgstr "新增至公開日誌" -#: rhodecode/templates/admin/repos/repo_edit.html:208 +#: rhodecode/templates/admin/repos/repo_edit.html:231 msgid "" "All actions made on this repository will be accessible to everyone in " "public journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:215 +#: rhodecode/templates/admin/repos/repo_edit.html:238 #, fuzzy msgid "Locking" msgstr "解鎖" -#: rhodecode/templates/admin/repos/repo_edit.html:220 +#: rhodecode/templates/admin/repos/repo_edit.html:243 msgid "Unlock locked repo" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:220 +#: rhodecode/templates/admin/repos/repo_edit.html:243 #, fuzzy msgid "Confirm to unlock repository" msgstr "確認移除這個版本庫" -#: rhodecode/templates/admin/repos/repo_edit.html:223 +#: rhodecode/templates/admin/repos/repo_edit.html:246 msgid "lock repo" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:223 +#: rhodecode/templates/admin/repos/repo_edit.html:246 #, fuzzy msgid "Confirm to lock repository" msgstr "確認移除這個版本庫" -#: rhodecode/templates/admin/repos/repo_edit.html:224 +#: rhodecode/templates/admin/repos/repo_edit.html:247 #, fuzzy msgid "Repository is not locked" msgstr "個版本庫" -#: rhodecode/templates/admin/repos/repo_edit.html:229 +#: rhodecode/templates/admin/repos/repo_edit.html:252 msgid "Force locking on repository. Works only when anonymous access is disabled" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:236 +#: rhodecode/templates/admin/repos/repo_edit.html:259 msgid "Set as fork of" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:245 +#: rhodecode/templates/admin/repos/repo_edit.html:268 msgid "Manually set this repository as a fork of another from the list" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:251 +#: rhodecode/templates/admin/repos/repo_edit.html:274 #: rhodecode/templates/changeset/changeset_file_comment.html:26 msgid "Delete" msgstr "移除" -#: rhodecode/templates/admin/repos/repo_edit.html:255 +#: rhodecode/templates/admin/repos/repo_edit.html:278 msgid "Remove this repository" msgstr "移除版本庫" -#: rhodecode/templates/admin/repos/repo_edit.html:255 -#: rhodecode/templates/journal/journal.html:84 +#: rhodecode/templates/admin/repos/repo_edit.html:278 msgid "Confirm to delete this repository" msgstr "確認移除這個版本庫" -#: rhodecode/templates/admin/repos/repo_edit.html:259 +#: rhodecode/templates/admin/repos/repo_edit.html:282 msgid "" "This repository will be renamed in a special way in order to be " "unaccesible for RhodeCode and VCS systems.\n" @@ -2108,7 +2194,7 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:6 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6 #: rhodecode/templates/admin/users/users.html:85 -#: rhodecode/templates/base/base.html:217 +#: rhodecode/templates/base/base.html:229 msgid "admin" msgstr "管理員" @@ -2119,8 +2205,8 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:16 #: rhodecode/templates/data_table/_dt_elements.html:67 -#: rhodecode/templates/journal/journal.html:132 -#: rhodecode/templates/summary/summary.html:76 +#: rhodecode/templates/journal/journal.html:87 +#: rhodecode/templates/summary/summary.html:85 msgid "private repository" msgstr "私有版本庫" @@ -2144,12 +2230,12 @@ msgstr "新增另ㄧ位成員" #: rhodecode/templates/admin/repos/repo_edit_perms.html:97 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 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:96 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:103 msgid "Failed to remove users group" msgstr "移除使用者群組失敗" @@ -2157,11 +2243,44 @@ msgid "Repositories administration" msgstr "版本庫管理員" -#: rhodecode/templates/admin/repos_groups/repos_groups.html:8 -msgid "Groups" -msgstr "群組" - -#: rhodecode/templates/admin/repos_groups/repos_groups.html:12 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:73 +msgid "apply to children" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:74 +msgid "" +"Set or revoke permission to all children of that group, including " +"repositories and other groups" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_groups.html:9 +#: rhodecode/templates/base/base.html:122 +#: rhodecode/templates/base/base.html:312 +#: rhodecode/templates/base/base.html:314 +#: rhodecode/templates/base/base.html:316 +#: rhodecode/templates/bookmarks/bookmarks.html:11 +#: rhodecode/templates/branches/branches.html:10 +#: rhodecode/templates/changelog/changelog.html:10 +#: rhodecode/templates/changeset/changeset.html:10 +#: rhodecode/templates/changeset/changeset_range.html:9 +#: rhodecode/templates/compare/compare_diff.html:9 +#: rhodecode/templates/files/file_diff.html:8 +#: rhodecode/templates/files/files.html:8 +#: rhodecode/templates/files/files_add.html:15 +#: rhodecode/templates/files/files_edit.html:15 +#: rhodecode/templates/followers/followers.html:9 +#: rhodecode/templates/forks/fork.html:9 rhodecode/templates/forks/forks.html:9 +#: rhodecode/templates/pullrequests/pullrequest.html:8 +#: rhodecode/templates/pullrequests/pullrequest_show.html:8 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 +#: rhodecode/templates/settings/repo_settings.html:9 +#: rhodecode/templates/shortlog/shortlog.html:10 +#: rhodecode/templates/summary/summary.html:8 +#: rhodecode/templates/tags/tags.html:11 +msgid "Home" +msgstr "首頁" + +#: rhodecode/templates/admin/repos_groups/repos_groups.html:13 msgid "with" msgstr "" @@ -2187,7 +2306,7 @@ #: rhodecode/templates/admin/users/user_add.html:94 #: rhodecode/templates/admin/users_groups/users_group_add.html:49 #: rhodecode/templates/admin/users_groups/users_group_edit.html:90 -#: rhodecode/templates/pullrequests/pullrequest_show.html:113 +#: rhodecode/templates/pullrequests/pullrequest_show.html:131 msgid "save" msgstr "儲存" @@ -2224,20 +2343,21 @@ msgid "action" msgstr "動作" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 -#: rhodecode/templates/admin/users/user_edit.html:255 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55 +#: rhodecode/templates/admin/users/user_edit.html:259 #: rhodecode/templates/admin/users_groups/users_groups.html:44 #: rhodecode/templates/data_table/_dt_elements.html:7 -#: rhodecode/templates/data_table/_dt_elements.html:103 +#: rhodecode/templates/data_table/_dt_elements.html:121 msgid "delete" msgstr "刪除" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55 #, fuzzy, python-format -msgid "Confirm to delete this group: %s" -msgstr "確認刪除這個群組" - -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:62 +msgid "Confirm to delete this group: %s with %s repository" +msgid_plural "Confirm to delete this group: %s with %s repositories" +msgstr[0] "確認移除這個版本庫" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:63 msgid "There are no repositories groups yet" msgstr "沒有任何版本庫群組" @@ -2330,8 +2450,8 @@ msgstr "" #: rhodecode/templates/admin/settings/settings.html:112 -#: rhodecode/templates/admin/settings/settings.html:167 -#: rhodecode/templates/admin/settings/settings.html:257 +#: rhodecode/templates/admin/settings/settings.html:178 +#: rhodecode/templates/admin/settings/settings.html:268 msgid "Save settings" msgstr "儲存設定" @@ -2340,132 +2460,142 @@ msgid "Visualisation settings" msgstr "全域設定" -#: rhodecode/templates/admin/settings/settings.html:128 +#: rhodecode/templates/admin/settings/settings.html:127 +#, fuzzy +msgid "General" +msgstr "啟用" + +#: rhodecode/templates/admin/settings/settings.html:132 +msgid "Use lightweight dashboard" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:139 #, fuzzy msgid "Icons" msgstr "選項" -#: rhodecode/templates/admin/settings/settings.html:133 +#: rhodecode/templates/admin/settings/settings.html:144 msgid "Show public repo icon on repositories" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:137 +#: rhodecode/templates/admin/settings/settings.html:148 #, fuzzy msgid "Show private repo icon on repositories" msgstr "私有版本庫" -#: rhodecode/templates/admin/settings/settings.html:144 +#: rhodecode/templates/admin/settings/settings.html:155 #, fuzzy msgid "Meta-Tagging" msgstr "設定" -#: rhodecode/templates/admin/settings/settings.html:149 +#: rhodecode/templates/admin/settings/settings.html:160 msgid "Stylify recognised metatags:" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:176 +#: rhodecode/templates/admin/settings/settings.html:187 #, fuzzy msgid "VCS settings" msgstr "設定" -#: rhodecode/templates/admin/settings/settings.html:185 +#: rhodecode/templates/admin/settings/settings.html:196 msgid "Web" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:190 +#: rhodecode/templates/admin/settings/settings.html:201 #, fuzzy msgid "require ssl for vcs operations" msgstr "推送時要求使用SSL" -#: rhodecode/templates/admin/settings/settings.html:192 +#: rhodecode/templates/admin/settings/settings.html:203 msgid "" "RhodeCode will require SSL for pushing or pulling. If SSL is missing it " "will return HTTP Error 406: Not Acceptable" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:198 +#: rhodecode/templates/admin/settings/settings.html:209 msgid "Hooks" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:203 +#: rhodecode/templates/admin/settings/settings.html:214 msgid "Update repository after push (hg update)" msgstr "push後更新版本庫 (hg update)" -#: rhodecode/templates/admin/settings/settings.html:207 +#: rhodecode/templates/admin/settings/settings.html:218 msgid "Show repository size after push" msgstr "push 後顯示版本庫大小" -#: rhodecode/templates/admin/settings/settings.html:211 +#: rhodecode/templates/admin/settings/settings.html:222 msgid "Log user push commands" msgstr "紀錄使用者推送命令" -#: rhodecode/templates/admin/settings/settings.html:215 +#: rhodecode/templates/admin/settings/settings.html:226 msgid "Log user pull commands" msgstr "紀錄使用者抓取命令" -#: rhodecode/templates/admin/settings/settings.html:219 +#: rhodecode/templates/admin/settings/settings.html:230 msgid "advanced setup" msgstr "進階設定" -#: rhodecode/templates/admin/settings/settings.html:224 +#: rhodecode/templates/admin/settings/settings.html:235 #, fuzzy msgid "Mercurial Extensions" msgstr "Mercurial 版本庫" -#: rhodecode/templates/admin/settings/settings.html:229 +#: rhodecode/templates/admin/settings/settings.html:240 msgid "largefiles extensions" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:233 +#: rhodecode/templates/admin/settings/settings.html:244 msgid "hgsubversion extensions" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:235 +#: rhodecode/templates/admin/settings/settings.html:246 msgid "" "Requires hgsubversion library installed. Allows clonning from svn remote " "locations" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:245 +#: rhodecode/templates/admin/settings/settings.html:256 msgid "Repositories location" msgstr "版本庫路徑" -#: rhodecode/templates/admin/settings/settings.html:250 +#: rhodecode/templates/admin/settings/settings.html:261 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:251 +#: rhodecode/templates/admin/settings/settings.html:262 +#: rhodecode/templates/base/base.html:221 msgid "unlock" msgstr "解鎖" -#: rhodecode/templates/admin/settings/settings.html:252 +#: rhodecode/templates/admin/settings/settings.html:263 msgid "" "Location where repositories are stored. After changing this value a " "restart, and rescan is required" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:272 +#: rhodecode/templates/admin/settings/settings.html:283 msgid "Test Email" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:280 +#: rhodecode/templates/admin/settings/settings.html:291 #, fuzzy msgid "Email to" msgstr "電子郵件" -#: rhodecode/templates/admin/settings/settings.html:288 +#: rhodecode/templates/admin/settings/settings.html:299 #, fuzzy msgid "Send" msgstr "秒" -#: rhodecode/templates/admin/settings/settings.html:294 +#: rhodecode/templates/admin/settings/settings.html:305 msgid "System Info and Packages" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:297 +#: rhodecode/templates/admin/settings/settings.html:308 #, fuzzy msgid "show" msgstr "顯示" @@ -2488,13 +2618,6 @@ msgid "Password confirmation" msgstr "密碼不相符" -#: rhodecode/templates/admin/users/user_add.html:86 -#: rhodecode/templates/admin/users/user_edit.html:113 -#: rhodecode/templates/admin/users_groups/users_group_add.html:41 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:42 -msgid "Active" -msgstr "啟用" - #: rhodecode/templates/admin/users/user_edit.html:5 msgid "Edit user" msgstr "編輯使用者" @@ -2514,27 +2637,27 @@ msgid "API key" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:59 +#: rhodecode/templates/admin/users/user_edit.html:63 msgid "LDAP DN" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:68 +#: rhodecode/templates/admin/users/user_edit.html:72 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:35 msgid "New password" msgstr "新密碼" -#: rhodecode/templates/admin/users/user_edit.html:77 +#: rhodecode/templates/admin/users/user_edit.html:81 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:44 msgid "New password confirmation" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:147 +#: rhodecode/templates/admin/users/user_edit.html:151 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108 #, fuzzy msgid "Inherit default permissions" msgstr "預設權限" -#: rhodecode/templates/admin/users/user_edit.html:152 +#: rhodecode/templates/admin/users/user_edit.html:156 #: rhodecode/templates/admin/users_groups/users_group_edit.html:113 #, python-format msgid "" @@ -2542,52 +2665,54 @@ "options does not have any action" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:158 +#: rhodecode/templates/admin/users/user_edit.html:162 #: rhodecode/templates/admin/users_groups/users_group_edit.html:119 msgid "Create repositories" msgstr "建立版本庫" -#: rhodecode/templates/admin/users/user_edit.html:166 +#: rhodecode/templates/admin/users/user_edit.html:170 #: rhodecode/templates/admin/users_groups/users_group_edit.html:127 #, fuzzy msgid "Fork repositories" msgstr "個版本庫" -#: rhodecode/templates/admin/users/user_edit.html:186 +#: rhodecode/templates/admin/users/user_edit.html:190 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39 #, fuzzy msgid "Nothing here yet" msgstr "尚未有任何變更" -#: rhodecode/templates/admin/users/user_edit.html:193 +#: rhodecode/templates/admin/users/user_edit.html:197 #: rhodecode/templates/admin/users/user_edit_my_account.html:60 -#: rhodecode/templates/admin/users/user_edit_my_account.html:194 +#: rhodecode/templates/admin/users/user_edit_my_account.html:217 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:185 #, fuzzy msgid "Permission" msgstr "權限" -#: rhodecode/templates/admin/users/user_edit.html:194 +#: rhodecode/templates/admin/users/user_edit.html:198 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:186 #, fuzzy msgid "Edit Permission" msgstr "版本庫權限" -#: rhodecode/templates/admin/users/user_edit.html:243 +#: rhodecode/templates/admin/users/user_edit.html:247 #, fuzzy msgid "Email addresses" msgstr "郵件位址" -#: rhodecode/templates/admin/users/user_edit.html:256 +#: rhodecode/templates/admin/users/user_edit.html:260 #, fuzzy, python-format msgid "Confirm to delete this email: %s" msgstr "確認刪除這個使用者" -#: rhodecode/templates/admin/users/user_edit.html:270 +#: rhodecode/templates/admin/users/user_edit.html:274 #, fuzzy msgid "New email address" msgstr "郵件位址" -#: rhodecode/templates/admin/users/user_edit.html:277 +#: rhodecode/templates/admin/users/user_edit.html:281 #, fuzzy msgid "Add" msgstr "新增" @@ -2649,31 +2774,33 @@ #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:7 #: rhodecode/templates/bookmarks/bookmarks.html:40 #: rhodecode/templates/bookmarks/bookmarks_data.html:9 -#: rhodecode/templates/branches/branches.html:55 -#: rhodecode/templates/journal/journal.html:60 -#: rhodecode/templates/tags/tags.html:40 +#: rhodecode/templates/branches/branches.html:54 +#: rhodecode/templates/branches/branches_data.html:9 +#: rhodecode/templates/journal/journal_page_repos.html:8 +#: rhodecode/templates/tags/tags.html:55 #: rhodecode/templates/tags/tags_data.html:9 msgid "Revision" msgstr "修訂" #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28 -#: rhodecode/templates/journal/journal.html:81 +#: rhodecode/templates/journal/journal_page_repos.html:29 msgid "private" msgstr "私有" #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:31 #: rhodecode/templates/data_table/_dt_elements.html:7 +#: rhodecode/templates/journal/journal_page_repos.html:32 #, fuzzy, python-format msgid "Confirm to delete this repository: %s" msgstr "確認移除這個版本庫" #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:38 -#: rhodecode/templates/journal/journal.html:94 +#: rhodecode/templates/journal/journal_page_repos.html:42 msgid "No repositories yet" msgstr "沒有任何版本庫" #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:40 -#: rhodecode/templates/journal/journal.html:96 +#: rhodecode/templates/journal/journal_page_repos.html:44 msgid "create one now" msgstr "" @@ -2682,7 +2809,7 @@ msgstr "使用者管理員" #: rhodecode/templates/admin/users/users.html:9 -#: rhodecode/templates/base/base.html:223 +#: rhodecode/templates/base/base.html:235 msgid "users" msgstr "使用者" @@ -2713,7 +2840,7 @@ msgstr "啟用" #: rhodecode/templates/admin/users/users.html:86 -#: rhodecode/templates/base/base.html:226 +#: rhodecode/templates/base/base.html:238 msgid "ldap" msgstr "" @@ -2763,6 +2890,21 @@ msgid "Group members" msgstr "選擇群組成員" +#: rhodecode/templates/admin/users_groups/users_group_edit.html:163 +#, fuzzy +msgid "No members yet" +msgstr "成員" + +#: rhodecode/templates/admin/users_groups/users_group_edit.html:171 +#, fuzzy +msgid "Permissions defined for this group" +msgstr "權限管理員" + +#: rhodecode/templates/admin/users_groups/users_group_edit.html:178 +#, fuzzy +msgid "No permissions set yet" +msgstr "權限" + #: rhodecode/templates/admin/users_groups/users_groups.html:5 msgid "Users groups administration" msgstr "使用者群組管理員" @@ -2806,36 +2948,10 @@ msgid "Inbox" msgstr "" -#: rhodecode/templates/base/base.html:122 -#: rhodecode/templates/base/base.html:300 -#: rhodecode/templates/base/base.html:302 -#: rhodecode/templates/base/base.html:304 -#: rhodecode/templates/bookmarks/bookmarks.html:11 -#: rhodecode/templates/branches/branches.html:10 -#: rhodecode/templates/changelog/changelog.html:10 -#: rhodecode/templates/changeset/changeset.html:10 -#: rhodecode/templates/changeset/changeset_range.html:9 -#: rhodecode/templates/compare/compare_diff.html:9 -#: rhodecode/templates/files/file_diff.html:8 -#: rhodecode/templates/files/files.html:8 -#: rhodecode/templates/files/files_add.html:15 -#: rhodecode/templates/files/files_edit.html:15 -#: rhodecode/templates/followers/followers.html:9 -#: rhodecode/templates/forks/fork.html:9 rhodecode/templates/forks/forks.html:9 -#: rhodecode/templates/pullrequests/pullrequest.html:8 -#: rhodecode/templates/pullrequests/pullrequest_show.html:8 -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 -#: rhodecode/templates/settings/repo_settings.html:9 -#: rhodecode/templates/shortlog/shortlog.html:10 -#: rhodecode/templates/summary/summary.html:8 -#: rhodecode/templates/tags/tags.html:11 -msgid "Home" -msgstr "首頁" - #: rhodecode/templates/base/base.html:123 -#: rhodecode/templates/base/base.html:309 -#: rhodecode/templates/base/base.html:311 -#: rhodecode/templates/base/base.html:313 +#: rhodecode/templates/base/base.html:321 +#: rhodecode/templates/base/base.html:323 +#: rhodecode/templates/base/base.html:325 #: rhodecode/templates/journal/journal.html:4 #: rhodecode/templates/journal/journal.html:21 #: rhodecode/templates/journal/public_journal.html:4 @@ -2855,7 +2971,7 @@ msgstr "" #: rhodecode/templates/base/base.html:152 -#: rhodecode/templates/base/base.html:182 +#: rhodecode/templates/base/base.html:182 rhodecode/templates/base/root.html:47 msgid "loading..." msgstr "載入中..." @@ -2900,50 +3016,64 @@ #: rhodecode/templates/base/base.html:204 #: rhodecode/templates/base/base.html:206 -#: rhodecode/templates/base/base.html:227 -msgid "settings" -msgstr "設定" - -#: rhodecode/templates/base/base.html:209 +#, fuzzy +msgid "repository settings" +msgstr "版本庫建立" + +#: rhodecode/templates/base/base.html:210 #: rhodecode/templates/data_table/_dt_elements.html:80 #: rhodecode/templates/forks/fork.html:13 msgid "fork" msgstr "" -#: rhodecode/templates/base/base.html:211 -#: rhodecode/templates/changelog/changelog.html:40 +#: rhodecode/templates/base/base.html:212 rhodecode/templates/base/root.html:50 +#: rhodecode/templates/changelog/changelog.html:43 msgid "Open new pull request" msgstr "" -#: rhodecode/templates/base/base.html:213 +#: rhodecode/templates/base/base.html:215 +#: rhodecode/templates/forks/forks_data.html:21 +msgid "Compare fork" +msgstr "" + +#: rhodecode/templates/base/base.html:217 msgid "search" msgstr "搜尋" -#: rhodecode/templates/base/base.html:222 +#: rhodecode/templates/base/base.html:223 +#, fuzzy +msgid "lock" +msgstr "解鎖" + +#: rhodecode/templates/base/base.html:234 msgid "repositories groups" msgstr "版本庫群組" -#: rhodecode/templates/base/base.html:224 +#: rhodecode/templates/base/base.html:236 msgid "users groups" msgstr "使用者群組" -#: rhodecode/templates/base/base.html:225 +#: rhodecode/templates/base/base.html:237 msgid "permissions" msgstr "權限" -#: rhodecode/templates/base/base.html:238 -#: rhodecode/templates/base/base.html:240 +#: rhodecode/templates/base/base.html:239 +msgid "settings" +msgstr "設定" + +#: rhodecode/templates/base/base.html:250 +#: rhodecode/templates/base/base.html:252 msgid "Followers" msgstr "追蹤者" -#: rhodecode/templates/base/base.html:246 -#: rhodecode/templates/base/base.html:248 +#: rhodecode/templates/base/base.html:258 +#: rhodecode/templates/base/base.html:260 msgid "Forks" msgstr "" -#: rhodecode/templates/base/base.html:327 -#: rhodecode/templates/base/base.html:329 -#: rhodecode/templates/base/base.html:331 +#: rhodecode/templates/base/base.html:339 +#: rhodecode/templates/base/base.html:341 +#: rhodecode/templates/base/base.html:343 #: rhodecode/templates/search/search.html:52 msgid "Search" msgstr "搜尋" @@ -2954,7 +3084,7 @@ msgstr "新增另ㄧ位成員" #: rhodecode/templates/base/root.html:43 -#: rhodecode/templates/journal/journal.html:120 +#: rhodecode/templates/journal/journal.html:75 #: rhodecode/templates/summary/summary.html:57 msgid "Stop following this repository" msgstr "停止追蹤這個版本庫" @@ -2968,14 +3098,26 @@ msgid "Group" msgstr "群組" -#: rhodecode/templates/base/root.html:47 +#: rhodecode/templates/base/root.html:48 msgid "search truncated" msgstr "" -#: rhodecode/templates/base/root.html:48 +#: rhodecode/templates/base/root.html:49 msgid "no matching files" msgstr "無符合的檔案" +#: rhodecode/templates/base/root.html:51 +msgid "Open new pull request for selected changesets" +msgstr "" + +#: rhodecode/templates/base/root.html:52 +msgid "Show selected changes __S -> __E" +msgstr "" + +#: rhodecode/templates/base/root.html:53 +msgid "Selection link" +msgstr "" + #: rhodecode/templates/bookmarks/bookmarks.html:5 #, python-format msgid "%s Bookmarks" @@ -2983,8 +3125,9 @@ #: rhodecode/templates/bookmarks/bookmarks.html:39 #: rhodecode/templates/bookmarks/bookmarks_data.html:8 -#: rhodecode/templates/branches/branches.html:54 -#: rhodecode/templates/tags/tags.html:39 +#: rhodecode/templates/branches/branches.html:53 +#: rhodecode/templates/branches/branches_data.html:8 +#: rhodecode/templates/tags/tags.html:54 #: rhodecode/templates/tags/tags_data.html:8 #, fuzzy msgid "Author" @@ -3000,36 +3143,16 @@ msgid "Compare branches" msgstr "分支" -#: rhodecode/templates/branches/branches.html:57 +#: rhodecode/templates/branches/branches.html:56 +#: rhodecode/templates/branches/branches_data.html:10 #: rhodecode/templates/compare/compare_diff.html:5 #: rhodecode/templates/compare/compare_diff.html:13 +#: rhodecode/templates/tags/tags.html:57 +#: rhodecode/templates/tags/tags_data.html:10 #, fuzzy msgid "Compare" msgstr "比較顯示" -#: rhodecode/templates/branches/branches_data.html:6 -msgid "name" -msgstr "名字" - -#: rhodecode/templates/branches/branches_data.html:7 -msgid "date" -msgstr "日期" - -#: rhodecode/templates/branches/branches_data.html:8 -#: rhodecode/templates/shortlog/shortlog_data.html:8 -msgid "author" -msgstr "作者" - -#: rhodecode/templates/branches/branches_data.html:9 -#: rhodecode/templates/shortlog/shortlog_data.html:5 -msgid "revision" -msgstr "修訂" - -#: rhodecode/templates/branches/branches_data.html:10 -#, fuzzy -msgid "compare" -msgstr "比較顯示" - #: rhodecode/templates/changelog/changelog.html:6 #, fuzzy, python-format msgid "%s Changelog" @@ -3042,58 +3165,65 @@ msgstr[0] "" #: rhodecode/templates/changelog/changelog.html:37 +#, fuzzy +msgid "Clear selection" +msgstr "搜尋選項" + +#: rhodecode/templates/changelog/changelog.html:40 #: rhodecode/templates/forks/forks_data.html:19 #, python-format msgid "compare fork with %s" msgstr "" -#: rhodecode/templates/changelog/changelog.html:37 -#: rhodecode/templates/forks/forks_data.html:21 -msgid "Compare fork" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:46 +#: rhodecode/templates/changelog/changelog.html:40 +msgid "Compare fork with parent" +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:49 msgid "Show" msgstr "顯示" -#: rhodecode/templates/changelog/changelog.html:72 -#: rhodecode/templates/summary/summary.html:364 +#: rhodecode/templates/changelog/changelog.html:74 +#: rhodecode/templates/summary/summary.html:375 msgid "show more" msgstr "顯示更多" -#: rhodecode/templates/changelog/changelog.html:76 +#: rhodecode/templates/changelog/changelog.html:78 msgid "Affected number of files, click to show more details" msgstr "" -#: rhodecode/templates/changelog/changelog.html:89 -#: rhodecode/templates/changeset/changeset.html:38 +#: rhodecode/templates/changelog/changelog.html:91 +#: rhodecode/templates/changeset/changeset.html:44 #: rhodecode/templates/changeset/changeset_file_comment.html:20 #: rhodecode/templates/changeset/changeset_range.html:46 #, fuzzy msgid "Changeset status" msgstr "變更" -#: rhodecode/templates/changelog/changelog.html:92 +#: rhodecode/templates/changelog/changelog.html:94 +#: rhodecode/templates/shortlog/shortlog_data.html:20 msgid "Click to open associated pull request" msgstr "" -#: rhodecode/templates/changelog/changelog.html:102 -#: rhodecode/templates/changeset/changeset.html:78 +#: rhodecode/templates/changelog/changelog.html:104 +#: rhodecode/templates/changeset/changeset.html:85 msgid "Parent" msgstr "" -#: rhodecode/templates/changelog/changelog.html:108 -#: rhodecode/templates/changeset/changeset.html:84 +#: rhodecode/templates/changelog/changelog.html:110 +#: rhodecode/templates/changeset/changeset.html:91 msgid "No parents" msgstr "" -#: rhodecode/templates/changelog/changelog.html:113 -#: rhodecode/templates/changeset/changeset.html:88 +#: rhodecode/templates/changelog/changelog.html:115 +#: rhodecode/templates/changeset/changeset.html:95 +#: rhodecode/templates/changeset/changeset_range.html:79 msgid "merge" msgstr "合併" -#: rhodecode/templates/changelog/changelog.html:116 -#: rhodecode/templates/changeset/changeset.html:91 +#: rhodecode/templates/changelog/changelog.html:118 +#: rhodecode/templates/changeset/changeset.html:98 +#: rhodecode/templates/changeset/changeset_range.html:82 #: rhodecode/templates/files/files.html:29 #: rhodecode/templates/files/files_add.html:33 #: rhodecode/templates/files/files_edit.html:33 @@ -3101,44 +3231,42 @@ msgid "branch" msgstr "分支" -#: rhodecode/templates/changelog/changelog.html:122 +#: rhodecode/templates/changelog/changelog.html:124 +#: rhodecode/templates/changeset/changeset_range.html:88 msgid "bookmark" msgstr "" -#: rhodecode/templates/changelog/changelog.html:128 -#: rhodecode/templates/changeset/changeset.html:96 +#: rhodecode/templates/changelog/changelog.html:130 +#: rhodecode/templates/changeset/changeset.html:103 +#: rhodecode/templates/changeset/changeset_range.html:94 msgid "tag" msgstr "標籤" -#: rhodecode/templates/changelog/changelog.html:164 -msgid "Show selected changes __S -> __E" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:255 +#: rhodecode/templates/changelog/changelog.html:301 msgid "There are no changes yet" msgstr "尚未有任何變更" #: rhodecode/templates/changelog/changelog_details.html:4 -#: rhodecode/templates/changeset/changeset.html:66 +#: rhodecode/templates/changeset/changeset.html:73 msgid "removed" msgstr "移除" #: rhodecode/templates/changelog/changelog_details.html:5 -#: rhodecode/templates/changeset/changeset.html:67 +#: rhodecode/templates/changeset/changeset.html:74 msgid "changed" msgstr "修改" #: rhodecode/templates/changelog/changelog_details.html:6 -#: rhodecode/templates/changeset/changeset.html:68 +#: rhodecode/templates/changeset/changeset.html:75 msgid "added" msgstr "新增" #: rhodecode/templates/changelog/changelog_details.html:8 #: rhodecode/templates/changelog/changelog_details.html:9 #: rhodecode/templates/changelog/changelog_details.html:10 -#: rhodecode/templates/changeset/changeset.html:70 -#: rhodecode/templates/changeset/changeset.html:71 -#: rhodecode/templates/changeset/changeset.html:72 +#: rhodecode/templates/changeset/changeset.html:77 +#: rhodecode/templates/changeset/changeset.html:78 +#: rhodecode/templates/changeset/changeset.html:79 #, python-format msgid "affected %s files" msgstr "" @@ -3152,38 +3280,50 @@ msgid "Changeset" msgstr "" -#: rhodecode/templates/changeset/changeset.html:43 +#: rhodecode/templates/changeset/changeset.html:49 #: rhodecode/templates/changeset/diff_block.html:20 msgid "raw diff" msgstr "原始差異" -#: rhodecode/templates/changeset/changeset.html:44 +#: rhodecode/templates/changeset/changeset.html:50 +#, fuzzy +msgid "patch diff" +msgstr "原始差異" + +#: rhodecode/templates/changeset/changeset.html:51 #: rhodecode/templates/changeset/diff_block.html:21 msgid "download diff" msgstr "下載差異" -#: rhodecode/templates/changeset/changeset.html:48 +#: rhodecode/templates/changeset/changeset.html:55 #: rhodecode/templates/changeset/changeset_file_comment.html:82 #, fuzzy, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "遞交" -#: rhodecode/templates/changeset/changeset.html:48 +#: rhodecode/templates/changeset/changeset.html:55 #: rhodecode/templates/changeset/changeset_file_comment.html:82 #, python-format msgid "(%d inline)" msgid_plural "(%d inline)" msgstr[0] "" -#: rhodecode/templates/changeset/changeset.html:103 +#: rhodecode/templates/changeset/changeset.html:111 +#: rhodecode/templates/compare/compare_diff.html:44 +#: rhodecode/templates/pullrequests/pullrequest_show.html:76 +#, fuzzy, python-format +msgid "%s file changed" +msgid_plural "%s files changed" +msgstr[0] "檔案修改" + +#: rhodecode/templates/changeset/changeset.html:113 +#: rhodecode/templates/compare/compare_diff.html:46 +#: rhodecode/templates/pullrequests/pullrequest_show.html:78 #, python-format -msgid "%s files affected with %s insertions and %s deletions:" -msgstr "" - -#: rhodecode/templates/changeset/changeset.html:119 -msgid "Changeset was too big and was cut off..." -msgstr "" +msgid "%s file changed with %s insertions and %s deletions" +msgid_plural "%s files changed with %s insertions and %s deletions" +msgstr[0] "" #: rhodecode/templates/changeset/changeset_file_comment.html:42 msgid "Submitting..." @@ -3251,15 +3391,18 @@ msgid "Compare View" msgstr "比較顯示" +#: rhodecode/templates/changeset/changeset_range.html:29 +#, fuzzy +msgid "Show combined compare" +msgstr "文件內容" + #: rhodecode/templates/changeset/changeset_range.html:54 -#: rhodecode/templates/compare/compare_diff.html:41 -#: rhodecode/templates/pullrequests/pullrequest_show.html:69 msgid "Files affected" msgstr "" #: rhodecode/templates/changeset/diff_block.html:19 -msgid "diff" -msgstr "差異" +msgid "show full diff for this file" +msgstr "" #: rhodecode/templates/changeset/diff_block.html:27 #, fuzzy @@ -3272,9 +3415,17 @@ msgstr "尚未有任何變更" #: rhodecode/templates/compare/compare_diff.html:37 +#: rhodecode/templates/pullrequests/pullrequest_show.html:69 +#, fuzzy, python-format +msgid "Showing %s commit" +msgid_plural "Showing %s commits" +msgstr[0] "文件內容" + +#: rhodecode/templates/compare/compare_diff.html:52 +#: rhodecode/templates/pullrequests/pullrequest_show.html:84 #, fuzzy -msgid "Outgoing changesets" -msgstr "尚未有任何變更" +msgid "No files" +msgstr "檔案" #: rhodecode/templates/data_table/_dt_elements.html:39 #: rhodecode/templates/data_table/_dt_elements.html:41 @@ -3283,40 +3434,52 @@ msgstr "分支" #: rhodecode/templates/data_table/_dt_elements.html:60 -#: rhodecode/templates/journal/journal.html:126 -#: rhodecode/templates/summary/summary.html:68 +#: rhodecode/templates/journal/journal.html:81 +#: rhodecode/templates/summary/summary.html:77 msgid "Mercurial repository" msgstr "Mercurial 版本庫" #: rhodecode/templates/data_table/_dt_elements.html:62 -#: rhodecode/templates/journal/journal.html:128 -#: rhodecode/templates/summary/summary.html:71 +#: rhodecode/templates/journal/journal.html:83 +#: rhodecode/templates/summary/summary.html:80 msgid "Git repository" msgstr "Git 版本庫" #: rhodecode/templates/data_table/_dt_elements.html:69 -#: rhodecode/templates/journal/journal.html:134 -#: rhodecode/templates/summary/summary.html:78 +#: rhodecode/templates/journal/journal.html:89 +#: rhodecode/templates/summary/summary.html:87 msgid "public repository" msgstr "公開版本庫" #: rhodecode/templates/data_table/_dt_elements.html:80 -#: rhodecode/templates/summary/summary.html:87 -#: rhodecode/templates/summary/summary.html:88 +#: rhodecode/templates/summary/summary.html:96 +#: rhodecode/templates/summary/summary.html:97 msgid "Fork of" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.html:92 +#: rhodecode/templates/data_table/_dt_elements.html:94 msgid "No changesets yet" msgstr "尚未有任何變更" -#: rhodecode/templates/data_table/_dt_elements.html:104 +#: rhodecode/templates/data_table/_dt_elements.html:101 +#: rhodecode/templates/data_table/_dt_elements.html:103 +#, python-format +msgid "Subscribe to %s rss feed" +msgstr "訂閱 %s rss" + +#: rhodecode/templates/data_table/_dt_elements.html:109 +#: rhodecode/templates/data_table/_dt_elements.html:111 +#, python-format +msgid "Subscribe to %s atom feed" +msgstr "訂閱 %s atom" + +#: rhodecode/templates/data_table/_dt_elements.html:122 #, fuzzy, python-format msgid "Confirm to delete this user: %s" msgstr "確認刪除這個使用者" #: rhodecode/templates/email_templates/main.html:8 -msgid "This is an notification from RhodeCode." +msgid "This is a notification from RhodeCode." msgstr "" #: rhodecode/templates/errors/error_document.html:46 @@ -3334,13 +3497,13 @@ msgstr "檔案差異" #: rhodecode/templates/files/files.html:4 -#: rhodecode/templates/files/files.html:72 +#: rhodecode/templates/files/files.html:74 #, fuzzy, python-format msgid "%s files" msgstr "檔案" #: rhodecode/templates/files/files.html:12 -#: rhodecode/templates/summary/summary.html:340 +#: rhodecode/templates/summary/summary.html:351 msgid "files" msgstr "檔案" @@ -3424,7 +3587,7 @@ msgstr "搜尋檔案列表" #: rhodecode/templates/files/files_browser.html:31 -#: rhodecode/templates/shortlog/shortlog_data.html:65 +#: rhodecode/templates/shortlog/shortlog_data.html:80 #, fuzzy msgid "add new file" msgstr "新增使用者" @@ -3459,18 +3622,18 @@ msgstr "編輯檔案" #: rhodecode/templates/files/files_edit.html:49 -#: rhodecode/templates/files/files_source.html:38 +#: rhodecode/templates/files/files_source.html:23 msgid "show annotation" msgstr "險是註釋" #: rhodecode/templates/files/files_edit.html:50 -#: rhodecode/templates/files/files_source.html:40 -#: rhodecode/templates/files/files_source.html:68 +#: rhodecode/templates/files/files_source.html:25 +#: rhodecode/templates/files/files_source.html:53 msgid "show as raw" msgstr "顯示原始文件" #: rhodecode/templates/files/files_edit.html:51 -#: rhodecode/templates/files/files_source.html:41 +#: rhodecode/templates/files/files_source.html:26 msgid "download as raw" msgstr "下載原始文件" @@ -3484,43 +3647,44 @@ msgid "Editing file" msgstr "編輯檔案" -#: rhodecode/templates/files/files_source.html:2 +#: rhodecode/templates/files/files_history_box.html:2 msgid "History" msgstr "歷史" -#: rhodecode/templates/files/files_source.html:9 +#: rhodecode/templates/files/files_history_box.html:9 #, fuzzy msgid "diff to revision" msgstr "下一個修訂" -#: rhodecode/templates/files/files_source.html:10 +#: rhodecode/templates/files/files_history_box.html:10 #, fuzzy msgid "show at revision" msgstr "下一個修訂" -#: rhodecode/templates/files/files_source.html:14 +#: rhodecode/templates/files/files_history_box.html:15 #, fuzzy, python-format msgid "%s author" msgid_plural "%s authors" msgstr[0] "作者" -#: rhodecode/templates/files/files_source.html:36 +#: rhodecode/templates/files/files_source.html:6 +#, fuzzy +msgid "Load file history" +msgstr "載入檔案列表..." + +#: rhodecode/templates/files/files_source.html:21 msgid "show source" msgstr "顯示原始碼" -#: rhodecode/templates/files/files_source.html:59 +#: rhodecode/templates/files/files_source.html:44 #, python-format msgid "Binary file (%s)" msgstr "二進位檔 (%s)" -#: rhodecode/templates/files/files_source.html:68 +#: rhodecode/templates/files/files_source.html:53 msgid "File is too big to display" msgstr "顯示的檔案太大" -#: rhodecode/templates/files/files_source.html:124 -msgid "Selection link" -msgstr "" - #: rhodecode/templates/files/files_ypjax.html:5 #, fuzzy msgid "annotation" @@ -3595,7 +3759,7 @@ msgid "forked" msgstr "已建立分支" -#: rhodecode/templates/forks/forks_data.html:38 +#: rhodecode/templates/forks/forks_data.html:42 msgid "There are no forks yet" msgstr "尚未有任何 fork" @@ -3610,7 +3774,7 @@ msgstr "%s 公開日誌 %s feed" #: rhodecode/templates/journal/journal.html:24 -#: rhodecode/templates/pullrequests/pullrequest.html:27 +#: rhodecode/templates/pullrequests/pullrequest.html:55 msgid "Refresh" msgstr "" @@ -3634,19 +3798,19 @@ msgid "ADD" msgstr "新增" -#: rhodecode/templates/journal/journal.html:114 +#: rhodecode/templates/journal/journal.html:69 msgid "following user" msgstr "追蹤使用者" -#: rhodecode/templates/journal/journal.html:114 +#: rhodecode/templates/journal/journal.html:69 msgid "user" msgstr "使用者" -#: rhodecode/templates/journal/journal.html:147 +#: rhodecode/templates/journal/journal.html:102 msgid "You are not following any users or repositories" msgstr "您尚未追蹤任何使用者或版本庫" -#: rhodecode/templates/journal/journal_data.html:47 +#: rhodecode/templates/journal/journal_data.html:51 msgid "No entries yet" msgstr "" @@ -3669,7 +3833,7 @@ msgid "New pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:28 +#: rhodecode/templates/pullrequests/pullrequest.html:54 msgid "refresh overview" msgstr "" @@ -3679,18 +3843,18 @@ msgstr "比較顯示" #: rhodecode/templates/pullrequests/pullrequest.html:70 -#: rhodecode/templates/pullrequests/pullrequest_show.html:82 +#: rhodecode/templates/pullrequests/pullrequest_show.html:100 msgid "Pull request reviewers" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:79 -#: rhodecode/templates/pullrequests/pullrequest_show.html:94 +#: rhodecode/templates/pullrequests/pullrequest_show.html:112 #, fuzzy msgid "owner" msgstr "擁有者" #: rhodecode/templates/pullrequests/pullrequest.html:91 -#: rhodecode/templates/pullrequests/pullrequest_show.html:109 +#: rhodecode/templates/pullrequests/pullrequest_show.html:127 msgid "Add reviewer to this pull request." msgstr "" @@ -3720,6 +3884,11 @@ msgid "Closed %s" msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_show.html:23 +#, python-format +msgid "with status %s" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_show.html:31 #, fuzzy msgid "Status" @@ -3733,27 +3902,26 @@ msgid "Still not reviewed by" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:47 +#: rhodecode/templates/pullrequests/pullrequest_show.html:48 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" msgstr[0] "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:54 +#: rhodecode/templates/pullrequests/pullrequest_show.html:50 +msgid "pull request was reviewed by all reviewers" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:58 #, fuzzy msgid "Created on" msgstr "建立使用者 %s" -#: rhodecode/templates/pullrequests/pullrequest_show.html:61 +#: rhodecode/templates/pullrequests/pullrequest_show.html:65 #, fuzzy msgid "Compare view" msgstr "比較顯示" -#: rhodecode/templates/pullrequests/pullrequest_show.html:65 -#, fuzzy -msgid "Incoming changesets" -msgstr "尚未有任何變更" - #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 #, fuzzy msgid "all pull requests" @@ -3830,24 +3998,32 @@ msgid "shortlog" msgstr "簡短紀錄" +#: rhodecode/templates/shortlog/shortlog_data.html:5 +msgid "revision" +msgstr "修訂" + #: rhodecode/templates/shortlog/shortlog_data.html:7 msgid "age" msgstr "" -#: rhodecode/templates/shortlog/shortlog_data.html:18 +#: rhodecode/templates/shortlog/shortlog_data.html:8 +msgid "author" +msgstr "作者" + +#: rhodecode/templates/shortlog/shortlog_data.html:33 #, fuzzy msgid "No commit message" msgstr "遞交資訊" -#: rhodecode/templates/shortlog/shortlog_data.html:62 +#: rhodecode/templates/shortlog/shortlog_data.html:77 msgid "Add or upload files directly via RhodeCode" msgstr "" -#: rhodecode/templates/shortlog/shortlog_data.html:71 +#: rhodecode/templates/shortlog/shortlog_data.html:86 msgid "Push new repo" msgstr "" -#: rhodecode/templates/shortlog/shortlog_data.html:79 +#: rhodecode/templates/shortlog/shortlog_data.html:94 #, fuzzy msgid "Existing repository?" msgstr "Git 版本庫" @@ -3877,132 +4053,142 @@ msgid "ATOM" msgstr "作者" -#: rhodecode/templates/summary/summary.html:82 +#: rhodecode/templates/summary/summary.html:70 +#, fuzzy, python-format +msgid "Repository locked by %s" +msgstr "個版本庫" + +#: rhodecode/templates/summary/summary.html:72 +#, fuzzy +msgid "Repository unlocked" +msgstr "個版本庫" + +#: rhodecode/templates/summary/summary.html:91 #, fuzzy, python-format msgid "Non changable ID %s" msgstr "沒有修改" -#: rhodecode/templates/summary/summary.html:87 +#: rhodecode/templates/summary/summary.html:96 msgid "public" msgstr "公開" -#: rhodecode/templates/summary/summary.html:95 +#: rhodecode/templates/summary/summary.html:104 msgid "remote clone" msgstr "遠端複製" -#: rhodecode/templates/summary/summary.html:116 +#: rhodecode/templates/summary/summary.html:125 msgid "Contact" msgstr "聯絡方式" -#: rhodecode/templates/summary/summary.html:130 +#: rhodecode/templates/summary/summary.html:139 msgid "Clone url" msgstr "複製連結" -#: rhodecode/templates/summary/summary.html:133 +#: rhodecode/templates/summary/summary.html:142 #, fuzzy msgid "Show by Name" msgstr "顯示更多" -#: rhodecode/templates/summary/summary.html:134 +#: rhodecode/templates/summary/summary.html:143 msgid "Show by ID" msgstr "" -#: rhodecode/templates/summary/summary.html:142 +#: rhodecode/templates/summary/summary.html:151 #, fuzzy msgid "Trending files" msgstr "編輯檔案" -#: rhodecode/templates/summary/summary.html:150 -#: rhodecode/templates/summary/summary.html:166 -#: rhodecode/templates/summary/summary.html:194 +#: rhodecode/templates/summary/summary.html:159 +#: rhodecode/templates/summary/summary.html:175 +#: rhodecode/templates/summary/summary.html:203 msgid "enable" msgstr "啟用" -#: rhodecode/templates/summary/summary.html:158 +#: rhodecode/templates/summary/summary.html:167 msgid "Download" msgstr "下載" -#: rhodecode/templates/summary/summary.html:162 +#: rhodecode/templates/summary/summary.html:171 msgid "There are no downloads yet" msgstr "沒有任何下載" -#: rhodecode/templates/summary/summary.html:164 +#: rhodecode/templates/summary/summary.html:173 msgid "Downloads are disabled for this repository" msgstr "這個版本庫的下載已停用" -#: rhodecode/templates/summary/summary.html:170 +#: rhodecode/templates/summary/summary.html:179 #, fuzzy msgid "Download as zip" msgstr "下載原始文件" -#: rhodecode/templates/summary/summary.html:173 +#: rhodecode/templates/summary/summary.html:182 msgid "Check this to download archive with subrepos" msgstr "" -#: rhodecode/templates/summary/summary.html:173 +#: rhodecode/templates/summary/summary.html:182 msgid "with subrepos" msgstr "" -#: rhodecode/templates/summary/summary.html:186 +#: rhodecode/templates/summary/summary.html:195 msgid "Commit activity by day / author" msgstr "" -#: rhodecode/templates/summary/summary.html:197 +#: rhodecode/templates/summary/summary.html:206 msgid "Stats gathered: " msgstr "" -#: rhodecode/templates/summary/summary.html:218 +#: rhodecode/templates/summary/summary.html:227 msgid "Shortlog" msgstr "簡短紀錄" -#: rhodecode/templates/summary/summary.html:220 +#: rhodecode/templates/summary/summary.html:229 #, fuzzy msgid "Quick start" msgstr "快速過濾..." -#: rhodecode/templates/summary/summary.html:233 +#: rhodecode/templates/summary/summary.html:243 #, python-format msgid "Readme file at revision '%s'" msgstr "" -#: rhodecode/templates/summary/summary.html:236 +#: rhodecode/templates/summary/summary.html:246 msgid "Permalink to this readme" msgstr "" -#: rhodecode/templates/summary/summary.html:293 +#: rhodecode/templates/summary/summary.html:304 #, python-format msgid "Download %s as %s" msgstr "下載 %s 為 %s" -#: rhodecode/templates/summary/summary.html:650 +#: rhodecode/templates/summary/summary.html:661 msgid "commits" msgstr "遞交" -#: rhodecode/templates/summary/summary.html:651 +#: rhodecode/templates/summary/summary.html:662 msgid "files added" msgstr "多個檔案新增" -#: rhodecode/templates/summary/summary.html:652 +#: rhodecode/templates/summary/summary.html:663 msgid "files changed" msgstr "多個檔案修改" -#: rhodecode/templates/summary/summary.html:653 +#: rhodecode/templates/summary/summary.html:664 msgid "files removed" msgstr "移除多個檔案" -#: rhodecode/templates/summary/summary.html:656 +#: rhodecode/templates/summary/summary.html:667 msgid "commit" msgstr "遞交" -#: rhodecode/templates/summary/summary.html:657 +#: rhodecode/templates/summary/summary.html:668 msgid "file added" msgstr "檔案新增" -#: rhodecode/templates/summary/summary.html:658 +#: rhodecode/templates/summary/summary.html:669 msgid "file changed" msgstr "檔案修改" -#: rhodecode/templates/summary/summary.html:659 +#: rhodecode/templates/summary/summary.html:670 msgid "file removed" msgstr "移除檔案" @@ -4011,3 +4197,8 @@ msgid "%s Tags" msgstr "之前" +#: rhodecode/templates/tags/tags.html:29 +#, fuzzy +msgid "Compare tags" +msgstr "比較顯示" +