l10n: Update git.pot (3 new, 2 removed messages)
Generate po/git.pot from v1.7.10.2-35-g0b9f4: * 3 new l10n messages at lines: 2743, 2751, 2759. * 2 removed l10n messages from lines: 1879, 2757. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Jiang Xin committed
May 15, 2012 at 06:36 UTC
b741611c062db33dcd2ab41ec589cb659c465ebc
1 file changed
+108
-96
po/git.pot
+108
-96
@@ -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-08 15:45+0800\n"
11
+"POT-Creation-Date: 2012-05-15 06:31+0800\n"
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
18
"Content-Transfer-Encoding: 8bit\n"
19
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
20
21
-#: advice.c:34
21
+#: advice.c:40
22
#, c-format
23
msgid "hint: %.*s\n"
24
msgstr ""
@@ -27,7 +27,7 @@ msgstr ""
27
#. * Message used both when 'git commit' fails and when
28
#. * other commands doing a merge do.
29
#.
30
-#: advice.c:64
30
+#: advice.c:70
31
msgid ""
32
"Fix them up in the work tree,\n"
33
"and then use 'git add/rm <file>' as\n"
@@ -105,7 +105,7 @@ msgid_plural ", %d deletions(-)"
105
msgstr[0] ""
106
msgstr[1] ""
107
108
-#: diff.c:3435
108
+#: diff.c:3439
109
#, c-format
110
msgid ""
111
"Failed to parse --dirstat/-X option parameter:\n"
@@ -1039,96 +1039,96 @@ msgid ""
1039
"\n"
1040
msgstr ""
1041
1042
-#: builtin/checkout.c:692
1042
+#: builtin/checkout.c:693
1043
msgid "internal error in revision walk"
1044
msgstr ""
1045
1046
-#: builtin/checkout.c:696
1046
+#: builtin/checkout.c:697
1047
msgid "Previous HEAD position was"
1048
msgstr ""
1049
1050
-#: builtin/checkout.c:722
1050
+#: builtin/checkout.c:723
1051
msgid "You are on a branch yet to be born"
1052
msgstr ""
1053
1054
#. case (1)
1055
-#: builtin/checkout.c:853
1055
+#: builtin/checkout.c:854
1056
#, c-format
1057
msgid "invalid reference: %s"
1058
msgstr ""
1059
1060
#. case (1): want a tree
1061
-#: builtin/checkout.c:892
1061
+#: builtin/checkout.c:893
1062
#, c-format
1063
msgid "reference is not a tree: %s"
1064
msgstr ""
1065
1066
-#: builtin/checkout.c:972
1066
+#: builtin/checkout.c:973
1067
msgid "-B cannot be used with -b"
1068
msgstr ""
1069
1070
-#: builtin/checkout.c:981
1070
+#: builtin/checkout.c:982
1071
msgid "--patch is incompatible with all other options"
1072
msgstr ""
1073
1074
-#: builtin/checkout.c:984
1074
+#: builtin/checkout.c:985
1075
msgid "--detach cannot be used with -b/-B/--orphan"
1076
msgstr ""
1077
1078
-#: builtin/checkout.c:986
1078
+#: builtin/checkout.c:987
1079
msgid "--detach cannot be used with -t"
1080
msgstr ""
1081
1082
-#: builtin/checkout.c:992
1082
+#: builtin/checkout.c:993
1083
msgid "--track needs a branch name"
1084
msgstr ""
1085
1086
-#: builtin/checkout.c:999
1086
+#: builtin/checkout.c:1000
1087
msgid "Missing branch name; try -b"
1088
msgstr ""
1089
1090
-#: builtin/checkout.c:1005
1090
+#: builtin/checkout.c:1006
1091
msgid "--orphan and -b|-B are mutually exclusive"
1092
msgstr ""
1093
1094
-#: builtin/checkout.c:1007
1094
+#: builtin/checkout.c:1008
1095
msgid "--orphan cannot be used with -t"
1096
msgstr ""
1097
1098
-#: builtin/checkout.c:1017
1098
+#: builtin/checkout.c:1018
1099
msgid "git checkout: -f and -m are incompatible"
1100
msgstr ""
1101
1102
-#: builtin/checkout.c:1051
1102
+#: builtin/checkout.c:1052
1103
msgid "invalid path specification"
1104
msgstr ""
1105
1106
-#: builtin/checkout.c:1059
1106
+#: builtin/checkout.c:1060
1107
#, c-format
1108
msgid ""
1109
"git checkout: updating paths is incompatible with switching branches.\n"
1110
"Did you intend to checkout '%s' which can not be resolved as commit?"
1111
msgstr ""
1112
1113
-#: builtin/checkout.c:1061
1113
+#: builtin/checkout.c:1062
1114
msgid "git checkout: updating paths is incompatible with switching branches."
1115
msgstr ""
1116
1117
-#: builtin/checkout.c:1066
1117
+#: builtin/checkout.c:1067
1118
msgid "git checkout: --detach does not take a path argument"
1119
msgstr ""
1120
1121
-#: builtin/checkout.c:1069
1121
+#: builtin/checkout.c:1070
1122
msgid ""
1123
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
1124
"checking out of the index."
1125
msgstr ""
1126
1127
-#: builtin/checkout.c:1088
1127
+#: builtin/checkout.c:1089
1128
msgid "Cannot switch branch to a non-commit."
1129
msgstr ""
1130
1131
-#: builtin/checkout.c:1091
1131
+#: builtin/checkout.c:1092
1132
msgid "--ours/--theirs is incompatible with switching branches."
1133
msgstr ""
1134
@@ -1874,28 +1874,24 @@ msgstr ""
1874
msgid "Invalid %s: '%s'"
1875
msgstr ""
1876
1877
-#: builtin/gc.c:78
1878
-msgid "Too many options specified"
1879
-msgstr ""
1880
-
1881
-#: builtin/gc.c:103
1877
+#: builtin/gc.c:90
1878
#, c-format
1879
msgid "insanely long object directory %.*s"
1880
msgstr ""
1881
1886
-#: builtin/gc.c:223
1882
+#: builtin/gc.c:221
1883
#, c-format
1884
msgid "Auto packing the repository for optimum performance.\n"
1885
msgstr ""
1886
1891
-#: builtin/gc.c:226
1887
+#: builtin/gc.c:224
1888
#, c-format
1889
msgid ""
1890
"Auto packing the repository for optimum performance. You may also\n"
1891
"run \"git gc\" manually. See \"git help gc\" for more information.\n"
1892
msgstr ""
1893
1898
-#: builtin/gc.c:256
1894
+#: builtin/gc.c:251
1895
msgid ""
1896
"There are too many unreachable loose objects; run 'git prune' to remove them."
1897
msgstr ""
@@ -2673,35 +2669,35 @@ msgstr ""
2669
msgid "Unknown subcommand: %s"
2670
msgstr ""
2671
2676
-#: builtin/pack-objects.c:2310
2672
+#: builtin/pack-objects.c:2315
2673
#, c-format
2674
msgid "unsupported index version %s"
2675
msgstr ""
2676
2681
-#: builtin/pack-objects.c:2314
2677
+#: builtin/pack-objects.c:2319
2678
#, c-format
2679
msgid "bad index version '%s'"
2680
msgstr ""
2681
2686
-#: builtin/pack-objects.c:2322
2682
+#: builtin/pack-objects.c:2342
2683
#, c-format
2684
msgid "option %s does not accept negative form"
2685
msgstr ""
2686
2691
-#: builtin/pack-objects.c:2326
2687
+#: builtin/pack-objects.c:2346
2688
#, c-format
2689
msgid "unable to parse value '%s' for option %s"
2690
msgstr ""
2691
2696
-#: builtin/push.c:44
2692
+#: builtin/push.c:45
2693
msgid "tag shorthand without <tag>"
2694
msgstr ""
2695
2700
-#: builtin/push.c:63
2696
+#: builtin/push.c:64
2697
msgid "--delete only accepts plain target ref names"
2698
msgstr ""
2699
2704
-#: builtin/push.c:83
2700
+#: builtin/push.c:84
2701
#, c-format
2702
msgid ""
2703
"You are not currently on a branch.\n"
@@ -2711,7 +2707,7 @@ msgid ""
2707
" git push %s HEAD:<name-of-remote-branch>\n"
2708
msgstr ""
2709
2714
-#: builtin/push.c:90
2710
+#: builtin/push.c:91
2711
#, c-format
2712
msgid ""
2713
"The current branch %s has no upstream branch.\n"
@@ -2720,12 +2716,12 @@ msgid ""
2716
" git push --set-upstream %s %s\n"
2717
msgstr ""
2718
2723
-#: builtin/push.c:98
2719
+#: builtin/push.c:99
2720
#, c-format
2721
msgid "The current branch %s has multiple upstream branches, refusing to push."
2722
msgstr ""
2723
2728
-#: builtin/push.c:101
2724
+#: builtin/push.c:102
2725
#, c-format
2726
msgid ""
2727
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -2733,35 +2729,51 @@ msgid ""
2729
"to update which remote branch."
2730
msgstr ""
2731
2736
-#: builtin/push.c:127
2732
+#: builtin/push.c:131
2733
msgid ""
2734
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
2735
msgstr ""
2736
2741
-#: builtin/push.c:147
2742
-#, c-format
2743
-msgid "Pushing to %s\n"
2737
+#: builtin/push.c:138
2738
+msgid ""
2739
+"Updates were rejected because the tip of your current branch is behind\n"
2740
+"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
2741
+"before pushing again.\n"
2742
+"See the 'Note about fast-forwards' in 'git push --help' for details."
2743
+msgstr ""
2744
+
2745
+#: builtin/push.c:144
2746
+msgid ""
2747
+"Updates were rejected because a pushed branch tip is behind its remote\n"
2748
+"counterpart. If you did not intend to push that branch, you may want to\n"
2749
+"specify branches to push or set the 'push.default' configuration\n"
2750
+"variable to 'current' or 'upstream' to push only the current branch."
2751
+msgstr ""
2752
+
2753
+#: builtin/push.c:150
2754
+msgid ""
2755
+"Updates were rejected because a pushed branch tip is behind its remote\n"
2756
+"counterpart. Check out this branch and merge the remote changes\n"
2757
+"(e.g. 'git pull') before pushing again.\n"
2758
+"See the 'Note about fast-forwards' in 'git push --help' for details."
2759
msgstr ""
2760
2746
-#: builtin/push.c:151
2761
+#: builtin/push.c:190
2762
#, c-format
2748
-msgid "failed to push some refs to '%s'"
2763
+msgid "Pushing to %s\n"
2764
msgstr ""
2765
2751
-#: builtin/push.c:159
2766
+#: builtin/push.c:194
2767
#, c-format
2753
-msgid ""
2754
-"To prevent you from losing history, non-fast-forward updates were rejected\n"
2755
-"Merge the remote changes (e.g. 'git pull') before pushing again. See the\n"
2756
-"'Note about fast-forwards' section of 'git push --help' for details.\n"
2768
+msgid "failed to push some refs to '%s'"
2769
msgstr ""
2770
2759
-#: builtin/push.c:176
2771
+#: builtin/push.c:226
2772
#, c-format
2773
msgid "bad repository '%s'"
2774
msgstr ""
2775
2764
-#: builtin/push.c:177
2776
+#: builtin/push.c:227
2777
msgid ""
2778
"No configured push destination.\n"
2779
"Either specify the URL from the command-line or configure a remote "
@@ -2774,31 +2786,31 @@ msgid ""
2786
" git push <name>\n"
2787
msgstr ""
2788
2777
-#: builtin/push.c:192
2789
+#: builtin/push.c:242
2790
msgid "--all and --tags are incompatible"
2791
msgstr ""
2792
2781
-#: builtin/push.c:193
2793
+#: builtin/push.c:243
2794
msgid "--all can't be combined with refspecs"
2795
msgstr ""
2796
2785
-#: builtin/push.c:198
2797
+#: builtin/push.c:248
2798
msgid "--mirror and --tags are incompatible"
2799
msgstr ""
2800
2789
-#: builtin/push.c:199
2801
+#: builtin/push.c:249
2802
msgid "--mirror can't be combined with refspecs"
2803
msgstr ""
2804
2793
-#: builtin/push.c:204
2805
+#: builtin/push.c:254
2806
msgid "--all and --mirror are incompatible"
2807
msgstr ""
2808
2797
-#: builtin/push.c:284
2809
+#: builtin/push.c:334
2810
msgid "--delete is incompatible with --all, --mirror and --tags"
2811
msgstr ""
2812
2801
-#: builtin/push.c:286
2813
+#: builtin/push.c:336
2814
msgid "--delete doesn't make sense without any refs"
2815
msgstr ""
2816
@@ -2881,20 +2893,20 @@ msgstr ""
2893
msgid "Could not reset index file to revision '%s'."
2894
msgstr ""
2895
2884
-#: builtin/revert.c:70 builtin/revert.c:91
2896
+#: builtin/revert.c:70 builtin/revert.c:92
2897
#, c-format
2898
msgid "%s: %s cannot be used with %s"
2899
msgstr ""
2900
2889
-#: builtin/revert.c:126
2901
+#: builtin/revert.c:127
2902
msgid "program error"
2903
msgstr ""
2904
2893
-#: builtin/revert.c:212
2905
+#: builtin/revert.c:213
2906
msgid "revert failed"
2907
msgstr ""
2908
2897
-#: builtin/revert.c:227
2909
+#: builtin/revert.c:228
2910
msgid "cherry-pick failed"
2911
msgstr ""
2912
@@ -3377,146 +3389,146 @@ msgstr ""
3389
msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
3390
msgstr ""
3391
3380
-#: git-submodule.sh:247
3392
+#: git-submodule.sh:248
3393
#, sh-format
3394
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
3395
msgstr ""
3396
3385
-#: git-submodule.sh:264
3397
+#: git-submodule.sh:265
3398
#, sh-format
3399
msgid "'$path' already exists in the index"
3400
msgstr ""
3401
3390
-#: git-submodule.sh:281
3402
+#: git-submodule.sh:282
3403
#, sh-format
3404
msgid "'$path' already exists and is not a valid git repo"
3405
msgstr ""
3406
3395
-#: git-submodule.sh:295
3407
+#: git-submodule.sh:296
3408
#, sh-format
3409
msgid "Unable to checkout submodule '$path'"
3410
msgstr ""
3411
3400
-#: git-submodule.sh:300
3412
+#: git-submodule.sh:301
3413
#, sh-format
3414
msgid "Failed to add submodule '$path'"
3415
msgstr ""
3416
3405
-#: git-submodule.sh:305
3417
+#: git-submodule.sh:306
3418
#, sh-format
3419
msgid "Failed to register submodule '$path'"
3420
msgstr ""
3421
3410
-#: git-submodule.sh:347
3422
+#: git-submodule.sh:348
3423
#, sh-format
3424
msgid "Entering '$prefix$path'"
3425
msgstr ""
3426
3415
-#: git-submodule.sh:359
3427
+#: git-submodule.sh:360
3428
#, sh-format
3429
msgid "Stopping at '$path'; script returned non-zero status."
3430
msgstr ""
3431
3420
-#: git-submodule.sh:401
3432
+#: git-submodule.sh:402
3433
#, sh-format
3434
msgid "No url found for submodule path '$path' in .gitmodules"
3435
msgstr ""
3436
3425
-#: git-submodule.sh:410
3437
+#: git-submodule.sh:411
3438
#, sh-format
3439
msgid "Failed to register url for submodule path '$path'"
3440
msgstr ""
3441
3430
-#: git-submodule.sh:418
3442
+#: git-submodule.sh:419
3443
#, sh-format
3444
msgid "Failed to register update mode for submodule path '$path'"
3445
msgstr ""
3446
3435
-#: git-submodule.sh:420
3447
+#: git-submodule.sh:421
3448
#, sh-format
3449
msgid "Submodule '$name' ($url) registered for path '$path'"
3450
msgstr ""
3451
3440
-#: git-submodule.sh:519
3452
+#: git-submodule.sh:520
3453
#, sh-format
3454
msgid ""
3455
"Submodule path '$path' not initialized\n"
3456
"Maybe you want to use 'update --init'?"
3457
msgstr ""
3458
3447
-#: git-submodule.sh:532
3459
+#: git-submodule.sh:533
3460
#, sh-format
3461
msgid "Unable to find current revision in submodule path '$path'"
3462
msgstr ""
3463
3452
-#: git-submodule.sh:551
3464
+#: git-submodule.sh:552
3465
#, sh-format
3466
msgid "Unable to fetch in submodule path '$path'"
3467
msgstr ""
3468
3457
-#: git-submodule.sh:565
3469
+#: git-submodule.sh:566
3470
#, sh-format
3471
msgid "Unable to rebase '$sha1' in submodule path '$path'"
3472
msgstr ""
3473
3462
-#: git-submodule.sh:566
3474
+#: git-submodule.sh:567
3475
#, sh-format
3476
msgid "Submodule path '$path': rebased into '$sha1'"
3477
msgstr ""
3478
3467
-#: git-submodule.sh:571
3479
+#: git-submodule.sh:572
3480
#, sh-format
3481
msgid "Unable to merge '$sha1' in submodule path '$path'"
3482
msgstr ""
3483
3472
-#: git-submodule.sh:572
3484
+#: git-submodule.sh:573
3485
#, sh-format
3486
msgid "Submodule path '$path': merged in '$sha1'"
3487
msgstr ""
3488
3477
-#: git-submodule.sh:577
3489
+#: git-submodule.sh:578
3490
#, sh-format
3491
msgid "Unable to checkout '$sha1' in submodule path '$path'"
3492
msgstr ""
3493
3482
-#: git-submodule.sh:578
3494
+#: git-submodule.sh:579
3495
#, sh-format
3496
msgid "Submodule path '$path': checked out '$sha1'"
3497
msgstr ""
3498
3487
-#: git-submodule.sh:600 git-submodule.sh:923
3499
+#: git-submodule.sh:601 git-submodule.sh:924
3500
#, sh-format
3501
msgid "Failed to recurse into submodule path '$path'"
3502
msgstr ""
3503
3492
-#: git-submodule.sh:708
3504
+#: git-submodule.sh:709
3505
msgid "--"
3506
msgstr ""
3507
3496
-#: git-submodule.sh:766
3508
+#: git-submodule.sh:767
3509
#, sh-format
3510
msgid " Warn: $name doesn't contain commit $sha1_src"
3511
msgstr ""
3512
3501
-#: git-submodule.sh:769
3513
+#: git-submodule.sh:770
3514
#, sh-format
3515
msgid " Warn: $name doesn't contain commit $sha1_dst"
3516
msgstr ""
3517
3506
-#: git-submodule.sh:772
3518
+#: git-submodule.sh:773
3519
#, sh-format
3520
msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
3521
msgstr ""
3522
3511
-#: git-submodule.sh:797
3523
+#: git-submodule.sh:798
3524
msgid "blob"
3525
msgstr ""
3526
3515
-#: git-submodule.sh:798
3527
+#: git-submodule.sh:799
3528
msgid "submodule"
3529
msgstr ""
3530
3519
-#: git-submodule.sh:969
3531
+#: git-submodule.sh:970
3532
#, sh-format
3533
msgid "Synchronizing submodule url for '$name'"
3534
msgstr ""