2f64542f9c · matheusbsbs/matheus-bagliano

@@ -12,7 +12,7 @@ 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: 2012-04-28 20:33+0800\n"

15 +"POT-Creation-Date: 2012-05-08 15:45+0800\n"

16 "PO-Revision-Date: 2012-01-30 00:00+0800\n"

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

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

@@ -183,14 +183,14 @@ msgstr[0] ""

183 "您的分支和 '%s' 出现了偏离，\n"

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

185

186 -#: sequencer.c:120 builtin/merge.c:864 builtin/merge.c:985

187 -#: builtin/merge.c:1095 builtin/merge.c:1105

186 +#: sequencer.c:120 builtin/merge.c:865 builtin/merge.c:978

187 +#: builtin/merge.c:1088 builtin/merge.c:1098

188 #, c-format

189 msgid "Could not open '%s' for writing"

190 msgstr "不能为写入打开 '%s'"

191

192 -#: sequencer.c:122 builtin/merge.c:334 builtin/merge.c:867

193 -#: builtin/merge.c:1097 builtin/merge.c:1110

192 +#: sequencer.c:122 builtin/merge.c:333 builtin/merge.c:868

193 +#: builtin/merge.c:1090 builtin/merge.c:1103

194 #, c-format

195 msgid "Could not write to '%s'"

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

@@ -286,7 +286,7 @@ msgid "could not apply %s... %s"

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

287

288 #: sequencer.c:450 sequencer.c:909 builtin/log.c:288 builtin/log.c:713

289 -#: builtin/log.c:1329 builtin/log.c:1548 builtin/merge.c:348

289 +#: builtin/log.c:1329 builtin/log.c:1548 builtin/merge.c:347

290 #: builtin/shortlog.c:181

291 msgid "revision walk setup failed"

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

@@ -1018,7 +1018,7 @@ msgid "path '%s' is unmerged"

1018 msgstr "路径 '%s' 未合并"

1019

1020 #: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583

1021 -#: builtin/merge.c:811

1021 +#: builtin/merge.c:812

1022 msgid "unable to write new index file"

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

1024

@@ -1691,7 +1691,7 @@ msgstr "终止提交；您未更改来自模版的提交说明。\n"

1691 msgid "Aborting commit due to empty commit message.\n"

1692 msgstr "终止提交因为提交说明为空。\n"

1693

1694 -#: builtin/commit.c:1554 builtin/merge.c:935 builtin/merge.c:968

1694 +#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961

1695 msgid "failed to write commit object"

1696 msgstr "无法写提交对象"

1697

@@ -1834,69 +1834,73 @@ msgstr "提供了无法处理的对象 '%s'。"

1834 msgid "Couldn't find remote ref HEAD"

1835 msgstr "无法发现远程 HEAD 引用"

1836

1837 -#: builtin/fetch.c:252

1837 +#: builtin/fetch.c:253

1838 #, c-format

1839 msgid "object %s not found"

1840 msgstr "对象 %s 未发现"

1841

1842 -#: builtin/fetch.c:258

1842 +#: builtin/fetch.c:259

1843 msgid "[up to date]"

1844 msgstr "[最新]"

1845

1846 -#: builtin/fetch.c:272

1846 +#: builtin/fetch.c:273

1847 #, c-format

1848 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"

1849 msgstr "! %-*s %-*s -> %s （在当前分支下不能获取）"

1850

1851 -#: builtin/fetch.c:273 builtin/fetch.c:351

1851 +#: builtin/fetch.c:274 builtin/fetch.c:360

1852 msgid "[rejected]"

1853 msgstr "[已拒绝]"

1854

1855 -#: builtin/fetch.c:284

1855 +#: builtin/fetch.c:285

1856 msgid "[tag update]"

1857 msgstr "[tag更新]"

1858

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

1860 -#: builtin/fetch.c:286 builtin/fetch.c:313 builtin/fetch.c:331

1860 +#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340

1861 msgid " (unable to update local ref)"

1862 msgstr " （不能更新本地引用）"

1863

1864 -#: builtin/fetch.c:298

1864 +#: builtin/fetch.c:305

1865 msgid "[new tag]"

1866 msgstr "[新tag]"

1867

1868 -#: builtin/fetch.c:302

1868 +#: builtin/fetch.c:308

1869 msgid "[new branch]"

1870 msgstr "[新分支]"

1871

1872 -#: builtin/fetch.c:347

1872 +#: builtin/fetch.c:311

1873 +msgid "[new ref]"

1874 +msgstr "[新引用]"

1875 +

1876 +#: builtin/fetch.c:356

1877 msgid "unable to update local ref"

1878 msgstr "不能更新本地引用"

1879

1876 -#: builtin/fetch.c:347

1880 +#: builtin/fetch.c:356

1881 msgid "forced update"

1882 msgstr "强制更新"

1883

1880 -#: builtin/fetch.c:353

1884 +#: builtin/fetch.c:362

1885 msgid "(non-fast-forward)"

1886 msgstr "（非快进式）"

1887

1884 -#: builtin/fetch.c:384 builtin/fetch.c:676

1888 +#: builtin/fetch.c:393 builtin/fetch.c:685

1889 #, c-format

1890 msgid "cannot open %s: %s\n"

1891 msgstr "无法打开 %s：%s\n"

1892

1889 -#: builtin/fetch.c:393

1893 +#: builtin/fetch.c:402

1894 #, c-format

1895 msgid "%s did not send all necessary objects\n"

1896 msgstr "%s 未发送所有必须的对象\n"

1897

1894 -#: builtin/fetch.c:479

1898 +#: builtin/fetch.c:488

1899 #, c-format

1900 msgid "From %.*s\n"

1901 msgstr "来自 %.*s\n"

1902

1899 -#: builtin/fetch.c:490

1903 +#: builtin/fetch.c:499

1904 #, c-format

1905 msgid ""

1906 "some local refs could not be updated; try running\n"

@@ -1906,79 +1910,79 @@ msgstr ""

1910 " 'git remote prune %s' 来删除旧的、有冲突的分支"

1911

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

1909 -#: builtin/fetch.c:540

1913 +#: builtin/fetch.c:549

1914 #, c-format

1915 msgid " (%s will become dangling)\n"

1916 msgstr " （%s 将成为悬空状态）\n"

1917

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

1915 -#: builtin/fetch.c:541

1919 +#: builtin/fetch.c:550

1920 #, c-format

1921 msgid " (%s has become dangling)\n"

1922 msgstr " （%s 已成为悬空状态）\n"

1923

1920 -#: builtin/fetch.c:548

1924 +#: builtin/fetch.c:557

1925 msgid "[deleted]"

1926 msgstr "[已删除]"

1927

1924 -#: builtin/fetch.c:549

1928 +#: builtin/fetch.c:558

1929 msgid "(none)"

1930 msgstr "（无）"

1931

1928 -#: builtin/fetch.c:666

1932 +#: builtin/fetch.c:675

1933 #, c-format

1934 msgid "Refusing to fetch into current branch %s of non-bare repository"

1935 msgstr "拒绝获取到非裸版本库的当前分支 %s"

1936

1933 -#: builtin/fetch.c:700

1937 +#: builtin/fetch.c:709

1938 #, c-format

1939 msgid "Don't know how to fetch from %s"

1940 msgstr "不知道如何从 %s 获取"

1941

1938 -#: builtin/fetch.c:777

1942 +#: builtin/fetch.c:786

1943 #, c-format

1944 msgid "Option \"%s\" value \"%s\" is not valid for %s"

1945 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"

1946

1943 -#: builtin/fetch.c:780

1947 +#: builtin/fetch.c:789

1948 #, c-format

1949 msgid "Option \"%s\" is ignored for %s\n"

1950 msgstr "选项 \"%s\" 对于 %s 被忽略\n"

1951

1948 -#: builtin/fetch.c:879

1952 +#: builtin/fetch.c:888

1953 #, c-format

1954 msgid "Fetching %s\n"

1955 msgstr "正在获取 %s\n"

1956

1953 -#: builtin/fetch.c:881

1957 +#: builtin/fetch.c:890

1958 #, c-format

1959 msgid "Could not fetch %s"

1960 msgstr "不能获取 %s"

1961

1958 -#: builtin/fetch.c:898

1962 +#: builtin/fetch.c:907

1963 msgid ""

1964 "No remote repository specified. Please, specify either a URL or a\n"

1965 "remote name from which new revisions should be fetched."

1966 msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定，用以获取新提交。"

1967

1964 -#: builtin/fetch.c:918

1968 +#: builtin/fetch.c:927

1969 msgid "You need to specify a tag name."

1970 msgstr "您需要指定一个 tag 名称。"

1971

1968 -#: builtin/fetch.c:970

1972 +#: builtin/fetch.c:979

1973 msgid "fetch --all does not take a repository argument"

1974 msgstr "fetch --all 不能带一个版本库参数"

1975

1972 -#: builtin/fetch.c:972

1976 +#: builtin/fetch.c:981

1977 msgid "fetch --all does not make sense with refspecs"

1978 msgstr "fetch --all 带引用表达式没有任何意义"

1979

1976 -#: builtin/fetch.c:983

1980 +#: builtin/fetch.c:992

1981 #, c-format

1982 msgid "No such remote or remote group: %s"

1983 msgstr "没有这样的远程或远程组：%s"

1984

1981 -#: builtin/fetch.c:991

1985 +#: builtin/fetch.c:1000

1986 msgid "Fetching a group and specifying refspecs does not make sense"

1987 msgstr "获取组并指定引用表达式没有意义"

1988

@@ -2326,57 +2330,57 @@ msgstr "不能找到跟踪的远程分支，请手工指定 <upstream>。\n"

2330 msgid "Unknown commit %s"

2331 msgstr "未知提交 %s"

2332

2329 -#: builtin/merge.c:91

2333 +#: builtin/merge.c:90

2334 msgid "switch `m' requires a value"

2335 msgstr "开关 `m' 需要一个值"

2336

2333 -#: builtin/merge.c:128

2337 +#: builtin/merge.c:127

2338 #, c-format

2339 msgid "Could not find merge strategy '%s'.\n"

2340 msgstr "不能找到合并策略 '%s'。\n"

2341

2338 -#: builtin/merge.c:129

2342 +#: builtin/merge.c:128

2343 #, c-format

2344 msgid "Available strategies are:"

2345 msgstr "可用的策略有："

2346

2343 -#: builtin/merge.c:134

2347 +#: builtin/merge.c:133

2348 #, c-format

2349 msgid "Available custom strategies are:"

2350 msgstr "可用的自定义策略有："

2351

2348 -#: builtin/merge.c:241

2352 +#: builtin/merge.c:240

2353 msgid "could not run stash."

2354 msgstr "不能进行进度保存。"

2355

2352 -#: builtin/merge.c:246

2356 +#: builtin/merge.c:245

2357 msgid "stash failed"

2358 msgstr "进度保存失败"

2359

2356 -#: builtin/merge.c:251

2360 +#: builtin/merge.c:250

2361 #, c-format

2362 msgid "not a valid object: %s"

2363 msgstr "不是一个有效对象：%s"

2364

2361 -#: builtin/merge.c:270 builtin/merge.c:287

2365 +#: builtin/merge.c:269 builtin/merge.c:286

2366 msgid "read-tree failed"

2367 msgstr "读取树失败"

2368

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

2366 -#: builtin/merge.c:317

2370 +#: builtin/merge.c:316

2371 msgid " (nothing to squash)"

2372 msgstr " （无可压缩）"

2373

2370 -#: builtin/merge.c:330

2374 +#: builtin/merge.c:329

2375 #, c-format

2376 msgid "Squash commit -- not updating HEAD\n"

2377 msgstr "压缩提交 -- 未更新 HEAD\n"

2378

2375 -#: builtin/merge.c:362

2379 +#: builtin/merge.c:361

2380 msgid "Writing SQUASH_MSG"

2381 msgstr "写入 SQUASH_MSG"

2382

2379 -#: builtin/merge.c:364

2383 +#: builtin/merge.c:363

2384 msgid "Finishing SQUASH_MSG"

2385 msgstr "完成 SQUASH_MSG"

2386

@@ -2403,35 +2407,35 @@ msgstr "git write-tree 无法写入一树对象"

2407 msgid "failed to read the cache"

2408 msgstr "无法读取缓存"

2409

2406 -#: builtin/merge.c:696

2410 +#: builtin/merge.c:697

2411 msgid "Unable to write index."

2412 msgstr "不能写索引。"

2413

2410 -#: builtin/merge.c:709

2414 +#: builtin/merge.c:710

2415 msgid "Not handling anything other than two heads merge."

2416 msgstr "不能处理两个头合并之外的任何操作。"

2417

2414 -#: builtin/merge.c:723

2418 +#: builtin/merge.c:724

2419 #, c-format

2420 msgid "Unknown option for merge-recursive: -X%s"

2421 msgstr "merge-recursive 的未知选项：-X%s"

2422

2419 -#: builtin/merge.c:737

2423 +#: builtin/merge.c:738

2424 #, c-format

2425 msgid "unable to write %s"

2426 msgstr "不能写 %s"

2427

2424 -#: builtin/merge.c:876

2428 +#: builtin/merge.c:877

2429 #, c-format

2430 msgid "Could not read from '%s'"

2431 msgstr "不能从 '%s' 读取"

2432

2429 -#: builtin/merge.c:885

2433 +#: builtin/merge.c:886

2434 #, c-format

2435 msgid "Not committing merge; use 'git commit' to complete the merge.\n"

2436 msgstr "未提交合并，使用 'git commit' 完成此次合并。\n"

2437

2434 -#: builtin/merge.c:891

2438 +#: builtin/merge.c:892

2439 msgid ""

2440 "Please enter a commit message to explain why this merge is necessary,\n"

2441 "especially if it merges an updated upstream into a topic branch.\n"

@@ -2444,47 +2448,52 @@ msgstr ""

2448 "\n"

2449 "以 '#' 开头的行将被忽略，而且空提交说明将会终止提交。\n"

2450

2447 -#: builtin/merge.c:915

2451 +#: builtin/merge.c:916

2452 msgid "Empty commit message."

2453 msgstr "空提交信息。"

2454

2451 -#: builtin/merge.c:927

2455 +#: builtin/merge.c:928

2456 #, c-format

2457 msgid "Wonderful.\n"

2458 msgstr "太棒了。\n"

2459

2456 -#: builtin/merge.c:1000

2460 +#: builtin/merge.c:993

2461 #, c-format

2462 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"

2463 msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"

2464

2461 -#: builtin/merge.c:1016

2465 +#: builtin/merge.c:1009

2466 #, c-format

2467 msgid "'%s' is not a commit"

2468 msgstr "'%s' 不是一个提交"

2469

2466 -#: builtin/merge.c:1057

2470 +#: builtin/merge.c:1050

2471 msgid "No current branch."

2472 msgstr "没有当前分支。"

2473

2470 -#: builtin/merge.c:1059

2474 +#: builtin/merge.c:1052

2475 msgid "No remote for the current branch."

2476 msgstr "当前分支没有对应的远程版本库。"

2477

2474 -#: builtin/merge.c:1061

2478 +#: builtin/merge.c:1054

2479 msgid "No default upstream defined for the current branch."

2480 msgstr "当前分支没有定义默认的上游分支。"

2481

2478 -#: builtin/merge.c:1066

2482 +#: builtin/merge.c:1059

2483 #, c-format

2484 msgid "No remote tracking branch for %s from %s"

2485 msgstr "%s 没有来自 %s 的远程跟踪分支"

2486

2483 -#: builtin/merge.c:1188

2487 +#: builtin/merge.c:1146 builtin/merge.c:1303

2488 +#, c-format

2489 +msgid "%s - not something we can merge"

2490 +msgstr "%s - 不能被合并"

2491 +

2492 +#: builtin/merge.c:1214

2493 msgid "There is no merge to abort (MERGE_HEAD missing)."

2494 msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"

2495

2487 -#: builtin/merge.c:1204 git-pull.sh:31

2496 +#: builtin/merge.c:1230 git-pull.sh:31

2497 msgid ""

2498 "You have not concluded your merge (MERGE_HEAD exists).\n"

2499 "Please, commit your changes before you can merge."

@@ -2492,11 +2501,11 @@ msgstr ""

2501 "您尚未结束您的合并（存在 MERGE_HEAD）。\n"

2502 "请在合并前先提交您的修改。"

2503

2495 -#: builtin/merge.c:1207 git-pull.sh:34

2504 +#: builtin/merge.c:1233 git-pull.sh:34

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

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

2507

2499 -#: builtin/merge.c:1211

2508 +#: builtin/merge.c:1237

2509 msgid ""

2510 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"

2511 "Please, commit your changes before you can merge."

@@ -2504,84 +2513,79 @@ msgstr ""

2513 "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"

2514 "请在合并前先提交您的修改。"

2515

2507 -#: builtin/merge.c:1214

2516 +#: builtin/merge.c:1240

2517 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."

2518 msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"

2519

2511 -#: builtin/merge.c:1223

2520 +#: builtin/merge.c:1249

2521 msgid "You cannot combine --squash with --no-ff."

2522 msgstr "您不能将 --squash 与 --no-ff 共用。"

2523

2515 -#: builtin/merge.c:1228

2524 +#: builtin/merge.c:1254

2525 msgid "You cannot combine --no-ff with --ff-only."

2526 msgstr "您不能将 --no-ff 与 --ff-only 共用。"

2527

2519 -#: builtin/merge.c:1235

2528 +#: builtin/merge.c:1261

2529 msgid "No commit specified and merge.defaultToUpstream not set."

2530 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"

2531

2523 -#: builtin/merge.c:1266

2532 +#: builtin/merge.c:1293

2533 msgid "Can merge only exactly one commit into empty head"

2534 msgstr "只能将一个提交合并到空分支上"

2535

2527 -#: builtin/merge.c:1269

2536 +#: builtin/merge.c:1296

2537 msgid "Squash commit into empty head not supported yet"

2538 msgstr "尚不支持到空分支的压缩提交"

2539

2531 -#: builtin/merge.c:1271

2540 +#: builtin/merge.c:1298

2541 msgid "Non-fast-forward commit does not make sense into an empty head"

2542 msgstr "到空分支的非快进式提交没有意义"

2543

2535 -#: builtin/merge.c:1275 builtin/merge.c:1319

2536 -#, c-format

2537 -msgid "%s - not something we can merge"

2538 -msgstr "%s - 不能被合并"

2539 -

2540 -#: builtin/merge.c:1382

2544 +#: builtin/merge.c:1413

2545 #, c-format

2546 msgid "Updating %s..%s\n"

2547 msgstr "更新 %s..%s\n"

2548

2545 -#: builtin/merge.c:1420

2549 +#: builtin/merge.c:1451

2550 #, c-format

2551 msgid "Trying really trivial in-index merge...\n"

2552 msgstr "尝试非常小的索引内合并...\n"

2553

2550 -#: builtin/merge.c:1427

2554 +#: builtin/merge.c:1458

2555 #, c-format

2556 msgid "Nope.\n"

2557 msgstr "无。\n"

2558

2555 -#: builtin/merge.c:1459

2559 +#: builtin/merge.c:1490

2560 msgid "Not possible to fast-forward, aborting."

2561 msgstr "无法快进，终止。"

2562

2559 -#: builtin/merge.c:1482 builtin/merge.c:1559

2563 +#: builtin/merge.c:1513 builtin/merge.c:1592

2564 #, c-format

2565 msgid "Rewinding the tree to pristine...\n"

2566 msgstr "将树回滚至原始状态...\n"

2567

2564 -#: builtin/merge.c:1486

2568 +#: builtin/merge.c:1517

2569 #, c-format

2570 msgid "Trying merge strategy %s...\n"

2571 msgstr "尝试合并策略 %s...\n"

2572

2569 -#: builtin/merge.c:1550

2573 +#: builtin/merge.c:1583

2574 #, c-format

2575 msgid "No merge strategy handled the merge.\n"

2576 msgstr "没有合并策略处理此合并。\n"

2577

2574 -#: builtin/merge.c:1552

2578 +#: builtin/merge.c:1585

2579 #, c-format

2580 msgid "Merge with strategy %s failed.\n"

2581 msgstr "使用策略 %s 合并失败。\n"

2582

2579 -#: builtin/merge.c:1561

2583 +#: builtin/merge.c:1594

2584 #, c-format

2585 msgid "Using the %s to prepare resolving by hand.\n"

2586 msgstr "使用 %s 以准备手工解决。\n"

2587

2584 -#: builtin/merge.c:1572

2588 +#: builtin/merge.c:1606

2589 #, c-format

2590 msgid "Automatic merge went well; stopped before committing as requested\n"

2591 msgstr "自动合并进展顺利，按要求在提交前停止\n"

@@ -3043,11 +3047,11 @@ msgstr "%s：%s 不能和 %s 共用"

3047 msgid "program error"

3048 msgstr "程序错误"

3049

3046 -#: builtin/revert.c:209

3050 +#: builtin/revert.c:212

3051 msgid "revert failed"

3052 msgstr "还原失败"

3053

3050 -#: builtin/revert.c:224

3054 +#: builtin/revert.c:227

3055 msgid "cherry-pick failed"

3056 msgstr "拣选失败"

3057

l10n: zh_CN.po: translate 1 new message