@matheusbsbs / matheus-bagliano / commits / 75f7b4b965

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

Generate po/git.pot from v1.7.11-rc0-100-g5498c: * 5 new l10n messages at lines: 635, 639, 1203, 1208, 3946 * 3 removed l10n messages at lines: 1194, 3158, 3936 Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Jiang Xin committed Jun 2, 2012 at 07:07 UTC 75f7b4b965502f24637eaf1ed7e4411f68d5ed75
1 file changed +219 -209
po/git.pot
+219 -209
@@ -8,7 +8,7 @@ msgid ""
8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
11 -"POT-Creation-Date: 2012-05-21 08:57+0800\n"
11 +"POT-Creation-Date: 2012-06-02 07:03+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"
@@ -45,7 +45,7 @@ msgstr ""
45 msgid "unrecognized header: %s%s (%d)"
46 msgstr ""
47
48 -#: bundle.c:89 builtin/commit.c:697
48 +#: bundle.c:89 builtin/commit.c:696
49 #, c-format
50 msgid "could not open '%s'"
51 msgstr ""
@@ -54,8 +54,8 @@ msgstr ""
54 msgid "Repository lacks these prerequisite commits:"
55 msgstr ""
56
57 -#: bundle.c:164 sequencer.c:533 sequencer.c:965 builtin/log.c:289
58 -#: builtin/log.c:719 builtin/log.c:1335 builtin/log.c:1554 builtin/merge.c:347
57 +#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:289
58 +#: builtin/log.c:720 builtin/log.c:1309 builtin/log.c:1528 builtin/merge.c:347
59 #: builtin/shortlog.c:181
60 msgid "revision walk setup failed"
61 msgstr ""
@@ -78,7 +78,7 @@ msgstr[1] ""
78 msgid "rev-list died"
79 msgstr ""
80
81 -#: bundle.c:296 builtin/log.c:1231 builtin/shortlog.c:284
81 +#: bundle.c:296 builtin/log.c:1205 builtin/shortlog.c:284
82 #, c-format
83 msgid "unrecognized argument: %s"
84 msgstr ""
@@ -265,17 +265,17 @@ msgstr ""
265 msgid "gpg failed to sign the data"
266 msgstr ""
267
268 -#: grep.c:1280
268 +#: grep.c:1320
269 #, c-format
270 msgid "'%s': unable to read %s"
271 msgstr ""
272
273 -#: grep.c:1297
273 +#: grep.c:1337
274 #, c-format
275 msgid "'%s': %s"
276 msgstr ""
277
278 -#: grep.c:1308
278 +#: grep.c:1348
279 #, c-format
280 msgid "'%s': short read %s"
281 msgstr ""
@@ -348,14 +348,14 @@ msgstr ""
348 msgid " %s"
349 msgstr ""
350
351 -#: remote.c:1607
351 +#: remote.c:1629
352 #, c-format
353 msgid "Your branch is ahead of '%s' by %d commit.\n"
354 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
355 msgstr[0] ""
356 msgstr[1] ""
357
358 -#: remote.c:1613
358 +#: remote.c:1635
359 #, c-format
360 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
361 msgid_plural ""
@@ -363,7 +363,7 @@ msgid_plural ""
363 msgstr[0] ""
364 msgstr[1] ""
365
366 -#: remote.c:1621
366 +#: remote.c:1643
367 #, c-format
368 msgid ""
369 "Your branch and '%s' have diverged,\n"
@@ -399,7 +399,7 @@ msgid ""
399 "and commit the result with 'git commit'"
400 msgstr ""
401
402 -#: sequencer.c:160 sequencer.c:741 sequencer.c:824
402 +#: sequencer.c:160 sequencer.c:758 sequencer.c:841
403 #, c-format
404 msgid "Could not write to %s"
405 msgstr ""
@@ -435,178 +435,178 @@ msgstr ""
435 msgid "Unable to update cache tree\n"
436 msgstr ""
437
438 -#: sequencer.c:323
438 +#: sequencer.c:324
439 #, c-format
440 msgid "Could not parse commit %s\n"
441 msgstr ""
442
443 -#: sequencer.c:328
443 +#: sequencer.c:329
444 #, c-format
445 msgid "Could not parse parent commit %s\n"
446 msgstr ""
447
448 -#: sequencer.c:358
448 +#: sequencer.c:395
449 msgid "Your index file is unmerged."
450 msgstr ""
451
452 -#: sequencer.c:361
452 +#: sequencer.c:398
453 msgid "You do not have a valid HEAD"
454 msgstr ""
455
456 -#: sequencer.c:376
456 +#: sequencer.c:413
457 #, c-format
458 msgid "Commit %s is a merge but no -m option was given."
459 msgstr ""
460
461 -#: sequencer.c:384
461 +#: sequencer.c:421
462 #, c-format
463 msgid "Commit %s does not have parent %d"
464 msgstr ""
465
466 -#: sequencer.c:388
466 +#: sequencer.c:425
467 #, c-format
468 msgid "Mainline was specified but commit %s is not a merge."
469 msgstr ""
470
471 #. TRANSLATORS: The first %s will be "revert" or
472 #. "cherry-pick", the second %s a SHA1
473 -#: sequencer.c:399
473 +#: sequencer.c:436
474 #, c-format
475 msgid "%s: cannot parse parent commit %s"
476 msgstr ""
477
478 -#: sequencer.c:403
478 +#: sequencer.c:440
479 #, c-format
480 msgid "Cannot get commit message for %s"
481 msgstr ""
482
483 -#: sequencer.c:491
483 +#: sequencer.c:524
484 #, c-format
485 msgid "could not revert %s... %s"
486 msgstr ""
487
488 -#: sequencer.c:492
488 +#: sequencer.c:525
489 #, c-format
490 msgid "could not apply %s... %s"
491 msgstr ""
492
493 -#: sequencer.c:536
493 +#: sequencer.c:553
494 msgid "empty commit set passed"
495 msgstr ""
496
497 -#: sequencer.c:544
497 +#: sequencer.c:561
498 #, c-format
499 msgid "git %s: failed to read the index"
500 msgstr ""
501
502 -#: sequencer.c:549
502 +#: sequencer.c:566
503 #, c-format
504 msgid "git %s: failed to refresh the index"
505 msgstr ""
506
507 -#: sequencer.c:607
507 +#: sequencer.c:624
508 #, c-format
509 msgid "Cannot %s during a %s"
510 msgstr ""
511
512 -#: sequencer.c:629
512 +#: sequencer.c:646
513 #, c-format
514 msgid "Could not parse line %d."
515 msgstr ""
516
517 -#: sequencer.c:634
517 +#: sequencer.c:651
518 msgid "No commits parsed."
519 msgstr ""
520
521 -#: sequencer.c:647
521 +#: sequencer.c:664
522 #, c-format
523 msgid "Could not open %s"
524 msgstr ""
525
526 -#: sequencer.c:651
526 +#: sequencer.c:668
527 #, c-format
528 msgid "Could not read %s."
529 msgstr ""
530
531 -#: sequencer.c:658
531 +#: sequencer.c:675
532 #, c-format
533 msgid "Unusable instruction sheet: %s"
534 msgstr ""
535
536 -#: sequencer.c:686
536 +#: sequencer.c:703
537 #, c-format
538 msgid "Invalid key: %s"
539 msgstr ""
540
541 -#: sequencer.c:689
541 +#: sequencer.c:706
542 #, c-format
543 msgid "Invalid value for %s: %s"
544 msgstr ""
545
546 -#: sequencer.c:701
546 +#: sequencer.c:718
547 #, c-format
548 msgid "Malformed options sheet: %s"
549 msgstr ""
550
551 -#: sequencer.c:722
551 +#: sequencer.c:739
552 msgid "a cherry-pick or revert is already in progress"
553 msgstr ""
554
555 -#: sequencer.c:723
555 +#: sequencer.c:740
556 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
557 msgstr ""
558
559 -#: sequencer.c:727
559 +#: sequencer.c:744
560 #, c-format
561 msgid "Could not create sequencer directory %s"
562 msgstr ""
563
564 -#: sequencer.c:743 sequencer.c:828
564 +#: sequencer.c:760 sequencer.c:845
565 #, c-format
566 msgid "Error wrapping up %s."
567 msgstr ""
568
569 -#: sequencer.c:762 sequencer.c:896
569 +#: sequencer.c:779 sequencer.c:913
570 msgid "no cherry-pick or revert in progress"
571 msgstr ""
572
573 -#: sequencer.c:764
573 +#: sequencer.c:781
574 msgid "cannot resolve HEAD"
575 msgstr ""
576
577 -#: sequencer.c:766
577 +#: sequencer.c:783
578 msgid "cannot abort from a branch yet to be born"
579 msgstr ""
580
581 -#: sequencer.c:788 builtin/apply.c:3689
581 +#: sequencer.c:805 builtin/apply.c:3697
582 #, c-format
583 msgid "cannot open %s: %s"
584 msgstr ""
585
586 -#: sequencer.c:791
586 +#: sequencer.c:808
587 #, c-format
588 msgid "cannot read %s: %s"
589 msgstr ""
590
591 -#: sequencer.c:792
591 +#: sequencer.c:809
592 msgid "unexpected end of file"
593 msgstr ""
594
595 -#: sequencer.c:798
595 +#: sequencer.c:815
596 #, c-format
597 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
598 msgstr ""
599
600 -#: sequencer.c:821
600 +#: sequencer.c:838
601 #, c-format
602 msgid "Could not format %s."
603 msgstr ""
604
605 -#: sequencer.c:983
605 +#: sequencer.c:1000
606 msgid "Can't revert as initial commit"
607 msgstr ""
608
609 -#: sequencer.c:984
609 +#: sequencer.c:1001
610 msgid "Can't cherry-pick into empty head"
611 msgstr ""
612
@@ -629,6 +629,15 @@ msgstr ""
629 msgid "Upstream branch '%s' not stored as a remote-tracking branch"
630 msgstr ""
631
632 +#: wrapper.c:413
633 +#, c-format
634 +msgid "unable to look up current user in the passwd file: %s"
635 +msgstr ""
636 +
637 +#: wrapper.c:414
638 +msgid "no such user"
639 +msgstr ""
640 +
641 #: wt-status.c:135
642 msgid "Unmerged paths:"
643 msgstr ""
@@ -958,7 +967,7 @@ msgstr ""
967 msgid "index file corrupt"
968 msgstr ""
969
961 -#: builtin/add.c:476 builtin/apply.c:4100 builtin/mv.c:229 builtin/rm.c:260
970 +#: builtin/add.c:476 builtin/apply.c:4108 builtin/mv.c:229 builtin/rm.c:260
971 msgid "Unable to write new index file"
972 msgstr ""
973
@@ -1188,234 +1197,239 @@ msgstr ""
1197 msgid "%s: already exists in index"
1198 msgstr ""
1199
1191 -#: builtin/apply.c:3266
1200 +#: builtin/apply.c:3267
1201 #, c-format
1193 -msgid "new mode (%o) of %s does not match old mode (%o)%s%s"
1202 +msgid "new mode (%o) of %s does not match old mode (%o)"
1203 msgstr ""
1204
1205 #: builtin/apply.c:3272
1206 #, c-format
1207 +msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1208 +msgstr ""
1209 +
1210 +#: builtin/apply.c:3280
1211 +#, c-format
1212 msgid "%s: patch does not apply"
1213 msgstr ""
1214
1201 -#: builtin/apply.c:3285
1215 +#: builtin/apply.c:3293
1216 #, c-format
1217 msgid "Checking patch %s..."
1218 msgstr ""
1219
1206 -#: builtin/apply.c:3340 builtin/checkout.c:212 builtin/reset.c:158
1220 +#: builtin/apply.c:3348 builtin/checkout.c:212 builtin/reset.c:158
1221 #, c-format
1222 msgid "make_cache_entry failed for path '%s'"
1223 msgstr ""
1224
1211 -#: builtin/apply.c:3483
1225 +#: builtin/apply.c:3491
1226 #, c-format
1227 msgid "unable to remove %s from index"
1228 msgstr ""
1229
1216 -#: builtin/apply.c:3510
1230 +#: builtin/apply.c:3518
1231 #, c-format
1232 msgid "corrupt patch for subproject %s"
1233 msgstr ""
1234
1221 -#: builtin/apply.c:3514
1235 +#: builtin/apply.c:3522
1236 #, c-format
1237 msgid "unable to stat newly created file '%s'"
1238 msgstr ""
1239
1226 -#: builtin/apply.c:3519
1240 +#: builtin/apply.c:3527
1241 #, c-format
1242 msgid "unable to create backing store for newly created file %s"
1243 msgstr ""
1244
1231 -#: builtin/apply.c:3522
1245 +#: builtin/apply.c:3530
1246 #, c-format
1247 msgid "unable to add cache entry for %s"
1248 msgstr ""
1249
1236 -#: builtin/apply.c:3555
1250 +#: builtin/apply.c:3563
1251 #, c-format
1252 msgid "closing file '%s'"
1253 msgstr ""
1254
1241 -#: builtin/apply.c:3604
1255 +#: builtin/apply.c:3612
1256 #, c-format
1257 msgid "unable to write file '%s' mode %o"
1258 msgstr ""
1259
1246 -#: builtin/apply.c:3660
1260 +#: builtin/apply.c:3668
1261 #, c-format
1262 msgid "Applied patch %s cleanly."
1263 msgstr ""
1264
1251 -#: builtin/apply.c:3668
1265 +#: builtin/apply.c:3676
1266 msgid "internal error"
1267 msgstr ""
1268
1269 #. Say this even without --verbose
1256 -#: builtin/apply.c:3671
1270 +#: builtin/apply.c:3679
1271 #, c-format
1272 msgid "Applying patch %%s with %d reject..."
1273 msgid_plural "Applying patch %%s with %d rejects..."
1274 msgstr[0] ""
1275 msgstr[1] ""
1276
1263 -#: builtin/apply.c:3681
1277 +#: builtin/apply.c:3689
1278 #, c-format
1279 msgid "truncating .rej filename to %.*s.rej"
1280 msgstr ""
1281
1268 -#: builtin/apply.c:3702
1282 +#: builtin/apply.c:3710
1283 #, c-format
1284 msgid "Hunk #%d applied cleanly."
1285 msgstr ""
1286
1273 -#: builtin/apply.c:3705
1287 +#: builtin/apply.c:3713
1288 #, c-format
1289 msgid "Rejected hunk #%d."
1290 msgstr ""
1291
1278 -#: builtin/apply.c:3836
1292 +#: builtin/apply.c:3844
1293 msgid "unrecognized input"
1294 msgstr ""
1295
1282 -#: builtin/apply.c:3847
1296 +#: builtin/apply.c:3855
1297 msgid "unable to read index file"
1298 msgstr ""
1299
1286 -#: builtin/apply.c:3962 builtin/apply.c:3965
1300 +#: builtin/apply.c:3970 builtin/apply.c:3973
1301 msgid "path"
1302 msgstr ""
1303
1290 -#: builtin/apply.c:3963
1304 +#: builtin/apply.c:3971
1305 msgid "don't apply changes matching the given path"
1306 msgstr ""
1307
1294 -#: builtin/apply.c:3966
1308 +#: builtin/apply.c:3974
1309 msgid "apply changes matching the given path"
1310 msgstr ""
1311
1298 -#: builtin/apply.c:3968
1312 +#: builtin/apply.c:3976
1313 msgid "num"
1314 msgstr ""
1315
1302 -#: builtin/apply.c:3969
1316 +#: builtin/apply.c:3977
1317 msgid "remove <num> leading slashes from traditional diff paths"
1318 msgstr ""
1319
1306 -#: builtin/apply.c:3972
1320 +#: builtin/apply.c:3980
1321 msgid "ignore additions made by the patch"
1322 msgstr ""
1323
1310 -#: builtin/apply.c:3974
1324 +#: builtin/apply.c:3982
1325 msgid "instead of applying the patch, output diffstat for the input"
1326 msgstr ""
1327
1314 -#: builtin/apply.c:3978
1328 +#: builtin/apply.c:3986
1329 msgid "shows number of added and deleted lines in decimal notation"
1330 msgstr ""
1331
1318 -#: builtin/apply.c:3980
1332 +#: builtin/apply.c:3988
1333 msgid "instead of applying the patch, output a summary for the input"
1334 msgstr ""
1335
1322 -#: builtin/apply.c:3982
1336 +#: builtin/apply.c:3990
1337 msgid "instead of applying the patch, see if the patch is applicable"
1338 msgstr ""
1339
1326 -#: builtin/apply.c:3984
1340 +#: builtin/apply.c:3992
1341 msgid "make sure the patch is applicable to the current index"
1342 msgstr ""
1343
1330 -#: builtin/apply.c:3986
1344 +#: builtin/apply.c:3994
1345 msgid "apply a patch without touching the working tree"
1346 msgstr ""
1347
1334 -#: builtin/apply.c:3988
1348 +#: builtin/apply.c:3996
1349 msgid "also apply the patch (use with --stat/--summary/--check)"
1350 msgstr ""
1351
1338 -#: builtin/apply.c:3990
1352 +#: builtin/apply.c:3998
1353 msgid "build a temporary index based on embedded index information"
1354 msgstr ""
1355
1342 -#: builtin/apply.c:3992
1356 +#: builtin/apply.c:4000
1357 msgid "paths are separated with NUL character"
1358 msgstr ""
1359
1346 -#: builtin/apply.c:3995
1360 +#: builtin/apply.c:4003
1361 msgid "ensure at least <n> lines of context match"
1362 msgstr ""
1363
1350 -#: builtin/apply.c:3996
1364 +#: builtin/apply.c:4004
1365 msgid "action"
1366 msgstr ""
1367
1354 -#: builtin/apply.c:3997
1368 +#: builtin/apply.c:4005
1369 msgid "detect new or modified lines that have whitespace errors"
1370 msgstr ""
1371
1358 -#: builtin/apply.c:4000 builtin/apply.c:4003
1372 +#: builtin/apply.c:4008 builtin/apply.c:4011
1373 msgid "ignore changes in whitespace when finding context"
1374 msgstr ""
1375
1362 -#: builtin/apply.c:4006
1376 +#: builtin/apply.c:4014
1377 msgid "apply the patch in reverse"
1378 msgstr ""
1379
1366 -#: builtin/apply.c:4008
1380 +#: builtin/apply.c:4016
1381 msgid "don't expect at least one line of context"
1382 msgstr ""
1383
1370 -#: builtin/apply.c:4010
1384 +#: builtin/apply.c:4018
1385 msgid "leave the rejected hunks in corresponding *.rej files"
1386 msgstr ""
1387
1374 -#: builtin/apply.c:4012
1388 +#: builtin/apply.c:4020
1389 msgid "allow overlapping hunks"
1390 msgstr ""
1391
1378 -#: builtin/apply.c:4013
1392 +#: builtin/apply.c:4021
1393 msgid "be verbose"
1394 msgstr ""
1395
1382 -#: builtin/apply.c:4015
1396 +#: builtin/apply.c:4023
1397 msgid "tolerate incorrectly detected missing new-line at the end of file"
1398 msgstr ""
1399
1386 -#: builtin/apply.c:4018
1400 +#: builtin/apply.c:4026
1401 msgid "do not trust the line counts in the hunk headers"
1402 msgstr ""
1403
1390 -#: builtin/apply.c:4020
1404 +#: builtin/apply.c:4028
1405 msgid "root"
1406 msgstr ""
1407
1394 -#: builtin/apply.c:4021
1408 +#: builtin/apply.c:4029
1409 msgid "prepend <root> to all filenames"
1410 msgstr ""
1411
1398 -#: builtin/apply.c:4042
1412 +#: builtin/apply.c:4050
1413 msgid "--index outside a repository"
1414 msgstr ""
1415
1402 -#: builtin/apply.c:4045
1416 +#: builtin/apply.c:4053
1417 msgid "--cached outside a repository"
1418 msgstr ""
1419
1406 -#: builtin/apply.c:4061
1420 +#: builtin/apply.c:4069
1421 #, c-format
1422 msgid "can't open patch '%s'"
1423 msgstr ""
1424
1411 -#: builtin/apply.c:4075
1425 +#: builtin/apply.c:4083
1426 #, c-format
1427 msgid "squelched %d whitespace error"
1428 msgid_plural "squelched %d whitespace errors"
1429 msgstr[0] ""
1430 msgstr[1] ""
1431
1418 -#: builtin/apply.c:4081 builtin/apply.c:4091
1432 +#: builtin/apply.c:4089 builtin/apply.c:4099
1433 #, c-format
1434 msgid "%d line adds whitespace errors."
1435 msgid_plural "%d lines add whitespace errors."
@@ -2090,52 +2104,52 @@ msgstr ""
2104 msgid "malformed --author parameter"
2105 msgstr ""
2106
2093 -#: builtin/commit.c:583
2107 +#: builtin/commit.c:582
2108 #, c-format
2109 msgid "Malformed ident string: '%s'"
2110 msgstr ""
2111
2098 -#: builtin/commit.c:621 builtin/commit.c:654 builtin/commit.c:968
2112 +#: builtin/commit.c:620 builtin/commit.c:653 builtin/commit.c:967
2113 #, c-format
2114 msgid "could not lookup commit %s"
2115 msgstr ""
2116
2103 -#: builtin/commit.c:633 builtin/shortlog.c:296
2117 +#: builtin/commit.c:632 builtin/shortlog.c:296
2118 #, c-format
2119 msgid "(reading log message from standard input)\n"
2120 msgstr ""
2121
2108 -#: builtin/commit.c:635
2122 +#: builtin/commit.c:634
2123 msgid "could not read log from standard input"
2124 msgstr ""
2125
2112 -#: builtin/commit.c:639
2126 +#: builtin/commit.c:638
2127 #, c-format
2128 msgid "could not read log file '%s'"
2129 msgstr ""
2130
2117 -#: builtin/commit.c:645
2131 +#: builtin/commit.c:644
2132 msgid "commit has empty message"
2133 msgstr ""
2134
2121 -#: builtin/commit.c:661
2135 +#: builtin/commit.c:660
2136 msgid "could not read MERGE_MSG"
2137 msgstr ""
2138
2125 -#: builtin/commit.c:665
2139 +#: builtin/commit.c:664
2140 msgid "could not read SQUASH_MSG"
2141 msgstr ""
2142
2129 -#: builtin/commit.c:669
2143 +#: builtin/commit.c:668
2144 #, c-format
2145 msgid "could not read '%s'"
2146 msgstr ""
2147
2134 -#: builtin/commit.c:721
2148 +#: builtin/commit.c:720
2149 msgid "could not write commit template"
2150 msgstr ""
2151
2138 -#: builtin/commit.c:732
2152 +#: builtin/commit.c:731
2153 #, c-format
2154 msgid ""
2155 "\n"
@@ -2145,7 +2159,7 @@ msgid ""
2159 "and try again.\n"
2160 msgstr ""
2161
2148 -#: builtin/commit.c:737
2162 +#: builtin/commit.c:736
2163 #, c-format
2164 msgid ""
2165 "\n"
@@ -2155,171 +2169,171 @@ msgid ""
2169 "and try again.\n"
2170 msgstr ""
2171
2158 -#: builtin/commit.c:749
2172 +#: builtin/commit.c:748
2173 msgid ""
2174 "Please enter the commit message for your changes. Lines starting\n"
2175 "with '#' will be ignored, and an empty message aborts the commit.\n"
2176 msgstr ""
2177
2164 -#: builtin/commit.c:754
2178 +#: builtin/commit.c:753
2179 msgid ""
2180 "Please enter the commit message for your changes. Lines starting\n"
2181 "with '#' will be kept; you may remove them yourself if you want to.\n"
2182 "An empty message aborts the commit.\n"
2183 msgstr ""
2184
2171 -#: builtin/commit.c:767
2185 +#: builtin/commit.c:766
2186 #, c-format
2187 msgid "%sAuthor: %s"
2188 msgstr ""
2189
2176 -#: builtin/commit.c:774
2190 +#: builtin/commit.c:773
2191 #, c-format
2192 msgid "%sCommitter: %s"
2193 msgstr ""
2194
2181 -#: builtin/commit.c:794
2195 +#: builtin/commit.c:793
2196 msgid "Cannot read index"
2197 msgstr ""
2198
2185 -#: builtin/commit.c:831
2199 +#: builtin/commit.c:830
2200 msgid "Error building trees"
2201 msgstr ""
2202
2189 -#: builtin/commit.c:846 builtin/tag.c:361
2203 +#: builtin/commit.c:845 builtin/tag.c:361
2204 #, c-format
2205 msgid "Please supply the message using either -m or -F option.\n"
2206 msgstr ""
2207
2194 -#: builtin/commit.c:943
2208 +#: builtin/commit.c:942
2209 #, c-format
2210 msgid "No existing author found with '%s'"
2211 msgstr ""
2212
2199 -#: builtin/commit.c:958 builtin/commit.c:1158
2213 +#: builtin/commit.c:957 builtin/commit.c:1157
2214 #, c-format
2215 msgid "Invalid untracked files mode '%s'"
2216 msgstr ""
2217
2204 -#: builtin/commit.c:998
2218 +#: builtin/commit.c:997
2219 msgid "Using both --reset-author and --author does not make sense"
2220 msgstr ""
2221
2208 -#: builtin/commit.c:1009
2222 +#: builtin/commit.c:1008
2223 msgid "You have nothing to amend."
2224 msgstr ""
2225
2212 -#: builtin/commit.c:1012
2226 +#: builtin/commit.c:1011
2227 msgid "You are in the middle of a merge -- cannot amend."
2228 msgstr ""
2229
2216 -#: builtin/commit.c:1014
2230 +#: builtin/commit.c:1013
2231 msgid "You are in the middle of a cherry-pick -- cannot amend."
2232 msgstr ""
2233
2220 -#: builtin/commit.c:1017
2234 +#: builtin/commit.c:1016
2235 msgid "Options --squash and --fixup cannot be used together"
2236 msgstr ""
2237
2224 -#: builtin/commit.c:1027
2238 +#: builtin/commit.c:1026
2239 msgid "Only one of -c/-C/-F/--fixup can be used."
2240 msgstr ""
2241
2228 -#: builtin/commit.c:1029
2242 +#: builtin/commit.c:1028
2243 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
2244 msgstr ""
2245
2232 -#: builtin/commit.c:1037
2246 +#: builtin/commit.c:1036
2247 msgid "--reset-author can be used only with -C, -c or --amend."
2248 msgstr ""
2249
2236 -#: builtin/commit.c:1054
2250 +#: builtin/commit.c:1053
2251 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
2252 msgstr ""
2253
2240 -#: builtin/commit.c:1056
2254 +#: builtin/commit.c:1055
2255 msgid "No paths with --include/--only does not make sense."
2256 msgstr ""
2257
2244 -#: builtin/commit.c:1058
2258 +#: builtin/commit.c:1057
2259 msgid "Clever... amending the last one with dirty index."
2260 msgstr ""
2261
2248 -#: builtin/commit.c:1060
2262 +#: builtin/commit.c:1059
2263 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
2264 msgstr ""
2265
2252 -#: builtin/commit.c:1070 builtin/tag.c:577
2266 +#: builtin/commit.c:1069 builtin/tag.c:577
2267 #, c-format
2268 msgid "Invalid cleanup mode %s"
2269 msgstr ""
2270
2257 -#: builtin/commit.c:1075
2271 +#: builtin/commit.c:1074
2272 msgid "Paths with -a does not make sense."
2273 msgstr ""
2274
2261 -#: builtin/commit.c:1258
2275 +#: builtin/commit.c:1257
2276 msgid "couldn't look up newly created commit"
2277 msgstr ""
2278
2265 -#: builtin/commit.c:1260
2279 +#: builtin/commit.c:1259
2280 msgid "could not parse newly created commit"
2281 msgstr ""
2282
2269 -#: builtin/commit.c:1301
2283 +#: builtin/commit.c:1300
2284 msgid "detached HEAD"
2285 msgstr ""
2286
2273 -#: builtin/commit.c:1303
2287 +#: builtin/commit.c:1302
2288 msgid " (root-commit)"
2289 msgstr ""
2290
2277 -#: builtin/commit.c:1447
2291 +#: builtin/commit.c:1446
2292 msgid "could not parse HEAD commit"
2293 msgstr ""
2294
2281 -#: builtin/commit.c:1485 builtin/merge.c:509
2295 +#: builtin/commit.c:1484 builtin/merge.c:509
2296 #, c-format
2297 msgid "could not open '%s' for reading"
2298 msgstr ""
2299
2286 -#: builtin/commit.c:1492
2300 +#: builtin/commit.c:1491
2301 #, c-format
2302 msgid "Corrupt MERGE_HEAD file (%s)"
2303 msgstr ""
2304
2291 -#: builtin/commit.c:1499
2305 +#: builtin/commit.c:1498
2306 msgid "could not read MERGE_MODE"
2307 msgstr ""
2308
2295 -#: builtin/commit.c:1518
2309 +#: builtin/commit.c:1517
2310 #, c-format
2311 msgid "could not read commit message: %s"
2312 msgstr ""
2313
2300 -#: builtin/commit.c:1532
2314 +#: builtin/commit.c:1531
2315 #, c-format
2316 msgid "Aborting commit; you did not edit the message.\n"
2317 msgstr ""
2318
2305 -#: builtin/commit.c:1537
2319 +#: builtin/commit.c:1536
2320 #, c-format
2321 msgid "Aborting commit due to empty commit message.\n"
2322 msgstr ""
2323
2310 -#: builtin/commit.c:1552 builtin/merge.c:936 builtin/merge.c:961
2324 +#: builtin/commit.c:1551 builtin/merge.c:936 builtin/merge.c:961
2325 msgid "failed to write commit object"
2326 msgstr ""
2327
2314 -#: builtin/commit.c:1573
2328 +#: builtin/commit.c:1572
2329 msgid "cannot lock HEAD ref"
2330 msgstr ""
2331
2318 -#: builtin/commit.c:1577
2332 +#: builtin/commit.c:1576
2333 msgid "cannot update HEAD ref"
2334 msgstr ""
2335
2322 -#: builtin/commit.c:1588
2336 +#: builtin/commit.c:1587
2337 msgid ""
2338 "Repository has been updated, but unable to write\n"
2339 "new_index file. Check that disk is not full or quota is\n"
@@ -2646,32 +2660,32 @@ msgstr ""
2660 msgid "cannot open '%s'"
2661 msgstr ""
2662
2649 -#: builtin/grep.c:888
2663 +#: builtin/grep.c:885
2664 msgid "no pattern given."
2665 msgstr ""
2666
2653 -#: builtin/grep.c:902
2667 +#: builtin/grep.c:899
2668 #, c-format
2669 msgid "bad object %s"
2670 msgstr ""
2671
2658 -#: builtin/grep.c:943
2672 +#: builtin/grep.c:940
2673 msgid "--open-files-in-pager only works on the worktree"
2674 msgstr ""
2675
2662 -#: builtin/grep.c:966
2676 +#: builtin/grep.c:963
2677 msgid "--cached or --untracked cannot be used with --no-index."
2678 msgstr ""
2679
2666 -#: builtin/grep.c:971
2680 +#: builtin/grep.c:968
2681 msgid "--no-index or --untracked cannot be used with revs."
2682 msgstr ""
2683
2670 -#: builtin/grep.c:974
2684 +#: builtin/grep.c:971
2685 msgid "--[no-]exclude-standard cannot be used for tracked contents."
2686 msgstr ""
2687
2674 -#: builtin/grep.c:982
2688 +#: builtin/grep.c:979
2689 msgid "both --cached and trees are given."
2690 msgstr ""
2691
@@ -3136,85 +3150,81 @@ msgstr ""
3150 msgid "format.headers without value"
3151 msgstr ""
3152
3139 -#: builtin/log.c:675
3153 +#: builtin/log.c:676
3154 msgid "name of output directory is too long"
3155 msgstr ""
3156
3143 -#: builtin/log.c:686
3157 +#: builtin/log.c:687
3158 #, c-format
3159 msgid "Cannot open patch file %s"
3160 msgstr ""
3161
3148 -#: builtin/log.c:700
3162 +#: builtin/log.c:701
3163 msgid "Need exactly one range."
3164 msgstr ""
3165
3152 -#: builtin/log.c:708
3166 +#: builtin/log.c:709
3167 msgid "Not a range."
3168 msgstr ""
3169
3156 -#: builtin/log.c:745
3157 -msgid "Could not extract email from committer identity."
3158 -msgstr ""
3159 -
3160 -#: builtin/log.c:791
3170 +#: builtin/log.c:786
3171 msgid "Cover letter needs email format"
3172 msgstr ""
3173
3164 -#: builtin/log.c:885
3174 +#: builtin/log.c:859
3175 #, c-format
3176 msgid "insane in-reply-to: %s"
3177 msgstr ""
3178
3169 -#: builtin/log.c:958
3179 +#: builtin/log.c:932
3180 msgid "Two output directories?"
3181 msgstr ""
3182
3173 -#: builtin/log.c:1179
3183 +#: builtin/log.c:1153
3184 #, c-format
3185 msgid "bogus committer info %s"
3186 msgstr ""
3187
3178 -#: builtin/log.c:1224
3188 +#: builtin/log.c:1198
3189 msgid "-n and -k are mutually exclusive."
3190 msgstr ""
3191
3182 -#: builtin/log.c:1226
3192 +#: builtin/log.c:1200
3193 msgid "--subject-prefix and -k are mutually exclusive."
3194 msgstr ""
3195
3186 -#: builtin/log.c:1234
3196 +#: builtin/log.c:1208
3197 msgid "--name-only does not make sense"
3198 msgstr ""
3199
3190 -#: builtin/log.c:1236
3200 +#: builtin/log.c:1210
3201 msgid "--name-status does not make sense"
3202 msgstr ""
3203
3194 -#: builtin/log.c:1238
3204 +#: builtin/log.c:1212
3205 msgid "--check does not make sense"
3206 msgstr ""
3207
3198 -#: builtin/log.c:1261
3208 +#: builtin/log.c:1235
3209 msgid "standard output, or directory, which one?"
3210 msgstr ""
3211
3202 -#: builtin/log.c:1263
3212 +#: builtin/log.c:1237
3213 #, c-format
3214 msgid "Could not create directory '%s'"
3215 msgstr ""
3216
3207 -#: builtin/log.c:1416
3217 +#: builtin/log.c:1390
3218 msgid "Failed to create output files"
3219 msgstr ""
3220
3211 -#: builtin/log.c:1520
3221 +#: builtin/log.c:1494
3222 #, c-format
3223 msgid ""
3224 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
3225 msgstr ""
3226
3217 -#: builtin/log.c:1536 builtin/log.c:1538 builtin/log.c:1550
3227 +#: builtin/log.c:1510 builtin/log.c:1512 builtin/log.c:1524
3228 #, c-format
3229 msgid "Unknown commit %s"
3230 msgstr ""
@@ -3684,22 +3694,22 @@ msgstr ""
3694 msgid "Unknown subcommand: %s"
3695 msgstr ""
3696
3687 -#: builtin/pack-objects.c:2315
3697 +#: builtin/pack-objects.c:2337
3698 #, c-format
3699 msgid "unsupported index version %s"
3700 msgstr ""
3701
3692 -#: builtin/pack-objects.c:2319
3702 +#: builtin/pack-objects.c:2341
3703 #, c-format
3704 msgid "bad index version '%s'"
3705 msgstr ""
3706
3697 -#: builtin/pack-objects.c:2342
3707 +#: builtin/pack-objects.c:2364
3708 #, c-format
3709 msgid "option %s does not accept negative form"
3710 msgstr ""
3711
3702 -#: builtin/pack-objects.c:2346
3712 +#: builtin/pack-objects.c:2368
3713 #, c-format
3714 msgid "unable to parse value '%s' for option %s"
3715 msgstr ""
@@ -3930,7 +3940,7 @@ msgstr ""
3940 #: builtin/remote.c:677
3941 #, c-format
3942 msgid ""
3933 -"Not updating non-default fetch respec\n"
3943 +"Not updating non-default fetch refspec\n"
3944 "\t%s\n"
3945 "\tPlease update the configuration manually if necessary."
3946 msgstr ""
@@ -4936,106 +4946,106 @@ msgstr ""
4946 msgid "Stopping at '$sm_path'; script returned non-zero status."
4947 msgstr ""
4948
4939 -#: git-submodule.sh:405
4949 +#: git-submodule.sh:406
4950 #, sh-format
4951 msgid "No url found for submodule path '$sm_path' in .gitmodules"
4952 msgstr ""
4953
4944 -#: git-submodule.sh:414
4954 +#: git-submodule.sh:415
4955 #, sh-format
4956 msgid "Failed to register url for submodule path '$sm_path'"
4957 msgstr ""
4958
4949 -#: git-submodule.sh:422
4959 +#: git-submodule.sh:417
4960 #, sh-format
4951 -msgid "Failed to register update mode for submodule path '$sm_path'"
4961 +msgid "Submodule '$name' ($url) registered for path '$sm_path'"
4962 msgstr ""
4963
4954 -#: git-submodule.sh:424
4964 +#: git-submodule.sh:425
4965 #, sh-format
4956 -msgid "Submodule '$name' ($url) registered for path '$sm_path'"
4966 +msgid "Failed to register update mode for submodule path '$sm_path'"
4967 msgstr ""
4968
4959 -#: git-submodule.sh:523
4969 +#: git-submodule.sh:524
4970 #, sh-format
4971 msgid ""
4972 "Submodule path '$sm_path' not initialized\n"
4973 "Maybe you want to use 'update --init'?"
4974 msgstr ""
4975
4966 -#: git-submodule.sh:536
4976 +#: git-submodule.sh:537
4977 #, sh-format
4978 msgid "Unable to find current revision in submodule path '$sm_path'"
4979 msgstr ""
4980
4971 -#: git-submodule.sh:555
4981 +#: git-submodule.sh:556
4982 #, sh-format
4983 msgid "Unable to fetch in submodule path '$sm_path'"
4984 msgstr ""
4985
4976 -#: git-submodule.sh:569
4986 +#: git-submodule.sh:570
4987 #, sh-format
4988 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
4989 msgstr ""
4990
4981 -#: git-submodule.sh:570
4991 +#: git-submodule.sh:571
4992 #, sh-format
4993 msgid "Submodule path '$sm_path': rebased into '$sha1'"
4994 msgstr ""
4995
4986 -#: git-submodule.sh:575
4996 +#: git-submodule.sh:576
4997 #, sh-format
4998 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
4999 msgstr ""
5000
4991 -#: git-submodule.sh:576
5001 +#: git-submodule.sh:577
5002 #, sh-format
5003 msgid "Submodule path '$sm_path': merged in '$sha1'"
5004 msgstr ""
5005
4996 -#: git-submodule.sh:581
5006 +#: git-submodule.sh:582
5007 #, sh-format
5008 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
5009 msgstr ""
5010
5001 -#: git-submodule.sh:582
5011 +#: git-submodule.sh:583
5012 #, sh-format
5013 msgid "Submodule path '$sm_path': checked out '$sha1'"
5014 msgstr ""
5015
5006 -#: git-submodule.sh:604 git-submodule.sh:927
5016 +#: git-submodule.sh:605 git-submodule.sh:928
5017 #, sh-format
5018 msgid "Failed to recurse into submodule path '$sm_path'"
5019 msgstr ""
5020
5011 -#: git-submodule.sh:712
5021 +#: git-submodule.sh:713
5022 msgid "--"
5023 msgstr ""
5024
5015 -#: git-submodule.sh:770
5025 +#: git-submodule.sh:771
5026 #, sh-format
5027 msgid " Warn: $name doesn't contain commit $sha1_src"
5028 msgstr ""
5029
5020 -#: git-submodule.sh:773
5030 +#: git-submodule.sh:774
5031 #, sh-format
5032 msgid " Warn: $name doesn't contain commit $sha1_dst"
5033 msgstr ""
5034
5025 -#: git-submodule.sh:776
5035 +#: git-submodule.sh:777
5036 #, sh-format
5037 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
5038 msgstr ""
5039
5030 -#: git-submodule.sh:801
5040 +#: git-submodule.sh:802
5041 msgid "blob"
5042 msgstr ""
5043
5034 -#: git-submodule.sh:802
5044 +#: git-submodule.sh:803
5045 msgid "submodule"
5046 msgstr ""
5047
5038 -#: git-submodule.sh:973
5048 +#: git-submodule.sh:974
5049 #, sh-format
5050 msgid "Synchronizing submodule url for '$name'"
5051 msgstr ""