48
48
"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"
52
52
msgid "git archive --remote <repo> [--exec <cmd>] --list"
55
#: archive.c:243 builtin/add.c:136 builtin/add.c:427 builtin/rm.c:328
55
#: archive.c:342 builtin/add.c:137 builtin/add.c:428 builtin/rm.c:327
57
57
msgid "pathspec '%s' did not match any files"
65
65
msgid "archive format"
68
#: archive.c:329 builtin/log.c:1201
68
#: archive.c:428 builtin/log.c:1204
73
73
msgid "prepend prefix to each pathname in the archive"
76
#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2517
77
#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:709
78
#: builtin/fast-export.c:711 builtin/grep.c:712 builtin/hash-object.c:77
79
#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:412
80
#: builtin/notes.c:569 builtin/read-tree.c:108 parse-options.h:151
76
#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516
77
#: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986
78
#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:99
79
#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394
80
#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:150
84
#: archive.c:332 builtin/archive.c:89
84
#: archive.c:431 builtin/archive.c:89
85
85
msgid "write the archive to this file"
89
89
msgid "read .gitattributes in working directory"
93
93
msgid "report archived files on stderr"
101
101
msgid "compress faster"
105
105
msgid "compress better"
109
109
msgid "list supported archive formats"
112
#: archive.c:350 builtin/archive.c:90 builtin/clone.c:84
112
#: archive.c:449 builtin/archive.c:90 builtin/clone.c:77
116
#: archive.c:351 builtin/archive.c:91
116
#: archive.c:450 builtin/archive.c:91
117
117
msgid "retrieve the archive from remote repository <repo>"
120
#: archive.c:352 builtin/archive.c:92 builtin/notes.c:491
120
#: archive.c:451 builtin/archive.c:92 builtin/notes.c:478
124
#: archive.c:353 builtin/archive.c:93
124
#: archive.c:452 builtin/archive.c:93
125
125
msgid "path to the remote git-upload-archive command"
130
130
"Negative patterns are ignored in git attributes\n"
131
131
"Use '\\!' for literal leading exclamation."
547
548
"ဤအရာထဲမှတစ်ခုကိုသင်ဆိုလိုခဲ့ပါသလား။"
551
552
msgid "%s: %s - %s"
555
556
msgid "failed to read the cache"
558
#: merge.c:93 builtin/checkout.c:356 builtin/checkout.c:556
559
#: builtin/clone.c:661
559
#: merge.c:94 builtin/checkout.c:376 builtin/checkout.c:587
560
#: builtin/clone.c:647
560
561
msgid "unable to write new index file"
563
#: merge-recursive.c:190
564
#: merge-recursive.c:189
565
566
msgid "(bad commit)\n"
566
567
msgstr "(မကောင်းသောကျူးလွန်မှ ု)\n"
568
#: merge-recursive.c:210
569
#: merge-recursive.c:209
570
571
msgid "addinfo_cache failed for path '%s'"
571
572
msgstr "addinfo_cache failed for path '%s'"
573
#: merge-recursive.c:271
574
#: merge-recursive.c:270
574
575
msgid "error building trees"
575
576
msgstr "trees များကိုတည်ဆောက်ရာတွင်အမှား"
577
#: merge-recursive.c:692
578
#: merge-recursive.c:687
579
580
msgid "failed to create path '%s'%s"
580
581
msgstr "'%s'%s လမ်းကြောင်းကိုတည်ဆောက်ရာတွင်မအောင်မြင်ခဲ့ပါ"
582
#: merge-recursive.c:703
583
#: merge-recursive.c:698
584
585
msgid "Removing %s to make room for subdirectory\n"
585
586
msgstr "subdirectoryအတွက်နေရာလွတ်ပေးရန် %s ဖယ်ရှားခြင်း\n"
587
#: merge-recursive.c:717 merge-recursive.c:738
588
#: merge-recursive.c:712 merge-recursive.c:733
588
589
msgid ": perhaps a D/F conflict?"
589
590
msgstr ": perhaps a D/F conflict?"
591
#: merge-recursive.c:728
592
#: merge-recursive.c:723
593
594
msgid "refusing to lose untracked file at '%s'"
596
#: merge-recursive.c:768
597
#: merge-recursive.c:763
598
599
msgid "cannot read object %s '%s'"
599
600
msgstr "မဖတ်နိုင်သောအရာဝထ္ထု %s '%s'"
601
#: merge-recursive.c:770
602
#: merge-recursive.c:765
603
604
msgid "blob expected for %s '%s'"
606
#: merge-recursive.c:793 builtin/clone.c:317
607
#: merge-recursive.c:788 builtin/clone.c:306
608
609
msgid "failed to open '%s'"
609
610
msgstr "'%s'ကိုဖွင့်ရာတွင်မအောင်မြင်ခဲ့ပါ"
611
#: merge-recursive.c:801
612
#: merge-recursive.c:796
613
614
msgid "failed to symlink '%s'"
616
#: merge-recursive.c:804
617
#: merge-recursive.c:799
618
619
msgid "do not know what to do with %06o %s '%s'"
619
620
msgstr "%06o %s '%s'နှင့်ဘာလုပ်ရမှန်းမသိပါ"
621
#: merge-recursive.c:942
622
#: merge-recursive.c:937
622
623
msgid "Failed to execute internal merge"
625
#: merge-recursive.c:946
626
#: merge-recursive.c:941
627
628
msgid "Unable to add %s to database"
628
629
msgstr "databaseအတွင်း %s ကိုမပေါင်းထည့်နိုင်ပါ"
630
#: merge-recursive.c:962
631
#: merge-recursive.c:957
631
632
msgid "unsupported object type in the tree"
632
633
msgstr "tree အတွင်းတွင်မထောက်ပံ့ခဲ့သောအရာဝထ္ထုအမျိုးအစား"
634
#: merge-recursive.c:1037 merge-recursive.c:1051
637
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
640
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
643
#: merge-recursive.c:1043 merge-recursive.c:1056
646
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
649
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
652
#: merge-recursive.c:1097
635
#: merge-recursive.c:1032 merge-recursive.c:1046
638
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
641
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
644
#: merge-recursive.c:1038 merge-recursive.c:1051
647
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
650
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
653
#: merge-recursive.c:1092
654
655
msgstr "အမည္ၿပန္ေပးသည္"
656
#: merge-recursive.c:1097
657
#: merge-recursive.c:1092
658
659
msgstr "အမည်ပြန်ပေးခဲ့သည်"
660
#: merge-recursive.c:1153
661
#: merge-recursive.c:1148
662
663
msgid "%s is a directory in %s adding as %s instead"
663
664
msgstr "%s is a directory in %s adding as %s instead"
666
#: merge-recursive.c:1170
669
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
670
"\"%s\"->\"%s\" in \"%s\"%s"
672
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
673
"\"%s\"->\"%s\" in \"%s\"%s"
665
675
#: merge-recursive.c:1175
668
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
669
"\"%s\"->\"%s\" in \"%s\"%s"
671
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
672
"\"%s\"->\"%s\" in \"%s\"%s"
674
#: merge-recursive.c:1180
675
676
msgid " (left unresolved)"
676
677
msgstr " (ချန်ထားသောပြန်လည်မဖြေရှင်းနိုင်ခဲ့မှ ု)"
678
#: merge-recursive.c:1234
679
#: merge-recursive.c:1229
680
681
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
681
682
msgstr "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
683
#: merge-recursive.c:1264
684
#: merge-recursive.c:1259
685
686
msgid "Renaming %s to %s and %s to %s instead"
686
687
msgstr "Renaming %s to %s and %s to %s instead"
688
#: merge-recursive.c:1463
689
#: merge-recursive.c:1458
690
691
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
691
692
msgstr "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
693
#: merge-recursive.c:1473
694
#: merge-recursive.c:1468
695
696
msgid "Adding merged %s"
698
#: merge-recursive.c:1478 merge-recursive.c:1676
699
#: merge-recursive.c:1473 merge-recursive.c:1671
700
701
msgid "Adding as %s instead"
703
#: merge-recursive.c:1529
704
#: merge-recursive.c:1524
705
706
msgid "cannot read object %s"
706
707
msgstr "မဖတ်နိုင်သောအရာ %s"
708
#: merge-recursive.c:1532
709
#: merge-recursive.c:1527
710
711
msgid "object %s is not a blob"
713
#: merge-recursive.c:1580
714
#: merge-recursive.c:1575
715
716
msgstr "ပြုပြင်မွမ်းမံ"
717
#: merge-recursive.c:1580
718
#: merge-recursive.c:1575
719
720
msgstr "ပြုပြင်မွမ်းမံခဲ့သည်"
721
#: merge-recursive.c:1590
722
#: merge-recursive.c:1585
725
#: merge-recursive.c:1597
726
#: merge-recursive.c:1592
727
728
msgstr "ထည့်သည်/ထည့်သည်"
729
#: merge-recursive.c:1631
730
#: merge-recursive.c:1626
731
732
msgid "Skipped %s (merged same as existing)"
734
#: merge-recursive.c:1645
735
#: merge-recursive.c:1640
736
737
msgid "Auto-merging %s"
739
#: merge-recursive.c:1649 git-submodule.sh:1150
740
#: merge-recursive.c:1644 git-submodule.sh:1150
740
741
msgid "submodule"
743
#: merge-recursive.c:1650
744
#: merge-recursive.c:1645
745
746
msgid "CONFLICT (%s): Merge conflict in %s"
748
#: merge-recursive.c:1740
749
#: merge-recursive.c:1731
750
751
msgid "Removing %s"
751
752
msgstr "ဖယ်ရှားနေသည် %s"
753
#: merge-recursive.c:1765
754
#: merge-recursive.c:1756
754
755
msgid "file/directory"
755
756
msgstr "file/directory"
757
#: merge-recursive.c:1771
758
#: merge-recursive.c:1762
758
759
msgid "directory/file"
759
760
msgstr "directory/file"
761
#: merge-recursive.c:1776
762
#: merge-recursive.c:1767
764
765
"CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
767
#: merge-recursive.c:1786
768
#: merge-recursive.c:1777
769
770
msgid "Adding %s"
770
771
msgstr "ထည့်နေသည် %s"
772
#: merge-recursive.c:1803
773
#: merge-recursive.c:1794
773
774
msgid "Fatal merge failure, shouldn't happen."
777
#: merge-recursive.c:1813
778
msgid "Already up-to-date!"
776
781
#: merge-recursive.c:1822
777
msgid "Already up-to-date!"
780
#: merge-recursive.c:1831
782
783
msgid "merging of trees %s and %s failed"
785
#: merge-recursive.c:1861
786
#: merge-recursive.c:1852
787
788
msgid "Unprocessed path??? %s"
790
#: merge-recursive.c:1906
791
#: merge-recursive.c:1900
794
#: merge-recursive.c:1919
795
#: merge-recursive.c:1913
796
797
msgid "found %u common ancestor:"
797
798
msgid_plural "found %u common ancestors:"
798
799
msgstr[0] "found %u common ancestor:"
800
#: merge-recursive.c:1956
801
#: merge-recursive.c:1950
801
802
msgid "merge returned no commit"
804
#: merge-recursive.c:2013
805
#: merge-recursive.c:2007
806
807
msgid "Could not parse object '%s'"
809
#: merge-recursive.c:2024 builtin/merge.c:666
810
#: merge-recursive.c:2018 builtin/merge.c:645
810
811
msgid "Unable to write index."
811
812
msgstr "အညွန်းအတွင်းမရေးနိုင်ပါ။"
992
993
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
996
997
msgid "open /dev/null failed"
1001
1002
msgid "dup2(%d,%d) failed"
1004
#: sequencer.c:171 builtin/merge.c:782 builtin/merge.c:893
1005
#: builtin/merge.c:1003 builtin/merge.c:1013
1005
#: sequencer.c:172 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
1006
#: builtin/merge.c:983
1007
1008
msgid "Could not open '%s' for writing"
1008
1009
msgstr "ရေးရန်အတွက် '%s' ကိုမဖွင့်နိုင်ပါ။"
1010
#: sequencer.c:173 builtin/merge.c:343 builtin/merge.c:785
1011
#: builtin/merge.c:1005 builtin/merge.c:1018
1011
#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975
1012
#: builtin/merge.c:988
1013
1014
msgid "Could not write to '%s'"
1014
1015
msgstr "'%s' တွင်မရေးနိုင်ခဲ့ပါ"
1018
1019
"after resolving the conflicts, mark the corrected paths\n"
1019
1020
"with 'git add <paths>' or 'git rm <paths>'"
1024
1025
"after resolving the conflicts, mark the corrected paths\n"
1025
1026
"with 'git add <paths>' or 'git rm <paths>'\n"
1026
1027
"and commit the result with 'git commit'"
1029
#: sequencer.c:210 sequencer.c:841 sequencer.c:924
1030
#: sequencer.c:211 sequencer.c:861 sequencer.c:944
1031
1032
msgid "Could not write to %s"
1032
1033
msgstr "'%s' တွင်မရေးနိုင်ခဲ့ပါ"
1036
1037
msgid "Error wrapping up %s"
1040
1041
msgid "Your local changes would be overwritten by cherry-pick."
1044
1045
msgid "Your local changes would be overwritten by revert."
1048
1049
msgid "Commit your changes or stash them to proceed."
1051
1052
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
1054
1055
msgid "%s: Unable to write new index file"
1058
1059
msgid "Could not resolve HEAD commit\n"
1062
1063
msgid "Unable to update cache tree\n"
1067
1068
msgid "Could not parse commit %s\n"
1072
1073
msgid "Could not parse parent commit %s\n"
1076
1077
msgid "Your index file is unmerged."
1081
1082
msgid "Commit %s is a merge but no -m option was given."
1086
1087
msgid "Commit %s does not have parent %d"
1091
1092
msgid "Mainline was specified but commit %s is not a merge."
1094
1095
#. TRANSLATORS: The first %s will be "revert" or
1095
1096
#. "cherry-pick", the second %s a SHA1
1098
1099
msgid "%s: cannot parse parent commit %s"
1103
1104
msgid "Cannot get commit message for %s"
1108
1109
msgid "could not revert %s... %s"
1113
1114
msgid "could not apply %s... %s"
1117
1118
msgid "empty commit set passed"
1122
1123
msgid "git %s: failed to read the index"
1127
1128
msgid "git %s: failed to refresh the index"
1132
1133
msgid "Cannot %s during a %s"
1137
1138
msgid "Could not parse line %d."
1141
1142
msgid "No commits parsed."
1146
1147
msgid "Could not open %s"
1151
1152
msgid "Could not read %s."
1156
1157
msgid "Unusable instruction sheet: %s"
1161
1162
msgid "Invalid key: %s"
1166
1167
msgid "Invalid value for %s: %s"
1171
1172
msgid "Malformed options sheet: %s"
1175
1176
msgid "a cherry-pick or revert is already in progress"
1179
1180
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1184
1185
msgid "Could not create sequencer directory %s"
1187
#: sequencer.c:843 sequencer.c:928
1188
#: sequencer.c:863 sequencer.c:948
1189
1190
msgid "Error wrapping up %s."
1192
#: sequencer.c:862 sequencer.c:998
1193
#: sequencer.c:882 sequencer.c:1018
1193
1194
msgid "no cherry-pick or revert in progress"
1197
1198
msgid "cannot resolve HEAD"
1201
1202
msgid "cannot abort from a branch yet to be born"
1204
#: sequencer.c:888 builtin/apply.c:4062
1205
#: sequencer.c:908 builtin/apply.c:4291
1206
1207
msgid "cannot open %s: %s"
1211
1212
msgid "cannot read %s: %s"
1215
1216
msgid "unexpected end of file"
1220
1221
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1225
1226
msgid "Could not format %s."
1230
1231
msgid "%s: can't cherry-pick a %s"
1235
1236
msgid "%s: bad revision"
1239
1240
msgid "Can't revert as initial commit"
1243
1244
msgid "Can't cherry-pick into empty head"
1248
1249
"Git normally never creates a ref that ends with 40 hex characters\n"
1249
1250
"because it will be ignored when you just specify 40-hex. These refs\n"
1504
1505
msgid "bug: unhandled diff status %c"
1508
1509
msgid "Submodules changed but not updated:"
1512
1513
msgid "Submodule changes to be committed:"
1517
1518
"Do not touch the line above.\n"
1518
1519
"Everything below will be removed."
1522
1523
msgid "You have unmerged paths."
1526
1527
msgid " (fix conflicts and run \"git commit\")"
1530
1531
msgid "All conflicts fixed but you are still merging."
1534
1535
msgid " (use \"git commit\" to conclude merge)"
1538
1539
msgid "You are in the middle of an am session."
1542
1543
msgid "The current patch is empty."
1546
1547
msgid " (fix conflicts and then run \"git am --continue\")"
1550
1551
msgid " (use \"git am --skip\" to skip this patch)"
1554
1555
msgid " (use \"git am --abort\" to restore the original branch)"
1557
#: wt-status.c:1026 wt-status.c:1043
1558
#: wt-status.c:1039 wt-status.c:1056
1559
1560
msgid "You are currently rebasing branch '%s' on '%s'."
1562
#: wt-status.c:1031 wt-status.c:1048
1563
#: wt-status.c:1044 wt-status.c:1061
1563
1564
msgid "You are currently rebasing."
1567
1568
msgid " (fix conflicts and then run \"git rebase --continue\")"
1571
1572
msgid " (use \"git rebase --skip\" to skip this patch)"
1575
1576
msgid " (use \"git rebase --abort\" to check out the original branch)"
1579
1580
msgid " (all conflicts fixed: run \"git rebase --continue\")"
1585
1586
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
1589
1590
msgid "You are currently splitting a commit during a rebase."
1594
1595
" (Once your working directory is clean, run \"git rebase --continue\")"
1600
1601
"You are currently editing a commit while rebasing branch '%s' on '%s'."
1604
1605
msgid "You are currently editing a commit during a rebase."
1608
1609
msgid " (use \"git commit --amend\" to amend the current commit)"
1613
1614
" (use \"git rebase --continue\" once you are satisfied with your changes)"
1618
1619
msgid "You are currently cherry-picking commit %s."
1622
1623
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
1626
1627
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
1631
1632
" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
1636
1637
msgid "You are currently reverting commit %s."
1640
1641
msgid " (fix conflicts and run \"git revert --continue\")"
1644
1645
msgid " (all conflicts fixed: run \"git revert --continue\")"
1648
1649
msgid " (use \"git revert --abort\" to cancel the revert operation)"
1653
1654
msgid "You are currently bisecting, started from branch '%s'."
1657
1658
msgid "You are currently bisecting."
1661
1662
msgid " (use \"git bisect reset\" to get back to the original branch)"
1665
1666
msgid "On branch "
1669
1670
msgid "rebase in progress; onto "
1673
1674
msgid "HEAD detached at "
1677
1678
msgid "HEAD detached from "
1681
1682
msgid "Not currently on any branch."
1685
1686
msgid "Initial commit"
1689
1690
msgid "Untracked files"
1693
1694
msgid "Ignored files"
1699
1700
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1836
1837
"Run 'git status' to check the paths you removed from your working tree.\n"
1841
1842
msgid "unexpected diff status %c"
1844
#: builtin/add.c:69 builtin/commit.c:261
1845
#: builtin/add.c:70 builtin/commit.c:277
1845
1846
msgid "updating files failed"
1850
1851
msgid "remove '%s'\n"
1853
#: builtin/add.c:133
1854
#: builtin/add.c:134
1854
1855
msgid "Unstaged changes after refreshing the index:"
1857
#: builtin/add.c:193 builtin/rev-parse.c:781
1858
#: builtin/add.c:194 builtin/rev-parse.c:796
1858
1859
msgid "Could not read the index"
1861
#: builtin/add.c:204
1862
#: builtin/add.c:205
1863
1864
msgid "Could not open '%s' for writing."
1866
#: builtin/add.c:208
1867
#: builtin/add.c:209
1867
1868
msgid "Could not write patch"
1870
#: builtin/add.c:213
1871
#: builtin/add.c:215
1872
1873
msgid "Could not stat '%s'"
1875
#: builtin/add.c:215
1876
#: builtin/add.c:217
1876
1877
msgid "Empty patch. Aborted."
1879
#: builtin/add.c:221
1880
#: builtin/add.c:222
1881
1882
msgid "Could not apply '%s'"
1884
#: builtin/add.c:231
1885
#: builtin/add.c:232
1885
1886
msgid "The following paths are ignored by one of your .gitignore files:\n"
1888
#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:70
1889
#: builtin/prune-packed.c:77 builtin/push.c:488 builtin/remote.c:1367
1889
#: builtin/add.c:249 builtin/clean.c:874 builtin/fetch.c:107 builtin/mv.c:110
1890
#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1369
1891
1892
msgid "dry run"
1894
#: builtin/add.c:249 builtin/apply.c:4411 builtin/check-ignore.c:19
1895
#: builtin/commit.c:1328 builtin/count-objects.c:95 builtin/fsck.c:606
1896
#: builtin/log.c:1613 builtin/mv.c:69 builtin/read-tree.c:113
1895
#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19
1896
#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:616
1897
#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114
1897
1898
msgid "be verbose"
1900
#: builtin/add.c:251
1901
#: builtin/add.c:252
1901
1902
msgid "interactive picking"
1904
#: builtin/add.c:252 builtin/checkout.c:1102 builtin/reset.c:285
1905
#: builtin/add.c:253 builtin/checkout.c:1221 builtin/reset.c:286
1905
1906
msgid "select hunks interactively"
1908
#: builtin/add.c:253
1909
#: builtin/add.c:254
1909
1910
msgid "edit current diff and apply"
1912
#: builtin/add.c:254
1913
#: builtin/add.c:255
1913
1914
msgid "allow adding otherwise ignored files"
1916
#: builtin/add.c:255
1917
#: builtin/add.c:256
1917
1918
msgid "update tracked files"
1920
#: builtin/add.c:256
1921
#: builtin/add.c:257
1921
1922
msgid "record only the fact that the path will be added later"
1924
#: builtin/add.c:257
1925
#: builtin/add.c:258
1925
1926
msgid "add changes from all tracked and untracked files"
1928
#: builtin/add.c:260
1929
#: builtin/add.c:261
1929
1930
msgid "ignore paths removed in the working tree (same as --no-all)"
1932
#: builtin/add.c:262
1933
#: builtin/add.c:263
1933
1934
msgid "don't add, only refresh the index"
1936
#: builtin/add.c:263
1937
#: builtin/add.c:264
1937
1938
msgid "just skip files which cannot be added because of errors"
1940
#: builtin/add.c:264
1941
#: builtin/add.c:265
1941
1942
msgid "check if - even missing - files are ignored in dry run"
1944
#: builtin/add.c:286
1945
#: builtin/add.c:287
1946
1947
msgid "Use -f if you really want to add them.\n"
2054
#: builtin/apply.c:1656
2055
#: builtin/apply.c:1659
2055
2056
msgid "new file depends on old contents"
2058
#: builtin/apply.c:1658
2059
#: builtin/apply.c:1661
2059
2060
msgid "deleted file still has contents"
2062
#: builtin/apply.c:1684
2063
#: builtin/apply.c:1687
2064
2065
msgid "corrupt patch at line %d"
2067
#: builtin/apply.c:1720
2068
#: builtin/apply.c:1723
2069
2070
msgid "new file %s depends on old contents"
2072
#: builtin/apply.c:1722
2073
#: builtin/apply.c:1725
2074
2075
msgid "deleted file %s still has contents"
2077
#: builtin/apply.c:1725
2078
#: builtin/apply.c:1728
2079
2080
msgid "** warning: file %s becomes empty but is not deleted"
2082
#: builtin/apply.c:1871
2083
#: builtin/apply.c:1874
2084
2085
msgid "corrupt binary patch at line %d: %.*s"
2087
#: builtin/apply.c:1900
2088
#: builtin/apply.c:1903
2089
2090
msgid "unrecognized binary patch at line %d"
2092
#: builtin/apply.c:1986
2093
#: builtin/apply.c:2054
2094
2095
msgid "patch with only garbage at line %d"
2097
#: builtin/apply.c:2076
2098
#: builtin/apply.c:2144
2099
2100
msgid "unable to read symlink %s"
2102
#: builtin/apply.c:2080
2103
#: builtin/apply.c:2148
2104
2105
msgid "unable to open or read %s"
2107
#: builtin/apply.c:2688
2108
#: builtin/apply.c:2781
2109
2110
msgid "invalid start of line: '%c'"
2112
#: builtin/apply.c:2806
2113
#: builtin/apply.c:2900
2114
2115
msgid "Hunk #%d succeeded at %d (offset %d line)."
2115
2116
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
2119
#: builtin/apply.c:2818
2120
#: builtin/apply.c:2912
2121
2122
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
2124
#: builtin/apply.c:2824
2125
#: builtin/apply.c:2918
2127
2128
"while searching for:\n"
2131
#: builtin/apply.c:2843
2132
#: builtin/apply.c:2938
2133
2134
msgid "missing binary patch data for '%s'"
2136
#: builtin/apply.c:2944
2137
#: builtin/apply.c:3039
2138
2139
msgid "binary patch does not apply to '%s'"
2141
#: builtin/apply.c:2950
2142
#: builtin/apply.c:3045
2143
2144
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
2146
#: builtin/apply.c:2971
2147
#: builtin/apply.c:3066
2148
2149
msgid "patch failed: %s:%ld"
2151
#: builtin/apply.c:3095
2152
#: builtin/apply.c:3190
2153
2154
msgid "cannot checkout %s"
2156
#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194
2157
#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291
2158
2159
msgid "read of %s failed"
2161
#: builtin/apply.c:3174 builtin/apply.c:3396
2162
#: builtin/apply.c:3271 builtin/apply.c:3493
2163
2164
msgid "path %s has been renamed/deleted"
2166
#: builtin/apply.c:3255 builtin/apply.c:3410
2167
#: builtin/apply.c:3352 builtin/apply.c:3507
2168
2169
msgid "%s: does not exist in index"
2171
#: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424
2172
#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521
2176
#: builtin/apply.c:3264 builtin/apply.c:3418
2177
#: builtin/apply.c:3361 builtin/apply.c:3515
2178
2179
msgid "%s: does not match index"
2181
#: builtin/apply.c:3366
2182
#: builtin/apply.c:3463
2182
2183
msgid "removal patch leaves file contents"
2185
#: builtin/apply.c:3435
2186
#: builtin/apply.c:3532
2187
2188
msgid "%s: wrong type"
2190
#: builtin/apply.c:3437
2191
#: builtin/apply.c:3534
2192
2193
msgid "%s has type %o, expected %o"
2195
#: builtin/apply.c:3538
2196
#: builtin/apply.c:3750
2197
2198
msgid "%s: already exists in index"
2200
#: builtin/apply.c:3541
2201
#: builtin/apply.c:3753
2202
2203
msgid "%s: already exists in working directory"
2205
#: builtin/apply.c:3561
2206
#: builtin/apply.c:3773
2207
2208
msgid "new mode (%o) of %s does not match old mode (%o)"
2210
#: builtin/apply.c:3566
2211
#: builtin/apply.c:3778
2212
2213
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2215
#: builtin/apply.c:3574
2216
#: builtin/apply.c:3802
2217
2218
msgid "%s: patch does not apply"
2220
#: builtin/apply.c:3587
2221
#: builtin/apply.c:3816
2222
2223
msgid "Checking patch %s..."
2225
#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:134
2226
#: builtin/apply.c:3909 builtin/checkout.c:233 builtin/reset.c:135
2227
2228
msgid "make_cache_entry failed for path '%s'"
2230
#: builtin/apply.c:3823
2231
#: builtin/apply.c:4052
2232
2233
msgid "unable to remove %s from index"
2235
#: builtin/apply.c:3852
2236
#: builtin/apply.c:4081
2237
2238
msgid "corrupt patch for submodule %s"
2240
#: builtin/apply.c:3856
2241
#: builtin/apply.c:4085
2242
2243
msgid "unable to stat newly created file '%s'"
2245
#: builtin/apply.c:3861
2246
#: builtin/apply.c:4090
2247
2248
msgid "unable to create backing store for newly created file %s"
2250
#: builtin/apply.c:3864 builtin/apply.c:3972
2251
#: builtin/apply.c:4093 builtin/apply.c:4201
2252
2253
msgid "unable to add cache entry for %s"
2255
#: builtin/apply.c:3897
2256
#: builtin/apply.c:4126
2257
2258
msgid "closing file '%s'"
2260
#: builtin/apply.c:3946
2261
#: builtin/apply.c:4175
2262
2263
msgid "unable to write file '%s' mode %o"
2265
#: builtin/apply.c:4033
2266
#: builtin/apply.c:4262
2267
2268
msgid "Applied patch %s cleanly."
2270
#: builtin/apply.c:4041
2271
#: builtin/apply.c:4270
2271
2272
msgid "internal error"
2274
#: builtin/apply.c:4044
2275
#: builtin/apply.c:4273
2276
2277
msgid "Applying patch %%s with %d reject..."
2277
2278
msgid_plural "Applying patch %%s with %d rejects..."
2281
#: builtin/apply.c:4054
2282
#: builtin/apply.c:4283
2283
2284
msgid "truncating .rej filename to %.*s.rej"
2286
#: builtin/apply.c:4075
2287
#: builtin/apply.c:4304
2288
2289
msgid "Hunk #%d applied cleanly."
2291
#: builtin/apply.c:4078
2292
#: builtin/apply.c:4307
2293
2294
msgid "Rejected hunk #%d."
2296
#: builtin/apply.c:4228
2297
#: builtin/apply.c:4397
2297
2298
msgid "unrecognized input"
2300
#: builtin/apply.c:4239
2301
#: builtin/apply.c:4408
2301
2302
msgid "unable to read index file"
2304
#: builtin/apply.c:4358 builtin/apply.c:4361 builtin/clone.c:90
2305
#: builtin/fetch.c:93
2305
#: builtin/apply.c:4525 builtin/apply.c:4528 builtin/clone.c:85
2306
#: builtin/fetch.c:92
2309
#: builtin/apply.c:4359
2310
#: builtin/apply.c:4526
2310
2311
msgid "don't apply changes matching the given path"
2313
#: builtin/apply.c:4362
2314
#: builtin/apply.c:4529
2314
2315
msgid "apply changes matching the given path"
2317
#: builtin/apply.c:4364
2318
#: builtin/apply.c:4531
2321
#: builtin/apply.c:4365
2322
#: builtin/apply.c:4532
2322
2323
msgid "remove <num> leading slashes from traditional diff paths"
2325
#: builtin/apply.c:4368
2326
#: builtin/apply.c:4535
2326
2327
msgid "ignore additions made by the patch"
2329
#: builtin/apply.c:4370
2330
#: builtin/apply.c:4537
2330
2331
msgid "instead of applying the patch, output diffstat for the input"
2333
#: builtin/apply.c:4374
2334
#: builtin/apply.c:4541
2334
2335
msgid "show number of added and deleted lines in decimal notation"
2337
#: builtin/apply.c:4376
2338
#: builtin/apply.c:4543
2338
2339
msgid "instead of applying the patch, output a summary for the input"
2341
#: builtin/apply.c:4378
2342
#: builtin/apply.c:4545
2342
2343
msgid "instead of applying the patch, see if the patch is applicable"
2345
#: builtin/apply.c:4380
2346
#: builtin/apply.c:4547
2346
2347
msgid "make sure the patch is applicable to the current index"
2349
#: builtin/apply.c:4382
2350
#: builtin/apply.c:4549
2350
2351
msgid "apply a patch without touching the working tree"
2353
#: builtin/apply.c:4384
2354
#: builtin/apply.c:4553
2354
2355
msgid "also apply the patch (use with --stat/--summary/--check)"
2357
#: builtin/apply.c:4386
2358
#: builtin/apply.c:4555
2358
2359
msgid "attempt three-way merge if a patch does not apply"
2361
#: builtin/apply.c:4388
2362
#: builtin/apply.c:4557
2362
2363
msgid "build a temporary index based on embedded index information"
2365
#: builtin/apply.c:4390 builtin/checkout-index.c:198 builtin/ls-files.c:455
2366
#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412
2366
2367
msgid "paths are separated with NUL character"
2369
#: builtin/apply.c:4393
2370
#: builtin/apply.c:4562
2370
2371
msgid "ensure at least <n> lines of context match"
2373
#: builtin/apply.c:4394
2374
#: builtin/apply.c:4563
2377
#: builtin/apply.c:4395
2378
#: builtin/apply.c:4564
2378
2379
msgid "detect new or modified lines that have whitespace errors"
2381
#: builtin/apply.c:4398 builtin/apply.c:4401
2382
#: builtin/apply.c:4567 builtin/apply.c:4570
2382
2383
msgid "ignore changes in whitespace when finding context"
2385
#: builtin/apply.c:4404
2386
#: builtin/apply.c:4573
2386
2387
msgid "apply the patch in reverse"
2389
#: builtin/apply.c:4406
2390
#: builtin/apply.c:4575
2390
2391
msgid "don't expect at least one line of context"
2393
#: builtin/apply.c:4408
2394
#: builtin/apply.c:4577
2394
2395
msgid "leave the rejected hunks in corresponding *.rej files"
2397
#: builtin/apply.c:4410
2398
#: builtin/apply.c:4579
2398
2399
msgid "allow overlapping hunks"
2401
#: builtin/apply.c:4413
2402
#: builtin/apply.c:4582
2402
2403
msgid "tolerate incorrectly detected missing new-line at the end of file"
2405
#: builtin/apply.c:4416
2406
#: builtin/apply.c:4585
2406
2407
msgid "do not trust the line counts in the hunk headers"
2409
#: builtin/apply.c:4418
2410
#: builtin/apply.c:4587
2413
#: builtin/apply.c:4419
2414
#: builtin/apply.c:4588
2414
2415
msgid "prepend <root> to all filenames"
2417
#: builtin/apply.c:4441
2418
#: builtin/apply.c:4610
2418
2419
msgid "--3way outside a repository"
2421
#: builtin/apply.c:4449
2422
#: builtin/apply.c:4618
2422
2423
msgid "--index outside a repository"
2425
#: builtin/apply.c:4452
2426
#: builtin/apply.c:4621
2426
2427
msgid "--cached outside a repository"
2429
#: builtin/apply.c:4468
2430
#: builtin/apply.c:4640
2431
2432
msgid "can't open patch '%s'"
2434
#: builtin/apply.c:4482
2435
#: builtin/apply.c:4654
2436
2437
msgid "squelched %d whitespace error"
2437
2438
msgid_plural "squelched %d whitespace errors"
2441
#: builtin/apply.c:4488 builtin/apply.c:4498
2442
#: builtin/apply.c:4660 builtin/apply.c:4670
2443
2444
msgid "%d line adds whitespace errors."
2444
2445
msgid_plural "%d lines add whitespace errors."
2500
2501
msgid "[rev-opts] are documented in git-rev-list(1)"
2504
#: builtin/blame.c:2500
2505
msgid "Show blame entries as we find them, incrementally"
2503
2508
#: builtin/blame.c:2501
2504
msgid "Show blame entries as we find them, incrementally"
2509
msgid "Show blank SHA-1 for boundary commits (Default: off)"
2507
2512
#: builtin/blame.c:2502
2508
msgid "Show blank SHA-1 for boundary commits (Default: off)"
2513
msgid "Do not treat root commits as boundaries (Default: off)"
2511
2516
#: builtin/blame.c:2503
2512
msgid "Do not treat root commits as boundaries (Default: off)"
2517
msgid "Show work cost statistics"
2515
2520
#: builtin/blame.c:2504
2516
msgid "Show work cost statistics"
2521
msgid "Show output score for blame entries"
2519
2524
#: builtin/blame.c:2505
2520
msgid "Show output score for blame entries"
2525
msgid "Show original filename (Default: auto)"
2523
2528
#: builtin/blame.c:2506
2524
msgid "Show original filename (Default: auto)"
2529
msgid "Show original linenumber (Default: off)"
2527
2532
#: builtin/blame.c:2507
2528
msgid "Show original linenumber (Default: off)"
2533
msgid "Show in a format designed for machine consumption"
2531
2536
#: builtin/blame.c:2508
2532
msgid "Show in a format designed for machine consumption"
2537
msgid "Show porcelain format with per-line commit information"
2535
2540
#: builtin/blame.c:2509
2536
msgid "Show porcelain format with per-line commit information"
2541
msgid "Use the same output mode as git-annotate (Default: off)"
2539
2544
#: builtin/blame.c:2510
2540
msgid "Use the same output mode as git-annotate (Default: off)"
2545
msgid "Show raw timestamp (Default: off)"
2543
2548
#: builtin/blame.c:2511
2544
msgid "Show raw timestamp (Default: off)"
2549
msgid "Show long commit SHA1 (Default: off)"
2547
2552
#: builtin/blame.c:2512
2548
msgid "Show long commit SHA1 (Default: off)"
2553
msgid "Suppress author name and timestamp (Default: off)"
2551
2556
#: builtin/blame.c:2513
2552
msgid "Suppress author name and timestamp (Default: off)"
2557
msgid "Show author email instead of name (Default: off)"
2555
2560
#: builtin/blame.c:2514
2556
msgid "Show author email instead of name (Default: off)"
2561
msgid "Ignore whitespace differences"
2559
2564
#: builtin/blame.c:2515
2560
msgid "Ignore whitespace differences"
2565
msgid "Spend extra cycles to find better match"
2563
2568
#: builtin/blame.c:2516
2564
msgid "Spend extra cycles to find better match"
2569
msgid "Use revisions from <file> instead of calling git-rev-list"
2567
2572
#: builtin/blame.c:2517
2568
msgid "Use revisions from <file> instead of calling git-rev-list"
2571
#: builtin/blame.c:2518
2572
2573
msgid "Use <file>'s contents as the final image"
2575
#: builtin/blame.c:2519 builtin/blame.c:2520
2576
#: builtin/blame.c:2518 builtin/blame.c:2519
2580
#: builtin/blame.c:2518
2581
msgid "Find line copies within and across files"
2579
2584
#: builtin/blame.c:2519
2580
msgid "Find line copies within and across files"
2583
#: builtin/blame.c:2520
2584
2585
msgid "Find line movements within and across files"
2587
#: builtin/blame.c:2521
2588
#: builtin/blame.c:2520
2591
#: builtin/blame.c:2521
2592
#: builtin/blame.c:2520
2592
2593
msgid "Process only line range n,m, counting from 1"
2745
2746
msgid "(detached from %s)"
2748
#: builtin/branch.c:603
2749
#: builtin/branch.c:595
2749
2750
msgid "(no branch)"
2752
#: builtin/branch.c:649
2753
#: builtin/branch.c:642
2754
2755
msgid "object '%s' does not point to a commit"
2757
#: builtin/branch.c:681
2758
#: builtin/branch.c:690
2758
2759
msgid "some refs could not be read"
2761
#: builtin/branch.c:694
2762
#: builtin/branch.c:703
2762
2763
msgid "cannot rename the current branch while not on any."
2765
#: builtin/branch.c:704
2766
#: builtin/branch.c:713
2767
2768
msgid "Invalid branch name: '%s'"
2770
#: builtin/branch.c:719
2771
#: builtin/branch.c:728
2771
2772
msgid "Branch rename failed"
2774
#: builtin/branch.c:723
2775
#: builtin/branch.c:732
2776
2777
msgid "Renamed a misnamed branch '%s' away"
2779
#: builtin/branch.c:727
2780
#: builtin/branch.c:736
2781
2782
msgid "Branch renamed to %s, but HEAD is not updated!"
2784
#: builtin/branch.c:734
2785
#: builtin/branch.c:743
2785
2786
msgid "Branch is renamed, but update of config-file failed"
2788
#: builtin/branch.c:749
2789
#: builtin/branch.c:758
2790
2791
msgid "malformed object name %s"
2793
#: builtin/branch.c:773
2794
#: builtin/branch.c:780
2795
2796
msgid "could not write branch description template: %s"
2798
#: builtin/branch.c:803
2799
#: builtin/branch.c:810
2799
2800
msgid "Generic options"
2802
#: builtin/branch.c:805
2803
#: builtin/branch.c:812
2803
2804
msgid "show hash and subject, give twice for upstream branch"
2806
#: builtin/branch.c:806
2807
#: builtin/branch.c:813
2807
2808
msgid "suppress informational messages"
2810
#: builtin/branch.c:807
2811
#: builtin/branch.c:814
2811
2812
msgid "set up tracking mode (see git-pull(1))"
2814
#: builtin/branch.c:809
2815
#: builtin/branch.c:816
2815
2816
msgid "change upstream info"
2818
#: builtin/branch.c:813
2819
#: builtin/branch.c:820
2819
2820
msgid "use colored output"
2822
#: builtin/branch.c:814
2823
#: builtin/branch.c:821
2823
2824
msgid "act on remote-tracking branches"
2826
#: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844
2827
#: builtin/branch.c:850 builtin/commit.c:1573 builtin/commit.c:1574
2828
#: builtin/commit.c:1575 builtin/commit.c:1576 builtin/tag.c:615
2829
#: builtin/tag.c:621
2827
#: builtin/branch.c:824 builtin/branch.c:830 builtin/branch.c:851
2828
#: builtin/branch.c:857 builtin/commit.c:1581 builtin/commit.c:1582
2829
#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/tag.c:616
2830
#: builtin/tag.c:622
2833
#: builtin/branch.c:818 builtin/branch.c:824
2834
#: builtin/branch.c:825 builtin/branch.c:831
2834
2835
msgid "print only branches that contain the commit"
2837
#: builtin/branch.c:830
2838
#: builtin/branch.c:837
2838
2839
msgid "Specific git-branch actions:"
2841
#: builtin/branch.c:831
2842
#: builtin/branch.c:838
2842
2843
msgid "list both remote-tracking and local branches"
2845
#: builtin/branch.c:833
2846
#: builtin/branch.c:840
2846
2847
msgid "delete fully merged branch"
2849
#: builtin/branch.c:834
2850
#: builtin/branch.c:841
2850
2851
msgid "delete branch (even if not merged)"
2853
#: builtin/branch.c:835
2854
#: builtin/branch.c:842
2854
2855
msgid "move/rename a branch and its reflog"
2857
#: builtin/branch.c:836
2858
#: builtin/branch.c:843
2858
2859
msgid "move/rename a branch, even if target exists"
2861
#: builtin/branch.c:837
2862
#: builtin/branch.c:844
2862
2863
msgid "list branch names"
2865
#: builtin/branch.c:838
2866
#: builtin/branch.c:845
2866
2867
msgid "create the branch's reflog"
2869
#: builtin/branch.c:840
2870
#: builtin/branch.c:847
2870
2871
msgid "edit the description for the branch"
3174
3175
msgid "git checkout [options] [<branch>] -- <file>..."
3177
#: builtin/checkout.c:114 builtin/checkout.c:147
3178
#: builtin/checkout.c:134 builtin/checkout.c:167
3179
3180
msgid "path '%s' does not have our version"
3182
#: builtin/checkout.c:116 builtin/checkout.c:149
3183
#: builtin/checkout.c:136 builtin/checkout.c:169
3184
3185
msgid "path '%s' does not have their version"
3187
#: builtin/checkout.c:132
3188
#: builtin/checkout.c:152
3189
3190
msgid "path '%s' does not have all necessary versions"
3192
#: builtin/checkout.c:176
3193
#: builtin/checkout.c:196
3194
3195
msgid "path '%s' does not have necessary versions"
3197
#: builtin/checkout.c:193
3198
#: builtin/checkout.c:213
3199
3200
msgid "path '%s': cannot merge"
3202
#: builtin/checkout.c:210
3203
#: builtin/checkout.c:230
3204
3205
msgid "Unable to add merge result for '%s'"
3207
#: builtin/checkout.c:231 builtin/checkout.c:234 builtin/checkout.c:237
3208
#: builtin/checkout.c:240
3208
#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
3209
#: builtin/checkout.c:260
3210
3211
msgid "'%s' cannot be used with updating paths"
3213
#: builtin/checkout.c:243 builtin/checkout.c:246
3214
#: builtin/checkout.c:263 builtin/checkout.c:266
3215
3216
msgid "'%s' cannot be used with %s"
3218
#: builtin/checkout.c:249
3219
#: builtin/checkout.c:269
3220
3221
msgid "Cannot update paths and switch to branch '%s' at the same time."
3223
#: builtin/checkout.c:260 builtin/checkout.c:449
3224
#: builtin/checkout.c:280 builtin/checkout.c:474
3224
3225
msgid "corrupt index file"
3227
#: builtin/checkout.c:320 builtin/checkout.c:327
3228
#: builtin/checkout.c:340 builtin/checkout.c:347
3229
3230
msgid "path '%s' is unmerged"
3232
#: builtin/checkout.c:471
3233
#: builtin/checkout.c:496
3233
3234
msgid "you need to resolve your current index first"
3236
#: builtin/checkout.c:591
3237
#: builtin/checkout.c:627
3238
3239
msgid "Can not do reflog for '%s'\n"
3241
#: builtin/checkout.c:629
3242
#: builtin/checkout.c:663
3242
3243
msgid "HEAD is now at"
3245
#: builtin/checkout.c:636
3246
#: builtin/checkout.c:670
3247
3248
msgid "Reset branch '%s'\n"
3250
#: builtin/checkout.c:639
3251
#: builtin/checkout.c:673
3252
3253
msgid "Already on '%s'\n"
3255
#: builtin/checkout.c:643
3256
#: builtin/checkout.c:677
3257
3258
msgid "Switched to and reset branch '%s'\n"
3260
#: builtin/checkout.c:645 builtin/checkout.c:1026
3261
#: builtin/checkout.c:679 builtin/checkout.c:1134
3262
3263
msgid "Switched to a new branch '%s'\n"
3265
#: builtin/checkout.c:647
3266
#: builtin/checkout.c:681
3267
3268
msgid "Switched to branch '%s'\n"
3270
#: builtin/checkout.c:699
3271
#: builtin/checkout.c:733
3272
3273
msgid " ... and %d more.\n"
3275
#: builtin/checkout.c:705
3276
#: builtin/checkout.c:739
3278
3279
"Warning: you are leaving %d commit behind, not connected to\n"
3300
#: builtin/checkout.c:753
3301
#: builtin/checkout.c:794
3301
3302
msgid "internal error in revision walk"
3304
#: builtin/checkout.c:757
3305
#: builtin/checkout.c:798
3305
3306
msgid "Previous HEAD position was"
3308
#: builtin/checkout.c:784 builtin/checkout.c:1021
3309
#: builtin/checkout.c:825 builtin/checkout.c:1129
3309
3310
msgid "You are on a branch yet to be born"
3312
#: builtin/checkout.c:928
3313
#: builtin/checkout.c:1036
3314
3315
msgid "only one reference expected, %d given."
3317
#: builtin/checkout.c:967
3318
#: builtin/checkout.c:1075
3319
3320
msgid "invalid reference: %s"
3322
#: builtin/checkout.c:996
3323
#: builtin/checkout.c:1104
3324
3325
msgid "reference is not a tree: %s"
3327
#: builtin/checkout.c:1035
3328
#: builtin/checkout.c:1143
3328
3329
msgid "paths cannot be used with switching branches"
3331
#: builtin/checkout.c:1038 builtin/checkout.c:1042
3332
#: builtin/checkout.c:1146 builtin/checkout.c:1150
3333
3334
msgid "'%s' cannot be used with switching branches"
3336
#: builtin/checkout.c:1046 builtin/checkout.c:1049 builtin/checkout.c:1054
3337
#: builtin/checkout.c:1057
3337
#: builtin/checkout.c:1154 builtin/checkout.c:1157 builtin/checkout.c:1162
3338
#: builtin/checkout.c:1165
3339
3340
msgid "'%s' cannot be used with '%s'"
3342
#: builtin/checkout.c:1062
3343
#: builtin/checkout.c:1170
3344
3345
msgid "Cannot switch branch to a non-commit '%s'"
3347
#: builtin/checkout.c:1084 builtin/checkout.c:1086 builtin/clone.c:88
3348
#: builtin/remote.c:159 builtin/remote.c:161
3348
#: builtin/checkout.c:1203 builtin/checkout.c:1205 builtin/clone.c:83
3349
#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:282
3350
#: builtin/worktree.c:284
3352
#: builtin/checkout.c:1085
3354
#: builtin/checkout.c:1204
3353
3355
msgid "create and checkout a new branch"
3356
#: builtin/checkout.c:1087
3358
#: builtin/checkout.c:1206
3357
3359
msgid "create/reset and checkout a branch"
3360
#: builtin/checkout.c:1088
3362
#: builtin/checkout.c:1207
3361
3363
msgid "create reflog for new branch"
3364
#: builtin/checkout.c:1089
3366
#: builtin/checkout.c:1208
3365
3367
msgid "detach the HEAD at named commit"
3368
#: builtin/checkout.c:1090
3370
#: builtin/checkout.c:1209
3369
3371
msgid "set upstream info for new branch"
3607
3609
msgid "git clone [options] [--] <repo> [<dir>]"
3610
#: builtin/clone.c:64 builtin/fetch.c:112 builtin/merge.c:222
3611
#: builtin/push.c:503
3612
#: builtin/clone.c:57 builtin/fetch.c:111 builtin/merge.c:224
3613
#: builtin/push.c:523
3612
3614
msgid "force progress reporting"
3615
#: builtin/clone.c:66
3617
#: builtin/clone.c:59
3616
3618
msgid "don't create a checkout"
3619
#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:486
3621
#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:503
3620
3622
msgid "create a bare repository"
3623
#: builtin/clone.c:71
3625
#: builtin/clone.c:64
3624
3626
msgid "create a mirror repository (implies bare)"
3627
#: builtin/clone.c:73
3629
#: builtin/clone.c:66
3628
3630
msgid "to clone from a local repository"
3631
#: builtin/clone.c:75
3633
#: builtin/clone.c:68
3632
3634
msgid "don't use local hardlinks, always copy"
3635
#: builtin/clone.c:77
3637
#: builtin/clone.c:70
3636
3638
msgid "setup as shared repository"
3639
#: builtin/clone.c:79 builtin/clone.c:81
3641
#: builtin/clone.c:72 builtin/clone.c:74
3640
3642
msgid "initialize submodules in the clone"
3643
#: builtin/clone.c:82 builtin/init-db.c:483
3645
#: builtin/clone.c:75 builtin/init-db.c:500
3644
3646
msgid "template-directory"
3647
#: builtin/clone.c:83 builtin/init-db.c:484
3649
#: builtin/clone.c:76 builtin/init-db.c:501
3648
3650
msgid "directory from which templates will be used"
3651
#: builtin/clone.c:85
3653
#: builtin/clone.c:78
3652
3654
msgid "reference repository"
3655
#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
3657
#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44
3659
#: builtin/clone.c:87
3661
#: builtin/clone.c:82
3660
3662
msgid "use <name> instead of 'origin' to track upstream"
3663
#: builtin/clone.c:89
3665
#: builtin/clone.c:84
3664
3666
msgid "checkout <branch> instead of the remote's HEAD"
3667
#: builtin/clone.c:91
3669
#: builtin/clone.c:86
3668
3670
msgid "path to git-upload-pack on the remote"
3671
#: builtin/clone.c:92 builtin/fetch.c:113 builtin/grep.c:659
3673
#: builtin/clone.c:87 builtin/fetch.c:112 builtin/grep.c:659
3675
#: builtin/clone.c:93
3677
#: builtin/clone.c:88
3676
3678
msgid "create a shallow clone of that depth"
3679
#: builtin/clone.c:95
3681
#: builtin/clone.c:90
3680
3682
msgid "clone only one branch, HEAD or --branch"
3683
#: builtin/clone.c:96 builtin/init-db.c:492
3685
#: builtin/clone.c:91 builtin/init-db.c:509
3687
#: builtin/clone.c:97 builtin/init-db.c:493
3689
#: builtin/clone.c:92 builtin/init-db.c:510
3688
3690
msgid "separate git dir from working tree"
3691
#: builtin/clone.c:98
3693
#: builtin/clone.c:93
3692
3694
msgid "key=value"
3695
#: builtin/clone.c:99
3697
#: builtin/clone.c:94
3696
3698
msgid "set config inside the new repository"
3699
#: builtin/clone.c:252
3701
#: builtin/clone.c:240
3701
3703
msgid "reference repository '%s' is not a local repository."
3704
#: builtin/clone.c:256
3706
#: builtin/clone.c:244
3706
3708
msgid "reference repository '%s' is shallow"
3709
#: builtin/clone.c:259
3711
#: builtin/clone.c:247
3711
3713
msgid "reference repository '%s' is grafted"
3714
#: builtin/clone.c:321
3716
#: builtin/clone.c:310
3716
3718
msgid "failed to create directory '%s'"
3719
#: builtin/clone.c:323 builtin/diff.c:83
3721
#: builtin/clone.c:312 builtin/diff.c:84
3721
3723
msgid "failed to stat '%s'"
3724
#: builtin/clone.c:325
3726
#: builtin/clone.c:314
3726
3728
msgid "%s exists and is not a directory"
3729
#: builtin/clone.c:339
3731
#: builtin/clone.c:328
3731
3733
msgid "failed to stat %s\n"
3734
#: builtin/clone.c:361
3736
#: builtin/clone.c:350
3736
3738
msgid "failed to create link '%s'"
3739
#: builtin/clone.c:365
3741
#: builtin/clone.c:354
3741
3743
msgid "failed to copy file to '%s'"
3744
#: builtin/clone.c:388 builtin/clone.c:565
3746
#: builtin/clone.c:377 builtin/clone.c:551
3746
3748
msgid "done.\n"
3749
#: builtin/clone.c:401
3751
#: builtin/clone.c:389
3751
3753
"Clone succeeded, but checkout failed.\n"
3752
3754
"You can inspect what was checked out with 'git status'\n"
3753
3755
"and retry the checkout with 'git checkout -f HEAD'\n"
3756
#: builtin/clone.c:480
3758
#: builtin/clone.c:466
3758
3760
msgid "Could not find remote branch %s to clone."
3761
#: builtin/clone.c:560
3763
#: builtin/clone.c:546
3763
3765
msgid "Checking connectivity... "
3766
#: builtin/clone.c:563
3768
#: builtin/clone.c:549
3767
3769
msgid "remote did not send all necessary objects"
3770
#: builtin/clone.c:627
3772
#: builtin/clone.c:613
3771
3773
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3774
#: builtin/clone.c:658
3776
#: builtin/clone.c:644
3775
3777
msgid "unable to checkout working tree"
3778
#: builtin/clone.c:768
3780
#: builtin/clone.c:763
3779
3781
msgid "Too many arguments."
3782
#: builtin/clone.c:772
3784
#: builtin/clone.c:767
3783
3785
msgid "You must specify a repository to clone."
3786
#: builtin/clone.c:783
3788
#: builtin/clone.c:778
3788
3790
msgid "--bare and --origin %s options are incompatible."
3791
#: builtin/clone.c:786
3793
#: builtin/clone.c:781
3792
3794
msgid "--bare and --separate-git-dir are incompatible."
3795
#: builtin/clone.c:799
3797
#: builtin/clone.c:794
3797
3799
msgid "repository '%s' does not exist"
3800
#: builtin/clone.c:898
3802
#: builtin/clone.c:900
3801
3803
msgid "--depth is ignored in local clones; use file:// instead."
3804
#: builtin/clone.c:901
3806
#: builtin/clone.c:903
3805
3807
msgid "source repository is shallow, ignoring --local"
3808
#: builtin/clone.c:906
3810
#: builtin/clone.c:908
3809
3811
msgid "--local is ignored"
3812
#: builtin/clone.c:805 builtin/fetch.c:1143
3814
#: builtin/clone.c:800 builtin/fetch.c:1160
3814
3816
msgid "depth %s is not a positive number"
3817
#: builtin/clone.c:815
3819
#: builtin/clone.c:810
3819
3821
msgid "destination path '%s' already exists and is not an empty directory."
3822
#: builtin/clone.c:825
3824
#: builtin/clone.c:820
3824
3826
msgid "working tree '%s' already exists."
3827
#: builtin/clone.c:838 builtin/clone.c:850
3829
#: builtin/clone.c:835 builtin/clone.c:846 builtin/worktree.c:193
3830
#: builtin/worktree.c:220
3829
3832
msgid "could not create leading directories of '%s'"
4148
4151
msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
4151
#: builtin/commit.c:1215 builtin/tag.c:727
4154
#: builtin/commit.c:1209 builtin/tag.c:728
4153
4156
msgid "Invalid cleanup mode %s"
4156
#: builtin/commit.c:1220
4159
#: builtin/commit.c:1214
4157
4160
msgid "Paths with -a does not make sense."
4160
#: builtin/commit.c:1330 builtin/commit.c:1595
4163
#: builtin/commit.c:1324 builtin/commit.c:1603
4161
4164
msgid "show status concisely"
4164
#: builtin/commit.c:1332 builtin/commit.c:1597
4167
#: builtin/commit.c:1326 builtin/commit.c:1605
4165
4168
msgid "show branch information"
4168
#: builtin/commit.c:1334 builtin/commit.c:1599 builtin/push.c:489
4171
#: builtin/commit.c:1328 builtin/commit.c:1607 builtin/push.c:509
4169
4172
msgid "machine-readable output"
4172
#: builtin/commit.c:1337 builtin/commit.c:1601
4175
#: builtin/commit.c:1331 builtin/commit.c:1609
4173
4176
msgid "show status in long format (default)"
4176
#: builtin/commit.c:1340 builtin/commit.c:1604
4179
#: builtin/commit.c:1334 builtin/commit.c:1612
4177
4180
msgid "terminate entries with NUL"
4180
#: builtin/commit.c:1342 builtin/commit.c:1607 builtin/fast-export.c:703
4181
#: builtin/fast-export.c:706 builtin/tag.c:602
4183
#: builtin/commit.c:1336 builtin/commit.c:1615 builtin/fast-export.c:980
4184
#: builtin/fast-export.c:983 builtin/tag.c:603
4185
#: builtin/commit.c:1343 builtin/commit.c:1607
4188
#: builtin/commit.c:1337 builtin/commit.c:1615
4186
4189
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
4189
#: builtin/commit.c:1346
4192
#: builtin/commit.c:1340
4190
4193
msgid "show ignored files"
4193
#: builtin/commit.c:1347 parse-options.h:153
4196
#: builtin/commit.c:1341 parse-options.h:152
4197
#: builtin/commit.c:1348
4200
#: builtin/commit.c:1342
4199
4202
"ignore changes to submodules, optional when: all, dirty, untracked. "
4200
4203
"(Default: all)"
4203
#: builtin/commit.c:1350
4206
#: builtin/commit.c:1344
4204
4207
msgid "list untracked files in columns"
4207
#: builtin/commit.c:1419
4210
#: builtin/commit.c:1430
4208
4211
msgid "couldn't look up newly created commit"
4211
#: builtin/commit.c:1421
4214
#: builtin/commit.c:1432
4212
4215
msgid "could not parse newly created commit"
4215
#: builtin/commit.c:1469
4218
#: builtin/commit.c:1477
4216
4219
msgid "detached HEAD"
4219
#: builtin/commit.c:1471
4222
#: builtin/commit.c:1480
4220
4223
msgid " (root-commit)"
4223
#: builtin/commit.c:1565
4226
#: builtin/commit.c:1573
4224
4227
msgid "suppress summary after successful commit"
4227
#: builtin/commit.c:1566
4230
#: builtin/commit.c:1574
4228
4231
msgid "show diff in commit message template"
4231
#: builtin/commit.c:1568
4234
#: builtin/commit.c:1576
4232
4235
msgid "Commit message options"
4235
#: builtin/commit.c:1569 builtin/tag.c:600
4238
#: builtin/commit.c:1577 builtin/tag.c:601
4236
4239
msgid "read message from file"
4239
#: builtin/commit.c:1570
4242
#: builtin/commit.c:1578
4243
#: builtin/commit.c:1570
4246
#: builtin/commit.c:1578
4244
4247
msgid "override author for commit"
4247
#: builtin/commit.c:1571 builtin/gc.c:286
4250
#: builtin/commit.c:1579 builtin/gc.c:280
4251
#: builtin/commit.c:1571
4254
#: builtin/commit.c:1579
4252
4255
msgid "override date for commit"
4255
#: builtin/commit.c:1572 builtin/merge.c:216 builtin/notes.c:409
4256
#: builtin/notes.c:566 builtin/tag.c:598
4258
#: builtin/commit.c:1580 builtin/merge.c:218 builtin/notes.c:391
4259
#: builtin/notes.c:554 builtin/tag.c:599
4257
4260
msgid "message"
4260
#: builtin/commit.c:1572
4263
#: builtin/commit.c:1580
4261
4264
msgid "commit message"
4264
#: builtin/commit.c:1573
4267
#: builtin/commit.c:1581
4265
4268
msgid "reuse and edit message from specified commit"
4268
#: builtin/commit.c:1574
4271
#: builtin/commit.c:1582
4269
4272
msgid "reuse message from specified commit"
4272
#: builtin/commit.c:1575
4275
#: builtin/commit.c:1583
4273
4276
msgid "use autosquash formatted message to fixup specified commit"
4276
#: builtin/commit.c:1576
4279
#: builtin/commit.c:1584
4277
4280
msgid "use autosquash formatted message to squash specified commit"
4280
#: builtin/commit.c:1577
4283
#: builtin/commit.c:1585
4281
4284
msgid "the commit is authored by me now (used with -C/-c/--amend)"
4284
#: builtin/commit.c:1578 builtin/log.c:1188 builtin/revert.c:86
4287
#: builtin/commit.c:1586 builtin/log.c:1191 builtin/revert.c:86
4285
4288
msgid "add Signed-off-by:"
4288
#: builtin/commit.c:1579
4291
#: builtin/commit.c:1587
4289
4292
msgid "use specified template file"
4292
#: builtin/commit.c:1580
4295
#: builtin/commit.c:1588
4293
4296
msgid "force edit of commit"
4296
#: builtin/commit.c:1581
4299
#: builtin/commit.c:1589
4297
4300
msgid "default"
4300
#: builtin/commit.c:1581 builtin/tag.c:603
4303
#: builtin/commit.c:1589 builtin/tag.c:604
4301
4304
msgid "how to strip spaces and #comments from message"
4304
#: builtin/commit.c:1582
4307
#: builtin/commit.c:1590
4305
4308
msgid "include status in commit message template"
4557
4560
msgid "git describe [options] --dirty"
4560
#: builtin/describe.c:216
4563
#: builtin/describe.c:217
4562
4565
msgid "annotated tag %s not available"
4565
#: builtin/describe.c:220
4568
#: builtin/describe.c:221
4567
4570
msgid "annotated tag %s has no embedded name"
4570
#: builtin/describe.c:222
4573
#: builtin/describe.c:223
4572
4575
msgid "tag '%s' is really '%s' here"
4575
#: builtin/describe.c:249
4578
#: builtin/describe.c:250 builtin/log.c:452
4577
4580
msgid "Not a valid object name %s"
4580
#: builtin/describe.c:252
4583
#: builtin/describe.c:253
4582
4585
msgid "%s is not a valid '%s' object"
4585
#: builtin/describe.c:269
4588
#: builtin/describe.c:270
4587
4590
msgid "no tag exactly matches '%s'"
4590
#: builtin/describe.c:271
4593
#: builtin/describe.c:272
4592
4595
msgid "searching to describe %s\n"
4595
#: builtin/describe.c:318
4598
#: builtin/describe.c:319
4597
4600
msgid "finished search at %s\n"
4600
#: builtin/describe.c:345
4603
#: builtin/describe.c:346
4603
4606
"No annotated tags can describe '%s'.\n"
4604
4607
"However, there were unannotated tags: try --tags."
4607
#: builtin/describe.c:349
4610
#: builtin/describe.c:350
4610
4613
"No tags can describe '%s'.\n"
4611
4614
"Try --always, or create some tags."
4614
#: builtin/describe.c:370
4617
#: builtin/describe.c:371
4616
4619
msgid "traversed %lu commits\n"
4619
#: builtin/describe.c:373
4622
#: builtin/describe.c:374
4622
4625
"more than %i tags found; listed %i most recent\n"
4623
4626
"gave up search at %s\n"
4626
#: builtin/describe.c:395
4629
#: builtin/describe.c:396
4627
4630
msgid "find the tag that comes after the commit"
4630
#: builtin/describe.c:396
4633
#: builtin/describe.c:397
4631
4634
msgid "debug search strategy on stderr"
4634
#: builtin/describe.c:397
4637
#: builtin/describe.c:398
4635
4638
msgid "use any ref"
4638
#: builtin/describe.c:398
4641
#: builtin/describe.c:399
4639
4642
msgid "use any tag, even unannotated"
4642
#: builtin/describe.c:399
4645
#: builtin/describe.c:400
4643
4646
msgid "always use long format"
4646
#: builtin/describe.c:400
4649
#: builtin/describe.c:401
4647
4650
msgid "only follow first parent"
4650
#: builtin/describe.c:403
4653
#: builtin/describe.c:404
4651
4654
msgid "only output exact matches"
4654
#: builtin/describe.c:405
4657
#: builtin/describe.c:406
4655
4658
msgid "consider <n> most recent tags (default: 10)"
4658
#: builtin/describe.c:407
4661
#: builtin/describe.c:408
4659
4662
msgid "only consider tags matching <pattern>"
4662
#: builtin/describe.c:409 builtin/name-rev.c:318
4665
#: builtin/describe.c:410 builtin/name-rev.c:318
4663
4666
msgid "show abbreviated commit object as fallback"
4666
#: builtin/describe.c:410
4669
#: builtin/describe.c:411
4670
#: builtin/describe.c:411
4673
#: builtin/describe.c:412
4671
4674
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
4674
#: builtin/describe.c:429
4677
#: builtin/describe.c:430
4675
4678
msgid "--long is incompatible with --abbrev=0"
4678
#: builtin/describe.c:455
4681
#: builtin/describe.c:456
4679
4682
msgid "No names found, cannot describe anything."
4682
#: builtin/describe.c:475
4685
#: builtin/describe.c:476
4683
4686
msgid "--dirty is incompatible with commit-ishes"
4686
#: builtin/diff.c:85
4689
#: builtin/diff.c:86
4688
4691
msgid "'%s': not a regular file or symlink"
4691
#: builtin/diff.c:236
4694
#: builtin/diff.c:237
4693
4696
msgid "invalid option: %s"
4696
#: builtin/diff.c:357
4699
#: builtin/diff.c:358
4697
4700
msgid "Not a git repository"
4700
#: builtin/diff.c:400
4703
#: builtin/diff.c:401
4702
4705
msgid "invalid object '%s' given."
4705
#: builtin/diff.c:409
4708
#: builtin/diff.c:410
4707
4710
msgid "more than two blobs given: '%s'"
4710
#: builtin/diff.c:416
4713
#: builtin/diff.c:417
4712
4715
msgid "unhandled object '%s' given."
4715
#: builtin/fast-export.c:23
4718
#: builtin/fast-export.c:24
4716
4719
msgid "git fast-export [rev-list-opts]"
4719
#: builtin/fast-export.c:702
4722
#: builtin/fast-export.c:979
4720
4723
msgid "show progress after <n> objects"
4723
#: builtin/fast-export.c:704
4726
#: builtin/fast-export.c:981
4724
4727
msgid "select handling of signed tags"
4727
#: builtin/fast-export.c:707
4730
#: builtin/fast-export.c:984
4728
4731
msgid "select handling of tags that tag filtered objects"
4731
#: builtin/fast-export.c:710
4734
#: builtin/fast-export.c:987
4732
4735
msgid "Dump marks to this file"
4735
#: builtin/fast-export.c:712
4738
#: builtin/fast-export.c:989
4736
4739
msgid "Import marks from this file"
4739
#: builtin/fast-export.c:714
4742
#: builtin/fast-export.c:991
4740
4743
msgid "Fake a tagger when tags lack one"
4743
#: builtin/fast-export.c:716
4746
#: builtin/fast-export.c:993
4744
4747
msgid "Output full tree for each commit"
4747
#: builtin/fast-export.c:718
4750
#: builtin/fast-export.c:995
4748
4751
msgid "Use the done feature to terminate the stream"
4751
#: builtin/fast-export.c:719
4754
#: builtin/fast-export.c:996
4752
4755
msgid "Skip output of blob data"
4758
#: builtin/fetch.c:19
4759
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
4755
4762
#: builtin/fetch.c:20
4756
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
4763
msgid "git fetch [<options>] <group>"
4759
4766
#: builtin/fetch.c:21
4760
msgid "git fetch [<options>] <group>"
4767
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
4763
4770
#: builtin/fetch.c:22
4764
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
4767
#: builtin/fetch.c:23
4768
4771
msgid "git fetch --all [<options>]"
4771
#: builtin/fetch.c:90
4774
#: builtin/fetch.c:89
4772
4775
msgid "fetch from all remotes"
4775
#: builtin/fetch.c:92
4778
#: builtin/fetch.c:91
4776
4779
msgid "append to .git/FETCH_HEAD instead of overwriting"
4782
#: builtin/fetch.c:93
4783
msgid "path to upload pack on remote end"
4779
4786
#: builtin/fetch.c:94
4780
msgid "path to upload pack on remote end"
4783
#: builtin/fetch.c:95
4784
4787
msgid "force overwrite of local branch"
4787
#: builtin/fetch.c:97
4790
#: builtin/fetch.c:96
4788
4791
msgid "fetch from multiple remotes"
4791
#: builtin/fetch.c:99
4794
#: builtin/fetch.c:98
4792
4795
msgid "fetch all tags and associated objects"
4795
#: builtin/fetch.c:101
4798
#: builtin/fetch.c:100
4796
4799
msgid "do not fetch all tags (--no-tags)"
4802
#: builtin/fetch.c:102
4803
msgid "prune remote-tracking branches no longer on remote"
4799
4806
#: builtin/fetch.c:103
4800
msgid "prune remote-tracking branches no longer on remote"
4803
4810
#: builtin/fetch.c:104
4807
#: builtin/fetch.c:105
4808
4811
msgid "control recursive fetching of submodules"
4811
#: builtin/fetch.c:109
4814
#: builtin/fetch.c:108
4812
4815
msgid "keep downloaded pack"
4815
#: builtin/fetch.c:111
4818
#: builtin/fetch.c:110
4816
4819
msgid "allow updating of HEAD ref"
4819
#: builtin/fetch.c:114
4822
#: builtin/fetch.c:113
4820
4823
msgid "deepen history of shallow clone"
4823
#: builtin/fetch.c:116
4826
#: builtin/fetch.c:115
4824
4827
msgid "convert to a complete repository"
4827
#: builtin/fetch.c:118 builtin/log.c:1205
4830
#: builtin/fetch.c:117 builtin/log.c:1208
4831
#: builtin/fetch.c:119
4834
#: builtin/fetch.c:118
4832
4835
msgid "prepend this to submodule path output"
4835
#: builtin/fetch.c:122
4838
#: builtin/fetch.c:121
4836
4839
msgid "default mode for recursion"
4839
#: builtin/fetch.c:124
4842
#: builtin/fetch.c:123
4840
4843
msgid "accept refs that update .git/shallow"
4843
#: builtin/fetch.c:376
4846
#: builtin/fetch.c:377
4844
4847
msgid "Couldn't find remote ref HEAD"
4847
#: builtin/fetch.c:440
4850
#: builtin/fetch.c:457
4849
4852
msgid "object %s not found"
4852
#: builtin/fetch.c:445
4855
#: builtin/fetch.c:462
4853
4856
msgid "[up to date]"
4856
#: builtin/fetch.c:459
4859
#: builtin/fetch.c:476
4858
4861
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
4861
#: builtin/fetch.c:460 builtin/fetch.c:546
4864
#: builtin/fetch.c:477 builtin/fetch.c:563
4862
4865
msgid "[rejected]"
4865
#: builtin/fetch.c:471
4868
#: builtin/fetch.c:488
4866
4869
msgid "[tag update]"
4869
#: builtin/fetch.c:473 builtin/fetch.c:508 builtin/fetch.c:526
4872
#: builtin/fetch.c:490 builtin/fetch.c:525 builtin/fetch.c:543
4870
4873
msgid " (unable to update local ref)"
4873
#: builtin/fetch.c:491
4876
#: builtin/fetch.c:508
4874
4877
msgid "[new tag]"
4877
#: builtin/fetch.c:494
4880
#: builtin/fetch.c:511
4878
4881
msgid "[new branch]"
4881
#: builtin/fetch.c:497
4884
#: builtin/fetch.c:514
4882
4885
msgid "[new ref]"
4885
#: builtin/fetch.c:542
4888
#: builtin/fetch.c:559
4886
4889
msgid "unable to update local ref"
4889
#: builtin/fetch.c:542
4892
#: builtin/fetch.c:559
4890
4893
msgid "forced update"
4893
#: builtin/fetch.c:548
4896
#: builtin/fetch.c:565
4894
4897
msgid "(non-fast-forward)"
4897
#: builtin/fetch.c:581 builtin/fetch.c:814
4900
#: builtin/fetch.c:599 builtin/fetch.c:832
4899
4902
msgid "cannot open %s: %s\n"
4902
#: builtin/fetch.c:590
4905
#: builtin/fetch.c:608
4904
4907
msgid "%s did not send all necessary objects\n"
4907
#: builtin/fetch.c:608
4910
#: builtin/fetch.c:626
4909
4912
msgid "reject %s because shallow roots are not allowed to be updated"
4912
#: builtin/fetch.c:696 builtin/fetch.c:779
4915
#: builtin/fetch.c:714 builtin/fetch.c:797
4914
4917
msgid "From %.*s\n"
4917
#: builtin/fetch.c:707
4920
#: builtin/fetch.c:725
4920
4923
"some local refs could not be updated; try running\n"
4921
4924
" 'git remote prune %s' to remove any old, conflicting branches"
4924
#: builtin/fetch.c:759
4927
#: builtin/fetch.c:777
4926
4929
msgid " (%s will become dangling)"
4929
#: builtin/fetch.c:760
4932
#: builtin/fetch.c:778
4931
4934
msgid " (%s has become dangling)"
4934
#: builtin/fetch.c:784
4937
#: builtin/fetch.c:802
4935
4938
msgid "[deleted]"
4938
#: builtin/fetch.c:785 builtin/remote.c:1059
4941
#: builtin/fetch.c:803 builtin/remote.c:1057
4942
#: builtin/fetch.c:804
4945
#: builtin/fetch.c:822
4944
4947
msgid "Refusing to fetch into current branch %s of non-bare repository"
4947
#: builtin/fetch.c:823
4950
#: builtin/fetch.c:841
4949
4952
msgid "Option \"%s\" value \"%s\" is not valid for %s"
4952
#: builtin/fetch.c:826
4955
#: builtin/fetch.c:844
4954
4957
msgid "Option \"%s\" is ignored for %s\n"
4957
#: builtin/fetch.c:882
4960
#: builtin/fetch.c:900
4959
4962
msgid "Don't know how to fetch from %s"
4962
#: builtin/fetch.c:1044
4965
#: builtin/fetch.c:1063
4964
4967
msgid "Fetching %s\n"
4967
#: builtin/fetch.c:1046 builtin/remote.c:90
4970
#: builtin/fetch.c:1065 builtin/remote.c:90
4969
4972
msgid "Could not fetch %s"
4972
#: builtin/fetch.c:1064
4975
#: builtin/fetch.c:1083
4974
4977
"No remote repository specified. Please, specify either a URL or a\n"
4975
4978
"remote name from which new revisions should be fetched."
4978
#: builtin/fetch.c:1087
4981
#: builtin/fetch.c:1106
4979
4982
msgid "You need to specify a tag name."
4982
#: builtin/fetch.c:1131
4985
#: builtin/fetch.c:1148
4983
4986
msgid "--depth and --unshallow cannot be used together"
4986
#: builtin/fetch.c:1133
4989
#: builtin/fetch.c:1150
4987
4990
msgid "--unshallow on a complete repository does not make sense"
4990
#: builtin/fetch.c:1156
4993
#: builtin/fetch.c:1173
4991
4994
msgid "fetch --all does not take a repository argument"
4994
#: builtin/fetch.c:1158
4997
#: builtin/fetch.c:1175
4995
4998
msgid "fetch --all does not make sense with refspecs"
4998
#: builtin/fetch.c:1169
5001
#: builtin/fetch.c:1186
5000
5003
msgid "No such remote or remote group: %s"
5003
#: builtin/fetch.c:1177
5006
#: builtin/fetch.c:1194
5004
5007
msgid "Fetching a group and specifying refspecs does not make sense"
5557
5560
msgid "object of unexpected type"
5560
#: builtin/index-pack.c:256
5563
#: builtin/index-pack.c:266
5562
5565
msgid "cannot fill %d byte"
5563
5566
msgid_plural "cannot fill %d bytes"
5567
#: builtin/index-pack.c:266
5570
#: builtin/index-pack.c:276
5568
5571
msgid "early EOF"
5571
#: builtin/index-pack.c:267
5574
#: builtin/index-pack.c:277
5572
5575
msgid "read error on input"
5575
#: builtin/index-pack.c:279
5578
#: builtin/index-pack.c:289
5576
5579
msgid "used more bytes than were available"
5579
#: builtin/index-pack.c:286
5582
#: builtin/index-pack.c:296
5580
5583
msgid "pack too large for current definition of off_t"
5583
#: builtin/index-pack.c:302
5586
#: builtin/index-pack.c:312
5585
5588
msgid "unable to create '%s'"
5588
#: builtin/index-pack.c:307
5591
#: builtin/index-pack.c:317
5590
5593
msgid "cannot open packfile '%s'"
5593
#: builtin/index-pack.c:321
5596
#: builtin/index-pack.c:331
5594
5597
msgid "pack signature mismatch"
5597
#: builtin/index-pack.c:323
5600
#: builtin/index-pack.c:333
5599
5602
msgid "pack version %<PRIu32> unsupported"
5602
#: builtin/index-pack.c:341
5605
#: builtin/index-pack.c:351
5604
5607
msgid "pack has bad object at offset %lu: %s"
5607
#: builtin/index-pack.c:462
5610
#: builtin/index-pack.c:472
5609
5612
msgid "inflate returned %d"
5612
#: builtin/index-pack.c:511
5615
#: builtin/index-pack.c:521
5613
5616
msgid "offset value overflow for delta base object"
5616
#: builtin/index-pack.c:519
5619
#: builtin/index-pack.c:529
5617
5620
msgid "delta base offset is out of bound"
5620
#: builtin/index-pack.c:527
5623
#: builtin/index-pack.c:537
5622
5625
msgid "unknown object type %d"
5625
#: builtin/index-pack.c:558
5628
#: builtin/index-pack.c:568
5626
5629
msgid "cannot pread pack file"
5629
#: builtin/index-pack.c:560
5632
#: builtin/index-pack.c:570
5631
5634
msgid "premature end of pack file, %lu byte missing"
5632
5635
msgid_plural "premature end of pack file, %lu bytes missing"
5636
#: builtin/index-pack.c:586
5639
#: builtin/index-pack.c:596
5637
5640
msgid "serious inflate inconsistency"
5640
#: builtin/index-pack.c:677 builtin/index-pack.c:683 builtin/index-pack.c:706
5641
#: builtin/index-pack.c:740 builtin/index-pack.c:749
5643
#: builtin/index-pack.c:742 builtin/index-pack.c:748 builtin/index-pack.c:771
5644
#: builtin/index-pack.c:805 builtin/index-pack.c:814
5643
5646
msgid "SHA1 COLLISION FOUND WITH %s !"
5646
#: builtin/index-pack.c:680 builtin/pack-objects.c:162
5649
#: builtin/index-pack.c:745 builtin/pack-objects.c:162
5647
5650
#: builtin/pack-objects.c:254
5649
5652
msgid "unable to read %s"
5652
#: builtin/index-pack.c:746
5655
#: builtin/index-pack.c:811
5654
5657
msgid "cannot read existing object %s"
5657
#: builtin/index-pack.c:760
5660
#: builtin/index-pack.c:825
5659
5662
msgid "invalid blob object %s"
5662
#: builtin/index-pack.c:774
5665
#: builtin/index-pack.c:839
5664
5667
msgid "invalid %s"
5667
#: builtin/index-pack.c:777
5670
#: builtin/index-pack.c:843
5668
5671
msgid "Error in object"
5671
#: builtin/index-pack.c:779
5674
#: builtin/index-pack.c:845
5673
5676
msgid "Not all child objects of %s are reachable"
5676
#: builtin/index-pack.c:851 builtin/index-pack.c:881
5679
#: builtin/index-pack.c:917 builtin/index-pack.c:948
5677
5680
msgid "failed to apply delta"
5680
#: builtin/index-pack.c:1022
5683
#: builtin/index-pack.c:1118
5681
5684
msgid "Receiving objects"
5684
#: builtin/index-pack.c:1022
5687
#: builtin/index-pack.c:1118
5685
5688
msgid "Indexing objects"
5688
#: builtin/index-pack.c:1048
5691
#: builtin/index-pack.c:1150
5689
5692
msgid "pack is corrupted (SHA1 mismatch)"
5692
#: builtin/index-pack.c:1053
5695
#: builtin/index-pack.c:1155
5693
5696
msgid "cannot fstat packfile"
5696
#: builtin/index-pack.c:1056
5699
#: builtin/index-pack.c:1158
5697
5700
msgid "pack has junk at the end"
5700
#: builtin/index-pack.c:1067
5703
#: builtin/index-pack.c:1169
5701
5704
msgid "confusion beyond insanity in parse_pack_objects()"
5704
#: builtin/index-pack.c:1090
5707
#: builtin/index-pack.c:1194
5705
5708
msgid "Resolving deltas"
5708
#: builtin/index-pack.c:1100
5711
#: builtin/index-pack.c:1205
5710
5713
msgid "unable to create thread: %s"
5713
#: builtin/index-pack.c:1142
5716
#: builtin/index-pack.c:1247
5714
5717
msgid "confusion beyond insanity"
5717
#: builtin/index-pack.c:1150
5720
#: builtin/index-pack.c:1253
5719
5722
msgid "completed with %d local objects"
5722
#: builtin/index-pack.c:1160
5725
#: builtin/index-pack.c:1263
5724
5727
msgid "Unexpected tail checksum for %s (disk corruption?)"
5727
#: builtin/index-pack.c:1164
5730
#: builtin/index-pack.c:1267
5729
5732
msgid "pack has %d unresolved delta"
5730
5733
msgid_plural "pack has %d unresolved deltas"
5734
#: builtin/index-pack.c:1189
5737
#: builtin/index-pack.c:1291
5736
5739
msgid "unable to deflate appended object (%d)"
5739
#: builtin/index-pack.c:1268
5742
#: builtin/index-pack.c:1367
5741
5744
msgid "local object %s is corrupt"
5744
#: builtin/index-pack.c:1292
5747
#: builtin/index-pack.c:1391
5745
5748
msgid "error while closing pack file"
5748
#: builtin/index-pack.c:1305
5751
#: builtin/index-pack.c:1404
5750
5753
msgid "cannot write keep file '%s'"
5753
#: builtin/index-pack.c:1313
5756
#: builtin/index-pack.c:1412
5755
5758
msgid "cannot close written keep file '%s'"
5758
#: builtin/index-pack.c:1326
5761
#: builtin/index-pack.c:1425
5759
5762
msgid "cannot store pack file"
5762
#: builtin/index-pack.c:1337
5765
#: builtin/index-pack.c:1436
5763
5766
msgid "cannot store index file"
5766
#: builtin/index-pack.c:1370
5769
#: builtin/index-pack.c:1469
5768
5771
msgid "bad pack.indexversion=%<PRIu32>"
5771
#: builtin/index-pack.c:1376
5774
#: builtin/index-pack.c:1475
5773
5776
msgid "invalid number of threads specified (%d)"
5776
#: builtin/index-pack.c:1380 builtin/index-pack.c:1559
5779
#: builtin/index-pack.c:1479 builtin/index-pack.c:1658
5778
5781
msgid "no threads support, ignoring %s"
5781
#: builtin/index-pack.c:1438
5784
#: builtin/index-pack.c:1537
5783
5786
msgid "Cannot open existing pack file '%s'"
5786
#: builtin/index-pack.c:1440
5789
#: builtin/index-pack.c:1539
5788
5791
msgid "Cannot open existing pack idx file for '%s'"
5791
#: builtin/index-pack.c:1487
5794
#: builtin/index-pack.c:1586
5793
5796
msgid "non delta: %d object"
5794
5797
msgid_plural "non delta: %d objects"
5798
#: builtin/index-pack.c:1494
5801
#: builtin/index-pack.c:1593
5800
5803
msgid "chain length = %d: %lu object"
5801
5804
msgid_plural "chain length = %d: %lu objects"
5805
#: builtin/index-pack.c:1523
5808
#: builtin/index-pack.c:1622
5806
5809
msgid "Cannot come back to cwd"
5809
#: builtin/index-pack.c:1571 builtin/index-pack.c:1574
5810
#: builtin/index-pack.c:1586 builtin/index-pack.c:1590
5812
#: builtin/index-pack.c:1670 builtin/index-pack.c:1673
5813
#: builtin/index-pack.c:1685 builtin/index-pack.c:1689
5815
#: builtin/index-pack.c:1604
5818
#: builtin/index-pack.c:1703
5816
5819
msgid "--fix-thin cannot be used without --stdin"
5819
#: builtin/index-pack.c:1608 builtin/index-pack.c:1617
5822
#: builtin/index-pack.c:1707 builtin/index-pack.c:1716
5821
5824
msgid "packfile name '%s' does not end with '.pack'"
5824
#: builtin/index-pack.c:1625
5827
#: builtin/index-pack.c:1724
5825
5828
msgid "--verify with no packfile name given"
6051
6054
msgid "git format-patch [options] [<since> | <revision range>]"
6054
#: builtin/log.c:1068
6057
#: builtin/log.c:1071
6055
6058
msgid "Two output directories?"
6058
#: builtin/log.c:1183
6061
#: builtin/log.c:1186
6059
6062
msgid "use [PATCH n/m] even with a single patch"
6062
#: builtin/log.c:1186
6065
#: builtin/log.c:1189
6063
6066
msgid "use [PATCH] even with multiple patches"
6066
#: builtin/log.c:1190
6069
#: builtin/log.c:1193
6067
6070
msgid "print patches to standard out"
6070
#: builtin/log.c:1192
6073
#: builtin/log.c:1195
6071
6074
msgid "generate a cover letter"
6074
#: builtin/log.c:1194
6077
#: builtin/log.c:1197
6075
6078
msgid "use simple number sequence for output file names"
6078
#: builtin/log.c:1195
6081
#: builtin/log.c:1198
6082
#: builtin/log.c:1196
6085
#: builtin/log.c:1199
6083
6086
msgid "use <sfx> instead of '.patch'"
6086
#: builtin/log.c:1198
6089
#: builtin/log.c:1201
6087
6090
msgid "start numbering patches at <n> instead of 1"
6090
#: builtin/log.c:1200
6093
#: builtin/log.c:1203
6091
6094
msgid "mark the series as Nth re-roll"
6094
#: builtin/log.c:1202
6097
#: builtin/log.c:1205
6095
6098
msgid "Use [<prefix>] instead of [PATCH]"
6098
#: builtin/log.c:1205
6101
#: builtin/log.c:1208
6099
6102
msgid "store resulting files in <dir>"
6102
#: builtin/log.c:1208
6105
#: builtin/log.c:1211
6103
6106
msgid "don't strip/add [PATCH]"
6106
#: builtin/log.c:1211
6109
#: builtin/log.c:1214
6107
6110
msgid "don't output binary diffs"
6110
#: builtin/log.c:1213
6113
#: builtin/log.c:1216
6111
6114
msgid "don't include a patch matching a commit upstream"
6114
#: builtin/log.c:1215
6117
#: builtin/log.c:1218
6115
6118
msgid "show patch format instead of default (patch + stat)"
6118
#: builtin/log.c:1217
6121
#: builtin/log.c:1220
6119
6122
msgid "Messaging"
6122
#: builtin/log.c:1218
6125
#: builtin/log.c:1221
6126
#: builtin/log.c:1219
6129
#: builtin/log.c:1222
6127
6130
msgid "add email header"
6130
#: builtin/log.c:1220 builtin/log.c:1222
6133
#: builtin/log.c:1223 builtin/log.c:1225
6134
#: builtin/log.c:1220
6137
#: builtin/log.c:1223
6135
6138
msgid "add To: header"
6138
#: builtin/log.c:1222
6141
#: builtin/log.c:1225
6139
6142
msgid "add Cc: header"
6142
#: builtin/log.c:1224
6145
#: builtin/log.c:1227
6146
#: builtin/log.c:1225
6149
#: builtin/log.c:1228
6147
6150
msgid "set From address to <ident> (or committer ident if absent)"
6150
#: builtin/log.c:1227
6153
#: builtin/log.c:1230
6151
6154
msgid "message-id"
6154
#: builtin/log.c:1228
6157
#: builtin/log.c:1231
6155
6158
msgid "make first mail a reply to <message-id>"
6158
#: builtin/log.c:1229 builtin/log.c:1232
6161
#: builtin/log.c:1232 builtin/log.c:1235
6159
6162
msgid "boundary"
6162
#: builtin/log.c:1230
6165
#: builtin/log.c:1233
6163
6166
msgid "attach the patch"
6166
#: builtin/log.c:1233
6169
#: builtin/log.c:1236
6167
6170
msgid "inline the patch"
6170
#: builtin/log.c:1237
6173
#: builtin/log.c:1240
6171
6174
msgid "enable message threading, styles: shallow, deep"
6174
#: builtin/log.c:1239
6177
#: builtin/log.c:1242
6175
6178
msgid "signature"
6178
#: builtin/log.c:1240
6181
#: builtin/log.c:1243
6179
6182
msgid "add a signature"
6182
#: builtin/log.c:1243
6185
#: builtin/log.c:1246
6183
6186
msgid "don't print the patch filenames"
6186
#: builtin/log.c:1317
6189
#: builtin/log.c:1320
6188
6191
msgid "invalid ident line: %s"
6191
#: builtin/log.c:1332
6194
#: builtin/log.c:1335
6192
6195
msgid "-n and -k are mutually exclusive."
6195
#: builtin/log.c:1334
6198
#: builtin/log.c:1337
6196
6199
msgid "--subject-prefix and -k are mutually exclusive."
6199
#: builtin/log.c:1342
6202
#: builtin/log.c:1345
6200
6203
msgid "--name-only does not make sense"
6203
#: builtin/log.c:1344
6206
#: builtin/log.c:1347
6204
6207
msgid "--name-status does not make sense"
6207
#: builtin/log.c:1346
6210
#: builtin/log.c:1349
6208
6211
msgid "--check does not make sense"
6211
#: builtin/log.c:1369
6214
#: builtin/log.c:1372
6212
6215
msgid "standard output, or directory, which one?"
6215
#: builtin/log.c:1371
6218
#: builtin/log.c:1374
6217
6220
msgid "Could not create directory '%s'"
6220
#: builtin/log.c:1531
6223
#: builtin/log.c:1535
6221
6224
msgid "Failed to create output files"
6224
#: builtin/log.c:1579
6227
#: builtin/log.c:1583
6225
6228
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
6228
#: builtin/log.c:1634
6231
#: builtin/log.c:1637
6231
6234
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
6234
#: builtin/log.c:1647 builtin/log.c:1649 builtin/log.c:1661
6237
#: builtin/log.c:1648 builtin/log.c:1650 builtin/log.c:1662
6236
6239
msgid "Unknown commit %s"
6280
6283
msgid "show 'other' directories' name only"
6283
#: builtin/ls-files.c:480
6286
#: builtin/ls-files.c:437
6284
6287
msgid "don't show empty directories"
6287
#: builtin/ls-files.c:483
6290
#: builtin/ls-files.c:440
6288
6291
msgid "show unmerged files in the output"
6291
#: builtin/ls-files.c:485
6294
#: builtin/ls-files.c:442
6292
6295
msgid "show resolve-undo information"
6295
#: builtin/ls-files.c:487
6298
#: builtin/ls-files.c:444
6296
6299
msgid "skip files matching pattern"
6299
#: builtin/ls-files.c:490
6302
#: builtin/ls-files.c:447
6300
6303
msgid "exclude patterns are read from <file>"
6303
#: builtin/ls-files.c:493
6306
#: builtin/ls-files.c:450
6304
6307
msgid "read additional per-directory exclude patterns in <file>"
6307
#: builtin/ls-files.c:495
6310
#: builtin/ls-files.c:452
6308
6311
msgid "add the standard git exclusions"
6311
#: builtin/ls-files.c:498
6314
#: builtin/ls-files.c:455
6312
6315
msgid "make the output relative to the project top directory"
6315
#: builtin/ls-files.c:501
6318
#: builtin/ls-files.c:458
6316
6319
msgid "if any <file> is not in the index, treat this as an error"
6319
#: builtin/ls-files.c:502
6322
#: builtin/ls-files.c:459
6320
6323
msgid "tree-ish"
6323
#: builtin/ls-files.c:503
6326
#: builtin/ls-files.c:460
6324
6327
msgid "pretend that paths removed since <tree-ish> are still present"
6327
#: builtin/ls-files.c:505
6330
#: builtin/ls-files.c:462
6328
6331
msgid "show debugging data"
6372
6375
msgid "git merge [options] <msg> HEAD <commit>"
6375
#: builtin/merge.c:45
6378
#: builtin/merge.c:47
6376
6379
msgid "git merge --abort"
6379
#: builtin/merge.c:98
6382
#: builtin/merge.c:100
6380
6383
msgid "switch `m' requires a value"
6383
#: builtin/merge.c:135
6386
#: builtin/merge.c:137
6385
6388
msgid "Could not find merge strategy '%s'.\n"
6388
#: builtin/merge.c:136
6391
#: builtin/merge.c:138
6390
6393
msgid "Available strategies are:"
6393
#: builtin/merge.c:141
6396
#: builtin/merge.c:143
6395
6398
msgid "Available custom strategies are:"
6398
#: builtin/merge.c:191
6401
#: builtin/merge.c:193
6399
6402
msgid "do not show a diffstat at the end of the merge"
6402
#: builtin/merge.c:194
6405
#: builtin/merge.c:196
6403
6406
msgid "show a diffstat at the end of the merge"
6406
#: builtin/merge.c:195
6409
#: builtin/merge.c:197
6407
6410
msgid "(synonym to --stat)"
6410
#: builtin/merge.c:197
6413
#: builtin/merge.c:199
6411
6414
msgid "add (at most <n>) entries from shortlog to merge commit message"
6414
#: builtin/merge.c:200
6417
#: builtin/merge.c:202
6415
6418
msgid "create a single commit instead of doing a merge"
6418
#: builtin/merge.c:202
6421
#: builtin/merge.c:204
6419
6422
msgid "perform a commit if the merge succeeds (default)"
6422
#: builtin/merge.c:204
6425
#: builtin/merge.c:206
6423
6426
msgid "edit message before committing"
6426
#: builtin/merge.c:205
6429
#: builtin/merge.c:207
6427
6430
msgid "allow fast-forward (default)"
6430
#: builtin/merge.c:207
6433
#: builtin/merge.c:209
6431
6434
msgid "abort if fast-forward is not possible"
6434
#: builtin/merge.c:211
6437
#: builtin/merge.c:213
6435
6438
msgid "Verify that the named commit has a valid GPG signature"
6438
#: builtin/merge.c:212 builtin/notes.c:742 builtin/revert.c:89
6441
#: builtin/merge.c:214 builtin/notes.c:753 builtin/revert.c:89
6439
6442
msgid "strategy"
6442
#: builtin/merge.c:213
6445
#: builtin/merge.c:215
6443
6446
msgid "merge strategy to use"
6446
#: builtin/merge.c:214
6449
#: builtin/merge.c:216
6447
6450
msgid "option=value"
6450
#: builtin/merge.c:215
6453
#: builtin/merge.c:217
6451
6454
msgid "option for selected merge strategy"
6454
#: builtin/merge.c:217
6457
#: builtin/merge.c:219
6455
6458
msgid "merge commit message (for a non-fast-forward merge)"
6458
#: builtin/merge.c:221
6461
#: builtin/merge.c:223
6459
6462
msgid "abort the current in-progress merge"
6462
#: builtin/merge.c:250
6465
#: builtin/merge.c:251
6463
6466
msgid "could not run stash."
6466
#: builtin/merge.c:255
6469
#: builtin/merge.c:256
6467
6470
msgid "stash failed"
6470
#: builtin/merge.c:260
6473
#: builtin/merge.c:261
6472
6475
msgid "not a valid object: %s"
6475
#: builtin/merge.c:279 builtin/merge.c:296
6478
#: builtin/merge.c:280 builtin/merge.c:297
6476
6479
msgid "read-tree failed"
6479
#: builtin/merge.c:326
6482
#: builtin/merge.c:327
6480
6483
msgid " (nothing to squash)"
6483
#: builtin/merge.c:339
6486
#: builtin/merge.c:340
6485
6488
msgid "Squash commit -- not updating HEAD\n"
6488
#: builtin/merge.c:371
6491
#: builtin/merge.c:372
6489
6492
msgid "Writing SQUASH_MSG"
6492
#: builtin/merge.c:373
6495
#: builtin/merge.c:374
6493
6496
msgid "Finishing SQUASH_MSG"
6496
#: builtin/merge.c:396
6499
#: builtin/merge.c:397
6498
6501
msgid "No merge message -- not updating HEAD\n"
6501
#: builtin/merge.c:446
6504
#: builtin/merge.c:447
6503
6506
msgid "'%s' does not point to a commit"
6506
#: builtin/merge.c:558
6509
#: builtin/merge.c:537
6508
6511
msgid "Bad branch.%s.mergeoptions string: %s"
6511
#: builtin/merge.c:653
6514
#: builtin/merge.c:632
6512
6515
msgid "git write-tree failed to write a tree"
6515
#: builtin/merge.c:678
6518
#: builtin/merge.c:656
6516
6519
msgid "Not handling anything other than two heads merge."
6519
#: builtin/merge.c:692
6522
#: builtin/merge.c:670
6521
6524
msgid "Unknown option for merge-recursive: -X%s"
6524
#: builtin/merge.c:705
6527
#: builtin/merge.c:683
6526
6529
msgid "unable to write %s"
6529
#: builtin/merge.c:794
6532
#: builtin/merge.c:772
6531
6534
msgid "Could not read from '%s'"
6534
#: builtin/merge.c:803
6537
#: builtin/merge.c:781
6536
6539
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
6539
#: builtin/merge.c:809
6542
#: builtin/merge.c:787
6542
6545
"Please enter a commit message to explain why this merge is necessary,\n"
7063
7066
msgid "The note contents has been left in %s"
7066
#: builtin/notes.c:248 builtin/tag.c:692
7069
#: builtin/notes.c:231 builtin/tag.c:693
7068
7071
msgid "cannot read '%s'"
7071
#: builtin/notes.c:250 builtin/tag.c:695
7074
#: builtin/notes.c:233 builtin/tag.c:696
7073
7076
msgid "could not open or read '%s'"
7076
#: builtin/notes.c:269 builtin/notes.c:320 builtin/notes.c:322
7077
#: builtin/notes.c:382 builtin/notes.c:436 builtin/notes.c:519
7078
#: builtin/notes.c:524 builtin/notes.c:599 builtin/notes.c:641
7079
#: builtin/notes.c:843 builtin/tag.c:708
7079
#: builtin/notes.c:252 builtin/notes.c:303 builtin/notes.c:305
7080
#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:506
7081
#: builtin/notes.c:511 builtin/notes.c:589 builtin/notes.c:652
7082
#: builtin/notes.c:854 builtin/tag.c:709
7081
7084
msgid "Failed to resolve '%s' as a valid ref."
7084
#: builtin/notes.c:272
7087
#: builtin/notes.c:255
7086
7089
msgid "Failed to read object '%s'."
7089
#: builtin/notes.c:316
7092
#: builtin/notes.c:299
7091
7094
msgid "Malformed input line: '%s'."
7094
#: builtin/notes.c:331
7097
#: builtin/notes.c:314
7096
7099
msgid "Failed to copy notes from '%s' to '%s'"
7099
#: builtin/notes.c:375 builtin/notes.c:429 builtin/notes.c:502
7100
#: builtin/notes.c:514 builtin/notes.c:587 builtin/notes.c:634
7101
#: builtin/notes.c:908
7102
#: builtin/notes.c:358 builtin/notes.c:413 builtin/notes.c:489
7103
#: builtin/notes.c:501 builtin/notes.c:577 builtin/notes.c:645
7104
#: builtin/notes.c:919
7102
7105
msgid "too many parameters"
7105
#: builtin/notes.c:388 builtin/notes.c:647
7108
#: builtin/notes.c:371 builtin/notes.c:658
7107
7110
msgid "No note found for object %s."
7110
#: builtin/notes.c:410 builtin/notes.c:567
7113
#: builtin/notes.c:392 builtin/notes.c:555
7111
7114
msgid "note contents as a string"
7114
#: builtin/notes.c:413 builtin/notes.c:570
7117
#: builtin/notes.c:395 builtin/notes.c:558
7115
7118
msgid "note contents in a file"
7118
#: builtin/notes.c:415 builtin/notes.c:418 builtin/notes.c:572
7119
#: builtin/notes.c:575 builtin/tag.c:627
7121
#: builtin/notes.c:397 builtin/notes.c:400 builtin/notes.c:560
7122
#: builtin/notes.c:563 builtin/tag.c:628
7123
#: builtin/notes.c:416 builtin/notes.c:573
7126
#: builtin/notes.c:398 builtin/notes.c:561
7124
7127
msgid "reuse and edit specified note object"
7127
#: builtin/notes.c:419 builtin/notes.c:576
7130
#: builtin/notes.c:401 builtin/notes.c:564
7128
7131
msgid "reuse specified note object"
7131
#: builtin/notes.c:421 builtin/notes.c:489
7134
#: builtin/notes.c:405 builtin/notes.c:476
7132
7135
msgid "replace existing notes"
7135
#: builtin/notes.c:455
7138
#: builtin/notes.c:430
7138
7141
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
7139
7142
"existing notes"
7142
#: builtin/notes.c:460 builtin/notes.c:537
7145
#: builtin/notes.c:445 builtin/notes.c:524
7144
7147
msgid "Overwriting existing notes for object %s\n"
7147
#: builtin/notes.c:490
7150
#: builtin/notes.c:477
7148
7151
msgid "read objects from stdin"
7151
#: builtin/notes.c:492
7154
#: builtin/notes.c:479
7152
7155
msgid "load rewriting config for <command> (implies --stdin)"
7155
#: builtin/notes.c:510
7158
#: builtin/notes.c:497
7156
7159
msgid "too few parameters"
7159
#: builtin/notes.c:531
7162
#: builtin/notes.c:518
7162
7165
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
7163
7166
"existing notes"
7166
#: builtin/notes.c:543
7169
#: builtin/notes.c:530
7168
7171
msgid "Missing notes on source object %s. Cannot copy."
7171
#: builtin/notes.c:592
7174
#: builtin/notes.c:582
7174
7177
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
7175
7178
"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
7178
#: builtin/notes.c:739
7181
#: builtin/notes.c:750
7179
7182
msgid "General options"
7182
#: builtin/notes.c:741
7185
#: builtin/notes.c:752
7183
7186
msgid "Merge options"
7186
#: builtin/notes.c:743
7189
#: builtin/notes.c:754
7188
7191
"resolve notes conflicts using the given strategy "
7189
7192
"(manual/ours/theirs/union/cat_sort_uniq)"
7192
#: builtin/notes.c:745
7195
#: builtin/notes.c:756
7193
7196
msgid "Committing unmerged notes"
7196
#: builtin/notes.c:747
7199
#: builtin/notes.c:758
7197
7200
msgid "finalize notes merge by committing unmerged notes"
7200
#: builtin/notes.c:749
7203
#: builtin/notes.c:760
7201
7204
msgid "Aborting notes merge resolution"
7204
#: builtin/notes.c:751
7207
#: builtin/notes.c:762
7205
7208
msgid "abort notes merge"
7208
#: builtin/notes.c:846
7211
#: builtin/notes.c:857
7210
7213
msgid "Object %s has no note\n"
7213
#: builtin/notes.c:858
7216
#: builtin/notes.c:869
7214
7217
msgid "attempt to remove non-existent note is not an error"
7217
#: builtin/notes.c:861
7220
#: builtin/notes.c:872
7218
7221
msgid "read object names from the standard input"
7244
7247
msgid "deflate error (%d)"
7247
#: builtin/pack-objects.c:2526
7250
#: builtin/pack-objects.c:2568
7249
7252
msgid "unsupported index version %s"
7252
#: builtin/pack-objects.c:2530
7255
#: builtin/pack-objects.c:2572
7254
7257
msgid "bad index version '%s'"
7257
#: builtin/pack-objects.c:2553
7260
#: builtin/pack-objects.c:2595
7259
7262
msgid "option %s does not accept negative form"
7262
#: builtin/pack-objects.c:2557
7265
#: builtin/pack-objects.c:2599
7264
7267
msgid "unable to parse value '%s' for option %s"
7267
#: builtin/pack-objects.c:2576
7270
#: builtin/pack-objects.c:2619
7268
7271
msgid "do not show progress meter"
7271
#: builtin/pack-objects.c:2578
7274
#: builtin/pack-objects.c:2621
7272
7275
msgid "show progress meter"
7275
#: builtin/pack-objects.c:2580
7278
#: builtin/pack-objects.c:2623
7276
7279
msgid "show progress meter during object writing phase"
7279
#: builtin/pack-objects.c:2583
7282
#: builtin/pack-objects.c:2626
7280
7283
msgid "similar to --all-progress when progress meter is shown"
7283
#: builtin/pack-objects.c:2584
7286
#: builtin/pack-objects.c:2627
7284
7287
msgid "version[,offset]"
7287
#: builtin/pack-objects.c:2585
7290
#: builtin/pack-objects.c:2628
7288
7291
msgid "write the pack index file in the specified idx format version"
7291
#: builtin/pack-objects.c:2588
7294
#: builtin/pack-objects.c:2631
7292
7295
msgid "maximum size of each output pack file"
7295
#: builtin/pack-objects.c:2590
7298
#: builtin/pack-objects.c:2633
7296
7299
msgid "ignore borrowed objects from alternate object store"
7299
#: builtin/pack-objects.c:2592
7302
#: builtin/pack-objects.c:2635
7300
7303
msgid "ignore packed objects"
7303
#: builtin/pack-objects.c:2594
7306
#: builtin/pack-objects.c:2637
7304
7307
msgid "limit pack window by objects"
7307
#: builtin/pack-objects.c:2596
7310
#: builtin/pack-objects.c:2639
7308
7311
msgid "limit pack window by memory in addition to object limit"
7311
#: builtin/pack-objects.c:2598
7314
#: builtin/pack-objects.c:2641
7312
7315
msgid "maximum length of delta chain allowed in the resulting pack"
7315
#: builtin/pack-objects.c:2600
7318
#: builtin/pack-objects.c:2643
7316
7319
msgid "reuse existing deltas"
7319
#: builtin/pack-objects.c:2602
7322
#: builtin/pack-objects.c:2645
7320
7323
msgid "reuse existing objects"
7323
#: builtin/pack-objects.c:2604
7326
#: builtin/pack-objects.c:2647
7324
7327
msgid "use OFS_DELTA objects"
7327
#: builtin/pack-objects.c:2606
7330
#: builtin/pack-objects.c:2649
7328
7331
msgid "use threads when searching for best delta matches"
7331
#: builtin/pack-objects.c:2608
7334
#: builtin/pack-objects.c:2651
7332
7335
msgid "do not create an empty pack output"
7335
#: builtin/pack-objects.c:2610
7338
#: builtin/pack-objects.c:2653
7336
7339
msgid "read revision arguments from standard input"
7339
#: builtin/pack-objects.c:2612
7342
#: builtin/pack-objects.c:2655
7340
7343
msgid "limit the objects to those that are not yet packed"
7343
#: builtin/pack-objects.c:2615
7346
#: builtin/pack-objects.c:2658
7344
7347
msgid "include objects reachable from any reference"
7347
#: builtin/pack-objects.c:2618
7350
#: builtin/pack-objects.c:2661
7348
7351
msgid "include objects referred by reflog entries"
7351
#: builtin/pack-objects.c:2621
7354
#: builtin/pack-objects.c:2667
7352
7355
msgid "output pack to stdout"
7355
#: builtin/pack-objects.c:2623
7358
#: builtin/pack-objects.c:2669
7356
7359
msgid "include tag objects that refer to objects to be packed"
7359
#: builtin/pack-objects.c:2625
7362
#: builtin/pack-objects.c:2671
7360
7363
msgid "keep unreachable objects"
7363
#: builtin/pack-objects.c:2626 parse-options.h:140
7366
#: builtin/pack-objects.c:2672 parse-options.h:139
7367
#: builtin/pack-objects.c:2627
7370
#: builtin/pack-objects.c:2673
7368
7371
msgid "unpack unreachable objects newer than <time>"
7371
#: builtin/pack-objects.c:2630
7374
#: builtin/pack-objects.c:2676
7372
7375
msgid "create thin packs"
7375
#: builtin/pack-objects.c:2632
7378
#: builtin/pack-objects.c:2680
7376
7379
msgid "ignore packs that have companion .keep file"
7379
#: builtin/pack-objects.c:2634
7382
#: builtin/pack-objects.c:2682
7380
7383
msgid "pack compression level"
7383
#: builtin/pack-objects.c:2636
7386
#: builtin/pack-objects.c:2684
7384
7387
msgid "do not hide commits by grafts"
7643
#: builtin/push.c:496
7646
#: builtin/push.c:516
7644
7647
msgid "control recursive pushing of submodules"
7647
#: builtin/push.c:498
7650
#: builtin/push.c:518
7648
7651
msgid "use thin pack"
7651
#: builtin/push.c:499 builtin/push.c:500
7654
#: builtin/push.c:519 builtin/push.c:520
7652
7655
msgid "receive pack program"
7655
#: builtin/push.c:501
7658
#: builtin/push.c:521
7656
7659
msgid "set upstream for git pull/status"
7659
#: builtin/push.c:504
7662
#: builtin/push.c:524
7660
7663
msgid "prune locally removed refs"
7663
#: builtin/push.c:506
7666
#: builtin/push.c:526
7664
7667
msgid "bypass pre-push hook"
7667
#: builtin/push.c:507
7670
#: builtin/push.c:527
7668
7671
msgid "push missing but relevant tags"
7671
#: builtin/push.c:517
7674
#: builtin/push.c:539
7672
7675
msgid "--delete is incompatible with --all, --mirror and --tags"
7675
#: builtin/push.c:519
7678
#: builtin/push.c:541
7676
7679
msgid "--delete doesn't make sense without any refs"
7679
#: builtin/read-tree.c:36
7682
#: builtin/read-tree.c:37
7681
7684
"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
7682
7685
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7683
7686
"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
7686
#: builtin/read-tree.c:109
7689
#: builtin/read-tree.c:110
7687
7690
msgid "write resulting index to <file>"
7690
#: builtin/read-tree.c:112
7693
#: builtin/read-tree.c:113
7691
7694
msgid "only empty the index"
7694
#: builtin/read-tree.c:114
7697
#: builtin/read-tree.c:115
7695
7698
msgid "Merging"
7698
#: builtin/read-tree.c:116
7701
#: builtin/read-tree.c:117
7699
7702
msgid "perform a merge in addition to a read"
7702
#: builtin/read-tree.c:118
7705
#: builtin/read-tree.c:119
7703
7706
msgid "3-way merge if no file level merging required"
7706
#: builtin/read-tree.c:120
7709
#: builtin/read-tree.c:121
7707
7710
msgid "3-way merge in presence of adds and removes"
7710
#: builtin/read-tree.c:122
7713
#: builtin/read-tree.c:123
7711
7714
msgid "same as -m, but discard unmerged entries"
7714
#: builtin/read-tree.c:123
7717
#: builtin/read-tree.c:124
7715
7718
msgid "<subdirectory>/"
7718
#: builtin/read-tree.c:124
7721
#: builtin/read-tree.c:125
7719
7722
msgid "read the tree into the index under <subdirectory>/"
7722
#: builtin/read-tree.c:127
7725
#: builtin/read-tree.c:128
7723
7726
msgid "update working tree with merge result"
7726
#: builtin/read-tree.c:129
7729
#: builtin/read-tree.c:130
7727
7730
msgid "gitignore"
7730
#: builtin/read-tree.c:130
7733
#: builtin/read-tree.c:131
7731
7734
msgid "allow explicitly ignored files to be overwritten"
7734
#: builtin/read-tree.c:133
7737
#: builtin/read-tree.c:134
7735
7738
msgid "don't check the working tree after merging"
7738
#: builtin/read-tree.c:134
7741
#: builtin/read-tree.c:135
7739
7742
msgid "don't update the index or the work tree"
7742
#: builtin/read-tree.c:136
7745
#: builtin/read-tree.c:137
7743
7746
msgid "skip applying sparse checkout filter"
7746
#: builtin/read-tree.c:138
7749
#: builtin/read-tree.c:139
7747
7750
msgid "debug unpack-trees"
7750
#: builtin/reflog.c:499
7753
#: builtin/reflog.c:430
7752
7755
msgid "%s' for '%s' is not a valid timestamp"
7755
#: builtin/reflog.c:615 builtin/reflog.c:620
7758
#: builtin/reflog.c:547 builtin/reflog.c:552
7757
7760
msgid "'%s' is not a valid timestamp"
7987
#: builtin/remote.c:947
7990
#: builtin/remote.c:945
7989
7992
msgid " new (next fetch will store in remotes/%s)"
7995
#: builtin/remote.c:948
7992
7999
#: builtin/remote.c:950
8000
msgid " stale (use 'git remote prune' to remove)"
7996
8003
#: builtin/remote.c:952
7997
msgid " stale (use 'git remote prune' to remove)"
8000
#: builtin/remote.c:954
8004
#: builtin/remote.c:995
8007
#: builtin/remote.c:993
8006
8009
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
8009
#: builtin/remote.c:1002
8012
#: builtin/remote.c:1000
8011
8014
msgid "rebases onto remote %s"
8014
#: builtin/remote.c:1005
8017
#: builtin/remote.c:1003
8016
8019
msgid " merges with remote %s"
8022
#: builtin/remote.c:1004
8023
msgid " and with remote"
8019
8026
#: builtin/remote.c:1006
8020
msgid " and with remote"
8023
#: builtin/remote.c:1008
8025
8028
msgid "merges with remote %s"
8028
#: builtin/remote.c:1009
8031
#: builtin/remote.c:1007
8029
8032
msgid " and with remote"
8032
#: builtin/remote.c:1055
8035
#: builtin/remote.c:1053
8036
#: builtin/remote.c:1058
8039
#: builtin/remote.c:1056
8040
#: builtin/remote.c:1062
8043
#: builtin/remote.c:1060
8041
8044
msgid "up to date"
8044
#: builtin/remote.c:1065
8047
#: builtin/remote.c:1063
8045
8048
msgid "fast-forwardable"
8048
#: builtin/remote.c:1068
8051
#: builtin/remote.c:1066
8049
8052
msgid "local out of date"
8052
#: builtin/remote.c:1075
8055
#: builtin/remote.c:1073
8054
8057
msgid " %-*s forces to %-*s (%s)"
8057
#: builtin/remote.c:1078
8060
#: builtin/remote.c:1076
8059
8062
msgid " %-*s pushes to %-*s (%s)"
8062
#: builtin/remote.c:1082
8065
#: builtin/remote.c:1080
8064
8067
msgid " %-*s forces to %s"
8067
#: builtin/remote.c:1085
8070
#: builtin/remote.c:1083
8069
8072
msgid " %-*s pushes to %s"
8072
#: builtin/remote.c:1153
8075
#: builtin/remote.c:1151
8073
8076
msgid "do not query remotes"
8076
#: builtin/remote.c:1180
8079
#: builtin/remote.c:1178
8078
8081
msgid "* remote %s"
8081
#: builtin/remote.c:1181
8084
#: builtin/remote.c:1179
8083
8086
msgid " Fetch URL: %s"
8086
#: builtin/remote.c:1182 builtin/remote.c:1329
8089
#: builtin/remote.c:1180 builtin/remote.c:1331
8087
8090
msgid "(no URL)"
8090
#: builtin/remote.c:1191 builtin/remote.c:1193
8093
#: builtin/remote.c:1189 builtin/remote.c:1191
8092
8095
msgid " Push URL: %s"
8095
#: builtin/remote.c:1195 builtin/remote.c:1197 builtin/remote.c:1199
8098
#: builtin/remote.c:1193 builtin/remote.c:1195 builtin/remote.c:1197
8097
8100
msgid " HEAD branch: %s"
8100
#: builtin/remote.c:1201
8103
#: builtin/remote.c:1199
8103
8106
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
8106
#: builtin/remote.c:1213
8109
#: builtin/remote.c:1211
8108
8111
msgid " Remote branch:%s"
8109
8112
msgid_plural " Remote branches:%s"
8113
#: builtin/remote.c:1216 builtin/remote.c:1243
8116
#: builtin/remote.c:1214 builtin/remote.c:1241
8114
8117
msgid " (status not queried)"
8117
#: builtin/remote.c:1225
8120
#: builtin/remote.c:1223
8118
8121
msgid " Local branch configured for 'git pull':"
8119
8122
msgid_plural " Local branches configured for 'git pull':"
8123
#: builtin/remote.c:1233
8126
#: builtin/remote.c:1231
8124
8127
msgid " Local refs will be mirrored by 'git push'"
8127
#: builtin/remote.c:1240
8130
#: builtin/remote.c:1238
8129
8132
msgid " Local ref configured for 'git push'%s:"
8130
8133
msgid_plural " Local refs configured for 'git push'%s:"
8137
#: builtin/remote.c:1259
8138
msgid "set refs/remotes/<name>/HEAD according to remote"
8134
8141
#: builtin/remote.c:1261
8135
msgid "set refs/remotes/<name>/HEAD according to remote"
8138
#: builtin/remote.c:1263
8139
8142
msgid "delete refs/remotes/<name>/HEAD"
8145
#: builtin/remote.c:1276
8146
msgid "Cannot determine remote HEAD"
8142
8149
#: builtin/remote.c:1278
8143
msgid "Cannot determine remote HEAD"
8146
#: builtin/remote.c:1280
8147
8150
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
8150
#: builtin/remote.c:1290
8153
#: builtin/remote.c:1288
8152
8155
msgid "Could not delete %s"
8158
#: builtin/remote.c:1296
8160
msgid "Not a valid ref: %s"
8155
8163
#: builtin/remote.c:1298
8157
msgid "Not a valid ref: %s"
8160
#: builtin/remote.c:1300
8162
8165
msgid "Could not setup %s"
8165
#: builtin/remote.c:1318
8168
#: builtin/remote.c:1316
8167
8170
msgid " %s will become dangling!"
8170
#: builtin/remote.c:1319
8173
#: builtin/remote.c:1317
8172
8175
msgid " %s has become dangling!"
8175
#: builtin/remote.c:1325
8178
#: builtin/remote.c:1327
8177
8180
msgid "Pruning %s"
8180
#: builtin/remote.c:1326
8183
#: builtin/remote.c:1328
8182
8185
msgid "URL: %s"
8185
#: builtin/remote.c:1349
8188
#: builtin/remote.c:1351
8187
8190
msgid " * [would prune] %s"
8190
#: builtin/remote.c:1352
8193
#: builtin/remote.c:1354
8192
8195
msgid " * [pruned] %s"
8195
#: builtin/remote.c:1397
8198
#: builtin/remote.c:1399
8196
8199
msgid "prune remotes after fetching"
8199
#: builtin/remote.c:1463 builtin/remote.c:1537
8202
#: builtin/remote.c:1465 builtin/remote.c:1539
8201
8204
msgid "No such remote '%s'"
8204
#: builtin/remote.c:1483
8207
#: builtin/remote.c:1485
8205
8208
msgid "add branch"
8208
#: builtin/remote.c:1490
8211
#: builtin/remote.c:1492
8209
8212
msgid "no remote specified"
8212
#: builtin/remote.c:1512
8215
#: builtin/remote.c:1514
8213
8216
msgid "manipulate push URLs"
8216
#: builtin/remote.c:1514
8219
#: builtin/remote.c:1516
8217
8220
msgid "add URL"
8220
#: builtin/remote.c:1516
8223
#: builtin/remote.c:1518
8221
8224
msgid "delete URLs"
8224
#: builtin/remote.c:1523
8227
#: builtin/remote.c:1525
8225
8228
msgid "--add --delete doesn't make sense"
8228
#: builtin/remote.c:1563
8231
#: builtin/remote.c:1565
8230
8233
msgid "Invalid old URL pattern: %s"
8233
#: builtin/remote.c:1571
8236
#: builtin/remote.c:1573
8235
8238
msgid "No such URL found: %s"
8238
#: builtin/remote.c:1573
8241
#: builtin/remote.c:1575
8239
8242
msgid "Will not delete all non-push URLs"
8242
#: builtin/remote.c:1587
8245
#: builtin/remote.c:1589
8243
8246
msgid "be verbose; must be placed before a subcommand"
8705
8708
msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
8708
#: builtin/show-branch.c:649
8711
#: builtin/show-branch.c:659
8709
8712
msgid "show remote-tracking and local branches"
8712
#: builtin/show-branch.c:651
8715
#: builtin/show-branch.c:661
8713
8716
msgid "show remote-tracking branches"
8716
#: builtin/show-branch.c:653
8719
#: builtin/show-branch.c:663
8717
8720
msgid "color '*!+-' corresponding to the branch"
8720
#: builtin/show-branch.c:655
8723
#: builtin/show-branch.c:665
8721
8724
msgid "show <n> more commits after the common ancestor"
8724
#: builtin/show-branch.c:657
8727
#: builtin/show-branch.c:667
8725
8728
msgid "synonym to more=-1"
8728
#: builtin/show-branch.c:658
8731
#: builtin/show-branch.c:668
8729
8732
msgid "suppress naming strings"
8732
#: builtin/show-branch.c:660
8735
#: builtin/show-branch.c:670
8733
8736
msgid "include the current branch"
8736
#: builtin/show-branch.c:662
8739
#: builtin/show-branch.c:672
8737
8740
msgid "name commits with their object names"
8740
#: builtin/show-branch.c:664
8743
#: builtin/show-branch.c:674
8741
8744
msgid "show possible merge bases"
8744
#: builtin/show-branch.c:666
8747
#: builtin/show-branch.c:676
8745
8748
msgid "show refs unreachable from any other ref"
8748
#: builtin/show-branch.c:668
8751
#: builtin/show-branch.c:678
8749
8752
msgid "show commits in topological order"
8752
#: builtin/show-branch.c:671
8755
#: builtin/show-branch.c:681
8753
8756
msgid "show only commits not on the first branch"
8756
#: builtin/show-branch.c:673
8759
#: builtin/show-branch.c:683
8757
8760
msgid "show merges reachable from only one tip"
8760
#: builtin/show-branch.c:675
8763
#: builtin/show-branch.c:685
8761
8764
msgid "topologically sort, maintaining date order where possible"
8764
#: builtin/show-branch.c:678
8767
#: builtin/show-branch.c:688
8765
8768
msgid "<n>[,<base>]"
8768
#: builtin/show-branch.c:679
8771
#: builtin/show-branch.c:689
8769
8772
msgid "show <n> most recent ref-log entries starting at base"
9079
9082
msgid "<mode> <object> <path>"
9082
#: builtin/update-index.c:779
9085
#: builtin/update-index.c:942
9083
9086
msgid "add the specified entry to the index"
9086
#: builtin/update-index.c:783
9089
#: builtin/update-index.c:946
9090
#: builtin/update-index.c:784
9093
#: builtin/update-index.c:947
9091
9094
msgid "override the executable bit of the listed files"
9094
#: builtin/update-index.c:788
9097
#: builtin/update-index.c:951
9095
9098
msgid "mark files as \"not changing\""
9098
#: builtin/update-index.c:791
9101
#: builtin/update-index.c:954
9099
9102
msgid "clear assumed-unchanged bit"
9102
#: builtin/update-index.c:794
9105
#: builtin/update-index.c:957
9103
9106
msgid "mark files as \"index-only\""
9106
#: builtin/update-index.c:797
9109
#: builtin/update-index.c:960
9107
9110
msgid "clear skip-worktree bit"
9110
#: builtin/update-index.c:800
9113
#: builtin/update-index.c:963
9111
9114
msgid "add to index only; do not add content to object database"
9114
#: builtin/update-index.c:802
9117
#: builtin/update-index.c:965
9115
9118
msgid "remove named paths even if present in worktree"
9118
#: builtin/update-index.c:804
9121
#: builtin/update-index.c:967
9119
9122
msgid "with --stdin: input lines are terminated by null bytes"
9122
#: builtin/update-index.c:806
9125
#: builtin/update-index.c:969
9123
9126
msgid "read list of paths to be updated from standard input"
9126
#: builtin/update-index.c:810
9129
#: builtin/update-index.c:973
9127
9130
msgid "add entries from standard input to the index"
9130
#: builtin/update-index.c:814
9133
#: builtin/update-index.c:977
9131
9134
msgid "repopulate stages #2 and #3 for the listed paths"
9134
#: builtin/update-index.c:818
9137
#: builtin/update-index.c:981
9135
9138
msgid "only update entries that differ from HEAD"
9138
#: builtin/update-index.c:822
9141
#: builtin/update-index.c:985
9139
9142
msgid "ignore files missing from worktree"
9142
#: builtin/update-index.c:825
9145
#: builtin/update-index.c:988
9143
9146
msgid "report actions to standard output"
9146
#: builtin/update-index.c:827
9149
#: builtin/update-index.c:990
9147
9150
msgid "(for porcelains) forget saved unresolved conflicts"
9150
#: builtin/update-index.c:831
9153
#: builtin/update-index.c:994
9151
9154
msgid "write index in this format"