[Vietnamese] Update language templates

10 files changed, 231 insertions, 245 deletions

diff --git a/vietnamese/po/cdimage.vi.po b/vietnamese/po/cdimage.vi.po
index 44502672c6c..0937893fe3e 100644
--- a/vietnamese/po/cdimage.vi.po
+++ b/vietnamese/po/cdimage.vi.po
@@ -20,11 +20,11 @@ msgstr ""
 msgid "      Key fingerprint"
 msgstr "      Dấu vân tay của khóa"
 
-#: ../../english/devel/debian-installer/images.data:87
+#: ../../english/devel/debian-installer/images.data:90
 msgid "ISO images"
 msgstr "Các ảnh ISO"
 
-#: ../../english/devel/debian-installer/images.data:88
+#: ../../english/devel/debian-installer/images.data:91
 msgid "Jigdo files"
 msgstr "Các tập tin jigdo"
 
diff --git a/vietnamese/po/countries.vi.po b/vietnamese/po/countries.vi.po
index fff9d1bc0a3..d12d9310b1f 100644
--- a/vietnamese/po/countries.vi.po
+++ b/vietnamese/po/countries.vi.po
@@ -264,178 +264,182 @@ msgid "Morocco"
 msgstr "Ma Rốc"
 
 #: ../../english/template/debian/countries.wml:297
+msgid "Monaco"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:300
 msgid "Moldova"
 msgstr "Moldova"
 
-#: ../../english/template/debian/countries.wml:300
+#: ../../english/template/debian/countries.wml:303
 msgid "Montenegro"
 msgstr "Mon-te-nê-gợ-rô"
 
-#: ../../english/template/debian/countries.wml:303
+#: ../../english/template/debian/countries.wml:306
 msgid "Madagascar"
 msgstr "Ma-đa-ga-x-că"
 
-#: ../../english/template/debian/countries.wml:306
+#: ../../english/template/debian/countries.wml:309
 msgid "Macedonia, Republic of"
 msgstr "Cộng Hòa Đô-mi-ni-ca"
 
-#: ../../english/template/debian/countries.wml:309
+#: ../../english/template/debian/countries.wml:312
 msgid "Mongolia"
 msgstr "Mông Cổ"
 
-#: ../../english/template/debian/countries.wml:312
+#: ../../english/template/debian/countries.wml:315
 msgid "Malta"
 msgstr "Malta"
 
-#: ../../english/template/debian/countries.wml:315
+#: ../../english/template/debian/countries.wml:318
 msgid "Mexico"
 msgstr "Mê-hi-cô"
 
-#: ../../english/template/debian/countries.wml:318
+#: ../../english/template/debian/countries.wml:321
 msgid "Malaysia"
 msgstr "Ma-lay-xi-a"
 
-#: ../../english/template/debian/countries.wml:321
+#: ../../english/template/debian/countries.wml:324
 msgid "New Caledonia"
 msgstr "Calédonia mới"
 
-#: ../../english/template/debian/countries.wml:324
+#: ../../english/template/debian/countries.wml:327
 msgid "Nicaragua"
 msgstr "Ni-ca-ra-gua"
 
-#: ../../english/template/debian/countries.wml:327
+#: ../../english/template/debian/countries.wml:330
 msgid "Netherlands"
 msgstr "Hà Lan"
 
-#: ../../english/template/debian/countries.wml:330
+#: ../../english/template/debian/countries.wml:333
 msgid "Norway"
 msgstr "Na Uy"
 
-#: ../../english/template/debian/countries.wml:333
+#: ../../english/template/debian/countries.wml:336
 msgid "New Zealand"
 msgstr "Niu Di-lân"
 
-#: ../../english/template/debian/countries.wml:336
+#: ../../english/template/debian/countries.wml:339
 msgid "Panama"
 msgstr "Pa-na-ma"
 
-#: ../../english/template/debian/countries.wml:339
+#: ../../english/template/debian/countries.wml:342
 msgid "Peru"
 msgstr "Pê-ru"
 
-#: ../../english/template/debian/countries.wml:342
+#: ../../english/template/debian/countries.wml:345
 msgid "French Polynesia"
 msgstr "Pô-li-nê-xi Pháp"
 
-#: ../../english/template/debian/countries.wml:345
+#: ../../english/template/debian/countries.wml:348
 msgid "Philippines"
 msgstr "Phi-líp-pin"
 
-#: ../../english/template/debian/countries.wml:348
+#: ../../english/template/debian/countries.wml:351
 msgid "Pakistan"
 msgstr "Pa-kít-xtan"
 
-#: ../../english/template/debian/countries.wml:351
+#: ../../english/template/debian/countries.wml:354
 msgid "Poland"
 msgstr "Ba Lan"
 
-#: ../../english/template/debian/countries.wml:354
+#: ../../english/template/debian/countries.wml:357
 msgid "Portugal"
 msgstr "Bồ Đào Nha"
 
-#: ../../english/template/debian/countries.wml:357
+#: ../../english/template/debian/countries.wml:360
 msgid "Réunion"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:360
+#: ../../english/template/debian/countries.wml:363
 msgid "Romania"
 msgstr "Ru-ma-ni"
 
-#: ../../english/template/debian/countries.wml:363
+#: ../../english/template/debian/countries.wml:366
 msgid "Serbia"
 msgstr "Xéc-bi"
 
-#: ../../english/template/debian/countries.wml:366
+#: ../../english/template/debian/countries.wml:369
 msgid "Russia"
 msgstr "Nga"
 
-#: ../../english/template/debian/countries.wml:369
+#: ../../english/template/debian/countries.wml:372
 msgid "Saudi Arabia"
 msgstr "A Rập Xau-đi"
 
-#: ../../english/template/debian/countries.wml:372
+#: ../../english/template/debian/countries.wml:375
 msgid "Sweden"
 msgstr "Thụy Điển"
 
-#: ../../english/template/debian/countries.wml:375
+#: ../../english/template/debian/countries.wml:378
 msgid "Singapore"
 msgstr "Xing-ga-po"
 
-#: ../../english/template/debian/countries.wml:378
+#: ../../english/template/debian/countries.wml:381
 msgid "Slovenia"
 msgstr "Xlô-ven"
 
-#: ../../english/template/debian/countries.wml:381
+#: ../../english/template/debian/countries.wml:384
 msgid "Slovakia"
 msgstr "Xlô-vác"
 
-#: ../../english/template/debian/countries.wml:384
+#: ../../english/template/debian/countries.wml:387
 msgid "El Salvador"
 msgstr "En-xan-va-đoa"
 
-#: ../../english/template/debian/countries.wml:387
+#: ../../english/template/debian/countries.wml:390
 msgid "Thailand"
 msgstr "Thái Lan"
 
-#: ../../english/template/debian/countries.wml:390
+#: ../../english/template/debian/countries.wml:393
 msgid "Tajikistan"
 msgstr "Ta-ji-kít-xtan"
 
-#: ../../english/template/debian/countries.wml:393
+#: ../../english/template/debian/countries.wml:396
 msgid "Tunisia"
 msgstr "Tu-ni-xi-a"
 
-#: ../../english/template/debian/countries.wml:396
+#: ../../english/template/debian/countries.wml:399
 msgid "Turkey"
 msgstr "Thổ Nhĩ Kỳ"
 
-#: ../../english/template/debian/countries.wml:399
+#: ../../english/template/debian/countries.wml:402
 msgid "Taiwan"
 msgstr "Đài Loan"
 
-#: ../../english/template/debian/countries.wml:402
+#: ../../english/template/debian/countries.wml:405
 msgid "Ukraine"
 msgstr "Ukraine"
 
-#: ../../english/template/debian/countries.wml:405
+#: ../../english/template/debian/countries.wml:408
 msgid "United States"
 msgstr "Hợp chủng quốc Hoa Kỳ"
 
-#: ../../english/template/debian/countries.wml:408
+#: ../../english/template/debian/countries.wml:411
 msgid "Uruguay"
 msgstr "U-ru-guay"
 
-#: ../../english/template/debian/countries.wml:411
+#: ../../english/template/debian/countries.wml:414
 msgid "Uzbekistan"
 msgstr "U-xơ-bê-ki-x-tanh"
 
-#: ../../english/template/debian/countries.wml:414
+#: ../../english/template/debian/countries.wml:417
 msgid "Venezuela"
 msgstr "Vê-nê-du-ê-la"
 
-#: ../../english/template/debian/countries.wml:417
+#: ../../english/template/debian/countries.wml:420
 msgid "Vietnam"
 msgstr "Việt Nam"
 
-#: ../../english/template/debian/countries.wml:420
+#: ../../english/template/debian/countries.wml:423
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: ../../english/template/debian/countries.wml:423
+#: ../../english/template/debian/countries.wml:426
 msgid "South Africa"
 msgstr "Nam Phi"
 
-#: ../../english/template/debian/countries.wml:426
+#: ../../english/template/debian/countries.wml:429
 msgid "Zimbabwe"
 msgstr "Zim-ba-buê"
 
diff --git a/vietnamese/po/homepage.vi.po b/vietnamese/po/homepage.vi.po
index 0e4d303edc9..23a74b5ffe3 100644
--- a/vietnamese/po/homepage.vi.po
+++ b/vietnamese/po/homepage.vi.po
@@ -16,11 +16,11 @@ msgid "DebConf19 Group Photo"
 msgstr ""
 
 #: ../../english/index.def:19
-msgid "Mini DebConf Hamburg 2018"
+msgid "Mini DebConf Regensburg 2021"
 msgstr ""
 
 #: ../../english/index.def:22
-msgid "Group photo of the MiniDebConf in Hamburg 2018"
+msgid "Group photo of the MiniDebConf in Regensburg 2021"
 msgstr ""
 
 #: ../../english/index.def:26
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/newsevents.vi.po b/vietnamese/po/newsevents.vi.po
index 8181722fff0..7552860acf7 100644
--- a/vietnamese/po/newsevents.vi.po
+++ b/vietnamese/po/newsevents.vi.po
@@ -521,29 +521,26 @@ msgstr ""
 "<void id=\"plural\" />Bản phát hành này của Tin tức Tuần Debian được biên "
 "tập bởi <a href=\"mailto:dwn@debian.org\">%s</a>."
 
-#~ msgid "Name:"
-#~ msgstr "Tên:"
+#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
+#~ msgstr "Quay trở lại <a href=\"./\">trang nói chuyện về Debian</a>."
 
 #~ msgid "Email:"
 #~ msgstr "Thư điện tử:"
 
-#~ msgid "Previous Talks:"
-#~ msgstr "Buổi nói chuyện trước đây:"
-
 #~ msgid "Languages:"
 #~ msgstr "Ngôn ngữ:"
 
+#~ msgid "List of Speakers"
+#~ msgstr "Danh sách người nói chuyện"
+
 #~ msgid "Location:"
 #~ msgstr "Vị trí:"
 
-#~ msgid "Topics:"
-#~ msgstr "Chủ đề:"
-
-#~ msgid "List of Speakers"
-#~ msgstr "Danh sách người nói chuyện"
+#~ msgid "Name:"
+#~ msgstr "Tên:"
 
-#~ msgid "Back to the <a href=\"./\">Debian speakers page</a>."
-#~ msgstr "Quay trở lại <a href=\"./\">trang nói chuyện về Debian</a>."
+#~ msgid "Previous Talks:"
+#~ msgstr "Buổi nói chuyện trước đây:"
 
 #~| msgid ""
 #~| "To receive this newsletter weekly in your mailbox, <a href=\"https://"
@@ -557,3 +554,6 @@ msgstr ""
 #~ "Để nhận được tin tức này hai tuần một lần bằng hộp thư điện tử của bạn, "
 #~ "<a href=\"https://lists.debian.org/debian-news/\">hãy đặt xem dài hạn bó "
 #~ "thư tin-tức-debian</a>."
+
+#~ msgid "Topics:"
+#~ msgstr "Chủ đề:"
diff --git a/vietnamese/po/organization.vi.po b/vietnamese/po/organization.vi.po
index 49796f54e01..48ee82684ab 100644
--- a/vietnamese/po/organization.vi.po
+++ b/vietnamese/po/organization.vi.po
@@ -127,28 +127,28 @@ msgid "Distribution"
 msgstr "Phân phối"
 
 #: ../../english/intro/organization.data:72
-#: ../../english/intro/organization.data:203
+#: ../../english/intro/organization.data:204
 msgid "Communication and Outreach"
 msgstr ""
 
 #: ../../english/intro/organization.data:74
-#: ../../english/intro/organization.data:206
+#: ../../english/intro/organization.data:207
 msgid "Data Protection team"
 msgstr ""
 
 #: ../../english/intro/organization.data:75
-#: ../../english/intro/organization.data:211
+#: ../../english/intro/organization.data:212
 #, fuzzy
 msgid "Publicity team"
 msgstr "Publicity"
 
 #: ../../english/intro/organization.data:77
-#: ../../english/intro/organization.data:284
+#: ../../english/intro/organization.data:279
 msgid "Membership in other organizations"
 msgstr ""
 
 #: ../../english/intro/organization.data:78
-#: ../../english/intro/organization.data:312
+#: ../../english/intro/organization.data:302
 msgid "Support and Infrastructure"
 msgstr "Hỗ trợ và Cơ sở hạ tầng"
 
@@ -200,187 +200,183 @@ msgstr "Ban quản lý phát hành"
 msgid "Release Team"
 msgstr "Nhóm phát hành"
 
-#: ../../english/intro/organization.data:147
+#: ../../english/intro/organization.data:148
 msgid "Quality Assurance"
 msgstr "Đảm bảo chất lượng"
 
-#: ../../english/intro/organization.data:148
+#: ../../english/intro/organization.data:149
 msgid "Installation System Team"
 msgstr "Nhóm Hệ thống cài đặt"
 
-#: ../../english/intro/organization.data:149
+#: ../../english/intro/organization.data:150
 msgid "Debian Live Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:150
+#: ../../english/intro/organization.data:151
 msgid "Release Notes"
 msgstr "Ghi chú phát hành"
 
-#: ../../english/intro/organization.data:152
+#: ../../english/intro/organization.data:153
 #, fuzzy
 #| msgid "CD Images"
 msgid "CD/DVD/USB Images"
 msgstr "Ảnh CD"
 
-#: ../../english/intro/organization.data:154
+#: ../../english/intro/organization.data:155
 msgid "Production"
 msgstr "Sản xuất"
 
-#: ../../english/intro/organization.data:161
+#: ../../english/intro/organization.data:162
 msgid "Testing"
 msgstr "Thử nghiệm"
 
-#: ../../english/intro/organization.data:163
+#: ../../english/intro/organization.data:164
 msgid "Cloud Team"
 msgstr ""
 
-#: ../../english/intro/organization.data:167
+#: ../../english/intro/organization.data:168
 msgid "Autobuilding infrastructure"
 msgstr "Cơ sở hạ tầng tự động biên dịch"
 
-#: ../../english/intro/organization.data:169
+#: ../../english/intro/organization.data:170
 msgid "Wanna-build team"
 msgstr "Nhóm Wanna-build"
 
-#: ../../english/intro/organization.data:176
+#: ../../english/intro/organization.data:177
 msgid "Buildd administration"
 msgstr "Quản tri Buildd"
 
-#: ../../english/intro/organization.data:193
+#: ../../english/intro/organization.data:194
 msgid "Documentation"
 msgstr "Tài liệu"
 
-#: ../../english/intro/organization.data:198
+#: ../../english/intro/organization.data:199
 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:214
+#: ../../english/intro/organization.data:215
 msgid "Press Contact"
 msgstr "Liên hệ báo chí"
 
-#: ../../english/intro/organization.data:216
+#: ../../english/intro/organization.data:217
 msgid "Web Pages"
 msgstr "Trang thông tin điện tử"
 
-#: ../../english/intro/organization.data:228
+#: ../../english/intro/organization.data:225
 msgid "Planet Debian"
 msgstr "Planet Debian"
 
-#: ../../english/intro/organization.data:233
+#: ../../english/intro/organization.data:230
 msgid "Outreach"
 msgstr "Hoạt động ngoài lề"
 
-#: ../../english/intro/organization.data:238
+#: ../../english/intro/organization.data:235
 msgid "Debian Women Project"
 msgstr "Dự án Phụ nữ Debian"
 
-#: ../../english/intro/organization.data:246
+#: ../../english/intro/organization.data:243
 msgid "Community"
 msgstr ""
 
-#: ../../english/intro/organization.data:255
+#: ../../english/intro/organization.data:250
 msgid ""
 "To send a private message to all the members of the Community Team, use the "
 "GPG key <a href=\"community-team-pubkey.txt"
 "\">817DAE61E2FE4CA28E1B7762A89C4D0527C4C869</a>."
 msgstr ""
 
-#: ../../english/intro/organization.data:257
+#: ../../english/intro/organization.data:252
 msgid "Events"
 msgstr "Sự kiện"
 
-#: ../../english/intro/organization.data:264
+#: ../../english/intro/organization.data:259
 #, fuzzy
 msgid "DebConf Committee"
 msgstr "Ủy ban kỹ thuật"
 
-#: ../../english/intro/organization.data:271
+#: ../../english/intro/organization.data:266
 msgid "Partner Program"
 msgstr "Chương trình đối tác"
 
-#: ../../english/intro/organization.data:275
+#: ../../english/intro/organization.data:270
 msgid "Hardware Donations Coordination"
 msgstr "Điều phối các quyên góp phần cứng"
 
-#: ../../english/intro/organization.data:290
+#: ../../english/intro/organization.data:285
 msgid "GNOME Foundation"
 msgstr ""
 
-#: ../../english/intro/organization.data:292
+#: ../../english/intro/organization.data:287
 msgid "Linux Professional Institute"
 msgstr ""
 
-#: ../../english/intro/organization.data:294
+#: ../../english/intro/organization.data:288
 msgid "Linux Magazine"
 msgstr ""
 
-#: ../../english/intro/organization.data:296
+#: ../../english/intro/organization.data:290
 msgid "Linux Standards Base"
 msgstr ""
 
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:291
 msgid "Free Standards Group"
 msgstr ""
 
-#: ../../english/intro/organization.data:299
-msgid "SchoolForge"
-msgstr ""
-
-#: ../../english/intro/organization.data:302
+#: ../../english/intro/organization.data:292
 msgid ""
 "OASIS: Organization\n"
 "      for the Advancement of Structured Information Standards"
 msgstr ""
 
-#: ../../english/intro/organization.data:305
+#: ../../english/intro/organization.data:295
 msgid ""
 "OVAL: Open Vulnerability\n"
 "      Assessment Language"
 msgstr ""
 
-#: ../../english/intro/organization.data:308
+#: ../../english/intro/organization.data:298
 msgid "Open Source Initiative"
 msgstr ""
 
-#: ../../english/intro/organization.data:315
+#: ../../english/intro/organization.data:305
 msgid "Bug Tracking System"
 msgstr "Hệ thống theo dõi lỗi"
 
-#: ../../english/intro/organization.data:320
+#: ../../english/intro/organization.data:310
 msgid "Mailing Lists Administration and Mailing List Archives"
 msgstr "Quản trị và Lưu trữ các bó thư"
 
-#: ../../english/intro/organization.data:329
+#: ../../english/intro/organization.data:318
 msgid "New Members Front Desk"
 msgstr "Các thành viên Bàn lễ tân mới"
 
-#: ../../english/intro/organization.data:335
+#: ../../english/intro/organization.data:324
 msgid "Debian Account Managers"
 msgstr "Quản lý các tài khoản Debian"
 
-#: ../../english/intro/organization.data:339
+#: ../../english/intro/organization.data:328
 msgid ""
 "To send a private message to all DAMs, use the GPG key "
 "57731224A9762EA155AB2A530CA8D15BB24D96F2."
 msgstr ""
 
-#: ../../english/intro/organization.data:340
+#: ../../english/intro/organization.data:329
 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:333
 msgid "Security Team"
 msgstr "Nhóm bảo mật"
 
-#: ../../english/intro/organization.data:355
+#: ../../english/intro/organization.data:346
 msgid "Policy"
 msgstr "Chính sách"
 
-#: ../../english/intro/organization.data:358
+#: ../../english/intro/organization.data:349
 msgid "System Administration"
 msgstr "Quản trị hệ thống"
 
-#: ../../english/intro/organization.data:359
+#: ../../english/intro/organization.data:350
 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."
@@ -388,7 +384,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:369
+#: ../../english/intro/organization.data:359
 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 "
@@ -398,105 +394,90 @@ 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:370
+#: ../../english/intro/organization.data:360
 msgid "LDAP Developer Directory Administrator"
 msgstr "Nhà quản trị Thư mục Phát triển LDAP"
 
-#: ../../english/intro/organization.data:371
+#: ../../english/intro/organization.data:361
 msgid "Mirrors"
 msgstr "Máy bản sao"
 
-#: ../../english/intro/organization.data:378
+#: ../../english/intro/organization.data:364
 msgid "DNS Maintainer"
 msgstr "Quản trị DNS"
 
-#: ../../english/intro/organization.data:379
+#: ../../english/intro/organization.data:365
 msgid "Package Tracking System"
 msgstr "Hệ thống theo dõi lỗi"
 
-#: ../../english/intro/organization.data:381
+#: ../../english/intro/organization.data:367
 msgid "Treasurer"
 msgstr ""
 
-#: ../../english/intro/organization.data:388
+#: ../../english/intro/organization.data:374
 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:392
+#: ../../english/intro/organization.data:378
 #, fuzzy
 msgid "Salsa administrators"
 msgstr "Các quản trị viên Alioth"
 
+#~ msgid "Alioth administrators"
+#~ msgstr "Các quản trị viên Alioth"
+
 #~ msgid "Anti-harassment"
 #~ msgstr "Chống quấy rối"
 
-#~ msgid "Debian Pure Blends"
-#~ msgstr "Debian Pure Blends"
+#~ msgid "Auditor"
+#~ msgstr "Kiểm soát"
 
-#~ msgid "Individual Packages"
-#~ msgstr "Các gói riêng lẻ"
+#~ msgid "Bits from Debian"
+#~ msgstr "Bits từ Debian"
 
-#~ msgid "Debian for children from 1 to 99"
-#~ msgstr "Debian dành cho trẻ em từ 1 đến 99"
+#~ msgid "CD Vendors Page"
+#~ msgstr "Trang nhà cung cấp CD"
 
-#~ msgid "Debian for medical practice and research"
-#~ msgstr "Debian dành cho nghiên cứu và thực hành y học"
+#~ msgid "Consultants Page"
+#~ msgstr "Trang cố vấn"
 
-#~ msgid "Debian for education"
-#~ msgstr "Debian dành cho giáo dục"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Bạn phân phối Debian tùy chỉnh"
 
-#~ msgid "Debian in legal offices"
-#~ msgstr "Debian trong các văn phòng luật"
+#~ msgid "DebConf chairs"
+#~ msgstr "Các ghế DebConf"
 
-#~ msgid "Debian for people with disabilities"
-#~ msgstr "Debian dành cho những người khuyết tật"
+#~ 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 "Debian for science and related research"
-#~ msgstr "Debian dành cho khoa học và nghiên cứu"
+#~ msgid "Debian Pure Blends"
+#~ msgstr "Debian Pure Blends"
 
 #, fuzzy
 #~| msgid "Debian for education"
 #~ msgid "Debian for astronomy"
 #~ msgstr "Debian dành cho giáo dục"
 
-#~ msgid "Live System Team"
-#~ msgstr "Nhóm hệ thống Live"
-
-#~ msgid "Auditor"
-#~ msgstr "Kiểm soát"
-
-#~ msgid "Publicity"
-#~ msgstr "Publicity"
-
-#~ msgid "Bits from Debian"
-#~ msgstr "Bits từ Debian"
-
-#~ 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 "DebConf chairs"
-#~ msgstr "Các ghế DebConf"
-
-#~ msgid "Marketing Team"
-#~ msgstr "Nhóm tiếp cận thị trường"
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "Debian dành cho trẻ em từ 1 đến 99"
 
-#~ msgid "Release Team for ``stable''"
-#~ msgstr "Nhóm phát hành cho bản ổn định ``stable''"
+#~ msgid "Debian for education"
+#~ msgstr "Debian dành cho giáo dục"
 
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Bạn phân phối Debian tùy chỉnh"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "Debian dành cho nghiên cứu và thực hành y học"
 
-#~ msgid "current Debian Project Leader"
-#~ msgstr "Nhà lãnh đạo dự án Debian hiện tại"
+#~ msgid "Debian for people with disabilities"
+#~ msgstr "Debian dành cho những người khuyết tật"
 
-#~ msgid "Alioth administrators"
-#~ msgstr "Các quản trị viên Alioth"
+#~ msgid "Debian for science and related research"
+#~ msgstr "Debian dành cho khoa học và nghiên cứu"
 
-#~ msgid "User support"
-#~ msgstr "Hỗ trợ người dùng"
+#~ msgid "Debian in legal offices"
+#~ msgstr "Debian trong các văn phòng luật"
 
 #~ msgid "Embedded systems"
 #~ msgstr "Các hệ thống nhúng"
@@ -504,17 +485,32 @@ msgstr "Các quản trị viên Alioth"
 #~ msgid "Firewalls"
 #~ msgstr "Tường lửa"
 
+#~ msgid "Individual Packages"
+#~ msgstr "Các gói riêng lẻ"
+
 #~ msgid "Laptops"
 #~ msgstr "Máy tính xách tay"
 
-#~ msgid "Special Configurations"
-#~ msgstr "Các cấu hình đặc biệt"
+#~ msgid "Live System Team"
+#~ msgstr "Nhóm hệ thống Live"
+
+#~ msgid "Marketing Team"
+#~ msgstr "Nhóm tiếp cận thị trường"
 
 #~ msgid "Ports"
 #~ msgstr "Bản chuyển đổi"
 
-#~ msgid "CD Vendors Page"
-#~ msgstr "Trang nhà cung cấp CD"
+#~ msgid "Publicity"
+#~ msgstr "Publicity"
 
-#~ msgid "Consultants Page"
-#~ msgstr "Trang cố vấn"
+#~ msgid "Release Team for ``stable''"
+#~ msgstr "Nhóm phát hành cho bản ổn định ``stable''"
+
+#~ msgid "Special Configurations"
+#~ msgstr "Các cấu hình đặc biệt"
+
+#~ msgid "User support"
+#~ msgstr "Hỗ trợ người dùng"
+
+#~ msgid "current Debian Project Leader"
+#~ msgstr "Nhà lãnh đạo dự án Debian hiện tại"
diff --git a/vietnamese/po/partners.vi.po b/vietnamese/po/partners.vi.po
index 552cb833d2a..2693936b607 100644
--- a/vietnamese/po/partners.vi.po
+++ b/vietnamese/po/partners.vi.po
@@ -320,24 +320,7 @@ msgid ""
 "environment."
 msgstr ""
 
-#: ../../english/partners/partners.def:214
-msgid ""
-"<a href=\"https://www.stackpath.com/?utm_campaign=Partner%20Display&amp;"
-"utm_source=Partner%20Display&amp;utm_medium=Debian\">StackPath</a> provides "
-"Debian with content delivery network (CDN) services, allowing high "
-"availability of services like <a href=\"https://security-tracker.debian.org/"
-"\">the Security Bug Tracker</a> and <a href=\"https://planet.debian.org/"
-"\">Planet Debian</a>."
-msgstr ""
-
-#: ../../english/partners/partners.def:217
-msgid ""
-"StackPath is a platform of secure edge services that enables developers to "
-"protect, accelerate, and innovate cloud properties ranging from websites to "
-"media delivery and IoT services."
-msgstr ""
-
-#: ../../english/partners/partners.def:223
+#: ../../english/partners/partners.def:213
 msgid ""
 "<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> has provided a new "
 "high-end server for the Debian cdbuilder service. In addition, Thomas Krenn "
@@ -347,7 +330,7 @@ msgid ""
 "thomas-krenn.com/linux</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:226
+#: ../../english/partners/partners.def:216
 msgid ""
 "<a href=\"http://www.thomas-krenn.com\">Thomas Krenn</a> is Europe's leading "
 "online shop for server systems and high-quality hosting. They offer rack-"
@@ -357,7 +340,7 @@ msgid ""
 "course they support Debian as operating system on their servers!"
 msgstr ""
 
-#: ../../english/partners/partners.def:232
+#: ../../english/partners/partners.def:222
 msgid ""
 "<a href=\"http://www.trustsec.de/\">trustsec</a> pays two Debian developers "
 "to work on the S/390 port of Debian and packages mainly related to Java. "
@@ -366,7 +349,7 @@ msgid ""
 "for LinuxTag 2001 in Stuttgart."
 msgstr ""
 
-#: ../../english/partners/partners.def:235
+#: ../../english/partners/partners.def:225
 msgid ""
 "trustsec offers customer support, consulting and training for Debian on the "
 "Intel PC architecture (i386), PowerPC and IBM S/390 and is specialized on "
@@ -374,7 +357,7 @@ msgid ""
 "\"mailto:info@trustsec.de\">info@trustsec.de</a> for more information."
 msgstr ""
 
-#: ../../english/partners/partners.def:243
+#: ../../english/partners/partners.def:233
 msgid ""
 "The <a href=\"https://www.sanger.ac.uk/\">Wellcome Sanger Institute</a> "
 "provides infrastructure for the <a href=\"https://snapshot.debian.org/"
@@ -384,7 +367,7 @@ msgid ""
 "increasing the amount of snapshot storage provided."
 msgstr ""
 
-#: ../../english/partners/partners.def:246
+#: ../../english/partners/partners.def:236
 msgid ""
 "The Wellcome Sanger Institute is one of the world's leading genome centres. "
 "Through its ability to conduct research at scale, it is able to engage in "
@@ -395,14 +378,14 @@ msgid ""
 "treatments for human disease."
 msgstr ""
 
-#: ../../english/partners/partners.def:256
+#: ../../english/partners/partners.def:246
 msgid ""
 "<A HREF=\"http://www.brainfood.com/\">Brainfood</A> (previously called "
 "Novare) provides several machines to Debian, as well as hosting and server "
 "administration services."
 msgstr ""
 
-#: ../../english/partners/partners.def:259
+#: ../../english/partners/partners.def:249
 msgid ""
 "Brainfood is a technology solutions company whose goal is to work to produce "
 "an ideal result for a specific need, whether it's a website or an ongoing, "
@@ -411,7 +394,7 @@ msgid ""
 "\">debian-contact@brainfood.com</A>."
 msgstr ""
 
-#: ../../english/partners/partners.def:266
+#: ../../english/partners/partners.def:256
 msgid ""
 "<a href=\"http://www.hp.com/\">Hewlett-Packard</a> has provided hardware for "
 "port development, Debian mirrors, and other Debian services (current HP "
@@ -421,7 +404,7 @@ msgid ""
 "com/products1/linux/\">HP Linux</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:269
+#: ../../english/partners/partners.def:259
 msgid ""
 "Hewlett-Packard is one of the largest computer companies in the world, "
 "providing a wide range of products and services, such as servers, PCs, "
@@ -429,7 +412,7 @@ msgid ""
 "solutions, etc."
 msgstr ""
 
-#: ../../english/partners/partners.def:276
+#: ../../english/partners/partners.def:266
 msgid ""
 "<A HREF=\"http://www.linuxcentral.com/\">Linux Central</A> provides us with "
 "Debian GNU/Linux CD-ROM sets for trade show type events. These CD's help to "
@@ -437,7 +420,7 @@ msgid ""
 "current users."
 msgstr ""
 
-#: ../../english/partners/partners.def:280
+#: ../../english/partners/partners.def:270
 msgid ""
 "Linux Central sells all the latest releases of Linux products such as "
 "commercial software, books, hardware, and versions of major Linux "
@@ -447,14 +430,14 @@ msgid ""
 "contact <A HREF=\"mailto:sales@linuxcentral.com\">sales@linuxcentral.com</A>."
 msgstr ""
 
-#: ../../english/partners/partners.def:287
+#: ../../english/partners/partners.def:277
 msgid ""
 "<a href=\"http://www.mythic-beasts.com\">Mythic Beasts Ltd.</a> supports "
 "Debian (and SPI Inc) by providing domain registration facilities.</p><p>They "
 "are a UK based web hosting, domain registration and co-location company."
 msgstr ""
 
-#: ../../english/partners/partners.def:294
+#: ../../english/partners/partners.def:284
 msgid ""
 "San Francisco based <a href=\"http://www.nostarch.com/\">No Starch Press</"
 "a>, publisher of \"The Finest in Geek Entertainment,\" is co-publisher of "
@@ -465,7 +448,7 @@ msgid ""
 "copy of The Debian System to the Debian Project."
 msgstr ""
 
-#: ../../english/partners/partners.def:301
+#: ../../english/partners/partners.def:291
 msgid ""
 "<a href=\"http://www.opensourcepress.de/\">Open Source Press</a> is the "
 "Munich-based publisher of the book <a href=\"http://debiansystem.info/\">The "
@@ -473,7 +456,7 @@ msgid ""
 "donate 1&euro; to the Debian Project."
 msgstr ""
 
-#: ../../english/partners/partners.def:304
+#: ../../english/partners/partners.def:294
 msgid ""
 "Open Source Press specialises on books around Linux and Open Source "
 "Software, written by authors with considerable experience in the fields, and "
@@ -481,7 +464,7 @@ msgid ""
 "Source Press publications are renowned for their quality and depth."
 msgstr ""
 
-#: ../../english/partners/partners.def:312
+#: ../../english/partners/partners.def:302
 msgid ""
 "<a href=\"http://www.rapidswitch.com/\">RapidSwitch</a> (formely Black Cat "
 "Networks) is a UK ISP specialising in dedicated hosting. It provides "
@@ -489,13 +472,13 @@ msgid ""
 "virtual servers."
 msgstr ""
 
-#: ../../english/partners/partners.def:315
+#: ../../english/partners/partners.def:305
 msgid ""
 "It hosts a Debian development machine, <a href=\"https://db.debian.org/"
 "machines.cgi?host=caballero\">caballero</a>."
 msgstr ""
 
-#: ../../english/partners/partners.def:323
+#: ../../english/partners/partners.def:313
 msgid ""
 "<a href=\"http://www.simtec.co.uk\">Simtec</a> has provided several ARM "
 "machines which make up the bulk of the Debian ARM infrastructure. In "
@@ -503,7 +486,7 @@ msgid ""
 "ARM port."
 msgstr ""
 
-#: ../../english/partners/partners.def:326
+#: ../../english/partners/partners.def:316
 msgid ""
 "Simtec is a leading provider of ARM based computing products. We have a "
 "range of <a href=\"http://www.simtec.co.uk/products/boards.html\">boards</a> "
@@ -514,21 +497,38 @@ msgid ""
 "operating systems."
 msgstr ""
 
-#: ../../english/partners/partners.def:334
+#: ../../english/partners/partners.def:325
+msgid ""
+"<a href=\"https://www.stackpath.com/?utm_campaign=Partner%20Display&amp;"
+"utm_source=Partner%20Display&amp;utm_medium=Debian\">StackPath</a> provides "
+"Debian with content delivery network (CDN) services, allowing high "
+"availability of services like <a href=\"https://security-tracker.debian.org/"
+"\">the Security Bug Tracker</a> and <a href=\"https://planet.debian.org/"
+"\">Planet Debian</a>."
+msgstr ""
+
+#: ../../english/partners/partners.def:328
+msgid ""
+"StackPath is a platform of secure edge services that enables developers to "
+"protect, accelerate, and innovate cloud properties ranging from websites to "
+"media delivery and IoT services."
+msgstr ""
+
+#: ../../english/partners/partners.def:336
 msgid ""
 "<a href=\"http://www.telegraaf.nl/\">Telegraaf Media ICT BV</a> is "
 "supporting the Debian community by donating hardware, rackspace and "
 "bandwidth for the Debian server hosting alioth, arch and svn."
 msgstr ""
 
-#: ../../english/partners/partners.def:337
+#: ../../english/partners/partners.def:339
 msgid ""
 "Telegraaf Media ICT BV is running its internet infrastructure (appx. 200 "
 "Intel based servers) mainly based on Debian GNU/Linux servers; the sysadmins "
 "are highly motivated Debian users and some of them also Debian maintainers."
 msgstr ""
 
-#: ../../english/partners/partners.def:340
+#: ../../english/partners/partners.def:342
 msgid ""
 "Telegraaf Media Group runs some of the most popular Dutch websites (http://"
 "www.telegraaf.nl, http://www.speurders.nl and http://www.dft.nl) as well as "
diff --git a/vietnamese/po/ports.vi.po b/vietnamese/po/ports.vi.po
index af60bbe50d1..dcc199c84b7 100644
--- a/vietnamese/po/ports.vi.po
+++ b/vietnamese/po/ports.vi.po
@@ -83,22 +83,6 @@ msgstr ""
 msgid "Systems"
 msgstr ""
 
-#: ../../english/ports/netbsd/menu.inc:6
-msgid "Debian GNU/NetBSD for i386"
-msgstr ""
-
-#: ../../english/ports/netbsd/menu.inc:10
-msgid "Debian GNU/NetBSD for Alpha"
-msgstr ""
-
-#: ../../english/ports/netbsd/menu.inc:14
-msgid "Why"
-msgstr ""
-
-#: ../../english/ports/netbsd/menu.inc:18
-msgid "People"
-msgstr ""
-
 #: ../../english/ports/powerpc/menu.inc:6
 msgid "Debian for PowerPC"
 msgstr ""
diff --git a/vietnamese/po/templates.vi.po b/vietnamese/po/templates.vi.po
index f8a3c05c40e..a129d6925f1 100644
--- a/vietnamese/po/templates.vi.po
+++ b/vietnamese/po/templates.vi.po
@@ -457,7 +457,9 @@ msgid "Debian-Edu project"
 msgstr "Dự án Debian-Edu"
 
 #: ../../english/template/debian/links.tags.wml:137
-msgid "Alioth &ndash; Debian GForge"
+#, fuzzy
+#| msgid "Alioth &ndash; Debian GForge"
+msgid "Salsa &ndash; Debian Gitlab"
 msgstr "Alioth &ndash; Debian GForge"
 
 #: ../../english/template/debian/links.tags.wml:140
diff --git a/vietnamese/po/vendors.vi.po b/vietnamese/po/vendors.vi.po
index 22536f2753b..f7258a21182 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 "Allows Contribution to Debian:"
+#~ msgstr "Cho phép các phần đóng góp cho Debian:"
+
 #~ msgid "Architectures:"
 #~ msgstr "Các kiến trúc:"
 
 #~| msgid "CD Type:"
-#~ msgid "USB Type:"
-#~ msgstr "Kiểu USB:"
-
-#~| msgid "CD Type:"
 #~ msgid "BD Type:"
 #~ msgstr "Kiểu BD:"
 
-#~ msgid "DVD Type:"
-#~ msgstr "Kiểu DVD:"
-
 #~ msgid "CD Type:"
 #~ msgstr "Kiểu CD:"
 
-#~ msgid "email:"
-#~ msgstr "thư điện tử:"
-
-#~ msgid "Ship International:"
-#~ msgstr "Vận chuyển quốc tế:"
-
 #~ msgid "Country:"
 #~ msgstr "Nước:"
 
-#~ 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 "Ship International:"
+#~ msgstr "Vận chuyển quốc tế:"
 
 #~ 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 "email:"
+#~ msgstr "thư điện tử:"