diff options
Diffstat (limited to 'po/vi.po')
| -rw-r--r-- | po/vi.po | 20 |
1 files changed, 11 insertions, 9 deletions
@@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git-1.7.12.rc0.91.g338ecb7\n" +"Project-Id-Version: git-1.7.12-rc1-18-ge0453\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2012-08-02 09:26+0800\n" -"PO-Revision-Date: 2012-08-03 14:05+0700\n" +"POT-Creation-Date: 2012-08-06 23:47+0800\n" +"PO-Revision-Date: 2012-08-07 07:11+0700\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" "MIME-Version: 1.0\n" @@ -595,21 +595,23 @@ msgstr "Đường dẫn chưa được xử lý??? %s" msgid "Merging:" msgstr "Đang trộn:" -#: merge-recursive.c:1918 +#: merge-recursive.c:1920 #, c-format -msgid "found %u common ancestor(s):" -msgstr "tìm thấy %u tổ tiên chung:" +msgid "found %u common ancestor:" +msgid_plural "found %u common ancestors:" +msgstr[0] "tìm thấy %u tổ tiên chung:" +msgstr[1] "tìm thấy %u tổ tiên chung:" -#: merge-recursive.c:1954 +#: merge-recursive.c:1957 msgid "merge returned no commit" msgstr "hòa trộn không trả về lần chuyển giao (commit) nào" -#: merge-recursive.c:2011 +#: merge-recursive.c:2014 #, c-format msgid "Could not parse object '%s'" msgstr "Không thể phân tích đối tượng '%s'" -#: merge-recursive.c:2023 +#: merge-recursive.c:2026 #: builtin/merge.c:697 msgid "Unable to write index." msgstr "Không thể ghi bảng mục lục" |