abc8de64d2 · matheusbsbs/matheus-bagliano

@@ -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: 2018-01-07 07:50+0800\n"

11 +"POT-Creation-Date: 2018-03-16 07:29+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"

@@ -58,7 +58,7 @@ msgstr ""

58 msgid "Exiting because of an unresolved conflict."

59 msgstr ""

60

61 -#: advice.c:121 builtin/merge.c:1213

61 +#: advice.c:121 builtin/merge.c:1251

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

63 msgstr ""

64

@@ -438,7 +438,7 @@ msgstr ""

438 msgid "sha1 information is lacking or useless (%s)."

439 msgstr ""

440

441 -#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148

441 +#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140

442 #, c-format

443 msgid "make_cache_entry failed for path '%s'"

444 msgstr ""

@@ -514,7 +514,7 @@ msgstr[1] ""

514 msgid "truncating .rej filename to %.*s.rej"

515 msgstr ""

516

517 -#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011

517 +#: apply.c:4545 builtin/fetch.c:775 builtin/fetch.c:1025

518 #, c-format

519 msgid "cannot open %s"

520 msgstr ""

@@ -572,11 +572,11 @@ msgstr[1] ""

572 msgid "Unable to write new index file"

573 msgstr ""

574

575 -#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223

576 -#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193

577 -#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860

578 -#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230

579 -#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450

575 +#: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257

576 +#: builtin/clone.c:118 builtin/fetch.c:127 builtin/pull.c:193

577 +#: builtin/submodule--helper.c:403 builtin/submodule--helper.c:1197

578 +#: builtin/submodule--helper.c:1200 builtin/submodule--helper.c:1567

579 +#: builtin/submodule--helper.c:1570 builtin/submodule--helper.c:1787

580 #: git-add--interactive.perl:197

581 msgid "path"

582 msgstr ""

@@ -589,7 +589,7 @@ msgstr ""

589 msgid "apply changes matching the given path"

590 msgstr ""

591

592 -#: apply.c:4927 builtin/am.c:2229

592 +#: apply.c:4927 builtin/am.c:2263

593 msgid "num"

594 msgstr ""

595

@@ -629,75 +629,75 @@ msgstr ""

629 msgid "accept a patch that touches outside the working area"

630 msgstr ""

631

632 -#: apply.c:4949

632 +#: apply.c:4950

633 msgid "also apply the patch (use with --stat/--summary/--check)"

634 msgstr ""

635

636 -#: apply.c:4951

636 +#: apply.c:4952

637 msgid "attempt three-way merge if a patch does not apply"

638 msgstr ""

639

640 -#: apply.c:4953

640 +#: apply.c:4954

641 msgid "build a temporary index based on embedded index information"

642 msgstr ""

643

644 -#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515

644 +#: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515

645 msgid "paths are separated with NUL character"

646 msgstr ""

647

648 -#: apply.c:4958

648 +#: apply.c:4959

649 msgid "ensure at least <n> lines of context match"

650 msgstr ""

651

652 -#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95

652 +#: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95

653 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99

654 -#: builtin/pack-objects.c:3009

654 +#: builtin/pack-objects.c:3035

655 msgid "action"

656 msgstr ""

657

658 -#: apply.c:4960

658 +#: apply.c:4961

659 msgid "detect new or modified lines that have whitespace errors"

660 msgstr ""

661

662 -#: apply.c:4963 apply.c:4966

662 +#: apply.c:4964 apply.c:4967

663 msgid "ignore changes in whitespace when finding context"

664 msgstr ""

665

666 -#: apply.c:4969

666 +#: apply.c:4970

667 msgid "apply the patch in reverse"

668 msgstr ""

669

670 -#: apply.c:4971

670 +#: apply.c:4972

671 msgid "don't expect at least one line of context"

672 msgstr ""

673

674 -#: apply.c:4973

674 +#: apply.c:4974

675 msgid "leave the rejected hunks in corresponding *.rej files"

676 msgstr ""

677

678 -#: apply.c:4975

678 +#: apply.c:4976

679 msgid "allow overlapping hunks"

680 msgstr ""

681

682 -#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21

683 -#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640

684 -#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125

682 +#: apply.c:4977 builtin/add.c:292 builtin/check-ignore.c:21

683 +#: builtin/commit.c:1276 builtin/count-objects.c:96 builtin/fsck.c:665

684 +#: builtin/log.c:1901 builtin/mv.c:123 builtin/read-tree.c:125

685 msgid "be verbose"

686 msgstr ""

687

688 -#: apply.c:4978

688 +#: apply.c:4979

689 msgid "tolerate incorrectly detected missing new-line at the end of file"

690 msgstr ""

691

692 -#: apply.c:4981

692 +#: apply.c:4982

693 msgid "do not trust the line counts in the hunk headers"

694 msgstr ""

695

696 -#: apply.c:4983 builtin/am.c:2217

696 +#: apply.c:4984 builtin/am.c:2251

697 msgid "root"

698 msgstr ""

699

700 -#: apply.c:4984

700 +#: apply.c:4985

701 msgid "prepend <root> to all filenames"

702 msgstr ""

703

@@ -731,7 +731,7 @@ msgstr ""

731 msgid "archive format"

732 msgstr ""

733

734 -#: archive.c:437 builtin/log.c:1459

734 +#: archive.c:437 builtin/log.c:1462

735 msgid "prefix"

736 msgstr ""

737

@@ -739,11 +739,11 @@ msgstr ""

739 msgid "prepend prefix to each pathname in the archive"

740 msgstr ""

741

742 -#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62

743 -#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861

744 -#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554

742 +#: archive.c:439 builtin/blame.c:702 builtin/blame.c:703 builtin/config.c:62

743 +#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:869

744 +#: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554

745 #: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120

746 -#: parse-options.h:153

746 +#: parse-options.h:165

747 msgid "file"

748 msgstr ""

749

@@ -775,8 +775,8 @@ msgstr ""

775 msgid "list supported archive formats"

776 msgstr ""

777

778 -#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109

779 -#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239

778 +#: archive.c:458 builtin/archive.c:90 builtin/clone.c:108 builtin/clone.c:111

779 +#: builtin/submodule--helper.c:1209 builtin/submodule--helper.c:1576

780 msgid "repo"

781 msgstr ""

782

@@ -825,43 +825,43 @@ msgid ""

825 "Use '\\!' for literal leading exclamation."

826 msgstr ""

827

828 -#: bisect.c:458

828 +#: bisect.c:460

829 #, c-format

830 msgid "Badly quoted content in file '%s': %s"

831 msgstr ""

832

833 -#: bisect.c:666

833 +#: bisect.c:668

834 #, c-format

835 msgid "We cannot bisect more!\n"

836 msgstr ""

837

838 -#: bisect.c:720

838 +#: bisect.c:722

839 #, c-format

840 msgid "Not a valid commit name %s"

841 msgstr ""

842

843 -#: bisect.c:744

843 +#: bisect.c:746

844 #, c-format

845 msgid ""

846 "The merge base %s is bad.\n"

847 "This means the bug has been fixed between %s and [%s].\n"

848 msgstr ""

849

850 -#: bisect.c:749

850 +#: bisect.c:751

851 #, c-format

852 msgid ""

853 "The merge base %s is new.\n"

854 "The property has changed between %s and [%s].\n"

855 msgstr ""

856

857 -#: bisect.c:754

857 +#: bisect.c:756

858 #, c-format

859 msgid ""

860 "The merge base %s is %s.\n"

861 "This means the first '%s' commit is between %s and [%s].\n"

862 msgstr ""

863

864 -#: bisect.c:762

864 +#: bisect.c:764

865 #, c-format

866 msgid ""

867 "Some %s revs are not ancestors of the %s rev.\n"

@@ -869,7 +869,7 @@ msgid ""

869 "Maybe you mistook %s and %s revs?\n"

870 msgstr ""

871

872 -#: bisect.c:775

872 +#: bisect.c:777

873 #, c-format

874 msgid ""

875 "the merge base between %s and [%s] must be skipped.\n"

@@ -882,38 +882,38 @@ msgstr ""

882 msgid "Bisecting: a merge base must be tested\n"

883 msgstr ""

884

885 -#: bisect.c:862

885 +#: bisect.c:850

886 #, c-format

887 msgid "a %s revision is needed"

888 msgstr ""

889

890 -#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234

890 +#: bisect.c:869 builtin/notes.c:175 builtin/tag.c:235

891 #, c-format

892 msgid "could not create file '%s'"

893 msgstr ""

894

895 -#: bisect.c:930

895 +#: bisect.c:920

896 #, c-format

897 msgid "could not read file '%s'"

898 msgstr ""

899

900 -#: bisect.c:960

900 +#: bisect.c:950

901 msgid "reading bisect refs failed"

902 msgstr ""

903

904 -#: bisect.c:979

904 +#: bisect.c:969

905 #, c-format

906 msgid "%s was both %s and %s\n"

907 msgstr ""

908

909 -#: bisect.c:987

909 +#: bisect.c:977

910 #, c-format

911 msgid ""

912 "No testable commit found.\n"

913 "Maybe you started with bad path parameters?\n"

914 msgstr ""

915

916 -#: bisect.c:1006

916 +#: bisect.c:996

917 #, c-format

918 msgid "(roughly %d step)"

919 msgid_plural "(roughly %d steps)"

@@ -923,43 +923,43 @@ msgstr[1] ""

923 #. TRANSLATORS: the last %s will be replaced with "(roughly %d

924 #. steps)" translation.

925 #.

926 -#: bisect.c:1012

926 +#: bisect.c:1002

927 #, c-format

928 msgid "Bisecting: %d revision left to test after this %s\n"

929 msgid_plural "Bisecting: %d revisions left to test after this %s\n"

930 msgstr[0] ""

931 msgstr[1] ""

932

933 -#: blame.c:1757

933 +#: blame.c:1758

934 msgid "--contents and --reverse do not blend well."

935 msgstr ""

936

937 -#: blame.c:1768

937 +#: blame.c:1769

938 msgid "cannot use --contents with final commit object name"

939 msgstr ""

940

941 -#: blame.c:1788

941 +#: blame.c:1789

942 msgid "--reverse and --first-parent together require specified latest commit"

943 msgstr ""

944

945 -#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177

946 -#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918

947 -#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369

945 +#: blame.c:1798 bundle.c:160 ref-filter.c:1978 sequencer.c:1699

946 +#: sequencer.c:2901 builtin/commit.c:976 builtin/log.c:366 builtin/log.c:920

947 +#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:370

948 #: builtin/shortlog.c:191

949 msgid "revision walk setup failed"

950 msgstr ""

951

952 -#: blame.c:1815

952 +#: blame.c:1816

953 msgid ""

954 "--reverse --first-parent together require range along first-parent chain"

955 msgstr ""

956

957 -#: blame.c:1826

957 +#: blame.c:1827

958 #, c-format

959 msgid "no such path %s in %s"

960 msgstr ""

961

962 -#: blame.c:1837

962 +#: blame.c:1838

963 #, c-format

964 msgid "cannot read blob %s for path %s"

965 msgstr ""

@@ -1098,76 +1098,75 @@ msgstr ""

1098 msgid "unrecognized header: %s%s (%d)"

1099 msgstr ""

1100

1101 -#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637

1102 -#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782

1101 +#: bundle.c:88 sequencer.c:1879 sequencer.c:2337 builtin/commit.c:750

1102 #, c-format

1103 msgid "could not open '%s'"

1104 msgstr ""

1105

1107 -#: bundle.c:140

1106 +#: bundle.c:139

1107 msgid "Repository lacks these prerequisite commits:"

1108 msgstr ""

1109

1111 -#: bundle.c:193

1110 +#: bundle.c:190

1111 #, c-format

1112 msgid "The bundle contains this ref:"

1113 msgid_plural "The bundle contains these %d refs:"

1114 msgstr[0] ""

1115 msgstr[1] ""

1116

1118 -#: bundle.c:200

1117 +#: bundle.c:197

1118 msgid "The bundle records a complete history."

1119 msgstr ""

1120

1122 -#: bundle.c:202

1121 +#: bundle.c:199

1122 #, c-format

1123 msgid "The bundle requires this ref:"

1124 msgid_plural "The bundle requires these %d refs:"

1125 msgstr[0] ""

1126 msgstr[1] ""

1127

1129 -#: bundle.c:261

1128 +#: bundle.c:258

1129 msgid "Could not spawn pack-objects"

1130 msgstr ""

1131

1133 -#: bundle.c:272

1132 +#: bundle.c:269

1133 msgid "pack-objects died"

1134 msgstr ""

1135

1137 -#: bundle.c:314

1136 +#: bundle.c:311

1137 msgid "rev-list died"

1138 msgstr ""

1139

1141 -#: bundle.c:363

1140 +#: bundle.c:360

1141 #, c-format

1142 msgid "ref '%s' is excluded by the rev-list options"

1143 msgstr ""

1144

1146 -#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296

1145 +#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:296

1146 #, c-format

1147 msgid "unrecognized argument: %s"

1148 msgstr ""

1149

1151 -#: bundle.c:461

1150 +#: bundle.c:458

1151 msgid "Refusing to create empty bundle."

1152 msgstr ""

1153

1155 -#: bundle.c:473

1154 +#: bundle.c:470

1155 #, c-format

1156 msgid "cannot create '%s'"

1157 msgstr ""

1158

1160 -#: bundle.c:501

1159 +#: bundle.c:498

1160 msgid "index-pack died"

1161 msgstr ""

1162

1164 -#: color.c:301

1163 +#: color.c:296

1164 #, c-format

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

1166 msgstr ""

1167

1169 -#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465

1170 -#: builtin/am.c:1434 builtin/am.c:2069

1168 +#: commit.c:41 sequencer.c:2141 builtin/am.c:421 builtin/am.c:465

1169 +#: builtin/am.c:1436 builtin/am.c:2072

1170 #, c-format

1171 msgid "could not parse %s"

1172 msgstr ""

@@ -1177,7 +1176,7 @@ msgstr ""

1176 msgid "%s %s is not a commit!"

1177 msgstr ""

1178

1180 -#: commit.c:1524

1179 +#: commit.c:1506

1180 msgid ""

1181 "Warning: commit message did not conform to UTF-8.\n"

1182 "You may want to amend it after fixing the message, or set the config\n"

@@ -1280,65 +1279,65 @@ msgstr ""

1279 msgid "bad zlib compression level %d"

1280 msgstr ""

1281

1283 -#: config.c:1222

1282 +#: config.c:1225

1283 #, c-format

1284 msgid "invalid mode for object creation: %s"

1285 msgstr ""

1286

1288 -#: config.c:1378

1287 +#: config.c:1386

1288 #, c-format

1289 msgid "bad pack compression level %d"

1290 msgstr ""

1291

1293 -#: config.c:1574

1292 +#: config.c:1582

1293 msgid "unable to parse command-line config"

1294 msgstr ""

1295

1297 -#: config.c:1906

1296 +#: config.c:1914

1297 msgid "unknown error occurred while reading the configuration files"

1298 msgstr ""

1299

1301 -#: config.c:2093

1300 +#: config.c:2101

1301 #, c-format

1302 msgid "Invalid %s: '%s'"

1303 msgstr ""

1304

1306 -#: config.c:2136

1305 +#: config.c:2144

1306 #, c-format

1307 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"

1308 msgstr ""

1309

1311 -#: config.c:2162

1310 +#: config.c:2170

1311 #, c-format

1312 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"

1313 msgstr ""

1314

1316 -#: config.c:2187

1315 +#: config.c:2195

1316 #, c-format

1317 msgid "unable to parse '%s' from command-line config"

1318 msgstr ""

1319

1321 -#: config.c:2189

1320 +#: config.c:2197

1321 #, c-format

1322 msgid "bad config variable '%s' in file '%s' at line %d"

1323 msgstr ""

1324

1326 -#: config.c:2248

1325 +#: config.c:2256

1326 #, c-format

1327 msgid "%s has multiple values"

1328 msgstr ""

1329

1331 -#: config.c:2591 config.c:2808

1330 +#: config.c:2599 config.c:2816

1331 #, c-format

1332 msgid "fstat on %s failed"

1333 msgstr ""

1334

1336 -#: config.c:2698

1335 +#: config.c:2706

1336 #, c-format

1337 msgid "could not set '%s' to '%s'"

1338 msgstr ""

1339

1341 -#: config.c:2700 builtin/remote.c:776

1340 +#: config.c:2708 builtin/remote.c:776

1341 #, c-format

1342 msgid "could not unset '%s'"

1343 msgstr ""

@@ -1355,46 +1354,46 @@ msgid ""

1354 "and the repository exists."

1355 msgstr ""

1356

1358 -#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141

1357 +#: connected.c:66 builtin/fsck.c:198 builtin/prune.c:144

1358 msgid "Checking connectivity"

1359 msgstr ""

1360

1362 -#: connected.c:76

1361 +#: connected.c:78

1362 msgid "Could not run 'git rev-list'"

1363 msgstr ""

1364

1366 -#: connected.c:96

1365 +#: connected.c:98

1366 msgid "failed write to rev-list"

1367 msgstr ""

1368

1370 -#: connected.c:103

1369 +#: connected.c:105

1370 msgid "failed to close rev-list's stdin"

1371 msgstr ""

1372

1373 #: convert.c:205

1374 #, c-format

1375 +msgid "CRLF would be replaced by LF in %s."

1376 +msgstr ""

1377 +

1378 +#: convert.c:207

1379 +#, c-format

1380 msgid ""

1381 "CRLF will be replaced by LF in %s.\n"

1382 "The file will have its original line endings in your working directory."

1383 msgstr ""

1384

1381 -#: convert.c:209

1385 +#: convert.c:215

1386 #, c-format

1383 -msgid "CRLF would be replaced by LF in %s."

1387 +msgid "LF would be replaced by CRLF in %s"

1388 msgstr ""

1389

1386 -#: convert.c:215

1390 +#: convert.c:217

1391 #, c-format

1392 msgid ""

1393 "LF will be replaced by CRLF in %s.\n"

1394 "The file will have its original line endings in your working directory."

1395 msgstr ""

1396

1393 -#: convert.c:219

1394 -#, c-format

1395 -msgid "LF would be replaced by CRLF in %s"

1396 -msgstr ""

1397 -

1397 #: date.c:116

1398 msgid "in the future"

1399 msgstr ""

@@ -1505,59 +1504,68 @@ msgid ""

1504 "%s"

1505 msgstr ""

1506

1508 -#: diff.c:3799

1507 +#: diff.c:3822

1508 #, c-format

1509 msgid "external diff died, stopping at %s"

1510 msgstr ""

1511

1513 -#: diff.c:4127

1512 +#: diff.c:4146

1513 msgid "--name-only, --name-status, --check and -s are mutually exclusive"

1514 msgstr ""

1515

1517 -#: diff.c:4215

1516 +#: diff.c:4149

1517 +msgid "-G, -S and --find-object are mutually exclusive"

1518 +msgstr ""

1519 +

1520 +#: diff.c:4237

1521 msgid "--follow requires exactly one pathspec"

1522 msgstr ""

1523

1521 -#: diff.c:4381

1524 +#: diff.c:4403

1525 #, c-format

1526 msgid ""

1527 "Failed to parse --dirstat/-X option parameter:\n"

1528 "%s"

1529 msgstr ""

1530

1528 -#: diff.c:4395

1531 +#: diff.c:4417

1532 #, c-format

1533 msgid "Failed to parse --submodule option parameter: '%s'"

1534 msgstr ""

1535

1533 -#: diff.c:5446

1536 +#: diff.c:5493

1537 msgid "inexact rename detection was skipped due to too many files."

1538 msgstr ""

1539

1537 -#: diff.c:5449

1540 +#: diff.c:5496

1541 msgid "only found copies from modified paths due to too many files."

1542 msgstr ""

1543

1541 -#: diff.c:5452

1544 +#: diff.c:5499

1545 #, c-format

1546 msgid ""

1547 "you may want to set your %s variable to at least %d and retry the command."

1548 msgstr ""

1549

1547 -#: dir.c:2100

1550 +#: dir.c:1866

1551 +#, c-format

1552 +msgid "could not open directory '%s'"

1553 +msgstr ""

1554 +

1555 +#: dir.c:2108

1556 msgid "failed to get kernel name and information"

1557 msgstr ""

1558

1551 -#: dir.c:2219

1559 +#: dir.c:2232

1560 msgid "Untracked cache is disabled on this system or location."

1561 msgstr ""

1562

1555 -#: dir.c:3002 dir.c:3007

1563 +#: dir.c:3024 dir.c:3029

1564 #, c-format

1565 msgid "could not create directories for %s"

1566 msgstr ""

1567

1560 -#: dir.c:3032

1568 +#: dir.c:3054

1569 #, c-format

1570 msgid "could not migrate git directory from '%s' to '%s'"

1571 msgstr ""

@@ -1576,184 +1584,192 @@ msgstr ""

1584 msgid "could not stat file '%s'"

1585 msgstr ""

1586

1579 -#: fetch-pack.c:252

1587 +#: fetch-object.c:17

1588 +msgid "Remote with no URL"

1589 +msgstr ""

1590 +

1591 +#: fetch-pack.c:253

1592 msgid "git fetch-pack: expected shallow list"

1593 msgstr ""

1594

1583 -#: fetch-pack.c:264

1584 -msgid "git fetch-pack: expected ACK/NAK, got EOF"

1595 +#: fetch-pack.c:265

1596 +msgid "git fetch-pack: expected ACK/NAK, got a flush packet"

1597 msgstr ""

1598

1587 -#: fetch-pack.c:283 builtin/archive.c:63

1599 +#: fetch-pack.c:284 builtin/archive.c:63

1600 #, c-format

1601 msgid "remote error: %s"

1602 msgstr ""

1603

1592 -#: fetch-pack.c:284

1604 +#: fetch-pack.c:285

1605 #, c-format

1606 msgid "git fetch-pack: expected ACK/NAK, got '%s'"

1607 msgstr ""

1608

1597 -#: fetch-pack.c:336

1609 +#: fetch-pack.c:337

1610 msgid "--stateless-rpc requires multi_ack_detailed"

1611 msgstr ""

1612

1601 -#: fetch-pack.c:422

1613 +#: fetch-pack.c:428

1614 #, c-format

1615 msgid "invalid shallow line: %s"

1616 msgstr ""

1617

1606 -#: fetch-pack.c:428

1618 +#: fetch-pack.c:434

1619 #, c-format

1620 msgid "invalid unshallow line: %s"

1621 msgstr ""

1622

1611 -#: fetch-pack.c:430

1623 +#: fetch-pack.c:436

1624 #, c-format

1625 msgid "object not found: %s"

1626 msgstr ""

1627

1616 -#: fetch-pack.c:433

1628 +#: fetch-pack.c:439

1629 #, c-format

1630 msgid "error in object: %s"

1631 msgstr ""

1632

1621 -#: fetch-pack.c:435

1633 +#: fetch-pack.c:441

1634 #, c-format

1635 msgid "no shallow found: %s"

1636 msgstr ""

1637

1626 -#: fetch-pack.c:438

1638 +#: fetch-pack.c:444

1639 #, c-format

1640 msgid "expected shallow/unshallow, got %s"

1641 msgstr ""

1642

1631 -#: fetch-pack.c:477

1643 +#: fetch-pack.c:485

1644 #, c-format

1645 msgid "got %s %d %s"

1646 msgstr ""

1647

1636 -#: fetch-pack.c:491

1648 +#: fetch-pack.c:499

1649 #, c-format

1650 msgid "invalid commit %s"

1651 msgstr ""

1652

1641 -#: fetch-pack.c:524

1653 +#: fetch-pack.c:532

1654 msgid "giving up"

1655 msgstr ""

1656

1645 -#: fetch-pack.c:534 progress.c:229

1657 +#: fetch-pack.c:542 progress.c:229

1658 msgid "done"

1659 msgstr ""

1660

1649 -#: fetch-pack.c:546

1661 +#: fetch-pack.c:554

1662 #, c-format

1663 msgid "got %s (%d) %s"

1664 msgstr ""

1665

1654 -#: fetch-pack.c:592

1666 +#: fetch-pack.c:600

1667 #, c-format

1668 msgid "Marking %s as complete"

1669 msgstr ""

1670

1659 -#: fetch-pack.c:777

1671 +#: fetch-pack.c:788

1672 #, c-format

1673 msgid "already have %s (%s)"

1674 msgstr ""

1675

1664 -#: fetch-pack.c:815

1676 +#: fetch-pack.c:829

1677 msgid "fetch-pack: unable to fork off sideband demultiplexer"

1678 msgstr ""

1679

1668 -#: fetch-pack.c:823

1680 +#: fetch-pack.c:837

1681 msgid "protocol error: bad pack header"

1682 msgstr ""

1683

1672 -#: fetch-pack.c:879

1684 +#: fetch-pack.c:895

1685 #, c-format

1686 msgid "fetch-pack: unable to fork off %s"

1687 msgstr ""

1688

1677 -#: fetch-pack.c:895

1689 +#: fetch-pack.c:911

1690 #, c-format

1691 msgid "%s failed"

1692 msgstr ""

1693

1682 -#: fetch-pack.c:897

1694 +#: fetch-pack.c:913

1695 msgid "error in sideband demultiplexer"

1696 msgstr ""

1697

1686 -#: fetch-pack.c:924

1698 +#: fetch-pack.c:940

1699 msgid "Server does not support shallow clients"

1700 msgstr ""

1701

1690 -#: fetch-pack.c:928

1702 +#: fetch-pack.c:944

1703 msgid "Server supports multi_ack_detailed"

1704 msgstr ""

1705

1694 -#: fetch-pack.c:931

1706 +#: fetch-pack.c:947

1707 msgid "Server supports no-done"

1708 msgstr ""

1709

1698 -#: fetch-pack.c:937

1710 +#: fetch-pack.c:953

1711 msgid "Server supports multi_ack"

1712 msgstr ""

1713

1702 -#: fetch-pack.c:941

1714 +#: fetch-pack.c:957

1715 msgid "Server supports side-band-64k"

1716 msgstr ""

1717

1706 -#: fetch-pack.c:945

1718 +#: fetch-pack.c:961

1719 msgid "Server supports side-band"

1720 msgstr ""

1721

1710 -#: fetch-pack.c:949

1722 +#: fetch-pack.c:965

1723 msgid "Server supports allow-tip-sha1-in-want"

1724 msgstr ""

1725

1714 -#: fetch-pack.c:953

1726 +#: fetch-pack.c:969

1727 msgid "Server supports allow-reachable-sha1-in-want"

1728 msgstr ""

1729

1718 -#: fetch-pack.c:963

1730 +#: fetch-pack.c:979

1731 msgid "Server supports ofs-delta"

1732 msgstr ""

1733

1722 -#: fetch-pack.c:970

1734 +#: fetch-pack.c:985

1735 +msgid "Server supports filter"

1736 +msgstr ""

1737 +

1738 +#: fetch-pack.c:993

1739 #, c-format

1740 msgid "Server version is %.*s"

1741 msgstr ""

1742

1727 -#: fetch-pack.c:976

1743 +#: fetch-pack.c:999

1744 msgid "Server does not support --shallow-since"

1745 msgstr ""

1746

1731 -#: fetch-pack.c:980

1747 +#: fetch-pack.c:1003

1748 msgid "Server does not support --shallow-exclude"

1749 msgstr ""

1750

1735 -#: fetch-pack.c:982

1751 +#: fetch-pack.c:1005

1752 msgid "Server does not support --deepen"

1753 msgstr ""

1754

1739 -#: fetch-pack.c:993

1755 +#: fetch-pack.c:1016

1756 msgid "no common commits"

1757 msgstr ""

1758

1743 -#: fetch-pack.c:1005

1759 +#: fetch-pack.c:1028

1760 msgid "git fetch-pack: fetch failed."

1761 msgstr ""

1762

1747 -#: fetch-pack.c:1167

1763 +#: fetch-pack.c:1190

1764 msgid "no matching remote head"

1765 msgstr ""

1766

1751 -#: fetch-pack.c:1189

1767 +#: fetch-pack.c:1212

1768 #, c-format

1769 msgid "no such remote ref %s"

1770 msgstr ""

1771

1756 -#: fetch-pack.c:1192

1772 +#: fetch-pack.c:1215

1773 #, c-format

1774 msgid "Server does not allow request for unadvertised object %s"

1775 msgstr ""

@@ -1776,17 +1792,18 @@ msgstr ""

1792 msgid "ignore invalid color '%.*s' in log.graphColors"

1793 msgstr ""

1794

1779 -#: grep.c:2017

1795 +#: grep.c:2022

1796 #, c-format

1797 msgid "'%s': unable to read %s"

1798 msgstr ""

1799

1784 -#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134

1800 +#: grep.c:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81

1801 +#: builtin/rm.c:134

1802 #, c-format

1803 msgid "failed to stat '%s'"

1804 msgstr ""

1805

1789 -#: grep.c:2045

1806 +#: grep.c:2050

1807 #, c-format

1808 msgid "'%s': short read"

1809 msgstr ""

@@ -1907,18 +1924,17 @@ msgstr ""

1924 msgid "name consists only of disallowed characters: %s"

1925 msgstr ""

1926

1910 -#: ident.c:416 builtin/commit.c:616

1927 +#: ident.c:416 builtin/commit.c:582

1928 #, c-format

1929 msgid "invalid date format: %s"

1930 msgstr ""

1931

1915 -#: list-objects-filter-options.c:30

1916 -msgid "multiple object filter types cannot be combined"

1932 +#: list-objects-filter-options.c:36

1933 +msgid "multiple filter-specs cannot be combined"

1934 msgstr ""

1935

1919 -#: list-objects-filter-options.c:41 list-objects-filter-options.c:68

1920 -#, c-format

1921 -msgid "invalid filter-spec expression '%s'"

1936 +#: list-objects-filter-options.c:126

1937 +msgid "cannot change partial clone promisor remote"

1938 msgstr ""

1939

1940 #: lockfile.c:151

@@ -1942,8 +1958,8 @@ msgstr ""

1958 msgid "failed to read the cache"

1959 msgstr ""

1960

1945 -#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379

1946 -#: builtin/checkout.c:600 builtin/clone.c:754

1961 +#: merge.c:134 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378

1962 +#: builtin/checkout.c:599 builtin/clone.c:759

1963 msgid "unable to write new index file"

1964 msgstr ""

1965

@@ -1960,239 +1976,239 @@ msgstr ""

1976 msgid "error building trees"

1977 msgstr ""

1978

1963 -#: merge-recursive.c:752

1979 +#: merge-recursive.c:771

1980 #, c-format

1981 msgid "failed to create path '%s'%s"

1982 msgstr ""

1983

1968 -#: merge-recursive.c:763

1984 +#: merge-recursive.c:782

1985 #, c-format

1986 msgid "Removing %s to make room for subdirectory\n"

1987 msgstr ""

1988

1973 -#: merge-recursive.c:777 merge-recursive.c:796

1989 +#: merge-recursive.c:796 merge-recursive.c:815

1990 msgid ": perhaps a D/F conflict?"

1991 msgstr ""

1992

1977 -#: merge-recursive.c:786

1993 +#: merge-recursive.c:805

1994 #, c-format

1995 msgid "refusing to lose untracked file at '%s'"

1996 msgstr ""

1997

1982 -#: merge-recursive.c:828 builtin/cat-file.c:37

1998 +#: merge-recursive.c:847 builtin/cat-file.c:37

1999 #, c-format

2000 msgid "cannot read object %s '%s'"

2001 msgstr ""

2002

1987 -#: merge-recursive.c:830

2003 +#: merge-recursive.c:849

2004 #, c-format

2005 msgid "blob expected for %s '%s'"

2006 msgstr ""

2007

1992 -#: merge-recursive.c:854

2008 +#: merge-recursive.c:873

2009 #, c-format

2010 msgid "failed to open '%s': %s"

2011 msgstr ""

2012

1997 -#: merge-recursive.c:865

2013 +#: merge-recursive.c:884

2014 #, c-format

2015 msgid "failed to symlink '%s': %s"

2016 msgstr ""

2017

2002 -#: merge-recursive.c:870

2018 +#: merge-recursive.c:889

2019 #, c-format

2020 msgid "do not know what to do with %06o %s '%s'"

2021 msgstr ""

2022

2007 -#: merge-recursive.c:1010

2023 +#: merge-recursive.c:1029

2024 msgid "Failed to execute internal merge"

2025 msgstr ""

2026

2011 -#: merge-recursive.c:1014

2027 +#: merge-recursive.c:1034

2028 #, c-format

2029 msgid "Unable to add %s to database"

2030 msgstr ""

2031

2016 -#: merge-recursive.c:1117

2032 +#: merge-recursive.c:1146

2033 #, c-format

2034 msgid ""

2035 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

2036 "in tree."

2037 msgstr ""

2038

2023 -#: merge-recursive.c:1122

2039 +#: merge-recursive.c:1151

2040 #, c-format

2041 msgid ""

2042 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

2043 "left in tree."

2044 msgstr ""

2045

2030 -#: merge-recursive.c:1129

2046 +#: merge-recursive.c:1158

2047 #, c-format

2048 msgid ""

2049 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

2050 "in tree at %s."

2051 msgstr ""

2052

2037 -#: merge-recursive.c:1134

2053 +#: merge-recursive.c:1163

2054 #, c-format

2055 msgid ""

2056 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

2057 "left in tree at %s."

2058 msgstr ""

2059

2044 -#: merge-recursive.c:1168

2060 +#: merge-recursive.c:1197

2061 msgid "rename"

2062 msgstr ""

2063

2048 -#: merge-recursive.c:1168

2064 +#: merge-recursive.c:1197

2065 msgid "renamed"

2066 msgstr ""

2067

2052 -#: merge-recursive.c:1225

2068 +#: merge-recursive.c:1254

2069 #, c-format

2070 msgid "%s is a directory in %s adding as %s instead"

2071 msgstr ""

2072

2057 -#: merge-recursive.c:1250

2073 +#: merge-recursive.c:1279

2074 #, c-format

2075 msgid ""

2076 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"

2077 "\"->\"%s\" in \"%s\"%s"

2078 msgstr ""

2079

2064 -#: merge-recursive.c:1255

2080 +#: merge-recursive.c:1284

2081 msgid " (left unresolved)"

2082 msgstr ""

2083

2068 -#: merge-recursive.c:1317

2084 +#: merge-recursive.c:1346

2085 #, c-format

2086 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

2087 msgstr ""

2088

2073 -#: merge-recursive.c:1350

2089 +#: merge-recursive.c:1379

2090 #, c-format

2091 msgid "Renaming %s to %s and %s to %s instead"

2092 msgstr ""

2093

2078 -#: merge-recursive.c:1553

2094 +#: merge-recursive.c:1582

2095 #, c-format

2096 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"

2097 msgstr ""

2098

2083 -#: merge-recursive.c:1568

2099 +#: merge-recursive.c:1597

2100 #, c-format

2101 msgid "Adding merged %s"

2102 msgstr ""

2103

2088 -#: merge-recursive.c:1575 merge-recursive.c:1805

2104 +#: merge-recursive.c:1604 merge-recursive.c:1834

2105 #, c-format

2106 msgid "Adding as %s instead"

2107 msgstr ""

2108

2093 -#: merge-recursive.c:1632

2109 +#: merge-recursive.c:1661

2110 #, c-format

2111 msgid "cannot read object %s"

2112 msgstr ""

2113

2098 -#: merge-recursive.c:1635

2114 +#: merge-recursive.c:1664

2115 #, c-format

2116 msgid "object %s is not a blob"

2117 msgstr ""

2118

2103 -#: merge-recursive.c:1704

2119 +#: merge-recursive.c:1733

2120 msgid "modify"

2121 msgstr ""

2122

2107 -#: merge-recursive.c:1704

2123 +#: merge-recursive.c:1733

2124 msgid "modified"

2125 msgstr ""

2126

2111 -#: merge-recursive.c:1714

2127 +#: merge-recursive.c:1743

2128 msgid "content"

2129 msgstr ""

2130

2115 -#: merge-recursive.c:1721

2131 +#: merge-recursive.c:1750

2132 msgid "add/add"

2133 msgstr ""

2134

2119 -#: merge-recursive.c:1757

2135 +#: merge-recursive.c:1786

2136 #, c-format

2137 msgid "Skipped %s (merged same as existing)"

2138 msgstr ""

2139

2124 -#: merge-recursive.c:1771

2140 +#: merge-recursive.c:1800

2141 #, c-format

2142 msgid "Auto-merging %s"

2143 msgstr ""

2144

2129 -#: merge-recursive.c:1775 git-submodule.sh:932

2145 +#: merge-recursive.c:1804 git-submodule.sh:879

2146 msgid "submodule"

2147 msgstr ""

2148

2133 -#: merge-recursive.c:1776

2149 +#: merge-recursive.c:1805

2150 #, c-format

2151 msgid "CONFLICT (%s): Merge conflict in %s"

2152 msgstr ""

2153

2138 -#: merge-recursive.c:1870

2154 +#: merge-recursive.c:1899

2155 #, c-format

2156 msgid "Removing %s"

2157 msgstr ""

2158

2143 -#: merge-recursive.c:1896

2159 +#: merge-recursive.c:1925

2160 msgid "file/directory"

2161 msgstr ""

2162

2147 -#: merge-recursive.c:1902

2163 +#: merge-recursive.c:1931

2164 msgid "directory/file"

2165 msgstr ""

2166

2151 -#: merge-recursive.c:1909

2167 +#: merge-recursive.c:1938

2168 #, c-format

2169 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"

2170 msgstr ""

2171

2156 -#: merge-recursive.c:1918

2172 +#: merge-recursive.c:1947

2173 #, c-format

2174 msgid "Adding %s"

2175 msgstr ""

2176

2161 -#: merge-recursive.c:1958

2177 +#: merge-recursive.c:1987

2178 #, c-format

2179 msgid "Dirty index: cannot merge (dirty: %s)"

2180 msgstr ""

2181

2166 -#: merge-recursive.c:1962

2182 +#: merge-recursive.c:1991

2183 msgid "Already up to date!"

2184 msgstr ""

2185

2170 -#: merge-recursive.c:1971

2186 +#: merge-recursive.c:2000

2187 #, c-format

2188 msgid "merging of trees %s and %s failed"

2189 msgstr ""

2190

2175 -#: merge-recursive.c:2068

2191 +#: merge-recursive.c:2097

2192 msgid "Merging:"

2193 msgstr ""

2194

2179 -#: merge-recursive.c:2081

2195 +#: merge-recursive.c:2110

2196 #, c-format

2197 msgid "found %u common ancestor:"

2198 msgid_plural "found %u common ancestors:"

2199 msgstr[0] ""

2200 msgstr[1] ""

2201

2186 -#: merge-recursive.c:2120

2202 +#: merge-recursive.c:2149

2203 msgid "merge returned no commit"

2204 msgstr ""

2205

2190 -#: merge-recursive.c:2183

2206 +#: merge-recursive.c:2212

2207 #, c-format

2208 msgid "Could not parse object '%s'"

2209 msgstr ""

2210

2195 -#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815

2211 +#: merge-recursive.c:2228 builtin/merge.c:657 builtin/merge.c:816

2212 msgid "Unable to write index."

2213 msgstr ""

2214

@@ -2209,16 +2225,16 @@ msgstr ""

2225 msgid "You have not concluded your notes merge (%s exists)."

2226 msgstr ""

2227

2212 -#: notes-utils.c:42

2228 +#: notes-utils.c:43

2229 msgid "Cannot commit uninitialized/unreferenced notes tree"

2230 msgstr ""

2231

2216 -#: notes-utils.c:101

2232 +#: notes-utils.c:102

2233 #, c-format

2234 msgid "Bad notes.rewriteMode value: '%s'"

2235 msgstr ""

2236

2221 -#: notes-utils.c:111

2237 +#: notes-utils.c:112

2238 #, c-format

2239 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"

2240 msgstr ""

@@ -2227,7 +2243,7 @@ msgstr ""

2243 #. the environment variable, the second %s is

2244 #. its value.

2245 #.

2230 -#: notes-utils.c:141

2246 +#: notes-utils.c:142

2247 #, c-format

2248 msgid "Bad %s value: '%s'"

2249 msgstr ""

@@ -2237,25 +2253,25 @@ msgstr ""

2253 msgid "unable to parse object: %s"

2254 msgstr ""

2255

2240 -#: packfile.c:556

2256 +#: packfile.c:561

2257 msgid "offset before end of packfile (broken .idx?)"

2258 msgstr ""

2259

2244 -#: packfile.c:1683

2260 +#: packfile.c:1694

2261 #, c-format

2262 msgid "offset before start of pack index for %s (corrupt index?)"

2263 msgstr ""

2264

2249 -#: packfile.c:1687

2265 +#: packfile.c:1698

2266 #, c-format

2267 msgid "offset beyond end of pack index for %s (truncated index?)"

2268 msgstr ""

2269

2254 -#: parse-options.c:573

2270 +#: parse-options.c:619

2271 msgid "..."

2272 msgstr ""

2273

2258 -#: parse-options.c:592

2274 +#: parse-options.c:638

2275 #, c-format

2276 msgid "usage: %s"

2277 msgstr ""

@@ -2263,17 +2279,17 @@ msgstr ""

2279 #. TRANSLATORS: the colon here should align with the

2280 #. one in "usage: %s" translation.

2281 #.

2266 -#: parse-options.c:598

2282 +#: parse-options.c:644

2283 #, c-format

2284 msgid " or: %s"

2285 msgstr ""

2286

2271 -#: parse-options.c:601

2287 +#: parse-options.c:647

2288 #, c-format

2289 msgid " %s"

2290 msgstr ""

2291

2276 -#: parse-options.c:640

2292 +#: parse-options.c:686

2293 msgid "-NUM"

2294 msgstr ""

2295

@@ -2362,36 +2378,36 @@ msgstr ""

2378 msgid "unable to parse --pretty format"

2379 msgstr ""

2380

2365 -#: read-cache.c:1472

2381 +#: read-cache.c:1473

2382 #, c-format

2383 msgid ""

2384 "index.version set, but the value is invalid.\n"

2385 "Using version %i"

2386 msgstr ""

2387

2372 -#: read-cache.c:1482

2388 +#: read-cache.c:1483

2389 #, c-format

2390 msgid ""

2391 "GIT_INDEX_VERSION set, but the value is invalid.\n"

2392 "Using version %i"

2393 msgstr ""

2394

2379 -#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048

2395 +#: read-cache.c:2375 sequencer.c:3248 wrapper.c:658 builtin/merge.c:1049

2396 #, c-format

2397 msgid "could not close '%s'"

2398 msgstr ""

2399

2384 -#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096

2400 +#: read-cache.c:2448 sequencer.c:1900 sequencer.c:2627

2401 #, c-format

2402 msgid "could not stat '%s'"

2403 msgstr ""

2404

2389 -#: read-cache.c:2455

2405 +#: read-cache.c:2461

2406 #, c-format

2407 msgid "unable to open git dir: %s"

2408 msgstr ""

2409

2394 -#: read-cache.c:2467

2410 +#: read-cache.c:2473

2411 #, c-format

2412 msgid "unable to unlink: %s"

2413 msgstr ""

@@ -2410,18 +2426,18 @@ msgstr ""

2426 msgid "could not remove reference %s"

2427 msgstr ""

2428

2413 -#: refs/files-backend.c:1203 refs/packed-backend.c:1524

2414 -#: refs/packed-backend.c:1534

2429 +#: refs/files-backend.c:1203 refs/packed-backend.c:1528

2430 +#: refs/packed-backend.c:1538

2431 #, c-format

2432 msgid "could not delete reference %s: %s"

2433 msgstr ""

2434

2419 -#: refs/files-backend.c:1206 refs/packed-backend.c:1537

2435 +#: refs/files-backend.c:1206 refs/packed-backend.c:1541

2436 #, c-format

2437 msgid "could not delete references: %s"

2438 msgstr ""

2439

2424 -#: ref-filter.c:35 wt-status.c:1816

2440 +#: ref-filter.c:35 wt-status.c:1842

2441 msgid "gone"

2442 msgstr ""

2443

@@ -2615,128 +2631,138 @@ msgstr ""

2631 msgid "(no branch)"

2632 msgstr ""

2633

2618 -#: ref-filter.c:1488 ref-filter.c:1519

2634 +#: ref-filter.c:1364

2635 #, c-format

2636 msgid "missing object %s for %s"

2637 msgstr ""

2638

2623 -#: ref-filter.c:1491 ref-filter.c:1522

2639 +#: ref-filter.c:1367

2640 #, c-format

2641 msgid "parse_object_buffer failed on %s for %s"

2642 msgstr ""

2643

2628 -#: ref-filter.c:1822

2644 +#: ref-filter.c:1819

2645 #, c-format

2646 msgid "malformed object at '%s'"

2647 msgstr ""

2648

2633 -#: ref-filter.c:1889

2649 +#: ref-filter.c:1886

2650 #, c-format

2651 msgid "ignoring ref with broken name %s"

2652 msgstr ""

2653

2638 -#: ref-filter.c:1894

2654 +#: ref-filter.c:1891

2655 #, c-format

2656 msgid "ignoring broken ref %s"

2657 msgstr ""

2658

2643 -#: ref-filter.c:2156

2659 +#: ref-filter.c:2152

2660 #, c-format

2661 msgid "format: %%(end) atom missing"

2662 msgstr ""

2663

2648 -#: ref-filter.c:2250

2664 +#: ref-filter.c:2246

2665 #, c-format

2666 msgid "malformed object name %s"

2667 msgstr ""

2668

2653 -#: remote.c:780

2669 +#: remote.c:795

2670 #, c-format

2671 msgid "Cannot fetch both %s and %s to %s"

2672 msgstr ""

2673

2658 -#: remote.c:784

2674 +#: remote.c:799

2675 #, c-format

2676 msgid "%s usually tracks %s, not %s"

2677 msgstr ""

2678

2663 -#: remote.c:788

2679 +#: remote.c:803

2680 #, c-format

2681 msgid "%s tracks both %s and %s"

2682 msgstr ""

2683

2668 -#: remote.c:796

2684 +#: remote.c:811

2685 msgid "Internal error"

2686 msgstr ""

2687

2672 -#: remote.c:1711 remote.c:1813

2688 +#: remote.c:1726 remote.c:1828

2689 msgid "HEAD does not point to a branch"

2690 msgstr ""

2691

2676 -#: remote.c:1720

2692 +#: remote.c:1735

2693 #, c-format

2694 msgid "no such branch: '%s'"

2695 msgstr ""

2696

2681 -#: remote.c:1723

2697 +#: remote.c:1738

2698 #, c-format

2699 msgid "no upstream configured for branch '%s'"

2700 msgstr ""

2701

2686 -#: remote.c:1729

2702 +#: remote.c:1744

2703 #, c-format

2704 msgid "upstream branch '%s' not stored as a remote-tracking branch"

2705 msgstr ""

2706

2691 -#: remote.c:1744

2707 +#: remote.c:1759

2708 #, c-format

2709 msgid "push destination '%s' on remote '%s' has no local tracking branch"

2710 msgstr ""

2711

2696 -#: remote.c:1756

2712 +#: remote.c:1771

2713 #, c-format

2714 msgid "branch '%s' has no remote for pushing"

2715 msgstr ""

2716

2701 -#: remote.c:1767

2717 +#: remote.c:1782

2718 #, c-format

2719 msgid "push refspecs for '%s' do not include '%s'"

2720 msgstr ""

2721

2706 -#: remote.c:1780

2722 +#: remote.c:1795

2723 msgid "push has no destination (push.default is 'nothing')"

2724 msgstr ""

2725

2710 -#: remote.c:1802

2726 +#: remote.c:1817

2727 msgid "cannot resolve 'simple' push to a single destination"

2728 msgstr ""

2729

2714 -#: remote.c:2106

2730 +#: remote.c:2132

2731 #, c-format

2732 msgid "Your branch is based on '%s', but the upstream is gone.\n"

2733 msgstr ""

2734

2719 -#: remote.c:2110

2735 +#: remote.c:2136

2736 msgid " (use \"git branch --unset-upstream\" to fixup)\n"

2737 msgstr ""

2738

2723 -#: remote.c:2113

2739 +#: remote.c:2139

2740 #, c-format

2741 msgid "Your branch is up to date with '%s'.\n"

2742 msgstr ""

2743

2728 -#: remote.c:2117

2744 +#: remote.c:2143

2745 +#, c-format

2746 +msgid "Your branch and '%s' refer to different commits.\n"

2747 +msgstr ""

2748 +

2749 +#: remote.c:2146

2750 +#, c-format

2751 +msgid " (use \"%s\" for details)\n"

2752 +msgstr ""

2753 +

2754 +#: remote.c:2150

2755 #, c-format

2756 msgid "Your branch is ahead of '%s' by %d commit.\n"

2757 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"

2758 msgstr[0] ""

2759 msgstr[1] ""

2760

2735 -#: remote.c:2123

2761 +#: remote.c:2156

2762 msgid " (use \"git push\" to publish your local commits)\n"

2763 msgstr ""

2764

2739 -#: remote.c:2126

2765 +#: remote.c:2159

2766 #, c-format

2767 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"

2768 msgid_plural ""

@@ -2744,11 +2770,11 @@ msgid_plural ""

2770 msgstr[0] ""

2771 msgstr[1] ""

2772

2747 -#: remote.c:2134

2773 +#: remote.c:2167

2774 msgid " (use \"git pull\" to update your local branch)\n"

2775 msgstr ""

2776

2751 -#: remote.c:2137

2777 +#: remote.c:2170

2778 #, c-format

2779 msgid ""

2780 "Your branch and '%s' have diverged,\n"

@@ -2759,28 +2785,28 @@ msgid_plural ""

2785 msgstr[0] ""

2786 msgstr[1] ""

2787

2762 -#: remote.c:2147

2788 +#: remote.c:2180

2789 msgid " (use \"git pull\" to merge the remote branch into yours)\n"

2790 msgstr ""

2791

2766 -#: revision.c:2268

2792 +#: revision.c:2277

2793 msgid "your current branch appears to be broken"

2794 msgstr ""

2795

2770 -#: revision.c:2271

2796 +#: revision.c:2280

2797 #, c-format

2798 msgid "your current branch '%s' does not have any commits yet"

2799 msgstr ""

2800

2775 -#: revision.c:2465

2801 +#: revision.c:2477

2802 msgid "--first-parent is incompatible with --bisect"

2803 msgstr ""

2804

2779 -#: run-command.c:645

2805 +#: run-command.c:731

2806 msgid "open /dev/null failed"

2807 msgstr ""

2808

2783 -#: run-command.c:1188

2809 +#: run-command.c:1274

2810 #, c-format

2811 msgid ""

2812 "The '%s' hook was ignored because it's not set as executable.\n"

@@ -2788,104 +2814,113 @@ msgid ""

2814 msgstr ""

2815

2816 #: send-pack.c:141

2817 +msgid "unexpected flush packet while reading remote unpack status"

2818 +msgstr ""

2819 +

2820 +#: send-pack.c:143

2821 #, c-format

2822 msgid "unable to parse remote unpack status: %s"

2823 msgstr ""

2824

2795 -#: send-pack.c:143

2825 +#: send-pack.c:145

2826 #, c-format

2827 msgid "remote unpack failed: %s"

2828 msgstr ""

2829

2800 -#: send-pack.c:306

2830 +#: send-pack.c:308

2831 msgid "failed to sign the push certificate"

2832 msgstr ""

2833

2804 -#: send-pack.c:419

2834 +#: send-pack.c:421

2835 msgid "the receiving end does not support --signed push"

2836 msgstr ""

2837

2808 -#: send-pack.c:421

2838 +#: send-pack.c:423

2839 msgid ""

2840 "not sending a push certificate since the receiving end does not support --"

2841 "signed push"

2842 msgstr ""

2843

2814 -#: send-pack.c:433

2844 +#: send-pack.c:435

2845 msgid "the receiving end does not support --atomic push"

2846 msgstr ""

2847

2818 -#: send-pack.c:438

2848 +#: send-pack.c:440

2849 msgid "the receiving end does not support push options"

2850 msgstr ""

2851

2822 -#: sequencer.c:218

2852 +#: sequencer.c:158

2853 +#, c-format

2854 +msgid "invalid commit message cleanup mode '%s'"

2855 +msgstr ""

2856 +

2857 +#: sequencer.c:267

2858 msgid "revert"

2859 msgstr ""

2860

2826 -#: sequencer.c:220

2861 +#: sequencer.c:269

2862 msgid "cherry-pick"

2863 msgstr ""

2864

2830 -#: sequencer.c:222

2865 +#: sequencer.c:271

2866 msgid "rebase -i"

2867 msgstr ""

2868

2834 -#: sequencer.c:224

2869 +#: sequencer.c:273

2870 #, c-format

2871 msgid "Unknown action: %d"

2872 msgstr ""

2873

2839 -#: sequencer.c:281

2874 +#: sequencer.c:330

2875 msgid ""

2876 "after resolving the conflicts, mark the corrected paths\n"

2877 "with 'git add <paths>' or 'git rm <paths>'"

2878 msgstr ""

2879

2845 -#: sequencer.c:284

2880 +#: sequencer.c:333

2881 msgid ""

2882 "after resolving the conflicts, mark the corrected paths\n"

2883 "with 'git add <paths>' or 'git rm <paths>'\n"

2884 "and commit the result with 'git commit'"

2885 msgstr ""

2886

2852 -#: sequencer.c:297 sequencer.c:1718

2887 +#: sequencer.c:346 sequencer.c:2245

2888 #, c-format

2889 msgid "could not lock '%s'"

2890 msgstr ""

2891

2857 -#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737

2858 -#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656

2892 +#: sequencer.c:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264

2893 +#: sequencer.c:3246 sequencer.c:3310 wrapper.c:656

2894 #, c-format

2895 msgid "could not write to '%s'"

2896 msgstr ""

2897

2863 -#: sequencer.c:304

2898 +#: sequencer.c:353

2899 #, c-format

2900 msgid "could not write eol to '%s'"

2901 msgstr ""

2902

2868 -#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725

2903 +#: sequencer.c:356 sequencer.c:2128 sequencer.c:2252

2904 #, c-format

2870 -msgid "failed to finalize '%s'."

2905 +msgid "failed to finalize '%s'"

2906 msgstr ""

2907

2873 -#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259

2874 -#: builtin/commit.c:754 builtin/merge.c:1046

2908 +#: sequencer.c:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259

2909 +#: builtin/commit.c:722 builtin/merge.c:1047

2910 #, c-format

2911 msgid "could not read '%s'"

2912 msgstr ""

2913

2879 -#: sequencer.c:358

2914 +#: sequencer.c:405

2915 #, c-format

2916 msgid "your local changes would be overwritten by %s."

2917 msgstr ""

2918

2884 -#: sequencer.c:362

2919 +#: sequencer.c:409

2920 msgid "commit your changes or stash them to proceed."

2921 msgstr ""

2922

2888 -#: sequencer.c:391

2923 +#: sequencer.c:438

2924 #, c-format

2925 msgid "%s: fast-forward"

2926 msgstr ""

@@ -2893,20 +2928,20 @@ msgstr ""

2928 #. TRANSLATORS: %s will be "revert", "cherry-pick" or

2929 #. "rebase -i".

2930 #.

2896 -#: sequencer.c:477

2931 +#: sequencer.c:526

2932 #, c-format

2933 msgid "%s: Unable to write new index file"

2934 msgstr ""

2935

2901 -#: sequencer.c:496

2936 +#: sequencer.c:542

2937 msgid "could not resolve HEAD commit"

2938 msgstr ""

2939

2905 -#: sequencer.c:516

2940 +#: sequencer.c:562

2941 msgid "unable to update cache tree"

2942 msgstr ""

2943

2909 -#: sequencer.c:600

2944 +#: sequencer.c:658

2945 #, c-format

2946 msgid ""

2947 "you have staged changes in your working tree\n"

@@ -2923,17 +2958,101 @@ msgid ""

2958 " git rebase --continue\n"

2959 msgstr ""

2960

2926 -#: sequencer.c:702

2961 +#: sequencer.c:915

2962 +msgid "'prepare-commit-msg' hook failed"

2963 +msgstr ""

2964 +

2965 +#: sequencer.c:922

2966 +msgid ""

2967 +"Your name and email address were configured automatically based\n"

2968 +"on your username and hostname. Please check that they are accurate.\n"

2969 +"You can suppress this message by setting them explicitly. Run the\n"

2970 +"following command and follow the instructions in your editor to edit\n"

2971 +"your configuration file:\n"

2972 +"\n"

2973 +" git config --global --edit\n"

2974 +"\n"

2975 +"After doing this, you may fix the identity used for this commit with:\n"

2976 +"\n"

2977 +" git commit --amend --reset-author\n"

2978 +msgstr ""

2979 +

2980 +#: sequencer.c:935

2981 +msgid ""

2982 +"Your name and email address were configured automatically based\n"

2983 +"on your username and hostname. Please check that they are accurate.\n"

2984 +"You can suppress this message by setting them explicitly:\n"

2985 +"\n"

2986 +" git config --global user.name \"Your Name\"\n"

2987 +" git config --global user.email you@example.com\n"

2988 +"\n"

2989 +"After doing this, you may fix the identity used for this commit with:\n"

2990 +"\n"

2991 +" git commit --amend --reset-author\n"

2992 +msgstr ""

2993 +

2994 +#: sequencer.c:975

2995 +msgid "couldn't look up newly created commit"

2996 +msgstr ""

2997 +

2998 +#: sequencer.c:977

2999 +msgid "could not parse newly created commit"

3000 +msgstr ""

3001 +

3002 +#: sequencer.c:1023

3003 +msgid "unable to resolve HEAD after creating commit"

3004 +msgstr ""

3005 +

3006 +#: sequencer.c:1025

3007 +msgid "detached HEAD"

3008 +msgstr ""

3009 +

3010 +#: sequencer.c:1029

3011 +msgid " (root-commit)"

3012 +msgstr ""

3013 +

3014 +#: sequencer.c:1050

3015 +msgid "could not parse HEAD"

3016 +msgstr ""

3017 +

3018 +#: sequencer.c:1052

3019 +#, c-format

3020 +msgid "HEAD %s is not a commit!"

3021 +msgstr ""

3022 +

3023 +#: sequencer.c:1056 builtin/commit.c:1491

3024 +msgid "could not parse HEAD commit"

3025 +msgstr ""

3026 +

3027 +#: sequencer.c:1107 sequencer.c:1673

3028 +msgid "unable to parse commit author"

3029 +msgstr ""

3030 +

3031 +#: sequencer.c:1117 builtin/am.c:1630 builtin/merge.c:643

3032 +msgid "git write-tree failed to write a tree"

3033 +msgstr ""

3034 +

3035 +#: sequencer.c:1134 sequencer.c:1186

3036 +#, c-format

3037 +msgid "unable to read commit message from '%s'"

3038 +msgstr ""

3039 +

3040 +#: sequencer.c:1154 builtin/am.c:1650 builtin/commit.c:1594 builtin/merge.c:826

3041 +#: builtin/merge.c:851

3042 +msgid "failed to write commit object"

3043 +msgstr ""

3044 +

3045 +#: sequencer.c:1213

3046 #, c-format

3047 msgid "could not parse commit %s"

3048 msgstr ""

3049

2931 -#: sequencer.c:707

3050 +#: sequencer.c:1218

3051 #, c-format

3052 msgid "could not parse parent commit %s"

3053 msgstr ""

3054

2936 -#: sequencer.c:836

3055 +#: sequencer.c:1347

3056 #, c-format

3057 msgid ""

3058 "unexpected 1st line of squash message:\n"

@@ -2941,7 +3060,7 @@ msgid ""

3060 "\t%.*s"

3061 msgstr ""

3062

2944 -#: sequencer.c:842

3063 +#: sequencer.c:1353

3064 #, c-format

3065 msgid ""

3066 "invalid 1st line of squash message:\n"

@@ -2949,240 +3068,244 @@ msgid ""

3068 "\t%.*s"

3069 msgstr ""

3070

2952 -#: sequencer.c:848 sequencer.c:873

3071 +#: sequencer.c:1359 sequencer.c:1384

3072 #, c-format

3073 msgid "This is a combination of %d commits."

3074 msgstr ""

3075

2957 -#: sequencer.c:857 sequencer.c:2748

3076 +#: sequencer.c:1368 sequencer.c:3265

3077 msgid "need a HEAD to fixup"

3078 msgstr ""

3079

2961 -#: sequencer.c:859

3080 +#: sequencer.c:1370

3081 msgid "could not read HEAD"

3082 msgstr ""

3083

2965 -#: sequencer.c:861

3084 +#: sequencer.c:1372

3085 msgid "could not read HEAD's commit message"

3086 msgstr ""

3087

2969 -#: sequencer.c:867

3088 +#: sequencer.c:1378

3089 #, c-format

3090 msgid "cannot write '%s'"

3091 msgstr ""

3092

2974 -#: sequencer.c:876 git-rebase--interactive.sh:446

3093 +#: sequencer.c:1387 git-rebase--interactive.sh:452

3094 msgid "This is the 1st commit message:"

3095 msgstr ""

3096

2978 -#: sequencer.c:884

3097 +#: sequencer.c:1395

3098 #, c-format

3099 msgid "could not read commit message of %s"

3100 msgstr ""

3101

2983 -#: sequencer.c:891

3102 +#: sequencer.c:1402

3103 #, c-format

3104 msgid "This is the commit message #%d:"

3105 msgstr ""

3106

2988 -#: sequencer.c:896

3107 +#: sequencer.c:1407

3108 #, c-format

3109 msgid "The commit message #%d will be skipped:"

3110 msgstr ""

3111

2993 -#: sequencer.c:901

3112 +#: sequencer.c:1412

3113 #, c-format

3114 msgid "unknown command: %d"

3115 msgstr ""

3116

2998 -#: sequencer.c:967

3117 +#: sequencer.c:1479

3118 msgid "your index file is unmerged."

3119 msgstr ""

3120

3002 -#: sequencer.c:986

3121 +#: sequencer.c:1498

3122 #, c-format

3123 msgid "commit %s is a merge but no -m option was given."

3124 msgstr ""

3125

3007 -#: sequencer.c:994

3126 +#: sequencer.c:1506

3127 #, c-format

3128 msgid "commit %s does not have parent %d"

3129 msgstr ""

3130

3012 -#: sequencer.c:998

3131 +#: sequencer.c:1510

3132 #, c-format

3133 msgid "mainline was specified but commit %s is not a merge."

3134 msgstr ""

3135

3017 -#: sequencer.c:1004

3136 +#: sequencer.c:1516

3137 #, c-format

3138 msgid "cannot get commit message for %s"

3139 msgstr ""

3140

3141 #. TRANSLATORS: The first %s will be a "todo" command like

3142 #. "revert" or "pick", the second %s a SHA1.

3024 -#: sequencer.c:1023

3143 +#: sequencer.c:1535

3144 #, c-format

3145 msgid "%s: cannot parse parent commit %s"

3146 msgstr ""

3147

3029 -#: sequencer.c:1086 sequencer.c:1867

3148 +#: sequencer.c:1600 sequencer.c:2397

3149 #, c-format

3150 msgid "could not rename '%s' to '%s'"

3151 msgstr ""

3152

3034 -#: sequencer.c:1137

3153 +#: sequencer.c:1654

3154 #, c-format

3155 msgid "could not revert %s... %s"

3156 msgstr ""

3157

3039 -#: sequencer.c:1138

3158 +#: sequencer.c:1655

3159 #, c-format

3160 msgid "could not apply %s... %s"

3161 msgstr ""

3162

3044 -#: sequencer.c:1180

3163 +#: sequencer.c:1702

3164 msgid "empty commit set passed"

3165 msgstr ""

3166

3048 -#: sequencer.c:1190

3167 +#: sequencer.c:1712

3168 #, c-format

3169 msgid "git %s: failed to read the index"

3170 msgstr ""

3171

3053 -#: sequencer.c:1196

3172 +#: sequencer.c:1718

3173 #, c-format

3174 msgid "git %s: failed to refresh the index"

3175 msgstr ""

3176

3058 -#: sequencer.c:1270

3177 +#: sequencer.c:1792

3178 #, c-format

3179 msgid "%s does not accept arguments: '%s'"

3180 msgstr ""

3181

3063 -#: sequencer.c:1279

3182 +#: sequencer.c:1801

3183 #, c-format

3184 msgid "missing arguments for %s"

3185 msgstr ""

3186

3068 -#: sequencer.c:1322

3187 +#: sequencer.c:1844

3188 #, c-format

3189 msgid "invalid line %d: %.*s"

3190 msgstr ""

3191

3073 -#: sequencer.c:1330

3192 +#: sequencer.c:1852

3193 #, c-format

3194 msgid "cannot '%s' without a previous commit"

3195 msgstr ""

3196

3078 -#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642

3079 -#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859

3197 +#: sequencer.c:1883 sequencer.c:3056 sequencer.c:3091

3198 #, c-format

3199 msgid "could not read '%s'."

3200 msgstr ""

3201

3084 -#: sequencer.c:1375

3202 +#: sequencer.c:1906

3203 msgid "please fix this using 'git rebase --edit-todo'."

3204 msgstr ""

3205

3088 -#: sequencer.c:1377

3206 +#: sequencer.c:1908

3207 #, c-format

3208 msgid "unusable instruction sheet: '%s'"

3209 msgstr ""

3210

3093 -#: sequencer.c:1382

3211 +#: sequencer.c:1913

3212 msgid "no commits parsed."

3213 msgstr ""

3214

3097 -#: sequencer.c:1393

3215 +#: sequencer.c:1924

3216 msgid "cannot cherry-pick during a revert."

3217 msgstr ""

3218

3101 -#: sequencer.c:1395

3219 +#: sequencer.c:1926

3220 msgid "cannot revert during a cherry-pick."

3221 msgstr ""

3222

3105 -#: sequencer.c:1462

3223 +#: sequencer.c:1993

3224 #, c-format

3225 msgid "invalid key: %s"

3226 msgstr ""

3227

3110 -#: sequencer.c:1465

3228 +#: sequencer.c:1996

3229 #, c-format

3230 msgid "invalid value for %s: %s"

3231 msgstr ""

3232

3115 -#: sequencer.c:1531

3233 +#: sequencer.c:2062

3234 #, c-format

3235 msgid "malformed options sheet: '%s'"

3236 msgstr ""

3237

3120 -#: sequencer.c:1569

3238 +#: sequencer.c:2100

3239 msgid "a cherry-pick or revert is already in progress"

3240 msgstr ""

3241

3124 -#: sequencer.c:1570

3242 +#: sequencer.c:2101

3243 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

3244 msgstr ""

3245

3128 -#: sequencer.c:1573

3246 +#: sequencer.c:2104

3247 #, c-format

3248 msgid "could not create sequencer directory '%s'"

3249 msgstr ""

3250

3133 -#: sequencer.c:1588

3251 +#: sequencer.c:2118

3252 msgid "could not lock HEAD"

3253 msgstr ""

3254

3137 -#: sequencer.c:1646 sequencer.c:2230

3255 +#: sequencer.c:2173 sequencer.c:2761

3256 msgid "no cherry-pick or revert in progress"

3257 msgstr ""

3258

3141 -#: sequencer.c:1648

3259 +#: sequencer.c:2175

3260 msgid "cannot resolve HEAD"

3261 msgstr ""

3262

3145 -#: sequencer.c:1650 sequencer.c:1685

3263 +#: sequencer.c:2177 sequencer.c:2212

3264 msgid "cannot abort from a branch yet to be born"

3265 msgstr ""

3266

3149 -#: sequencer.c:1671 builtin/grep.c:713

3267 +#: sequencer.c:2198 builtin/grep.c:720

3268 #, c-format

3269 msgid "cannot open '%s'"

3270 msgstr ""

3271

3154 -#: sequencer.c:1673

3272 +#: sequencer.c:2200

3273 #, c-format

3274 msgid "cannot read '%s': %s"

3275 msgstr ""

3276

3159 -#: sequencer.c:1674

3277 +#: sequencer.c:2201

3278 msgid "unexpected end of file"

3279 msgstr ""

3280

3163 -#: sequencer.c:1680

3281 +#: sequencer.c:2207

3282 #, c-format

3283 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

3284 msgstr ""

3285

3168 -#: sequencer.c:1691

3286 +#: sequencer.c:2218

3287 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

3288 msgstr ""

3289

3172 -#: sequencer.c:1832 sequencer.c:2128

3290 +#: sequencer.c:2324 sequencer.c:2679

3291 +#, c-format

3292 +msgid "could not update %s"

3293 +msgstr ""

3294 +

3295 +#: sequencer.c:2362 sequencer.c:2659

3296 msgid "cannot read HEAD"

3297 msgstr ""

3298

3176 -#: sequencer.c:1872 builtin/difftool.c:639

3299 +#: sequencer.c:2402 builtin/difftool.c:639

3300 #, c-format

3301 msgid "could not copy '%s' to '%s'"

3302 msgstr ""

3303

3181 -#: sequencer.c:1891

3304 +#: sequencer.c:2421

3305 msgid "could not read index"

3306 msgstr ""

3307

3185 -#: sequencer.c:1896

3308 +#: sequencer.c:2426

3309 #, c-format

3310 msgid ""

3311 "execution failed: %s\n"

@@ -3192,11 +3315,11 @@ msgid ""

3315 "\n"

3316 msgstr ""

3317

3195 -#: sequencer.c:1902

3318 +#: sequencer.c:2432

3319 msgid "and made changes to the index and/or the working tree\n"

3320 msgstr ""

3321

3199 -#: sequencer.c:1908

3322 +#: sequencer.c:2438

3323 #, c-format

3324 msgid ""

3325 "execution succeeded: %s\n"

@@ -3207,17 +3330,17 @@ msgid ""

3330 "\n"

3331 msgstr ""

3332

3210 -#: sequencer.c:1967

3333 +#: sequencer.c:2497

3334 #, c-format

3335 msgid "Applied autostash.\n"

3336 msgstr ""

3337

3215 -#: sequencer.c:1979

3338 +#: sequencer.c:2509

3339 #, c-format

3340 msgid "cannot store %s"

3341 msgstr ""

3342

3220 -#: sequencer.c:1982 git-rebase.sh:175

3343 +#: sequencer.c:2512 git-rebase.sh:178

3344 #, c-format

3345 msgid ""

3346 "Applying autostash resulted in conflicts.\n"

@@ -3225,108 +3348,103 @@ msgid ""

3348 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"

3349 msgstr ""

3350

3228 -#: sequencer.c:2064

3351 +#: sequencer.c:2595

3352 #, c-format

3353 msgid "Stopped at %s... %.*s\n"

3354 msgstr ""

3355

3233 -#: sequencer.c:2106

3356 +#: sequencer.c:2637

3357 #, c-format

3358 msgid "unknown command %d"

3359 msgstr ""

3360

3238 -#: sequencer.c:2136

3361 +#: sequencer.c:2667

3362 msgid "could not read orig-head"

3363 msgstr ""

3364

3242 -#: sequencer.c:2141 sequencer.c:2745

3365 +#: sequencer.c:2672 sequencer.c:3262

3366 msgid "could not read 'onto'"

3367 msgstr ""

3368

3246 -#: sequencer.c:2148

3247 -#, c-format

3248 -msgid "could not update %s"

3249 -msgstr ""

3250 -

3251 -#: sequencer.c:2155

3369 +#: sequencer.c:2686

3370 #, c-format

3371 msgid "could not update HEAD to %s"

3372 msgstr ""

3373

3256 -#: sequencer.c:2239

3374 +#: sequencer.c:2770

3375 msgid "cannot rebase: You have unstaged changes."

3376 msgstr ""

3377

3260 -#: sequencer.c:2244

3378 +#: sequencer.c:2775

3379 msgid "could not remove CHERRY_PICK_HEAD"

3380 msgstr ""

3381

3264 -#: sequencer.c:2253

3382 +#: sequencer.c:2784

3383 msgid "cannot amend non-existing commit"

3384 msgstr ""

3385

3268 -#: sequencer.c:2255

3386 +#: sequencer.c:2786

3387 #, c-format

3388 msgid "invalid file: '%s'"

3389 msgstr ""

3390

3273 -#: sequencer.c:2257

3391 +#: sequencer.c:2788

3392 #, c-format

3393 msgid "invalid contents: '%s'"

3394 msgstr ""

3395

3278 -#: sequencer.c:2260

3396 +#: sequencer.c:2791

3397 msgid ""

3398 "\n"

3399 "You have uncommitted changes in your working tree. Please, commit them\n"

3400 "first and then run 'git rebase --continue' again."

3401 msgstr ""

3402

3285 -#: sequencer.c:2270

3403 +#: sequencer.c:2801

3404 msgid "could not commit staged changes."

3405 msgstr ""

3406

3289 -#: sequencer.c:2350

3407 +#: sequencer.c:2881

3408 #, c-format

3409 msgid "%s: can't cherry-pick a %s"

3410 msgstr ""

3411

3294 -#: sequencer.c:2354

3412 +#: sequencer.c:2885

3413 #, c-format

3414 msgid "%s: bad revision"

3415 msgstr ""

3416

3299 -#: sequencer.c:2387

3417 +#: sequencer.c:2918

3418 msgid "can't revert as initial commit"

3419 msgstr ""

3420

3303 -#: sequencer.c:2492

3421 +#: sequencer.c:3023

3422 msgid "make_script: unhandled options"

3423 msgstr ""

3424

3307 -#: sequencer.c:2495

3425 +#: sequencer.c:3026

3426 msgid "make_script: error preparing revisions"

3427 msgstr ""

3428

3311 -#: sequencer.c:2529 sequencer.c:2564

3429 +#: sequencer.c:3060 sequencer.c:3095

3430 #, c-format

3431 msgid "unusable todo list: '%s'"

3432 msgstr ""

3433

3316 -#: sequencer.c:2615

3434 +#: sequencer.c:3146

3435 #, c-format

3436 msgid ""

3437 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

3438 msgstr ""

3439

3322 -#: sequencer.c:2695

3440 +#: sequencer.c:3212

3441 #, c-format

3442 msgid ""

3443 "Warning: some commits may have been dropped accidentally.\n"

3444 "Dropped commits (newer to older):\n"

3445 msgstr ""

3446

3329 -#: sequencer.c:2702

3447 +#: sequencer.c:3219

3448 #, c-format

3449 msgid ""

3450 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"

@@ -3337,7 +3455,7 @@ msgid ""

3455 "\n"

3456 msgstr ""

3457

3340 -#: sequencer.c:2714

3458 +#: sequencer.c:3231

3459 #, c-format

3460 msgid ""

3461 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

@@ -3345,21 +3463,26 @@ msgid ""

3463 "Or you can abort the rebase with 'git rebase --abort'.\n"

3464 msgstr ""

3465

3348 -#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395

3466 +#: sequencer.c:3244 sequencer.c:3304 wrapper.c:225 wrapper.c:395

3467 #: builtin/am.c:779

3468 #, c-format

3469 msgid "could not open '%s' for writing"

3470 msgstr ""

3471

3354 -#: sequencer.c:2775

3472 +#: sequencer.c:3285

3473 #, c-format

3474 msgid "could not parse commit '%s'"

3475 msgstr ""

3476

3359 -#: sequencer.c:2897

3477 +#: sequencer.c:3401

3478 msgid "the script was already rearranged."

3479 msgstr ""

3480

3481 +#: setup.c:122

3482 +#, c-format

3483 +msgid "'%s' is outside repository"

3484 +msgstr ""

3485 +

3486 #: setup.c:171

3487 #, c-format

3488 msgid ""

@@ -3375,6 +3498,11 @@ msgid ""

3498 "'git <command> [<revision>...] -- [<file>...]'"

3499 msgstr ""

3500

3501 +#: setup.c:233

3502 +#, c-format

3503 +msgid "option '%s' must come before non-option arguments"

3504 +msgstr ""

3505 +

3506 #: setup.c:252

3507 #, c-format

3508 msgid ""

@@ -3383,68 +3511,138 @@ msgid ""

3511 "'git <command> [<revision>...] -- [<file>...]'"

3512 msgstr ""

3513

3386 -#: setup.c:501

3514 +#: setup.c:388

3515 +msgid "unable to set up work tree using invalid config"

3516 +msgstr ""

3517 +

3518 +#: setup.c:395

3519 +msgid "this operation must be run in a work tree"

3520 +msgstr ""

3521 +

3522 +#: setup.c:506

3523 #, c-format

3524 msgid "Expected git repo version <= %d, found %d"

3525 msgstr ""

3526

3391 -#: setup.c:509

3527 +#: setup.c:514

3528 msgid "unknown repository extensions found:"

3529 msgstr ""

3530

3395 -#: setup.c:811

3531 +#: setup.c:533

3532 #, c-format

3397 -msgid "Not a git repository (or any of the parent directories): %s"

3533 +msgid "error opening '%s'"

3534 msgstr ""

3535

3400 -#: setup.c:813 builtin/index-pack.c:1653

3401 -msgid "Cannot come back to cwd"

3536 +#: setup.c:535

3537 +#, c-format

3538 +msgid "too large to be a .git file: '%s'"

3539 +msgstr ""

3540 +

3541 +#: setup.c:537

3542 +#, c-format

3543 +msgid "error reading %s"

3544 +msgstr ""

3545 +

3546 +#: setup.c:539

3547 +#, c-format

3548 +msgid "invalid gitfile format: %s"

3549 +msgstr ""

3550 +

3551 +#: setup.c:541

3552 +#, c-format

3553 +msgid "no path in gitfile: %s"

3554 +msgstr ""

3555 +

3556 +#: setup.c:543

3557 +#, c-format

3558 +msgid "not a git repository: %s"

3559 +msgstr ""

3560 +

3561 +#: setup.c:642

3562 +#, c-format

3563 +msgid "'$%s' too big"

3564 +msgstr ""

3565 +

3566 +#: setup.c:656

3567 +#, c-format

3568 +msgid "not a git repository: '%s'"

3569 +msgstr ""

3570 +

3571 +#: setup.c:685 setup.c:687 setup.c:718

3572 +#, c-format

3573 +msgid "cannot chdir to '%s'"

3574 +msgstr ""

3575 +

3576 +#: setup.c:690 setup.c:746 setup.c:756 setup.c:795 setup.c:803 setup.c:818

3577 +msgid "cannot come back to cwd"

3578 +msgstr ""

3579 +

3580 +#: setup.c:816

3581 +#, c-format

3582 +msgid "not a git repository (or any of the parent directories): %s"

3583 +msgstr ""

3584 +

3585 +#: setup.c:827

3586 +#, c-format

3587 +msgid "failed to stat '%*s%s%s'"

3588 msgstr ""

3589

3404 -#: setup.c:1052

3590 +#: setup.c:1057

3591 msgid "Unable to read current working directory"

3592 msgstr ""

3593

3408 -#: setup.c:1064 setup.c:1070

3594 +#: setup.c:1069 setup.c:1075

3595 #, c-format

3410 -msgid "Cannot change to '%s'"

3596 +msgid "cannot change to '%s'"

3597 msgstr ""

3598

3413 -#: setup.c:1083

3599 +#: setup.c:1088

3600 #, c-format

3601 msgid ""

3416 -"Not a git repository (or any parent up to mount point %s)\n"

3602 +"not a git repository (or any parent up to mount point %s)\n"

3603 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."

3604 msgstr ""

3605

3420 -#: setup.c:1167

3606 +#: setup.c:1172

3607 #, c-format

3608 msgid ""

3423 -"Problem with core.sharedRepository filemode value (0%.3o).\n"

3609 +"problem with core.sharedRepository filemode value (0%.3o).\n"

3610 "The owner of files must always have read and write permissions."

3611 msgstr ""

3612

3427 -#: sha1_file.c:598

3613 +#: setup.c:1215

3614 +msgid "open /dev/null or dup failed"

3615 +msgstr ""

3616 +

3617 +#: setup.c:1230

3618 +msgid "fork failed"

3619 +msgstr ""

3620 +

3621 +#: setup.c:1235

3622 +msgid "setsid failed"

3623 +msgstr ""

3624 +

3625 +#: sha1_file.c:592

3626 #, c-format

3627 msgid "path '%s' does not exist"

3628 msgstr ""

3629

3432 -#: sha1_file.c:624

3630 +#: sha1_file.c:618

3631 #, c-format

3632 msgid "reference repository '%s' as a linked checkout is not supported yet."

3633 msgstr ""

3634

3437 -#: sha1_file.c:630

3635 +#: sha1_file.c:624

3636 #, c-format

3637 msgid "reference repository '%s' is not a local repository."

3638 msgstr ""

3639

3442 -#: sha1_file.c:636

3640 +#: sha1_file.c:630

3641 #, c-format

3642 msgid "reference repository '%s' is shallow"

3643 msgstr ""

3644

3447 -#: sha1_file.c:644

3645 +#: sha1_file.c:638

3646 #, c-format

3647 msgid "reference repository '%s' is grafted"

3648 msgstr ""

@@ -3509,7 +3707,7 @@ msgstr ""

3707 msgid "submodule entry '%s' (%s) is a %s, not a commit"

3708 msgstr ""

3709

3512 -#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387

3710 +#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724

3711 msgid "Failed to resolve HEAD as a valid ref."

3712 msgstr ""

3713

@@ -3533,24 +3731,24 @@ msgstr ""

3731 msgid "submodule '%s' has dirty index"

3732 msgstr ""

3733

3536 -#: submodule.c:1876

3734 +#: submodule.c:1878

3735 #, c-format

3736 msgid ""

3737 "relocate_gitdir for submodule '%s' with more than one worktree not supported"

3738 msgstr ""

3739

3542 -#: submodule.c:1888 submodule.c:1944

3740 +#: submodule.c:1890 submodule.c:1946

3741 #, c-format

3742 msgid "could not lookup name for submodule '%s'"

3743 msgstr ""

3744

3547 -#: submodule.c:1892 builtin/submodule--helper.c:909

3548 -#: builtin/submodule--helper.c:919

3745 +#: submodule.c:1894 builtin/submodule--helper.c:1246

3746 +#: builtin/submodule--helper.c:1256

3747 #, c-format

3748 msgid "could not create directory '%s'"

3749 msgstr ""

3750

3553 -#: submodule.c:1895

3751 +#: submodule.c:1897

3752 #, c-format

3753 msgid ""

3754 "Migrating git directory of '%s%s' from\n"

@@ -3558,20 +3756,20 @@ msgid ""

3756 "'%s'\n"

3757 msgstr ""

3758

3561 -#: submodule.c:1979

3759 +#: submodule.c:1981

3760 #, c-format

3761 msgid "could not recurse into submodule '%s'"

3762 msgstr ""

3763

3566 -#: submodule.c:2023

3764 +#: submodule.c:2025

3765 msgid "could not start ls-files in .."

3766 msgstr ""

3767

3570 -#: submodule.c:2043

3768 +#: submodule.c:2045

3769 msgid "BUG: returned path string doesn't match cwd?"

3770 msgstr ""

3771

3574 -#: submodule.c:2062

3772 +#: submodule.c:2064

3773 #, c-format

3774 msgid "ls-tree returned unexpected return code %d"

3775 msgstr ""

@@ -3649,14 +3847,14 @@ msgstr ""

3847 msgid "transport: invalid depth option '%s'"

3848 msgstr ""

3849

3652 -#: transport.c:904

3850 +#: transport.c:916

3851 #, c-format

3852 msgid ""

3853 "The following submodule paths contain changes that can\n"

3854 "not be found on any remote:\n"

3855 msgstr ""

3856

3659 -#: transport.c:908

3857 +#: transport.c:920

3858 #, c-format

3859 msgid ""

3860 "\n"

@@ -3672,11 +3870,11 @@ msgid ""

3870 "\n"

3871 msgstr ""

3872

3675 -#: transport.c:916

3873 +#: transport.c:928

3874 msgid "Aborting."

3875 msgstr ""

3876

3679 -#: transport-helper.c:1074

3877 +#: transport-helper.c:1079

3878 #, c-format

3879 msgid "Could not read ref %s"

3880 msgstr ""

@@ -3697,98 +3895,98 @@ msgstr ""

3895 msgid "too-short tree file"

3896 msgstr ""

3897

3700 -#: unpack-trees.c:107

3898 +#: unpack-trees.c:108

3899 #, c-format

3900 msgid ""

3901 "Your local changes to the following files would be overwritten by checkout:\n"

3902 "%%sPlease commit your changes or stash them before you switch branches."

3903 msgstr ""

3904

3707 -#: unpack-trees.c:109

3905 +#: unpack-trees.c:110

3906 #, c-format

3907 msgid ""

3908 "Your local changes to the following files would be overwritten by checkout:\n"

3909 "%%s"

3910 msgstr ""

3911

3714 -#: unpack-trees.c:112

3912 +#: unpack-trees.c:113

3913 #, c-format

3914 msgid ""

3915 "Your local changes to the following files would be overwritten by merge:\n"

3916 "%%sPlease commit your changes or stash them before you merge."

3917 msgstr ""

3918

3721 -#: unpack-trees.c:114

3919 +#: unpack-trees.c:115

3920 #, c-format

3921 msgid ""

3922 "Your local changes to the following files would be overwritten by merge:\n"

3923 "%%s"

3924 msgstr ""

3925

3728 -#: unpack-trees.c:117

3926 +#: unpack-trees.c:118

3927 #, c-format

3928 msgid ""

3929 "Your local changes to the following files would be overwritten by %s:\n"

3930 "%%sPlease commit your changes or stash them before you %s."

3931 msgstr ""

3932

3735 -#: unpack-trees.c:119

3933 +#: unpack-trees.c:120

3934 #, c-format

3935 msgid ""

3936 "Your local changes to the following files would be overwritten by %s:\n"

3937 "%%s"

3938 msgstr ""

3939

3742 -#: unpack-trees.c:124

3940 +#: unpack-trees.c:125

3941 #, c-format

3942 msgid ""

3943 "Updating the following directories would lose untracked files in them:\n"

3944 "%s"

3945 msgstr ""

3946

3749 -#: unpack-trees.c:128

3947 +#: unpack-trees.c:129

3948 #, c-format

3949 msgid ""

3950 "The following untracked working tree files would be removed by checkout:\n"

3951 "%%sPlease move or remove them before you switch branches."

3952 msgstr ""

3953

3756 -#: unpack-trees.c:130

3954 +#: unpack-trees.c:131

3955 #, c-format

3956 msgid ""

3957 "The following untracked working tree files would be removed by checkout:\n"

3958 "%%s"

3959 msgstr ""

3960

3763 -#: unpack-trees.c:133

3961 +#: unpack-trees.c:134

3962 #, c-format

3963 msgid ""

3964 "The following untracked working tree files would be removed by merge:\n"

3965 "%%sPlease move or remove them before you merge."

3966 msgstr ""

3967

3770 -#: unpack-trees.c:135

3968 +#: unpack-trees.c:136

3969 #, c-format

3970 msgid ""

3971 "The following untracked working tree files would be removed by merge:\n"

3972 "%%s"

3973 msgstr ""

3974

3777 -#: unpack-trees.c:138

3975 +#: unpack-trees.c:139

3976 #, c-format

3977 msgid ""

3978 "The following untracked working tree files would be removed by %s:\n"

3979 "%%sPlease move or remove them before you %s."

3980 msgstr ""

3981

3784 -#: unpack-trees.c:140

3982 +#: unpack-trees.c:141

3983 #, c-format

3984 msgid ""

3985 "The following untracked working tree files would be removed by %s:\n"

3986 "%%s"

3987 msgstr ""

3988

3791 -#: unpack-trees.c:145

3989 +#: unpack-trees.c:146

3990 #, c-format

3991 msgid ""

3992 "The following untracked working tree files would be overwritten by "

@@ -3796,7 +3994,7 @@ msgid ""

3994 "%%sPlease move or remove them before you switch branches."

3995 msgstr ""

3996

3799 -#: unpack-trees.c:147

3997 +#: unpack-trees.c:148

3998 #, c-format

3999 msgid ""

4000 "The following untracked working tree files would be overwritten by "

@@ -3804,47 +4002,47 @@ msgid ""

4002 "%%s"

4003 msgstr ""

4004

3807 -#: unpack-trees.c:150

4005 +#: unpack-trees.c:151

4006 #, c-format

4007 msgid ""

4008 "The following untracked working tree files would be overwritten by merge:\n"

4009 "%%sPlease move or remove them before you merge."

4010 msgstr ""

4011

3814 -#: unpack-trees.c:152

4012 +#: unpack-trees.c:153

4013 #, c-format

4014 msgid ""

4015 "The following untracked working tree files would be overwritten by merge:\n"

4016 "%%s"

4017 msgstr ""

4018

3821 -#: unpack-trees.c:155

4019 +#: unpack-trees.c:156

4020 #, c-format

4021 msgid ""

4022 "The following untracked working tree files would be overwritten by %s:\n"

4023 "%%sPlease move or remove them before you %s."

4024 msgstr ""

4025

3828 -#: unpack-trees.c:157

4026 +#: unpack-trees.c:158

4027 #, c-format

4028 msgid ""

4029 "The following untracked working tree files would be overwritten by %s:\n"

4030 "%%s"

4031 msgstr ""

4032

3835 -#: unpack-trees.c:164

4033 +#: unpack-trees.c:165

4034 #, c-format

4035 msgid "Entry '%s' overlaps with '%s'. Cannot bind."

4036 msgstr ""

4037

3840 -#: unpack-trees.c:167

4038 +#: unpack-trees.c:168

4039 #, c-format

4040 msgid ""

4041 "Cannot update sparse checkout: the following entries are not up to date:\n"

4042 "%s"

4043 msgstr ""

4044

3847 -#: unpack-trees.c:169

4045 +#: unpack-trees.c:170

4046 #, c-format

4047 msgid ""

4048 "The following working tree files would be overwritten by sparse checkout "

@@ -3852,7 +4050,7 @@ msgid ""

4050 "%s"

4051 msgstr ""

4052

3855 -#: unpack-trees.c:171

4053 +#: unpack-trees.c:172

4054 #, c-format

4055 msgid ""

4056 "The following working tree files would be removed by sparse checkout "

@@ -3860,19 +4058,19 @@ msgid ""

4058 "%s"

4059 msgstr ""

4060

3863 -#: unpack-trees.c:173

4061 +#: unpack-trees.c:174

4062 #, c-format

4063 msgid ""

4064 "Cannot update submodule:\n"

4065 "%s"

4066 msgstr ""

4067

3870 -#: unpack-trees.c:250

4068 +#: unpack-trees.c:251

4069 #, c-format

4070 msgid "Aborting\n"

4071 msgstr ""

4072

3875 -#: unpack-trees.c:332

4073 +#: unpack-trees.c:333

4074 msgid "Checking out files"

4075 msgstr ""

4076

@@ -3905,18 +4103,43 @@ msgstr ""

4103 msgid "invalid '..' path segment"

4104 msgstr ""

4105

3908 -#: worktree.c:245

4106 +#: worktree.c:245 builtin/am.c:2147

4107 #, c-format

4108 msgid "failed to read '%s'"

4109 msgstr ""

4110

4111 +#: worktree.c:291

4112 +#, c-format

4113 +msgid "'%s' at main working tree is not the repository directory"

4114 +msgstr ""

4115 +

4116 +#: worktree.c:302

4117 +#, c-format

4118 +msgid "'%s' file does not contain absolute path to the working tree location"

4119 +msgstr ""

4120 +

4121 +#: worktree.c:314

4122 +#, c-format

4123 +msgid "'%s' does not exist"

4124 +msgstr ""

4125 +

4126 +#: worktree.c:320

4127 +#, c-format

4128 +msgid "'%s' is not a .git file, error code %d"

4129 +msgstr ""

4130 +

4131 +#: worktree.c:328

4132 +#, c-format

4133 +msgid "'%s' does not point back to '%s'"

4134 +msgstr ""

4135 +

4136 #: wrapper.c:223 wrapper.c:393

4137 #, c-format

4138 msgid "could not open '%s' for reading and writing"

4139 msgstr ""

4140

4141 #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770

3919 -#: builtin/am.c:862 builtin/merge.c:1043

4142 +#: builtin/am.c:862 builtin/merge.c:1044

4143 #, c-format

4144 msgid "could not open '%s' for reading"

4145 msgstr ""

@@ -3930,374 +4153,374 @@ msgstr ""

4153 msgid "unable to get current working directory"

4154 msgstr ""

4155

3933 -#: wt-status.c:150

4156 +#: wt-status.c:151

4157 msgid "Unmerged paths:"

4158 msgstr ""

4159

3937 -#: wt-status.c:177 wt-status.c:204

4160 +#: wt-status.c:178 wt-status.c:205

4161 #, c-format

4162 msgid " (use \"git reset %s <file>...\" to unstage)"

4163 msgstr ""

4164

3942 -#: wt-status.c:179 wt-status.c:206

4165 +#: wt-status.c:180 wt-status.c:207

4166 msgid " (use \"git rm --cached <file>...\" to unstage)"

4167 msgstr ""

4168

3946 -#: wt-status.c:183

4169 +#: wt-status.c:184

4170 msgid " (use \"git add <file>...\" to mark resolution)"

4171 msgstr ""

4172

3950 -#: wt-status.c:185 wt-status.c:189

4173 +#: wt-status.c:186 wt-status.c:190

4174 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"

4175 msgstr ""

4176

3954 -#: wt-status.c:187

4177 +#: wt-status.c:188

4178 msgid " (use \"git rm <file>...\" to mark resolution)"

4179 msgstr ""

4180

3958 -#: wt-status.c:198 wt-status.c:984

4181 +#: wt-status.c:199 wt-status.c:1007

4182 msgid "Changes to be committed:"

4183 msgstr ""

4184

3962 -#: wt-status.c:216 wt-status.c:993

4185 +#: wt-status.c:217 wt-status.c:1016

4186 msgid "Changes not staged for commit:"

4187 msgstr ""

4188

3966 -#: wt-status.c:220

4189 +#: wt-status.c:221

4190 msgid " (use \"git add <file>...\" to update what will be committed)"

4191 msgstr ""

4192

3970 -#: wt-status.c:222

4193 +#: wt-status.c:223

4194 msgid " (use \"git add/rm <file>...\" to update what will be committed)"

4195 msgstr ""

4196

3974 -#: wt-status.c:223

4197 +#: wt-status.c:224

4198 msgid ""

4199 " (use \"git checkout -- <file>...\" to discard changes in working directory)"

4200 msgstr ""

4201

3979 -#: wt-status.c:225

4202 +#: wt-status.c:226

4203 msgid " (commit or discard the untracked or modified content in submodules)"

4204 msgstr ""

4205

3983 -#: wt-status.c:237

4206 +#: wt-status.c:238

4207 #, c-format

4208 msgid " (use \"git %s <file>...\" to include in what will be committed)"

4209 msgstr ""

4210

3988 -#: wt-status.c:252

4211 +#: wt-status.c:253

4212 msgid "both deleted:"

4213 msgstr ""

4214

3992 -#: wt-status.c:254

4215 +#: wt-status.c:255

4216 msgid "added by us:"

4217 msgstr ""

4218

3996 -#: wt-status.c:256

4219 +#: wt-status.c:257

4220 msgid "deleted by them:"

4221 msgstr ""

4222

4000 -#: wt-status.c:258

4223 +#: wt-status.c:259

4224 msgid "added by them:"

4225 msgstr ""

4226

4004 -#: wt-status.c:260

4227 +#: wt-status.c:261

4228 msgid "deleted by us:"

4229 msgstr ""

4230

4008 -#: wt-status.c:262

4231 +#: wt-status.c:263

4232 msgid "both added:"

4233 msgstr ""

4234

4012 -#: wt-status.c:264

4235 +#: wt-status.c:265

4236 msgid "both modified:"

4237 msgstr ""

4238

4016 -#: wt-status.c:274

4239 +#: wt-status.c:275

4240 msgid "new file:"

4241 msgstr ""

4242

4020 -#: wt-status.c:276

4243 +#: wt-status.c:277

4244 msgid "copied:"

4245 msgstr ""

4246

4024 -#: wt-status.c:278

4247 +#: wt-status.c:279

4248 msgid "deleted:"

4249 msgstr ""

4250

4028 -#: wt-status.c:280

4251 +#: wt-status.c:281

4252 msgid "modified:"

4253 msgstr ""

4254

4032 -#: wt-status.c:282

4255 +#: wt-status.c:283

4256 msgid "renamed:"

4257 msgstr ""

4258

4036 -#: wt-status.c:284

4259 +#: wt-status.c:285

4260 msgid "typechange:"

4261 msgstr ""

4262

4040 -#: wt-status.c:286

4263 +#: wt-status.c:287

4264 msgid "unknown:"

4265 msgstr ""

4266

4044 -#: wt-status.c:288

4267 +#: wt-status.c:289

4268 msgid "unmerged:"

4269 msgstr ""

4270

4048 -#: wt-status.c:370

4271 +#: wt-status.c:369

4272 msgid "new commits, "

4273 msgstr ""

4274

4052 -#: wt-status.c:372

4275 +#: wt-status.c:371

4276 msgid "modified content, "

4277 msgstr ""

4278

4056 -#: wt-status.c:374

4279 +#: wt-status.c:373

4280 msgid "untracked content, "

4281 msgstr ""

4282

4060 -#: wt-status.c:824

4283 +#: wt-status.c:847

4284 #, c-format

4285 msgid "Your stash currently has %d entry"

4286 msgid_plural "Your stash currently has %d entries"

4287 msgstr[0] ""

4288 msgstr[1] ""

4289

4067 -#: wt-status.c:856

4290 +#: wt-status.c:879

4291 msgid "Submodules changed but not updated:"

4292 msgstr ""

4293

4071 -#: wt-status.c:858

4294 +#: wt-status.c:881

4295 msgid "Submodule changes to be committed:"

4296 msgstr ""

4297

4075 -#: wt-status.c:940

4298 +#: wt-status.c:963

4299 msgid ""

4300 "Do not modify or remove the line above.\n"

4301 "Everything below it will be ignored."

4302 msgstr ""

4303

4081 -#: wt-status.c:1053

4304 +#: wt-status.c:1076

4305 msgid "You have unmerged paths."

4306 msgstr ""

4307

4085 -#: wt-status.c:1056

4308 +#: wt-status.c:1079

4309 msgid " (fix conflicts and run \"git commit\")"

4310 msgstr ""

4311

4089 -#: wt-status.c:1058

4312 +#: wt-status.c:1081

4313 msgid " (use \"git merge --abort\" to abort the merge)"

4314 msgstr ""

4315

4093 -#: wt-status.c:1063

4316 +#: wt-status.c:1086

4317 msgid "All conflicts fixed but you are still merging."

4318 msgstr ""

4319

4097 -#: wt-status.c:1066

4320 +#: wt-status.c:1089

4321 msgid " (use \"git commit\" to conclude merge)"

4322 msgstr ""

4323

4101 -#: wt-status.c:1076

4324 +#: wt-status.c:1099

4325 msgid "You are in the middle of an am session."

4326 msgstr ""

4327

4105 -#: wt-status.c:1079

4328 +#: wt-status.c:1102

4329 msgid "The current patch is empty."

4330 msgstr ""

4331

4109 -#: wt-status.c:1083

4332 +#: wt-status.c:1106

4333 msgid " (fix conflicts and then run \"git am --continue\")"

4334 msgstr ""

4335

4113 -#: wt-status.c:1085

4336 +#: wt-status.c:1108

4337 msgid " (use \"git am --skip\" to skip this patch)"

4338 msgstr ""

4339

4117 -#: wt-status.c:1087

4340 +#: wt-status.c:1110

4341 msgid " (use \"git am --abort\" to restore the original branch)"

4342 msgstr ""

4343

4121 -#: wt-status.c:1219

4344 +#: wt-status.c:1242

4345 msgid "git-rebase-todo is missing."

4346 msgstr ""

4347

4125 -#: wt-status.c:1221

4348 +#: wt-status.c:1244

4349 msgid "No commands done."

4350 msgstr ""

4351

4129 -#: wt-status.c:1224

4352 +#: wt-status.c:1247

4353 #, c-format

4354 msgid "Last command done (%d command done):"

4355 msgid_plural "Last commands done (%d commands done):"

4356 msgstr[0] ""

4357 msgstr[1] ""

4358

4136 -#: wt-status.c:1235

4359 +#: wt-status.c:1258

4360 #, c-format

4361 msgid " (see more in file %s)"

4362 msgstr ""

4363

4141 -#: wt-status.c:1240

4364 +#: wt-status.c:1263

4365 msgid "No commands remaining."

4366 msgstr ""

4367

4145 -#: wt-status.c:1243

4368 +#: wt-status.c:1266

4369 #, c-format

4370 msgid "Next command to do (%d remaining command):"

4371 msgid_plural "Next commands to do (%d remaining commands):"

4372 msgstr[0] ""

4373 msgstr[1] ""

4374

4152 -#: wt-status.c:1251

4375 +#: wt-status.c:1274

4376 msgid " (use \"git rebase --edit-todo\" to view and edit)"

4377 msgstr ""

4378

4156 -#: wt-status.c:1264

4379 +#: wt-status.c:1287

4380 #, c-format

4381 msgid "You are currently rebasing branch '%s' on '%s'."

4382 msgstr ""

4383

4161 -#: wt-status.c:1269

4384 +#: wt-status.c:1292

4385 msgid "You are currently rebasing."

4386 msgstr ""

4387

4165 -#: wt-status.c:1283

4388 +#: wt-status.c:1306

4389 msgid " (fix conflicts and then run \"git rebase --continue\")"

4390 msgstr ""

4391

4169 -#: wt-status.c:1285

4392 +#: wt-status.c:1308

4393 msgid " (use \"git rebase --skip\" to skip this patch)"

4394 msgstr ""

4395

4173 -#: wt-status.c:1287

4396 +#: wt-status.c:1310

4397 msgid " (use \"git rebase --abort\" to check out the original branch)"

4398 msgstr ""

4399

4177 -#: wt-status.c:1293

4400 +#: wt-status.c:1316

4401 msgid " (all conflicts fixed: run \"git rebase --continue\")"

4402 msgstr ""

4403

4181 -#: wt-status.c:1297

4404 +#: wt-status.c:1320

4405 #, c-format

4406 msgid ""

4407 "You are currently splitting a commit while rebasing branch '%s' on '%s'."

4408 msgstr ""

4409

4187 -#: wt-status.c:1302

4410 +#: wt-status.c:1325

4411 msgid "You are currently splitting a commit during a rebase."

4412 msgstr ""

4413

4191 -#: wt-status.c:1305

4414 +#: wt-status.c:1328

4415 msgid " (Once your working directory is clean, run \"git rebase --continue\")"

4416 msgstr ""

4417

4195 -#: wt-status.c:1309

4418 +#: wt-status.c:1332

4419 #, c-format

4420 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."

4421 msgstr ""

4422

4200 -#: wt-status.c:1314

4423 +#: wt-status.c:1337

4424 msgid "You are currently editing a commit during a rebase."

4425 msgstr ""

4426

4204 -#: wt-status.c:1317

4427 +#: wt-status.c:1340

4428 msgid " (use \"git commit --amend\" to amend the current commit)"

4429 msgstr ""

4430

4208 -#: wt-status.c:1319

4431 +#: wt-status.c:1342

4432 msgid ""

4433 " (use \"git rebase --continue\" once you are satisfied with your changes)"

4434 msgstr ""

4435

4213 -#: wt-status.c:1329

4436 +#: wt-status.c:1352

4437 #, c-format

4438 msgid "You are currently cherry-picking commit %s."

4439 msgstr ""

4440

4218 -#: wt-status.c:1334

4441 +#: wt-status.c:1357

4442 msgid " (fix conflicts and run \"git cherry-pick --continue\")"

4443 msgstr ""

4444

4222 -#: wt-status.c:1337

4445 +#: wt-status.c:1360

4446 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"

4447 msgstr ""

4448

4226 -#: wt-status.c:1339

4449 +#: wt-status.c:1362

4450 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"

4451 msgstr ""

4452

4230 -#: wt-status.c:1348

4453 +#: wt-status.c:1371

4454 #, c-format

4455 msgid "You are currently reverting commit %s."

4456 msgstr ""

4457

4235 -#: wt-status.c:1353

4458 +#: wt-status.c:1376

4459 msgid " (fix conflicts and run \"git revert --continue\")"

4460 msgstr ""

4461

4239 -#: wt-status.c:1356

4462 +#: wt-status.c:1379

4463 msgid " (all conflicts fixed: run \"git revert --continue\")"

4464 msgstr ""

4465

4243 -#: wt-status.c:1358

4466 +#: wt-status.c:1381

4467 msgid " (use \"git revert --abort\" to cancel the revert operation)"

4468 msgstr ""

4469

4247 -#: wt-status.c:1369

4470 +#: wt-status.c:1392

4471 #, c-format

4472 msgid "You are currently bisecting, started from branch '%s'."

4473 msgstr ""

4474

4252 -#: wt-status.c:1373

4475 +#: wt-status.c:1396

4476 msgid "You are currently bisecting."

4477 msgstr ""

4478

4256 -#: wt-status.c:1376

4479 +#: wt-status.c:1399

4480 msgid " (use \"git bisect reset\" to get back to the original branch)"

4481 msgstr ""

4482

4260 -#: wt-status.c:1573

4483 +#: wt-status.c:1596

4484 msgid "On branch "

4485 msgstr ""

4486

4264 -#: wt-status.c:1579

4487 +#: wt-status.c:1602

4488 msgid "interactive rebase in progress; onto "

4489 msgstr ""

4490

4268 -#: wt-status.c:1581

4491 +#: wt-status.c:1604

4492 msgid "rebase in progress; onto "

4493 msgstr ""

4494

4272 -#: wt-status.c:1586

4495 +#: wt-status.c:1609

4496 msgid "HEAD detached at "

4497 msgstr ""

4498

4276 -#: wt-status.c:1588

4499 +#: wt-status.c:1611

4500 msgid "HEAD detached from "

4501 msgstr ""

4502

4280 -#: wt-status.c:1591

4503 +#: wt-status.c:1614

4504 msgid "Not currently on any branch."

4505 msgstr ""

4506

4284 -#: wt-status.c:1611

4507 +#: wt-status.c:1634

4508 msgid "Initial commit"

4509 msgstr ""

4510

4288 -#: wt-status.c:1612

4511 +#: wt-status.c:1635

4512 msgid "No commits yet"

4513 msgstr ""

4514

4292 -#: wt-status.c:1626

4515 +#: wt-status.c:1649

4516 msgid "Untracked files"

4517 msgstr ""

4518

4296 -#: wt-status.c:1628

4519 +#: wt-status.c:1651

4520 msgid "Ignored files"

4521 msgstr ""

4522

4300 -#: wt-status.c:1632

4523 +#: wt-status.c:1655

4524 #, c-format

4525 msgid ""

4526 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

@@ -4305,93 +4528,97 @@ msgid ""

4528 "new files yourself (see 'git help status')."

4529 msgstr ""

4530

4308 -#: wt-status.c:1638

4531 +#: wt-status.c:1661

4532 #, c-format

4533 msgid "Untracked files not listed%s"

4534 msgstr ""

4535

4313 -#: wt-status.c:1640

4536 +#: wt-status.c:1663

4537 msgid " (use -u option to show untracked files)"

4538 msgstr ""

4539

4317 -#: wt-status.c:1646

4540 +#: wt-status.c:1669

4541 msgid "No changes"

4542 msgstr ""

4543

4321 -#: wt-status.c:1651

4544 +#: wt-status.c:1674

4545 #, c-format

4546 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

4547 msgstr ""

4548

4326 -#: wt-status.c:1654

4549 +#: wt-status.c:1677

4550 #, c-format

4551 msgid "no changes added to commit\n"

4552 msgstr ""

4553

4331 -#: wt-status.c:1657

4554 +#: wt-status.c:1680

4555 #, c-format

4556 msgid ""

4557 "nothing added to commit but untracked files present (use \"git add\" to "

4558 "track)\n"

4559 msgstr ""

4560

4338 -#: wt-status.c:1660

4561 +#: wt-status.c:1683

4562 #, c-format

4563 msgid "nothing added to commit but untracked files present\n"

4564 msgstr ""

4565

4343 -#: wt-status.c:1663

4566 +#: wt-status.c:1686

4567 #, c-format

4568 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

4569 msgstr ""

4570

4348 -#: wt-status.c:1666 wt-status.c:1671

4571 +#: wt-status.c:1689 wt-status.c:1694

4572 #, c-format

4573 msgid "nothing to commit\n"

4574 msgstr ""

4575

4353 -#: wt-status.c:1669

4576 +#: wt-status.c:1692

4577 #, c-format

4578 msgid "nothing to commit (use -u to show untracked files)\n"

4579 msgstr ""

4580

4358 -#: wt-status.c:1673

4581 +#: wt-status.c:1696

4582 #, c-format

4583 msgid "nothing to commit, working tree clean\n"

4584 msgstr ""

4585

4363 -#: wt-status.c:1785

4586 +#: wt-status.c:1809

4587 msgid "No commits yet on "

4588 msgstr ""

4589

4367 -#: wt-status.c:1789

4590 +#: wt-status.c:1813

4591 msgid "HEAD (no branch)"

4592 msgstr ""

4593

4371 -#: wt-status.c:1818 wt-status.c:1826

4594 +#: wt-status.c:1844

4595 +msgid "different"

4596 +msgstr ""

4597 +

4598 +#: wt-status.c:1846 wt-status.c:1854

4599 msgid "behind "

4600 msgstr ""

4601

4375 -#: wt-status.c:1821 wt-status.c:1824

4602 +#: wt-status.c:1849 wt-status.c:1852

4603 msgid "ahead "

4604 msgstr ""

4605

4606 #. TRANSLATORS: the action is e.g. "pull with rebase"

4380 -#: wt-status.c:2318

4607 +#: wt-status.c:2358

4608 #, c-format

4609 msgid "cannot %s: You have unstaged changes."

4610 msgstr ""

4611

4385 -#: wt-status.c:2324

4612 +#: wt-status.c:2364

4613 msgid "additionally, your index contains uncommitted changes."

4614 msgstr ""

4615

4389 -#: wt-status.c:2326

4616 +#: wt-status.c:2366

4617 #, c-format

4618 msgid "cannot %s: Your index contains uncommitted changes."

4619 msgstr ""

4620

4394 -#: compat/precompose_utf8.c:58 builtin/clone.c:437

4621 +#: compat/precompose_utf8.c:58 builtin/clone.c:440

4622 #, c-format

4623 msgid "failed to unlink '%s'"

4624 msgstr ""

@@ -4405,7 +4632,7 @@ msgstr ""

4632 msgid "unexpected diff status %c"

4633 msgstr ""

4634

4408 -#: builtin/add.c:88 builtin/commit.c:291

4635 +#: builtin/add.c:88 builtin/commit.c:257

4636 msgid "updating files failed"

4637 msgstr ""

4638

@@ -4453,7 +4680,7 @@ msgstr ""

4680 msgid "The following paths are ignored by one of your .gitignore files:\n"

4681 msgstr ""

4682

4456 -#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124

4683 +#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:146 builtin/mv.c:124

4684 #: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541

4685 #: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164

4686 msgid "dry run"

@@ -4463,7 +4690,7 @@ msgstr ""

4690 msgid "interactive picking"

4691 msgstr ""

4692

4466 -#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310

4693 +#: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302

4694 msgid "select hunks interactively"

4695 msgstr ""

4696

@@ -4574,10 +4801,10 @@ msgstr ""

4801 msgid "Maybe you wanted to say 'git add .'?\n"

4802 msgstr ""

4803

4577 -#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281

4578 -#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350

4579 -#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249

4580 -#: builtin/rm.c:271 builtin/submodule--helper.c:311

4804 +#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:280

4805 +#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:316

4806 +#: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241

4807 +#: builtin/rm.c:271 builtin/submodule--helper.c:326

4808 msgid "index file corrupt"

4809 msgstr ""

4810

@@ -4629,93 +4856,84 @@ msgstr ""

4856 msgid "Patch format detection failed."

4857 msgstr ""

4858

4632 -#: builtin/am.c:1013 builtin/clone.c:402

4859 +#: builtin/am.c:1013 builtin/clone.c:405

4860 #, c-format

4861 msgid "failed to create directory '%s'"

4862 msgstr ""

4863

4637 -#: builtin/am.c:1017

4864 +#: builtin/am.c:1018

4865 msgid "Failed to split patches."

4866 msgstr ""

4867

4641 -#: builtin/am.c:1146 builtin/commit.c:376

4868 +#: builtin/am.c:1148 builtin/commit.c:342

4869 msgid "unable to write index file"

4870 msgstr ""

4871

4645 -#: builtin/am.c:1160

4872 +#: builtin/am.c:1162

4873 #, c-format

4874 msgid "When you have resolved this problem, run \"%s --continue\"."

4875 msgstr ""

4876

4650 -#: builtin/am.c:1161

4877 +#: builtin/am.c:1163

4878 #, c-format

4879 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."

4880 msgstr ""

4881

4655 -#: builtin/am.c:1162

4882 +#: builtin/am.c:1164

4883 #, c-format

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

4885 msgstr ""

4886

4660 -#: builtin/am.c:1269

4887 +#: builtin/am.c:1271

4888 msgid "Patch is empty."

4889 msgstr ""

4890

4664 -#: builtin/am.c:1335

4891 +#: builtin/am.c:1337

4892 #, c-format

4893 msgid "invalid ident line: %.*s"

4894 msgstr ""

4895

4669 -#: builtin/am.c:1357

4896 +#: builtin/am.c:1359

4897 #, c-format

4898 msgid "unable to parse commit %s"

4899 msgstr ""

4900

4674 -#: builtin/am.c:1550

4901 +#: builtin/am.c:1554

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

4903 msgstr ""

4904

4678 -#: builtin/am.c:1552

4905 +#: builtin/am.c:1556

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

4907 msgstr ""

4908

4682 -#: builtin/am.c:1571

4909 +#: builtin/am.c:1575

4910 msgid ""

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

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

4913 msgstr ""

4914

4688 -#: builtin/am.c:1577

4915 +#: builtin/am.c:1581

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

4917 msgstr ""

4918

4692 -#: builtin/am.c:1602

4919 +#: builtin/am.c:1606

4920 msgid "Failed to merge in the changes."

4921 msgstr ""

4922

4696 -#: builtin/am.c:1626 builtin/merge.c:642

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

4698 -msgstr ""

4699 -

4700 -#: builtin/am.c:1633

4923 +#: builtin/am.c:1637

4924 msgid "applying to an empty history"

4925 msgstr ""

4926

4704 -#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825

4705 -#: builtin/merge.c:850

4706 -msgid "failed to write commit object"

4707 -msgstr ""

4708 -

4709 -#: builtin/am.c:1679 builtin/am.c:1683

4927 +#: builtin/am.c:1683 builtin/am.c:1687

4928 #, c-format

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

4930 msgstr ""

4931

4714 -#: builtin/am.c:1699

4932 +#: builtin/am.c:1703

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

4934 msgstr ""

4935

4718 -#: builtin/am.c:1704

4936 +#: builtin/am.c:1708

4937 msgid "Commit Body is:"

4938 msgstr ""

4939

@@ -4723,42 +4941,41 @@ msgstr ""

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

4942 #. input at this point.

4943 #.

4726 -#: builtin/am.c:1714

4944 +#: builtin/am.c:1718

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

4946 msgstr ""

4947

4730 -#: builtin/am.c:1764

4948 +#: builtin/am.c:1768

4949 #, c-format

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

4951 msgstr ""

4952

4735 -#: builtin/am.c:1804 builtin/am.c:1876

4953 +#: builtin/am.c:1808 builtin/am.c:1879

4954 #, c-format

4955 msgid "Applying: %.*s"

4956 msgstr ""

4957

4740 -#: builtin/am.c:1820

4958 +#: builtin/am.c:1824

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

4960 msgstr ""

4961

4744 -#: builtin/am.c:1828

4962 +#: builtin/am.c:1832

4963 #, c-format

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

4965 msgstr ""

4966

4749 -#: builtin/am.c:1834

4750 -#, c-format

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

4967 +#: builtin/am.c:1838

4968 +msgid "Use 'git am --show-current-patch' to see the failed patch"

4969 msgstr ""

4970

4754 -#: builtin/am.c:1879

4971 +#: builtin/am.c:1882

4972 msgid ""

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

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

4975 "already introduced the same changes; you might want to skip this patch."

4976 msgstr ""

4977

4761 -#: builtin/am.c:1886

4978 +#: builtin/am.c:1889

4979 msgid ""

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

4981 "You should 'git add' each file with resolved conflicts to mark them as "

@@ -4766,171 +4983,179 @@ msgid ""

4983 "You might run `git rm` on a file to accept \"deleted by them\" for it."

4984 msgstr ""

4985

4769 -#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332

4770 -#: builtin/reset.c:340

4986 +#: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324

4987 +#: builtin/reset.c:332

4988 #, c-format

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

4990 msgstr ""

4991

4775 -#: builtin/am.c:2045

4992 +#: builtin/am.c:2048

4993 msgid "failed to clean index"

4994 msgstr ""

4995

4779 -#: builtin/am.c:2080

4996 +#: builtin/am.c:2083

4997 msgid ""

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

4999 "Not rewinding to ORIG_HEAD"

5000 msgstr ""

5001

4785 -#: builtin/am.c:2143

5002 +#: builtin/am.c:2174

5003 #, c-format

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

5005 msgstr ""

5006

4790 -#: builtin/am.c:2176

5007 +#: builtin/am.c:2210

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

5009 msgstr ""

5010

4794 -#: builtin/am.c:2177

5011 +#: builtin/am.c:2211

5012 msgid "git am [<options>] (--continue | --skip | --abort)"

5013 msgstr ""

5014

4798 -#: builtin/am.c:2183

5015 +#: builtin/am.c:2217

5016 msgid "run interactively"

5017 msgstr ""

5018

4802 -#: builtin/am.c:2185

5019 +#: builtin/am.c:2219

5020 msgid "historical option -- no-op"

5021 msgstr ""

5022

4806 -#: builtin/am.c:2187

5023 +#: builtin/am.c:2221

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

5025 msgstr ""

5026

4810 -#: builtin/am.c:2188 builtin/init-db.c:484 builtin/prune-packed.c:57

4811 -#: builtin/repack.c:180

5027 +#: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57

5028 +#: builtin/repack.c:182

5029 msgid "be quiet"

5030 msgstr ""

5031

4815 -#: builtin/am.c:2190

5032 +#: builtin/am.c:2224

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

5034 msgstr ""

5035

4819 -#: builtin/am.c:2193

5036 +#: builtin/am.c:2227

5037 msgid "recode into utf8 (default)"

5038 msgstr ""

5039

4823 -#: builtin/am.c:2195

5040 +#: builtin/am.c:2229

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

5042 msgstr ""

5043

4827 -#: builtin/am.c:2197

5044 +#: builtin/am.c:2231

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

5046 msgstr ""

5047

4831 -#: builtin/am.c:2199

5048 +#: builtin/am.c:2233

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

5050 msgstr ""

5051

4835 -#: builtin/am.c:2201

5052 +#: builtin/am.c:2235

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

5054 msgstr ""

5055

4839 -#: builtin/am.c:2204

5056 +#: builtin/am.c:2238

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

5058 msgstr ""

5059

4843 -#: builtin/am.c:2207

5060 +#: builtin/am.c:2241

5061 msgid "strip everything before a scissors line"

5062 msgstr ""

5063

4847 -#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218

4848 -#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230

4849 -#: builtin/am.c:2236

5064 +#: builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252

5065 +#: builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264

5066 +#: builtin/am.c:2270

5067 msgid "pass it through git-apply"

5068 msgstr ""

5069

4853 -#: builtin/am.c:2226 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668

4854 -#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203

4855 -#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195

4856 -#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377

4857 -#: parse-options.h:132 parse-options.h:134 parse-options.h:245

5070 +#: builtin/am.c:2260 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668

5071 +#: builtin/grep.c:853 builtin/merge.c:206 builtin/pull.c:145 builtin/pull.c:203

5072 +#: builtin/repack.c:191 builtin/repack.c:195 builtin/repack.c:197

5073 +#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:382

5074 +#: parse-options.h:144 parse-options.h:146 parse-options.h:257

5075 msgid "n"

5076 msgstr ""

5077

4861 -#: builtin/am.c:2232 builtin/branch.c:629 builtin/for-each-ref.c:38

4862 -#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39

5078 +#: builtin/am.c:2266 builtin/branch.c:629 builtin/for-each-ref.c:38

5079 +#: builtin/replace.c:445 builtin/tag.c:418 builtin/verify-tag.c:39

5080 msgid "format"

5081 msgstr ""

5082

4866 -#: builtin/am.c:2233

5083 +#: builtin/am.c:2267

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

5085 msgstr ""

5086

4870 -#: builtin/am.c:2239

5087 +#: builtin/am.c:2273

5088 msgid "override error message when patch failure occurs"

5089 msgstr ""

5090

4874 -#: builtin/am.c:2241

5091 +#: builtin/am.c:2275

5092 msgid "continue applying patches after resolving a conflict"

5093 msgstr ""

5094

4878 -#: builtin/am.c:2244

5095 +#: builtin/am.c:2278

5096 msgid "synonyms for --continue"

5097 msgstr ""

5098

4882 -#: builtin/am.c:2247

5099 +#: builtin/am.c:2281

5100 msgid "skip the current patch"

5101 msgstr ""

5102

4886 -#: builtin/am.c:2250

5103 +#: builtin/am.c:2284

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

5105 msgstr ""

5106

4890 -#: builtin/am.c:2254

5107 +#: builtin/am.c:2287

5108 +msgid "abort the patching operation but keep HEAD where it is."

5109 +msgstr ""

5110 +

5111 +#: builtin/am.c:2290

5112 +msgid "show the patch being applied."

5113 +msgstr ""

5114 +

5115 +#: builtin/am.c:2294

5116 msgid "lie about committer date"

5117 msgstr ""

5118

4894 -#: builtin/am.c:2256

5119 +#: builtin/am.c:2296

5120 msgid "use current timestamp for author date"

5121 msgstr ""

5122

4898 -#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236

4899 -#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392

5123 +#: builtin/am.c:2298 builtin/commit.c:1431 builtin/merge.c:237

5124 +#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:398

5125 msgid "key-id"

5126 msgstr ""

5127

4903 -#: builtin/am.c:2259

5128 +#: builtin/am.c:2299

5129 msgid "GPG-sign commits"

5130 msgstr ""

5131

4907 -#: builtin/am.c:2262

5132 +#: builtin/am.c:2302

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

5134 msgstr ""

5135

4911 -#: builtin/am.c:2280

5136 +#: builtin/am.c:2320

5137 msgid ""

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

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

5140 msgstr ""

5141

4917 -#: builtin/am.c:2287

5142 +#: builtin/am.c:2327

5143 msgid "failed to read the index"

5144 msgstr ""

5145

4921 -#: builtin/am.c:2302

5146 +#: builtin/am.c:2342

5147 #, c-format

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

5149 msgstr ""

5150

4926 -#: builtin/am.c:2326

5151 +#: builtin/am.c:2366

5152 #, c-format

5153 msgid ""

5154 "Stray %s directory found.\n"

5155 "Use \"git am --abort\" to remove it."

5156 msgstr ""

5157

4933 -#: builtin/am.c:2332

5158 +#: builtin/am.c:2372

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

5160 msgstr ""

5161

@@ -4952,7 +5177,7 @@ msgid "git archive: Remote with no URL"

5177 msgstr ""

5178

5179 #: builtin/archive.c:58

4955 -msgid "git archive: expected ACK/NAK, got EOF"

5180 +msgid "git archive: expected ACK/NAK, got a flush packet"

5181 msgstr ""

5182

5183 #: builtin/archive.c:61

@@ -5039,107 +5264,107 @@ msgstr ""

5264 msgid "<rev-opts> are documented in git-rev-list(1)"

5265 msgstr ""

5266

5042 -#: builtin/blame.c:668

5267 +#: builtin/blame.c:677

5268 msgid "Show blame entries as we find them, incrementally"

5269 msgstr ""

5270

5046 -#: builtin/blame.c:669

5271 +#: builtin/blame.c:678

5272 msgid "Show blank SHA-1 for boundary commits (Default: off)"

5273 msgstr ""

5274

5050 -#: builtin/blame.c:670

5275 +#: builtin/blame.c:679

5276 msgid "Do not treat root commits as boundaries (Default: off)"

5277 msgstr ""

5278

5054 -#: builtin/blame.c:671

5279 +#: builtin/blame.c:680

5280 msgid "Show work cost statistics"

5281 msgstr ""

5282

5058 -#: builtin/blame.c:672

5283 +#: builtin/blame.c:681

5284 msgid "Force progress reporting"

5285 msgstr ""

5286

5062 -#: builtin/blame.c:673

5287 +#: builtin/blame.c:682

5288 msgid "Show output score for blame entries"

5289 msgstr ""

5290

5066 -#: builtin/blame.c:674

5291 +#: builtin/blame.c:683

5292 msgid "Show original filename (Default: auto)"

5293 msgstr ""

5294

5070 -#: builtin/blame.c:675

5295 +#: builtin/blame.c:684

5296 msgid "Show original linenumber (Default: off)"

5297 msgstr ""

5298

5074 -#: builtin/blame.c:676

5299 +#: builtin/blame.c:685

5300 msgid "Show in a format designed for machine consumption"

5301 msgstr ""

5302

5078 -#: builtin/blame.c:677

5303 +#: builtin/blame.c:686

5304 msgid "Show porcelain format with per-line commit information"

5305 msgstr ""

5306

5082 -#: builtin/blame.c:678

5307 +#: builtin/blame.c:687

5308 msgid "Use the same output mode as git-annotate (Default: off)"

5309 msgstr ""

5310

5086 -#: builtin/blame.c:679

5311 +#: builtin/blame.c:688

5312 msgid "Show raw timestamp (Default: off)"

5313 msgstr ""

5314

5090 -#: builtin/blame.c:680

5315 +#: builtin/blame.c:689

5316 msgid "Show long commit SHA1 (Default: off)"

5317 msgstr ""

5318

5094 -#: builtin/blame.c:681

5319 +#: builtin/blame.c:690

5320 msgid "Suppress author name and timestamp (Default: off)"

5321 msgstr ""

5322

5098 -#: builtin/blame.c:682

5323 +#: builtin/blame.c:691

5324 msgid "Show author email instead of name (Default: off)"

5325 msgstr ""

5326

5102 -#: builtin/blame.c:683

5327 +#: builtin/blame.c:692

5328 msgid "Ignore whitespace differences"

5329 msgstr ""

5330

5106 -#: builtin/blame.c:690

5331 +#: builtin/blame.c:699

5332 msgid "Use an experimental heuristic to improve diffs"

5333 msgstr ""

5334

5110 -#: builtin/blame.c:692

5335 +#: builtin/blame.c:701

5336 msgid "Spend extra cycles to find better match"

5337 msgstr ""

5338

5114 -#: builtin/blame.c:693

5339 +#: builtin/blame.c:702

5340 msgid "Use revisions from <file> instead of calling git-rev-list"

5341 msgstr ""

5342

5118 -#: builtin/blame.c:694

5343 +#: builtin/blame.c:703

5344 msgid "Use <file>'s contents as the final image"

5345 msgstr ""

5346

5122 -#: builtin/blame.c:695 builtin/blame.c:696

5347 +#: builtin/blame.c:704 builtin/blame.c:705

5348 msgid "score"

5349 msgstr ""

5350

5126 -#: builtin/blame.c:695

5351 +#: builtin/blame.c:704

5352 msgid "Find line copies within and across files"

5353 msgstr ""

5354

5130 -#: builtin/blame.c:696

5355 +#: builtin/blame.c:705

5356 msgid "Find line movements within and across files"

5357 msgstr ""

5358

5134 -#: builtin/blame.c:697

5359 +#: builtin/blame.c:706

5360 msgid "n,m"

5361 msgstr ""

5362

5138 -#: builtin/blame.c:697

5363 +#: builtin/blame.c:706

5364 msgid "Process only line range n,m, counting from 1"

5365 msgstr ""

5366

5142 -#: builtin/blame.c:744

5367 +#: builtin/blame.c:753

5368 msgid "--progress can't be used with --incremental or porcelain formats"

5369 msgstr ""

5370

@@ -5151,18 +5376,18 @@ msgstr ""

5376 #. your language may need more or fewer display

5377 #. columns.

5378 #.

5154 -#: builtin/blame.c:795

5379 +#: builtin/blame.c:804

5380 msgid "4 years, 11 months ago"

5381 msgstr ""

5382

5158 -#: builtin/blame.c:882

5383 +#: builtin/blame.c:890

5384 #, c-format

5385 msgid "file %s has only %lu line"

5386 msgid_plural "file %s has only %lu lines"

5387 msgstr[0] ""

5388 msgstr[1] ""

5389

5165 -#: builtin/blame.c:928

5390 +#: builtin/blame.c:936

5391 msgid "Blaming lines"

5392 msgstr ""

5393

@@ -5441,17 +5666,17 @@ msgstr ""

5666 msgid "list branches in columns"

5667 msgstr ""

5668

5444 -#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405

5669 +#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:411

5670 msgid "key"

5671 msgstr ""

5672

5448 -#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406

5673 +#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:412

5674 msgid "field name to sort on"

5675 msgstr ""

5676

5677 #: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408

5678 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574

5454 -#: builtin/tag.c:408

5679 +#: builtin/tag.c:414

5680 msgid "object"

5681 msgstr ""

5682

@@ -5459,16 +5684,16 @@ msgstr ""

5684 msgid "print only branches of the object"

5685 msgstr ""

5686

5462 -#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415

5687 +#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:421

5688 msgid "sorting and filtering are case insensitive"

5689 msgstr ""

5690

5466 -#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413

5691 +#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:419

5692 #: builtin/verify-tag.c:39

5693 msgid "format to use for the output"

5694 msgstr ""

5695

5471 -#: builtin/branch.c:652 builtin/clone.c:730

5696 +#: builtin/branch.c:652 builtin/clone.c:735

5697 msgid "HEAD not found below refs/heads!"

5698 msgstr ""

5699

@@ -5562,75 +5787,75 @@ msgstr ""

5787 msgid "Need a repository to unbundle."

5788 msgstr ""

5789

5565 -#: builtin/cat-file.c:521

5790 +#: builtin/cat-file.c:523

5791 msgid ""

5792 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"

5793 "p | <type> | --textconv | --filters) [--path=<path>] <object>"

5794 msgstr ""

5795

5571 -#: builtin/cat-file.c:522

5796 +#: builtin/cat-file.c:524

5797 msgid ""

5798 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"

5799 "filters]"

5800 msgstr ""

5801

5577 -#: builtin/cat-file.c:559

5802 +#: builtin/cat-file.c:561

5803 msgid "<type> can be one of: blob, tree, commit, tag"

5804 msgstr ""

5805

5581 -#: builtin/cat-file.c:560

5806 +#: builtin/cat-file.c:562

5807 msgid "show object type"

5808 msgstr ""

5809

5585 -#: builtin/cat-file.c:561

5810 +#: builtin/cat-file.c:563

5811 msgid "show object size"

5812 msgstr ""

5813

5589 -#: builtin/cat-file.c:563

5814 +#: builtin/cat-file.c:565

5815 msgid "exit with zero when there's no error"

5816 msgstr ""

5817

5593 -#: builtin/cat-file.c:564

5818 +#: builtin/cat-file.c:566

5819 msgid "pretty-print object's content"

5820 msgstr ""

5821

5597 -#: builtin/cat-file.c:566

5822 +#: builtin/cat-file.c:568

5823 msgid "for blob objects, run textconv on object's content"

5824 msgstr ""

5825

5601 -#: builtin/cat-file.c:568

5826 +#: builtin/cat-file.c:570

5827 msgid "for blob objects, run filters on object's content"

5828 msgstr ""

5829

5605 -#: builtin/cat-file.c:569 git-submodule.sh:931

5830 +#: builtin/cat-file.c:571 git-submodule.sh:878

5831 msgid "blob"

5832 msgstr ""

5833

5609 -#: builtin/cat-file.c:570

5834 +#: builtin/cat-file.c:572

5835 msgid "use a specific path for --textconv/--filters"

5836 msgstr ""

5837

5613 -#: builtin/cat-file.c:572

5838 +#: builtin/cat-file.c:574

5839 msgid "allow -s and -t to work with broken/corrupt objects"

5840 msgstr ""

5841

5617 -#: builtin/cat-file.c:573

5842 +#: builtin/cat-file.c:575

5843 msgid "buffer --batch output"

5844 msgstr ""

5845

5621 -#: builtin/cat-file.c:575

5846 +#: builtin/cat-file.c:577

5847 msgid "show info and content of objects fed from the standard input"

5848 msgstr ""

5849

5625 -#: builtin/cat-file.c:578

5850 +#: builtin/cat-file.c:580

5851 msgid "show info about objects fed from the standard input"

5852 msgstr ""

5853

5629 -#: builtin/cat-file.c:581

5854 +#: builtin/cat-file.c:583

5855 msgid "follow in-tree symlinks (used with --batch or --batch-check)"

5856 msgstr ""

5857

5633 -#: builtin/cat-file.c:583

5858 +#: builtin/cat-file.c:585

5859 msgid "show all objects with --batch or --batch-check"

5860 msgstr ""

5861

@@ -5650,7 +5875,7 @@ msgstr ""

5875 msgid "use .gitattributes only from the index"

5876 msgstr ""

5877

5653 -#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99

5878 +#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100

5879 msgid "read file names from stdin"

5880 msgstr ""

5881

@@ -5658,7 +5883,7 @@ msgstr ""

5883 msgid "terminate input and output records by a NUL character"

5884 msgstr ""

5885

5661 -#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358

5886 +#: builtin/check-ignore.c:20 builtin/checkout.c:1106 builtin/gc.c:358

5887 msgid "suppress progress reporting"

5888 msgstr ""

5889

@@ -5670,27 +5895,27 @@ msgstr ""

5895 msgid "ignore index when checking"

5896 msgstr ""

5897

5673 -#: builtin/check-ignore.c:158

5898 +#: builtin/check-ignore.c:159

5899 msgid "cannot specify pathnames with --stdin"

5900 msgstr ""

5901

5677 -#: builtin/check-ignore.c:161

5902 +#: builtin/check-ignore.c:162

5903 msgid "-z only makes sense with --stdin"

5904 msgstr ""

5905

5681 -#: builtin/check-ignore.c:163

5906 +#: builtin/check-ignore.c:164

5907 msgid "no path specified"

5908 msgstr ""

5909

5685 -#: builtin/check-ignore.c:167

5910 +#: builtin/check-ignore.c:168

5911 msgid "--quiet is only valid with a single pathname"

5912 msgstr ""

5913

5689 -#: builtin/check-ignore.c:169

5914 +#: builtin/check-ignore.c:170

5915 msgid "cannot have both --quiet and --verbose"

5916 msgstr ""

5917

5693 -#: builtin/check-ignore.c:172

5918 +#: builtin/check-ignore.c:173

5919 msgid "--non-matching is only valid with --verbose"

5920 msgstr ""

5921

@@ -5748,9 +5973,9 @@ msgid "write the content to temporary files"

5973 msgstr ""

5974

5975 #: builtin/checkout-index.c:173 builtin/column.c:31

5751 -#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869

5752 -#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237

5753 -#: builtin/worktree.c:552

5976 +#: builtin/submodule--helper.c:1203 builtin/submodule--helper.c:1206

5977 +#: builtin/submodule--helper.c:1212 builtin/submodule--helper.c:1574

5978 +#: builtin/worktree.c:570

5979 msgid "string"

5980 msgstr ""

5981

@@ -5795,80 +6020,80 @@ msgstr ""

6020 msgid "path '%s': cannot merge"

6021 msgstr ""

6022

5798 -#: builtin/checkout.c:232

6023 +#: builtin/checkout.c:231

6024 #, c-format

6025 msgid "Unable to add merge result for '%s'"

6026 msgstr ""

6027

5803 -#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260

5804 -#: builtin/checkout.c:263

6028 +#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259

6029 +#: builtin/checkout.c:262

6030 #, c-format

6031 msgid "'%s' cannot be used with updating paths"

6032 msgstr ""

6033

5809 -#: builtin/checkout.c:266 builtin/checkout.c:269

6034 +#: builtin/checkout.c:265 builtin/checkout.c:268

6035 #, c-format

6036 msgid "'%s' cannot be used with %s"

6037 msgstr ""

6038

5814 -#: builtin/checkout.c:272

6039 +#: builtin/checkout.c:271

6040 #, c-format

6041 msgid "Cannot update paths and switch to branch '%s' at the same time."

6042 msgstr ""

6043

5819 -#: builtin/checkout.c:341 builtin/checkout.c:348

6044 +#: builtin/checkout.c:340 builtin/checkout.c:347

6045 #, c-format

6046 msgid "path '%s' is unmerged"

6047 msgstr ""

6048

5824 -#: builtin/checkout.c:506

6049 +#: builtin/checkout.c:505

6050 msgid "you need to resolve your current index first"

6051 msgstr ""

6052

5828 -#: builtin/checkout.c:637

6053 +#: builtin/checkout.c:636

6054 #, c-format

6055 msgid "Can not do reflog for '%s': %s\n"

6056 msgstr ""

6057

5833 -#: builtin/checkout.c:678

6058 +#: builtin/checkout.c:677

6059 msgid "HEAD is now at"

6060 msgstr ""

6061

5837 -#: builtin/checkout.c:682 builtin/clone.c:684

6062 +#: builtin/checkout.c:681 builtin/clone.c:689

6063 msgid "unable to update HEAD"

6064 msgstr ""

6065

5841 -#: builtin/checkout.c:686

6066 +#: builtin/checkout.c:685

6067 #, c-format

6068 msgid "Reset branch '%s'\n"

6069 msgstr ""

6070

5846 -#: builtin/checkout.c:689

6071 +#: builtin/checkout.c:688

6072 #, c-format

6073 msgid "Already on '%s'\n"

6074 msgstr ""

6075

5851 -#: builtin/checkout.c:693

6076 +#: builtin/checkout.c:692

6077 #, c-format

6078 msgid "Switched to and reset branch '%s'\n"

6079 msgstr ""

6080

5856 -#: builtin/checkout.c:695 builtin/checkout.c:1051

6081 +#: builtin/checkout.c:694 builtin/checkout.c:1039

6082 #, c-format

6083 msgid "Switched to a new branch '%s'\n"

6084 msgstr ""

6085

5861 -#: builtin/checkout.c:697

6086 +#: builtin/checkout.c:696

6087 #, c-format

6088 msgid "Switched to branch '%s'\n"

6089 msgstr ""

6090

5866 -#: builtin/checkout.c:748

6091 +#: builtin/checkout.c:747

6092 #, c-format

6093 msgid " ... and %d more.\n"

6094 msgstr ""

6095

5871 -#: builtin/checkout.c:754

6096 +#: builtin/checkout.c:753

6097 #, c-format

6098 msgid ""

6099 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -5883,7 +6108,7 @@ msgid_plural ""

6108 msgstr[0] ""

6109 msgstr[1] ""

6110

5886 -#: builtin/checkout.c:773

6111 +#: builtin/checkout.c:772

6112 #, c-format

6113 msgid ""

6114 "If you want to keep it by creating a new branch, this may be a good time\n"

@@ -5900,160 +6125,160 @@ msgid_plural ""

6125 msgstr[0] ""

6126 msgstr[1] ""

6127

5903 -#: builtin/checkout.c:814

6128 +#: builtin/checkout.c:804

6129 msgid "internal error in revision walk"

6130 msgstr ""

6131

5907 -#: builtin/checkout.c:818

6132 +#: builtin/checkout.c:808

6133 msgid "Previous HEAD position was"

6134 msgstr ""

6135

5911 -#: builtin/checkout.c:848 builtin/checkout.c:1046

6136 +#: builtin/checkout.c:836 builtin/checkout.c:1034

6137 msgid "You are on a branch yet to be born"

6138 msgstr ""

6139

5915 -#: builtin/checkout.c:952

6140 +#: builtin/checkout.c:940

6141 #, c-format

6142 msgid "only one reference expected, %d given."

6143 msgstr ""

6144

5920 -#: builtin/checkout.c:992 builtin/worktree.c:247

6145 +#: builtin/checkout.c:980 builtin/worktree.c:249

6146 #, c-format

6147 msgid "invalid reference: %s"

6148 msgstr ""

6149

5925 -#: builtin/checkout.c:1021

6150 +#: builtin/checkout.c:1009

6151 #, c-format

6152 msgid "reference is not a tree: %s"

6153 msgstr ""

6154

5930 -#: builtin/checkout.c:1060

6155 +#: builtin/checkout.c:1048

6156 msgid "paths cannot be used with switching branches"

6157 msgstr ""

6158

5934 -#: builtin/checkout.c:1063 builtin/checkout.c:1067

6159 +#: builtin/checkout.c:1051 builtin/checkout.c:1055

6160 #, c-format

6161 msgid "'%s' cannot be used with switching branches"

6162 msgstr ""

6163

5939 -#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079

5940 -#: builtin/checkout.c:1082

6164 +#: builtin/checkout.c:1059 builtin/checkout.c:1062 builtin/checkout.c:1067

6165 +#: builtin/checkout.c:1070

6166 #, c-format

6167 msgid "'%s' cannot be used with '%s'"

6168 msgstr ""

6169

5945 -#: builtin/checkout.c:1087

6170 +#: builtin/checkout.c:1075

6171 #, c-format

6172 msgid "Cannot switch branch to a non-commit '%s'"

6173 msgstr ""

6174

5950 -#: builtin/checkout.c:1119 builtin/checkout.c:1121 builtin/clone.c:114

5951 -#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:369

5952 -#: builtin/worktree.c:371

6175 +#: builtin/checkout.c:1107 builtin/checkout.c:1109 builtin/clone.c:116

6176 +#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:387

6177 +#: builtin/worktree.c:389

6178 msgid "branch"

6179 msgstr ""

6180

5956 -#: builtin/checkout.c:1120

6181 +#: builtin/checkout.c:1108

6182 msgid "create and checkout a new branch"

6183 msgstr ""

6184

5960 -#: builtin/checkout.c:1122

6185 +#: builtin/checkout.c:1110

6186 msgid "create/reset and checkout a branch"

6187 msgstr ""

6188

5964 -#: builtin/checkout.c:1123

6189 +#: builtin/checkout.c:1111

6190 msgid "create reflog for new branch"

6191 msgstr ""

6192

5968 -#: builtin/checkout.c:1124 builtin/worktree.c:373

6193 +#: builtin/checkout.c:1112 builtin/worktree.c:391

6194 msgid "detach HEAD at named commit"

6195 msgstr ""

6196

5972 -#: builtin/checkout.c:1125

6197 +#: builtin/checkout.c:1113

6198 msgid "set upstream info for new branch"

6199 msgstr ""

6200

5976 -#: builtin/checkout.c:1127

6201 +#: builtin/checkout.c:1115

6202 msgid "new-branch"

6203 msgstr ""

6204

5980 -#: builtin/checkout.c:1127

6205 +#: builtin/checkout.c:1115

6206 msgid "new unparented branch"

6207 msgstr ""

6208

5984 -#: builtin/checkout.c:1128

6209 +#: builtin/checkout.c:1116

6210 msgid "checkout our version for unmerged files"

6211 msgstr ""

6212

5988 -#: builtin/checkout.c:1130

6213 +#: builtin/checkout.c:1118

6214 msgid "checkout their version for unmerged files"

6215 msgstr ""

6216

5992 -#: builtin/checkout.c:1132

6217 +#: builtin/checkout.c:1120

6218 msgid "force checkout (throw away local modifications)"

6219 msgstr ""

6220

5996 -#: builtin/checkout.c:1133

6221 +#: builtin/checkout.c:1122

6222 msgid "perform a 3-way merge with the new branch"

6223 msgstr ""

6224

6000 -#: builtin/checkout.c:1134 builtin/merge.c:238

6225 +#: builtin/checkout.c:1124 builtin/merge.c:239

6226 msgid "update ignored files (default)"

6227 msgstr ""

6228

6004 -#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251

6229 +#: builtin/checkout.c:1126 builtin/log.c:1499 parse-options.h:263

6230 msgid "style"

6231 msgstr ""

6232

6008 -#: builtin/checkout.c:1136

6233 +#: builtin/checkout.c:1127

6234 msgid "conflict style (merge or diff3)"

6235 msgstr ""

6236

6012 -#: builtin/checkout.c:1139

6237 +#: builtin/checkout.c:1130

6238 msgid "do not limit pathspecs to sparse entries only"

6239 msgstr ""

6240

6016 -#: builtin/checkout.c:1141

6241 +#: builtin/checkout.c:1132

6242 msgid "second guess 'git checkout <no-such-branch>'"

6243 msgstr ""

6244

6020 -#: builtin/checkout.c:1143

6245 +#: builtin/checkout.c:1134

6246 msgid "do not check if another worktree is holding the given ref"

6247 msgstr ""

6248

6024 -#: builtin/checkout.c:1147 builtin/clone.c:81 builtin/fetch.c:137

6025 -#: builtin/merge.c:235 builtin/pull.c:123 builtin/push.c:556

6249 +#: builtin/checkout.c:1138 builtin/clone.c:83 builtin/fetch.c:150

6250 +#: builtin/merge.c:236 builtin/pull.c:123 builtin/push.c:556

6251 #: builtin/send-pack.c:173

6252 msgid "force progress reporting"

6253 msgstr ""

6254

6030 -#: builtin/checkout.c:1177

6255 +#: builtin/checkout.c:1168

6256 msgid "-b, -B and --orphan are mutually exclusive"

6257 msgstr ""

6258

6034 -#: builtin/checkout.c:1194

6259 +#: builtin/checkout.c:1185

6260 msgid "--track needs a branch name"

6261 msgstr ""

6262

6038 -#: builtin/checkout.c:1199

6263 +#: builtin/checkout.c:1190

6264 msgid "Missing branch name; try -b"

6265 msgstr ""

6266

6042 -#: builtin/checkout.c:1235

6267 +#: builtin/checkout.c:1226

6268 msgid "invalid path specification"

6269 msgstr ""

6270

6046 -#: builtin/checkout.c:1242

6271 +#: builtin/checkout.c:1233

6272 #, c-format

6273 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"

6274 msgstr ""

6275

6051 -#: builtin/checkout.c:1246

6276 +#: builtin/checkout.c:1237

6277 #, c-format

6278 msgid "git checkout: --detach does not take a path argument '%s'"

6279 msgstr ""

6280

6056 -#: builtin/checkout.c:1250

6281 +#: builtin/checkout.c:1241

6282 msgid ""

6283 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

6284 "checking out of the index."

@@ -6137,7 +6362,7 @@ msgstr ""

6362 msgid "Remove %s [y/N]? "

6363 msgstr ""

6364

6140 -#: builtin/clean.c:788 git-add--interactive.perl:1616

6365 +#: builtin/clean.c:788 git-add--interactive.perl:1710

6366 #, c-format

6367 msgid "Bye.\n"

6368 msgstr ""

@@ -6153,11 +6378,11 @@ msgid ""

6378 "? - help for prompt selection"

6379 msgstr ""

6380

6156 -#: builtin/clean.c:823 git-add--interactive.perl:1692

6381 +#: builtin/clean.c:823 git-add--interactive.perl:1786

6382 msgid "*** Commands ***"

6383 msgstr ""

6384

6160 -#: builtin/clean.c:824 git-add--interactive.perl:1689

6385 +#: builtin/clean.c:824 git-add--interactive.perl:1783

6386 msgid "What now"

6387 msgstr ""

6388

@@ -6187,8 +6412,8 @@ msgstr ""

6412 msgid "remove whole directories"

6413 msgstr ""

6414

6190 -#: builtin/clean.c:916 builtin/describe.c:530 builtin/describe.c:532

6191 -#: builtin/grep.c:863 builtin/log.c:155 builtin/log.c:157

6415 +#: builtin/clean.c:916 builtin/describe.c:533 builtin/describe.c:535

6416 +#: builtin/grep.c:871 builtin/log.c:157 builtin/log.c:159

6417 #: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399

6418 #: builtin/show-ref.c:176

6419 msgid "pattern"

@@ -6222,315 +6447,319 @@ msgid ""

6447 "refusing to clean"

6448 msgstr ""

6449

6225 -#: builtin/clone.c:39

6450 +#: builtin/clone.c:40

6451 msgid "git clone [<options>] [--] <repo> [<dir>]"

6452 msgstr ""

6453

6229 -#: builtin/clone.c:83

6454 +#: builtin/clone.c:85

6455 msgid "don't create a checkout"

6456 msgstr ""

6457

6233 -#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479

6458 +#: builtin/clone.c:86 builtin/clone.c:88 builtin/init-db.c:479

6459 msgid "create a bare repository"

6460 msgstr ""

6461

6237 -#: builtin/clone.c:88

6462 +#: builtin/clone.c:90

6463 msgid "create a mirror repository (implies bare)"

6464 msgstr ""

6465

6241 -#: builtin/clone.c:90

6466 +#: builtin/clone.c:92

6467 msgid "to clone from a local repository"

6468 msgstr ""

6469

6245 -#: builtin/clone.c:92

6470 +#: builtin/clone.c:94

6471 msgid "don't use local hardlinks, always copy"

6472 msgstr ""

6473

6249 -#: builtin/clone.c:94

6474 +#: builtin/clone.c:96

6475 msgid "setup as shared repository"

6476 msgstr ""

6477

6253 -#: builtin/clone.c:96 builtin/clone.c:100

6478 +#: builtin/clone.c:98 builtin/clone.c:102

6479 msgid "pathspec"

6480 msgstr ""

6481

6257 -#: builtin/clone.c:96 builtin/clone.c:100

6482 +#: builtin/clone.c:98 builtin/clone.c:102

6483 msgid "initialize submodules in the clone"

6484 msgstr ""

6485

6261 -#: builtin/clone.c:103

6486 +#: builtin/clone.c:105

6487 msgid "number of submodules cloned in parallel"

6488 msgstr ""

6489

6265 -#: builtin/clone.c:104 builtin/init-db.c:476

6490 +#: builtin/clone.c:106 builtin/init-db.c:476

6491 msgid "template-directory"

6492 msgstr ""

6493

6269 -#: builtin/clone.c:105 builtin/init-db.c:477

6494 +#: builtin/clone.c:107 builtin/init-db.c:477

6495 msgid "directory from which templates will be used"

6496 msgstr ""

6497

6273 -#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873

6274 -#: builtin/submodule--helper.c:1240

6498 +#: builtin/clone.c:109 builtin/clone.c:111 builtin/submodule--helper.c:1210

6499 +#: builtin/submodule--helper.c:1577

6500 msgid "reference repository"

6501 msgstr ""

6502

6278 -#: builtin/clone.c:111

6503 +#: builtin/clone.c:113

6504 msgid "use --reference only while cloning"

6505 msgstr ""

6506

6282 -#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44

6507 +#: builtin/clone.c:114 builtin/column.c:27 builtin/merge-file.c:44

6508 msgid "name"

6509 msgstr ""

6510

6286 -#: builtin/clone.c:113

6511 +#: builtin/clone.c:115

6512 msgid "use <name> instead of 'origin' to track upstream"

6513 msgstr ""

6514

6290 -#: builtin/clone.c:115

6515 +#: builtin/clone.c:117

6516 msgid "checkout <branch> instead of the remote's HEAD"

6517 msgstr ""

6518

6294 -#: builtin/clone.c:117

6519 +#: builtin/clone.c:119

6520 msgid "path to git-upload-pack on the remote"

6521 msgstr ""

6522

6298 -#: builtin/clone.c:118 builtin/fetch.c:138 builtin/grep.c:806

6523 +#: builtin/clone.c:120 builtin/fetch.c:151 builtin/grep.c:813

6524 #: builtin/pull.c:211

6525 msgid "depth"

6526 msgstr ""

6527

6303 -#: builtin/clone.c:119

6528 +#: builtin/clone.c:121

6529 msgid "create a shallow clone of that depth"

6530 msgstr ""

6531

6307 -#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991

6308 -#: parse-options.h:142

6532 +#: builtin/clone.c:122 builtin/fetch.c:153 builtin/pack-objects.c:3017

6533 +#: parse-options.h:154

6534 msgid "time"

6535 msgstr ""

6536

6312 -#: builtin/clone.c:121

6537 +#: builtin/clone.c:123

6538 msgid "create a shallow clone since a specific time"

6539 msgstr ""

6540

6316 -#: builtin/clone.c:122 builtin/fetch.c:142

6541 +#: builtin/clone.c:124 builtin/fetch.c:155

6542 msgid "revision"

6543 msgstr ""

6544

6320 -#: builtin/clone.c:123 builtin/fetch.c:143

6545 +#: builtin/clone.c:125 builtin/fetch.c:156

6546 msgid "deepen history of shallow clone, excluding rev"

6547 msgstr ""

6548

6324 -#: builtin/clone.c:125

6549 +#: builtin/clone.c:127

6550 msgid "clone only one branch, HEAD or --branch"

6551 msgstr ""

6552

6328 -#: builtin/clone.c:127

6553 +#: builtin/clone.c:129

6554 msgid "don't clone any tags, and make later fetches not to follow them"

6555 msgstr ""

6556

6332 -#: builtin/clone.c:129

6557 +#: builtin/clone.c:131

6558 msgid "any cloned submodules will be shallow"

6559 msgstr ""

6560

6336 -#: builtin/clone.c:130 builtin/init-db.c:485

6561 +#: builtin/clone.c:132 builtin/init-db.c:485

6562 msgid "gitdir"

6563 msgstr ""

6564

6340 -#: builtin/clone.c:131 builtin/init-db.c:486

6565 +#: builtin/clone.c:133 builtin/init-db.c:486

6566 msgid "separate git dir from working tree"

6567 msgstr ""

6568

6344 -#: builtin/clone.c:132

6569 +#: builtin/clone.c:134

6570 msgid "key=value"

6571 msgstr ""

6572

6348 -#: builtin/clone.c:133

6573 +#: builtin/clone.c:135

6574 msgid "set config inside the new repository"

6575 msgstr ""

6576

6352 -#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224

6577 +#: builtin/clone.c:136 builtin/fetch.c:173 builtin/pull.c:224

6578 #: builtin/push.c:567

6579 msgid "use IPv4 addresses only"

6580 msgstr ""

6581

6357 -#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227

6582 +#: builtin/clone.c:138 builtin/fetch.c:175 builtin/pull.c:227

6583 #: builtin/push.c:569

6584 msgid "use IPv6 addresses only"

6585 msgstr ""

6586

6362 -#: builtin/clone.c:273

6587 +#: builtin/clone.c:276

6588 msgid ""

6589 "No directory name could be guessed.\n"

6590 "Please specify a directory on the command line"

6591 msgstr ""

6592

6368 -#: builtin/clone.c:326

6593 +#: builtin/clone.c:329

6594 #, c-format

6595 msgid "info: Could not add alternate for '%s': %s\n"

6596 msgstr ""

6597

6373 -#: builtin/clone.c:398

6598 +#: builtin/clone.c:401

6599 #, c-format

6600 msgid "failed to open '%s'"

6601 msgstr ""

6602

6378 -#: builtin/clone.c:406

6603 +#: builtin/clone.c:409

6604 #, c-format

6605 msgid "%s exists and is not a directory"

6606 msgstr ""

6607

6383 -#: builtin/clone.c:420

6608 +#: builtin/clone.c:423

6609 #, c-format

6610 msgid "failed to stat %s\n"

6611 msgstr ""

6612

6388 -#: builtin/clone.c:442

6613 +#: builtin/clone.c:445

6614 #, c-format

6615 msgid "failed to create link '%s'"

6616 msgstr ""

6617

6393 -#: builtin/clone.c:446

6618 +#: builtin/clone.c:449

6619 #, c-format

6620 msgid "failed to copy file to '%s'"

6621 msgstr ""

6622

6398 -#: builtin/clone.c:472

6623 +#: builtin/clone.c:475

6624 #, c-format

6625 msgid "done.\n"

6626 msgstr ""

6627

6403 -#: builtin/clone.c:484

6628 +#: builtin/clone.c:489

6629 msgid ""

6630 "Clone succeeded, but checkout failed.\n"

6631 "You can inspect what was checked out with 'git status'\n"

6632 "and retry the checkout with 'git checkout -f HEAD'\n"

6633 msgstr ""

6634

6410 -#: builtin/clone.c:561

6635 +#: builtin/clone.c:566

6636 #, c-format

6637 msgid "Could not find remote branch %s to clone."

6638 msgstr ""

6639

6415 -#: builtin/clone.c:656

6640 +#: builtin/clone.c:661

6641 msgid "remote did not send all necessary objects"

6642 msgstr ""

6643

6419 -#: builtin/clone.c:672

6644 +#: builtin/clone.c:677

6645 #, c-format

6646 msgid "unable to update %s"

6647 msgstr ""

6648

6424 -#: builtin/clone.c:721

6649 +#: builtin/clone.c:726

6650 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

6651 msgstr ""

6652

6428 -#: builtin/clone.c:751

6653 +#: builtin/clone.c:756

6654 msgid "unable to checkout working tree"

6655 msgstr ""

6656

6432 -#: builtin/clone.c:796

6657 +#: builtin/clone.c:801

6658 msgid "unable to write parameters to config file"

6659 msgstr ""

6660

6436 -#: builtin/clone.c:859

6661 +#: builtin/clone.c:864

6662 msgid "cannot repack to clean up"

6663 msgstr ""

6664

6440 -#: builtin/clone.c:861

6665 +#: builtin/clone.c:866

6666 msgid "cannot unlink temporary alternates file"

6667 msgstr ""

6668

6444 -#: builtin/clone.c:894 builtin/receive-pack.c:1945

6669 +#: builtin/clone.c:906 builtin/receive-pack.c:1946

6670 msgid "Too many arguments."

6671 msgstr ""

6672

6448 -#: builtin/clone.c:898

6673 +#: builtin/clone.c:910

6674 msgid "You must specify a repository to clone."

6675 msgstr ""

6676

6452 -#: builtin/clone.c:911

6677 +#: builtin/clone.c:923

6678 #, c-format

6679 msgid "--bare and --origin %s options are incompatible."

6680 msgstr ""

6681

6457 -#: builtin/clone.c:914

6682 +#: builtin/clone.c:926

6683 msgid "--bare and --separate-git-dir are incompatible."

6684 msgstr ""

6685

6461 -#: builtin/clone.c:927

6686 +#: builtin/clone.c:939

6687 #, c-format

6688 msgid "repository '%s' does not exist"

6689 msgstr ""

6690

6466 -#: builtin/clone.c:933 builtin/fetch.c:1358

6691 +#: builtin/clone.c:945 builtin/fetch.c:1455

6692 #, c-format

6693 msgid "depth %s is not a positive number"

6694 msgstr ""

6695

6471 -#: builtin/clone.c:943

6696 +#: builtin/clone.c:955

6697 #, c-format

6698 msgid "destination path '%s' already exists and is not an empty directory."

6699 msgstr ""

6700

6476 -#: builtin/clone.c:953

6701 +#: builtin/clone.c:965

6702 #, c-format

6703 msgid "working tree '%s' already exists."

6704 msgstr ""

6705

6481 -#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270

6482 -#: builtin/worktree.c:253 builtin/worktree.c:283

6706 +#: builtin/clone.c:980 builtin/clone.c:1001 builtin/difftool.c:270

6707 +#: builtin/worktree.c:255 builtin/worktree.c:285

6708 #, c-format

6709 msgid "could not create leading directories of '%s'"

6710 msgstr ""

6711

6487 -#: builtin/clone.c:971

6712 +#: builtin/clone.c:985

6713 #, c-format

6714 msgid "could not create work tree dir '%s'"

6715 msgstr ""

6716

6492 -#: builtin/clone.c:983

6717 +#: builtin/clone.c:1005

6718 #, c-format

6719 msgid "Cloning into bare repository '%s'...\n"

6720 msgstr ""

6721

6497 -#: builtin/clone.c:985

6722 +#: builtin/clone.c:1007

6723 #, c-format

6724 msgid "Cloning into '%s'...\n"

6725 msgstr ""

6726

6502 -#: builtin/clone.c:1009

6727 +#: builtin/clone.c:1031

6728 msgid ""

6729 "clone --recursive is not compatible with both --reference and --reference-if-"

6730 "able"

6731 msgstr ""

6732

6508 -#: builtin/clone.c:1071

6733 +#: builtin/clone.c:1093

6734 msgid "--depth is ignored in local clones; use file:// instead."

6735 msgstr ""

6736

6512 -#: builtin/clone.c:1073

6737 +#: builtin/clone.c:1095

6738 msgid "--shallow-since is ignored in local clones; use file:// instead."

6739 msgstr ""

6740

6516 -#: builtin/clone.c:1075

6741 +#: builtin/clone.c:1097

6742 msgid "--shallow-exclude is ignored in local clones; use file:// instead."

6743 msgstr ""

6744

6520 -#: builtin/clone.c:1078

6745 +#: builtin/clone.c:1099

l10n: git.pot: v2.17.0 round 1 (132 new, 44 removed)