l10n: zh_CN: for git v2.6.0 l10n round 2
Update 2 translations (2440t0f0u) for git v2.6.0-rc2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
This commit is contained in:
Jiang Xin
parent
3ffa1ab2c8
commit
03ea3327da
155
po/zh_CN.po
155
po/zh_CN.po
@ -134,8 +134,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Git\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2015-09-05 09:16+0800\n"
|
||||
"PO-Revision-Date: 2015-09-08 23:00+0800\n"
|
||||
"POT-Creation-Date: 2015-09-15 06:45+0800\n"
|
||||
"PO-Revision-Date: 2015-09-15 21:49+0800\n"
|
||||
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
|
||||
"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
|
||||
"Language: zh_CN\n"
|
||||
@ -464,8 +464,8 @@ msgstr "index-pack 终止"
|
||||
msgid "invalid color value: %.*s"
|
||||
msgstr "无效的颜色值：%.*s"
|
||||
|
||||
#: commit.c:40 builtin/am.c:451 builtin/am.c:487 builtin/am.c:1489
|
||||
#: builtin/am.c:2101
|
||||
#: commit.c:40 builtin/am.c:451 builtin/am.c:487 builtin/am.c:1516
|
||||
#: builtin/am.c:2128
|
||||
#, c-format
|
||||
msgid "could not parse %s"
|
||||
msgstr "不能解析 %s"
|
||||
@ -785,7 +785,7 @@ msgstr "%s：%s - %s"
|
||||
msgid "failed to read the cache"
|
||||
msgstr "无法读取缓存"
|
||||
|
||||
#: merge.c:94 builtin/am.c:1974 builtin/am.c:2009 builtin/checkout.c:375
|
||||
#: merge.c:94 builtin/am.c:2001 builtin/am.c:2036 builtin/checkout.c:375
|
||||
#: builtin/checkout.c:586 builtin/clone.c:715
|
||||
msgid "unable to write new index file"
|
||||
msgstr "无法写新的索引文件"
|
||||
@ -2410,7 +2410,7 @@ msgstr "无法写入新索引文件"
|
||||
msgid "could not stat %s"
|
||||
msgstr "不能获取 %s 的文件状态"
|
||||
|
||||
#: builtin/am.c:270 builtin/am.c:1318 builtin/commit.c:737
|
||||
#: builtin/am.c:270 builtin/am.c:1345 builtin/commit.c:737
|
||||
#: builtin/merge.c:1079
|
||||
#, c-format
|
||||
msgid "could not read '%s'"
|
||||
@ -2502,29 +2502,29 @@ msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。"
|
||||
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
|
||||
msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。"
|
||||
|
||||
#: builtin/am.c:1312
|
||||
#: builtin/am.c:1339
|
||||
msgid "Patch is empty. Was it split wrong?"
|
||||
msgstr "补丁为空。是不是切分错误？"
|
||||
|
||||
#: builtin/am.c:1386 builtin/log.c:1345
|
||||
#: builtin/am.c:1413 builtin/log.c:1345
|
||||
#, c-format
|
||||
msgid "invalid ident line: %s"
|
||||
msgstr "包含无效的身份标识：%s"
|
||||
|
||||
#: builtin/am.c:1413
|
||||
#: builtin/am.c:1440
|
||||
#, c-format
|
||||
msgid "unable to parse commit %s"
|
||||
msgstr "不能解析提交 %s"
|
||||
|
||||
#: builtin/am.c:1587
|
||||
#: builtin/am.c:1614
|
||||
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
|
||||
msgstr "仓库缺乏必要的数据对象以进行三方合并。"
|
||||
|
||||
#: builtin/am.c:1589
|
||||
#: builtin/am.c:1616
|
||||
msgid "Using index info to reconstruct a base tree..."
|
||||
msgstr "使用索引来重建一个（三方合并的）基础目录树..."
|
||||
|
||||
#: builtin/am.c:1608
|
||||
#: builtin/am.c:1635
|
||||
msgid ""
|
||||
"Did you hand edit your patch?\n"
|
||||
"It does not apply to blobs recorded in its index."
|
||||
@ -2532,37 +2532,37 @@ msgstr ""
|
||||
"您是否曾手动编辑过您的补丁？\n"
|
||||
"无法应用补丁到索引中的数据对象上。"
|
||||
|
||||
#: builtin/am.c:1614
|
||||
#: builtin/am.c:1641
|
||||
msgid "Falling back to patching base and 3-way merge..."
|
||||
msgstr "回落到基础版本上打补丁及进行三方合并..."
|
||||
|
||||
#: builtin/am.c:1639
|
||||
#: builtin/am.c:1666
|
||||
msgid "Failed to merge in the changes."
|
||||
msgstr "无法合并变更。"
|
||||
|
||||
#: builtin/am.c:1664 builtin/merge.c:632
|
||||
#: builtin/am.c:1691 builtin/merge.c:632
|
||||
msgid "git write-tree failed to write a tree"
|
||||
msgstr "git write-tree 无法写入一树对象"
|
||||
|
||||
#: builtin/am.c:1671
|
||||
#: builtin/am.c:1698
|
||||
msgid "applying to an empty history"
|
||||
msgstr "正应用到一个空历史上"
|
||||
|
||||
#: builtin/am.c:1684 builtin/commit.c:1752 builtin/merge.c:829
|
||||
#: builtin/am.c:1711 builtin/commit.c:1752 builtin/merge.c:829
|
||||
#: builtin/merge.c:854
|
||||
msgid "failed to write commit object"
|
||||
msgstr "无法写提交对象"
|
||||
|
||||
#: builtin/am.c:1716 builtin/am.c:1720
|
||||
#: builtin/am.c:1743 builtin/am.c:1747
|
||||
#, c-format
|
||||
msgid "cannot resume: %s does not exist."
|
||||
msgstr "无法继续：%s 不存在。"
|
||||
|
||||
#: builtin/am.c:1736
|
||||
#: builtin/am.c:1763
|
||||
msgid "cannot be interactive without stdin connected to a terminal."
|
||||
msgstr "标准输入没有和终端关联，不能进行交互式操作。"
|
||||
|
||||
#: builtin/am.c:1741
|
||||
#: builtin/am.c:1768
|
||||
msgid "Commit Body is:"
|
||||
msgstr "提交内容为："
|
||||
|
||||
@ -2571,35 +2571,35 @@ msgstr "提交内容为："
|
||||
#. in your translation. The program will only accept English
|
||||
#. input at this point.
|
||||
#.
|
||||
#: builtin/am.c:1751
|
||||
#: builtin/am.c:1778
|
||||
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
|
||||
msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]："
|
||||
|
||||
#: builtin/am.c:1801
|
||||
#: builtin/am.c:1828
|
||||
#, c-format
|
||||
msgid "Dirty index: cannot apply patches (dirty: %s)"
|
||||
msgstr "脏索引：不能应用补丁（脏文件：%s）"
|
||||
|
||||
#: builtin/am.c:1836 builtin/am.c:1907
|
||||
#: builtin/am.c:1863 builtin/am.c:1934
|
||||
#, c-format
|
||||
msgid "Applying: %.*s"
|
||||
msgstr "应用：%.*s"
|
||||
|
||||
#: builtin/am.c:1852
|
||||
#: builtin/am.c:1879
|
||||
msgid "No changes -- Patch already applied."
|
||||
msgstr "没有变更 —— 补丁已经应用过。"
|
||||
|
||||
#: builtin/am.c:1860
|
||||
#: builtin/am.c:1887
|
||||
#, c-format
|
||||
msgid "Patch failed at %s %.*s"
|
||||
msgstr "打补丁失败于 %s %.*s"
|
||||
|
||||
#: builtin/am.c:1866
|
||||
#: builtin/am.c:1893
|
||||
#, c-format
|
||||
msgid "The copy of the patch that failed is found in: %s"
|
||||
msgstr "失败的补丁文件副本位于：%s"
|
||||
|
||||
#: builtin/am.c:1910
|
||||
#: builtin/am.c:1937
|
||||
msgid ""
|
||||
"No changes - did you forget to use 'git add'?\n"
|
||||
"If there is nothing left to stage, chances are that something else\n"
|
||||
@ -2609,7 +2609,7 @@ msgstr ""
|
||||
"如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"
|
||||
"您也许想要跳过这个补丁。"
|
||||
|
||||
#: builtin/am.c:1917
|
||||
#: builtin/am.c:1944
|
||||
msgid ""
|
||||
"You still have unmerged paths in your index.\n"
|
||||
"Did you forget to use 'git add'?"
|
||||
@ -2617,105 +2617,105 @@ msgstr ""
|
||||
"您的索引中仍有未合并的路径。\n"
|
||||
"您是否忘了执行 'git add'？"
|
||||
|
||||
#: builtin/am.c:2025 builtin/am.c:2029 builtin/am.c:2041 builtin/reset.c:308
|
||||
#: builtin/am.c:2052 builtin/am.c:2056 builtin/am.c:2068 builtin/reset.c:308
|
||||
#: builtin/reset.c:316
|
||||
#, c-format
|
||||
msgid "Could not parse object '%s'."
|
||||
msgstr "不能解析对象 '%s'。"
|
||||
|
||||
#: builtin/am.c:2077
|
||||
#: builtin/am.c:2104
|
||||
msgid "failed to clean index"
|
||||
msgstr "无法清空索引"
|
||||
|
||||
#: builtin/am.c:2111
|
||||
#: builtin/am.c:2138
|
||||
msgid ""
|
||||
"You seem to have moved HEAD since the last 'am' failure.\n"
|
||||
"Not rewinding to ORIG_HEAD"
|
||||
msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
|
||||
|
||||
#: builtin/am.c:2172
|
||||
#: builtin/am.c:2199
|
||||
#, c-format
|
||||
msgid "Invalid value for --patch-format: %s"
|
||||
msgstr "无效的 --patch-format 值：%s"
|
||||
|
||||
#: builtin/am.c:2194
|
||||
#: builtin/am.c:2221
|
||||
msgid "git am [options] [(<mbox>|<Maildir>)...]"
|
||||
msgstr "git am [选项] [(<mbox>|<Maildir>)...]"
|
||||
|
||||
#: builtin/am.c:2195
|
||||
#: builtin/am.c:2222
|
||||
msgid "git am [options] (--continue | --skip | --abort)"
|
||||
msgstr "git am [选项] (--continue | --skip | --abort)"
|
||||
|
||||
#: builtin/am.c:2201
|
||||
#: builtin/am.c:2228
|
||||
msgid "run interactively"
|
||||
msgstr "以交互式方式运行"
|
||||
|
||||
#: builtin/am.c:2203
|
||||
#: builtin/am.c:2230
|
||||
msgid "historical option -- no-op"
|
||||
msgstr "老的参数 —— 无作用"
|
||||
|
||||
#: builtin/am.c:2205
|
||||
#: builtin/am.c:2232
|
||||
msgid "allow fall back on 3way merging if needed"
|
||||
msgstr "如果必要，允许使用三方合并。"
|
||||
|
||||
#: builtin/am.c:2206 builtin/init-db.c:509 builtin/prune-packed.c:57
|
||||
#: builtin/am.c:2233 builtin/init-db.c:509 builtin/prune-packed.c:57
|
||||
#: builtin/repack.c:171
|
||||
msgid "be quiet"
|
||||
msgstr "静默模式"
|
||||
|
||||
#: builtin/am.c:2208
|
||||
#: builtin/am.c:2235
|
||||
msgid "add a Signed-off-by line to the commit message"
|
||||
msgstr "在提交说明中添加一个 Signed-off-by 签名"
|
||||
|
||||
#: builtin/am.c:2211
|
||||
#: builtin/am.c:2238
|
||||
msgid "recode into utf8 (default)"
|
||||
msgstr "使用 utf8 字符集（默认）"
|
||||
|
||||
#: builtin/am.c:2213
|
||||
#: builtin/am.c:2240
|
||||
msgid "pass -k flag to git-mailinfo"
|
||||
msgstr "向 git-mailinfo 传递 -k 参数"
|
||||
|
||||
#: builtin/am.c:2215
|
||||
#: builtin/am.c:2242
|
||||
msgid "pass -b flag to git-mailinfo"
|
||||
msgstr "向 git-mailinfo 传递 -b 参数"
|
||||
|
||||
#: builtin/am.c:2217
|
||||
#: builtin/am.c:2244
|
||||
msgid "pass -m flag to git-mailinfo"
|
||||
msgstr "向 git-mailinfo 传递 -m 参数"
|
||||
|
||||
#: builtin/am.c:2219
|
||||
#: builtin/am.c:2246
|
||||
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
|
||||
msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数"
|
||||
|
||||
#: builtin/am.c:2222
|
||||
#: builtin/am.c:2249
|
||||
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
|
||||
msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置"
|
||||
|
||||
#: builtin/am.c:2225
|
||||
#: builtin/am.c:2252
|
||||
msgid "strip everything before a scissors line"
|
||||
msgstr "丢弃裁切线前的所有内容"
|
||||
|
||||
#: builtin/am.c:2226 builtin/apply.c:4563
|
||||
#: builtin/am.c:2253 builtin/apply.c:4563
|
||||
msgid "action"
|
||||
msgstr "动作"
|
||||
|
||||
#: builtin/am.c:2227 builtin/am.c:2230 builtin/am.c:2233 builtin/am.c:2236
|
||||
#: builtin/am.c:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248
|
||||
#: builtin/am.c:2254
|
||||
#: builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263
|
||||
#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
|
||||
#: builtin/am.c:2281
|
||||
msgid "pass it through git-apply"
|
||||
msgstr "传递给 git-apply"
|
||||
|
||||
#: builtin/am.c:2235 builtin/apply.c:4587
|
||||
#: builtin/am.c:2262 builtin/apply.c:4587
|
||||
msgid "root"
|
||||
msgstr "根目录"
|
||||
|
||||
#: builtin/am.c:2238 builtin/am.c:2241 builtin/apply.c:4525
|
||||
#: builtin/am.c:2265 builtin/am.c:2268 builtin/apply.c:4525
|
||||
#: builtin/apply.c:4528 builtin/clone.c:85 builtin/fetch.c:93
|
||||
#: builtin/pull.c:167
|
||||
msgid "path"
|
||||
msgstr "路径"
|
||||
|
||||
#: builtin/am.c:2244 builtin/fmt-merge-msg.c:669 builtin/fmt-merge-msg.c:672
|
||||
#: builtin/am.c:2271 builtin/fmt-merge-msg.c:669 builtin/fmt-merge-msg.c:672
|
||||
#: builtin/grep.c:698 builtin/merge.c:198 builtin/pull.c:127
|
||||
#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:664
|
||||
#: builtin/show-ref.c:180 builtin/tag.c:591 parse-options.h:132
|
||||
@ -2723,60 +2723,60 @@ msgstr "路径"
|
||||
msgid "n"
|
||||
msgstr "n"
|
||||
|
||||
#: builtin/am.c:2247 builtin/apply.c:4531
|
||||
#: builtin/am.c:2274 builtin/apply.c:4531
|
||||
msgid "num"
|
||||
msgstr "数字"
|
||||
|
||||
#: builtin/am.c:2250 builtin/for-each-ref.c:34 builtin/replace.c:438
|
||||
#: builtin/am.c:2277 builtin/for-each-ref.c:34 builtin/replace.c:438
|
||||
msgid "format"
|
||||
msgstr "格式"
|
||||
|
||||
#: builtin/am.c:2251
|
||||
#: builtin/am.c:2278
|
||||
msgid "format the patch(es) are in"
|
||||
msgstr "补丁的格式"
|
||||
|
||||
#: builtin/am.c:2257
|
||||
#: builtin/am.c:2284
|
||||
msgid "override error message when patch failure occurs"
|
||||
msgstr "打补丁失败时显示的错误信息"
|
||||
|
||||
#: builtin/am.c:2259
|
||||
#: builtin/am.c:2286
|
||||
msgid "continue applying patches after resolving a conflict"
|
||||
msgstr "冲突解决后继续应用补丁"
|
||||
|
||||
#: builtin/am.c:2262
|
||||
#: builtin/am.c:2289
|
||||
msgid "synonyms for --continue"
|
||||
msgstr "和 --continue 同义"
|
||||
|
||||
#: builtin/am.c:2265
|
||||
#: builtin/am.c:2292
|
||||
msgid "skip the current patch"
|
||||
msgstr "跳过当前补丁"
|
||||
|
||||
#: builtin/am.c:2268
|
||||
#: builtin/am.c:2295
|
||||
msgid "restore the original branch and abort the patching operation."
|
||||
msgstr "恢复原始分支并终止打补丁操作。"
|
||||
|
||||
#: builtin/am.c:2272
|
||||
#: builtin/am.c:2299
|
||||
msgid "lie about committer date"
|
||||
msgstr "将作者日期作为提交日期"
|
||||
|
||||
#: builtin/am.c:2274
|
||||
#: builtin/am.c:2301
|
||||
msgid "use current timestamp for author date"
|
||||
msgstr "用当前时间作为作者日期"
|
||||
|
||||
#: builtin/am.c:2276 builtin/commit.c:1590 builtin/merge.c:225
|
||||
#: builtin/am.c:2303 builtin/commit.c:1590 builtin/merge.c:225
|
||||
#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:606
|
||||
msgid "key-id"
|
||||
msgstr "key-id"
|
||||
|
||||
#: builtin/am.c:2277
|
||||
#: builtin/am.c:2304
|
||||
msgid "GPG-sign commits"
|
||||
msgstr "使用 GPG 签名提交"
|
||||
|
||||
#: builtin/am.c:2280
|
||||
#: builtin/am.c:2307
|
||||
msgid "(internal use for git-rebase)"
|
||||
msgstr "（内部使用，用于 git-rebase）"
|
||||
|
||||
#: builtin/am.c:2295
|
||||
#: builtin/am.c:2322
|
||||
msgid ""
|
||||
"The -b/--binary option has been a no-op for long time, and\n"
|
||||
"it will be removed. Please do not use it anymore."
|
||||
@ -2784,16 +2784,16 @@ msgstr ""
|
||||
"参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n"
|
||||
"请不要再使用它了。"
|
||||
|
||||
#: builtin/am.c:2302
|
||||
#: builtin/am.c:2329
|
||||
msgid "failed to read the index"
|
||||
msgstr "无法读取索引"
|
||||
|
||||
#: builtin/am.c:2317
|
||||
#: builtin/am.c:2344
|
||||
#, c-format
|
||||
msgid "previous rebase directory %s still exists but mbox given."
|
||||
msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。"
|
||||
|
||||
#: builtin/am.c:2341
|
||||
#: builtin/am.c:2368
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Stray %s directory found.\n"
|
||||
@ -2802,7 +2802,7 @@ msgstr ""
|
||||
"发现了错误的 %s 目录。\n"
|
||||
"使用 \"git am --abort\" 删除它。"
|
||||
|
||||
#: builtin/am.c:2347
|
||||
#: builtin/am.c:2374
|
||||
msgid "Resolve operation not in progress, we are not resuming."
|
||||
msgstr "解决操作未进行，我们不会继续。"
|
||||
|
||||
@ -8612,10 +8612,6 @@ msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
|
||||
msgid "Options related to merging"
|
||||
msgstr "和合并相关的选项"
|
||||
|
||||
#: builtin/pull.c:115
|
||||
msgid "false|true|preserve"
|
||||
msgstr "false|true|preserve"
|
||||
|
||||
#: builtin/pull.c:116
|
||||
msgid "incorporate changes by rebasing rather than merging"
|
||||
msgstr "使用变基操作取代合并操作以合入修改"
|
||||
@ -10288,8 +10284,8 @@ msgstr ""
|
||||
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
|
||||
|
||||
#: builtin/show-ref.c:11
|
||||
msgid "git show-ref --exclude-existing[=pattern] < ref-list"
|
||||
msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
|
||||
msgid "git show-ref --exclude-existing[=<pattern>] < <ref-list>"
|
||||
msgstr "git show-ref --exclude-existing[=<模式>] < <引用列表>"
|
||||
|
||||
#: builtin/show-ref.c:170
|
||||
msgid "only show tags (can be combined with heads)"
|
||||
@ -10510,7 +10506,7 @@ msgid "replace the tag if exists"
|
||||
msgstr "如果存在，替换现有的标签"
|
||||
|
||||
#: builtin/tag.c:609 builtin/update-ref.c:368
|
||||
msgid "create_reflog"
|
||||
msgid "create a reflog"
|
||||
msgstr "创建引用日志"
|
||||
|
||||
#: builtin/tag.c:611
|
||||
@ -11795,6 +11791,9 @@ msgstr "无法递归进子模组路径 '$sm_path'"
|
||||
msgid "Synchronizing submodule url for '$displaypath'"
|
||||
msgstr "为 '$displaypath' 同步子模组 url"
|
||||
|
||||
#~ msgid "false|true|preserve"
|
||||
#~ msgstr "false|true|preserve"
|
||||
|
||||
#~ msgid "BUG: reopen a lockfile that is still open"
|
||||
#~ msgstr "BUG: 重新打开一个仍打开着的锁文件"
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user