l10n: Update git.pot (5 new, 1 removed messages)
L10n for git 1.8.1 round 2: Generate po/git.pot from v1.8.0.1-347-gf94c3. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Jiang Xin committed
Nov 30, 2012 at 12:41 UTC
f9472e359e070fb3fb7d48a730468538764e308f
1 file changed
+32
-14
po/git.pot
+32
-14
@@ -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-11-23 14:27+0800\n"
11
+"POT-Creation-Date: 2012-11-30 12:40+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"
@@ -309,20 +309,30 @@ msgstr ""
309
msgid " Unknown dirstat parameter '%s'\n"
310
msgstr ""
311
312
-#: diff.c:219
312
+#: diff.c:194
313
+#, c-format
314
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
315
+msgstr ""
316
+
317
+#: diff.c:237
318
#, c-format
319
msgid ""
320
"Found errors in 'diff.dirstat' config variable:\n"
321
"%s"
322
msgstr ""
323
319
-#: diff.c:3467
324
+#: diff.c:3494
325
#, c-format
326
msgid ""
327
"Failed to parse --dirstat/-X option parameter:\n"
328
"%s"
329
msgstr ""
330
331
+#: diff.c:3508
332
+#, c-format
333
+msgid "Failed to parse --submodule option parameter: '%s'"
334
+msgstr ""
335
+
336
#: gpg-interface.c:59
337
msgid "could not run gpg."
338
msgstr ""
@@ -680,7 +690,11 @@ msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
690
msgstr[0] ""
691
msgstr[1] ""
692
683
-#: remote.c:1638
693
+#: remote.c:1637
694
+msgid " (use \"git push\" to publish your local commits)\n"
695
+msgstr ""
696
+
697
+#: remote.c:1640
698
#, c-format
699
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
700
msgid_plural ""
@@ -688,7 +702,11 @@ msgid_plural ""
702
msgstr[0] ""
703
msgstr[1] ""
704
691
-#: remote.c:1646
705
+#: remote.c:1647
706
+msgid " (use \"git pull\" to update your local branch)\n"
707
+msgstr ""
708
+
709
+#: remote.c:1650
710
#, c-format
711
msgid ""
712
"Your branch and '%s' have diverged,\n"
@@ -699,6 +717,10 @@ msgid_plural ""
717
msgstr[0] ""
718
msgstr[1] ""
719
720
+#: remote.c:1659
721
+msgid " (use \"git pull\" to merge the remote branch into yours)\n"
722
+msgstr ""
723
+
724
#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:874 builtin/merge.c:984
725
#: builtin/merge.c:994
726
#, c-format
@@ -1332,7 +1354,7 @@ msgstr ""
1354
msgid "Unstaged changes after refreshing the index:"
1355
msgstr ""
1356
1335
-#: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:260
1357
+#: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:275
1358
#, c-format
1359
msgid "pathspec '%s' did not match any files"
1360
msgstr ""
@@ -1461,7 +1483,7 @@ msgstr ""
1483
msgid "index file corrupt"
1484
msgstr ""
1485
1464
-#: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:355
1486
+#: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:370
1487
msgid "Unable to write new index file"
1488
msgstr ""
1489
@@ -6814,7 +6836,7 @@ msgstr ""
6836
msgid "git remote remove <name>"
6837
msgstr ""
6838
6817
-#: builtin/remote.c:15
6839
+#: builtin/remote.c:15 builtin/remote.c:42
6840
msgid "git remote set-head <name> (-a | -d | <branch>)"
6841
msgstr ""
6842
@@ -6851,10 +6873,6 @@ msgstr ""
6873
msgid "git remote add [<options>] <name> <url>"
6874
msgstr ""
6875
6854
-#: builtin/remote.c:42
6855
-msgid "git remote set-head <name> (-a | -d | <branch>])"
6856
-msgstr ""
6857
-
6876
#: builtin/remote.c:47
6877
msgid "git remote set-branches <name> <branch>..."
6878
msgstr ""
@@ -7592,12 +7610,12 @@ msgstr ""
7610
msgid "exit with a zero status even if nothing matched"
7611
msgstr ""
7612
7595
-#: builtin/rm.c:268
7613
+#: builtin/rm.c:283
7614
#, c-format
7615
msgid "not removing '%s' recursively without -r"
7616
msgstr ""
7617
7600
-#: builtin/rm.c:307
7618
+#: builtin/rm.c:322
7619
#, c-format
7620
msgid "git rm: unable to remove %s"
7621
msgstr ""