63af42fe30 · matheusbsbs/matheus-bagliano

@@ -12,8 +12,8 @@ msgid ""

12 msgstr ""

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

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

15 -"POT-Creation-Date: 2013-02-14 14:46+0800\n"

16 -"PO-Revision-Date: 2013-02-14 17:43+0800\n"

15 +"POT-Creation-Date: 2013-02-19 13:32+0800\n"

16 +"PO-Revision-Date: 2013-02-19 14:44+0800\n"

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

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

19 "Language: zh_CN\n"

@@ -310,23 +310,23 @@ msgstr[0] "%lu 年前"

310 msgstr[1] "%lu 年前"

311

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

313 -#: diff.c:111

313 +#: diff.c:112

314 #, c-format

315 msgid " Failed to parse dirstat cut-off percentage '%s'\n"

316 msgstr " 无法解析 dirstat 截止（cut-off）百分比 '%s'\n"

317

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

319 -#: diff.c:116

319 +#: diff.c:117

320 #, c-format

321 msgid " Unknown dirstat parameter '%s'\n"

322 msgstr " 未知的 dirstat 参数 '%s'\n"

323

324 -#: diff.c:194

324 +#: diff.c:210

325 #, c-format

326 msgid "Unknown value for 'diff.submodule' config variable: '%s'"

327 msgstr "配置变量 'diff.submodule' 未知的取值：'%s'"

328

329 -#: diff.c:237

329 +#: diff.c:260

330 #, c-format

331 msgid ""

332 "Found errors in 'diff.dirstat' config variable:\n"

@@ -335,7 +335,7 @@ msgstr ""

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

336 "%s"

337

338 -#: diff.c:3494

338 +#: diff.c:3468

339 #, c-format

340 msgid ""

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

@@ -344,7 +344,7 @@ msgstr ""

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

345 "%s"

346

347 -#: diff.c:3508

347 +#: diff.c:3482

348 #, c-format

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

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

@@ -708,28 +708,32 @@ msgstr "不能解析对象 '%s'"

708 msgid "Unable to write index."

709 msgstr "不能写入索引。"

710

711 -#: parse-options.c:485

711 +#: parse-options.c:489

712 msgid "..."

713 msgstr "..."

714

715 -#: parse-options.c:503

715 +#: parse-options.c:507

716 #, c-format

717 msgid "usage: %s"

718 msgstr "用法：%s"

719

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

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

722 -#: parse-options.c:507

722 +#: parse-options.c:511

723 #, c-format

724 msgid " or: %s"

725 msgstr " 或：%s"

726

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

728 -#: parse-options.c:510

728 +#: parse-options.c:514

729 #, c-format

730 msgid " %s"

731 msgstr " %s"

732

733 +#: parse-options.c:548

734 +msgid "-NUM"

735 +msgstr "-数字"

736 +

737 #: pathspec.c:83

738 #, c-format

739 msgid "Path '%s' is in submodule '%.*s'"

@@ -988,7 +992,7 @@ msgstr "不能解析 HEAD"

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

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

994

991 -#: sequencer.c:821 builtin/apply.c:4020

995 +#: sequencer.c:821 builtin/apply.c:4056

996 #, c-format

997 msgid "cannot open %s: %s"

998 msgstr "不能打开 %s：%s"

@@ -1228,7 +1232,7 @@ msgid "You have unmerged paths."

1232 msgstr "您有尚未合并的路径。"

1233

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

1231 -#: wt-status.c:792 wt-status.c:916

1235 +#: wt-status.c:792 wt-status.c:944

1236 msgid " (fix conflicts and run \"git commit\")"

1237 msgstr " （解决冲突并运行 \"git commit\"）"

1238

@@ -1264,173 +1268,194 @@ msgstr " （使用 \"git am --skip\" 跳过此补丁）"

1268 msgid " (use \"git am --abort\" to restore the original branch)"

1269 msgstr " （使用 \"git am --abort\" 恢复原有分支）"

1270

1267 -#: wt-status.c:877 wt-status.c:887

1271 +#: wt-status.c:879 wt-status.c:896

1272 +#, c-format

1273 +msgid "You are currently rebasing branch '%s' on '%s'."

1274 +msgstr "您正在将分支 '%s' 变基到 '%s'。"

1275 +

1276 +#: wt-status.c:884 wt-status.c:901

1277 msgid "You are currently rebasing."

1278 msgstr "您正在变基。"

1279

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

1272 -#: wt-status.c:880

1281 +#: wt-status.c:887

1282 msgid " (fix conflicts and then run \"git rebase --continue\")"

1283 msgstr " （解决冲突，然后运行 \"git rebase --continue\"）"

1284

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

1277 -#: wt-status.c:882

1286 +#: wt-status.c:889

1287 msgid " (use \"git rebase --skip\" to skip this patch)"

1288 msgstr " （使用 \"git rebase --skip\" 跳过此补丁）"

1289

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

1282 -#: wt-status.c:884

1291 +#: wt-status.c:891

1292 msgid " (use \"git rebase --abort\" to check out the original branch)"

1293 msgstr " （使用 \"git rebase --abort\" 以检出原有分支）"

1294

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

1287 -#: wt-status.c:890

1296 +#: wt-status.c:904

1297 msgid " (all conflicts fixed: run \"git rebase --continue\")"

1298 msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）"

1299

1291 -#: wt-status.c:892

1300 +#: wt-status.c:908

1301 +#, c-format

1302 +msgid ""

1303 +"You are currently splitting a commit while rebasing branch '%s' on '%s'."

1304 +msgstr "您正在将分支 '%s' 变基到 '%s' 过程中拆分一个提交。"

1305 +

1306 +#: wt-status.c:913

1307 msgid "You are currently splitting a commit during a rebase."

1308 msgstr "您正在变基过程中拆分一个提交。"

1309

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

1296 -#: wt-status.c:895

1311 +#: wt-status.c:916

1312 msgid " (Once your working directory is clean, run \"git rebase --continue\")"

1313 msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"

1314

1300 -#: wt-status.c:897

1315 +#: wt-status.c:920

1316 +#, c-format

1317 +msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."

1318 +msgstr "您正在将分支 '%s' 变基到 '%s' 过程中编辑一个提交。"

1319 +

1320 +#: wt-status.c:925

1321 msgid "You are currently editing a commit during a rebase."

1322 msgstr "您正在变基过程中编辑一个提交。"

1323

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

1305 -#: wt-status.c:900

1325 +#: wt-status.c:928

1326 msgid " (use \"git commit --amend\" to amend the current commit)"

1327 msgstr " （使用 \"git commit --amend\" 修补当前提交）"

1328

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

1310 -#: wt-status.c:902

1330 +#: wt-status.c:930

1331 msgid ""

1332 " (use \"git rebase --continue\" once you are satisfied with your changes)"

1333 msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）"

1334

1315 -#: wt-status.c:912

1335 +#: wt-status.c:940

1336 msgid "You are currently cherry-picking."

1337 msgstr "您正在做拣选操作。"

1338

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

1320 -#: wt-status.c:919

1340 +#: wt-status.c:947

1341 msgid " (all conflicts fixed: run \"git commit\")"

1342 msgstr " （解决所有冲突后，执行 \"git commit\"）"

1343

1324 -#: wt-status.c:928

1344 +#: wt-status.c:958

1345 +#, c-format

1346 +msgid "You are currently bisecting branch '%s'."

1347 +msgstr "您正在分支 '%s' 中做二分查找。"

1348 +

1349 +#: wt-status.c:962

1350 msgid "You are currently bisecting."

1351 msgstr "您正在做二分查找。"

1352

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

1329 -#: wt-status.c:931

1354 +#: wt-status.c:965

1355 msgid " (use \"git bisect reset\" to get back to the original branch)"

1356 msgstr " （使用 \"git bisect reset\" 以回到原有分支）"

1357

1333 -#: wt-status.c:982

1358 +#: wt-status.c:1064

1359 msgid "On branch "

1360 msgstr "位于分支 "

1361

1337 -#: wt-status.c:989

1362 +#: wt-status.c:1071

1363 msgid "Not currently on any branch."

1364 msgstr "当前不在任何分支上。"

1365

1341 -#: wt-status.c:1001

1366 +#: wt-status.c:1083

1367 msgid "Initial commit"

1368 msgstr "初始提交"

1369

1345 -#: wt-status.c:1015

1370 +#: wt-status.c:1097

1371 msgid "Untracked files"

1372 msgstr "未跟踪的文件"

1373

1349 -#: wt-status.c:1017

1374 +#: wt-status.c:1099

1375 msgid "Ignored files"

1376 msgstr "忽略的文件"

1377

1353 -#: wt-status.c:1019

1378 +#: wt-status.c:1101

1379 #, c-format

1380 msgid "Untracked files not listed%s"

1381 msgstr "未跟踪的文件没有列出%s"

1382

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

1359 -#: wt-status.c:1021

1384 +#: wt-status.c:1103

1385 msgid " (use -u option to show untracked files)"

1386 msgstr "（使用 -u 参数显示未跟踪的文件）"

1387

1363 -#: wt-status.c:1027

1388 +#: wt-status.c:1109

1389 msgid "No changes"

1390 msgstr "没有修改"

1391

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

1368 -#: wt-status.c:1032

1393 +#: wt-status.c:1114

1394 #, c-format

1395 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

1396 msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n"

1397

1373 -#: wt-status.c:1035

1398 +#: wt-status.c:1117

1399 #, c-format

1400 msgid "no changes added to commit\n"

1401 msgstr "修改尚未加入提交\n"

1402

1378 -#: wt-status.c:1038

1403 +#: wt-status.c:1120

1404 #, c-format

1405 msgid ""

1406 "nothing added to commit but untracked files present (use \"git add\" to "

1407 "track)\n"

1408 msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"

1409

1385 -#: wt-status.c:1041

1410 +#: wt-status.c:1123

1411 #, c-format

1412 msgid "nothing added to commit but untracked files present\n"

1413 msgstr "提交为空，但是存在尚未跟踪的文件\n"

1414

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

1391 -#: wt-status.c:1044

1416 +#: wt-status.c:1126

1417 #, c-format

1418 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

1419 msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n"

1420

1396 -#: wt-status.c:1047 wt-status.c:1052

1421 +#: wt-status.c:1129 wt-status.c:1134

1422 #, c-format

1423 msgid "nothing to commit\n"

1424 msgstr "无文件要提交\n"

1425

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

1402 -#: wt-status.c:1050

1427 +#: wt-status.c:1132

1428 #, c-format

1429 msgid "nothing to commit (use -u to show untracked files)\n"

1430 msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n"

1431

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

1408 -#: wt-status.c:1054

1433 +#: wt-status.c:1136

1434 #, c-format

1435 msgid "nothing to commit, working directory clean\n"

1436 msgstr "无文件要提交，干净的工作区\n"

1437

1413 -#: wt-status.c:1162

1438 +#: wt-status.c:1244

1439 msgid "HEAD (no branch)"

1440 msgstr "HEAD（非分支）"

1441

1442 # 译者：注意保持句尾空格

1418 -#: wt-status.c:1168

1443 +#: wt-status.c:1250

1444 msgid "Initial commit on "

1445 msgstr "初始提交于 "

1446

1447 # 译者：注意保持句尾空格

1423 -#: wt-status.c:1183

1448 +#: wt-status.c:1265

1449 msgid "behind "

1450 msgstr "落后 "

1451

1452 # 译者：注意保持句尾空格

1428 -#: wt-status.c:1186 wt-status.c:1189

1453 +#: wt-status.c:1268 wt-status.c:1271

1454 msgid "ahead "

1455 msgstr "领先 "

1456

1457 # 译者：注意保持句尾空格

1433 -#: wt-status.c:1191

1458 +#: wt-status.c:1273

1459 msgid ", behind "

1460 msgstr "，落后 "

1461

@@ -1503,7 +1528,7 @@ msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"

1528 msgid "dry run"

1529 msgstr "演习"

1530

1506 -#: builtin/add.c:278 builtin/apply.c:4369 builtin/check-ignore.c:19

1531 +#: builtin/add.c:278 builtin/apply.c:4405 builtin/check-ignore.c:19

1532 #: builtin/commit.c:1150 builtin/count-objects.c:82 builtin/fsck.c:613

1533 #: builtin/log.c:1522 builtin/mv.c:62 builtin/read-tree.c:112

1534 msgid "be verbose"

@@ -1629,7 +1654,7 @@ msgstr "也许您想要执行 'git add .'？\n"

1654 msgid "index file corrupt"

1655 msgstr "索引文件损坏"

1656

1632 -#: builtin/add.c:481 builtin/apply.c:4465 builtin/mv.c:229 builtin/rm.c:370

1657 +#: builtin/add.c:481 builtin/apply.c:4501 builtin/mv.c:229 builtin/rm.c:370

1658 msgid "Unable to write new index file"

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

1660

@@ -1877,224 +1902,224 @@ msgstr "%s：补丁未应用"

1902 msgid "Checking patch %s..."

1903 msgstr "检查补丁 %s..."

1904

1880 -#: builtin/apply.c:3639 builtin/checkout.c:215 builtin/reset.c:124

1905 +#: builtin/apply.c:3675 builtin/checkout.c:215 builtin/reset.c:124

1906 #, c-format

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

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

1909

1885 -#: builtin/apply.c:3782

1910 +#: builtin/apply.c:3818

1911 #, c-format

1912 msgid "unable to remove %s from index"

1913 msgstr "不能从索引中移除 %s"

1914

1890 -#: builtin/apply.c:3810

1915 +#: builtin/apply.c:3846

1916 #, c-format

1917 msgid "corrupt patch for subproject %s"

1918 msgstr "子项目 %s 损坏的补丁"

1919

1895 -#: builtin/apply.c:3814

1920 +#: builtin/apply.c:3850

1921 #, c-format

1922 msgid "unable to stat newly created file '%s'"

1923 msgstr "不能枚举新建文件 '%s' 的状态"

1924

1900 -#: builtin/apply.c:3819

1925 +#: builtin/apply.c:3855

1926 #, c-format

1927 msgid "unable to create backing store for newly created file %s"

1928 msgstr "不能为新建文件 %s 创建后端存储"

1929

1905 -#: builtin/apply.c:3822 builtin/apply.c:3930

1930 +#: builtin/apply.c:3858 builtin/apply.c:3966

1931 #, c-format

1932 msgid "unable to add cache entry for %s"

1933 msgstr "无法为 %s 添加缓存条目"

1934

1910 -#: builtin/apply.c:3855

1935 +#: builtin/apply.c:3891

1936 #, c-format

1937 msgid "closing file '%s'"

1938 msgstr "关闭文件 '%s'"

1939

1915 -#: builtin/apply.c:3904

1940 +#: builtin/apply.c:3940

1941 #, c-format

1942 msgid "unable to write file '%s' mode %o"

1943 msgstr "不能写文件 '%s' 权限 %o"

1944

1920 -#: builtin/apply.c:3991

1945 +#: builtin/apply.c:4027

1946 #, c-format

1947 msgid "Applied patch %s cleanly."

1948 msgstr "成功应用补丁 %s。"

1949

1925 -#: builtin/apply.c:3999

1950 +#: builtin/apply.c:4035

1951 msgid "internal error"

1952 msgstr "内部错误"

1953

1954 #. Say this even without --verbose

1930 -#: builtin/apply.c:4002

1955 +#: builtin/apply.c:4038

1956 #, c-format

1957 msgid "Applying patch %%s with %d reject..."

1958 msgid_plural "Applying patch %%s with %d rejects..."

1959 msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..."

1960 msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."

1961

1937 -#: builtin/apply.c:4012

1962 +#: builtin/apply.c:4048

1963 #, c-format

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

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

1966

1942 -#: builtin/apply.c:4033

1967 +#: builtin/apply.c:4069

1968 #, c-format

1969 msgid "Hunk #%d applied cleanly."

1970 msgstr "第 #%d 个片段成功应用。"

1971

1947 -#: builtin/apply.c:4036

1972 +#: builtin/apply.c:4072

1973 #, c-format

1974 msgid "Rejected hunk #%d."

1975 msgstr "拒绝第 #%d 个片段。"

1976

1952 -#: builtin/apply.c:4186

1977 +#: builtin/apply.c:4222

1978 msgid "unrecognized input"

1979 msgstr "未能识别的输入"

1980

1956 -#: builtin/apply.c:4197

1981 +#: builtin/apply.c:4233

1982 msgid "unable to read index file"

1983 msgstr "无法读取索引文件"

1984

1960 -#: builtin/apply.c:4316 builtin/apply.c:4319 builtin/clone.c:91

1985 +#: builtin/apply.c:4352 builtin/apply.c:4355 builtin/clone.c:91

1986 #: builtin/fetch.c:63

1987 msgid "path"

1988 msgstr "路径"

1989

1965 -#: builtin/apply.c:4317

1990 +#: builtin/apply.c:4353

1991 msgid "don't apply changes matching the given path"

1992 msgstr "不要应用与给出路径向匹配的变更"

1993

1969 -#: builtin/apply.c:4320

1994 +#: builtin/apply.c:4356

1995 msgid "apply changes matching the given path"

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

1997

1973 -#: builtin/apply.c:4322

1998 +#: builtin/apply.c:4358

1999 msgid "num"

2000 msgstr "数字"

2001

1977 -#: builtin/apply.c:4323

2002 +#: builtin/apply.c:4359

2003 msgid "remove <num> leading slashes from traditional diff paths"

2004 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"

2005

1981 -#: builtin/apply.c:4326

2006 +#: builtin/apply.c:4362

2007 msgid "ignore additions made by the patch"

2008 msgstr "忽略补丁中的添加的文件"

2009

1985 -#: builtin/apply.c:4328

2010 +#: builtin/apply.c:4364

2011 msgid "instead of applying the patch, output diffstat for the input"

2012 msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"

2013

1989 -#: builtin/apply.c:4332

2014 +#: builtin/apply.c:4368

2015 msgid "show number of added and deleted lines in decimal notation"

2016 msgstr "以十进制数显示添加和删除的行数"

2017

1993 -#: builtin/apply.c:4334

2018 +#: builtin/apply.c:4370

2019 msgid "instead of applying the patch, output a summary for the input"

2020 msgstr "不应用补丁，而是显示输入的概要"

2021

1997 -#: builtin/apply.c:4336

2022 +#: builtin/apply.c:4372

2023 msgid "instead of applying the patch, see if the patch is applicable"

2024 msgstr "不应用补丁，而是查看补丁是否可应用"

2025

2001 -#: builtin/apply.c:4338

2026 +#: builtin/apply.c:4374

2027 msgid "make sure the patch is applicable to the current index"

2028 msgstr "确认补丁可以应用到当前索引"

2029

2005 -#: builtin/apply.c:4340

2030 +#: builtin/apply.c:4376

2031 msgid "apply a patch without touching the working tree"

2032 msgstr "应用补丁而不修改工作区"

2033

2009 -#: builtin/apply.c:4342

2034 +#: builtin/apply.c:4378

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

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

2037

2013 -#: builtin/apply.c:4344

2038 +#: builtin/apply.c:4380

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

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

2041

2017 -#: builtin/apply.c:4346

2042 +#: builtin/apply.c:4382

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

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

2045

2021 -#: builtin/apply.c:4348 builtin/checkout-index.c:197 builtin/ls-files.c:463

2046 +#: builtin/apply.c:4384 builtin/checkout-index.c:197 builtin/ls-files.c:463

2047 msgid "paths are separated with NUL character"

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

2049

2025 -#: builtin/apply.c:4351

2050 +#: builtin/apply.c:4387

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

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

2053

2029 -#: builtin/apply.c:4352

2054 +#: builtin/apply.c:4388

2055 msgid "action"

2056 msgstr "动作"

2057

2033 -#: builtin/apply.c:4353

2058 +#: builtin/apply.c:4389

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

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

2061

2037 -#: builtin/apply.c:4356 builtin/apply.c:4359

2062 +#: builtin/apply.c:4392 builtin/apply.c:4395

2063 msgid "ignore changes in whitespace when finding context"

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

2065

2041 -#: builtin/apply.c:4362

2066 +#: builtin/apply.c:4398

2067 msgid "apply the patch in reverse"

2068 msgstr "反向应用补丁"

2069

2045 -#: builtin/apply.c:4364

2070 +#: builtin/apply.c:4400

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

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

2073

2049 -#: builtin/apply.c:4366

2074 +#: builtin/apply.c:4402

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

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

2077

2053 -#: builtin/apply.c:4368

2078 +#: builtin/apply.c:4404

2079 msgid "allow overlapping hunks"

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

2081

2057 -#: builtin/apply.c:4371

2082 +#: builtin/apply.c:4407

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

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

2085

2061 -#: builtin/apply.c:4374

2086 +#: builtin/apply.c:4410

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

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

2089

2065 -#: builtin/apply.c:4376

2090 +#: builtin/apply.c:4412

2091 msgid "root"

2092 msgstr "根目录"

2093

2069 -#: builtin/apply.c:4377

2094 +#: builtin/apply.c:4413

2095 msgid "prepend <root> to all filenames"

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

2097

2073 -#: builtin/apply.c:4399

2098 +#: builtin/apply.c:4435

2099 msgid "--3way outside a repository"

2100 msgstr "--3way 在一个版本库之外"

2101

2077 -#: builtin/apply.c:4407

2102 +#: builtin/apply.c:4443

2103 msgid "--index outside a repository"

2104 msgstr "--index 在一个版本库之外"

2105

2081 -#: builtin/apply.c:4410

2106 +#: builtin/apply.c:4446

2107 msgid "--cached outside a repository"

2108 msgstr "--cached 在一个版本库之外"

2109

2085 -#: builtin/apply.c:4426

2110 +#: builtin/apply.c:4462

2111 #, c-format

2112 msgid "can't open patch '%s'"

2113 msgstr "不能打开补丁 '%s'"

2114

2090 -#: builtin/apply.c:4440

2115 +#: builtin/apply.c:4476

2116 #, c-format

2117 msgid "squelched %d whitespace error"

2118 msgid_plural "squelched %d whitespace errors"

2119 msgstr[0] "抑制下仍有 %d 个空白字符误用"

2120 msgstr[1] "抑制下仍有 %d 个空白字符误用"

2121

2097 -#: builtin/apply.c:4446 builtin/apply.c:4456

2122 +#: builtin/apply.c:4482 builtin/apply.c:4492

2123 #, c-format

2124 msgid "%d line adds whitespace errors."

2125 msgid_plural "%d lines add whitespace errors."

@@ -8759,7 +8784,7 @@ msgstr "版本库缺乏必要的数据（blob）对象以进行三路合并。"

8784

8785 #: git-am.sh:139

8786 msgid "Using index info to reconstruct a base tree..."

8762 -msgstr "更新索引信息以重建基树..."

8787 +msgstr "使用索引来重建一个（三路合并的）基础目录树..."

8788

8789 #: git-am.sh:154

8790 msgid ""

@@ -8870,7 +8895,7 @@ msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add

8895

8896 #: git-am.sh:845

8897 msgid "No changes -- Patch already applied."

8873 -msgstr "没有变更 -- 补丁已经应用过。"

8898 +msgstr "没有变更 —— 补丁已经应用过。"

8899

8900 #: git-am.sh:855

8901 #, sh-format

@@ -9567,9 +9592,6 @@ msgstr "为 '$prefix$sm_path' 同步子模组 url"

9592 #~ msgid "failed to close pipe to 'show' for object '%s'"

9593 #~ msgstr "无法为对象 '%s' 的 'show' 关闭管道"

9594

9570 -#~ msgid "-NUM"

9571 -#~ msgstr "-数字"

9572 -

9595 #~ msgid " 0 files changed"

9596 #~ msgstr " 0 个文件被修改"

9597

l10n: zh_CN.po: translate 5 new messages