@matheusbsbs / matheus-bagliano / commits / ccfca8dc26

l10n: Update git.pot (2 new, 4 removed messages)

Generate po/git.pot from v1.7.12-146-g16d26, and there are 2 new, 4 removed l10n messages. * 2 new messages are added at lines: 4151, 4172 * 4 old messages are deleted from the previous version at lines: 350, 354, 2069, 4166 Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Jiang Xin committed Sep 5, 2012 at 06:20 UTC ccfca8dc26e14f53bbf7ee7257bbd9e8c0dd4bf7
1 file changed +345 -339
po/git.pot
+345 -339
@@ -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: 2012-08-06 23:47+0800\n"
11 +"POT-Creation-Date: 2012-09-05 06:20+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"
@@ -55,7 +55,7 @@ msgid "Repository lacks these prerequisite commits:"
55 msgstr ""
56
57 #: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290
58 -#: builtin/log.c:726 builtin/log.c:1316 builtin/log.c:1535 builtin/merge.c:347
58 +#: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347
59 #: builtin/shortlog.c:181
60 msgid "revision walk setup failed"
61 msgstr ""
@@ -82,7 +82,7 @@ msgstr[1] ""
82 msgid "rev-list died"
83 msgstr ""
84
85 -#: bundle.c:300 builtin/log.c:1212 builtin/shortlog.c:284
85 +#: bundle.c:300 builtin/log.c:1209 builtin/shortlog.c:284
86 #, c-format
87 msgid "unrecognized argument: %s"
88 msgstr ""
@@ -225,32 +225,32 @@ msgid ""
225 "%s"
226 msgstr ""
227
228 -#: diff.c:1400
228 +#: diff.c:1401
229 msgid " 0 files changed"
230 msgstr ""
231
232 -#: diff.c:1404
232 +#: diff.c:1405
233 #, c-format
234 msgid " %d file changed"
235 msgid_plural " %d files changed"
236 msgstr[0] ""
237 msgstr[1] ""
238
239 -#: diff.c:1421
239 +#: diff.c:1422
240 #, c-format
241 msgid ", %d insertion(+)"
242 msgid_plural ", %d insertions(+)"
243 msgstr[0] ""
244 msgstr[1] ""
245
246 -#: diff.c:1432
246 +#: diff.c:1433
247 #, c-format
248 msgid ", %d deletion(-)"
249 msgid_plural ", %d deletions(-)"
250 msgstr[0] ""
251 msgstr[1] ""
252
253 -#: diff.c:3461
253 +#: diff.c:3460
254 #, c-format
255 msgid ""
256 "Failed to parse --dirstat/-X option parameter:\n"
@@ -345,243 +345,235 @@ msgstr ""
345 msgid "error building trees"
346 msgstr ""
347
348 -#: merge-recursive.c:497
349 -msgid "diff setup failed"
350 -msgstr ""
351 -
352 -#: merge-recursive.c:627
353 -msgid "merge-recursive: disk full?"
354 -msgstr ""
355 -
356 -#: merge-recursive.c:690
348 +#: merge-recursive.c:672
349 #, c-format
350 msgid "failed to create path '%s'%s"
351 msgstr ""
352
361 -#: merge-recursive.c:701
353 +#: merge-recursive.c:683
354 #, c-format
355 msgid "Removing %s to make room for subdirectory\n"
356 msgstr ""
357
358 #. something else exists
359 #. .. but not some other error (who really cares what?)
368 -#: merge-recursive.c:715 merge-recursive.c:736
360 +#: merge-recursive.c:697 merge-recursive.c:718
361 msgid ": perhaps a D/F conflict?"
362 msgstr ""
363
372 -#: merge-recursive.c:726
364 +#: merge-recursive.c:708
365 #, c-format
366 msgid "refusing to lose untracked file at '%s'"
367 msgstr ""
368
377 -#: merge-recursive.c:766
369 +#: merge-recursive.c:748
370 #, c-format
371 msgid "cannot read object %s '%s'"
372 msgstr ""
373
382 -#: merge-recursive.c:768
374 +#: merge-recursive.c:750
375 #, c-format
376 msgid "blob expected for %s '%s'"
377 msgstr ""
378
387 -#: merge-recursive.c:791 builtin/clone.c:302
379 +#: merge-recursive.c:773 builtin/clone.c:302
380 #, c-format
381 msgid "failed to open '%s'"
382 msgstr ""
383
392 -#: merge-recursive.c:799
384 +#: merge-recursive.c:781
385 #, c-format
386 msgid "failed to symlink '%s'"
387 msgstr ""
388
397 -#: merge-recursive.c:802
389 +#: merge-recursive.c:784
390 #, c-format
391 msgid "do not know what to do with %06o %s '%s'"
392 msgstr ""
393
402 -#: merge-recursive.c:939
394 +#: merge-recursive.c:921
395 msgid "Failed to execute internal merge"
396 msgstr ""
397
406 -#: merge-recursive.c:943
398 +#: merge-recursive.c:925
399 #, c-format
400 msgid "Unable to add %s to database"
401 msgstr ""
402
411 -#: merge-recursive.c:959
403 +#: merge-recursive.c:941
404 msgid "unsupported object type in the tree"
405 msgstr ""
406
415 -#: merge-recursive.c:1038 merge-recursive.c:1052
407 +#: merge-recursive.c:1020 merge-recursive.c:1034
408 #, c-format
409 msgid ""
410 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
411 "in tree."
412 msgstr ""
413
422 -#: merge-recursive.c:1044 merge-recursive.c:1057
414 +#: merge-recursive.c:1026 merge-recursive.c:1039
415 #, c-format
416 msgid ""
417 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
418 "in tree at %s."
419 msgstr ""
420
429 -#: merge-recursive.c:1098
421 +#: merge-recursive.c:1080
422 msgid "rename"
423 msgstr ""
424
433 -#: merge-recursive.c:1098
425 +#: merge-recursive.c:1080
426 msgid "renamed"
427 msgstr ""
428
437 -#: merge-recursive.c:1154
429 +#: merge-recursive.c:1136
430 #, c-format
431 msgid "%s is a directory in %s adding as %s instead"
432 msgstr ""
433
442 -#: merge-recursive.c:1176
434 +#: merge-recursive.c:1158
435 #, c-format
436 msgid ""
437 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
438 "\"->\"%s\" in \"%s\"%s"
439 msgstr ""
440
449 -#: merge-recursive.c:1181
441 +#: merge-recursive.c:1163
442 msgid " (left unresolved)"
443 msgstr ""
444
453 -#: merge-recursive.c:1235
445 +#: merge-recursive.c:1217
446 #, c-format
447 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
448 msgstr ""
449
458 -#: merge-recursive.c:1265
450 +#: merge-recursive.c:1247
451 #, c-format
452 msgid "Renaming %s to %s and %s to %s instead"
453 msgstr ""
454
463 -#: merge-recursive.c:1464
455 +#: merge-recursive.c:1446
456 #, c-format
457 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
458 msgstr ""
459
468 -#: merge-recursive.c:1474
460 +#: merge-recursive.c:1456
461 #, c-format
462 msgid "Adding merged %s"
463 msgstr ""
464
473 -#: merge-recursive.c:1479 merge-recursive.c:1677
465 +#: merge-recursive.c:1461 merge-recursive.c:1659
466 #, c-format
467 msgid "Adding as %s instead"
468 msgstr ""
469
478 -#: merge-recursive.c:1530
470 +#: merge-recursive.c:1512
471 #, c-format
472 msgid "cannot read object %s"
473 msgstr ""
474
483 -#: merge-recursive.c:1533
475 +#: merge-recursive.c:1515
476 #, c-format
477 msgid "object %s is not a blob"
478 msgstr ""
479
488 -#: merge-recursive.c:1581
480 +#: merge-recursive.c:1563
481 msgid "modify"
482 msgstr ""
483
492 -#: merge-recursive.c:1581
484 +#: merge-recursive.c:1563
485 msgid "modified"
486 msgstr ""
487
496 -#: merge-recursive.c:1591
488 +#: merge-recursive.c:1573
489 msgid "content"
490 msgstr ""
491
500 -#: merge-recursive.c:1598
492 +#: merge-recursive.c:1580
493 msgid "add/add"
494 msgstr ""
495
504 -#: merge-recursive.c:1632
496 +#: merge-recursive.c:1614
497 #, c-format
498 msgid "Skipped %s (merged same as existing)"
499 msgstr ""
500
509 -#: merge-recursive.c:1646
501 +#: merge-recursive.c:1628
502 #, c-format
503 msgid "Auto-merging %s"
504 msgstr ""
505
514 -#: merge-recursive.c:1650 git-submodule.sh:844
506 +#: merge-recursive.c:1632 git-submodule.sh:869
507 msgid "submodule"
508 msgstr ""
509
518 -#: merge-recursive.c:1651
510 +#: merge-recursive.c:1633
511 #, c-format
512 msgid "CONFLICT (%s): Merge conflict in %s"
513 msgstr ""
514
523 -#: merge-recursive.c:1741
515 +#: merge-recursive.c:1723
516 #, c-format
517 msgid "Removing %s"
518 msgstr ""
519
528 -#: merge-recursive.c:1766
520 +#: merge-recursive.c:1748
521 msgid "file/directory"
522 msgstr ""
523
532 -#: merge-recursive.c:1772
524 +#: merge-recursive.c:1754
525 msgid "directory/file"
526 msgstr ""
527
536 -#: merge-recursive.c:1777
528 +#: merge-recursive.c:1759
529 #, c-format
530 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
531 msgstr ""
532
541 -#: merge-recursive.c:1787
533 +#: merge-recursive.c:1769
534 #, c-format
535 msgid "Adding %s"
536 msgstr ""
537
546 -#: merge-recursive.c:1804
538 +#: merge-recursive.c:1786
539 msgid "Fatal merge failure, shouldn't happen."
540 msgstr ""
541
550 -#: merge-recursive.c:1823
542 +#: merge-recursive.c:1805
543 msgid "Already up-to-date!"
544 msgstr ""
545
554 -#: merge-recursive.c:1832
546 +#: merge-recursive.c:1814
547 #, c-format
548 msgid "merging of trees %s and %s failed"
549 msgstr ""
550
559 -#: merge-recursive.c:1862
551 +#: merge-recursive.c:1844
552 #, c-format
553 msgid "Unprocessed path??? %s"
554 msgstr ""
555
564 -#: merge-recursive.c:1907
556 +#: merge-recursive.c:1889
557 msgid "Merging:"
558 msgstr ""
559
568 -#: merge-recursive.c:1920
560 +#: merge-recursive.c:1902
561 #, c-format
562 msgid "found %u common ancestor:"
563 msgid_plural "found %u common ancestors:"
564 msgstr[0] ""
565 msgstr[1] ""
566
575 -#: merge-recursive.c:1957
567 +#: merge-recursive.c:1939
568 msgid "merge returned no commit"
569 msgstr ""
570
579 -#: merge-recursive.c:2014
571 +#: merge-recursive.c:1996
572 #, c-format
573 msgid "Could not parse object '%s'"
574 msgstr ""
575
584 -#: merge-recursive.c:2026 builtin/merge.c:697
576 +#: merge-recursive.c:2008 builtin/merge.c:696
577 msgid "Unable to write index."
578 msgstr ""
579
@@ -632,14 +624,14 @@ msgid_plural ""
624 msgstr[0] ""
625 msgstr[1] ""
626
635 -#: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978
636 -#: builtin/merge.c:1088 builtin/merge.c:1098
627 +#: sequencer.c:121 builtin/merge.c:864 builtin/merge.c:977
628 +#: builtin/merge.c:1087 builtin/merge.c:1097
629 #, c-format
630 msgid "Could not open '%s' for writing"
631 msgstr ""
632
641 -#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868
642 -#: builtin/merge.c:1090 builtin/merge.c:1103
633 +#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:867
634 +#: builtin/merge.c:1089 builtin/merge.c:1102
635 #, c-format
636 msgid "Could not write to '%s'"
637 msgstr ""
@@ -836,7 +828,7 @@ msgstr ""
828 msgid "cannot abort from a branch yet to be born"
829 msgstr ""
830
839 -#: sequencer.c:805 builtin/apply.c:3988
831 +#: sequencer.c:805 builtin/apply.c:3987
832 #, c-format
833 msgid "cannot open %s: %s"
834 msgstr ""
@@ -1226,6 +1218,11 @@ msgstr ""
1218 msgid ", behind "
1219 msgstr ""
1220
1221 +#: compat/precompose_utf8.c:58 builtin/clone.c:341
1222 +#, c-format
1223 +msgid "failed to unlink '%s'"
1224 +msgstr ""
1225 +
1226 #: builtin/add.c:62
1227 #, c-format
1228 msgid "unexpected diff status %c"
@@ -1326,7 +1323,7 @@ msgstr ""
1323 msgid "index file corrupt"
1324 msgstr ""
1325
1329 -#: builtin/add.c:480 builtin/apply.c:4433 builtin/mv.c:229 builtin/rm.c:260
1326 +#: builtin/add.c:480 builtin/apply.c:4432 builtin/mv.c:229 builtin/rm.c:260
1327 msgid "Unable to write new index file"
1328 msgstr ""
1329
@@ -1344,52 +1341,52 @@ msgstr ""
1341 msgid "unrecognized whitespace ignore option '%s'"
1342 msgstr ""
1343
1347 -#: builtin/apply.c:824
1344 +#: builtin/apply.c:823
1345 #, c-format
1346 msgid "Cannot prepare timestamp regexp %s"
1347 msgstr ""
1348
1352 -#: builtin/apply.c:833
1349 +#: builtin/apply.c:832
1350 #, c-format
1351 msgid "regexec returned %d for input: %s"
1352 msgstr ""
1353
1357 -#: builtin/apply.c:914
1354 +#: builtin/apply.c:913
1355 #, c-format
1356 msgid "unable to find filename in patch at line %d"
1357 msgstr ""
1358
1362 -#: builtin/apply.c:946
1359 +#: builtin/apply.c:945
1360 #, c-format
1361 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1362 msgstr ""
1363
1367 -#: builtin/apply.c:950
1364 +#: builtin/apply.c:949
1365 #, c-format
1366 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1367 msgstr ""
1368
1372 -#: builtin/apply.c:951
1369 +#: builtin/apply.c:950
1370 #, c-format
1371 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1372 msgstr ""
1373
1377 -#: builtin/apply.c:958
1374 +#: builtin/apply.c:957
1375 #, c-format
1376 msgid "git apply: bad git-diff - expected /dev/null on line %d"
1377 msgstr ""
1378
1382 -#: builtin/apply.c:1403
1379 +#: builtin/apply.c:1402
1380 #, c-format
1381 msgid "recount: unexpected line: %.*s"
1382 msgstr ""
1383
1387 -#: builtin/apply.c:1460
1384 +#: builtin/apply.c:1459
1385 #, c-format
1386 msgid "patch fragment without header at line %d: %.*s"
1387 msgstr ""
1388
1392 -#: builtin/apply.c:1477
1389 +#: builtin/apply.c:1476
1390 #, c-format
1391 msgid ""
1392 "git diff header lacks filename information when removing %d leading pathname "
@@ -1400,403 +1397,403 @@ msgid_plural ""
1397 msgstr[0] ""
1398 msgstr[1] ""
1399
1403 -#: builtin/apply.c:1637
1400 +#: builtin/apply.c:1636
1401 msgid "new file depends on old contents"
1402 msgstr ""
1403
1407 -#: builtin/apply.c:1639
1404 +#: builtin/apply.c:1638
1405 msgid "deleted file still has contents"
1406 msgstr ""
1407
1411 -#: builtin/apply.c:1665
1408 +#: builtin/apply.c:1664
1409 #, c-format
1410 msgid "corrupt patch at line %d"
1411 msgstr ""
1412
1416 -#: builtin/apply.c:1701
1413 +#: builtin/apply.c:1700
1414 #, c-format
1415 msgid "new file %s depends on old contents"
1416 msgstr ""
1417
1421 -#: builtin/apply.c:1703
1418 +#: builtin/apply.c:1702
1419 #, c-format
1420 msgid "deleted file %s still has contents"
1421 msgstr ""
1422
1426 -#: builtin/apply.c:1706
1423 +#: builtin/apply.c:1705
1424 #, c-format
1425 msgid "** warning: file %s becomes empty but is not deleted"
1426 msgstr ""
1427
1431 -#: builtin/apply.c:1852
1428 +#: builtin/apply.c:1851
1429 #, c-format
1430 msgid "corrupt binary patch at line %d: %.*s"
1431 msgstr ""
1432
1433 #. there has to be one hunk (forward hunk)
1437 -#: builtin/apply.c:1881
1434 +#: builtin/apply.c:1880
1435 #, c-format
1436 msgid "unrecognized binary patch at line %d"
1437 msgstr ""
1438
1442 -#: builtin/apply.c:1967
1439 +#: builtin/apply.c:1966
1440 #, c-format
1441 msgid "patch with only garbage at line %d"
1442 msgstr ""
1443
1447 -#: builtin/apply.c:2057
1444 +#: builtin/apply.c:2056
1445 #, c-format
1446 msgid "unable to read symlink %s"
1447 msgstr ""
1448
1452 -#: builtin/apply.c:2061
1449 +#: builtin/apply.c:2060
1450 #, c-format
1451 msgid "unable to open or read %s"
1452 msgstr ""
1453
1457 -#: builtin/apply.c:2132
1454 +#: builtin/apply.c:2131
1455 msgid "oops"
1456 msgstr ""
1457
1461 -#: builtin/apply.c:2654
1458 +#: builtin/apply.c:2653
1459 #, c-format
1460 msgid "invalid start of line: '%c'"
1461 msgstr ""
1462
1466 -#: builtin/apply.c:2772
1463 +#: builtin/apply.c:2771
1464 #, c-format
1465 msgid "Hunk #%d succeeded at %d (offset %d line)."
1466 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1467 msgstr[0] ""
1468 msgstr[1] ""
1469
1473 -#: builtin/apply.c:2784
1470 +#: builtin/apply.c:2783
1471 #, c-format
1472 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1473 msgstr ""
1474
1478 -#: builtin/apply.c:2790
1475 +#: builtin/apply.c:2789
1476 #, c-format
1477 msgid ""
1478 "while searching for:\n"
1479 "%.*s"
1480 msgstr ""
1481
1485 -#: builtin/apply.c:2809
1482 +#: builtin/apply.c:2808
1483 #, c-format
1484 msgid "missing binary patch data for '%s'"
1485 msgstr ""
1486
1490 -#: builtin/apply.c:2912
1487 +#: builtin/apply.c:2911
1488 #, c-format
1489 msgid "binary patch does not apply to '%s'"
1490 msgstr ""
1491
1495 -#: builtin/apply.c:2918
1492 +#: builtin/apply.c:2917
1493 #, c-format
1494 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1495 msgstr ""
1496
1500 -#: builtin/apply.c:2939
1497 +#: builtin/apply.c:2938
1498 #, c-format
1499 msgid "patch failed: %s:%ld"
1500 msgstr ""
1501
1505 -#: builtin/apply.c:3061
1502 +#: builtin/apply.c:3060
1503 #, c-format
1504 msgid "cannot checkout %s"
1505 msgstr ""
1506
1510 -#: builtin/apply.c:3106 builtin/apply.c:3115 builtin/apply.c:3159
1507 +#: builtin/apply.c:3105 builtin/apply.c:3114 builtin/apply.c:3158
1508 #, c-format
1509 msgid "read of %s failed"
1510 msgstr ""
1511
1515 -#: builtin/apply.c:3139 builtin/apply.c:3361
1512 +#: builtin/apply.c:3138 builtin/apply.c:3360
1513 #, c-format
1514 msgid "path %s has been renamed/deleted"
1515 msgstr ""
1516
1520 -#: builtin/apply.c:3220 builtin/apply.c:3375
1517 +#: builtin/apply.c:3219 builtin/apply.c:3374
1518 #, c-format
1519 msgid "%s: does not exist in index"
1520 msgstr ""
1521
1525 -#: builtin/apply.c:3224 builtin/apply.c:3367 builtin/apply.c:3389
1522 +#: builtin/apply.c:3223 builtin/apply.c:3366 builtin/apply.c:3388
1523 #, c-format
1524 msgid "%s: %s"
1525 msgstr ""
1526
1530 -#: builtin/apply.c:3229 builtin/apply.c:3383
1527 +#: builtin/apply.c:3228 builtin/apply.c:3382
1528 #, c-format
1529 msgid "%s: does not match index"
1530 msgstr ""
1531
1535 -#: builtin/apply.c:3331
1532 +#: builtin/apply.c:3330
1533 msgid "removal patch leaves file contents"
1534 msgstr ""
1535
1539 -#: builtin/apply.c:3400
1536 +#: builtin/apply.c:3399
1537 #, c-format
1538 msgid "%s: wrong type"
1539 msgstr ""
1540
1544 -#: builtin/apply.c:3402
1541 +#: builtin/apply.c:3401
1542 #, c-format
1543 msgid "%s has type %o, expected %o"
1544 msgstr ""
1545
1549 -#: builtin/apply.c:3503
1546 +#: builtin/apply.c:3502
1547 #, c-format
1548 msgid "%s: already exists in index"
1549 msgstr ""
1550
1554 -#: builtin/apply.c:3506
1551 +#: builtin/apply.c:3505
1552 #, c-format
1553 msgid "%s: already exists in working directory"
1554 msgstr ""
1555
1559 -#: builtin/apply.c:3526
1556 +#: builtin/apply.c:3525
1557 #, c-format
1558 msgid "new mode (%o) of %s does not match old mode (%o)"
1559 msgstr ""
1560
1564 -#: builtin/apply.c:3531
1561 +#: builtin/apply.c:3530
1562 #, c-format
1563 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1564 msgstr ""
1565
1569 -#: builtin/apply.c:3539
1566 +#: builtin/apply.c:3538
1567 #, c-format
1568 msgid "%s: patch does not apply"
1569 msgstr ""
1570
1574 -#: builtin/apply.c:3552
1571 +#: builtin/apply.c:3551
1572 #, c-format
1573 msgid "Checking patch %s..."
1574 msgstr ""
1575
1579 -#: builtin/apply.c:3607 builtin/checkout.c:213 builtin/reset.c:158
1576 +#: builtin/apply.c:3606 builtin/checkout.c:213 builtin/reset.c:158
1577 #, c-format
1578 msgid "make_cache_entry failed for path '%s'"
1579 msgstr ""
1580
1584 -#: builtin/apply.c:3750
1581 +#: builtin/apply.c:3749
1582 #, c-format
1583 msgid "unable to remove %s from index"
1584 msgstr ""
1585
1589 -#: builtin/apply.c:3778
1586 +#: builtin/apply.c:3777
1587 #, c-format
1588 msgid "corrupt patch for subproject %s"
1589 msgstr ""
1590
1594 -#: builtin/apply.c:3782
1591 +#: builtin/apply.c:3781
1592 #, c-format
1593 msgid "unable to stat newly created file '%s'"
1594 msgstr ""
1595
1599 -#: builtin/apply.c:3787
1596 +#: builtin/apply.c:3786
1597 #, c-format
1598 msgid "unable to create backing store for newly created file %s"
1599 msgstr ""
1600
1604 -#: builtin/apply.c:3790 builtin/apply.c:3898
1601 +#: builtin/apply.c:3789 builtin/apply.c:3897
1602 #, c-format
1603 msgid "unable to add cache entry for %s"
1604 msgstr ""
1605
1609 -#: builtin/apply.c:3823
1606 +#: builtin/apply.c:3822
1607 #, c-format
1608 msgid "closing file '%s'"
1609 msgstr ""
1610
1614 -#: builtin/apply.c:3872
1611 +#: builtin/apply.c:3871
1612 #, c-format
1613 msgid "unable to write file '%s' mode %o"
1614 msgstr ""
1615
1619 -#: builtin/apply.c:3959
1616 +#: builtin/apply.c:3958
1617 #, c-format
1618 msgid "Applied patch %s cleanly."
1619 msgstr ""
1620
1624 -#: builtin/apply.c:3967
1621 +#: builtin/apply.c:3966
1622 msgid "internal error"
1623 msgstr ""
1624
1625 #. Say this even without --verbose
1629 -#: builtin/apply.c:3970
1626 +#: builtin/apply.c:3969
1627 #, c-format
1628 msgid "Applying patch %%s with %d reject..."
1629 msgid_plural "Applying patch %%s with %d rejects..."
1630 msgstr[0] ""
1631 msgstr[1] ""
1632
1636 -#: builtin/apply.c:3980
1633 +#: builtin/apply.c:3979
1634 #, c-format
1635 msgid "truncating .rej filename to %.*s.rej"
1636 msgstr ""
1637
1641 -#: builtin/apply.c:4001
1638 +#: builtin/apply.c:4000
1639 #, c-format
1640 msgid "Hunk #%d applied cleanly."
1641 msgstr ""
1642
1646 -#: builtin/apply.c:4004
1643 +#: builtin/apply.c:4003
1644 #, c-format
1645 msgid "Rejected hunk #%d."
1646 msgstr ""
1647
1651 -#: builtin/apply.c:4154
1648 +#: builtin/apply.c:4153
1649 msgid "unrecognized input"
1650 msgstr ""
1651
1655 -#: builtin/apply.c:4165
1652 +#: builtin/apply.c:4164
1653 msgid "unable to read index file"
1654 msgstr ""
1655
1659 -#: builtin/apply.c:4284 builtin/apply.c:4287
1656 +#: builtin/apply.c:4283 builtin/apply.c:4286
1657 msgid "path"
1658 msgstr ""
1659
1663 -#: builtin/apply.c:4285
1660 +#: builtin/apply.c:4284
1661 msgid "don't apply changes matching the given path"
1662 msgstr ""
1663
1667 -#: builtin/apply.c:4288
1664 +#: builtin/apply.c:4287
1665 msgid "apply changes matching the given path"
1666 msgstr ""
1667
1671 -#: builtin/apply.c:4290
1668 +#: builtin/apply.c:4289
1669 msgid "num"
1670 msgstr ""
1671
1675 -#: builtin/apply.c:4291
1672 +#: builtin/apply.c:4290
1673 msgid "remove <num> leading slashes from traditional diff paths"
1674 msgstr ""
1675
1679 -#: builtin/apply.c:4294
1676 +#: builtin/apply.c:4293
1677 msgid "ignore additions made by the patch"
1678 msgstr ""
1679
1683 -#: builtin/apply.c:4296
1680 +#: builtin/apply.c:4295
1681 msgid "instead of applying the patch, output diffstat for the input"
1682 msgstr ""
1683
1687 -#: builtin/apply.c:4300
1684 +#: builtin/apply.c:4299
1685 msgid "shows number of added and deleted lines in decimal notation"
1686 msgstr ""
1687
1691 -#: builtin/apply.c:4302
1688 +#: builtin/apply.c:4301
1689 msgid "instead of applying the patch, output a summary for the input"
1690 msgstr ""
1691
1695 -#: builtin/apply.c:4304
1692 +#: builtin/apply.c:4303
1693 msgid "instead of applying the patch, see if the patch is applicable"
1694 msgstr ""
1695
1699 -#: builtin/apply.c:4306
1696 +#: builtin/apply.c:4305
1697 msgid "make sure the patch is applicable to the current index"
1698 msgstr ""
1699
1703 -#: builtin/apply.c:4308
1700 +#: builtin/apply.c:4307
1701 msgid "apply a patch without touching the working tree"
1702 msgstr ""
1703
1707 -#: builtin/apply.c:4310
1704 +#: builtin/apply.c:4309
1705 msgid "also apply the patch (use with --stat/--summary/--check)"
1706 msgstr ""
1707
1711 -#: builtin/apply.c:4312
1708 +#: builtin/apply.c:4311
1709 msgid "attempt three-way merge if a patch does not apply"
1710 msgstr ""
1711
1715 -#: builtin/apply.c:4314
1712 +#: builtin/apply.c:4313
1713 msgid "build a temporary index based on embedded index information"
1714 msgstr ""
1715
1719 -#: builtin/apply.c:4316
1716 +#: builtin/apply.c:4315
1717 msgid "paths are separated with NUL character"
1718 msgstr ""
1719
1723 -#: builtin/apply.c:4319
1720 +#: builtin/apply.c:4318
1721 msgid "ensure at least <n> lines of context match"
1722 msgstr ""
1723
1727 -#: builtin/apply.c:4320
1724 +#: builtin/apply.c:4319
1725 msgid "action"
1726 msgstr ""
1727
1731 -#: builtin/apply.c:4321
1728 +#: builtin/apply.c:4320
1729 msgid "detect new or modified lines that have whitespace errors"
1730 msgstr ""
1731
1735 -#: builtin/apply.c:4324 builtin/apply.c:4327
1732 +#: builtin/apply.c:4323 builtin/apply.c:4326
1733 msgid "ignore changes in whitespace when finding context"
1734 msgstr ""
1735
1739 -#: builtin/apply.c:4330
1736 +#: builtin/apply.c:4329
1737 msgid "apply the patch in reverse"
1738 msgstr ""
1739
1743 -#: builtin/apply.c:4332
1740 +#: builtin/apply.c:4331
1741 msgid "don't expect at least one line of context"
1742 msgstr ""
1743
1747 -#: builtin/apply.c:4334
1744 +#: builtin/apply.c:4333
1745 msgid "leave the rejected hunks in corresponding *.rej files"
1746 msgstr ""
1747
1751 -#: builtin/apply.c:4336
1748 +#: builtin/apply.c:4335
1749 msgid "allow overlapping hunks"
1750 msgstr ""
1751
1755 -#: builtin/apply.c:4337
1752 +#: builtin/apply.c:4336
1753 msgid "be verbose"
1754 msgstr ""
1755
1759 -#: builtin/apply.c:4339
1756 +#: builtin/apply.c:4338
1757 msgid "tolerate incorrectly detected missing new-line at the end of file"
1758 msgstr ""
1759
1763 -#: builtin/apply.c:4342
1760 +#: builtin/apply.c:4341
1761 msgid "do not trust the line counts in the hunk headers"
1762 msgstr ""
1763
1767 -#: builtin/apply.c:4344
1764 +#: builtin/apply.c:4343
1765 msgid "root"
1766 msgstr ""
1767
1771 -#: builtin/apply.c:4345
1768 +#: builtin/apply.c:4344
1769 msgid "prepend <root> to all filenames"
1770 msgstr ""
1771
1775 -#: builtin/apply.c:4367
1772 +#: builtin/apply.c:4366
1773 msgid "--3way outside a repository"
1774 msgstr ""
1775
1779 -#: builtin/apply.c:4375
1776 +#: builtin/apply.c:4374
1777 msgid "--index outside a repository"
1778 msgstr ""
1779
1783 -#: builtin/apply.c:4378
1780 +#: builtin/apply.c:4377
1781 msgid "--cached outside a repository"
1782 msgstr ""
1783
1787 -#: builtin/apply.c:4394
1784 +#: builtin/apply.c:4393
1785 #, c-format
1786 msgid "can't open patch '%s'"
1787 msgstr ""
1788
1792 -#: builtin/apply.c:4408
1789 +#: builtin/apply.c:4407
1790 #, c-format
1791 msgid "squelched %d whitespace error"
1792 msgid_plural "squelched %d whitespace errors"
1793 msgstr[0] ""
1794 msgstr[1] ""
1795
1799 -#: builtin/apply.c:4414 builtin/apply.c:4424
1796 +#: builtin/apply.c:4413 builtin/apply.c:4423
1797 #, c-format
1798 msgid "%d line adds whitespace errors."
1799 msgid_plural "%d lines add whitespace errors."
@@ -2050,7 +2047,7 @@ msgstr ""
2047 msgid "Unable to add merge result for '%s'"
2048 msgstr ""
2049
2053 -#: builtin/checkout.c:235 builtin/checkout.c:393
2050 +#: builtin/checkout.c:235 builtin/checkout.c:392
2051 msgid "corrupt index file"
2052 msgstr ""
2053
@@ -2059,60 +2056,56 @@ msgstr ""
2056 msgid "path '%s' is unmerged"
2057 msgstr ""
2058
2062 -#: builtin/checkout.c:303 builtin/checkout.c:499 builtin/clone.c:586
2063 -#: builtin/merge.c:812
2059 +#: builtin/checkout.c:303 builtin/checkout.c:498 builtin/clone.c:586
2060 +#: builtin/merge.c:811
2061 msgid "unable to write new index file"
2062 msgstr ""
2063
2067 -#: builtin/checkout.c:320 builtin/diff.c:302 builtin/merge.c:408
2068 -msgid "diff_setup_done failed"
2069 -msgstr ""
2070 -
2071 -#: builtin/checkout.c:415
2064 +#: builtin/checkout.c:414
2065 msgid "you need to resolve your current index first"
2066 msgstr ""
2067
2075 -#: builtin/checkout.c:534
2068 +#: builtin/checkout.c:533
2069 #, c-format
2070 msgid "Can not do reflog for '%s'\n"
2071 msgstr ""
2072
2080 -#: builtin/checkout.c:567
2073 +#: builtin/checkout.c:566
2074 msgid "HEAD is now at"
2075 msgstr ""
2076
2084 -#: builtin/checkout.c:574
2077 +#: builtin/checkout.c:573
2078 #, c-format
2079 msgid "Reset branch '%s'\n"
2080 msgstr ""
2081
2089 -#: builtin/checkout.c:577
2082 +#: builtin/checkout.c:576
2083 #, c-format
2084 msgid "Already on '%s'\n"
2085 msgstr ""
2086
2094 -#: builtin/checkout.c:581
2087 +#: builtin/checkout.c:580
2088 #, c-format
2089 msgid "Switched to and reset branch '%s'\n"
2090 msgstr ""
2091
2099 -#: builtin/checkout.c:583
2092 +#: builtin/checkout.c:582
2093 #, c-format
2094 msgid "Switched to a new branch '%s'\n"
2095 msgstr ""
2096
2104 -#: builtin/checkout.c:585
2097 +#: builtin/checkout.c:584
2098 #, c-format
2099 msgid "Switched to branch '%s'\n"
2100 msgstr ""
2101
2109 -#: builtin/checkout.c:641
2102 +#: builtin/checkout.c:640
2103 #, c-format
2104 msgid " ... and %d more.\n"
2105 msgstr ""
2106
2107 #. The singular version
2115 -#: builtin/checkout.c:647
2108 +#: builtin/checkout.c:646
2109 #, c-format
2110 msgid ""
2111 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -2127,7 +2120,7 @@ msgid_plural ""
2120 msgstr[0] ""
2121 msgstr[1] ""
2122
2130 -#: builtin/checkout.c:665
2123 +#: builtin/checkout.c:664
2124 #, c-format
2125 msgid ""
2126 "If you want to keep them by creating a new branch, this may be a good time\n"
@@ -2137,96 +2130,96 @@ msgid ""
2130 "\n"
2131 msgstr ""
2132
2140 -#: builtin/checkout.c:695
2133 +#: builtin/checkout.c:694
2134 msgid "internal error in revision walk"
2135 msgstr ""
2136
2144 -#: builtin/checkout.c:699
2137 +#: builtin/checkout.c:698
2138 msgid "Previous HEAD position was"
2139 msgstr ""
2140
2148 -#: builtin/checkout.c:725 builtin/checkout.c:920
2141 +#: builtin/checkout.c:724 builtin/checkout.c:919
2142 msgid "You are on a branch yet to be born"
2143 msgstr ""
2144
2145 #. case (1)
2153 -#: builtin/checkout.c:856
2146 +#: builtin/checkout.c:855
2147 #, c-format
2148 msgid "invalid reference: %s"
2149 msgstr ""
2150
2151 #. case (1): want a tree
2159 -#: builtin/checkout.c:895
2152 +#: builtin/checkout.c:894
2153 #, c-format
2154 msgid "reference is not a tree: %s"
2155 msgstr ""
2156
2164 -#: builtin/checkout.c:977
2157 +#: builtin/checkout.c:976
2158 msgid "-B cannot be used with -b"
2159 msgstr ""
2160
2168 -#: builtin/checkout.c:986
2161 +#: builtin/checkout.c:985
2162 msgid "--patch is incompatible with all other options"
2163 msgstr ""
2164
2172 -#: builtin/checkout.c:989
2165 +#: builtin/checkout.c:988
2166 msgid "--detach cannot be used with -b/-B/--orphan"
2167 msgstr ""
2168
2176 -#: builtin/checkout.c:991
2169 +#: builtin/checkout.c:990
2170 msgid "--detach cannot be used with -t"
2171 msgstr ""
2172
2180 -#: builtin/checkout.c:997
2173 +#: builtin/checkout.c:996
2174 msgid "--track needs a branch name"
2175 msgstr ""
2176
2184 -#: builtin/checkout.c:1004
2177 +#: builtin/checkout.c:1003
2178 msgid "Missing branch name; try -b"
2179 msgstr ""
2180
2188 -#: builtin/checkout.c:1010
2181 +#: builtin/checkout.c:1009
2182 msgid "--orphan and -b|-B are mutually exclusive"
2183 msgstr ""
2184
2192 -#: builtin/checkout.c:1012
2185 +#: builtin/checkout.c:1011
2186 msgid "--orphan cannot be used with -t"
2187 msgstr ""
2188
2196 -#: builtin/checkout.c:1022
2189 +#: builtin/checkout.c:1021
2190 msgid "git checkout: -f and -m are incompatible"
2191 msgstr ""
2192
2200 -#: builtin/checkout.c:1056
2193 +#: builtin/checkout.c:1055
2194 msgid "invalid path specification"
2195 msgstr ""
2196
2204 -#: builtin/checkout.c:1064
2197 +#: builtin/checkout.c:1063
2198 #, c-format
2199 msgid ""
2200 "git checkout: updating paths is incompatible with switching branches.\n"
2201 "Did you intend to checkout '%s' which can not be resolved as commit?"
2202 msgstr ""
2203
2211 -#: builtin/checkout.c:1066
2204 +#: builtin/checkout.c:1065
2205 msgid "git checkout: updating paths is incompatible with switching branches."
2206 msgstr ""
2207
2215 -#: builtin/checkout.c:1071
2208 +#: builtin/checkout.c:1070
2209 msgid "git checkout: --detach does not take a path argument"
2210 msgstr ""
2211
2219 -#: builtin/checkout.c:1074
2212 +#: builtin/checkout.c:1073
2213 msgid ""
2214 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
2215 "checking out of the index."
2216 msgstr ""
2217
2225 -#: builtin/checkout.c:1093
2218 +#: builtin/checkout.c:1092
2219 msgid "Cannot switch branch to a non-commit."
2220 msgstr ""
2221
2229 -#: builtin/checkout.c:1096
2222 +#: builtin/checkout.c:1095
2223 msgid "--ours/--theirs is incompatible with switching branches."
2224 msgstr ""
2225
@@ -2280,7 +2273,7 @@ msgstr ""
2273 msgid "failed to create directory '%s'"
2274 msgstr ""
2275
2283 -#: builtin/clone.c:308 builtin/diff.c:75
2276 +#: builtin/clone.c:308 builtin/diff.c:77
2277 #, c-format
2278 msgid "failed to stat '%s'"
2279 msgstr ""
@@ -2295,11 +2288,6 @@ msgstr ""
2288 msgid "failed to stat %s\n"
2289 msgstr ""
2290
2298 -#: builtin/clone.c:341
2299 -#, c-format
2300 -msgid "failed to unlink '%s'"
2301 -msgstr ""
2302 -
2291 #: builtin/clone.c:346
2292 #, c-format
2293 msgid "failed to create link '%s'"
@@ -2654,7 +2642,7 @@ msgstr ""
2642 msgid "could not parse HEAD commit"
2643 msgstr ""
2644
2657 -#: builtin/commit.c:1487 builtin/merge.c:509
2645 +#: builtin/commit.c:1487 builtin/merge.c:508
2646 #, c-format
2647 msgid "could not open '%s' for reading"
2648 msgstr ""
@@ -2683,7 +2671,7 @@ msgstr ""
2671 msgid "Aborting commit due to empty commit message.\n"
2672 msgstr ""
2673
2686 -#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961
2674 +#: builtin/commit.c:1554 builtin/merge.c:935 builtin/merge.c:960
2675 msgid "failed to write commit object"
2676 msgstr ""
2677
@@ -2780,36 +2768,36 @@ msgstr ""
2768 msgid "--dirty is incompatible with committishes"
2769 msgstr ""
2770
2783 -#: builtin/diff.c:77
2771 +#: builtin/diff.c:79
2772 #, c-format
2773 msgid "'%s': not a regular file or symlink"
2774 msgstr ""
2775
2788 -#: builtin/diff.c:220
2776 +#: builtin/diff.c:224
2777 #, c-format
2778 msgid "invalid option: %s"
2779 msgstr ""
2780
2793 -#: builtin/diff.c:297
2781 +#: builtin/diff.c:301
2782 msgid "Not a git repository"
2783 msgstr ""
2784
2797 -#: builtin/diff.c:341
2785 +#: builtin/diff.c:344
2786 #, c-format
2787 msgid "invalid object '%s' given."
2788 msgstr ""
2789
2802 -#: builtin/diff.c:346
2790 +#: builtin/diff.c:349
2791 #, c-format
2792 msgid "more than %d trees given: '%s'"
2793 msgstr ""
2794
2807 -#: builtin/diff.c:356
2795 +#: builtin/diff.c:359
2796 #, c-format
2797 msgid "more than two blobs given: '%s'"
2798 msgstr ""
2799
2812 -#: builtin/diff.c:364
2800 +#: builtin/diff.c:367
2801 #, c-format
2802 msgid "unhandled object '%s' given."
2803 msgstr ""
@@ -2997,57 +2985,57 @@ msgstr ""
2985 msgid "grep: failed to create thread: %s"
2986 msgstr ""
2987
3000 -#: builtin/grep.c:402
2988 +#: builtin/grep.c:454
2989 #, c-format
2990 msgid "Failed to chdir: %s"
2991 msgstr ""
2992
3005 -#: builtin/grep.c:478 builtin/grep.c:512
2993 +#: builtin/grep.c:530 builtin/grep.c:564
2994 #, c-format
2995 msgid "unable to read tree (%s)"
2996 msgstr ""
2997
3010 -#: builtin/grep.c:526
2998 +#: builtin/grep.c:578
2999 #, c-format
3000 msgid "unable to grep from object of type %s"
3001 msgstr ""
3002
3015 -#: builtin/grep.c:584
3003 +#: builtin/grep.c:636
3004 #, c-format
3005 msgid "switch `%c' expects a numerical value"
3006 msgstr ""
3007
3020 -#: builtin/grep.c:601
3008 +#: builtin/grep.c:653
3009 #, c-format
3010 msgid "cannot open '%s'"
3011 msgstr ""
3012
3025 -#: builtin/grep.c:885
3013 +#: builtin/grep.c:917
3014 msgid "no pattern given."
3015 msgstr ""
3016
3029 -#: builtin/grep.c:899
3017 +#: builtin/grep.c:931
3018 #, c-format
3019 msgid "bad object %s"
3020 msgstr ""
3021
3034 -#: builtin/grep.c:940
3022 +#: builtin/grep.c:972
3023 msgid "--open-files-in-pager only works on the worktree"
3024 msgstr ""
3025
3038 -#: builtin/grep.c:963
3026 +#: builtin/grep.c:995
3027 msgid "--cached or --untracked cannot be used with --no-index."
3028 msgstr ""
3029
3042 -#: builtin/grep.c:968
3030 +#: builtin/grep.c:1000
3031 msgid "--no-index or --untracked cannot be used with revs."
3032 msgstr ""
3033
3046 -#: builtin/grep.c:971
3034 +#: builtin/grep.c:1003
3035 msgid "--[no-]exclude-standard cannot be used for tracked contents."
3036 msgstr ""
3037
3050 -#: builtin/grep.c:979
3038 +#: builtin/grep.c:1011
3039 msgid "both --cached and trees are given."
3040 msgstr ""
3041
@@ -3535,64 +3523,64 @@ msgstr ""
3523 msgid "Not a range."
3524 msgstr ""
3525
3538 -#: builtin/log.c:792
3526 +#: builtin/log.c:789
3527 msgid "Cover letter needs email format"
3528 msgstr ""
3529
3542 -#: builtin/log.c:865
3530 +#: builtin/log.c:862
3531 #, c-format
3532 msgid "insane in-reply-to: %s"
3533 msgstr ""
3534
3547 -#: builtin/log.c:938
3535 +#: builtin/log.c:935
3536 msgid "Two output directories?"
3537 msgstr ""
3538
3551 -#: builtin/log.c:1160
3539 +#: builtin/log.c:1157
3540 #, c-format
3541 msgid "bogus committer info %s"
3542 msgstr ""
3543
3556 -#: builtin/log.c:1205
3544 +#: builtin/log.c:1202
3545 msgid "-n and -k are mutually exclusive."
3546 msgstr ""
3547
3560 -#: builtin/log.c:1207
3548 +#: builtin/log.c:1204
3549 msgid "--subject-prefix and -k are mutually exclusive."
3550 msgstr ""
3551
3564 -#: builtin/log.c:1215
3552 +#: builtin/log.c:1212
3553 msgid "--name-only does not make sense"
3554 msgstr ""
3555
3568 -#: builtin/log.c:1217
3556 +#: builtin/log.c:1214
3557 msgid "--name-status does not make sense"
3558 msgstr ""
3559
3572 -#: builtin/log.c:1219
3560 +#: builtin/log.c:1216
3561 msgid "--check does not make sense"
3562 msgstr ""
3563
3576 -#: builtin/log.c:1242
3564 +#: builtin/log.c:1239
3565 msgid "standard output, or directory, which one?"
3566 msgstr ""
3567
3580 -#: builtin/log.c:1244
3568 +#: builtin/log.c:1241
3569 #, c-format
3570 msgid "Could not create directory '%s'"
3571 msgstr ""
3572
3585 -#: builtin/log.c:1397
3573 +#: builtin/log.c:1394
3574 msgid "Failed to create output files"
3575 msgstr ""
3576
3589 -#: builtin/log.c:1501
3577 +#: builtin/log.c:1498
3578 #, c-format
3579 msgid ""
3580 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
3581 msgstr ""
3582
3595 -#: builtin/log.c:1517 builtin/log.c:1519 builtin/log.c:1531
3583 +#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525
3584 #, c-format
3585 msgid "Unknown commit %s"
3586 msgstr ""
@@ -3655,49 +3643,49 @@ msgstr ""
3643 msgid "No merge message -- not updating HEAD\n"
3644 msgstr ""
3645
3658 -#: builtin/merge.c:437
3646 +#: builtin/merge.c:436
3647 #, c-format
3648 msgid "'%s' does not point to a commit"
3649 msgstr ""
3650
3663 -#: builtin/merge.c:536
3651 +#: builtin/merge.c:535
3652 #, c-format
3653 msgid "Bad branch.%s.mergeoptions string: %s"
3654 msgstr ""
3655
3668 -#: builtin/merge.c:629
3656 +#: builtin/merge.c:628
3657 msgid "git write-tree failed to write a tree"
3658 msgstr ""
3659
3672 -#: builtin/merge.c:679
3660 +#: builtin/merge.c:678
3661 msgid "failed to read the cache"
3662 msgstr ""
3663
3676 -#: builtin/merge.c:710
3664 +#: builtin/merge.c:709
3665 msgid "Not handling anything other than two heads merge."
3666 msgstr ""
3667
3680 -#: builtin/merge.c:724
3668 +#: builtin/merge.c:723
3669 #, c-format
3670 msgid "Unknown option for merge-recursive: -X%s"
3671 msgstr ""
3672
3685 -#: builtin/merge.c:738
3673 +#: builtin/merge.c:737
3674 #, c-format
3675 msgid "unable to write %s"
3676 msgstr ""
3677
3690 -#: builtin/merge.c:877
3678 +#: builtin/merge.c:876
3679 #, c-format
3680 msgid "Could not read from '%s'"
3681 msgstr ""
3682
3695 -#: builtin/merge.c:886
3683 +#: builtin/merge.c:885
3684 #, c-format
3685 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
3686 msgstr ""
3687
3700 -#: builtin/merge.c:892
3688 +#: builtin/merge.c:891
3689 msgid ""
3690 "Please enter a commit message to explain why this merge is necessary,\n"
3691 "especially if it merges an updated upstream into a topic branch.\n"
@@ -3706,140 +3694,140 @@ msgid ""
3694 "the commit.\n"
3695 msgstr ""
3696
3709 -#: builtin/merge.c:916
3697 +#: builtin/merge.c:915
3698 msgid "Empty commit message."
3699 msgstr ""
3700
3713 -#: builtin/merge.c:928
3701 +#: builtin/merge.c:927
3702 #, c-format
3703 msgid "Wonderful.\n"
3704 msgstr ""
3705
3718 -#: builtin/merge.c:993
3706 +#: builtin/merge.c:992
3707 #, c-format
3708 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
3709 msgstr ""
3710
3723 -#: builtin/merge.c:1009
3711 +#: builtin/merge.c:1008
3712 #, c-format
3713 msgid "'%s' is not a commit"
3714 msgstr ""
3715
3728 -#: builtin/merge.c:1050
3716 +#: builtin/merge.c:1049
3717 msgid "No current branch."
3718 msgstr ""
3719
3732 -#: builtin/merge.c:1052
3720 +#: builtin/merge.c:1051
3721 msgid "No remote for the current branch."
3722 msgstr ""
3723
3736 -#: builtin/merge.c:1054
3724 +#: builtin/merge.c:1053
3725 msgid "No default upstream defined for the current branch."
3726 msgstr ""
3727
3740 -#: builtin/merge.c:1059
3728 +#: builtin/merge.c:1058
3729 #, c-format
3730 msgid "No remote tracking branch for %s from %s"
3731 msgstr ""
3732
3745 -#: builtin/merge.c:1146 builtin/merge.c:1303
3733 +#: builtin/merge.c:1145 builtin/merge.c:1302
3734 #, c-format
3735 msgid "%s - not something we can merge"
3736 msgstr ""
3737
3750 -#: builtin/merge.c:1214
3738 +#: builtin/merge.c:1213
3739 msgid "There is no merge to abort (MERGE_HEAD missing)."
3740 msgstr ""
3741
3754 -#: builtin/merge.c:1230 git-pull.sh:31
3742 +#: builtin/merge.c:1229 git-pull.sh:31
3743 msgid ""
3744 "You have not concluded your merge (MERGE_HEAD exists).\n"
3745 "Please, commit your changes before you can merge."
3746 msgstr ""
3747
3760 -#: builtin/merge.c:1233 git-pull.sh:34
3748 +#: builtin/merge.c:1232 git-pull.sh:34
3749 msgid "You have not concluded your merge (MERGE_HEAD exists)."
3750 msgstr ""
3751
3764 -#: builtin/merge.c:1237
3752 +#: builtin/merge.c:1236
3753 msgid ""
3754 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
3755 "Please, commit your changes before you can merge."
3756 msgstr ""
3757
3770 -#: builtin/merge.c:1240
3758 +#: builtin/merge.c:1239
3759 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
3760 msgstr ""
3761
3774 -#: builtin/merge.c:1249
3762 +#: builtin/merge.c:1248
3763 msgid "You cannot combine --squash with --no-ff."
3764 msgstr ""
3765
3778 -#: builtin/merge.c:1254
3766 +#: builtin/merge.c:1253
3767 msgid "You cannot combine --no-ff with --ff-only."
3768 msgstr ""
3769
3782 -#: builtin/merge.c:1261
3770 +#: builtin/merge.c:1260
3771 msgid "No commit specified and merge.defaultToUpstream not set."
3772 msgstr ""
3773
3786 -#: builtin/merge.c:1293
3774 +#: builtin/merge.c:1292
3775 msgid "Can merge only exactly one commit into empty head"
3776 msgstr ""
3777
3790 -#: builtin/merge.c:1296
3778 +#: builtin/merge.c:1295
3779 msgid "Squash commit into empty head not supported yet"
3780 msgstr ""
3781
3794 -#: builtin/merge.c:1298
3782 +#: builtin/merge.c:1297
3783 msgid "Non-fast-forward commit does not make sense into an empty head"
3784 msgstr ""
3785
3798 -#: builtin/merge.c:1413
3786 +#: builtin/merge.c:1412
3787 #, c-format
3788 msgid "Updating %s..%s\n"
3789 msgstr ""
3790
3803 -#: builtin/merge.c:1451
3791 +#: builtin/merge.c:1450
3792 #, c-format
3793 msgid "Trying really trivial in-index merge...\n"
3794 msgstr ""
3795
3808 -#: builtin/merge.c:1458
3796 +#: builtin/merge.c:1457
3797 #, c-format
3798 msgid "Nope.\n"
3799 msgstr ""
3800
3813 -#: builtin/merge.c:1490
3801 +#: builtin/merge.c:1489
3802 msgid "Not possible to fast-forward, aborting."
3803 msgstr ""
3804
3817 -#: builtin/merge.c:1513 builtin/merge.c:1592
3805 +#: builtin/merge.c:1512 builtin/merge.c:1591
3806 #, c-format
3807 msgid "Rewinding the tree to pristine...\n"
3808 msgstr ""
3809
3822 -#: builtin/merge.c:1517
3810 +#: builtin/merge.c:1516
3811 #, c-format
3812 msgid "Trying merge strategy %s...\n"
3813 msgstr ""
3814
3827 -#: builtin/merge.c:1583
3815 +#: builtin/merge.c:1582
3816 #, c-format
3817 msgid "No merge strategy handled the merge.\n"
3818 msgstr ""
3819
3832 -#: builtin/merge.c:1585
3820 +#: builtin/merge.c:1584
3821 #, c-format
3822 msgid "Merge with strategy %s failed.\n"
3823 msgstr ""
3824
3837 -#: builtin/merge.c:1594
3825 +#: builtin/merge.c:1593
3826 #, c-format
3827 msgid "Using the %s to prepare resolving by hand.\n"
3828 msgstr ""
3829
3842 -#: builtin/merge.c:1606
3830 +#: builtin/merge.c:1605
3831 #, c-format
3832 msgid "Automatic merge went well; stopped before committing as requested\n"
3833 msgstr ""
@@ -4144,12 +4132,30 @@ msgid ""
4132 "to update which remote branch."
4133 msgstr ""
4134
4147 -#: builtin/push.c:174
4135 +#: builtin/push.c:151
4136 +msgid ""
4137 +"push.default is unset; its implicit value is changing in\n"
4138 +"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
4139 +"and maintain the current behavior after the default changes, use:\n"
4140 +"\n"
4141 +" git config --global push.default matching\n"
4142 +"\n"
4143 +"To squelch this message and adopt the new behavior now, use:\n"
4144 +"\n"
4145 +" git config --global push.default simple\n"
4146 +"\n"
4147 +"See 'git help config' and search for 'push.default' for further "
4148 +"information.\n"
4149 +"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
4150 +"'current' instead of 'simple' if you sometimes use older versions of Git)"
4151 +msgstr ""
4152 +
4153 +#: builtin/push.c:199
4154 msgid ""
4155 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
4156 msgstr ""
4157
4152 -#: builtin/push.c:181
4158 +#: builtin/push.c:206
4159 msgid ""
4160 "Updates were rejected because the tip of your current branch is behind\n"
4161 "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
@@ -4157,15 +4163,15 @@ msgid ""
4163 "See the 'Note about fast-forwards' in 'git push --help' for details."
4164 msgstr ""
4165
4160 -#: builtin/push.c:187
4166 +#: builtin/push.c:212
4167 msgid ""
4168 "Updates were rejected because a pushed branch tip is behind its remote\n"
4169 "counterpart. If you did not intend to push that branch, you may want to\n"
4164 -"specify branches to push or set the 'push.default' configuration\n"
4165 -"variable to 'current' or 'upstream' to push only the current branch."
4170 +"specify branches to push or set the 'push.default' configuration variable\n"
4171 +"to 'simple', 'current' or 'upstream' to push only the current branch."
4172 msgstr ""
4173
4168 -#: builtin/push.c:193
4174 +#: builtin/push.c:218
4175 msgid ""
4176 "Updates were rejected because a pushed branch tip is behind its remote\n"
4177 "counterpart. Check out this branch and merge the remote changes\n"
@@ -4173,22 +4179,22 @@ msgid ""
4179 "See the 'Note about fast-forwards' in 'git push --help' for details."
4180 msgstr ""
4181
4176 -#: builtin/push.c:233
4182 +#: builtin/push.c:258
4183 #, c-format
4184 msgid "Pushing to %s\n"
4185 msgstr ""
4186
4181 -#: builtin/push.c:237
4187 +#: builtin/push.c:262
4188 #, c-format
4189 msgid "failed to push some refs to '%s'"
4190 msgstr ""
4191
4186 -#: builtin/push.c:269
4192 +#: builtin/push.c:294
4193 #, c-format
4194 msgid "bad repository '%s'"
4195 msgstr ""
4196
4191 -#: builtin/push.c:270
4197 +#: builtin/push.c:295
4198 msgid ""
4199 "No configured push destination.\n"
4200 "Either specify the URL from the command-line or configure a remote "
@@ -4201,31 +4207,31 @@ msgid ""
4207 " git push <name>\n"
4208 msgstr ""
4209
4204 -#: builtin/push.c:285
4210 +#: builtin/push.c:310
4211 msgid "--all and --tags are incompatible"
4212 msgstr ""
4213
4208 -#: builtin/push.c:286
4214 +#: builtin/push.c:311
4215 msgid "--all can't be combined with refspecs"
4216 msgstr ""
4217
4212 -#: builtin/push.c:291
4218 +#: builtin/push.c:316
4219 msgid "--mirror and --tags are incompatible"
4220 msgstr ""
4221
4216 -#: builtin/push.c:292
4222 +#: builtin/push.c:317
4223 msgid "--mirror can't be combined with refspecs"
4224 msgstr ""
4225
4220 -#: builtin/push.c:297
4226 +#: builtin/push.c:322
4227 msgid "--all and --mirror are incompatible"
4228 msgstr ""
4229
4224 -#: builtin/push.c:385
4230 +#: builtin/push.c:410
4231 msgid "--delete is incompatible with --all, --mirror and --tags"
4232 msgstr ""
4233
4228 -#: builtin/push.c:387
4234 +#: builtin/push.c:412
4235 msgid "--delete doesn't make sense without any refs"
4236 msgstr ""
4237
@@ -5511,32 +5517,32 @@ msgstr ""
5517 msgid "cannot strip one component off url '$remoteurl'"
5518 msgstr ""
5519
5514 -#: git-submodule.sh:145
5520 +#: git-submodule.sh:167
5521 #, sh-format
5522 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
5523 msgstr ""
5524
5519 -#: git-submodule.sh:189
5525 +#: git-submodule.sh:211
5526 #, sh-format
5527 msgid "Clone of '$url' into submodule path '$sm_path' failed"
5528 msgstr ""
5529
5524 -#: git-submodule.sh:201
5530 +#: git-submodule.sh:223
5531 #, sh-format
5532 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
5533 msgstr ""
5534
5529 -#: git-submodule.sh:290
5535 +#: git-submodule.sh:312
5536 #, sh-format
5537 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
5538 msgstr ""
5539
5534 -#: git-submodule.sh:307
5540 +#: git-submodule.sh:329
5541 #, sh-format
5542 msgid "'$sm_path' already exists in the index"
5543 msgstr ""
5544
5539 -#: git-submodule.sh:311
5545 +#: git-submodule.sh:333
5546 #, sh-format
5547 msgid ""
5548 "The following path is ignored by one of your .gitignore files:\n"
@@ -5544,151 +5550,151 @@ msgid ""
5550 "Use -f if you really want to add it."
5551 msgstr ""
5552
5547 -#: git-submodule.sh:322
5553 +#: git-submodule.sh:344
5554 #, sh-format
5555 msgid "Adding existing repo at '$sm_path' to the index"
5556 msgstr ""
5557
5552 -#: git-submodule.sh:324
5558 +#: git-submodule.sh:346
5559 #, sh-format
5560 msgid "'$sm_path' already exists and is not a valid git repo"
5561 msgstr ""
5562
5557 -#: git-submodule.sh:338
5563 +#: git-submodule.sh:360
5564 #, sh-format
5565 msgid "Unable to checkout submodule '$sm_path'"
5566 msgstr ""
5567
5562 -#: git-submodule.sh:343
5568 +#: git-submodule.sh:365
5569 #, sh-format
5570 msgid "Failed to add submodule '$sm_path'"
5571 msgstr ""
5572
5567 -#: git-submodule.sh:348
5573 +#: git-submodule.sh:370
5574 #, sh-format
5575 msgid "Failed to register submodule '$sm_path'"
5576 msgstr ""
5577
5572 -#: git-submodule.sh:390
5578 +#: git-submodule.sh:413
5579 #, sh-format
5580 msgid "Entering '$prefix$sm_path'"
5581 msgstr ""
5582
5577 -#: git-submodule.sh:404
5583 +#: git-submodule.sh:427
5584 #, sh-format
5585 msgid "Stopping at '$sm_path'; script returned non-zero status."
5586 msgstr ""
5587
5582 -#: git-submodule.sh:447
5588 +#: git-submodule.sh:471
5589 #, sh-format
5590 msgid "No url found for submodule path '$sm_path' in .gitmodules"
5591 msgstr ""
5592
5587 -#: git-submodule.sh:456
5593 +#: git-submodule.sh:480
5594 #, sh-format
5595 msgid "Failed to register url for submodule path '$sm_path'"
5596 msgstr ""
5597
5592 -#: git-submodule.sh:458
5598 +#: git-submodule.sh:482
5599 #, sh-format
5600 msgid "Submodule '$name' ($url) registered for path '$sm_path'"
5601 msgstr ""
5602
5597 -#: git-submodule.sh:466
5603 +#: git-submodule.sh:490
5604 #, sh-format
5605 msgid "Failed to register update mode for submodule path '$sm_path'"
5606 msgstr ""
5607
5602 -#: git-submodule.sh:565
5608 +#: git-submodule.sh:590
5609 #, sh-format
5610 msgid ""
5611 "Submodule path '$sm_path' not initialized\n"
5612 "Maybe you want to use 'update --init'?"
5613 msgstr ""
5614
5609 -#: git-submodule.sh:578
5615 +#: git-submodule.sh:603
5616 #, sh-format
5617 msgid "Unable to find current revision in submodule path '$sm_path'"
5618 msgstr ""
5619
5614 -#: git-submodule.sh:597
5620 +#: git-submodule.sh:622
5621 #, sh-format
5622 msgid "Unable to fetch in submodule path '$sm_path'"
5623 msgstr ""
5624
5619 -#: git-submodule.sh:611
5625 +#: git-submodule.sh:636
5626 #, sh-format
5627 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
5628 msgstr ""
5629
5624 -#: git-submodule.sh:612
5630 +#: git-submodule.sh:637
5631 #, sh-format
5632 msgid "Submodule path '$sm_path': rebased into '$sha1'"
5633 msgstr ""
5634
5629 -#: git-submodule.sh:617
5635 +#: git-submodule.sh:642
5636 #, sh-format
5637 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
5638 msgstr ""
5639
5634 -#: git-submodule.sh:618
5640 +#: git-submodule.sh:643
5641 #, sh-format
5642 msgid "Submodule path '$sm_path': merged in '$sha1'"
5643 msgstr ""
5644
5639 -#: git-submodule.sh:623
5645 +#: git-submodule.sh:648
5646 #, sh-format
5647 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
5648 msgstr ""
5649
5644 -#: git-submodule.sh:624
5650 +#: git-submodule.sh:649
5651 #, sh-format
5652 msgid "Submodule path '$sm_path': checked out '$sha1'"
5653 msgstr ""
5654
5649 -#: git-submodule.sh:646 git-submodule.sh:969
5655 +#: git-submodule.sh:671 git-submodule.sh:995
5656 #, sh-format
5657 msgid "Failed to recurse into submodule path '$sm_path'"
5658 msgstr ""
5659
5654 -#: git-submodule.sh:754
5660 +#: git-submodule.sh:779
5661 msgid "The --cached option cannot be used with the --files option"
5662 msgstr ""
5663
5664 #. unexpected type
5659 -#: git-submodule.sh:794
5665 +#: git-submodule.sh:819
5666 #, sh-format
5667 msgid "unexpected mode $mod_dst"
5668 msgstr ""
5669
5664 -#: git-submodule.sh:812
5670 +#: git-submodule.sh:837
5671 #, sh-format
5672 msgid " Warn: $name doesn't contain commit $sha1_src"
5673 msgstr ""
5674
5669 -#: git-submodule.sh:815
5675 +#: git-submodule.sh:840
5676 #, sh-format
5677 msgid " Warn: $name doesn't contain commit $sha1_dst"
5678 msgstr ""
5679
5674 -#: git-submodule.sh:818
5680 +#: git-submodule.sh:843
5681 #, sh-format
5682 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
5683 msgstr ""
5684
5679 -#: git-submodule.sh:843
5685 +#: git-submodule.sh:868
5686 msgid "blob"
5687 msgstr ""
5688
5683 -#: git-submodule.sh:881
5689 +#: git-submodule.sh:906
5690 msgid "# Submodules changed but not updated:"
5691 msgstr ""
5692
5687 -#: git-submodule.sh:883
5693 +#: git-submodule.sh:908
5694 msgid "# Submodule changes to be committed:"
5695 msgstr ""
5696
5691 -#: git-submodule.sh:1027
5697 +#: git-submodule.sh:1054
5698 #, sh-format
5699 msgid "Synchronizing submodule url for '$name'"
5700 msgstr ""