46bc4039a9 · matheusbsbs/matheus-bagliano

@@ -8,7 +8,7 @@ msgid ""

8 msgstr ""

9 "Project-Id-Version: PACKAGE VERSION\n"

10 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"

11 -"POT-Creation-Date: 2012-11-30 12:40+0800\n"

11 +"POT-Creation-Date: 2013-01-25 12:33+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"

@@ -18,7 +18,7 @@ msgstr ""

18 "Content-Transfer-Encoding: 8bit\n"

19 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"

20

21 -#: advice.c:40

21 +#: advice.c:45

22 #, c-format

23 msgid "hint: %.*s\n"

24 msgstr ""

@@ -27,7 +27,7 @@ msgstr ""

27 #. * Message used both when 'git commit' fails and when

28 #. * other commands doing a merge do.

29 #.

30 -#: advice.c:70

30 +#: advice.c:75

31 msgid ""

32 "Fix them up in the work tree,\n"

33 "and then use 'git add/rm <file>' as\n"

@@ -52,71 +52,71 @@ msgstr ""

52 msgid "git archive --remote <repo> [--exec <cmd>] --list"

53 msgstr ""

54

55 -#: archive.c:322

55 +#: archive.c:323

56 msgid "fmt"

57 msgstr ""

58

59 -#: archive.c:322

59 +#: archive.c:323

60 msgid "archive format"

61 msgstr ""

62

63 -#: archive.c:323 builtin/log.c:1084

63 +#: archive.c:324 builtin/log.c:1115

64 msgid "prefix"

65 msgstr ""

66

67 -#: archive.c:324

67 +#: archive.c:325

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

69 msgstr ""

70

71 -#: archive.c:325 builtin/archive.c:91 builtin/blame.c:2390

72 -#: builtin/blame.c:2391 builtin/config.c:55 builtin/fast-export.c:642

73 -#: builtin/fast-export.c:644 builtin/grep.c:715 builtin/hash-object.c:77

71 +#: archive.c:326 builtin/archive.c:91 builtin/blame.c:2380

72 +#: builtin/blame.c:2381 builtin/config.c:55 builtin/fast-export.c:653

73 +#: builtin/fast-export.c:655 builtin/grep.c:715 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

79 -#: archive.c:326 builtin/archive.c:92

79 +#: archive.c:327 builtin/archive.c:92

80 msgid "write the archive to this file"

81 msgstr ""

82

83 -#: archive.c:328

83 +#: archive.c:329

84 msgid "read .gitattributes in working directory"

85 msgstr ""

86

87 -#: archive.c:329

87 +#: archive.c:330

88 msgid "report archived files on stderr"

89 msgstr ""

90

91 -#: archive.c:330

91 +#: archive.c:331

92 msgid "store only"

93 msgstr ""

94

95 -#: archive.c:331

95 +#: archive.c:332

96 msgid "compress faster"

97 msgstr ""

98

99 -#: archive.c:339

99 +#: archive.c:340

100 msgid "compress better"

101 msgstr ""

102

103 -#: archive.c:342

103 +#: archive.c:343

104 msgid "list supported archive formats"

105 msgstr ""

106

107 -#: archive.c:344 builtin/archive.c:93 builtin/clone.c:85

107 +#: archive.c:345 builtin/archive.c:93 builtin/clone.c:85

108 msgid "repo"

109 msgstr ""

110

111 -#: archive.c:345 builtin/archive.c:94

111 +#: archive.c:346 builtin/archive.c:94

112 msgid "retrieve the archive from remote repository <repo>"

113 msgstr ""

114

115 -#: archive.c:346 builtin/archive.c:95 builtin/notes.c:619

115 +#: archive.c:347 builtin/archive.c:95 builtin/notes.c:619

116 msgid "command"

117 msgstr ""

118

119 -#: archive.c:347 builtin/archive.c:96

119 +#: archive.c:348 builtin/archive.c:96

120 msgid "path to the remote git-upload-archive command"

121 msgstr ""

122

@@ -145,9 +145,9 @@ msgstr ""

145 msgid "Repository lacks these prerequisite commits:"

146 msgstr ""

147

148 -#: bundle.c:164 sequencer.c:562 sequencer.c:994 builtin/log.c:290

149 -#: builtin/log.c:732 builtin/log.c:1319 builtin/log.c:1535 builtin/merge.c:347

150 -#: builtin/shortlog.c:181

148 +#: bundle.c:164 sequencer.c:566 sequencer.c:998 builtin/log.c:299

149 +#: builtin/log.c:751 builtin/log.c:1358 builtin/log.c:1574 builtin/merge.c:347

150 +#: builtin/shortlog.c:157

151 msgid "revision walk setup failed"

152 msgstr ""

153

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

173 msgid "rev-list died"

174 msgstr ""

175

176 -#: bundle.c:300 builtin/log.c:1215 builtin/shortlog.c:284

176 +#: bundle.c:300 builtin/log.c:1254 builtin/shortlog.c:260

177 #, c-format

178 msgid "unrecognized argument: %s"

179 msgstr ""

@@ -588,7 +588,7 @@ msgstr ""

588 msgid "Auto-merging %s"

589 msgstr ""

590

591 -#: merge-recursive.c:1633 git-submodule.sh:893

591 +#: merge-recursive.c:1633 git-submodule.sh:942

592 msgid "submodule"

593 msgstr ""

594

@@ -662,39 +662,39 @@ msgstr ""

662 msgid "Unable to write index."

663 msgstr ""

664

665 -#: parse-options.c:494

665 +#: parse-options.c:485

666 msgid "..."

667 msgstr ""

668

669 -#: parse-options.c:512

669 +#: parse-options.c:503

670 #, c-format

671 msgid "usage: %s"

672 msgstr ""

673

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

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

676 -#: parse-options.c:516

676 +#: parse-options.c:507

677 #, c-format

678 msgid " or: %s"

679 msgstr ""

680

681 -#: parse-options.c:519

681 +#: parse-options.c:510

682 #, c-format

683 msgid " %s"

684 msgstr ""

685

686 -#: remote.c:1632

686 +#: remote.c:1686

687 #, c-format

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

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

690 msgstr[0] ""

691 msgstr[1] ""

692

693 -#: remote.c:1637

693 +#: remote.c:1692

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

695 msgstr ""

696

697 -#: remote.c:1640

697 +#: remote.c:1695

698 #, c-format

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

700 msgid_plural ""

@@ -702,11 +702,11 @@ msgid_plural ""

702 msgstr[0] ""

703 msgstr[1] ""

704

705 -#: remote.c:1647

705 +#: remote.c:1703

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

707 msgstr ""

708

709 -#: remote.c:1650

709 +#: remote.c:1706

710 #, c-format

711 msgid ""

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

@@ -717,18 +717,18 @@ msgid_plural ""

717 msgstr[0] ""

718 msgstr[1] ""

719

720 -#: remote.c:1659

720 +#: remote.c:1716

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

722 msgstr ""

723

724 -#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:874 builtin/merge.c:984

725 -#: builtin/merge.c:994

724 +#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:875 builtin/merge.c:985

725 +#: builtin/merge.c:995

726 #, c-format

727 msgid "Could not open '%s' for writing"

728 msgstr ""

729

730 -#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:986

731 -#: builtin/merge.c:999

730 +#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:987

731 +#: builtin/merge.c:1000

732 #, c-format

733 msgid "Could not write to '%s'"

734 msgstr ""

@@ -746,7 +746,7 @@ msgid ""

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

747 msgstr ""

748

749 -#: sequencer.c:162 sequencer.c:770 sequencer.c:853

749 +#: sequencer.c:162 sequencer.c:774 sequencer.c:857

750 #, c-format

751 msgid "Could not write to %s"

752 msgstr ""

@@ -769,191 +769,187 @@ msgid "Commit your changes or stash them to proceed."

769 msgstr ""

770

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

772 -#: sequencer.c:235

772 +#: sequencer.c:236

773 #, c-format

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

775 msgstr ""

776

777 -#: sequencer.c:266

777 +#: sequencer.c:267

778 msgid "Could not resolve HEAD commit\n"

779 msgstr ""

780

781 -#: sequencer.c:287

781 +#: sequencer.c:288

782 msgid "Unable to update cache tree\n"

783 msgstr ""

784

785 -#: sequencer.c:332

785 +#: sequencer.c:333

786 #, c-format

787 msgid "Could not parse commit %s\n"

788 msgstr ""

789

790 -#: sequencer.c:337

790 +#: sequencer.c:338

791 #, c-format

792 msgid "Could not parse parent commit %s\n"

793 msgstr ""

794

795 -#: sequencer.c:403

795 +#: sequencer.c:404

796 msgid "Your index file is unmerged."

797 msgstr ""

798

799 -#: sequencer.c:406

800 -msgid "You do not have a valid HEAD"

801 -msgstr ""

802 -

803 -#: sequencer.c:421

799 +#: sequencer.c:423

800 #, c-format

801 msgid "Commit %s is a merge but no -m option was given."

802 msgstr ""

803

808 -#: sequencer.c:429

804 +#: sequencer.c:431

805 #, c-format

806 msgid "Commit %s does not have parent %d"

807 msgstr ""

808

813 -#: sequencer.c:433

809 +#: sequencer.c:435

810 #, c-format

811 msgid "Mainline was specified but commit %s is not a merge."

812 msgstr ""

813

814 #. TRANSLATORS: The first %s will be "revert" or

815 #. "cherry-pick", the second %s a SHA1

820 -#: sequencer.c:444

816 +#: sequencer.c:448

817 #, c-format

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

819 msgstr ""

820

825 -#: sequencer.c:448

821 +#: sequencer.c:452

822 #, c-format

823 msgid "Cannot get commit message for %s"

824 msgstr ""

825

830 -#: sequencer.c:532

826 +#: sequencer.c:536

827 #, c-format

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

829 msgstr ""

830

835 -#: sequencer.c:533

831 +#: sequencer.c:537

832 #, c-format

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

834 msgstr ""

835

840 -#: sequencer.c:565

836 +#: sequencer.c:569

837 msgid "empty commit set passed"

838 msgstr ""

839

844 -#: sequencer.c:573

840 +#: sequencer.c:577

841 #, c-format

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

843 msgstr ""

844

849 -#: sequencer.c:578

845 +#: sequencer.c:582

846 #, c-format

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

848 msgstr ""

849

854 -#: sequencer.c:636

850 +#: sequencer.c:640

851 #, c-format

852 msgid "Cannot %s during a %s"

853 msgstr ""

854

859 -#: sequencer.c:658

855 +#: sequencer.c:662

856 #, c-format

857 msgid "Could not parse line %d."

858 msgstr ""

859

864 -#: sequencer.c:663

860 +#: sequencer.c:667

861 msgid "No commits parsed."

862 msgstr ""

863

868 -#: sequencer.c:676

864 +#: sequencer.c:680

865 #, c-format

866 msgid "Could not open %s"

867 msgstr ""

868

873 -#: sequencer.c:680

869 +#: sequencer.c:684

870 #, c-format

871 msgid "Could not read %s."

872 msgstr ""

873

878 -#: sequencer.c:687

874 +#: sequencer.c:691

875 #, c-format

876 msgid "Unusable instruction sheet: %s"

877 msgstr ""

878

883 -#: sequencer.c:715

879 +#: sequencer.c:719

880 #, c-format

881 msgid "Invalid key: %s"

882 msgstr ""

883

888 -#: sequencer.c:718

884 +#: sequencer.c:722

885 #, c-format

886 msgid "Invalid value for %s: %s"

887 msgstr ""

888

893 -#: sequencer.c:730

889 +#: sequencer.c:734

890 #, c-format

891 msgid "Malformed options sheet: %s"

892 msgstr ""

893

898 -#: sequencer.c:751

894 +#: sequencer.c:755

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

896 msgstr ""

897

902 -#: sequencer.c:752

898 +#: sequencer.c:756

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

900 msgstr ""

901

906 -#: sequencer.c:756

902 +#: sequencer.c:760

903 #, c-format

904 msgid "Could not create sequencer directory %s"

905 msgstr ""

906

911 -#: sequencer.c:772 sequencer.c:857

907 +#: sequencer.c:776 sequencer.c:861

908 #, c-format

909 msgid "Error wrapping up %s."

910 msgstr ""

911

916 -#: sequencer.c:791 sequencer.c:925

912 +#: sequencer.c:795 sequencer.c:929

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

914 msgstr ""

915

920 -#: sequencer.c:793

916 +#: sequencer.c:797

917 msgid "cannot resolve HEAD"

918 msgstr ""

919

924 -#: sequencer.c:795

920 +#: sequencer.c:799

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

922 msgstr ""

923

928 -#: sequencer.c:817 builtin/apply.c:4005

924 +#: sequencer.c:821 builtin/apply.c:4016

925 #, c-format

926 msgid "cannot open %s: %s"

927 msgstr ""

928

933 -#: sequencer.c:820

929 +#: sequencer.c:824

930 #, c-format

931 msgid "cannot read %s: %s"

932 msgstr ""

933

938 -#: sequencer.c:821

934 +#: sequencer.c:825

935 msgid "unexpected end of file"

936 msgstr ""

937

942 -#: sequencer.c:827

938 +#: sequencer.c:831

939 #, c-format

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

941 msgstr ""

942

947 -#: sequencer.c:850

943 +#: sequencer.c:854

944 #, c-format

945 msgid "Could not format %s."

946 msgstr ""

947

952 -#: sequencer.c:1012

948 +#: sequencer.c:1016

949 msgid "Can't revert as initial commit"

950 msgstr ""

951

956 -#: sequencer.c:1013

952 +#: sequencer.c:1017

953 msgid "Can't cherry-pick into empty head"

954 msgstr ""

955

@@ -981,12 +977,17 @@ msgstr ""

977 msgid "unable to access '%s': %s"

978 msgstr ""

979

984 -#: wrapper.c:426

980 +#: wrapper.c:423

981 +#, c-format

982 +msgid "unable to access '%s'"

983 +msgstr ""

984 +

985 +#: wrapper.c:434

986 #, c-format

987 msgid "unable to look up current user in the passwd file: %s"

988 msgstr ""

989

989 -#: wrapper.c:427

990 +#: wrapper.c:435

991 msgid "no such user"

992 msgstr ""

993

@@ -1134,199 +1135,194 @@ msgstr ""

1135 msgid "bug: unhandled diff status %c"

1136 msgstr ""

1137

1137 -#: wt-status.c:785

1138 +#: wt-status.c:787

1139 msgid "You have unmerged paths."

1140 msgstr ""

1141

1141 -#: wt-status.c:788 wt-status.c:912

1142 +#: wt-status.c:790 wt-status.c:914

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

1144 msgstr ""

1145

1145 -#: wt-status.c:791

1146 +#: wt-status.c:793

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

1148 msgstr ""

1149

1149 -#: wt-status.c:794

1150 +#: wt-status.c:796

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

1152 msgstr ""

1153

1153 -#: wt-status.c:804

1154 +#: wt-status.c:806

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

1156 msgstr ""

1157

1157 -#: wt-status.c:807

1158 +#: wt-status.c:809

1159 msgid "The current patch is empty."

1160 msgstr ""

1161

1161 -#: wt-status.c:811

1162 +#: wt-status.c:813

1163 msgid " (fix conflicts and then run \"git am --resolved\")"

1164 msgstr ""

1165

1165 -#: wt-status.c:813

1166 +#: wt-status.c:815

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

1168 msgstr ""

1169

1169 -#: wt-status.c:815

1170 +#: wt-status.c:817

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

1172 msgstr ""

1173

1173 -#: wt-status.c:873 wt-status.c:883

1174 +#: wt-status.c:875 wt-status.c:885

1175 msgid "You are currently rebasing."

1176 msgstr ""

1177

1177 -#: wt-status.c:876

1178 +#: wt-status.c:878

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

1180 msgstr ""

1181

1181 -#: wt-status.c:878

1182 +#: wt-status.c:880

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

1184 msgstr ""

1185

1185 -#: wt-status.c:880

1186 +#: wt-status.c:882

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

1188 msgstr ""

1189

1189 -#: wt-status.c:886

1190 +#: wt-status.c:888

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

1192 msgstr ""

1193

1193 -#: wt-status.c:888

1194 +#: wt-status.c:890

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

1196 msgstr ""

1197

1197 -#: wt-status.c:891

1198 +#: wt-status.c:893

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

1200 msgstr ""

1201

1201 -#: wt-status.c:893

1202 +#: wt-status.c:895

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

1204 msgstr ""

1205

1205 -#: wt-status.c:896

1206 +#: wt-status.c:898

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

1208 msgstr ""

1209

1209 -#: wt-status.c:898

1210 +#: wt-status.c:900

1211 msgid ""

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

1213 msgstr ""

1214

1214 -#: wt-status.c:908

1215 +#: wt-status.c:910

1216 msgid "You are currently cherry-picking."

1217 msgstr ""

1218

1218 -#: wt-status.c:915

1219 +#: wt-status.c:917

1220 msgid " (all conflicts fixed: run \"git commit\")"

1221 msgstr ""

1222

1222 -#: wt-status.c:924

1223 +#: wt-status.c:926

1224 msgid "You are currently bisecting."

1225 msgstr ""

1226

1226 -#: wt-status.c:927

1227 +#: wt-status.c:929

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

1229 msgstr ""

1230

1230 -#: wt-status.c:978

1231 +#: wt-status.c:980

1232 msgid "On branch "

1233 msgstr ""

1234

1234 -#: wt-status.c:985

1235 +#: wt-status.c:987

1236 msgid "Not currently on any branch."

1237 msgstr ""

1238

1238 -#: wt-status.c:997

1239 +#: wt-status.c:999

1240 msgid "Initial commit"

1241 msgstr ""

1242

1242 -#: wt-status.c:1011

1243 +#: wt-status.c:1013

1244 msgid "Untracked files"

1245 msgstr ""

1246

1246 -#: wt-status.c:1013

1247 +#: wt-status.c:1015

1248 msgid "Ignored files"

1249 msgstr ""

1250

1250 -#: wt-status.c:1015

1251 +#: wt-status.c:1017

1252 #, c-format

1253 msgid "Untracked files not listed%s"

1254 msgstr ""

1255

1255 -#: wt-status.c:1017

1256 +#: wt-status.c:1019

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

1258 msgstr ""

1259

1259 -#: wt-status.c:1023

1260 +#: wt-status.c:1025

1261 msgid "No changes"

1262 msgstr ""

1263

1263 -#: wt-status.c:1028

1264 +#: wt-status.c:1030

1265 #, c-format

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

1267 msgstr ""

1268

1268 -#: wt-status.c:1031

1269 +#: wt-status.c:1033

1270 #, c-format

1271 msgid "no changes added to commit\n"

1272 msgstr ""

1273

1273 -#: wt-status.c:1034

1274 +#: wt-status.c:1036

1275 #, c-format

1276 msgid ""

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

1278 "track)\n"

1279 msgstr ""

1280

1280 -#: wt-status.c:1037

1281 +#: wt-status.c:1039

1282 #, c-format

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

1284 msgstr ""

1285

1285 -#: wt-status.c:1040

1286 +#: wt-status.c:1042

1287 #, c-format

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

1289 msgstr ""

1290

1290 -#: wt-status.c:1043 wt-status.c:1048

1291 +#: wt-status.c:1045 wt-status.c:1050

1292 #, c-format

1293 msgid "nothing to commit\n"

1294 msgstr ""

1295

1295 -#: wt-status.c:1046

1296 +#: wt-status.c:1048

1297 #, c-format

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

1299 msgstr ""

1300

1300 -#: wt-status.c:1050

1301 +#: wt-status.c:1052

1302 #, c-format

1303 msgid "nothing to commit, working directory clean\n"

1304 msgstr ""

1305

1305 -#: wt-status.c:1158

1306 +#: wt-status.c:1160

1307 msgid "HEAD (no branch)"

1308 msgstr ""

1309

1309 -#: wt-status.c:1164

1310 +#: wt-status.c:1166

1311 msgid "Initial commit on "

1312 msgstr ""

1313

1313 -#: wt-status.c:1179

1314 +#: wt-status.c:1181

1315 msgid "behind "

1316 msgstr ""

1317

1317 -#: wt-status.c:1182 wt-status.c:1185

1318 +#: wt-status.c:1184 wt-status.c:1187

1319 msgid "ahead "

1320 msgstr ""

1321

1321 -#: wt-status.c:1187

1322 +#: wt-status.c:1189

1323 msgid ", behind "

1324 msgstr ""

1325

1325 -#: compat/precompose_utf8.c:58 builtin/clone.c:341

1326 -#, c-format

1327 -msgid "failed to unlink '%s'"

1328 -msgstr ""

1329 -

1326 #: builtin/add.c:19

1327 msgid "git add [options] [--] <filepattern>..."

1328 msgstr ""

@@ -1395,14 +1391,14 @@ msgstr ""

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

1392 msgstr ""

1393

1398 -#: builtin/add.c:319 builtin/clean.c:52 builtin/fetch.c:78 builtin/mv.c:63

1399 -#: builtin/prune-packed.c:76 builtin/push.c:388 builtin/remote.c:1253

1394 +#: builtin/add.c:319 builtin/clean.c:160 builtin/fetch.c:78 builtin/mv.c:63

1395 +#: builtin/prune-packed.c:76 builtin/push.c:396 builtin/remote.c:1253

1396 #: builtin/rm.c:206

1397 msgid "dry run"

1398 msgstr ""

1399

1404 -#: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:1160

1405 -#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1483

1400 +#: builtin/add.c:320 builtin/apply.c:4365 builtin/commit.c:1160

1401 +#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1522

1402 #: builtin/mv.c:62 builtin/read-tree.c:112

1403 msgid "be verbose"

1404 msgstr ""

@@ -1411,7 +1407,7 @@ msgstr ""

1407 msgid "interactive picking"

1408 msgstr ""

1409

1414 -#: builtin/add.c:323 builtin/checkout.c:1031 builtin/reset.c:248

1410 +#: builtin/add.c:323 builtin/checkout.c:1031 builtin/reset.c:258

1411 msgid "select hunks interactively"

1412 msgstr ""

1413

@@ -1478,12 +1474,12 @@ msgstr ""

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

1475 msgstr ""

1476

1481 -#: builtin/add.c:421 builtin/clean.c:95 builtin/commit.c:291 builtin/mv.c:82

1477 +#: builtin/add.c:421 builtin/clean.c:203 builtin/commit.c:291 builtin/mv.c:82

1478 #: builtin/rm.c:235

1479 msgid "index file corrupt"

1480 msgstr ""

1481

1486 -#: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:370

1482 +#: builtin/add.c:481 builtin/apply.c:4461 builtin/mv.c:229 builtin/rm.c:370

1483 msgid "Unable to write new index file"

1484 msgstr ""

1485

@@ -1611,346 +1607,342 @@ msgstr ""

1607 msgid "unable to open or read %s"

1608 msgstr ""

1609

1614 -#: builtin/apply.c:2149

1615 -msgid "oops"

1616 -msgstr ""

1617 -

1618 -#: builtin/apply.c:2671

1610 +#: builtin/apply.c:2682

1611 #, c-format

1612 msgid "invalid start of line: '%c'"

1613 msgstr ""

1614

1623 -#: builtin/apply.c:2789

1615 +#: builtin/apply.c:2800

1616 #, c-format

1617 msgid "Hunk #%d succeeded at %d (offset %d line)."

1618 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."

1619 msgstr[0] ""

1620 msgstr[1] ""

1621

1630 -#: builtin/apply.c:2801

1622 +#: builtin/apply.c:2812

1623 #, c-format

1624 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"

1625 msgstr ""

1626

1635 -#: builtin/apply.c:2807

1627 +#: builtin/apply.c:2818

1628 #, c-format

1629 msgid ""

1630 "while searching for:\n"

1631 "%.*s"

1632 msgstr ""

1633

1642 -#: builtin/apply.c:2826

1634 +#: builtin/apply.c:2837

1635 #, c-format

1636 msgid "missing binary patch data for '%s'"

1637 msgstr ""

1638

1647 -#: builtin/apply.c:2929

1639 +#: builtin/apply.c:2940

1640 #, c-format

1641 msgid "binary patch does not apply to '%s'"

1642 msgstr ""

1643

1652 -#: builtin/apply.c:2935

1644 +#: builtin/apply.c:2946

1645 #, c-format

1646 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"

1647 msgstr ""

1648

1657 -#: builtin/apply.c:2956

1649 +#: builtin/apply.c:2967

1650 #, c-format

1651 msgid "patch failed: %s:%ld"

1652 msgstr ""

1653

1662 -#: builtin/apply.c:3078

1654 +#: builtin/apply.c:3089

1655 #, c-format

1656 msgid "cannot checkout %s"

1657 msgstr ""

1658

1667 -#: builtin/apply.c:3123 builtin/apply.c:3132 builtin/apply.c:3176

1659 +#: builtin/apply.c:3134 builtin/apply.c:3143 builtin/apply.c:3187

1660 #, c-format

1661 msgid "read of %s failed"

1662 msgstr ""

1663

1672 -#: builtin/apply.c:3156 builtin/apply.c:3378

1664 +#: builtin/apply.c:3167 builtin/apply.c:3389

1665 #, c-format

1666 msgid "path %s has been renamed/deleted"

1667 msgstr ""

1668

1677 -#: builtin/apply.c:3237 builtin/apply.c:3392

1669 +#: builtin/apply.c:3248 builtin/apply.c:3403

1670 #, c-format

1671 msgid "%s: does not exist in index"

1672 msgstr ""

1673

1682 -#: builtin/apply.c:3241 builtin/apply.c:3384 builtin/apply.c:3406

1674 +#: builtin/apply.c:3252 builtin/apply.c:3395 builtin/apply.c:3417

1675 #, c-format

1676 msgid "%s: %s"

1677 msgstr ""

1678

1687 -#: builtin/apply.c:3246 builtin/apply.c:3400

1679 +#: builtin/apply.c:3257 builtin/apply.c:3411

1680 #, c-format

1681 msgid "%s: does not match index"

1682 msgstr ""

1683

1692 -#: builtin/apply.c:3348

1684 +#: builtin/apply.c:3359

1685 msgid "removal patch leaves file contents"

1686 msgstr ""

1687

1696 -#: builtin/apply.c:3417

1688 +#: builtin/apply.c:3428

1689 #, c-format

1690 msgid "%s: wrong type"

1691 msgstr ""

1692

1701 -#: builtin/apply.c:3419

1693 +#: builtin/apply.c:3430

1694 #, c-format

1695 msgid "%s has type %o, expected %o"

1696 msgstr ""

1697

1706 -#: builtin/apply.c:3520

1698 +#: builtin/apply.c:3531

1699 #, c-format

1700 msgid "%s: already exists in index"

1701 msgstr ""

1702

1711 -#: builtin/apply.c:3523

1703 +#: builtin/apply.c:3534

1704 #, c-format

1705 msgid "%s: already exists in working directory"

1706 msgstr ""

1707

1716 -#: builtin/apply.c:3543

1708 +#: builtin/apply.c:3554

1709 #, c-format

1710 msgid "new mode (%o) of %s does not match old mode (%o)"

1711 msgstr ""

1712

1721 -#: builtin/apply.c:3548

1713 +#: builtin/apply.c:3559

1714 #, c-format

1715 msgid "new mode (%o) of %s does not match old mode (%o) of %s"

1716 msgstr ""

1717

1726 -#: builtin/apply.c:3556

1718 +#: builtin/apply.c:3567

1719 #, c-format

1720 msgid "%s: patch does not apply"

1721 msgstr ""

1722

1731 -#: builtin/apply.c:3569

1723 +#: builtin/apply.c:3580

1724 #, c-format

1725 msgid "Checking patch %s..."

1726 msgstr ""

1727

1736 -#: builtin/apply.c:3624 builtin/checkout.c:215 builtin/reset.c:158

1728 +#: builtin/apply.c:3635 builtin/checkout.c:215 builtin/reset.c:124

1729 #, c-format

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

1731 msgstr ""

1732

1741 -#: builtin/apply.c:3767

1733 +#: builtin/apply.c:3778

1734 #, c-format

1735 msgid "unable to remove %s from index"

1736 msgstr ""

1737

1746 -#: builtin/apply.c:3795

1738 +#: builtin/apply.c:3806

1739 #, c-format

1740 msgid "corrupt patch for subproject %s"

1741 msgstr ""

1742

1751 -#: builtin/apply.c:3799

1743 +#: builtin/apply.c:3810

1744 #, c-format

1745 msgid "unable to stat newly created file '%s'"

1746 msgstr ""

1747

1756 -#: builtin/apply.c:3804

1748 +#: builtin/apply.c:3815

1749 #, c-format

1750 msgid "unable to create backing store for newly created file %s"

1751 msgstr ""

1752

1761 -#: builtin/apply.c:3807 builtin/apply.c:3915

1753 +#: builtin/apply.c:3818 builtin/apply.c:3926

1754 #, c-format

1755 msgid "unable to add cache entry for %s"

1756 msgstr ""

1757

1766 -#: builtin/apply.c:3840

1758 +#: builtin/apply.c:3851

1759 #, c-format

1760 msgid "closing file '%s'"

1761 msgstr ""

1762

1771 -#: builtin/apply.c:3889

1763 +#: builtin/apply.c:3900

1764 #, c-format

1765 msgid "unable to write file '%s' mode %o"

1766 msgstr ""

1767

1776 -#: builtin/apply.c:3976

1768 +#: builtin/apply.c:3987

1769 #, c-format

1770 msgid "Applied patch %s cleanly."

1771 msgstr ""

1772

1781 -#: builtin/apply.c:3984

1773 +#: builtin/apply.c:3995

1774 msgid "internal error"

1775 msgstr ""

1776

1777 #. Say this even without --verbose

1786 -#: builtin/apply.c:3987

1778 +#: builtin/apply.c:3998

1779 #, c-format

1780 msgid "Applying patch %%s with %d reject..."

1781 msgid_plural "Applying patch %%s with %d rejects..."

1782 msgstr[0] ""

1783 msgstr[1] ""

1784

1793 -#: builtin/apply.c:3997

1785 +#: builtin/apply.c:4008

1786 #, c-format

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

1788 msgstr ""

1789

1798 -#: builtin/apply.c:4018

1790 +#: builtin/apply.c:4029

1791 #, c-format

1792 msgid "Hunk #%d applied cleanly."

1793 msgstr ""

1794

1803 -#: builtin/apply.c:4021

1795 +#: builtin/apply.c:4032

1796 #, c-format

1797 msgid "Rejected hunk #%d."

1798 msgstr ""

1799

1808 -#: builtin/apply.c:4171

1800 +#: builtin/apply.c:4182

1801 msgid "unrecognized input"

1802 msgstr ""

1803

1812 -#: builtin/apply.c:4182

1804 +#: builtin/apply.c:4193

1805 msgid "unable to read index file"

1806 msgstr ""

1807

1816 -#: builtin/apply.c:4301 builtin/apply.c:4304 builtin/clone.c:91

1808 +#: builtin/apply.c:4312 builtin/apply.c:4315 builtin/clone.c:91

1809 #: builtin/fetch.c:63

1810 msgid "path"

1811 msgstr ""

1812

1821 -#: builtin/apply.c:4302

1813 +#: builtin/apply.c:4313

1814 msgid "don't apply changes matching the given path"

1815 msgstr ""

1816

1825 -#: builtin/apply.c:4305

1817 +#: builtin/apply.c:4316

1818 msgid "apply changes matching the given path"

1819 msgstr ""

1820

1829 -#: builtin/apply.c:4307

1821 +#: builtin/apply.c:4318

1822 msgid "num"

1823 msgstr ""

1824

1833 -#: builtin/apply.c:4308

1825 +#: builtin/apply.c:4319

1826 msgid "remove <num> leading slashes from traditional diff paths"

1827 msgstr ""

1828

1837 -#: builtin/apply.c:4311

1829 +#: builtin/apply.c:4322

1830 msgid "ignore additions made by the patch"

1831 msgstr ""

1832

1841 -#: builtin/apply.c:4313

1833 +#: builtin/apply.c:4324

1834 msgid "instead of applying the patch, output diffstat for the input"

1835 msgstr ""

1836

1845 -#: builtin/apply.c:4317

1837 +#: builtin/apply.c:4328

1838 msgid "show number of added and deleted lines in decimal notation"

1839 msgstr ""

1840

1849 -#: builtin/apply.c:4319

1841 +#: builtin/apply.c:4330

1842 msgid "instead of applying the patch, output a summary for the input"

1843 msgstr ""

1844

1853 -#: builtin/apply.c:4321

1845 +#: builtin/apply.c:4332

1846 msgid "instead of applying the patch, see if the patch is applicable"

1847 msgstr ""

1848

1857 -#: builtin/apply.c:4323

1849 +#: builtin/apply.c:4334

1850 msgid "make sure the patch is applicable to the current index"

1851 msgstr ""

1852

1861 -#: builtin/apply.c:4325

1853 +#: builtin/apply.c:4336

1854 msgid "apply a patch without touching the working tree"

1855 msgstr ""

1856

1865 -#: builtin/apply.c:4327

1857 +#: builtin/apply.c:4338

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

1859 msgstr ""

1860

1869 -#: builtin/apply.c:4329

1861 +#: builtin/apply.c:4340

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

1863 msgstr ""

1864

1873 -#: builtin/apply.c:4331

1865 +#: builtin/apply.c:4342

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

1867 msgstr ""

1868

1877 -#: builtin/apply.c:4333 builtin/checkout-index.c:197 builtin/ls-files.c:460

1869 +#: builtin/apply.c:4344 builtin/checkout-index.c:197 builtin/ls-files.c:460

1870 msgid "paths are separated with NUL character"

1871 msgstr ""

1872

1881 -#: builtin/apply.c:4336

1873 +#: builtin/apply.c:4347

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

1875 msgstr ""

1876

1885 -#: builtin/apply.c:4337

1877 +#: builtin/apply.c:4348

1878 msgid "action"

1879 msgstr ""

1880

1889 -#: builtin/apply.c:4338

1881 +#: builtin/apply.c:4349

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

1883 msgstr ""

1884

1893 -#: builtin/apply.c:4341 builtin/apply.c:4344

1885 +#: builtin/apply.c:4352 builtin/apply.c:4355

1886 msgid "ignore changes in whitespace when finding context"

1887 msgstr ""

1888

1897 -#: builtin/apply.c:4347

1889 +#: builtin/apply.c:4358

1890 msgid "apply the patch in reverse"

1891 msgstr ""

1892

1901 -#: builtin/apply.c:4349

1893 +#: builtin/apply.c:4360

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

1895 msgstr ""

1896

1905 -#: builtin/apply.c:4351

1897 +#: builtin/apply.c:4362

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

1899 msgstr ""

1900

1909 -#: builtin/apply.c:4353

1901 +#: builtin/apply.c:4364

1902 msgid "allow overlapping hunks"

1903 msgstr ""

1904

1913 -#: builtin/apply.c:4356

1905 +#: builtin/apply.c:4367

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

1907 msgstr ""

1908

1917 -#: builtin/apply.c:4359

1909 +#: builtin/apply.c:4370

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

1911 msgstr ""

1912

1921 -#: builtin/apply.c:4361

1913 +#: builtin/apply.c:4372

1914 msgid "root"

1915 msgstr ""

1916

1925 -#: builtin/apply.c:4362

1917 +#: builtin/apply.c:4373

1918 msgid "prepend <root> to all filenames"

1919 msgstr ""

1920

1929 -#: builtin/apply.c:4384

1921 +#: builtin/apply.c:4395

1922 msgid "--3way outside a repository"

1923 msgstr ""

1924

1933 -#: builtin/apply.c:4392

1925 +#: builtin/apply.c:4403

1926 msgid "--index outside a repository"

1927 msgstr ""

1928

1937 -#: builtin/apply.c:4395

1929 +#: builtin/apply.c:4406

1930 msgid "--cached outside a repository"

1931 msgstr ""

1932

1941 -#: builtin/apply.c:4411

1933 +#: builtin/apply.c:4422

1934 #, c-format

1935 msgid "can't open patch '%s'"

1936 msgstr ""

1937

1946 -#: builtin/apply.c:4425

1938 +#: builtin/apply.c:4436

1939 #, c-format

1940 msgid "squelched %d whitespace error"

1941 msgid_plural "squelched %d whitespace errors"

1942 msgstr[0] ""

1943 msgstr[1] ""

1944

1953 -#: builtin/apply.c:4431 builtin/apply.c:4441

1945 +#: builtin/apply.c:4442 builtin/apply.c:4452

1946 #, c-format

1947 msgid "%d line adds whitespace errors."

1948 msgid_plural "%d lines add whitespace errors."

@@ -2012,95 +2004,95 @@ msgstr ""

2004 msgid "[rev-opts] are documented in git-rev-list(1)"

2005 msgstr ""

2006

2015 -#: builtin/blame.c:2374

2007 +#: builtin/blame.c:2364

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

2009 msgstr ""

2010

2019 -#: builtin/blame.c:2375

2011 +#: builtin/blame.c:2365

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

2013 msgstr ""

2014

2023 -#: builtin/blame.c:2376

2015 +#: builtin/blame.c:2366

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

2017 msgstr ""

2018

2027 -#: builtin/blame.c:2377

2019 +#: builtin/blame.c:2367

2020 msgid "Show work cost statistics"

2021 msgstr ""

2022

2031 -#: builtin/blame.c:2378

2023 +#: builtin/blame.c:2368

2024 msgid "Show output score for blame entries"

2025 msgstr ""

2026

2035 -#: builtin/blame.c:2379

2027 +#: builtin/blame.c:2369

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

2029 msgstr ""

2030

2039 -#: builtin/blame.c:2380

2031 +#: builtin/blame.c:2370

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

2033 msgstr ""

2034

2043 -#: builtin/blame.c:2381

2035 +#: builtin/blame.c:2371

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

2037 msgstr ""

2038

2047 -#: builtin/blame.c:2382

2039 +#: builtin/blame.c:2372

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

2041 msgstr ""

2042

2051 -#: builtin/blame.c:2383

2043 +#: builtin/blame.c:2373

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

2045 msgstr ""

2046

2055 -#: builtin/blame.c:2384

2047 +#: builtin/blame.c:2374

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

2049 msgstr ""

2050

2059 -#: builtin/blame.c:2385

2051 +#: builtin/blame.c:2375

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

2053 msgstr ""

2054

2063 -#: builtin/blame.c:2386

2055 +#: builtin/blame.c:2376

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

2057 msgstr ""

2058

2067 -#: builtin/blame.c:2387

2059 +#: builtin/blame.c:2377

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

2061 msgstr ""

2062

2071 -#: builtin/blame.c:2388

2063 +#: builtin/blame.c:2378

2064 msgid "Ignore whitespace differences"

2065 msgstr ""

2066

2075 -#: builtin/blame.c:2389

2067 +#: builtin/blame.c:2379

2068 msgid "Spend extra cycles to find better match"

2069 msgstr ""

2070

2079 -#: builtin/blame.c:2390

2071 +#: builtin/blame.c:2380

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

2073 msgstr ""

2074

2083 -#: builtin/blame.c:2391

2075 +#: builtin/blame.c:2381

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

2077 msgstr ""

2078

2087 -#: builtin/blame.c:2392 builtin/blame.c:2393

2079 +#: builtin/blame.c:2382 builtin/blame.c:2383

2080 msgid "score"

2081 msgstr ""

2082

2091 -#: builtin/blame.c:2392

2083 +#: builtin/blame.c:2382

2084 msgid "Find line copies within and across files"

2085 msgstr ""

2086

2095 -#: builtin/blame.c:2393

2087 +#: builtin/blame.c:2383

2088 msgid "Find line movements within and across files"

2089 msgstr ""

2090

2099 -#: builtin/blame.c:2394

2091 +#: builtin/blame.c:2384

2092 msgid "n,m"

2093 msgstr ""

2094

2103 -#: builtin/blame.c:2394

2095 +#: builtin/blame.c:2384

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

2097 msgstr ""

2098

@@ -2302,8 +2294,8 @@ msgid "act on remote-tracking branches"

2294 msgstr ""

2295

2296 #: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788

2305 -#: builtin/branch.c:794 builtin/commit.c:1376 builtin/commit.c:1377

2306 -#: builtin/commit.c:1378 builtin/commit.c:1379 builtin/tag.c:470

2297 +#: builtin/branch.c:794 builtin/commit.c:1378 builtin/commit.c:1379

2298 +#: builtin/commit.c:1380 builtin/commit.c:1381 builtin/tag.c:470

2299 msgid "commit"

2300 msgstr ""

2301

@@ -2768,7 +2760,7 @@ msgstr ""

2760 msgid "update ignored files (default)"

2761 msgstr ""

2762

2771 -#: builtin/checkout.c:1029 builtin/log.c:1116 parse-options.h:241

2763 +#: builtin/checkout.c:1029 builtin/log.c:1147 parse-options.h:245

2764 msgid "style"

2765 msgstr ""

2766

@@ -2814,85 +2806,85 @@ msgid ""

2806 "checking out of the index."

2807 msgstr ""

2808

2817 -#: builtin/clean.c:19

2809 +#: builtin/clean.c:20

2810 msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."

2811 msgstr ""

2812

2821 -#: builtin/clean.c:51

2813 +#: builtin/clean.c:24

2814 +#, c-format

2815 +msgid "Removing %s\n"

2816 +msgstr ""

2817 +

2818 +#: builtin/clean.c:25

2819 +#, c-format

2820 +msgid "Would remove %s\n"

2821 +msgstr ""

2822 +

2823 +#: builtin/clean.c:26

2824 +#, c-format

2825 +msgid "Skipping repository %s\n"

2826 +msgstr ""

2827 +

2828 +#: builtin/clean.c:27

2829 +#, c-format

2830 +msgid "Would skip repository %s\n"

2831 +msgstr ""

2832 +

2833 +#: builtin/clean.c:28

2834 +#, c-format

2835 +msgid "failed to remove %s"

2836 +msgstr ""

2837 +

2838 +#: builtin/clean.c:159

2839 msgid "do not print names of files removed"

2840 msgstr ""

2841

2825 -#: builtin/clean.c:53

2842 +#: builtin/clean.c:161

2843 msgid "force"

2844 msgstr ""

2845

2829 -#: builtin/clean.c:55

2846 +#: builtin/clean.c:163

2847 msgid "remove whole directories"

2848 msgstr ""

2849

2833 -#: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:717

2850 +#: builtin/clean.c:164 builtin/describe.c:413 builtin/grep.c:717

2851 #: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:182

2852 msgid "pattern"

2853 msgstr ""

2854

2838 -#: builtin/clean.c:57

2855 +#: builtin/clean.c:165

2856 msgid "add <pattern> to ignore rules"

2857 msgstr ""

2858

2842 -#: builtin/clean.c:58

2859 +#: builtin/clean.c:166

2860 msgid "remove ignored files, too"

2861 msgstr ""

2862

2846 -#: builtin/clean.c:60

2863 +#: builtin/clean.c:168

2864 msgid "remove only ignored files"

2865 msgstr ""

2866

2850 -#: builtin/clean.c:78

2867 +#: builtin/clean.c:186

2868 msgid "-x and -X cannot be used together"

2869 msgstr ""

2870

2854 -#: builtin/clean.c:82

2871 +#: builtin/clean.c:190

2872 msgid ""

2873 "clean.requireForce set to true and neither -n nor -f given; refusing to clean"

2874 msgstr ""

2875

2859 -#: builtin/clean.c:85

2876 +#: builtin/clean.c:193

2877 msgid ""

2878 "clean.requireForce defaults to true and neither -n nor -f given; refusing to "

2879 "clean"

2880 msgstr ""

2881

2865 -#: builtin/clean.c:155 builtin/clean.c:176

2866 -#, c-format

2867 -msgid "Would remove %s\n"

2868 -msgstr ""

2869 -

2870 -#: builtin/clean.c:159 builtin/clean.c:179

2871 -#, c-format

2872 -msgid "Removing %s\n"

2873 -msgstr ""

2874 -

2875 -#: builtin/clean.c:162 builtin/clean.c:182

2876 -#, c-format

2877 -msgid "failed to remove %s"

2878 -msgstr ""

2879 -

2880 -#: builtin/clean.c:166

2881 -#, c-format

2882 -msgid "Would not remove %s\n"

2883 -msgstr ""

2884 -

2885 -#: builtin/clean.c:168

2886 -#, c-format

2887 -msgid "Not removing %s\n"

2888 -msgstr ""

2889 -

2882 #: builtin/clone.c:36

2883 msgid "git clone [options] [--] <repo> [<dir>]"

2884 msgstr ""

2885

2886 #: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212

2895 -#: builtin/push.c:399

2887 +#: builtin/push.c:407

2888 msgid "force progress reporting"

2889 msgstr ""

2890

@@ -3005,6 +2997,11 @@ msgstr ""

2997 msgid "failed to stat %s\n"

2998 msgstr ""

2999

3000 +#: builtin/clone.c:341

3001 +#, c-format

3002 +msgid "failed to unlink '%s'"

3003 +msgstr ""

3004 +

3005 #: builtin/clone.c:346

3006 #, c-format

3007 msgid "failed to create link '%s'"

@@ -3042,56 +3039,60 @@ msgstr ""

3039 msgid "--bare and --origin %s options are incompatible."

3040 msgstr ""

3041

3045 -#: builtin/clone.c:719

3042 +#: builtin/clone.c:708

3043 +msgid "--bare and --separate-git-dir are incompatible."

3044 +msgstr ""

3045 +

3046 +#: builtin/clone.c:721

3047 #, c-format

3048 msgid "repository '%s' does not exist"

3049 msgstr ""

3050

3050 -#: builtin/clone.c:724

3051 +#: builtin/clone.c:726

3052 msgid "--depth is ignored in local clones; use file:// instead."

3053 msgstr ""

3054

3054 -#: builtin/clone.c:734

3055 +#: builtin/clone.c:736

3056 #, c-format

3057 msgid "destination path '%s' already exists and is not an empty directory."

3058 msgstr ""

3059

3059 -#: builtin/clone.c:744

3060 +#: builtin/clone.c:746

3061 #, c-format

3062 msgid "working tree '%s' already exists."

3063 msgstr ""

3064

3064 -#: builtin/clone.c:757 builtin/clone.c:771

3065 +#: builtin/clone.c:759 builtin/clone.c:773

3066 #, c-format

3067 msgid "could not create leading directories of '%s'"

3068 msgstr ""

3069

3069 -#: builtin/clone.c:760

3070 +#: builtin/clone.c:762

3071 #, c-format

3072 msgid "could not create work tree dir '%s'."

3073 msgstr ""

3074

3074 -#: builtin/clone.c:779

3075 +#: builtin/clone.c:783

3076 #, c-format

3077 msgid "Cloning into bare repository '%s'...\n"

3078 msgstr ""

3079

3079 -#: builtin/clone.c:781

3080 +#: builtin/clone.c:785

3081 #, c-format

3082 msgid "Cloning into '%s'...\n"

3083 msgstr ""

3084

3084 -#: builtin/clone.c:823

3085 +#: builtin/clone.c:827

3086 #, c-format

3087 msgid "Don't know how to clone %s"

3088 msgstr ""

3089

3089 -#: builtin/clone.c:872

3090 +#: builtin/clone.c:876

3091 #, c-format

3092 msgid "Remote branch %s not found in upstream %s"

3093 msgstr ""

3094

3094 -#: builtin/clone.c:879

3095 +#: builtin/clone.c:883

3096 msgid "You appear to have cloned an empty repository."

3097 msgstr ""

3098

@@ -3217,7 +3218,7 @@ msgstr ""

3218 msgid "could not lookup commit %s"

3219 msgstr ""

3220

3220 -#: builtin/commit.c:610 builtin/shortlog.c:296

3221 +#: builtin/commit.c:610 builtin/shortlog.c:272

3222 #, c-format

3223 msgid "(reading log message from standard input)\n"

3224 msgstr ""

@@ -3379,32 +3380,32 @@ msgstr ""

3380 msgid "--long and -z are incompatible"

3381 msgstr ""

3382

3382 -#: builtin/commit.c:1162 builtin/commit.c:1398

3383 +#: builtin/commit.c:1162 builtin/commit.c:1400

3384 msgid "show status concisely"

3385 msgstr ""

3386

3386 -#: builtin/commit.c:1164 builtin/commit.c:1400

3387 +#: builtin/commit.c:1164 builtin/commit.c:1402

3388 msgid "show branch information"

3389 msgstr ""

3390

3390 -#: builtin/commit.c:1166 builtin/commit.c:1402 builtin/push.c:389

3391 +#: builtin/commit.c:1166 builtin/commit.c:1404 builtin/push.c:397

3392 msgid "machine-readable output"

3393 msgstr ""

3394

3394 -#: builtin/commit.c:1169 builtin/commit.c:1404

3395 +#: builtin/commit.c:1169 builtin/commit.c:1406

3396 msgid "show status in long format (default)"

3397 msgstr ""

3398

3398 -#: builtin/commit.c:1172 builtin/commit.c:1407

3399 +#: builtin/commit.c:1172 builtin/commit.c:1409

3400 msgid "terminate entries with NUL"

3401 msgstr ""

3402

3402 -#: builtin/commit.c:1174 builtin/commit.c:1410 builtin/fast-export.c:636

3403 -#: builtin/fast-export.c:639 builtin/tag.c:461

3403 +#: builtin/commit.c:1174 builtin/commit.c:1412 builtin/fast-export.c:647

3404 +#: builtin/fast-export.c:650 builtin/tag.c:461

3405 msgid "mode"

3406 msgstr ""

3407

3407 -#: builtin/commit.c:1175 builtin/commit.c:1410

3408 +#: builtin/commit.c:1175 builtin/commit.c:1412

3409 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

3410 msgstr ""

3411

@@ -3442,194 +3443,194 @@ msgstr ""

3443 msgid " (root-commit)"

3444 msgstr ""

3445

3445 -#: builtin/commit.c:1368

3446 +#: builtin/commit.c:1370

3447 msgid "suppress summary after successful commit"

3448 msgstr ""

3449

3449 -#: builtin/commit.c:1369

3450 +#: builtin/commit.c:1371

3451 msgid "show diff in commit message template"

3452 msgstr ""

3453

3453 -#: builtin/commit.c:1371

3454 +#: builtin/commit.c:1373

3455 msgid "Commit message options"

3456 msgstr ""

3457

3457 -#: builtin/commit.c:1372 builtin/tag.c:459

3458 +#: builtin/commit.c:1374 builtin/tag.c:459

3459 msgid "read message from file"

3460 msgstr ""

3461

3461 -#: builtin/commit.c:1373

3462 +#: builtin/commit.c:1375

3463 msgid "author"

3464 msgstr ""

3465

3465 -#: builtin/commit.c:1373

3466 +#: builtin/commit.c:1375

3467 msgid "override author for commit"

3468 msgstr ""

3469

3469 -#: builtin/commit.c:1374 builtin/gc.c:178

3470 +#: builtin/commit.c:1376 builtin/gc.c:178

3471 msgid "date"

3472 msgstr ""

3473

3473 -#: builtin/commit.c:1374

3474 +#: builtin/commit.c:1376

3475 msgid "override date for commit"

3476 msgstr ""

3477

3477 -#: builtin/commit.c:1375 builtin/merge.c:206 builtin/notes.c:537

3478 +#: builtin/commit.c:1377 builtin/merge.c:206 builtin/notes.c:537

3479 #: builtin/notes.c:694 builtin/tag.c:457

3480 msgid "message"

3481 msgstr ""

3482

3482 -#: builtin/commit.c:1375

3483 +#: builtin/commit.c:1377

3484 msgid "commit message"

3485 msgstr ""

3486

3486 -#: builtin/commit.c:1376

3487 +#: builtin/commit.c:1378

3488 msgid "reuse and edit message from specified commit"

3489 msgstr ""

3490

3490 -#: builtin/commit.c:1377

3491 +#: builtin/commit.c:1379

3492 msgid "reuse message from specified commit"

3493 msgstr ""

3494

3494 -#: builtin/commit.c:1378

3495 +#: builtin/commit.c:1380

3496 msgid "use autosquash formatted message to fixup specified commit"

3497 msgstr ""

3498

3498 -#: builtin/commit.c:1379

3499 +#: builtin/commit.c:1381

3500 msgid "use autosquash formatted message to squash specified commit"

3501 msgstr ""

3502

3502 -#: builtin/commit.c:1380

3503 +#: builtin/commit.c:1382

3504 msgid "the commit is authored by me now (used with -C/-c/--amend)"

3505 msgstr ""

3506

3506 -#: builtin/commit.c:1381 builtin/log.c:1073 builtin/revert.c:109

3507 +#: builtin/commit.c:1383 builtin/log.c:1102 builtin/revert.c:109

3508 msgid "add Signed-off-by:"

3509 msgstr ""

3510

3510 -#: builtin/commit.c:1382

3511 +#: builtin/commit.c:1384

3512 msgid "use specified template file"

3513 msgstr ""

3514

3514 -#: builtin/commit.c:1383

3515 +#: builtin/commit.c:1385

3516 msgid "force edit of commit"

3517 msgstr ""

3518

3518 -#: builtin/commit.c:1384

3519 +#: builtin/commit.c:1386

3520 msgid "default"

3521 msgstr ""

3522

3522 -#: builtin/commit.c:1384 builtin/tag.c:462

3523 +#: builtin/commit.c:1386 builtin/tag.c:462

3524 msgid "how to strip spaces and #comments from message"

3525 msgstr ""

3526

3526 -#: builtin/commit.c:1385

3527 +#: builtin/commit.c:1387

3528 msgid "include status in commit message template"

3529 msgstr ""

3530

3530 -#: builtin/commit.c:1386 builtin/merge.c:213 builtin/tag.c:463

3531 +#: builtin/commit.c:1388 builtin/merge.c:213 builtin/tag.c:463

3532 msgid "key id"

3533 msgstr ""

3534

3534 -#: builtin/commit.c:1387 builtin/merge.c:214

3535 +#: builtin/commit.c:1389 builtin/merge.c:214

3536 msgid "GPG sign commit"

3537 msgstr ""

3538

3539 #. end commit message options

3539 -#: builtin/commit.c:1390

3540 +#: builtin/commit.c:1392

3541 msgid "Commit contents options"

3542 msgstr ""

3543

3543 -#: builtin/commit.c:1391

3544 +#: builtin/commit.c:1393

3545 msgid "commit all changed files"

3546 msgstr ""

3547

3547 -#: builtin/commit.c:1392

3548 +#: builtin/commit.c:1394

3549 msgid "add specified files to index for commit"

3550 msgstr ""

3551

3551 -#: builtin/commit.c:1393

3552 +#: builtin/commit.c:1395

3553 msgid "interactively add files"

3554 msgstr ""

3555

3555 -#: builtin/commit.c:1394

3556 +#: builtin/commit.c:1396

3557 msgid "interactively add changes"

3558 msgstr ""

3559

3559 -#: builtin/commit.c:1395

3560 +#: builtin/commit.c:1397

3561 msgid "commit only specified files"

3562 msgstr ""

3563

3563 -#: builtin/commit.c:1396

3564 +#: builtin/commit.c:1398

3565 msgid "bypass pre-commit hook"

3566 msgstr ""

3567

3567 -#: builtin/commit.c:1397

3568 +#: builtin/commit.c:1399

3569 msgid "show what would be committed"

3570 msgstr ""

3571

3571 -#: builtin/commit.c:1408

3572 +#: builtin/commit.c:1410

3573 msgid "amend previous commit"

3574 msgstr ""

3575

3575 -#: builtin/commit.c:1409

3576 +#: builtin/commit.c:1411

3577 msgid "bypass post-rewrite hook"

3578 msgstr ""

3579

3579 -#: builtin/commit.c:1414

3580 +#: builtin/commit.c:1416

3581 msgid "ok to record an empty change"

3582 msgstr ""

3583

3583 -#: builtin/commit.c:1417

3584 +#: builtin/commit.c:1419

3585 msgid "ok to record a change with an empty message"

3586 msgstr ""

3587

3587 -#: builtin/commit.c:1449

3588 +#: builtin/commit.c:1451

3589 msgid "could not parse HEAD commit"

3590 msgstr ""

3591

3591 -#: builtin/commit.c:1487 builtin/merge.c:508

3592 +#: builtin/commit.c:1489 builtin/merge.c:508

3593 #, c-format

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

3595 msgstr ""

3596

3596 -#: builtin/commit.c:1494

3597 +#: builtin/commit.c:1496

3598 #, c-format

3599 msgid "Corrupt MERGE_HEAD file (%s)"

3600 msgstr ""

3601

3601 -#: builtin/commit.c:1501

3602 +#: builtin/commit.c:1503

3603 msgid "could not read MERGE_MODE"

3604 msgstr ""

3605

3605 -#: builtin/commit.c:1520

3606 +#: builtin/commit.c:1522

3607 #, c-format

3608 msgid "could not read commit message: %s"

3609 msgstr ""

3610

3610 -#: builtin/commit.c:1534

3611 +#: builtin/commit.c:1536

3612 #, c-format

3613 msgid "Aborting commit; you did not edit the message.\n"

3614 msgstr ""

3615

3615 -#: builtin/commit.c:1539

3616 +#: builtin/commit.c:1541

3617 #, c-format

3618 msgid "Aborting commit due to empty commit message.\n"

3619 msgstr ""

3620

3620 -#: builtin/commit.c:1554 builtin/merge.c:832 builtin/merge.c:857

3621 +#: builtin/commit.c:1556 builtin/merge.c:833 builtin/merge.c:858

3622 msgid "failed to write commit object"

3623 msgstr ""

3624

3624 -#: builtin/commit.c:1575

3625 +#: builtin/commit.c:1577

3626 msgid "cannot lock HEAD ref"

3627 msgstr ""

3628

3628 -#: builtin/commit.c:1579

3629 +#: builtin/commit.c:1581

3630 msgid "cannot update HEAD ref"

3631 msgstr ""

3632

3632 -#: builtin/commit.c:1590

3633 +#: builtin/commit.c:1592

3634 msgid ""

3635 "Repository has been updated, but unable to write\n"

3636 "new_index file. Check that disk is not full or quota is\n"

@@ -3924,39 +3925,39 @@ msgstr ""

3925 msgid "git fast-export [rev-list-opts]"

3926 msgstr ""

3927

3927 -#: builtin/fast-export.c:635

3928 +#: builtin/fast-export.c:646

3929 msgid "show progress after <n> objects"

3930 msgstr ""

3931

3931 -#: builtin/fast-export.c:637

3932 +#: builtin/fast-export.c:648

3933 msgid "select handling of signed tags"

3934 msgstr ""

3935

3935 -#: builtin/fast-export.c:640

3936 +#: builtin/fast-export.c:651

3937 msgid "select handling of tags that tag filtered objects"

3938 msgstr ""

3939

3939 -#: builtin/fast-export.c:643

3940 +#: builtin/fast-export.c:654

3941 msgid "Dump marks to this file"

3942 msgstr ""

3943

3943 -#: builtin/fast-export.c:645

3944 +#: builtin/fast-export.c:656

3945 msgid "Import marks from this file"

3946 msgstr ""

3947

3947 -#: builtin/fast-export.c:647

3948 +#: builtin/fast-export.c:658

3949 msgid "Fake a tagger when tags lack one"

3950 msgstr ""

3951

3951 -#: builtin/fast-export.c:649

3952 +#: builtin/fast-export.c:660

3953 msgid "Output full tree for each commit"

3954 msgstr ""

3955

3955 -#: builtin/fast-export.c:651

3956 +#: builtin/fast-export.c:662

3957 msgid "Use the done feature to terminate the stream"

3958 msgstr ""

3959

3959 -#: builtin/fast-export.c:652

3960 +#: builtin/fast-export.c:663

3961 msgid "Skip output of blob data"

3962 msgstr ""

3963

@@ -4028,7 +4029,7 @@ msgstr ""

4029 msgid "deepen history of shallow clone"

4030 msgstr ""

4031

4031 -#: builtin/fetch.c:85 builtin/log.c:1088

4032 +#: builtin/fetch.c:85 builtin/log.c:1119

4033 msgid "dir"

4034 msgstr ""

4035

@@ -4195,29 +4196,29 @@ msgstr ""

4196 msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

4197 msgstr ""

4198

4198 -#: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:701

4199 +#: builtin/fmt-merge-msg.c:659 builtin/fmt-merge-msg.c:662 builtin/grep.c:701

4200 #: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175

4200 -#: builtin/tag.c:448 parse-options.h:133 parse-options.h:235

4201 +#: builtin/tag.c:448 parse-options.h:133 parse-options.h:239

4202 msgid "n"

4203 msgstr ""

4204

4204 -#: builtin/fmt-merge-msg.c:654

4205 +#: builtin/fmt-merge-msg.c:660

4206 msgid "populate log with at most <n> entries from shortlog"

4207 msgstr ""

4208

4208 -#: builtin/fmt-merge-msg.c:657

4209 +#: builtin/fmt-merge-msg.c:663

4210 msgid "alias for --log (deprecated)"

4211 msgstr ""

4212

4212 -#: builtin/fmt-merge-msg.c:660

4213 +#: builtin/fmt-merge-msg.c:666

4214 msgid "text"

4215 msgstr ""

4216

4216 -#: builtin/fmt-merge-msg.c:661

4217 +#: builtin/fmt-merge-msg.c:667

4218 msgid "use <text> as start of message"

4219 msgstr ""

4220

4220 -#: builtin/fmt-merge-msg.c:662

4221 +#: builtin/fmt-merge-msg.c:668

4222 msgid "file to read from"

4223 msgstr ""

4224

@@ -5129,244 +5130,252 @@ msgstr ""

5130 msgid "Cannot access work tree '%s'"

5131 msgstr ""

5132

5132 -#: builtin/log.c:37

5133 +#: builtin/log.c:39

5134 msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n"

5135 msgstr ""

5136

5136 -#: builtin/log.c:38

5137 +#: builtin/log.c:40

5138 msgid " or: git show [options] <object>..."

5139 msgstr ""

5140

5140 -#: builtin/log.c:100

5141 +#: builtin/log.c:102

5142 msgid "suppress diff output"

5143 msgstr ""

5144

5144 -#: builtin/log.c:101

5145 +#: builtin/log.c:103

5146 msgid "show source"

5147 msgstr ""

5148

5148 -#: builtin/log.c:102

5149 +#: builtin/log.c:104

5150 +msgid "Use mail map file"

5151 +msgstr ""

5152 +

5153 +#: builtin/log.c:105

5154 msgid "decorate options"

5155 msgstr ""

5156

5152 -#: builtin/log.c:189

5157 +#: builtin/log.c:198

5158 #, c-format

5159 msgid "Final output: %d %s\n"

5160 msgstr ""

5161

5157 -#: builtin/log.c:405 builtin/log.c:497

5162 +#: builtin/log.c:419 builtin/log.c:511

5163 #, c-format

5164 msgid "Could not read object %s"

5165 msgstr ""

5166

5162 -#: builtin/log.c:521

5167 +#: builtin/log.c:535

5168 #, c-format

5169 msgid "Unknown type: %d"

5170 msgstr ""

5171

5167 -#: builtin/log.c:613

5172 +#: builtin/log.c:627

5173 msgid "format.headers without value"

5174 msgstr ""

5175

5171 -#: builtin/log.c:687

5176 +#: builtin/log.c:701

5177 msgid "name of output directory is too long"

5178 msgstr ""

5179

5175 -#: builtin/log.c:698

5180 +#: builtin/log.c:717

5181 #, c-format

5182 msgid "Cannot open patch file %s"

5183 msgstr ""

5184

5180 -#: builtin/log.c:712

5185 +#: builtin/log.c:731

5186 msgid "Need exactly one range."

5187 msgstr ""

5188

5184 -#: builtin/log.c:720

5189 +#: builtin/log.c:739

5190 msgid "Not a range."

5191 msgstr ""

5192

5188 -#: builtin/log.c:794

5193 +#: builtin/log.c:812

5194 msgid "Cover letter needs email format"

5195 msgstr ""

5196

5192 -#: builtin/log.c:867

5197 +#: builtin/log.c:885

5198 #, c-format

5199 msgid "insane in-reply-to: %s"

5200 msgstr ""

5201

5197 -#: builtin/log.c:895

5202 +#: builtin/log.c:913

5203 msgid "git format-patch [options] [<since> | <revision range>]"

5204 msgstr ""

5205

5201 -#: builtin/log.c:940

5206 +#: builtin/log.c:958

5207 msgid "Two output directories?"

5208 msgstr ""

5209

5205 -#: builtin/log.c:1068

5210 +#: builtin/log.c:1097

5211 msgid "use [PATCH n/m] even with a single patch"

5212 msgstr ""

5213

5209 -#: builtin/log.c:1071

5214 +#: builtin/log.c:1100

5215 msgid "use [PATCH] even with multiple patches"

5216 msgstr ""

5217

5213 -#: builtin/log.c:1075

5218 +#: builtin/log.c:1104

5219 msgid "print patches to standard out"

5220 msgstr ""

5221

5217 -#: builtin/log.c:1077

5222 +#: builtin/log.c:1106

5223 msgid "generate a cover letter"

5224 msgstr ""

5225

5221 -#: builtin/log.c:1079

5226 +#: builtin/log.c:1108

5227 msgid "use simple number sequence for output file names"

5228 msgstr ""

5229

5225 -#: builtin/log.c:1080

5230 +#: builtin/log.c:1109

5231 msgid "sfx"

5232 msgstr ""

5233

5229 -#: builtin/log.c:1081

5234 +#: builtin/log.c:1110

5235 msgid "use <sfx> instead of '.patch'"

5236 msgstr ""

5237

5233 -#: builtin/log.c:1083

5238 +#: builtin/log.c:1112

5239 msgid "start numbering patches at <n> instead of 1"

5240 msgstr ""

5241

5237 -#: builtin/log.c:1085

5242 +#: builtin/log.c:1114

5243 +msgid "mark the series as Nth re-roll"

5244 +msgstr ""

5245 +

5246 +#: builtin/log.c:1116

5247 msgid "Use [<prefix>] instead of [PATCH]"

5248 msgstr ""

5249

5241 -#: builtin/log.c:1088

5250 +#: builtin/log.c:1119

5251 msgid "store resulting files in <dir>"

5252 msgstr ""

5253

5245 -#: builtin/log.c:1091

5254 +#: builtin/log.c:1122

5255 msgid "don't strip/add [PATCH]"

5256 msgstr ""

5257

5249 -#: builtin/log.c:1094

5258 +#: builtin/log.c:1125

5259 msgid "don't output binary diffs"

5260 msgstr ""

5261

5253 -#: builtin/log.c:1096

5262 +#: builtin/log.c:1127

5263 msgid "don't include a patch matching a commit upstream"

5264 msgstr ""

5265

5257 -#: builtin/log.c:1098

5266 +#: builtin/log.c:1129

5267 msgid "show patch format instead of default (patch + stat)"

5268 msgstr ""

5269

5261 -#: builtin/log.c:1100

5270 +#: builtin/log.c:1131

5271 msgid "Messaging"

5272 msgstr ""

5273

5265 -#: builtin/log.c:1101

5274 +#: builtin/log.c:1132

5275 msgid "header"

5276 msgstr ""

5277

5269 -#: builtin/log.c:1102

5278 +#: builtin/log.c:1133

5279 msgid "add email header"

5280 msgstr ""

5281

5273 -#: builtin/log.c:1103 builtin/log.c:1105

5282 +#: builtin/log.c:1134 builtin/log.c:1136

5283 msgid "email"

5284 msgstr ""

5285

5277 -#: builtin/log.c:1103

5286 +#: builtin/log.c:1134

5287 msgid "add To: header"

5288 msgstr ""

5289

5281 -#: builtin/log.c:1105

5290 +#: builtin/log.c:1136

5291 msgid "add Cc: header"

5292 msgstr ""

5293

5285 -#: builtin/log.c:1107

5294 +#: builtin/log.c:1138

5295 msgid "message-id"

5296 msgstr ""

5297

5289 -#: builtin/log.c:1108

5298 +#: builtin/log.c:1139

5299 msgid "make first mail a reply to <message-id>"

5300 msgstr ""

5301

5293 -#: builtin/log.c:1109 builtin/log.c:1112

5302 +#: builtin/log.c:1140 builtin/log.c:1143

5303 msgid "boundary"

5304 msgstr ""

5305

5297 -#: builtin/log.c:1110

5306 +#: builtin/log.c:1141

5307 msgid "attach the patch"

5308 msgstr ""

5309

5301 -#: builtin/log.c:1113

5310 +#: builtin/log.c:1144

5311 msgid "inline the patch"

5312 msgstr ""

5313

5305 -#: builtin/log.c:1117

5314 +#: builtin/log.c:1148

5315 msgid "enable message threading, styles: shallow, deep"

5316 msgstr ""

5317

5309 -#: builtin/log.c:1119

5318 +#: builtin/log.c:1150

5319 msgid "signature"

5320 msgstr ""

5321

5313 -#: builtin/log.c:1120

5322 +#: builtin/log.c:1151

5323 msgid "add a signature"

5324 msgstr ""

5325

5317 -#: builtin/log.c:1122

5326 +#: builtin/log.c:1153

5327 msgid "don't print the patch filenames"

5328 msgstr ""

5329

5321 -#: builtin/log.c:1163

5330 +#: builtin/log.c:1202

5331 #, c-format

5332 msgid "bogus committer info %s"

5333 msgstr ""

5334

5326 -#: builtin/log.c:1208

5335 +#: builtin/log.c:1247

5336 msgid "-n and -k are mutually exclusive."

5337 msgstr ""

5338

5330 -#: builtin/log.c:1210

5339 +#: builtin/log.c:1249

5340 msgid "--subject-prefix and -k are mutually exclusive."

5341 msgstr ""

5342

5334 -#: builtin/log.c:1218

5343 +#: builtin/log.c:1257

5344 msgid "--name-only does not make sense"

5345 msgstr ""

5346

5338 -#: builtin/log.c:1220

5347 +#: builtin/log.c:1259

5348 msgid "--name-status does not make sense"

5349 msgstr ""

5350

5342 -#: builtin/log.c:1222

5351 +#: builtin/log.c:1261

5352 msgid "--check does not make sense"

5353 msgstr ""

5354

5346 -#: builtin/log.c:1245

5355 +#: builtin/log.c:1284

5356 msgid "standard output, or directory, which one?"

5357 msgstr ""

5358

5350 -#: builtin/log.c:1247

5359 +#: builtin/log.c:1286

5360 #, c-format

5361 msgid "Could not create directory '%s'"

5362 msgstr ""

5363

5355 -#: builtin/log.c:1400

5364 +#: builtin/log.c:1439

5365 msgid "Failed to create output files"

5366 msgstr ""

5367

5359 -#: builtin/log.c:1449

5368 +#: builtin/log.c:1488

5369 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"

5370 msgstr ""

5371

5363 -#: builtin/log.c:1504

5372 +#: builtin/log.c:1543

5373 #, c-format

5374 msgid ""

5375 "Could not find a tracked remote branch, please specify <upstream> manually.\n"

5376 msgstr ""

5377

5369 -#: builtin/log.c:1517 builtin/log.c:1519 builtin/log.c:1531

5378 +#: builtin/log.c:1556 builtin/log.c:1558 builtin/log.c:1570

5379 #, c-format

5380 msgid "Unknown commit %s"

5381 msgstr ""

@@ -5676,140 +5685,140 @@ msgid ""

5685 "the commit.\n"

5686 msgstr ""

5687

5679 -#: builtin/merge.c:812

5688 +#: builtin/merge.c:813

5689 msgid "Empty commit message."

5690 msgstr ""

5691

5683 -#: builtin/merge.c:824

5692 +#: builtin/merge.c:825

5693 #, c-format

5694 msgid "Wonderful.\n"

5695 msgstr ""

5696

5688 -#: builtin/merge.c:889

5697 +#: builtin/merge.c:890

5698 #, c-format

5699 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"

5700 msgstr ""

5701

5693 -#: builtin/merge.c:905

5702 +#: builtin/merge.c:906

5703 #, c-format

5704 msgid "'%s' is not a commit"

5705 msgstr ""

5706

5698 -#: builtin/merge.c:946

5707 +#: builtin/merge.c:947

5708 msgid "No current branch."

5709 msgstr ""

5710

5702 -#: builtin/merge.c:948

5711 +#: builtin/merge.c:949

5712 msgid "No remote for the current branch."

5713 msgstr ""

5714

5706 -#: builtin/merge.c:950

5715 +#: builtin/merge.c:951

5716 msgid "No default upstream defined for the current branch."

5717 msgstr ""

5718

5710 -#: builtin/merge.c:955

5719 +#: builtin/merge.c:956

5720 #, c-format

5721 msgid "No remote tracking branch for %s from %s"

5722 msgstr ""

5723

5715 -#: builtin/merge.c:1042 builtin/merge.c:1199

5724 +#: builtin/merge.c:1043 builtin/merge.c:1200

5725 #, c-format

5726 msgid "%s - not something we can merge"

5727 msgstr ""

5728

5720 -#: builtin/merge.c:1110

5729 +#: builtin/merge.c:1111

5730 msgid "There is no merge to abort (MERGE_HEAD missing)."

5731 msgstr ""

5732

5724 -#: builtin/merge.c:1126 git-pull.sh:31

5733 +#: builtin/merge.c:1127 git-pull.sh:31

5734 msgid ""

5735 "You have not concluded your merge (MERGE_HEAD exists).\n"

5736 "Please, commit your changes before you can merge."

5737 msgstr ""

5738

5730 -#: builtin/merge.c:1129 git-pull.sh:34

5739 +#: builtin/merge.c:1130 git-pull.sh:34

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

5741 msgstr ""

5742

5734 -#: builtin/merge.c:1133

5743 +#: builtin/merge.c:1134

5744 msgid ""

5745 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"

5746 "Please, commit your changes before you can merge."

5747 msgstr ""

5748

5740 -#: builtin/merge.c:1136

5749 +#: builtin/merge.c:1137

5750 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."

5751 msgstr ""

5752

5744 -#: builtin/merge.c:1145

5753 +#: builtin/merge.c:1146

5754 msgid "You cannot combine --squash with --no-ff."

5755 msgstr ""

5756

5748 -#: builtin/merge.c:1150

5757 +#: builtin/merge.c:1151

5758 msgid "You cannot combine --no-ff with --ff-only."

5759 msgstr ""

5760

5752 -#: builtin/merge.c:1157

5761 +#: builtin/merge.c:1158

5762 msgid "No commit specified and merge.defaultToUpstream not set."

5763 msgstr ""

5764

5756 -#: builtin/merge.c:1189

5765 +#: builtin/merge.c:1190

5766 msgid "Can merge only exactly one commit into empty head"

5767 msgstr ""

5768

5760 -#: builtin/merge.c:1192

5769 +#: builtin/merge.c:1193

5770 msgid "Squash commit into empty head not supported yet"

5771 msgstr ""

5772

5764 -#: builtin/merge.c:1194

5773 +#: builtin/merge.c:1195

5774 msgid "Non-fast-forward commit does not make sense into an empty head"

5775 msgstr ""

5776

5768 -#: builtin/merge.c:1309

5777 +#: builtin/merge.c:1311

5778 #, c-format

5779 msgid "Updating %s..%s\n"

5780 msgstr ""

5781

5773 -#: builtin/merge.c:1348

5782 +#: builtin/merge.c:1350

5783 #, c-format

5784 msgid "Trying really trivial in-index merge...\n"

5785 msgstr ""

5786

5778 -#: builtin/merge.c:1355

5787 +#: builtin/merge.c:1357

5788 #, c-format

5789 msgid "Nope.\n"

5790 msgstr ""

5791

5783 -#: builtin/merge.c:1387

5792 +#: builtin/merge.c:1389

5793 msgid "Not possible to fast-forward, aborting."

5794 msgstr ""

5795

5787 -#: builtin/merge.c:1410 builtin/merge.c:1489

5796 +#: builtin/merge.c:1412 builtin/merge.c:1491

5797 #, c-format

5798 msgid "Rewinding the tree to pristine...\n"

5799 msgstr ""

5800

5792 -#: builtin/merge.c:1414

5801 +#: builtin/merge.c:1416

5802 #, c-format

5803 msgid "Trying merge strategy %s...\n"

5804 msgstr ""

5805

5797 -#: builtin/merge.c:1480

5806 +#: builtin/merge.c:1482

5807 #, c-format

5808 msgid "No merge strategy handled the merge.\n"

5809 msgstr ""

5810

5802 -#: builtin/merge.c:1482

5811 +#: builtin/merge.c:1484

5812 #, c-format

5813 msgid "Merge with strategy %s failed.\n"

5814 msgstr ""

5815

5807 -#: builtin/merge.c:1491

5816 +#: builtin/merge.c:1493

5817 #, c-format

5818 msgid "Using the %s to prepare resolving by hand.\n"

5819 msgstr ""

5820

5812 -#: builtin/merge.c:1503

5821 +#: builtin/merge.c:1505

5822 #, c-format

5823 msgid "Automatic merge went well; stopped before committing as requested\n"

5824 msgstr ""

@@ -6170,7 +6179,7 @@ msgstr ""

6179 #: builtin/notes.c:275 builtin/notes.c:448 builtin/notes.c:450

6180 #: builtin/notes.c:510 builtin/notes.c:564 builtin/notes.c:647

6181 #: builtin/notes.c:652 builtin/notes.c:727 builtin/notes.c:769

6173 -#: builtin/notes.c:971 builtin/reset.c:293 builtin/tag.c:558

6182 +#: builtin/notes.c:971 builtin/tag.c:558

6183 #, c-format

6184 msgid "Failed to resolve '%s' as a valid ref."

6185 msgstr ""

@@ -6643,22 +6652,28 @@ msgid ""

6652 "See the 'Note about fast-forwards' in 'git push --help' for details."

6653 msgstr ""

6654

6646 -#: builtin/push.c:258

6655 +#: builtin/push.c:224

6656 +msgid ""

6657 +"Updates were rejected because the destination reference already exists\n"

6658 +"in the remote."

6659 +msgstr ""

6660 +

6661 +#: builtin/push.c:269

6662 #, c-format

6663 msgid "Pushing to %s\n"

6664 msgstr ""

6665

6651 -#: builtin/push.c:262

6666 +#: builtin/push.c:273

6667 #, c-format

6668 msgid "failed to push some refs to '%s'"

6669 msgstr ""

6670

6656 -#: builtin/push.c:294

6671 +#: builtin/push.c:302

6672 #, c-format

6673 msgid "bad repository '%s'"

6674 msgstr ""

6675

6661 -#: builtin/push.c:295

6676 +#: builtin/push.c:303

6677 msgid ""

6678 "No configured push destination.\n"

6679 "Either specify the URL from the command-line or configure a remote "

@@ -6671,79 +6686,79 @@ msgid ""

6686 " git push <name>\n"

6687 msgstr ""

6688

6674 -#: builtin/push.c:310

6689 +#: builtin/push.c:318

6690 msgid "--all and --tags are incompatible"

6691 msgstr ""

6692

6678 -#: builtin/push.c:311

6693 +#: builtin/push.c:319

6694 msgid "--all can't be combined with refspecs"

6695 msgstr ""

6696

6682 -#: builtin/push.c:316

6697 +#: builtin/push.c:324

6698 msgid "--mirror and --tags are incompatible"

6699 msgstr ""

6700

6686 -#: builtin/push.c:317

6701 +#: builtin/push.c:325

6702 msgid "--mirror can't be combined with refspecs"

6703 msgstr ""

6704

6690 -#: builtin/push.c:322

6705 +#: builtin/push.c:330

6706 msgid "--all and --mirror are incompatible"

6707 msgstr ""

6708

6694 -#: builtin/push.c:382

6709 +#: builtin/push.c:390

6710 msgid "repository"

6711 msgstr ""

6712

6698 -#: builtin/push.c:383

6713 +#: builtin/push.c:391

6714 msgid "push all refs"

6715 msgstr ""

6716

6702 -#: builtin/push.c:384

6717 +#: builtin/push.c:392

6718 msgid "mirror all refs"

6719 msgstr ""

6720

6706 -#: builtin/push.c:386

6721 +#: builtin/push.c:394

6722 msgid "delete refs"

6723 msgstr ""

6724

6710 -#: builtin/push.c:387

6725 +#: builtin/push.c:395

6726 msgid "push tags (can't be used with --all or --mirror)"

6727 msgstr ""

6728

6714 -#: builtin/push.c:390

6729 +#: builtin/push.c:398

6730 msgid "force updates"

6731 msgstr ""

6732

6718 -#: builtin/push.c:391

6733 +#: builtin/push.c:399

6734 msgid "check"

6735 msgstr ""

6736

6722 -#: builtin/push.c:392

6737 +#: builtin/push.c:400

6738 msgid "control recursive pushing of submodules"

6739 msgstr ""

6740

6726 -#: builtin/push.c:394

6741 +#: builtin/push.c:402

6742 msgid "use thin pack"

6743 msgstr ""

6744

6730 -#: builtin/push.c:395 builtin/push.c:396

6745 +#: builtin/push.c:403 builtin/push.c:404

6746 msgid "receive pack program"

6747 msgstr ""

6748

6734 -#: builtin/push.c:397

6749 +#: builtin/push.c:405

6750 msgid "set upstream for git pull/status"

6751 msgstr ""

6752

6738 -#: builtin/push.c:400

6753 +#: builtin/push.c:408

6754 msgid "prune locally removed refs"

6755 msgstr ""

6756

6742 -#: builtin/push.c:410

6757 +#: builtin/push.c:418

6758 msgid "--delete is incompatible with --all, --mirror and --tags"

6759 msgstr ""

6760

6746 -#: builtin/push.c:412

6761 +#: builtin/push.c:420

6762 msgid "--delete doesn't make sense without any refs"

6763 msgstr ""

6764

@@ -7338,11 +7353,11 @@ msgid ""

7353 msgstr ""

7354

7355 #: builtin/reset.c:26

7341 -msgid "git reset [-q] <commit> [--] <paths>..."

7356 +msgid "git reset [-q] <tree-ish> [--] <paths>..."

7357 msgstr ""

7358

7359 #: builtin/reset.c:27

7345 -msgid "git reset --patch [<commit>] [--] [<paths>...]"

7360 +msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"

7361 msgstr ""

7362

7363 #: builtin/reset.c:33

@@ -7365,89 +7380,95 @@ msgstr ""

7380 msgid "keep"

7381 msgstr ""

7382

7368 -#: builtin/reset.c:77

7383 +#: builtin/reset.c:73

7384 msgid "You do not have a valid HEAD."

7385 msgstr ""

7386

7372 -#: builtin/reset.c:79

7387 +#: builtin/reset.c:75

7388 msgid "Failed to find tree of HEAD."

7389 msgstr ""

7390

7376 -#: builtin/reset.c:85

7391 +#: builtin/reset.c:81

7392 #, c-format

7393 msgid "Failed to find tree of %s."

7394 msgstr ""

7395

7381 -#: builtin/reset.c:96

7382 -msgid "Could not write new index file."

7383 -msgstr ""

7384 -

7385 -#: builtin/reset.c:106

7396 +#: builtin/reset.c:98

7397 #, c-format

7398 msgid "HEAD is now at %s"

7399 msgstr ""

7400

7390 -#: builtin/reset.c:130

7391 -msgid "Could not read index"

7392 -msgstr ""

7393 -

7394 -#: builtin/reset.c:133

7395 -msgid "Unstaged changes after reset:"

7396 -msgstr ""

7397 -

7398 -#: builtin/reset.c:223

7401 +#: builtin/reset.c:169

7402 #, c-format

7403 msgid "Cannot do a %s reset in the middle of a merge."

7404 msgstr ""

7405

7403 -#: builtin/reset.c:238

7406 +#: builtin/reset.c:248

7407 msgid "be quiet, only report errors"

7408 msgstr ""

7409

7407 -#: builtin/reset.c:240

7410 +#: builtin/reset.c:250

7411 msgid "reset HEAD and index"

7412 msgstr ""

7413

7411 -#: builtin/reset.c:241

7414 +#: builtin/reset.c:251

7415 msgid "reset only HEAD"

7416 msgstr ""

7417

7415 -#: builtin/reset.c:243 builtin/reset.c:245

7418 +#: builtin/reset.c:253 builtin/reset.c:255

7419 msgid "reset HEAD, index and working tree"

7420 msgstr ""

7421

7419 -#: builtin/reset.c:247

7422 +#: builtin/reset.c:257

7423 msgid "reset HEAD but keep local changes"

7424 msgstr ""

7425

7423 -#: builtin/reset.c:303

7426 +#: builtin/reset.c:275

7427 +#, c-format

7428 +msgid "Failed to resolve '%s' as a valid revision."

7429 +msgstr ""

7430 +

7431 +#: builtin/reset.c:278 builtin/reset.c:286

7432 #, c-format

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

7434 msgstr ""

7435

7428 -#: builtin/reset.c:308

7436 +#: builtin/reset.c:283

7437 +#, c-format

7438 +msgid "Failed to resolve '%s' as a valid tree."

7439 +msgstr ""

7440 +

7441 +#: builtin/reset.c:292

7442 msgid "--patch is incompatible with --{hard,mixed,soft}"

7443 msgstr ""

7444

7432 -#: builtin/reset.c:317

7445 +#: builtin/reset.c:301

7446 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."

7447 msgstr ""

7448

7436 -#: builtin/reset.c:319

7449 +#: builtin/reset.c:303

7450 #, c-format

7451 msgid "Cannot do %s reset with paths."

7452 msgstr ""

7453

7441 -#: builtin/reset.c:331

7454 +#: builtin/reset.c:313

7455 #, c-format

7456 msgid "%s reset is not allowed in a bare repository"

7457 msgstr ""

7458

7446 -#: builtin/reset.c:347

7459 +#: builtin/reset.c:333

7460 #, c-format

7461 msgid "Could not reset index file to revision '%s'."

7462 msgstr ""

7463

7464 +#: builtin/reset.c:339

7465 +msgid "Unstaged changes after reset:"

7466 +msgstr ""

7467 +

7468 +#: builtin/reset.c:344

7469 +msgid "Could not write new index file."

7470 +msgstr ""

7471 +

7472 #: builtin/rev-parse.c:339

7473 msgid "git rev-parse --parseopt [options] -- [<args>...]"

7474 msgstr ""

@@ -7624,28 +7645,28 @@ msgstr ""

7645 msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"

7646 msgstr ""

7647

7627 -#: builtin/shortlog.c:157

7648 +#: builtin/shortlog.c:133

7649 #, c-format

7650 msgid "Missing author: %s"

7651 msgstr ""

7652

7632 -#: builtin/shortlog.c:253

7653 +#: builtin/shortlog.c:229

7654 msgid "sort output according to the number of commits per author"

7655 msgstr ""

7656

7636 -#: builtin/shortlog.c:255

7657 +#: builtin/shortlog.c:231

7658 msgid "Suppress commit descriptions, only provides commit count"

7659 msgstr ""

7660

7640 -#: builtin/shortlog.c:257

7661 +#: builtin/shortlog.c:233

7662 msgid "Show the email address of each author"

7663 msgstr ""

7664

7644 -#: builtin/shortlog.c:258

7665 +#: builtin/shortlog.c:234

7666 msgid "w[,i1[,i2]]"

7667 msgstr ""

7668

7648 -#: builtin/shortlog.c:259

7669 +#: builtin/shortlog.c:235

7670 msgid "Linewrap output"

7671 msgstr ""

7672

@@ -8177,15 +8198,15 @@ msgstr ""

8198 msgid "no-op (backward compatibility)"

8199 msgstr ""

8200

8180 -#: parse-options.h:228

8201 +#: parse-options.h:232

8202 msgid "be more verbose"

8203 msgstr ""

8204

8184 -#: parse-options.h:230

8205 +#: parse-options.h:234

8206 msgid "be more quiet"

8207 msgstr ""

8208

8188 -#: parse-options.h:236

8209 +#: parse-options.h:240

8210 msgid "use <n> digits to display SHA-1s"

8211 msgstr ""

8212

@@ -8835,37 +8856,37 @@ msgstr ""

8856 msgid "(To restore them type \"git stash apply\")"

8857 msgstr ""

8858

8838 -#: git-submodule.sh:89

8859 +#: git-submodule.sh:90

8860 #, sh-format

8861 msgid "cannot strip one component off url '$remoteurl'"

8862 msgstr ""

8863

8843 -#: git-submodule.sh:168

8864 +#: git-submodule.sh:195

8865 #, sh-format

8866 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"

8867 msgstr ""

8868

8848 -#: git-submodule.sh:211

8869 +#: git-submodule.sh:238

8870 #, sh-format

8871 msgid "Clone of '$url' into submodule path '$sm_path' failed"

8872 msgstr ""

8873

8853 -#: git-submodule.sh:223

8874 +#: git-submodule.sh:250

8875 #, sh-format

8876 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"

8877 msgstr ""

8878

8858 -#: git-submodule.sh:316

8879 +#: git-submodule.sh:343

8880 #, sh-format

8881 msgid "repo URL: '$repo' must be absolute or begin with ./|../"

8882 msgstr ""

8883

8863 -#: git-submodule.sh:333

8884 +#: git-submodule.sh:360

8885 #, sh-format

8886 msgid "'$sm_path' already exists in the index"

8887 msgstr ""

8888

8868 -#: git-submodule.sh:337

8889 +#: git-submodule.sh:364

8890 #, sh-format

8891 msgid ""

8892 "The following path is ignored by one of your .gitignore files:\n"

@@ -8873,180 +8894,180 @@ msgid ""

8894 "Use -f if you really want to add it."

8895 msgstr ""

8896

8876 -#: git-submodule.sh:355

8897 +#: git-submodule.sh:382

8898 #, sh-format

8899 msgid "Adding existing repo at '$sm_path' to the index"

8900 msgstr ""

8901

8881 -#: git-submodule.sh:357

8902 +#: git-submodule.sh:384

8903 #, sh-format

8904 msgid "'$sm_path' already exists and is not a valid git repo"

8905 msgstr ""

8906

8886 -#: git-submodule.sh:365

8907 +#: git-submodule.sh:392

8908 #, sh-format

8909 msgid "A git directory for '$sm_name' is found locally with remote(s):"

8910 msgstr ""

8911

8891 -#: git-submodule.sh:367

8912 +#: git-submodule.sh:394

8913 #, sh-format

8914 msgid ""

8915 "If you want to reuse this local git directory instead of cloning again from"

8916 msgstr ""

8917

8897 -#: git-submodule.sh:369

8918 +#: git-submodule.sh:396

8919 #, sh-format

8920 msgid ""

8921 "use the '--force' option. If the local git directory is not the correct repo"

8922 msgstr ""

8923

8903 -#: git-submodule.sh:370

8924 +#: git-submodule.sh:397

8925 #, sh-format

8926 msgid ""

8927 "or you are unsure what this means choose another name with the '--name' "

8928 "option."

8929 msgstr ""

8930

8910 -#: git-submodule.sh:372

8931 +#: git-submodule.sh:399

8932 #, sh-format

8933 msgid "Reactivating local git directory for submodule '$sm_name'."

8934 msgstr ""

8935

8915 -#: git-submodule.sh:384

8936 +#: git-submodule.sh:411

8937 #, sh-format

8938 msgid "Unable to checkout submodule '$sm_path'"

8939 msgstr ""

8940

8920 -#: git-submodule.sh:389

8941 +#: git-submodule.sh:416

8942 #, sh-format

8943 msgid "Failed to add submodule '$sm_path'"

8944 msgstr ""

8945

8925 -#: git-submodule.sh:394

8946 +#: git-submodule.sh:425

8947 #, sh-format

8948 msgid "Failed to register submodule '$sm_path'"

8949 msgstr ""

8950

8930 -#: git-submodule.sh:437

8951 +#: git-submodule.sh:468

8952 #, sh-format

8953 msgid "Entering '$prefix$sm_path'"

8954 msgstr ""

8955

8935 -#: git-submodule.sh:451

8956 +#: git-submodule.sh:482

8957 #, sh-format

8958 msgid "Stopping at '$sm_path'; script returned non-zero status."

8959 msgstr ""

8960

8940 -#: git-submodule.sh:495

8961 +#: git-submodule.sh:526

8962 #, sh-format

8963 msgid "No url found for submodule path '$sm_path' in .gitmodules"

8964 msgstr ""

8965

8945 -#: git-submodule.sh:504

8966 +#: git-submodule.sh:535

8967 #, sh-format

8968 msgid "Failed to register url for submodule path '$sm_path'"

8969 msgstr ""

8970

8950 -#: git-submodule.sh:506

8971 +#: git-submodule.sh:537

8972 #, sh-format

8973 msgid "Submodule '$name' ($url) registered for path '$sm_path'"

8974 msgstr ""

8975

8955 -#: git-submodule.sh:514

8976 +#: git-submodule.sh:545

8977 #, sh-format

8978 msgid "Failed to register update mode for submodule path '$sm_path'"

8979 msgstr ""

8980

8960 -#: git-submodule.sh:614

8981 +#: git-submodule.sh:649

8982 #, sh-format

8983 msgid ""

8984 "Submodule path '$sm_path' not initialized\n"

8985 "Maybe you want to use 'update --init'?"

8986 msgstr ""

8987

8967 -#: git-submodule.sh:627

8988 +#: git-submodule.sh:662

8989 #, sh-format

8990 msgid "Unable to find current revision in submodule path '$sm_path'"

8991 msgstr ""

8992

8972 -#: git-submodule.sh:646

8993 +#: git-submodule.sh:671 git-submodule.sh:695

8994 #, sh-format

8995 msgid "Unable to fetch in submodule path '$sm_path'"

8996 msgstr ""

8997

8977 -#: git-submodule.sh:660

8998 +#: git-submodule.sh:709

8999 #, sh-format

9000 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"

9001 msgstr ""

9002

8982 -#: git-submodule.sh:661

9003 +#: git-submodule.sh:710

9004 #, sh-format

9005 msgid "Submodule path '$sm_path': rebased into '$sha1'"

9006 msgstr ""

9007

8987 -#: git-submodule.sh:666

9008 +#: git-submodule.sh:715

9009 #, sh-format

9010 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"

9011 msgstr ""

9012

8992 -#: git-submodule.sh:667

9013 +#: git-submodule.sh:716

9014 #, sh-format

9015 msgid "Submodule path '$sm_path': merged in '$sha1'"

9016 msgstr ""

9017

8997 -#: git-submodule.sh:672

9018 +#: git-submodule.sh:721

9019 #, sh-format

9020 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"

9021 msgstr ""

9022

9002 -#: git-submodule.sh:673

9023 +#: git-submodule.sh:722

9024 #, sh-format

9025 msgid "Submodule path '$sm_path': checked out '$sha1'"

9026 msgstr ""

9027

9007 -#: git-submodule.sh:695 git-submodule.sh:1017

9028 +#: git-submodule.sh:744 git-submodule.sh:1066

9029 #, sh-format

9030 msgid "Failed to recurse into submodule path '$sm_path'"

9031 msgstr ""

9032

9012 -#: git-submodule.sh:803

9033 +#: git-submodule.sh:852

9034 msgid "The --cached option cannot be used with the --files option"

9035 msgstr ""

9036

9037 #. unexpected type

9017 -#: git-submodule.sh:843

9038 +#: git-submodule.sh:892

9039 #, sh-format

9040 msgid "unexpected mode $mod_dst"

9041 msgstr ""

9042

9022 -#: git-submodule.sh:861

9043 +#: git-submodule.sh:910

9044 #, sh-format

9045 msgid " Warn: $name doesn't contain commit $sha1_src"

9046 msgstr ""

9047

9027 -#: git-submodule.sh:864

9048 +#: git-submodule.sh:913

9049 #, sh-format

9050 msgid " Warn: $name doesn't contain commit $sha1_dst"

9051 msgstr ""

9052

9032 -#: git-submodule.sh:867

9053 +#: git-submodule.sh:916

9054 #, sh-format

9055 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"

9056 msgstr ""

9057

9037 -#: git-submodule.sh:892

9058 +#: git-submodule.sh:941

9059 msgid "blob"

9060 msgstr ""

9061

9041 -#: git-submodule.sh:930

9062 +#: git-submodule.sh:979

9063 msgid "# Submodules changed but not updated:"

9064 msgstr ""

9065

9045 -#: git-submodule.sh:932

9066 +#: git-submodule.sh:981

9067 msgid "# Submodule changes to be committed:"

9068 msgstr ""

9069

9049 -#: git-submodule.sh:1080

9070 +#: git-submodule.sh:1129

9071 #, sh-format

9072 msgid "Synchronizing submodule url for '$prefix$sm_path'"

9073 msgstr ""

l10n: Update git.pot (11 new, 7 removed messages)