Skip to content
This repository
Browse code

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>
  • Loading branch information...
commit bb2ba06fd3e325d377dd011242714fe6b1a112bc 1 parent bfbf4d4
Jiang Xin jiangxin authored

Showing 1 changed file with 9 additions and 7 deletions. Show diff stats Hide diff stats

  1. +9 7 po/git.pot
16 po/git.pot
@@ -8,7 +8,7 @@ msgid ""
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 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 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -565,21 +565,23 @@ msgstr ""
565 565 msgid "Merging:"
566 566 msgstr ""
567 567
568   -#: merge-recursive.c:1918
  568 +#: merge-recursive.c:1920
569 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] ""
572 574
573   -#: merge-recursive.c:1954
  575 +#: merge-recursive.c:1957
574 576 msgid "merge returned no commit"
575 577 msgstr ""
576 578
577   -#: merge-recursive.c:2011
  579 +#: merge-recursive.c:2014
578 580 #, c-format
579 581 msgid "Could not parse object '%s'"
580 582 msgstr ""
581 583
582   -#: merge-recursive.c:2023 builtin/merge.c:697
  584 +#: merge-recursive.c:2026 builtin/merge.c:697
583 585 msgid "Unable to write index."
584 586 msgstr ""
585 587

0 comments on commit bb2ba06

Please sign in to comment.
Something went wrong with that request. Please try again.