@matheusbsbs / matheus-bagliano / commits / d9d56b2357

l10n: zh_CN: various fixes on command arguments

Updated translations for Git 2.3.0 l10n round 2, and fixed various translations for command arguments. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Jiang Xin committed Jan 18, 2015 at 20:37 UTC d9d56b235724a6aaf10f1ce89b82cd457a7ef04c
1 file changed +175 -176
po/zh_CN.po
+175 -176
@@ -12,8 +12,8 @@ msgid ""
12 msgstr ""
13 "Project-Id-Version: Git\n"
14 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
15 -"POT-Creation-Date: 2015-01-13 14:05+0800\n"
16 -"PO-Revision-Date: 2015-01-13 14:21+0800\n"
15 +"POT-Creation-Date: 2015-01-18 11:24+0800\n"
16 +"PO-Revision-Date: 2015-01-18 20:34+0800\n"
17 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
18 "Language-Team: GitHub <https://github.com/gotgit/git/>\n"
19 "Language: zh_CN\n"
@@ -32,7 +32,7 @@ msgid ""
32 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
33 "as appropriate to mark resolution and make a commit."
34 msgstr ""
35 -"请在工作区改正文件，然后酌情使用 'git add/rm <file>' 命令标记\n"
35 +"请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n"
36 "解决方案并提交。"
37
38 #: archive.c:11
@@ -1153,7 +1153,7 @@ msgid ""
1153 "after resolving the conflicts, mark the corrected paths\n"
1154 "with 'git add <paths>' or 'git rm <paths>'"
1155 msgstr ""
1156 -"冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n"
1156 +"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
1157 "命令标记修正后的文件"
1158
1159 #: sequencer.c:198
@@ -1162,7 +1162,7 @@ msgid ""
1162 "with 'git add <paths>' or 'git rm <paths>'\n"
1163 "and commit the result with 'git commit'"
1164 msgstr ""
1165 -"冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n"
1165 +"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
1166 "对修正后的文件做标记，然后用 'git commit' 提交"
1167
1168 #: sequencer.c:211 sequencer.c:856 sequencer.c:939
@@ -1461,7 +1461,7 @@ msgstr "不能在 %s 中设置 core.worktree"
1461 msgid "unknown value '%s' for key '%s'"
1462 msgstr "键 '%2$s' 的未知取值 '%1$s'"
1463
1464 -#: trailer.c:552 trailer.c:557 builtin/remote.c:288
1464 +#: trailer.c:552 trailer.c:557 builtin/remote.c:290
1465 #, c-format
1466 msgid "more than one %s"
1467 msgstr "多于一个 %s"
@@ -1544,27 +1544,27 @@ msgstr "未合并的路径："
1544 #: wt-status.c:177 wt-status.c:204
1545 #, c-format
1546 msgid " (use \"git reset %s <file>...\" to unstage)"
1547 -msgstr " （使用 \"git reset %s <file>...\" 撤出暂存区）"
1547 +msgstr " （使用 \"git reset %s <文件>...\" 撤出暂存区）"
1548
1549 # 译者：注意保持前导空格
1550 #: wt-status.c:179 wt-status.c:206
1551 msgid " (use \"git rm --cached <file>...\" to unstage)"
1552 -msgstr " （使用 \"git rm --cached <file>...\" 撤出暂存区）"
1552 +msgstr " （使用 \"git rm --cached <文件>...\" 撤出暂存区）"
1553
1554 # 译者：注意保持前导空格
1555 #: wt-status.c:183
1556 msgid " (use \"git add <file>...\" to mark resolution)"
1557 -msgstr " （使用 \"git add <file>...\" 标记解决方案）"
1557 +msgstr " （使用 \"git add <文件>...\" 标记解决方案）"
1558
1559 # 译者：注意保持前导空格
1560 #: wt-status.c:185 wt-status.c:189
1561 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1562 -msgstr " （酌情使用 \"git add/rm <file>...\" 标记解决方案）"
1562 +msgstr " （酌情使用 \"git add/rm <文件>...\" 标记解决方案）"
1563
1564 # 译者：注意保持前导空格
1565 #: wt-status.c:187
1566 msgid " (use \"git rm <file>...\" to mark resolution)"
1567 -msgstr " （使用 \"git rm <file>...\" 标记解决方案）"
1567 +msgstr " （使用 \"git rm <文件>...\" 标记解决方案）"
1568
1569 #: wt-status.c:198
1570 msgid "Changes to be committed:"
@@ -1577,18 +1577,18 @@ msgstr "尚未暂存以备提交的变更："
1577 # 译者：注意保持前导空格
1578 #: wt-status.c:220
1579 msgid " (use \"git add <file>...\" to update what will be committed)"
1580 -msgstr " （使用 \"git add <file>...\" 更新要提交的内容）"
1580 +msgstr " （使用 \"git add <文件>...\" 更新要提交的内容）"
1581
1582 # 译者：注意保持前导空格
1583 #: wt-status.c:222
1584 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1585 -msgstr " （使用 \"git add/rm <file>...\" 更新要提交的内容）"
1585 +msgstr " （使用 \"git add/rm <文件>...\" 更新要提交的内容）"
1586
1587 # 译者：注意保持前导空格
1588 #: wt-status.c:223
1589 msgid ""
1590 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
1591 -msgstr " （使用 \"git checkout -- <file>...\" 丢弃工作区的改动）"
1591 +msgstr " （使用 \"git checkout -- <文件>...\" 丢弃工作区的改动）"
1592
1593 # 译者：注意保持前导空格
1594 #: wt-status.c:225
@@ -1599,7 +1599,7 @@ msgstr " （提交或丢弃子模组中未跟踪或修改的内容）"
1599 #: wt-status.c:237
1600 #, c-format
1601 msgid " (use \"git %s <file>...\" to include in what will be committed)"
1602 -msgstr " （使用 \"git %s <file>...\" 以包含要提交的内容）"
1602 +msgstr " （使用 \"git %s <文件>...\" 以包含要提交的内容）"
1603
1604 #: wt-status.c:252
1605 msgid "both deleted:"
@@ -2039,7 +2039,7 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"
2039 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
2040
2041 #: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110
2042 -#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1370
2042 +#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1372
2043 #: builtin/rm.c:269
2044 msgid "dry run"
2045 msgstr "演习"
@@ -2717,11 +2717,11 @@ msgstr "花费额外的循环来找到更好的匹配"
2717
2718 #: builtin/blame.c:2517
2719 msgid "Use revisions from <file> instead of calling git-rev-list"
2720 -msgstr "使用来自 <file> 的修订集而不是调用 git-rev-list"
2720 +msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
2721
2722 #: builtin/blame.c:2518
2723 msgid "Use <file>'s contents as the final image"
2724 -msgstr "使用 <file> 的内容作为最终的图片"
2724 +msgstr "使用 <文件> 的内容作为最终的图片"
2725
2726 #: builtin/blame.c:2519 builtin/blame.c:2520
2727 msgid "score"
@@ -3176,43 +3176,43 @@ msgstr "需要一个版本库来创建包。"
3176 msgid "Need a repository to unbundle."
3177 msgstr "需要一个版本库来解包。"
3178
3179 -#: builtin/cat-file.c:332
3179 +#: builtin/cat-file.c:328
3180 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
3181 msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>"
3182
3183 -#: builtin/cat-file.c:333
3183 +#: builtin/cat-file.c:329
3184 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
3185 msgstr "git cat-file (--batch|--batch-check) < <对象列表>"
3186
3187 -#: builtin/cat-file.c:370
3187 +#: builtin/cat-file.c:366
3188 msgid "<type> can be one of: blob, tree, commit, tag"
3189 msgstr "<类型> 可以是其中之一：blob、tree、commit、tag"
3190
3191 -#: builtin/cat-file.c:371
3191 +#: builtin/cat-file.c:367
3192 msgid "show object type"
3193 msgstr "显示对象类型"
3194
3195 -#: builtin/cat-file.c:372
3195 +#: builtin/cat-file.c:368
3196 msgid "show object size"
3197 msgstr "显示对象大小"
3198
3199 -#: builtin/cat-file.c:374
3199 +#: builtin/cat-file.c:370
3200 msgid "exit with zero when there's no error"
3201 msgstr "当没有错误时退出并返回零"
3202
3203 -#: builtin/cat-file.c:375
3203 +#: builtin/cat-file.c:371
3204 msgid "pretty-print object's content"
3205 msgstr "美观地打印对象的内容"
3206
3207 -#: builtin/cat-file.c:377
3207 +#: builtin/cat-file.c:373
3208 msgid "for blob objects, run textconv on object's content"
3209 msgstr "对于数据（blob）对象，对其内容执行 textconv"
3210
3211 -#: builtin/cat-file.c:379
3211 +#: builtin/cat-file.c:375
3212 msgid "show info and content of objects fed from the standard input"
3213 msgstr "显示从标准输入提供的对象的信息和内容"
3214
3215 -#: builtin/cat-file.c:382
3215 +#: builtin/cat-file.c:378
3216 msgid "show info about objects fed from the standard input"
3217 msgstr "显示从标准输入提供的对象的信息"
3218
@@ -5297,7 +5297,7 @@ msgstr " （%s 已成为摇摆状态）"
5297 msgid "[deleted]"
5298 msgstr "[已删除]"
5299
5300 -#: builtin/fetch.c:799 builtin/remote.c:1058
5300 +#: builtin/fetch.c:799 builtin/remote.c:1060
5301 msgid "(none)"
5302 msgstr "（无）"
5303
@@ -5369,11 +5369,11 @@ msgstr "获取组并指定引用规则没有意义"
5369 #: builtin/fmt-merge-msg.c:13
5370 msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
5371 msgstr ""
5372 -"git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
5372 +"git fmt-merge-msg [-m <说明>] [--log[=<n>]|--no-log] [--file <文件>]"
5373
5374 #: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698
5375 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182
5376 -#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:590
5376 +#: builtin/show-branch.c:657 builtin/show-ref.c:178 builtin/tag.c:590
5377 #: parse-options.h:132 parse-options.h:239
5378 msgid "n"
5379 msgstr "n"
@@ -5402,43 +5402,43 @@ msgstr "从文件中读取"
5402 msgid "unable to parse format"
5403 msgstr "不能解析格式"
5404
5405 -#: builtin/for-each-ref.c:1057
5405 +#: builtin/for-each-ref.c:1064
5406 msgid "git for-each-ref [options] [<pattern>]"
5407 msgstr "git for-each-ref [选项] [<模式>]"
5408
5409 -#: builtin/for-each-ref.c:1072
5409 +#: builtin/for-each-ref.c:1079
5410 msgid "quote placeholders suitably for shells"
5411 msgstr "引用占位符适用于 shells"
5412
5413 -#: builtin/for-each-ref.c:1074
5413 +#: builtin/for-each-ref.c:1081
5414 msgid "quote placeholders suitably for perl"
5415 msgstr "引用占位符适用于 perl"
5416
5417 -#: builtin/for-each-ref.c:1076
5417 +#: builtin/for-each-ref.c:1083
5418 msgid "quote placeholders suitably for python"
5419 msgstr "引用占位符适用于 python"
5420
5421 -#: builtin/for-each-ref.c:1078
5421 +#: builtin/for-each-ref.c:1085
5422 msgid "quote placeholders suitably for Tcl"
5423 msgstr "引用占位符适用于 Tcl"
5424
5425 -#: builtin/for-each-ref.c:1081
5425 +#: builtin/for-each-ref.c:1088
5426 msgid "show only <n> matched refs"
5427 msgstr "只显示 <n> 个匹配的引用"
5428
5429 -#: builtin/for-each-ref.c:1082 builtin/replace.c:438
5429 +#: builtin/for-each-ref.c:1089 builtin/replace.c:438
5430 msgid "format"
5431 msgstr "格式"
5432
5433 -#: builtin/for-each-ref.c:1082
5433 +#: builtin/for-each-ref.c:1089
5434 msgid "format to use for the output"
5435 msgstr "输出格式"
5436
5437 -#: builtin/for-each-ref.c:1083
5437 +#: builtin/for-each-ref.c:1090
5438 msgid "key"
5439 msgstr "key"
5440
5441 -#: builtin/for-each-ref.c:1084
5441 +#: builtin/for-each-ref.c:1091
5442 msgid "field name to sort on"
5443 msgstr "排序的字段名"
5444
@@ -5557,7 +5557,7 @@ msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"
5557
5558 #: builtin/grep.c:23
5559 msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
5560 -msgstr "git grep [选项] [-e] <模式> [<修订>...] [[--] <路径>...]"
5560 +msgstr "git grep [选项] [-e] <模式> [<版本>...] [[--] <路径>...]"
5561
5562 #: builtin/grep.c:218
5563 #, c-format
@@ -5876,7 +5876,7 @@ msgid ""
5876 "Please consider using 'man.<tool>.cmd' instead."
5877 msgstr ""
5878 "'%s'：不支持的 man 手册查看器的路径。\n"
5879 -"请使用 'man.<tool>.cmd'。"
5879 +"请使用 'man.<工具>.cmd'。"
5880
5881 #: builtin/help.c:227
5882 #, c-format
@@ -5885,7 +5885,7 @@ msgid ""
5885 "Please consider using 'man.<tool>.path' instead."
5886 msgstr ""
5887 "'%s': 支持的 man 手册查看器命令。\n"
5888 -"请使用 'man.<tool>.path'。"
5888 +"请使用 'man.<工具>.path'。"
5889
5890 #: builtin/help.c:354
5891 #, c-format
@@ -6376,8 +6376,7 @@ msgid ""
6376 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
6377 "dir=<directory>)"
6378 msgstr ""
6379 -"不允许 %s（或 --work-tree=<directory>）而没有指定 %s（或 --git-"
6380 -"dir=<directory>）"
6379 +"不允许 %s（或 --work-tree=<目录>）而没有指定 %s（或 --git-dir=<目录>）"
6380
6381 #: builtin/init-db.c:591
6382 #, c-format
@@ -6405,12 +6404,12 @@ msgid "trailer(s) to add"
6404 msgstr "要添加的签名"
6405
6406 #: builtin/log.c:41
6408 -msgid "git log [<options>] [<revision range>] [[--] <path>...]\n"
6409 -msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]\n"
6407 +msgid "git log [<options>] [<revision range>] [[--] <path>...]"
6408 +msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
6409
6410 #: builtin/log.c:42
6412 -msgid " or: git show [options] <object>..."
6413 -msgstr " 或者：git show [选项] <对象>..."
6411 +msgid "git show [options] <object>..."
6412 +msgstr "git show [选项] <对象>..."
6413
6414 #: builtin/log.c:81
6415 #, c-format
@@ -6489,7 +6488,7 @@ msgstr "不正常的 in-reply-to：%s"
6488
6489 #: builtin/log.c:1026
6490 msgid "git format-patch [options] [<since> | <revision range>]"
6492 -msgstr "git format-patch [选项] [<从> | <修订集范围>]"
6491 +msgstr "git format-patch [选项] [<从> | <版本范围>]"
6492
6493 #: builtin/log.c:1071
6494 msgid "Two output directories?"
@@ -6537,7 +6536,7 @@ msgstr "使用 [<前缀>] 代替 [PATCH]"
6536
6537 #: builtin/log.c:1208
6538 msgid "store resulting files in <dir>"
6540 -msgstr "把结果文件存储在 <dir>"
6539 +msgstr "把结果文件存储在 <目录>"
6540
6541 #: builtin/log.c:1211
6542 msgid "don't strip/add [PATCH]"
@@ -6581,19 +6580,19 @@ msgstr "添加抄送"
6580
6581 #: builtin/log.c:1227
6582 msgid "ident"
6584 -msgstr "ident"
6583 +msgstr "标识"
6584
6585 #: builtin/log.c:1228
6586 msgid "set From address to <ident> (or committer ident if absent)"
6588 -msgstr "设置 From 地址为 <ident>（如若不提供，用提交者ID做为地址）"
6587 +msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者ID做为地址）"
6588
6589 #: builtin/log.c:1230
6590 msgid "message-id"
6592 -msgstr "message-id"
6591 +msgstr "邮件标识"
6592
6593 #: builtin/log.c:1231
6594 msgid "make first mail a reply to <message-id>"
6596 -msgstr "使第一封邮件作为对 <message-id> 的回复"
6595 +msgstr "使第一封邮件作为对 <邮件标识> 的回复"
6596
6597 #: builtin/log.c:1232 builtin/log.c:1235
6598 msgid "boundary"
@@ -6678,7 +6677,7 @@ msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
6677 #, c-format
6678 msgid ""
6679 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
6681 -msgstr "不能找到跟踪的远程分支，请手工指定 <upstream>。\n"
6680 +msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n"
6681
6682 #: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665
6683 #, c-format
@@ -7176,7 +7175,7 @@ msgstr "git merge-base --is-ancestor <提交> <提交>"
7175
7176 #: builtin/merge-base.c:33
7177 msgid "git merge-base --fork-point <ref> [<commit>]"
7179 -msgstr "git merge-base --fork-point <提交> [<提交>]"
7178 +msgstr "git merge-base --fork-point <引用> [<提交>]"
7179
7180 #: builtin/merge-base.c:214
7181 msgid "output all common ancestors"
@@ -7196,7 +7195,7 @@ msgstr "第一个是其他的祖先提交么？"
7195
7196 #: builtin/merge-base.c:222
7197 msgid "find where <commit> forked from reflog of <ref>"
7199 -msgstr "查找 <commit> 从<引用>日志的何处分支的"
7198 +msgstr "查找 <提交> 从<引用>日志的何处分支的"
7199
7200 #: builtin/merge-file.c:8
7201 msgid ""
@@ -7340,7 +7339,7 @@ msgstr "%s，源=%s，目标=%s"
7339 msgid "Renaming %s to %s\n"
7340 msgstr "重命名 %s 至 %s\n"
7341
7343 -#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:355
7342 +#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:355
7343 #, c-format
7344 msgid "renaming '%s' failed"
7345 msgstr "重命名 '%s' 失败"
@@ -7705,7 +7704,7 @@ msgstr "注解引用"
7704 msgid "use notes from <notes_ref>"
7705 msgstr "从 <注解引用> 使用注解"
7706
7708 -#: builtin/notes.c:989 builtin/remote.c:1619
7707 +#: builtin/notes.c:989 builtin/remote.c:1621
7708 #, c-format
7709 msgid "Unknown subcommand: %s"
7710 msgstr "未知子命令：%s"
@@ -7825,7 +7824,7 @@ msgstr "不创建空的包输出"
7824
7825 #: builtin/pack-objects.c:2657
7826 msgid "read revision arguments from standard input"
7828 -msgstr "从标准输入读取修订号参数"
7827 +msgstr "从标准输入读取版本号参数"
7828
7829 #: builtin/pack-objects.c:2659
7830 msgid "limit the objects to those that are not yet packed"
@@ -7937,7 +7936,7 @@ msgstr "git push [<选项>] [<版本库> [<引用规则>...]]"
7936
7937 #: builtin/push.c:85
7938 msgid "tag shorthand without <tag>"
7940 -msgstr "tag 简写没有跟 <tag> 参数"
7939 +msgstr "tag 后面未提供 <标签> 参数"
7940
7941 #: builtin/push.c:95
7942 msgid "--delete only accepts plain target ref names"
@@ -7987,7 +7986,7 @@ msgstr ""
7986 "您当前不在一个分支上。\n"
7987 "现在为推送当前（分离头指针）的历史，使用\n"
7988 "\n"
7990 -" git push %s HEAD:<name-of-remote-branch>\n"
7989 +" git push %s HEAD:<远程分支名字>\n"
7990
7991 #: builtin/push.c:171
7992 #, c-format
@@ -8144,11 +8143,11 @@ msgstr ""
8143 "没有配置推送目标。\n"
8144 "或通过命令行指定URL，或用下面命令配置一个远程版本库\n"
8145 "\n"
8147 -" git remote add <name> <url>\n"
8146 +" git remote add <名称> <地址>\n"
8147 "\n"
8148 "然后使用该远程版本库名执行推送\n"
8149 "\n"
8151 -" git push <name>\n"
8150 +" git push <名称>\n"
8151
8152 #: builtin/push.c:410
8153 msgid "--all and --tags are incompatible"
@@ -8254,7 +8253,7 @@ msgstr ""
8253
8254 #: builtin/read-tree.c:110
8255 msgid "write resulting index to <file>"
8257 -msgstr "将索引结果写入 <file>"
8256 +msgstr "将索引结果写入 <文件>"
8257
8258 #: builtin/read-tree.c:113
8259 msgid "only empty the index"
@@ -8336,7 +8335,7 @@ msgid ""
8335 "mirror=<fetch|push>] <name> <url>"
8336 msgstr ""
8337 "git remote add [-t <分支>] [-m <master>] [-f] [--tags|--no-tags] [--"
8339 -"mirror=<fetch|push>] <名称> <url>"
8338 +"mirror=<fetch|push>] <名称> <地址>"
8339
8340 #: builtin/remote.c:14 builtin/remote.c:33
8341 msgid "git remote rename <old> <new>"
@@ -8461,55 +8460,55 @@ msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8460 msgid "specifying branches to track makes sense only with fetch mirrors"
8461 msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8462
8464 -#: builtin/remote.c:185 builtin/remote.c:641
8463 +#: builtin/remote.c:187 builtin/remote.c:643
8464 #, c-format
8465 msgid "remote %s already exists."
8466 msgstr "远程 %s 已经存在。"
8467
8469 -#: builtin/remote.c:189 builtin/remote.c:645
8468 +#: builtin/remote.c:191 builtin/remote.c:647
8469 #, c-format
8470 msgid "'%s' is not a valid remote name"
8471 msgstr "'%s' 不是一个有效的远程名称"
8472
8474 -#: builtin/remote.c:233
8473 +#: builtin/remote.c:235
8474 #, c-format
8475 msgid "Could not setup master '%s'"
8476 msgstr "无法设置 master '%s'"
8477
8479 -#: builtin/remote.c:333
8478 +#: builtin/remote.c:335
8479 #, c-format
8480 msgid "Could not get fetch map for refspec %s"
8481 msgstr "无法得到引用规则 %s 的获取列表"
8482
8484 -#: builtin/remote.c:434 builtin/remote.c:442
8483 +#: builtin/remote.c:436 builtin/remote.c:444
8484 msgid "(matching)"
8485 msgstr "（匹配）"
8486
8488 -#: builtin/remote.c:446
8487 +#: builtin/remote.c:448
8488 msgid "(delete)"
8489 msgstr "（删除）"
8490
8492 -#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602
8491 +#: builtin/remote.c:592 builtin/remote.c:598 builtin/remote.c:604
8492 #, c-format
8493 msgid "Could not append '%s' to '%s'"
8494 msgstr "不能添加 '%s' 至 '%s'"
8495
8497 -#: builtin/remote.c:634 builtin/remote.c:793 builtin/remote.c:893
8496 +#: builtin/remote.c:636 builtin/remote.c:795 builtin/remote.c:895
8497 #, c-format
8498 msgid "No such remote: %s"
8499 msgstr "没有这样的远程：%s"
8500
8502 -#: builtin/remote.c:651
8501 +#: builtin/remote.c:653
8502 #, c-format
8503 msgid "Could not rename config section '%s' to '%s'"
8504 msgstr "不能重命名配置小节 '%s' 到 '%s'"
8505
8507 -#: builtin/remote.c:657 builtin/remote.c:845
8506 +#: builtin/remote.c:659 builtin/remote.c:847
8507 #, c-format
8508 msgid "Could not remove config section '%s'"
8509 msgstr "不能移除配置小节 '%s'"
8510
8512 -#: builtin/remote.c:672
8511 +#: builtin/remote.c:674
8512 #, c-format
8513 msgid ""
8514 "Not updating non-default fetch refspec\n"
@@ -8520,32 +8519,32 @@ msgstr ""
8519 "\t%s\n"
8520 "\t如果必要请手动更新配置。"
8521
8523 -#: builtin/remote.c:678
8522 +#: builtin/remote.c:680
8523 #, c-format
8524 msgid "Could not append '%s'"
8525 msgstr "不能追加 '%s'"
8526
8528 -#: builtin/remote.c:689
8527 +#: builtin/remote.c:691
8528 #, c-format
8529 msgid "Could not set '%s'"
8530 msgstr "不能设置 '%s'"
8531
8533 -#: builtin/remote.c:711
8532 +#: builtin/remote.c:713
8533 #, c-format
8534 msgid "deleting '%s' failed"
8535 msgstr "删除 '%s' 失败"
8536
8538 -#: builtin/remote.c:745
8537 +#: builtin/remote.c:747
8538 #, c-format
8539 msgid "creating '%s' failed"
8540 msgstr "创建 '%s' 失败"
8541
8543 -#: builtin/remote.c:764
8542 +#: builtin/remote.c:766
8543 #, c-format
8544 msgid "Could not remove branch %s"
8545 msgstr "无法移除分支 %s"
8546
8548 -#: builtin/remote.c:831
8547 +#: builtin/remote.c:833
8548 msgid ""
8549 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
8550 "to delete it, use:"
@@ -8555,126 +8554,126 @@ msgid_plural ""
8554 msgstr[0] "注意：ref/remotes 层级之外的一个分支未被移除。要删除它，使用："
8555 msgstr[1] "注意：ref/remotes 层级之外的一些分支未被移除。要删除它们，使用："
8556
8558 -#: builtin/remote.c:946
8557 +#: builtin/remote.c:948
8558 #, c-format
8559 msgid " new (next fetch will store in remotes/%s)"
8560 msgstr " 新的（下一次获取将存储于 remotes/%s）"
8561
8563 -#: builtin/remote.c:949
8562 +#: builtin/remote.c:951
8563 msgid " tracked"
8564 msgstr " 已跟踪"
8565
8567 -#: builtin/remote.c:951
8566 +#: builtin/remote.c:953
8567 msgid " stale (use 'git remote prune' to remove)"
8568 msgstr " 过时（使用 'git remote prune' 来移除）"
8569
8571 -#: builtin/remote.c:953
8570 +#: builtin/remote.c:955
8571 msgid " ???"
8572 msgstr " ???"
8573
8575 -#: builtin/remote.c:994
8574 +#: builtin/remote.c:996
8575 #, c-format
8576 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
8577 msgstr "无效的 branch.%s.merge，不能变基到一个以上的分支"
8578
8580 -#: builtin/remote.c:1001
8579 +#: builtin/remote.c:1003
8580 #, c-format
8581 msgid "rebases onto remote %s"
8582 msgstr "变基到远程 %s"
8583
8585 -#: builtin/remote.c:1004
8584 +#: builtin/remote.c:1006
8585 #, c-format
8586 msgid " merges with remote %s"
8587 msgstr " 与远程 %s 合并"
8588
8590 -#: builtin/remote.c:1005
8589 +#: builtin/remote.c:1007
8590 msgid " and with remote"
8591 msgstr " 且有远程"
8592
8594 -#: builtin/remote.c:1007
8593 +#: builtin/remote.c:1009
8594 #, c-format
8595 msgid "merges with remote %s"
8596 msgstr "与远程 %s 合并"
8597
8599 -#: builtin/remote.c:1008
8598 +#: builtin/remote.c:1010
8599 msgid " and with remote"
8600 msgstr " 且有远程"
8601
8603 -#: builtin/remote.c:1054
8602 +#: builtin/remote.c:1056
8603 msgid "create"
8604 msgstr "创建"
8605
8607 -#: builtin/remote.c:1057
8606 +#: builtin/remote.c:1059
8607 msgid "delete"
8608 msgstr "删除"
8609
8611 -#: builtin/remote.c:1061
8610 +#: builtin/remote.c:1063
8611 msgid "up to date"
8612 msgstr "最新"
8613
8615 -#: builtin/remote.c:1064
8614 +#: builtin/remote.c:1066
8615 msgid "fast-forwardable"
8616 msgstr "可快进"
8617
8619 -#: builtin/remote.c:1067
8618 +#: builtin/remote.c:1069
8619 msgid "local out of date"
8620 msgstr "本地已过时"
8621
8623 -#: builtin/remote.c:1074
8622 +#: builtin/remote.c:1076
8623 #, c-format
8624 msgid " %-*s forces to %-*s (%s)"
8625 msgstr " %-*s 强制推送至 %-*s (%s)"
8626
8628 -#: builtin/remote.c:1077
8627 +#: builtin/remote.c:1079
8628 #, c-format
8629 msgid " %-*s pushes to %-*s (%s)"
8630 msgstr " %-*s 推送至 %-*s (%s)"
8631
8633 -#: builtin/remote.c:1081
8632 +#: builtin/remote.c:1083
8633 #, c-format
8634 msgid " %-*s forces to %s"
8635 msgstr " %-*s 强制推送至 %s"
8636
8638 -#: builtin/remote.c:1084
8637 +#: builtin/remote.c:1086
8638 #, c-format
8639 msgid " %-*s pushes to %s"
8640 msgstr " %-*s 推送至 %s"
8641
8643 -#: builtin/remote.c:1152
8642 +#: builtin/remote.c:1154
8643 msgid "do not query remotes"
8644 msgstr "不查询远程"
8645
8647 -#: builtin/remote.c:1179
8646 +#: builtin/remote.c:1181
8647 #, c-format
8648 msgid "* remote %s"
8649 msgstr "* 远程 %s"
8650
8652 -#: builtin/remote.c:1180
8651 +#: builtin/remote.c:1182
8652 #, c-format
8653 msgid " Fetch URL: %s"
8654 msgstr " 获取地址：%s"
8655
8657 -#: builtin/remote.c:1181 builtin/remote.c:1332
8656 +#: builtin/remote.c:1183 builtin/remote.c:1334
8657 msgid "(no URL)"
8658 msgstr "(无 URL)"
8659
8661 -#: builtin/remote.c:1190 builtin/remote.c:1192
8660 +#: builtin/remote.c:1192 builtin/remote.c:1194
8661 #, c-format
8662 msgid " Push URL: %s"
8663 msgstr " 推送地址：%s"
8664
8666 -#: builtin/remote.c:1194 builtin/remote.c:1196 builtin/remote.c:1198
8665 +#: builtin/remote.c:1196 builtin/remote.c:1198 builtin/remote.c:1200
8666 #, c-format
8667 msgid " HEAD branch: %s"
8668 msgstr " HEAD分支：%s"
8669
8671 -#: builtin/remote.c:1200
8670 +#: builtin/remote.c:1202
8671 #, c-format
8672 msgid ""
8673 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
8674 msgstr " HEAD 分支（远程 HEAD 模糊，可能是下列中的一个）：\n"
8675
8677 -#: builtin/remote.c:1212
8676 +#: builtin/remote.c:1214
8677 #, c-format
8678 msgid " Remote branch:%s"
8679 msgid_plural " Remote branches:%s"
@@ -8682,138 +8681,138 @@ msgstr[0] " 远程分支：%s"
8681 msgstr[1] " 远程分支：%s"
8682
8683 # 译者：中文字符串拼接，可删除前导空格
8685 -#: builtin/remote.c:1215 builtin/remote.c:1242
8684 +#: builtin/remote.c:1217 builtin/remote.c:1244
8685 msgid " (status not queried)"
8686 msgstr "（状态未查询）"
8687
8689 -#: builtin/remote.c:1224
8688 +#: builtin/remote.c:1226
8689 msgid " Local branch configured for 'git pull':"
8690 msgid_plural " Local branches configured for 'git pull':"
8691 msgstr[0] " 为 'git pull' 配置的本地分支："
8692 msgstr[1] " 为 'git pull' 配置的本地分支："
8693
8695 -#: builtin/remote.c:1232
8694 +#: builtin/remote.c:1234
8695 msgid " Local refs will be mirrored by 'git push'"
8696 msgstr " 本地引用将在 'git push' 时被镜像"
8697
8699 -#: builtin/remote.c:1239
8698 +#: builtin/remote.c:1241
8699 #, c-format
8700 msgid " Local ref configured for 'git push'%s:"
8701 msgid_plural " Local refs configured for 'git push'%s:"
8702 msgstr[0] " 为 'git push' 配置的本地引用%s："
8703 msgstr[1] " 为 'git push' 配置的本地引用%s："
8704
8706 -#: builtin/remote.c:1260
8705 +#: builtin/remote.c:1262
8706 msgid "set refs/remotes/<name>/HEAD according to remote"
8707 msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
8708
8710 -#: builtin/remote.c:1262
8709 +#: builtin/remote.c:1264
8710 msgid "delete refs/remotes/<name>/HEAD"
8711 msgstr "删除 refs/remotes/<名称>/HEAD"
8712
8714 -#: builtin/remote.c:1277
8713 +#: builtin/remote.c:1279
8714 msgid "Cannot determine remote HEAD"
8715 msgstr "无法确定远程 HEAD"
8716
8718 -#: builtin/remote.c:1279
8717 +#: builtin/remote.c:1281
8718 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
8719 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令："
8720
8722 -#: builtin/remote.c:1289
8721 +#: builtin/remote.c:1291
8722 #, c-format
8723 msgid "Could not delete %s"
8724 msgstr "无法删除 %s"
8725
8727 -#: builtin/remote.c:1297
8726 +#: builtin/remote.c:1299
8727 #, c-format
8728 msgid "Not a valid ref: %s"
8729 msgstr "不是一个有效引用：%s"
8730
8732 -#: builtin/remote.c:1299
8731 +#: builtin/remote.c:1301
8732 #, c-format
8733 msgid "Could not setup %s"
8734 msgstr "不能设置 %s"
8735
8736 # 译者：注意保持前导空格
8738 -#: builtin/remote.c:1317
8737 +#: builtin/remote.c:1319
8738 #, c-format
8739 msgid " %s will become dangling!"
8740 msgstr " %s 将成为摇摆状态！"
8741
8742 # 译者：注意保持前导空格
8744 -#: builtin/remote.c:1318
8743 +#: builtin/remote.c:1320
8744 #, c-format
8745 msgid " %s has become dangling!"
8746 msgstr " %s 已成为摇摆状态！"
8747
8749 -#: builtin/remote.c:1328
8748 +#: builtin/remote.c:1330
8749 #, c-format
8750 msgid "Pruning %s"
8751 msgstr "修剪 %s"
8752
8754 -#: builtin/remote.c:1329
8753 +#: builtin/remote.c:1331
8754 #, c-format
8755 msgid "URL: %s"
8756 msgstr "URL：%s"
8757
8759 -#: builtin/remote.c:1352
8758 +#: builtin/remote.c:1354
8759 #, c-format
8760 msgid " * [would prune] %s"
8761 msgstr " * [将删除] %s"
8762
8764 -#: builtin/remote.c:1355
8763 +#: builtin/remote.c:1357
8764 #, c-format
8765 msgid " * [pruned] %s"
8766 msgstr " * [已删除] %s"
8767
8769 -#: builtin/remote.c:1400
8768 +#: builtin/remote.c:1402
8769 msgid "prune remotes after fetching"
8770 msgstr "抓取后清除远程"
8771
8773 -#: builtin/remote.c:1466 builtin/remote.c:1540
8772 +#: builtin/remote.c:1468 builtin/remote.c:1542
8773 #, c-format
8774 msgid "No such remote '%s'"
8775 msgstr "没有此远程 '%s'"
8776
8778 -#: builtin/remote.c:1486
8777 +#: builtin/remote.c:1488
8778 msgid "add branch"
8779 msgstr "添加分支"
8780
8782 -#: builtin/remote.c:1493
8781 +#: builtin/remote.c:1495
8782 msgid "no remote specified"
8783 msgstr "未指定远程"
8784
8786 -#: builtin/remote.c:1515
8785 +#: builtin/remote.c:1517
8786 msgid "manipulate push URLs"
8787 msgstr "操作推送 URLS"
8788
8790 -#: builtin/remote.c:1517
8789 +#: builtin/remote.c:1519
8790 msgid "add URL"
8791 msgstr "添加 URL"
8792
8794 -#: builtin/remote.c:1519
8793 +#: builtin/remote.c:1521
8794 msgid "delete URLs"
8795 msgstr "删除 URLS"
8796
8798 -#: builtin/remote.c:1526
8797 +#: builtin/remote.c:1528
8798 msgid "--add --delete doesn't make sense"
8799 msgstr "--add --delete 无意义"
8800
8802 -#: builtin/remote.c:1566
8801 +#: builtin/remote.c:1568
8802 #, c-format
8803 msgid "Invalid old URL pattern: %s"
8804 msgstr "无效的旧URL匹配模版：%s"
8805
8807 -#: builtin/remote.c:1574
8806 +#: builtin/remote.c:1576
8807 #, c-format
8808 msgid "No such URL found: %s"
8809 msgstr "未找到此URL：%s"
8810
8812 -#: builtin/remote.c:1576
8811 +#: builtin/remote.c:1578
8812 msgid "Will not delete all non-push URLs"
8813 msgstr "将不会删除所有非推送URL地址"
8814
8816 -#: builtin/remote.c:1590
8815 +#: builtin/remote.c:1592
8816 msgid "be verbose; must be placed before a subcommand"
8817 msgstr "冗长输出；必须置于子命令之前"
8818
@@ -9084,7 +9083,7 @@ msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
9083
9084 #: builtin/reset.c:331
9085 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
9087 -msgstr "--mixed 带路径已弃用，而是用 'git reset -- <paths>'。"
9086 +msgstr "--mixed 带路径已弃用，而是用 'git reset -- <路径>'。"
9087
9088 # 译者：汉字之间无空格，故删除%s前后空格
9089 #: builtin/reset.c:333
@@ -9359,81 +9358,81 @@ msgstr "折行输出"
9358
9359 #: builtin/show-branch.c:9
9360 msgid ""
9362 -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
9363 -"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
9364 -"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
9365 -"<glob>)...]"
9361 +"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
9362 +"\t\t [--current] [--color[=<when>] | --no-color] [--sparse]\n"
9363 +"\t\t [--more=<n> | --list | --independent | --merge-base]\n"
9364 +"\t [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
9365 msgstr ""
9367 -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
9368 -"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
9369 -"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
9370 -"<glob>)...]"
9366 +"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
9367 +"\t\t [--current] [--color[=<何时>] | --no-color] [--sparse]\n"
9368 +"\t\t [--more=<n> | --list | --independent | --merge-base]\n"
9369 +"\t [--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
9370
9372 -#: builtin/show-branch.c:10
9371 +#: builtin/show-branch.c:13
9372 msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
9374 -msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
9373 +msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<引用>]"
9374
9376 -#: builtin/show-branch.c:649
9375 +#: builtin/show-branch.c:652
9376 msgid "show remote-tracking and local branches"
9377 msgstr "显示远程跟踪的和本地的分支"
9378
9380 -#: builtin/show-branch.c:651
9379 +#: builtin/show-branch.c:654
9380 msgid "show remote-tracking branches"
9381 msgstr "显示远程跟踪的分支"
9382
9384 -#: builtin/show-branch.c:653
9383 +#: builtin/show-branch.c:656
9384 msgid "color '*!+-' corresponding to the branch"
9385 msgstr "着色 '*!+-' 到相应的分支"
9386
9388 -#: builtin/show-branch.c:655
9387 +#: builtin/show-branch.c:658
9388 msgid "show <n> more commits after the common ancestor"
9389 msgstr "显示共同祖先后的 <n> 个提交"
9390
9392 -#: builtin/show-branch.c:657
9391 +#: builtin/show-branch.c:660
9392 msgid "synonym to more=-1"
9393 msgstr "和 more=-1 同义"
9394
9396 -#: builtin/show-branch.c:658
9395 +#: builtin/show-branch.c:661
9396 msgid "suppress naming strings"
9397 msgstr "不显示字符串命名"
9398
9400 -#: builtin/show-branch.c:660
9399 +#: builtin/show-branch.c:663
9400 msgid "include the current branch"
9401 msgstr "包括当前分支"
9402
9404 -#: builtin/show-branch.c:662
9403 +#: builtin/show-branch.c:665
9404 msgid "name commits with their object names"
9405 msgstr "以对象名字命名提交"
9406
9408 -#: builtin/show-branch.c:664
9407 +#: builtin/show-branch.c:667
9408 msgid "show possible merge bases"
9409 msgstr "显示可能合并的基线"
9410
9412 -#: builtin/show-branch.c:666
9411 +#: builtin/show-branch.c:669
9412 msgid "show refs unreachable from any other ref"
9413 msgstr "显示没有任何引用的的引用"
9414
9416 -#: builtin/show-branch.c:668
9415 +#: builtin/show-branch.c:671
9416 msgid "show commits in topological order"
9417 msgstr "以拓扑顺序显示提交"
9418
9420 -#: builtin/show-branch.c:671
9419 +#: builtin/show-branch.c:674
9420 msgid "show only commits not on the first branch"
9421 msgstr "只显示不在第一个分支上的提交"
9422
9424 -#: builtin/show-branch.c:673
9423 +#: builtin/show-branch.c:676
9424 msgid "show merges reachable from only one tip"
9425 msgstr "显示仅一个分支可访问的合并提交"
9426
9428 -#: builtin/show-branch.c:675
9427 +#: builtin/show-branch.c:678
9428 msgid "topologically sort, maintaining date order where possible"
9429 msgstr "拓扑方式排序，并尽可能地保持日期顺序"
9430
9432 -#: builtin/show-branch.c:678
9431 +#: builtin/show-branch.c:681
9432 msgid "<n>[,<base>]"
9433 msgstr "<n>[,<base>]"
9434
9436 -#: builtin/show-branch.c:679
9435 +#: builtin/show-branch.c:682
9436 msgid "show <n> most recent ref-log entries starting at base"
9437 msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
9438
@@ -9523,7 +9522,7 @@ msgid ""
9522 "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
9523 "\t\t[<pattern>...]"
9524 msgstr ""
9526 -"git tag -l [-n[<num>]] [--contains <提交>] [--points-at <对象>] \n"
9525 +"git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>] \n"
9526 "\t\t[<模式>...]"
9527
9528 #: builtin/tag.c:26
@@ -9771,7 +9770,7 @@ msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置"
9770
9771 #: builtin/update-index.c:779
9772 msgid "<mode>,<object>,<path>"
9774 -msgstr "<mode>,<object>,<path>"
9773 +msgstr "<存取模式>,<对象>,<路径>"
9774
9775 #: builtin/update-index.c:780
9776 msgid "add the specified entry to the index"
@@ -9895,7 +9894,7 @@ msgstr "打印提交内容"
9894
9895 #: builtin/verify-pack.c:54
9896 msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
9898 -msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
9897 +msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <包>..."
9898
9899 #: builtin/verify-pack.c:64
9900 msgid "verbose"
@@ -9907,7 +9906,7 @@ msgstr "只显示统计"
9906
9907 #: builtin/verify-tag.c:17
9908 msgid "git verify-tag [-v|--verbose] <tag>..."
9910 -msgstr "git verify-tag [-v|--verbose] <tag>..."
9909 +msgstr "git verify-tag [-v|--verbose] <标签>..."
9910
9911 #: builtin/verify-tag.c:73
9912 msgid "print tag contents"
@@ -9933,7 +9932,7 @@ msgstr "只对调试有用"
9932 msgid "print debugging messages to stderr"
9933 msgstr "调试信息输出到标准错误"
9934
9936 -#: git.c:17
9935 +#: git.c:14
9936 msgid ""
9937 "'git help -a' and 'git help -g' list available subcommands and some\n"
9938 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
@@ -10252,7 +10251,7 @@ msgstr "坏的 HEAD - 我需要一个 HEAD"
10251 #, sh-format
10252 msgid ""
10253 "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
10255 -msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"
10254 +msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
10255
10256 #: git-bisect.sh:140
10257 msgid "won't bisect on cg-seek'ed tree"
@@ -10384,7 +10383,7 @@ msgid ""
10383 "as appropriate to mark resolution and make a commit."
10384 msgstr ""
10385 "Pull 不可用，因为您尚有未合并的文件。请先在工作区改正文件，\n"
10387 -"然后酌情使用 'git add/rm <file>' 标记解决方案，再做提交。"
10386 +"然后酌情使用 'git add/rm <文件>' 标记解决方案，再做提交。"
10387
10388 #: git-pull.sh:25
10389 msgid "Pull is not possible because you have unmerged files."
@@ -11265,7 +11264,7 @@ msgstr "为 '$displaypath' 同步子模组 url"
11264 #~ msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]"
11265
11266 #~ msgid "See 'git help <command>' for more information on a specific command."
11268 -#~ msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"
11267 +#~ msgstr "参见 'git help <命令>' 以获得该特定命令的详细信息。"
11268
11269 #~ msgid "BUG: impossible combination of %d and %p"
11270 #~ msgstr "BUG: 无法组合 %d 和 %p"