31e5e17b22 · matheusbsbs/matheus-bagliano

@@ -3,7 +3,7 @@

4 # This file is distributed under the same license as the Git package.

5 # Contributors:

6 -# - Fangyi Zhou <fangyi.zhou AT yuriko.moe>

6 +# - Fangyi Zhou <fangyi.zhou AT yuriko.moe>

7 # - Jiang Xin <worldhello.net AT gmail.com>

8 # - Lian Cheng <rhythm.mail AT gmail.com>

9 # - Ray Chen <oldsharp AT gmail.com>

@@ -138,8 +138,8 @@ msgid ""

138 msgstr ""

139 "Project-Id-Version: Git\n"

140 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"

141 -"POT-Creation-Date: 2018-01-07 07:50+0800\n"

142 -"PO-Revision-Date: 2018-01-09 09:53+0800\n"

141 +"POT-Creation-Date: 2018-03-16 07:29+0800\n"

142 +"PO-Revision-Date: 2018-03-25 22:20+0800\n"

143 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"

144 "Language-Team: GitHub <https://github.com/jiangxin/git/>\n"

145 "Language: zh_CN\n"

@@ -190,7 +190,7 @@ msgstr ""

190 msgid "Exiting because of an unresolved conflict."

191 msgstr "因为存在未解决的冲突而退出。"

192

193 -#: advice.c:121 builtin/merge.c:1213

193 +#: advice.c:121 builtin/merge.c:1251

194 msgid "You have not concluded your merge (MERGE_HEAD exists)."

195 msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"

196

@@ -576,14 +576,14 @@ msgstr "子模组 %s 的 sha1 信息缺失或无效"

576 #: apply.c:4087

577 #, c-format

578 msgid "mode change for %s, which is not in current HEAD"

579 -msgstr "%s 的模式被改变，但它不在当前 HEAD 中"

579 +msgstr "%s 的模式变更，但它不在当前 HEAD 中"

580

581 #: apply.c:4090

582 #, c-format

583 msgid "sha1 information is lacking or useless (%s)."

584 msgstr "sha1 信息缺失或无效（%s）。"

585

586 -#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148

586 +#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140

587 #, c-format

588 msgid "make_cache_entry failed for path '%s'"

589 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"

@@ -659,7 +659,7 @@ msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."

659 msgid "truncating .rej filename to %.*s.rej"

660 msgstr "截短 .rej 文件名为 %.*s.rej"

661

662 -#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011

662 +#: apply.c:4545 builtin/fetch.c:775 builtin/fetch.c:1025

663 #, c-format

664 msgid "cannot open %s"

665 msgstr "不能打开 %s"

@@ -717,11 +717,11 @@ msgstr[1] "修复空白错误后，应用了 %d 行。"

717 msgid "Unable to write new index file"

718 msgstr "无法写入新索引文件"

719

720 -#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223

721 -#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193

722 -#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860

723 -#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230

724 -#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450

720 +#: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257

721 +#: builtin/clone.c:118 builtin/fetch.c:127 builtin/pull.c:193

722 +#: builtin/submodule--helper.c:403 builtin/submodule--helper.c:1197

723 +#: builtin/submodule--helper.c:1200 builtin/submodule--helper.c:1567

724 +#: builtin/submodule--helper.c:1570 builtin/submodule--helper.c:1787

725 #: git-add--interactive.perl:197

726 msgid "path"

727 msgstr "路径"

@@ -734,7 +734,7 @@ msgstr "不要应用与给出路径向匹配的变更"

734 msgid "apply changes matching the given path"

735 msgstr "应用与给出路径向匹配的变更"

736

737 -#: apply.c:4927 builtin/am.c:2229

737 +#: apply.c:4927 builtin/am.c:2263

738 msgid "num"

739 msgstr "数字"

740

@@ -774,75 +774,75 @@ msgstr "应用补丁而不修改工作区"

774 msgid "accept a patch that touches outside the working area"

775 msgstr "接受修改工作区之外文件的补丁"

776

777 -#: apply.c:4949

777 +#: apply.c:4950

778 msgid "also apply the patch (use with --stat/--summary/--check)"

779 msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"

780

781 -#: apply.c:4951

781 +#: apply.c:4952

782 msgid "attempt three-way merge if a patch does not apply"

783 msgstr "如果一个补丁不能应用则尝试三方合并"

784

785 -#: apply.c:4953

785 +#: apply.c:4954

786 msgid "build a temporary index based on embedded index information"

787 msgstr "创建一个临时索引基于嵌入的索引信息"

788

789 -#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515

789 +#: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515

790 msgid "paths are separated with NUL character"

791 msgstr "路径以 NUL 字符分隔"

792

793 -#: apply.c:4958

793 +#: apply.c:4959

794 msgid "ensure at least <n> lines of context match"

795 msgstr "确保至少匹配 <n> 行上下文"

796

797 -#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95

797 +#: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95

798 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99

799 -#: builtin/pack-objects.c:3009

799 +#: builtin/pack-objects.c:3035

800 msgid "action"

801 msgstr "动作"

802

803 -#: apply.c:4960

803 +#: apply.c:4961

804 msgid "detect new or modified lines that have whitespace errors"

805 msgstr "检查新增和修改的行中间的空白字符滥用"

806

807 -#: apply.c:4963 apply.c:4966

807 +#: apply.c:4964 apply.c:4967

808 msgid "ignore changes in whitespace when finding context"

809 msgstr "查找上下文时忽略空白字符的变更"

810

811 -#: apply.c:4969

811 +#: apply.c:4970

812 msgid "apply the patch in reverse"

813 msgstr "反向应用补丁"

814

815 -#: apply.c:4971

815 +#: apply.c:4972

816 msgid "don't expect at least one line of context"

817 msgstr "无需至少一行上下文"

818

819 -#: apply.c:4973

819 +#: apply.c:4974

820 msgid "leave the rejected hunks in corresponding *.rej files"

821 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"

822

823 -#: apply.c:4975

823 +#: apply.c:4976

824 msgid "allow overlapping hunks"

825 msgstr "允许重叠的补丁片段"

826

827 -#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21

828 -#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640

829 -#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125

827 +#: apply.c:4977 builtin/add.c:292 builtin/check-ignore.c:21

828 +#: builtin/commit.c:1276 builtin/count-objects.c:96 builtin/fsck.c:665

829 +#: builtin/log.c:1901 builtin/mv.c:123 builtin/read-tree.c:125

830 msgid "be verbose"

831 msgstr "冗长输出"

832

833 -#: apply.c:4978

833 +#: apply.c:4979

834 msgid "tolerate incorrectly detected missing new-line at the end of file"

835 msgstr "允许不正确的文件末尾换行符"

836

837 -#: apply.c:4981

837 +#: apply.c:4982

838 msgid "do not trust the line counts in the hunk headers"

839 msgstr "不信任补丁片段的头信息中的行号"

840

841 -#: apply.c:4983 builtin/am.c:2217

841 +#: apply.c:4984 builtin/am.c:2251

842 msgid "root"

843 msgstr "根目录"

844

845 -#: apply.c:4984

845 +#: apply.c:4985

846 msgid "prepend <root> to all filenames"

847 msgstr "为所有文件名前添加 <根目录>"

848

@@ -877,7 +877,7 @@ msgstr "格式"

877 msgid "archive format"

878 msgstr "归档格式"

879

880 -#: archive.c:437 builtin/log.c:1459

880 +#: archive.c:437 builtin/log.c:1462

881 msgid "prefix"

882 msgstr "前缀"

883

@@ -885,11 +885,11 @@ msgstr "前缀"

885 msgid "prepend prefix to each pathname in the archive"

886 msgstr "为归档中每个路径名加上前缀"

887

888 -#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62

889 -#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861

890 -#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554

888 +#: archive.c:439 builtin/blame.c:702 builtin/blame.c:703 builtin/config.c:62

889 +#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:869

890 +#: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554

891 #: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120

892 -#: parse-options.h:153

892 +#: parse-options.h:165

893 msgid "file"

894 msgstr "文件"

895

@@ -921,8 +921,8 @@ msgstr "压缩效果更好"

921 msgid "list supported archive formats"

922 msgstr "列出支持的归档格式"

923

924 -#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109

925 -#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239

924 +#: archive.c:458 builtin/archive.c:90 builtin/clone.c:108 builtin/clone.c:111

925 +#: builtin/submodule--helper.c:1209 builtin/submodule--helper.c:1576

926 msgid "repo"

927 msgstr "仓库"

928

@@ -973,22 +973,22 @@ msgstr ""

973 "负值模版在 git attributes 中被忽略\n"

974 "当字符串确实要以感叹号开始时，使用 '\\!'。"

975

976 -#: bisect.c:458

976 +#: bisect.c:460

977 #, c-format

978 msgid "Badly quoted content in file '%s': %s"

979 msgstr "文件 '%s' 包含错误的引用格式：%s"

980

981 -#: bisect.c:666

981 +#: bisect.c:668

982 #, c-format

983 msgid "We cannot bisect more!\n"

984 msgstr "我们无法进行更多的二分查找！\n"

985

986 -#: bisect.c:720

986 +#: bisect.c:722

987 #, c-format

988 msgid "Not a valid commit name %s"

989 msgstr "不是一个有效的提交名 %s"

990

991 -#: bisect.c:744

991 +#: bisect.c:746

992 #, c-format

993 msgid ""

994 "The merge base %s is bad.\n"

@@ -997,7 +997,7 @@ msgstr ""

997 "合并基线 %s 是坏的。\n"

998 "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"

999

1000 -#: bisect.c:749

1000 +#: bisect.c:751

1001 #, c-format

1002 msgid ""

1003 "The merge base %s is new.\n"

@@ -1006,7 +1006,7 @@ msgstr ""

1006 "合并基线 %s 是新的。\n"

1007 "介于 %s 和 [%s] 之间的属性已经被修改。\n"

1008

1009 -#: bisect.c:754

1009 +#: bisect.c:756

1010 #, c-format

1011 msgid ""

1012 "The merge base %s is %s.\n"

@@ -1015,7 +1015,7 @@ msgstr ""

1015 "合并基线 %s 是 %s。\n"

1016 "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"

1017

1018 -#: bisect.c:762

1018 +#: bisect.c:764

1019 #, c-format

1020 msgid ""

1021 "Some %s revs are not ancestors of the %s rev.\n"

@@ -1026,7 +1026,7 @@ msgstr ""

1026 "这种情况下 git 二分查找无法正常工作。\n"

1027 "您可能弄错了 %s 和 %s 版本？\n"

1028

1029 -#: bisect.c:775

1029 +#: bisect.c:777

1030 #, c-format

1031 msgid ""

1032 "the merge base between %s and [%s] must be skipped.\n"

@@ -1042,31 +1042,31 @@ msgstr ""

1042 msgid "Bisecting: a merge base must be tested\n"

1043 msgstr "二分查找中：合并基线必须是经过测试的\n"

1044

1045 -#: bisect.c:862

1045 +#: bisect.c:850

1046 #, c-format

1047 msgid "a %s revision is needed"

1048 msgstr "需要一个 %s 版本"

1049

1050 -#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234

1050 +#: bisect.c:869 builtin/notes.c:175 builtin/tag.c:235

1051 #, c-format

1052 msgid "could not create file '%s'"

1053 msgstr "不能创建文件 '%s'"

1054

1055 -#: bisect.c:930

1055 +#: bisect.c:920

1056 #, c-format

1057 msgid "could not read file '%s'"

1058 msgstr "不能读取文件 '%s'"

1059

1060 -#: bisect.c:960

1060 +#: bisect.c:950

1061 msgid "reading bisect refs failed"

1062 msgstr "读取二分查找引用失败"

1063

1064 -#: bisect.c:979

1064 +#: bisect.c:969

1065 #, c-format

1066 msgid "%s was both %s and %s\n"

1067 msgstr "%s 同时为 %s 和 %s\n"

1068

1069 -#: bisect.c:987

1069 +#: bisect.c:977

1070 #, c-format

1071 msgid ""

1072 "No testable commit found.\n"

@@ -1075,7 +1075,7 @@ msgstr ""

1075 "没有发现可测试的提交。\n"

1076 "可能您在运行时使用了错误的路径参数？\n"

1077

1078 -#: bisect.c:1006

1078 +#: bisect.c:996

1079 #, c-format

1080 msgid "(roughly %d step)"

1081 msgid_plural "(roughly %d steps)"

@@ -1085,43 +1085,43 @@ msgstr[1] "（大概 %d 步）"

1085 #. TRANSLATORS: the last %s will be replaced with "(roughly %d

1086 #. steps)" translation.

1087 #.

1088 -#: bisect.c:1012

1088 +#: bisect.c:1002

1089 #, c-format

1090 msgid "Bisecting: %d revision left to test after this %s\n"

1091 msgid_plural "Bisecting: %d revisions left to test after this %s\n"

1092 msgstr[0] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"

1093 msgstr[1] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"

1094

1095 -#: blame.c:1757

1095 +#: blame.c:1758

1096 msgid "--contents and --reverse do not blend well."

1097 msgstr "--contents 和 --reverse 不能混用。"

1098

1099 -#: blame.c:1768

1099 +#: blame.c:1769

1100 msgid "cannot use --contents with final commit object name"

1101 msgstr "不能将 --contents 和最终的提交对象名共用"

1102

1103 -#: blame.c:1788

1103 +#: blame.c:1789

1104 msgid "--reverse and --first-parent together require specified latest commit"

1105 msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"

1106

1107 -#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177

1108 -#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918

1109 -#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369

1107 +#: blame.c:1798 bundle.c:160 ref-filter.c:1978 sequencer.c:1699

1108 +#: sequencer.c:2901 builtin/commit.c:976 builtin/log.c:366 builtin/log.c:920

1109 +#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:370

1110 #: builtin/shortlog.c:191

1111 msgid "revision walk setup failed"

1112 msgstr "版本遍历设置失败"

1113

1114 -#: blame.c:1815

1114 +#: blame.c:1816

1115 msgid ""

1116 "--reverse --first-parent together require range along first-parent chain"

1117 msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围"

1118

1119 -#: blame.c:1826

1119 +#: blame.c:1827

1120 #, c-format

1121 msgid "no such path %s in %s"

1122 msgstr "在 %2$s 中无此路径 %1$s"

1123

1124 -#: blame.c:1837

1124 +#: blame.c:1838

1125 #, c-format

1126 msgid "cannot read blob %s for path %s"

1127 msgstr "不能为路径 %2$s 读取数据对象 %1$s"

@@ -1269,76 +1269,75 @@ msgstr "'%s' 不像是一个 v2 版本的包文件"

1269 msgid "unrecognized header: %s%s (%d)"

1270 msgstr "未能识别的包头：%s%s (%d)"

1271

1272 -#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637

1273 -#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782

1272 +#: bundle.c:88 sequencer.c:1879 sequencer.c:2337 builtin/commit.c:750

1273 #, c-format

1274 msgid "could not open '%s'"

1275 msgstr "不能打开 '%s'"

1276

1278 -#: bundle.c:140

1277 +#: bundle.c:139

1278 msgid "Repository lacks these prerequisite commits:"

1279 msgstr "仓库中缺少这些必备的提交："

1280

1282 -#: bundle.c:193

1281 +#: bundle.c:190

1282 #, c-format

1283 msgid "The bundle contains this ref:"

1284 msgid_plural "The bundle contains these %d refs:"

1285 msgstr[0] "这个包中含有这个引用："

1286 msgstr[1] "这个包中含有 %d 个引用："

1287

1289 -#: bundle.c:200

1288 +#: bundle.c:197

1289 msgid "The bundle records a complete history."

1290 msgstr "这个包记录一个完整历史。"

1291

1293 -#: bundle.c:202

1292 +#: bundle.c:199

1293 #, c-format

1294 msgid "The bundle requires this ref:"

1295 msgid_plural "The bundle requires these %d refs:"

1296 msgstr[0] "这个包需要这个引用："

1297 msgstr[1] "这个包需要 %d 个引用："

1298

1300 -#: bundle.c:261

1299 +#: bundle.c:258

1300 msgid "Could not spawn pack-objects"

1301 msgstr "不能生成 pack-objects 进程"

1302

1304 -#: bundle.c:272

1303 +#: bundle.c:269

1304 msgid "pack-objects died"

1305 msgstr "pack-objects 终止"

1306

1308 -#: bundle.c:314

1307 +#: bundle.c:311

1308 msgid "rev-list died"

1309 msgstr "rev-list 终止"

1310

1312 -#: bundle.c:363

1311 +#: bundle.c:360

1312 #, c-format

1313 msgid "ref '%s' is excluded by the rev-list options"

1314 msgstr "引用 '%s' 被 rev-list 选项排除"

1315

1317 -#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296

1316 +#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:296

1317 #, c-format

1318 msgid "unrecognized argument: %s"

1319 msgstr "未能识别的参数：%s"

1320

1322 -#: bundle.c:461

1321 +#: bundle.c:458

1322 msgid "Refusing to create empty bundle."

1323 msgstr "不能创建空包。"

1324

1326 -#: bundle.c:473

1325 +#: bundle.c:470

1326 #, c-format

1327 msgid "cannot create '%s'"

1328 msgstr "不能创建 '%s'"

1329

1331 -#: bundle.c:501

1330 +#: bundle.c:498

1331 msgid "index-pack died"

1332 msgstr "index-pack 终止"

1333

1335 -#: color.c:301

1334 +#: color.c:296

1335 #, c-format

1336 msgid "invalid color value: %.*s"

1337 msgstr "无效的颜色值：%.*s"

1338

1340 -#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465

1341 -#: builtin/am.c:1434 builtin/am.c:2069

1339 +#: commit.c:41 sequencer.c:2141 builtin/am.c:421 builtin/am.c:465

1340 +#: builtin/am.c:1436 builtin/am.c:2072

1341 #, c-format

1342 msgid "could not parse %s"

1343 msgstr "不能解析 %s"

@@ -1346,9 +1345,9 @@ msgstr "不能解析 %s"

1345 #: commit.c:43

1346 #, c-format

1347 msgid "%s %s is not a commit!"

1349 -msgstr "%s %s 不是一个提交!"

1348 +msgstr "%s %s 不是一个提交！"

1349

1351 -#: commit.c:1524

1350 +#: commit.c:1506

1351 msgid ""

1352 "Warning: commit message did not conform to UTF-8.\n"

1353 "You may want to amend it after fixing the message, or set the config\n"

@@ -1454,65 +1453,65 @@ msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"

1453 msgid "bad zlib compression level %d"

1454 msgstr "错误的 zlib 压缩级别 %d"

1455

1457 -#: config.c:1222

1456 +#: config.c:1225

1457 #, c-format

1458 msgid "invalid mode for object creation: %s"

1459 msgstr "无效的对象创建模式：%s"

1460

1462 -#: config.c:1378

1461 +#: config.c:1386

1462 #, c-format

1463 msgid "bad pack compression level %d"

1464 msgstr "错误的打包压缩级别 %d"

1465

1467 -#: config.c:1574

1466 +#: config.c:1582

1467 msgid "unable to parse command-line config"

1468 msgstr "无法解析命令行中的配置"

1469

1471 -#: config.c:1906

1470 +#: config.c:1914

1471 msgid "unknown error occurred while reading the configuration files"

1472 msgstr "在读取配置文件时遇到未知错误"

1473

1475 -#: config.c:2093

1474 +#: config.c:2101

1475 #, c-format

1476 msgid "Invalid %s: '%s'"

1477 msgstr "无效 %s：'%s'"

1478

1480 -#: config.c:2136

1479 +#: config.c:2144

1480 #, c-format

1481 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"

1482 msgstr "未知的 core.untrackedCache 取值 '%s'，使用默认值 'keep'"

1483

1485 -#: config.c:2162

1484 +#: config.c:2170

1485 #, c-format

1486 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"

1487 msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"

1488

1490 -#: config.c:2187

1489 +#: config.c:2195

1490 #, c-format

1491 msgid "unable to parse '%s' from command-line config"

1492 msgstr "无法解析命令行配置中的 '%s'"

1493

1495 -#: config.c:2189

1494 +#: config.c:2197

1495 #, c-format

1496 msgid "bad config variable '%s' in file '%s' at line %d"

1497 msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"

1498

1500 -#: config.c:2248

1499 +#: config.c:2256

1500 #, c-format

1501 msgid "%s has multiple values"

1502 msgstr "%s 有多个取值"

1503

1505 -#: config.c:2591 config.c:2808

1504 +#: config.c:2599 config.c:2816

1505 #, c-format

1506 msgid "fstat on %s failed"

1507 msgstr "对 %s 调用 fstat 失败"

1508

1510 -#: config.c:2698

1509 +#: config.c:2706

1510 #, c-format

1511 msgid "could not set '%s' to '%s'"

1512 msgstr "不能设置 '%s' 为 '%s'"

1513

1515 -#: config.c:2700 builtin/remote.c:776

1514 +#: config.c:2708 builtin/remote.c:776

1515 #, c-format

1516 msgid "could not unset '%s'"

1517 msgstr "不能取消设置 '%s'"

@@ -1532,24 +1531,29 @@ msgstr ""

1531 "\n"

1532 "请确认您有正确的访问权限并且仓库存在。"

1533

1535 -#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141

1534 +#: connected.c:66 builtin/fsck.c:198 builtin/prune.c:144

1535 msgid "Checking connectivity"

1536 msgstr "检查连接中"

1537

1539 -#: connected.c:76

1538 +#: connected.c:78

1539 msgid "Could not run 'git rev-list'"

1540 msgstr "不能执行 'git rev-list'"

1541

1543 -#: connected.c:96

1542 +#: connected.c:98

1543 msgid "failed write to rev-list"

1544 msgstr "无法写入 rev-list"

1545

1547 -#: connected.c:103

1546 +#: connected.c:105

1547 msgid "failed to close rev-list's stdin"

1548 msgstr "无法关闭 rev-list 的标准输入"

1549

1550 #: convert.c:205

1551 #, c-format

1552 +msgid "CRLF would be replaced by LF in %s."

1553 +msgstr "文件 %s 中的 CRLF 将被 LF 替换。"

1554 +

1555 +#: convert.c:207

1556 +#, c-format

1557 msgid ""

1558 "CRLF will be replaced by LF in %s.\n"

1559 "The file will have its original line endings in your working directory."

@@ -1557,12 +1561,12 @@ msgstr ""

1561 "文件 %s 中的 CRLF 将被 LF 替换。\n"

1562 "在工作区中该文件仍保持原有的换行符。"

1563

1560 -#: convert.c:209

1564 +#: convert.c:215

1565 #, c-format

1562 -msgid "CRLF would be replaced by LF in %s."

1563 -msgstr "文件 %s 中的 CRLF 将被 LF 替换。"

1566 +msgid "LF would be replaced by CRLF in %s"

1567 +msgstr "文件 %s 中的 LF 将被 CRLF 替换"

1568

1565 -#: convert.c:215

1569 +#: convert.c:217

1570 #, c-format

1571 msgid ""

1572 "LF will be replaced by CRLF in %s.\n"

@@ -1571,11 +1575,6 @@ msgstr ""

1575 "文件 %s 中的 LF 将被 CRLF 替换。\n"

1576 "在工作区中该文件仍保持原有的换行符。"

1577

1574 -#: convert.c:219

1575 -#, c-format

1576 -msgid "LF would be replaced by CRLF in %s"

1577 -msgstr "文件 %s 中的 LF 将被 CRLF 替换"

1578 -

1578 #: date.c:116

1579 msgid "in the future"

1580 msgstr "在将来"

@@ -1691,20 +1690,24 @@ msgstr ""

1690 "发现配置变量 'diff.dirstat' 中的错误：\n"

1691 "%s"

1692

1694 -#: diff.c:3799

1693 +#: diff.c:3822

1694 #, c-format

1695 msgid "external diff died, stopping at %s"

1696 msgstr "外部 diff 退出，停止在 %s"

1697

1699 -#: diff.c:4127

1698 +#: diff.c:4146

1699 msgid "--name-only, --name-status, --check and -s are mutually exclusive"

1700 msgstr "--name-only、--name-status、--check 和 -s 是互斥的"

1701

1703 -#: diff.c:4215

1702 +#: diff.c:4149

1703 +msgid "-G, -S and --find-object are mutually exclusive"

1704 +msgstr "-G、-S 和 --find-object 是互斥的"

1705 +

1706 +#: diff.c:4237

1707 msgid "--follow requires exactly one pathspec"

1708 msgstr "--follow 明确要求只跟一个路径规格"

1709

1707 -#: diff.c:4381

1710 +#: diff.c:4403

1711 #, c-format

1712 msgid ""

1713 "Failed to parse --dirstat/-X option parameter:\n"

@@ -1713,39 +1716,44 @@ msgstr ""

1716 "无法解析 --dirstat/-X 选项的参数：\n"

1717 "%s"

1718

1716 -#: diff.c:4395

1719 +#: diff.c:4417

1720 #, c-format

1721 msgid "Failed to parse --submodule option parameter: '%s'"

1722 msgstr "无法解析 --submodule 选项的参数：'%s'"

1723

1721 -#: diff.c:5446

1724 +#: diff.c:5493

1725 msgid "inexact rename detection was skipped due to too many files."

1726 msgstr "因为文件太多，略过不严格的重命名检查。"

1727

1725 -#: diff.c:5449

1728 +#: diff.c:5496

1729 msgid "only found copies from modified paths due to too many files."

1730 msgstr "因为文件太多，只在修改的路径中查找拷贝。"

1731

1729 -#: diff.c:5452

1732 +#: diff.c:5499

1733 #, c-format

1734 msgid ""

1735 "you may want to set your %s variable to at least %d and retry the command."

1736 msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"

1737

1735 -#: dir.c:2100

1738 +#: dir.c:1866

1739 +#, c-format

1740 +msgid "could not open directory '%s'"

1741 +msgstr "不能打开目录 '%s'"

1742 +

1743 +#: dir.c:2108

1744 msgid "failed to get kernel name and information"

1745 msgstr "无法获得内核名称和信息"

1746

1739 -#: dir.c:2219

1747 +#: dir.c:2232

1748 msgid "Untracked cache is disabled on this system or location."

1749 msgstr "缓存未跟踪文件在本系统或位置中被禁用。"

1750

1743 -#: dir.c:3002 dir.c:3007

1751 +#: dir.c:3024 dir.c:3029

1752 #, c-format

1753 msgid "could not create directories for %s"

1754 msgstr "不能为 %s 创建目录"

1755

1748 -#: dir.c:3032

1756 +#: dir.c:3054

1757 #, c-format

1758 msgid "could not migrate git directory from '%s' to '%s'"

1759 msgstr "不能从 '%s' 迁移 git 目录到 '%s'"

@@ -1764,184 +1772,192 @@ msgstr "过滤内容"

1772 msgid "could not stat file '%s'"

1773 msgstr "不能对文件 '%s' 调用 stat"

1774

1767 -#: fetch-pack.c:252

1775 +#: fetch-object.c:17

1776 +msgid "Remote with no URL"

1777 +msgstr "远程未设置 URL"

1778 +

1779 +#: fetch-pack.c:253

1780 msgid "git fetch-pack: expected shallow list"

1781 msgstr "git fetch-pack：应为 shallow 列表"

1782

1771 -#: fetch-pack.c:264

1772 -msgid "git fetch-pack: expected ACK/NAK, got EOF"

1773 -msgstr "git fetch-pack：应为 ACK/NAK，却得到 EOF"

1783 +#: fetch-pack.c:265

1784 +msgid "git fetch-pack: expected ACK/NAK, got a flush packet"

1785 +msgstr "git fetch-pack：期望 ACK/NAK，却得到 flush 包"

1786

1775 -#: fetch-pack.c:283 builtin/archive.c:63

1787 +#: fetch-pack.c:284 builtin/archive.c:63

1788 #, c-format

1789 msgid "remote error: %s"

1790 msgstr "远程错误：%s"

1791

1780 -#: fetch-pack.c:284

1792 +#: fetch-pack.c:285

1793 #, c-format

1794 msgid "git fetch-pack: expected ACK/NAK, got '%s'"

1795 msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"

1796

1785 -#: fetch-pack.c:336

1797 +#: fetch-pack.c:337

1798 msgid "--stateless-rpc requires multi_ack_detailed"

1799 msgstr "--stateless-rpc 需要 multi_ack_detailed"

1800

1789 -#: fetch-pack.c:422

1801 +#: fetch-pack.c:428

1802 #, c-format

1803 msgid "invalid shallow line: %s"

1804 msgstr "无效的 shallow 信息：%s"

1805

1794 -#: fetch-pack.c:428

1806 +#: fetch-pack.c:434

1807 #, c-format

1808 msgid "invalid unshallow line: %s"

1809 msgstr "无效的 unshallow 信息：%s"

1810

1799 -#: fetch-pack.c:430

1811 +#: fetch-pack.c:436

1812 #, c-format

1813 msgid "object not found: %s"

1814 msgstr "对象未找到：%s"

1815

1804 -#: fetch-pack.c:433

1816 +#: fetch-pack.c:439

1817 #, c-format

1818 msgid "error in object: %s"

1819 msgstr "对象中出错：%s"

1820

1809 -#: fetch-pack.c:435

1821 +#: fetch-pack.c:441

1822 #, c-format

1823 msgid "no shallow found: %s"

1824 msgstr "未发现 shallow：%s"

1825

1814 -#: fetch-pack.c:438

1826 +#: fetch-pack.c:444

1827 #, c-format

1828 msgid "expected shallow/unshallow, got %s"

1829 msgstr "应为 shallow/unshallow，却得到 %s"

1830

1819 -#: fetch-pack.c:477

1831 +#: fetch-pack.c:485

1832 #, c-format

1833 msgid "got %s %d %s"

1834 msgstr "得到 %s %d %s"

1835

1824 -#: fetch-pack.c:491

1836 +#: fetch-pack.c:499

1837 #, c-format

1838 msgid "invalid commit %s"

1839 msgstr "无效提交 %s"

1840

1829 -#: fetch-pack.c:524

1841 +#: fetch-pack.c:532

1842 msgid "giving up"

1843 msgstr "放弃"

1844

1833 -#: fetch-pack.c:534 progress.c:229

1845 +#: fetch-pack.c:542 progress.c:229

1846 msgid "done"

1847 msgstr "完成"

1848

1837 -#: fetch-pack.c:546

1849 +#: fetch-pack.c:554

1850 #, c-format

1851 msgid "got %s (%d) %s"

1852 msgstr "得到 %s (%d) %s"

1853

1842 -#: fetch-pack.c:592

1854 +#: fetch-pack.c:600

1855 #, c-format

1856 msgid "Marking %s as complete"

1857 msgstr "标记 %s 为完成"

1858

1847 -#: fetch-pack.c:777

1859 +#: fetch-pack.c:788

1860 #, c-format

1861 msgid "already have %s (%s)"

1862 msgstr "已经有 %s（%s）"

1863

1852 -#: fetch-pack.c:815

1864 +#: fetch-pack.c:829

1865 msgid "fetch-pack: unable to fork off sideband demultiplexer"

1866 msgstr "fetch-pack：无法派生 sideband 多路输出"

1867

1856 -#: fetch-pack.c:823

1868 +#: fetch-pack.c:837

1869 msgid "protocol error: bad pack header"

1870 msgstr "协议错误：坏的包头"

1871

1860 -#: fetch-pack.c:879

1872 +#: fetch-pack.c:895

1873 #, c-format

1874 msgid "fetch-pack: unable to fork off %s"

1875 msgstr "fetch-pack：无法派生进程 %s"

1876

1865 -#: fetch-pack.c:895

1877 +#: fetch-pack.c:911

1878 #, c-format

1879 msgid "%s failed"

1880 msgstr "%s 失败"

1881

1870 -#: fetch-pack.c:897

1882 +#: fetch-pack.c:913

1883 msgid "error in sideband demultiplexer"

1884 msgstr "sideband 多路输出出错"

1885

1874 -#: fetch-pack.c:924

1886 +#: fetch-pack.c:940

1887 msgid "Server does not support shallow clients"

1888 msgstr "服务器不支持 shalllow 客户端"

1889

1878 -#: fetch-pack.c:928

1890 +#: fetch-pack.c:944

1891 msgid "Server supports multi_ack_detailed"

1892 msgstr "服务器支持 multi_ack_detailed"

1893

1882 -#: fetch-pack.c:931

1894 +#: fetch-pack.c:947

1895 msgid "Server supports no-done"

1896 msgstr "服务器支持 no-done"

1897

1886 -#: fetch-pack.c:937

1898 +#: fetch-pack.c:953

1899 msgid "Server supports multi_ack"

1900 msgstr "服务器支持 multi_ack"

1901

1890 -#: fetch-pack.c:941

1902 +#: fetch-pack.c:957

1903 msgid "Server supports side-band-64k"

1904 msgstr "服务器支持 side-band-64k"

1905

1894 -#: fetch-pack.c:945

1906 +#: fetch-pack.c:961

1907 msgid "Server supports side-band"

1908 msgstr "服务器支持 side-band"

1909

1898 -#: fetch-pack.c:949

1910 +#: fetch-pack.c:965

1911 msgid "Server supports allow-tip-sha1-in-want"

1912 msgstr "服务器支持 allow-tip-sha1-in-want"

1913

1902 -#: fetch-pack.c:953

1914 +#: fetch-pack.c:969

1915 msgid "Server supports allow-reachable-sha1-in-want"

1916 msgstr "服务器支持 allow-reachable-sha1-in-want"

1917

1906 -#: fetch-pack.c:963

1918 +#: fetch-pack.c:979

1919 msgid "Server supports ofs-delta"

1920 msgstr "服务器支持 ofs-delta"

1921

1910 -#: fetch-pack.c:970

1922 +#: fetch-pack.c:985

1923 +msgid "Server supports filter"

1924 +msgstr "服务器支持 filter"

1925 +

1926 +#: fetch-pack.c:993

1927 #, c-format

1928 msgid "Server version is %.*s"

1929 msgstr "服务器版本 %.*s"

1930

1915 -#: fetch-pack.c:976

1931 +#: fetch-pack.c:999

1932 msgid "Server does not support --shallow-since"

1933 msgstr "服务器不支持 --shallow-since"

1934

1919 -#: fetch-pack.c:980

1935 +#: fetch-pack.c:1003

1936 msgid "Server does not support --shallow-exclude"

1937 msgstr "服务器不支持 --shallow-exclude"

1938

1923 -#: fetch-pack.c:982

1939 +#: fetch-pack.c:1005

1940 msgid "Server does not support --deepen"

1941 msgstr "服务器不支持 --deepen"

1942

1927 -#: fetch-pack.c:993

1943 +#: fetch-pack.c:1016

1944 msgid "no common commits"

1945 msgstr "没有共同的提交"

1946

1931 -#: fetch-pack.c:1005

1947 +#: fetch-pack.c:1028

1948 msgid "git fetch-pack: fetch failed."

1949 msgstr "git fetch-pack：获取失败。"

1950

1935 -#: fetch-pack.c:1167

1951 +#: fetch-pack.c:1190

1952 msgid "no matching remote head"

1953 msgstr "没有匹配的远程分支"

1954

1939 -#: fetch-pack.c:1189

1955 +#: fetch-pack.c:1212

1956 #, c-format

1957 msgid "no such remote ref %s"

1958 msgstr "没有这样的远程引用 %s"

1959

1944 -#: fetch-pack.c:1192

1960 +#: fetch-pack.c:1215

1961 #, c-format

1962 msgid "Server does not allow request for unadvertised object %s"

1963 msgstr "服务器不允许请求未公开的对象 %s"

@@ -1964,17 +1980,18 @@ msgstr "无法将分离式签名写入 '%s'"

1980 msgid "ignore invalid color '%.*s' in log.graphColors"

1981 msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"

1982

1967 -#: grep.c:2017

1983 +#: grep.c:2022

1984 #, c-format

1985 msgid "'%s': unable to read %s"

1986 msgstr "'%s'：无法读取 %s"

1987

1972 -#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134

1988 +#: grep.c:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81

1989 +#: builtin/rm.c:134

1990 #, c-format

1991 msgid "failed to stat '%s'"

1992 msgstr "对 '%s' 调用 stat 失败"

1993

1977 -#: grep.c:2045

1994 +#: grep.c:2050

1995 #, c-format

1996 msgid "'%s': short read"

1997 msgstr "'%s'：读取不完整"

@@ -2115,19 +2132,18 @@ msgstr "不允许空的姓名（对于 <%s>）"

2132 msgid "name consists only of disallowed characters: %s"

2133 msgstr "姓名中仅包含禁用字符：%s"

2134

2118 -#: ident.c:416 builtin/commit.c:616

2135 +#: ident.c:416 builtin/commit.c:582

2136 #, c-format

2137 msgid "invalid date format: %s"

2138 msgstr "无效的日期格式：%s"

2139

2123 -#: list-objects-filter-options.c:30

2124 -msgid "multiple object filter types cannot be combined"

2125 -msgstr "不能混用多种对象过滤类型"

2140 +#: list-objects-filter-options.c:36

2141 +msgid "multiple filter-specs cannot be combined"

2142 +msgstr "不能混用多种过滤规格"

2143

2127 -#: list-objects-filter-options.c:41 list-objects-filter-options.c:68

2128 -#, c-format

2129 -msgid "invalid filter-spec expression '%s'"

2130 -msgstr "无效的 filter-spec 表达式 '%s'"

2144 +#: list-objects-filter-options.c:126

2145 +msgid "cannot change partial clone promisor remote"

2146 +msgstr "无法修改部分克隆的 promisor 远程仓库"

2147

2148 #: lockfile.c:151

2149 #, c-format

@@ -2156,8 +2172,8 @@ msgstr "不能创建 '%s.lock'：%s"

2172 msgid "failed to read the cache"

2173 msgstr "无法读取缓存"

2174

2159 -#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379

2160 -#: builtin/checkout.c:600 builtin/clone.c:754

2175 +#: merge.c:134 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378

2176 +#: builtin/checkout.c:599 builtin/clone.c:759

2177 msgid "unable to write new index file"

2178 msgstr "无法写新的索引文件"

2179

@@ -2174,60 +2190,60 @@ msgstr "为路径 '%s' addinfo_cache 失败"

2190 msgid "error building trees"

2191 msgstr "无法创建树"

2192

2177 -#: merge-recursive.c:752

2193 +#: merge-recursive.c:771

2194 #, c-format

2195 msgid "failed to create path '%s'%s"

2196 msgstr "无法创建路径 '%s'%s"

2197

2182 -#: merge-recursive.c:763

2198 +#: merge-recursive.c:782

2199 #, c-format

2200 msgid "Removing %s to make room for subdirectory\n"

2201 msgstr "删除 %s 以便为子目录留出空间\n"

2202

2187 -#: merge-recursive.c:777 merge-recursive.c:796

2203 +#: merge-recursive.c:796 merge-recursive.c:815

2204 msgid ": perhaps a D/F conflict?"

2205 msgstr "：可能是一个目录/文件冲突？"

2206

2191 -#: merge-recursive.c:786

2207 +#: merge-recursive.c:805

2208 #, c-format

2209 msgid "refusing to lose untracked file at '%s'"

2210 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"

2211

2196 -#: merge-recursive.c:828 builtin/cat-file.c:37

2212 +#: merge-recursive.c:847 builtin/cat-file.c:37

2213 #, c-format

2214 msgid "cannot read object %s '%s'"

2215 msgstr "不能读取对象 %s '%s'"

2216

2201 -#: merge-recursive.c:830

2217 +#: merge-recursive.c:849

2218 #, c-format

2219 msgid "blob expected for %s '%s'"

2220 msgstr "%s '%s' 应为数据对象"

2221

2206 -#: merge-recursive.c:854

2222 +#: merge-recursive.c:873

2223 #, c-format

2224 msgid "failed to open '%s': %s"

2225 msgstr "无法打开 '%s'：%s"

2226

2211 -#: merge-recursive.c:865

2227 +#: merge-recursive.c:884

2228 #, c-format

2229 msgid "failed to symlink '%s': %s"

2230 msgstr "无法创建符号链接 '%s'：%s"

2231

2216 -#: merge-recursive.c:870

2232 +#: merge-recursive.c:889

2233 #, c-format

2234 msgid "do not know what to do with %06o %s '%s'"

2235 msgstr "不知道如何处理 %06o %s '%s'"

2236

2221 -#: merge-recursive.c:1010

2237 +#: merge-recursive.c:1029

2238 msgid "Failed to execute internal merge"

2239 msgstr "无法执行内部合并"

2240

2225 -#: merge-recursive.c:1014

2241 +#: merge-recursive.c:1034

2242 #, c-format

2243 msgid "Unable to add %s to database"

2244 msgstr "不能添加 %s 至对象库"

2245

2230 -#: merge-recursive.c:1117

2246 +#: merge-recursive.c:1146

2247 #, c-format

2248 msgid ""

2249 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -2236,7 +2252,7 @@ msgstr ""

2252 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"

2253 "本被保留。"

2254

2239 -#: merge-recursive.c:1122

2255 +#: merge-recursive.c:1151

2256 #, c-format

2257 msgid ""

2258 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -2245,7 +2261,7 @@ msgstr ""

2261 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "

2262 "%7$s 版本被保留。"

2263

2248 -#: merge-recursive.c:1129

2264 +#: merge-recursive.c:1158

2265 #, c-format

2266 msgid ""

2267 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -2254,7 +2270,7 @@ msgstr ""

2270 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"

2271 "本保留在 %8$s 中。"

2272

2257 -#: merge-recursive.c:1134

2273 +#: merge-recursive.c:1163

2274 #, c-format

2275 msgid ""

2276 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -2263,20 +2279,20 @@ msgstr ""

2279 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "

2280 "%7$s 版本保留在 %9$s 中。"

2281

2266 -#: merge-recursive.c:1168

2282 +#: merge-recursive.c:1197

2283 msgid "rename"

2284 msgstr "重命名"

2285

2270 -#: merge-recursive.c:1168

2286 +#: merge-recursive.c:1197

2287 msgid "renamed"

2288 msgstr "重命名"

2289

2274 -#: merge-recursive.c:1225

2290 +#: merge-recursive.c:1254

2291 #, c-format

2292 msgid "%s is a directory in %s adding as %s instead"

2293 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"

2294

2279 -#: merge-recursive.c:1250

2295 +#: merge-recursive.c:1279

2296 #, c-format

2297 msgid ""

2298 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"

@@ -2285,140 +2301,140 @@ msgstr ""

2301 "冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 "

2302 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"

2303

2288 -#: merge-recursive.c:1255

2304 +#: merge-recursive.c:1284

2305 msgid " (left unresolved)"

2306 msgstr "（留下未解决）"

2307

2292 -#: merge-recursive.c:1317

2308 +#: merge-recursive.c:1346

2309 #, c-format

2310 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

2311 msgstr ""

2312 "冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->"

2313 "%5$s"

2314

2299 -#: merge-recursive.c:1350

2315 +#: merge-recursive.c:1379

2316 #, c-format

2317 msgid "Renaming %s to %s and %s to %s instead"

2318 msgstr "而是重命名 %s 至 %s，以及 %s 至 %s"

2319

2304 -#: merge-recursive.c:1553

2320 +#: merge-recursive.c:1582

2321 #, c-format

2322 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"

2323 msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"

2324

2309 -#: merge-recursive.c:1568

2325 +#: merge-recursive.c:1597

2326 #, c-format

2327 msgid "Adding merged %s"

2328 msgstr "添加合并后的 %s"

2329

2314 -#: merge-recursive.c:1575 merge-recursive.c:1805

2330 +#: merge-recursive.c:1604 merge-recursive.c:1834

2331 #, c-format

2332 msgid "Adding as %s instead"

2333 msgstr "而是以 %s 为名添加"

2334

2319 -#: merge-recursive.c:1632

2335 +#: merge-recursive.c:1661

2336 #, c-format

2337 msgid "cannot read object %s"

2338 msgstr "不能读取对象 %s"

2339

2324 -#: merge-recursive.c:1635

2340 +#: merge-recursive.c:1664

2341 #, c-format

2342 msgid "object %s is not a blob"

2343 msgstr "对象 %s 不是一个数据对象"

2344

2329 -#: merge-recursive.c:1704

2345 +#: merge-recursive.c:1733

2346 msgid "modify"

2347 msgstr "修改"

2348

2333 -#: merge-recursive.c:1704

2349 +#: merge-recursive.c:1733

2350 msgid "modified"

2351 msgstr "修改"

2352

2337 -#: merge-recursive.c:1714

2353 +#: merge-recursive.c:1743

2354 msgid "content"

2355 msgstr "内容"

2356

2341 -#: merge-recursive.c:1721

2357 +#: merge-recursive.c:1750

2358 msgid "add/add"

2359 msgstr "添加/添加"

2360

2345 -#: merge-recursive.c:1757

2361 +#: merge-recursive.c:1786

2362 #, c-format

2363 msgid "Skipped %s (merged same as existing)"

2364 msgstr "略过 %s（已经做过相同合并）"

2365

2350 -#: merge-recursive.c:1771

2366 +#: merge-recursive.c:1800

2367 #, c-format

2368 msgid "Auto-merging %s"

2369 msgstr "自动合并 %s"

2370

2355 -#: merge-recursive.c:1775 git-submodule.sh:932

2371 +#: merge-recursive.c:1804 git-submodule.sh:879

2372 msgid "submodule"

2373 msgstr "子模组"

2374

2359 -#: merge-recursive.c:1776

2375 +#: merge-recursive.c:1805

2376 #, c-format

2377 msgid "CONFLICT (%s): Merge conflict in %s"

2378 msgstr "冲突（%s）：合并冲突于 %s"

2379

2364 -#: merge-recursive.c:1870

2380 +#: merge-recursive.c:1899

2381 #, c-format

2382 msgid "Removing %s"

2383 msgstr "删除 %s"

2384

2369 -#: merge-recursive.c:1896

2385 +#: merge-recursive.c:1925

2386 msgid "file/directory"

2387 msgstr "文件/目录"

2388

2373 -#: merge-recursive.c:1902

2389 +#: merge-recursive.c:1931

2390 msgid "directory/file"

2391 msgstr "目录/文件"

2392

2377 -#: merge-recursive.c:1909

2393 +#: merge-recursive.c:1938

2394 #, c-format

2395 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"

2396 msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"

2397

2382 -#: merge-recursive.c:1918

2398 +#: merge-recursive.c:1947

2399 #, c-format

2400 msgid "Adding %s"

2401 msgstr "添加 %s"

2402

2387 -#: merge-recursive.c:1958

2403 +#: merge-recursive.c:1987

2404 #, c-format

2405 msgid "Dirty index: cannot merge (dirty: %s)"

2406 msgstr "脏索引：不能合并（脏文件：%s）"

2407

2392 -#: merge-recursive.c:1962

2408 +#: merge-recursive.c:1991

2409 msgid "Already up to date!"

2410 msgstr "已经是最新的！"

2411

2396 -#: merge-recursive.c:1971

2412 +#: merge-recursive.c:2000

2413 #, c-format

2414 msgid "merging of trees %s and %s failed"

2415 msgstr "无法合并树 %s 和 %s"

2416

2401 -#: merge-recursive.c:2068

2417 +#: merge-recursive.c:2097

2418 msgid "Merging:"

2419 msgstr "合并："

2420

2405 -#: merge-recursive.c:2081

2421 +#: merge-recursive.c:2110

2422 #, c-format

2423 msgid "found %u common ancestor:"

2424 msgid_plural "found %u common ancestors:"

2425 msgstr[0] "发现 %u 个共同祖先："

2426 msgstr[1] "发现 %u 个共同祖先："

2427

2412 -#: merge-recursive.c:2120

2428 +#: merge-recursive.c:2149

2429 msgid "merge returned no commit"

2430 msgstr "合并未返回提交"

2431

2416 -#: merge-recursive.c:2183

2432 +#: merge-recursive.c:2212

2433 #, c-format

2434 msgid "Could not parse object '%s'"

2435 msgstr "不能解析对象 '%s'"

2436

2421 -#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815

2437 +#: merge-recursive.c:2228 builtin/merge.c:657 builtin/merge.c:816

2438 msgid "Unable to write index."

2439 msgstr "不能写入索引。"

2440

@@ -2438,16 +2454,16 @@ msgstr ""

2454 msgid "You have not concluded your notes merge (%s exists)."

2455 msgstr "您尚未结束注释合并（存在 %s）。"

2456

2441 -#: notes-utils.c:42

2457 +#: notes-utils.c:43

2458 msgid "Cannot commit uninitialized/unreferenced notes tree"

2459 msgstr "不能提交未初始化/未引用的注解树"

2460

2445 -#: notes-utils.c:101

2461 +#: notes-utils.c:102

2462 #, c-format

2463 msgid "Bad notes.rewriteMode value: '%s'"

2464 msgstr "坏的 notes.rewriteMode 值：'%s'"

2465

2450 -#: notes-utils.c:111

2466 +#: notes-utils.c:112

2467 #, c-format

2468 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"

2469 msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"

@@ -2456,7 +2472,7 @@ msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"

2472 #. the environment variable, the second %s is

2473 #. its value.

2474 #.

2459 -#: notes-utils.c:141

2475 +#: notes-utils.c:142

2476 #, c-format

2477 msgid "Bad %s value: '%s'"

2478 msgstr "坏的 %s 值：'%s'"

@@ -2466,25 +2482,25 @@ msgstr "坏的 %s 值：'%s'"

2482 msgid "unable to parse object: %s"

2483 msgstr "不能解析对象：%s"

2484

2469 -#: packfile.c:556

2485 +#: packfile.c:561

2486 msgid "offset before end of packfile (broken .idx?)"

2487 msgstr "偏移量在包文件结束之前（损坏的 .idx？）"

2488

2473 -#: packfile.c:1683

2489 +#: packfile.c:1694

2490 #, c-format

2491 msgid "offset before start of pack index for %s (corrupt index?)"

2492 msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"

2493

2478 -#: packfile.c:1687

2494 +#: packfile.c:1698

2495 #, c-format

2496 msgid "offset beyond end of pack index for %s (truncated index?)"

2497 msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"

2498

2483 -#: parse-options.c:573

2499 +#: parse-options.c:619

2500 msgid "..."

2501 msgstr "..."

2502

2487 -#: parse-options.c:592

2503 +#: parse-options.c:638

2504 #, c-format

2505 msgid "usage: %s"

2506 msgstr "用法：%s"

@@ -2492,18 +2508,18 @@ msgstr "用法：%s"

2508 #. TRANSLATORS: the colon here should align with the

2509 #. one in "usage: %s" translation.

2510 #.

2495 -#: parse-options.c:598

2511 +#: parse-options.c:644

2512 #, c-format

2513 msgid " or: %s"

2514 msgstr " 或：%s"

2515

2516 # 译者：为保证在输出中对齐，注意调整句中空格！

2501 -#: parse-options.c:601

2517 +#: parse-options.c:647

2518 #, c-format

2519 msgid " %s"

2520 msgstr " %s"

2521

2506 -#: parse-options.c:640

2522 +#: parse-options.c:686

2523 msgid "-NUM"

2524 msgstr "-数字"

2525

@@ -2592,7 +2608,7 @@ msgstr "路径规格 '%s' 位于符号链接中"

2608 msgid "unable to parse --pretty format"

2609 msgstr "不能解析 --pretty 格式"

2610

2595 -#: read-cache.c:1472

2611 +#: read-cache.c:1473

2612 #, c-format

2613 msgid ""

2614 "index.version set, but the value is invalid.\n"

@@ -2601,7 +2617,7 @@ msgstr ""

2617 "设置了 index.version，但是取值无效。\n"

2618 "使用版本 %i"

2619

2604 -#: read-cache.c:1482

2620 +#: read-cache.c:1483

2621 #, c-format

2622 msgid ""

2623 "GIT_INDEX_VERSION set, but the value is invalid.\n"

@@ -2610,22 +2626,22 @@ msgstr ""

2626 "设置了 GIT_INDEX_VERSION，但是取值无效。\n"

2627 "使用版本 %i"

2628

2613 -#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048

2629 +#: read-cache.c:2375 sequencer.c:3248 wrapper.c:658 builtin/merge.c:1049

2630 #, c-format

2631 msgid "could not close '%s'"

2632 msgstr "不能关闭 '%s'"

2633

2618 -#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096

2634 +#: read-cache.c:2448 sequencer.c:1900 sequencer.c:2627

2635 #, c-format

2636 msgid "could not stat '%s'"

2637 msgstr "不能对 '%s' 调用 stat"

2638

2623 -#: read-cache.c:2455

2639 +#: read-cache.c:2461

2640 #, c-format

2641 msgid "unable to open git dir: %s"

2642 msgstr "不能打开 git 目录：%s"

2643

2628 -#: read-cache.c:2467

2644 +#: read-cache.c:2473

2645 #, c-format

2646 msgid "unable to unlink: %s"

2647 msgstr "无法删除：%s"

@@ -2644,18 +2660,18 @@ msgstr "在隔离环境中禁止更新引用"

2660 msgid "could not remove reference %s"

2661 msgstr "无法删除引用 %s"

2662

2647 -#: refs/files-backend.c:1203 refs/packed-backend.c:1524

2648 -#: refs/packed-backend.c:1534

2663 +#: refs/files-backend.c:1203 refs/packed-backend.c:1528

2664 +#: refs/packed-backend.c:1538

2665 #, c-format

2666 msgid "could not delete reference %s: %s"

2667 msgstr "无法删除引用 %s：%s"

2668

2653 -#: refs/files-backend.c:1206 refs/packed-backend.c:1537

2669 +#: refs/files-backend.c:1206 refs/packed-backend.c:1541

2670 #, c-format

2671 msgid "could not delete references: %s"

2672 msgstr "无法删除引用：%s"

2673

2658 -#: ref-filter.c:35 wt-status.c:1816

2674 +#: ref-filter.c:35 wt-status.c:1842

2675 msgid "gone"

2676 msgstr "丢失"

2677

@@ -2849,128 +2865,138 @@ msgstr "（头指针分离自 %s）"

2865 msgid "(no branch)"

2866 msgstr "（非分支）"

2867

2852 -#: ref-filter.c:1488 ref-filter.c:1519

2868 +#: ref-filter.c:1364

2869 #, c-format

2870 msgid "missing object %s for %s"

2871 msgstr "缺失 %2$s 的对象 %1$s"

2872

2857 -#: ref-filter.c:1491 ref-filter.c:1522

2873 +#: ref-filter.c:1367

2874 #, c-format

2875 msgid "parse_object_buffer failed on %s for %s"

2876 msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"

2877

2862 -#: ref-filter.c:1822

2878 +#: ref-filter.c:1819

2879 #, c-format

2880 msgid "malformed object at '%s'"

2881 msgstr "非法的对象于 '%s'"

2882

2867 -#: ref-filter.c:1889

2883 +#: ref-filter.c:1886

2884 #, c-format

2885 msgid "ignoring ref with broken name %s"

2886 msgstr "忽略带有错误名称 %s 的引用"

2887

2872 -#: ref-filter.c:1894

2888 +#: ref-filter.c:1891

2889 #, c-format

2890 msgid "ignoring broken ref %s"

2891 msgstr "忽略损坏的引用 %s"

2892

2877 -#: ref-filter.c:2156

2893 +#: ref-filter.c:2152

2894 #, c-format

2895 msgid "format: %%(end) atom missing"

2896 msgstr "格式：缺少 %%(end) 元素"

2897

2882 -#: ref-filter.c:2250

2898 +#: ref-filter.c:2246

2899 #, c-format

2900 msgid "malformed object name %s"

2901 msgstr "非法的对象名 %s"

2902

2887 -#: remote.c:780

2903 +#: remote.c:795

2904 #, c-format

2905 msgid "Cannot fetch both %s and %s to %s"

2906 msgstr "不能同时获取 %s 和 %s 至 %s"

2907

2892 -#: remote.c:784

2908 +#: remote.c:799

2909 #, c-format

2910 msgid "%s usually tracks %s, not %s"

2911 msgstr "%s 通常跟踪 %s，而非 %s"

2912

2897 -#: remote.c:788

2913 +#: remote.c:803

2914 #, c-format

2915 msgid "%s tracks both %s and %s"

2916 msgstr "%s 同时跟踪 %s 和 %s"

2917

2902 -#: remote.c:796

2918 +#: remote.c:811

2919 msgid "Internal error"

2920 msgstr "内部错误"

2921

2906 -#: remote.c:1711 remote.c:1813

2922 +#: remote.c:1726 remote.c:1828

2923 msgid "HEAD does not point to a branch"

2924 msgstr "HEAD 没有指向一个分支"

2925

2910 -#: remote.c:1720

2926 +#: remote.c:1735

2927 #, c-format

2928 msgid "no such branch: '%s'"

2929 msgstr "没有此分支：'%s'"

2930

2915 -#: remote.c:1723

2931 +#: remote.c:1738

2932 #, c-format

2933 msgid "no upstream configured for branch '%s'"

2934 msgstr "尚未给分支 '%s' 设置上游"

2935

2920 -#: remote.c:1729

2936 +#: remote.c:1744

2937 #, c-format

2938 msgid "upstream branch '%s' not stored as a remote-tracking branch"

2939 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"

2940

2925 -#: remote.c:1744

2941 +#: remote.c:1759

2942 #, c-format

2943 msgid "push destination '%s' on remote '%s' has no local tracking branch"

2944 msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"

2945

2930 -#: remote.c:1756

2946 +#: remote.c:1771

2947 #, c-format

2948 msgid "branch '%s' has no remote for pushing"

2949 msgstr "分支 '%s' 没有设置要推送的远程服务器"

2950

2935 -#: remote.c:1767

2951 +#: remote.c:1782

2952 #, c-format

2953 msgid "push refspecs for '%s' do not include '%s'"

2954 msgstr "向 '%s' 推送引用规格未包含 '%s'"

2955

2940 -#: remote.c:1780

2956 +#: remote.c:1795

2957 msgid "push has no destination (push.default is 'nothing')"

2958 msgstr "推送无目标（push.default 是 'nothing'）"

2959

2944 -#: remote.c:1802

2960 +#: remote.c:1817

2961 msgid "cannot resolve 'simple' push to a single destination"

2962 msgstr "无法解析 'simple' 推送至一个单独的目标"

2963

2948 -#: remote.c:2106

2964 +#: remote.c:2132

2965 #, c-format

2966 msgid "Your branch is based on '%s', but the upstream is gone.\n"

2967 msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"

2968

2953 -#: remote.c:2110

2969 +#: remote.c:2136

2970 msgid " (use \"git branch --unset-upstream\" to fixup)\n"

2971 msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n"

2972

2957 -#: remote.c:2113

2973 +#: remote.c:2139

2974 #, c-format

2975 msgid "Your branch is up to date with '%s'.\n"

2976 msgstr "您的分支与上游分支 '%s' 一致。\n"

2977

2962 -#: remote.c:2117

2978 +#: remote.c:2143

2979 +#, c-format

2980 +msgid "Your branch and '%s' refer to different commits.\n"

2981 +msgstr "您的分支和 '%s' 指向不同的提交。\n"

2982 +

2983 +#: remote.c:2146

2984 +#, c-format

2985 +msgid " (use \"%s\" for details)\n"

2986 +msgstr " （使用 \"%s\" 查看详情）\n"

2987 +

2988 +#: remote.c:2150

2989 #, c-format

2990 msgid "Your branch is ahead of '%s' by %d commit.\n"

2991 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"

2992 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"

2993 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"

2994

2969 -#: remote.c:2123

2995 +#: remote.c:2156

2996 msgid " (use \"git push\" to publish your local commits)\n"

2997 msgstr " （使用 \"git push\" 来发布您的本地提交）\n"

2998

2973 -#: remote.c:2126

2999 +#: remote.c:2159

3000 #, c-format

3001 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"

3002 msgid_plural ""

@@ -2979,11 +3005,11 @@ msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"

3005 msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"

3006

3007 # 译者：注意保持前导空格

2982 -#: remote.c:2134

3008 +#: remote.c:2167

3009 msgid " (use \"git pull\" to update your local branch)\n"

3010 msgstr " （使用 \"git pull\" 来更新您的本地分支）\n"

3011

2986 -#: remote.c:2137

3012 +#: remote.c:2170

3013 #, c-format

3014 msgid ""

3015 "Your branch and '%s' have diverged,\n"

@@ -2999,28 +3025,28 @@ msgstr[1] ""

3025 "并且分别有 %d 和 %d 处不同的提交。\n"

3026

3027 # 译者：注意保持前导空格

3002 -#: remote.c:2147

3028 +#: remote.c:2180

3029 msgid " (use \"git pull\" to merge the remote branch into yours)\n"

3030 msgstr " （使用 \"git pull\" 来合并远程分支）\n"

3031

3006 -#: revision.c:2268

3032 +#: revision.c:2277

3033 msgid "your current branch appears to be broken"

3034 msgstr "您的当前分支好像被损坏"

3035

3010 -#: revision.c:2271

3036 +#: revision.c:2280

3037 #, c-format

3038 msgid "your current branch '%s' does not have any commits yet"

3039 msgstr "您的当前分支 '%s' 尚无任何提交"

3040

3015 -#: revision.c:2465

3041 +#: revision.c:2477

3042 msgid "--first-parent is incompatible with --bisect"

3043 msgstr "--first-parent 与 --bisect 不兼容"

3044

3019 -#: run-command.c:645

3045 +#: run-command.c:731

3046 msgid "open /dev/null failed"

3047 msgstr "不能打开 /dev/null"

3048

3023 -#: run-command.c:1188

3049 +#: run-command.c:1274

3050 #, c-format

3051 msgid ""

3052 "The '%s' hook was ignored because it's not set as executable.\n"

@@ -3030,55 +3056,64 @@ msgstr ""

3056 "配置 `git config advice.ignoredHook false` 来关闭这条警告。"

3057

3058 #: send-pack.c:141

3059 +msgid "unexpected flush packet while reading remote unpack status"

3060 +msgstr "读取远程解包状态时收到意外的 flush 包"

3061 +

3062 +#: send-pack.c:143

3063 #, c-format

3064 msgid "unable to parse remote unpack status: %s"

3065 msgstr "不能解析远程解包状态：%s"

3066

3037 -#: send-pack.c:143

3067 +#: send-pack.c:145

3068 #, c-format

3069 msgid "remote unpack failed: %s"

3070 msgstr "远程解包失败：%s"

3071

3042 -#: send-pack.c:306

3072 +#: send-pack.c:308

3073 msgid "failed to sign the push certificate"

3074 msgstr "无法为推送证书签名"

3075

3046 -#: send-pack.c:419

3076 +#: send-pack.c:421

3077 msgid "the receiving end does not support --signed push"

3078 msgstr "接收端不支持签名推送"

3079

3050 -#: send-pack.c:421

3080 +#: send-pack.c:423

3081 msgid ""

3082 "not sending a push certificate since the receiving end does not support --"

3083 "signed push"

3084 msgstr "未发送推送证书，因为接收端不支持签名推送"

3085

3056 -#: send-pack.c:433

3086 +#: send-pack.c:435

3087 msgid "the receiving end does not support --atomic push"

3088 msgstr "接收端不支持原子推送"

3089

3060 -#: send-pack.c:438

3090 +#: send-pack.c:440

3091 msgid "the receiving end does not support push options"

3092 msgstr "接收端不支持推送选项"

3093

3064 -#: sequencer.c:218

3094 +#: sequencer.c:158

3095 +#, c-format

3096 +msgid "invalid commit message cleanup mode '%s'"

3097 +msgstr "无效的提交信息清理模式 '%s'"

3098 +

3099 +#: sequencer.c:267

3100 msgid "revert"

3101 msgstr "还原"

3102

3068 -#: sequencer.c:220

3103 +#: sequencer.c:269

3104 msgid "cherry-pick"

3105 msgstr "拣选"

3106

3072 -#: sequencer.c:222

3107 +#: sequencer.c:271

3108 msgid "rebase -i"

3109 msgstr "rebase -i"

3110

3076 -#: sequencer.c:224

3111 +#: sequencer.c:273

3112 #, c-format

3113 msgid "Unknown action: %d"

3114 msgstr "未知动作：%d"

3115

3081 -#: sequencer.c:281

3116 +#: sequencer.c:330

3117 msgid ""

3118 "after resolving the conflicts, mark the corrected paths\n"

3119 "with 'git add <paths>' or 'git rm <paths>'"

@@ -3086,7 +3121,7 @@ msgstr ""

3121 "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"

3122 "命令标记修正后的文件"

3123

3089 -#: sequencer.c:284

3124 +#: sequencer.c:333

3125 msgid ""

3126 "after resolving the conflicts, mark the corrected paths\n"

3127 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -3095,43 +3130,43 @@ msgstr ""

3130 "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"

3131 "对修正后的文件做标记，然后用 'git commit' 提交"

3132

3098 -#: sequencer.c:297 sequencer.c:1718

3133 +#: sequencer.c:346 sequencer.c:2245

3134 #, c-format

3135 msgid "could not lock '%s'"

3136 msgstr "不能锁定 '%s'"

3137

3103 -#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737

3104 -#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656

3138 +#: sequencer.c:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264

3139 +#: sequencer.c:3246 sequencer.c:3310 wrapper.c:656

3140 #, c-format

3141 msgid "could not write to '%s'"

3142 msgstr "不能写入 '%s'"

3143

3109 -#: sequencer.c:304

3144 +#: sequencer.c:353

3145 #, c-format

3146 msgid "could not write eol to '%s'"

3147 msgstr "不能将换行符写入 '%s'"

3148

3114 -#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725

3149 +#: sequencer.c:356 sequencer.c:2128 sequencer.c:2252

3150 #, c-format

3116 -msgid "failed to finalize '%s'."

3117 -msgstr "无法完成 '%s'。"

3151 +msgid "failed to finalize '%s'"

3152 +msgstr "无法完成 '%s'"

3153

3119 -#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259

3120 -#: builtin/commit.c:754 builtin/merge.c:1046

3154 +#: sequencer.c:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259

3155 +#: builtin/commit.c:722 builtin/merge.c:1047

3156 #, c-format

3157 msgid "could not read '%s'"

3158 msgstr "不能读取 '%s'"

3159

3125 -#: sequencer.c:358

3160 +#: sequencer.c:405

3161 #, c-format

3162 msgid "your local changes would be overwritten by %s."

3163 msgstr "您的本地修改将被%s覆盖。"

3164

3130 -#: sequencer.c:362

3165 +#: sequencer.c:409

3166 msgid "commit your changes or stash them to proceed."

3167 msgstr "提交您的修改或贮藏后再继续。"

3168

3134 -#: sequencer.c:391

3169 +#: sequencer.c:438

3170 #, c-format

3171 msgid "%s: fast-forward"

3172 msgstr "%s：快进"

@@ -3139,20 +3174,20 @@ msgstr "%s：快进"

3174 #. TRANSLATORS: %s will be "revert", "cherry-pick" or

3175 #. "rebase -i".

3176 #.

3142 -#: sequencer.c:477

3177 +#: sequencer.c:526

3178 #, c-format

3179 msgid "%s: Unable to write new index file"

3180 msgstr "%s：无法写入新索引文件"

3181

3147 -#: sequencer.c:496

3182 +#: sequencer.c:542

3183 msgid "could not resolve HEAD commit"

3184 msgstr "不能解析 HEAD 提交"

3185

3151 -#: sequencer.c:516

3186 +#: sequencer.c:562

3187 msgid "unable to update cache tree"

3188 msgstr "不能更新缓存树"

3189

3155 -#: sequencer.c:600

3190 +#: sequencer.c:658

3191 #, c-format

3192 msgid ""

3193 "you have staged changes in your working tree\n"

@@ -3181,17 +3216,120 @@ msgstr ""

3216 "\n"

3217 " git rebase --continue\n"

3218

3184 -#: sequencer.c:702

3219 +#: sequencer.c:915

3220 +msgid "'prepare-commit-msg' hook failed"

3221 +msgstr "'prepare-commit-msg' 钩子失败"

3222 +

3223 +#: sequencer.c:922

3224 +msgid ""

3225 +"Your name and email address were configured automatically based\n"

3226 +"on your username and hostname. Please check that they are accurate.\n"

3227 +"You can suppress this message by setting them explicitly. Run the\n"

3228 +"following command and follow the instructions in your editor to edit\n"

3229 +"your configuration file:\n"

3230 +"\n"

3231 +" git config --global --edit\n"

3232 +"\n"

3233 +"After doing this, you may fix the identity used for this commit with:\n"

3234 +"\n"

3235 +" git commit --amend --reset-author\n"

3236 +msgstr ""

3237 +"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"

3238 +"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"

3239 +"中编辑您的配置文件：\n"

3240 +"\n"

3241 +" git config --global --edit\n"

3242 +"\n"

3243 +"设置完毕后，您可以用下面的命令来修正本次提交所使用的用户身份：\n"

3244 +"\n"

3245 +" git commit --amend --reset-author\n"

3246 +

3247 +#: sequencer.c:935

3248 +msgid ""

3249 +"Your name and email address were configured automatically based\n"

3250 +"on your username and hostname. Please check that they are accurate.\n"

3251 +"You can suppress this message by setting them explicitly:\n"

3252 +"\n"

3253 +" git config --global user.name \"Your Name\"\n"

3254 +" git config --global user.email you@example.com\n"

3255 +"\n"

3256 +"After doing this, you may fix the identity used for this commit with:\n"

3257 +"\n"

3258 +" git commit --amend --reset-author\n"

3259 +msgstr ""

3260 +"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"

3261 +"与否。您可以对其进行设置以免再出现本提示信息：\n"

3262 +"\n"

3263 +" git config --global user.name \"Your Name\"\n"

3264 +" git config --global user.email you@example.com\n"

3265 +"\n"

3266 +"设置完毕后，您可以用下面的命令来修正本次提交所使用的用户身份：\n"

3267 +"\n"

3268 +" git commit --amend --reset-author\n"

3269 +

3270 +#: sequencer.c:975

3271 +msgid "couldn't look up newly created commit"

3272 +msgstr "无法找到新创建的提交"

3273 +

3274 +#: sequencer.c:977

3275 +msgid "could not parse newly created commit"

3276 +msgstr "不能解析新创建的提交"

3277 +

3278 +#: sequencer.c:1023

3279 +msgid "unable to resolve HEAD after creating commit"

3280 +msgstr "创建提交后，不能解析 HEAD"

3281 +

3282 +#: sequencer.c:1025

3283 +msgid "detached HEAD"

3284 +msgstr "分离头指针"

3285 +

3286 +# 译者：中文字符串拼接，可删除前导空格

3287 +#: sequencer.c:1029

3288 +msgid " (root-commit)"

3289 +msgstr "（根提交）"

3290 +

3291 +#: sequencer.c:1050

3292 +msgid "could not parse HEAD"

3293 +msgstr "不能解析 HEAD"

3294 +

3295 +#: sequencer.c:1052

3296 +#, c-format

3297 +msgid "HEAD %s is not a commit!"

3298 +msgstr "HEAD %s 不是一个提交！"

3299 +

3300 +#: sequencer.c:1056 builtin/commit.c:1491

3301 +msgid "could not parse HEAD commit"

3302 +msgstr "不能解析 HEAD 提交"

3303 +

3304 +#: sequencer.c:1107 sequencer.c:1673

3305 +msgid "unable to parse commit author"

3306 +msgstr "不能解析提交作者"

3307 +

3308 +#: sequencer.c:1117 builtin/am.c:1630 builtin/merge.c:643

3309 +msgid "git write-tree failed to write a tree"

3310 +msgstr "git write-tree 无法写入树对象"

3311 +

3312 +#: sequencer.c:1134 sequencer.c:1186

3313 +#, c-format

3314 +msgid "unable to read commit message from '%s'"

3315 +msgstr "不能从 '%s' 读取提交说明"

3316 +

3317 +#: sequencer.c:1154 builtin/am.c:1650 builtin/commit.c:1594 builtin/merge.c:826

3318 +#: builtin/merge.c:851

3319 +msgid "failed to write commit object"

3320 +msgstr "无法写提交对象"

3321 +

3322 +#: sequencer.c:1213

3323 #, c-format

3324 msgid "could not parse commit %s"

3325 msgstr "不能解析提交 %s"

3326

3189 -#: sequencer.c:707

3327 +#: sequencer.c:1218

3328 #, c-format

3329 msgid "could not parse parent commit %s"

3330 msgstr "不能解析父提交 %s"

3331

3194 -#: sequencer.c:836

3332 +#: sequencer.c:1347

3333 #, c-format

3334 msgid ""

3335 "unexpected 1st line of squash message:\n"

@@ -3202,7 +3340,7 @@ msgstr ""

3340 "\n"

3341 "\t%.*s"

3342

3205 -#: sequencer.c:842

3343 +#: sequencer.c:1353

3344 #, c-format

3345 msgid ""

3346 "invalid 1st line of squash message:\n"

@@ -3213,241 +3351,245 @@ msgstr ""

3351 "\n"

3352 "\t%.*s"

3353

3216 -#: sequencer.c:848 sequencer.c:873

3354 +#: sequencer.c:1359 sequencer.c:1384

3355 #, c-format

3356 msgid "This is a combination of %d commits."

3357 msgstr "这是一个 %d 个提交的组合。"

3358

3221 -#: sequencer.c:857 sequencer.c:2748

3359 +#: sequencer.c:1368 sequencer.c:3265

3360 msgid "need a HEAD to fixup"

3361 msgstr "需要一个 HEAD 来修复"

3362

3225 -#: sequencer.c:859

3363 +#: sequencer.c:1370

3364 msgid "could not read HEAD"

3365 msgstr "不能读取 HEAD"

3366

3229 -#: sequencer.c:861

3367 +#: sequencer.c:1372

3368 msgid "could not read HEAD's commit message"

3369 msgstr "不能读取 HEAD 的提交说明"

3370

3233 -#: sequencer.c:867

3371 +#: sequencer.c:1378

3372 #, c-format

3373 msgid "cannot write '%s'"

3374 msgstr "不能写 '%s'"

3375

3238 -#: sequencer.c:876 git-rebase--interactive.sh:446

3376 +#: sequencer.c:1387 git-rebase--interactive.sh:452

3377 msgid "This is the 1st commit message:"

3378 msgstr "这是第一个提交说明："

3379

3242 -#: sequencer.c:884

3380 +#: sequencer.c:1395

3381 #, c-format

3382 msgid "could not read commit message of %s"

3383 msgstr "不能读取 %s 的提交说明"

3384

3247 -#: sequencer.c:891

3385 +#: sequencer.c:1402

3386 #, c-format

3387 msgid "This is the commit message #%d:"

3388 msgstr "这是提交说明 #%d："

3389

3252 -#: sequencer.c:896

3390 +#: sequencer.c:1407

3391 #, c-format

3392 msgid "The commit message #%d will be skipped:"

3393 msgstr "提交说明 #%d 将被跳过："

3394

3257 -#: sequencer.c:901

3395 +#: sequencer.c:1412

3396 #, c-format

3397 msgid "unknown command: %d"

3398 msgstr "未知命令：%d"

3399

3262 -#: sequencer.c:967

3400 +#: sequencer.c:1479

3401 msgid "your index file is unmerged."

3402 msgstr "您的索引文件未完成合并。"

3403

3266 -#: sequencer.c:986

3404 +#: sequencer.c:1498

3405 #, c-format

3406 msgid "commit %s is a merge but no -m option was given."

3407 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"

3408

3271 -#: sequencer.c:994

3409 +#: sequencer.c:1506

3410 #, c-format

3411 msgid "commit %s does not have parent %d"

3412 msgstr "提交 %s 没有第 %d 个父提交"

3413

3276 -#: sequencer.c:998

3414 +#: sequencer.c:1510

3415 #, c-format

3416 msgid "mainline was specified but commit %s is not a merge."

3417 msgstr "指定了主线，但是提交 %s 不是一个合并提交。"

3418

3281 -#: sequencer.c:1004

3419 +#: sequencer.c:1516

3420 #, c-format

3421 msgid "cannot get commit message for %s"

3422 msgstr "不能得到 %s 的提交说明"

3423

3424 #. TRANSLATORS: The first %s will be a "todo" command like

3425 #. "revert" or "pick", the second %s a SHA1.

3288 -#: sequencer.c:1023

3426 +#: sequencer.c:1535

3427 #, c-format

3428 msgid "%s: cannot parse parent commit %s"

3429 msgstr "%s：不能解析父提交 %s"

3430

3293 -#: sequencer.c:1086 sequencer.c:1867

3431 +#: sequencer.c:1600 sequencer.c:2397

3432 #, c-format

3433 msgid "could not rename '%s' to '%s'"

3434 msgstr "不能将 '%s' 重命名为 '%s'"

3435

3298 -#: sequencer.c:1137

3436 +#: sequencer.c:1654

3437 #, c-format

3438 msgid "could not revert %s... %s"

3439 msgstr "不能还原 %s... %s"

3440

3303 -#: sequencer.c:1138

3441 +#: sequencer.c:1655

3442 #, c-format

3443 msgid "could not apply %s... %s"

3444 msgstr "不能应用 %s... %s"

3445

3308 -#: sequencer.c:1180

3446 +#: sequencer.c:1702

3447 msgid "empty commit set passed"

3448 msgstr "提供了空的提交集"

3449

3312 -#: sequencer.c:1190

3450 +#: sequencer.c:1712

3451 #, c-format

3452 msgid "git %s: failed to read the index"

3453 msgstr "git %s：无法读取索引"

3454

3317 -#: sequencer.c:1196

3455 +#: sequencer.c:1718

3456 #, c-format

3457 msgid "git %s: failed to refresh the index"

3458 msgstr "git %s：无法刷新索引"

3459

3322 -#: sequencer.c:1270

3460 +#: sequencer.c:1792

3461 #, c-format

3462 msgid "%s does not accept arguments: '%s'"

3463 msgstr "%s 不接受参数：'%s'"

3464

3327 -#: sequencer.c:1279

3465 +#: sequencer.c:1801

3466 #, c-format

3467 msgid "missing arguments for %s"

3468 msgstr "缺少 %s 的参数"

3469

3332 -#: sequencer.c:1322

3470 +#: sequencer.c:1844

3471 #, c-format

3472 msgid "invalid line %d: %.*s"

3473 msgstr "无效行 %d：%.*s"

3474

3337 -#: sequencer.c:1330

3475 +#: sequencer.c:1852

3476 #, c-format

3477 msgid "cannot '%s' without a previous commit"

3478 msgstr "没有父提交的情况下不能 '%s'"

3479

3342 -#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642

3343 -#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859

3480 +#: sequencer.c:1883 sequencer.c:3056 sequencer.c:3091

3481 #, c-format

3482 msgid "could not read '%s'."

3483 msgstr "不能读取 '%s'。"

3484

3348 -#: sequencer.c:1375

3485 +#: sequencer.c:1906

3486 msgid "please fix this using 'git rebase --edit-todo'."

3487 msgstr "请用 'git rebase --edit-todo' 来修改。"

3488

3352 -#: sequencer.c:1377

3489 +#: sequencer.c:1908

3490 #, c-format

3491 msgid "unusable instruction sheet: '%s'"

3492 msgstr "不可用的指令清单：'%s'"

3493

3357 -#: sequencer.c:1382

3494 +#: sequencer.c:1913

3495 msgid "no commits parsed."

3496 msgstr "没有解析提交。"

3497

3361 -#: sequencer.c:1393

3498 +#: sequencer.c:1924

3499 msgid "cannot cherry-pick during a revert."

3500 msgstr "不能在回退中执行拣选。"

3501

3365 -#: sequencer.c:1395

3502 +#: sequencer.c:1926

3503 msgid "cannot revert during a cherry-pick."

3504 msgstr "不能在拣选中执行回退。"

3505

3369 -#: sequencer.c:1462

3506 +#: sequencer.c:1993

3507 #, c-format

3508 msgid "invalid key: %s"

3509 msgstr "无效键名：%s"

3510

3374 -#: sequencer.c:1465

3511 +#: sequencer.c:1996

3512 #, c-format

3513 msgid "invalid value for %s: %s"

3514 msgstr "%s 的值无效：%s"

3515

3379 -#: sequencer.c:1531

3516 +#: sequencer.c:2062

3517 #, c-format

3518 msgid "malformed options sheet: '%s'"

3519 msgstr "非法的选项清单：'%s'"

3520

3384 -#: sequencer.c:1569

3521 +#: sequencer.c:2100

3522 msgid "a cherry-pick or revert is already in progress"

3523 msgstr "一个拣选或还原操作已在进行"

3524

3388 -#: sequencer.c:1570

3525 +#: sequencer.c:2101

3526 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

3527 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""

3528

3392 -#: sequencer.c:1573

3529 +#: sequencer.c:2104

3530 #, c-format

3531 msgid "could not create sequencer directory '%s'"

3532 msgstr "不能创建序列目录 '%s'"

3533

3397 -#: sequencer.c:1588

3534 +#: sequencer.c:2118

3535 msgid "could not lock HEAD"

3536 msgstr "不能锁定 HEAD"

3537

3401 -#: sequencer.c:1646 sequencer.c:2230

3538 +#: sequencer.c:2173 sequencer.c:2761

3539 msgid "no cherry-pick or revert in progress"

3540 msgstr "拣选或还原操作并未进行"

3541

3405 -#: sequencer.c:1648

3542 +#: sequencer.c:2175

3543 msgid "cannot resolve HEAD"

3544 msgstr "不能解析 HEAD"

3545

3409 -#: sequencer.c:1650 sequencer.c:1685

3546 +#: sequencer.c:2177 sequencer.c:2212

3547 msgid "cannot abort from a branch yet to be born"

3548 msgstr "不能从尚未建立的分支终止"

3549

3413 -#: sequencer.c:1671 builtin/grep.c:713

3550 +#: sequencer.c:2198 builtin/grep.c:720

3551 #, c-format

3552 msgid "cannot open '%s'"

3553 msgstr "不能打开 '%s'"

3554

3418 -#: sequencer.c:1673

3555 +#: sequencer.c:2200

3556 #, c-format

3557 msgid "cannot read '%s': %s"

3558 msgstr "不能读取 '%s'：%s"

3559

3423 -#: sequencer.c:1674

3560 +#: sequencer.c:2201

3561 msgid "unexpected end of file"

3562 msgstr "意外的文件结束"

3563

3427 -#: sequencer.c:1680

3564 +#: sequencer.c:2207

3565 #, c-format

3566 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

3567 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"

3568

3432 -#: sequencer.c:1691

3569 +#: sequencer.c:2218

3570 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

3571 msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！"

3572

3436 -#: sequencer.c:1832 sequencer.c:2128

3573 +#: sequencer.c:2324 sequencer.c:2679

3574 +#, c-format

3575 +msgid "could not update %s"

3576 +msgstr "不能更新 %s"

3577 +

3578 +#: sequencer.c:2362 sequencer.c:2659

3579 msgid "cannot read HEAD"

3580 msgstr "不能读取 HEAD"

3581

3440 -#: sequencer.c:1872 builtin/difftool.c:639

3582 +#: sequencer.c:2402 builtin/difftool.c:639

3583 #, c-format

3584 msgid "could not copy '%s' to '%s'"

3585 msgstr "不能拷贝 '%s' 至 '%s'"

3586

3445 -#: sequencer.c:1891

3587 +#: sequencer.c:2421

3588 msgid "could not read index"

3589 msgstr "不能读取索引"

3590

3591 # 译者：注意保持前导空格

3450 -#: sequencer.c:1896

3592 +#: sequencer.c:2426

3593 #, c-format

3594 msgid ""

3595 "execution failed: %s\n"

@@ -3462,11 +3604,11 @@ msgstr ""

3604 " git rebase --continue\n"

3605 "\n"

3606

3465 -#: sequencer.c:1902

3607 +#: sequencer.c:2432

3608 msgid "and made changes to the index and/or the working tree\n"

3609 msgstr "并且修改索引和/或工作区\n"

3610

3469 -#: sequencer.c:1908

3611 +#: sequencer.c:2438

3612 #, c-format

3613 msgid ""

3614 "execution succeeded: %s\n"

@@ -3483,17 +3625,17 @@ msgstr ""

3625 " git rebase --continue\n"

3626 "\n"

3627

3486 -#: sequencer.c:1967

3628 +#: sequencer.c:2497

3629 #, c-format

3630 msgid "Applied autostash.\n"

3631 msgstr "已应用 autostash。\n"

3632

3491 -#: sequencer.c:1979

3633 +#: sequencer.c:2509

3634 #, c-format

3635 msgid "cannot store %s"

3636 msgstr "不能存储 %s"

3637

3496 -#: sequencer.c:1982 git-rebase.sh:175

3638 +#: sequencer.c:2512 git-rebase.sh:178

3639 #, c-format

3640 msgid ""

3641 "Applying autostash resulted in conflicts.\n"

@@ -3504,57 +3646,52 @@ msgstr ""

3646 "您的修改安全地保存在贮藏区中。\n"

3647 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"

3648

3507 -#: sequencer.c:2064

3649 +#: sequencer.c:2595

3650 #, c-format

3651 msgid "Stopped at %s... %.*s\n"

3652 msgstr "停止在 %s... %.*s\n"

3653

3512 -#: sequencer.c:2106

3654 +#: sequencer.c:2637

3655 #, c-format

3656 msgid "unknown command %d"

3657 msgstr "未知命令 %d"

3658

3517 -#: sequencer.c:2136

3659 +#: sequencer.c:2667

3660 msgid "could not read orig-head"

3661 msgstr "不能读取 orig-head"

3662

3521 -#: sequencer.c:2141 sequencer.c:2745

3663 +#: sequencer.c:2672 sequencer.c:3262

3664 msgid "could not read 'onto'"

3665 msgstr "不能读取 'onto'"

3666

3525 -#: sequencer.c:2148

3526 -#, c-format

3527 -msgid "could not update %s"

3528 -msgstr "不能更新 %s"

3529 -

3530 -#: sequencer.c:2155

3667 +#: sequencer.c:2686

3668 #, c-format

3669 msgid "could not update HEAD to %s"

3670 msgstr "不能更新 HEAD 为 %s"

3671

3535 -#: sequencer.c:2239

3672 +#: sequencer.c:2770

3673 msgid "cannot rebase: You have unstaged changes."

3674 msgstr "不能变基：您有未暂存的变更。"

3675

3539 -#: sequencer.c:2244

3676 +#: sequencer.c:2775

3677 msgid "could not remove CHERRY_PICK_HEAD"

3678 msgstr "不能删除 CHERRY_PICK_HEAD"

3679

3543 -#: sequencer.c:2253

3680 +#: sequencer.c:2784

3681 msgid "cannot amend non-existing commit"

3682 msgstr "不能修补不存在的提交"

3683

3547 -#: sequencer.c:2255

3684 +#: sequencer.c:2786

3685 #, c-format

3686 msgid "invalid file: '%s'"

3687 msgstr "无效文件：'%s'"

3688

3552 -#: sequencer.c:2257

3689 +#: sequencer.c:2788

3690 #, c-format

3691 msgid "invalid contents: '%s'"

3692 msgstr "无效内容：'%s'"

3693

3557 -#: sequencer.c:2260

3694 +#: sequencer.c:2791

3695 msgid ""

3696 "\n"

3697 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -3563,44 +3700,44 @@ msgstr ""

3700 "\n"

3701 "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"

3702

3566 -#: sequencer.c:2270

3703 +#: sequencer.c:2801

3704 msgid "could not commit staged changes."

3705 msgstr "不能提交暂存的修改。"

3706

3570 -#: sequencer.c:2350

3707 +#: sequencer.c:2881

3708 #, c-format

3709 msgid "%s: can't cherry-pick a %s"

3710 msgstr "%s：不能拣选一个%s"

3711

3575 -#: sequencer.c:2354

3712 +#: sequencer.c:2885

3713 #, c-format

3714 msgid "%s: bad revision"

3715 msgstr "%s：错误的版本"

3716

3580 -#: sequencer.c:2387

3717 +#: sequencer.c:2918

3718 msgid "can't revert as initial commit"

3719 msgstr "不能作为初始提交回退"

3720

3584 -#: sequencer.c:2492

3721 +#: sequencer.c:3023

3722 msgid "make_script: unhandled options"

3723 msgstr "make_script：有未能处理的选项"

3724

3588 -#: sequencer.c:2495

3725 +#: sequencer.c:3026

3726 msgid "make_script: error preparing revisions"

3727 msgstr "make_script：准备版本时错误"

3728

3592 -#: sequencer.c:2529 sequencer.c:2564

3729 +#: sequencer.c:3060 sequencer.c:3095

3730 #, c-format

3731 msgid "unusable todo list: '%s'"

3732 msgstr "不可用的待办列表：'%s'"

3733

3597 -#: sequencer.c:2615

3734 +#: sequencer.c:3146

3735 #, c-format

3736 msgid ""

3737 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

3738 msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"

3739

3603 -#: sequencer.c:2695

3740 +#: sequencer.c:3212

3741 #, c-format

3742 msgid ""

3743 "Warning: some commits may have been dropped accidentally.\n"

@@ -3609,7 +3746,7 @@ msgstr ""

3746 "警告：一些提交可能被意外丢弃。\n"

3747 "丢弃的提交（从新到旧）：\n"

3748

3612 -#: sequencer.c:2702

3749 +#: sequencer.c:3219

3750 #, c-format

3751 msgid ""

3752 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"

@@ -3625,7 +3762,7 @@ msgstr ""

3762 "可选值有：ignore、warn、error。\n"

3763 "\n"

3764

3628 -#: sequencer.c:2714

3765 +#: sequencer.c:3231

3766 #, c-format

3767 msgid ""

3768 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

@@ -3635,21 +3772,26 @@ msgstr ""

3772 "您可以用 'git rebase --edit-todo' 修正，然后执行 'git rebase --continue'。\n"

3773 "或者您可以用 'git rebase --abort' 终止变基。\n"

3774

3638 -#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395

3775 +#: sequencer.c:3244 sequencer.c:3304 wrapper.c:225 wrapper.c:395

3776 #: builtin/am.c:779

3777 #, c-format

3778 msgid "could not open '%s' for writing"

3779 msgstr "无法打开 '%s' 进行写入"

3780

3644 -#: sequencer.c:2775

3781 +#: sequencer.c:3285

3782 #, c-format

3783 msgid "could not parse commit '%s'"

3784 msgstr "不能解析提交 '%s'"

3785

3649 -#: sequencer.c:2897

3786 +#: sequencer.c:3401

3787 msgid "the script was already rearranged."

3788 msgstr "脚本已经重新编排。"

3789

3790 +#: setup.c:122

3791 +#, c-format

3792 +msgid "'%s' is outside repository"

3793 +msgstr "'%s' 在仓库之外"

3794 +

3795 #: setup.c:171

3796 #, c-format

3797 msgid ""

@@ -3670,6 +3812,11 @@ msgstr ""

3812 "使用 '--' 来分隔版本和路径，例如：\n"

3813 "'git <命令> [<版本>...] -- [<文件>...]'"

3814

3815 +#: setup.c:233

3816 +#, c-format

3817 +msgid "option '%s' must come before non-option arguments"

3818 +msgstr "选项 '%s' 必须在其他非选项参数之前"

3819 +

3820 #: setup.c:252

3821 #, c-format

3822 msgid ""

@@ -3681,72 +3828,142 @@ msgstr ""

3828 "使用 '--' 来分隔版本和路径，例如：\n"

3829 "'git <命令> [<版本>...] -- [<文件>...]'"

3830

3684 -#: setup.c:501

3831 +#: setup.c:388

3832 +msgid "unable to set up work tree using invalid config"

3833 +msgstr "无法使用无效配置来创建工作区"

3834 +

3835 +#: setup.c:395

3836 +msgid "this operation must be run in a work tree"

3837 +msgstr "本操作必须在一个工作区中运行"

3838 +

3839 +#: setup.c:506

3840 #, c-format

3841 msgid "Expected git repo version <= %d, found %d"

3842 msgstr "期望 git 仓库版本 <= %d，却得到 %d"

3843

3689 -#: setup.c:509

3844 +#: setup.c:514

3845 msgid "unknown repository extensions found:"

3846 msgstr "发现未知的仓库扩展："

3847

3693 -#: setup.c:811

3848 +#: setup.c:533

3849 #, c-format

3695 -msgid "Not a git repository (or any of the parent directories): %s"

3696 -msgstr "不是一个 git 仓库（或者任何父目录）：%s"

3850 +msgid "error opening '%s'"

3851 +msgstr "无法打开 '%s'"

3852

3698 -#: setup.c:813 builtin/index-pack.c:1653

3699 -msgid "Cannot come back to cwd"

3853 +#: setup.c:535

3854 +#, c-format

3855 +msgid "too large to be a .git file: '%s'"

3856 +msgstr "文件 .git 太大：'%s'"

3857 +

3858 +#: setup.c:537

3859 +#, c-format

3860 +msgid "error reading %s"

3861 +msgstr "无法读取 %s"

3862 +

3863 +#: setup.c:539

3864 +#, c-format

3865 +msgid "invalid gitfile format: %s"

3866 +msgstr "无效的 gitfile 格式：%s"

3867 +

3868 +#: setup.c:541

3869 +#, c-format

3870 +msgid "no path in gitfile: %s"

3871 +msgstr "在 gitfile 中没有路径：%s"

3872 +

3873 +#: setup.c:543

3874 +#, c-format

3875 +msgid "not a git repository: %s"

3876 +msgstr "不是一个 git 仓库：%s"

3877 +

3878 +#: setup.c:642

3879 +#, c-format

3880 +msgid "'$%s' too big"

3881 +msgstr "'$%s' 太大"

3882 +

3883 +#: setup.c:656

3884 +#, c-format

3885 +msgid "not a git repository: '%s'"

3886 +msgstr "不是一个 git 仓库：'%s'"

3887 +

3888 +#: setup.c:685 setup.c:687 setup.c:718

3889 +#, c-format

3890 +msgid "cannot chdir to '%s'"

3891 +msgstr "不能切换目录到 '%s'"

3892 +

3893 +#: setup.c:690 setup.c:746 setup.c:756 setup.c:795 setup.c:803 setup.c:818

3894 +msgid "cannot come back to cwd"

3895 msgstr "无法返回当前工作目录"

3896

3702 -#: setup.c:1052

3897 +#: setup.c:816

3898 +#, c-format

3899 +msgid "not a git repository (or any of the parent directories): %s"

3900 +msgstr "不是一个 git 仓库（或者任何父目录）：%s"

3901 +

3902 +#: setup.c:827

3903 +#, c-format

3904 +msgid "failed to stat '%*s%s%s'"

3905 +msgstr "无法获取 '%*s%s%s' 状态（stat）"

3906 +

3907 +#: setup.c:1057

3908 msgid "Unable to read current working directory"

3909 msgstr "不能读取当前工作目录"

3910

3706 -#: setup.c:1064 setup.c:1070

3911 +#: setup.c:1069 setup.c:1075

3912 #, c-format

3708 -msgid "Cannot change to '%s'"

3913 +msgid "cannot change to '%s'"

3914 msgstr "不能切换到 '%s'"

3915

3711 -#: setup.c:1083

3916 +#: setup.c:1088

3917 #, c-format

3918 msgid ""

3714 -"Not a git repository (or any parent up to mount point %s)\n"

3919 +"not a git repository (or any parent up to mount point %s)\n"

3920 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."

3921 msgstr ""

3717 -"不是一个 git 仓库（或者向上递归至挂载点 %s 的任何祖先目录）\n"

3922 +"不是一个 git 仓库（或者直至挂载点 %s 的任何父目录）\n"

3923 "停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"

3924

3720 -#: setup.c:1167

3925 +#: setup.c:1172

3926 #, c-format

3927 msgid ""

3723 -"Problem with core.sharedRepository filemode value (0%.3o).\n"

3928 +"problem with core.sharedRepository filemode value (0%.3o).\n"

3929 "The owner of files must always have read and write permissions."

3930 msgstr ""

3726 -"参数 core.sharedRepository 的文件权限值有错（0%.3o）。\n"

3931 +"参数 core.sharedRepository 的文件属性值有问题（0%.3o）。\n"

3932 "文件属主必须始终拥有读写权限。"

3933

3729 -#: sha1_file.c:598

3934 +#: setup.c:1215

3935 +msgid "open /dev/null or dup failed"

3936 +msgstr "不能打开或者复制 /dev/null"

3937 +

3938 +#: setup.c:1230

3939 +msgid "fork failed"

3940 +msgstr "fork 失败"

3941 +

3942 +#: setup.c:1235

3943 +msgid "setsid failed"

3944 +msgstr "setsid 失败"

3945 +

3946 +#: sha1_file.c:592

3947 #, c-format

3948 msgid "path '%s' does not exist"

3949 msgstr "路径 '%s' 不存在"

3950

3734 -#: sha1_file.c:624

3951 +#: sha1_file.c:618

3952 #, c-format

3953 msgid "reference repository '%s' as a linked checkout is not supported yet."

3954 msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"

3955

3739 -#: sha1_file.c:630

3956 +#: sha1_file.c:624

3957 #, c-format

3958 msgid "reference repository '%s' is not a local repository."

3959 msgstr "参考仓库 '%s' 不是一个本地仓库。"

3960

3744 -#: sha1_file.c:636

3961 +#: sha1_file.c:630

3962 #, c-format

3963 msgid "reference repository '%s' is shallow"

3964 msgstr "参考仓库 '%s' 是一个浅克隆"

3965

3749 -#: sha1_file.c:644

3966 +#: sha1_file.c:638

3967 #, c-format

3968 msgid "reference repository '%s' is grafted"

3969 msgstr "参考仓库 '%s' 已被嫁接"

@@ -3819,7 +4036,7 @@ msgstr "路径规格 '%s' 在子模组 '%.*s' 中"

4036 msgid "submodule entry '%s' (%s) is a %s, not a commit"

4037 msgstr "子模组条目 '%s'（%s）是一个 %s，不是一个提交"

4038

3822 -#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387

4039 +#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724

4040 msgid "Failed to resolve HEAD as a valid ref."

4041 msgstr "无法将 HEAD 解析为有效引用。"

4042

@@ -3843,24 +4060,24 @@ msgstr "无法在子模组 '%s' 中执行 'git status'"

4060 msgid "submodule '%s' has dirty index"

4061 msgstr "子模组 '%s' 中有脏索引"

4062

3846 -#: submodule.c:1876

4063 +#: submodule.c:1878

4064 #, c-format

4065 msgid ""

4066 "relocate_gitdir for submodule '%s' with more than one worktree not supported"

4067 msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"

4068

3852 -#: submodule.c:1888 submodule.c:1944

4069 +#: submodule.c:1890 submodule.c:1946

4070 #, c-format

4071 msgid "could not lookup name for submodule '%s'"

4072 msgstr "不能查询子模组 '%s' 的名称"

4073

3857 -#: submodule.c:1892 builtin/submodule--helper.c:909

3858 -#: builtin/submodule--helper.c:919

4074 +#: submodule.c:1894 builtin/submodule--helper.c:1246

4075 +#: builtin/submodule--helper.c:1256

4076 #, c-format

4077 msgid "could not create directory '%s'"

4078 msgstr "不能创建目录 '%s'"

4079

3863 -#: submodule.c:1895

4080 +#: submodule.c:1897

4081 #, c-format

4082 msgid ""

4083 "Migrating git directory of '%s%s' from\n"

@@ -3871,20 +4088,20 @@ msgstr ""

4088 "'%s' 迁移至\n"

4089 "'%s'\n"

4090

3874 -#: submodule.c:1979

4091 +#: submodule.c:1981

4092 #, c-format

4093 msgid "could not recurse into submodule '%s'"

4094 msgstr "无法递归进子模组路径 '%s'"

4095

3879 -#: submodule.c:2023

4096 +#: submodule.c:2025

4097 msgid "could not start ls-files in .."

4098 msgstr "无法在 .. 中启动 ls-files"

4099

3883 -#: submodule.c:2043

4100 +#: submodule.c:2045

4101 msgid "BUG: returned path string doesn't match cwd?"

4102 msgstr "BUG：返回的路径和当前路径不匹配？"

4103

3887 -#: submodule.c:2062

4104 +#: submodule.c:2064

4105 #, c-format

4106 msgid "ls-tree returned unexpected return code %d"

4107 msgstr "ls-tree 返回未知返回值 %d"

@@ -3962,14 +4179,14 @@ msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"

4179 msgid "transport: invalid depth option '%s'"

4180 msgstr "传输：无效的深度选项 '%s'"

4181

3965 -#: transport.c:904

4182 +#: transport.c:916

4183 #, c-format

4184 msgid ""

4185 "The following submodule paths contain changes that can\n"

4186 "not be found on any remote:\n"

4187 msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n"

4188

3972 -#: transport.c:908

4189 +#: transport.c:920

4190 #, c-format

4191 msgid ""

4192 "\n"

@@ -3996,11 +4213,11 @@ msgstr ""

4213 "以推送至远程。\n"

4214 "\n"

4215

3999 -#: transport.c:916

4216 +#: transport.c:928

4217 msgid "Aborting."

4218 msgstr "正在终止。"

4219

4003 -#: transport-helper.c:1074

4220 +#: transport-helper.c:1079

4221 #, c-format

4222 msgid "Could not read ref %s"

4223 msgstr "不能读取引用 %s"

@@ -4021,7 +4238,7 @@ msgstr "树对象条目中空的文件名"

4238 msgid "too-short tree file"

4239 msgstr "太短的树文件"

4240

4024 -#: unpack-trees.c:107

4241 +#: unpack-trees.c:108

4242 #, c-format

4243 msgid ""

4244 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -4030,7 +4247,7 @@ msgstr ""

4247 "您对下列文件的本地修改将被检出操作覆盖：\n"

4248 "%%s请在切换分支前提交或贮藏您的修改。"

4249

4033 -#: unpack-trees.c:109

4250 +#: unpack-trees.c:110

4251 #, c-format

4252 msgid ""

4253 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -4039,7 +4256,7 @@ msgstr ""

4256 "您对下列文件的本地修改将被检出操作覆盖：\n"

4257 "%%s"

4258

4042 -#: unpack-trees.c:112

4259 +#: unpack-trees.c:113

4260 #, c-format

4261 msgid ""

4262 "Your local changes to the following files would be overwritten by merge:\n"

@@ -4048,7 +4265,7 @@ msgstr ""

4265 "您对下列文件的本地修改将被合并操作覆盖：\n"

4266 "%%s请在合并前提交或贮藏您的修改。"

4267

4051 -#: unpack-trees.c:114

4268 +#: unpack-trees.c:115

4269 #, c-format

4270 msgid ""

4271 "Your local changes to the following files would be overwritten by merge:\n"

@@ -4057,7 +4274,7 @@ msgstr ""

4274 "您对下列文件的本地修改将被合并操作覆盖：\n"

4275 "%%s"

4276

4060 -#: unpack-trees.c:117

4277 +#: unpack-trees.c:118

4278 #, c-format

4279 msgid ""

4280 "Your local changes to the following files would be overwritten by %s:\n"

@@ -4066,7 +4283,7 @@ msgstr ""

4283 "您对下列文件的本地修改将被 %s 覆盖：\n"

4284 "%%s请在 %s 之前提交或贮藏您的修改。"

4285

4069 -#: unpack-trees.c:119

4286 +#: unpack-trees.c:120

4287 #, c-format

4288 msgid ""

4289 "Your local changes to the following files would be overwritten by %s:\n"

@@ -4075,7 +4292,7 @@ msgstr ""

4292 "您对下列文件的本地修改将被 %s 覆盖：\n"

4293 "%%s"

4294

4078 -#: unpack-trees.c:124

4295 +#: unpack-trees.c:125

4296 #, c-format

4297 msgid ""

4298 "Updating the following directories would lose untracked files in them:\n"

@@ -4084,7 +4301,7 @@ msgstr ""

4301 "更新如下目录将会丢失其中未跟踪的文件：\n"

4302 "%s"

4303

4087 -#: unpack-trees.c:128

4304 +#: unpack-trees.c:129

4305 #, c-format

4306 msgid ""

4307 "The following untracked working tree files would be removed by checkout:\n"

@@ -4093,7 +4310,7 @@ msgstr ""

4310 "工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"

4311 "%%s请在切换分支之前移动或删除。"

4312

4096 -#: unpack-trees.c:130

4313 +#: unpack-trees.c:131

4314 #, c-format

4315 msgid ""

4316 "The following untracked working tree files would be removed by checkout:\n"

@@ -4102,7 +4319,7 @@ msgstr ""

4319 "工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"

4320 "%%s"

4321

4105 -#: unpack-trees.c:133

4322 +#: unpack-trees.c:134

4323 #, c-format

4324 msgid ""

4325 "The following untracked working tree files would be removed by merge:\n"

@@ -4111,7 +4328,7 @@ msgstr ""

4328 "工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"

4329 "%%s请在合并前移动或删除。"

4330

4114 -#: unpack-trees.c:135

4331 +#: unpack-trees.c:136

4332 #, c-format

4333 msgid ""

4334 "The following untracked working tree files would be removed by merge:\n"

@@ -4120,7 +4337,7 @@ msgstr ""

4337 "工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"

4338 "%%s"

4339

4123 -#: unpack-trees.c:138

4340 +#: unpack-trees.c:139

4341 #, c-format

4342 msgid ""

4343 "The following untracked working tree files would be removed by %s:\n"

@@ -4129,7 +4346,7 @@ msgstr ""

4346 "工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"

4347 "%%s请在 %s 前移动或删除。"

4348

4132 -#: unpack-trees.c:140

4349 +#: unpack-trees.c:141

4350 #, c-format

4351 msgid ""

4352 "The following untracked working tree files would be removed by %s:\n"

@@ -4138,7 +4355,7 @@ msgstr ""

4355 "工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"

4356 "%%s"

4357

4141 -#: unpack-trees.c:145

4358 +#: unpack-trees.c:146

4359 #, c-format

4360 msgid ""

4361 "The following untracked working tree files would be overwritten by "

@@ -4148,7 +4365,7 @@ msgstr ""

4365 "工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"

4366 "%%s请在切换分支前移动或删除。"

4367

4151 -#: unpack-trees.c:147

4368 +#: unpack-trees.c:148

4369 #, c-format

4370 msgid ""

4371 "The following untracked working tree files would be overwritten by "

@@ -4158,7 +4375,7 @@ msgstr ""

4375 "工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"

4376 "%%s"

4377

4161 -#: unpack-trees.c:150

4378 +#: unpack-trees.c:151

4379 #, c-format

4380 msgid ""

4381 "The following untracked working tree files would be overwritten by merge:\n"

@@ -4167,7 +4384,7 @@ msgstr ""

4384 "工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"

4385 "%%s请在合并前移动或删除。"

4386

4170 -#: unpack-trees.c:152

4387 +#: unpack-trees.c:153

4388 #, c-format

4389 msgid ""

4390 "The following untracked working tree files would be overwritten by merge:\n"

@@ -4176,7 +4393,7 @@ msgstr ""

4393 "工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"

4394 "%%s"

4395

4179 -#: unpack-trees.c:155

4396 +#: unpack-trees.c:156

4397 #, c-format

4398 msgid ""

4399 "The following untracked working tree files would be overwritten by %s:\n"

@@ -4185,7 +4402,7 @@ msgstr ""

4402 "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"

4403 "%%s请在 %s 前移动或删除。"

4404

4188 -#: unpack-trees.c:157

4405 +#: unpack-trees.c:158

4406 #, c-format

4407 msgid ""

4408 "The following untracked working tree files would be overwritten by %s:\n"

@@ -4194,12 +4411,12 @@ msgstr ""

4411 "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"

4412 "%%s"

4413

4197 -#: unpack-trees.c:164

4414 +#: unpack-trees.c:165

4415 #, c-format

4416 msgid "Entry '%s' overlaps with '%s'. Cannot bind."

4417 msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"

4418

4202 -#: unpack-trees.c:167

4419 +#: unpack-trees.c:168

4420 #, c-format

4421 msgid ""

4422 "Cannot update sparse checkout: the following entries are not up to date:\n"

@@ -4208,7 +4425,7 @@ msgstr ""

4425 "无法更新稀疏检出：如下条目不是最新：\n"

4426 "%s"

4427

4211 -#: unpack-trees.c:169

4428 +#: unpack-trees.c:170

4429 #, c-format

4430 msgid ""

4431 "The following working tree files would be overwritten by sparse checkout "

@@ -4218,7 +4435,7 @@ msgstr ""

4435 "工作区中下列文件将被稀疏检出更新所覆盖：\n"

4436 "%s"

4437

4221 -#: unpack-trees.c:171

4438 +#: unpack-trees.c:172

4439 #, c-format

4440 msgid ""

4441 "The following working tree files would be removed by sparse checkout "

@@ -4228,7 +4445,7 @@ msgstr ""

4445 "工作区中下列文件将被稀疏检出更新所删除：\n"

4446 "%s"

4447

4231 -#: unpack-trees.c:173

4448 +#: unpack-trees.c:174

4449 #, c-format

4450 msgid ""

4451 "Cannot update submodule:\n"

@@ -4237,12 +4454,12 @@ msgstr ""

4454 "无法更新子模组：\n"

4455 "%s"

4456

4240 -#: unpack-trees.c:250

4457 +#: unpack-trees.c:251

4458 #, c-format

4459 msgid "Aborting\n"

4460 msgstr "终止中\n"

4461

4245 -#: unpack-trees.c:332

4462 +#: unpack-trees.c:333

4463 msgid "Checking out files"

4464 msgstr "正在检出文件"

4465

@@ -4275,18 +4492,43 @@ msgstr "无效的端口号"

4492 msgid "invalid '..' path segment"

4493 msgstr "无效的 '..' 路径片段"

4494

4278 -#: worktree.c:245

4495 +#: worktree.c:245 builtin/am.c:2147

4496 #, c-format

4497 msgid "failed to read '%s'"

4498 msgstr "无法读取 '%s'"

4499

4500 +#: worktree.c:291

4501 +#, c-format

4502 +msgid "'%s' at main working tree is not the repository directory"

4503 +msgstr "在主工作区的 '%s' 不是仓库目录"

4504 +

4505 +#: worktree.c:302

4506 +#, c-format

4507 +msgid "'%s' file does not contain absolute path to the working tree location"

4508 +msgstr "文件 '%s' 不包含工作区的绝对路径"

4509 +

4510 +#: worktree.c:314

4511 +#, c-format

4512 +msgid "'%s' does not exist"

4513 +msgstr "'%s' 不存在"

4514 +

4515 +#: worktree.c:320

4516 +#, c-format

4517 +msgid "'%s' is not a .git file, error code %d"

4518 +msgstr "'%s' 不是一个 .git 文件，错误码 %d"

4519 +

4520 +#: worktree.c:328

4521 +#, c-format

4522 +msgid "'%s' does not point back to '%s'"

4523 +msgstr "'%s' 没有指回到 '%s'"

4524 +

4525 #: wrapper.c:223 wrapper.c:393

4526 #, c-format

4527 msgid "could not open '%s' for reading and writing"

4528 msgstr "无法打开 '%s' 进行读写"

4529

4530 #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770

4289 -#: builtin/am.c:862 builtin/merge.c:1043

4531 +#: builtin/am.c:862 builtin/merge.c:1044

4532 #, c-format

4533 msgid "could not open '%s' for reading"

4534 msgstr "无法打开 '%s' 进行读取"

@@ -4300,162 +4542,162 @@ msgstr "不能访问 '%s'"

4542 msgid "unable to get current working directory"

4543 msgstr "不能获取当前工作目录"

4544

4303 -#: wt-status.c:150

4545 +#: wt-status.c:151

4546 msgid "Unmerged paths:"

4547 msgstr "未合并的路径："

4548

4549 # 译者：注意保持前导空格

4308 -#: wt-status.c:177 wt-status.c:204

4550 +#: wt-status.c:178 wt-status.c:205

4551 #, c-format

4552 msgid " (use \"git reset %s <file>...\" to unstage)"

4553 msgstr " （使用 \"git reset %s <文件>...\" 以取消暂存）"

4554

4555 # 译者：注意保持前导空格

4314 -#: wt-status.c:179 wt-status.c:206

4556 +#: wt-status.c:180 wt-status.c:207

4557 msgid " (use \"git rm --cached <file>...\" to unstage)"

4558 msgstr " （使用 \"git rm --cached <文件>...\" 以取消暂存）"

4559

4560 # 译者：注意保持前导空格

4319 -#: wt-status.c:183

4561 +#: wt-status.c:184

4562 msgid " (use \"git add <file>...\" to mark resolution)"

4563 msgstr " （使用 \"git add <文件>...\" 标记解决方案）"

4564

4565 # 译者：注意保持前导空格

4324 -#: wt-status.c:185 wt-status.c:189

4566 +#: wt-status.c:186 wt-status.c:190

4567 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"

4568 msgstr " （酌情使用 \"git add/rm <文件>...\" 标记解决方案）"

4569

4570 # 译者：注意保持前导空格

4329 -#: wt-status.c:187

4571 +#: wt-status.c:188

4572 msgid " (use \"git rm <file>...\" to mark resolution)"

4573 msgstr " （使用 \"git rm <文件>...\" 标记解决方案）"

4574

4333 -#: wt-status.c:198 wt-status.c:984

4575 +#: wt-status.c:199 wt-status.c:1007

4576 msgid "Changes to be committed:"

4577 msgstr "要提交的变更："

4578

4337 -#: wt-status.c:216 wt-status.c:993

4579 +#: wt-status.c:217 wt-status.c:1016

4580 msgid "Changes not staged for commit:"

4581 msgstr "尚未暂存以备提交的变更："

4582

4583 # 译者：注意保持前导空格

4342 -#: wt-status.c:220

4584 +#: wt-status.c:221

4585 msgid " (use \"git add <file>...\" to update what will be committed)"

4586 msgstr " （使用 \"git add <文件>...\" 更新要提交的内容）"

4587

4588 # 译者：注意保持前导空格

4347 -#: wt-status.c:222

4589 +#: wt-status.c:223

4590 msgid " (use \"git add/rm <file>...\" to update what will be committed)"

4591 msgstr " （使用 \"git add/rm <文件>...\" 更新要提交的内容）"

4592

4593 # 译者：注意保持前导空格

4352 -#: wt-status.c:223

4594 +#: wt-status.c:224

4595 msgid ""

4596 " (use \"git checkout -- <file>...\" to discard changes in working directory)"

4597 msgstr " （使用 \"git checkout -- <文件>...\" 丢弃工作区的改动）"

4598

4599 # 译者：注意保持前导空格

4358 -#: wt-status.c:225

4600 +#: wt-status.c:226

4601 msgid " (commit or discard the untracked or modified content in submodules)"

4602 msgstr " （提交或丢弃子模组中未跟踪或修改的内容）"

4603

4604 # 译者：注意保持前导空格

4363 -#: wt-status.c:237

4605 +#: wt-status.c:238

4606 #, c-format

4607 msgid " (use \"git %s <file>...\" to include in what will be committed)"

4608 msgstr " （使用 \"git %s <文件>...\" 以包含要提交的内容）"

4609

4368 -#: wt-status.c:252

4610 +#: wt-status.c:253

4611 msgid "both deleted:"

4612 msgstr "双方删除："

4613

4372 -#: wt-status.c:254

4614 +#: wt-status.c:255

4615 msgid "added by us:"

4616 msgstr "由我们添加："

4617

4376 -#: wt-status.c:256

4618 +#: wt-status.c:257

4619 msgid "deleted by them:"

4620 msgstr "由他们删除："

4621

4380 -#: wt-status.c:258

4622 +#: wt-status.c:259

4623 msgid "added by them:"

4624 msgstr "由他们添加："

4625

4384 -#: wt-status.c:260

4626 +#: wt-status.c:261

4627 msgid "deleted by us:"

4628 msgstr "由我们删除："

4629

4388 -#: wt-status.c:262

4630 +#: wt-status.c:263

4631 msgid "both added:"

4632 msgstr "双方添加："

4633

4392 -#: wt-status.c:264

4634 +#: wt-status.c:265

4635 msgid "both modified:"

4636 msgstr "双方修改："

4637

4396 -#: wt-status.c:274

4638 +#: wt-status.c:275

4639 msgid "new file:"

4640 msgstr "新文件："

4641

4400 -#: wt-status.c:276

4642 +#: wt-status.c:277

4643 msgid "copied:"

4644 msgstr "拷贝："

4645

4404 -#: wt-status.c:278

4646 +#: wt-status.c:279

4647 msgid "deleted:"

4648 msgstr "删除："

4649

4408 -#: wt-status.c:280

4650 +#: wt-status.c:281

4651 msgid "modified:"

4652 msgstr "修改："

4653

4412 -#: wt-status.c:282

4654 +#: wt-status.c:283

4655 msgid "renamed:"

4656 msgstr "重命名："

4657

4416 -#: wt-status.c:284

4658 +#: wt-status.c:285

4659 msgid "typechange:"

4660 msgstr "类型变更："

4661

4420 -#: wt-status.c:286

4662 +#: wt-status.c:287

4663 msgid "unknown:"

4664 msgstr "未知："

4665

4424 -#: wt-status.c:288

4666 +#: wt-status.c:289

4667 msgid "unmerged:"

4668 msgstr "未合并："

4669

4670 # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字

4429 -#: wt-status.c:370

4671 +#: wt-status.c:369

4672 msgid "new commits, "

4673 msgstr "新提交, "

4674

4675 # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字

4434 -#: wt-status.c:372

4676 +#: wt-status.c:371

4677 msgid "modified content, "

4678 msgstr "修改的内容, "

4679

4680 # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字

4439 -#: wt-status.c:374

4681 +#: wt-status.c:373

4682 msgid "untracked content, "

4683 msgstr "未跟踪的内容, "

4684

4443 -#: wt-status.c:824

4685 +#: wt-status.c:847

4686 #, c-format

4687 msgid "Your stash currently has %d entry"

4688 msgid_plural "Your stash currently has %d entries"

4689 msgstr[0] "您的贮藏区当前有 %d 条记录"

4690 msgstr[1] "您的贮藏区当前有 %d 条记录"

4691

4450 -#: wt-status.c:856

4692 +#: wt-status.c:879

4693 msgid "Submodules changed but not updated:"

4694 msgstr "子模组已修改但尚未更新："

4695

4454 -#: wt-status.c:858

4696 +#: wt-status.c:881

4697 msgid "Submodule changes to be committed:"

4698 msgstr "要提交的子模组变更："

4699

4458 -#: wt-status.c:940

4700 +#: wt-status.c:963

4701 msgid ""

4702 "Do not modify or remove the line above.\n"

4703 "Everything below it will be ignored."

@@ -4463,77 +4705,77 @@ msgstr ""

4705 "不要改动或删除上面的一行。\n"

4706 "其下所有内容都将被忽略。"

4707

4466 -#: wt-status.c:1053

4708 +#: wt-status.c:1076

4709 msgid "You have unmerged paths."

4710 msgstr "您有尚未合并的路径。"

4711

4712 # 译者：注意保持前导空格

4471 -#: wt-status.c:1056

4713 +#: wt-status.c:1079

4714 msgid " (fix conflicts and run \"git commit\")"

4715 msgstr " （解决冲突并运行 \"git commit\"）"

4716

4717 # 译者：注意保持前导空格

4476 -#: wt-status.c:1058

4718 +#: wt-status.c:1081

4719 msgid " (use \"git merge --abort\" to abort the merge)"

4720 msgstr " （使用 \"git merge --abort\" 终止合并）"

4721

4480 -#: wt-status.c:1063

4722 +#: wt-status.c:1086

4723 msgid "All conflicts fixed but you are still merging."

4724 msgstr "所有冲突已解决但您仍处于合并中。"

4725

4726 # 译者：注意保持前导空格

4485 -#: wt-status.c:1066

4727 +#: wt-status.c:1089

4728 msgid " (use \"git commit\" to conclude merge)"

4729 msgstr " （使用 \"git commit\" 结束合并）"

4730

4489 -#: wt-status.c:1076

4731 +#: wt-status.c:1099

4732 msgid "You are in the middle of an am session."

4733 msgstr "您正处于 am 操作过程中。"

4734

4493 -#: wt-status.c:1079

4735 +#: wt-status.c:1102

4736 msgid "The current patch is empty."

4737 msgstr "当前的补丁为空。"

4738

4739 # 译者：注意保持前导空格

4498 -#: wt-status.c:1083

4740 +#: wt-status.c:1106

4741 msgid " (fix conflicts and then run \"git am --continue\")"

4742 msgstr " （解决冲突，然后运行 \"git am --continue\"）"

4743

4744 # 译者：注意保持前导空格

4503 -#: wt-status.c:1085

4745 +#: wt-status.c:1108

4746 msgid " (use \"git am --skip\" to skip this patch)"

4747 msgstr " （使用 \"git am --skip\" 跳过此补丁）"

4748

4749 # 译者：注意保持前导空格

4508 -#: wt-status.c:1087

4750 +#: wt-status.c:1110

4751 msgid " (use \"git am --abort\" to restore the original branch)"

4752 msgstr " （使用 \"git am --abort\" 恢复原有分支）"

4753

4512 -#: wt-status.c:1219

4754 +#: wt-status.c:1242

4755 msgid "git-rebase-todo is missing."

4756 msgstr "git-rebase-todo 丢失。"

4757

4516 -#: wt-status.c:1221

4758 +#: wt-status.c:1244

4759 msgid "No commands done."

4760 msgstr "没有命令被执行。"

4761

4520 -#: wt-status.c:1224

4762 +#: wt-status.c:1247

4763 #, c-format

4764 msgid "Last command done (%d command done):"

4765 msgid_plural "Last commands done (%d commands done):"

4766 msgstr[0] "最后一条命令已完成（%d 条命令被执行）："

4767 msgstr[1] "最后的命令已完成（%d 条命令被执行）："

4768

4527 -#: wt-status.c:1235

4769 +#: wt-status.c:1258

4770 #, c-format

4771 msgid " (see more in file %s)"

4772 msgstr " （更多参见文件 %s）"

4773

4532 -#: wt-status.c:1240

4774 +#: wt-status.c:1263

4775 msgid "No commands remaining."

4776 msgstr "未剩下任何命令。"

4777

4536 -#: wt-status.c:1243

4778 +#: wt-status.c:1266

4779 #, c-format

4780 msgid "Next command to do (%d remaining command):"

4781 msgid_plural "Next commands to do (%d remaining commands):"

@@ -4541,169 +4783,169 @@ msgstr[0] "接下来要执行的命令（剩余 %d 条命令）："

4783 msgstr[1] "接下来要执行的命令（剩余 %d 条命令）："

4784

4785 # 译者：注意保持前导空格

4544 -#: wt-status.c:1251

4786 +#: wt-status.c:1274

4787 msgid " (use \"git rebase --edit-todo\" to view and edit)"

4788 msgstr " （使用 \"git rebase --edit-todo\" 来查看和编辑）"

4789

4548 -#: wt-status.c:1264

4790 +#: wt-status.c:1287

4791 #, c-format

4792 msgid "You are currently rebasing branch '%s' on '%s'."

4793 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"

4794

4553 -#: wt-status.c:1269

4795 +#: wt-status.c:1292

4796 msgid "You are currently rebasing."

4797 msgstr "您在执行变基操作。"

4798

4799 # 译者：注意保持前导空格

4558 -#: wt-status.c:1283

4800 +#: wt-status.c:1306

4801 msgid " (fix conflicts and then run \"git rebase --continue\")"

4802 msgstr " （解决冲突，然后运行 \"git rebase --continue\"）"

4803

4804 # 译者：注意保持前导空格

4563 -#: wt-status.c:1285

4805 +#: wt-status.c:1308

4806 msgid " (use \"git rebase --skip\" to skip this patch)"

4807 msgstr " （使用 \"git rebase --skip\" 跳过此补丁）"

4808

4809 # 译者：注意保持前导空格

4568 -#: wt-status.c:1287

4810 +#: wt-status.c:1310

4811 msgid " (use \"git rebase --abort\" to check out the original branch)"

4812 msgstr " （使用 \"git rebase --abort\" 以检出原有分支）"

4813

4814 # 译者：注意保持前导空格

4573 -#: wt-status.c:1293

4815 +#: wt-status.c:1316

4816 msgid " (all conflicts fixed: run \"git rebase --continue\")"

4817 msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）"

4818

4577 -#: wt-status.c:1297

4819 +#: wt-status.c:1320

4820 #, c-format

4821 msgid ""

4822 "You are currently splitting a commit while rebasing branch '%s' on '%s'."

4823 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"

4824

4583 -#: wt-status.c:1302

4825 +#: wt-status.c:1325

4826 msgid "You are currently splitting a commit during a rebase."

4827 msgstr "您在执行变基操作时拆分提交。"

4828

4829 # 译者：注意保持前导空格

4588 -#: wt-status.c:1305

4830 +#: wt-status.c:1328

4831 msgid " (Once your working directory is clean, run \"git rebase --continue\")"

4832 msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"

4833

4592 -#: wt-status.c:1309

4834 +#: wt-status.c:1332

4835 #, c-format

4836 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."

4837 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"

4838

4597 -#: wt-status.c:1314

4839 +#: wt-status.c:1337

4840 msgid "You are currently editing a commit during a rebase."

4841 msgstr "您在执行变基操作时编辑提交。"

4842

4843 # 译者：注意保持前导空格

4602 -#: wt-status.c:1317

4844 +#: wt-status.c:1340

4845 msgid " (use \"git commit --amend\" to amend the current commit)"

4846 msgstr " （使用 \"git commit --amend\" 修补当前提交）"

4847

4848 # 译者：注意保持前导空格

4607 -#: wt-status.c:1319

4849 +#: wt-status.c:1342

4850 msgid ""

4851 " (use \"git rebase --continue\" once you are satisfied with your changes)"

4852 msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）"

4853

4612 -#: wt-status.c:1329

4854 +#: wt-status.c:1352

4855 #, c-format

4856 msgid "You are currently cherry-picking commit %s."

4857 msgstr "您在执行拣选提交 %s 的操作。"

4858

4859 # 译者：注意保持前导空格

4618 -#: wt-status.c:1334

4860 +#: wt-status.c:1357

4861 msgid " (fix conflicts and run \"git cherry-pick --continue\")"

4862 msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）"

4863

4864 # 译者：注意保持前导空格

4623 -#: wt-status.c:1337

4865 +#: wt-status.c:1360

4866 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"

4867 msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）"

4868

4869 # 译者：注意保持前导空格

4628 -#: wt-status.c:1339

4870 +#: wt-status.c:1362

4871 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"

4872 msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）"

4873

4632 -#: wt-status.c:1348

4874 +#: wt-status.c:1371

4875 #, c-format

4876 msgid "You are currently reverting commit %s."

4877 msgstr "您在执行反转提交 %s 的操作。"

4878

4879 # 译者：注意保持前导空格

4638 -#: wt-status.c:1353

4880 +#: wt-status.c:1376

4881 msgid " (fix conflicts and run \"git revert --continue\")"

4882 msgstr " （解决冲突并运行 \"git revert --continue\"）"

4883

4884 # 译者：注意保持前导空格

4643 -#: wt-status.c:1356

4885 +#: wt-status.c:1379

4886 msgid " (all conflicts fixed: run \"git revert --continue\")"

4887 msgstr " （所有冲突已解决：运行 \"git revert --continue\"）"

4888

4889 # 译者：注意保持前导空格

4648 -#: wt-status.c:1358

4890 +#: wt-status.c:1381

4891 msgid " (use \"git revert --abort\" to cancel the revert operation)"

4892 msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）"

4893

4652 -#: wt-status.c:1369

4894 +#: wt-status.c:1392

4895 #, c-format

4896 msgid "You are currently bisecting, started from branch '%s'."

4897 msgstr "您在执行从分支 '%s' 开始的二分查找操作。"

4898

4657 -#: wt-status.c:1373

4899 +#: wt-status.c:1396

4900 msgid "You are currently bisecting."

4901 msgstr "您在执行二分查找操作。"

4902

4903 # 译者：注意保持前导空格

4662 -#: wt-status.c:1376

4904 +#: wt-status.c:1399

4905 msgid " (use \"git bisect reset\" to get back to the original branch)"

4906 msgstr " （使用 \"git bisect reset\" 以回到原有分支）"

4907

4666 -#: wt-status.c:1573

4908 +#: wt-status.c:1596

4909 msgid "On branch "

4910 msgstr "位于分支 "

4911

4670 -#: wt-status.c:1579

4912 +#: wt-status.c:1602

4913 msgid "interactive rebase in progress; onto "

4914 msgstr "交互式变基操作正在进行中；至 "

4915

4674 -#: wt-status.c:1581

4916 +#: wt-status.c:1604

4917 msgid "rebase in progress; onto "

4918 msgstr "变基操作正在进行中；至 "

4919

4678 -#: wt-status.c:1586

4920 +#: wt-status.c:1609

4921 msgid "HEAD detached at "

4922 msgstr "头指针分离于 "

4923

4682 -#: wt-status.c:1588

4924 +#: wt-status.c:1611

4925 msgid "HEAD detached from "

4926 msgstr "头指针分离自 "

4927

4686 -#: wt-status.c:1591

4928 +#: wt-status.c:1614

4929 msgid "Not currently on any branch."

4930 msgstr "当前不在任何分支上。"

4931

4690 -#: wt-status.c:1611

4932 +#: wt-status.c:1634

4933 msgid "Initial commit"

4934 msgstr "初始提交"

4935

4694 -#: wt-status.c:1612

4936 +#: wt-status.c:1635

4937 msgid "No commits yet"

4938 msgstr "尚无提交"

4939

4698 -#: wt-status.c:1626

4940 +#: wt-status.c:1649

4941 msgid "Untracked files"

4942 msgstr "未跟踪的文件"

4943

4702 -#: wt-status.c:1628

4944 +#: wt-status.c:1651

4945 msgid "Ignored files"

4946 msgstr "忽略的文件"

4947

4706 -#: wt-status.c:1632

4948 +#: wt-status.c:1655

4949 #, c-format

4950 msgid ""

4951 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

@@ -4713,98 +4955,102 @@ msgstr ""

4955 "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n"

4956 "但您需要小心不要忘了添加新文件（参见 'git help status'）。"

4957

4716 -#: wt-status.c:1638

4958 +#: wt-status.c:1661

4959 #, c-format

4960 msgid "Untracked files not listed%s"

4961 msgstr "未跟踪的文件没有列出%s"

4962

4963 # 译者：中文字符串拼接，可删除前导空格

4722 -#: wt-status.c:1640

4964 +#: wt-status.c:1663

4965 msgid " (use -u option to show untracked files)"

4966 msgstr "（使用 -u 参数显示未跟踪的文件）"

4967

4726 -#: wt-status.c:1646

4968 +#: wt-status.c:1669

4969 msgid "No changes"

4970 msgstr "没有修改"

4971

4730 -#: wt-status.c:1651

4972 +#: wt-status.c:1674

4973 #, c-format

4974 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

4975 msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n"

4976

4735 -#: wt-status.c:1654

4977 +#: wt-status.c:1677

4978 #, c-format

4979 msgid "no changes added to commit\n"

4980 msgstr "修改尚未加入提交\n"

4981

4740 -#: wt-status.c:1657

4982 +#: wt-status.c:1680

4983 #, c-format

4984 msgid ""

4985 "nothing added to commit but untracked files present (use \"git add\" to "

4986 "track)\n"

4987 msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"

4988

4747 -#: wt-status.c:1660

4989 +#: wt-status.c:1683

4990 #, c-format

4991 msgid "nothing added to commit but untracked files present\n"

4992 msgstr "提交为空，但是存在尚未跟踪的文件\n"

4993

4994 # 译者：中文字符串拼接，可删除前导空格

4753 -#: wt-status.c:1663

4995 +#: wt-status.c:1686

4996 #, c-format

4997 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

4998 msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n"

4999

4758 -#: wt-status.c:1666 wt-status.c:1671

5000 +#: wt-status.c:1689 wt-status.c:1694

5001 #, c-format

5002 msgid "nothing to commit\n"

5003 msgstr "无文件要提交\n"

5004

5005 # 译者：中文字符串拼接，可删除前导空格

4764 -#: wt-status.c:1669

5006 +#: wt-status.c:1692

5007 #, c-format

5008 msgid "nothing to commit (use -u to show untracked files)\n"

5009 msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n"

5010

5011 # 译者：中文字符串拼接，可删除前导空格

4770 -#: wt-status.c:1673

5012 +#: wt-status.c:1696

5013 #, c-format

5014 msgid "nothing to commit, working tree clean\n"

5015 msgstr "无文件要提交，干净的工作区\n"

5016

4775 -#: wt-status.c:1785

5017 +#: wt-status.c:1809

5018 msgid "No commits yet on "

5019 msgstr "尚无提交在 "

5020

4779 -#: wt-status.c:1789

5021 +#: wt-status.c:1813

5022 msgid "HEAD (no branch)"

5023 msgstr "HEAD（非分支）"

5024

5025 +#: wt-status.c:1844

5026 +msgid "different"

5027 +msgstr "不同"

5028 +

5029 # 译者：注意保持句尾空格

4784 -#: wt-status.c:1818 wt-status.c:1826

5030 +#: wt-status.c:1846 wt-status.c:1854

5031 msgid "behind "

5032 msgstr "落后 "

5033

4788 -#: wt-status.c:1821 wt-status.c:1824

5034 +#: wt-status.c:1849 wt-status.c:1852

5035 msgid "ahead "

5036 msgstr "领先 "

5037

5038 #. TRANSLATORS: the action is e.g. "pull with rebase"

4793 -#: wt-status.c:2318

5039 +#: wt-status.c:2358

5040 #, c-format

5041 msgid "cannot %s: You have unstaged changes."

5042 msgstr "不能%s：您有未暂存的变更。"

5043

4798 -#: wt-status.c:2324

5044 +#: wt-status.c:2364

5045 msgid "additionally, your index contains uncommitted changes."

5046 msgstr "另外，您的索引中包含未提交的变更。"

5047

4802 -#: wt-status.c:2326

5048 +#: wt-status.c:2366

5049 #, c-format

5050 msgid "cannot %s: Your index contains uncommitted changes."

5051 msgstr "不能%s：您的索引中包含未提交的变更。"

5052

4807 -#: compat/precompose_utf8.c:58 builtin/clone.c:437

5053 +#: compat/precompose_utf8.c:58 builtin/clone.c:440

5054 #, c-format

5055 msgid "failed to unlink '%s'"

5056 msgstr "无法删除 '%s'"

@@ -4818,7 +5064,7 @@ msgstr "git add [<选项>] [--] <路径规格>..."

5064 msgid "unexpected diff status %c"

5065 msgstr "意外的差异状态 %c"

5066

4821 -#: builtin/add.c:88 builtin/commit.c:291

5067 +#: builtin/add.c:88 builtin/commit.c:257

5068 msgid "updating files failed"

5069 msgstr "更新文件失败"

5070

@@ -4866,7 +5112,7 @@ msgstr "不能应用 '%s'"

5112 msgid "The following paths are ignored by one of your .gitignore files:\n"

5113 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"

5114

4869 -#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124

5115 +#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:146 builtin/mv.c:124

5116 #: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541

5117 #: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164

5118 msgid "dry run"

@@ -4876,7 +5122,7 @@ msgstr "演习"

5122 msgid "interactive picking"

5123 msgstr "交互式拣选"

5124

4879 -#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310

5125 +#: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302

5126 msgid "select hunks interactively"

5127 msgstr "交互式挑选数据块"

5128

@@ -4998,10 +5244,10 @@ msgstr "没有指定文件，也没有文件被添加。\n"

5244 msgid "Maybe you wanted to say 'git add .'?\n"

5245 msgstr "也许您想要执行 'git add .'？\n"

5246

5001 -#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281

5002 -#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350

5003 -#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249

5004 -#: builtin/rm.c:271 builtin/submodule--helper.c:311

5247 +#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:280

5248 +#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:316

5249 +#: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241

5250 +#: builtin/rm.c:271 builtin/submodule--helper.c:326

5251 msgid "index file corrupt"

5252 msgstr "索引文件损坏"

5253

@@ -5053,57 +5299,57 @@ msgstr "无效的时区偏移值"

5299 msgid "Patch format detection failed."

5300 msgstr "补丁格式探测失败。"

5301

5056 -#: builtin/am.c:1013 builtin/clone.c:402

5302 +#: builtin/am.c:1013 builtin/clone.c:405

5303 #, c-format

5304 msgid "failed to create directory '%s'"

5305 msgstr "无法创建目录 '%s'"

5306

5061 -#: builtin/am.c:1017

5307 +#: builtin/am.c:1018

5308 msgid "Failed to split patches."

5309 msgstr "无法拆分补丁。"

5310

5065 -#: builtin/am.c:1146 builtin/commit.c:376

5311 +#: builtin/am.c:1148 builtin/commit.c:342

5312 msgid "unable to write index file"

5313 msgstr "无法写入索引文件"

5314

5069 -#: builtin/am.c:1160

5315 +#: builtin/am.c:1162

5316 #, c-format

5317 msgid "When you have resolved this problem, run \"%s --continue\"."

5318 msgstr "当您解决这一问题，执行 \"%s --continue\"。"

5319

5074 -#: builtin/am.c:1161

5320 +#: builtin/am.c:1163

5321 #, c-format

5322 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."

5323 msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。"

5324

5079 -#: builtin/am.c:1162

5325 +#: builtin/am.c:1164

5326 #, c-format

5327 msgid "To restore the original branch and stop patching, run \"%s --abort\"."

5328 msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。"

5329

5084 -#: builtin/am.c:1269

5330 +#: builtin/am.c:1271

5331 msgid "Patch is empty."

5332 msgstr "补丁为空。"

5333

5088 -#: builtin/am.c:1335

5334 +#: builtin/am.c:1337

5335 #, c-format

5336 msgid "invalid ident line: %.*s"

5337 msgstr "无效的身份标识：%.*s"

5338

5093 -#: builtin/am.c:1357

5339 +#: builtin/am.c:1359

5340 #, c-format

5341 msgid "unable to parse commit %s"

5342 msgstr "不能解析提交 %s"

5343

5098 -#: builtin/am.c:1550

5344 +#: builtin/am.c:1554

5345 msgid "Repository lacks necessary blobs to fall back on 3-way merge."

5346 msgstr "仓库缺乏必要的数据对象以进行三方合并。"

5347

5102 -#: builtin/am.c:1552

5348 +#: builtin/am.c:1556

5349 msgid "Using index info to reconstruct a base tree..."

5350 msgstr "使用索引来重建一个（三方合并的）基础目录树..."

5351

5106 -#: builtin/am.c:1571

5352 +#: builtin/am.c:1575

5353 msgid ""

5354 "Did you hand edit your patch?\n"

5355 "It does not apply to blobs recorded in its index."

@@ -5111,37 +5357,28 @@ msgstr ""

5357 "您是否曾手动编辑过您的补丁？\n"

5358 "无法应用补丁到索引中的数据对象上。"

5359

5114 -#: builtin/am.c:1577

5360 +#: builtin/am.c:1581

5361 msgid "Falling back to patching base and 3-way merge..."

5362 msgstr "回落到基础版本上打补丁及进行三方合并..."

5363

5118 -#: builtin/am.c:1602

5364 +#: builtin/am.c:1606

5365 msgid "Failed to merge in the changes."

5366 msgstr "无法合并变更。"

5367

5122 -#: builtin/am.c:1626 builtin/merge.c:642

5123 -msgid "git write-tree failed to write a tree"

5124 -msgstr "git write-tree 无法写入一树对象"

5125 -

5126 -#: builtin/am.c:1633

5368 +#: builtin/am.c:1637

5369 msgid "applying to an empty history"

5370 msgstr "正应用到一个空历史上"

5371

5130 -#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825

5131 -#: builtin/merge.c:850

5132 -msgid "failed to write commit object"

5133 -msgstr "无法写提交对象"

5134 -

5135 -#: builtin/am.c:1679 builtin/am.c:1683

5372 +#: builtin/am.c:1683 builtin/am.c:1687

5373 #, c-format

5374 msgid "cannot resume: %s does not exist."

5375 msgstr "无法继续：%s 不存在。"

5376

5140 -#: builtin/am.c:1699

5377 +#: builtin/am.c:1703

5378 msgid "cannot be interactive without stdin connected to a terminal."

5379 msgstr "标准输入没有和终端关联，不能进行交互式操作。"

5380

5144 -#: builtin/am.c:1704

5381 +#: builtin/am.c:1708

5382 msgid "Commit Body is:"

5383 msgstr "提交内容为："

5384

@@ -5150,35 +5387,34 @@ msgstr "提交内容为："

5387 #. in your translation. The program will only accept English

5388 #. input at this point.

5389 #.

5153 -#: builtin/am.c:1714

5390 +#: builtin/am.c:1718

5391 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "

5392 msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]："

5393

5157 -#: builtin/am.c:1764

5394 +#: builtin/am.c:1768

5395 #, c-format

5396 msgid "Dirty index: cannot apply patches (dirty: %s)"

5397 msgstr "脏索引：不能应用补丁（脏文件：%s）"

5398

5162 -#: builtin/am.c:1804 builtin/am.c:1876

5399 +#: builtin/am.c:1808 builtin/am.c:1879

5400 #, c-format

5401 msgid "Applying: %.*s"

5402 msgstr "应用：%.*s"

5403

5167 -#: builtin/am.c:1820

5404 +#: builtin/am.c:1824

5405 msgid "No changes -- Patch already applied."

5406 msgstr "没有变更 —— 补丁已经应用过。"

5407

5171 -#: builtin/am.c:1828

5408 +#: builtin/am.c:1832

5409 #, c-format

5410 msgid "Patch failed at %s %.*s"

5411 msgstr "打补丁失败于 %s %.*s"

5412

5176 -#: builtin/am.c:1834

5177 -#, c-format

5178 -msgid "The copy of the patch that failed is found in: %s"

5179 -msgstr "失败的补丁文件副本位于：%s"

5413 +#: builtin/am.c:1838

5414 +msgid "Use 'git am --show-current-patch' to see the failed patch"

5415 +msgstr "用 'git am --show-current-patch' 命令查看失败的补丁"

5416

5181 -#: builtin/am.c:1879

5417 +#: builtin/am.c:1882

5418 msgid ""

5419 "No changes - did you forget to use 'git add'?\n"

5420 "If there is nothing left to stage, chances are that something else\n"

@@ -5188,7 +5424,7 @@ msgstr ""

5424 "如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"

5425 "您也许想要跳过这个补丁。"

5426

5191 -#: builtin/am.c:1886

5427 +#: builtin/am.c:1889

5428 msgid ""

5429 "You still have unmerged paths in your index.\n"

5430 "You should 'git add' each file with resolved conflicts to mark them as "

@@ -5199,149 +5435,157 @@ msgstr ""

5435 "您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"

5436 "你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"

5437

5202 -#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332

5203 -#: builtin/reset.c:340

5438 +#: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324

5439 +#: builtin/reset.c:332

5440 #, c-format

5441 msgid "Could not parse object '%s'."

5442 msgstr "不能解析对象 '%s'。"

5443

5208 -#: builtin/am.c:2045

5444 +#: builtin/am.c:2048

5445 msgid "failed to clean index"

5446 msgstr "无法清空索引"

5447

5212 -#: builtin/am.c:2080

5448 +#: builtin/am.c:2083

5449 msgid ""

5450 "You seem to have moved HEAD since the last 'am' failure.\n"

5451 "Not rewinding to ORIG_HEAD"

5452 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"

5453

5218 -#: builtin/am.c:2143

5454 +#: builtin/am.c:2174

5455 #, c-format

5456 msgid "Invalid value for --patch-format: %s"

5457 msgstr "无效的 --patch-format 值：%s"

5458

5223 -#: builtin/am.c:2176

5459 +#: builtin/am.c:2210

5460 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"

5461 msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"

5462

5227 -#: builtin/am.c:2177

5463 +#: builtin/am.c:2211

5464 msgid "git am [<options>] (--continue | --skip | --abort)"

5465 msgstr "git am [<选项>] (--continue | --skip | --abort)"

5466

5231 -#: builtin/am.c:2183

5467 +#: builtin/am.c:2217

5468 msgid "run interactively"

5469 msgstr "以交互式方式运行"

5470

5235 -#: builtin/am.c:2185

5471 +#: builtin/am.c:2219

5472 msgid "historical option -- no-op"

5473 msgstr "老的参数 —— 无作用"

5474

5239 -#: builtin/am.c:2187

5475 +#: builtin/am.c:2221

5476 msgid "allow fall back on 3way merging if needed"

5477 msgstr "如果必要，允许使用三方合并。"

5478

5243 -#: builtin/am.c:2188 builtin/init-db.c:484 builtin/prune-packed.c:57

5244 -#: builtin/repack.c:180

5479 +#: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57

5480 +#: builtin/repack.c:182

5481 msgid "be quiet"

5482 msgstr "静默模式"

5483

5248 -#: builtin/am.c:2190

5484 +#: builtin/am.c:2224

5485 msgid "add a Signed-off-by line to the commit message"

5486 msgstr "在提交说明中添加一个 Signed-off-by 签名"

5487

5252 -#: builtin/am.c:2193

5488 +#: builtin/am.c:2227

5489 msgid "recode into utf8 (default)"

5490 msgstr "使用 utf8 字符集（默认）"

5491

5256 -#: builtin/am.c:2195

5492 +#: builtin/am.c:2229

5493 msgid "pass -k flag to git-mailinfo"

5494 msgstr "向 git-mailinfo 传递 -k 参数"

5495

5260 -#: builtin/am.c:2197

5496 +#: builtin/am.c:2231

5497 msgid "pass -b flag to git-mailinfo"

5498 msgstr "向 git-mailinfo 传递 -b 参数"

5499

5264 -#: builtin/am.c:2199

5500 +#: builtin/am.c:2233

5501 msgid "pass -m flag to git-mailinfo"

5502 msgstr "向 git-mailinfo 传递 -m 参数"

5503

5268 -#: builtin/am.c:2201

5504 +#: builtin/am.c:2235

5505 msgid "pass --keep-cr flag to git-mailsplit for mbox format"

5506 msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数"

5507

5272 -#: builtin/am.c:2204

5508 +#: builtin/am.c:2238

5509 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"

5510 msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置"

5511

5276 -#: builtin/am.c:2207

5512 +#: builtin/am.c:2241

5513 msgid "strip everything before a scissors line"

5514 msgstr "丢弃裁切线前的所有内容"

5515

5280 -#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218

5281 -#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230

5282 -#: builtin/am.c:2236

5516 +#: builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252

5517 +#: builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264

5518 +#: builtin/am.c:2270

5519 msgid "pass it through git-apply"

5520 msgstr "传递给 git-apply"

5521

5286 -#: builtin/am.c:2226 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668

5287 -#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203

5288 -#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195

5289 -#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377

5290 -#: parse-options.h:132 parse-options.h:134 parse-options.h:245

5522 +#: builtin/am.c:2260 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668

5523 +#: builtin/grep.c:853 builtin/merge.c:206 builtin/pull.c:145 builtin/pull.c:203

5524 +#: builtin/repack.c:191 builtin/repack.c:195 builtin/repack.c:197

5525 +#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:382

5526 +#: parse-options.h:144 parse-options.h:146 parse-options.h:257

5527 msgid "n"

5528 msgstr "n"

5529

5294 -#: builtin/am.c:2232 builtin/branch.c:629 builtin/for-each-ref.c:38

5295 -#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39

5530 +#: builtin/am.c:2266 builtin/branch.c:629 builtin/for-each-ref.c:38

5531 +#: builtin/replace.c:445 builtin/tag.c:418 builtin/verify-tag.c:39

5532 msgid "format"

5533 msgstr "格式"

5534

5299 -#: builtin/am.c:2233

5535 +#: builtin/am.c:2267

5536 msgid "format the patch(es) are in"

5537 msgstr "补丁的格式"

5538

5303 -#: builtin/am.c:2239

5539 +#: builtin/am.c:2273

5540 msgid "override error message when patch failure occurs"

5541 msgstr "打补丁失败时显示的错误信息"

5542

5307 -#: builtin/am.c:2241

5543 +#: builtin/am.c:2275

5544 msgid "continue applying patches after resolving a conflict"

5545 msgstr "冲突解决后继续应用补丁"

5546

5311 -#: builtin/am.c:2244

5547 +#: builtin/am.c:2278

5548 msgid "synonyms for --continue"

5549 msgstr "和 --continue 同义"

5550

5315 -#: builtin/am.c:2247

5551 +#: builtin/am.c:2281

5552 msgid "skip the current patch"

5553 msgstr "跳过当前补丁"

5554

5319 -#: builtin/am.c:2250

5555 +#: builtin/am.c:2284

5556 msgid "restore the original branch and abort the patching operation."

5557 msgstr "恢复原始分支并终止打补丁操作。"

5558

5323 -#: builtin/am.c:2254

5559 +#: builtin/am.c:2287

5560 +msgid "abort the patching operation but keep HEAD where it is."

5561 +msgstr "终止补丁操作但保持 HEAD 不变。"

5562 +

5563 +#: builtin/am.c:2290

5564 +msgid "show the patch being applied."

5565 +msgstr "显示正在应用的补丁。"

5566 +

5567 +#: builtin/am.c:2294

5568 msgid "lie about committer date"

5569 msgstr "将作者日期作为提交日期"

5570

5327 -#: builtin/am.c:2256

5571 +#: builtin/am.c:2296

5572 msgid "use current timestamp for author date"

5573 msgstr "用当前时间作为作者日期"

5574

5331 -#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236

5332 -#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392

5575 +#: builtin/am.c:2298 builtin/commit.c:1431 builtin/merge.c:237

5576 +#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:398

5577 msgid "key-id"

5578 msgstr "key-id"

5579

5336 -#: builtin/am.c:2259

5580 +#: builtin/am.c:2299

5581 msgid "GPG-sign commits"

5582 msgstr "使用 GPG 签名提交"

5583

5340 -#: builtin/am.c:2262

5584 +#: builtin/am.c:2302

5585 msgid "(internal use for git-rebase)"

5586 msgstr "（内部使用，用于 git-rebase）"

5587

5344 -#: builtin/am.c:2280

5588 +#: builtin/am.c:2320

5589 msgid ""

5590 "The -b/--binary option has been a no-op for long time, and\n"

5591 "it will be removed. Please do not use it anymore."

@@ -5349,16 +5593,16 @@ msgstr ""

5593 "参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n"

5594 "请不要再使用它了。"

5595

5352 -#: builtin/am.c:2287

5596 +#: builtin/am.c:2327

5597 msgid "failed to read the index"

5598 msgstr "无法读取索引"

5599

5356 -#: builtin/am.c:2302

5600 +#: builtin/am.c:2342

5601 #, c-format

5602 msgid "previous rebase directory %s still exists but mbox given."

5603 msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。"

5604

5361 -#: builtin/am.c:2326

5605 +#: builtin/am.c:2366

5606 #, c-format

5607 msgid ""

5608 "Stray %s directory found.\n"

@@ -5367,7 +5611,7 @@ msgstr ""

5611 "发现了错误的 %s 目录。\n"

5612 "使用 \"git am --abort\" 删除它。"

5613

5370 -#: builtin/am.c:2332

5614 +#: builtin/am.c:2372

5615 msgid "Resolve operation not in progress, we are not resuming."

5616 msgstr "解决操作未进行，我们不会继续。"

5617

@@ -5389,8 +5633,8 @@ msgid "git archive: Remote with no URL"

5633 msgstr "git archive：未提供远程 URL"

5634

5635 #: builtin/archive.c:58

5392 -msgid "git archive: expected ACK/NAK, got EOF"

5393 -msgstr "git archive：应为 ACK/NACK，却得到 EOF"

5636 +msgid "git archive: expected ACK/NAK, got a flush packet"

5637 +msgstr "git archive：期望是 ACK/NAK，却得到 flush 包"

5638

5639 #: builtin/archive.c:61

5640 #, c-format

@@ -5403,7 +5647,7 @@ msgstr "git archive：协议错误"

5647

5648 #: builtin/archive.c:68

5649 msgid "git archive: expected a flush"

5406 -msgstr "git archive：应有一个 flush 刷新"

5650 +msgstr "git archive：应有一个 flush 包"

5651

5652 #: builtin/bisect--helper.c:12

5653 msgid "git bisect--helper --next-all [--no-checkout]"

@@ -5476,107 +5720,107 @@ msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"

5720 msgid "<rev-opts> are documented in git-rev-list(1)"

5721 msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"

5722

5479 -#: builtin/blame.c:668

5723 +#: builtin/blame.c:677

5724 msgid "Show blame entries as we find them, incrementally"

5725 msgstr "增量式地显示发现的 blame 条目"

5726

5483 -#: builtin/blame.c:669

5727 +#: builtin/blame.c:678

5728 msgid "Show blank SHA-1 for boundary commits (Default: off)"

5729 msgstr "边界提交显示空的 SHA-1（默认：关闭）"

5730

5487 -#: builtin/blame.c:670

5731 +#: builtin/blame.c:679

5732 msgid "Do not treat root commits as boundaries (Default: off)"

5733 msgstr "不把根提交作为边界（默认：关闭）"

5734

5491 -#: builtin/blame.c:671

5735 +#: builtin/blame.c:680

5736 msgid "Show work cost statistics"

5737 msgstr "显示命令消耗统计"

5738

5495 -#: builtin/blame.c:672

5739 +#: builtin/blame.c:681

5740 msgid "Force progress reporting"

5741 msgstr "强制进度显示"

5742

5499 -#: builtin/blame.c:673

5743 +#: builtin/blame.c:682

5744 msgid "Show output score for blame entries"

5745 msgstr "显示判断 blame 条目位移的得分诊断信息"

5746

5503 -#: builtin/blame.c:674

5747 +#: builtin/blame.c:683

5748 msgid "Show original filename (Default: auto)"

5749 msgstr "显示原始文件名（默认：自动）"

5750

5507 -#: builtin/blame.c:675

5751 +#: builtin/blame.c:684

5752 msgid "Show original linenumber (Default: off)"

5753 msgstr "显示原始的行号（默认：关闭）"

5754

5511 -#: builtin/blame.c:676

5755 +#: builtin/blame.c:685

5756 msgid "Show in a format designed for machine consumption"

5757 msgstr "显示为一个适合机器读取的格式"

5758

5515 -#: builtin/blame.c:677

5759 +#: builtin/blame.c:686

5760 msgid "Show porcelain format with per-line commit information"

5761 msgstr "为每一行显示机器适用的提交信息"

5762

5519 -#: builtin/blame.c:678

5763 +#: builtin/blame.c:687

5764 msgid "Use the same output mode as git-annotate (Default: off)"

5765 msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）"

5766

5523 -#: builtin/blame.c:679

5767 +#: builtin/blame.c:688

5768 msgid "Show raw timestamp (Default: off)"

5769 msgstr "显示原始时间戳（默认：关闭）"

5770

5527 -#: builtin/blame.c:680

5771 +#: builtin/blame.c:689

5772 msgid "Show long commit SHA1 (Default: off)"

5773 msgstr "显示长的 SHA1 提交号（默认：关闭）"

5774

5531 -#: builtin/blame.c:681

5775 +#: builtin/blame.c:690

5776 msgid "Suppress author name and timestamp (Default: off)"

5777 msgstr "隐藏作者名字和时间戳（默认：关闭）"

5778

5535 -#: builtin/blame.c:682

5779 +#: builtin/blame.c:691

5780 msgid "Show author email instead of name (Default: off)"

5781 msgstr "显示作者的邮箱而不是名字（默认：关闭）"

5782

5539 -#: builtin/blame.c:683

5783 +#: builtin/blame.c:692

5784 msgid "Ignore whitespace differences"

5785 msgstr "忽略空白差异"

5786

5543 -#: builtin/blame.c:690

5787 +#: builtin/blame.c:699

5788 msgid "Use an experimental heuristic to improve diffs"

5789 msgstr "使用一个试验性的启发式算法改进差异显示"

5790

5547 -#: builtin/blame.c:692

5791 +#: builtin/blame.c:701

5792 msgid "Spend extra cycles to find better match"

5793 msgstr "花费额外的循环来找到更好的匹配"

5794

5551 -#: builtin/blame.c:693

5795 +#: builtin/blame.c:702

5796 msgid "Use revisions from <file> instead of calling git-rev-list"

5797 msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"

5798

5555 -#: builtin/blame.c:694

5799 +#: builtin/blame.c:703

5800 msgid "Use <file>'s contents as the final image"

5801 msgstr "使用 <文件> 的内容作为最终的图片"

5802

5559 -#: builtin/blame.c:695 builtin/blame.c:696

5803 +#: builtin/blame.c:704 builtin/blame.c:705

5804 msgid "score"

5805 msgstr "得分"

5806

5563 -#: builtin/blame.c:695

5807 +#: builtin/blame.c:704

5808 msgid "Find line copies within and across files"

5809 msgstr "找到文件内及跨文件的行拷贝"

5810

5567 -#: builtin/blame.c:696

5811 +#: builtin/blame.c:705

5812 msgid "Find line movements within and across files"

5813 msgstr "找到文件内及跨文件的行移动"

5814

5571 -#: builtin/blame.c:697

5815 +#: builtin/blame.c:706

5816 msgid "n,m"

5817 msgstr "n,m"

5818

5575 -#: builtin/blame.c:697

5819 +#: builtin/blame.c:706

5820 msgid "Process only line range n,m, counting from 1"

5821 msgstr "只处理行范围在 n 和 m 之间的，从 1 开始"

5822

5579 -#: builtin/blame.c:744

5823 +#: builtin/blame.c:753

5824 msgid "--progress can't be used with --incremental or porcelain formats"

5825 msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"

5826

@@ -5588,18 +5832,18 @@ msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"

5832 #. your language may need more or fewer display

5833 #. columns.

5834 #.

5591 -#: builtin/blame.c:795

5835 +#: builtin/blame.c:804

5836 msgid "4 years, 11 months ago"

5837 msgstr "4 年 11 个月前"

5838

5595 -#: builtin/blame.c:882

5839 +#: builtin/blame.c:890

5840 #, c-format

5841 msgid "file %s has only %lu line"

5842 msgid_plural "file %s has only %lu lines"

5843 msgstr[0] "文件 %s 只有 %lu 行"

5844 msgstr[1] "文件 %s 只有 %lu 行"

5845

5602 -#: builtin/blame.c:928

5846 +#: builtin/blame.c:936

5847 msgid "Blaming lines"

5848 msgstr "追踪代码行"

5849

@@ -5889,17 +6133,17 @@ msgstr "只打印尚未合并的分支"

6133 msgid "list branches in columns"

6134 msgstr "以列的方式显示分支"

6135

5892 -#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405

6136 +#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:411

6137 msgid "key"

6138 msgstr "key"

6139

5896 -#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406

6140 +#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:412

6141 msgid "field name to sort on"

6142 msgstr "排序的字段名"

6143

6144 #: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408

6145 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574

5902 -#: builtin/tag.c:408

6146 +#: builtin/tag.c:414

6147 msgid "object"

6148 msgstr "对象"

6149

@@ -5907,16 +6151,16 @@ msgstr "对象"

6151 msgid "print only branches of the object"

6152 msgstr "只打印指向该对象的分支"

6153

5910 -#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415

6154 +#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:421

6155 msgid "sorting and filtering are case insensitive"

6156 msgstr "排序和过滤属于大小写不敏感"

6157

5914 -#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413

6158 +#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:419

6159 #: builtin/verify-tag.c:39

6160 msgid "format to use for the output"

6161 msgstr "输出格式"

6162

5919 -#: builtin/branch.c:652 builtin/clone.c:730

6163 +#: builtin/branch.c:652 builtin/clone.c:735

6164 msgid "HEAD not found below refs/heads!"

6165 msgstr "HEAD 没有位于 /refs/heads 之下！"

6166

@@ -6011,7 +6255,7 @@ msgstr "需要一个仓库来创建包。"

6255 msgid "Need a repository to unbundle."

6256 msgstr "需要一个仓库来解包。"

6257

6014 -#: builtin/cat-file.c:521

6258 +#: builtin/cat-file.c:523

6259 msgid ""

6260 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"

6261 "p | <type> | --textconv | --filters) [--path=<path>] <object>"

@@ -6019,7 +6263,7 @@ msgstr ""

6263 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"

6264 "p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"

6265

6022 -#: builtin/cat-file.c:522

6266 +#: builtin/cat-file.c:524

6267 msgid ""

6268 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"

6269 "filters]"

@@ -6027,63 +6271,63 @@ msgstr ""

6271 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"

6272 "filters]"

6273

6030 -#: builtin/cat-file.c:559

6274 +#: builtin/cat-file.c:561

6275 msgid "<type> can be one of: blob, tree, commit, tag"

6276 msgstr "<类型> 可以是其中之一：blob、tree、commit、tag"

6277

6034 -#: builtin/cat-file.c:560

6278 +#: builtin/cat-file.c:562

6279 msgid "show object type"

6280 msgstr "显示对象类型"

6281

6038 -#: builtin/cat-file.c:561

6282 +#: builtin/cat-file.c:563

6283 msgid "show object size"

6284 msgstr "显示对象大小"

6285

6042 -#: builtin/cat-file.c:563

6286 +#: builtin/cat-file.c:565

6287 msgid "exit with zero when there's no error"

6288 msgstr "当没有错误时退出并返回零"

6289

6046 -#: builtin/cat-file.c:564

6290 +#: builtin/cat-file.c:566

6291 msgid "pretty-print object's content"

6292 msgstr "美观地打印对象的内容"

6293

6050 -#: builtin/cat-file.c:566

6294 +#: builtin/cat-file.c:568

6295 msgid "for blob objects, run textconv on object's content"

6296 msgstr "对于数据对象，对其内容做文本转换"

6297

6054 -#: builtin/cat-file.c:568

6298 +#: builtin/cat-file.c:570

6299 msgid "for blob objects, run filters on object's content"

6300 msgstr "对于数据对象，对其内容做过滤"

6301

6058 -#: builtin/cat-file.c:569 git-submodule.sh:931

6302 +#: builtin/cat-file.c:571 git-submodule.sh:878

6303 msgid "blob"

6304 msgstr "数据对象"

6305

6062 -#: builtin/cat-file.c:570

6306 +#: builtin/cat-file.c:572

6307 msgid "use a specific path for --textconv/--filters"

6308 msgstr "对于 --textconv/--filters 使用一个特定的路径"

6309

6066 -#: builtin/cat-file.c:572

6310 +#: builtin/cat-file.c:574

6311 msgid "allow -s and -t to work with broken/corrupt objects"

6312 msgstr "允许 -s 和 -t 对损坏的对象生效"

6313

6070 -#: builtin/cat-file.c:573

6314 +#: builtin/cat-file.c:575

6315 msgid "buffer --batch output"

6316 msgstr "缓冲 --batch 的输出"

6317

6074 -#: builtin/cat-file.c:575

6318 +#: builtin/cat-file.c:577

6319 msgid "show info and content of objects fed from the standard input"

6320 msgstr "显示从标准输入提供的对象的信息和内容"

6321

6078 -#: builtin/cat-file.c:578

6322 +#: builtin/cat-file.c:580

6323 msgid "show info about objects fed from the standard input"

6324 msgstr "显示从标准输入提供的对象的信息"

6325

6082 -#: builtin/cat-file.c:581

6326 +#: builtin/cat-file.c:583

6327 msgid "follow in-tree symlinks (used with --batch or --batch-check)"

6328 msgstr "跟随树内符号链接（和 --batch 或 --batch-check 共用）"

6329

6086 -#: builtin/cat-file.c:583

6330 +#: builtin/cat-file.c:585

6331 msgid "show all objects with --batch or --batch-check"

6332 msgstr "使用 --batch 或 --batch-check 参数显示所有对象"

6333

@@ -6103,7 +6347,7 @@ msgstr "报告设置在文件上的所有属性"

6347 msgid "use .gitattributes only from the index"

6348 msgstr "只使用索引中的 .gitattributes"

6349

6106 -#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99

6350 +#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100

6351 msgid "read file names from stdin"

6352 msgstr "从标准输入读出文件名"

6353

@@ -6111,7 +6355,7 @@ msgstr "从标准输入读出文件名"

6355 msgid "terminate input and output records by a NUL character"

6356 msgstr "输入和输出的记录使用 NUL 字符终结"

6357

6114 -#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358

6358 +#: builtin/check-ignore.c:20 builtin/checkout.c:1106 builtin/gc.c:358

6359 msgid "suppress progress reporting"

6360 msgstr "不显示进度报告"

6361

@@ -6123,27 +6367,27 @@ msgstr "显示未匹配的输入路径"

6367 msgid "ignore index when checking"

6368 msgstr "检查时忽略索引"

6369

6126 -#: builtin/check-ignore.c:158

6370 +#: builtin/check-ignore.c:159

6371 msgid "cannot specify pathnames with --stdin"

6372 msgstr "不能同时指定路径及 --stdin 参数"

6373

6130 -#: builtin/check-ignore.c:161

6374 +#: builtin/check-ignore.c:162

6375 msgid "-z only makes sense with --stdin"

6376 msgstr "-z 需要和 --stdin 参数共用才有意义"

6377

6134 -#: builtin/check-ignore.c:163

6378 +#: builtin/check-ignore.c:164

6379 msgid "no path specified"

6380 msgstr "未指定路径"

6381

6138 -#: builtin/check-ignore.c:167

6382 +#: builtin/check-ignore.c:168

6383 msgid "--quiet is only valid with a single pathname"

6384 msgstr "参数 --quiet 只在提供一个路径名时有效"

6385

6142 -#: builtin/check-ignore.c:169

6386 +#: builtin/check-ignore.c:170

6387 msgid "cannot have both --quiet and --verbose"

6388 msgstr "不能同时提供 --quiet 和 --verbose 参数"

6389

6146 -#: builtin/check-ignore.c:172

6390 +#: builtin/check-ignore.c:173

6391 msgid "--non-matching is only valid with --verbose"

6392 msgstr "--non-matching 选项只在使用 --verbose 时有效"

6393

@@ -6201,9 +6445,9 @@ msgid "write the content to temporary files"

6445 msgstr "将内容写入临时文件"

6446

6447 #: builtin/checkout-index.c:173 builtin/column.c:31

6204 -#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869

6205 -#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237

6206 -#: builtin/worktree.c:552

6448 +#: builtin/submodule--helper.c:1203 builtin/submodule--helper.c:1206

6449 +#: builtin/submodule--helper.c:1212 builtin/submodule--helper.c:1574

6450 +#: builtin/worktree.c:570

6451 msgid "string"

6452 msgstr "字符串"

6453

@@ -6248,81 +6492,81 @@ msgstr "路径 '%s' 没有必须的版本"

6492 msgid "path '%s': cannot merge"

6493 msgstr "path '%s'：无法合并"

6494

6251 -#: builtin/checkout.c:232

6495 +#: builtin/checkout.c:231

6496 #, c-format

6497 msgid "Unable to add merge result for '%s'"

6498 msgstr "无法为 '%s' 添加合并结果"

6499

6256 -#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260

6257 -#: builtin/checkout.c:263

6500 +#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259

6501 +#: builtin/checkout.c:262

6502 #, c-format

6503 msgid "'%s' cannot be used with updating paths"

6504 msgstr "'%s' 不能在更新路径时使用"

6505

6262 -#: builtin/checkout.c:266 builtin/checkout.c:269

6506 +#: builtin/checkout.c:265 builtin/checkout.c:268

6507 #, c-format

6508 msgid "'%s' cannot be used with %s"

6509 msgstr "'%s' 不能和 %s 同时使用"

6510

6267 -#: builtin/checkout.c:272

6511 +#: builtin/checkout.c:271

6512 #, c-format

6513 msgid "Cannot update paths and switch to branch '%s' at the same time."

6514 msgstr "不能同时更新路径并切换到分支'%s'。"

6515

6272 -#: builtin/checkout.c:341 builtin/checkout.c:348

6516 +#: builtin/checkout.c:340 builtin/checkout.c:347

6517 #, c-format

6518 msgid "path '%s' is unmerged"

6519 msgstr "路径 '%s' 未合并"

6520

6277 -#: builtin/checkout.c:506

6521 +#: builtin/checkout.c:505

6522 msgid "you need to resolve your current index first"

6523 msgstr "您需要先解决当前索引的冲突"

6524

6281 -#: builtin/checkout.c:637

6525 +#: builtin/checkout.c:636

6526 #, c-format

6527 msgid "Can not do reflog for '%s': %s\n"

6528 msgstr "不能对 '%s' 执行 reflog 操作：%s\n"

6529

6286 -#: builtin/checkout.c:678

6530 +#: builtin/checkout.c:677

6531 msgid "HEAD is now at"

6532 msgstr "HEAD 目前位于"

6533

6290 -#: builtin/checkout.c:682 builtin/clone.c:684

6534 +#: builtin/checkout.c:681 builtin/clone.c:689

6535 msgid "unable to update HEAD"

6536 msgstr "不能更新 HEAD"

6537

6294 -#: builtin/checkout.c:686

6538 +#: builtin/checkout.c:685

6539 #, c-format

6540 msgid "Reset branch '%s'\n"

6541 msgstr "重置分支 '%s'\n"

6542

6299 -#: builtin/checkout.c:689

6543 +#: builtin/checkout.c:688

6544 #, c-format

6545 msgid "Already on '%s'\n"

6546 msgstr "已经位于 '%s'\n"

6547

6304 -#: builtin/checkout.c:693

6548 +#: builtin/checkout.c:692

6549 #, c-format

6550 msgid "Switched to and reset branch '%s'\n"

6551 msgstr "切换并重置分支 '%s'\n"

6552

6309 -#: builtin/checkout.c:695 builtin/checkout.c:1051

6553 +#: builtin/checkout.c:694 builtin/checkout.c:1039

6554 #, c-format

6555 msgid "Switched to a new branch '%s'\n"

6556 msgstr "切换到一个新分支 '%s'\n"

6557

6314 -#: builtin/checkout.c:697

6558 +#: builtin/checkout.c:696

6559 #, c-format

6560 msgid "Switched to branch '%s'\n"

6561 msgstr "切换到分支 '%s'\n"

6562

6563 # 译者：注意保持前导空格

6320 -#: builtin/checkout.c:748

6564 +#: builtin/checkout.c:747

6565 #, c-format

6566 msgid " ... and %d more.\n"

6567 msgstr " ... 及其它 %d 个。\n"

6568

6325 -#: builtin/checkout.c:754

6569 +#: builtin/checkout.c:753

6570 #, c-format

6571 msgid ""

6572 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -6343,7 +6587,7 @@ msgstr[1] ""

6587 "\n"

6588 "%s\n"

6589

6346 -#: builtin/checkout.c:773

6590 +#: builtin/checkout.c:772

6591 #, c-format

6592 msgid ""

6593 "If you want to keep it by creating a new branch, this may be a good time\n"

@@ -6370,160 +6614,160 @@ msgstr[1] ""

6614 " git branch <新分支名> %s\n"

6615 "\n"

6616

6373 -#: builtin/checkout.c:814

6617 +#: builtin/checkout.c:804

6618 msgid "internal error in revision walk"

6619 msgstr "在版本遍历时遇到内部错误"

6620

6377 -#: builtin/checkout.c:818

6621 +#: builtin/checkout.c:808

6622 msgid "Previous HEAD position was"

6623 msgstr "之前的 HEAD 位置是"

6624

6381 -#: builtin/checkout.c:848 builtin/checkout.c:1046

6625 +#: builtin/checkout.c:836 builtin/checkout.c:1034

6626 msgid "You are on a branch yet to be born"

6627 msgstr "您位于一个尚未初始化的分支"

6628

6385 -#: builtin/checkout.c:952

6629 +#: builtin/checkout.c:940

6630 #, c-format

6631 msgid "only one reference expected, %d given."

6632 msgstr "应只有一个引用，却给出了 %d 个"

6633

6390 -#: builtin/checkout.c:992 builtin/worktree.c:247

6634 +#: builtin/checkout.c:980 builtin/worktree.c:249

6635 #, c-format

6636 msgid "invalid reference: %s"

6637 msgstr "无效引用：%s"

6638

6395 -#: builtin/checkout.c:1021

6639 +#: builtin/checkout.c:1009

6640 #, c-format

6641 msgid "reference is not a tree: %s"

6642 msgstr "引用不是一个树：%s"

6643

6400 -#: builtin/checkout.c:1060

6644 +#: builtin/checkout.c:1048

6645 msgid "paths cannot be used with switching branches"

6646 msgstr "路径不能和切换分支同时使用"

6647

6404 -#: builtin/checkout.c:1063 builtin/checkout.c:1067

6648 +#: builtin/checkout.c:1051 builtin/checkout.c:1055

6649 #, c-format

6650 msgid "'%s' cannot be used with switching branches"

6651 msgstr "'%s' 不能和切换分支同时使用"

6652

6409 -#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079

6410 -#: builtin/checkout.c:1082

6653 +#: builtin/checkout.c:1059 builtin/checkout.c:1062 builtin/checkout.c:1067

6654 +#: builtin/checkout.c:1070

6655 #, c-format

6656 msgid "'%s' cannot be used with '%s'"

6657 msgstr "'%s' 不能和 '%s' 同时使用"

6658

6415 -#: builtin/checkout.c:1087

6659 +#: builtin/checkout.c:1075

6660 #, c-format

6661 msgid "Cannot switch branch to a non-commit '%s'"

6662 msgstr "不能切换分支到一个非提交 '%s'"

6663

6420 -#: builtin/checkout.c:1119 builtin/checkout.c:1121 builtin/clone.c:114

6421 -#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:369

6422 -#: builtin/worktree.c:371

6664 +#: builtin/checkout.c:1107 builtin/checkout.c:1109 builtin/clone.c:116

6665 +#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:387

6666 +#: builtin/worktree.c:389

6667 msgid "branch"

6668 msgstr "分支"

6669

6426 -#: builtin/checkout.c:1120

6670 +#: builtin/checkout.c:1108

6671 msgid "create and checkout a new branch"

6672 msgstr "创建并检出一个新的分支"

6673

6430 -#: builtin/checkout.c:1122

6674 +#: builtin/checkout.c:1110

6675 msgid "create/reset and checkout a branch"

6676 msgstr "创建/重置并检出一个分支"

6677

6434 -#: builtin/checkout.c:1123

6678 +#: builtin/checkout.c:1111

6679 msgid "create reflog for new branch"

6680 msgstr "为新的分支创建引用日志"

6681

6438 -#: builtin/checkout.c:1124 builtin/worktree.c:373

6682 +#: builtin/checkout.c:1112 builtin/worktree.c:391

6683 msgid "detach HEAD at named commit"

6684 msgstr "HEAD 从指定的提交分离"

6685

6442 -#: builtin/checkout.c:1125

6686 +#: builtin/checkout.c:1113

6687 msgid "set upstream info for new branch"

6688 msgstr "为新的分支设置上游信息"

6689

6446 -#: builtin/checkout.c:1127

6690 +#: builtin/checkout.c:1115

6691 msgid "new-branch"

6692 msgstr "新分支"

6693

6450 -#: builtin/checkout.c:1127

6694 +#: builtin/checkout.c:1115

6695 msgid "new unparented branch"

6696 msgstr "新的没有父提交的分支"

6697

6454 -#: builtin/checkout.c:1128

6698 +#: builtin/checkout.c:1116

6699 msgid "checkout our version for unmerged files"

6700 msgstr "对尚未合并的文件检出我们的版本"

6701

6458 -#: builtin/checkout.c:1130

6702 +#: builtin/checkout.c:1118

6703 msgid "checkout their version for unmerged files"

6704 msgstr "对尚未合并的文件检出他们的版本"

6705

6462 -#: builtin/checkout.c:1132

6706 +#: builtin/checkout.c:1120

6707 msgid "force checkout (throw away local modifications)"

6708 msgstr "强制检出（丢弃本地修改）"

6709

6466 -#: builtin/checkout.c:1133

6710 +#: builtin/checkout.c:1122

6711 msgid "perform a 3-way merge with the new branch"

6712 msgstr "和新的分支执行三方合并"

6713

6470 -#: builtin/checkout.c:1134 builtin/merge.c:238

6714 +#: builtin/checkout.c:1124 builtin/merge.c:239

6715 msgid "update ignored files (default)"

6716 msgstr "更新忽略的文件（默认）"

6717

6474 -#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251

6718 +#: builtin/checkout.c:1126 builtin/log.c:1499 parse-options.h:263

6719 msgid "style"

6720 msgstr "风格"

6721

6478 -#: builtin/checkout.c:1136

6722 +#: builtin/checkout.c:1127

6723 msgid "conflict style (merge or diff3)"

6724 msgstr "冲突输出风格（merge 或 diff3）"

6725

6482 -#: builtin/checkout.c:1139

6726 +#: builtin/checkout.c:1130

6727 msgid "do not limit pathspecs to sparse entries only"

6728 msgstr "对路径不做稀疏检出的限制"

6729

6486 -#: builtin/checkout.c:1141

6730 +#: builtin/checkout.c:1132

6731 msgid "second guess 'git checkout <no-such-branch>'"

6732 msgstr "二次猜测'git checkout <无此分支>'"

6733

6490 -#: builtin/checkout.c:1143

6734 +#: builtin/checkout.c:1134

6735 msgid "do not check if another worktree is holding the given ref"

6736 msgstr "不检查指定的引用是否被其他工作区所占用"

6737

6494 -#: builtin/checkout.c:1147 builtin/clone.c:81 builtin/fetch.c:137

6495 -#: builtin/merge.c:235 builtin/pull.c:123 builtin/push.c:556

6738 +#: builtin/checkout.c:1138 builtin/clone.c:83 builtin/fetch.c:150

6739 +#: builtin/merge.c:236 builtin/pull.c:123 builtin/push.c:556

6740 #: builtin/send-pack.c:173

6741 msgid "force progress reporting"

6742 msgstr "强制显示进度报告"

6743

6500 -#: builtin/checkout.c:1177

6744 +#: builtin/checkout.c:1168

6745 msgid "-b, -B and --orphan are mutually exclusive"

6746 msgstr "-b、-B 和 --orphan 是互斥的"

6747

6504 -#: builtin/checkout.c:1194

6748 +#: builtin/checkout.c:1185

6749 msgid "--track needs a branch name"

6750 msgstr "--track 需要一个分支名"

6751

6508 -#: builtin/checkout.c:1199

6752 +#: builtin/checkout.c:1190

6753 msgid "Missing branch name; try -b"

6754 msgstr "缺少分支名；尝试 -b"

6755

6512 -#: builtin/checkout.c:1235

6756 +#: builtin/checkout.c:1226

6757 msgid "invalid path specification"

6758 msgstr "无效的路径规格"

6759

6516 -#: builtin/checkout.c:1242

6760 +#: builtin/checkout.c:1233

6761 #, c-format

6762 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"

6763 msgstr "'%s' 不是一个提交，不能基于它创建分支 '%s'"

6764

6521 -#: builtin/checkout.c:1246

6765 +#: builtin/checkout.c:1237

6766 #, c-format

6767 msgid "git checkout: --detach does not take a path argument '%s'"

6768 msgstr "git checkout：--detach 不能接收路径参数 '%s'"

6769

6526 -#: builtin/checkout.c:1250

6770 +#: builtin/checkout.c:1241

6771 msgid ""

6772 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

6773 "checking out of the index."

@@ -6621,7 +6865,7 @@ msgstr "选择要删除的条目"

6865 msgid "Remove %s [y/N]? "

6866 msgstr "删除 %s [y/N]？"

6867

6624 -#: builtin/clean.c:788 git-add--interactive.perl:1616

6868 +#: builtin/clean.c:788 git-add--interactive.perl:1710

6869 #, c-format

6870 msgid "Bye.\n"

6871 msgstr "再见。\n"

@@ -6644,11 +6888,11 @@ msgstr ""

6888 "help - 显示本帮助\n"

6889 "? - 显示如何在提示符下选择的帮助"

6890

6647 -#: builtin/clean.c:823 git-add--interactive.perl:1692

6891 +#: builtin/clean.c:823 git-add--interactive.perl:1786

6892 msgid "*** Commands ***"

6893 msgstr "*** 命令 ***"

6894

6651 -#: builtin/clean.c:824 git-add--interactive.perl:1689

6895 +#: builtin/clean.c:824 git-add--interactive.perl:1783

6896 msgid "What now"

6897 msgstr "请选择"

6898

@@ -6678,8 +6922,8 @@ msgstr "交互式清除"

6922 msgid "remove whole directories"

6923 msgstr "删除整个目录"

6924

6681 -#: builtin/clean.c:916 builtin/describe.c:530 builtin/describe.c:532

6682 -#: builtin/grep.c:863 builtin/log.c:155 builtin/log.c:157

6925 +#: builtin/clean.c:916 builtin/describe.c:533 builtin/describe.c:535

6926 +#: builtin/grep.c:871 builtin/log.c:157 builtin/log.c:159

6927 #: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399

6928 #: builtin/show-ref.c:176

6929 msgid "pattern"

@@ -6715,144 +6959,144 @@ msgid ""

6959 msgstr ""

6960 "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"

6961

6718 -#: builtin/clone.c:39

6962 +#: builtin/clone.c:40

6963 msgid "git clone [<options>] [--] <repo> [<dir>]"

6964 msgstr "git clone [<选项>] [--] <仓库> [<路径>]"

6965

6722 -#: builtin/clone.c:83

6966 +#: builtin/clone.c:85

6967 msgid "don't create a checkout"

6968 msgstr "不创建一个检出"

6969

6726 -#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479

6970 +#: builtin/clone.c:86 builtin/clone.c:88 builtin/init-db.c:479

6971 msgid "create a bare repository"

6972 msgstr "创建一个纯仓库"

6973

6730 -#: builtin/clone.c:88

6974 +#: builtin/clone.c:90

6975 msgid "create a mirror repository (implies bare)"

6976 msgstr "创建一个镜像仓库（也是纯仓库）"

6977

6734 -#: builtin/clone.c:90

6978 +#: builtin/clone.c:92

6979 msgid "to clone from a local repository"

6980 msgstr "从本地仓库克隆"

6981

6738 -#: builtin/clone.c:92

6982 +#: builtin/clone.c:94

6983 msgid "don't use local hardlinks, always copy"

6984 msgstr "不使用本地硬链接，始终复制"

6985

6742 -#: builtin/clone.c:94

6986 +#: builtin/clone.c:96

6987 msgid "setup as shared repository"

6988 msgstr "设置为共享仓库"

6989

6746 -#: builtin/clone.c:96 builtin/clone.c:100

6990 +#: builtin/clone.c:98 builtin/clone.c:102

6991 msgid "pathspec"

6992 msgstr "路径规格"

6993

6750 -#: builtin/clone.c:96 builtin/clone.c:100

6994 +#: builtin/clone.c:98 builtin/clone.c:102

6995 msgid "initialize submodules in the clone"

6996 msgstr "在克隆时初始化子模组"

6997

6754 -#: builtin/clone.c:103

6998 +#: builtin/clone.c:105

6999 msgid "number of submodules cloned in parallel"

7000 msgstr "并发克隆的子模组的数量"

7001

6758 -#: builtin/clone.c:104 builtin/init-db.c:476

7002 +#: builtin/clone.c:106 builtin/init-db.c:476

7003 msgid "template-directory"

7004 msgstr "模板目录"

7005

6762 -#: builtin/clone.c:105 builtin/init-db.c:477

7006 +#: builtin/clone.c:107 builtin/init-db.c:477

7007 msgid "directory from which templates will be used"

7008 msgstr "模板目录将被使用"

7009

6766 -#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873

6767 -#: builtin/submodule--helper.c:1240

7010 +#: builtin/clone.c:109 builtin/clone.c:111 builtin/submodule--helper.c:1210

7011 +#: builtin/submodule--helper.c:1577

7012 msgid "reference repository"

7013 msgstr "参考仓库"

7014

6771 -#: builtin/clone.c:111

7015 +#: builtin/clone.c:113

7016 msgid "use --reference only while cloning"

7017 msgstr "仅在克隆时参考 --reference 指向的本地仓库"

7018

6775 -#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44

7019 +#: builtin/clone.c:114 builtin/column.c:27 builtin/merge-file.c:44

7020 msgid "name"

7021 msgstr "名称"

7022

6779 -#: builtin/clone.c:113

7023 +#: builtin/clone.c:115

7024 msgid "use <name> instead of 'origin' to track upstream"

7025 msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"

7026

6783 -#: builtin/clone.c:115

7027 +#: builtin/clone.c:117

7028 msgid "checkout <branch> instead of the remote's HEAD"

7029 msgstr "检出 <分支> 而不是远程 HEAD"

7030

6787 -#: builtin/clone.c:117

7031 +#: builtin/clone.c:119

7032 msgid "path to git-upload-pack on the remote"

7033 msgstr "远程 git-upload-pack 路径"

7034

6791 -#: builtin/clone.c:118 builtin/fetch.c:138 builtin/grep.c:806

7035 +#: builtin/clone.c:120 builtin/fetch.c:151 builtin/grep.c:813

7036 #: builtin/pull.c:211

7037 msgid "depth"

7038 msgstr "深度"

7039

6796 -#: builtin/clone.c:119

7040 +#: builtin/clone.c:121

7041 msgid "create a shallow clone of that depth"

7042 msgstr "创建一个指定深度的浅克隆"

7043

6800 -#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991

6801 -#: parse-options.h:142

7044 +#: builtin/clone.c:122 builtin/fetch.c:153 builtin/pack-objects.c:3017

7045 +#: parse-options.h:154

7046 msgid "time"

7047 msgstr "时间"

7048

6805 -#: builtin/clone.c:121

7049 +#: builtin/clone.c:123

7050 msgid "create a shallow clone since a specific time"

7051 msgstr "从一个特定时间创建一个浅克隆"

7052

6809 -#: builtin/clone.c:122 builtin/fetch.c:142

7053 +#: builtin/clone.c:124 builtin/fetch.c:155

7054 msgid "revision"

7055 msgstr "版本"

7056

6813 -#: builtin/clone.c:123 builtin/fetch.c:143

7057 +#: builtin/clone.c:125 builtin/fetch.c:156

7058 msgid "deepen history of shallow clone, excluding rev"

7059 msgstr "深化浅克隆的历史，除了特定版本"

7060

6817 -#: builtin/clone.c:125

7061 +#: builtin/clone.c:127

7062 msgid "clone only one branch, HEAD or --branch"

7063 msgstr "只克隆一个分支、HEAD 或 --branch"

7064

6821 -#: builtin/clone.c:127

7065 +#: builtin/clone.c:129

7066 msgid "don't clone any tags, and make later fetches not to follow them"

7067 msgstr "不要克隆任何标签，并且后续获取操作也不下载它们"

7068

6825 -#: builtin/clone.c:129

7069 +#: builtin/clone.c:131

7070 msgid "any cloned submodules will be shallow"

7071 msgstr "子模组将以浅下载模式克隆"

7072

6829 -#: builtin/clone.c:130 builtin/init-db.c:485

7073 +#: builtin/clone.c:132 builtin/init-db.c:485

7074 msgid "gitdir"

7075 msgstr "git目录"

7076

6833 -#: builtin/clone.c:131 builtin/init-db.c:486

7077 +#: builtin/clone.c:133 builtin/init-db.c:486

7078 msgid "separate git dir from working tree"

7079 msgstr "git目录和工作区分离"

7080

6837 -#: builtin/clone.c:132

7081 +#: builtin/clone.c:134

7082 msgid "key=value"

7083 msgstr "key=value"

7084

6841 -#: builtin/clone.c:133

7085 +#: builtin/clone.c:135

7086 msgid "set config inside the new repository"

7087 msgstr "在新仓库中设置配置信息"

7088

6845 -#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224

7089 +#: builtin/clone.c:136 builtin/fetch.c:173 builtin/pull.c:224

7090 #: builtin/push.c:567

7091 msgid "use IPv4 addresses only"

7092 msgstr "只使用 IPv4 地址"

7093

6850 -#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227

7094 +#: builtin/clone.c:138 builtin/fetch.c:175 builtin/pull.c:227

7095 #: builtin/push.c:569

7096 msgid "use IPv6 addresses only"

7097 msgstr "只使用 IPv6 地址"

7098

6855 -#: builtin/clone.c:273

7099 +#: builtin/clone.c:276

7100 msgid ""

7101 "No directory name could be guessed.\n"

7102 "Please specify a directory on the command line"

@@ -6860,42 +7104,42 @@ msgstr ""

7104 "无法猜到目录名。\n"

7105 "请在命令行指定一个目录"

7106

6863 -#: builtin/clone.c:326

7107 +#: builtin/clone.c:329

7108 #, c-format

7109 msgid "info: Could not add alternate for '%s': %s\n"

7110 msgstr "info: 不能为 '%s' 添加一个备用：%s\n"

7111

6868 -#: builtin/clone.c:398

7112 +#: builtin/clone.c:401

7113 #, c-format

7114 msgid "failed to open '%s'"

7115 msgstr "无法打开 '%s'"

7116

6873 -#: builtin/clone.c:406

7117 +#: builtin/clone.c:409

7118 #, c-format

7119 msgid "%s exists and is not a directory"

7120 msgstr "%s 存在且不是一个目录"

7121

6878 -#: builtin/clone.c:420

7122 +#: builtin/clone.c:423

7123 #, c-format

7124 msgid "failed to stat %s\n"

7125 msgstr "对 %s 调用 stat 失败\n"

7126

l10n: zh_CN: for git v2.17.0 l10n round 1