727b9576eb · 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: 2013-08-06 14:10+0800\n"

11 +"POT-Creation-Date: 2013-11-02 08:06+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"

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

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

53 msgstr ""

54

55 -#: archive.c:323

55 +#: archive.c:242 builtin/add.c:240 builtin/add.c:556 builtin/rm.c:328

56 +#, c-format

57 +msgid "pathspec '%s' did not match any files"

58 +msgstr ""

59 +

60 +#: archive.c:327

61 msgid "fmt"

62 msgstr ""

63

59 -#: archive.c:323

64 +#: archive.c:327

65 msgid "archive format"

66 msgstr ""

67

63 -#: archive.c:324 builtin/log.c:1173

68 +#: archive.c:328 builtin/log.c:1193

69 msgid "prefix"

70 msgstr ""

71

67 -#: archive.c:325

72 +#: archive.c:329

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

74 msgstr ""

75

71 -#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2292

72 -#: builtin/blame.c:2293 builtin/config.c:56 builtin/fast-export.c:673

73 -#: builtin/fast-export.c:675 builtin/grep.c:714 builtin/hash-object.c:77

74 -#: builtin/ls-files.c:496 builtin/ls-files.c:499 builtin/notes.c:408

75 -#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:152

76 +#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2264

77 +#: builtin/blame.c:2265 builtin/config.c:58 builtin/fast-export.c:680

78 +#: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77

79 +#: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408

80 +#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154

81 msgid "file"

82 msgstr ""

83

79 -#: archive.c:327 builtin/archive.c:89

84 +#: archive.c:331 builtin/archive.c:89

85 msgid "write the archive to this file"

86 msgstr ""

87

83 -#: archive.c:329

88 +#: archive.c:333

89 msgid "read .gitattributes in working directory"

90 msgstr ""

91

87 -#: archive.c:330

92 +#: archive.c:334

93 msgid "report archived files on stderr"

94 msgstr ""

95

91 -#: archive.c:331

96 +#: archive.c:335

97 msgid "store only"

98 msgstr ""

99

95 -#: archive.c:332

100 +#: archive.c:336

101 msgid "compress faster"

102 msgstr ""

103

99 -#: archive.c:340

104 +#: archive.c:344

105 msgid "compress better"

106 msgstr ""

107

103 -#: archive.c:343

108 +#: archive.c:347

109 msgid "list supported archive formats"

110 msgstr ""

111

107 -#: archive.c:345 builtin/archive.c:90 builtin/clone.c:85

112 +#: archive.c:349 builtin/archive.c:90 builtin/clone.c:84

113 msgid "repo"

114 msgstr ""

115

111 -#: archive.c:346 builtin/archive.c:91

116 +#: archive.c:350 builtin/archive.c:91

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

118 msgstr ""

119

115 -#: archive.c:347 builtin/archive.c:92 builtin/notes.c:487

120 +#: archive.c:351 builtin/archive.c:92 builtin/notes.c:487

121 msgid "command"

122 msgstr ""

123

119 -#: archive.c:348 builtin/archive.c:93

124 +#: archive.c:352 builtin/archive.c:93

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

126 msgstr ""

127

@@ -195,17 +200,17 @@ msgstr ""

200 msgid "Cannot force update the current branch."

201 msgstr ""

202

198 -#: branch.c:216

203 +#: branch.c:215

204 #, c-format

205 msgid "Cannot setup tracking information; starting point '%s' is not a branch."

206 msgstr ""

207

203 -#: branch.c:218

208 +#: branch.c:217

209 #, c-format

210 msgid "the requested upstream branch '%s' does not exist"

211 msgstr ""

212

208 -#: branch.c:220

213 +#: branch.c:219

214 msgid ""

215 "\n"

216 "If you are planning on basing your work on an upstream\n"

@@ -217,26 +222,26 @@ msgid ""

222 "\"git push -u\" to set the upstream config as you push."

223 msgstr ""

224

220 -#: branch.c:265

225 +#: branch.c:264

226 #, c-format

227 msgid "Not a valid object name: '%s'."

228 msgstr ""

229

225 -#: branch.c:285

230 +#: branch.c:284

231 #, c-format

232 msgid "Ambiguous object name: '%s'."

233 msgstr ""

234

230 -#: branch.c:290

235 +#: branch.c:289

236 #, c-format

237 msgid "Not a valid branch point: '%s'."

238 msgstr ""

239

235 -#: branch.c:296

240 +#: branch.c:295

241 msgid "Failed to lock ref for update"

242 msgstr ""

243

239 -#: branch.c:314

244 +#: branch.c:313

245 msgid "Failed to write ref"

246 msgstr ""

247

@@ -250,7 +255,7 @@ msgstr ""

255 msgid "unrecognized header: %s%s (%d)"

256 msgstr ""

257

253 -#: bundle.c:89 builtin/commit.c:697

258 +#: bundle.c:89 builtin/commit.c:706

259 #, c-format

260 msgid "could not open '%s'"

261 msgstr ""

@@ -259,9 +264,9 @@ msgstr ""

264 msgid "Repository lacks these prerequisite commits:"

265 msgstr ""

266

262 -#: bundle.c:164 sequencer.c:661 sequencer.c:1111 builtin/log.c:331

263 -#: builtin/log.c:801 builtin/log.c:1399 builtin/log.c:1625 builtin/merge.c:364

264 -#: builtin/shortlog.c:156

267 +#: bundle.c:164 sequencer.c:662 sequencer.c:1112 builtin/log.c:332

268 +#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:364

269 +#: builtin/shortlog.c:158

270 msgid "revision walk setup failed"

271 msgstr ""

272

@@ -287,7 +292,7 @@ msgstr[1] ""

292 msgid "rev-list died"

293 msgstr ""

294

290 -#: bundle.c:300 builtin/log.c:1310 builtin/shortlog.c:259

295 +#: bundle.c:300 builtin/log.c:1329 builtin/shortlog.c:261

296 #, c-format

297 msgid "unrecognized argument: %s"

298 msgstr ""

@@ -435,14 +440,14 @@ msgid ""

440 "%s"

441 msgstr ""

442

438 -#: diff.c:3487

443 +#: diff.c:3490

444 #, c-format

445 msgid ""

446 "Failed to parse --dirstat/-X option parameter:\n"

447 "%s"

448 msgstr ""

449

445 -#: diff.c:3501

450 +#: diff.c:3504

451 #, c-format

452 msgid "Failed to parse --submodule option parameter: '%s'"

453 msgstr ""

@@ -469,17 +474,17 @@ msgstr ""

474 msgid "failed writing detached signature to '%s': %s"

475 msgstr ""

476

472 -#: grep.c:1623

477 +#: grep.c:1695

478 #, c-format

479 msgid "'%s': unable to read %s"

480 msgstr ""

481

477 -#: grep.c:1640

482 +#: grep.c:1712

483 #, c-format

484 msgid "'%s': %s"

485 msgstr ""

486

482 -#: grep.c:1651

487 +#: grep.c:1723

488 #, c-format

489 msgid "'%s': short read %s"

490 msgstr ""

@@ -544,8 +549,8 @@ msgstr ""

549 msgid "failed to read the cache"

550 msgstr ""

551

547 -#: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566

548 -#: builtin/clone.c:656

552 +#: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559

553 +#: builtin/clone.c:655

554 msgid "unable to write new index file"

555 msgstr ""

556

@@ -594,7 +599,7 @@ msgstr ""

599 msgid "blob expected for %s '%s'"

600 msgstr ""

601

597 -#: merge-recursive.c:774 builtin/clone.c:312

602 +#: merge-recursive.c:774 builtin/clone.c:311

603 #, c-format

604 msgid "failed to open '%s'"

605 msgstr ""

@@ -721,7 +726,7 @@ msgstr ""

726 msgid "Auto-merging %s"

727 msgstr ""

728

724 -#: merge-recursive.c:1634 git-submodule.sh:1118

729 +#: merge-recursive.c:1634 git-submodule.sh:1125

730 msgid "submodule"

731 msgstr ""

732

@@ -816,58 +821,121 @@ msgstr ""

821 msgid "Bad %s value: '%s'"

822 msgstr ""

823

819 -#: object.c:204

824 +#: object.c:202

825 #, c-format

826 msgid "unable to parse object: %s"

827 msgstr ""

828

824 -#: parse-options.c:489

829 +#: parse-options.c:537

830 msgid "..."

831 msgstr ""

832

828 -#: parse-options.c:507

833 +#: parse-options.c:555

834 #, c-format

835 msgid "usage: %s"

836 msgstr ""

837

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

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

835 -#: parse-options.c:511

840 +#: parse-options.c:559

841 #, c-format

842 msgid " or: %s"

843 msgstr ""

844

840 -#: parse-options.c:514

845 +#: parse-options.c:562

846 #, c-format

847 msgid " %s"

848 msgstr ""

849

845 -#: parse-options.c:548

850 +#: parse-options.c:596

851 msgid "-NUM"

852 msgstr ""

853

849 -#: pathspec.c:83

854 +#: pathspec.c:118

855 +msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

856 +msgstr ""

857 +

858 +#: pathspec.c:128

859 +msgid ""

860 +"global 'literal' pathspec setting is incompatible with all other global "

861 +"pathspec settings"

862 +msgstr ""

863 +

864 +#: pathspec.c:158

865 +msgid "invalid parameter for pathspec magic 'prefix'"

866 +msgstr ""

867 +

868 +#: pathspec.c:164

869 +#, c-format

870 +msgid "Invalid pathspec magic '%.*s' in '%s'"

871 +msgstr ""

872 +

873 +#: pathspec.c:168

874 +#, c-format

875 +msgid "Missing ')' at the end of pathspec magic in '%s'"

876 +msgstr ""

877 +

878 +#: pathspec.c:186

879 +#, c-format

880 +msgid "Unimplemented pathspec magic '%c' in '%s'"

881 +msgstr ""

882 +

883 +#: pathspec.c:211

884 +#, c-format

885 +msgid "%s: 'literal' and 'glob' are incompatible"

886 +msgstr ""

887 +

888 +#: pathspec.c:222

889 +#, c-format

890 +msgid "%s: '%s' is outside repository"

891 +msgstr ""

892 +

893 +#: pathspec.c:278

894 +#, c-format

895 +msgid "Pathspec '%s' is in submodule '%.*s'"

896 +msgstr ""

897 +

898 +#.

899 +#. * We may want to substitute "this command" with a command

900 +#. * name. E.g. when add--interactive dies when running

901 +#. * "checkout -p"

902 +#.

903 +#: pathspec.c:340

904 +#, c-format

905 +msgid "%s: pathspec magic not supported by this command: %s"

906 +msgstr ""

907 +

908 +#: pathspec.c:415

909 #, c-format

851 -msgid "Path '%s' is in submodule '%.*s'"

910 +msgid "pathspec '%s' is beyond a symbolic link"

911 msgstr ""

912

854 -#: pathspec.c:99

913 +#: remote.c:1833

914 #, c-format

856 -msgid "'%s' is beyond a symbolic link"

915 +msgid "Your branch is based on '%s', but the upstream is gone.\n"

916 msgstr ""

917

859 -#: remote.c:1788

918 +#: remote.c:1837

919 +msgid " (use \"git branch --unset-upstream\" to fixup)\n"

920 +msgstr ""

921 +

922 +#: remote.c:1840

923 +#, c-format

924 +msgid "Your branch is up-to-date with '%s'.\n"

925 +msgstr ""

926 +

927 +#: remote.c:1844

928 #, c-format

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

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

931 msgstr[0] ""

932 msgstr[1] ""

933

866 -#: remote.c:1794

934 +#: remote.c:1850

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

936 msgstr ""

937

870 -#: remote.c:1797

938 +#: remote.c:1853

939 #, c-format

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

941 msgid_plural ""

@@ -875,11 +943,11 @@ msgid_plural ""

943 msgstr[0] ""

944 msgstr[1] ""

945

878 -#: remote.c:1805

946 +#: remote.c:1861

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

948 msgstr ""

949

882 -#: remote.c:1808

950 +#: remote.c:1864

951 #, c-format

952 msgid ""

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

@@ -890,7 +958,7 @@ msgid_plural ""

958 msgstr[0] ""

959 msgstr[1] ""

960

893 -#: remote.c:1818

961 +#: remote.c:1874

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

963 msgstr ""

964

@@ -928,7 +996,7 @@ msgid ""

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

997 msgstr ""

998

931 -#: sequencer.c:245 sequencer.c:869 sequencer.c:952

999 +#: sequencer.c:245 sequencer.c:870 sequencer.c:953

1000 #, c-format

1001 msgid "Could not write to %s"

1002 msgstr ""

@@ -951,197 +1019,197 @@ msgid "Commit your changes or stash them to proceed."

1019 msgstr ""

1020

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

954 -#: sequencer.c:324

1022 +#: sequencer.c:325

1023 #, c-format

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

1025 msgstr ""

1026

959 -#: sequencer.c:355

1027 +#: sequencer.c:356

1028 msgid "Could not resolve HEAD commit\n"

1029 msgstr ""

1030

963 -#: sequencer.c:377

1031 +#: sequencer.c:378

1032 msgid "Unable to update cache tree\n"

1033 msgstr ""

1034

967 -#: sequencer.c:422

1035 +#: sequencer.c:423

1036 #, c-format

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

1038 msgstr ""

1039

972 -#: sequencer.c:427

1040 +#: sequencer.c:428

1041 #, c-format

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

1043 msgstr ""

1044

977 -#: sequencer.c:493

1045 +#: sequencer.c:494

1046 msgid "Your index file is unmerged."

1047 msgstr ""

1048

981 -#: sequencer.c:512

1049 +#: sequencer.c:513

1050 #, c-format

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

1052 msgstr ""

1053

986 -#: sequencer.c:520

1054 +#: sequencer.c:521

1055 #, c-format

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

1057 msgstr ""

1058

991 -#: sequencer.c:524

1059 +#: sequencer.c:525

1060 #, c-format

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

1062 msgstr ""

1063

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

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

998 -#: sequencer.c:537

1066 +#: sequencer.c:538

1067 #, c-format

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

1069 msgstr ""

1070

1003 -#: sequencer.c:541

1071 +#: sequencer.c:542

1072 #, c-format

1073 msgid "Cannot get commit message for %s"

1074 msgstr ""

1075

1008 -#: sequencer.c:627

1076 +#: sequencer.c:628

1077 #, c-format

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

1079 msgstr ""

1080

1013 -#: sequencer.c:628

1081 +#: sequencer.c:629

1082 #, c-format

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

1084 msgstr ""

1085

1018 -#: sequencer.c:664

1086 +#: sequencer.c:665

1087 msgid "empty commit set passed"

1088 msgstr ""

1089

1022 -#: sequencer.c:672

1090 +#: sequencer.c:673

1091 #, c-format

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

1093 msgstr ""

1094

1027 -#: sequencer.c:677

1095 +#: sequencer.c:678

1096 #, c-format

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

1098 msgstr ""

1099

1032 -#: sequencer.c:735

1100 +#: sequencer.c:736

1101 #, c-format

1102 msgid "Cannot %s during a %s"

1103 msgstr ""

1104

1037 -#: sequencer.c:757

1105 +#: sequencer.c:758

1106 #, c-format

1107 msgid "Could not parse line %d."

1108 msgstr ""

1109

1042 -#: sequencer.c:762

1110 +#: sequencer.c:763

1111 msgid "No commits parsed."

1112 msgstr ""

1113

1046 -#: sequencer.c:775

1114 +#: sequencer.c:776

1115 #, c-format

1116 msgid "Could not open %s"

1117 msgstr ""

1118

1051 -#: sequencer.c:779

1119 +#: sequencer.c:780

1120 #, c-format

1121 msgid "Could not read %s."

1122 msgstr ""

1123

1056 -#: sequencer.c:786

1124 +#: sequencer.c:787

1125 #, c-format

1126 msgid "Unusable instruction sheet: %s"

1127 msgstr ""

1128

1061 -#: sequencer.c:814

1129 +#: sequencer.c:815

1130 #, c-format

1131 msgid "Invalid key: %s"

1132 msgstr ""

1133

1066 -#: sequencer.c:817

1134 +#: sequencer.c:818

1135 #, c-format

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

1137 msgstr ""

1138

1071 -#: sequencer.c:829

1139 +#: sequencer.c:830

1140 #, c-format

1141 msgid "Malformed options sheet: %s"

1142 msgstr ""

1143

1076 -#: sequencer.c:850

1144 +#: sequencer.c:851

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

1146 msgstr ""

1147

1080 -#: sequencer.c:851

1148 +#: sequencer.c:852

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

1150 msgstr ""

1151

1084 -#: sequencer.c:855

1152 +#: sequencer.c:856

1153 #, c-format

1154 msgid "Could not create sequencer directory %s"

1155 msgstr ""

1156

1089 -#: sequencer.c:871 sequencer.c:956

1157 +#: sequencer.c:872 sequencer.c:957

1158 #, c-format

1159 msgid "Error wrapping up %s."

1160 msgstr ""

1161

1094 -#: sequencer.c:890 sequencer.c:1024

1162 +#: sequencer.c:891 sequencer.c:1025

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

1164 msgstr ""

1165

1098 -#: sequencer.c:892

1166 +#: sequencer.c:893

1167 msgid "cannot resolve HEAD"

1168 msgstr ""

1169

1102 -#: sequencer.c:894

1170 +#: sequencer.c:895

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

1172 msgstr ""

1173

1106 -#: sequencer.c:916 builtin/apply.c:4061

1174 +#: sequencer.c:917 builtin/apply.c:4061

1175 #, c-format

1176 msgid "cannot open %s: %s"

1177 msgstr ""

1178

1111 -#: sequencer.c:919

1179 +#: sequencer.c:920

1180 #, c-format

1181 msgid "cannot read %s: %s"

1182 msgstr ""

1183

1116 -#: sequencer.c:920

1184 +#: sequencer.c:921

1185 msgid "unexpected end of file"

1186 msgstr ""

1187

1120 -#: sequencer.c:926

1188 +#: sequencer.c:927

1189 #, c-format

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

1191 msgstr ""

1192

1125 -#: sequencer.c:949

1193 +#: sequencer.c:950

1194 #, c-format

1195 msgid "Could not format %s."

1196 msgstr ""

1197

1130 -#: sequencer.c:1092

1198 +#: sequencer.c:1093

1199 #, c-format

1200 msgid "%s: can't cherry-pick a %s"

1201 msgstr ""

1202

1135 -#: sequencer.c:1095

1203 +#: sequencer.c:1096

1204 #, c-format

1205 msgid "%s: bad revision"

1206 msgstr ""

1207

1140 -#: sequencer.c:1129

1208 +#: sequencer.c:1130

1209 msgid "Can't revert as initial commit"

1210 msgstr ""

1211

1144 -#: sequencer.c:1130

1212 +#: sequencer.c:1131

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

1214 msgstr ""

1215

@@ -1158,360 +1226,453 @@ msgid ""

1226 "running \"git config advice.objectNameWarning false\""

1227 msgstr ""

1228

1161 -#: sha1_name.c:1097

1229 +#: sha1_name.c:1112

1230 msgid "HEAD does not point to a branch"

1231 msgstr ""

1232

1165 -#: sha1_name.c:1100

1233 +#: sha1_name.c:1115

1234 #, c-format

1235 msgid "No such branch: '%s'"

1236 msgstr ""

1237

1170 -#: sha1_name.c:1102

1238 +#: sha1_name.c:1117

1239 #, c-format

1240 msgid "No upstream configured for branch '%s'"

1241 msgstr ""

1242

1175 -#: sha1_name.c:1106

1243 +#: sha1_name.c:1121

1244 #, c-format

1245 msgid "Upstream branch '%s' not stored as a remote-tracking branch"

1246 msgstr ""

1247

1180 -#: wrapper.c:408

1248 +#: submodule.c:64 submodule.c:98

1249 +msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"

1250 +msgstr ""

1251 +

1252 +#: submodule.c:68 submodule.c:102

1253 +#, c-format

1254 +msgid "Could not find section in .gitmodules where path=%s"

1255 +msgstr ""

1256 +

1257 +#. Maybe the user already did that, don't error out here

1258 +#: submodule.c:76

1259 +#, c-format

1260 +msgid "Could not update .gitmodules entry %s"

1261 +msgstr ""

1262 +

1263 +#. Maybe the user already did that, don't error out here

1264 +#: submodule.c:109

1265 +#, c-format

1266 +msgid "Could not remove .gitmodules entry for %s"

1267 +msgstr ""

1268 +

1269 +#: submodule.c:127

1270 +msgid "could not find .gitmodules in index"

1271 +msgstr ""

1272 +

1273 +#: submodule.c:133

1274 +msgid "reading updated .gitmodules failed"

1275 +msgstr ""

1276 +

1277 +#: submodule.c:135

1278 +msgid "unable to stat updated .gitmodules"

1279 +msgstr ""

1280 +

1281 +#: submodule.c:139

1282 +msgid "unable to remove .gitmodules from index"

1283 +msgstr ""

1284 +

1285 +#: submodule.c:141

1286 +msgid "adding updated .gitmodules failed"

1287 +msgstr ""

1288 +

1289 +#: submodule.c:143

1290 +msgid "staging updated .gitmodules failed"

1291 +msgstr ""

1292 +

1293 +#: submodule.c:1144 builtin/init-db.c:363

1294 +#, c-format

1295 +msgid "Could not create git link %s"

1296 +msgstr ""

1297 +

1298 +#: submodule.c:1155

1299 +#, c-format

1300 +msgid "Could not set core.worktree in %s"

1301 +msgstr ""

1302 +

1303 +#: urlmatch.c:120

1304 +msgid "invalid URL scheme name or missing '://' suffix"

1305 +msgstr ""

1306 +

1307 +#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356

1308 +#, c-format

1309 +msgid "invalid %XX escape sequence"

1310 +msgstr ""

1311 +

1312 +#: urlmatch.c:172

1313 +msgid "missing host and scheme is not 'file:'"

1314 +msgstr ""

1315 +

1316 +#: urlmatch.c:189

1317 +msgid "a 'file:' URL may not have a port number"

1318 +msgstr ""

1319 +

1320 +#: urlmatch.c:199

1321 +msgid "invalid characters in host name"

1322 +msgstr ""

1323 +

1324 +#: urlmatch.c:244 urlmatch.c:255

1325 +msgid "invalid port number"

1326 +msgstr ""

1327 +

1328 +#: urlmatch.c:322

1329 +msgid "invalid '..' path segment"

1330 +msgstr ""

1331 +

1332 +#: wrapper.c:422

1333 #, c-format

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

1335 msgstr ""

1336

1185 -#: wrapper.c:429

1337 +#: wrapper.c:443

1338 #, c-format

1339 msgid "unable to access '%s'"

1340 msgstr ""

1341

1190 -#: wrapper.c:440

1342 +#: wrapper.c:454

1343 #, c-format

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

1345 msgstr ""

1346

1195 -#: wrapper.c:441

1347 +#: wrapper.c:455

1348 msgid "no such user"

1349 msgstr ""

1350

1199 -#: wt-status.c:141

1351 +#: wt-status.c:146

1352 msgid "Unmerged paths:"

1353 msgstr ""

1354

1203 -#: wt-status.c:168 wt-status.c:195

1355 +#: wt-status.c:173 wt-status.c:200

1356 #, c-format

1357 msgid " (use \"git reset %s <file>...\" to unstage)"

1358 msgstr ""

1359

1208 -#: wt-status.c:170 wt-status.c:197

1360 +#: wt-status.c:175 wt-status.c:202

1361 msgid " (use \"git rm --cached <file>...\" to unstage)"

1362 msgstr ""

1363

1212 -#: wt-status.c:174

1364 +#: wt-status.c:179

1365 msgid " (use \"git add <file>...\" to mark resolution)"

1366 msgstr ""

1367

1216 -#: wt-status.c:176 wt-status.c:180

1368 +#: wt-status.c:181 wt-status.c:185

1369 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"

1370 msgstr ""

1371

1220 -#: wt-status.c:178

1372 +#: wt-status.c:183

1373 msgid " (use \"git rm <file>...\" to mark resolution)"

1374 msgstr ""

1375

1224 -#: wt-status.c:189

1376 +#: wt-status.c:194

1377 msgid "Changes to be committed:"

1378 msgstr ""

1379

1228 -#: wt-status.c:207

1380 +#: wt-status.c:212

1381 msgid "Changes not staged for commit:"

1382 msgstr ""

1383

1232 -#: wt-status.c:211

1384 +#: wt-status.c:216

1385 msgid " (use \"git add <file>...\" to update what will be committed)"

1386 msgstr ""

1387

1236 -#: wt-status.c:213

1388 +#: wt-status.c:218

1389 msgid " (use \"git add/rm <file>...\" to update what will be committed)"

1390 msgstr ""

1391

1240 -#: wt-status.c:214

1392 +#: wt-status.c:219

1393 msgid ""

1394 " (use \"git checkout -- <file>...\" to discard changes in working directory)"

1395 msgstr ""

1396

1245 -#: wt-status.c:216

1397 +#: wt-status.c:221

1398 msgid " (commit or discard the untracked or modified content in submodules)"

1399 msgstr ""

1400

1249 -#: wt-status.c:228

1401 +#: wt-status.c:233

1402 #, c-format

1403 msgid " (use \"git %s <file>...\" to include in what will be committed)"

1404 msgstr ""

1405

1254 -#: wt-status.c:245

1406 +#: wt-status.c:250

1407 msgid "bug"

1408 msgstr ""

1409

1258 -#: wt-status.c:250

1410 +#: wt-status.c:255

1411 msgid "both deleted:"

1412 msgstr ""

1413

1262 -#: wt-status.c:251

1414 +#: wt-status.c:256

1415 msgid "added by us:"

1416 msgstr ""

1417

1266 -#: wt-status.c:252

1418 +#: wt-status.c:257

1419 msgid "deleted by them:"

1420 msgstr ""

1421

1270 -#: wt-status.c:253

1422 +#: wt-status.c:258

1423 msgid "added by them:"

1424 msgstr ""

1425

1274 -#: wt-status.c:254

1426 +#: wt-status.c:259

1427 msgid "deleted by us:"

1428 msgstr ""

1429

1278 -#: wt-status.c:255

1430 +#: wt-status.c:260

1431 msgid "both added:"

1432 msgstr ""

1433

1282 -#: wt-status.c:256

1434 +#: wt-status.c:261

1435 msgid "both modified:"

1436 msgstr ""

1437

1286 -#: wt-status.c:286

1438 +#: wt-status.c:291

1439 msgid "new commits, "

1440 msgstr ""

1441

1290 -#: wt-status.c:288

1442 +#: wt-status.c:293

1443 msgid "modified content, "

1444 msgstr ""

1445

1294 -#: wt-status.c:290

1446 +#: wt-status.c:295

1447 msgid "untracked content, "

1448 msgstr ""

1449

1298 -#: wt-status.c:307

1450 +#: wt-status.c:312

1451 #, c-format

1452 msgid "new file: %s"

1453 msgstr ""

1454

1303 -#: wt-status.c:310

1455 +#: wt-status.c:315

1456 #, c-format

1457 msgid "copied: %s -> %s"

1458 msgstr ""

1459

1308 -#: wt-status.c:313

1460 +#: wt-status.c:318

1461 #, c-format

1462 msgid "deleted: %s"

1463 msgstr ""

1464

1313 -#: wt-status.c:316

1465 +#: wt-status.c:321

1466 #, c-format

1467 msgid "modified: %s"

1468 msgstr ""

1469

1318 -#: wt-status.c:319

1470 +#: wt-status.c:324

1471 #, c-format

1472 msgid "renamed: %s -> %s"

1473 msgstr ""

1474

1323 -#: wt-status.c:322

1475 +#: wt-status.c:327

1476 #, c-format

1477 msgid "typechange: %s"

1478 msgstr ""

1479

1328 -#: wt-status.c:325

1480 +#: wt-status.c:330

1481 #, c-format

1482 msgid "unknown: %s"

1483 msgstr ""

1484

1333 -#: wt-status.c:328

1485 +#: wt-status.c:333

1486 #, c-format

1487 msgid "unmerged: %s"

1488 msgstr ""

1489

1338 -#: wt-status.c:331

1490 +#: wt-status.c:336

1491 #, c-format

1492 msgid "bug: unhandled diff status %c"

1493 msgstr ""

1494

1343 -#: wt-status.c:803

1495 +#: wt-status.c:703

1496 +msgid "Submodules changed but not updated:"

1497 +msgstr ""

1498 +

1499 +#: wt-status.c:705

1500 +msgid "Submodule changes to be committed:"

1501 +msgstr ""

1502 +

1503 +#: wt-status.c:848

1504 msgid "You have unmerged paths."

1505 msgstr ""

1506

1347 -#: wt-status.c:806

1507 +#: wt-status.c:851

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

1509 msgstr ""

1510

1351 -#: wt-status.c:809

1511 +#: wt-status.c:854

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

1513 msgstr ""

1514

1355 -#: wt-status.c:812

1515 +#: wt-status.c:857

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

1517 msgstr ""

1518

1359 -#: wt-status.c:822

1519 +#: wt-status.c:867

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

1521 msgstr ""

1522

1363 -#: wt-status.c:825

1523 +#: wt-status.c:870

1524 msgid "The current patch is empty."

1525 msgstr ""

1526

1367 -#: wt-status.c:829

1527 +#: wt-status.c:874

1528 msgid " (fix conflicts and then run \"git am --continue\")"

1529 msgstr ""

1530

1371 -#: wt-status.c:831

1531 +#: wt-status.c:876

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

1533 msgstr ""

1534

1375 -#: wt-status.c:833

1535 +#: wt-status.c:878

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

1537 msgstr ""

1538

1379 -#: wt-status.c:893 wt-status.c:910

1539 +#: wt-status.c:938 wt-status.c:955

1540 #, c-format

1541 msgid "You are currently rebasing branch '%s' on '%s'."

1542 msgstr ""

1543

1384 -#: wt-status.c:898 wt-status.c:915

1544 +#: wt-status.c:943 wt-status.c:960

1545 msgid "You are currently rebasing."

1546 msgstr ""

1547

1388 -#: wt-status.c:901

1548 +#: wt-status.c:946

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

1550 msgstr ""

1551

1392 -#: wt-status.c:903

1552 +#: wt-status.c:948

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

1554 msgstr ""

1555

1396 -#: wt-status.c:905

1556 +#: wt-status.c:950

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

1558 msgstr ""

1559

1400 -#: wt-status.c:918

1560 +#: wt-status.c:963

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

1562 msgstr ""

1563

1404 -#: wt-status.c:922

1564 +#: wt-status.c:967

1565 #, c-format

1566 msgid ""

1567 "You are currently splitting a commit while rebasing branch '%s' on '%s'."

1568 msgstr ""

1569

1410 -#: wt-status.c:927

1570 +#: wt-status.c:972

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

1572 msgstr ""

1573

1414 -#: wt-status.c:930

1574 +#: wt-status.c:975

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

1576 msgstr ""

1577

1418 -#: wt-status.c:934

1578 +#: wt-status.c:979

1579 #, c-format

1580 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."

1581 msgstr ""

1582

1423 -#: wt-status.c:939

1583 +#: wt-status.c:984

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

1585 msgstr ""

1586

1427 -#: wt-status.c:942

1587 +#: wt-status.c:987

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

1589 msgstr ""

1590

1431 -#: wt-status.c:944

1591 +#: wt-status.c:989

1592 msgid ""

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

1594 msgstr ""

1595

1436 -#: wt-status.c:954

1437 -msgid "You are currently cherry-picking."

1596 +#: wt-status.c:999

1597 +#, c-format

1598 +msgid "You are currently cherry-picking commit %s."

1599 msgstr ""

1600

1440 -#: wt-status.c:958

1601 +#: wt-status.c:1004

1602 msgid " (fix conflicts and run \"git cherry-pick --continue\")"

1603 msgstr ""

1604

1444 -#: wt-status.c:961

1605 +#: wt-status.c:1007

1606 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"

1607 msgstr ""

1608

1448 -#: wt-status.c:963

1609 +#: wt-status.c:1009

1610 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"

1611 msgstr ""

1612

1452 -#: wt-status.c:972

1613 +#: wt-status.c:1018

1614 #, c-format

1615 msgid "You are currently reverting commit %s."

1616 msgstr ""

1617

1457 -#: wt-status.c:977

1618 +#: wt-status.c:1023

1619 msgid " (fix conflicts and run \"git revert --continue\")"

1620 msgstr ""

1621

1461 -#: wt-status.c:980

1622 +#: wt-status.c:1026

1623 msgid " (all conflicts fixed: run \"git revert --continue\")"

1624 msgstr ""

1625

1465 -#: wt-status.c:982

1626 +#: wt-status.c:1028

1627 msgid " (use \"git revert --abort\" to cancel the revert operation)"

1628 msgstr ""

1629

1469 -#: wt-status.c:993

1630 +#: wt-status.c:1039

1631 #, c-format

1632 msgid "You are currently bisecting, started from branch '%s'."

1633 msgstr ""

1634

1474 -#: wt-status.c:997

1635 +#: wt-status.c:1043

1636 msgid "You are currently bisecting."

1637 msgstr ""

1638

1478 -#: wt-status.c:1000

1639 +#: wt-status.c:1046

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

1641 msgstr ""

1642

1482 -#: wt-status.c:1173

1643 +#: wt-status.c:1221

1644 msgid "On branch "

1645 msgstr ""

1646

1486 -#: wt-status.c:1180

1647 +#: wt-status.c:1228

1648 msgid "rebase in progress; onto "

1649 msgstr ""

1650

1490 -#: wt-status.c:1187

1651 +#: wt-status.c:1235

1652 msgid "HEAD detached at "

1653 msgstr ""

1654

1494 -#: wt-status.c:1189

1655 +#: wt-status.c:1237

1656 msgid "HEAD detached from "

1657 msgstr ""

1658

1498 -#: wt-status.c:1192

1659 +#: wt-status.c:1240

1660 msgid "Not currently on any branch."

1661 msgstr ""

1662

1502 -#: wt-status.c:1209

1663 +#: wt-status.c:1257

1664 msgid "Initial commit"

1665 msgstr ""

1666

1506 -#: wt-status.c:1223

1667 +#: wt-status.c:1271

1668 msgid "Untracked files"

1669 msgstr ""

1670

1510 -#: wt-status.c:1225

1671 +#: wt-status.c:1273

1672 msgid "Ignored files"

1673 msgstr ""

1674

1514 -#: wt-status.c:1229

1675 +#: wt-status.c:1277

1676 #, c-format

1677 msgid ""

1678 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

@@ -1519,82 +1680,86 @@ msgid ""

1680 "new files yourself (see 'git help status')."

1681 msgstr ""

1682

1522 -#: wt-status.c:1235

1683 +#: wt-status.c:1283

1684 #, c-format

1685 msgid "Untracked files not listed%s"

1686 msgstr ""

1687

1527 -#: wt-status.c:1237

1688 +#: wt-status.c:1285

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

1690 msgstr ""

1691

1531 -#: wt-status.c:1243

1692 +#: wt-status.c:1291

1693 msgid "No changes"

1694 msgstr ""

1695

1535 -#: wt-status.c:1248

1696 +#: wt-status.c:1296

1697 #, c-format

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

1699 msgstr ""

1700

1540 -#: wt-status.c:1251

1701 +#: wt-status.c:1299

1702 #, c-format

1703 msgid "no changes added to commit\n"

1704 msgstr ""

1705

1545 -#: wt-status.c:1254

1706 +#: wt-status.c:1302

1707 #, c-format

1708 msgid ""

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

1710 "track)\n"

1711 msgstr ""

1712

1552 -#: wt-status.c:1257

1713 +#: wt-status.c:1305

1714 #, c-format

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

1716 msgstr ""

1717

1557 -#: wt-status.c:1260

1718 +#: wt-status.c:1308

1719 #, c-format

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

1721 msgstr ""

1722

1562 -#: wt-status.c:1263 wt-status.c:1268

1723 +#: wt-status.c:1311 wt-status.c:1316

1724 #, c-format

1725 msgid "nothing to commit\n"

1726 msgstr ""

1727

1567 -#: wt-status.c:1266

1728 +#: wt-status.c:1314

1729 #, c-format

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

1731 msgstr ""

1732

1572 -#: wt-status.c:1270

1733 +#: wt-status.c:1318

1734 #, c-format

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

1736 msgstr ""

1737

1577 -#: wt-status.c:1378

1738 +#: wt-status.c:1427

1739 msgid "HEAD (no branch)"

1740 msgstr ""

1741

1581 -#: wt-status.c:1384

1742 +#: wt-status.c:1433

1743 msgid "Initial commit on "

1744 msgstr ""

1745

1585 -#: wt-status.c:1399

1746 +#: wt-status.c:1463

1747 +msgid "gone"

1748 +msgstr ""

1749 +

1750 +#: wt-status.c:1465

1751 msgid "behind "

1752 msgstr ""

1753

1589 -#: wt-status.c:1402 wt-status.c:1405

1754 +#: wt-status.c:1468 wt-status.c:1471

1755 msgid "ahead "

1756 msgstr ""

1757

1593 -#: wt-status.c:1407

1758 +#: wt-status.c:1473

1759 msgid ", behind "

1760 msgstr ""

1761

1597 -#: compat/precompose_utf8.c:58 builtin/clone.c:351

1762 +#: compat/precompose_utf8.c:55 builtin/clone.c:350

1763 #, c-format

1764 msgid "failed to unlink '%s'"

1765 msgstr ""

@@ -1654,7 +1819,7 @@ msgstr ""

1819 msgid "unexpected diff status %c"

1820 msgstr ""

1821

1657 -#: builtin/add.c:149 builtin/commit.c:252

1822 +#: builtin/add.c:149 builtin/commit.c:260

1823 msgid "updating files failed"

1824 msgstr ""

1825

@@ -1663,140 +1828,135 @@ msgstr ""

1828 msgid "remove '%s'\n"

1829 msgstr ""

1830

1666 -#: builtin/add.c:253

1831 +#: builtin/add.c:237

1832 msgid "Unstaged changes after refreshing the index:"

1833 msgstr ""

1834

1670 -#: builtin/add.c:256 builtin/add.c:573 builtin/rm.c:337

1671 -#, c-format

1672 -msgid "pathspec '%s' did not match any files"

1673 -msgstr ""

1674 -

1675 -#: builtin/add.c:339

1835 +#: builtin/add.c:299

1836 msgid "Could not read the index"

1837 msgstr ""

1838

1679 -#: builtin/add.c:350

1839 +#: builtin/add.c:310

1840 #, c-format

1841 msgid "Could not open '%s' for writing."

1842 msgstr ""

1843

1684 -#: builtin/add.c:354

1844 +#: builtin/add.c:314

1845 msgid "Could not write patch"

1846 msgstr ""

1847

1688 -#: builtin/add.c:359

1848 +#: builtin/add.c:319

1849 #, c-format

1850 msgid "Could not stat '%s'"

1851 msgstr ""

1852

1693 -#: builtin/add.c:361

1853 +#: builtin/add.c:321

1854 msgid "Empty patch. Aborted."

1855 msgstr ""

1856

1697 -#: builtin/add.c:367

1857 +#: builtin/add.c:327

1858 #, c-format

1859 msgid "Could not apply '%s'"

1860 msgstr ""

1861

1702 -#: builtin/add.c:377

1862 +#: builtin/add.c:337

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

1864 msgstr ""

1865

1706 -#: builtin/add.c:394 builtin/clean.c:875 builtin/fetch.c:78 builtin/mv.c:63

1707 -#: builtin/prune-packed.c:73 builtin/push.c:451 builtin/remote.c:1253

1708 -#: builtin/rm.c:268

1866 +#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:92 builtin/mv.c:66

1867 +#: builtin/prune-packed.c:73 builtin/push.c:459 builtin/remote.c:1253

1868 +#: builtin/rm.c:269

1869 msgid "dry run"

1870 msgstr ""

1871

1712 -#: builtin/add.c:395 builtin/apply.c:4410 builtin/check-ignore.c:19

1713 -#: builtin/commit.c:1220 builtin/count-objects.c:95 builtin/fsck.c:613

1714 -#: builtin/log.c:1573 builtin/mv.c:62 builtin/read-tree.c:113

1872 +#: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19

1873 +#: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612

1874 +#: builtin/log.c:1592 builtin/mv.c:65 builtin/read-tree.c:113

1875 msgid "be verbose"

1876 msgstr ""

1877

1718 -#: builtin/add.c:397

1878 +#: builtin/add.c:357

1879 msgid "interactive picking"

1880 msgstr ""

1881

1722 -#: builtin/add.c:398 builtin/checkout.c:1073 builtin/reset.c:261

1882 +#: builtin/add.c:358 builtin/checkout.c:1109 builtin/reset.c:272

1883 msgid "select hunks interactively"

1884 msgstr ""

1885

1726 -#: builtin/add.c:399

1886 +#: builtin/add.c:359

1887 msgid "edit current diff and apply"

1888 msgstr ""

1889

1730 -#: builtin/add.c:400

1890 +#: builtin/add.c:360

1891 msgid "allow adding otherwise ignored files"

1892 msgstr ""

1893

1734 -#: builtin/add.c:401

1894 +#: builtin/add.c:361

1895 msgid "update tracked files"

1896 msgstr ""

1897

1738 -#: builtin/add.c:402

1898 +#: builtin/add.c:362

1899 msgid "record only the fact that the path will be added later"

1900 msgstr ""

1901

1742 -#: builtin/add.c:403

1902 +#: builtin/add.c:363

1903 msgid "add changes from all tracked and untracked files"

1904 msgstr ""

1905

1906 #. takes no arguments

1747 -#: builtin/add.c:406

1907 +#: builtin/add.c:366

1908 msgid "ignore paths removed in the working tree (same as --no-all)"

1909 msgstr ""

1910

1751 -#: builtin/add.c:408

1911 +#: builtin/add.c:368

1912 msgid "don't add, only refresh the index"

1913 msgstr ""

1914

1755 -#: builtin/add.c:409

1915 +#: builtin/add.c:369

1916 msgid "just skip files which cannot be added because of errors"

1917 msgstr ""

1918

1759 -#: builtin/add.c:410

1919 +#: builtin/add.c:370

1920 msgid "check if - even missing - files are ignored in dry run"

1921 msgstr ""

1922

1763 -#: builtin/add.c:432

1923 +#: builtin/add.c:392

1924 #, c-format

1925 msgid "Use -f if you really want to add them.\n"

1926 msgstr ""

1927

1768 -#: builtin/add.c:433

1928 +#: builtin/add.c:393

1929 msgid "no files added"

1930 msgstr ""

1931

1772 -#: builtin/add.c:439

1932 +#: builtin/add.c:399

1933 msgid "adding files failed"

1934 msgstr ""

1935

1776 -#: builtin/add.c:478

1936 +#: builtin/add.c:438

1937 msgid "-A and -u are mutually incompatible"

1938 msgstr ""

1939

1780 -#: builtin/add.c:496

1940 +#: builtin/add.c:456

1941 msgid "Option --ignore-missing can only be used together with --dry-run"

1942 msgstr ""

1943

1784 -#: builtin/add.c:526

1944 +#: builtin/add.c:486

1945 #, c-format

1946 msgid "Nothing specified, nothing added.\n"

1947 msgstr ""

1948

1789 -#: builtin/add.c:527

1949 +#: builtin/add.c:487

1950 #, c-format

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

1952 msgstr ""

1953

1794 -#: builtin/add.c:533 builtin/check-ignore.c:161 builtin/clean.c:919

1795 -#: builtin/commit.c:312 builtin/mv.c:82 builtin/rm.c:297

1954 +#: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919

1955 +#: builtin/commit.c:320 builtin/mv.c:86 builtin/reset.c:224 builtin/rm.c:299

1956 msgid "index file corrupt"

1957 msgstr ""

1958

1799 -#: builtin/add.c:605 builtin/apply.c:4506 builtin/mv.c:229 builtin/rm.c:432

1959 +#: builtin/add.c:589 builtin/apply.c:4506 builtin/mv.c:259 builtin/rm.c:432

1960 msgid "Unable to write new index file"

1961 msgstr ""

1962

@@ -2042,7 +2202,7 @@ msgstr ""

2202 msgid "Checking patch %s..."

2203 msgstr ""

2204

2045 -#: builtin/apply.c:3680 builtin/checkout.c:216 builtin/reset.c:127

2205 +#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:127

2206 #, c-format

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

2208 msgstr ""

@@ -2122,8 +2282,8 @@ msgstr ""

2282 msgid "unable to read index file"

2283 msgstr ""

2284

2125 -#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:91

2126 -#: builtin/fetch.c:63

2285 +#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90

2286 +#: builtin/fetch.c:77

2287 msgid "path"

2288 msgstr ""

2289

@@ -2183,7 +2343,7 @@ msgstr ""

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

2344 msgstr ""

2345

2186 -#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:462

2346 +#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:452

2347 msgid "paths are separated with NUL character"

2348 msgstr ""

2349

@@ -2313,103 +2473,103 @@ msgstr ""

2473 msgid "update BISECT_HEAD instead of checking out the current commit"

2474 msgstr ""

2475

2316 -#: builtin/blame.c:26

2476 +#: builtin/blame.c:27

2477 msgid "git blame [options] [rev-opts] [rev] [--] file"

2478 msgstr ""

2479

2320 -#: builtin/blame.c:31

2480 +#: builtin/blame.c:32

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

2482 msgstr ""

2483

2324 -#: builtin/blame.c:2276

2484 +#: builtin/blame.c:2248

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

2486 msgstr ""

2487

2328 -#: builtin/blame.c:2277

2488 +#: builtin/blame.c:2249

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

2490 msgstr ""

2491

2332 -#: builtin/blame.c:2278

2492 +#: builtin/blame.c:2250

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

2494 msgstr ""

2495

2336 -#: builtin/blame.c:2279

2496 +#: builtin/blame.c:2251

2497 msgid "Show work cost statistics"

2498 msgstr ""

2499

2340 -#: builtin/blame.c:2280

2500 +#: builtin/blame.c:2252

2501 msgid "Show output score for blame entries"

2502 msgstr ""

2503

2344 -#: builtin/blame.c:2281

2504 +#: builtin/blame.c:2253

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

2506 msgstr ""

2507

2348 -#: builtin/blame.c:2282

2508 +#: builtin/blame.c:2254

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

2510 msgstr ""

2511

2352 -#: builtin/blame.c:2283

2512 +#: builtin/blame.c:2255

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

2514 msgstr ""

2515

2356 -#: builtin/blame.c:2284

2516 +#: builtin/blame.c:2256

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

2518 msgstr ""

2519

2360 -#: builtin/blame.c:2285

2520 +#: builtin/blame.c:2257

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

2522 msgstr ""

2523

2364 -#: builtin/blame.c:2286

2524 +#: builtin/blame.c:2258

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

2526 msgstr ""

2527

2368 -#: builtin/blame.c:2287

2528 +#: builtin/blame.c:2259

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

2530 msgstr ""

2531

2372 -#: builtin/blame.c:2288

2532 +#: builtin/blame.c:2260

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

2534 msgstr ""

2535

2376 -#: builtin/blame.c:2289

2536 +#: builtin/blame.c:2261

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

2538 msgstr ""

2539

2380 -#: builtin/blame.c:2290

2540 +#: builtin/blame.c:2262

2541 msgid "Ignore whitespace differences"

2542 msgstr ""

2543

2384 -#: builtin/blame.c:2291

2544 +#: builtin/blame.c:2263

2545 msgid "Spend extra cycles to find better match"

2546 msgstr ""

2547

2388 -#: builtin/blame.c:2292

2548 +#: builtin/blame.c:2264

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

2550 msgstr ""

2551

2392 -#: builtin/blame.c:2293

2552 +#: builtin/blame.c:2265

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

2554 msgstr ""

2555

2396 -#: builtin/blame.c:2294 builtin/blame.c:2295

2556 +#: builtin/blame.c:2266 builtin/blame.c:2267

2557 msgid "score"

2558 msgstr ""

2559

2400 -#: builtin/blame.c:2294

2560 +#: builtin/blame.c:2266

2561 msgid "Find line copies within and across files"

2562 msgstr ""

2563

2404 -#: builtin/blame.c:2295

2564 +#: builtin/blame.c:2267

2565 msgid "Find line movements within and across files"

2566 msgstr ""

2567

2408 -#: builtin/blame.c:2296

2568 +#: builtin/blame.c:2268

2569 msgid "n,m"

2570 msgstr ""

2571

2412 -#: builtin/blame.c:2296

2572 +#: builtin/blame.c:2268

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

2574 msgstr ""

2575

@@ -2509,280 +2669,290 @@ msgstr ""

2669

2670 #: builtin/branch.c:453

2671 #, c-format

2672 +msgid "[%s: gone]"

2673 +msgstr ""

2674 +

2675 +#: builtin/branch.c:456

2676 +#, c-format

2677 +msgid "[%s]"

2678 +msgstr ""

2679 +

2680 +#: builtin/branch.c:459

2681 +#, c-format

2682 msgid "[%s: behind %d]"

2683 msgstr ""

2684

2515 -#: builtin/branch.c:455

2685 +#: builtin/branch.c:461

2686 #, c-format

2687 msgid "[behind %d]"

2688 msgstr ""

2689

2520 -#: builtin/branch.c:459

2690 +#: builtin/branch.c:465

2691 #, c-format

2692 msgid "[%s: ahead %d]"

2693 msgstr ""

2694

2525 -#: builtin/branch.c:461

2695 +#: builtin/branch.c:467

2696 #, c-format

2697 msgid "[ahead %d]"

2698 msgstr ""

2699

2530 -#: builtin/branch.c:464

2700 +#: builtin/branch.c:470

2701 #, c-format

2702 msgid "[%s: ahead %d, behind %d]"

2703 msgstr ""

2704

2535 -#: builtin/branch.c:467

2705 +#: builtin/branch.c:473

2706 #, c-format

2707 msgid "[ahead %d, behind %d]"

2708 msgstr ""

2709

2540 -#: builtin/branch.c:490

2710 +#: builtin/branch.c:496

2711 msgid " **** invalid ref ****"

2712 msgstr ""

2713

2544 -#: builtin/branch.c:582

2714 +#: builtin/branch.c:588

2715 #, c-format

2716 msgid "(no branch, rebasing %s)"

2717 msgstr ""

2718

2549 -#: builtin/branch.c:585

2719 +#: builtin/branch.c:591

2720 #, c-format

2721 msgid "(no branch, bisect started on %s)"

2722 msgstr ""

2723

2554 -#: builtin/branch.c:588

2724 +#: builtin/branch.c:594

2725 #, c-format

2726 msgid "(detached from %s)"

2727 msgstr ""

2728

2559 -#: builtin/branch.c:591

2729 +#: builtin/branch.c:597

2730 msgid "(no branch)"

2731 msgstr ""

2732

2563 -#: builtin/branch.c:637

2733 +#: builtin/branch.c:643

2734 #, c-format

2735 msgid "object '%s' does not point to a commit"

2736 msgstr ""

2737

2568 -#: builtin/branch.c:669

2738 +#: builtin/branch.c:675

2739 msgid "some refs could not be read"

2740 msgstr ""

2741

2572 -#: builtin/branch.c:682

2742 +#: builtin/branch.c:688

2743 msgid "cannot rename the current branch while not on any."

2744 msgstr ""

2745

2576 -#: builtin/branch.c:692

2746 +#: builtin/branch.c:698

2747 #, c-format

2748 msgid "Invalid branch name: '%s'"

2749 msgstr ""

2750

2581 -#: builtin/branch.c:707

2751 +#: builtin/branch.c:713

2752 msgid "Branch rename failed"

2753 msgstr ""

2754

2585 -#: builtin/branch.c:711

2755 +#: builtin/branch.c:717

2756 #, c-format

2757 msgid "Renamed a misnamed branch '%s' away"

2758 msgstr ""

2759

2590 -#: builtin/branch.c:715

2760 +#: builtin/branch.c:721

2761 #, c-format

2762 msgid "Branch renamed to %s, but HEAD is not updated!"

2763 msgstr ""

2764

2595 -#: builtin/branch.c:722

2765 +#: builtin/branch.c:728

2766 msgid "Branch is renamed, but update of config-file failed"

2767 msgstr ""

2768

2599 -#: builtin/branch.c:737

2769 +#: builtin/branch.c:743

2770 #, c-format

2771 msgid "malformed object name %s"

2772 msgstr ""

2773

2604 -#: builtin/branch.c:761

2774 +#: builtin/branch.c:767

2775 #, c-format

2776 msgid "could not write branch description template: %s"

2777 msgstr ""

2778

2609 -#: builtin/branch.c:791

2779 +#: builtin/branch.c:797

2780 msgid "Generic options"

2781 msgstr ""

2782

2613 -#: builtin/branch.c:793

2783 +#: builtin/branch.c:799

2784 msgid "show hash and subject, give twice for upstream branch"

2785 msgstr ""

2786

2617 -#: builtin/branch.c:794

2787 +#: builtin/branch.c:800

2788 msgid "suppress informational messages"

2789 msgstr ""

2790

2621 -#: builtin/branch.c:795

2791 +#: builtin/branch.c:801

2792 msgid "set up tracking mode (see git-pull(1))"

2793 msgstr ""

2794

2625 -#: builtin/branch.c:797

2795 +#: builtin/branch.c:803

2796 msgid "change upstream info"

2797 msgstr ""

2798

2629 -#: builtin/branch.c:801

2799 +#: builtin/branch.c:807

2800 msgid "use colored output"

2801 msgstr ""

2802

2633 -#: builtin/branch.c:802

2803 +#: builtin/branch.c:808

2804 msgid "act on remote-tracking branches"

2805 msgstr ""

2806

2637 -#: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832

2638 -#: builtin/branch.c:838 builtin/commit.c:1433 builtin/commit.c:1434

2639 -#: builtin/commit.c:1435 builtin/commit.c:1436 builtin/tag.c:468

2807 +#: builtin/branch.c:811 builtin/branch.c:817 builtin/branch.c:838

2808 +#: builtin/branch.c:844 builtin/commit.c:1460 builtin/commit.c:1461

2809 +#: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468

2810 msgid "commit"

2811 msgstr ""

2812

2643 -#: builtin/branch.c:806 builtin/branch.c:812

2813 +#: builtin/branch.c:812 builtin/branch.c:818

2814 msgid "print only branches that contain the commit"

2815 msgstr ""

2816

2647 -#: builtin/branch.c:818

2817 +#: builtin/branch.c:824

2818 msgid "Specific git-branch actions:"

2819 msgstr ""

2820

2651 -#: builtin/branch.c:819

2821 +#: builtin/branch.c:825

2822 msgid "list both remote-tracking and local branches"

2823 msgstr ""

2824

2655 -#: builtin/branch.c:821

2825 +#: builtin/branch.c:827

2826 msgid "delete fully merged branch"

2827 msgstr ""

2828

2659 -#: builtin/branch.c:822

2829 +#: builtin/branch.c:828

2830 msgid "delete branch (even if not merged)"

2831 msgstr ""

2832

2663 -#: builtin/branch.c:823

2833 +#: builtin/branch.c:829

2834 msgid "move/rename a branch and its reflog"

2835 msgstr ""

2836

2667 -#: builtin/branch.c:824

2837 +#: builtin/branch.c:830

2838 msgid "move/rename a branch, even if target exists"

2839 msgstr ""

2840

2671 -#: builtin/branch.c:825

2841 +#: builtin/branch.c:831

2842 msgid "list branch names"

2843 msgstr ""

2844

2675 -#: builtin/branch.c:826

2845 +#: builtin/branch.c:832

2846 msgid "create the branch's reflog"

2847 msgstr ""

2848

2679 -#: builtin/branch.c:828

2849 +#: builtin/branch.c:834

2850 msgid "edit the description for the branch"

2851 msgstr ""

2852

2683 -#: builtin/branch.c:829

2853 +#: builtin/branch.c:835

2854 msgid "force creation (when already exists)"

2855 msgstr ""

2856

2687 -#: builtin/branch.c:832

2857 +#: builtin/branch.c:838

2858 msgid "print only not merged branches"

2859 msgstr ""

2860

2691 -#: builtin/branch.c:838

2861 +#: builtin/branch.c:844

2862 msgid "print only merged branches"

2863 msgstr ""

2864

2695 -#: builtin/branch.c:842

2865 +#: builtin/branch.c:848

2866 msgid "list branches in columns"

2867 msgstr ""

2868

2699 -#: builtin/branch.c:855

2869 +#: builtin/branch.c:861

2870 msgid "Failed to resolve HEAD as a valid ref."

2871 msgstr ""

2872

2703 -#: builtin/branch.c:860 builtin/clone.c:630

2873 +#: builtin/branch.c:866 builtin/clone.c:629

2874 msgid "HEAD not found below refs/heads!"

2875 msgstr ""

2876

2707 -#: builtin/branch.c:883

2877 +#: builtin/branch.c:890

2878 msgid "--column and --verbose are incompatible"

2879 msgstr ""

2880

2711 -#: builtin/branch.c:889 builtin/branch.c:928

2881 +#: builtin/branch.c:896 builtin/branch.c:935

2882 msgid "branch name required"

2883 msgstr ""

2884

2715 -#: builtin/branch.c:904

2885 +#: builtin/branch.c:911

2886 msgid "Cannot give description to detached HEAD"

2887 msgstr ""

2888

2719 -#: builtin/branch.c:909

2889 +#: builtin/branch.c:916

2890 msgid "cannot edit description of more than one branch"

2891 msgstr ""

2892

2723 -#: builtin/branch.c:916

2893 +#: builtin/branch.c:923

2894 #, c-format

2895 msgid "No commit on branch '%s' yet."

2896 msgstr ""

2897

2728 -#: builtin/branch.c:919

2898 +#: builtin/branch.c:926

2899 #, c-format

2900 msgid "No branch named '%s'."

2901 msgstr ""

2902

2733 -#: builtin/branch.c:934

2903 +#: builtin/branch.c:941

2904 msgid "too many branches for a rename operation"

2905 msgstr ""

2906

2737 -#: builtin/branch.c:939

2907 +#: builtin/branch.c:946

2908 msgid "too many branches to set new upstream"

2909 msgstr ""

2910

2741 -#: builtin/branch.c:943

2911 +#: builtin/branch.c:950

2912 #, c-format

2913 msgid ""

2914 "could not set upstream of HEAD to %s when it does not point to any branch."

2915 msgstr ""

2916

2747 -#: builtin/branch.c:946 builtin/branch.c:968 builtin/branch.c:990

2917 +#: builtin/branch.c:953 builtin/branch.c:975 builtin/branch.c:997

2918 #, c-format

2919 msgid "no such branch '%s'"

2920 msgstr ""

2921

2752 -#: builtin/branch.c:950

2922 +#: builtin/branch.c:957

2923 #, c-format

2924 msgid "branch '%s' does not exist"

2925 msgstr ""

2926

2757 -#: builtin/branch.c:962

2927 +#: builtin/branch.c:969

2928 msgid "too many branches to unset upstream"

2929 msgstr ""

2930

2761 -#: builtin/branch.c:966

2931 +#: builtin/branch.c:973

2932 msgid "could not unset upstream of HEAD when it does not point to any branch."

2933 msgstr ""

2934

2765 -#: builtin/branch.c:972

2935 +#: builtin/branch.c:979

2936 #, c-format

2937 msgid "Branch '%s' has no upstream information"

2938 msgstr ""

2939

2770 -#: builtin/branch.c:987

2940 +#: builtin/branch.c:994

2941 msgid "it does not make sense to create 'HEAD' manually"

2942 msgstr ""

2943

2774 -#: builtin/branch.c:993

2944 +#: builtin/branch.c:1000

2945 msgid "-a and -r options to 'git branch' do not make sense with a branch name"

2946 msgstr ""

2947

2778 -#: builtin/branch.c:996

2948 +#: builtin/branch.c:1003

2949 #, c-format

2950 msgid ""

2951 "The --set-upstream flag is deprecated and will be removed. Consider using --"

2952 "track or --set-upstream-to\n"

2953 msgstr ""

2954

2785 -#: builtin/branch.c:1013

2955 +#: builtin/branch.c:1020

2956 #, c-format

2957 msgid ""

2958 "\n"

@@ -2790,12 +2960,12 @@ msgid ""

2960 "\n"

2961 msgstr ""

2962

2793 -#: builtin/branch.c:1014

2963 +#: builtin/branch.c:1021

2964 #, c-format

2965 msgid " git branch -d %s\n"

2966 msgstr ""

2967

2798 -#: builtin/branch.c:1015

2968 +#: builtin/branch.c:1022

2969 #, c-format

2970 msgid " git branch --set-upstream-to %s\n"

2971 msgstr ""

@@ -2813,43 +2983,43 @@ msgstr ""

2983 msgid "Need a repository to unbundle."

2984 msgstr ""

2985

2816 -#: builtin/cat-file.c:285

2986 +#: builtin/cat-file.c:312

2987 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"

2988 msgstr ""

2989

2820 -#: builtin/cat-file.c:286

2990 +#: builtin/cat-file.c:313

2991 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"

2992 msgstr ""

2993

2824 -#: builtin/cat-file.c:323

2994 +#: builtin/cat-file.c:350

2995 msgid "<type> can be one of: blob, tree, commit, tag"

2996 msgstr ""

2997

2828 -#: builtin/cat-file.c:324

2998 +#: builtin/cat-file.c:351

2999 msgid "show object type"

3000 msgstr ""

3001

2832 -#: builtin/cat-file.c:325

3002 +#: builtin/cat-file.c:352

3003 msgid "show object size"

3004 msgstr ""

3005

2836 -#: builtin/cat-file.c:327

3006 +#: builtin/cat-file.c:354

3007 msgid "exit with zero when there's no error"

3008 msgstr ""

3009

2840 -#: builtin/cat-file.c:328

3010 +#: builtin/cat-file.c:355

3011 msgid "pretty-print object's content"

3012 msgstr ""

3013

2844 -#: builtin/cat-file.c:330

3014 +#: builtin/cat-file.c:357

3015 msgid "for blob objects, run textconv on object's content"

3016 msgstr ""

3017

2848 -#: builtin/cat-file.c:332

3018 +#: builtin/cat-file.c:359

3019 msgid "show info and content of objects fed from the standard input"

3020 msgstr ""

3021

2852 -#: builtin/cat-file.c:335

3022 +#: builtin/cat-file.c:362

3023 msgid "show info about objects fed from the standard input"

3024 msgstr ""

3025

@@ -2874,10 +3044,10 @@ msgid "read file names from stdin"

3044 msgstr ""

3045

3046 #: builtin/check-attr.c:23 builtin/check-ignore.c:24

2877 -msgid "input paths are terminated by a null character"

3047 +msgid "terminate input and output records by a NUL character"

3048 msgstr ""

3049

2880 -#: builtin/check-ignore.c:18 builtin/checkout.c:1054 builtin/gc.c:177

3050 +#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:259

3051 msgid "suppress progress reporting"

3052 msgstr ""

3053

@@ -2885,27 +3055,31 @@ msgstr ""

3055 msgid "show non-matching input paths"

3056 msgstr ""

3057

2888 -#: builtin/check-ignore.c:143

3058 +#: builtin/check-ignore.c:28

3059 +msgid "ignore index when checking"

3060 +msgstr ""

3061 +

3062 +#: builtin/check-ignore.c:154

3063 msgid "cannot specify pathnames with --stdin"

3064 msgstr ""

3065

2892 -#: builtin/check-ignore.c:146

3066 +#: builtin/check-ignore.c:157

3067 msgid "-z only makes sense with --stdin"

3068 msgstr ""

3069

2896 -#: builtin/check-ignore.c:148

3070 +#: builtin/check-ignore.c:159

3071 msgid "no path specified"

3072 msgstr ""

3073

2900 -#: builtin/check-ignore.c:152

3074 +#: builtin/check-ignore.c:163

3075 msgid "--quiet is only valid with a single pathname"

3076 msgstr ""

3077

2904 -#: builtin/check-ignore.c:154

3078 +#: builtin/check-ignore.c:165

3079 msgid "cannot have both --quiet and --verbose"

3080 msgstr ""

3081

2908 -#: builtin/check-ignore.c:157

3082 +#: builtin/check-ignore.c:168

3083 msgid "--non-matching is only valid with --verbose"

3084 msgstr ""

3085

@@ -2978,106 +3152,106 @@ msgstr ""

3152 msgid "git checkout [options] [<branch>] -- <file>..."

3153 msgstr ""

3154

2981 -#: builtin/checkout.c:117 builtin/checkout.c:150

3155 +#: builtin/checkout.c:114 builtin/checkout.c:147

3156 #, c-format

3157 msgid "path '%s' does not have our version"

3158 msgstr ""

3159

2986 -#: builtin/checkout.c:119 builtin/checkout.c:152

3160 +#: builtin/checkout.c:116 builtin/checkout.c:149

3161 #, c-format

3162 msgid "path '%s' does not have their version"

3163 msgstr ""

3164

2991 -#: builtin/checkout.c:135

3165 +#: builtin/checkout.c:132

3166 #, c-format

3167 msgid "path '%s' does not have all necessary versions"

3168 msgstr ""

3169

2996 -#: builtin/checkout.c:179

3170 +#: builtin/checkout.c:176

3171 #, c-format

3172 msgid "path '%s' does not have necessary versions"

3173 msgstr ""

3174

3001 -#: builtin/checkout.c:196

3175 +#: builtin/checkout.c:193

3176 #, c-format

3177 msgid "path '%s': cannot merge"

3178 msgstr ""

3179

3006 -#: builtin/checkout.c:213

3180 +#: builtin/checkout.c:210

3181 #, c-format

3182 msgid "Unable to add merge result for '%s'"

3183 msgstr ""

3184

3011 -#: builtin/checkout.c:237 builtin/checkout.c:240 builtin/checkout.c:243

3012 -#: builtin/checkout.c:246

3185 +#: builtin/checkout.c:232 builtin/checkout.c:235 builtin/checkout.c:238

3186 +#: builtin/checkout.c:241

3187 #, c-format

3188 msgid "'%s' cannot be used with updating paths"

3189 msgstr ""

3190

3017 -#: builtin/checkout.c:249 builtin/checkout.c:252

3191 +#: builtin/checkout.c:244 builtin/checkout.c:247

3192 #, c-format

3193 msgid "'%s' cannot be used with %s"

3194 msgstr ""

3195

3022 -#: builtin/checkout.c:255

3196 +#: builtin/checkout.c:250

3197 #, c-format

3198 msgid "Cannot update paths and switch to branch '%s' at the same time."

3199 msgstr ""

3200

3027 -#: builtin/checkout.c:266 builtin/checkout.c:458

3201 +#: builtin/checkout.c:261 builtin/checkout.c:451

3202 msgid "corrupt index file"

3203 msgstr ""

3204

3031 -#: builtin/checkout.c:329 builtin/checkout.c:336

3205 +#: builtin/checkout.c:322 builtin/checkout.c:329

3206 #, c-format

3207 msgid "path '%s' is unmerged"

3208 msgstr ""

3209

3036 -#: builtin/checkout.c:480

3210 +#: builtin/checkout.c:473

3211 msgid "you need to resolve your current index first"

3212 msgstr ""

3213

3040 -#: builtin/checkout.c:601

3214 +#: builtin/checkout.c:594

3215 #, c-format

3216 msgid "Can not do reflog for '%s'\n"

3217 msgstr ""

3218

3045 -#: builtin/checkout.c:639

3219 +#: builtin/checkout.c:632

3220 msgid "HEAD is now at"

3221 msgstr ""

3222

3049 -#: builtin/checkout.c:646

3223 +#: builtin/checkout.c:639

3224 #, c-format

3225 msgid "Reset branch '%s'\n"

3226 msgstr ""

3227

3054 -#: builtin/checkout.c:649

3228 +#: builtin/checkout.c:642

3229 #, c-format

3230 msgid "Already on '%s'\n"

3231 msgstr ""

3232

3059 -#: builtin/checkout.c:653

3233 +#: builtin/checkout.c:646

3234 #, c-format

3235 msgid "Switched to and reset branch '%s'\n"

3236 msgstr ""

3237

3064 -#: builtin/checkout.c:655 builtin/checkout.c:997

3238 +#: builtin/checkout.c:648 builtin/checkout.c:1033

3239 #, c-format

3240 msgid "Switched to a new branch '%s'\n"

3241 msgstr ""

3242

3069 -#: builtin/checkout.c:657

3243 +#: builtin/checkout.c:650

3244 #, c-format

3245 msgid "Switched to branch '%s'\n"

3246 msgstr ""

3247

3074 -#: builtin/checkout.c:713

3248 +#: builtin/checkout.c:706

3249 #, c-format

3250 msgid " ... and %d more.\n"

3251 msgstr ""

3252

3253 #. The singular version

3080 -#: builtin/checkout.c:719

3254 +#: builtin/checkout.c:712

3255 #, c-format

3256 msgid ""

3257 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -3092,7 +3266,7 @@ msgid_plural ""

3266 msgstr[0] ""

3267 msgstr[1] ""

3268

3095 -#: builtin/checkout.c:737

3269 +#: builtin/checkout.c:730

3270 #, c-format

3271 msgid ""

3272 "If you want to keep them by creating a new branch, this may be a good time\n"

@@ -3102,184 +3276,188 @@ msgid ""

3276 "\n"

3277 msgstr ""

3278

3105 -#: builtin/checkout.c:767

3279 +#: builtin/checkout.c:760

3280 msgid "internal error in revision walk"

3281 msgstr ""

3282

3109 -#: builtin/checkout.c:771

3283 +#: builtin/checkout.c:764

3284 msgid "Previous HEAD position was"

3285 msgstr ""

3286

3113 -#: builtin/checkout.c:798 builtin/checkout.c:992

3287 +#: builtin/checkout.c:791 builtin/checkout.c:1028

3288 msgid "You are on a branch yet to be born"

3289 msgstr ""

3290

3117 -#. case (1)

3118 -#: builtin/checkout.c:928

3291 +#: builtin/checkout.c:935

3292 +#, c-format

3293 +msgid "only one reference expected, %d given."

3294 +msgstr ""

3295 +

3296 +#: builtin/checkout.c:974

3297 #, c-format

3298 msgid "invalid reference: %s"

3299 msgstr ""

3300

3301 #. case (1): want a tree

3124 -#: builtin/checkout.c:967

3302 +#: builtin/checkout.c:1003

3303 #, c-format

3304 msgid "reference is not a tree: %s"

3305 msgstr ""

3306

3129 -#: builtin/checkout.c:1006

3307 +#: builtin/checkout.c:1042

3308 msgid "paths cannot be used with switching branches"

3309 msgstr ""

3310

3133 -#: builtin/checkout.c:1009 builtin/checkout.c:1013

3311 +#: builtin/checkout.c:1045 builtin/checkout.c:1049

3312 #, c-format

3313 msgid "'%s' cannot be used with switching branches"

3314 msgstr ""

3315

3138 -#: builtin/checkout.c:1017 builtin/checkout.c:1020 builtin/checkout.c:1025

3139 -#: builtin/checkout.c:1028

3316 +#: builtin/checkout.c:1053 builtin/checkout.c:1056 builtin/checkout.c:1061

3317 +#: builtin/checkout.c:1064

3318 #, c-format

3319 msgid "'%s' cannot be used with '%s'"

3320 msgstr ""

3321

3144 -#: builtin/checkout.c:1033

3322 +#: builtin/checkout.c:1069

3323 #, c-format

3324 msgid "Cannot switch branch to a non-commit '%s'"

3325 msgstr ""

3326

3149 -#: builtin/checkout.c:1055 builtin/checkout.c:1057 builtin/clone.c:89

3327 +#: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88

3328 #: builtin/remote.c:169 builtin/remote.c:171

3329 msgid "branch"

3330 msgstr ""

3331

3154 -#: builtin/checkout.c:1056

3332 +#: builtin/checkout.c:1092

3333 msgid "create and checkout a new branch"

3334 msgstr ""

3335

3158 -#: builtin/checkout.c:1058

3336 +#: builtin/checkout.c:1094

3337 msgid "create/reset and checkout a branch"

3338 msgstr ""

3339

3162 -#: builtin/checkout.c:1059

3340 +#: builtin/checkout.c:1095

3341 msgid "create reflog for new branch"

3342 msgstr ""

3343

3166 -#: builtin/checkout.c:1060

3344 +#: builtin/checkout.c:1096

3345 msgid "detach the HEAD at named commit"

3346 msgstr ""

3347

3170 -#: builtin/checkout.c:1061

3348 +#: builtin/checkout.c:1097

3349 msgid "set upstream info for new branch"

3350 msgstr ""

3351

3174 -#: builtin/checkout.c:1063

3352 +#: builtin/checkout.c:1099

3353 msgid "new branch"

3354 msgstr ""

3355

3178 -#: builtin/checkout.c:1063

3356 +#: builtin/checkout.c:1099

3357 msgid "new unparented branch"

3358 msgstr ""

3359

3182 -#: builtin/checkout.c:1064

3360 +#: builtin/checkout.c:1100

3361 msgid "checkout our version for unmerged files"

3362 msgstr ""

3363

3186 -#: builtin/checkout.c:1066

3364 +#: builtin/checkout.c:1102

3365 msgid "checkout their version for unmerged files"

3366 msgstr ""

3367

3190 -#: builtin/checkout.c:1068

3368 +#: builtin/checkout.c:1104

3369 msgid "force checkout (throw away local modifications)"

3370 msgstr ""

3371

3194 -#: builtin/checkout.c:1069

3372 +#: builtin/checkout.c:1105

3373 msgid "perform a 3-way merge with the new branch"

3374 msgstr ""

3375

3198 -#: builtin/checkout.c:1070 builtin/merge.c:232

3376 +#: builtin/checkout.c:1106 builtin/merge.c:232

3377 msgid "update ignored files (default)"

3378 msgstr ""

3379

3202 -#: builtin/checkout.c:1071 builtin/log.c:1208 parse-options.h:249

3380 +#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:251

3381 msgid "style"

3382 msgstr ""

3383

3206 -#: builtin/checkout.c:1072

3384 +#: builtin/checkout.c:1108

3385 msgid "conflict style (merge or diff3)"

3386 msgstr ""

3387

3210 -#: builtin/checkout.c:1075

3388 +#: builtin/checkout.c:1111

3389 msgid "do not limit pathspecs to sparse entries only"

3390 msgstr ""

3391

3214 -#: builtin/checkout.c:1077

3392 +#: builtin/checkout.c:1113

3393 msgid "second guess 'git checkout no-such-branch'"

3394 msgstr ""

3395

3218 -#: builtin/checkout.c:1101

3396 +#: builtin/checkout.c:1136

3397 msgid "-b, -B and --orphan are mutually exclusive"

3398 msgstr ""

3399

3222 -#: builtin/checkout.c:1118

3400 +#: builtin/checkout.c:1153

3401 msgid "--track needs a branch name"

3402 msgstr ""

3403

3226 -#: builtin/checkout.c:1125

3404 +#: builtin/checkout.c:1160

3405 msgid "Missing branch name; try -b"

3406 msgstr ""

3407

3230 -#: builtin/checkout.c:1160

3408 +#: builtin/checkout.c:1197

3409 msgid "invalid path specification"

3410 msgstr ""

3411

3234 -#: builtin/checkout.c:1167

3412 +#: builtin/checkout.c:1204

3413 #, c-format

3414 msgid ""

3415 "Cannot update paths and switch to branch '%s' at the same time.\n"

3416 "Did you intend to checkout '%s' which can not be resolved as commit?"

3417 msgstr ""

3418

3241 -#: builtin/checkout.c:1172

3419 +#: builtin/checkout.c:1209

3420 #, c-format

3421 msgid "git checkout: --detach does not take a path argument '%s'"

3422 msgstr ""

3423

3246 -#: builtin/checkout.c:1176

3424 +#: builtin/checkout.c:1213

3425 msgid ""

3426 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

3427 "checking out of the index."

3428 msgstr ""

3429

3252 -#: builtin/clean.c:25

3430 +#: builtin/clean.c:26

3431 msgid ""

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

3433 msgstr ""

3434

3257 -#: builtin/clean.c:29

3435 +#: builtin/clean.c:30

3436 #, c-format

3437 msgid "Removing %s\n"

3438 msgstr ""

3439

3262 -#: builtin/clean.c:30

3440 +#: builtin/clean.c:31

3441 #, c-format

3442 msgid "Would remove %s\n"

3443 msgstr ""

3444

3267 -#: builtin/clean.c:31

3445 +#: builtin/clean.c:32

3446 #, c-format

3447 msgid "Skipping repository %s\n"

3448 msgstr ""

3449

3272 -#: builtin/clean.c:32

3450 +#: builtin/clean.c:33

3451 #, c-format

3452 msgid "Would skip repository %s\n"

3453 msgstr ""

3454

3277 -#: builtin/clean.c:33

3455 +#: builtin/clean.c:34

3456 #, c-format

3457 msgid "failed to remove %s"

3458 msgstr ""

3459

3282 -#: builtin/clean.c:293

3460 +#: builtin/clean.c:294

3461 msgid ""

3462 "Prompt help:\n"

3463 "1 - select a numbered item\n"

@@ -3287,7 +3465,7 @@ msgid ""

3465 " - (empty) select nothing"

3466 msgstr ""

3467

3290 -#: builtin/clean.c:297

3468 +#: builtin/clean.c:298

3469 msgid ""

3470 "Prompt help:\n"

3471 "1 - select a single item\n"

@@ -3299,35 +3477,35 @@ msgid ""

3477 " - (empty) finish selecting"

3478 msgstr ""

3479

3302 -#: builtin/clean.c:515

3480 +#: builtin/clean.c:516

3481 #, c-format

3482 msgid "Huh (%s)?"

3483 msgstr ""

3484

3307 -#: builtin/clean.c:658

3485 +#: builtin/clean.c:659

3486 #, c-format

3487 msgid "Input ignore patterns>> "

3488 msgstr ""

3489

3312 -#: builtin/clean.c:695

3490 +#: builtin/clean.c:696

3491 #, c-format

3492 msgid "WARNING: Cannot find items matched by: %s"

3493 msgstr ""

3494

3317 -#: builtin/clean.c:716

3495 +#: builtin/clean.c:717

3496 msgid "Select items to delete"

3497 msgstr ""

3498

3321 -#: builtin/clean.c:756

3499 +#: builtin/clean.c:757

3500 #, c-format

3501 msgid "remove %s? "

3502 msgstr ""

3503

3326 -#: builtin/clean.c:781

3504 +#: builtin/clean.c:782

3505 msgid "Bye."

3506 msgstr ""

3507

3330 -#: builtin/clean.c:789

3508 +#: builtin/clean.c:790

3509 msgid ""

3510 "clean - start cleaning\n"

3511 "filter by pattern - exclude items from deletion\n"

@@ -3338,21 +3516,21 @@ msgid ""

3516 "? - help for prompt selection"

3517 msgstr ""

3518

3341 -#: builtin/clean.c:816

3519 +#: builtin/clean.c:817

3520 msgid "*** Commands ***"

3521 msgstr ""

3522

3345 -#: builtin/clean.c:817

3523 +#: builtin/clean.c:818

3524 msgid "What now"

3525 msgstr ""

3526

3349 -#: builtin/clean.c:825

3527 +#: builtin/clean.c:826

3528 msgid "Would remove the following item:"

3529 msgid_plural "Would remove the following items:"

3530 msgstr[0] ""

3531 msgstr[1] ""

3532

3355 -#: builtin/clean.c:842

3533 +#: builtin/clean.c:843

3534 msgid "No more files to clean, exiting."

3535 msgstr ""

3536

@@ -3372,8 +3550,8 @@ msgstr ""

3550 msgid "remove whole directories"

3551 msgstr ""

3552

3375 -#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:716

3376 -#: builtin/ls-files.c:493 builtin/name-rev.c:315 builtin/show-ref.c:186

3553 +#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718

3554 +#: builtin/ls-files.c:483 builtin/name-rev.c:315 builtin/show-ref.c:185

3555 msgid "pattern"

3556 msgstr ""

3557

@@ -3409,8 +3587,8 @@ msgstr ""

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

3588 msgstr ""

3589

3412 -#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:229

3413 -#: builtin/push.c:462

3590 +#: builtin/clone.c:64 builtin/fetch.c:96 builtin/merge.c:229

3591 +#: builtin/push.c:474

3592 msgid "force progress reporting"

3593 msgstr ""

3594

@@ -3422,227 +3600,222 @@ msgstr ""

3600 msgid "create a bare repository"

3601 msgstr ""

3602

3425 -#: builtin/clone.c:72

3603 +#: builtin/clone.c:71

3604 msgid "create a mirror repository (implies bare)"

3605 msgstr ""

3606

3429 -#: builtin/clone.c:74

3607 +#: builtin/clone.c:73

3608 msgid "to clone from a local repository"

3609 msgstr ""

3610

3433 -#: builtin/clone.c:76

3611 +#: builtin/clone.c:75

3612 msgid "don't use local hardlinks, always copy"

3613 msgstr ""

3614

3437 -#: builtin/clone.c:78

3615 +#: builtin/clone.c:77

3616 msgid "setup as shared repository"

3617 msgstr ""

3618

3441 -#: builtin/clone.c:80 builtin/clone.c:82

3619 +#: builtin/clone.c:79 builtin/clone.c:81

3620 msgid "initialize submodules in the clone"

3621 msgstr ""

3622

3445 -#: builtin/clone.c:83 builtin/init-db.c:485

3623 +#: builtin/clone.c:82 builtin/init-db.c:485

3624 msgid "template-directory"

3625 msgstr ""

3626

3449 -#: builtin/clone.c:84 builtin/init-db.c:486

3627 +#: builtin/clone.c:83 builtin/init-db.c:486

3628 msgid "directory from which templates will be used"

3629 msgstr ""

3630

3453 -#: builtin/clone.c:86

3631 +#: builtin/clone.c:85

3632 msgid "reference repository"

3633 msgstr ""

3634

3457 -#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44

3635 +#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44

3636 msgid "name"

3637 msgstr ""

3638

3461 -#: builtin/clone.c:88

3639 +#: builtin/clone.c:87

3640 msgid "use <name> instead of 'origin' to track upstream"

3641 msgstr ""

3642

3465 -#: builtin/clone.c:90

3643 +#: builtin/clone.c:89

3644 msgid "checkout <branch> instead of the remote's HEAD"

3645 msgstr ""

3646

3469 -#: builtin/clone.c:92

3647 +#: builtin/clone.c:91

3648 msgid "path to git-upload-pack on the remote"

3649 msgstr ""

3650

3473 -#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:661

3651 +#: builtin/clone.c:92 builtin/fetch.c:97 builtin/grep.c:663

3652 msgid "depth"

3653 msgstr ""

3654

3477 -#: builtin/clone.c:94

3655 +#: builtin/clone.c:93

3656 msgid "create a shallow clone of that depth"

3657 msgstr ""

3658

3481 -#: builtin/clone.c:96

3659 +#: builtin/clone.c:95

3660 msgid "clone only one branch, HEAD or --branch"

3661 msgstr ""

3662

3485 -#: builtin/clone.c:97 builtin/init-db.c:494

3663 +#: builtin/clone.c:96 builtin/init-db.c:494

3664 msgid "gitdir"

3665 msgstr ""

3666

3489 -#: builtin/clone.c:98 builtin/init-db.c:495

3667 +#: builtin/clone.c:97 builtin/init-db.c:495

3668 msgid "separate git dir from working tree"

3669 msgstr ""

3670

3493 -#: builtin/clone.c:99

3671 +#: builtin/clone.c:98

3672 msgid "key=value"

3673 msgstr ""

3674

3497 -#: builtin/clone.c:100

3675 +#: builtin/clone.c:99

3676 msgid "set config inside the new repository"

3677 msgstr ""

3678

3501 -#: builtin/clone.c:253

3679 +#: builtin/clone.c:252

3680 #, c-format

3681 msgid "reference repository '%s' is not a local repository."

3682 msgstr ""

3683

3506 -#: builtin/clone.c:316

3684 +#: builtin/clone.c:315

3685 #, c-format

3686 msgid "failed to create directory '%s'"

3687 msgstr ""

3688

3511 -#: builtin/clone.c:318 builtin/diff.c:77

3689 +#: builtin/clone.c:317 builtin/diff.c:77

3690 #, c-format

3691 msgid "failed to stat '%s'"

3692 msgstr ""

3693

3516 -#: builtin/clone.c:320

3694 +#: builtin/clone.c:319

3695 #, c-format

3696 msgid "%s exists and is not a directory"

3697 msgstr ""

3698

3521 -#: builtin/clone.c:334

3699 +#: builtin/clone.c:333

3700 #, c-format

3701 msgid "failed to stat %s\n"

3702 msgstr ""

3703

3526 -#: builtin/clone.c:356

3704 +#: builtin/clone.c:355

3705 #, c-format

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

3707 msgstr ""

3708

3531 -#: builtin/clone.c:360

3709 +#: builtin/clone.c:359

3710 #, c-format

3711 msgid "failed to copy file to '%s'"

3712 msgstr ""

3713

3536 -#: builtin/clone.c:383

3714 +#: builtin/clone.c:382 builtin/clone.c:559

3715 #, c-format

3716 msgid "done.\n"

3717 msgstr ""

3718

3541 -#: builtin/clone.c:396

3719 +#: builtin/clone.c:395

3720 msgid ""

3721 "Clone succeeded, but checkout failed.\n"

3722 "You can inspect what was checked out with 'git status'\n"

3723 "and retry the checkout with 'git checkout -f HEAD'\n"

3724 msgstr ""

3725

3548 -#: builtin/clone.c:475

3726 +#: builtin/clone.c:474

3727 #, c-format

3728 msgid "Could not find remote branch %s to clone."

3729 msgstr ""

3730

3553 -#: builtin/clone.c:555

3731 +#: builtin/clone.c:554

3732 #, c-format

3733 msgid "Checking connectivity... "

3734 msgstr ""

3735

3558 -#: builtin/clone.c:558

3736 +#: builtin/clone.c:557

3737 msgid "remote did not send all necessary objects"

3738 msgstr ""

3739

3562 -#: builtin/clone.c:560

3563 -#, c-format

3564 -msgid "done\n"

3565 -msgstr ""

3566 -

3567 -#: builtin/clone.c:621

3740 +#: builtin/clone.c:620

3741 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

3742 msgstr ""

3743

3571 -#: builtin/clone.c:652

3744 +#: builtin/clone.c:651

3745 msgid "unable to checkout working tree"

3746 msgstr ""

3747

3575 -#: builtin/clone.c:760

3748 +#: builtin/clone.c:759

3749 msgid "Too many arguments."

3750 msgstr ""

3751

3579 -#: builtin/clone.c:764

3752 +#: builtin/clone.c:763

3753 msgid "You must specify a repository to clone."

3754 msgstr ""

3755

3583 -#: builtin/clone.c:775

3756 +#: builtin/clone.c:774

3757 #, c-format

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

3759 msgstr ""

3760

3588 -#: builtin/clone.c:778

3761 +#: builtin/clone.c:777

3762 msgid "--bare and --separate-git-dir are incompatible."

3763 msgstr ""

3764

3592 -#: builtin/clone.c:791

3765 +#: builtin/clone.c:790

3766 #, c-format

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

3768 msgstr ""

3769

3597 -#: builtin/clone.c:796

3770 +#: builtin/clone.c:795

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

3772 msgstr ""

3773

3601 -#: builtin/clone.c:798

3774 +#: builtin/clone.c:797

3775 msgid "--local is ignored"

3776 msgstr ""

3777

3605 -#: builtin/clone.c:808

3778 +#: builtin/clone.c:807

3779 #, c-format

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

3781 msgstr ""

3782

3610 -#: builtin/clone.c:818

3783 +#: builtin/clone.c:817

3784 #, c-format

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

3786 msgstr ""

3787

3615 -#: builtin/clone.c:831 builtin/clone.c:843

3788 +#: builtin/clone.c:830 builtin/clone.c:842

3789 #, c-format

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

3791 msgstr ""

3792

3620 -#: builtin/clone.c:834

3793 +#: builtin/clone.c:833

3794 #, c-format

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

3796 msgstr ""

3797

3625 -#: builtin/clone.c:853

3798 +#: builtin/clone.c:852

3799 #, c-format

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

3801 msgstr ""

3802

3630 -#: builtin/clone.c:855

3803 +#: builtin/clone.c:854

3804 #, c-format

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

3806 msgstr ""

3807

3635 -#: builtin/clone.c:890

3808 +#: builtin/clone.c:888

3809 #, c-format

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

3811 msgstr ""

3812

3640 -#: builtin/clone.c:942

3813 +#: builtin/clone.c:939 builtin/clone.c:947

3814 #, c-format

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

3816 msgstr ""

3817

3645 -#: builtin/clone.c:949

3818 +#: builtin/clone.c:950

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

3820 msgstr ""

3821

@@ -3678,15 +3851,15 @@ msgstr ""

3851 msgid "--command must be the first argument"

3852 msgstr ""

3853

3681 -#: builtin/commit.c:35

3854 +#: builtin/commit.c:36

3855 msgid "git commit [options] [--] <pathspec>..."

3856 msgstr ""

3857

3685 -#: builtin/commit.c:40

3858 +#: builtin/commit.c:41

3859 msgid "git status [options] [--] <pathspec>..."

3860 msgstr ""

3861

3689 -#: builtin/commit.c:45

3862 +#: builtin/commit.c:46

3863 msgid ""

3864 "Your name and email address were configured automatically based\n"

3865 "on your username and hostname. Please check that they are accurate.\n"

@@ -3700,14 +3873,14 @@ msgid ""

3873 " git commit --amend --reset-author\n"

3874 msgstr ""

3875

3703 -#: builtin/commit.c:57

3876 +#: builtin/commit.c:58

3877 msgid ""

3878 "You asked to amend the most recent commit, but doing so would make\n"

3879 "it empty. You can repeat your command with --allow-empty, or you can\n"

3880 "remove the commit entirely with \"git reset HEAD^\".\n"

3881 msgstr ""

3882

3710 -#: builtin/commit.c:62

3883 +#: builtin/commit.c:63

3884 msgid ""

3885 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"

3886 "If you wish to commit it anyway, use:\n"

@@ -3716,11 +3889,11 @@ msgid ""

3889 "\n"

3890 msgstr ""

3891

3719 -#: builtin/commit.c:69

3892 +#: builtin/commit.c:70

3893 msgid "Otherwise, please use 'git reset'\n"

3894 msgstr ""

3895

3723 -#: builtin/commit.c:72

3896 +#: builtin/commit.c:73

3897 msgid ""

3898 "If you wish to skip this commit, use:\n"

3899 "\n"

@@ -3730,93 +3903,93 @@ msgid ""

3903 "the remaining commits.\n"

3904 msgstr ""

3905

3733 -#: builtin/commit.c:279

3906 +#: builtin/commit.c:287

3907 msgid "failed to unpack HEAD tree object"

3908 msgstr ""

3909

3737 -#: builtin/commit.c:321

3910 +#: builtin/commit.c:329

3911 msgid "unable to create temporary index"

3912 msgstr ""

3913

3741 -#: builtin/commit.c:327

3914 +#: builtin/commit.c:335

3915 msgid "interactive add failed"

3916 msgstr ""

3917

3745 -#: builtin/commit.c:360 builtin/commit.c:381 builtin/commit.c:431

3918 +#: builtin/commit.c:368 builtin/commit.c:389 builtin/commit.c:439

3919 msgid "unable to write new_index file"

3920 msgstr ""

3921

3749 -#: builtin/commit.c:412

3922 +#: builtin/commit.c:420

3923 msgid "cannot do a partial commit during a merge."

3924 msgstr ""

3925

3753 -#: builtin/commit.c:414

3926 +#: builtin/commit.c:422

3927 msgid "cannot do a partial commit during a cherry-pick."

3928 msgstr ""

3929

3757 -#: builtin/commit.c:424

3930 +#: builtin/commit.c:432

3931 msgid "cannot read the index"

3932 msgstr ""

3933

3761 -#: builtin/commit.c:444

3934 +#: builtin/commit.c:452

3935 msgid "unable to write temporary index file"

3936 msgstr ""

3937

3765 -#: builtin/commit.c:535 builtin/commit.c:541

3938 +#: builtin/commit.c:543 builtin/commit.c:549

3939 #, c-format

3940 msgid "invalid commit: %s"

3941 msgstr ""

3942

3770 -#: builtin/commit.c:563

3943 +#: builtin/commit.c:571

3944 msgid "malformed --author parameter"

3945 msgstr ""

3946

3774 -#: builtin/commit.c:583

3947 +#: builtin/commit.c:591

3948 #, c-format

3949 msgid "Malformed ident string: '%s'"

3950 msgstr ""

3951

3779 -#: builtin/commit.c:621 builtin/commit.c:654 builtin/commit.c:982

3952 +#: builtin/commit.c:630 builtin/commit.c:663 builtin/commit.c:1007

3953 #, c-format

3954 msgid "could not lookup commit %s"

3955 msgstr ""

3956

3784 -#: builtin/commit.c:633 builtin/shortlog.c:271

3957 +#: builtin/commit.c:642 builtin/shortlog.c:273

3958 #, c-format

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

3960 msgstr ""

3961

3789 -#: builtin/commit.c:635

3962 +#: builtin/commit.c:644

3963 msgid "could not read log from standard input"

3964 msgstr ""

3965

3793 -#: builtin/commit.c:639

3966 +#: builtin/commit.c:648

3967 #, c-format

3968 msgid "could not read log file '%s'"

3969 msgstr ""

3970

3798 -#: builtin/commit.c:645

3971 +#: builtin/commit.c:654

3972 msgid "commit has empty message"

3973 msgstr ""

3974

3802 -#: builtin/commit.c:661

3975 +#: builtin/commit.c:670

3976 msgid "could not read MERGE_MSG"

3977 msgstr ""

3978

3806 -#: builtin/commit.c:665

3979 +#: builtin/commit.c:674

3980 msgid "could not read SQUASH_MSG"

3981 msgstr ""

3982

3810 -#: builtin/commit.c:669

3983 +#: builtin/commit.c:678

3984 #, c-format

3985 msgid "could not read '%s'"

3986 msgstr ""

3987

3815 -#: builtin/commit.c:730

3988 +#: builtin/commit.c:749

3989 msgid "could not write commit template"

3990 msgstr ""

3991

3819 -#: builtin/commit.c:741

3992 +#: builtin/commit.c:760

3993 #, c-format

3994 msgid ""

3995 "\n"

@@ -3826,7 +3999,7 @@ msgid ""

3999 "and try again.\n"

4000 msgstr ""

4001

3829 -#: builtin/commit.c:746

4002 +#: builtin/commit.c:765

4003 #, c-format

4004 msgid ""

4005 "\n"

@@ -3836,14 +4009,14 @@ msgid ""

4009 "and try again.\n"

4010 msgstr ""

4011

3839 -#: builtin/commit.c:758

4012 +#: builtin/commit.c:777

4013 #, c-format

4014 msgid ""

4015 "Please enter the commit message for your changes. Lines starting\n"

4016 "with '%c' will be ignored, and an empty message aborts the commit.\n"

4017 msgstr ""

4018

3846 -#: builtin/commit.c:763

4019 +#: builtin/commit.c:782

4020 #, c-format

4021 msgid ""

4022 "Please enter the commit message for your changes. Lines starting\n"

@@ -3851,478 +4024,482 @@ msgid ""

4024 "An empty message aborts the commit.\n"

4025 msgstr ""

4026

3854 -#: builtin/commit.c:776

4027 +#: builtin/commit.c:795

4028 #, c-format

4029 msgid "%sAuthor: %s"

4030 msgstr ""

4031

3859 -#: builtin/commit.c:783

4032 +#: builtin/commit.c:802

4033 #, c-format

4034 msgid "%sCommitter: %s"

4035 msgstr ""

4036

3864 -#: builtin/commit.c:803

4037 +#: builtin/commit.c:822

4038 msgid "Cannot read index"

4039 msgstr ""

4040

3868 -#: builtin/commit.c:845

4041 +#: builtin/commit.c:865

4042 msgid "Error building trees"

4043 msgstr ""

4044

3872 -#: builtin/commit.c:860 builtin/tag.c:359

4045 +#: builtin/commit.c:880 builtin/tag.c:359

4046 #, c-format

4047 msgid "Please supply the message using either -m or -F option.\n"

4048 msgstr ""

4049

3877 -#: builtin/commit.c:957

4050 +#: builtin/commit.c:982

4051 #, c-format

4052 msgid "No existing author found with '%s'"

4053 msgstr ""

4054

3882 -#: builtin/commit.c:972 builtin/commit.c:1208

4055 +#: builtin/commit.c:997 builtin/commit.c:1237

4056 #, c-format

4057 msgid "Invalid untracked files mode '%s'"

4058 msgstr ""

4059

3887 -#: builtin/commit.c:1009

4060 +#: builtin/commit.c:1034

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

4062 msgstr ""

4063

3891 -#: builtin/commit.c:1039

4064 +#: builtin/commit.c:1064

4065 msgid "Using both --reset-author and --author does not make sense"

4066 msgstr ""

4067

3895 -#: builtin/commit.c:1050

4068 +#: builtin/commit.c:1075

4069 msgid "You have nothing to amend."

4070 msgstr ""

4071

3899 -#: builtin/commit.c:1053

4072 +#: builtin/commit.c:1078

4073 msgid "You are in the middle of a merge -- cannot amend."

4074 msgstr ""

4075

3903 -#: builtin/commit.c:1055

4076 +#: builtin/commit.c:1080

4077 msgid "You are in the middle of a cherry-pick -- cannot amend."

4078 msgstr ""

4079

3907 -#: builtin/commit.c:1058

4080 +#: builtin/commit.c:1083

4081 msgid "Options --squash and --fixup cannot be used together"

4082 msgstr ""

4083

3911 -#: builtin/commit.c:1068

4084 +#: builtin/commit.c:1093

4085 msgid "Only one of -c/-C/-F/--fixup can be used."

4086 msgstr ""

4087

3915 -#: builtin/commit.c:1070

4088 +#: builtin/commit.c:1095

4089 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."

4090 msgstr ""

4091

3919 -#: builtin/commit.c:1078

4092 +#: builtin/commit.c:1103

4093 msgid "--reset-author can be used only with -C, -c or --amend."

4094 msgstr ""

4095

3923 -#: builtin/commit.c:1095

4096 +#: builtin/commit.c:1120

4097 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."

4098 msgstr ""

4099

3927 -#: builtin/commit.c:1097

4100 +#: builtin/commit.c:1122

4101 msgid "No paths with --include/--only does not make sense."

4102 msgstr ""

4103

3931 -#: builtin/commit.c:1099

4104 +#: builtin/commit.c:1124

4105 msgid "Clever... amending the last one with dirty index."

4106 msgstr ""

4107

3935 -#: builtin/commit.c:1101

4108 +#: builtin/commit.c:1126

4109 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."

4110 msgstr ""

4111

3939 -#: builtin/commit.c:1111 builtin/tag.c:575

4112 +#: builtin/commit.c:1136 builtin/tag.c:572

4113 #, c-format

4114 msgid "Invalid cleanup mode %s"

4115 msgstr ""

4116

3944 -#: builtin/commit.c:1116

4117 +#: builtin/commit.c:1141

4118 msgid "Paths with -a does not make sense."

4119 msgstr ""

4120

3948 -#: builtin/commit.c:1222 builtin/commit.c:1455

4121 +#: builtin/commit.c:1251 builtin/commit.c:1482

4122 msgid "show status concisely"

4123 msgstr ""

4124

3952 -#: builtin/commit.c:1224 builtin/commit.c:1457

4125 +#: builtin/commit.c:1253 builtin/commit.c:1484

4126 msgid "show branch information"

4127 msgstr ""

4128

3956 -#: builtin/commit.c:1226 builtin/commit.c:1459 builtin/push.c:452

4129 +#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:460

4130 msgid "machine-readable output"

4131 msgstr ""

4132

3960 -#: builtin/commit.c:1229 builtin/commit.c:1461

4133 +#: builtin/commit.c:1258 builtin/commit.c:1488

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

4135 msgstr ""

4136

3964 -#: builtin/commit.c:1232 builtin/commit.c:1464

4137 +#: builtin/commit.c:1261 builtin/commit.c:1491

4138 msgid "terminate entries with NUL"

4139 msgstr ""

4140

3968 -#: builtin/commit.c:1234 builtin/commit.c:1467 builtin/fast-export.c:667

3969 -#: builtin/fast-export.c:670 builtin/tag.c:459

4141 +#: builtin/commit.c:1263 builtin/commit.c:1494 builtin/fast-export.c:674

4142 +#: builtin/fast-export.c:677 builtin/tag.c:459

4143 msgid "mode"

4144 msgstr ""

4145

3973 -#: builtin/commit.c:1235 builtin/commit.c:1467

4146 +#: builtin/commit.c:1264 builtin/commit.c:1494

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

4148 msgstr ""

4149

3977 -#: builtin/commit.c:1238

4150 +#: builtin/commit.c:1267

4151 msgid "show ignored files"

4152 msgstr ""

4153

3981 -#: builtin/commit.c:1239 parse-options.h:154

4154 +#: builtin/commit.c:1268 parse-options.h:156

4155 msgid "when"

4156 msgstr ""

4157

3985 -#: builtin/commit.c:1240

4158 +#: builtin/commit.c:1269

4159 msgid ""

4160 "ignore changes to submodules, optional when: all, dirty, untracked. "

4161 "(Default: all)"

4162 msgstr ""

4163

3991 -#: builtin/commit.c:1242

4164 +#: builtin/commit.c:1271

4165 msgid "list untracked files in columns"

4166 msgstr ""

4167

3995 -#: builtin/commit.c:1313

4168 +#: builtin/commit.c:1340

4169 msgid "couldn't look up newly created commit"

4170 msgstr ""

4171

3999 -#: builtin/commit.c:1315

4172 +#: builtin/commit.c:1342

4173 msgid "could not parse newly created commit"

4174 msgstr ""

4175

4003 -#: builtin/commit.c:1356

4176 +#: builtin/commit.c:1383

4177 msgid "detached HEAD"

4178 msgstr ""

4179

4007 -#: builtin/commit.c:1358

4180 +#: builtin/commit.c:1385

4181 msgid " (root-commit)"

4182 msgstr ""

4183

4011 -#: builtin/commit.c:1425

4184 +#: builtin/commit.c:1452

4185 msgid "suppress summary after successful commit"

4186 msgstr ""

4187

4015 -#: builtin/commit.c:1426

4188 +#: builtin/commit.c:1453

4189 msgid "show diff in commit message template"

4190 msgstr ""

4191

4019 -#: builtin/commit.c:1428

4192 +#: builtin/commit.c:1455

4193 msgid "Commit message options"

4194 msgstr ""

4195

4023 -#: builtin/commit.c:1429 builtin/tag.c:457

4196 +#: builtin/commit.c:1456 builtin/tag.c:457

4197 msgid "read message from file"

4198 msgstr ""

4199

4027 -#: builtin/commit.c:1430

4200 +#: builtin/commit.c:1457

4201 msgid "author"

4202 msgstr ""

4203

4031 -#: builtin/commit.c:1430

4204 +#: builtin/commit.c:1457

4205 msgid "override author for commit"

4206 msgstr ""

4207

4035 -#: builtin/commit.c:1431 builtin/gc.c:178

4208 +#: builtin/commit.c:1458 builtin/gc.c:260

4209 msgid "date"

4210 msgstr ""

4211

4039 -#: builtin/commit.c:1431

4212 +#: builtin/commit.c:1458

4213 msgid "override date for commit"

4214 msgstr ""

4215

4043 -#: builtin/commit.c:1432 builtin/merge.c:223 builtin/notes.c:405

4216 +#: builtin/commit.c:1459 builtin/merge.c:223 builtin/notes.c:405

4217 #: builtin/notes.c:562 builtin/tag.c:455

4218 msgid "message"

4219 msgstr ""

4220

4048 -#: builtin/commit.c:1432

4221 +#: builtin/commit.c:1459

4222 msgid "commit message"

4223 msgstr ""

4224

4052 -#: builtin/commit.c:1433

4225 +#: builtin/commit.c:1460

4226 msgid "reuse and edit message from specified commit"

4227 msgstr ""

4228

4056 -#: builtin/commit.c:1434

4229 +#: builtin/commit.c:1461

4230 msgid "reuse message from specified commit"

4231 msgstr ""

4232

4060 -#: builtin/commit.c:1435

4233 +#: builtin/commit.c:1462

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

4235 msgstr ""

4236

4064 -#: builtin/commit.c:1436

4237 +#: builtin/commit.c:1463

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

4239 msgstr ""

4240

4068 -#: builtin/commit.c:1437

4241 +#: builtin/commit.c:1464

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

4243 msgstr ""

4244

4072 -#: builtin/commit.c:1438 builtin/log.c:1160 builtin/revert.c:111

4245 +#: builtin/commit.c:1465 builtin/log.c:1180 builtin/revert.c:86

4246 msgid "add Signed-off-by:"

4247 msgstr ""

4248

4076 -#: builtin/commit.c:1439

4249 +#: builtin/commit.c:1466

4250 msgid "use specified template file"

4251 msgstr ""

4252

4080 -#: builtin/commit.c:1440

4253 +#: builtin/commit.c:1467

4254 msgid "force edit of commit"

4255 msgstr ""

4256

4084 -#: builtin/commit.c:1441

4257 +#: builtin/commit.c:1468

4258 msgid "default"

4259 msgstr ""

4260

4088 -#: builtin/commit.c:1441 builtin/tag.c:460

4261 +#: builtin/commit.c:1468 builtin/tag.c:460

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

4263 msgstr ""

4264

4092 -#: builtin/commit.c:1442

4265 +#: builtin/commit.c:1469

4266 msgid "include status in commit message template"

4267 msgstr ""

4268

4096 -#: builtin/commit.c:1443 builtin/merge.c:230 builtin/tag.c:461

4269 +#: builtin/commit.c:1470 builtin/merge.c:230 builtin/tag.c:461

4270 msgid "key id"

4271 msgstr ""

4272

4100 -#: builtin/commit.c:1444 builtin/merge.c:231

4273 +#: builtin/commit.c:1471 builtin/merge.c:231

4274 msgid "GPG sign commit"

4275 msgstr ""

4276

4277 #. end commit message options

4105 -#: builtin/commit.c:1447

4278 +#: builtin/commit.c:1474

4279 msgid "Commit contents options"

4280 msgstr ""

4281

4109 -#: builtin/commit.c:1448

4282 +#: builtin/commit.c:1475

4283 msgid "commit all changed files"

4284 msgstr ""

4285

4113 -#: builtin/commit.c:1449

4286 +#: builtin/commit.c:1476

4287 msgid "add specified files to index for commit"

4288 msgstr ""

4289

4117 -#: builtin/commit.c:1450

4290 +#: builtin/commit.c:1477

4291 msgid "interactively add files"

4292 msgstr ""

4293

4121 -#: builtin/commit.c:1451

4294 +#: builtin/commit.c:1478

4295 msgid "interactively add changes"

4296 msgstr ""

4297

4125 -#: builtin/commit.c:1452

4298 +#: builtin/commit.c:1479

4299 msgid "commit only specified files"

4300 msgstr ""

4301

4129 -#: builtin/commit.c:1453

4302 +#: builtin/commit.c:1480

4303 msgid "bypass pre-commit hook"

4304 msgstr ""

4305

4133 -#: builtin/commit.c:1454

4306 +#: builtin/commit.c:1481

4307 msgid "show what would be committed"

4308 msgstr ""

4309

4137 -#: builtin/commit.c:1465

4310 +#: builtin/commit.c:1492

4311 msgid "amend previous commit"

4312 msgstr ""

4313

4141 -#: builtin/commit.c:1466

4314 +#: builtin/commit.c:1493

4315 msgid "bypass post-rewrite hook"

4316 msgstr ""

4317

4145 -#: builtin/commit.c:1471

4318 +#: builtin/commit.c:1498

4319 msgid "ok to record an empty change"

4320 msgstr ""

4321

4149 -#: builtin/commit.c:1474

4322 +#: builtin/commit.c:1500

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

4324 msgstr ""

4325

4153 -#: builtin/commit.c:1507

4326 +#: builtin/commit.c:1529

4327 msgid "could not parse HEAD commit"

4328 msgstr ""

4329

4157 -#: builtin/commit.c:1545 builtin/merge.c:525

4330 +#: builtin/commit.c:1567 builtin/merge.c:525

4331 #, c-format

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

4333 msgstr ""

4334

4162 -#: builtin/commit.c:1552

4335 +#: builtin/commit.c:1574

4336 #, c-format

4337 msgid "Corrupt MERGE_HEAD file (%s)"

4338 msgstr ""

4339

4167 -#: builtin/commit.c:1559

4340 +#: builtin/commit.c:1581

4341 msgid "could not read MERGE_MODE"

4342 msgstr ""

4343

4171 -#: builtin/commit.c:1578

4344 +#: builtin/commit.c:1600

4345 #, c-format

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

4347 msgstr ""

4348

4176 -#: builtin/commit.c:1592

4349 +#: builtin/commit.c:1614

4350 #, c-format

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

4352 msgstr ""

4353

4181 -#: builtin/commit.c:1597

4354 +#: builtin/commit.c:1619

4355 #, c-format

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

4357 msgstr ""

4358

4186 -#: builtin/commit.c:1612 builtin/merge.c:861 builtin/merge.c:886

4359 +#: builtin/commit.c:1634 builtin/merge.c:861 builtin/merge.c:886

4360 msgid "failed to write commit object"

4361 msgstr ""

4362

4190 -#: builtin/commit.c:1633

4363 +#: builtin/commit.c:1655

4364 msgid "cannot lock HEAD ref"

4365 msgstr ""

4366

4194 -#: builtin/commit.c:1637

4367 +#: builtin/commit.c:1659

4368 msgid "cannot update HEAD ref"

4369 msgstr ""

4370

4198 -#: builtin/commit.c:1648

4371 +#: builtin/commit.c:1670

4372 msgid ""

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

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

4375 "not exceeded, and then \"git reset HEAD\" to recover."

4376 msgstr ""

4377

4205 -#: builtin/config.c:7

4378 +#: builtin/config.c:8

4379 msgid "git config [options]"

4380 msgstr ""

4381

4209 -#: builtin/config.c:52

4382 +#: builtin/config.c:54

4383 msgid "Config file location"

4384 msgstr ""

4385

4213 -#: builtin/config.c:53

4386 +#: builtin/config.c:55

4387 msgid "use global config file"

4388 msgstr ""

4389

4217 -#: builtin/config.c:54

4390 +#: builtin/config.c:56

4391 msgid "use system config file"

4392 msgstr ""

4393

4221 -#: builtin/config.c:55

4394 +#: builtin/config.c:57

4395 msgid "use repository config file"

4396 msgstr ""

4397

4225 -#: builtin/config.c:56

4398 +#: builtin/config.c:58

4399 msgid "use given config file"

4400 msgstr ""

4401

4229 -#: builtin/config.c:57

4402 +#: builtin/config.c:59

4403 msgid "blob-id"

4404 msgstr ""

4405

4233 -#: builtin/config.c:57

4406 +#: builtin/config.c:59

4407 msgid "read config from given blob object"

4408 msgstr ""

4409

4237 -#: builtin/config.c:58

4410 +#: builtin/config.c:60

4411 msgid "Action"

4412 msgstr ""

4413

4241 -#: builtin/config.c:59

4414 +#: builtin/config.c:61

4415 msgid "get value: name [value-regex]"

4416 msgstr ""

4417

4245 -#: builtin/config.c:60

4418 +#: builtin/config.c:62

4419 msgid "get all values: key [value-regex]"

4420 msgstr ""

4421

4249 -#: builtin/config.c:61

4422 +#: builtin/config.c:63

4423 msgid "get values for regexp: name-regex [value-regex]"

4424 msgstr ""

4425

4253 -#: builtin/config.c:62

4426 +#: builtin/config.c:64

4427 +msgid "get value specific for the URL: section[.var] URL"

4428 +msgstr ""

4429 +

4430 +#: builtin/config.c:65

4431 msgid "replace all matching variables: name value [value_regex]"

4432 msgstr ""

4433

4257 -#: builtin/config.c:63

4434 +#: builtin/config.c:66

4435 msgid "add a new variable: name value"

4436 msgstr ""

4437

4261 -#: builtin/config.c:64

4438 +#: builtin/config.c:67

4439 msgid "remove a variable: name [value-regex]"

4440 msgstr ""

4441

4265 -#: builtin/config.c:65

4442 +#: builtin/config.c:68

4443 msgid "remove all matches: name [value-regex]"

4444 msgstr ""

4445

4269 -#: builtin/config.c:66

4446 +#: builtin/config.c:69

4447 msgid "rename section: old-name new-name"

4448 msgstr ""

4449

4273 -#: builtin/config.c:67

4450 +#: builtin/config.c:70

4451 msgid "remove a section: name"

4452 msgstr ""

4453

4277 -#: builtin/config.c:68

4454 +#: builtin/config.c:71

4455 msgid "list all"

4456 msgstr ""

4457

4281 -#: builtin/config.c:69

4458 +#: builtin/config.c:72

4459 msgid "open an editor"

4460 msgstr ""

4461

4285 -#: builtin/config.c:70 builtin/config.c:71

4462 +#: builtin/config.c:73 builtin/config.c:74

4463 msgid "slot"

4464 msgstr ""

4465

4289 -#: builtin/config.c:70

4466 +#: builtin/config.c:73

4467 msgid "find the color configured: [default]"

4468 msgstr ""

4469

4293 -#: builtin/config.c:71

4470 +#: builtin/config.c:74

4471 msgid "find the color setting: [stdout-is-tty]"

4472 msgstr ""

4473

4297 -#: builtin/config.c:72

4474 +#: builtin/config.c:75

4475 msgid "Type"

4476 msgstr ""

4477

4301 -#: builtin/config.c:73

4478 +#: builtin/config.c:76

4479 msgid "value is \"true\" or \"false\""

4480 msgstr ""

4481

4305 -#: builtin/config.c:74

4482 +#: builtin/config.c:77

4483 msgid "value is decimal number"

4484 msgstr ""

4485

4309 -#: builtin/config.c:75

4486 +#: builtin/config.c:78

4487 msgid "value is --bool or --int"

4488 msgstr ""

4489

4313 -#: builtin/config.c:76

4490 +#: builtin/config.c:79

4491 msgid "value is a path (file or directory name)"

4492 msgstr ""

4493

4317 -#: builtin/config.c:77

4494 +#: builtin/config.c:80

4495 msgid "Other"

4496 msgstr ""

4497

4321 -#: builtin/config.c:78

4498 +#: builtin/config.c:81

4499 msgid "terminate values with NUL byte"

4500 msgstr ""

4501

4325 -#: builtin/config.c:79

4502 +#: builtin/config.c:82

4503 msgid "respect include directives on lookup"

4504 msgstr ""

4505

@@ -4501,39 +4678,39 @@ msgstr ""

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

4679 msgstr ""

4680

4504 -#: builtin/fast-export.c:666

4681 +#: builtin/fast-export.c:673

4682 msgid "show progress after <n> objects"

4683 msgstr ""

4684

4508 -#: builtin/fast-export.c:668

4685 +#: builtin/fast-export.c:675

4686 msgid "select handling of signed tags"

4687 msgstr ""

4688

4512 -#: builtin/fast-export.c:671

4689 +#: builtin/fast-export.c:678

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

4691 msgstr ""

4692

4516 -#: builtin/fast-export.c:674

4693 +#: builtin/fast-export.c:681

4694 msgid "Dump marks to this file"

4695 msgstr ""

4696

4520 -#: builtin/fast-export.c:676

4697 +#: builtin/fast-export.c:683

4698 msgid "Import marks from this file"

4699 msgstr ""

4700

4524 -#: builtin/fast-export.c:678

4701 +#: builtin/fast-export.c:685

4702 msgid "Fake a tagger when tags lack one"

4703 msgstr ""

4704

4528 -#: builtin/fast-export.c:680

4705 +#: builtin/fast-export.c:687

4706 msgid "Output full tree for each commit"

4707 msgstr ""

4708

4532 -#: builtin/fast-export.c:682

4709 +#: builtin/fast-export.c:689

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

4711 msgstr ""

4712

4536 -#: builtin/fast-export.c:683

4713 +#: builtin/fast-export.c:690

4714 msgid "Skip output of blob data"

4715 msgstr ""

4716

@@ -4553,230 +4730,230 @@ msgstr ""

4730 msgid "git fetch --all [<options>]"

4731 msgstr ""

4732

4556 -#: builtin/fetch.c:60

4733 +#: builtin/fetch.c:74

4734 msgid "fetch from all remotes"

4735 msgstr ""

4736

4560 -#: builtin/fetch.c:62

4737 +#: builtin/fetch.c:76

4738 msgid "append to .git/FETCH_HEAD instead of overwriting"

4739 msgstr ""

4740

4564 -#: builtin/fetch.c:64

4741 +#: builtin/fetch.c:78

4742 msgid "path to upload pack on remote end"

4743 msgstr ""

4744

4568 -#: builtin/fetch.c:65

4745 +#: builtin/fetch.c:79

4746 msgid "force overwrite of local branch"

4747 msgstr ""

4748

4572 -#: builtin/fetch.c:67

4749 +#: builtin/fetch.c:81

4750 msgid "fetch from multiple remotes"

4751 msgstr ""

4752

4576 -#: builtin/fetch.c:69

4753 +#: builtin/fetch.c:83

4754 msgid "fetch all tags and associated objects"

4755 msgstr ""

4756

4580 -#: builtin/fetch.c:71

4757 +#: builtin/fetch.c:85

4758 msgid "do not fetch all tags (--no-tags)"

4759 msgstr ""

4760

4584 -#: builtin/fetch.c:73

4761 +#: builtin/fetch.c:87

4762 msgid "prune remote-tracking branches no longer on remote"

4763 msgstr ""

4764

4588 -#: builtin/fetch.c:74

4765 +#: builtin/fetch.c:88

4766 msgid "on-demand"

4767 msgstr ""

4768

4592 -#: builtin/fetch.c:75

4769 +#: builtin/fetch.c:89

4770 msgid "control recursive fetching of submodules"

4771 msgstr ""

4772

4596 -#: builtin/fetch.c:79

4773 +#: builtin/fetch.c:93

4774 msgid "keep downloaded pack"

4775 msgstr ""

4776

4600 -#: builtin/fetch.c:81

4777 +#: builtin/fetch.c:95

4778 msgid "allow updating of HEAD ref"

4779 msgstr ""

4780

4604 -#: builtin/fetch.c:84

4781 +#: builtin/fetch.c:98

4782 msgid "deepen history of shallow clone"

4783 msgstr ""

4784

4608 -#: builtin/fetch.c:86

4785 +#: builtin/fetch.c:100

4786 msgid "convert to a complete repository"

4787 msgstr ""

4788

4612 -#: builtin/fetch.c:88 builtin/log.c:1177

4789 +#: builtin/fetch.c:102 builtin/log.c:1197

4790 msgid "dir"

4791 msgstr ""

4792

4616 -#: builtin/fetch.c:89

4793 +#: builtin/fetch.c:103

4794 msgid "prepend this to submodule path output"

4795 msgstr ""

4796

4620 -#: builtin/fetch.c:92

4797 +#: builtin/fetch.c:106

4798 msgid "default mode for recursion"

4799 msgstr ""

4800

4624 -#: builtin/fetch.c:220

4801 +#: builtin/fetch.c:236

4802 msgid "Couldn't find remote ref HEAD"

4803 msgstr ""

4804

4628 -#: builtin/fetch.c:273

4805 +#: builtin/fetch.c:290

4806 #, c-format

4807 msgid "object %s not found"

4808 msgstr ""

4809

4633 -#: builtin/fetch.c:278

4810 +#: builtin/fetch.c:295

4811 msgid "[up to date]"

4812 msgstr ""

4813

4637 -#: builtin/fetch.c:292

4814 +#: builtin/fetch.c:309

4815 #, c-format

4816 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"

4817 msgstr ""

4818

4642 -#: builtin/fetch.c:293 builtin/fetch.c:379

4819 +#: builtin/fetch.c:310 builtin/fetch.c:396

4820 msgid "[rejected]"

4821 msgstr ""

4822

4646 -#: builtin/fetch.c:304

4823 +#: builtin/fetch.c:321

4824 msgid "[tag update]"

4825 msgstr ""

4826

4650 -#: builtin/fetch.c:306 builtin/fetch.c:341 builtin/fetch.c:359

4827 +#: builtin/fetch.c:323 builtin/fetch.c:358 builtin/fetch.c:376

4828 msgid " (unable to update local ref)"

4829 msgstr ""

4830

4654 -#: builtin/fetch.c:324

4831 +#: builtin/fetch.c:341

4832 msgid "[new tag]"

4833 msgstr ""

4834

4658 -#: builtin/fetch.c:327

4835 +#: builtin/fetch.c:344

4836 msgid "[new branch]"

4837 msgstr ""

4838

4662 -#: builtin/fetch.c:330

4839 +#: builtin/fetch.c:347

4840 msgid "[new ref]"

4841 msgstr ""

4842

4666 -#: builtin/fetch.c:375

4843 +#: builtin/fetch.c:392

4844 msgid "unable to update local ref"

4845 msgstr ""

4846

4670 -#: builtin/fetch.c:375

4847 +#: builtin/fetch.c:392

4848 msgid "forced update"

4849 msgstr ""

4850

4674 -#: builtin/fetch.c:381

4851 +#: builtin/fetch.c:398

4852 msgid "(non-fast-forward)"

4853 msgstr ""

4854

4678 -#: builtin/fetch.c:412 builtin/fetch.c:718

4855 +#: builtin/fetch.c:429 builtin/fetch.c:735

4856 #, c-format

4857 msgid "cannot open %s: %s\n"

4858 msgstr ""

4859

4683 -#: builtin/fetch.c:421

4860 +#: builtin/fetch.c:438

4861 #, c-format

4862 msgid "%s did not send all necessary objects\n"

4863 msgstr ""

4864

4688 -#: builtin/fetch.c:520

4865 +#: builtin/fetch.c:537

4866 #, c-format

4867 msgid "From %.*s\n"

4868 msgstr ""

4869

4693 -#: builtin/fetch.c:531

4870 +#: builtin/fetch.c:548

4871 #, c-format

4872 msgid ""

4873 "some local refs could not be updated; try running\n"

4874 " 'git remote prune %s' to remove any old, conflicting branches"

4875 msgstr ""

4876

4700 -#: builtin/fetch.c:581

4877 +#: builtin/fetch.c:598

4878 #, c-format

4879 msgid " (%s will become dangling)"

4880 msgstr ""

4881

4705 -#: builtin/fetch.c:582

4882 +#: builtin/fetch.c:599

4883 #, c-format

4884 msgid " (%s has become dangling)"

4885 msgstr ""

4886

4710 -#: builtin/fetch.c:589

4887 +#: builtin/fetch.c:606

4888 msgid "[deleted]"

4889 msgstr ""

4890

4714 -#: builtin/fetch.c:590 builtin/remote.c:1055

4891 +#: builtin/fetch.c:607 builtin/remote.c:1055

4892 msgid "(none)"

4893 msgstr ""

4894

4718 -#: builtin/fetch.c:708

4895 +#: builtin/fetch.c:725

4896 #, c-format

4897 msgid "Refusing to fetch into current branch %s of non-bare repository"

4898 msgstr ""

4899

4723 -#: builtin/fetch.c:742

4900 +#: builtin/fetch.c:744

4901 #, c-format

4725 -msgid "Don't know how to fetch from %s"

4902 +msgid "Option \"%s\" value \"%s\" is not valid for %s"

4903 msgstr ""

4904

4728 -#: builtin/fetch.c:823

4905 +#: builtin/fetch.c:747

4906 #, c-format

4730 -msgid "Option \"%s\" value \"%s\" is not valid for %s"

4907 +msgid "Option \"%s\" is ignored for %s\n"

4908 msgstr ""

4909

4733 -#: builtin/fetch.c:826

4910 +#: builtin/fetch.c:801

4911 #, c-format

4735 -msgid "Option \"%s\" is ignored for %s\n"

4912 +msgid "Don't know how to fetch from %s"

4913 msgstr ""

4914

4738 -#: builtin/fetch.c:928

4915 +#: builtin/fetch.c:976

4916 #, c-format

4917 msgid "Fetching %s\n"

4918 msgstr ""

4919

4743 -#: builtin/fetch.c:930 builtin/remote.c:100

4920 +#: builtin/fetch.c:978 builtin/remote.c:100

4921 #, c-format

4922 msgid "Could not fetch %s"

4923 msgstr ""

4924

4748 -#: builtin/fetch.c:949

4925 +#: builtin/fetch.c:997

4926 msgid ""

4927 "No remote repository specified. Please, specify either a URL or a\n"

4928 "remote name from which new revisions should be fetched."

4929 msgstr ""

4930

4754 -#: builtin/fetch.c:969

4931 +#: builtin/fetch.c:1020

4932 msgid "You need to specify a tag name."

4933 msgstr ""

4934

4758 -#: builtin/fetch.c:1015

4935 +#: builtin/fetch.c:1068

4936 msgid "--depth and --unshallow cannot be used together"

4937 msgstr ""

4938

4762 -#: builtin/fetch.c:1017

4939 +#: builtin/fetch.c:1070

4940 msgid "--unshallow on a complete repository does not make sense"

4941 msgstr ""

4942

4766 -#: builtin/fetch.c:1036

4943 +#: builtin/fetch.c:1089

4944 msgid "fetch --all does not take a repository argument"

4945 msgstr ""

4946

4770 -#: builtin/fetch.c:1038

4947 +#: builtin/fetch.c:1091

4948 msgid "fetch --all does not make sense with refspecs"

4949 msgstr ""

4950

4774 -#: builtin/fetch.c:1049

4951 +#: builtin/fetch.c:1102

4952 #, c-format

4953 msgid "No such remote or remote group: %s"

4954 msgstr ""

4955

4779 -#: builtin/fetch.c:1057

4956 +#: builtin/fetch.c:1110

4957 msgid "Fetching a group and specifying refspecs does not make sense"

4958 msgstr ""

4959

@@ -4784,9 +4961,9 @@ msgstr ""

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

4962 msgstr ""

4963

4787 -#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700

4788 -#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:179

4789 -#: builtin/tag.c:446 parse-options.h:133 parse-options.h:243

4964 +#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702

4965 +#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:178

4966 +#: builtin/tag.c:446 parse-options.h:135 parse-options.h:245

4967 msgid "n"

4968 msgstr ""

4969

@@ -4810,158 +4987,169 @@ msgstr ""

4987 msgid "file to read from"

4988 msgstr ""

4989

4813 -#: builtin/for-each-ref.c:979

4990 +#: builtin/for-each-ref.c:995

4991 msgid "git for-each-ref [options] [<pattern>]"

4992 msgstr ""

4993

4817 -#: builtin/for-each-ref.c:994

4994 +#: builtin/for-each-ref.c:1010

4995 msgid "quote placeholders suitably for shells"

4996 msgstr ""

4997

4821 -#: builtin/for-each-ref.c:996

4998 +#: builtin/for-each-ref.c:1012

4999 msgid "quote placeholders suitably for perl"

5000 msgstr ""

5001

4825 -#: builtin/for-each-ref.c:998

5002 +#: builtin/for-each-ref.c:1014

5003 msgid "quote placeholders suitably for python"

5004 msgstr ""

5005

4829 -#: builtin/for-each-ref.c:1000

5006 +#: builtin/for-each-ref.c:1016

5007 msgid "quote placeholders suitably for tcl"

5008 msgstr ""

5009

4833 -#: builtin/for-each-ref.c:1003

5010 +#: builtin/for-each-ref.c:1019

5011 msgid "show only <n> matched refs"

5012 msgstr ""

5013

4837 -#: builtin/for-each-ref.c:1004

5014 +#: builtin/for-each-ref.c:1020

5015 msgid "format"

5016 msgstr ""

5017

4841 -#: builtin/for-each-ref.c:1004

5018 +#: builtin/for-each-ref.c:1020

5019 msgid "format to use for the output"

5020 msgstr ""

5021

4845 -#: builtin/for-each-ref.c:1005

5022 +#: builtin/for-each-ref.c:1021

5023 msgid "key"

5024 msgstr ""

5025

4849 -#: builtin/for-each-ref.c:1006

5026 +#: builtin/for-each-ref.c:1022

5027 msgid "field name to sort on"

5028 msgstr ""

5029

4853 -#: builtin/fsck.c:608

5030 +#: builtin/fsck.c:607

5031 msgid "git fsck [options] [<object>...]"

5032 msgstr ""

5033

4857 -#: builtin/fsck.c:614

5034 +#: builtin/fsck.c:613

5035 msgid "show unreachable objects"

5036 msgstr ""

5037

4861 -#: builtin/fsck.c:615

5038 +#: builtin/fsck.c:614

5039 msgid "show dangling objects"

5040 msgstr ""

5041

4865 -#: builtin/fsck.c:616

5042 +#: builtin/fsck.c:615

5043 msgid "report tags"

5044 msgstr ""

5045

4869 -#: builtin/fsck.c:617

5046 +#: builtin/fsck.c:616

5047 msgid "report root nodes"

5048 msgstr ""

5049

4873 -#: builtin/fsck.c:618

5050 +#: builtin/fsck.c:617

5051 msgid "make index objects head nodes"

5052 msgstr ""

5053

4877 -#: builtin/fsck.c:619

5054 +#: builtin/fsck.c:618

5055 msgid "make reflogs head nodes (default)"

5056 msgstr ""

5057

4881 -#: builtin/fsck.c:620

5058 +#: builtin/fsck.c:619

5059 msgid "also consider packs and alternate objects"

5060 msgstr ""

5061

4885 -#: builtin/fsck.c:621

5062 +#: builtin/fsck.c:620

5063 msgid "enable more strict checking"

5064 msgstr ""

5065

4889 -#: builtin/fsck.c:623

5066 +#: builtin/fsck.c:622

5067 msgid "write dangling objects in .git/lost-found"

5068 msgstr ""

5069

4893 -#: builtin/fsck.c:624 builtin/prune.c:134

5070 +#: builtin/fsck.c:623 builtin/prune.c:134

5071 msgid "show progress"

5072 msgstr ""

5073

4897 -#: builtin/gc.c:22

5074 +#: builtin/gc.c:23

5075 msgid "git gc [options]"

5076 msgstr ""

5077

4901 -#: builtin/gc.c:63

5078 +#: builtin/gc.c:79

5079 #, c-format

5080 msgid "Invalid %s: '%s'"

5081 msgstr ""

5082

4906 -#: builtin/gc.c:90

5083 +#: builtin/gc.c:106

5084 #, c-format

5085 msgid "insanely long object directory %.*s"

5086 msgstr ""

5087

4911 -#: builtin/gc.c:179

5088 +#: builtin/gc.c:261

5089 msgid "prune unreferenced objects"

5090 msgstr ""

5091

4915 -#: builtin/gc.c:181

5092 +#: builtin/gc.c:263

5093 msgid "be more thorough (increased runtime)"

5094 msgstr ""

5095

4919 -#: builtin/gc.c:182

5096 +#: builtin/gc.c:264

5097 msgid "enable auto-gc mode"

5098 msgstr ""

5099

4923 -#: builtin/gc.c:222

5100 +#: builtin/gc.c:265

5101 +msgid "force running gc even if there may be another gc running"

5102 +msgstr ""

5103 +

5104 +#: builtin/gc.c:305

5105 #, c-format

5106 msgid ""

5107 "Auto packing the repository for optimum performance. You may also\n"

5108 "run \"git gc\" manually. See \"git help gc\" for more information.\n"

5109 msgstr ""

5110

4930 -#: builtin/gc.c:249

5111 +#. be quiet on --auto

5112 +#: builtin/gc.c:315

5113 +#, c-format

5114 +msgid ""

5115 +"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"

5116 +msgstr ""

5117 +

5118 +#: builtin/gc.c:340

5119 msgid ""

5120 "There are too many unreachable loose objects; run 'git prune' to remove them."

5121 msgstr ""

5122

4935 -#: builtin/grep.c:22

5123 +#: builtin/grep.c:23

5124 msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"

5125 msgstr ""

5126

4939 -#: builtin/grep.c:217

5127 +#: builtin/grep.c:218

5128 #, c-format

5129 msgid "grep: failed to create thread: %s"

5130 msgstr ""

5131

4944 -#: builtin/grep.c:364

5132 +#: builtin/grep.c:365

5133 #, c-format

5134 msgid "Failed to chdir: %s"

5135 msgstr ""

5136

4949 -#: builtin/grep.c:442 builtin/grep.c:477

5137 +#: builtin/grep.c:443 builtin/grep.c:478

5138 #, c-format

5139 msgid "unable to read tree (%s)"

5140 msgstr ""

5141

4954 -#: builtin/grep.c:492

5142 +#: builtin/grep.c:493

5143 #, c-format

5144 msgid "unable to grep from object of type %s"

5145 msgstr ""

5146

4959 -#: builtin/grep.c:550

5147 +#: builtin/grep.c:551

5148 #, c-format

5149 msgid "switch `%c' expects a numerical value"

5150 msgstr ""

5151

4964 -#: builtin/grep.c:567

5152 +#: builtin/grep.c:568

5153 #, c-format

5154 msgid "cannot open '%s'"

5155 msgstr ""

@@ -5003,158 +5191,162 @@ msgid "don't match patterns in binary files"

5191 msgstr ""

5192

5193 #: builtin/grep.c:662

5194 +msgid "process binary files with textconv filters"

5195 +msgstr ""

5196 +

5197 +#: builtin/grep.c:664

5198 msgid "descend at most <depth> levels"

5199 msgstr ""

5200

5009 -#: builtin/grep.c:666

5201 +#: builtin/grep.c:668

5202 msgid "use extended POSIX regular expressions"

5203 msgstr ""

5204

5013 -#: builtin/grep.c:669

5205 +#: builtin/grep.c:671

5206 msgid "use basic POSIX regular expressions (default)"

5207 msgstr ""

5208

5017 -#: builtin/grep.c:672

5209 +#: builtin/grep.c:674

5210 msgid "interpret patterns as fixed strings"

5211 msgstr ""

5212

5021 -#: builtin/grep.c:675

5213 +#: builtin/grep.c:677

5214 msgid "use Perl-compatible regular expressions"

5215 msgstr ""

5216

5025 -#: builtin/grep.c:678

5217 +#: builtin/grep.c:680

5218 msgid "show line numbers"

5219 msgstr ""

5220

5029 -#: builtin/grep.c:679

5221 +#: builtin/grep.c:681

5222 msgid "don't show filenames"

5223 msgstr ""

5224

5033 -#: builtin/grep.c:680

5225 +#: builtin/grep.c:682

5226 msgid "show filenames"

5227 msgstr ""

5228

5037 -#: builtin/grep.c:682

5229 +#: builtin/grep.c:684

5230 msgid "show filenames relative to top directory"

5231 msgstr ""

5232

5041 -#: builtin/grep.c:684

5233 +#: builtin/grep.c:686

5234 msgid "show only filenames instead of matching lines"

5235 msgstr ""

5236

5045 -#: builtin/grep.c:686

5237 +#: builtin/grep.c:688

5238 msgid "synonym for --files-with-matches"

5239 msgstr ""

5240

5049 -#: builtin/grep.c:689

5241 +#: builtin/grep.c:691

5242 msgid "show only the names of files without match"

5243 msgstr ""

5244

5053 -#: builtin/grep.c:691

5245 +#: builtin/grep.c:693

5246 msgid "print NUL after filenames"

5247 msgstr ""

5248

5057 -#: builtin/grep.c:693

5249 +#: builtin/grep.c:695

5250 msgid "show the number of matches instead of matching lines"

5251 msgstr ""

5252

5061 -#: builtin/grep.c:694

5253 +#: builtin/grep.c:696

5254 msgid "highlight matches"

5255 msgstr ""

5256

5065 -#: builtin/grep.c:696

5257 +#: builtin/grep.c:698

5258 msgid "print empty line between matches from different files"

5259 msgstr ""

5260

5069 -#: builtin/grep.c:698

5261 +#: builtin/grep.c:700

5262 msgid "show filename only once above matches from same file"

5263 msgstr ""

5264

5073 -#: builtin/grep.c:701

5265 +#: builtin/grep.c:703

5266 msgid "show <n> context lines before and after matches"

5267 msgstr ""

5268

5077 -#: builtin/grep.c:704

5269 +#: builtin/grep.c:706

5270 msgid "show <n> context lines before matches"

5271 msgstr ""

5272

5081 -#: builtin/grep.c:706

5273 +#: builtin/grep.c:708

5274 msgid "show <n> context lines after matches"

5275 msgstr ""

5276

5085 -#: builtin/grep.c:707

5277 +#: builtin/grep.c:709

5278 msgid "shortcut for -C NUM"

5279 msgstr ""

5280

5089 -#: builtin/grep.c:710

5281 +#: builtin/grep.c:712

5282 msgid "show a line with the function name before matches"

5283 msgstr ""

5284

5093 -#: builtin/grep.c:712

5285 +#: builtin/grep.c:714

5286 msgid "show the surrounding function"

5287 msgstr ""

5288

5097 -#: builtin/grep.c:715

5289 +#: builtin/grep.c:717

5290 msgid "read patterns from file"

5291 msgstr ""

5292

5101 -#: builtin/grep.c:717

5293 +#: builtin/grep.c:719

5294 msgid "match <pattern>"

5295 msgstr ""

5296

5105 -#: builtin/grep.c:719

5297 +#: builtin/grep.c:721

5298 msgid "combine patterns specified with -e"

5299 msgstr ""

5300

5109 -#: builtin/grep.c:731

5301 +#: builtin/grep.c:733

5302 msgid "indicate hit with exit status without output"

5303 msgstr ""

5304

5113 -#: builtin/grep.c:733

5305 +#: builtin/grep.c:735

5306 msgid "show only matches from files that match all patterns"

5307 msgstr ""

5308

5117 -#: builtin/grep.c:735

5309 +#: builtin/grep.c:737

5310 msgid "show parse tree for grep expression"

5311 msgstr ""

5312

5121 -#: builtin/grep.c:739

5313 +#: builtin/grep.c:741

5314 msgid "pager"

5315 msgstr ""

5316

5125 -#: builtin/grep.c:739

5317 +#: builtin/grep.c:741

5318 msgid "show matching files in the pager"

5319 msgstr ""

5320

5129 -#: builtin/grep.c:742

5321 +#: builtin/grep.c:744

5322 msgid "allow calling of grep(1) (ignored by this build)"

5323 msgstr ""

5324

5133 -#: builtin/grep.c:743 builtin/show-ref.c:188

5325 +#: builtin/grep.c:745 builtin/show-ref.c:187

5326 msgid "show usage"

5327 msgstr ""

5328

5137 -#: builtin/grep.c:810

5329 +#: builtin/grep.c:812

5330 msgid "no pattern given."

5331 msgstr ""

5332

5141 -#: builtin/grep.c:865

5333 +#: builtin/grep.c:870

5334 msgid "--open-files-in-pager only works on the worktree"

5335 msgstr ""

5336

5145 -#: builtin/grep.c:888

5337 +#: builtin/grep.c:893

5338 msgid "--cached or --untracked cannot be used with --no-index."

5339 msgstr ""

5340

5149 -#: builtin/grep.c:893

5341 +#: builtin/grep.c:898

5342 msgid "--no-index or --untracked cannot be used with revs."

5343 msgstr ""

5344

5153 -#: builtin/grep.c:896

5345 +#: builtin/grep.c:901

5346 msgid "--[no-]exclude-standard cannot be used for tracked contents."

5347 msgstr ""

5348

5157 -#: builtin/grep.c:904

5349 +#: builtin/grep.c:909

5350 msgid "both --cached and trees are given."

5351 msgstr ""

5352

@@ -5403,8 +5595,8 @@ msgstr ""

5595 msgid "SHA1 COLLISION FOUND WITH %s !"

5596 msgstr ""

5597

5406 -#: builtin/index-pack.c:669 builtin/pack-objects.c:170

5407 -#: builtin/pack-objects.c:262

5598 +#: builtin/index-pack.c:669 builtin/pack-objects.c:171

5599 +#: builtin/pack-objects.c:263

5600 #, c-format

5601 msgid "unable to read %s"

5602 msgstr ""

@@ -5433,155 +5625,155 @@ msgstr ""

5625 msgid "Not all child objects of %s are reachable"

5626 msgstr ""

5627

5436 -#: builtin/index-pack.c:838 builtin/index-pack.c:868

5628 +#: builtin/index-pack.c:839 builtin/index-pack.c:869

5629 msgid "failed to apply delta"

5630 msgstr ""

5631

5440 -#: builtin/index-pack.c:1009

5632 +#: builtin/index-pack.c:1010

5633 msgid "Receiving objects"

5634 msgstr ""

5635

5444 -#: builtin/index-pack.c:1009

5636 +#: builtin/index-pack.c:1010

5637 msgid "Indexing objects"

5638 msgstr ""

5639

5448 -#: builtin/index-pack.c:1035

5640 +#: builtin/index-pack.c:1036

5641 msgid "pack is corrupted (SHA1 mismatch)"

5642 msgstr ""

5643

5452 -#: builtin/index-pack.c:1040

5644 +#: builtin/index-pack.c:1041

5645 msgid "cannot fstat packfile"

5646 msgstr ""

5647

5456 -#: builtin/index-pack.c:1043

5648 +#: builtin/index-pack.c:1044

5649 msgid "pack has junk at the end"

5650 msgstr ""

5651

5460 -#: builtin/index-pack.c:1054

5652 +#: builtin/index-pack.c:1055

5653 msgid "confusion beyond insanity in parse_pack_objects()"

5654 msgstr ""

5655

5464 -#: builtin/index-pack.c:1077

5656 +#: builtin/index-pack.c:1078

5657 msgid "Resolving deltas"

5658 msgstr ""

5659

5468 -#: builtin/index-pack.c:1087

5660 +#: builtin/index-pack.c:1088

5661 #, c-format

5662 msgid "unable to create thread: %s"

5663 msgstr ""

5664

5473 -#: builtin/index-pack.c:1129

5665 +#: builtin/index-pack.c:1130

5666 msgid "confusion beyond insanity"

5667 msgstr ""

5668

5477 -#: builtin/index-pack.c:1137

5669 +#: builtin/index-pack.c:1138

5670 #, c-format

5671 msgid "completed with %d local objects"

5672 msgstr ""

5673

5482 -#: builtin/index-pack.c:1147

5674 +#: builtin/index-pack.c:1148

5675 #, c-format

5676 msgid "Unexpected tail checksum for %s (disk corruption?)"

5677 msgstr ""

5678

5487 -#: builtin/index-pack.c:1151

5679 +#: builtin/index-pack.c:1152

5680 #, c-format

5681 msgid "pack has %d unresolved delta"

5682 msgid_plural "pack has %d unresolved deltas"

5683 msgstr[0] ""

5684 msgstr[1] ""

5685

5494 -#: builtin/index-pack.c:1176

5686 +#: builtin/index-pack.c:1177

5687 #, c-format

5688 msgid "unable to deflate appended object (%d)"

5689 msgstr ""

5690

5499 -#: builtin/index-pack.c:1255

5691 +#: builtin/index-pack.c:1256

5692 #, c-format

5693 msgid "local object %s is corrupt"

5694 msgstr ""

5695

5504 -#: builtin/index-pack.c:1279

5696 +#: builtin/index-pack.c:1280

5697 msgid "error while closing pack file"

5698 msgstr ""

5699

5508 -#: builtin/index-pack.c:1292

5700 +#: builtin/index-pack.c:1293

5701 #, c-format

5702 msgid "cannot write keep file '%s'"

5703 msgstr ""

5704

5513 -#: builtin/index-pack.c:1300

5705 +#: builtin/index-pack.c:1301

5706 #, c-format

5707 msgid "cannot close written keep file '%s'"

5708 msgstr ""

5709

5518 -#: builtin/index-pack.c:1313

5710 +#: builtin/index-pack.c:1314

5711 msgid "cannot store pack file"

5712 msgstr ""

5713

5522 -#: builtin/index-pack.c:1324

5714 +#: builtin/index-pack.c:1325

5715 msgid "cannot store index file"

5716 msgstr ""

5717

5526 -#: builtin/index-pack.c:1357

5718 +#: builtin/index-pack.c:1358

5719 #, c-format

5720 msgid "bad pack.indexversion=%<PRIu32>"

5721 msgstr ""

5722

5531 -#: builtin/index-pack.c:1363

5723 +#: builtin/index-pack.c:1364

5724 #, c-format

5725 msgid "invalid number of threads specified (%d)"

5726 msgstr ""

5727

5536 -#: builtin/index-pack.c:1367 builtin/index-pack.c:1545

5728 +#: builtin/index-pack.c:1368 builtin/index-pack.c:1546

5729 #, c-format

5730 msgid "no threads support, ignoring %s"

5731 msgstr ""

5732

5541 -#: builtin/index-pack.c:1425

5733 +#: builtin/index-pack.c:1426

5734 #, c-format

5735 msgid "Cannot open existing pack file '%s'"

5736 msgstr ""

5737

5546 -#: builtin/index-pack.c:1427

5738 +#: builtin/index-pack.c:1428

5739 #, c-format

5740 msgid "Cannot open existing pack idx file for '%s'"

5741 msgstr ""

5742

5551 -#: builtin/index-pack.c:1474

5743 +#: builtin/index-pack.c:1475

5744 #, c-format

5745 msgid "non delta: %d object"

5746 msgid_plural "non delta: %d objects"

5747 msgstr[0] ""

5748 msgstr[1] ""

5749

5558 -#: builtin/index-pack.c:1481

5750 +#: builtin/index-pack.c:1482

5751 #, c-format

5752 msgid "chain length = %d: %lu object"

5753 msgid_plural "chain length = %d: %lu objects"

5754 msgstr[0] ""

5755 msgstr[1] ""

5756

5565 -#: builtin/index-pack.c:1509

5757 +#: builtin/index-pack.c:1510

5758 msgid "Cannot come back to cwd"

5759 msgstr ""

5760

5569 -#: builtin/index-pack.c:1557 builtin/index-pack.c:1560

5570 -#: builtin/index-pack.c:1572 builtin/index-pack.c:1576

5761 +#: builtin/index-pack.c:1558 builtin/index-pack.c:1561

5762 +#: builtin/index-pack.c:1573 builtin/index-pack.c:1577

5763 #, c-format

5764 msgid "bad %s"

5765 msgstr ""

5766

5575 -#: builtin/index-pack.c:1590

5767 +#: builtin/index-pack.c:1591

5768 msgid "--fix-thin cannot be used without --stdin"

5769 msgstr ""

5770

5579 -#: builtin/index-pack.c:1594 builtin/index-pack.c:1604

5771 +#: builtin/index-pack.c:1595 builtin/index-pack.c:1605

5772 #, c-format

5773 msgid "packfile name '%s' does not end with '.pack'"

5774 msgstr ""

5775

5584 -#: builtin/index-pack.c:1613

5776 +#: builtin/index-pack.c:1614

5777 msgid "--verify with no packfile name given"

5778 msgstr ""

5779

@@ -5670,11 +5862,6 @@ msgstr ""

5862 msgid "unable to move %s to %s"

5863 msgstr ""

5864

5673 -#: builtin/init-db.c:363

5674 -#, c-format

5675 -msgid "Could not create git link %s"

5676 -msgstr ""

5677 -

5865 #.

5866 #. * TRANSLATORS: The first '%s' is either "Reinitialized

5867 #. * existing" or "Initialized empty", the second " shared" or

@@ -5715,7 +5902,7 @@ msgstr ""

5902 msgid "specify that the git repository is to be shared amongst several users"

5903 msgstr ""

5904

5718 -#: builtin/init-db.c:493 builtin/prune-packed.c:75

5905 +#: builtin/init-db.c:493 builtin/prune-packed.c:75 builtin/repack.c:155

5906 msgid "be quiet"

5907 msgstr ""

5908

@@ -5753,381 +5940,381 @@ msgstr ""

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

5941 msgstr ""

5942

5756 -#: builtin/log.c:124

5943 +#: builtin/log.c:125

5944 msgid "suppress diff output"

5945 msgstr ""

5946

5760 -#: builtin/log.c:125

5947 +#: builtin/log.c:126

5948 msgid "show source"

5949 msgstr ""

5950

5764 -#: builtin/log.c:126

5951 +#: builtin/log.c:127

5952 msgid "Use mail map file"

5953 msgstr ""

5954

5768 -#: builtin/log.c:127

5955 +#: builtin/log.c:128

5956 msgid "decorate options"

5957 msgstr ""

5958

5772 -#: builtin/log.c:230

5959 +#: builtin/log.c:231

5960 #, c-format

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

5962 msgstr ""

5963

5777 -#: builtin/log.c:453 builtin/log.c:545

5964 +#: builtin/log.c:473 builtin/log.c:565

5965 #, c-format

5966 msgid "Could not read object %s"

5967 msgstr ""

5968

5782 -#: builtin/log.c:569

5969 +#: builtin/log.c:589

5970 #, c-format

5971 msgid "Unknown type: %d"

5972 msgstr ""

5973

5787 -#: builtin/log.c:669

5974 +#: builtin/log.c:689

5975 msgid "format.headers without value"

5976 msgstr ""

5977

5791 -#: builtin/log.c:751

5978 +#: builtin/log.c:771

5979 msgid "name of output directory is too long"

5980 msgstr ""

5981

5795 -#: builtin/log.c:767

5982 +#: builtin/log.c:787

5983 #, c-format

5984 msgid "Cannot open patch file %s"

5985 msgstr ""

5986

5800 -#: builtin/log.c:781

5987 +#: builtin/log.c:801

5988 msgid "Need exactly one range."

5989 msgstr ""

5990

5804 -#: builtin/log.c:789

5991 +#: builtin/log.c:809

5992 msgid "Not a range."

5993 msgstr ""

5994

5808 -#: builtin/log.c:891

5995 +#: builtin/log.c:911

5996 msgid "Cover letter needs email format"

5997 msgstr ""

5998

5812 -#: builtin/log.c:967

5999 +#: builtin/log.c:987

6000 #, c-format

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

6002 msgstr ""

6003

5817 -#: builtin/log.c:995

6004 +#: builtin/log.c:1015

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

6006 msgstr ""

6007

5821 -#: builtin/log.c:1040

6008 +#: builtin/log.c:1060

6009 msgid "Two output directories?"

6010 msgstr ""

6011

5825 -#: builtin/log.c:1155

6012 +#: builtin/log.c:1175

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

6014 msgstr ""

6015

5829 -#: builtin/log.c:1158

6016 +#: builtin/log.c:1178

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

6018 msgstr ""

6019

5833 -#: builtin/log.c:1162

6020 +#: builtin/log.c:1182

6021 msgid "print patches to standard out"

6022 msgstr ""

6023

5837 -#: builtin/log.c:1164

6024 +#: builtin/log.c:1184

6025 msgid "generate a cover letter"

6026 msgstr ""

6027

5841 -#: builtin/log.c:1166

6028 +#: builtin/log.c:1186

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

6030 msgstr ""

6031

5845 -#: builtin/log.c:1167

6032 +#: builtin/log.c:1187

6033 msgid "sfx"

6034 msgstr ""

6035

5849 -#: builtin/log.c:1168

6036 +#: builtin/log.c:1188

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

6038 msgstr ""

6039

5853 -#: builtin/log.c:1170

6040 +#: builtin/log.c:1190

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

6042 msgstr ""

6043

5857 -#: builtin/log.c:1172

6044 +#: builtin/log.c:1192

6045 msgid "mark the series as Nth re-roll"

6046 msgstr ""

6047

5861 -#: builtin/log.c:1174

6048 +#: builtin/log.c:1194

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

6050 msgstr ""

6051

5865 -#: builtin/log.c:1177

6052 +#: builtin/log.c:1197

6053 msgid "store resulting files in <dir>"

6054 msgstr ""

6055

5869 -#: builtin/log.c:1180

6056 +#: builtin/log.c:1200

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

6058 msgstr ""

6059

5873 -#: builtin/log.c:1183

6060 +#: builtin/log.c:1203

6061 msgid "don't output binary diffs"

6062 msgstr ""

6063

5877 -#: builtin/log.c:1185

6064 +#: builtin/log.c:1205

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

6066 msgstr ""

6067

5881 -#: builtin/log.c:1187

6068 +#: builtin/log.c:1207

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

6070 msgstr ""

6071

5885 -#: builtin/log.c:1189

6072 +#: builtin/log.c:1209

6073 msgid "Messaging"

6074 msgstr ""

6075

5889 -#: builtin/log.c:1190

6076 +#: builtin/log.c:1210

6077 msgid "header"

6078 msgstr ""

6079

5893 -#: builtin/log.c:1191

6080 +#: builtin/log.c:1211

6081 msgid "add email header"

6082 msgstr ""

6083

5897 -#: builtin/log.c:1192 builtin/log.c:1194

6084 +#: builtin/log.c:1212 builtin/log.c:1214

6085 msgid "email"

6086 msgstr ""

6087

5901 -#: builtin/log.c:1192

6088 +#: builtin/log.c:1212

6089 msgid "add To: header"

6090 msgstr ""

6091

5905 -#: builtin/log.c:1194

6092 +#: builtin/log.c:1214

6093 msgid "add Cc: header"

6094 msgstr ""

6095

5909 -#: builtin/log.c:1196

6096 +#: builtin/log.c:1216

6097 msgid "ident"

6098 msgstr ""

6099

5913 -#: builtin/log.c:1197

6100 +#: builtin/log.c:1217

6101 msgid "set From address to <ident> (or committer ident if absent)"

6102 msgstr ""

6103

5917 -#: builtin/log.c:1199

6104 +#: builtin/log.c:1219

6105 msgid "message-id"

6106 msgstr ""

6107

5921 -#: builtin/log.c:1200

6108 +#: builtin/log.c:1220

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

6110 msgstr ""

6111

5925 -#: builtin/log.c:1201 builtin/log.c:1204

6112 +#: builtin/log.c:1221 builtin/log.c:1224

6113 msgid "boundary"

6114 msgstr ""

6115

5929 -#: builtin/log.c:1202

6116 +#: builtin/log.c:1222

6117 msgid "attach the patch"

6118 msgstr ""

6119

5933 -#: builtin/log.c:1205

6120 +#: builtin/log.c:1225

6121 msgid "inline the patch"

6122 msgstr ""

6123

5937 -#: builtin/log.c:1209

6124 +#: builtin/log.c:1229

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

6126 msgstr ""

6127

5941 -#: builtin/log.c:1211

6128 +#: builtin/log.c:1231

6129 msgid "signature"

6130 msgstr ""

6131

5945 -#: builtin/log.c:1212

6132 +#: builtin/log.c:1232

6133 msgid "add a signature"

6134 msgstr ""

6135

5949 -#: builtin/log.c:1214

6136 +#: builtin/log.c:1233

6137 msgid "don't print the patch filenames"

6138 msgstr ""

6139

5953 -#: builtin/log.c:1288

6140 +#: builtin/log.c:1307

6141 #, c-format

6142 msgid "invalid ident line: %s"

6143 msgstr ""

6144

5958 -#: builtin/log.c:1303

6145 +#: builtin/log.c:1322

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

6147 msgstr ""

6148

5962 -#: builtin/log.c:1305

6149 +#: builtin/log.c:1324

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

6151 msgstr ""

6152

5966 -#: builtin/log.c:1313

6153 +#: builtin/log.c:1332

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

6155 msgstr ""

6156

5970 -#: builtin/log.c:1315

6157 +#: builtin/log.c:1334

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

6159 msgstr ""

6160

5974 -#: builtin/log.c:1317

6161 +#: builtin/log.c:1336

6162 msgid "--check does not make sense"

6163 msgstr ""

6164

5978 -#: builtin/log.c:1340

6165 +#: builtin/log.c:1359

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

6167 msgstr ""

6168

5982 -#: builtin/log.c:1342

6169 +#: builtin/log.c:1361

6170 #, c-format

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

6172 msgstr ""

6173

5987 -#: builtin/log.c:1490

6174 +#: builtin/log.c:1509

6175 msgid "Failed to create output files"

6176 msgstr ""

6177

5991 -#: builtin/log.c:1539

6178 +#: builtin/log.c:1558

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

6180 msgstr ""

6181

5995 -#: builtin/log.c:1594

6182 +#: builtin/log.c:1613

6183 #, c-format

6184 msgid ""

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

6186 msgstr ""

6187

6001 -#: builtin/log.c:1607 builtin/log.c:1609 builtin/log.c:1621

6188 +#: builtin/log.c:1626 builtin/log.c:1628 builtin/log.c:1640

6189 #, c-format

6190 msgid "Unknown commit %s"

6191 msgstr ""

6192

6006 -#: builtin/ls-files.c:408

6193 +#: builtin/ls-files.c:398

6194 msgid "git ls-files [options] [<file>...]"

6195 msgstr ""

6196

6010 -#: builtin/ls-files.c:465

6197 +#: builtin/ls-files.c:455

6198 msgid "identify the file status with tags"

6199 msgstr ""

6200

6014 -#: builtin/ls-files.c:467

6201 +#: builtin/ls-files.c:457

6202 msgid "use lowercase letters for 'assume unchanged' files"

6203 msgstr ""

6204

6018 -#: builtin/ls-files.c:469

6205 +#: builtin/ls-files.c:459

6206 msgid "show cached files in the output (default)"

6207 msgstr ""

6208

6022 -#: builtin/ls-files.c:471

6209 +#: builtin/ls-files.c:461

6210 msgid "show deleted files in the output"

6211 msgstr ""

6212

6026 -#: builtin/ls-files.c:473

6213 +#: builtin/ls-files.c:463

6214 msgid "show modified files in the output"

6215 msgstr ""

6216

6030 -#: builtin/ls-files.c:475

6217 +#: builtin/ls-files.c:465

6218 msgid "show other files in the output"

6219 msgstr ""

6220

6034 -#: builtin/ls-files.c:477

6221 +#: builtin/ls-files.c:467

6222 msgid "show ignored files in the output"

6223 msgstr ""

6224

6038 -#: builtin/ls-files.c:480

6225 +#: builtin/ls-files.c:470

6226 msgid "show staged contents' object name in the output"

6227 msgstr ""

6228

6042 -#: builtin/ls-files.c:482

6229 +#: builtin/ls-files.c:472

6230 msgid "show files on the filesystem that need to be removed"

6231 msgstr ""

6232

6046 -#: builtin/ls-files.c:484

6233 +#: builtin/ls-files.c:474

l10n: git.pot: v1.8.5 round 1 (68 new, 9 removed)