# HG changeset patch # User Marcin Kuzminski # Date 1337894357 -7200 # Node ID aa2f0e4382e9149ff056f8471f9b68dd7d27fc7d # Parent b0fef8a77568d4459355aa553ee43b30c72f2346# Parent 566e6bb34dbb50da8b874e266294e738410a49e8 merge with beta diff -r b0fef8a77568 -r aa2f0e4382e9 rhodecode/config/deployment.ini_tmpl --- a/rhodecode/config/deployment.ini_tmpl Wed May 23 00:58:37 2012 +0200 +++ b/rhodecode/config/deployment.ini_tmpl Thu May 24 23:19:17 2012 +0200 @@ -46,6 +46,8 @@ use = egg:rhodecode full_stack = true static_files = true +# Optional Languages +# en, fr, pt_BR, zh_CN, zh_TW lang = en cache_dir = %(here)s/data index_dir = %(here)s/data/index diff -r b0fef8a77568 -r aa2f0e4382e9 rhodecode/i18n/en/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/en/LC_MESSAGES/rhodecode.po Wed May 23 00:58:37 2012 +0200 +++ b/rhodecode/i18n/en/LC_MESSAGES/rhodecode.po Thu May 24 23:19:17 2012 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: rhodecode 0.1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2011-09-14 15:50-0300\n" +"POT-Creation-Date: 2012-05-24 22:18+0200\n" "PO-Revision-Date: 2011-02-25 19:13+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: en \n" @@ -17,22 +17,28 @@ "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -#: rhodecode/controllers/changeset.py:108 -#: rhodecode/controllers/changeset.py:149 -#: rhodecode/controllers/changeset.py:216 -#: rhodecode/controllers/changeset.py:229 +#: rhodecode/controllers/changelog.py:96 +msgid "All Branches" +msgstr "" + +#: rhodecode/controllers/changeset.py:79 +msgid "show white space" +msgstr "" + +#: rhodecode/controllers/changeset.py:86 rhodecode/controllers/changeset.py:93 +msgid "ignore white space" +msgstr "" + +#: rhodecode/controllers/changeset.py:153 +#, python-format +msgid "%s line context" +msgstr "" + +#: rhodecode/controllers/changeset.py:320 +#: rhodecode/controllers/changeset.py:335 rhodecode/lib/diffs.py:62 msgid "binary file" msgstr "" -#: rhodecode/controllers/changeset.py:123 -#: rhodecode/controllers/changeset.py:168 -msgid "Changeset is to big and was cut off, see raw changeset instead" -msgstr "" - -#: rhodecode/controllers/changeset.py:159 -msgid "Diff is to big and was cut off, see raw diff instead" -msgstr "" - #: rhodecode/controllers/error.py:69 msgid "Home page" msgstr "" @@ -69,107 +75,90 @@ msgid "%s %s feed" msgstr "" -#: rhodecode/controllers/files.py:72 -msgid "There are no files yet" -msgstr "" - -#: rhodecode/controllers/files.py:262 +#: rhodecode/controllers/files.py:86 +#: rhodecode/templates/admin/repos/repo_add.html:13 +msgid "add new" +msgstr "" + +#: rhodecode/controllers/files.py:87 +#, python-format +msgid "There are no files yet %s" +msgstr "" + +#: rhodecode/controllers/files.py:247 #, python-format msgid "Edited %s via RhodeCode" msgstr "" -#: rhodecode/controllers/files.py:267 -#: rhodecode/templates/files/file_diff.html:40 +#: rhodecode/controllers/files.py:252 msgid "No changes" msgstr "" -#: rhodecode/controllers/files.py:278 +#: rhodecode/controllers/files.py:263 rhodecode/controllers/files.py:316 #, python-format msgid "Successfully committed to %s" msgstr "" -#: rhodecode/controllers/files.py:283 +#: rhodecode/controllers/files.py:268 rhodecode/controllers/files.py:322 msgid "Error occurred during commit" msgstr "" -#: rhodecode/controllers/files.py:308 +#: rhodecode/controllers/files.py:288 +#, python-format +msgid "Added %s via RhodeCode" +msgstr "" + +#: rhodecode/controllers/files.py:302 +msgid "No content" +msgstr "" + +#: rhodecode/controllers/files.py:306 +msgid "No filename" +msgstr "" + +#: rhodecode/controllers/files.py:347 msgid "downloads disabled" msgstr "" -#: rhodecode/controllers/files.py:313 +#: rhodecode/controllers/files.py:358 #, python-format msgid "Unknown revision %s" msgstr "" -#: rhodecode/controllers/files.py:315 +#: rhodecode/controllers/files.py:360 msgid "Empty repository" msgstr "" -#: rhodecode/controllers/files.py:317 +#: rhodecode/controllers/files.py:362 msgid "Unknown archive type" msgstr "" -#: rhodecode/controllers/files.py:385 rhodecode/controllers/files.py:398 -msgid "Binary file" -msgstr "" - -#: rhodecode/controllers/files.py:417 -#: rhodecode/templates/changeset/changeset_range.html:4 -#: rhodecode/templates/changeset/changeset_range.html:12 -#: rhodecode/templates/changeset/changeset_range.html:29 +#: rhodecode/controllers/files.py:461 +#: rhodecode/templates/changeset/changeset_range.html:5 +#: rhodecode/templates/changeset/changeset_range.html:13 +#: rhodecode/templates/changeset/changeset_range.html:31 msgid "Changesets" msgstr "" -#: rhodecode/controllers/files.py:418 rhodecode/controllers/summary.py:175 +#: rhodecode/controllers/files.py:462 rhodecode/controllers/summary.py:230 #: rhodecode/templates/branches/branches.html:5 -#: rhodecode/templates/summary/summary.html:690 msgid "Branches" msgstr "" -#: rhodecode/controllers/files.py:419 rhodecode/controllers/summary.py:176 -#: rhodecode/templates/summary/summary.html:679 +#: rhodecode/controllers/files.py:463 rhodecode/controllers/summary.py:231 #: rhodecode/templates/tags/tags.html:5 msgid "Tags" msgstr "" -#: rhodecode/controllers/journal.py:50 +#: rhodecode/controllers/forks.py:69 rhodecode/controllers/admin/repos.py:86 #, python-format -msgid "%s public journal %s feed" -msgstr "" - -#: rhodecode/controllers/journal.py:178 rhodecode/controllers/journal.py:212 -#: rhodecode/templates/admin/repos/repo_edit.html:171 -#: rhodecode/templates/base/base.html:50 -msgid "Public journal" -msgstr "" - -#: rhodecode/controllers/login.py:111 -msgid "You have successfully registered into rhodecode" -msgstr "" - -#: rhodecode/controllers/login.py:133 -msgid "Your password reset link was sent" -msgstr "" - -#: rhodecode/controllers/login.py:155 msgid "" -"Your password reset was successful, new password has been sent to your " -"email" -msgstr "" - -#: rhodecode/controllers/search.py:109 -msgid "Invalid search query. Try quoting it." -msgstr "" - -#: rhodecode/controllers/search.py:114 -msgid "There is no index to search in. Please run whoosh indexer" -msgstr "" - -#: rhodecode/controllers/search.py:118 -msgid "An error occurred during this search operation" -msgstr "" - -#: rhodecode/controllers/settings.py:61 rhodecode/controllers/settings.py:171 +"%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:128 rhodecode/controllers/settings.py:69 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -177,20 +166,69 @@ "repositories" msgstr "" -#: rhodecode/controllers/settings.py:109 -#: rhodecode/controllers/admin/repos.py:239 +#: rhodecode/controllers/forks.py:163 +#, python-format +msgid "forked %s repository as %s" +msgstr "" + +#: rhodecode/controllers/forks.py:177 +#, python-format +msgid "An error occurred during repository forking %s" +msgstr "" + +#: rhodecode/controllers/journal.py:53 +#, python-format +msgid "%s public journal %s feed" +msgstr "" + +#: rhodecode/controllers/journal.py:190 rhodecode/controllers/journal.py:224 +#: rhodecode/templates/admin/repos/repo_edit.html:177 +#: rhodecode/templates/base/base.html:307 +#: rhodecode/templates/base/base.html:309 +#: rhodecode/templates/base/base.html:311 +msgid "Public journal" +msgstr "" + +#: rhodecode/controllers/login.py:116 +msgid "You have successfully registered into rhodecode" +msgstr "" + +#: rhodecode/controllers/login.py:137 +msgid "Your password reset link was sent" +msgstr "" + +#: rhodecode/controllers/login.py:157 +msgid "" +"Your password reset was successful, new password has been sent to your " +"email" +msgstr "" + +#: rhodecode/controllers/search.py:114 +msgid "Invalid search query. Try quoting it." +msgstr "" + +#: rhodecode/controllers/search.py:119 +msgid "There is no index to search in. Please run whoosh indexer" +msgstr "" + +#: rhodecode/controllers/search.py:123 +msgid "An error occurred during this search operation" +msgstr "" + +#: rhodecode/controllers/settings.py:103 +#: rhodecode/controllers/admin/repos.py:211 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: rhodecode/controllers/settings.py:126 -#: rhodecode/controllers/admin/repos.py:257 +#: rhodecode/controllers/settings.py:121 +#: rhodecode/controllers/admin/repos.py:229 #, python-format msgid "error occurred during update of repository %s" msgstr "" -#: rhodecode/controllers/settings.py:144 -#: rhodecode/controllers/admin/repos.py:275 +#: rhodecode/controllers/settings.py:139 +#: rhodecode/controllers/admin/repos.py:247 #, python-format msgid "" "%s repository is not mapped to db perhaps it was moved or renamed from " @@ -198,34 +236,25 @@ "repositories" msgstr "" -#: rhodecode/controllers/settings.py:156 -#: rhodecode/controllers/admin/repos.py:287 +#: rhodecode/controllers/settings.py:151 +#: rhodecode/controllers/admin/repos.py:259 #, python-format msgid "deleted repository %s" msgstr "" -#: rhodecode/controllers/settings.py:159 -#: rhodecode/controllers/admin/repos.py:297 -#: rhodecode/controllers/admin/repos.py:303 +#: rhodecode/controllers/settings.py:155 +#: rhodecode/controllers/admin/repos.py:269 +#: rhodecode/controllers/admin/repos.py:275 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: rhodecode/controllers/settings.py:193 -#, python-format -msgid "forked %s repository as %s" -msgstr "" - -#: rhodecode/controllers/settings.py:211 -#, python-format -msgid "An error occurred during repository forking %s" -msgstr "" - -#: rhodecode/controllers/summary.py:123 +#: rhodecode/controllers/summary.py:138 msgid "No data loaded yet" msgstr "" -#: rhodecode/controllers/summary.py:126 +#: rhodecode/controllers/summary.py:142 +#: rhodecode/templates/summary/summary.html:139 msgid "Statistics are disabled for this repository" msgstr "" @@ -273,31 +302,31 @@ msgid "START_TLS on LDAP connection" msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:115 +#: rhodecode/controllers/admin/ldap_settings.py:125 msgid "Ldap settings updated successfully" msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:120 +#: rhodecode/controllers/admin/ldap_settings.py:129 msgid "Unable to activate ldap. The \"python-ldap\" library is missing." msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:134 +#: rhodecode/controllers/admin/ldap_settings.py:146 msgid "error occurred during update of ldap settings" msgstr "" -#: rhodecode/controllers/admin/permissions.py:56 -msgid "None" -msgstr "" - -#: rhodecode/controllers/admin/permissions.py:57 -msgid "Read" -msgstr "" - -#: rhodecode/controllers/admin/permissions.py:58 -msgid "Write" -msgstr "" - #: rhodecode/controllers/admin/permissions.py:59 +msgid "None" +msgstr "" + +#: rhodecode/controllers/admin/permissions.py:60 +msgid "Read" +msgstr "" + +#: rhodecode/controllers/admin/permissions.py:61 +msgid "Write" +msgstr "" + +#: 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 @@ -310,550 +339,657 @@ #: 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:110 +#: 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:279 -#: rhodecode/templates/base/base.html:366 -#: rhodecode/templates/base/base.html:368 -#: rhodecode/templates/base/base.html:370 +#: rhodecode/templates/base/base.html:197 +#: rhodecode/templates/base/base.html:326 +#: rhodecode/templates/base/base.html:328 +#: rhodecode/templates/base/base.html:330 msgid "Admin" msgstr "" -#: rhodecode/controllers/admin/permissions.py:62 +#: rhodecode/controllers/admin/permissions.py:65 msgid "disabled" msgstr "" -#: rhodecode/controllers/admin/permissions.py:64 +#: rhodecode/controllers/admin/permissions.py:67 msgid "allowed with manual account activation" msgstr "" -#: rhodecode/controllers/admin/permissions.py:66 -msgid "allowed with automatic account activation" -msgstr "" - -#: rhodecode/controllers/admin/permissions.py:68 -msgid "Disabled" -msgstr "" - #: rhodecode/controllers/admin/permissions.py:69 +msgid "allowed with automatic account activation" +msgstr "" + +#: rhodecode/controllers/admin/permissions.py:71 +msgid "Disabled" +msgstr "" + +#: rhodecode/controllers/admin/permissions.py:72 msgid "Enabled" msgstr "" -#: rhodecode/controllers/admin/permissions.py:102 +#: rhodecode/controllers/admin/permissions.py:106 msgid "Default permissions updated successfully" msgstr "" -#: rhodecode/controllers/admin/permissions.py:119 +#: rhodecode/controllers/admin/permissions.py:123 msgid "error occurred during update of permissions" msgstr "" -#: rhodecode/controllers/admin/repos.py:96 -#, 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/admin/repos.py:172 +#: rhodecode/controllers/admin/repos.py:116 +msgid "--REMOVE FORK--" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:144 #, python-format msgid "created repository %s from %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:176 +#: rhodecode/controllers/admin/repos.py:148 #, python-format msgid "created repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:205 +#: rhodecode/controllers/admin/repos.py:177 #, python-format msgid "error occurred during creation of repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:292 +#: rhodecode/controllers/admin/repos.py:264 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:320 +#: rhodecode/controllers/admin/repos.py:293 msgid "An error occurred during deletion of repository user" msgstr "" -#: rhodecode/controllers/admin/repos.py:335 +#: rhodecode/controllers/admin/repos.py:312 msgid "An error occurred during deletion of repository users groups" msgstr "" -#: rhodecode/controllers/admin/repos.py:352 +#: rhodecode/controllers/admin/repos.py:329 msgid "An error occurred during deletion of repository stats" msgstr "" -#: rhodecode/controllers/admin/repos.py:367 +#: rhodecode/controllers/admin/repos.py:345 msgid "An error occurred during cache invalidation" msgstr "" +#: rhodecode/controllers/admin/repos.py:365 +msgid "Updated repository visibility in public journal" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:369 +msgid "An error occurred during setting this repository in public journal" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:374 rhodecode/model/forms.py:54 +msgid "Token mismatch" +msgstr "" + #: rhodecode/controllers/admin/repos.py:387 -msgid "Updated repository visibility in public journal" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:390 -msgid "An error occurred during setting this repository in public journal" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:395 rhodecode/model/forms.py:53 -msgid "Token mismatch" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:408 msgid "Pulled from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:410 +#: rhodecode/controllers/admin/repos.py:389 msgid "An error occurred during pull from remote location" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:83 +#: rhodecode/controllers/admin/repos.py:405 +msgid "Nothing" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:407 +#, python-format +msgid "Marked repo %s as fork of %s" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:411 +msgid "An error occurred during this operation" +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:119 #, python-format msgid "created repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:96 +#: rhodecode/controllers/admin/repos_groups.py:132 #, python-format msgid "error occurred during creation of repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:130 +#: rhodecode/controllers/admin/repos_groups.py:166 #, python-format msgid "updated repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:143 +#: rhodecode/controllers/admin/repos_groups.py:179 #, python-format msgid "error occurred during update of repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:164 +#: 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:171 +#: rhodecode/controllers/admin/repos_groups.py:205 #, python-format msgid "removed repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:175 +#: rhodecode/controllers/admin/repos_groups.py:210 +msgid "Cannot delete this group it still contains subgroups" +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:215 +#: rhodecode/controllers/admin/repos_groups.py:220 #, python-format msgid "error occurred during deletion of repos group %s" msgstr "" -#: rhodecode/controllers/admin/settings.py:109 +#: rhodecode/controllers/admin/repos_groups.py:240 +msgid "An error occurred during deletion of group user" +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:260 +msgid "An error occurred during deletion of group users groups" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:120 #, python-format msgid "Repositories successfully rescanned added: %s,removed: %s" msgstr "" -#: rhodecode/controllers/admin/settings.py:118 +#: rhodecode/controllers/admin/settings.py:129 msgid "Whoosh reindex task scheduled" msgstr "" -#: rhodecode/controllers/admin/settings.py:143 +#: rhodecode/controllers/admin/settings.py:154 msgid "Updated application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:148 -#: rhodecode/controllers/admin/settings.py:215 +#: rhodecode/controllers/admin/settings.py:159 +#: rhodecode/controllers/admin/settings.py:226 msgid "error occurred during updating application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:210 +#: rhodecode/controllers/admin/settings.py:221 msgid "Updated mercurial settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:236 +#: rhodecode/controllers/admin/settings.py:246 msgid "Added new hook" msgstr "" -#: rhodecode/controllers/admin/settings.py:247 +#: rhodecode/controllers/admin/settings.py:258 msgid "Updated hooks" msgstr "" -#: rhodecode/controllers/admin/settings.py:251 +#: rhodecode/controllers/admin/settings.py:262 msgid "error occurred during hook creation" msgstr "" -#: rhodecode/controllers/admin/settings.py:310 +#: rhodecode/controllers/admin/settings.py:281 +msgid "Email task created" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:336 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/controllers/admin/settings.py:339 +#: rhodecode/controllers/admin/settings.py:365 msgid "Your account was updated successfully" msgstr "" -#: rhodecode/controllers/admin/settings.py:359 -#: rhodecode/controllers/admin/users.py:130 +#: rhodecode/controllers/admin/settings.py:384 +#: rhodecode/controllers/admin/users.py:132 #, python-format msgid "error occurred during update of user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:78 +#: rhodecode/controllers/admin/users.py:79 #, python-format msgid "created user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:90 +#: rhodecode/controllers/admin/users.py:92 #, python-format msgid "error occurred during creation of user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:116 +#: rhodecode/controllers/admin/users.py:118 msgid "User updated successfully" msgstr "" -#: rhodecode/controllers/admin/users.py:146 +#: rhodecode/controllers/admin/users.py:149 msgid "successfully deleted user" msgstr "" -#: rhodecode/controllers/admin/users.py:150 +#: rhodecode/controllers/admin/users.py:154 msgid "An error occurred during deletion of user" msgstr "" -#: rhodecode/controllers/admin/users.py:166 +#: rhodecode/controllers/admin/users.py:169 msgid "You can't edit this user" msgstr "" -#: rhodecode/controllers/admin/users.py:195 -#: rhodecode/controllers/admin/users_groups.py:202 +#: rhodecode/controllers/admin/users.py:199 +#: rhodecode/controllers/admin/users_groups.py:215 msgid "Granted 'repository create' permission to user" msgstr "" -#: rhodecode/controllers/admin/users.py:204 -#: rhodecode/controllers/admin/users_groups.py:211 +#: rhodecode/controllers/admin/users.py:208 +#: rhodecode/controllers/admin/users_groups.py:225 msgid "Revoked 'repository create' permission to user" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:74 +#: rhodecode/controllers/admin/users_groups.py:79 #, python-format msgid "created users group %s" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:86 +#: rhodecode/controllers/admin/users_groups.py:92 #, python-format msgid "error occurred during creation of users group %s" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:119 +#: rhodecode/controllers/admin/users_groups.py:128 #, python-format msgid "updated users group %s" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:138 +#: rhodecode/controllers/admin/users_groups.py:148 #, python-format msgid "error occurred during update of users group %s" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:154 +#: rhodecode/controllers/admin/users_groups.py:165 msgid "successfully deleted users group" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:158 +#: rhodecode/controllers/admin/users_groups.py:170 msgid "An error occurred during deletion of users group" msgstr "" -#: rhodecode/lib/__init__.py:279 -msgid "year" -msgstr "" - -#: rhodecode/lib/__init__.py:280 -msgid "month" -msgstr "" - -#: rhodecode/lib/__init__.py:281 -msgid "day" -msgstr "" - -#: rhodecode/lib/__init__.py:282 -msgid "hour" -msgstr "" - -#: rhodecode/lib/__init__.py:283 -msgid "minute" -msgstr "" - -#: rhodecode/lib/__init__.py:284 -msgid "second" -msgstr "" - -#: rhodecode/lib/__init__.py:293 -msgid "ago" -msgstr "" - -#: rhodecode/lib/__init__.py:296 -msgid "just now" -msgstr "" - -#: rhodecode/lib/auth.py:377 +#: rhodecode/lib/auth.py:497 msgid "You need to be a registered user to perform this action" msgstr "" -#: rhodecode/lib/auth.py:421 +#: rhodecode/lib/auth.py:538 msgid "You need to be a signed in to view this page" msgstr "" -#: rhodecode/lib/helpers.py:307 +#: rhodecode/lib/diffs.py:78 +msgid "Changeset was to big and was cut off, use diff menu to display this diff" +msgstr "" + +#: rhodecode/lib/diffs.py:88 +msgid "No changes detected" +msgstr "" + +#: rhodecode/lib/helpers.py:414 msgid "True" msgstr "" -#: rhodecode/lib/helpers.py:311 +#: rhodecode/lib/helpers.py:418 msgid "False" msgstr "" -#: rhodecode/lib/helpers.py:352 +#: rhodecode/lib/helpers.py:462 +msgid "Changeset not found" +msgstr "" + +#: rhodecode/lib/helpers.py:485 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: rhodecode/lib/helpers.py:356 +#: rhodecode/lib/helpers.py:491 msgid "compare view" msgstr "" -#: rhodecode/lib/helpers.py:365 +#: rhodecode/lib/helpers.py:511 msgid "and" msgstr "" -#: rhodecode/lib/helpers.py:365 +#: rhodecode/lib/helpers.py:512 #, python-format msgid "%s more" msgstr "" -#: rhodecode/lib/helpers.py:367 rhodecode/templates/changelog/changelog.html:14 -#: rhodecode/templates/changelog/changelog.html:39 +#: rhodecode/lib/helpers.py:513 rhodecode/templates/changelog/changelog.html:40 msgid "revisions" msgstr "" -#: rhodecode/lib/helpers.py:385 +#: rhodecode/lib/helpers.py:536 msgid "fork name " msgstr "" -#: rhodecode/lib/helpers.py:388 +#: rhodecode/lib/helpers.py:539 msgid "[deleted] repository" msgstr "" -#: rhodecode/lib/helpers.py:389 rhodecode/lib/helpers.py:393 +#: rhodecode/lib/helpers.py:540 rhodecode/lib/helpers.py:545 msgid "[created] repository" msgstr "" -#: rhodecode/lib/helpers.py:390 rhodecode/lib/helpers.py:394 +#: rhodecode/lib/helpers.py:541 +msgid "[created] repository as fork" +msgstr "" + +#: rhodecode/lib/helpers.py:542 rhodecode/lib/helpers.py:546 msgid "[forked] repository" msgstr "" -#: rhodecode/lib/helpers.py:391 rhodecode/lib/helpers.py:395 +#: rhodecode/lib/helpers.py:543 rhodecode/lib/helpers.py:547 msgid "[updated] repository" msgstr "" -#: rhodecode/lib/helpers.py:392 +#: rhodecode/lib/helpers.py:544 msgid "[delete] repository" msgstr "" -#: rhodecode/lib/helpers.py:396 +#: rhodecode/lib/helpers.py:548 msgid "[pushed] into" msgstr "" -#: rhodecode/lib/helpers.py:397 +#: rhodecode/lib/helpers.py:549 msgid "[committed via RhodeCode] into" msgstr "" -#: rhodecode/lib/helpers.py:398 +#: rhodecode/lib/helpers.py:550 msgid "[pulled from remote] into" msgstr "" -#: rhodecode/lib/helpers.py:399 +#: rhodecode/lib/helpers.py:551 msgid "[pulled] from" msgstr "" -#: rhodecode/lib/helpers.py:400 +#: rhodecode/lib/helpers.py:552 msgid "[started following] repository" msgstr "" -#: rhodecode/lib/helpers.py:401 +#: rhodecode/lib/helpers.py:553 msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/helpers.py:577 +#: rhodecode/lib/helpers.py:731 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:581 +#: rhodecode/lib/helpers.py:735 msgid "No Files" msgstr "" -#: rhodecode/model/forms.py:66 +#: rhodecode/lib/utils2.py:335 +#, python-format +msgid "%d year" +msgid_plural "%d years" +msgstr[0] "" +msgstr[1] "" + +#: rhodecode/lib/utils2.py:336 +#, python-format +msgid "%d month" +msgid_plural "%d months" +msgstr[0] "" +msgstr[1] "" + +#: rhodecode/lib/utils2.py:337 +#, python-format +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "" +msgstr[1] "" + +#: rhodecode/lib/utils2.py:338 +#, python-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "" +msgstr[1] "" + +#: rhodecode/lib/utils2.py:339 +#, python-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "" +msgstr[1] "" + +#: rhodecode/lib/utils2.py:340 +#, python-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "" +msgstr[1] "" + +#: rhodecode/lib/utils2.py:355 +#, python-format +msgid "%s ago" +msgstr "" + +#: rhodecode/lib/utils2.py:357 +#, python-format +msgid "%s and %s ago" +msgstr "" + +#: rhodecode/lib/utils2.py:360 +msgid "just now" +msgstr "" + +#: rhodecode/lib/celerylib/tasks.py:269 +msgid "password reset link" +msgstr "" + +#: rhodecode/model/comment.py:85 +#, python-format +msgid "on line %s" +msgstr "" + +#: rhodecode/model/comment.py:113 +msgid "[Mention]" +msgstr "" + +#: rhodecode/model/forms.py:72 msgid "Invalid username" msgstr "" -#: rhodecode/model/forms.py:75 +#: rhodecode/model/forms.py:80 msgid "This username already exists" msgstr "" -#: rhodecode/model/forms.py:79 +#: rhodecode/model/forms.py:85 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with alphanumeric character" msgstr "" -#: rhodecode/model/forms.py:94 +#: rhodecode/model/forms.py:101 msgid "Invalid group name" msgstr "" -#: rhodecode/model/forms.py:104 +#: rhodecode/model/forms.py:111 msgid "This users group already exists" msgstr "" -#: rhodecode/model/forms.py:110 +#: rhodecode/model/forms.py:117 msgid "" -"Group name may only contain alphanumeric characters underscores, periods " -"or dashes and must begin with alphanumeric character" -msgstr "" - -#: rhodecode/model/forms.py:132 +"RepoGroup name may only contain alphanumeric characters underscores, " +"periods or dashes and must begin with alphanumeric character" +msgstr "" + +#: rhodecode/model/forms.py:145 msgid "Cannot assign this group as parent" msgstr "" -#: rhodecode/model/forms.py:148 +#: rhodecode/model/forms.py:164 msgid "This group already exists" msgstr "" -#: rhodecode/model/forms.py:164 rhodecode/model/forms.py:172 -#: rhodecode/model/forms.py:180 +#: rhodecode/model/forms.py:176 +msgid "Repository with this name already exists" +msgstr "" + +#: rhodecode/model/forms.py:195 rhodecode/model/forms.py:204 +#: rhodecode/model/forms.py:213 msgid "Invalid characters in password" msgstr "" -#: rhodecode/model/forms.py:191 +#: rhodecode/model/forms.py:226 msgid "Passwords do not match" msgstr "" -#: rhodecode/model/forms.py:196 +#: rhodecode/model/forms.py:232 msgid "invalid password" msgstr "" -#: rhodecode/model/forms.py:197 -msgid "invalid user name" -msgstr "" - -#: rhodecode/model/forms.py:198 -msgid "Your account is disabled" -msgstr "" - #: rhodecode/model/forms.py:233 -msgid "This username is not valid" -msgstr "" - -#: rhodecode/model/forms.py:245 -msgid "This repository name is disallowed" -msgstr "" - -#: rhodecode/model/forms.py:266 -#, python-format -msgid "This repository already exists in group \"%s\"" +msgid "invalid user name" +msgstr "" + +#: rhodecode/model/forms.py:234 +msgid "Your account is disabled" msgstr "" #: rhodecode/model/forms.py:274 +msgid "This username is not valid" +msgstr "" + +#: rhodecode/model/forms.py:287 +msgid "This repository name is disallowed" +msgstr "" + +#: rhodecode/model/forms.py:310 +#, python-format +msgid "This repository already exists in a group \"%s\"" +msgstr "" + +#: rhodecode/model/forms.py:317 +#, python-format +msgid "There is a group with this name already \"%s\"" +msgstr "" + +#: rhodecode/model/forms.py:324 msgid "This repository already exists" msgstr "" -#: rhodecode/model/forms.py:312 rhodecode/model/forms.py:319 +#: rhodecode/model/forms.py:367 msgid "invalid clone url" msgstr "" -#: rhodecode/model/forms.py:322 +#: rhodecode/model/forms.py:384 msgid "Invalid clone url, provide a valid clone http\\s url" msgstr "" -#: rhodecode/model/forms.py:334 +#: rhodecode/model/forms.py:398 msgid "Fork have to be the same type as original" msgstr "" -#: rhodecode/model/forms.py:341 +#: rhodecode/model/forms.py:414 msgid "This username or users group name is not valid" msgstr "" -#: rhodecode/model/forms.py:403 +#: rhodecode/model/forms.py:480 msgid "This is not a valid path" msgstr "" -#: rhodecode/model/forms.py:416 +#: rhodecode/model/forms.py:494 msgid "This e-mail address is already taken" msgstr "" -#: rhodecode/model/forms.py:427 +#: rhodecode/model/forms.py:507 msgid "This e-mail address doesn't exist." msgstr "" -#: rhodecode/model/forms.py:447 +#: rhodecode/model/forms.py:530 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/forms.py:466 +#: rhodecode/model/forms.py:549 msgid "Please enter a login" msgstr "" -#: rhodecode/model/forms.py:467 +#: rhodecode/model/forms.py:550 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "" -#: rhodecode/model/forms.py:475 +#: rhodecode/model/forms.py:558 msgid "Please enter a password" msgstr "" -#: rhodecode/model/forms.py:476 +#: rhodecode/model/forms.py:559 #, python-format msgid "Enter %(min)i characters or more" msgstr "" -#: rhodecode/model/user.py:145 -msgid "[RhodeCode] New User registration" -msgstr "" - -#: rhodecode/model/user.py:157 rhodecode/model/user.py:179 +#: rhodecode/model/notification.py:175 +msgid "commented on commit" +msgstr "" + +#: rhodecode/model/notification.py:176 +msgid "sent message" +msgstr "" + +#: rhodecode/model/notification.py:177 +msgid "mentioned you" +msgstr "" + +#: rhodecode/model/notification.py:178 +msgid "registered in RhodeCode" +msgstr "" + +#: rhodecode/model/user.py:235 +msgid "new user registration" +msgstr "" + +#: rhodecode/model/user.py:259 rhodecode/model/user.py:279 msgid "You can't Edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:201 +#: rhodecode/model/user.py:300 msgid "You can't remove this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:204 +#: rhodecode/model/user.py:306 #, python-format msgid "" -"This user still owns %s repositories and cannot be removed. Switch owners" -" or remove those repositories" -msgstr "" - -#: rhodecode/templates/index.html:4 +"user \"%s\" still owns %s repositories and cannot be removed. Switch " +"owners or remove those repositories. %s" +msgstr "" + +#: rhodecode/templates/index.html:3 msgid "Dashboard" msgstr "" -#: rhodecode/templates/index_base.html:22 -#: rhodecode/templates/admin/users/user_edit_my_account.html:102 +#: rhodecode/templates/index_base.html:6 +#: rhodecode/templates/admin/users/user_edit_my_account.html:115 +#: rhodecode/templates/bookmarks/bookmarks.html:10 +#: rhodecode/templates/branches/branches.html:9 +#: rhodecode/templates/journal/journal.html:31 +#: rhodecode/templates/tags/tags.html:10 msgid "quick filter..." msgstr "" -#: rhodecode/templates/index_base.html:23 -#: rhodecode/templates/base/base.html:300 +#: rhodecode/templates/index_base.html:6 rhodecode/templates/base/base.html:218 msgid "repositories" msgstr "" +#: rhodecode/templates/index_base.html:13 +#: rhodecode/templates/index_base.html:15 +#: rhodecode/templates/admin/repos/repos.html:22 +msgid "ADD REPOSITORY" +msgstr "" + #: rhodecode/templates/index_base.html:29 -#: rhodecode/templates/admin/repos/repos.html:22 -msgid "ADD NEW REPOSITORY" -msgstr "" - -#: rhodecode/templates/index_base.html:41 #: 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 @@ -862,158 +998,160 @@ msgid "Group name" msgstr "" -#: rhodecode/templates/index_base.html:42 -#: rhodecode/templates/index_base.html:73 -#: rhodecode/templates/admin/repos/repo_add_base.html:44 -#: rhodecode/templates/admin/repos/repo_edit.html:64 -#: rhodecode/templates/admin/repos/repos.html:31 +#: rhodecode/templates/index_base.html:30 +#: rhodecode/templates/index_base.html:67 +#: rhodecode/templates/index_base.html:132 +#: rhodecode/templates/index_base.html:158 +#: rhodecode/templates/admin/repos/repo_add_base.html:47 +#: rhodecode/templates/admin/repos/repo_edit.html:66 +#: rhodecode/templates/admin/repos/repos.html:37 +#: rhodecode/templates/admin/repos/repos.html:84 #: 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/settings/repo_fork.html:40 -#: rhodecode/templates/settings/repo_settings.html:40 -#: rhodecode/templates/summary/summary.html:92 +#: rhodecode/templates/forks/fork.html:49 +#: rhodecode/templates/settings/repo_settings.html:57 +#: rhodecode/templates/summary/summary.html:100 msgid "Description" msgstr "" -#: rhodecode/templates/index_base.html:53 +#: rhodecode/templates/index_base.html:40 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46 msgid "Repositories group" msgstr "" +#: rhodecode/templates/index_base.html:66 +#: rhodecode/templates/index_base.html:156 +#: rhodecode/templates/admin/repos/repo_add_base.html:9 +#: rhodecode/templates/admin/repos/repo_edit.html:32 +#: rhodecode/templates/admin/repos/repos.html:36 +#: rhodecode/templates/admin/repos/repos.html:82 +#: rhodecode/templates/admin/users/user_edit_my_account.html:133 +#: rhodecode/templates/admin/users/user_edit_my_account.html:183 +#: rhodecode/templates/admin/users/user_edit_my_account.html:249 +#: rhodecode/templates/admin/users/user_edit_my_account.html:284 +#: rhodecode/templates/bookmarks/bookmarks.html:36 +#: rhodecode/templates/bookmarks/bookmarks_data.html:6 +#: rhodecode/templates/branches/branches.html:36 +#: rhodecode/templates/files/files_browser.html:47 +#: rhodecode/templates/journal/journal.html:50 +#: rhodecode/templates/journal/journal.html:98 +#: rhodecode/templates/journal/journal.html:177 +#: rhodecode/templates/settings/repo_settings.html:31 +#: rhodecode/templates/summary/summary.html:38 +#: rhodecode/templates/summary/summary.html:114 +#: rhodecode/templates/tags/tags.html:36 +#: rhodecode/templates/tags/tags_data.html:6 +msgid "Name" +msgstr "" + +#: rhodecode/templates/index_base.html:68 +#: rhodecode/templates/admin/repos/repos.html:38 +msgid "Last change" +msgstr "" + +#: rhodecode/templates/index_base.html:69 +#: rhodecode/templates/index_base.html:161 +#: rhodecode/templates/admin/repos/repos.html:39 +#: rhodecode/templates/admin/repos/repos.html:87 +#: rhodecode/templates/admin/users/user_edit_my_account.html:251 +#: rhodecode/templates/journal/journal.html:179 +msgid "Tip" +msgstr "" + +#: rhodecode/templates/index_base.html:70 +#: rhodecode/templates/index_base.html:163 +#: rhodecode/templates/admin/repos/repo_edit.html:103 +#: rhodecode/templates/admin/repos/repos.html:89 +msgid "Owner" +msgstr "" + +#: rhodecode/templates/index_base.html:71 +#: rhodecode/templates/journal/public_journal.html:20 +#: rhodecode/templates/summary/summary.html:43 +#: rhodecode/templates/summary/summary.html:46 +msgid "RSS" +msgstr "" + #: rhodecode/templates/index_base.html:72 -#: rhodecode/templates/admin/repos/repo_add_base.html:9 -#: rhodecode/templates/admin/repos/repo_edit.html:32 -#: rhodecode/templates/admin/repos/repos.html:30 -#: rhodecode/templates/admin/users/user_edit_my_account.html:117 -#: rhodecode/templates/files/files_browser.html:157 -#: rhodecode/templates/settings/repo_settings.html:31 -#: rhodecode/templates/summary/summary.html:31 -#: rhodecode/templates/summary/summary.html:107 -msgid "Name" -msgstr "" - -#: rhodecode/templates/index_base.html:74 -#: rhodecode/templates/admin/repos/repos.html:32 -#: rhodecode/templates/summary/summary.html:114 -msgid "Last change" -msgstr "" - -#: rhodecode/templates/index_base.html:75 -#: rhodecode/templates/admin/repos/repos.html:33 -msgid "Tip" -msgstr "" - -#: rhodecode/templates/index_base.html:76 -#: rhodecode/templates/admin/repos/repo_edit.html:97 -msgid "Owner" -msgstr "" - -#: rhodecode/templates/index_base.html:77 -#: rhodecode/templates/journal/public_journal.html:20 -#: rhodecode/templates/summary/summary.html:180 -#: rhodecode/templates/summary/summary.html:183 -msgid "RSS" -msgstr "" - -#: rhodecode/templates/index_base.html:78 #: rhodecode/templates/journal/public_journal.html:23 -#: rhodecode/templates/summary/summary.html:181 -#: rhodecode/templates/summary/summary.html:184 msgid "Atom" msgstr "" -#: rhodecode/templates/index_base.html:87 -#: rhodecode/templates/index_base.html:89 -#: rhodecode/templates/index_base.html:91 -#: rhodecode/templates/base/base.html:209 -#: rhodecode/templates/base/base.html:211 -#: rhodecode/templates/base/base.html:213 -#: rhodecode/templates/summary/summary.html:4 -msgid "Summary" -msgstr "" - -#: rhodecode/templates/index_base.html:95 -#: rhodecode/templates/index_base.html:97 -#: rhodecode/templates/index_base.html:99 -#: rhodecode/templates/base/base.html:225 -#: rhodecode/templates/base/base.html:227 -#: rhodecode/templates/base/base.html:229 -#: rhodecode/templates/changelog/changelog.html:6 -#: rhodecode/templates/changelog/changelog.html:14 -msgid "Changelog" -msgstr "" - -#: rhodecode/templates/index_base.html:103 -#: rhodecode/templates/index_base.html:105 -#: rhodecode/templates/index_base.html:107 -#: rhodecode/templates/base/base.html:268 -#: rhodecode/templates/base/base.html:270 -#: rhodecode/templates/base/base.html:272 -#: rhodecode/templates/files/files.html:4 -msgid "Files" -msgstr "" - -#: rhodecode/templates/index_base.html:116 -#: rhodecode/templates/admin/repos/repos.html:42 -#: rhodecode/templates/admin/users/user_edit_my_account.html:127 -#: rhodecode/templates/summary/summary.html:48 -msgid "Mercurial repository" -msgstr "" - -#: rhodecode/templates/index_base.html:118 -#: rhodecode/templates/admin/repos/repos.html:44 -#: rhodecode/templates/admin/users/user_edit_my_account.html:129 -#: rhodecode/templates/summary/summary.html:51 -msgid "Git repository" -msgstr "" - -#: rhodecode/templates/index_base.html:123 -#: rhodecode/templates/admin/repos/repo_edit_perms.html:16 -#: rhodecode/templates/journal/journal.html:53 -#: rhodecode/templates/summary/summary.html:56 -msgid "private repository" -msgstr "" - -#: rhodecode/templates/index_base.html:125 -#: rhodecode/templates/journal/journal.html:55 -#: rhodecode/templates/summary/summary.html:58 -msgid "public repository" -msgstr "" - -#: rhodecode/templates/index_base.html:133 -#: rhodecode/templates/base/base.html:291 -#: rhodecode/templates/settings/repo_fork.html:13 -msgid "fork" -msgstr "" - -#: rhodecode/templates/index_base.html:134 -#: rhodecode/templates/admin/repos/repos.html:60 -#: rhodecode/templates/admin/users/user_edit_my_account.html:143 -#: rhodecode/templates/summary/summary.html:69 -#: rhodecode/templates/summary/summary.html:71 -msgid "Fork of" -msgstr "" - -#: rhodecode/templates/index_base.html:155 -#: rhodecode/templates/admin/repos/repos.html:73 -msgid "No changesets yet" -msgstr "" - -#: rhodecode/templates/index_base.html:161 -#: rhodecode/templates/index_base.html:163 +#: rhodecode/templates/index_base.html:102 +#: rhodecode/templates/index_base.html:104 #, python-format msgid "Subscribe to %s rss feed" msgstr "" -#: rhodecode/templates/index_base.html:168 -#: rhodecode/templates/index_base.html:170 +#: rhodecode/templates/index_base.html:109 +#: rhodecode/templates/index_base.html:111 #, python-format msgid "Subscribe to %s atom feed" msgstr "" +#: rhodecode/templates/index_base.html:130 +msgid "Group Name" +msgstr "" + +#: rhodecode/templates/index_base.html:148 +#: rhodecode/templates/index_base.html:188 +#: rhodecode/templates/admin/repos/repos.html:112 +#: rhodecode/templates/admin/users/user_edit_my_account.html:270 +#: rhodecode/templates/bookmarks/bookmarks.html:60 +#: rhodecode/templates/branches/branches.html:60 +#: rhodecode/templates/journal/journal.html:202 +#: rhodecode/templates/tags/tags.html:60 +msgid "Click to sort ascending" +msgstr "" + +#: rhodecode/templates/index_base.html:149 +#: rhodecode/templates/index_base.html:189 +#: rhodecode/templates/admin/repos/repos.html:113 +#: rhodecode/templates/admin/users/user_edit_my_account.html:271 +#: rhodecode/templates/bookmarks/bookmarks.html:61 +#: rhodecode/templates/branches/branches.html:61 +#: rhodecode/templates/journal/journal.html:203 +#: rhodecode/templates/tags/tags.html:61 +msgid "Click to sort descending" +msgstr "" + +#: rhodecode/templates/index_base.html:159 +#: rhodecode/templates/admin/repos/repos.html:85 +msgid "Last Change" +msgstr "" + +#: rhodecode/templates/index_base.html:190 +#: rhodecode/templates/admin/repos/repos.html:114 +#: rhodecode/templates/admin/users/user_edit_my_account.html:272 +#: rhodecode/templates/bookmarks/bookmarks.html:62 +#: rhodecode/templates/branches/branches.html:62 +#: rhodecode/templates/journal/journal.html:204 +#: rhodecode/templates/tags/tags.html:62 +msgid "No records found." +msgstr "" + +#: rhodecode/templates/index_base.html:191 +#: rhodecode/templates/admin/repos/repos.html:115 +#: rhodecode/templates/admin/users/user_edit_my_account.html:273 +#: rhodecode/templates/bookmarks/bookmarks.html:63 +#: rhodecode/templates/branches/branches.html:63 +#: rhodecode/templates/journal/journal.html:205 +#: rhodecode/templates/tags/tags.html:63 +msgid "Data error." +msgstr "" + +#: rhodecode/templates/index_base.html:192 +#: rhodecode/templates/admin/repos/repos.html:116 +#: rhodecode/templates/admin/users/user_edit_my_account.html:274 +#: rhodecode/templates/bookmarks/bookmarks.html:64 +#: rhodecode/templates/branches/branches.html:64 +#: rhodecode/templates/journal/journal.html:206 +#: rhodecode/templates/tags/tags.html:64 +msgid "Loading..." +msgstr "" + #: rhodecode/templates/login.html:5 rhodecode/templates/login.html:54 -#: rhodecode/templates/base/base.html:38 msgid "Sign In" msgstr "" @@ -1024,25 +1162,29 @@ #: 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:47 -#: rhodecode/templates/admin/users/user_edit_my_account.html:45 -#: rhodecode/templates/base/base.html:15 -#: rhodecode/templates/summary/summary.html:106 +#: rhodecode/templates/admin/users/user_edit.html:50 +#: rhodecode/templates/admin/users/user_edit_my_account.html:49 +#: rhodecode/templates/base/base.html:83 +#: rhodecode/templates/summary/summary.html:113 msgid "Username" msgstr "" #: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29 #: rhodecode/templates/admin/ldap/ldap.html:46 #: rhodecode/templates/admin/users/user_add.html:41 -#: rhodecode/templates/base/base.html:24 +#: rhodecode/templates/base/base.html:92 msgid "Password" msgstr "" +#: rhodecode/templates/login.html:50 +msgid "Remember me" +msgstr "" + #: rhodecode/templates/login.html:60 msgid "Forgot your password ?" msgstr "" -#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:35 +#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:103 msgid "Don't have an account ?" msgstr "" @@ -1079,24 +1221,24 @@ msgstr "" #: rhodecode/templates/register.html:47 -#: rhodecode/templates/admin/users/user_add.html:50 -#: rhodecode/templates/admin/users/user_edit.html:74 -#: rhodecode/templates/admin/users/user_edit_my_account.html:63 +#: rhodecode/templates/admin/users/user_add.html:59 +#: rhodecode/templates/admin/users/user_edit.html:86 +#: rhodecode/templates/admin/users/user_edit_my_account.html:76 msgid "First Name" msgstr "" #: rhodecode/templates/register.html:56 -#: rhodecode/templates/admin/users/user_add.html:59 -#: rhodecode/templates/admin/users/user_edit.html:83 -#: rhodecode/templates/admin/users/user_edit_my_account.html:72 +#: rhodecode/templates/admin/users/user_add.html:68 +#: rhodecode/templates/admin/users/user_edit.html:95 +#: rhodecode/templates/admin/users/user_edit_my_account.html:85 msgid "Last Name" msgstr "" #: rhodecode/templates/register.html:65 -#: rhodecode/templates/admin/users/user_add.html:68 -#: rhodecode/templates/admin/users/user_edit.html:92 -#: rhodecode/templates/admin/users/user_edit_my_account.html:81 -#: rhodecode/templates/summary/summary.html:108 +#: rhodecode/templates/admin/users/user_add.html:77 +#: rhodecode/templates/admin/users/user_edit.html:104 +#: rhodecode/templates/admin/users/user_edit_my_account.html:94 +#: rhodecode/templates/summary/summary.html:115 msgid "Email" msgstr "" @@ -1108,20 +1250,60 @@ msgid "Your account must wait for activation by administrator" msgstr "" -#: rhodecode/templates/repo_switcher_list.html:14 +#: rhodecode/templates/repo_switcher_list.html:11 +#: rhodecode/templates/admin/repos/repo_add_base.html:56 +#: rhodecode/templates/admin/repos/repo_edit.html:76 +#: rhodecode/templates/settings/repo_settings.html:67 msgid "Private repository" msgstr "" -#: rhodecode/templates/repo_switcher_list.html:19 +#: rhodecode/templates/repo_switcher_list.html:16 msgid "Public repository" msgstr "" +#: rhodecode/templates/switch_to_list.html:3 +#: rhodecode/templates/branches/branches.html:14 +msgid "branches" +msgstr "" + +#: rhodecode/templates/switch_to_list.html:10 +#: rhodecode/templates/branches/branches_data.html:51 +msgid "There are no branches yet" +msgstr "" + +#: rhodecode/templates/switch_to_list.html:15 +#: rhodecode/templates/shortlog/shortlog_data.html:10 +#: rhodecode/templates/tags/tags.html:15 +msgid "tags" +msgstr "" + +#: rhodecode/templates/switch_to_list.html:22 +#: rhodecode/templates/tags/tags_data.html:33 +msgid "There are no tags yet" +msgstr "" + +#: rhodecode/templates/switch_to_list.html:28 +#: rhodecode/templates/bookmarks/bookmarks.html:15 +msgid "bookmarks" +msgstr "" + +#: rhodecode/templates/switch_to_list.html:35 +#: rhodecode/templates/bookmarks/bookmarks_data.html:32 +msgid "There are no bookmarks yet" +msgstr "" + #: rhodecode/templates/admin/admin.html:5 #: rhodecode/templates/admin/admin.html:9 msgid "Admin journal" msgstr "" #: rhodecode/templates/admin/admin_log.html:6 +#: rhodecode/templates/admin/repos/repos.html:41 +#: rhodecode/templates/admin/repos/repos.html:90 +#: rhodecode/templates/admin/users/user_edit_my_account.html:135 +#: rhodecode/templates/admin/users/user_edit_my_account.html:136 +#: rhodecode/templates/journal/journal.html:52 +#: rhodecode/templates/journal/journal.html:53 msgid "Action" msgstr "" @@ -1130,6 +1312,11 @@ msgstr "" #: 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:37 +#: rhodecode/templates/tags/tags.html:37 +#: rhodecode/templates/tags/tags_data.html:7 msgid "Date" msgstr "" @@ -1214,23 +1401,48 @@ msgstr "" #: rhodecode/templates/admin/ldap/ldap.html:89 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66 #: rhodecode/templates/admin/settings/hooks.html:73 -#: rhodecode/templates/admin/users/user_edit.html:117 -#: rhodecode/templates/admin/users/user_edit.html:142 -#: rhodecode/templates/admin/users/user_edit_my_account.html:89 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:263 +#: rhodecode/templates/admin/users/user_edit.html:129 +#: rhodecode/templates/admin/users/user_edit.html:154 +#: rhodecode/templates/admin/users/user_edit_my_account.html:102 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:115 +#: rhodecode/templates/settings/repo_settings.html:84 msgid "Save" msgstr "" +#: rhodecode/templates/admin/notifications/notifications.html:5 +#: rhodecode/templates/admin/notifications/notifications.html:9 +msgid "My Notifications" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications.html:29 +msgid "Mark all read" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_data.html:38 +msgid "No notifications here yet" +msgstr "" + +#: rhodecode/templates/admin/notifications/show_notification.html:5 +#: rhodecode/templates/admin/notifications/show_notification.html:11 +msgid "Show notification" +msgstr "" + +#: rhodecode/templates/admin/notifications/show_notification.html:9 +msgid "Notifications" +msgstr "" + #: rhodecode/templates/admin/permissions/permissions.html:5 msgid "Permissions administration" msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:11 -#: rhodecode/templates/admin/repos/repo_edit.html:109 -#: rhodecode/templates/admin/users/user_edit.html:127 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:248 -#: rhodecode/templates/settings/repo_settings.html:58 +#: rhodecode/templates/admin/repos/repo_edit.html:116 +#: 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:77 msgid "Permissions" msgstr "" @@ -1266,6 +1478,7 @@ msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:71 +#: rhodecode/templates/admin/repos/repo_edit.html:218 msgid "set" msgstr "" @@ -1281,35 +1494,56 @@ msgid "Repositories" msgstr "" -#: rhodecode/templates/admin/repos/repo_add.html:13 -msgid "add new" -msgstr "" - #: rhodecode/templates/admin/repos/repo_add_base.html:20 -#: rhodecode/templates/summary/summary.html:80 -#: rhodecode/templates/summary/summary.html:82 +#: rhodecode/templates/summary/summary.html:90 +#: rhodecode/templates/summary/summary.html:91 msgid "Clone from" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.html:28 -#: rhodecode/templates/admin/repos/repo_edit.html:48 +#: rhodecode/templates/admin/repos/repo_add_base.html:24 +#: rhodecode/templates/admin/repos/repo_edit.html:44 +#: rhodecode/templates/settings/repo_settings.html:43 +msgid "Optional http[s] url from which repository should be cloned." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_add_base.html:29 +#: rhodecode/templates/admin/repos/repo_edit.html:49 #: rhodecode/templates/admin/repos_groups/repos_groups.html:4 +#: rhodecode/templates/forks/fork.html:41 +#: rhodecode/templates/settings/repo_settings.html:48 msgid "Repository group" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.html:36 -#: rhodecode/templates/admin/repos/repo_edit.html:56 +#: rhodecode/templates/admin/repos/repo_add_base.html:33 +#: 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 "" + +#: rhodecode/templates/admin/repos/repo_add_base.html:38 +#: rhodecode/templates/admin/repos/repo_edit.html:58 msgid "Type" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.html:52 -#: rhodecode/templates/admin/repos/repo_edit.html:73 -#: rhodecode/templates/settings/repo_fork.html:48 -#: rhodecode/templates/settings/repo_settings.html:49 -msgid "Private" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_add_base.html:59 +#: rhodecode/templates/admin/repos/repo_add_base.html:42 +msgid "Type of repository to create." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_add_base.html:51 +#: rhodecode/templates/admin/repos/repo_edit.html:70 +#: rhodecode/templates/settings/repo_settings.html:61 +msgid "Keep it short and to the point. Use a README file for longer descriptions." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_add_base.html:60 +#: rhodecode/templates/admin/repos/repo_edit.html:80 +#: rhodecode/templates/settings/repo_settings.html:71 +msgid "" +"Private repositories are only visible to people explicitly added as " +"collaborators." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_add_base.html:64 msgid "add" msgstr "" @@ -1323,138 +1557,192 @@ #: rhodecode/templates/admin/repos/repo_edit.html:13 #: rhodecode/templates/admin/users/user_edit.html:13 -#: rhodecode/templates/admin/users/user_edit_my_account.html:148 +#: rhodecode/templates/admin/users/user_edit_my_account.html:155 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13 -#: rhodecode/templates/files/files_annotate.html:49 -#: rhodecode/templates/files/files_source.html:20 +#: rhodecode/templates/files/files_source.html:32 +#: rhodecode/templates/journal/journal.html:72 msgid "edit" msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:40 +#: rhodecode/templates/settings/repo_settings.html:39 msgid "Clone uri" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:81 +#: rhodecode/templates/admin/repos/repo_edit.html:85 msgid "Enable statistics" msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:89 +msgid "Enable statistics window on summary page." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:94 msgid "Enable downloads" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:127 -msgid "Administration" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:130 -msgid "Statistics" +#: rhodecode/templates/admin/repos/repo_edit.html:98 +msgid "Enable download menu on summary page." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:108 +msgid "Change owner of this repository." msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:134 -msgid "Reset current statistics" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:134 -msgid "Confirm to remove current statistics" +msgid "Administration" msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:137 +msgid "Statistics" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:141 +msgid "Reset current statistics" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:141 +msgid "Confirm to remove current statistics" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:144 msgid "Fetched to rev" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:138 -msgid "Percentage of stats gathered" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:147 +#: rhodecode/templates/admin/repos/repo_edit.html:145 +msgid "Stats gathered" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:153 msgid "Remote" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:151 +#: rhodecode/templates/admin/repos/repo_edit.html:157 msgid "Pull changes from remote location" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:151 +#: rhodecode/templates/admin/repos/repo_edit.html:157 msgid "Confirm to pull changes from remote side" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:162 +#: rhodecode/templates/admin/repos/repo_edit.html:168 msgid "Cache" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:166 +#: rhodecode/templates/admin/repos/repo_edit.html:172 msgid "Invalidate repository cache" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:166 +#: rhodecode/templates/admin/repos/repo_edit.html:172 msgid "Confirm to invalidate repository cache" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:177 +#: rhodecode/templates/admin/repos/repo_edit.html:183 msgid "Remove from public journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:179 -msgid "Add to public journal" -msgstr "" - #: rhodecode/templates/admin/repos/repo_edit.html:185 +msgid "Add to public journal" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:190 +msgid "" +"All actions made on this repository will be accessible to everyone in " +"public journal" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:197 +#: rhodecode/templates/changeset/changeset_file_comment.html:19 msgid "Delete" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:189 +#: rhodecode/templates/admin/repos/repo_edit.html:201 msgid "Remove this repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:189 -#: rhodecode/templates/admin/repos/repos.html:79 +#: rhodecode/templates/admin/repos/repo_edit.html:201 msgid "Confirm to delete this repository" msgstr "" +#: rhodecode/templates/admin/repos/repo_edit.html:205 +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 "" + +#: rhodecode/templates/admin/repos/repo_edit.html:213 +msgid "Set as fork" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:222 +msgid "Manually set this repository as a fork of another" +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit_perms.html:3 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3 msgid "none" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:4 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:4 msgid "read" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:5 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:5 msgid "write" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:6 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6 #: rhodecode/templates/admin/users/users.html:38 -#: rhodecode/templates/base/base.html:296 +#: rhodecode/templates/base/base.html:214 msgid "admin" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:7 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:7 msgid "member" msgstr "" +#: rhodecode/templates/admin/repos/repo_edit_perms.html:16 +#: rhodecode/templates/data_table/_dt_elements.html:61 +#: rhodecode/templates/journal/journal.html:123 +#: rhodecode/templates/summary/summary.html:71 +msgid "private repository" +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit_perms.html:33 #: rhodecode/templates/admin/repos/repo_edit_perms.html:53 +#: 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 "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:75 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:64 msgid "Add another member" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:89 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:78 msgid "Failed to remove user" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:104 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:93 msgid "Failed to remove users group" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:205 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:123 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:112 msgid "Group" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:206 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:124 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:113 #: rhodecode/templates/admin/users_groups/users_groups.html:33 msgid "members" msgstr "" @@ -1463,43 +1751,29 @@ msgid "Repositories administration" msgstr "" -#: rhodecode/templates/admin/repos/repos.html:34 -#: rhodecode/templates/summary/summary.html:100 +#: rhodecode/templates/admin/repos/repos.html:40 +#: rhodecode/templates/summary/summary.html:107 msgid "Contact" msgstr "" -#: rhodecode/templates/admin/repos/repos.html:35 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36 -#: rhodecode/templates/admin/users/user_edit_my_account.html:119 -#: rhodecode/templates/admin/users/users.html:40 -#: rhodecode/templates/admin/users_groups/users_groups.html:35 -msgid "action" -msgstr "" - -#: rhodecode/templates/admin/repos/repos.html:51 -#: rhodecode/templates/admin/users/user_edit_my_account.html:134 -#: rhodecode/templates/admin/users/user_edit_my_account.html:148 -msgid "private" -msgstr "" - -#: rhodecode/templates/admin/repos/repos.html:53 -#: rhodecode/templates/admin/repos/repos.html:59 -#: rhodecode/templates/admin/users/user_edit_my_account.html:136 -#: rhodecode/templates/admin/users/user_edit_my_account.html:142 -#: rhodecode/templates/summary/summary.html:68 -msgid "public" -msgstr "" - -#: rhodecode/templates/admin/repos/repos.html:79 +#: rhodecode/templates/admin/repos/repos.html:68 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 #: rhodecode/templates/admin/users/users.html:55 +#: rhodecode/templates/admin/users_groups/users_groups.html:44 msgid "delete" msgstr "" +#: rhodecode/templates/admin/repos/repos.html:68 +#: rhodecode/templates/admin/users/user_edit_my_account.html:158 +#, python-format +msgid "Confirm to delete this repository: %s" +msgstr "" + #: rhodecode/templates/admin/repos_groups/repos_groups.html:8 msgid "Groups" msgstr "" -#: rhodecode/templates/admin/repos_groups/repos_groups.html:13 +#: rhodecode/templates/admin/repos_groups/repos_groups.html:12 msgid "with" msgstr "" @@ -1522,8 +1796,7 @@ msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:58 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58 -#: rhodecode/templates/admin/users/user_add.html:85 +#: 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 msgid "save" @@ -1537,6 +1810,19 @@ msgid "edit repos group" msgstr "" +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:67 +#: rhodecode/templates/admin/settings/settings.html:112 +#: rhodecode/templates/admin/settings/settings.html:177 +#: rhodecode/templates/admin/users/user_edit.html:130 +#: rhodecode/templates/admin/users/user_edit.html:155 +#: rhodecode/templates/admin/users/user_edit_my_account.html:103 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:116 +#: rhodecode/templates/files/files_add.html:82 +#: rhodecode/templates/files/files_edit.html:68 +#: rhodecode/templates/settings/repo_settings.html:85 +msgid "Reset" +msgstr "" + #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5 msgid "Repositories groups administration" msgstr "" @@ -1546,11 +1832,18 @@ msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:35 -msgid "Number of repositories" +msgid "Number of toplevel repositories" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36 +#: rhodecode/templates/admin/users/users.html:40 +#: rhodecode/templates/admin/users_groups/users_groups.html:35 +msgid "action" msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 -msgid "Confirm to delete this group" +#, python-format +msgid "Confirm to delete this group: %s" msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:62 @@ -1641,20 +1934,10 @@ msgstr "" #: rhodecode/templates/admin/settings/settings.html:111 -#: rhodecode/templates/admin/settings/settings.html:177 +#: rhodecode/templates/admin/settings/settings.html:176 msgid "Save settings" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:112 -#: rhodecode/templates/admin/settings/settings.html:178 -#: rhodecode/templates/admin/users/user_edit.html:118 -#: rhodecode/templates/admin/users/user_edit.html:143 -#: rhodecode/templates/admin/users/user_edit_my_account.html:90 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:264 -#: rhodecode/templates/files/files_edit.html:50 -msgid "Reset" -msgstr "" - #: rhodecode/templates/admin/settings/settings.html:118 msgid "Mercurial settings" msgstr "" @@ -1671,41 +1954,61 @@ msgid "Hooks" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:142 -msgid "advanced setup" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:147 +#: rhodecode/templates/admin/settings/settings.html:144 msgid "Update repository after push (hg update)" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:151 +#: rhodecode/templates/admin/settings/settings.html:148 msgid "Show repository size after push" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:155 +#: rhodecode/templates/admin/settings/settings.html:152 msgid "Log user push commands" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:159 +#: rhodecode/templates/admin/settings/settings.html:156 msgid "Log user pull commands" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:166 +#: rhodecode/templates/admin/settings/settings.html:160 +msgid "advanced setup" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:165 msgid "Repositories location" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:171 +#: rhodecode/templates/admin/settings/settings.html:170 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:172 +#: rhodecode/templates/admin/settings/settings.html:171 msgid "unlock" msgstr "" +#: rhodecode/templates/admin/settings/settings.html:191 +msgid "Test Email" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:199 +msgid "Email to" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:207 +msgid "Send" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:213 +msgid "System Info and Packages" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:216 +msgid "show" +msgstr "" + #: rhodecode/templates/admin/users/user_add.html:5 msgid "Add user" msgstr "" @@ -1720,8 +2023,12 @@ msgid "add new user" msgstr "" -#: rhodecode/templates/admin/users/user_add.html:77 -#: rhodecode/templates/admin/users/user_edit.html:101 +#: rhodecode/templates/admin/users/user_add.html:50 +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" @@ -1731,36 +2038,42 @@ msgid "Edit user" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:33 -#: rhodecode/templates/admin/users/user_edit_my_account.html:32 -msgid "Change your avatar at" -msgstr "" - #: rhodecode/templates/admin/users/user_edit.html:34 #: rhodecode/templates/admin/users/user_edit_my_account.html:33 +msgid "Change your avatar at" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.html:35 +#: rhodecode/templates/admin/users/user_edit_my_account.html:34 msgid "Using" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:40 -#: rhodecode/templates/admin/users/user_edit_my_account.html:39 +#: rhodecode/templates/admin/users/user_edit.html:43 +#: rhodecode/templates/admin/users/user_edit_my_account.html:43 msgid "API key" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:56 +#: rhodecode/templates/admin/users/user_edit.html:59 msgid "LDAP DN" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:65 -#: rhodecode/templates/admin/users/user_edit_my_account.html:54 +#: rhodecode/templates/admin/users/user_edit.html:68 +#: rhodecode/templates/admin/users/user_edit_my_account.html:58 msgid "New password" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:135 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:256 +#: rhodecode/templates/admin/users/user_edit.html:77 +#: rhodecode/templates/admin/users/user_edit_my_account.html:67 +msgid "New password confirmation" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.html:147 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:108 msgid "Create repositories" msgstr "" #: rhodecode/templates/admin/users/user_edit_my_account.html:5 +#: rhodecode/templates/base/base.html:124 msgid "My account" msgstr "" @@ -1768,29 +2081,50 @@ msgid "My Account" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account.html:101 -msgid "My repositories" -msgstr "" - -#: rhodecode/templates/admin/users/user_edit_my_account.html:107 -msgid "ADD REPOSITORY" -msgstr "" - -#: rhodecode/templates/admin/users/user_edit_my_account.html:118 -#: rhodecode/templates/branches/branches_data.html:7 -#: rhodecode/templates/shortlog/shortlog_data.html:8 -#: rhodecode/templates/tags/tags_data.html:7 -msgid "revision" -msgstr "" - -#: rhodecode/templates/admin/users/user_edit_my_account.html:157 +#: rhodecode/templates/admin/users/user_edit_my_account.html:116 +#: rhodecode/templates/journal/journal.html:32 +msgid "My repos" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:116 +msgid "My permissions" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:121 +#: rhodecode/templates/journal/journal.html:37 +msgid "ADD" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:134 +#: rhodecode/templates/bookmarks/bookmarks.html:40 +#: rhodecode/templates/bookmarks/bookmarks_data.html:9 +#: rhodecode/templates/branches/branches.html:40 +#: rhodecode/templates/journal/journal.html:51 +#: rhodecode/templates/tags/tags.html:40 +#: rhodecode/templates/tags/tags_data.html:9 +msgid "Revision" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:155 +#: rhodecode/templates/journal/journal.html:72 +msgid "private" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:165 +#: rhodecode/templates/journal/journal.html:85 msgid "No repositories yet" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account.html:159 +#: rhodecode/templates/admin/users/user_edit_my_account.html:167 +#: rhodecode/templates/journal/journal.html:87 msgid "create one now" msgstr "" +#: rhodecode/templates/admin/users/user_edit_my_account.html:184 +#: rhodecode/templates/admin/users/user_edit_my_account.html:285 +msgid "Permission" +msgstr "" + #: rhodecode/templates/admin/users/users.html:5 msgid "Users administration" msgstr "" @@ -1804,8 +2138,7 @@ msgstr "" #: rhodecode/templates/admin/users/users.html:34 -#: rhodecode/templates/branches/branches_data.html:5 -#: rhodecode/templates/tags/tags_data.html:5 +#: rhodecode/templates/branches/branches_data.html:6 msgid "name" msgstr "" @@ -1823,12 +2156,13 @@ msgstr "" #: rhodecode/templates/admin/users/users.html:39 -#: rhodecode/templates/base/base.html:305 +#: rhodecode/templates/base/base.html:223 msgid "ldap" msgstr "" #: rhodecode/templates/admin/users/users.html:56 -msgid "Confirm to delete this user" +#, python-format +msgid "Confirm to delete this user: %s" msgstr "" #: rhodecode/templates/admin/users_groups/users_group_add.html:5 @@ -1872,6 +2206,10 @@ msgid "Add all elements" msgstr "" +#: rhodecode/templates/admin/users_groups/users_group_edit.html:126 +msgid "Group members" +msgstr "" + #: rhodecode/templates/admin/users_groups/users_groups.html:5 msgid "Users groups administration" msgstr "" @@ -1884,310 +2222,426 @@ msgid "group name" msgstr "" -#: rhodecode/templates/base/base.html:32 +#: rhodecode/templates/admin/users_groups/users_groups.html:45 +#, python-format +msgid "Confirm to delete this users group: %s" +msgstr "" + +#: rhodecode/templates/base/base.html:41 +msgid "Submit a bug" +msgstr "" + +#: rhodecode/templates/base/base.html:77 +msgid "Login to your account" +msgstr "" + +#: rhodecode/templates/base/base.html:100 msgid "Forgot password ?" msgstr "" -#: rhodecode/templates/base/base.html:57 rhodecode/templates/base/base.html:338 -#: rhodecode/templates/base/base.html:340 -#: rhodecode/templates/base/base.html:342 +#: rhodecode/templates/base/base.html:107 +msgid "Log In" +msgstr "" + +#: rhodecode/templates/base/base.html:118 +msgid "Inbox" +msgstr "" + +#: rhodecode/templates/base/base.html:122 +#: rhodecode/templates/base/base.html:289 +#: rhodecode/templates/base/base.html:291 +#: rhodecode/templates/base/base.html:293 msgid "Home" msgstr "" -#: rhodecode/templates/base/base.html:61 rhodecode/templates/base/base.html:347 -#: rhodecode/templates/base/base.html:349 -#: rhodecode/templates/base/base.html:351 +#: rhodecode/templates/base/base.html:123 +#: rhodecode/templates/base/base.html:298 +#: rhodecode/templates/base/base.html:300 +#: rhodecode/templates/base/base.html:302 #: rhodecode/templates/journal/journal.html:4 #: rhodecode/templates/journal/journal.html:17 #: rhodecode/templates/journal/public_journal.html:4 msgid "Journal" msgstr "" -#: rhodecode/templates/base/base.html:66 -msgid "Login" -msgstr "" - -#: rhodecode/templates/base/base.html:68 +#: rhodecode/templates/base/base.html:125 msgid "Log Out" msgstr "" -#: rhodecode/templates/base/base.html:107 -msgid "Submit a bug" -msgstr "" - -#: rhodecode/templates/base/base.html:141 +#: rhodecode/templates/base/base.html:144 msgid "Switch repository" msgstr "" -#: rhodecode/templates/base/base.html:143 +#: rhodecode/templates/base/base.html:146 msgid "Products" msgstr "" -#: rhodecode/templates/base/base.html:149 +#: rhodecode/templates/base/base.html:152 +#: rhodecode/templates/base/base.html:182 msgid "loading..." msgstr "" -#: rhodecode/templates/base/base.html:234 -#: rhodecode/templates/base/base.html:236 -#: rhodecode/templates/base/base.html:238 +#: 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:9 +#: rhodecode/templates/data_table/_dt_elements.html:11 +#: rhodecode/templates/data_table/_dt_elements.html:13 +#: rhodecode/templates/summary/summary.html:4 +msgid "Summary" +msgstr "" + +#: rhodecode/templates/base/base.html:166 +#: rhodecode/templates/base/base.html:168 +#: rhodecode/templates/base/base.html:170 +#: rhodecode/templates/changelog/changelog.html:6 +#: rhodecode/templates/changelog/changelog.html:15 +#: rhodecode/templates/data_table/_dt_elements.html:17 +#: rhodecode/templates/data_table/_dt_elements.html:19 +#: rhodecode/templates/data_table/_dt_elements.html:21 +msgid "Changelog" +msgstr "" + +#: rhodecode/templates/base/base.html:175 +#: rhodecode/templates/base/base.html:177 +#: rhodecode/templates/base/base.html:179 msgid "Switch to" msgstr "" -#: rhodecode/templates/base/base.html:242 -#: rhodecode/templates/branches/branches.html:13 -msgid "branches" -msgstr "" - -#: rhodecode/templates/base/base.html:249 -#: rhodecode/templates/branches/branches_data.html:52 -msgid "There are no branches yet" -msgstr "" - -#: rhodecode/templates/base/base.html:254 -#: rhodecode/templates/shortlog/shortlog_data.html:10 -#: rhodecode/templates/tags/tags.html:14 -msgid "tags" -msgstr "" - -#: rhodecode/templates/base/base.html:261 -#: rhodecode/templates/tags/tags_data.html:32 -msgid "There are no tags yet" -msgstr "" - -#: rhodecode/templates/base/base.html:277 -#: rhodecode/templates/base/base.html:281 -#: rhodecode/templates/files/files_annotate.html:40 -#: rhodecode/templates/files/files_source.html:11 +#: 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:25 +#: rhodecode/templates/data_table/_dt_elements.html:27 +#: rhodecode/templates/data_table/_dt_elements.html:29 +#: rhodecode/templates/files/files.html:4 +#: rhodecode/templates/files/files.html:40 +msgid "Files" +msgstr "" + +#: rhodecode/templates/base/base.html:195 +#: rhodecode/templates/base/base.html:199 msgid "Options" msgstr "" -#: rhodecode/templates/base/base.html:286 -#: rhodecode/templates/base/base.html:288 -#: rhodecode/templates/base/base.html:306 +#: rhodecode/templates/base/base.html:204 +#: rhodecode/templates/base/base.html:206 +#: rhodecode/templates/base/base.html:224 msgid "settings" msgstr "" -#: rhodecode/templates/base/base.html:292 +#: rhodecode/templates/base/base.html:209 +#: rhodecode/templates/data_table/_dt_elements.html:74 +#: rhodecode/templates/forks/fork.html:13 +msgid "fork" +msgstr "" + +#: rhodecode/templates/base/base.html:210 msgid "search" msgstr "" -#: rhodecode/templates/base/base.html:299 +#: rhodecode/templates/base/base.html:217 msgid "journal" msgstr "" -#: rhodecode/templates/base/base.html:301 +#: rhodecode/templates/base/base.html:219 msgid "repositories groups" msgstr "" -#: rhodecode/templates/base/base.html:302 +#: rhodecode/templates/base/base.html:220 msgid "users" msgstr "" -#: rhodecode/templates/base/base.html:303 +#: rhodecode/templates/base/base.html:221 msgid "users groups" msgstr "" -#: rhodecode/templates/base/base.html:304 +#: rhodecode/templates/base/base.html:222 msgid "permissions" msgstr "" -#: rhodecode/templates/base/base.html:317 -#: rhodecode/templates/base/base.html:319 +#: rhodecode/templates/base/base.html:235 +#: rhodecode/templates/base/base.html:237 #: rhodecode/templates/followers/followers.html:5 msgid "Followers" msgstr "" -#: rhodecode/templates/base/base.html:325 -#: rhodecode/templates/base/base.html:327 +#: rhodecode/templates/base/base.html:243 +#: rhodecode/templates/base/base.html:245 #: rhodecode/templates/forks/forks.html:5 msgid "Forks" msgstr "" -#: rhodecode/templates/base/base.html:356 -#: rhodecode/templates/base/base.html:358 -#: rhodecode/templates/base/base.html:360 +#: rhodecode/templates/base/base.html:316 +#: rhodecode/templates/base/base.html:318 +#: rhodecode/templates/base/base.html:320 #: rhodecode/templates/search/search.html:4 #: rhodecode/templates/search/search.html:24 #: rhodecode/templates/search/search.html:46 msgid "Search" msgstr "" -#: rhodecode/templates/base/root.html:57 -#: rhodecode/templates/journal/journal.html:48 -#: rhodecode/templates/summary/summary.html:36 +#: rhodecode/templates/base/root.html:53 +msgid "add another comment" +msgstr "" + +#: rhodecode/templates/base/root.html:54 +#: rhodecode/templates/journal/journal.html:111 +#: rhodecode/templates/summary/summary.html:52 msgid "Stop following this repository" msgstr "" -#: rhodecode/templates/base/root.html:66 -#: rhodecode/templates/summary/summary.html:40 +#: rhodecode/templates/base/root.html:55 +#: rhodecode/templates/summary/summary.html:56 msgid "Start following this repository" msgstr "" -#: rhodecode/templates/branches/branches_data.html:4 -#: rhodecode/templates/tags/tags_data.html:4 +#: rhodecode/templates/bookmarks/bookmarks.html:5 +msgid "Bookmarks" +msgstr "" + +#: rhodecode/templates/bookmarks/bookmarks.html:39 +#: rhodecode/templates/bookmarks/bookmarks_data.html:8 +#: rhodecode/templates/branches/branches.html:39 +#: rhodecode/templates/tags/tags.html:39 +#: rhodecode/templates/tags/tags_data.html:8 +msgid "Author" +msgstr "" + +#: rhodecode/templates/branches/branches_data.html:7 msgid "date" msgstr "" -#: rhodecode/templates/branches/branches_data.html:6 -#: rhodecode/templates/shortlog/shortlog_data.html:7 -#: rhodecode/templates/tags/tags_data.html:6 -msgid "author" -msgstr "" - #: rhodecode/templates/branches/branches_data.html:8 -#: rhodecode/templates/shortlog/shortlog_data.html:11 -#: rhodecode/templates/tags/tags_data.html:8 -msgid "links" -msgstr "" - -#: rhodecode/templates/branches/branches_data.html:23 -#: rhodecode/templates/branches/branches_data.html:43 -#: rhodecode/templates/shortlog/shortlog_data.html:39 -#: rhodecode/templates/tags/tags_data.html:24 -msgid "changeset" -msgstr "" - -#: rhodecode/templates/branches/branches_data.html:25 -#: rhodecode/templates/branches/branches_data.html:45 -#: rhodecode/templates/files/files.html:12 -#: rhodecode/templates/shortlog/shortlog_data.html:41 -#: rhodecode/templates/summary/summary.html:233 -#: rhodecode/templates/tags/tags_data.html:26 -msgid "files" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:14 -msgid "showing " -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:14 -msgid "out of" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:37 +#: 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/changelog/changelog.html:15 +#, python-format +msgid "showing %d out of %d revision" +msgid_plural "showing %d out of %d revisions" +msgstr[0] "" +msgstr[1] "" + +#: rhodecode/templates/changelog/changelog.html:38 msgid "Show" msgstr "" -#: rhodecode/templates/changelog/changelog.html:50 -#: rhodecode/templates/changeset/changeset.html:42 -#: rhodecode/templates/summary/summary.html:609 -msgid "commit" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:63 +#: rhodecode/templates/changelog/changelog.html:64 +#: rhodecode/templates/summary/summary.html:352 +msgid "show more" +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:68 msgid "Affected number of files, click to show more details" msgstr "" -#: rhodecode/templates/changelog/changelog.html:67 -#: rhodecode/templates/changeset/changeset.html:66 -msgid "merge" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:72 -#: rhodecode/templates/changeset/changeset.html:72 -msgid "Parent" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:77 -#: rhodecode/templates/changeset/changeset.html:77 -msgid "No parents" -msgstr "" - #: rhodecode/templates/changelog/changelog.html:82 -#: rhodecode/templates/changeset/changeset.html:80 +#: rhodecode/templates/changeset/changeset.html:72 +msgid "Parent" +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:88 +#: rhodecode/templates/changeset/changeset.html:78 +msgid "No parents" +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:93 +#: rhodecode/templates/changeset/changeset.html:82 +msgid "merge" +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:96 +#: rhodecode/templates/changeset/changeset.html:85 #: rhodecode/templates/files/files.html:29 -#: rhodecode/templates/files/files_annotate.html:25 +#: rhodecode/templates/files/files_add.html:33 #: rhodecode/templates/files/files_edit.html:33 #: rhodecode/templates/shortlog/shortlog_data.html:9 msgid "branch" msgstr "" -#: rhodecode/templates/changelog/changelog.html:86 -#: rhodecode/templates/changeset/changeset.html:83 +#: rhodecode/templates/changelog/changelog.html:102 +msgid "bookmark" +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:108 +#: rhodecode/templates/changeset/changeset.html:90 msgid "tag" msgstr "" -#: rhodecode/templates/changelog/changelog.html:122 +#: rhodecode/templates/changelog/changelog.html:144 msgid "Show selected changes __S -> __E" msgstr "" -#: rhodecode/templates/changelog/changelog.html:172 -#: rhodecode/templates/shortlog/shortlog_data.html:61 +#: rhodecode/templates/changelog/changelog.html:235 msgid "There are no changes yet" msgstr "" #: rhodecode/templates/changelog/changelog_details.html:2 -#: rhodecode/templates/changeset/changeset.html:55 +#: rhodecode/templates/changeset/changeset.html:60 msgid "removed" msgstr "" #: rhodecode/templates/changelog/changelog_details.html:3 -#: rhodecode/templates/changeset/changeset.html:56 +#: rhodecode/templates/changeset/changeset.html:61 msgid "changed" msgstr "" #: rhodecode/templates/changelog/changelog_details.html:4 -#: rhodecode/templates/changeset/changeset.html:57 +#: rhodecode/templates/changeset/changeset.html:62 msgid "added" msgstr "" #: rhodecode/templates/changelog/changelog_details.html:6 #: rhodecode/templates/changelog/changelog_details.html:7 #: rhodecode/templates/changelog/changelog_details.html:8 -#: rhodecode/templates/changeset/changeset.html:59 -#: rhodecode/templates/changeset/changeset.html:60 -#: rhodecode/templates/changeset/changeset.html:61 +#: rhodecode/templates/changeset/changeset.html:64 +#: rhodecode/templates/changeset/changeset.html:65 +#: rhodecode/templates/changeset/changeset.html:66 #, python-format msgid "affected %s files" msgstr "" #: rhodecode/templates/changeset/changeset.html:6 #: rhodecode/templates/changeset/changeset.html:14 -#: rhodecode/templates/changeset/changeset.html:31 msgid "Changeset" msgstr "" -#: rhodecode/templates/changeset/changeset.html:32 -#: rhodecode/templates/changeset/changeset.html:121 -#: rhodecode/templates/changeset/changeset_range.html:78 -#: rhodecode/templates/files/file_diff.html:32 -#: rhodecode/templates/files/file_diff.html:42 +#: rhodecode/templates/changeset/changeset.html:37 +#: rhodecode/templates/changeset/diff_block.html:20 msgid "raw diff" msgstr "" -#: rhodecode/templates/changeset/changeset.html:34 -#: rhodecode/templates/changeset/changeset.html:123 -#: rhodecode/templates/changeset/changeset_range.html:80 -#: rhodecode/templates/files/file_diff.html:34 +#: rhodecode/templates/changeset/changeset.html:38 +#: rhodecode/templates/changeset/diff_block.html:21 msgid "download diff" msgstr "" -#: rhodecode/templates/changeset/changeset.html:90 +#: rhodecode/templates/changeset/changeset.html:42 +#: rhodecode/templates/changeset/changeset_file_comment.html:69 +#, python-format +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "" +msgstr[1] "" + +#: rhodecode/templates/changeset/changeset.html:42 +#: rhodecode/templates/changeset/changeset_file_comment.html:69 +#, python-format +msgid "(%d inline)" +msgid_plural "(%d inline)" +msgstr[0] "" +msgstr[1] "" + +#: rhodecode/templates/changeset/changeset.html:97 +#, python-format +msgid "%s files affected with %s insertions and %s deletions:" +msgstr "" + +#: rhodecode/templates/changeset/changeset.html:113 +msgid "Changeset was too big and was cut off..." +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:35 +msgid "Submitting..." +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:38 +msgid "Commenting on line {1}." +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:39 +#: rhodecode/templates/changeset/changeset_file_comment.html:100 #, python-format -msgid "%s files affected with %s additions and %s deletions." -msgstr "" - -#: rhodecode/templates/changeset/changeset.html:101 -msgid "Changeset was too big and was cut off..." -msgstr "" - -#: rhodecode/templates/changeset/changeset.html:119 -#: rhodecode/templates/changeset/changeset_range.html:76 -#: rhodecode/templates/files/file_diff.html:30 +msgid "Comments parsed using %s syntax with %s support." +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:41 +#: rhodecode/templates/changeset/changeset_file_comment.html:102 +msgid "Use @username inside this text to send notification to this RhodeCode user" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:47 +#: rhodecode/templates/changeset/changeset_file_comment.html:107 +msgid "Comment" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:48 +#: rhodecode/templates/changeset/changeset_file_comment.html:59 +msgid "Hide" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:55 +msgid "You need to be logged in to comment." +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:55 +msgid "Login now" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:97 +msgid "Leave a comment" +msgstr "" + +#: rhodecode/templates/changeset/changeset_range.html:29 +msgid "Compare View" +msgstr "" + +#: rhodecode/templates/changeset/changeset_range.html:49 +msgid "Files affected" +msgstr "" + +#: rhodecode/templates/changeset/diff_block.html:19 msgid "diff" msgstr "" -#: rhodecode/templates/changeset/changeset.html:132 -#: rhodecode/templates/changeset/changeset_range.html:89 -msgid "No changes in this file" -msgstr "" - -#: rhodecode/templates/changeset/changeset_range.html:30 -msgid "Compare View" -msgstr "" - -#: rhodecode/templates/changeset/changeset_range.html:52 -msgid "Files affected" +#: rhodecode/templates/changeset/diff_block.html:27 +msgid "show inline comments" +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.html:33 +#: rhodecode/templates/data_table/_dt_elements.html:35 +#: rhodecode/templates/data_table/_dt_elements.html:37 +#: rhodecode/templates/forks/fork.html:5 +msgid "Fork" +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.html:54 +#: rhodecode/templates/journal/journal.html:117 +#: rhodecode/templates/summary/summary.html:63 +msgid "Mercurial repository" +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.html:56 +#: rhodecode/templates/journal/journal.html:119 +#: rhodecode/templates/summary/summary.html:66 +msgid "Git repository" +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.html:63 +#: rhodecode/templates/journal/journal.html:125 +#: rhodecode/templates/summary/summary.html:73 +msgid "public repository" +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.html:74 +#: rhodecode/templates/summary/summary.html:82 +#: rhodecode/templates/summary/summary.html:83 +msgid "Fork of" +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.html:86 +msgid "No changesets yet" +msgstr "" + +#: rhodecode/templates/email_templates/main.html:8 +msgid "This is an notification from RhodeCode." msgstr "" #: rhodecode/templates/errors/error_document.html:44 @@ -2200,80 +2654,69 @@ msgid "File diff" msgstr "" -#: rhodecode/templates/files/file_diff.html:42 -msgid "Diff is to big to display" -msgstr "" - -#: rhodecode/templates/files/files.html:37 -#: rhodecode/templates/files/files_annotate.html:31 +#: rhodecode/templates/files/files.html:12 +#: rhodecode/templates/summary/summary.html:328 +msgid "files" +msgstr "" + +#: rhodecode/templates/files/files.html:44 +msgid "search truncated" +msgstr "" + +#: rhodecode/templates/files/files.html:45 +msgid "no matching files" +msgstr "" + +#: rhodecode/templates/files/files_add.html:4 +#: rhodecode/templates/files/files_edit.html:4 +msgid "Edit file" +msgstr "" + +#: rhodecode/templates/files/files_add.html:19 +msgid "add file" +msgstr "" + +#: rhodecode/templates/files/files_add.html:40 +msgid "Add new file" +msgstr "" + +#: rhodecode/templates/files/files_add.html:45 +msgid "File Name" +msgstr "" + +#: rhodecode/templates/files/files_add.html:49 +#: rhodecode/templates/files/files_add.html:58 +msgid "or" +msgstr "" + +#: rhodecode/templates/files/files_add.html:49 +#: rhodecode/templates/files/files_add.html:54 +msgid "Upload file" +msgstr "" + +#: rhodecode/templates/files/files_add.html:58 +msgid "Create new file" +msgstr "" + +#: rhodecode/templates/files/files_add.html:63 #: rhodecode/templates/files/files_edit.html:39 +#: rhodecode/templates/files/files_ypjax.html:3 msgid "Location" msgstr "" -#: rhodecode/templates/files/files.html:46 -msgid "Go back" -msgstr "" - -#: rhodecode/templates/files/files.html:47 -msgid "No files at given path" -msgstr "" - -#: rhodecode/templates/files/files_annotate.html:4 -msgid "File annotate" -msgstr "" - -#: rhodecode/templates/files/files_annotate.html:12 -msgid "annotate" -msgstr "" - -#: rhodecode/templates/files/files_annotate.html:33 -#: rhodecode/templates/files/files_browser.html:160 -#: rhodecode/templates/files/files_source.html:2 -msgid "Revision" -msgstr "" - -#: rhodecode/templates/files/files_annotate.html:36 -#: rhodecode/templates/files/files_browser.html:158 -#: rhodecode/templates/files/files_source.html:7 -msgid "Size" -msgstr "" - -#: rhodecode/templates/files/files_annotate.html:38 -#: rhodecode/templates/files/files_browser.html:159 -#: rhodecode/templates/files/files_source.html:9 -msgid "Mimetype" -msgstr "" - -#: rhodecode/templates/files/files_annotate.html:41 -msgid "show source" -msgstr "" - -#: rhodecode/templates/files/files_annotate.html:43 -#: rhodecode/templates/files/files_annotate.html:78 -#: rhodecode/templates/files/files_source.html:14 -#: rhodecode/templates/files/files_source.html:51 -msgid "show as raw" -msgstr "" - -#: rhodecode/templates/files/files_annotate.html:45 -#: rhodecode/templates/files/files_source.html:16 -msgid "download as raw" -msgstr "" - -#: rhodecode/templates/files/files_annotate.html:54 -#: rhodecode/templates/files/files_source.html:25 -msgid "History" -msgstr "" - -#: rhodecode/templates/files/files_annotate.html:73 -#: rhodecode/templates/files/files_source.html:46 -#, python-format -msgid "Binary file (%s)" -msgstr "" - -#: rhodecode/templates/files/files_annotate.html:78 -#: rhodecode/templates/files/files_source.html:51 -msgid "File is too big to display" +#: rhodecode/templates/files/files_add.html:67 +msgid "use / to separate directories" +msgstr "" + +#: 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 "" + +#: rhodecode/templates/files/files_add.html:81 +#: rhodecode/templates/files/files_edit.html:67 +msgid "Commit changes" msgstr "" #: rhodecode/templates/files/files_browser.html:13 @@ -2296,51 +2739,96 @@ msgid "search file list" msgstr "" -#: rhodecode/templates/files/files_browser.html:32 +#: rhodecode/templates/files/files_browser.html:31 +#: rhodecode/templates/shortlog/shortlog_data.html:65 +msgid "add new file" +msgstr "" + +#: rhodecode/templates/files/files_browser.html:35 msgid "Loading file list..." msgstr "" -#: rhodecode/templates/files/files_browser.html:111 -msgid "search truncated" -msgstr "" - -#: rhodecode/templates/files/files_browser.html:122 -msgid "no matching files" -msgstr "" - -#: rhodecode/templates/files/files_browser.html:161 +#: rhodecode/templates/files/files_browser.html:48 +msgid "Size" +msgstr "" + +#: rhodecode/templates/files/files_browser.html:49 +msgid "Mimetype" +msgstr "" + +#: rhodecode/templates/files/files_browser.html:50 +msgid "Last Revision" +msgstr "" + +#: rhodecode/templates/files/files_browser.html:51 msgid "Last modified" msgstr "" -#: rhodecode/templates/files/files_browser.html:162 +#: rhodecode/templates/files/files_browser.html:52 msgid "Last commiter" msgstr "" -#: rhodecode/templates/files/files_edit.html:4 -msgid "Edit file" -msgstr "" - #: rhodecode/templates/files/files_edit.html:19 msgid "edit file" msgstr "" -#: rhodecode/templates/files/files_edit.html:45 -#: rhodecode/templates/shortlog/shortlog_data.html:5 -msgid "commit message" +#: rhodecode/templates/files/files_edit.html:49 +#: rhodecode/templates/files/files_source.html:26 +msgid "show annotation" +msgstr "" + +#: rhodecode/templates/files/files_edit.html:50 +#: rhodecode/templates/files/files_source.html:28 +#: rhodecode/templates/files/files_source.html:56 +msgid "show as raw" msgstr "" #: rhodecode/templates/files/files_edit.html:51 -msgid "Commit changes" -msgstr "" - -#: rhodecode/templates/files/files_source.html:12 -msgid "show annotation" -msgstr "" - -#: rhodecode/templates/files/files_source.html:153 +#: rhodecode/templates/files/files_source.html:29 +msgid "download as raw" +msgstr "" + +#: rhodecode/templates/files/files_edit.html:54 +msgid "source" +msgstr "" + +#: rhodecode/templates/files/files_edit.html:59 +msgid "Editing file" +msgstr "" + +#: rhodecode/templates/files/files_source.html:2 +msgid "History" +msgstr "" + +#: rhodecode/templates/files/files_source.html:24 +msgid "show source" +msgstr "" + +#: rhodecode/templates/files/files_source.html:47 +#, python-format +msgid "Binary file (%s)" +msgstr "" + +#: rhodecode/templates/files/files_source.html:56 +msgid "File is too big to display" +msgstr "" + +#: rhodecode/templates/files/files_source.html:112 msgid "Selection link" msgstr "" +#: rhodecode/templates/files/files_ypjax.html:5 +msgid "annotation" +msgstr "" + +#: rhodecode/templates/files/files_ypjax.html:15 +msgid "Go back" +msgstr "" + +#: rhodecode/templates/files/files_ypjax.html:16 +msgid "No files at given path" +msgstr "" + #: rhodecode/templates/followers/followers.html:13 msgid "followers" msgstr "" @@ -2349,6 +2837,26 @@ msgid "Started following" msgstr "" +#: rhodecode/templates/forks/fork.html:31 +msgid "Fork name" +msgstr "" + +#: rhodecode/templates/forks/fork.html:57 +msgid "Private" +msgstr "" + +#: rhodecode/templates/forks/fork.html:65 +msgid "Copy permissions" +msgstr "" + +#: rhodecode/templates/forks/fork.html:73 +msgid "Update after clone" +msgstr "" + +#: rhodecode/templates/forks/fork.html:80 +msgid "fork this repository" +msgstr "" + #: rhodecode/templates/forks/forks.html:13 msgid "forks" msgstr "" @@ -2361,23 +2869,27 @@ msgid "There are no forks yet" msgstr "" -#: rhodecode/templates/journal/journal.html:34 -msgid "Following" -msgstr "" - -#: rhodecode/templates/journal/journal.html:41 +#: rhodecode/templates/journal/journal.html:20 +msgid "Refresh" +msgstr "" + +#: rhodecode/templates/journal/journal.html:32 +msgid "Watched" +msgstr "" + +#: rhodecode/templates/journal/journal.html:105 msgid "following user" msgstr "" -#: rhodecode/templates/journal/journal.html:41 +#: rhodecode/templates/journal/journal.html:105 msgid "user" msgstr "" -#: rhodecode/templates/journal/journal.html:65 +#: rhodecode/templates/journal/journal.html:138 msgid "You are not following any users or repositories" msgstr "" -#: rhodecode/templates/journal/journal_data.html:46 +#: rhodecode/templates/journal/journal_data.html:47 msgid "No entries yet" msgstr "" @@ -2411,25 +2923,13 @@ msgid "File names" msgstr "" -#: rhodecode/templates/search/search_content.html:20 +#: rhodecode/templates/search/search_content.html:21 #: rhodecode/templates/search/search_path.html:15 msgid "Permission denied" msgstr "" -#: rhodecode/templates/settings/repo_fork.html:5 -msgid "Fork" -msgstr "" - -#: rhodecode/templates/settings/repo_fork.html:31 -msgid "Fork name" -msgstr "" - -#: rhodecode/templates/settings/repo_fork.html:55 -msgid "fork this repository" -msgstr "" - #: rhodecode/templates/shortlog/shortlog.html:5 -#: rhodecode/templates/summary/summary.html:666 +#: rhodecode/templates/summary/summary.html:209 msgid "Shortlog" msgstr "" @@ -2437,104 +2937,251 @@ msgid "shortlog" msgstr "" -#: rhodecode/templates/shortlog/shortlog_data.html:6 +#: rhodecode/templates/shortlog/shortlog_data.html:7 msgid "age" msgstr "" +#: rhodecode/templates/shortlog/shortlog_data.html:18 +msgid "No commit message" +msgstr "" + +#: rhodecode/templates/shortlog/shortlog_data.html:62 +msgid "Add or upload files directly via RhodeCode" +msgstr "" + +#: rhodecode/templates/shortlog/shortlog_data.html:71 +msgid "Push new repo" +msgstr "" + +#: rhodecode/templates/shortlog/shortlog_data.html:79 +msgid "Existing repository?" +msgstr "" + #: rhodecode/templates/summary/summary.html:12 msgid "summary" msgstr "" -#: rhodecode/templates/summary/summary.html:79 +#: rhodecode/templates/summary/summary.html:44 +#: rhodecode/templates/summary/summary.html:47 +msgid "ATOM" +msgstr "" + +#: rhodecode/templates/summary/summary.html:77 +#, python-format +msgid "Non changable ID %s" +msgstr "" + +#: rhodecode/templates/summary/summary.html:82 +msgid "public" +msgstr "" + +#: rhodecode/templates/summary/summary.html:90 msgid "remote clone" msgstr "" #: rhodecode/templates/summary/summary.html:121 -msgid "by" -msgstr "" - -#: rhodecode/templates/summary/summary.html:128 msgid "Clone url" msgstr "" -#: rhodecode/templates/summary/summary.html:137 -msgid "Trending source files" -msgstr "" - -#: rhodecode/templates/summary/summary.html:146 +#: rhodecode/templates/summary/summary.html:124 +msgid "Show by Name" +msgstr "" + +#: rhodecode/templates/summary/summary.html:125 +msgid "Show by ID" +msgstr "" + +#: rhodecode/templates/summary/summary.html:133 +msgid "Trending files" +msgstr "" + +#: rhodecode/templates/summary/summary.html:141 +#: rhodecode/templates/summary/summary.html:157 +#: rhodecode/templates/summary/summary.html:185 +msgid "enable" +msgstr "" + +#: rhodecode/templates/summary/summary.html:149 msgid "Download" msgstr "" -#: rhodecode/templates/summary/summary.html:150 +#: rhodecode/templates/summary/summary.html:153 msgid "There are no downloads yet" msgstr "" -#: rhodecode/templates/summary/summary.html:152 +#: rhodecode/templates/summary/summary.html:155 msgid "Downloads are disabled for this repository" msgstr "" -#: rhodecode/templates/summary/summary.html:154 -#: rhodecode/templates/summary/summary.html:320 -msgid "enable" -msgstr "" - -#: rhodecode/templates/summary/summary.html:162 -#: rhodecode/templates/summary/summary.html:297 +#: rhodecode/templates/summary/summary.html:164 +msgid "Check this to download archive with subrepos" +msgstr "" + +#: rhodecode/templates/summary/summary.html:164 +msgid "with subrepos" +msgstr "" + +#: rhodecode/templates/summary/summary.html:177 +msgid "Commit activity by day / author" +msgstr "" + +#: rhodecode/templates/summary/summary.html:188 +msgid "Stats gathered: " +msgstr "" + +#: rhodecode/templates/summary/summary.html:211 +msgid "Quick start" +msgstr "" + +#: rhodecode/templates/summary/summary.html:281 #, python-format msgid "Download %s as %s" msgstr "" -#: rhodecode/templates/summary/summary.html:168 -msgid "Check this to download archive with subrepos" -msgstr "" - -#: rhodecode/templates/summary/summary.html:168 -msgid "with subrepos" -msgstr "" - -#: rhodecode/templates/summary/summary.html:176 -msgid "Feeds" -msgstr "" - -#: rhodecode/templates/summary/summary.html:257 -#: rhodecode/templates/summary/summary.html:684 -#: rhodecode/templates/summary/summary.html:695 -msgid "show more" -msgstr "" - -#: rhodecode/templates/summary/summary.html:312 -msgid "Commit activity by day / author" -msgstr "" - -#: rhodecode/templates/summary/summary.html:324 -msgid "Loaded in" -msgstr "" - -#: rhodecode/templates/summary/summary.html:603 +#: rhodecode/templates/summary/summary.html:638 msgid "commits" msgstr "" -#: rhodecode/templates/summary/summary.html:604 +#: rhodecode/templates/summary/summary.html:639 msgid "files added" msgstr "" -#: rhodecode/templates/summary/summary.html:605 +#: rhodecode/templates/summary/summary.html:640 msgid "files changed" msgstr "" -#: rhodecode/templates/summary/summary.html:606 +#: rhodecode/templates/summary/summary.html:641 msgid "files removed" msgstr "" -#: rhodecode/templates/summary/summary.html:610 +#: rhodecode/templates/summary/summary.html:644 +msgid "commit" +msgstr "" + +#: rhodecode/templates/summary/summary.html:645 msgid "file added" msgstr "" -#: rhodecode/templates/summary/summary.html:611 +#: rhodecode/templates/summary/summary.html:646 msgid "file changed" msgstr "" -#: rhodecode/templates/summary/summary.html:612 +#: rhodecode/templates/summary/summary.html:647 msgid "file removed" msgstr "" +#~ msgid "Changeset is to big and was cut off, see raw changeset instead" +#~ msgstr "" + +#~ msgid "Diff is to big and was cut off, see raw diff instead" +#~ msgstr "" + +#~ msgid "There are no files yet" +#~ msgstr "" + +#~ msgid "Binary file" +#~ msgstr "" + +#~ msgid "year" +#~ msgstr "" + +#~ msgid "month" +#~ msgstr "" + +#~ msgid "day" +#~ msgstr "" + +#~ msgid "hour" +#~ msgstr "" + +#~ msgid "minute" +#~ msgstr "" + +#~ msgid "second" +#~ msgstr "" + +#~ msgid "ago" +#~ msgstr "" + +#~ msgid "" +#~ "Group name may only contain alphanumeric" +#~ " characters underscores, periods or dashes" +#~ " and must begin with alphanumeric " +#~ "character" +#~ msgstr "" + +#~ msgid "This repository already exists in group \"%s\"" +#~ msgstr "" + +#~ msgid "[RhodeCode] New User registration" +#~ msgstr "" + +#~ msgid "" +#~ "This user still owns %s repositories " +#~ "and cannot be removed. Switch owners " +#~ "or remove those repositories" +#~ msgstr "" + +#~ msgid "ADD NEW REPOSITORY" +#~ msgstr "" + +#~ msgid "Percentage of stats gathered" +#~ msgstr "" + +#~ msgid "Number of repositories" +#~ msgstr "" + +#~ msgid "Confirm to delete this group" +#~ msgstr "" + +#~ msgid "My repositories" +#~ msgstr "" + +#~ msgid "Confirm to delete this user" +#~ msgstr "" + +#~ msgid "Login" +#~ msgstr "" + +#~ msgid "links" +#~ msgstr "" + +#~ msgid "changeset" +#~ msgstr "" + +#~ msgid "showing " +#~ msgstr "" + +#~ msgid "out of" +#~ msgstr "" + +#~ msgid "%s files affected with %s additions and %s deletions." +#~ msgstr "" + +#~ msgid "No changes in this file" +#~ msgstr "" + +#~ msgid "Diff is to big to display" +#~ msgstr "" + +#~ msgid "File annotate" +#~ msgstr "" + +#~ msgid "annotate" +#~ msgstr "" + +#~ msgid "Following" +#~ msgstr "" + +#~ msgid "by" +#~ msgstr "" + +#~ msgid "Trending source files" +#~ msgstr "" + +#~ msgid "Feeds" +#~ msgstr "" + +#~ msgid "Loaded in" +#~ msgstr "" + diff -r b0fef8a77568 -r aa2f0e4382e9 rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po Wed May 23 00:58:37 2012 +0200 +++ b/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po Thu May 24 23:19:17 2012 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: RhodeCode 1.1.5\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-05-20 11:45+0200\n" +"POT-Creation-Date: 2012-05-24 22:18+0200\n" "PO-Revision-Date: 2012-05-20 11:36+0100\n" "Last-Translator: Vincent Duvert \n" "Language-Team: fr \n" @@ -144,12 +144,12 @@ msgid "Changesets" msgstr "Changesets" -#: rhodecode/controllers/files.py:462 rhodecode/controllers/summary.py:227 +#: rhodecode/controllers/files.py:462 rhodecode/controllers/summary.py:230 #: rhodecode/templates/branches/branches.html:5 msgid "Branches" msgstr "Branches" -#: rhodecode/controllers/files.py:463 rhodecode/controllers/summary.py:228 +#: rhodecode/controllers/files.py:463 rhodecode/controllers/summary.py:231 #: rhodecode/templates/tags/tags.html:5 msgid "Tags" msgstr "Tags" @@ -215,17 +215,17 @@ "Votre mot de passe a été réinitialisé. Votre nouveau mot de passe vous a " "été envoyé par e-mail." -#: rhodecode/controllers/search.py:113 +#: rhodecode/controllers/search.py:114 msgid "Invalid search query. Try quoting it." msgstr "Requête invalide. Essayer de la mettre entre guillemets." -#: rhodecode/controllers/search.py:118 +#: rhodecode/controllers/search.py:119 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:122 +#: rhodecode/controllers/search.py:123 msgid "An error occurred during this search operation" msgstr "Une erreur est survenue durant l’opération de recherche." @@ -266,11 +266,11 @@ msgid "An error occurred during deletion of %s" msgstr "Erreur pendant la suppression de %s" -#: rhodecode/controllers/summary.py:137 +#: rhodecode/controllers/summary.py:138 msgid "No data loaded yet" msgstr "Aucune donnée actuellement disponible." -#: rhodecode/controllers/summary.py:141 +#: rhodecode/controllers/summary.py:142 #: rhodecode/templates/summary/summary.html:139 msgid "Statistics are disabled for this repository" msgstr "La mise à jour des statistiques est désactivée pour ce dépôt." @@ -661,94 +661,100 @@ msgid "No changes detected" msgstr "Aucun changement détecté." -#: rhodecode/lib/helpers.py:412 +#: rhodecode/lib/helpers.py:414 msgid "True" msgstr "Vrai" -#: rhodecode/lib/helpers.py:416 +#: rhodecode/lib/helpers.py:418 msgid "False" msgstr "Faux" -#: rhodecode/lib/helpers.py:475 +#: rhodecode/lib/helpers.py:462 +#, fuzzy +#| msgid "No changesets yet" +msgid "Changeset not found" +msgstr "Dépôt vide" + +#: rhodecode/lib/helpers.py:485 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Afficher les changements combinés %s->%s" -#: rhodecode/lib/helpers.py:481 +#: rhodecode/lib/helpers.py:491 msgid "compare view" msgstr "vue de comparaison" -#: rhodecode/lib/helpers.py:501 +#: rhodecode/lib/helpers.py:511 msgid "and" msgstr "et" -#: rhodecode/lib/helpers.py:502 +#: rhodecode/lib/helpers.py:512 #, python-format msgid "%s more" msgstr "%s de plus" -#: rhodecode/lib/helpers.py:503 rhodecode/templates/changelog/changelog.html:40 +#: rhodecode/lib/helpers.py:513 rhodecode/templates/changelog/changelog.html:40 msgid "revisions" msgstr "révisions" -#: rhodecode/lib/helpers.py:526 +#: rhodecode/lib/helpers.py:536 msgid "fork name " msgstr "Nom du fork" -#: rhodecode/lib/helpers.py:529 +#: rhodecode/lib/helpers.py:539 msgid "[deleted] repository" msgstr "[a supprimé] le dépôt" -#: rhodecode/lib/helpers.py:530 rhodecode/lib/helpers.py:535 +#: rhodecode/lib/helpers.py:540 rhodecode/lib/helpers.py:545 msgid "[created] repository" msgstr "[a créé] le dépôt" -#: rhodecode/lib/helpers.py:531 +#: rhodecode/lib/helpers.py:541 msgid "[created] repository as fork" msgstr "[a créé] le dépôt en tant que fork" -#: rhodecode/lib/helpers.py:532 rhodecode/lib/helpers.py:536 +#: rhodecode/lib/helpers.py:542 rhodecode/lib/helpers.py:546 msgid "[forked] repository" msgstr "[a forké] le dépôt" -#: rhodecode/lib/helpers.py:533 rhodecode/lib/helpers.py:537 +#: rhodecode/lib/helpers.py:543 rhodecode/lib/helpers.py:547 msgid "[updated] repository" msgstr "[a mis à jour] le dépôt" -#: rhodecode/lib/helpers.py:534 +#: rhodecode/lib/helpers.py:544 msgid "[delete] repository" msgstr "[a supprimé] le dépôt" -#: rhodecode/lib/helpers.py:538 +#: rhodecode/lib/helpers.py:548 msgid "[pushed] into" msgstr "[a pushé] dans" -#: rhodecode/lib/helpers.py:539 +#: rhodecode/lib/helpers.py:549 msgid "[committed via RhodeCode] into" msgstr "[a commité via RhodeCode] dans" -#: rhodecode/lib/helpers.py:540 +#: rhodecode/lib/helpers.py:550 msgid "[pulled from remote] into" msgstr "[a pullé depuis un site distant] dans" -#: rhodecode/lib/helpers.py:541 +#: rhodecode/lib/helpers.py:551 msgid "[pulled] from" msgstr "[a pullé] depuis" -#: rhodecode/lib/helpers.py:542 +#: rhodecode/lib/helpers.py:552 msgid "[started following] repository" msgstr "[suit maintenant] le dépôt" -#: rhodecode/lib/helpers.py:543 +#: rhodecode/lib/helpers.py:553 msgid "[stopped following] repository" msgstr "[ne suit plus] le dépôt" -#: rhodecode/lib/helpers.py:721 +#: rhodecode/lib/helpers.py:731 #, python-format msgid " and %s more" msgstr "et %s de plus" -#: rhodecode/lib/helpers.py:725 +#: rhodecode/lib/helpers.py:735 msgid "No Files" msgstr "Aucun fichier" diff -r b0fef8a77568 -r aa2f0e4382e9 rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.mo Binary file rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.mo has changed diff -r b0fef8a77568 -r aa2f0e4382e9 rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po Wed May 23 00:58:37 2012 +0200 +++ b/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po Thu May 24 23:19:17 2012 +0200 @@ -1,14 +1,14 @@ # Portuguese (Brazil) translations for RhodeCode. -# Copyright (C) 2011 Augusto Herrmann +# Copyright (C) 2011-2012 Augusto Herrmann # This file is distributed under the same license as the RhodeCode project. -# Augusto Herrmann , 2011. +# Augusto Herrmann , 2012. # msgid "" msgstr "" "Project-Id-Version: RhodeCode 1.2.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2011-09-14 15:50-0300\n" -"PO-Revision-Date: 2011-09-14 15:53-0300\n" +"POT-Creation-Date: 2012-05-24 09:24-0300\n" +"PO-Revision-Date: 2012-05-22 16:47-0300\n" "Last-Translator: Augusto Herrmann \n" "Language-Team: pt_BR \n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" @@ -17,29 +17,37 @@ "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -#: rhodecode/controllers/changeset.py:108 -#: rhodecode/controllers/changeset.py:149 -#: rhodecode/controllers/changeset.py:216 -#: rhodecode/controllers/changeset.py:229 +#: rhodecode/controllers/changelog.py:96 +msgid "All Branches" +msgstr "Todos os Ramos" + +#: rhodecode/controllers/changeset.py:79 +msgid "show white space" +msgstr "mostrar espaços em branco" + +#: rhodecode/controllers/changeset.py:86 rhodecode/controllers/changeset.py:93 +msgid "ignore white space" +msgstr "ignorar espaços em branco" + +#: rhodecode/controllers/changeset.py:153 +#, python-format +msgid "%s line context" +msgstr "contexto de %s linhas" + +#: rhodecode/controllers/changeset.py:320 +#: rhodecode/controllers/changeset.py:335 rhodecode/lib/diffs.py:62 msgid "binary file" msgstr "arquivo binário" -#: rhodecode/controllers/changeset.py:123 -#: rhodecode/controllers/changeset.py:168 -msgid "Changeset is to big and was cut off, see raw changeset instead" -msgstr "Conjunto de mudanças é grande demais e foi cortado, em vez disso veja o conjunto de mudanças bruto" - -#: rhodecode/controllers/changeset.py:159 -msgid "Diff is to big and was cut off, see raw diff instead" -msgstr "Diff é grande demais e foi cortado, em vez disso veja diff bruto" - #: rhodecode/controllers/error.py:69 msgid "Home page" msgstr "Página inicial" #: rhodecode/controllers/error.py:98 msgid "The request could not be understood by the server due to malformed syntax." -msgstr "A requisição não pôde ser compreendida pelo servidor devido à sintaxe mal formada" +msgstr "" +"A requisição não pôde ser compreendida pelo servidor devido à sintaxe mal" +" formada" #: rhodecode/controllers/error.py:101 msgid "Unauthorized access to resource" @@ -54,8 +62,12 @@ msgstr "O recurso não pôde ser encontrado" #: rhodecode/controllers/error.py:107 -msgid "The server encountered an unexpected condition which prevented it from fulfilling the request." -msgstr "O servidor encontrou uma condição inesperada que o impediu de satisfazer a requisição" +msgid "" +"The server encountered an unexpected condition which prevented it from " +"fulfilling the request." +msgstr "" +"O servidor encontrou uma condição inesperada que o impediu de satisfazer " +"a requisição" #: rhodecode/controllers/feed.py:48 #, python-format @@ -67,160 +79,197 @@ msgid "%s %s feed" msgstr "%s - feed %s" -#: rhodecode/controllers/files.py:72 -msgid "There are no files yet" -msgstr "Ainda não há arquivos" - -#: rhodecode/controllers/files.py:262 +#: rhodecode/controllers/files.py:86 +#: rhodecode/templates/admin/repos/repo_add.html:13 +msgid "add new" +msgstr "adicionar novo" + +#: 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:247 #, python-format msgid "Edited %s via RhodeCode" msgstr "Editado %s via RhodeCode" -#: rhodecode/controllers/files.py:267 -#: rhodecode/templates/files/file_diff.html:40 +#: rhodecode/controllers/files.py:252 msgid "No changes" msgstr "Sem alterações" -#: rhodecode/controllers/files.py:278 +#: rhodecode/controllers/files.py:263 rhodecode/controllers/files.py:316 #, python-format msgid "Successfully committed to %s" msgstr "Commit realizado com sucesso para %s" -#: rhodecode/controllers/files.py:283 +#: rhodecode/controllers/files.py:268 rhodecode/controllers/files.py:322 msgid "Error occurred during commit" msgstr "Ocorreu um erro ao realizar commit" -#: rhodecode/controllers/files.py:308 +#: rhodecode/controllers/files.py:288 +#, python-format +msgid "Added %s via RhodeCode" +msgstr "Adicionado %s via RhodeCode" + +#: rhodecode/controllers/files.py:302 +msgid "No content" +msgstr "Nenhum conteúdo" + +#: rhodecode/controllers/files.py:306 +msgid "No filename" +msgstr "Nenhum nomes de arquivo" + +#: rhodecode/controllers/files.py:347 msgid "downloads disabled" msgstr "downloads desabilitados" -#: rhodecode/controllers/files.py:313 +#: rhodecode/controllers/files.py:358 #, python-format msgid "Unknown revision %s" msgstr "Revisão desconhecida %s" -#: rhodecode/controllers/files.py:315 +#: rhodecode/controllers/files.py:360 msgid "Empty repository" msgstr "Repositório vazio" -#: rhodecode/controllers/files.py:317 +#: rhodecode/controllers/files.py:362 msgid "Unknown archive type" msgstr "Arquivo de tipo desconhecido" -#: rhodecode/controllers/files.py:385 -#: rhodecode/controllers/files.py:398 -msgid "Binary file" -msgstr "Arquivo binário" - -#: rhodecode/controllers/files.py:417 -#: rhodecode/templates/changeset/changeset_range.html:4 -#: rhodecode/templates/changeset/changeset_range.html:12 -#: rhodecode/templates/changeset/changeset_range.html:29 +#: rhodecode/controllers/files.py:461 +#: rhodecode/templates/changeset/changeset_range.html:5 +#: 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:418 -#: rhodecode/controllers/summary.py:175 +#: rhodecode/controllers/files.py:462 rhodecode/controllers/summary.py:230 #: rhodecode/templates/branches/branches.html:5 -#: rhodecode/templates/summary/summary.html:690 msgid "Branches" msgstr "Ramos" -#: rhodecode/controllers/files.py:419 -#: rhodecode/controllers/summary.py:176 -#: rhodecode/templates/summary/summary.html:679 +#: rhodecode/controllers/files.py:463 rhodecode/controllers/summary.py:231 #: rhodecode/templates/tags/tags.html:5 msgid "Tags" msgstr "Etiquetas" -#: rhodecode/controllers/journal.py:50 +#: rhodecode/controllers/forks.py:69 rhodecode/controllers/admin/repos.py:86 +#, 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 "" +"repositório %s não está mapeado ao bd. Talvez ele tenha sido criado ou " +"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:128 rhodecode/controllers/settings.py:69 +#, 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 "" +"repositório %s não está mapeado ao bd. Talvez ele tenha sido criado ou " +"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:163 +#, python-format +msgid "forked %s repository as %s" +msgstr "bifurcado repositório %s como %s" + +#: rhodecode/controllers/forks.py:177 +#, python-format +msgid "An error occurred during repository forking %s" +msgstr "Ocorreu um erro ao bifurcar o repositório %s" + +#: rhodecode/controllers/journal.py:53 #, python-format msgid "%s public journal %s feed" msgstr "diário público de %s - feed %s" -#: rhodecode/controllers/journal.py:178 -#: rhodecode/controllers/journal.py:212 -#: rhodecode/templates/admin/repos/repo_edit.html:171 -#: rhodecode/templates/base/base.html:50 +#: rhodecode/controllers/journal.py:190 rhodecode/controllers/journal.py:224 +#: rhodecode/templates/admin/repos/repo_edit.html:177 +#: rhodecode/templates/base/base.html:307 +#: rhodecode/templates/base/base.html:309 +#: rhodecode/templates/base/base.html:311 msgid "Public journal" msgstr "Diário público" -#: rhodecode/controllers/login.py:111 +#: rhodecode/controllers/login.py:116 msgid "You have successfully registered into rhodecode" msgstr "Você se registrou com sucesso no rhodecode" -#: rhodecode/controllers/login.py:133 +#: rhodecode/controllers/login.py:137 msgid "Your password reset link was sent" msgstr "Seu link de reinicialização de senha foi enviado" -#: rhodecode/controllers/login.py:155 -msgid "Your password reset was successful, new password has been sent to your email" -msgstr "Sua reinicialização de senha foi bem sucedida, sua senha foi enviada ao seu e-mail" - -#: rhodecode/controllers/search.py:109 +#: rhodecode/controllers/login.py:157 +msgid "" +"Your password reset was successful, new password has been sent to your " +"email" +msgstr "" +"Sua reinicialização de senha foi bem sucedida, sua senha foi enviada ao " +"seu e-mail" + +#: rhodecode/controllers/search.py:114 msgid "Invalid search query. Try quoting it." msgstr "Consulta de busca inválida. Tente usar aspas." -#: rhodecode/controllers/search.py:114 +#: rhodecode/controllers/search.py:119 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:118 +#: rhodecode/controllers/search.py:123 msgid "An error occurred during this search operation" msgstr "Ocorreu um erro durante essa operação de busca" -#: rhodecode/controllers/settings.py:61 -#: rhodecode/controllers/settings.py:171 -#, 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 "repositório %s não está mapeado ao bd. Talvez ele tenha sido criado ou 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:109 -#: rhodecode/controllers/admin/repos.py:239 +#: rhodecode/controllers/settings.py:103 +#: rhodecode/controllers/admin/repos.py:211 #, python-format msgid "Repository %s updated successfully" msgstr "Repositório %s atualizado com sucesso" -#: rhodecode/controllers/settings.py:126 -#: rhodecode/controllers/admin/repos.py:257 +#: rhodecode/controllers/settings.py:121 +#: rhodecode/controllers/admin/repos.py:229 #, python-format msgid "error occurred during update of repository %s" msgstr "ocorreu um erro ao atualizar o repositório %s" -#: rhodecode/controllers/settings.py:144 -#: rhodecode/controllers/admin/repos.py:275 +#: rhodecode/controllers/settings.py:139 +#: rhodecode/controllers/admin/repos.py:247 #, 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 "repositório %s não está mapeado ao bd. Talvez ele tenha sido movido ou 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:156 -#: rhodecode/controllers/admin/repos.py:287 +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 "" +"repositório %s não está mapeado ao bd. Talvez ele tenha sido movido ou " +"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:151 +#: rhodecode/controllers/admin/repos.py:259 #, python-format msgid "deleted repository %s" msgstr "excluído o repositório %s" -#: rhodecode/controllers/settings.py:159 -#: rhodecode/controllers/admin/repos.py:297 -#: rhodecode/controllers/admin/repos.py:303 +#: rhodecode/controllers/settings.py:155 +#: rhodecode/controllers/admin/repos.py:269 +#: rhodecode/controllers/admin/repos.py:275 #, python-format msgid "An error occurred during deletion of %s" msgstr "Ocorreu um erro durante a exclusão de %s" -#: rhodecode/controllers/settings.py:193 -#, python-format -msgid "forked %s repository as %s" -msgstr "bifurcado repositório %s como %s" - -#: rhodecode/controllers/settings.py:211 -#, python-format -msgid "An error occurred during repository forking %s" -msgstr "Ocorreu um erro ao bifurcar o repositório %s" - -#: rhodecode/controllers/summary.py:123 +#: rhodecode/controllers/summary.py:138 msgid "No data loaded yet" msgstr "Ainda não há dados carregados" -#: rhodecode/controllers/summary.py:126 +#: rhodecode/controllers/summary.py:142 +#: rhodecode/templates/summary/summary.html:139 msgid "Statistics are disabled for this repository" msgstr "As estatísticas estão desabillitadas para este repositório" @@ -268,31 +317,31 @@ msgid "START_TLS on LDAP connection" msgstr "START_TLS na conexão LDAP" -#: rhodecode/controllers/admin/ldap_settings.py:115 +#: rhodecode/controllers/admin/ldap_settings.py:125 msgid "Ldap settings updated successfully" msgstr "Configurações de LDAP atualizadas com sucesso" -#: rhodecode/controllers/admin/ldap_settings.py:120 +#: rhodecode/controllers/admin/ldap_settings.py:129 msgid "Unable to activate ldap. The \"python-ldap\" library is missing." msgstr "Não foi possível ativar LDAP. A biblioteca \"python-ldap\" está faltando." -#: rhodecode/controllers/admin/ldap_settings.py:134 +#: rhodecode/controllers/admin/ldap_settings.py:146 msgid "error occurred during update of ldap settings" msgstr "ocorreu um erro ao atualizar as configurações de LDAP" -#: rhodecode/controllers/admin/permissions.py:56 +#: rhodecode/controllers/admin/permissions.py:59 msgid "None" msgstr "Nenhum" -#: rhodecode/controllers/admin/permissions.py:57 +#: rhodecode/controllers/admin/permissions.py:60 msgid "Read" msgstr "Ler" -#: rhodecode/controllers/admin/permissions.py:58 +#: rhodecode/controllers/admin/permissions.py:61 msgid "Write" msgstr "Gravar" -#: rhodecode/controllers/admin/permissions.py:59 +#: 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 @@ -305,547 +354,672 @@ #: 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:110 +#: 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:279 -#: rhodecode/templates/base/base.html:366 -#: rhodecode/templates/base/base.html:368 -#: rhodecode/templates/base/base.html:370 +#: rhodecode/templates/base/base.html:197 +#: rhodecode/templates/base/base.html:326 +#: rhodecode/templates/base/base.html:328 +#: rhodecode/templates/base/base.html:330 msgid "Admin" msgstr "Administrador" -#: rhodecode/controllers/admin/permissions.py:62 +#: rhodecode/controllers/admin/permissions.py:65 msgid "disabled" msgstr "desabilitado" -#: rhodecode/controllers/admin/permissions.py:64 +#: rhodecode/controllers/admin/permissions.py:67 msgid "allowed with manual account activation" msgstr "permitido com ativação manual de conta" -#: rhodecode/controllers/admin/permissions.py:66 +#: rhodecode/controllers/admin/permissions.py:69 msgid "allowed with automatic account activation" msgstr "permitido com ativação automática de conta" -#: rhodecode/controllers/admin/permissions.py:68 +#: rhodecode/controllers/admin/permissions.py:71 msgid "Disabled" msgstr "Desabilitado" -#: rhodecode/controllers/admin/permissions.py:69 +#: rhodecode/controllers/admin/permissions.py:72 msgid "Enabled" msgstr "Habilitado" -#: rhodecode/controllers/admin/permissions.py:102 +#: rhodecode/controllers/admin/permissions.py:106 msgid "Default permissions updated successfully" msgstr "Permissões padrões atualizadas com sucesso" -#: rhodecode/controllers/admin/permissions.py:119 +#: rhodecode/controllers/admin/permissions.py:123 msgid "error occurred during update of permissions" msgstr "ocorreu um erro ao atualizar as permissões" -#: rhodecode/controllers/admin/repos.py:96 -#, 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 "repositório %s não está mapeado ao bd. Talvez ele tenha sido criado ou renomeado a partir do sistema de arquivos. Por favor execute a aplicação outra vez para varrer novamente por repositórios" - -#: rhodecode/controllers/admin/repos.py:172 +#: rhodecode/controllers/admin/repos.py:116 +msgid "--REMOVE FORK--" +msgstr "--REMOVER BIFURCAÇÂO--" + +#: rhodecode/controllers/admin/repos.py:144 #, python-format msgid "created repository %s from %s" msgstr "repositório %s criado a partir de %s" -#: rhodecode/controllers/admin/repos.py:176 +#: rhodecode/controllers/admin/repos.py:148 #, python-format msgid "created repository %s" msgstr "repositório %s criado" -#: rhodecode/controllers/admin/repos.py:205 +#: rhodecode/controllers/admin/repos.py:177 #, 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:292 +#: rhodecode/controllers/admin/repos.py:264 #, 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:320 +#: rhodecode/controllers/admin/repos.py:293 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:335 +#: rhodecode/controllers/admin/repos.py:312 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:352 +#: rhodecode/controllers/admin/repos.py:329 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:367 +#: rhodecode/controllers/admin/repos.py:345 msgid "An error occurred during cache invalidation" msgstr "Ocorreu um erro ao invalidar o cache" -#: rhodecode/controllers/admin/repos.py:387 +#: rhodecode/controllers/admin/repos.py:365 msgid "Updated repository visibility in public journal" msgstr "Atualizada a visibilidade do repositório no diário público" -#: rhodecode/controllers/admin/repos.py:390 +#: rhodecode/controllers/admin/repos.py:369 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:395 -#: rhodecode/model/forms.py:53 +#: rhodecode/controllers/admin/repos.py:374 rhodecode/model/forms.py:54 msgid "Token mismatch" msgstr "Descompasso de Token" -#: rhodecode/controllers/admin/repos.py:408 +#: rhodecode/controllers/admin/repos.py:387 msgid "Pulled from remote location" msgstr "Realizado pull de localização remota" -#: rhodecode/controllers/admin/repos.py:410 +#: rhodecode/controllers/admin/repos.py:389 msgid "An error occurred during pull from remote location" msgstr "Ocorreu um erro ao realizar pull de localização remota" -#: rhodecode/controllers/admin/repos_groups.py:83 +#: rhodecode/controllers/admin/repos.py:405 +msgid "Nothing" +msgstr "Nada" + +#: rhodecode/controllers/admin/repos.py:407 +#, 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:411 +msgid "An error occurred during this operation" +msgstr "Ocorreu um erro durante essa operação" + +#: rhodecode/controllers/admin/repos_groups.py:119 #, python-format msgid "created repos group %s" msgstr "criado grupo de repositórios %s" -#: rhodecode/controllers/admin/repos_groups.py:96 +#: rhodecode/controllers/admin/repos_groups.py:132 #, 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:130 +#: rhodecode/controllers/admin/repos_groups.py:166 #, python-format msgid "updated repos group %s" msgstr "atualizado grupo de repositórios %s" -#: rhodecode/controllers/admin/repos_groups.py:143 +#: rhodecode/controllers/admin/repos_groups.py:179 #, 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:164 +#: 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:171 +#: rhodecode/controllers/admin/repos_groups.py:205 #, python-format msgid "removed repos group %s" msgstr "removido grupo de repositórios %s" -#: rhodecode/controllers/admin/repos_groups.py:175 +#: rhodecode/controllers/admin/repos_groups.py:210 +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:215 +#: rhodecode/controllers/admin/repos_groups.py:220 #, 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/settings.py:109 +#: rhodecode/controllers/admin/repos_groups.py:240 +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:260 +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:120 #, 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:118 +#: rhodecode/controllers/admin/settings.py:129 msgid "Whoosh reindex task scheduled" msgstr "Tarefa de reindexação do whoosh agendada" -#: rhodecode/controllers/admin/settings.py:143 +#: rhodecode/controllers/admin/settings.py:154 msgid "Updated application settings" msgstr "Configurações da aplicação atualizadas" -#: rhodecode/controllers/admin/settings.py:148 -#: rhodecode/controllers/admin/settings.py:215 +#: rhodecode/controllers/admin/settings.py:159 +#: rhodecode/controllers/admin/settings.py:226 msgid "error occurred during updating application settings" msgstr "ocorreu um erro ao atualizar as configurações da aplicação" -#: rhodecode/controllers/admin/settings.py:210 +#: rhodecode/controllers/admin/settings.py:221 msgid "Updated mercurial settings" msgstr "Atualizadas as configurações do mercurial" -#: rhodecode/controllers/admin/settings.py:236 +#: rhodecode/controllers/admin/settings.py:246 msgid "Added new hook" msgstr "Adicionado novo gancho" -#: rhodecode/controllers/admin/settings.py:247 +#: rhodecode/controllers/admin/settings.py:258 msgid "Updated hooks" msgstr "Atualizados os ganchos" -#: rhodecode/controllers/admin/settings.py:251 +#: rhodecode/controllers/admin/settings.py:262 msgid "error occurred during hook creation" msgstr "ocorreu um erro ao criar gancho" -#: rhodecode/controllers/admin/settings.py:310 +#: rhodecode/controllers/admin/settings.py:281 +msgid "Email task created" +msgstr "Tarefa de e-mail criada" + +#: rhodecode/controllers/admin/settings.py:336 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:339 +#: rhodecode/controllers/admin/settings.py:365 msgid "Your account was updated successfully" msgstr "Sua conta foi atualizada com sucesso" -#: rhodecode/controllers/admin/settings.py:359 -#: rhodecode/controllers/admin/users.py:130 +#: rhodecode/controllers/admin/settings.py:384 +#: rhodecode/controllers/admin/users.py:132 #, python-format msgid "error occurred during update of user %s" msgstr "ocorreu um erro ao atualizar o usuário %s" -#: rhodecode/controllers/admin/users.py:78 +#: rhodecode/controllers/admin/users.py:79 #, python-format msgid "created user %s" msgstr "usuário %s criado" -#: rhodecode/controllers/admin/users.py:90 +#: rhodecode/controllers/admin/users.py:92 #, python-format msgid "error occurred during creation of user %s" msgstr "ocorreu um erro ao criar o usuário %s" -#: rhodecode/controllers/admin/users.py:116 +#: rhodecode/controllers/admin/users.py:118 msgid "User updated successfully" msgstr "Usuário atualizado com sucesso" -#: rhodecode/controllers/admin/users.py:146 +#: rhodecode/controllers/admin/users.py:149 msgid "successfully deleted user" msgstr "usuário excluído com sucesso" -#: rhodecode/controllers/admin/users.py:150 +#: rhodecode/controllers/admin/users.py:154 msgid "An error occurred during deletion of user" msgstr "Ocorreu um erro ao excluir o usuário" -#: rhodecode/controllers/admin/users.py:166 +#: rhodecode/controllers/admin/users.py:169 msgid "You can't edit this user" msgstr "Você não pode editar esse usuário" -#: rhodecode/controllers/admin/users.py:195 -#: rhodecode/controllers/admin/users_groups.py:202 +#: rhodecode/controllers/admin/users.py:199 +#: rhodecode/controllers/admin/users_groups.py:215 msgid "Granted 'repository create' permission to user" msgstr "Concedida permissão de 'criar repositório' ao usuário" -#: rhodecode/controllers/admin/users.py:204 -#: rhodecode/controllers/admin/users_groups.py:211 +#: rhodecode/controllers/admin/users.py:208 +#: rhodecode/controllers/admin/users_groups.py:225 msgid "Revoked 'repository create' permission to user" msgstr "Revogada permissão de 'criar repositório' ao usuário" -#: rhodecode/controllers/admin/users_groups.py:74 +#: rhodecode/controllers/admin/users_groups.py:79 #, python-format msgid "created users group %s" msgstr "criado grupo de usuários %s" -#: rhodecode/controllers/admin/users_groups.py:86 +#: rhodecode/controllers/admin/users_groups.py:92 #, 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:119 +#: rhodecode/controllers/admin/users_groups.py:128 #, python-format msgid "updated users group %s" msgstr "grupo de usuários %s atualizado" -#: rhodecode/controllers/admin/users_groups.py:138 +#: rhodecode/controllers/admin/users_groups.py:148 #, 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:154 +#: rhodecode/controllers/admin/users_groups.py:165 msgid "successfully deleted users group" msgstr "grupo de usuários excluído com sucesso" -#: rhodecode/controllers/admin/users_groups.py:158 +#: rhodecode/controllers/admin/users_groups.py:170 msgid "An error occurred during deletion of users group" msgstr "Ocorreu um erro ao excluir o grupo de usuários" -#: rhodecode/lib/__init__.py:279 -msgid "year" -msgstr "ano" - -#: rhodecode/lib/__init__.py:280 -msgid "month" -msgstr "mês" - -#: rhodecode/lib/__init__.py:281 -msgid "day" -msgstr "dia" - -#: rhodecode/lib/__init__.py:282 -msgid "hour" -msgstr "hora" - -#: rhodecode/lib/__init__.py:283 -msgid "minute" -msgstr "minuto" - -#: rhodecode/lib/__init__.py:284 -msgid "second" -msgstr "segundo" - -#: rhodecode/lib/__init__.py:293 -msgid "ago" -msgstr "atrás" - -#: rhodecode/lib/__init__.py:296 -msgid "just now" -msgstr "agora há pouco" - -#: rhodecode/lib/auth.py:377 +#: rhodecode/lib/auth.py:497 msgid "You need to be a registered user to perform this action" msgstr "Você precisa ser um usuário registrado para realizar essa ação" -#: rhodecode/lib/auth.py:421 +#: rhodecode/lib/auth.py:538 msgid "You need to be a signed in to view this page" msgstr "Você precisa estar logado para ver essa página" -#: rhodecode/lib/helpers.py:307 +#: rhodecode/lib/diffs.py:78 +msgid "Changeset was to 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:88 +msgid "No changes detected" +msgstr "Nenhuma alteração detectada" + +#: rhodecode/lib/helpers.py:414 msgid "True" msgstr "Verdadeiro" -#: rhodecode/lib/helpers.py:311 +#: rhodecode/lib/helpers.py:418 msgid "False" msgstr "Falso" -#: rhodecode/lib/helpers.py:352 +#: rhodecode/lib/helpers.py:462 +msgid "Changeset not found" +msgstr "Conjunto de alterações não encontrado" + +#: rhodecode/lib/helpers.py:485 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Ver todos os conjuntos de mudanças combinados %s->%s" -#: rhodecode/lib/helpers.py:356 +#: rhodecode/lib/helpers.py:491 msgid "compare view" msgstr "comparar exibir" -#: rhodecode/lib/helpers.py:365 +#: rhodecode/lib/helpers.py:511 msgid "and" msgstr "e" -#: rhodecode/lib/helpers.py:365 +#: rhodecode/lib/helpers.py:512 #, python-format msgid "%s more" msgstr "%s mais" -#: rhodecode/lib/helpers.py:367 -#: rhodecode/templates/changelog/changelog.html:14 -#: rhodecode/templates/changelog/changelog.html:39 +#: rhodecode/lib/helpers.py:513 rhodecode/templates/changelog/changelog.html:40 msgid "revisions" msgstr "revisões" -#: rhodecode/lib/helpers.py:385 +#: rhodecode/lib/helpers.py:536 msgid "fork name " msgstr "nome da bifurcação" -#: rhodecode/lib/helpers.py:388 +#: rhodecode/lib/helpers.py:539 msgid "[deleted] repository" msgstr "repositório [excluído]" -#: rhodecode/lib/helpers.py:389 -#: rhodecode/lib/helpers.py:393 +#: rhodecode/lib/helpers.py:540 rhodecode/lib/helpers.py:545 msgid "[created] repository" msgstr "repositório [criado]" -#: rhodecode/lib/helpers.py:390 -#: rhodecode/lib/helpers.py:394 +#: rhodecode/lib/helpers.py:541 +msgid "[created] repository as fork" +msgstr "repositório [criado] como uma bifurcação" + +#: rhodecode/lib/helpers.py:542 rhodecode/lib/helpers.py:546 msgid "[forked] repository" msgstr "repositório [bifurcado]" -#: rhodecode/lib/helpers.py:391 -#: rhodecode/lib/helpers.py:395 +#: rhodecode/lib/helpers.py:543 rhodecode/lib/helpers.py:547 msgid "[updated] repository" msgstr "repositório [atualizado]" -#: rhodecode/lib/helpers.py:392 +#: rhodecode/lib/helpers.py:544 msgid "[delete] repository" msgstr "[excluir] repositório" -#: rhodecode/lib/helpers.py:396 +#: rhodecode/lib/helpers.py:548 msgid "[pushed] into" msgstr "[realizado push] para" -#: rhodecode/lib/helpers.py:397 +#: rhodecode/lib/helpers.py:549 msgid "[committed via RhodeCode] into" msgstr "[realizado commit via RhodeCode] para" -#: rhodecode/lib/helpers.py:398 +#: rhodecode/lib/helpers.py:550 msgid "[pulled from remote] into" msgstr "[realizado pull remoto] para" -#: rhodecode/lib/helpers.py:399 +#: rhodecode/lib/helpers.py:551 msgid "[pulled] from" msgstr "[realizado pull] a partir de" -#: rhodecode/lib/helpers.py:400 +#: rhodecode/lib/helpers.py:552 msgid "[started following] repository" msgstr "[passou a seguir] o repositório" -#: rhodecode/lib/helpers.py:401 +#: rhodecode/lib/helpers.py:553 msgid "[stopped following] repository" msgstr "[parou de seguir] o repositório" -#: rhodecode/lib/helpers.py:577 +#: rhodecode/lib/helpers.py:731 #, python-format msgid " and %s more" msgstr " e mais %s" -#: rhodecode/lib/helpers.py:581 +#: rhodecode/lib/helpers.py:735 msgid "No Files" msgstr "Nenhum Arquivo" -#: rhodecode/model/forms.py:66 +#: rhodecode/lib/utils2.py:335 +#, python-format +msgid "%d year" +msgid_plural "%d years" +msgstr[0] "%d ano" +msgstr[1] "%d anos" + +#: rhodecode/lib/utils2.py:336 +#, python-format +msgid "%d month" +msgid_plural "%d months" +msgstr[0] "%d mês" +msgstr[1] "%d meses" + +#: rhodecode/lib/utils2.py:337 +#, python-format +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d dia" +msgstr[1] "%d dias" + +#: rhodecode/lib/utils2.py:338 +#, python-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d hora" +msgstr[1] "%d horas" + +#: rhodecode/lib/utils2.py:339 +#, python-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d minuto" +msgstr[1] "%d minutos" + +#: rhodecode/lib/utils2.py:340 +#, python-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d segundo" +msgstr[1] "%d segundos" + +#: rhodecode/lib/utils2.py:355 +#, python-format +msgid "%s ago" +msgstr "%s atrás" + +#: rhodecode/lib/utils2.py:357 +#, python-format +msgid "%s and %s ago" +msgstr "%s e %s atrás" + +#: rhodecode/lib/utils2.py:360 +msgid "just now" +msgstr "agora há pouco" + +#: rhodecode/lib/celerylib/tasks.py:269 +msgid "password reset link" +msgstr "link de reinicialização de senha" + +#: rhodecode/model/comment.py:85 +#, python-format +msgid "on line %s" +msgstr "na linha %s" + +#: rhodecode/model/comment.py:113 +msgid "[Mention]" +msgstr "[Menção]" + +#: rhodecode/model/forms.py:72 msgid "Invalid username" msgstr "Nome de usuário inválido" -#: rhodecode/model/forms.py:75 +#: rhodecode/model/forms.py:80 msgid "This username already exists" msgstr "Esse nome de usuário já existe" -#: rhodecode/model/forms.py:79 -msgid "Username may only contain alphanumeric characters underscores, periods or dashes and must begin with alphanumeric character" -msgstr "Nome de usuário pode conter somente caracteres alfanuméricos, sublinha, pontos e hífens e deve iniciar com caractere alfanumérico" - -#: rhodecode/model/forms.py:94 +#: rhodecode/model/forms.py:85 +msgid "" +"Username may only contain alphanumeric characters underscores, periods or" +" dashes and must begin with alphanumeric character" +msgstr "" +"Nome de usuário pode conter somente caracteres alfanuméricos, sublinha, " +"pontos e hífens e deve iniciar com caractere alfanumérico" + +#: rhodecode/model/forms.py:101 msgid "Invalid group name" msgstr "Nome de grupo inválido" -#: rhodecode/model/forms.py:104 +#: rhodecode/model/forms.py:111 msgid "This users group already exists" msgstr "Esse grupo de usuários já existe" -#: rhodecode/model/forms.py:110 -msgid "Group name may only contain alphanumeric characters underscores, periods or dashes and must begin with alphanumeric character" -msgstr "Nome de grupo pode conter somente caracteres alfanuméricos, sublinha, pontos e hífens e deve iniciar com caractere alfanumérico" - -#: rhodecode/model/forms.py:132 +#: rhodecode/model/forms.py:117 +msgid "" +"RepoGroup name may only contain alphanumeric characters underscores, " +"periods or dashes and must begin with alphanumeric character" +msgstr "" +"Nome de grupo de repositório pode conter somente caracteres " +"alfanuméricos, sublinha, pontos e hífens e deve iniciar com caractere " +"alfanumérico" + +#: rhodecode/model/forms.py:145 msgid "Cannot assign this group as parent" msgstr "Não é possível associar esse grupo como progenitor" -#: rhodecode/model/forms.py:148 -msgid "This group already exists" -msgstr "Esse grupo já existe" - #: rhodecode/model/forms.py:164 -#: rhodecode/model/forms.py:172 -#: rhodecode/model/forms.py:180 +msgid "This group already exists" +msgstr "Esse grupo já existe" + +#: rhodecode/model/forms.py:176 +msgid "Repository with this name already exists" +msgstr "Já existe um repositório com esse nome" + +#: rhodecode/model/forms.py:195 rhodecode/model/forms.py:204 +#: rhodecode/model/forms.py:213 msgid "Invalid characters in password" msgstr "Caracteres inválidos na senha" -#: rhodecode/model/forms.py:191 +#: rhodecode/model/forms.py:226 msgid "Passwords do not match" msgstr "Senhas não conferem" -#: rhodecode/model/forms.py:196 +#: rhodecode/model/forms.py:232 msgid "invalid password" msgstr "senha inválida" -#: rhodecode/model/forms.py:197 +#: rhodecode/model/forms.py:233 msgid "invalid user name" msgstr "nome de usuário inválido" -#: rhodecode/model/forms.py:198 +#: rhodecode/model/forms.py:234 msgid "Your account is disabled" msgstr "Sua conta está desabilitada" -#: rhodecode/model/forms.py:233 +#: rhodecode/model/forms.py:274 msgid "This username is not valid" msgstr "Esse nome de usuário não é válido" -#: rhodecode/model/forms.py:245 +#: rhodecode/model/forms.py:287 msgid "This repository name is disallowed" msgstr "Esse nome de repositório não é permitido" -#: rhodecode/model/forms.py:266 +#: rhodecode/model/forms.py:310 #, python-format -msgid "This repository already exists in group \"%s\"" -msgstr "Esse repositório já existe no grupo \"%s\"" - -#: rhodecode/model/forms.py:274 +msgid "This repository already exists in a group \"%s\"" +msgstr "Esse repositório já existe em um grupo \"%s\"" + +#: rhodecode/model/forms.py:317 +#, python-format +msgid "There is a group with this name already \"%s\"" +msgstr "Já existe um grupo com esse nome \"%s\"" + +#: rhodecode/model/forms.py:324 msgid "This repository already exists" msgstr "Esse repositório já existe" -#: rhodecode/model/forms.py:312 -#: rhodecode/model/forms.py:319 +#: rhodecode/model/forms.py:367 msgid "invalid clone url" msgstr "URL de clonagem inválida" -#: rhodecode/model/forms.py:322 +#: rhodecode/model/forms.py:384 msgid "Invalid clone url, provide a valid clone http\\s url" msgstr "URL de clonagem inválida, forneça uma URL válida de clonagem http\\s" -#: rhodecode/model/forms.py:334 +#: rhodecode/model/forms.py:398 msgid "Fork have to be the same type as original" msgstr "Bifurcação precisa ser do mesmo tipo que o original" -#: rhodecode/model/forms.py:341 +#: rhodecode/model/forms.py:414 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/forms.py:403 +#: rhodecode/model/forms.py:480 msgid "This is not a valid path" msgstr "Esse não é um caminho válido" -#: rhodecode/model/forms.py:416 +#: rhodecode/model/forms.py:494 msgid "This e-mail address is already taken" msgstr "Esse endereço de e-mail já está tomado" -#: rhodecode/model/forms.py:427 +#: rhodecode/model/forms.py:507 msgid "This e-mail address doesn't exist." msgstr "Esse endereço de e-mail não existe." -#: rhodecode/model/forms.py:447 -msgid "The LDAP Login attribute of the CN must be specified - this is the name of the attribute that is equivalent to 'username'" -msgstr "O atributo de login LDAP do CN deve ser especificado - isto é o nome do atributo que é equivalente ao 'nome de usuário'" - -#: rhodecode/model/forms.py:466 +#: rhodecode/model/forms.py:530 +msgid "" +"The LDAP Login attribute of the CN must be specified - this is the name " +"of the attribute that is equivalent to 'username'" +msgstr "" +"O atributo de login LDAP do CN deve ser especificado - isto é o nome do " +"atributo que é equivalente ao 'nome de usuário'" + +#: rhodecode/model/forms.py:549 msgid "Please enter a login" msgstr "Por favor entre um login" -#: rhodecode/model/forms.py:467 +#: rhodecode/model/forms.py:550 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "Entre um valor com %(min)i caracteres ou mais" -#: rhodecode/model/forms.py:475 +#: rhodecode/model/forms.py:558 msgid "Please enter a password" msgstr "Por favor entre com uma senha" -#: rhodecode/model/forms.py:476 +#: rhodecode/model/forms.py:559 #, python-format msgid "Enter %(min)i characters or more" msgstr "Entre com %(min)i caracteres ou mais" -#: rhodecode/model/user.py:145 -msgid "[RhodeCode] New User registration" -msgstr "[RhodeCode] Registro de Novo Usuário" - -#: rhodecode/model/user.py:157 -#: rhodecode/model/user.py:179 +#: rhodecode/model/notification.py:175 +msgid "commented on commit" +msgstr "comentado no commit" + +#: rhodecode/model/notification.py:176 +msgid "sent message" +msgstr "mensagem enviada" + +#: rhodecode/model/notification.py:177 +msgid "mentioned you" +msgstr "mencionou você" + +#: rhodecode/model/notification.py:178 +msgid "registered in RhodeCode" +msgstr "registrado no RhodeCode" + +#: rhodecode/model/user.py:235 +msgid "new user registration" +msgstr "registro de novo usuário" + +#: rhodecode/model/user.py:259 rhodecode/model/user.py:279 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:201 +msgstr "" +"Você não pode Editar esse usuário, pois ele é crucial para toda a " +"aplicação" + +#: rhodecode/model/user.py:300 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:204 +msgstr "" +"Você não pode remover esse usuário, pois ele é crucial para toda a " +"aplicação" + +#: rhodecode/model/user.py:306 #, python-format -msgid "This user still owns %s repositories and cannot be removed. Switch owners or remove those repositories" -msgstr "Esse usuário ainda é dono de %s repositórios e não pode ser removido. Troque os donos ou remova esses repositórios" - -#: rhodecode/templates/index.html:4 +msgid "" +"user \"%s\" still owns %s repositories and cannot be removed. Switch " +"owners or remove those repositories. %s" +msgstr "" +"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/templates/index.html:3 msgid "Dashboard" msgstr "Painel de Controle" -#: rhodecode/templates/index_base.html:22 -#: rhodecode/templates/admin/users/user_edit_my_account.html:102 +#: rhodecode/templates/index_base.html:6 +#: rhodecode/templates/admin/users/user_edit_my_account.html:115 +#: rhodecode/templates/bookmarks/bookmarks.html:10 +#: rhodecode/templates/branches/branches.html:9 +#: rhodecode/templates/journal/journal.html:31 +#: rhodecode/templates/tags/tags.html:10 msgid "quick filter..." msgstr "filtro rápido..." -#: rhodecode/templates/index_base.html:23 -#: rhodecode/templates/base/base.html:300 +#: rhodecode/templates/index_base.html:6 rhodecode/templates/base/base.html:218 msgid "repositories" msgstr "repositórios" +#: rhodecode/templates/index_base.html:13 +#: rhodecode/templates/index_base.html:15 +#: rhodecode/templates/admin/repos/repos.html:22 +msgid "ADD REPOSITORY" +msgstr "ADICIONAR REPOSITÓRIO" + #: rhodecode/templates/index_base.html:29 -#: rhodecode/templates/admin/repos/repos.html:22 -msgid "ADD NEW REPOSITORY" -msgstr "ADICIONAR NOVO REPOSITÓRIO" - -#: rhodecode/templates/index_base.html:41 #: 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 @@ -854,159 +1028,160 @@ msgid "Group name" msgstr "Nome do grupo" -#: rhodecode/templates/index_base.html:42 -#: rhodecode/templates/index_base.html:73 -#: rhodecode/templates/admin/repos/repo_add_base.html:44 -#: rhodecode/templates/admin/repos/repo_edit.html:64 -#: rhodecode/templates/admin/repos/repos.html:31 +#: rhodecode/templates/index_base.html:30 +#: rhodecode/templates/index_base.html:67 +#: rhodecode/templates/index_base.html:132 +#: rhodecode/templates/index_base.html:158 +#: rhodecode/templates/admin/repos/repo_add_base.html:47 +#: rhodecode/templates/admin/repos/repo_edit.html:66 +#: rhodecode/templates/admin/repos/repos.html:37 +#: rhodecode/templates/admin/repos/repos.html:84 #: 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/settings/repo_fork.html:40 -#: rhodecode/templates/settings/repo_settings.html:40 -#: rhodecode/templates/summary/summary.html:92 +#: rhodecode/templates/forks/fork.html:49 +#: rhodecode/templates/settings/repo_settings.html:57 +#: rhodecode/templates/summary/summary.html:100 msgid "Description" msgstr "Descrição" -#: rhodecode/templates/index_base.html:53 +#: rhodecode/templates/index_base.html:40 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46 msgid "Repositories group" msgstr "Grupo de repositórios" -#: rhodecode/templates/index_base.html:72 +#: rhodecode/templates/index_base.html:66 +#: rhodecode/templates/index_base.html:156 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:32 -#: rhodecode/templates/admin/repos/repos.html:30 -#: rhodecode/templates/admin/users/user_edit_my_account.html:117 -#: rhodecode/templates/files/files_browser.html:157 +#: rhodecode/templates/admin/repos/repos.html:36 +#: rhodecode/templates/admin/repos/repos.html:82 +#: rhodecode/templates/admin/users/user_edit_my_account.html:133 +#: rhodecode/templates/admin/users/user_edit_my_account.html:183 +#: rhodecode/templates/admin/users/user_edit_my_account.html:249 +#: rhodecode/templates/admin/users/user_edit_my_account.html:284 +#: rhodecode/templates/bookmarks/bookmarks.html:36 +#: rhodecode/templates/bookmarks/bookmarks_data.html:6 +#: rhodecode/templates/branches/branches.html:36 +#: rhodecode/templates/files/files_browser.html:47 +#: rhodecode/templates/journal/journal.html:50 +#: rhodecode/templates/journal/journal.html:98 +#: rhodecode/templates/journal/journal.html:177 #: rhodecode/templates/settings/repo_settings.html:31 -#: rhodecode/templates/summary/summary.html:31 -#: rhodecode/templates/summary/summary.html:107 +#: rhodecode/templates/summary/summary.html:38 +#: rhodecode/templates/summary/summary.html:114 +#: rhodecode/templates/tags/tags.html:36 +#: rhodecode/templates/tags/tags_data.html:6 msgid "Name" msgstr "Nome" -#: rhodecode/templates/index_base.html:74 -#: rhodecode/templates/admin/repos/repos.html:32 -#: rhodecode/templates/summary/summary.html:114 +#: rhodecode/templates/index_base.html:68 +#: rhodecode/templates/admin/repos/repos.html:38 msgid "Last change" msgstr "Última alteração" -#: rhodecode/templates/index_base.html:75 -#: rhodecode/templates/admin/repos/repos.html:33 +#: rhodecode/templates/index_base.html:69 +#: rhodecode/templates/index_base.html:161 +#: rhodecode/templates/admin/repos/repos.html:39 +#: rhodecode/templates/admin/repos/repos.html:87 +#: rhodecode/templates/admin/users/user_edit_my_account.html:251 +#: rhodecode/templates/journal/journal.html:179 msgid "Tip" msgstr "Ponta" -#: rhodecode/templates/index_base.html:76 -#: rhodecode/templates/admin/repos/repo_edit.html:97 +#: rhodecode/templates/index_base.html:70 +#: rhodecode/templates/index_base.html:163 +#: rhodecode/templates/admin/repos/repo_edit.html:103 +#: rhodecode/templates/admin/repos/repos.html:89 msgid "Owner" msgstr "Dono" -#: rhodecode/templates/index_base.html:77 +#: rhodecode/templates/index_base.html:71 #: rhodecode/templates/journal/public_journal.html:20 -#: rhodecode/templates/summary/summary.html:180 -#: rhodecode/templates/summary/summary.html:183 +#: rhodecode/templates/summary/summary.html:43 +#: rhodecode/templates/summary/summary.html:46 msgid "RSS" msgstr "RSS" -#: rhodecode/templates/index_base.html:78 +#: rhodecode/templates/index_base.html:72 #: rhodecode/templates/journal/public_journal.html:23 -#: rhodecode/templates/summary/summary.html:181 -#: rhodecode/templates/summary/summary.html:184 msgid "Atom" msgstr "Atom" -#: rhodecode/templates/index_base.html:87 -#: rhodecode/templates/index_base.html:89 -#: rhodecode/templates/index_base.html:91 -#: rhodecode/templates/base/base.html:209 -#: rhodecode/templates/base/base.html:211 -#: rhodecode/templates/base/base.html:213 -#: rhodecode/templates/summary/summary.html:4 -msgid "Summary" -msgstr "Sumário" - -#: rhodecode/templates/index_base.html:95 -#: rhodecode/templates/index_base.html:97 -#: rhodecode/templates/index_base.html:99 -#: rhodecode/templates/base/base.html:225 -#: rhodecode/templates/base/base.html:227 -#: rhodecode/templates/base/base.html:229 -#: rhodecode/templates/changelog/changelog.html:6 -#: rhodecode/templates/changelog/changelog.html:14 -msgid "Changelog" -msgstr "Registro de alterações" - -#: rhodecode/templates/index_base.html:103 -#: rhodecode/templates/index_base.html:105 -#: rhodecode/templates/index_base.html:107 -#: rhodecode/templates/base/base.html:268 -#: rhodecode/templates/base/base.html:270 -#: rhodecode/templates/base/base.html:272 -#: rhodecode/templates/files/files.html:4 -msgid "Files" -msgstr "Arquivos" - -#: rhodecode/templates/index_base.html:116 -#: rhodecode/templates/admin/repos/repos.html:42 -#: rhodecode/templates/admin/users/user_edit_my_account.html:127 -#: rhodecode/templates/summary/summary.html:48 -msgid "Mercurial repository" -msgstr "Repositório Mercurial" - -#: rhodecode/templates/index_base.html:118 -#: rhodecode/templates/admin/repos/repos.html:44 -#: rhodecode/templates/admin/users/user_edit_my_account.html:129 -#: rhodecode/templates/summary/summary.html:51 -msgid "Git repository" -msgstr "Repositório Git" - -#: rhodecode/templates/index_base.html:123 -#: rhodecode/templates/admin/repos/repo_edit_perms.html:16 -#: rhodecode/templates/journal/journal.html:53 -#: rhodecode/templates/summary/summary.html:56 -msgid "private repository" -msgstr "repositório privado" - -#: rhodecode/templates/index_base.html:125 -#: rhodecode/templates/journal/journal.html:55 -#: rhodecode/templates/summary/summary.html:58 -msgid "public repository" -msgstr "repositório público" - -#: rhodecode/templates/index_base.html:133 -#: rhodecode/templates/base/base.html:291 -#: rhodecode/templates/settings/repo_fork.html:13 -msgid "fork" -msgstr "bifurcação" - -#: rhodecode/templates/index_base.html:134 -#: rhodecode/templates/admin/repos/repos.html:60 -#: rhodecode/templates/admin/users/user_edit_my_account.html:143 -#: rhodecode/templates/summary/summary.html:69 -#: rhodecode/templates/summary/summary.html:71 -msgid "Fork of" -msgstr "Bifurcação de" - -#: rhodecode/templates/index_base.html:155 -#: rhodecode/templates/admin/repos/repos.html:73 -msgid "No changesets yet" -msgstr "Ainda não há conjuntos de mudanças" - -#: rhodecode/templates/index_base.html:161 -#: rhodecode/templates/index_base.html:163 +#: rhodecode/templates/index_base.html:102 +#: rhodecode/templates/index_base.html:104 #, python-format msgid "Subscribe to %s rss feed" msgstr "Assinar o feed rss de %s" -#: rhodecode/templates/index_base.html:168 -#: rhodecode/templates/index_base.html:170 +#: rhodecode/templates/index_base.html:109 +#: rhodecode/templates/index_base.html:111 #, python-format msgid "Subscribe to %s atom feed" msgstr "Assinar o feed atom de %s" -#: rhodecode/templates/login.html:5 -#: rhodecode/templates/login.html:54 -#: rhodecode/templates/base/base.html:38 +#: rhodecode/templates/index_base.html:130 +msgid "Group Name" +msgstr "Nome do Grupo" + +#: rhodecode/templates/index_base.html:148 +#: rhodecode/templates/index_base.html:188 +#: rhodecode/templates/admin/repos/repos.html:112 +#: rhodecode/templates/admin/users/user_edit_my_account.html:270 +#: rhodecode/templates/bookmarks/bookmarks.html:60 +#: rhodecode/templates/branches/branches.html:60 +#: rhodecode/templates/journal/journal.html:202 +#: rhodecode/templates/tags/tags.html:60 +msgid "Click to sort ascending" +msgstr "Clique para ordenar em ordem crescente" + +#: rhodecode/templates/index_base.html:149 +#: rhodecode/templates/index_base.html:189 +#: rhodecode/templates/admin/repos/repos.html:113 +#: rhodecode/templates/admin/users/user_edit_my_account.html:271 +#: rhodecode/templates/bookmarks/bookmarks.html:61 +#: rhodecode/templates/branches/branches.html:61 +#: rhodecode/templates/journal/journal.html:203 +#: rhodecode/templates/tags/tags.html:61 +msgid "Click to sort descending" +msgstr "Clique para ordenar em ordem descrescente" + +#: rhodecode/templates/index_base.html:159 +#: rhodecode/templates/admin/repos/repos.html:85 +msgid "Last Change" +msgstr "Última Alteração" + +#: rhodecode/templates/index_base.html:190 +#: rhodecode/templates/admin/repos/repos.html:114 +#: rhodecode/templates/admin/users/user_edit_my_account.html:272 +#: rhodecode/templates/bookmarks/bookmarks.html:62 +#: rhodecode/templates/branches/branches.html:62 +#: rhodecode/templates/journal/journal.html:204 +#: rhodecode/templates/tags/tags.html:62 +msgid "No records found." +msgstr "Nenhum registro encontrado." + +#: rhodecode/templates/index_base.html:191 +#: rhodecode/templates/admin/repos/repos.html:115 +#: rhodecode/templates/admin/users/user_edit_my_account.html:273 +#: rhodecode/templates/bookmarks/bookmarks.html:63 +#: rhodecode/templates/branches/branches.html:63 +#: rhodecode/templates/journal/journal.html:205 +#: rhodecode/templates/tags/tags.html:63 +msgid "Data error." +msgstr "Erro de dados." + +#: rhodecode/templates/index_base.html:192 +#: rhodecode/templates/admin/repos/repos.html:116 +#: rhodecode/templates/admin/users/user_edit_my_account.html:274 +#: rhodecode/templates/bookmarks/bookmarks.html:64 +#: rhodecode/templates/branches/branches.html:64 +#: rhodecode/templates/journal/journal.html:206 +#: rhodecode/templates/tags/tags.html:64 +msgid "Loading..." +msgstr "Carregando..." + +#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:54 msgid "Sign In" msgstr "Entrar" @@ -1014,31 +1189,32 @@ msgid "Sign In to" msgstr "Entrar em" -#: 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:47 -#: rhodecode/templates/admin/users/user_edit_my_account.html:45 -#: rhodecode/templates/base/base.html:15 -#: rhodecode/templates/summary/summary.html:106 +#: rhodecode/templates/admin/users/user_edit.html:50 +#: rhodecode/templates/admin/users/user_edit_my_account.html:49 +#: rhodecode/templates/base/base.html:83 +#: rhodecode/templates/summary/summary.html:113 msgid "Username" msgstr "Nome de usuário" -#: 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:24 +#: rhodecode/templates/base/base.html:92 msgid "Password" msgstr "Senha" +#: rhodecode/templates/login.html:50 +msgid "Remember me" +msgstr "Lembre-se de mim" + #: rhodecode/templates/login.html:60 msgid "Forgot your password ?" msgstr "Esqueceu sua senha ?" -#: rhodecode/templates/login.html:63 -#: rhodecode/templates/base/base.html:35 +#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:103 msgid "Don't have an account ?" msgstr "Não possui uma conta ?" @@ -1060,10 +1236,11 @@ #: rhodecode/templates/password_reset.html:31 msgid "Password reset link will be send to matching email address" -msgstr "Link de reinicialização de senha será enviado ao endereço de e-mail correspondente" - -#: rhodecode/templates/register.html:5 -#: rhodecode/templates/register.html:74 +msgstr "" +"Link de reinicialização de senha será enviado ao endereço de e-mail " +"correspondente" + +#: rhodecode/templates/register.html:5 rhodecode/templates/register.html:74 msgid "Sign Up" msgstr "Inscrever-se" @@ -1076,24 +1253,24 @@ msgstr "Repita a senha" #: rhodecode/templates/register.html:47 -#: rhodecode/templates/admin/users/user_add.html:50 -#: rhodecode/templates/admin/users/user_edit.html:74 -#: rhodecode/templates/admin/users/user_edit_my_account.html:63 +#: rhodecode/templates/admin/users/user_add.html:59 +#: rhodecode/templates/admin/users/user_edit.html:86 +#: rhodecode/templates/admin/users/user_edit_my_account.html:76 msgid "First Name" msgstr "Primeiro Nome" #: rhodecode/templates/register.html:56 -#: rhodecode/templates/admin/users/user_add.html:59 -#: rhodecode/templates/admin/users/user_edit.html:83 -#: rhodecode/templates/admin/users/user_edit_my_account.html:72 +#: rhodecode/templates/admin/users/user_add.html:68 +#: rhodecode/templates/admin/users/user_edit.html:95 +#: rhodecode/templates/admin/users/user_edit_my_account.html:85 msgid "Last Name" msgstr "Último Nome" #: rhodecode/templates/register.html:65 -#: rhodecode/templates/admin/users/user_add.html:68 -#: rhodecode/templates/admin/users/user_edit.html:92 -#: rhodecode/templates/admin/users/user_edit_my_account.html:81 -#: rhodecode/templates/summary/summary.html:108 +#: rhodecode/templates/admin/users/user_add.html:77 +#: rhodecode/templates/admin/users/user_edit.html:104 +#: rhodecode/templates/admin/users/user_edit_my_account.html:94 +#: rhodecode/templates/summary/summary.html:115 msgid "Email" msgstr "E-mail" @@ -1105,20 +1282,60 @@ msgid "Your account must wait for activation by administrator" msgstr "Sua conta precisa esperar ativação por um administrador" -#: rhodecode/templates/repo_switcher_list.html:14 +#: rhodecode/templates/repo_switcher_list.html:11 +#: rhodecode/templates/admin/repos/repo_add_base.html:56 +#: rhodecode/templates/admin/repos/repo_edit.html:76 +#: rhodecode/templates/settings/repo_settings.html:67 msgid "Private repository" msgstr "Repositório privado" -#: rhodecode/templates/repo_switcher_list.html:19 +#: rhodecode/templates/repo_switcher_list.html:16 msgid "Public repository" msgstr "Repositório público" +#: rhodecode/templates/switch_to_list.html:3 +#: rhodecode/templates/branches/branches.html:14 +msgid "branches" +msgstr "ramos" + +#: rhodecode/templates/switch_to_list.html:10 +#: rhodecode/templates/branches/branches_data.html:51 +msgid "There are no branches yet" +msgstr "Ainda não há ramos" + +#: rhodecode/templates/switch_to_list.html:15 +#: rhodecode/templates/shortlog/shortlog_data.html:10 +#: rhodecode/templates/tags/tags.html:15 +msgid "tags" +msgstr "etiquetas" + +#: rhodecode/templates/switch_to_list.html:22 +#: rhodecode/templates/tags/tags_data.html:33 +msgid "There are no tags yet" +msgstr "Ainda não há etiquetas" + +#: rhodecode/templates/switch_to_list.html:28 +#: rhodecode/templates/bookmarks/bookmarks.html:15 +msgid "bookmarks" +msgstr "marcadores" + +#: rhodecode/templates/switch_to_list.html:35 +#: rhodecode/templates/bookmarks/bookmarks_data.html:32 +msgid "There are no bookmarks yet" +msgstr "Ainda não há marcadores" + #: rhodecode/templates/admin/admin.html:5 #: rhodecode/templates/admin/admin.html:9 msgid "Admin journal" msgstr "Diário do administrador" #: rhodecode/templates/admin/admin_log.html:6 +#: rhodecode/templates/admin/repos/repos.html:41 +#: rhodecode/templates/admin/repos/repos.html:90 +#: rhodecode/templates/admin/users/user_edit_my_account.html:135 +#: rhodecode/templates/admin/users/user_edit_my_account.html:136 +#: rhodecode/templates/journal/journal.html:52 +#: rhodecode/templates/journal/journal.html:53 msgid "Action" msgstr "Ação" @@ -1127,6 +1344,11 @@ msgstr "Repositório" #: 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:37 +#: rhodecode/templates/tags/tags.html:37 +#: rhodecode/templates/tags/tags_data.html:7 msgid "Date" msgstr "Data" @@ -1211,23 +1433,48 @@ msgstr "Atributo de E-mail" #: rhodecode/templates/admin/ldap/ldap.html:89 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66 #: rhodecode/templates/admin/settings/hooks.html:73 -#: rhodecode/templates/admin/users/user_edit.html:117 -#: rhodecode/templates/admin/users/user_edit.html:142 -#: rhodecode/templates/admin/users/user_edit_my_account.html:89 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:263 +#: rhodecode/templates/admin/users/user_edit.html:129 +#: rhodecode/templates/admin/users/user_edit.html:154 +#: rhodecode/templates/admin/users/user_edit_my_account.html:102 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:115 +#: rhodecode/templates/settings/repo_settings.html:84 msgid "Save" msgstr "Salvar" +#: rhodecode/templates/admin/notifications/notifications.html:5 +#: rhodecode/templates/admin/notifications/notifications.html:9 +msgid "My Notifications" +msgstr "Minhas Notificações" + +#: rhodecode/templates/admin/notifications/notifications.html:29 +msgid "Mark all read" +msgstr "Marcar tudo como lido" + +#: rhodecode/templates/admin/notifications/notifications_data.html:38 +msgid "No notifications here yet" +msgstr "Ainda não há notificações aqui" + +#: rhodecode/templates/admin/notifications/show_notification.html:5 +#: rhodecode/templates/admin/notifications/show_notification.html:11 +msgid "Show notification" +msgstr "Mostrar notificação" + +#: rhodecode/templates/admin/notifications/show_notification.html:9 +msgid "Notifications" +msgstr "Notificações" + #: rhodecode/templates/admin/permissions/permissions.html:5 msgid "Permissions administration" msgstr "Administração de permissões" #: rhodecode/templates/admin/permissions/permissions.html:11 -#: rhodecode/templates/admin/repos/repo_edit.html:109 -#: rhodecode/templates/admin/users/user_edit.html:127 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:248 -#: rhodecode/templates/settings/repo_settings.html:58 +#: rhodecode/templates/admin/repos/repo_edit.html:116 +#: 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:77 msgid "Permissions" msgstr "Permissões" @@ -1244,8 +1491,14 @@ msgstr "Permissão de repositório" #: 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 "Todas as permissões padrão em cada repositório serão reinicializadas para as permissões escolhidas. Note que todas as permissões padrão customizadas nos repositórios serão perdidas" +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 "" +"Todas as permissões padrão em cada repositório serão reinicializadas para" +" as permissões escolhidas. Note que todas as permissões padrão " +"customizadas nos repositórios serão perdidas" #: rhodecode/templates/admin/permissions/permissions.html:50 msgid "overwrite existing settings" @@ -1260,6 +1513,7 @@ msgstr "Criação de repositório" #: rhodecode/templates/admin/permissions/permissions.html:71 +#: rhodecode/templates/admin/repos/repo_edit.html:218 msgid "set" msgstr "ajustar" @@ -1275,35 +1529,60 @@ msgid "Repositories" msgstr "Repositórios" -#: rhodecode/templates/admin/repos/repo_add.html:13 -msgid "add new" -msgstr "adicionar novo" - #: rhodecode/templates/admin/repos/repo_add_base.html:20 -#: rhodecode/templates/summary/summary.html:80 -#: rhodecode/templates/summary/summary.html:82 +#: rhodecode/templates/summary/summary.html:90 +#: rhodecode/templates/summary/summary.html:91 msgid "Clone from" msgstr "Clonar de" -#: rhodecode/templates/admin/repos/repo_add_base.html:28 -#: rhodecode/templates/admin/repos/repo_edit.html:48 +#: rhodecode/templates/admin/repos/repo_add_base.html:24 +#: rhodecode/templates/admin/repos/repo_edit.html:44 +#: rhodecode/templates/settings/repo_settings.html:43 +msgid "Optional http[s] url from which repository should be cloned." +msgstr "URL opcional http[s] da qual o repositório deve ser clonado." + +#: rhodecode/templates/admin/repos/repo_add_base.html:29 +#: rhodecode/templates/admin/repos/repo_edit.html:49 #: rhodecode/templates/admin/repos_groups/repos_groups.html:4 +#: rhodecode/templates/forks/fork.html:41 +#: rhodecode/templates/settings/repo_settings.html:48 msgid "Repository group" msgstr "Grupo de repositórios" -#: rhodecode/templates/admin/repos/repo_add_base.html:36 -#: rhodecode/templates/admin/repos/repo_edit.html:56 +#: rhodecode/templates/admin/repos/repo_add_base.html:33 +#: rhodecode/templates/admin/repos/repo_edit.html:53 +#: rhodecode/templates/settings/repo_settings.html:52 +msgid "Optional select a group to put this repository into." +msgstr "Opcionalmente selecione um grupo no qual colocar esse repositório." + +#: rhodecode/templates/admin/repos/repo_add_base.html:38 +#: rhodecode/templates/admin/repos/repo_edit.html:58 msgid "Type" msgstr "Tipo" -#: rhodecode/templates/admin/repos/repo_add_base.html:52 -#: rhodecode/templates/admin/repos/repo_edit.html:73 -#: rhodecode/templates/settings/repo_fork.html:48 -#: rhodecode/templates/settings/repo_settings.html:49 -msgid "Private" -msgstr "Privado" - -#: rhodecode/templates/admin/repos/repo_add_base.html:59 +#: rhodecode/templates/admin/repos/repo_add_base.html:42 +msgid "Type of repository to create." +msgstr "Tipo de repositório a criar." + +#: rhodecode/templates/admin/repos/repo_add_base.html:51 +#: rhodecode/templates/admin/repos/repo_edit.html:70 +#: rhodecode/templates/settings/repo_settings.html:61 +msgid "Keep it short and to the point. Use a README file for longer descriptions." +msgstr "" +"Seja sucinto e objetivo. Use um arquivo README para descrições mais " +"longas." + +#: rhodecode/templates/admin/repos/repo_add_base.html:60 +#: rhodecode/templates/admin/repos/repo_edit.html:80 +#: rhodecode/templates/settings/repo_settings.html:71 +msgid "" +"Private repositories are only visible to people explicitly added as " +"collaborators." +msgstr "" +"Repositórios privados são visíveis somente por pessoas explicitamente " +"adicionadas como colaboradores." + +#: rhodecode/templates/admin/repos/repo_add_base.html:64 msgid "add" msgstr "adicionar" @@ -1317,138 +1596,198 @@ #: rhodecode/templates/admin/repos/repo_edit.html:13 #: rhodecode/templates/admin/users/user_edit.html:13 -#: rhodecode/templates/admin/users/user_edit_my_account.html:148 +#: rhodecode/templates/admin/users/user_edit_my_account.html:155 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13 -#: rhodecode/templates/files/files_annotate.html:49 -#: rhodecode/templates/files/files_source.html:20 +#: rhodecode/templates/files/files_source.html:32 +#: rhodecode/templates/journal/journal.html:72 msgid "edit" msgstr "editar" #: rhodecode/templates/admin/repos/repo_edit.html:40 +#: rhodecode/templates/settings/repo_settings.html:39 msgid "Clone uri" msgstr "URI de clonagem" -#: rhodecode/templates/admin/repos/repo_edit.html:81 +#: rhodecode/templates/admin/repos/repo_edit.html:85 msgid "Enable statistics" msgstr "Habilitar estatísticas" #: rhodecode/templates/admin/repos/repo_edit.html:89 +msgid "Enable statistics window on summary page." +msgstr "Habilitar janela de estatísticas na página de sumário." + +#: rhodecode/templates/admin/repos/repo_edit.html:94 msgid "Enable downloads" msgstr "Habilitar downloads" -#: rhodecode/templates/admin/repos/repo_edit.html:127 -msgid "Administration" -msgstr "Administração" - -#: rhodecode/templates/admin/repos/repo_edit.html:130 -msgid "Statistics" -msgstr "Estatísticas" - -#: rhodecode/templates/admin/repos/repo_edit.html:134 -msgid "Reset current statistics" -msgstr "Reinicializar estatísticas atuais" +#: rhodecode/templates/admin/repos/repo_edit.html:98 +msgid "Enable download menu on summary page." +msgstr "Habilitar menu de descarregar na página de sumário." + +#: rhodecode/templates/admin/repos/repo_edit.html:108 +msgid "Change owner of this repository." +msgstr "Mudar o dono desse repositório." #: rhodecode/templates/admin/repos/repo_edit.html:134 +msgid "Administration" +msgstr "Administração" + +#: rhodecode/templates/admin/repos/repo_edit.html:137 +msgid "Statistics" +msgstr "Estatísticas" + +#: rhodecode/templates/admin/repos/repo_edit.html:141 +msgid "Reset current statistics" +msgstr "Reinicializar estatísticas atuais" + +#: rhodecode/templates/admin/repos/repo_edit.html:141 msgid "Confirm to remove current statistics" msgstr "Confirma remover atuais estatísticas" -#: rhodecode/templates/admin/repos/repo_edit.html:137 +#: rhodecode/templates/admin/repos/repo_edit.html:144 msgid "Fetched to rev" msgstr "Trazida à rev" -#: rhodecode/templates/admin/repos/repo_edit.html:138 -msgid "Percentage of stats gathered" -msgstr "Porcentagem das estatísticas totalizadas" - -#: rhodecode/templates/admin/repos/repo_edit.html:147 +#: rhodecode/templates/admin/repos/repo_edit.html:145 +msgid "Stats gathered" +msgstr "Estatísticas coletadas" + +#: rhodecode/templates/admin/repos/repo_edit.html:153 msgid "Remote" msgstr "Remoto" -#: rhodecode/templates/admin/repos/repo_edit.html:151 +#: rhodecode/templates/admin/repos/repo_edit.html:157 msgid "Pull changes from remote location" msgstr "Realizar pull de alterações a partir de localização remota" -#: rhodecode/templates/admin/repos/repo_edit.html:151 +#: rhodecode/templates/admin/repos/repo_edit.html:157 msgid "Confirm to pull changes from remote side" msgstr "Confirma realizar pull de alterações a partir de lado remoto" -#: rhodecode/templates/admin/repos/repo_edit.html:162 +#: rhodecode/templates/admin/repos/repo_edit.html:168 msgid "Cache" msgstr "Cache" -#: rhodecode/templates/admin/repos/repo_edit.html:166 +#: rhodecode/templates/admin/repos/repo_edit.html:172 msgid "Invalidate repository cache" msgstr "Invalidar cache do repositório" -#: rhodecode/templates/admin/repos/repo_edit.html:166 +#: rhodecode/templates/admin/repos/repo_edit.html:172 msgid "Confirm to invalidate repository cache" msgstr "Confirma invalidar cache do repositório" -#: rhodecode/templates/admin/repos/repo_edit.html:177 +#: rhodecode/templates/admin/repos/repo_edit.html:183 msgid "Remove from public journal" msgstr "Remover do diário público" -#: rhodecode/templates/admin/repos/repo_edit.html:179 +#: rhodecode/templates/admin/repos/repo_edit.html:185 msgid "Add to public journal" msgstr "Adicionar ao diário público" -#: rhodecode/templates/admin/repos/repo_edit.html:185 +#: rhodecode/templates/admin/repos/repo_edit.html:190 +msgid "" +"All actions made on this repository will be accessible to everyone in " +"public journal" +msgstr "" +"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:197 +#: rhodecode/templates/changeset/changeset_file_comment.html:19 msgid "Delete" msgstr "Excluir" -#: rhodecode/templates/admin/repos/repo_edit.html:189 +#: rhodecode/templates/admin/repos/repo_edit.html:201 msgid "Remove this repository" msgstr "Remover deste repositório" -#: rhodecode/templates/admin/repos/repo_edit.html:189 -#: rhodecode/templates/admin/repos/repos.html:79 +#: rhodecode/templates/admin/repos/repo_edit.html:201 msgid "Confirm to delete this repository" msgstr "Confirma excluir este repositório" +#: rhodecode/templates/admin/repos/repo_edit.html:205 +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 "" +"Este repositório será renomeado de uma maneira especial, de forma a ser " +"inacessível ao RhodeCode e sistemas de controle de versão.\n" +" Se você precisa exclui-lo completamente do " +"sistema de arquivos, por favor faça-o manualmente" + +#: rhodecode/templates/admin/repos/repo_edit.html:213 +msgid "Set as fork" +msgstr "Marcar como bifurcação" + +#: rhodecode/templates/admin/repos/repo_edit.html:222 +msgid "Manually set this repository as a fork of another" +msgstr "Marcar manualmente este repositório como sendo uma bifurcação de outro" + #: rhodecode/templates/admin/repos/repo_edit_perms.html:3 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3 msgid "none" msgstr "nenhum" #: rhodecode/templates/admin/repos/repo_edit_perms.html:4 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:4 msgid "read" msgstr "ler" #: rhodecode/templates/admin/repos/repo_edit_perms.html:5 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:5 msgid "write" msgstr "escrever" #: rhodecode/templates/admin/repos/repo_edit_perms.html:6 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6 #: rhodecode/templates/admin/users/users.html:38 -#: rhodecode/templates/base/base.html:296 +#: rhodecode/templates/base/base.html:214 msgid "admin" msgstr "administrador" #: rhodecode/templates/admin/repos/repo_edit_perms.html:7 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:7 msgid "member" msgstr "membro" +#: rhodecode/templates/admin/repos/repo_edit_perms.html:16 +#: rhodecode/templates/data_table/_dt_elements.html:61 +#: rhodecode/templates/journal/journal.html:123 +#: rhodecode/templates/summary/summary.html:71 +msgid "private repository" +msgstr "repositório privado" + #: rhodecode/templates/admin/repos/repo_edit_perms.html:33 #: rhodecode/templates/admin/repos/repo_edit_perms.html:53 +#: 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 "revogar" #: rhodecode/templates/admin/repos/repo_edit_perms.html:75 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:64 msgid "Add another member" msgstr "Adicionar outro membro" #: rhodecode/templates/admin/repos/repo_edit_perms.html:89 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:78 msgid "Failed to remove user" msgstr "Falha ao reomver usuário" #: rhodecode/templates/admin/repos/repo_edit_perms.html:104 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:93 msgid "Failed to remove users group" msgstr "Falha ao remover grupo de usuários" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:205 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:123 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:112 msgid "Group" msgstr "Grupo" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:206 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:124 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:113 #: rhodecode/templates/admin/users_groups/users_groups.html:33 msgid "members" msgstr "membros" @@ -1457,43 +1796,29 @@ msgid "Repositories administration" msgstr "Administração de repositórios" -#: rhodecode/templates/admin/repos/repos.html:34 -#: rhodecode/templates/summary/summary.html:100 +#: rhodecode/templates/admin/repos/repos.html:40 +#: rhodecode/templates/summary/summary.html:107 msgid "Contact" msgstr "Contato" -#: rhodecode/templates/admin/repos/repos.html:35 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36 -#: rhodecode/templates/admin/users/user_edit_my_account.html:119 -#: rhodecode/templates/admin/users/users.html:40 -#: rhodecode/templates/admin/users_groups/users_groups.html:35 -msgid "action" -msgstr "ação" - -#: rhodecode/templates/admin/repos/repos.html:51 -#: rhodecode/templates/admin/users/user_edit_my_account.html:134 -#: rhodecode/templates/admin/users/user_edit_my_account.html:148 -msgid "private" -msgstr "privado" - -#: rhodecode/templates/admin/repos/repos.html:53 -#: rhodecode/templates/admin/repos/repos.html:59 -#: rhodecode/templates/admin/users/user_edit_my_account.html:136 -#: rhodecode/templates/admin/users/user_edit_my_account.html:142 -#: rhodecode/templates/summary/summary.html:68 -msgid "public" -msgstr "público" - -#: rhodecode/templates/admin/repos/repos.html:79 +#: rhodecode/templates/admin/repos/repos.html:68 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 #: rhodecode/templates/admin/users/users.html:55 +#: rhodecode/templates/admin/users_groups/users_groups.html:44 msgid "delete" msgstr "excluir" +#: rhodecode/templates/admin/repos/repos.html:68 +#: rhodecode/templates/admin/users/user_edit_my_account.html:158 +#, python-format +msgid "Confirm to delete this repository: %s" +msgstr "Confirma excluir esse repositório: %s" + #: rhodecode/templates/admin/repos_groups/repos_groups.html:8 msgid "Groups" msgstr "Grupos" -#: rhodecode/templates/admin/repos_groups/repos_groups.html:13 +#: rhodecode/templates/admin/repos_groups/repos_groups.html:12 msgid "with" msgstr "com" @@ -1516,8 +1841,7 @@ msgstr "Progenitor do grupo" #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:58 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58 -#: rhodecode/templates/admin/users/user_add.html:85 +#: 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 msgid "save" @@ -1531,6 +1855,19 @@ msgid "edit repos group" msgstr "editar grupo de repositórios" +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:67 +#: rhodecode/templates/admin/settings/settings.html:112 +#: rhodecode/templates/admin/settings/settings.html:177 +#: rhodecode/templates/admin/users/user_edit.html:130 +#: rhodecode/templates/admin/users/user_edit.html:155 +#: rhodecode/templates/admin/users/user_edit_my_account.html:103 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:116 +#: rhodecode/templates/files/files_add.html:82 +#: rhodecode/templates/files/files_edit.html:68 +#: rhodecode/templates/settings/repo_settings.html:85 +msgid "Reset" +msgstr "Limpar" + #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5 msgid "Repositories groups administration" msgstr "Administração de grupos de repositórios" @@ -1540,12 +1877,19 @@ msgstr "ADICIONAR NOVO GRUPO" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:35 -msgid "Number of repositories" -msgstr "Número de repositórios" +msgid "Number of toplevel repositories" +msgstr "Número de repositórios de nível superior" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36 +#: rhodecode/templates/admin/users/users.html:40 +#: rhodecode/templates/admin/users_groups/users_groups.html:35 +msgid "action" +msgstr "ação" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 -msgid "Confirm to delete this group" -msgstr "Confirme para excluir este grupo" +#, 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 msgid "There are no repositories groups yet" @@ -1588,8 +1932,14 @@ msgstr "opção de varredura" #: 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 "Caso um repositório tenha sido excluído do sistema de arquivos e haja restos no banco de dados, marque esta opção para varrer dados obsoletos no banco e removê-los." +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 "" +"Caso um repositório tenha sido excluído do sistema de arquivos e haja " +"restos no banco de dados, marque esta opção para varrer dados obsoletos " +"no banco e removê-los." #: rhodecode/templates/admin/settings/settings.html:39 msgid "destroy old data" @@ -1632,20 +1982,10 @@ msgstr "Código GA" #: rhodecode/templates/admin/settings/settings.html:111 -#: rhodecode/templates/admin/settings/settings.html:177 +#: rhodecode/templates/admin/settings/settings.html:176 msgid "Save settings" msgstr "Salvar configurações" -#: rhodecode/templates/admin/settings/settings.html:112 -#: rhodecode/templates/admin/settings/settings.html:178 -#: rhodecode/templates/admin/users/user_edit.html:118 -#: rhodecode/templates/admin/users/user_edit.html:143 -#: rhodecode/templates/admin/users/user_edit_my_account.html:90 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:264 -#: rhodecode/templates/files/files_edit.html:50 -msgid "Reset" -msgstr "Limpar" - #: rhodecode/templates/admin/settings/settings.html:118 msgid "Mercurial settings" msgstr "Configurações do Mercurial" @@ -1662,38 +2002,64 @@ msgid "Hooks" msgstr "Ganchos" -#: rhodecode/templates/admin/settings/settings.html:142 -msgid "advanced setup" -msgstr "confirguações avançadas" - -#: rhodecode/templates/admin/settings/settings.html:147 +#: rhodecode/templates/admin/settings/settings.html:144 msgid "Update repository after push (hg update)" msgstr "Atualizar repositório após realizar push (hg update)" -#: rhodecode/templates/admin/settings/settings.html:151 +#: rhodecode/templates/admin/settings/settings.html:148 msgid "Show repository size after push" msgstr "Mostrar tamanho do repositório após o push" -#: rhodecode/templates/admin/settings/settings.html:155 +#: rhodecode/templates/admin/settings/settings.html:152 msgid "Log user push commands" msgstr "Armazenar registro de comandos de push dos usuários" -#: rhodecode/templates/admin/settings/settings.html:159 +#: rhodecode/templates/admin/settings/settings.html:156 msgid "Log user pull commands" msgstr "Armazenar registro de comandos de pull dos usuários" -#: rhodecode/templates/admin/settings/settings.html:166 +#: rhodecode/templates/admin/settings/settings.html:160 +msgid "advanced setup" +msgstr "confirguações avançadas" + +#: rhodecode/templates/admin/settings/settings.html:165 msgid "Repositories location" msgstr "Localização dos repositórios" +#: rhodecode/templates/admin/settings/settings.html:170 +msgid "" +"This a crucial application setting. If you are really sure you need to " +"change this, you must restart application in order to make this setting " +"take effect. Click this label to unlock." +msgstr "" +"Essa é uma configuração crucial da aplicação. Se você realmente tem " +"certeza de que quer mudar isto, você precisa reiniciar a aplicação para " +"que essa configuração tenha efeito. Clique este rótulo para destravar." + #: rhodecode/templates/admin/settings/settings.html:171 -msgid "This a crucial application setting. If you are really sure you need to change this, you must restart application in order to make this setting take effect. Click this label to unlock." -msgstr "Essa é uma configuração crucial da aplicação. Se você realmente tem certeza de que quer mudar isto, você precisa reiniciar a aplicação para que essa configuração tenha efeito. Clique este rótulo para destravar." - -#: rhodecode/templates/admin/settings/settings.html:172 msgid "unlock" msgstr "destravar" +#: rhodecode/templates/admin/settings/settings.html:191 +msgid "Test Email" +msgstr "Testar E-mail" + +#: rhodecode/templates/admin/settings/settings.html:199 +msgid "Email to" +msgstr "E-mail para" + +#: rhodecode/templates/admin/settings/settings.html:207 +msgid "Send" +msgstr "Enviar" + +#: rhodecode/templates/admin/settings/settings.html:213 +msgid "System Info and Packages" +msgstr "Informações de Sistema e Pacotes" + +#: rhodecode/templates/admin/settings/settings.html:216 +msgid "show" +msgstr "mostrar" + #: rhodecode/templates/admin/users/user_add.html:5 msgid "Add user" msgstr "Adicionar usuário" @@ -1708,8 +2074,12 @@ msgid "add new user" msgstr "adicionar novo usuário" -#: rhodecode/templates/admin/users/user_add.html:77 -#: rhodecode/templates/admin/users/user_edit.html:101 +#: rhodecode/templates/admin/users/user_add.html:50 +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" @@ -1719,36 +2089,42 @@ msgid "Edit user" msgstr "Editar usuário" -#: rhodecode/templates/admin/users/user_edit.html:33 -#: rhodecode/templates/admin/users/user_edit_my_account.html:32 +#: rhodecode/templates/admin/users/user_edit.html:34 +#: rhodecode/templates/admin/users/user_edit_my_account.html:33 msgid "Change your avatar at" msgstr "Altere o seu avatar em" -#: rhodecode/templates/admin/users/user_edit.html:34 -#: rhodecode/templates/admin/users/user_edit_my_account.html:33 +#: rhodecode/templates/admin/users/user_edit.html:35 +#: rhodecode/templates/admin/users/user_edit_my_account.html:34 msgid "Using" msgstr "Usando" -#: rhodecode/templates/admin/users/user_edit.html:40 -#: rhodecode/templates/admin/users/user_edit_my_account.html:39 +#: rhodecode/templates/admin/users/user_edit.html:43 +#: rhodecode/templates/admin/users/user_edit_my_account.html:43 msgid "API key" msgstr "Chave de API" -#: rhodecode/templates/admin/users/user_edit.html:56 +#: rhodecode/templates/admin/users/user_edit.html:59 msgid "LDAP DN" msgstr "DN LDAP" -#: rhodecode/templates/admin/users/user_edit.html:65 -#: rhodecode/templates/admin/users/user_edit_my_account.html:54 +#: rhodecode/templates/admin/users/user_edit.html:68 +#: rhodecode/templates/admin/users/user_edit_my_account.html:58 msgid "New password" msgstr "Nova senha" -#: rhodecode/templates/admin/users/user_edit.html:135 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:256 +#: rhodecode/templates/admin/users/user_edit.html:77 +#: rhodecode/templates/admin/users/user_edit_my_account.html:67 +msgid "New password confirmation" +msgstr "Confirmação de nova senha" + +#: rhodecode/templates/admin/users/user_edit.html:147 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:108 msgid "Create repositories" msgstr "Criar repositórios" #: rhodecode/templates/admin/users/user_edit_my_account.html:5 +#: rhodecode/templates/base/base.html:124 msgid "My account" msgstr "Minha conta" @@ -1756,29 +2132,50 @@ msgid "My Account" msgstr "Minha Conta" -#: rhodecode/templates/admin/users/user_edit_my_account.html:101 -msgid "My repositories" +#: rhodecode/templates/admin/users/user_edit_my_account.html:116 +#: rhodecode/templates/journal/journal.html:32 +msgid "My repos" msgstr "Meus repositórios" -#: rhodecode/templates/admin/users/user_edit_my_account.html:107 -msgid "ADD REPOSITORY" -msgstr "ADICIONAR REPOSITÓRIO" - -#: rhodecode/templates/admin/users/user_edit_my_account.html:118 -#: rhodecode/templates/branches/branches_data.html:7 -#: rhodecode/templates/shortlog/shortlog_data.html:8 -#: rhodecode/templates/tags/tags_data.html:7 -msgid "revision" -msgstr "revisão" - -#: rhodecode/templates/admin/users/user_edit_my_account.html:157 +#: rhodecode/templates/admin/users/user_edit_my_account.html:116 +msgid "My permissions" +msgstr "Minhas permissões" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:121 +#: rhodecode/templates/journal/journal.html:37 +msgid "ADD" +msgstr "ADICIONAR" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:134 +#: rhodecode/templates/bookmarks/bookmarks.html:40 +#: rhodecode/templates/bookmarks/bookmarks_data.html:9 +#: rhodecode/templates/branches/branches.html:40 +#: rhodecode/templates/journal/journal.html:51 +#: rhodecode/templates/tags/tags.html:40 +#: rhodecode/templates/tags/tags_data.html:9 +msgid "Revision" +msgstr "Revisão" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:155 +#: rhodecode/templates/journal/journal.html:72 +msgid "private" +msgstr "privado" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:165 +#: rhodecode/templates/journal/journal.html:85 msgid "No repositories yet" msgstr "Ainda não há repositórios" -#: rhodecode/templates/admin/users/user_edit_my_account.html:159 +#: rhodecode/templates/admin/users/user_edit_my_account.html:167 +#: rhodecode/templates/journal/journal.html:87 msgid "create one now" msgstr "criar um agora" +#: rhodecode/templates/admin/users/user_edit_my_account.html:184 +#: rhodecode/templates/admin/users/user_edit_my_account.html:285 +msgid "Permission" +msgstr "Permissão" + #: rhodecode/templates/admin/users/users.html:5 msgid "Users administration" msgstr "Administração de usuários" @@ -1792,8 +2189,7 @@ msgstr "nome de usuário" #: rhodecode/templates/admin/users/users.html:34 -#: rhodecode/templates/branches/branches_data.html:5 -#: rhodecode/templates/tags/tags_data.html:5 +#: rhodecode/templates/branches/branches_data.html:6 msgid "name" msgstr "nome" @@ -1811,13 +2207,14 @@ msgstr "ativo" #: rhodecode/templates/admin/users/users.html:39 -#: rhodecode/templates/base/base.html:305 +#: rhodecode/templates/base/base.html:223 msgid "ldap" msgstr "ldap" #: rhodecode/templates/admin/users/users.html:56 -msgid "Confirm to delete this user" -msgstr "Conforma excluir este usuário" +#, python-format +msgid "Confirm to delete this user: %s" +msgstr "Confirma excluir este usuário: %s" #: rhodecode/templates/admin/users_groups/users_group_add.html:5 msgid "Add users group" @@ -1860,6 +2257,10 @@ msgid "Add all elements" msgstr "Adicionar todos os elementos" +#: rhodecode/templates/admin/users_groups/users_group_edit.html:126 +msgid "Group members" +msgstr "Membros do grupo" + #: rhodecode/templates/admin/users_groups/users_groups.html:5 msgid "Users groups administration" msgstr "Administração de grupos de usuários" @@ -1872,313 +2273,429 @@ msgid "group name" msgstr "nome do grupo" -#: rhodecode/templates/base/base.html:32 +#: rhodecode/templates/admin/users_groups/users_groups.html:45 +#, python-format +msgid "Confirm to delete this users group: %s" +msgstr "Confirme para excluir este grupo de usuários: %s" + +#: rhodecode/templates/base/base.html:41 +msgid "Submit a bug" +msgstr "Encaminhe um bug" + +#: rhodecode/templates/base/base.html:77 +msgid "Login to your account" +msgstr "Entrar com sua conta" + +#: rhodecode/templates/base/base.html:100 msgid "Forgot password ?" msgstr "Esqueceu a senha ?" -#: rhodecode/templates/base/base.html:57 -#: rhodecode/templates/base/base.html:338 -#: rhodecode/templates/base/base.html:340 -#: rhodecode/templates/base/base.html:342 +#: rhodecode/templates/base/base.html:107 +msgid "Log In" +msgstr "Entrar" + +#: rhodecode/templates/base/base.html:118 +msgid "Inbox" +msgstr "Caixa de Entrada" + +#: rhodecode/templates/base/base.html:122 +#: rhodecode/templates/base/base.html:289 +#: rhodecode/templates/base/base.html:291 +#: rhodecode/templates/base/base.html:293 msgid "Home" msgstr "Início" -#: rhodecode/templates/base/base.html:61 -#: rhodecode/templates/base/base.html:347 -#: rhodecode/templates/base/base.html:349 -#: rhodecode/templates/base/base.html:351 +#: rhodecode/templates/base/base.html:123 +#: rhodecode/templates/base/base.html:298 +#: rhodecode/templates/base/base.html:300 +#: rhodecode/templates/base/base.html:302 #: rhodecode/templates/journal/journal.html:4 #: rhodecode/templates/journal/journal.html:17 #: rhodecode/templates/journal/public_journal.html:4 msgid "Journal" msgstr "Diário" -#: rhodecode/templates/base/base.html:66 -msgid "Login" -msgstr "Entrar" - -#: rhodecode/templates/base/base.html:68 +#: rhodecode/templates/base/base.html:125 msgid "Log Out" msgstr "Sair" -#: rhodecode/templates/base/base.html:107 -msgid "Submit a bug" -msgstr "Encaminhe um bug" - -#: rhodecode/templates/base/base.html:141 +#: rhodecode/templates/base/base.html:144 msgid "Switch repository" msgstr "Trocar repositório" -#: rhodecode/templates/base/base.html:143 +#: rhodecode/templates/base/base.html:146 msgid "Products" msgstr "Produtos" -#: rhodecode/templates/base/base.html:149 +#: rhodecode/templates/base/base.html:152 +#: rhodecode/templates/base/base.html:182 msgid "loading..." msgstr "carregando..." -#: rhodecode/templates/base/base.html:234 -#: rhodecode/templates/base/base.html:236 -#: rhodecode/templates/base/base.html:238 +#: 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:9 +#: rhodecode/templates/data_table/_dt_elements.html:11 +#: rhodecode/templates/data_table/_dt_elements.html:13 +#: rhodecode/templates/summary/summary.html:4 +msgid "Summary" +msgstr "Sumário" + +#: rhodecode/templates/base/base.html:166 +#: rhodecode/templates/base/base.html:168 +#: rhodecode/templates/base/base.html:170 +#: rhodecode/templates/changelog/changelog.html:6 +#: rhodecode/templates/changelog/changelog.html:15 +#: rhodecode/templates/data_table/_dt_elements.html:17 +#: rhodecode/templates/data_table/_dt_elements.html:19 +#: rhodecode/templates/data_table/_dt_elements.html:21 +msgid "Changelog" +msgstr "Registro de alterações" + +#: rhodecode/templates/base/base.html:175 +#: rhodecode/templates/base/base.html:177 +#: rhodecode/templates/base/base.html:179 msgid "Switch to" msgstr "Trocar para" -#: rhodecode/templates/base/base.html:242 -#: rhodecode/templates/branches/branches.html:13 -msgid "branches" -msgstr "ramos" - -#: rhodecode/templates/base/base.html:249 -#: rhodecode/templates/branches/branches_data.html:52 -msgid "There are no branches yet" -msgstr "Ainda não há ramos" - -#: rhodecode/templates/base/base.html:254 -#: rhodecode/templates/shortlog/shortlog_data.html:10 -#: rhodecode/templates/tags/tags.html:14 -msgid "tags" -msgstr "etiquetas" - -#: rhodecode/templates/base/base.html:261 -#: rhodecode/templates/tags/tags_data.html:32 -msgid "There are no tags yet" -msgstr "Ainda não há etiquetas" - -#: rhodecode/templates/base/base.html:277 -#: rhodecode/templates/base/base.html:281 -#: rhodecode/templates/files/files_annotate.html:40 -#: rhodecode/templates/files/files_source.html:11 +#: 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:25 +#: rhodecode/templates/data_table/_dt_elements.html:27 +#: rhodecode/templates/data_table/_dt_elements.html:29 +#: rhodecode/templates/files/files.html:4 +#: rhodecode/templates/files/files.html:40 +msgid "Files" +msgstr "Arquivos" + +#: rhodecode/templates/base/base.html:195 +#: rhodecode/templates/base/base.html:199 msgid "Options" msgstr "Opções" -#: rhodecode/templates/base/base.html:286 -#: rhodecode/templates/base/base.html:288 -#: rhodecode/templates/base/base.html:306 +#: rhodecode/templates/base/base.html:204 +#: rhodecode/templates/base/base.html:206 +#: rhodecode/templates/base/base.html:224 msgid "settings" msgstr "configurações" -#: rhodecode/templates/base/base.html:292 +#: rhodecode/templates/base/base.html:209 +#: rhodecode/templates/data_table/_dt_elements.html:74 +#: rhodecode/templates/forks/fork.html:13 +msgid "fork" +msgstr "bifurcação" + +#: rhodecode/templates/base/base.html:210 msgid "search" msgstr "pesquisar" -#: rhodecode/templates/base/base.html:299 +#: rhodecode/templates/base/base.html:217 msgid "journal" msgstr "diário" -#: rhodecode/templates/base/base.html:301 +#: rhodecode/templates/base/base.html:219 msgid "repositories groups" msgstr "grupos de repositórios" -#: rhodecode/templates/base/base.html:302 +#: rhodecode/templates/base/base.html:220 msgid "users" msgstr "usuários" -#: rhodecode/templates/base/base.html:303 +#: rhodecode/templates/base/base.html:221 msgid "users groups" msgstr "grupos de usuários" -#: rhodecode/templates/base/base.html:304 +#: rhodecode/templates/base/base.html:222 msgid "permissions" msgstr "permissões" -#: rhodecode/templates/base/base.html:317 -#: rhodecode/templates/base/base.html:319 +#: rhodecode/templates/base/base.html:235 +#: rhodecode/templates/base/base.html:237 #: rhodecode/templates/followers/followers.html:5 msgid "Followers" msgstr "Seguidores" -#: rhodecode/templates/base/base.html:325 -#: rhodecode/templates/base/base.html:327 +#: rhodecode/templates/base/base.html:243 +#: rhodecode/templates/base/base.html:245 #: rhodecode/templates/forks/forks.html:5 msgid "Forks" msgstr "Bifurcações" -#: rhodecode/templates/base/base.html:356 -#: rhodecode/templates/base/base.html:358 -#: rhodecode/templates/base/base.html:360 +#: rhodecode/templates/base/base.html:316 +#: rhodecode/templates/base/base.html:318 +#: rhodecode/templates/base/base.html:320 #: rhodecode/templates/search/search.html:4 #: rhodecode/templates/search/search.html:24 #: rhodecode/templates/search/search.html:46 msgid "Search" msgstr "Pesquisar" -#: rhodecode/templates/base/root.html:57 -#: rhodecode/templates/journal/journal.html:48 -#: rhodecode/templates/summary/summary.html:36 +#: rhodecode/templates/base/root.html:53 +msgid "add another comment" +msgstr "adicionar outro comentário" + +#: rhodecode/templates/base/root.html:54 +#: rhodecode/templates/journal/journal.html:111 +#: rhodecode/templates/summary/summary.html:52 msgid "Stop following this repository" msgstr "Parar de seguir este repositório" -#: rhodecode/templates/base/root.html:66 -#: rhodecode/templates/summary/summary.html:40 +#: rhodecode/templates/base/root.html:55 +#: rhodecode/templates/summary/summary.html:56 msgid "Start following this repository" msgstr "Passar a seguir este repositório" -#: rhodecode/templates/branches/branches_data.html:4 -#: rhodecode/templates/tags/tags_data.html:4 +#: rhodecode/templates/bookmarks/bookmarks.html:5 +msgid "Bookmarks" +msgstr "Marcadores" + +#: rhodecode/templates/bookmarks/bookmarks.html:39 +#: rhodecode/templates/bookmarks/bookmarks_data.html:8 +#: rhodecode/templates/branches/branches.html:39 +#: rhodecode/templates/tags/tags.html:39 +#: rhodecode/templates/tags/tags_data.html:8 +msgid "Author" +msgstr "Autor" + +#: rhodecode/templates/branches/branches_data.html:7 msgid "date" msgstr "data" -#: rhodecode/templates/branches/branches_data.html:6 -#: rhodecode/templates/shortlog/shortlog_data.html:7 -#: rhodecode/templates/tags/tags_data.html:6 -msgid "author" -msgstr "autor" - #: rhodecode/templates/branches/branches_data.html:8 -#: rhodecode/templates/shortlog/shortlog_data.html:11 -#: rhodecode/templates/tags/tags_data.html:8 -msgid "links" -msgstr "inks" - -#: rhodecode/templates/branches/branches_data.html:23 -#: rhodecode/templates/branches/branches_data.html:43 -#: rhodecode/templates/shortlog/shortlog_data.html:39 -#: rhodecode/templates/tags/tags_data.html:24 -msgid "changeset" -msgstr "conjunto de mudanças" - -#: rhodecode/templates/branches/branches_data.html:25 -#: rhodecode/templates/branches/branches_data.html:45 -#: rhodecode/templates/files/files.html:12 -#: rhodecode/templates/shortlog/shortlog_data.html:41 -#: rhodecode/templates/summary/summary.html:233 -#: rhodecode/templates/tags/tags_data.html:26 -msgid "files" -msgstr "arquivos" - -#: rhodecode/templates/changelog/changelog.html:14 -msgid "showing " -msgstr "mostrando " - -#: rhodecode/templates/changelog/changelog.html:14 -msgid "out of" -msgstr "de" - -#: rhodecode/templates/changelog/changelog.html:37 +#: 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/changelog/changelog.html:15 +#, python-format +msgid "showing %d out of %d revision" +msgid_plural "showing %d out of %d revisions" +msgstr[0] "mostrando %d de % revisão" +msgstr[1] "mostrando %d de % revisões" + +#: rhodecode/templates/changelog/changelog.html:38 msgid "Show" msgstr "Mostrar" -#: rhodecode/templates/changelog/changelog.html:50 -#: rhodecode/templates/changeset/changeset.html:42 -#: rhodecode/templates/summary/summary.html:609 -msgid "commit" -msgstr "commit" - -#: rhodecode/templates/changelog/changelog.html:63 +#: rhodecode/templates/changelog/changelog.html:64 +#: rhodecode/templates/summary/summary.html:352 +msgid "show more" +msgstr "mostrar mais" + +#: rhodecode/templates/changelog/changelog.html:68 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:67 -#: rhodecode/templates/changeset/changeset.html:66 -msgid "merge" -msgstr "mesclar" - -#: rhodecode/templates/changelog/changelog.html:72 +#: rhodecode/templates/changelog/changelog.html:82 #: rhodecode/templates/changeset/changeset.html:72 msgid "Parent" msgstr "Progenitor" -#: rhodecode/templates/changelog/changelog.html:77 -#: rhodecode/templates/changeset/changeset.html:77 +#: rhodecode/templates/changelog/changelog.html:88 +#: rhodecode/templates/changeset/changeset.html:78 msgid "No parents" msgstr "Sem progenitores" -#: rhodecode/templates/changelog/changelog.html:82 -#: rhodecode/templates/changeset/changeset.html:80 +#: rhodecode/templates/changelog/changelog.html:93 +#: rhodecode/templates/changeset/changeset.html:82 +msgid "merge" +msgstr "mesclar" + +#: rhodecode/templates/changelog/changelog.html:96 +#: rhodecode/templates/changeset/changeset.html:85 #: rhodecode/templates/files/files.html:29 -#: rhodecode/templates/files/files_annotate.html:25 +#: rhodecode/templates/files/files_add.html:33 #: rhodecode/templates/files/files_edit.html:33 #: rhodecode/templates/shortlog/shortlog_data.html:9 msgid "branch" msgstr "ramo" -#: rhodecode/templates/changelog/changelog.html:86 -#: rhodecode/templates/changeset/changeset.html:83 +#: rhodecode/templates/changelog/changelog.html:102 +msgid "bookmark" +msgstr "marcador" + +#: rhodecode/templates/changelog/changelog.html:108 +#: rhodecode/templates/changeset/changeset.html:90 msgid "tag" msgstr "etiqueta" -#: rhodecode/templates/changelog/changelog.html:122 +#: rhodecode/templates/changelog/changelog.html:144 msgid "Show selected changes __S -> __E" msgstr "Mostrar alterações selecionadas __S -> __E" -#: rhodecode/templates/changelog/changelog.html:172 -#: rhodecode/templates/shortlog/shortlog_data.html:61 +#: rhodecode/templates/changelog/changelog.html:235 msgid "There are no changes yet" msgstr "Ainda não há alteações" #: rhodecode/templates/changelog/changelog_details.html:2 -#: rhodecode/templates/changeset/changeset.html:55 +#: rhodecode/templates/changeset/changeset.html:60 msgid "removed" msgstr "removidos" #: rhodecode/templates/changelog/changelog_details.html:3 -#: rhodecode/templates/changeset/changeset.html:56 +#: rhodecode/templates/changeset/changeset.html:61 msgid "changed" msgstr "alterados" #: rhodecode/templates/changelog/changelog_details.html:4 -#: rhodecode/templates/changeset/changeset.html:57 +#: rhodecode/templates/changeset/changeset.html:62 msgid "added" msgstr "adicionados" #: rhodecode/templates/changelog/changelog_details.html:6 #: rhodecode/templates/changelog/changelog_details.html:7 #: rhodecode/templates/changelog/changelog_details.html:8 -#: rhodecode/templates/changeset/changeset.html:59 -#: rhodecode/templates/changeset/changeset.html:60 -#: rhodecode/templates/changeset/changeset.html:61 +#: rhodecode/templates/changeset/changeset.html:64 +#: rhodecode/templates/changeset/changeset.html:65 +#: rhodecode/templates/changeset/changeset.html:66 #, python-format msgid "affected %s files" msgstr "%s arquivos afetados" #: rhodecode/templates/changeset/changeset.html:6 #: rhodecode/templates/changeset/changeset.html:14 -#: rhodecode/templates/changeset/changeset.html:31 msgid "Changeset" msgstr "Conjunto de Mudanças" -#: rhodecode/templates/changeset/changeset.html:32 -#: rhodecode/templates/changeset/changeset.html:121 -#: rhodecode/templates/changeset/changeset_range.html:78 -#: rhodecode/templates/files/file_diff.html:32 -#: rhodecode/templates/files/file_diff.html:42 +#: rhodecode/templates/changeset/changeset.html:37 +#: rhodecode/templates/changeset/diff_block.html:20 msgid "raw diff" msgstr "diff bruto" -#: rhodecode/templates/changeset/changeset.html:34 -#: rhodecode/templates/changeset/changeset.html:123 -#: rhodecode/templates/changeset/changeset_range.html:80 -#: rhodecode/templates/files/file_diff.html:34 +#: rhodecode/templates/changeset/changeset.html:38 +#: rhodecode/templates/changeset/diff_block.html:21 msgid "download diff" msgstr "descarregar diff" -#: rhodecode/templates/changeset/changeset.html:90 +#: rhodecode/templates/changeset/changeset.html:42 +#: rhodecode/templates/changeset/changeset_file_comment.html:69 +#, python-format +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "%d comentário" +msgstr[1] "%d comentários" + +#: rhodecode/templates/changeset/changeset.html:42 +#: rhodecode/templates/changeset/changeset_file_comment.html:69 #, python-format -msgid "%s files affected with %s additions and %s deletions." -msgstr "%s arquivos afetados com %s adições e %s exclusões" - -#: rhodecode/templates/changeset/changeset.html:101 +msgid "(%d inline)" +msgid_plural "(%d inline)" +msgstr[0] "(%d em linha)" +msgstr[1] "(%d em linha)" + +#: rhodecode/templates/changeset/changeset.html:97 +#, 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:113 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:119 -#: rhodecode/templates/changeset/changeset_range.html:76 -#: rhodecode/templates/files/file_diff.html:30 +#: rhodecode/templates/changeset/changeset_file_comment.html:35 +msgid "Submitting..." +msgstr "Enviando..." + +#: rhodecode/templates/changeset/changeset_file_comment.html:38 +msgid "Commenting on line {1}." +msgstr "Comentando a linha {1}." + +#: rhodecode/templates/changeset/changeset_file_comment.html:39 +#: rhodecode/templates/changeset/changeset_file_comment.html:100 +#, python-format +msgid "Comments parsed using %s syntax with %s support." +msgstr "Comentários interpretados usando a sintaxe %s com suporte a %s." + +#: rhodecode/templates/changeset/changeset_file_comment.html:41 +#: rhodecode/templates/changeset/changeset_file_comment.html:102 +msgid "Use @username inside this text to send notification to this RhodeCode user" +msgstr "" +"Use @nomedeusuário dentro desse texto para enviar notificação a este " +"usuário do RhodeCode" + +#: rhodecode/templates/changeset/changeset_file_comment.html:47 +#: rhodecode/templates/changeset/changeset_file_comment.html:107 +msgid "Comment" +msgstr "Comentário" + +#: rhodecode/templates/changeset/changeset_file_comment.html:48 +#: rhodecode/templates/changeset/changeset_file_comment.html:59 +msgid "Hide" +msgstr "Ocultar" + +#: rhodecode/templates/changeset/changeset_file_comment.html:55 +msgid "You need to be logged in to comment." +msgstr "Você precisa estar logado para comentar." + +#: rhodecode/templates/changeset/changeset_file_comment.html:55 +msgid "Login now" +msgstr "Entrar agora" + +#: rhodecode/templates/changeset/changeset_file_comment.html:97 +msgid "Leave a comment" +msgstr "Deixar um comentário" + +#: rhodecode/templates/changeset/changeset_range.html:29 +msgid "Compare View" +msgstr "Exibir Comparação" + +#: rhodecode/templates/changeset/changeset_range.html:49 +msgid "Files affected" +msgstr "Arquivos afetados" + +#: rhodecode/templates/changeset/diff_block.html:19 msgid "diff" msgstr "diff" -#: rhodecode/templates/changeset/changeset.html:132 -#: rhodecode/templates/changeset/changeset_range.html:89 -msgid "No changes in this file" -msgstr "Nenhuma alteração nesse arquivo" - -#: rhodecode/templates/changeset/changeset_range.html:30 -msgid "Compare View" -msgstr "Exibir Comparação" - -#: rhodecode/templates/changeset/changeset_range.html:52 -msgid "Files affected" -msgstr "Arquivos afetados" +#: rhodecode/templates/changeset/diff_block.html:27 +msgid "show inline comments" +msgstr "mostrar comentários em linha" + +#: rhodecode/templates/data_table/_dt_elements.html:33 +#: rhodecode/templates/data_table/_dt_elements.html:35 +#: rhodecode/templates/data_table/_dt_elements.html:37 +#: rhodecode/templates/forks/fork.html:5 +msgid "Fork" +msgstr "Bifurcação" + +#: rhodecode/templates/data_table/_dt_elements.html:54 +#: rhodecode/templates/journal/journal.html:117 +#: rhodecode/templates/summary/summary.html:63 +msgid "Mercurial repository" +msgstr "Repositório Mercurial" + +#: rhodecode/templates/data_table/_dt_elements.html:56 +#: rhodecode/templates/journal/journal.html:119 +#: rhodecode/templates/summary/summary.html:66 +msgid "Git repository" +msgstr "Repositório Git" + +#: rhodecode/templates/data_table/_dt_elements.html:63 +#: rhodecode/templates/journal/journal.html:125 +#: rhodecode/templates/summary/summary.html:73 +msgid "public repository" +msgstr "repositório público" + +#: rhodecode/templates/data_table/_dt_elements.html:74 +#: rhodecode/templates/summary/summary.html:82 +#: rhodecode/templates/summary/summary.html:83 +msgid "Fork of" +msgstr "Bifurcação de" + +#: rhodecode/templates/data_table/_dt_elements.html:86 +msgid "No changesets yet" +msgstr "Nenhum conjunto de alterações ainda." + +#: rhodecode/templates/email_templates/main.html:8 +msgid "This is an notification from RhodeCode." +msgstr "Esta é uma notificação do RhodeCode." #: rhodecode/templates/errors/error_document.html:44 #, python-format @@ -2190,81 +2707,70 @@ msgid "File diff" msgstr "Diff do arquivo" -#: rhodecode/templates/files/file_diff.html:42 -msgid "Diff is to big to display" -msgstr "Diff é grande demais para exibir" - -#: rhodecode/templates/files/files.html:37 -#: rhodecode/templates/files/files_annotate.html:31 +#: rhodecode/templates/files/files.html:12 +#: rhodecode/templates/summary/summary.html:328 +msgid "files" +msgstr "arquivos" + +#: rhodecode/templates/files/files.html:44 +msgid "search truncated" +msgstr "pesquisa truncada" + +#: rhodecode/templates/files/files.html:45 +msgid "no matching files" +msgstr "nenhum arquivo corresponde" + +#: rhodecode/templates/files/files_add.html:4 +#: rhodecode/templates/files/files_edit.html:4 +msgid "Edit file" +msgstr "Editar arquivo" + +#: rhodecode/templates/files/files_add.html:19 +msgid "add file" +msgstr "adicionar arquivo" + +#: rhodecode/templates/files/files_add.html:40 +msgid "Add new file" +msgstr "Adicionar novo arquivo" + +#: rhodecode/templates/files/files_add.html:45 +msgid "File Name" +msgstr "Nome de Arquivo" + +#: rhodecode/templates/files/files_add.html:49 +#: rhodecode/templates/files/files_add.html:58 +msgid "or" +msgstr "ou" + +#: rhodecode/templates/files/files_add.html:49 +#: rhodecode/templates/files/files_add.html:54 +msgid "Upload file" +msgstr "Enviar arquivo" + +#: rhodecode/templates/files/files_add.html:58 +msgid "Create new file" +msgstr "Criar novo arquivo" + +#: rhodecode/templates/files/files_add.html:63 #: rhodecode/templates/files/files_edit.html:39 +#: rhodecode/templates/files/files_ypjax.html:3 msgid "Location" msgstr "Local" -#: rhodecode/templates/files/files.html:46 -msgid "Go back" -msgstr "Voltar" - -#: rhodecode/templates/files/files.html:47 -msgid "No files at given path" -msgstr "Nenhum arquivo no caminho especificado" - -#: rhodecode/templates/files/files_annotate.html:4 -msgid "File annotate" -msgstr "Anotar arquivo" - -#: rhodecode/templates/files/files_annotate.html:12 -msgid "annotate" -msgstr "anotar" - -#: rhodecode/templates/files/files_annotate.html:33 -#: rhodecode/templates/files/files_browser.html:160 -#: rhodecode/templates/files/files_source.html:2 -msgid "Revision" -msgstr "Revisão" - -#: rhodecode/templates/files/files_annotate.html:36 -#: rhodecode/templates/files/files_browser.html:158 -#: rhodecode/templates/files/files_source.html:7 -msgid "Size" -msgstr "Tamanho" - -#: rhodecode/templates/files/files_annotate.html:38 -#: rhodecode/templates/files/files_browser.html:159 -#: rhodecode/templates/files/files_source.html:9 -msgid "Mimetype" -msgstr "Mimetype" - -#: rhodecode/templates/files/files_annotate.html:41 -msgid "show source" -msgstr "mostrar fonte" - -#: rhodecode/templates/files/files_annotate.html:43 -#: rhodecode/templates/files/files_annotate.html:78 -#: rhodecode/templates/files/files_source.html:14 -#: rhodecode/templates/files/files_source.html:51 -msgid "show as raw" -msgstr "mostrar como bruto" - -#: rhodecode/templates/files/files_annotate.html:45 -#: rhodecode/templates/files/files_source.html:16 -msgid "download as raw" -msgstr "descarregar como bruto" - -#: rhodecode/templates/files/files_annotate.html:54 -#: rhodecode/templates/files/files_source.html:25 -msgid "History" -msgstr "Histórico" - -#: rhodecode/templates/files/files_annotate.html:73 -#: rhodecode/templates/files/files_source.html:46 -#, python-format -msgid "Binary file (%s)" -msgstr "Arquivo binário (%s)" - -#: rhodecode/templates/files/files_annotate.html:78 -#: rhodecode/templates/files/files_source.html:51 -msgid "File is too big to display" -msgstr "Arquivo é grande demais para exibir" +#: rhodecode/templates/files/files_add.html:67 +msgid "use / to separate directories" +msgstr "use / para separar diretórios" + +#: rhodecode/templates/files/files_add.html:77 +#: rhodecode/templates/files/files_edit.html:63 +#: rhodecode/templates/shortlog/shortlog_data.html:6 +msgid "commit message" +msgstr "mensagem de commit" + +#: rhodecode/templates/files/files_add.html:81 +#: rhodecode/templates/files/files_edit.html:67 +msgid "Commit changes" +msgstr "Realizar commit das alterações" #: rhodecode/templates/files/files_browser.html:13 msgid "view" @@ -2286,51 +2792,96 @@ msgid "search file list" msgstr "pesquisar lista de arquivos" -#: rhodecode/templates/files/files_browser.html:32 +#: rhodecode/templates/files/files_browser.html:31 +#: rhodecode/templates/shortlog/shortlog_data.html:65 +msgid "add new file" +msgstr "adicionar novo arquivo" + +#: rhodecode/templates/files/files_browser.html:35 msgid "Loading file list..." msgstr "Carregando lista de arquivos..." -#: rhodecode/templates/files/files_browser.html:111 -msgid "search truncated" -msgstr "pesquisa truncada" - -#: rhodecode/templates/files/files_browser.html:122 -msgid "no matching files" -msgstr "nenhum arquivo corresponde" - -#: rhodecode/templates/files/files_browser.html:161 +#: rhodecode/templates/files/files_browser.html:48 +msgid "Size" +msgstr "Tamanho" + +#: rhodecode/templates/files/files_browser.html:49 +msgid "Mimetype" +msgstr "Mimetype" + +#: rhodecode/templates/files/files_browser.html:50 +msgid "Last Revision" +msgstr "Última revisão" + +#: rhodecode/templates/files/files_browser.html:51 msgid "Last modified" msgstr "Última alteração" -#: rhodecode/templates/files/files_browser.html:162 +#: rhodecode/templates/files/files_browser.html:52 msgid "Last commiter" msgstr "Último commiter" -#: rhodecode/templates/files/files_edit.html:4 -msgid "Edit file" -msgstr "Editar arquivo" - #: rhodecode/templates/files/files_edit.html:19 msgid "edit file" msgstr "editar arquivo" -#: rhodecode/templates/files/files_edit.html:45 -#: rhodecode/templates/shortlog/shortlog_data.html:5 -msgid "commit message" -msgstr "mensagem de commit" +#: rhodecode/templates/files/files_edit.html:49 +#: rhodecode/templates/files/files_source.html:26 +msgid "show annotation" +msgstr "mostrar anotação" + +#: rhodecode/templates/files/files_edit.html:50 +#: rhodecode/templates/files/files_source.html:28 +#: rhodecode/templates/files/files_source.html:56 +msgid "show as raw" +msgstr "mostrar como bruto" #: rhodecode/templates/files/files_edit.html:51 -msgid "Commit changes" -msgstr "Realizar commit das alterações" - -#: rhodecode/templates/files/files_source.html:12 -msgid "show annotation" -msgstr "mostrar anotação" - -#: rhodecode/templates/files/files_source.html:153 +#: rhodecode/templates/files/files_source.html:29 +msgid "download as raw" +msgstr "descarregar como bruto" + +#: rhodecode/templates/files/files_edit.html:54 +msgid "source" +msgstr "fonte" + +#: rhodecode/templates/files/files_edit.html:59 +msgid "Editing file" +msgstr "Editando arquivo" + +#: rhodecode/templates/files/files_source.html:2 +msgid "History" +msgstr "Histórico" + +#: rhodecode/templates/files/files_source.html:24 +msgid "show source" +msgstr "mostrar fonte" + +#: rhodecode/templates/files/files_source.html:47 +#, python-format +msgid "Binary file (%s)" +msgstr "Arquivo binário (%s)" + +#: rhodecode/templates/files/files_source.html:56 +msgid "File is too big to display" +msgstr "Arquivo é grande demais para exibir" + +#: rhodecode/templates/files/files_source.html:112 msgid "Selection link" msgstr "Link da seleção" +#: rhodecode/templates/files/files_ypjax.html:5 +msgid "annotation" +msgstr "anotação" + +#: rhodecode/templates/files/files_ypjax.html:15 +msgid "Go back" +msgstr "Voltar" + +#: rhodecode/templates/files/files_ypjax.html:16 +msgid "No files at given path" +msgstr "Nenhum arquivo no caminho especificado" + #: rhodecode/templates/followers/followers.html:13 msgid "followers" msgstr "seguidores" @@ -2339,6 +2890,26 @@ msgid "Started following" msgstr "Passou a seguir" +#: rhodecode/templates/forks/fork.html:31 +msgid "Fork name" +msgstr "Nome da bifurcação" + +#: rhodecode/templates/forks/fork.html:57 +msgid "Private" +msgstr "Privado" + +#: rhodecode/templates/forks/fork.html:65 +msgid "Copy permissions" +msgstr "Copiar permissões" + +#: rhodecode/templates/forks/fork.html:73 +msgid "Update after clone" +msgstr "Atualizar após clonar" + +#: rhodecode/templates/forks/fork.html:80 +msgid "fork this repository" +msgstr "bifurcar este repositório" + #: rhodecode/templates/forks/forks.html:13 msgid "forks" msgstr "bifurcações" @@ -2351,23 +2922,27 @@ msgid "There are no forks yet" msgstr "Ainda não há bifurcações" -#: rhodecode/templates/journal/journal.html:34 -msgid "Following" +#: rhodecode/templates/journal/journal.html:20 +msgid "Refresh" +msgstr "Atualizar" + +#: rhodecode/templates/journal/journal.html:32 +msgid "Watched" msgstr "Seguindo" -#: rhodecode/templates/journal/journal.html:41 +#: rhodecode/templates/journal/journal.html:105 msgid "following user" msgstr "seguindo usuário" -#: rhodecode/templates/journal/journal.html:41 +#: rhodecode/templates/journal/journal.html:105 msgid "user" msgstr "usuário" -#: rhodecode/templates/journal/journal.html:65 +#: rhodecode/templates/journal/journal.html:138 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:46 +#: rhodecode/templates/journal/journal_data.html:47 msgid "No entries yet" msgstr "Ainda não há entradas" @@ -2401,25 +2976,13 @@ msgid "File names" msgstr "Nomes dos arquivos" -#: rhodecode/templates/search/search_content.html:20 +#: rhodecode/templates/search/search_content.html:21 #: rhodecode/templates/search/search_path.html:15 msgid "Permission denied" msgstr "Permissão negada" -#: rhodecode/templates/settings/repo_fork.html:5 -msgid "Fork" -msgstr "Bifurcação" - -#: rhodecode/templates/settings/repo_fork.html:31 -msgid "Fork name" -msgstr "Nome da bifurcação" - -#: rhodecode/templates/settings/repo_fork.html:55 -msgid "fork this repository" -msgstr "bifurcar este repositório" - #: rhodecode/templates/shortlog/shortlog.html:5 -#: rhodecode/templates/summary/summary.html:666 +#: rhodecode/templates/summary/summary.html:209 msgid "Shortlog" msgstr "Log resumido" @@ -2427,104 +2990,136 @@ msgid "shortlog" msgstr "log resumido" -#: rhodecode/templates/shortlog/shortlog_data.html:6 +#: rhodecode/templates/shortlog/shortlog_data.html:7 msgid "age" msgstr "idade" +#: rhodecode/templates/shortlog/shortlog_data.html:18 +msgid "No commit message" +msgstr "Nenhuma mensagem de commit" + +#: rhodecode/templates/shortlog/shortlog_data.html:62 +msgid "Add or upload files directly via RhodeCode" +msgstr "Adicionar ou enviar arquivos diretamente pelo RhodeCode" + +#: rhodecode/templates/shortlog/shortlog_data.html:71 +msgid "Push new repo" +msgstr "Fazer push de novo repositório" + +#: rhodecode/templates/shortlog/shortlog_data.html:79 +msgid "Existing repository?" +msgstr "Repositório existente?" + #: rhodecode/templates/summary/summary.html:12 msgid "summary" msgstr "sumário" -#: rhodecode/templates/summary/summary.html:79 +#: rhodecode/templates/summary/summary.html:44 +#: rhodecode/templates/summary/summary.html:47 +msgid "ATOM" +msgstr "ATOM" + +#: rhodecode/templates/summary/summary.html:77 +#, python-format +msgid "Non changable ID %s" +msgstr "ID não alterável %s" + +#: rhodecode/templates/summary/summary.html:82 +msgid "public" +msgstr "público" + +#: rhodecode/templates/summary/summary.html:90 msgid "remote clone" msgstr "clone remoto" #: rhodecode/templates/summary/summary.html:121 -msgid "by" -msgstr "por" - -#: rhodecode/templates/summary/summary.html:128 msgid "Clone url" msgstr "URL de clonagem" -#: rhodecode/templates/summary/summary.html:137 -msgid "Trending source files" -msgstr "Tendências nos arquivos fonte" - -#: rhodecode/templates/summary/summary.html:146 +#: rhodecode/templates/summary/summary.html:124 +msgid "Show by Name" +msgstr "Mostrar por Nome" + +#: rhodecode/templates/summary/summary.html:125 +msgid "Show by ID" +msgstr "Mostrar por ID" + +#: rhodecode/templates/summary/summary.html:133 +msgid "Trending files" +msgstr "Tendências em arquivos" + +#: rhodecode/templates/summary/summary.html:141 +#: rhodecode/templates/summary/summary.html:157 +#: rhodecode/templates/summary/summary.html:185 +msgid "enable" +msgstr "habilitar" + +#: rhodecode/templates/summary/summary.html:149 msgid "Download" msgstr "Download" -#: rhodecode/templates/summary/summary.html:150 +#: rhodecode/templates/summary/summary.html:153 msgid "There are no downloads yet" msgstr "Ainda não há downloads" -#: rhodecode/templates/summary/summary.html:152 +#: rhodecode/templates/summary/summary.html:155 msgid "Downloads are disabled for this repository" msgstr "Downloads estão desabilitados para este repositório" -#: rhodecode/templates/summary/summary.html:154 -#: rhodecode/templates/summary/summary.html:320 -msgid "enable" -msgstr "habilitar" - -#: rhodecode/templates/summary/summary.html:162 -#: rhodecode/templates/summary/summary.html:297 +#: rhodecode/templates/summary/summary.html:164 +msgid "Check this to download archive with subrepos" +msgstr "Marque isto para descarregar arquivo com subrepositórios" + +#: rhodecode/templates/summary/summary.html:164 +msgid "with subrepos" +msgstr "com subrepositórios" + +#: rhodecode/templates/summary/summary.html:177 +msgid "Commit activity by day / author" +msgstr "Atividade de commit por dia / autor" + +#: rhodecode/templates/summary/summary.html:188 +msgid "Stats gathered: " +msgstr "Estatísticas coletadas:" + +#: rhodecode/templates/summary/summary.html:211 +msgid "Quick start" +msgstr "Início rápido" + +#: rhodecode/templates/summary/summary.html:281 #, python-format msgid "Download %s as %s" msgstr "Descarregar %s como %s" -#: rhodecode/templates/summary/summary.html:168 -msgid "Check this to download archive with subrepos" -msgstr "Marque isto para descarregar arquivo com subrepositórios" - -#: rhodecode/templates/summary/summary.html:168 -msgid "with subrepos" -msgstr "com subrepositórios" - -#: rhodecode/templates/summary/summary.html:176 -msgid "Feeds" -msgstr "Feeds" - -#: rhodecode/templates/summary/summary.html:257 -#: rhodecode/templates/summary/summary.html:684 -#: rhodecode/templates/summary/summary.html:695 -msgid "show more" -msgstr "mostrar mais" - -#: rhodecode/templates/summary/summary.html:312 -msgid "Commit activity by day / author" -msgstr "Atividade de commit por dia / autor" - -#: rhodecode/templates/summary/summary.html:324 -msgid "Loaded in" -msgstr "Carregado em" - -#: rhodecode/templates/summary/summary.html:603 +#: rhodecode/templates/summary/summary.html:638 msgid "commits" msgstr "commits" -#: rhodecode/templates/summary/summary.html:604 +#: rhodecode/templates/summary/summary.html:639 msgid "files added" msgstr "arquivos adicionados" -#: rhodecode/templates/summary/summary.html:605 +#: rhodecode/templates/summary/summary.html:640 msgid "files changed" msgstr "arquivos alterados" -#: rhodecode/templates/summary/summary.html:606 +#: rhodecode/templates/summary/summary.html:641 msgid "files removed" msgstr "arquivos removidos" -#: rhodecode/templates/summary/summary.html:610 +#: rhodecode/templates/summary/summary.html:644 +msgid "commit" +msgstr "commit" + +#: rhodecode/templates/summary/summary.html:645 msgid "file added" msgstr "arquivo adicionado" -#: rhodecode/templates/summary/summary.html:611 +#: rhodecode/templates/summary/summary.html:646 msgid "file changed" msgstr "arquivo alterado" -#: rhodecode/templates/summary/summary.html:612 +#: rhodecode/templates/summary/summary.html:647 msgid "file removed" msgstr "arquivo removido" diff -r b0fef8a77568 -r aa2f0e4382e9 rhodecode/i18n/rhodecode.pot --- a/rhodecode/i18n/rhodecode.pot Wed May 23 00:58:37 2012 +0200 +++ b/rhodecode/i18n/rhodecode.pot Thu May 24 23:19:17 2012 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: RhodeCode 1.4.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-05-20 11:45+0200\n" +"POT-Creation-Date: 2012-05-24 22:18+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -140,12 +140,12 @@ msgid "Changesets" msgstr "" -#: rhodecode/controllers/files.py:462 rhodecode/controllers/summary.py:227 +#: rhodecode/controllers/files.py:462 rhodecode/controllers/summary.py:230 #: rhodecode/templates/branches/branches.html:5 msgid "Branches" msgstr "" -#: rhodecode/controllers/files.py:463 rhodecode/controllers/summary.py:228 +#: rhodecode/controllers/files.py:463 rhodecode/controllers/summary.py:231 #: rhodecode/templates/tags/tags.html:5 msgid "Tags" msgstr "" @@ -198,15 +198,15 @@ msgid "Your password reset was successful, new password has been sent to your email" msgstr "" -#: rhodecode/controllers/search.py:113 +#: rhodecode/controllers/search.py:114 msgid "Invalid search query. Try quoting it." msgstr "" -#: rhodecode/controllers/search.py:118 +#: rhodecode/controllers/search.py:119 msgid "There is no index to search in. Please run whoosh indexer" msgstr "" -#: rhodecode/controllers/search.py:122 +#: rhodecode/controllers/search.py:123 msgid "An error occurred during this search operation" msgstr "" @@ -238,11 +238,11 @@ msgid "An error occurred during deletion of %s" msgstr "" -#: rhodecode/controllers/summary.py:137 +#: rhodecode/controllers/summary.py:138 msgid "No data loaded yet" msgstr "" -#: rhodecode/controllers/summary.py:141 +#: rhodecode/controllers/summary.py:142 #: rhodecode/templates/summary/summary.html:139 msgid "Statistics are disabled for this repository" msgstr "" @@ -619,94 +619,98 @@ msgid "No changes detected" msgstr "" -#: rhodecode/lib/helpers.py:412 +#: rhodecode/lib/helpers.py:414 msgid "True" msgstr "" -#: rhodecode/lib/helpers.py:416 +#: rhodecode/lib/helpers.py:418 msgid "False" msgstr "" -#: rhodecode/lib/helpers.py:475 +#: rhodecode/lib/helpers.py:462 +msgid "Changeset not found" +msgstr "" + +#: rhodecode/lib/helpers.py:485 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: rhodecode/lib/helpers.py:481 +#: rhodecode/lib/helpers.py:491 msgid "compare view" msgstr "" -#: rhodecode/lib/helpers.py:501 +#: rhodecode/lib/helpers.py:511 msgid "and" msgstr "" -#: rhodecode/lib/helpers.py:502 +#: rhodecode/lib/helpers.py:512 #, python-format msgid "%s more" msgstr "" -#: rhodecode/lib/helpers.py:503 rhodecode/templates/changelog/changelog.html:40 +#: rhodecode/lib/helpers.py:513 rhodecode/templates/changelog/changelog.html:40 msgid "revisions" msgstr "" -#: rhodecode/lib/helpers.py:526 +#: rhodecode/lib/helpers.py:536 msgid "fork name " msgstr "" -#: rhodecode/lib/helpers.py:529 -msgid "[deleted] repository" -msgstr "" - -#: rhodecode/lib/helpers.py:530 rhodecode/lib/helpers.py:535 -msgid "[created] repository" -msgstr "" - -#: rhodecode/lib/helpers.py:531 -msgid "[created] repository as fork" -msgstr "" - -#: rhodecode/lib/helpers.py:532 rhodecode/lib/helpers.py:536 -msgid "[forked] repository" -msgstr "" - -#: rhodecode/lib/helpers.py:533 rhodecode/lib/helpers.py:537 -msgid "[updated] repository" -msgstr "" - -#: rhodecode/lib/helpers.py:534 -msgid "[delete] repository" -msgstr "" - -#: rhodecode/lib/helpers.py:538 -msgid "[pushed] into" -msgstr "" - #: rhodecode/lib/helpers.py:539 -msgid "[committed via RhodeCode] into" -msgstr "" - -#: rhodecode/lib/helpers.py:540 -msgid "[pulled from remote] into" +msgid "[deleted] repository" +msgstr "" + +#: rhodecode/lib/helpers.py:540 rhodecode/lib/helpers.py:545 +msgid "[created] repository" msgstr "" #: rhodecode/lib/helpers.py:541 +msgid "[created] repository as fork" +msgstr "" + +#: rhodecode/lib/helpers.py:542 rhodecode/lib/helpers.py:546 +msgid "[forked] repository" +msgstr "" + +#: rhodecode/lib/helpers.py:543 rhodecode/lib/helpers.py:547 +msgid "[updated] repository" +msgstr "" + +#: rhodecode/lib/helpers.py:544 +msgid "[delete] repository" +msgstr "" + +#: rhodecode/lib/helpers.py:548 +msgid "[pushed] into" +msgstr "" + +#: rhodecode/lib/helpers.py:549 +msgid "[committed via RhodeCode] into" +msgstr "" + +#: rhodecode/lib/helpers.py:550 +msgid "[pulled from remote] into" +msgstr "" + +#: rhodecode/lib/helpers.py:551 msgid "[pulled] from" msgstr "" -#: rhodecode/lib/helpers.py:542 +#: rhodecode/lib/helpers.py:552 msgid "[started following] repository" msgstr "" -#: rhodecode/lib/helpers.py:543 +#: rhodecode/lib/helpers.py:553 msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/helpers.py:721 +#: rhodecode/lib/helpers.py:731 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:725 +#: rhodecode/lib/helpers.py:735 msgid "No Files" msgstr "" diff -r b0fef8a77568 -r aa2f0e4382e9 rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.mo Binary file rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.mo has changed diff -r b0fef8a77568 -r aa2f0e4382e9 rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po Thu May 24 23:19:17 2012 +0200 @@ -0,0 +1,3256 @@ +# Chinese (China) translations for RhodeCode. +# Copyright (C) 2011 ORGANIZATION +# This file is distributed under the same license as the RhodeCode project. +# FIRST AUTHOR , 2011. +# mikespook , 2012. +msgid "" +msgstr "" +"Project-Id-Version: RhodeCode 1.2.0\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2012-05-24 22:18+0200\n" +"PO-Revision-Date: 2012-04-05 17:37+0800\n" +"Last-Translator: mikespook \n" +"Language-Team: mikespook\n" +"Plural-Forms: nplurals=1; plural=0\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:96 +#, fuzzy +#| msgid "branches" +msgid "All Branches" +msgstr "分支" + +#: rhodecode/controllers/changeset.py:79 +msgid "show white space" +msgstr "" + +#: rhodecode/controllers/changeset.py:86 rhodecode/controllers/changeset.py:93 +msgid "ignore white space" +msgstr "" + +#: rhodecode/controllers/changeset.py:153 +#, fuzzy, python-format +#| msgid "File contents" +msgid "%s line context" +msgstr "文件内容" + +#: rhodecode/controllers/changeset.py:320 +#: rhodecode/controllers/changeset.py:335 rhodecode/lib/diffs.py:62 +msgid "binary file" +msgstr "二进制文件" + +#: rhodecode/controllers/error.py:69 +msgid "Home page" +msgstr "主页" + +#: rhodecode/controllers/error.py:98 +msgid "The request could not be understood by the server due to malformed syntax." +msgstr "由于错误的语法，服务器无法对请求进行响应。" + +#: rhodecode/controllers/error.py:101 +msgid "Unauthorized access to resource" +msgstr "未授权的资源访问" + +#: rhodecode/controllers/error.py:103 +msgid "You don't have permission to view this page" +msgstr "无权访问该页面" + +#: rhodecode/controllers/error.py:105 +msgid "The resource could not be found" +msgstr "资源未找到" + +#: rhodecode/controllers/error.py:107 +msgid "" +"The server encountered an unexpected condition which prevented it from " +"fulfilling the request." +msgstr "服务进入非预期的混乱状态，这会阻止它对请求进行响应。" + +#: rhodecode/controllers/feed.py:48 +#, python-format +msgid "Changes on %s repository" +msgstr "%s 库的修改" + +#: rhodecode/controllers/feed.py:49 +#, python-format +msgid "%s %s feed" +msgstr "%s %s 订阅" + +#: rhodecode/controllers/files.py:86 +#: rhodecode/templates/admin/repos/repo_add.html:13 +msgid "add new" +msgstr "新增" + +#: rhodecode/controllers/files.py:87 +#, fuzzy, python-format +#| msgid "There are no files yet" +msgid "There are no files yet %s" +msgstr "尚无文件" + +#: rhodecode/controllers/files.py:247 +#, python-format +msgid "Edited %s via RhodeCode" +msgstr "通过 RhodeCode 修改了 %s" + +#: rhodecode/controllers/files.py:252 +msgid "No changes" +msgstr "无变更" + +#: rhodecode/controllers/files.py:263 rhodecode/controllers/files.py:316 +#, python-format +msgid "Successfully committed to %s" +msgstr "成功提交到 %s" + +#: rhodecode/controllers/files.py:268 rhodecode/controllers/files.py:322 +msgid "Error occurred during commit" +msgstr "提交时发生错误" + +#: rhodecode/controllers/files.py:288 +#, fuzzy, python-format +#| msgid "Edited %s via RhodeCode" +msgid "Added %s via RhodeCode" +msgstr "通过 RhodeCode 修改了 %s" + +#: rhodecode/controllers/files.py:302 +#, fuzzy +#| msgid "File contents" +msgid "No content" +msgstr "文件内容" + +#: rhodecode/controllers/files.py:306 +#, fuzzy +#| msgid "File names" +msgid "No filename" +msgstr "文件名" + +#: rhodecode/controllers/files.py:347 +msgid "downloads disabled" +msgstr "禁止下载" + +#: rhodecode/controllers/files.py:358 +#, python-format +msgid "Unknown revision %s" +msgstr "未知版本 %s" + +#: rhodecode/controllers/files.py:360 +msgid "Empty repository" +msgstr "空版本库" + +#: rhodecode/controllers/files.py:362 +msgid "Unknown archive type" +msgstr "未知包类型" + +#: rhodecode/controllers/files.py:461 +#: rhodecode/templates/changeset/changeset_range.html:5 +#: rhodecode/templates/changeset/changeset_range.html:13 +#: rhodecode/templates/changeset/changeset_range.html:31 +msgid "Changesets" +msgstr "变更集" + +#: rhodecode/controllers/files.py:462 rhodecode/controllers/summary.py:230 +#: rhodecode/templates/branches/branches.html:5 +msgid "Branches" +msgstr "分支" + +#: rhodecode/controllers/files.py:463 rhodecode/controllers/summary.py:231 +#: rhodecode/templates/tags/tags.html:5 +msgid "Tags" +msgstr "标签" + +#: rhodecode/controllers/forks.py:69 rhodecode/controllers/admin/repos.py:86 +#, 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:128 rhodecode/controllers/settings.py:69 +#, 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:163 +#, python-format +msgid "forked %s repository as %s" +msgstr "版本库 %s 被分支到 %s" + +#: rhodecode/controllers/forks.py:177 +#, python-format +msgid "An error occurred during repository forking %s" +msgstr "" + +#: rhodecode/controllers/journal.py:53 +#, python-format +msgid "%s public journal %s feed" +msgstr "公共日志 %s %s 订阅" + +#: rhodecode/controllers/journal.py:190 rhodecode/controllers/journal.py:224 +#: rhodecode/templates/admin/repos/repo_edit.html:177 +#: rhodecode/templates/base/base.html:307 +#: rhodecode/templates/base/base.html:309 +#: rhodecode/templates/base/base.html:311 +msgid "Public journal" +msgstr "公共日志" + +#: rhodecode/controllers/login.py:116 +msgid "You have successfully registered into rhodecode" +msgstr "成功注册到 rhodecode" + +#: rhodecode/controllers/login.py:137 +msgid "Your password reset link was sent" +msgstr "密码重置链接已经发送" + +#: rhodecode/controllers/login.py:157 +msgid "" +"Your password reset was successful, new password has been sent to your " +"email" +msgstr "密码已经成功重置，新密码已经发送到你的邮箱" + +#: rhodecode/controllers/search.py:114 +msgid "Invalid search query. Try quoting it." +msgstr "错误的搜索。请尝试用引号包含它。" + +#: rhodecode/controllers/search.py:119 +msgid "There is no index to search in. Please run whoosh indexer" +msgstr "没有索引用于搜索。请运行 whoosh 索引器" + +#: rhodecode/controllers/search.py:123 +msgid "An error occurred during this search operation" +msgstr "在搜索操作中发生异常" + +#: rhodecode/controllers/settings.py:103 +#: rhodecode/controllers/admin/repos.py:211 +#, python-format +msgid "Repository %s updated successfully" +msgstr "版本库 %s 成功更新" + +#: rhodecode/controllers/settings.py:121 +#: rhodecode/controllers/admin/repos.py:229 +#, python-format +msgid "error occurred during update of repository %s" +msgstr "" + +#: rhodecode/controllers/settings.py:139 +#: rhodecode/controllers/admin/repos.py:247 +#, 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:151 +#: rhodecode/controllers/admin/repos.py:259 +#, python-format +msgid "deleted repository %s" +msgstr "已经删除版本库 %s" + +#: rhodecode/controllers/settings.py:155 +#: rhodecode/controllers/admin/repos.py:269 +#: rhodecode/controllers/admin/repos.py:275 +#, python-format +msgid "An error occurred during deletion of %s" +msgstr "" + +#: rhodecode/controllers/summary.py:138 +msgid "No data loaded yet" +msgstr "" + +#: rhodecode/controllers/summary.py:142 +#: rhodecode/templates/summary/summary.html:139 +msgid "Statistics are disabled for this repository" +msgstr "该版本库统计功能已经禁用" + +#: rhodecode/controllers/admin/ldap_settings.py:49 +msgid "BASE" +msgstr "" + +#: rhodecode/controllers/admin/ldap_settings.py:50 +msgid "ONELEVEL" +msgstr "" + +#: rhodecode/controllers/admin/ldap_settings.py:51 +msgid "SUBTREE" +msgstr "" + +#: rhodecode/controllers/admin/ldap_settings.py:55 +msgid "NEVER" +msgstr "" + +#: rhodecode/controllers/admin/ldap_settings.py:56 +msgid "ALLOW" +msgstr "" + +#: rhodecode/controllers/admin/ldap_settings.py:57 +msgid "TRY" +msgstr "" + +#: rhodecode/controllers/admin/ldap_settings.py:58 +msgid "DEMAND" +msgstr "" + +#: rhodecode/controllers/admin/ldap_settings.py:59 +msgid "HARD" +msgstr "" + +#: rhodecode/controllers/admin/ldap_settings.py:63 +msgid "No encryption" +msgstr "未加密" + +#: rhodecode/controllers/admin/ldap_settings.py:64 +msgid "LDAPS connection" +msgstr "" + +#: rhodecode/controllers/admin/ldap_settings.py:65 +msgid "START_TLS on LDAP connection" +msgstr "" + +#: rhodecode/controllers/admin/ldap_settings.py:125 +msgid "Ldap settings updated successfully" +msgstr "LDAP 设置已经成功更新" + +#: rhodecode/controllers/admin/ldap_settings.py:129 +msgid "Unable to activate ldap. The \"python-ldap\" library is missing." +msgstr "无法启用 LDAP。库“python-ldap”缺失。" + +#: rhodecode/controllers/admin/ldap_settings.py:146 +msgid "error occurred during update of ldap settings" +msgstr "" + +#: rhodecode/controllers/admin/permissions.py:59 +msgid "None" +msgstr "无" + +#: rhodecode/controllers/admin/permissions.py:60 +msgid "Read" +msgstr "读" + +#: rhodecode/controllers/admin/permissions.py:61 +msgid "Write" +msgstr "写" + +#: 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:10 +#: 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:326 +#: rhodecode/templates/base/base.html:328 +#: rhodecode/templates/base/base.html:330 +msgid "Admin" +msgstr "管理" + +#: rhodecode/controllers/admin/permissions.py:65 +msgid "disabled" +msgstr "禁用" + +#: rhodecode/controllers/admin/permissions.py:67 +msgid "allowed with manual account activation" +msgstr "允许手工启用帐号" + +#: rhodecode/controllers/admin/permissions.py:69 +msgid "allowed with automatic account activation" +msgstr "允许自动启用帐号" + +#: rhodecode/controllers/admin/permissions.py:71 +msgid "Disabled" +msgstr "停用" + +#: rhodecode/controllers/admin/permissions.py:72 +msgid "Enabled" +msgstr "启用" + +#: rhodecode/controllers/admin/permissions.py:106 +msgid "Default permissions updated successfully" +msgstr "成功更新默认权限" + +#: rhodecode/controllers/admin/permissions.py:123 +msgid "error occurred during update of permissions" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:116 +msgid "--REMOVE FORK--" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:144 +#, python-format +msgid "created repository %s from %s" +msgstr "新版本库 %s 基于 %s 建立。" + +#: rhodecode/controllers/admin/repos.py:148 +#, python-format +msgid "created repository %s" +msgstr "建立版本库 %s" + +#: rhodecode/controllers/admin/repos.py:177 +#, python-format +msgid "error occurred during creation of repository %s" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:264 +#, python-format +msgid "Cannot delete %s it still contains attached forks" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:293 +msgid "An error occurred during deletion of repository user" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:312 +msgid "An error occurred during deletion of repository users groups" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:329 +msgid "An error occurred during deletion of repository stats" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:345 +msgid "An error occurred during cache invalidation" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:365 +msgid "Updated repository visibility in public journal" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:369 +msgid "An error occurred during setting this repository in public journal" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:374 rhodecode/model/forms.py:54 +msgid "Token mismatch" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:387 +msgid "Pulled from remote location" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:389 +msgid "An error occurred during pull from remote location" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:405 +msgid "Nothing" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:407 +#, fuzzy, python-format +#| msgid "created repository %s from %s" +msgid "Marked repo %s as fork of %s" +msgstr "新版本库 %s 基于 %s 建立。" + +#: rhodecode/controllers/admin/repos.py:411 +#, fuzzy +#| msgid "An error occurred during this search operation" +msgid "An error occurred during this operation" +msgstr "在搜索操作中发生异常" + +#: rhodecode/controllers/admin/repos_groups.py:119 +#, python-format +msgid "created repos group %s" +msgstr "建立版本库组 %s" + +#: rhodecode/controllers/admin/repos_groups.py:132 +#, python-format +msgid "error occurred during creation of repos group %s" +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:166 +#, python-format +msgid "updated repos group %s" +msgstr "更新版本库组 %s" + +#: rhodecode/controllers/admin/repos_groups.py:179 +#, python-format +msgid "error occurred during update of repos group %s" +msgstr "" + +#: 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:205 +#, python-format +msgid "removed repos group %s" +msgstr "移除版本库组 %s" + +#: rhodecode/controllers/admin/repos_groups.py:210 +msgid "Cannot delete this group it still contains subgroups" +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:215 +#: rhodecode/controllers/admin/repos_groups.py:220 +#, python-format +msgid "error occurred during deletion of repos group %s" +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:240 +#, fuzzy +#| msgid "An error occurred during this search operation" +msgid "An error occurred during deletion of group user" +msgstr "在搜索操作中发生异常" + +#: rhodecode/controllers/admin/repos_groups.py:260 +msgid "An error occurred during deletion of group users groups" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:120 +#, python-format +msgid "Repositories successfully rescanned added: %s,removed: %s" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:129 +msgid "Whoosh reindex task scheduled" +msgstr "Whoosh 重新索引任务调度" + +#: rhodecode/controllers/admin/settings.py:154 +msgid "Updated application settings" +msgstr "更新应用设置" + +#: rhodecode/controllers/admin/settings.py:159 +#: rhodecode/controllers/admin/settings.py:226 +msgid "error occurred during updating application settings" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:221 +msgid "Updated mercurial settings" +msgstr "更新 mercurial 设置" + +#: rhodecode/controllers/admin/settings.py:246 +msgid "Added new hook" +msgstr "新增钩子" + +#: rhodecode/controllers/admin/settings.py:258 +msgid "Updated hooks" +msgstr "更新钩子" + +#: rhodecode/controllers/admin/settings.py:262 +msgid "error occurred during hook creation" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:281 +msgid "Email task created" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:336 +msgid "You can't edit this user since it's crucial for entire application" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:365 +msgid "Your account was updated successfully" +msgstr "你的帐号已经更新完成" + +#: rhodecode/controllers/admin/settings.py:384 +#: rhodecode/controllers/admin/users.py:132 +#, python-format +msgid "error occurred during update of user %s" +msgstr "" + +#: rhodecode/controllers/admin/users.py:79 +#, python-format +msgid "created user %s" +msgstr "创建用户 %s" + +#: rhodecode/controllers/admin/users.py:92 +#, python-format +msgid "error occurred during creation of user %s" +msgstr "" + +#: rhodecode/controllers/admin/users.py:118 +msgid "User updated successfully" +msgstr "用户更新成功" + +#: rhodecode/controllers/admin/users.py:149 +msgid "successfully deleted user" +msgstr "用户删除成功" + +#: rhodecode/controllers/admin/users.py:154 +msgid "An error occurred during deletion of user" +msgstr "" + +#: rhodecode/controllers/admin/users.py:169 +msgid "You can't edit this user" +msgstr "无法编辑该用户" + +#: rhodecode/controllers/admin/users.py:199 +#: rhodecode/controllers/admin/users_groups.py:215 +msgid "Granted 'repository create' permission to user" +msgstr "" + +#: rhodecode/controllers/admin/users.py:208 +#: rhodecode/controllers/admin/users_groups.py:225 +msgid "Revoked 'repository create' permission to user" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:79 +#, python-format +msgid "created users group %s" +msgstr "建立用户组 %s" + +#: rhodecode/controllers/admin/users_groups.py:92 +#, python-format +msgid "error occurred during creation of users group %s" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:128 +#, python-format +msgid "updated users group %s" +msgstr "更新用户组 %s" + +#: rhodecode/controllers/admin/users_groups.py:148 +#, python-format +msgid "error occurred during update of users group %s" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:165 +msgid "successfully deleted users group" +msgstr "删除用户组成功" + +#: rhodecode/controllers/admin/users_groups.py:170 +msgid "An error occurred during deletion of users group" +msgstr "" + +#: rhodecode/lib/auth.py:497 +msgid "You need to be a registered user to perform this action" +msgstr "必须是注册用户才能进行此操作" + +#: rhodecode/lib/auth.py:538 +msgid "You need to be a signed in to view this page" +msgstr "必须登录才能访问该页面" + +#: rhodecode/lib/diffs.py:78 +#, fuzzy +#| msgid "Changeset is to big and was cut off, see raw changeset instead" +msgid "Changeset was to big and was cut off, use diff menu to display this diff" +msgstr "变更集因过大而被截断，可查看原始变更集作为替代" + +#: rhodecode/lib/diffs.py:88 +#, fuzzy +#| msgid "No changesets yet" +msgid "No changes detected" +msgstr "尚无修订" + +#: rhodecode/lib/helpers.py:414 +msgid "True" +msgstr "" + +#: rhodecode/lib/helpers.py:418 +msgid "False" +msgstr "" + +#: rhodecode/lib/helpers.py:462 +#, fuzzy +#| msgid "changeset" +msgid "Changeset not found" +msgstr "修改" + +#: rhodecode/lib/helpers.py:485 +#, python-format +msgid "Show all combined changesets %s->%s" +msgstr "" + +#: rhodecode/lib/helpers.py:491 +msgid "compare view" +msgstr "" + +#: rhodecode/lib/helpers.py:511 +msgid "and" +msgstr "" + +#: rhodecode/lib/helpers.py:512 +#, python-format +msgid "%s more" +msgstr "" + +#: rhodecode/lib/helpers.py:513 rhodecode/templates/changelog/changelog.html:40 +msgid "revisions" +msgstr "修订" + +#: rhodecode/lib/helpers.py:536 +msgid "fork name " +msgstr "分支名称" + +#: rhodecode/lib/helpers.py:539 +msgid "[deleted] repository" +msgstr "" + +#: rhodecode/lib/helpers.py:540 rhodecode/lib/helpers.py:545 +msgid "[created] repository" +msgstr "" + +#: rhodecode/lib/helpers.py:541 +#, fuzzy, python-format +#| msgid "created repository %s" +msgid "[created] repository as fork" +msgstr "建立版本库 %s" + +#: rhodecode/lib/helpers.py:542 rhodecode/lib/helpers.py:546 +msgid "[forked] repository" +msgstr "" + +#: rhodecode/lib/helpers.py:543 rhodecode/lib/helpers.py:547 +msgid "[updated] repository" +msgstr "" + +#: rhodecode/lib/helpers.py:544 +msgid "[delete] repository" +msgstr "" + +#: rhodecode/lib/helpers.py:548 +msgid "[pushed] into" +msgstr "" + +#: rhodecode/lib/helpers.py:549 +msgid "[committed via RhodeCode] into" +msgstr "" + +#: rhodecode/lib/helpers.py:550 +msgid "[pulled from remote] into" +msgstr "" + +#: rhodecode/lib/helpers.py:551 +msgid "[pulled] from" +msgstr "" + +#: rhodecode/lib/helpers.py:552 +msgid "[started following] repository" +msgstr "" + +#: rhodecode/lib/helpers.py:553 +msgid "[stopped following] repository" +msgstr "" + +#: rhodecode/lib/helpers.py:731 +#, python-format +msgid " and %s more" +msgstr "" + +#: rhodecode/lib/helpers.py:735 +msgid "No Files" +msgstr "没有文件" + +#: rhodecode/lib/utils2.py:335 +#, fuzzy, python-format +#| msgid "year" +msgid "%d year" +msgid_plural "%d years" +msgstr[0] "年" + +#: rhodecode/lib/utils2.py:336 +#, fuzzy, python-format +#| msgid "month" +msgid "%d month" +msgid_plural "%d months" +msgstr[0] "月" + +#: rhodecode/lib/utils2.py:337 +#, fuzzy, python-format +#| msgid "day" +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "日" + +#: rhodecode/lib/utils2.py:338 +#, fuzzy, python-format +#| msgid "hour" +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "时" + +#: rhodecode/lib/utils2.py:339 +#, fuzzy, python-format +#| msgid "minute" +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "分" + +#: rhodecode/lib/utils2.py:340 +#, fuzzy, python-format +#| msgid "second" +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "秒" + +#: rhodecode/lib/utils2.py:355 +#, fuzzy, python-format +#| msgid "ago" +msgid "%s ago" +msgstr "之前" + +#: rhodecode/lib/utils2.py:357 +#, python-format +msgid "%s and %s ago" +msgstr "" + +#: rhodecode/lib/utils2.py:360 +msgid "just now" +msgstr "现在" + +#: rhodecode/lib/celerylib/tasks.py:269 +#, fuzzy +#| msgid "Your password reset link was sent" +msgid "password reset link" +msgstr "密码重置链接已经发送" + +#: rhodecode/model/comment.py:85 +#, python-format +msgid "on line %s" +msgstr "" + +#: rhodecode/model/comment.py:113 +msgid "[Mention]" +msgstr "" + +#: rhodecode/model/forms.py:72 +msgid "Invalid username" +msgstr "非法的用户名" + +#: rhodecode/model/forms.py:80 +msgid "This username already exists" +msgstr "该用户名已经存在" + +#: rhodecode/model/forms.py:85 +msgid "" +"Username may only contain alphanumeric characters underscores, periods or" +" dashes and must begin with alphanumeric character" +msgstr "只能使用字母、数字、下划线、小数点或减号作为用户名，且必须由数字或字母开头" + +#: rhodecode/model/forms.py:101 +msgid "Invalid group name" +msgstr "非法的用户组名称" + +#: rhodecode/model/forms.py:111 +msgid "This users group already exists" +msgstr "该用户组名称已经存在" + +#: rhodecode/model/forms.py:117 +#, fuzzy +#| msgid "" "Group name may only contain alphanumeric characters underscores, +#| periods " "or dashes and must begin with alphanumeric character" +msgid "" +"RepoGroup name may only contain alphanumeric characters underscores, " +"periods or dashes and must begin with alphanumeric character" +msgstr "只能使用字母、数字、下划线、小数点或减号作为用户组名，且必须由数字或字母开头" + +#: rhodecode/model/forms.py:145 +msgid "Cannot assign this group as parent" +msgstr "" + +#: rhodecode/model/forms.py:164 +msgid "This group already exists" +msgstr "该组已经存在" + +#: rhodecode/model/forms.py:176 +#, fuzzy +#| msgid "This repository already exists" +msgid "Repository with this name already exists" +msgstr "这个版本库已经存在" + +#: rhodecode/model/forms.py:195 rhodecode/model/forms.py:204 +#: rhodecode/model/forms.py:213 +msgid "Invalid characters in password" +msgstr "密码含有无效字符" + +#: rhodecode/model/forms.py:226 +msgid "Passwords do not match" +msgstr "密码不符" + +#: rhodecode/model/forms.py:232 +msgid "invalid password" +msgstr "无效密码" + +#: rhodecode/model/forms.py:233 +msgid "invalid user name" +msgstr "无效用户名" + +#: rhodecode/model/forms.py:234 +msgid "Your account is disabled" +msgstr "该帐号已被禁用" + +#: rhodecode/model/forms.py:274 +msgid "This username is not valid" +msgstr "该用户名不合法" + +#: rhodecode/model/forms.py:287 +msgid "This repository name is disallowed" +msgstr "该版本库名称被禁用" + +#: rhodecode/model/forms.py:310 +#, fuzzy, python-format +#| msgid "This repository already exists in group \"%s\"" +msgid "This repository already exists in a group \"%s\"" +msgstr "组中已经存在该版本库" + +#: rhodecode/model/forms.py:317 +#, python-format +msgid "There is a group with this name already \"%s\"" +msgstr "" + +#: rhodecode/model/forms.py:324 +msgid "This repository already exists" +msgstr "这个版本库已经存在" + +#: rhodecode/model/forms.py:367 +msgid "invalid clone url" +msgstr "无效的 clone 地址" + +#: rhodecode/model/forms.py:384 +msgid "Invalid clone url, provide a valid clone http\\s url" +msgstr "" + +#: rhodecode/model/forms.py:398 +msgid "Fork have to be the same type as original" +msgstr "分支必须使用相同的版本库类型" + +#: rhodecode/model/forms.py:414 +msgid "This username or users group name is not valid" +msgstr "用户或用户组名称无效" + +#: rhodecode/model/forms.py:480 +msgid "This is not a valid path" +msgstr "不是一个合法的路径" + +#: rhodecode/model/forms.py:494 +msgid "This e-mail address is already taken" +msgstr "该邮件地址已被使用" + +#: rhodecode/model/forms.py:507 +msgid "This e-mail address doesn't exist." +msgstr "该邮件地址不存在" + +#: rhodecode/model/forms.py:530 +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/forms.py:549 +msgid "Please enter a login" +msgstr "请登录" + +#: rhodecode/model/forms.py:550 +#, python-format +msgid "Enter a value %(min)i characters long or more" +msgstr "" + +#: rhodecode/model/forms.py:558 +msgid "Please enter a password" +msgstr "请输入密码" + +#: rhodecode/model/forms.py:559 +#, python-format +msgid "Enter %(min)i characters or more" +msgstr "" + +#: rhodecode/model/notification.py:175 +msgid "commented on commit" +msgstr "" + +#: rhodecode/model/notification.py:176 +#, fuzzy +#| msgid "commit message" +msgid "sent message" +msgstr "提交信息" + +#: rhodecode/model/notification.py:177 +msgid "mentioned you" +msgstr "" + +#: rhodecode/model/notification.py:178 +#, fuzzy +#| msgid "You have successfully registered into rhodecode" +msgid "registered in RhodeCode" +msgstr "成功注册到 rhodecode" + +#: rhodecode/model/user.py:235 +#, fuzzy +#| msgid "[RhodeCode] New User registration" +msgid "new user registration" +msgstr "[RhodeCode] 新用户注册" + +#: rhodecode/model/user.py:259 rhodecode/model/user.py:279 +msgid "You can't Edit this user since it's crucial for entire application" +msgstr "由于是系统帐号，无法编辑该用户" + +#: rhodecode/model/user.py:300 +msgid "You can't remove this user since it's crucial for entire application" +msgstr "由于是系统帐号，无法删除该用户" + +#: rhodecode/model/user.py:306 +#, fuzzy, python-format +#| msgid "" "This user still owns %s repositories and cannot be removed. Switch +#| owners" " or remove those repositories" +msgid "" +"user \"%s\" still owns %s repositories and cannot be removed. Switch " +"owners or remove those repositories. %s" +msgstr "由于该用户拥有版本库 %s 因而无法删除，请变更版本库所有者或删除版本库" + +#: rhodecode/templates/index.html:3 +msgid "Dashboard" +msgstr "" + +#: rhodecode/templates/index_base.html:6 +#: rhodecode/templates/admin/users/user_edit_my_account.html:115 +#: rhodecode/templates/bookmarks/bookmarks.html:10 +#: rhodecode/templates/branches/branches.html:9 +#: rhodecode/templates/journal/journal.html:31 +#: rhodecode/templates/tags/tags.html:10 +msgid "quick filter..." +msgstr "快速过滤..." + +#: rhodecode/templates/index_base.html:6 rhodecode/templates/base/base.html:218 +msgid "repositories" +msgstr "个版本库" + +#: rhodecode/templates/index_base.html:13 +#: rhodecode/templates/index_base.html:15 +#: rhodecode/templates/admin/repos/repos.html:22 +msgid "ADD REPOSITORY" +msgstr "新增版本库" + +#: 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 "组名" + +#: rhodecode/templates/index_base.html:30 +#: rhodecode/templates/index_base.html:67 +#: rhodecode/templates/index_base.html:132 +#: rhodecode/templates/index_base.html:158 +#: rhodecode/templates/admin/repos/repo_add_base.html:47 +#: rhodecode/templates/admin/repos/repo_edit.html:66 +#: rhodecode/templates/admin/repos/repos.html:37 +#: rhodecode/templates/admin/repos/repos.html:84 +#: 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:49 +#: rhodecode/templates/settings/repo_settings.html:57 +#: rhodecode/templates/summary/summary.html:100 +msgid "Description" +msgstr "描述" + +#: rhodecode/templates/index_base.html:40 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46 +msgid "Repositories group" +msgstr "版本库组" + +#: rhodecode/templates/index_base.html:66 +#: rhodecode/templates/index_base.html:156 +#: rhodecode/templates/admin/repos/repo_add_base.html:9 +#: rhodecode/templates/admin/repos/repo_edit.html:32 +#: rhodecode/templates/admin/repos/repos.html:36 +#: rhodecode/templates/admin/repos/repos.html:82 +#: rhodecode/templates/admin/users/user_edit_my_account.html:133 +#: rhodecode/templates/admin/users/user_edit_my_account.html:183 +#: rhodecode/templates/admin/users/user_edit_my_account.html:249 +#: rhodecode/templates/admin/users/user_edit_my_account.html:284 +#: rhodecode/templates/bookmarks/bookmarks.html:36 +#: rhodecode/templates/bookmarks/bookmarks_data.html:6 +#: rhodecode/templates/branches/branches.html:36 +#: rhodecode/templates/files/files_browser.html:47 +#: rhodecode/templates/journal/journal.html:50 +#: rhodecode/templates/journal/journal.html:98 +#: rhodecode/templates/journal/journal.html:177 +#: rhodecode/templates/settings/repo_settings.html:31 +#: rhodecode/templates/summary/summary.html:38 +#: rhodecode/templates/summary/summary.html:114 +#: rhodecode/templates/tags/tags.html:36 +#: rhodecode/templates/tags/tags_data.html:6 +msgid "Name" +msgstr "名称" + +#: rhodecode/templates/index_base.html:68 +#: rhodecode/templates/admin/repos/repos.html:38 +msgid "Last change" +msgstr "最后修改" + +#: rhodecode/templates/index_base.html:69 +#: rhodecode/templates/index_base.html:161 +#: rhodecode/templates/admin/repos/repos.html:39 +#: rhodecode/templates/admin/repos/repos.html:87 +#: rhodecode/templates/admin/users/user_edit_my_account.html:251 +#: rhodecode/templates/journal/journal.html:179 +msgid "Tip" +msgstr "" + +#: rhodecode/templates/index_base.html:70 +#: rhodecode/templates/index_base.html:163 +#: rhodecode/templates/admin/repos/repo_edit.html:103 +#: rhodecode/templates/admin/repos/repos.html:89 +msgid "Owner" +msgstr "所有者" + +#: rhodecode/templates/index_base.html:71 +#: rhodecode/templates/journal/public_journal.html:20 +#: rhodecode/templates/summary/summary.html:43 +#: rhodecode/templates/summary/summary.html:46 +msgid "RSS" +msgstr "" + +#: rhodecode/templates/index_base.html:72 +#: rhodecode/templates/journal/public_journal.html:23 +msgid "Atom" +msgstr "" + +#: rhodecode/templates/index_base.html:102 +#: rhodecode/templates/index_base.html:104 +#, python-format +msgid "Subscribe to %s rss feed" +msgstr "订阅 rss %s" + +#: rhodecode/templates/index_base.html:109 +#: rhodecode/templates/index_base.html:111 +#, python-format +msgid "Subscribe to %s atom feed" +msgstr "订阅 atom %s" + +#: rhodecode/templates/index_base.html:130 +#, fuzzy +#| msgid "group name" +msgid "Group Name" +msgstr "组名" + +#: rhodecode/templates/index_base.html:148 +#: rhodecode/templates/index_base.html:188 +#: rhodecode/templates/admin/repos/repos.html:112 +#: rhodecode/templates/admin/users/user_edit_my_account.html:270 +#: rhodecode/templates/bookmarks/bookmarks.html:60 +#: rhodecode/templates/branches/branches.html:60 +#: rhodecode/templates/journal/journal.html:202 +#: rhodecode/templates/tags/tags.html:60 +msgid "Click to sort ascending" +msgstr "" + +#: rhodecode/templates/index_base.html:149 +#: rhodecode/templates/index_base.html:189 +#: rhodecode/templates/admin/repos/repos.html:113 +#: rhodecode/templates/admin/users/user_edit_my_account.html:271 +#: rhodecode/templates/bookmarks/bookmarks.html:61 +#: rhodecode/templates/branches/branches.html:61 +#: rhodecode/templates/journal/journal.html:203 +#: rhodecode/templates/tags/tags.html:61 +msgid "Click to sort descending" +msgstr "" + +#: rhodecode/templates/index_base.html:159 +#: rhodecode/templates/admin/repos/repos.html:85 +#, fuzzy +#| msgid "Last change" +msgid "Last Change" +msgstr "最后修改" + +#: rhodecode/templates/index_base.html:190 +#: rhodecode/templates/admin/repos/repos.html:114 +#: rhodecode/templates/admin/users/user_edit_my_account.html:272 +#: rhodecode/templates/bookmarks/bookmarks.html:62 +#: rhodecode/templates/branches/branches.html:62 +#: rhodecode/templates/journal/journal.html:204 +#: rhodecode/templates/tags/tags.html:62 +msgid "No records found." +msgstr "" + +#: rhodecode/templates/index_base.html:191 +#: rhodecode/templates/admin/repos/repos.html:115 +#: rhodecode/templates/admin/users/user_edit_my_account.html:273 +#: rhodecode/templates/bookmarks/bookmarks.html:63 +#: rhodecode/templates/branches/branches.html:63 +#: rhodecode/templates/journal/journal.html:205 +#: rhodecode/templates/tags/tags.html:63 +msgid "Data error." +msgstr "" + +#: rhodecode/templates/index_base.html:192 +#: rhodecode/templates/admin/repos/repos.html:116 +#: rhodecode/templates/admin/users/user_edit_my_account.html:274 +#: rhodecode/templates/bookmarks/bookmarks.html:64 +#: rhodecode/templates/branches/branches.html:64 +#: rhodecode/templates/journal/journal.html:206 +#: rhodecode/templates/tags/tags.html:64 +#, fuzzy +#| msgid "Loading file list..." +msgid "Loading..." +msgstr "加载文件列表..." + +#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:54 +msgid "Sign In" +msgstr "登录" + +#: rhodecode/templates/login.html:21 +msgid "Sign In to" +msgstr "登录到" + +#: rhodecode/templates/login.html:31 rhodecode/templates/register.html:20 +#: rhodecode/templates/admin/admin_log.html:5 +#: rhodecode/templates/admin/users/user_add.html:32 +#: rhodecode/templates/admin/users/user_edit.html:50 +#: rhodecode/templates/admin/users/user_edit_my_account.html:49 +#: rhodecode/templates/base/base.html:83 +#: rhodecode/templates/summary/summary.html:113 +msgid "Username" +msgstr "帐号" + +#: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29 +#: rhodecode/templates/admin/ldap/ldap.html:46 +#: rhodecode/templates/admin/users/user_add.html:41 +#: rhodecode/templates/base/base.html:92 +msgid "Password" +msgstr "密码" + +#: rhodecode/templates/login.html:50 +#, fuzzy +#| msgid "member" +msgid "Remember me" +msgstr "成员" + +#: rhodecode/templates/login.html:60 +msgid "Forgot your password ?" +msgstr "忘记了密码？" + +#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:103 +msgid "Don't have an account ?" +msgstr "还没有帐号？" + +#: rhodecode/templates/password_reset.html:5 +msgid "Reset your password" +msgstr "重置密码" + +#: rhodecode/templates/password_reset.html:11 +msgid "Reset your password to" +msgstr "重置密码" + +#: rhodecode/templates/password_reset.html:21 +msgid "Email address" +msgstr "邮件地址" + +#: rhodecode/templates/password_reset.html:30 +msgid "Reset my password" +msgstr "重置密码" + +#: rhodecode/templates/password_reset.html:31 +msgid "Password reset link will be send to matching email address" +msgstr "密码重置地址已经发送到邮件" + +#: rhodecode/templates/register.html:5 rhodecode/templates/register.html:74 +msgid "Sign Up" +msgstr "注册" + +#: rhodecode/templates/register.html:11 +msgid "Sign Up to" +msgstr "注册" + +#: rhodecode/templates/register.html:38 +msgid "Re-enter password" +msgstr "确认密码" + +#: 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.html:76 +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_my_account.html:85 +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_my_account.html:94 +#: rhodecode/templates/summary/summary.html:115 +msgid "Email" +msgstr "电子邮件" + +#: rhodecode/templates/register.html:76 +msgid "Your account will be activated right after registration" +msgstr "注册后，帐号将启用" + +#: rhodecode/templates/register.html:78 +msgid "Your account must wait for activation by administrator" +msgstr "管理员审核后，你注册的帐号将被启用" + +#: rhodecode/templates/repo_switcher_list.html:11 +#: rhodecode/templates/admin/repos/repo_add_base.html:56 +#: rhodecode/templates/admin/repos/repo_edit.html:76 +#: rhodecode/templates/settings/repo_settings.html:67 +msgid "Private repository" +msgstr "私有版本库" + +#: rhodecode/templates/repo_switcher_list.html:16 +msgid "Public repository" +msgstr "公共版本库" + +#: rhodecode/templates/switch_to_list.html:3 +#: rhodecode/templates/branches/branches.html:14 +msgid "branches" +msgstr "分支" + +#: rhodecode/templates/switch_to_list.html:10 +#: rhodecode/templates/branches/branches_data.html:51 +msgid "There are no branches yet" +msgstr "没有任何分支" + +#: rhodecode/templates/switch_to_list.html:15 +#: rhodecode/templates/shortlog/shortlog_data.html:10 +#: rhodecode/templates/tags/tags.html:15 +msgid "tags" +msgstr "标签" + +#: rhodecode/templates/switch_to_list.html:22 +#: rhodecode/templates/tags/tags_data.html:33 +msgid "There are no tags yet" +msgstr "没有任何标签" + +#: rhodecode/templates/switch_to_list.html:28 +#: rhodecode/templates/bookmarks/bookmarks.html:15 +msgid "bookmarks" +msgstr "" + +#: rhodecode/templates/switch_to_list.html:35 +#: rhodecode/templates/bookmarks/bookmarks_data.html:32 +#, fuzzy +#| msgid "There are no forks yet" +msgid "There are no bookmarks yet" +msgstr "尚未有任何分支" + +#: rhodecode/templates/admin/admin.html:5 +#: rhodecode/templates/admin/admin.html:9 +msgid "Admin journal" +msgstr "管理员日志" + +#: rhodecode/templates/admin/admin_log.html:6 +#: rhodecode/templates/admin/repos/repos.html:41 +#: rhodecode/templates/admin/repos/repos.html:90 +#: rhodecode/templates/admin/users/user_edit_my_account.html:135 +#: rhodecode/templates/admin/users/user_edit_my_account.html:136 +#: rhodecode/templates/journal/journal.html:52 +#: rhodecode/templates/journal/journal.html:53 +msgid "Action" +msgstr "操作" + +#: rhodecode/templates/admin/admin_log.html:7 +msgid "Repository" +msgstr "版本库" + +#: 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:37 +#: rhodecode/templates/tags/tags.html:37 +#: rhodecode/templates/tags/tags_data.html:7 +msgid "Date" +msgstr "日期" + +#: rhodecode/templates/admin/admin_log.html:9 +msgid "From IP" +msgstr "来源 IP" + +#: rhodecode/templates/admin/admin_log.html:52 +msgid "No actions yet" +msgstr "尚无操作" + +#: rhodecode/templates/admin/ldap/ldap.html:5 +msgid "LDAP administration" +msgstr "LDAP 管理员" + +#: rhodecode/templates/admin/ldap/ldap.html:11 +msgid "Ldap" +msgstr "" + +#: rhodecode/templates/admin/ldap/ldap.html:28 +msgid "Connection settings" +msgstr "连接设置" + +#: rhodecode/templates/admin/ldap/ldap.html:30 +msgid "Enable LDAP" +msgstr "启用 LDAP" + +#: rhodecode/templates/admin/ldap/ldap.html:34 +msgid "Host" +msgstr "主机" + +#: rhodecode/templates/admin/ldap/ldap.html:38 +msgid "Port" +msgstr "端口" + +#: rhodecode/templates/admin/ldap/ldap.html:42 +msgid "Account" +msgstr "帐号" + +#: rhodecode/templates/admin/ldap/ldap.html:50 +msgid "Connection security" +msgstr "连接安全" + +#: rhodecode/templates/admin/ldap/ldap.html:54 +msgid "Certificate Checks" +msgstr "凭证确认" + +#: rhodecode/templates/admin/ldap/ldap.html:57 +msgid "Search settings" +msgstr "搜索设置" + +#: rhodecode/templates/admin/ldap/ldap.html:59 +msgid "Base DN" +msgstr "" + +#: rhodecode/templates/admin/ldap/ldap.html:63 +msgid "LDAP Filter" +msgstr "" + +#: rhodecode/templates/admin/ldap/ldap.html:67 +msgid "LDAP Search Scope" +msgstr "" + +#: rhodecode/templates/admin/ldap/ldap.html:70 +msgid "Attribute mappings" +msgstr "属性映射" + +#: rhodecode/templates/admin/ldap/ldap.html:72 +msgid "Login Attribute" +msgstr "登录属性" + +#: rhodecode/templates/admin/ldap/ldap.html:76 +msgid "First Name Attribute" +msgstr "名" + +#: rhodecode/templates/admin/ldap/ldap.html:80 +msgid "Last Name Attribute" +msgstr "姓" + +#: rhodecode/templates/admin/ldap/ldap.html:84 +msgid "E-mail Attribute" +msgstr "电子邮件属性" + +#: rhodecode/templates/admin/ldap/ldap.html:89 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66 +#: rhodecode/templates/admin/settings/hooks.html:73 +#: rhodecode/templates/admin/users/user_edit.html:129 +#: rhodecode/templates/admin/users/user_edit.html:154 +#: rhodecode/templates/admin/users/user_edit_my_account.html:102 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:115 +#: rhodecode/templates/settings/repo_settings.html:84 +msgid "Save" +msgstr "保存" + +#: rhodecode/templates/admin/notifications/notifications.html:5 +#: rhodecode/templates/admin/notifications/notifications.html:9 +msgid "My Notifications" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications.html:29 +msgid "Mark all read" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_data.html:38 +#, fuzzy +#| msgid "No actions yet" +msgid "No notifications here yet" +msgstr "尚无操作" + +#: rhodecode/templates/admin/notifications/show_notification.html:5 +#: rhodecode/templates/admin/notifications/show_notification.html:11 +#, fuzzy +#| msgid "show annotation" +msgid "Show notification" +msgstr "显示注释" + +#: rhodecode/templates/admin/notifications/show_notification.html:9 +#, fuzzy +#| msgid "Location" +msgid "Notifications" +msgstr "位置" + +#: rhodecode/templates/admin/permissions/permissions.html:5 +msgid "Permissions administration" +msgstr "权限管理" + +#: rhodecode/templates/admin/permissions/permissions.html:11 +#: rhodecode/templates/admin/repos/repo_edit.html:116 +#: 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:77 +msgid "Permissions" +msgstr "权限" + +#: rhodecode/templates/admin/permissions/permissions.html:24 +msgid "Default permissions" +msgstr "默认权限" + +#: rhodecode/templates/admin/permissions/permissions.html:31 +msgid "Anonymous access" +msgstr "匿名访问" + +#: rhodecode/templates/admin/permissions/permissions.html:41 +msgid "Repository permission" +msgstr "版本库权限" + +#: 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 "" + +#: rhodecode/templates/admin/permissions/permissions.html:50 +msgid "overwrite existing settings" +msgstr "覆盖已有设置" + +#: rhodecode/templates/admin/permissions/permissions.html:55 +msgid "Registration" +msgstr "注册" + +#: rhodecode/templates/admin/permissions/permissions.html:63 +msgid "Repository creation" +msgstr "建立版本库" + +#: rhodecode/templates/admin/permissions/permissions.html:71 +#: rhodecode/templates/admin/repos/repo_edit.html:218 +msgid "set" +msgstr "设置" + +#: rhodecode/templates/admin/repos/repo_add.html:5 +#: rhodecode/templates/admin/repos/repo_add_create_repository.html:5 +msgid "Add repository" +msgstr "添加版本库" + +#: rhodecode/templates/admin/repos/repo_add.html:11 +#: rhodecode/templates/admin/repos/repo_edit.html:11 +#: rhodecode/templates/admin/repos/repos.html:10 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 +msgid "Repositories" +msgstr "版本库" + +#: rhodecode/templates/admin/repos/repo_add_base.html:20 +#: rhodecode/templates/summary/summary.html:90 +#: rhodecode/templates/summary/summary.html:91 +msgid "Clone from" +msgstr "clone 自" + +#: rhodecode/templates/admin/repos/repo_add_base.html:24 +#: rhodecode/templates/admin/repos/repo_edit.html:44 +#: rhodecode/templates/settings/repo_settings.html:43 +msgid "Optional http[s] url from which repository should be cloned." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_add_base.html:29 +#: rhodecode/templates/admin/repos/repo_edit.html:49 +#: rhodecode/templates/admin/repos_groups/repos_groups.html:4 +#: rhodecode/templates/forks/fork.html:41 +#: rhodecode/templates/settings/repo_settings.html:48 +msgid "Repository group" +msgstr "版本库组" + +#: rhodecode/templates/admin/repos/repo_add_base.html:33 +#: 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 "" + +#: rhodecode/templates/admin/repos/repo_add_base.html:38 +#: rhodecode/templates/admin/repos/repo_edit.html:58 +msgid "Type" +msgstr "类型" + +#: rhodecode/templates/admin/repos/repo_add_base.html:42 +#, fuzzy +#| msgid "Repository creation" +msgid "Type of repository to create." +msgstr "建立版本库" + +#: rhodecode/templates/admin/repos/repo_add_base.html:51 +#: rhodecode/templates/admin/repos/repo_edit.html:70 +#: rhodecode/templates/settings/repo_settings.html:61 +msgid "Keep it short and to the point. Use a README file for longer descriptions." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_add_base.html:60 +#: rhodecode/templates/admin/repos/repo_edit.html:80 +#: rhodecode/templates/settings/repo_settings.html:71 +msgid "" +"Private repositories are only visible to people explicitly added as " +"collaborators." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_add_base.html:64 +msgid "add" +msgstr "新增" + +#: rhodecode/templates/admin/repos/repo_add_create_repository.html:9 +msgid "add new repository" +msgstr "新增版本库" + +#: rhodecode/templates/admin/repos/repo_edit.html:5 +msgid "Edit repository" +msgstr "编辑版本库" + +#: rhodecode/templates/admin/repos/repo_edit.html:13 +#: rhodecode/templates/admin/users/user_edit.html:13 +#: rhodecode/templates/admin/users/user_edit_my_account.html:155 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:13 +#: rhodecode/templates/files/files_source.html:32 +#: rhodecode/templates/journal/journal.html:72 +msgid "edit" +msgstr "编辑" + +#: rhodecode/templates/admin/repos/repo_edit.html:40 +#: rhodecode/templates/settings/repo_settings.html:39 +msgid "Clone uri" +msgstr "clone 地址" + +#: rhodecode/templates/admin/repos/repo_edit.html:85 +msgid "Enable statistics" +msgstr "启用统计" + +#: rhodecode/templates/admin/repos/repo_edit.html:89 +msgid "Enable statistics window on summary page." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:94 +msgid "Enable downloads" +msgstr "启用下载" + +#: rhodecode/templates/admin/repos/repo_edit.html:98 +msgid "Enable download menu on summary page." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:108 +#, fuzzy, python-format +#| msgid "Changes on %s repository" +msgid "Change owner of this repository." +msgstr "%s 库的修改" + +#: rhodecode/templates/admin/repos/repo_edit.html:134 +msgid "Administration" +msgstr "管理" + +#: rhodecode/templates/admin/repos/repo_edit.html:137 +msgid "Statistics" +msgstr "统计" + +#: rhodecode/templates/admin/repos/repo_edit.html:141 +msgid "Reset current statistics" +msgstr "重置统计" + +#: rhodecode/templates/admin/repos/repo_edit.html:141 +msgid "Confirm to remove current statistics" +msgstr "确认移除当前统计" + +#: rhodecode/templates/admin/repos/repo_edit.html:144 +msgid "Fetched to rev" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:145 +msgid "Stats gathered" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:153 +msgid "Remote" +msgstr "远程" + +#: rhodecode/templates/admin/repos/repo_edit.html:157 +msgid "Pull changes from remote location" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:157 +msgid "Confirm to pull changes from remote side" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:168 +msgid "Cache" +msgstr "缓存" + +#: rhodecode/templates/admin/repos/repo_edit.html:172 +msgid "Invalidate repository cache" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:172 +msgid "Confirm to invalidate repository cache" +msgstr "确认清除版本库缓存" + +#: rhodecode/templates/admin/repos/repo_edit.html:183 +msgid "Remove from public journal" +msgstr "从公共日志删除" + +#: rhodecode/templates/admin/repos/repo_edit.html:185 +msgid "Add to public journal" +msgstr "添加到公共日志" + +#: rhodecode/templates/admin/repos/repo_edit.html:190 +msgid "" +"All actions made on this repository will be accessible to everyone in " +"public journal" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:197 +#: rhodecode/templates/changeset/changeset_file_comment.html:19 +msgid "Delete" +msgstr "删除" + +#: rhodecode/templates/admin/repos/repo_edit.html:201 +msgid "Remove this repository" +msgstr "删除版本库" + +#: rhodecode/templates/admin/repos/repo_edit.html:201 +msgid "Confirm to delete this repository" +msgstr "确认删除版本库" + +#: rhodecode/templates/admin/repos/repo_edit.html:205 +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 "" + +#: rhodecode/templates/admin/repos/repo_edit.html:213 +msgid "Set as fork" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:222 +msgid "Manually set this repository as a fork of another" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_perms.html:3 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3 +msgid "none" +msgstr "无" + +#: rhodecode/templates/admin/repos/repo_edit_perms.html:4 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:4 +msgid "read" +msgstr "读" + +#: rhodecode/templates/admin/repos/repo_edit_perms.html:5 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:5 +msgid "write" +msgstr "写" + +#: rhodecode/templates/admin/repos/repo_edit_perms.html:6 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6 +#: rhodecode/templates/admin/users/users.html:38 +#: rhodecode/templates/base/base.html:214 +msgid "admin" +msgstr "管理员" + +#: rhodecode/templates/admin/repos/repo_edit_perms.html:7 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:7 +msgid "member" +msgstr "成员" + +#: rhodecode/templates/admin/repos/repo_edit_perms.html:16 +#: rhodecode/templates/data_table/_dt_elements.html:61 +#: rhodecode/templates/journal/journal.html:123 +#: rhodecode/templates/summary/summary.html:71 +msgid "private repository" +msgstr "私有版本库" + +#: rhodecode/templates/admin/repos/repo_edit_perms.html:33 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:53 +#: 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 "" + +#: rhodecode/templates/admin/repos/repo_edit_perms.html:75 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:64 +msgid "Add another member" +msgstr "添加成员" + +#: rhodecode/templates/admin/repos/repo_edit_perms.html:89 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:78 +msgid "Failed to remove user" +msgstr "删除用户失败" + +#: rhodecode/templates/admin/repos/repo_edit_perms.html:104 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:93 +msgid "Failed to remove users group" +msgstr "删除用户组失败" + +#: rhodecode/templates/admin/repos/repo_edit_perms.html:123 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:112 +msgid "Group" +msgstr "组" + +#: rhodecode/templates/admin/repos/repo_edit_perms.html:124 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:113 +#: rhodecode/templates/admin/users_groups/users_groups.html:33 +msgid "members" +msgstr "成员" + +#: rhodecode/templates/admin/repos/repos.html:5 +msgid "Repositories administration" +msgstr "版本库管理员" + +#: rhodecode/templates/admin/repos/repos.html:40 +#: rhodecode/templates/summary/summary.html:107 +msgid "Contact" +msgstr "联系方式" + +#: rhodecode/templates/admin/repos/repos.html:68 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 +#: rhodecode/templates/admin/users/users.html:55 +#: rhodecode/templates/admin/users_groups/users_groups.html:44 +msgid "delete" +msgstr "删除" + +#: rhodecode/templates/admin/repos/repos.html:68 +#: rhodecode/templates/admin/users/user_edit_my_account.html:158 +#, fuzzy, python-format +#| msgid "Confirm to delete this repository" +msgid "Confirm to delete this repository: %s" +msgstr "确认删除版本库" + +#: rhodecode/templates/admin/repos_groups/repos_groups.html:8 +msgid "Groups" +msgstr "组" + +#: rhodecode/templates/admin/repos_groups/repos_groups.html:12 +msgid "with" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5 +msgid "Add repos group" +msgstr "添加版本库组" + +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:10 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:10 +msgid "Repos groups" +msgstr "版本库组" + +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:12 +msgid "add new repos group" +msgstr "添加新版本库组" + +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:50 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:50 +msgid "Group parent" +msgstr "上级组" + +#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:58 +#: rhodecode/templates/admin/users/user_add.html:94 +#: rhodecode/templates/admin/users_groups/users_group_add.html:49 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:90 +msgid "save" +msgstr "保存" + +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:5 +msgid "Edit repos group" +msgstr "编辑版本库组" + +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:12 +msgid "edit repos group" +msgstr "编辑版本库组" + +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:67 +#: rhodecode/templates/admin/settings/settings.html:112 +#: rhodecode/templates/admin/settings/settings.html:177 +#: rhodecode/templates/admin/users/user_edit.html:130 +#: rhodecode/templates/admin/users/user_edit.html:155 +#: rhodecode/templates/admin/users/user_edit_my_account.html:103 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:116 +#: rhodecode/templates/files/files_add.html:82 +#: rhodecode/templates/files/files_edit.html:68 +#: rhodecode/templates/settings/repo_settings.html:85 +msgid "Reset" +msgstr "重置" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5 +msgid "Repositories groups administration" +msgstr "版本库管理员" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:22 +msgid "ADD NEW GROUP" +msgstr "添加组" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:35 +#, fuzzy +#| msgid "Number of repositories" +msgid "Number of toplevel repositories" +msgstr "版本库数量" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36 +#: rhodecode/templates/admin/users/users.html:40 +#: rhodecode/templates/admin/users_groups/users_groups.html:35 +msgid "action" +msgstr "操作" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 +#, fuzzy, python-format +#| msgid "Confirm to delete this group" +msgid "Confirm to delete this group: %s" +msgstr "确认删除该组" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:62 +msgid "There are no repositories groups yet" +msgstr "没有版本库组" + +#: rhodecode/templates/admin/settings/hooks.html:5 +#: rhodecode/templates/admin/settings/settings.html:5 +msgid "Settings administration" +msgstr "设置管理员" + +#: rhodecode/templates/admin/settings/hooks.html:9 +#: rhodecode/templates/admin/settings/settings.html:9 +#: rhodecode/templates/settings/repo_settings.html:5 +#: rhodecode/templates/settings/repo_settings.html:13 +msgid "Settings" +msgstr "设置" + +#: rhodecode/templates/admin/settings/hooks.html:24 +msgid "Built in hooks - read only" +msgstr "内建钩子 - 只读" + +#: rhodecode/templates/admin/settings/hooks.html:40 +msgid "Custom hooks" +msgstr "自定义钩子" + +#: rhodecode/templates/admin/settings/hooks.html:56 +msgid "remove" +msgstr "删除" + +#: rhodecode/templates/admin/settings/hooks.html:88 +msgid "Failed to remove hook" +msgstr "移除钩子失败" + +#: rhodecode/templates/admin/settings/settings.html:24 +msgid "Remap and rescan repositories" +msgstr "重新扫描并映射版本库" + +#: rhodecode/templates/admin/settings/settings.html:32 +msgid "rescan option" +msgstr "重新扫描选项" + +#: 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 "如果版本库已经从文件系统删除，但数据库仍然有遗留信息，请勾选该项进行清理" + +#: rhodecode/templates/admin/settings/settings.html:39 +msgid "destroy old data" +msgstr "清理旧数据" + +#: rhodecode/templates/admin/settings/settings.html:45 +msgid "Rescan repositories" +msgstr "重新扫描版本库" + +#: rhodecode/templates/admin/settings/settings.html:51 +msgid "Whoosh indexing" +msgstr "Whoosh 索引" + +#: rhodecode/templates/admin/settings/settings.html:59 +msgid "index build option" +msgstr "构建索引选项" + +#: rhodecode/templates/admin/settings/settings.html:64 +msgid "build from scratch" +msgstr "重新建立" + +#: rhodecode/templates/admin/settings/settings.html:70 +msgid "Reindex" +msgstr "重新索引" + +#: rhodecode/templates/admin/settings/settings.html:76 +msgid "Global application settings" +msgstr "全局设置" + +#: rhodecode/templates/admin/settings/settings.html:85 +msgid "Application name" +msgstr "应用名称" + +#: rhodecode/templates/admin/settings/settings.html:94 +msgid "Realm text" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:103 +msgid "GA code" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:111 +#: rhodecode/templates/admin/settings/settings.html:176 +msgid "Save settings" +msgstr "保存设置" + +#: rhodecode/templates/admin/settings/settings.html:118 +msgid "Mercurial settings" +msgstr "Mercurial 设置" + +#: rhodecode/templates/admin/settings/settings.html:127 +msgid "Web" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:132 +msgid "require ssl for pushing" +msgstr "使用 SSL 推送" + +#: rhodecode/templates/admin/settings/settings.html:139 +msgid "Hooks" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:144 +msgid "Update repository after push (hg update)" +msgstr "推送后更新版本库（hg update）" + +#: rhodecode/templates/admin/settings/settings.html:148 +msgid "Show repository size after push" +msgstr "推送后显示版本库大小" + +#: rhodecode/templates/admin/settings/settings.html:152 +msgid "Log user push commands" +msgstr "记录用户推送命令" + +#: rhodecode/templates/admin/settings/settings.html:156 +msgid "Log user pull commands" +msgstr "记录用户拉取命令" + +#: rhodecode/templates/admin/settings/settings.html:160 +msgid "advanced setup" +msgstr "高级设置" + +#: rhodecode/templates/admin/settings/settings.html:165 +msgid "Repositories location" +msgstr "版本库路径" + +#: rhodecode/templates/admin/settings/settings.html:170 +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:171 +msgid "unlock" +msgstr "解锁" + +#: rhodecode/templates/admin/settings/settings.html:191 +msgid "Test Email" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:199 +#, fuzzy +#| msgid "Email" +msgid "Email to" +msgstr "电子邮件" + +#: rhodecode/templates/admin/settings/settings.html:207 +#, fuzzy +#| msgid "second" +msgid "Send" +msgstr "秒" + +#: rhodecode/templates/admin/settings/settings.html:213 +msgid "System Info and Packages" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:216 +#, fuzzy +#| msgid "Show" +msgid "show" +msgstr "显示" + +#: rhodecode/templates/admin/users/user_add.html:5 +msgid "Add user" +msgstr "添加用户" + +#: rhodecode/templates/admin/users/user_add.html:10 +#: rhodecode/templates/admin/users/user_edit.html:11 +#: rhodecode/templates/admin/users/users.html:9 +msgid "Users" +msgstr "用户" + +#: rhodecode/templates/admin/users/user_add.html:12 +msgid "add new user" +msgstr "添加新用户" + +#: rhodecode/templates/admin/users/user_add.html:50 +#, fuzzy +#| msgid "Passwords do not match" +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 "编辑用户" + +#: rhodecode/templates/admin/users/user_edit.html:34 +#: rhodecode/templates/admin/users/user_edit_my_account.html:33 +msgid "Change your avatar at" +msgstr "修改你的头像" + +#: rhodecode/templates/admin/users/user_edit.html:35 +#: rhodecode/templates/admin/users/user_edit_my_account.html:34 +msgid "Using" +msgstr "使用中" + +#: rhodecode/templates/admin/users/user_edit.html:43 +#: rhodecode/templates/admin/users/user_edit_my_account.html:43 +msgid "API key" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.html:59 +msgid "LDAP DN" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.html:68 +#: rhodecode/templates/admin/users/user_edit_my_account.html:58 +msgid "New password" +msgstr "新密码" + +#: rhodecode/templates/admin/users/user_edit.html:77 +#: rhodecode/templates/admin/users/user_edit_my_account.html:67 +msgid "New password confirmation" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.html:147 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:108 +msgid "Create repositories" +msgstr "创建版本库" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:5 +#: rhodecode/templates/base/base.html:124 +msgid "My account" +msgstr "我的账户" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:9 +msgid "My Account" +msgstr "我的账户" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:116 +#: rhodecode/templates/journal/journal.html:32 +#, fuzzy +#| msgid "Empty repository" +msgid "My repos" +msgstr "空版本库" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:116 +#, fuzzy +#| msgid "permissions" +msgid "My permissions" +msgstr "权限" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:121 +#: rhodecode/templates/journal/journal.html:37 +#, fuzzy +#| msgid "add" +msgid "ADD" +msgstr "新增" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:134 +#: rhodecode/templates/bookmarks/bookmarks.html:40 +#: rhodecode/templates/bookmarks/bookmarks_data.html:9 +#: rhodecode/templates/branches/branches.html:40 +#: rhodecode/templates/journal/journal.html:51 +#: rhodecode/templates/tags/tags.html:40 +#: rhodecode/templates/tags/tags_data.html:9 +msgid "Revision" +msgstr "修订" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:155 +#: rhodecode/templates/journal/journal.html:72 +msgid "private" +msgstr "私有" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:165 +#: rhodecode/templates/journal/journal.html:85 +msgid "No repositories yet" +msgstr "没有任何版本库" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:167 +#: rhodecode/templates/journal/journal.html:87 +msgid "create one now" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:184 +#: rhodecode/templates/admin/users/user_edit_my_account.html:285 +#, fuzzy +#| msgid "permissions" +msgid "Permission" +msgstr "权限" + +#: rhodecode/templates/admin/users/users.html:5 +msgid "Users administration" +msgstr "用户管理员" + +#: rhodecode/templates/admin/users/users.html:23 +msgid "ADD NEW USER" +msgstr "添加用户" + +#: rhodecode/templates/admin/users/users.html:33 +msgid "username" +msgstr "用户名" + +#: rhodecode/templates/admin/users/users.html:34 +#: rhodecode/templates/branches/branches_data.html:6 +msgid "name" +msgstr "名称" + +#: rhodecode/templates/admin/users/users.html:35 +msgid "lastname" +msgstr "姓" + +#: rhodecode/templates/admin/users/users.html:36 +msgid "last login" +msgstr "最后登录" + +#: rhodecode/templates/admin/users/users.html:37 +#: rhodecode/templates/admin/users_groups/users_groups.html:34 +msgid "active" +msgstr "启用" + +#: rhodecode/templates/admin/users/users.html:39 +#: rhodecode/templates/base/base.html:223 +msgid "ldap" +msgstr "" + +#: rhodecode/templates/admin/users/users.html:56 +#, fuzzy, python-format +#| msgid "Confirm to delete this user" +msgid "Confirm to delete this user: %s" +msgstr "确认删除该用户" + +#: rhodecode/templates/admin/users_groups/users_group_add.html:5 +msgid "Add users group" +msgstr "添加用户组" + +#: rhodecode/templates/admin/users_groups/users_group_add.html:10 +#: rhodecode/templates/admin/users_groups/users_groups.html:9 +msgid "Users groups" +msgstr "用户组" + +#: rhodecode/templates/admin/users_groups/users_group_add.html:12 +msgid "add new users group" +msgstr "添加新用户组" + +#: rhodecode/templates/admin/users_groups/users_group_edit.html:5 +msgid "Edit users group" +msgstr "编辑用户组" + +#: rhodecode/templates/admin/users_groups/users_group_edit.html:11 +msgid "UsersGroups" +msgstr "用户组" + +#: rhodecode/templates/admin/users_groups/users_group_edit.html:50 +msgid "Members" +msgstr "成员" + +#: rhodecode/templates/admin/users_groups/users_group_edit.html:58 +msgid "Choosen group members" +msgstr "选择组成员" + +#: rhodecode/templates/admin/users_groups/users_group_edit.html:61 +msgid "Remove all elements" +msgstr "移除全部项目" + +#: rhodecode/templates/admin/users_groups/users_group_edit.html:75 +msgid "Available members" +msgstr "启用成员" + +#: rhodecode/templates/admin/users_groups/users_group_edit.html:79 +msgid "Add all elements" +msgstr "添加全部项目" + +#: rhodecode/templates/admin/users_groups/users_group_edit.html:126 +#, fuzzy +#| msgid "Choosen group members" +msgid "Group members" +msgstr "选择组成员" + +#: rhodecode/templates/admin/users_groups/users_groups.html:5 +msgid "Users groups administration" +msgstr "用户组管理" + +#: rhodecode/templates/admin/users_groups/users_groups.html:23 +msgid "ADD NEW USER GROUP" +msgstr "添加新用户组" + +#: rhodecode/templates/admin/users_groups/users_groups.html:32 +msgid "group name" +msgstr "组名" + +#: rhodecode/templates/admin/users_groups/users_groups.html:45 +#, fuzzy, python-format +#| msgid "Confirm to delete this group" +msgid "Confirm to delete this users group: %s" +msgstr "确认删除该组" + +#: rhodecode/templates/base/base.html:41 +msgid "Submit a bug" +msgstr "提交 bug" + +#: rhodecode/templates/base/base.html:77 +msgid "Login to your account" +msgstr "" + +#: rhodecode/templates/base/base.html:100 +msgid "Forgot password ?" +msgstr "忘记密码？" + +#: rhodecode/templates/base/base.html:107 +#, fuzzy +#| msgid "Login" +msgid "Log In" +msgstr "登录" + +#: rhodecode/templates/base/base.html:118 +msgid "Inbox" +msgstr "" + +#: rhodecode/templates/base/base.html:122 +#: rhodecode/templates/base/base.html:289 +#: rhodecode/templates/base/base.html:291 +#: rhodecode/templates/base/base.html:293 +msgid "Home" +msgstr "首页" + +#: rhodecode/templates/base/base.html:123 +#: rhodecode/templates/base/base.html:298 +#: rhodecode/templates/base/base.html:300 +#: rhodecode/templates/base/base.html:302 +#: rhodecode/templates/journal/journal.html:4 +#: rhodecode/templates/journal/journal.html:17 +#: rhodecode/templates/journal/public_journal.html:4 +msgid "Journal" +msgstr "日志" + +#: rhodecode/templates/base/base.html:125 +msgid "Log Out" +msgstr "退出" + +#: rhodecode/templates/base/base.html:144 +msgid "Switch repository" +msgstr "切换版本库" + +#: rhodecode/templates/base/base.html:146 +msgid "Products" +msgstr "" + +#: rhodecode/templates/base/base.html:152 +#: rhodecode/templates/base/base.html:182 +msgid "loading..." +msgstr "" + +#: 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:9 +#: rhodecode/templates/data_table/_dt_elements.html:11 +#: rhodecode/templates/data_table/_dt_elements.html:13 +#: rhodecode/templates/summary/summary.html:4 +msgid "Summary" +msgstr "概况" + +#: rhodecode/templates/base/base.html:166 +#: rhodecode/templates/base/base.html:168 +#: rhodecode/templates/base/base.html:170 +#: rhodecode/templates/changelog/changelog.html:6 +#: rhodecode/templates/changelog/changelog.html:15 +#: rhodecode/templates/data_table/_dt_elements.html:17 +#: rhodecode/templates/data_table/_dt_elements.html:19 +#: rhodecode/templates/data_table/_dt_elements.html:21 +msgid "Changelog" +msgstr "修改记录" + +#: rhodecode/templates/base/base.html:175 +#: rhodecode/templates/base/base.html:177 +#: rhodecode/templates/base/base.html:179 +msgid "Switch to" +msgstr "切换到" + +#: 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:25 +#: rhodecode/templates/data_table/_dt_elements.html:27 +#: rhodecode/templates/data_table/_dt_elements.html:29 +#: rhodecode/templates/files/files.html:4 +#: rhodecode/templates/files/files.html:40 +msgid "Files" +msgstr "档案" + +#: rhodecode/templates/base/base.html:195 +#: rhodecode/templates/base/base.html:199 +msgid "Options" +msgstr "选项" + +#: rhodecode/templates/base/base.html:204 +#: rhodecode/templates/base/base.html:206 +#: rhodecode/templates/base/base.html:224 +msgid "settings" +msgstr "设置" + +#: rhodecode/templates/base/base.html:209 +#: rhodecode/templates/data_table/_dt_elements.html:74 +#: rhodecode/templates/forks/fork.html:13 +msgid "fork" +msgstr "" + +#: rhodecode/templates/base/base.html:210 +msgid "search" +msgstr "搜索" + +#: rhodecode/templates/base/base.html:217 +msgid "journal" +msgstr "日志" + +#: rhodecode/templates/base/base.html:219 +msgid "repositories groups" +msgstr "版本库组" + +#: rhodecode/templates/base/base.html:220 +msgid "users" +msgstr "用户" + +#: rhodecode/templates/base/base.html:221 +msgid "users groups" +msgstr "用户组" + +#: rhodecode/templates/base/base.html:222 +msgid "permissions" +msgstr "权限" + +#: rhodecode/templates/base/base.html:235 +#: rhodecode/templates/base/base.html:237 +#: rhodecode/templates/followers/followers.html:5 +msgid "Followers" +msgstr "跟随者" + +#: rhodecode/templates/base/base.html:243 +#: rhodecode/templates/base/base.html:245 +#: rhodecode/templates/forks/forks.html:5 +msgid "Forks" +msgstr "" + +#: rhodecode/templates/base/base.html:316 +#: rhodecode/templates/base/base.html:318 +#: rhodecode/templates/base/base.html:320 +#: rhodecode/templates/search/search.html:4 +#: rhodecode/templates/search/search.html:24 +#: rhodecode/templates/search/search.html:46 +msgid "Search" +msgstr "搜索" + +#: rhodecode/templates/base/root.html:53 +#, fuzzy +#| msgid "Add another member" +msgid "add another comment" +msgstr "添加成员" + +#: rhodecode/templates/base/root.html:54 +#: rhodecode/templates/journal/journal.html:111 +#: rhodecode/templates/summary/summary.html:52 +msgid "Stop following this repository" +msgstr "停止跟随该版本库" + +#: rhodecode/templates/base/root.html:55 +#: rhodecode/templates/summary/summary.html:56 +msgid "Start following this repository" +msgstr "开始跟随该版本库" + +#: rhodecode/templates/bookmarks/bookmarks.html:5 +msgid "Bookmarks" +msgstr "" + +#: rhodecode/templates/bookmarks/bookmarks.html:39 +#: rhodecode/templates/bookmarks/bookmarks_data.html:8 +#: rhodecode/templates/branches/branches.html:39 +#: rhodecode/templates/tags/tags.html:39 +#: rhodecode/templates/tags/tags_data.html:8 +#, fuzzy +#| msgid "author" +msgid "Author" +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/changelog/changelog.html:15 +#, python-format +msgid "showing %d out of %d revision" +msgid_plural "showing %d out of %d revisions" +msgstr[0] "" + +#: rhodecode/templates/changelog/changelog.html:38 +msgid "Show" +msgstr "显示" + +#: rhodecode/templates/changelog/changelog.html:64 +#: rhodecode/templates/summary/summary.html:352 +msgid "show more" +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:68 +msgid "Affected number of files, click to show more details" +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:82 +#: rhodecode/templates/changeset/changeset.html:72 +msgid "Parent" +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:88 +#: rhodecode/templates/changeset/changeset.html:78 +msgid "No parents" +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:93 +#: rhodecode/templates/changeset/changeset.html:82 +msgid "merge" +msgstr "合并" + +#: rhodecode/templates/changelog/changelog.html:96 +#: rhodecode/templates/changeset/changeset.html:85 +#: rhodecode/templates/files/files.html:29 +#: rhodecode/templates/files/files_add.html:33 +#: rhodecode/templates/files/files_edit.html:33 +#: rhodecode/templates/shortlog/shortlog_data.html:9 +msgid "branch" +msgstr "分支" + +#: rhodecode/templates/changelog/changelog.html:102 +msgid "bookmark" +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:108 +#: rhodecode/templates/changeset/changeset.html:90 +msgid "tag" +msgstr "标签" + +#: rhodecode/templates/changelog/changelog.html:144 +msgid "Show selected changes __S -> __E" +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:235 +msgid "There are no changes yet" +msgstr "没有任何变更" + +#: rhodecode/templates/changelog/changelog_details.html:2 +#: rhodecode/templates/changeset/changeset.html:60 +msgid "removed" +msgstr "移除" + +#: rhodecode/templates/changelog/changelog_details.html:3 +#: rhodecode/templates/changeset/changeset.html:61 +msgid "changed" +msgstr "修改" + +#: rhodecode/templates/changelog/changelog_details.html:4 +#: rhodecode/templates/changeset/changeset.html:62 +msgid "added" +msgstr "添加" + +#: rhodecode/templates/changelog/changelog_details.html:6 +#: rhodecode/templates/changelog/changelog_details.html:7 +#: rhodecode/templates/changelog/changelog_details.html:8 +#: rhodecode/templates/changeset/changeset.html:64 +#: rhodecode/templates/changeset/changeset.html:65 +#: rhodecode/templates/changeset/changeset.html:66 +#, python-format +msgid "affected %s files" +msgstr "" + +#: rhodecode/templates/changeset/changeset.html:6 +#: rhodecode/templates/changeset/changeset.html:14 +msgid "Changeset" +msgstr "" + +#: rhodecode/templates/changeset/changeset.html:37 +#: rhodecode/templates/changeset/diff_block.html:20 +msgid "raw diff" +msgstr "原始 diff" + +#: rhodecode/templates/changeset/changeset.html:38 +#: rhodecode/templates/changeset/diff_block.html:21 +msgid "download diff" +msgstr "下载 diff" + +#: rhodecode/templates/changeset/changeset.html:42 +#: rhodecode/templates/changeset/changeset_file_comment.html:69 +#, fuzzy, python-format +#| msgid "commit" +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "提交" + +#: rhodecode/templates/changeset/changeset.html:42 +#: rhodecode/templates/changeset/changeset_file_comment.html:69 +#, python-format +msgid "(%d inline)" +msgid_plural "(%d inline)" +msgstr[0] "" + +#: rhodecode/templates/changeset/changeset.html:97 +#, python-format +msgid "%s files affected with %s insertions and %s deletions:" +msgstr "" + +#: rhodecode/templates/changeset/changeset.html:113 +msgid "Changeset was too big and was cut off..." +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:35 +msgid "Submitting..." +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:38 +msgid "Commenting on line {1}." +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:39 +#: rhodecode/templates/changeset/changeset_file_comment.html:100 +#, python-format +msgid "Comments parsed using %s syntax with %s support." +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:41 +#: rhodecode/templates/changeset/changeset_file_comment.html:102 +msgid "Use @username inside this text to send notification to this RhodeCode user" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:47 +#: rhodecode/templates/changeset/changeset_file_comment.html:107 +#, fuzzy +#| msgid "commit" +msgid "Comment" +msgstr "提交" + +#: rhodecode/templates/changeset/changeset_file_comment.html:48 +#: rhodecode/templates/changeset/changeset_file_comment.html:59 +msgid "Hide" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:55 +#, fuzzy +#| msgid "You need to be a signed in to view this page" +msgid "You need to be logged in to comment." +msgstr "必须登录才能访问该页面" + +#: rhodecode/templates/changeset/changeset_file_comment.html:55 +msgid "Login now" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:97 +msgid "Leave a comment" +msgstr "" + +#: rhodecode/templates/changeset/changeset_range.html:29 +msgid "Compare View" +msgstr "比较显示" + +#: rhodecode/templates/changeset/changeset_range.html:49 +msgid "Files affected" +msgstr "" + +#: rhodecode/templates/changeset/diff_block.html:19 +msgid "diff" +msgstr "" + +#: rhodecode/templates/changeset/diff_block.html:27 +#, fuzzy +#| msgid "File contents" +msgid "show inline comments" +msgstr "文件内容" + +#: rhodecode/templates/data_table/_dt_elements.html:33 +#: rhodecode/templates/data_table/_dt_elements.html:35 +#: rhodecode/templates/data_table/_dt_elements.html:37 +#: rhodecode/templates/forks/fork.html:5 +msgid "Fork" +msgstr "分支" + +#: rhodecode/templates/data_table/_dt_elements.html:54 +#: rhodecode/templates/journal/journal.html:117 +#: rhodecode/templates/summary/summary.html:63 +msgid "Mercurial repository" +msgstr "Mercurial 版本库" + +#: rhodecode/templates/data_table/_dt_elements.html:56 +#: rhodecode/templates/journal/journal.html:119 +#: rhodecode/templates/summary/summary.html:66 +msgid "Git repository" +msgstr "Git 版本库" + +#: rhodecode/templates/data_table/_dt_elements.html:63 +#: rhodecode/templates/journal/journal.html:125 +#: rhodecode/templates/summary/summary.html:73 +msgid "public repository" +msgstr "公共版本库" + +#: rhodecode/templates/data_table/_dt_elements.html:74 +#: rhodecode/templates/summary/summary.html:82 +#: rhodecode/templates/summary/summary.html:83 +msgid "Fork of" +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.html:86 +msgid "No changesets yet" +msgstr "尚无修订" + +#: rhodecode/templates/email_templates/main.html:8 +msgid "This is an notification from RhodeCode." +msgstr "" + +#: rhodecode/templates/errors/error_document.html:44 +#, python-format +msgid "You will be redirected to %s in %s seconds" +msgstr "" + +#: rhodecode/templates/files/file_diff.html:4 +#: rhodecode/templates/files/file_diff.html:12 +msgid "File diff" +msgstr "文件 diff" + +#: rhodecode/templates/files/files.html:12 +#: rhodecode/templates/summary/summary.html:328 +msgid "files" +msgstr "文件" + +#: rhodecode/templates/files/files.html:44 +msgid "search truncated" +msgstr "" + +#: rhodecode/templates/files/files.html:45 +msgid "no matching files" +msgstr "没有符合的文件" + +#: rhodecode/templates/files/files_add.html:4 +#: rhodecode/templates/files/files_edit.html:4 +msgid "Edit file" +msgstr "编辑文件" + +#: rhodecode/templates/files/files_add.html:19 +#, fuzzy +#| msgid "edit file" +msgid "add file" +msgstr "编辑文件" + +#: rhodecode/templates/files/files_add.html:40 +#, fuzzy +#| msgid "add new user" +msgid "Add new file" +msgstr "添加新用户" + +#: rhodecode/templates/files/files_add.html:45 +#, fuzzy +#| msgid "File names" +msgid "File Name" +msgstr "文件名" + +#: rhodecode/templates/files/files_add.html:49 +#: rhodecode/templates/files/files_add.html:58 +#, fuzzy +#| msgid "hour" +msgid "or" +msgstr "时" + +#: rhodecode/templates/files/files_add.html:49 +#: rhodecode/templates/files/files_add.html:54 +#, fuzzy +#| msgid "edit file" +msgid "Upload file" +msgstr "编辑文件" + +#: rhodecode/templates/files/files_add.html:58 +#, fuzzy, python-format +#| msgid "created user %s" +msgid "Create new file" +msgstr "创建用户 %s" + +#: rhodecode/templates/files/files_add.html:63 +#: rhodecode/templates/files/files_edit.html:39 +#: rhodecode/templates/files/files_ypjax.html:3 +msgid "Location" +msgstr "位置" + +#: rhodecode/templates/files/files_add.html:67 +msgid "use / to separate directories" +msgstr "" + +#: 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 "提交信息" + +#: rhodecode/templates/files/files_add.html:81 +#: rhodecode/templates/files/files_edit.html:67 +msgid "Commit changes" +msgstr "提交修改" + +#: rhodecode/templates/files/files_browser.html:13 +msgid "view" +msgstr "显示" + +#: rhodecode/templates/files/files_browser.html:14 +msgid "previous revision" +msgstr "上一个修订" + +#: rhodecode/templates/files/files_browser.html:16 +msgid "next revision" +msgstr "下一个修订" + +#: rhodecode/templates/files/files_browser.html:23 +msgid "follow current branch" +msgstr "" + +#: rhodecode/templates/files/files_browser.html:27 +msgid "search file list" +msgstr "搜索文件列表" + +#: rhodecode/templates/files/files_browser.html:31 +#: rhodecode/templates/shortlog/shortlog_data.html:65 +#, fuzzy +#| msgid "add new user" +msgid "add new file" +msgstr "添加新用户" + +#: rhodecode/templates/files/files_browser.html:35 +msgid "Loading file list..." +msgstr "加载文件列表..." + +#: rhodecode/templates/files/files_browser.html:48 +msgid "Size" +msgstr "大小" + +#: rhodecode/templates/files/files_browser.html:49 +msgid "Mimetype" +msgstr "" + +#: rhodecode/templates/files/files_browser.html:50 +#, fuzzy +#| msgid "next revision" +msgid "Last Revision" +msgstr "下一个修订" + +#: rhodecode/templates/files/files_browser.html:51 +msgid "Last modified" +msgstr "最后修改" + +#: rhodecode/templates/files/files_browser.html:52 +msgid "Last commiter" +msgstr "最后提交" + +#: rhodecode/templates/files/files_edit.html:19 +msgid "edit file" +msgstr "编辑文件" + +#: rhodecode/templates/files/files_edit.html:49 +#: rhodecode/templates/files/files_source.html:26 +msgid "show annotation" +msgstr "显示注释" + +#: rhodecode/templates/files/files_edit.html:50 +#: rhodecode/templates/files/files_source.html:28 +#: rhodecode/templates/files/files_source.html:56 +msgid "show as raw" +msgstr "显示原始文件" + +#: rhodecode/templates/files/files_edit.html:51 +#: rhodecode/templates/files/files_source.html:29 +msgid "download as raw" +msgstr "下载原始文件" + +#: rhodecode/templates/files/files_edit.html:54 +#, fuzzy +#| msgid "show source" +msgid "source" +msgstr "显示代码" + +#: rhodecode/templates/files/files_edit.html:59 +#, fuzzy +#| msgid "edit file" +msgid "Editing file" +msgstr "编辑文件" + +#: rhodecode/templates/files/files_source.html:2 +msgid "History" +msgstr "历史" + +#: rhodecode/templates/files/files_source.html:24 +msgid "show source" +msgstr "显示代码" + +#: rhodecode/templates/files/files_source.html:47 +#, python-format +msgid "Binary file (%s)" +msgstr "二进制文件（%s）" + +#: rhodecode/templates/files/files_source.html:56 +msgid "File is too big to display" +msgstr "文件过大，不能显示" + +#: rhodecode/templates/files/files_source.html:112 +msgid "Selection link" +msgstr "" + +#: rhodecode/templates/files/files_ypjax.html:5 +#, fuzzy +#| msgid "show annotation" +msgid "annotation" +msgstr "显示注释" + +#: rhodecode/templates/files/files_ypjax.html:15 +msgid "Go back" +msgstr "" + +#: rhodecode/templates/files/files_ypjax.html:16 +msgid "No files at given path" +msgstr "" + +#: rhodecode/templates/followers/followers.html:13 +msgid "followers" +msgstr "跟随者" + +#: rhodecode/templates/followers/followers_data.html:12 +msgid "Started following" +msgstr "开始跟随" + +#: rhodecode/templates/forks/fork.html:31 +msgid "Fork name" +msgstr "分支名" + +#: rhodecode/templates/forks/fork.html:57 +msgid "Private" +msgstr "私有" + +#: rhodecode/templates/forks/fork.html:65 +#, fuzzy +#| msgid "permissions" +msgid "Copy permissions" +msgstr "权限" + +#: rhodecode/templates/forks/fork.html:73 +msgid "Update after clone" +msgstr "" + +#: rhodecode/templates/forks/fork.html:80 +msgid "fork this repository" +msgstr "对该版本库建立分支" + +#: rhodecode/templates/forks/forks.html:13 +msgid "forks" +msgstr "分支" + +#: rhodecode/templates/forks/forks_data.html:17 +msgid "forked" +msgstr "已有分支" + +#: rhodecode/templates/forks/forks_data.html:34 +msgid "There are no forks yet" +msgstr "尚未有任何分支" + +#: rhodecode/templates/journal/journal.html:20 +msgid "Refresh" +msgstr "" + +#: rhodecode/templates/journal/journal.html:32 +#, fuzzy +#| msgid "Cache" +msgid "Watched" +msgstr "缓存" + +#: rhodecode/templates/journal/journal.html:105 +msgid "following user" +msgstr "跟随中用户" + +#: rhodecode/templates/journal/journal.html:105 +msgid "user" +msgstr "用户" + +#: rhodecode/templates/journal/journal.html:138 +msgid "You are not following any users or repositories" +msgstr "尚未跟随任何用户或版本库" + +#: rhodecode/templates/journal/journal_data.html:47 +msgid "No entries yet" +msgstr "" + +#: rhodecode/templates/journal/public_journal.html:17 +msgid "Public Journal" +msgstr "公共日志" + +#: rhodecode/templates/search/search.html:7 +#: rhodecode/templates/search/search.html:26 +msgid "in repository: " +msgstr "在版本库：" + +#: rhodecode/templates/search/search.html:9 +#: rhodecode/templates/search/search.html:28 +msgid "in all repositories" +msgstr "在所有的版本库" + +#: rhodecode/templates/search/search.html:42 +msgid "Search term" +msgstr "搜索短语" + +#: rhodecode/templates/search/search.html:54 +msgid "Search in" +msgstr "搜索范围" + +#: rhodecode/templates/search/search.html:57 +msgid "File contents" +msgstr "文件内容" + +#: rhodecode/templates/search/search.html:59 +msgid "File names" +msgstr "文件名" + +#: rhodecode/templates/search/search_content.html:21 +#: rhodecode/templates/search/search_path.html:15 +msgid "Permission denied" +msgstr "权限不足" + +#: rhodecode/templates/shortlog/shortlog.html:5 +#: rhodecode/templates/summary/summary.html:209 +msgid "Shortlog" +msgstr "简短日志" + +#: rhodecode/templates/shortlog/shortlog.html:14 +msgid "shortlog" +msgstr "简短日志" + +#: rhodecode/templates/shortlog/shortlog_data.html:7 +msgid "age" +msgstr "" + +#: rhodecode/templates/shortlog/shortlog_data.html:18 +#, fuzzy +#| msgid "commit message" +msgid "No commit message" +msgstr "提交信息" + +#: rhodecode/templates/shortlog/shortlog_data.html:62 +msgid "Add or upload files directly via RhodeCode" +msgstr "" + +#: rhodecode/templates/shortlog/shortlog_data.html:71 +msgid "Push new repo" +msgstr "" + +#: rhodecode/templates/shortlog/shortlog_data.html:79 +#, fuzzy +#| msgid "Git repository" +msgid "Existing repository?" +msgstr "Git 版本库" + +#: rhodecode/templates/summary/summary.html:12 +msgid "summary" +msgstr "概要" + +#: rhodecode/templates/summary/summary.html:44 +#: rhodecode/templates/summary/summary.html:47 +#, fuzzy +#| msgid "author" +msgid "ATOM" +msgstr "作者" + +#: rhodecode/templates/summary/summary.html:77 +#, fuzzy, python-format +#| msgid "No changes" +msgid "Non changable ID %s" +msgstr "无变更" + +#: rhodecode/templates/summary/summary.html:82 +msgid "public" +msgstr "公共" + +#: rhodecode/templates/summary/summary.html:90 +msgid "remote clone" +msgstr "远程 clone" + +#: rhodecode/templates/summary/summary.html:121 +msgid "Clone url" +msgstr "clone 地址" + +#: rhodecode/templates/summary/summary.html:124 +msgid "Show by Name" +msgstr "" + +#: rhodecode/templates/summary/summary.html:125 +msgid "Show by ID" +msgstr "" + +#: rhodecode/templates/summary/summary.html:133 +#, fuzzy +#| msgid "edit file" +msgid "Trending files" +msgstr "编辑文件" + +#: rhodecode/templates/summary/summary.html:141 +#: rhodecode/templates/summary/summary.html:157 +#: rhodecode/templates/summary/summary.html:185 +msgid "enable" +msgstr "启用" + +#: rhodecode/templates/summary/summary.html:149 +msgid "Download" +msgstr "下载" + +#: rhodecode/templates/summary/summary.html:153 +msgid "There are no downloads yet" +msgstr "尚无任何下载" + +#: rhodecode/templates/summary/summary.html:155 +msgid "Downloads are disabled for this repository" +msgstr "这个版本库的下载已经禁用" + +#: rhodecode/templates/summary/summary.html:164 +msgid "Check this to download archive with subrepos" +msgstr "" + +#: rhodecode/templates/summary/summary.html:164 +msgid "with subrepos" +msgstr "" + +#: rhodecode/templates/summary/summary.html:177 +msgid "Commit activity by day / author" +msgstr "" + +#: rhodecode/templates/summary/summary.html:188 +msgid "Stats gathered: " +msgstr "" + +#: rhodecode/templates/summary/summary.html:211 +#, fuzzy +#| msgid "quick filter..." +msgid "Quick start" +msgstr "快速过滤..." + +#: rhodecode/templates/summary/summary.html:281 +#, python-format +msgid "Download %s as %s" +msgstr "下载 %s 作为 %s" + +#: rhodecode/templates/summary/summary.html:638 +msgid "commits" +msgstr "提交" + +#: rhodecode/templates/summary/summary.html:639 +msgid "files added" +msgstr "文件已添加" + +#: rhodecode/templates/summary/summary.html:640 +msgid "files changed" +msgstr "文件已更改" + +#: rhodecode/templates/summary/summary.html:641 +msgid "files removed" +msgstr "文件已删除" + +#: rhodecode/templates/summary/summary.html:644 +msgid "commit" +msgstr "提交" + +#: rhodecode/templates/summary/summary.html:645 +msgid "file added" +msgstr "文件已添加" + +#: rhodecode/templates/summary/summary.html:646 +msgid "file changed" +msgstr "文件已更改" + +#: rhodecode/templates/summary/summary.html:647 +msgid "file removed" +msgstr "文件已删除" + +#~ msgid "Diff is to big and was cut off, see raw diff instead" +#~ msgstr "差异比较因过大而被截断，可查看原始差异比较作为替代" + +#~ msgid "Binary file" +#~ msgstr "二进制文件" + +#~ msgid "ADD NEW REPOSITORY" +#~ msgstr "新增版本库" + +#~ msgid "Percentage of stats gathered" +#~ msgstr "" + +#~ msgid "My repositories" +#~ msgstr "我的版本库" + +#~ msgid "links" +#~ msgstr "连接" + +#~ msgid "showing " +#~ msgstr "" + +#~ msgid "out of" +#~ msgstr "" + +#~ msgid "%s files affected with %s additions and %s deletions." +#~ msgstr "" + +#~ msgid "No changes in this file" +#~ msgstr "没有任何修改" + +#~ msgid "Diff is to big to display" +#~ msgstr "" + +#~ msgid "File annotate" +#~ msgstr "文件注释" + +#~ msgid "annotate" +#~ msgstr "注释" + +#~ msgid "Following" +#~ msgstr "跟随中" + +#~ msgid "by" +#~ msgstr "" + +#~ msgid "Trending source files" +#~ msgstr "" + +#~ msgid "Feeds" +#~ msgstr "订阅" + +#~ msgid "Loaded in" +#~ msgstr "" + diff -r b0fef8a77568 -r aa2f0e4382e9 rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po Wed May 23 00:58:37 2012 +0200 +++ b/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po Thu May 24 23:19:17 2012 +0200 @@ -1,4 +1,4 @@ -# Translations template for RhodeCode. +# Chinese (Taiwan) translations for RhodeCode. # Copyright (C) 2011 ORGANIZATION # This file is distributed under the same license as the RhodeCode project. # FIRST AUTHOR , 2011. @@ -7,34 +7,41 @@ msgstr "" "Project-Id-Version: RhodeCode 1.2.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2011-09-14 15:50-0300\n" +"POT-Creation-Date: 2012-05-24 22:18+0200\n" "PO-Revision-Date: 2012-05-09 22:23+0800\n" "Last-Translator: Nansen \n" -"Language-Team: LANGUAGE \n" +"Language-Team: zh_TW \n" +"Plural-Forms: nplurals=1; plural=0\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" -"X-Poedit-Language: Chinese\n" -"X-Poedit-Country: TAIWAN\n" -"X-Poedit-SourceCharset: utf-8\n" - -#: rhodecode/controllers/changeset.py:108 -#: rhodecode/controllers/changeset.py:149 -#: rhodecode/controllers/changeset.py:216 -#: rhodecode/controllers/changeset.py:229 + +#: rhodecode/controllers/changelog.py:96 +#, fuzzy +#| msgid "branches" +msgid "All Branches" +msgstr "分支" + +#: rhodecode/controllers/changeset.py:79 +msgid "show white space" +msgstr "" + +#: rhodecode/controllers/changeset.py:86 rhodecode/controllers/changeset.py:93 +msgid "ignore white space" +msgstr "" + +#: rhodecode/controllers/changeset.py:153 +#, fuzzy, python-format +#| msgid "File contents" +msgid "%s line context" +msgstr "文件內容" + +#: rhodecode/controllers/changeset.py:320 +#: rhodecode/controllers/changeset.py:335 rhodecode/lib/diffs.py:62 msgid "binary file" msgstr "二進位檔" -#: rhodecode/controllers/changeset.py:123 -#: rhodecode/controllers/changeset.py:168 -msgid "Changeset is to big and was cut off, see raw changeset instead" -msgstr "" - -#: rhodecode/controllers/changeset.py:159 -msgid "Diff is to big and was cut off, see raw diff instead" -msgstr "" - #: rhodecode/controllers/error.py:69 msgid "Home page" msgstr "首頁" @@ -56,7 +63,9 @@ msgstr "找不到這個資源" #: rhodecode/controllers/error.py:107 -msgid "The server encountered an unexpected condition which prevented it from fulfilling the request." +msgid "" +"The server encountered an unexpected condition which prevented it from " +"fulfilling the request." msgstr "" #: rhodecode/controllers/feed.py:48 @@ -69,160 +78,192 @@ msgid "%s %s feed" msgstr "" -#: rhodecode/controllers/files.py:72 -msgid "There are no files yet" +#: rhodecode/controllers/files.py:86 +#: rhodecode/templates/admin/repos/repo_add.html:13 +msgid "add new" +msgstr "新增" + +#: rhodecode/controllers/files.py:87 +#, fuzzy, python-format +#| msgid "There are no files yet" +msgid "There are no files yet %s" msgstr "尚未有任何檔案" -#: rhodecode/controllers/files.py:262 +#: rhodecode/controllers/files.py:247 #, python-format msgid "Edited %s via RhodeCode" msgstr "使用 RhodeCode 編輯 %s" -#: rhodecode/controllers/files.py:267 -#: rhodecode/templates/files/file_diff.html:40 +#: rhodecode/controllers/files.py:252 msgid "No changes" msgstr "沒有修改" -#: rhodecode/controllers/files.py:278 +#: rhodecode/controllers/files.py:263 rhodecode/controllers/files.py:316 #, python-format msgid "Successfully committed to %s" msgstr "成功遞交至 %s" -#: rhodecode/controllers/files.py:283 +#: rhodecode/controllers/files.py:268 rhodecode/controllers/files.py:322 msgid "Error occurred during commit" msgstr "" -#: rhodecode/controllers/files.py:308 +#: rhodecode/controllers/files.py:288 +#, fuzzy, python-format +#| msgid "Edited %s via RhodeCode" +msgid "Added %s via RhodeCode" +msgstr "使用 RhodeCode 編輯 %s" + +#: rhodecode/controllers/files.py:302 +#, fuzzy +#| msgid "File contents" +msgid "No content" +msgstr "文件內容" + +#: rhodecode/controllers/files.py:306 +#, fuzzy +#| msgid "File names" +msgid "No filename" +msgstr "檔案名稱" + +#: rhodecode/controllers/files.py:347 msgid "downloads disabled" msgstr "下載已關閉" -#: rhodecode/controllers/files.py:313 +#: rhodecode/controllers/files.py:358 #, python-format msgid "Unknown revision %s" msgstr "未知修訂 %s" -#: rhodecode/controllers/files.py:315 +#: rhodecode/controllers/files.py:360 msgid "Empty repository" msgstr "空的版本庫" -#: rhodecode/controllers/files.py:317 +#: rhodecode/controllers/files.py:362 msgid "Unknown archive type" msgstr "未知的存檔類型" -#: rhodecode/controllers/files.py:385 -#: rhodecode/controllers/files.py:398 -msgid "Binary file" -msgstr "二進位檔" - -#: rhodecode/controllers/files.py:417 -#: rhodecode/templates/changeset/changeset_range.html:4 -#: rhodecode/templates/changeset/changeset_range.html:12 -#: rhodecode/templates/changeset/changeset_range.html:29 +#: rhodecode/controllers/files.py:461 +#: rhodecode/templates/changeset/changeset_range.html:5 +#: rhodecode/templates/changeset/changeset_range.html:13 +#: rhodecode/templates/changeset/changeset_range.html:31 msgid "Changesets" msgstr "變更" -#: rhodecode/controllers/files.py:418 -#: rhodecode/controllers/summary.py:175 +#: rhodecode/controllers/files.py:462 rhodecode/controllers/summary.py:230 #: rhodecode/templates/branches/branches.html:5 -#: rhodecode/templates/summary/summary.html:690 msgid "Branches" msgstr "分支" -#: rhodecode/controllers/files.py:419 -#: rhodecode/controllers/summary.py:176 -#: rhodecode/templates/summary/summary.html:679 +#: rhodecode/controllers/files.py:463 rhodecode/controllers/summary.py:231 #: rhodecode/templates/tags/tags.html:5 msgid "Tags" msgstr "標籤" -#: rhodecode/controllers/journal.py:50 +#: rhodecode/controllers/forks.py:69 rhodecode/controllers/admin/repos.py:86 +#, 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:128 rhodecode/controllers/settings.py:69 +#, 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:163 +#, python-format +msgid "forked %s repository as %s" +msgstr "forked %s 版本庫為 %s" + +#: rhodecode/controllers/forks.py:177 +#, python-format +msgid "An error occurred during repository forking %s" +msgstr "" + +#: rhodecode/controllers/journal.py:53 #, python-format msgid "%s public journal %s feed" msgstr "%s 公開日誌 %s feed" -#: rhodecode/controllers/journal.py:178 -#: rhodecode/controllers/journal.py:212 -#: rhodecode/templates/admin/repos/repo_edit.html:171 -#: rhodecode/templates/base/base.html:50 +#: rhodecode/controllers/journal.py:190 rhodecode/controllers/journal.py:224 +#: rhodecode/templates/admin/repos/repo_edit.html:177 +#: rhodecode/templates/base/base.html:307 +#: rhodecode/templates/base/base.html:309 +#: rhodecode/templates/base/base.html:311 msgid "Public journal" msgstr "公開日誌" -#: rhodecode/controllers/login.py:111 +#: rhodecode/controllers/login.py:116 msgid "You have successfully registered into rhodecode" msgstr "您已經成功註冊rhodecode" -#: rhodecode/controllers/login.py:133 +#: rhodecode/controllers/login.py:137 msgid "Your password reset link was sent" msgstr "您的密碼重設連結已寄出" -#: rhodecode/controllers/login.py:155 -msgid "Your password reset was successful, new password has been sent to your email" +#: rhodecode/controllers/login.py:157 +msgid "" +"Your password reset was successful, new password has been sent to your " +"email" msgstr "您的密碼重設動作已完成，新的密碼已寄至您的信箱" -#: rhodecode/controllers/search.py:109 +#: rhodecode/controllers/search.py:114 msgid "Invalid search query. Try quoting it." msgstr "無效的查詢。請使用跳脫字元" -#: rhodecode/controllers/search.py:114 +#: rhodecode/controllers/search.py:119 msgid "There is no index to search in. Please run whoosh indexer" msgstr "沒有任何索引可以搜尋。請執行 whoosh 建立索引" -#: rhodecode/controllers/search.py:118 +#: rhodecode/controllers/search.py:123 msgid "An error occurred during this search operation" msgstr "" -#: rhodecode/controllers/settings.py:61 -#: rhodecode/controllers/settings.py:171 -#, 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/settings.py:109 -#: rhodecode/controllers/admin/repos.py:239 +#: rhodecode/controllers/settings.py:103 +#: rhodecode/controllers/admin/repos.py:211 #, python-format msgid "Repository %s updated successfully" msgstr "版本庫 %s 更新完成" -#: rhodecode/controllers/settings.py:126 -#: rhodecode/controllers/admin/repos.py:257 +#: rhodecode/controllers/settings.py:121 +#: rhodecode/controllers/admin/repos.py:229 #, python-format msgid "error occurred during update of repository %s" msgstr "" -#: rhodecode/controllers/settings.py:144 -#: rhodecode/controllers/admin/repos.py:275 +#: rhodecode/controllers/settings.py:139 +#: rhodecode/controllers/admin/repos.py:247 #, 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" +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:156 -#: rhodecode/controllers/admin/repos.py:287 +#: rhodecode/controllers/settings.py:151 +#: rhodecode/controllers/admin/repos.py:259 #, python-format msgid "deleted repository %s" msgstr "刪除版本庫 %s" -#: rhodecode/controllers/settings.py:159 -#: rhodecode/controllers/admin/repos.py:297 -#: rhodecode/controllers/admin/repos.py:303 +#: rhodecode/controllers/settings.py:155 +#: rhodecode/controllers/admin/repos.py:269 +#: rhodecode/controllers/admin/repos.py:275 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: rhodecode/controllers/settings.py:193 -#, python-format -msgid "forked %s repository as %s" -msgstr "forked %s 版本庫為 %s" - -#: rhodecode/controllers/settings.py:211 -#, python-format -msgid "An error occurred during repository forking %s" -msgstr "" - -#: rhodecode/controllers/summary.py:123 +#: rhodecode/controllers/summary.py:138 msgid "No data loaded yet" msgstr "" -#: rhodecode/controllers/summary.py:126 +#: rhodecode/controllers/summary.py:142 +#: rhodecode/templates/summary/summary.html:139 msgid "Statistics are disabled for this repository" msgstr "這個版本庫的統計功能已停用" @@ -270,31 +311,31 @@ msgid "START_TLS on LDAP connection" msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:115 +#: rhodecode/controllers/admin/ldap_settings.py:125 msgid "Ldap settings updated successfully" msgstr "LDAP設定更新完成" -#: rhodecode/controllers/admin/ldap_settings.py:120 +#: rhodecode/controllers/admin/ldap_settings.py:129 msgid "Unable to activate ldap. The \"python-ldap\" library is missing." msgstr "無法啟用LDAP。找不到python-ldap函式庫" -#: rhodecode/controllers/admin/ldap_settings.py:134 +#: rhodecode/controllers/admin/ldap_settings.py:146 msgid "error occurred during update of ldap settings" msgstr "" -#: rhodecode/controllers/admin/permissions.py:56 +#: rhodecode/controllers/admin/permissions.py:59 msgid "None" msgstr "無" -#: rhodecode/controllers/admin/permissions.py:57 +#: rhodecode/controllers/admin/permissions.py:60 msgid "Read" msgstr "讀" -#: rhodecode/controllers/admin/permissions.py:58 +#: rhodecode/controllers/admin/permissions.py:61 msgid "Write" msgstr "寫" -#: rhodecode/controllers/admin/permissions.py:59 +#: 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 @@ -307,547 +348,681 @@ #: 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:110 +#: 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:279 -#: rhodecode/templates/base/base.html:366 -#: rhodecode/templates/base/base.html:368 -#: rhodecode/templates/base/base.html:370 +#: rhodecode/templates/base/base.html:197 +#: rhodecode/templates/base/base.html:326 +#: rhodecode/templates/base/base.html:328 +#: rhodecode/templates/base/base.html:330 msgid "Admin" msgstr "管理" -#: rhodecode/controllers/admin/permissions.py:62 +#: rhodecode/controllers/admin/permissions.py:65 msgid "disabled" msgstr "停用" -#: rhodecode/controllers/admin/permissions.py:64 +#: rhodecode/controllers/admin/permissions.py:67 msgid "allowed with manual account activation" msgstr "允許手動啟用帳號" -#: rhodecode/controllers/admin/permissions.py:66 +#: rhodecode/controllers/admin/permissions.py:69 msgid "allowed with automatic account activation" msgstr "允許自動啟用帳號" -#: rhodecode/controllers/admin/permissions.py:68 +#: rhodecode/controllers/admin/permissions.py:71 msgid "Disabled" msgstr "停用" -#: rhodecode/controllers/admin/permissions.py:69 +#: rhodecode/controllers/admin/permissions.py:72 msgid "Enabled" msgstr "啟用" -#: rhodecode/controllers/admin/permissions.py:102 +#: rhodecode/controllers/admin/permissions.py:106 msgid "Default permissions updated successfully" msgstr "預設權限更新完成" -#: rhodecode/controllers/admin/permissions.py:119 +#: rhodecode/controllers/admin/permissions.py:123 msgid "error occurred during update of permissions" msgstr "" -#: rhodecode/controllers/admin/repos.py:96 -#, 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" +#: rhodecode/controllers/admin/repos.py:116 +msgid "--REMOVE FORK--" msgstr "" -#: rhodecode/controllers/admin/repos.py:172 +#: rhodecode/controllers/admin/repos.py:144 #, python-format msgid "created repository %s from %s" msgstr "建立版本庫 %s 到 %s" -#: rhodecode/controllers/admin/repos.py:176 +#: rhodecode/controllers/admin/repos.py:148 #, python-format msgid "created repository %s" msgstr "建立版本庫 %s" -#: rhodecode/controllers/admin/repos.py:205 +#: rhodecode/controllers/admin/repos.py:177 #, python-format msgid "error occurred during creation of repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:292 +#: rhodecode/controllers/admin/repos.py:264 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:320 +#: rhodecode/controllers/admin/repos.py:293 msgid "An error occurred during deletion of repository user" msgstr "" -#: rhodecode/controllers/admin/repos.py:335 +#: rhodecode/controllers/admin/repos.py:312 msgid "An error occurred during deletion of repository users groups" msgstr "" -#: rhodecode/controllers/admin/repos.py:352 +#: rhodecode/controllers/admin/repos.py:329 msgid "An error occurred during deletion of repository stats" msgstr "" -#: rhodecode/controllers/admin/repos.py:367 +#: rhodecode/controllers/admin/repos.py:345 msgid "An error occurred during cache invalidation" msgstr "" +#: rhodecode/controllers/admin/repos.py:365 +msgid "Updated repository visibility in public journal" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:369 +msgid "An error occurred during setting this repository in public journal" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:374 rhodecode/model/forms.py:54 +msgid "Token mismatch" +msgstr "" + #: rhodecode/controllers/admin/repos.py:387 -msgid "Updated repository visibility in public journal" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:390 -msgid "An error occurred during setting this repository in public journal" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:395 -#: rhodecode/model/forms.py:53 -msgid "Token mismatch" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:408 msgid "Pulled from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:410 +#: rhodecode/controllers/admin/repos.py:389 msgid "An error occurred during pull from remote location" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:83 +#: rhodecode/controllers/admin/repos.py:405 +msgid "Nothing" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:407 +#, fuzzy, python-format +#| msgid "created repository %s from %s" +msgid "Marked repo %s as fork of %s" +msgstr "建立版本庫 %s 到 %s" + +#: rhodecode/controllers/admin/repos.py:411 +msgid "An error occurred during this operation" +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:119 #, python-format msgid "created repos group %s" msgstr "建立版本庫群組 %s" -#: rhodecode/controllers/admin/repos_groups.py:96 +#: rhodecode/controllers/admin/repos_groups.py:132 #, python-format msgid "error occurred during creation of repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:130 +#: rhodecode/controllers/admin/repos_groups.py:166 #, python-format msgid "updated repos group %s" msgstr "更新版本庫群組 %s" -#: rhodecode/controllers/admin/repos_groups.py:143 +#: rhodecode/controllers/admin/repos_groups.py:179 #, python-format msgid "error occurred during update of repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:164 +#: 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:171 +#: rhodecode/controllers/admin/repos_groups.py:205 #, python-format msgid "removed repos group %s" msgstr "移除版本庫群組 %s" -#: rhodecode/controllers/admin/repos_groups.py:175 +#: rhodecode/controllers/admin/repos_groups.py:210 +msgid "Cannot delete this group it still contains subgroups" +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:215 +#: rhodecode/controllers/admin/repos_groups.py:220 #, python-format msgid "error occurred during deletion of repos group %s" msgstr "" -#: rhodecode/controllers/admin/settings.py:109 +#: rhodecode/controllers/admin/repos_groups.py:240 +msgid "An error occurred during deletion of group user" +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:260 +msgid "An error occurred during deletion of group users groups" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:120 #, python-format msgid "Repositories successfully rescanned added: %s,removed: %s" msgstr "" -#: rhodecode/controllers/admin/settings.py:118 +#: rhodecode/controllers/admin/settings.py:129 msgid "Whoosh reindex task scheduled" msgstr "Whoosh 重新索引工作排程" -#: rhodecode/controllers/admin/settings.py:143 +#: rhodecode/controllers/admin/settings.py:154 msgid "Updated application settings" msgstr "更新應用設定" -#: rhodecode/controllers/admin/settings.py:148 -#: rhodecode/controllers/admin/settings.py:215 +#: rhodecode/controllers/admin/settings.py:159 +#: rhodecode/controllers/admin/settings.py:226 msgid "error occurred during updating application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:210 +#: rhodecode/controllers/admin/settings.py:221 msgid "Updated mercurial settings" msgstr "更新 mercurial 設定" -#: rhodecode/controllers/admin/settings.py:236 +#: rhodecode/controllers/admin/settings.py:246 msgid "Added new hook" msgstr "新增hook" -#: rhodecode/controllers/admin/settings.py:247 +#: rhodecode/controllers/admin/settings.py:258 msgid "Updated hooks" msgstr "更新hook" -#: rhodecode/controllers/admin/settings.py:251 +#: rhodecode/controllers/admin/settings.py:262 msgid "error occurred during hook creation" msgstr "" -#: rhodecode/controllers/admin/settings.py:310 +#: rhodecode/controllers/admin/settings.py:281 +msgid "Email task created" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:336 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/controllers/admin/settings.py:339 +#: rhodecode/controllers/admin/settings.py:365 msgid "Your account was updated successfully" msgstr "您的帳號已更新完成" -#: rhodecode/controllers/admin/settings.py:359 -#: rhodecode/controllers/admin/users.py:130 +#: rhodecode/controllers/admin/settings.py:384 +#: rhodecode/controllers/admin/users.py:132 #, python-format msgid "error occurred during update of user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:78 +#: rhodecode/controllers/admin/users.py:79 #, python-format msgid "created user %s" msgstr "建立使用者 %s" -#: rhodecode/controllers/admin/users.py:90 +#: rhodecode/controllers/admin/users.py:92 #, python-format msgid "error occurred during creation of user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:116 +#: rhodecode/controllers/admin/users.py:118 msgid "User updated successfully" msgstr "使用者更新完成" -#: rhodecode/controllers/admin/users.py:146 +#: rhodecode/controllers/admin/users.py:149 msgid "successfully deleted user" msgstr "成功刪除使用者" -#: rhodecode/controllers/admin/users.py:150 +#: rhodecode/controllers/admin/users.py:154 msgid "An error occurred during deletion of user" msgstr "" -#: rhodecode/controllers/admin/users.py:166 +#: rhodecode/controllers/admin/users.py:169 msgid "You can't edit this user" msgstr "您無法編輯這位使用者" -#: rhodecode/controllers/admin/users.py:195 -#: rhodecode/controllers/admin/users_groups.py:202 +#: rhodecode/controllers/admin/users.py:199 +#: rhodecode/controllers/admin/users_groups.py:215 msgid "Granted 'repository create' permission to user" msgstr "" -#: rhodecode/controllers/admin/users.py:204 -#: rhodecode/controllers/admin/users_groups.py:211 +#: rhodecode/controllers/admin/users.py:208 +#: rhodecode/controllers/admin/users_groups.py:225 msgid "Revoked 'repository create' permission to user" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:74 +#: rhodecode/controllers/admin/users_groups.py:79 #, python-format msgid "created users group %s" msgstr "建立使用者群組 %s" -#: rhodecode/controllers/admin/users_groups.py:86 +#: rhodecode/controllers/admin/users_groups.py:92 #, python-format msgid "error occurred during creation of users group %s" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:119 +#: rhodecode/controllers/admin/users_groups.py:128 #, python-format msgid "updated users group %s" msgstr "更新使用者群組 %s" -#: rhodecode/controllers/admin/users_groups.py:138 +#: rhodecode/controllers/admin/users_groups.py:148 #, python-format msgid "error occurred during update of users group %s" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:154 +#: rhodecode/controllers/admin/users_groups.py:165 msgid "successfully deleted users group" msgstr "成功移除使用者群組" -#: rhodecode/controllers/admin/users_groups.py:158 +#: rhodecode/controllers/admin/users_groups.py:170 msgid "An error occurred during deletion of users group" msgstr "" -#: rhodecode/lib/__init__.py:279 -msgid "year" -msgstr "年" - -#: rhodecode/lib/__init__.py:280 -msgid "month" -msgstr "月" - -#: rhodecode/lib/__init__.py:281 -msgid "day" -msgstr "日" - -#: rhodecode/lib/__init__.py:282 -msgid "hour" -msgstr "時" - -#: rhodecode/lib/__init__.py:283 -msgid "minute" -msgstr "分" - -#: rhodecode/lib/__init__.py:284 -msgid "second" -msgstr "秒" - -#: rhodecode/lib/__init__.py:293 -msgid "ago" -msgstr "之前" - -#: rhodecode/lib/__init__.py:296 -msgid "just now" -msgstr "現在" - -#: rhodecode/lib/auth.py:377 +#: rhodecode/lib/auth.py:497 msgid "You need to be a registered user to perform this action" msgstr "您必須是註冊使用者才能執行這個動作" -#: rhodecode/lib/auth.py:421 +#: rhodecode/lib/auth.py:538 msgid "You need to be a signed in to view this page" msgstr "您必須登入後才能瀏覽這個頁面" -#: rhodecode/lib/helpers.py:307 +#: rhodecode/lib/diffs.py:78 +msgid "Changeset was to big and was cut off, use diff menu to display this diff" +msgstr "" + +#: rhodecode/lib/diffs.py:88 +#, fuzzy +#| msgid "No changesets yet" +msgid "No changes detected" +msgstr "尚未有任何變更" + +#: rhodecode/lib/helpers.py:414 msgid "True" msgstr "真" -#: rhodecode/lib/helpers.py:311 +#: rhodecode/lib/helpers.py:418 msgid "False" msgstr "假" -#: rhodecode/lib/helpers.py:352 +#: rhodecode/lib/helpers.py:462 +#, fuzzy +#| msgid "changeset" +msgid "Changeset not found" +msgstr "修改" + +#: rhodecode/lib/helpers.py:485 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: rhodecode/lib/helpers.py:356 +#: rhodecode/lib/helpers.py:491 msgid "compare view" msgstr "" -#: rhodecode/lib/helpers.py:365 +#: rhodecode/lib/helpers.py:511 msgid "and" msgstr "和" -#: rhodecode/lib/helpers.py:365 +#: rhodecode/lib/helpers.py:512 #, python-format msgid "%s more" msgstr "" -#: rhodecode/lib/helpers.py:367 -#: rhodecode/templates/changelog/changelog.html:14 -#: rhodecode/templates/changelog/changelog.html:39 +#: rhodecode/lib/helpers.py:513 rhodecode/templates/changelog/changelog.html:40 msgid "revisions" msgstr "修訂" -#: rhodecode/lib/helpers.py:385 +#: rhodecode/lib/helpers.py:536 msgid "fork name " msgstr "fork 名稱" -#: rhodecode/lib/helpers.py:388 +#: rhodecode/lib/helpers.py:539 msgid "[deleted] repository" msgstr "" -#: rhodecode/lib/helpers.py:389 -#: rhodecode/lib/helpers.py:393 +#: rhodecode/lib/helpers.py:540 rhodecode/lib/helpers.py:545 msgid "[created] repository" msgstr "" -#: rhodecode/lib/helpers.py:390 -#: rhodecode/lib/helpers.py:394 +#: rhodecode/lib/helpers.py:541 +#, fuzzy, python-format +#| msgid "created repository %s" +msgid "[created] repository as fork" +msgstr "建立版本庫 %s" + +#: rhodecode/lib/helpers.py:542 rhodecode/lib/helpers.py:546 msgid "[forked] repository" msgstr "" -#: rhodecode/lib/helpers.py:391 -#: rhodecode/lib/helpers.py:395 +#: rhodecode/lib/helpers.py:543 rhodecode/lib/helpers.py:547 msgid "[updated] repository" msgstr "" -#: rhodecode/lib/helpers.py:392 +#: rhodecode/lib/helpers.py:544 msgid "[delete] repository" msgstr "" -#: rhodecode/lib/helpers.py:396 +#: rhodecode/lib/helpers.py:548 msgid "[pushed] into" msgstr "" -#: rhodecode/lib/helpers.py:397 +#: rhodecode/lib/helpers.py:549 msgid "[committed via RhodeCode] into" msgstr "" -#: rhodecode/lib/helpers.py:398 +#: rhodecode/lib/helpers.py:550 msgid "[pulled from remote] into" msgstr "" -#: rhodecode/lib/helpers.py:399 +#: rhodecode/lib/helpers.py:551 msgid "[pulled] from" msgstr "" -#: rhodecode/lib/helpers.py:400 +#: rhodecode/lib/helpers.py:552 msgid "[started following] repository" msgstr "" -#: rhodecode/lib/helpers.py:401 +#: rhodecode/lib/helpers.py:553 msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/helpers.py:577 +#: rhodecode/lib/helpers.py:731 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:581 +#: rhodecode/lib/helpers.py:735 msgid "No Files" msgstr "沒有檔案" -#: rhodecode/model/forms.py:66 +#: rhodecode/lib/utils2.py:335 +#, fuzzy, python-format +#| msgid "year" +msgid "%d year" +msgid_plural "%d years" +msgstr[0] "年" + +#: rhodecode/lib/utils2.py:336 +#, fuzzy, python-format +#| msgid "month" +msgid "%d month" +msgid_plural "%d months" +msgstr[0] "月" + +#: rhodecode/lib/utils2.py:337 +#, fuzzy, python-format +#| msgid "day" +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "日" + +#: rhodecode/lib/utils2.py:338 +#, fuzzy, python-format +#| msgid "hour" +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "時" + +#: rhodecode/lib/utils2.py:339 +#, fuzzy, python-format +#| msgid "minute" +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "分" + +#: rhodecode/lib/utils2.py:340 +#, fuzzy, python-format +#| msgid "second" +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "秒" + +#: rhodecode/lib/utils2.py:355 +#, fuzzy, python-format +#| msgid "ago" +msgid "%s ago" +msgstr "之前" + +#: rhodecode/lib/utils2.py:357 +#, python-format +msgid "%s and %s ago" +msgstr "" + +#: rhodecode/lib/utils2.py:360 +msgid "just now" +msgstr "現在" + +#: rhodecode/lib/celerylib/tasks.py:269 +#, fuzzy +#| msgid "Your password reset link was sent" +msgid "password reset link" +msgstr "您的密碼重設連結已寄出" + +#: rhodecode/model/comment.py:85 +#, python-format +msgid "on line %s" +msgstr "" + +#: rhodecode/model/comment.py:113 +msgid "[Mention]" +msgstr "" + +#: rhodecode/model/forms.py:72 msgid "Invalid username" msgstr "無效的使用者名稱" -#: rhodecode/model/forms.py:75 +#: rhodecode/model/forms.py:80 msgid "This username already exists" msgstr "使用者名稱已存在" -#: rhodecode/model/forms.py:79 -msgid "Username may only contain alphanumeric characters underscores, periods or dashes and must begin with alphanumeric character" +#: rhodecode/model/forms.py:85 +msgid "" +"Username may only contain alphanumeric characters underscores, periods or" +" dashes and must begin with alphanumeric character" msgstr "使用者名稱只能使用字母數字、底線、小數點或破折號，且必須使用數字或字母開頭" -#: rhodecode/model/forms.py:94 +#: rhodecode/model/forms.py:101 msgid "Invalid group name" msgstr "無效的群組名稱" -#: rhodecode/model/forms.py:104 +#: rhodecode/model/forms.py:111 msgid "This users group already exists" msgstr "這個使用者群組已存在" -#: rhodecode/model/forms.py:110 -msgid "Group name may only contain alphanumeric characters underscores, periods or dashes and must begin with alphanumeric character" +#: rhodecode/model/forms.py:117 +#, fuzzy +#| msgid "" "Group name may only contain alphanumeric characters underscores, +#| periods " "or dashes and must begin with alphanumeric character" +msgid "" +"RepoGroup name may only contain alphanumeric characters underscores, " +"periods or dashes and must begin with alphanumeric character" msgstr "群組名稱只能使用字母數字、底線、小數點或破折號，且必須使用數字或字母開頭" -#: rhodecode/model/forms.py:132 +#: rhodecode/model/forms.py:145 msgid "Cannot assign this group as parent" msgstr "" -#: rhodecode/model/forms.py:148 -msgid "This group already exists" -msgstr "這個群組已存在" - #: rhodecode/model/forms.py:164 -#: rhodecode/model/forms.py:172 -#: rhodecode/model/forms.py:180 +msgid "This group already exists" +msgstr "這個群組已存在" + +#: rhodecode/model/forms.py:176 +#, fuzzy +#| msgid "This repository already exists" +msgid "Repository with this name already exists" +msgstr "這個版本庫已經存在" + +#: rhodecode/model/forms.py:195 rhodecode/model/forms.py:204 +#: rhodecode/model/forms.py:213 msgid "Invalid characters in password" msgstr "無效的字元在密碼中" -#: rhodecode/model/forms.py:191 +#: rhodecode/model/forms.py:226 msgid "Passwords do not match" msgstr "密碼不相符" -#: rhodecode/model/forms.py:196 +#: rhodecode/model/forms.py:232 msgid "invalid password" msgstr "無效的密碼" -#: rhodecode/model/forms.py:197 +#: rhodecode/model/forms.py:233 msgid "invalid user name" msgstr "無效的使用者名稱" -#: rhodecode/model/forms.py:198 +#: rhodecode/model/forms.py:234 msgid "Your account is disabled" msgstr "您的帳號已被停用" -#: rhodecode/model/forms.py:233 +#: rhodecode/model/forms.py:274 msgid "This username is not valid" msgstr "無效的使用者名稱" -#: rhodecode/model/forms.py:245 +#: rhodecode/model/forms.py:287 msgid "This repository name is disallowed" msgstr "不允許的版本庫名稱" -#: rhodecode/model/forms.py:266 +#: rhodecode/model/forms.py:310 +#, fuzzy, python-format +#| msgid "This repository already exists in group \"%s\"" +msgid "This repository already exists in a group \"%s\"" +msgstr "這個版本庫已存在於群組 \"%s\"" + +#: rhodecode/model/forms.py:317 #, python-format -msgid "This repository already exists in group \"%s\"" -msgstr "這個版本庫已存在於群組 \"%s\"" - -#: rhodecode/model/forms.py:274 +msgid "There is a group with this name already \"%s\"" +msgstr "" + +#: rhodecode/model/forms.py:324 msgid "This repository already exists" msgstr "這個版本庫已經存在" -#: rhodecode/model/forms.py:312 -#: rhodecode/model/forms.py:319 +#: rhodecode/model/forms.py:367 msgid "invalid clone url" msgstr "無效的複製URL" -#: rhodecode/model/forms.py:322 +#: rhodecode/model/forms.py:384 msgid "Invalid clone url, provide a valid clone http\\s url" msgstr "" -#: rhodecode/model/forms.py:334 +#: rhodecode/model/forms.py:398 msgid "Fork have to be the same type as original" msgstr "Fork 必須使用相同的版本庫類型" -#: rhodecode/model/forms.py:341 +#: rhodecode/model/forms.py:414 msgid "This username or users group name is not valid" msgstr "使用者名稱或群組名稱無效" -#: rhodecode/model/forms.py:403 +#: rhodecode/model/forms.py:480 msgid "This is not a valid path" msgstr "不是一個有效的路徑" -#: rhodecode/model/forms.py:416 +#: rhodecode/model/forms.py:494 msgid "This e-mail address is already taken" msgstr "這個郵件位址已經使用了" -#: rhodecode/model/forms.py:427 +#: rhodecode/model/forms.py:507 msgid "This e-mail address doesn't exist." msgstr "這個郵件位址不存在" -#: rhodecode/model/forms.py:447 -msgid "The LDAP Login attribute of the CN must be specified - this is the name of the attribute that is equivalent to 'username'" +#: rhodecode/model/forms.py:530 +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/forms.py:466 +#: rhodecode/model/forms.py:549 msgid "Please enter a login" msgstr "請登入" -#: rhodecode/model/forms.py:467 +#: rhodecode/model/forms.py:550 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "" -#: rhodecode/model/forms.py:475 +#: rhodecode/model/forms.py:558 msgid "Please enter a password" msgstr "請輸入密碼" -#: rhodecode/model/forms.py:476 +#: rhodecode/model/forms.py:559 #, python-format msgid "Enter %(min)i characters or more" msgstr "" -#: rhodecode/model/user.py:145 -msgid "[RhodeCode] New User registration" +#: rhodecode/model/notification.py:175 +msgid "commented on commit" +msgstr "" + +#: rhodecode/model/notification.py:176 +#, fuzzy +#| msgid "commit message" +msgid "sent message" +msgstr "遞交資訊" + +#: rhodecode/model/notification.py:177 +msgid "mentioned you" +msgstr "" + +#: rhodecode/model/notification.py:178 +#, fuzzy +#| msgid "You have successfully registered into rhodecode" +msgid "registered in RhodeCode" +msgstr "您已經成功註冊rhodecode" + +#: rhodecode/model/user.py:235 +#, fuzzy +#| msgid "[RhodeCode] New User registration" +msgid "new user registration" msgstr "[RhodeCode] 新使用者註冊" -#: rhodecode/model/user.py:157 -#: rhodecode/model/user.py:179 +#: rhodecode/model/user.py:259 rhodecode/model/user.py:279 msgid "You can't Edit this user since it's crucial for entire application" msgstr "您無法編輯這個使用者，因為他是系統帳號" -#: rhodecode/model/user.py:201 +#: rhodecode/model/user.py:300 msgid "You can't remove this user since it's crucial for entire application" msgstr "您無法移除這個使用者，因為他是系統帳號" -#: rhodecode/model/user.py:204 -#, python-format -msgid "This user still owns %s repositories and cannot be removed. Switch owners or remove those repositories" +#: rhodecode/model/user.py:306 +#, fuzzy, python-format +#| msgid "" "This user still owns %s repositories and cannot be removed. Switch +#| owners" " or remove those repositories" +msgid "" +"user \"%s\" still owns %s repositories and cannot be removed. Switch " +"owners or remove those repositories. %s" msgstr "這個使用者擁有 %s 個版本庫所以無法移除，請先變更版本庫擁有者或者刪除版本庫" -#: rhodecode/templates/index.html:4 +#: rhodecode/templates/index.html:3 msgid "Dashboard" msgstr "儀表板" -#: rhodecode/templates/index_base.html:22 -#: rhodecode/templates/admin/users/user_edit_my_account.html:102 +#: rhodecode/templates/index_base.html:6 +#: rhodecode/templates/admin/users/user_edit_my_account.html:115 +#: rhodecode/templates/bookmarks/bookmarks.html:10 +#: rhodecode/templates/branches/branches.html:9 +#: rhodecode/templates/journal/journal.html:31 +#: rhodecode/templates/tags/tags.html:10 msgid "quick filter..." msgstr "快速過濾..." -#: rhodecode/templates/index_base.html:23 -#: rhodecode/templates/base/base.html:300 +#: rhodecode/templates/index_base.html:6 rhodecode/templates/base/base.html:218 msgid "repositories" msgstr "個版本庫" +#: rhodecode/templates/index_base.html:13 +#: rhodecode/templates/index_base.html:15 +#: rhodecode/templates/admin/repos/repos.html:22 +msgid "ADD REPOSITORY" +msgstr "新增版本庫" + #: rhodecode/templates/index_base.html:29 -#: rhodecode/templates/admin/repos/repos.html:22 -msgid "ADD NEW REPOSITORY" -msgstr "新增版本庫" - -#: rhodecode/templates/index_base.html:41 #: 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 @@ -856,159 +1031,166 @@ msgid "Group name" msgstr "群組名稱" -#: rhodecode/templates/index_base.html:42 -#: rhodecode/templates/index_base.html:73 -#: rhodecode/templates/admin/repos/repo_add_base.html:44 -#: rhodecode/templates/admin/repos/repo_edit.html:64 -#: rhodecode/templates/admin/repos/repos.html:31 +#: rhodecode/templates/index_base.html:30 +#: rhodecode/templates/index_base.html:67 +#: rhodecode/templates/index_base.html:132 +#: rhodecode/templates/index_base.html:158 +#: rhodecode/templates/admin/repos/repo_add_base.html:47 +#: rhodecode/templates/admin/repos/repo_edit.html:66 +#: rhodecode/templates/admin/repos/repos.html:37 +#: rhodecode/templates/admin/repos/repos.html:84 #: 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/settings/repo_fork.html:40 -#: rhodecode/templates/settings/repo_settings.html:40 -#: rhodecode/templates/summary/summary.html:92 +#: rhodecode/templates/forks/fork.html:49 +#: rhodecode/templates/settings/repo_settings.html:57 +#: rhodecode/templates/summary/summary.html:100 msgid "Description" msgstr "描述" -#: rhodecode/templates/index_base.html:53 +#: rhodecode/templates/index_base.html:40 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46 msgid "Repositories group" msgstr "版本庫群組" -#: rhodecode/templates/index_base.html:72 +#: rhodecode/templates/index_base.html:66 +#: rhodecode/templates/index_base.html:156 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:32 -#: rhodecode/templates/admin/repos/repos.html:30 -#: rhodecode/templates/admin/users/user_edit_my_account.html:117 -#: rhodecode/templates/files/files_browser.html:157 +#: rhodecode/templates/admin/repos/repos.html:36 +#: rhodecode/templates/admin/repos/repos.html:82 +#: rhodecode/templates/admin/users/user_edit_my_account.html:133 +#: rhodecode/templates/admin/users/user_edit_my_account.html:183 +#: rhodecode/templates/admin/users/user_edit_my_account.html:249 +#: rhodecode/templates/admin/users/user_edit_my_account.html:284 +#: rhodecode/templates/bookmarks/bookmarks.html:36 +#: rhodecode/templates/bookmarks/bookmarks_data.html:6 +#: rhodecode/templates/branches/branches.html:36 +#: rhodecode/templates/files/files_browser.html:47 +#: rhodecode/templates/journal/journal.html:50 +#: rhodecode/templates/journal/journal.html:98 +#: rhodecode/templates/journal/journal.html:177 #: rhodecode/templates/settings/repo_settings.html:31 -#: rhodecode/templates/summary/summary.html:31 -#: rhodecode/templates/summary/summary.html:107 +#: rhodecode/templates/summary/summary.html:38 +#: rhodecode/templates/summary/summary.html:114 +#: rhodecode/templates/tags/tags.html:36 +#: rhodecode/templates/tags/tags_data.html:6 msgid "Name" msgstr "名稱" -#: rhodecode/templates/index_base.html:74 -#: rhodecode/templates/admin/repos/repos.html:32 -#: rhodecode/templates/summary/summary.html:114 +#: rhodecode/templates/index_base.html:68 +#: rhodecode/templates/admin/repos/repos.html:38 msgid "Last change" msgstr "最後修改" -#: rhodecode/templates/index_base.html:75 -#: rhodecode/templates/admin/repos/repos.html:33 +#: rhodecode/templates/index_base.html:69 +#: rhodecode/templates/index_base.html:161 +#: rhodecode/templates/admin/repos/repos.html:39 +#: rhodecode/templates/admin/repos/repos.html:87 +#: rhodecode/templates/admin/users/user_edit_my_account.html:251 +#: rhodecode/templates/journal/journal.html:179 msgid "Tip" msgstr "" -#: rhodecode/templates/index_base.html:76 -#: rhodecode/templates/admin/repos/repo_edit.html:97 +#: rhodecode/templates/index_base.html:70 +#: rhodecode/templates/index_base.html:163 +#: rhodecode/templates/admin/repos/repo_edit.html:103 +#: rhodecode/templates/admin/repos/repos.html:89 msgid "Owner" msgstr "擁有者" -#: rhodecode/templates/index_base.html:77 +#: rhodecode/templates/index_base.html:71 #: rhodecode/templates/journal/public_journal.html:20 -#: rhodecode/templates/summary/summary.html:180 -#: rhodecode/templates/summary/summary.html:183 +#: rhodecode/templates/summary/summary.html:43 +#: rhodecode/templates/summary/summary.html:46 msgid "RSS" msgstr "" -#: rhodecode/templates/index_base.html:78 +#: rhodecode/templates/index_base.html:72 #: rhodecode/templates/journal/public_journal.html:23 -#: rhodecode/templates/summary/summary.html:181 -#: rhodecode/templates/summary/summary.html:184 msgid "Atom" msgstr "" -#: rhodecode/templates/index_base.html:87 -#: rhodecode/templates/index_base.html:89 -#: rhodecode/templates/index_base.html:91 -#: rhodecode/templates/base/base.html:209 -#: rhodecode/templates/base/base.html:211 -#: rhodecode/templates/base/base.html:213 -#: rhodecode/templates/summary/summary.html:4 -msgid "Summary" -msgstr "概況" - -#: rhodecode/templates/index_base.html:95 -#: rhodecode/templates/index_base.html:97 -#: rhodecode/templates/index_base.html:99 -#: rhodecode/templates/base/base.html:225 -#: rhodecode/templates/base/base.html:227 -#: rhodecode/templates/base/base.html:229 -#: rhodecode/templates/changelog/changelog.html:6 -#: rhodecode/templates/changelog/changelog.html:14 -msgid "Changelog" -msgstr "修改紀錄" - -#: rhodecode/templates/index_base.html:103 -#: rhodecode/templates/index_base.html:105 -#: rhodecode/templates/index_base.html:107 -#: rhodecode/templates/base/base.html:268 -#: rhodecode/templates/base/base.html:270 -#: rhodecode/templates/base/base.html:272 -#: rhodecode/templates/files/files.html:4 -msgid "Files" -msgstr "檔案" - -#: rhodecode/templates/index_base.html:116 -#: rhodecode/templates/admin/repos/repos.html:42 -#: rhodecode/templates/admin/users/user_edit_my_account.html:127 -#: rhodecode/templates/summary/summary.html:48 -msgid "Mercurial repository" -msgstr "Mercurial 版本庫" - -#: rhodecode/templates/index_base.html:118 -#: rhodecode/templates/admin/repos/repos.html:44 -#: rhodecode/templates/admin/users/user_edit_my_account.html:129 -#: rhodecode/templates/summary/summary.html:51 -msgid "Git repository" -msgstr "Git 版本庫" - -#: rhodecode/templates/index_base.html:123 -#: rhodecode/templates/admin/repos/repo_edit_perms.html:16 -#: rhodecode/templates/journal/journal.html:53 -#: rhodecode/templates/summary/summary.html:56 -msgid "private repository" -msgstr "私有版本庫" - -#: rhodecode/templates/index_base.html:125 -#: rhodecode/templates/journal/journal.html:55 -#: rhodecode/templates/summary/summary.html:58 -msgid "public repository" -msgstr "公開版本庫" - -#: rhodecode/templates/index_base.html:133 -#: rhodecode/templates/base/base.html:291 -#: rhodecode/templates/settings/repo_fork.html:13 -msgid "fork" -msgstr "" - -#: rhodecode/templates/index_base.html:134 -#: rhodecode/templates/admin/repos/repos.html:60 -#: rhodecode/templates/admin/users/user_edit_my_account.html:143 -#: rhodecode/templates/summary/summary.html:69 -#: rhodecode/templates/summary/summary.html:71 -msgid "Fork of" -msgstr "" - -#: rhodecode/templates/index_base.html:155 -#: rhodecode/templates/admin/repos/repos.html:73 -msgid "No changesets yet" -msgstr "尚未有任何變更" - -#: rhodecode/templates/index_base.html:161 -#: rhodecode/templates/index_base.html:163 +#: rhodecode/templates/index_base.html:102 +#: rhodecode/templates/index_base.html:104 #, python-format msgid "Subscribe to %s rss feed" msgstr "訂閱 %s rss" -#: rhodecode/templates/index_base.html:168 -#: rhodecode/templates/index_base.html:170 +#: rhodecode/templates/index_base.html:109 +#: rhodecode/templates/index_base.html:111 #, python-format msgid "Subscribe to %s atom feed" msgstr "訂閱 %s atom" -#: rhodecode/templates/login.html:5 -#: rhodecode/templates/login.html:54 -#: rhodecode/templates/base/base.html:38 +#: rhodecode/templates/index_base.html:130 +#, fuzzy +#| msgid "group name" +msgid "Group Name" +msgstr "群組名稱" + +#: rhodecode/templates/index_base.html:148 +#: rhodecode/templates/index_base.html:188 +#: rhodecode/templates/admin/repos/repos.html:112 +#: rhodecode/templates/admin/users/user_edit_my_account.html:270 +#: rhodecode/templates/bookmarks/bookmarks.html:60 +#: rhodecode/templates/branches/branches.html:60 +#: rhodecode/templates/journal/journal.html:202 +#: rhodecode/templates/tags/tags.html:60 +msgid "Click to sort ascending" +msgstr "" + +#: rhodecode/templates/index_base.html:149 +#: rhodecode/templates/index_base.html:189 +#: rhodecode/templates/admin/repos/repos.html:113 +#: rhodecode/templates/admin/users/user_edit_my_account.html:271 +#: rhodecode/templates/bookmarks/bookmarks.html:61 +#: rhodecode/templates/branches/branches.html:61 +#: rhodecode/templates/journal/journal.html:203 +#: rhodecode/templates/tags/tags.html:61 +msgid "Click to sort descending" +msgstr "" + +#: rhodecode/templates/index_base.html:159 +#: rhodecode/templates/admin/repos/repos.html:85 +#, fuzzy +#| msgid "Last change" +msgid "Last Change" +msgstr "最後修改" + +#: rhodecode/templates/index_base.html:190 +#: rhodecode/templates/admin/repos/repos.html:114 +#: rhodecode/templates/admin/users/user_edit_my_account.html:272 +#: rhodecode/templates/bookmarks/bookmarks.html:62 +#: rhodecode/templates/branches/branches.html:62 +#: rhodecode/templates/journal/journal.html:204 +#: rhodecode/templates/tags/tags.html:62 +msgid "No records found." +msgstr "" + +#: rhodecode/templates/index_base.html:191 +#: rhodecode/templates/admin/repos/repos.html:115 +#: rhodecode/templates/admin/users/user_edit_my_account.html:273 +#: rhodecode/templates/bookmarks/bookmarks.html:63 +#: rhodecode/templates/branches/branches.html:63 +#: rhodecode/templates/journal/journal.html:205 +#: rhodecode/templates/tags/tags.html:63 +msgid "Data error." +msgstr "" + +#: rhodecode/templates/index_base.html:192 +#: rhodecode/templates/admin/repos/repos.html:116 +#: rhodecode/templates/admin/users/user_edit_my_account.html:274 +#: rhodecode/templates/bookmarks/bookmarks.html:64 +#: rhodecode/templates/branches/branches.html:64 +#: rhodecode/templates/journal/journal.html:206 +#: rhodecode/templates/tags/tags.html:64 +#, fuzzy +#| msgid "loading..." +msgid "Loading..." +msgstr "載入中..." + +#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:54 msgid "Sign In" msgstr "登入" @@ -1016,31 +1198,34 @@ msgid "Sign In to" msgstr "登入" -#: 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:47 -#: rhodecode/templates/admin/users/user_edit_my_account.html:45 -#: rhodecode/templates/base/base.html:15 -#: rhodecode/templates/summary/summary.html:106 +#: rhodecode/templates/admin/users/user_edit.html:50 +#: rhodecode/templates/admin/users/user_edit_my_account.html:49 +#: rhodecode/templates/base/base.html:83 +#: rhodecode/templates/summary/summary.html:113 msgid "Username" msgstr "帳號" -#: 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:24 +#: rhodecode/templates/base/base.html:92 msgid "Password" msgstr "密碼" +#: rhodecode/templates/login.html:50 +#, fuzzy +#| msgid "member" +msgid "Remember me" +msgstr "成員" + #: rhodecode/templates/login.html:60 msgid "Forgot your password ?" msgstr "忘記您的密碼?" -#: rhodecode/templates/login.html:63 -#: rhodecode/templates/base/base.html:35 +#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:103 msgid "Don't have an account ?" msgstr "沒有帳號?" @@ -1064,8 +1249,7 @@ msgid "Password reset link will be send to matching email address" msgstr "密碼重設連結已郵寄至您的信箱" -#: rhodecode/templates/register.html:5 -#: rhodecode/templates/register.html:74 +#: rhodecode/templates/register.html:5 rhodecode/templates/register.html:74 msgid "Sign Up" msgstr "登入" @@ -1078,24 +1262,24 @@ msgstr "確認密碼" #: rhodecode/templates/register.html:47 -#: rhodecode/templates/admin/users/user_add.html:50 -#: rhodecode/templates/admin/users/user_edit.html:74 -#: rhodecode/templates/admin/users/user_edit_my_account.html:63 +#: rhodecode/templates/admin/users/user_add.html:59 +#: rhodecode/templates/admin/users/user_edit.html:86 +#: rhodecode/templates/admin/users/user_edit_my_account.html:76 msgid "First Name" msgstr "名" #: rhodecode/templates/register.html:56 -#: rhodecode/templates/admin/users/user_add.html:59 -#: rhodecode/templates/admin/users/user_edit.html:83 -#: rhodecode/templates/admin/users/user_edit_my_account.html:72 +#: rhodecode/templates/admin/users/user_add.html:68 +#: rhodecode/templates/admin/users/user_edit.html:95 +#: rhodecode/templates/admin/users/user_edit_my_account.html:85 msgid "Last Name" msgstr "姓" #: rhodecode/templates/register.html:65 -#: rhodecode/templates/admin/users/user_add.html:68 -#: rhodecode/templates/admin/users/user_edit.html:92 -#: rhodecode/templates/admin/users/user_edit_my_account.html:81 -#: rhodecode/templates/summary/summary.html:108 +#: rhodecode/templates/admin/users/user_add.html:77 +#: rhodecode/templates/admin/users/user_edit.html:104 +#: rhodecode/templates/admin/users/user_edit_my_account.html:94 +#: rhodecode/templates/summary/summary.html:115 msgid "Email" msgstr "電子郵件" @@ -1107,20 +1291,62 @@ msgid "Your account must wait for activation by administrator" msgstr "您的帳號註冊後將等待管理員啟用" -#: rhodecode/templates/repo_switcher_list.html:14 +#: rhodecode/templates/repo_switcher_list.html:11 +#: rhodecode/templates/admin/repos/repo_add_base.html:56 +#: rhodecode/templates/admin/repos/repo_edit.html:76 +#: rhodecode/templates/settings/repo_settings.html:67 msgid "Private repository" msgstr "私有的版本庫" -#: rhodecode/templates/repo_switcher_list.html:19 +#: rhodecode/templates/repo_switcher_list.html:16 msgid "Public repository" msgstr "公開的版本庫" +#: rhodecode/templates/switch_to_list.html:3 +#: rhodecode/templates/branches/branches.html:14 +msgid "branches" +msgstr "分支" + +#: rhodecode/templates/switch_to_list.html:10 +#: rhodecode/templates/branches/branches_data.html:51 +msgid "There are no branches yet" +msgstr "沒有任何分支" + +#: rhodecode/templates/switch_to_list.html:15 +#: rhodecode/templates/shortlog/shortlog_data.html:10 +#: rhodecode/templates/tags/tags.html:15 +msgid "tags" +msgstr "標籤" + +#: rhodecode/templates/switch_to_list.html:22 +#: rhodecode/templates/tags/tags_data.html:33 +msgid "There are no tags yet" +msgstr "沒有任何標籤" + +#: rhodecode/templates/switch_to_list.html:28 +#: rhodecode/templates/bookmarks/bookmarks.html:15 +msgid "bookmarks" +msgstr "" + +#: rhodecode/templates/switch_to_list.html:35 +#: rhodecode/templates/bookmarks/bookmarks_data.html:32 +#, fuzzy +#| msgid "There are no forks yet" +msgid "There are no bookmarks yet" +msgstr "尚未有任何 fork" + #: rhodecode/templates/admin/admin.html:5 #: rhodecode/templates/admin/admin.html:9 msgid "Admin journal" msgstr "管理員日誌" #: rhodecode/templates/admin/admin_log.html:6 +#: rhodecode/templates/admin/repos/repos.html:41 +#: rhodecode/templates/admin/repos/repos.html:90 +#: rhodecode/templates/admin/users/user_edit_my_account.html:135 +#: rhodecode/templates/admin/users/user_edit_my_account.html:136 +#: rhodecode/templates/journal/journal.html:52 +#: rhodecode/templates/journal/journal.html:53 msgid "Action" msgstr "動作" @@ -1129,6 +1355,11 @@ msgstr "版本庫" #: 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:37 +#: rhodecode/templates/tags/tags.html:37 +#: rhodecode/templates/tags/tags_data.html:7 msgid "Date" msgstr "時間" @@ -1213,23 +1444,52 @@ msgstr "電子郵件屬性" #: rhodecode/templates/admin/ldap/ldap.html:89 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66 #: rhodecode/templates/admin/settings/hooks.html:73 -#: rhodecode/templates/admin/users/user_edit.html:117 -#: rhodecode/templates/admin/users/user_edit.html:142 -#: rhodecode/templates/admin/users/user_edit_my_account.html:89 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:263 +#: rhodecode/templates/admin/users/user_edit.html:129 +#: rhodecode/templates/admin/users/user_edit.html:154 +#: rhodecode/templates/admin/users/user_edit_my_account.html:102 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:115 +#: rhodecode/templates/settings/repo_settings.html:84 msgid "Save" msgstr "儲存" +#: rhodecode/templates/admin/notifications/notifications.html:5 +#: rhodecode/templates/admin/notifications/notifications.html:9 +msgid "My Notifications" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications.html:29 +msgid "Mark all read" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications_data.html:38 +msgid "No notifications here yet" +msgstr "" + +#: rhodecode/templates/admin/notifications/show_notification.html:5 +#: rhodecode/templates/admin/notifications/show_notification.html:11 +#, fuzzy +#| msgid "show annotation" +msgid "Show notification" +msgstr "險是註釋" + +#: rhodecode/templates/admin/notifications/show_notification.html:9 +#, fuzzy +#| msgid "Location" +msgid "Notifications" +msgstr "位置" + #: rhodecode/templates/admin/permissions/permissions.html:5 msgid "Permissions administration" msgstr "權限管理員" #: rhodecode/templates/admin/permissions/permissions.html:11 -#: rhodecode/templates/admin/repos/repo_edit.html:109 -#: rhodecode/templates/admin/users/user_edit.html:127 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:248 -#: rhodecode/templates/settings/repo_settings.html:58 +#: rhodecode/templates/admin/repos/repo_edit.html:116 +#: 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:77 msgid "Permissions" msgstr "權限" @@ -1246,7 +1506,10 @@ msgstr "版本庫權限" #: 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" +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 "" #: rhodecode/templates/admin/permissions/permissions.html:50 @@ -1262,6 +1525,7 @@ msgstr "版本庫建立" #: rhodecode/templates/admin/permissions/permissions.html:71 +#: rhodecode/templates/admin/repos/repo_edit.html:218 msgid "set" msgstr "設定" @@ -1277,35 +1541,58 @@ msgid "Repositories" msgstr "版本庫" -#: rhodecode/templates/admin/repos/repo_add.html:13 -msgid "add new" -msgstr "新增" - #: rhodecode/templates/admin/repos/repo_add_base.html:20 -#: rhodecode/templates/summary/summary.html:80 -#: rhodecode/templates/summary/summary.html:82 +#: rhodecode/templates/summary/summary.html:90 +#: rhodecode/templates/summary/summary.html:91 msgid "Clone from" msgstr "複製由" -#: rhodecode/templates/admin/repos/repo_add_base.html:28 -#: rhodecode/templates/admin/repos/repo_edit.html:48 +#: rhodecode/templates/admin/repos/repo_add_base.html:24 +#: rhodecode/templates/admin/repos/repo_edit.html:44 +#: rhodecode/templates/settings/repo_settings.html:43 +msgid "Optional http[s] url from which repository should be cloned." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_add_base.html:29 +#: rhodecode/templates/admin/repos/repo_edit.html:49 #: rhodecode/templates/admin/repos_groups/repos_groups.html:4 +#: rhodecode/templates/forks/fork.html:41 +#: rhodecode/templates/settings/repo_settings.html:48 msgid "Repository group" msgstr "版本庫群組" -#: rhodecode/templates/admin/repos/repo_add_base.html:36 -#: rhodecode/templates/admin/repos/repo_edit.html:56 +#: rhodecode/templates/admin/repos/repo_add_base.html:33 +#: 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 "" + +#: rhodecode/templates/admin/repos/repo_add_base.html:38 +#: rhodecode/templates/admin/repos/repo_edit.html:58 msgid "Type" msgstr "類型" -#: rhodecode/templates/admin/repos/repo_add_base.html:52 -#: rhodecode/templates/admin/repos/repo_edit.html:73 -#: rhodecode/templates/settings/repo_fork.html:48 -#: rhodecode/templates/settings/repo_settings.html:49 -msgid "Private" -msgstr "私有" - -#: rhodecode/templates/admin/repos/repo_add_base.html:59 +#: rhodecode/templates/admin/repos/repo_add_base.html:42 +#, fuzzy +#| msgid "Repository creation" +msgid "Type of repository to create." +msgstr "版本庫建立" + +#: rhodecode/templates/admin/repos/repo_add_base.html:51 +#: rhodecode/templates/admin/repos/repo_edit.html:70 +#: rhodecode/templates/settings/repo_settings.html:61 +msgid "Keep it short and to the point. Use a README file for longer descriptions." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_add_base.html:60 +#: rhodecode/templates/admin/repos/repo_edit.html:80 +#: rhodecode/templates/settings/repo_settings.html:71 +msgid "" +"Private repositories are only visible to people explicitly added as " +"collaborators." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_add_base.html:64 msgid "add" msgstr "新增" @@ -1319,138 +1606,194 @@ #: rhodecode/templates/admin/repos/repo_edit.html:13 #: rhodecode/templates/admin/users/user_edit.html:13 -#: rhodecode/templates/admin/users/user_edit_my_account.html:148 +#: rhodecode/templates/admin/users/user_edit_my_account.html:155 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13 -#: rhodecode/templates/files/files_annotate.html:49 -#: rhodecode/templates/files/files_source.html:20 +#: rhodecode/templates/files/files_source.html:32 +#: rhodecode/templates/journal/journal.html:72 msgid "edit" msgstr "編輯" #: rhodecode/templates/admin/repos/repo_edit.html:40 +#: rhodecode/templates/settings/repo_settings.html:39 msgid "Clone uri" msgstr "複製URL" -#: rhodecode/templates/admin/repos/repo_edit.html:81 +#: rhodecode/templates/admin/repos/repo_edit.html:85 msgid "Enable statistics" msgstr "啟用統計" #: rhodecode/templates/admin/repos/repo_edit.html:89 +msgid "Enable statistics window on summary page." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:94 msgid "Enable downloads" msgstr "啟用下載" -#: rhodecode/templates/admin/repos/repo_edit.html:127 -msgid "Administration" -msgstr "管理者" - -#: rhodecode/templates/admin/repos/repo_edit.html:130 -msgid "Statistics" -msgstr "統計" - -#: rhodecode/templates/admin/repos/repo_edit.html:134 -msgid "Reset current statistics" -msgstr "重設目前的統計" +#: rhodecode/templates/admin/repos/repo_edit.html:98 +msgid "Enable download menu on summary page." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:108 +#, fuzzy, python-format +#| msgid "Changes on %s repository" +msgid "Change owner of this repository." +msgstr "修改於版本庫 %s" #: rhodecode/templates/admin/repos/repo_edit.html:134 +msgid "Administration" +msgstr "管理者" + +#: rhodecode/templates/admin/repos/repo_edit.html:137 +msgid "Statistics" +msgstr "統計" + +#: rhodecode/templates/admin/repos/repo_edit.html:141 +msgid "Reset current statistics" +msgstr "重設目前的統計" + +#: rhodecode/templates/admin/repos/repo_edit.html:141 msgid "Confirm to remove current statistics" msgstr "確認移除目前的統計" -#: rhodecode/templates/admin/repos/repo_edit.html:137 +#: rhodecode/templates/admin/repos/repo_edit.html:144 msgid "Fetched to rev" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:138 -msgid "Percentage of stats gathered" +#: rhodecode/templates/admin/repos/repo_edit.html:145 +msgid "Stats gathered" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:147 +#: rhodecode/templates/admin/repos/repo_edit.html:153 msgid "Remote" msgstr "遠端" -#: rhodecode/templates/admin/repos/repo_edit.html:151 +#: rhodecode/templates/admin/repos/repo_edit.html:157 msgid "Pull changes from remote location" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:151 +#: rhodecode/templates/admin/repos/repo_edit.html:157 msgid "Confirm to pull changes from remote side" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:162 +#: rhodecode/templates/admin/repos/repo_edit.html:168 msgid "Cache" msgstr "快取" -#: rhodecode/templates/admin/repos/repo_edit.html:166 +#: rhodecode/templates/admin/repos/repo_edit.html:172 msgid "Invalidate repository cache" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:166 +#: rhodecode/templates/admin/repos/repo_edit.html:172 msgid "Confirm to invalidate repository cache" msgstr "確認廢止版本庫快取" -#: rhodecode/templates/admin/repos/repo_edit.html:177 +#: rhodecode/templates/admin/repos/repo_edit.html:183 msgid "Remove from public journal" msgstr "從公開日誌移除" -#: rhodecode/templates/admin/repos/repo_edit.html:179 +#: rhodecode/templates/admin/repos/repo_edit.html:185 msgid "Add to public journal" msgstr "新增至公開日誌" -#: rhodecode/templates/admin/repos/repo_edit.html:185 +#: rhodecode/templates/admin/repos/repo_edit.html:190 +msgid "" +"All actions made on this repository will be accessible to everyone in " +"public journal" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:197 +#: rhodecode/templates/changeset/changeset_file_comment.html:19 msgid "Delete" msgstr "移除" -#: rhodecode/templates/admin/repos/repo_edit.html:189 +#: rhodecode/templates/admin/repos/repo_edit.html:201 msgid "Remove this repository" msgstr "移除版本庫" -#: rhodecode/templates/admin/repos/repo_edit.html:189 -#: rhodecode/templates/admin/repos/repos.html:79 +#: rhodecode/templates/admin/repos/repo_edit.html:201 msgid "Confirm to delete this repository" msgstr "確認移除這個版本庫" +#: rhodecode/templates/admin/repos/repo_edit.html:205 +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 "" + +#: rhodecode/templates/admin/repos/repo_edit.html:213 +msgid "Set as fork" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:222 +msgid "Manually set this repository as a fork of another" +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit_perms.html:3 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3 msgid "none" msgstr "無" #: rhodecode/templates/admin/repos/repo_edit_perms.html:4 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:4 msgid "read" msgstr "讀" #: rhodecode/templates/admin/repos/repo_edit_perms.html:5 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:5 msgid "write" msgstr "寫" #: rhodecode/templates/admin/repos/repo_edit_perms.html:6 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6 #: rhodecode/templates/admin/users/users.html:38 -#: rhodecode/templates/base/base.html:296 +#: rhodecode/templates/base/base.html:214 msgid "admin" msgstr "管理員" #: rhodecode/templates/admin/repos/repo_edit_perms.html:7 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:7 msgid "member" msgstr "成員" +#: rhodecode/templates/admin/repos/repo_edit_perms.html:16 +#: rhodecode/templates/data_table/_dt_elements.html:61 +#: rhodecode/templates/journal/journal.html:123 +#: rhodecode/templates/summary/summary.html:71 +msgid "private repository" +msgstr "私有版本庫" + #: rhodecode/templates/admin/repos/repo_edit_perms.html:33 #: rhodecode/templates/admin/repos/repo_edit_perms.html:53 +#: 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 "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:75 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:64 msgid "Add another member" msgstr "新增另ㄧ位成員" #: rhodecode/templates/admin/repos/repo_edit_perms.html:89 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:78 msgid "Failed to remove user" msgstr "移除使用者失敗" #: rhodecode/templates/admin/repos/repo_edit_perms.html:104 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:93 msgid "Failed to remove users group" msgstr "移除使用者群組失敗" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:205 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:123 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:112 msgid "Group" msgstr "群組" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:206 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:124 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:113 #: rhodecode/templates/admin/users_groups/users_groups.html:33 msgid "members" msgstr "成員" @@ -1459,43 +1802,30 @@ msgid "Repositories administration" msgstr "版本庫管理員" -#: rhodecode/templates/admin/repos/repos.html:34 -#: rhodecode/templates/summary/summary.html:100 +#: rhodecode/templates/admin/repos/repos.html:40 +#: rhodecode/templates/summary/summary.html:107 msgid "Contact" msgstr "聯絡方式" -#: rhodecode/templates/admin/repos/repos.html:35 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36 -#: rhodecode/templates/admin/users/user_edit_my_account.html:119 -#: rhodecode/templates/admin/users/users.html:40 -#: rhodecode/templates/admin/users_groups/users_groups.html:35 -msgid "action" -msgstr "動作" - -#: rhodecode/templates/admin/repos/repos.html:51 -#: rhodecode/templates/admin/users/user_edit_my_account.html:134 -#: rhodecode/templates/admin/users/user_edit_my_account.html:148 -msgid "private" -msgstr "私有" - -#: rhodecode/templates/admin/repos/repos.html:53 -#: rhodecode/templates/admin/repos/repos.html:59 -#: rhodecode/templates/admin/users/user_edit_my_account.html:136 -#: rhodecode/templates/admin/users/user_edit_my_account.html:142 -#: rhodecode/templates/summary/summary.html:68 -msgid "public" -msgstr "公開" - -#: rhodecode/templates/admin/repos/repos.html:79 +#: rhodecode/templates/admin/repos/repos.html:68 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 #: rhodecode/templates/admin/users/users.html:55 +#: rhodecode/templates/admin/users_groups/users_groups.html:44 msgid "delete" msgstr "刪除" +#: rhodecode/templates/admin/repos/repos.html:68 +#: rhodecode/templates/admin/users/user_edit_my_account.html:158 +#, fuzzy, python-format +#| msgid "Confirm to delete this repository" +msgid "Confirm to delete this repository: %s" +msgstr "確認移除這個版本庫" + #: rhodecode/templates/admin/repos_groups/repos_groups.html:8 msgid "Groups" msgstr "群組" -#: rhodecode/templates/admin/repos_groups/repos_groups.html:13 +#: rhodecode/templates/admin/repos_groups/repos_groups.html:12 msgid "with" msgstr "" @@ -1518,8 +1848,7 @@ msgstr "父群組" #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:58 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58 -#: rhodecode/templates/admin/users/user_add.html:85 +#: 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 msgid "save" @@ -1533,6 +1862,19 @@ msgid "edit repos group" msgstr "編輯版本庫群組" +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:67 +#: rhodecode/templates/admin/settings/settings.html:112 +#: rhodecode/templates/admin/settings/settings.html:177 +#: rhodecode/templates/admin/users/user_edit.html:130 +#: rhodecode/templates/admin/users/user_edit.html:155 +#: rhodecode/templates/admin/users/user_edit_my_account.html:103 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:116 +#: rhodecode/templates/files/files_add.html:82 +#: rhodecode/templates/files/files_edit.html:68 +#: rhodecode/templates/settings/repo_settings.html:85 +msgid "Reset" +msgstr "重設" + #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5 msgid "Repositories groups administration" msgstr "版本庫群組管理員" @@ -1542,11 +1884,21 @@ msgstr "新增群組" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:35 -msgid "Number of repositories" +#, fuzzy +#| msgid "Number of repositories" +msgid "Number of toplevel repositories" msgstr "版本庫數量" +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36 +#: rhodecode/templates/admin/users/users.html:40 +#: rhodecode/templates/admin/users_groups/users_groups.html:35 +msgid "action" +msgstr "動作" + #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 -msgid "Confirm to delete this group" +#, fuzzy, python-format +#| msgid "Confirm to delete this group" +msgid "Confirm to delete this group: %s" msgstr "確認刪除這個群組" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:62 @@ -1590,7 +1942,10 @@ msgstr "重新掃描選項" #: 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." +msgid "" +"In case a repository was deleted from filesystem and there are leftovers " +"in the database check this option to scan obsolete data in database and " +"remove it." msgstr "如果版本庫已從檔案系統中刪除，但是資料還留在資料庫，請勾選這個項目清理資料庫中舊的資料" #: rhodecode/templates/admin/settings/settings.html:39 @@ -1634,20 +1989,10 @@ msgstr "" #: rhodecode/templates/admin/settings/settings.html:111 -#: rhodecode/templates/admin/settings/settings.html:177 +#: rhodecode/templates/admin/settings/settings.html:176 msgid "Save settings" msgstr "儲存設定" -#: rhodecode/templates/admin/settings/settings.html:112 -#: rhodecode/templates/admin/settings/settings.html:178 -#: rhodecode/templates/admin/users/user_edit.html:118 -#: rhodecode/templates/admin/users/user_edit.html:143 -#: rhodecode/templates/admin/users/user_edit_my_account.html:90 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:264 -#: rhodecode/templates/files/files_edit.html:50 -msgid "Reset" -msgstr "重設" - #: rhodecode/templates/admin/settings/settings.html:118 msgid "Mercurial settings" msgstr "Mercurial 設定" @@ -1664,38 +2009,67 @@ msgid "Hooks" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:142 -msgid "advanced setup" -msgstr "進階設定" - -#: rhodecode/templates/admin/settings/settings.html:147 +#: rhodecode/templates/admin/settings/settings.html:144 msgid "Update repository after push (hg update)" msgstr "push後更新版本庫 (hg update)" -#: rhodecode/templates/admin/settings/settings.html:151 +#: rhodecode/templates/admin/settings/settings.html:148 msgid "Show repository size after push" msgstr "push 後顯示版本庫大小" -#: rhodecode/templates/admin/settings/settings.html:155 +#: rhodecode/templates/admin/settings/settings.html:152 msgid "Log user push commands" msgstr "紀錄使用者推送命令" -#: rhodecode/templates/admin/settings/settings.html:159 +#: rhodecode/templates/admin/settings/settings.html:156 msgid "Log user pull commands" msgstr "紀錄使用者抓取命令" -#: rhodecode/templates/admin/settings/settings.html:166 +#: rhodecode/templates/admin/settings/settings.html:160 +msgid "advanced setup" +msgstr "進階設定" + +#: rhodecode/templates/admin/settings/settings.html:165 msgid "Repositories location" msgstr "版本庫路徑" -#: rhodecode/templates/admin/settings/settings.html:171 -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." +#: rhodecode/templates/admin/settings/settings.html:170 +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:172 +#: rhodecode/templates/admin/settings/settings.html:171 msgid "unlock" msgstr "解鎖" +#: rhodecode/templates/admin/settings/settings.html:191 +msgid "Test Email" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:199 +#, fuzzy +#| msgid "Email" +msgid "Email to" +msgstr "電子郵件" + +#: rhodecode/templates/admin/settings/settings.html:207 +#, fuzzy +#| msgid "second" +msgid "Send" +msgstr "秒" + +#: rhodecode/templates/admin/settings/settings.html:213 +msgid "System Info and Packages" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:216 +#, fuzzy +#| msgid "Show" +msgid "show" +msgstr "顯示" + #: rhodecode/templates/admin/users/user_add.html:5 msgid "Add user" msgstr "新增使用者" @@ -1710,8 +2084,14 @@ msgid "add new user" msgstr "新增使用者" -#: rhodecode/templates/admin/users/user_add.html:77 -#: rhodecode/templates/admin/users/user_edit.html:101 +#: rhodecode/templates/admin/users/user_add.html:50 +#, fuzzy +#| msgid "Passwords do not match" +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" @@ -1721,36 +2101,42 @@ msgid "Edit user" msgstr "編輯使用者" -#: rhodecode/templates/admin/users/user_edit.html:33 -#: rhodecode/templates/admin/users/user_edit_my_account.html:32 +#: rhodecode/templates/admin/users/user_edit.html:34 +#: rhodecode/templates/admin/users/user_edit_my_account.html:33 msgid "Change your avatar at" msgstr "修改您的頭像於" -#: rhodecode/templates/admin/users/user_edit.html:34 -#: rhodecode/templates/admin/users/user_edit_my_account.html:33 +#: rhodecode/templates/admin/users/user_edit.html:35 +#: rhodecode/templates/admin/users/user_edit_my_account.html:34 msgid "Using" msgstr "使用中" -#: rhodecode/templates/admin/users/user_edit.html:40 -#: rhodecode/templates/admin/users/user_edit_my_account.html:39 +#: rhodecode/templates/admin/users/user_edit.html:43 +#: rhodecode/templates/admin/users/user_edit_my_account.html:43 msgid "API key" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:56 +#: rhodecode/templates/admin/users/user_edit.html:59 msgid "LDAP DN" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:65 -#: rhodecode/templates/admin/users/user_edit_my_account.html:54 +#: rhodecode/templates/admin/users/user_edit.html:68 +#: rhodecode/templates/admin/users/user_edit_my_account.html:58 msgid "New password" msgstr "新密碼" -#: rhodecode/templates/admin/users/user_edit.html:135 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:256 +#: rhodecode/templates/admin/users/user_edit.html:77 +#: rhodecode/templates/admin/users/user_edit_my_account.html:67 +msgid "New password confirmation" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.html:147 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:108 msgid "Create repositories" msgstr "建立版本庫" #: rhodecode/templates/admin/users/user_edit_my_account.html:5 +#: rhodecode/templates/base/base.html:124 msgid "My account" msgstr "我的帳號" @@ -1758,29 +2144,58 @@ msgid "My Account" msgstr "我的帳號" -#: rhodecode/templates/admin/users/user_edit_my_account.html:101 -msgid "My repositories" -msgstr "我的版本庫" - -#: rhodecode/templates/admin/users/user_edit_my_account.html:107 -msgid "ADD REPOSITORY" -msgstr "新增版本庫" - -#: rhodecode/templates/admin/users/user_edit_my_account.html:118 -#: rhodecode/templates/branches/branches_data.html:7 -#: rhodecode/templates/shortlog/shortlog_data.html:8 -#: rhodecode/templates/tags/tags_data.html:7 -msgid "revision" +#: rhodecode/templates/admin/users/user_edit_my_account.html:116 +#: rhodecode/templates/journal/journal.html:32 +#, fuzzy +#| msgid "Empty repository" +msgid "My repos" +msgstr "空的版本庫" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:116 +#, fuzzy +#| msgid "permissions" +msgid "My permissions" +msgstr "權限" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:121 +#: rhodecode/templates/journal/journal.html:37 +#, fuzzy +#| msgid "add" +msgid "ADD" +msgstr "新增" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:134 +#: rhodecode/templates/bookmarks/bookmarks.html:40 +#: rhodecode/templates/bookmarks/bookmarks_data.html:9 +#: rhodecode/templates/branches/branches.html:40 +#: rhodecode/templates/journal/journal.html:51 +#: rhodecode/templates/tags/tags.html:40 +#: rhodecode/templates/tags/tags_data.html:9 +msgid "Revision" msgstr "修訂" -#: rhodecode/templates/admin/users/user_edit_my_account.html:157 +#: rhodecode/templates/admin/users/user_edit_my_account.html:155 +#: rhodecode/templates/journal/journal.html:72 +msgid "private" +msgstr "私有" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:165 +#: rhodecode/templates/journal/journal.html:85 msgid "No repositories yet" msgstr "沒有任何版本庫" -#: rhodecode/templates/admin/users/user_edit_my_account.html:159 +#: rhodecode/templates/admin/users/user_edit_my_account.html:167 +#: rhodecode/templates/journal/journal.html:87 msgid "create one now" msgstr "" +#: rhodecode/templates/admin/users/user_edit_my_account.html:184 +#: rhodecode/templates/admin/users/user_edit_my_account.html:285 +#, fuzzy +#| msgid "permissions" +msgid "Permission" +msgstr "權限" + #: rhodecode/templates/admin/users/users.html:5 msgid "Users administration" msgstr "使用者管理員" @@ -1794,8 +2209,7 @@ msgstr "使用者名稱" #: rhodecode/templates/admin/users/users.html:34 -#: rhodecode/templates/branches/branches_data.html:5 -#: rhodecode/templates/tags/tags_data.html:5 +#: rhodecode/templates/branches/branches_data.html:6 msgid "name" msgstr "名字" @@ -1813,12 +2227,14 @@ msgstr "啟用" #: rhodecode/templates/admin/users/users.html:39 -#: rhodecode/templates/base/base.html:305 +#: rhodecode/templates/base/base.html:223 msgid "ldap" msgstr "" #: rhodecode/templates/admin/users/users.html:56 -msgid "Confirm to delete this user" +#, fuzzy, python-format +#| msgid "Confirm to delete this user" +msgid "Confirm to delete this user: %s" msgstr "確認刪除這個使用者" #: rhodecode/templates/admin/users_groups/users_group_add.html:5 @@ -1862,6 +2278,12 @@ msgid "Add all elements" msgstr "新增索有元素" +#: rhodecode/templates/admin/users_groups/users_group_edit.html:126 +#, fuzzy +#| msgid "Choosen group members" +msgid "Group members" +msgstr "選擇群組成員" + #: rhodecode/templates/admin/users_groups/users_groups.html:5 msgid "Users groups administration" msgstr "使用者群組管理員" @@ -1874,312 +2296,437 @@ msgid "group name" msgstr "群組名稱" -#: rhodecode/templates/base/base.html:32 +#: rhodecode/templates/admin/users_groups/users_groups.html:45 +#, fuzzy, python-format +#| msgid "Confirm to delete this group" +msgid "Confirm to delete this users group: %s" +msgstr "確認刪除這個群組" + +#: rhodecode/templates/base/base.html:41 +msgid "Submit a bug" +msgstr "回報錯誤" + +#: rhodecode/templates/base/base.html:77 +msgid "Login to your account" +msgstr "" + +#: rhodecode/templates/base/base.html:100 msgid "Forgot password ?" msgstr "忘記密碼?" -#: rhodecode/templates/base/base.html:57 -#: rhodecode/templates/base/base.html:338 -#: rhodecode/templates/base/base.html:340 -#: rhodecode/templates/base/base.html:342 +#: rhodecode/templates/base/base.html:107 +#, fuzzy +#| msgid "Login" +msgid "Log In" +msgstr "登入" + +#: rhodecode/templates/base/base.html:118 +msgid "Inbox" +msgstr "" + +#: rhodecode/templates/base/base.html:122 +#: rhodecode/templates/base/base.html:289 +#: rhodecode/templates/base/base.html:291 +#: rhodecode/templates/base/base.html:293 msgid "Home" msgstr "首頁" -#: rhodecode/templates/base/base.html:61 -#: rhodecode/templates/base/base.html:347 -#: rhodecode/templates/base/base.html:349 -#: rhodecode/templates/base/base.html:351 +#: rhodecode/templates/base/base.html:123 +#: rhodecode/templates/base/base.html:298 +#: rhodecode/templates/base/base.html:300 +#: rhodecode/templates/base/base.html:302 #: rhodecode/templates/journal/journal.html:4 #: rhodecode/templates/journal/journal.html:17 #: rhodecode/templates/journal/public_journal.html:4 msgid "Journal" msgstr "日誌" -#: rhodecode/templates/base/base.html:66 -msgid "Login" -msgstr "登入" - -#: rhodecode/templates/base/base.html:68 +#: rhodecode/templates/base/base.html:125 msgid "Log Out" msgstr "登出" -#: rhodecode/templates/base/base.html:107 -msgid "Submit a bug" -msgstr "回報錯誤" - -#: rhodecode/templates/base/base.html:141 +#: rhodecode/templates/base/base.html:144 msgid "Switch repository" msgstr "切換版本庫" -#: rhodecode/templates/base/base.html:143 +#: rhodecode/templates/base/base.html:146 msgid "Products" msgstr "" -#: rhodecode/templates/base/base.html:149 +#: rhodecode/templates/base/base.html:152 +#: rhodecode/templates/base/base.html:182 msgid "loading..." msgstr "載入中..." -#: rhodecode/templates/base/base.html:234 -#: rhodecode/templates/base/base.html:236 -#: rhodecode/templates/base/base.html:238 +#: 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:9 +#: rhodecode/templates/data_table/_dt_elements.html:11 +#: rhodecode/templates/data_table/_dt_elements.html:13 +#: rhodecode/templates/summary/summary.html:4 +msgid "Summary" +msgstr "概況" + +#: rhodecode/templates/base/base.html:166 +#: rhodecode/templates/base/base.html:168 +#: rhodecode/templates/base/base.html:170 +#: rhodecode/templates/changelog/changelog.html:6 +#: rhodecode/templates/changelog/changelog.html:15 +#: rhodecode/templates/data_table/_dt_elements.html:17 +#: rhodecode/templates/data_table/_dt_elements.html:19 +#: rhodecode/templates/data_table/_dt_elements.html:21 +msgid "Changelog" +msgstr "修改紀錄" + +#: rhodecode/templates/base/base.html:175 +#: rhodecode/templates/base/base.html:177 +#: rhodecode/templates/base/base.html:179 msgid "Switch to" msgstr "切換至" -#: rhodecode/templates/base/base.html:242 -#: rhodecode/templates/branches/branches.html:13 -msgid "branches" -msgstr "分支" - -#: rhodecode/templates/base/base.html:249 -#: rhodecode/templates/branches/branches_data.html:52 -msgid "There are no branches yet" -msgstr "沒有任何分支" - -#: rhodecode/templates/base/base.html:254 -#: rhodecode/templates/shortlog/shortlog_data.html:10 -#: rhodecode/templates/tags/tags.html:14 -msgid "tags" -msgstr "標籤" - -#: rhodecode/templates/base/base.html:261 -#: rhodecode/templates/tags/tags_data.html:32 -msgid "There are no tags yet" -msgstr "沒有任何標籤" - -#: rhodecode/templates/base/base.html:277 -#: rhodecode/templates/base/base.html:281 -#: rhodecode/templates/files/files_annotate.html:40 -#: rhodecode/templates/files/files_source.html:11 +#: 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:25 +#: rhodecode/templates/data_table/_dt_elements.html:27 +#: rhodecode/templates/data_table/_dt_elements.html:29 +#: rhodecode/templates/files/files.html:4 +#: rhodecode/templates/files/files.html:40 +msgid "Files" +msgstr "檔案" + +#: rhodecode/templates/base/base.html:195 +#: rhodecode/templates/base/base.html:199 msgid "Options" msgstr "選項" -#: rhodecode/templates/base/base.html:286 -#: rhodecode/templates/base/base.html:288 -#: rhodecode/templates/base/base.html:306 +#: rhodecode/templates/base/base.html:204 +#: rhodecode/templates/base/base.html:206 +#: rhodecode/templates/base/base.html:224 msgid "settings" msgstr "設定" -#: rhodecode/templates/base/base.html:292 +#: rhodecode/templates/base/base.html:209 +#: rhodecode/templates/data_table/_dt_elements.html:74 +#: rhodecode/templates/forks/fork.html:13 +msgid "fork" +msgstr "" + +#: rhodecode/templates/base/base.html:210 msgid "search" msgstr "搜尋" -#: rhodecode/templates/base/base.html:299 +#: rhodecode/templates/base/base.html:217 msgid "journal" msgstr "日誌" -#: rhodecode/templates/base/base.html:301 +#: rhodecode/templates/base/base.html:219 msgid "repositories groups" msgstr "版本庫群組" -#: rhodecode/templates/base/base.html:302 +#: rhodecode/templates/base/base.html:220 msgid "users" msgstr "使用者" -#: rhodecode/templates/base/base.html:303 +#: rhodecode/templates/base/base.html:221 msgid "users groups" msgstr "使用者群組" -#: rhodecode/templates/base/base.html:304 +#: rhodecode/templates/base/base.html:222 msgid "permissions" msgstr "權限" -#: rhodecode/templates/base/base.html:317 -#: rhodecode/templates/base/base.html:319 +#: rhodecode/templates/base/base.html:235 +#: rhodecode/templates/base/base.html:237 #: rhodecode/templates/followers/followers.html:5 msgid "Followers" msgstr "追蹤者" -#: rhodecode/templates/base/base.html:325 -#: rhodecode/templates/base/base.html:327 +#: rhodecode/templates/base/base.html:243 +#: rhodecode/templates/base/base.html:245 #: rhodecode/templates/forks/forks.html:5 msgid "Forks" msgstr "" -#: rhodecode/templates/base/base.html:356 -#: rhodecode/templates/base/base.html:358 -#: rhodecode/templates/base/base.html:360 +#: rhodecode/templates/base/base.html:316 +#: rhodecode/templates/base/base.html:318 +#: rhodecode/templates/base/base.html:320 #: rhodecode/templates/search/search.html:4 #: rhodecode/templates/search/search.html:24 #: rhodecode/templates/search/search.html:46 msgid "Search" msgstr "搜尋" -#: rhodecode/templates/base/root.html:57 -#: rhodecode/templates/journal/journal.html:48 -#: rhodecode/templates/summary/summary.html:36 +#: rhodecode/templates/base/root.html:53 +#, fuzzy +#| msgid "Add another member" +msgid "add another comment" +msgstr "新增另ㄧ位成員" + +#: rhodecode/templates/base/root.html:54 +#: rhodecode/templates/journal/journal.html:111 +#: rhodecode/templates/summary/summary.html:52 msgid "Stop following this repository" msgstr "停止追蹤這個版本庫" -#: rhodecode/templates/base/root.html:66 -#: rhodecode/templates/summary/summary.html:40 +#: rhodecode/templates/base/root.html:55 +#: rhodecode/templates/summary/summary.html:56 msgid "Start following this repository" msgstr "開始追蹤這個版本庫" -#: rhodecode/templates/branches/branches_data.html:4 -#: rhodecode/templates/tags/tags_data.html:4 +#: rhodecode/templates/bookmarks/bookmarks.html:5 +msgid "Bookmarks" +msgstr "" + +#: rhodecode/templates/bookmarks/bookmarks.html:39 +#: rhodecode/templates/bookmarks/bookmarks_data.html:8 +#: rhodecode/templates/branches/branches.html:39 +#: rhodecode/templates/tags/tags.html:39 +#: rhodecode/templates/tags/tags_data.html:8 +#, fuzzy +#| msgid "author" +msgid "Author" +msgstr "作者" + +#: rhodecode/templates/branches/branches_data.html:7 msgid "date" msgstr "日期" -#: rhodecode/templates/branches/branches_data.html:6 -#: rhodecode/templates/shortlog/shortlog_data.html:7 -#: rhodecode/templates/tags/tags_data.html:6 -msgid "author" -msgstr "作者" - #: rhodecode/templates/branches/branches_data.html:8 -#: rhodecode/templates/shortlog/shortlog_data.html:11 -#: rhodecode/templates/tags/tags_data.html:8 -msgid "links" -msgstr "連結" - -#: rhodecode/templates/branches/branches_data.html:23 -#: rhodecode/templates/branches/branches_data.html:43 -#: rhodecode/templates/shortlog/shortlog_data.html:39 -#: rhodecode/templates/tags/tags_data.html:24 -msgid "changeset" -msgstr "修改" - -#: rhodecode/templates/branches/branches_data.html:25 -#: rhodecode/templates/branches/branches_data.html:45 -#: rhodecode/templates/files/files.html:12 -#: rhodecode/templates/shortlog/shortlog_data.html:41 -#: rhodecode/templates/summary/summary.html:233 -#: rhodecode/templates/tags/tags_data.html:26 -msgid "files" -msgstr "檔案" - -#: rhodecode/templates/changelog/changelog.html:14 -msgid "showing " -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:14 -msgid "out of" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:37 +#: 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/changelog/changelog.html:15 +#, python-format +msgid "showing %d out of %d revision" +msgid_plural "showing %d out of %d revisions" +msgstr[0] "" + +#: rhodecode/templates/changelog/changelog.html:38 msgid "Show" msgstr "顯示" -#: rhodecode/templates/changelog/changelog.html:50 -#: rhodecode/templates/changeset/changeset.html:42 -#: rhodecode/templates/summary/summary.html:609 -msgid "commit" -msgstr "遞交" - -#: rhodecode/templates/changelog/changelog.html:63 +#: rhodecode/templates/changelog/changelog.html:64 +#: rhodecode/templates/summary/summary.html:352 +msgid "show more" +msgstr "顯示更多" + +#: rhodecode/templates/changelog/changelog.html:68 msgid "Affected number of files, click to show more details" msgstr "" -#: rhodecode/templates/changelog/changelog.html:67 -#: rhodecode/templates/changeset/changeset.html:66 -msgid "merge" -msgstr "合併" - -#: rhodecode/templates/changelog/changelog.html:72 +#: rhodecode/templates/changelog/changelog.html:82 #: rhodecode/templates/changeset/changeset.html:72 msgid "Parent" msgstr "" -#: rhodecode/templates/changelog/changelog.html:77 -#: rhodecode/templates/changeset/changeset.html:77 +#: rhodecode/templates/changelog/changelog.html:88 +#: rhodecode/templates/changeset/changeset.html:78 msgid "No parents" msgstr "" -#: rhodecode/templates/changelog/changelog.html:82 -#: rhodecode/templates/changeset/changeset.html:80 +#: rhodecode/templates/changelog/changelog.html:93 +#: rhodecode/templates/changeset/changeset.html:82 +msgid "merge" +msgstr "合併" + +#: rhodecode/templates/changelog/changelog.html:96 +#: rhodecode/templates/changeset/changeset.html:85 #: rhodecode/templates/files/files.html:29 -#: rhodecode/templates/files/files_annotate.html:25 +#: rhodecode/templates/files/files_add.html:33 #: rhodecode/templates/files/files_edit.html:33 #: rhodecode/templates/shortlog/shortlog_data.html:9 msgid "branch" msgstr "分支" -#: rhodecode/templates/changelog/changelog.html:86 -#: rhodecode/templates/changeset/changeset.html:83 +#: rhodecode/templates/changelog/changelog.html:102 +msgid "bookmark" +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:108 +#: rhodecode/templates/changeset/changeset.html:90 msgid "tag" msgstr "標籤" -#: rhodecode/templates/changelog/changelog.html:122 +#: rhodecode/templates/changelog/changelog.html:144 msgid "Show selected changes __S -> __E" msgstr "" -#: rhodecode/templates/changelog/changelog.html:172 -#: rhodecode/templates/shortlog/shortlog_data.html:61 +#: rhodecode/templates/changelog/changelog.html:235 msgid "There are no changes yet" msgstr "尚未有任何變更" #: rhodecode/templates/changelog/changelog_details.html:2 -#: rhodecode/templates/changeset/changeset.html:55 +#: rhodecode/templates/changeset/changeset.html:60 msgid "removed" msgstr "移除" #: rhodecode/templates/changelog/changelog_details.html:3 -#: rhodecode/templates/changeset/changeset.html:56 +#: rhodecode/templates/changeset/changeset.html:61 msgid "changed" msgstr "修改" #: rhodecode/templates/changelog/changelog_details.html:4 -#: rhodecode/templates/changeset/changeset.html:57 +#: rhodecode/templates/changeset/changeset.html:62 msgid "added" msgstr "新增" #: rhodecode/templates/changelog/changelog_details.html:6 #: rhodecode/templates/changelog/changelog_details.html:7 #: rhodecode/templates/changelog/changelog_details.html:8 -#: rhodecode/templates/changeset/changeset.html:59 -#: rhodecode/templates/changeset/changeset.html:60 -#: rhodecode/templates/changeset/changeset.html:61 +#: rhodecode/templates/changeset/changeset.html:64 +#: rhodecode/templates/changeset/changeset.html:65 +#: rhodecode/templates/changeset/changeset.html:66 #, python-format msgid "affected %s files" msgstr "" #: rhodecode/templates/changeset/changeset.html:6 #: rhodecode/templates/changeset/changeset.html:14 -#: rhodecode/templates/changeset/changeset.html:31 msgid "Changeset" msgstr "" -#: rhodecode/templates/changeset/changeset.html:32 -#: rhodecode/templates/changeset/changeset.html:121 -#: rhodecode/templates/changeset/changeset_range.html:78 -#: rhodecode/templates/files/file_diff.html:32 -#: rhodecode/templates/files/file_diff.html:42 +#: rhodecode/templates/changeset/changeset.html:37 +#: rhodecode/templates/changeset/diff_block.html:20 msgid "raw diff" msgstr "原始差異" -#: rhodecode/templates/changeset/changeset.html:34 -#: rhodecode/templates/changeset/changeset.html:123 -#: rhodecode/templates/changeset/changeset_range.html:80 -#: rhodecode/templates/files/file_diff.html:34 +#: rhodecode/templates/changeset/changeset.html:38 +#: rhodecode/templates/changeset/diff_block.html:21 msgid "download diff" msgstr "下載差異" -#: rhodecode/templates/changeset/changeset.html:90 +#: rhodecode/templates/changeset/changeset.html:42 +#: rhodecode/templates/changeset/changeset_file_comment.html:69 +#, fuzzy, python-format +#| msgid "commit" +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "遞交" + +#: rhodecode/templates/changeset/changeset.html:42 +#: rhodecode/templates/changeset/changeset_file_comment.html:69 #, python-format -msgid "%s files affected with %s additions and %s deletions." +msgid "(%d inline)" +msgid_plural "(%d inline)" +msgstr[0] "" + +#: rhodecode/templates/changeset/changeset.html:97 +#, python-format +msgid "%s files affected with %s insertions and %s deletions:" msgstr "" -#: rhodecode/templates/changeset/changeset.html:101 +#: rhodecode/templates/changeset/changeset.html:113 msgid "Changeset was too big and was cut off..." msgstr "" -#: rhodecode/templates/changeset/changeset.html:119 -#: rhodecode/templates/changeset/changeset_range.html:76 -#: rhodecode/templates/files/file_diff.html:30 +#: rhodecode/templates/changeset/changeset_file_comment.html:35 +msgid "Submitting..." +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:38 +msgid "Commenting on line {1}." +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:39 +#: rhodecode/templates/changeset/changeset_file_comment.html:100 +#, python-format +msgid "Comments parsed using %s syntax with %s support." +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:41 +#: rhodecode/templates/changeset/changeset_file_comment.html:102 +msgid "Use @username inside this text to send notification to this RhodeCode user" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:47 +#: rhodecode/templates/changeset/changeset_file_comment.html:107 +#, fuzzy +#| msgid "commit" +msgid "Comment" +msgstr "遞交" + +#: rhodecode/templates/changeset/changeset_file_comment.html:48 +#: rhodecode/templates/changeset/changeset_file_comment.html:59 +msgid "Hide" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:55 +#, fuzzy +#| msgid "You need to be a signed in to view this page" +msgid "You need to be logged in to comment." +msgstr "您必須登入後才能瀏覽這個頁面" + +#: rhodecode/templates/changeset/changeset_file_comment.html:55 +msgid "Login now" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:97 +msgid "Leave a comment" +msgstr "" + +#: rhodecode/templates/changeset/changeset_range.html:29 +msgid "Compare View" +msgstr "比較顯示" + +#: rhodecode/templates/changeset/changeset_range.html:49 +msgid "Files affected" +msgstr "" + +#: rhodecode/templates/changeset/diff_block.html:19 msgid "diff" msgstr "差異" -#: rhodecode/templates/changeset/changeset.html:132 -#: rhodecode/templates/changeset/changeset_range.html:89 -msgid "No changes in this file" -msgstr "這個檔案沒有任何變更" - -#: rhodecode/templates/changeset/changeset_range.html:30 -msgid "Compare View" -msgstr "比較顯示" - -#: rhodecode/templates/changeset/changeset_range.html:52 -msgid "Files affected" +#: rhodecode/templates/changeset/diff_block.html:27 +#, fuzzy +#| msgid "File contents" +msgid "show inline comments" +msgstr "文件內容" + +#: rhodecode/templates/data_table/_dt_elements.html:33 +#: rhodecode/templates/data_table/_dt_elements.html:35 +#: rhodecode/templates/data_table/_dt_elements.html:37 +#: rhodecode/templates/forks/fork.html:5 +msgid "Fork" +msgstr "分支" + +#: rhodecode/templates/data_table/_dt_elements.html:54 +#: rhodecode/templates/journal/journal.html:117 +#: rhodecode/templates/summary/summary.html:63 +msgid "Mercurial repository" +msgstr "Mercurial 版本庫" + +#: rhodecode/templates/data_table/_dt_elements.html:56 +#: rhodecode/templates/journal/journal.html:119 +#: rhodecode/templates/summary/summary.html:66 +msgid "Git repository" +msgstr "Git 版本庫" + +#: rhodecode/templates/data_table/_dt_elements.html:63 +#: rhodecode/templates/journal/journal.html:125 +#: rhodecode/templates/summary/summary.html:73 +msgid "public repository" +msgstr "公開版本庫" + +#: rhodecode/templates/data_table/_dt_elements.html:74 +#: rhodecode/templates/summary/summary.html:82 +#: rhodecode/templates/summary/summary.html:83 +msgid "Fork of" +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.html:86 +msgid "No changesets yet" +msgstr "尚未有任何變更" + +#: rhodecode/templates/email_templates/main.html:8 +msgid "This is an notification from RhodeCode." msgstr "" #: rhodecode/templates/errors/error_document.html:44 @@ -2192,81 +2739,82 @@ msgid "File diff" msgstr "檔案差異" -#: rhodecode/templates/files/file_diff.html:42 -msgid "Diff is to big to display" +#: rhodecode/templates/files/files.html:12 +#: rhodecode/templates/summary/summary.html:328 +msgid "files" +msgstr "檔案" + +#: rhodecode/templates/files/files.html:44 +msgid "search truncated" msgstr "" -#: rhodecode/templates/files/files.html:37 -#: rhodecode/templates/files/files_annotate.html:31 +#: rhodecode/templates/files/files.html:45 +msgid "no matching files" +msgstr "無符合的檔案" + +#: rhodecode/templates/files/files_add.html:4 +#: rhodecode/templates/files/files_edit.html:4 +msgid "Edit file" +msgstr "編輯檔案" + +#: rhodecode/templates/files/files_add.html:19 +#, fuzzy +#| msgid "edit file" +msgid "add file" +msgstr "編輯檔案" + +#: rhodecode/templates/files/files_add.html:40 +#, fuzzy +#| msgid "add new user" +msgid "Add new file" +msgstr "新增使用者" + +#: rhodecode/templates/files/files_add.html:45 +#, fuzzy +#| msgid "File names" +msgid "File Name" +msgstr "檔案名稱" + +#: rhodecode/templates/files/files_add.html:49 +#: rhodecode/templates/files/files_add.html:58 +#, fuzzy +#| msgid "hour" +msgid "or" +msgstr "時" + +#: rhodecode/templates/files/files_add.html:49 +#: rhodecode/templates/files/files_add.html:54 +#, fuzzy +#| msgid "edit file" +msgid "Upload file" +msgstr "編輯檔案" + +#: rhodecode/templates/files/files_add.html:58 +#, fuzzy, python-format +#| msgid "created user %s" +msgid "Create new file" +msgstr "建立使用者 %s" + +#: rhodecode/templates/files/files_add.html:63 #: rhodecode/templates/files/files_edit.html:39 +#: rhodecode/templates/files/files_ypjax.html:3 msgid "Location" msgstr "位置" -#: rhodecode/templates/files/files.html:46 -msgid "Go back" -msgstr "" - -#: rhodecode/templates/files/files.html:47 -msgid "No files at given path" -msgstr "" - -#: rhodecode/templates/files/files_annotate.html:4 -msgid "File annotate" -msgstr "檔案註釋" - -#: rhodecode/templates/files/files_annotate.html:12 -msgid "annotate" -msgstr "註釋" - -#: rhodecode/templates/files/files_annotate.html:33 -#: rhodecode/templates/files/files_browser.html:160 -#: rhodecode/templates/files/files_source.html:2 -msgid "Revision" -msgstr "修訂" - -#: rhodecode/templates/files/files_annotate.html:36 -#: rhodecode/templates/files/files_browser.html:158 -#: rhodecode/templates/files/files_source.html:7 -msgid "Size" -msgstr "大小" - -#: rhodecode/templates/files/files_annotate.html:38 -#: rhodecode/templates/files/files_browser.html:159 -#: rhodecode/templates/files/files_source.html:9 -msgid "Mimetype" +#: rhodecode/templates/files/files_add.html:67 +msgid "use / to separate directories" msgstr "" -#: rhodecode/templates/files/files_annotate.html:41 -msgid "show source" -msgstr "顯示原始碼" - -#: rhodecode/templates/files/files_annotate.html:43 -#: rhodecode/templates/files/files_annotate.html:78 -#: rhodecode/templates/files/files_source.html:14 -#: rhodecode/templates/files/files_source.html:51 -msgid "show as raw" -msgstr "顯示原始文件" - -#: rhodecode/templates/files/files_annotate.html:45 -#: rhodecode/templates/files/files_source.html:16 -msgid "download as raw" -msgstr "下載原始文件" - -#: rhodecode/templates/files/files_annotate.html:54 -#: rhodecode/templates/files/files_source.html:25 -msgid "History" -msgstr "歷史" - -#: rhodecode/templates/files/files_annotate.html:73 -#: rhodecode/templates/files/files_source.html:46 -#, python-format -msgid "Binary file (%s)" -msgstr "二進位檔 (%s)" - -#: rhodecode/templates/files/files_annotate.html:78 -#: rhodecode/templates/files/files_source.html:51 -msgid "File is too big to display" -msgstr "顯示的檔案太大" +#: 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 "遞交資訊" + +#: rhodecode/templates/files/files_add.html:81 +#: rhodecode/templates/files/files_edit.html:67 +msgid "Commit changes" +msgstr "遞交修改" #: rhodecode/templates/files/files_browser.html:13 msgid "view" @@ -2288,49 +2836,104 @@ msgid "search file list" msgstr "搜尋檔案列表" -#: rhodecode/templates/files/files_browser.html:32 +#: rhodecode/templates/files/files_browser.html:31 +#: rhodecode/templates/shortlog/shortlog_data.html:65 +#, fuzzy +#| msgid "add new user" +msgid "add new file" +msgstr "新增使用者" + +#: rhodecode/templates/files/files_browser.html:35 msgid "Loading file list..." msgstr "載入檔案列表..." -#: rhodecode/templates/files/files_browser.html:111 -msgid "search truncated" +#: rhodecode/templates/files/files_browser.html:48 +msgid "Size" +msgstr "大小" + +#: rhodecode/templates/files/files_browser.html:49 +msgid "Mimetype" msgstr "" -#: rhodecode/templates/files/files_browser.html:122 -msgid "no matching files" -msgstr "無符合的檔案" - -#: rhodecode/templates/files/files_browser.html:161 +#: rhodecode/templates/files/files_browser.html:50 +#, fuzzy +#| msgid "next revision" +msgid "Last Revision" +msgstr "下一個修訂" + +#: rhodecode/templates/files/files_browser.html:51 msgid "Last modified" msgstr "最後修改" -#: rhodecode/templates/files/files_browser.html:162 +#: rhodecode/templates/files/files_browser.html:52 msgid "Last commiter" msgstr "最後的遞交者" -#: rhodecode/templates/files/files_edit.html:4 -msgid "Edit file" -msgstr "編輯檔案" - #: rhodecode/templates/files/files_edit.html:19 msgid "edit file" msgstr "編輯檔案" -#: rhodecode/templates/files/files_edit.html:45 -#: rhodecode/templates/shortlog/shortlog_data.html:5 -msgid "commit message" -msgstr "遞交資訊" +#: rhodecode/templates/files/files_edit.html:49 +#: rhodecode/templates/files/files_source.html:26 +msgid "show annotation" +msgstr "險是註釋" + +#: rhodecode/templates/files/files_edit.html:50 +#: rhodecode/templates/files/files_source.html:28 +#: rhodecode/templates/files/files_source.html:56 +msgid "show as raw" +msgstr "顯示原始文件" #: rhodecode/templates/files/files_edit.html:51 -msgid "Commit changes" -msgstr "遞交修改" - -#: rhodecode/templates/files/files_source.html:12 -msgid "show annotation" +#: rhodecode/templates/files/files_source.html:29 +msgid "download as raw" +msgstr "下載原始文件" + +#: rhodecode/templates/files/files_edit.html:54 +#, fuzzy +#| msgid "show source" +msgid "source" +msgstr "顯示原始碼" + +#: rhodecode/templates/files/files_edit.html:59 +#, fuzzy +#| msgid "edit file" +msgid "Editing file" +msgstr "編輯檔案" + +#: rhodecode/templates/files/files_source.html:2 +msgid "History" +msgstr "歷史" + +#: rhodecode/templates/files/files_source.html:24 +msgid "show source" +msgstr "顯示原始碼" + +#: rhodecode/templates/files/files_source.html:47 +#, python-format +msgid "Binary file (%s)" +msgstr "二進位檔 (%s)" + +#: rhodecode/templates/files/files_source.html:56 +msgid "File is too big to display" +msgstr "顯示的檔案太大" + +#: rhodecode/templates/files/files_source.html:112 +msgid "Selection link" +msgstr "" + +#: rhodecode/templates/files/files_ypjax.html:5 +#, fuzzy +#| msgid "show annotation" +msgid "annotation" msgstr "險是註釋" -#: rhodecode/templates/files/files_source.html:153 -msgid "Selection link" +#: rhodecode/templates/files/files_ypjax.html:15 +msgid "Go back" +msgstr "" + +#: rhodecode/templates/files/files_ypjax.html:16 +msgid "No files at given path" msgstr "" #: rhodecode/templates/followers/followers.html:13 @@ -2341,6 +2944,28 @@ msgid "Started following" msgstr "開始追蹤" +#: rhodecode/templates/forks/fork.html:31 +msgid "Fork name" +msgstr "分支名稱" + +#: rhodecode/templates/forks/fork.html:57 +msgid "Private" +msgstr "私有" + +#: rhodecode/templates/forks/fork.html:65 +#, fuzzy +#| msgid "permissions" +msgid "Copy permissions" +msgstr "權限" + +#: rhodecode/templates/forks/fork.html:73 +msgid "Update after clone" +msgstr "" + +#: rhodecode/templates/forks/fork.html:80 +msgid "fork this repository" +msgstr "fork 這個版本庫" + #: rhodecode/templates/forks/forks.html:13 msgid "forks" msgstr "分支" @@ -2353,23 +2978,29 @@ msgid "There are no forks yet" msgstr "尚未有任何 fork" -#: rhodecode/templates/journal/journal.html:34 -msgid "Following" -msgstr "已追蹤" - -#: rhodecode/templates/journal/journal.html:41 +#: rhodecode/templates/journal/journal.html:20 +msgid "Refresh" +msgstr "" + +#: rhodecode/templates/journal/journal.html:32 +#, fuzzy +#| msgid "Cache" +msgid "Watched" +msgstr "快取" + +#: rhodecode/templates/journal/journal.html:105 msgid "following user" msgstr "追蹤使用者" -#: rhodecode/templates/journal/journal.html:41 +#: rhodecode/templates/journal/journal.html:105 msgid "user" msgstr "使用者" -#: rhodecode/templates/journal/journal.html:65 +#: rhodecode/templates/journal/journal.html:138 msgid "You are not following any users or repositories" msgstr "您尚未追蹤任何使用者或版本庫" -#: rhodecode/templates/journal/journal_data.html:46 +#: rhodecode/templates/journal/journal_data.html:47 msgid "No entries yet" msgstr "" @@ -2403,25 +3034,13 @@ msgid "File names" msgstr "檔案名稱" -#: rhodecode/templates/search/search_content.html:20 +#: rhodecode/templates/search/search_content.html:21 #: rhodecode/templates/search/search_path.html:15 msgid "Permission denied" msgstr "權限不足" -#: rhodecode/templates/settings/repo_fork.html:5 -msgid "Fork" -msgstr "分支" - -#: rhodecode/templates/settings/repo_fork.html:31 -msgid "Fork name" -msgstr "分支名稱" - -#: rhodecode/templates/settings/repo_fork.html:55 -msgid "fork this repository" -msgstr "fork 這個版本庫" - #: rhodecode/templates/shortlog/shortlog.html:5 -#: rhodecode/templates/summary/summary.html:666 +#: rhodecode/templates/summary/summary.html:209 msgid "Shortlog" msgstr "簡短紀錄" @@ -2429,104 +3048,206 @@ msgid "shortlog" msgstr "簡短紀錄" -#: rhodecode/templates/shortlog/shortlog_data.html:6 +#: rhodecode/templates/shortlog/shortlog_data.html:7 msgid "age" msgstr "" +#: rhodecode/templates/shortlog/shortlog_data.html:18 +#, fuzzy +#| msgid "commit message" +msgid "No commit message" +msgstr "遞交資訊" + +#: rhodecode/templates/shortlog/shortlog_data.html:62 +msgid "Add or upload files directly via RhodeCode" +msgstr "" + +#: rhodecode/templates/shortlog/shortlog_data.html:71 +msgid "Push new repo" +msgstr "" + +#: rhodecode/templates/shortlog/shortlog_data.html:79 +#, fuzzy +#| msgid "Git repository" +msgid "Existing repository?" +msgstr "Git 版本庫" + #: rhodecode/templates/summary/summary.html:12 msgid "summary" msgstr "概況" -#: rhodecode/templates/summary/summary.html:79 +#: rhodecode/templates/summary/summary.html:44 +#: rhodecode/templates/summary/summary.html:47 +#, fuzzy +#| msgid "author" +msgid "ATOM" +msgstr "作者" + +#: rhodecode/templates/summary/summary.html:77 +#, fuzzy, python-format +#| msgid "No changes" +msgid "Non changable ID %s" +msgstr "沒有修改" + +#: rhodecode/templates/summary/summary.html:82 +msgid "public" +msgstr "公開" + +#: rhodecode/templates/summary/summary.html:90 msgid "remote clone" msgstr "遠端複製" #: rhodecode/templates/summary/summary.html:121 -msgid "by" -msgstr "" - -#: rhodecode/templates/summary/summary.html:128 msgid "Clone url" msgstr "複製連結" -#: rhodecode/templates/summary/summary.html:137 -msgid "Trending source files" +#: rhodecode/templates/summary/summary.html:124 +#, fuzzy +#| msgid "show more" +msgid "Show by Name" +msgstr "顯示更多" + +#: rhodecode/templates/summary/summary.html:125 +msgid "Show by ID" msgstr "" -#: rhodecode/templates/summary/summary.html:146 +#: rhodecode/templates/summary/summary.html:133 +#, fuzzy +#| msgid "edit file" +msgid "Trending files" +msgstr "編輯檔案" + +#: rhodecode/templates/summary/summary.html:141 +#: rhodecode/templates/summary/summary.html:157 +#: rhodecode/templates/summary/summary.html:185 +msgid "enable" +msgstr "啟用" + +#: rhodecode/templates/summary/summary.html:149 msgid "Download" msgstr "下載" -#: rhodecode/templates/summary/summary.html:150 +#: rhodecode/templates/summary/summary.html:153 msgid "There are no downloads yet" msgstr "沒有任何下載" -#: rhodecode/templates/summary/summary.html:152 +#: rhodecode/templates/summary/summary.html:155 msgid "Downloads are disabled for this repository" msgstr "這個版本庫的下載已停用" -#: rhodecode/templates/summary/summary.html:154 -#: rhodecode/templates/summary/summary.html:320 -msgid "enable" -msgstr "啟用" - -#: rhodecode/templates/summary/summary.html:162 -#: rhodecode/templates/summary/summary.html:297 +#: rhodecode/templates/summary/summary.html:164 +msgid "Check this to download archive with subrepos" +msgstr "" + +#: rhodecode/templates/summary/summary.html:164 +msgid "with subrepos" +msgstr "" + +#: rhodecode/templates/summary/summary.html:177 +msgid "Commit activity by day / author" +msgstr "" + +#: rhodecode/templates/summary/summary.html:188 +msgid "Stats gathered: " +msgstr "" + +#: rhodecode/templates/summary/summary.html:211 +#, fuzzy +#| msgid "quick filter..." +msgid "Quick start" +msgstr "快速過濾..." + +#: rhodecode/templates/summary/summary.html:281 #, python-format msgid "Download %s as %s" msgstr "下載 %s 為 %s" -#: rhodecode/templates/summary/summary.html:168 -msgid "Check this to download archive with subrepos" -msgstr "" - -#: rhodecode/templates/summary/summary.html:168 -msgid "with subrepos" -msgstr "" - -#: rhodecode/templates/summary/summary.html:176 -msgid "Feeds" -msgstr "" - -#: rhodecode/templates/summary/summary.html:257 -#: rhodecode/templates/summary/summary.html:684 -#: rhodecode/templates/summary/summary.html:695 -msgid "show more" -msgstr "顯示更多" - -#: rhodecode/templates/summary/summary.html:312 -msgid "Commit activity by day / author" -msgstr "" - -#: rhodecode/templates/summary/summary.html:324 -msgid "Loaded in" -msgstr "" - -#: rhodecode/templates/summary/summary.html:603 +#: rhodecode/templates/summary/summary.html:638 msgid "commits" msgstr "遞交" -#: rhodecode/templates/summary/summary.html:604 +#: rhodecode/templates/summary/summary.html:639 msgid "files added" msgstr "多個檔案新增" -#: rhodecode/templates/summary/summary.html:605 +#: rhodecode/templates/summary/summary.html:640 msgid "files changed" msgstr "多個檔案修改" -#: rhodecode/templates/summary/summary.html:606 +#: rhodecode/templates/summary/summary.html:641 msgid "files removed" msgstr "移除多個檔案" -#: rhodecode/templates/summary/summary.html:610 +#: rhodecode/templates/summary/summary.html:644 +msgid "commit" +msgstr "遞交" + +#: rhodecode/templates/summary/summary.html:645 msgid "file added" msgstr "檔案新增" -#: rhodecode/templates/summary/summary.html:611 +#: rhodecode/templates/summary/summary.html:646 msgid "file changed" msgstr "檔案修改" -#: rhodecode/templates/summary/summary.html:612 +#: rhodecode/templates/summary/summary.html:647 msgid "file removed" msgstr "移除檔案" +#~ msgid "Changeset is to big and was cut off, see raw changeset instead" +#~ msgstr "" + +#~ msgid "Diff is to big and was cut off, see raw diff instead" +#~ msgstr "" + +#~ msgid "Binary file" +#~ msgstr "二進位檔" + +#~ msgid "ADD NEW REPOSITORY" +#~ msgstr "新增版本庫" + +#~ msgid "Percentage of stats gathered" +#~ msgstr "" + +#~ msgid "My repositories" +#~ msgstr "我的版本庫" + +#~ msgid "links" +#~ msgstr "連結" + +#~ msgid "showing " +#~ msgstr "" + +#~ msgid "out of" +#~ msgstr "" + +#~ msgid "%s files affected with %s additions and %s deletions." +#~ msgstr "" + +#~ msgid "No changes in this file" +#~ msgstr "這個檔案沒有任何變更" + +#~ msgid "Diff is to big to display" +#~ msgstr "" + +#~ msgid "File annotate" +#~ msgstr "檔案註釋" + +#~ msgid "annotate" +#~ msgstr "註釋" + +#~ msgid "Following" +#~ msgstr "已追蹤" + +#~ msgid "by" +#~ msgstr "" + +#~ msgid "Trending source files" +#~ msgstr "" + +#~ msgid "Feeds" +#~ msgstr "" + +#~ msgid "Loaded in" +#~ msgstr "" +