@matheusbsbs / matheus-bagliano / commits / 9306b5b9a3

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

This po/git.pot update is generated from v1.8.0-rc2-4-g42e55. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Jiang Xin committed Oct 16, 2012 at 08:39 UTC 9306b5b9a33185e7867202718162d8a38d5627ab
1 file changed +415 -437
po/git.pot
+415 -437
@@ -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-09-15 10:21+0800\n"
11 +"POT-Creation-Date: 2012-10-16 08:38+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"
@@ -68,11 +68,11 @@ msgstr ""
68 msgid "prepend prefix to each pathname in the archive"
69 msgstr ""
70
71 -#: archive.c:325 builtin/archive.c:91 builtin/blame.c:2332
72 -#: builtin/blame.c:2333 builtin/config.c:56 builtin/fast-export.c:642
73 -#: builtin/fast-export.c:644 builtin/grep.c:800 builtin/hash-object.c:77
74 -#: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:537
75 -#: builtin/notes.c:694 builtin/read-tree.c:107 parse-options.h:149
71 +#: archive.c:325 builtin/archive.c:91 builtin/blame.c:2389
72 +#: builtin/blame.c:2390 builtin/config.c:56 builtin/fast-export.c:642
73 +#: builtin/fast-export.c:644 builtin/grep.c:801 builtin/hash-object.c:77
74 +#: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:540
75 +#: builtin/notes.c:697 builtin/read-tree.c:107 parse-options.h:149
76 msgid "file"
77 msgstr ""
78
@@ -112,7 +112,7 @@ msgstr ""
112 msgid "retrieve the archive from remote repository <repo>"
113 msgstr ""
114
115 -#: archive.c:346 builtin/archive.c:95 builtin/notes.c:616
115 +#: archive.c:346 builtin/archive.c:95 builtin/notes.c:619
116 msgid "command"
117 msgstr ""
118
@@ -130,7 +130,7 @@ msgstr ""
130 msgid "unrecognized header: %s%s (%d)"
131 msgstr ""
132
133 -#: bundle.c:89 builtin/commit.c:714
133 +#: bundle.c:89 builtin/commit.c:672
134 #, c-format
135 msgid "could not open '%s'"
136 msgstr ""
@@ -139,7 +139,7 @@ msgstr ""
139 msgid "Repository lacks these prerequisite commits:"
140 msgstr ""
141
142 -#: bundle.c:164 sequencer.c:557 sequencer.c:989 builtin/log.c:290
142 +#: bundle.c:164 sequencer.c:562 sequencer.c:994 builtin/log.c:290
143 #: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347
144 #: builtin/shortlog.c:181
145 msgid "revision walk setup failed"
@@ -198,12 +198,12 @@ msgstr ""
198 msgid "index-pack died"
199 msgstr ""
200
201 -#: commit.c:48
201 +#: commit.c:50
202 #, c-format
203 msgid "could not parse %s"
204 msgstr ""
205
206 -#: commit.c:50
206 +#: commit.c:52
207 #, c-format
208 msgid "%s %s is not a commit!"
209 msgstr ""
@@ -310,32 +310,7 @@ msgid ""
310 "%s"
311 msgstr ""
312
313 -#: diff.c:1401
314 -msgid " 0 files changed"
315 -msgstr ""
316 -
317 -#: diff.c:1405
318 -#, c-format
319 -msgid " %d file changed"
320 -msgid_plural " %d files changed"
321 -msgstr[0] ""
322 -msgstr[1] ""
323 -
324 -#: diff.c:1422
325 -#, c-format
326 -msgid ", %d insertion(+)"
327 -msgid_plural ", %d insertions(+)"
328 -msgstr[0] ""
329 -msgstr[1] ""
330 -
331 -#: diff.c:1433
332 -#, c-format
333 -msgid ", %d deletion(-)"
334 -msgid_plural ", %d deletions(-)"
335 -msgstr[0] ""
336 -msgstr[1] ""
337 -
338 -#: diff.c:3460
313 +#: diff.c:3458
314 #, c-format
315 msgid ""
316 "Failed to parse --dirstat/-X option parameter:\n"
@@ -354,17 +329,17 @@ msgstr ""
329 msgid "gpg failed to sign the data"
330 msgstr ""
331
357 -#: grep.c:1320
332 +#: grep.c:1441
333 #, c-format
334 msgid "'%s': unable to read %s"
335 msgstr ""
336
362 -#: grep.c:1337
337 +#: grep.c:1458
338 #, c-format
339 msgid "'%s': %s"
340 msgstr ""
341
367 -#: grep.c:1348
342 +#: grep.c:1469
343 #, c-format
344 msgid "'%s': short read %s"
345 msgstr ""
@@ -709,239 +684,239 @@ msgid_plural ""
684 msgstr[0] ""
685 msgstr[1] ""
686
712 -#: sequencer.c:121 builtin/merge.c:864 builtin/merge.c:977
687 +#: sequencer.c:123 builtin/merge.c:864 builtin/merge.c:977
688 #: builtin/merge.c:1087 builtin/merge.c:1097
689 #, c-format
690 msgid "Could not open '%s' for writing"
691 msgstr ""
692
718 -#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:867
693 +#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:867
694 #: builtin/merge.c:1089 builtin/merge.c:1102
695 #, c-format
696 msgid "Could not write to '%s'"
697 msgstr ""
698
724 -#: sequencer.c:144
699 +#: sequencer.c:146
700 msgid ""
701 "after resolving the conflicts, mark the corrected paths\n"
702 "with 'git add <paths>' or 'git rm <paths>'"
703 msgstr ""
704
730 -#: sequencer.c:147
705 +#: sequencer.c:149
706 msgid ""
707 "after resolving the conflicts, mark the corrected paths\n"
708 "with 'git add <paths>' or 'git rm <paths>'\n"
709 "and commit the result with 'git commit'"
710 msgstr ""
711
737 -#: sequencer.c:160 sequencer.c:765 sequencer.c:848
712 +#: sequencer.c:162 sequencer.c:770 sequencer.c:853
713 #, c-format
714 msgid "Could not write to %s"
715 msgstr ""
716
742 -#: sequencer.c:163
717 +#: sequencer.c:165
718 #, c-format
719 msgid "Error wrapping up %s"
720 msgstr ""
721
747 -#: sequencer.c:178
722 +#: sequencer.c:180
723 msgid "Your local changes would be overwritten by cherry-pick."
724 msgstr ""
725
751 -#: sequencer.c:180
726 +#: sequencer.c:182
727 msgid "Your local changes would be overwritten by revert."
728 msgstr ""
729
755 -#: sequencer.c:183
730 +#: sequencer.c:185
731 msgid "Commit your changes or stash them to proceed."
732 msgstr ""
733
734 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
760 -#: sequencer.c:233
735 +#: sequencer.c:235
736 #, c-format
737 msgid "%s: Unable to write new index file"
738 msgstr ""
739
765 -#: sequencer.c:261
740 +#: sequencer.c:266
741 msgid "Could not resolve HEAD commit\n"
742 msgstr ""
743
769 -#: sequencer.c:282
744 +#: sequencer.c:287
745 msgid "Unable to update cache tree\n"
746 msgstr ""
747
773 -#: sequencer.c:327
748 +#: sequencer.c:332
749 #, c-format
750 msgid "Could not parse commit %s\n"
751 msgstr ""
752
778 -#: sequencer.c:332
753 +#: sequencer.c:337
754 #, c-format
755 msgid "Could not parse parent commit %s\n"
756 msgstr ""
757
783 -#: sequencer.c:398
758 +#: sequencer.c:403
759 msgid "Your index file is unmerged."
760 msgstr ""
761
787 -#: sequencer.c:401
762 +#: sequencer.c:406
763 msgid "You do not have a valid HEAD"
764 msgstr ""
765
791 -#: sequencer.c:416
766 +#: sequencer.c:421
767 #, c-format
768 msgid "Commit %s is a merge but no -m option was given."
769 msgstr ""
770
796 -#: sequencer.c:424
771 +#: sequencer.c:429
772 #, c-format
773 msgid "Commit %s does not have parent %d"
774 msgstr ""
775
801 -#: sequencer.c:428
776 +#: sequencer.c:433
777 #, c-format
778 msgid "Mainline was specified but commit %s is not a merge."
779 msgstr ""
780
781 #. TRANSLATORS: The first %s will be "revert" or
782 #. "cherry-pick", the second %s a SHA1
808 -#: sequencer.c:439
783 +#: sequencer.c:444
784 #, c-format
785 msgid "%s: cannot parse parent commit %s"
786 msgstr ""
787
813 -#: sequencer.c:443
788 +#: sequencer.c:448
789 #, c-format
790 msgid "Cannot get commit message for %s"
791 msgstr ""
792
818 -#: sequencer.c:527
793 +#: sequencer.c:532
794 #, c-format
795 msgid "could not revert %s... %s"
796 msgstr ""
797
823 -#: sequencer.c:528
798 +#: sequencer.c:533
799 #, c-format
800 msgid "could not apply %s... %s"
801 msgstr ""
802
828 -#: sequencer.c:560
803 +#: sequencer.c:565
804 msgid "empty commit set passed"
805 msgstr ""
806
832 -#: sequencer.c:568
807 +#: sequencer.c:573
808 #, c-format
809 msgid "git %s: failed to read the index"
810 msgstr ""
811
837 -#: sequencer.c:573
812 +#: sequencer.c:578
813 #, c-format
814 msgid "git %s: failed to refresh the index"
815 msgstr ""
816
842 -#: sequencer.c:631
817 +#: sequencer.c:636
818 #, c-format
819 msgid "Cannot %s during a %s"
820 msgstr ""
821
847 -#: sequencer.c:653
822 +#: sequencer.c:658
823 #, c-format
824 msgid "Could not parse line %d."
825 msgstr ""
826
852 -#: sequencer.c:658
827 +#: sequencer.c:663
828 msgid "No commits parsed."
829 msgstr ""
830
856 -#: sequencer.c:671
831 +#: sequencer.c:676
832 #, c-format
833 msgid "Could not open %s"
834 msgstr ""
835
861 -#: sequencer.c:675
836 +#: sequencer.c:680
837 #, c-format
838 msgid "Could not read %s."
839 msgstr ""
840
866 -#: sequencer.c:682
841 +#: sequencer.c:687
842 #, c-format
843 msgid "Unusable instruction sheet: %s"
844 msgstr ""
845
871 -#: sequencer.c:710
846 +#: sequencer.c:715
847 #, c-format
848 msgid "Invalid key: %s"
849 msgstr ""
850
876 -#: sequencer.c:713
851 +#: sequencer.c:718
852 #, c-format
853 msgid "Invalid value for %s: %s"
854 msgstr ""
855
881 -#: sequencer.c:725
856 +#: sequencer.c:730
857 #, c-format
858 msgid "Malformed options sheet: %s"
859 msgstr ""
860
886 -#: sequencer.c:746
861 +#: sequencer.c:751
862 msgid "a cherry-pick or revert is already in progress"
863 msgstr ""
864
890 -#: sequencer.c:747
865 +#: sequencer.c:752
866 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
867 msgstr ""
868
894 -#: sequencer.c:751
869 +#: sequencer.c:756
870 #, c-format
871 msgid "Could not create sequencer directory %s"
872 msgstr ""
873
899 -#: sequencer.c:767 sequencer.c:852
874 +#: sequencer.c:772 sequencer.c:857
875 #, c-format
876 msgid "Error wrapping up %s."
877 msgstr ""
878
904 -#: sequencer.c:786 sequencer.c:920
879 +#: sequencer.c:791 sequencer.c:925
880 msgid "no cherry-pick or revert in progress"
881 msgstr ""
882
908 -#: sequencer.c:788
883 +#: sequencer.c:793
884 msgid "cannot resolve HEAD"
885 msgstr ""
886
912 -#: sequencer.c:790
887 +#: sequencer.c:795
888 msgid "cannot abort from a branch yet to be born"
889 msgstr ""
890
916 -#: sequencer.c:812 builtin/apply.c:4005
891 +#: sequencer.c:817 builtin/apply.c:4005
892 #, c-format
893 msgid "cannot open %s: %s"
894 msgstr ""
895
921 -#: sequencer.c:815
896 +#: sequencer.c:820
897 #, c-format
898 msgid "cannot read %s: %s"
899 msgstr ""
900
926 -#: sequencer.c:816
901 +#: sequencer.c:821
902 msgid "unexpected end of file"
903 msgstr ""
904
930 -#: sequencer.c:822
905 +#: sequencer.c:827
906 #, c-format
907 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
908 msgstr ""
909
935 -#: sequencer.c:845
910 +#: sequencer.c:850
911 #, c-format
912 msgid "Could not format %s."
913 msgstr ""
914
940 -#: sequencer.c:1007
915 +#: sequencer.c:1012
916 msgid "Can't revert as initial commit"
917 msgstr ""
918
944 -#: sequencer.c:1008
919 +#: sequencer.c:1013
920 msgid "Can't cherry-pick into empty head"
921 msgstr ""
922
@@ -1324,7 +1299,7 @@ msgstr ""
1299 msgid "unexpected diff status %c"
1300 msgstr ""
1301
1327 -#: builtin/add.c:67 builtin/commit.c:229
1302 +#: builtin/add.c:67 builtin/commit.c:230
1303 msgid "updating files failed"
1304 msgstr ""
1305
@@ -1389,7 +1364,7 @@ msgstr ""
1364 msgid "dry run"
1365 msgstr ""
1366
1392 -#: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:1187
1367 +#: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:1154
1368 #: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1477
1369 #: builtin/mv.c:62 builtin/read-tree.c:112
1370 msgid "be verbose"
@@ -1466,7 +1441,7 @@ msgstr ""
1441 msgid "Maybe you wanted to say 'git add .'?\n"
1442 msgstr ""
1443
1469 -#: builtin/add.c:421 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82
1444 +#: builtin/add.c:421 builtin/clean.c:95 builtin/commit.c:290 builtin/mv.c:82
1445 #: builtin/rm.c:162
1446 msgid "index file corrupt"
1447 msgstr ""
@@ -2000,95 +1975,95 @@ msgstr ""
1975 msgid "[rev-opts] are documented in git-rev-list(1)"
1976 msgstr ""
1977
2003 -#: builtin/blame.c:2316
1978 +#: builtin/blame.c:2373
1979 msgid "Show blame entries as we find them, incrementally"
1980 msgstr ""
1981
2007 -#: builtin/blame.c:2317
1982 +#: builtin/blame.c:2374
1983 msgid "Show blank SHA-1 for boundary commits (Default: off)"
1984 msgstr ""
1985
2011 -#: builtin/blame.c:2318
1986 +#: builtin/blame.c:2375
1987 msgid "Do not treat root commits as boundaries (Default: off)"
1988 msgstr ""
1989
2015 -#: builtin/blame.c:2319
1990 +#: builtin/blame.c:2376
1991 msgid "Show work cost statistics"
1992 msgstr ""
1993
2019 -#: builtin/blame.c:2320
1994 +#: builtin/blame.c:2377
1995 msgid "Show output score for blame entries"
1996 msgstr ""
1997
2023 -#: builtin/blame.c:2321
1998 +#: builtin/blame.c:2378
1999 msgid "Show original filename (Default: auto)"
2000 msgstr ""
2001
2027 -#: builtin/blame.c:2322
2002 +#: builtin/blame.c:2379
2003 msgid "Show original linenumber (Default: off)"
2004 msgstr ""
2005
2031 -#: builtin/blame.c:2323
2006 +#: builtin/blame.c:2380
2007 msgid "Show in a format designed for machine consumption"
2008 msgstr ""
2009
2035 -#: builtin/blame.c:2324
2010 +#: builtin/blame.c:2381
2011 msgid "Show porcelain format with per-line commit information"
2012 msgstr ""
2013
2039 -#: builtin/blame.c:2325
2014 +#: builtin/blame.c:2382
2015 msgid "Use the same output mode as git-annotate (Default: off)"
2016 msgstr ""
2017
2043 -#: builtin/blame.c:2326
2018 +#: builtin/blame.c:2383
2019 msgid "Show raw timestamp (Default: off)"
2020 msgstr ""
2021
2047 -#: builtin/blame.c:2327
2022 +#: builtin/blame.c:2384
2023 msgid "Show long commit SHA1 (Default: off)"
2024 msgstr ""
2025
2051 -#: builtin/blame.c:2328
2026 +#: builtin/blame.c:2385
2027 msgid "Suppress author name and timestamp (Default: off)"
2028 msgstr ""
2029
2055 -#: builtin/blame.c:2329
2030 +#: builtin/blame.c:2386
2031 msgid "Show author email instead of name (Default: off)"
2032 msgstr ""
2033
2059 -#: builtin/blame.c:2330
2034 +#: builtin/blame.c:2387
2035 msgid "Ignore whitespace differences"
2036 msgstr ""
2037
2063 -#: builtin/blame.c:2331
2038 +#: builtin/blame.c:2388
2039 msgid "Spend extra cycles to find better match"
2040 msgstr ""
2041
2067 -#: builtin/blame.c:2332
2042 +#: builtin/blame.c:2389
2043 msgid "Use revisions from <file> instead of calling git-rev-list"
2044 msgstr ""
2045
2071 -#: builtin/blame.c:2333
2046 +#: builtin/blame.c:2390
2047 msgid "Use <file>'s contents as the final image"
2048 msgstr ""
2049
2075 -#: builtin/blame.c:2334 builtin/blame.c:2335
2050 +#: builtin/blame.c:2391 builtin/blame.c:2392
2051 msgid "score"
2052 msgstr ""
2053
2079 -#: builtin/blame.c:2334
2054 +#: builtin/blame.c:2391
2055 msgid "Find line copies within and across files"
2056 msgstr ""
2057
2083 -#: builtin/blame.c:2335
2058 +#: builtin/blame.c:2392
2059 msgid "Find line movements within and across files"
2060 msgstr ""
2061
2087 -#: builtin/blame.c:2336
2062 +#: builtin/blame.c:2393
2063 msgid "n,m"
2064 msgstr ""
2065
2091 -#: builtin/blame.c:2336
2066 +#: builtin/blame.c:2393
2067 msgid "Process only line range n,m, counting from 1"
2068 msgstr ""
2069
@@ -2290,8 +2265,8 @@ msgid "act on remote-tracking branches"
2265 msgstr ""
2266
2267 #: builtin/branch.c:738 builtin/branch.c:744 builtin/branch.c:765
2293 -#: builtin/branch.c:771 builtin/commit.c:1395 builtin/commit.c:1396
2294 -#: builtin/commit.c:1397 builtin/commit.c:1398 builtin/tag.c:470
2268 +#: builtin/branch.c:771 builtin/commit.c:1362 builtin/commit.c:1363
2269 +#: builtin/commit.c:1364 builtin/commit.c:1365 builtin/tag.c:470
2270 msgid "commit"
2271 msgstr ""
2272
@@ -2460,7 +2435,7 @@ msgid "git check-attr [-a | --all | attr...] [--] pathname..."
2435 msgstr ""
2436
2437 #: builtin/check-attr.c:12
2463 -msgid "git check-attr --stdin [-a | --all | attr...] < <list-of-paths>"
2438 +msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
2439 msgstr ""
2440
2441 #: builtin/check-attr.c:19
@@ -2823,7 +2798,7 @@ msgstr ""
2798 msgid "remove whole directories"
2799 msgstr ""
2800
2826 -#: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:802
2801 +#: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:803
2802 #: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:199
2803 msgid "pattern"
2804 msgstr ""
@@ -2945,7 +2920,7 @@ msgstr ""
2920 msgid "path to git-upload-pack on the remote"
2921 msgstr ""
2922
2948 -#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:747
2923 +#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:748
2924 msgid "depth"
2925 msgstr ""
2926
@@ -3022,69 +2997,69 @@ msgstr ""
2997 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
2998 msgstr ""
2999
3025 -#: builtin/clone.c:642
3000 +#: builtin/clone.c:690
3001 msgid "Too many arguments."
3002 msgstr ""
3003
3029 -#: builtin/clone.c:646
3004 +#: builtin/clone.c:694
3005 msgid "You must specify a repository to clone."
3006 msgstr ""
3007
3033 -#: builtin/clone.c:657
3008 +#: builtin/clone.c:705
3009 #, c-format
3010 msgid "--bare and --origin %s options are incompatible."
3011 msgstr ""
3012
3038 -#: builtin/clone.c:671
3013 +#: builtin/clone.c:719
3014 #, c-format
3015 msgid "repository '%s' does not exist"
3016 msgstr ""
3017
3043 -#: builtin/clone.c:676
3018 +#: builtin/clone.c:724
3019 msgid "--depth is ignored in local clones; use file:// instead."
3020 msgstr ""
3021
3047 -#: builtin/clone.c:686
3022 +#: builtin/clone.c:734
3023 #, c-format
3024 msgid "destination path '%s' already exists and is not an empty directory."
3025 msgstr ""
3026
3052 -#: builtin/clone.c:696
3027 +#: builtin/clone.c:744
3028 #, c-format
3029 msgid "working tree '%s' already exists."
3030 msgstr ""
3031
3057 -#: builtin/clone.c:709 builtin/clone.c:723
3032 +#: builtin/clone.c:757 builtin/clone.c:771
3033 #, c-format
3034 msgid "could not create leading directories of '%s'"
3035 msgstr ""
3036
3062 -#: builtin/clone.c:712
3037 +#: builtin/clone.c:760
3038 #, c-format
3039 msgid "could not create work tree dir '%s'."
3040 msgstr ""
3041
3067 -#: builtin/clone.c:731
3042 +#: builtin/clone.c:779
3043 #, c-format
3044 msgid "Cloning into bare repository '%s'...\n"
3045 msgstr ""
3046
3072 -#: builtin/clone.c:733
3047 +#: builtin/clone.c:781
3048 #, c-format
3049 msgid "Cloning into '%s'...\n"
3050 msgstr ""
3051
3077 -#: builtin/clone.c:789
3052 +#: builtin/clone.c:823
3053 #, c-format
3054 msgid "Don't know how to clone %s"
3055 msgstr ""
3056
3082 -#: builtin/clone.c:838
3057 +#: builtin/clone.c:872
3058 #, c-format
3059 msgid "Remote branch %s not found in upstream %s"
3060 msgstr ""
3061
3087 -#: builtin/clone.c:845
3062 +#: builtin/clone.c:879
3063 msgid "You appear to have cloned an empty repository."
3064 msgstr ""
3065
@@ -3120,15 +3095,15 @@ msgstr ""
3095 msgid "--command must be the first argument"
3096 msgstr ""
3097
3123 -#: builtin/commit.c:33
3098 +#: builtin/commit.c:34
3099 msgid "git commit [options] [--] <filepattern>..."
3100 msgstr ""
3101
3127 -#: builtin/commit.c:38
3102 +#: builtin/commit.c:39
3103 msgid "git status [options] [--] <filepattern>..."
3104 msgstr ""
3105
3131 -#: builtin/commit.c:43
3106 +#: builtin/commit.c:44
3107 msgid ""
3108 "Your name and email address were configured automatically based\n"
3109 "on your username and hostname. Please check that they are accurate.\n"
@@ -3142,14 +3117,14 @@ msgid ""
3117 " git commit --amend --reset-author\n"
3118 msgstr ""
3119
3145 -#: builtin/commit.c:55
3120 +#: builtin/commit.c:56
3121 msgid ""
3122 "You asked to amend the most recent commit, but doing so would make\n"
3123 "it empty. You can repeat your command with --allow-empty, or you can\n"
3124 "remove the commit entirely with \"git reset HEAD^\".\n"
3125 msgstr ""
3126
3152 -#: builtin/commit.c:60
3127 +#: builtin/commit.c:61
3128 msgid ""
3129 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
3130 "If you wish to commit it anyway, use:\n"
@@ -3159,93 +3134,93 @@ msgid ""
3134 "Otherwise, please use 'git reset'\n"
3135 msgstr ""
3136
3162 -#: builtin/commit.c:256
3137 +#: builtin/commit.c:257
3138 msgid "failed to unpack HEAD tree object"
3139 msgstr ""
3140
3166 -#: builtin/commit.c:298
3141 +#: builtin/commit.c:299
3142 msgid "unable to create temporary index"
3143 msgstr ""
3144
3170 -#: builtin/commit.c:304
3145 +#: builtin/commit.c:305
3146 msgid "interactive add failed"
3147 msgstr ""
3148
3174 -#: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408
3149 +#: builtin/commit.c:338 builtin/commit.c:359 builtin/commit.c:409
3150 msgid "unable to write new_index file"
3151 msgstr ""
3152
3178 -#: builtin/commit.c:389
3153 +#: builtin/commit.c:390
3154 msgid "cannot do a partial commit during a merge."
3155 msgstr ""
3156
3182 -#: builtin/commit.c:391
3157 +#: builtin/commit.c:392
3158 msgid "cannot do a partial commit during a cherry-pick."
3159 msgstr ""
3160
3186 -#: builtin/commit.c:401
3161 +#: builtin/commit.c:402
3162 msgid "cannot read the index"
3163 msgstr ""
3164
3190 -#: builtin/commit.c:421
3165 +#: builtin/commit.c:422
3166 msgid "unable to write temporary index file"
3167 msgstr ""
3168
3194 -#: builtin/commit.c:510 builtin/commit.c:516
3169 +#: builtin/commit.c:509 builtin/commit.c:515
3170 #, c-format
3171 msgid "invalid commit: %s"
3172 msgstr ""
3173
3199 -#: builtin/commit.c:539
3174 +#: builtin/commit.c:538
3175 msgid "malformed --author parameter"
3176 msgstr ""
3177
3203 -#: builtin/commit.c:600
3178 +#: builtin/commit.c:558
3179 #, c-format
3180 msgid "Malformed ident string: '%s'"
3181 msgstr ""
3182
3208 -#: builtin/commit.c:638 builtin/commit.c:671 builtin/commit.c:985
3183 +#: builtin/commit.c:596 builtin/commit.c:629 builtin/commit.c:952
3184 #, c-format
3185 msgid "could not lookup commit %s"
3186 msgstr ""
3187
3213 -#: builtin/commit.c:650 builtin/shortlog.c:296
3188 +#: builtin/commit.c:608 builtin/shortlog.c:296
3189 #, c-format
3190 msgid "(reading log message from standard input)\n"
3191 msgstr ""
3192
3218 -#: builtin/commit.c:652
3193 +#: builtin/commit.c:610
3194 msgid "could not read log from standard input"
3195 msgstr ""
3196
3222 -#: builtin/commit.c:656
3197 +#: builtin/commit.c:614
3198 #, c-format
3199 msgid "could not read log file '%s'"
3200 msgstr ""
3201
3227 -#: builtin/commit.c:662
3202 +#: builtin/commit.c:620
3203 msgid "commit has empty message"
3204 msgstr ""
3205
3231 -#: builtin/commit.c:678
3206 +#: builtin/commit.c:636
3207 msgid "could not read MERGE_MSG"
3208 msgstr ""
3209
3235 -#: builtin/commit.c:682
3210 +#: builtin/commit.c:640
3211 msgid "could not read SQUASH_MSG"
3212 msgstr ""
3213
3239 -#: builtin/commit.c:686
3214 +#: builtin/commit.c:644
3215 #, c-format
3216 msgid "could not read '%s'"
3217 msgstr ""
3218
3244 -#: builtin/commit.c:738
3219 +#: builtin/commit.c:705
3220 msgid "could not write commit template"
3221 msgstr ""
3222
3248 -#: builtin/commit.c:749
3223 +#: builtin/commit.c:716
3224 #, c-format
3225 msgid ""
3226 "\n"
@@ -3255,7 +3230,7 @@ msgid ""
3230 "and try again.\n"
3231 msgstr ""
3232
3258 -#: builtin/commit.c:754
3233 +#: builtin/commit.c:721
3234 #, c-format
3235 msgid ""
3236 "\n"
@@ -3265,356 +3240,356 @@ msgid ""
3240 "and try again.\n"
3241 msgstr ""
3242
3268 -#: builtin/commit.c:766
3243 +#: builtin/commit.c:733
3244 msgid ""
3245 "Please enter the commit message for your changes. Lines starting\n"
3246 "with '#' will be ignored, and an empty message aborts the commit.\n"
3247 msgstr ""
3248
3274 -#: builtin/commit.c:771
3249 +#: builtin/commit.c:738
3250 msgid ""
3251 "Please enter the commit message for your changes. Lines starting\n"
3252 "with '#' will be kept; you may remove them yourself if you want to.\n"
3253 "An empty message aborts the commit.\n"
3254 msgstr ""
3255
3281 -#: builtin/commit.c:784
3256 +#: builtin/commit.c:751
3257 #, c-format
3258 msgid "%sAuthor: %s"
3259 msgstr ""
3260
3286 -#: builtin/commit.c:791
3261 +#: builtin/commit.c:758
3262 #, c-format
3263 msgid "%sCommitter: %s"
3264 msgstr ""
3265
3291 -#: builtin/commit.c:811
3266 +#: builtin/commit.c:778
3267 msgid "Cannot read index"
3268 msgstr ""
3269
3295 -#: builtin/commit.c:848
3270 +#: builtin/commit.c:815
3271 msgid "Error building trees"
3272 msgstr ""
3273
3299 -#: builtin/commit.c:863 builtin/tag.c:361
3274 +#: builtin/commit.c:830 builtin/tag.c:361
3275 #, c-format
3276 msgid "Please supply the message using either -m or -F option.\n"
3277 msgstr ""
3278
3304 -#: builtin/commit.c:960
3279 +#: builtin/commit.c:927
3280 #, c-format
3281 msgid "No existing author found with '%s'"
3282 msgstr ""
3283
3309 -#: builtin/commit.c:975 builtin/commit.c:1175
3284 +#: builtin/commit.c:942 builtin/commit.c:1142
3285 #, c-format
3286 msgid "Invalid untracked files mode '%s'"
3287 msgstr ""
3288
3314 -#: builtin/commit.c:1015
3289 +#: builtin/commit.c:982
3290 msgid "Using both --reset-author and --author does not make sense"
3291 msgstr ""
3292
3318 -#: builtin/commit.c:1026
3293 +#: builtin/commit.c:993
3294 msgid "You have nothing to amend."
3295 msgstr ""
3296
3322 -#: builtin/commit.c:1029
3297 +#: builtin/commit.c:996
3298 msgid "You are in the middle of a merge -- cannot amend."
3299 msgstr ""
3300
3326 -#: builtin/commit.c:1031
3301 +#: builtin/commit.c:998
3302 msgid "You are in the middle of a cherry-pick -- cannot amend."
3303 msgstr ""
3304
3330 -#: builtin/commit.c:1034
3305 +#: builtin/commit.c:1001
3306 msgid "Options --squash and --fixup cannot be used together"
3307 msgstr ""
3308
3334 -#: builtin/commit.c:1044
3309 +#: builtin/commit.c:1011
3310 msgid "Only one of -c/-C/-F/--fixup can be used."
3311 msgstr ""
3312
3338 -#: builtin/commit.c:1046
3313 +#: builtin/commit.c:1013
3314 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
3315 msgstr ""
3316
3342 -#: builtin/commit.c:1054
3317 +#: builtin/commit.c:1021
3318 msgid "--reset-author can be used only with -C, -c or --amend."
3319 msgstr ""
3320
3346 -#: builtin/commit.c:1071
3321 +#: builtin/commit.c:1038
3322 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
3323 msgstr ""
3324
3350 -#: builtin/commit.c:1073
3325 +#: builtin/commit.c:1040
3326 msgid "No paths with --include/--only does not make sense."
3327 msgstr ""
3328
3354 -#: builtin/commit.c:1075
3329 +#: builtin/commit.c:1042
3330 msgid "Clever... amending the last one with dirty index."
3331 msgstr ""
3332
3358 -#: builtin/commit.c:1077
3333 +#: builtin/commit.c:1044
3334 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
3335 msgstr ""
3336
3362 -#: builtin/commit.c:1087 builtin/tag.c:577
3337 +#: builtin/commit.c:1054 builtin/tag.c:577
3338 #, c-format
3339 msgid "Invalid cleanup mode %s"
3340 msgstr ""
3341
3367 -#: builtin/commit.c:1092
3342 +#: builtin/commit.c:1059
3343 msgid "Paths with -a does not make sense."
3344 msgstr ""
3345
3371 -#: builtin/commit.c:1189 builtin/commit.c:1417
3346 +#: builtin/commit.c:1156 builtin/commit.c:1384
3347 msgid "show status concisely"
3348 msgstr ""
3349
3375 -#: builtin/commit.c:1191 builtin/commit.c:1419
3350 +#: builtin/commit.c:1158 builtin/commit.c:1386
3351 msgid "show branch information"
3352 msgstr ""
3353
3379 -#: builtin/commit.c:1193 builtin/commit.c:1421 builtin/push.c:389
3354 +#: builtin/commit.c:1160 builtin/commit.c:1388 builtin/push.c:389
3355 msgid "machine-readable output"
3356 msgstr ""
3357
3383 -#: builtin/commit.c:1196 builtin/commit.c:1423
3358 +#: builtin/commit.c:1163 builtin/commit.c:1390
3359 msgid "terminate entries with NUL"
3360 msgstr ""
3361
3387 -#: builtin/commit.c:1198 builtin/commit.c:1426 builtin/fast-export.c:636
3362 +#: builtin/commit.c:1165 builtin/commit.c:1393 builtin/fast-export.c:636
3363 #: builtin/fast-export.c:639 builtin/tag.c:461
3364 msgid "mode"
3365 msgstr ""
3366
3392 -#: builtin/commit.c:1199 builtin/commit.c:1426
3367 +#: builtin/commit.c:1166 builtin/commit.c:1393
3368 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
3369 msgstr ""
3370
3396 -#: builtin/commit.c:1202
3371 +#: builtin/commit.c:1169
3372 msgid "show ignored files"
3373 msgstr ""
3374
3400 -#: builtin/commit.c:1203 parse-options.h:151
3375 +#: builtin/commit.c:1170 parse-options.h:151
3376 msgid "when"
3377 msgstr ""
3378
3404 -#: builtin/commit.c:1204
3379 +#: builtin/commit.c:1171
3380 msgid ""
3381 "ignore changes to submodules, optional when: all, dirty, untracked. "
3382 "(Default: all)"
3383 msgstr ""
3384
3410 -#: builtin/commit.c:1206
3385 +#: builtin/commit.c:1173
3386 msgid "list untracked files in columns"
3387 msgstr ""
3388
3414 -#: builtin/commit.c:1275
3389 +#: builtin/commit.c:1242
3390 msgid "couldn't look up newly created commit"
3391 msgstr ""
3392
3418 -#: builtin/commit.c:1277
3393 +#: builtin/commit.c:1244
3394 msgid "could not parse newly created commit"
3395 msgstr ""
3396
3422 -#: builtin/commit.c:1318
3397 +#: builtin/commit.c:1285
3398 msgid "detached HEAD"
3399 msgstr ""
3400
3426 -#: builtin/commit.c:1320
3401 +#: builtin/commit.c:1287
3402 msgid " (root-commit)"
3403 msgstr ""
3404
3430 -#: builtin/commit.c:1387
3405 +#: builtin/commit.c:1354
3406 msgid "suppress summary after successful commit"
3407 msgstr ""
3408
3434 -#: builtin/commit.c:1388
3409 +#: builtin/commit.c:1355
3410 msgid "show diff in commit message template"
3411 msgstr ""
3412
3438 -#: builtin/commit.c:1390
3413 +#: builtin/commit.c:1357
3414 msgid "Commit message options"
3415 msgstr ""
3416
3442 -#: builtin/commit.c:1391 builtin/tag.c:459
3417 +#: builtin/commit.c:1358 builtin/tag.c:459
3418 msgid "read message from file"
3419 msgstr ""
3420
3446 -#: builtin/commit.c:1392
3421 +#: builtin/commit.c:1359
3422 msgid "author"
3423 msgstr ""
3424
3450 -#: builtin/commit.c:1392
3425 +#: builtin/commit.c:1359
3426 msgid "override author for commit"
3427 msgstr ""
3428
3454 -#: builtin/commit.c:1393 builtin/gc.c:178
3429 +#: builtin/commit.c:1360 builtin/gc.c:178
3430 msgid "date"
3431 msgstr ""
3432
3458 -#: builtin/commit.c:1393
3433 +#: builtin/commit.c:1360
3434 msgid "override date for commit"
3435 msgstr ""
3436
3462 -#: builtin/commit.c:1394 builtin/merge.c:206 builtin/notes.c:534
3463 -#: builtin/notes.c:691 builtin/tag.c:457
3437 +#: builtin/commit.c:1361 builtin/merge.c:206 builtin/notes.c:537
3438 +#: builtin/notes.c:694 builtin/tag.c:457
3439 msgid "message"
3440 msgstr ""
3441
3467 -#: builtin/commit.c:1394
3442 +#: builtin/commit.c:1361
3443 msgid "commit message"
3444 msgstr ""
3445
3471 -#: builtin/commit.c:1395
3446 +#: builtin/commit.c:1362
3447 msgid "reuse and edit message from specified commit"
3448 msgstr ""
3449
3475 -#: builtin/commit.c:1396
3450 +#: builtin/commit.c:1363
3451 msgid "reuse message from specified commit"
3452 msgstr ""
3453
3479 -#: builtin/commit.c:1397
3454 +#: builtin/commit.c:1364
3455 msgid "use autosquash formatted message to fixup specified commit"
3456 msgstr ""
3457
3483 -#: builtin/commit.c:1398
3458 +#: builtin/commit.c:1365
3459 msgid "use autosquash formatted message to squash specified commit"
3460 msgstr ""
3461
3487 -#: builtin/commit.c:1399
3462 +#: builtin/commit.c:1366
3463 msgid "the commit is authored by me now (used with -C/-c/--amend)"
3464 msgstr ""
3465
3491 -#: builtin/commit.c:1400 builtin/log.c:1068 builtin/revert.c:109
3466 +#: builtin/commit.c:1367 builtin/log.c:1068 builtin/revert.c:109
3467 msgid "add Signed-off-by:"
3468 msgstr ""
3469
3495 -#: builtin/commit.c:1401
3470 +#: builtin/commit.c:1368
3471 msgid "use specified template file"
3472 msgstr ""
3473
3499 -#: builtin/commit.c:1402
3474 +#: builtin/commit.c:1369
3475 msgid "force edit of commit"
3476 msgstr ""
3477
3503 -#: builtin/commit.c:1403
3478 +#: builtin/commit.c:1370
3479 msgid "default"
3480 msgstr ""
3481
3507 -#: builtin/commit.c:1403 builtin/tag.c:462
3482 +#: builtin/commit.c:1370 builtin/tag.c:462
3483 msgid "how to strip spaces and #comments from message"
3484 msgstr ""
3485
3511 -#: builtin/commit.c:1404
3486 +#: builtin/commit.c:1371
3487 msgid "include status in commit message template"
3488 msgstr ""
3489
3515 -#: builtin/commit.c:1405 builtin/merge.c:213 builtin/tag.c:463
3490 +#: builtin/commit.c:1372 builtin/merge.c:213 builtin/tag.c:463
3491 msgid "key id"
3492 msgstr ""
3493
3519 -#: builtin/commit.c:1406 builtin/merge.c:214
3494 +#: builtin/commit.c:1373 builtin/merge.c:214
3495 msgid "GPG sign commit"
3496 msgstr ""
3497
3498 #. end commit message options
3524 -#: builtin/commit.c:1409
3499 +#: builtin/commit.c:1376
3500 msgid "Commit contents options"
3501 msgstr ""
3502
3528 -#: builtin/commit.c:1410
3503 +#: builtin/commit.c:1377
3504 msgid "commit all changed files"
3505 msgstr ""
3506
3532 -#: builtin/commit.c:1411
3507 +#: builtin/commit.c:1378
3508 msgid "add specified files to index for commit"
3509 msgstr ""
3510
3536 -#: builtin/commit.c:1412
3511 +#: builtin/commit.c:1379
3512 msgid "interactively add files"
3513 msgstr ""
3514
3540 -#: builtin/commit.c:1413
3515 +#: builtin/commit.c:1380
3516 msgid "interactively add changes"
3517 msgstr ""
3518
3544 -#: builtin/commit.c:1414
3519 +#: builtin/commit.c:1381
3520 msgid "commit only specified files"
3521 msgstr ""
3522
3548 -#: builtin/commit.c:1415
3523 +#: builtin/commit.c:1382
3524 msgid "bypass pre-commit hook"
3525 msgstr ""
3526
3552 -#: builtin/commit.c:1416
3527 +#: builtin/commit.c:1383
3528 msgid "show what would be committed"
3529 msgstr ""
3530
3556 -#: builtin/commit.c:1424
3531 +#: builtin/commit.c:1391
3532 msgid "amend previous commit"
3533 msgstr ""
3534
3560 -#: builtin/commit.c:1425
3535 +#: builtin/commit.c:1392
3536 msgid "bypass post-rewrite hook"
3537 msgstr ""
3538
3564 -#: builtin/commit.c:1430
3539 +#: builtin/commit.c:1397
3540 msgid "ok to record an empty change"
3541 msgstr ""
3542
3568 -#: builtin/commit.c:1433
3543 +#: builtin/commit.c:1400
3544 msgid "ok to record a change with an empty message"
3545 msgstr ""
3546
3572 -#: builtin/commit.c:1464
3547 +#: builtin/commit.c:1432
3548 msgid "could not parse HEAD commit"
3549 msgstr ""
3550
3576 -#: builtin/commit.c:1502 builtin/merge.c:508
3551 +#: builtin/commit.c:1470 builtin/merge.c:508
3552 #, c-format
3553 msgid "could not open '%s' for reading"
3554 msgstr ""
3555
3581 -#: builtin/commit.c:1509
3556 +#: builtin/commit.c:1477
3557 #, c-format
3558 msgid "Corrupt MERGE_HEAD file (%s)"
3559 msgstr ""
3560
3586 -#: builtin/commit.c:1516
3561 +#: builtin/commit.c:1484
3562 msgid "could not read MERGE_MODE"
3563 msgstr ""
3564
3590 -#: builtin/commit.c:1535
3565 +#: builtin/commit.c:1503
3566 #, c-format
3567 msgid "could not read commit message: %s"
3568 msgstr ""
3569
3595 -#: builtin/commit.c:1549
3570 +#: builtin/commit.c:1517
3571 #, c-format
3572 msgid "Aborting commit; you did not edit the message.\n"
3573 msgstr ""
3574
3600 -#: builtin/commit.c:1554
3575 +#: builtin/commit.c:1522
3576 #, c-format
3577 msgid "Aborting commit due to empty commit message.\n"
3578 msgstr ""
3579
3605 -#: builtin/commit.c:1569 builtin/merge.c:935 builtin/merge.c:960
3580 +#: builtin/commit.c:1537 builtin/merge.c:935 builtin/merge.c:960
3581 msgid "failed to write commit object"
3582 msgstr ""
3583
3609 -#: builtin/commit.c:1590
3584 +#: builtin/commit.c:1558
3585 msgid "cannot lock HEAD ref"
3586 msgstr ""
3587
3613 -#: builtin/commit.c:1594
3588 +#: builtin/commit.c:1562
3589 msgid "cannot update HEAD ref"
3590 msgstr ""
3591
3617 -#: builtin/commit.c:1605
3592 +#: builtin/commit.c:1573
3593 msgid ""
3594 "Repository has been updated, but unable to write\n"
3595 "new_index file. Check that disk is not full or quota is\n"
@@ -4034,145 +4009,145 @@ msgstr ""
4009 msgid "object %s not found"
4010 msgstr ""
4011
4037 -#: builtin/fetch.c:260
4012 +#: builtin/fetch.c:259
4013 msgid "[up to date]"
4014 msgstr ""
4015
4041 -#: builtin/fetch.c:274
4016 +#: builtin/fetch.c:273
4017 #, c-format
4018 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
4019 msgstr ""
4020
4046 -#: builtin/fetch.c:275 builtin/fetch.c:361
4021 +#: builtin/fetch.c:274 builtin/fetch.c:360
4022 msgid "[rejected]"
4023 msgstr ""
4024
4050 -#: builtin/fetch.c:286
4025 +#: builtin/fetch.c:285
4026 msgid "[tag update]"
4027 msgstr ""
4028
4054 -#: builtin/fetch.c:288 builtin/fetch.c:323 builtin/fetch.c:341
4029 +#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
4030 msgid " (unable to update local ref)"
4031 msgstr ""
4032
4058 -#: builtin/fetch.c:306
4033 +#: builtin/fetch.c:305
4034 msgid "[new tag]"
4035 msgstr ""
4036
4062 -#: builtin/fetch.c:309
4037 +#: builtin/fetch.c:308
4038 msgid "[new branch]"
4039 msgstr ""
4040
4066 -#: builtin/fetch.c:312
4041 +#: builtin/fetch.c:311
4042 msgid "[new ref]"
4043 msgstr ""
4044
4070 -#: builtin/fetch.c:357
4045 +#: builtin/fetch.c:356
4046 msgid "unable to update local ref"
4047 msgstr ""
4048
4074 -#: builtin/fetch.c:357
4049 +#: builtin/fetch.c:356
4050 msgid "forced update"
4051 msgstr ""
4052
4078 -#: builtin/fetch.c:363
4053 +#: builtin/fetch.c:362
4054 msgid "(non-fast-forward)"
4055 msgstr ""
4056
4082 -#: builtin/fetch.c:394 builtin/fetch.c:686
4057 +#: builtin/fetch.c:393 builtin/fetch.c:685
4058 #, c-format
4059 msgid "cannot open %s: %s\n"
4060 msgstr ""
4061
4087 -#: builtin/fetch.c:403
4062 +#: builtin/fetch.c:402
4063 #, c-format
4064 msgid "%s did not send all necessary objects\n"
4065 msgstr ""
4066
4092 -#: builtin/fetch.c:489
4067 +#: builtin/fetch.c:488
4068 #, c-format
4069 msgid "From %.*s\n"
4070 msgstr ""
4071
4097 -#: builtin/fetch.c:500
4072 +#: builtin/fetch.c:499
4073 #, c-format
4074 msgid ""
4075 "some local refs could not be updated; try running\n"
4076 " 'git remote prune %s' to remove any old, conflicting branches"
4077 msgstr ""
4078
4104 -#: builtin/fetch.c:550
4079 +#: builtin/fetch.c:549
4080 #, c-format
4081 msgid " (%s will become dangling)"
4082 msgstr ""
4083
4109 -#: builtin/fetch.c:551
4084 +#: builtin/fetch.c:550
4085 #, c-format
4086 msgid " (%s has become dangling)"
4087 msgstr ""
4088
4114 -#: builtin/fetch.c:558
4089 +#: builtin/fetch.c:557
4090 msgid "[deleted]"
4091 msgstr ""
4092
4118 -#: builtin/fetch.c:559 builtin/remote.c:1055
4093 +#: builtin/fetch.c:558 builtin/remote.c:1055
4094 msgid "(none)"
4095 msgstr ""
4096
4122 -#: builtin/fetch.c:676
4097 +#: builtin/fetch.c:675
4098 #, c-format
4099 msgid "Refusing to fetch into current branch %s of non-bare repository"
4100 msgstr ""
4101
4127 -#: builtin/fetch.c:710
4102 +#: builtin/fetch.c:709
4103 #, c-format
4104 msgid "Don't know how to fetch from %s"
4105 msgstr ""
4106
4132 -#: builtin/fetch.c:787
4107 +#: builtin/fetch.c:786
4108 #, c-format
4109 msgid "Option \"%s\" value \"%s\" is not valid for %s"
4110 msgstr ""
4111
4137 -#: builtin/fetch.c:790
4112 +#: builtin/fetch.c:789
4113 #, c-format
4114 msgid "Option \"%s\" is ignored for %s\n"
4115 msgstr ""
4116
4142 -#: builtin/fetch.c:892
4117 +#: builtin/fetch.c:891
4118 #, c-format
4119 msgid "Fetching %s\n"
4120 msgstr ""
4121
4147 -#: builtin/fetch.c:894 builtin/remote.c:100
4122 +#: builtin/fetch.c:893 builtin/remote.c:100
4123 #, c-format
4124 msgid "Could not fetch %s"
4125 msgstr ""
4126
4152 -#: builtin/fetch.c:913
4127 +#: builtin/fetch.c:912
4128 msgid ""
4129 "No remote repository specified. Please, specify either a URL or a\n"
4130 "remote name from which new revisions should be fetched."
4131 msgstr ""
4132
4158 -#: builtin/fetch.c:933
4133 +#: builtin/fetch.c:932
4134 msgid "You need to specify a tag name."
4135 msgstr ""
4136
4162 -#: builtin/fetch.c:985
4137 +#: builtin/fetch.c:984
4138 msgid "fetch --all does not take a repository argument"
4139 msgstr ""
4140
4166 -#: builtin/fetch.c:987
4141 +#: builtin/fetch.c:986
4142 msgid "fetch --all does not make sense with refspecs"
4143 msgstr ""
4144
4170 -#: builtin/fetch.c:998
4145 +#: builtin/fetch.c:997
4146 #, c-format
4147 msgid "No such remote or remote group: %s"
4148 msgstr ""
4149
4175 -#: builtin/fetch.c:1006
4150 +#: builtin/fetch.c:1005
4151 msgid "Fetching a group and specifying refspecs does not make sense"
4152 msgstr ""
4153
@@ -4180,7 +4155,7 @@ msgstr ""
4155 msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
4156 msgstr ""
4157
4183 -#: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:786
4158 +#: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:787
4159 #: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:192
4160 #: builtin/tag.c:448 parse-options.h:133 parse-options.h:235
4161 msgid "n"
@@ -4316,19 +4291,14 @@ msgstr ""
4291 msgid "enable auto-gc mode"
4292 msgstr ""
4293
4319 -#: builtin/gc.c:221
4320 -#, c-format
4321 -msgid "Auto packing the repository for optimum performance.\n"
4322 -msgstr ""
4323 -
4324 -#: builtin/gc.c:224
4294 +#: builtin/gc.c:222
4295 #, c-format
4296 msgid ""
4297 "Auto packing the repository for optimum performance. You may also\n"
4298 "run \"git gc\" manually. See \"git help gc\" for more information.\n"
4299 msgstr ""
4300
4331 -#: builtin/gc.c:251
4301 +#: builtin/gc.c:249
4302 msgid ""
4303 "There are too many unreachable loose objects; run 'git prune' to remove them."
4304 msgstr ""
@@ -4337,226 +4307,230 @@ msgstr ""
4307 msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
4308 msgstr ""
4309
4340 -#: builtin/grep.c:216
4310 +#: builtin/grep.c:217
4311 #, c-format
4312 msgid "grep: failed to create thread: %s"
4313 msgstr ""
4314
4345 -#: builtin/grep.c:454
4315 +#: builtin/grep.c:455
4316 #, c-format
4317 msgid "Failed to chdir: %s"
4318 msgstr ""
4319
4350 -#: builtin/grep.c:530 builtin/grep.c:564
4320 +#: builtin/grep.c:531 builtin/grep.c:565
4321 #, c-format
4322 msgid "unable to read tree (%s)"
4323 msgstr ""
4324
4355 -#: builtin/grep.c:578
4325 +#: builtin/grep.c:579
4326 #, c-format
4327 msgid "unable to grep from object of type %s"
4328 msgstr ""
4329
4360 -#: builtin/grep.c:636
4330 +#: builtin/grep.c:637
4331 #, c-format
4332 msgid "switch `%c' expects a numerical value"
4333 msgstr ""
4334
4365 -#: builtin/grep.c:653
4335 +#: builtin/grep.c:654
4336 #, c-format
4337 msgid "cannot open '%s'"
4338 msgstr ""
4339
4370 -#: builtin/grep.c:728
4340 +#: builtin/grep.c:729
4341 msgid "search in index instead of in the work tree"
4342 msgstr ""
4343
4374 -#: builtin/grep.c:730
4344 +#: builtin/grep.c:731
4345 msgid "find in contents not managed by git"
4346 msgstr ""
4347
4378 -#: builtin/grep.c:732
4348 +#: builtin/grep.c:733
4349 msgid "search in both tracked and untracked files"
4350 msgstr ""
4351
4382 -#: builtin/grep.c:734
4352 +#: builtin/grep.c:735
4353 msgid "search also in ignored files"
4354 msgstr ""
4355
4386 -#: builtin/grep.c:737
4356 +#: builtin/grep.c:738
4357 msgid "show non-matching lines"
4358 msgstr ""
4359
4390 -#: builtin/grep.c:739
4360 +#: builtin/grep.c:740
4361 msgid "case insensitive matching"
4362 msgstr ""
4363
4394 -#: builtin/grep.c:741
4364 +#: builtin/grep.c:742
4365 msgid "match patterns only at word boundaries"
4366 msgstr ""
4367
4398 -#: builtin/grep.c:743
4368 +#: builtin/grep.c:744
4369 msgid "process binary files as text"
4370 msgstr ""
4371
4402 -#: builtin/grep.c:745
4372 +#: builtin/grep.c:746
4373 msgid "don't match patterns in binary files"
4374 msgstr ""
4375
4406 -#: builtin/grep.c:748
4376 +#: builtin/grep.c:749
4377 msgid "descend at most <depth> levels"
4378 msgstr ""
4379
4410 -#: builtin/grep.c:752
4380 +#: builtin/grep.c:753
4381 msgid "use extended POSIX regular expressions"
4382 msgstr ""
4383
4414 -#: builtin/grep.c:755
4384 +#: builtin/grep.c:756
4385 msgid "use basic POSIX regular expressions (default)"
4386 msgstr ""
4387
4418 -#: builtin/grep.c:758
4388 +#: builtin/grep.c:759
4389 msgid "interpret patterns as fixed strings"
4390 msgstr ""
4391
4422 -#: builtin/grep.c:761
4392 +#: builtin/grep.c:762
4393 msgid "use Perl-compatible regular expressions"
4394 msgstr ""
4395
4426 -#: builtin/grep.c:764
4396 +#: builtin/grep.c:765
4397 msgid "show line numbers"
4398 msgstr ""
4399
4430 -#: builtin/grep.c:765
4400 +#: builtin/grep.c:766
4401 msgid "don't show filenames"
4402 msgstr ""
4403
4434 -#: builtin/grep.c:766
4404 +#: builtin/grep.c:767
4405 msgid "show filenames"
4406 msgstr ""
4407
4438 -#: builtin/grep.c:768
4408 +#: builtin/grep.c:769
4409 msgid "show filenames relative to top directory"
4410 msgstr ""
4411
4442 -#: builtin/grep.c:770
4412 +#: builtin/grep.c:771
4413 msgid "show only filenames instead of matching lines"
4414 msgstr ""
4415
4446 -#: builtin/grep.c:772
4416 +#: builtin/grep.c:773
4417 msgid "synonym for --files-with-matches"
4418 msgstr ""
4419
4450 -#: builtin/grep.c:775
4420 +#: builtin/grep.c:776
4421 msgid "show only the names of files without match"
4422 msgstr ""
4423
4454 -#: builtin/grep.c:777
4424 +#: builtin/grep.c:778
4425 msgid "print NUL after filenames"
4426 msgstr ""
4427
4458 -#: builtin/grep.c:779
4428 +#: builtin/grep.c:780
4429 msgid "show the number of matches instead of matching lines"
4430 msgstr ""
4431
4462 -#: builtin/grep.c:780
4432 +#: builtin/grep.c:781
4433 msgid "highlight matches"
4434 msgstr ""
4435
4466 -#: builtin/grep.c:782
4436 +#: builtin/grep.c:783
4437 msgid "print empty line between matches from different files"
4438 msgstr ""
4439
4470 -#: builtin/grep.c:784
4440 +#: builtin/grep.c:785
4441 msgid "show filename only once above matches from same file"
4442 msgstr ""
4443
4474 -#: builtin/grep.c:787
4444 +#: builtin/grep.c:788
4445 msgid "show <n> context lines before and after matches"
4446 msgstr ""
4447
4478 -#: builtin/grep.c:790
4448 +#: builtin/grep.c:791
4449 msgid "show <n> context lines before matches"
4450 msgstr ""
4451
4482 -#: builtin/grep.c:792
4452 +#: builtin/grep.c:793
4453 msgid "show <n> context lines after matches"
4454 msgstr ""
4455
4486 -#: builtin/grep.c:793
4456 +#: builtin/grep.c:794
4457 msgid "shortcut for -C NUM"
4458 msgstr ""
4459
4490 -#: builtin/grep.c:796
4460 +#: builtin/grep.c:797
4461 msgid "show a line with the function name before matches"
4462 msgstr ""
4463
4494 -#: builtin/grep.c:798
4464 +#: builtin/grep.c:799
4465 msgid "show the surrounding function"
4466 msgstr ""
4467
4498 -#: builtin/grep.c:801
4468 +#: builtin/grep.c:802
4469 msgid "read patterns from file"
4470 msgstr ""
4471
4502 -#: builtin/grep.c:803
4472 +#: builtin/grep.c:804
4473 msgid "match <pattern>"
4474 msgstr ""
4475
4506 -#: builtin/grep.c:805
4476 +#: builtin/grep.c:806
4477 msgid "combine patterns specified with -e"
4478 msgstr ""
4479
4510 -#: builtin/grep.c:817
4480 +#: builtin/grep.c:818
4481 msgid "indicate hit with exit status without output"
4482 msgstr ""
4483
4514 -#: builtin/grep.c:819
4484 +#: builtin/grep.c:820
4485 msgid "show only matches from files that match all patterns"
4486 msgstr ""
4487
4488 #: builtin/grep.c:822
4489 +msgid "show parse tree for grep expression"
4490 +msgstr ""
4491 +
4492 +#: builtin/grep.c:826
4493 msgid "pager"
4494 msgstr ""
4495
4522 -#: builtin/grep.c:822
4496 +#: builtin/grep.c:826
4497 msgid "show matching files in the pager"
4498 msgstr ""
4499
4526 -#: builtin/grep.c:825
4500 +#: builtin/grep.c:829
4501 msgid "allow calling of grep(1) (ignored by this build)"
4502 msgstr ""
4503
4530 -#: builtin/grep.c:826 builtin/show-ref.c:201
4504 +#: builtin/grep.c:830 builtin/show-ref.c:201
4505 msgid "show usage"
4506 msgstr ""
4507
4534 -#: builtin/grep.c:917
4508 +#: builtin/grep.c:921
4509 msgid "no pattern given."
4510 msgstr ""
4511
4538 -#: builtin/grep.c:931
4512 +#: builtin/grep.c:935
4513 #, c-format
4514 msgid "bad object %s"
4515 msgstr ""
4516
4543 -#: builtin/grep.c:972
4517 +#: builtin/grep.c:976
4518 msgid "--open-files-in-pager only works on the worktree"
4519 msgstr ""
4520
4547 -#: builtin/grep.c:995
4521 +#: builtin/grep.c:999
4522 msgid "--cached or --untracked cannot be used with --no-index."
4523 msgstr ""
4524
4551 -#: builtin/grep.c:1000
4525 +#: builtin/grep.c:1004
4526 msgid "--no-index or --untracked cannot be used with revs."
4527 msgstr ""
4528
4555 -#: builtin/grep.c:1003
4529 +#: builtin/grep.c:1007
4530 msgid "--[no-]exclude-standard cannot be used for tracked contents."
4531 msgstr ""
4532
4559 -#: builtin/grep.c:1011
4533 +#: builtin/grep.c:1015
4534 msgid "both --cached and trees are given."
4535 msgstr ""
4536
@@ -5552,7 +5526,7 @@ msgstr ""
5526 msgid "abort if fast-forward is not possible"
5527 msgstr ""
5528
5555 -#: builtin/merge.c:202 builtin/notes.c:867 builtin/revert.c:112
5529 +#: builtin/merge.c:202 builtin/notes.c:870 builtin/revert.c:112
5530 msgid "strategy"
5531 msgstr ""
5532
@@ -6000,338 +5974,338 @@ msgstr ""
5974 msgid "allow to print `undefined` names"
5975 msgstr ""
5976
6003 -#: builtin/notes.c:23
5977 +#: builtin/notes.c:26
5978 msgid "git notes [--ref <notes_ref>] [list [<object>]]"
5979 msgstr ""
5980
6007 -#: builtin/notes.c:24
5981 +#: builtin/notes.c:27
5982 msgid ""
5983 "git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
5984 "<object>] [<object>]"
5985 msgstr ""
5986
6013 -#: builtin/notes.c:25
5987 +#: builtin/notes.c:28
5988 msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
5989 msgstr ""
5990
6017 -#: builtin/notes.c:26
5991 +#: builtin/notes.c:29
5992 msgid ""
5993 "git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
5994 "<object>] [<object>]"
5995 msgstr ""
5996
6023 -#: builtin/notes.c:27
5997 +#: builtin/notes.c:30
5998 msgid "git notes [--ref <notes_ref>] edit [<object>]"
5999 msgstr ""
6000
6027 -#: builtin/notes.c:28
6001 +#: builtin/notes.c:31
6002 msgid "git notes [--ref <notes_ref>] show [<object>]"
6003 msgstr ""
6004
6031 -#: builtin/notes.c:29
6005 +#: builtin/notes.c:32
6006 msgid ""
6007 "git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
6008 msgstr ""
6009
6036 -#: builtin/notes.c:30
6010 +#: builtin/notes.c:33
6011 msgid "git notes merge --commit [-v | -q]"
6012 msgstr ""
6013
6040 -#: builtin/notes.c:31
6014 +#: builtin/notes.c:34
6015 msgid "git notes merge --abort [-v | -q]"
6016 msgstr ""
6017
6044 -#: builtin/notes.c:32
6018 +#: builtin/notes.c:35
6019 msgid "git notes [--ref <notes_ref>] remove [<object>...]"
6020 msgstr ""
6021
6048 -#: builtin/notes.c:33
6022 +#: builtin/notes.c:36
6023 msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
6024 msgstr ""
6025
6052 -#: builtin/notes.c:34
6026 +#: builtin/notes.c:37
6027 msgid "git notes [--ref <notes_ref>] get-ref"
6028 msgstr ""
6029
6056 -#: builtin/notes.c:39
6030 +#: builtin/notes.c:42
6031 msgid "git notes [list [<object>]]"
6032 msgstr ""
6033
6060 -#: builtin/notes.c:44
6034 +#: builtin/notes.c:47
6035 msgid "git notes add [<options>] [<object>]"
6036 msgstr ""
6037
6064 -#: builtin/notes.c:49
6038 +#: builtin/notes.c:52
6039 msgid "git notes copy [<options>] <from-object> <to-object>"
6040 msgstr ""
6041
6068 -#: builtin/notes.c:50
6042 +#: builtin/notes.c:53
6043 msgid "git notes copy --stdin [<from-object> <to-object>]..."
6044 msgstr ""
6045
6072 -#: builtin/notes.c:55
6046 +#: builtin/notes.c:58
6047 msgid "git notes append [<options>] [<object>]"
6048 msgstr ""
6049
6076 -#: builtin/notes.c:60
6050 +#: builtin/notes.c:63
6051 msgid "git notes edit [<object>]"
6052 msgstr ""
6053
6080 -#: builtin/notes.c:65
6054 +#: builtin/notes.c:68
6055 msgid "git notes show [<object>]"
6056 msgstr ""
6057
6084 -#: builtin/notes.c:70
6058 +#: builtin/notes.c:73
6059 msgid "git notes merge [<options>] <notes_ref>"
6060 msgstr ""
6061
6088 -#: builtin/notes.c:71
6062 +#: builtin/notes.c:74
6063 msgid "git notes merge --commit [<options>]"
6064 msgstr ""
6065
6092 -#: builtin/notes.c:72
6066 +#: builtin/notes.c:75
6067 msgid "git notes merge --abort [<options>]"
6068 msgstr ""
6069
6096 -#: builtin/notes.c:77
6070 +#: builtin/notes.c:80
6071 msgid "git notes remove [<object>]"
6072 msgstr ""
6073
6100 -#: builtin/notes.c:82
6074 +#: builtin/notes.c:85
6075 msgid "git notes prune [<options>]"
6076 msgstr ""
6077
6104 -#: builtin/notes.c:87
6078 +#: builtin/notes.c:90
6079 msgid "git notes get-ref"
6080 msgstr ""
6081
6108 -#: builtin/notes.c:139
6082 +#: builtin/notes.c:142
6083 #, c-format
6084 msgid "unable to start 'show' for object '%s'"
6085 msgstr ""
6086
6113 -#: builtin/notes.c:145
6087 +#: builtin/notes.c:148
6088 msgid "can't fdopen 'show' output fd"
6089 msgstr ""
6090
6117 -#: builtin/notes.c:155
6091 +#: builtin/notes.c:158
6092 #, c-format
6093 msgid "failed to close pipe to 'show' for object '%s'"
6094 msgstr ""
6095
6122 -#: builtin/notes.c:158
6096 +#: builtin/notes.c:161
6097 #, c-format
6098 msgid "failed to finish 'show' for object '%s'"
6099 msgstr ""
6100
6127 -#: builtin/notes.c:175 builtin/tag.c:347
6101 +#: builtin/notes.c:178 builtin/tag.c:347
6102 #, c-format
6103 msgid "could not create file '%s'"
6104 msgstr ""
6105
6132 -#: builtin/notes.c:189
6106 +#: builtin/notes.c:192
6107 msgid "Please supply the note contents using either -m or -F option"
6108 msgstr ""
6109
6136 -#: builtin/notes.c:210 builtin/notes.c:973
6110 +#: builtin/notes.c:213 builtin/notes.c:976
6111 #, c-format
6112 msgid "Removing note for object %s\n"
6113 msgstr ""
6114
6141 -#: builtin/notes.c:215
6115 +#: builtin/notes.c:218
6116 msgid "unable to write note object"
6117 msgstr ""
6118
6145 -#: builtin/notes.c:217
6119 +#: builtin/notes.c:220
6120 #, c-format
6121 msgid "The note contents has been left in %s"
6122 msgstr ""
6123
6150 -#: builtin/notes.c:251 builtin/tag.c:542
6124 +#: builtin/notes.c:254 builtin/tag.c:542
6125 #, c-format
6126 msgid "cannot read '%s'"
6127 msgstr ""
6128
6155 -#: builtin/notes.c:253 builtin/tag.c:545
6129 +#: builtin/notes.c:256 builtin/tag.c:545
6130 #, c-format
6131 msgid "could not open or read '%s'"
6132 msgstr ""
6133
6160 -#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
6161 -#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
6162 -#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
6163 -#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558
6134 +#: builtin/notes.c:275 builtin/notes.c:448 builtin/notes.c:450
6135 +#: builtin/notes.c:510 builtin/notes.c:564 builtin/notes.c:647
6136 +#: builtin/notes.c:652 builtin/notes.c:727 builtin/notes.c:769
6137 +#: builtin/notes.c:971 builtin/reset.c:293 builtin/tag.c:558
6138 #, c-format
6139 msgid "Failed to resolve '%s' as a valid ref."
6140 msgstr ""
6141
6168 -#: builtin/notes.c:275
6142 +#: builtin/notes.c:278
6143 #, c-format
6144 msgid "Failed to read object '%s'."
6145 msgstr ""
6146
6173 -#: builtin/notes.c:299
6147 +#: builtin/notes.c:302
6148 msgid "Cannot commit uninitialized/unreferenced notes tree"
6149 msgstr ""
6150
6177 -#: builtin/notes.c:340
6151 +#: builtin/notes.c:343
6152 #, c-format
6153 msgid "Bad notes.rewriteMode value: '%s'"
6154 msgstr ""
6155
6182 -#: builtin/notes.c:350
6156 +#: builtin/notes.c:353
6157 #, c-format
6158 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
6159 msgstr ""
6160
6161 #. TRANSLATORS: The first %s is the name of the
6162 #. environment variable, the second %s is its value
6189 -#: builtin/notes.c:377
6163 +#: builtin/notes.c:380
6164 #, c-format
6165 msgid "Bad %s value: '%s'"
6166 msgstr ""
6167
6194 -#: builtin/notes.c:441
6168 +#: builtin/notes.c:444
6169 #, c-format
6170 msgid "Malformed input line: '%s'."
6171 msgstr ""
6172
6199 -#: builtin/notes.c:456
6173 +#: builtin/notes.c:459
6174 #, c-format
6175 msgid "Failed to copy notes from '%s' to '%s'"
6176 msgstr ""
6177
6204 -#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627
6205 -#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759
6206 -#: builtin/notes.c:1033
6178 +#: builtin/notes.c:503 builtin/notes.c:557 builtin/notes.c:630
6179 +#: builtin/notes.c:642 builtin/notes.c:715 builtin/notes.c:762
6180 +#: builtin/notes.c:1036
6181 msgid "too many parameters"
6182 msgstr ""
6183
6210 -#: builtin/notes.c:513 builtin/notes.c:772
6184 +#: builtin/notes.c:516 builtin/notes.c:775
6185 #, c-format
6186 msgid "No note found for object %s."
6187 msgstr ""
6188
6215 -#: builtin/notes.c:535 builtin/notes.c:692
6189 +#: builtin/notes.c:538 builtin/notes.c:695
6190 msgid "note contents as a string"
6191 msgstr ""
6192
6219 -#: builtin/notes.c:538 builtin/notes.c:695
6193 +#: builtin/notes.c:541 builtin/notes.c:698
6194 msgid "note contents in a file"
6195 msgstr ""
6196
6223 -#: builtin/notes.c:540 builtin/notes.c:543 builtin/notes.c:697
6224 -#: builtin/notes.c:700 builtin/tag.c:476
6197 +#: builtin/notes.c:543 builtin/notes.c:546 builtin/notes.c:700
6198 +#: builtin/notes.c:703 builtin/tag.c:476
6199 msgid "object"
6200 msgstr ""
6201
6228 -#: builtin/notes.c:541 builtin/notes.c:698
6202 +#: builtin/notes.c:544 builtin/notes.c:701
6203 msgid "reuse and edit specified note object"
6204 msgstr ""
6205
6232 -#: builtin/notes.c:544 builtin/notes.c:701
6206 +#: builtin/notes.c:547 builtin/notes.c:704
6207 msgid "reuse specified note object"
6208 msgstr ""
6209
6236 -#: builtin/notes.c:546 builtin/notes.c:614
6210 +#: builtin/notes.c:549 builtin/notes.c:617
6211 msgid "replace existing notes"
6212 msgstr ""
6213
6240 -#: builtin/notes.c:580
6214 +#: builtin/notes.c:583
6215 #, c-format
6216 msgid ""
6217 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
6218 "existing notes"
6219 msgstr ""
6220
6247 -#: builtin/notes.c:585 builtin/notes.c:662
6221 +#: builtin/notes.c:588 builtin/notes.c:665
6222 #, c-format
6223 msgid "Overwriting existing notes for object %s\n"
6224 msgstr ""
6225
6252 -#: builtin/notes.c:615
6226 +#: builtin/notes.c:618
6227 msgid "read objects from stdin"
6228 msgstr ""
6229
6256 -#: builtin/notes.c:617
6230 +#: builtin/notes.c:620
6231 msgid "load rewriting config for <command> (implies --stdin)"
6232 msgstr ""
6233
6260 -#: builtin/notes.c:635
6234 +#: builtin/notes.c:638
6235 msgid "too few parameters"
6236 msgstr ""
6237
6264 -#: builtin/notes.c:656
6238 +#: builtin/notes.c:659
6239 #, c-format
6240 msgid ""
6241 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
6242 "existing notes"
6243 msgstr ""
6244
6271 -#: builtin/notes.c:668
6245 +#: builtin/notes.c:671
6246 #, c-format
6247 msgid "Missing notes on source object %s. Cannot copy."
6248 msgstr ""
6249
6276 -#: builtin/notes.c:717
6250 +#: builtin/notes.c:720
6251 #, c-format
6252 msgid ""
6253 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
6254 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
6255 msgstr ""
6256
6283 -#: builtin/notes.c:864
6257 +#: builtin/notes.c:867
6258 msgid "General options"
6259 msgstr ""
6260
6287 -#: builtin/notes.c:866
6261 +#: builtin/notes.c:869
6262 msgid "Merge options"
6263 msgstr ""
6264
6291 -#: builtin/notes.c:868
6265 +#: builtin/notes.c:871
6266 msgid ""
6267 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
6268 "cat_sort_uniq)"
6269 msgstr ""
6270
6297 -#: builtin/notes.c:870
6271 +#: builtin/notes.c:873
6272 msgid "Committing unmerged notes"
6273 msgstr ""
6274
6301 -#: builtin/notes.c:872
6275 +#: builtin/notes.c:875
6276 msgid "finalize notes merge by committing unmerged notes"
6277 msgstr ""
6278
6305 -#: builtin/notes.c:874
6279 +#: builtin/notes.c:877
6280 msgid "Aborting notes merge resolution"
6281 msgstr ""
6282
6309 -#: builtin/notes.c:876
6283 +#: builtin/notes.c:879
6284 msgid "abort notes merge"
6285 msgstr ""
6286
6313 -#: builtin/notes.c:971
6287 +#: builtin/notes.c:974
6288 #, c-format
6289 msgid "Object %s has no note\n"
6290 msgstr ""
6291
6318 -#: builtin/notes.c:983
6292 +#: builtin/notes.c:986
6293 msgid "attempt to remove non-existent note is not an error"
6294 msgstr ""
6295
6322 -#: builtin/notes.c:986
6296 +#: builtin/notes.c:989
6297 msgid "read object names from the standard input"
6298 msgstr ""
6299
6326 -#: builtin/notes.c:1067
6300 +#: builtin/notes.c:1070
6301 msgid "notes_ref"
6302 msgstr ""
6303
6330 -#: builtin/notes.c:1068
6304 +#: builtin/notes.c:1071
6305 msgid "use notes from <notes_ref>"
6306 msgstr ""
6307
6334 -#: builtin/notes.c:1103 builtin/remote.c:1598
6308 +#: builtin/notes.c:1106 builtin/remote.c:1598
6309 #, c-format
6310 msgid "Unknown subcommand: %s"
6311 msgstr ""
@@ -8577,7 +8551,7 @@ msgstr ""
8551 msgid "Cannot rebase onto multiple branches"
8552 msgstr ""
8553
8580 -#: git-rebase.sh:52
8554 +#: git-rebase.sh:53
8555 msgid ""
8556 "When you have resolved this problem, run \"git rebase --continue\".\n"
8557 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
@@ -8585,38 +8559,42 @@ msgid ""
8559 "\"."
8560 msgstr ""
8561
8588 -#: git-rebase.sh:159
8562 +#: git-rebase.sh:160
8563 msgid "The pre-rebase hook refused to rebase."
8564 msgstr ""
8565
8592 -#: git-rebase.sh:164
8566 +#: git-rebase.sh:165
8567 msgid "It looks like git-am is in progress. Cannot rebase."
8568 msgstr ""
8569
8596 -#: git-rebase.sh:295
8570 +#: git-rebase.sh:296
8571 msgid "The --exec option must be used with the --interactive option"
8572 msgstr ""
8573
8600 -#: git-rebase.sh:300
8574 +#: git-rebase.sh:301
8575 msgid "No rebase in progress?"
8576 msgstr ""
8577
8604 -#: git-rebase.sh:313
8578 +#: git-rebase.sh:312
8579 +msgid "The --edit-todo action can only be used during interactive rebase."
8580 +msgstr ""
8581 +
8582 +#: git-rebase.sh:319
8583 msgid "Cannot read HEAD"
8584 msgstr ""
8585
8608 -#: git-rebase.sh:316
8586 +#: git-rebase.sh:322
8587 msgid ""
8588 "You must edit all merge conflicts and then\n"
8589 "mark them as resolved using git add"
8590 msgstr ""
8591
8614 -#: git-rebase.sh:334
8592 +#: git-rebase.sh:340
8593 #, sh-format
8594 msgid "Could not move back to $head_name"
8595 msgstr ""
8596
8619 -#: git-rebase.sh:350
8597 +#: git-rebase.sh:359
8598 #, sh-format
8599 msgid ""
8600 "It seems that there is already a $state_dir_base directory, and\n"
@@ -8629,56 +8607,56 @@ msgid ""
8607 "valuable there."
8608 msgstr ""
8609
8632 -#: git-rebase.sh:395
8610 +#: git-rebase.sh:404
8611 #, sh-format
8612 msgid "invalid upstream $upstream_name"
8613 msgstr ""
8614
8637 -#: git-rebase.sh:419
8615 +#: git-rebase.sh:428
8616 #, sh-format
8617 msgid "$onto_name: there are more than one merge bases"
8618 msgstr ""
8619
8642 -#: git-rebase.sh:422 git-rebase.sh:426
8620 +#: git-rebase.sh:431 git-rebase.sh:435
8621 #, sh-format
8622 msgid "$onto_name: there is no merge base"
8623 msgstr ""
8624
8647 -#: git-rebase.sh:431
8625 +#: git-rebase.sh:440
8626 #, sh-format
8627 msgid "Does not point to a valid commit: $onto_name"
8628 msgstr ""
8629
8652 -#: git-rebase.sh:454
8630 +#: git-rebase.sh:463
8631 #, sh-format
8632 msgid "fatal: no such branch: $branch_name"
8633 msgstr ""
8634
8657 -#: git-rebase.sh:474
8635 +#: git-rebase.sh:483
8636 msgid "Please commit or stash them."
8637 msgstr ""
8638
8661 -#: git-rebase.sh:492
8639 +#: git-rebase.sh:501
8640 #, sh-format
8641 msgid "Current branch $branch_name is up to date."
8642 msgstr ""
8643
8666 -#: git-rebase.sh:495
8644 +#: git-rebase.sh:504
8645 #, sh-format
8646 msgid "Current branch $branch_name is up to date, rebase forced."
8647 msgstr ""
8648
8671 -#: git-rebase.sh:506
8649 +#: git-rebase.sh:515
8650 #, sh-format
8651 msgid "Changes from $mb to $onto:"
8652 msgstr ""
8653
8654 #. Detach HEAD and reset the tree
8677 -#: git-rebase.sh:515
8655 +#: git-rebase.sh:524
8656 msgid "First, rewinding head to replay your work on top of it..."
8657 msgstr ""
8658
8681 -#: git-rebase.sh:523
8659 +#: git-rebase.sh:532
8660 #, sh-format
8661 msgid "Fast-forwarded $branch_name to $onto_name."
8662 msgstr ""