l10n: vi.po: update one message
* Translate message that updated from commit bb2ba06 Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
Tran Ngoc Quan committed
Aug 7, 2012 at 07:18 UTC
58b66f8f76ff4d310dba75867f5973ccf2721ebc
1 file changed
+11
-9
po/vi.po
+11
-9
@@ -5,10 +5,10 @@
5
#
6
msgid ""
7
msgstr ""
8
-"Project-Id-Version: git-1.7.12.rc0.91.g338ecb7\n"
8
+"Project-Id-Version: git-1.7.12-rc1-18-ge0453\n"
9
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
10
-"POT-Creation-Date: 2012-08-02 09:26+0800\n"
11
-"PO-Revision-Date: 2012-08-03 14:05+0700\n"
10
+"POT-Creation-Date: 2012-08-06 23:47+0800\n"
11
+"PO-Revision-Date: 2012-08-07 07:11+0700\n"
12
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
13
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
14
"MIME-Version: 1.0\n"
@@ -595,21 +595,23 @@ msgstr "Đường dẫn chưa được xử lý??? %s"
595
msgid "Merging:"
596
msgstr "Đang trộn:"
597
598
-#: merge-recursive.c:1918
598
+#: merge-recursive.c:1920
599
#, c-format
600
-msgid "found %u common ancestor(s):"
601
-msgstr "tìm thấy %u tổ tiên chung:"
600
+msgid "found %u common ancestor:"
601
+msgid_plural "found %u common ancestors:"
602
+msgstr[0] "tìm thấy %u tổ tiên chung:"
603
+msgstr[1] "tìm thấy %u tổ tiên chung:"
604
603
-#: merge-recursive.c:1954
605
+#: merge-recursive.c:1957
606
msgid "merge returned no commit"
607
msgstr "hòa trộn không trả về lần chuyển giao (commit) nào"
608
607
-#: merge-recursive.c:2011
609
+#: merge-recursive.c:2014
610
#, c-format
611
msgid "Could not parse object '%s'"
612
msgstr "Không thể phân tích đối tượng '%s'"
613
612
-#: merge-recursive.c:2023
614
+#: merge-recursive.c:2026
615
#: builtin/merge.c:697
616
msgid "Unable to write index."
617
msgstr "Không thể ghi bảng mục lục"