diff options
author | Michael Vogt <mvo@debian.org> | 2014-04-28 12:50:47 +0200 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2014-04-28 12:50:47 +0200 |
commit | 77efe478cc59fe205c35036bae8c0d5e0e6913d7 (patch) | |
tree | 292ddf183b3f38c299bd6614fbd48585aa6d00b2 /po | |
parent | 814e1b8d623cb1e6b03c79fcdab6b20754c57038 (diff) | |
parent | 038e721ad2557fd517eae4b102cd36080f4ee6e3 (diff) |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
po/vi.po
Diffstat (limited to 'po')
-rw-r--r-- | po/vi.po | 22 |
1 files changed, 11 insertions, 11 deletions
@@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: apt 1.0.1\n" +"Project-Id-Version: apt 1.0.2\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-04-25 13:52+0200\n" -"PO-Revision-Date: 2014-04-11 09:08+0700\n" +"POT-Creation-Date: 2014-04-25 13:17+0200\n" +"PO-Revision-Date: 2014-04-28 09:24+0700\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" "Language: vi\n" @@ -162,7 +162,7 @@ msgid " Version table:" msgstr " Bảng phiên bản:" #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 #: cmdline/apt-sortpkgs.cc:147 @@ -546,11 +546,11 @@ msgstr "Gặp lỗi khi xử lý các quan hệ phụ thuộc khi biên dịch" msgid "Changelog for %s (%s)" msgstr "Changelog cho %s (%s)" -#: cmdline/apt-get.cc:1586 +#: cmdline/apt-get.cc:1583 msgid "Supported modules:" msgstr "Hỗ trợ các mô-đun:" -#: cmdline/apt-get.cc:1627 +#: cmdline/apt-get.cc:1624 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1503,11 +1503,11 @@ msgid "Listing" msgstr "Đang liệt kê" #: apt-private/private-list.cc:164 -#, fuzzy, c-format +#, c-format msgid "There is %i additional version. Please use the '-a' switch to see it" msgid_plural "" "There are %i additional versions. Please use the '-a' switch to see them." -msgstr[0] "Ở đây có %i bản ghi phụ thêm. Hãy dùng tùy chọn “-a” để xem" +msgstr[0] "Ở đây có %i phiên bản phụ thêm. Hãy dùng tùy chọn “-a” để xem." #: apt-private/private-main.cc:23 msgid "" @@ -1727,7 +1727,7 @@ msgstr "Xong" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:491 -#: apt-pkg/clean.cc:40 apt-pkg/init.cc:103 apt-pkg/init.cc:111 +#: apt-pkg/clean.cc:40 apt-pkg/init.cc:102 apt-pkg/init.cc:110 #: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 #: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:371 #: apt-pkg/contrib/fileutl.cc:484 @@ -2808,12 +2808,12 @@ msgid "Invalid 'Date' entry in Release file %s" msgstr "" "Gặp mục tin “Date” (ngày tháng) không hợp lệ trong tập tin Phát hành %s" -#: apt-pkg/init.cc:146 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Không hỗ trợ hệ thống đóng gói “%s”" -#: apt-pkg/init.cc:162 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "Không thể quyết định kiểu hệ thống đóng gói thích hợp" |