03ea3327da · matheusbsbs/matheus-bagliano

@@ -134,8 +134,8 @@ msgid ""

134 msgstr ""

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

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

137 -"POT-Creation-Date: 2015-09-05 09:16+0800\n"

138 -"PO-Revision-Date: 2015-09-08 23:00+0800\n"

137 +"POT-Creation-Date: 2015-09-15 06:45+0800\n"

138 +"PO-Revision-Date: 2015-09-15 21:49+0800\n"

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

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

141 "Language: zh_CN\n"

@@ -464,8 +464,8 @@ msgstr "index-pack 终止"

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

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

466

467 -#: commit.c:40 builtin/am.c:451 builtin/am.c:487 builtin/am.c:1489

468 -#: builtin/am.c:2101

467 +#: commit.c:40 builtin/am.c:451 builtin/am.c:487 builtin/am.c:1516

468 +#: builtin/am.c:2128

469 #, c-format

470 msgid "could not parse %s"

471 msgstr "不能解析 %s"

@@ -785,7 +785,7 @@ msgstr "%s：%s - %s"

785 msgid "failed to read the cache"

786 msgstr "无法读取缓存"

787

788 -#: merge.c:94 builtin/am.c:1974 builtin/am.c:2009 builtin/checkout.c:375

788 +#: merge.c:94 builtin/am.c:2001 builtin/am.c:2036 builtin/checkout.c:375

789 #: builtin/checkout.c:586 builtin/clone.c:715

790 msgid "unable to write new index file"

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

@@ -2410,7 +2410,7 @@ msgstr "无法写入新索引文件"

2410 msgid "could not stat %s"

2411 msgstr "不能获取 %s 的文件状态"

2412

2413 -#: builtin/am.c:270 builtin/am.c:1318 builtin/commit.c:737

2413 +#: builtin/am.c:270 builtin/am.c:1345 builtin/commit.c:737

2414 #: builtin/merge.c:1079

2415 #, c-format

2416 msgid "could not read '%s'"

@@ -2502,29 +2502,29 @@ msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。"

2502 msgid "To restore the original branch and stop patching, run \"%s --abort\"."

2503 msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。"

2504

2505 -#: builtin/am.c:1312

2505 +#: builtin/am.c:1339

2506 msgid "Patch is empty. Was it split wrong?"

2507 msgstr "补丁为空。是不是切分错误？"

2508

2509 -#: builtin/am.c:1386 builtin/log.c:1345

2509 +#: builtin/am.c:1413 builtin/log.c:1345

2510 #, c-format

2511 msgid "invalid ident line: %s"

2512 msgstr "包含无效的身份标识：%s"

2513

2514 -#: builtin/am.c:1413

2514 +#: builtin/am.c:1440

2515 #, c-format

2516 msgid "unable to parse commit %s"

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

2518

2519 -#: builtin/am.c:1587

2519 +#: builtin/am.c:1614

2520 msgid "Repository lacks necessary blobs to fall back on 3-way merge."

2521 msgstr "仓库缺乏必要的数据对象以进行三方合并。"

2522

2523 -#: builtin/am.c:1589

2523 +#: builtin/am.c:1616

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

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

2526

2527 -#: builtin/am.c:1608

2527 +#: builtin/am.c:1635

2528 msgid ""

2529 "Did you hand edit your patch?\n"

2530 "It does not apply to blobs recorded in its index."

@@ -2532,37 +2532,37 @@ msgstr ""

2532 "您是否曾手动编辑过您的补丁？\n"

2533 "无法应用补丁到索引中的数据对象上。"

2534

2535 -#: builtin/am.c:1614

2535 +#: builtin/am.c:1641

2536 msgid "Falling back to patching base and 3-way merge..."

2537 msgstr "回落到基础版本上打补丁及进行三方合并..."

2538

2539 -#: builtin/am.c:1639

2539 +#: builtin/am.c:1666

2540 msgid "Failed to merge in the changes."

2541 msgstr "无法合并变更。"

2542

2543 -#: builtin/am.c:1664 builtin/merge.c:632

2543 +#: builtin/am.c:1691 builtin/merge.c:632

2544 msgid "git write-tree failed to write a tree"

2545 msgstr "git write-tree 无法写入一树对象"

2546

2547 -#: builtin/am.c:1671

2547 +#: builtin/am.c:1698

2548 msgid "applying to an empty history"

2549 msgstr "正应用到一个空历史上"

2550

2551 -#: builtin/am.c:1684 builtin/commit.c:1752 builtin/merge.c:829

2551 +#: builtin/am.c:1711 builtin/commit.c:1752 builtin/merge.c:829

2552 #: builtin/merge.c:854

2553 msgid "failed to write commit object"

2554 msgstr "无法写提交对象"

2555

2556 -#: builtin/am.c:1716 builtin/am.c:1720

2556 +#: builtin/am.c:1743 builtin/am.c:1747

2557 #, c-format

2558 msgid "cannot resume: %s does not exist."

2559 msgstr "无法继续：%s 不存在。"

2560

2561 -#: builtin/am.c:1736

2561 +#: builtin/am.c:1763

2562 msgid "cannot be interactive without stdin connected to a terminal."

2563 msgstr "标准输入没有和终端关联，不能进行交互式操作。"

2564

2565 -#: builtin/am.c:1741

2565 +#: builtin/am.c:1768

2566 msgid "Commit Body is:"

2567 msgstr "提交内容为："

2568

@@ -2571,35 +2571,35 @@ msgstr "提交内容为："

2571 #. in your translation. The program will only accept English

2572 #. input at this point.

2573 #.

2574 -#: builtin/am.c:1751

2574 +#: builtin/am.c:1778

2575 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "

2576 msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]："

2577

2578 -#: builtin/am.c:1801

2578 +#: builtin/am.c:1828

2579 #, c-format

2580 msgid "Dirty index: cannot apply patches (dirty: %s)"

2581 msgstr "脏索引：不能应用补丁（脏文件：%s）"

2582

2583 -#: builtin/am.c:1836 builtin/am.c:1907

2583 +#: builtin/am.c:1863 builtin/am.c:1934

2584 #, c-format

2585 msgid "Applying: %.*s"

2586 msgstr "应用：%.*s"

2587

2588 -#: builtin/am.c:1852

2588 +#: builtin/am.c:1879

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

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

2591

2592 -#: builtin/am.c:1860

2592 +#: builtin/am.c:1887

2593 #, c-format

2594 msgid "Patch failed at %s %.*s"

2595 msgstr "打补丁失败于 %s %.*s"

2596

2597 -#: builtin/am.c:1866

2597 +#: builtin/am.c:1893

2598 #, c-format

2599 msgid "The copy of the patch that failed is found in: %s"

2600 msgstr "失败的补丁文件副本位于：%s"

2601

2602 -#: builtin/am.c:1910

2602 +#: builtin/am.c:1937

2603 msgid ""

2604 "No changes - did you forget to use 'git add'?\n"

2605 "If there is nothing left to stage, chances are that something else\n"

@@ -2609,7 +2609,7 @@ msgstr ""

2609 "如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"

2610 "您也许想要跳过这个补丁。"

2611

2612 -#: builtin/am.c:1917

2612 +#: builtin/am.c:1944

2613 msgid ""

2614 "You still have unmerged paths in your index.\n"

2615 "Did you forget to use 'git add'?"

@@ -2617,105 +2617,105 @@ msgstr ""

2617 "您的索引中仍有未合并的路径。\n"

2618 "您是否忘了执行 'git add'？"

2619

2620 -#: builtin/am.c:2025 builtin/am.c:2029 builtin/am.c:2041 builtin/reset.c:308

2620 +#: builtin/am.c:2052 builtin/am.c:2056 builtin/am.c:2068 builtin/reset.c:308

2621 #: builtin/reset.c:316

2622 #, c-format

2623 msgid "Could not parse object '%s'."

2624 msgstr "不能解析对象 '%s'。"

2625

2626 -#: builtin/am.c:2077

2626 +#: builtin/am.c:2104

2627 msgid "failed to clean index"

2628 msgstr "无法清空索引"

2629

2630 -#: builtin/am.c:2111

2630 +#: builtin/am.c:2138

2631 msgid ""

2632 "You seem to have moved HEAD since the last 'am' failure.\n"

2633 "Not rewinding to ORIG_HEAD"

2634 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"

2635

2636 -#: builtin/am.c:2172

2636 +#: builtin/am.c:2199

2637 #, c-format

2638 msgid "Invalid value for --patch-format: %s"

2639 msgstr "无效的 --patch-format 值：%s"

2640

2641 -#: builtin/am.c:2194

2641 +#: builtin/am.c:2221

2642 msgid "git am [options] [(<mbox>|<Maildir>)...]"

2643 msgstr "git am [选项] [(<mbox>|<Maildir>)...]"

2644

2645 -#: builtin/am.c:2195

2645 +#: builtin/am.c:2222

2646 msgid "git am [options] (--continue | --skip | --abort)"

2647 msgstr "git am [选项] (--continue | --skip | --abort)"

2648

2649 -#: builtin/am.c:2201

2649 +#: builtin/am.c:2228

2650 msgid "run interactively"

2651 msgstr "以交互式方式运行"

2652

2653 -#: builtin/am.c:2203

2653 +#: builtin/am.c:2230

2654 msgid "historical option -- no-op"

2655 msgstr "老的参数 —— 无作用"

2656

2657 -#: builtin/am.c:2205

2657 +#: builtin/am.c:2232

2658 msgid "allow fall back on 3way merging if needed"

2659 msgstr "如果必要，允许使用三方合并。"

2660

2661 -#: builtin/am.c:2206 builtin/init-db.c:509 builtin/prune-packed.c:57

2661 +#: builtin/am.c:2233 builtin/init-db.c:509 builtin/prune-packed.c:57

2662 #: builtin/repack.c:171

2663 msgid "be quiet"

2664 msgstr "静默模式"

2665

2666 -#: builtin/am.c:2208

2666 +#: builtin/am.c:2235

2667 msgid "add a Signed-off-by line to the commit message"

2668 msgstr "在提交说明中添加一个 Signed-off-by 签名"

2669

2670 -#: builtin/am.c:2211

2670 +#: builtin/am.c:2238

2671 msgid "recode into utf8 (default)"

2672 msgstr "使用 utf8 字符集（默认）"

2673

2674 -#: builtin/am.c:2213

2674 +#: builtin/am.c:2240

2675 msgid "pass -k flag to git-mailinfo"

2676 msgstr "向 git-mailinfo 传递 -k 参数"

2677

2678 -#: builtin/am.c:2215

2678 +#: builtin/am.c:2242

2679 msgid "pass -b flag to git-mailinfo"

2680 msgstr "向 git-mailinfo 传递 -b 参数"

2681

2682 -#: builtin/am.c:2217

2682 +#: builtin/am.c:2244

2683 msgid "pass -m flag to git-mailinfo"

2684 msgstr "向 git-mailinfo 传递 -m 参数"

2685

2686 -#: builtin/am.c:2219

2686 +#: builtin/am.c:2246

2687 msgid "pass --keep-cr flag to git-mailsplit for mbox format"

2688 msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数"

2689

2690 -#: builtin/am.c:2222

2690 +#: builtin/am.c:2249

2691 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"

2692 msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置"

2693

2694 -#: builtin/am.c:2225

2694 +#: builtin/am.c:2252

2695 msgid "strip everything before a scissors line"

2696 msgstr "丢弃裁切线前的所有内容"

2697

2698 -#: builtin/am.c:2226 builtin/apply.c:4563

2698 +#: builtin/am.c:2253 builtin/apply.c:4563

2699 msgid "action"

2700 msgstr "动作"

2701

2702 -#: builtin/am.c:2227 builtin/am.c:2230 builtin/am.c:2233 builtin/am.c:2236

2703 -#: builtin/am.c:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248

2704 -#: builtin/am.c:2254

2702 +#: builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263

2703 +#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275

2704 +#: builtin/am.c:2281

2705 msgid "pass it through git-apply"

2706 msgstr "传递给 git-apply"

2707

2708 -#: builtin/am.c:2235 builtin/apply.c:4587

2708 +#: builtin/am.c:2262 builtin/apply.c:4587

2709 msgid "root"

2710 msgstr "根目录"

2711

2712 -#: builtin/am.c:2238 builtin/am.c:2241 builtin/apply.c:4525

2712 +#: builtin/am.c:2265 builtin/am.c:2268 builtin/apply.c:4525

2713 #: builtin/apply.c:4528 builtin/clone.c:85 builtin/fetch.c:93

2714 #: builtin/pull.c:167

2715 msgid "path"

2716 msgstr "路径"

2717

2718 -#: builtin/am.c:2244 builtin/fmt-merge-msg.c:669 builtin/fmt-merge-msg.c:672

2718 +#: builtin/am.c:2271 builtin/fmt-merge-msg.c:669 builtin/fmt-merge-msg.c:672

2719 #: builtin/grep.c:698 builtin/merge.c:198 builtin/pull.c:127

2720 #: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:664

2721 #: builtin/show-ref.c:180 builtin/tag.c:591 parse-options.h:132

@@ -2723,60 +2723,60 @@ msgstr "路径"

2723 msgid "n"

2724 msgstr "n"

2725

2726 -#: builtin/am.c:2247 builtin/apply.c:4531

2726 +#: builtin/am.c:2274 builtin/apply.c:4531

2727 msgid "num"

2728 msgstr "数字"

2729

2730 -#: builtin/am.c:2250 builtin/for-each-ref.c:34 builtin/replace.c:438

2730 +#: builtin/am.c:2277 builtin/for-each-ref.c:34 builtin/replace.c:438

2731 msgid "format"

2732 msgstr "格式"

2733

2734 -#: builtin/am.c:2251

2734 +#: builtin/am.c:2278

2735 msgid "format the patch(es) are in"

2736 msgstr "补丁的格式"

2737

2738 -#: builtin/am.c:2257

2738 +#: builtin/am.c:2284

2739 msgid "override error message when patch failure occurs"

2740 msgstr "打补丁失败时显示的错误信息"

2741

2742 -#: builtin/am.c:2259

2742 +#: builtin/am.c:2286

2743 msgid "continue applying patches after resolving a conflict"

2744 msgstr "冲突解决后继续应用补丁"

2745

2746 -#: builtin/am.c:2262

2746 +#: builtin/am.c:2289

2747 msgid "synonyms for --continue"

2748 msgstr "和 --continue 同义"

2749

2750 -#: builtin/am.c:2265

2750 +#: builtin/am.c:2292

2751 msgid "skip the current patch"

2752 msgstr "跳过当前补丁"

2753

2754 -#: builtin/am.c:2268

2754 +#: builtin/am.c:2295

2755 msgid "restore the original branch and abort the patching operation."

2756 msgstr "恢复原始分支并终止打补丁操作。"

2757

2758 -#: builtin/am.c:2272

2758 +#: builtin/am.c:2299

2759 msgid "lie about committer date"

2760 msgstr "将作者日期作为提交日期"

2761

2762 -#: builtin/am.c:2274

2762 +#: builtin/am.c:2301

2763 msgid "use current timestamp for author date"

2764 msgstr "用当前时间作为作者日期"

2765

2766 -#: builtin/am.c:2276 builtin/commit.c:1590 builtin/merge.c:225

2766 +#: builtin/am.c:2303 builtin/commit.c:1590 builtin/merge.c:225

2767 #: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:606

2768 msgid "key-id"

2769 msgstr "key-id"

2770

2771 -#: builtin/am.c:2277

2771 +#: builtin/am.c:2304

2772 msgid "GPG-sign commits"

2773 msgstr "使用 GPG 签名提交"

2774

2775 -#: builtin/am.c:2280

2775 +#: builtin/am.c:2307

2776 msgid "(internal use for git-rebase)"

2777 msgstr "（内部使用，用于 git-rebase）"

2778

2779 -#: builtin/am.c:2295

2779 +#: builtin/am.c:2322

2780 msgid ""

2781 "The -b/--binary option has been a no-op for long time, and\n"

2782 "it will be removed. Please do not use it anymore."

@@ -2784,16 +2784,16 @@ msgstr ""

2784 "参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n"

2785 "请不要再使用它了。"

2786

2787 -#: builtin/am.c:2302

2787 +#: builtin/am.c:2329

2788 msgid "failed to read the index"

2789 msgstr "无法读取索引"

2790

2791 -#: builtin/am.c:2317

2791 +#: builtin/am.c:2344

2792 #, c-format

2793 msgid "previous rebase directory %s still exists but mbox given."

2794 msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。"

2795

2796 -#: builtin/am.c:2341

2796 +#: builtin/am.c:2368

2797 #, c-format

2798 msgid ""

2799 "Stray %s directory found.\n"

@@ -2802,7 +2802,7 @@ msgstr ""

2802 "发现了错误的 %s 目录。\n"

2803 "使用 \"git am --abort\" 删除它。"

2804

2805 -#: builtin/am.c:2347

2805 +#: builtin/am.c:2374

2806 msgid "Resolve operation not in progress, we are not resuming."

2807 msgstr "解决操作未进行，我们不会继续。"

2808

@@ -8612,10 +8612,6 @@ msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"

8612 msgid "Options related to merging"

8613 msgstr "和合并相关的选项"

8614

8615 -#: builtin/pull.c:115

8616 -msgid "false|true|preserve"

8617 -msgstr "false|true|preserve"

8618 -

8615 #: builtin/pull.c:116

8616 msgid "incorporate changes by rebasing rather than merging"

8617 msgstr "使用变基操作取代合并操作以合入修改"

@@ -10288,8 +10284,8 @@ msgstr ""

10284 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"

10285

10286 #: builtin/show-ref.c:11

10291 -msgid "git show-ref --exclude-existing[=pattern] < ref-list"

10292 -msgstr "git show-ref --exclude-existing[=模式] < 引用列表"

10287 +msgid "git show-ref --exclude-existing[=<pattern>] < <ref-list>"

10288 +msgstr "git show-ref --exclude-existing[=<模式>] < <引用列表>"

10289

10290 #: builtin/show-ref.c:170

10291 msgid "only show tags (can be combined with heads)"

@@ -10510,7 +10506,7 @@ msgid "replace the tag if exists"

10506 msgstr "如果存在，替换现有的标签"

10507

10508 #: builtin/tag.c:609 builtin/update-ref.c:368

10513 -msgid "create_reflog"

10509 +msgid "create a reflog"

10510 msgstr "创建引用日志"

10511

10512 #: builtin/tag.c:611

@@ -11795,6 +11791,9 @@ msgstr "无法递归进子模组路径 '$sm_path'"

11791 msgid "Synchronizing submodule url for '$displaypath'"

11792 msgstr "为 '$displaypath' 同步子模组 url"

11793

11794 +#~ msgid "false|true|preserve"

11795 +#~ msgstr "false|true|preserve"

11796 +

11797 #~ msgid "BUG: reopen a lockfile that is still open"

11798 #~ msgstr "BUG: 重新打开一个仍打开着的锁文件"

11799

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