@matheusbsbs / matheus-bagliano / commits / 11b901747b

l10n: Update git.pot (29 new messages)

Generate po/git.pot from v1.7.11.1-107-g72601, and there are 29 new l10n messages. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Jiang Xin committed Jul 3, 2012 at 10:31 UTC 11b901747b94b2a36a9b5933bb85b3cea3c0bb5d
1 file changed +329 -208
po/git.pot
+329 -208
@@ -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-06-08 10:20+0800\n"
11 +"POT-Creation-Date: 2012-07-03 10:23+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"
@@ -54,8 +54,8 @@ msgstr ""
54 msgid "Repository lacks these prerequisite commits:"
55 msgstr ""
56
57 -#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:289
58 -#: builtin/log.c:720 builtin/log.c:1309 builtin/log.c:1528 builtin/merge.c:347
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
59 #: builtin/shortlog.c:181
60 msgid "revision walk setup failed"
61 msgstr ""
@@ -68,44 +68,48 @@ msgstr[0] ""
68 msgstr[1] ""
69
70 #: bundle.c:192
71 +msgid "The bundle records a complete history."
72 +msgstr ""
73 +
74 +#: bundle.c:195
75 #, c-format
76 msgid "The bundle requires this ref"
77 msgid_plural "The bundle requires these %d refs"
78 msgstr[0] ""
79 msgstr[1] ""
80
77 -#: bundle.c:290
81 +#: bundle.c:294
82 msgid "rev-list died"
83 msgstr ""
84
81 -#: bundle.c:296 builtin/log.c:1205 builtin/shortlog.c:284
85 +#: bundle.c:300 builtin/log.c:1206 builtin/shortlog.c:284
86 #, c-format
87 msgid "unrecognized argument: %s"
88 msgstr ""
89
86 -#: bundle.c:331
90 +#: bundle.c:335
91 #, c-format
92 msgid "ref '%s' is excluded by the rev-list options"
93 msgstr ""
94
91 -#: bundle.c:376
95 +#: bundle.c:380
96 msgid "Refusing to create empty bundle."
97 msgstr ""
98
95 -#: bundle.c:394
99 +#: bundle.c:398
100 msgid "Could not spawn pack-objects"
101 msgstr ""
102
99 -#: bundle.c:412
103 +#: bundle.c:416
104 msgid "pack-objects died"
105 msgstr ""
106
103 -#: bundle.c:415
107 +#: bundle.c:419
108 #, c-format
109 msgid "cannot create '%s'"
110 msgstr ""
111
108 -#: bundle.c:437
112 +#: bundle.c:441
113 msgid "index-pack died"
114 msgstr ""
115
@@ -280,44 +284,44 @@ msgstr ""
284 msgid "'%s': short read %s"
285 msgstr ""
286
283 -#: help.c:207
287 +#: help.c:208
288 #, c-format
289 msgid "available git commands in '%s'"
290 msgstr ""
291
288 -#: help.c:214
292 +#: help.c:215
293 msgid "git commands available from elsewhere on your $PATH"
294 msgstr ""
295
292 -#: help.c:270
296 +#: help.c:271
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
299 -#: help.c:327
303 +#: help.c:328
304 msgid "Uh oh. Your system reports no Git commands at all."
305 msgstr ""
306
303 -#: help.c:349
307 +#: help.c:350
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
310 -#: help.c:354
314 +#: help.c:355
315 #, c-format
316 msgid "in %0.1f seconds automatically..."
317 msgstr ""
318
315 -#: help.c:361
319 +#: help.c:362
320 #, c-format
321 msgid "git: '%s' is not a git command. See 'git --help'."
322 msgstr ""
323
320 -#: help.c:365
324 +#: help.c:366
325 msgid ""
326 "\n"
327 "Did you mean this?"
@@ -638,232 +642,333 @@ msgstr ""
642 msgid "no such user"
643 msgstr ""
644
641 -#: wt-status.c:135
645 +#: wt-status.c:141
646 msgid "Unmerged paths:"
647 msgstr ""
648
645 -#: wt-status.c:141 wt-status.c:158
649 +#: wt-status.c:168 wt-status.c:195
650 #, c-format
651 msgid " (use \"git reset %s <file>...\" to unstage)"
652 msgstr ""
653
650 -#: wt-status.c:143 wt-status.c:160
654 +#: wt-status.c:170 wt-status.c:197
655 msgid " (use \"git rm --cached <file>...\" to unstage)"
656 msgstr ""
657
654 -#: wt-status.c:144
658 +#: wt-status.c:174
659 +msgid " (use \"git add <file>...\" to mark resolution)"
660 +msgstr ""
661 +
662 +#: wt-status.c:176 wt-status.c:180
663 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
664 msgstr ""
665
658 -#: wt-status.c:152
666 +#: wt-status.c:178
667 +msgid " (use \"git rm <file>...\" to mark resolution)"
668 +msgstr ""
669 +
670 +#: wt-status.c:189
671 msgid "Changes to be committed:"
672 msgstr ""
673
662 -#: wt-status.c:170
674 +#: wt-status.c:207
675 msgid "Changes not staged for commit:"
676 msgstr ""
677
666 -#: wt-status.c:174
678 +#: wt-status.c:211
679 msgid " (use \"git add <file>...\" to update what will be committed)"
680 msgstr ""
681
670 -#: wt-status.c:176
682 +#: wt-status.c:213
683 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
684 msgstr ""
685
674 -#: wt-status.c:177
686 +#: wt-status.c:214
687 msgid ""
688 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
689 msgstr ""
690
679 -#: wt-status.c:179
691 +#: wt-status.c:216
692 msgid " (commit or discard the untracked or modified content in submodules)"
693 msgstr ""
694
683 -#: wt-status.c:188
695 +#: wt-status.c:225
696 #, c-format
697 msgid "%s files:"
698 msgstr ""
699
688 -#: wt-status.c:191
700 +#: wt-status.c:228
701 #, c-format
702 msgid " (use \"git %s <file>...\" to include in what will be committed)"
703 msgstr ""
704
693 -#: wt-status.c:208
705 +#: wt-status.c:245
706 msgid "bug"
707 msgstr ""
708
697 -#: wt-status.c:213
709 +#: wt-status.c:250
710 msgid "both deleted:"
711 msgstr ""
712
701 -#: wt-status.c:214
713 +#: wt-status.c:251
714 msgid "added by us:"
715 msgstr ""
716
705 -#: wt-status.c:215
717 +#: wt-status.c:252
718 msgid "deleted by them:"
719 msgstr ""
720
709 -#: wt-status.c:216
721 +#: wt-status.c:253
722 msgid "added by them:"
723 msgstr ""
724
713 -#: wt-status.c:217
725 +#: wt-status.c:254
726 msgid "deleted by us:"
727 msgstr ""
728
717 -#: wt-status.c:218
729 +#: wt-status.c:255
730 msgid "both added:"
731 msgstr ""
732
721 -#: wt-status.c:219
733 +#: wt-status.c:256
734 msgid "both modified:"
735 msgstr ""
736
725 -#: wt-status.c:249
737 +#: wt-status.c:286
738 msgid "new commits, "
739 msgstr ""
740
729 -#: wt-status.c:251
741 +#: wt-status.c:288
742 msgid "modified content, "
743 msgstr ""
744
733 -#: wt-status.c:253
745 +#: wt-status.c:290
746 msgid "untracked content, "
747 msgstr ""
748
737 -#: wt-status.c:267
749 +#: wt-status.c:304
750 #, c-format
751 msgid "new file: %s"
752 msgstr ""
753
742 -#: wt-status.c:270
754 +#: wt-status.c:307
755 #, c-format
756 msgid "copied: %s -> %s"
757 msgstr ""
758
747 -#: wt-status.c:273
759 +#: wt-status.c:310
760 #, c-format
761 msgid "deleted: %s"
762 msgstr ""
763
752 -#: wt-status.c:276
764 +#: wt-status.c:313
765 #, c-format
766 msgid "modified: %s"
767 msgstr ""
768
757 -#: wt-status.c:279
769 +#: wt-status.c:316
770 #, c-format
771 msgid "renamed: %s -> %s"
772 msgstr ""
773
762 -#: wt-status.c:282
774 +#: wt-status.c:319
775 #, c-format
776 msgid "typechange: %s"
777 msgstr ""
778
767 -#: wt-status.c:285
779 +#: wt-status.c:322
780 #, c-format
781 msgid "unknown: %s"
782 msgstr ""
783
772 -#: wt-status.c:288
784 +#: wt-status.c:325
785 #, c-format
786 msgid "unmerged: %s"
787 msgstr ""
788
777 -#: wt-status.c:291
789 +#: wt-status.c:328
790 #, c-format
791 msgid "bug: unhandled diff status %c"
792 msgstr ""
793
782 -#: wt-status.c:737
794 +#: wt-status.c:786
795 +msgid "You have unmerged paths."
796 +msgstr ""
797 +
798 +#: wt-status.c:789 wt-status.c:913
799 +msgid " (fix conflicts and run \"git commit\")"
800 +msgstr ""
801 +
802 +#: wt-status.c:792
803 +msgid "All conflicts fixed but you are still merging."
804 +msgstr ""
805 +
806 +#: wt-status.c:795
807 +msgid " (use \"git commit\" to conclude merge)"
808 +msgstr ""
809 +
810 +#: wt-status.c:805
811 +msgid "You are in the middle of an am session."
812 +msgstr ""
813 +
814 +#: wt-status.c:808
815 +msgid "The current patch is empty."
816 +msgstr ""
817 +
818 +#: wt-status.c:812
819 +msgid " (fix conflicts and then run \"git am --resolved\")"
820 +msgstr ""
821 +
822 +#: wt-status.c:814
823 +msgid " (use \"git am --skip\" to skip this patch)"
824 +msgstr ""
825 +
826 +#: wt-status.c:816
827 +msgid " (use \"git am --abort\" to restore the original branch)"
828 +msgstr ""
829 +
830 +#: wt-status.c:874 wt-status.c:884
831 +msgid "You are currently rebasing."
832 +msgstr ""
833 +
834 +#: wt-status.c:877
835 +msgid " (fix conflicts and then run \"git rebase --continue\")"
836 +msgstr ""
837 +
838 +#: wt-status.c:879
839 +msgid " (use \"git rebase --skip\" to skip this patch)"
840 +msgstr ""
841 +
842 +#: wt-status.c:881
843 +msgid " (use \"git rebase --abort\" to check out the original branch)"
844 +msgstr ""
845 +
846 +#: wt-status.c:887
847 +msgid " (all conflicts fixed: run \"git rebase --continue\")"
848 +msgstr ""
849 +
850 +#: wt-status.c:889
851 +msgid "You are currently splitting a commit during a rebase."
852 +msgstr ""
853 +
854 +#: wt-status.c:892
855 +msgid " (Once your working directory is clean, run \"git rebase --continue\")"
856 +msgstr ""
857 +
858 +#: wt-status.c:894
859 +msgid "You are currently editing a commit during a rebase."
860 +msgstr ""
861 +
862 +#: wt-status.c:897
863 +msgid " (use \"git commit --amend\" to amend the current commit)"
864 +msgstr ""
865 +
866 +#: wt-status.c:899
867 +msgid ""
868 +" (use \"git rebase --continue\" once you are satisfied with your changes)"
869 +msgstr ""
870 +
871 +#: wt-status.c:909
872 +msgid "You are currently cherry-picking."
873 +msgstr ""
874 +
875 +#: wt-status.c:916
876 +msgid " (all conflicts fixed: run \"git commit\")"
877 +msgstr ""
878 +
879 +#: wt-status.c:925
880 +msgid "You are currently bisecting."
881 +msgstr ""
882 +
883 +#: wt-status.c:928
884 +msgid " (use \"git bisect reset\" to get back to the original branch)"
885 +msgstr ""
886 +
887 +#: wt-status.c:979
888 msgid "On branch "
889 msgstr ""
890
786 -#: wt-status.c:744
891 +#: wt-status.c:986
892 msgid "Not currently on any branch."
893 msgstr ""
894
790 -#: wt-status.c:755
895 +#: wt-status.c:998
896 msgid "Initial commit"
897 msgstr ""
898
794 -#: wt-status.c:769
899 +#: wt-status.c:1012
900 msgid "Untracked"
901 msgstr ""
902
798 -#: wt-status.c:771
903 +#: wt-status.c:1014
904 msgid "Ignored"
905 msgstr ""
906
802 -#: wt-status.c:773
907 +#: wt-status.c:1016
908 #, c-format
909 msgid "Untracked files not listed%s"
910 msgstr ""
911
807 -#: wt-status.c:775
912 +#: wt-status.c:1018
913 msgid " (use -u option to show untracked files)"
914 msgstr ""
915
811 -#: wt-status.c:781
916 +#: wt-status.c:1024
917 msgid "No changes"
918 msgstr ""
919
815 -#: wt-status.c:785
920 +#: wt-status.c:1028
921 #, c-format
922 msgid "no changes added to commit%s\n"
923 msgstr ""
924
820 -#: wt-status.c:787
925 +#: wt-status.c:1030
926 msgid " (use \"git add\" and/or \"git commit -a\")"
927 msgstr ""
928
824 -#: wt-status.c:789
929 +#: wt-status.c:1032
930 #, c-format
931 msgid "nothing added to commit but untracked files present%s\n"
932 msgstr ""
933
829 -#: wt-status.c:791
934 +#: wt-status.c:1034
935 msgid " (use \"git add\" to track)"
936 msgstr ""
937
833 -#: wt-status.c:793 wt-status.c:796 wt-status.c:799
938 +#: wt-status.c:1036 wt-status.c:1039 wt-status.c:1042
939 #, c-format
940 msgid "nothing to commit%s\n"
941 msgstr ""
942
838 -#: wt-status.c:794
943 +#: wt-status.c:1037
944 msgid " (create/copy files and use \"git add\" to track)"
945 msgstr ""
946
842 -#: wt-status.c:797
947 +#: wt-status.c:1040
948 msgid " (use -u to show untracked files)"
949 msgstr ""
950
846 -#: wt-status.c:800
951 +#: wt-status.c:1043
952 msgid " (working directory clean)"
953 msgstr ""
954
850 -#: wt-status.c:908
955 +#: wt-status.c:1151
956 msgid "HEAD (no branch)"
957 msgstr ""
958
854 -#: wt-status.c:914
959 +#: wt-status.c:1157
960 msgid "Initial commit on "
961 msgstr ""
962
858 -#: wt-status.c:929
963 +#: wt-status.c:1172
964 msgid "behind "
965 msgstr ""
966
862 -#: wt-status.c:932 wt-status.c:935
967 +#: wt-status.c:1175 wt-status.c:1178
968 msgid "ahead "
969 msgstr ""
970
866 -#: wt-status.c:937
971 +#: wt-status.c:1180
972 msgid ", behind "
973 msgstr ""
974
@@ -890,7 +995,7 @@ msgstr ""
995 msgid "Unstaged changes after refreshing the index:"
996 msgstr ""
997
893 -#: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186
998 +#: builtin/add.c:195 builtin/add.c:459 builtin/rm.c:186
999 #, c-format
1000 msgid "pathspec '%s' did not match any files"
1001 msgstr ""
@@ -967,7 +1072,7 @@ msgstr ""
1072 msgid "index file corrupt"
1073 msgstr ""
1074
970 -#: builtin/add.c:476 builtin/apply.c:4108 builtin/mv.c:229 builtin/rm.c:260
1075 +#: builtin/add.c:480 builtin/apply.c:4108 builtin/mv.c:229 builtin/rm.c:260
1076 msgid "Unable to write new index file"
1077 msgstr ""
1078
@@ -2432,22 +2537,22 @@ msgstr ""
2537 msgid "Not a git repository"
2538 msgstr ""
2539
2435 -#: builtin/diff.c:347
2540 +#: builtin/diff.c:341
2541 #, c-format
2542 msgid "invalid object '%s' given."
2543 msgstr ""
2544
2440 -#: builtin/diff.c:352
2545 +#: builtin/diff.c:346
2546 #, c-format
2547 msgid "more than %d trees given: '%s'"
2548 msgstr ""
2549
2445 -#: builtin/diff.c:362
2550 +#: builtin/diff.c:356
2551 #, c-format
2552 msgid "more than two blobs given: '%s'"
2553 msgstr ""
2554
2450 -#: builtin/diff.c:370
2555 +#: builtin/diff.c:364
2556 #, c-format
2557 msgid "unhandled object '%s' given."
2558 msgstr ""
@@ -2689,303 +2794,314 @@ msgstr ""
2794 msgid "both --cached and trees are given."
2795 msgstr ""
2796
2692 -#: builtin/help.c:59
2797 +#: builtin/help.c:63
2798 #, c-format
2799 msgid "unrecognized help format '%s'"
2800 msgstr ""
2801
2697 -#: builtin/help.c:87
2802 +#: builtin/help.c:91
2803 msgid "Failed to start emacsclient."
2804 msgstr ""
2805
2701 -#: builtin/help.c:100
2806 +#: builtin/help.c:104
2807 msgid "Failed to parse emacsclient version."
2808 msgstr ""
2809
2705 -#: builtin/help.c:108
2810 +#: builtin/help.c:112
2811 #, c-format
2812 msgid "emacsclient version '%d' too old (< 22)."
2813 msgstr ""
2814
2710 -#: builtin/help.c:126 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
2815 +#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
2816 #, c-format
2817 msgid "failed to exec '%s': %s"
2818 msgstr ""
2819
2715 -#: builtin/help.c:211
2820 +#: builtin/help.c:215
2821 #, c-format
2822 msgid ""
2823 "'%s': path for unsupported man viewer.\n"
2824 "Please consider using 'man.<tool>.cmd' instead."
2825 msgstr ""
2826
2722 -#: builtin/help.c:223
2827 +#: builtin/help.c:227
2828 #, c-format
2829 msgid ""
2830 "'%s': cmd for supported man viewer.\n"
2831 "Please consider using 'man.<tool>.path' instead."
2832 msgstr ""
2833
2729 -#: builtin/help.c:287
2834 +#: builtin/help.c:291
2835 msgid "The most commonly used git commands are:"
2836 msgstr ""
2837
2733 -#: builtin/help.c:355
2838 +#: builtin/help.c:359
2839 #, c-format
2840 msgid "'%s': unknown man viewer."
2841 msgstr ""
2842
2738 -#: builtin/help.c:372
2843 +#: builtin/help.c:376
2844 msgid "no man viewer handled the request"
2845 msgstr ""
2846
2742 -#: builtin/help.c:380
2847 +#: builtin/help.c:384
2848 msgid "no info viewer handled the request"
2849 msgstr ""
2850
2746 -#: builtin/help.c:391
2851 +#: builtin/help.c:395
2852 #, c-format
2853 msgid "'%s': not a documentation directory."
2854 msgstr ""
2855
2751 -#: builtin/help.c:432 builtin/help.c:439
2856 +#: builtin/help.c:436 builtin/help.c:443
2857 #, c-format
2858 msgid "usage: %s%s"
2859 msgstr ""
2860
2756 -#: builtin/help.c:453
2861 +#: builtin/help.c:459
2862 #, c-format
2863 msgid "`git %s' is aliased to `%s'"
2864 msgstr ""
2865
2761 -#: builtin/index-pack.c:169
2866 +#: builtin/index-pack.c:170
2867 #, c-format
2868 msgid "object type mismatch at %s"
2869 msgstr ""
2870
2766 -#: builtin/index-pack.c:189
2871 +#: builtin/index-pack.c:190
2872 msgid "object of unexpected type"
2873 msgstr ""
2874
2770 -#: builtin/index-pack.c:226
2875 +#: builtin/index-pack.c:227
2876 #, c-format
2877 msgid "cannot fill %d byte"
2878 msgid_plural "cannot fill %d bytes"
2879 msgstr[0] ""
2880 msgstr[1] ""
2881
2777 -#: builtin/index-pack.c:236
2882 +#: builtin/index-pack.c:237
2883 msgid "early EOF"
2884 msgstr ""
2885
2781 -#: builtin/index-pack.c:237
2886 +#: builtin/index-pack.c:238
2887 msgid "read error on input"
2888 msgstr ""
2889
2785 -#: builtin/index-pack.c:249
2890 +#: builtin/index-pack.c:250
2891 msgid "used more bytes than were available"
2892 msgstr ""
2893
2789 -#: builtin/index-pack.c:256
2894 +#: builtin/index-pack.c:257
2895 msgid "pack too large for current definition of off_t"
2896 msgstr ""
2897
2793 -#: builtin/index-pack.c:272
2898 +#: builtin/index-pack.c:273
2899 #, c-format
2900 msgid "unable to create '%s'"
2901 msgstr ""
2902
2798 -#: builtin/index-pack.c:277
2903 +#: builtin/index-pack.c:278
2904 #, c-format
2905 msgid "cannot open packfile '%s'"
2906 msgstr ""
2907
2803 -#: builtin/index-pack.c:291
2908 +#: builtin/index-pack.c:292
2909 msgid "pack signature mismatch"
2910 msgstr ""
2911
2807 -#: builtin/index-pack.c:311
2912 +#: builtin/index-pack.c:312
2913 #, c-format
2914 msgid "pack has bad object at offset %lu: %s"
2915 msgstr ""
2916
2812 -#: builtin/index-pack.c:405
2917 +#: builtin/index-pack.c:434
2918 #, c-format
2919 msgid "inflate returned %d"
2920 msgstr ""
2921
2817 -#: builtin/index-pack.c:450
2922 +#: builtin/index-pack.c:483
2923 msgid "offset value overflow for delta base object"
2924 msgstr ""
2925
2821 -#: builtin/index-pack.c:458
2926 +#: builtin/index-pack.c:491
2927 msgid "delta base offset is out of bound"
2928 msgstr ""
2929
2825 -#: builtin/index-pack.c:466
2930 +#: builtin/index-pack.c:499
2931 #, c-format
2932 msgid "unknown object type %d"
2933 msgstr ""
2934
2830 -#: builtin/index-pack.c:495
2935 +#: builtin/index-pack.c:531
2936 msgid "cannot pread pack file"
2937 msgstr ""
2938
2834 -#: builtin/index-pack.c:497
2939 +#: builtin/index-pack.c:533
2940 #, c-format
2941 msgid "premature end of pack file, %lu byte missing"
2942 msgid_plural "premature end of pack file, %lu bytes missing"
2943 msgstr[0] ""
2944 msgstr[1] ""
2945
2841 -#: builtin/index-pack.c:510
2946 +#: builtin/index-pack.c:555
2947 msgid "serious inflate inconsistency"
2948 msgstr ""
2949
2845 -#: builtin/index-pack.c:583
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
2952 #, c-format
2847 -msgid "cannot read existing object %s"
2953 +msgid "SHA1 COLLISION FOUND WITH %s !"
2954 msgstr ""
2955
2850 -#: builtin/index-pack.c:586
2956 +#: builtin/index-pack.c:649 builtin/pack-objects.c:170
2957 +#: builtin/pack-objects.c:262
2958 #, c-format
2852 -msgid "SHA1 COLLISION FOUND WITH %s !"
2959 +msgid "unable to read %s"
2960 msgstr ""
2961
2855 -#: builtin/index-pack.c:598
2962 +#: builtin/index-pack.c:715
2963 +#, c-format
2964 +msgid "cannot read existing object %s"
2965 +msgstr ""
2966 +
2967 +#: builtin/index-pack.c:729
2968 #, c-format
2969 msgid "invalid blob object %s"
2970 msgstr ""
2971
2860 -#: builtin/index-pack.c:610
2972 +#: builtin/index-pack.c:744
2973 #, c-format
2974 msgid "invalid %s"
2975 msgstr ""
2976
2865 -#: builtin/index-pack.c:612
2977 +#: builtin/index-pack.c:746
2978 msgid "Error in object"
2979 msgstr ""
2980
2869 -#: builtin/index-pack.c:614
2981 +#: builtin/index-pack.c:748
2982 #, c-format
2983 msgid "Not all child objects of %s are reachable"
2984 msgstr ""
2985
2874 -#: builtin/index-pack.c:687 builtin/index-pack.c:713
2986 +#: builtin/index-pack.c:818 builtin/index-pack.c:844
2987 msgid "failed to apply delta"
2988 msgstr ""
2989
2878 -#: builtin/index-pack.c:850
2990 +#: builtin/index-pack.c:983
2991 msgid "Receiving objects"
2992 msgstr ""
2993
2882 -#: builtin/index-pack.c:850
2994 +#: builtin/index-pack.c:983
2995 msgid "Indexing objects"
2996 msgstr ""
2997
2886 -#: builtin/index-pack.c:872
2998 +#: builtin/index-pack.c:1009
2999 msgid "pack is corrupted (SHA1 mismatch)"
3000 msgstr ""
3001
2890 -#: builtin/index-pack.c:877
3002 +#: builtin/index-pack.c:1014
3003 msgid "cannot fstat packfile"
3004 msgstr ""
3005
2894 -#: builtin/index-pack.c:880
3006 +#: builtin/index-pack.c:1017
3007 msgid "pack has junk at the end"
3008 msgstr ""
3009
2898 -#: builtin/index-pack.c:903
3010 +#: builtin/index-pack.c:1028
3011 +msgid "confusion beyond insanity in parse_pack_objects()"
3012 +msgstr ""
3013 +
3014 +#: builtin/index-pack.c:1051
3015 msgid "Resolving deltas"
3016 msgstr ""
3017
2902 -#: builtin/index-pack.c:954
3018 +#: builtin/index-pack.c:1102
3019 msgid "confusion beyond insanity"
3020 msgstr ""
3021
2906 -#: builtin/index-pack.c:973
3022 +#: builtin/index-pack.c:1121
3023 #, c-format
3024 msgid "pack has %d unresolved delta"
3025 msgid_plural "pack has %d unresolved deltas"
3026 msgstr[0] ""
3027 msgstr[1] ""
3028
2913 -#: builtin/index-pack.c:998
3029 +#: builtin/index-pack.c:1146
3030 #, c-format
3031 msgid "unable to deflate appended object (%d)"
3032 msgstr ""
3033
2918 -#: builtin/index-pack.c:1077
3034 +#: builtin/index-pack.c:1225
3035 #, c-format
3036 msgid "local object %s is corrupt"
3037 msgstr ""
3038
2923 -#: builtin/index-pack.c:1101
3039 +#: builtin/index-pack.c:1249
3040 msgid "error while closing pack file"
3041 msgstr ""
3042
2927 -#: builtin/index-pack.c:1114
3043 +#: builtin/index-pack.c:1262
3044 #, c-format
3045 msgid "cannot write keep file '%s'"
3046 msgstr ""
3047
2932 -#: builtin/index-pack.c:1122
3048 +#: builtin/index-pack.c:1270
3049 #, c-format
3050 msgid "cannot close written keep file '%s'"
3051 msgstr ""
3052
2937 -#: builtin/index-pack.c:1135
3053 +#: builtin/index-pack.c:1283
3054 msgid "cannot store pack file"
3055 msgstr ""
3056
2941 -#: builtin/index-pack.c:1146
3057 +#: builtin/index-pack.c:1294
3058 msgid "cannot store index file"
3059 msgstr ""
3060
2945 -#: builtin/index-pack.c:1247
3061 +#: builtin/index-pack.c:1395
3062 #, c-format
3063 msgid "Cannot open existing pack file '%s'"
3064 msgstr ""
3065
2950 -#: builtin/index-pack.c:1249
3066 +#: builtin/index-pack.c:1397
3067 #, c-format
3068 msgid "Cannot open existing pack idx file for '%s'"
3069 msgstr ""
3070
2955 -#: builtin/index-pack.c:1296
3071 +#: builtin/index-pack.c:1444
3072 #, c-format
3073 msgid "non delta: %d object"
3074 msgid_plural "non delta: %d objects"
3075 msgstr[0] ""
3076 msgstr[1] ""
3077
2962 -#: builtin/index-pack.c:1303
3078 +#: builtin/index-pack.c:1451
3079 #, c-format
3080 msgid "chain length = %d: %lu object"
3081 msgid_plural "chain length = %d: %lu objects"
3082 msgstr[0] ""
3083 msgstr[1] ""
3084
2969 -#: builtin/index-pack.c:1330
3085 +#: builtin/index-pack.c:1478
3086 msgid "Cannot come back to cwd"
3087 msgstr ""
3088
2973 -#: builtin/index-pack.c:1374 builtin/index-pack.c:1377
2974 -#: builtin/index-pack.c:1389 builtin/index-pack.c:1393
3089 +#: builtin/index-pack.c:1522 builtin/index-pack.c:1525
3090 +#: builtin/index-pack.c:1537 builtin/index-pack.c:1541
3091 #, c-format
3092 msgid "bad %s"
3093 msgstr ""
3094
2979 -#: builtin/index-pack.c:1407
3095 +#: builtin/index-pack.c:1555
3096 msgid "--fix-thin cannot be used without --stdin"
3097 msgstr ""
3098
2983 -#: builtin/index-pack.c:1411 builtin/index-pack.c:1421
3099 +#: builtin/index-pack.c:1559 builtin/index-pack.c:1569
3100 #, c-format
3101 msgid "packfile name '%s' does not end with '.pack'"
3102 msgstr ""
3103
2988 -#: builtin/index-pack.c:1430
3104 +#: builtin/index-pack.c:1578
3105 msgid "--verify with no packfile name given"
3106 msgstr ""
3107
@@ -3131,100 +3247,100 @@ msgstr ""
3247 msgid "Cannot access work tree '%s'"
3248 msgstr ""
3249
3134 -#: builtin/log.c:188
3250 +#: builtin/log.c:189
3251 #, c-format
3252 msgid "Final output: %d %s\n"
3253 msgstr ""
3254
3139 -#: builtin/log.c:401 builtin/log.c:489
3255 +#: builtin/log.c:402 builtin/log.c:490
3256 #, c-format
3257 msgid "Could not read object %s"
3258 msgstr ""
3259
3144 -#: builtin/log.c:513
3260 +#: builtin/log.c:514
3261 #, c-format
3262 msgid "Unknown type: %d"
3263 msgstr ""
3264
3149 -#: builtin/log.c:602
3265 +#: builtin/log.c:603
3266 msgid "format.headers without value"
3267 msgstr ""
3268
3153 -#: builtin/log.c:676
3269 +#: builtin/log.c:677
3270 msgid "name of output directory is too long"
3271 msgstr ""
3272
3157 -#: builtin/log.c:687
3273 +#: builtin/log.c:688
3274 #, c-format
3275 msgid "Cannot open patch file %s"
3276 msgstr ""
3277
3162 -#: builtin/log.c:701
3278 +#: builtin/log.c:702
3279 msgid "Need exactly one range."
3280 msgstr ""
3281
3166 -#: builtin/log.c:709
3282 +#: builtin/log.c:710
3283 msgid "Not a range."
3284 msgstr ""
3285
3170 -#: builtin/log.c:786
3286 +#: builtin/log.c:787
3287 msgid "Cover letter needs email format"
3288 msgstr ""
3289
3174 -#: builtin/log.c:859
3290 +#: builtin/log.c:860
3291 #, c-format
3292 msgid "insane in-reply-to: %s"
3293 msgstr ""
3294
3179 -#: builtin/log.c:932
3295 +#: builtin/log.c:933
3296 msgid "Two output directories?"
3297 msgstr ""
3298
3183 -#: builtin/log.c:1153
3299 +#: builtin/log.c:1154
3300 #, c-format
3301 msgid "bogus committer info %s"
3302 msgstr ""
3303
3188 -#: builtin/log.c:1198
3304 +#: builtin/log.c:1199
3305 msgid "-n and -k are mutually exclusive."
3306 msgstr ""
3307
3192 -#: builtin/log.c:1200
3308 +#: builtin/log.c:1201
3309 msgid "--subject-prefix and -k are mutually exclusive."
3310 msgstr ""
3311
3196 -#: builtin/log.c:1208
3312 +#: builtin/log.c:1209
3313 msgid "--name-only does not make sense"
3314 msgstr ""
3315
3200 -#: builtin/log.c:1210
3316 +#: builtin/log.c:1211
3317 msgid "--name-status does not make sense"
3318 msgstr ""
3319
3204 -#: builtin/log.c:1212
3320 +#: builtin/log.c:1213
3321 msgid "--check does not make sense"
3322 msgstr ""
3323
3208 -#: builtin/log.c:1235
3324 +#: builtin/log.c:1236
3325 msgid "standard output, or directory, which one?"
3326 msgstr ""
3327
3212 -#: builtin/log.c:1237
3328 +#: builtin/log.c:1238
3329 #, c-format
3330 msgid "Could not create directory '%s'"
3331 msgstr ""
3332
3217 -#: builtin/log.c:1390
3333 +#: builtin/log.c:1391
3334 msgid "Failed to create output files"
3335 msgstr ""
3336
3221 -#: builtin/log.c:1494
3337 +#: builtin/log.c:1495
3338 #, c-format
3339 msgid ""
3340 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
3341 msgstr ""
3342
3227 -#: builtin/log.c:1510 builtin/log.c:1512 builtin/log.c:1524
3343 +#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525
3344 #, c-format
3345 msgid "Unknown commit %s"
3346 msgstr ""
@@ -3694,22 +3810,27 @@ msgstr ""
3810 msgid "Unknown subcommand: %s"
3811 msgstr ""
3812
3697 -#: builtin/pack-objects.c:2337
3813 +#: builtin/pack-objects.c:183 builtin/pack-objects.c:186
3814 +#, c-format
3815 +msgid "deflate error (%d)"
3816 +msgstr ""
3817 +
3818 +#: builtin/pack-objects.c:2398
3819 #, c-format
3820 msgid "unsupported index version %s"
3821 msgstr ""
3822
3702 -#: builtin/pack-objects.c:2341
3823 +#: builtin/pack-objects.c:2402
3824 #, c-format
3825 msgid "bad index version '%s'"
3826 msgstr ""
3827
3707 -#: builtin/pack-objects.c:2364
3828 +#: builtin/pack-objects.c:2425
3829 #, c-format
3830 msgid "option %s does not accept negative form"
3831 msgstr ""
3832
3712 -#: builtin/pack-objects.c:2368
3833 +#: builtin/pack-objects.c:2429
3834 #, c-format
3835 msgid "unable to parse value '%s' for option %s"
3836 msgstr ""
@@ -5021,37 +5142,37 @@ msgstr ""
5142 msgid "(To restore them type \"git stash apply\")"
5143 msgstr ""
5144
5024 -#: git-submodule.sh:56
5145 +#: git-submodule.sh:88
5146 #, sh-format
5147 msgid "cannot strip one component off url '$remoteurl'"
5148 msgstr ""
5149
5029 -#: git-submodule.sh:109
5150 +#: git-submodule.sh:145
5151 #, sh-format
5152 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
5153 msgstr ""
5154
5034 -#: git-submodule.sh:150
5155 +#: git-submodule.sh:186
5156 #, sh-format
5157 msgid "Clone of '$url' into submodule path '$sm_path' failed"
5158 msgstr ""
5159
5039 -#: git-submodule.sh:160
5160 +#: git-submodule.sh:196
5161 #, sh-format
5162 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
5163 msgstr ""
5164
5044 -#: git-submodule.sh:249
5165 +#: git-submodule.sh:285
5166 #, sh-format
5167 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
5168 msgstr ""
5169
5049 -#: git-submodule.sh:266
5170 +#: git-submodule.sh:302
5171 #, sh-format
5172 msgid "'$sm_path' already exists in the index"
5173 msgstr ""
5174
5054 -#: git-submodule.sh:270
5175 +#: git-submodule.sh:306
5176 #, sh-format
5177 msgid ""
5178 "The following path is ignored by one of your .gitignore files:\n"
@@ -5059,155 +5180,155 @@ msgid ""
5180 "Use -f if you really want to add it."
5181 msgstr ""
5182
5062 -#: git-submodule.sh:281
5183 +#: git-submodule.sh:317
5184 #, sh-format
5185 msgid "Adding existing repo at '$sm_path' to the index"
5186 msgstr ""
5187
5067 -#: git-submodule.sh:283
5188 +#: git-submodule.sh:319
5189 #, sh-format
5190 msgid "'$sm_path' already exists and is not a valid git repo"
5191 msgstr ""
5192
5072 -#: git-submodule.sh:297
5193 +#: git-submodule.sh:333
5194 #, sh-format
5195 msgid "Unable to checkout submodule '$sm_path'"
5196 msgstr ""
5197
5077 -#: git-submodule.sh:302
5198 +#: git-submodule.sh:338
5199 #, sh-format
5200 msgid "Failed to add submodule '$sm_path'"
5201 msgstr ""
5202
5082 -#: git-submodule.sh:307
5203 +#: git-submodule.sh:343
5204 #, sh-format
5205 msgid "Failed to register submodule '$sm_path'"
5206 msgstr ""
5207
5087 -#: git-submodule.sh:349
5208 +#: git-submodule.sh:385
5209 #, sh-format
5210 msgid "Entering '$prefix$sm_path'"
5211 msgstr ""
5212
5092 -#: git-submodule.sh:363
5213 +#: git-submodule.sh:399
5214 #, sh-format
5215 msgid "Stopping at '$sm_path'; script returned non-zero status."
5216 msgstr ""
5217
5097 -#: git-submodule.sh:406
5218 +#: git-submodule.sh:442
5219 #, sh-format
5220 msgid "No url found for submodule path '$sm_path' in .gitmodules"
5221 msgstr ""
5222
5102 -#: git-submodule.sh:415
5223 +#: git-submodule.sh:451
5224 #, sh-format
5225 msgid "Failed to register url for submodule path '$sm_path'"
5226 msgstr ""
5227
5107 -#: git-submodule.sh:417
5228 +#: git-submodule.sh:453
5229 #, sh-format
5230 msgid "Submodule '$name' ($url) registered for path '$sm_path'"
5231 msgstr ""
5232
5112 -#: git-submodule.sh:425
5233 +#: git-submodule.sh:461
5234 #, sh-format
5235 msgid "Failed to register update mode for submodule path '$sm_path'"
5236 msgstr ""
5237
5117 -#: git-submodule.sh:524
5238 +#: git-submodule.sh:560
5239 #, sh-format
5240 msgid ""
5241 "Submodule path '$sm_path' not initialized\n"
5242 "Maybe you want to use 'update --init'?"
5243 msgstr ""
5244
5124 -#: git-submodule.sh:537
5245 +#: git-submodule.sh:573
5246 #, sh-format
5247 msgid "Unable to find current revision in submodule path '$sm_path'"
5248 msgstr ""
5249
5129 -#: git-submodule.sh:556
5250 +#: git-submodule.sh:592
5251 #, sh-format
5252 msgid "Unable to fetch in submodule path '$sm_path'"
5253 msgstr ""
5254
5134 -#: git-submodule.sh:570
5255 +#: git-submodule.sh:606
5256 #, sh-format
5257 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
5258 msgstr ""
5259
5139 -#: git-submodule.sh:571
5260 +#: git-submodule.sh:607
5261 #, sh-format
5262 msgid "Submodule path '$sm_path': rebased into '$sha1'"
5263 msgstr ""
5264
5144 -#: git-submodule.sh:576
5265 +#: git-submodule.sh:612
5266 #, sh-format
5267 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
5268 msgstr ""
5269
5149 -#: git-submodule.sh:577
5270 +#: git-submodule.sh:613
5271 #, sh-format
5272 msgid "Submodule path '$sm_path': merged in '$sha1'"
5273 msgstr ""
5274
5154 -#: git-submodule.sh:582
5275 +#: git-submodule.sh:618
5276 #, sh-format
5277 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
5278 msgstr ""
5279
5159 -#: git-submodule.sh:583
5280 +#: git-submodule.sh:619
5281 #, sh-format
5282 msgid "Submodule path '$sm_path': checked out '$sha1'"
5283 msgstr ""
5284
5164 -#: git-submodule.sh:605 git-submodule.sh:928
5285 +#: git-submodule.sh:641 git-submodule.sh:964
5286 #, sh-format
5287 msgid "Failed to recurse into submodule path '$sm_path'"
5288 msgstr ""
5289
5169 -#: git-submodule.sh:713
5290 +#: git-submodule.sh:749
5291 msgid "--cached cannot be used with --files"
5292 msgstr ""
5293
5294 #. unexpected type
5174 -#: git-submodule.sh:753
5295 +#: git-submodule.sh:789
5296 #, sh-format
5297 msgid "unexpected mode $mod_dst"
5298 msgstr ""
5299
5179 -#: git-submodule.sh:771
5300 +#: git-submodule.sh:807
5301 #, sh-format
5302 msgid " Warn: $name doesn't contain commit $sha1_src"
5303 msgstr ""
5304
5184 -#: git-submodule.sh:774
5305 +#: git-submodule.sh:810
5306 #, sh-format
5307 msgid " Warn: $name doesn't contain commit $sha1_dst"
5308 msgstr ""
5309
5189 -#: git-submodule.sh:777
5310 +#: git-submodule.sh:813
5311 #, sh-format
5312 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
5313 msgstr ""
5314
5194 -#: git-submodule.sh:802
5315 +#: git-submodule.sh:838
5316 msgid "blob"
5317 msgstr ""
5318
5198 -#: git-submodule.sh:803
5319 +#: git-submodule.sh:839
5320 msgid "submodule"
5321 msgstr ""
5322
5202 -#: git-submodule.sh:840
5323 +#: git-submodule.sh:876
5324 msgid "# Submodules changed but not updated:"
5325 msgstr ""
5326
5206 -#: git-submodule.sh:842
5327 +#: git-submodule.sh:878
5328 msgid "# Submodule changes to be committed:"
5329 msgstr ""
5330
5210 -#: git-submodule.sh:974
5331 +#: git-submodule.sh:1022
5332 #, sh-format
5333 msgid "Synchronizing submodule url for '$name'"
5334 msgstr ""