[gnome-control-center] Updated Vietnamese translation

[Trần Ngọc Quân <tnquan src gnome org>]

commit 789af820239c0ba5b339938e39a1d68b82dbd3a1
Author: Trần Ngọc Quân <vnwildman gmail com>
Date:   Wed Sep 7 14:27:33 2016 +0700

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

 po/vi.po | 2132 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 1197 insertions(+), 935 deletions(-)
---
diff --git a/po/vi.po b/po/vi.po
index 7f584bc..e9329f9 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: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
 "control-center&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-03-25 20:57+0000\n"
-"PO-Revision-Date: 2016-03-26 14:30+0700\n"
+"POT-Creation-Date: 2016-09-06 14:57+0000\n"
+"PO-Revision-Date: 2016-09-07 14:26+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"
@@ -93,7 +93,7 @@ msgstr "Không tìm thấy ảnh nào"
 #. * directory in the string below when XDG_PICTURES_DIR is
 #. * undefined
 #: ../panels/background/cc-background-chooser-dialog.c:561
-#: ../panels/search/cc-search-locations-dialog.c:274
+#: ../panels/search/cc-search-locations-dialog.c:302
 msgid "Home"
 msgstr "Thư mục chứa ảnh"
 
@@ -108,25 +108,24 @@ msgstr "Bạn có thể thêm ảnh vào thư mục %s của mình và chúng s
 #: ../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:1563
-#: ../panels/display/cc-display-panel.c:2196
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
+#: ../panels/display/cc-display-panel.c:1561
+#: ../panels/display/cc-display-panel.c:2206
 #: ../panels/network/connection-editor/connection-editor.ui.h:1
-#: ../panels/network/connection-editor/vpn-helpers.c:245
-#: ../panels/network/connection-editor/vpn-helpers.c:374
-#: ../panels/network/net-device-wifi.c:1269
-#: ../panels/network/net-device-wifi.c:1462
+#: ../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/network-wifi.ui.h:1
-#: ../panels/printers/cc-printers-panel.c:2052
+#: ../panels/printers/cc-printers-panel.c:2076
 #: ../panels/printers/new-printer-dialog.ui.h:2
-#: ../panels/privacy/cc-privacy-panel.c:982
+#: ../panels/privacy/cc-privacy-panel.c:1048
 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2
-#: ../panels/search/cc-search-locations-dialog.c:681
+#: ../panels/search/cc-search-locations-dialog.c:637
 #: ../panels/sharing/cc-sharing-panel.c:372
-#: ../panels/user-accounts/data/account-dialog.ui.h:17
+#: ../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-account-dialog.c:1476
-#: ../panels/user-accounts/um-fingerprint-dialog.c:264
+#: ../panels/user-accounts/um-fingerprint-dialog.c:265
 #: ../panels/user-accounts/um-photo-dialog.c:94
 #: ../panels/user-accounts/um-photo-dialog.c:217
 #: ../panels/user-accounts/um-user-panel.c:705
@@ -157,16 +156,17 @@ msgstr "Không có ảnh nền"
 msgid "Current background"
 msgstr "Ảnh nền hiện tại"
 
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:1
-msgid "Background"
+#. 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/background/gnome-background-panel.desktop.in.in.h:2
+msgid "Back­ground"
 msgstr "Ảnh nền"
 
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:2
+#: ../panels/background/gnome-background-panel.desktop.in.in.h:3
 msgid "Change your background image to a wallpaper or photo"
 msgstr "Thay đổi ảnh nền màn hình"
 
 #. Translators: those are keywords for the background control-center panel
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:4
+#: ../panels/background/gnome-background-panel.desktop.in.in.h:5
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "Wallpaper;Ảnh;nền;Anh;nen;Screen;Màn;hình;Man;hinh;Desktop;"
 
@@ -206,18 +206,17 @@ msgstr "Chế độ máy bay được bật"
 msgid "Turn off the Airplane mode switch to enable Bluetooth."
 msgstr "Tắt chế độ máy bay chuyển sang bật Bluetooth."
 
-#. Translators: The found device is a printer connected via Bluetooth
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1
-#: ../panels/printers/pp-new-printer-dialog.c:1676
-msgid "Bluetooth"
-msgstr "Bluetooth"
-
+#. 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/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2
+msgid "Blue­tooth"
+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ị"
 
 #. Translators: those are keywords for the bluetooth control-center panel
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5
 msgid "share;sharing;bluetooth;obex;"
 msgstr "share;chia sẻ;chia se;sharing;bluetooth;obex;"
 
@@ -387,7 +386,7 @@ msgstr "Các hồ sơ ICC được hỗ trợ"
 
 #. TRANSLATORS: filter name on the file->open dialog
 #: ../panels/color/cc-color-panel.c:244
-#: ../panels/network/wireless-security/eap-method-fast.c:420
+#: ../panels/network/wireless-security/eap-method-fast.c:417
 msgid "All files"
 msgstr "Mọi tập tin"
 
@@ -426,7 +425,7 @@ msgid "Save Profile"
 msgstr "Lưu hồ sơ"
 
 #: ../panels/color/cc-color-panel.c:964
-#: ../panels/network/connection-editor/vpn-helpers.c:375
+#: ../panels/network/connection-editor/vpn-helpers.c:311
 msgid "_Save"
 msgstr "_Lưu"
 
@@ -684,7 +683,7 @@ msgstr ""
 "href=\"windows\">Microsoft Windows</a> một cách hữu ích."
 
 #: ../panels/color/color.ui.h:27
-#: ../panels/user-accounts/um-fingerprint-dialog.c:729
+#: ../panels/user-accounts/um-fingerprint-dialog.c:730
 msgid "Summary"
 msgstr "Tóm tắt"
 
@@ -696,11 +695,11 @@ msgstr "Thêm hồ sơ"
 msgid "_Import File…"
 msgstr "Nhậ_p tập tin…"
 
-#: ../panels/color/color.ui.h:31 ../panels/keyboard/gnome-keyboard-panel.ui.h:3
-#: ../panels/network/connection-editor/net-connection-editor.c:518
+#: ../panels/color/color.ui.h:31
+#: ../panels/network/connection-editor/net-connection-editor.c:546
 #: ../panels/printers/new-printer-dialog.ui.h:3
 #: ../panels/region/input-chooser.ui.h:3
-#: ../panels/user-accounts/um-account-dialog.c:1477
+#: ../panels/user-accounts/data/account-dialog.ui.h:3
 msgid "_Add"
 msgstr "_Thêm"
 
@@ -850,11 +849,12 @@ msgstr "D65 (Nhiếp ảnh và đồ họa)"
 msgid "D75"
 msgstr "D75"
 
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
-msgid "Color"
-msgstr "Màu sắc"
-
+#. 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/color/gnome-color-panel.desktop.in.in.h:2
+msgid "Co­lor"
+msgstr "Màu"
+
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:3
 msgid ""
 "Calibrate the color of your devices, such as displays, cameras or printers"
 msgstr ""
@@ -862,7 +862,7 @@ msgstr ""
 "in"
 
 #. Translators: those are keywords for the color control-center panel
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:4
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:5
 msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
 msgstr ""
 "Color;Màu;Mau;ICC;Profile;Calibrate;Chinh;Printer;Máy;in;May;Display;Màn;"
@@ -882,23 +882,23 @@ msgstr "Còn nữa…"
 msgid "No languages found"
 msgstr "Không tìm thấy ngôn ngữ"
 
-#: ../panels/common/cc-util.c:125
-#: ../panels/network/connection-editor/ce-page-details.c:102
+#: ../panels/common/cc-util.c:127
+#: ../panels/network/connection-editor/ce-page-details.c:100
 msgid "Today"
 msgstr "Hôm nay"
 
-#: ../panels/common/cc-util.c:129
-#: ../panels/network/connection-editor/ce-page-details.c:104
+#: ../panels/common/cc-util.c:131
+#: ../panels/network/connection-editor/ce-page-details.c:102
 msgid "Yesterday"
 msgstr "Hôm qua"
 
 #. Translators: This is a date format string in the style of "Feb 24".
-#: ../panels/common/cc-util.c:136
+#: ../panels/common/cc-util.c:138
 msgid "%b %e"
 msgstr "%e %b"
 
 #. Translators: This is a date format string in the style of "Feb 24, 2013".
-#: ../panels/common/cc-util.c:141
+#: ../panels/common/cc-util.c:143
 msgid "%b %e, %Y"
 msgstr "%e %b, %Y"
 
@@ -1018,8 +1018,9 @@ msgstr "Tháng mười một"
 msgid "December"
 msgstr "Tháng mười hai"
 
+#. 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/datetime/datetime.ui.h:13
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1
+#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
 msgid "Date & Time"
 msgstr "Ngày & giờ"
 
@@ -1074,14 +1075,14 @@ msgstr "24-giờ"
 
 #: ../panels/datetime/datetime.ui.h:27
 msgid "AM / PM"
-msgstr "AM / PM"
+msgstr "SA / CH"
 
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
+#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3
 msgid "Change the date and time, including time zone"
 msgstr "Thay đổi ngày giờ hay múi giờ"
 
 #. Translators: those are keywords for the date and time control-center panel
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4
+#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5
 msgid "Clock;Timezone;Location;"
 msgstr ""
 "Clock;Đồng;hồ;Dong;ho;Timezone;Múi;giờ;Mui;gio;Location;Vị;trí;Vi;tri;nước;"
@@ -1095,209 +1096,224 @@ 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:575
+#: ../panels/display/cc-display-panel.c:573
 msgid "Lid Closed"
 msgstr "Nắp đã đóng"
 
 #. translators: "Mirrored" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:578
+#: ../panels/display/cc-display-panel.c:576
 msgid "Mirrored"
 msgstr "Hiển thị giống nhau"
 
-#: ../panels/display/cc-display-panel.c:580
-#: ../panels/display/cc-display-panel.c:2390
+#: ../panels/display/cc-display-panel.c:578
+#: ../panels/display/cc-display-panel.c:2429
 msgid "Primary"
 msgstr "Chính"
 
-#: ../panels/display/cc-display-panel.c:582
+#: ../panels/display/cc-display-panel.c:580
 #: ../panels/notifications/cc-notifications-panel.c:257
-#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938
-#: ../panels/privacy/cc-privacy-panel.c:172
-#: ../panels/privacy/cc-privacy-panel.c:239
+#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971
+#: ../panels/privacy/cc-privacy-panel.c:190
+#: ../panels/privacy/cc-privacy-panel.c:257
 #: ../panels/universal-access/cc-ua-panel.c:269
-#: ../panels/universal-access/cc-ua-panel.c:582
-#: ../panels/universal-access/cc-ua-panel.c:595
-#: ../panels/universal-access/cc-ua-panel.c:607
-#: ../panels/universal-access/cc-ua-panel.c:778
+#: ../panels/universal-access/cc-ua-panel.c:590
+#: ../panels/universal-access/cc-ua-panel.c:603
+#: ../panels/universal-access/cc-ua-panel.c:615
+#: ../panels/universal-access/cc-ua-panel.c:786
 #: ../panels/universal-access/uap.ui.h:6
 msgid "Off"
 msgstr "Tắt"
 
-#: ../panels/display/cc-display-panel.c:585
+#: ../panels/display/cc-display-panel.c:583
 msgid "Secondary"
 msgstr "Phụ"
 
 #. Title of displays dialog when multiple monitors are present.
-#: ../panels/display/cc-display-panel.c:1560
+#: ../panels/display/cc-display-panel.c:1558
 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:1564
-#: ../panels/display/cc-display-panel.c:2197
+#: ../panels/display/cc-display-panel.c:1562
+#: ../panels/display/cc-display-panel.c:2207
 #: ../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:1588
+#: ../panels/display/cc-display-panel.c:1586
 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:1794
+#: ../panels/display/cc-display-panel.c:1793
 #, c-format
 msgid "%d Hz (NTSC)"
 msgstr "%d Hz (NTSC)"
 
 #. translators: example string is "60 Hz"
-#: ../panels/display/cc-display-panel.c:1800
+#: ../panels/display/cc-display-panel.c:1799
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../panels/display/cc-display-panel.c:2246
+#: ../panels/display/cc-display-panel.c:2259
 msgid "Rotate counterclockwise by 90°"
 msgstr "Quay ngược chiều kim đồng hồ 90°"
 
-#: ../panels/display/cc-display-panel.c:2264
+#: ../panels/display/cc-display-panel.c:2277
 msgid "Rotate by 180°"
 msgstr "Quay 180°"
 
-#: ../panels/display/cc-display-panel.c:2282
+#: ../panels/display/cc-display-panel.c:2295
 msgid "Rotate clockwise by 90°"
 msgstr "Quay xuôi chiều kim đồng hồ 90°"
 
-#: ../panels/display/cc-display-panel.c:2303
+#: ../panels/display/cc-display-panel.c:2316
 msgid "Size"
 msgstr "Cỡ"
 
 #. aspect ratio
-#: ../panels/display/cc-display-panel.c:2316
+#: ../panels/display/cc-display-panel.c:2331
 msgid "Aspect Ratio"
 msgstr "Tỷ lệ màn hình"
 
-#: ../panels/display/cc-display-panel.c:2338
+#: ../panels/display/cc-display-panel.c:2354
 #: ../panels/printers/pp-options-dialog.c:85
 msgid "Resolution"
 msgstr "Độ phân giải"
 
-#: ../panels/display/cc-display-panel.c:2360
+#: ../panels/display/cc-display-panel.c:2374
+msgid "Adjust for TV"
+msgstr "Chỉnh cho TV"
+
+#: ../panels/display/cc-display-panel.c:2398
 msgid "Refresh Rate"
 msgstr "Tốc độ làm tươi"
 
-#: ../panels/display/cc-display-panel.c:2391
+#: ../panels/display/cc-display-panel.c:2430
 msgid "Show the top bar and Activities Overview on this display"
 msgstr "Hiển thị thanh đỉnh và “Tổng quan Tích cực” trên màn hình hiển thị này"
 
-#: ../panels/display/cc-display-panel.c:2397
+#: ../panels/display/cc-display-panel.c:2436
 msgid "Secondary Display"
 msgstr "Màn hình hiển thị thứ hai"
 
-#: ../panels/display/cc-display-panel.c:2398
+#: ../panels/display/cc-display-panel.c:2437
 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:2405
+#: ../panels/display/cc-display-panel.c:2444
 msgid "Presentation"
 msgstr "Trình diễn"
 
-#: ../panels/display/cc-display-panel.c:2406
+#: ../panels/display/cc-display-panel.c:2445
 msgid "Show slideshows and media only"
 msgstr "Chỉ hiển thị phần trình diễn và đa phương tiện"
 
 #. translators: "Mirror" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:2411
+#: ../panels/display/cc-display-panel.c:2450
 msgid "Mirror"
 msgstr "Giống nhau"
 
-#: ../panels/display/cc-display-panel.c:2412
+#: ../panels/display/cc-display-panel.c:2451
 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:2418
+#: ../panels/display/cc-display-panel.c:2457
 msgid "Turn Off"
 msgstr "_Tắt"
 
-#: ../panels/display/cc-display-panel.c:2419
+#: ../panels/display/cc-display-panel.c:2458
 msgid "Don't use this display"
 msgstr "Không dùng màn hình hiển thị này"
 
-#: ../panels/display/cc-display-panel.c:2722
+#: ../panels/display/cc-display-panel.c:2769
 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:2753
+#: ../panels/display/cc-display-panel.c:2800
 msgid "_Arrange Combined Displays"
 msgstr "_Sắp xếp màn hình hiển thị tổ hợp"
 
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:1
-msgid "Displays"
-msgstr "Thiết bị hiển thị"
-
+#. 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/display/gnome-display-panel.desktop.in.in.h:2
+msgid "Dis­plays"
+msgstr "Màn hình"
+
+#: ../panels/display/gnome-display-panel.desktop.in.in.h:3
 msgid "Choose how to use connected monitors and projectors"
 msgstr "Chọn cách dùng màn hình và máy chiếu được kết nối"
 
 #. Translators: those are keywords for the display control-center panel
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:4
+#: ../panels/display/gnome-display-panel.desktop.in.in.h:5
 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;"
 msgstr ""
 "Panel;Bảng;bang;Projector;Máy;chiếu;May;chieu;xrandr;Screen;Màn;hình;Man;"
 "hinh;Resolution;Độ;phân;giải;Do;phan;gia;Refresh;"
 
-#: ../panels/info/cc-info-panel.c:385
+#: ../panels/info/cc-info-panel.c:345
 msgid "Wayland"
 msgstr "Wayland"
 
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127
+#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123
 msgid "Unknown"
 msgstr "Chưa biết"
 
-#: ../panels/info/cc-info-panel.c:473
+#: ../panels/info/cc-info-panel.c:481
+#, c-format
+msgid "%s %d-bit (Build ID: %s)"
+msgstr "%s %d-bit (Mã số biên dịch: %s)"
+
+#: ../panels/info/cc-info-panel.c:483
+#, c-format
+msgid "%d-bit (Build ID: %s)"
+msgstr "%d-bit (Mã số biên dịch: %s)"
+
+#: ../panels/info/cc-info-panel.c:491
 #, c-format
 msgid "%s %d-bit"
 msgstr "%s %d-bít"
 
-#: ../panels/info/cc-info-panel.c:475
+#: ../panels/info/cc-info-panel.c:493
 #, c-format
 msgid "%d-bit"
 msgstr "%d-bít"
 
-#: ../panels/info/cc-info-panel.c:1155
+#: ../panels/info/cc-info-panel.c:1174
 msgid "Ask what to do"
 msgstr "Hỏi cần phải làm gì"
 
-#: ../panels/info/cc-info-panel.c:1159
+#: ../panels/info/cc-info-panel.c:1178
 msgid "Do nothing"
 msgstr "Không làm gì cả"
 
-#: ../panels/info/cc-info-panel.c:1163
+#: ../panels/info/cc-info-panel.c:1182
 msgid "Open folder"
 msgstr "Mở thư mục"
 
-#: ../panels/info/cc-info-panel.c:1254
+#: ../panels/info/cc-info-panel.c:1273
 msgid "Other Media"
 msgstr "Thiết bị lưu trữ khác"
 
-#: ../panels/info/cc-info-panel.c:1285
+#: ../panels/info/cc-info-panel.c:1304
 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:1286
+#: ../panels/info/cc-info-panel.c:1305
 msgid "Select an application for video DVDs"
 msgstr "Chọn ứng dụng cho DVD phim"
 
-#: ../panels/info/cc-info-panel.c:1287
+#: ../panels/info/cc-info-panel.c:1306
 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:1288
+#: ../panels/info/cc-info-panel.c:1307
 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:1289
+#: ../panels/info/cc-info-panel.c:1308
 msgid "Select an application for software CDs"
 msgstr "Chọn ứng dụng cho CD phần mềm"
 
@@ -1306,88 +1322,86 @@ 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:1301
+#: ../panels/info/cc-info-panel.c:1320
 msgid "audio DVD"
 msgstr "DVD nhạc"
 
-#: ../panels/info/cc-info-panel.c:1302
+#: ../panels/info/cc-info-panel.c:1321
 msgid "blank Blu-ray disc"
 msgstr "Đĩa Blu-ray trắng"
 
-#: ../panels/info/cc-info-panel.c:1303
+#: ../panels/info/cc-info-panel.c:1322
 msgid "blank CD disc"
 msgstr "Đĩa CD trắng"
 
-#: ../panels/info/cc-info-panel.c:1304
+#: ../panels/info/cc-info-panel.c:1323
 msgid "blank DVD disc"
 msgstr "Đĩa DVD trắng"
 
-#: ../panels/info/cc-info-panel.c:1305
+#: ../panels/info/cc-info-panel.c:1324
 msgid "blank HD DVD disc"
 msgstr "Đĩa HD DVD trắng"
 
-#: ../panels/info/cc-info-panel.c:1306
+#: ../panels/info/cc-info-panel.c:1325
 msgid "Blu-ray video disc"
 msgstr "Đĩa phim Blu-ray"
 
-#: ../panels/info/cc-info-panel.c:1307
+#: ../panels/info/cc-info-panel.c:1326
 msgid "e-book reader"
 msgstr "Bộ đọc e-book"
 
-#: ../panels/info/cc-info-panel.c:1308
+#: ../panels/info/cc-info-panel.c:1327
 msgid "HD DVD video disc"
 msgstr "Đĩa phim HD DVD"
 
-#: ../panels/info/cc-info-panel.c:1309
+#: ../panels/info/cc-info-panel.c:1328
 msgid "Picture CD"
 msgstr "CD hình"
 
-#: ../panels/info/cc-info-panel.c:1310
+#: ../panels/info/cc-info-panel.c:1329
 msgid "Super Video CD"
 msgstr "CD Siêu phim"
 
-#: ../panels/info/cc-info-panel.c:1311
+#: ../panels/info/cc-info-panel.c:1330
 msgid "Video CD"
 msgstr "CD Phim"
 
-#: ../panels/info/cc-info-panel.c:1312
+#: ../panels/info/cc-info-panel.c:1331
 msgid "Windows software"
 msgstr "Phần mềm Windows"
 
-#: ../panels/info/cc-info-panel.c:1435
-#: ../panels/keyboard/keyboard-shortcuts.c:1949
+#: ../panels/info/cc-info-panel.c:1454
 msgid "Section"
 msgstr "Phần"
 
-#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14
+#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14
 msgid "Overview"
 msgstr "Tổng quan"
 
-#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21
+#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21
 msgid "Default Applications"
 msgstr "Ứng dụng mặc định"
 
-#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29
+#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29
 msgid "Removable Media"
 msgstr "Đa phương tiện"
 
-#: ../panels/info/cc-info-panel.c:1480
+#: ../panels/info/cc-info-panel.c:1499
 #, c-format
 msgid "Version %s"
 msgstr "Phiên bản %s"
 
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:1
-#: ../panels/network/connection-editor/ce-page-details.c:240
-#: ../panels/network/network-wifi.ui.h:46
-msgid "Details"
+#. 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-panel.desktop.in.in.h:2
+#: ../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-panel.desktop.in.in.h:4
+#: ../panels/info/gnome-info-panel.desktop.in.in.h:5
 msgid ""
 "device;system;information;memory;processor;version;default;application;"
 "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
@@ -1566,8 +1580,9 @@ 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/cc-window.c:1606
-#: ../shell/gnome-control-center.desktop.in.in.h:1
+#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274
+#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584
+#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1
 msgid "Settings"
 msgstr "Cài đặt"
 
@@ -1640,7 +1655,6 @@ msgid "Lock screen"
 msgstr "Khóa màn hình"
 
 #: ../panels/keyboard/50-accessibility.xml.in.h:1
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1
 msgid "Universal Access"
 msgstr "Hỗ trợ truy cập"
 
@@ -1676,11 +1690,21 @@ 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:514
+#: ../panels/keyboard/cc-keyboard-manager.c:522
+#: ../panels/keyboard/cc-keyboard-manager.c:830
+msgid "Custom Shortcuts"
+msgstr "Phím tắt tự chọn"
+
+#. This label is displayed in a treeview cell displaying
+#. * a disabled accelerator key combination.
+#.
 #. translators:
 #. * The device has been disabled
 #: ../panels/keyboard/cc-keyboard-option.c:276
 #: ../panels/keyboard/cc-keyboard-option.c:395
-#: ../panels/keyboard/keyboard-shortcuts.c:1220
+#: ../panels/keyboard/keyboard-shortcuts.c:417
+#: ../panels/keyboard/shortcut-editor.ui.h:1
 #: ../panels/network/network-wifi.ui.h:31
 #: ../panels/sound/gvc/gvc-mixer-control.c:1830
 #: ../panels/user-accounts/um-fingerprint-dialog.c:213
@@ -1707,40 +1731,42 @@ msgstr "Phím tổ hợp"
 msgid "Modifiers-only switch to next source"
 msgstr "Chuyển sang kiểu gõ kế chỉ dùng phím bổ trợ"
 
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
-msgid "Keyboard"
-msgstr "Bàn phím"
+#: ../panels/keyboard/cc-keyboard-panel.c:215
+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:308
+#, 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"
+
+#. Setup the top label
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:444
+#, c-format
+msgid "Keyboard shortcut for <b>%s</b>. Enter new shortcut to change."
+msgstr "Phím tắt cho <b>%s</b>. Nhập vào phím tắt mới để thay đổi."
 
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:799
+msgid "Add Custom Shortcut"
+msgstr "Thêm phím tắt tự chọ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/keyboard/gnome-keyboard-panel.desktop.in.in.h:2
+msgid "Key­board"
+msgstr "Bàn phím"
+
+#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3
 msgid "View and change keyboard shortcuts and set your typing preferences"
 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:4
+#: ../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;"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1
-msgid "Custom Shortcut"
-msgstr "Phím tắt tự chọn"
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
-msgid "_Name:"
-msgstr "Tê_n:"
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
-msgid "C_ommand:"
-msgstr "Lện_h:"
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
-msgid "Add Shortcut"
-msgstr "Thêm phím tắt"
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
-msgid "Remove Shortcut"
-msgstr "Bỏ phím tắt"
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
 msgid ""
 "To edit a shortcut, click the row and hold down the new keys or press "
 "Backspace to clear."
@@ -1748,81 +1774,79 @@ msgstr ""
 "Để sửa đổi phím tắt, nhấn vào hàng muốn sửa rồi ấn tổ hợp phím mới hoặc nhấn "
 "Backspace để xóa phím tắt."
 
-#: ../panels/keyboard/keyboard-shortcuts.c:633
-#: ../panels/keyboard/keyboard-shortcuts.c:641
-msgid "Custom Shortcuts"
-msgstr "Phím tắt tự chọn"
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
+msgid "No keyboard shortcut found"
+msgstr "Không tìm thấy phím tắt bàn phím"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:858
-msgid "<Unknown Action>"
-msgstr "<Hành động lạ>"
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:3
+msgid "Try a different search"
+msgstr "Thử tìm kiếm khác"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1359
-#, c-format
-msgid ""
-"The shortcut \"%s\" cannot be used because it will become impossible to type "
-"using this key.\n"
-"Please try with a key such as Control, Alt or Shift at the same time."
-msgstr ""
-"Không thể dùng \"%s\" làm phím tắt vì sẽ không thể gõ được phím này nữa.\n"
-"Xin hãy thêm một phím bổ trợ như Ctrl, Alt, Shift."
+#: ../panels/keyboard/shortcut-editor.ui.h:2
+#: ../panels/network/connection-editor/ce-page-reset.c:78
+#: ../panels/network/network-wifi.ui.h:51
+msgid "Reset"
+msgstr "Đặt lại"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1389
-#, c-format
-msgid ""
-"The shortcut \"%s\" is already used for\n"
-"\"%s\""
-msgstr ""
-"Phím tắt \"%s\" đã dùng cho\n"
-"\"%s\""
+#: ../panels/keyboard/shortcut-editor.ui.h:3
+#: ../panels/sound/gvc-mixer-dialog.c:1493
+#: ../panels/sound/gvc-sound-theme-chooser.c:564
+msgid "Name"
+msgstr "Tên"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1394
-#, c-format
-msgid ""
-"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
-msgstr "Nếu bạn gán lại phím tắt là \"%s\", \"%s\" sẽ bị tắt."
+#: ../panels/keyboard/shortcut-editor.ui.h:4
+msgid "Command"
+msgstr "Câu lệnh"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1400
-msgid "_Reassign"
-msgstr "_Gán lại"
+#: ../panels/keyboard/shortcut-editor.ui.h:5
+msgid "Shortcut"
+msgstr "Phím tắt"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1441
-#, c-format
-msgid ""
-"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to "
-"automatically set it to \"%s\"?"
-msgstr ""
-"Tổ hợp phím tắt \"%s\" đã được gán cho \"%s\". Bạn có muốn tự động đặt nó "
-"thành \"%s\"?"
+#: ../panels/keyboard/shortcut-editor.ui.h:6
+msgid "Edit"
+msgstr "Chỉnh sửa"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1451
-#, c-format
-msgid ""
-"\"%s\" is currently associated with \"%s\", this shortcut will be disabled "
-"if you move forward."
-msgstr ""
-"\"%s\" hiện tại được gán cho \"%s\", phím tắt này sẽ bị tắt nếu bạn di "
-"chuyển về phía trước."
+#: ../panels/keyboard/shortcut-editor.ui.h:7
+#: ../panels/network/network-wifi.ui.h:20
+msgid "None"
+msgstr "Không có"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1458
-msgid "_Assign"
-msgstr "_Gán"
+#: ../panels/keyboard/shortcut-editor.ui.h:8
+msgid "Remove"
+msgstr "Xóa"
+
+#: ../panels/keyboard/shortcut-editor.ui.h:9
+#: ../panels/printers/authentication-dialog.ui.h:2
+#: ../panels/printers/ppd-selection-dialog.ui.h:2
+msgid "Cancel"
+msgstr "Thôi"
+
+#: ../panels/keyboard/shortcut-editor.ui.h:10
+#: ../panels/network/connection-editor/ce-page-ip4.c:276
+#: ../panels/network/connection-editor/ce-page-ip6.c:277
+msgid "Add"
+msgstr "Thêm"
+
+#: ../panels/keyboard/shortcut-editor.ui.h:11
+msgid "Replace"
+msgstr "Thay thế"
 
 #: ../panels/mouse/cc-mouse-panel.c:82
 msgid "Test Your _Settings"
 msgstr "_Kiểm tra cài đặt của bạn"
 
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1
-msgid "Mouse & Touchpad"
-msgstr "Chuột và Touchpad"
-
+#. 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/mouse/gnome-mouse-panel.desktop.in.in.h:2
+msgid "Mouse & Touch­pad"
+msgstr "Chuột & Touchpad"
+
+#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3
 msgid ""
 "Change your mouse or touchpad sensitivity and select right or left-handed"
 msgstr "Thay đổi độ nhạy chuột và touchpad và chọn thuận tay phải/trái"
 
 #. Translators: those are keywords for the mouse and touchpad control-center panel
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4
+#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5
 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;"
 msgstr ""
 "Trackpad;Pointer;Con;trỏ;tro;Click;Nhấn;Nhắp;Nhan;Nhap;Tap;Double;Dup;Button;"
@@ -1882,6 +1906,10 @@ msgid "Tap to Click"
 msgstr "Chỗ để bấm chuột"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:15
+msgid "Two-finger Scrolling"
+msgstr "Cuộn hai-ngón"
+
+#: ../panels/mouse/gnome-mouse-properties.ui.h:16
 msgid "Edge Scrolling"
 msgstr "Cuộn sắc"
 
@@ -1920,11 +1948,11 @@ 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:358
+#: ../panels/network/cc-network-panel.c:349
 msgid "Air_plane Mode"
 msgstr "Chế độ _máy bay"
 
-#: ../panels/network/cc-network-panel.c:967
+#: ../panels/network/cc-network-panel.c:953
 msgid "Network proxy"
 msgstr "Ủy nhiệm mạng"
 
@@ -1932,18 +1960,18 @@ 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:1144 ../panels/network/net-vpn.c:278
-#: ../panels/network/net-vpn.c:432
+#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283
+#: ../panels/network/net-vpn.c:440
 #, c-format
 msgid "%s VPN"
 msgstr "VPN %s"
 
-#: ../panels/network/cc-network-panel.c:1300
+#: ../panels/network/cc-network-panel.c:1194
 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:1306
+#: ../panels/network/cc-network-panel.c:1200
 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."
 
@@ -1959,7 +1987,7 @@ 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:1
+#: ../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
 msgid "Anony_mous identity"
@@ -1976,238 +2004,238 @@ msgstr "_Xác thực bên trong"
 msgid "page 2"
 msgstr "trang 2"
 
-#: ../panels/network/connection-editor/ce-page-8021x-security.c:108
-#: ../panels/network/connection-editor/ce-page-security.c:469
+#: ../panels/network/connection-editor/ce-page-8021x-security.c:101
+#: ../panels/network/connection-editor/ce-page-security.c:459
 #: ../panels/network/connection-editor/details-page.ui.h:3
 #: ../panels/network/network-wifi.ui.h:6
 msgid "Security"
 msgstr "An ninh"
 
-#: ../panels/network/connection-editor/ce-page.c:507
+#: ../panels/network/connection-editor/ce-page.c:481
 msgid "automatic"
 msgstr "tự động"
 
+#: ../panels/network/connection-editor/ce-page.c:521
+#, c-format
+msgid "Profile %d"
+msgstr "Hồ sơ %d"
+
 #. TRANSLATORS: this WEP WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:52
-#: ../panels/network/net-device-wifi.c:219
-#: ../panels/network/net-device-wifi.c:383
+#: ../panels/network/connection-editor/ce-page-details.c:50
+#: ../panels/network/net-device-wifi.c:214
+#: ../panels/network/net-device-wifi.c:390
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:56
-#: ../panels/network/net-device-wifi.c:223
-#: ../panels/network/net-device-wifi.c:388
+#: ../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/network-wifi.ui.h:19
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:60
-#: ../panels/network/net-device-wifi.c:227
+#: ../panels/network/connection-editor/ce-page-details.c:58
+#: ../panels/network/net-device-wifi.c:222
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:65
-#: ../panels/network/net-device-wifi.c:232
+#: ../panels/network/connection-editor/ce-page-details.c:63
+#: ../panels/network/net-device-wifi.c:227
 msgid "Enterprise"
 msgstr "Doanh nghiệp"
 
-#: ../panels/network/connection-editor/ce-page-details.c:70
-#: ../panels/network/net-device-wifi.c:237
-#: ../panels/network/net-device-wifi.c:373
+#: ../panels/network/connection-editor/ce-page-details.c:68
+#: ../panels/network/net-device-wifi.c:232
+#: ../panels/network/net-device-wifi.c:380
 msgctxt "Wifi security"
 msgid "None"
 msgstr "Không"
 
-#: ../panels/network/connection-editor/ce-page-details.c:91
+#: ../panels/network/connection-editor/ce-page-details.c:89
 #: ../panels/power/power.ui.h:17
 msgid "Never"
 msgstr "Không bao giờ"
 
-#: ../panels/network/connection-editor/ce-page-details.c:106
-#: ../panels/network/net-device-ethernet.c:124
-#: ../panels/network/net-device-wifi.c:477
+#: ../panels/network/connection-editor/ce-page-details.c:104
+#: ../panels/network/net-device-ethernet.c:120
+#: ../panels/network/net-device-wifi.c:485
 #, 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:155
-#: ../panels/network/net-device-ethernet.c:54
-#: ../panels/network/net-device-wifi.c:534
+#: ../panels/network/connection-editor/ce-page-details.c:153
+#: ../panels/network/net-device-ethernet.c:50
+#: ../panels/network/net-device-wifi.c:542
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: ../panels/network/connection-editor/ce-page-details.c:181
-#: ../panels/network/net-device-wifi.c:563
+#: ../panels/network/connection-editor/ce-page-details.c:179
+#: ../panels/network/net-device-wifi.c:571
 msgctxt "Signal strength"
 msgid "None"
 msgstr "Không"
 
-#: ../panels/network/connection-editor/ce-page-details.c:183
-#: ../panels/network/net-device-wifi.c:565
+#: ../panels/network/connection-editor/ce-page-details.c:181
+#: ../panels/network/net-device-wifi.c:573
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "Yếu"
 
-#: ../panels/network/connection-editor/ce-page-details.c:185
-#: ../panels/network/net-device-wifi.c:567
+#: ../panels/network/connection-editor/ce-page-details.c:183
+#: ../panels/network/net-device-wifi.c:575
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "Ok"
 
-#: ../panels/network/connection-editor/ce-page-details.c:187
-#: ../panels/network/net-device-wifi.c:569
+#: ../panels/network/connection-editor/ce-page-details.c:185
+#: ../panels/network/net-device-wifi.c:577
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "Tốt"
 
-#: ../panels/network/connection-editor/ce-page-details.c:189
-#: ../panels/network/net-device-wifi.c:571
+#: ../panels/network/connection-editor/ce-page-details.c:187
+#: ../panels/network/net-device-wifi.c:579
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "Tuyệt hảo"
 
-#: ../panels/network/connection-editor/ce-page-ethernet.c:226
-#: ../panels/network/connection-editor/ce-page-vpn.c:220
-#: ../panels/network/connection-editor/ce-page-wifi.c:262
+#: ../panels/network/connection-editor/ce-page-details.c:225
+#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266
+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/network-wifi.ui.h:47
 msgid "Identity"
 msgstr "Thực thể"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:177
-#: ../panels/network/connection-editor/ce-page-ip4.c:439
-#: ../panels/network/connection-editor/ce-page-ip6.c:179
-#: ../panels/network/connection-editor/ce-page-ip6.c:443
+#: ../panels/network/connection-editor/ce-page-ip4.c:178
+#: ../panels/network/connection-editor/ce-page-ip4.c:432
+#: ../panels/network/connection-editor/ce-page-ip6.c:180
+#: ../panels/network/connection-editor/ce-page-ip6.c:427
 msgid "Address"
 msgstr "Địa chỉ"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:190
-#: ../panels/network/connection-editor/ce-page-ip4.c:452
+#: ../panels/network/connection-editor/ce-page-ip4.c:191
+#: ../panels/network/connection-editor/ce-page-ip4.c:445
 msgid "Netmask"
 msgstr "Mặt nạ mạng"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:204
-#: ../panels/network/connection-editor/ce-page-ip4.c:465
-#: ../panels/network/connection-editor/ce-page-ip6.c:205
-#: ../panels/network/connection-editor/ce-page-ip6.c:473
+#: ../panels/network/connection-editor/ce-page-ip4.c:205
+#: ../panels/network/connection-editor/ce-page-ip4.c:458
+#: ../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:221
-#: ../panels/network/connection-editor/ce-page-ip6.c:222
+#: ../panels/network/connection-editor/ce-page-ip4.c:222
+#: ../panels/network/connection-editor/ce-page-ip6.c:223
 msgid "Delete Address"
 msgstr "Xóa địa chỉ"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:275
-#: ../panels/network/connection-editor/ce-page-ip6.c:276
-msgid "Add"
-msgstr "Thêm"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:343
-#: ../panels/network/connection-editor/ce-page-ip6.c:347
+#: ../panels/network/connection-editor/ce-page-ip4.c:339
+#: ../panels/network/connection-editor/ce-page-ip6.c:334
 msgid "Server"
 msgstr "Máy chủ"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:360
-#: ../panels/network/connection-editor/ce-page-ip6.c:364
+#: ../panels/network/connection-editor/ce-page-ip4.c:356
+#: ../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:479
-#: ../panels/network/connection-editor/ce-page-ip6.c:487
+#: ../panels/network/connection-editor/ce-page-ip4.c:472
+#: ../panels/network/connection-editor/ce-page-ip6.c:467
 msgctxt "network parameters"
 msgid "Metric"
 msgstr "Metric"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:500
-#: ../panels/network/connection-editor/ce-page-ip6.c:508
+#: ../panels/network/connection-editor/ce-page-ip4.c:493
+#: ../panels/network/connection-editor/ce-page-ip6.c:484
 msgid "Delete Route"
 msgstr "Xóa định tuyến"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:615
+#: ../panels/network/connection-editor/ce-page-ip4.c:597
 #: ../panels/network/network-wifi.ui.h:27
 msgid "Automatic (DHCP)"
 msgstr "Tự động (DHCP)"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:619
-#: ../panels/network/connection-editor/ce-page-ip6.c:621
+#: ../panels/network/connection-editor/ce-page-ip4.c:601
+#: ../panels/network/connection-editor/ce-page-ip6.c:592
 #: ../panels/network/network-wifi.ui.h:26
-#: ../panels/privacy/cc-privacy-panel.c:199
+#: ../panels/privacy/cc-privacy-panel.c:217
 msgid "Manual"
 msgstr "Thủ công"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:623
-#: ../panels/network/connection-editor/ce-page-ip6.c:625
+#: ../panels/network/connection-editor/ce-page-ip4.c:605
+#: ../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:967
+#: ../panels/network/connection-editor/ce-page-ip4.c:935
 #: ../panels/network/network-wifi.ui.h:48
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:192
-#: ../panels/network/connection-editor/ce-page-ip6.c:456
+#: ../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:613
+#: ../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:199
+#: ../panels/privacy/cc-privacy-panel.c:217
 msgid "Automatic"
 msgstr "Tự động"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:617
+#: ../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:937
+#: ../panels/network/connection-editor/ce-page-ip6.c:898
 #: ../panels/network/network-wifi.ui.h:49
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../panels/network/connection-editor/ce-page-reset.c:91
-#: ../panels/network/network-wifi.ui.h:51
-msgid "Reset"
-msgstr "Đặt lại"
-
-#: ../panels/network/connection-editor/ce-page-security.c:253
+#: ../panels/network/connection-editor/ce-page-security.c:248
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Không"
 
-#: ../panels/network/connection-editor/ce-page-security.c:276
+#: ../panels/network/connection-editor/ce-page-security.c:271
 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:286
+#: ../panels/network/connection-editor/ce-page-security.c:281
 msgid "WEP 128-bit Passphrase"
 msgstr "Mật khẩu WEP 128-bit"
 
-#: ../panels/network/connection-editor/ce-page-security.c:299
-#: ../panels/network/wireless-security/wireless-security.c:409
+#: ../panels/network/connection-editor/ce-page-security.c:294
+#: ../panels/network/wireless-security/wireless-security.c:463
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../panels/network/connection-editor/ce-page-security.c:312
+#: ../panels/network/connection-editor/ce-page-security.c:307
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP động (802.1x)"
 
-#: ../panels/network/connection-editor/ce-page-security.c:326
+#: ../panels/network/connection-editor/ce-page-security.c:321
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Cá nhân"
 
-#: ../panels/network/connection-editor/ce-page-security.c:340
+#: ../panels/network/connection-editor/ce-page-security.c:335
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA và WPA2 Doanh nghiệp"
 
@@ -2222,30 +2250,30 @@ msgid "Link speed"
 msgstr "Tốc độ đường truyền"
 
 #: ../panels/network/connection-editor/details-page.ui.h:4
-#: ../panels/network/net-device-ethernet.c:157
+#: ../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:695
+#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644
 msgid "IPv4 Address"
 msgstr "Địa chỉ IPv4"
 
 #: ../panels/network/connection-editor/details-page.ui.h:5
+#: ../panels/network/net-device-ethernet.c:154
 #: ../panels/network/net-device-ethernet.c:158
-#: ../panels/network/net-device-ethernet.c:162
 #: ../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:696
+#: ../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:165
+#: ../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"
 
 #: ../panels/network/connection-editor/details-page.ui.h:7
-#: ../panels/network/net-device-ethernet.c:169
+#: ../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
@@ -2255,7 +2283,7 @@ 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/net-device-ethernet.c:171
+#: ../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
@@ -2338,13 +2366,13 @@ msgstr "Kết nối _tự động"
 msgid "Firewall _Zone"
 msgstr "_Vùng tường lửa"
 
-#: ../panels/network/connection-editor/firewall-helpers.c:48
-#: ../panels/network/connection-editor/firewall-helpers.c:113
+#: ../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/firewall-helpers.c:49
+#: ../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"
 
@@ -2386,45 +2414,25 @@ msgstr "Dùng kết nối này _chỉ cho tài nguyên trên mạng này"
 msgid "IPv_6"
 msgstr "IPv_6"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:275
+#: ../panels/network/connection-editor/net-connection-editor.c:296
 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:293
+#: ../panels/network/connection-editor/net-connection-editor.c:314
 msgid "New Profile"
 msgstr "Hồ sơ mới"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:583
+#: ../panels/network/connection-editor/net-connection-editor.c:635
 msgid "VPN"
 msgstr "VPN"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:584
-msgid "Bond"
-msgstr "Bond"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:586
-msgid "Team"
-msgstr "Team"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:588
-msgid "Bridge"
-msgstr "Bridge"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:589
-msgid "VLAN"
-msgstr "VLAN"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:740
-msgid "Could not load VPN plugins"
-msgstr "Không thể tải phần mở rộng VPN"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:809
+#: ../panels/network/connection-editor/net-connection-editor.c:783
 msgid "Import from file…"
 msgstr "Nhập từ tập tin…"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:880
-msgid "Add Network Connection"
-msgstr "Thêm kết nối mạng"
+#: ../panels/network/connection-editor/net-connection-editor.c:817
+msgid "Add VPN"
+msgstr "Thêm VPN"
 
 #: ../panels/network/connection-editor/reset-page.ui.h:1
 #: ../panels/network/network-wifi.ui.h:41
@@ -2432,7 +2440,7 @@ msgid "_Reset"
 msgstr "Đặ_t lại"
 
 #: ../panels/network/connection-editor/reset-page.ui.h:2
-#: ../panels/network/net-device-wifi.c:1463
+#: ../panels/network/net-device-wifi.c:1536
 #: ../panels/network/network-wifi.ui.h:42
 msgid "_Forget"
 msgstr "_Quên"
@@ -2457,11 +2465,11 @@ msgstr ""
 msgid "S_ecurity"
 msgstr "_An ninh"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:205
+#: ../panels/network/connection-editor/vpn-helpers.c:141
 msgid "Cannot import VPN connection"
 msgstr "Không thể nhập kết nối VPN"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:207
+#: ../panels/network/connection-editor/vpn-helpers.c:143
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2474,36 +2482,36 @@ msgstr ""
 "\n"
 "Lỗi: %s."
 
-#: ../panels/network/connection-editor/vpn-helpers.c:242
+#: ../panels/network/connection-editor/vpn-helpers.c:178
 msgid "Select file to import"
 msgstr "Chọn tập tin cần nhập"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:246
-#: ../panels/printers/cc-printers-panel.c:2053
+#: ../panels/network/connection-editor/vpn-helpers.c:182
+#: ../panels/printers/cc-printers-panel.c:2077
 #: ../panels/sharing/cc-sharing-panel.c:373
 #: ../panels/user-accounts/um-photo-dialog.c:218
 msgid "_Open"
 msgstr "_Mở"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:294
+#: ../panels/network/connection-editor/vpn-helpers.c:230
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Đã có tập tin tên “%s” rồi."
 
-#: ../panels/network/connection-editor/vpn-helpers.c:296
+#: ../panels/network/connection-editor/vpn-helpers.c:232
 msgid "_Replace"
 msgstr "_Thay thế"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:298
+#: ../panels/network/connection-editor/vpn-helpers.c:234
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Bạn có muốn thay thế %s bằng kết nối này?"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:334
+#: ../panels/network/connection-editor/vpn-helpers.c:270
 msgid "Cannot export VPN connection"
 msgstr "Không thể xuất kết nối VPN"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:336
+#: ../panels/network/connection-editor/vpn-helpers.c:272
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2514,7 +2522,7 @@ msgstr ""
 "\n"
 "Lỗi: %s."
 
-#: ../panels/network/connection-editor/vpn-helpers.c:371
+#: ../panels/network/connection-editor/vpn-helpers.c:307
 msgid "Export VPN connection"
 msgstr "Xuất kết nối VPN"
 
@@ -2541,60 +2549,46 @@ msgstr "Mạng nhà"
 msgid "Make available to _other users"
 msgstr "Cho người dùng _khác sử dụng"
 
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:1
-#: ../panels/network/network-mobile.ui.h:7
-msgid "Network"
+#. 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"
 msgstr "Mạng"
 
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:3
 msgid "Control how you connect to the Internet"
 msgstr "Điều khiển cách kết nối Internet"
 
 #. Translators: those are keywords for the network control-center panel
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:4
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:5
 msgid ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
-"vlan;bridge;bond;DNS;"
+"DNS;"
 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;vlan;bridge;bond;DNS;"
-
-#: ../panels/network/net-device-bond.c:77
-msgid "Bond slaves"
-msgstr "Bond slave"
-
-#: ../panels/network/net-device-bond.c:102
-#: ../panels/network/net-device-bridge.c:102
-#: ../panels/network/net-device-team.c:102
-msgid "(none)"
-msgstr "(không)"
+"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/net-device-bridge.c:77
-msgid "Bridge slaves"
-msgstr "Bridge slave"
-
-#: ../panels/network/net-device-ethernet.c:110
-#: ../panels/network/net-device-wifi.c:463
+#: ../panels/network/net-device-ethernet.c:106
+#: ../panels/network/net-device-wifi.c:471
 msgid "never"
 msgstr "chưa bao giờ"
 
-#: ../panels/network/net-device-ethernet.c:120
-#: ../panels/network/net-device-wifi.c:473
+#: ../panels/network/net-device-ethernet.c:116
+#: ../panels/network/net-device-wifi.c:481
 msgid "today"
 msgstr "hôm nay"
 
-#: ../panels/network/net-device-ethernet.c:122
-#: ../panels/network/net-device-wifi.c:475
+#: ../panels/network/net-device-ethernet.c:118
+#: ../panels/network/net-device-wifi.c:483
 msgid "yesterday"
 msgstr "hôm qua"
 
-#: ../panels/network/net-device-ethernet.c:160
-#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:698
-#: ../panels/network/panel-common.c:700 ../panels/printers/printers.ui.h:13
+#: ../panels/network/net-device-ethernet.c:156
+#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647
+#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13
 msgid "IP Address"
 msgstr "Địa chỉ IP"
 
-#: ../panels/network/net-device-ethernet.c:176
+#: ../panels/network/net-device-ethernet.c:172
 #: ../panels/network/network-wifi.ui.h:12
 msgid "Last used"
 msgstr "Dùng lần cuối"
@@ -2604,34 +2598,25 @@ 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:286
+#: ../panels/network/net-device-ethernet.c:280
 #: ../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:354
-#: ../panels/network/net-device-wifi.c:1621
+#: ../panels/network/net-device-ethernet.c:348
+#: ../panels/network/net-device-wifi.c:1694
 #: ../panels/network/network-ethernet.ui.h:3
 #: ../panels/network/network-mobile.ui.h:8
 #: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7
 msgid "Options…"
 msgstr "Tùy chọn…"
 
-#: ../panels/network/net-device-ethernet.c:473
-#, c-format
-msgid "Profile %d"
-msgstr "Hồ sơ %d"
-
-#: ../panels/network/net-device-mobile.c:232
+#: ../panels/network/net-device-mobile.c:223
 msgid "Add new connection"
 msgstr "Thêm kết nối mới"
 
-#: ../panels/network/net-device-team.c:77
-msgid "Team slaves"
-msgstr "Team slave"
-
-#: ../panels/network/net-device-wifi.c:1176
+#: ../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."
@@ -2639,12 +2624,12 @@ 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:1180
+#: ../panels/network/net-device-wifi.c:1209
 #, 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:1184
+#: ../panels/network/net-device-wifi.c:1213
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
@@ -2652,26 +2637,26 @@ 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:1267
+#: ../panels/network/net-device-wifi.c:1296
 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:1270
+#: ../panels/network/net-device-wifi.c:1299
 msgid "_Stop Hotspot"
 msgstr "_Dừng điểm truy cập"
 
-#: ../panels/network/net-device-wifi.c:1327
+#: ../panels/network/net-device-wifi.c:1397
 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:1330
+#: ../panels/network/net-device-wifi.c:1400
 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:1459
+#: ../panels/network/net-device-wifi.c:1532
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
@@ -2679,11 +2664,11 @@ 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:1774
+#: ../panels/network/net-device-wifi.c:1842
 msgid "History"
 msgstr "Lịch sử"
 
-#: ../panels/network/net-device-wifi.c:1778
+#: ../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:525
 #: ../panels/wacom/gnome-wacom-properties.ui.h:5
@@ -2691,7 +2676,7 @@ msgid "_Close"
 msgstr "Đón_g"
 
 #. translators: This is the label for the "Forget wireless network" functionality
-#: ../panels/network/net-device-wifi.c:1786
+#: ../panels/network/net-device-wifi.c:1854
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "_Quên"
@@ -2726,6 +2711,10 @@ msgstr "IMEI"
 msgid "Provider"
 msgstr "Nhà cung cấp"
 
+#: ../panels/network/network-mobile.ui.h:7
+msgid "Network"
+msgstr "Mạng"
+
 #: ../panels/network/network-proxy.ui.h:1
 msgctxt "proxy method"
 msgid "None"
@@ -2832,15 +2821,11 @@ msgstr "chi tiết"
 #: ../panels/network/wireless-security/ws-leap.ui.h:2
 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1
 #: ../panels/sharing/sharing.ui.h:9
-#: ../panels/user-accounts/data/account-dialog.ui.h:9
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
+#: ../panels/user-accounts/data/account-dialog.ui.h:12
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
 msgid "_Password"
 msgstr "_Mật khẩu"
 
-#: ../panels/network/network-wifi.ui.h:20
-msgid "None"
-msgstr "Không có"
-
 #: ../panels/network/network-wifi.ui.h:21
 msgid "Show P_assword"
 msgstr "_Hiện mật khẩu"
@@ -2934,7 +2919,6 @@ msgid "_Connect to Hidden Network…"
 msgstr "_Nối vào mạng ẩn…"
 
 #: ../panels/network/network-wifi.ui.h:58
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
 msgid "_History"
 msgstr "_Lịch sử"
 
@@ -2956,360 +2940,337 @@ msgstr "Kiểu an ninh"
 
 #: ../panels/network/network-wifi.ui.h:63
 #: ../panels/printers/authentication-dialog.ui.h:5
-#: ../panels/user-accounts/data/account-dialog.ui.h:6
+#: ../panels/user-accounts/data/account-dialog.ui.h:9
 msgid "Password"
 msgstr "Mật khẩu"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:131
+#: ../panels/network/panel-common.c:127
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:135
+#: ../panels/network/panel-common.c:131
 msgid "Infrastructure"
 msgstr "Hạ tầng"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205
+#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201
 msgid "Status unknown"
 msgstr "Tình trạng không rõ"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:155
+#: ../panels/network/panel-common.c:151
 msgid "Unmanaged"
 msgstr "Chưa được quản lý"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:159
+#: ../panels/network/panel-common.c:155
 msgid "Unavailable"
 msgstr "Không sẵn sàng"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211
+#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207
 msgid "Connecting"
 msgstr "Đang kết nối"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215
+#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211
 msgid "Authentication required"
 msgstr "Cần xác thực"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219
+#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215
 msgid "Connected"
 msgstr "Đã kết nối"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:181
+#: ../panels/network/panel-common.c:177
 msgid "Disconnecting"
 msgstr "Đang ngắt kết nối"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223
+#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219
 msgid "Connection failed"
 msgstr "Kết nối gặp lỗi"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231
+#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227
 msgid "Status unknown (missing)"
 msgstr "Tình trạng không rõ (thiếu)"
 
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:227
+#: ../panels/network/panel-common.c:223
 msgid "Not connected"
 msgstr "Chưa kết nối"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:252
+#: ../panels/network/panel-common.c:248
 msgid "Configuration failed"
 msgstr "Cấu hình gặp lỗi"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:256
+#: ../panels/network/panel-common.c:252
 msgid "IP configuration failed"
 msgstr "Cấu hình IP gặp lỗi"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:260
+#: ../panels/network/panel-common.c:256
 msgid "IP configuration expired"
 msgstr "Hết hạn cấu hình IP"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:264
+#: ../panels/network/panel-common.c:260
 msgid "Secrets were required, but not provided"
 msgstr "Cần bí mật nhưng chưa được cung cấp"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:268
+#: ../panels/network/panel-common.c:264
 msgid "802.1x supplicant disconnected"
 msgstr "802.1x supplicant ngắt kết nối"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:272
+#: ../panels/network/panel-common.c:268
 msgid "802.1x supplicant configuration failed"
 msgstr "Lỗi cấu hình 802.1x supplicant"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:276
+#: ../panels/network/panel-common.c:272
 msgid "802.1x supplicant failed"
 msgstr "Lỗi 802.1x supplicant"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:280
+#: ../panels/network/panel-common.c:276
 msgid "802.1x supplicant took too long to authenticate"
 msgstr "802.1x supplicant tốn quá nhiều thời gian để xác thực"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:284
+#: ../panels/network/panel-common.c:280
 msgid "PPP service failed to start"
 msgstr "Gặp lỗi khi khởi động dịch vụ PPP"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:288
+#: ../panels/network/panel-common.c:284
 msgid "PPP service disconnected"
 msgstr "Dịch vụ PPP bị ngắt"
 
 # Name: don't translate / Tên: đừng dịch
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:292
+#: ../panels/network/panel-common.c:288
 msgid "PPP failed"
 msgstr "PPP bị lỗi"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:296
+#: ../panels/network/panel-common.c:292
 msgid "DHCP client failed to start"
 msgstr "Lỗi khởi động trình khách DHCP"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:300
+#: ../panels/network/panel-common.c:296
 msgid "DHCP client error"
 msgstr "Lỗi trình khách DHCP"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:304
+#: ../panels/network/panel-common.c:300
 msgid "DHCP client failed"
 msgstr "Lỗi trình khách DHCP"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:308
+#: ../panels/network/panel-common.c:304
 msgid "Shared connection service failed to start"
 msgstr "Lỗi khởi động dịch vụ kết nối chia sẻ"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:312
+#: ../panels/network/panel-common.c:308
 msgid "Shared connection service failed"
 msgstr "Lỗi dịch vụ kết nối chia sẻ"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:316
+#: ../panels/network/panel-common.c:312
 msgid "AutoIP service failed to start"
 msgstr "Lỗi khởi động dịch vụ AutoIP"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:320
+#: ../panels/network/panel-common.c:316
 msgid "AutoIP service error"
 msgstr "Lỗi dịch vụ AutoIP"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:324
+#: ../panels/network/panel-common.c:320
 msgid "AutoIP service failed"
 msgstr "Lỗi dịch vụ AutoIP"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:328
+#: ../panels/network/panel-common.c:324
 msgid "Line busy"
 msgstr "Đường dây bận"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:332
+#: ../panels/network/panel-common.c:328
 msgid "No dial tone"
 msgstr "Không có tông"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:336
+#: ../panels/network/panel-common.c:332
 msgid "No carrier could be established"
 msgstr "Không thể cài đặt carrier"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:340
+#: ../panels/network/panel-common.c:336
 msgid "Dialing request timed out"
 msgstr "Hết hạn yêu cầu quay số"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:344
+#: ../panels/network/panel-common.c:340
 msgid "Dialing attempt failed"
 msgstr "Lỗi quay số"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:348
+#: ../panels/network/panel-common.c:344
 msgid "Modem initialization failed"
 msgstr "Lỗi khởi động Modem"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:352
+#: ../panels/network/panel-common.c:348
 msgid "Failed to select the specified APN"
 msgstr "Lỗi chọn APN"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:356
+#: ../panels/network/panel-common.c:352
 msgid "Not searching for networks"
 msgstr "Không tìm thấy mạng"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:360
+#: ../panels/network/panel-common.c:356
 msgid "Network registration denied"
 msgstr "Đăng ký mạng bị từ chối"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:364
+#: ../panels/network/panel-common.c:360
 msgid "Network registration timed out"
 msgstr "Hết hạn đăng ký mạng"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:368
+#: ../panels/network/panel-common.c:364
 msgid "Failed to register with the requested network"
 msgstr "Lỗi đăng ký mạng yêu cầu"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:372
+#: ../panels/network/panel-common.c:368
 msgid "PIN check failed"
 msgstr "Gặp lỗi khi kiểm tra PIN"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:376
+#: ../panels/network/panel-common.c:372
 msgid "Firmware for the device may be missing"
 msgstr "Có lẽ thiếu firmware cho thiết bị"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:380
+#: ../panels/network/panel-common.c:376
 msgid "Connection disappeared"
 msgstr "Kết nối bị biến mất"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:384
+#: ../panels/network/panel-common.c:380
 msgid "Existing connection was assumed"
 msgstr "Ngầm định kết nối đã tồn tại"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:388
+#: ../panels/network/panel-common.c:384
 msgid "Modem not found"
 msgstr "không tìm thấy Modem"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:392
+#: ../panels/network/panel-common.c:388
 msgid "Bluetooth connection failed"
 msgstr "Lỗi kết nối Bluetooth"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:396
+#: ../panels/network/panel-common.c:392
 msgid "SIM Card not inserted"
 msgstr "Chưa cài SIM"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:400
+#: ../panels/network/panel-common.c:396
 msgid "SIM Pin required"
 msgstr "Cần Pin của SIM"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:404
+#: ../panels/network/panel-common.c:400
 msgid "SIM Puk required"
 msgstr "Cần Puk của SIM"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:408
+#: ../panels/network/panel-common.c:404
 msgid "SIM wrong"
 msgstr "SIM không đúng"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:412
-msgid "InfiniBand device does not support connected mode"
-msgstr "Thiết bị InfiniBand không hỗ trợ chế độ kết nối"
-
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:416
+#: ../panels/network/panel-common.c:408
 msgid "Connection dependency failed"
 msgstr "Lỗi phụ thuộc kết nối"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:440
+#: ../panels/network/panel-common.c:433
 msgid "Firmware missing"
 msgstr "thiếu firmware"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447
+#: ../panels/network/panel-common.c:437
 msgid "Cable unplugged"
 msgstr "Chưa cắm dây"
 
-#: ../panels/network/wireless-security/eap-method.c:275
-msgid "No Certificate Authority certificate chosen"
-msgstr "Chưa chọn chứng nhận CA."
-
-#: ../panels/network/wireless-security/eap-method.c:276
-msgid ""
-"Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue Wi-Fi networks.  Would you like to choose a Certificate "
-"Authority certificate?"
-msgstr ""
-"Không dùng giấy chứng nhận CA có thể là nguyên nhân gây nên mất an toàn của "
-"kết nối, mạng Wi-Fi lừa đảo. Bạn có muốn chọn một giấy chứng nhận CA không?"
+#: ../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:281
-msgid "Ignore"
-msgstr "Bỏ qua"
+#: ../panels/network/wireless-security/eap-method.c:245
+msgid "no file selected"
+msgstr "chưa chọn tập tin"
 
-#: ../panels/network/wireless-security/eap-method.c:285
-msgid "Choose CA Certificate"
-msgstr "Chọn chứng nhận CA"
+#: ../panels/network/wireless-security/eap-method.c:276
+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:645
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
-msgstr "Khóa riêng DER, PEM, hay PKCS#12 (*.der, *.pem, *.p12)"
+#: ../panels/network/wireless-security/eap-method.c:480
+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:648
+#: ../panels/network/wireless-security/eap-method.c:483
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "Giấy phép DER hay PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:271
-#: ../panels/network/wireless-security/eap-method-peap.c:280
+#: ../panels/network/wireless-security/eap-method-fast.c:72
+msgid "missing EAP-FAST PAC file"
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:287
-#: ../panels/network/wireless-security/eap-method-peap.c:246
-#: ../panels/network/wireless-security/eap-method-ttls.c:263
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:409
+#: ../panels/network/wireless-security/eap-method-fast.c:406
 msgid "Choose a PAC file"
 msgstr "Chọn tập tin PAC của bạn"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:416
+#: ../panels/network/wireless-security/eap-method-fast.c:413
 msgid "PAC files (*.pac)"
 msgstr "Tập tin PAC (*.pac)"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
-msgid "PAC _file"
-msgstr "Tập tin _PAC"
-
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
-#: ../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:4
-msgid "PAC pro_visioning"
-msgstr "PAC pro_visioning"
-
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
+#: ../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
@@ -3318,41 +3279,74 @@ msgstr "PAC pro_visioning"
 msgid " "
 msgstr " "
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
+#: ../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:7
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
 msgid "Authenticated"
 msgstr "Đã xác thực"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:8
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
 msgid "Both"
 msgstr "Cả hai"
 
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
+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
+msgid "_Inner authentication"
+msgstr "Xác thực _bên trong"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:8
+msgid "Allow automatic PAC pro_visioning"
+msgstr "Cho phép PAC pro_visioning tự động"
+
+#: ../panels/network/wireless-security/eap-method-leap.c:65
+msgid "missing EAP-LEAP username"
+msgstr "thiếu tên tài khoản EAP-LEAP"
+
+#: ../panels/network/wireless-security/eap-method-leap.c:74
+msgid "missing EAP-LEAP password"
+msgstr "thiếu mật khẩu EAP-LEAP"
+
 #: ../panels/network/wireless-security/eap-method-leap.ui.h:1
 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1
 #: ../panels/network/wireless-security/ws-leap.ui.h:1
-#: ../panels/user-accounts/data/account-dialog.ui.h:3
+#: ../panels/user-accounts/data/account-dialog.ui.h:4
 msgid "_Username"
 msgstr "_Tài khoản"
 
 #: ../panels/network/wireless-security/eap-method-leap.ui.h:3
-#: ../panels/network/wireless-security/eap-method-simple.ui.h:4
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:6
+#: ../panels/network/wireless-security/eap-method-simple.ui.h:3
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:7
 #: ../panels/network/wireless-security/ws-leap.ui.h:3
 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3
 msgid "Sho_w password"
 msgstr "_Hiện mật khẩu"
 
-#: ../panels/network/wireless-security/eap-method-peap.c:263
-#: ../panels/network/wireless-security/wireless-security.c:385
+#: ../panels/network/wireless-security/eap-method-peap.c:63
+#, c-format
+msgid "invalid EAP-PEAP CA certificate: %s"
+msgstr "giấy chứng nhận CA EAP-PEAP không hợp lệ: %s"
+
+#: ../panels/network/wireless-security/eap-method-peap.c:68
+msgid "invalid EAP-PEAP CA certificate: no certificate specified"
+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
 msgid "MD5"
 msgstr "MD5"
 
-#: ../panels/network/wireless-security/eap-method-peap.c:350
-#: ../panels/network/wireless-security/eap-method-tls.c:456
-#: ../panels/network/wireless-security/eap-method-ttls.c:350
+#: ../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
 msgid "Choose a Certificate Authority certificate"
 msgstr "Chọn một giấy chứng nhận CA"
 
@@ -3370,19 +3364,56 @@ msgstr "Phiên bản 1"
 msgid "C_A certificate"
 msgstr "Giấy chứng nhận C_A"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:7
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:4
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
+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
 msgid "PEAP _version"
 msgstr "_Phiên bản PEAP"
 
-#: ../panels/network/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "Luôn _Hỏi mật khẩu này"
+#: ../panels/network/wireless-security/eap-method-simple.c:74
+msgid "missing EAP username"
+msgstr "thiếu tên tài khoản EAP"
+
+#: ../panels/network/wireless-security/eap-method-simple.c:87
+msgid "missing EAP password"
+msgstr "thiếu mật khẩu EAP"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:68
+msgid "missing EAP-TLS identity"
+msgstr "sai định danh EAP-TLS"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:77
+#, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "giấy chứng nhận CA EAP-TLS không hợp lệ: %s"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr "giấy chứng nhận CA EAP-TLS không hợp lệ: chưa chỉ định giấy chứng nhận"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:95
+msgid "invalid EAP-TLS password: missing"
+msgstr "mật khẩu EAP-TLS không hợp lệ: thiếu"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:282
+#: ../panels/network/wireless-security/eap-method-tls.c:109
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr "khóa riêng EAP-TLS không hợp lệ: %s"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:119
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr "giấy chứng nhận người dùng EAP-TLS không hợp lệ: %s"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:316
 msgid "Unencrypted private keys are insecure"
 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:285
+#: ../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 "
@@ -3395,11 +3426,11 @@ msgstr ""
 "\n"
 "(Bạn có thể bảo vệ khóa riêng bằng mật khẩu với openssl)"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:450
+#: ../panels/network/wireless-security/eap-method-tls.c:495
 msgid "Choose your personal certificate"
 msgstr "Chọn chứng nhận cá nhân của bạn"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:462
+#: ../panels/network/wireless-security/eap-method-tls.c:507
 msgid "Choose your private key"
 msgstr "Chọn khóa riêng của bạn"
 
@@ -3411,51 +3442,57 @@ msgstr "_Thực thể"
 msgid "_User certificate"
 msgstr "Chứng nhận _người dùng"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:4
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:5
 msgid "Private _key"
 msgstr "_Khóa riêng"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:5
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:6
 msgid "_Private key password"
 msgstr "Mật khẩu khóa _riêng"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:230
+#: ../panels/network/wireless-security/eap-method-ttls.c:63
+#, c-format
+msgid "invalid EAP-TTLS CA certificate: %s"
+msgstr "giấy chứng nhận CA EAP-TTLS không hợp lệ: %s"
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:68
+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
 msgid "PAP"
 msgstr "PAP"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:247
+#: ../panels/network/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:280
+#: ../panels/network/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "Đừng _cảnh báo tôi nữa"
-
-#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "Không"
+#: ../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"
 
-#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "Có"
-
-#: ../panels/network/wireless-security/wireless-security.c:397
+#: ../panels/network/wireless-security/wireless-security.c:451
 msgid "TLS"
 msgstr "TLS"
 
-#: ../panels/network/wireless-security/wireless-security.c:421
+#: ../panels/network/wireless-security/wireless-security.c:475
+msgid "PWD"
+msgstr "PWD"
+
+#: ../panels/network/wireless-security/wireless-security.c:486
 msgid "FAST"
 msgstr "FAST"
 
-#: ../panels/network/wireless-security/wireless-security.c:432
+#: ../panels/network/wireless-security/wireless-security.c:497
 msgid "Tunneled TLS"
 msgstr "TLS Xuyên hầm"
 
-#: ../panels/network/wireless-security/wireless-security.c:443
+#: ../panels/network/wireless-security/wireless-security.c:508
 msgid "Protected EAP (PEAP)"
 msgstr "EAP được bảo vệ (PEAP)"
 
@@ -3465,6 +3502,50 @@ msgstr "EAP được bảo vệ (PEAP)"
 msgid "Au_thentication"
 msgstr "_Xác thực"
 
+#: ../panels/network/wireless-security/ws-leap.c:63
+msgid "missing leap-username"
+msgstr "thiếu leap-username"
+
+#: ../panels/network/wireless-security/ws-leap.c:74
+msgid "missing leap-password"
+msgstr "thiếu leap-password"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:107
+msgid "missing wep-key"
+msgstr "thiếu wep-key"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:116
+#, c-format
+msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
+msgstr ""
+"wep-key không hợp lệ: khóa phải có chiều dài của %zu phải chỉ chứa chữ số "
+"thập lục"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:124
+#, c-format
+msgid ""
+"invalid wep-key: key with a length of %zu must contain only ascii characters"
+msgstr ""
+"wep-key không hợp lệ: khóa phải có chiều dài của %zu phải chỉ chứa các ký tự "
+"ascii"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:130
+#, c-format
+msgid ""
+"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
+"(ascii) or 10/26 (hex)"
+msgstr ""
+"wep-key không hợp lệ: khóa phải có chiều dài của %zu. Một khóa phải hoặc là "
+"có chiều dài 5/4 (ascii) hoặc là 10/26 (chữ số thập lục)"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:137
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr "wep-key không hợp lệ: mật khẩu phải không rỗng"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:139
+msgid "invalid wep-key: passphrase must be shorter than 64 characters"
+msgstr "wep-key không hợp lệ: mật khẩu phải ngắn hơn 64 ký tự"
+
 #: ../panels/network/wireless-security/ws-wep-key.ui.h:1
 msgid "1 (Default)"
 msgstr "1 (Mặc định)"
@@ -3501,19 +3582,33 @@ msgstr "_Hiện khóa"
 msgid "WEP inde_x"
 msgstr "_Mục lục WEP"
 
+#: ../panels/network/wireless-security/ws-wpa-psk.c:70
+#, c-format
+msgid ""
+"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
+"digits"
+msgstr ""
+"wpa-psk không hợp lệ: chiều dài khóa %zu không hợp lệ. Phải là [8,63] bye "
+"hoặc 64 số thập lục"
+
+#: ../panels/network/wireless-security/ws-wpa-psk.c:79
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+"wpa-psk không hợp lệ: không thể phiên dịch khóa với 64 bye như là số thập lục"
+
 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2
 msgid "_Type"
 msgstr "_Kiểu"
 
 #: ../panels/notifications/cc-notifications-panel.c:257
-#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940
-#: ../panels/privacy/cc-privacy-panel.c:172
-#: ../panels/privacy/cc-privacy-panel.c:239
+#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973
+#: ../panels/privacy/cc-privacy-panel.c:190
+#: ../panels/privacy/cc-privacy-panel.c:257
 #: ../panels/universal-access/cc-ua-panel.c:269
-#: ../panels/universal-access/cc-ua-panel.c:582
-#: ../panels/universal-access/cc-ua-panel.c:595
-#: ../panels/universal-access/cc-ua-panel.c:607
-#: ../panels/universal-access/cc-ua-panel.c:778
+#: ../panels/universal-access/cc-ua-panel.c:590
+#: ../panels/universal-access/cc-ua-panel.c:603
+#: ../panels/universal-access/cc-ua-panel.c:615
+#: ../panels/universal-access/cc-ua-panel.c:786
 msgid "On"
 msgstr "Bật"
 
@@ -3550,16 +3645,17 @@ msgctxt "notifications"
 msgid "Show Message C_ontent on Lock Screen"
 msgstr "Hiển thị nội _dung lời nhắn trên màn hình khóa"
 
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1
-msgid "Notifications"
+#. 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/notifications/gnome-notifications-panel.desktop.in.in.h:2
+msgid "No­ti­fi­ca­tions"
 msgstr "Thông báo"
 
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2
+#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3
 msgid "Control which notifications are displayed and what they show"
 msgstr "Cấu hình xem cảnh báo nào sẽ được hiển thị và hiển thị nó như thế nào"
 
 #. Translators: those are keywords for the notifications control-center panel
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4
+#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5
 msgid "Notifications;Banner;Message;Tray;Popup;"
 msgstr ""
 "Notifications;Thông;báo;Thong;bao;Banner;Message;Nhắn;nhan;Tray;Khay;Popup;"
@@ -3579,80 +3675,69 @@ msgstr "Thông báo trên màn hình _khóa"
 msgid "Applications"
 msgstr "Ứng dụng"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170
 msgctxt "Online Account"
 msgid "Other"
 msgstr "Khác"
 
 #. translators: This is the title of the "Add Account" dialog.
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291
 #: ../panels/online-accounts/online-accounts.ui.h:2
 msgid "Add Account"
 msgstr "Thêm tài khoản"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328
 msgid "Mail"
 msgstr "Thư điện tử"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334
+msgid "Calendar"
+msgstr "Lịch"
+
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340
 msgid "Contacts"
 msgstr "Danh bạ"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346
 msgid "Chat"
 msgstr "Tán gẫu"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352
 msgid "Resources"
 msgstr "Tài nguyên"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:422
-msgid "Error logging into the account"
-msgstr "Không thể đăng nhập vào tài khoản này"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:492
-msgid "Credentials have expired."
-msgstr "Các giấy ủy nhiệm đã hết hạn."
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:496
-msgid "Sign in to enable this account."
-msgstr "Đăng nhập để bật tài khoản này."
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:501
-msgid "_Sign In"
-msgstr "Đă_ng nhập"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:748
+#: ../panels/online-accounts/cc-online-accounts-panel.c:640
 msgid "Error creating account"
 msgstr "Không thể tạo tài khoản mới"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:808
+#: ../panels/online-accounts/cc-online-accounts-panel.c:700
 msgid "Error removing account"
 msgstr "Không thể xóa tài khoản"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:844
+#: ../panels/online-accounts/cc-online-accounts-panel.c:736
 msgid "Are you sure you want to remove the account?"
 msgstr "Bạn có chắc chắn muốn xóa tài khoản này không?"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:846
+#: ../panels/online-accounts/cc-online-accounts-panel.c:738
 msgid "This will not remove the account on the server."
 msgstr "Hành động này không xóa tài khoản trên máy chủ."
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:847
+#: ../panels/online-accounts/cc-online-accounts-panel.c:739
 msgid "_Remove"
 msgstr "_Xóa"
 
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1
-msgid "Online Accounts"
+#. 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/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2
+msgid "On­line Accounts"
 msgstr "Tài khoản trực tuyến"
 
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2
+#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3
 msgid "Connect to your online accounts and decide what to use them for"
 msgstr ""
 "Kết nối các tài khoản trực tuyến của bạn và quyết định dùng chúng vào việc gì"
 
 #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application)
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4
+#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5
 msgid ""
 "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
 "Kerberos;IMAP;SMTP;Pocket;ReadItLater;"
@@ -3666,6 +3751,7 @@ msgid "No online accounts configured"
 msgstr "Chưa cấu hình tài khoản trực tuyến"
 
 #: ../panels/online-accounts/online-accounts.ui.h:3
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
 msgid "Remove Account"
 msgstr "Bỏ tài khoản"
 
@@ -3804,7 +3890,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:2252
+#: ../panels/power/cc-power-panel.c:2358
 msgid "Battery"
 msgstr "Pin"
 
@@ -3852,102 +3938,103 @@ msgstr "Pin"
 msgid "When _idle"
 msgstr "Kh_i nghỉ"
 
-#: ../panels/power/cc-power-panel.c:1640
+#: ../panels/power/cc-power-panel.c:1680
 msgid "Power Saving"
 msgstr "Tiết kiệm năng lượng"
 
-#: ../panels/power/cc-power-panel.c:1675
+#: ../panels/power/cc-power-panel.c:1715
 msgid "_Screen brightness"
 msgstr "_Màn hình sáng tối đa"
 
-#: ../panels/power/cc-power-panel.c:1694
+#: ../panels/power/cc-power-panel.c:1734
 msgid "Automatic brightness"
 msgstr "Chỉnh độ sáng tự động"
 
-#: ../panels/power/cc-power-panel.c:1714
+#: ../panels/power/cc-power-panel.c:1754
 msgid "_Keyboard brightness"
 msgstr "Độ sáng _bàn phím"
 
-#: ../panels/power/cc-power-panel.c:1724
+#: ../panels/power/cc-power-panel.c:1764
 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:1749
+#: ../panels/power/cc-power-panel.c:1789
 msgid "_Blank screen"
 msgstr "_Tắt màn hình"
 
-#: ../panels/power/cc-power-panel.c:1786
+#: ../panels/power/cc-power-panel.c:1826
 msgid "_Wi-Fi"
 msgstr "_Wi-Fi"
 
-#: ../panels/power/cc-power-panel.c:1791
+#: ../panels/power/cc-power-panel.c:1831
 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:1816
+#: ../panels/power/cc-power-panel.c:1856
 msgid "_Mobile broadband"
 msgstr "Mạng _di động băng thông rộng"
 
-#: ../panels/power/cc-power-panel.c:1821
+#: ../panels/power/cc-power-panel.c:1861
 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:1873
+#: ../panels/power/cc-power-panel.c:1906
 msgid "_Bluetooth"
 msgstr "_Bluetooth"
 
-#: ../panels/power/cc-power-panel.c:1929
+#: ../panels/power/cc-power-panel.c:1962
 msgid "When on battery power"
 msgstr "Khi sử dụng nguồn pin"
 
-#: ../panels/power/cc-power-panel.c:1931
+#: ../panels/power/cc-power-panel.c:1964
 msgid "When plugged in"
 msgstr "Khi cắm dây nguồn"
 
-#: ../panels/power/cc-power-panel.c:2023
+#: ../panels/power/cc-power-panel.c:2059
 msgid "Suspend"
 msgstr "Tạm ngưng"
 
-#: ../panels/power/cc-power-panel.c:2024
+#: ../panels/power/cc-power-panel.c:2060
 msgid "Hibernate"
 msgstr "Ngủ đông"
 
-#: ../panels/power/cc-power-panel.c:2025
+#: ../panels/power/cc-power-panel.c:2061
 msgid "Nothing"
 msgstr "Không gì"
 
 #. Frame header
-#: ../panels/power/cc-power-panel.c:2074
+#: ../panels/power/cc-power-panel.c:2175
 msgid "Suspend & Power Button"
 msgstr "Nút tạm ngưng & Tắt máy"
 
-#: ../panels/power/cc-power-panel.c:2115
+#: ../panels/power/cc-power-panel.c:2218
 msgid "_Automatic suspend"
 msgstr "_Tự động tạm dừng"
 
-#: ../panels/power/cc-power-panel.c:2116
+#: ../panels/power/cc-power-panel.c:2219
 msgid "Automatic suspend"
 msgstr "Tự động tạm dừng"
 
-#: ../panels/power/cc-power-panel.c:2180
+#: ../panels/power/cc-power-panel.c:2286
 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:2306
+#: ../panels/power/cc-power-panel.c:2412 ../shell/alt/cc-window.c:270
 msgid "Devices"
 msgstr "Thiết bị"
 
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:1
-msgid "Power"
+#. 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/power/gnome-power-panel.desktop.in.in.h:2
+msgid "Po­wer"
 msgstr "Nguồn điện"
 
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:2
+#: ../panels/power/gnome-power-panel.desktop.in.in.h:3
 msgid "View your battery status and change power saving settings"
 msgstr "Hiển thị trạng thái pin và thay đổi cài đặt chế độ tiết kiệm pin"
 
 #. Translators: those are keywords for the power control-center panel
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:4
+#: ../panels/power/gnome-power-panel.desktop.in.in.h:5
 msgid ""
 "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
 msgstr ""
@@ -4027,11 +4114,6 @@ msgstr "Dùng nguồn _pin"
 msgid "Delay"
 msgstr "Khoảng trễ"
 
-#: ../panels/printers/authentication-dialog.ui.h:2
-#: ../panels/printers/ppd-selection-dialog.ui.h:2
-msgid "Cancel"
-msgstr "Thôi"
-
 #: ../panels/printers/authentication-dialog.ui.h:3
 msgid "Authenticate"
 msgstr "Xác thực"
@@ -4041,153 +4123,153 @@ msgid "Authentication Required"
 msgstr "Cần xác thực"
 
 #. Translators: The printer is low on toner
-#: ../panels/printers/cc-printers-panel.c:678
+#: ../panels/printers/cc-printers-panel.c:683
 msgid "Low on toner"
 msgstr "Sắp hết mực"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:680
+#: ../panels/printers/cc-printers-panel.c:685
 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/cc-printers-panel.c:683
+#: ../panels/printers/cc-printers-panel.c:688
 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/cc-printers-panel.c:686
+#: ../panels/printers/cc-printers-panel.c:691
 msgid "Out of developer"
 msgstr "Hết thuốc hiện hình"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:688
+#: ../panels/printers/cc-printers-panel.c:693
 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/cc-printers-panel.c:690
+#: ../panels/printers/cc-printers-panel.c:695
 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/cc-printers-panel.c:692
+#: ../panels/printers/cc-printers-panel.c:697
 msgid "Open cover"
 msgstr "Mở nắp"
 
 #. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:694
+#: ../panels/printers/cc-printers-panel.c:699
 msgid "Open door"
 msgstr "Mở cửa"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:696
+#: ../panels/printers/cc-printers-panel.c:701
 msgid "Low on paper"
 msgstr "Sắp hết giấy"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:698
+#: ../panels/printers/cc-printers-panel.c:703
 msgid "Out of paper"
 msgstr "Hết giấy"
 
 #. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:700
+#: ../panels/printers/cc-printers-panel.c:705
 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/cc-printers-panel.c:702
-#: ../panels/printers/cc-printers-panel.c:893
+#: ../panels/printers/cc-printers-panel.c:707
+#: ../panels/printers/cc-printers-panel.c:897
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "Dừng"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:704
+#: ../panels/printers/cc-printers-panel.c:709
 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/cc-printers-panel.c:706
+#: ../panels/printers/cc-printers-panel.c:711
 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/cc-printers-panel.c:708
+#: ../panels/printers/cc-printers-panel.c:713
 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/cc-printers-panel.c:710
+#: ../panels/printers/cc-printers-panel.c:715
 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 (printer is being configured right now)
-#: ../panels/printers/cc-printers-panel.c:820
+#: ../panels/printers/cc-printers-panel.c:824
 msgctxt "printer state"
 msgid "Configuring"
 msgstr "Đang cấu hình"
 
 #. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/cc-printers-panel.c:879
+#: ../panels/printers/cc-printers-panel.c:883
 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/cc-printers-panel.c:884
+#: ../panels/printers/cc-printers-panel.c:888
 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/cc-printers-panel.c:889
+#: ../panels/printers/cc-printers-panel.c:893
 msgctxt "printer state"
 msgid "Processing"
 msgstr "Đang xử lý"
 
 #. Translators: Toner supply
-#: ../panels/printers/cc-printers-panel.c:1009
+#: ../panels/printers/cc-printers-panel.c:1013
 msgid "Toner Level"
 msgstr "Mức trống mực"
 
 #. Translators: Ink supply
-#: ../panels/printers/cc-printers-panel.c:1012
+#: ../panels/printers/cc-printers-panel.c:1016
 msgid "Ink Level"
 msgstr "Mức mực"
 
 #. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/cc-printers-panel.c:1015
+#: ../panels/printers/cc-printers-panel.c:1019
 msgid "Supply Level"
 msgstr "Mức cung cấp"
 
 #. Translators: Printer's state (printer is being installed right now)
-#: ../panels/printers/cc-printers-panel.c:1033
+#: ../panels/printers/cc-printers-panel.c:1037
 msgctxt "printer state"
 msgid "Installing"
 msgstr "Đang cài đặt"
 
 #. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:1541
+#: ../panels/printers/cc-printers-panel.c:1551
 #, c-format
 msgid "%u active"
 msgid_plural "%u active"
 msgstr[0] "%u đang hoạt động"
 
 #. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:1882
+#: ../panels/printers/cc-printers-panel.c:1892
 msgid "Failed to add new printer."
 msgstr "Không thể thêm máy in mới."
 
-#: ../panels/printers/cc-printers-panel.c:2049
+#: ../panels/printers/cc-printers-panel.c:2073
 msgid "Select PPD File"
 msgstr "Chọn tập tin PPD"
 
-#: ../panels/printers/cc-printers-panel.c:2058
+#: ../panels/printers/cc-printers-panel.c:2082
 msgid ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
@@ -4195,49 +4277,46 @@ msgstr ""
 "Tập tin PostScript Printer Description (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
 
-#: ../panels/printers/cc-printers-panel.c:2365
+#: ../panels/printers/cc-printers-panel.c:2389
 msgid "No suitable driver found"
 msgstr "Không tìm thấy trình điều khiển phù hợp"
 
-#: ../panels/printers/cc-printers-panel.c:2436
+#: ../panels/printers/cc-printers-panel.c:2460
 msgid "Searching for preferred drivers…"
 msgstr "Đang tìm trình điều khiển phù hợp…"
 
-#: ../panels/printers/cc-printers-panel.c:2457
+#: ../panels/printers/cc-printers-panel.c:2481
 msgid "Select from database…"
 msgstr "Chọn từ cơ sở dữ liệu…"
 
-#: ../panels/printers/cc-printers-panel.c:2466
+#: ../panels/printers/cc-printers-panel.c:2490
 msgid "Provide PPD File…"
 msgstr "Cung cấp tập tin PPD…"
 
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2617
-#: ../panels/printers/cc-printers-panel.c:2640
+#: ../panels/printers/cc-printers-panel.c:2637
+#: ../panels/printers/cc-printers-panel.c:2660
 msgid "Test page"
 msgstr "Trang in thử"
 
-#: ../panels/printers/cc-printers-panel.c:2753
-msgid "No printers"
-msgstr "Không có máy in"
-
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:3099
+#: ../panels/printers/cc-printers-panel.c:3115
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "Không thể tải giao diện: %s"
 
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1
-msgid "Printers"
+#. 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/printers/gnome-printers-panel.desktop.in.in.h:2
+msgid "Prin­ters"
 msgstr "Máy in"
 
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3
 msgid "Add printers, view printer jobs and decide how you want to print"
 msgstr ""
 "Thêm máy in, xem các công việc in và quyết định bạn muốn in như thế nào"
 
 #. Translators: those are keywords for the printing control-center panel
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5
 msgid "Printer;Queue;Print;Paper;Ink;Toner;"
 msgstr "Printer;Máy;in;May;Queue;Print;In;Paper;Giấy;Giay;Ink;Mực;Muc;Toner;"
 
@@ -4399,6 +4478,11 @@ 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:1676
+msgid "Bluetooth"
+msgstr "Bluetooth"
+
 #. Translators: Location of found network printer (e.g. Kitchen, Reception)
 #: ../panels/printers/pp-new-printer-dialog.c:1713
 #, c-format
@@ -4610,13 +4694,17 @@ msgstr "_In thử"
 msgid "_Options"
 msgstr "_Tùy chọn"
 
+#: ../panels/printers/printers.ui.h:23
+msgid "No printers"
+msgstr "Không có máy in"
+
 #. Translators: This button adds new printer.
-#: ../panels/printers/printers.ui.h:24
+#: ../panels/printers/printers.ui.h:25
 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:26
+#: ../panels/printers/printers.ui.h:27
 msgid ""
 "Sorry! The system printing service\n"
 "doesn't seem to be available."
@@ -4624,70 +4712,70 @@ msgstr ""
 "Rất tiếc! Dịch vụ in hệ thống\n"
 "hình như không sẵn sàng."
 
-#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24
+#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24
 msgid "Screen Lock"
 msgstr "Khóa màn hình"
 
-#: ../panels/privacy/cc-privacy-panel.c:420
+#: ../panels/privacy/cc-privacy-panel.c:438
 msgid "In use"
 msgstr "Đang dùng"
 
-#: ../panels/privacy/cc-privacy-panel.c:425
+#: ../panels/privacy/cc-privacy-panel.c:443
 msgctxt "Location services status"
 msgid "On"
 msgstr "Bật"
 
-#: ../panels/privacy/cc-privacy-panel.c:426
+#: ../panels/privacy/cc-privacy-panel.c:444
 msgctxt "Location services status"
 msgid "Off"
 msgstr "Tắt"
 
-#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42
+#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42
 msgid "Location Services"
 msgstr "Dịch vụ vị trí"
 
-#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19
+#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19
 msgid "Usage & History"
 msgstr "Sử dụng & Lịch sử"
 
-#: ../panels/privacy/cc-privacy-panel.c:1001
+#: ../panels/privacy/cc-privacy-panel.c:1067
 msgid "Empty all items from Trash?"
 msgstr "Bỏ mọi thứ trong thùng rác chứ?"
 
-#: ../panels/privacy/cc-privacy-panel.c:1002
+#: ../panels/privacy/cc-privacy-panel.c:1068
 msgid "All items in the Trash will be permanently deleted."
 msgstr "Toàn bộ nội dung chứa trong Thùng rác sẽ bị xóa vĩnh viễn."
 
-#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34
+#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34
 msgid "_Empty Trash"
 msgstr "Đổ _rác"
 
-#: ../panels/privacy/cc-privacy-panel.c:1026
+#: ../panels/privacy/cc-privacy-panel.c:1092
 msgid "Delete all the temporary files?"
 msgstr "Xóa tất cả các tập tin tạm?"
 
-#: ../panels/privacy/cc-privacy-panel.c:1027
+#: ../panels/privacy/cc-privacy-panel.c:1093
 msgid "All the temporary files will be permanently deleted."
 msgstr "Toàn bộ các tập tin tạm sẽ bị xóa vĩnh viễn."
 
-#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35
+#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35
 msgid "_Purge Temporary Files"
 msgstr "_Xóa tập tin tạm"
 
-#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29
+#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29
 msgid "Purge Trash & Temporary Files"
 msgstr "Đổ rác & tập tin tạm"
 
-#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36
+#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36
 msgid "Software Usage"
 msgstr "Cách dùng phần mềm"
 
-#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46
+#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46
 msgid "Problem Reporting"
 msgstr "Báo cáo trục trặc"
 
 #. translators: '%s' is the distributor's name, such as 'Fedora'
-#: ../panels/privacy/cc-privacy-panel.c:1145
+#: ../panels/privacy/cc-privacy-panel.c:1211
 #, c-format
 msgid ""
 "Sending reports of technical problems helps us improve %s. Reports are sent "
@@ -4696,22 +4784,23 @@ msgstr ""
 "Báo cáo trục trặc kỹ thuật cho chúng tôi để giúp chúng tôi nâng cao %s. Báo "
 "cáo gửi nặc danh và xóa sạch dữ liệu cá nhân."
 
-#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41
+#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41
 msgid "Privacy Policy"
 msgstr "Chính sách riêng tư"
 
-#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1
-msgid "Privacy"
+#. 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/privacy/gnome-privacy-panel.desktop.in.in.h:2
+msgid "Pri­va­cy"
 msgstr "Riêng tư"
 
-#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2
+#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3
 msgid "Protect your personal information and control what others might see"
 msgstr ""
 "Bảo về thông tin cá nhân của bạn và không khiển xem người khác có thể xem "
 "được những gì"
 
 #. Translators: those are keywords for the privacy control-center panel
-#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4
+#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5
 msgid ""
 "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
 "network;identity;"
@@ -4787,7 +4876,7 @@ msgstr "Giữ lại _Lịch sử"
 
 #: ../panels/privacy/privacy.ui.h:23
 msgid "Cl_ear Recent History"
-msgstr "Xóa _Sạch Danh sách Mới dùng"
+msgstr "_Xóa Danh sách Mới dùng"
 
 #: ../panels/privacy/privacy.ui.h:25
 msgid "The Screen Lock protects your privacy when you are away."
@@ -4877,30 +4966,30 @@ msgstr "Không tìm thấy lãnh thổ"
 
 #: ../panels/region/cc-input-chooser.c:182
 msgid "No input sources found"
-msgstr "Không tìm thấy nguồn nhập"
+msgstr "Không tìm thấy nguồn nhập liệu"
 
 #: ../panels/region/cc-input-chooser.c:992
 msgctxt "Input Source"
 msgid "Other"
 msgstr "Khác"
 
-#: ../panels/region/cc-region-panel.c:248
-#: ../panels/user-accounts/um-user-panel.c:1069
+#: ../panels/region/cc-region-panel.c:247
+#: ../panels/user-accounts/um-user-panel.c:1087
 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/cc-region-panel.c:252
-#: ../panels/user-accounts/um-user-panel.c:1073
+#: ../panels/region/cc-region-panel.c:251
+#: ../panels/user-accounts/um-user-panel.c:1091
 msgid "Restart Now"
 msgstr "Khởi động lại ngay"
 
-#: ../panels/region/cc-region-panel.c:889
+#: ../panels/region/cc-region-panel.c:888
 msgid "No input source selected"
-msgstr "Chưa chọn nguồn nhập"
+msgstr "Chưa chọn nguồn nhập liệu"
 
-#: ../panels/region/cc-region-panel.c:1807
+#: ../panels/region/cc-region-panel.c:1779
 msgid "Login _Screen"
 msgstr "_Màn hình đăng nhập"
 
@@ -4933,17 +5022,19 @@ msgstr "Hệ đo lường"
 msgid "Paper"
 msgstr "Giấy"
 
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:1
-msgid "Region & Language"
-msgstr "Lãnh thổ và ngôn 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/region/gnome-region-panel.desktop.in.in.h:2
+msgid "Re­gion & Lan­guage"
+msgstr "Lãnh thổ & ngôn ngữ"
+
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:3
 msgid ""
 "Select your display language, formats, keyboard layouts and input sources"
-msgstr "Chọn ngôn ngữ hiển thị, định dạng, bố cục của bàn phím và nguồn nhập"
+msgstr ""
+"Chọn ngôn ngữ hiển thị, định dạng, bố cục của bàn phím và nguồn nhập liệu"
 
 #. Translators: those are keywords for the region control-center panel
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:4
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:5
 msgid "Language;Layout;Keyboard;Input;"
 msgstr ""
 "Language;Ngôn;ngữ;Ngon;ngu;Layout;Bố;trí;Bo;tri;Keyboard;Bàn;phím;Ban;phim;"
@@ -4951,7 +5042,7 @@ msgstr ""
 
 #: ../panels/region/input-chooser.ui.h:1
 msgid "Add an Input Source"
-msgstr "Thêm nguồn nhập"
+msgstr "Thêm nguồn nhập liệu"
 
 #: ../panels/region/input-chooser.ui.h:4
 msgid "Input methods can't be used on the login screen"
@@ -4959,7 +5050,7 @@ msgstr "Các phương thức nhập liệu không thể dùng tại màn hình 
 
 #: ../panels/region/input-options.ui.h:1
 msgid "Input Source Options"
-msgstr "Tùy chọn nguồn nhập"
+msgstr "Tùy chọn nguồn nhập liệu"
 
 #: ../panels/region/input-options.ui.h:2
 msgid "Use the _same source for all windows"
@@ -4975,7 +5066,7 @@ msgstr "Phím tắt bàn phím"
 
 #: ../panels/region/input-options.ui.h:5
 msgid "Switch to previous source"
-msgstr "Chuyển sang nguồn cũ"
+msgstr "Chuyển sang nguồn trước"
 
 #: ../panels/region/input-options.ui.h:6
 msgid "Super+Shift+Space"
@@ -5002,7 +5093,7 @@ 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:11
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
 msgid "_Language"
 msgstr "_Ngôn ngữ"
 
@@ -5024,53 +5115,38 @@ msgstr "Thiết bị nhập"
 
 #: ../panels/region/region.ui.h:7
 msgid "Add input source"
-msgstr "Thêm nguồn nhập"
+msgstr "Thêm nguồn nhập liệu"
 
 #: ../panels/region/region.ui.h:8
 msgid "Remove input source"
-msgstr "Gỡ bỏ nguồn nhập"
+msgstr "Gỡ bỏ nguồn nhập liệu"
 
 #: ../panels/region/region.ui.h:9
 msgid "Move input source up"
-msgstr "Đưa nguồn nhập lên trên"
+msgstr "Đưa nguồn nhập liệu lên trên"
 
 #: ../panels/region/region.ui.h:10
 msgid "Move input source down"
-msgstr "Đưa nguồn nhập xuống dưới"
+msgstr "Đưa nguồn nhập liệu xuống dưới"
 
 #: ../panels/region/region.ui.h:11
 msgid "Configure input source"
-msgstr "Cấu hình nguồn nhập"
+msgstr "Cấu hình nguồn nhập liệu"
 
 #: ../panels/region/region.ui.h:12
 msgid "Show input source keyboard layout"
-msgstr "Hiển thị bố trí bàn phím nguồn nhập"
+msgstr "Hiển thị bố trí bàn phím nguồn nhập liệu"
 
 #: ../panels/region/region.ui.h:13
 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:476
-msgctxt "Search Location"
-msgid "Places"
-msgstr "Mở nhanh"
-
-#: ../panels/search/cc-search-locations-dialog.c:478
-msgctxt "Search Location"
-msgid "Bookmarks"
-msgstr "Đánh dấu"
-
-#: ../panels/search/cc-search-locations-dialog.c:480
-msgctxt "Search Location"
-msgid "Other"
-msgstr "Khác"
-
-#: ../panels/search/cc-search-locations-dialog.c:678
+#: ../panels/search/cc-search-locations-dialog.c:634
 msgid "Select Location"
 msgstr "_Chọn vị trí"
 
-#: ../panels/search/cc-search-locations-dialog.c:682
+#: ../panels/search/cc-search-locations-dialog.c:638
 msgid "_OK"
 msgstr "Đồn_g ý"
 
@@ -5078,11 +5154,12 @@ msgstr "Đồn_g ý"
 msgid "No applications found"
 msgstr "Không tìm thấy ứng dụng"
 
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:1
+#. 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/search/gnome-search-panel.desktop.in.in.h:2
 msgid "Search"
 msgstr "Tìm kiếm"
 
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:2
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:3
 msgid ""
 "Control which applications show search results in the Activities Overview"
 msgstr ""
@@ -5090,7 +5167,7 @@ msgstr ""
 "cực”"
 
 #. Translators: those are keywords for the search control-center panel
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:4
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:5
 msgid "Search;Find;Index;Hide;Privacy;Results;"
 msgstr ""
 "Search;Tìm;tim;Find;Index;Mục;lục;muc;luc;Hide;Ẩn;an;Privacy;Riêng;tư;rieng;"
@@ -5100,6 +5177,18 @@ msgstr ""
 msgid "Search Locations"
 msgstr "Vị trí tìm"
 
+#: ../panels/search/search-locations-dialog.ui.h:2
+msgid "Places"
+msgstr "Mở nhanh"
+
+#: ../panels/search/search-locations-dialog.ui.h:3
+msgid "Bookmarks"
+msgstr "Đánh dấu"
+
+#: ../panels/search/search-locations-dialog.ui.h:4
+msgid "Other"
+msgstr "Khác"
+
 #: ../panels/search/search.ui.h:1
 msgid "Move Up"
 msgstr "Chuyển lên"
@@ -5112,6 +5201,11 @@ msgstr "Chuyển xuống"
 msgid "Preferences"
 msgstr "Tùy thích"
 
+#. Label
+#: ../panels/sharing/cc-sharing-networks.c:303
+msgid "No networks selected for sharing"
+msgstr "Chưa chọn mạng để chia sẻ"
+
 #: ../panels/sharing/cc-sharing-panel.c:263
 msgctxt "service is enabled"
 msgid "On"
@@ -5149,37 +5243,43 @@ msgstr ""
 #: ../panels/sharing/cc-sharing-panel.c:682
 #, c-format
 msgid ""
-"Allow remote users to connect using the Secure Shell command:\n"
+"When remote login is enabled, remote users can connect using the Secure "
+"Shell command:\n"
 "<a href=\"ssh %s\">ssh %s</a>"
 msgstr ""
-"Cho phép người điều khiển từ xa kết nối dùng lệnh “Secure Shell” (ssh):\n"
+"Khi đăng nhập máy mạng được bật, những người dùng máy mạng có thể sử dụng "
+"lệnh “Secure Shell” (ssh):\n"
 "<a href=\"ssh %s\">ssh %s</a>"
 
 #: ../panels/sharing/cc-sharing-panel.c:684
 #, c-format
 msgid ""
-"Allow remote users to view or control your screen by connecting to: <a href="
-"\"vnc://%s\">vnc://%s</a>"
+"Screen sharing allows remote users to view or control your screen by "
+"connecting to <a href=\"vnc://%s\">vnc://%s</a>"
 msgstr ""
-"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>"
+"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:796
 msgid "Copy"
 msgstr "Chép"
 
 #: ../panels/sharing/cc-sharing-panel.c:1122
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1
 msgid "Sharing"
 msgstr "Chia sẻ"
 
+#. 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/sharing/gnome-sharing-panel.desktop.in.in.h:2
+msgid "Sha­ring"
+msgstr "Chia sẻ"
+
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3
 msgid "Control what you want to share with others"
 msgstr ""
 "Điều khiển việc bạn muôn chia sẻ những gì với các máy tính hay thiết bị khác"
 
 #. Translators: those are keywords for the sharing control-center panel
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5
 msgid ""
 "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
 "movies;server;renderer;"
@@ -5188,6 +5288,10 @@ msgstr ""
 "điều;khiển;desktop;media;đa phương tiện;da phuong tien;audio;nhạc;nhạc;video;"
 "phim;pictures;photos;ảnh;anh;movies;server;renderer;"
 
+#: ../panels/sharing/networks.ui.h:1
+msgid "Networks"
+msgstr "Mạng"
+
 #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1
 msgid "Enable or disable remote login"
 msgstr "Bật hoặc tắt đăng nhập từ xa"
@@ -5196,25 +5300,13 @@ msgstr "Bật hoặc tắt đăng nhập từ xa"
 msgid "Authentication is required to enable or disable remote login"
 msgstr "Cần xác thực để bật hoặc tắt đăng nhập từ xa"
 
-#. Label
-#: ../panels/sharing/cc-sharing-networks.c:303
-msgid "No networks selected for sharing"
-msgstr "Chưa chọn mạng để chia sẻ"
-
-#.
-#. * vim: sw=2 ts=8 cindent noai bs=2
-#.
-#: ../panels/sharing/networks.ui.h:1
-msgid "Networks"
-msgstr "Mạng"
-
 #: ../panels/sharing/sharing.ui.h:1
 msgid "_Computer Name"
 msgstr "Tên má_y tính"
 
 #: ../panels/sharing/sharing.ui.h:2
-msgid "_Personal File Sharing"
-msgstr "Chia sẻ tập tin _cá nhân"
+msgid "_File Sharing"
+msgstr "Chia sẻ _tập tin"
 
 #: ../panels/sharing/sharing.ui.h:3
 msgid "_Screen Sharing"
@@ -5233,8 +5325,8 @@ msgid "Some services are disabled because of no network access."
 msgstr "Một số dịch vụ bị tắt bởi vì không truy cập được mạng."
 
 #: ../panels/sharing/sharing.ui.h:7
-msgid "Personal File Sharing"
-msgstr "Chia sẻ tập tin cá nhân"
+msgid "File Sharing"
+msgstr "Chia sẻ tập tin"
 
 #: ../panels/sharing/sharing.ui.h:8
 msgid "_Require Password"
@@ -5249,8 +5341,8 @@ msgid "Screen Sharing"
 msgstr "Chia sẻ màn hình"
 
 #: ../panels/sharing/sharing.ui.h:12
-msgid "_Allow Remote Control"
-msgstr "_Cho phép điều khiển từ xa"
+msgid "_Allow connections to control the screen"
+msgstr "Cho _phép các kết nối điều khiển màn hinh"
 
 #: ../panels/sharing/sharing.ui.h:13
 msgid "_Password:"
@@ -5277,11 +5369,8 @@ msgid "Media Sharing"
 msgstr "Chia sẻ phương tiện"
 
 #: ../panels/sharing/sharing.ui.h:19
-msgid ""
-"Media sharing allows you to share music, photos and videos over the network."
-msgstr ""
-"Chia sẻ đa phương tiện cho phép bạn chia sẻ nhạc, ảnh, phim với những người "
-"khác qua mạng."
+msgid "Share music, photos and videos over the network."
+msgstr "Chia sẻ nhạc, ảnh, phim với những người khác qua mạng."
 
 #: ../panels/sharing/sharing.ui.h:20
 msgid "Folders"
@@ -5411,11 +5500,6 @@ msgstr "Thử _loa"
 msgid "Peak detect"
 msgstr "Dò tìm đỉnh"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1493
-#: ../panels/sound/gvc-sound-theme-chooser.c:564
-msgid "Name"
-msgstr "Tên"
-
 #: ../panels/sound/gvc-mixer-dialog.c:1512
 msgid "Device"
 msgstr "Thiết bị"
@@ -5511,16 +5595,21 @@ msgstr "Thử"
 msgid "Subwoofer"
 msgstr "Siêu trầm"
 
-#: ../panels/sound/sound-theme-file-utils.c:290
+#: ../panels/sound/sound-theme-file-utils.c:304
 msgid "Custom"
 msgstr "Tự chọ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/universal-access/gnome-universal-access-panel.desktop.in.in.h:2
+msgid "Uni­ver­sal Access"
+msgstr "Hỗ trợ truy cập"
+
+#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3
 msgid "Make it easier to see, hear, type, point and click"
 msgstr "Làm cho việc xem, nghe, gõ, di và bấm chuột trở nên dễ dàng hơn"
 
 #. Translators: those are keywords for the universal access control-center panel
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4
+#: ../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;"
@@ -5620,8 +5709,8 @@ msgid "Sound Keys"
 msgstr "Phím âm thanh"
 
 #: ../panels/universal-access/uap.ui.h:25
-msgid "Beep when Num Lock or Caps Lock are turned on."
-msgstr "Kêu bíp khi các phím Num Lock hay Caps Lock được bật."
+msgid "Beep when Num Lock or Caps Lock are turned on or off."
+msgstr "Kêu bíp khi các phím Num Lock hay Caps Lock được bật hay tắt."
 
 #: ../panels/universal-access/uap.ui.h:26
 msgid "Visual Alerts"
@@ -6002,94 +6091,68 @@ msgid "Color Effects"
 msgstr "Hiệu ứng màu"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:1
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1
-#: ../panels/user-accounts/um-account-type.c:34
-msgctxt "Account type"
-msgid "Standard"
-msgstr "Tiêu chuẩn"
+#: ../panels/user-accounts/data/join-dialog.ui.h:1
+msgid "Add User"
+msgstr "Thêm người dùng"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:2
+#: ../panels/user-accounts/data/account-dialog.ui.h:5
+msgid "_Full Name"
+msgstr "_Họ tên"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:6
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
-#: ../panels/user-accounts/um-account-type.c:36
-msgctxt "Account type"
+msgid "Standard"
+msgstr "Chuẩn"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:7
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
 msgid "Administrator"
 msgstr "Quản trị"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:4
-msgid "_Full Name"
-msgstr "_Họ tên"
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:5
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
+#: ../panels/user-accounts/data/account-dialog.ui.h:8
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
 msgid "Account _Type"
 msgstr "Kiểu _tài khoản"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:7
+#: ../panels/user-accounts/data/account-dialog.ui.h:10
 msgid "Allow user to set a password when they next _login"
 msgstr "Cho phép người dùng đặt mật khẩu khi họ đăng nhậ_p lần kế tiếp"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:8
+#: ../panels/user-accounts/data/account-dialog.ui.h:11
 msgid "Set a password _now"
 msgstr "Đặt mật khẩu mới _ngay"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:10
-msgid "_Verify"
-msgstr "_Kiểm tra"
+#: ../panels/user-accounts/data/account-dialog.ui.h:13
+msgid "_Confirm"
+msgstr "Xá_c nhận"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:11
+#: ../panels/user-accounts/data/account-dialog.ui.h:14
 msgid ""
 "Enterprise login allows an existing centrally managed user account to be "
-"used on this device."
+"used on this device. You can also use this account to access company "
+"resources on the internet."
 msgstr ""
-"Đăng nhập theo các doanh nghiệp cho phép các tài khoản người dùng được quản "
-"lý theo kiểu tập trung để sử dụng trên thiết bị này."
+"Đăng nhập theo cách doanh nghiệp cho phép các tài khoản người dùng được quản "
+"lý theo kiểu tập trung để sử dụng trên thiết bị này. Bạn có thể sử dụng tài "
+"khoản này để truy cập các nguồn tài nguyên của công ty trên mạng internet."
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:12
+#: ../panels/user-accounts/data/account-dialog.ui.h:15
+#: ../panels/user-accounts/data/join-dialog.ui.h:9
 msgid "_Domain"
 msgstr "_Miền"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:13
-msgid ""
-"Go online to add\n"
-"enterprise login accounts."
-msgstr ""
-"Kết nối mạng để\n"
-"thêm tài khoản đăng nhập kiểu doanh nghiệp."
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:15
-msgid "_Enterprise Login"
-msgstr "Đăng nhập _Kiểu doanh nghiệp"
-
 #: ../panels/user-accounts/data/account-dialog.ui.h:16
-#: ../panels/user-accounts/um-account-dialog.c:1466
-msgid "Add User"
-msgstr "Thêm người dùng"
-
-#. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
-#: ../panels/user-accounts/data/account-dialog.ui.h:19
-msgid "_Enroll"
-msgstr "_Enroll"
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:20
-msgid "Domain Administrator Login"
-msgstr "Đăng nhập quản trị miền"
+msgid "You are Offline"
+msgstr "Bạn đang Ngoại tuyến"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:21
-msgid ""
-"In order to use enterprise logins, this computer needs to be\n"
-"enrolled in the domain. Please have your network administrator\n"
-"type their domain password here."
+#: ../panels/user-accounts/data/account-dialog.ui.h:17
+msgid "You must be online in order to add enterprise users."
 msgstr ""
-"Để dùng đăng nhập kiểu doanh nghiệp, máy này cần nằm trong miền. Hãy nhờ "
-"quản trị mạng của bạn nhập mật khẩu miền vào đây."
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:24
-msgid "Administrator _Name"
-msgstr "_Tên quản trị"
+"Bạn phải kết nối trực tuyến để thêm tài khoản đăng nhập kiểu doanh nghiệp."
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:25
-msgid "Administrator Password"
-msgstr "Mật khẩu quản trị"
+#: ../panels/user-accounts/data/account-dialog.ui.h:18
+msgid "_Enterprise Login"
+msgstr "Đăng nhập _Kiểu doanh nghiệp"
 
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:1
 msgid "Left thumb"
@@ -6124,7 +6187,7 @@ msgid "Right little finger"
 msgstr "Ngón út tay phải"
 
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:9
-#: ../panels/user-accounts/um-fingerprint-dialog.c:686
+#: ../panels/user-accounts/um-fingerprint-dialog.c:687
 msgid "Enable Fingerprint Login"
 msgstr "Bật đăng nhập bằng vân tay"
 
@@ -6163,9 +6226,31 @@ msgstr ""
 "Login;Đăng;nhập;Dang;nhap;Name;Tên;Ten;Fingerprint;Vân;tay;Van;Avatar;Logo;"
 "Face;Mặt;Mat;Password;Mật;khẩu;mã;Mat;khau;ma;"
 
-#: ../panels/user-accounts/data/history-dialog.ui.h:1
-msgid "Login History"
-msgstr "Lịch sử đăng nhập"
+#. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
+#: ../panels/user-accounts/data/join-dialog.ui.h:4
+msgid "_Enroll"
+msgstr "_Enroll"
+
+#: ../panels/user-accounts/data/join-dialog.ui.h:5
+msgid "Domain Administrator Login"
+msgstr "Đăng nhập quản trị miền"
+
+#: ../panels/user-accounts/data/join-dialog.ui.h:6
+msgid ""
+"In order to use enterprise logins, this computer needs to be\n"
+"enrolled in the domain. Please have your network administrator\n"
+"type their domain password here."
+msgstr ""
+"Để dùng đăng nhập kiểu doanh nghiệp, máy này cần nằm trong miền. Hãy nhờ "
+"quản trị mạng của bạn nhập mật khẩu miền vào đây."
+
+#: ../panels/user-accounts/data/join-dialog.ui.h:10
+msgid "Administrator _Name"
+msgstr "_Tên quản trị"
+
+#: ../panels/user-accounts/data/join-dialog.ui.h:11
+msgid "Administrator Password"
+msgstr "Mật khẩu quản trị"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:1
 msgid "Change Password"
@@ -6188,38 +6273,30 @@ msgid "Current _Password"
 msgstr "_Mật khẩu hiện tại"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:7
-msgid "Allow user to set a password when they next login"
-msgstr "Cho phép người dùng đặt mật khẩu khi họ đăng nhập lần kế tiếp"
+msgid "Allow user to change their password on next login"
+msgstr "Cho phép người dùng thay đổi mật khẩu khi họ đăng nhập lần kế tiếp"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:8
 msgid "Set a password now"
 msgstr "Đặt mật khẩu mới ngay"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
-msgid "Add User Account"
-msgstr "Thêm tài khoản người dùng"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
-msgid "Remove User Account"
-msgstr "Bỏ tài khoản người dùng"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1
+msgid "_Add User…"
+msgstr "_Thêm người dùng…"
 
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
-msgid "Login Options"
-msgstr "Tùy chọn đăng nhập"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
 msgid "A_utomatic Login"
 msgstr "Đăng nhập _tự động"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
 msgid "_Fingerprint Login"
 msgstr "Đăng nhập bằng _vân tay"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
 msgid "User Icon"
 msgstr "Biểu tượng người dùng"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
 msgid "Last Login"
 msgstr "Đăng nhập cuối"
 
@@ -6321,8 +6398,8 @@ msgstr "Hãy thử thêm các chữ cái, chữ số và ký hiệu."
 
 #: ../panels/user-accounts/pw-utils.c:117
 msgctxt "Password hint"
-msgid "Mix uppercase and lowercase and use a number or two."
-msgstr "Trộn chữ cái HOA và thường cùng với một vài chữ số."
+msgid "Mix uppercase and lowercase and try to use a number or two."
+msgstr "Trộn chữ cái HOA và thường cùng với một chữ số hoặc hai."
 
 #: ../panels/user-accounts/pw-utils.c:119
 msgctxt "Password hint"
@@ -6413,32 +6490,32 @@ msgid "Unknown error"
 msgstr "Lỗi chưa biết"
 
 #: ../panels/user-accounts/um-account-dialog.c:34
-msgid "Should match the web address of your account provider."
+msgid "Should match the web address of your login provider."
 msgstr "Nên khớp với địa chỉ web của nhà cung cấp tài khoản cho bạn."
 
 #: ../panels/user-accounts/um-account-dialog.c:228
 msgid "Failed to add account"
 msgstr "Gặp lỗi khi thêm tài khoản"
 
-#: ../panels/user-accounts/um-account-dialog.c:452
+#: ../panels/user-accounts/um-account-dialog.c:448
 msgid "Passwords do not match."
 msgstr "Mật khẩu không khớp nhau."
 
-#: ../panels/user-accounts/um-account-dialog.c:733
-#: ../panels/user-accounts/um-account-dialog.c:779
-#: ../panels/user-accounts/um-account-dialog.c:800
+#: ../panels/user-accounts/um-account-dialog.c:702
+#: ../panels/user-accounts/um-account-dialog.c:748
+#: ../panels/user-accounts/um-account-dialog.c:769
 msgid "Failed to register account"
 msgstr "Gặp lỗi khi đăng ký tài khoản"
 
-#: ../panels/user-accounts/um-account-dialog.c:923
+#: ../panels/user-accounts/um-account-dialog.c:892
 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:982
+#: ../panels/user-accounts/um-account-dialog.c:965
 msgid "Failed to join domain"
 msgstr "Gặp lỗi khi gia nhập miền"
 
-#: ../panels/user-accounts/um-account-dialog.c:1043
+#: ../panels/user-accounts/um-account-dialog.c:1026
 msgid ""
 "That login name didn't work.\n"
 "Please try again."
@@ -6446,7 +6523,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:1050
+#: ../panels/user-accounts/um-account-dialog.c:1033
 msgid ""
 "That login password didn't work.\n"
 "Please try again."
@@ -6454,14 +6531,24 @@ 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:1058
+#: ../panels/user-accounts/um-account-dialog.c:1041
 msgid "Failed to log into domain"
 msgstr "Gặp lỗi khi đăng nhập miền"
 
-#: ../panels/user-accounts/um-account-dialog.c:1116
+#: ../panels/user-accounts/um-account-dialog.c:1099
 msgid "Unable 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
+msgctxt "Account type"
+msgid "Standard"
+msgstr "Tiêu chuẩn"
+
+#: ../panels/user-accounts/um-account-type.c:36
+msgctxt "Account type"
+msgid "Administrator"
+msgstr "Quản trị"
+
 #: ../panels/user-accounts/um-fingerprint-dialog.c:138
 msgid ""
 "You are not allowed to access the device. Contact your system administrator."
@@ -6481,15 +6568,15 @@ msgstr "Gặp lỗi nội bộ."
 msgid "Enabled"
 msgstr "Bật"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:263
+#: ../panels/user-accounts/um-fingerprint-dialog.c:264
 msgid "Delete registered fingerprints?"
 msgstr "Xóa các vân tay đã đăng ký?"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:267
+#: ../panels/user-accounts/um-fingerprint-dialog.c:268
 msgid "_Delete Fingerprints"
 msgstr "_Xóa các vân tay"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:273
+#: ../panels/user-accounts/um-fingerprint-dialog.c:274
 msgid ""
 "Do you want to delete your registered fingerprints so fingerprint login is "
 "disabled?"
@@ -6497,15 +6584,15 @@ msgstr ""
 "Bạn có muốn xóa các vân tay đã đăng ký để tắt chức năng đăng nhập bằng vân "
 "tay không?"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:443
+#: ../panels/user-accounts/um-fingerprint-dialog.c:444
 msgid "Done!"
 msgstr "Hoàn tất!"
 
 #. translators:
 #. * The variable is the name of the device, for example:
 #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: ../panels/user-accounts/um-fingerprint-dialog.c:504
-#: ../panels/user-accounts/um-fingerprint-dialog.c:546
+#: ../panels/user-accounts/um-fingerprint-dialog.c:505
+#: ../panels/user-accounts/um-fingerprint-dialog.c:547
 #, c-format
 msgid "Could not access '%s' device"
 msgstr "Không thể truy cập thiết bị “%s”"
@@ -6513,16 +6600,16 @@ msgstr "Không thể truy cập thiết bị “%s”"
 #. translators:
 #. * The variable is the name of the device, for example:
 #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: ../panels/user-accounts/um-fingerprint-dialog.c:587
+#: ../panels/user-accounts/um-fingerprint-dialog.c:588
 #, c-format
 msgid "Could not start finger capture on '%s' device"
 msgstr "Không thể khởi chạy tiến trình đọc vân tay trên thiết bị “%s”"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:637
+#: ../panels/user-accounts/um-fingerprint-dialog.c:638
 msgid "Could not access any fingerprint readers"
 msgstr "Không thể truy cập đến thiết bị đọc vân tay nào"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:638
+#: ../panels/user-accounts/um-fingerprint-dialog.c:639
 msgid "Please contact your system administrator for help."
 msgstr "Hãy liên lạc với quản trị hệ thống để yêu cầu sự giúp đỡ."
 
@@ -6531,7 +6618,7 @@ msgstr "Hãy liên lạc với quản trị hệ thống để yêu cầu sự g
 #. * "To enable fingerprint login, you need to save one of your fingerprints, using the
 #. * 'Digital Persona U.are.U 4000/4000B' device."
 #.
-#: ../panels/user-accounts/um-fingerprint-dialog.c:720
+#: ../panels/user-accounts/um-fingerprint-dialog.c:721
 #, c-format
 msgid ""
 "To enable fingerprint login, you need to save one of your fingerprints, "
@@ -6540,11 +6627,11 @@ msgstr ""
 "Để bật tính năng đăng nhập bằng vân tay, bạn cần lưu một bản vân tay của "
 "mình, sử dụng thiết bị “%s”."
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:727
+#: ../panels/user-accounts/um-fingerprint-dialog.c:728
 msgid "Selecting finger"
 msgstr "Chọn ngón tay"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:728
+#: ../panels/user-accounts/um-fingerprint-dialog.c:729
 msgid "Enrolling fingerprints"
 msgstr "Đang ghi dấu vân tay"
 
@@ -6598,14 +6685,21 @@ msgctxt "login date-time"
 msgid "%s, %s"
 msgstr "%2$s, %1$s"
 
-#: ../panels/user-accounts/um-history-dialog.c:249
+#: ../panels/user-accounts/um-history-dialog.c:250
 msgid "Session Ended"
 msgstr "Phiên đã chấm dứt"
 
-#: ../panels/user-accounts/um-history-dialog.c:255
+#: ../panels/user-accounts/um-history-dialog.c:256
 msgid "Session Started"
 msgstr "Phiên được bắt đầu"
 
+#. Translators: This is the title of the "Account Activity" dialog.
+#. The %s is the user real name.
+#: ../panels/user-accounts/um-history-dialog.c:299
+#, c-format
+msgid "%s - Account Activity"
+msgstr "%s - Sự hoạt động của tài khoản"
+
 #: ../panels/user-accounts/um-password-dialog.c:145
 msgid "Please choose another password."
 msgstr "Vui lòng chọn mật khẩu khác."
@@ -6667,7 +6761,7 @@ msgstr "Mật khẩu không đúng, vui lòng thử lại"
 msgid "Couldn't connect to the %s domain: %s"
 msgstr "Không thể kết nối miền %s: %s"
 
-#: ../panels/user-accounts/um-user-panel.c:237
+#: ../panels/user-accounts/um-user-panel.c:239
 msgid "Other Accounts"
 msgstr "Tài khoản khác"
 
@@ -6745,15 +6839,15 @@ msgstr "Không có"
 msgid "Logged in"
 msgstr "Đang đăng nhập"
 
-#: ../panels/user-accounts/um-user-panel.c:1272
+#: ../panels/user-accounts/um-user-panel.c:1290
 msgid "Failed to contact the accounts service"
 msgstr "Gặp lỗi khi liên lạc dịch vụ tài khoản (accountsservice)"
 
-#: ../panels/user-accounts/um-user-panel.c:1274
+#: ../panels/user-accounts/um-user-panel.c:1292
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "Hãy kiểm tra xem AccountService có cài và được bật không."
 
-#: ../panels/user-accounts/um-user-panel.c:1315
+#: ../panels/user-accounts/um-user-panel.c:1334
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -6761,12 +6855,12 @@ msgstr ""
 "Để thay đổi,\n"
 "nhấn biểu tượng * trước"
 
-#: ../panels/user-accounts/um-user-panel.c:1353
+#: ../panels/user-accounts/um-user-panel.c:1374
 msgid "Create a user account"
 msgstr "Tạo tài khoản người dùng mới"
 
-#: ../panels/user-accounts/um-user-panel.c:1364
-#: ../panels/user-accounts/um-user-panel.c:1676
+#: ../panels/user-accounts/um-user-panel.c:1385
+#: ../panels/user-accounts/um-user-panel.c:1677
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -6774,12 +6868,12 @@ msgstr ""
 "Để tạo tài khoản người dùng,\n"
 "nhấn biểu tượng * trước"
 
-#: ../panels/user-accounts/um-user-panel.c:1374
+#: ../panels/user-accounts/um-user-panel.c:1395
 msgid "Delete the selected user account"
 msgstr "Xóa tài khoản người dùng được chọn"
 
-#: ../panels/user-accounts/um-user-panel.c:1386
-#: ../panels/user-accounts/um-user-panel.c:1681
+#: ../panels/user-accounts/um-user-panel.c:1407
+#: ../panels/user-accounts/um-user-panel.c:1682
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -6787,33 +6881,32 @@ msgstr ""
 "Để xóa tài khoản người dùng được chọn,\n"
 "nhấn biểu tượng * trước"
 
-#: ../panels/user-accounts/um-user-panel.c:1590
+#: ../panels/user-accounts/um-user-panel.c:1591
 msgid "My Account"
 msgstr "Tài khoản của mình"
 
 #: ../panels/user-accounts/um-utils.c:563
-#, c-format
-msgid "A user with the username '%s' already exists."
-msgstr "Đã có người dùng tên “%s” rồi."
+msgid "Sorry, that user name isn't available. Please try another."
+msgstr "Rất tiếc, tên tài khoản đó không sẵn sàng. Vui lòng thử cái khác."
 
-#: ../panels/user-accounts/um-utils.c:567
+#: ../panels/user-accounts/um-utils.c:566
 #, c-format
 msgid "The username is too long."
 msgstr "Tên người dùng quá dài."
 
-#: ../panels/user-accounts/um-utils.c:570
+#: ../panels/user-accounts/um-utils.c:569
 msgid "The username cannot start with a '-'."
 msgstr "Tên người dùng không thể bắt đầu bằng “-”."
 
-#: ../panels/user-accounts/um-utils.c:573
+#: ../panels/user-accounts/um-utils.c:572
 msgid ""
-"The username should only consist of lower and upper case letters from a-z, "
-"digits and any of characters '.', '-' and '_'."
+"The username should only consist of upper and lower case letters from a-z, "
+"digits and the following characters: . - _"
 msgstr ""
-"Tên người dùng hay còn gọi là tài khoản, chỉ được phép chứa các chữ cái HOA/"
-"thường từ a-z, chữ số và các ký tự “.”, “-” và “_”."
+"Tên tài khoản chỉ được phép chứa các chữ cái HOA/thường từ a-z, chữ số và "
+"các ký tự sau: “.”, “-” và “_”."
 
-#: ../panels/user-accounts/um-utils.c:577
+#: ../panels/user-accounts/um-utils.c:576
 msgid "This will be used to name your home folder and can't be changed."
 msgstr ""
 "Cái này sẽ được dùng để đặt tên cho thư mục riêng của bạn và không thể thay "
@@ -6904,17 +6997,17 @@ msgstr "Hiện ánh xạ"
 msgid "Button"
 msgstr "Nút"
 
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1
-#: ../panels/wacom/gnome-wacom-properties.ui.h:9
-msgid "Wacom Tablet"
+#. 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/wacom/gnome-wacom-panel.desktop.in.in.h:2
+msgid "Wa­com Tab­let"
 msgstr "Bảng vẽ Wacom"
 
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2
+#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3
 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets"
 msgstr "Đặt ảnh của nút và sửa kiểu dáng cho thích hợp dành cho bảng đồ họa"
 
 #. Translators: those are keywords for the wacom tablet control-center panel
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4
+#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5
 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;"
 msgstr ""
 "Tablet;Bảng;bang;Wacom;Stylus;Bút;trỏ;but;tro;Eraser;Tẩy;Tay;Mouse;Chuột;"
@@ -6948,6 +7041,10 @@ msgstr "Vui lòng cắm vào và bật bảng vẽ Wacom"
 msgid "Bluetooth Settings"
 msgstr "Cài đặt Bluetooth"
 
+#: ../panels/wacom/gnome-wacom-properties.ui.h:9
+msgid "Wacom Tablet"
+msgstr "Bảng vẽ Wacom"
+
 #: ../panels/wacom/gnome-wacom-properties.ui.h:10
 msgid "Map to Monitor…"
 msgstr "Ánh xạ sang màn hình…"
@@ -7133,6 +7230,11 @@ msgstr "Nút thấp"
 msgid "Tip Pressure Feel"
 msgstr "Cảm giác ấn ngón"
 
+#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53
+#: ../shell/cc-window.c:1478
+msgid "All Settings"
+msgstr "Mọi cài đặt"
+
 #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1
 msgid "GNOME Control Center"
 msgstr "Trung tâm điều khiển GNOME"
@@ -7189,22 +7291,18 @@ msgstr "Trợ giúp"
 msgid "Quit"
 msgstr "Thoát"
 
-#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495
-msgid "All Settings"
-msgstr "Mọi cài đặt"
-
 #. Add categories
-#: ../shell/cc-window.c:881
+#: ../shell/cc-window.c:871
 msgctxt "category"
 msgid "Personal"
 msgstr "Cá nhân"
 
-#: ../shell/cc-window.c:882
+#: ../shell/cc-window.c:872
 msgctxt "category"
 msgid "Hardware"
 msgstr "Phần cứng"
 
-#: ../shell/cc-window.c:883
+#: ../shell/cc-window.c:873
 msgctxt "category"
 msgid "System"
 msgstr "Hệ thống"
@@ -7245,6 +7343,176 @@ msgctxt "shortcut window"
 msgid "Cancel search"
 msgstr "Ngưng tìm"
 
+#. translators: This is the default hotspot name, need to be less than 32-bytes
+#: ../shell/hostname-helper.c:189
+msgctxt "hotspot"
+msgid "Hotspot"
+msgstr "Điểm truy cập"
+
+#~ msgid "Color"
+#~ msgstr "Màu sắc"
+
+#~ msgid "_Name:"
+#~ msgstr "Tê_n:"
+
+#~ msgid "Add Shortcut"
+#~ msgstr "Thêm phím tắt"
+
+#~ msgid "Remove Shortcut"
+#~ msgstr "Bỏ phím tắt"
+
+#~ msgid "<Unknown Action>"
+#~ msgstr "<Hành động lạ>"
+
+#~ msgid ""
+#~ "The shortcut \"%s\" cannot be used because it will become impossible to "
+#~ "type using this key.\n"
+#~ "Please try with a key such as Control, Alt or Shift at the same time."
+#~ msgstr ""
+#~ "Không thể dùng \"%s\" làm phím tắt vì sẽ không thể gõ được phím này nữa.\n"
+#~ "Xin hãy thêm một phím bổ trợ như Ctrl, Alt, Shift."
+
+#~ msgid ""
+#~ "The shortcut \"%s\" is already used for\n"
+#~ "\"%s\""
+#~ msgstr ""
+#~ "Phím tắt \"%s\" đã dùng cho\n"
+#~ "\"%s\""
+
+#~ msgid ""
+#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be "
+#~ "disabled."
+#~ msgstr "Nếu bạn gán lại phím tắt là \"%s\", \"%s\" sẽ bị tắt."
+
+#~ msgid "_Reassign"
+#~ msgstr "_Gán lại"
+
+#~ msgid ""
+#~ "The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to "
+#~ "automatically set it to \"%s\"?"
+#~ msgstr ""
+#~ "Tổ hợp phím tắt \"%s\" đã được gán cho \"%s\". Bạn có muốn tự động đặt nó "
+#~ "thành \"%s\"?"
+
+#~ msgid ""
+#~ "\"%s\" is currently associated with \"%s\", this shortcut will be "
+#~ "disabled if you move forward."
+#~ msgstr ""
+#~ "\"%s\" hiện tại được gán cho \"%s\", phím tắt này sẽ bị tắt nếu bạn di "
+#~ "chuyển về phía trước."
+
+#~ msgid "_Assign"
+#~ msgstr "_Gán"
+
+#~ msgid "Bond"
+#~ msgstr "Bond"
+
+#~ msgid "Team"
+#~ msgstr "Team"
+
+#~ msgid "Bridge"
+#~ msgstr "Bridge"
+
+#~ msgid "VLAN"
+#~ msgstr "VLAN"
+
+#~ msgid "Could not load VPN plugins"
+#~ msgstr "Không thể tải phần mở rộng VPN"
+
+#~ msgid "Add Network Connection"
+#~ msgstr "Thêm kết nối mạng"
+
+#~ msgid "Bond slaves"
+#~ msgstr "Bond slave"
+
+#~ msgid "(none)"
+#~ msgstr "(không)"
+
+#~ msgid "Bridge slaves"
+#~ msgstr "Bridge slave"
+
+#~ msgid "Team slaves"
+#~ msgstr "Team slave"
+
+#~ msgid "InfiniBand device does not support connected mode"
+#~ msgstr "Thiết bị InfiniBand không hỗ trợ chế độ kết nối"
+
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "Chưa chọn chứng nhận CA."
+
+#~ msgid ""
+#~ "Not using a Certificate Authority (CA) certificate can result in "
+#~ "connections to insecure, rogue Wi-Fi networks.  Would you like to choose "
+#~ "a Certificate Authority certificate?"
+#~ msgstr ""
+#~ "Không dùng giấy chứng nhận CA có thể là nguyên nhân gây nên mất an toàn "
+#~ "của kết nối, mạng Wi-Fi lừa đảo. Bạn có muốn chọn một giấy chứng nhận CA "
+#~ "không?"
+
+#~ msgid "Ignore"
+#~ msgstr "Bỏ qua"
+
+#~ msgid "Choose CA Certificate"
+#~ msgstr "Chọn chứng nhận CA"
+
+#~ msgid "As_k for this password every time"
+#~ msgstr "Luôn _Hỏi mật khẩu này"
+
+#~ msgid "Don't _warn me again"
+#~ msgstr "Đừng _cảnh báo tôi nữa"
+
+#~ msgid "No"
+#~ msgstr "Không"
+
+#~ msgid "Yes"
+#~ msgstr "Có"
+
+#~ msgid "Error logging into the account"
+#~ msgstr "Không thể đăng nhập vào tài khoản này"
+
+#~ msgid "Credentials have expired."
+#~ msgstr "Các giấy ủy nhiệm đã hết hạn."
+
+#~ msgid "Sign in to enable this account."
+#~ msgstr "Đăng nhập để bật tài khoản này."
+
+#~ msgid "_Sign In"
+#~ msgstr "Đă_ng nhập"
+
+#~ msgid "Power"
+#~ msgstr "Nguồn điện"
+
+#~ msgid "Privacy"
+#~ msgstr "Riêng tư"
+
+#~ msgctxt "Search Location"
+#~ msgid "Other"
+#~ msgstr "Khác"
+
+#~ msgid "Personal File Sharing"
+#~ msgstr "Chia sẻ tập tin cá nhân"
+
+#~ msgid "_Allow Remote Control"
+#~ msgstr "_Cho phép điều khiển từ xa"
+
+#~ msgid "_Verify"
+#~ msgstr "_Kiểm tra"
+
+#~ msgid "Login History"
+#~ msgstr "Lịch sử đăng nhập"
+
+#~ msgid "Add User Account"
+#~ msgstr "Thêm tài khoản người dùng"
+
+#~ msgid "Remove User Account"
+#~ msgstr "Bỏ tài khoản người dùng"
+
+#~ msgid "Login Options"
+#~ msgstr "Tùy chọn đăng nhập"
+
+#~ msgid "A user with the username '%s' already exists."
+#~ msgstr "Đã có người dùng tên “%s” rồi."
+
 #~ msgid "Done"
 #~ msgstr "Xong"
 
@@ -7273,9 +7541,6 @@ msgstr "Ngưng tìm"
 #~ msgid "S_peed:"
 #~ msgstr "_Tốc độ:"
 
-#~ msgid "Shortcuts"
-#~ msgstr "Phím tắt"
-
 #~ msgid "Test Your Settings"
 #~ msgstr "Kiểm tra các cài đặt của bạn"
 
@@ -7314,9 +7579,6 @@ msgstr "Ngưng tìm"
 #~ msgid "Fast"
 #~ msgstr "Nhanh"
 
-#~ msgid "Two _finger scroll"
-#~ msgstr "Cuộn _hai ngón"
-
 #~ msgid "No printers available"
 #~ msgstr "Không có máy in"