From bb2ba06fd3e325d377dd011242714fe6b1a112bc Mon Sep 17 00:00:00 2001 From: Jiang Xin Date: Mon, 6 Aug 2012 23:48:08 +0800 Subject: [PATCH] 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 --- po/git.pot | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/po/git.pot b/po/git.pot index 73eb449526..5c586d6007 100644 --- a/po/git.pot +++ b/po/git.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2012-08-02 09:26+0800\n" +"POT-Creation-Date: 2012-08-06 23:47+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -565,21 +565,23 @@ msgstr "" msgid "Merging:" msgstr "" -#: merge-recursive.c:1918 +#: merge-recursive.c:1920 #, c-format -msgid "found %u common ancestor(s):" -msgstr "" +msgid "found %u common ancestor:" +msgid_plural "found %u common ancestors:" +msgstr[0] "" +msgstr[1] "" -#: merge-recursive.c:1954 +#: merge-recursive.c:1957 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:2011 +#: merge-recursive.c:2014 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:2023 builtin/merge.c:697 +#: merge-recursive.c:2026 builtin/merge.c:697 msgid "Unable to write index." msgstr "" -- 2.11.4.GIT