[gnome-control-center] Updated Vietnamese translation



commit 325eca591421476d1221bb156924f20b5f562b57
Author: Trần Ngọc Quân <vnwildman gmail com>
Date:   Tue Sep 5 07:55:54 2017 +0700

    Updated Vietnamese translation
    
    Signed-off-by: Trần Ngọc Quân <vnwildman gmail com>

 po/vi.po | 2066 +++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 1118 insertions(+), 948 deletions(-)
---
diff --git a/po/vi.po b/po/vi.po
index 98b9c79..204df01 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -12,8 +12,8 @@ msgstr ""
 "Project-Id-Version: gnome-control-center master\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
 "control-center&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-03-08 15:01+0000\n"
-"PO-Revision-Date: 2017-03-09 14:57+0700\n"
+"POT-Creation-Date: 2017-09-04 12:44+0000\n"
+"PO-Revision-Date: 2017-09-05 07:53+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman gmail com>\n"
 "Language-Team: Vietnamese <gnome-vi-list gnome org>\n"
 "Language: vi\n"
@@ -50,7 +50,7 @@ msgstr "Phóng to"
 #: ../panels/background/background.ui.h:8
 msgctxt "background, style"
 msgid "Center"
-msgstr "Giữa"
+msgstr "Ở giữa"
 
 #: ../panels/background/background.ui.h:9
 msgctxt "background, style"
@@ -67,73 +67,73 @@ msgctxt "background, style"
 msgid "Span"
 msgstr "Bề rộng"
 
-#: ../panels/background/cc-background-chooser-dialog.c:437
+#: ../panels/background/cc-background-chooser-dialog.c:430
 msgid "Wallpapers"
 msgstr "Ảnh nền"
 
-#: ../panels/background/cc-background-chooser-dialog.c:446
+#: ../panels/background/cc-background-chooser-dialog.c:439
 msgid "Colors"
 msgstr "Màu sắc"
 
 #. translators: This is the title of the wallpaper chooser dialog.
-#: ../panels/background/cc-background-chooser-dialog.c:483
+#: ../panels/background/cc-background-chooser-dialog.c:476
 msgid "Select Background"
 msgstr "Chọn ảnh nền"
 
-#: ../panels/background/cc-background-chooser-dialog.c:511
+#: ../panels/background/cc-background-chooser-dialog.c:504
 msgid "Pictures"
 msgstr "Ảnh"
 
 #. translators: No pictures were found
-#: ../panels/background/cc-background-chooser-dialog.c:543
+#: ../panels/background/cc-background-chooser-dialog.c:536
 msgid "No Pictures Found"
 msgstr "Không tìm thấy ảnh nào"
 
 #. translators: "Home" is used in place of the Pictures
 #. * directory in the string below when XDG_PICTURES_DIR is
 #. * undefined
-#: ../panels/background/cc-background-chooser-dialog.c:561
+#: ../panels/background/cc-background-chooser-dialog.c:554
 #: ../panels/search/cc-search-locations-dialog.c:302
 msgid "Home"
 msgstr "Thư mục chứa ảnh"
 
 #. translators: %s here is the name of the Pictures directory, the string should be translated in
 #. * the context "You can add images to your Pictures folder and they will show up here"
-#: ../panels/background/cc-background-chooser-dialog.c:573
+#: ../panels/background/cc-background-chooser-dialog.c:566
 #, c-format
 msgid "You can add images to your %s folder and they will show up here"
 msgstr "Bạn có thể thêm ảnh vào thư mục %s của mình và chúng sẽ hiện ra ở đây"
 
-#: ../panels/background/cc-background-chooser-dialog.c:580
+#: ../panels/background/cc-background-chooser-dialog.c:573
 #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963
 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30
 #: ../panels/common/language-chooser.ui.h:3
-#: ../panels/display/cc-display-panel.c:1580
-#: ../panels/display/cc-display-panel.c:2226
+#: ../panels/display/cc-display-panel.c:2697
 #: ../panels/network/connection-editor/connection-editor.ui.h:1
 #: ../panels/network/connection-editor/vpn-helpers.c:181
 #: ../panels/network/connection-editor/vpn-helpers.c:310
-#: ../panels/network/net-device-wifi.c:1298
-#: ../panels/network/net-device-wifi.c:1535
+#: ../panels/network/net-device-wifi.c:1318
+#: ../panels/network/net-device-wifi.c:1398
+#: ../panels/network/net-device-wifi.c:1633
 #: ../panels/network/network-wifi.ui.h:1
 #: ../panels/printers/new-printer-dialog.ui.h:3
 #: ../panels/printers/pp-details-dialog.c:319
 #: ../panels/privacy/cc-privacy-panel.c:1049
 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2
-#: ../panels/search/cc-search-locations-dialog.c:637
-#: ../panels/sharing/cc-sharing-panel.c:375
+#: ../panels/search/cc-search-locations-dialog.c:642
+#: ../panels/sharing/cc-sharing-panel.c:382
 #: ../panels/user-accounts/data/account-dialog.ui.h:2
 #: ../panels/user-accounts/data/join-dialog.ui.h:2
 #: ../panels/user-accounts/data/password-dialog.ui.h:2
 #: ../panels/user-accounts/um-fingerprint-dialog.c:264
 #: ../panels/user-accounts/um-photo-dialog.c:94
-#: ../panels/user-accounts/um-photo-dialog.c:218
+#: ../panels/user-accounts/um-photo-dialog.c:221
 #: ../panels/user-accounts/um-user-panel.c:644
 #: ../panels/user-accounts/um-user-panel.c:662
 msgid "_Cancel"
 msgstr "T_hôi"
 
-#: ../panels/background/cc-background-chooser-dialog.c:581
+#: ../panels/background/cc-background-chooser-dialog.c:574
 msgid "_Select"
 msgstr "_Chọn"
 
@@ -170,39 +170,39 @@ msgstr "Thay đổi ảnh nền màn hình"
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "Wallpaper;Ảnh;nền;Anh;nen;Screen;Màn;hình;Man;hinh;Desktop;"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:264
+#: ../panels/bluetooth/cc-bluetooth-panel.c:268
 msgid "Turn Off Airplane Mode"
 msgstr "Tắt chế độ máy bay"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:330
+#: ../panels/bluetooth/cc-bluetooth-panel.c:334
 msgid "No Bluetooth Found"
 msgstr "Không tìm thấy Bluetooth nào"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:330
+#: ../panels/bluetooth/cc-bluetooth-panel.c:334
 msgid "Plug in a dongle to use Bluetooth."
-msgstr "Cắm khóa điện tử để dùng Bluetooth."
+msgstr "Cắm thiết bị để dùng Bluetooth."
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:331
+#: ../panels/bluetooth/cc-bluetooth-panel.c:335
 msgid "Bluetooth Turned Off"
 msgstr "Bluetooth bị tắt"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:331
+#: ../panels/bluetooth/cc-bluetooth-panel.c:335
 msgid "Turn on to connect devices and receive file transfers."
 msgstr "Bật để kết nối các thiết bị và nhận các tập tin được truyền."
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:332
+#: ../panels/bluetooth/cc-bluetooth-panel.c:336
 msgid "Airplane Mode is on"
 msgstr "Chế độ máy bay được bật"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:332
+#: ../panels/bluetooth/cc-bluetooth-panel.c:336
 msgid "Bluetooth is disabled when airplane mode is on."
 msgstr "Bluetooth bị tắt khi chế độ máy bay được bật."
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:333
+#: ../panels/bluetooth/cc-bluetooth-panel.c:337
 msgid "Hardware Airplane Mode is on"
 msgstr "Chế độ máy bay được bật"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:333
+#: ../panels/bluetooth/cc-bluetooth-panel.c:337
 msgid "Turn off the Airplane mode switch to enable Bluetooth."
 msgstr "Tắt chế độ máy bay chuyển sang bật Bluetooth."
 
@@ -213,7 +213,7 @@ msgstr "Blue­tooth"
 
 #: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3
 msgid "Turn Bluetooth on and off and connect your devices"
-msgstr "Bật/tắt Bluetooth và kết nối thiết bị"
+msgstr "Bật/tắt Bluetooth và kết nối các thiết bị của bạn"
 
 #. Translators: those are keywords for the bluetooth control-center panel
 #: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5
@@ -696,7 +696,7 @@ msgid "_Import File…"
 msgstr "Nhậ_p tập tin…"
 
 #: ../panels/color/color.ui.h:31
-#: ../panels/network/connection-editor/net-connection-editor.c:546
+#: ../panels/network/connection-editor/net-connection-editor.c:519
 #: ../panels/printers/new-printer-dialog.ui.h:4
 #: ../panels/region/input-chooser.ui.h:3
 #: ../panels/user-accounts/data/account-dialog.ui.h:3
@@ -873,7 +873,7 @@ msgid "Other…"
 msgstr "Khác…"
 
 #: ../panels/common/cc-language-chooser.c:124
-#: ../panels/region/cc-format-chooser.c:271
+#: ../panels/region/cc-format-chooser.c:269
 #: ../panels/region/cc-input-chooser.c:169
 msgid "More…"
 msgstr "Còn nữa…"
@@ -883,12 +883,12 @@ msgid "No languages found"
 msgstr "Không tìm thấy ngôn ngữ"
 
 #: ../panels/common/cc-util.c:127
-#: ../panels/network/connection-editor/ce-page-details.c:100
+#: ../panels/network/connection-editor/ce-page-details.c:106
 msgid "Today"
 msgstr "Hôm nay"
 
 #: ../panels/common/cc-util.c:131
-#: ../panels/network/connection-editor/ce-page-details.c:102
+#: ../panels/network/connection-editor/ce-page-details.c:108
 msgid "Yesterday"
 msgstr "Hôm qua"
 
@@ -922,17 +922,17 @@ msgid "Year"
 msgstr "Năm"
 
 #. Translators: This is the full date and time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:340
+#: ../panels/datetime/cc-datetime-panel.c:339
 msgid "%e %B %Y, %l:%M %p"
 msgstr "%l:%M %p, %e %b %Y"
 
 #. Translators: This is the full date and time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:345
+#: ../panels/datetime/cc-datetime-panel.c:344
 msgid "%e %B %Y, %R"
 msgstr "%R, %e %B %Y"
 
 #. Translators: "city, country"
-#: ../panels/datetime/cc-datetime-panel.c:523
+#: ../panels/datetime/cc-datetime-panel.c:522
 #, c-format
 msgctxt "timezone loc"
 msgid "%s, %s"
@@ -940,7 +940,7 @@ msgstr "%s, %s"
 
 #. Update the timezone on the listbow row
 #. Translators: "timezone (details)"
-#: ../panels/datetime/cc-datetime-panel.c:553
+#: ../panels/datetime/cc-datetime-panel.c:552
 #, c-format
 msgctxt "timezone desc"
 msgid "%s (%s)"
@@ -948,23 +948,23 @@ msgstr "%s (%s)"
 
 #. Translators: UTC here means the Coordinated Universal Time.
 #. * %:::z will be replaced by the offset from UTC e.g. UTC+02
-#: ../panels/datetime/cc-datetime-panel.c:561
+#: ../panels/datetime/cc-datetime-panel.c:560
 msgid "UTC%:::z"
 msgstr "UTC%:::z"
 
 #. Translators: This is the time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:566
+#: ../panels/datetime/cc-datetime-panel.c:565
 msgid "%l:%M %p"
 msgstr "%l:%M %p"
 
 #. Translators: This is the time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:571
+#: ../panels/datetime/cc-datetime-panel.c:570
 msgid "%R"
 msgstr "%R"
 
 #. Update the text bubble in the timezone map
 #. Translators: "timezone (utc shift)"
-#: ../panels/datetime/cc-datetime-panel.c:576
+#: ../panels/datetime/cc-datetime-panel.c:575
 #, c-format
 msgctxt "timezone map"
 msgid "%s (%s)"
@@ -1096,166 +1096,138 @@ msgstr "Thay đổi thời gian và ngày tháng"
 msgid "To change time or date settings, you need to authenticate."
 msgstr "Bạn cần xác thực để có thể sửa đổi thời gian hoặc ngày tháng."
 
-#: ../panels/display/cc-display-panel.c:592
-msgid "Lid Closed"
-msgstr "Nắp đã đóng"
-
-#. translators: "Mirrored" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:595
-msgid "Mirrored"
-msgstr "Hiển thị giống nhau"
-
-#: ../panels/display/cc-display-panel.c:597
-#: ../panels/display/cc-display-panel.c:2449
-msgid "Primary"
-msgstr "Chính"
-
-#: ../panels/display/cc-display-panel.c:599
-#: ../panels/display/cc-display-panel.c:2786
-#: ../panels/notifications/cc-notifications-panel.c:293
-#: ../panels/power/cc-power-panel.c:1968 ../panels/power/cc-power-panel.c:1979
-#: ../panels/privacy/cc-privacy-panel.c:190
-#: ../panels/privacy/cc-privacy-panel.c:257
-#: ../panels/universal-access/cc-ua-panel.c:331
-#: ../panels/universal-access/cc-ua-panel.c:708
-#: ../panels/universal-access/cc-ua-panel.c:721
-#: ../panels/universal-access/cc-ua-panel.c:733
-#: ../panels/universal-access/cc-ua-panel.c:904
-#: ../panels/universal-access/uap.ui.h:7
-msgid "Off"
-msgstr "Tắt"
-
-#: ../panels/display/cc-display-panel.c:602
-msgid "Secondary"
-msgstr "Phụ"
-
-#. Title of displays dialog when multiple monitors are present.
-#: ../panels/display/cc-display-panel.c:1577
-msgid "Arrange Combined Displays"
-msgstr "Sắp xếp màn hình hiển thị tổ hợp"
-
-#: ../panels/display/cc-display-panel.c:1581
-#: ../panels/display/cc-display-panel.c:2227
-#: ../panels/network/connection-editor/connection-editor.ui.h:2
-#: ../panels/network/network-wifi.ui.h:2
-msgid "_Apply"
-msgstr "Á_p dụng"
-
-#: ../panels/display/cc-display-panel.c:1605
-msgid "Drag displays to rearrange them"
-msgstr "Kéo các bộ hiển thị để sắp xếp chúng"
-
-#. translators: example string is "60 Hz (NTSC)"
-#. * NTSC is https://en.wikipedia.org/wiki/NTSC
-#: ../panels/display/cc-display-panel.c:1812
-#, c-format
-msgid "%d Hz (NTSC)"
-msgstr "%d Hz (NTSC)"
-
-#. translators: example string is "60 Hz"
-#: ../panels/display/cc-display-panel.c:1818
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
-
-#: ../panels/display/cc-display-panel.c:2279
-msgid "Rotate counterclockwise by 90°"
-msgstr "Quay ngược chiều kim đồng hồ 90°"
+#: ../panels/display/cc-display-panel.c:738
+msgctxt "Display rotation"
+msgid "Landscape"
+msgstr "Nằm ngang"
 
-#: ../panels/display/cc-display-panel.c:2297
-msgid "Rotate by 180°"
-msgstr "Quay 180°"
+#: ../panels/display/cc-display-panel.c:741
+msgctxt "Display rotation"
+msgid "Portrait Right"
+msgstr "Dọc (quay phải)"
 
-#: ../panels/display/cc-display-panel.c:2315
-msgid "Rotate clockwise by 90°"
-msgstr "Quay xuôi chiều kim đồng hồ 90°"
+#: ../panels/display/cc-display-panel.c:744
+msgctxt "Display rotation"
+msgid "Portrait Left"
+msgstr "Dọc (quay trái)"
 
-#: ../panels/display/cc-display-panel.c:2336
-msgid "Size"
-msgstr "Cỡ"
+#: ../panels/display/cc-display-panel.c:747
+msgctxt "Display rotation"
+msgid "Landscape (flipped)"
+msgstr "Nằm gang (lật ngược)"
 
-#. aspect ratio
-#: ../panels/display/cc-display-panel.c:2351
-msgid "Aspect Ratio"
-msgstr "Tỷ lệ màn hình"
+#. Translators: This option sets orientation of print (portrait, landscape...)
+#: ../panels/display/cc-display-panel.c:788
+#: ../panels/display/cc-display-panel.c:838
+#: ../panels/printers/pp-options-dialog.c:558
+msgid "Orientation"
+msgstr "Hướng"
 
-#: ../panels/display/cc-display-panel.c:2374
-#: ../panels/printers/pp-options-dialog.c:85
+#: ../panels/display/cc-display-panel.c:881
+#: ../panels/display/cc-display-panel.c:933
+#: ../panels/display/cc-display-panel.c:1751
+#: ../panels/display/cc-display-panel.c:1797
+#: ../panels/printers/pp-options-dialog.c:87
 msgid "Resolution"
 msgstr "Độ phân giải"
 
-#: ../panels/display/cc-display-panel.c:2394
-msgid "Adjust for TV"
-msgstr "Chỉnh cho TV"
-
-#: ../panels/display/cc-display-panel.c:2418
+#: ../panels/display/cc-display-panel.c:978
+#: ../panels/display/cc-display-panel.c:1049
 msgid "Refresh Rate"
 msgstr "Tốc độ làm tươi"
 
-#: ../panels/display/cc-display-panel.c:2450
-msgid "Show the top bar and Activities Overview on this display"
-msgstr ""
-"Hiển thị thanh đỉnh và “Tổng quan hoạt động” trên màn hình hiển thị này"
+#: ../panels/display/cc-display-panel.c:1186
+msgid "Scale"
+msgstr "Co giãn"
 
-#: ../panels/display/cc-display-panel.c:2456
-msgid "Secondary Display"
-msgstr "Màn hình hiển thị thứ hai"
+#: ../panels/display/cc-display-panel.c:1239
+msgid "Adjust for TV"
+msgstr "Chỉnh cho TV"
 
-#: ../panels/display/cc-display-panel.c:2457
-msgid "Join this display with another to create an extra workspace"
-msgstr "Nối hai màn hình để tạo không gian làm việc rộng hơn"
+#: ../panels/display/cc-display-panel.c:1451
+#: ../panels/display/cc-display-panel.c:1497
+msgid "Primary Display"
+msgstr "Màn hình chính"
 
-#: ../panels/display/cc-display-panel.c:2464
-msgid "Presentation"
-msgstr "Trình diễn"
+#: ../panels/display/cc-display-panel.c:1546
+msgid "Display Arrangement"
+msgstr "Sắp xếp màn hình"
 
-#: ../panels/display/cc-display-panel.c:2465
-msgid "Show slideshows and media only"
-msgstr "Chỉ hiển thị phần trình diễn và đa phương tiện"
+#: ../panels/display/cc-display-panel.c:1547
+msgid ""
+"Drag displays to match your setup. The top bar is placed on the primary "
+"display."
+msgstr ""
+"Kéo thả các màn hình cho phù hợp với cài đặt của bạn. Thanh đỉnh được đặt "
+"trên màn hình chính."
+
+#: ../panels/display/cc-display-panel.c:1985
+msgid "Display Mode"
+msgstr "Chế độ hiển thị"
 
-#. translators: "Mirror" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:2470
+#: ../panels/display/cc-display-panel.c:2001
+msgid "Join Displays"
+msgstr "Ghép màn hình"
+
+#: ../panels/display/cc-display-panel.c:2004
 msgid "Mirror"
 msgstr "Giống nhau"
 
-#: ../panels/display/cc-display-panel.c:2471
-msgid "Show your existing view on both displays"
-msgstr "Cả hai màn hình hiện cùng nội dung"
+#: ../panels/display/cc-display-panel.c:2007
+msgid "Single Display"
+msgstr "Màn hình đơn"
+
+#: ../panels/display/cc-display-panel.c:2693
+msgid "Apply Changes?"
+msgstr "Áp dụng thay đổi?"
 
-#: ../panels/display/cc-display-panel.c:2477
-msgid "Turn Off"
-msgstr "_Tắt"
+#: ../panels/display/cc-display-panel.c:2707
+#: ../panels/network/connection-editor/connection-editor.ui.h:2
+#: ../panels/network/network-wifi.ui.h:2
+msgid "_Apply"
+msgstr "Á_p dụng"
 
-#: ../panels/display/cc-display-panel.c:2478
-msgid "Don’t use this display"
-msgstr "Không dùng màn hình này"
+#: ../panels/display/cc-display-panel.c:3083
+#, c-format
+msgid "%.2lf Hz"
+msgstr "%.2lf Hz"
 
 #. TRANSLATORS: the state of the night light setting
-#: ../panels/display/cc-display-panel.c:2786
+#: ../panels/display/cc-display-panel.c:3299
 #: ../panels/notifications/cc-notifications-panel.c:293
-#: ../panels/power/cc-power-panel.c:1974 ../panels/power/cc-power-panel.c:1981
+#: ../panels/power/cc-power-panel.c:1970 ../panels/power/cc-power-panel.c:1977
 #: ../panels/privacy/cc-privacy-panel.c:190
 #: ../panels/privacy/cc-privacy-panel.c:257
 #: ../panels/universal-access/cc-ua-panel.c:331
-#: ../panels/universal-access/cc-ua-panel.c:708
-#: ../panels/universal-access/cc-ua-panel.c:721
-#: ../panels/universal-access/cc-ua-panel.c:733
-#: ../panels/universal-access/cc-ua-panel.c:904
+#: ../panels/universal-access/cc-ua-panel.c:712
+#: ../panels/universal-access/cc-ua-panel.c:725
+#: ../panels/universal-access/cc-ua-panel.c:737
+#: ../panels/universal-access/cc-ua-panel.c:908
 msgid "On"
 msgstr "Bật"
 
-#: ../panels/display/cc-display-panel.c:2826
-msgid "Could not get screen information"
-msgstr "Không thể lấy thông tin về màn hình"
-
-#: ../panels/display/cc-display-panel.c:2857
-msgid "_Arrange Combined Displays"
-msgstr "_Sắp xếp màn hình hiển thị tổ hợp"
+#: ../panels/display/cc-display-panel.c:3299 ../panels/network/net-proxy.c:54
+#: ../panels/notifications/cc-notifications-panel.c:293
+#: ../panels/power/cc-power-panel.c:1964 ../panels/power/cc-power-panel.c:1975
+#: ../panels/privacy/cc-privacy-panel.c:190
+#: ../panels/privacy/cc-privacy-panel.c:257
+#: ../panels/universal-access/cc-ua-panel.c:331
+#: ../panels/universal-access/cc-ua-panel.c:712
+#: ../panels/universal-access/cc-ua-panel.c:725
+#: ../panels/universal-access/cc-ua-panel.c:737
+#: ../panels/universal-access/cc-ua-panel.c:908
+#: ../panels/universal-access/uap.ui.h:7
+msgid "Off"
+msgstr "Tắt"
 
-#: ../panels/display/cc-display-panel.c:2878
+#: ../panels/display/cc-display-panel.c:3320
 msgid "_Night Light"
 msgstr "Ánh sáng đê_m"
 
+#: ../panels/display/cc-display-panel.c:3385
+msgid "Could not get screen information"
+msgstr "Không thể lấy thông tin về màn hình"
+
 #. This cancels the redshift inhibit.
 #: ../panels/display/display.ui.h:2
 msgid "Restart Filter"
@@ -1288,8 +1260,9 @@ msgid "Sunset to Sunrise"
 msgstr "Hoàng hôn tới Bình minh"
 
 #: ../panels/display/display.ui.h:10
-#: ../panels/network/connection-editor/ce-page-ip4.c:630
-#: ../panels/network/connection-editor/ce-page-ip6.c:592
+#: ../panels/network/connection-editor/ip4-page.ui.h:4
+#: ../panels/network/connection-editor/ip6-page.ui.h:5
+#: ../panels/network/net-proxy.c:56 ../panels/network/network-proxy.ui.h:3
 #: ../panels/network/network-wifi.ui.h:26
 #: ../panels/privacy/cc-privacy-panel.c:217
 msgid "Manual"
@@ -1338,70 +1311,87 @@ msgstr ""
 "sunrise;bình minh;binh minh;"
 
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:384 ../panels/network/panel-common.c:123
+#: ../panels/info/cc-info-overview-panel.c:381
+#: ../panels/info/cc-info-overview-panel.c:468
+#: ../panels/network/panel-common.c:123
 msgid "Unknown"
 msgstr "Chưa biết"
 
-#. translators: This is the name of the OS, followed by the type
-#. * of architecture and the build id, for example:
-#. * "Fedora 18 (Spherical Cow) 64-bit (Build ID: xyz)" or
-#. * "Ubuntu (Oneric Ocelot) 32-bit (Build ID: jki)"
-#: ../panels/info/cc-info-panel.c:517
+#. translators: This is the name of the OS, followed by the build ID, for
+#. * example:
+#. * "Fedora 25 (Workstation Edition); Build ID: xyz" or
+#. * "Ubuntu 16.04 LTS; Build ID: jki"
+#: ../panels/info/cc-info-overview-panel.c:476
 #, c-format
-msgid "%s %d-bit (Build ID: %s)"
-msgstr "%s %d-bit (Mã số biên dịch: %s)"
+msgid "%s; Build ID: %s"
+msgstr "%s; Mã số biên dịch: %s"
 
-#: ../panels/info/cc-info-panel.c:519
+#. translators: This is the type of architecture for the OS
+#: ../panels/info/cc-info-overview-panel.c:493
 #, c-format
-msgid "%d-bit (Build ID: %s)"
-msgstr "%d-bit (Mã số biên dịch: %s)"
+msgid "64-bit"
+msgstr "64-bít"
 
-#. translators: This is the name of the OS, followed by the type
-#. * of architecture, for example:
-#. * "Fedora 18 (Spherical Cow) 64-bit" or "Ubuntu (Oneric Ocelot) 32-bit"
-#: ../panels/info/cc-info-panel.c:527
+#. translators: This is the type of architecture for the OS
+#: ../panels/info/cc-info-overview-panel.c:496
 #, c-format
-msgid "%s %d-bit"
-msgstr "%s %d-bít"
+msgid "32-bit"
+msgstr "32-bít"
 
-#: ../panels/info/cc-info-panel.c:529
+#: ../panels/info/cc-info-overview-panel.c:807
 #, c-format
-msgid "%d-bit"
-msgstr "%d-bít"
+msgid "Version %s"
+msgstr "Phiên bản %s"
 
-#: ../panels/info/cc-info-panel.c:1175
+#: ../panels/info/cc-info-panel.c:138
+msgid "Section"
+msgstr "Phần"
+
+#: ../panels/info/cc-info-panel.c:147 ../panels/info/info.ui.h:1
+msgid "Overview"
+msgstr "Tổng quan"
+
+#: ../panels/info/cc-info-panel.c:153 ../panels/info/info.ui.h:2
+msgid "Default Applications"
+msgstr "Ứng dụng mặc định"
+
+#: ../panels/info/cc-info-panel.c:158 ../panels/info/info.ui.h:3
+msgid "Removable Media"
+msgstr "Đa phương tiện"
+
+#: ../panels/info/cc-info-removable-media-panel.c:312
 msgid "Ask what to do"
 msgstr "Hỏi cần phải làm gì"
 
-#: ../panels/info/cc-info-panel.c:1179
+#: ../panels/info/cc-info-removable-media-panel.c:316
 msgid "Do nothing"
 msgstr "Không làm gì cả"
 
-#: ../panels/info/cc-info-panel.c:1183
+#: ../panels/info/cc-info-removable-media-panel.c:320
 msgid "Open folder"
 msgstr "Mở thư mục"
 
-#: ../panels/info/cc-info-panel.c:1274
+#: ../panels/info/cc-info-removable-media-panel.c:411
 msgid "Other Media"
 msgstr "Thiết bị lưu trữ khác"
 
-#: ../panels/info/cc-info-panel.c:1305
+#: ../panels/info/cc-info-removable-media-panel.c:444
 msgid "Select an application for audio CDs"
 msgstr "Chọn ứng dụng dành cho đĩa CD nhạc"
 
-#: ../panels/info/cc-info-panel.c:1306
+#: ../panels/info/cc-info-removable-media-panel.c:445
 msgid "Select an application for video DVDs"
 msgstr "Chọn ứng dụng cho DVD phim"
 
-#: ../panels/info/cc-info-panel.c:1307
+#: ../panels/info/cc-info-removable-media-panel.c:446
 msgid "Select an application to run when a music player is connected"
 msgstr "Chọn ứng dụng cần chạy khi kết nối máy nghe nhạc"
 
-#: ../panels/info/cc-info-panel.c:1308
+#: ../panels/info/cc-info-removable-media-panel.c:447
 msgid "Select an application to run when a camera is connected"
 msgstr "Chọn ứng dụng cần chạy khi kết nối máy ảnh, máy quay phim"
 
-#: ../panels/info/cc-info-panel.c:1309
+#: ../panels/info/cc-info-removable-media-panel.c:448
 msgid "Select an application for software CDs"
 msgstr "Chọn ứng dụng cho CD phần mềm"
 
@@ -1410,85 +1400,82 @@ msgstr "Chọn ứng dụng cho CD phần mềm"
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-panel.c:1321
+#: ../panels/info/cc-info-removable-media-panel.c:460
 msgid "audio DVD"
 msgstr "DVD nhạc"
 
-#: ../panels/info/cc-info-panel.c:1322
+#: ../panels/info/cc-info-removable-media-panel.c:461
 msgid "blank Blu-ray disc"
 msgstr "Đĩa Blu-ray trắng"
 
-#: ../panels/info/cc-info-panel.c:1323
+#: ../panels/info/cc-info-removable-media-panel.c:462
 msgid "blank CD disc"
 msgstr "Đĩa CD trắng"
 
-#: ../panels/info/cc-info-panel.c:1324
+#: ../panels/info/cc-info-removable-media-panel.c:463
 msgid "blank DVD disc"
 msgstr "Đĩa DVD trắng"
 
-#: ../panels/info/cc-info-panel.c:1325
+#: ../panels/info/cc-info-removable-media-panel.c:464
 msgid "blank HD DVD disc"
 msgstr "Đĩa HD DVD trắng"
 
-#: ../panels/info/cc-info-panel.c:1326
+#: ../panels/info/cc-info-removable-media-panel.c:465
 msgid "Blu-ray video disc"
 msgstr "Đĩa phim Blu-ray"
 
-#: ../panels/info/cc-info-panel.c:1327
+#: ../panels/info/cc-info-removable-media-panel.c:466
 msgid "e-book reader"
 msgstr "Bộ đọc e-book"
 
-#: ../panels/info/cc-info-panel.c:1328
+#: ../panels/info/cc-info-removable-media-panel.c:467
 msgid "HD DVD video disc"
 msgstr "Đĩa phim HD DVD"
 
-#: ../panels/info/cc-info-panel.c:1329
+#: ../panels/info/cc-info-removable-media-panel.c:468
 msgid "Picture CD"
 msgstr "CD hình"
 
-#: ../panels/info/cc-info-panel.c:1330
+#: ../panels/info/cc-info-removable-media-panel.c:469
 msgid "Super Video CD"
 msgstr "CD Siêu phim"
 
-#: ../panels/info/cc-info-panel.c:1331
+#: ../panels/info/cc-info-removable-media-panel.c:470
 msgid "Video CD"
 msgstr "CD Phim"
 
-#: ../panels/info/cc-info-panel.c:1332
+#: ../panels/info/cc-info-removable-media-panel.c:471
 msgid "Windows software"
 msgstr "Phần mềm Windows"
 
-#: ../panels/info/cc-info-panel.c:1455
-msgid "Section"
-msgstr "Phần"
-
-#: ../panels/info/cc-info-panel.c:1464 ../panels/info/info.ui.h:14
-msgid "Overview"
-msgstr "Tổng quan"
-
-#: ../panels/info/cc-info-panel.c:1470 ../panels/info/info.ui.h:21
-msgid "Default Applications"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:2
+msgid "Defa­ult Applications"
 msgstr "Ứng dụng mặc định"
 
-#: ../panels/info/cc-info-panel.c:1475 ../panels/info/info.ui.h:29
-msgid "Removable Media"
-msgstr "Đa phương tiện"
+#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:3
+msgid "Configure Default Applications"
+msgstr "Cấu hình ứng dụng mặc định"
 
-#: ../panels/info/cc-info-panel.c:1500
-#, c-format
-msgid "Version %s"
-msgstr "Phiên bản %s"
+#. Translators: those are keywords for the Default Applications panel
+#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:5
+msgid "default;application;preferred;media;"
+msgstr ""
+"default;application;preferred;media;mặc định;mac dinh;ứng dụng;ung dung;ưa "
+"dùng;uu dung;"
 
 #. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:2
-msgid "De­tails"
-msgstr "Chi tiết"
+#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:2
+msgid "Ab­out"
+msgstr "Giới thiệu"
 
+#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:3
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:3
 msgid "View information about your system"
 msgstr "Xem thông tin về hệ thống của bạn"
 
 #. sure that you use the same "translation" for those keywords
+#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:5
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:5
 msgid ""
 "device;system;information;memory;processor;version;default;application;"
@@ -1500,109 +1487,140 @@ msgstr ""
 "preferred;ưa;thích;ua;thich;cd;dvd;usb;audio;video;disc;đĩa;dia;removable;di;"
 "động;dong;media;autorun;tự;chạy;"
 
-#: ../panels/info/info.ui.h:1
-msgid "Select how other media should be handled"
-msgstr "Chọn cách xử lý thiết bị lưu trữ khác"
-
-#: ../panels/info/info.ui.h:2
-msgid "_Action:"
-msgstr "_Hành động:"
-
-#: ../panels/info/info.ui.h:3
-msgid "_Type:"
-msgstr "_Kiểu:"
-
-#: ../panels/info/info.ui.h:4
-msgid "Device name"
-msgstr "Tên thiết bị"
-
-#: ../panels/info/info.ui.h:5
-msgid "Memory"
-msgstr "Bộ nhớ"
-
-#: ../panels/info/info.ui.h:6
-msgid "Processor"
-msgstr "Bộ vi xử lý"
-
-#. To translators: this field contains the distro name, version and type
-#: ../panels/info/info.ui.h:8
-msgid "Base system"
-msgstr "Hệ thống nền"
-
-#: ../panels/info/info.ui.h:9
-msgid "Disk"
-msgstr "Đĩa"
-
-#: ../panels/info/info.ui.h:10
-msgid "Calculating…"
-msgstr "Đang tính toán…"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/info/gnome-info-panel.desktop.in.in.h:2
+msgid "De­tails"
+msgstr "Chi tiết"
 
-#: ../panels/info/info.ui.h:11
-msgid "Graphics"
-msgstr "Đồ họa"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:2
+msgid "Remo­vable Media"
+msgstr "Đĩa đa phương tiện"
 
-#: ../panels/info/info.ui.h:12
-msgid "Virtualization"
-msgstr "Ảo hóa"
+#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:3
+msgid "Configure Removable Media settings"
+msgstr "Cấu hình cho các cài đặt đĩa đa phương tiện"
 
-#: ../panels/info/info.ui.h:13
-msgid "Check for updates"
-msgstr "Kiểm tra phiên bản mới"
+#. Translators: those are keywords for the Removable Media panel
+#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:5
+msgid ""
+"device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;"
+"removable;media;autorun;"
+msgstr ""
+"device;thiết bị;thiet bi;system;hệ thống;he thong;default;mặc định;mac dinh;"
+"dinh;application ứng dụng;ung dung;fallback;preferred;ưa thích;ua thich;cd;"
+"dvd;usb;audio;video;disc;đĩa;dia;removable;di động;di dong;media;đa phương "
+"tiện;da phuong tien;autorun;tự chạy;tu chay;"
 
-#: ../panels/info/info.ui.h:15
+#: ../panels/info/info-default-apps.ui.h:1
 msgid "_Web"
 msgstr "_Web"
 
-#: ../panels/info/info.ui.h:16
+#: ../panels/info/info-default-apps.ui.h:2
 msgid "_Mail"
 msgstr "_Thư"
 
-#: ../panels/info/info.ui.h:17
+#: ../panels/info/info-default-apps.ui.h:3
 msgid "_Calendar"
 msgstr "_Lịch"
 
-#: ../panels/info/info.ui.h:18
+#: ../panels/info/info-default-apps.ui.h:4
 msgid "M_usic"
 msgstr "_Nhạc"
 
-#: ../panels/info/info.ui.h:19
+#: ../panels/info/info-default-apps.ui.h:5
 msgid "_Video"
 msgstr "Ph_im"
 
-#: ../panels/info/info.ui.h:20
+#: ../panels/info/info-default-apps.ui.h:6
+#: ../panels/info/info-removable-media.ui.h:5
 msgid "_Photos"
 msgstr "Ả_nh"
 
-#: ../panels/info/info.ui.h:22
+#: ../panels/info/info-overview.ui.h:1
+msgid "Device name"
+msgstr "Tên thiết bị"
+
+#: ../panels/info/info-overview.ui.h:2
+msgid "Memory"
+msgstr "Bộ nhớ"
+
+#: ../panels/info/info-overview.ui.h:3
+msgid "Processor"
+msgstr "Bộ vi xử lý"
+
+#: ../panels/info/info-overview.ui.h:4
+msgid "Graphics"
+msgstr "Đồ họa"
+
+#. To translators: this field contains the distro name and version
+#: ../panels/info/info-overview.ui.h:6
+msgid "OS name"
+msgstr "Tên HDH"
+
+#. To translators: this field contains the distro type
+#: ../panels/info/info-overview.ui.h:8
+msgid "OS type"
+msgstr "Kiểu HDH"
+
+#: ../panels/info/info-overview.ui.h:9
+msgid "Virtualization"
+msgstr "Ảo hóa"
+
+#: ../panels/info/info-overview.ui.h:10
+msgid "Disk"
+msgstr "Đĩa"
+
+#: ../panels/info/info-overview.ui.h:11
+msgid "Calculating…"
+msgstr "Đang tính toán…"
+
+#: ../panels/info/info-overview.ui.h:12
+msgid "Check for updates"
+msgstr "Kiểm tra phiên bản mới"
+
+#: ../panels/info/info-removable-media.ui.h:1
 msgid "Select how media should be handled"
 msgstr "Chọn cách xử lý thiết bị lưu trữ"
 
-#: ../panels/info/info.ui.h:23
+#: ../panels/info/info-removable-media.ui.h:2
 msgid "CD _audio"
 msgstr "CD _nhạc"
 
-#: ../panels/info/info.ui.h:24
+#: ../panels/info/info-removable-media.ui.h:3
 msgid "_DVD video"
 msgstr "_DVD phim"
 
-#: ../panels/info/info.ui.h:25
+#: ../panels/info/info-removable-media.ui.h:4
 msgid "_Music player"
 msgstr "_Máy nghe nhạc"
 
-#: ../panels/info/info.ui.h:26
+#: ../panels/info/info-removable-media.ui.h:6
 msgid "_Software"
 msgstr "_Phần mềm"
 
-#: ../panels/info/info.ui.h:27
+#: ../panels/info/info-removable-media.ui.h:7
 msgid "_Other Media…"
 msgstr "_Thiết bị lưu trữ khác…"
 
-#: ../panels/info/info.ui.h:28
+#: ../panels/info/info-removable-media.ui.h:8
 msgid "_Never prompt or start programs on media insertion"
 msgstr ""
 "_Không bao giờ hỏi hay khởi động chương trình khi nhận ra thiết bị lưu trữ "
 "mới"
 
+#: ../panels/info/info-removable-media.ui.h:9
+msgid "Select how other media should be handled"
+msgstr "Chọn cách xử lý thiết bị lưu trữ khác"
+
+#: ../panels/info/info-removable-media.ui.h:10
+msgid "_Action:"
+msgstr "_Hành động:"
+
+#: ../panels/info/info-removable-media.ui.h:11
+msgid "_Type:"
+msgstr "_Kiểu:"
+
 #: ../panels/keyboard/00-multimedia.xml.in.h:1
 msgid "Sound and Media"
 msgstr "Âm thanh và phương tiện"
@@ -1668,8 +1686,8 @@ msgstr "Chạy phần mềm"
 msgid "Launch help browser"
 msgstr "Chạy trình duyệt trợ giúp"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:277
-#: ../shell/alt/cc-window.c:830 ../shell/cc-window.c:1590
+#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:1590
+#: ../shell/cc-window.c:251 ../shell/cc-window.c:794
 #: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1
 msgid "Settings"
 msgstr "Cài đặt"
@@ -1778,9 +1796,9 @@ msgstr "Giảm cỡ chữ"
 msgid "High contrast on or off"
 msgstr "Bật hoặc tắt tương phản cao"
 
+#: ../panels/keyboard/cc-keyboard-manager.c:506
 #: ../panels/keyboard/cc-keyboard-manager.c:514
-#: ../panels/keyboard/cc-keyboard-manager.c:522
-#: ../panels/keyboard/cc-keyboard-manager.c:830
+#: ../panels/keyboard/cc-keyboard-manager.c:822
 msgid "Custom Shortcuts"
 msgstr "Phím tắt tự chọn"
 
@@ -1791,10 +1809,11 @@ msgstr "Phím tắt tự chọn"
 #. * The device has been disabled
 #: ../panels/keyboard/cc-keyboard-option.c:276
 #: ../panels/keyboard/cc-keyboard-option.c:395
-#: ../panels/keyboard/keyboard-shortcuts.c:440
+#: ../panels/keyboard/keyboard-shortcuts.c:435
 #: ../panels/keyboard/shortcut-editor.ui.h:2
+#: ../panels/network/network-proxy.ui.h:4
 #: ../panels/network/network-wifi.ui.h:31
-#: ../panels/sound/gvc/gvc-mixer-control.c:1830
+#: ../panels/sound/gvc/gvc-mixer-control.c:1866
 #: ../panels/user-accounts/um-fingerprint-dialog.c:214
 msgid "Disabled"
 msgstr "Tắt"
@@ -1832,7 +1851,7 @@ msgstr ""
 "Hành động này không thể hoàn lại được."
 
 #: ../panels/keyboard/cc-keyboard-panel.c:188
-#: ../panels/keyboard/shortcut-editor.ui.h:10
+#: ../panels/keyboard/shortcut-editor.ui.h:9
 #: ../panels/printers/authentication-dialog.ui.h:2
 #: ../panels/printers/ppd-selection-dialog.ui.h:2
 msgid "Cancel"
@@ -1846,28 +1865,28 @@ msgstr "Đặt lại tất cả"
 msgid "Reset the shortcut to its default value"
 msgstr "Đặt lại các phím tắt thành giá trị mặc định của chúng"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:433
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:427
 #, c-format
 msgid ""
 "%s is already being used for <b>%s</b>. If you replace it, %s will be "
 "disabled"
 msgstr "%s đang được sử dụng cho <b>%s</b>. Nếu bạn thay thế nó, %s sẽ bị tắt"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:599
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:597
 msgid "Set Custom Shortcut"
 msgstr "Đặt phím tắt tự chọn"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:599
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:597
 msgid "Set Shortcut"
 msgstr "Đặt phím tắt"
 
 #. Setup the top label
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:608
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:606
 #, c-format
 msgid "Enter new shortcut to change <b>%s</b>."
 msgstr "Gõ phím tắt mới để thay đổi <b>%s</b>."
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:1036
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:1033
 msgid "Add Custom Shortcut"
 msgstr "Thêm phím tắt tự chọn"
 
@@ -1882,8 +1901,13 @@ msgstr "Xem và thay đổi phím tắt và đặt tùy thích nhập liệu"
 
 #. Translators: those are keywords for the keyboard control-center panel
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5
-msgid "Shortcut;Repeat;Blink;"
-msgstr "Shortcut;Phím;tắt;phim;tat;Repeat;Lặp;lap;Blink;Nháy;nhay;"
+msgid ""
+"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;"
+msgstr ""
+"Shortcut;phím tắt;phim tat;Workspace;không gian làm việc;khong gian làm viec;"
+"Window;cửa sổ;cua so;Resize;đổi cỡ;doi co;Zoom;phóng to;phong to;Contrast;"
+"tương phản;tuong phan;Input;Source;nguồn;nguon;Lock;khóa;khoa;Volume;âm "
+"lượng;am luong;"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1
 #: ../panels/region/input-options.ui.h:4 ../shell/cc-application.c:251
@@ -1907,8 +1931,8 @@ msgid "Try a different search"
 msgstr "Thử tìm kiếm khác"
 
 #: ../panels/keyboard/shortcut-editor.ui.h:1
-msgid "Press Esc to cancel."
-msgstr "Nhấn phím Esc để thôi."
+msgid "Press Esc to cancel or Backspace to reset the keyboard shortcut."
+msgstr "Nhấn Esc để thôi hoặc Backspace để đặt lại phím tắt."
 
 #: ../panels/keyboard/shortcut-editor.ui.h:3
 #: ../panels/printers/details-dialog.ui.h:1
@@ -1935,16 +1959,14 @@ msgid "None"
 msgstr "Không có"
 
 #: ../panels/keyboard/shortcut-editor.ui.h:8
-msgid "Remove"
-msgstr "Xóa"
-
-#: ../panels/keyboard/shortcut-editor.ui.h:9
 msgid "Enter the new shortcut"
 msgstr "Gõ phím tắt mới"
 
+#: ../panels/keyboard/shortcut-editor.ui.h:10
+msgid "Remove"
+msgstr "Xóa"
+
 #: ../panels/keyboard/shortcut-editor.ui.h:11
-#: ../panels/network/connection-editor/ce-page-ip4.c:305
-#: ../panels/network/connection-editor/ce-page-ip6.c:277
 msgid "Add"
 msgstr "Thêm"
 
@@ -2071,13 +2093,8 @@ msgstr "Bấm đúp, nút phụ"
 msgid "Single click, secondary button"
 msgstr "Bấm đơn, nút phụ"
 
-#. TRANSLATORS: this is to disable the radio hardware in the
-#. * network panel
-#: ../panels/network/cc-network-panel.c:349
-msgid "Air_plane Mode"
-msgstr "Chế độ _máy bay"
-
-#: ../panels/network/cc-network-panel.c:953
+#. add proxy to device list
+#: ../panels/network/cc-network-panel.c:579
 msgid "Network proxy"
 msgstr "Ủy nhiệm mạng"
 
@@ -2085,52 +2102,59 @@ msgstr "Ủy nhiệm mạng"
 #. * window for vpn connections, it is also used to display
 #. * vpn connections in the device list.
 #.
-#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283
-#: ../panels/network/net-vpn.c:440
+#: ../panels/network/cc-network-panel.c:715 ../panels/network/net-vpn.c:192
+#: ../panels/network/net-vpn.c:321
 #, c-format
 msgid "%s VPN"
 msgstr "VPN %s"
 
-#: ../panels/network/cc-network-panel.c:1194
+#: ../panels/network/cc-network-panel.c:779 ../panels/network/wifi.ui.h:7
 msgid "Oops, something has gone wrong. Please contact your software vendor."
 msgstr ""
 "Ôi trời, có gì đó sai rồi. Vui lòng liên lạc với nhà cung cấp phần mềm."
 
-#: ../panels/network/cc-network-panel.c:1200
+#: ../panels/network/cc-network-panel.c:785
 msgid "NetworkManager needs to be running."
 msgstr "Trình quản lý kết nối mạng cần phải đang chạy."
 
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/network/cc-wifi-panel.c:209
+#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:2
+#: ../panels/network/network-wifi.ui.h:58
+msgid "Wi-Fi"
+msgstr "Wi-Fi"
+
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:1
 msgid "802.1x _Security"
 msgstr "_An ninh 802.1x"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:2
-#: ../panels/network/connection-editor/security-page.ui.h:3
+#: ../panels/network/connection-editor/security-page.ui.h:2
 #: ../panels/wacom/wacom-stylus-page.ui.h:8
 msgid "page 1"
 msgstr "trang 1"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:3
-#: ../panels/network/connection-editor/security-page.ui.h:4
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:5
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:2
+#: ../panels/network/connection-editor/security-page.ui.h:3
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:4
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:1
 msgid "Anony_mous identity"
 msgstr "Thực thể _vô danh"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:4
-#: ../panels/network/connection-editor/security-page.ui.h:5
+#: ../panels/network/connection-editor/security-page.ui.h:4
 msgid "Inner _authentication"
 msgstr "_Xác thực bên trong"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:5
-#: ../panels/network/connection-editor/security-page.ui.h:6
+#: ../panels/network/connection-editor/security-page.ui.h:5
 #: ../panels/wacom/wacom-stylus-page.ui.h:16
 msgid "page 2"
 msgstr "trang 2"
 
 #: ../panels/network/connection-editor/ce-page-8021x-security.c:101
-#: ../panels/network/connection-editor/ce-page-security.c:459
+#: ../panels/network/connection-editor/ce-page-security.c:445
 #: ../panels/network/connection-editor/details-page.ui.h:3
 #: ../panels/network/network-wifi.ui.h:6
 msgid "Security"
@@ -2146,220 +2170,162 @@ msgid "Profile %d"
 msgstr "Hồ sơ %d"
 
 #. TRANSLATORS: this WEP WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:50
-#: ../panels/network/net-device-wifi.c:214
-#: ../panels/network/net-device-wifi.c:390
+#: ../panels/network/connection-editor/ce-page-details.c:56
+#: ../panels/network/net-device-wifi.c:231
+#: ../panels/network/net-device-wifi.c:407
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:54
-#: ../panels/network/net-device-wifi.c:218
-#: ../panels/network/net-device-wifi.c:395
+#: ../panels/network/connection-editor/ce-page-details.c:60
+#: ../panels/network/net-device-wifi.c:235
+#: ../panels/network/net-device-wifi.c:412
 #: ../panels/network/network-wifi.ui.h:19
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:58
-#: ../panels/network/net-device-wifi.c:222
+#: ../panels/network/connection-editor/ce-page-details.c:64
+#: ../panels/network/net-device-wifi.c:239
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:63
-#: ../panels/network/net-device-wifi.c:227
+#: ../panels/network/connection-editor/ce-page-details.c:69
+#: ../panels/network/net-device-wifi.c:244
 msgid "Enterprise"
 msgstr "Doanh nghiệp"
 
-#: ../panels/network/connection-editor/ce-page-details.c:68
-#: ../panels/network/net-device-wifi.c:232
-#: ../panels/network/net-device-wifi.c:380
+#: ../panels/network/connection-editor/ce-page-details.c:74
+#: ../panels/network/net-device-wifi.c:249
+#: ../panels/network/net-device-wifi.c:397
 msgctxt "Wifi security"
 msgid "None"
 msgstr "Không"
 
-#: ../panels/network/connection-editor/ce-page-details.c:89
+#: ../panels/network/connection-editor/ce-page-details.c:95
 #: ../panels/power/power.ui.h:17
 msgid "Never"
 msgstr "Không bao giờ"
 
-#: ../panels/network/connection-editor/ce-page-details.c:104
+#: ../panels/network/connection-editor/ce-page-details.c:110
 #: ../panels/network/net-device-ethernet.c:120
-#: ../panels/network/net-device-wifi.c:485
+#: ../panels/network/net-device-wifi.c:505
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
 msgstr[0] "%i ngày trước"
 
 #. Translators: network device speed
-#: ../panels/network/connection-editor/ce-page-details.c:153
+#: ../panels/network/connection-editor/ce-page-details.c:176
 #: ../panels/network/net-device-ethernet.c:50
-#: ../panels/network/net-device-wifi.c:542
+#: ../panels/network/net-device-wifi.c:561
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: ../panels/network/connection-editor/ce-page-details.c:179
-#: ../panels/network/net-device-wifi.c:571
+#: ../panels/network/connection-editor/ce-page-details.c:202
+#: ../panels/network/net-device-wifi.c:590
 msgctxt "Signal strength"
 msgid "None"
 msgstr "Không"
 
-#: ../panels/network/connection-editor/ce-page-details.c:181
-#: ../panels/network/net-device-wifi.c:573
+#: ../panels/network/connection-editor/ce-page-details.c:204
+#: ../panels/network/net-device-wifi.c:592
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "Yếu"
 
-#: ../panels/network/connection-editor/ce-page-details.c:183
-#: ../panels/network/net-device-wifi.c:575
+#: ../panels/network/connection-editor/ce-page-details.c:206
+#: ../panels/network/net-device-wifi.c:594
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "Ok"
 
-#: ../panels/network/connection-editor/ce-page-details.c:185
-#: ../panels/network/net-device-wifi.c:577
+#: ../panels/network/connection-editor/ce-page-details.c:208
+#: ../panels/network/net-device-wifi.c:596
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "Tốt"
 
-#: ../panels/network/connection-editor/ce-page-details.c:187
-#: ../panels/network/net-device-wifi.c:579
+#: ../panels/network/connection-editor/ce-page-details.c:210
+#: ../panels/network/net-device-wifi.c:598
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "Tuyệt hảo"
 
-#: ../panels/network/connection-editor/ce-page-details.c:225
-#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:269
+#: ../panels/network/connection-editor/ce-page-details.c:248
+msgid "Forget Connection"
+msgstr "Quên kết nối"
+
+#: ../panels/network/connection-editor/ce-page-details.c:250
+msgid "Remove Connection Profile"
+msgstr "Xóa bỏ Hồ sơ Kết nối"
+
+#: ../panels/network/connection-editor/ce-page-details.c:252
+msgid "Remove VPN"
+msgstr "Xóa VPN"
+
+#: ../panels/network/connection-editor/ce-page-details.c:280
+#: ../panels/network/network-wifi.ui.h:46 ../shell/cc-window.c:243
 #: ../shell/panel-list.ui.h:2
 msgid "Details"
 msgstr "Chi tiết"
 
-#: ../panels/network/connection-editor/ce-page-ethernet.c:215
-#: ../panels/network/connection-editor/ce-page-vpn.c:221
-#: ../panels/network/connection-editor/ce-page-wifi.c:227
+#: ../panels/network/connection-editor/ce-page-ethernet.c:173
+#: ../panels/network/connection-editor/ce-page-vpn.c:188
+#: ../panels/network/connection-editor/ce-page-wifi.c:194
 #: ../panels/network/network-wifi.ui.h:47
 msgid "Identity"
 msgstr "Thực thể"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:202
-#: ../panels/network/connection-editor/ce-page-ip4.c:461
-#: ../panels/network/connection-editor/ce-page-ip6.c:180
-#: ../panels/network/connection-editor/ce-page-ip6.c:427
-#: ../panels/printers/details-dialog.ui.h:3
-msgid "Address"
-msgstr "Địa chỉ"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:215
-#: ../panels/network/connection-editor/ce-page-ip4.c:474
-msgid "Netmask"
-msgstr "Mặt nạ mạng"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:229
-#: ../panels/network/connection-editor/ce-page-ip4.c:487
-#: ../panels/network/connection-editor/ce-page-ip6.c:206
-#: ../panels/network/connection-editor/ce-page-ip6.c:453
-#: ../panels/network/network-vpn.ui.h:2
-msgid "Gateway"
-msgstr "Máy cổng"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:250
-#: ../panels/network/connection-editor/ce-page-ip6.c:223
+#: ../panels/network/connection-editor/ce-page-ip4.c:251
+#: ../panels/network/connection-editor/ce-page-ip6.c:230
 msgid "Delete Address"
 msgstr "Xóa địa chỉ"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:368
-#: ../panels/network/connection-editor/ce-page-ip6.c:334
-msgid "Server"
-msgstr "Máy chủ"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:385
-#: ../panels/network/connection-editor/ce-page-ip6.c:351
-msgid "Delete DNS Server"
-msgstr "Xóa máy chủ DNS"
-
-#. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
-#: ../panels/network/connection-editor/ce-page-ip4.c:501
-#: ../panels/network/connection-editor/ce-page-ip6.c:467
-msgctxt "network parameters"
-msgid "Metric"
-msgstr "Hệ mét"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:522
-#: ../panels/network/connection-editor/ce-page-ip6.c:484
+#: ../panels/network/connection-editor/ce-page-ip4.c:422
+#: ../panels/network/connection-editor/ce-page-ip6.c:390
 msgid "Delete Route"
 msgstr "Xóa định tuyến"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:626
-#: ../panels/network/network-wifi.ui.h:27
-msgid "Automatic (DHCP)"
-msgstr "Tự động (DHCP)"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:634
-#: ../panels/network/connection-editor/ce-page-ip6.c:596
-msgid "Link-Local Only"
-msgstr "Chỉ Link-Local"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:980
+#: ../panels/network/connection-editor/ce-page-ip4.c:896
 #: ../panels/network/network-wifi.ui.h:48
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:193
-#: ../panels/network/connection-editor/ce-page-ip6.c:440
-msgid "Prefix"
-msgstr "Tiền tố"
-
-#: ../panels/network/connection-editor/ce-page-ip6.c:584
-#: ../panels/network/connection-editor/ethernet-page.ui.h:1
-#: ../panels/network/connection-editor/ip4-page.ui.h:4
-#: ../panels/network/connection-editor/ip6-page.ui.h:4
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:2
-#: ../panels/privacy/cc-privacy-panel.c:217
-msgid "Automatic"
-msgstr "Tự động"
-
-#: ../panels/network/connection-editor/ce-page-ip6.c:588
-msgid "Automatic, DHCP only"
-msgstr "Tự động, chỉ DHCP"
-
-#: ../panels/network/connection-editor/ce-page-ip6.c:898
+#: ../panels/network/connection-editor/ce-page-ip6.c:827
 #: ../panels/network/network-wifi.ui.h:49
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../panels/network/connection-editor/ce-page-reset.c:78
-msgid "Reset"
-msgstr "Đặt lại"
-
-#: ../panels/network/connection-editor/ce-page-security.c:248
+#: ../panels/network/connection-editor/ce-page-security.c:245
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Không"
 
-#: ../panels/network/connection-editor/ce-page-security.c:271
+#: ../panels/network/connection-editor/ce-page-security.c:268
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Khóa WEP 40/128-bit (thập lục phân hoặc ASCII)"
 
-#: ../panels/network/connection-editor/ce-page-security.c:281
+#: ../panels/network/connection-editor/ce-page-security.c:278
 msgid "WEP 128-bit Passphrase"
 msgstr "Mật khẩu WEP 128-bit"
 
-#: ../panels/network/connection-editor/ce-page-security.c:294
-#: ../panels/network/wireless-security/wireless-security.c:463
+#: ../panels/network/connection-editor/ce-page-security.c:291
+#: ../panels/network/wireless-security/wireless-security.c:465
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../panels/network/connection-editor/ce-page-security.c:307
+#: ../panels/network/connection-editor/ce-page-security.c:304
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP động (802.1x)"
 
-#: ../panels/network/connection-editor/ce-page-security.c:321
+#: ../panels/network/connection-editor/ce-page-security.c:318
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Cá nhân"
 
-#: ../panels/network/connection-editor/ce-page-security.c:335
+#: ../panels/network/connection-editor/ce-page-security.c:332
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA và WPA2 Doanh nghiệp"
 
@@ -2375,7 +2341,6 @@ msgstr "Tốc độ đường truyền"
 
 #: ../panels/network/connection-editor/details-page.ui.h:4
 #: ../panels/network/net-device-ethernet.c:153
-#: ../panels/network/network-simple.ui.h:3
 #: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644
 msgid "IPv4 Address"
 msgstr "Địa chỉ IPv4"
@@ -2384,14 +2349,12 @@ msgstr "Địa chỉ IPv4"
 #: ../panels/network/net-device-ethernet.c:154
 #: ../panels/network/net-device-ethernet.c:158
 #: ../panels/network/network-mobile.ui.h:4
-#: ../panels/network/network-simple.ui.h:4
 #: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645
 msgid "IPv6 Address"
 msgstr "Địa chỉ IPv6"
 
 #: ../panels/network/connection-editor/details-page.ui.h:6
 #: ../panels/network/net-device-ethernet.c:161
-#: ../panels/network/network-simple.ui.h:2
 #: ../panels/network/network-wifi.ui.h:9
 msgid "Hardware Address"
 msgstr "Địa chỉ phần cứng"
@@ -2399,17 +2362,15 @@ msgstr "Địa chỉ phần cứng"
 #: ../panels/network/connection-editor/details-page.ui.h:7
 #: ../panels/network/net-device-ethernet.c:165
 #: ../panels/network/network-mobile.ui.h:5
-#: ../panels/network/network-simple.ui.h:5
 #: ../panels/network/network-wifi.ui.h:10
 msgid "Default Route"
 msgstr "Định tuyến mặc định"
 
 #: ../panels/network/connection-editor/details-page.ui.h:8
-#: ../panels/network/connection-editor/ip4-page.ui.h:3
-#: ../panels/network/connection-editor/ip6-page.ui.h:3
+#: ../panels/network/connection-editor/ip4-page.ui.h:10
+#: ../panels/network/connection-editor/ip6-page.ui.h:11
 #: ../panels/network/net-device-ethernet.c:167
 #: ../panels/network/network-mobile.ui.h:6
-#: ../panels/network/network-simple.ui.h:6
 #: ../panels/network/network-wifi.ui.h:11
 msgid "DNS"
 msgstr "DNS"
@@ -2418,6 +2379,23 @@ msgstr "DNS"
 msgid "Last Used"
 msgstr "Dùng lần cuối"
 
+#: ../panels/network/connection-editor/details-page.ui.h:10
+msgid "Connect _automatically"
+msgstr "Kết nối _tự động"
+
+#: ../panels/network/connection-editor/details-page.ui.h:11
+msgid "Make available to _other users"
+msgstr "Cho người dùng _khác sử dụng"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:1
+#: ../panels/network/connection-editor/ip4-page.ui.h:11
+#: ../panels/network/connection-editor/ip6-page.ui.h:2
+#: ../panels/network/net-proxy.c:58 ../panels/network/network-proxy.ui.h:2
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:1
+#: ../panels/privacy/cc-privacy-panel.c:217
+msgid "Automatic"
+msgstr "Tự động"
+
 #: ../panels/network/connection-editor/ethernet-page.ui.h:2
 msgid "Twisted Pair (TP)"
 msgstr "Dây xoắn đôi (TP)"
@@ -2474,116 +2452,111 @@ msgstr "Địa chỉ _nhân bản"
 msgid "bytes"
 msgstr "byte"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:15
-#: ../panels/network/connection-editor/vpn-page.ui.h:3
-msgid "Make available to other _users"
-msgstr "Cho người dùng _khác sử dụng"
+#: ../panels/network/connection-editor/ip4-page.ui.h:1
+msgid "IPv_4 Method"
+msgstr "Phương thức IPv_4"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:16
-#: ../panels/network/connection-editor/wifi-page.ui.h:7
-msgid "Connect _automatically"
-msgstr "Kết nối _tự động"
+#: ../panels/network/connection-editor/ip4-page.ui.h:2
+#: ../panels/network/network-wifi.ui.h:27
+msgid "Automatic (DHCP)"
+msgstr "Tự động (DHCP)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:17
-#: ../panels/network/connection-editor/security-page.ui.h:2
-#: ../panels/network/connection-editor/vpn-page.ui.h:2
-msgid "Firewall _Zone"
-msgstr "_Vùng tường lửa"
+#: ../panels/network/connection-editor/ip4-page.ui.h:3
+#: ../panels/network/connection-editor/ip6-page.ui.h:4
+msgid "Link-Local Only"
+msgstr "Chỉ Link-Local"
 
-#: ../panels/network/connection-editor/firewall-helpers.c:49
-#: ../panels/network/connection-editor/firewall-helpers.c:118
-msgctxt "Firewall zone"
-msgid "Default"
-msgstr "Mặc định"
+#: ../panels/network/connection-editor/ip4-page.ui.h:5
+#: ../panels/network/connection-editor/ip6-page.ui.h:6
+msgid "Disable"
+msgstr "Tắt"
 
-#: ../panels/network/connection-editor/firewall-helpers.c:50
-msgid "The zone defines the trust level of the connection"
-msgstr "Đây là vùng định nghĩa mức tin cậy của kết nối"
+#: ../panels/network/connection-editor/ip4-page.ui.h:6
+#: ../panels/network/connection-editor/ip6-page.ui.h:7
+msgid "Addresses"
+msgstr "Địa chỉ"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:24
-msgid "IPv_4"
-msgstr "IPv_4"
+#: ../panels/network/connection-editor/ip4-page.ui.h:7
+#: ../panels/network/connection-editor/ip6-page.ui.h:8
+#: ../panels/printers/details-dialog.ui.h:3
+msgid "Address"
+msgstr "Địa chỉ"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:2
-#: ../panels/network/connection-editor/ip6-page.ui.h:2
-#: ../panels/network/network-wifi.ui.h:25
-msgid "_Addresses"
-msgstr "Đị_a chỉ"
+#: ../panels/network/connection-editor/ip4-page.ui.h:8
+msgid "Netmask"
+msgstr "Mặt nạ mạng"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:5
-#: ../panels/network/connection-editor/ip6-page.ui.h:5
+#: ../panels/network/connection-editor/ip4-page.ui.h:9
+#: ../panels/network/connection-editor/ip6-page.ui.h:10
+msgid "Gateway"
+msgstr "Máy cổng"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:12
+#: ../panels/network/connection-editor/ip6-page.ui.h:12
 msgid "Automatic DNS"
 msgstr "DNS tự động"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:6
-#: ../panels/network/connection-editor/ip6-page.ui.h:6
+#: ../panels/network/connection-editor/ip4-page.ui.h:13
+#: ../panels/network/connection-editor/ip6-page.ui.h:13
+msgid "Separate IP addresses with commas"
+msgstr "Ngăn cách địa chỉ IP bằng các dấu phẩy"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:14
+#: ../panels/network/connection-editor/ip6-page.ui.h:14
 #: ../panels/network/network-wifi.ui.h:32
 msgid "Routes"
 msgstr "Định tuyến"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:7
-#: ../panels/network/connection-editor/ip6-page.ui.h:7
+#: ../panels/network/connection-editor/ip4-page.ui.h:15
+#: ../panels/network/connection-editor/ip6-page.ui.h:15
 msgid "Automatic Routes"
 msgstr "Định tuyến tự động"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:8
-#: ../panels/network/connection-editor/ip6-page.ui.h:8
+#. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
+#: ../panels/network/connection-editor/ip4-page.ui.h:17
+#: ../panels/network/connection-editor/ip6-page.ui.h:17
+msgid "Metric"
+msgstr "Metric"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:18
+#: ../panels/network/connection-editor/ip6-page.ui.h:18
 #: ../panels/network/network-wifi.ui.h:34
 msgid "Use this connection _only for resources on its network"
 msgstr "Dùng kết nối này _chỉ cho tài nguyên trên mạng này"
 
 #: ../panels/network/connection-editor/ip6-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:36
-msgid "IPv_6"
-msgstr "IPv_6"
+msgid "IPv_6 Method"
+msgstr "Phương thức IPv_6"
+
+#: ../panels/network/connection-editor/ip6-page.ui.h:3
+msgid "Automatic, DHCP only"
+msgstr "Tự động, chỉ DHCP"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:296
+#: ../panels/network/connection-editor/ip6-page.ui.h:9
+msgid "Prefix"
+msgstr "Tiền tố"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:273
 msgid "Unable to open connection editor"
 msgstr "Không thể mở cửa sổ điều chỉnh kết nối"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:314
+#: ../panels/network/connection-editor/net-connection-editor.c:291
 msgid "New Profile"
 msgstr "Hồ sơ mới"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:635
+#: ../panels/network/connection-editor/net-connection-editor.c:603
+#: ../panels/network/network.ui.h:2
 msgid "VPN"
 msgstr "VPN"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:783
+#: ../panels/network/connection-editor/net-connection-editor.c:751
 msgid "Import from file…"
 msgstr "Nhập từ tập tin…"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:817
+#: ../panels/network/connection-editor/net-connection-editor.c:785
 msgid "Add VPN"
 msgstr "Thêm VPN"
 
-#: ../panels/network/connection-editor/reset-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:41
-msgid "_Reset"
-msgstr "Đặ_t lại"
-
-#: ../panels/network/connection-editor/reset-page.ui.h:2
-#: ../panels/network/net-device-wifi.c:1536
-#: ../panels/network/network-wifi.ui.h:42
-msgid "_Forget"
-msgstr "_Quên"
-
-#: ../panels/network/connection-editor/reset-page.ui.h:3
-msgid ""
-"Reset the settings for this network, including passwords, but remember it as "
-"a preferred network"
-msgstr ""
-"Đặt lại toàn bộ cài đặt cho mạng này, bao gồm mật khẩu, nhưng vẫn ghi nhớ nó "
-"là mạng ưa dùng"
-
-#: ../panels/network/connection-editor/reset-page.ui.h:4
-msgid ""
-"Remove all details relating to this network and do not try to automatically "
-"connect"
-msgstr ""
-"Xóa bỏ mọi thông tin chi tiết liên quan đến mạng và không kết nối tự động"
-
 #: ../panels/network/connection-editor/security-page.ui.h:1
 #: ../panels/network/network-wifi.ui.h:16
 msgid "S_ecurity"
@@ -2612,8 +2585,8 @@ msgstr "Chọn tập tin cần nhập"
 
 #: ../panels/network/connection-editor/vpn-helpers.c:182
 #: ../panels/printers/pp-details-dialog.c:320
-#: ../panels/sharing/cc-sharing-panel.c:376
-#: ../panels/user-accounts/um-photo-dialog.c:219
+#: ../panels/sharing/cc-sharing-panel.c:383
+#: ../panels/user-accounts/um-photo-dialog.c:222
 msgid "_Open"
 msgstr "_Mở"
 
@@ -2650,7 +2623,7 @@ msgstr ""
 msgid "Export VPN connection"
 msgstr "Xuất kết nối VPN"
 
-#: ../panels/network/connection-editor/vpn-page.ui.h:4
+#: ../panels/network/connection-editor/vpn-page.ui.h:2
 msgid "(Error: unable to load VPN connection editor)"
 msgstr "(Lỗi: không thể tải bộ biên soạn kết nối VPN)"
 
@@ -2669,10 +2642,6 @@ msgstr "_BSSID"
 msgid "My Home Network"
 msgstr "Mạng nhà"
 
-#: ../panels/network/connection-editor/wifi-page.ui.h:6
-msgid "Make available to _other users"
-msgstr "Cho người dùng _khác sử dụng"
-
 #. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/network/gnome-network-panel.desktop.in.in.h:2
 msgid "Net­work"
@@ -2691,18 +2660,29 @@ msgstr ""
 "Network;mạng;mang;Wireless;không dây;khong day;Wi-Fi;Wifi;IP;LAN;Proxy;ủy "
 "nhiệm;uy nhiem;WAN;Broadband;Modem;Bluetooth;vpn;DNS;"
 
+#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:3
+msgid "Control how you connect to Wi-Fi networks"
+msgstr "Điều khiển cách kết nối đến mạng Wi-Fi"
+
+#. Translators: those are keywords for the wi-fi control-center panel
+#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:5
+msgid "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;"
+msgstr ""
+"Network;mạng;mang;Wireless;không dây;khong day;Wi-Fi;Wifi;IP;LAN;Broadband;"
+"DNS;"
+
 #: ../panels/network/net-device-ethernet.c:106
-#: ../panels/network/net-device-wifi.c:471
+#: ../panels/network/net-device-wifi.c:491
 msgid "never"
 msgstr "chưa bao giờ"
 
 #: ../panels/network/net-device-ethernet.c:116
-#: ../panels/network/net-device-wifi.c:481
+#: ../panels/network/net-device-wifi.c:501
 msgid "today"
 msgstr "hôm nay"
 
 #: ../panels/network/net-device-ethernet.c:118
-#: ../panels/network/net-device-wifi.c:483
+#: ../panels/network/net-device-wifi.c:503
 msgid "yesterday"
 msgstr "hôm qua"
 
@@ -2722,38 +2702,30 @@ msgstr "Dùng lần cuối"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: ../panels/network/net-device-ethernet.c:280
+#: ../panels/network/net-device-ethernet.c:275
 #: ../panels/network/network-ethernet.ui.h:1
 #: ../panels/network/network-simple.ui.h:1
 msgid "Wired"
 msgstr "Có dây"
 
-#: ../panels/network/net-device-ethernet.c:348
-#: ../panels/network/net-device-wifi.c:1694
-#: ../panels/network/network-ethernet.ui.h:3
+#: ../panels/network/net-device-ethernet.c:343
+#: ../panels/network/net-device-wifi.c:1792
+#: ../panels/network/network-ethernet.ui.h:2
 #: ../panels/network/network-mobile.ui.h:8
-#: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7
+#: ../panels/network/network-simple.ui.h:3 ../panels/network/network-vpn.ui.h:2
 msgid "Options…"
 msgstr "Tùy chọn…"
 
-#: ../panels/network/net-device-mobile.c:223
+#: ../panels/network/net-device-mobile.c:238
 msgid "Add new connection"
 msgstr "Thêm kết nối mới"
 
-#: ../panels/network/net-device-wifi.c:1205
-msgid ""
-"If you have a connection to the Internet other than wireless, you can set up "
-"a wireless hotspot to share the connection with others."
-msgstr ""
-"Nếu bạn có kết nối Internet không phải không dây, bạn có thể cài đặt một "
-"điểm kết nối không dây (hotspot) để chia sẻ kết nối Internet với người khác."
-
-#: ../panels/network/net-device-wifi.c:1209
+#: ../panels/network/net-device-wifi.c:1275
 #, c-format
 msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
 msgstr "Chuyển qua kết nối không dây, bạn sẽ bị ngắt khỏi <b>%s</b>."
 
-#: ../panels/network/net-device-wifi.c:1213
+#: ../panels/network/net-device-wifi.c:1279
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
@@ -2761,26 +2733,42 @@ msgstr ""
 "Không thể truy cập Internet không dây khi điểm kết nối không dây vẫn đang "
 "hoạt động."
 
-#: ../panels/network/net-device-wifi.c:1296
+#: ../panels/network/net-device-wifi.c:1286
+msgid "Turn On Wi-Fi Hotspot?"
+msgstr "Bật Wi-Fi Hotspot?"
+
+#: ../panels/network/net-device-wifi.c:1308
+msgid ""
+"Wi-Fi hotspots are usually used to share an additional Internet connection "
+"over Wi-Fi."
+msgstr ""
+"Wi-Fi hotspots thường được sử dụng để chia sẻ kết nối Internet thông qua Wi-"
+"Fi."
+
+#: ../panels/network/net-device-wifi.c:1319
+msgid "_Turn On"
+msgstr "_Bật"
+
+#: ../panels/network/net-device-wifi.c:1396
 msgid "Stop hotspot and disconnect any users?"
 msgstr ""
 "Bạn có muốn dừng điểm truy cập này và ngắt kết nối những người đang sử dụng?"
 
-#: ../panels/network/net-device-wifi.c:1299
+#: ../panels/network/net-device-wifi.c:1399
 msgid "_Stop Hotspot"
 msgstr "_Dừng điểm truy cập"
 
-#: ../panels/network/net-device-wifi.c:1397
+#: ../panels/network/net-device-wifi.c:1496
 msgid "System policy prohibits use as a Hotspot"
 msgstr ""
 "Chính sách của hệ thống cấm chỉ dùng máy tính này như một Hotspot (Điểm tập "
 "trung để máy khác truy cập mạng)"
 
-#: ../panels/network/net-device-wifi.c:1400
+#: ../panels/network/net-device-wifi.c:1499
 msgid "Wireless device does not support Hotspot mode"
 msgstr "Thiết bị không dây không hỗ trợ chế độ điểm truy cập"
 
-#: ../panels/network/net-device-wifi.c:1532
+#: ../panels/network/net-device-wifi.c:1630
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
@@ -2788,25 +2776,24 @@ msgstr ""
 "Sẽ mất chi tiết của những mạng được chọn, bao gồm mật khẩu và các cài đặt "
 "tùy biến khác."
 
-#: ../panels/network/net-device-wifi.c:1842
-msgid "History"
-msgstr "Lịch sử"
+#: ../panels/network/net-device-wifi.c:1634
+#: ../panels/network/network-wifi.ui.h:42
+msgid "_Forget"
+msgstr "_Quên"
 
-#: ../panels/network/net-device-wifi.c:1846
-#: ../panels/printers/options-dialog.ui.h:2
-#: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:505
-#: ../panels/wacom/gnome-wacom-properties.ui.h:5
-msgid "_Close"
-msgstr "Đón_g"
+#: ../panels/network/net-device-wifi.c:1943
+#: ../panels/network/net-device-wifi.c:1950
+msgid "Known Wi-Fi Networks"
+msgstr "Mạng đã biết Wi-Fi"
 
 #. translators: This is the label for the "Forget wireless network" functionality
-#: ../panels/network/net-device-wifi.c:1854
+#: ../panels/network/net-device-wifi.c:1983
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "_Quên"
 
 #. TRANSLATORS: this is when the use leaves the PAC textbox blank
-#: ../panels/network/net-proxy.c:67
+#: ../panels/network/net-proxy.c:102
 msgid ""
 "Web Proxy Autodiscovery is used when a Configuration URL is not provided."
 msgstr "Dùng Tự động phát hiện ủy nhiệm Web nếu không cung cấp URL cấu hình."
@@ -2815,18 +2802,10 @@ msgstr "Dùng Tự động phát hiện ủy nhiệm Web nếu không cung cấp
 #. * network, then anyone else on that network can tell your
 #. * machine that it should proxy all of your web traffic
 #. * through them.
-#: ../panels/network/net-proxy.c:75
+#: ../panels/network/net-proxy.c:110
 msgid "This is not recommended for untrusted public networks."
 msgstr "Không khuyến khích đối với mạng công cộng không đáng tin."
 
-#: ../panels/network/net-proxy.c:410
-msgid "Proxy"
-msgstr "Ủy nhiệm"
-
-#: ../panels/network/network-ethernet.ui.h:2
-msgid "_Add Profile…"
-msgstr "_Thêm hồ sơ…"
-
 #: ../panels/network/network-mobile.ui.h:1
 msgid "IMEI"
 msgstr "IMEI"
@@ -2840,95 +2819,64 @@ msgid "Network"
 msgstr "Mạng"
 
 #: ../panels/network/network-proxy.ui.h:1
-msgctxt "proxy method"
-msgid "None"
-msgstr "Không có"
-
-#: ../panels/network/network-proxy.ui.h:2
-msgctxt "proxy method"
-msgid "Manual"
-msgstr "Thủ công"
-
-#: ../panels/network/network-proxy.ui.h:3
-msgctxt "proxy method"
-msgid "Automatic"
-msgstr "Tự động"
-
-#: ../panels/network/network-proxy.ui.h:4
-msgid "_Method"
-msgstr "_Phương thức"
+msgid "Network Proxy"
+msgstr "Ủy nhiệm mạng"
 
 #: ../panels/network/network-proxy.ui.h:5
-msgid "_Configuration URL"
-msgstr "_Cấu hình URL"
-
-#: ../panels/network/network-proxy.ui.h:6
 msgid "_HTTP Proxy"
 msgstr "Ủy nhiệm _HTTP"
 
-#: ../panels/network/network-proxy.ui.h:7
+#: ../panels/network/network-proxy.ui.h:6
 msgid "H_TTPS Proxy"
 msgstr "Ủy nhiệm H_TTPS"
 
-#: ../panels/network/network-proxy.ui.h:8
+#: ../panels/network/network-proxy.ui.h:7
 msgid "_FTP Proxy"
 msgstr "Ủy nhiệm _FTP"
 
-#: ../panels/network/network-proxy.ui.h:9
+#: ../panels/network/network-proxy.ui.h:8
 msgid "_Socks Host"
 msgstr "Máy chủ _Socks"
 
-#: ../panels/network/network-proxy.ui.h:10
+#: ../panels/network/network-proxy.ui.h:9
 msgid "_Ignore Hosts"
 msgstr "_Bỏ qua máy"
 
-#: ../panels/network/network-proxy.ui.h:11
+#: ../panels/network/network-proxy.ui.h:10
 msgid "HTTP proxy port"
 msgstr "Cổng ủy nhiệm HTTP"
 
-#: ../panels/network/network-proxy.ui.h:12
+#: ../panels/network/network-proxy.ui.h:11
 msgid "HTTPS proxy port"
 msgstr "Cổng ủy nhiệm HTTPS"
 
-#: ../panels/network/network-proxy.ui.h:13
+#: ../panels/network/network-proxy.ui.h:12
 msgid "FTP proxy port"
 msgstr "Cổng ủy nhiệm FTP"
 
-#: ../panels/network/network-proxy.ui.h:14
+#: ../panels/network/network-proxy.ui.h:13
 msgid "Socks proxy port"
 msgstr "Cổng ủy nhiệm Socks"
 
-#: ../panels/network/network-simple.ui.h:7
+#: ../panels/network/network-proxy.ui.h:14
+msgid "_Configuration URL"
+msgstr "_Cấu hình URL"
+
+#: ../panels/network/network-simple.ui.h:2
 msgid "Turn device off"
 msgstr "Tắt thiết bị"
 
+#. Translators: The found device is a printer connected via Bluetooth
 #: ../panels/network/network.ui.h:1
-msgid "Add Device"
-msgstr "Thêm thiết bị"
+#: ../panels/printers/pp-new-printer-dialog.c:1816
+msgid "Bluetooth"
+msgstr "Bluetooth"
 
-#: ../panels/network/network.ui.h:2
-msgid "Remove Device"
-msgstr "Gỡ bỏ thiết bị"
+#: ../panels/network/network.ui.h:3
+msgid "Not set up"
+msgstr "Chưa cài đặt"
 
 #: ../panels/network/network-vpn.ui.h:1
-msgid "VPN Type"
-msgstr "Kiểu VPN"
-
-#: ../panels/network/network-vpn.ui.h:3
-msgid "Group Name"
-msgstr "Tên nhóm"
-
-#: ../panels/network/network-vpn.ui.h:4
-msgid "Group Password"
-msgstr "Mật khẩu nhóm"
-
-#: ../panels/network/network-vpn.ui.h:5
-#: ../panels/printers/authentication-dialog.ui.h:4
-#: ../panels/printers/new-printer-dialog.ui.h:13
-msgid "Username"
-msgstr "Tên người dùng"
-
-#: ../panels/network/network-vpn.ui.h:6
 msgid "Turn VPN connection off"
 msgstr "Tắt kết nối VPN"
 
@@ -2963,6 +2911,14 @@ msgstr "Cho phép những người dùng khác sử dụng"
 msgid "identity"
 msgstr "thực thể"
 
+#: ../panels/network/network-wifi.ui.h:24
+msgid "IPv_4"
+msgstr "IPv_4"
+
+#: ../panels/network/network-wifi.ui.h:25
+msgid "_Addresses"
+msgstr "Đị_a chỉ"
+
 #: ../panels/network/network-wifi.ui.h:28
 msgid "Automatic (DHCP) addresses only"
 msgstr "Chỉ địa chỉ tự động (DHCP)"
@@ -2983,6 +2939,10 @@ msgstr "_Bỏ qua định tuyến lấy tự động"
 msgid "ipv4"
 msgstr "ipv4"
 
+#: ../panels/network/network-wifi.ui.h:36
+msgid "IPv_6"
+msgstr "IPv_6"
+
 #: ../panels/network/network-wifi.ui.h:37
 msgid "ipv6"
 msgstr "ipv6"
@@ -2995,6 +2955,10 @@ msgstr "Địa chỉ MAC _nhân bản"
 msgid "hardware"
 msgstr "phần cứng"
 
+#: ../panels/network/network-wifi.ui.h:41
+msgid "_Reset"
+msgstr "Đặ_t lại"
+
 #: ../panels/network/network-wifi.ui.h:43
 msgid ""
 "Reset the settings for this connection to their defaults, but remember as a "
@@ -3029,52 +2993,68 @@ msgid "Wi-Fi Hotspot"
 msgstr "Wi-Fi Hotspot"
 
 #: ../panels/network/network-wifi.ui.h:53
-msgid "_Turn On"
-msgstr "_Bật"
-
-#: ../panels/network/network-wifi.ui.h:54
-msgid "Wi-Fi"
-msgstr "Wi-Fi"
-
-#: ../panels/network/network-wifi.ui.h:55
-msgid "Turn Wi-Fi off"
-msgstr "Tắt Wi-Fi"
-
-#: ../panels/network/network-wifi.ui.h:56
-msgid "_Use as Hotspot…"
-msgstr "_Dùng làm điểm truy cập…"
-
-#: ../panels/network/network-wifi.ui.h:57
-msgid "_Connect to Hidden Network…"
-msgstr "_Nối vào mạng ẩn…"
-
-#: ../panels/network/network-wifi.ui.h:58
-msgid "_History"
-msgstr "_Lịch sử"
-
-#: ../panels/network/network-wifi.ui.h:59
 msgid "Switch off to connect to a Wi-Fi network"
 msgstr "Tắt kết nối vào mạng không dây"
 
-#: ../panels/network/network-wifi.ui.h:60
+#: ../panels/network/network-wifi.ui.h:54
 msgid "Network Name"
 msgstr "Tên mạng"
 
-#: ../panels/network/network-wifi.ui.h:61
+#: ../panels/network/network-wifi.ui.h:55
 msgid "Connected Devices"
 msgstr "Thiết bị đã kết nối"
 
-#: ../panels/network/network-wifi.ui.h:62
+#: ../panels/network/network-wifi.ui.h:56
 msgid "Security type"
 msgstr "Kiểu an ninh"
 
-#: ../panels/network/network-wifi.ui.h:63
+#: ../panels/network/network-wifi.ui.h:57
 #: ../panels/printers/authentication-dialog.ui.h:5
 #: ../panels/printers/new-printer-dialog.ui.h:14
 #: ../panels/user-accounts/data/account-dialog.ui.h:9
 msgid "Password"
 msgstr "Mật khẩu"
 
+#: ../panels/network/network-wifi.ui.h:59
+msgid "Turn Wi-Fi off"
+msgstr "Tắt Wi-Fi"
+
+#: ../panels/network/network-wifi.ui.h:60
+msgid "_Connect to Hidden Network…"
+msgstr "_Nối vào mạng ẩn…"
+
+#: ../panels/network/network-wifi.ui.h:61
+msgid "_Turn On Wi-Fi Hotspot…"
+msgstr "_Bật Wi-Fi Hotspot…"
+
+#: ../panels/network/network-wifi.ui.h:62
+msgid "_Known Wi-Fi Networks"
+msgstr "Mạng Wi-Fi đã _biết"
+
+#: ../panels/network/wifi.ui.h:1
+msgid "Make sure you have a Wi-Fi adapter plugged and turned on"
+msgstr "Hãy chắc chắn là bạn có thiết bị Wi-Fi và nó được bật"
+
+#: ../panels/network/wifi.ui.h:2
+msgid "No Wi-Fi Adapter Found"
+msgstr "Không tìm thấy thiết bị Wi-Fi nào"
+
+#: ../panels/network/wifi.ui.h:3
+msgid "Airplane Mode"
+msgstr "Chế độ máy bay"
+
+#: ../panels/network/wifi.ui.h:4
+msgid "Disables Wi-Fi, Bluetooth and mobile broadband"
+msgstr "Tắt Wi-Fi, Bluetooth và di động băng thông rộng"
+
+#: ../panels/network/wifi.ui.h:5
+msgid "Visible Networks"
+msgstr "Mạng thấy được"
+
+#: ../panels/network/wifi.ui.h:6
+msgid "NetworkManager needs to be running"
+msgstr "Trình quản lý kết nối mạng cần phải đang chạy"
+
 #. TRANSLATORS: AP type
 #: ../panels/network/panel-common.c:127
 msgid "Ad-hoc"
@@ -3320,7 +3300,7 @@ msgstr "không tìm thấy Modem"
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:388
 msgid "Bluetooth connection failed"
-msgstr "Lỗi kết nối Bluetooth"
+msgstr "Gặp lỗi khi kết nối Bluetooth"
 
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:392
@@ -3357,23 +3337,23 @@ msgstr "thiếu firmware"
 msgid "Cable unplugged"
 msgstr "Chưa cắm dây"
 
-#: ../panels/network/wireless-security/eap-method.c:69
-msgid "undefined error in 802.1x security (wpa-eap)"
-msgstr "lỗi chưa biết trong an ninh 802.1x (wpa-eap)"
+#: ../panels/network/wireless-security/eap-method.c:57
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "lỗi chưa biết trong an ninh 802.1X (wpa-eap)"
 
-#: ../panels/network/wireless-security/eap-method.c:245
+#: ../panels/network/wireless-security/eap-method.c:233
 msgid "no file selected"
 msgstr "chưa chọn tập tin"
 
-#: ../panels/network/wireless-security/eap-method.c:276
+#: ../panels/network/wireless-security/eap-method.c:264
 msgid "unspecified error validating eap-method file"
 msgstr "lỗi chưa định nghĩa khi xác thực lại tập tin eap-method"
 
-#: ../panels/network/wireless-security/eap-method.c:480
+#: ../panels/network/wireless-security/eap-method.c:439
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "Khóa riêng DER, PEM, hay PKCS#12 (*.der, *.pem, *.p12, *.key)"
 
-#: ../panels/network/wireless-security/eap-method.c:483
+#: ../panels/network/wireless-security/eap-method.c:442
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "Giấy phép DER hay PEM (*.der, *.pem, *.crt, *.cer)"
 
@@ -3383,13 +3363,13 @@ msgstr "thiếu tập tin EAP-FAST"
 
 #: ../panels/network/wireless-security/eap-method-fast.c:268
 #: ../panels/network/wireless-security/eap-method-peap.c:302
-#: ../panels/network/wireless-security/eap-method-ttls.c:333
+#: ../panels/network/wireless-security/eap-method-ttls.c:351
 msgid "GTC"
 msgstr "GTC"
 
 #: ../panels/network/wireless-security/eap-method-fast.c:283
 #: ../panels/network/wireless-security/eap-method-peap.c:272
-#: ../panels/network/wireless-security/eap-method-ttls.c:288
+#: ../panels/network/wireless-security/eap-method-ttls.c:289
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
@@ -3402,37 +3382,28 @@ msgid "PAC files (*.pac)"
 msgstr "Tập tin PAC (*.pac)"
 
 #: ../panels/network/wireless-security/eap-method-fast.ui.h:1
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:1
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:1
-#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1
-#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:1
-#: ../panels/printers/authentication-dialog.ui.h:1
-msgid " "
-msgstr " "
-
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
 msgid "Anonymous"
 msgstr "Nặc danh"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
 msgid "Authenticated"
 msgstr "Đã xác thực"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
 msgid "Both"
 msgstr "Cả hai"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
 msgid "PAC _file"
 msgstr "Tập tin _PAC"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:7
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
 msgid "_Inner authentication"
 msgstr "Xác thực _bên trong"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:8
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Cho phép PAC _dự liệu tự động"
 
@@ -3470,38 +3441,38 @@ msgstr ""
 "giấy chứng nhận CA EAP-PEAP không hợp lệ: chưa chỉ định giấy chứng nhận"
 
 #: ../panels/network/wireless-security/eap-method-peap.c:287
-#: ../panels/network/wireless-security/eap-method-ttls.c:318
-#: ../panels/network/wireless-security/wireless-security.c:439
+#: ../panels/network/wireless-security/eap-method-ttls.c:336
+#: ../panels/network/wireless-security/wireless-security.c:441
 msgid "MD5"
 msgstr "MD5"
 
 #: ../panels/network/wireless-security/eap-method-peap.c:381
 #: ../panels/network/wireless-security/eap-method-tls.c:501
-#: ../panels/network/wireless-security/eap-method-ttls.c:412
+#: ../panels/network/wireless-security/eap-method-ttls.c:430
 msgid "Choose a Certificate Authority certificate"
 msgstr "Chọn một giấy chứng nhận CA"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:3
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:2
 msgid "Version 0"
 msgstr "Phiên bản 0"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:4
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:3
 msgid "Version 1"
 msgstr "Phiên bản 1"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:6
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:5
 #: ../panels/network/wireless-security/eap-method-tls.ui.h:3
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:3
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:2
 msgid "C_A certificate"
 msgstr "Giấy chứng nhận C_A"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:7
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:6
 #: ../panels/network/wireless-security/eap-method-tls.ui.h:4
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:3
 msgid "No CA certificate is _required"
 msgstr "_Yêu cầu là không giấy chứng nhận CA"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:9
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
 msgid "PEAP _version"
 msgstr "_Phiên bản PEAP"
 
@@ -3546,9 +3517,9 @@ msgstr "Khóa riêng mà không được mã hóa là không an toàn"
 
 #: ../panels/network/wireless-security/eap-method-tls.c:319
 msgid ""
-"The selected private key does not appear to be protected by a password.  "
-"This could allow your security credentials to be compromised.  Please select "
-"a password-protected private key.\n"
+"The selected private key does not appear to be protected by a password. This "
+"could allow your security credentials to be compromised. Please select a "
+"password-protected private key.\n"
 "\n"
 "(You can password-protect your private key with openssl)"
 msgstr ""
@@ -3591,45 +3562,49 @@ msgid "invalid EAP-TTLS CA certificate: no certificate specified"
 msgstr ""
 "giấy chứng nhận CA EAP-TTLS không hợp lệ: chưa chỉ định giấy chứng nhận"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:258
+#: ../panels/network/wireless-security/eap-method-ttls.c:259
 msgid "PAP"
 msgstr "PAP"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:273
+#: ../panels/network/wireless-security/eap-method-ttls.c:274
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:303
+#: ../panels/network/wireless-security/eap-method-ttls.c:305
+msgid "MSCHAPv2 (no EAP)"
+msgstr "MSCHAPv2 (không EAP)"
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:321
 msgid "CHAP"
 msgstr "CHAP"
 
 #: ../panels/network/wireless-security/wireless-security.c:87
-msgid "Unknown error validating 802.1x security"
-msgstr "Lỗi thẩm tra an ninh 802.1x chưa biết"
+msgid "Unknown error validating 802.1X security"
+msgstr "Lỗi thẩm tra an ninh 802.1X chưa biết"
 
-#: ../panels/network/wireless-security/wireless-security.c:451
+#: ../panels/network/wireless-security/wireless-security.c:453
 msgid "TLS"
 msgstr "TLS"
 
-#: ../panels/network/wireless-security/wireless-security.c:475
+#: ../panels/network/wireless-security/wireless-security.c:477
 msgid "PWD"
 msgstr "PWD"
 
-#: ../panels/network/wireless-security/wireless-security.c:486
+#: ../panels/network/wireless-security/wireless-security.c:488
 msgid "FAST"
 msgstr "FAST"
 
-#: ../panels/network/wireless-security/wireless-security.c:497
+#: ../panels/network/wireless-security/wireless-security.c:499
 msgid "Tunneled TLS"
 msgstr "TLS Xuyên hầm"
 
-#: ../panels/network/wireless-security/wireless-security.c:508
+#: ../panels/network/wireless-security/wireless-security.c:510
 msgid "Protected EAP (PEAP)"
 msgstr "EAP được bảo vệ (PEAP)"
 
-#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:2
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:9
-#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:2
+#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:6
+#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:1
 msgid "Au_thentication"
 msgstr "_Xác thực"
 
@@ -3682,34 +3657,22 @@ msgid "1 (Default)"
 msgstr "1 (Mặc định)"
 
 #: ../panels/network/wireless-security/ws-wep-key.ui.h:2
-msgid "2"
-msgstr "2"
-
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:3
-msgid "3"
-msgstr "3"
-
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:4
-msgid "4"
-msgstr "4"
-
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:5
 msgid "Open System"
 msgstr "Hệ thống mở"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:6
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:3
 msgid "Shared Key"
 msgstr "Khóa chia sẻ"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:7
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:4
 msgid "_Key"
 msgstr "_Khóa"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:8
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:5
 msgid "Sho_w key"
 msgstr "_Hiện khóa"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:10
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:7
 msgid "WEP inde_x"
 msgstr "_Mục lục WEP"
 
@@ -3809,19 +3772,19 @@ msgstr "Khác"
 
 #. translators: This is the title of the "Show Account" dialog. The
 #. * %s is the name of the provider. e.g., 'Google'.
-#: ../panels/online-accounts/cc-online-accounts-panel.c:580
+#: ../panels/online-accounts/cc-online-accounts-panel.c:603
 #, c-format
 msgid "%s Account"
 msgstr "Tài khoản %s"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:872
+#: ../panels/online-accounts/cc-online-accounts-panel.c:895
 msgid "Error removing account"
 msgstr "Không thể xóa tài khoản"
 
 #. Translators: The %s is the username (eg., debarshi ray gmail com
 #. * or rishi).
 #.
-#: ../panels/online-accounts/cc-online-accounts-panel.c:937
+#: ../panels/online-accounts/cc-online-accounts-panel.c:960
 #, c-format
 msgid "<b>%s</b> removed"
 msgstr "<b>%s</b> đã bị xóa bỏ"
@@ -3846,7 +3809,9 @@ msgstr ""
 "Mail;Thư;Thu;Contact;Liên;lạc;Lien;lac;ownCloud;Kerberos;IMAP;SMTP;Pocket;"
 "ReadItLater;"
 
+#. Translators: This is the button which allows undoing the removal of the printer.
 #: ../panels/online-accounts/online-accounts.ui.h:1
+#: ../panels/printers/printers.ui.h:4
 msgid "Undo"
 msgstr "Hoàn tác"
 
@@ -3990,7 +3955,7 @@ msgstr "Máy tính"
 
 #. TRANSLATORS: secondary battery, misc
 #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801
-#: ../panels/power/cc-power-panel.c:2366
+#: ../panels/power/cc-power-panel.c:2356
 msgid "Battery"
 msgstr "Pin"
 
@@ -4004,7 +3969,7 @@ msgstr "Đang sạc"
 #: ../panels/power/cc-power-panel.c:622
 msgctxt "Battery power"
 msgid "Caution"
-msgstr "Coi chừng"
+msgstr "Thận trọng"
 
 #. TRANSLATORS: secondary battery
 #: ../panels/power/cc-power-panel.c:627
@@ -4042,85 +4007,89 @@ msgstr "Kh_i nghỉ"
 msgid "Power Saving"
 msgstr "Tiết kiệm năng lượng"
 
-#: ../panels/power/cc-power-panel.c:1716
+#: ../panels/power/cc-power-panel.c:1712
 msgid "_Screen brightness"
 msgstr "_Màn hình sáng tối đa"
 
-#: ../panels/power/cc-power-panel.c:1735
+#: ../panels/power/cc-power-panel.c:1731
 msgid "Automatic brightness"
 msgstr "Chỉnh độ sáng tự động"
 
-#: ../panels/power/cc-power-panel.c:1755
+#: ../panels/power/cc-power-panel.c:1751
 msgid "_Keyboard brightness"
 msgstr "Độ sáng _bàn phím"
 
-#: ../panels/power/cc-power-panel.c:1765
+#: ../panels/power/cc-power-panel.c:1761
 msgid "_Dim screen when inactive"
 msgstr "_Giảm sáng màn hình nếu máy không hoạt động"
 
-#: ../panels/power/cc-power-panel.c:1790
+#: ../panels/power/cc-power-panel.c:1786
 msgid "_Blank screen"
 msgstr "_Tắt màn hình"
 
-#: ../panels/power/cc-power-panel.c:1827
+#: ../panels/power/cc-power-panel.c:1823
 msgid "_Wi-Fi"
 msgstr "_Wi-Fi"
 
-#: ../panels/power/cc-power-panel.c:1832
+#: ../panels/power/cc-power-panel.c:1828
 msgid "Turn off Wi-Fi to save power."
 msgstr "Tắt Wi-Fi để tiết kiệm điện."
 
-#: ../panels/power/cc-power-panel.c:1857
+#: ../panels/power/cc-power-panel.c:1853
 msgid "_Mobile broadband"
 msgstr "Mạng _di động băng thông rộng"
 
-#: ../panels/power/cc-power-panel.c:1862
+#: ../panels/power/cc-power-panel.c:1858
 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power."
 msgstr ""
 "Tắt thiết bị di động băng thông rộng (3G, 4G, LTE, v.v..) để tiết kiệm điện."
 
-#: ../panels/power/cc-power-panel.c:1907
+#: ../panels/power/cc-power-panel.c:1903
 msgid "_Bluetooth"
 msgstr "_Bluetooth"
 
-#: ../panels/power/cc-power-panel.c:1970
+#: ../panels/power/cc-power-panel.c:1966
 msgid "When on battery power"
 msgstr "Khi sử dụng nguồn pin"
 
-#: ../panels/power/cc-power-panel.c:1972
+#: ../panels/power/cc-power-panel.c:1968
 msgid "When plugged in"
 msgstr "Khi cắm dây nguồn"
 
-#: ../panels/power/cc-power-panel.c:2067
+#: ../panels/power/cc-power-panel.c:2063
 msgid "Suspend"
 msgstr "Tạm ngưng"
 
-#: ../panels/power/cc-power-panel.c:2068
+#: ../panels/power/cc-power-panel.c:2064
+msgid "Power Off"
+msgstr "Tắt máy"
+
+#: ../panels/power/cc-power-panel.c:2065
 msgid "Hibernate"
 msgstr "Ngủ đông"
 
-#: ../panels/power/cc-power-panel.c:2069
+#: ../panels/power/cc-power-panel.c:2066
 msgid "Nothing"
 msgstr "Không gì"
 
 #. Frame header
-#: ../panels/power/cc-power-panel.c:2183
+#: ../panels/power/cc-power-panel.c:2180
 msgid "Suspend & Power Button"
 msgstr "Nút tạm ngưng & Tắt máy"
 
-#: ../panels/power/cc-power-panel.c:2226
+#: ../panels/power/cc-power-panel.c:2219
 msgid "_Automatic suspend"
 msgstr "_Tự động tạm dừng"
 
-#: ../panels/power/cc-power-panel.c:2227
+#: ../panels/power/cc-power-panel.c:2220
 msgid "Automatic suspend"
 msgstr "Tự động tạm dừng"
 
-#: ../panels/power/cc-power-panel.c:2294
+#: ../panels/power/cc-power-panel.c:2287
 msgid "_When the Power Button is pressed"
 msgstr "_Khi nút bật tắt nguồn được ấn"
 
-#: ../panels/power/cc-power-panel.c:2420 ../shell/alt/cc-window.c:273
+#: ../panels/power/cc-power-panel.c:2406 ../shell/cc-window.c:247
 #: ../shell/panel-list.ui.h:1
 msgid "Devices"
 msgstr "Thiết bị"
@@ -4215,28 +4184,43 @@ msgstr "Dùng nguồn _pin"
 msgid "Delay"
 msgstr "Khoảng trễ"
 
+#: ../panels/printers/authentication-dialog.ui.h:1
+msgid " "
+msgstr " "
+
 #: ../panels/printers/authentication-dialog.ui.h:3
 msgid "Authenticate"
 msgstr "Xác thực"
 
+#: ../panels/printers/authentication-dialog.ui.h:4
+#: ../panels/printers/new-printer-dialog.ui.h:13
+msgid "Username"
+msgstr "Tên người dùng"
+
 #: ../panels/printers/authentication-dialog.ui.h:6
 #: ../panels/printers/new-printer-dialog.ui.h:11
 msgid "Authentication Required"
 msgstr "Cần xác thực"
 
+#. Translators: %s is the printer name
+#: ../panels/printers/cc-printers-panel.c:718
+#, c-format
+msgid "Printer “%s” has been deleted"
+msgstr "Máy in “%s” đã bị xóa bỏ"
+
 #. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:713
+#: ../panels/printers/cc-printers-panel.c:909
 msgid "Failed to add new printer."
 msgstr "Không thể thêm máy in mới."
 
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:959
+#: ../panels/printers/cc-printers-panel.c:1221
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "Không thể tải giao diện: %s"
 
 #: ../panels/printers/details-dialog.ui.h:2
-#: ../panels/printers/printer-entry.ui.h:6
+#: ../panels/printers/printer-entry.ui.h:9
 msgid "Location"
 msgstr "Vị trí"
 
@@ -4313,9 +4297,12 @@ msgstr "Nhập địa chỉ mạng hoặc tìm kiếm máy in"
 msgid "Enter username and password to view printers on Print Server."
 msgstr "Nhận tên tài khoản và mật khẩu để xem các máy in trên Máy phục vụ in."
 
-#: ../panels/printers/options-dialog.ui.h:1
-msgid "Loading options…"
-msgstr "Tùy chọn tải…"
+#. Translators: This button triggers the printing of a test page.
+#. Translators: Name of job which makes printer to print test page
+#: ../panels/printers/options-dialog.ui.h:2
+#: ../panels/printers/pp-options-dialog.c:893
+msgid "Test Page"
+msgstr "Trang in thử"
 
 #. Translators: This is the title of the dialog. %s is the printer name.
 #: ../panels/printers/pp-details-dialog.c:123
@@ -4485,11 +4472,6 @@ msgstr "Cổng nối tiếp"
 msgid "Parallel Port"
 msgstr "Cổng song song"
 
-#. Translators: The found device is a printer connected via Bluetooth
-#: ../panels/printers/pp-new-printer-dialog.c:1816
-msgid "Bluetooth"
-msgstr "Bluetooth"
-
 #. Translators: Location of found network printer (e.g. Kitchen, Reception)
 #: ../panels/printers/pp-new-printer-dialog.c:1853
 #, c-format
@@ -4507,90 +4489,89 @@ msgstr "Địa chỉ: %s"
 msgid "Server requires authentication"
 msgstr "Máy chủ yêu cầu xác thực"
 
-#: ../panels/printers/pp-options-dialog.c:81
+#: ../panels/printers/pp-options-dialog.c:83
 msgid "Two Sided"
 msgstr "Hai mặt"
 
-#: ../panels/printers/pp-options-dialog.c:82
+#: ../panels/printers/pp-options-dialog.c:84
 msgid "Paper Type"
 msgstr "Kiểu giấy"
 
-#: ../panels/printers/pp-options-dialog.c:83
+#: ../panels/printers/pp-options-dialog.c:85
 msgid "Paper Source"
 msgstr "Nguồn giấy"
 
-# Name: don't translate / Tên: đừng dịch
-#: ../panels/printers/pp-options-dialog.c:84
+#: ../panels/printers/pp-options-dialog.c:86
 msgid "Output Tray"
 msgstr "Khay ra"
 
-#: ../panels/printers/pp-options-dialog.c:86
+#: ../panels/printers/pp-options-dialog.c:88
 msgid "GhostScript pre-filtering"
 msgstr "Tiền lọc GhostScript"
 
 #. Translators: This option sets number of pages printed on one sheet
-#: ../panels/printers/pp-options-dialog.c:533
+#: ../panels/printers/pp-options-dialog.c:534
 msgid "Pages per side"
 msgstr "Trang mỗi mặt"
 
 #. Translators: This option sets whether to print on both sides of paper
-#: ../panels/printers/pp-options-dialog.c:545
+#: ../panels/printers/pp-options-dialog.c:546
 msgid "Two-sided"
 msgstr "Hai mặt"
 
-#. Translators: This option sets orientation of print (portrait, landscape...)
-#: ../panels/printers/pp-options-dialog.c:557
-msgid "Orientation"
-msgstr "Hướng"
-
 #. Translators: "General" tab contains general printer options
-#: ../panels/printers/pp-options-dialog.c:654
+#: ../panels/printers/pp-options-dialog.c:655
 msgctxt "Printer Option Group"
 msgid "General"
 msgstr "Chung"
 
 #. Translators: "Page Setup" tab contains settings related to pages (page size, paper source, etc.)
-#: ../panels/printers/pp-options-dialog.c:657
+#: ../panels/printers/pp-options-dialog.c:658
 msgctxt "Printer Option Group"
 msgid "Page Setup"
 msgstr "Cài đặt giấy"
 
 #. Translators: "Installable Options" tab contains settings of presence of installed options (amount of RAM, 
duplex unit, etc.)
-#: ../panels/printers/pp-options-dialog.c:660
+#: ../panels/printers/pp-options-dialog.c:661
 msgctxt "Printer Option Group"
 msgid "Installable Options"
 msgstr "Tùy chọn có thể cài"
 
 #. Translators: "Job" tab contains settings for jobs
-#: ../panels/printers/pp-options-dialog.c:663
+#: ../panels/printers/pp-options-dialog.c:664
 msgctxt "Printer Option Group"
 msgid "Job"
 msgstr "Yêu cầu"
 
 #. Translators: "Image Quality" tab contains settings for quality of output print (e.g. resolution)
-#: ../panels/printers/pp-options-dialog.c:666
+#: ../panels/printers/pp-options-dialog.c:667
 msgctxt "Printer Option Group"
 msgid "Image Quality"
 msgstr "Chất lượng ảnh"
 
 #. Translators: "Color" tab contains color settings (e.g. color printing)
-#: ../panels/printers/pp-options-dialog.c:669
+#: ../panels/printers/pp-options-dialog.c:670
 msgctxt "Printer Option Group"
 msgid "Color"
 msgstr "Màu sắc"
 
 #. Translators: "Finishing" tab contains finishing settings (e.g. booklet printing)
-#: ../panels/printers/pp-options-dialog.c:672
+#: ../panels/printers/pp-options-dialog.c:673
 msgctxt "Printer Option Group"
 msgid "Finishing"
 msgstr "Hoàn tất"
 
 #. Translators: "Advanced" tab contains all others settings
-#: ../panels/printers/pp-options-dialog.c:675
+#: ../panels/printers/pp-options-dialog.c:676
 msgctxt "Printer Option Group"
 msgid "Advanced"
 msgstr "Nâng cao"
 
+#. Translators: Name of job which makes printer to print test page
+#: ../panels/printers/pp-options-dialog.c:908
+msgid "Test page"
+msgstr "Trang in thử"
+
 #. Translators: this is an option of "Paper Source"
 #: ../panels/printers/pp-ppd-option-widget.c:76
 #: ../panels/printers/pp-ppd-option-widget.c:78
@@ -4633,121 +4614,126 @@ msgid "Manufacturer"
 msgstr "Nhà sản xuất"
 
 #. Translators: This is the label of the button that opens the Jobs Dialog.
-#: ../panels/printers/pp-printer-entry.c:427
+#: ../panels/printers/pp-printer-entry.c:577
 msgid "No Active Jobs"
 msgstr "Yêu cầu in hoạt động"
 
 #. Translators: This is the label of the button that opens the Jobs Dialog.
-#: ../panels/printers/pp-printer-entry.c:432
+#: ../panels/printers/pp-printer-entry.c:582
 #, c-format
 msgid "%u Job"
 msgid_plural "%u Jobs"
 msgstr[0] "%u yêu cầu in"
 
 #. Translators: The printer is low on toner
-#: ../panels/printers/pp-printer-entry.c:560
+#: ../panels/printers/pp-printer-entry.c:730
 msgid "Low on toner"
 msgstr "Sắp hết mực"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/pp-printer-entry.c:562
+#: ../panels/printers/pp-printer-entry.c:732
 msgid "Out of toner"
 msgstr "Hết mực"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/pp-printer-entry.c:565
+#: ../panels/printers/pp-printer-entry.c:735
 msgid "Low on developer"
 msgstr "Sắp hết thuốc hiện hình"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/pp-printer-entry.c:568
+#: ../panels/printers/pp-printer-entry.c:738
 msgid "Out of developer"
 msgstr "Hết thuốc hiện hình"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/pp-printer-entry.c:570
+#: ../panels/printers/pp-printer-entry.c:740
 msgid "Low on a marker supply"
 msgstr "Sắp hết một ống mực"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/pp-printer-entry.c:572
+#: ../panels/printers/pp-printer-entry.c:742
 msgid "Out of a marker supply"
 msgstr "Một ống mực đã hết"
 
 #. Translators: One or more covers on the printer are open
-#: ../panels/printers/pp-printer-entry.c:574
+#: ../panels/printers/pp-printer-entry.c:744
 msgid "Open cover"
 msgstr "Mở nắp"
 
 #. Translators: One or more doors on the printer are open
-#: ../panels/printers/pp-printer-entry.c:576
+#: ../panels/printers/pp-printer-entry.c:746
 msgid "Open door"
 msgstr "Mở cửa"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/pp-printer-entry.c:578
+#: ../panels/printers/pp-printer-entry.c:748
 msgid "Low on paper"
 msgstr "Sắp hết giấy"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/pp-printer-entry.c:580
+#: ../panels/printers/pp-printer-entry.c:750
 msgid "Out of paper"
 msgstr "Hết giấy"
 
 #. Translators: The printer is offline
-#: ../panels/printers/pp-printer-entry.c:582
+#: ../panels/printers/pp-printer-entry.c:752
 msgctxt "printer state"
 msgid "Offline"
 msgstr "Ngoại tuyến"
 
 #. Translators: Someone has stopped the Printer
 #. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/pp-printer-entry.c:584
-#: ../panels/printers/pp-printer-entry.c:714
+#: ../panels/printers/pp-printer-entry.c:754
+#: ../panels/printers/pp-printer-entry.c:884
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "Dừng"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/pp-printer-entry.c:586
+#: ../panels/printers/pp-printer-entry.c:756
 msgid "Waste receptacle almost full"
 msgstr "Thùng chứa chất thải sắp đầy"
 
 #. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/pp-printer-entry.c:588
+#: ../panels/printers/pp-printer-entry.c:758
 msgid "Waste receptacle full"
 msgstr "Thùng chứa chất thải đã đầy"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/pp-printer-entry.c:590
+#: ../panels/printers/pp-printer-entry.c:760
 msgid "The optical photo conductor is near end of life"
 msgstr "Trống quang máy in sắp quá tuổi thọ"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/pp-printer-entry.c:592
+#: ../panels/printers/pp-printer-entry.c:762
 msgid "The optical photo conductor is no longer functioning"
 msgstr "Trống quang máy in không còn hoạt động được nữa"
 
 #. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/pp-printer-entry.c:700
+#: ../panels/printers/pp-printer-entry.c:870
 msgctxt "printer state"
 msgid "Ready"
 msgstr "Sẵn sàng"
 
 #. Translators: Printer's state (printer is ready but doesn't accept new jobs)
-#: ../panels/printers/pp-printer-entry.c:705
+#: ../panels/printers/pp-printer-entry.c:875
 msgctxt "printer state"
 msgid "Does not accept jobs"
 msgstr "Không chấp nhận lệnh in"
 
 #. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/pp-printer-entry.c:710
+#: ../panels/printers/pp-printer-entry.c:880
 msgctxt "printer state"
 msgid "Processing"
 msgstr "Đang xử lý"
 
+#. Translators: Name of job which makes printer to clean its heads
+#: ../panels/printers/pp-printer-entry.c:904
+msgid "Clean print heads"
+msgstr "Lau đầu in"
+
 #: ../panels/printers/printer-entry.ui.h:1
 msgid "Printing Options"
 msgstr "Tùy chọn in"
@@ -4756,29 +4742,35 @@ msgstr "Tùy chọn in"
 msgid "Printer Details"
 msgstr "Chi tiết máy in"
 
-#: ../panels/printers/printer-entry.ui.h:3
+#. Set this printer as default
+#: ../panels/printers/printer-entry.ui.h:4
 msgid "Use Printer by Default"
 msgstr "Dùng máy in theo mặc định"
 
-#: ../panels/printers/printer-entry.ui.h:4
+#. Translators: This button executes command which cleans print heads of the printer.
+#: ../panels/printers/printer-entry.ui.h:6
+msgid "Clean Print Heads"
+msgstr "Lau đầu in"
+
+#: ../panels/printers/printer-entry.ui.h:7
 msgid "Remove Printer"
 msgstr "Bỏ máy in"
 
-#: ../panels/printers/printer-entry.ui.h:5
+#: ../panels/printers/printer-entry.ui.h:8
 msgid "Model"
 msgstr "Kiểu"
 
-#: ../panels/printers/printer-entry.ui.h:7
+#: ../panels/printers/printer-entry.ui.h:10
 msgid "Ink Level"
 msgstr "Mức mực"
 
 #. Translators: This is the message which follows the printer error.
-#: ../panels/printers/printer-entry.ui.h:9
+#: ../panels/printers/printer-entry.ui.h:12
 msgid "Please restart when the problem is resolved."
 msgstr "Vui lòng khởi động lại khi trục trặc được giải quyết."
 
 #. Translators: This is the button which restarts the printer.
-#: ../panels/printers/printer-entry.ui.h:11
+#: ../panels/printers/printer-entry.ui.h:14
 msgid "Restart"
 msgstr "Khởi động lại"
 
@@ -4787,17 +4779,17 @@ msgstr "Khởi động lại"
 msgid "Add…"
 msgstr "Thêm…"
 
-#: ../panels/printers/printers.ui.h:3
+#: ../panels/printers/printers.ui.h:5
 msgid "No printers"
 msgstr "Không có máy in"
 
 #. Translators: This button adds new printer.
-#: ../panels/printers/printers.ui.h:5
+#: ../panels/printers/printers.ui.h:7
 msgid "Add a Printer…"
 msgstr "Thêm máy in…"
 
 #. Translators: The CUPS server is not running (we can not connect to it).
-#: ../panels/printers/printers.ui.h:7
+#: ../panels/printers/printers.ui.h:9
 msgid ""
 "Sorry! The system printing service\n"
 "doesn’t seem to be available."
@@ -5051,17 +5043,17 @@ msgstr "Dịch vụ _vị trí"
 msgid "_Automatic Problem Reporting"
 msgstr "Báo cáo trục trặc _tự động"
 
-#: ../panels/region/cc-format-chooser.c:120
+#: ../panels/region/cc-format-chooser.c:118
 msgctxt "measurement format"
 msgid "Imperial"
 msgstr "Anh-Mỹ"
 
-#: ../panels/region/cc-format-chooser.c:122
+#: ../panels/region/cc-format-chooser.c:120
 msgctxt "measurement format"
 msgid "Metric"
 msgstr "Hệ mét"
 
-#: ../panels/region/cc-format-chooser.c:287
+#: ../panels/region/cc-format-chooser.c:285
 msgid "No regions found"
 msgstr "Không tìm thấy lãnh thổ"
 
@@ -5069,16 +5061,16 @@ msgstr "Không tìm thấy lãnh thổ"
 msgid "No input sources found"
 msgstr "Không tìm thấy nguồn nhập liệu"
 
-#: ../panels/region/cc-input-chooser.c:992
+#: ../panels/region/cc-input-chooser.c:1012
 msgctxt "Input Source"
 msgid "Other"
 msgstr "Khác"
 
-#: ../panels/region/cc-region-panel.c:866
+#: ../panels/region/cc-region-panel.c:881
 msgid "No input source selected"
 msgstr "Chưa chọn nguồn nhập liệu"
 
-#: ../panels/region/cc-region-panel.c:1757
+#: ../panels/region/cc-region-panel.c:1773
 msgid "Login _Screen"
 msgstr "_Màn hình đăng nhập"
 
@@ -5100,14 +5092,18 @@ msgid "Times"
 msgstr "Thời gian"
 
 #: ../panels/region/format-chooser.ui.h:7
+msgid "Dates & Times"
+msgstr "Ngày & giờ"
+
+#: ../panels/region/format-chooser.ui.h:8
 msgid "Numbers"
 msgstr "Cách ghi số"
 
-#: ../panels/region/format-chooser.ui.h:8
+#: ../panels/region/format-chooser.ui.h:9
 msgid "Measurement"
 msgstr "Hệ đo lường"
 
-#: ../panels/region/format-chooser.ui.h:9
+#: ../panels/region/format-chooser.ui.h:10
 msgid "Paper"
 msgstr "Giấy"
 
@@ -5178,26 +5174,23 @@ msgid "Left+Right Alt"
 msgstr "Alt trái+phải"
 
 #: ../panels/region/region.ui.h:1
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
-msgid "Your session needs to be restarted for changes to take effect"
-msgstr ""
-"Phiên làm việc của bạn cần phải khởi động lại máy tính thì các thay đổi mới "
-"được áp dụng"
-
-#: ../panels/region/region.ui.h:2
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
-msgid "Restart Now"
-msgstr "Khởi động lại ngay"
-
-#: ../panels/region/region.ui.h:3
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
 msgid "_Language"
 msgstr "_Ngôn ngữ"
 
-#: ../panels/region/region.ui.h:4
+#: ../panels/region/region.ui.h:2
 msgid "English (United Kingdom)"
 msgstr "Tiếng Anh (Vương quốc Anh)"
 
+#: ../panels/region/region.ui.h:3
+msgid "Restart the session for changes to take effect"
+msgstr ""
+"Cần phải khởi động lại phiên làm việc thì các thay đổi mới được áp dụng"
+
+#: ../panels/region/region.ui.h:4
+msgid "Restart…"
+msgstr "Khởi động lại…"
+
 #: ../panels/region/region.ui.h:5
 msgid "_Formats"
 msgstr "Địn_h dạng"
@@ -5243,15 +5236,15 @@ msgid "Login settings are used by all users when logging into the system"
 msgstr ""
 "Cài đặt đăng nhập được dùng bởi mọi người dùng khi đăng nhập vào hệ thống"
 
-#: ../panels/search/cc-search-locations-dialog.c:634
+#: ../panels/search/cc-search-locations-dialog.c:639
 msgid "Select Location"
 msgstr "_Chọn vị trí"
 
-#: ../panels/search/cc-search-locations-dialog.c:638
+#: ../panels/search/cc-search-locations-dialog.c:643
 msgid "_OK"
 msgstr "Đồn_g ý"
 
-#: ../panels/search/cc-search-panel.c:177
+#: ../panels/search/cc-search-panel.c:178
 msgid "No applications found"
 msgstr "Không tìm thấy ứng dụng"
 
@@ -5307,32 +5300,32 @@ msgstr "Tùy thích"
 msgid "No networks selected for sharing"
 msgstr "Chưa chọn mạng để chia sẻ"
 
-#: ../panels/sharing/cc-sharing-panel.c:266
+#: ../panels/sharing/cc-sharing-panel.c:273
 msgctxt "service is enabled"
 msgid "On"
 msgstr "Bật"
 
-#: ../panels/sharing/cc-sharing-panel.c:268
-#: ../panels/sharing/cc-sharing-panel.c:295
+#: ../panels/sharing/cc-sharing-panel.c:275
+#: ../panels/sharing/cc-sharing-panel.c:302
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "Tắt"
 
-#: ../panels/sharing/cc-sharing-panel.c:298
+#: ../panels/sharing/cc-sharing-panel.c:305
 msgctxt "service is enabled"
 msgid "Enabled"
 msgstr "Bật"
 
-#: ../panels/sharing/cc-sharing-panel.c:301
+#: ../panels/sharing/cc-sharing-panel.c:308
 msgctxt "service is active"
 msgid "Active"
 msgstr "Hoạt động"
 
-#: ../panels/sharing/cc-sharing-panel.c:372
+#: ../panels/sharing/cc-sharing-panel.c:379
 msgid "Choose a Folder"
 msgstr "Chọn thư mục"
 
-#: ../panels/sharing/cc-sharing-panel.c:683
+#: ../panels/sharing/cc-sharing-panel.c:690
 #, c-format
 msgid ""
 "Personal File Sharing allows you to share your Public folder with others on "
@@ -5341,7 +5334,7 @@ msgstr ""
 "Chia sẻ Tập tin cá nhân cho phép bạn chia sẻ thư mục Công với những máy khác "
 "trong mạng hiện tại sử dụng: <a href=\"dav://%s\">dav://%s</a>"
 
-#: ../panels/sharing/cc-sharing-panel.c:685
+#: ../panels/sharing/cc-sharing-panel.c:692
 #, c-format
 msgid ""
 "When remote login is enabled, remote users can connect using the Secure "
@@ -5352,7 +5345,7 @@ msgstr ""
 "lệnh “Secure Shell” (ssh):\n"
 "<a href=\"ssh %s\">ssh %s</a>"
 
-#: ../panels/sharing/cc-sharing-panel.c:687
+#: ../panels/sharing/cc-sharing-panel.c:694
 #, c-format
 msgid ""
 "Screen sharing allows remote users to view or control your screen by "
@@ -5361,11 +5354,11 @@ msgstr ""
 "Chia sẻ màn hình cho phép người điều khiển từ xa có thể xem, điều khiển màn "
 "hình của bạn bằng cách kết nối đến: <a href=\"vnc://%s\">vnc://%s</a>"
 
-#: ../panels/sharing/cc-sharing-panel.c:799
+#: ../panels/sharing/cc-sharing-panel.c:806
 msgid "Copy"
 msgstr "Chép"
 
-#: ../panels/sharing/cc-sharing-panel.c:1125
+#: ../panels/sharing/cc-sharing-panel.c:1233
 msgid "Sharing"
 msgstr "Chia sẻ"
 
@@ -5575,7 +5568,7 @@ msgstr "_Hồ sơ:"
 
 #. translators:
 #. * The number of sound outputs on a particular device
-#: ../panels/sound/gvc/gvc-mixer-control.c:1837
+#: ../panels/sound/gvc/gvc-mixer-control.c:1873
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@@ -5583,13 +5576,13 @@ msgstr[0] "%u đầu ra"
 
 #. translators:
 #. * The number of sound inputs on a particular device
-#: ../panels/sound/gvc/gvc-mixer-control.c:1847
+#: ../panels/sound/gvc/gvc-mixer-control.c:1883
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
 msgstr[0] "%u đầu vào"
 
-#: ../panels/sound/gvc/gvc-mixer-control.c:2373
+#: ../panels/sound/gvc/gvc-mixer-control.c:2738
 msgid "System Sounds"
 msgstr "Âm thanh hệ thống"
 
@@ -5728,10 +5721,11 @@ msgctxt "cursor size"
 msgid "Largest"
 msgstr "Lớn nhất"
 
-#: ../panels/universal-access/cc-ua-panel.c:366
+#: ../panels/universal-access/cc-ua-panel.c:367
 #, c-format
-msgid "%d pixels"
-msgstr "%d điểm ảnh"
+msgid "%d pixel"
+msgid_plural "%d pixels"
+msgstr[0] "%d điểm ảnh"
 
 #. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2
@@ -5746,12 +5740,13 @@ msgstr "Làm cho việc xem, nghe, gõ, di và bấm chuột trở nên dễ dà
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5
 msgid ""
 "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
-"AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;"
+"AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;Repeat;Blink;"
 msgstr ""
-"Keyboard;Bàn;phím;Ban;phim;Mouse;Chuột;Chuot;Con;tro;a11y;Accessibility;"
-"Contrast;Tương;phản;Tuong;phan;Zoom;Phóng;Phong;Thu;Screen;Reader;Màn;hình;"
-"Man;hinh;text;chữ;chu;font;phông;phong;size;Kích;thước;Kich;thuoc;AccessX;"
-"Sticky;Dính;Dinh;Keys;phím;Slow;Keys;Chậm;Cham;Bounce;Dội;Doi;"
+"Keyboard;Bàn phím;Ban phim;Mouse;Chuột;Chuot;;a11y;Accessibility;Hỗ trợ truy "
+"cập;ho tro truy cap;Contrast;Tương phản;Tuong phan;Zoom;Phóng;Phong;Thu;"
+"Screen;Reader;Màn hình;Man hinh;text;chữ;chu;font;phông;phong;size;Kích "
+"thước;Kich thuoc;AccessX;Sticky;Dính;Dinh;Keys;phím;Slow;Chậm;Cham;Bounce;"
+"Dội;Doi;"
 
 #: ../panels/universal-access/uap.ui.h:1
 msgid "_Always Show Universal Access Menu"
@@ -6432,6 +6427,16 @@ msgstr "Đặt mật khẩu mới ngay"
 msgid "_Add User…"
 msgstr "_Thêm người dùng…"
 
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
+msgid "Your session needs to be restarted for changes to take effect"
+msgstr ""
+"Phiên làm việc của bạn cần phải khởi động lại máy tính thì các thay đổi mới "
+"được áp dụng"
+
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
+msgid "Restart Now"
+msgstr "Khởi động lại ngay"
+
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
 msgid "A_utomatic Login"
 msgstr "Đăng nhập _tự động"
@@ -6545,8 +6550,10 @@ msgstr "Hãy tránh sử dụng các chuỗi kế tiếp nhau như là 1234 hay
 
 #: ../panels/user-accounts/pw-utils.c:115
 msgctxt "Password hint"
-msgid "Try to add more letters, numbers and symbols."
-msgstr "Hãy thử thêm các chữ cái, chữ số và ký hiệu."
+msgid ""
+"Password needs to be longer. Try to add more letters, numbers and "
+"punctuation."
+msgstr "Mật khẩu cần dài hơn. Hãy thêm chữ cái, chữ số và dấu chấm câu."
 
 #: ../panels/user-accounts/pw-utils.c:117
 msgctxt "Password hint"
@@ -6556,41 +6563,8 @@ msgstr "Trộn chữ cái HOA và thường cùng với một chữ số hoặc
 #: ../panels/user-accounts/pw-utils.c:119
 msgctxt "Password hint"
 msgid ""
-"Good password! Adding more letters, numbers and punctuation will make it "
-"stronger."
-msgstr ""
-"Mật khẩu tốt! Thêm các chữ cái, chữ số và dấu chấm câu sẽ làm cho nó mạnh "
-"thêm."
-
-#: ../panels/user-accounts/pw-utils.c:141
-#: ../panels/user-accounts/pw-utils.c:171
-msgctxt "Password strength"
-msgid "Strength: Weak"
-msgstr "Mức an toàn: Yếu"
-
-#: ../panels/user-accounts/pw-utils.c:145
-#: ../panels/user-accounts/pw-utils.c:172
-msgctxt "Password strength"
-msgid "Strength: Low"
-msgstr "Mức an toàn: Thấp"
-
-#: ../panels/user-accounts/pw-utils.c:148
-#: ../panels/user-accounts/pw-utils.c:173
-msgctxt "Password strength"
-msgid "Strength: Medium"
-msgstr "Mức an toàn: Vừa"
-
-#: ../panels/user-accounts/pw-utils.c:151
-#: ../panels/user-accounts/pw-utils.c:174
-msgctxt "Password strength"
-msgid "Strength: Good"
-msgstr "Mức an toàn: Tốt"
-
-#: ../panels/user-accounts/pw-utils.c:154
-#: ../panels/user-accounts/pw-utils.c:175
-msgctxt "Password strength"
-msgid "Strength: High"
-msgstr "Mức an toàn: Cao"
+"Adding more letters, numbers and punctuation will make the password stronger."
+msgstr "Thêm các chữ cái, chữ số và dấu chấm câu sẽ làm cho nó mạnh thêm."
 
 #: ../panels/user-accounts/run-passwd.c:422
 msgid "Authentication failed"
@@ -6649,25 +6623,25 @@ msgstr "Nên khớp với địa chỉ web của nhà cung cấp tài khoản ch
 msgid "Failed to add account"
 msgstr "Gặp lỗi khi thêm tài khoản"
 
-#: ../panels/user-accounts/um-account-dialog.c:463
+#: ../panels/user-accounts/um-account-dialog.c:462
 msgid "Passwords do not match."
 msgstr "Mật khẩu không khớp nhau."
 
-#: ../panels/user-accounts/um-account-dialog.c:718
-#: ../panels/user-accounts/um-account-dialog.c:764
-#: ../panels/user-accounts/um-account-dialog.c:785
+#: ../panels/user-accounts/um-account-dialog.c:717
+#: ../panels/user-accounts/um-account-dialog.c:763
+#: ../panels/user-accounts/um-account-dialog.c:784
 msgid "Failed to register account"
 msgstr "Gặp lỗi khi đăng ký tài khoản"
 
-#: ../panels/user-accounts/um-account-dialog.c:908
+#: ../panels/user-accounts/um-account-dialog.c:907
 msgid "No supported way to authenticate with this domain"
 msgstr "Không có cách xác thực được hỗ trợ nào với miền này"
 
-#: ../panels/user-accounts/um-account-dialog.c:981
+#: ../panels/user-accounts/um-account-dialog.c:980
 msgid "Failed to join domain"
 msgstr "Gặp lỗi khi gia nhập miền"
 
-#: ../panels/user-accounts/um-account-dialog.c:1042
+#: ../panels/user-accounts/um-account-dialog.c:1041
 msgid ""
 "That login name didn’t work.\n"
 "Please try again."
@@ -6675,7 +6649,7 @@ msgstr ""
 "Tên tài khoản đăng nhập đó không đúng.\n"
 "Vui lòng thử lại."
 
-#: ../panels/user-accounts/um-account-dialog.c:1049
+#: ../panels/user-accounts/um-account-dialog.c:1048
 msgid ""
 "That login password didn’t work.\n"
 "Please try again."
@@ -6683,12 +6657,12 @@ msgstr ""
 "Mật khẩu đăng nhập đó không đúng.\n"
 "Vui lòng thử lại."
 
-#: ../panels/user-accounts/um-account-dialog.c:1057
+#: ../panels/user-accounts/um-account-dialog.c:1056
 msgid "Failed to log into domain"
 msgstr "Gặp lỗi khi đăng nhập miền"
 
-#: ../panels/user-accounts/um-account-dialog.c:1115
-msgid "Unable find the domain. Maybe you misspelled it?"
+#: ../panels/user-accounts/um-account-dialog.c:1114
+msgid "Unable to find the domain. Maybe you misspelled it?"
 msgstr "Không thể tìm thấy miền. Có lẽ bạn gõ sai chăng?"
 
 #: ../panels/user-accounts/um-account-type.c:34
@@ -6852,39 +6826,39 @@ msgstr "Phiên được bắt đầu"
 msgid "%s — Account Activity"
 msgstr "%s - Sự hoạt động của tài khoản"
 
-#: ../panels/user-accounts/um-password-dialog.c:145
+#: ../panels/user-accounts/um-password-dialog.c:144
 msgid "Please choose another password."
 msgstr "Vui lòng chọn mật khẩu khác."
 
-#: ../panels/user-accounts/um-password-dialog.c:154
+#: ../panels/user-accounts/um-password-dialog.c:153
 msgid "Please type your current password again."
 msgstr "Hãy gõ mật khẩu hiện tại một lần nữa."
 
-#: ../panels/user-accounts/um-password-dialog.c:160
+#: ../panels/user-accounts/um-password-dialog.c:159
 msgid "Password could not be changed"
 msgstr "Mật khẩu của bạn không thể bị thay đổi"
 
-#: ../panels/user-accounts/um-password-dialog.c:286
+#: ../panels/user-accounts/um-password-dialog.c:285
 msgid "The passwords do not match."
 msgstr "Mật khẩu không khớp nhau."
 
-#: ../panels/user-accounts/um-photo-dialog.c:215
+#: ../panels/user-accounts/um-photo-dialog.c:218
 msgid "Browse for more pictures"
 msgstr "Duyệt thêm ảnh"
 
-#: ../panels/user-accounts/um-photo-dialog.c:449
+#: ../panels/user-accounts/um-photo-dialog.c:452
 msgid "Disable image"
 msgstr "Tắt ảnh"
 
-#: ../panels/user-accounts/um-photo-dialog.c:467
+#: ../panels/user-accounts/um-photo-dialog.c:470
 msgid "Take a photo…"
 msgstr "Chụp ảnh…"
 
-#: ../panels/user-accounts/um-photo-dialog.c:485
+#: ../panels/user-accounts/um-photo-dialog.c:488
 msgid "Browse for more pictures…"
 msgstr "Duyệt thêm ảnh…"
 
-#: ../panels/user-accounts/um-photo-dialog.c:703
+#: ../panels/user-accounts/um-photo-dialog.c:714
 #, c-format
 msgid "Used by %s"
 msgstr "Được dùng bởi %s"
@@ -7068,6 +7042,11 @@ msgstr ""
 msgid "Map Buttons"
 msgstr "Ánh xạ nút"
 
+#: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:547
+#: ../panels/wacom/gnome-wacom-properties.ui.h:5
+msgid "_Close"
+msgstr "Đón_g"
+
 #: ../panels/wacom/button-mapping.ui.h:3
 msgid "Map buttons to functions"
 msgstr "Ánh xạ nút sang chức năng"
@@ -7136,7 +7115,7 @@ msgstr "Ánh xạ sang màn hình đơn"
 msgid "%d of %d"
 msgstr "%d / %d"
 
-#: ../panels/wacom/cc-wacom-page.c:502
+#: ../panels/wacom/cc-wacom-page.c:544
 msgid "Display Mapping"
 msgstr "Hiện ánh xạ"
 
@@ -7281,11 +7260,27 @@ msgstr "Cảm giác ấn ngón"
 msgid "page 3"
 msgstr "trang 3"
 
-#: ../shell/alt/cc-window.c:766 ../shell/cc-window.c:53
-#: ../shell/cc-window.c:1484
+#: ../shell/alt/cc-window.c:53 ../shell/alt/cc-window.c:1484
+#: ../shell/cc-window.c:730
 msgid "All Settings"
 msgstr "Mọi cài đặt"
 
+#. Add categories
+#: ../shell/alt/cc-window.c:875
+msgctxt "category"
+msgid "Personal"
+msgstr "Cá nhân"
+
+#: ../shell/alt/cc-window.c:876
+msgctxt "category"
+msgid "Hardware"
+msgstr "Phần cứng"
+
+#: ../shell/alt/cc-window.c:877
+msgctxt "category"
+msgid "System"
+msgstr "Hệ thống"
+
 #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1
 msgid "GNOME Control Center"
 msgstr "Trung tâm điều khiển GNOME"
@@ -7342,22 +7337,6 @@ msgstr "Trợ giúp"
 msgid "Quit"
 msgstr "Thoát"
 
-#. Add categories
-#: ../shell/cc-window.c:875
-msgctxt "category"
-msgid "Personal"
-msgstr "Cá nhân"
-
-#: ../shell/cc-window.c:876
-msgctxt "category"
-msgid "Hardware"
-msgstr "Phần cứng"
-
-#: ../shell/cc-window.c:877
-msgctxt "category"
-msgid "System"
-msgstr "Hệ thống"
-
 #: ../shell/gnome-control-center.desktop.in.in.h:2
 msgid "Preferences;Settings;"
 msgstr ""
@@ -7404,6 +7383,209 @@ msgstr "Điểm truy cập"
 msgid "No results found"
 msgstr "Không tìm thấy kết quả nào"
 
+#~ msgid "Lid Closed"
+#~ msgstr "Nắp đã đóng"
+
+#~ msgid "Mirrored"
+#~ msgstr "Hiển thị giống nhau"
+
+#~ msgid "Primary"
+#~ msgstr "Chính"
+
+#~ msgid "Secondary"
+#~ msgstr "Phụ"
+
+#~ msgid "Arrange Combined Displays"
+#~ msgstr "Sắp xếp màn hình hiển thị tổ hợp"
+
+#~ msgid "Drag displays to rearrange them"
+#~ msgstr "Kéo các bộ hiển thị để sắp xếp chúng"
+
+#~ msgid "%d Hz (NTSC)"
+#~ msgstr "%d Hz (NTSC)"
+
+#~ msgid "%d Hz"
+#~ msgstr "%d Hz"
+
+#~ msgid "Rotate counterclockwise by 90°"
+#~ msgstr "Quay ngược chiều kim đồng hồ 90°"
+
+#~ msgid "Rotate by 180°"
+#~ msgstr "Quay 180°"
+
+#~ msgid "Rotate clockwise by 90°"
+#~ msgstr "Quay xuôi chiều kim đồng hồ 90°"
+
+#~ msgid "Size"
+#~ msgstr "Cỡ"
+
+#~ msgid "Aspect Ratio"
+#~ msgstr "Tỷ lệ màn hình"
+
+#~ msgid "Show the top bar and Activities Overview on this display"
+#~ msgstr ""
+#~ "Hiển thị thanh đỉnh và “Tổng quan hoạt động” trên màn hình hiển thị này"
+
+#~ msgid "Join this display with another to create an extra workspace"
+#~ msgstr "Nối hai màn hình để tạo không gian làm việc rộng hơn"
+
+#~ msgid "Presentation"
+#~ msgstr "Trình diễn"
+
+#~ msgid "Show slideshows and media only"
+#~ msgstr "Chỉ hiển thị phần trình diễn và đa phương tiện"
+
+#~ msgid "Show your existing view on both displays"
+#~ msgstr "Cả hai màn hình hiện cùng nội dung"
+
+#~ msgid "Turn Off"
+#~ msgstr "_Tắt"
+
+#~ msgid "Don’t use this display"
+#~ msgstr "Không dùng màn hình này"
+
+#~ msgid "_Arrange Combined Displays"
+#~ msgstr "_Sắp xếp màn hình hiển thị tổ hợp"
+
+#~ msgid "Server"
+#~ msgstr "Máy chủ"
+
+#~ msgid "Delete DNS Server"
+#~ msgstr "Xóa máy chủ DNS"
+
+#~ msgid "Proxy"
+#~ msgstr "Ủy nhiệm"
+
+#~ msgid "_Add Profile…"
+#~ msgstr "_Thêm hồ sơ…"
+
+#~ msgctxt "proxy method"
+#~ msgid "None"
+#~ msgstr "Không có"
+
+#~ msgctxt "proxy method"
+#~ msgid "Manual"
+#~ msgstr "Thủ công"
+
+#~ msgctxt "proxy method"
+#~ msgid "Automatic"
+#~ msgstr "Tự động"
+
+#~ msgid "_Method"
+#~ msgstr "_Phương thức"
+
+#~ msgid "Add Device"
+#~ msgstr "Thêm thiết bị"
+
+#~ msgid "Remove Device"
+#~ msgstr "Gỡ bỏ thiết bị"
+
+#~ msgid "VPN Type"
+#~ msgstr "Kiểu VPN"
+
+#~ msgid "Group Name"
+#~ msgstr "Tên nhóm"
+
+#~ msgid "Group Password"
+#~ msgstr "Mật khẩu nhóm"
+
+#~ msgid "_Use as Hotspot…"
+#~ msgstr "_Dùng làm điểm truy cập…"
+
+#~ msgid "_History"
+#~ msgstr "_Lịch sử"
+
+#~ msgid "%s %d-bit (Build ID: %s)"
+#~ msgstr "%s %d-bit (Mã số biên dịch: %s)"
+
+#~ msgid "%s %d-bit"
+#~ msgstr "%s %d-bít"
+
+#~ msgid "Base system"
+#~ msgstr "Hệ thống nền"
+
+#~ msgid "Shortcut;Repeat;Blink;"
+#~ msgstr "Shortcut;Phím;tắt;phim;tat;Repeat;Lặp;lap;Blink;Nháy;nhay;"
+
+#~ msgid "Press Esc to cancel."
+#~ msgstr "Nhấn phím Esc để thôi."
+
+#~ msgid "Reset"
+#~ msgstr "Đặt lại"
+
+#~ msgid "Make available to other _users"
+#~ msgstr "Cho người dùng _khác sử dụng"
+
+#~ msgid "Firewall _Zone"
+#~ msgstr "_Vùng tường lửa"
+
+#~ msgctxt "Firewall zone"
+#~ msgid "Default"
+#~ msgstr "Mặc định"
+
+#~ msgid "The zone defines the trust level of the connection"
+#~ msgstr "Đây là vùng định nghĩa mức tin cậy của kết nối"
+
+#~ msgid ""
+#~ "Reset the settings for this network, including passwords, but remember it "
+#~ "as a preferred network"
+#~ msgstr ""
+#~ "Đặt lại toàn bộ cài đặt cho mạng này, bao gồm mật khẩu, nhưng vẫn ghi nhớ "
+#~ "nó là mạng ưa dùng"
+
+#~ msgid ""
+#~ "Remove all details relating to this network and do not try to "
+#~ "automatically connect"
+#~ msgstr ""
+#~ "Xóa bỏ mọi thông tin chi tiết liên quan đến mạng và không kết nối tự động"
+
+#~ msgid ""
+#~ "If you have a connection to the Internet other than wireless, you can set "
+#~ "up a wireless hotspot to share the connection with others."
+#~ msgstr ""
+#~ "Nếu bạn có kết nối Internet không phải không dây, bạn có thể cài đặt một "
+#~ "điểm kết nối không dây (hotspot) để chia sẻ kết nối Internet với người "
+#~ "khác."
+
+#~ msgid "History"
+#~ msgstr "Lịch sử"
+
+#~ msgid "2"
+#~ msgstr "2"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgid "Loading options…"
+#~ msgstr "Tùy chọn tải…"
+
+#~ msgctxt "Password hint"
+#~ msgid "Try to add more letters, numbers and symbols."
+#~ msgstr "Hãy thử thêm các chữ cái, chữ số và ký hiệu."
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Weak"
+#~ msgstr "Mức an toàn: Yếu"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Low"
+#~ msgstr "Mức an toàn: Thấp"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Medium"
+#~ msgstr "Mức an toàn: Vừa"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Good"
+#~ msgstr "Mức an toàn: Tốt"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: High"
+#~ msgstr "Mức an toàn: Cao"
+
 #~ msgid "Edit"
 #~ msgstr "Chỉnh sửa"
 
@@ -7476,9 +7658,6 @@ msgstr "Không tìm thấy kết quả nào"
 #~ msgid_plural "%u active"
 #~ msgstr[0] "%u đang hoạt động"
 
-#~ msgid "Test page"
-#~ msgstr "Trang in thử"
-
 #~ msgid "Supply"
 #~ msgstr "Nguyên liệu in"
 
@@ -7843,9 +8022,6 @@ msgstr "Không tìm thấy kết quả nào"
 #~ msgid "Pause Printing"
 #~ msgstr "Tạm ngừng in"
 
-#~ msgid "Cancel Print Job"
-#~ msgstr "Hủy tác vụ in"
-
 #~ msgctxt "print job"
 #~ msgid "Held"
 #~ msgstr "Đang giữ"
@@ -7890,9 +8066,6 @@ msgstr "Không tìm thấy kết quả nào"
 #~ msgid "When battery power is _critical"
 #~ msgstr "Khi nguồn pin _cực thấp"
 
-#~ msgid "Power Off"
-#~ msgstr "Tắt máy"
-
 #~ msgid "Power off"
 #~ msgstr "Tắt máy"
 
@@ -7956,6 +8129,3 @@ msgstr "Không tìm thấy kết quả nào"
 
 #~ msgid "Set Up New Device"
 #~ msgstr "Cài đặt thiết bị mới"
-
-#~ msgid "Connection"
-#~ msgstr "Kết nối"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]