[gnome-control-center] po/vi: import from Damned Lies

[Nguyen Thai Ngoc Duy <pclouds src gnome org>]

commit 79ac5916a714bcb8116ee81afe79536ce1236545
Author: Nguyễn Thái Ngọc Duy <pclouds gmail com>
Date:   Sat Mar 2 10:04:33 2013 +0700

    po/vi: import from Damned Lies

 po/vi.po | 5817 ++++++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 4164 insertions(+), 1653 deletions(-)
---
diff --git a/po/vi.po b/po/vi.po
index d644f48..a0dc520 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: gnome-control-center 2.25.90\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: 2012-09-11 11:28+0000\n"
-"PO-Revision-Date: 2012-09-11 21:03+0700\n"
+"POT-Creation-Date: 2013-02-28 12:46+0000\n"
+"PO-Revision-Date: 2013-03-02 10:04+0700\n"
 "Last-Translator: Nguyễn Thái Ngọc Duy <pclouds gmail com>\n"
 "Language-Team: Vietnamese <vi-VN googlegroups com>\n"
 "Language: vi\n"
@@ -83,22 +83,22 @@ msgstr "Flickr"
 msgid "Select"
 msgstr "Chọn"
 
-#: ../panels/background/cc-background-item.c:148
+#: ../panels/background/cc-background-item.c:150
 msgid "multiple sizes"
 msgstr "nhiều kích cỡ"
 
 #. translators: 100 × 100px
 #. * Note that this is not an "x", but U+00D7 MULTIPLICATION SIGN
-#: ../panels/background/cc-background-item.c:152
+#: ../panels/background/cc-background-item.c:154
 #, c-format
 msgid "%d × %d"
 msgstr "%d × %d"
 
-#: ../panels/background/cc-background-item.c:281
+#: ../panels/background/cc-background-item.c:283
 msgid "No Desktop Background"
 msgstr "Không có ảnh nền"
 
-#: ../panels/background/cc-background-panel.c:387
+#: ../panels/background/cc-background-panel.c:453
 msgid "Current background"
 msgstr "Ảnh nền hiện tại"
 
@@ -107,24 +107,14 @@ msgid "Background"
 msgstr "Ảnh nền"
 
 #: ../panels/background/gnome-background-panel.desktop.in.in.h:2
-msgid "Change the background"
-msgstr "Đổi nền"
+msgid "Change your background image to a wallpaper or photo"
+msgstr ""
 
 #. Translators: those are keywords for the background control-center panel
 #: ../panels/background/gnome-background-panel.desktop.in.in.h:4
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "Wallpaper;Ảnh;nền;Anh;nen;Screen;Mà n;hình;Man;hinh;Desktop;"
 
-#. TRANSLATORS: device type
-#: ../panels/bluetooth/bluetooth-properties.desktop.in.in.h:1
-#: ../panels/network/panel-common.c:102
-msgid "Bluetooth"
-msgstr "Bluetooth"
-
-#: ../panels/bluetooth/bluetooth-properties.desktop.in.in.h:2
-msgid "Configure Bluetooth settings"
-msgstr "Cấu hình thiết lập Bluetooth"
-
 #: ../panels/bluetooth/bluetooth.ui.h:1
 msgid "Set Up New Device"
 msgstr "Thiết lập thiết bị mới"
@@ -137,187 +127,323 @@ msgstr "Loại bỏ thiết bị"
 msgid "Connection"
 msgstr "Kết nối"
 
-# Name: don't translate / Tên: đừng dịch
 #: ../panels/bluetooth/bluetooth.ui.h:4
+#: ../panels/network/connection-editor/8021x-security-page.ui.h:2
+#: ../panels/network/connection-editor/security-page.ui.h:2
+#: ../panels/printers/printers.ui.h:14
+msgid "page 1"
+msgstr "trang 1"
+
+#: ../panels/bluetooth/bluetooth.ui.h:5
+#: ../panels/network/connection-editor/8021x-security-page.ui.h:5
+#: ../panels/network/connection-editor/security-page.ui.h:5
+#: ../panels/printers/printers.ui.h:16
+msgid "page 2"
+msgstr "trang 2"
+
+# Name: don't translate / Tên: đừng dịch
+#: ../panels/bluetooth/bluetooth.ui.h:6
 msgid "Paired"
 msgstr "Có dây"
 
-#: ../panels/bluetooth/bluetooth.ui.h:5 ../panels/wacom/cc-wacom-page.c:756
+#: ../panels/bluetooth/bluetooth.ui.h:7 ../panels/wacom/cc-wacom-page.c:789
 msgid "Type"
 msgstr "Loại"
 
-#: ../panels/bluetooth/bluetooth.ui.h:6
+#: ../panels/bluetooth/bluetooth.ui.h:8
+#: ../panels/network/connection-editor/ce-page-ip4.c:189
+#: ../panels/network/connection-editor/ce-page-ip4.c:441
+#: ../panels/network/connection-editor/ce-page-ip6.c:191
+#: ../panels/network/connection-editor/ce-page-ip6.c:445
 msgid "Address"
 msgstr "Địa chỉ"
 
-#: ../panels/bluetooth/bluetooth.ui.h:7
-msgid "Mouse and Touchpad Settings"
+#: ../panels/bluetooth/bluetooth.ui.h:9
+#, fuzzy
+#| msgid "Mouse and Touchpad Settings"
+msgid "Mouse & Touchpad Settings"
 msgstr "Thiết lập Chuột và Touchpad"
 
-#: ../panels/bluetooth/bluetooth.ui.h:8 ../panels/universal-access/uap.ui.h:38
+#: ../panels/bluetooth/bluetooth.ui.h:10
+#: ../panels/universal-access/uap.ui.h:38
 msgid "Sound Settings"
 msgstr "Thiết lập âm thanh"
 
-#: ../panels/bluetooth/bluetooth.ui.h:9
+#: ../panels/bluetooth/bluetooth.ui.h:11
 msgid "Keyboard Settings"
 msgstr "Thiết lập bà n phím"
 
-#: ../panels/bluetooth/bluetooth.ui.h:10
-msgid "Send Files..."
+#: ../panels/bluetooth/bluetooth.ui.h:12
+#, fuzzy
+#| msgid "Send Files..."
+msgid "Send Files…"
 msgstr "Gửi tập tin..."
 
-#: ../panels/bluetooth/bluetooth.ui.h:11
-msgid "Browse Files..."
-msgstr "Duyệt tập tin..."
-
-#. Translator: This string appears next to a toggle switch which controls enabling/disabling Bluetooth 
radio's on the device.
-#: ../panels/bluetooth/bluetooth.ui.h:13
-msgctxt "Power"
-msgid "Bluetooth"
-msgstr "Bluetooth"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:290
+#: ../panels/bluetooth/cc-bluetooth-panel.c:355
+#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3
 msgid "Yes"
 msgstr "Có"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:290
+#: ../panels/bluetooth/cc-bluetooth-panel.c:355
+#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2
 msgid "No"
 msgstr "Không"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:405
+#: ../panels/bluetooth/cc-bluetooth-panel.c:469
 msgid "Bluetooth is disabled"
 msgstr "Bluetooth tắt"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:410
+#: ../panels/bluetooth/cc-bluetooth-panel.c:474
 msgid "Bluetooth is disabled by hardware switch"
 msgstr "Bluetooth tắt bằng công tắt"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:414
+#: ../panels/bluetooth/cc-bluetooth-panel.c:478
 msgid "No Bluetooth adapters found"
 msgstr "Không tìm thấy bộ điều hợp Bluetooth"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:547
+#: ../panels/bluetooth/cc-bluetooth-panel.c:577
 msgid "Visibility"
 msgstr "Cho phép nhìn thấy"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:551
+#: ../panels/bluetooth/cc-bluetooth-panel.c:581
 #, c-format
 msgid "Visibility of “%s”"
 msgstr "Cho phép nhìn thấy “%s”"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:595
+#: ../panels/bluetooth/cc-bluetooth-panel.c:625
 #, c-format
 msgid "Remove '%s' from the list of devices?"
 msgstr "Loại '%s' khỏi danh sách thiết bị chứ?"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:597
+#: ../panels/bluetooth/cc-bluetooth-panel.c:627
 msgid ""
 "If you remove the device, you will have to set it up again before next use."
 msgstr ""
 "Nếu bạn loại bỏ thiết bị, bạn sẽ phải thiết lập lại cho lần dùng kế tiếp."
 
-#. TRANSLATORS: this is where the user can click and import a profile
-#: ../panels/color/cc-color-panel.c:106
-msgid "Other profile…"
-msgstr "Hồ sơ khác..."
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1
+msgid "Bluetooth"
+msgstr "Bluetooth"
+
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2
+msgid "Turn Bluetooth on and off and connect your devices"
+msgstr ""
+
+#. TRANSLATORS: The user has to attach the sensor to the screen
+#: ../panels/color/cc-color-calibrate.c:360
+msgid "Place your calibration device over the square and press 'Start'"
+msgstr ""
+
+#. TRANSLATORS: Some calibration devices need the user to move a
+#. * dial or switch manually. We also show a picture showing them
+#. * what to do...
+#: ../panels/color/cc-color-calibrate.c:366
+msgid ""
+"Move your calibration device to the calibrate position and press 'Continue'"
+msgstr ""
+
+#. TRANSLATORS: Some calibration devices need the user to move a
+#. * dial or switch manually. We also show a picture showing them
+#. * what to do...
+#: ../panels/color/cc-color-calibrate.c:372
+msgid ""
+"Move your calibration device to the surface position and press 'Continue'"
+msgstr ""
+
+#. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor
+#. * is built into the palmrest and we need to fullscreen the
+#. * sample widget and shut the lid.
+#: ../panels/color/cc-color-calibrate.c:378
+msgid "Shut the laptop lid"
+msgstr ""
+
+#. TRANSLATORS: We suck, the calibation failed and we have no
+#. * good idea why or any suggestions
+#: ../panels/color/cc-color-calibrate.c:409
+#, fuzzy
+#| msgid "An internal error occurred."
+msgid "An internal error occurred that could not be recovered."
+msgstr "Gặp lỗi nội bộ."
+
+#. TRANSLATORS: Some required-at-runtime tools were not
+#. * installed, which should only affect insane distros
+#: ../panels/color/cc-color-calibrate.c:414
+msgid "Tools required for calibration are not installed."
+msgstr ""
+
+#. TRANSLATORS: The profile failed for some reason
+#: ../panels/color/cc-color-calibrate.c:420
+#, fuzzy
+#| msgid "Theme cannot be deleted"
+msgid "The profile could not be generated."
+msgstr "Sắc thái không xóa được"
+
+#. TRANSLATORS: The user specified a whitepoint that was
+#. * unobtainable with the hardware they've got -- see
+#. * https://en.wikipedia.org/wiki/White_point for details
+#: ../panels/color/cc-color-calibrate.c:426
+msgid "The target whitepoint was not obtainable."
+msgstr ""
+
+#. TRANSLATORS: the display calibration process is finished
+#: ../panels/color/cc-color-calibrate.c:466
+#, fuzzy
+#| msgctxt "print job"
+#| msgid "Completed"
+msgid "Complete!"
+msgstr "Hoà n tất"
+
+#. TRANSLATORS: the display calibration failed, and we also show
+#. * the translated (or untranslated) error string after this
+#: ../panels/color/cc-color-calibrate.c:474
+#, fuzzy
+#| msgid "Configuration failed"
+msgid "Calibration failed!"
+msgstr "Lỗi cấu hình"
+
+#. TRANSLATORS: The user can now remove the sensor from the screen
+#: ../panels/color/cc-color-calibrate.c:481
+msgid "You can remove the calibration device."
+msgstr ""
+
+#. TRANSLATORS: The user has to be careful not to knock the
+#. * display off the screen (although we do cope if this is
+#. * detected early enough)
+#: ../panels/color/cc-color-calibrate.c:552
+msgid "Do not disturb the calibration device while in progress"
+msgstr ""
+
+#. TRANSLATORS: This refers to the TFT display on a laptop
+#: ../panels/color/cc-color-common.c:41
+#, fuzzy
+#| msgid "Lock screen"
+msgid "Laptop Screen"
+msgstr "Khoá mà n hình"
+
+#. TRANSLATORS: This refers to the embedded webcam on a laptop
+#: ../panels/color/cc-color-common.c:50
+#, fuzzy
+#| msgid "Built-in"
+msgid "Built-in Webcam"
+msgstr "Tích hợp"
+
+#. TRANSLATORS: an externally connected display, where %s is either the
+#. * model, vendor or ID, e.g. 'LP2480zx Monitor'
+#: ../panels/color/cc-color-common.c:65
+#, fuzzy, c-format
+#| msgid "Monitor"
+msgid "%s Monitor"
+msgstr "Mà n hình"
+
+#. TRANSLATORS: a flatbed scanner device, e.g. 'Epson Scanner'
+#: ../panels/color/cc-color-common.c:69
+#, fuzzy, c-format
+#| msgctxt "Device kind"
+#| msgid "Scanner"
+msgid "%s Scanner"
+msgstr "Máy quét"
+
+#. TRANSLATORS: a camera device, e.g. 'Nikon D60 Camera'
+#: ../panels/color/cc-color-common.c:73
+#, fuzzy, c-format
+#| msgctxt "Device kind"
+#| msgid "Camera"
+msgid "%s Camera"
+msgstr "Máy ảnh"
+
+#. TRANSLATORS: a printer device, e.g. 'Epson Photosmart Printer'
+#: ../panels/color/cc-color-common.c:77
+#, fuzzy, c-format
+#| msgctxt "Device kind"
+#| msgid "Printer"
+msgid "%s Printer"
+msgstr "Máy in"
+
+#. TRANSLATORS: a webcam device, e.g. 'Philips HiDef Camera'
+#: ../panels/color/cc-color-common.c:81
+#, fuzzy, c-format
+#| msgctxt "Device kind"
+#| msgid "Webcam"
+msgid "%s Webcam"
+msgstr "Webcam"
+
+#: ../panels/color/cc-color-device.c:89
+#, fuzzy, c-format
+#| msgid "Learn more about color management"
+msgid "Enable color management for %s"
+msgstr "Tìm hiểu thêm về quản lý mà u sắc"
+
+#: ../panels/color/cc-color-device.c:93
+#, c-format
+msgid "Show color profiles for %s"
+msgstr ""
+
+#. not calibrated
+#: ../panels/color/cc-color-device.c:322
+#, fuzzy
+#| msgid "Uncalibrated"
+msgid "Not calibrated"
+msgstr "Chưa cân chỉnh"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile has been auto-generated for this hardware
-#: ../panels/color/cc-color-panel.c:119
+#: ../panels/color/cc-color-panel.c:133
 msgid "Default: "
 msgstr "Mặc định: "
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile his a standard space like AdobeRGB
-#: ../panels/color/cc-color-panel.c:126
+#: ../panels/color/cc-color-panel.c:141
 msgid "Colorspace: "
 msgstr "Không gian mà u: "
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile is a test profile
-#: ../panels/color/cc-color-panel.c:132
+#: ../panels/color/cc-color-panel.c:148
 msgid "Test profile: "
 msgstr "Hồ sơ thử: "
 
-#. TRANSLATORS: this is when the profile should be set for all users
-#: ../panels/color/cc-color-panel.c:185 ../panels/color/color.ui.h:11
-msgid "Set for all users"
-msgstr "Đặt cho tất cả mọi người dùng"
-
-#. TRANSLATORS: this is when the profile should be set for all users
-#: ../panels/color/cc-color-panel.c:192
-msgid "Create virtual device"
-msgstr "Tạo thiết bị ảo"
-
 #. TRANSLATORS: an ICC profile is a file containing colorspace data
-#: ../panels/color/cc-color-panel.c:227
+#: ../panels/color/cc-color-panel.c:216
 msgid "Select ICC Profile File"
 msgstr "Chọn tập tin hồ sơ ICC"
 
-#: ../panels/color/cc-color-panel.c:230
+#: ../panels/color/cc-color-panel.c:219
 msgid "_Import"
 msgstr "_Nhập"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:241
+#: ../panels/color/cc-color-panel.c:230
 msgid "Supported ICC profiles"
 msgstr "Các hồ sơ ICC được hỗ trợ"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:248
+#: ../panels/color/cc-color-panel.c:237
+#: ../panels/network/wireless-security/eap-method-fast.c:410
 msgid "All files"
 msgstr "Mọi tập tin"
 
-#. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#: ../panels/color/cc-color-panel.c:522
-msgid "Available Profiles for Displays"
-msgstr "Các hồ sơ thiết bị hiển thị hiện có"
-
-#. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#: ../panels/color/cc-color-panel.c:526
-msgid "Available Profiles for Scanners"
-msgstr "Các hồ sơ máy quét hiện có"
-
-#. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#: ../panels/color/cc-color-panel.c:530
-msgid "Available Profiles for Printers"
-msgstr "Các hồ sơ máy in hiện có"
-
-#. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#: ../panels/color/cc-color-panel.c:534
-msgid "Available Profiles for Cameras"
-msgstr "Các hồ sơ máy chụp hình hiện có"
-
-#. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#: ../panels/color/cc-color-panel.c:538
-msgid "Available Profiles for Webcams"
-msgstr "Các hồ sơ Webcam hiện có"
-
-#. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#. * where the device type is not recognised
-#. Profiles that can be added to the device
-#: ../panels/color/cc-color-panel.c:543 ../panels/color/color.ui.h:2
-msgid "Available Profiles"
-msgstr "Các hồ sơ hiện có"
-
-#. TRANSLATORS: column for device list
-#: ../panels/color/cc-color-panel.c:824
-#: ../panels/sound/gvc-mixer-dialog.c:1525
-msgid "Device"
-msgstr "Thiết bị"
+#: ../panels/color/cc-color-panel.c:581
+#, fuzzy
+#| msgctxt "Distance"
+#| msgid "¼ Screen"
+msgid "Screen"
+msgstr "¼ mà n hình"
 
-#. TRANSLATORS: column for device list
-#: ../panels/color/cc-color-panel.c:859
-msgid "Calibration"
-msgstr "Cân chỉnh"
+#. TRANSLATORS: this is the dialog to save the ICC profile
+#: ../panels/color/cc-color-panel.c:853
+#, fuzzy
+#| msgid "Save File"
+msgid "Save Profile"
+msgstr "Lưu tập tin"
 
 #. TRANSLATORS: this is when the button is sensitive
-#: ../panels/color/cc-color-panel.c:891
+#: ../panels/color/cc-color-panel.c:1214
 msgid "Create a color profile for the selected device"
 msgstr "Tạo một hồ sơ mà u cho thiết bị được chọn"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:905 ../panels/color/cc-color-panel.c:929
+#: ../panels/color/cc-color-panel.c:1229 ../panels/color/cc-color-panel.c:1253
 msgid ""
 "The measuring instrument is not detected. Please check it is turned on and "
 "correctly connected."
@@ -326,293 +452,619 @@ msgstr ""
 "chÆ°a?"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:938
+#: ../panels/color/cc-color-panel.c:1263
 msgid "The measuring instrument does not support printer profiling."
 msgstr "Thiết bị đo không hỗ trợ tạo hồ sơ mà u cho máy in."
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:949
+#: ../panels/color/cc-color-panel.c:1274
 msgid "The device type is not currently supported."
 msgstr "Loại thiết bị nà y hiện chưa được hỗ trợ."
 
-#. TRANSLATORS: this is when an auto-added profile cannot be removed
-#: ../panels/color/cc-color-panel.c:1022
-msgid "Cannot remove automatically added profile"
-msgstr "Không thể xóa bỏ hồ sơ được thêm và o tự động"
+#. TRANSLATORS: standard spaces are well known colorspaces like
+#. * sRGB, AdobeRGB and ProPhotoRGB
+#: ../panels/color/cc-color-profile.c:101
+#, fuzzy
+#| msgctxt "Experience"
+#| msgid "Standard"
+msgid "Standard Space"
+msgstr "Chuẩn"
 
-#. TRANSLATORS: this is when there is no profile for the device
-#: ../panels/color/cc-color-panel.c:1359
-msgid "No profile"
-msgstr "Không có hồ sơ"
+#. TRANSLATORS: test profiles do things like changing the screen
+#. * a different color, or swap the red and green channels
+#: ../panels/color/cc-color-profile.c:107
+#, fuzzy
+#| msgid "Test profile: "
+msgid "Test Profile"
+msgstr "Hồ sơ thử: "
 
-#: ../panels/color/cc-color-panel.c:1390
-#, c-format
-msgid "%i year"
-msgid_plural "%i years"
-msgstr[0] "%i năm"
+#. TRANSLATORS: automatic profiles are generated automatically
+#. * by the color management system based on manufacturing data,
+#. * for instance the default monitor profile is created from the
+#. * primaries specified in the monitor EDID
+#: ../panels/color/cc-color-profile.c:115
+#, fuzzy
+#| msgctxt "proxy method"
+#| msgid "Automatic"
+msgctxt "Automatically generated profile"
+msgid "Automatic"
+msgstr "Tá»± Ä‘á»™ng"
 
-#: ../panels/color/cc-color-panel.c:1401
-#, c-format
-msgid "%i month"
-msgid_plural "%i months"
-msgstr[0] "%i tháng"
+#. TRANSLATORS: the profile quality - low quality profiles take
+#. * much less time to generate but may be a poor reflection of the
+#. * device capability
+#: ../panels/color/cc-color-profile.c:125
+#, fuzzy
+#| msgctxt "Printer Option Group"
+#| msgid "Image Quality"
+msgctxt "Profile quality"
+msgid "Low Quality"
+msgstr "Chất lượng ảnh"
 
-#: ../panels/color/cc-color-panel.c:1412
-#, c-format
-msgid "%i week"
-msgid_plural "%i weeks"
-msgstr[0] "%i tuần"
+#. TRANSLATORS: the profile quality
+#: ../panels/color/cc-color-profile.c:130
+#, fuzzy
+#| msgctxt "Printer Option Group"
+#| msgid "Image Quality"
+msgctxt "Profile quality"
+msgid "Medium Quality"
+msgstr "Chất lượng ảnh"
 
-#. fallback
-#: ../panels/color/cc-color-panel.c:1419
-#, c-format
-msgid "Less than 1 week"
-msgstr "Dưới một tuần"
+#. TRANSLATORS: the profile quality - high quality profiles take
+#. * a *long* time, and have the best calibration and
+#. * characterisation data.
+#: ../panels/color/cc-color-profile.c:137
+#, fuzzy
+#| msgctxt "Printer Option Group"
+#| msgid "Image Quality"
+msgctxt "Profile quality"
+msgid "High Quality"
+msgstr "Chất lượng ảnh"
 
-#: ../panels/color/cc-color-panel.c:1481
+#. TRANSLATORS: this default RGB space is used for printers that
+#. * do not have additional printer profiles specified in the PPD
+#: ../panels/color/cc-color-profile.c:154
 msgctxt "Colorspace fallback"
 msgid "Default RGB"
 msgstr "RGB mặc định"
 
-#: ../panels/color/cc-color-panel.c:1486
+#. TRANSLATORS: this default CMYK space is used for printers that
+#. * do not have additional printer profiles specified in the PPD
+#: ../panels/color/cc-color-profile.c:161
 msgctxt "Colorspace fallback"
 msgid "Default CMYK"
 msgstr "CMYK mặc định"
 
-#: ../panels/color/cc-color-panel.c:1491
+#. TRANSLATORS: this default gray space is used for printers that
+#. * do not have additional printer profiles specified in the PPD
+#: ../panels/color/cc-color-profile.c:168
 msgctxt "Colorspace fallback"
 msgid "Default Gray"
 msgstr "Mà u xám mặc định"
 
-#: ../panels/color/cc-color-panel.c:1609 ../panels/color/cc-color-panel.c:1650
-#: ../panels/color/cc-color-panel.c:1661 ../panels/color/cc-color-panel.c:1672
-msgid "Uncalibrated"
-msgstr "Chưa cân chỉnh"
-
-#: ../panels/color/cc-color-panel.c:1612
-msgid "This device is not color managed."
-msgstr "Thiết bị nà y đang không được quản lý mà u."
-
-#: ../panels/color/cc-color-panel.c:1653
-msgid "This device is using manufacturing calibrated data."
-msgstr "Thiết bị nà y đang sử dụng thông số cân chỉnh của nhà sản xuất."
+#: ../panels/color/cc-color-profile.c:192
+msgid "Vendor supplied factory calibration data"
+msgstr ""
 
-#: ../panels/color/cc-color-panel.c:1664
-msgid ""
-"This device does not have a profile suitable for whole-screen color "
-"correction."
-msgstr "Thiết bị nà y không có một hồ sơ phù hợp để điều chỉnh mà u cả mà n hình."
+#: ../panels/color/cc-color-profile.c:201
+msgid "Full-screen display correction not possible with this profile"
+msgstr ""
 
-#: ../panels/color/cc-color-panel.c:1697
-msgid "This device has an old profile that may no longer be accurate."
+#: ../panels/color/cc-color-profile.c:223
+#, fuzzy
+#| msgid "This device has an old profile that may no longer be accurate."
+msgid "This profile may no longer be accurate"
 msgstr "Thiết bị nà y có một bộ hồ sơ cũ có thể không còn chính xác nữa."
 
-#. TRANSLATORS: this is when the calibration profile age is not
-#. * specified as it has been autogenerated from the hardware
-#: ../panels/color/cc-color-panel.c:1725
-msgid "Not specified"
-msgstr "Không xác định"
+#: ../panels/color/color-calibrate.ui.h:1
+#, fuzzy
+#| msgid "Calibration"
+msgid "Display Calibration"
+msgstr "Cân chỉnh"
 
-#. add the 'No devices detected' entry
-#: ../panels/color/cc-color-panel.c:1910
-msgid "No devices supporting color management detected"
-msgstr "Không tìm ra thiết bị hỗ trợ quản lý mà u sắc"
+#: ../panels/color/color-calibrate.ui.h:2
+#: ../panels/printers/authentication-dialog.ui.h:2
+#: ../panels/printers/ppd-selection-dialog.ui.h:2
+#: ../panels/user-accounts/data/photo-dialog.ui.h:8
+#: ../panels/user-accounts/um-account-dialog.c:1067
+msgid "Cancel"
+msgstr "Thôi"
 
-#: ../panels/color/cc-color-panel.c:2139
-msgctxt "Device kind"
-msgid "Display"
-msgstr "Mà n hình"
+#. This starts the calibration process
+#: ../panels/color/color-calibrate.ui.h:4
+msgid "Start"
+msgstr ""
 
-#: ../panels/color/cc-color-panel.c:2141
-msgctxt "Device kind"
-msgid "Scanner"
-msgstr "Máy quét"
+#. This resumes the calibration process
+#: ../panels/color/color-calibrate.ui.h:6
+msgid "Resume"
+msgstr ""
 
-#: ../panels/color/cc-color-panel.c:2143
-msgctxt "Device kind"
-msgid "Printer"
-msgstr "Máy in"
+#. This button returns the user back to the color control panel
+#: ../panels/color/color-calibrate.ui.h:8
+#, fuzzy
+#| msgid "Done!"
+msgid "Done"
+msgstr "Hoà n tất!"
 
-#: ../panels/color/cc-color-panel.c:2145
-msgctxt "Device kind"
-msgid "Camera"
-msgstr "Máy ảnh"
+#. Text printed on screen
+#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/gui_gtk.c:78
+msgid "Screen Calibration"
+msgstr "Cân chỉnh mà n hình"
 
-#: ../panels/color/cc-color-panel.c:2147
-msgctxt "Device kind"
-msgid "Webcam"
-msgstr "Webcam"
+#: ../panels/color/color.ui.h:2
+msgid ""
+"Calibration will produce a profile that you can use to color manage your "
+"screen. The longer you spend on calibration, the better the quality of the "
+"color profile."
+msgstr ""
 
 #: ../panels/color/color.ui.h:3
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
-msgid "Color"
-msgstr "Mà u sắc"
-
-#: ../panels/color/color.ui.h:4
-msgid "Each device needs an up to date color profile to be color managed."
+msgid ""
+"You will not be able to use your computer while calibration takes place."
 msgstr ""
-"Mỗi thiết bị cần một bộ hồ sơ mà u cập nhật để có thể được quản lý mà u chính "
-"xác."
 
+#. This is the approximate time it takes to calibrate the display.
 #: ../panels/color/color.ui.h:5
-msgid "Learn more"
-msgstr "Tìm hiểu thêm"
-
-#: ../panels/color/color.ui.h:6
-msgid "Learn more about color management"
-msgstr "Tìm hiểu thêm về quản lý mà u sắc"
+#, fuzzy
+#| msgctxt "Printer Option Group"
+#| msgid "Image Quality"
+msgid "Quality"
+msgstr "Chất lượng ảnh"
 
+#. This is the approximate time it takes to calibrate the display.
 #: ../panels/color/color.ui.h:7
-msgid "Add device"
-msgstr "Thêm thiết bị"
+msgid "Approximate Time"
+msgstr ""
 
 #: ../panels/color/color.ui.h:8
-msgid "Add a virtual device"
-msgstr "Thêm một thiết bị ảo"
+#, fuzzy
+#| msgid "Calibration"
+msgid "Calibration Quality"
+msgstr "Cân chỉnh"
 
 #: ../panels/color/color.ui.h:9
-msgid "Delete device"
-msgstr "Xoá thiết bị"
+msgid "Select the sensor device you want to use for calibration."
+msgstr ""
 
 #: ../panels/color/color.ui.h:10
-msgid "Remove a device"
-msgstr "Xóa thiết bị"
+#, fuzzy
+#| msgid "Calibration"
+msgid "Calibration Device"
+msgstr "Cân chỉnh"
+
+#: ../panels/color/color.ui.h:11
+msgid "Select the type of display that is connected."
+msgstr ""
 
 #: ../panels/color/color.ui.h:12
-msgid "Set this profile for all users on this computer"
-msgstr "Đặt hồ sơ nà y cho tất cả người dùng trên máy"
+#, fuzzy
+#| msgctxt "Device kind"
+#| msgid "Display"
+msgid "Display Type"
+msgstr "Mà n hình"
 
 #: ../panels/color/color.ui.h:13
-msgid "Add profile"
-msgstr "Thêm hồ sơ"
+msgid ""
+"Select a display target white point. Most displays should be calibrated to a "
+"D65 illuminant."
+msgstr ""
 
 #: ../panels/color/color.ui.h:14
-msgid "Calibrate…"
-msgstr "Cân chỉnh..."
+#, fuzzy
+#| msgid "Large White Pointer"
+msgid "Profile Whitepoint"
+msgstr "Con trỏ trắng lớn"
 
 #: ../panels/color/color.ui.h:15
-msgid "Calibrate the device"
-msgstr "Cân chỉnh thiết bị nà y"
+msgid ""
+"Please set the display to a brightness that is typical for you. Color "
+"management will be most accurate at this brightness level."
+msgstr ""
 
 #: ../panels/color/color.ui.h:16
-msgid "Remove profile"
-msgstr "Xóa hồ sơ"
+msgid ""
+"Alternatively, you can use the brightness level used with one of the other "
+"profiles for this device."
+msgstr ""
 
 #: ../panels/color/color.ui.h:17
-msgid "View details"
-msgstr "Hiện chi tiết"
+#, fuzzy
+#| msgid "Brightness"
+msgid "Display Brightness"
+msgstr "Độ sáng"
 
 #: ../panels/color/color.ui.h:18
+msgid ""
+"You can use a color profile on different computers, or even create profiles "
+"for different lighting conditions."
+msgstr ""
+
+#: ../panels/color/color.ui.h:19
+#, fuzzy
+#| msgid "_Profile:"
+msgid "Profile Name:"
+msgstr "_Hồ sơ:"
+
+#: ../panels/color/color.ui.h:20
+#, fuzzy
+#| msgid "filename"
+msgid "Profile Name"
+msgstr "tên-tập-tin"
+
+#: ../panels/color/color.ui.h:21
+msgid "Profile successfully created!"
+msgstr ""
+
+#: ../panels/color/color.ui.h:22
+#, fuzzy
+#| msgid "_Import"
+msgid "Export"
+msgstr "_Nhập"
+
+#: ../panels/color/color.ui.h:23
+msgid ""
+"You may find these instructions on how to use the profile on <a href=\"linux"
+"\">GNU/Linux</a>, <a href=\"osx\">Apple OS X</a> and <a href=\"windows"
+"\">Microsoft Windows</a> systems useful."
+msgstr ""
+
+#: ../panels/color/color.ui.h:24
+#: ../panels/user-accounts/um-fingerprint-dialog.c:743
+msgid "Summary"
+msgstr "Tổng kết"
+
+#: ../panels/color/color.ui.h:25
+msgid "Import File…"
+msgstr ""
+
+#: ../panels/color/color.ui.h:26
+msgid ""
+"Problems detected. The profile may not work correctly. <a href=\"\">Show "
+"details.</a>"
+msgstr ""
+
+#: ../panels/color/color.ui.h:27
 msgid "Device type:"
 msgstr "Loại thiết bị"
 
-#: ../panels/color/color.ui.h:19
+#: ../panels/color/color.ui.h:28
 msgid "Manufacturer:"
 msgstr "Nhà sản xuất:"
 
-#: ../panels/color/color.ui.h:20
+#: ../panels/color/color.ui.h:29
 msgid "Model:"
 msgstr "Kiểu:"
 
-#: ../panels/color/color.ui.h:21
+#: ../panels/color/color.ui.h:30
 msgid ""
 "Image files can be dragged on this window to auto-complete the above fields."
 msgstr "Bạn có thể kéo thả tập tin ảnh để tự động điền nốt những ô trên."
 
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:2
-msgid "Color management settings"
-msgstr "Thiết lập quản lý mà u sắc"
+#: ../panels/color/color.ui.h:31
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
+#: ../panels/universal-access/zoom-options.ui.h:28
+msgid "Color"
+msgstr "Mà u sắc"
 
-#. Translators: those are keywords for the color control-center panel
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:4
-msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
+#: ../panels/color/color.ui.h:32
+msgid "Each device needs an up to date color profile to be color managed."
 msgstr ""
-"Color;Mà u;Mau;ICC;Profile;Calibrate;Chinh;Printer;Máy;in;May;Display;Mà n;"
-"hình;Man;hinh;"
+"Mỗi thiết bị cần một bộ hồ sơ mà u cập nhật để có thể được quản lý mà u chính "
+"xác."
 
-#. Add some common languages first
-#: ../panels/common/cc-common-language.c:523
-msgid "English"
-msgstr "Tiếng Anh"
+#: ../panels/color/color.ui.h:33
+msgid "Learn more"
+msgstr "Tìm hiểu thêm"
 
-#: ../panels/common/cc-common-language.c:525
-msgid "British English"
-msgstr "Tiếng Anh (British)"
+#: ../panels/color/color.ui.h:34
+msgid "Learn more about color management"
+msgstr "Tìm hiểu thêm về quản lý mà u sắc"
 
-#: ../panels/common/cc-common-language.c:528
-msgid "German"
-msgstr "Tiếng Đức"
+#: ../panels/color/color.ui.h:35
+msgid "Set for all users"
+msgstr "Đặt cho tất cả mọi người dùng"
 
-#: ../panels/common/cc-common-language.c:531
-msgid "French"
-msgstr "Tiếng Pháp"
+#: ../panels/color/color.ui.h:36
+msgid "Set this profile for all users on this computer"
+msgstr "Đặt hồ sơ nà y cho tất cả người dùng trên máy"
 
-#: ../panels/common/cc-common-language.c:534
-msgid "Spanish"
-msgstr "Tiếng Tây Ban Nha"
+#: ../panels/color/color.ui.h:37
+#, fuzzy
+#| msgid "Enabled"
+msgid "Enable"
+msgstr "Bật"
 
-#: ../panels/common/cc-common-language.c:536
-msgid "Chinese (simplified)"
-msgstr "Tiếng Trung Hoa (giản thể)"
+#: ../panels/color/color.ui.h:38
+msgid "Add profile"
+msgstr "Thêm hồ sơ"
 
-#: ../panels/common/cc-common-language.c:539
-msgid "Russian"
-msgstr "Tiếng Nga"
+#: ../panels/color/color.ui.h:39
+#: ../panels/wacom/gnome-wacom-properties.ui.h:10
+msgid "Calibrate…"
+msgstr "Cân chỉnh..."
 
-#: ../panels/common/cc-common-language.c:542
-msgid "Arabic"
-msgstr "Tiếng Ả Rập"
+#: ../panels/color/color.ui.h:40
+msgid "Calibrate the device"
+msgstr "Cân chỉnh thiết bị nà y"
 
-#. Add some common regions
-#: ../panels/common/cc-common-language.c:571
-msgid "United States"
-msgstr "Mỹ"
+#: ../panels/color/color.ui.h:41
+msgid "Remove profile"
+msgstr "Xóa hồ sơ"
 
-#: ../panels/common/cc-common-language.c:572
-msgid "Germany"
-msgstr "Đức"
+#: ../panels/color/color.ui.h:42
+msgid "View details"
+msgstr "Hiện chi tiết"
 
-#: ../panels/common/cc-common-language.c:573
-msgid "France"
-msgstr "Pháp"
+#: ../panels/color/color.ui.h:43
+msgid "Unable to detect any devices that can be color managed"
+msgstr ""
 
-#: ../panels/common/cc-common-language.c:574
-msgid "Spain"
-msgstr "Tây Ban Nha"
+#: ../panels/color/color.ui.h:44
+msgid "LCD"
+msgstr ""
 
-#: ../panels/common/cc-common-language.c:575
-msgid "China"
-msgstr "Trung Quốc"
+#: ../panels/color/color.ui.h:45
+msgid "LED"
+msgstr ""
 
-#: ../panels/common/cc-language-chooser.c:122
-msgid "Other..."
-msgstr "Khác..."
+#: ../panels/color/color.ui.h:46
+msgid "CRT"
+msgstr ""
 
-#: ../panels/common/cc-language-chooser.c:296
-msgid "Select a region"
-msgstr "Chọn vùng"
+#: ../panels/color/color.ui.h:47
+#, fuzzy
+#| msgid "Co_nnector:"
+msgid "Projector"
+msgstr "Đầu _nối:"
 
-#: ../panels/common/gdm-languages.c:781
-msgid "Unspecified"
-msgstr "Không xác định"
+#: ../panels/color/color.ui.h:48
+msgid "Plasma"
+msgstr ""
 
-#: ../panels/common/language-chooser.ui.h:1
-msgid "Select a language"
-msgstr "Chọn ngôn ngữ"
+#: ../panels/color/color.ui.h:49
+#, fuzzy
+#| msgid "High"
+msgctxt "Calibration quality"
+msgid "High"
+msgstr "Cao"
 
-#: ../panels/common/language-chooser.ui.h:2
-#: ../panels/printers/new-printer-dialog.ui.h:1
-#: ../panels/user-accounts/um-user-panel.c:462
-msgid "_Cancel"
-msgstr "T_hôi"
+#: ../panels/color/color.ui.h:50
+#, fuzzy
+#| msgid "10 minutes"
+msgid "40 minutes"
+msgstr "10 phút"
 
-#: ../panels/common/language-chooser.ui.h:3
-msgid "_Select"
-msgstr "_Chọn"
+#: ../panels/color/color.ui.h:51
+#, fuzzy
+#| msgid "_Medium"
+msgctxt "Calibration quality"
+msgid "Medium"
+msgstr "Trung _bình"
 
-#: ../panels/datetime/datetime.ui.h:1
-msgid "_Region:"
-msgstr "_Vùng:"
+#: ../panels/color/color.ui.h:52 ../panels/power/power.ui.h:4
+#: ../panels/privacy/privacy.ui.h:7
+msgid "30 minutes"
+msgstr "30 phút"
+
+#: ../panels/color/color.ui.h:53
+#, fuzzy
+#| msgid "Low"
+msgctxt "Calibration quality"
+msgid "Low"
+msgstr "Thấp"
+
+#: ../panels/color/color.ui.h:54 ../panels/power/power.ui.h:3
+#, fuzzy
+#| msgid "5 minutes"
+msgid "15 minutes"
+msgstr "5 phút"
+
+#: ../panels/color/color.ui.h:55
+#, fuzzy
+#| msgid "Panel to display"
+msgid "Native to display"
+msgstr "Khung hiển thị"
+
+#: ../panels/color/color.ui.h:56
+#, fuzzy
+#| msgid "Pointing and Clicking"
+msgid "D50 (Printing and publishing)"
+msgstr "Trỏ và nhấn"
+
+#: ../panels/color/color.ui.h:57
+msgid "D55"
+msgstr ""
+
+#: ../panels/color/color.ui.h:58
+msgid "D65 (Photography and graphics)"
+msgstr ""
+
+#: ../panels/color/color.ui.h:59
+#, fuzzy
+#| msgid "75%"
+msgid "D75"
+msgstr "75%"
+
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:2
+msgid ""
+"Calibrate the color of your devices, such as displays, cameras or printers"
+msgstr ""
+
+#. Translators: those are keywords for the color control-center panel
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:4
+msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
+msgstr ""
+"Color;Mà u;Mau;ICC;Profile;Calibrate;Chinh;Printer;Máy;in;May;Display;Mà n;"
+"hình;Man;hinh;"
+
+#. Add some common regions
+#: ../panels/common/cc-common-language.c:677
+msgid "United States"
+msgstr "Mỹ"
+
+#: ../panels/common/cc-common-language.c:678
+msgid "Germany"
+msgstr "Đức"
+
+#: ../panels/common/cc-common-language.c:679
+msgid "France"
+msgstr "Pháp"
+
+#: ../panels/common/cc-common-language.c:680
+msgid "Spain"
+msgstr "Tây Ban Nha"
+
+#: ../panels/common/cc-common-language.c:681
+msgid "China"
+msgstr "Trung Quốc"
+
+#: ../panels/common/cc-common-language.c:747
+#, fuzzy
+#| msgid "Other profile…"
+msgid "Other…"
+msgstr "Hồ sơ khác..."
+
+#: ../panels/common/cc-language-chooser.c:169
+#: ../panels/region/cc-format-chooser.c:259
+#: ../panels/region/cc-input-chooser.c:171
+msgid "More…"
+msgstr ""
+
+#: ../panels/common/cc-language-chooser.c:178
+#, fuzzy
+#| msgid "No local printers found"
+msgid "No languages found"
+msgstr "Không tìm thấy máy in cục bộ"
+
+#. translators:
+#. * The device has been disabled
+#: ../panels/common/cc-util.c:28 ../panels/keyboard/cc-keyboard-option.c:276
+#: ../panels/keyboard/cc-keyboard-option.c:408
+#: ../panels/keyboard/keyboard-shortcuts.c:1160
+#: ../panels/network/network-wifi.ui.h:30
+#: ../panels/sound/gvc/gvc-mixer-control.c:1830
+#: ../panels/user-accounts/um-fingerprint-dialog.c:215
+#: ../panels/user-accounts/um-fingerprint-dialog.c:216
+msgid "Disabled"
+msgstr "Tắt"
+
+#: ../panels/common/cc-util.c:29
+#, fuzzy
+#| msgid "Left Half"
+msgid "Left Shift"
+msgstr "Nửa trái"
+
+#: ../panels/common/cc-util.c:30
+#, fuzzy
+#| msgid "Left Half"
+msgid "Left Alt"
+msgstr "Nửa trái"
+
+#: ../panels/common/cc-util.c:31
+#, fuzzy
+#| msgid "Left Half"
+msgid "Left Ctrl"
+msgstr "Nửa trái"
+
+#: ../panels/common/cc-util.c:32
+#, fuzzy
+#| msgid "Right Half"
+msgid "Right Shift"
+msgstr "Nửa phải"
+
+#: ../panels/common/cc-util.c:33
+#, fuzzy
+#| msgid "Right Half"
+msgid "Right Alt"
+msgstr "Nửa phải"
+
+#: ../panels/common/cc-util.c:34
+#, fuzzy
+#| msgid "Right Half"
+msgid "Right Ctrl"
+msgstr "Nửa phải"
+
+#: ../panels/common/cc-util.c:35
+#, fuzzy
+#| msgid "Left Half"
+msgid "Left Alt+Shift"
+msgstr "Nửa trái"
+
+#: ../panels/common/cc-util.c:36
+#, fuzzy
+#| msgid "Right Half"
+msgid "Right Alt+Shift"
+msgstr "Nửa phải"
+
+#: ../panels/common/cc-util.c:37
+msgid "Left Ctrl+Shift"
+msgstr ""
+
+#: ../panels/common/cc-util.c:38
+#, fuzzy
+#| msgid "Right Half"
+msgid "Right Ctrl+Shift"
+msgstr "Nửa phải"
+
+#: ../panels/common/cc-util.c:39
+msgid "Left+Right Shift"
+msgstr ""
+
+#: ../panels/common/cc-util.c:40 ../panels/region/input-options.ui.h:11
+msgid "Left+Right Alt"
+msgstr ""
+
+#: ../panels/common/cc-util.c:41
+msgid "Left+Right Ctrl"
+msgstr ""
+
+#: ../panels/common/cc-util.c:42
+#, fuzzy
+#| msgid "Ctrl+Alt+Shift+Space"
+msgid "Alt+Shift"
+msgstr "Ctrl+Alt+Shift+<khoảng trắng>"
+
+#: ../panels/common/cc-util.c:43
+#, fuzzy
+#| msgid "Ctrl+Alt+Shift+Space"
+msgid "Ctrl+Shift"
+msgstr "Ctrl+Alt+Shift+<khoảng trắng>"
+
+#: ../panels/common/cc-util.c:44
+msgid "Alt+Ctrl"
+msgstr ""
+
+#: ../panels/common/cc-util.c:45
+msgid "Caps"
+msgstr ""
+
+#: ../panels/common/cc-util.c:46
+msgid "Shift+Caps"
+msgstr ""
+
+#: ../panels/common/cc-util.c:47
+msgid "Alt+Caps"
+msgstr ""
+
+#: ../panels/common/cc-util.c:48
+msgid "Ctrl+Caps"
+msgstr ""
+
+#: ../panels/common/language-chooser.ui.h:1 ../panels/region/region.ui.h:1
+msgid "Language"
+msgstr "Ngôn ngữ"
+
+#: ../panels/common/language-chooser.ui.h:2
+#: ../panels/region/format-chooser.ui.h:2
+#, fuzzy
+#| msgid "Done!"
+msgid "_Done"
+msgstr "Hoà n tất!"
+
+#: ../panels/datetime/datetime.ui.h:1
+msgid "_Region:"
+msgstr "_Vùng:"
 
 #: ../panels/datetime/datetime.ui.h:2
 msgid "_City:"
@@ -720,8 +1172,8 @@ msgid "Date & Time"
 msgstr "Ngà y giờ"
 
 #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
-msgid "Date and Time preferences panel"
-msgstr "Khung tuỳ thích ngà y giờ"
+msgid "Change the date and time, including time zone"
+msgstr ""
 
 #. Translators: those are keywords for the date and time control-center panel
 #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4
@@ -736,22 +1188,22 @@ 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 để đổi thời gian hoặc ngà y tháng."
 
-#: ../panels/display/cc-display-panel.c:481
+#: ../panels/display/cc-display-panel.c:483
 msgctxt "display panel, rotation"
 msgid "Normal"
 msgstr "Bình thường"
 
-#: ../panels/display/cc-display-panel.c:482
+#: ../panels/display/cc-display-panel.c:484
 msgctxt "display panel, rotation"
 msgid "Counterclockwise"
 msgstr "Ngược chiều kim đồng hồ"
 
-#: ../panels/display/cc-display-panel.c:483
+#: ../panels/display/cc-display-panel.c:485
 msgctxt "display panel, rotation"
 msgid "Clockwise"
 msgstr "Thuận chiều kim đồng hồ"
 
-#: ../panels/display/cc-display-panel.c:484
+#: ../panels/display/cc-display-panel.c:486
 msgctxt "display panel, rotation"
 msgid "180 Degrees"
 msgstr "180 Ä‘á»™"
@@ -762,58 +1214,55 @@ msgstr "180 Ä‘á»™"
 #. * used as an adjective.  For example, the Spanish translation could be
 #. * "Pantallas en Espejo".
 #.
-#: ../panels/display/cc-display-panel.c:623
+#. Keep this string in sync with gnome-control-center/capplets/display/xrandr-capplet.c:get_display_name()
+#. Translators:  this is the feature where what you see on your
+#. * laptop's screen is the same as your external projector.
+#. * Here, "Mirrored" is being used as an adjective.  For example,
+#. * the Spanish translation could be "Pantallas en Espejo".
+#.
+#: ../panels/display/cc-display-panel.c:625
+#: ../panels/display/cc-rr-labeler.c:418
 msgid "Mirrored Displays"
 msgstr "Thiết bị hiển thị song song"
 
-#: ../panels/display/cc-display-panel.c:647
+#: ../panels/display/cc-display-panel.c:649
 #: ../panels/display/display-capplet.ui.h:1
 msgid "Monitor"
 msgstr "Mà n hình"
 
-#: ../panels/display/cc-display-panel.c:748
-#, c-format
-msgid "%d x %d (%s)"
-msgstr "%d x %d (%s)"
-
-#: ../panels/display/cc-display-panel.c:750
-#, c-format
-msgid "%d x %d"
-msgstr "%d x %d"
-
-#: ../panels/display/cc-display-panel.c:1659
+#: ../panels/display/cc-display-panel.c:1669
 msgid "Drag to change primary display."
 msgstr "Kéo để thay đổi thiết bị hiển thị chính."
 
-#: ../panels/display/cc-display-panel.c:1717
+#: ../panels/display/cc-display-panel.c:1727
 msgid ""
 "Select a monitor to change its properties; drag it to rearrange its "
 "placement."
 msgstr "Chọn mà n hình để thay đổi thuộc tính; kéo để sắp xếp vị trí."
 
-#: ../panels/display/cc-display-panel.c:2105
+#: ../panels/display/cc-display-panel.c:2115
 msgid "%a %R"
 msgstr "%a %R"
 
-#: ../panels/display/cc-display-panel.c:2107
+#: ../panels/display/cc-display-panel.c:2117
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../panels/display/cc-display-panel.c:2269
-#: ../panels/display/cc-display-panel.c:2321
+#: ../panels/display/cc-display-panel.c:2279
+#: ../panels/display/cc-display-panel.c:2331
 #, c-format
 msgid "Failed to apply configuration: %s"
 msgstr "Gặp lỗi khi áp dụng cấu hình: %s"
 
-#: ../panels/display/cc-display-panel.c:2349
+#: ../panels/display/cc-display-panel.c:2359
 msgid "Could not save the monitor configuration"
 msgstr "Không thể lưu cấu hình mà n hình"
 
-#: ../panels/display/cc-display-panel.c:2409
+#: ../panels/display/cc-display-panel.c:2419
 msgid "Could not detect displays"
 msgstr "Không thể dò ra thiết bị hiển thị"
 
-#: ../panels/display/cc-display-panel.c:2603
+#: ../panels/display/cc-display-panel.c:2614
 msgid "Could not get screen information"
 msgstr "Không thể lấy thông tin về mà n hình"
 
@@ -843,7 +1292,9 @@ msgid "Displays"
 msgstr "Thiết bị hiển thị"
 
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:2
-msgid "Change resolution and position of monitors and projectors"
+#, fuzzy
+#| msgid "Change resolution and position of monitors and projectors"
+msgid "Choose how to use connected monitors and projectors"
 msgstr "Thay đổi độ phân giải và vị trí mà n hình/máy chiếu"
 
 #. Translators: those are keywords for the display control-center panel
@@ -853,89 +1304,55 @@ msgstr ""
 "Panel;Projector;Máy;chiếu;May;chieu;xrandr;Screen;Mà n;hình;Man;hinh;"
 "Resolution;Độ;pân;giải;Do;phan;gia;Refresh;"
 
-#. Translators: VESA is an techncial acronym, don't translate it.
-#: ../panels/info/cc-info-panel.c:413
-#, c-format
-msgid "VESA: %s"
-msgstr "VESA: %s"
-
-#. TRANSLATORS: device type
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:437 ../panels/network/panel-common.c:82
-#: ../panels/network/panel-common.c:162
+#: ../panels/info/cc-info-panel.c:440 ../panels/network/panel-common.c:127
 msgid "Unknown"
 msgstr "Không rõ"
 
-#. translators: This is the type of architecture, for example:
-#. * "64-bit" or "32-bit"
-#: ../panels/info/cc-info-panel.c:593
+#: ../panels/info/cc-info-panel.c:541
+#, fuzzy, c-format
+#| msgid "%d-bit"
+msgid "%s %d-bit"
+msgstr "%d bit"
+
+#: ../panels/info/cc-info-panel.c:543
 #, c-format
 msgid "%d-bit"
 msgstr "%d bit"
 
-#: ../panels/info/cc-info-panel.c:752
-msgid "Unknown model"
-msgstr "Kiểu lạ"
-
-#: ../panels/info/cc-info-panel.c:835
-msgid "The next login will attempt to use the standard experience."
-msgstr "Dùng trải nghiệm mặc định cho lần đăng nhập tiếp theo."
-
-#: ../panels/info/cc-info-panel.c:837
-msgid ""
-"The next login will use the fallback mode intended for unsupported graphics "
-"hardware."
-msgstr ""
-"Dùng chế độ dự phòng cho phần cứng không hỗ trợ trong lần đăng nhập tiếp "
-"theo."
-
-#. translators: The hardware is not able to run GNOME 3's
-#. * shell, so we use the GNOME "Fallback" session
-#: ../panels/info/cc-info-panel.c:879
-msgctxt "Experience"
-msgid "Fallback"
-msgstr "Dự phòng"
-
-#. translators: The hardware is able to run GNOME 3's
-#. * shell, also called "Standard" experience
-#: ../panels/info/cc-info-panel.c:885
-msgctxt "Experience"
-msgid "Standard"
-msgstr "Chuẩn"
-
-#: ../panels/info/cc-info-panel.c:1227
+#: ../panels/info/cc-info-panel.c:1218
 msgid "Ask what to do"
 msgstr "Hỏi cần phải là m gì"
 
-#: ../panels/info/cc-info-panel.c:1231
+#: ../panels/info/cc-info-panel.c:1222
 msgid "Do nothing"
 msgstr "Không là m gì cả"
 
-#: ../panels/info/cc-info-panel.c:1235
+#: ../panels/info/cc-info-panel.c:1226
 msgid "Open folder"
 msgstr "Mở thư mục"
 
-#: ../panels/info/cc-info-panel.c:1326
+#: ../panels/info/cc-info-panel.c:1317
 msgid "Other Media"
 msgstr "_Thiết bị lưu trữ khác"
 
-#: ../panels/info/cc-info-panel.c:1357
+#: ../panels/info/cc-info-panel.c:1348
 msgid "Select an application for audio CDs"
 msgstr "Chọn ứng dụng cho CD nhạc"
 
-#: ../panels/info/cc-info-panel.c:1358
+#: ../panels/info/cc-info-panel.c:1349
 msgid "Select an application for video DVDs"
 msgstr "Chọn ứng dụng cho DVD phim"
 
-#: ../panels/info/cc-info-panel.c:1359
+#: ../panels/info/cc-info-panel.c:1350
 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:1360
+#: ../panels/info/cc-info-panel.c:1351
 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:1361
+#: ../panels/info/cc-info-panel.c:1352
 msgid "Select an application for software CDs"
 msgstr "Chọn ứng dụng cho CD phần mềm"
 
@@ -944,109 +1361,111 @@ 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:1373
+#: ../panels/info/cc-info-panel.c:1364
 msgid "audio DVD"
 msgstr "DVD nhạc"
 
-#: ../panels/info/cc-info-panel.c:1374
+#: ../panels/info/cc-info-panel.c:1365
 msgid "blank Blu-ray disc"
 msgstr "Đĩa Blu-ray trắng"
 
-#: ../panels/info/cc-info-panel.c:1375
+#: ../panels/info/cc-info-panel.c:1366
 msgid "blank CD disc"
 msgstr "Đĩa CD trắng"
 
-#: ../panels/info/cc-info-panel.c:1376
+#: ../panels/info/cc-info-panel.c:1367
 msgid "blank DVD disc"
 msgstr "Đĩa DVD trắng"
 
-#: ../panels/info/cc-info-panel.c:1377
+#: ../panels/info/cc-info-panel.c:1368
 msgid "blank HD DVD disc"
 msgstr "Đĩa HD DVD trắng"
 
-#: ../panels/info/cc-info-panel.c:1378
+#: ../panels/info/cc-info-panel.c:1369
 msgid "Blu-ray video disc"
 msgstr "Đĩa phim Blu-ray"
 
-#: ../panels/info/cc-info-panel.c:1379
+#: ../panels/info/cc-info-panel.c:1370
 msgid "e-book reader"
 msgstr "Máy xem e-book"
 
-#: ../panels/info/cc-info-panel.c:1380
+#: ../panels/info/cc-info-panel.c:1371
 msgid "HD DVD video disc"
 msgstr "Đĩa phim HD DVD"
 
-#: ../panels/info/cc-info-panel.c:1381
+#: ../panels/info/cc-info-panel.c:1372
 msgid "Picture CD"
 msgstr "CD hình"
 
-#: ../panels/info/cc-info-panel.c:1382
+#: ../panels/info/cc-info-panel.c:1373
 msgid "Super Video CD"
 msgstr "Super Video CD"
 
-#: ../panels/info/cc-info-panel.c:1383
+#: ../panels/info/cc-info-panel.c:1374
 msgid "Video CD"
 msgstr "Video CD"
 
-#: ../panels/info/cc-info-panel.c:1384
+#: ../panels/info/cc-info-panel.c:1375
 msgid "Windows software"
 msgstr "Phần mềm Windows"
 
-#: ../panels/info/cc-info-panel.c:1385
+#: ../panels/info/cc-info-panel.c:1376
 msgid "Software"
 msgstr "Phần mềm"
 
-#: ../panels/info/cc-info-panel.c:1508
-#: ../panels/keyboard/keyboard-shortcuts.c:1647
+#: ../panels/info/cc-info-panel.c:1499
+#: ../panels/keyboard/keyboard-shortcuts.c:1697
 msgid "Section"
 msgstr "Phần"
 
-#: ../panels/info/cc-info-panel.c:1517 ../panels/info/info.ui.h:11
+#: ../panels/info/cc-info-panel.c:1508 ../panels/info/info.ui.h:13
 msgid "Overview"
 msgstr "Tổng quan"
 
-#: ../panels/info/cc-info-panel.c:1523 ../panels/info/info.ui.h:18
+#: ../panels/info/cc-info-panel.c:1514 ../panels/info/info.ui.h:20
 msgid "Default Applications"
 msgstr "Ứng dụng mặc định"
 
-#: ../panels/info/cc-info-panel.c:1528 ../panels/info/info.ui.h:26
+#: ../panels/info/cc-info-panel.c:1519 ../panels/info/info.ui.h:28
 msgid "Removable Media"
 msgstr "Thiết bị lưu trữ di động"
 
-#: ../panels/info/cc-info-panel.c:1533 ../panels/info/info.ui.h:10
-msgid "Graphics"
-msgstr "Đồ hoạ"
-
-#: ../panels/info/cc-info-panel.c:1735
+#: ../panels/info/cc-info-panel.c:1544
 #, c-format
 msgid "Version %s"
 msgstr "Phiên bản %s"
 
-#: ../panels/info/cc-info-panel.c:1785
+#: ../panels/info/cc-info-panel.c:1594
 msgid "Install Updates"
 msgstr "Cà i đặt bản cập nhật"
 
-#: ../panels/info/cc-info-panel.c:1789
+#: ../panels/info/cc-info-panel.c:1598
 msgid "System Up-To-Date"
 msgstr "Hệ thống mới nhất"
 
-#: ../panels/info/cc-info-panel.c:1793
+#: ../panels/info/cc-info-panel.c:1602
 msgid "Checking for Updates"
 msgstr "Tìm bản cập nhật"
 
 #: ../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:58
 msgid "Details"
 msgstr "Chi tiết"
 
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:2
-msgid "System Information"
-msgstr "Thông tin hệ thống"
+msgid "View information about your system"
+msgstr ""
 
 #. sure that you use the same "translation" for those keywords
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:4
+#, fuzzy
+#| msgid ""
+#| "device;system;information;memory;processor;version;default;application;"
+#| "fallback;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
 msgid ""
 "device;system;information;memory;processor;version;default;application;"
-"fallback;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
+"preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
 msgstr ""
 "device;thiết;bị;thiet;bi;system;hệ;thống;he;thong;information;thông;tin;"
 "thong;memory;bộ;nhớ;bo;nho;processor;xử;lý;xu;ly;li;version;phiên;bản;phien;"
@@ -1078,86 +1497,90 @@ msgstr "Bá»™ nhá»›"
 msgid "Processor"
 msgstr "Bộ xử lý"
 
-#: ../panels/info/info.ui.h:7
-msgid "OS type"
-msgstr "Kiểu OS"
-
+#. To translators: this field contains the distro name, version and type
 #: ../panels/info/info.ui.h:8
+#, fuzzy
+#| msgid "File System"
+msgid "Base system"
+msgstr "Hệ thống Tập tin"
+
+#: ../panels/info/info.ui.h:9
 msgid "Disk"
 msgstr "Đĩa"
 
-#: ../panels/info/info.ui.h:9
-msgid "Calculating..."
+#: ../panels/info/info.ui.h:10
+#, fuzzy
+#| msgid "Calculating..."
+msgid "Calculating…"
 msgstr "Đang tính toán..."
 
+#: ../panels/info/info.ui.h:11
+msgid "Graphics"
+msgstr "Đồ hoạ"
+
 #: ../panels/info/info.ui.h:12
+#, fuzzy
+#| msgid "Calibration"
+msgid "Virtualization"
+msgstr "Cân chỉnh"
+
+#: ../panels/info/info.ui.h:14
 msgid "_Web"
 msgstr "_Web"
 
 # Name: don't translate / Tên: đừng dịch
-#: ../panels/info/info.ui.h:13
+#: ../panels/info/info.ui.h:15
 msgid "_Mail"
 msgstr "_ThÆ°"
 
-#: ../panels/info/info.ui.h:14
+#: ../panels/info/info.ui.h:16
 msgid "_Calendar"
 msgstr "_Lịch"
 
-#: ../panels/info/info.ui.h:15
+#: ../panels/info/info.ui.h:17
 msgid "M_usic"
 msgstr "_Nhạc"
 
-#: ../panels/info/info.ui.h:16
+#: ../panels/info/info.ui.h:18
 msgid "_Video"
 msgstr "Phim"
 
-#: ../panels/info/info.ui.h:17
+#: ../panels/info/info.ui.h:19
 msgid "_Photos"
 msgstr "Ả_nh"
 
-#: ../panels/info/info.ui.h:19
+#: ../panels/info/info.ui.h:21
 msgid "Select how media should be handled"
 msgstr "Chọn cách xử lý thiết bị lưu trữ"
 
-#: ../panels/info/info.ui.h:20
+#: ../panels/info/info.ui.h:22
 msgid "CD _audio"
 msgstr "CD _nhạc"
 
-#: ../panels/info/info.ui.h:21
+#: ../panels/info/info.ui.h:23
 msgid "_DVD video"
 msgstr "_DVD phim"
 
-#: ../panels/info/info.ui.h:22
+#: ../panels/info/info.ui.h:24
 msgid "_Music player"
 msgstr "_Trình phát nhạc"
 
-#: ../panels/info/info.ui.h:23
+#: ../panels/info/info.ui.h:25
 msgid "_Software"
 msgstr "_Phần mềm"
 
-#: ../panels/info/info.ui.h:24
-msgid "_Other Media..."
-msgstr "_Thiết bị lưu trữ khác..."
+#: ../panels/info/info.ui.h:26
+#, fuzzy
+#| msgid "Other Media"
+msgid "_Other Media…"
+msgstr "_Thiết bị lưu trữ khác"
 
-#: ../panels/info/info.ui.h:25
+#: ../panels/info/info.ui.h:27
 msgid "_Never prompt or start programs on media insertion"
 msgstr ""
 "_Không bao giờ hỏi hay khởi động chương trình khi nhận ra thiết bị lưu trữ "
 "má»›i"
 
-#: ../panels/info/info.ui.h:27
-msgid "Driver"
-msgstr "Trình điều khiển"
-
-#: ../panels/info/info.ui.h:28
-msgid "Experience"
-msgstr "Trải nghiệm"
-
-#. Hardware is not able to run GNOME 3's shell, so we might want to force running the 'Fallback' experience.
-#: ../panels/info/info.ui.h:30
-msgid "Forced _Fallback Mode"
-msgstr "_Buộc chế độ dự phòng"
-
 #: ../panels/keyboard/00-multimedia.xml.in.h:1
 msgid "Sound and Media"
 msgstr "Âm thanh và phương tiện"
@@ -1204,19 +1627,20 @@ msgstr "Đẩy ra"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:1
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
-#: ../panels/keyboard/keyboard-shortcuts.c:858
-#: ../panels/universal-access/uap.ui.h:68
+#: ../panels/universal-access/uap.ui.h:66
 msgid "Typing"
 msgstr "Nhập liệu"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:2
-#: ../panels/region/gnome-region-panel.ui.h:26
-msgid "Switch to next source"
+#, fuzzy
+#| msgid "Switch to next source"
+msgid "Switch to next input source"
 msgstr "Chuyển sang nguồn kế"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:3
-#: ../panels/region/gnome-region-panel.ui.h:24
-msgid "Switch to previous source"
+#, fuzzy
+#| msgid "Switch to previous source"
+msgid "Switch to previous input source"
 msgstr "Chuyển sang nguồn cũ"
 
 #: ../panels/keyboard/01-launchers.xml.in.h:1
@@ -1244,6 +1668,9 @@ msgid "Home folder"
 msgstr "Thư mục cá nhân"
 
 #: ../panels/keyboard/01-launchers.xml.in.h:7
+#, fuzzy
+#| msgid "Search"
+msgctxt "keybinding"
 msgid "Search"
 msgstr "Tìm kiếm"
 
@@ -1251,19 +1678,25 @@ msgstr "Tìm kiếm"
 msgid "Screenshots"
 msgstr "Hình chụp"
 
-#. translators: Pictures is the name of the XDG Pictures directory
+#. translators: $PICTURES will be replaced by the name of the XDG Pictures directory
 #: ../panels/keyboard/01-screenshot.xml.in.h:3
-msgid "Save a screenshot to Pictures"
+#, fuzzy
+#| msgid "Save a screenshot to Pictures"
+msgid "Save a screenshot to $PICTURES"
 msgstr "Chụp mà n hình"
 
-#. translators: Pictures is the name of the XDG Pictures directory
+#. translators: $PICTURES will be replaced by the name of the XDG Pictures directory
 #: ../panels/keyboard/01-screenshot.xml.in.h:5
-msgid "Save a screenshot of a window to Pictures"
+#, fuzzy
+#| msgid "Save a screenshot of a window to Pictures"
+msgid "Save a screenshot of a window to $PICTURES"
 msgstr "Chụp hình cửa sổ"
 
-#. translators: Pictures is the name of the XDG Pictures directory
+#. translators: $PICTURES will be replaced by the name of the XDG Pictures directory
 #: ../panels/keyboard/01-screenshot.xml.in.h:7
-msgid "Save a screenshot of an area to Pictures"
+#, fuzzy
+#| msgid "Save a screenshot of an area to Pictures"
+msgid "Save a screenshot of an area to $PICTURES"
 msgstr "Chụp một vùng mà n hình"
 
 #: ../panels/keyboard/01-screenshot.xml.in.h:8
@@ -1279,7 +1712,6 @@ msgid "Copy a screenshot of an area to clipboard"
 msgstr "Chụp một vùng mà n hình và o bảng tạm"
 
 #: ../panels/keyboard/01-system.xml.in.h:1
-#: ../panels/region/gnome-region-panel.ui.h:39
 msgid "System"
 msgstr "Hệ thống"
 
@@ -1328,33 +1760,28 @@ msgstr "Giảm cỡ chữ"
 msgid "High contrast on or off"
 msgstr "Bật hoặc tắt tương phản cao"
 
-#. translators:
-#. * The device has been disabled
-#: ../panels/keyboard/cc-keyboard-option.c:241
-#: ../panels/keyboard/cc-keyboard-option.c:347
-#: ../panels/keyboard/keyboard-shortcuts.c:1112
-#: ../panels/sound/gvc-mixer-control.c:1834
-#: ../panels/user-accounts/um-fingerprint-dialog.c:215
-#: ../panels/user-accounts/um-fingerprint-dialog.c:216
-msgid "Disabled"
-msgstr "Tắt"
-
-#: ../panels/keyboard/cc-keyboard-option.c:315
+#: ../panels/keyboard/cc-keyboard-option.c:362
 msgid "Alternative Characters Key"
 msgstr "Phím ký tự thay thế"
 
-#: ../panels/keyboard/cc-keyboard-option.c:320
+#: ../panels/keyboard/cc-keyboard-option.c:367
 msgid "Compose Key"
 msgstr "Phím tổ hợp"
 
+#: ../panels/keyboard/cc-keyboard-option.c:371
+#, fuzzy
+#| msgid "Switch to next source"
+msgid "Modifiers-only switch to next source"
+msgstr "Chuyển sang nguồn kế"
+
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
 msgid "Keyboard"
 msgstr "Bà n phím"
 
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2
-msgid "Change keyboard settings"
-msgstr "Thay đổi thiết lập bà n phím"
+msgid "View and change keyboard shortcuts and set your typing preferences"
+msgstr ""
 
 #. Translators: those are keywords for the keyboard control-center panel
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4
@@ -1389,15 +1816,17 @@ msgstr "Khoảng _trễ:"
 msgid "_Speed:"
 msgstr "_Tốc độ:"
 
-#. short delay
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
-#: ../panels/universal-access/uap.ui.h:49
+#, fuzzy
+#| msgid "Short"
+msgctxt "keyboard, delay"
 msgid "Short"
 msgstr "Ngắn"
 
-#. slow acceleration
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
-#: ../panels/mouse/gnome-mouse-properties.ui.h:4
+#, fuzzy
+#| msgid "Slow"
+msgctxt "keyboard, speed"
 msgid "Slow"
 msgstr "Chậm"
 
@@ -1405,15 +1834,17 @@ msgstr "Chậm"
 msgid "Repeat keys speed"
 msgstr "Tốc độ lặp"
 
-#. long delay
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
-#: ../panels/universal-access/uap.ui.h:52
+#, fuzzy
+#| msgid "Long"
+msgctxt "keyboard, delay"
 msgid "Long"
 msgstr "Lâu"
 
-#. fast acceleration
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
-#: ../panels/mouse/gnome-mouse-properties.ui.h:7
+#, fuzzy
+#| msgid "Fast"
+msgctxt "keyboard, speed"
 msgid "Fast"
 msgstr "Nhanh"
 
@@ -1434,8 +1865,9 @@ msgid "Cursor blink speed"
 msgstr "Tốc độ chớp con trỏ"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
-msgid "Layout Settings"
-msgstr "Thiết lập bố trí"
+#: ../panels/region/region.ui.h:5
+msgid "Input Sources"
+msgstr "Thiết bị nhập"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
 msgid "Add Shortcut"
@@ -1455,23 +1887,19 @@ msgstr ""
 "Backspace để xóa phím tắt."
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:23
-#: ../panels/region/gnome-region-panel.ui.h:29
 msgid "Shortcuts"
 msgstr "Phím tắt"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:552
-#: ../panels/keyboard/keyboard-shortcuts.c:560
-#: ../panels/keyboard/keyboard-shortcuts.c:942
-#: ../panels/keyboard/keyboard-shortcuts.c:1414
-#: ../panels/keyboard/keyboard-shortcuts.c:1418
+#: ../panels/keyboard/keyboard-shortcuts.c:585
+#: ../panels/keyboard/keyboard-shortcuts.c:593
 msgid "Custom Shortcuts"
 msgstr "Phím tắt tự chọn"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:756
+#: ../panels/keyboard/keyboard-shortcuts.c:804
 msgid "<Unknown Action>"
 msgstr "<Hà nh động lạ>"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1253
+#: ../panels/keyboard/keyboard-shortcuts.c:1301
 #, c-format
 msgid ""
 "The shortcut \"%s\" cannot be used because it will become impossible to type "
@@ -1481,7 +1909,7 @@ 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/keyboard-shortcuts.c:1285
+#: ../panels/keyboard/keyboard-shortcuts.c:1333
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for\n"
@@ -1490,18 +1918,20 @@ msgstr ""
 "Phím tắt \"%s\" đã dùng cho\n"
 "\"%s\""
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1290
+#: ../panels/keyboard/keyboard-shortcuts.c:1338
 #, 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/keyboard-shortcuts.c:1296
+#: ../panels/keyboard/keyboard-shortcuts.c:1344
 msgid "_Reassign"
 msgstr "_Gán lại"
 
-#: ../panels/mouse/cc-mouse-panel.c:152
-msgid "_Test Your Settings"
+#: ../panels/mouse/cc-mouse-panel.c:123
+#, fuzzy
+#| msgid "_Test Your Settings"
+msgid "Test Your _Settings"
 msgstr "_Kiểm tra thiết lập của bạn"
 
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1
@@ -1509,8 +1939,9 @@ msgid "Mouse & Touchpad"
 msgstr "Chuột và Touchpad"
 
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2
-msgid "Set your mouse and touchpad preferences"
-msgstr "Đặt tuỳ thích chuột và touchpad"
+msgid ""
+"Change your mouse or touchpad sensitivity and select right or left-handed"
+msgstr ""
 
 #. Translators: those are keywords for the mouse and touchpad control-center panel
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4
@@ -1527,51 +1958,71 @@ msgstr "Tùy thích con trỏ chuột"
 msgid "General"
 msgstr "Chung"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:5
+#: ../panels/mouse/gnome-mouse-properties.ui.h:3
+#, fuzzy
+#| msgid "Slow"
+msgctxt "mouse, speed"
+msgid "Slow"
+msgstr "Chậm"
+
+#: ../panels/mouse/gnome-mouse-properties.ui.h:4
 msgid "Double-click timeout"
 msgstr "Thời hạn nhấp đúp"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:8
+#: ../panels/mouse/gnome-mouse-properties.ui.h:5
+#, fuzzy
+#| msgid "Fast"
+msgctxt "mouse, speed"
+msgid "Fast"
+msgstr "Nhanh"
+
+#: ../panels/mouse/gnome-mouse-properties.ui.h:6
 msgid "_Double-click"
 msgstr "Nhấn đô_i:"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:9
+#: ../panels/mouse/gnome-mouse-properties.ui.h:7
 msgid "Primary _button"
 msgstr "_Phím chính"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:10
+#: ../panels/mouse/gnome-mouse-properties.ui.h:8
+#, fuzzy
+#| msgid "_Left"
+msgctxt "mouse, left button as primary"
 msgid "_Left"
 msgstr "_Trái"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:11
+#: ../panels/mouse/gnome-mouse-properties.ui.h:9
+#, fuzzy
+#| msgid "_Right"
+msgctxt "mouse, right button as primary"
 msgid "_Right"
 msgstr "_Phải"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:12
+#: ../panels/mouse/gnome-mouse-properties.ui.h:10
 msgid "Mouse"
 msgstr "Chuá»™t"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:13
+#: ../panels/mouse/gnome-mouse-properties.ui.h:11
 msgid "_Pointer speed"
 msgstr "Tốc độ _con trỏ"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:14
+#: ../panels/mouse/gnome-mouse-properties.ui.h:12
 msgid "Touchpad"
 msgstr "Touchpad"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+#: ../panels/mouse/gnome-mouse-properties.ui.h:13
 msgid "Disable while _typing"
 msgstr "_Tắt khi đang gõ"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:16
+#: ../panels/mouse/gnome-mouse-properties.ui.h:14
 msgid "Tap to _click"
 msgstr "Nhấp để _nhấn"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:17
+#: ../panels/mouse/gnome-mouse-properties.ui.h:15
 msgid "Two _finger scroll"
 msgstr "Cuộn _hai ngón"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:18
+#: ../panels/mouse/gnome-mouse-properties.ui.h:16
 msgid "C_ontent sticks to fingers"
 msgstr "_Nội dung dính và o ngón"
 
@@ -1608,25 +2059,667 @@ msgstr "Nhấp đúp, nút phụ"
 msgid "Single click, secondary button"
 msgstr "Nhấp đơn, nút phụ"
 
-#: ../panels/network/cc-network-panel.c:615
+#. TRANSLATORS: this is to disable the radio hardware in the
+#. * network panel
+#: ../panels/network/cc-network-panel.c:347
+msgid "Air_plane Mode"
+msgstr "Chế độ _máy bay"
+
+#: ../panels/network/cc-network-panel.c:912
 msgid "Network proxy"
 msgstr "Ủy nhiệm mạng"
 
-#: ../panels/network/cc-network-panel.c:799 ../panels/network/net-vpn.c:278
+#: ../panels/network/cc-network-panel.c:1091 ../panels/network/net-vpn.c:280
 #, c-format
 msgid "%s VPN"
 msgstr "VPN %s"
 
-#. TRANSLATORS: the user is running a NM that is not API compatible
-#: ../panels/network/cc-network-panel.c:866
-msgid "The system network services are not compatible with this version."
-msgstr "Dịch vụ mạng hệ thống không tương thích với phiên bản nà y."
+#. TRANSLATORS: the user is running a NM that is not API compatible
+#: ../panels/network/cc-network-panel.c:1225
+msgid "The system network services are not compatible with this version."
+msgstr "Dịch vụ mạng hệ thống không tương thích với phiên bản nà y."
+
+#: ../panels/network/connection-editor/8021x-security-page.ui.h:1
+#, fuzzy
+#| msgid "Security"
+msgid "802.1x _Security"
+msgstr "An ninh"
+
+#: ../panels/network/connection-editor/8021x-security-page.ui.h:3
+#: ../panels/network/connection-editor/security-page.ui.h:3
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:1
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:5
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:2
+msgid "Anony_mous identity"
+msgstr ""
+
+#: ../panels/network/connection-editor/8021x-security-page.ui.h:4
+#: ../panels/network/connection-editor/security-page.ui.h:4
+#, fuzzy
+#| msgid "Authenticating"
+msgid "Inner _authentication"
+msgstr "Đang xác thực"
+
+#: ../panels/network/connection-editor/ce-page-8021x-security.c:108
+#: ../panels/network/connection-editor/ce-page-security.c:455
+#: ../panels/network/connection-editor/details-page.ui.h:3
+#: ../panels/network/network-wifi.ui.h:4
+msgid "Security"
+msgstr "An ninh"
+
+#: ../panels/network/connection-editor/ce-page.c:502
+#, fuzzy
+#| msgctxt "proxy method"
+#| msgid "Automatic"
+msgid "automatic"
+msgstr "Tá»± Ä‘á»™ng"
+
+#. TRANSLATORS: this WEP WiFi security
+#: ../panels/network/connection-editor/ce-page-details.c:52
+#: ../panels/network/net-device-wifi.c:224
+#: ../panels/network/net-device-wifi.c:385
+msgid "WEP"
+msgstr "WEP"
+
+#. TRANSLATORS: this WPA WiFi security
+#: ../panels/network/connection-editor/ce-page-details.c:56
+#: ../panels/network/net-device-wifi.c:228
+#: ../panels/network/net-device-wifi.c:390
+#: ../panels/network/network-wifi.ui.h:17
+msgid "WPA"
+msgstr "WPA"
+
+#. TRANSLATORS: this WPA WiFi security
+#: ../panels/network/connection-editor/ce-page-details.c:60
+#: ../panels/network/net-device-wifi.c:232
+msgid "WPA2"
+msgstr "WPA2"
+
+#. TRANSLATORS: this Enterprise WiFi security
+#: ../panels/network/connection-editor/ce-page-details.c:65
+#: ../panels/network/net-device-wifi.c:237
+msgid "Enterprise"
+msgstr "Doanh nghiệp"
+
+#: ../panels/network/connection-editor/ce-page-details.c:70
+#: ../panels/network/net-device-wifi.c:242
+#: ../panels/network/net-device-wifi.c:375
+msgctxt "Wifi security"
+msgid "None"
+msgstr "Không"
+
+#: ../panels/network/connection-editor/ce-page-details.c:91
+#: ../panels/power/power.ui.h:19
+msgid "Never"
+msgstr ""
+
+#: ../panels/network/connection-editor/ce-page-details.c:102
+#: ../panels/user-accounts/um-utils.c:770
+msgid "Today"
+msgstr ""
+
+#: ../panels/network/connection-editor/ce-page-details.c:104
+#: ../panels/user-accounts/um-utils.c:773
+#, fuzzy
+#| msgid "Yesterday %l:%M %p"
+msgid "Yesterday"
+msgstr "Hôm qua %l:%M %p"
+
+#: ../panels/network/connection-editor/ce-page-details.c:106
+#: ../panels/network/net-device-ethernet.c:126
+#: ../panels/network/net-device-wifi.c:479
+#, 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:537
+#, 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:566
+msgctxt "Signal strength"
+msgid "None"
+msgstr "Không"
+
+#: ../panels/network/connection-editor/ce-page-details.c:183
+#: ../panels/network/net-device-wifi.c:568
+msgctxt "Signal strength"
+msgid "Weak"
+msgstr "Yếu"
+
+#: ../panels/network/connection-editor/ce-page-details.c:185
+#: ../panels/network/net-device-wifi.c:570
+msgctxt "Signal strength"
+msgid "Ok"
+msgstr "Ok"
+
+#: ../panels/network/connection-editor/ce-page-details.c:187
+#: ../panels/network/net-device-wifi.c:572
+msgctxt "Signal strength"
+msgid "Good"
+msgstr "Tốt"
+
+#: ../panels/network/connection-editor/ce-page-details.c:189
+#: ../panels/network/net-device-wifi.c:574
+msgctxt "Signal strength"
+msgid "Excellent"
+msgstr "Mạnh"
+
+#: ../panels/network/connection-editor/ce-page-ethernet.c:200
+#: ../panels/network/connection-editor/ce-page-vpn.c:172
+#: ../panels/network/connection-editor/ce-page-wifi.c:243
+#: ../panels/network/network-wifi.ui.h:59
+msgid "Identity"
+msgstr ""
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:202
+#: ../panels/network/connection-editor/ce-page-ip4.c:454
+msgid "Netmask"
+msgstr ""
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:216
+#: ../panels/network/connection-editor/ce-page-ip4.c:467
+#: ../panels/network/connection-editor/ce-page-ip6.c:217
+#: ../panels/network/connection-editor/ce-page-ip6.c:475
+#: ../panels/network/network-vpn.ui.h:3
+msgid "Gateway"
+msgstr "Máy cổng"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:233
+#: ../panels/network/connection-editor/ce-page-ip6.c:234
+#, fuzzy
+#| msgid "IP Address"
+msgid "Delete Address"
+msgstr "Địa chỉ IP"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:285
+#: ../panels/network/connection-editor/ce-page-ip6.c:286
+#, fuzzy
+#| msgid "_Add"
+msgid "Add"
+msgstr "_Thêm"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:350
+#: ../panels/network/connection-editor/ce-page-ip6.c:354
+msgid "Server"
+msgstr ""
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:367
+#: ../panels/network/connection-editor/ce-page-ip6.c:371
+#, fuzzy
+#| msgid "Delete device"
+msgid "Delete DNS Server"
+msgstr "Xoá thiết bị"
+
+#. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
+#: ../panels/network/connection-editor/ce-page-ip4.c:481
+#: ../panels/network/connection-editor/ce-page-ip6.c:489
+#, fuzzy
+#| msgid "Metric"
+msgctxt "network parameters"
+msgid "Metric"
+msgstr "Mét"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:502
+#: ../panels/network/connection-editor/ce-page-ip6.c:510
+#, fuzzy
+#| msgid "Default Route"
+msgid "Delete Route"
+msgstr "Định tuyến mặc định"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:616
+#: ../panels/network/network-wifi.ui.h:26
+#, fuzzy
+#| msgctxt "proxy method"
+#| msgid "Automatic"
+msgid "Automatic (DHCP)"
+msgstr "Tá»± Ä‘á»™ng"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:620
+#: ../panels/network/connection-editor/ce-page-ip6.c:622
+#: ../panels/network/network-wifi.ui.h:25
+#, fuzzy
+#| msgctxt "proxy method"
+#| msgid "Manual"
+msgid "Manual"
+msgstr "Thủ công"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:624
+#: ../panels/network/connection-editor/ce-page-ip6.c:626
+msgid "Link-Local Only"
+msgstr ""
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:925
+#: ../panels/network/network-wifi.ui.h:60
+msgid "IPv4"
+msgstr ""
+
+#: ../panels/network/connection-editor/ce-page-ip6.c:204
+#: ../panels/network/connection-editor/ce-page-ip6.c:458
+msgid "Prefix"
+msgstr ""
+
+#: ../panels/network/connection-editor/ce-page-ip6.c:614
+#: ../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
+#, fuzzy
+#| msgctxt "proxy method"
+#| msgid "Automatic"
+msgid "Automatic"
+msgstr "Tá»± Ä‘á»™ng"
+
+#: ../panels/network/connection-editor/ce-page-ip6.c:618
+#, fuzzy
+#| msgid "A_utomatic Login"
+msgid "Automatic, DHCP only"
+msgstr "Đăng nhập _tự động"
+
+#: ../panels/network/connection-editor/ce-page-ip6.c:886
+#: ../panels/network/network-wifi.ui.h:61
+msgid "IPv6"
+msgstr ""
+
+#: ../panels/network/connection-editor/ce-page-reset.c:91
+#: ../panels/network/network-wifi.ui.h:63
+msgid "Reset"
+msgstr ""
+
+#: ../panels/network/connection-editor/ce-page-security.c:250
+#, fuzzy
+#| msgid "None"
+msgctxt "Wi-Fi/Ethernet security"
+msgid "None"
+msgstr "Không có"
+
+#: ../panels/network/connection-editor/ce-page-security.c:273
+msgid "WEP 40/128-bit Key (Hex or ASCII)"
+msgstr ""
+
+#: ../panels/network/connection-editor/ce-page-security.c:283
+msgid "WEP 128-bit Passphrase"
+msgstr ""
+
+#: ../panels/network/connection-editor/ce-page-security.c:296
+#: ../panels/network/wireless-security/wireless-security.c:409
+msgid "LEAP"
+msgstr ""
+
+#: ../panels/network/connection-editor/ce-page-security.c:309
+msgid "Dynamic WEP (802.1x)"
+msgstr ""
+
+#: ../panels/network/connection-editor/ce-page-security.c:323
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../panels/network/connection-editor/ce-page-security.c:337
+#, fuzzy
+#| msgid "Enterprise"
+msgid "WPA & WPA2 Enterprise"
+msgstr "Doanh nghiệp"
+
+#: ../panels/network/connection-editor/connection-editor.ui.h:1
+#, fuzzy
+#| msgid "Supply"
+msgid "_Apply"
+msgstr "Nguyên liệu in"
+
+#: ../panels/network/connection-editor/details-page.ui.h:1
+#: ../panels/network/network-wifi.ui.h:2
+#, fuzzy
+#| msgid "Strength"
+msgid "Signal Strength"
+msgstr "Độ mạnh"
+
+#: ../panels/network/connection-editor/details-page.ui.h:2
+#: ../panels/network/network-wifi.ui.h:3
+msgid "Link speed"
+msgstr "Tốc độ đường truyền"
+
+#: ../panels/network/connection-editor/details-page.ui.h:4
+#: ../panels/network/net-device-ethernet.c:159
+#: ../panels/network/network-simple.ui.h:2
+#: ../panels/network/network-wifi.ui.h:5 ../panels/network/panel-common.c:693
+msgid "IPv4 Address"
+msgstr "Địa chỉ IPv4"
+
+#: ../panels/network/connection-editor/details-page.ui.h:5
+#: ../panels/network/net-device-ethernet.c:160
+#: ../panels/network/net-device-ethernet.c:164
+#: ../panels/network/network-mobile.ui.h:4
+#: ../panels/network/network-simple.ui.h:3
+#: ../panels/network/network-wifi.ui.h:6 ../panels/network/panel-common.c:694
+msgid "IPv6 Address"
+msgstr "Địa chỉ IPv6"
+
+#: ../panels/network/connection-editor/details-page.ui.h:6
+#: ../panels/network/net-device-ethernet.c:167
+#: ../panels/network/network-simple.ui.h:1
+#: ../panels/network/network-wifi.ui.h:7
+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:171
+#: ../panels/network/network-mobile.ui.h:5
+#: ../panels/network/network-simple.ui.h:4
+#: ../panels/network/network-wifi.ui.h:8
+msgid "Default Route"
+msgstr "Định tuyến mặc định"
+
+#: ../panels/network/connection-editor/details-page.ui.h:8
+#: ../panels/network/connection-editor/ip4-page.ui.h:3
+#: ../panels/network/connection-editor/ip6-page.ui.h:3
+#: ../panels/network/net-device-ethernet.c:173
+#: ../panels/network/network-mobile.ui.h:6
+#: ../panels/network/network-simple.ui.h:5
+#: ../panels/network/network-wifi.ui.h:9
+msgid "DNS"
+msgstr "DNS"
+
+#: ../panels/network/connection-editor/details-page.ui.h:9
+#, fuzzy
+#| msgid "Last used"
+msgid "Last Used"
+msgstr "Dùng lần cuối"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr ""
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr ""
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:4
+msgid "BNC"
+msgstr ""
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr ""
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:6
+#, fuzzy
+#| msgid "%d Mb/s"
+msgid "10 Mb/s"
+msgstr "%d Mb/s"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:7
+#, fuzzy
+#| msgid "%d Mb/s"
+msgid "100 Mb/s"
+msgstr "%d Mb/s"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:8
+#, fuzzy
+#| msgid "%i Gb/s"
+msgid "1 Gb/s"
+msgstr "%i Gb/s"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:9
+#, fuzzy
+#| msgid "%i Gb/s"
+msgid "10 Gb/s"
+msgstr "%i Gb/s"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:10
+#: ../panels/network/connection-editor/vpn-page.ui.h:1
+#, fuzzy
+#| msgid "_Name:"
+msgid "_Name"
+msgstr "Tê_n:"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:11
+#: ../panels/network/connection-editor/wifi-page.ui.h:4
+#: ../panels/network/network-wifi.ui.h:49
+#, fuzzy
+#| msgid "Address"
+msgid "_MAC Address"
+msgstr "Địa chỉ"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:12
+msgid "M_TU"
+msgstr ""
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:13
+#: ../panels/network/connection-editor/wifi-page.ui.h:5
+#, fuzzy
+#| msgid "IP Address"
+msgid "_Cloned Address"
+msgstr "Địa chỉ IP"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:14
+#: ../panels/network/connection-editor/wifi-page.ui.h:6
+msgid "Connect _automatically"
+msgstr ""
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:15
+msgid "Make available to other _users"
+msgstr ""
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:16
+#, fuzzy
+#| msgid "%u byte"
+#| msgid_plural "%u bytes"
+msgid "bytes"
+msgstr "%u byte"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:1
+#: ../panels/network/network-wifi.ui.h:23
+msgid "IPv_4"
+msgstr ""
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:2
+#: ../panels/network/connection-editor/ip6-page.ui.h:2
+#: ../panels/network/network-wifi.ui.h:24
+#, fuzzy
+#| msgid "Address"
+msgid "_Addresses"
+msgstr "Địa chỉ"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:5
+#: ../panels/network/connection-editor/ip6-page.ui.h:5
+#, fuzzy
+#| msgctxt "proxy method"
+#| msgid "Automatic"
+msgid "Automatic DNS"
+msgstr "Tá»± Ä‘á»™ng"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:6
+#: ../panels/network/connection-editor/ip6-page.ui.h:6
+#: ../panels/network/network-wifi.ui.h:39
+msgid "Routes"
+msgstr ""
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:7
+#: ../panels/network/connection-editor/ip6-page.ui.h:7
+#, fuzzy
+#| msgctxt "proxy method"
+#| msgid "Automatic"
+msgid "Automatic Routes"
+msgstr "Tá»± Ä‘á»™ng"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:8
+#: ../panels/network/connection-editor/ip6-page.ui.h:8
+#: ../panels/network/network-wifi.ui.h:45
+msgid "Use this connection _only for resources on its network"
+msgstr ""
+
+#: ../panels/network/connection-editor/ip6-page.ui.h:1
+#: ../panels/network/network-wifi.ui.h:47
+msgid "IPv_6"
+msgstr ""
+
+#: ../panels/network/connection-editor/net-connection-editor.c:267
+#, fuzzy
+#| msgid "Bluetooth connection failed"
+msgid "Unable to open connection editor"
+msgstr "Lỗi kết nối Bluetooth"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:282
+#, fuzzy
+#| msgid "No profile"
+msgid "New Profile"
+msgstr "Không có hồ sơ"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:504
+#: ../panels/printers/new-printer-dialog.ui.h:3
+#: ../panels/user-accounts/um-account-dialog.c:1068
+msgid "_Add"
+msgstr "_Thêm"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:586
+#: ../panels/network/network.ui.h:4 ../panels/network/network-vpn.ui.h:1
+msgid "VPN"
+msgstr "VPN"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:587
+msgid "Bond"
+msgstr ""
+
+#: ../panels/network/connection-editor/net-connection-editor.c:588
+msgid "Bridge"
+msgstr ""
+
+#: ../panels/network/connection-editor/net-connection-editor.c:589
+msgid "VLAN"
+msgstr ""
+
+#: ../panels/network/connection-editor/net-connection-editor.c:739
+#, fuzzy
+#| msgid "Could not load ui: %s"
+msgid "Could not load VPN plugins"
+msgstr "Không thể nạp giao diện: %s"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:803
+#, fuzzy
+#| msgid "Other profile…"
+msgid "Import from file…"
+msgstr "Hồ sơ khác..."
+
+#: ../panels/network/connection-editor/net-connection-editor.c:870
+#, fuzzy
+#| msgid "Add new connection"
+msgid "Add Network Connection"
+msgstr "Thêm kết nối mới"
+
+#: ../panels/network/connection-editor/reset-page.ui.h:1
+#: ../panels/network/network-wifi.ui.h:53
+msgid "_Reset"
+msgstr ""
+
+#: ../panels/network/connection-editor/reset-page.ui.h:2
+#: ../panels/network/net-device-wifi.c:1411
+#: ../panels/network/network-wifi.ui.h:54
+#, fuzzy
+#| msgid "Forget"
+msgid "_Forget"
+msgstr "Quên"
+
+#: ../panels/network/connection-editor/reset-page.ui.h:3
+msgid ""
+"Reset the settings for this network, including passwords, but remember it as "
+"a preferred network"
+msgstr ""
+
+#: ../panels/network/connection-editor/reset-page.ui.h:4
+msgid ""
+"Remove all details relating to this network and do not try to automatically "
+"connect"
+msgstr ""
+
+#: ../panels/network/connection-editor/security-page.ui.h:1
+#: ../panels/network/network-wifi.ui.h:14
+#, fuzzy
+#| msgid "Security"
+msgid "S_ecurity"
+msgstr "An ninh"
+
+#: ../panels/network/connection-editor/vpn-helpers.c:205
+#, fuzzy
+#| msgid "Configuring connection"
+msgid "Cannot import VPN connection"
+msgstr "Đang cấu hình kết nối"
+
+#: ../panels/network/connection-editor/vpn-helpers.c:207
+#, c-format
+msgid ""
+"The file '%s' could not be read or does not contain recognized VPN "
+"connection information\n"
+"\n"
+"Error: %s."
+msgstr ""
+
+#: ../panels/network/connection-editor/vpn-helpers.c:242
+#, fuzzy
+#| msgid "Select your photo"
+msgid "Select file to import"
+msgstr "Chọn ảnh chụp"
+
+#: ../panels/network/connection-editor/vpn-helpers.c:294
+#, fuzzy, c-format
+#| msgid "A user with name '%s' already exists."
+msgid "A file named \"%s\" already exists."
+msgstr "Đã có người dùng tên '%s' rồi."
+
+#: ../panels/network/connection-editor/vpn-helpers.c:296
+msgid "_Replace"
+msgstr ""
+
+#: ../panels/network/connection-editor/vpn-helpers.c:298
+#, c-format
+msgid "Do you want to replace %s with the VPN connection you are saving?"
+msgstr ""
+
+#: ../panels/network/connection-editor/vpn-helpers.c:334
+msgid "Cannot export VPN connection"
+msgstr ""
+
+#: ../panels/network/connection-editor/vpn-helpers.c:336
+#, c-format
+msgid ""
+"The VPN connection '%s' could not be exported to %s.\n"
+"\n"
+"Error: %s."
+msgstr ""
+
+#: ../panels/network/connection-editor/vpn-helpers.c:371
+msgid "Export VPN connection..."
+msgstr ""
+
+#: ../panels/network/connection-editor/vpn-page.ui.h:2
+msgid "(Error: unable to load VPN connection editor)"
+msgstr ""
+
+#: ../panels/network/connection-editor/wifi-page.ui.h:1
+#: ../panels/network/network-wifi.ui.h:12
+msgid "_SSID"
+msgstr ""
+
+#: ../panels/network/connection-editor/wifi-page.ui.h:2
+#: ../panels/network/network-wifi.ui.h:13
+msgid "_BSSID"
+msgstr ""
 
-#. TRANSLATORS: this is to disable the radio hardware in the
-#. * network panel
-#: ../panels/network/cc-network-panel.c:1001
-msgid "Air_plane Mode"
-msgstr "Chế độ _máy bay"
+#: ../panels/network/connection-editor/wifi-page.ui.h:3
+#: ../panels/network/network-wifi.ui.h:16
+#, fuzzy
+#| msgid "_Forget Network"
+msgid "My Home Network"
+msgstr "_Quên mạng"
+
+#: ../panels/network/connection-editor/wifi-page.ui.h:7
+msgid "Make available to _other users"
+msgstr ""
 
 #: ../panels/network/gnome-network-panel.desktop.in.in.h:1
 #: ../panels/network/network-mobile.ui.h:7
@@ -1634,138 +2727,141 @@ msgid "Network"
 msgstr "Mạng"
 
 #: ../panels/network/gnome-network-panel.desktop.in.in.h:2
-msgid "Network settings"
-msgstr "Thiết lập mạng"
+#, fuzzy
+#| msgid "Not connected to the internet."
+msgid "Control how you connect to the Internet"
+msgstr "Chưa 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
-msgid "Network;Wireless;IP;LAN;Proxy;"
-msgstr "Network;Mạng;Mang;Wireless;Không;dây;Khong;day;IP;LAN;Proxy;Uỷ;nhiệm"
-
-#: ../panels/network/net-device-mobile.c:222
-msgid "Add new connection"
-msgstr "Thêm kết nối mới"
-
-#. Translators: network device speed
-#: ../panels/network/net-device-mobile.c:261
-#: ../panels/network/net-device-wifi.c:699
-#: ../panels/network/net-device-wired.c:126
-#, c-format
-msgid "%d Mb/s"
-msgstr "%d Mb/s"
-
-#. TRANSLATORS: this is when the access point is not listed in
-#. *  the dropdown (or hidden) and the user has to select another
-#. *  entry manually
-#: ../panels/network/net-device-wifi.c:196
-msgid "Connect to a Hidden Network"
-msgstr "Nối và o mạng ẩn"
-
-#. TRANSLATORS: this WEP WiFi security
-#: ../panels/network/net-device-wifi.c:293
-#: ../panels/network/net-device-wifi.c:472
-msgid "WEP"
-msgstr "WEP"
-
-#. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/net-device-wifi.c:297
-#: ../panels/network/net-device-wifi.c:476
-msgid "WPA"
-msgstr "WPA"
+msgid "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;"
+msgstr ""
 
-#. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/net-device-wifi.c:301
-msgid "WPA2"
-msgstr "WPA2"
+#: ../panels/network/net-device-bond.c:77
+msgid "Bond slaves"
+msgstr ""
 
-#. TRANSLATORS: this Enterprise WiFi security
-#: ../panels/network/net-device-wifi.c:306
-msgid "Enterprise"
-msgstr "Doanh nghiệp"
+#: ../panels/network/net-device-bridge.c:77
+msgid "Bridge slaves"
+msgstr ""
 
-#: ../panels/network/net-device-wifi.c:311
-#: ../panels/network/net-device-wifi.c:467
-msgctxt "Wifi security"
-msgid "None"
-msgstr "Không"
+#: ../panels/network/net-device-ethernet.c:112
+#: ../panels/network/net-device-wifi.c:465
+msgid "never"
+msgstr ""
 
-#: ../panels/network/net-device-wifi.c:733
-msgctxt "Signal strength"
-msgid "None"
-msgstr "Không"
+#: ../panels/network/net-device-ethernet.c:122
+#: ../panels/network/net-device-wifi.c:475
+msgid "today"
+msgstr ""
 
-#: ../panels/network/net-device-wifi.c:735
-msgctxt "Signal strength"
-msgid "Weak"
-msgstr "Yếu"
+#: ../panels/network/net-device-ethernet.c:124
+#: ../panels/network/net-device-wifi.c:477
+msgid "yesterday"
+msgstr ""
 
-#: ../panels/network/net-device-wifi.c:737
-msgctxt "Signal strength"
-msgid "Ok"
-msgstr "Ok"
+#: ../panels/network/net-device-ethernet.c:162
+#: ../panels/network/network-mobile.ui.h:3
+#: ../panels/network/panel-common.c:696 ../panels/network/panel-common.c:698
+#: ../panels/printers/printers.ui.h:13
+msgid "IP Address"
+msgstr "Địa chỉ IP"
 
-#: ../panels/network/net-device-wifi.c:739
-msgctxt "Signal strength"
-msgid "Good"
-msgstr "Tốt"
+#: ../panels/network/net-device-ethernet.c:178
+#: ../panels/network/network-wifi.ui.h:10
+msgid "Last used"
+msgstr "Dùng lần cuối"
 
-#: ../panels/network/net-device-wifi.c:741
-msgctxt "Signal strength"
-msgid "Excellent"
-msgstr "Mạnh"
+#: ../panels/network/net-device-ethernet.c:337
+#: ../panels/network/net-device-wifi.c:1549
+#: ../panels/network/network-ethernet.ui.h:2
+#: ../panels/network/network-vpn.ui.h:8 ../panels/universal-access/uap.ui.h:23
+#, fuzzy
+#| msgid "Options"
+msgid "Options…"
+msgstr "Tùy chọn"
 
-#: ../panels/network/net-device-wifi.c:901
-#, c-format
-msgid ""
-"Network details for %s including password and any custom configuration will "
-"be lost"
-msgstr ""
-"Sẽ mất chi tiết mạng cho %s, bao gồm mật khẩu và các thiết lập tuỳ biến khác"
+#: ../panels/network/net-device-ethernet.c:472
+#, fuzzy, c-format
+#| msgid "_Profile:"
+msgid "Profile %d"
+msgstr "_Hồ sơ:"
 
-#: ../panels/network/net-device-wifi.c:912
-msgid "Forget"
-msgstr "Quên"
+#: ../panels/network/net-device-mobile.c:241
+msgid "Add new connection"
+msgstr "Thêm kết nối mới"
 
-#: ../panels/network/net-device-wifi.c:1437
+#: ../panels/network/net-device-wifi.c:1120
+#, fuzzy
+#| msgid ""
+#| "If you have a connection to the Internet other than wireless, you can use "
+#| "it to share your internet connection with others."
 msgid ""
-"If you have a connection to the Internet other than wireless, you can use it "
-"to share your internet connection with others."
+"If you have a connection to the Internet other than wireless, you can set up "
+"a wireless hotspot to share the connection with others."
 msgstr ""
 "Nếu bạn có kết nối Internet không phải không dây, bạn có thể dùng để chia sẻ "
 "kết nối Internet với người khác."
 
-#: ../panels/network/net-device-wifi.c:1441
+#: ../panels/network/net-device-wifi.c:1124
 #, 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:1445
+#: ../panels/network/net-device-wifi.c:1128
+#, fuzzy
+#| msgid ""
+#| "It is not possible to access the internet through your wireless while the "
+#| "hotspot is active."
 msgid ""
-"It is not possible to access the internet through your wireless while the "
+"It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
 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:1511
+#: ../panels/network/net-device-wifi.c:1202
 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:1514
+#: ../panels/network/net-device-wifi.c:1205
 msgid "_Stop Hotspot"
 msgstr "_Dừng điểm truy cập"
 
-#: ../panels/network/net-device-wifi.c:1579
-#, c-format
-msgid "%i day ago"
-msgid_plural "%i days ago"
-msgstr[0] "%i ngà y trước"
+#: ../panels/network/net-device-wifi.c:1277
+msgid "System policy prohibits use as a Hotspot"
+msgstr ""
 
-#: ../panels/network/net-device-wifi.c:1933
-#: ../panels/network/network-wifi.ui.h:19
-msgid "Out of range"
-msgstr "Ngoà i vùng"
+#: ../panels/network/net-device-wifi.c:1280
+#, fuzzy
+#| msgid "InfiniBand device does not support connected mode"
+msgid "Wireless device does not support Hotspot mode"
+msgstr "Thiết bị InfiniBand không hỗ trợ chế độ kết nối"
+
+#: ../panels/network/net-device-wifi.c:1407
+#, fuzzy
+#| msgid ""
+#| "Network details for %s including password and any custom configuration "
+#| "will be lost"
+msgid ""
+"Network details for the selected networks, including passwords and any "
+"custom configuration will be lost."
+msgstr ""
+"Sẽ mất chi tiết mạng cho %s, bao gồm mật khẩu và các thiết lập tuỳ biến khác"
+
+#: ../panels/network/net-device-wifi.c:1714
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:14
+msgid "History"
+msgstr ""
+
+#. translators: This is the label for the "Forget wireless network" functionality
+#: ../panels/network/net-device-wifi.c:1726
+#, fuzzy
+#| msgid "Forget"
+msgctxt "Wi-Fi Network"
+msgid "_Forget"
+msgstr "Quên"
 
 #. TRANSLATORS: this is when the use leaves the PAC textbox blank
 #: ../panels/network/net-proxy.c:67
@@ -1781,10 +2877,16 @@ msgstr "Dùng Tự động phát hiện uỷ nhiệm Web nếu không cung cấp
 msgid "This is not recommended for untrusted public networks."
 msgstr "Không khuyến khích đối với mạng công cộng không đáng tin."
 
-#: ../panels/network/net-proxy.c:367
+#: ../panels/network/net-proxy.c:408
 msgid "Proxy"
 msgstr "Ủy nhiệm"
 
+#: ../panels/network/network-ethernet.ui.h:1
+#, fuzzy
+#| msgid "Add profile"
+msgid "_Add Profile…"
+msgstr "Thêm hồ sơ"
+
 #: ../panels/network/network-mobile.ui.h:1
 msgid "IMEI"
 msgstr "IMEI"
@@ -1793,34 +2895,12 @@ msgstr "IMEI"
 msgid "Provider"
 msgstr "Nhà cung cấp"
 
-#: ../panels/network/network-mobile.ui.h:3
-#: ../panels/network/panel-common.c:697 ../panels/network/panel-common.c:699
-#: ../panels/printers/printers.ui.h:13
-msgid "IP Address"
-msgstr "Địa chỉ IP"
-
-#: ../panels/network/network-mobile.ui.h:4
-#: ../panels/network/network-wifi.ui.h:7
-#: ../panels/network/network-wired.ui.h:3 ../panels/network/panel-common.c:695
-msgid "IPv6 Address"
-msgstr "Địa chỉ IPv6"
-
-#: ../panels/network/network-mobile.ui.h:5
-#: ../panels/network/network-wifi.ui.h:8
-#: ../panels/network/network-wired.ui.h:5
-msgid "Default Route"
-msgstr "Định tuyến mặc định"
-
-#: ../panels/network/network-mobile.ui.h:6
-#: ../panels/network/network-wifi.ui.h:9
-#: ../panels/network/network-wired.ui.h:6
-msgid "DNS"
-msgstr "DNS"
-
 #: ../panels/network/network-mobile.ui.h:8
-#: ../panels/network/network-wired.ui.h:7
-msgid "_Options..."
-msgstr "_Tuỳ chọn..."
+#: ../panels/network/network-simple.ui.h:7
+#, fuzzy
+#| msgid "_Options"
+msgid "_Options…"
+msgstr "_Tùy chọn"
 
 #: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:5
 msgctxt "proxy method"
@@ -1861,22 +2941,56 @@ msgstr "Ủy nhiệm _FTP"
 msgid "_Socks Host"
 msgstr "Máy chủ _Socks"
 
+#: ../panels/network/network-proxy.ui.h:10
+#, fuzzy
+#| msgid "Ignored Hosts"
+msgid "_Ignore Hosts"
+msgstr "Máy đã bỏ qua"
+
+#: ../panels/network/network-proxy.ui.h:11
+#, fuzzy
+#| msgid "_HTTP Proxy"
+msgid "HTTP proxy port"
+msgstr "Ủy nhiệm _HTTP"
+
+#: ../panels/network/network-proxy.ui.h:12
+#, fuzzy
+#| msgid "H_TTPS Proxy"
+msgid "HTTPS proxy port"
+msgstr "Ủy nhiệm H_TTPS"
+
+#: ../panels/network/network-proxy.ui.h:13
+#, fuzzy
+#| msgid "_FTP Proxy"
+msgid "FTP proxy port"
+msgstr "Ủy nhiệm _FTP"
+
+#: ../panels/network/network-proxy.ui.h:14
+#, fuzzy
+#| msgid "Socks Port"
+msgid "Socks proxy port"
+msgstr "Cổng Socks"
+
+#: ../panels/network/network-simple.ui.h:6
+#, fuzzy
+#| msgid "Device Off"
+msgid "Turn device off"
+msgstr "Thiết bị tắt"
+
 #: ../panels/network/network.ui.h:1
 msgid "Select the interface to use for the new service"
 msgstr "Chọn giao tiếp để dùng cho dịch vụ mới"
 
 #: ../panels/network/network.ui.h:2
-msgid "C_reate..."
-msgstr "_Tạo..."
+#, fuzzy
+#| msgid "Calibrate…"
+msgid "C_reate…"
+msgstr "Cân chỉnh..."
 
 #: ../panels/network/network.ui.h:3
 msgid "_Interface"
 msgstr "_Giao tiếp"
 
-#: ../panels/network/network.ui.h:4 ../panels/network/network-vpn.ui.h:1
-msgid "VPN"
-msgstr "VPN"
-
 #: ../panels/network/network.ui.h:8
 msgid "Add Device"
 msgstr "Thêm thiết bị"
@@ -1885,10 +2999,6 @@ msgstr "Thêm thiết bị"
 msgid "VPN Type"
 msgstr "Loại VPN"
 
-#: ../panels/network/network-vpn.ui.h:3
-msgid "Gateway"
-msgstr "Máy cổng"
-
 #: ../panels/network/network-vpn.ui.h:4
 msgid "Group Name"
 msgstr "Tên nhóm"
@@ -1898,439 +3008,889 @@ msgid "Group Password"
 msgstr "Mật khẩu nhóm"
 
 #: ../panels/network/network-vpn.ui.h:6
+#: ../panels/printers/authentication-dialog.ui.h:4
 msgid "Username"
 msgstr "Tên người dùng"
 
 #: ../panels/network/network-vpn.ui.h:7
-msgid "_Configure..."
-msgstr "_Cấu hình..."
+#, fuzzy
+#| msgid "Turn on or off:"
+msgid "Turn VPN connection off"
+msgstr "Bật hoặc tắt:"
 
 #: ../panels/network/network-wifi.ui.h:1
-msgid "Wireless Hotspot"
-msgstr "Điểm kết nối không dây"
+#, fuzzy
+#| msgid "A_utomatic Login"
+msgid "Automatic _Connect"
+msgstr "Đăng nhập _tự động"
 
-#: ../panels/network/network-wifi.ui.h:2
-msgid "_Turn On"
-msgstr "_Bật"
+#: ../panels/network/network-wifi.ui.h:11
+#, fuzzy
+#| msgid "Details"
+msgid "details"
+msgstr "Chi tiết"
 
-#. TRANSLATORS: device type
-#: ../panels/network/network-wifi.ui.h:3 ../panels/network/panel-common.c:90
-msgid "Wireless"
-msgstr "Không dây"
+#: ../panels/network/network-wifi.ui.h:15
+#: ../panels/network/wireless-security/eap-method-leap.ui.h:2
+#: ../panels/network/wireless-security/eap-method-simple.ui.h:2
+#: ../panels/network/wireless-security/ws-leap.ui.h:2
+#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1
+#: ../panels/user-accounts/data/account-dialog.ui.h:11
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
+msgid "_Password"
+msgstr "_Mật khẩu"
 
-#: ../panels/network/network-wifi.ui.h:4
-msgid "_Use as Hotspot..."
-msgstr "Dùng _là m điểm truy cập..."
+#: ../panels/network/network-wifi.ui.h:18
+#: ../panels/universal-access/uap.ui.h:8
+msgid "None"
+msgstr "Không có"
 
-#: ../panels/network/network-wifi.ui.h:5
-#: ../panels/network/network-wired.ui.h:1
-msgid "Hardware Address"
-msgstr "Địa chỉ phần cứng"
+#: ../panels/network/network-wifi.ui.h:19
+msgid "blablabla"
+msgstr ""
 
-#: ../panels/network/network-wifi.ui.h:6
-#: ../panels/network/network-wired.ui.h:2 ../panels/network/panel-common.c:694
-msgid "IPv4 Address"
-msgstr "Địa chỉ IPv4"
+#: ../panels/network/network-wifi.ui.h:20
+#, fuzzy
+#| msgid "_Show password"
+msgid "Show P_assword"
+msgstr "_Hiện mật khẩu"
 
-#: ../panels/network/network-wifi.ui.h:10
-msgid "Security"
-msgstr "An ninh"
+#: ../panels/network/network-wifi.ui.h:21
+#, fuzzy
+#| msgid "Failed to delete user"
+msgid "Make available to other users"
+msgstr "Lỗi xoá người dùng"
 
-#: ../panels/network/network-wifi.ui.h:11
-msgid "Strength"
-msgstr "Độ mạnh"
+#: ../panels/network/network-wifi.ui.h:22
+msgid "identity"
+msgstr ""
 
-#: ../panels/network/network-wifi.ui.h:12
-msgid "Link speed"
-msgstr "Tốc độ đường truyền"
+#: ../panels/network/network-wifi.ui.h:27
+msgid "Automatic (DHCP) addresses only"
+msgstr ""
 
-#: ../panels/network/network-wifi.ui.h:13
-msgid "_Settings..."
-msgstr "T_hiết lập..."
+#: ../panels/network/network-wifi.ui.h:28
+msgid "Link-local only"
+msgstr ""
 
-#: ../panels/network/network-wifi.ui.h:14
-msgid "Switch off to connect to a wireless network"
+#: ../panels/network/network-wifi.ui.h:29
+msgid "Shared with other computers"
+msgstr ""
+
+#: ../panels/network/network-wifi.ui.h:31
+msgid ""
+"Address\n"
+"section\n"
+"goes\n"
+"here"
+msgstr ""
+
+#: ../panels/network/network-wifi.ui.h:35
+msgid ""
+"DNS\n"
+"section\n"
+"goes\n"
+"here"
+msgstr ""
+
+#: ../panels/network/network-wifi.ui.h:40
+msgid ""
+"Routes\n"
+"section\n"
+"goes\n"
+"here"
+msgstr ""
+
+#: ../panels/network/network-wifi.ui.h:44
+#, fuzzy
+#| msgid "Cannot remove automatically added profile"
+msgid "_Ignore automatically obtained routes"
+msgstr "Không thể xóa bỏ hồ sơ được thêm và o tự động"
+
+#: ../panels/network/network-wifi.ui.h:46
+msgid "ipv4"
+msgstr ""
+
+#: ../panels/network/network-wifi.ui.h:48
+msgid "ipv6"
+msgstr ""
+
+#: ../panels/network/network-wifi.ui.h:50
+msgid "_Cloned MAC Address"
+msgstr ""
+
+#: ../panels/network/network-wifi.ui.h:51
+msgid "00:24:16:31:8G:7A"
+msgstr ""
+
+#: ../panels/network/network-wifi.ui.h:52
+#, fuzzy
+#| msgid "Hardware"
+msgid "hardware"
+msgstr "Phần cứng"
+
+#: ../panels/network/network-wifi.ui.h:55
+msgid ""
+"Reset the settings for this connection to their defaults, but remember as a "
+"preferred connection."
+msgstr ""
+
+#: ../panels/network/network-wifi.ui.h:56
+msgid ""
+"Remove all details relating to this network and do not try to automatically "
+"connect to it."
+msgstr ""
+
+#: ../panels/network/network-wifi.ui.h:57
+msgid "reset"
+msgstr ""
+
+#: ../panels/network/network-wifi.ui.h:62
+msgid "Hardware"
+msgstr "Phần cứng"
+
+#: ../panels/network/network-wifi.ui.h:64
+#, fuzzy
+#| msgid "Hotspot"
+msgid "Wi-Fi Hotspot"
+msgstr "Điểm truy cập không dây"
+
+#: ../panels/network/network-wifi.ui.h:65
+msgid "_Turn On"
+msgstr "_Bật"
+
+#: ../panels/network/network-wifi.ui.h:66
+msgid "Wi-Fi"
+msgstr ""
+
+#: ../panels/network/network-wifi.ui.h:67
+#, fuzzy
+#| msgid "Turn on or off:"
+msgid "Turn Wi-Fi off"
+msgstr "Bật hoặc tắt:"
+
+#: ../panels/network/network-wifi.ui.h:68
+#, fuzzy
+#| msgid "_Use as Hotspot..."
+msgid "_Use as Hotspot…"
+msgstr "Dùng _là m điểm truy cập..."
+
+#: ../panels/network/network-wifi.ui.h:69
+#, fuzzy
+#| msgid "Connect to a Hidden Network"
+msgid "_Connect to Hidden Network…"
+msgstr "Nối và o mạng ẩn"
+
+#: ../panels/network/network-wifi.ui.h:70
+msgid "_History"
+msgstr ""
+
+#: ../panels/network/network-wifi.ui.h:71
+#, fuzzy
+#| msgid "Switch off to connect to a wireless network"
+msgid "Switch off to connect to a Wi-Fi network"
 msgstr "Tắt kết nối mạng không dây"
 
-#: ../panels/network/network-wifi.ui.h:15
+#: ../panels/network/network-wifi.ui.h:72
 msgid "Network Name"
 msgstr "Tên mạng"
 
-#: ../panels/network/network-wifi.ui.h:16
+#: ../panels/network/network-wifi.ui.h:73
 msgid "Connected Devices"
 msgstr "Thiết bị đã kết nối"
 
-#: ../panels/network/network-wifi.ui.h:17
+#: ../panels/network/network-wifi.ui.h:74
 msgid "Security type"
 msgstr "Loại an ninh"
 
-#: ../panels/network/network-wifi.ui.h:18
+#: ../panels/network/network-wifi.ui.h:75
 msgid "Security key"
 msgstr "Khóa an ninh"
 
-#: ../panels/network/network-wifi.ui.h:20
-msgid "Security Key"
-msgstr "Khóa an ninh"
-
-#: ../panels/network/network-wifi.ui.h:21
-msgid "Last used"
-msgstr "Dùng lần cuối"
-
-#: ../panels/network/network-wifi.ui.h:22
-msgid "_Forget Network"
-msgstr "_Quên mạng"
-
-#: ../panels/network/network-wired.ui.h:4
-msgid "Subnet Mask"
-msgstr "Mặt nạ mạng"
-
-# Name: don't translate / Tên: đừng dịch
-#. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:86
-msgid "Wired"
-msgstr "Có dây"
-
-#. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:97
-msgid "Mobile broadband"
-msgstr "Mạng di động băng thông rộng"
-
-#. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:106
-msgid "Mesh"
-msgstr "LÆ°á»›i"
-
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:166
+#: ../panels/network/panel-common.c:131
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:170
+#: ../panels/network/panel-common.c:135
 msgid "Infrastructure"
 msgstr "Hạ tầng"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:194 ../panels/network/panel-common.c:255
+#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205
 msgid "Status unknown"
 msgstr "Tình trạng không rõ"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:198
+#: ../panels/network/panel-common.c:155
 msgid "Unmanaged"
 msgstr "Không quản lý"
 
-#: ../panels/network/panel-common.c:203
-msgid "Firmware missing"
-msgstr "thiếu firmware"
-
-#: ../panels/network/panel-common.c:206
-msgid "Cable unplugged"
-msgstr "Chưa cắm dây"
-
-#: ../panels/network/panel-common.c:208
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:159
 msgid "Unavailable"
 msgstr "Không sẵn sà ng"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:212
-msgid "Disconnected"
-msgstr "Bị ngắt"
-
-#. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:219 ../panels/network/panel-common.c:261
+#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211
 msgid "Connecting"
 msgstr "Đang kết nối"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:223 ../panels/network/panel-common.c:265
+#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215
 msgid "Authentication required"
 msgstr "Cần xác thực"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:227 ../panels/network/panel-common.c:269
+#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219
 msgid "Connected"
 msgstr "Đã kết nối"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:231
+#: ../panels/network/panel-common.c:181
 msgid "Disconnecting"
 msgstr "Đang ngắt"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:235 ../panels/network/panel-common.c:273
+#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223
 msgid "Connection failed"
 msgstr "Lỗi kết nối"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:239 ../panels/network/panel-common.c:281
+#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231
 msgid "Status unknown (missing)"
 msgstr "Tình trạng không rõ (thiếu)"
 
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:277
+#: ../panels/network/panel-common.c:227
 msgid "Not connected"
 msgstr "Chưa kết nối"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:301
+#: ../panels/network/panel-common.c:252
 msgid "Configuration failed"
 msgstr "Lỗi cấu hình"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:305
+#: ../panels/network/panel-common.c:256
 msgid "IP configuration failed"
 msgstr "Lỗi cấu hình IP"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:309
+#: ../panels/network/panel-common.c:260
 msgid "IP configuration expired"
 msgstr "Hết hạn cấu hình IP"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:313
+#: ../panels/network/panel-common.c:264
 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:317
+#: ../panels/network/panel-common.c:268
 msgid "802.1x supplicant disconnected"
 msgstr "802.1x supplicant ngắt kết nối"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:321
+#: ../panels/network/panel-common.c:272
 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:325
+#: ../panels/network/panel-common.c:276
 msgid "802.1x supplicant failed"
 msgstr "Lá»—i 802.1x supplicant"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:329
+#: ../panels/network/panel-common.c:280
 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:333
+#: ../panels/network/panel-common.c:284
 msgid "PPP service failed to start"
 msgstr "Lỗi khởi động dịch vụ PPP"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:337
+#: ../panels/network/panel-common.c:288
 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:341
+#: ../panels/network/panel-common.c:292
 msgid "PPP failed"
 msgstr "Lá»—i PPP"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:345
+#: ../panels/network/panel-common.c:296
 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:349
+#: ../panels/network/panel-common.c:300
 msgid "DHCP client error"
 msgstr "Lỗi trình khách DHCP"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:353
+#: ../panels/network/panel-common.c:304
 msgid "DHCP client failed"
 msgstr "Lỗi trình khách DHCP"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:357
+#: ../panels/network/panel-common.c:308
 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:361
+#: ../panels/network/panel-common.c:312
 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:365
+#: ../panels/network/panel-common.c:316
 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:369
+#: ../panels/network/panel-common.c:320
 msgid "AutoIP service error"
 msgstr "Lỗi dịch vụ AutoIP"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:373
+#: ../panels/network/panel-common.c:324
 msgid "AutoIP service failed"
 msgstr "Lỗi dịch vụ AutoIP"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:377
+#: ../panels/network/panel-common.c:328
 msgid "Line busy"
 msgstr "Đường dây bận"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:381
+#: ../panels/network/panel-common.c:332
 msgid "No dial tone"
 msgstr "Không có tông"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:385
+#: ../panels/network/panel-common.c:336
 msgid "No carrier could be established"
 msgstr "Không thể thiết lập carrier"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:389
+#: ../panels/network/panel-common.c:340
 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:393
+#: ../panels/network/panel-common.c:344
 msgid "Dialing attempt failed"
 msgstr "Lỗi quay số"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:397
+#: ../panels/network/panel-common.c:348
 msgid "Modem initialization failed"
 msgstr "Lỗi khởi động Modem"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:401
+#: ../panels/network/panel-common.c:352
 msgid "Failed to select the specified APN"
 msgstr "Lỗi chọn APN"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:405
+#: ../panels/network/panel-common.c:356
 msgid "Not searching for networks"
 msgstr "Không tìm mạng"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:409
+#: ../panels/network/panel-common.c:360
 msgid "Network registration denied"
 msgstr "Đăng ký mạng bị từ chối"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:413
+#: ../panels/network/panel-common.c:364
 msgid "Network registration timed out"
 msgstr "Hết hạn đăng ký mạng"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:417
+#: ../panels/network/panel-common.c:368
 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:421
+#: ../panels/network/panel-common.c:372
 msgid "PIN check failed"
 msgstr "Lỗi kiểm tra PIN"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:425
+#: ../panels/network/panel-common.c:376
 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:429
+#: ../panels/network/panel-common.c:380
 msgid "Connection disappeared"
-msgstr "Kết nối biến mất"
-
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:433
-msgid "Carrier/link changed"
-msgstr "Carrier/link thay đổi"
+msgstr "Kết nối biến mất"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:437
+#: ../panels/network/panel-common.c:384
 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:441
+#: ../panels/network/panel-common.c:388
 msgid "Modem not found"
 msgstr "không tìm thấy Modem"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:445
+#: ../panels/network/panel-common.c:392
 msgid "Bluetooth connection failed"
 msgstr "Lỗi kết nối Bluetooth"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:449
+#: ../panels/network/panel-common.c:396
 msgid "SIM Card not inserted"
 msgstr "Chưa cà i SIM"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:453
+#: ../panels/network/panel-common.c:400
 msgid "SIM Pin required"
 msgstr "Cần SIM Pin"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:457
+#: ../panels/network/panel-common.c:404
 msgid "SIM Puk required"
 msgstr "Cần SIM Puk"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:461
+#: ../panels/network/panel-common.c:408
 msgid "SIM wrong"
 msgstr "SIM không đúng"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:465
+#: ../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:469
+#: ../panels/network/panel-common.c:416
 msgid "Connection dependency failed"
 msgstr "Lỗi phụ thuộc kết nối"
 
-#. translators: This is the title of the "Add Account" dialogue.
-#. * The title is not visible when using GNOME Shell
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:252
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:263
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:440
+msgid "Firmware missing"
+msgstr "thiếu firmware"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447
+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 ""
+
+#: ../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 ""
+
+#: ../panels/network/wireless-security/eap-method.c:281
+#, fuzzy
+#| msgid "Ignored Hosts"
+msgid "Ignore"
+msgstr "Máy đã bỏ qua"
+
+#: ../panels/network/wireless-security/eap-method.c:285
+msgid "Choose CA Certificate"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method.c:645
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method.c:648
+msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-fast.c:261
+#: ../panels/network/wireless-security/eap-method-peap.c:280
+msgid "GTC"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-fast.c:277
+#: ../panels/network/wireless-security/eap-method-peap.c:246
+#: ../panels/network/wireless-security/eap-method-ttls.c:263
+msgid "MSCHAPv2"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-fast.c:399
+msgid "Choose a PAC file..."
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-fast.c:406
+msgid "PAC files (*.pac)"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
+#, fuzzy
+#| msgid "All files"
+msgid "PAC _file"
+msgstr "Mọi tập tin"
+
+#: ../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
+#, fuzzy
+#| msgid "<b>_Use authentication</b>"
+msgid "_Inner authentication"
+msgstr "<b>_Sử dụng xác thực</b>"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
+msgid "PAC pro_visioning"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:1
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:1
+#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1
+#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:1
+#: ../panels/printers/authentication-dialog.ui.h:1
+msgid " "
+msgstr " "
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
+msgid "Anonymous"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
+#, fuzzy
+#| msgid "Authenticating"
+msgid "Authenticated"
+msgstr "Đang xác thực"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:8
+msgid "Both"
+msgstr ""
+
+#: ../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:6
+msgid "_Username"
+msgstr "_Tên người dùng"
+
+#: ../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/ws-leap.ui.h:3
+#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3
+#, fuzzy
+#| msgid "_Show password"
+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
+msgid "MD5"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-peap.c:350
+#: ../panels/network/wireless-security/eap-method-tls.c:434
+#: ../panels/network/wireless-security/eap-method-ttls.c:350
+msgid "Choose a Certificate Authority certificate..."
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:3
+#, fuzzy
+#| msgid "Version %s"
+msgid "Version 0"
+msgstr "Phiên bản %s"
+
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:4
+#, fuzzy
+#| msgid "Version %s"
+msgid "Version 1"
+msgstr "Phiên bản %s"
+
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:6
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:3
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:3
+msgid "C_A certificate"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
+msgid "PEAP _version"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-simple.ui.h:3
+msgid "As_k for this password every time"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.c:260
+msgid "Unencrypted private keys are insecure"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.c:263
+msgid ""
+"The selected private key does not appear to be protected by a password.  "
+"This could allow your security credentials to be compromised.  Please select "
+"a password-protected private key.\n"
+"\n"
+"(You can password-protect your private key with openssl)"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.c:428
+#, fuzzy
+#| msgid "Set your personal information"
+msgid "Choose your personal certificate..."
+msgstr "Lập thông tin cá nhân"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:440
+msgid "Choose your private key..."
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:1
+msgid "I_dentity"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:2
+msgid "_User certificate"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:4
+msgid "Private _key"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:5
+#, fuzzy
+#| msgid "_Generate a password"
+msgid "_Private key password"
+msgstr "_Phát sinh mật khẩu"
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:230
+#, fuzzy
+#| msgid "WPA"
+msgid "PAP"
+msgstr "WPA"
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:247
+msgid "MSCHAP"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:280
+msgid "CHAP"
+msgstr ""
+
+#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1
+msgid "Don't _warn me again"
+msgstr ""
+
+#: ../panels/network/wireless-security/wireless-security.c:397
+msgid "TLS"
+msgstr ""
+
+#: ../panels/network/wireless-security/wireless-security.c:421
+msgid "FAST"
+msgstr ""
+
+#: ../panels/network/wireless-security/wireless-security.c:432
+msgid "Tunneled TLS"
+msgstr ""
+
+#: ../panels/network/wireless-security/wireless-security.c:443
+msgid "Protected EAP (PEAP)"
+msgstr ""
+
+#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:2
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:9
+#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:2
+#, fuzzy
+#| msgid "Authenticating"
+msgid "Au_thentication"
+msgstr "Đang xác thực"
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:1
+#, fuzzy
+#| msgid "Default"
+msgid "1 (Default)"
+msgstr "Mặc định"
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:2
+#, fuzzy
+#| msgid "22"
+msgid "2"
+msgstr "22"
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr ""
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:4
+#, fuzzy
+#| msgid "45"
+msgid "4"
+msgstr "45"
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:5
+#, fuzzy
+#| msgid "File System"
+msgid "Open System"
+msgstr "Hệ thống Tập tin"
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:6
+msgid "Shared Key"
+msgstr ""
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:7
+msgid "_Key"
+msgstr ""
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:8
+msgid "Sho_w key"
+msgstr ""
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:10
+msgid "WEP inde_x"
+msgstr ""
+
+#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2
+#, fuzzy
+#| msgid "_Type:"
+msgid "_Type"
+msgstr "_Loại:"
+
+#. TRANSLATORS: this is the per application switch for message tray usage.
+#: ../panels/notifications/cc-edit-dialog.c:39
+#, fuzzy
+#| msgid "Magnification:"
+msgctxt "notifications"
+msgid "Notifications"
+msgstr "Phóng to:"
+
+#. TRANSLATORS: this is the setting to configure sounds associated with notifications
+#: ../panels/notifications/cc-edit-dialog.c:41
+#, fuzzy
+#| msgid "Sound Effects"
+msgctxt "notifications"
+msgid "Sound Alerts"
+msgstr "Hiệu ứng âm thanh"
+
+#: ../panels/notifications/cc-edit-dialog.c:42
+msgctxt "notifications"
+msgid "Show Popup Banners"
+msgstr ""
+
+#. TRANSLATORS: banners here refers to message tray notifications in the middle of the screen
+#: ../panels/notifications/cc-edit-dialog.c:44
+#, fuzzy
+#| msgid "_Show displays in panel"
+msgctxt "notifications"
+msgid "Show Details in Banners"
+msgstr "_Hiện các mà n hình trên Bảng"
+
+#: ../panels/notifications/cc-edit-dialog.c:45
+#, fuzzy
+#| msgid "Lock screen"
+msgctxt "notifications"
+msgid "View in Lock Screen"
+msgstr "Khoá mà n hình"
+
+#: ../panels/notifications/cc-edit-dialog.c:46
+msgctxt "notifications"
+msgid "Show Details in Lock Screen"
+msgstr ""
+
+#: ../panels/notifications/cc-notifications-panel.c:203
+#: ../panels/power/cc-power-panel.c:1637 ../panels/power/cc-power-panel.c:1644
+#: ../panels/privacy/cc-privacy-panel.c:78
+#: ../panels/privacy/cc-privacy-panel.c:145
+msgid "On"
+msgstr "Bật"
+
+#: ../panels/notifications/cc-notifications-panel.c:203
+#: ../panels/power/cc-power-panel.c:1631 ../panels/power/cc-power-panel.c:1642
+#: ../panels/privacy/cc-privacy-panel.c:78
+#: ../panels/privacy/cc-privacy-panel.c:145
+msgid "Off"
+msgstr ""
+
+#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1
+#, fuzzy
+#| msgid "Magnification:"
+msgid "Notifications"
+msgstr "Phóng to:"
+
+#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2
+msgid "Control which notifications are displayed and what they show"
+msgstr ""
+
+#. Translators: those are keywords for the notifications control-center panel
+#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4
+msgid "Notifications;Banner;Message;Tray;Popup;"
+msgstr ""
+
+#: ../panels/notifications/notifications.ui.h:1
+msgid "Show Pop Up Banners"
+msgstr ""
+
+#: ../panels/notifications/notifications.ui.h:2
+#, fuzzy
+#| msgid "Lock screen"
+msgid "Show in Lock Screen"
+msgstr "Khoá mà n hình"
+
+#. translators: This is the title of the "Add Account" dialog.
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:190
 #: ../panels/online-accounts/online-accounts.ui.h:2
 msgid "Add Account"
 msgstr "Thêm tà i khoản"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:383
+#: ../panels/online-accounts/cc-online-accounts-panel.c:357
 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:437
-msgid "Expired credentials. Please log in again."
-msgstr "Giấy ủy nhiệm đã hết hạn. Xin hãy đăng nhập lại."
+#: ../panels/online-accounts/cc-online-accounts-panel.c:429
+msgid "Credentials have expired."
+msgstr ""
+
+#: ../panels/online-accounts/cc-online-accounts-panel.c:433
+#, fuzzy
+#| msgid "Enable this account"
+msgid "Sign in to enable this account."
+msgstr "Bật mật khẩu nà y"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:440
-msgid "_Log In"
-msgstr "Đăng _nhập"
+#: ../panels/online-accounts/cc-online-accounts-panel.c:438
+msgid "_Sign In"
+msgstr ""
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:676
+#: ../panels/online-accounts/cc-online-accounts-panel.c:679
 msgid "Error creating account"
 msgstr "Không thể tạo tà i khoản mới"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:718
+#: ../panels/online-accounts/cc-online-accounts-panel.c:721
 msgid "Error removing account"
 msgstr "Không thể xóa tà i khoản"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:754
+#: ../panels/online-accounts/cc-online-accounts-panel.c:757
 msgid "Are you sure you want to remove the account?"
 msgstr "Bạn có chắc chắn muốn xoá tà i khoản nà y không?"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:756
+#: ../panels/online-accounts/cc-online-accounts-panel.c:759
 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:757
+#: ../panels/online-accounts/cc-online-accounts-panel.c:760
 msgid "_Remove"
 msgstr "_Xóa"
 
@@ -2339,8 +3899,8 @@ msgid "Online Accounts"
 msgstr "Tà i khoản trực tuyến"
 
 #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2
-msgid "Manage online accounts"
-msgstr "Quản lý tà i khoản trực tuyến"
+msgid "Connect to your online accounts and decide what to use them for"
+msgstr ""
 
 #. Translators: those are keywords for the online-accounts control-center panel
 #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4
@@ -2369,17 +3929,17 @@ msgstr ""
 "Thêm tà i khoản cho phép ứng dụng của bạn truy cập tà i liệu, thư từ, liên "
 "lạc, lịch hẹn, tán gẫu và nhiều nữa."
 
-#: ../panels/power/cc-power-panel.c:157
+#: ../panels/power/cc-power-panel.c:184
 msgid "Unknown time"
 msgstr "Thời gian không rõ"
 
-#: ../panels/power/cc-power-panel.c:163
+#: ../panels/power/cc-power-panel.c:190
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i phút"
 
-#: ../panels/power/cc-power-panel.c:175
+#: ../panels/power/cc-power-panel.c:202
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -2387,183 +3947,263 @@ msgstr[0] "%i giờ"
 
 #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
 #. * Swap order with "%2$s %2$i %1$s %1$i if needed
-#: ../panels/power/cc-power-panel.c:183
+#: ../panels/power/cc-power-panel.c:210
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: ../panels/power/cc-power-panel.c:184
+#: ../panels/power/cc-power-panel.c:211
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "giờ"
 
-#: ../panels/power/cc-power-panel.c:185
+#: ../panels/power/cc-power-panel.c:212
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "phút"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:228
-#, c-format
-msgid "Charging - %s until fully charged"
+#: ../panels/power/cc-power-panel.c:231
+#, fuzzy, c-format
+#| msgid "Charging - %s until fully charged"
+msgid "%s until fully charged"
 msgstr "Đang sạc - %s đến khi sạc đầy"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:236
-#, c-format
-msgid "Caution low battery, %s remaining"
-msgstr "Báo động pin ít, còn %s"
+#: ../panels/power/cc-power-panel.c:238
+#, fuzzy, c-format
+#| msgid "Caution low UPS, %s remaining"
+msgid "Caution: %s remaining"
+msgstr "Báo động UPS ít, còn %s"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:244
+#: ../panels/power/cc-power-panel.c:243
 #, c-format
-msgid "Using battery power - %s remaining"
-msgstr "Sử dụng nguồn pin - còn %s"
+msgid "%s remaining"
+msgstr ""
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:261
-msgid "Charging"
-msgstr "Đang sạc"
+#: ../panels/power/cc-power-panel.c:248 ../panels/power/cc-power-panel.c:276
+#, fuzzy
+#| msgid "Full Screen"
+msgid "Fully charged"
+msgstr "Toà n mà n hình"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:266
-msgid "Using battery power"
-msgstr "Sử dụng nguồn pin"
+#: ../panels/power/cc-power-panel.c:252 ../panels/power/cc-power-panel.c:280
+msgid "Empty"
+msgstr "Rá»—ng"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:270
-msgid "Charging - fully charged"
-msgstr "Đang sạc - đã đầy"
+#: ../panels/power/cc-power-panel.c:267
+msgid "Charging"
+msgstr "Đang sạc"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:274
-msgid "Empty"
-msgstr "Rá»—ng"
-
-#. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:342
-#, c-format
-msgid "Caution low UPS, %s remaining"
-msgstr "Báo động UPS ít, còn %s"
+#: ../panels/power/cc-power-panel.c:272
+#, fuzzy
+#| msgid "UPS discharging"
+msgid "Discharging"
+msgstr "UPS đang xả"
 
-#. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:348
+#: ../panels/power/cc-power-panel.c:324
 #, c-format
-msgid "Using UPS power - %s remaining"
-msgstr "Dùng nguồn UPS - còn %s"
-
-#. TRANSLATORS: UPS battery
-#: ../panels/power/cc-power-panel.c:366
-msgid "Caution low UPS"
-msgstr "Báo động UPS ít"
-
-#. TRANSLATORS: UPS battery
-#: ../panels/power/cc-power-panel.c:371
-msgid "Using UPS power"
-msgstr "Dùng nguồn UPS"
+msgid "Estimated battery capacity: %s"
+msgstr ""
 
-#. TRANSLATORS: secondary battery is normally in the media bay
-#: ../panels/power/cc-power-panel.c:423
-msgid "Your secondary battery is fully charged"
-msgstr "Pin phụ đã sạc đầy"
+#: ../panels/power/cc-power-panel.c:404
+msgctxt "Battery name"
+msgid "Main"
+msgstr ""
 
-#. TRANSLATORS: secondary battery is normally in the media bay
-#: ../panels/power/cc-power-panel.c:427
-msgid "Your secondary battery is empty"
-msgstr "Pin phụ rỗng"
+#: ../panels/power/cc-power-panel.c:406
+msgctxt "Battery name"
+msgid "Extra"
+msgstr ""
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:510
+#: ../panels/power/cc-power-panel.c:493
 msgid "Wireless mouse"
 msgstr "Chuột không dây"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:514
+#: ../panels/power/cc-power-panel.c:497
 msgid "Wireless keyboard"
 msgstr "Bà n phím không dây"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:518
+#: ../panels/power/cc-power-panel.c:501
 msgid "Uninterruptible power supply"
 msgstr "Nguồn không ngắt"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:522
+#: ../panels/power/cc-power-panel.c:506
 msgid "Personal digital assistant"
 msgstr "Trợ lý điện tử cá nhân"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:526
+#: ../panels/power/cc-power-panel.c:510
 msgid "Cellphone"
 msgstr "Điện thoại di động"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:530
+#: ../panels/power/cc-power-panel.c:514
 msgid "Media player"
 msgstr "Trình đa phương tiện"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:534
+#: ../panels/power/cc-power-panel.c:518
 msgid "Tablet"
 msgstr "Tablet"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:538
+#: ../panels/power/cc-power-panel.c:522
 msgid "Computer"
 msgstr "Máy tính"
 
 #. TRANSLATORS: secondary battery, misc
-#: ../panels/power/cc-power-panel.c:542
+#: ../panels/power/cc-power-panel.c:526 ../panels/power/cc-power-panel.c:734
+#: ../panels/power/cc-power-panel.c:1938
 msgid "Battery"
 msgstr "Pin"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:553
+#: ../panels/power/cc-power-panel.c:535
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "Đang sạc"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:560
+#: ../panels/power/cc-power-panel.c:542
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "Báo động"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:565
+#: ../panels/power/cc-power-panel.c:547
 msgctxt "Battery power"
 msgid "Low"
 msgstr "Thấp"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:570
+#: ../panels/power/cc-power-panel.c:552
 msgctxt "Battery power"
 msgid "Good"
 msgstr "Tốt"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:575
+#: ../panels/power/cc-power-panel.c:557
+#, fuzzy
+#| msgid "Full Screen"
 msgctxt "Battery power"
-msgid "Charging - fully charged"
-msgstr "Đang sạc - đã đầy"
+msgid "Fully charged"
+msgstr "Toà n mà n hình"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:579
+#: ../panels/power/cc-power-panel.c:561
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "Rá»—ng"
 
+#: ../panels/power/cc-power-panel.c:732
+#, fuzzy
+#| msgid "Battery"
+msgid "Batteries"
+msgstr "Pin"
+
+#: ../panels/power/cc-power-panel.c:1074
+msgid "When _idle"
+msgstr ""
+
+#: ../panels/power/cc-power-panel.c:1401
+msgid "Power Saving"
+msgstr ""
+
+#: ../panels/power/cc-power-panel.c:1430
+#, fuzzy
+#| msgid "Brightness"
+msgid "_Screen Brightness"
+msgstr "Độ sáng"
+
+#: ../panels/power/cc-power-panel.c:1458
+#, fuzzy
+#| msgid "_Turn screen off when inactive for:"
+msgid "_Dim Screen when Inactive"
+msgstr "_Tắt mà n hình nếu không hoạt động trong:"
+
+#: ../panels/power/cc-power-panel.c:1481
+#, fuzzy
+#| msgid "Full Screen"
+msgid "_Blank Screen"
+msgstr "Toà n mà n hình"
+
+#: ../panels/power/cc-power-panel.c:1516
+msgid "_Wi-Fi"
+msgstr ""
+
+#: ../panels/power/cc-power-panel.c:1544
+#, fuzzy
+#| msgid "Mobile broadband"
+msgid "_Mobile Broadband"
+msgstr "Mạng di động băng thông rộng"
+
+#: ../panels/power/cc-power-panel.c:1582
+#, fuzzy
+#| msgid "Bluetooth"
+msgid "_Bluetooth"
+msgstr "Bluetooth"
+
+#: ../panels/power/cc-power-panel.c:1633
+#, fuzzy
+#| msgid "On battery power"
+msgid "When on battery power"
+msgstr "Sử dụng nguồn pin"
+
+#: ../panels/power/cc-power-panel.c:1635
+msgid "When plugged in"
+msgstr "Khi cắm dây"
+
+#: ../panels/power/cc-power-panel.c:1762
+msgid "Suspend & Power Off"
+msgstr ""
+
+#: ../panels/power/cc-power-panel.c:1793
+#, fuzzy
+#| msgctxt "proxy method"
+#| msgid "Automatic"
+msgid "_Automatic Suspend"
+msgstr "Tá»± Ä‘á»™ng"
+
+#: ../panels/power/cc-power-panel.c:1815
+#, fuzzy
+#| msgid "When power is _critically low"
+msgid "When Battery Power is _Critical"
+msgstr "Khi nguồn _cực thấp"
+
+#: ../panels/power/cc-power-panel.c:1848
+#, fuzzy
+#| msgid "Power off"
+msgid "Power Off"
+msgstr "Tắt máy"
+
+#: ../panels/power/cc-power-panel.c:1990
+msgid "Devices"
+msgstr "Thiết bị"
+
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:1
 msgid "Power"
 msgstr "Năng lượng"
 
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:2
-msgid "Power management settings"
-msgstr "Thiết lập quản lý năng lượng"
+msgid "View your battery status and change power saving settings"
+msgstr ""
 
 #. Translators: those are keywords for the power control-center panel
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:4
-msgid "Power;Sleep;Suspend;Hibernate;Battery;"
+#, fuzzy
+#| msgid "Power;Sleep;Suspend;Hibernate;Battery;"
+msgid ""
+"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
 msgstr ""
 "Power;Nguồn;Nguon;dien;Sleep;Ngủ;Ngu;Suspend;Ngưng;Ngung;Hibernate;Battery;"
 "Pin;"
@@ -2576,193 +4216,281 @@ msgstr "Ngủ đông"
 msgid "Power off"
 msgstr "Tắt máy"
 
-#: ../panels/power/power.ui.h:3 ../panels/screen/screen.ui.h:6
-msgid "5 minutes"
+#: ../panels/power/power.ui.h:5
+#, fuzzy
+#| msgid "5 minutes"
+msgid "45 minutes"
 msgstr "5 phút"
 
-#: ../panels/power/power.ui.h:4 ../panels/screen/screen.ui.h:7
-msgid "10 minutes"
-msgstr "10 phút"
-
-#: ../panels/power/power.ui.h:5 ../panels/screen/screen.ui.h:8
-msgid "30 minutes"
-msgstr "30 phút"
-
-#: ../panels/power/power.ui.h:6 ../panels/screen/screen.ui.h:9
+#: ../panels/power/power.ui.h:6 ../panels/privacy/privacy.ui.h:8
 msgid "1 hour"
 msgstr "1 giờ"
 
 #: ../panels/power/power.ui.h:7
-msgid "Don't suspend"
-msgstr "Không tạm ngưng"
+#, fuzzy
+#| msgid "10 minutes"
+msgid "80 minutes"
+msgstr "10 phút"
 
 #: ../panels/power/power.ui.h:8
-msgid "On battery power"
-msgstr "Sử dụng nguồn pin"
+#, fuzzy
+#| msgid "10 minutes"
+msgid "90 minutes"
+msgstr "10 phút"
 
 #: ../panels/power/power.ui.h:9
-msgid "When plugged in"
+#, fuzzy
+#| msgid "10 minutes"
+msgid "100 minutes"
+msgstr "10 phút"
+
+#: ../panels/power/power.ui.h:10
+#, fuzzy
+#| msgid "1 hour"
+msgid "2 hours"
+msgstr "1 giờ"
+
+#: ../panels/power/power.ui.h:11 ../panels/privacy/privacy.ui.h:3
+msgid "1 minute"
+msgstr "1 phút"
+
+#: ../panels/power/power.ui.h:12 ../panels/privacy/privacy.ui.h:4
+msgid "2 minutes"
+msgstr "2 phút"
+
+#: ../panels/power/power.ui.h:13 ../panels/privacy/privacy.ui.h:5
+msgid "3 minutes"
+msgstr "3 phút"
+
+#: ../panels/power/power.ui.h:14
+#, fuzzy
+#| msgid "5 minutes"
+msgid "4 minutes"
+msgstr "5 phút"
+
+#: ../panels/power/power.ui.h:15 ../panels/privacy/privacy.ui.h:6
+msgid "5 minutes"
+msgstr "5 phút"
+
+#: ../panels/power/power.ui.h:16
+#, fuzzy
+#| msgid "5 minutes"
+msgid "8 minutes"
+msgstr "5 phút"
+
+#: ../panels/power/power.ui.h:17
+msgid "10 minutes"
+msgstr "10 phút"
+
+#: ../panels/power/power.ui.h:18
+#, fuzzy
+#| msgid "2 minutes"
+msgid "12 minutes"
+msgstr "2 phút"
+
+#: ../panels/power/power.ui.h:20
+#, fuzzy
+#| msgctxt "proxy method"
+#| msgid "Automatic"
+msgid "Automatic Suspend"
+msgstr "Tá»± Ä‘á»™ng"
+
+#: ../panels/power/power.ui.h:21 ../panels/privacy/privacy.ui.h:10
+#, fuzzy
+#| msgid "Close"
+msgid "_Close"
+msgstr "Đóng"
+
+#: ../panels/power/power.ui.h:22
+#, fuzzy
+#| msgid "When plugged in"
+msgid "_Plugged In"
 msgstr "Khi cắm dây"
 
-#: ../panels/power/power.ui.h:10
-msgid "Suspend when inactive for"
-msgstr "Tạm ngưng nếu không hoạt động trong"
+#: ../panels/power/power.ui.h:23
+#, fuzzy
+#| msgid "On battery power"
+msgid "On _Battery Power"
+msgstr "Sử dụng nguồn pin"
+
+#: ../panels/power/power.ui.h:24
+#, fuzzy
+#| msgid "_Delay:"
+msgid "Delay"
+msgstr "Khoảng _trễ:"
 
-#: ../panels/power/power.ui.h:11
-msgid "When power is _critically low"
-msgstr "Khi nguồn _cực thấp"
+#: ../panels/printers/authentication-dialog.ui.h:3
+#, fuzzy
+#| msgid "Authenticating"
+msgid "Authenticate"
+msgstr "Đang xác thực"
+
+#: ../panels/printers/authentication-dialog.ui.h:5
+#: ../panels/sharing/sharing.ui.h:21
+#, fuzzy
+#| msgid "_Password"
+msgid "Password"
+msgstr "_Mật khẩu"
+
+#: ../panels/printers/authentication-dialog.ui.h:6
+#, fuzzy
+#| msgid "Authentication required"
+msgid "Authentication Required"
+msgstr "Cần xác thực"
 
 #. Translators: The printer is low on toner
-#: ../panels/printers/cc-printers-panel.c:589
+#: ../panels/printers/cc-printers-panel.c:591
 msgid "Low on toner"
 msgstr "Sắp hết mực"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:591
+#: ../panels/printers/cc-printers-panel.c:593
 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:594
+#: ../panels/printers/cc-printers-panel.c:596
 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:597
+#: ../panels/printers/cc-printers-panel.c:599
 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:599
+#: ../panels/printers/cc-printers-panel.c:601
 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:601
+#: ../panels/printers/cc-printers-panel.c:603
 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:603
+#: ../panels/printers/cc-printers-panel.c:605
 msgid "Open cover"
 msgstr "Mở nắp"
 
 #. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:605
+#: ../panels/printers/cc-printers-panel.c:607
 msgid "Open door"
 msgstr "Mở cửa"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:607
+#: ../panels/printers/cc-printers-panel.c:609
 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:609
+#: ../panels/printers/cc-printers-panel.c:611
 msgid "Out of paper"
 msgstr "Hết giấy"
 
 #. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:611
+#: ../panels/printers/cc-printers-panel.c:613
 msgctxt "printer state"
 msgid "Offline"
 msgstr "Ngoại tuyến"
 
-#. Translators: Someone has paused the Printer
-#: ../panels/printers/cc-printers-panel.c:613
+#. Translators: Someone has stopped the Printer
+#. Translators: Printer's state (no jobs can be processed)
+#: ../panels/printers/cc-printers-panel.c:615
+#: ../panels/printers/cc-printers-panel.c:806
 msgctxt "printer state"
-msgid "Paused"
-msgstr "Tạm dừng"
+msgid "Stopped"
+msgstr "Dừng"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:615
+#: ../panels/printers/cc-printers-panel.c:617
 msgid "Waste receptacle almost full"
 msgstr "Chỗ chứa chất thải sắp đầy"
 
 #. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:617
+#: ../panels/printers/cc-printers-panel.c:619
 msgid "Waste receptacle full"
 msgstr "Chỗ chứa chất thải đã đầy"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:619
+#: ../panels/printers/cc-printers-panel.c:621
 msgid "The optical photo conductor is near end of life"
 msgstr "Cáp quang truyền hình ảnh sắp quá tuổi thọ"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:621
+#: ../panels/printers/cc-printers-panel.c:623
 msgid "The optical photo conductor is no longer functioning"
 msgstr "Cáp quang truyền hình ảnh không còn hoạt động"
 
 #. Translators: Printer's state (printer is being configured right now)
-#: ../panels/printers/cc-printers-panel.c:724
+#: ../panels/printers/cc-printers-panel.c:733
 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:781
+#: ../panels/printers/cc-printers-panel.c:792
 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:797
+msgctxt "printer state"
+msgid "Does not accept jobs"
+msgstr ""
+
 #. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/cc-printers-panel.c:785
+#: ../panels/printers/cc-printers-panel.c:802
 msgctxt "printer state"
 msgid "Processing"
 msgstr "Đang xử lý"
 
-#. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/cc-printers-panel.c:789
-msgctxt "printer state"
-msgid "Stopped"
-msgstr "Dừng"
-
 #. Translators: Toner supply
-#: ../panels/printers/cc-printers-panel.c:906
+#: ../panels/printers/cc-printers-panel.c:923
 msgid "Toner Level"
 msgstr "Mức mực"
 
 #. Translators: Ink supply
-#: ../panels/printers/cc-printers-panel.c:909
+#: ../panels/printers/cc-printers-panel.c:926
 msgid "Ink Level"
 msgstr "Mức mực"
 
 #. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/cc-printers-panel.c:912
+#: ../panels/printers/cc-printers-panel.c:929
 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:930
+#: ../panels/printers/cc-printers-panel.c:947
 msgctxt "printer state"
 msgid "Installing"
 msgstr "Đang cà i đặt"
 
 #. Translators: There are no printers available (none is configured or CUPS is not running)
-#: ../panels/printers/cc-printers-panel.c:1107
+#: ../panels/printers/cc-printers-panel.c:1124
 msgid "No printers available"
 msgstr "Không có máy in"
 
 #. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:1411
+#: ../panels/printers/cc-printers-panel.c:1429
 #, 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:1731
+#: ../panels/printers/cc-printers-panel.c:1773
 msgid "Failed to add new printer."
 msgstr "Không thể thêm máy in mới."
 
-#: ../panels/printers/cc-printers-panel.c:1896
+#: ../panels/printers/cc-printers-panel.c:1940
 msgid "Select PPD File"
 msgstr "Chọn tập tin PPD"
 
-#: ../panels/printers/cc-printers-panel.c:1905
+#: ../panels/printers/cc-printers-panel.c:1949
 msgid ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
@@ -2770,30 +4498,36 @@ msgstr ""
 "Tập tin PostScript Printer Description (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
 
-#: ../panels/printers/cc-printers-panel.c:2210
+#: ../panels/printers/cc-printers-panel.c:2254
 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:2279
-msgid "Searching for preferred drivers..."
+#: ../panels/printers/cc-printers-panel.c:2323
+#, fuzzy
+#| msgid "Searching for preferred drivers..."
+msgid "Searching for preferred drivers…"
 msgstr "Đang tìm trình điều khiển phù hợp..."
 
-#: ../panels/printers/cc-printers-panel.c:2294
-msgid "Select from database..."
+#: ../panels/printers/cc-printers-panel.c:2338
+#, fuzzy
+#| msgid "Select from database..."
+msgid "Select from database…"
 msgstr "Chuọn từ cơ sở dữ liệu..."
 
-#: ../panels/printers/cc-printers-panel.c:2303
-msgid "Provide PPD File..."
+#: ../panels/printers/cc-printers-panel.c:2347
+#, fuzzy
+#| msgid "Provide PPD File..."
+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:2454
-#: ../panels/printers/cc-printers-panel.c:2477
+#: ../panels/printers/cc-printers-panel.c:2498
+#: ../panels/printers/cc-printers-panel.c:2521
 msgid "Test page"
 msgstr "Trang thá»­"
 
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:2880
+#: ../panels/printers/cc-printers-panel.c:2929
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "Không thể nạp giao diện: %s"
@@ -2803,77 +4537,64 @@ msgid "Printers"
 msgstr "Máy in"
 
 #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2
-msgid "Change printer settings"
-msgstr "Thay đổi thiết lập máy in"
+msgid "Add printers, view printer jobs and decide how you want to print"
+msgstr ""
 
 #. Translators: those are keywords for the printing control-center panel
 #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4
 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;"
 
-#: ../panels/printers/jobs-dialog.ui.h:1
-#: ../panels/printers/options-dialog.ui.h:1
-#: ../panels/printers/ppd-selection-dialog.ui.h:1
-msgid " "
-msgstr " "
-
+#. Translators: This dialog contains list of active print jobs of the selected printer
 #: ../panels/printers/jobs-dialog.ui.h:2
-#: ../panels/printers/options-dialog.ui.h:4
+msgid "Active Jobs"
+msgstr "Yêu cầu in hoạt động"
+
+#: ../panels/printers/jobs-dialog.ui.h:3
+#: ../panels/printers/options-dialog.ui.h:2
+#: ../panels/user-accounts/data/history-dialog.ui.h:1
 msgid "Close"
 msgstr "Đóng"
 
-#. Translators: This tab contains list of active print jobs of the selected printer
 #: ../panels/printers/jobs-dialog.ui.h:4
-msgid "Active Jobs"
-msgstr "Yêu cầu in hoạt động"
-
-#: ../panels/printers/jobs-dialog.ui.h:5
 msgid "Resume Printing"
 msgstr "Tiếp tục in"
 
-#: ../panels/printers/jobs-dialog.ui.h:6
+#: ../panels/printers/jobs-dialog.ui.h:5
 msgid "Pause Printing"
 msgstr "Tạm ngừng in"
 
-#: ../panels/printers/jobs-dialog.ui.h:7
+#: ../panels/printers/jobs-dialog.ui.h:6
 msgid "Cancel Print Job"
 msgstr "Huỷ tác vụ in"
 
-#: ../panels/printers/new-printer-dialog.ui.h:2
-#: ../panels/user-accounts/um-account-dialog.c:1017
-msgid "_Add"
-msgstr "_Thêm"
-
-#: ../panels/printers/new-printer-dialog.ui.h:3
+#: ../panels/printers/new-printer-dialog.ui.h:1
 msgid "Add a New Printer"
 msgstr "Thêm máy in mới"
 
+#: ../panels/printers/new-printer-dialog.ui.h:2
+#: ../panels/user-accounts/um-user-panel.c:467
+msgid "_Cancel"
+msgstr "T_hôi"
+
 #: ../panels/printers/new-printer-dialog.ui.h:4
 msgid "Search for network printers or filter result"
 msgstr "Tìm máy in mạng hoặc lọc kết quả"
 
-#: ../panels/printers/options-dialog.ui.h:2
-msgid "Options"
-msgstr "Tùy chọn"
-
-#: ../panels/printers/options-dialog.ui.h:3
-msgid "Loading options..."
+#: ../panels/printers/options-dialog.ui.h:1
+#, fuzzy
+#| msgid "Loading options..."
+msgid "Loading options…"
 msgstr "Tuỳ chọn nạp..."
 
-#: ../panels/printers/ppd-selection-dialog.ui.h:2
-#: ../panels/user-accounts/data/photo-dialog.ui.h:8
-#: ../panels/user-accounts/um-account-dialog.c:1016
-msgid "Cancel"
-msgstr "Thôi"
+#: ../panels/printers/ppd-selection-dialog.ui.h:1
+msgid "Select Printer Driver"
+msgstr "Chọn trình điều khiển máy in"
 
 #: ../panels/printers/ppd-selection-dialog.ui.h:4
 msgid "Loading drivers database..."
 msgstr "Đang nạp cơ sở dữ liệu trình điều khiển..."
 
-#: ../panels/printers/ppd-selection-dialog.ui.h:5
-msgid "Select Printer Driver"
-msgstr "Chọn trình điều khiển máy in"
-
 #. Translators: this is an option of "Two Sided"
 #: ../panels/printers/pp-ipp-option-widget.c:65
 #: ../panels/printers/pp-ppd-option-widget.c:69
@@ -2969,13 +4690,13 @@ msgstr "Tình trạng"
 msgid "Time"
 msgstr "Thời gian"
 
-#: ../panels/printers/pp-jobs-dialog.c:484
+#: ../panels/printers/pp-jobs-dialog.c:496
 #, c-format
 msgid "%s Active Jobs"
 msgstr "%s yêu cầu in hoạt động"
 
 #. Translators: No printers were found
-#: ../panels/printers/pp-new-printer-dialog.c:1291
+#: ../panels/printers/pp-new-printer-dialog.c:1465
 msgid "No printers detected."
 msgstr "Không tìm ra tablet."
 
@@ -3067,12 +4788,6 @@ msgctxt "Printer Option Group"
 msgid "Advanced"
 msgstr "Nâng cao"
 
-#. Translators: Options of given printer (e.g. "MyPrinter Options")
-#: ../panels/printers/pp-options-dialog.c:936
-#, c-format
-msgid "%s Options"
-msgstr "Tùy chọn %s"
-
 #. Translators: this is an option of "Paper Source"
 #: ../panels/printers/pp-ppd-option-widget.c:75
 #: ../panels/printers/pp-ppd-option-widget.c:77
@@ -3110,15 +4825,23 @@ msgid "No pre-filtering"
 msgstr "Không tiền lọc"
 
 #. Translators: Name of column showing printer manufacturers
-#: ../panels/printers/pp-ppd-selection-dialog.c:230
-msgid "Manufacturers"
-msgstr "Nhà sản xuất"
+#: ../panels/printers/pp-ppd-selection-dialog.c:233
+#, fuzzy
+#| msgid "Manufacturer:"
+msgid "Manufacturer"
+msgstr "Nhà sản xuất:"
 
 #. Translators: Name of column showing printer drivers
-#: ../panels/printers/pp-ppd-selection-dialog.c:242
-msgid "Drivers"
+#: ../panels/printers/pp-ppd-selection-dialog.c:250
+msgid "Driver"
 msgstr "Trình điều khiển"
 
+#. Translators: Samba server needs authentication of the user to show list of its printers.
+#: ../panels/printers/pp-samba.c:247
+#, c-format
+msgid "Enter your username and password to view printers available on %s."
+msgstr ""
+
 #: ../panels/printers/printers.ui.h:1
 msgid "Add Printer"
 msgstr "Thêm máy in"
@@ -3146,29 +4869,23 @@ msgstr "Mặc định"
 msgid "Jobs"
 msgstr "Yêu cầu"
 
-#. Tanslators: Opens a dialog containing printer's jobs
+#. Translators: Opens a dialog containing printer's jobs
 #: ../panels/printers/printers.ui.h:11
-msgid "_Show"
-msgstr "_Hiện"
+msgid "Show _Jobs"
+msgstr ""
 
 #: ../panels/printers/printers.ui.h:12
 msgid "Model"
 msgstr "Kiểu"
 
-#: ../panels/printers/printers.ui.h:14
-msgid "page 1"
-msgstr "trang 1"
-
 #: ../panels/printers/printers.ui.h:15
 msgid "label"
 msgstr "nhãn"
 
-#: ../panels/printers/printers.ui.h:16
-msgid "page 2"
-msgstr "trang 2"
-
 #: ../panels/printers/printers.ui.h:17
-msgid "Setting new driver..."
+#, fuzzy
+#| msgid "Setting new driver..."
+msgid "Setting new driver…"
 msgstr "Đang thiết đặt trình điều khiển..."
 
 #: ../panels/printers/printers.ui.h:18
@@ -3197,289 +4914,649 @@ msgid ""
 "doesn't seem to be available."
 msgstr "Rất tiếc! Dịch vụ in hệ thống dường như không hoạt động."
 
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:1
-msgid "Region & Language"
-msgstr "Lãnh thổ và ngôn ngữ"
+#: ../panels/privacy/cc-privacy-panel.c:105
+msgid "Hidden"
+msgstr ""
 
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:2
-msgid "Change your region and language settings"
-msgstr "Thay đổi thiết lập lãnh thổ và ngôn ngữ"
+#: ../panels/privacy/cc-privacy-panel.c:105
+#, fuzzy
+#| msgid "Visibility"
+msgid "Visible"
+msgstr "Cho phép nhìn thấy"
 
-#. Translators: those are keywords for the region control-center panel
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:4
-msgid "Language;Layout;Keyboard;"
+#: ../panels/privacy/cc-privacy-panel.c:271 ../panels/privacy/privacy.ui.h:31
+#, fuzzy
+#| msgid "Screenshots"
+msgid "Screen Lock"
+msgstr "Hình chụp"
+
+#: ../panels/privacy/cc-privacy-panel.c:338 ../panels/privacy/privacy.ui.h:9
+#, fuzzy
+#| msgid "Visibility"
+msgid "Name & Visibility"
+msgstr "Cho phép nhìn thấy"
+
+#: ../panels/privacy/cc-privacy-panel.c:446 ../panels/privacy/privacy.ui.h:26
+msgid "Usage & History"
+msgstr ""
+
+#: ../panels/privacy/cc-privacy-panel.c:576 ../panels/privacy/privacy.ui.h:36
+msgid "Purge Trash & Temporary Files"
+msgstr ""
+
+#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1
+msgid "Privacy"
+msgstr ""
+
+#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2
+msgid "Protect your personal information and control what others might see"
+msgstr ""
+
+#. Translators: those are keywords for the privacy control-center panel
+#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4
+msgid ""
+"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
+"network;identity;"
+msgstr ""
+
+#: ../panels/privacy/privacy.ui.h:1
+#, fuzzy
+#| msgid "Screen turns off"
+msgid "Screen Turns Off"
+msgstr "Khi tắt mà n hình"
+
+#: ../panels/privacy/privacy.ui.h:2
+msgid "30 seconds"
+msgstr "30 giây"
+
+#: ../panels/privacy/privacy.ui.h:11
+msgid "Control how you appear on the screen and the network."
+msgstr ""
+
+#: ../panels/privacy/privacy.ui.h:12
+msgid "Display _full name in top bar"
+msgstr ""
+
+#: ../panels/privacy/privacy.ui.h:13
+msgid "Display full name in _lock screen"
+msgstr ""
+
+#: ../panels/privacy/privacy.ui.h:14
+#, fuzzy
+#| msgid "Switch Modes"
+msgid "_Stealth Mode"
+msgstr "Chuyển chế độ"
+
+#: ../panels/privacy/privacy.ui.h:15
+msgid "Immediately"
+msgstr ""
+
+#: ../panels/privacy/privacy.ui.h:16
+msgid "1 day"
+msgstr ""
+
+#: ../panels/privacy/privacy.ui.h:17
+msgid "2 days"
+msgstr ""
+
+#: ../panels/privacy/privacy.ui.h:18
+msgid "3 days"
+msgstr ""
+
+#: ../panels/privacy/privacy.ui.h:19
+msgid "4 days"
+msgstr ""
+
+#: ../panels/privacy/privacy.ui.h:20
+msgid "5 days"
+msgstr ""
+
+#: ../panels/privacy/privacy.ui.h:21
+msgid "6 days"
+msgstr ""
+
+#: ../panels/privacy/privacy.ui.h:22
+msgid "7 days"
+msgstr ""
+
+#: ../panels/privacy/privacy.ui.h:23
+msgid "14 days"
+msgstr ""
+
+#: ../panels/privacy/privacy.ui.h:24
+msgid "30 days"
+msgstr ""
+
+#: ../panels/privacy/privacy.ui.h:25
+msgid "Forever"
 msgstr ""
-"Language;Ngôn;ngữ;Ngon;ngu;Layout;Bố;trí;Bo;tri;Keyboard;Bà n;phím;Ban;phim;"
-"Kieu;go;"
 
-#: ../panels/region/gnome-region-panel-formats.c:142
+#: ../panels/privacy/privacy.ui.h:27
+msgid ""
+"Remembering your history makes things easier to find again. These items are "
+"never shared over the network."
+msgstr ""
+
+#: ../panels/privacy/privacy.ui.h:28
+msgid "Cl_ear Recent History"
+msgstr ""
+
+#: ../panels/privacy/privacy.ui.h:29
+msgid "_Recently Used"
+msgstr ""
+
+#: ../panels/privacy/privacy.ui.h:30
+msgid "Retain _History"
+msgstr ""
+
+#: ../panels/privacy/privacy.ui.h:32
+msgid "The Screen Lock protects your privacy when you are away."
+msgstr ""
+
+#: ../panels/privacy/privacy.ui.h:33
+#, fuzzy
+#| msgid "A_utomatic Login"
+msgid "Automatic Screen _Lock"
+msgstr "Đăng nhập _tự động"
+
+#: ../panels/privacy/privacy.ui.h:34
+#, fuzzy
+#| msgid "_Lock screen after:"
+msgid "Lock Screen _After Blank For"
+msgstr "_Khoá mà n hình sau:"
+
+#: ../panels/privacy/privacy.ui.h:35
+#, fuzzy
+#| msgid "Show _notifications when locked"
+msgid "Show _Notifications"
+msgstr "Hiện _thông báo khi bị khoá"
+
+#: ../panels/privacy/privacy.ui.h:37
+msgid "_Empty Trash"
+msgstr ""
+
+#: ../panels/privacy/privacy.ui.h:38
+#, fuzzy
+#| msgid "_Keep Files"
+msgid "_Purge Temporary Files"
+msgstr "_Giữ tập tin"
+
+#: ../panels/privacy/privacy.ui.h:39
+msgid ""
+"Automatically purge the Trash and temporary files to help keep your computer "
+"free of unnecessary sensitive information."
+msgstr ""
+
+#: ../panels/privacy/privacy.ui.h:40
+msgid "Automatically Empty _Trash"
+msgstr ""
+
+#: ../panels/privacy/privacy.ui.h:41
+msgid "Automatically Purge Temporary _Files"
+msgstr ""
+
+#: ../panels/privacy/privacy.ui.h:42
+msgid "Purge _After"
+msgstr ""
+
+#: ../panels/region/cc-format-chooser.c:122
+#, fuzzy
+#| msgid "Imperial"
+msgctxt "measurement format"
 msgid "Imperial"
 msgstr "Anh-Mỹ"
 
-#: ../panels/region/gnome-region-panel-formats.c:144
+#: ../panels/region/cc-format-chooser.c:124
+#, fuzzy
+#| msgid "Metric"
+msgctxt "measurement format"
 msgid "Metric"
 msgstr "Mét"
 
-#: ../panels/region/gnome-region-panel-input-chooser.ui.h:1
-msgid "Choose an input source"
-msgstr "Chọn nguồn nhập"
+#: ../panels/region/cc-format-chooser.c:268
+#, fuzzy
+#| msgid "No local printers found"
+msgid "No regions found"
+msgstr "Không tìm thấy máy in cục bộ"
 
-#: ../panels/region/gnome-region-panel-input-chooser.ui.h:2
-msgid "Select an input source to add"
-msgstr "Chọn nguồn nhập cần thêm"
+#: ../panels/region/cc-input-chooser.c:179
+#, fuzzy
+#| msgid "Move Input Source Down"
+msgid "No input sources found"
+msgstr "Chuyển nguồn nhập xuống dưới"
 
-#: ../panels/region/gnome-region-panel-system.c:330
-msgid ""
-"The login screen, system accounts and new user accounts use the system-wide "
-"Region and Language settings."
+#: ../panels/region/cc-input-chooser.c:997
+#: ../panels/search/cc-search-locations-dialog.c:479
+#, fuzzy
+#| msgid "Other..."
+msgid "Other"
+msgstr "Khác..."
+
+#: ../panels/region/cc-region-panel.c:225
+msgid "Your session needs to be restarted for changes to take effect"
 msgstr ""
-"Mà n hình đăng nhập, các tà i khoản hệ thống và các tà i khoản mới sẽ sử dụng "
-"thiết lập hệ thống \"Lãnh thổ và Ngôn ngữ\"."
 
-#: ../panels/region/gnome-region-panel-system.c:335
-#: ../panels/region/gnome-region-panel.ui.h:31
-msgid ""
-"The login screen, system accounts and new user accounts use the system-wide "
-"Region and Language settings. You may change the system settings to match "
-"yours."
+#: ../panels/region/cc-region-panel.c:226
+msgid "Restart Now"
+msgstr ""
+
+#: ../panels/region/cc-region-panel.c:436
+#, fuzzy
+#| msgid "None"
+msgctxt "Language"
+msgid "None"
+msgstr "Không có"
+
+#: ../panels/region/cc-region-panel.c:898
+msgid "Sorry"
 msgstr ""
-"Mà n hình đăng nhập, các tà i khoản hệ thống và các tà i khoản mới sẽ sử dụng "
-"thiết lập hệ thống \"Lãnh thổ và Ngôn ngữ\". Bạn có thể sửa sao cho thiết "
-"lập hệ thống giống với thiết lập của bạn."
 
-#: ../panels/region/gnome-region-panel-system.c:338
-msgid "Copy Settings"
-msgstr "Chép thiết lập"
+#: ../panels/region/cc-region-panel.c:900
+msgid "Input methods can't be used on the login screen"
+msgstr ""
+
+#: ../panels/region/cc-region-panel.c:1345
+#, fuzzy
+#| msgid "None"
+msgctxt "Input source"
+msgid "None"
+msgstr "Không có"
+
+#: ../panels/region/cc-region-panel.c:1502
+#, fuzzy
+#| msgid "Lock screen"
+msgid "Login Screen"
+msgstr "Khoá mà n hình"
+
+#: ../panels/region/format-chooser.ui.h:1 ../panels/region/region.ui.h:3
+msgid "Formats"
+msgstr "Định dạng"
+
+#: ../panels/region/format-chooser.ui.h:3
+msgid "Preview"
+msgstr "Xem thá»­"
+
+# Name: don't translate / Tên: đừng dịch
+#: ../panels/region/format-chooser.ui.h:4
+msgid "Dates"
+msgstr "Ngà y tháng"
+
+#: ../panels/region/format-chooser.ui.h:5
+msgid "Times"
+msgstr "Thời gian"
+
+#: ../panels/region/format-chooser.ui.h:6
+msgid "Numbers"
+msgstr "Cách ghi số"
+
+#: ../panels/region/format-chooser.ui.h:7
+msgid "Measurement"
+msgstr "Hệ đo"
 
-#: ../panels/region/gnome-region-panel-system.c:341
-#: ../panels/region/gnome-region-panel.ui.h:38
-msgid "Copy Settings..."
-msgstr "Chép các thiết lập..."
+#: ../panels/region/format-chooser.ui.h:8
+#, fuzzy
+#| msgid "Paper Type"
+msgid "Paper"
+msgstr "Kiểu giấy"
 
-#: ../panels/region/gnome-region-panel.ui.h:1
-msgid "Region and Language"
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:1
+msgid "Region & Language"
 msgstr "Lãnh thổ và ngôn ngữ"
 
-#: ../panels/region/gnome-region-panel.ui.h:2
-msgid "Select a display language (change will be applied next time you log in)"
-msgstr "Chọn ngôn ngữ (áp dụng cho lần đăng nhập kế tiếp)"
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:2
+msgid ""
+"Select your display language, formats, keyboard layouts and input sources"
+msgstr ""
+
+#. Translators: those are keywords for the region control-center panel
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:4
+#, fuzzy
+#| msgid "Language;Layout;Keyboard;"
+msgid "Language;Layout;Keyboard;Input;"
+msgstr ""
+"Language;Ngôn;ngữ;Ngon;ngu;Layout;Bố;trí;Bo;tri;Keyboard;Bà n;phím;Ban;phim;"
+"Kieu;go;"
 
-#: ../panels/region/gnome-region-panel.ui.h:3
-msgid "Add Language"
-msgstr "Thêm ngôn ngữ"
+#: ../panels/region/input-chooser.ui.h:1
+#, fuzzy
+#| msgid "Add Input Source"
+msgid "Add an Input Source"
+msgstr "Thêm nguồn nhập"
 
-#: ../panels/region/gnome-region-panel.ui.h:4
-msgid "Remove Language"
-msgstr "Bỏ ngôn ngữ"
+#: ../panels/region/input-options.ui.h:1
+#, fuzzy
+#| msgid "Input Source Settings"
+msgid "Input Source Options"
+msgstr "Thiết lập nguồn nhập"
 
-#: ../panels/region/gnome-region-panel.ui.h:5
-msgid "Install languages..."
-msgstr "Cà i đặt ngôn ngữ..."
+#: ../panels/region/input-options.ui.h:2
+#, fuzzy
+#| msgid "Use the same layout for all windows"
+msgid "Use the _same source for all windows"
+msgstr "Sử dụng một kiểu bố trí cho mọi cửa sổ"
+
+#: ../panels/region/input-options.ui.h:3
+#, fuzzy
+#| msgid "Allow different layouts for individual windows"
+msgid "Allow _different sources for each window"
+msgstr "Cho phép mỗi cửa sổ sử dụng một kiểu bố trí bà n phím riêng"
+
+#: ../panels/region/input-options.ui.h:4
+#, fuzzy
+#| msgid "Keyboard Settings"
+msgid "Keyboard Shortcuts"
+msgstr "Thiết lập bà n phím"
 
-#: ../panels/region/gnome-region-panel.ui.h:6
-msgid "Language"
-msgstr "Ngôn ngữ"
+#: ../panels/region/input-options.ui.h:5
+msgid "Switch to previous source"
+msgstr "Chuyển sang nguồn cũ"
+
+#: ../panels/region/input-options.ui.h:6
+#, fuzzy
+#| msgid "Ctrl+Alt+Shift+Space"
+msgid "Super+Shift+Space"
+msgstr "Ctrl+Alt+Shift+<khoảng trắng>"
+
+#: ../panels/region/input-options.ui.h:7
+msgid "Switch to next source"
+msgstr "Chuyển sang nguồn kế"
+
+#: ../panels/region/input-options.ui.h:8
+msgid "Super+Space"
+msgstr ""
+
+#: ../panels/region/input-options.ui.h:9
+msgid "You can change these shortcuts in the keyboard settings"
+msgstr ""
+
+#: ../panels/region/input-options.ui.h:10
+#, fuzzy
+#| msgid "Switch to next source"
+msgid "Alternative switch to next source"
+msgstr "Chuyển sang nguồn kế"
+
+#: ../panels/region/region.ui.h:2
+msgid "English (United Kingdom)"
+msgstr ""
+
+#: ../panels/region/region.ui.h:4
+msgid "United Kingdom"
+msgstr ""
 
-#: ../panels/region/gnome-region-panel.ui.h:7
-msgid "Select a region (change will be applied the next time you log in)"
-msgstr "Chọn vùng (áp dụng cho lần đăng nhập kế tiếp)"
+#: ../panels/region/region.ui.h:6
+msgid "Options"
+msgstr "Tùy chọn"
 
-#: ../panels/region/gnome-region-panel.ui.h:8
-msgid "Add Region"
-msgstr "Thêm vùng"
+#: ../panels/region/region.ui.h:7
+msgid "Login settings are used by all users when logging into the system"
+msgstr ""
 
-#: ../panels/region/gnome-region-panel.ui.h:9
-msgid "Remove Region"
-msgstr "Bỏ vùng"
+#: ../panels/search/cc-search-locations-dialog.c:275
+msgid "Home"
+msgstr "Nhà "
 
-# Name: don't translate / Tên: đừng dịch
-#: ../panels/region/gnome-region-panel.ui.h:10
-msgid "Dates"
-msgstr "Ngà y tháng"
+#: ../panels/search/cc-search-locations-dialog.c:475
+msgid "Places"
+msgstr ""
 
-#: ../panels/region/gnome-region-panel.ui.h:11
-msgid "Times"
-msgstr "Thời gian"
+#: ../panels/search/cc-search-locations-dialog.c:477
+msgid "Bookmarks"
+msgstr ""
 
-#: ../panels/region/gnome-region-panel.ui.h:12
-msgid "Numbers"
-msgstr "Cách ghi số"
+#: ../panels/search/cc-search-locations-dialog.c:675
+#, fuzzy
+#| msgid "_Delete Location"
+msgid "Select Location"
+msgstr "_Xoá vị trí"
 
-#: ../panels/region/gnome-region-panel.ui.h:13
-msgid "Currency"
-msgstr "Đơn vị tiền tệ"
+#: ../panels/search/cc-search-panel.c:193
+#, fuzzy
+#| msgid "No local printers found"
+msgid "No applications found"
+msgstr "Không tìm thấy máy in cục bộ"
 
-#: ../panels/region/gnome-region-panel.ui.h:14
-msgid "Measurement"
-msgstr "Hệ đo"
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:1
+msgid "Search"
+msgstr "Tìm kiếm"
 
-#: ../panels/region/gnome-region-panel.ui.h:15
-msgid "Examples"
-msgstr "Ví dụ"
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:2
+msgid ""
+"Control which applications show search results in the Activities Overview"
+msgstr ""
 
-#: ../panels/region/gnome-region-panel.ui.h:16
-msgid "Formats"
-msgstr "Định dạng"
+#. Translators: those are keywords for the search control-center panel
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:4
+msgid "Search;Find;Index;Hide;Privacy;Results;"
+msgstr ""
 
-#: ../panels/region/gnome-region-panel.ui.h:17
-msgid "Select keyboards or other input sources"
-msgstr "Chọn bà n phím và nguồn nhập khác"
+#: ../panels/search/search-locations-dialog.ui.h:1
+#, fuzzy
+#| msgid "Location"
+msgid "Search Locations"
+msgstr "Vị trí"
 
-#: ../panels/region/gnome-region-panel.ui.h:18
-msgid "Add Input Source"
-msgstr "Thêm nguồn nhập"
+#: ../panels/search/search.ui.h:1
+msgid "Move Up"
+msgstr "Chuyển lên"
 
-#: ../panels/region/gnome-region-panel.ui.h:19
-msgid "Remove Input Source"
-msgstr "Bỏ nguồn nhập"
+#: ../panels/search/search.ui.h:2
+msgid "Move Down"
+msgstr "Chuyển xuống"
 
-#: ../panels/region/gnome-region-panel.ui.h:20
-msgid "Move Input Source Up"
-msgstr "Chuyển nguồn nhập lên trên"
+#: ../panels/search/search.ui.h:3
+#, fuzzy
+#| msgid "Mouse Preferences"
+msgid "Preferences"
+msgstr "Tùy thích con trỏ chuột"
 
-#: ../panels/region/gnome-region-panel.ui.h:21
-msgid "Move Input Source Down"
-msgstr "Chuyển nguồn nhập xuống dưới"
+#: ../panels/sharing/cc-sharing-panel.c:259
+#, fuzzy
+#| msgid "On"
+msgctxt "service is enabled"
+msgid "On"
+msgstr "Bật"
 
-#: ../panels/region/gnome-region-panel.ui.h:22
-msgid "Input Source Settings"
-msgstr "Thiết lập nguồn nhập"
+#: ../panels/sharing/cc-sharing-panel.c:261
+msgctxt "service is disabled"
+msgid "Off"
+msgstr ""
 
-#: ../panels/region/gnome-region-panel.ui.h:23
-msgid "Show Keyboard Layout"
-msgstr "Hiện bố trí bà n phím"
+#: ../panels/sharing/cc-sharing-panel.c:407
+#, fuzzy
+#| msgid "Choose a Layout"
+msgid "Choose a Folder"
+msgstr "Chọn bố trí"
+
+#: ../panels/sharing/cc-sharing-panel.c:585
+#, fuzzy
+#| msgid "_Copy"
+msgid "Copy"
+msgstr "_Chép"
+
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1
+#, fuzzy
+#| msgid "Hearing"
+msgid "Sharing"
+msgstr "Nghe"
 
-#: ../panels/region/gnome-region-panel.ui.h:25
-msgid "Ctrl+Alt+Space"
-msgstr "Ctrl+Alt+<khoảng trắng>"
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2
+msgid "Control what you want to share with others"
+msgstr ""
 
-#: ../panels/region/gnome-region-panel.ui.h:27
-msgid "Ctrl+Alt+Shift+Space"
-msgstr "Ctrl+Alt+Shift+<khoảng trắng>"
+#. Translators: those are keywords for the sharing control-center panel
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4
+msgid ""
+"share;sharing;ssh;host;name;remote;desktop;bluetooth;obex;media;audio;video;"
+"pictures;photos;movies;server;renderer;"
+msgstr ""
 
-#: ../panels/region/gnome-region-panel.ui.h:28
-msgid "Shortcut Settings"
-msgstr "Thiết lập phím tắt"
+#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1
+#, fuzzy
+#| msgid "Enable h_orizontal scrolling"
+msgid "Enable or disable remote login"
+msgstr "Bật cuộn _ngang"
 
-#: ../panels/region/gnome-region-panel.ui.h:30
-msgid "Input Sources"
-msgstr "Thiết bị nhập"
+#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:2
+#, fuzzy
+#| msgid "Authentication is required to change user data"
+msgid "Authentication is required to enable or disable remote login"
+msgstr "Cần xác thực để thay đổi dữ liệu người dùng"
 
-#. 'display' means 'output' here, as in 'translated messages that are displayed to the user'
-#: ../panels/region/gnome-region-panel.ui.h:33
-msgid "Display language:"
-msgstr "Ngôn ngữ hiển thị:"
+#: ../panels/sharing/sharing.ui.h:1
+#, fuzzy
+#| msgid "Bluetooth Settings"
+msgid "Bluetooth Sharing"
+msgstr "Thiết lập Bluetooth"
 
-#: ../panels/region/gnome-region-panel.ui.h:34
-msgid "Input source:"
-msgstr "Thiết bị nhập:"
+#: ../panels/sharing/sharing.ui.h:2
+msgid ""
+"Bluetooth Sharing allows you to share files with other Bluetooth enabled "
+"devices"
+msgstr ""
 
-#: ../panels/region/gnome-region-panel.ui.h:35
-msgid "Format:"
-msgstr "Định dạng:"
+#: ../panels/sharing/sharing.ui.h:3
+msgid "Share Public Folder"
+msgstr ""
 
-#: ../panels/region/gnome-region-panel.ui.h:36
-msgid "Your settings"
-msgstr "Thiết lập của bạn"
+#: ../panels/sharing/sharing.ui.h:4
+msgid "Only Receive From Trusted Devices"
+msgstr ""
 
-#: ../panels/region/gnome-region-panel.ui.h:37
-msgid "System settings"
-msgstr "Thiết lập hệ thống"
+#: ../panels/sharing/sharing.ui.h:5
+msgid "Save Received Files to Downloads Folder"
+msgstr ""
 
-#: ../panels/screen/gnome-screen-panel.desktop.in.in.h:1
-msgid "Brightness & Lock"
-msgstr "Khoá và độ sáng"
+#: ../panels/sharing/sharing.ui.h:6
+msgid "Only share with Trusted Devices"
+msgstr ""
 
-#: ../panels/screen/gnome-screen-panel.desktop.in.in.h:2
-msgid "Screen brightness and lock settings"
-msgstr "Thiết lập khoá và độ sáng mà n hình"
+#: ../panels/sharing/sharing.ui.h:7
+#, fuzzy
+#| msgid "Computer"
+msgid "Computer Name"
+msgstr "Máy tính"
 
-#. Translators: those are keywords for the brightness and lock control-center panel
-#: ../panels/screen/gnome-screen-panel.desktop.in.in.h:4
-msgid "Brightness;Lock;Dim;Blank;Monitor;"
+#: ../panels/sharing/sharing.ui.h:8
+msgid "Some services are disabled because of no network access."
 msgstr ""
-"Brightness;Độ;sáng;Sang;Lock;Khoá;Khoa;Dim;Mờ;Blank;Trắng;Trang;Monitor;Mà n;"
-"hình;Man;hinh;"
 
-#: ../panels/screen/screen.ui.h:1
-msgid "Screen turns off"
-msgstr "Khi tắt mà n hình"
+#: ../panels/sharing/sharing.ui.h:9
+#, fuzzy
+#| msgid "Media player"
+msgid "Media Sharing"
+msgstr "Trình đa phương tiện"
 
-#: ../panels/screen/screen.ui.h:2
-msgid "30 seconds"
-msgstr "30 giây"
+#: ../panels/sharing/sharing.ui.h:10
+msgid "Share Music, Photos and Videos with others on the current network."
+msgstr ""
 
-#: ../panels/screen/screen.ui.h:3
-msgid "1 minute"
-msgstr "1 phút"
+#: ../panels/sharing/sharing.ui.h:11
+msgid "Share Media On This Network"
+msgstr ""
 
-#: ../panels/screen/screen.ui.h:4
-msgid "2 minutes"
-msgstr "2 phút"
+#: ../panels/sharing/sharing.ui.h:12
+#, fuzzy
+#| msgid "Pictures Folder"
+msgid "Shared Folders"
+msgstr "Thư mục ảnh"
 
-#: ../panels/screen/screen.ui.h:5
-msgid "3 minutes"
-msgstr "3 phút"
+#: ../panels/sharing/sharing.ui.h:13
+msgid "column"
+msgstr ""
 
-#: ../panels/screen/screen.ui.h:10
-msgid "_Dim screen to save power"
-msgstr "Là m _tối mà n hình để tiết kiệm năng lượng"
+#: ../panels/sharing/sharing.ui.h:14
+#, fuzzy
+#| msgid "Add profile"
+msgid "Add Folder"
+msgstr "Thêm hồ sơ"
 
-#: ../panels/screen/screen.ui.h:11
-msgid "Brightness"
-msgstr "Độ sáng"
+#: ../panels/sharing/sharing.ui.h:15
+#, fuzzy
+#| msgid "Remove User"
+msgid "Remove Folder"
+msgstr "Bỏ người dùng"
 
-#: ../panels/screen/screen.ui.h:12
-msgid "_Turn screen off when inactive for:"
-msgstr "_Tắt mà n hình nếu không hoạt động trong:"
+#: ../panels/sharing/sharing.ui.h:16
+#, fuzzy
+#| msgid "Personal digital assistant"
+msgid "Personal File Sharing"
+msgstr "Trợ lý điện tử cá nhân"
 
-#: ../panels/screen/screen.ui.h:13
-msgid "_Lock screen after:"
-msgstr "_Khoá mà n hình sau:"
+#: ../panels/sharing/sharing.ui.h:18
+#, no-c-format
+msgid ""
+"Personal File Sharing allows you to share your Public folder with others on "
+"your current network using: <a href=\"dav://%s\">dav://%s</a>"
+msgstr ""
 
-#. To translators: This asks whether you want to lock the screen (through the screensaver) when you're 
detected to be physically in your home (your house, etc.)
-#: ../panels/screen/screen.ui.h:15
-msgid "Don't lock when at home"
-msgstr "Không khoá khi ở nhà "
+#: ../panels/sharing/sharing.ui.h:19
+msgid "Share Public Folder On This Network"
+msgstr ""
 
-#: ../panels/screen/screen.ui.h:16
-msgid "Locations..."
-msgstr "Vị trí..."
+#: ../panels/sharing/sharing.ui.h:20
+#, fuzzy
+#| msgid "Group Password"
+msgid "Require Password"
+msgstr "Mật khẩu nhóm"
 
-#: ../panels/screen/screen.ui.h:17
-msgid "Show _notifications when locked"
-msgstr "Hiện _thông báo khi bị khoá"
+#: ../panels/sharing/sharing.ui.h:22
+#, fuzzy
+#| msgid "Remove Region"
+msgid "Remote Login"
+msgstr "Bỏ vùng"
 
-#: ../panels/screen/screen.ui.h:18
-msgid "Lock"
-msgstr "Khoá"
+#: ../panels/sharing/sharing.ui.h:24
+#, no-c-format
+msgid ""
+"Allow remote users to connect using the Secure Shell command:\n"
+"<a href=\"ssh %s\">ssh %s</a>"
+msgstr ""
 
-#: ../panels/sound/applet-main.c:49
-msgid "Enable debugging code"
-msgstr "Bật mã gỡ lỗi"
+#: ../panels/sharing/sharing.ui.h:26
+#, fuzzy
+#| msgid "Screen Settings"
+msgid "Screen Sharing"
+msgstr "Thiết lập mà n hình"
 
-#: ../panels/sound/applet-main.c:50
-msgid "Version of this application"
-msgstr "Phiên bản ứng dụng nà y"
+#: ../panels/sharing/sharing.ui.h:28
+#, no-c-format
+msgid ""
+"Allow remote users to view or control your screen by connecting to: <a href="
+"\"vnc://%s\">vnc://%s</a>"
+msgstr ""
 
-#: ../panels/sound/applet-main.c:62
-msgid " — GNOME Volume Control Applet"
-msgstr " - Applet Điều khiển Âm lượng GNOME"
+#: ../panels/sharing/sharing.ui.h:29
+#, fuzzy
+#| msgid "Remove Device"
+msgid "Remote View"
+msgstr "Loại bỏ thiết bị"
 
-#: ../panels/sound/data/gnome-sound-applet.desktop.in.h:1
-msgid "Volume Control"
+#: ../panels/sharing/sharing.ui.h:30
+#, fuzzy
+#| msgid "Volume Control"
+msgid "Remote Control"
 msgstr "Điều khiển âm lượng"
 
-#: ../panels/sound/data/gnome-sound-applet.desktop.in.h:2
-msgid "Show desktop volume control"
-msgstr "Hiện điều khiển âm lượng"
+#: ../panels/sharing/sharing.ui.h:31
+#, fuzzy
+#| msgid "Connection"
+msgid "Approve All Connections"
+msgstr "Kết nối"
+
+#: ../panels/sharing/sharing.ui.h:32
+#, fuzzy
+#| msgid "_Show password"
+msgid "Show Password"
+msgstr "_Hiện mật khẩu"
 
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:1
 msgid "Sound"
 msgstr "Âm thanh"
 
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:2
-msgid "Change sound volume and sound events"
+#, fuzzy
+#| msgid "Change sound volume and sound events"
+msgid "Change sound levels, inputs, outputs, and alert sounds"
 msgstr "Thay đổi âm lượng và sự kiện âm thanh"
 
 #. Translators: those are keywords for the sound control-center panel
@@ -3513,62 +5590,45 @@ msgstr "Thuá»· tinh"
 msgid "Sonar"
 msgstr "Sonar"
 
-# Name: don't translate / Tên: đừng dịch
-#: ../panels/sound/gvc-applet.c:270 ../panels/sound/gvc-mixer-dialog.c:1656
-msgid "Output"
-msgstr "Đầu ra"
-
-#: ../panels/sound/gvc-applet.c:272
-msgid "Sound Output Volume"
-msgstr "Âm lượng đầu ra"
-
-#: ../panels/sound/gvc-applet.c:276 ../panels/sound/gvc-mixer-dialog.c:1697
-msgid "Input"
-msgstr "Đầu và o"
-
-#: ../panels/sound/gvc-applet.c:278
-msgid "Microphone Volume"
-msgstr "Âm lượng micrô"
-
-#: ../panels/sound/gvc-balance-bar.c:111
+#: ../panels/sound/gvc-balance-bar.c:106
 msgctxt "balance"
 msgid "Left"
 msgstr "Trái"
 
-#: ../panels/sound/gvc-balance-bar.c:112
+#: ../panels/sound/gvc-balance-bar.c:107
 msgctxt "balance"
 msgid "Right"
 msgstr "Phải"
 
-#: ../panels/sound/gvc-balance-bar.c:115
+#: ../panels/sound/gvc-balance-bar.c:110
 msgctxt "balance"
 msgid "Rear"
 msgstr "Đằng sau"
 
-#: ../panels/sound/gvc-balance-bar.c:116
+#: ../panels/sound/gvc-balance-bar.c:111
 msgctxt "balance"
 msgid "Front"
 msgstr "Đằng trước"
 
-#: ../panels/sound/gvc-balance-bar.c:119
+#: ../panels/sound/gvc-balance-bar.c:114
 msgctxt "balance"
 msgid "Minimum"
 msgstr "Tối thiểu"
 
-#: ../panels/sound/gvc-balance-bar.c:120
+#: ../panels/sound/gvc-balance-bar.c:115
 msgctxt "balance"
 msgid "Maximum"
 msgstr "Tối đa"
 
-#: ../panels/sound/gvc-balance-bar.c:295
+#: ../panels/sound/gvc-balance-bar.c:290
 msgid "_Balance:"
 msgstr "_Cân bằng:"
 
-#: ../panels/sound/gvc-balance-bar.c:298
+#: ../panels/sound/gvc-balance-bar.c:293
 msgid "_Fade:"
 msgstr "_Mờ dần"
 
-#: ../panels/sound/gvc-balance-bar.c:301
+#: ../panels/sound/gvc-balance-bar.c:296
 msgid "_Subwoofer:"
 msgstr "_Subwoofer:"
 
@@ -3583,13 +5643,13 @@ msgid "Unamplified"
 msgstr "Không khuếch đại"
 
 #: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:260
-#: ../panels/sound/gvc-mixer-dialog.c:521
+#: ../panels/sound/gvc-mixer-dialog.c:526
 msgid "_Profile:"
 msgstr "_Hồ sơ:"
 
 #. translators:
 #. * The number of sound outputs on a particular device
-#: ../panels/sound/gvc-mixer-control.c:1841
+#: ../panels/sound/gvc/gvc-mixer-control.c:1837
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@@ -3597,13 +5657,13 @@ msgstr[0] "%u đầu ra"
 
 #. translators:
 #. * The number of sound inputs on a particular device
-#: ../panels/sound/gvc-mixer-control.c:1851
+#: ../panels/sound/gvc/gvc-mixer-control.c:1847
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
 msgstr[0] "%u đầu và o"
 
-#: ../panels/sound/gvc-mixer-control.c:2375
+#: ../panels/sound/gvc/gvc-mixer-control.c:2373
 msgid "System Sounds"
 msgstr "Âm thanh hệ thống"
 
@@ -3611,57 +5671,70 @@ msgstr "Âm thanh hệ thống"
 msgid "_Test Speakers"
 msgstr "Thá»­ _loa"
 
-#: ../panels/sound/gvc-mixer-dialog.c:426
+#: ../panels/sound/gvc-mixer-dialog.c:431
 msgid "Peak detect"
 msgstr "Dò tìm đỉnh"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1506
+#: ../panels/sound/gvc-mixer-dialog.c:1508
 #: ../panels/sound/gvc-sound-theme-chooser.c:595
 msgid "Name"
 msgstr "Tên"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1588
+#: ../panels/sound/gvc-mixer-dialog.c:1527
+msgid "Device"
+msgstr "Thiết bị"
+
+#: ../panels/sound/gvc-mixer-dialog.c:1590
 #, c-format
 msgid "Speaker Testing for %s"
 msgstr "Thá»­ loa %s"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1642
+#: ../panels/sound/gvc-mixer-dialog.c:1644
 msgid "_Output volume:"
 msgstr "Âm lượng đầu _ra:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1661
+# Name: don't translate / Tên: đừng dịch
+#: ../panels/sound/gvc-mixer-dialog.c:1658
+msgid "Output"
+msgstr "Đầu ra"
+
+#: ../panels/sound/gvc-mixer-dialog.c:1663
 msgid "C_hoose a device for sound output:"
 msgstr "_Chọn thiết bị âm thanh đầu ra:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1686
+#: ../panels/sound/gvc-mixer-dialog.c:1688
 msgid "Settings for the selected device:"
 msgstr "Thiết lập cho thiết bị được chọn:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1704
+#: ../panels/sound/gvc-mixer-dialog.c:1699
+msgid "Input"
+msgstr "Đầu và o"
+
+#: ../panels/sound/gvc-mixer-dialog.c:1706
 msgid "_Input volume:"
 msgstr "Âm lượng đầu _và o:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1727
+#: ../panels/sound/gvc-mixer-dialog.c:1729
 msgid "Input level:"
 msgstr "Mức đầu và o:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1755
+#: ../panels/sound/gvc-mixer-dialog.c:1757
 msgid "C_hoose a device for sound input:"
 msgstr "_Chọn thiết bị âm thanh đầu và o:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1782
+#: ../panels/sound/gvc-mixer-dialog.c:1784
 msgid "Sound Effects"
 msgstr "Hiệu ứng âm thanh"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1789
+#: ../panels/sound/gvc-mixer-dialog.c:1791
 msgid "_Alert volume:"
 msgstr "Âm lượng _cảnh báo:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1802
+#: ../panels/sound/gvc-mixer-dialog.c:1804
 msgid "Applications"
 msgstr "Ứng dụng"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1806
+#: ../panels/sound/gvc-mixer-dialog.c:1808
 msgid "No application is currently playing or recording audio."
 msgstr "Không có ứng dụng nà o đang phát hoặc thu âm thanh."
 
@@ -3706,35 +5779,18 @@ msgstr "Thá»­"
 msgid "Subwoofer"
 msgstr "Subwoofer"
 
-#: ../panels/sound/gvc-stream-status-icon.c:236
-#, c-format
-msgid "Failed to start Sound Preferences: %s"
-msgstr "Lỗi khởi động Tuỳ thích Âm thanh: %s"
-
-#: ../panels/sound/gvc-stream-status-icon.c:262
-msgid "_Mute"
-msgstr "_Tắt"
-
-#: ../panels/sound/gvc-stream-status-icon.c:271
-msgid "_Sound Preferences"
-msgstr "Tuỳ thích Â_m thanh"
-
-#: ../panels/sound/gvc-stream-status-icon.c:416
-msgid "Muted"
-msgstr "Đã tắt"
-
 #: ../panels/sound/sound-theme-file-utils.c:292
 msgid "Custom"
 msgstr "Tự chọn"
 
-#: ../panels/universal-access/cc-ua-panel.c:286
-#: ../panels/universal-access/cc-ua-panel.c:292
+#: ../panels/universal-access/cc-ua-panel.c:281
+#: ../panels/universal-access/cc-ua-panel.c:287
 msgid "No shortcut set"
 msgstr "Chưa đặt phím tắt"
 
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2
-msgid "Universal Access Preferences"
-msgstr "Tuỳ thích hỗ trợ truy cập"
+msgid "Make it easier to see, hear, type, point and click"
+msgstr ""
 
 #. Translators: those are keywords for the universal access control-center panel
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4
@@ -3749,6 +5805,7 @@ msgstr ""
 "Keys;"
 
 #: ../panels/universal-access/uap.ui.h:1
+#: ../panels/universal-access/zoom-options.ui.h:33
 msgctxt "universal access, contrast"
 msgid "Low"
 msgstr "Thấp"
@@ -3759,6 +5816,7 @@ msgid "Normal"
 msgstr "Bình thường"
 
 #: ../panels/universal-access/uap.ui.h:3
+#: ../panels/universal-access/zoom-options.ui.h:34
 msgctxt "universal access, contrast"
 msgid "High"
 msgstr "Cao"
@@ -3780,10 +5838,6 @@ msgstr "GOK"
 msgid "OnBoard"
 msgstr "Trên máy"
 
-#: ../panels/universal-access/uap.ui.h:8
-msgid "None"
-msgstr "Không có"
-
 #: ../panels/universal-access/uap.ui.h:10
 #, no-c-format
 msgid "75%"
@@ -3832,10 +5886,6 @@ msgstr "Tương phản cao"
 msgid "Beep on Caps and Num Lock"
 msgstr "Kêu bíp khi nhấn phím Caps và Num Lock"
 
-#: ../panels/universal-access/uap.ui.h:23
-msgid "Options..."
-msgstr "Tùy chọn..."
-
 #: ../panels/universal-access/uap.ui.h:24
 msgid "Screen Reader"
 msgstr "Bộ đọc mà n hình"
@@ -3929,117 +5979,135 @@ msgstr "Đặt độ trễ từ lúc nhấn phím đến lúc phím được ch
 msgid "A_cceptance delay:"
 msgstr "Độ t_rễ chấp nhận:"
 
-#: ../panels/universal-access/uap.ui.h:50
+#: ../panels/universal-access/uap.ui.h:48
+#, fuzzy
+#| msgid "Short"
+msgctxt "universal access, delay"
+msgid "Short"
+msgstr "Ngắn"
+
+#: ../panels/universal-access/uap.ui.h:49
 msgid "Slow keys typing delay"
 msgstr "Khoản chờ nhập phím chậm"
 
+#: ../panels/universal-access/uap.ui.h:50
+#, fuzzy
+#| msgid "Long"
+msgctxt "universal access, delay"
+msgid "Long"
+msgstr "Lâu"
+
 #. This string is part of a line of checkboxes: Beep when a key is [ ] pressed  [ ] accepted  [ ] rejected
-#: ../panels/universal-access/uap.ui.h:54
+#: ../panels/universal-access/uap.ui.h:52
 msgid "Beep when a key is"
 msgstr "Kêu bíp khi một phím"
 
 #. This completes the sentence "Beep when a key is"
-#: ../panels/universal-access/uap.ui.h:56
+#: ../panels/universal-access/uap.ui.h:54
 msgid "pressed"
 msgstr "được nhấn"
 
 #. This completes the sentence "Beep when a key is"
-#: ../panels/universal-access/uap.ui.h:58
+#: ../panels/universal-access/uap.ui.h:56
 msgid "accepted"
 msgstr "được chấp nhận"
 
 #. This completes the sentence "Beep when a key is"
-#: ../panels/universal-access/uap.ui.h:60
+#: ../panels/universal-access/uap.ui.h:58
 msgid "rejected"
 msgstr "bị từ chối"
 
-#: ../panels/universal-access/uap.ui.h:61
+#: ../panels/universal-access/uap.ui.h:59
 msgid "Bounce Keys"
 msgstr "Phím dội"
 
-#: ../panels/universal-access/uap.ui.h:62
+#: ../panels/universal-access/uap.ui.h:60
 msgid "Ignores fast duplicate keypresses"
 msgstr "Bỏ qua phím nhấn lặp lại nhanh"
 
-#: ../panels/universal-access/uap.ui.h:63
+#: ../panels/universal-access/uap.ui.h:61
 msgid "Acc_eptance delay:"
 msgstr "Độ _trễ chấp nhận:"
 
-#: ../panels/universal-access/uap.ui.h:64
+#: ../panels/universal-access/uap.ui.h:62
 msgid "Bounce keys typing delay"
 msgstr "Khoảng chờ nhập phím dội"
 
-#: ../panels/universal-access/uap.ui.h:65
+#: ../panels/universal-access/uap.ui.h:63
 msgid "Beep when a key is _rejected"
 msgstr "Kêu bíp khi một phím bị _từ chối"
 
-#: ../panels/universal-access/uap.ui.h:66
+#: ../panels/universal-access/uap.ui.h:64
 msgid "Enable by Keyboard"
 msgstr "Bật bằng bà n phím"
 
-#: ../panels/universal-access/uap.ui.h:67
+#: ../panels/universal-access/uap.ui.h:65
 msgid "Turn accessibility features on and off using the keyboard"
 msgstr "Bật các tính năng hỗ trợ bằng bà n phím"
 
-#: ../panels/universal-access/uap.ui.h:69
+#: ../panels/universal-access/uap.ui.h:67
 msgid "Mouse Keys"
 msgstr "Phím chuột"
 
-#: ../panels/universal-access/uap.ui.h:70
+#: ../panels/universal-access/uap.ui.h:68
 msgid "Control the pointer using the keypad"
 msgstr "Điều khiển con trỏ bằng bà n phím số"
 
-#: ../panels/universal-access/uap.ui.h:71
+#: ../panels/universal-access/uap.ui.h:69
 msgid "Video Mouse"
 msgstr "Chuá»™t phim"
 
-#: ../panels/universal-access/uap.ui.h:72
+#: ../panels/universal-access/uap.ui.h:70
 msgid "Control the pointer using the video camera."
 msgstr "Điều khiển con trỏ dùng máy quay phim."
 
-#: ../panels/universal-access/uap.ui.h:73
+#: ../panels/universal-access/uap.ui.h:71
 msgid "Simulated Secondary Click"
 msgstr "Cú nhấn thứ hai mô phỏng"
 
-#: ../panels/universal-access/uap.ui.h:74
+#: ../panels/universal-access/uap.ui.h:72
 msgid "Trigger a secondary click by holding down the primary button"
 msgstr "Gây ra cú nhấn phụ bằng cách nhấn giữ nút chính"
 
-#: ../panels/universal-access/uap.ui.h:75
+#: ../panels/universal-access/uap.ui.h:73
 msgid "Secondary click delay"
 msgstr "Khoảng chờ nhấn lần hai"
 
-#: ../panels/universal-access/uap.ui.h:76
+#: ../panels/universal-access/uap.ui.h:74
 msgid "Hover Click"
 msgstr "Phủ bóng nhấn"
 
-#: ../panels/universal-access/uap.ui.h:77
+#: ../panels/universal-access/uap.ui.h:75
 msgid "Trigger a click when the pointer hovers"
 msgstr "Gây ra cú nhấn khi lướt con trỏ qua"
 
-#: ../panels/universal-access/uap.ui.h:78
+#: ../panels/universal-access/uap.ui.h:76
 msgid "D_elay:"
 msgstr "T_rá»…:"
 
-#: ../panels/universal-access/uap.ui.h:79
+#: ../panels/universal-access/uap.ui.h:77
 msgid "Motion _threshold:"
 msgstr "Ngưỡng di chu_yển:"
 
-#. small threshold
-#: ../panels/universal-access/uap.ui.h:81
+#: ../panels/universal-access/uap.ui.h:78
+#, fuzzy
+#| msgid "Small"
+msgctxt "universal access, threshold"
 msgid "Small"
 msgstr "Nhỏ"
 
-#. large threshold
-#: ../panels/universal-access/uap.ui.h:83
+#: ../panels/universal-access/uap.ui.h:79
+#, fuzzy
+#| msgid "Large"
+msgctxt "universal access, threshold"
 msgid "Large"
 msgstr "Lá»›n"
 
-#: ../panels/universal-access/uap.ui.h:84
+#: ../panels/universal-access/uap.ui.h:80
 msgid "Mouse Settings"
 msgstr "Thiết lập chuột"
 
-#: ../panels/universal-access/uap.ui.h:85
+#: ../panels/universal-access/uap.ui.h:81
 msgid "Pointing and Clicking"
 msgstr "Trỏ và nhấn"
 
@@ -4136,78 +6204,86 @@ msgstr "Kính lúp"
 msgid "Thickness:"
 msgstr "Độ dà y:"
 
-#. short delay
-#: ../panels/universal-access/zoom-options.ui.h:19
+#: ../panels/universal-access/zoom-options.ui.h:18
+#, fuzzy
+#| msgid "Thin"
+msgctxt "universal access, thickness"
 msgid "Thin"
 msgstr "Mỏng"
 
-#. long delay
-#: ../panels/universal-access/zoom-options.ui.h:21
+#: ../panels/universal-access/zoom-options.ui.h:19
+#, fuzzy
+#| msgid "Thick"
+msgctxt "universal access, thickness"
 msgid "Thick"
 msgstr "DÃ y"
 
-#: ../panels/universal-access/zoom-options.ui.h:22
+#: ../panels/universal-access/zoom-options.ui.h:20
 msgid "Length:"
 msgstr "Chiều dà i:"
 
-#: ../panels/universal-access/zoom-options.ui.h:23
+#: ../panels/universal-access/zoom-options.ui.h:21
 msgid "Color:"
 msgstr "Mà u sắc:"
 
-#: ../panels/universal-access/zoom-options.ui.h:24
+#: ../panels/universal-access/zoom-options.ui.h:22
 msgid "Crosshairs:"
 msgstr "Khung nhắm:"
 
-#: ../panels/universal-access/zoom-options.ui.h:25
+#: ../panels/universal-access/zoom-options.ui.h:23
 msgid "Overlaps mouse cursor"
 msgstr "Đè con trỏ chuột"
 
-#: ../panels/universal-access/zoom-options.ui.h:26
+#: ../panels/universal-access/zoom-options.ui.h:24
 msgid "Crosshairs"
 msgstr "Khung nhắm"
 
-#: ../panels/universal-access/zoom-options.ui.h:27
+#: ../panels/universal-access/zoom-options.ui.h:25
 msgid "White on black:"
 msgstr "Trắng nền đen:"
 
-#: ../panels/universal-access/zoom-options.ui.h:28
+#: ../panels/universal-access/zoom-options.ui.h:26
 msgid "Brightness:"
 msgstr "Độ sáng:"
 
-#: ../panels/universal-access/zoom-options.ui.h:29
+#: ../panels/universal-access/zoom-options.ui.h:27
 msgid "Contrast:"
 msgstr "Độ tương phản:"
 
-#: ../panels/universal-access/zoom-options.ui.h:30
-msgctxt "Zoom Grayscale"
-msgid "Color"
-msgstr "Mà u sắc"
-
-#: ../panels/universal-access/zoom-options.ui.h:31
-msgctxt "Zoom Grayscale"
+#: ../panels/universal-access/zoom-options.ui.h:29
+#, fuzzy
+#| msgid "None"
+msgctxt "universal access, color"
 msgid "None"
-msgstr "Không"
+msgstr "Không có"
 
-#: ../panels/universal-access/zoom-options.ui.h:32
-msgctxt "Zoom Grayscale"
+#: ../panels/universal-access/zoom-options.ui.h:30
+#, fuzzy
+#| msgctxt "Zoom Grayscale"
+#| msgid "Full"
+msgctxt "universal access, color"
 msgid "Full"
 msgstr "Đầy"
 
-#. short delay
-#: ../panels/universal-access/zoom-options.ui.h:34
+#: ../panels/universal-access/zoom-options.ui.h:31
+#, fuzzy
+#| msgid "Low"
+msgctxt "universal access, brightness"
 msgid "Low"
 msgstr "Thấp"
 
-#. long delay
-#: ../panels/universal-access/zoom-options.ui.h:36
+#: ../panels/universal-access/zoom-options.ui.h:32
+#, fuzzy
+#| msgid "High"
+msgctxt "universal access, brightness"
 msgid "High"
 msgstr "Cao"
 
-#: ../panels/universal-access/zoom-options.ui.h:37
+#: ../panels/universal-access/zoom-options.ui.h:35
 msgid "Color Effects:"
 msgstr "Hiệu ứng mà u:"
 
-#: ../panels/universal-access/zoom-options.ui.h:38
+#: ../panels/universal-access/zoom-options.ui.h:36
 msgid "Color Effects"
 msgstr "Hiệu ứng mà u"
 
@@ -4237,10 +6313,6 @@ msgstr "Tà i khoản _cục bộ"
 msgid "_Enterprise Login"
 msgstr "Đăng nhập _Enterprise"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:6
-msgid "_Username"
-msgstr "_Tên người dùng"
-
 #: ../panels/user-accounts/data/account-dialog.ui.h:7
 msgid "_Full name"
 msgstr "_Họ tên"
@@ -4258,11 +6330,6 @@ msgstr "_Miền"
 msgid "_Login Name"
 msgstr "Tên đă_ng nhập"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:11
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
-msgid "_Password"
-msgstr "_Mật khẩu"
-
 #: ../panels/user-accounts/data/account-dialog.ui.h:12
 msgid "Tip: Enterprise domain or realm name"
 msgstr "Mẹo: tên miền doanh nghiệp"
@@ -4325,7 +6392,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:706
+#: ../panels/user-accounts/um-fingerprint-dialog.c:700
 msgid "Enable Fingerprint Login"
 msgstr "Bật đăng nhập bằng vân tay"
 
@@ -4350,11 +6417,15 @@ msgstr ""
 "máy đọc vân tay."
 
 #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:1
-msgid "User Accounts"
-msgstr "Tà i khoản người dùng"
+#, fuzzy
+#| msgid "Username"
+msgid "Users"
+msgstr "Tên người dùng"
 
 #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:2
-msgid "Add or remove users"
+#, fuzzy
+#| msgid "Add or remove users"
+msgid "Add or remove users and change your password"
 msgstr "Thêm hoặc xoá người dùng"
 
 #. Translators: those are keywords for the user accounts control-center panel
@@ -4364,6 +6435,24 @@ 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:2
+#, fuzzy
+#| msgid "Previous track"
+msgid "Previous Week"
+msgstr "BÃ i trÆ°á»›c"
+
+#: ../panels/user-accounts/data/history-dialog.ui.h:3
+#, fuzzy
+#| msgid "Next track"
+msgid "Next Week"
+msgstr "Bà i tiếp"
+
+#: ../panels/user-accounts/data/history-dialog.ui.h:4
+#, fuzzy
+#| msgid "Next track"
+msgid "Next week"
+msgstr "Bà i tiếp"
+
 #: ../panels/user-accounts/data/password-dialog.ui.h:1
 msgid "Set a password now"
 msgstr "Đặt mật khẩu mới ngay"
@@ -4385,54 +6474,38 @@ msgid "Enable this account"
 msgstr "Bật mật khẩu nà y"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:6
-msgid "_Hint"
-msgstr "_Gợi ý"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:7
-msgid ""
-"This hint may be displayed at the login screen.  It will be visible to all "
-"users of this system.  Do <b>not</b> include the password here."
-msgstr ""
-"Gợi ý nà y sẽ được hiện ở mà n hình đăng nhập và mọi người đều có thể nhìn "
-"thấy. Xin <b>đừng để lộ mật khẩu</b> của bạn ở đây."
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:8
 msgid "C_onfirm password"
 msgstr "_Xác nhận mật khẩu"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:9
+#: ../panels/user-accounts/data/password-dialog.ui.h:7
 msgid "_New password"
 msgstr "Mật khẩu _mới"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:10
+#: ../panels/user-accounts/data/password-dialog.ui.h:8
 msgid "Generate a password"
 msgstr "Phát sinh mật khẩu"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:11
-msgid "Fair"
-msgstr "Được"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:12
+#: ../panels/user-accounts/data/password-dialog.ui.h:9
 msgid "Current _password"
 msgstr "_Mật khẩu hiện có"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:13
+#: ../panels/user-accounts/data/password-dialog.ui.h:10
 msgid "_Action"
 msgstr "_HÃ nh Ä‘á»™ng"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:14
+#: ../panels/user-accounts/data/password-dialog.ui.h:11
 msgid "Changing password for"
 msgstr "Đổi mật khẩu cho"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:15
+#: ../panels/user-accounts/data/password-dialog.ui.h:12
 msgid "_Show password"
 msgstr "_Hiện mật khẩu"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:16
+#: ../panels/user-accounts/data/password-dialog.ui.h:13
 msgid "How to choose a strong password"
 msgstr "Là m cách nà o chọn mật khẩu tốt"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:17
+#: ../panels/user-accounts/data/password-dialog.ui.h:14
 msgid "Ch_ange"
 msgstr "Đổ_i"
 
@@ -4499,6 +6572,12 @@ msgstr "Biểu tượng người dùng"
 msgid "_Language"
 msgstr "_Ngôn ngữ"
 
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
+#, fuzzy
+#| msgid "A_utomatic Login"
+msgid "Last Login"
+msgstr "Đăng nhập _tự động"
+
 #: ../panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in.h:1
 msgid "Manage user accounts"
 msgstr "Quản lý tà i khoản người dùng"
@@ -4508,7 +6587,7 @@ msgid "Authentication is required to change user data"
 msgstr "Cần xác thực để thay đổi dữ liệu người dùng"
 
 #: ../panels/user-accounts/pw-utils.c:94
-#: ../panels/user-accounts/um-password-dialog.c:569
+#: ../panels/user-accounts/um-password-dialog.c:597
 msgctxt "Password strength"
 msgid "Too short"
 msgstr "Quá ngắn"
@@ -4519,25 +6598,25 @@ msgid "Not good enough"
 msgstr "Không đủ tốt"
 
 #: ../panels/user-accounts/pw-utils.c:108
-#: ../panels/user-accounts/um-password-dialog.c:570
+#: ../panels/user-accounts/um-password-dialog.c:598
 msgctxt "Password strength"
 msgid "Weak"
 msgstr "Yếu"
 
 #: ../panels/user-accounts/pw-utils.c:111
-#: ../panels/user-accounts/um-password-dialog.c:571
+#: ../panels/user-accounts/um-password-dialog.c:599
 msgctxt "Password strength"
 msgid "Fair"
 msgstr "Được"
 
 #: ../panels/user-accounts/pw-utils.c:114
-#: ../panels/user-accounts/um-password-dialog.c:572
+#: ../panels/user-accounts/um-password-dialog.c:600
 msgctxt "Password strength"
 msgid "Good"
 msgstr "Tốt"
 
 #: ../panels/user-accounts/pw-utils.c:117
-#: ../panels/user-accounts/um-password-dialog.c:573
+#: ../panels/user-accounts/um-password-dialog.c:601
 msgctxt "Password strength"
 msgid "Strong"
 msgstr "Rất tốt"
@@ -4547,7 +6626,6 @@ msgid "Authentication failed"
 msgstr "Lỗi xác thực"
 
 #: ../panels/user-accounts/run-passwd.c:504
-#: ../panels/user-accounts/um-password-dialog.c:239
 #, c-format
 msgid "The new password is too short"
 msgstr "Mật khẩu quá ngắn"
@@ -4592,24 +6670,24 @@ msgstr "Mật khẩu mới phải chứa đủ các ký tự khác nhau"
 msgid "Unknown error"
 msgstr "Lỗi lạ"
 
-#: ../panels/user-accounts/um-account-dialog.c:175
+#: ../panels/user-accounts/um-account-dialog.c:182
 msgid "Failed to add account"
 msgstr "Lỗi thêm tà i khoản"
 
-#: ../panels/user-accounts/um-account-dialog.c:366
-#: ../panels/user-accounts/um-account-dialog.c:405
+#: ../panels/user-accounts/um-account-dialog.c:403
+#: ../panels/user-accounts/um-account-dialog.c:444
 msgid "Failed to register account"
 msgstr "Lỗi đăng ký tà i khoản"
 
-#: ../panels/user-accounts/um-account-dialog.c:530
+#: ../panels/user-accounts/um-account-dialog.c:577
 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:582
+#: ../panels/user-accounts/um-account-dialog.c:631
 msgid "Failed to join domain"
 msgstr "Lỗi tham gia miền"
 
-#: ../panels/user-accounts/um-account-dialog.c:635
+#: ../panels/user-accounts/um-account-dialog.c:688
 msgid "Failed to log into domain"
 msgstr "Lỗi đăng nhập miền"
 
@@ -4665,16 +6743,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:603
+#: ../panels/user-accounts/um-fingerprint-dialog.c:599
 #, 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:655
+#: ../panels/user-accounts/um-fingerprint-dialog.c:650
 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:656
+#: ../panels/user-accounts/um-fingerprint-dialog.c:651
 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 đỡ."
 
@@ -4683,7 +6761,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:740
+#: ../panels/user-accounts/um-fingerprint-dialog.c:734
 #, c-format
 msgid ""
 "To enable fingerprint login, you need to save one of your fingerprints, "
@@ -4692,59 +6770,71 @@ 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:747
+#: ../panels/user-accounts/um-fingerprint-dialog.c:741
 msgid "Selecting finger"
 msgstr "Chọn ngón tay"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:748
+#: ../panels/user-accounts/um-fingerprint-dialog.c:742
 msgid "Enrolling fingerprints"
 msgstr "Đang ghi dấu vân tay"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:749
-msgid "Summary"
-msgstr "Tổng kết"
+#: ../panels/user-accounts/um-history-dialog.c:88
+msgid "This Week"
+msgstr ""
+
+#: ../panels/user-accounts/um-history-dialog.c:91
+#, fuzzy
+#| msgid "Last used"
+msgid "Last Week"
+msgstr "Dùng lần cuối"
 
-#: ../panels/user-accounts/um-password-dialog.c:96
+#: ../panels/user-accounts/um-password-dialog.c:128
 msgid "_Generate a password"
 msgstr "_Phát sinh mật khẩu"
 
-#: ../panels/user-accounts/um-password-dialog.c:150
+#: ../panels/user-accounts/um-password-dialog.c:181
 msgid "Please choose another password."
 msgstr "Vui lòng chọn mật khẩu khác."
 
-#: ../panels/user-accounts/um-password-dialog.c:159
+#: ../panels/user-accounts/um-password-dialog.c:190
 msgid "Please type your current password again."
 msgstr "Hãy gõ mật khẩu hiện tại một lần nữa."
 
-#: ../panels/user-accounts/um-password-dialog.c:165
+#: ../panels/user-accounts/um-password-dialog.c:196
 msgid "Password could not be changed"
 msgstr "Mật khẩu của bạn không thể bị thay đổi"
 
-#: ../panels/user-accounts/um-password-dialog.c:236
+#: ../panels/user-accounts/um-password-dialog.c:301
 msgid "You need to enter a new password"
 msgstr "Bạn cần nhập mật khẩu mới"
 
-#: ../panels/user-accounts/um-password-dialog.c:245
+#: ../panels/user-accounts/um-password-dialog.c:304
+#, fuzzy
+#| msgid "The new password is too short"
+msgid "The new password is not strong enough"
+msgstr "Mật khẩu quá ngắn"
+
+#: ../panels/user-accounts/um-password-dialog.c:310
 msgid "You need to confirm the password"
 msgstr "Bạn cần xác nhận mật khẩu"
 
-#: ../panels/user-accounts/um-password-dialog.c:248
+#: ../panels/user-accounts/um-password-dialog.c:313
 msgid "The passwords do not match"
 msgstr "Mật khẩu không khớp"
 
-#: ../panels/user-accounts/um-password-dialog.c:254
+#: ../panels/user-accounts/um-password-dialog.c:319
 msgid "You need to enter your current password"
 msgstr "Bạn cần nhập mật khẩu hiện tại"
 
-#: ../panels/user-accounts/um-password-dialog.c:257
+#: ../panels/user-accounts/um-password-dialog.c:322
 msgid "The current password is not correct"
 msgstr "Mật khẩu hiện tại không đúng"
 
-#: ../panels/user-accounts/um-password-dialog.c:347
+#: ../panels/user-accounts/um-password-dialog.c:385
 msgid "Passwords do not match"
 msgstr "Mật khẩu không khớp"
 
-#: ../panels/user-accounts/um-password-dialog.c:409
+#: ../panels/user-accounts/um-password-dialog.c:439
 msgid "Wrong password"
 msgstr "Mật khẩu sai"
 
@@ -4753,76 +6843,72 @@ msgid "Disable image"
 msgstr "Tắt ảnh"
 
 #: ../panels/user-accounts/um-photo-dialog.c:461
-msgid "Take a photo..."
+#, fuzzy
+#| msgid "Take a photo..."
+msgid "Take a photo…"
 msgstr "Chụp ảnh..."
 
 #: ../panels/user-accounts/um-photo-dialog.c:479
-msgid "Browse for more pictures..."
-msgstr "Duyệt thêm ảnh..."
+#, fuzzy
+#| msgid "Browse for more pictures"
+msgid "Browse for more pictures…"
+msgstr "Duyệt thêm ảnh"
 
-#: ../panels/user-accounts/um-photo-dialog.c:704
+#: ../panels/user-accounts/um-photo-dialog.c:703
 #, c-format
 msgid "Used by %s"
 msgstr "Được dùng bởi %s"
 
-#: ../panels/user-accounts/um-realm-manager.c:368
+#: ../panels/user-accounts/um-realm-manager.c:351
+#, fuzzy
+#| msgid "Cannot remove automatically added profile"
+msgid "Cannot automatically join this type of domain"
+msgstr "Không thể xóa bỏ hồ sơ được thêm và o tự động"
+
+#: ../panels/user-accounts/um-realm-manager.c:414
 #, c-format
 msgid "No such domain or realm found"
 msgstr "Không tìm thấy miền"
 
-#: ../panels/user-accounts/um-realm-manager.c:743
+#: ../panels/user-accounts/um-realm-manager.c:815
 #, c-format
 msgid "Cannot log in as %s at the %s domain"
 msgstr "Không thể đăng nhập là %s tại miền %s"
 
-#: ../panels/user-accounts/um-realm-manager.c:748
+#: ../panels/user-accounts/um-realm-manager.c:820
 msgid "Invalid password, please try again"
 msgstr "Mật khẩu không đúng, vui lòng thử lại"
 
-#: ../panels/user-accounts/um-realm-manager.c:752
+#: ../panels/user-accounts/um-realm-manager.c:824
 #, c-format
 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-manager.c:466
-#, c-format
-msgid "A user with name '%s' already exists."
-msgstr "Đã có người dùng tên '%s' rồi."
-
-#: ../panels/user-accounts/um-user-manager.c:473
-#, c-format
-msgid "No user with the name '%s' exists."
-msgstr "Không có người dùng tên '%s'."
-
-#: ../panels/user-accounts/um-user-manager.c:631
-msgid "This user does not exist."
-msgstr "Người dùng không tồn tại."
-
-#: ../panels/user-accounts/um-user-panel.c:371
+#: ../panels/user-accounts/um-user-panel.c:376
 msgid "Failed to delete user"
 msgstr "Lỗi xoá người dùng"
 
-#: ../panels/user-accounts/um-user-panel.c:431
+#: ../panels/user-accounts/um-user-panel.c:436
 msgid "You cannot delete your own account."
 msgstr "Không thể xoá tà i khoản của chính bạn."
 
-#: ../panels/user-accounts/um-user-panel.c:440
+#: ../panels/user-accounts/um-user-panel.c:445
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s vẫn đang đăng nhập"
 
-#: ../panels/user-accounts/um-user-panel.c:444
+#: ../panels/user-accounts/um-user-panel.c:449
 msgid ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
 msgstr "Xoá người dùng vẫn đang đăng nhập có thể gây bất ổn hệ thống."
 
-#: ../panels/user-accounts/um-user-panel.c:453
+#: ../panels/user-accounts/um-user-panel.c:458
 #, c-format
 msgid "Do you want to keep %s's files?"
 msgstr "Bạn có muốn giữ tập tin của %s không?"
 
-#: ../panels/user-accounts/um-user-panel.c:457
+#: ../panels/user-accounts/um-user-panel.c:462
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
@@ -4830,38 +6916,42 @@ msgstr ""
 "Có thể giữ lại thư mục cá nhân, thư từ và tập tin tạm khi xoá tà i khoản "
 "người dùng."
 
-#: ../panels/user-accounts/um-user-panel.c:460
+#: ../panels/user-accounts/um-user-panel.c:465
 msgid "_Delete Files"
 msgstr "_Xoá tập tin"
 
-#: ../panels/user-accounts/um-user-panel.c:461
+#: ../panels/user-accounts/um-user-panel.c:466
 msgid "_Keep Files"
 msgstr "_Giữ tập tin"
 
-#: ../panels/user-accounts/um-user-panel.c:513
+#: ../panels/user-accounts/um-user-panel.c:518
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "Tà i khoản bị vô hiệu hoá"
 
-#: ../panels/user-accounts/um-user-panel.c:521
+#: ../panels/user-accounts/um-user-panel.c:526
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "Cần đặt và o lần đăng nhập tiếp theo"
 
-#: ../panels/user-accounts/um-user-panel.c:524
+#: ../panels/user-accounts/um-user-panel.c:529
 msgctxt "Password mode"
 msgid "None"
 msgstr "Không có"
 
-#: ../panels/user-accounts/um-user-panel.c:869
+#: ../panels/user-accounts/um-user-panel.c:578
+msgid "Logged in"
+msgstr ""
+
+#: ../panels/user-accounts/um-user-panel.c:942
 msgid "Failed to contact the accounts service"
 msgstr "Lỗi liên lạc dịch vụ tà i khoản (accountsservice)"
 
-#: ../panels/user-accounts/um-user-panel.c:871
+#: ../panels/user-accounts/um-user-panel.c:944
 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:911
+#: ../panels/user-accounts/um-user-panel.c:985
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -4869,12 +6959,12 @@ msgstr ""
 "Để thay đổi,\n"
 "nhấn biểu tượng * trước"
 
-#: ../panels/user-accounts/um-user-panel.c:949
+#: ../panels/user-accounts/um-user-panel.c:1023
 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:960
-#: ../panels/user-accounts/um-user-panel.c:1271
+#: ../panels/user-accounts/um-user-panel.c:1034
+#: ../panels/user-accounts/um-user-panel.c:1320
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -4882,12 +6972,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:969
+#: ../panels/user-accounts/um-user-panel.c:1043
 msgid "Delete the selected user account"
 msgstr "Xoá tà i khoản người dùng được chọn"
 
-#: ../panels/user-accounts/um-user-panel.c:981
-#: ../panels/user-accounts/um-user-panel.c:1276
+#: ../panels/user-accounts/um-user-panel.c:1055
+#: ../panels/user-accounts/um-user-panel.c:1325
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -4895,29 +6985,29 @@ msgstr ""
 "Để xoá 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:1174
+#: ../panels/user-accounts/um-user-panel.c:1229
 msgid "My Account"
 msgstr "Tà i khoản của mình"
 
-#: ../panels/user-accounts/um-user-panel.c:1184
+#: ../panels/user-accounts/um-user-panel.c:1238
 msgid "Other Accounts"
 msgstr "Tà i khoản khác"
 
-#: ../panels/user-accounts/um-utils.c:512
+#: ../panels/user-accounts/um-utils.c:516
 #, c-format
 msgid "A user with the username '%s' already exists"
 msgstr "Đã có người dùng tên '%s' rồi"
 
-#: ../panels/user-accounts/um-utils.c:516
+#: ../panels/user-accounts/um-utils.c:520
 #, c-format
 msgid "The username is too long"
 msgstr "Tên người dùng quá dà i"
 
-#: ../panels/user-accounts/um-utils.c:519
+#: ../panels/user-accounts/um-utils.c:523
 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:522
+#: ../panels/user-accounts/um-utils.c:526
 msgid ""
 "The username must only consist of:\n"
 " ➣ letters from the English alphabet\n"
@@ -4937,11 +7027,6 @@ msgstr "Ánh xạ nút"
 msgid "Map buttons to functions"
 msgstr "Ánh xạ nút sang chức năng"
 
-#. Text printed on screen
-#: ../panels/wacom/calibrator/gui_gtk.c:78
-msgid "Screen Calibration"
-msgstr "Cân chỉnh mà n hình"
-
 #: ../panels/wacom/calibrator/gui_gtk.c:79
 msgid ""
 "Please tap the target markers as they appear on screen to calibrate the "
@@ -4973,7 +7058,7 @@ msgstr "Ánh xạ sang mà n hình đơn"
 msgid "%d of %d"
 msgstr "%d / %d"
 
-#: ../panels/wacom/cc-wacom-page.c:118 ../panels/wacom/cc-wacom-page.c:371
+#: ../panels/wacom/cc-wacom-page.c:118 ../panels/wacom/cc-wacom-page.c:384
 msgctxt "Wacom action-type"
 msgid "None"
 msgstr "Không"
@@ -4988,28 +7073,39 @@ msgctxt "Wacom action-type"
 msgid "Switch Monitor"
 msgstr "Chuyển mà n hình"
 
-#: ../panels/wacom/cc-wacom-page.c:601
+#: ../panels/wacom/cc-wacom-page.c:121
+msgctxt "Wacom action-type"
+msgid "Show On-Screen Help"
+msgstr ""
+
+#: ../panels/wacom/cc-wacom-page.c:621
+#, fuzzy
+#| msgid "Up"
+msgctxt "Wacom tablet button"
 msgid "Up"
 msgstr "Lên"
 
-#: ../panels/wacom/cc-wacom-page.c:601
+#: ../panels/wacom/cc-wacom-page.c:621
+#, fuzzy
+#| msgid "Down"
+msgctxt "Wacom tablet button"
 msgid "Down"
 msgstr "Xuống"
 
-#: ../panels/wacom/cc-wacom-page.c:638
+#: ../panels/wacom/cc-wacom-page.c:662
 msgid "Switch Modes"
 msgstr "Chuyển chế độ"
 
-#: ../panels/wacom/cc-wacom-page.c:724
-#: ../panels/wacom/cc-wacom-stylus-page.c:376
+#: ../panels/wacom/cc-wacom-page.c:752
+#: ../panels/wacom/cc-wacom-stylus-page.c:373
 msgid "Button"
 msgstr "Nút"
 
-#: ../panels/wacom/cc-wacom-page.c:777
+#: ../panels/wacom/cc-wacom-page.c:810
 msgid "Action"
 msgstr "HÃ nh Ä‘á»™ng"
 
-#: ../panels/wacom/cc-wacom-page.c:886
+#: ../panels/wacom/cc-wacom-page.c:920
 msgid "Display Mapping"
 msgstr "Hiện ánh xạ"
 
@@ -5019,8 +7115,8 @@ msgid "Wacom Tablet"
 msgstr "Tablet Wacom"
 
 #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2
-msgid "Set your Wacom tablet preferences"
-msgstr "Đặt tuỳ thích Tablet Wacom"
+msgid "Set button mappings and adjust stylus sensitivity for graphics tablets"
+msgstr ""
 
 #. Translators: those are keywords for the wacom tablet control-center panel
 #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4
@@ -5052,16 +7148,16 @@ msgid "Bluetooth Settings"
 msgstr "Thiết lập Bluetooth"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:8
-msgid "Map to Monitor..."
+#, fuzzy
+#| msgid "Map to Monitor..."
+msgid "Map to Monitor…"
 msgstr "Ánh xạ sang mà n hình..."
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:9
-msgid "Map Buttons..."
-msgstr "Ánh xạ nút..."
-
-#: ../panels/wacom/gnome-wacom-properties.ui.h:10
-msgid "Calibrate..."
-msgstr "Cân chỉnh..."
+#, fuzzy
+#| msgid "Map Buttons"
+msgid "Map Buttons…"
+msgstr "Ánh xạ nút"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:11
 msgid "Adjust display resolution"
@@ -5075,67 +7171,91 @@ msgstr "Chế độ rà "
 msgid "Left-Handed Orientation"
 msgstr "Hướng chuột thuận tay trái"
 
-#: ../panels/wacom/gsd-wacom-device.c:1010
+#. If no mode is available, we use "left-ring-mode-1" for backward compat
+#: ../panels/wacom/gsd-wacom-device.c:1076
+#, fuzzy
+#| msgid "Left Ring Mode #%d"
+msgid "Left Ring"
+msgstr "Chế độ vòng trái #%d"
+
+#: ../panels/wacom/gsd-wacom-device.c:1086
 #, c-format
 msgid "Left Ring Mode #%d"
 msgstr "Chế độ vòng trái #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1019
+#. If no mode is available, we use "right-ring-mode-1" for backward compat
+#: ../panels/wacom/gsd-wacom-device.c:1105
+#, fuzzy
+#| msgid "Right Ring Mode #%d"
+msgid "Right Ring"
+msgstr "Chế độ vòng phải #%d"
+
+#: ../panels/wacom/gsd-wacom-device.c:1115
 #, c-format
 msgid "Right Ring Mode #%d"
 msgstr "Chế độ vòng phải #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1049
+#. If no mode is available, we use "left-strip-mode-1" for backward compat
+#: ../panels/wacom/gsd-wacom-device.c:1156
+msgid "Left Touchstrip"
+msgstr ""
+
+#: ../panels/wacom/gsd-wacom-device.c:1166
 #, c-format
 msgid "Left Touchstrip Mode #%d"
 msgstr ""
 
-#: ../panels/wacom/gsd-wacom-device.c:1058
+#. If no mode is available, we use "right-strip-mode-1" for backward compat
+#: ../panels/wacom/gsd-wacom-device.c:1185
+msgid "Right Touchstrip"
+msgstr ""
+
+#: ../panels/wacom/gsd-wacom-device.c:1195
 #, c-format
 msgid "Right Touchstrip Mode #%d"
 msgstr ""
 
-#: ../panels/wacom/gsd-wacom-device.c:1075
+#: ../panels/wacom/gsd-wacom-device.c:1220
 #, c-format
 msgid "Left Touchring Mode Switch"
 msgstr ""
 
-#: ../panels/wacom/gsd-wacom-device.c:1077
+#: ../panels/wacom/gsd-wacom-device.c:1222
 #, c-format
 msgid "Right Touchring Mode Switch"
 msgstr ""
 
-#: ../panels/wacom/gsd-wacom-device.c:1080
+#: ../panels/wacom/gsd-wacom-device.c:1225
 #, c-format
 msgid "Left Touchstrip Mode Switch"
 msgstr ""
 
-#: ../panels/wacom/gsd-wacom-device.c:1082
+#: ../panels/wacom/gsd-wacom-device.c:1227
 #, c-format
 msgid "Right Touchstrip Mode Switch"
 msgstr ""
 
-#: ../panels/wacom/gsd-wacom-device.c:1087
+#: ../panels/wacom/gsd-wacom-device.c:1232
 #, c-format
 msgid "Mode Switch #%d"
 msgstr "Công tắc chế độ #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1159
+#: ../panels/wacom/gsd-wacom-device.c:1336
 #, c-format
 msgid "Left Button #%d"
 msgstr "Nút trái #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1162
+#: ../panels/wacom/gsd-wacom-device.c:1339
 #, c-format
 msgid "Right Button #%d"
 msgstr "Nút phải #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1165
+#: ../panels/wacom/gsd-wacom-device.c:1342
 #, c-format
 msgid "Top Button #%d"
 msgstr "Nút cao #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1168
+#: ../panels/wacom/gsd-wacom-device.c:1345
 #, c-format
 msgid "Bottom Button #%d"
 msgstr "Nút thấp #%d"
@@ -5208,28 +7328,42 @@ msgstr "Nút thấp"
 msgid "Tip Pressure Feel"
 msgstr "Cảm giác ấn ngón"
 
-#: ../shell/control-center.c:58
+#: ../shell/cc-application.c:67
 msgid "Enable verbose mode"
 msgstr "Bật chế độ chi tiết"
 
-#: ../shell/control-center.c:59
+#: ../shell/cc-application.c:68
 msgid "Show the overview"
 msgstr "Hiện tổng quan"
 
-#: ../shell/control-center.c:60 ../shell/control-center.c:61
-#: ../shell/control-center.c:62
+#: ../shell/cc-application.c:69
+msgid "Search for the string"
+msgstr ""
+
+#: ../shell/cc-application.c:70
+msgid "List possible panel names and exit"
+msgstr ""
+
+#: ../shell/cc-application.c:71 ../shell/cc-application.c:72
+#: ../shell/cc-application.c:73
 msgid "Show help options"
 msgstr "Hiển thị các tùy chọn trợ giúp"
 
-#: ../shell/control-center.c:63
+#: ../shell/cc-application.c:74
 msgid "Panel to display"
 msgstr "Khung hiển thị"
 
-#: ../shell/control-center.c:85
-msgid "- System Settings"
-msgstr "- Thiết lập hệ thống"
+#: ../shell/cc-application.c:74
+msgid "[PANEL] [ARGUMENT…]"
+msgstr ""
+
+#: ../shell/cc-application.c:116
+#, fuzzy
+#| msgid "All Settings"
+msgid "- Settings"
+msgstr "Tất cả thiết lập"
 
-#: ../shell/control-center.c:93
+#: ../shell/cc-application.c:124
 #, c-format
 msgid ""
 "%s\n"
@@ -5238,21 +7372,51 @@ msgstr ""
 "%s\n"
 "Chạy '%s --help' để xem danh sách tuỳ chọn dòng lệnh.\n"
 
-#: ../shell/control-center.c:211
+#: ../shell/cc-application.c:154
+#, fuzzy
+#| msgid "Available Profiles"
+msgid "Available panels:"
+msgstr "Các hồ sơ hiện có"
+
+#: ../shell/cc-application.c:273
 msgid "Help"
 msgstr "Trợ giúp"
 
-#: ../shell/control-center.c:212
+#: ../shell/cc-application.c:274
 msgid "Quit"
 msgstr "Thoát"
 
-#: ../shell/gnomecc.directory.in.h:1
-msgid "Control Center"
-msgstr "Trung tâm điều khiển"
+#: ../shell/cc-window.c:61 ../shell/gnome-control-center.desktop.in.in.h:1
+#, fuzzy
+#| msgid "_Settings..."
+msgid "Settings"
+msgstr "T_hiết lập..."
+
+#. Add categories
+#: ../shell/cc-window.c:845
+#, fuzzy
+#| msgid "Personal Info"
+msgctxt "category"
+msgid "Personal"
+msgstr "Thông tin cá nhân"
+
+#: ../shell/cc-window.c:846
+#, fuzzy
+#| msgid "Hardware"
+msgctxt "category"
+msgid "Hardware"
+msgstr "Phần cứng"
+
+#: ../shell/cc-window.c:847
+#, fuzzy
+#| msgid "System"
+msgctxt "category"
+msgid "System"
+msgstr "Hệ thống"
 
-#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/shell.ui.h:1
-msgid "System Settings"
-msgstr "Thiết lập hệ thống"
+#: ../shell/cc-window.c:1401
+msgid "All Settings"
+msgstr "Tất cả thiết lập"
 
 #: ../shell/gnome-control-center.desktop.in.in.h:2
 msgid "Preferences;Settings;"
@@ -5260,9 +7424,484 @@ msgstr ""
 "Preferences;Tuỳ;thích;Tuy;thich;Cấu;hình;Cau;hinh;Settings;Thiết;lập;Thiet;"
 "lap;Tuỳ;chọn;Tuy;chon;"
 
-#: ../shell/shell.ui.h:2
-msgid "All Settings"
-msgstr "Tất cả thiết lập"
+#~ msgid "Change the background"
+#~ msgstr "Đổi nền"
+
+#~ msgid "Configure Bluetooth settings"
+#~ msgstr "Cấu hình thiết lập Bluetooth"
+
+#~ msgid "Browse Files..."
+#~ msgstr "Duyệt tập tin..."
+
+#~ msgctxt "Power"
+#~ msgid "Bluetooth"
+#~ msgstr "Bluetooth"
+
+#~ msgid "Create virtual device"
+#~ msgstr "Tạo thiết bị ảo"
+
+#~ msgid "Available Profiles for Displays"
+#~ msgstr "Các hồ sơ thiết bị hiển thị hiện có"
+
+#~ msgid "Available Profiles for Scanners"
+#~ msgstr "Các hồ sơ máy quét hiện có"
+
+#~ msgid "Available Profiles for Printers"
+#~ msgstr "Các hồ sơ máy in hiện có"
+
+#~ msgid "Available Profiles for Cameras"
+#~ msgstr "Các hồ sơ máy chụp hình hiện có"
+
+#~ msgid "Available Profiles for Webcams"
+#~ msgstr "Các hồ sơ Webcam hiện có"
+
+#~ msgid "%i year"
+#~ msgid_plural "%i years"
+#~ msgstr[0] "%i năm"
+
+#~ msgid "%i month"
+#~ msgid_plural "%i months"
+#~ msgstr[0] "%i tháng"
+
+#~ msgid "%i week"
+#~ msgid_plural "%i weeks"
+#~ msgstr[0] "%i tuần"
+
+#~ msgid "Less than 1 week"
+#~ msgstr "Dưới một tuần"
+
+#~ msgid "This device is not color managed."
+#~ msgstr "Thiết bị nà y đang không được quản lý mà u."
+
+#~ msgid "This device is using manufacturing calibrated data."
+#~ msgstr "Thiết bị nà y đang sử dụng thông số cân chỉnh của nhà sản xuất."
+
+#~ msgid ""
+#~ "This device does not have a profile suitable for whole-screen color "
+#~ "correction."
+#~ msgstr ""
+#~ "Thiết bị nà y không có một hồ sơ phù hợp để điều chỉnh mà u cả mà n hình."
+
+#~ msgid "Not specified"
+#~ msgstr "Không xác định"
+
+#~ msgid "No devices supporting color management detected"
+#~ msgstr "Không tìm ra thiết bị hỗ trợ quản lý mà u sắc"
+
+#~ msgid "Add device"
+#~ msgstr "Thêm thiết bị"
+
+#~ msgid "Add a virtual device"
+#~ msgstr "Thêm một thiết bị ảo"
+
+#~ msgid "Remove a device"
+#~ msgstr "Xóa thiết bị"
+
+#~ msgid "Color management settings"
+#~ msgstr "Thiết lập quản lý mà u sắc"
+
+#~ msgid "English"
+#~ msgstr "Tiếng Anh"
+
+#~ msgid "British English"
+#~ msgstr "Tiếng Anh (British)"
+
+#~ msgid "German"
+#~ msgstr "Tiếng Đức"
+
+#~ msgid "French"
+#~ msgstr "Tiếng Pháp"
+
+#~ msgid "Spanish"
+#~ msgstr "Tiếng Tây Ban Nha"
+
+#~ msgid "Chinese (simplified)"
+#~ msgstr "Tiếng Trung Hoa (giản thể)"
+
+#~ msgid "Russian"
+#~ msgstr "Tiếng Nga"
+
+#~ msgid "Arabic"
+#~ msgstr "Tiếng Ả Rập"
+
+#~ msgid "Select a region"
+#~ msgstr "Chọn vùng"
+
+#~ msgid "Unspecified"
+#~ msgstr "Không xác định"
+
+#~ msgid "Select a language"
+#~ msgstr "Chọn ngôn ngữ"
+
+#~ msgid "_Select"
+#~ msgstr "_Chọn"
+
+#~ msgid "Date and Time preferences panel"
+#~ msgstr "Khung tuỳ thích ngà y giờ"
+
+#~ msgid "%d x %d (%s)"
+#~ msgstr "%d x %d (%s)"
+
+#~ msgid "%d x %d"
+#~ msgstr "%d x %d"
+
+#~ msgid "VESA: %s"
+#~ msgstr "VESA: %s"
+
+#~ msgid "Unknown model"
+#~ msgstr "Kiểu lạ"
+
+#~ msgid "The next login will attempt to use the standard experience."
+#~ msgstr "Dùng trải nghiệm mặc định cho lần đăng nhập tiếp theo."
+
+#~ msgid ""
+#~ "The next login will use the fallback mode intended for unsupported "
+#~ "graphics hardware."
+#~ msgstr ""
+#~ "Dùng chế độ dự phòng cho phần cứng không hỗ trợ trong lần đăng nhập tiếp "
+#~ "theo."
+
+#~ msgctxt "Experience"
+#~ msgid "Fallback"
+#~ msgstr "Dự phòng"
+
+#~ msgid "System Information"
+#~ msgstr "Thông tin hệ thống"
+
+#~ msgid "OS type"
+#~ msgstr "Kiểu OS"
+
+#~ msgid "_Other Media..."
+#~ msgstr "_Thiết bị lưu trữ khác..."
+
+#~ msgid "Experience"
+#~ msgstr "Trải nghiệm"
+
+#~ msgid "Forced _Fallback Mode"
+#~ msgstr "_Buộc chế độ dự phòng"
+
+#~ msgid "Change keyboard settings"
+#~ msgstr "Thay đổi thiết lập bà n phím"
+
+#~ msgid "Layout Settings"
+#~ msgstr "Thiết lập bố trí"
+
+#~ msgid "Set your mouse and touchpad preferences"
+#~ msgstr "Đặt tuỳ thích chuột và touchpad"
+
+#~ msgid "Network settings"
+#~ msgstr "Thiết lập mạng"
+
+#~ msgid "Network;Wireless;IP;LAN;Proxy;"
+#~ msgstr ""
+#~ "Network;Mạng;Mang;Wireless;Không;dây;Khong;day;IP;LAN;Proxy;Uỷ;nhiệm"
+
+#~ msgid "Out of range"
+#~ msgstr "Ngoà i vùng"
+
+#~ msgid "_Options..."
+#~ msgstr "_Tuỳ chọn..."
+
+#~ msgid "C_reate..."
+#~ msgstr "_Tạo..."
+
+#~ msgid "_Configure..."
+#~ msgstr "_Cấu hình..."
+
+#~ msgid "Wireless Hotspot"
+#~ msgstr "Điểm kết nối không dây"
+
+#~ msgid "Wireless"
+#~ msgstr "Không dây"
+
+#~ msgid "Security Key"
+#~ msgstr "Khóa an ninh"
+
+#~ msgid "Subnet Mask"
+#~ msgstr "Mặt nạ mạng"
+
+# Name: don't translate / Tên: đừng dịch
+#~ msgid "Wired"
+#~ msgstr "Có dây"
+
+#~ msgid "Mesh"
+#~ msgstr "LÆ°á»›i"
+
+#~ msgid "Disconnected"
+#~ msgstr "Bị ngắt"
+
+#~ msgid "Carrier/link changed"
+#~ msgstr "Carrier/link thay đổi"
+
+#~ msgid "Expired credentials. Please log in again."
+#~ msgstr "Giấy ủy nhiệm đã hết hạn. Xin hãy đăng nhập lại."
+
+#~ msgid "_Log In"
+#~ msgstr "Đăng _nhập"
+
+#~ msgid "Manage online accounts"
+#~ msgstr "Quản lý tà i khoản trực tuyến"
+
+#~ msgid "Caution low battery, %s remaining"
+#~ msgstr "Báo động pin ít, còn %s"
+
+#~ msgid "Using battery power - %s remaining"
+#~ msgstr "Sử dụng nguồn pin - còn %s"
+
+#~ msgid "Using battery power"
+#~ msgstr "Sử dụng nguồn pin"
+
+#~ msgid "Charging - fully charged"
+#~ msgstr "Đang sạc - đã đầy"
+
+#~ msgid "Using UPS power - %s remaining"
+#~ msgstr "Dùng nguồn UPS - còn %s"
+
+#~ msgid "Caution low UPS"
+#~ msgstr "Báo động UPS ít"
+
+#~ msgid "Using UPS power"
+#~ msgstr "Dùng nguồn UPS"
+
+#~ msgid "Your secondary battery is fully charged"
+#~ msgstr "Pin phụ đã sạc đầy"
+
+#~ msgid "Your secondary battery is empty"
+#~ msgstr "Pin phụ rỗng"
+
+#~ msgctxt "Battery power"
+#~ msgid "Charging - fully charged"
+#~ msgstr "Đang sạc - đã đầy"
+
+#~ msgid "Power management settings"
+#~ msgstr "Thiết lập quản lý năng lượng"
+
+#~ msgid "Don't suspend"
+#~ msgstr "Không tạm ngưng"
+
+#~ msgid "Suspend when inactive for"
+#~ msgstr "Tạm ngưng nếu không hoạt động trong"
+
+#~ msgctxt "printer state"
+#~ msgid "Paused"
+#~ msgstr "Tạm dừng"
+
+#~ msgid "Change printer settings"
+#~ msgstr "Thay đổi thiết lập máy in"
+
+#~ msgid "%s Options"
+#~ msgstr "Tùy chọn %s"
+
+#~ msgid "Manufacturers"
+#~ msgstr "Nhà sản xuất"
+
+#~ msgid "Drivers"
+#~ msgstr "Trình điều khiển"
+
+#~ msgid "_Show"
+#~ msgstr "_Hiện"
+
+#~ msgid "Change your region and language settings"
+#~ msgstr "Thay đổi thiết lập lãnh thổ và ngôn ngữ"
+
+#~ msgid "Choose an input source"
+#~ msgstr "Chọn nguồn nhập"
+
+#~ msgid "Select an input source to add"
+#~ msgstr "Chọn nguồn nhập cần thêm"
+
+#~ msgid ""
+#~ "The login screen, system accounts and new user accounts use the system-"
+#~ "wide Region and Language settings."
+#~ msgstr ""
+#~ "Mà n hình đăng nhập, các tà i khoản hệ thống và các tà i khoản mới sẽ sử "
+#~ "dụng thiết lập hệ thống \"Lãnh thổ và Ngôn ngữ\"."
+
+#~ msgid ""
+#~ "The login screen, system accounts and new user accounts use the system-"
+#~ "wide Region and Language settings. You may change the system settings to "
+#~ "match yours."
+#~ msgstr ""
+#~ "Mà n hình đăng nhập, các tà i khoản hệ thống và các tà i khoản mới sẽ sử "
+#~ "dụng thiết lập hệ thống \"Lãnh thổ và Ngôn ngữ\". Bạn có thể sửa sao cho "
+#~ "thiết lập hệ thống giống với thiết lập của bạn."
+
+#~ msgid "Copy Settings"
+#~ msgstr "Chép thiết lập"
+
+#~ msgid "Copy Settings..."
+#~ msgstr "Chép các thiết lập..."
+
+#~ msgid "Region and Language"
+#~ msgstr "Lãnh thổ và ngôn ngữ"
+
+#~ msgid ""
+#~ "Select a display language (change will be applied next time you log in)"
+#~ msgstr "Chọn ngôn ngữ (áp dụng cho lần đăng nhập kế tiếp)"
+
+#~ msgid "Add Language"
+#~ msgstr "Thêm ngôn ngữ"
+
+#~ msgid "Remove Language"
+#~ msgstr "Bỏ ngôn ngữ"
+
+#~ msgid "Install languages..."
+#~ msgstr "Cà i đặt ngôn ngữ..."
+
+#~ msgid "Select a region (change will be applied the next time you log in)"
+#~ msgstr "Chọn vùng (áp dụng cho lần đăng nhập kế tiếp)"
+
+#~ msgid "Add Region"
+#~ msgstr "Thêm vùng"
+
+#~ msgid "Currency"
+#~ msgstr "Đơn vị tiền tệ"
+
+#~ msgid "Examples"
+#~ msgstr "Ví dụ"
+
+#~ msgid "Select keyboards or other input sources"
+#~ msgstr "Chọn bà n phím và nguồn nhập khác"
+
+#~ msgid "Remove Input Source"
+#~ msgstr "Bỏ nguồn nhập"
+
+#~ msgid "Move Input Source Up"
+#~ msgstr "Chuyển nguồn nhập lên trên"
+
+#~ msgid "Show Keyboard Layout"
+#~ msgstr "Hiện bố trí bà n phím"
+
+#~ msgid "Ctrl+Alt+Space"
+#~ msgstr "Ctrl+Alt+<khoảng trắng>"
+
+#~ msgid "Shortcut Settings"
+#~ msgstr "Thiết lập phím tắt"
+
+#~ msgid "Display language:"
+#~ msgstr "Ngôn ngữ hiển thị:"
+
+#~ msgid "Input source:"
+#~ msgstr "Thiết bị nhập:"
+
+#~ msgid "Format:"
+#~ msgstr "Định dạng:"
+
+#~ msgid "Your settings"
+#~ msgstr "Thiết lập của bạn"
+
+#~ msgid "System settings"
+#~ msgstr "Thiết lập hệ thống"
+
+#~ msgid "Brightness & Lock"
+#~ msgstr "Khoá và độ sáng"
+
+#~ msgid "Screen brightness and lock settings"
+#~ msgstr "Thiết lập khoá và độ sáng mà n hình"
+
+#~ msgid "Brightness;Lock;Dim;Blank;Monitor;"
+#~ msgstr ""
+#~ "Brightness;Độ;sáng;Sang;Lock;Khoá;Khoa;Dim;Mờ;Blank;Trắng;Trang;Monitor;"
+#~ "Mà n;hình;Man;hinh;"
+
+#~ msgid "_Dim screen to save power"
+#~ msgstr "Là m _tối mà n hình để tiết kiệm năng lượng"
+
+#~ msgid "Don't lock when at home"
+#~ msgstr "Không khoá khi ở nhà "
+
+#~ msgid "Locations..."
+#~ msgstr "Vị trí..."
+
+#~ msgid "Lock"
+#~ msgstr "Khoá"
+
+#~ msgid "Enable debugging code"
+#~ msgstr "Bật mã gỡ lỗi"
+
+#~ msgid "Version of this application"
+#~ msgstr "Phiên bản ứng dụng nà y"
+
+#~ msgid " — GNOME Volume Control Applet"
+#~ msgstr " - Applet Điều khiển Âm lượng GNOME"
+
+#~ msgid "Show desktop volume control"
+#~ msgstr "Hiện điều khiển âm lượng"
+
+#~ msgid "Sound Output Volume"
+#~ msgstr "Âm lượng đầu ra"
+
+#~ msgid "Microphone Volume"
+#~ msgstr "Âm lượng micrô"
+
+#~ msgid "Failed to start Sound Preferences: %s"
+#~ msgstr "Lỗi khởi động Tuỳ thích Âm thanh: %s"
+
+#~ msgid "_Mute"
+#~ msgstr "_Tắt"
+
+#~ msgid "_Sound Preferences"
+#~ msgstr "Tuỳ thích Â_m thanh"
+
+#~ msgid "Muted"
+#~ msgstr "Đã tắt"
+
+#~ msgid "Universal Access Preferences"
+#~ msgstr "Tuỳ thích hỗ trợ truy cập"
+
+#~ msgid "Options..."
+#~ msgstr "Tùy chọn..."
+
+#~ msgctxt "Zoom Grayscale"
+#~ msgid "Color"
+#~ msgstr "Mà u sắc"
+
+#~ msgctxt "Zoom Grayscale"
+#~ msgid "None"
+#~ msgstr "Không"
+
+#~ msgid "User Accounts"
+#~ msgstr "Tà i khoản người dùng"
+
+#~ msgid "_Hint"
+#~ msgstr "_Gợi ý"
+
+#~ msgid ""
+#~ "This hint may be displayed at the login screen.  It will be visible to "
+#~ "all users of this system.  Do <b>not</b> include the password here."
+#~ msgstr ""
+#~ "Gợi ý nà y sẽ được hiện ở mà n hình đăng nhập và mọi người đều có thể nhìn "
+#~ "thấy. Xin <b>đừng để lộ mật khẩu</b> của bạn ở đây."
+
+#~ msgid "Fair"
+#~ msgstr "Được"
+
+#~ msgid "Browse for more pictures..."
+#~ msgstr "Duyệt thêm ảnh..."
+
+#~ msgid "No user with the name '%s' exists."
+#~ msgstr "Không có người dùng tên '%s'."
+
+#~ msgid "This user does not exist."
+#~ msgstr "Người dùng không tồn tại."
+
+#~ msgid "Set your Wacom tablet preferences"
+#~ msgstr "Đặt tuỳ thích Tablet Wacom"
+
+#~ msgid "Map Buttons..."
+#~ msgstr "Ánh xạ nút..."
+
+#~ msgid "Calibrate..."
+#~ msgstr "Cân chỉnh..."
+
+#~ msgid "- System Settings"
+#~ msgstr "- Thiết lập hệ thống"
+
+#~ msgid "Control Center"
+#~ msgstr "Trung tâm điều khiển"
+
+#~ msgid "System Settings"
+#~ msgstr "Thiết lập hệ thống"
 
 #~ msgid "A_ddress:"
 #~ msgstr "Đị_a chỉ:"
@@ -5273,9 +7912,6 @@ msgstr "Tất cả thiết lập"
 #~ msgid "Getting devices..."
 #~ msgstr "Đang lấy thiết bị..."
 
-#~ msgid "No local printers found"
-#~ msgstr "Không tìm thấy máy in cục bộ"
-
 #~ msgid ""
 #~ "FirewallD is not running. Network printer detection needs services mdns, "
 #~ "ipp, ipp-client and samba-client enabled on firewall."
@@ -5283,9 +7919,6 @@ msgstr "Tất cả thiết lập"
 #~ "FirewallD không hoạt động. Việc nhận dạng máy in mạng yêu cầu tường lửa "
 #~ "phải cho phép các dịch vụ mdns, ipp, ipp-client và samba-client."
 
-#~ msgid "Devices"
-#~ msgstr "Thiết bị"
-
 #~ msgctxt "printer type"
 #~ msgid "Local"
 #~ msgstr "Cục bộ"
@@ -5342,9 +7975,6 @@ msgstr "Tất cả thiết lập"
 #~ msgid "Solid Color"
 #~ msgstr "Mà u đặc"
 
-#~ msgid "Pictures Folder"
-#~ msgstr "Thư mục ảnh"
-
 #~ msgid "Colors & Gradients"
 #~ msgstr "Mà u và dốc"
 
@@ -5399,19 +8029,10 @@ msgstr "Tất cả thiết lập"
 #~ msgid "_Edge scrolling"
 #~ msgstr "_Cuộn mép"
 
-#~ msgid "Enable h_orizontal scrolling"
-#~ msgstr "Bật cuộn _ngang"
-
 #~ msgctxt "Wireless access point"
 #~ msgid "Other..."
 #~ msgstr "Khác..."
 
-#~ msgid "Hotspot"
-#~ msgstr "Điểm truy cập không dây"
-
-#~ msgid "Not connected to the internet."
-#~ msgstr "Chưa kết nối Internet."
-
 #~ msgid "Create the hotspot anyway?"
 #~ msgstr "Tiếp tục tạo điểm truy cập?"
 
@@ -5424,9 +8045,6 @@ msgstr "Tất cả thiết lập"
 #~ msgid "Create _Hotspot"
 #~ msgstr "Tạo điểm truy _cập"
 
-#~ msgid "Device Off"
-#~ msgstr "Thiết bị tắt"
-
 #~ msgid "_Network Name"
 #~ msgstr "Tên _mạng"
 
@@ -5445,27 +8063,15 @@ msgstr "Tất cả thiết lập"
 #~ msgid "FTP Port"
 #~ msgstr "Cổng FTP"
 
-#~ msgid "Socks Port"
-#~ msgstr "Cổng Socks"
-
 #~ msgid "_Back"
 #~ msgstr "_Quay lại"
 
 #~ msgid "Add User"
 #~ msgstr "Thêm người dùng"
 
-#~ msgid "Remove User"
-#~ msgstr "Bỏ người dùng"
-
 #~ msgid "Allowed users"
 #~ msgstr "Người dùng được phép"
 
-#~ msgid "Co_nnector:"
-#~ msgstr "Đầu _nối:"
-
-#~ msgid "Hardware"
-#~ msgstr "Phần cứng"
-
 #~ msgid "C_hoose a device to configure:"
 #~ msgstr "_Chọn thiết bị để cấu hình:"
 
@@ -5491,33 +8097,15 @@ msgstr "Tất cả thiết lập"
 #~ msgid "affect how much power is used"
 #~ msgstr "tác động lượng nguồn tiêu thụ"
 
-#~ msgid "Choose a Layout"
-#~ msgstr "Chọn bố trí"
-
-#~ msgid "Preview"
-#~ msgstr "Xem thá»­"
-
 #~ msgid "Add Layout"
 #~ msgstr "Thêm bố trí"
 
 #~ msgid "Remove Layout"
 #~ msgstr "Bỏ bố trí"
 
-#~ msgid "Move Up"
-#~ msgstr "Chuyển lên"
-
-#~ msgid "Move Down"
-#~ msgstr "Chuyển xuống"
-
 #~ msgid "Preview Layout"
 #~ msgstr "Xem thử bố trí"
 
-#~ msgid "Use the same layout for all windows"
-#~ msgstr "Sử dụng một kiểu bố trí cho mọi cửa sổ"
-
-#~ msgid "Allow different layouts for individual windows"
-#~ msgstr "Cho phép mỗi cửa sổ sử dụng một kiểu bố trí bà n phím riêng"
-
 #~ msgid "New windows use the default layout"
 #~ msgstr "Cửa sổ mới dùng kiểu bố trí bà n phím mặc định"
 
@@ -5594,10 +8182,6 @@ msgstr "Tất cả thiết lập"
 #~ msgid "Wacom Graphics Tablet"
 #~ msgstr "Tablet đồ hoạ Wacom"
 
-#~| msgid "_Sound Settings"
-#~ msgid "Screen Settings"
-#~ msgstr "Thiết lập mà n hình"
-
 #~ msgid "Could not get session bus while applying display configuration"
 #~ msgstr "Không thể lấy session bus khi áp dụng cấu hình thiết bị hiển thị"
 
@@ -5658,9 +8242,6 @@ msgstr "Tất cả thiết lập"
 #~ msgid "Battery discharging"
 #~ msgstr "Pin đang xả"
 
-#~ msgid "UPS discharging"
-#~ msgstr "UPS đang xả"
-
 #~ msgid "%s until charged (%.0lf%%)"
 #~ msgstr "%s đến khi sạc đầy (%.0lf%%)"
 
@@ -5830,10 +8411,6 @@ msgstr "Tất cả thiết lập"
 #~ "Chính sách hệ thống không cho phép thay đổi.\n"
 #~ "Hãy liên lạc với quản trị hệ thống"
 
-#~ msgid "%u byte"
-#~ msgid_plural "%u bytes"
-#~ msgstr[0] "%u byte"
-
 #~ msgid "%.1f KB"
 #~ msgstr "%.1f KB"
 
@@ -5921,12 +8498,6 @@ msgstr "Tất cả thiết lập"
 #~ msgid "2010"
 #~ msgstr "2010"
 
-#~ msgid "22"
-#~ msgstr "22"
-
-#~ msgid "45"
-#~ msgstr "45"
-
 #~ msgid "AM"
 #~ msgstr "AM"
 
@@ -5954,12 +8525,6 @@ msgstr "Tất cả thiết lập"
 #~ msgid "Preparing connection"
 #~ msgstr "Đang chuẩn bị kết nối"
 
-#~ msgid "Configuring connection"
-#~ msgstr "Đang cấu hình kết nối"
-
-#~ msgid "Authenticating"
-#~ msgstr "Đang xác thực"
-
 #~ msgid "Getting network address"
 #~ msgstr "Đang lấy địa chỉ mạng"
 
@@ -6184,9 +8749,6 @@ msgstr "Tất cả thiết lập"
 #~ msgid "_Trigger secondary click by holding down the primary button"
 #~ msgstr "_Gây ra cú nhấn phụ bằng cách ấn giữ cái nút chính"
 
-#~ msgid "%i Gb/s"
-#~ msgstr "%i Gb/s"
-
 #~ msgid "%i kb/s"
 #~ msgstr "%i kb/s"
 
@@ -6205,9 +8767,6 @@ msgstr "Tất cả thiết lập"
 #~ msgid "LowContrast"
 #~ msgstr "Tương phản thấp"
 
-#~ msgid "On"
-#~ msgstr "Bật"
-
 #~ msgid "Shift+Ctrl+Alt+-"
 #~ msgstr "Shift+Ctrl+Alt+-"
 
@@ -6389,9 +8948,6 @@ msgstr "Tất cả thiết lập"
 #~ msgid "Disable _Fingerprint Login..."
 #~ msgstr "Tắt Đăng nhập _Vân tay..."
 
-#~ msgid "Set your personal information"
-#~ msgstr "Lập thông tin cá nhân"
-
 #~ msgid "Swipe finger on reader"
 #~ msgstr "Kéo ngón tay qua trên máy đọc"
 
@@ -6471,16 +9027,10 @@ msgstr "Tất cả thiết lập"
 #~ msgid "P._O. box:"
 #~ msgstr "_Hộp bưu điện:"
 
-#~ msgid "Personal Info"
-#~ msgstr "Thông tin cá nhân"
-
 #~ msgid ""
 #~ "Please type your password again in the <b>Retype new password</b> field."
 #~ msgstr "Hãy gõ lại mật khẩu và o trường <b>Gõ lại mật khẩu mới</b>."
 
-#~ msgid "Select your photo"
-#~ msgstr "Chọn ảnh chụp"
-
 #~ msgid "State/Pro_vince:"
 #~ msgstr "_Tỉnh/Huyện:"
 
@@ -6641,9 +9191,6 @@ msgstr "Tất cả thiết lập"
 #~ msgid "Specify the filename of a theme to install"
 #~ msgstr "Chưa xác định tên tập tin sắc thái cần cà i đặt"
 
-#~ msgid "filename"
-#~ msgstr "tên-tập-tin"
-
 #~ msgid ""
 #~ "Specify the name of the page to show (theme|background|fonts|interface)"
 #~ msgstr ""
@@ -6765,9 +9312,6 @@ msgstr "Tất cả thiết lập"
 #~ msgid "R_esolution:"
 #~ msgstr "Độ _phân giải:"
 
-#~ msgid "Save File"
-#~ msgstr "Lưu tập tin"
-
 #~ msgid "Save Theme As..."
 #~ msgstr "Lưu mới Sắc thái..."
 
@@ -6831,9 +9375,6 @@ msgstr "Tất cả thiết lập"
 #~ msgid "_BGR"
 #~ msgstr "_BGR"
 
-#~ msgid "_Copy"
-#~ msgstr "_Chép"
-
 #~ msgid "_Description:"
 #~ msgstr "_Mô tả:"
 
@@ -6846,9 +9387,6 @@ msgstr "Tất cả thiết lập"
 #~ msgid "_Fixed width font:"
 #~ msgstr "Phông chữ _rộng cố định:"
 
-#~ msgid "_Medium"
-#~ msgstr "Trung _bình"
-
 #~ msgid "_Monochrome"
 #~ msgstr "Đơ_n sắc"
 
@@ -6983,9 +9521,6 @@ msgstr "Tất cả thiết lập"
 #~ msgid "Would you like to delete this theme?"
 #~ msgstr "Bạn có muốn xoá sắc thái nà y không?"
 
-#~ msgid "Theme cannot be deleted"
-#~ msgstr "Sắc thái không xóa được"
-
 #~ msgid "Could not install theme engine"
 #~ msgstr "Không thể cà i đặt cơ chế sắc thái"
 
@@ -7076,9 +9611,6 @@ msgstr "Tất cả thiết lập"
 #~ msgid "Large White Pointer - Current"
 #~ msgstr "Con trỏ trắng lớn — hiện thời"
 
-#~ msgid "Large White Pointer"
-#~ msgstr "Con trỏ trắng lớn"
-
 #~ msgid ""
 #~ "This theme will not look as intended because the required GTK+ theme '%s' "
 #~ "is not installed."
@@ -7237,9 +9769,6 @@ msgstr "Tất cả thiết lập"
 #~ msgid "_Detect Monitors"
 #~ msgstr "_Dò tìm mà n hình"
 
-#~ msgid "_Show displays in panel"
-#~ msgstr "_Hiện các mà n hình trên Bảng"
-
 #~ msgid "Change screen resolution"
 #~ msgstr "Thay đổi độ phân giải mà n hình"
 
@@ -7413,24 +9942,15 @@ msgstr "Tất cả thiết lập"
 #~ msgid "<b>_Manual proxy configuration</b>"
 #~ msgstr "<b>_Tự cấu hình ủy nhiệm</b>"
 
-#~ msgid "<b>_Use authentication</b>"
-#~ msgstr "<b>_Sử dụng xác thực</b>"
-
 #~ msgid "HTTP Proxy Details"
 #~ msgstr "Chi tiết ủy nhiệm HTTP"
 
-#~ msgid "Ignored Hosts"
-#~ msgstr "Máy đã bỏ qua"
-
 #~ msgid "Network Proxy Preferences"
 #~ msgstr "Tùy thích máy phục vụ ủy nhiệm mạng"
 
 #~ msgid "U_sername:"
 #~ msgstr "Tên _người dùng:"
 
-#~ msgid "_Delete Location"
-#~ msgstr "_Xoá vị trí"
-
 #~ msgid "_Use the same proxy for all protocols"
 #~ msgstr "_Dùng cùng uỷ nhiệm mạng cho mọi giao thức"
 
@@ -7521,15 +10041,9 @@ msgstr "Tất cả thiết lập"
 #~ msgid "New Document"
 #~ msgstr "Tà i liệu mới"
 
-#~ msgid "Home"
-#~ msgstr "Nhà "
-
 #~ msgid "Documents"
 #~ msgstr "Tà i liệu"
 
-#~ msgid "File System"
-#~ msgstr "Hệ thống Tập tin"
-
 #~ msgid "<b>Open</b>"
 #~ msgstr "<b>Mở</b>"
 
@@ -7560,9 +10074,6 @@ msgstr "Tất cả thiết lập"
 #~ msgid "Today %l:%M %p"
 #~ msgstr "Hôm nay %l:%M %p"
 
-#~ msgid "Yesterday %l:%M %p"
-#~ msgstr "Hôm qua %l:%M %p"
-
 #~ msgid "%b %d %l:%M %p"
 #~ msgstr "%b %d %l:%M %p"