@matheusbsbs / matheus-bagliano / commits / b8ecf239d0

l10n: git.pot: v1.8.4 round 2 (5 new, 3 removed)

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

Jiang Xin committed Aug 6, 2013 at 14:13 UTC b8ecf239d08041f1c56266328bbdff15fe04782a
1 file changed +174 -161
po/git.pot
+174 -161
@@ -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-07-26 14:19+0800\n"
11 +"POT-Creation-Date: 2013-08-06 14:10+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"
@@ -250,7 +250,7 @@ msgstr ""
250 msgid "unrecognized header: %s%s (%d)"
251 msgstr ""
252
253 -#: bundle.c:89 builtin/commit.c:683
253 +#: bundle.c:89 builtin/commit.c:697
254 #, c-format
255 msgid "could not open '%s'"
256 msgstr ""
@@ -484,48 +484,48 @@ msgstr ""
484 msgid "'%s': short read %s"
485 msgstr ""
486
487 -#: help.c:213
487 +#: help.c:210
488 #, c-format
489 msgid "available git commands in '%s'"
490 msgstr ""
491
492 -#: help.c:220
492 +#: help.c:217
493 msgid "git commands available from elsewhere on your $PATH"
494 msgstr ""
495
496 -#: help.c:236
496 +#: help.c:233
497 msgid "The most commonly used git commands are:"
498 msgstr ""
499
500 -#: help.c:293
500 +#: help.c:290
501 #, c-format
502 msgid ""
503 "'%s' appears to be a git command, but we were not\n"
504 "able to execute it. Maybe git-%s is broken?"
505 msgstr ""
506
507 -#: help.c:350
507 +#: help.c:347
508 msgid "Uh oh. Your system reports no Git commands at all."
509 msgstr ""
510
511 -#: help.c:372
511 +#: help.c:369
512 #, c-format
513 msgid ""
514 "WARNING: You called a Git command named '%s', which does not exist.\n"
515 "Continuing under the assumption that you meant '%s'"
516 msgstr ""
517
518 -#: help.c:377
518 +#: help.c:374
519 #, c-format
520 msgid "in %0.1f seconds automatically..."
521 msgstr ""
522
523 -#: help.c:384
523 +#: help.c:381
524 #, c-format
525 msgid "git: '%s' is not a git command. See 'git --help'."
526 msgstr ""
527
528 -#: help.c:388 help.c:447
528 +#: help.c:385 help.c:444
529 msgid ""
530 "\n"
531 "Did you mean this?"
@@ -535,7 +535,7 @@ msgid_plural ""
535 msgstr[0] ""
536 msgstr[1] ""
537
538 -#: help.c:443
538 +#: help.c:440
539 #, c-format
540 msgid "%s: %s - %s"
541 msgstr ""
@@ -1155,7 +1155,7 @@ msgid ""
1155 "\n"
1156 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1157 "examine these refs and maybe delete them. Turn this message off by\n"
1158 -"running \"git config advice.object_name_warning false\""
1158 +"running \"git config advice.objectNameWarning false\""
1159 msgstr ""
1160
1161 #: sha1_name.c:1097
@@ -1654,7 +1654,7 @@ msgstr ""
1654 msgid "unexpected diff status %c"
1655 msgstr ""
1656
1657 -#: builtin/add.c:149 builtin/commit.c:238
1657 +#: builtin/add.c:149 builtin/commit.c:252
1658 msgid "updating files failed"
1659 msgstr ""
1660
@@ -1703,14 +1703,14 @@ msgstr ""
1703 msgid "The following paths are ignored by one of your .gitignore files:\n"
1704 msgstr ""
1705
1706 -#: builtin/add.c:394 builtin/clean.c:851 builtin/fetch.c:78 builtin/mv.c:63
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
1709 msgid "dry run"
1710 msgstr ""
1711
1712 #: builtin/add.c:395 builtin/apply.c:4410 builtin/check-ignore.c:19
1713 -#: builtin/commit.c:1201 builtin/count-objects.c:95 builtin/fsck.c:613
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
1715 msgid "be verbose"
1716 msgstr ""
@@ -1791,8 +1791,8 @@ msgstr ""
1791 msgid "Maybe you wanted to say 'git add .'?\n"
1792 msgstr ""
1793
1794 -#: builtin/add.c:533 builtin/check-ignore.c:161 builtin/clean.c:895
1795 -#: builtin/commit.c:298 builtin/mv.c:82 builtin/rm.c:297
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
1796 msgid "index file corrupt"
1797 msgstr ""
1798
@@ -2635,8 +2635,8 @@ msgid "act on remote-tracking branches"
2635 msgstr ""
2636
2637 #: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832
2638 -#: builtin/branch.c:838 builtin/commit.c:1414 builtin/commit.c:1415
2639 -#: builtin/commit.c:1416 builtin/commit.c:1417 builtin/tag.c:468
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
2640 msgid "commit"
2641 msgstr ""
2642
@@ -2813,43 +2813,43 @@ msgstr ""
2813 msgid "Need a repository to unbundle."
2814 msgstr ""
2815
2816 -#: builtin/cat-file.c:303
2816 +#: builtin/cat-file.c:285
2817 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
2818 msgstr ""
2819
2820 -#: builtin/cat-file.c:304
2820 +#: builtin/cat-file.c:286
2821 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
2822 msgstr ""
2823
2824 -#: builtin/cat-file.c:341
2824 +#: builtin/cat-file.c:323
2825 msgid "<type> can be one of: blob, tree, commit, tag"
2826 msgstr ""
2827
2828 -#: builtin/cat-file.c:342
2828 +#: builtin/cat-file.c:324
2829 msgid "show object type"
2830 msgstr ""
2831
2832 -#: builtin/cat-file.c:343
2832 +#: builtin/cat-file.c:325
2833 msgid "show object size"
2834 msgstr ""
2835
2836 -#: builtin/cat-file.c:345
2836 +#: builtin/cat-file.c:327
2837 msgid "exit with zero when there's no error"
2838 msgstr ""
2839
2840 -#: builtin/cat-file.c:346
2840 +#: builtin/cat-file.c:328
2841 msgid "pretty-print object's content"
2842 msgstr ""
2843
2844 -#: builtin/cat-file.c:348
2844 +#: builtin/cat-file.c:330
2845 msgid "for blob objects, run textconv on object's content"
2846 msgstr ""
2847
2848 -#: builtin/cat-file.c:350
2848 +#: builtin/cat-file.c:332
2849 msgid "show info and content of objects fed from the standard input"
2850 msgstr ""
2851
2852 -#: builtin/cat-file.c:353
2852 +#: builtin/cat-file.c:335
2853 msgid "show info about objects fed from the standard input"
2854 msgstr ""
2855
@@ -3299,35 +3299,35 @@ msgid ""
3299 " - (empty) finish selecting"
3300 msgstr ""
3301
3302 -#: builtin/clean.c:491
3302 +#: builtin/clean.c:515
3303 #, c-format
3304 msgid "Huh (%s)?"
3305 msgstr ""
3306
3307 -#: builtin/clean.c:634
3307 +#: builtin/clean.c:658
3308 #, c-format
3309 msgid "Input ignore patterns>> "
3310 msgstr ""
3311
3312 -#: builtin/clean.c:671
3312 +#: builtin/clean.c:695
3313 #, c-format
3314 msgid "WARNING: Cannot find items matched by: %s"
3315 msgstr ""
3316
3317 -#: builtin/clean.c:692
3317 +#: builtin/clean.c:716
3318 msgid "Select items to delete"
3319 msgstr ""
3320
3321 -#: builtin/clean.c:732
3321 +#: builtin/clean.c:756
3322 #, c-format
3323 msgid "remove %s? "
3324 msgstr ""
3325
3326 -#: builtin/clean.c:757
3326 +#: builtin/clean.c:781
3327 msgid "Bye."
3328 msgstr ""
3329
3330 -#: builtin/clean.c:765
3330 +#: builtin/clean.c:789
3331 msgid ""
3332 "clean - start cleaning\n"
3333 "filter by pattern - exclude items from deletion\n"
@@ -3338,68 +3338,68 @@ msgid ""
3338 "? - help for prompt selection"
3339 msgstr ""
3340
3341 -#: builtin/clean.c:792
3341 +#: builtin/clean.c:816
3342 msgid "*** Commands ***"
3343 msgstr ""
3344
3345 -#: builtin/clean.c:793
3345 +#: builtin/clean.c:817
3346 msgid "What now"
3347 msgstr ""
3348
3349 -#: builtin/clean.c:801
3349 +#: builtin/clean.c:825
3350 msgid "Would remove the following item:"
3351 msgid_plural "Would remove the following items:"
3352 msgstr[0] ""
3353 msgstr[1] ""
3354
3355 -#: builtin/clean.c:818
3355 +#: builtin/clean.c:842
3356 msgid "No more files to clean, exiting."
3357 msgstr ""
3358
3359 -#: builtin/clean.c:850
3359 +#: builtin/clean.c:874
3360 msgid "do not print names of files removed"
3361 msgstr ""
3362
3363 -#: builtin/clean.c:852
3363 +#: builtin/clean.c:876
3364 msgid "force"
3365 msgstr ""
3366
3367 -#: builtin/clean.c:853
3367 +#: builtin/clean.c:877
3368 msgid "interactive cleaning"
3369 msgstr ""
3370
3371 -#: builtin/clean.c:855
3371 +#: builtin/clean.c:879
3372 msgid "remove whole directories"
3373 msgstr ""
3374
3375 -#: builtin/clean.c:856 builtin/describe.c:420 builtin/grep.c:716
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
3377 msgid "pattern"
3378 msgstr ""
3379
3380 -#: builtin/clean.c:857
3380 +#: builtin/clean.c:881
3381 msgid "add <pattern> to ignore rules"
3382 msgstr ""
3383
3384 -#: builtin/clean.c:858
3384 +#: builtin/clean.c:882
3385 msgid "remove ignored files, too"
3386 msgstr ""
3387
3388 -#: builtin/clean.c:860
3388 +#: builtin/clean.c:884
3389 msgid "remove only ignored files"
3390 msgstr ""
3391
3392 -#: builtin/clean.c:878
3392 +#: builtin/clean.c:902
3393 msgid "-x and -X cannot be used together"
3394 msgstr ""
3395
3396 -#: builtin/clean.c:882
3396 +#: builtin/clean.c:906
3397 msgid ""
3398 "clean.requireForce set to true and neither -i, -n nor -f given; refusing to "
3399 "clean"
3400 msgstr ""
3401
3402 -#: builtin/clean.c:885
3402 +#: builtin/clean.c:909
3403 msgid ""
3404 "clean.requireForce defaults to true and neither -i, -n nor -f given; "
3405 "refusing to clean"
@@ -3714,96 +3714,109 @@ msgid ""
3714 "\n"
3715 " git commit --allow-empty\n"
3716 "\n"
3717 -"Otherwise, please use 'git reset'\n"
3717 msgstr ""
3718
3720 -#: builtin/commit.c:265
3719 +#: builtin/commit.c:69
3720 +msgid "Otherwise, please use 'git reset'\n"
3721 +msgstr ""
3722 +
3723 +#: builtin/commit.c:72
3724 +msgid ""
3725 +"If you wish to skip this commit, use:\n"
3726 +"\n"
3727 +" git reset\n"
3728 +"\n"
3729 +"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
3730 +"the remaining commits.\n"
3731 +msgstr ""
3732 +
3733 +#: builtin/commit.c:279
3734 msgid "failed to unpack HEAD tree object"
3735 msgstr ""
3736
3724 -#: builtin/commit.c:307
3737 +#: builtin/commit.c:321
3738 msgid "unable to create temporary index"
3739 msgstr ""
3740
3728 -#: builtin/commit.c:313
3741 +#: builtin/commit.c:327
3742 msgid "interactive add failed"
3743 msgstr ""
3744
3732 -#: builtin/commit.c:346 builtin/commit.c:367 builtin/commit.c:417
3745 +#: builtin/commit.c:360 builtin/commit.c:381 builtin/commit.c:431
3746 msgid "unable to write new_index file"
3747 msgstr ""
3748
3736 -#: builtin/commit.c:398
3749 +#: builtin/commit.c:412
3750 msgid "cannot do a partial commit during a merge."
3751 msgstr ""
3752
3740 -#: builtin/commit.c:400
3753 +#: builtin/commit.c:414
3754 msgid "cannot do a partial commit during a cherry-pick."
3755 msgstr ""
3756
3744 -#: builtin/commit.c:410
3757 +#: builtin/commit.c:424
3758 msgid "cannot read the index"
3759 msgstr ""
3760
3748 -#: builtin/commit.c:430
3761 +#: builtin/commit.c:444
3762 msgid "unable to write temporary index file"
3763 msgstr ""
3764
3752 -#: builtin/commit.c:521 builtin/commit.c:527
3765 +#: builtin/commit.c:535 builtin/commit.c:541
3766 #, c-format
3767 msgid "invalid commit: %s"
3768 msgstr ""
3769
3757 -#: builtin/commit.c:549
3770 +#: builtin/commit.c:563
3771 msgid "malformed --author parameter"
3772 msgstr ""
3773
3761 -#: builtin/commit.c:569
3774 +#: builtin/commit.c:583
3775 #, c-format
3776 msgid "Malformed ident string: '%s'"
3777 msgstr ""
3778
3766 -#: builtin/commit.c:607 builtin/commit.c:640 builtin/commit.c:963
3779 +#: builtin/commit.c:621 builtin/commit.c:654 builtin/commit.c:982
3780 #, c-format
3781 msgid "could not lookup commit %s"
3782 msgstr ""
3783
3771 -#: builtin/commit.c:619 builtin/shortlog.c:271
3784 +#: builtin/commit.c:633 builtin/shortlog.c:271
3785 #, c-format
3786 msgid "(reading log message from standard input)\n"
3787 msgstr ""
3788
3776 -#: builtin/commit.c:621
3789 +#: builtin/commit.c:635
3790 msgid "could not read log from standard input"
3791 msgstr ""
3792
3780 -#: builtin/commit.c:625
3793 +#: builtin/commit.c:639
3794 #, c-format
3795 msgid "could not read log file '%s'"
3796 msgstr ""
3797
3785 -#: builtin/commit.c:631
3798 +#: builtin/commit.c:645
3799 msgid "commit has empty message"
3800 msgstr ""
3801
3789 -#: builtin/commit.c:647
3802 +#: builtin/commit.c:661
3803 msgid "could not read MERGE_MSG"
3804 msgstr ""
3805
3793 -#: builtin/commit.c:651
3806 +#: builtin/commit.c:665
3807 msgid "could not read SQUASH_MSG"
3808 msgstr ""
3809
3797 -#: builtin/commit.c:655
3810 +#: builtin/commit.c:669
3811 #, c-format
3812 msgid "could not read '%s'"
3813 msgstr ""
3814
3802 -#: builtin/commit.c:716
3815 +#: builtin/commit.c:730
3816 msgid "could not write commit template"
3817 msgstr ""
3818
3806 -#: builtin/commit.c:727
3819 +#: builtin/commit.c:741
3820 #, c-format
3821 msgid ""
3822 "\n"
@@ -3813,7 +3826,7 @@ msgid ""
3826 "and try again.\n"
3827 msgstr ""
3828
3816 -#: builtin/commit.c:732
3829 +#: builtin/commit.c:746
3830 #, c-format
3831 msgid ""
3832 "\n"
@@ -3823,14 +3836,14 @@ msgid ""
3836 "and try again.\n"
3837 msgstr ""
3838
3826 -#: builtin/commit.c:744
3839 +#: builtin/commit.c:758
3840 #, c-format
3841 msgid ""
3842 "Please enter the commit message for your changes. Lines starting\n"
3843 "with '%c' will be ignored, and an empty message aborts the commit.\n"
3844 msgstr ""
3845
3833 -#: builtin/commit.c:749
3846 +#: builtin/commit.c:763
3847 #, c-format
3848 msgid ""
3849 "Please enter the commit message for your changes. Lines starting\n"
@@ -3838,351 +3851,351 @@ msgid ""
3851 "An empty message aborts the commit.\n"
3852 msgstr ""
3853
3841 -#: builtin/commit.c:762
3854 +#: builtin/commit.c:776
3855 #, c-format
3856 msgid "%sAuthor: %s"
3857 msgstr ""
3858
3846 -#: builtin/commit.c:769
3859 +#: builtin/commit.c:783
3860 #, c-format
3861 msgid "%sCommitter: %s"
3862 msgstr ""
3863
3851 -#: builtin/commit.c:789
3864 +#: builtin/commit.c:803
3865 msgid "Cannot read index"
3866 msgstr ""
3867
3855 -#: builtin/commit.c:826
3868 +#: builtin/commit.c:845
3869 msgid "Error building trees"
3870 msgstr ""
3871
3859 -#: builtin/commit.c:841 builtin/tag.c:359
3872 +#: builtin/commit.c:860 builtin/tag.c:359
3873 #, c-format
3874 msgid "Please supply the message using either -m or -F option.\n"
3875 msgstr ""
3876
3864 -#: builtin/commit.c:938
3877 +#: builtin/commit.c:957
3878 #, c-format
3879 msgid "No existing author found with '%s'"
3880 msgstr ""
3881
3869 -#: builtin/commit.c:953 builtin/commit.c:1189
3882 +#: builtin/commit.c:972 builtin/commit.c:1208
3883 #, c-format
3884 msgid "Invalid untracked files mode '%s'"
3885 msgstr ""
3886
3874 -#: builtin/commit.c:990
3887 +#: builtin/commit.c:1009
3888 msgid "--long and -z are incompatible"
3889 msgstr ""
3890
3878 -#: builtin/commit.c:1020
3891 +#: builtin/commit.c:1039
3892 msgid "Using both --reset-author and --author does not make sense"
3893 msgstr ""
3894
3882 -#: builtin/commit.c:1031
3895 +#: builtin/commit.c:1050
3896 msgid "You have nothing to amend."
3897 msgstr ""
3898
3886 -#: builtin/commit.c:1034
3899 +#: builtin/commit.c:1053
3900 msgid "You are in the middle of a merge -- cannot amend."
3901 msgstr ""
3902
3890 -#: builtin/commit.c:1036
3903 +#: builtin/commit.c:1055
3904 msgid "You are in the middle of a cherry-pick -- cannot amend."
3905 msgstr ""
3906
3894 -#: builtin/commit.c:1039
3907 +#: builtin/commit.c:1058
3908 msgid "Options --squash and --fixup cannot be used together"
3909 msgstr ""
3910
3898 -#: builtin/commit.c:1049
3911 +#: builtin/commit.c:1068
3912 msgid "Only one of -c/-C/-F/--fixup can be used."
3913 msgstr ""
3914
3902 -#: builtin/commit.c:1051
3915 +#: builtin/commit.c:1070
3916 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
3917 msgstr ""
3918
3906 -#: builtin/commit.c:1059
3919 +#: builtin/commit.c:1078
3920 msgid "--reset-author can be used only with -C, -c or --amend."
3921 msgstr ""
3922
3910 -#: builtin/commit.c:1076
3923 +#: builtin/commit.c:1095
3924 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
3925 msgstr ""
3926
3914 -#: builtin/commit.c:1078
3927 +#: builtin/commit.c:1097
3928 msgid "No paths with --include/--only does not make sense."
3929 msgstr ""
3930
3918 -#: builtin/commit.c:1080
3931 +#: builtin/commit.c:1099
3932 msgid "Clever... amending the last one with dirty index."
3933 msgstr ""
3934
3922 -#: builtin/commit.c:1082
3935 +#: builtin/commit.c:1101
3936 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
3937 msgstr ""
3938
3926 -#: builtin/commit.c:1092 builtin/tag.c:575
3939 +#: builtin/commit.c:1111 builtin/tag.c:575
3940 #, c-format
3941 msgid "Invalid cleanup mode %s"
3942 msgstr ""
3943
3931 -#: builtin/commit.c:1097
3944 +#: builtin/commit.c:1116
3945 msgid "Paths with -a does not make sense."
3946 msgstr ""
3947
3935 -#: builtin/commit.c:1203 builtin/commit.c:1436
3948 +#: builtin/commit.c:1222 builtin/commit.c:1455
3949 msgid "show status concisely"
3950 msgstr ""
3951
3939 -#: builtin/commit.c:1205 builtin/commit.c:1438
3952 +#: builtin/commit.c:1224 builtin/commit.c:1457
3953 msgid "show branch information"
3954 msgstr ""
3955
3943 -#: builtin/commit.c:1207 builtin/commit.c:1440 builtin/push.c:452
3956 +#: builtin/commit.c:1226 builtin/commit.c:1459 builtin/push.c:452
3957 msgid "machine-readable output"
3958 msgstr ""
3959
3947 -#: builtin/commit.c:1210 builtin/commit.c:1442
3960 +#: builtin/commit.c:1229 builtin/commit.c:1461
3961 msgid "show status in long format (default)"
3962 msgstr ""
3963
3951 -#: builtin/commit.c:1213 builtin/commit.c:1445
3964 +#: builtin/commit.c:1232 builtin/commit.c:1464
3965 msgid "terminate entries with NUL"
3966 msgstr ""
3967
3955 -#: builtin/commit.c:1215 builtin/commit.c:1448 builtin/fast-export.c:667
3968 +#: builtin/commit.c:1234 builtin/commit.c:1467 builtin/fast-export.c:667
3969 #: builtin/fast-export.c:670 builtin/tag.c:459
3970 msgid "mode"
3971 msgstr ""
3972
3960 -#: builtin/commit.c:1216 builtin/commit.c:1448
3973 +#: builtin/commit.c:1235 builtin/commit.c:1467
3974 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
3975 msgstr ""
3976
3964 -#: builtin/commit.c:1219
3977 +#: builtin/commit.c:1238
3978 msgid "show ignored files"
3979 msgstr ""
3980
3968 -#: builtin/commit.c:1220 parse-options.h:154
3981 +#: builtin/commit.c:1239 parse-options.h:154
3982 msgid "when"
3983 msgstr ""
3984
3972 -#: builtin/commit.c:1221
3985 +#: builtin/commit.c:1240
3986 msgid ""
3987 "ignore changes to submodules, optional when: all, dirty, untracked. "
3988 "(Default: all)"
3989 msgstr ""
3990
3978 -#: builtin/commit.c:1223
3991 +#: builtin/commit.c:1242
3992 msgid "list untracked files in columns"
3993 msgstr ""
3994
3982 -#: builtin/commit.c:1294
3995 +#: builtin/commit.c:1313
3996 msgid "couldn't look up newly created commit"
3997 msgstr ""
3998
3986 -#: builtin/commit.c:1296
3999 +#: builtin/commit.c:1315
4000 msgid "could not parse newly created commit"
4001 msgstr ""
4002
3990 -#: builtin/commit.c:1337
4003 +#: builtin/commit.c:1356
4004 msgid "detached HEAD"
4005 msgstr ""
4006
3994 -#: builtin/commit.c:1339
4007 +#: builtin/commit.c:1358
4008 msgid " (root-commit)"
4009 msgstr ""
4010
3998 -#: builtin/commit.c:1406
4011 +#: builtin/commit.c:1425
4012 msgid "suppress summary after successful commit"
4013 msgstr ""
4014
4002 -#: builtin/commit.c:1407
4015 +#: builtin/commit.c:1426
4016 msgid "show diff in commit message template"
4017 msgstr ""
4018
4006 -#: builtin/commit.c:1409
4019 +#: builtin/commit.c:1428
4020 msgid "Commit message options"
4021 msgstr ""
4022
4010 -#: builtin/commit.c:1410 builtin/tag.c:457
4023 +#: builtin/commit.c:1429 builtin/tag.c:457
4024 msgid "read message from file"
4025 msgstr ""
4026
4014 -#: builtin/commit.c:1411
4027 +#: builtin/commit.c:1430
4028 msgid "author"
4029 msgstr ""
4030
4018 -#: builtin/commit.c:1411
4031 +#: builtin/commit.c:1430
4032 msgid "override author for commit"
4033 msgstr ""
4034
4022 -#: builtin/commit.c:1412 builtin/gc.c:178
4035 +#: builtin/commit.c:1431 builtin/gc.c:178
4036 msgid "date"
4037 msgstr ""
4038
4026 -#: builtin/commit.c:1412
4039 +#: builtin/commit.c:1431
4040 msgid "override date for commit"
4041 msgstr ""
4042
4030 -#: builtin/commit.c:1413 builtin/merge.c:223 builtin/notes.c:405
4043 +#: builtin/commit.c:1432 builtin/merge.c:223 builtin/notes.c:405
4044 #: builtin/notes.c:562 builtin/tag.c:455
4045 msgid "message"
4046 msgstr ""
4047
4035 -#: builtin/commit.c:1413
4048 +#: builtin/commit.c:1432
4049 msgid "commit message"
4050 msgstr ""
4051
4039 -#: builtin/commit.c:1414
4052 +#: builtin/commit.c:1433
4053 msgid "reuse and edit message from specified commit"
4054 msgstr ""
4055
4043 -#: builtin/commit.c:1415
4056 +#: builtin/commit.c:1434
4057 msgid "reuse message from specified commit"
4058 msgstr ""
4059
4047 -#: builtin/commit.c:1416
4060 +#: builtin/commit.c:1435
4061 msgid "use autosquash formatted message to fixup specified commit"
4062 msgstr ""
4063
4051 -#: builtin/commit.c:1417
4064 +#: builtin/commit.c:1436
4065 msgid "use autosquash formatted message to squash specified commit"
4066 msgstr ""
4067
4055 -#: builtin/commit.c:1418
4068 +#: builtin/commit.c:1437
4069 msgid "the commit is authored by me now (used with -C/-c/--amend)"
4070 msgstr ""
4071
4059 -#: builtin/commit.c:1419 builtin/log.c:1160 builtin/revert.c:111
4072 +#: builtin/commit.c:1438 builtin/log.c:1160 builtin/revert.c:111
4073 msgid "add Signed-off-by:"
4074 msgstr ""
4075
4063 -#: builtin/commit.c:1420
4076 +#: builtin/commit.c:1439
4077 msgid "use specified template file"
4078 msgstr ""
4079
4067 -#: builtin/commit.c:1421
4080 +#: builtin/commit.c:1440
4081 msgid "force edit of commit"
4082 msgstr ""
4083
4071 -#: builtin/commit.c:1422
4084 +#: builtin/commit.c:1441
4085 msgid "default"
4086 msgstr ""
4087
4075 -#: builtin/commit.c:1422 builtin/tag.c:460
4088 +#: builtin/commit.c:1441 builtin/tag.c:460
4089 msgid "how to strip spaces and #comments from message"
4090 msgstr ""
4091
4079 -#: builtin/commit.c:1423
4092 +#: builtin/commit.c:1442
4093 msgid "include status in commit message template"
4094 msgstr ""
4095
4083 -#: builtin/commit.c:1424 builtin/merge.c:230 builtin/tag.c:461
4096 +#: builtin/commit.c:1443 builtin/merge.c:230 builtin/tag.c:461
4097 msgid "key id"
4098 msgstr ""
4099
4087 -#: builtin/commit.c:1425 builtin/merge.c:231
4100 +#: builtin/commit.c:1444 builtin/merge.c:231
4101 msgid "GPG sign commit"
4102 msgstr ""
4103
4104 #. end commit message options
4092 -#: builtin/commit.c:1428
4105 +#: builtin/commit.c:1447
4106 msgid "Commit contents options"
4107 msgstr ""
4108
4096 -#: builtin/commit.c:1429
4109 +#: builtin/commit.c:1448
4110 msgid "commit all changed files"
4111 msgstr ""
4112
4100 -#: builtin/commit.c:1430
4113 +#: builtin/commit.c:1449
4114 msgid "add specified files to index for commit"
4115 msgstr ""
4116
4104 -#: builtin/commit.c:1431
4117 +#: builtin/commit.c:1450
4118 msgid "interactively add files"
4119 msgstr ""
4120
4108 -#: builtin/commit.c:1432
4121 +#: builtin/commit.c:1451
4122 msgid "interactively add changes"
4123 msgstr ""
4124
4112 -#: builtin/commit.c:1433
4125 +#: builtin/commit.c:1452
4126 msgid "commit only specified files"
4127 msgstr ""
4128
4116 -#: builtin/commit.c:1434
4129 +#: builtin/commit.c:1453
4130 msgid "bypass pre-commit hook"
4131 msgstr ""
4132
4120 -#: builtin/commit.c:1435
4133 +#: builtin/commit.c:1454
4134 msgid "show what would be committed"
4135 msgstr ""
4136
4124 -#: builtin/commit.c:1446
4137 +#: builtin/commit.c:1465
4138 msgid "amend previous commit"
4139 msgstr ""
4140
4128 -#: builtin/commit.c:1447
4141 +#: builtin/commit.c:1466
4142 msgid "bypass post-rewrite hook"
4143 msgstr ""
4144
4132 -#: builtin/commit.c:1452
4145 +#: builtin/commit.c:1471
4146 msgid "ok to record an empty change"
4147 msgstr ""
4148
4136 -#: builtin/commit.c:1455
4149 +#: builtin/commit.c:1474
4150 msgid "ok to record a change with an empty message"
4151 msgstr ""
4152
4140 -#: builtin/commit.c:1488
4153 +#: builtin/commit.c:1507
4154 msgid "could not parse HEAD commit"
4155 msgstr ""
4156
4144 -#: builtin/commit.c:1526 builtin/merge.c:525
4157 +#: builtin/commit.c:1545 builtin/merge.c:525
4158 #, c-format
4159 msgid "could not open '%s' for reading"
4160 msgstr ""
4161
4149 -#: builtin/commit.c:1533
4162 +#: builtin/commit.c:1552
4163 #, c-format
4164 msgid "Corrupt MERGE_HEAD file (%s)"
4165 msgstr ""
4166
4154 -#: builtin/commit.c:1540
4167 +#: builtin/commit.c:1559
4168 msgid "could not read MERGE_MODE"
4169 msgstr ""
4170
4158 -#: builtin/commit.c:1559
4171 +#: builtin/commit.c:1578
4172 #, c-format
4173 msgid "could not read commit message: %s"
4174 msgstr ""
4175
4163 -#: builtin/commit.c:1573
4176 +#: builtin/commit.c:1592
4177 #, c-format
4178 msgid "Aborting commit; you did not edit the message.\n"
4179 msgstr ""
4180
4168 -#: builtin/commit.c:1578
4181 +#: builtin/commit.c:1597
4182 #, c-format
4183 msgid "Aborting commit due to empty commit message.\n"
4184 msgstr ""
4185
4173 -#: builtin/commit.c:1593 builtin/merge.c:861 builtin/merge.c:886
4186 +#: builtin/commit.c:1612 builtin/merge.c:861 builtin/merge.c:886
4187 msgid "failed to write commit object"
4188 msgstr ""
4189
4177 -#: builtin/commit.c:1614
4190 +#: builtin/commit.c:1633
4191 msgid "cannot lock HEAD ref"
4192 msgstr ""
4193
4181 -#: builtin/commit.c:1618
4194 +#: builtin/commit.c:1637
4195 msgid "cannot update HEAD ref"
4196 msgstr ""
4197
4185 -#: builtin/commit.c:1629
4198 +#: builtin/commit.c:1648
4199 msgid ""
4200 "Repository has been updated, but unable to write\n"
4201 "new_index file. Check that disk is not full or quota is\n"
@@ -9316,7 +9329,7 @@ msgstr ""
9329 msgid ""
9330 "Applying autostash resulted in conflicts.\n"
9331 "Your changes are safe in the stash.\n"
9319 -"You can run \"git stash pop\" or \"git stash drop\" it at any time.\n"
9332 +"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
9333 msgstr ""
9334
9335 #: git-rebase.sh:190