@matheusbsbs / matheus-bagliano / commits / 051fae4d51
Fork 0

l10n: git.pot: v2.26.0 round 2 (7 new, 2 removed)

Generate po/git.pot from v2.26.0-rc1 for git v2.26.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Jiang Xin committed Mar 11, 2020 at 14:59 UTC 051fae4d51be9bfe097b47d89e932901524e9c85
1 file changed +260 -238
po/git.pot
+260 -238
@@ -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: 2020-03-06 14:25+0800\n"
11 +"POT-Creation-Date: 2020-03-11 15:26+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"
@@ -210,8 +210,8 @@ msgstr ""
210 msgid "unstaged"
211 msgstr ""
212
213 -#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2197
214 -#: builtin/am.c:2200 builtin/clone.c:123 builtin/fetch.c:144
213 +#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251
214 +#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144
215 #: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409
216 #: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
217 #: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
@@ -1185,7 +1185,7 @@ msgid_plural "%d lines applied after fixing whitespace errors."
1185 msgstr[0] ""
1186 msgstr[1] ""
1187
1188 -#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:390
1188 +#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406
1189 msgid "Unable to write new index file"
1190 msgstr ""
1191
@@ -1197,7 +1197,7 @@ msgstr ""
1197 msgid "apply changes matching the given path"
1198 msgstr ""
1199
1200 -#: apply.c:4973 builtin/am.c:2206
1200 +#: apply.c:4973 builtin/am.c:2260
1201 msgid "num"
1202 msgstr ""
1203
@@ -1261,7 +1261,7 @@ msgstr ""
1261 msgid "ensure at least <n> lines of context match"
1262 msgstr ""
1263
1264 -#: apply.c:5008 builtin/am.c:2185 builtin/interpret-trailers.c:98
1264 +#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98
1265 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
1266 #: builtin/pack-objects.c:3457 builtin/rebase.c:1508
1267 msgid "action"
@@ -1305,7 +1305,7 @@ msgstr ""
1305 msgid "do not trust the line counts in the hunk headers"
1306 msgstr ""
1307
1308 -#: apply.c:5032 builtin/am.c:2194
1308 +#: apply.c:5032 builtin/am.c:2248
1309 msgid "root"
1310 msgstr ""
1311
@@ -1330,7 +1330,7 @@ msgstr ""
1330 msgid "git archive --remote <repo> [--exec <cmd>] --list"
1331 msgstr ""
1332
1333 -#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:299
1333 +#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
1334 #, c-format
1335 msgid "pathspec '%s' did not match any files"
1336 msgstr ""
@@ -1862,8 +1862,8 @@ msgstr ""
1862 msgid "invalid color value: %.*s"
1863 msgstr ""
1864
1865 -#: commit.c:51 sequencer.c:2719 builtin/am.c:354 builtin/am.c:398
1866 -#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:457
1865 +#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403
1866 +#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457
1867 #, c-format
1868 msgid "could not parse %s"
1869 msgstr ""
@@ -1971,7 +1971,7 @@ msgstr ""
1971 msgid "could not find commit %s"
1972 msgstr ""
1973
1974 -#: commit-graph.c:852 builtin/am.c:1287
1974 +#: commit-graph.c:852 builtin/am.c:1292
1975 #, c-format
1976 msgid "unable to parse commit %s"
1977 msgstr ""
@@ -2923,7 +2923,7 @@ msgid "invalid --stat value: %s"
2923 msgstr ""
2924
2925 #: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
2926 -#: parse-options.c:199 parse-options.c:203
2926 +#: parse-options.c:197 parse-options.c:201
2927 #, c-format
2928 msgid "%s expects a numerical value"
2929 msgstr ""
@@ -4039,9 +4039,9 @@ msgstr ""
4039 msgid "failed to read the cache"
4040 msgstr ""
4041
4042 -#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908
4042 +#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913
4043 #: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810
4044 -#: builtin/stash.c:264
4044 +#: builtin/stash.c:265
4045 msgid "unable to write new index file"
4046 msgstr ""
4047
@@ -4213,48 +4213,48 @@ msgstr ""
4213 msgid "renamed"
4214 msgstr ""
4215
4216 -#: merge-recursive.c:1606 merge-recursive.c:2530 merge-recursive.c:3175
4216 +#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117
4217 #, c-format
4218 msgid "Refusing to lose dirty file at %s"
4219 msgstr ""
4220
4221 -#: merge-recursive.c:1616
4221 +#: merge-recursive.c:1587
4222 #, c-format
4223 msgid "Refusing to lose untracked file at %s, even though it's in the way."
4224 msgstr ""
4225
4226 -#: merge-recursive.c:1674
4226 +#: merge-recursive.c:1645
4227 #, c-format
4228 msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
4229 msgstr ""
4230
4231 -#: merge-recursive.c:1705
4231 +#: merge-recursive.c:1676
4232 #, c-format
4233 msgid "%s is a directory in %s adding as %s instead"
4234 msgstr ""
4235
4236 -#: merge-recursive.c:1710
4236 +#: merge-recursive.c:1681
4237 #, c-format
4238 msgid "Refusing to lose untracked file at %s; adding as %s instead"
4239 msgstr ""
4240
4241 -#: merge-recursive.c:1737
4241 +#: merge-recursive.c:1708
4242 #, c-format
4243 msgid ""
4244 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
4245 "\"->\"%s\" in \"%s\"%s"
4246 msgstr ""
4247
4248 -#: merge-recursive.c:1742
4248 +#: merge-recursive.c:1713
4249 msgid " (left unresolved)"
4250 msgstr ""
4251
4252 -#: merge-recursive.c:1851
4252 +#: merge-recursive.c:1793
4253 #, c-format
4254 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
4255 msgstr ""
4256
4257 -#: merge-recursive.c:2114
4257 +#: merge-recursive.c:2056
4258 #, c-format
4259 msgid ""
4260 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -4262,172 +4262,172 @@ msgid ""
4262 "getting a majority of the files."
4263 msgstr ""
4264
4265 -#: merge-recursive.c:2146
4265 +#: merge-recursive.c:2088
4266 #, c-format
4267 msgid ""
4268 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
4269 "implicit directory rename(s) putting the following path(s) there: %s."
4270 msgstr ""
4271
4272 -#: merge-recursive.c:2156
4272 +#: merge-recursive.c:2098
4273 #, c-format
4274 msgid ""
4275 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
4276 "implicit directory renames tried to put these paths there: %s"
4277 msgstr ""
4278
4279 -#: merge-recursive.c:2248
4279 +#: merge-recursive.c:2190
4280 #, c-format
4281 msgid ""
4282 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
4283 ">%s in %s"
4284 msgstr ""
4285
4286 -#: merge-recursive.c:2493
4286 +#: merge-recursive.c:2435
4287 #, c-format
4288 msgid ""
4289 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
4290 "renamed."
4291 msgstr ""
4292
4293 -#: merge-recursive.c:3019
4293 +#: merge-recursive.c:2961
4294 #, c-format
4295 msgid "cannot read object %s"
4296 msgstr ""
4297
4298 -#: merge-recursive.c:3022
4298 +#: merge-recursive.c:2964
4299 #, c-format
4300 msgid "object %s is not a blob"
4301 msgstr ""
4302
4303 -#: merge-recursive.c:3086
4303 +#: merge-recursive.c:3028
4304 msgid "modify"
4305 msgstr ""
4306
4307 -#: merge-recursive.c:3086
4307 +#: merge-recursive.c:3028
4308 msgid "modified"
4309 msgstr ""
4310
4311 -#: merge-recursive.c:3098
4311 +#: merge-recursive.c:3040
4312 msgid "content"
4313 msgstr ""
4314
4315 -#: merge-recursive.c:3102
4315 +#: merge-recursive.c:3044
4316 msgid "add/add"
4317 msgstr ""
4318
4319 -#: merge-recursive.c:3125
4319 +#: merge-recursive.c:3067
4320 #, c-format
4321 msgid "Skipped %s (merged same as existing)"
4322 msgstr ""
4323
4324 -#: merge-recursive.c:3147 git-submodule.sh:1003
4324 +#: merge-recursive.c:3089 git-submodule.sh:1003
4325 msgid "submodule"
4326 msgstr ""
4327
4328 -#: merge-recursive.c:3148
4328 +#: merge-recursive.c:3090
4329 #, c-format
4330 msgid "CONFLICT (%s): Merge conflict in %s"
4331 msgstr ""
4332
4333 -#: merge-recursive.c:3178
4333 +#: merge-recursive.c:3120
4334 #, c-format
4335 msgid "Adding as %s instead"
4336 msgstr ""
4337
4338 -#: merge-recursive.c:3261
4338 +#: merge-recursive.c:3203
4339 #, c-format
4340 msgid ""
4341 "Path updated: %s added in %s inside a directory that was renamed in %s; "
4342 "moving it to %s."
4343 msgstr ""
4344
4345 -#: merge-recursive.c:3264
4345 +#: merge-recursive.c:3206
4346 #, c-format
4347 msgid ""
4348 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
4349 "in %s, suggesting it should perhaps be moved to %s."
4350 msgstr ""
4351
4352 -#: merge-recursive.c:3268
4352 +#: merge-recursive.c:3210
4353 #, c-format
4354 msgid ""
4355 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
4356 "%s; moving it to %s."
4357 msgstr ""
4358
4359 -#: merge-recursive.c:3271
4359 +#: merge-recursive.c:3213
4360 #, c-format
4361 msgid ""
4362 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
4363 "was renamed in %s, suggesting it should perhaps be moved to %s."
4364 msgstr ""
4365
4366 -#: merge-recursive.c:3385
4366 +#: merge-recursive.c:3327
4367 #, c-format
4368 msgid "Removing %s"
4369 msgstr ""
4370
4371 -#: merge-recursive.c:3408
4371 +#: merge-recursive.c:3350
4372 msgid "file/directory"
4373 msgstr ""
4374
4375 -#: merge-recursive.c:3413
4375 +#: merge-recursive.c:3355
4376 msgid "directory/file"
4377 msgstr ""
4378
4379 -#: merge-recursive.c:3420
4379 +#: merge-recursive.c:3362
4380 #, c-format
4381 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
4382 msgstr ""
4383
4384 -#: merge-recursive.c:3429
4384 +#: merge-recursive.c:3371
4385 #, c-format
4386 msgid "Adding %s"
4387 msgstr ""
4388
4389 -#: merge-recursive.c:3438
4389 +#: merge-recursive.c:3380
4390 #, c-format
4391 msgid "CONFLICT (add/add): Merge conflict in %s"
4392 msgstr ""
4393
4394 -#: merge-recursive.c:3482
4394 +#: merge-recursive.c:3424
4395 msgid "Already up to date!"
4396 msgstr ""
4397
4398 -#: merge-recursive.c:3491
4398 +#: merge-recursive.c:3433
4399 #, c-format
4400 msgid "merging of trees %s and %s failed"
4401 msgstr ""
4402
4403 -#: merge-recursive.c:3595
4403 +#: merge-recursive.c:3537
4404 msgid "Merging:"
4405 msgstr ""
4406
4407 -#: merge-recursive.c:3608
4407 +#: merge-recursive.c:3550
4408 #, c-format
4409 msgid "found %u common ancestor:"
4410 msgid_plural "found %u common ancestors:"
4411 msgstr[0] ""
4412 msgstr[1] ""
4413
4414 -#: merge-recursive.c:3658
4414 +#: merge-recursive.c:3600
4415 msgid "merge returned no commit"
4416 msgstr ""
4417
4418 -#: merge-recursive.c:3717
4418 +#: merge-recursive.c:3659
4419 #, c-format
4420 msgid ""
4421 "Your local changes to the following files would be overwritten by merge:\n"
4422 " %s"
4423 msgstr ""
4424
4425 -#: merge-recursive.c:3814
4425 +#: merge-recursive.c:3756
4426 #, c-format
4427 msgid "Could not parse object '%s'"
4428 msgstr ""
4429
4430 -#: merge-recursive.c:3832 builtin/merge.c:697 builtin/merge.c:877
4430 +#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877
4431 msgid "Unable to write index."
4432 msgstr ""
4433
@@ -4694,7 +4694,7 @@ msgstr ""
4694 msgid "%s : incompatible with something else"
4695 msgstr ""
4696
4697 -#: parse-options.c:92 parse-options.c:96 parse-options.c:319
4697 +#: parse-options.c:92 parse-options.c:96 parse-options.c:317
4698 #, c-format
4699 msgid "%s takes no value"
4700 msgstr ""
@@ -4704,41 +4704,41 @@ msgstr ""
4704 msgid "%s isn't available"
4705 msgstr ""
4706
4707 -#: parse-options.c:219
4707 +#: parse-options.c:217
4708 #, c-format
4709 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
4710 msgstr ""
4711
4712 -#: parse-options.c:388
4712 +#: parse-options.c:386
4713 #, c-format
4714 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
4715 msgstr ""
4716
4717 -#: parse-options.c:422 parse-options.c:430
4717 +#: parse-options.c:420 parse-options.c:428
4718 #, c-format
4719 msgid "did you mean `--%s` (with two dashes)?"
4720 msgstr ""
4721
4722 -#: parse-options.c:859
4722 +#: parse-options.c:857
4723 #, c-format
4724 msgid "unknown option `%s'"
4725 msgstr ""
4726
4727 -#: parse-options.c:861
4727 +#: parse-options.c:859
4728 #, c-format
4729 msgid "unknown switch `%c'"
4730 msgstr ""
4731
4732 -#: parse-options.c:863
4732 +#: parse-options.c:861
4733 #, c-format
4734 msgid "unknown non-ascii option in string: `%s'"
4735 msgstr ""
4736
4737 -#: parse-options.c:887
4737 +#: parse-options.c:885
4738 msgid "..."
4739 msgstr ""
4740
4741 -#: parse-options.c:906
4741 +#: parse-options.c:904
4742 #, c-format
4743 msgid "usage: %s"
4744 msgstr ""
@@ -4746,21 +4746,21 @@ msgstr ""
4746 #. TRANSLATORS: the colon here should align with the
4747 #. one in "usage: %s" translation.
4748 #.
4749 -#: parse-options.c:912
4749 +#: parse-options.c:910
4750 #, c-format
4751 msgid " or: %s"
4752 msgstr ""
4753
4754 -#: parse-options.c:915
4754 +#: parse-options.c:913
4755 #, c-format
4756 msgid " %s"
4757 msgstr ""
4758
4759 -#: parse-options.c:954
4759 +#: parse-options.c:952
4760 msgid "-NUM"
4761 msgstr ""
4762
4763 -#: parse-options.c:968
4763 +#: parse-options.c:966
4764 #, c-format
4765 msgid "alias of --%s"
4766 msgstr ""
@@ -5075,7 +5075,7 @@ msgstr ""
5075 #: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
5076 #: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
5077 #: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
5078 -#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:271
5078 +#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
5079 #: builtin/submodule--helper.c:332
5080 msgid "index file corrupt"
5081 msgstr ""
@@ -5309,7 +5309,7 @@ msgstr ""
5309 msgid "could not write to '%s'"
5310 msgstr ""
5311
5312 -#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:714
5312 +#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719
5313 #: builtin/rebase.c:1029
5314 #, c-format
5315 msgid "could not open '%s' for writing"
@@ -6058,7 +6058,7 @@ msgstr ""
6058 msgid "could not delete '%s'"
6059 msgstr ""
6060
6061 -#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:369
6061 +#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385
6062 #, c-format
6063 msgid "could not remove '%s'"
6064 msgstr ""
@@ -6110,7 +6110,7 @@ msgid "failed to finalize '%s'"
6110 msgstr ""
6111
6112 #: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
6113 -#: sequencer.c:3276 builtin/am.c:244 builtin/commit.c:787 builtin/merge.c:1120
6113 +#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
6114 #: builtin/rebase.c:593
6115 #, c-format
6116 msgid "could not read '%s'"
@@ -6161,8 +6161,8 @@ msgstr ""
6161 msgid "unable to dequote value of '%s'"
6162 msgstr ""
6163
6164 -#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:705
6165 -#: builtin/am.c:797 builtin/merge.c:1117 builtin/rebase.c:1072
6164 +#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710
6165 +#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072
6166 #, c-format
6167 msgid "could not open '%s' for reading"
6168 msgstr ""
@@ -6283,7 +6283,7 @@ msgstr ""
6283 msgid "unable to parse commit author"
6284 msgstr ""
6285
6286 -#: sequencer.c:1353 builtin/am.c:1561 builtin/merge.c:687
6286 +#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687
6287 msgid "git write-tree failed to write a tree"
6288 msgstr ""
6289
@@ -6292,7 +6292,7 @@ msgstr ""
6292 msgid "unable to read commit message from '%s'"
6293 msgstr ""
6294
6295 -#: sequencer.c:1413 builtin/am.c:1583 builtin/commit.c:1673 builtin/merge.c:886
6295 +#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886
6296 #: builtin/merge.c:911
6297 msgid "failed to write commit object"
6298 msgstr ""
@@ -8109,7 +8109,11 @@ msgstr ""
8109 msgid "invalid '..' path segment"
8110 msgstr ""
8111
8112 -#: worktree.c:259 builtin/am.c:2084
8112 +#: walker.c:170
8113 +msgid "Fetching objects"
8114 +msgstr ""
8115 +
8116 +#: worktree.c:259 builtin/am.c:2099
8117 #, c-format
8118 msgid "failed to read '%s'"
8119 msgstr ""
@@ -8710,7 +8714,7 @@ msgstr ""
8714
8715 #: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
8716 #: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548
8713 -#: builtin/remote.c:1421 builtin/rm.c:241 builtin/send-pack.c:165
8717 +#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
8718 msgid "dry run"
8719 msgstr ""
8720
@@ -8830,12 +8834,12 @@ msgid "--chmod param '%s' must be either -x or +x"
8834 msgstr ""
8835
8836 #: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354
8833 -#: builtin/reset.c:327
8837 +#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509
8838 msgid "--pathspec-from-file is incompatible with pathspec arguments"
8839 msgstr ""
8840
8841 #: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360
8838 -#: builtin/reset.c:333
8842 +#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515
8843 msgid "--pathspec-file-nul requires --pathspec-from-file"
8844 msgstr ""
8845
@@ -8851,128 +8855,128 @@ msgid ""
8855 "\"git config advice.addEmptyPathspec false\""
8856 msgstr ""
8857
8854 -#: builtin/am.c:347
8858 +#: builtin/am.c:352
8859 msgid "could not parse author script"
8860 msgstr ""
8861
8858 -#: builtin/am.c:431
8862 +#: builtin/am.c:436
8863 #, c-format
8864 msgid "'%s' was deleted by the applypatch-msg hook"
8865 msgstr ""
8866
8863 -#: builtin/am.c:473
8867 +#: builtin/am.c:478
8868 #, c-format
8869 msgid "Malformed input line: '%s'."
8870 msgstr ""
8871
8868 -#: builtin/am.c:511
8872 +#: builtin/am.c:516
8873 #, c-format
8874 msgid "Failed to copy notes from '%s' to '%s'"
8875 msgstr ""
8876
8873 -#: builtin/am.c:537
8877 +#: builtin/am.c:542
8878 msgid "fseek failed"
8879 msgstr ""
8880
8877 -#: builtin/am.c:725
8881 +#: builtin/am.c:730
8882 #, c-format
8883 msgid "could not parse patch '%s'"
8884 msgstr ""
8885
8882 -#: builtin/am.c:790
8886 +#: builtin/am.c:795
8887 msgid "Only one StGIT patch series can be applied at once"
8888 msgstr ""
8889
8886 -#: builtin/am.c:838
8890 +#: builtin/am.c:843
8891 msgid "invalid timestamp"
8892 msgstr ""
8893
8890 -#: builtin/am.c:843 builtin/am.c:855
8894 +#: builtin/am.c:848 builtin/am.c:860
8895 msgid "invalid Date line"
8896 msgstr ""
8897
8894 -#: builtin/am.c:850
8898 +#: builtin/am.c:855
8899 msgid "invalid timezone offset"
8900 msgstr ""
8901
8898 -#: builtin/am.c:943
8902 +#: builtin/am.c:948
8903 msgid "Patch format detection failed."
8904 msgstr ""
8905
8902 -#: builtin/am.c:948 builtin/clone.c:409
8906 +#: builtin/am.c:953 builtin/clone.c:409
8907 #, c-format
8908 msgid "failed to create directory '%s'"
8909 msgstr ""
8910
8907 -#: builtin/am.c:953
8911 +#: builtin/am.c:958
8912 msgid "Failed to split patches."
8913 msgstr ""
8914
8911 -#: builtin/am.c:1084
8915 +#: builtin/am.c:1089
8916 #, c-format
8917 msgid "When you have resolved this problem, run \"%s --continue\"."
8918 msgstr ""
8919
8916 -#: builtin/am.c:1085
8920 +#: builtin/am.c:1090
8921 #, c-format
8922 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
8923 msgstr ""
8924
8921 -#: builtin/am.c:1086
8925 +#: builtin/am.c:1091
8926 #, c-format
8927 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
8928 msgstr ""
8929
8926 -#: builtin/am.c:1169
8930 +#: builtin/am.c:1174
8931 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
8932 msgstr ""
8933
8930 -#: builtin/am.c:1197
8934 +#: builtin/am.c:1202
8935 msgid "Patch is empty."
8936 msgstr ""
8937
8934 -#: builtin/am.c:1262
8938 +#: builtin/am.c:1267
8939 #, c-format
8940 msgid "missing author line in commit %s"
8941 msgstr ""
8942
8939 -#: builtin/am.c:1265
8943 +#: builtin/am.c:1270
8944 #, c-format
8945 msgid "invalid ident line: %.*s"
8946 msgstr ""
8947
8944 -#: builtin/am.c:1484
8948 +#: builtin/am.c:1489
8949 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
8950 msgstr ""
8951
8948 -#: builtin/am.c:1486
8952 +#: builtin/am.c:1491
8953 msgid "Using index info to reconstruct a base tree..."
8954 msgstr ""
8955
8952 -#: builtin/am.c:1505
8956 +#: builtin/am.c:1510
8957 msgid ""
8958 "Did you hand edit your patch?\n"
8959 "It does not apply to blobs recorded in its index."
8960 msgstr ""
8961
8958 -#: builtin/am.c:1511
8962 +#: builtin/am.c:1516
8963 msgid "Falling back to patching base and 3-way merge..."
8964 msgstr ""
8965
8962 -#: builtin/am.c:1537
8966 +#: builtin/am.c:1542
8967 msgid "Failed to merge in the changes."
8968 msgstr ""
8969
8966 -#: builtin/am.c:1569
8970 +#: builtin/am.c:1574
8971 msgid "applying to an empty history"
8972 msgstr ""
8973
8970 -#: builtin/am.c:1616 builtin/am.c:1620
8974 +#: builtin/am.c:1621 builtin/am.c:1625
8975 #, c-format
8976 msgid "cannot resume: %s does not exist."
8977 msgstr ""
8978
8975 -#: builtin/am.c:1638
8979 +#: builtin/am.c:1643
8980 msgid "Commit Body is:"
8981 msgstr ""
8982
@@ -8980,46 +8984,46 @@ msgstr ""
8984 #. in your translation. The program will only accept English
8985 #. input at this point.
8986 #.
8983 -#: builtin/am.c:1648
8987 +#: builtin/am.c:1653
8988 #, c-format
8989 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
8990 msgstr ""
8991
8988 -#: builtin/am.c:1695 builtin/commit.c:398
8992 +#: builtin/am.c:1700 builtin/commit.c:398
8993 msgid "unable to write index file"
8994 msgstr ""
8995
8992 -#: builtin/am.c:1699
8996 +#: builtin/am.c:1704
8997 #, c-format
8998 msgid "Dirty index: cannot apply patches (dirty: %s)"
8999 msgstr ""
9000
8997 -#: builtin/am.c:1739 builtin/am.c:1807
9001 +#: builtin/am.c:1744 builtin/am.c:1812
9002 #, c-format
9003 msgid "Applying: %.*s"
9004 msgstr ""
9005
9002 -#: builtin/am.c:1756
9006 +#: builtin/am.c:1761
9007 msgid "No changes -- Patch already applied."
9008 msgstr ""
9009
9006 -#: builtin/am.c:1762
9010 +#: builtin/am.c:1767
9011 #, c-format
9012 msgid "Patch failed at %s %.*s"
9013 msgstr ""
9014
9011 -#: builtin/am.c:1766
9012 -msgid "Use 'git am --show-current-patch' to see the failed patch"
9015 +#: builtin/am.c:1771
9016 +msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
9017 msgstr ""
9018
9015 -#: builtin/am.c:1810
9019 +#: builtin/am.c:1815
9020 msgid ""
9021 "No changes - did you forget to use 'git add'?\n"
9022 "If there is nothing left to stage, chances are that something else\n"
9023 "already introduced the same changes; you might want to skip this patch."
9024 msgstr ""
9025
9022 -#: builtin/am.c:1817
9026 +#: builtin/am.c:1822
9027 msgid ""
9028 "You still have unmerged paths in your index.\n"
9029 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -9027,91 +9031,101 @@ msgid ""
9031 "You might run `git rm` on a file to accept \"deleted by them\" for it."
9032 msgstr ""
9033
9030 -#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:346
9034 +#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346
9035 #: builtin/reset.c:354
9036 #, c-format
9037 msgid "Could not parse object '%s'."
9038 msgstr ""
9039
9036 -#: builtin/am.c:1976
9040 +#: builtin/am.c:1981
9041 msgid "failed to clean index"
9042 msgstr ""
9043
9040 -#: builtin/am.c:2020
9044 +#: builtin/am.c:2025
9045 msgid ""
9046 "You seem to have moved HEAD since the last 'am' failure.\n"
9047 "Not rewinding to ORIG_HEAD"
9048 msgstr ""
9049
9046 -#: builtin/am.c:2117
9050 +#: builtin/am.c:2132
9051 #, c-format
9052 msgid "Invalid value for --patch-format: %s"
9053 msgstr ""
9054
9051 -#: builtin/am.c:2153
9055 +#: builtin/am.c:2172
9056 +#, c-format
9057 +msgid "Invalid value for --show-current-patch: %s"
9058 +msgstr ""
9059 +
9060 +#: builtin/am.c:2176
9061 +#, c-format
9062 +msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
9063 +msgstr ""
9064 +
9065 +#: builtin/am.c:2207
9066 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
9067 msgstr ""
9068
9055 -#: builtin/am.c:2154
9069 +#: builtin/am.c:2208
9070 msgid "git am [<options>] (--continue | --skip | --abort)"
9071 msgstr ""
9072
9059 -#: builtin/am.c:2160
9073 +#: builtin/am.c:2214
9074 msgid "run interactively"
9075 msgstr ""
9076
9063 -#: builtin/am.c:2162
9077 +#: builtin/am.c:2216
9078 msgid "historical option -- no-op"
9079 msgstr ""
9080
9067 -#: builtin/am.c:2164
9081 +#: builtin/am.c:2218
9082 msgid "allow fall back on 3way merging if needed"
9083 msgstr ""
9084
9071 -#: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58
9072 -#: builtin/repack.c:304 builtin/stash.c:811
9085 +#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58
9086 +#: builtin/repack.c:304 builtin/stash.c:812
9087 msgid "be quiet"
9088 msgstr ""
9089
9076 -#: builtin/am.c:2167
9090 +#: builtin/am.c:2221
9091 msgid "add a Signed-off-by line to the commit message"
9092 msgstr ""
9093
9080 -#: builtin/am.c:2170
9094 +#: builtin/am.c:2224
9095 msgid "recode into utf8 (default)"
9096 msgstr ""
9097
9084 -#: builtin/am.c:2172
9098 +#: builtin/am.c:2226
9099 msgid "pass -k flag to git-mailinfo"
9100 msgstr ""
9101
9088 -#: builtin/am.c:2174
9102 +#: builtin/am.c:2228
9103 msgid "pass -b flag to git-mailinfo"
9104 msgstr ""
9105
9092 -#: builtin/am.c:2176
9106 +#: builtin/am.c:2230
9107 msgid "pass -m flag to git-mailinfo"
9108 msgstr ""
9109
9096 -#: builtin/am.c:2178
9110 +#: builtin/am.c:2232
9111 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
9112 msgstr ""
9113
9100 -#: builtin/am.c:2181
9114 +#: builtin/am.c:2235
9115 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
9116 msgstr ""
9117
9104 -#: builtin/am.c:2184
9118 +#: builtin/am.c:2238
9119 msgid "strip everything before a scissors line"
9120 msgstr ""
9121
9108 -#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195
9109 -#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207
9110 -#: builtin/am.c:2213
9122 +#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249
9123 +#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261
9124 +#: builtin/am.c:2267
9125 msgid "pass it through git-apply"
9126 msgstr ""
9127
9114 -#: builtin/am.c:2203 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670
9128 +#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670
9129 #: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250
9130 #: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505
9131 #: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321
@@ -9120,92 +9134,92 @@ msgstr ""
9134 msgid "n"
9135 msgstr ""
9136
9123 -#: builtin/am.c:2209 builtin/branch.c:661 builtin/for-each-ref.c:38
9137 +#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38
9138 #: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38
9139 msgid "format"
9140 msgstr ""
9141
9128 -#: builtin/am.c:2210
9142 +#: builtin/am.c:2264
9143 msgid "format the patch(es) are in"
9144 msgstr ""
9145
9132 -#: builtin/am.c:2216
9146 +#: builtin/am.c:2270
9147 msgid "override error message when patch failure occurs"
9148 msgstr ""
9149
9136 -#: builtin/am.c:2218
9150 +#: builtin/am.c:2272
9151 msgid "continue applying patches after resolving a conflict"
9152 msgstr ""
9153
9140 -#: builtin/am.c:2221
9154 +#: builtin/am.c:2275
9155 msgid "synonyms for --continue"
9156 msgstr ""
9157
9144 -#: builtin/am.c:2224
9158 +#: builtin/am.c:2278
9159 msgid "skip the current patch"
9160 msgstr ""
9161
9148 -#: builtin/am.c:2227
9162 +#: builtin/am.c:2281
9163 msgid "restore the original branch and abort the patching operation."
9164 msgstr ""
9165
9152 -#: builtin/am.c:2230
9166 +#: builtin/am.c:2284
9167 msgid "abort the patching operation but keep HEAD where it is."
9168 msgstr ""
9169
9156 -#: builtin/am.c:2233
9157 -msgid "show the patch being applied."
9170 +#: builtin/am.c:2288
9171 +msgid "show the patch being applied"
9172 msgstr ""
9173
9160 -#: builtin/am.c:2237
9174 +#: builtin/am.c:2293
9175 msgid "lie about committer date"
9176 msgstr ""
9177
9164 -#: builtin/am.c:2239
9178 +#: builtin/am.c:2295
9179 msgid "use current timestamp for author date"
9180 msgstr ""
9181
9168 -#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1512
9182 +#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512
9183 #: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517
9184 #: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418
9185 msgid "key-id"
9186 msgstr ""
9187
9174 -#: builtin/am.c:2242 builtin/rebase.c:518 builtin/rebase.c:1557
9188 +#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
9189 msgid "GPG-sign commits"
9190 msgstr ""
9191
9178 -#: builtin/am.c:2245
9192 +#: builtin/am.c:2301
9193 msgid "(internal use for git-rebase)"
9194 msgstr ""
9195
9182 -#: builtin/am.c:2263
9196 +#: builtin/am.c:2319
9197 msgid ""
9198 "The -b/--binary option has been a no-op for long time, and\n"
9199 "it will be removed. Please do not use it anymore."
9200 msgstr ""
9201
9188 -#: builtin/am.c:2270
9202 +#: builtin/am.c:2326
9203 msgid "failed to read the index"
9204 msgstr ""
9205
9192 -#: builtin/am.c:2285
9206 +#: builtin/am.c:2341
9207 #, c-format
9208 msgid "previous rebase directory %s still exists but mbox given."
9209 msgstr ""
9210
9197 -#: builtin/am.c:2309
9211 +#: builtin/am.c:2365
9212 #, c-format
9213 msgid ""
9214 "Stray %s directory found.\n"
9215 "Use \"git am --abort\" to remove it."
9216 msgstr ""
9217
9204 -#: builtin/am.c:2315
9218 +#: builtin/am.c:2371
9219 msgid "Resolve operation not in progress, we are not resuming."
9220 msgstr ""
9221
9208 -#: builtin/am.c:2325
9222 +#: builtin/am.c:2381
9223 msgid "interactive mode requires patches on the command line"
9224 msgstr ""
9225
@@ -10756,7 +10770,7 @@ msgstr ""
10770 msgid "--pathspec-from-file is incompatible with --detach"
10771 msgstr ""
10772
10759 -#: builtin/checkout.c:1681 builtin/reset.c:324
10773 +#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506
10774 msgid "--pathspec-from-file is incompatible with --patch"
10775 msgstr ""
10776
@@ -11396,7 +11410,7 @@ msgid "id of a parent commit object"
11410 msgstr ""
11411
11412 #: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271
11399 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1472
11413 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477
11414 #: builtin/tag.c:412
11415 msgid "message"
11416 msgstr ""
@@ -15963,7 +15977,7 @@ msgstr ""
15977 msgid "use notes from <notes-ref>"
15978 msgstr ""
15979
15966 -#: builtin/notes.c:1034 builtin/stash.c:1610
15980 +#: builtin/notes.c:1034 builtin/stash.c:1643
15981 #, c-format
15982 msgid "unknown subcommand: %s"
15983 msgstr ""
@@ -17223,10 +17237,6 @@ msgstr ""
17237 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
17238 msgstr ""
17239
17226 -#: builtin/rebase.c:1546
17227 -msgid "{drop,keep,ask}"
17228 -msgstr ""
17229 -
17240 #: builtin/rebase.c:1547
17241 msgid "how to handle commits that become empty"
17242 msgstr ""
@@ -18528,8 +18538,8 @@ msgstr ""
18538 msgid "Cannot do a %s reset in the middle of a merge."
18539 msgstr ""
18540
18531 -#: builtin/reset.c:294 builtin/stash.c:519 builtin/stash.c:594
18532 -#: builtin/stash.c:618
18541 +#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595
18542 +#: builtin/stash.c:619
18543 msgid "be quiet, only report errors"
18544 msgstr ""
18545
@@ -18772,36 +18782,40 @@ msgid_plural "the following files have local modifications:"
18782 msgstr[0] ""
18783 msgstr[1] ""
18784
18775 -#: builtin/rm.c:242
18785 +#: builtin/rm.c:243
18786 msgid "do not list removed files"
18787 msgstr ""
18788
18779 -#: builtin/rm.c:243
18789 +#: builtin/rm.c:244
18790 msgid "only remove from the index"
18791 msgstr ""
18792
18783 -#: builtin/rm.c:244
18793 +#: builtin/rm.c:245
18794 msgid "override the up-to-date check"
18795 msgstr ""
18796
18787 -#: builtin/rm.c:245
18797 +#: builtin/rm.c:246
18798 msgid "allow recursive removal"
18799 msgstr ""
18800
18791 -#: builtin/rm.c:247
18801 +#: builtin/rm.c:248
18802 msgid "exit with a zero status even if nothing matched"
18803 msgstr ""
18804
18795 -#: builtin/rm.c:289
18805 +#: builtin/rm.c:282
18806 +msgid "No pathspec was given. Which files should I remove?"
18807 +msgstr ""
18808 +
18809 +#: builtin/rm.c:305
18810 msgid "please stage your changes to .gitmodules or stash them to proceed"
18811 msgstr ""
18812
18799 -#: builtin/rm.c:307
18813 +#: builtin/rm.c:323
18814 #, c-format
18815 msgid "not removing '%s' recursively without -r"
18816 msgstr ""
18817
18804 -#: builtin/rm.c:346
18818 +#: builtin/rm.c:362
18819 #, c-format
18820 msgid "git rm: unable to remove %s"
18821 msgstr ""
@@ -19105,15 +19119,15 @@ msgstr ""
19119 msgid "error while refreshing working directory"
19120 msgstr ""
19121
19108 -#: builtin/stash.c:22 builtin/stash.c:37
19122 +#: builtin/stash.c:22 builtin/stash.c:38
19123 msgid "git stash list [<options>]"
19124 msgstr ""
19125
19112 -#: builtin/stash.c:23 builtin/stash.c:42
19126 +#: builtin/stash.c:23 builtin/stash.c:43
19127 msgid "git stash show [<options>] [<stash>]"
19128 msgstr ""
19129
19116 -#: builtin/stash.c:24 builtin/stash.c:47
19130 +#: builtin/stash.c:24 builtin/stash.c:48
19131 msgid "git stash drop [-q|--quiet] [<stash>]"
19132 msgstr ""
19133
@@ -19121,207 +19135,215 @@ msgstr ""
19135 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
19136 msgstr ""
19137
19124 -#: builtin/stash.c:26 builtin/stash.c:62
19138 +#: builtin/stash.c:26 builtin/stash.c:63
19139 msgid "git stash branch <branchname> [<stash>]"
19140 msgstr ""
19141
19128 -#: builtin/stash.c:27 builtin/stash.c:67
19142 +#: builtin/stash.c:27 builtin/stash.c:68
19143 msgid "git stash clear"
19144 msgstr ""
19145
19132 -#: builtin/stash.c:28 builtin/stash.c:77
19146 +#: builtin/stash.c:28
19147 msgid ""
19148 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
19149 " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
19150 +" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
19151 " [--] [<pathspec>...]]"
19152 msgstr ""
19153
19139 -#: builtin/stash.c:31 builtin/stash.c:84
19154 +#: builtin/stash.c:32 builtin/stash.c:85
19155 msgid ""
19156 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
19157 " [-u|--include-untracked] [-a|--all] [<message>]"
19158 msgstr ""
19159
19145 -#: builtin/stash.c:52
19160 +#: builtin/stash.c:53
19161 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
19162 msgstr ""
19163
19149 -#: builtin/stash.c:57
19164 +#: builtin/stash.c:58
19165 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
19166 msgstr ""
19167
19153 -#: builtin/stash.c:72
19168 +#: builtin/stash.c:73
19169 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
19170 msgstr ""
19171
19157 -#: builtin/stash.c:127
19172 +#: builtin/stash.c:78
19173 +msgid ""
19174 +"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
19175 +" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
19176 +" [--] [<pathspec>...]]"
19177 +msgstr ""
19178 +
19179 +#: builtin/stash.c:128
19180 #, c-format
19181 msgid "'%s' is not a stash-like commit"
19182 msgstr ""
19183
19162 -#: builtin/stash.c:147
19184 +#: builtin/stash.c:148
19185 #, c-format
19186 msgid "Too many revisions specified:%s"
19187 msgstr ""
19188
19167 -#: builtin/stash.c:161 git-legacy-stash.sh:549
19189 +#: builtin/stash.c:162 git-legacy-stash.sh:549
19190 msgid "No stash entries found."
19191 msgstr ""
19192
19171 -#: builtin/stash.c:175
19193 +#: builtin/stash.c:176
19194 #, c-format
19195 msgid "%s is not a valid reference"
19196 msgstr ""
19197
19176 -#: builtin/stash.c:224 git-legacy-stash.sh:75
19198 +#: builtin/stash.c:225 git-legacy-stash.sh:75
19199 msgid "git stash clear with parameters is unimplemented"
19200 msgstr ""
19201
19180 -#: builtin/stash.c:403
19202 +#: builtin/stash.c:404
19203 msgid "cannot apply a stash in the middle of a merge"
19204 msgstr ""
19205
19184 -#: builtin/stash.c:414
19206 +#: builtin/stash.c:415
19207 #, c-format
19208 msgid "could not generate diff %s^!."
19209 msgstr ""
19210
19189 -#: builtin/stash.c:421
19211 +#: builtin/stash.c:422
19212 msgid "conflicts in index.Try without --index."
19213 msgstr ""
19214
19193 -#: builtin/stash.c:427
19215 +#: builtin/stash.c:428
19216 msgid "could not save index tree"
19217 msgstr ""
19218
19197 -#: builtin/stash.c:436
19219 +#: builtin/stash.c:437
19220 msgid "could not restore untracked files from stash"
19221 msgstr ""
19222
19201 -#: builtin/stash.c:450
19223 +#: builtin/stash.c:451
19224 #, c-format
19225 msgid "Merging %s with %s"
19226 msgstr ""
19227
19206 -#: builtin/stash.c:460 git-legacy-stash.sh:681
19228 +#: builtin/stash.c:461 git-legacy-stash.sh:681
19229 msgid "Index was not unstashed."
19230 msgstr ""
19231
19210 -#: builtin/stash.c:521 builtin/stash.c:620
19232 +#: builtin/stash.c:522 builtin/stash.c:621
19233 msgid "attempt to recreate the index"
19234 msgstr ""
19235
19214 -#: builtin/stash.c:554
19236 +#: builtin/stash.c:555
19237 #, c-format
19238 msgid "Dropped %s (%s)"
19239 msgstr ""
19240
19219 -#: builtin/stash.c:557
19241 +#: builtin/stash.c:558
19242 #, c-format
19243 msgid "%s: Could not drop stash entry"
19244 msgstr ""
19245
19224 -#: builtin/stash.c:582
19246 +#: builtin/stash.c:583
19247 #, c-format
19248 msgid "'%s' is not a stash reference"
19249 msgstr ""
19250
19229 -#: builtin/stash.c:632 git-legacy-stash.sh:695
19251 +#: builtin/stash.c:633 git-legacy-stash.sh:695
19252 msgid "The stash entry is kept in case you need it again."
19253 msgstr ""
19254
19233 -#: builtin/stash.c:655 git-legacy-stash.sh:713
19255 +#: builtin/stash.c:656 git-legacy-stash.sh:713
19256 msgid "No branch name specified"
19257 msgstr ""
19258
19237 -#: builtin/stash.c:795 builtin/stash.c:832
19259 +#: builtin/stash.c:796 builtin/stash.c:833
19260 #, c-format
19261 msgid "Cannot update %s with %s"
19262 msgstr ""
19263
19242 -#: builtin/stash.c:813 builtin/stash.c:1473 builtin/stash.c:1509
19264 +#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
19265 msgid "stash message"
19266 msgstr ""
19267
19246 -#: builtin/stash.c:823
19268 +#: builtin/stash.c:824
19269 msgid "\"git stash store\" requires one <commit> argument"
19270 msgstr ""
19271
19250 -#: builtin/stash.c:1048 git-legacy-stash.sh:218
19272 +#: builtin/stash.c:1049 git-legacy-stash.sh:218
19273 msgid "No changes selected"
19274 msgstr ""
19275
19254 -#: builtin/stash.c:1148 git-legacy-stash.sh:150
19276 +#: builtin/stash.c:1149 git-legacy-stash.sh:150
19277 msgid "You do not have the initial commit yet"
19278 msgstr ""
19279
19258 -#: builtin/stash.c:1175 git-legacy-stash.sh:165
19280 +#: builtin/stash.c:1176 git-legacy-stash.sh:165
19281 msgid "Cannot save the current index state"
19282 msgstr ""
19283
19262 -#: builtin/stash.c:1184 git-legacy-stash.sh:180
19284 +#: builtin/stash.c:1185 git-legacy-stash.sh:180
19285 msgid "Cannot save the untracked files"
19286 msgstr ""
19287
19266 -#: builtin/stash.c:1195 builtin/stash.c:1204 git-legacy-stash.sh:201
19288 +#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201
19289 #: git-legacy-stash.sh:214
19290 msgid "Cannot save the current worktree state"
19291 msgstr ""
19292
19271 -#: builtin/stash.c:1232 git-legacy-stash.sh:234
19293 +#: builtin/stash.c:1233 git-legacy-stash.sh:234
19294 msgid "Cannot record working tree state"
19295 msgstr ""
19296
19275 -#: builtin/stash.c:1281 git-legacy-stash.sh:338
19297 +#: builtin/stash.c:1282 git-legacy-stash.sh:338
19298 msgid "Can't use --patch and --include-untracked or --all at the same time"
19299 msgstr ""
19300
19279 -#: builtin/stash.c:1297
19301 +#: builtin/stash.c:1298
19302 msgid "Did you forget to 'git add'?"
19303 msgstr ""
19304
19283 -#: builtin/stash.c:1312 git-legacy-stash.sh:346
19305 +#: builtin/stash.c:1313 git-legacy-stash.sh:346
19306 msgid "No local changes to save"
19307 msgstr ""
19308
19287 -#: builtin/stash.c:1319 git-legacy-stash.sh:351
19309 +#: builtin/stash.c:1320 git-legacy-stash.sh:351
19310 msgid "Cannot initialize stash"
19311 msgstr ""
19312
19291 -#: builtin/stash.c:1334 git-legacy-stash.sh:355
19313 +#: builtin/stash.c:1335 git-legacy-stash.sh:355
19314 msgid "Cannot save the current status"
19315 msgstr ""
19316
19295 -#: builtin/stash.c:1339
19317 +#: builtin/stash.c:1340
19318 #, c-format
19319 msgid "Saved working directory and index state %s"
19320 msgstr ""
19321
19300 -#: builtin/stash.c:1429 git-legacy-stash.sh:385
19322 +#: builtin/stash.c:1430 git-legacy-stash.sh:385
19323 msgid "Cannot remove worktree changes"
19324 msgstr ""
19325
19304 -#: builtin/stash.c:1464 builtin/stash.c:1500
19326 +#: builtin/stash.c:1469 builtin/stash.c:1534
19327 msgid "keep index"
19328 msgstr ""
19329
19308 -#: builtin/stash.c:1466 builtin/stash.c:1502
19330 +#: builtin/stash.c:1471 builtin/stash.c:1536
19331 msgid "stash in patch mode"
19332 msgstr ""
19333
19312 -#: builtin/stash.c:1467 builtin/stash.c:1503
19334 +#: builtin/stash.c:1472 builtin/stash.c:1537
19335 msgid "quiet mode"
19336 msgstr ""
19337
19316 -#: builtin/stash.c:1469 builtin/stash.c:1505
19338 +#: builtin/stash.c:1474 builtin/stash.c:1539
19339 msgid "include untracked files in stash"
19340 msgstr ""
19341
19320 -#: builtin/stash.c:1471 builtin/stash.c:1507
19342 +#: builtin/stash.c:1476 builtin/stash.c:1541
19343 msgid "include ignore files"
19344 msgstr ""
19345
19324 -#: builtin/stash.c:1567
19346 +#: builtin/stash.c:1600
19347 #, c-format
19348 msgid "could not exec %s"
19349 msgstr ""
@@ -20882,41 +20904,41 @@ msgstr ""
20904 msgid "dumb http transport does not support shallow capabilities"
20905 msgstr ""
20906
20885 -#: remote-curl.c:1037
20907 +#: remote-curl.c:1038
20908 msgid "fetch failed."
20909 msgstr ""
20910
20889 -#: remote-curl.c:1085
20911 +#: remote-curl.c:1086
20912 msgid "cannot fetch by sha1 over smart http"
20913 msgstr ""
20914
20893 -#: remote-curl.c:1129 remote-curl.c:1135
20915 +#: remote-curl.c:1130 remote-curl.c:1136
20916 #, c-format
20917 msgid "protocol error: expected sha/ref, got '%s'"
20918 msgstr ""
20919
20898 -#: remote-curl.c:1147 remote-curl.c:1262
20920 +#: remote-curl.c:1148 remote-curl.c:1263
20921 #, c-format
20922 msgid "http transport does not support %s"
20923 msgstr ""
20924
20903 -#: remote-curl.c:1183
20925 +#: remote-curl.c:1184
20926 msgid "git-http-push failed"
20927 msgstr ""
20928
20907 -#: remote-curl.c:1368
20929 +#: remote-curl.c:1369
20930 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
20931 msgstr ""
20932
20911 -#: remote-curl.c:1400
20933 +#: remote-curl.c:1401
20934 msgid "remote-curl: error reading command stream from git"
20935 msgstr ""
20936
20915 -#: remote-curl.c:1407
20937 +#: remote-curl.c:1408
20938 msgid "remote-curl: fetch attempted without a local repo"
20939 msgstr ""
20940
20919 -#: remote-curl.c:1447
20941 +#: remote-curl.c:1448
20942 #, c-format
20943 msgid "remote-curl: unknown command '%s' from git"
20944 msgstr ""