diff --git a/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.mo b/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.mo index edf8e1b29ae13e51ab5aec704a0ad472010a5399..abf60eabb60780a7c613f6f696c1228e51243c44 GIT binary patch literal 54291 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 QWwCCZEk$>K@oM9L0c7u`Qvd(} diff --git a/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po @@ -6,18 +6,19 @@ # xpol , 2012. msgid "" msgstr "" -"Project-Id-Version: RhodeCode 1.2.0\n" +"Project-Id-Version: RhodeCode 1.4.4\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-10-02 13:34+0800\n" -"PO-Revision-Date: 2012-10-02 13:44+0800\n" +"POT-Creation-Date: 2012-10-16 10:48+0800\n" +"PO-Revision-Date: 2012-10-16 11:36+0800\n" "Last-Translator: xpol \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-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -"X-Generator: Poedit 1.5.3\n" +"X-Generator: Poedit 1.5.4\n" +"X-Poedit-Basepath: ../../../..\n" #: rhodecode/controllers/changelog.py:95 msgid "All Branches" @@ -34,18 +35,18 @@ msgstr "忽略空白字符" #: rhodecode/controllers/changeset.py:157 #, python-format msgid "%s line context" -msgstr "%s 行上下文" +msgstr "%s行上下文" #: rhodecode/controllers/changeset.py:333 -#: rhodecode/controllers/changeset.py:348 rhodecode/lib/diffs.py:71 +#: rhodecode/controllers/changeset.py:348 rhodecode/lib/diffs.py:74 msgid "binary file" msgstr "二进制文件" #: rhodecode/controllers/changeset.py:381 -#: rhodecode/controllers/pullrequests.py:376 +#: rhodecode/controllers/pullrequests.py:383 #, python-format msgid "Status change -> %s" -msgstr "状态改变 -> %s" +msgstr "状态改变->%s" #: rhodecode/controllers/changeset.py:412 msgid "" @@ -53,7 +54,7 @@ msgid "" "allowed" msgstr "不允许修改已关闭拉取请求的修订集状态" -#: rhodecode/controllers/compare.py:72 +#: rhodecode/controllers/compare.py:73 #: rhodecode/controllers/pullrequests.py:114 msgid "There are no changesets yet" msgstr "还没有修订集" @@ -88,12 +89,12 @@ msgstr "服务进入非预期的混乱状态,这会阻止它对请求进行响应。" #: rhodecode/controllers/feed.py:49 #, python-format msgid "Changes on %s repository" -msgstr "%s 库的修改" +msgstr "%s库的修改" #: rhodecode/controllers/feed.py:50 #, python-format msgid "%s %s feed" -msgstr "%s %s 订阅" +msgstr "%s %s订阅" #: rhodecode/controllers/feed.py:67 #: rhodecode/templates/changeset/changeset.html:119 @@ -111,17 +112,17 @@ msgstr "点击此处添加新文件" #: rhodecode/controllers/files.py:85 #, python-format msgid "There are no files yet %s" -msgstr "还没有文件 %s" +msgstr "还没有文件%s" #: rhodecode/controllers/files.py:239 rhodecode/controllers/files.py:299 #, python-format msgid "This repository is has been locked by %s on %s" -msgstr "版本库由 %s 于 %s 锁定" +msgstr "版本库由%s于%s锁定" #: rhodecode/controllers/files.py:266 #, python-format msgid "Edited %s via RhodeCode" -msgstr "通过 RhodeCode 修改了 %s" +msgstr "通过RhodeCode修改了%s" #: rhodecode/controllers/files.py:271 msgid "No changes" @@ -130,7 +131,7 @@ msgstr "无变更" #: rhodecode/controllers/files.py:282 rhodecode/controllers/files.py:346 #, python-format msgid "Successfully committed to %s" -msgstr "成功提交到 %s" +msgstr "成功提交到%s" #: rhodecode/controllers/files.py:287 rhodecode/controllers/files.py:352 msgid "Error occurred during commit" @@ -139,7 +140,7 @@ msgstr "提交时发生错误" #: rhodecode/controllers/files.py:318 #, python-format msgid "Added %s via RhodeCode" -msgstr "通过 RhodeCode 添加了 %s" +msgstr "通过RhodeCode添加了%s" #: rhodecode/controllers/files.py:332 msgid "No content" @@ -156,7 +157,7 @@ msgstr "禁止下载" #: rhodecode/controllers/files.py:389 #, python-format msgid "Unknown revision %s" -msgstr "未知版本 %s" +msgstr "未知版本%s" #: rhodecode/controllers/files.py:391 msgid "Empty repository" @@ -188,8 +189,8 @@ msgid "" "%s repository is not mapped to db perhaps it was created or renamed from the " "filesystem please run the application again in order to rescan repositories" msgstr "" -"版本库 %s 没有映射到数据库,可能是从文件系统创建或者重命名,请重启 RhodeCode " -"以重新扫描版本库" +"版本库%s没有映射到数据库,可能是从文件系统创建或者重命名,请重启RhodeCode以重" +"新扫描版本库" #: rhodecode/controllers/forks.py:134 rhodecode/controllers/settings.py:73 #, python-format @@ -197,18 +198,18 @@ msgid "" "%s repository is not mapped to db perhaps it was created or renamed from the " "file system please run the application again in order to rescan repositories" msgstr "" -" 版本库 %s 没有映射到数据库,可能是从文件系统创建或者重命名,请重启 " -"RhodeCode 以重新扫描版本库" +" 版本库%s没有映射到数据库,可能是从文件系统创建或者重命名,请重启RhodeCode以" +"重新扫描版本库" #: rhodecode/controllers/forks.py:168 #, python-format msgid "forked %s repository as %s" -msgstr "版本库 %s 被复刻到 %s" +msgstr "版本库%s被复刻到%s" #: rhodecode/controllers/forks.py:182 #, python-format msgid "An error occurred during repository forking %s" -msgstr "在复刻版本库 %s 的时候发生错误" +msgstr "在复刻版本库%s的时候发生错误" #: rhodecode/controllers/journal.py:203 rhodecode/controllers/journal.py:240 msgid "public journal" @@ -221,7 +222,7 @@ msgstr "日志" #: rhodecode/controllers/login.py:143 msgid "You have successfully registered into rhodecode" -msgstr "成功注册到 rhodecode" +msgstr "成功注册到RhodeCode" #: rhodecode/controllers/login.py:164 msgid "Your password reset link was sent" @@ -236,35 +237,35 @@ msgstr "密码已经成功重置,新密码已经发送到你的邮箱" msgid "Bookmarks" msgstr "书签" -#: rhodecode/controllers/pullrequests.py:182 +#: rhodecode/controllers/pullrequests.py:183 msgid "Pull request requires a title with min. 3 chars" -msgstr "拉取请求的标题至少 3 个字符" - -#: rhodecode/controllers/pullrequests.py:184 +msgstr "拉取请求的标题至少3个字符" + +#: rhodecode/controllers/pullrequests.py:185 msgid "error during creation of pull request" msgstr "提交拉取请求时发生错误" -#: rhodecode/controllers/pullrequests.py:205 +#: rhodecode/controllers/pullrequests.py:206 msgid "Successfully opened new pull request" msgstr "成功提交拉取请求" -#: rhodecode/controllers/pullrequests.py:208 +#: rhodecode/controllers/pullrequests.py:209 msgid "Error occurred during sending pull request" msgstr "提交拉取请求时发生错误" -#: rhodecode/controllers/pullrequests.py:241 +#: rhodecode/controllers/pullrequests.py:242 msgid "Successfully deleted pull request" msgstr "成功删除拉取请求" -#: rhodecode/controllers/search.py:132 +#: rhodecode/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "错误的搜索。请尝试用引号包含它。" -#: rhodecode/controllers/search.py:137 +#: rhodecode/controllers/search.py:139 msgid "There is no index to search in. Please run whoosh indexer" -msgstr "没有索引用于搜索。请运行 whoosh 索引器" - -#: rhodecode/controllers/search.py:141 +msgstr "没有索引用于搜索。请运行whoosh索引器" + +#: rhodecode/controllers/search.py:143 msgid "An error occurred during this search operation" msgstr "在搜索操作中发生异常" @@ -272,13 +273,13 @@ msgstr "在搜索操作中发生异常" #: rhodecode/controllers/admin/repos.py:266 #, python-format msgid "Repository %s updated successfully" -msgstr "版本库 %s 成功更新" +msgstr "版本库%s成功更新" #: rhodecode/controllers/settings.py:126 #: rhodecode/controllers/admin/repos.py:284 #, python-format msgid "error occurred during update of repository %s" -msgstr "在更新版本库 %s 的时候发生错误" +msgstr "在更新版本库%s的时候发生错误" #: rhodecode/controllers/settings.py:144 #: rhodecode/controllers/admin/repos.py:302 @@ -287,21 +288,21 @@ msgid "" "%s repository is not mapped to db perhaps it was moved or renamed from the " "filesystem please run the application again in order to rescan repositories" msgstr "" -"版本库 %s 没有映射到数据库,可能是从文件系统创建或者重命名,请重启 RhodeCode " -"以重新扫描版本库" +"版本库%s没有映射到数据库,可能是从文件系统创建或者重命名,请重启RhodeCode以重" +"新扫描版本库" #: rhodecode/controllers/settings.py:156 #: rhodecode/controllers/admin/repos.py:314 #, python-format msgid "deleted repository %s" -msgstr "已经删除版本库 %s" +msgstr "已经删除版本库%s" #: rhodecode/controllers/settings.py:160 #: rhodecode/controllers/admin/repos.py:324 #: rhodecode/controllers/admin/repos.py:330 #, python-format msgid "An error occurred during deletion of %s" -msgstr "在删除 %s 的时候发生错误" +msgstr "在删除%s的时候发生错误" #: rhodecode/controllers/settings.py:179 msgid "unlocked" @@ -314,7 +315,7 @@ msgstr "已锁" #: rhodecode/controllers/settings.py:184 #, python-format msgid "Repository has been %s" -msgstr "版本库已经 %s" +msgstr "版本库已经%s" #: rhodecode/controllers/settings.py:188 #: rhodecode/controllers/admin/repos.py:422 @@ -368,23 +369,23 @@ msgstr "未加密" #: rhodecode/controllers/admin/ldap_settings.py:65 msgid "LDAPS connection" -msgstr "LDAPS 连接" +msgstr "LDAPS连接" #: rhodecode/controllers/admin/ldap_settings.py:66 msgid "START_TLS on LDAP connection" -msgstr "LDAP 连接上的 START_TLS" +msgstr "LDAP连接上的START_TLS" #: rhodecode/controllers/admin/ldap_settings.py:126 msgid "Ldap settings updated successfully" -msgstr "LDAP 设置已经成功更新" +msgstr "LDAP设置已经成功更新" #: rhodecode/controllers/admin/ldap_settings.py:130 msgid "Unable to activate ldap. The \"python-ldap\" library is missing." -msgstr "无法启用 LDAP。缺失“python-ldap”库。" +msgstr "无法启用LDAP。缺失“python-ldap”库。" #: rhodecode/controllers/admin/ldap_settings.py:147 msgid "error occurred during update of ldap settings" -msgstr "更新 LDAP 设置时发生错误" +msgstr "更新LDAP设置时发生错误" #: rhodecode/controllers/admin/permissions.py:59 msgid "None" @@ -460,22 +461,22 @@ msgstr "-- 移除复刻 --" #: rhodecode/controllers/admin/repos.py:192 #, python-format msgid "created repository %s from %s" -msgstr "新版本库 %s 基于 %s 建立。" +msgstr "新版本库%s基于%s建立。" #: rhodecode/controllers/admin/repos.py:196 #, python-format msgid "created repository %s" -msgstr "建立版本库 %s" +msgstr "建立版本库%s" #: rhodecode/controllers/admin/repos.py:227 #, python-format msgid "error occurred during creation of repository %s" -msgstr "创建版本库时发生错误 %s" +msgstr "创建版本库时发生错误%s" #: rhodecode/controllers/admin/repos.py:319 #, python-format msgid "Cannot delete %s it still contains attached forks" -msgstr "无法删除 %s 因为它还有其他分复刻本库" +msgstr "无法删除%s因为它还有其他分复刻本库" #: rhodecode/controllers/admin/repos.py:348 msgid "An error occurred during deletion of repository user" @@ -520,7 +521,7 @@ msgstr "无" #: rhodecode/controllers/admin/repos.py:484 #, python-format msgid "Marked repo %s as fork of %s" -msgstr "成功将版本库 %s 标记为复刻自 %s" +msgstr "成功将版本库%s标记为复刻自%s" #: rhodecode/controllers/admin/repos.py:488 msgid "An error occurred during this operation" @@ -529,32 +530,32 @@ msgstr "在搜索操作中发生错误" #: rhodecode/controllers/admin/repos_groups.py:117 #, python-format msgid "created repos group %s" -msgstr "建立版本库组 %s" +msgstr "建立版本库组%s" #: rhodecode/controllers/admin/repos_groups.py:130 #, python-format msgid "error occurred during creation of repos group %s" -msgstr "创建版本库组时发生错误 %s" +msgstr "创建版本库组时发生错误%s" #: rhodecode/controllers/admin/repos_groups.py:164 #, python-format msgid "updated repos group %s" -msgstr "更新版本库组 %s" +msgstr "更新版本库组%s" #: rhodecode/controllers/admin/repos_groups.py:177 #, python-format msgid "error occurred during update of repos group %s" -msgstr "更新版本库组时发生错误 %s" +msgstr "更新版本库组时发生错误%s" #: rhodecode/controllers/admin/repos_groups.py:195 #, python-format msgid "This group contains %s repositores and cannot be deleted" -msgstr "这个组内有 %s 个版本库因而无法删除" +msgstr "这个组内有%s个版本库因而无法删除" #: rhodecode/controllers/admin/repos_groups.py:203 #, python-format msgid "removed repos group %s" -msgstr "移除版本库组 %s" +msgstr "移除版本库组%s" #: rhodecode/controllers/admin/repos_groups.py:209 msgid "Cannot delete this group it still contains subgroups" @@ -564,7 +565,7 @@ msgstr "不能删除包含子组的组" #: rhodecode/controllers/admin/repos_groups.py:219 #, python-format msgid "error occurred during deletion of repos group %s" -msgstr "删除版本库组时发生错误 %s" +msgstr "删除版本库组时发生错误%s" #: rhodecode/controllers/admin/repos_groups.py:240 msgid "An error occurred during deletion of group user" @@ -574,75 +575,75 @@ msgstr "删除组用户时发生错误" msgid "An error occurred during deletion of group users groups" msgstr "删除版本库组的用户组时发生错误" -#: rhodecode/controllers/admin/settings.py:122 +#: rhodecode/controllers/admin/settings.py:123 #, python-format msgid "Repositories successfully rescanned added: %s,removed: %s" -msgstr "重新扫描版本库成功,增加 %s, 移除 %s" - -#: rhodecode/controllers/admin/settings.py:130 +msgstr "重新扫描版本库成功,增加%s, 移除%s" + +#: rhodecode/controllers/admin/settings.py:131 msgid "Whoosh reindex task scheduled" -msgstr "Whoosh 重新索引任务调度" - -#: rhodecode/controllers/admin/settings.py:161 +msgstr "Whoosh重新索引任务调度" + +#: rhodecode/controllers/admin/settings.py:162 msgid "Updated application settings" msgstr "更新应用设置" -#: rhodecode/controllers/admin/settings.py:165 -#: rhodecode/controllers/admin/settings.py:293 +#: rhodecode/controllers/admin/settings.py:166 +#: rhodecode/controllers/admin/settings.py:294 msgid "error occurred during updating application settings" msgstr "更新设置时发生错误" -#: rhodecode/controllers/admin/settings.py:201 +#: rhodecode/controllers/admin/settings.py:202 msgid "Updated visualisation settings" msgstr "成功更新可视化设置" -#: rhodecode/controllers/admin/settings.py:206 +#: rhodecode/controllers/admin/settings.py:207 msgid "error occurred during updating visualisation settings" msgstr "更新可视化设置时发生错误" -#: rhodecode/controllers/admin/settings.py:289 +#: rhodecode/controllers/admin/settings.py:290 msgid "Updated VCS settings" msgstr "成功更新版本控制系统设置" -#: rhodecode/controllers/admin/settings.py:303 +#: rhodecode/controllers/admin/settings.py:304 msgid "Added new hook" msgstr "新建钩子" -#: rhodecode/controllers/admin/settings.py:315 +#: rhodecode/controllers/admin/settings.py:316 msgid "Updated hooks" msgstr "更新钩子" -#: rhodecode/controllers/admin/settings.py:319 +#: rhodecode/controllers/admin/settings.py:320 msgid "error occurred during hook creation" msgstr "创建钩子时发生错误" -#: rhodecode/controllers/admin/settings.py:338 +#: rhodecode/controllers/admin/settings.py:339 msgid "Email task created" msgstr "已创建电子邮件任务" -#: rhodecode/controllers/admin/settings.py:393 +#: rhodecode/controllers/admin/settings.py:394 msgid "You can't edit this user since it's crucial for entire application" msgstr "由于是系统帐号,无法编辑该用户" -#: rhodecode/controllers/admin/settings.py:424 +#: rhodecode/controllers/admin/settings.py:425 msgid "Your account was updated successfully" msgstr "你的帐号已经更新完成" -#: rhodecode/controllers/admin/settings.py:439 +#: rhodecode/controllers/admin/settings.py:440 #: rhodecode/controllers/admin/users.py:191 #, python-format msgid "error occurred during update of user %s" -msgstr "更新用户 %s 时发生错误" +msgstr "更新用户%s时发生错误" #: rhodecode/controllers/admin/users.py:130 #, python-format msgid "created user %s" -msgstr "创建用户 %s" +msgstr "创建用户%s" #: rhodecode/controllers/admin/users.py:142 #, python-format msgid "error occurred during creation of user %s" -msgstr "创建用户 %s 时发生错误" +msgstr "创建用户%s时发生错误" #: rhodecode/controllers/admin/users.py:171 msgid "User updated successfully" @@ -697,22 +698,22 @@ msgstr "成功删除用户电子邮件" #: rhodecode/controllers/admin/users_groups.py:84 #, python-format msgid "created users group %s" -msgstr "建立用户组 %s" +msgstr "建立用户组%s" #: rhodecode/controllers/admin/users_groups.py:95 #, python-format msgid "error occurred during creation of users group %s" -msgstr "创建用户组 %s 时发生错误" +msgstr "创建用户组%s时发生错误" #: rhodecode/controllers/admin/users_groups.py:135 #, python-format msgid "updated users group %s" -msgstr "更新用户组 %s" +msgstr "更新用户组%s" #: rhodecode/controllers/admin/users_groups.py:157 #, python-format msgid "error occurred during update of users group %s" -msgstr "更新用户组 %s 时发生错误" +msgstr "更新用户组%s时发生错误" #: rhodecode/controllers/admin/users_groups.py:174 msgid "successfully deleted users group" @@ -746,19 +747,19 @@ msgstr "必须是注册用户才能进行此操作" msgid "You need to be a signed in to view this page" msgstr "必须登录才能访问该页面" -#: rhodecode/lib/diffs.py:87 +#: rhodecode/lib/diffs.py:90 msgid "" "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "修订集因过大而被截断,可查看原始修订集作为替代" -#: rhodecode/lib/diffs.py:97 +#: rhodecode/lib/diffs.py:100 msgid "No changes detected" msgstr "未发现差异" #: rhodecode/lib/helpers.py:373 #, python-format msgid "%a, %d %b %Y %H:%M:%S" -msgstr "%Y/%b/%d %H:%M:%S %a" +msgstr "%Y/%m/%d %H:%M:%S" #: rhodecode/lib/helpers.py:485 msgid "True" @@ -775,7 +776,7 @@ msgstr "未找到修订集" #: rhodecode/lib/helpers.py:556 #, python-format msgid "Show all combined changesets %s->%s" -msgstr "显示合并的修订集 %s->%s" +msgstr "显示合并的修订集%s->%s" #: rhodecode/lib/helpers.py:562 msgid "compare view" @@ -788,23 +789,25 @@ msgstr "还有" #: rhodecode/lib/helpers.py:583 #, python-format msgid "%s more" -msgstr "%s 个" +msgstr "%s个" #: rhodecode/lib/helpers.py:584 #: rhodecode/templates/changelog/changelog.html:49 msgid "revisions" msgstr "修订" -#: rhodecode/lib/helpers.py:607 -msgid "fork name " -msgstr "复刻名称" +#: rhodecode/lib/helpers.py:608 +#, python-format +#| msgid "fork name " +msgid "fork name %s" +msgstr "复刻名称%s" #: rhodecode/lib/helpers.py:621 #: rhodecode/templates/pullrequests/pullrequest_show.html:4 #: rhodecode/templates/pullrequests/pullrequest_show.html:12 #, python-format msgid "Pull request #%s" -msgstr "拉取请求 #%s" +msgstr "拉取请求#%s" #: rhodecode/lib/helpers.py:627 msgid "[deleted] repository" @@ -864,7 +867,7 @@ msgstr "[推送]到" #: rhodecode/lib/helpers.py:661 msgid "[committed via RhodeCode] into repository" -msgstr "[通过 RhodeCode 提交]到版本库" +msgstr "[通过RhodeCode提交]到版本库" #: rhodecode/lib/helpers.py:663 msgid "[pulled from remote] into repository" @@ -885,59 +888,71 @@ msgstr "[停止关注]版本库" #: rhodecode/lib/helpers.py:845 #, python-format msgid " and %s more" -msgstr "还有 %s 个" +msgstr "还有%s个" #: rhodecode/lib/helpers.py:849 msgid "No Files" msgstr "没有文件" -#: rhodecode/lib/utils2.py:352 +#: rhodecode/lib/utils2.py:357 #, python-format msgid "%d year" msgid_plural "%d years" -msgstr[0] "%d 年" - -#: rhodecode/lib/utils2.py:353 +msgstr[0] "%d年" + +#: rhodecode/lib/utils2.py:358 #, python-format msgid "%d month" msgid_plural "%d months" -msgstr[0] "%d 月" - -#: rhodecode/lib/utils2.py:354 +msgstr[0] "%d月" + +#: rhodecode/lib/utils2.py:359 #, python-format msgid "%d day" msgid_plural "%d days" -msgstr[0] "%d 天" - -#: rhodecode/lib/utils2.py:355 +msgstr[0] "%d天" + +#: rhodecode/lib/utils2.py:360 #, python-format msgid "%d hour" msgid_plural "%d hours" -msgstr[0] "%d 小时" - -#: rhodecode/lib/utils2.py:356 +msgstr[0] "%d时" + +#: rhodecode/lib/utils2.py:361 #, python-format msgid "%d minute" msgid_plural "%d minutes" -msgstr[0] "%d 分钟" - -#: rhodecode/lib/utils2.py:357 +msgstr[0] "%d分" + +#: rhodecode/lib/utils2.py:362 #, python-format msgid "%d second" msgid_plural "%d seconds" -msgstr[0] "%d 秒" - -#: rhodecode/lib/utils2.py:372 +msgstr[0] "%d秒" + +#: rhodecode/lib/utils2.py:378 +#, python-format +#| msgid "on line %s" +msgid "in %s" +msgstr "%s前" + +#: rhodecode/lib/utils2.py:380 #, python-format msgid "%s ago" -msgstr "%s 之前" - -#: rhodecode/lib/utils2.py:374 +msgstr "%s前" + +#: rhodecode/lib/utils2.py:382 +#, python-format +#| msgid "%s and %s ago" +msgid "in %s and %s" +msgstr "%s%s前" + +#: rhodecode/lib/utils2.py:385 #, python-format msgid "%s and %s ago" -msgstr "%s 零 %s 之前" - -#: rhodecode/lib/utils2.py:377 +msgstr "%s%s前" + +#: rhodecode/lib/utils2.py:388 msgid "just now" msgstr "刚才" @@ -948,7 +963,7 @@ msgstr "密码重置链接" #: rhodecode/model/comment.py:110 #, python-format msgid "on line %s" -msgstr "在 %s 行" +msgstr "在%s行" #: rhodecode/model/comment.py:173 msgid "[Mention]" @@ -1041,7 +1056,7 @@ msgstr "请登录" #: rhodecode/model/forms.py:44 #, python-format msgid "Enter a value %(min)i characters long or more" -msgstr "输入一个不少于 %(min)i 个字符的值" +msgstr "输入一个不少于%(min)i个字符的值" #: rhodecode/model/forms.py:52 msgid "Please enter a password" @@ -1050,7 +1065,7 @@ msgstr "请输入密码" #: rhodecode/model/forms.py:53 #, python-format msgid "Enter %(min)i characters or more" -msgstr "输入少于 %(min)i 个字符" +msgstr "输入少于%(min)i个字符" #: rhodecode/model/notification.py:220 msgid "commented on commit" @@ -1066,7 +1081,7 @@ msgstr "提到了你" #: rhodecode/model/notification.py:223 msgid "registered in RhodeCode" -msgstr "注册到 RhodeCode" +msgstr "注册到RhodeCode" #: rhodecode/model/notification.py:224 msgid "opened new pull request" @@ -1079,15 +1094,15 @@ msgstr "评论了拉取请求" #: rhodecode/model/pull_request.py:89 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s" -msgstr "%(user)s 想要你检视拉取请求 #%(pr_id)s" +msgstr "%(user)s想要你检视拉取请求#%(pr_id)s" #: rhodecode/model/scm.py:535 msgid "latest tip" -msgstr "最后 tip 版本" +msgstr "最新tip版本" #: rhodecode/model/user.py:230 msgid "new user registration" -msgstr "[RhodeCode] 新用户注册" +msgstr "[RhodeCode]新用户注册" #: rhodecode/model/user.py:255 rhodecode/model/user.py:277 #: rhodecode/model/user.py:299 @@ -1104,8 +1119,7 @@ msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch owners " "or remove those repositories. %s" msgstr "" -"由于用户 \"%s\" 拥有版本库 %s 因而无法删除,请修改版本库所有者或删除版本" -"库。%s" +"由于用户 \"%s\" 拥有版本库%s因而无法删除,请修改版本库所有者或删除版本库。%s" #: rhodecode/model/validators.py:36 rhodecode/model/validators.py:37 msgid "Value cannot be an empty list" @@ -1114,7 +1128,7 @@ msgstr "值不能为空" #: rhodecode/model/validators.py:83 #, python-format msgid "Username \"%(username)s\" already exists" -msgstr "用户名称 %(username)s 已经存在" +msgstr "用户名称%(username)s已经存在" #: rhodecode/model/validators.py:85 #, python-format @@ -1151,7 +1165,7 @@ msgstr "" #: rhodecode/model/validators.py:175 msgid "Cannot assign this group as parent" -msgstr "不能将这个组作为 parent" +msgstr "不能将这个组作为parent" #: rhodecode/model/validators.py:176 #, python-format @@ -1186,12 +1200,12 @@ msgstr "该帐号已被禁用" #: rhodecode/model/validators.py:314 #, python-format msgid "Repository name %(repo)s is disallowed" -msgstr "版本库名称不能为 %(repo)s" +msgstr "版本库名称不能为%(repo)s" #: rhodecode/model/validators.py:316 #, python-format msgid "Repository named %(repo)s already exists" -msgstr "已经存在版本库 %(repo)s" +msgstr "已经存在版本库%(repo)s" #: rhodecode/model/validators.py:317 #, python-format @@ -1209,7 +1223,7 @@ msgstr "无效的克隆地址" #: rhodecode/model/validators.py:433 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" -msgstr "无效的克隆地址,提供一个有效的克隆 http(s) 或 svn+http(s) 地址" +msgstr "无效的克隆地址,提供一个有效的克隆 http(s)或svn+http(s)地址" #: rhodecode/model/validators.py:458 msgid "Fork have to be the same type as parent" @@ -1234,7 +1248,7 @@ msgstr "该邮件地址已被使用" #: rhodecode/model/validators.py:617 #, python-format msgid "e-mail \"%(email)s\" does not exist." -msgstr "邮件地址 \"%(email)s\" 不存在" +msgstr "邮件地址\"%(email)s\"不存在" #: rhodecode/model/validators.py:654 msgid "" @@ -1245,7 +1259,7 @@ msgstr "LDAP 登陆属性的 CN 必须指定 - 这个名字作为用户名" #: rhodecode/model/validators.py:673 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" -msgstr "修订 %(revs)s 已经包含在拉取请求中或者或者已经设置状态" +msgstr "修订%(revs)s已经包含在拉取请求中或者或者已经设置状态" #: rhodecode/templates/index.html:3 msgid "Dashboard" @@ -1362,13 +1376,13 @@ msgstr "Atom" #: rhodecode/templates/index_base.html:112 #, python-format msgid "Subscribe to %s rss feed" -msgstr "订阅 %s 的 RSS" +msgstr "订阅%s的RSS" #: rhodecode/templates/index_base.html:117 #: rhodecode/templates/index_base.html:119 #, python-format msgid "Subscribe to %s atom feed" -msgstr "订阅 %s 的 Atom" +msgstr "订阅%s的Atom" #: rhodecode/templates/index_base.html:140 msgid "Group Name" @@ -1605,7 +1619,7 @@ msgstr "日期" #: rhodecode/templates/admin/admin_log.html:9 msgid "From IP" -msgstr "来源 IP" +msgstr "来源IP" #: rhodecode/templates/admin/admin_log.html:53 msgid "No actions yet" @@ -1613,7 +1627,7 @@ msgstr "无操作" #: rhodecode/templates/admin/ldap/ldap.html:5 msgid "LDAP administration" -msgstr "LDAP 管理员" +msgstr "LDAP管理员" #: rhodecode/templates/admin/ldap/ldap.html:11 msgid "Ldap" @@ -1625,7 +1639,7 @@ msgstr "连接设置" #: rhodecode/templates/admin/ldap/ldap.html:30 msgid "Enable LDAP" -msgstr "启用 LDAP" +msgstr "启用LDAP" #: rhodecode/templates/admin/ldap/ldap.html:34 msgid "Host" @@ -1657,11 +1671,11 @@ msgstr "Base DN" #: rhodecode/templates/admin/ldap/ldap.html:63 msgid "LDAP Filter" -msgstr "LDAP 过滤器" +msgstr "LDAP过滤器" #: rhodecode/templates/admin/ldap/ldap.html:67 msgid "LDAP Search Scope" -msgstr "LDAP 搜索范围" +msgstr "LDAP搜索范围" #: rhodecode/templates/admin/ldap/ldap.html:70 msgid "Attribute mappings" @@ -1810,7 +1824,7 @@ msgstr "克隆自" #: rhodecode/templates/admin/repos/repo_edit.html:44 #: rhodecode/templates/settings/repo_settings.html:43 msgid "Optional http[s] url from which repository should be cloned." -msgstr "可选的,指定版本库应该从哪个 http[s] 地址克隆。" +msgstr "可选的,指定版本库应该从哪个http[s]地址克隆。" #: rhodecode/templates/admin/repos/repo_add_base.html:29 #: rhodecode/templates/admin/repos/repo_edit.html:49 @@ -1846,7 +1860,7 @@ msgstr "默认修订" #: rhodecode/templates/forks/fork.html:45 #: rhodecode/templates/settings/repo_settings.html:61 msgid "Default revision for files page, downloads, whoosh and readme" -msgstr "文件浏览、下载、whoosh和readme的默认修订版本" +msgstr "文件浏览、下载、whoosh和README的默认修订版本" #: rhodecode/templates/admin/repos/repo_add_base.html:60 #: rhodecode/templates/admin/repos/repo_edit.html:79 @@ -1854,7 +1868,7 @@ msgstr "文件浏览、下载、whoosh和readme的默认修订版本" #: rhodecode/templates/settings/repo_settings.html:70 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." -msgstr "保持简短。用 README 文件来写更长的描述。" +msgstr "保持简短。用README文件来写更长的描述。" #: rhodecode/templates/admin/repos/repo_add_base.html:69 #: rhodecode/templates/admin/repos/repo_edit.html:89 @@ -2081,7 +2095,7 @@ msgid "" " If you need fully delete it from filesystem please " "do it manually" msgstr "" -"这个版本库将以特殊的方式重命名这样 RhodeCode 和版本控制系统将不能访问它。\n" +"这个版本库将以特殊的方式重命名这样RhodeCode和版本控制系统将不能访问它。\n" " 如果需要从文件系统完全删除,你需要手动操作" #: rhodecode/templates/admin/repos/repo_edit_perms.html:3 @@ -2261,7 +2275,7 @@ msgstr "删除" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 #, python-format msgid "Confirm to delete this group: %s" -msgstr "确认删除该版本库组: %s" +msgstr "确认删除该版本库组:%s" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:62 msgid "There are no repositories groups yet" @@ -2327,7 +2341,7 @@ msgstr "重新扫描版本库" #: rhodecode/templates/admin/settings/settings.html:52 msgid "Whoosh indexing" -msgstr "Whoosh 索引" +msgstr "Whoosh索引" #: rhodecode/templates/admin/settings/settings.html:60 msgid "index build option" @@ -2397,15 +2411,15 @@ msgstr "网络" #: rhodecode/templates/admin/settings/settings.html:190 msgid "require ssl for vcs operations" -msgstr "要求使用 SSL进行版本控制系统操作" +msgstr "要求使用SSL进行版本控制系统操作" #: rhodecode/templates/admin/settings/settings.html:192 msgid "" "RhodeCode will require SSL for pushing or pulling. If SSL is missing it will " "return HTTP Error 406: Not Acceptable" msgstr "" -"勾选后 RhodeCode 将要求使用 SSL 进行推送和拉取。如果没有使用 SSL 将返回 HTTP " -"406错误:Not Acceptable" +"勾选后RhodeCode将要求使用SSL进行推送和拉取。如果没有使用SSL将返回HTTP 406错" +"误:Not Acceptable" #: rhodecode/templates/admin/settings/settings.html:198 msgid "Hooks" @@ -2433,7 +2447,7 @@ msgstr "高级设置" #: rhodecode/templates/admin/settings/settings.html:224 msgid "Mercurial Extensions" -msgstr "Mercurial 扩展" +msgstr "Mercurial扩展" #: rhodecode/templates/admin/settings/settings.html:229 msgid "largefiles extensions" @@ -2441,13 +2455,13 @@ msgstr "大文件扩展" #: rhodecode/templates/admin/settings/settings.html:233 msgid "hgsubversion extensions" -msgstr "hgsubversion 扩展" +msgstr "hgsubversion扩展" #: rhodecode/templates/admin/settings/settings.html:235 msgid "" "Requires hgsubversion library installed. Allows clonning from svn remote " "locations" -msgstr " 允许从远程 svn 地址克隆。需要安装 hgsubversion 库" +msgstr " 允许从远程svn地址克隆。需要安装hgsubversion库" #: rhodecode/templates/admin/settings/settings.html:245 msgid "Repositories location" @@ -2532,7 +2546,7 @@ msgstr "使用中" #: rhodecode/templates/admin/users/user_edit.html:43 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:20 msgid "API key" -msgstr "API 密钥" +msgstr "API密钥" #: rhodecode/templates/admin/users/user_edit.html:59 msgid "LDAP DN" @@ -2559,7 +2573,7 @@ msgstr "继承默认权限" msgid "" "Select to inherit permissions from %s settings. With this selected below " "options does not have any action" -msgstr "勾选以从 %s 继承权限设置。 勾选后下面的选项将不起作用" +msgstr "勾选以从%s继承权限设置。 勾选后下面的选项将不起作用" #: rhodecode/templates/admin/users/user_edit.html:158 #: rhodecode/templates/admin/users_groups/users_group_edit.html:119 @@ -2594,11 +2608,11 @@ msgstr "邮件地址" #: rhodecode/templates/admin/users/user_edit.html:256 #, python-format msgid "Confirm to delete this email: %s" -msgstr "确认删除邮件地址: %s" +msgstr "确认删除邮箱:%s" #: rhodecode/templates/admin/users/user_edit.html:270 msgid "New email address" -msgstr "增加邮件地址" +msgstr "增加邮箱" #: rhodecode/templates/admin/users/user_edit.html:277 msgid "Add" @@ -2637,7 +2651,7 @@ msgstr "我创建的" #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:10 #, python-format msgid "Pull request #%s opened on %s" -msgstr "拉取请求 #%s 创建于 %s" +msgstr "拉取请求#%s创建于%s" #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15 msgid "Confirm to delete this pull request" @@ -2651,7 +2665,7 @@ msgstr "我参与的" #: rhodecode/templates/pullrequests/pullrequest_show_all.html:30 #, python-format msgid "Pull request #%s opened by %s on %s" -msgstr "拉取请求 #%s 由 %s 创建于 %s" +msgstr "拉取请求#%s由%s创建于%s" #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:7 #: rhodecode/templates/bookmarks/bookmarks.html:40 @@ -2672,7 +2686,7 @@ msgstr "私有" #: rhodecode/templates/data_table/_dt_elements.html:7 #, python-format msgid "Confirm to delete this repository: %s" -msgstr "确认删除版本库: %s" +msgstr "确认删除版本库:%s" #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:38 #: rhodecode/templates/journal/journal.html:94 @@ -2788,11 +2802,11 @@ msgstr "成员" #: rhodecode/templates/admin/users_groups/users_groups.html:45 #, python-format msgid "Confirm to delete this users group: %s" -msgstr "确认删除该组: %s" +msgstr "确认删除该组:%s" #: rhodecode/templates/base/base.html:41 msgid "Submit a bug" -msgstr "提交 bug" +msgstr "提交bug" #: rhodecode/templates/base/base.html:77 msgid "Login to your account" @@ -2963,7 +2977,7 @@ msgstr "没有符合的文件" #: rhodecode/templates/bookmarks/bookmarks.html:5 #, python-format msgid "%s Bookmarks" -msgstr "%s 书签" +msgstr "%s书签" #: rhodecode/templates/bookmarks/bookmarks.html:39 #: rhodecode/templates/bookmarks/bookmarks_data.html:8 @@ -2976,7 +2990,7 @@ msgstr "作者" #: rhodecode/templates/branches/branches.html:5 #, python-format msgid "%s Branches" -msgstr "%s 分支" +msgstr "%s分支" #: rhodecode/templates/branches/branches.html:29 msgid "Compare branches" @@ -3013,13 +3027,13 @@ msgstr "比较显示" #: rhodecode/templates/changelog/changelog.html:6 #, python-format msgid "%s Changelog" -msgstr "%s 修订记录" +msgstr "%s修订记录" #: 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] "显示 %2d 中的 %1d 个版本" +msgstr[0] "显示%d/%d个版本" #: rhodecode/templates/changelog/changelog.html:38 #: rhodecode/templates/forks/forks_data.html:19 @@ -3069,11 +3083,13 @@ msgstr "无父版本" #: rhodecode/templates/changelog/changelog.html:113 #: rhodecode/templates/changeset/changeset.html:88 +#: rhodecode/templates/changeset/changeset_range.html:79 msgid "merge" msgstr "合并" #: rhodecode/templates/changelog/changelog.html:116 #: rhodecode/templates/changeset/changeset.html:91 +#: rhodecode/templates/changeset/changeset_range.html:82 #: rhodecode/templates/files/files.html:29 #: rhodecode/templates/files/files_add.html:33 #: rhodecode/templates/files/files_edit.html:33 @@ -3082,19 +3098,21 @@ msgid "branch" msgstr "分支" #: rhodecode/templates/changelog/changelog.html:122 +#: rhodecode/templates/changeset/changeset_range.html:88 msgid "bookmark" msgstr "书签" #: rhodecode/templates/changelog/changelog.html:128 #: rhodecode/templates/changeset/changeset.html:96 +#: rhodecode/templates/changeset/changeset_range.html:94 msgid "tag" msgstr "标签" #: rhodecode/templates/changelog/changelog.html:164 msgid "Show selected changes __S -> __E" -msgstr "显示选定的修订集 __S -> __E" - -#: rhodecode/templates/changelog/changelog.html:255 +msgstr "显示选定的修订集:__S -> __E" + +#: rhodecode/templates/changelog/changelog.html:256 msgid "There are no changes yet" msgstr "没有任何变更" @@ -3121,12 +3139,12 @@ msgstr "添加" #: rhodecode/templates/changeset/changeset.html:72 #, python-format msgid "affected %s files" -msgstr "影响 %s 文件" +msgstr "影响%s文件" #: rhodecode/templates/changeset/changeset.html:6 #, python-format msgid "%s Changeset" -msgstr "%s 修订集" +msgstr "%s修订集" #: rhodecode/templates/changeset/changeset.html:14 msgid "Changeset" @@ -3135,31 +3153,31 @@ msgstr "修订集" #: rhodecode/templates/changeset/changeset.html:43 #: rhodecode/templates/changeset/diff_block.html:20 msgid "raw diff" -msgstr "原始 diff" +msgstr "原始diff" #: rhodecode/templates/changeset/changeset.html:44 #: rhodecode/templates/changeset/diff_block.html:21 msgid "download diff" -msgstr "下载 diff" +msgstr "下载diff" #: rhodecode/templates/changeset/changeset.html:48 #: rhodecode/templates/changeset/changeset_file_comment.html:82 #, python-format msgid "%d comment" msgid_plural "%d comments" -msgstr[0] "%d 条评论" +msgstr[0] "%d条评论" #: rhodecode/templates/changeset/changeset.html:48 #: rhodecode/templates/changeset/changeset_file_comment.html:82 #, python-format msgid "(%d inline)" msgid_plural "(%d inline)" -msgstr[0] "(%d 内嵌)" +msgstr[0] "(%d内嵌)" #: rhodecode/templates/changeset/changeset.html:103 #, python-format msgid "%s files affected with %s insertions and %s deletions:" -msgstr "%s 个文件受影响包括 %s 行插入和 %s 行删除:" +msgstr "%s个文件受影响%s行插入和%s行删除:" #: rhodecode/templates/changeset/changeset_file_comment.html:42 msgid "Submitting..." @@ -3167,19 +3185,19 @@ msgstr "提交中……" #: rhodecode/templates/changeset/changeset_file_comment.html:45 msgid "Commenting on line {1}." -msgstr "在 {1} 行上评论" +msgstr "在{1}行上评论" #: rhodecode/templates/changeset/changeset_file_comment.html:46 #: rhodecode/templates/changeset/changeset_file_comment.html:121 #, python-format msgid "Comments parsed using %s syntax with %s support." -msgstr "评论使用 %s 语法并支持 %s" +msgstr "评论使用%s语法并支持%s" #: rhodecode/templates/changeset/changeset_file_comment.html:48 #: rhodecode/templates/changeset/changeset_file_comment.html:123 msgid "" "Use @username inside this text to send notification to this RhodeCode user" -msgstr "在文本中使用 @用户名 以发送通知到该 RhodeCode 用户" +msgstr "在文本中使用 @用户名 以发送通知到该RhodeCode用户" #: rhodecode/templates/changeset/changeset_file_comment.html:59 #: rhodecode/templates/changeset/changeset_file_comment.html:138 @@ -3189,7 +3207,7 @@ msgstr "评论" #: rhodecode/templates/changeset/changeset_file_comment.html:60 #: rhodecode/templates/changeset/changeset_file_comment.html:71 msgid "Hide" -msgstr "影藏" +msgstr "隐藏" #: rhodecode/templates/changeset/changeset_file_comment.html:67 msgid "You need to be logged in to comment." @@ -3218,7 +3236,7 @@ msgstr "评论并关闭" #: rhodecode/templates/changeset/changeset_range.html:5 #, python-format msgid "%s Changesets" -msgstr "%s 修订集" +msgstr "%s修订集" #: rhodecode/templates/changeset/changeset_range.html:29 #: rhodecode/templates/compare/compare_diff.html:29 @@ -3257,13 +3275,13 @@ msgstr "复刻" #: rhodecode/templates/journal/journal.html:126 #: rhodecode/templates/summary/summary.html:68 msgid "Mercurial repository" -msgstr "Mercurial 版本库" +msgstr "Mercurial版本库" #: rhodecode/templates/data_table/_dt_elements.html:62 #: rhodecode/templates/journal/journal.html:128 #: rhodecode/templates/summary/summary.html:71 msgid "Git repository" -msgstr "Git 版本库" +msgstr "Git版本库" #: rhodecode/templates/data_table/_dt_elements.html:69 #: rhodecode/templates/journal/journal.html:134 @@ -3284,21 +3302,21 @@ msgstr "无修订" #: rhodecode/templates/data_table/_dt_elements.html:104 #, python-format msgid "Confirm to delete this user: %s" -msgstr "确认删除用户: %s" +msgstr "确认删除用户:%s" #: rhodecode/templates/email_templates/main.html:8 msgid "This is an notification from RhodeCode." -msgstr "这是 RhodeCode 发送的一个通知。" +msgstr "这是RhodeCode发送的一个通知。" #: rhodecode/templates/errors/error_document.html:46 #, python-format msgid "You will be redirected to %s in %s seconds" -msgstr "%1s 秒后你将重定向到 %2s" +msgstr "重定向到%s,于%s秒后" #: rhodecode/templates/files/file_diff.html:4 #, python-format msgid "%s File diff" -msgstr "%s 文件差异" +msgstr "%s文件差异" #: rhodecode/templates/files/file_diff.html:12 msgid "File diff" @@ -3308,7 +3326,7 @@ msgstr "文件差异" #: rhodecode/templates/files/files.html:72 #, python-format msgid "%s files" -msgstr "%s 文件" +msgstr "%s文件" #: rhodecode/templates/files/files.html:12 #: rhodecode/templates/summary/summary.html:340 @@ -3324,7 +3342,7 @@ msgstr "选择链接" #: rhodecode/templates/files/files_edit.html:4 #, python-format msgid "%s Edit file" -msgstr "%s 编辑文件" +msgstr "%s编辑文件" #: rhodecode/templates/files/files_add.html:19 msgid "add file" @@ -3408,7 +3426,7 @@ msgstr "大小" #: rhodecode/templates/files/files_browser.html:49 msgid "Mimetype" -msgstr "MIME 类型" +msgstr "MIME类型" #: rhodecode/templates/files/files_browser.html:50 msgid "Last Revision" @@ -3466,7 +3484,7 @@ msgstr "显示修订" #, python-format msgid "%s author" msgid_plural "%s authors" -msgstr[0] "%s 个作者" +msgstr[0] "%s个作者" #: rhodecode/templates/files/files_source.html:36 msgid "show source" @@ -3496,7 +3514,7 @@ msgstr "指定的路径中没有文件" #: rhodecode/templates/followers/followers.html:5 #, python-format msgid "%s Followers" -msgstr "%s 个关注者" +msgstr "%s个关注者" #: rhodecode/templates/followers/followers.html:13 msgid "followers" @@ -3558,11 +3576,11 @@ msgstr "无复刻" #: rhodecode/templates/journal/journal.html:13 msgid "ATOM journal feed" -msgstr "订阅日志 ATOM" +msgstr "订阅日志ATOM" #: rhodecode/templates/journal/journal.html:14 msgid "RSS journal feed" -msgstr "订阅日志 RSS" +msgstr "订阅日志RSS" #: rhodecode/templates/journal/journal.html:24 #: rhodecode/templates/pullrequests/pullrequest.html:53 @@ -3572,12 +3590,12 @@ msgstr "刷新" #: rhodecode/templates/journal/journal.html:27 #: rhodecode/templates/journal/public_journal.html:24 msgid "RSS feed" -msgstr "订阅 RSS" +msgstr "订阅RSS" #: rhodecode/templates/journal/journal.html:30 #: rhodecode/templates/journal/public_journal.html:27 msgid "ATOM feed" -msgstr "订阅 ATOM" +msgstr "订阅ATOM" #: rhodecode/templates/journal/journal.html:41 msgid "Watched" @@ -3605,11 +3623,11 @@ msgstr "没有条目" #: rhodecode/templates/journal/public_journal.html:13 msgid "ATOM public journal feed" -msgstr "订阅公共日志 ATOM" +msgstr "订阅公共日志ATOM" #: rhodecode/templates/journal/public_journal.html:14 msgid "RSS public journal feed" -msgstr "订阅公共日志 RSS" +msgstr "订阅公共日志RSS" #: rhodecode/templates/journal/public_journal.html:21 msgid "Public Journal" @@ -3664,7 +3682,7 @@ msgstr "发送拉取请求" #: rhodecode/templates/pullrequests/pullrequest_show.html:23 #, python-format msgid "Closed %s" -msgstr "关闭于 %s" +msgstr "于%s前关闭" #: rhodecode/templates/pullrequests/pullrequest_show.html:23 #, python-format @@ -3687,16 +3705,15 @@ msgstr "还未检视的检视人员" #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" -msgstr[0] "%d 个检视者" +msgstr[0] "%d个检视者" #: rhodecode/templates/pullrequests/pullrequest_show.html:50 -#| msgid "Pull request reviewers" msgid "pull request was reviewed by all reviewers" msgstr "拉取请求已经被所有检视人员检视" #: rhodecode/templates/pullrequests/pullrequest_show.html:58 msgid "Created on" -msgstr "创建于 %s" +msgstr "创建于" #: rhodecode/templates/pullrequests/pullrequest_show.html:65 msgid "Compare view" @@ -3726,13 +3743,13 @@ msgstr "搜索 \"%s\" 于版本库 %s 中" #: rhodecode/templates/search/search.html:8 #, python-format msgid "Search \"%s\" in all repositories" -msgstr "在所有的版本库中搜索 \"%s\"" +msgstr "在所有的版本库中搜索 \"%s\"" #: rhodecode/templates/search/search.html:12 #: rhodecode/templates/search/search.html:32 #, python-format msgid "Search in repository: %s" -msgstr "在版本库 %s 中搜索" +msgstr "在版本库%s中搜索" #: rhodecode/templates/search/search.html:14 #: rhodecode/templates/search/search.html:34 @@ -3768,12 +3785,12 @@ msgstr "权限不足" #: rhodecode/templates/settings/repo_settings.html:5 #, python-format msgid "%s Settings" -msgstr "%s 设置" +msgstr "%s设置" #: rhodecode/templates/shortlog/shortlog.html:5 #, python-format msgid "%s Shortlog" -msgstr "%s 简短日志" +msgstr "%s简短日志" #: rhodecode/templates/shortlog/shortlog.html:14 msgid "shortlog" @@ -3789,20 +3806,20 @@ msgstr "没有提交信息" #: rhodecode/templates/shortlog/shortlog_data.html:77 msgid "Add or upload files directly via RhodeCode" -msgstr "通过 RhodeCode 直接添加或者上传文件" +msgstr "通过RhodeCode直接添加或者上传文件" #: rhodecode/templates/shortlog/shortlog_data.html:86 msgid "Push new repo" -msgstr "Push 新版本库" +msgstr "推送新版本库" #: rhodecode/templates/shortlog/shortlog_data.html:94 msgid "Existing repository?" -msgstr "现有版本库?" +msgstr "已有版本库?" #: rhodecode/templates/summary/summary.html:4 #, python-format msgid "%s Summary" -msgstr "%s 概要" +msgstr "%s概要" #: rhodecode/templates/summary/summary.html:12 msgid "summary" @@ -3811,12 +3828,12 @@ msgstr "概要" #: rhodecode/templates/summary/summary.html:20 #, python-format msgid "repo %s ATOM feed" -msgstr "订阅 ATOM %s" +msgstr "订阅ATOM %s" #: rhodecode/templates/summary/summary.html:21 #, python-format msgid "repo %s RSS feed" -msgstr "订阅 RSS %s" +msgstr "订阅RSS %s" #: rhodecode/templates/summary/summary.html:49 #: rhodecode/templates/summary/summary.html:52 @@ -3826,7 +3843,7 @@ msgstr "ATOM" #: rhodecode/templates/summary/summary.html:82 #, python-format msgid "Non changable ID %s" -msgstr "不可变 ID %s" +msgstr "不可变ID %s" #: rhodecode/templates/summary/summary.html:87 msgid "public" @@ -3850,7 +3867,7 @@ msgstr "以名字显示" #: rhodecode/templates/summary/summary.html:134 msgid "Show by ID" -msgstr "以 ID 显示" +msgstr "按ID显示" #: rhodecode/templates/summary/summary.html:142 msgid "Trending files" @@ -3876,7 +3893,7 @@ msgstr "这个版本库的下载已经禁用" #: rhodecode/templates/summary/summary.html:170 msgid "Download as zip" -msgstr "下载 zip 包" +msgstr "zip打包下载" #: rhodecode/templates/summary/summary.html:173 msgid "Check this to download archive with subrepos" @@ -3892,7 +3909,7 @@ msgstr "按日期或作者的提交活动" #: rhodecode/templates/summary/summary.html:197 msgid "Stats gathered: " -msgstr "已收集的统计: " +msgstr "已收集的统计:" #: rhodecode/templates/summary/summary.html:218 msgid "Shortlog" @@ -3905,16 +3922,16 @@ msgstr "快速入门" #: rhodecode/templates/summary/summary.html:233 #, python-format msgid "Readme file at revision '%s'" -msgstr "修订 '%s' 中的README" +msgstr "修订'%s'中的README" #: rhodecode/templates/summary/summary.html:236 msgid "Permalink to this readme" -msgstr "这个 README 的固定链接" +msgstr "这个README的永久链接" #: rhodecode/templates/summary/summary.html:293 #, python-format msgid "Download %s as %s" -msgstr "下载 %s 作为 %s" +msgstr "下载%s为%s包" #: rhodecode/templates/summary/summary.html:650 msgid "commits" @@ -3951,4 +3968,4 @@ msgstr "文件已删除" #: rhodecode/templates/tags/tags.html:5 #, python-format msgid "%s Tags" -msgstr "%s 标签" +msgstr "%s标签"