l10n: Update one message in git.pot
This update comes from commit v1.7.12-rc1-18-ge0453 (merge-recursive: separate message for common ancestors). Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Jiang Xin committed
Aug 6, 2012 at 23:48 UTC
bb2ba06fd3e325d377dd011242714fe6b1a112bc
1 file changed
+9
-7
po/git.pot
+9
-7
@@ -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-08-02 09:26+0800\n"
11
+"POT-Creation-Date: 2012-08-06 23:47+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"
@@ -565,21 +565,23 @@ msgstr ""
565
msgid "Merging:"
566
msgstr ""
567
568
-#: merge-recursive.c:1918
568
+#: merge-recursive.c:1920
569
#, c-format
570
-msgid "found %u common ancestor(s):"
571
-msgstr ""
570
+msgid "found %u common ancestor:"
571
+msgid_plural "found %u common ancestors:"
572
+msgstr[0] ""
573
+msgstr[1] ""
574
573
-#: merge-recursive.c:1954
575
+#: merge-recursive.c:1957
576
msgid "merge returned no commit"
577
msgstr ""
578
577
-#: merge-recursive.c:2011
579
+#: merge-recursive.c:2014
580
#, c-format
581
msgid "Could not parse object '%s'"
582
msgstr ""
583
582
-#: merge-recursive.c:2023 builtin/merge.c:697
584
+#: merge-recursive.c:2026 builtin/merge.c:697
585
msgid "Unable to write index."
586
msgstr ""
587