@matheusbsbs / matheus-bagliano / commits / 0bbe5b483d

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

Generate po/git.pot from v1.7.12-rc0-54-g9e211, and there are 4 new, 3 removed l10n messages. * 4 new messages are added at lines: 1254, 1264, 1459, 1523 * 3 old messages are deleted from the previous version at lines: 1254, 1273, 2854 Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Jiang Xin committed Jul 30, 2012 at 10:24 UTC 0bbe5b483df990a85183b29c29db7a96071e87a6
1 file changed +478 -475
po/git.pot
+478 -475
@@ -8,7 +8,7 @@ msgid ""
8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
11 -"POT-Creation-Date: 2012-07-03 10:23+0800\n"
11 +"POT-Creation-Date: 2012-07-30 09:18+0800\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -45,7 +45,7 @@ msgstr ""
45 msgid "unrecognized header: %s%s (%d)"
46 msgstr ""
47
48 -#: bundle.c:89 builtin/commit.c:696
48 +#: bundle.c:89 builtin/commit.c:699
49 #, c-format
50 msgid "could not open '%s'"
51 msgstr ""
@@ -55,7 +55,7 @@ msgid "Repository lacks these prerequisite commits:"
55 msgstr ""
56
57 #: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290
58 -#: builtin/log.c:721 builtin/log.c:1310 builtin/log.c:1529 builtin/merge.c:347
58 +#: builtin/log.c:726 builtin/log.c:1316 builtin/log.c:1535 builtin/merge.c:347
59 #: builtin/shortlog.c:181
60 msgid "revision walk setup failed"
61 msgstr ""
@@ -82,7 +82,7 @@ msgstr[1] ""
82 msgid "rev-list died"
83 msgstr ""
84
85 -#: bundle.c:300 builtin/log.c:1206 builtin/shortlog.c:284
85 +#: bundle.c:300 builtin/log.c:1212 builtin/shortlog.c:284
86 #, c-format
87 msgid "unrecognized argument: %s"
88 msgstr ""
@@ -250,7 +250,7 @@ msgid_plural ", %d deletions(-)"
250 msgstr[0] ""
251 msgstr[1] ""
252
253 -#: diff.c:3478
253 +#: diff.c:3461
254 #, c-format
255 msgid ""
256 "Failed to parse --dirstat/-X option parameter:\n"
@@ -284,44 +284,44 @@ msgstr ""
284 msgid "'%s': short read %s"
285 msgstr ""
286
287 -#: help.c:208
287 +#: help.c:212
288 #, c-format
289 msgid "available git commands in '%s'"
290 msgstr ""
291
292 -#: help.c:215
292 +#: help.c:219
293 msgid "git commands available from elsewhere on your $PATH"
294 msgstr ""
295
296 -#: help.c:271
296 +#: help.c:275
297 #, c-format
298 msgid ""
299 "'%s' appears to be a git command, but we were not\n"
300 "able to execute it. Maybe git-%s is broken?"
301 msgstr ""
302
303 -#: help.c:328
303 +#: help.c:332
304 msgid "Uh oh. Your system reports no Git commands at all."
305 msgstr ""
306
307 -#: help.c:350
307 +#: help.c:354
308 #, c-format
309 msgid ""
310 "WARNING: You called a Git command named '%s', which does not exist.\n"
311 "Continuing under the assumption that you meant '%s'"
312 msgstr ""
313
314 -#: help.c:355
314 +#: help.c:359
315 #, c-format
316 msgid "in %0.1f seconds automatically..."
317 msgstr ""
318
319 -#: help.c:362
319 +#: help.c:366
320 #, c-format
321 msgid "git: '%s' is not a git command. See 'git --help'."
322 msgstr ""
323
324 -#: help.c:366
324 +#: help.c:370
325 msgid ""
326 "\n"
327 "Did you mean this?"
@@ -331,35 +331,35 @@ msgid_plural ""
331 msgstr[0] ""
332 msgstr[1] ""
333
334 -#: parse-options.c:493
334 +#: parse-options.c:494
335 msgid "..."
336 msgstr ""
337
338 -#: parse-options.c:511
338 +#: parse-options.c:512
339 #, c-format
340 msgid "usage: %s"
341 msgstr ""
342
343 #. TRANSLATORS: the colon here should align with the
344 #. one in "usage: %s" translation
345 -#: parse-options.c:515
345 +#: parse-options.c:516
346 #, c-format
347 msgid " or: %s"
348 msgstr ""
349
350 -#: parse-options.c:518
350 +#: parse-options.c:519
351 #, c-format
352 msgid " %s"
353 msgstr ""
354
355 -#: remote.c:1629
355 +#: remote.c:1632
356 #, c-format
357 msgid "Your branch is ahead of '%s' by %d commit.\n"
358 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
359 msgstr[0] ""
360 msgstr[1] ""
361
362 -#: remote.c:1635
362 +#: remote.c:1638
363 #, c-format
364 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
365 msgid_plural ""
@@ -367,7 +367,7 @@ msgid_plural ""
367 msgstr[0] ""
368 msgstr[1] ""
369
370 -#: remote.c:1643
370 +#: remote.c:1646
371 #, c-format
372 msgid ""
373 "Your branch and '%s' have diverged,\n"
@@ -582,7 +582,7 @@ msgstr ""
582 msgid "cannot abort from a branch yet to be born"
583 msgstr ""
584
585 -#: sequencer.c:805 builtin/apply.c:3697
585 +#: sequencer.c:805 builtin/apply.c:3988
586 #, c-format
587 msgid "cannot open %s: %s"
588 msgstr ""
@@ -614,21 +614,21 @@ msgstr ""
614 msgid "Can't cherry-pick into empty head"
615 msgstr ""
616
617 -#: sha1_name.c:864
617 +#: sha1_name.c:1044
618 msgid "HEAD does not point to a branch"
619 msgstr ""
620
621 -#: sha1_name.c:867
621 +#: sha1_name.c:1047
622 #, c-format
623 msgid "No such branch: '%s'"
624 msgstr ""
625
626 -#: sha1_name.c:869
626 +#: sha1_name.c:1049
627 #, c-format
628 msgid "No upstream configured for branch '%s'"
629 msgstr ""
630
631 -#: sha1_name.c:872
631 +#: sha1_name.c:1052
632 #, c-format
633 msgid "Upstream branch '%s' not stored as a remote-tracking branch"
634 msgstr ""
@@ -642,333 +642,333 @@ msgstr ""
642 msgid "no such user"
643 msgstr ""
644
645 -#: wt-status.c:141
645 +#: wt-status.c:140
646 msgid "Unmerged paths:"
647 msgstr ""
648
649 -#: wt-status.c:168 wt-status.c:195
649 +#: wt-status.c:167 wt-status.c:194
650 #, c-format
651 msgid " (use \"git reset %s <file>...\" to unstage)"
652 msgstr ""
653
654 -#: wt-status.c:170 wt-status.c:197
654 +#: wt-status.c:169 wt-status.c:196
655 msgid " (use \"git rm --cached <file>...\" to unstage)"
656 msgstr ""
657
658 -#: wt-status.c:174
658 +#: wt-status.c:173
659 msgid " (use \"git add <file>...\" to mark resolution)"
660 msgstr ""
661
662 -#: wt-status.c:176 wt-status.c:180
662 +#: wt-status.c:175 wt-status.c:179
663 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
664 msgstr ""
665
666 -#: wt-status.c:178
666 +#: wt-status.c:177
667 msgid " (use \"git rm <file>...\" to mark resolution)"
668 msgstr ""
669
670 -#: wt-status.c:189
670 +#: wt-status.c:188
671 msgid "Changes to be committed:"
672 msgstr ""
673
674 -#: wt-status.c:207
674 +#: wt-status.c:206
675 msgid "Changes not staged for commit:"
676 msgstr ""
677
678 -#: wt-status.c:211
678 +#: wt-status.c:210
679 msgid " (use \"git add <file>...\" to update what will be committed)"
680 msgstr ""
681
682 -#: wt-status.c:213
682 +#: wt-status.c:212
683 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
684 msgstr ""
685
686 -#: wt-status.c:214
686 +#: wt-status.c:213
687 msgid ""
688 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
689 msgstr ""
690
691 -#: wt-status.c:216
691 +#: wt-status.c:215
692 msgid " (commit or discard the untracked or modified content in submodules)"
693 msgstr ""
694
695 -#: wt-status.c:225
695 +#: wt-status.c:224
696 #, c-format
697 msgid "%s files:"
698 msgstr ""
699
700 -#: wt-status.c:228
700 +#: wt-status.c:227
701 #, c-format
702 msgid " (use \"git %s <file>...\" to include in what will be committed)"
703 msgstr ""
704
705 -#: wt-status.c:245
705 +#: wt-status.c:244
706 msgid "bug"
707 msgstr ""
708
709 -#: wt-status.c:250
709 +#: wt-status.c:249
710 msgid "both deleted:"
711 msgstr ""
712
713 -#: wt-status.c:251
713 +#: wt-status.c:250
714 msgid "added by us:"
715 msgstr ""
716
717 -#: wt-status.c:252
717 +#: wt-status.c:251
718 msgid "deleted by them:"
719 msgstr ""
720
721 -#: wt-status.c:253
721 +#: wt-status.c:252
722 msgid "added by them:"
723 msgstr ""
724
725 -#: wt-status.c:254
725 +#: wt-status.c:253
726 msgid "deleted by us:"
727 msgstr ""
728
729 -#: wt-status.c:255
729 +#: wt-status.c:254
730 msgid "both added:"
731 msgstr ""
732
733 -#: wt-status.c:256
733 +#: wt-status.c:255
734 msgid "both modified:"
735 msgstr ""
736
737 -#: wt-status.c:286
737 +#: wt-status.c:285
738 msgid "new commits, "
739 msgstr ""
740
741 -#: wt-status.c:288
741 +#: wt-status.c:287
742 msgid "modified content, "
743 msgstr ""
744
745 -#: wt-status.c:290
745 +#: wt-status.c:289
746 msgid "untracked content, "
747 msgstr ""
748
749 -#: wt-status.c:304
749 +#: wt-status.c:303
750 #, c-format
751 msgid "new file: %s"
752 msgstr ""
753
754 -#: wt-status.c:307
754 +#: wt-status.c:306
755 #, c-format
756 msgid "copied: %s -> %s"
757 msgstr ""
758
759 -#: wt-status.c:310
759 +#: wt-status.c:309
760 #, c-format
761 msgid "deleted: %s"
762 msgstr ""
763
764 -#: wt-status.c:313
764 +#: wt-status.c:312
765 #, c-format
766 msgid "modified: %s"
767 msgstr ""
768
769 -#: wt-status.c:316
769 +#: wt-status.c:315
770 #, c-format
771 msgid "renamed: %s -> %s"
772 msgstr ""
773
774 -#: wt-status.c:319
774 +#: wt-status.c:318
775 #, c-format
776 msgid "typechange: %s"
777 msgstr ""
778
779 -#: wt-status.c:322
779 +#: wt-status.c:321
780 #, c-format
781 msgid "unknown: %s"
782 msgstr ""
783
784 -#: wt-status.c:325
784 +#: wt-status.c:324
785 #, c-format
786 msgid "unmerged: %s"
787 msgstr ""
788
789 -#: wt-status.c:328
789 +#: wt-status.c:327
790 #, c-format
791 msgid "bug: unhandled diff status %c"
792 msgstr ""
793
794 -#: wt-status.c:786
794 +#: wt-status.c:785
795 msgid "You have unmerged paths."
796 msgstr ""
797
798 -#: wt-status.c:789 wt-status.c:913
798 +#: wt-status.c:788 wt-status.c:912
799 msgid " (fix conflicts and run \"git commit\")"
800 msgstr ""
801
802 -#: wt-status.c:792
802 +#: wt-status.c:791
803 msgid "All conflicts fixed but you are still merging."
804 msgstr ""
805
806 -#: wt-status.c:795
806 +#: wt-status.c:794
807 msgid " (use \"git commit\" to conclude merge)"
808 msgstr ""
809
810 -#: wt-status.c:805
810 +#: wt-status.c:804
811 msgid "You are in the middle of an am session."
812 msgstr ""
813
814 -#: wt-status.c:808
814 +#: wt-status.c:807
815 msgid "The current patch is empty."
816 msgstr ""
817
818 -#: wt-status.c:812
818 +#: wt-status.c:811
819 msgid " (fix conflicts and then run \"git am --resolved\")"
820 msgstr ""
821
822 -#: wt-status.c:814
822 +#: wt-status.c:813
823 msgid " (use \"git am --skip\" to skip this patch)"
824 msgstr ""
825
826 -#: wt-status.c:816
826 +#: wt-status.c:815
827 msgid " (use \"git am --abort\" to restore the original branch)"
828 msgstr ""
829
830 -#: wt-status.c:874 wt-status.c:884
830 +#: wt-status.c:873 wt-status.c:883
831 msgid "You are currently rebasing."
832 msgstr ""
833
834 -#: wt-status.c:877
834 +#: wt-status.c:876
835 msgid " (fix conflicts and then run \"git rebase --continue\")"
836 msgstr ""
837
838 -#: wt-status.c:879
838 +#: wt-status.c:878
839 msgid " (use \"git rebase --skip\" to skip this patch)"
840 msgstr ""
841
842 -#: wt-status.c:881
842 +#: wt-status.c:880
843 msgid " (use \"git rebase --abort\" to check out the original branch)"
844 msgstr ""
845
846 -#: wt-status.c:887
846 +#: wt-status.c:886
847 msgid " (all conflicts fixed: run \"git rebase --continue\")"
848 msgstr ""
849
850 -#: wt-status.c:889
850 +#: wt-status.c:888
851 msgid "You are currently splitting a commit during a rebase."
852 msgstr ""
853
854 -#: wt-status.c:892
854 +#: wt-status.c:891
855 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
856 msgstr ""
857
858 -#: wt-status.c:894
858 +#: wt-status.c:893
859 msgid "You are currently editing a commit during a rebase."
860 msgstr ""
861
862 -#: wt-status.c:897
862 +#: wt-status.c:896
863 msgid " (use \"git commit --amend\" to amend the current commit)"
864 msgstr ""
865
866 -#: wt-status.c:899
866 +#: wt-status.c:898
867 msgid ""
868 " (use \"git rebase --continue\" once you are satisfied with your changes)"
869 msgstr ""
870
871 -#: wt-status.c:909
871 +#: wt-status.c:908
872 msgid "You are currently cherry-picking."
873 msgstr ""
874
875 -#: wt-status.c:916
875 +#: wt-status.c:915
876 msgid " (all conflicts fixed: run \"git commit\")"
877 msgstr ""
878
879 -#: wt-status.c:925
879 +#: wt-status.c:924
880 msgid "You are currently bisecting."
881 msgstr ""
882
883 -#: wt-status.c:928
883 +#: wt-status.c:927
884 msgid " (use \"git bisect reset\" to get back to the original branch)"
885 msgstr ""
886
887 -#: wt-status.c:979
887 +#: wt-status.c:978
888 msgid "On branch "
889 msgstr ""
890
891 -#: wt-status.c:986
891 +#: wt-status.c:985
892 msgid "Not currently on any branch."
893 msgstr ""
894
895 -#: wt-status.c:998
895 +#: wt-status.c:997
896 msgid "Initial commit"
897 msgstr ""
898
899 -#: wt-status.c:1012
899 +#: wt-status.c:1011
900 msgid "Untracked"
901 msgstr ""
902
903 -#: wt-status.c:1014
903 +#: wt-status.c:1013
904 msgid "Ignored"
905 msgstr ""
906
907 -#: wt-status.c:1016
907 +#: wt-status.c:1015
908 #, c-format
909 msgid "Untracked files not listed%s"
910 msgstr ""
911
912 -#: wt-status.c:1018
912 +#: wt-status.c:1017
913 msgid " (use -u option to show untracked files)"
914 msgstr ""
915
916 -#: wt-status.c:1024
916 +#: wt-status.c:1023
917 msgid "No changes"
918 msgstr ""
919
920 -#: wt-status.c:1028
920 +#: wt-status.c:1027
921 #, c-format
922 msgid "no changes added to commit%s\n"
923 msgstr ""
924
925 -#: wt-status.c:1030
925 +#: wt-status.c:1029
926 msgid " (use \"git add\" and/or \"git commit -a\")"
927 msgstr ""
928
929 -#: wt-status.c:1032
929 +#: wt-status.c:1031
930 #, c-format
931 msgid "nothing added to commit but untracked files present%s\n"
932 msgstr ""
933
934 -#: wt-status.c:1034
934 +#: wt-status.c:1033
935 msgid " (use \"git add\" to track)"
936 msgstr ""
937
938 -#: wt-status.c:1036 wt-status.c:1039 wt-status.c:1042
938 +#: wt-status.c:1035 wt-status.c:1038 wt-status.c:1041
939 #, c-format
940 msgid "nothing to commit%s\n"
941 msgstr ""
942
943 -#: wt-status.c:1037
943 +#: wt-status.c:1036
944 msgid " (create/copy files and use \"git add\" to track)"
945 msgstr ""
946
947 -#: wt-status.c:1040
947 +#: wt-status.c:1039
948 msgid " (use -u to show untracked files)"
949 msgstr ""
950
951 -#: wt-status.c:1043
951 +#: wt-status.c:1042
952 msgid " (working directory clean)"
953 msgstr ""
954
955 -#: wt-status.c:1151
955 +#: wt-status.c:1150
956 msgid "HEAD (no branch)"
957 msgstr ""
958
959 -#: wt-status.c:1157
959 +#: wt-status.c:1156
960 msgid "Initial commit on "
961 msgstr ""
962
963 -#: wt-status.c:1172
963 +#: wt-status.c:1171
964 msgid "behind "
965 msgstr ""
966
967 -#: wt-status.c:1175 wt-status.c:1178
967 +#: wt-status.c:1174 wt-status.c:1177
968 msgid "ahead "
969 msgstr ""
970
971 -#: wt-status.c:1180
971 +#: wt-status.c:1179
972 msgid ", behind "
973 msgstr ""
974
@@ -977,7 +977,7 @@ msgstr ""
977 msgid "unexpected diff status %c"
978 msgstr ""
979
980 -#: builtin/add.c:67 builtin/commit.c:226
980 +#: builtin/add.c:67 builtin/commit.c:229
981 msgid "updating files failed"
982 msgstr ""
983
@@ -1067,75 +1067,75 @@ msgstr ""
1067 msgid "Maybe you wanted to say 'git add .'?\n"
1068 msgstr ""
1069
1070 -#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:286 builtin/mv.c:82
1070 +#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82
1071 #: builtin/rm.c:162
1072 msgid "index file corrupt"
1073 msgstr ""
1074
1075 -#: builtin/add.c:480 builtin/apply.c:4108 builtin/mv.c:229 builtin/rm.c:260
1075 +#: builtin/add.c:480 builtin/apply.c:4433 builtin/mv.c:229 builtin/rm.c:260
1076 msgid "Unable to write new index file"
1077 msgstr ""
1078
1079 -#: builtin/apply.c:53
1079 +#: builtin/apply.c:57
1080 msgid "git apply [options] [<patch>...]"
1081 msgstr ""
1082
1083 -#: builtin/apply.c:106
1083 +#: builtin/apply.c:110
1084 #, c-format
1085 msgid "unrecognized whitespace option '%s'"
1086 msgstr ""
1087
1088 -#: builtin/apply.c:121
1088 +#: builtin/apply.c:125
1089 #, c-format
1090 msgid "unrecognized whitespace ignore option '%s'"
1091 msgstr ""
1092
1093 -#: builtin/apply.c:815
1093 +#: builtin/apply.c:824
1094 #, c-format
1095 msgid "Cannot prepare timestamp regexp %s"
1096 msgstr ""
1097
1098 -#: builtin/apply.c:824
1098 +#: builtin/apply.c:833
1099 #, c-format
1100 msgid "regexec returned %d for input: %s"
1101 msgstr ""
1102
1103 -#: builtin/apply.c:905
1103 +#: builtin/apply.c:914
1104 #, c-format
1105 msgid "unable to find filename in patch at line %d"
1106 msgstr ""
1107
1108 -#: builtin/apply.c:937
1108 +#: builtin/apply.c:946
1109 #, c-format
1110 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1111 msgstr ""
1112
1113 -#: builtin/apply.c:941
1113 +#: builtin/apply.c:950
1114 #, c-format
1115 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1116 msgstr ""
1117
1118 -#: builtin/apply.c:942
1118 +#: builtin/apply.c:951
1119 #, c-format
1120 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1121 msgstr ""
1122
1123 -#: builtin/apply.c:949
1123 +#: builtin/apply.c:958
1124 #, c-format
1125 msgid "git apply: bad git-diff - expected /dev/null on line %d"
1126 msgstr ""
1127
1128 -#: builtin/apply.c:1394
1128 +#: builtin/apply.c:1403
1129 #, c-format
1130 msgid "recount: unexpected line: %.*s"
1131 msgstr ""
1132
1133 -#: builtin/apply.c:1451
1133 +#: builtin/apply.c:1460
1134 #, c-format
1135 msgid "patch fragment without header at line %d: %.*s"
1136 msgstr ""
1137
1138 -#: builtin/apply.c:1468
1138 +#: builtin/apply.c:1477
1139 #, c-format
1140 msgid ""
1141 "git diff header lacks filename information when removing %d leading pathname "
@@ -1146,395 +1146,403 @@ msgid_plural ""
1146 msgstr[0] ""
1147 msgstr[1] ""
1148
1149 -#: builtin/apply.c:1628
1149 +#: builtin/apply.c:1637
1150 msgid "new file depends on old contents"
1151 msgstr ""
1152
1153 -#: builtin/apply.c:1630
1153 +#: builtin/apply.c:1639
1154 msgid "deleted file still has contents"
1155 msgstr ""
1156
1157 -#: builtin/apply.c:1656
1157 +#: builtin/apply.c:1665
1158 #, c-format
1159 msgid "corrupt patch at line %d"
1160 msgstr ""
1161
1162 -#: builtin/apply.c:1692
1162 +#: builtin/apply.c:1701
1163 #, c-format
1164 msgid "new file %s depends on old contents"
1165 msgstr ""
1166
1167 -#: builtin/apply.c:1694
1167 +#: builtin/apply.c:1703
1168 #, c-format
1169 msgid "deleted file %s still has contents"
1170 msgstr ""
1171
1172 -#: builtin/apply.c:1697
1172 +#: builtin/apply.c:1706
1173 #, c-format
1174 msgid "** warning: file %s becomes empty but is not deleted"
1175 msgstr ""
1176
1177 -#: builtin/apply.c:1843
1177 +#: builtin/apply.c:1852
1178 #, c-format
1179 msgid "corrupt binary patch at line %d: %.*s"
1180 msgstr ""
1181
1182 #. there has to be one hunk (forward hunk)
1183 -#: builtin/apply.c:1872
1183 +#: builtin/apply.c:1881
1184 #, c-format
1185 msgid "unrecognized binary patch at line %d"
1186 msgstr ""
1187
1188 -#: builtin/apply.c:1958
1188 +#: builtin/apply.c:1967
1189 #, c-format
1190 msgid "patch with only garbage at line %d"
1191 msgstr ""
1192
1193 -#: builtin/apply.c:2048
1193 +#: builtin/apply.c:2057
1194 #, c-format
1195 msgid "unable to read symlink %s"
1196 msgstr ""
1197
1198 -#: builtin/apply.c:2052
1198 +#: builtin/apply.c:2061
1199 #, c-format
1200 msgid "unable to open or read %s"
1201 msgstr ""
1202
1203 -#: builtin/apply.c:2123
1203 +#: builtin/apply.c:2132
1204 msgid "oops"
1205 msgstr ""
1206
1207 -#: builtin/apply.c:2645
1207 +#: builtin/apply.c:2654
1208 #, c-format
1209 msgid "invalid start of line: '%c'"
1210 msgstr ""
1211
1212 -#: builtin/apply.c:2763
1212 +#: builtin/apply.c:2772
1213 #, c-format
1214 msgid "Hunk #%d succeeded at %d (offset %d line)."
1215 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1216 msgstr[0] ""
1217 msgstr[1] ""
1218
1219 -#: builtin/apply.c:2775
1219 +#: builtin/apply.c:2784
1220 #, c-format
1221 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1222 msgstr ""
1223
1224 -#: builtin/apply.c:2781
1224 +#: builtin/apply.c:2790
1225 #, c-format
1226 msgid ""
1227 "while searching for:\n"
1228 "%.*s"
1229 msgstr ""
1230
1231 -#: builtin/apply.c:2800
1231 +#: builtin/apply.c:2809
1232 #, c-format
1233 msgid "missing binary patch data for '%s'"
1234 msgstr ""
1235
1236 -#: builtin/apply.c:2903
1236 +#: builtin/apply.c:2912
1237 #, c-format
1238 msgid "binary patch does not apply to '%s'"
1239 msgstr ""
1240
1241 -#: builtin/apply.c:2909
1241 +#: builtin/apply.c:2918
1242 #, c-format
1243 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1244 msgstr ""
1245
1246 -#: builtin/apply.c:2930
1246 +#: builtin/apply.c:2939
1247 #, c-format
1248 msgid "patch failed: %s:%ld"
1249 msgstr ""
1250
1251 -#: builtin/apply.c:3045
1251 +#: builtin/apply.c:3061
1252 #, c-format
1253 -msgid "patch %s has been renamed/deleted"
1253 +msgid "cannot checkout %s"
1254 msgstr ""
1255
1256 -#: builtin/apply.c:3052 builtin/apply.c:3069
1256 +#: builtin/apply.c:3106 builtin/apply.c:3115 builtin/apply.c:3159
1257 #, c-format
1258 msgid "read of %s failed"
1259 msgstr ""
1260
1261 -#: builtin/apply.c:3084
1262 -msgid "removal patch leaves file contents"
1263 -msgstr ""
1264 -
1265 -#: builtin/apply.c:3105
1261 +#: builtin/apply.c:3139 builtin/apply.c:3361
1262 #, c-format
1267 -msgid "%s: already exists in working directory"
1263 +msgid "path %s has been renamed/deleted"
1264 msgstr ""
1265
1270 -#: builtin/apply.c:3143
1266 +#: builtin/apply.c:3220 builtin/apply.c:3375
1267 #, c-format
1272 -msgid "%s: has been deleted/renamed"
1268 +msgid "%s: does not exist in index"
1269 msgstr ""
1270
1275 -#: builtin/apply.c:3148 builtin/apply.c:3179
1271 +#: builtin/apply.c:3224 builtin/apply.c:3367 builtin/apply.c:3389
1272 #, c-format
1273 msgid "%s: %s"
1274 msgstr ""
1275
1280 -#: builtin/apply.c:3159
1276 +#: builtin/apply.c:3229 builtin/apply.c:3383
1277 #, c-format
1282 -msgid "%s: does not exist in index"
1278 +msgid "%s: does not match index"
1279 msgstr ""
1280
1285 -#: builtin/apply.c:3173
1286 -#, c-format
1287 -msgid "%s: does not match index"
1281 +#: builtin/apply.c:3331
1282 +msgid "removal patch leaves file contents"
1283 msgstr ""
1284
1290 -#: builtin/apply.c:3190
1285 +#: builtin/apply.c:3400
1286 #, c-format
1287 msgid "%s: wrong type"
1288 msgstr ""
1289
1295 -#: builtin/apply.c:3192
1290 +#: builtin/apply.c:3402
1291 #, c-format
1292 msgid "%s has type %o, expected %o"
1293 msgstr ""
1294
1300 -#: builtin/apply.c:3247
1295 +#: builtin/apply.c:3503
1296 #, c-format
1297 msgid "%s: already exists in index"
1298 msgstr ""
1299
1305 -#: builtin/apply.c:3267
1300 +#: builtin/apply.c:3506
1301 +#, c-format
1302 +msgid "%s: already exists in working directory"
1303 +msgstr ""
1304 +
1305 +#: builtin/apply.c:3526
1306 #, c-format
1307 msgid "new mode (%o) of %s does not match old mode (%o)"
1308 msgstr ""
1309
1310 -#: builtin/apply.c:3272
1310 +#: builtin/apply.c:3531
1311 #, c-format
1312 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1313 msgstr ""
1314
1315 -#: builtin/apply.c:3280
1315 +#: builtin/apply.c:3539
1316 #, c-format
1317 msgid "%s: patch does not apply"
1318 msgstr ""
1319
1320 -#: builtin/apply.c:3293
1320 +#: builtin/apply.c:3552
1321 #, c-format
1322 msgid "Checking patch %s..."
1323 msgstr ""
1324
1325 -#: builtin/apply.c:3348 builtin/checkout.c:212 builtin/reset.c:158
1325 +#: builtin/apply.c:3607 builtin/checkout.c:213 builtin/reset.c:158
1326 #, c-format
1327 msgid "make_cache_entry failed for path '%s'"
1328 msgstr ""
1329
1330 -#: builtin/apply.c:3491
1330 +#: builtin/apply.c:3750
1331 #, c-format
1332 msgid "unable to remove %s from index"
1333 msgstr ""
1334
1335 -#: builtin/apply.c:3518
1335 +#: builtin/apply.c:3778
1336 #, c-format
1337 msgid "corrupt patch for subproject %s"
1338 msgstr ""
1339
1340 -#: builtin/apply.c:3522
1340 +#: builtin/apply.c:3782
1341 #, c-format
1342 msgid "unable to stat newly created file '%s'"
1343 msgstr ""
1344
1345 -#: builtin/apply.c:3527
1345 +#: builtin/apply.c:3787
1346 #, c-format
1347 msgid "unable to create backing store for newly created file %s"
1348 msgstr ""
1349
1350 -#: builtin/apply.c:3530
1350 +#: builtin/apply.c:3790 builtin/apply.c:3898
1351 #, c-format
1352 msgid "unable to add cache entry for %s"
1353 msgstr ""
1354
1355 -#: builtin/apply.c:3563
1355 +#: builtin/apply.c:3823
1356 #, c-format
1357 msgid "closing file '%s'"
1358 msgstr ""
1359
1360 -#: builtin/apply.c:3612
1360 +#: builtin/apply.c:3872
1361 #, c-format
1362 msgid "unable to write file '%s' mode %o"
1363 msgstr ""
1364
1365 -#: builtin/apply.c:3668
1365 +#: builtin/apply.c:3959
1366 #, c-format
1367 msgid "Applied patch %s cleanly."
1368 msgstr ""
1369
1370 -#: builtin/apply.c:3676
1370 +#: builtin/apply.c:3967
1371 msgid "internal error"
1372 msgstr ""
1373
1374 #. Say this even without --verbose
1375 -#: builtin/apply.c:3679
1375 +#: builtin/apply.c:3970
1376 #, c-format
1377 msgid "Applying patch %%s with %d reject..."
1378 msgid_plural "Applying patch %%s with %d rejects..."
1379 msgstr[0] ""
1380 msgstr[1] ""
1381
1382 -#: builtin/apply.c:3689
1382 +#: builtin/apply.c:3980
1383 #, c-format
1384 msgid "truncating .rej filename to %.*s.rej"
1385 msgstr ""
1386
1387 -#: builtin/apply.c:3710
1387 +#: builtin/apply.c:4001
1388 #, c-format
1389 msgid "Hunk #%d applied cleanly."
1390 msgstr ""
1391
1392 -#: builtin/apply.c:3713
1392 +#: builtin/apply.c:4004
1393 #, c-format
1394 msgid "Rejected hunk #%d."
1395 msgstr ""
1396
1397 -#: builtin/apply.c:3844
1397 +#: builtin/apply.c:4154
1398 msgid "unrecognized input"
1399 msgstr ""
1400
1401 -#: builtin/apply.c:3855
1401 +#: builtin/apply.c:4165
1402 msgid "unable to read index file"
1403 msgstr ""
1404
1405 -#: builtin/apply.c:3970 builtin/apply.c:3973
1405 +#: builtin/apply.c:4284 builtin/apply.c:4287
1406 msgid "path"
1407 msgstr ""
1408
1409 -#: builtin/apply.c:3971
1409 +#: builtin/apply.c:4285
1410 msgid "don't apply changes matching the given path"
1411 msgstr ""
1412
1413 -#: builtin/apply.c:3974
1413 +#: builtin/apply.c:4288
1414 msgid "apply changes matching the given path"
1415 msgstr ""
1416
1417 -#: builtin/apply.c:3976
1417 +#: builtin/apply.c:4290
1418 msgid "num"
1419 msgstr ""
1420
1421 -#: builtin/apply.c:3977
1421 +#: builtin/apply.c:4291
1422 msgid "remove <num> leading slashes from traditional diff paths"
1423 msgstr ""
1424
1425 -#: builtin/apply.c:3980
1425 +#: builtin/apply.c:4294
1426 msgid "ignore additions made by the patch"
1427 msgstr ""
1428
1429 -#: builtin/apply.c:3982
1429 +#: builtin/apply.c:4296
1430 msgid "instead of applying the patch, output diffstat for the input"
1431 msgstr ""
1432
1433 -#: builtin/apply.c:3986
1433 +#: builtin/apply.c:4300
1434 msgid "shows number of added and deleted lines in decimal notation"
1435 msgstr ""
1436
1437 -#: builtin/apply.c:3988
1437 +#: builtin/apply.c:4302
1438 msgid "instead of applying the patch, output a summary for the input"
1439 msgstr ""
1440
1441 -#: builtin/apply.c:3990
1441 +#: builtin/apply.c:4304
1442 msgid "instead of applying the patch, see if the patch is applicable"
1443 msgstr ""
1444
1445 -#: builtin/apply.c:3992
1445 +#: builtin/apply.c:4306
1446 msgid "make sure the patch is applicable to the current index"
1447 msgstr ""
1448
1449 -#: builtin/apply.c:3994
1449 +#: builtin/apply.c:4308
1450 msgid "apply a patch without touching the working tree"
1451 msgstr ""
1452
1453 -#: builtin/apply.c:3996
1453 +#: builtin/apply.c:4310
1454 msgid "also apply the patch (use with --stat/--summary/--check)"
1455 msgstr ""
1456
1457 -#: builtin/apply.c:3998
1457 +#: builtin/apply.c:4312
1458 +msgid "attempt three-way merge if a patch does not apply"
1459 +msgstr ""
1460 +
1461 +#: builtin/apply.c:4314
1462 msgid "build a temporary index based on embedded index information"
1463 msgstr ""
1464
1461 -#: builtin/apply.c:4000
1465 +#: builtin/apply.c:4316
1466 msgid "paths are separated with NUL character"
1467 msgstr ""
1468
1465 -#: builtin/apply.c:4003
1469 +#: builtin/apply.c:4319
1470 msgid "ensure at least <n> lines of context match"
1471 msgstr ""
1472
1469 -#: builtin/apply.c:4004
1473 +#: builtin/apply.c:4320
1474 msgid "action"
1475 msgstr ""
1476
1473 -#: builtin/apply.c:4005
1477 +#: builtin/apply.c:4321
1478 msgid "detect new or modified lines that have whitespace errors"
1479 msgstr ""
1480
1477 -#: builtin/apply.c:4008 builtin/apply.c:4011
1481 +#: builtin/apply.c:4324 builtin/apply.c:4327
1482 msgid "ignore changes in whitespace when finding context"
1483 msgstr ""
1484
1481 -#: builtin/apply.c:4014
1485 +#: builtin/apply.c:4330
1486 msgid "apply the patch in reverse"
1487 msgstr ""
1488
1485 -#: builtin/apply.c:4016
1489 +#: builtin/apply.c:4332
1490 msgid "don't expect at least one line of context"
1491 msgstr ""
1492
1489 -#: builtin/apply.c:4018
1493 +#: builtin/apply.c:4334
1494 msgid "leave the rejected hunks in corresponding *.rej files"
1495 msgstr ""
1496
1493 -#: builtin/apply.c:4020
1497 +#: builtin/apply.c:4336
1498 msgid "allow overlapping hunks"
1499 msgstr ""
1500
1497 -#: builtin/apply.c:4021
1501 +#: builtin/apply.c:4337
1502 msgid "be verbose"
1503 msgstr ""
1504
1501 -#: builtin/apply.c:4023
1505 +#: builtin/apply.c:4339
1506 msgid "tolerate incorrectly detected missing new-line at the end of file"
1507 msgstr ""
1508
1505 -#: builtin/apply.c:4026
1509 +#: builtin/apply.c:4342
1510 msgid "do not trust the line counts in the hunk headers"
1511 msgstr ""
1512
1509 -#: builtin/apply.c:4028
1513 +#: builtin/apply.c:4344
1514 msgid "root"
1515 msgstr ""
1516
1513 -#: builtin/apply.c:4029
1517 +#: builtin/apply.c:4345
1518 msgid "prepend <root> to all filenames"
1519 msgstr ""
1520
1517 -#: builtin/apply.c:4050
1521 +#: builtin/apply.c:4367
1522 +msgid "--3way outside a repository"
1523 +msgstr ""
1524 +
1525 +#: builtin/apply.c:4375
1526 msgid "--index outside a repository"
1527 msgstr ""
1528
1521 -#: builtin/apply.c:4053
1529 +#: builtin/apply.c:4378
1530 msgid "--cached outside a repository"
1531 msgstr ""
1532
1525 -#: builtin/apply.c:4069
1533 +#: builtin/apply.c:4394
1534 #, c-format
1535 msgid "can't open patch '%s'"
1536 msgstr ""
1537
1530 -#: builtin/apply.c:4083
1538 +#: builtin/apply.c:4408
1539 #, c-format
1540 msgid "squelched %d whitespace error"
1541 msgid_plural "squelched %d whitespace errors"
1542 msgstr[0] ""
1543 msgstr[1] ""
1544
1537 -#: builtin/apply.c:4089 builtin/apply.c:4099
1545 +#: builtin/apply.c:4414 builtin/apply.c:4424
1546 #, c-format
1547 msgid "%d line adds whitespace errors."
1548 msgid_plural "%d lines add whitespace errors."
@@ -1733,7 +1741,7 @@ msgstr ""
1741 msgid "Failed to resolve HEAD as a valid ref."
1742 msgstr ""
1743
1736 -#: builtin/branch.c:788 builtin/clone.c:558
1744 +#: builtin/branch.c:788 builtin/clone.c:561
1745 msgid "HEAD not found below refs/heads!"
1746 msgstr ""
1747
@@ -1758,99 +1766,99 @@ msgstr ""
1766 msgid "Need a repository to unbundle."
1767 msgstr ""
1768
1761 -#: builtin/checkout.c:113 builtin/checkout.c:146
1769 +#: builtin/checkout.c:114 builtin/checkout.c:147
1770 #, c-format
1771 msgid "path '%s' does not have our version"
1772 msgstr ""
1773
1766 -#: builtin/checkout.c:115 builtin/checkout.c:148
1774 +#: builtin/checkout.c:116 builtin/checkout.c:149
1775 #, c-format
1776 msgid "path '%s' does not have their version"
1777 msgstr ""
1778
1771 -#: builtin/checkout.c:131
1779 +#: builtin/checkout.c:132
1780 #, c-format
1781 msgid "path '%s' does not have all necessary versions"
1782 msgstr ""
1783
1776 -#: builtin/checkout.c:175
1784 +#: builtin/checkout.c:176
1785 #, c-format
1786 msgid "path '%s' does not have necessary versions"
1787 msgstr ""
1788
1781 -#: builtin/checkout.c:192
1789 +#: builtin/checkout.c:193
1790 #, c-format
1791 msgid "path '%s': cannot merge"
1792 msgstr ""
1793
1786 -#: builtin/checkout.c:209
1794 +#: builtin/checkout.c:210
1795 #, c-format
1796 msgid "Unable to add merge result for '%s'"
1797 msgstr ""
1798
1791 -#: builtin/checkout.c:234 builtin/checkout.c:392
1799 +#: builtin/checkout.c:235 builtin/checkout.c:393
1800 msgid "corrupt index file"
1801 msgstr ""
1802
1795 -#: builtin/checkout.c:264 builtin/checkout.c:271
1803 +#: builtin/checkout.c:265 builtin/checkout.c:272
1804 #, c-format
1805 msgid "path '%s' is unmerged"
1806 msgstr ""
1807
1800 -#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583
1808 +#: builtin/checkout.c:303 builtin/checkout.c:499 builtin/clone.c:586
1809 #: builtin/merge.c:812
1810 msgid "unable to write new index file"
1811 msgstr ""
1812
1805 -#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408
1813 +#: builtin/checkout.c:320 builtin/diff.c:302 builtin/merge.c:408
1814 msgid "diff_setup_done failed"
1815 msgstr ""
1816
1809 -#: builtin/checkout.c:414
1817 +#: builtin/checkout.c:415
1818 msgid "you need to resolve your current index first"
1819 msgstr ""
1820
1813 -#: builtin/checkout.c:533
1821 +#: builtin/checkout.c:534
1822 #, c-format
1823 msgid "Can not do reflog for '%s'\n"
1824 msgstr ""
1825
1818 -#: builtin/checkout.c:566
1826 +#: builtin/checkout.c:567
1827 msgid "HEAD is now at"
1828 msgstr ""
1829
1822 -#: builtin/checkout.c:573
1830 +#: builtin/checkout.c:574
1831 #, c-format
1832 msgid "Reset branch '%s'\n"
1833 msgstr ""
1834
1827 -#: builtin/checkout.c:576
1835 +#: builtin/checkout.c:577
1836 #, c-format
1837 msgid "Already on '%s'\n"
1838 msgstr ""
1839
1832 -#: builtin/checkout.c:580
1840 +#: builtin/checkout.c:581
1841 #, c-format
1842 msgid "Switched to and reset branch '%s'\n"
1843 msgstr ""
1844
1837 -#: builtin/checkout.c:582
1845 +#: builtin/checkout.c:583
1846 #, c-format
1847 msgid "Switched to a new branch '%s'\n"
1848 msgstr ""
1849
1842 -#: builtin/checkout.c:584
1850 +#: builtin/checkout.c:585
1851 #, c-format
1852 msgid "Switched to branch '%s'\n"
1853 msgstr ""
1854
1847 -#: builtin/checkout.c:640
1855 +#: builtin/checkout.c:641
1856 #, c-format
1857 msgid " ... and %d more.\n"
1858 msgstr ""
1859
1860 #. The singular version
1853 -#: builtin/checkout.c:646
1861 +#: builtin/checkout.c:647
1862 #, c-format
1863 msgid ""
1864 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -1865,7 +1873,7 @@ msgid_plural ""
1873 msgstr[0] ""
1874 msgstr[1] ""
1875
1868 -#: builtin/checkout.c:664
1876 +#: builtin/checkout.c:665
1877 #, c-format
1878 msgid ""
1879 "If you want to keep them by creating a new branch, this may be a good time\n"
@@ -1875,96 +1883,96 @@ msgid ""
1883 "\n"
1884 msgstr ""
1885
1878 -#: builtin/checkout.c:694
1886 +#: builtin/checkout.c:695
1887 msgid "internal error in revision walk"
1888 msgstr ""
1889
1882 -#: builtin/checkout.c:698
1890 +#: builtin/checkout.c:699
1891 msgid "Previous HEAD position was"
1892 msgstr ""
1893
1886 -#: builtin/checkout.c:724
1894 +#: builtin/checkout.c:725 builtin/checkout.c:920
1895 msgid "You are on a branch yet to be born"
1896 msgstr ""
1897
1898 #. case (1)
1891 -#: builtin/checkout.c:855
1899 +#: builtin/checkout.c:856
1900 #, c-format
1901 msgid "invalid reference: %s"
1902 msgstr ""
1903
1904 #. case (1): want a tree
1897 -#: builtin/checkout.c:894
1905 +#: builtin/checkout.c:895
1906 #, c-format
1907 msgid "reference is not a tree: %s"
1908 msgstr ""
1909
1902 -#: builtin/checkout.c:974
1910 +#: builtin/checkout.c:977
1911 msgid "-B cannot be used with -b"
1912 msgstr ""
1913
1906 -#: builtin/checkout.c:983
1914 +#: builtin/checkout.c:986
1915 msgid "--patch is incompatible with all other options"
1916 msgstr ""
1917
1910 -#: builtin/checkout.c:986
1918 +#: builtin/checkout.c:989
1919 msgid "--detach cannot be used with -b/-B/--orphan"
1920 msgstr ""
1921
1914 -#: builtin/checkout.c:988
1922 +#: builtin/checkout.c:991
1923 msgid "--detach cannot be used with -t"
1924 msgstr ""
1925
1918 -#: builtin/checkout.c:994
1926 +#: builtin/checkout.c:997
1927 msgid "--track needs a branch name"
1928 msgstr ""
1929
1922 -#: builtin/checkout.c:1001
1930 +#: builtin/checkout.c:1004
1931 msgid "Missing branch name; try -b"
1932 msgstr ""
1933
1926 -#: builtin/checkout.c:1007
1934 +#: builtin/checkout.c:1010
1935 msgid "--orphan and -b|-B are mutually exclusive"
1936 msgstr ""
1937
1930 -#: builtin/checkout.c:1009
1938 +#: builtin/checkout.c:1012
1939 msgid "--orphan cannot be used with -t"
1940 msgstr ""
1941
1934 -#: builtin/checkout.c:1019
1942 +#: builtin/checkout.c:1022
1943 msgid "git checkout: -f and -m are incompatible"
1944 msgstr ""
1945
1938 -#: builtin/checkout.c:1053
1946 +#: builtin/checkout.c:1056
1947 msgid "invalid path specification"
1948 msgstr ""
1949
1942 -#: builtin/checkout.c:1061
1950 +#: builtin/checkout.c:1064
1951 #, c-format
1952 msgid ""
1953 "git checkout: updating paths is incompatible with switching branches.\n"
1954 "Did you intend to checkout '%s' which can not be resolved as commit?"
1955 msgstr ""
1956
1949 -#: builtin/checkout.c:1063
1957 +#: builtin/checkout.c:1066
1958 msgid "git checkout: updating paths is incompatible with switching branches."
1959 msgstr ""
1960
1953 -#: builtin/checkout.c:1068
1961 +#: builtin/checkout.c:1071
1962 msgid "git checkout: --detach does not take a path argument"
1963 msgstr ""
1964
1957 -#: builtin/checkout.c:1071
1965 +#: builtin/checkout.c:1074
1966 msgid ""
1967 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
1968 "checking out of the index."
1969 msgstr ""
1970
1963 -#: builtin/checkout.c:1090
1971 +#: builtin/checkout.c:1093
1972 msgid "Cannot switch branch to a non-commit."
1973 msgstr ""
1974
1967 -#: builtin/checkout.c:1093
1975 +#: builtin/checkout.c:1096
1976 msgid "--ours/--theirs is incompatible with switching branches."
1977 msgstr ""
1978
@@ -2058,78 +2066,78 @@ msgstr ""
2066 msgid "done.\n"
2067 msgstr ""
2068
2061 -#: builtin/clone.c:440
2069 +#: builtin/clone.c:443
2070 #, c-format
2071 msgid "Could not find remote branch %s to clone."
2072 msgstr ""
2073
2066 -#: builtin/clone.c:549
2074 +#: builtin/clone.c:552
2075 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
2076 msgstr ""
2077
2070 -#: builtin/clone.c:639
2078 +#: builtin/clone.c:642
2079 msgid "Too many arguments."
2080 msgstr ""
2081
2074 -#: builtin/clone.c:643
2082 +#: builtin/clone.c:646
2083 msgid "You must specify a repository to clone."
2084 msgstr ""
2085
2078 -#: builtin/clone.c:654
2086 +#: builtin/clone.c:657
2087 #, c-format
2088 msgid "--bare and --origin %s options are incompatible."
2089 msgstr ""
2090
2083 -#: builtin/clone.c:668
2091 +#: builtin/clone.c:671
2092 #, c-format
2093 msgid "repository '%s' does not exist"
2094 msgstr ""
2095
2088 -#: builtin/clone.c:673
2096 +#: builtin/clone.c:676
2097 msgid "--depth is ignored in local clones; use file:// instead."
2098 msgstr ""
2099
2092 -#: builtin/clone.c:683
2100 +#: builtin/clone.c:686
2101 #, c-format
2102 msgid "destination path '%s' already exists and is not an empty directory."
2103 msgstr ""
2104
2097 -#: builtin/clone.c:693
2105 +#: builtin/clone.c:696
2106 #, c-format
2107 msgid "working tree '%s' already exists."
2108 msgstr ""
2109
2102 -#: builtin/clone.c:706 builtin/clone.c:720
2110 +#: builtin/clone.c:709 builtin/clone.c:723
2111 #, c-format
2112 msgid "could not create leading directories of '%s'"
2113 msgstr ""
2114
2107 -#: builtin/clone.c:709
2115 +#: builtin/clone.c:712
2116 #, c-format
2117 msgid "could not create work tree dir '%s'."
2118 msgstr ""
2119
2112 -#: builtin/clone.c:728
2120 +#: builtin/clone.c:731
2121 #, c-format
2122 msgid "Cloning into bare repository '%s'...\n"
2123 msgstr ""
2124
2117 -#: builtin/clone.c:730
2125 +#: builtin/clone.c:733
2126 #, c-format
2127 msgid "Cloning into '%s'...\n"
2128 msgstr ""
2129
2122 -#: builtin/clone.c:786
2130 +#: builtin/clone.c:789
2131 #, c-format
2132 msgid "Don't know how to clone %s"
2133 msgstr ""
2134
2127 -#: builtin/clone.c:835
2135 +#: builtin/clone.c:838
2136 #, c-format
2137 msgid "Remote branch %s not found in upstream %s"
2138 msgstr ""
2139
2132 -#: builtin/clone.c:842
2140 +#: builtin/clone.c:845
2141 msgid "You appear to have cloned an empty repository."
2142 msgstr ""
2143
@@ -2168,93 +2176,93 @@ msgid ""
2176 "Otherwise, please use 'git reset'\n"
2177 msgstr ""
2178
2171 -#: builtin/commit.c:253
2179 +#: builtin/commit.c:256
2180 msgid "failed to unpack HEAD tree object"
2181 msgstr ""
2182
2175 -#: builtin/commit.c:295
2183 +#: builtin/commit.c:298
2184 msgid "unable to create temporary index"
2185 msgstr ""
2186
2179 -#: builtin/commit.c:301
2187 +#: builtin/commit.c:304
2188 msgid "interactive add failed"
2189 msgstr ""
2190
2183 -#: builtin/commit.c:334 builtin/commit.c:355 builtin/commit.c:405
2191 +#: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408
2192 msgid "unable to write new_index file"
2193 msgstr ""
2194
2187 -#: builtin/commit.c:386
2195 +#: builtin/commit.c:389
2196 msgid "cannot do a partial commit during a merge."
2197 msgstr ""
2198
2191 -#: builtin/commit.c:388
2199 +#: builtin/commit.c:391
2200 msgid "cannot do a partial commit during a cherry-pick."
2201 msgstr ""
2202
2195 -#: builtin/commit.c:398
2203 +#: builtin/commit.c:401
2204 msgid "cannot read the index"
2205 msgstr ""
2206
2199 -#: builtin/commit.c:418
2207 +#: builtin/commit.c:421
2208 msgid "unable to write temporary index file"
2209 msgstr ""
2210
2203 -#: builtin/commit.c:493 builtin/commit.c:499
2211 +#: builtin/commit.c:496 builtin/commit.c:502
2212 #, c-format
2213 msgid "invalid commit: %s"
2214 msgstr ""
2215
2208 -#: builtin/commit.c:522
2216 +#: builtin/commit.c:525
2217 msgid "malformed --author parameter"
2218 msgstr ""
2219
2212 -#: builtin/commit.c:582
2220 +#: builtin/commit.c:585
2221 #, c-format
2222 msgid "Malformed ident string: '%s'"
2223 msgstr ""
2224
2217 -#: builtin/commit.c:620 builtin/commit.c:653 builtin/commit.c:967
2225 +#: builtin/commit.c:623 builtin/commit.c:656 builtin/commit.c:970
2226 #, c-format
2227 msgid "could not lookup commit %s"
2228 msgstr ""
2229
2222 -#: builtin/commit.c:632 builtin/shortlog.c:296
2230 +#: builtin/commit.c:635 builtin/shortlog.c:296
2231 #, c-format
2232 msgid "(reading log message from standard input)\n"
2233 msgstr ""
2234
2227 -#: builtin/commit.c:634
2235 +#: builtin/commit.c:637
2236 msgid "could not read log from standard input"
2237 msgstr ""
2238
2231 -#: builtin/commit.c:638
2239 +#: builtin/commit.c:641
2240 #, c-format
2241 msgid "could not read log file '%s'"
2242 msgstr ""
2243
2236 -#: builtin/commit.c:644
2244 +#: builtin/commit.c:647
2245 msgid "commit has empty message"
2246 msgstr ""
2247
2240 -#: builtin/commit.c:660
2248 +#: builtin/commit.c:663
2249 msgid "could not read MERGE_MSG"
2250 msgstr ""
2251
2244 -#: builtin/commit.c:664
2252 +#: builtin/commit.c:667
2253 msgid "could not read SQUASH_MSG"
2254 msgstr ""
2255
2248 -#: builtin/commit.c:668
2256 +#: builtin/commit.c:671
2257 #, c-format
2258 msgid "could not read '%s'"
2259 msgstr ""
2260
2253 -#: builtin/commit.c:720
2261 +#: builtin/commit.c:723
2262 msgid "could not write commit template"
2263 msgstr ""
2264
2257 -#: builtin/commit.c:731
2265 +#: builtin/commit.c:734
2266 #, c-format
2267 msgid ""
2268 "\n"
@@ -2264,7 +2272,7 @@ msgid ""
2272 "and try again.\n"
2273 msgstr ""
2274
2267 -#: builtin/commit.c:736
2275 +#: builtin/commit.c:739
2276 #, c-format
2277 msgid ""
2278 "\n"
@@ -2274,171 +2282,171 @@ msgid ""
2282 "and try again.\n"
2283 msgstr ""
2284
2277 -#: builtin/commit.c:748
2285 +#: builtin/commit.c:751
2286 msgid ""
2287 "Please enter the commit message for your changes. Lines starting\n"
2288 "with '#' will be ignored, and an empty message aborts the commit.\n"
2289 msgstr ""
2290
2283 -#: builtin/commit.c:753
2291 +#: builtin/commit.c:756
2292 msgid ""
2293 "Please enter the commit message for your changes. Lines starting\n"
2294 "with '#' will be kept; you may remove them yourself if you want to.\n"
2295 "An empty message aborts the commit.\n"
2296 msgstr ""
2297
2290 -#: builtin/commit.c:766
2298 +#: builtin/commit.c:769
2299 #, c-format
2300 msgid "%sAuthor: %s"
2301 msgstr ""
2302
2295 -#: builtin/commit.c:773
2303 +#: builtin/commit.c:776
2304 #, c-format
2305 msgid "%sCommitter: %s"
2306 msgstr ""
2307
2300 -#: builtin/commit.c:793
2308 +#: builtin/commit.c:796
2309 msgid "Cannot read index"
2310 msgstr ""
2311
2304 -#: builtin/commit.c:830
2312 +#: builtin/commit.c:833
2313 msgid "Error building trees"
2314 msgstr ""
2315
2308 -#: builtin/commit.c:845 builtin/tag.c:361
2316 +#: builtin/commit.c:848 builtin/tag.c:361
2317 #, c-format
2318 msgid "Please supply the message using either -m or -F option.\n"
2319 msgstr ""
2320
2313 -#: builtin/commit.c:942
2321 +#: builtin/commit.c:945
2322 #, c-format
2323 msgid "No existing author found with '%s'"
2324 msgstr ""
2325
2318 -#: builtin/commit.c:957 builtin/commit.c:1157
2326 +#: builtin/commit.c:960 builtin/commit.c:1160
2327 #, c-format
2328 msgid "Invalid untracked files mode '%s'"
2329 msgstr ""
2330
2323 -#: builtin/commit.c:997
2331 +#: builtin/commit.c:1000
2332 msgid "Using both --reset-author and --author does not make sense"
2333 msgstr ""
2334
2327 -#: builtin/commit.c:1008
2335 +#: builtin/commit.c:1011
2336 msgid "You have nothing to amend."
2337 msgstr ""
2338
2331 -#: builtin/commit.c:1011
2339 +#: builtin/commit.c:1014
2340 msgid "You are in the middle of a merge -- cannot amend."
2341 msgstr ""
2342
2335 -#: builtin/commit.c:1013
2343 +#: builtin/commit.c:1016
2344 msgid "You are in the middle of a cherry-pick -- cannot amend."
2345 msgstr ""
2346
2339 -#: builtin/commit.c:1016
2347 +#: builtin/commit.c:1019
2348 msgid "Options --squash and --fixup cannot be used together"
2349 msgstr ""
2350
2343 -#: builtin/commit.c:1026
2351 +#: builtin/commit.c:1029
2352 msgid "Only one of -c/-C/-F/--fixup can be used."
2353 msgstr ""
2354
2347 -#: builtin/commit.c:1028
2355 +#: builtin/commit.c:1031
2356 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
2357 msgstr ""
2358
2351 -#: builtin/commit.c:1036
2359 +#: builtin/commit.c:1039
2360 msgid "--reset-author can be used only with -C, -c or --amend."
2361 msgstr ""
2362
2355 -#: builtin/commit.c:1053
2363 +#: builtin/commit.c:1056
2364 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
2365 msgstr ""
2366
2359 -#: builtin/commit.c:1055
2367 +#: builtin/commit.c:1058
2368 msgid "No paths with --include/--only does not make sense."
2369 msgstr ""
2370
2363 -#: builtin/commit.c:1057
2371 +#: builtin/commit.c:1060
2372 msgid "Clever... amending the last one with dirty index."
2373 msgstr ""
2374
2367 -#: builtin/commit.c:1059
2375 +#: builtin/commit.c:1062
2376 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
2377 msgstr ""
2378
2371 -#: builtin/commit.c:1069 builtin/tag.c:577
2379 +#: builtin/commit.c:1072 builtin/tag.c:577
2380 #, c-format
2381 msgid "Invalid cleanup mode %s"
2382 msgstr ""
2383
2376 -#: builtin/commit.c:1074
2384 +#: builtin/commit.c:1077
2385 msgid "Paths with -a does not make sense."
2386 msgstr ""
2387
2380 -#: builtin/commit.c:1257
2388 +#: builtin/commit.c:1260
2389 msgid "couldn't look up newly created commit"
2390 msgstr ""
2391
2384 -#: builtin/commit.c:1259
2392 +#: builtin/commit.c:1262
2393 msgid "could not parse newly created commit"
2394 msgstr ""
2395
2388 -#: builtin/commit.c:1300
2396 +#: builtin/commit.c:1303
2397 msgid "detached HEAD"
2398 msgstr ""
2399
2392 -#: builtin/commit.c:1302
2400 +#: builtin/commit.c:1305
2401 msgid " (root-commit)"
2402 msgstr ""
2403
2396 -#: builtin/commit.c:1446
2404 +#: builtin/commit.c:1449
2405 msgid "could not parse HEAD commit"
2406 msgstr ""
2407
2400 -#: builtin/commit.c:1484 builtin/merge.c:509
2408 +#: builtin/commit.c:1487 builtin/merge.c:509
2409 #, c-format
2410 msgid "could not open '%s' for reading"
2411 msgstr ""
2412
2405 -#: builtin/commit.c:1491
2413 +#: builtin/commit.c:1494
2414 #, c-format
2415 msgid "Corrupt MERGE_HEAD file (%s)"
2416 msgstr ""
2417
2410 -#: builtin/commit.c:1498
2418 +#: builtin/commit.c:1501
2419 msgid "could not read MERGE_MODE"
2420 msgstr ""
2421
2414 -#: builtin/commit.c:1517
2422 +#: builtin/commit.c:1520
2423 #, c-format
2424 msgid "could not read commit message: %s"
2425 msgstr ""
2426
2419 -#: builtin/commit.c:1531
2427 +#: builtin/commit.c:1534
2428 #, c-format
2429 msgid "Aborting commit; you did not edit the message.\n"
2430 msgstr ""
2431
2424 -#: builtin/commit.c:1536
2432 +#: builtin/commit.c:1539
2433 #, c-format
2434 msgid "Aborting commit due to empty commit message.\n"
2435 msgstr ""
2436
2429 -#: builtin/commit.c:1551 builtin/merge.c:936 builtin/merge.c:961
2437 +#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961
2438 msgid "failed to write commit object"
2439 msgstr ""
2440
2433 -#: builtin/commit.c:1572
2441 +#: builtin/commit.c:1575
2442 msgid "cannot lock HEAD ref"
2443 msgstr ""
2444
2437 -#: builtin/commit.c:1576
2445 +#: builtin/commit.c:1579
2446 msgid "cannot update HEAD ref"
2447 msgstr ""
2448
2441 -#: builtin/commit.c:1587
2449 +#: builtin/commit.c:1590
2450 msgid ""
2451 "Repository has been updated, but unable to write\n"
2452 "new_index file. Check that disk is not full or quota is\n"
@@ -2794,71 +2802,66 @@ msgstr ""
2802 msgid "both --cached and trees are given."
2803 msgstr ""
2804
2797 -#: builtin/help.c:63
2805 +#: builtin/help.c:65
2806 #, c-format
2807 msgid "unrecognized help format '%s'"
2808 msgstr ""
2809
2802 -#: builtin/help.c:91
2810 +#: builtin/help.c:93
2811 msgid "Failed to start emacsclient."
2812 msgstr ""
2813
2806 -#: builtin/help.c:104
2814 +#: builtin/help.c:106
2815 msgid "Failed to parse emacsclient version."
2816 msgstr ""
2817
2810 -#: builtin/help.c:112
2818 +#: builtin/help.c:114
2819 #, c-format
2820 msgid "emacsclient version '%d' too old (< 22)."
2821 msgstr ""
2822
2815 -#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
2823 +#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177
2824 #, c-format
2825 msgid "failed to exec '%s': %s"
2826 msgstr ""
2827
2820 -#: builtin/help.c:215
2828 +#: builtin/help.c:217
2829 #, c-format
2830 msgid ""
2831 "'%s': path for unsupported man viewer.\n"
2832 "Please consider using 'man.<tool>.cmd' instead."
2833 msgstr ""
2834
2827 -#: builtin/help.c:227
2835 +#: builtin/help.c:229
2836 #, c-format
2837 msgid ""
2838 "'%s': cmd for supported man viewer.\n"
2839 "Please consider using 'man.<tool>.path' instead."
2840 msgstr ""
2841
2834 -#: builtin/help.c:291
2842 +#: builtin/help.c:299
2843 msgid "The most commonly used git commands are:"
2844 msgstr ""
2845
2838 -#: builtin/help.c:359
2846 +#: builtin/help.c:367
2847 #, c-format
2848 msgid "'%s': unknown man viewer."
2849 msgstr ""
2850
2843 -#: builtin/help.c:376
2851 +#: builtin/help.c:384
2852 msgid "no man viewer handled the request"
2853 msgstr ""
2854
2847 -#: builtin/help.c:384
2855 +#: builtin/help.c:392
2856 msgid "no info viewer handled the request"
2857 msgstr ""
2858
2851 -#: builtin/help.c:395
2852 -#, c-format
2853 -msgid "'%s': not a documentation directory."
2854 -msgstr ""
2855 -
2856 -#: builtin/help.c:436 builtin/help.c:443
2859 +#: builtin/help.c:447 builtin/help.c:454
2860 #, c-format
2861 msgid "usage: %s%s"
2862 msgstr ""
2863
2861 -#: builtin/help.c:459
2864 +#: builtin/help.c:470
2865 #, c-format
2866 msgid "`git %s' is aliased to `%s'"
2867 msgstr ""
@@ -2932,176 +2935,176 @@ msgstr ""
2935 msgid "unknown object type %d"
2936 msgstr ""
2937
2935 -#: builtin/index-pack.c:531
2938 +#: builtin/index-pack.c:530
2939 msgid "cannot pread pack file"
2940 msgstr ""
2941
2939 -#: builtin/index-pack.c:533
2942 +#: builtin/index-pack.c:532
2943 #, c-format
2944 msgid "premature end of pack file, %lu byte missing"
2945 msgid_plural "premature end of pack file, %lu bytes missing"
2946 msgstr[0] ""
2947 msgstr[1] ""
2948
2946 -#: builtin/index-pack.c:555
2949 +#: builtin/index-pack.c:558
2950 msgid "serious inflate inconsistency"
2951 msgstr ""
2952
2950 -#: builtin/index-pack.c:646 builtin/index-pack.c:652 builtin/index-pack.c:675
2951 -#: builtin/index-pack.c:709 builtin/index-pack.c:718
2953 +#: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678
2954 +#: builtin/index-pack.c:712 builtin/index-pack.c:721
2955 #, c-format
2956 msgid "SHA1 COLLISION FOUND WITH %s !"
2957 msgstr ""
2958
2956 -#: builtin/index-pack.c:649 builtin/pack-objects.c:170
2959 +#: builtin/index-pack.c:652 builtin/pack-objects.c:170
2960 #: builtin/pack-objects.c:262
2961 #, c-format
2962 msgid "unable to read %s"
2963 msgstr ""
2964
2962 -#: builtin/index-pack.c:715
2965 +#: builtin/index-pack.c:718
2966 #, c-format
2967 msgid "cannot read existing object %s"
2968 msgstr ""
2969
2967 -#: builtin/index-pack.c:729
2970 +#: builtin/index-pack.c:732
2971 #, c-format
2972 msgid "invalid blob object %s"
2973 msgstr ""
2974
2972 -#: builtin/index-pack.c:744
2975 +#: builtin/index-pack.c:747
2976 #, c-format
2977 msgid "invalid %s"
2978 msgstr ""
2979
2977 -#: builtin/index-pack.c:746
2980 +#: builtin/index-pack.c:749
2981 msgid "Error in object"
2982 msgstr ""
2983
2981 -#: builtin/index-pack.c:748
2984 +#: builtin/index-pack.c:751
2985 #, c-format
2986 msgid "Not all child objects of %s are reachable"
2987 msgstr ""
2988
2986 -#: builtin/index-pack.c:818 builtin/index-pack.c:844
2989 +#: builtin/index-pack.c:821 builtin/index-pack.c:847
2990 msgid "failed to apply delta"
2991 msgstr ""
2992
2990 -#: builtin/index-pack.c:983
2993 +#: builtin/index-pack.c:986
2994 msgid "Receiving objects"
2995 msgstr ""
2996
2994 -#: builtin/index-pack.c:983
2997 +#: builtin/index-pack.c:986
2998 msgid "Indexing objects"
2999 msgstr ""
3000
2998 -#: builtin/index-pack.c:1009
3001 +#: builtin/index-pack.c:1012
3002 msgid "pack is corrupted (SHA1 mismatch)"
3003 msgstr ""
3004
3002 -#: builtin/index-pack.c:1014
3005 +#: builtin/index-pack.c:1017
3006 msgid "cannot fstat packfile"
3007 msgstr ""
3008
3006 -#: builtin/index-pack.c:1017
3009 +#: builtin/index-pack.c:1020
3010 msgid "pack has junk at the end"
3011 msgstr ""
3012
3010 -#: builtin/index-pack.c:1028
3013 +#: builtin/index-pack.c:1031
3014 msgid "confusion beyond insanity in parse_pack_objects()"
3015 msgstr ""
3016
3014 -#: builtin/index-pack.c:1051
3017 +#: builtin/index-pack.c:1054
3018 msgid "Resolving deltas"
3019 msgstr ""
3020
3018 -#: builtin/index-pack.c:1102
3021 +#: builtin/index-pack.c:1105
3022 msgid "confusion beyond insanity"
3023 msgstr ""
3024
3022 -#: builtin/index-pack.c:1121
3025 +#: builtin/index-pack.c:1124
3026 #, c-format
3027 msgid "pack has %d unresolved delta"
3028 msgid_plural "pack has %d unresolved deltas"
3029 msgstr[0] ""
3030 msgstr[1] ""
3031
3029 -#: builtin/index-pack.c:1146
3032 +#: builtin/index-pack.c:1149
3033 #, c-format
3034 msgid "unable to deflate appended object (%d)"
3035 msgstr ""
3036
3034 -#: builtin/index-pack.c:1225
3037 +#: builtin/index-pack.c:1228
3038 #, c-format
3039 msgid "local object %s is corrupt"
3040 msgstr ""
3041
3039 -#: builtin/index-pack.c:1249
3042 +#: builtin/index-pack.c:1252
3043 msgid "error while closing pack file"
3044 msgstr ""
3045
3043 -#: builtin/index-pack.c:1262
3046 +#: builtin/index-pack.c:1265
3047 #, c-format
3048 msgid "cannot write keep file '%s'"
3049 msgstr ""
3050
3048 -#: builtin/index-pack.c:1270
3051 +#: builtin/index-pack.c:1273
3052 #, c-format
3053 msgid "cannot close written keep file '%s'"
3054 msgstr ""
3055
3053 -#: builtin/index-pack.c:1283
3056 +#: builtin/index-pack.c:1286
3057 msgid "cannot store pack file"
3058 msgstr ""
3059
3057 -#: builtin/index-pack.c:1294
3060 +#: builtin/index-pack.c:1297
3061 msgid "cannot store index file"
3062 msgstr ""
3063
3061 -#: builtin/index-pack.c:1395
3064 +#: builtin/index-pack.c:1398
3065 #, c-format
3066 msgid "Cannot open existing pack file '%s'"
3067 msgstr ""
3068
3066 -#: builtin/index-pack.c:1397
3069 +#: builtin/index-pack.c:1400
3070 #, c-format
3071 msgid "Cannot open existing pack idx file for '%s'"
3072 msgstr ""
3073
3071 -#: builtin/index-pack.c:1444
3074 +#: builtin/index-pack.c:1447
3075 #, c-format
3076 msgid "non delta: %d object"
3077 msgid_plural "non delta: %d objects"
3078 msgstr[0] ""
3079 msgstr[1] ""
3080
3078 -#: builtin/index-pack.c:1451
3081 +#: builtin/index-pack.c:1454
3082 #, c-format
3083 msgid "chain length = %d: %lu object"
3084 msgid_plural "chain length = %d: %lu objects"
3085 msgstr[0] ""
3086 msgstr[1] ""
3087
3085 -#: builtin/index-pack.c:1478
3088 +#: builtin/index-pack.c:1481
3089 msgid "Cannot come back to cwd"
3090 msgstr ""
3091
3089 -#: builtin/index-pack.c:1522 builtin/index-pack.c:1525
3090 -#: builtin/index-pack.c:1537 builtin/index-pack.c:1541
3092 +#: builtin/index-pack.c:1525 builtin/index-pack.c:1528
3093 +#: builtin/index-pack.c:1540 builtin/index-pack.c:1544
3094 #, c-format
3095 msgid "bad %s"
3096 msgstr ""
3097
3095 -#: builtin/index-pack.c:1555
3098 +#: builtin/index-pack.c:1558
3099 msgid "--fix-thin cannot be used without --stdin"
3100 msgstr ""
3101
3099 -#: builtin/index-pack.c:1559 builtin/index-pack.c:1569
3102 +#: builtin/index-pack.c:1562 builtin/index-pack.c:1572
3103 #, c-format
3104 msgid "packfile name '%s' does not end with '.pack'"
3105 msgstr ""
3106
3104 -#: builtin/index-pack.c:1578
3107 +#: builtin/index-pack.c:1581
3108 msgid "--verify with no packfile name given"
3109 msgstr ""
3110
@@ -3175,22 +3178,22 @@ msgstr ""
3178 msgid "insane git directory %s"
3179 msgstr ""
3180
3178 -#: builtin/init-db.c:322 builtin/init-db.c:325
3181 +#: builtin/init-db.c:323 builtin/init-db.c:326
3182 #, c-format
3183 msgid "%s already exists"
3184 msgstr ""
3185
3183 -#: builtin/init-db.c:354
3186 +#: builtin/init-db.c:355
3187 #, c-format
3188 msgid "unable to handle file type %d"
3189 msgstr ""
3190
3188 -#: builtin/init-db.c:357
3191 +#: builtin/init-db.c:358
3192 #, c-format
3193 msgid "unable to move %s to %s"
3194 msgstr ""
3195
3193 -#: builtin/init-db.c:362
3196 +#: builtin/init-db.c:363
3197 #, c-format
3198 msgid "Could not create git link %s"
3199 msgstr ""
@@ -3200,49 +3203,49 @@ msgstr ""
3203 #. * existing" or "Initialized empty", the second " shared" or
3204 #. * "", and the last '%s%s' is the verbatim directory name.
3205 #.
3203 -#: builtin/init-db.c:419
3206 +#: builtin/init-db.c:420
3207 #, c-format
3208 msgid "%s%s Git repository in %s%s\n"
3209 msgstr ""
3210
3208 -#: builtin/init-db.c:420
3211 +#: builtin/init-db.c:421
3212 msgid "Reinitialized existing"
3213 msgstr ""
3214
3212 -#: builtin/init-db.c:420
3215 +#: builtin/init-db.c:421
3216 msgid "Initialized empty"
3217 msgstr ""
3218
3216 -#: builtin/init-db.c:421
3219 +#: builtin/init-db.c:422
3220 msgid " shared"
3221 msgstr ""
3222
3220 -#: builtin/init-db.c:440
3223 +#: builtin/init-db.c:441
3224 msgid "cannot tell cwd"
3225 msgstr ""
3226
3224 -#: builtin/init-db.c:521 builtin/init-db.c:528
3227 +#: builtin/init-db.c:522 builtin/init-db.c:529
3228 #, c-format
3229 msgid "cannot mkdir %s"
3230 msgstr ""
3231
3229 -#: builtin/init-db.c:532
3232 +#: builtin/init-db.c:533
3233 #, c-format
3234 msgid "cannot chdir to %s"
3235 msgstr ""
3236
3234 -#: builtin/init-db.c:554
3237 +#: builtin/init-db.c:555
3238 #, c-format
3239 msgid ""
3240 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
3241 "dir=<directory>)"
3242 msgstr ""
3243
3241 -#: builtin/init-db.c:578
3244 +#: builtin/init-db.c:579
3245 msgid "Cannot access current working directory"
3246 msgstr ""
3247
3245 -#: builtin/init-db.c:585
3248 +#: builtin/init-db.c:586
3249 #, c-format
3250 msgid "Cannot access work tree '%s'"
3251 msgstr ""
@@ -3252,95 +3255,95 @@ msgstr ""
3255 msgid "Final output: %d %s\n"
3256 msgstr ""
3257
3255 -#: builtin/log.c:402 builtin/log.c:490
3258 +#: builtin/log.c:403 builtin/log.c:494
3259 #, c-format
3260 msgid "Could not read object %s"
3261 msgstr ""
3262
3260 -#: builtin/log.c:514
3263 +#: builtin/log.c:518
3264 #, c-format
3265 msgid "Unknown type: %d"
3266 msgstr ""
3267
3265 -#: builtin/log.c:603
3268 +#: builtin/log.c:608
3269 msgid "format.headers without value"
3270 msgstr ""
3271
3269 -#: builtin/log.c:677
3272 +#: builtin/log.c:682
3273 msgid "name of output directory is too long"
3274 msgstr ""
3275
3273 -#: builtin/log.c:688
3276 +#: builtin/log.c:693
3277 #, c-format
3278 msgid "Cannot open patch file %s"
3279 msgstr ""
3280
3278 -#: builtin/log.c:702
3281 +#: builtin/log.c:707
3282 msgid "Need exactly one range."
3283 msgstr ""
3284
3282 -#: builtin/log.c:710
3285 +#: builtin/log.c:715
3286 msgid "Not a range."
3287 msgstr ""
3288
3286 -#: builtin/log.c:787
3289 +#: builtin/log.c:792
3290 msgid "Cover letter needs email format"
3291 msgstr ""
3292
3290 -#: builtin/log.c:860
3293 +#: builtin/log.c:865
3294 #, c-format
3295 msgid "insane in-reply-to: %s"
3296 msgstr ""
3297
3295 -#: builtin/log.c:933
3298 +#: builtin/log.c:938
3299 msgid "Two output directories?"
3300 msgstr ""
3301
3299 -#: builtin/log.c:1154
3302 +#: builtin/log.c:1160
3303 #, c-format
3304 msgid "bogus committer info %s"
3305 msgstr ""
3306
3304 -#: builtin/log.c:1199
3307 +#: builtin/log.c:1205
3308 msgid "-n and -k are mutually exclusive."
3309 msgstr ""
3310
3308 -#: builtin/log.c:1201
3311 +#: builtin/log.c:1207
3312 msgid "--subject-prefix and -k are mutually exclusive."
3313 msgstr ""
3314
3312 -#: builtin/log.c:1209
3315 +#: builtin/log.c:1215
3316 msgid "--name-only does not make sense"
3317 msgstr ""
3318
3316 -#: builtin/log.c:1211
3319 +#: builtin/log.c:1217
3320 msgid "--name-status does not make sense"
3321 msgstr ""
3322
3320 -#: builtin/log.c:1213
3323 +#: builtin/log.c:1219
3324 msgid "--check does not make sense"
3325 msgstr ""
3326
3324 -#: builtin/log.c:1236
3327 +#: builtin/log.c:1242
3328 msgid "standard output, or directory, which one?"
3329 msgstr ""
3330
3328 -#: builtin/log.c:1238
3331 +#: builtin/log.c:1244
3332 #, c-format
3333 msgid "Could not create directory '%s'"
3334 msgstr ""
3335
3333 -#: builtin/log.c:1391
3336 +#: builtin/log.c:1397
3337 msgid "Failed to create output files"
3338 msgstr ""
3339
3337 -#: builtin/log.c:1495
3340 +#: builtin/log.c:1501
3341 #, c-format
3342 msgid ""
3343 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
3344 msgstr ""
3345
3343 -#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525
3346 +#: builtin/log.c:1517 builtin/log.c:1519 builtin/log.c:1531
3347 #, c-format
3348 msgid "Unknown commit %s"
3349 msgstr ""
@@ -4379,30 +4382,30 @@ msgstr ""
4382 msgid "Cannot do a %s reset in the middle of a merge."
4383 msgstr ""
4384
4382 -#: builtin/reset.c:297
4385 +#: builtin/reset.c:303
4386 #, c-format
4387 msgid "Could not parse object '%s'."
4388 msgstr ""
4389
4387 -#: builtin/reset.c:302
4390 +#: builtin/reset.c:308
4391 msgid "--patch is incompatible with --{hard,mixed,soft}"
4392 msgstr ""
4393
4391 -#: builtin/reset.c:311
4394 +#: builtin/reset.c:317
4395 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
4396 msgstr ""
4397
4395 -#: builtin/reset.c:313
4398 +#: builtin/reset.c:319
4399 #, c-format
4400 msgid "Cannot do %s reset with paths."
4401 msgstr ""
4402
4400 -#: builtin/reset.c:325
4403 +#: builtin/reset.c:331
4404 #, c-format
4405 msgid "%s reset is not allowed in a bare repository"
4406 msgstr ""
4407
4405 -#: builtin/reset.c:341
4408 +#: builtin/reset.c:347
4409 #, c-format
4410 msgid "Could not reset index file to revision '%s'."
4411 msgstr ""
@@ -4778,7 +4781,7 @@ msgstr ""
4781 msgid "Dirty index: cannot apply patches (dirty: $files)"
4782 msgstr ""
4783
4781 -#: git-am.sh:671
4784 +#: git-am.sh:683
4785 #, sh-format
4786 msgid ""
4787 "Patch is empty. Was it split wrong?\n"
@@ -4786,53 +4789,53 @@ msgid ""
4789 "To restore the original branch and stop patching run \"$cmdline --abort\"."
4790 msgstr ""
4791
4789 -#: git-am.sh:708
4792 +#: git-am.sh:710
4793 msgid "Patch does not have a valid e-mail address."
4794 msgstr ""
4795
4793 -#: git-am.sh:755
4796 +#: git-am.sh:757
4797 msgid "cannot be interactive without stdin connected to a terminal."
4798 msgstr ""
4799
4797 -#: git-am.sh:759
4800 +#: git-am.sh:761
4801 msgid "Commit Body is:"
4802 msgstr ""
4803
4804 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
4805 #. in your translation. The program will only accept English
4806 #. input at this point.
4804 -#: git-am.sh:766
4807 +#: git-am.sh:768
4808 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
4809 msgstr ""
4810
4808 -#: git-am.sh:802
4811 +#: git-am.sh:804
4812 #, sh-format
4813 msgid "Applying: $FIRSTLINE"
4814 msgstr ""
4815
4813 -#: git-am.sh:823
4816 +#: git-am.sh:825
4817 msgid ""
4818 "No changes - did you forget to use 'git add'?\n"
4819 "If there is nothing left to stage, chances are that something else\n"
4820 "already introduced the same changes; you might want to skip this patch."
4821 msgstr ""
4822
4820 -#: git-am.sh:831
4823 +#: git-am.sh:833
4824 msgid ""
4825 "You still have unmerged paths in your index\n"
4826 "did you forget to use 'git add'?"
4827 msgstr ""
4828
4826 -#: git-am.sh:847
4829 +#: git-am.sh:849
4830 msgid "No changes -- Patch already applied."
4831 msgstr ""
4832
4830 -#: git-am.sh:857
4833 +#: git-am.sh:859
4834 #, sh-format
4835 msgid "Patch failed at $msgnum $FIRSTLINE"
4836 msgstr ""
4837
4835 -#: git-am.sh:873
4838 +#: git-am.sh:880
4839 msgid "applying to an empty history"
4840 msgstr ""
4841
@@ -5152,27 +5155,27 @@ msgstr ""
5155 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
5156 msgstr ""
5157
5155 -#: git-submodule.sh:186
5158 +#: git-submodule.sh:189
5159 #, sh-format
5160 msgid "Clone of '$url' into submodule path '$sm_path' failed"
5161 msgstr ""
5162
5160 -#: git-submodule.sh:196
5163 +#: git-submodule.sh:201
5164 #, sh-format
5165 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
5166 msgstr ""
5167
5165 -#: git-submodule.sh:285
5168 +#: git-submodule.sh:290
5169 #, sh-format
5170 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
5171 msgstr ""
5172
5170 -#: git-submodule.sh:302
5173 +#: git-submodule.sh:307
5174 #, sh-format
5175 msgid "'$sm_path' already exists in the index"
5176 msgstr ""
5177
5175 -#: git-submodule.sh:306
5178 +#: git-submodule.sh:311
5179 #, sh-format
5180 msgid ""
5181 "The following path is ignored by one of your .gitignore files:\n"
@@ -5180,155 +5183,155 @@ msgid ""
5183 "Use -f if you really want to add it."
5184 msgstr ""
5185
5183 -#: git-submodule.sh:317
5186 +#: git-submodule.sh:322
5187 #, sh-format
5188 msgid "Adding existing repo at '$sm_path' to the index"
5189 msgstr ""
5190
5188 -#: git-submodule.sh:319
5191 +#: git-submodule.sh:324
5192 #, sh-format
5193 msgid "'$sm_path' already exists and is not a valid git repo"
5194 msgstr ""
5195
5193 -#: git-submodule.sh:333
5196 +#: git-submodule.sh:338
5197 #, sh-format
5198 msgid "Unable to checkout submodule '$sm_path'"
5199 msgstr ""
5200
5198 -#: git-submodule.sh:338
5201 +#: git-submodule.sh:343
5202 #, sh-format
5203 msgid "Failed to add submodule '$sm_path'"
5204 msgstr ""
5205
5203 -#: git-submodule.sh:343
5206 +#: git-submodule.sh:348
5207 #, sh-format
5208 msgid "Failed to register submodule '$sm_path'"
5209 msgstr ""
5210
5208 -#: git-submodule.sh:385
5211 +#: git-submodule.sh:390
5212 #, sh-format
5213 msgid "Entering '$prefix$sm_path'"
5214 msgstr ""
5215
5213 -#: git-submodule.sh:399
5216 +#: git-submodule.sh:404
5217 #, sh-format
5218 msgid "Stopping at '$sm_path'; script returned non-zero status."
5219 msgstr ""
5220
5218 -#: git-submodule.sh:442
5221 +#: git-submodule.sh:447
5222 #, sh-format
5223 msgid "No url found for submodule path '$sm_path' in .gitmodules"
5224 msgstr ""
5225
5223 -#: git-submodule.sh:451
5226 +#: git-submodule.sh:456
5227 #, sh-format
5228 msgid "Failed to register url for submodule path '$sm_path'"
5229 msgstr ""
5230
5228 -#: git-submodule.sh:453
5231 +#: git-submodule.sh:458
5232 #, sh-format
5233 msgid "Submodule '$name' ($url) registered for path '$sm_path'"
5234 msgstr ""
5235
5233 -#: git-submodule.sh:461
5236 +#: git-submodule.sh:466
5237 #, sh-format
5238 msgid "Failed to register update mode for submodule path '$sm_path'"
5239 msgstr ""
5240
5238 -#: git-submodule.sh:560
5241 +#: git-submodule.sh:565
5242 #, sh-format
5243 msgid ""
5244 "Submodule path '$sm_path' not initialized\n"
5245 "Maybe you want to use 'update --init'?"
5246 msgstr ""
5247
5245 -#: git-submodule.sh:573
5248 +#: git-submodule.sh:578
5249 #, sh-format
5250 msgid "Unable to find current revision in submodule path '$sm_path'"
5251 msgstr ""
5252
5250 -#: git-submodule.sh:592
5253 +#: git-submodule.sh:597
5254 #, sh-format
5255 msgid "Unable to fetch in submodule path '$sm_path'"
5256 msgstr ""
5257
5255 -#: git-submodule.sh:606
5258 +#: git-submodule.sh:611
5259 #, sh-format
5260 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
5261 msgstr ""
5262
5260 -#: git-submodule.sh:607
5263 +#: git-submodule.sh:612
5264 #, sh-format
5265 msgid "Submodule path '$sm_path': rebased into '$sha1'"
5266 msgstr ""
5267
5265 -#: git-submodule.sh:612
5268 +#: git-submodule.sh:617
5269 #, sh-format
5270 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
5271 msgstr ""
5272
5270 -#: git-submodule.sh:613
5273 +#: git-submodule.sh:618
5274 #, sh-format
5275 msgid "Submodule path '$sm_path': merged in '$sha1'"
5276 msgstr ""
5277
5275 -#: git-submodule.sh:618
5278 +#: git-submodule.sh:623
5279 #, sh-format
5280 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
5281 msgstr ""
5282
5280 -#: git-submodule.sh:619
5283 +#: git-submodule.sh:624
5284 #, sh-format
5285 msgid "Submodule path '$sm_path': checked out '$sha1'"
5286 msgstr ""
5287
5285 -#: git-submodule.sh:641 git-submodule.sh:964
5288 +#: git-submodule.sh:646 git-submodule.sh:969
5289 #, sh-format
5290 msgid "Failed to recurse into submodule path '$sm_path'"
5291 msgstr ""
5292
5290 -#: git-submodule.sh:749
5293 +#: git-submodule.sh:754
5294 msgid "--cached cannot be used with --files"
5295 msgstr ""
5296
5297 #. unexpected type
5295 -#: git-submodule.sh:789
5298 +#: git-submodule.sh:794
5299 #, sh-format
5300 msgid "unexpected mode $mod_dst"
5301 msgstr ""
5302
5300 -#: git-submodule.sh:807
5303 +#: git-submodule.sh:812
5304 #, sh-format
5305 msgid " Warn: $name doesn't contain commit $sha1_src"
5306 msgstr ""
5307
5305 -#: git-submodule.sh:810
5308 +#: git-submodule.sh:815
5309 #, sh-format
5310 msgid " Warn: $name doesn't contain commit $sha1_dst"
5311 msgstr ""
5312
5310 -#: git-submodule.sh:813
5313 +#: git-submodule.sh:818
5314 #, sh-format
5315 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
5316 msgstr ""
5317
5315 -#: git-submodule.sh:838
5318 +#: git-submodule.sh:843
5319 msgid "blob"
5320 msgstr ""
5321
5319 -#: git-submodule.sh:839
5322 +#: git-submodule.sh:844
5323 msgid "submodule"
5324 msgstr ""
5325
5323 -#: git-submodule.sh:876
5326 +#: git-submodule.sh:881
5327 msgid "# Submodules changed but not updated:"
5328 msgstr ""
5329
5327 -#: git-submodule.sh:878
5330 +#: git-submodule.sh:883
5331 msgid "# Submodule changes to be committed:"
5332 msgstr ""
5333
5331 -#: git-submodule.sh:1022
5334 +#: git-submodule.sh:1027
5335 #, sh-format
5336 msgid "Synchronizing submodule url for '$name'"
5337 msgstr ""