l10n: git.pot: v2.15.0 round 2 (2 new, 2 removed)

Generate po/git.pot from v2.15.0-rc1 for git v2.15.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Jiang Xin committed Oct 17, 2017 at 09:49 UTC 9c07fab78c26b09b14ae3c3090f9816c134da09e
1 file changed +48 -47
po/git.pot
+48 -47
@@ -8,7 +8,7 @@ msgid ""
8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
11 -"POT-Creation-Date: 2017-10-08 09:48+0800\n"
11 +"POT-Creation-Date: 2017-10-17 09:44+0800\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -941,7 +941,7 @@ msgstr ""
941 msgid "--reverse and --first-parent together require specified latest commit"
942 msgstr ""
943
944 -#: blame.c:1797 bundle.c:169 ref-filter.c:1932 sequencer.c:1168
944 +#: blame.c:1797 bundle.c:169 ref-filter.c:1947 sequencer.c:1168
945 #: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911
946 #: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369
947 #: builtin/shortlog.c:191
@@ -1561,7 +1561,7 @@ msgstr ""
1561 msgid "Filtering content"
1562 msgstr ""
1563
1564 -#: entry.c:417
1564 +#: entry.c:433
1565 #, c-format
1566 msgid "could not stat file '%s'"
1567 msgstr ""
@@ -2383,7 +2383,7 @@ msgstr ""
2383 msgid "Could not open '%s' for writing"
2384 msgstr ""
2385
2386 -#: refs.c:1779
2386 +#: refs.c:1792
2387 msgid "ref updates forbidden inside quarantine environment"
2388 msgstr ""
2389
@@ -2422,157 +2422,157 @@ msgstr ""
2422 msgid "ahead %d, behind %d"
2423 msgstr ""
2424
2425 -#: ref-filter.c:104
2425 +#: ref-filter.c:105
2426 #, c-format
2427 msgid "expected format: %%(color:<color>)"
2428 msgstr ""
2429
2430 -#: ref-filter.c:106
2430 +#: ref-filter.c:107
2431 #, c-format
2432 msgid "unrecognized color: %%(color:%s)"
2433 msgstr ""
2434
2435 -#: ref-filter.c:126
2435 +#: ref-filter.c:127
2436 #, c-format
2437 msgid "Integer value expected refname:lstrip=%s"
2438 msgstr ""
2439
2440 -#: ref-filter.c:130
2440 +#: ref-filter.c:131
2441 #, c-format
2442 msgid "Integer value expected refname:rstrip=%s"
2443 msgstr ""
2444
2445 -#: ref-filter.c:132
2445 +#: ref-filter.c:133
2446 #, c-format
2447 msgid "unrecognized %%(%s) argument: %s"
2448 msgstr ""
2449
2450 -#: ref-filter.c:172
2450 +#: ref-filter.c:173
2451 #, c-format
2452 msgid "%%(body) does not take arguments"
2453 msgstr ""
2454
2455 -#: ref-filter.c:179
2455 +#: ref-filter.c:180
2456 #, c-format
2457 msgid "%%(subject) does not take arguments"
2458 msgstr ""
2459
2460 -#: ref-filter.c:186
2460 +#: ref-filter.c:198
2461 #, c-format
2462 -msgid "%%(trailers) does not take arguments"
2462 +msgid "unknown %%(trailers) argument: %s"
2463 msgstr ""
2464
2465 -#: ref-filter.c:205
2465 +#: ref-filter.c:221
2466 #, c-format
2467 msgid "positive value expected contents:lines=%s"
2468 msgstr ""
2469
2470 -#: ref-filter.c:207
2470 +#: ref-filter.c:223
2471 #, c-format
2472 msgid "unrecognized %%(contents) argument: %s"
2473 msgstr ""
2474
2475 -#: ref-filter.c:220
2475 +#: ref-filter.c:236
2476 #, c-format
2477 msgid "positive value expected objectname:short=%s"
2478 msgstr ""
2479
2480 -#: ref-filter.c:224
2480 +#: ref-filter.c:240
2481 #, c-format
2482 msgid "unrecognized %%(objectname) argument: %s"
2483 msgstr ""
2484
2485 -#: ref-filter.c:251
2485 +#: ref-filter.c:267
2486 #, c-format
2487 msgid "expected format: %%(align:<width>,<position>)"
2488 msgstr ""
2489
2490 -#: ref-filter.c:263
2490 +#: ref-filter.c:279
2491 #, c-format
2492 msgid "unrecognized position:%s"
2493 msgstr ""
2494
2495 -#: ref-filter.c:267
2495 +#: ref-filter.c:283
2496 #, c-format
2497 msgid "unrecognized width:%s"
2498 msgstr ""
2499
2500 -#: ref-filter.c:273
2500 +#: ref-filter.c:289
2501 #, c-format
2502 msgid "unrecognized %%(align) argument: %s"
2503 msgstr ""
2504
2505 -#: ref-filter.c:277
2505 +#: ref-filter.c:293
2506 #, c-format
2507 msgid "positive width expected with the %%(align) atom"
2508 msgstr ""
2509
2510 -#: ref-filter.c:292
2510 +#: ref-filter.c:308
2511 #, c-format
2512 msgid "unrecognized %%(if) argument: %s"
2513 msgstr ""
2514
2515 -#: ref-filter.c:382
2515 +#: ref-filter.c:398
2516 #, c-format
2517 msgid "malformed field name: %.*s"
2518 msgstr ""
2519
2520 -#: ref-filter.c:408
2520 +#: ref-filter.c:424
2521 #, c-format
2522 msgid "unknown field name: %.*s"
2523 msgstr ""
2524
2525 -#: ref-filter.c:520
2525 +#: ref-filter.c:536
2526 #, c-format
2527 msgid "format: %%(if) atom used without a %%(then) atom"
2528 msgstr ""
2529
2530 -#: ref-filter.c:580
2530 +#: ref-filter.c:596
2531 #, c-format
2532 msgid "format: %%(then) atom used without an %%(if) atom"
2533 msgstr ""
2534
2535 -#: ref-filter.c:582
2535 +#: ref-filter.c:598
2536 #, c-format
2537 msgid "format: %%(then) atom used more than once"
2538 msgstr ""
2539
2540 -#: ref-filter.c:584
2540 +#: ref-filter.c:600
2541 #, c-format
2542 msgid "format: %%(then) atom used after %%(else)"
2543 msgstr ""
2544
2545 -#: ref-filter.c:610
2545 +#: ref-filter.c:626
2546 #, c-format
2547 msgid "format: %%(else) atom used without an %%(if) atom"
2548 msgstr ""
2549
2550 -#: ref-filter.c:612
2550 +#: ref-filter.c:628
2551 #, c-format
2552 msgid "format: %%(else) atom used without a %%(then) atom"
2553 msgstr ""
2554
2555 -#: ref-filter.c:614
2555 +#: ref-filter.c:630
2556 #, c-format
2557 msgid "format: %%(else) atom used more than once"
2558 msgstr ""
2559
2560 -#: ref-filter.c:627
2560 +#: ref-filter.c:643
2561 #, c-format
2562 msgid "format: %%(end) atom used without corresponding atom"
2563 msgstr ""
2564
2565 -#: ref-filter.c:682
2565 +#: ref-filter.c:698
2566 #, c-format
2567 msgid "malformed format string %s"
2568 msgstr ""
2569
2570 -#: ref-filter.c:1268
2570 +#: ref-filter.c:1283
2571 #, c-format
2572 msgid "(no branch, rebasing %s)"
2573 msgstr ""
2574
2575 -#: ref-filter.c:1271
2575 +#: ref-filter.c:1286
2576 #, c-format
2577 msgid "(no branch, bisect started on %s)"
2578 msgstr ""
@@ -2580,7 +2580,7 @@ msgstr ""
2580 #. TRANSLATORS: make sure this matches "HEAD
2581 #. detached at " in wt-status.c
2582 #.
2583 -#: ref-filter.c:1279
2583 +#: ref-filter.c:1294
2584 #, c-format
2585 msgid "(HEAD detached at %s)"
2586 msgstr ""
@@ -2588,46 +2588,46 @@ msgstr ""
2588 #. TRANSLATORS: make sure this matches "HEAD
2589 #. detached from " in wt-status.c
2590 #.
2591 -#: ref-filter.c:1286
2591 +#: ref-filter.c:1301
2592 #, c-format
2593 msgid "(HEAD detached from %s)"
2594 msgstr ""
2595
2596 -#: ref-filter.c:1290
2596 +#: ref-filter.c:1305
2597 msgid "(no branch)"
2598 msgstr ""
2599
2600 -#: ref-filter.c:1439 ref-filter.c:1470
2600 +#: ref-filter.c:1454 ref-filter.c:1485
2601 #, c-format
2602 msgid "missing object %s for %s"
2603 msgstr ""
2604
2605 -#: ref-filter.c:1442 ref-filter.c:1473
2605 +#: ref-filter.c:1457 ref-filter.c:1488
2606 #, c-format
2607 msgid "parse_object_buffer failed on %s for %s"
2608 msgstr ""
2609
2610 -#: ref-filter.c:1773
2610 +#: ref-filter.c:1788
2611 #, c-format
2612 msgid "malformed object at '%s'"
2613 msgstr ""
2614
2615 -#: ref-filter.c:1840
2615 +#: ref-filter.c:1855
2616 #, c-format
2617 msgid "ignoring ref with broken name %s"
2618 msgstr ""
2619
2620 -#: ref-filter.c:1845
2620 +#: ref-filter.c:1860
2621 #, c-format
2622 msgid "ignoring broken ref %s"
2623 msgstr ""
2624
2625 -#: ref-filter.c:2107
2625 +#: ref-filter.c:2122
2626 #, c-format
2627 msgid "format: %%(end) atom missing"
2628 msgstr ""
2629
2630 -#: ref-filter.c:2201
2630 +#: ref-filter.c:2216
2631 #, c-format
2632 msgid "malformed object name %s"
2633 msgstr ""
@@ -3285,7 +3285,8 @@ msgstr ""
3285
3286 #: sequencer.c:2561
3287 #, c-format
3288 -msgid "unrecognized setting %s for optionrebase.missingCommitsCheck. Ignoring."
3288 +msgid ""
3289 +"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
3290 msgstr ""
3291
3292 #: sequencer.c:2641