Update PO templates for Vietnamese

CVS version numbers

vietnamese/po/blends.vi.po: INITIAL -> 1.1 
vietnamese/po/consultants.vi.po: 1.2 -> 1.3 
vietnamese/po/countries.vi.po: 1.5 -> 1.6 
vietnamese/po/distrib.vi.po: 1.2 -> 1.3 
vietnamese/po/doc.vi.po: 1.2 -> 1.3 
vietnamese/po/mailinglists.vi.po: 1.3 -> 1.4 
vietnamese/po/organization.vi.po: 1.4 -> 1.5 
vietnamese/po/others.vi.po: 1.4 -> 1.5 
vietnamese/po/ports.vi.po: 1.2 -> 1.3 
vietnamese/po/stats.vi.po: 1.3 -> 1.4 
vietnamese/po/templates.vi.po: 1.6 -> 1.7 
vietnamese/po/vendors.vi.po: 1.4 -> 1.5 
vietnamese/po/vote.vi.po: 1.2 -> 1.3 
vietnamese/po/wnpp.vi.po: 1.2 -> 1.3

14 files changed, 449 insertions, 298 deletions

diff --git a/vietnamese/po/blends.vi.po b/vietnamese/po/blends.vi.po
new file mode 100644
index 00000000000..4ca17d293f6
--- /dev/null
+++ b/vietnamese/po/blends.vi.po
@@ -0,0 +1,125 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../english/blends/blend.defs:15
+msgid "Metapackages"
+msgstr ""
+
+#: ../../english/blends/blend.defs:18
+msgid "Downloads"
+msgstr ""
+
+#: ../../english/blends/blend.defs:21
+msgid "Derivatives"
+msgstr ""
+
+#: ../../english/blends/released.data:15
+msgid ""
+"The goal of DebiChem is to make Debian a good platform for chemists in their "
+"day-to-day work."
+msgstr ""
+
+#: ../../english/blends/released.data:22
+msgid "Debian Games"
+msgstr ""
+
+#: ../../english/blends/released.data:23
+msgid ""
+"The goal of Debian Games is to provide games in Debian from arcade and "
+"aventure to simulation and strategy."
+msgstr ""
+
+#: ../../english/blends/released.data:31
+msgid ""
+"The goal of Debian Edu is to provide a Debian OS system suitable for "
+"educational use and in schools."
+msgstr ""
+
+#: ../../english/blends/released.data:39
+msgid ""
+"The goal of Debian GIS is to develop Debian into the best distribution for "
+"Geographical Information System applications and users."
+msgstr ""
+
+#: ../../english/blends/released.data:49
+msgid ""
+"The goal of Debian Junior is to make Debian an OS that children will enjoy "
+"using."
+msgstr ""
+
+#: ../../english/blends/released.data:57
+msgid ""
+"The goal of Debian Med is a complete free and open system for all tasks in "
+"medical care and research. To achieve this goal Debian Med integrates "
+"related free and open source software for medical imaging, bioinformatics, "
+"clinic IT infrastructure, and others within the Debian OS."
+msgstr ""
+
+#: ../../english/blends/released.data:65
+msgid ""
+"The goal of Debian Multimedia is to make Debian a good platform for audio "
+"and multimedia work."
+msgstr ""
+
+#: ../../english/blends/released.data:73
+msgid ""
+"The goal of Debian Science is to provide a better experience when using "
+"Debian to researchers and scientists."
+msgstr ""
+
+#: ../../english/blends/unreleased.data:14
+msgid "Debian Accessibility"
+msgstr ""
+
+#: ../../english/blends/unreleased.data:15
+msgid ""
+"The goal of Debian Accessibility is to develop Debian into an operating "
+"system that is particularly well suited for the requirements of people with "
+"disabilities."
+msgstr ""
+
+#: ../../english/blends/unreleased.data:23
+msgid ""
+"The goal of Debian Astro is to develop a Debian based operating system that "
+"fits the requirements of both professional and hobby astronomers. It "
+"integrates a large number of software packages covering telescope control, "
+"data reduction, presentation and other fields."
+msgstr ""
+
+#: ../../english/blends/unreleased.data:31
+msgid ""
+"The goal of Debian Design is to provide applications for designers. This "
+"includes graphic design, web design and multimedia design."
+msgstr ""
+
+#: ../../english/blends/unreleased.data:38
+msgid ""
+"The goal of Debian EzGo is to provide culture-based open and free technology "
+"with native language support and appropriate user friendly, lightweight and "
+"fast desktop environment for low powerful/cost hardwares to empower human "
+"capacity building and technology development  in many areas and regions, "
+"like Africa, Afghanistan, Indonesia, Vietnam  using Debian."
+msgstr ""
+
+#: ../../english/blends/unreleased.data:46
+msgid ""
+"The goal of FreedomBox is to develop, design and promote personal servers "
+"running free software for private, personal communications. Applications "
+"include blogs, wikis, websites, social networks, email, web proxy and a Tor "
+"relay on a device that can replace a wireless router so that data stays with "
+"the users."
+msgstr ""
+
+#: ../../english/blends/unreleased.data:54
+msgid ""
+"The goal of Debian Hamradio is to support the needs of radio amateurs in "
+"Debian by providing logging, data mode and packet mode applications and more."
+msgstr ""
+
+#: ../../english/blends/unreleased.data:63
+msgid ""
+"The goal of DebianParl is to provide applications to support the needs of "
+"parliamentarians, politicians and their staffers all around the world."
+msgstr ""
diff --git a/vietnamese/po/consultants.vi.po b/vietnamese/po/consultants.vi.po
index 1ae3baa2941..fa9d82e2967 100644
--- a/vietnamese/po/consultants.vi.po
+++ b/vietnamese/po/consultants.vi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../../english/consultants/consultant.defs:6
diff --git a/vietnamese/po/countries.vi.po b/vietnamese/po/countries.vi.po
index a3f53169929..e40e33fd43f 100644
--- a/vietnamese/po/countries.vi.po
+++ b/vietnamese/po/countries.vi.po
@@ -335,94 +335,98 @@ msgid "Portugal"
 msgstr "Bồ Đào Nha"
 
 #: ../../english/template/debian/countries.wml:351
+msgid "Réunion"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:354
 msgid "Romania"
 msgstr "Ru-ma-ni"
 
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
 msgid "Serbia"
 msgstr "Xéc-bi"
 
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
 msgid "Russia"
 msgstr "Nga"
 
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
 msgid "Saudi Arabia"
 msgstr "A Rập Xau-đi"
 
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
 msgid "Sweden"
 msgstr "Thụy Điển"
 
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
 msgid "Singapore"
 msgstr "Xing-ga-po"
 
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
 msgid "Slovenia"
 msgstr "Xlô-ven"
 
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
 msgid "Slovakia"
 msgstr "Xlô-vác"
 
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
 msgid "El Salvador"
 msgstr "En-xan-va-đoa"
 
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
 msgid "Thailand"
 msgstr "Thái Lan"
 
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
 msgid "Tajikistan"
 msgstr "Ta-ji-kít-xtan"
 
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
 msgid "Tunisia"
 msgstr "Tu-ni-xi-a"
 
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
 msgid "Turkey"
 msgstr "Thổ Nhĩ Kỳ"
 
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
 msgid "Taiwan"
 msgstr "Đài Loan"
 
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
 msgid "Ukraine"
 msgstr "Ukraine"
 
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
 msgid "United States"
 msgstr "Hợp chủng quốc Hoa Kỳ"
 
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
 msgid "Uruguay"
 msgstr "U-ru-guay"
 
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
 msgid "Uzbekistan"
 msgstr "U-xơ-bê-ki-x-tanh"
 
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
 msgid "Venezuela"
 msgstr "Vê-nê-du-ê-la"
 
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
 msgid "Vietnam"
 msgstr "Việt Nam"
 
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
 msgid "South Africa"
 msgstr "Nam Phi"
 
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
 msgid "Zimbabwe"
 msgstr "Zim-ba-buê"
 
diff --git a/vietnamese/po/distrib.vi.po b/vietnamese/po/distrib.vi.po
index 3d142bbd027..1a807707d9b 100644
--- a/vietnamese/po/distrib.vi.po
+++ b/vietnamese/po/distrib.vi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../../english/distrib/search_contents-form.inc:9
@@ -8,59 +8,49 @@ msgstr ""
 msgid "Keyword"
 msgstr ""
 
-#: ../../english/distrib/search_contents-form.inc:11
-#: ../../english/distrib/search_packages-form.inc:10
-msgid "Search"
-msgstr ""
-
-#: ../../english/distrib/search_contents-form.inc:12
-#: ../../english/distrib/search_packages-form.inc:10
-msgid "Reset"
-msgstr ""
-
-#: ../../english/distrib/search_contents-form.inc:14
+#: ../../english/distrib/search_contents-form.inc:13
 msgid "Display"
 msgstr ""
 
-#: ../../english/distrib/search_contents-form.inc:17
+#: ../../english/distrib/search_contents-form.inc:16
 msgid "paths ending with the keyword"
 msgstr ""
 
-#: ../../english/distrib/search_contents-form.inc:20
+#: ../../english/distrib/search_contents-form.inc:19
 msgid "packages that contain files named like this"
 msgstr ""
 
-#: ../../english/distrib/search_contents-form.inc:23
+#: ../../english/distrib/search_contents-form.inc:22
 msgid "packages that contain files whose names contain the keyword"
 msgstr ""
 
 #: ../../english/distrib/search_contents-form.inc:25
-#: ../../english/distrib/search_packages-form.inc:23
+#: ../../english/distrib/search_packages-form.inc:25
 msgid "Distribution"
 msgstr ""
 
 #: ../../english/distrib/search_contents-form.inc:27
-#: ../../english/distrib/search_packages-form.inc:25
+#: ../../english/distrib/search_packages-form.inc:27
 msgid "experimental"
 msgstr ""
 
 #: ../../english/distrib/search_contents-form.inc:28
-#: ../../english/distrib/search_packages-form.inc:26
+#: ../../english/distrib/search_packages-form.inc:28
 msgid "unstable"
 msgstr ""
 
 #: ../../english/distrib/search_contents-form.inc:29
-#: ../../english/distrib/search_packages-form.inc:27
+#: ../../english/distrib/search_packages-form.inc:29
 msgid "testing"
 msgstr ""
 
 #: ../../english/distrib/search_contents-form.inc:30
-#: ../../english/distrib/search_packages-form.inc:28
+#: ../../english/distrib/search_packages-form.inc:30
 msgid "stable"
 msgstr ""
 
 #: ../../english/distrib/search_contents-form.inc:31
-#: ../../english/distrib/search_packages-form.inc:29
+#: ../../english/distrib/search_packages-form.inc:31
 msgid "oldstable"
 msgstr ""
 
@@ -69,11 +59,21 @@ msgid "Architecture"
 msgstr ""
 
 #: ../../english/distrib/search_contents-form.inc:38
-#: ../../english/distrib/search_packages-form.inc:30
-#: ../../english/distrib/search_packages-form.inc:37
+#: ../../english/distrib/search_packages-form.inc:32
+#: ../../english/distrib/search_packages-form.inc:39
 msgid "any"
 msgstr ""
 
+#: ../../english/distrib/search_contents-form.inc:48
+#: ../../english/distrib/search_packages-form.inc:43
+msgid "Search"
+msgstr ""
+
+#: ../../english/distrib/search_contents-form.inc:49
+#: ../../english/distrib/search_packages-form.inc:44
+msgid "Reset"
+msgstr ""
+
 #: ../../english/distrib/search_packages-form.inc:12
 msgid "Search on"
 msgstr ""
@@ -90,23 +90,23 @@ msgstr ""
 msgid "Source package names"
 msgstr ""
 
-#: ../../english/distrib/search_packages-form.inc:20
+#: ../../english/distrib/search_packages-form.inc:21
 msgid "Only show exact matches"
 msgstr ""
 
-#: ../../english/distrib/search_packages-form.inc:32
+#: ../../english/distrib/search_packages-form.inc:34
 msgid "Section"
 msgstr ""
 
-#: ../../english/distrib/search_packages-form.inc:34
+#: ../../english/distrib/search_packages-form.inc:36
 msgid "main"
 msgstr ""
 
-#: ../../english/distrib/search_packages-form.inc:35
+#: ../../english/distrib/search_packages-form.inc:37
 msgid "contrib"
 msgstr ""
 
-#: ../../english/distrib/search_packages-form.inc:36
+#: ../../english/distrib/search_packages-form.inc:38
 msgid "non-free"
 msgstr ""
 
@@ -127,11 +127,11 @@ msgid "64-bit ARM (AArch64)"
 msgstr ""
 
 #: ../../english/releases/arches.data:12
-msgid "EABI ARM"
+msgid "EABI ARM (armel)"
 msgstr ""
 
 #: ../../english/releases/arches.data:13
-msgid "Hard Float ABI ARM"
+msgid "Hard Float ABI ARM (armhf)"
 msgstr ""
 
 #: ../../english/releases/arches.data:14
@@ -167,25 +167,29 @@ msgid "MIPS (big endian)"
 msgstr ""
 
 #: ../../english/releases/arches.data:22
-msgid "MIPS (little endian)"
+msgid "64-bit MIPS (little endian)"
 msgstr ""
 
 #: ../../english/releases/arches.data:23
-msgid "PowerPC"
+msgid "MIPS (little endian)"
 msgstr ""
 
 #: ../../english/releases/arches.data:24
-msgid "POWER Processors"
+msgid "PowerPC"
 msgstr ""
 
 #: ../../english/releases/arches.data:25
-msgid "IBM S/390"
+msgid "POWER Processors"
 msgstr ""
 
 #: ../../english/releases/arches.data:26
-msgid "IBM System z"
+msgid "IBM S/390"
 msgstr ""
 
 #: ../../english/releases/arches.data:27
+msgid "IBM System z"
+msgstr ""
+
+#: ../../english/releases/arches.data:28
 msgid "SPARC"
 msgstr ""
diff --git a/vietnamese/po/doc.vi.po b/vietnamese/po/doc.vi.po
index f2dc289981b..59301003e32 100644
--- a/vietnamese/po/doc.vi.po
+++ b/vietnamese/po/doc.vi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../../english/doc/books.data:32
@@ -360,7 +360,7 @@ msgstr ""
 msgid "(version <get-var version />)"
 msgstr ""
 
-#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:36
+#: ../../english/doc/manuals.defs:138 ../../english/releases/arches.data:37
 msgid "plain text"
 msgstr ""
 
@@ -417,10 +417,10 @@ msgstr ""
 msgid "Debian package (archived)"
 msgstr ""
 
-#: ../../english/releases/arches.data:34
+#: ../../english/releases/arches.data:35
 msgid "HTML"
 msgstr ""
 
-#: ../../english/releases/arches.data:35
+#: ../../english/releases/arches.data:36
 msgid "PDF"
 msgstr ""
diff --git a/vietnamese/po/mailinglists.vi.po b/vietnamese/po/mailinglists.vi.po
index 324c30101f0..2e88cfd5c47 100644
--- a/vietnamese/po/mailinglists.vi.po
+++ b/vietnamese/po/mailinglists.vi.po
@@ -132,8 +132,8 @@ msgstr "mở"
 msgid "closed"
 msgstr "đã đóng"
 
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "Vui lòng chọn bó nào mà bạn muốn đặt xem dài hạn:"
-
 #~ msgid "Please select which lists you want to subscribe to:"
 #~ msgstr "Vui lòng chỉ định bó thư nào bạn muốn đặt xem dài hạn:"
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "Vui lòng chọn bó nào mà bạn muốn đặt xem dài hạn:"
diff --git a/vietnamese/po/organization.vi.po b/vietnamese/po/organization.vi.po
index 77d5a236c32..b30a4e72ec2 100644
--- a/vietnamese/po/organization.vi.po
+++ b/vietnamese/po/organization.vi.po
@@ -14,280 +14,284 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
-#: ../../english/intro/organization.data:13
+#: ../../english/intro/organization.data:15
 msgid "delegation mail"
 msgstr "thư đại biểu"
 
-#: ../../english/intro/organization.data:14
+#: ../../english/intro/organization.data:16
 msgid "appointment mail"
 msgstr "thư bổ nhiệm"
 
 #. One male delegate
-#: ../../english/intro/organization.data:16
+#: ../../english/intro/organization.data:18
 msgid "<void id=\"male\"/>delegate"
 msgstr "<void id=\"male\"/>đại biểu"
 
 #. One female delegate
-#: ../../english/intro/organization.data:18
+#: ../../english/intro/organization.data:20
 msgid "<void id=\"female\"/>delegate"
 msgstr "<void id=\"female\"/>đại biểu"
 
-#: ../../english/intro/organization.data:21
 #: ../../english/intro/organization.data:23
+#: ../../english/intro/organization.data:25
 msgid "current"
 msgstr "hiện tại"
 
-#: ../../english/intro/organization.data:25
 #: ../../english/intro/organization.data:27
+#: ../../english/intro/organization.data:29
 msgid "member"
 msgstr "thành viên"
 
-#: ../../english/intro/organization.data:30
+#: ../../english/intro/organization.data:32
 msgid "manager"
 msgstr "nhà quản lý"
 
-#: ../../english/intro/organization.data:32
+#: ../../english/intro/organization.data:34
 msgid "SRM"
 msgstr "SRM"
 
-#: ../../english/intro/organization.data:32
+#: ../../english/intro/organization.data:34
 msgid "Stable Release Manager"
 msgstr "Quản lý phát hành bản ổn định"
 
-#: ../../english/intro/organization.data:34
+#: ../../english/intro/organization.data:36
 msgid "wizard"
 msgstr "thuật sỹ"
 
-#: ../../english/intro/organization.data:37
+#: ../../english/intro/organization.data:39
 msgid "chairman"
 msgstr "chủ tịch"
 
-#: ../../english/intro/organization.data:40
+#: ../../english/intro/organization.data:42
 msgid "assistant"
 msgstr "trợ lý"
 
-#: ../../english/intro/organization.data:42
+#: ../../english/intro/organization.data:44
 msgid "secretary"
 msgstr "thư ký"
 
-#: ../../english/intro/organization.data:51
-#: ../../english/intro/organization.data:60
+#: ../../english/intro/organization.data:53
+#: ../../english/intro/organization.data:62
 msgid "Officers"
 msgstr "Các nhân viên"
 
-#: ../../english/intro/organization.data:52
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:54
+#: ../../english/intro/organization.data:79
 msgid "Distribution"
 msgstr "Phân phối"
 
-#: ../../english/intro/organization.data:53
-#: ../../english/intro/organization.data:220
+#: ../../english/intro/organization.data:55
+#: ../../english/intro/organization.data:223
 msgid "Publicity"
 msgstr "Publicity"
 
-#: ../../english/intro/organization.data:54
-#: ../../english/intro/organization.data:243
+#: ../../english/intro/organization.data:56
+#: ../../english/intro/organization.data:245
 msgid "Support and Infrastructure"
 msgstr "Hỗ trợ và Cơ sở hạ tầng"
 
 #. formerly Custom Debian Distributions (CCDs); see https://blends.alioth.debian.org/blends/ch-about.en.html#s-Blends
-#: ../../english/intro/organization.data:56
+#: ../../english/intro/organization.data:58
 msgid "Debian Pure Blends"
 msgstr "Debian Pure Blends"
 
-#: ../../english/intro/organization.data:63
+#: ../../english/intro/organization.data:65
 msgid "Leader"
 msgstr "Lãnh đạo"
 
-#: ../../english/intro/organization.data:65
+#: ../../english/intro/organization.data:67
 msgid "Technical Committee"
 msgstr "Ủy ban kỹ thuật"
 
-#: ../../english/intro/organization.data:72
+#: ../../english/intro/organization.data:74
 msgid "Secretary"
 msgstr "Thư ký"
 
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:82
 msgid "Development Projects"
 msgstr "Các dự án phát triển"
 
-#: ../../english/intro/organization.data:81
+#: ../../english/intro/organization.data:83
 msgid "FTP Archives"
 msgstr "Lưu trữ FTP"
 
-#: ../../english/intro/organization.data:83
+#: ../../english/intro/organization.data:85
 msgid "FTP Masters"
 msgstr "Chủ FPT"
 
-#: ../../english/intro/organization.data:87
+#: ../../english/intro/organization.data:89
 msgid "FTP Assistants"
 msgstr "Trợ lý FTP"
 
-#: ../../english/intro/organization.data:95
+#: ../../english/intro/organization.data:98
 msgid "FTP Wizards"
 msgstr "Thuật sỹ FTP"
 
-#: ../../english/intro/organization.data:99
+#: ../../english/intro/organization.data:102
 msgid "Backports"
 msgstr "Chuyển ngược"
 
-#: ../../english/intro/organization.data:101
+#: ../../english/intro/organization.data:104
 msgid "Backports Team"
 msgstr "Nhóm chuyển ngược"
 
-#: ../../english/intro/organization.data:105
+#: ../../english/intro/organization.data:108
 msgid "Individual Packages"
 msgstr "Các gói riêng lẻ"
 
-#: ../../english/intro/organization.data:106
+#: ../../english/intro/organization.data:109
 msgid "Release Management"
 msgstr "Ban quản lý phát hành"
 
-#: ../../english/intro/organization.data:108
+#: ../../english/intro/organization.data:111
 msgid "Release Team"
 msgstr "Nhóm phát hành"
 
-#: ../../english/intro/organization.data:121
+#: ../../english/intro/organization.data:124
 msgid "Quality Assurance"
 msgstr "Đảm bảo chất lượng"
 
-#: ../../english/intro/organization.data:122
+#: ../../english/intro/organization.data:125
 msgid "Installation System Team"
 msgstr "Nhóm Hệ thống cài đặt"
 
-#: ../../english/intro/organization.data:123
+#: ../../english/intro/organization.data:126
 msgid "Release Notes"
 msgstr "Ghi chú phát hành"
 
-#: ../../english/intro/organization.data:125
+#: ../../english/intro/organization.data:128
 msgid "CD Images"
 msgstr "Ảnh CD"
 
-#: ../../english/intro/organization.data:127
+#: ../../english/intro/organization.data:130
 msgid "Production"
 msgstr "Sản xuất"
 
-#: ../../english/intro/organization.data:135
+#: ../../english/intro/organization.data:138
 msgid "Testing"
 msgstr "Thử nghiệm"
 
-#: ../../english/intro/organization.data:137
+#: ../../english/intro/organization.data:140
 msgid "Autobuilding infrastructure"
 msgstr "Cơ sở hạ tầng tự động biên dịch"
 
-#: ../../english/intro/organization.data:139
+#: ../../english/intro/organization.data:142
 msgid "Wanna-build team"
 msgstr "Nhóm Wanna-build"
 
-#: ../../english/intro/organization.data:147
+#: ../../english/intro/organization.data:150
 msgid "Buildd administration"
 msgstr "Quản tri Buildd"
 
-#: ../../english/intro/organization.data:166
+#: ../../english/intro/organization.data:169
 msgid "Documentation"
 msgstr "Tài liệu"
 
-#: ../../english/intro/organization.data:171
+#: ../../english/intro/organization.data:174
 msgid "Work-Needing and Prospective Packages list"
 msgstr "Danh sách các gói cần làm và trong tương lai"
 
-#: ../../english/intro/organization.data:174
+#: ../../english/intro/organization.data:177
 msgid "Live System Team"
 msgstr "Nhóm hệ thống Live"
 
-#: ../../english/intro/organization.data:175
+#: ../../english/intro/organization.data:178
 msgid "Ports"
 msgstr "Bản chuyển đổi"
 
-#: ../../english/intro/organization.data:210
+#: ../../english/intro/organization.data:213
 msgid "Special Configurations"
 msgstr "Các cấu hình đặc biệt"
 
-#: ../../english/intro/organization.data:213
+#: ../../english/intro/organization.data:216
 msgid "Laptops"
 msgstr "Máy tính xách tay"
 
-#: ../../english/intro/organization.data:214
+#: ../../english/intro/organization.data:217
 msgid "Firewalls"
 msgstr "Tường lửa"
 
-#: ../../english/intro/organization.data:215
+#: ../../english/intro/organization.data:218
 msgid "Embedded systems"
 msgstr "Các hệ thống nhúng"
 
-#: ../../english/intro/organization.data:223
+#: ../../english/intro/organization.data:226
+#, fuzzy
+#| msgid "Publicity"
+msgid "Publicity team"
+msgstr "Publicity"
+
+#: ../../english/intro/organization.data:231
 msgid "Press Contact"
 msgstr "Liên hệ báo chí"
 
-#: ../../english/intro/organization.data:229
+#: ../../english/intro/organization.data:233
 msgid "Partner Program"
 msgstr "Chương trình đối tác"
 
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:237
 msgid "Events"
 msgstr "Sự kiện"
 
-#: ../../english/intro/organization.data:237
-msgid "Bits from Debian"
-msgstr "Bits từ Debian"
-
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:248
 msgid "User support"
 msgstr "Hỗ trợ người dùng"
 
-#: ../../english/intro/organization.data:313
+#: ../../english/intro/organization.data:315
 msgid "Bug Tracking System"
 msgstr "Hệ thống theo dõi lỗi"
 
-#: ../../english/intro/organization.data:318
+#: ../../english/intro/organization.data:320
 msgid "Mailing Lists Administration and Mailing List Archives"
 msgstr "Quản trị và Lưu trữ các bó thư"
 
-#: ../../english/intro/organization.data:326
+#: ../../english/intro/organization.data:328
 msgid "New Members Front Desk"
 msgstr "Các thành viên Bàn lễ tân mới"
 
-#: ../../english/intro/organization.data:332
+#: ../../english/intro/organization.data:334
 msgid "Debian Account Managers"
 msgstr "Quản lý các tài khoản Debian"
 
-#: ../../english/intro/organization.data:337
-msgid "Keyring Maintainers (PGP and GPG)"
-msgstr "Những nhà bảo trì chùm chìa khóa (PGP và GPG)"
+#: ../../english/intro/organization.data:339
+msgid ""
+"To send a private message to all DAMs, use the GPG key "
+"57731224A9762EA155AB2A530CA8D15BB24D96F2."
+msgstr ""
 
 #: ../../english/intro/organization.data:340
-msgid "Debian Maintainer (DM) Keyring Maintainers"
-msgstr "Những người quản lý chùm chìa khóa Nhà bảo trì Debian (DM)"
+msgid "Keyring Maintainers (PGP and GPG)"
+msgstr "Những nhà bảo trì chùm chìa khóa (PGP và GPG)"
 
-#: ../../english/intro/organization.data:344
+#: ../../english/intro/organization.data:343
 msgid "Security Team"
 msgstr "Nhóm bảo mật"
 
-#: ../../english/intro/organization.data:359
+#: ../../english/intro/organization.data:356
 msgid "Web Pages"
 msgstr "Trang thông tin điện tử"
 
-#: ../../english/intro/organization.data:366
+#: ../../english/intro/organization.data:365
 msgid "Consultants Page"
 msgstr "Trang cố vấn"
 
-#: ../../english/intro/organization.data:371
+#: ../../english/intro/organization.data:370
 msgid "CD Vendors Page"
 msgstr "Trang nhà cung cấp CD"
 
-#: ../../english/intro/organization.data:374
+#: ../../english/intro/organization.data:373
 msgid "Planet Debian"
 msgstr "Planet Debian"
 
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:377
 msgid "Policy"
 msgstr "Chính sách"
 
-#: ../../english/intro/organization.data:383
+#: ../../english/intro/organization.data:382
 msgid "System Administration"
 msgstr "Quản trị hệ thống"
 
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:383
 msgid ""
 "This is the address to use when encountering problems on one of Debian's "
 "machines, including password problems or you need a package installed."
@@ -295,7 +299,7 @@ msgstr ""
 "Đây là địa chỉ dùng khi gặp trục trặc với một trong số các máy của Debian, "
 "bao gồm các vấn đề với mật khẩu hoặc bạn muốn một gói nào đó được cài đặt."
 
-#: ../../english/intro/organization.data:394
+#: ../../english/intro/organization.data:393
 msgid ""
 "If you have hardware problems with Debian machines, please see <a href="
 "\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
@@ -305,89 +309,100 @@ msgstr ""
 "href=\"https://db.debian.org/machines.cgi\">Các máy Debian</a>, nó chứa "
 "thông tin quản trị cho từng máy."
 
-#: ../../english/intro/organization.data:395
+#: ../../english/intro/organization.data:394
 msgid "LDAP Developer Directory Administrator"
 msgstr "Nhà quản trị Thư mục Phát triển LDAP"
 
-#: ../../english/intro/organization.data:396
+#: ../../english/intro/organization.data:395
 msgid "Mirrors"
 msgstr "Máy bản sao"
 
-#: ../../english/intro/organization.data:401
+#: ../../english/intro/organization.data:400
 msgid "DNS Maintainer"
 msgstr "Quản trị DNS"
 
-#: ../../english/intro/organization.data:402
+#: ../../english/intro/organization.data:401
 msgid "Package Tracking System"
 msgstr "Hệ thống theo dõi lỗi"
 
-#: ../../english/intro/organization.data:404
+#: ../../english/intro/organization.data:403
 msgid "Hardware Donations Coordination"
 msgstr "Điều phối các quyên góp phần cứng"
 
-#: ../../english/intro/organization.data:410
+#: ../../english/intro/organization.data:409
 msgid "Auditor"
 msgstr "Kiểm soát"
 
-#: ../../english/intro/organization.data:413
+#: ../../english/intro/organization.data:415
 msgid ""
 "<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
 msgstr ""
 "Các yêu cầu dùng <a name=\"trademark\" href=\"m4_HOME/trademark\">nhãn hiệu</"
 "a>"
 
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:418
 msgid "Alioth administrators"
 msgstr "Các quản trị viên Alioth"
 
-#: ../../english/intro/organization.data:422
+#: ../../english/intro/organization.data:424
 msgid "Debian Women Project"
 msgstr "Dự án Phụ nữ Debian"
 
-#: ../../english/intro/organization.data:429
-msgid "DebConf chairs"
-msgstr "Các ghế DebConf"
+#: ../../english/intro/organization.data:431
+#, fuzzy
+#| msgid "Technical Committee"
+msgid "DebConf Committee"
+msgstr "Ủy ban kỹ thuật"
 
-#: ../../english/intro/organization.data:433
+#: ../../english/intro/organization.data:437
 msgid "Anti-harassment"
 msgstr "Chống quấy rối"
 
-#: ../../english/intro/organization.data:436
+#: ../../english/intro/organization.data:442
 msgid "Outreach"
 msgstr "Hoạt động ngoài lề"
 
-#: ../../english/intro/organization.data:446
+#: ../../english/intro/organization.data:452
 msgid "Debian for children from 1 to 99"
 msgstr "Debian dành cho trẻ em từ 1 đến 99"
 
-#: ../../english/intro/organization.data:449
+#: ../../english/intro/organization.data:455
 msgid "Debian for medical practice and research"
 msgstr "Debian dành cho nghiên cứu và thực hành y học"
 
-#: ../../english/intro/organization.data:452
+#: ../../english/intro/organization.data:458
 msgid "Debian for education"
 msgstr "Debian dành cho giáo dục"
 
-#: ../../english/intro/organization.data:457
+#: ../../english/intro/organization.data:463
 msgid "Debian in legal offices"
 msgstr "Debian trong các văn phòng luật"
 
-#: ../../english/intro/organization.data:461
+#: ../../english/intro/organization.data:467
 msgid "Debian for people with disabilities"
 msgstr "Debian dành cho những người khuyết tật"
 
-#: ../../english/intro/organization.data:465
+#: ../../english/intro/organization.data:471
 msgid "Debian for science and related research"
 msgstr "Debian dành cho khoa học và nghiên cứu"
 
-#~ msgid "Marketing Team"
-#~ msgstr "Nhóm tiếp cận thị trường"
+#~ msgid "current Debian Project Leader"
+#~ msgstr "Nhà lãnh đạo dự án Debian hiện tại"
+
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Bạn phân phối Debian tùy chỉnh"
 
 #~ msgid "Release Team for ``stable''"
 #~ msgstr "Nhóm phát hành cho bản ổn định ``stable''"
 
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Bạn phân phối Debian tùy chỉnh"
+#~ msgid "Marketing Team"
+#~ msgstr "Nhóm tiếp cận thị trường"
 
-#~ msgid "current Debian Project Leader"
-#~ msgstr "Nhà lãnh đạo dự án Debian hiện tại"
+#~ msgid "DebConf chairs"
+#~ msgstr "Các ghế DebConf"
+
+#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
+#~ msgstr "Những người quản lý chùm chìa khóa Nhà bảo trì Debian (DM)"
+
+#~ msgid "Bits from Debian"
+#~ msgstr "Bits từ Debian"
diff --git a/vietnamese/po/others.vi.po b/vietnamese/po/others.vi.po
index 119effbc9b2..2e6f5267ae7 100644
--- a/vietnamese/po/others.vi.po
+++ b/vietnamese/po/others.vi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../../english/banners/index.tags:7
diff --git a/vietnamese/po/ports.vi.po b/vietnamese/po/ports.vi.po
index ca0a4ac5880..af60bbe50d1 100644
--- a/vietnamese/po/ports.vi.po
+++ b/vietnamese/po/ports.vi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../../english/ports/alpha/menu.inc:6
diff --git a/vietnamese/po/stats.vi.po b/vietnamese/po/stats.vi.po
index 0a5012b669d..d3a938d8a7f 100644
--- a/vietnamese/po/stats.vi.po
+++ b/vietnamese/po/stats.vi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../../english/template/debian/stats_tags.wml:6
@@ -47,180 +47,180 @@ msgstr ""
 msgid "Click to fetch diffstat data"
 msgstr ""
 
-#: ../../stattrans.pl:436 ../../stattrans.pl:575 ../../stattrans.pl:576
+#: ../../stattrans.pl:436 ../../stattrans.pl:580 ../../stattrans.pl:581
 msgid "Unified diff"
 msgstr ""
 
-#: ../../stattrans.pl:439 ../../stattrans.pl:575 ../../stattrans.pl:576
+#: ../../stattrans.pl:439 ../../stattrans.pl:580 ../../stattrans.pl:581
 msgid "Colored diff"
 msgstr ""
 
-#: ../../stattrans.pl:541
+#: ../../stattrans.pl:541 ../../stattrans.pl:683
+msgid "Created with <transstatslink>"
+msgstr ""
+
+#: ../../stattrans.pl:546
 msgid "Translation summary for"
 msgstr ""
 
-#: ../../stattrans.pl:544 ../../stattrans.pl:700 ../../stattrans.pl:746
-#: ../../stattrans.pl:789
+#: ../../stattrans.pl:549 ../../stattrans.pl:707 ../../stattrans.pl:753
+#: ../../stattrans.pl:796
 msgid "Not translated"
 msgstr ""
 
-#: ../../stattrans.pl:544 ../../stattrans.pl:699 ../../stattrans.pl:745
+#: ../../stattrans.pl:549 ../../stattrans.pl:706 ../../stattrans.pl:752
 msgid "Outdated"
 msgstr ""
 
-#: ../../stattrans.pl:544
+#: ../../stattrans.pl:549
 msgid "Translated"
 msgstr ""
 
-#: ../../stattrans.pl:544 ../../stattrans.pl:626 ../../stattrans.pl:698
-#: ../../stattrans.pl:744 ../../stattrans.pl:787
+#: ../../stattrans.pl:549 ../../stattrans.pl:631 ../../stattrans.pl:705
+#: ../../stattrans.pl:751 ../../stattrans.pl:794
 msgid "Up to date"
 msgstr ""
 
-#: ../../stattrans.pl:545 ../../stattrans.pl:546 ../../stattrans.pl:547
-#: ../../stattrans.pl:548
+#: ../../stattrans.pl:550 ../../stattrans.pl:551 ../../stattrans.pl:552
+#: ../../stattrans.pl:553
 msgid "files"
 msgstr ""
 
-#: ../../stattrans.pl:551 ../../stattrans.pl:552 ../../stattrans.pl:553
-#: ../../stattrans.pl:554
+#: ../../stattrans.pl:556 ../../stattrans.pl:557 ../../stattrans.pl:558
+#: ../../stattrans.pl:559
 msgid "bytes"
 msgstr ""
 
-#: ../../stattrans.pl:561
+#: ../../stattrans.pl:566
 msgid ""
 "Note: the lists of pages are sorted by popularity. Hover over the page name "
 "to see the number of hits."
 msgstr ""
 
-#: ../../stattrans.pl:567
+#: ../../stattrans.pl:572
 msgid "Outdated translations"
 msgstr ""
 
-#: ../../stattrans.pl:569 ../../stattrans.pl:625
+#: ../../stattrans.pl:574 ../../stattrans.pl:630
 msgid "File"
 msgstr ""
 
-#: ../../stattrans.pl:571 ../../stattrans.pl:577
+#: ../../stattrans.pl:576 ../../stattrans.pl:582
 msgid "Diff"
 msgstr ""
 
-#: ../../stattrans.pl:573
+#: ../../stattrans.pl:578
 msgid "Comment"
 msgstr ""
 
-#: ../../stattrans.pl:574
+#: ../../stattrans.pl:579
 msgid "Diffstat"
 msgstr ""
 
-#: ../../stattrans.pl:579
+#: ../../stattrans.pl:584
 msgid "Log"
 msgstr ""
 
-#: ../../stattrans.pl:580
+#: ../../stattrans.pl:585
 msgid "Translation"
 msgstr ""
 
-#: ../../stattrans.pl:581
+#: ../../stattrans.pl:586
 msgid "Maintainer"
 msgstr ""
 
-#: ../../stattrans.pl:583
+#: ../../stattrans.pl:588
 msgid "Status"
 msgstr ""
 
-#: ../../stattrans.pl:584
+#: ../../stattrans.pl:589
 msgid "Translator"
 msgstr ""
 
-#: ../../stattrans.pl:585
+#: ../../stattrans.pl:590
 msgid "Date"
 msgstr ""
 
-#: ../../stattrans.pl:592
+#: ../../stattrans.pl:597
 msgid "General pages not translated"
 msgstr ""
 
-#: ../../stattrans.pl:593
+#: ../../stattrans.pl:598
 msgid "Untranslated general pages"
 msgstr ""
 
-#: ../../stattrans.pl:598
+#: ../../stattrans.pl:603
 msgid "News items not translated"
 msgstr ""
 
-#: ../../stattrans.pl:599
+#: ../../stattrans.pl:604
 msgid "Untranslated news items"
 msgstr ""
 
-#: ../../stattrans.pl:604
+#: ../../stattrans.pl:609
 msgid "Consultant/user pages not translated"
 msgstr ""
 
-#: ../../stattrans.pl:605
+#: ../../stattrans.pl:610
 msgid "Untranslated consultant/user pages"
 msgstr ""
 
-#: ../../stattrans.pl:610
+#: ../../stattrans.pl:615
 msgid "International pages not translated"
 msgstr ""
 
-#: ../../stattrans.pl:611
+#: ../../stattrans.pl:616
 msgid "Untranslated international pages"
 msgstr ""
 
-#: ../../stattrans.pl:616
+#: ../../stattrans.pl:621
 msgid "Translated pages (up-to-date)"
 msgstr ""
 
-#: ../../stattrans.pl:623 ../../stattrans.pl:771
+#: ../../stattrans.pl:628 ../../stattrans.pl:778
 msgid "Translated templates (PO files)"
 msgstr ""
 
-#: ../../stattrans.pl:624 ../../stattrans.pl:774
+#: ../../stattrans.pl:629 ../../stattrans.pl:781
 msgid "PO Translation Statistics"
 msgstr ""
 
-#: ../../stattrans.pl:627 ../../stattrans.pl:788
+#: ../../stattrans.pl:632 ../../stattrans.pl:795
 msgid "Fuzzy"
 msgstr ""
 
-#: ../../stattrans.pl:628
+#: ../../stattrans.pl:633
 msgid "Untranslated"
 msgstr ""
 
-#: ../../stattrans.pl:629
+#: ../../stattrans.pl:634
 msgid "Total"
 msgstr ""
 
-#: ../../stattrans.pl:646
+#: ../../stattrans.pl:651
 msgid "Total:"
 msgstr ""
 
-#: ../../stattrans.pl:659 ../../stattrans.pl:813
-msgid "Created with"
-msgstr ""
-
-#: ../../stattrans.pl:678
+#: ../../stattrans.pl:685
 msgid "Translated web pages"
 msgstr ""
 
-#: ../../stattrans.pl:681
+#: ../../stattrans.pl:688
 msgid "Translation Statistics by Page Count"
 msgstr ""
 
-#: ../../stattrans.pl:696 ../../stattrans.pl:742 ../../stattrans.pl:786
+#: ../../stattrans.pl:703 ../../stattrans.pl:749 ../../stattrans.pl:793
 msgid "Language"
 msgstr ""
 
-#: ../../stattrans.pl:697 ../../stattrans.pl:743
+#: ../../stattrans.pl:704 ../../stattrans.pl:750
 msgid "Translations"
 msgstr ""
 
-#: ../../stattrans.pl:724
+#: ../../stattrans.pl:731
 msgid "Translated web pages (by size)"
 msgstr ""
 
-#: ../../stattrans.pl:727
+#: ../../stattrans.pl:734
 msgid "Translation Statistics by Page Size"
 msgstr ""
diff --git a/vietnamese/po/templates.vi.po b/vietnamese/po/templates.vi.po
index 295f49377f8..031bb97bbeb 100644
--- a/vietnamese/po/templates.vi.po
+++ b/vietnamese/po/templates.vi.po
@@ -62,7 +62,7 @@ msgid "Back to the <a href=\"m4_HOME/\">Debian Project homepage</a>."
 msgstr "Quay trở lại <a href=\"m4_HOME/\">trang chủ Dự án Debian</a>."
 
 #: ../../english/template/debian/common_translation.wml:22
-#: ../../english/template/debian/links.tags.wml:152
+#: ../../english/template/debian/links.tags.wml:149
 msgid "Home"
 msgstr "Trang chủ"
 
@@ -103,48 +103,52 @@ msgid "Support"
 msgstr "Hỗ trợ"
 
 #: ../../english/template/debian/common_translation.wml:52
+msgid "Pure Blends"
+msgstr ""
+
+#: ../../english/template/debian/common_translation.wml:55
 #: ../../english/template/debian/links.tags.wml:46
 msgid "Developers' Corner"
 msgstr "Góc phát triển"
 
-#: ../../english/template/debian/common_translation.wml:55
+#: ../../english/template/debian/common_translation.wml:58
 msgid "Documentation"
 msgstr "Tài liệu"
 
-#: ../../english/template/debian/common_translation.wml:58
+#: ../../english/template/debian/common_translation.wml:61
 msgid "Security Information"
 msgstr "Thông tin bảo mật"
 
-#: ../../english/template/debian/common_translation.wml:61
+#: ../../english/template/debian/common_translation.wml:64
 msgid "Search"
 msgstr "Tìm kiếm"
 
-#: ../../english/template/debian/common_translation.wml:64
+#: ../../english/template/debian/common_translation.wml:67
 msgid "none"
 msgstr "không"
 
-#: ../../english/template/debian/common_translation.wml:67
+#: ../../english/template/debian/common_translation.wml:70
 msgid "Go"
 msgstr "Đi"
 
-#: ../../english/template/debian/common_translation.wml:70
+#: ../../english/template/debian/common_translation.wml:73
 msgid "worldwide"
 msgstr "toàn cầu"
 
-#: ../../english/template/debian/common_translation.wml:73
+#: ../../english/template/debian/common_translation.wml:76
 msgid "Site map"
 msgstr "Sơ đồ"
 
-#: ../../english/template/debian/common_translation.wml:76
+#: ../../english/template/debian/common_translation.wml:79
 msgid "Miscellaneous"
 msgstr "Lặt vặt"
 
-#: ../../english/template/debian/common_translation.wml:79
-#: ../../english/template/debian/links.tags.wml:107
+#: ../../english/template/debian/common_translation.wml:82
+#: ../../english/template/debian/links.tags.wml:104
 msgid "Getting Debian"
 msgstr "Lấy Debian"
 
-#: ../../english/template/debian/common_translation.wml:82
+#: ../../english/template/debian/common_translation.wml:85
 msgid "The Debian Blog"
 msgstr "Nhật ký Debian"
 
@@ -194,7 +198,7 @@ msgstr "trong bản phát hành 2.2"
 #. you can add some information of your own translation mailing list
 #. (i.e. debian-l10n-XXXXXX@lists.debian.org) for reporting things in
 #. your language.
-#: ../../english/template/debian/footer.wml:97
+#: ../../english/template/debian/footer.wml:105
 msgid ""
 "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
 "www@lists.debian.org\">debian-www@lists.debian.org</a>.  For other contact "
@@ -210,25 +214,25 @@ msgstr ""
 "Debian. Mã nguồn trang thông tin điện tử cũng <a href=\"m4_HOME/devel/"
 "website/using_cvs\">sẵn có</a>."
 
-#: ../../english/template/debian/footer.wml:100
+#: ../../english/template/debian/footer.wml:108
 msgid "Last Modified"
 msgstr "Lần sửa cuối"
 
-#: ../../english/template/debian/footer.wml:103
+#: ../../english/template/debian/footer.wml:111
 msgid "Copyright"
 msgstr "Bản quyền"
 
-#: ../../english/template/debian/footer.wml:106
+#: ../../english/template/debian/footer.wml:114
 msgid "<a href=\"http://www.spi-inc.org/\">SPI</a> and others;"
 msgstr "<a href=\"http://www.spi-inc.org/\">SPI</a> và các chủ thể khác;"
 
-#: ../../english/template/debian/footer.wml:109
+#: ../../english/template/debian/footer.wml:117
 msgid "See <a href=\"m4_HOME/license\" rel=\"copyright\">license terms</a>"
 msgstr ""
 "Xem <a href=\"m4_HOME/license\" rel=\"copyright\">các điều khoản giấy phép</"
 "a>"
 
-#: ../../english/template/debian/footer.wml:112
+#: ../../english/template/debian/footer.wml:120
 msgid ""
 "Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
 "Software in the Public Interest, Inc."
@@ -310,126 +314,122 @@ msgid "Code of Conduct"
 msgstr "Quy tắc ứng xử"
 
 #: ../../english/template/debian/links.tags.wml:55
-msgid "Visit the site sponsor"
-msgstr "Viếng thăm trang của nhà đỡ đầu"
-
-#: ../../english/template/debian/links.tags.wml:58
 msgid "Debian 5.0 - The universal operating system"
 msgstr "Debian 5.0 - Hệ điều hành toàn cầu"
 
-#: ../../english/template/debian/links.tags.wml:61
+#: ../../english/template/debian/links.tags.wml:58
 msgid "Site map for Debian web pages"
 msgstr "Sơ đồ trang thông tin điện tử Debian"
 
-#: ../../english/template/debian/links.tags.wml:64
+#: ../../english/template/debian/links.tags.wml:61
 msgid "Developer Database"
 msgstr "Cơ sở dữ liệu nhà phát triển"
 
-#: ../../english/template/debian/links.tags.wml:67
+#: ../../english/template/debian/links.tags.wml:64
 msgid "Debian FAQ"
 msgstr "Debian FAQ"
 
-#: ../../english/template/debian/links.tags.wml:70
+#: ../../english/template/debian/links.tags.wml:67
 msgid "Debian Policy Manual"
 msgstr "Hướng dẫn chính sách Debian"
 
-#: ../../english/template/debian/links.tags.wml:73
+#: ../../english/template/debian/links.tags.wml:70
 msgid "Developers' Reference"
 msgstr "Tham khảo cho nhà phát triển"
 
-#: ../../english/template/debian/links.tags.wml:76
+#: ../../english/template/debian/links.tags.wml:73
 msgid "New Maintainers' Guide"
 msgstr "Hướng dẫn người bảo trì mới"
 
-#: ../../english/template/debian/links.tags.wml:79
+#: ../../english/template/debian/links.tags.wml:76
 msgid "Release Critical Bugs"
 msgstr "Các lỗi phát hành nghiêm trọng"
 
-#: ../../english/template/debian/links.tags.wml:82
+#: ../../english/template/debian/links.tags.wml:79
 msgid "Lintian Reports"
 msgstr "Báo cáo kiểm chuẩn"
 
-#: ../../english/template/debian/links.tags.wml:86
+#: ../../english/template/debian/links.tags.wml:83
 msgid "Archives for users' mailing lists"
 msgstr "Lưu trữ cho các bó thư người dùng"
 
-#: ../../english/template/debian/links.tags.wml:89
+#: ../../english/template/debian/links.tags.wml:86
 msgid "Archives for developers' mailing lists"
 msgstr "Lưu trữ cho các bó thư nhà phát triển"
 
-#: ../../english/template/debian/links.tags.wml:92
+#: ../../english/template/debian/links.tags.wml:89
 msgid "Archives for i18n/l10n mailing lists"
 msgstr "Lưu trữ cho các bó thư i18n/l10n"
 
-#: ../../english/template/debian/links.tags.wml:95
+#: ../../english/template/debian/links.tags.wml:92
 msgid "Archives for ports' mailing lists"
 msgstr "Lưu trữ cho các bó thư chuyển đổi để chạy trên các hệ thống khác"
 
-#: ../../english/template/debian/links.tags.wml:98
+#: ../../english/template/debian/links.tags.wml:95
 msgid "Archives for mailing lists of the Bug tracking system"
 msgstr "Lưu trữ cho các bó thư của hệ thống theo dõi lỗi"
 
-#: ../../english/template/debian/links.tags.wml:101
+#: ../../english/template/debian/links.tags.wml:98
 msgid "Archives for miscellaneous mailing lists"
 msgstr "Lưu trữ cho các bó thư lặt vặt"
 
-#: ../../english/template/debian/links.tags.wml:104
+#: ../../english/template/debian/links.tags.wml:101
 msgid "Free Software"
 msgstr "Phần mềm tự do"
 
-#: ../../english/template/debian/links.tags.wml:110
+#: ../../english/template/debian/links.tags.wml:107
 msgid "Development"
 msgstr "Phát triển"
 
-#: ../../english/template/debian/links.tags.wml:113
+#: ../../english/template/debian/links.tags.wml:110
 msgid "Help Debian"
 msgstr "Hỗ trợ Debian"
 
-#: ../../english/template/debian/links.tags.wml:116
+#: ../../english/template/debian/links.tags.wml:113
 msgid "Bug reports"
 msgstr "Báo cáo lỗi"
 
-#: ../../english/template/debian/links.tags.wml:119
+#: ../../english/template/debian/links.tags.wml:116
 msgid "Ports/Architectures"
 msgstr "Bản chuyển/Kiến trúc"
 
-#: ../../english/template/debian/links.tags.wml:122
+#: ../../english/template/debian/links.tags.wml:119
 msgid "Installation manual"
 msgstr "Hướng dẫn cài đặt"
 
-#: ../../english/template/debian/links.tags.wml:125
+#: ../../english/template/debian/links.tags.wml:122
 msgid "CD vendors"
 msgstr "Nhà cung cấp CD"
 
-#: ../../english/template/debian/links.tags.wml:128
+#: ../../english/template/debian/links.tags.wml:125
 msgid "CD/USB ISO images"
 msgstr "Ảnh ISO CD/USB"
 
-#: ../../english/template/debian/links.tags.wml:131
+#: ../../english/template/debian/links.tags.wml:128
 msgid "Network install"
 msgstr "Cài đặt qua mạng"
 
-#: ../../english/template/debian/links.tags.wml:134
+#: ../../english/template/debian/links.tags.wml:131
 msgid "Pre-installed"
 msgstr "Cài sẵn"
 
-#: ../../english/template/debian/links.tags.wml:137
+#: ../../english/template/debian/links.tags.wml:134
 msgid "Debian-Edu project"
 msgstr "Dự án Debian-Edu"
 
-#: ../../english/template/debian/links.tags.wml:140
+#: ../../english/template/debian/links.tags.wml:137
 msgid "Alioth &ndash; Debian GForge"
 msgstr "Alioth &ndash; Debian GForge"
 
-#: ../../english/template/debian/links.tags.wml:143
+#: ../../english/template/debian/links.tags.wml:140
 msgid "Quality Assurance"
 msgstr "Đảm bảo chất lượng"
 
-#: ../../english/template/debian/links.tags.wml:146
+#: ../../english/template/debian/links.tags.wml:143
 msgid "Package Tracking System"
 msgstr "Hệ thống theo dõi gói"
 
-#: ../../english/template/debian/links.tags.wml:149
+#: ../../english/template/debian/links.tags.wml:146
 msgid "Debian Developer's Packages Overview"
 msgstr "Tổng quan các gói của nhà phát triển Debian"
 
@@ -473,7 +473,7 @@ msgstr "Sự kiện đã qua"
 msgid "(new revision)"
 msgstr "(phiên bản mới)"
 
-#: ../../english/template/debian/recent_list.wml:301
+#: ../../english/template/debian/recent_list.wml:303
 msgid "Report"
 msgstr "Báo cáo"
 
@@ -510,3 +510,6 @@ msgstr "URL"
 #: ../../english/template/debian/users.wml:7
 msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
 msgstr "Quay trở về trang <a href=\"../\">Ai đang dùng Debian?</a>."
+
+#~ msgid "Visit the site sponsor"
+#~ msgstr "Viếng thăm trang của nhà đỡ đầu"
diff --git a/vietnamese/po/vendors.vi.po b/vietnamese/po/vendors.vi.po
index 22536f2753b..e518d1e5016 100644
--- a/vietnamese/po/vendors.vi.po
+++ b/vietnamese/po/vendors.vi.po
@@ -68,37 +68,37 @@ msgstr "nguồn"
 msgid "and"
 msgstr "và"
 
-#~ msgid "Architectures:"
-#~ msgstr "Các kiến trúc:"
+#~ msgid "Vendor:"
+#~ msgstr "Nhà cung cấp:"
 
-#~| msgid "CD Type:"
-#~ msgid "USB Type:"
-#~ msgstr "Kiểu USB:"
+#~ msgid "URL for Debian Page:"
+#~ msgstr "URL cho trang Debian:"
 
-#~| msgid "CD Type:"
-#~ msgid "BD Type:"
-#~ msgstr "Kiểu BD:"
+#~ msgid "Allows Contribution to Debian:"
+#~ msgstr "Cho phép các phần đóng góp cho Debian:"
 
-#~ msgid "DVD Type:"
-#~ msgstr "Kiểu DVD:"
+#~ msgid "Country:"
+#~ msgstr "Nước:"
 
-#~ msgid "CD Type:"
-#~ msgstr "Kiểu CD:"
+#~ msgid "Ship International:"
+#~ msgstr "Vận chuyển quốc tế:"
 
 #~ msgid "email:"
 #~ msgstr "thư điện tử:"
 
-#~ msgid "Ship International:"
-#~ msgstr "Vận chuyển quốc tế:"
+#~ msgid "CD Type:"
+#~ msgstr "Kiểu CD:"
 
-#~ msgid "Country:"
-#~ msgstr "Nước:"
+#~ msgid "DVD Type:"
+#~ msgstr "Kiểu DVD:"
 
-#~ msgid "Allows Contribution to Debian:"
-#~ msgstr "Cho phép các phần đóng góp cho Debian:"
+#~| msgid "CD Type:"
+#~ msgid "BD Type:"
+#~ msgstr "Kiểu BD:"
 
-#~ msgid "URL for Debian Page:"
-#~ msgstr "URL cho trang Debian:"
+#~| msgid "CD Type:"
+#~ msgid "USB Type:"
+#~ msgstr "Kiểu USB:"
 
-#~ msgid "Vendor:"
-#~ msgstr "Nhà cung cấp:"
+#~ msgid "Architectures:"
+#~ msgstr "Các kiến trúc:"
diff --git a/vietnamese/po/vote.vi.po b/vietnamese/po/vote.vi.po
index 35e3d42d7f9..57703ac0a36 100644
--- a/vietnamese/po/vote.vi.po
+++ b/vietnamese/po/vote.vi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../../english/template/debian/votebar.wml:13
diff --git a/vietnamese/po/wnpp.vi.po b/vietnamese/po/wnpp.vi.po
index efc21dc9dbc..38aca2d02e8 100644
--- a/vietnamese/po/wnpp.vi.po
+++ b/vietnamese/po/wnpp.vi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../../english/template/debian/wnpp.wml:8