@matheusbsbs / matheus-bagliano / commits / 44f518e68e

l10n: zh_CN: for git v2.4.0 l10n round 2

Translate 1 update message (2305t0f0u) for git v2.4.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Jiang Xin committed Apr 3, 2015 at 08:39 UTC 44f518e68eea7ad2318f33702ce3fe525bd254eb
1 file changed +235 -235
po/zh_CN.po
+235 -235
@@ -12,8 +12,8 @@ msgid ""
12 msgstr ""
13 "Project-Id-Version: Git\n"
14 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
15 -"POT-Creation-Date: 2015-03-27 13:33+0800\n"
16 -"PO-Revision-Date: 2015-03-31 09:43+0800\n"
15 +"POT-Creation-Date: 2015-04-03 08:13+0800\n"
16 +"PO-Revision-Date: 2015-04-03 08:35+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"
@@ -251,7 +251,7 @@ msgstr "'%s' 不像是一个 v2 版本的包文件"
251 msgid "unrecognized header: %s%s (%d)"
252 msgstr "未能识别的包头：%s%s (%d)"
253
254 -#: bundle.c:87 builtin/commit.c:764
254 +#: bundle.c:87 builtin/commit.c:766
255 #, c-format
256 msgid "could not open '%s'"
257 msgstr "不能打开 '%s'"
@@ -261,7 +261,7 @@ msgid "Repository lacks these prerequisite commits:"
261 msgstr "版本库缺少这些必备的提交："
262
263 #: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705
264 -#: builtin/branch.c:659 builtin/commit.c:1043 builtin/log.c:330
264 +#: builtin/branch.c:659 builtin/commit.c:1045 builtin/log.c:330
265 #: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358
266 #: builtin/shortlog.c:158
267 msgid "revision walk setup failed"
@@ -878,27 +878,27 @@ msgstr "无法合并树 %s 和 %s"
878 msgid "Unprocessed path??? %s"
879 msgstr "未处理的路径??? %s"
880
881 -#: merge-recursive.c:1898
881 +#: merge-recursive.c:1901
882 msgid "Merging:"
883 msgstr "合并："
884
885 -#: merge-recursive.c:1911
885 +#: merge-recursive.c:1914
886 #, c-format
887 msgid "found %u common ancestor:"
888 msgid_plural "found %u common ancestors:"
889 msgstr[0] "发现 %u 个共同祖先："
890 msgstr[1] "发现 %u 个共同祖先："
891
892 -#: merge-recursive.c:1948
892 +#: merge-recursive.c:1951
893 msgid "merge returned no commit"
894 msgstr "合并未返回提交"
895
896 -#: merge-recursive.c:2005
896 +#: merge-recursive.c:2008
897 #, c-format
898 msgid "Could not parse object '%s'"
899 msgstr "不能解析对象 '%s'"
900
901 -#: merge-recursive.c:2016 builtin/merge.c:667
901 +#: merge-recursive.c:2019 builtin/merge.c:667
902 msgid "Unable to write index."
903 msgstr "不能写入索引。"
904
@@ -1024,7 +1024,7 @@ msgstr "不能解析 --pretty 格式"
1024 msgid "done"
1025 msgstr "完成"
1026
1027 -#: read-cache.c:1273
1027 +#: read-cache.c:1275
1028 #, c-format
1029 msgid ""
1030 "index.version set, but the value is invalid.\n"
@@ -1033,7 +1033,7 @@ msgstr ""
1033 "设置了 index.version，但是取值无效。\n"
1034 "使用版本 %i"
1035
1036 -#: read-cache.c:1283
1036 +#: read-cache.c:1285
1037 #, c-format
1038 msgid ""
1039 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -1141,8 +1141,8 @@ msgid "the receiving end does not support --signed push"
1141 msgstr "接收端不支持签名推送"
1142
1143 #: send-pack.c:366
1144 -msgid "server does not support --atomic push"
1145 -msgstr "服务器端不支持原子（--atomic）推送"
1144 +msgid "the receiving end does not support --atomic push"
1145 +msgstr "接收端不支持原子推送"
1146
1147 #: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995
1148 #: builtin/merge.c:1005
@@ -1348,7 +1348,7 @@ msgstr "不能解析 HEAD"
1348 msgid "cannot abort from a branch yet to be born"
1349 msgstr "不能从尚未建立的分支终止"
1350
1351 -#: sequencer.c:908 builtin/apply.c:4286
1351 +#: sequencer.c:908 builtin/apply.c:4288
1352 #, c-format
1353 msgid "cannot open %s: %s"
1354 msgstr "不能打开 %s：%s"
@@ -2002,7 +2002,7 @@ msgstr "git add [<选项>] [--] <路径规则>..."
2002 msgid "unexpected diff status %c"
2003 msgstr "意外的差异状态 %c"
2004
2005 -#: builtin/add.c:70 builtin/commit.c:275
2005 +#: builtin/add.c:70 builtin/commit.c:277
2006 msgid "updating files failed"
2007 msgstr "更新文件失败"
2008
@@ -2052,8 +2052,8 @@ msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
2052 msgid "dry run"
2053 msgstr "演习"
2054
2055 -#: builtin/add.c:249 builtin/apply.c:4575 builtin/check-ignore.c:19
2056 -#: builtin/commit.c:1320 builtin/count-objects.c:63 builtin/fsck.c:608
2055 +#: builtin/add.c:249 builtin/apply.c:4577 builtin/check-ignore.c:19
2056 +#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:608
2057 #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114
2058 msgid "be verbose"
2059 msgstr "冗长输出"
@@ -2130,11 +2130,11 @@ msgid "Maybe you wanted to say 'git add .'?\n"
2130 msgstr "也许您想要执行 'git add .'？\n"
2131
2132 #: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920
2133 -#: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299
2133 +#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299
2134 msgid "index file corrupt"
2135 msgstr "索引文件损坏"
2136
2137 -#: builtin/add.c:446 builtin/apply.c:4673 builtin/mv.c:279 builtin/rm.c:431
2137 +#: builtin/add.c:446 builtin/apply.c:4675 builtin/mv.c:279 builtin/rm.c:431
2138 msgid "Unable to write new index file"
2139 msgstr "无法写入新索引文件"
2140
@@ -2266,19 +2266,19 @@ msgstr "不能打开或读取 %s"
2266 msgid "invalid start of line: '%c'"
2267 msgstr "无效的行首字符：'%c'"
2268
2269 -#: builtin/apply.c:2896
2269 +#: builtin/apply.c:2897
2270 #, c-format
2271 msgid "Hunk #%d succeeded at %d (offset %d line)."
2272 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
2273 msgstr[0] "块 #%d 成功应用于 %d（偏移 %d 行）"
2274 msgstr[1] "块 #%d 成功应用于 %d（偏移 %d 行）"
2275
2276 -#: builtin/apply.c:2908
2276 +#: builtin/apply.c:2909
2277 #, c-format
2278 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
2279 msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"
2280
2281 -#: builtin/apply.c:2914
2281 +#: builtin/apply.c:2915
2282 #, c-format
2283 msgid ""
2284 "while searching for:\n"
@@ -2287,336 +2287,336 @@ msgstr ""
2287 "当查询：\n"
2288 "%.*s"
2289
2290 -#: builtin/apply.c:2933
2290 +#: builtin/apply.c:2935
2291 #, c-format
2292 msgid "missing binary patch data for '%s'"
2293 msgstr "缺失 '%s' 的二进制补丁数据"
2294
2295 -#: builtin/apply.c:3034
2295 +#: builtin/apply.c:3036
2296 #, c-format
2297 msgid "binary patch does not apply to '%s'"
2298 msgstr "二进制补丁未应用到 '%s'"
2299
2300 -#: builtin/apply.c:3040
2300 +#: builtin/apply.c:3042
2301 #, c-format
2302 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
2303 msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）"
2304
2305 -#: builtin/apply.c:3061
2305 +#: builtin/apply.c:3063
2306 #, c-format
2307 msgid "patch failed: %s:%ld"
2308 msgstr "打补丁失败：%s:%ld"
2309
2310 -#: builtin/apply.c:3185
2310 +#: builtin/apply.c:3187
2311 #, c-format
2312 msgid "cannot checkout %s"
2313 msgstr "不能检出 %s"
2314
2315 -#: builtin/apply.c:3230 builtin/apply.c:3241 builtin/apply.c:3286
2315 +#: builtin/apply.c:3232 builtin/apply.c:3243 builtin/apply.c:3288
2316 #, c-format
2317 msgid "read of %s failed"
2318 msgstr "读取 %s 失败"
2319
2320 -#: builtin/apply.c:3238
2320 +#: builtin/apply.c:3240
2321 #, c-format
2322 msgid "reading from '%s' beyond a symbolic link"
2323 msgstr "读取位于符号链接中的 '%s'"
2324
2325 -#: builtin/apply.c:3266 builtin/apply.c:3488
2325 +#: builtin/apply.c:3268 builtin/apply.c:3490
2326 #, c-format
2327 msgid "path %s has been renamed/deleted"
2328 msgstr "路径 %s 已经被重命名/删除"
2329
2330 -#: builtin/apply.c:3347 builtin/apply.c:3502
2330 +#: builtin/apply.c:3349 builtin/apply.c:3504
2331 #, c-format
2332 msgid "%s: does not exist in index"
2333 msgstr "%s：不存在于索引中"
2334
2335 -#: builtin/apply.c:3351 builtin/apply.c:3494 builtin/apply.c:3516
2335 +#: builtin/apply.c:3353 builtin/apply.c:3496 builtin/apply.c:3518
2336 #, c-format
2337 msgid "%s: %s"
2338 msgstr "%s：%s"
2339
2340 -#: builtin/apply.c:3356 builtin/apply.c:3510
2340 +#: builtin/apply.c:3358 builtin/apply.c:3512
2341 #, c-format
2342 msgid "%s: does not match index"
2343 msgstr "%s：和索引不匹配"
2344
2345 -#: builtin/apply.c:3458
2345 +#: builtin/apply.c:3460
2346 msgid "removal patch leaves file contents"
2347 msgstr "移除补丁仍留下了文件内容"
2348
2349 -#: builtin/apply.c:3527
2349 +#: builtin/apply.c:3529
2350 #, c-format
2351 msgid "%s: wrong type"
2352 msgstr "%s：错误类型"
2353
2354 -#: builtin/apply.c:3529
2354 +#: builtin/apply.c:3531
2355 #, c-format
2356 msgid "%s has type %o, expected %o"
2357 msgstr "%s 的类型是 %o，应为 %o"
2358
2359 -#: builtin/apply.c:3688 builtin/apply.c:3690
2359 +#: builtin/apply.c:3690 builtin/apply.c:3692
2360 #, c-format
2361 msgid "invalid path '%s'"
2362 msgstr "无效路径 '%s'"
2363
2364 -#: builtin/apply.c:3745
2364 +#: builtin/apply.c:3747
2365 #, c-format
2366 msgid "%s: already exists in index"
2367 msgstr "%s：已经存在于索引中"
2368
2369 -#: builtin/apply.c:3748
2369 +#: builtin/apply.c:3750
2370 #, c-format
2371 msgid "%s: already exists in working directory"
2372 msgstr "%s：已经存在于工作区中"
2373
2374 -#: builtin/apply.c:3768
2374 +#: builtin/apply.c:3770
2375 #, c-format
2376 msgid "new mode (%o) of %s does not match old mode (%o)"
2377 msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"
2378
2379 -#: builtin/apply.c:3773
2379 +#: builtin/apply.c:3775
2380 #, c-format
2381 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2382 msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配"
2383
2384 -#: builtin/apply.c:3793
2384 +#: builtin/apply.c:3795
2385 #, c-format
2386 msgid "affected file '%s' is beyond a symbolic link"
2387 msgstr "受影响的文件 '%s' 位于符号链接中"
2388
2389 -#: builtin/apply.c:3797
2389 +#: builtin/apply.c:3799
2390 #, c-format
2391 msgid "%s: patch does not apply"
2392 msgstr "%s：补丁未应用"
2393
2394 -#: builtin/apply.c:3811
2394 +#: builtin/apply.c:3813
2395 #, c-format
2396 msgid "Checking patch %s..."
2397 msgstr "检查补丁 %s..."
2398
2399 -#: builtin/apply.c:3904 builtin/checkout.c:231 builtin/reset.c:135
2399 +#: builtin/apply.c:3906 builtin/checkout.c:231 builtin/reset.c:135
2400 #, c-format
2401 msgid "make_cache_entry failed for path '%s'"
2402 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
2403
2404 -#: builtin/apply.c:4047
2404 +#: builtin/apply.c:4049
2405 #, c-format
2406 msgid "unable to remove %s from index"
2407 msgstr "不能从索引中移除 %s"
2408
2409 -#: builtin/apply.c:4076
2409 +#: builtin/apply.c:4078
2410 #, c-format
2411 msgid "corrupt patch for submodule %s"
2412 msgstr "子模组 %s 损坏的补丁"
2413
2414 -#: builtin/apply.c:4080
2414 +#: builtin/apply.c:4082
2415 #, c-format
2416 msgid "unable to stat newly created file '%s'"
2417 msgstr "不能枚举新建文件 '%s' 的状态"
2418
2419 -#: builtin/apply.c:4085
2419 +#: builtin/apply.c:4087
2420 #, c-format
2421 msgid "unable to create backing store for newly created file %s"
2422 msgstr "不能为新建文件 %s 创建后端存储"
2423
2424 -#: builtin/apply.c:4088 builtin/apply.c:4196
2424 +#: builtin/apply.c:4090 builtin/apply.c:4198
2425 #, c-format
2426 msgid "unable to add cache entry for %s"
2427 msgstr "无法为 %s 添加缓存条目"
2428
2429 -#: builtin/apply.c:4121
2429 +#: builtin/apply.c:4123
2430 #, c-format
2431 msgid "closing file '%s'"
2432 msgstr "关闭文件 '%s'"
2433
2434 -#: builtin/apply.c:4170
2434 +#: builtin/apply.c:4172
2435 #, c-format
2436 msgid "unable to write file '%s' mode %o"
2437 msgstr "不能写文件 '%s' 权限 %o"
2438
2439 -#: builtin/apply.c:4257
2439 +#: builtin/apply.c:4259
2440 #, c-format
2441 msgid "Applied patch %s cleanly."
2442 msgstr "成功应用补丁 %s。"
2443
2444 -#: builtin/apply.c:4265
2444 +#: builtin/apply.c:4267
2445 msgid "internal error"
2446 msgstr "内部错误"
2447
2448 -#: builtin/apply.c:4268
2448 +#: builtin/apply.c:4270
2449 #, c-format
2450 msgid "Applying patch %%s with %d reject..."
2451 msgid_plural "Applying patch %%s with %d rejects..."
2452 msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..."
2453 msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."
2454
2455 -#: builtin/apply.c:4278
2455 +#: builtin/apply.c:4280
2456 #, c-format
2457 msgid "truncating .rej filename to %.*s.rej"
2458 msgstr "截短 .rej 文件名为 %.*s.rej"
2459
2460 -#: builtin/apply.c:4299
2460 +#: builtin/apply.c:4301
2461 #, c-format
2462 msgid "Hunk #%d applied cleanly."
2463 msgstr "第 #%d 个片段成功应用。"
2464
2465 -#: builtin/apply.c:4302
2465 +#: builtin/apply.c:4304
2466 #, c-format
2467 msgid "Rejected hunk #%d."
2468 msgstr "拒绝第 #%d 个片段。"
2469
2470 -#: builtin/apply.c:4392
2470 +#: builtin/apply.c:4394
2471 msgid "unrecognized input"
2472 msgstr "未能识别的输入"
2473
2474 -#: builtin/apply.c:4403
2474 +#: builtin/apply.c:4405
2475 msgid "unable to read index file"
2476 msgstr "无法读取索引文件"
2477
2478 -#: builtin/apply.c:4520 builtin/apply.c:4523 builtin/clone.c:92
2478 +#: builtin/apply.c:4522 builtin/apply.c:4525 builtin/clone.c:92
2479 #: builtin/fetch.c:92
2480 msgid "path"
2481 msgstr "路径"
2482
2483 -#: builtin/apply.c:4521
2483 +#: builtin/apply.c:4523
2484 msgid "don't apply changes matching the given path"
2485 msgstr "不要应用与给出路径向匹配的变更"
2486
2487 -#: builtin/apply.c:4524
2487 +#: builtin/apply.c:4526
2488 msgid "apply changes matching the given path"
2489 msgstr "应用与给出路径向匹配的变更"
2490
2491 -#: builtin/apply.c:4526
2491 +#: builtin/apply.c:4528
2492 msgid "num"
2493 msgstr "数字"
2494
2495 -#: builtin/apply.c:4527
2495 +#: builtin/apply.c:4529
2496 msgid "remove <num> leading slashes from traditional diff paths"
2497 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
2498
2499 -#: builtin/apply.c:4530
2499 +#: builtin/apply.c:4532
2500 msgid "ignore additions made by the patch"
2501 msgstr "忽略补丁中的添加的文件"
2502
2503 -#: builtin/apply.c:4532
2503 +#: builtin/apply.c:4534
2504 msgid "instead of applying the patch, output diffstat for the input"
2505 msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"
2506
2507 -#: builtin/apply.c:4536
2507 +#: builtin/apply.c:4538
2508 msgid "show number of added and deleted lines in decimal notation"
2509 msgstr "以十进制数显示添加和删除的行数"
2510
2511 -#: builtin/apply.c:4538
2511 +#: builtin/apply.c:4540
2512 msgid "instead of applying the patch, output a summary for the input"
2513 msgstr "不应用补丁，而是显示输入的概要"
2514
2515 -#: builtin/apply.c:4540
2515 +#: builtin/apply.c:4542
2516 msgid "instead of applying the patch, see if the patch is applicable"
2517 msgstr "不应用补丁，而是查看补丁是否可应用"
2518
2519 -#: builtin/apply.c:4542
2519 +#: builtin/apply.c:4544
2520 msgid "make sure the patch is applicable to the current index"
2521 msgstr "确认补丁可以应用到当前索引"
2522
2523 -#: builtin/apply.c:4544
2523 +#: builtin/apply.c:4546
2524 msgid "apply a patch without touching the working tree"
2525 msgstr "应用补丁而不修改工作区"
2526
2527 -#: builtin/apply.c:4546
2527 +#: builtin/apply.c:4548
2528 msgid "accept a patch that touches outside the working area"
2529 msgstr "接受修改工作区之外文件的补丁"
2530
2531 -#: builtin/apply.c:4548
2531 +#: builtin/apply.c:4550
2532 msgid "also apply the patch (use with --stat/--summary/--check)"
2533 msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"
2534
2535 -#: builtin/apply.c:4550
2535 +#: builtin/apply.c:4552
2536 msgid "attempt three-way merge if a patch does not apply"
2537 msgstr "如果一个补丁不能应用则尝试三路合并"
2538
2539 -#: builtin/apply.c:4552
2539 +#: builtin/apply.c:4554
2540 msgid "build a temporary index based on embedded index information"
2541 msgstr "创建一个临时索引基于嵌入的索引信息"
2542
2543 -#: builtin/apply.c:4554 builtin/checkout-index.c:198 builtin/ls-files.c:412
2543 +#: builtin/apply.c:4556 builtin/checkout-index.c:198 builtin/ls-files.c:412
2544 msgid "paths are separated with NUL character"
2545 msgstr "路径以 NUL 字符分隔"
2546
2547 -#: builtin/apply.c:4557
2547 +#: builtin/apply.c:4559
2548 msgid "ensure at least <n> lines of context match"
2549 msgstr "确保至少匹配 <n> 行上下文"
2550
2551 -#: builtin/apply.c:4558
2551 +#: builtin/apply.c:4560
2552 msgid "action"
2553 msgstr "动作"
2554
2555 -#: builtin/apply.c:4559
2555 +#: builtin/apply.c:4561
2556 msgid "detect new or modified lines that have whitespace errors"
2557 msgstr "检查新增和修改的行中间的空白字符滥用"
2558
2559 -#: builtin/apply.c:4562 builtin/apply.c:4565
2559 +#: builtin/apply.c:4564 builtin/apply.c:4567
2560 msgid "ignore changes in whitespace when finding context"
2561 msgstr "查找上下文时忽略空白字符的变更"
2562
2563 -#: builtin/apply.c:4568
2563 +#: builtin/apply.c:4570
2564 msgid "apply the patch in reverse"
2565 msgstr "反向应用补丁"
2566
2567 -#: builtin/apply.c:4570
2567 +#: builtin/apply.c:4572
2568 msgid "don't expect at least one line of context"
2569 msgstr "无需至少一行上下文"
2570
2571 -#: builtin/apply.c:4572
2571 +#: builtin/apply.c:4574
2572 msgid "leave the rejected hunks in corresponding *.rej files"
2573 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
2574
2575 -#: builtin/apply.c:4574
2575 +#: builtin/apply.c:4576
2576 msgid "allow overlapping hunks"
2577 msgstr "允许重叠的补丁片段"
2578
2579 -#: builtin/apply.c:4577
2579 +#: builtin/apply.c:4579
2580 msgid "tolerate incorrectly detected missing new-line at the end of file"
2581 msgstr "允许不正确的文件末尾换行符"
2582
2583 -#: builtin/apply.c:4580
2583 +#: builtin/apply.c:4582
2584 msgid "do not trust the line counts in the hunk headers"
2585 msgstr "不信任补丁片段的头信息中的行号"
2586
2587 -#: builtin/apply.c:4582
2587 +#: builtin/apply.c:4584
2588 msgid "root"
2589 msgstr "根目录"
2590
2591 -#: builtin/apply.c:4583
2591 +#: builtin/apply.c:4585
2592 msgid "prepend <root> to all filenames"
2593 msgstr "为所有文件名前添加 <根目录>"
2594
2595 -#: builtin/apply.c:4605
2595 +#: builtin/apply.c:4607
2596 msgid "--3way outside a repository"
2597 msgstr "--3way 在一个版本库之外"
2598
2599 -#: builtin/apply.c:4613
2599 +#: builtin/apply.c:4615
2600 msgid "--index outside a repository"
2601 msgstr "--index 在一个版本库之外"
2602
2603 -#: builtin/apply.c:4616
2603 +#: builtin/apply.c:4618
2604 msgid "--cached outside a repository"
2605 msgstr "--cached 在一个版本库之外"
2606
2607 -#: builtin/apply.c:4635
2607 +#: builtin/apply.c:4637
2608 #, c-format
2609 msgid "can't open patch '%s'"
2610 msgstr "不能打开补丁 '%s'"
2611
2612 -#: builtin/apply.c:4649
2612 +#: builtin/apply.c:4651
2613 #, c-format
2614 msgid "squelched %d whitespace error"
2615 msgid_plural "squelched %d whitespace errors"
2616 msgstr[0] "抑制下仍有 %d 个空白字符误用"
2617 msgstr[1] "抑制下仍有 %d 个空白字符误用"
2618
2619 -#: builtin/apply.c:4655 builtin/apply.c:4665
2619 +#: builtin/apply.c:4657 builtin/apply.c:4667
2620 #, c-format
2621 msgid "%d line adds whitespace errors."
2622 msgid_plural "%d lines add whitespace errors."
@@ -3025,8 +3025,8 @@ msgid "act on remote-tracking branches"
3025 msgstr "作用于远程跟踪分支"
3026
3027 #: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861
3028 -#: builtin/branch.c:867 builtin/commit.c:1580 builtin/commit.c:1581
3029 -#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:616
3028 +#: builtin/branch.c:867 builtin/commit.c:1582 builtin/commit.c:1583
3029 +#: builtin/commit.c:1584 builtin/commit.c:1585 builtin/tag.c:616
3030 #: builtin/tag.c:622
3031 msgid "commit"
3032 msgstr "提交"
@@ -4248,112 +4248,112 @@ msgstr ""
4248 "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
4249 "操作。\n"
4250
4251 -#: builtin/commit.c:302
4251 +#: builtin/commit.c:304
4252 msgid "failed to unpack HEAD tree object"
4253 msgstr "无法解包 HEAD 树对象"
4254
4255 -#: builtin/commit.c:342
4255 +#: builtin/commit.c:344
4256 msgid "unable to create temporary index"
4257 msgstr "不能创建临时索引"
4258
4259 -#: builtin/commit.c:348
4259 +#: builtin/commit.c:350
4260 msgid "interactive add failed"
4261 msgstr "交互式添加失败"
4262
4263 -#: builtin/commit.c:359
4263 +#: builtin/commit.c:361
4264 msgid "unable to write index file"
4265 msgstr "无法写入索引文件"
4266
4267 -#: builtin/commit.c:361
4267 +#: builtin/commit.c:363
4268 msgid "unable to update temporary index"
4269 msgstr "无法更新临时索引"
4270
4271 -#: builtin/commit.c:363
4271 +#: builtin/commit.c:365
4272 msgid "Failed to update main cache tree"
4273 msgstr "不能更新树的主缓存"
4274
4275 -#: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461
4275 +#: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463
4276 msgid "unable to write new_index file"
4277 msgstr "无法写 new_index 文件"
4278
4279 -#: builtin/commit.c:443
4279 +#: builtin/commit.c:445
4280 msgid "cannot do a partial commit during a merge."
4281 msgstr "在合并过程中不能做部分提交。"
4282
4283 -#: builtin/commit.c:445
4283 +#: builtin/commit.c:447
4284 msgid "cannot do a partial commit during a cherry-pick."
4285 msgstr "在拣选过程中不能做部分提交。"
4286
4287 -#: builtin/commit.c:454
4287 +#: builtin/commit.c:456
4288 msgid "cannot read the index"
4289 msgstr "无法读取索引"
4290
4291 -#: builtin/commit.c:473
4291 +#: builtin/commit.c:475
4292 msgid "unable to write temporary index file"
4293 msgstr "无法写临时索引文件"
4294
4295 -#: builtin/commit.c:578
4295 +#: builtin/commit.c:580
4296 #, c-format
4297 msgid "commit '%s' lacks author header"
4298 msgstr "提交 '%s' 缺少作者信息"
4299
4300 -#: builtin/commit.c:580
4300 +#: builtin/commit.c:582
4301 #, c-format
4302 msgid "commit '%s' has malformed author line"
4303 msgstr "提交 '%s' 有非法的作者信息"
4304
4305 -#: builtin/commit.c:599
4305 +#: builtin/commit.c:601
4306 msgid "malformed --author parameter"
4307 msgstr "非法的 --author 参数"
4308
4309 -#: builtin/commit.c:607
4309 +#: builtin/commit.c:609
4310 #, c-format
4311 msgid "invalid date format: %s"
4312 msgstr "无效的日期格式：%s"
4313
4314 -#: builtin/commit.c:651
4314 +#: builtin/commit.c:653
4315 msgid ""
4316 "unable to select a comment character that is not used\n"
4317 "in the current commit message"
4318 msgstr "无法选择一个未被当前提交说明使用的注释字符"
4319
4320 -#: builtin/commit.c:688 builtin/commit.c:721 builtin/commit.c:1078
4320 +#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
4321 #, c-format
4322 msgid "could not lookup commit %s"
4323 msgstr "不能查询提交 %s"
4324
4325 -#: builtin/commit.c:700 builtin/shortlog.c:273
4325 +#: builtin/commit.c:702 builtin/shortlog.c:273
4326 #, c-format
4327 msgid "(reading log message from standard input)\n"
4328 msgstr "（正从标准输入中读取日志信息）\n"
4329
4330 -#: builtin/commit.c:702
4330 +#: builtin/commit.c:704
4331 msgid "could not read log from standard input"
4332 msgstr "不能从标准输入中读取日志信息"
4333
4334 -#: builtin/commit.c:706
4334 +#: builtin/commit.c:708
4335 #, c-format
4336 msgid "could not read log file '%s'"
4337 msgstr "不能读取日志文件 '%s'"
4338
4339 -#: builtin/commit.c:728
4339 +#: builtin/commit.c:730
4340 msgid "could not read MERGE_MSG"
4341 msgstr "不能读取 MERGE_MSG"
4342
4343 -#: builtin/commit.c:732
4343 +#: builtin/commit.c:734
4344 msgid "could not read SQUASH_MSG"
4345 msgstr "不能读取 SQUASH_MSG"
4346
4347 -#: builtin/commit.c:736
4347 +#: builtin/commit.c:738
4348 #, c-format
4349 msgid "could not read '%s'"
4350 msgstr "不能读取 '%s'"
4351
4352 -#: builtin/commit.c:783
4352 +#: builtin/commit.c:785
4353 msgid "could not write commit template"
4354 msgstr "不能写提交模版"
4355
4356 -#: builtin/commit.c:801
4356 +#: builtin/commit.c:803
4357 #, c-format
4358 msgid ""
4359 "\n"
@@ -4367,7 +4367,7 @@ msgstr ""
4367 "\t%s\n"
4368 "然后重试。\n"
4369
4370 -#: builtin/commit.c:806
4370 +#: builtin/commit.c:808
4371 #, c-format
4372 msgid ""
4373 "\n"
@@ -4381,7 +4381,7 @@ msgstr ""
4381 "\t%s\n"
4382 "然后重试。\n"
4383
4384 -#: builtin/commit.c:819
4384 +#: builtin/commit.c:821
4385 #, c-format
4386 msgid ""
4387 "Please enter the commit message for your changes. Lines starting\n"
@@ -4390,7 +4390,7 @@ msgstr ""
4390 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n"
4391 "说明将会终止提交。\n"
4392
4393 -#: builtin/commit.c:826
4393 +#: builtin/commit.c:828
4394 #, c-format
4395 msgid ""
4396 "Please enter the commit message for your changes. Lines starting\n"
@@ -4401,353 +4401,353 @@ msgstr ""
4401 "也可以删除它们。一个空的提交说明将会终止提交。\n"
4402
4403 # 译者：为保证在输出中对齐，注意调整句中空格！
4404 -#: builtin/commit.c:846
4404 +#: builtin/commit.c:848
4405 #, c-format
4406 msgid "%sAuthor: %.*s <%.*s>"
4407 msgstr "%s作者： %.*s <%.*s>"
4408
4409 # 译者：为保证在输出中对齐，注意调整句中空格！
4410 -#: builtin/commit.c:854
4410 +#: builtin/commit.c:856
4411 #, c-format
4412 msgid "%sDate: %s"
4413 msgstr "%s日期： %s"
4414
4415 # 译者：为保证在输出中对齐，注意调整句中空格！
4416 -#: builtin/commit.c:861
4416 +#: builtin/commit.c:863
4417 #, c-format
4418 msgid "%sCommitter: %.*s <%.*s>"
4419 msgstr "%s提交者：%.*s <%.*s>"
4420
4421 -#: builtin/commit.c:879
4421 +#: builtin/commit.c:881
4422 msgid "Cannot read index"
4423 msgstr "无法读取索引"
4424
4425 -#: builtin/commit.c:936
4425 +#: builtin/commit.c:938
4426 msgid "Error building trees"
4427 msgstr "无法创建树对象"
4428
4429 -#: builtin/commit.c:951 builtin/tag.c:495
4429 +#: builtin/commit.c:953 builtin/tag.c:495
4430 #, c-format
4431 msgid "Please supply the message using either -m or -F option.\n"
4432 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
4433
4434 -#: builtin/commit.c:1053
4434 +#: builtin/commit.c:1055
4435 #, c-format
4436 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
4437 msgstr "--author '%s' 不是 'Name <email>' 格式，且未能在现有作者中找到匹配"
4438
4439 -#: builtin/commit.c:1068 builtin/commit.c:1308
4439 +#: builtin/commit.c:1070 builtin/commit.c:1310
4440 #, c-format
4441 msgid "Invalid untracked files mode '%s'"
4442 msgstr "无效的未追踪文件参数 '%s'"
4443
4444 -#: builtin/commit.c:1105
4444 +#: builtin/commit.c:1107
4445 msgid "--long and -z are incompatible"
4446 msgstr "--long 和 -z 选项不兼容"
4447
4448 -#: builtin/commit.c:1135
4448 +#: builtin/commit.c:1137
4449 msgid "Using both --reset-author and --author does not make sense"
4450 msgstr "同时使用 --reset-author 和 --author 没有意义"
4451
4452 -#: builtin/commit.c:1144
4452 +#: builtin/commit.c:1146
4453 msgid "You have nothing to amend."
4454 msgstr "您没有可修补的提交。"
4455
4456 -#: builtin/commit.c:1147
4456 +#: builtin/commit.c:1149
4457 msgid "You are in the middle of a merge -- cannot amend."
4458 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
4459
4460 -#: builtin/commit.c:1149
4460 +#: builtin/commit.c:1151
4461 msgid "You are in the middle of a cherry-pick -- cannot amend."
4462 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
4463
4464 -#: builtin/commit.c:1152
4464 +#: builtin/commit.c:1154
4465 msgid "Options --squash and --fixup cannot be used together"
4466 msgstr "选项 --squash 和 --fixup 不能同时使用"
4467
4468 -#: builtin/commit.c:1162
4468 +#: builtin/commit.c:1164
4469 msgid "Only one of -c/-C/-F/--fixup can be used."
4470 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
4471
4472 -#: builtin/commit.c:1164
4472 +#: builtin/commit.c:1166
4473 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
4474 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
4475
4476 -#: builtin/commit.c:1172
4476 +#: builtin/commit.c:1174
4477 msgid "--reset-author can be used only with -C, -c or --amend."
4478 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
4479
4480 -#: builtin/commit.c:1189
4480 +#: builtin/commit.c:1191
4481 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
4482 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
4483
4484 -#: builtin/commit.c:1191
4484 +#: builtin/commit.c:1193
4485 msgid "No paths with --include/--only does not make sense."
4486 msgstr "参数 --include/--only 不跟路径没有意义。"
4487
4488 -#: builtin/commit.c:1193
4488 +#: builtin/commit.c:1195
4489 msgid "Clever... amending the last one with dirty index."
4490 msgstr "聪明... 在索引不干净下修补最后的提交。"
4491
4492 -#: builtin/commit.c:1195
4492 +#: builtin/commit.c:1197
4493 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
4494 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项，认为是 --only paths..."
4495
4496 -#: builtin/commit.c:1207 builtin/tag.c:728
4496 +#: builtin/commit.c:1209 builtin/tag.c:728
4497 #, c-format
4498 msgid "Invalid cleanup mode %s"
4499 msgstr "无效的清理模式 %s"
4500
4501 -#: builtin/commit.c:1212
4501 +#: builtin/commit.c:1214
4502 msgid "Paths with -a does not make sense."
4503 msgstr "路径和 -a 选项同时使用没有意义。"
4504
4505 -#: builtin/commit.c:1322 builtin/commit.c:1602
4505 +#: builtin/commit.c:1324 builtin/commit.c:1604
4506 msgid "show status concisely"
4507 msgstr "以简洁的格式显示状态"
4508
4509 -#: builtin/commit.c:1324 builtin/commit.c:1604
4509 +#: builtin/commit.c:1326 builtin/commit.c:1606
4510 msgid "show branch information"
4511 msgstr "显示分支信息"
4512
4513 -#: builtin/commit.c:1326 builtin/commit.c:1606 builtin/push.c:509
4513 +#: builtin/commit.c:1328 builtin/commit.c:1608 builtin/push.c:509
4514 msgid "machine-readable output"
4515 msgstr "机器可读的输出"
4516
4517 -#: builtin/commit.c:1329 builtin/commit.c:1608
4517 +#: builtin/commit.c:1331 builtin/commit.c:1610
4518 msgid "show status in long format (default)"
4519 msgstr "以长格式显示状态（默认）"
4520
4521 -#: builtin/commit.c:1332 builtin/commit.c:1611
4521 +#: builtin/commit.c:1334 builtin/commit.c:1613
4522 msgid "terminate entries with NUL"
4523 msgstr "条目以NUL字符结尾"
4524
4525 -#: builtin/commit.c:1334 builtin/commit.c:1614 builtin/fast-export.c:980
4525 +#: builtin/commit.c:1336 builtin/commit.c:1616 builtin/fast-export.c:980
4526 #: builtin/fast-export.c:983 builtin/tag.c:603
4527 msgid "mode"
4528 msgstr "模式"
4529
4530 -#: builtin/commit.c:1335 builtin/commit.c:1614
4530 +#: builtin/commit.c:1337 builtin/commit.c:1616
4531 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
4532 msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"
4533
4534 -#: builtin/commit.c:1338
4534 +#: builtin/commit.c:1340
4535 msgid "show ignored files"
4536 msgstr "显示忽略的文件"
4537
4538 -#: builtin/commit.c:1339 parse-options.h:153
4538 +#: builtin/commit.c:1341 parse-options.h:153
4539 msgid "when"
4540 msgstr "何时"
4541
4542 -#: builtin/commit.c:1340
4542 +#: builtin/commit.c:1342
4543 msgid ""
4544 "ignore changes to submodules, optional when: all, dirty, untracked. "
4545 "(Default: all)"
4546 msgstr ""
4547 "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"
4548
4549 -#: builtin/commit.c:1342
4549 +#: builtin/commit.c:1344
4550 msgid "list untracked files in columns"
4551 msgstr "以列的方式显示未跟踪的文件"
4552
4553 -#: builtin/commit.c:1429
4553 +#: builtin/commit.c:1431
4554 msgid "couldn't look up newly created commit"
4555 msgstr "无法找到新创建的提交"
4556
4557 -#: builtin/commit.c:1431
4557 +#: builtin/commit.c:1433
4558 msgid "could not parse newly created commit"
4559 msgstr "不能解析新创建的提交"
4560
4561 -#: builtin/commit.c:1476
4561 +#: builtin/commit.c:1478
4562 msgid "detached HEAD"
4563 msgstr "分离头指针"
4564
4565 # 译者：中文字符串拼接，可删除前导空格
4566 -#: builtin/commit.c:1479
4566 +#: builtin/commit.c:1481
4567 msgid " (root-commit)"
4568 msgstr "（根提交）"
4569
4570 -#: builtin/commit.c:1572
4570 +#: builtin/commit.c:1574
4571 msgid "suppress summary after successful commit"
4572 msgstr "提交成功后不显示概述信息"
4573
4574 -#: builtin/commit.c:1573
4574 +#: builtin/commit.c:1575
4575 msgid "show diff in commit message template"
4576 msgstr "在提交说明模板里显示差异"
4577
4578 -#: builtin/commit.c:1575
4578 +#: builtin/commit.c:1577
4579 msgid "Commit message options"
4580 msgstr "提交说明选项"
4581
4582 -#: builtin/commit.c:1576 builtin/tag.c:601
4582 +#: builtin/commit.c:1578 builtin/tag.c:601
4583 msgid "read message from file"
4584 msgstr "从文件中读取提交说明"
4585
4586 -#: builtin/commit.c:1577
4586 +#: builtin/commit.c:1579
4587 msgid "author"
4588 msgstr "作者"
4589
4590 -#: builtin/commit.c:1577
4590 +#: builtin/commit.c:1579
4591 msgid "override author for commit"
4592 msgstr "提交时覆盖作者"
4593
4594 -#: builtin/commit.c:1578 builtin/gc.c:275
4594 +#: builtin/commit.c:1580 builtin/gc.c:275
4595 msgid "date"
4596 msgstr "日期"
4597
4598 -#: builtin/commit.c:1578
4598 +#: builtin/commit.c:1580
4599 msgid "override date for commit"
4600 msgstr "提交时覆盖日期"
4601
4602 -#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:391
4602 +#: builtin/commit.c:1581 builtin/merge.c:218 builtin/notes.c:391
4603 #: builtin/notes.c:554 builtin/tag.c:599
4604 msgid "message"
4605 msgstr "说明"
4606
4607 -#: builtin/commit.c:1579
4607 +#: builtin/commit.c:1581
4608 msgid "commit message"
4609 msgstr "提交说明"
4610
4611 -#: builtin/commit.c:1580
4611 +#: builtin/commit.c:1582
4612 msgid "reuse and edit message from specified commit"
4613 msgstr "重用并编辑指定提交的提交说明"
4614
4615 -#: builtin/commit.c:1581
4615 +#: builtin/commit.c:1583
4616 msgid "reuse message from specified commit"
4617 msgstr "重用指定提交的提交说明"
4618
4619 -#: builtin/commit.c:1582
4619 +#: builtin/commit.c:1584
4620 msgid "use autosquash formatted message to fixup specified commit"
4621 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
4622
4623 -#: builtin/commit.c:1583
4623 +#: builtin/commit.c:1585
4624 msgid "use autosquash formatted message to squash specified commit"
4625 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
4626
4627 -#: builtin/commit.c:1584
4627 +#: builtin/commit.c:1586
4628 msgid "the commit is authored by me now (used with -C/-c/--amend)"
4629 msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"
4630
4631 -#: builtin/commit.c:1585 builtin/log.c:1191 builtin/revert.c:86
4631 +#: builtin/commit.c:1587 builtin/log.c:1191 builtin/revert.c:86
4632 msgid "add Signed-off-by:"
4633 msgstr "添加 Signed-off-by: 签名"
4634
4635 -#: builtin/commit.c:1586
4635 +#: builtin/commit.c:1588
4636 msgid "use specified template file"
4637 msgstr "使用指定的模板文件"
4638
4639 -#: builtin/commit.c:1587
4639 +#: builtin/commit.c:1589
4640 msgid "force edit of commit"
4641 msgstr "强制编辑提交"
4642
4643 # 译者：可选值，不能翻译（或是原文中笔误，应为 mode）
4644 -#: builtin/commit.c:1588
4644 +#: builtin/commit.c:1590
4645 msgid "default"
4646 msgstr "default"
4647
4648 -#: builtin/commit.c:1588 builtin/tag.c:604
4648 +#: builtin/commit.c:1590 builtin/tag.c:604
4649 msgid "how to strip spaces and #comments from message"
4650 msgstr "设置如何删除提交说明里的空格和#注释"
4651
4652 -#: builtin/commit.c:1589
4652 +#: builtin/commit.c:1591
4653 msgid "include status in commit message template"
4654 msgstr "在提交说明模板里包含状态信息"
4655
4656 -#: builtin/commit.c:1590 builtin/merge.c:225 builtin/revert.c:92
4656 +#: builtin/commit.c:1592 builtin/merge.c:225 builtin/revert.c:92
4657 #: builtin/tag.c:605
4658 msgid "key-id"
4659 msgstr "key-id"
4660
4661 -#: builtin/commit.c:1591 builtin/merge.c:226 builtin/revert.c:93
4661 +#: builtin/commit.c:1593 builtin/merge.c:226 builtin/revert.c:93
4662 msgid "GPG sign commit"
4663 msgstr "GPG 提交签名"
4664
4665 -#: builtin/commit.c:1594
4665 +#: builtin/commit.c:1596
4666 msgid "Commit contents options"
4667 msgstr "提交内容选项"
4668
4669 -#: builtin/commit.c:1595
4669 +#: builtin/commit.c:1597
4670 msgid "commit all changed files"
4671 msgstr "提交所有改动的文件"
4672
4673 -#: builtin/commit.c:1596
4673 +#: builtin/commit.c:1598
4674 msgid "add specified files to index for commit"
4675 msgstr "添加指定的文件到索引区等待提交"
4676
4677 -#: builtin/commit.c:1597
4677 +#: builtin/commit.c:1599
4678 msgid "interactively add files"
4679 msgstr "交互式添加文件"
4680
4681 -#: builtin/commit.c:1598
4681 +#: builtin/commit.c:1600
4682 msgid "interactively add changes"
4683 msgstr "交互式添加变更"
4684
4685 -#: builtin/commit.c:1599
4685 +#: builtin/commit.c:1601
4686 msgid "commit only specified files"
4687 msgstr "只提交指定的文件"
4688
4689 -#: builtin/commit.c:1600
4689 +#: builtin/commit.c:1602
4690 msgid "bypass pre-commit hook"
4691 msgstr "绕过 pre-commit 钩子"
4692
4693 -#: builtin/commit.c:1601
4693 +#: builtin/commit.c:1603
4694 msgid "show what would be committed"
4695 msgstr "显示将要提交的内容"
4696
4697 -#: builtin/commit.c:1612
4697 +#: builtin/commit.c:1614
4698 msgid "amend previous commit"
4699 msgstr "修改先前的提交"
4700
4701 -#: builtin/commit.c:1613
4701 +#: builtin/commit.c:1615
4702 msgid "bypass post-rewrite hook"
4703 msgstr "绕过 post-rewrite 钩子"
4704
4705 -#: builtin/commit.c:1618
4705 +#: builtin/commit.c:1620
4706 msgid "ok to record an empty change"
4707 msgstr "允许一个空提交"
4708
4709 -#: builtin/commit.c:1620
4709 +#: builtin/commit.c:1622
4710 msgid "ok to record a change with an empty message"
4711 msgstr "允许空的提交说明"
4712
4713 -#: builtin/commit.c:1649
4713 +#: builtin/commit.c:1651
4714 msgid "could not parse HEAD commit"
4715 msgstr "不能解析 HEAD 提交"
4716
4717 -#: builtin/commit.c:1688 builtin/merge.c:519
4717 +#: builtin/commit.c:1690 builtin/merge.c:519
4718 #, c-format
4719 msgid "could not open '%s' for reading"
4720 msgstr "不能为读入打开 '%s'"
4721
4722 -#: builtin/commit.c:1695
4722 +#: builtin/commit.c:1697
4723 #, c-format
4724 msgid "Corrupt MERGE_HEAD file (%s)"
4725 msgstr "损坏的 MERGE_HEAD 文件（%s）"
4726
4727 -#: builtin/commit.c:1702
4727 +#: builtin/commit.c:1704
4728 msgid "could not read MERGE_MODE"
4729 msgstr "不能读取 MERGE_MODE"
4730
4731 -#: builtin/commit.c:1721
4731 +#: builtin/commit.c:1723
4732 #, c-format
4733 msgid "could not read commit message: %s"
4734 msgstr "不能读取提交说明：%s"
4735
4736 -#: builtin/commit.c:1732
4736 +#: builtin/commit.c:1734
4737 #, c-format
4738 msgid "Aborting commit; you did not edit the message.\n"
4739 msgstr "终止提交；您未更改来自模版的提交说明。\n"
4740
4741 -#: builtin/commit.c:1737
4741 +#: builtin/commit.c:1739
4742 #, c-format
4743 msgid "Aborting commit due to empty commit message.\n"
4744 msgstr "终止提交因为提交说明为空。\n"
4745
4746 -#: builtin/commit.c:1752 builtin/merge.c:851 builtin/merge.c:876
4746 +#: builtin/commit.c:1754 builtin/merge.c:851 builtin/merge.c:876
4747 msgid "failed to write commit object"
4748 msgstr "无法写提交对象"
4749
4750 -#: builtin/commit.c:1785
4750 +#: builtin/commit.c:1787
4751 msgid ""
4752 "Repository has been updated, but unable to write\n"
4753 "new_index file. Check that disk is not full and quota is\n"
@@ -9770,115 +9770,115 @@ msgstr "展开对象中"
9770 msgid "git update-index [<options>] [--] [<file>...]"
9771 msgstr "git update-index [<选项>] [--] [<文件>...]"
9772
9773 -#: builtin/update-index.c:756
9773 +#: builtin/update-index.c:757
9774 msgid "continue refresh even when index needs update"
9775 msgstr "当索引需要更新时继续刷新"
9776
9777 -#: builtin/update-index.c:759
9777 +#: builtin/update-index.c:760
9778 msgid "refresh: ignore submodules"
9779 msgstr "刷新：忽略子模组"
9780
9781 -#: builtin/update-index.c:762
9781 +#: builtin/update-index.c:763
9782 msgid "do not ignore new files"
9783 msgstr "不忽略新的文件"
9784
9785 -#: builtin/update-index.c:764
9785 +#: builtin/update-index.c:765
9786 msgid "let files replace directories and vice-versa"
9787 msgstr "让文件替换目录（反之亦然）"
9788
9789 -#: builtin/update-index.c:766
9789 +#: builtin/update-index.c:767
9790 msgid "notice files missing from worktree"
9791 msgstr "通知文件从工作区丢失"
9792
9793 -#: builtin/update-index.c:768
9793 +#: builtin/update-index.c:769
9794 msgid "refresh even if index contains unmerged entries"
9795 msgstr "即使索引区包含未合并的条目也执行刷新"
9796
9797 -#: builtin/update-index.c:771
9797 +#: builtin/update-index.c:772
9798 msgid "refresh stat information"
9799 msgstr "刷新统计信息"
9800
9801 -#: builtin/update-index.c:775
9801 +#: builtin/update-index.c:776
9802 msgid "like --refresh, but ignore assume-unchanged setting"
9803 msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置"
9804
9805 -#: builtin/update-index.c:779
9805 +#: builtin/update-index.c:780
9806 msgid "<mode>,<object>,<path>"
9807 msgstr "<存取模式>,<对象>,<路径>"
9808
9809 -#: builtin/update-index.c:780
9809 +#: builtin/update-index.c:781
9810 msgid "add the specified entry to the index"
9811 msgstr "添加指定的条目到索引区"
9812
9813 -#: builtin/update-index.c:784
9813 +#: builtin/update-index.c:785
9814 msgid "(+/-)x"
9815 msgstr "(+/-)x"
9816
9817 -#: builtin/update-index.c:785
9817 +#: builtin/update-index.c:786
9818 msgid "override the executable bit of the listed files"
9819 msgstr "覆盖列表里文件的可执行位"
9820
9821 -#: builtin/update-index.c:789
9821 +#: builtin/update-index.c:790
9822 msgid "mark files as \"not changing\""
9823 msgstr "把文件标记为 \"没有变更\""
9824
9825 -#: builtin/update-index.c:792
9825 +#: builtin/update-index.c:793
9826 msgid "clear assumed-unchanged bit"
9827 msgstr "清除 assumed-unchanged 位"
9828
9829 -#: builtin/update-index.c:795
9829 +#: builtin/update-index.c:796
9830 msgid "mark files as \"index-only\""
9831 msgstr "把文件标记为 \"仅索引\""
9832
9833 -#: builtin/update-index.c:798
9833 +#: builtin/update-index.c:799
9834 msgid "clear skip-worktree bit"
9835 msgstr "清除 skip-worktree 位"
9836
9837 -#: builtin/update-index.c:801
9837 +#: builtin/update-index.c:802
9838 msgid "add to index only; do not add content to object database"
9839 msgstr "只添加到索引区；不添加对象到对象库"
9840
9841 -#: builtin/update-index.c:803
9841 +#: builtin/update-index.c:804
9842 msgid "remove named paths even if present in worktree"
9843 msgstr "即使存在工作区里，也删除路径"
9844
9845 -#: builtin/update-index.c:805
9845 +#: builtin/update-index.c:806
9846 msgid "with --stdin: input lines are terminated by null bytes"
9847 msgstr "携带 --stdin：输入的行以 null 字符终止"
9848
9849 -#: builtin/update-index.c:807
9849 +#: builtin/update-index.c:808
9850 msgid "read list of paths to be updated from standard input"
9851 msgstr "从标准输入中读取需要更新的路径列表"
9852
9853 -#: builtin/update-index.c:811
9853 +#: builtin/update-index.c:812
9854 msgid "add entries from standard input to the index"
9855 msgstr "从标准输入添加条目到索引区"
9856
9857 -#: builtin/update-index.c:815
9857 +#: builtin/update-index.c:816
9858 msgid "repopulate stages #2 and #3 for the listed paths"
9859 msgstr "为指定文件重新生成第2和第3暂存区"
9860
9861 -#: builtin/update-index.c:819
9861 +#: builtin/update-index.c:820
9862 msgid "only update entries that differ from HEAD"
9863 msgstr "只更新与 HEAD 不同的条目"
9864
9865 -#: builtin/update-index.c:823
9865 +#: builtin/update-index.c:824
9866 msgid "ignore files missing from worktree"
9867 msgstr "忽略工作区丢失的文件"
9868
9869 -#: builtin/update-index.c:826
9869 +#: builtin/update-index.c:827
9870 msgid "report actions to standard output"
9871 msgstr "在标准输出显示操作"
9872
9873 -#: builtin/update-index.c:828
9873 +#: builtin/update-index.c:829
9874 msgid "(for porcelains) forget saved unresolved conflicts"
9875 msgstr "(for porcelains) 忘记保存的未解决的冲突"
9876
9877 -#: builtin/update-index.c:832
9877 +#: builtin/update-index.c:833
9878 msgid "write index in this format"
9879 msgstr "以这种格式写入索引区"
9880
9881 -#: builtin/update-index.c:834
9881 +#: builtin/update-index.c:835
9882 msgid "enable or disable split index"
9883 msgstr "启用或禁用索引拆分"
9884