[gnome-control-center/gnome-3-8] Updated British English translation



commit 3322ff1af1e8cfd166f9be5143f1298f05c1a46b
Author: Bruce Cowan <bruce bcowan me uk>
Date:   Tue Mar 5 20:08:13 2013 +0000

    Updated British English translation

 po/en_GB.po | 5510 ++++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 3733 insertions(+), 1777 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 22c3265..53db28b 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,15 +2,15 @@
 # Copyright (C) 1999 Free Software Foundation, Inc.
 # Robert Brady <rwb197 ecs soton ac uk>
 # Gareth Owen <gowen72 yahoo com>, David Lodge <dave cirt net>, 2004.
-# Bruce Cowan <bruce bcowan me uk>, 2009, 2010, 2011, 2012.
+# Bruce Cowan <bruce bcowan me uk>, 2009, 2010, 2011, 2012, 2013.
 # Philip Withnall <philip tecnocode co uk>, 2010.
 # Chris Leonard <cjl laptop org>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-22 11:21+0100\n"
-"PO-Revision-Date: 2012-09-22 11:22+0100\n"
+"POT-Creation-Date: 2013-03-05 19:52+0000\n"
+"PO-Revision-Date: 2013-03-05 20:07+0100\n"
 "Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
 "Language-Team: British English <en li org>\n"
 "Language: en_GB\n"
@@ -84,22 +84,22 @@ msgstr "Flickr"
 msgid "Select"
 msgstr "Select"
 
-#: ../panels/background/cc-background-item.c:148
+#: ../panels/background/cc-background-item.c:150
 msgid "multiple sizes"
 msgstr "multiple sizes"
 
 #. 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 "No Desktop Background"
 
-#: ../panels/background/cc-background-panel.c:387
+#: ../panels/background/cc-background-panel.c:453
 msgid "Current background"
 msgstr "Current background"
 
@@ -108,24 +108,14 @@ msgid "Background"
 msgstr "Background"
 
 #: ../panels/background/gnome-background-panel.desktop.in.in.h:2
-msgid "Change the background"
-msgstr "Change the background"
+msgid "Change your background image to a wallpaper or photo"
+msgstr "Change your background image to a wallpaper or photo"
 
 #. 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;Screen;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 "Configure Bluetooth settings"
-
 #: ../panels/bluetooth/bluetooth.ui.h:1
 msgid "Set Up New Device"
 msgstr "Set Up New Device"
@@ -139,185 +129,289 @@ msgid "Connection"
 msgstr "Connection"
 
 #: ../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 "page 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 "page 2"
+
+#: ../panels/bluetooth/bluetooth.ui.h:6
 msgid "Paired"
 msgstr "Paired"
 
-#: ../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 "Type"
 
-#: ../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 "Address"
 
-#: ../panels/bluetooth/bluetooth.ui.h:7
-msgid "Mouse and Touchpad Settings"
-msgstr "Mouse and Touchpad Settings"
+#: ../panels/bluetooth/bluetooth.ui.h:9
+msgid "Mouse & Touchpad Settings"
+msgstr "Mouse & Touchpad Settings"
 
-#: ../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 "Sound Settings"
 
-#: ../panels/bluetooth/bluetooth.ui.h:9
+#: ../panels/bluetooth/bluetooth.ui.h:11
 msgid "Keyboard Settings"
 msgstr "Keyboard Settings"
 
-#: ../panels/bluetooth/bluetooth.ui.h:10
-msgid "Send Files..."
+#: ../panels/bluetooth/bluetooth.ui.h:12
+msgid "Send Files…"
 msgstr "Send Files…"
 
-#: ../panels/bluetooth/bluetooth.ui.h:11
-msgid "Browse Files..."
-msgstr "Browse Files…"
-
-#. 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 "Yes"
 
-#: ../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 "No"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:405
+#: ../panels/bluetooth/cc-bluetooth-panel.c:469
 msgid "Bluetooth is disabled"
 msgstr "Bluetooth is disabled"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:410
+#: ../panels/bluetooth/cc-bluetooth-panel.c:474
 msgid "Bluetooth is disabled by hardware switch"
 msgstr "Bluetooth is disabled by hardware switch"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:414
+#: ../panels/bluetooth/cc-bluetooth-panel.c:478
 msgid "No Bluetooth adapters found"
 msgstr "No Bluetooth adapters found"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:547
+#: ../panels/bluetooth/cc-bluetooth-panel.c:577
 msgid "Visibility"
 msgstr "Visibility"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:551
+#: ../panels/bluetooth/cc-bluetooth-panel.c:581
 #, c-format
 msgid "Visibility of “%s”"
 msgstr "Visibility of “%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 "Remove '%s' from the list of devices?"
 
-#: ../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 ""
 "If you remove the device, you will have to set it up again before next use."
 
-#. TRANSLATORS: this is where the user can click and import a profile
-#: ../panels/color/cc-color-panel.c:106
-msgid "Other profile…"
-msgstr "Other profile…"
+#: ../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 "Turn Bluetooth on and off and connect your devices"
+
+#. 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 "Place your calibration device over the square and press 'Start'"
+
+#. 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 ""
+"Move your calibration device to the calibrate position and press 'Continue'"
+
+#. 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 ""
+"Move your calibration device to the surface position and press 'Continue'"
+
+#. 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 "Shut the laptop lid"
+
+#. TRANSLATORS: We suck, the calibation failed and we have no
+#. * good idea why or any suggestions
+#: ../panels/color/cc-color-calibrate.c:409
+msgid "An internal error occurred that could not be recovered."
+msgstr "An internal error occurred that could not be recovered."
+
+#. 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 "Tools required for calibration are not installed."
+
+#. TRANSLATORS: The profile failed for some reason
+#: ../panels/color/cc-color-calibrate.c:420
+msgid "The profile could not be generated."
+msgstr "The profile could not be generated."
+
+#. 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 "The target whitepoint was not obtainable."
+
+#. TRANSLATORS: the display calibration process is finished
+#: ../panels/color/cc-color-calibrate.c:466
+msgid "Complete!"
+msgstr "Complete!"
+
+#. TRANSLATORS: the display calibration failed, and we also show
+#. * the translated (or untranslated) error string after this
+#: ../panels/color/cc-color-calibrate.c:474
+msgid "Calibration failed!"
+msgstr "Calibration failed!"
+
+#. 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 "You can remove the calibration device."
+
+#. 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 "Do not disturb the calibration device while in progress"
+
+#. TRANSLATORS: This refers to the TFT display on a laptop
+#: ../panels/color/cc-color-common.c:41
+msgid "Laptop Screen"
+msgstr "Laptop Screen"
+
+#. TRANSLATORS: This refers to the embedded webcam on a laptop
+#: ../panels/color/cc-color-common.c:50
+msgid "Built-in Webcam"
+msgstr "Built-in Webcam"
+
+#. 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
+#, c-format
+msgid "%s Monitor"
+msgstr "%s Monitor"
+
+#. TRANSLATORS: a flatbed scanner device, e.g. 'Epson Scanner'
+#: ../panels/color/cc-color-common.c:69
+#, c-format
+msgid "%s Scanner"
+msgstr "%s Scanner"
+
+#. TRANSLATORS: a camera device, e.g. 'Nikon D60 Camera'
+#: ../panels/color/cc-color-common.c:73
+#, c-format
+msgid "%s Camera"
+msgstr "%s Camera"
+
+#. TRANSLATORS: a printer device, e.g. 'Epson Photosmart Printer'
+#: ../panels/color/cc-color-common.c:77
+#, c-format
+msgid "%s Printer"
+msgstr "%s Printer"
+
+#. TRANSLATORS: a webcam device, e.g. 'Philips HiDef Camera'
+#: ../panels/color/cc-color-common.c:81
+#, c-format
+msgid "%s Webcam"
+msgstr "%s Webcam"
+
+#: ../panels/color/cc-color-device.c:89
+#, c-format
+msgid "Enable color management for %s"
+msgstr "Enable colour management for %s"
+
+#: ../panels/color/cc-color-device.c:93
+#, c-format
+msgid "Show color profiles for %s"
+msgstr "Show colour profiles for %s"
+
+#. not calibrated
+#: ../panels/color/cc-color-device.c:322
+msgid "Not calibrated"
+msgstr "Not calibrated"
 
 #. 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 "Default: "
 
 #. 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 "Colourspace: "
 
 #. 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 "Test profile: "
 
-#. 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 "Set for all users"
-
-#. TRANSLATORS: this is when the profile should be set for all users
-#: ../panels/color/cc-color-panel.c:192
-msgid "Create virtual device"
-msgstr "Create virtual device"
-
 #. 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 "Select ICC Profile File"
 
-#: ../panels/color/cc-color-panel.c:230
+#: ../panels/color/cc-color-panel.c:219
 msgid "_Import"
 msgstr "_Import"
 
 #. 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 "Supported ICC profiles"
 
 #. 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 "All files"
 
-#. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#: ../panels/color/cc-color-panel.c:522
-msgid "Available Profiles for Displays"
-msgstr "Available Profiles for Displays"
-
-#. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#: ../panels/color/cc-color-panel.c:526
-msgid "Available Profiles for Scanners"
-msgstr "Available Profiles for Scanners"
-
-#. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#: ../panels/color/cc-color-panel.c:530
-msgid "Available Profiles for Printers"
-msgstr "Available Profiles for Printers"
-
-#. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#: ../panels/color/cc-color-panel.c:534
-msgid "Available Profiles for Cameras"
-msgstr "Available Profiles for Cameras"
-
-#. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#: ../panels/color/cc-color-panel.c:538
-msgid "Available Profiles for Webcams"
-msgstr "Available Profiles for Webcams"
-
-#. 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 "Available Profiles"
-
-#. TRANSLATORS: column for device list
-#: ../panels/color/cc-color-panel.c:824
-#: ../panels/sound/gvc-mixer-dialog.c:1525
-msgid "Device"
-msgstr "Device"
+#: ../panels/color/cc-color-panel.c:581
+msgid "Screen"
+msgstr "Screen"
 
-#. TRANSLATORS: column for device list
-#: ../panels/color/cc-color-panel.c:859
-msgid "Calibration"
-msgstr "Calibration"
+#. TRANSLATORS: this is the dialog to save the ICC profile
+#: ../panels/color/cc-color-panel.c:853
+msgid "Save Profile"
+msgstr "Save Profile"
 
 #. 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 "Create a colour profile for the selected device"
 
 #. 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,291 +420,535 @@ msgstr ""
 "correctly connected."
 
 #. 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 "The measuring instrument does not support printer profiling."
 
 #. 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 "The device type is not currently supported."
 
-#. 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 "Cannot remove automatically added profile"
-
-#. TRANSLATORS: this is when there is no profile for the device
-#: ../panels/color/cc-color-panel.c:1359
-msgid "No profile"
-msgstr "No profile"
-
-#: ../panels/color/cc-color-panel.c:1390
-#, c-format
-msgid "%i year"
-msgid_plural "%i years"
-msgstr[0] "%i year"
-msgstr[1] "%i years"
-
-#: ../panels/color/cc-color-panel.c:1401
-#, c-format
-msgid "%i month"
-msgid_plural "%i months"
-msgstr[0] "%i month"
-msgstr[1] "%i months"
-
-#: ../panels/color/cc-color-panel.c:1412
-#, c-format
-msgid "%i week"
-msgid_plural "%i weeks"
-msgstr[0] "%i week"
-msgstr[1] "%i weeks"
-
-#. fallback
-#: ../panels/color/cc-color-panel.c:1419
-#, c-format
-msgid "Less than 1 week"
-msgstr "Less than 1 week"
+#. TRANSLATORS: standard spaces are well known colorspaces like
+#. * sRGB, AdobeRGB and ProPhotoRGB
+#: ../panels/color/cc-color-profile.c:101
+msgid "Standard Space"
+msgstr "Standard Space"
+
+#. 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
+msgid "Test Profile"
+msgstr "Test Profile"
+
+#. 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
+msgctxt "Automatically generated profile"
+msgid "Automatic"
+msgstr "Automatic"
 
-#: ../panels/color/cc-color-panel.c:1481
+#. 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
+msgctxt "Profile quality"
+msgid "Low Quality"
+msgstr "Low Quality"
+
+#. TRANSLATORS: the profile quality
+#: ../panels/color/cc-color-profile.c:130
+msgctxt "Profile quality"
+msgid "Medium Quality"
+msgstr "Medium Quality"
+
+#. 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
+msgctxt "Profile quality"
+msgid "High Quality"
+msgstr "High Quality"
+
+#. 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 "Default RGB"
 
-#: ../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 "Default CMYK"
 
-#: ../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 "Default Grey"
 
-#: ../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 "Uncalibrated"
+#: ../panels/color/cc-color-profile.c:192
+msgid "Vendor supplied factory calibration data"
+msgstr "Vendor supplied factory calibration data"
+
+#: ../panels/color/cc-color-profile.c:201
+msgid "Full-screen display correction not possible with this profile"
+msgstr "Full-screen display correction not possible with this profile"
+
+#: ../panels/color/cc-color-profile.c:223
+msgid "This profile may no longer be accurate"
+msgstr "This profile may no longer be accurate"
+
+#: ../panels/color/color-calibrate.ui.h:1
+msgid "Display Calibration"
+msgstr "Display Calibration"
+
+#: ../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 "Cancel"
+
+#. This starts the calibration process
+#: ../panels/color/color-calibrate.ui.h:4
+msgid "Start"
+msgstr "Start"
 
-#: ../panels/color/cc-color-panel.c:1612
-msgid "This device is not color managed."
-msgstr "This device is not colour managed."
+#. This resumes the calibration process
+#: ../panels/color/color-calibrate.ui.h:6
+msgid "Resume"
+msgstr "Resume"
 
-#: ../panels/color/cc-color-panel.c:1653
-msgid "This device is using manufacturing calibrated data."
-msgstr "This device is using manufacturing calibrated data."
+#. This button returns the user back to the color control panel
+#: ../panels/color/color-calibrate.ui.h:8
+msgid "Done"
+msgstr "Done"
+
+#. Text printed on screen
+#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/gui_gtk.c:78
+msgid "Screen Calibration"
+msgstr "Screen Calibration"
 
-#: ../panels/color/cc-color-panel.c:1664
+#: ../panels/color/color.ui.h:2
 msgid ""
-"This device does not have a profile suitable for whole-screen color "
-"correction."
+"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 ""
-"This device does not have a profile suitable for whole-screen colour "
-"correction."
-
-#: ../panels/color/cc-color-panel.c:1697
-msgid "This device has an old profile that may no longer be accurate."
-msgstr "This device has an old profile that may no longer be accurate."
-
-#. 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 "Not specified"
-
-#. add the 'No devices detected' entry
-#: ../panels/color/cc-color-panel.c:1910
-msgid "No devices supporting color management detected"
-msgstr "No devices supporting colour management detected"
-
-#: ../panels/color/cc-color-panel.c:2139
-msgctxt "Device kind"
-msgid "Display"
-msgstr "Display"
-
-#: ../panels/color/cc-color-panel.c:2141
-msgctxt "Device kind"
-msgid "Scanner"
-msgstr "Scanner"
-
-#: ../panels/color/cc-color-panel.c:2143
-msgctxt "Device kind"
-msgid "Printer"
-msgstr "Printer"
-
-#: ../panels/color/cc-color-panel.c:2145
-msgctxt "Device kind"
-msgid "Camera"
-msgstr "Camera"
-
-#: ../panels/color/cc-color-panel.c:2147
-msgctxt "Device kind"
-msgid "Webcam"
-msgstr "Webcam"
+"Calibration will produce a profile that you can use to colour manage your "
+"screen. The longer you spend on calibration, the better the quality of the "
+"colour profile."
 
 #: ../panels/color/color.ui.h:3
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
-msgid "Color"
-msgstr "Colour"
-
-#: ../panels/color/color.ui.h:4
-msgid "Each device needs an up to date color profile to be color managed."
-msgstr "Each device needs an up to date colour profile to be colour managed."
+msgid ""
+"You will not be able to use your computer while calibration takes place."
+msgstr ""
+"You will not be able to use your computer while calibration takes place."
 
+#. This is the approximate time it takes to calibrate the display.
 #: ../panels/color/color.ui.h:5
-msgid "Learn more"
-msgstr "Learn more"
-
-#: ../panels/color/color.ui.h:6
-msgid "Learn more about color management"
-msgstr "Learn more about colour management"
+msgid "Quality"
+msgstr "Quality"
 
+#. This is the approximate time it takes to calibrate the display.
 #: ../panels/color/color.ui.h:7
-msgid "Add device"
-msgstr "Add device"
+msgid "Approximate Time"
+msgstr "Approximate Time"
 
 #: ../panels/color/color.ui.h:8
-msgid "Add a virtual device"
-msgstr "Add a virtual device"
+msgid "Calibration Quality"
+msgstr "Calibration Quality"
 
 #: ../panels/color/color.ui.h:9
-msgid "Delete device"
-msgstr "Delete device"
+msgid "Select the sensor device you want to use for calibration."
+msgstr "Select the sensor device you want to use for calibration."
 
 #: ../panels/color/color.ui.h:10
-msgid "Remove a device"
-msgstr "Remove a device"
+msgid "Calibration Device"
+msgstr "Calibration Device"
+
+#: ../panels/color/color.ui.h:11
+msgid "Select the type of display that is connected."
+msgstr "Select the type of display that is connected."
 
 #: ../panels/color/color.ui.h:12
-msgid "Set this profile for all users on this computer"
-msgstr "Set this profile for all users on this computer"
+msgid "Display Type"
+msgstr "Display Type"
 
 #: ../panels/color/color.ui.h:13
-msgid "Add profile"
-msgstr "Add profile"
+msgid ""
+"Select a display target white point. Most displays should be calibrated to a "
+"D65 illuminant."
+msgstr ""
+"Select a display target white point. Most displays should be calibrated to a "
+"D65 illuminant."
 
 #: ../panels/color/color.ui.h:14
-msgid "Calibrate…"
-msgstr "Calibrate…"
+msgid "Profile Whitepoint"
+msgstr "Profile Whitepoint"
 
 #: ../panels/color/color.ui.h:15
-msgid "Calibrate the device"
-msgstr "Calibrate the device"
+msgid ""
+"Please set the display to a brightness that is typical for you. Color "
+"management will be most accurate at this brightness level."
+msgstr ""
+"Please set the display to a brightness that is typical for you. Colour "
+"management will be most accurate at this brightness level."
 
 #: ../panels/color/color.ui.h:16
-msgid "Remove profile"
-msgstr "Remove profile"
+msgid ""
+"Alternatively, you can use the brightness level used with one of the other "
+"profiles for this device."
+msgstr ""
+"Alternatively, you can use the brightness level used with one of the other "
+"profiles for this device."
 
 #: ../panels/color/color.ui.h:17
-msgid "View details"
-msgstr "View details"
+msgid "Display Brightness"
+msgstr "Display Brightness"
 
 #: ../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 ""
+"You can use a colour profile on different computers, or even create profiles "
+"for different lighting conditions."
+
+#: ../panels/color/color.ui.h:19
+msgid "Profile Name:"
+msgstr "Profile Name:"
+
+#: ../panels/color/color.ui.h:20
+msgid "Profile Name"
+msgstr "Profile Name"
+
+#: ../panels/color/color.ui.h:21
+msgid "Profile successfully created!"
+msgstr "Profile successfully created!"
+
+#: ../panels/color/color.ui.h:22
+msgid "Export"
+msgstr "Export"
+
+#: ../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 ""
+"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."
+
+#: ../panels/color/color.ui.h:24
+#: ../panels/user-accounts/um-fingerprint-dialog.c:743
+msgid "Summary"
+msgstr "Summary"
+
+#: ../panels/color/color.ui.h:25
+msgid "Import File…"
+msgstr "Import File…"
+
+#: ../panels/color/color.ui.h:26
+msgid ""
+"Problems detected. The profile may not work correctly. <a href=\"\">Show "
+"details.</a>"
+msgstr ""
+"Problems detected. The profile may not work correctly. <a href=\"\">Show "
+"details.</a>"
+
+#: ../panels/color/color.ui.h:27
 msgid "Device type:"
 msgstr "Device type:"
 
-#: ../panels/color/color.ui.h:19
+#: ../panels/color/color.ui.h:28
 msgid "Manufacturer:"
 msgstr "Manufacturer:"
 
-#: ../panels/color/color.ui.h:20
+#: ../panels/color/color.ui.h:29
 msgid "Model:"
 msgstr "Model:"
 
-#: ../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 ""
 "Image files can be dragged on this window to auto-complete the above fields."
 
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:2
-msgid "Color management settings"
-msgstr "Colour management settings"
+#: ../panels/color/color.ui.h:31
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
+msgid "Color"
+msgstr "Colour"
 
-#. 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 "Colour;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 "Each device needs an up to date colour profile to be colour managed."
+
+#: ../panels/color/color.ui.h:33
+msgid "Learn more"
+msgstr "Learn more"
+
+#: ../panels/color/color.ui.h:34
+msgid "Learn more about color management"
+msgstr "Learn more about colour management"
+
+#: ../panels/color/color.ui.h:35
+msgid "Set for all users"
+msgstr "Set for all users"
+
+#: ../panels/color/color.ui.h:36
+msgid "Set this profile for all users on this computer"
+msgstr "Set this profile for all users on this computer"
+
+#: ../panels/color/color.ui.h:37
+msgid "Enable"
+msgstr "Enable"
+
+#: ../panels/color/color.ui.h:38
+msgid "Add profile"
+msgstr "Add profile"
+
+#: ../panels/color/color.ui.h:39
+#: ../panels/wacom/gnome-wacom-properties.ui.h:10
+msgid "Calibrate…"
+msgstr "Calibrate…"
+
+#: ../panels/color/color.ui.h:40
+msgid "Calibrate the device"
+msgstr "Calibrate the device"
+
+#: ../panels/color/color.ui.h:41
+msgid "Remove profile"
+msgstr "Remove profile"
+
+#: ../panels/color/color.ui.h:42
+msgid "View details"
+msgstr "View details"
+
+#: ../panels/color/color.ui.h:43
+msgid "Unable to detect any devices that can be color managed"
+msgstr "Unable to detect any devices that can be colour managed"
+
+#: ../panels/color/color.ui.h:44
+msgid "LCD"
+msgstr "LCD"
 
-#. Add some common languages first
-#: ../panels/common/cc-common-language.c:523
-msgid "English"
-msgstr "English"
+#: ../panels/color/color.ui.h:45
+msgid "LED"
+msgstr "LED"
 
-#: ../panels/common/cc-common-language.c:525
-msgid "British English"
-msgstr "British English"
+#: ../panels/color/color.ui.h:46
+msgid "CRT"
+msgstr "CRT"
 
-#: ../panels/common/cc-common-language.c:528
-msgid "German"
-msgstr "German"
+#: ../panels/color/color.ui.h:47
+msgid "Projector"
+msgstr "Projector"
 
-#: ../panels/common/cc-common-language.c:531
-msgid "French"
-msgstr "French"
+#: ../panels/color/color.ui.h:48
+msgid "Plasma"
+msgstr "Plasma"
 
-#: ../panels/common/cc-common-language.c:534
-msgid "Spanish"
-msgstr "Spanish"
+#: ../panels/color/color.ui.h:49
+msgctxt "Calibration quality"
+msgid "High"
+msgstr "High"
+
+#: ../panels/color/color.ui.h:50
+msgid "40 minutes"
+msgstr "40 minutes"
+
+#: ../panels/color/color.ui.h:51
+msgctxt "Calibration quality"
+msgid "Medium"
+msgstr "Medium"
+
+#: ../panels/color/color.ui.h:52 ../panels/power/power.ui.h:4
+#: ../panels/privacy/privacy.ui.h:7
+msgid "30 minutes"
+msgstr "30 minutes"
+
+#: ../panels/color/color.ui.h:53
+msgctxt "Calibration quality"
+msgid "Low"
+msgstr "Low"
+
+#: ../panels/color/color.ui.h:54 ../panels/power/power.ui.h:3
+msgid "15 minutes"
+msgstr "15 minutes"
+
+#: ../panels/color/color.ui.h:55
+msgid "Native to display"
+msgstr "Native to display"
 
-#: ../panels/common/cc-common-language.c:536
-msgid "Chinese (simplified)"
-msgstr "Chinese (simplified)"
+#: ../panels/color/color.ui.h:56
+msgid "D50 (Printing and publishing)"
+msgstr "D50 (Printing and publishing)"
 
-#: ../panels/common/cc-common-language.c:539
-msgid "Russian"
-msgstr "Russian"
+#: ../panels/color/color.ui.h:57
+msgid "D55"
+msgstr "D55"
+
+#: ../panels/color/color.ui.h:58
+msgid "D65 (Photography and graphics)"
+msgstr "D65 (Photography and graphics)"
+
+#: ../panels/color/color.ui.h:59
+msgid "D75"
+msgstr "D75"
+
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:2
+msgid ""
+"Calibrate the color of your devices, such as displays, cameras or printers"
+msgstr ""
+"Calibrate the colour of your devices, such as displays, cameras or printers"
 
-#: ../panels/common/cc-common-language.c:542
-msgid "Arabic"
-msgstr "Arabic"
+#. 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 "Colour;ICC;Profile;Calibrate;Printer;Display;"
 
 #. Add some common regions
-#: ../panels/common/cc-common-language.c:571
+#: ../panels/common/cc-common-language.c:677
 msgid "United States"
 msgstr "United States"
 
-#: ../panels/common/cc-common-language.c:572
+#: ../panels/common/cc-common-language.c:678
 msgid "Germany"
 msgstr "Germany"
 
-#: ../panels/common/cc-common-language.c:573
+#: ../panels/common/cc-common-language.c:679
 msgid "France"
 msgstr "France"
 
-#: ../panels/common/cc-common-language.c:574
+#: ../panels/common/cc-common-language.c:680
 msgid "Spain"
 msgstr "Spain"
 
-#: ../panels/common/cc-common-language.c:575
+#: ../panels/common/cc-common-language.c:681
 msgid "China"
 msgstr "China"
 
-#: ../panels/common/cc-language-chooser.c:122
-msgid "Other..."
+#: ../panels/common/cc-common-language.c:747
+msgid "Other…"
 msgstr "Other…"
 
-#: ../panels/common/cc-language-chooser.c:296
-msgid "Select a region"
-msgstr "Select a region"
+#: ../panels/common/cc-language-chooser.c:169
+#: ../panels/region/cc-format-chooser.c:259
+#: ../panels/region/cc-input-chooser.c:171
+msgid "More…"
+msgstr "More…"
 
-#: ../panels/common/gdm-languages.c:781
-msgid "Unspecified"
-msgstr "Unspecified"
+#: ../panels/common/cc-language-chooser.c:178
+msgid "No languages found"
+msgstr "No languages found"
+
+#: ../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/user-accounts/um-fingerprint-dialog.c:215
+#: ../panels/user-accounts/um-fingerprint-dialog.c:216
+msgid "Disabled"
+msgstr "Disabled"
 
-#: ../panels/common/language-chooser.ui.h:1
-msgid "Select a language"
-msgstr "Select a language"
+#: ../panels/common/cc-util.c:29
+msgid "Left Shift"
+msgstr "Left Shift"
 
-#: ../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 "_Cancel"
+#: ../panels/common/cc-util.c:30
+msgid "Left Alt"
+msgstr "Left Alt"
+
+#: ../panels/common/cc-util.c:31
+msgid "Left Ctrl"
+msgstr "Left Ctrl"
+
+#: ../panels/common/cc-util.c:32
+msgid "Right Shift"
+msgstr "Right Shift"
+
+#: ../panels/common/cc-util.c:33
+msgid "Right Alt"
+msgstr "Right Alt"
+
+#: ../panels/common/cc-util.c:34
+msgid "Right Ctrl"
+msgstr "Right Ctrl"
+
+#: ../panels/common/cc-util.c:35
+msgid "Left Alt+Shift"
+msgstr "Left Alt+Shift"
+
+#: ../panels/common/cc-util.c:36
+msgid "Right Alt+Shift"
+msgstr "Right Alt+Shift"
+
+#: ../panels/common/cc-util.c:37
+msgid "Left Ctrl+Shift"
+msgstr "Left Ctrl+Shift"
+
+#: ../panels/common/cc-util.c:38
+msgid "Right Ctrl+Shift"
+msgstr "Right Ctrl+Shift"
+
+#: ../panels/common/cc-util.c:39
+msgid "Left+Right Shift"
+msgstr "Left+Right Shift"
+
+#: ../panels/common/cc-util.c:40 ../panels/region/input-options.ui.h:11
+msgid "Left+Right Alt"
+msgstr "Left+Right Alt"
+
+#: ../panels/common/cc-util.c:41
+msgid "Left+Right Ctrl"
+msgstr "Left+Right Ctrl"
+
+#: ../panels/common/cc-util.c:42
+msgid "Alt+Shift"
+msgstr "Alt+Shift"
+
+#: ../panels/common/cc-util.c:43
+msgid "Ctrl+Shift"
+msgstr "Ctrl+Shift"
+
+#: ../panels/common/cc-util.c:44
+msgid "Alt+Ctrl"
+msgstr "Alt+Ctrl"
+
+#: ../panels/common/cc-util.c:45
+msgid "Caps"
+msgstr "Caps"
+
+#: ../panels/common/cc-util.c:46
+msgid "Shift+Caps"
+msgstr "Shift+Caps"
 
-#: ../panels/common/language-chooser.ui.h:3
-msgid "_Select"
-msgstr "_Select"
+#: ../panels/common/cc-util.c:47
+msgid "Alt+Caps"
+msgstr "Alt+Caps"
+
+#: ../panels/common/cc-util.c:48
+msgid "Ctrl+Caps"
+msgstr "Ctrl+Caps"
+
+#: ../panels/common/language-chooser.ui.h:1 ../panels/region/region.ui.h:1
+msgid "Language"
+msgstr "Language"
+
+#: ../panels/common/language-chooser.ui.h:2
+#: ../panels/region/format-chooser.ui.h:2
+msgid "_Done"
+msgstr "_Done"
 
 #: ../panels/datetime/datetime.ui.h:1
 msgid "_Region:"
@@ -722,8 +1060,8 @@ msgid "Date & Time"
 msgstr "Date & Time"
 
 #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
-msgid "Date and Time preferences panel"
-msgstr "Date and Time preferences panel"
+msgid "Change the date and time, including time zone"
+msgstr "Change the date and time, including time zone"
 
 #. Translators: those are keywords for the date and time control-center panel
 #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4
@@ -738,22 +1076,22 @@ msgstr "Change system time and date settings"
 msgid "To change time or date settings, you need to authenticate."
 msgstr "To change time or date settings, you need to authenticate."
 
-#: ../panels/display/cc-display-panel.c:481
+#: ../panels/display/cc-display-panel.c:483
 msgctxt "display panel, rotation"
 msgid "Normal"
 msgstr "Normal"
 
-#: ../panels/display/cc-display-panel.c:482
+#: ../panels/display/cc-display-panel.c:484
 msgctxt "display panel, rotation"
 msgid "Counterclockwise"
 msgstr "Anticlockwise"
 
-#: ../panels/display/cc-display-panel.c:483
+#: ../panels/display/cc-display-panel.c:485
 msgctxt "display panel, rotation"
 msgid "Clockwise"
 msgstr "Clockwise"
 
-#: ../panels/display/cc-display-panel.c:484
+#: ../panels/display/cc-display-panel.c:486
 msgctxt "display panel, rotation"
 msgid "180 Degrees"
 msgstr "180 Degrees"
@@ -764,30 +1102,27 @@ msgstr "180 Degrees"
 #. * 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 "Mirrored Displays"
 
-#: ../panels/display/cc-display-panel.c:647
+#: ../panels/display/cc-display-panel.c:649
 #: ../panels/display/display-capplet.ui.h:1
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../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 "Drag to change primary display."
 
-#: ../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."
@@ -795,29 +1130,29 @@ msgstr ""
 "Select a monitor to change its properties; drag it to rearrange its "
 "placement."
 
-#: ../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 %H:%M"
 
-#: ../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 "Failed to apply configuration: %s"
 
-#: ../panels/display/cc-display-panel.c:2349
+#: ../panels/display/cc-display-panel.c:2359
 msgid "Could not save the monitor configuration"
 msgstr "Could not save the monitor configuration"
 
-#: ../panels/display/cc-display-panel.c:2409
+#: ../panels/display/cc-display-panel.c:2419
 msgid "Could not detect displays"
 msgstr "Could not detect displays"
 
-#: ../panels/display/cc-display-panel.c:2603
+#: ../panels/display/cc-display-panel.c:2614
 msgid "Could not get screen information"
 msgstr "Could not get screen information"
 
@@ -847,97 +1182,62 @@ msgid "Displays"
 msgstr "Displays"
 
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:2
-msgid "Change resolution and position of monitors and projectors"
-msgstr "Change resolution and position of monitors and projectors"
+msgid "Choose how to use connected monitors and projectors"
+msgstr "Choose how to use connected monitors and projectors"
 
 #. Translators: those are keywords for the display control-center panel
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:4
 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
 msgstr "Panel;Projector;xrandr;Screen;Resolution;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 "Unknown"
 
-#. 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
+#, c-format
+msgid "%s %d-bit"
+msgstr "%s %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 "Unknown model"
-
-#: ../panels/info/cc-info-panel.c:835
-msgid "The next login will attempt to use the standard experience."
-msgstr "The next login will attempt to use the standard experience."
-
-#: ../panels/info/cc-info-panel.c:837
-msgid ""
-"The next login will use the fallback mode intended for unsupported graphics "
-"hardware."
-msgstr ""
-"The next login will use the fallback mode intended for unsupported graphics "
-"hardware."
-
-#. 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 "Fallback"
-
-#. 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 "Standard"
-
-#: ../panels/info/cc-info-panel.c:1227
+#: ../panels/info/cc-info-panel.c:1218
 msgid "Ask what to do"
 msgstr "Ask what to do"
 
-#: ../panels/info/cc-info-panel.c:1231
+#: ../panels/info/cc-info-panel.c:1222
 msgid "Do nothing"
 msgstr "Do nothing"
 
-#: ../panels/info/cc-info-panel.c:1235
+#: ../panels/info/cc-info-panel.c:1226
 msgid "Open folder"
 msgstr "Open folder"
 
-#: ../panels/info/cc-info-panel.c:1326
+#: ../panels/info/cc-info-panel.c:1317
 msgid "Other Media"
 msgstr "Other Media"
 
-#: ../panels/info/cc-info-panel.c:1357
+#: ../panels/info/cc-info-panel.c:1348
 msgid "Select an application for audio CDs"
 msgstr "Select an application for audio CDs"
 
-#: ../panels/info/cc-info-panel.c:1358
+#: ../panels/info/cc-info-panel.c:1349
 msgid "Select an application for video DVDs"
 msgstr "Select an application for video DVDs"
 
-#: ../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 "Select an application to run when a music player is connected"
 
-#: ../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 "Select an application to run when a camera is connected"
 
-#: ../panels/info/cc-info-panel.c:1361
+#: ../panels/info/cc-info-panel.c:1352
 msgid "Select an application for software CDs"
 msgstr "Select an application for software CDs"
 
@@ -946,112 +1246,110 @@ msgstr "Select an application for software CDs"
 #. * 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 "audio DVD"
 
-#: ../panels/info/cc-info-panel.c:1374
+#: ../panels/info/cc-info-panel.c:1365
 msgid "blank Blu-ray disc"
 msgstr "blank Blu-ray disc"
 
-#: ../panels/info/cc-info-panel.c:1375
+#: ../panels/info/cc-info-panel.c:1366
 msgid "blank CD disc"
 msgstr "blank CD disc"
 
-#: ../panels/info/cc-info-panel.c:1376
+#: ../panels/info/cc-info-panel.c:1367
 msgid "blank DVD disc"
 msgstr "blank DVD disc"
 
-#: ../panels/info/cc-info-panel.c:1377
+#: ../panels/info/cc-info-panel.c:1368
 msgid "blank HD DVD disc"
 msgstr "blank HD DVD disc"
 
-#: ../panels/info/cc-info-panel.c:1378
+#: ../panels/info/cc-info-panel.c:1369
 msgid "Blu-ray video disc"
 msgstr "Blu-ray video disc"
 
-#: ../panels/info/cc-info-panel.c:1379
+#: ../panels/info/cc-info-panel.c:1370
 msgid "e-book reader"
 msgstr "e-book reader"
 
-#: ../panels/info/cc-info-panel.c:1380
+#: ../panels/info/cc-info-panel.c:1371
 msgid "HD DVD video disc"
 msgstr "HD DVD video disc"
 
-#: ../panels/info/cc-info-panel.c:1381
+#: ../panels/info/cc-info-panel.c:1372
 msgid "Picture CD"
 msgstr "Picture CD"
 
-#: ../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 "Windows software"
 
-#: ../panels/info/cc-info-panel.c:1385
+#: ../panels/info/cc-info-panel.c:1376
 msgid "Software"
 msgstr "Software"
 
-#: ../panels/info/cc-info-panel.c:1508
-#: ../panels/keyboard/keyboard-shortcuts.c:1667
+#: ../panels/info/cc-info-panel.c:1499
+#: ../panels/keyboard/keyboard-shortcuts.c:1697
 msgid "Section"
 msgstr "Section"
 
-#: ../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 "Overview"
 
-#: ../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 "Default Applications"
 
-#: ../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 "Removable Media"
 
-#: ../panels/info/cc-info-panel.c:1533 ../panels/info/info.ui.h:10
-msgid "Graphics"
-msgstr "Graphics"
-
-#: ../panels/info/cc-info-panel.c:1735
+#: ../panels/info/cc-info-panel.c:1544
 #, c-format
 msgid "Version %s"
 msgstr "Version %s"
 
-#: ../panels/info/cc-info-panel.c:1785
+#: ../panels/info/cc-info-panel.c:1594
 msgid "Install Updates"
 msgstr "Install Updates"
 
-#: ../panels/info/cc-info-panel.c:1789
+#: ../panels/info/cc-info-panel.c:1598
 msgid "System Up-To-Date"
 msgstr "System Up-To-Date"
 
-#: ../panels/info/cc-info-panel.c:1793
+#: ../panels/info/cc-info-panel.c:1602
 msgid "Checking for Updates"
 msgstr "Checking for Updates"
 
 #: ../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 "Details"
 
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:2
-msgid "System Information"
-msgstr "System Information"
+msgid "View information about your system"
+msgstr "View information about your system"
 
 #. sure that you use the same "translation" for those keywords
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:4
 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;system;information;memory;processor;version;default;application;"
-"fallback;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
+"device;system;information;memory;processor;version;default;application;prefe"
+"rred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
 
 #: ../panels/info/info.ui.h:1
 msgid "Select how other media should be handled"
@@ -1077,83 +1375,79 @@ msgstr "Memory"
 msgid "Processor"
 msgstr "Processor"
 
-#: ../panels/info/info.ui.h:7
-msgid "OS type"
-msgstr "OS type"
-
+#. To translators: this field contains the distro name, version and type
 #: ../panels/info/info.ui.h:8
+msgid "Base system"
+msgstr "Base system"
+
+#: ../panels/info/info.ui.h:9
 msgid "Disk"
 msgstr "Disk"
 
-#: ../panels/info/info.ui.h:9
-msgid "Calculating..."
+#: ../panels/info/info.ui.h:10
+msgid "Calculating…"
 msgstr "Calculating…"
 
+#: ../panels/info/info.ui.h:11
+msgid "Graphics"
+msgstr "Graphics"
+
 #: ../panels/info/info.ui.h:12
+msgid "Virtualization"
+msgstr "Virtualisation"
+
+#: ../panels/info/info.ui.h:14
 msgid "_Web"
 msgstr "_Web"
 
-#: ../panels/info/info.ui.h:13
+#: ../panels/info/info.ui.h:15
 msgid "_Mail"
 msgstr "_Mail"
 
-#: ../panels/info/info.ui.h:14
+#: ../panels/info/info.ui.h:16
 msgid "_Calendar"
 msgstr "_Calendar"
 
-#: ../panels/info/info.ui.h:15
+#: ../panels/info/info.ui.h:17
 msgid "M_usic"
 msgstr "M_usic"
 
-#: ../panels/info/info.ui.h:16
+#: ../panels/info/info.ui.h:18
 msgid "_Video"
 msgstr "_Video"
 
-#: ../panels/info/info.ui.h:17
+#: ../panels/info/info.ui.h:19
 msgid "_Photos"
 msgstr "_Photos"
 
-#: ../panels/info/info.ui.h:19
+#: ../panels/info/info.ui.h:21
 msgid "Select how media should be handled"
 msgstr "Select how media should be handled"
 
-#: ../panels/info/info.ui.h:20
+#: ../panels/info/info.ui.h:22
 msgid "CD _audio"
 msgstr "CD _audio"
 
-#: ../panels/info/info.ui.h:21
+#: ../panels/info/info.ui.h:23
 msgid "_DVD video"
 msgstr "_DVD video"
 
-#: ../panels/info/info.ui.h:22
+#: ../panels/info/info.ui.h:24
 msgid "_Music player"
 msgstr "_Music player"
 
-#: ../panels/info/info.ui.h:23
+#: ../panels/info/info.ui.h:25
 msgid "_Software"
 msgstr "_Software"
 
-#: ../panels/info/info.ui.h:24
-msgid "_Other Media..."
+#: ../panels/info/info.ui.h:26
+msgid "_Other Media…"
 msgstr "_Other Media…"
 
-#: ../panels/info/info.ui.h:25
+#: ../panels/info/info.ui.h:27
 msgid "_Never prompt or start programs on media insertion"
 msgstr "_Never prompt or start programs on media insertion"
 
-#: ../panels/info/info.ui.h:27
-msgid "Driver"
-msgstr "Driver"
-
-#: ../panels/info/info.ui.h:28
-msgid "Experience"
-msgstr "Experience"
-
-#. 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 "Forced _Fallback Mode"
-
 #: ../panels/keyboard/00-multimedia.xml.in.h:1
 msgid "Sound and Media"
 msgstr "Sound and Media"
@@ -1200,19 +1494,17 @@ msgstr "Eject"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:1
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
-#: ../panels/universal-access/uap.ui.h:68
+#: ../panels/universal-access/uap.ui.h:66
 msgid "Typing"
 msgstr "Typing"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:2
-#: ../panels/region/gnome-region-panel.ui.h:26
-msgid "Switch to next source"
-msgstr "Switch to next source"
+msgid "Switch to next input source"
+msgstr "Switch to next input source"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:3
-#: ../panels/region/gnome-region-panel.ui.h:24
-msgid "Switch to previous source"
-msgstr "Switch to previous source"
+msgid "Switch to previous input source"
+msgstr "Switch to previous input source"
 
 #: ../panels/keyboard/01-launchers.xml.in.h:1
 msgid "Launchers"
@@ -1239,6 +1531,7 @@ msgid "Home folder"
 msgstr "Home folder"
 
 #: ../panels/keyboard/01-launchers.xml.in.h:7
+msgctxt "keybinding"
 msgid "Search"
 msgstr "Search"
 
@@ -1246,20 +1539,20 @@ msgstr "Search"
 msgid "Screenshots"
 msgstr "Screenshots"
 
-#. 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"
-msgstr "Save a screenshot to Pictures"
+msgid "Save a screenshot to $PICTURES"
+msgstr "Save a screenshot to $PICTURES"
 
-#. 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"
-msgstr "Save a screenshot of a window to Pictures"
+msgid "Save a screenshot of a window to $PICTURES"
+msgstr "Save a screenshot of a window to $PICTURES"
 
-#. 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"
-msgstr "Save a screenshot of an area to Pictures"
+msgid "Save a screenshot of an area to $PICTURES"
+msgstr "Save a screenshot of an area to $PICTURES"
 
 #: ../panels/keyboard/01-screenshot.xml.in.h:8
 msgid "Copy a screenshot to clipboard"
@@ -1274,7 +1567,6 @@ msgid "Copy a screenshot of an area to clipboard"
 msgstr "Copy a screenshot of an area to clipboard"
 
 #: ../panels/keyboard/01-system.xml.in.h:1
-#: ../panels/region/gnome-region-panel.ui.h:39
 msgid "System"
 msgstr "System"
 
@@ -1323,33 +1615,26 @@ msgstr "Decrease text size"
 msgid "High contrast on or off"
 msgstr "High contrast on or off"
 
-#. 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:1132
-#: ../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 "Disabled"
-
-#: ../panels/keyboard/cc-keyboard-option.c:315
+#: ../panels/keyboard/cc-keyboard-option.c:362
 msgid "Alternative Characters Key"
 msgstr "Alternative Characters Key"
 
-#: ../panels/keyboard/cc-keyboard-option.c:320
+#: ../panels/keyboard/cc-keyboard-option.c:367
 msgid "Compose Key"
 msgstr "Compose Key"
 
+#: ../panels/keyboard/cc-keyboard-option.c:371
+msgid "Modifiers-only switch to next source"
+msgstr "Modifiers-only switch to next source"
+
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
 msgid "Keyboard"
 msgstr "Keyboard"
 
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2
-msgid "Change keyboard settings"
-msgstr "Change keyboard settings"
+msgid "View and change keyboard shortcuts and set your typing preferences"
+msgstr "View and change keyboard shortcuts and set your typing preferences"
 
 #. Translators: those are keywords for the keyboard control-center panel
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4
@@ -1384,15 +1669,13 @@ msgstr "_Delay:"
 msgid "_Speed:"
 msgstr "_Speed:"
 
-#. short delay
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
-#: ../panels/universal-access/uap.ui.h:49
+msgctxt "keyboard, delay"
 msgid "Short"
 msgstr "Short"
 
-#. slow acceleration
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
-#: ../panels/mouse/gnome-mouse-properties.ui.h:4
+msgctxt "keyboard, speed"
 msgid "Slow"
 msgstr "Slow"
 
@@ -1400,15 +1683,13 @@ msgstr "Slow"
 msgid "Repeat keys speed"
 msgstr "Repeat keys speed"
 
-#. long delay
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
-#: ../panels/universal-access/uap.ui.h:52
+msgctxt "keyboard, delay"
 msgid "Long"
 msgstr "Long"
 
-#. fast acceleration
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
-#: ../panels/mouse/gnome-mouse-properties.ui.h:7
+msgctxt "keyboard, speed"
 msgid "Fast"
 msgstr "Fast"
 
@@ -1429,8 +1710,9 @@ msgid "Cursor blink speed"
 msgstr "Cursor blink speed"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
-msgid "Layout Settings"
-msgstr "Layout Settings"
+#: ../panels/region/region.ui.h:5
+msgid "Input Sources"
+msgstr "Input Sources"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
 msgid "Add Shortcut"
@@ -1450,20 +1732,19 @@ msgstr ""
 "Backspace to clear."
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:23
-#: ../panels/region/gnome-region-panel.ui.h:29
 msgid "Shortcuts"
 msgstr "Shortcuts"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:557
-#: ../panels/keyboard/keyboard-shortcuts.c:565
+#: ../panels/keyboard/keyboard-shortcuts.c:585
+#: ../panels/keyboard/keyboard-shortcuts.c:593
 msgid "Custom Shortcuts"
 msgstr "Custom Shortcuts"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:776
+#: ../panels/keyboard/keyboard-shortcuts.c:804
 msgid "<Unknown Action>"
 msgstr "<Unknown Action>"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1273
+#: ../panels/keyboard/keyboard-shortcuts.c:1301
 #, c-format
 msgid ""
 "The shortcut \"%s\" cannot be used because it will become impossible to type "
@@ -1474,7 +1755,7 @@ msgstr ""
 "using this key.\n"
 "Please try with a key such as Control, Alt or Shift at the same time."
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1305
+#: ../panels/keyboard/keyboard-shortcuts.c:1333
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for\n"
@@ -1483,28 +1764,30 @@ msgstr ""
 "The shortcut \"%s\" is already used for\n"
 "\"%s\""
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1310
+#: ../panels/keyboard/keyboard-shortcuts.c:1338
 #, c-format
 msgid ""
 "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
 msgstr ""
 "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1316
+#: ../panels/keyboard/keyboard-shortcuts.c:1344
 msgid "_Reassign"
 msgstr "_Reassign"
 
-#: ../panels/mouse/cc-mouse-panel.c:152
-msgid "_Test Your Settings"
-msgstr "_Test Your Settings"
+#: ../panels/mouse/cc-mouse-panel.c:123
+msgid "Test Your _Settings"
+msgstr "Test Your _Settings"
 
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1
 msgid "Mouse & Touchpad"
 msgstr "Mouse & Touchpad"
 
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2
-msgid "Set your mouse and touchpad preferences"
-msgstr "Set your mouse and touchpad preferences"
+msgid ""
+"Change your mouse or touchpad sensitivity and select right or left-handed"
+msgstr ""
+"Change your mouse or touchpad sensitivity and select right or left-handed"
 
 #. Translators: those are keywords for the mouse and touchpad control-center panel
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4
@@ -1519,51 +1802,63 @@ msgstr "Mouse Preferences"
 msgid "General"
 msgstr "General"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:5
+#: ../panels/mouse/gnome-mouse-properties.ui.h:3
+msgctxt "mouse, speed"
+msgid "Slow"
+msgstr "Slow"
+
+#: ../panels/mouse/gnome-mouse-properties.ui.h:4
 msgid "Double-click timeout"
 msgstr "Double-click timeout"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:8
+#: ../panels/mouse/gnome-mouse-properties.ui.h:5
+msgctxt "mouse, speed"
+msgid "Fast"
+msgstr "Fast"
+
+#: ../panels/mouse/gnome-mouse-properties.ui.h:6
 msgid "_Double-click"
 msgstr "_Double-click"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:9
+#: ../panels/mouse/gnome-mouse-properties.ui.h:7
 msgid "Primary _button"
 msgstr "Primary _button"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:10
+#: ../panels/mouse/gnome-mouse-properties.ui.h:8
+msgctxt "mouse, left button as primary"
 msgid "_Left"
 msgstr "_Left"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:11
+#: ../panels/mouse/gnome-mouse-properties.ui.h:9
+msgctxt "mouse, right button as primary"
 msgid "_Right"
 msgstr "_Right"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:12
+#: ../panels/mouse/gnome-mouse-properties.ui.h:10
 msgid "Mouse"
 msgstr "Mouse"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:13
+#: ../panels/mouse/gnome-mouse-properties.ui.h:11
 msgid "_Pointer speed"
 msgstr "_Pointer speed"
 
-#: ../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 "Disable while _typing"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:16
+#: ../panels/mouse/gnome-mouse-properties.ui.h:14
 msgid "Tap to _click"
 msgstr "Tap to _click"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:17
+#: ../panels/mouse/gnome-mouse-properties.ui.h:15
 msgid "Two _finger scroll"
 msgstr "Two _finger scroll"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:18
+#: ../panels/mouse/gnome-mouse-properties.ui.h:16
 msgid "C_ontent sticks to fingers"
 msgstr "C_ontent sticks to fingers"
 
@@ -1600,295 +1895,826 @@ msgstr "Double click, secondary button"
 msgid "Single click, secondary button"
 msgstr "Single click, secondary button"
 
-#: ../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 "Aero_plane Mode"
+
+#: ../panels/network/cc-network-panel.c:912
 msgid "Network proxy"
 msgstr "Network proxy"
 
-#: ../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 "%s VPN"
 
 #. TRANSLATORS: the user is running a NM that is not API compatible
-#: ../panels/network/cc-network-panel.c:866
+#: ../panels/network/cc-network-panel.c:1225
 msgid "The system network services are not compatible with this version."
 msgstr "The system network services are not compatible with this version."
 
-#. TRANSLATORS: this is to disable the radio hardware in the
-#. * network panel
-#: ../panels/network/cc-network-panel.c:1001
-msgid "Air_plane Mode"
-msgstr "Aero_plane Mode"
-
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:1
-#: ../panels/network/network-mobile.ui.h:7
-msgid "Network"
-msgstr "Network"
-
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
-msgid "Network settings"
-msgstr "Network settings"
-
-#. 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;Wireless;IP;LAN;Proxy;"
-
-#: ../panels/network/net-device-mobile.c:222
-msgid "Add new connection"
-msgstr "Add new connection"
-
-#. Translators: network device speed
-#: ../panels/network/net-device-mobile.c:261
-#: ../panels/network/net-device-wifi.c:770
-#: ../panels/network/net-device-wired.c:126
-#, c-format
-msgid "%d Mb/s"
-msgstr "%d Mb/s"
+#: ../panels/network/connection-editor/8021x-security-page.ui.h:1
+msgid "802.1x _Security"
+msgstr "802.1x _Security"
+
+#: ../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 "Anony_mous identity"
+
+#: ../panels/network/connection-editor/8021x-security-page.ui.h:4
+#: ../panels/network/connection-editor/security-page.ui.h:4
+msgid "Inner _authentication"
+msgstr "Inner _authentication"
+
+#: ../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 "Security"
 
-#. TRANSLATORS: this is when the access point is not shown
-#. * in the list and the user has to enter the SSID manually
-#.
-#: ../panels/network/net-device-wifi.c:203
-msgid "Connect to a Hidden Network"
-msgstr "Connect to a Hidden Network"
+#: ../panels/network/connection-editor/ce-page.c:502
+msgid "automatic"
+msgstr "automatic"
 
 #. TRANSLATORS: this WEP WiFi security
-#: ../panels/network/net-device-wifi.c:302
-#: ../panels/network/net-device-wifi.c:481
+#: ../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/net-device-wifi.c:306
-#: ../panels/network/net-device-wifi.c:485
+#: ../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/net-device-wifi.c:310
+#: ../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/net-device-wifi.c:315
+#: ../panels/network/connection-editor/ce-page-details.c:65
+#: ../panels/network/net-device-wifi.c:237
 msgid "Enterprise"
 msgstr "Enterprise"
 
-#: ../panels/network/net-device-wifi.c:320
-#: ../panels/network/net-device-wifi.c:476
+#: ../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 "None"
 
-#: ../panels/network/net-device-wifi.c:697
-msgid "never"
-msgstr "never"
+#: ../panels/network/connection-editor/ce-page-details.c:91
+#: ../panels/power/power.ui.h:19
+msgid "Never"
+msgstr "Never"
 
-#: ../panels/network/net-device-wifi.c:707
-msgid "today"
-msgstr "today"
+#: ../panels/network/connection-editor/ce-page-details.c:102
+#: ../panels/user-accounts/um-utils.c:770
+msgid "Today"
+msgstr "Today"
 
-#: ../panels/network/net-device-wifi.c:709
-msgid "yesterday"
-msgstr "yesterday"
+#: ../panels/network/connection-editor/ce-page-details.c:104
+#: ../panels/user-accounts/um-utils.c:773
+msgid "Yesterday"
+msgstr "Yesterday"
 
-#: ../panels/network/net-device-wifi.c:711
+#: ../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 day ago"
 msgstr[1] "%i days ago"
 
-#. TRANSLATORS: VPN status
-#: ../panels/network/net-device-wifi.c:780
-#: ../panels/network/panel-common.c:277
-msgid "Not connected"
-msgstr "Not connected"
-
-#: ../panels/network/net-device-wifi.c:782
-#: ../panels/network/net-device-wifi.c:2086
-msgid "Out of range"
-msgstr "Out of range"
+#. 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/net-device-wifi.c:813
+#: ../panels/network/connection-editor/ce-page-details.c:181
+#: ../panels/network/net-device-wifi.c:566
 msgctxt "Signal strength"
 msgid "None"
 msgstr "None"
 
-#: ../panels/network/net-device-wifi.c:815
+#: ../panels/network/connection-editor/ce-page-details.c:183
+#: ../panels/network/net-device-wifi.c:568
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "Weak"
 
-#: ../panels/network/net-device-wifi.c:817
+#: ../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/net-device-wifi.c:819
+#: ../panels/network/connection-editor/ce-page-details.c:187
+#: ../panels/network/net-device-wifi.c:572
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "Good"
 
-#: ../panels/network/net-device-wifi.c:821
+#: ../panels/network/connection-editor/ce-page-details.c:189
+#: ../panels/network/net-device-wifi.c:574
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "Excellent"
 
-#: ../panels/network/net-device-wifi.c:1005
-#, c-format
-msgid ""
-"Network details for %s including password and any custom configuration will "
-"be lost."
-msgstr ""
-"Network details for %s including password and any custom configuration will "
-"be lost."
+#: ../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 "Identity"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:202
+#: ../panels/network/connection-editor/ce-page-ip4.c:454
+msgid "Netmask"
+msgstr "Netmask"
+
+#: ../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 "Gateway"
 
-#: ../panels/network/net-device-wifi.c:1016
-msgid "Forget"
-msgstr "Forget"
+#: ../panels/network/connection-editor/ce-page-ip4.c:233
+#: ../panels/network/connection-editor/ce-page-ip6.c:234
+msgid "Delete Address"
+msgstr "Delete Address"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:285
+#: ../panels/network/connection-editor/ce-page-ip6.c:286
+msgid "Add"
+msgstr "Add"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:350
+#: ../panels/network/connection-editor/ce-page-ip6.c:354
+msgid "Server"
+msgstr "Server"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:367
+#: ../panels/network/connection-editor/ce-page-ip6.c:371
+msgid "Delete DNS Server"
+msgstr "Delete DNS Server"
+
+#. 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
+msgctxt "network parameters"
+msgid "Metric"
+msgstr "Metric"
 
-#: ../panels/network/net-device-wifi.c:1552
-msgid ""
-"If you have a connection to the Internet other than wireless, you can use it "
-"to share your internet connection with others."
-msgstr ""
-"If you have a connection to the Internet other than wireless, you can use it "
-"to share your internet connection with others."
+#: ../panels/network/connection-editor/ce-page-ip4.c:502
+#: ../panels/network/connection-editor/ce-page-ip6.c:510
+msgid "Delete Route"
+msgstr "Delete Route"
 
-#: ../panels/network/net-device-wifi.c:1556
-#, c-format
-msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
-msgstr "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
+#: ../panels/network/connection-editor/ce-page-ip4.c:616
+#: ../panels/network/network-wifi.ui.h:26
+msgid "Automatic (DHCP)"
+msgstr "Automatic (DHCP)"
 
-#: ../panels/network/net-device-wifi.c:1560
-msgid ""
-"It is not possible to access the internet through your wireless while the "
-"hotspot is active."
-msgstr ""
-"It is not possible to access the internet through your wireless while the "
-"hotspot is active."
+#: ../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
+msgid "Manual"
+msgstr "Manual"
 
-#: ../panels/network/net-device-wifi.c:1626
-msgid "Stop hotspot and disconnect any users?"
-msgstr "Stop hotspot and disconnect any users?"
+#: ../panels/network/connection-editor/ce-page-ip4.c:624
+#: ../panels/network/connection-editor/ce-page-ip6.c:626
+msgid "Link-Local Only"
+msgstr "Link-Local Only"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:925
+#: ../panels/network/network-wifi.ui.h:60
+msgid "IPv4"
+msgstr "IPv4"
+
+#: ../panels/network/connection-editor/ce-page-ip6.c:204
+#: ../panels/network/connection-editor/ce-page-ip6.c:458
+msgid "Prefix"
+msgstr "Prefix"
+
+#: ../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
+msgid "Automatic"
+msgstr "Automatic"
 
-#: ../panels/network/net-device-wifi.c:1629
-msgid "_Stop Hotspot"
-msgstr "_Stop Hotspot"
+#: ../panels/network/connection-editor/ce-page-ip6.c:618
+msgid "Automatic, DHCP only"
+msgstr "Automatic, DHCP only"
 
-#. TRANSLATORS: this is when the use leaves the PAC textbox blank
-#: ../panels/network/net-proxy.c:67
-msgid ""
-"Web Proxy Autodiscovery is used when a Configuration URL is not provided."
-msgstr ""
-"Web Proxy Autodiscovery is used when a Configuration URL is not provided."
+#: ../panels/network/connection-editor/ce-page-ip6.c:886
+#: ../panels/network/network-wifi.ui.h:61
+msgid "IPv6"
+msgstr "IPv6"
 
-#. TRANSLATORS: WPAD is bad: if you enable it on an untrusted
-#. * network, then anyone else on that network can tell your
-#. * machine that it should proxy all of your web traffic
-#. * through them.
-#: ../panels/network/net-proxy.c:75
-msgid "This is not recommended for untrusted public networks."
-msgstr "This is not recommended for untrusted public networks."
+#: ../panels/network/connection-editor/ce-page-reset.c:91
+#: ../panels/network/network-wifi.ui.h:63
+msgid "Reset"
+msgstr "Reset"
 
-#: ../panels/network/net-proxy.c:367
-msgid "Proxy"
-msgstr "Proxy"
+#: ../panels/network/connection-editor/ce-page-security.c:250
+msgctxt "Wi-Fi/Ethernet security"
+msgid "None"
+msgstr "None"
 
-#: ../panels/network/network-mobile.ui.h:1
-msgid "IMEI"
-msgstr "IMEI"
+#: ../panels/network/connection-editor/ce-page-security.c:273
+msgid "WEP 40/128-bit Key (Hex or ASCII)"
+msgstr "WEP 40/128-bit Key (Hex or ASCII)"
 
-#: ../panels/network/network-mobile.ui.h:2
-msgid "Provider"
-msgstr "Provider"
+#: ../panels/network/connection-editor/ce-page-security.c:283
+msgid "WEP 128-bit Passphrase"
+msgstr "WEP 128-bit Passphrase"
 
-#: ../panels/network/network-mobile.ui.h:3
-#: ../panels/network/panel-common.c:686 ../panels/network/panel-common.c:688
-#: ../panels/printers/printers.ui.h:13
-msgid "IP Address"
-msgstr "IP Address"
+#: ../panels/network/connection-editor/ce-page-security.c:296
+#: ../panels/network/wireless-security/wireless-security.c:409
+msgid "LEAP"
+msgstr "LEAP"
+
+#: ../panels/network/connection-editor/ce-page-security.c:309
+msgid "Dynamic WEP (802.1x)"
+msgstr "Dynamic WEP (802.1x)"
+
+#: ../panels/network/connection-editor/ce-page-security.c:323
+msgid "WPA & WPA2 Personal"
+msgstr "WPA & WPA2 Personal"
+
+#: ../panels/network/connection-editor/ce-page-security.c:337
+msgid "WPA & WPA2 Enterprise"
+msgstr "WPA & WPA2 Enterprise"
+
+#: ../panels/network/connection-editor/connection-editor.ui.h:1
+msgid "_Apply"
+msgstr "_Apply"
 
+#: ../panels/network/connection-editor/details-page.ui.h:1
+#: ../panels/network/network-wifi.ui.h:2
+msgid "Signal Strength"
+msgstr "Signal Strength"
+
+#: ../panels/network/connection-editor/details-page.ui.h:2
+#: ../panels/network/network-wifi.ui.h:3
+msgid "Link speed"
+msgstr "Link speed"
+
+#: ../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 "IPv4 Address"
+
+#: ../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-wifi.ui.h:13
-#: ../panels/network/network-wired.ui.h:3 ../panels/network/panel-common.c:684
+#: ../panels/network/network-simple.ui.h:3
+#: ../panels/network/network-wifi.ui.h:6 ../panels/network/panel-common.c:694
 msgid "IPv6 Address"
 msgstr "IPv6 Address"
 
+#: ../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 "Hardware Address"
+
+#: ../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-wifi.ui.h:14
-#: ../panels/network/network-wired.ui.h:4
+#: ../panels/network/network-simple.ui.h:4
+#: ../panels/network/network-wifi.ui.h:8
 msgid "Default Route"
 msgstr "Default Route"
 
+#: ../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-wifi.ui.h:15
-#: ../panels/network/network-wired.ui.h:5
+#: ../panels/network/network-simple.ui.h:5
+#: ../panels/network/network-wifi.ui.h:9
 msgid "DNS"
 msgstr "DNS"
 
-#: ../panels/network/network-mobile.ui.h:8
-#: ../panels/network/network-wired.ui.h:6
-msgid "_Options..."
-msgstr "_Options…"
+#: ../panels/network/connection-editor/details-page.ui.h:9
+msgid "Last Used"
+msgstr "Last Used"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr "Twisted Pair (TP)"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr "Attachment Unit Interface (AUI)"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:4
+msgid "BNC"
+msgstr "BNC"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr "Media Independent Interface (MII)"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:6
+msgid "10 Mb/s"
+msgstr "10 Mb/s"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:7
+msgid "100 Mb/s"
+msgstr "100 Mb/s"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:8
+msgid "1 Gb/s"
+msgstr "1 Gb/s"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:9
+msgid "10 Gb/s"
+msgstr "10 Gb/s"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:10
+#: ../panels/network/connection-editor/vpn-page.ui.h:1
+msgid "_Name"
+msgstr "_Name"
+
+#: ../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
+msgid "_MAC Address"
+msgstr "_MAC Address"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:12
+msgid "M_TU"
+msgstr "M_TU"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:13
+#: ../panels/network/connection-editor/wifi-page.ui.h:5
+msgid "_Cloned Address"
+msgstr "_Cloned Address"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:14
+#: ../panels/network/connection-editor/wifi-page.ui.h:6
+msgid "Connect _automatically"
+msgstr "Connect _automatically"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:15
+msgid "Make available to other _users"
+msgstr "Make available to other _users"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:16
+msgid "bytes"
+msgstr "bytes"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:1
+#: ../panels/network/network-wifi.ui.h:23
+msgid "IPv_4"
+msgstr "IPv_4"
+
+#: ../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
+msgid "_Addresses"
+msgstr "_Addresses"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:5
+#: ../panels/network/connection-editor/ip6-page.ui.h:5
+msgid "Automatic DNS"
+msgstr "Automatic DNS"
+
+#: ../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 "Routes"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:7
+#: ../panels/network/connection-editor/ip6-page.ui.h:7
+msgid "Automatic Routes"
+msgstr "Automatic Routes"
+
+#: ../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 "Use this connection _only for resources on its network"
+
+#: ../panels/network/connection-editor/ip6-page.ui.h:1
+#: ../panels/network/network-wifi.ui.h:47
+msgid "IPv_6"
+msgstr "IPv_6"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:267
+msgid "Unable to open connection editor"
+msgstr "Unable to open connection editor"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:282
+msgid "New Profile"
+msgstr "New Profile"
+
+#: ../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 "_Add"
 
-#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:5
-msgctxt "proxy method"
-msgid "None"
-msgstr "None"
+#: ../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/network-proxy.ui.h:2 ../panels/network/network.ui.h:6
-msgctxt "proxy method"
-msgid "Manual"
-msgstr "Manual"
+#: ../panels/network/connection-editor/net-connection-editor.c:587
+msgid "Bond"
+msgstr "Bond"
 
-#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:7
-msgctxt "proxy method"
-msgid "Automatic"
-msgstr "Automatic"
+#: ../panels/network/connection-editor/net-connection-editor.c:588
+msgid "Bridge"
+msgstr "Bridge"
 
-#: ../panels/network/network-proxy.ui.h:4
-msgid "_Method"
-msgstr "_Method"
+#: ../panels/network/connection-editor/net-connection-editor.c:589
+msgid "VLAN"
+msgstr "VLAN"
 
-#: ../panels/network/network-proxy.ui.h:5
-msgid "_Configuration URL"
-msgstr "_Configuration URL"
+#: ../panels/network/connection-editor/net-connection-editor.c:739
+msgid "Could not load VPN plugins"
+msgstr "Could not load VPN plugins"
 
-#: ../panels/network/network-proxy.ui.h:6
-msgid "_HTTP Proxy"
-msgstr "_HTTP Proxy"
+#: ../panels/network/connection-editor/net-connection-editor.c:803
+msgid "Import from file…"
+msgstr "Import from file…"
 
-#: ../panels/network/network-proxy.ui.h:7
-msgid "H_TTPS Proxy"
-msgstr "H_TTPS Proxy"
+#: ../panels/network/connection-editor/net-connection-editor.c:870
+msgid "Add Network Connection"
+msgstr "Add Network Connection"
 
-#: ../panels/network/network-proxy.ui.h:8
-msgid "_FTP Proxy"
-msgstr "_FTP Proxy"
+#: ../panels/network/connection-editor/reset-page.ui.h:1
+#: ../panels/network/network-wifi.ui.h:53
+msgid "_Reset"
+msgstr "_Reset"
 
-#: ../panels/network/network-proxy.ui.h:9
-msgid "_Socks Host"
-msgstr "_Socks Host"
+#: ../panels/network/connection-editor/reset-page.ui.h:2
+#: ../panels/network/net-device-wifi.c:1411
+#: ../panels/network/network-wifi.ui.h:54
+msgid "_Forget"
+msgstr "_Forget"
 
-#: ../panels/network/network.ui.h:1
-msgid "Select the interface to use for the new service"
-msgstr "Select the interface to use for the new service"
+#: ../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 ""
+"Reset the settings for this network, including passwords, but remember it as "
+"a preferred network"
 
-#: ../panels/network/network.ui.h:2
-msgid "C_reate..."
-msgstr "C_reate…"
+#: ../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 ""
+"Remove all details relating to this network and do not try to automatically "
+"connect"
+
+#: ../panels/network/connection-editor/security-page.ui.h:1
+#: ../panels/network/network-wifi.ui.h:14
+msgid "S_ecurity"
+msgstr "S_ecurity"
+
+#: ../panels/network/connection-editor/vpn-helpers.c:205
+msgid "Cannot import VPN connection"
+msgstr "Cannot import VPN connection"
+
+#: ../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 ""
+"The file '%s' could not be read or does not contain recognised VPN "
+"connection information\n"
+"\n"
+"Error: %s."
+
+#: ../panels/network/connection-editor/vpn-helpers.c:242
+msgid "Select file to import"
+msgstr "Select file to import"
+
+#: ../panels/network/connection-editor/vpn-helpers.c:294
+#, c-format
+msgid "A file named \"%s\" already exists."
+msgstr "A file named \"%s\" already exists."
+
+#: ../panels/network/connection-editor/vpn-helpers.c:296
+msgid "_Replace"
+msgstr "_Replace"
+
+#: ../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 "Do you want to replace %s with the VPN connection you are saving?"
+
+#: ../panels/network/connection-editor/vpn-helpers.c:334
+msgid "Cannot export VPN connection"
+msgstr "Cannot export VPN connection"
+
+#: ../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 ""
+"The VPN connection '%s' could not be exported to %s.\n"
+"\n"
+"Error: %s."
+
+#: ../panels/network/connection-editor/vpn-helpers.c:371
+msgid "Export VPN connection..."
+msgstr "Export VPN connection…"
+
+#: ../panels/network/connection-editor/vpn-page.ui.h:2
+msgid "(Error: unable to load VPN connection editor)"
+msgstr "(Error: unable to load VPN connection editor)"
+
+#: ../panels/network/connection-editor/wifi-page.ui.h:1
+#: ../panels/network/network-wifi.ui.h:12
+msgid "_SSID"
+msgstr "_SSID"
+
+#: ../panels/network/connection-editor/wifi-page.ui.h:2
+#: ../panels/network/network-wifi.ui.h:13
+msgid "_BSSID"
+msgstr "_BSSID"
+
+#: ../panels/network/connection-editor/wifi-page.ui.h:3
+#: ../panels/network/network-wifi.ui.h:16
+msgid "My Home Network"
+msgstr "My Home Network"
+
+#: ../panels/network/connection-editor/wifi-page.ui.h:7
+msgid "Make available to _other users"
+msgstr "Make available to _other users"
+
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:1
+#: ../panels/network/network-mobile.ui.h:7
+msgid "Network"
+msgstr "Network"
+
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
+msgid "Control how you connect to the Internet"
+msgstr "Control how you connect to the Internet"
+
+#. Translators: those are keywords for the network control-center panel
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:4
+msgid "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;"
+msgstr "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;"
+
+#: ../panels/network/net-device-bond.c:77
+msgid "Bond slaves"
+msgstr "Bond slaves"
+
+#: ../panels/network/net-device-bridge.c:77
+msgid "Bridge slaves"
+msgstr "Bridge slaves"
+
+#: ../panels/network/net-device-ethernet.c:112
+#: ../panels/network/net-device-wifi.c:465
+msgid "never"
+msgstr "never"
+
+#: ../panels/network/net-device-ethernet.c:122
+#: ../panels/network/net-device-wifi.c:475
+msgid "today"
+msgstr "today"
+
+#: ../panels/network/net-device-ethernet.c:124
+#: ../panels/network/net-device-wifi.c:477
+msgid "yesterday"
+msgstr "yesterday"
+
+#: ../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 "IP Address"
+
+#: ../panels/network/net-device-ethernet.c:178
+#: ../panels/network/network-wifi.ui.h:10
+msgid "Last used"
+msgstr "Last used"
+
+#: ../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
+msgid "Options…"
+msgstr "Options…"
+
+#: ../panels/network/net-device-ethernet.c:472
+#, c-format
+msgid "Profile %d"
+msgstr "Profile %d"
+
+#: ../panels/network/net-device-mobile.c:241
+msgid "Add new connection"
+msgstr "Add new connection"
+
+#: ../panels/network/net-device-wifi.c:1120
+msgid ""
+"If you have a connection to the Internet other than wireless, you can set up "
+"a wireless hotspot to share the connection with others."
+msgstr ""
+"If you have a connection to the Internet other than wireless, you can set up "
+"a wireless hotspot to share the connection with others."
+
+#: ../panels/network/net-device-wifi.c:1124
+#, c-format
+msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
+msgstr "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
+
+#: ../panels/network/net-device-wifi.c:1128
+msgid ""
+"It is not possible to access the Internet through your wireless while the "
+"hotspot is active."
+msgstr ""
+"It is not possible to access the Internet through your wireless while the "
+"hotspot is active."
+
+#: ../panels/network/net-device-wifi.c:1202
+msgid "Stop hotspot and disconnect any users?"
+msgstr "Stop hotspot and disconnect any users?"
+
+#: ../panels/network/net-device-wifi.c:1205
+msgid "_Stop Hotspot"
+msgstr "_Stop Hotspot"
+
+#: ../panels/network/net-device-wifi.c:1277
+msgid "System policy prohibits use as a Hotspot"
+msgstr "System policy prohibits use as a Hotspot"
+
+#: ../panels/network/net-device-wifi.c:1280
+msgid "Wireless device does not support Hotspot mode"
+msgstr "Wireless device does not support Hotspot mode"
+
+#: ../panels/network/net-device-wifi.c:1407
+msgid ""
+"Network details for the selected networks, including passwords and any "
+"custom configuration will be lost."
+msgstr ""
+"Network details for the selected networks, including passwords and any "
+"custom configuration will be lost."
+
+#: ../panels/network/net-device-wifi.c:1714
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:14
+msgid "History"
+msgstr "History"
+
+#. translators: This is the label for the "Forget wireless network" functionality
+#: ../panels/network/net-device-wifi.c:1726
+msgctxt "Wi-Fi Network"
+msgid "_Forget"
+msgstr "_Forget"
+
+#. TRANSLATORS: this is when the use leaves the PAC textbox blank
+#: ../panels/network/net-proxy.c:67
+msgid ""
+"Web Proxy Autodiscovery is used when a Configuration URL is not provided."
+msgstr ""
+"Web Proxy Autodiscovery is used when a Configuration URL is not provided."
+
+#. TRANSLATORS: WPAD is bad: if you enable it on an untrusted
+#. * network, then anyone else on that network can tell your
+#. * machine that it should proxy all of your web traffic
+#. * through them.
+#: ../panels/network/net-proxy.c:75
+msgid "This is not recommended for untrusted public networks."
+msgstr "This is not recommended for untrusted public networks."
+
+#: ../panels/network/net-proxy.c:408
+msgid "Proxy"
+msgstr "Proxy"
+
+#: ../panels/network/network-ethernet.ui.h:1
+msgid "_Add Profile…"
+msgstr "_Add Profile…"
+
+#: ../panels/network/network-mobile.ui.h:1
+msgid "IMEI"
+msgstr "IMEI"
+
+#: ../panels/network/network-mobile.ui.h:2
+msgid "Provider"
+msgstr "Provider"
+
+#: ../panels/network/network-mobile.ui.h:8
+#: ../panels/network/network-simple.ui.h:7
+msgid "_Options…"
+msgstr "_Options…"
+
+#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:5
+msgctxt "proxy method"
+msgid "None"
+msgstr "None"
+
+#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:6
+msgctxt "proxy method"
+msgid "Manual"
+msgstr "Manual"
+
+#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:7
+msgctxt "proxy method"
+msgid "Automatic"
+msgstr "Automatic"
+
+#: ../panels/network/network-proxy.ui.h:4
+msgid "_Method"
+msgstr "_Method"
+
+#: ../panels/network/network-proxy.ui.h:5
+msgid "_Configuration URL"
+msgstr "_Configuration URL"
+
+#: ../panels/network/network-proxy.ui.h:6
+msgid "_HTTP Proxy"
+msgstr "_HTTP Proxy"
+
+#: ../panels/network/network-proxy.ui.h:7
+msgid "H_TTPS Proxy"
+msgstr "H_TTPS Proxy"
+
+#: ../panels/network/network-proxy.ui.h:8
+msgid "_FTP Proxy"
+msgstr "_FTP Proxy"
+
+#: ../panels/network/network-proxy.ui.h:9
+msgid "_Socks Host"
+msgstr "_Socks Host"
+
+#: ../panels/network/network-proxy.ui.h:10
+msgid "_Ignore Hosts"
+msgstr "_Ignore Hosts"
+
+#: ../panels/network/network-proxy.ui.h:11
+msgid "HTTP proxy port"
+msgstr "HTTP proxy port"
+
+#: ../panels/network/network-proxy.ui.h:12
+msgid "HTTPS proxy port"
+msgstr "HTTPS proxy port"
+
+#: ../panels/network/network-proxy.ui.h:13
+msgid "FTP proxy port"
+msgstr "FTP proxy port"
+
+#: ../panels/network/network-proxy.ui.h:14
+msgid "Socks proxy port"
+msgstr "Socks proxy port"
+
+#: ../panels/network/network-simple.ui.h:6
+msgid "Turn device off"
+msgstr "Turn device off"
+
+#: ../panels/network/network.ui.h:1
+msgid "Select the interface to use for the new service"
+msgstr "Select the interface to use for the new service"
+
+#: ../panels/network/network.ui.h:2
+msgid "C_reate…"
+msgstr "C_reate…"
 
 #: ../panels/network/network.ui.h:3
 msgid "_Interface"
 msgstr "_Interface"
 
-#: ../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 "Add Device"
@@ -1897,10 +2723,6 @@ msgstr "Add Device"
 msgid "VPN Type"
 msgstr "VPN Type"
 
-#: ../panels/network/network-vpn.ui.h:3
-msgid "Gateway"
-msgstr "Gateway"
-
 #: ../panels/network/network-vpn.ui.h:4
 msgid "Group Name"
 msgstr "Group Name"
@@ -1910,430 +2732,860 @@ msgid "Group Password"
 msgstr "Group Password"
 
 #: ../panels/network/network-vpn.ui.h:6
+#: ../panels/printers/authentication-dialog.ui.h:4
 msgid "Username"
 msgstr "Username"
 
 #: ../panels/network/network-vpn.ui.h:7
-msgid "_Configure..."
-msgstr "_Configure…"
+msgid "Turn VPN connection off"
+msgstr "Turn VPN connection off"
 
 #: ../panels/network/network-wifi.ui.h:1
-msgid "Wireless Hotspot"
-msgstr "Wireless Hotspot"
+msgid "Automatic _Connect"
+msgstr "Automatic _Connect"
 
-#: ../panels/network/network-wifi.ui.h:2
-msgid "_Turn On"
-msgstr "_Turn On"
+#: ../panels/network/network-wifi.ui.h:11
+msgid "details"
+msgstr "details"
 
-#. TRANSLATORS: device type
-#: ../panels/network/network-wifi.ui.h:3 ../panels/network/panel-common.c:90
-msgid "Wireless"
-msgstr "Wireless"
+#: ../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 "_Password"
 
-#: ../panels/network/network-wifi.ui.h:4
-msgid "_Use as Hotspot..."
-msgstr "_Use as Hotspot…"
+#: ../panels/network/network-wifi.ui.h:18
+#: ../panels/universal-access/uap.ui.h:8
+msgid "None"
+msgstr "None"
 
-#: ../panels/network/network-wifi.ui.h:5
-msgid "_Disconnect"
-msgstr "_Disconnect"
+#: ../panels/network/network-wifi.ui.h:19
+msgid "blablabla"
+msgstr "blablabla"
 
-#: ../panels/network/network-wifi.ui.h:6
-msgid "_Connect"
-msgstr "_Connect"
+#: ../panels/network/network-wifi.ui.h:20
+msgid "Show P_assword"
+msgstr "Show P_assword"
 
-#: ../panels/network/network-wifi.ui.h:7
-msgid "Last used"
-msgstr "Last used"
+#: ../panels/network/network-wifi.ui.h:21
+msgid "Make available to other users"
+msgstr "Make available to other users"
 
-#: ../panels/network/network-wifi.ui.h:8
-#: ../panels/network/network-wired.ui.h:1
-msgid "Hardware Address"
-msgstr "Hardware Address"
+#: ../panels/network/network-wifi.ui.h:22
+msgid "identity"
+msgstr "identity"
 
-#: ../panels/network/network-wifi.ui.h:9
-msgid "Security"
-msgstr "Security"
+#: ../panels/network/network-wifi.ui.h:27
+msgid "Automatic (DHCP) addresses only"
+msgstr "Automatic (DHCP) addresses only"
 
-#: ../panels/network/network-wifi.ui.h:10
-msgid "Strength"
-msgstr "Strength"
+#: ../panels/network/network-wifi.ui.h:28
+msgid "Link-local only"
+msgstr "Link-local only"
 
-#: ../panels/network/network-wifi.ui.h:11
-msgid "Link speed"
-msgstr "Link speed"
+#: ../panels/network/network-wifi.ui.h:29
+msgid "Shared with other computers"
+msgstr "Shared with other computers"
 
-#: ../panels/network/network-wifi.ui.h:12
-#: ../panels/network/network-wired.ui.h:2 ../panels/network/panel-common.c:683
-msgid "IPv4 Address"
-msgstr "IPv4 Address"
+#: ../panels/network/network-wifi.ui.h:31
+msgid ""
+"Address\n"
+"section\n"
+"goes\n"
+"here"
+msgstr ""
+"Address\n"
+"section\n"
+"goes\n"
+"here"
 
-#: ../panels/network/network-wifi.ui.h:16
-msgid "_Forget Network"
-msgstr "_Forget Network"
+#: ../panels/network/network-wifi.ui.h:35
+msgid ""
+"DNS\n"
+"section\n"
+"goes\n"
+"here"
+msgstr ""
+"DNS\n"
+"section\n"
+"goes\n"
+"here"
 
-#: ../panels/network/network-wifi.ui.h:17
-msgid "_Settings..."
-msgstr "_Settings…"
+#: ../panels/network/network-wifi.ui.h:40
+msgid ""
+"Routes\n"
+"section\n"
+"goes\n"
+"here"
+msgstr ""
+"Routes\n"
+"section\n"
+"goes\n"
+"here"
 
-#: ../panels/network/network-wifi.ui.h:18
-msgid "Switch off to connect to a wireless network"
-msgstr "Switch off to connect to a wireless network"
+#: ../panels/network/network-wifi.ui.h:44
+msgid "_Ignore automatically obtained routes"
+msgstr "_Ignore automatically obtained routes"
 
-#: ../panels/network/network-wifi.ui.h:19
+#: ../panels/network/network-wifi.ui.h:46
+msgid "ipv4"
+msgstr "ipv4"
+
+#: ../panels/network/network-wifi.ui.h:48
+msgid "ipv6"
+msgstr "ipv6"
+
+#: ../panels/network/network-wifi.ui.h:50
+msgid "_Cloned MAC Address"
+msgstr "_Cloned MAC Address"
+
+#: ../panels/network/network-wifi.ui.h:51
+msgid "00:24:16:31:8G:7A"
+msgstr "00:24:16:31:8G:7A"
+
+#: ../panels/network/network-wifi.ui.h:52
+msgid "hardware"
+msgstr "hardware"
+
+#: ../panels/network/network-wifi.ui.h:55
+msgid ""
+"Reset the settings for this connection to their defaults, but remember as a "
+"preferred connection."
+msgstr ""
+"Reset the settings for this connection to their defaults, but remember as a "
+"preferred connection."
+
+#: ../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 ""
+"Remove all details relating to this network and do not try to automatically "
+"connect to it."
+
+#: ../panels/network/network-wifi.ui.h:57
+msgid "reset"
+msgstr "reset"
+
+#: ../panels/network/network-wifi.ui.h:62
+msgid "Hardware"
+msgstr "Hardware"
+
+#: ../panels/network/network-wifi.ui.h:64
+msgid "Wi-Fi Hotspot"
+msgstr "Wi-Fi Hotspot"
+
+#: ../panels/network/network-wifi.ui.h:65
+msgid "_Turn On"
+msgstr "_Turn On"
+
+#: ../panels/network/network-wifi.ui.h:66
+msgid "Wi-Fi"
+msgstr "Wi-Fi"
+
+#: ../panels/network/network-wifi.ui.h:67
+msgid "Turn Wi-Fi off"
+msgstr "Turn Wi-Fi off"
+
+#: ../panels/network/network-wifi.ui.h:68
+msgid "_Use as Hotspot…"
+msgstr "_Use as Hotspot…"
+
+#: ../panels/network/network-wifi.ui.h:69
+msgid "_Connect to Hidden Network…"
+msgstr "_Connect to Hidden Network…"
+
+#: ../panels/network/network-wifi.ui.h:70
+msgid "_History"
+msgstr "_History"
+
+#: ../panels/network/network-wifi.ui.h:71
+msgid "Switch off to connect to a Wi-Fi network"
+msgstr "Switch off to connect to a Wi-Fi network"
+
+#: ../panels/network/network-wifi.ui.h:72
 msgid "Network Name"
 msgstr "Network Name"
 
-#: ../panels/network/network-wifi.ui.h:20
+#: ../panels/network/network-wifi.ui.h:73
 msgid "Connected Devices"
 msgstr "Connected Devices"
 
-#: ../panels/network/network-wifi.ui.h:21
+#: ../panels/network/network-wifi.ui.h:74
 msgid "Security type"
 msgstr "Security type"
 
-#: ../panels/network/network-wifi.ui.h:22
+#: ../panels/network/network-wifi.ui.h:75
 msgid "Security key"
 msgstr "Security key"
 
-#. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:86
-msgid "Wired"
-msgstr "Wired"
-
-#. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:97
-msgid "Mobile broadband"
-msgstr "Mobile broadband"
-
-#. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:106
-msgid "Mesh"
-msgstr "Mesh"
-
 #. 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 "Infrastructure"
 
 #. 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 "Status unknown"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:198
+#: ../panels/network/panel-common.c:155
 msgid "Unmanaged"
 msgstr "Unmanaged"
 
-#: ../panels/network/panel-common.c:203
-msgid "Firmware missing"
-msgstr "Firmware missing"
-
-#: ../panels/network/panel-common.c:206
-msgid "Cable unplugged"
-msgstr "Cable unplugged"
-
-#: ../panels/network/panel-common.c:208
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:159
 msgid "Unavailable"
 msgstr "Unavailable"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:212
-msgid "Disconnected"
-msgstr "Disconnected"
-
-#. 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 "Connecting"
 
 #. 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 "Authentication required"
 
 #. 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 "Connected"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:231
+#: ../panels/network/panel-common.c:181
 msgid "Disconnecting"
 msgstr "Disconnecting"
 
 #. 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 "Connection failed"
 
 #. 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 "Status unknown (missing)"
 
+#. TRANSLATORS: VPN status
+#: ../panels/network/panel-common.c:227
+msgid "Not connected"
+msgstr "Not connected"
+
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:301
+#: ../panels/network/panel-common.c:252
 msgid "Configuration failed"
 msgstr "Configuration failed"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:305
+#: ../panels/network/panel-common.c:256
 msgid "IP configuration failed"
 msgstr "IP configuration failed"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:309
+#: ../panels/network/panel-common.c:260
 msgid "IP configuration expired"
 msgstr "IP configuration expired"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:313
+#: ../panels/network/panel-common.c:264
 msgid "Secrets were required, but not provided"
 msgstr "Secrets were required, but not provided"
 
 #. 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 disconnected"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:321
+#: ../panels/network/panel-common.c:272
 msgid "802.1x supplicant configuration failed"
 msgstr "802.1x supplicant configuration failed"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:325
+#: ../panels/network/panel-common.c:276
 msgid "802.1x supplicant failed"
 msgstr "802.1x supplicant failed"
 
 #. 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 took too long to authenticate"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:333
+#: ../panels/network/panel-common.c:284
 msgid "PPP service failed to start"
 msgstr "PPP service failed to start"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:337
+#: ../panels/network/panel-common.c:288
 msgid "PPP service disconnected"
 msgstr "PPP service disconnected"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:341
+#: ../panels/network/panel-common.c:292
 msgid "PPP failed"
 msgstr "PPP failed"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:345
+#: ../panels/network/panel-common.c:296
 msgid "DHCP client failed to start"
 msgstr "DHCP client failed to start"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:349
+#: ../panels/network/panel-common.c:300
 msgid "DHCP client error"
 msgstr "DHCP client error"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:353
+#: ../panels/network/panel-common.c:304
 msgid "DHCP client failed"
 msgstr "DHCP client failed"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:357
+#: ../panels/network/panel-common.c:308
 msgid "Shared connection service failed to start"
 msgstr "Shared connection service failed to start"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:361
+#: ../panels/network/panel-common.c:312
 msgid "Shared connection service failed"
 msgstr "Shared connection service failed"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:365
+#: ../panels/network/panel-common.c:316
 msgid "AutoIP service failed to start"
 msgstr "AutoIP service failed to start"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:369
+#: ../panels/network/panel-common.c:320
 msgid "AutoIP service error"
 msgstr "AutoIP service error"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:373
+#: ../panels/network/panel-common.c:324
 msgid "AutoIP service failed"
 msgstr "AutoIP service failed"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:377
+#: ../panels/network/panel-common.c:328
 msgid "Line busy"
 msgstr "Line busy"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:381
+#: ../panels/network/panel-common.c:332
 msgid "No dial tone"
 msgstr "No dial tone"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:385
+#: ../panels/network/panel-common.c:336
 msgid "No carrier could be established"
 msgstr "No carrier could be established"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:389
+#: ../panels/network/panel-common.c:340
 msgid "Dialing request timed out"
 msgstr "Dialing request timed out"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:393
+#: ../panels/network/panel-common.c:344
 msgid "Dialing attempt failed"
 msgstr "Dialing attempt failed"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:397
+#: ../panels/network/panel-common.c:348
 msgid "Modem initialization failed"
 msgstr "Modem initialisation failed"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:401
+#: ../panels/network/panel-common.c:352
 msgid "Failed to select the specified APN"
 msgstr "Failed to select the specified APN"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:405
+#: ../panels/network/panel-common.c:356
 msgid "Not searching for networks"
 msgstr "Not searching for networks"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:409
+#: ../panels/network/panel-common.c:360
 msgid "Network registration denied"
 msgstr "Network registration denied"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:413
+#: ../panels/network/panel-common.c:364
 msgid "Network registration timed out"
 msgstr "Network registration timed out"
 
 #. 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 "Failed to register with the requested network"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:421
+#: ../panels/network/panel-common.c:372
 msgid "PIN check failed"
 msgstr "PIN check failed"
 
 #. 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 "Firmware for the device may be missing"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:429
+#: ../panels/network/panel-common.c:380
 msgid "Connection disappeared"
 msgstr "Connection disappeared"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:433
-msgid "Carrier/link changed"
-msgstr "Carrier/link changed"
-
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:437
+#: ../panels/network/panel-common.c:384
 msgid "Existing connection was assumed"
 msgstr "Existing connection was assumed"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:441
+#: ../panels/network/panel-common.c:388
 msgid "Modem not found"
 msgstr "Modem not found"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:445
+#: ../panels/network/panel-common.c:392
 msgid "Bluetooth connection failed"
 msgstr "Bluetooth connection failed"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:449
+#: ../panels/network/panel-common.c:396
 msgid "SIM Card not inserted"
 msgstr "SIM Card not inserted"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:453
+#: ../panels/network/panel-common.c:400
 msgid "SIM Pin required"
 msgstr "SIM Pin required"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:457
+#: ../panels/network/panel-common.c:404
 msgid "SIM Puk required"
 msgstr "SIM Puk required"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:461
+#: ../panels/network/panel-common.c:408
 msgid "SIM wrong"
 msgstr "SIM wrong"
 
 #. 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 "InfiniBand device does not support connected mode"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:469
+#: ../panels/network/panel-common.c:416
 msgid "Connection dependency failed"
 msgstr "Connection dependency failed"
 
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:440
+msgid "Firmware missing"
+msgstr "Firmware missing"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447
+msgid "Cable unplugged"
+msgstr "Cable unplugged"
+
+#: ../panels/network/wireless-security/eap-method.c:275
+msgid "No Certificate Authority certificate chosen"
+msgstr "No Certificate Authority certificate chosen"
+
+#: ../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 ""
+"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?"
+
+#: ../panels/network/wireless-security/eap-method.c:281
+msgid "Ignore"
+msgstr "Ignore"
+
+#: ../panels/network/wireless-security/eap-method.c:285
+msgid "Choose CA Certificate"
+msgstr "Choose CA Certificate"
+
+#: ../panels/network/wireless-security/eap-method.c:645
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+msgstr "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+
+#: ../panels/network/wireless-security/eap-method.c:648
+msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
+msgstr "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
+
+#: ../panels/network/wireless-security/eap-method-fast.c:261
+#: ../panels/network/wireless-security/eap-method-peap.c:280
+msgid "GTC"
+msgstr "GTC"
+
+#: ../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 "MSCHAPv2"
+
+#: ../panels/network/wireless-security/eap-method-fast.c:399
+msgid "Choose a PAC file..."
+msgstr "Choose a PAC file…"
+
+#: ../panels/network/wireless-security/eap-method-fast.c:406
+msgid "PAC files (*.pac)"
+msgstr "PAC files (*.pac)"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
+msgid "PAC _file"
+msgstr "PAC _file"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:7
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
+msgid "_Inner authentication"
+msgstr "_Inner authentication"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
+msgid "PAC pro_visioning"
+msgstr "PAC pro_visioning"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
+#: ../panels/network/wireless-security/eap-method-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 "Anonymous"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
+msgid "Authenticated"
+msgstr "Authenticated"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:8
+msgid "Both"
+msgstr "Both"
+
+#: ../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 "_Username"
+
+#: ../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
+msgid "Sho_w password"
+msgstr "Sho_w password"
+
+#: ../panels/network/wireless-security/eap-method-peap.c:263
+#: ../panels/network/wireless-security/wireless-security.c:385
+msgid "MD5"
+msgstr "MD5"
+
+#: ../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 "Choose a Certificate Authority certificate…"
+
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:3
+msgid "Version 0"
+msgstr "Version 0"
+
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:4
+msgid "Version 1"
+msgstr "Version 1"
+
+#: ../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 "C_A certificate"
+
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
+msgid "PEAP _version"
+msgstr "PEAP _version"
+
+#: ../panels/network/wireless-security/eap-method-simple.ui.h:3
+msgid "As_k for this password every time"
+msgstr "As_k for this password every time"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:260
+msgid "Unencrypted private keys are insecure"
+msgstr "Unencrypted private keys are insecure"
+
+#: ../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 ""
+"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)"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:428
+msgid "Choose your personal certificate..."
+msgstr "Choose your personal certificate…"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:440
+msgid "Choose your private key..."
+msgstr "Choose your private key…"
+
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:1
+msgid "I_dentity"
+msgstr "I_dentity"
+
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:2
+msgid "_User certificate"
+msgstr "_User certificate"
+
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:4
+msgid "Private _key"
+msgstr "Private _key"
+
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:5
+msgid "_Private key password"
+msgstr "_Private key password"
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:230
+msgid "PAP"
+msgstr "PAP"
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:247
+msgid "MSCHAP"
+msgstr "MSCHAP"
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:280
+msgid "CHAP"
+msgstr "CHAP"
+
+#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1
+msgid "Don't _warn me again"
+msgstr "Don't _warn me again"
+
+#: ../panels/network/wireless-security/wireless-security.c:397
+msgid "TLS"
+msgstr "TLS"
+
+#: ../panels/network/wireless-security/wireless-security.c:421
+msgid "FAST"
+msgstr "FAST"
+
+#: ../panels/network/wireless-security/wireless-security.c:432
+msgid "Tunneled TLS"
+msgstr "Tunnelled TLS"
+
+#: ../panels/network/wireless-security/wireless-security.c:443
+msgid "Protected EAP (PEAP)"
+msgstr "Protected EAP (PEAP)"
+
+#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:2
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:9
+#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:2
+msgid "Au_thentication"
+msgstr "Au_thentication"
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:1
+msgid "1 (Default)"
+msgstr "1 (Default)"
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr "2"
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr "3"
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr "4"
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:5
+msgid "Open System"
+msgstr "Open System"
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:6
+msgid "Shared Key"
+msgstr "Shared Key"
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:7
+msgid "_Key"
+msgstr "_Key"
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:8
+msgid "Sho_w key"
+msgstr "Sho_w key"
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:10
+msgid "WEP inde_x"
+msgstr "WEP inde_x"
+
+#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type"
+msgstr "_Type"
+
+#. TRANSLATORS: this is the per application switch for message tray usage.
+#: ../panels/notifications/cc-edit-dialog.c:39
+msgctxt "notifications"
+msgid "Notifications"
+msgstr "Notifications"
+
+#. TRANSLATORS: this is the setting to configure sounds associated with notifications
+#: ../panels/notifications/cc-edit-dialog.c:41
+msgctxt "notifications"
+msgid "Sound Alerts"
+msgstr "Sound Alerts"
+
+#: ../panels/notifications/cc-edit-dialog.c:42
+msgctxt "notifications"
+msgid "Show Popup Banners"
+msgstr "Show Popup Banners"
+
+#. TRANSLATORS: banners here refers to message tray notifications in the middle of the screen
+#: ../panels/notifications/cc-edit-dialog.c:44
+msgctxt "notifications"
+msgid "Show Details in Banners"
+msgstr "Show Details in Banners"
+
+#: ../panels/notifications/cc-edit-dialog.c:45
+msgctxt "notifications"
+msgid "View in Lock Screen"
+msgstr "View in Lock Screen"
+
+#: ../panels/notifications/cc-edit-dialog.c:46
+msgctxt "notifications"
+msgid "Show Details in Lock Screen"
+msgstr "Show Details in Lock Screen"
+
+#: ../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 "On"
+
+#: ../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 "Off"
+
+#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1
+msgid "Notifications"
+msgstr "Notifications"
+
+#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2
+msgid "Control which notifications are displayed and what they show"
+msgstr "Control which notifications are displayed and what they show"
+
+#. 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 "Notifications;Banner;Message;Tray;Popup;"
+
+#: ../panels/notifications/notifications.ui.h:1
+msgid "Show Pop Up Banners"
+msgstr "Show Pop Up Banners"
+
+#: ../panels/notifications/notifications.ui.h:2
+msgid "Show in Lock Screen"
+msgstr "Show in Lock Screen"
+
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:190
+#: ../panels/region/cc-input-chooser.c:997
+#: ../panels/search/cc-search-locations-dialog.c:480
+msgid "Other"
+msgstr "Other"
+
 #. translators: This is the title of the "Add Account" dialog.
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:249
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291
 #: ../panels/online-accounts/online-accounts.ui.h:2
 msgid "Add Account"
 msgstr "Add Account"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:383
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:329
+msgid "Mail"
+msgstr "Mail"
+
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:335
+msgid "Contacts"
+msgstr "Contacts"
+
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:341
+msgid "Resources"
+msgstr "Resources"
+
+#: ../panels/online-accounts/cc-online-accounts-panel.c:358
 msgid "Error logging into the account"
 msgstr "Error logging into the account"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:437
-msgid "Expired credentials. Please log in again."
-msgstr "Expired credentials. Please log in again."
+#: ../panels/online-accounts/cc-online-accounts-panel.c:430
+msgid "Credentials have expired."
+msgstr "Credentials have expired."
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:440
-msgid "_Log In"
-msgstr "_Log In"
+#: ../panels/online-accounts/cc-online-accounts-panel.c:434
+msgid "Sign in to enable this account."
+msgstr "Sign in to enable this account."
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:676
+#: ../panels/online-accounts/cc-online-accounts-panel.c:439
+msgid "_Sign In"
+msgstr "_Sign In"
+
+#: ../panels/online-accounts/cc-online-accounts-panel.c:680
 msgid "Error creating account"
 msgstr "Error creating account"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:718
+#: ../panels/online-accounts/cc-online-accounts-panel.c:722
 msgid "Error removing account"
 msgstr "Error removing account"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:754
+#: ../panels/online-accounts/cc-online-accounts-panel.c:758
 msgid "Are you sure you want to remove the account?"
 msgstr "Are you sure you want to remove the account?"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:756
+#: ../panels/online-accounts/cc-online-accounts-panel.c:760
 msgid "This will not remove the account on the server."
 msgstr "This will not remove the account on the server."
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:757
+#: ../panels/online-accounts/cc-online-accounts-panel.c:761
 msgid "_Remove"
 msgstr "_Remove"
 
@@ -2342,8 +3594,8 @@ msgid "Online Accounts"
 msgstr "Online Accounts"
 
 #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2
-msgid "Manage online accounts"
-msgstr "Manage online accounts"
+msgid "Connect to your online accounts and decide what to use them for"
+msgstr "Connect to your online accounts and decide what to use them for"
 
 #. Translators: those are keywords for the online-accounts control-center panel
 #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4
@@ -2370,18 +3622,18 @@ msgstr ""
 "Adding an account allows your applications to access it for documents, mail, "
 "contacts, calendar, chat and more."
 
-#: ../panels/power/cc-power-panel.c:157
+#: ../panels/power/cc-power-panel.c:184
 msgid "Unknown time"
 msgstr "Unknown time"
 
-#: ../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 minute"
 msgstr[1] "%i minutes"
 
-#: ../panels/power/cc-power-panel.c:175
+#: ../panels/power/cc-power-panel.c:202
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -2390,192 +3642,237 @@ msgstr[1] "%i hours"
 
 #. 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] "hour"
 msgstr[1] "hours"
 
-#: ../panels/power/cc-power-panel.c:185
+#: ../panels/power/cc-power-panel.c:212
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:228
+#: ../panels/power/cc-power-panel.c:231
 #, c-format
-msgid "Charging - %s until fully charged"
-msgstr "Charging - %s until fully charged"
+msgid "%s until fully charged"
+msgstr "%s until fully charged"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:236
+#: ../panels/power/cc-power-panel.c:238
 #, c-format
-msgid "Caution low battery, %s remaining"
-msgstr "Caution low battery, %s remaining"
+msgid "Caution: %s remaining"
+msgstr "Caution: %s remaining"
 
 #. 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 "Using battery power - %s remaining"
+msgid "%s remaining"
+msgstr "%s remaining"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:261
-msgid "Charging"
-msgstr "Charging"
+#: ../panels/power/cc-power-panel.c:248 ../panels/power/cc-power-panel.c:276
+msgid "Fully charged"
+msgstr "Fully charged"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:266
-msgid "Using battery power"
-msgstr "Using battery power"
+#: ../panels/power/cc-power-panel.c:252 ../panels/power/cc-power-panel.c:280
+msgid "Empty"
+msgstr "Empty"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:270
-msgid "Charging - fully charged"
-msgstr "Charging - fully charged"
+#: ../panels/power/cc-power-panel.c:267
+msgid "Charging"
+msgstr "Charging"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:274
-msgid "Empty"
-msgstr "Empty"
+#: ../panels/power/cc-power-panel.c:272
+msgid "Discharging"
+msgstr "Discharging"
 
-#. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:342
+#: ../panels/power/cc-power-panel.c:324
 #, c-format
-msgid "Caution low UPS, %s remaining"
-msgstr "Caution low UPS, %s remaining"
-
-#. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:348
-#, c-format
-msgid "Using UPS power - %s remaining"
-msgstr "Using UPS power - %s remaining"
-
-#. TRANSLATORS: UPS battery
-#: ../panels/power/cc-power-panel.c:366
-msgid "Caution low UPS"
-msgstr "Caution low UPS"
+msgid "Estimated battery capacity: %s"
+msgstr "Estimated battery capacity: %s"
 
-#. TRANSLATORS: UPS battery
-#: ../panels/power/cc-power-panel.c:371
-msgid "Using UPS power"
-msgstr "Using UPS power"
+#: ../panels/power/cc-power-panel.c:404
+msgctxt "Battery name"
+msgid "Main"
+msgstr "Main"
 
-#. TRANSLATORS: secondary battery is normally in the media bay
-#: ../panels/power/cc-power-panel.c:423
-msgid "Your secondary battery is fully charged"
-msgstr "Your secondary battery is fully charged"
-
-#. TRANSLATORS: secondary battery is normally in the media bay
-#: ../panels/power/cc-power-panel.c:427
-msgid "Your secondary battery is empty"
-msgstr "Your secondary battery is empty"
+#: ../panels/power/cc-power-panel.c:406
+msgctxt "Battery name"
+msgid "Extra"
+msgstr "Extra"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:510
+#: ../panels/power/cc-power-panel.c:493
 msgid "Wireless mouse"
 msgstr "Wireless mouse"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:514
+#: ../panels/power/cc-power-panel.c:497
 msgid "Wireless keyboard"
 msgstr "Wireless keyboard"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:518
+#: ../panels/power/cc-power-panel.c:501
 msgid "Uninterruptible power supply"
 msgstr "Uninterruptible power supply"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:522
+#: ../panels/power/cc-power-panel.c:506
 msgid "Personal digital assistant"
 msgstr "Personal digital assistant"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:526
+#: ../panels/power/cc-power-panel.c:510
 msgid "Cellphone"
 msgstr "Mobile phone"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:530
+#: ../panels/power/cc-power-panel.c:514
 msgid "Media player"
 msgstr "Media player"
 
 #. 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 "Computer"
 
 #. 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 "Battery"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:553
+#: ../panels/power/cc-power-panel.c:535
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "Charging"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:560
+#: ../panels/power/cc-power-panel.c:542
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "Caution"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:565
+#: ../panels/power/cc-power-panel.c:547
 msgctxt "Battery power"
 msgid "Low"
 msgstr "Low"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:570
+#: ../panels/power/cc-power-panel.c:552
 msgctxt "Battery power"
 msgid "Good"
 msgstr "Good"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:575
+#: ../panels/power/cc-power-panel.c:557
 msgctxt "Battery power"
-msgid "Charging - fully charged"
-msgstr "Charging - fully charged"
+msgid "Fully charged"
+msgstr "Fully charged"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:579
+#: ../panels/power/cc-power-panel.c:561
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "Empty"
 
-#: ../panels/power/cc-power-panel.c:1075
-msgid ""
-"Tip: <a href=\"screen\">screen brightness</a> affects how much power is used"
-msgstr ""
-"Tip: <a href=\"screen\">screen brightness</a> affects how much power is used"
+#: ../panels/power/cc-power-panel.c:732
+msgid "Batteries"
+msgstr "Batteries"
+
+#: ../panels/power/cc-power-panel.c:1074
+msgid "When _idle"
+msgstr "When _idle"
+
+#: ../panels/power/cc-power-panel.c:1401
+msgid "Power Saving"
+msgstr "Power Saving"
+
+#: ../panels/power/cc-power-panel.c:1430
+msgid "_Screen Brightness"
+msgstr "_Screen Brightness"
+
+#: ../panels/power/cc-power-panel.c:1458
+msgid "_Dim Screen when Inactive"
+msgstr "_Dim Screen when Inactive"
+
+#: ../panels/power/cc-power-panel.c:1481
+msgid "_Blank Screen"
+msgstr "_Blank Screen"
+
+#: ../panels/power/cc-power-panel.c:1516
+msgid "_Wi-Fi"
+msgstr "_Wi-Fi"
+
+#: ../panels/power/cc-power-panel.c:1544
+msgid "_Mobile Broadband"
+msgstr "_Mobile Broadband"
+
+#: ../panels/power/cc-power-panel.c:1582
+msgid "_Bluetooth"
+msgstr "_Bluetooth"
+
+#: ../panels/power/cc-power-panel.c:1633
+msgid "When on battery power"
+msgstr "When on battery power"
+
+#: ../panels/power/cc-power-panel.c:1635
+msgid "When plugged in"
+msgstr "When plugged in"
+
+#: ../panels/power/cc-power-panel.c:1762
+msgid "Suspend & Power Off"
+msgstr "Suspend & Power Off"
+
+#: ../panels/power/cc-power-panel.c:1793
+msgid "_Automatic Suspend"
+msgstr "_Automatic Suspend"
+
+#: ../panels/power/cc-power-panel.c:1815
+msgid "When Battery Power is _Critical"
+msgstr "When Battery Power is _Critical"
+
+#: ../panels/power/cc-power-panel.c:1848
+msgid "Power Off"
+msgstr "Power Off"
+
+#: ../panels/power/cc-power-panel.c:1990
+msgid "Devices"
+msgstr "Devices"
 
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:1
 msgid "Power"
 msgstr "Power"
 
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:2
-msgid "Power management settings"
-msgstr "Power management settings"
+msgid "View your battery status and change power saving settings"
+msgstr "View your battery status and change power saving settings"
 
 #. 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;"
-msgstr "Power;Sleep;Suspend;Hibernate;Battery;"
+msgid ""
+"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
+msgstr ""
+"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle"
+";"
 
 #: ../panels/power/power.ui.h:1
 msgid "Hibernate"
@@ -2585,178 +3882,233 @@ msgstr "Hibernate"
 msgid "Power off"
 msgstr "Power off"
 
-#: ../panels/power/power.ui.h:3 ../panels/screen/screen.ui.h:6
-msgid "5 minutes"
-msgstr "5 minutes"
-
-#: ../panels/power/power.ui.h:4 ../panels/screen/screen.ui.h:7
-msgid "10 minutes"
-msgstr "10 minutes"
-
-#: ../panels/power/power.ui.h:5 ../panels/screen/screen.ui.h:8
-msgid "30 minutes"
-msgstr "30 minutes"
+#: ../panels/power/power.ui.h:5
+msgid "45 minutes"
+msgstr "45 minutes"
 
-#: ../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 hour"
 
 #: ../panels/power/power.ui.h:7
-msgid "Don't suspend"
-msgstr "Don't suspend"
+msgid "80 minutes"
+msgstr "80 minutes"
 
 #: ../panels/power/power.ui.h:8
-msgid "On battery power"
-msgstr "On battery power"
+msgid "90 minutes"
+msgstr "90 minutes"
 
 #: ../panels/power/power.ui.h:9
-msgid "When plugged in"
-msgstr "When plugged in"
+msgid "100 minutes"
+msgstr "100 minutes"
 
 #: ../panels/power/power.ui.h:10
-msgid "Suspend when inactive for"
-msgstr "Suspend when inactive for"
+msgid "2 hours"
+msgstr "2 hours"
+
+#: ../panels/power/power.ui.h:11 ../panels/privacy/privacy.ui.h:3
+msgid "1 minute"
+msgstr "1 minute"
+
+#: ../panels/power/power.ui.h:12 ../panels/privacy/privacy.ui.h:4
+msgid "2 minutes"
+msgstr "2 minutes"
+
+#: ../panels/power/power.ui.h:13 ../panels/privacy/privacy.ui.h:5
+msgid "3 minutes"
+msgstr "3 minutes"
+
+#: ../panels/power/power.ui.h:14
+msgid "4 minutes"
+msgstr "4 minutes"
+
+#: ../panels/power/power.ui.h:15 ../panels/privacy/privacy.ui.h:6
+msgid "5 minutes"
+msgstr "5 minutes"
+
+#: ../panels/power/power.ui.h:16
+msgid "8 minutes"
+msgstr "8 minutes"
+
+#: ../panels/power/power.ui.h:17
+msgid "10 minutes"
+msgstr "10 minutes"
+
+#: ../panels/power/power.ui.h:18
+msgid "12 minutes"
+msgstr "12 minutes"
+
+#: ../panels/power/power.ui.h:20
+msgid "Automatic Suspend"
+msgstr "Automatic Suspend"
+
+#: ../panels/power/power.ui.h:21 ../panels/privacy/privacy.ui.h:10
+msgid "_Close"
+msgstr "_Close"
+
+#: ../panels/power/power.ui.h:22
+msgid "_Plugged In"
+msgstr "_Plugged In"
+
+#: ../panels/power/power.ui.h:23
+msgid "On _Battery Power"
+msgstr "On _Battery Power"
 
-#: ../panels/power/power.ui.h:11
-msgid "When power is _critically low"
-msgstr "When power is _critically low"
+#: ../panels/power/power.ui.h:24
+msgid "Delay"
+msgstr "Delay"
+
+#: ../panels/printers/authentication-dialog.ui.h:3
+msgid "Authenticate"
+msgstr "Authenticate"
+
+#: ../panels/printers/authentication-dialog.ui.h:5
+#: ../panels/sharing/sharing.ui.h:21
+msgid "Password"
+msgstr "Password"
+
+#: ../panels/printers/authentication-dialog.ui.h:6
+msgid "Authentication Required"
+msgstr "Authentication Required"
 
 #. 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 "Low on toner"
 
 #. 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 "Out of toner"
 
 #. 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 "Low on developer"
 
 #. 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 "Out of developer"
 
 #. 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 "Low on a marker supply"
 
 #. 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 "Out of a marker supply"
 
 #. 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 "Open cover"
 
 #. 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 "Open door"
 
 #. 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 "Low on paper"
 
 #. 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 "Out of paper"
 
 #. 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 "Offline"
 
-#. 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 "Paused"
+msgid "Stopped"
+msgstr "Stopped"
 
 #. 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 "Waste receptacle almost full"
 
 #. 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 "Waste receptacle full"
 
 #. 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 "The optical photo conductor is near end of life"
 
 #. 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 "The optical photo conductor is no longer functioning"
 
 #. 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 "Configuring"
 
 #. 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 "Ready"
 
+#. 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 "Does not accept jobs"
+
 #. 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 "Processing"
 
-#. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/cc-printers-panel.c:789
-msgctxt "printer state"
-msgid "Stopped"
-msgstr "Stopped"
-
 #. Translators: Toner supply
-#: ../panels/printers/cc-printers-panel.c:906
+#: ../panels/printers/cc-printers-panel.c:923
 msgid "Toner Level"
 msgstr "Toner Level"
 
 #. Translators: Ink supply
-#: ../panels/printers/cc-printers-panel.c:909
+#: ../panels/printers/cc-printers-panel.c:926
 msgid "Ink Level"
 msgstr "Ink Level"
 
 #. 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 "Supply Level"
 
 #. 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 "Installing"
 
 #. 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 "No printers available"
 
 #. 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"
@@ -2764,15 +4116,15 @@ msgstr[0] "%u active"
 msgstr[1] "%u active"
 
 #. 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 "Failed to add new printer."
 
-#: ../panels/printers/cc-printers-panel.c:1896
+#: ../panels/printers/cc-printers-panel.c:1940
 msgid "Select PPD File"
 msgstr "Select PPD File"
 
-#: ../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)"
@@ -2780,30 +4132,30 @@ msgstr ""
 "PostScript Printer Description files (*.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 "No suitable driver found"
 
-#: ../panels/printers/cc-printers-panel.c:2279
-msgid "Searching for preferred drivers..."
+#: ../panels/printers/cc-printers-panel.c:2323
+msgid "Searching for preferred drivers…"
 msgstr "Searching for preferred drivers…"
 
-#: ../panels/printers/cc-printers-panel.c:2294
-msgid "Select from database..."
+#: ../panels/printers/cc-printers-panel.c:2338
+msgid "Select from database…"
 msgstr "Select from database…"
 
-#: ../panels/printers/cc-printers-panel.c:2303
-msgid "Provide PPD File..."
+#: ../panels/printers/cc-printers-panel.c:2347
+msgid "Provide PPD File…"
 msgstr "Provide PPD File…"
 
 #. 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 "Test page"
 
 #. 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 "Could not load ui: %s"
@@ -2813,112 +4165,97 @@ msgid "Printers"
 msgstr "Printers"
 
 #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2
-msgid "Change printer settings"
-msgstr "Change printer settings"
+msgid "Add printers, view printer jobs and decide how you want to print"
+msgstr "Add printers, view printer jobs and decide how you want to print"
 
 #. 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;Queue;Print;Paper;Ink;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 "Active Jobs"
+
+#: ../panels/printers/jobs-dialog.ui.h:3
+#: ../panels/printers/options-dialog.ui.h:2
+#: ../panels/user-accounts/data/history-dialog.ui.h:2
 msgid "Close"
 msgstr "Close"
 
-#. Translators: This tab contains list of active print jobs of the selected printer
 #: ../panels/printers/jobs-dialog.ui.h:4
-msgid "Active Jobs"
-msgstr "Active Jobs"
-
-#: ../panels/printers/jobs-dialog.ui.h:5
 msgid "Resume Printing"
 msgstr "Resume Printing"
 
-#: ../panels/printers/jobs-dialog.ui.h:6
+#: ../panels/printers/jobs-dialog.ui.h:5
 msgid "Pause Printing"
 msgstr "Pause Printing"
 
-#: ../panels/printers/jobs-dialog.ui.h:7
+#: ../panels/printers/jobs-dialog.ui.h:6
 msgid "Cancel Print Job"
 msgstr "Cancel Print Job"
 
-#: ../panels/printers/new-printer-dialog.ui.h:2
-#: ../panels/user-accounts/um-account-dialog.c:1044
-msgid "_Add"
-msgstr "_Add"
-
-#: ../panels/printers/new-printer-dialog.ui.h:3
+#: ../panels/printers/new-printer-dialog.ui.h:1
 msgid "Add a New Printer"
 msgstr "Add a New Printer"
 
+#: ../panels/printers/new-printer-dialog.ui.h:2
+#: ../panels/user-accounts/um-user-panel.c:467
+msgid "_Cancel"
+msgstr "_Cancel"
+
 #: ../panels/printers/new-printer-dialog.ui.h:4
 msgid "Search for network printers or filter result"
 msgstr "Search for network printers or filter result"
 
-#: ../panels/printers/options-dialog.ui.h:2
-msgid "Options"
-msgstr "Options"
-
-#: ../panels/printers/options-dialog.ui.h:3
-msgid "Loading options..."
+#: ../panels/printers/options-dialog.ui.h:1
+msgid "Loading options…"
 msgstr "Loading options…"
 
-#: ../panels/printers/ppd-selection-dialog.ui.h:2
-#: ../panels/user-accounts/data/photo-dialog.ui.h:8
-#: ../panels/user-accounts/um-account-dialog.c:1043
-msgid "Cancel"
-msgstr "Cancel"
+#: ../panels/printers/ppd-selection-dialog.ui.h:1
+msgid "Select Printer Driver"
+msgstr "Select Printer Driver"
 
 #: ../panels/printers/ppd-selection-dialog.ui.h:4
 msgid "Loading drivers database..."
 msgstr "Loading drivers database…"
 
-#: ../panels/printers/ppd-selection-dialog.ui.h:5
-msgid "Select Printer Driver"
-msgstr "Select Printer Driver"
-
 #. Translators: this is an option of "Two Sided"
-#: ../panels/printers/pp-ipp-option-widget.c:65
-#: ../panels/printers/pp-ppd-option-widget.c:69
+#: ../panels/printers/pp-ipp-option-widget.c:67
+#: ../panels/printers/pp-ppd-option-widget.c:71
 msgid "One Sided"
 msgstr "One Sided"
 
 #. Translators: this is an option of "Two Sided"
-#: ../panels/printers/pp-ipp-option-widget.c:67
-#: ../panels/printers/pp-ppd-option-widget.c:71
+#: ../panels/printers/pp-ipp-option-widget.c:69
+#: ../panels/printers/pp-ppd-option-widget.c:73
 msgid "Long Edge (Standard)"
 msgstr "Long Edge (Standard)"
 
 #. Translators: this is an option of "Two Sided"
-#: ../panels/printers/pp-ipp-option-widget.c:69
-#: ../panels/printers/pp-ppd-option-widget.c:73
+#: ../panels/printers/pp-ipp-option-widget.c:71
+#: ../panels/printers/pp-ppd-option-widget.c:75
 msgid "Short Edge (Flip)"
 msgstr "Short Edge (Flip)"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:71
+#: ../panels/printers/pp-ipp-option-widget.c:73
 msgid "Portrait"
 msgstr "Portrait"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:73
+#: ../panels/printers/pp-ipp-option-widget.c:75
 msgid "Landscape"
 msgstr "Landscape"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:75
+#: ../panels/printers/pp-ipp-option-widget.c:77
 msgid "Reverse landscape"
 msgstr "Reverse landscape"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:77
+#: ../panels/printers/pp-ipp-option-widget.c:79
 msgid "Reverse portrait"
 msgstr "Reverse portrait"
 
@@ -2979,13 +4316,13 @@ msgstr "Job State"
 msgid "Time"
 msgstr "Time"
 
-#: ../panels/printers/pp-jobs-dialog.c:484
+#: ../panels/printers/pp-jobs-dialog.c:496
 #, c-format
 msgid "%s Active Jobs"
 msgstr "%s Active Jobs"
 
 #. 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 "No printers detected."
 
@@ -3076,57 +4413,57 @@ msgctxt "Printer Option Group"
 msgid "Advanced"
 msgstr "Advanced"
 
-#. Translators: Options of given printer (e.g. "MyPrinter Options")
-#: ../panels/printers/pp-options-dialog.c:936
-#, c-format
-msgid "%s Options"
-msgstr "%s Options"
-
 #. Translators: this is an option of "Paper Source"
-#: ../panels/printers/pp-ppd-option-widget.c:75
 #: ../panels/printers/pp-ppd-option-widget.c:77
-#: ../panels/printers/pp-ppd-option-widget.c:85
+#: ../panels/printers/pp-ppd-option-widget.c:79
+#: ../panels/printers/pp-ppd-option-widget.c:87
 msgid "Auto Select"
 msgstr "Auto Select"
 
 #. Translators: this is an option of "Paper Source"
 #. Translators: this is an option of "Resolution"
-#: ../panels/printers/pp-ppd-option-widget.c:79
 #: ../panels/printers/pp-ppd-option-widget.c:81
 #: ../panels/printers/pp-ppd-option-widget.c:83
-#: ../panels/printers/pp-ppd-option-widget.c:87
+#: ../panels/printers/pp-ppd-option-widget.c:85
+#: ../panels/printers/pp-ppd-option-widget.c:89
 msgid "Printer Default"
 msgstr "Printer Default"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:89
+#: ../panels/printers/pp-ppd-option-widget.c:91
 msgid "Embed GhostScript fonts only"
 msgstr "Embed GhostScript fonts only"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:91
+#: ../panels/printers/pp-ppd-option-widget.c:93
 msgid "Convert to PS level 1"
 msgstr "Convert to PS level 1"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:93
+#: ../panels/printers/pp-ppd-option-widget.c:95
 msgid "Convert to PS level 2"
 msgstr "Convert to PS level 2"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:95
+#: ../panels/printers/pp-ppd-option-widget.c:97
 msgid "No pre-filtering"
 msgstr "No pre-filtering"
 
 #. Translators: Name of column showing printer manufacturers
-#: ../panels/printers/pp-ppd-selection-dialog.c:230
-msgid "Manufacturers"
-msgstr "Manufacturers"
+#: ../panels/printers/pp-ppd-selection-dialog.c:233
+msgid "Manufacturer"
+msgstr "Manufacturer"
 
 #. Translators: Name of column showing printer drivers
-#: ../panels/printers/pp-ppd-selection-dialog.c:242
-msgid "Drivers"
-msgstr "Drivers"
+#: ../panels/printers/pp-ppd-selection-dialog.c:250
+msgid "Driver"
+msgstr "Driver"
+
+#. 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 "Enter your username and password to view printers available on %s."
 
 #: ../panels/printers/printers.ui.h:1
 msgid "Add Printer"
@@ -3155,339 +4492,603 @@ msgstr "_Default"
 msgid "Jobs"
 msgstr "Jobs"
 
-#. 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 "_Show"
+msgid "Show _Jobs"
+msgstr "Show _Jobs"
 
 #: ../panels/printers/printers.ui.h:12
 msgid "Model"
 msgstr "Model"
 
-#: ../panels/printers/printers.ui.h:14
-msgid "page 1"
-msgstr "page 1"
-
 #: ../panels/printers/printers.ui.h:15
 msgid "label"
 msgstr "label"
 
-#: ../panels/printers/printers.ui.h:16
-msgid "page 2"
-msgstr "page 2"
-
 #: ../panels/printers/printers.ui.h:17
-msgid "Setting new driver..."
+msgid "Setting new driver…"
 msgstr "Setting new driver…"
 
-#: ../panels/printers/printers.ui.h:18
-msgid "page 3"
-msgstr "page 3"
+#: ../panels/printers/printers.ui.h:18
+msgid "page 3"
+msgstr "page 3"
+
+#. Translators: This button executes command which prints test page.
+#: ../panels/printers/printers.ui.h:20
+msgid "Print _Test Page"
+msgstr "Print _Test Page"
+
+#. Translators: This button opens printer's options tab
+#: ../panels/printers/printers.ui.h:22
+msgid "_Options"
+msgstr "_Options"
+
+#. Translators: This button adds new printer.
+#: ../panels/printers/printers.ui.h:24
+msgid "Add New Printer"
+msgstr "Add New Printer"
+
+#. Translators: The CUPS server is not running (we can not connect to it).
+#: ../panels/printers/printers.ui.h:26
+msgid ""
+"Sorry! The system printing service\n"
+"doesn't seem to be available."
+msgstr ""
+"Sorry! The system printing service\n"
+"doesn't seem to be available."
+
+#: ../panels/privacy/cc-privacy-panel.c:105
+msgid "Hidden"
+msgstr "Hidden"
+
+#: ../panels/privacy/cc-privacy-panel.c:105
+msgid "Visible"
+msgstr "Visible"
+
+#: ../panels/privacy/cc-privacy-panel.c:271 ../panels/privacy/privacy.ui.h:31
+msgid "Screen Lock"
+msgstr "Screen Lock"
+
+#: ../panels/privacy/cc-privacy-panel.c:338 ../panels/privacy/privacy.ui.h:9
+msgid "Name & Visibility"
+msgstr "Name & Visibility"
+
+#: ../panels/privacy/cc-privacy-panel.c:446 ../panels/privacy/privacy.ui.h:26
+msgid "Usage & History"
+msgstr "Usage & History"
+
+#: ../panels/privacy/cc-privacy-panel.c:576 ../panels/privacy/privacy.ui.h:36
+msgid "Purge Trash & Temporary Files"
+msgstr "Purge Wastebasket & Temporary Files"
+
+#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1
+msgid "Privacy"
+msgstr "Privacy"
+
+#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2
+msgid "Protect your personal information and control what others might see"
+msgstr "Protect your personal information and control what others might see"
+
+#. 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 ""
+"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;networ"
+"k;identity;"
+
+#: ../panels/privacy/privacy.ui.h:1
+msgid "Screen Turns Off"
+msgstr "Screen Turns Off"
+
+#: ../panels/privacy/privacy.ui.h:2
+msgid "30 seconds"
+msgstr "30 seconds"
+
+#: ../panels/privacy/privacy.ui.h:11
+msgid "Control how you appear on the screen and the network."
+msgstr "Control how you appear on the screen and the network."
+
+#: ../panels/privacy/privacy.ui.h:12
+msgid "Display _full name in top bar"
+msgstr "Display _full name in top bar"
+
+#: ../panels/privacy/privacy.ui.h:13
+msgid "Display full name in _lock screen"
+msgstr "Display full name in _lock screen"
+
+#: ../panels/privacy/privacy.ui.h:14
+msgid "_Stealth Mode"
+msgstr "_Stealth Mode"
+
+#: ../panels/privacy/privacy.ui.h:15
+msgid "Immediately"
+msgstr "Immediately"
+
+#: ../panels/privacy/privacy.ui.h:16
+msgid "1 day"
+msgstr "1 day"
+
+#: ../panels/privacy/privacy.ui.h:17
+msgid "2 days"
+msgstr "2 days"
+
+#: ../panels/privacy/privacy.ui.h:18
+msgid "3 days"
+msgstr "3 days"
+
+#: ../panels/privacy/privacy.ui.h:19
+msgid "4 days"
+msgstr "4 days"
+
+#: ../panels/privacy/privacy.ui.h:20
+msgid "5 days"
+msgstr "5 days"
+
+#: ../panels/privacy/privacy.ui.h:21
+msgid "6 days"
+msgstr "6 days"
+
+#: ../panels/privacy/privacy.ui.h:22
+msgid "7 days"
+msgstr "7 days"
+
+#: ../panels/privacy/privacy.ui.h:23
+msgid "14 days"
+msgstr "14 days"
+
+#: ../panels/privacy/privacy.ui.h:24
+msgid "30 days"
+msgstr "30 days"
+
+#: ../panels/privacy/privacy.ui.h:25
+msgid "Forever"
+msgstr "Forever"
+
+#: ../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 ""
+"Remembering your history makes things easier to find again. These items are "
+"never shared over the network."
+
+#: ../panels/privacy/privacy.ui.h:28
+msgid "Cl_ear Recent History"
+msgstr "Cl_ear Recent History"
+
+#: ../panels/privacy/privacy.ui.h:29
+msgid "_Recently Used"
+msgstr "_Recently Used"
+
+#: ../panels/privacy/privacy.ui.h:30
+msgid "Retain _History"
+msgstr "Retain _History"
+
+#: ../panels/privacy/privacy.ui.h:32
+msgid "The Screen Lock protects your privacy when you are away."
+msgstr "The Screen Lock protects your privacy when you are away."
+
+#: ../panels/privacy/privacy.ui.h:33
+msgid "Automatic Screen _Lock"
+msgstr "Automatic Screen _Lock"
+
+#: ../panels/privacy/privacy.ui.h:34
+msgid "Lock Screen _After Blank For"
+msgstr "Lock Screen _After Blank For"
+
+#: ../panels/privacy/privacy.ui.h:35
+msgid "Show _Notifications"
+msgstr "Show _Notifications"
+
+#: ../panels/privacy/privacy.ui.h:37
+msgid "_Empty Trash"
+msgstr "_Empty Wastebasket"
+
+#: ../panels/privacy/privacy.ui.h:38
+msgid "_Purge Temporary Files"
+msgstr "_Purge Temporary Files"
+
+#: ../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 ""
+"Automatically purge the Wastebasket and temporary files to help keep your "
+"computer free of unnecessary sensitive information."
+
+#: ../panels/privacy/privacy.ui.h:40
+msgid "Automatically Empty _Trash"
+msgstr "Automatically Empty _Wastebasket"
+
+#: ../panels/privacy/privacy.ui.h:41
+msgid "Automatically Purge Temporary _Files"
+msgstr "Automatically Purge Temporary _Files"
+
+#: ../panels/privacy/privacy.ui.h:42
+msgid "Purge _After"
+msgstr "Purge _After"
+
+#: ../panels/region/cc-format-chooser.c:122
+msgctxt "measurement format"
+msgid "Imperial"
+msgstr "Imperial"
+
+#: ../panels/region/cc-format-chooser.c:124
+msgctxt "measurement format"
+msgid "Metric"
+msgstr "Metric"
+
+#: ../panels/region/cc-format-chooser.c:268
+msgid "No regions found"
+msgstr "No regions found"
+
+#: ../panels/region/cc-input-chooser.c:179
+msgid "No input sources found"
+msgstr "No input sources found"
+
+#: ../panels/region/cc-region-panel.c:225
+msgid "Your session needs to be restarted for changes to take effect"
+msgstr "Your session needs to be restarted for changes to take effect"
+
+#: ../panels/region/cc-region-panel.c:226
+msgid "Restart Now"
+msgstr "Restart Now"
+
+#: ../panels/region/cc-region-panel.c:436
+msgctxt "Language"
+msgid "None"
+msgstr "None"
+
+#: ../panels/region/cc-region-panel.c:898
+msgid "Sorry"
+msgstr "Sorry"
+
+#: ../panels/region/cc-region-panel.c:900
+msgid "Input methods can't be used on the login screen"
+msgstr "Input methods can't be used on the login screen"
+
+#: ../panels/region/cc-region-panel.c:1345
+msgctxt "Input source"
+msgid "None"
+msgstr "None"
+
+#: ../panels/region/cc-region-panel.c:1502
+msgid "Login Screen"
+msgstr "Login Screen"
+
+#: ../panels/region/format-chooser.ui.h:1 ../panels/region/region.ui.h:3
+msgid "Formats"
+msgstr "Formats"
+
+#: ../panels/region/format-chooser.ui.h:3
+msgid "Preview"
+msgstr "Preview"
 
-#. Translators: This button executes command which prints test page.
-#: ../panels/printers/printers.ui.h:20
-msgid "Print _Test Page"
-msgstr "Print _Test Page"
+#: ../panels/region/format-chooser.ui.h:4
+msgid "Dates"
+msgstr "Dates"
 
-#. Translators: This button opens printer's options tab
-#: ../panels/printers/printers.ui.h:22
-msgid "_Options"
-msgstr "_Options"
+#: ../panels/region/format-chooser.ui.h:5
+msgid "Times"
+msgstr "Times"
 
-#. Translators: This button adds new printer.
-#: ../panels/printers/printers.ui.h:24
-msgid "Add New Printer"
-msgstr "Add New Printer"
+#: ../panels/region/format-chooser.ui.h:6
+msgid "Numbers"
+msgstr "Numbers"
 
-#. Translators: The CUPS server is not running (we can not connect to it).
-#: ../panels/printers/printers.ui.h:26
-msgid ""
-"Sorry! The system printing service\n"
-"doesn't seem to be available."
-msgstr ""
-"Sorry! The system printing service\n"
-"doesn't seem to be available."
+#: ../panels/region/format-chooser.ui.h:7
+msgid "Measurement"
+msgstr "Measurement"
+
+#: ../panels/region/format-chooser.ui.h:8
+msgid "Paper"
+msgstr "Paper"
 
 #: ../panels/region/gnome-region-panel.desktop.in.in.h:1
 msgid "Region & Language"
 msgstr "Region & Language"
 
 #: ../panels/region/gnome-region-panel.desktop.in.in.h:2
-msgid "Change your region and language settings"
-msgstr "Change your region and language settings"
+msgid ""
+"Select your display language, formats, keyboard layouts and input sources"
+msgstr ""
+"Select your display language, formats, keyboard layouts and input sources"
 
 #. Translators: those are keywords for the region control-center panel
 #: ../panels/region/gnome-region-panel.desktop.in.in.h:4
-msgid "Language;Layout;Keyboard;"
-msgstr "Language;Layout;Keyboard;"
+msgid "Language;Layout;Keyboard;Input;"
+msgstr "Language;Layout;Keyboard;Input;"
 
-#: ../panels/region/gnome-region-panel-formats.c:142
-msgid "Imperial"
-msgstr "Imperial"
+#: ../panels/region/input-chooser.ui.h:1
+msgid "Add an Input Source"
+msgstr "Add an Input Source"
 
-#: ../panels/region/gnome-region-panel-formats.c:144
-msgid "Metric"
-msgstr "Metric"
+#: ../panels/region/input-options.ui.h:1
+msgid "Input Source Options"
+msgstr "Input Source Options"
 
-#: ../panels/region/gnome-region-panel-input-chooser.ui.h:1
-msgid "Choose an input source"
-msgstr "Choose an input source"
+#: ../panels/region/input-options.ui.h:2
+msgid "Use the _same source for all windows"
+msgstr "Use the _same source for all windows"
 
-#: ../panels/region/gnome-region-panel-input-chooser.ui.h:2
-msgid "Select an input source to add"
-msgstr "Select an input source to add"
+#: ../panels/region/input-options.ui.h:3
+msgid "Allow _different sources for each window"
+msgstr "Allow _different sources for each window"
 
-#: ../panels/region/gnome-region-panel-system.c:470
-msgid ""
-"The login screen, system accounts and new user accounts use the system-wide "
-"Region and Language settings."
-msgstr ""
-"The login screen, system accounts and new user accounts use the system-wide "
-"Region and Language settings."
+#: ../panels/region/input-options.ui.h:4
+msgid "Keyboard Shortcuts"
+msgstr "Keyboard Shortcuts"
 
-#: ../panels/region/gnome-region-panel-system.c:475
-#: ../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."
-msgstr ""
-"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/input-options.ui.h:5
+msgid "Switch to previous source"
+msgstr "Switch to previous source"
 
-#: ../panels/region/gnome-region-panel-system.c:478
-msgid "Copy Settings"
-msgstr "Copy Settings"
+#: ../panels/region/input-options.ui.h:6
+msgid "Super+Shift+Space"
+msgstr "Super+Shift+Space"
 
-#: ../panels/region/gnome-region-panel-system.c:481
-#: ../panels/region/gnome-region-panel.ui.h:38
-msgid "Copy Settings..."
-msgstr "Copy Settings…"
+#: ../panels/region/input-options.ui.h:7
+msgid "Switch to next source"
+msgstr "Switch to next source"
 
-#: ../panels/region/gnome-region-panel.ui.h:1
-msgid "Region and Language"
-msgstr "Region and Language"
+#: ../panels/region/input-options.ui.h:8
+msgid "Super+Space"
+msgstr "Super+Space"
 
-#: ../panels/region/gnome-region-panel.ui.h:2
-msgid "Select a display language (change will be applied next time you log in)"
-msgstr ""
-"Select a display language (change will be applied next time you log in)"
+#: ../panels/region/input-options.ui.h:9
+msgid "You can change these shortcuts in the keyboard settings"
+msgstr "You can change these shortcuts in the keyboard settings"
 
-#: ../panels/region/gnome-region-panel.ui.h:3
-msgid "Add Language"
-msgstr "Add Language"
+#: ../panels/region/input-options.ui.h:10
+msgid "Alternative switch to next source"
+msgstr "Alternative switch to next source"
 
-#: ../panels/region/gnome-region-panel.ui.h:4
-msgid "Remove Language"
-msgstr "Remove Language"
+#: ../panels/region/region.ui.h:2
+msgid "English (United Kingdom)"
+msgstr "English (United Kingdom)"
 
-#: ../panels/region/gnome-region-panel.ui.h:5
-msgid "Install languages..."
-msgstr "Install languages…"
+#: ../panels/region/region.ui.h:4
+msgid "United Kingdom"
+msgstr "United Kingdom"
 
-#: ../panels/region/gnome-region-panel.ui.h:6
-msgid "Language"
-msgstr "Language"
+#: ../panels/region/region.ui.h:6
+msgid "Options"
+msgstr "Options"
 
-#: ../panels/region/gnome-region-panel.ui.h:7
-msgid "Select a region (change will be applied the next time you log in)"
-msgstr "Select a region (change will be applied the next time you log in)"
+#: ../panels/region/region.ui.h:7
+msgid "Login settings are used by all users when logging into the system"
+msgstr "Login settings are used by all users when logging into the system"
 
-#: ../panels/region/gnome-region-panel.ui.h:8
-msgid "Add Region"
-msgstr "Add Region"
+#: ../panels/search/cc-search-locations-dialog.c:276
+msgid "Home"
+msgstr "Home"
 
-#: ../panels/region/gnome-region-panel.ui.h:9
-msgid "Remove Region"
-msgstr "Remove Region"
+#: ../panels/search/cc-search-locations-dialog.c:476
+msgid "Places"
+msgstr "Places"
 
-#: ../panels/region/gnome-region-panel.ui.h:10
-msgid "Dates"
-msgstr "Dates"
+#: ../panels/search/cc-search-locations-dialog.c:478
+msgid "Bookmarks"
+msgstr "Bookmarks"
 
-#: ../panels/region/gnome-region-panel.ui.h:11
-msgid "Times"
-msgstr "Times"
+#: ../panels/search/cc-search-locations-dialog.c:676
+msgid "Select Location"
+msgstr "Select Location"
 
-#: ../panels/region/gnome-region-panel.ui.h:12
-msgid "Numbers"
-msgstr "Numbers"
+#: ../panels/search/cc-search-panel.c:193
+msgid "No applications found"
+msgstr "No applications found"
 
-#: ../panels/region/gnome-region-panel.ui.h:13
-msgid "Currency"
-msgstr "Currency"
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:1
+msgid "Search"
+msgstr "Search"
 
-#: ../panels/region/gnome-region-panel.ui.h:14
-msgid "Measurement"
-msgstr "Measurement"
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:2
+msgid ""
+"Control which applications show search results in the Activities Overview"
+msgstr ""
+"Control which applications show search results in the Activities Overview"
 
-#: ../panels/region/gnome-region-panel.ui.h:15
-msgid "Examples"
-msgstr "Examples"
+#. 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 "Search;Find;Index;Hide;Privacy;Results;"
 
-#: ../panels/region/gnome-region-panel.ui.h:16
-msgid "Formats"
-msgstr "Formats"
+#: ../panels/search/search-locations-dialog.ui.h:1
+msgid "Search Locations"
+msgstr "Search Locations"
 
-#: ../panels/region/gnome-region-panel.ui.h:17
-msgid "Select keyboards or other input sources"
-msgstr "Select keyboards or other input sources"
+#: ../panels/search/search.ui.h:1
+msgid "Move Up"
+msgstr "Move Up"
 
-#: ../panels/region/gnome-region-panel.ui.h:18
-msgid "Add Input Source"
-msgstr "Add Input Source"
+#: ../panels/search/search.ui.h:2
+msgid "Move Down"
+msgstr "Move Down"
 
-#: ../panels/region/gnome-region-panel.ui.h:19
-msgid "Remove Input Source"
-msgstr "Remove Input Source"
+#: ../panels/search/search.ui.h:3
+msgid "Preferences"
+msgstr "Preferences"
 
-#: ../panels/region/gnome-region-panel.ui.h:20
-msgid "Move Input Source Up"
-msgstr "Move Input Source Up"
+#: ../panels/sharing/cc-sharing-panel.c:259
+msgctxt "service is enabled"
+msgid "On"
+msgstr "On"
 
-#: ../panels/region/gnome-region-panel.ui.h:21
-msgid "Move Input Source Down"
-msgstr "Move Input Source Down"
+#: ../panels/sharing/cc-sharing-panel.c:261
+msgctxt "service is disabled"
+msgid "Off"
+msgstr "Off"
 
-#: ../panels/region/gnome-region-panel.ui.h:22
-msgid "Input Source Settings"
-msgstr "Input Source Settings"
+#: ../panels/sharing/cc-sharing-panel.c:407
+msgid "Choose a Folder"
+msgstr "Choose a Folder"
 
-#: ../panels/region/gnome-region-panel.ui.h:23
-msgid "Show Keyboard Layout"
-msgstr "Show Keyboard Layout"
+#: ../panels/sharing/cc-sharing-panel.c:585
+msgid "Copy"
+msgstr "Copy"
 
-#: ../panels/region/gnome-region-panel.ui.h:25
-msgid "Ctrl+Alt+Space"
-msgstr "Ctrl+Alt+Space"
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1
+msgid "Sharing"
+msgstr "Sharing"
 
-#: ../panels/region/gnome-region-panel.ui.h:27
-msgid "Ctrl+Alt+Shift+Space"
-msgstr "Ctrl+Alt+Shift+Space"
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2
+msgid "Control what you want to share with others"
+msgstr "Control what you want to share with others"
 
-#: ../panels/region/gnome-region-panel.ui.h:28
-msgid "Shortcut Settings"
-msgstr "Shortcut Settings"
+#. 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 ""
+"share;sharing;ssh;host;name;remote;desktop;bluetooth;obex;media;audio;video;"
+"pictures;photos;movies;server;renderer;"
 
-#: ../panels/region/gnome-region-panel.ui.h:30
-msgid "Input Sources"
-msgstr "Input Sources"
+#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1
+msgid "Enable or disable remote login"
+msgstr "Enable or disable remote login"
 
-#. '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 "Display language:"
+#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:2
+msgid "Authentication is required to enable or disable remote login"
+msgstr "Authentication is required to enable or disable remote login"
 
-#: ../panels/region/gnome-region-panel.ui.h:34
-msgid "Input source:"
-msgstr "Input source:"
+#: ../panels/sharing/sharing.ui.h:1
+msgid "Bluetooth Sharing"
+msgstr "Bluetooth Sharing"
 
-#: ../panels/region/gnome-region-panel.ui.h:35
-msgid "Format:"
-msgstr "Format:"
+#: ../panels/sharing/sharing.ui.h:2
+msgid ""
+"Bluetooth Sharing allows you to share files with other Bluetooth enabled "
+"devices"
+msgstr ""
+"Bluetooth Sharing allows you to share files with other Bluetooth enabled "
+"devices"
 
-#: ../panels/region/gnome-region-panel.ui.h:36
-msgid "Your settings"
-msgstr "Your settings"
+#: ../panels/sharing/sharing.ui.h:3
+msgid "Share Public Folder"
+msgstr "Share Public Folder"
 
-#: ../panels/region/gnome-region-panel.ui.h:37
-msgid "System settings"
-msgstr "System settings"
+#: ../panels/sharing/sharing.ui.h:4
+msgid "Only Receive From Trusted Devices"
+msgstr "Only Receive From Trusted Devices"
 
-#: ../panels/screen/gnome-screen-panel.desktop.in.in.h:1
-msgid "Brightness & Lock"
-msgstr "Brightness & Lock"
+#: ../panels/sharing/sharing.ui.h:5
+msgid "Save Received Files to Downloads Folder"
+msgstr "Save Received Files to Downloads Folder"
 
-#: ../panels/screen/gnome-screen-panel.desktop.in.in.h:2
-msgid "Screen brightness and lock settings"
-msgstr "Screen brightness and lock settings"
+#: ../panels/sharing/sharing.ui.h:6
+msgid "Only share with Trusted Devices"
+msgstr "Only share with Trusted Devices"
 
-#. 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;"
-msgstr "Brightness;Lock;Dim;Blank;Monitor;"
+#: ../panels/sharing/sharing.ui.h:7
+msgid "Computer Name"
+msgstr "Computer Name"
 
-#: ../panels/screen/screen.ui.h:1
-msgid "Screen turns off"
-msgstr "Screen turns off"
+#: ../panels/sharing/sharing.ui.h:8
+msgid "Some services are disabled because of no network access."
+msgstr "Some services are disabled because of no network access."
 
-#: ../panels/screen/screen.ui.h:2
-msgid "30 seconds"
-msgstr "30 seconds"
+#: ../panels/sharing/sharing.ui.h:9
+msgid "Media Sharing"
+msgstr "Media Sharing"
 
-#: ../panels/screen/screen.ui.h:3
-msgid "1 minute"
-msgstr "1 minute"
+#: ../panels/sharing/sharing.ui.h:10
+msgid "Share Music, Photos and Videos with others on the current network."
+msgstr "Share Music, Photos and Videos with others on the current network."
 
-#: ../panels/screen/screen.ui.h:4
-msgid "2 minutes"
-msgstr "2 minutes"
+#: ../panels/sharing/sharing.ui.h:11
+msgid "Share Media On This Network"
+msgstr "Share Media On This Network"
 
-#: ../panels/screen/screen.ui.h:5
-msgid "3 minutes"
-msgstr "3 minutes"
+#: ../panels/sharing/sharing.ui.h:12
+msgid "Shared Folders"
+msgstr "Shared Folders"
+
+#: ../panels/sharing/sharing.ui.h:13
+msgid "column"
+msgstr "column"
 
-#: ../panels/screen/screen.ui.h:10
-msgid "_Dim screen to save power"
-msgstr "_Dim screen to save power"
+#: ../panels/sharing/sharing.ui.h:14
+msgid "Add Folder"
+msgstr "Add Folder"
 
-#: ../panels/screen/screen.ui.h:11
-msgid "Brightness"
-msgstr "Brightness"
+#: ../panels/sharing/sharing.ui.h:15
+msgid "Remove Folder"
+msgstr "Remove Folder"
 
-#: ../panels/screen/screen.ui.h:12
-msgid "_Turn screen off when inactive for:"
-msgstr "_Turn screen off when inactive for:"
+#: ../panels/sharing/sharing.ui.h:16
+msgid "Personal File Sharing"
+msgstr "Personal File Sharing"
 
-#: ../panels/screen/screen.ui.h:13
-msgid "_Lock screen after:"
-msgstr "_Lock screen after:"
+#: ../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 ""
+"Personal File Sharing allows you to share your Public folder with others on "
+"your current network using: <a href=\"dav://%s\">dav://%s</a>"
 
-#. 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 "Don't lock when at home"
+#: ../panels/sharing/sharing.ui.h:19
+msgid "Share Public Folder On This Network"
+msgstr "Share Public Folder On This Network"
 
-#: ../panels/screen/screen.ui.h:16
-msgid "Locations..."
-msgstr "Locations…"
+#: ../panels/sharing/sharing.ui.h:20
+msgid "Require Password"
+msgstr "Require Password"
 
-#: ../panels/screen/screen.ui.h:17
-msgid "Show _notifications when locked"
-msgstr "Show _notifications when locked"
+#: ../panels/sharing/sharing.ui.h:22
+msgid "Remote Login"
+msgstr "Remote Login"
 
-#: ../panels/screen/screen.ui.h:18
-msgid "Lock"
-msgstr "Lock"
+#: ../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 ""
+"Allow remote users to connect using the Secure Shell command:\n"
+"<a href=\"ssh %s\">ssh %s</a>"
 
-#: ../panels/sound/applet-main.c:49
-msgid "Enable debugging code"
-msgstr "Enable debugging code"
+#: ../panels/sharing/sharing.ui.h:26
+msgid "Screen Sharing"
+msgstr "Screen Sharing"
 
-#: ../panels/sound/applet-main.c:50
-msgid "Version of this application"
-msgstr "Version of this application"
+#: ../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 ""
+"Allow remote users to view or control your screen by connecting to: <a "
+"href=\"vnc://%s\">vnc://%s</a>"
 
-#: ../panels/sound/applet-main.c:62
-msgid " — GNOME Volume Control Applet"
-msgstr " — GNOME Volume Control Applet"
+#: ../panels/sharing/sharing.ui.h:29
+msgid "Remote View"
+msgstr "Remote View"
 
-#: ../panels/sound/data/gnome-sound-applet.desktop.in.h:1
-msgid "Volume Control"
+#: ../panels/sharing/sharing.ui.h:30
+msgid "Remote Control"
 msgstr "Volume Control"
 
-#: ../panels/sound/data/gnome-sound-applet.desktop.in.h:2
-msgid "Show desktop volume control"
-msgstr "Show desktop volume control"
+#: ../panels/sharing/sharing.ui.h:31
+msgid "Approve All Connections"
+msgstr "Approve All Connections"
+
+#: ../panels/sharing/sharing.ui.h:32
+msgid "Show Password"
+msgstr "Show Password"
 
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:1
 msgid "Sound"
 msgstr "Sound"
 
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:2
-msgid "Change sound volume and sound events"
-msgstr "Change sound volume and sound events"
+msgid "Change sound levels, inputs, outputs, and alert sounds"
+msgstr "Change sound levels, inputs, outputs, and alert sounds"
 
 #. Translators: those are keywords for the sound control-center panel
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:4
@@ -3518,61 +5119,45 @@ msgstr "Glass"
 msgid "Sonar"
 msgstr "Sonar"
 
-#: ../panels/sound/gvc-applet.c:270 ../panels/sound/gvc-mixer-dialog.c:1656
-msgid "Output"
-msgstr "Output"
-
-#: ../panels/sound/gvc-applet.c:272
-msgid "Sound Output Volume"
-msgstr "Sound Output Volume"
-
-#: ../panels/sound/gvc-applet.c:276 ../panels/sound/gvc-mixer-dialog.c:1697
-msgid "Input"
-msgstr "Input"
-
-#: ../panels/sound/gvc-applet.c:278
-msgid "Microphone Volume"
-msgstr "Microphone Volume"
-
-#: ../panels/sound/gvc-balance-bar.c:111
+#: ../panels/sound/gvc-balance-bar.c:106
 msgctxt "balance"
 msgid "Left"
 msgstr "Left"
 
-#: ../panels/sound/gvc-balance-bar.c:112
+#: ../panels/sound/gvc-balance-bar.c:107
 msgctxt "balance"
 msgid "Right"
 msgstr "Right"
 
-#: ../panels/sound/gvc-balance-bar.c:115
+#: ../panels/sound/gvc-balance-bar.c:110
 msgctxt "balance"
 msgid "Rear"
 msgstr "Rear"
 
-#: ../panels/sound/gvc-balance-bar.c:116
+#: ../panels/sound/gvc-balance-bar.c:111
 msgctxt "balance"
 msgid "Front"
 msgstr "Front"
 
-#: ../panels/sound/gvc-balance-bar.c:119
+#: ../panels/sound/gvc-balance-bar.c:114
 msgctxt "balance"
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../panels/sound/gvc-balance-bar.c:120
+#: ../panels/sound/gvc-balance-bar.c:115
 msgctxt "balance"
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../panels/sound/gvc-balance-bar.c:295
+#: ../panels/sound/gvc-balance-bar.c:290
 msgid "_Balance:"
 msgstr "_Balance:"
 
-#: ../panels/sound/gvc-balance-bar.c:298
+#: ../panels/sound/gvc-balance-bar.c:293
 msgid "_Fade:"
 msgstr "_Fade:"
 
-#: ../panels/sound/gvc-balance-bar.c:301
+#: ../panels/sound/gvc-balance-bar.c:296
 msgid "_Subwoofer:"
 msgstr "_Subwoofer:"
 
@@ -3587,87 +5172,77 @@ msgid "Unamplified"
 msgstr "Unamplified"
 
 #: ../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 "_Profile:"
 
-#. translators:
-#. * The number of sound outputs on a particular device
-#: ../panels/sound/gvc-mixer-control.c:1841
-#, c-format
-msgid "%u Output"
-msgid_plural "%u Outputs"
-msgstr[0] "%u Output"
-msgstr[1] "%u Outputs"
-
-#. translators:
-#. * The number of sound inputs on a particular device
-#: ../panels/sound/gvc-mixer-control.c:1851
-#, c-format
-msgid "%u Input"
-msgid_plural "%u Inputs"
-msgstr[0] "%u Input"
-msgstr[1] "%u Inputs"
-
-#: ../panels/sound/gvc-mixer-control.c:2375
-msgid "System Sounds"
-msgstr "System Sounds"
-
 #: ../panels/sound/gvc-mixer-dialog.c:262
 msgid "_Test Speakers"
 msgstr "_Test Speakers"
 
-#: ../panels/sound/gvc-mixer-dialog.c:426
+#: ../panels/sound/gvc-mixer-dialog.c:431
 msgid "Peak detect"
 msgstr "Peak detect"
 
-#: ../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 "Name"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1588
+#: ../panels/sound/gvc-mixer-dialog.c:1527
+msgid "Device"
+msgstr "Device"
+
+#: ../panels/sound/gvc-mixer-dialog.c:1590
 #, c-format
 msgid "Speaker Testing for %s"
 msgstr "Speaker Testing for %s"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1642
+#: ../panels/sound/gvc-mixer-dialog.c:1644
 msgid "_Output volume:"
 msgstr "_Output volume:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1661
+#: ../panels/sound/gvc-mixer-dialog.c:1658
+msgid "Output"
+msgstr "Output"
+
+#: ../panels/sound/gvc-mixer-dialog.c:1663
 msgid "C_hoose a device for sound output:"
 msgstr "C_hoose a device for sound output:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1686
+#: ../panels/sound/gvc-mixer-dialog.c:1688
 msgid "Settings for the selected device:"
 msgstr "Settings for the selected device:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1704
+#: ../panels/sound/gvc-mixer-dialog.c:1699
+msgid "Input"
+msgstr "Input"
+
+#: ../panels/sound/gvc-mixer-dialog.c:1706
 msgid "_Input volume:"
 msgstr "_Input volume:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1727
+#: ../panels/sound/gvc-mixer-dialog.c:1729
 msgid "Input level:"
 msgstr "Input level:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1755
+#: ../panels/sound/gvc-mixer-dialog.c:1757
 msgid "C_hoose a device for sound input:"
 msgstr "C_hoose a device for sound input:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1782
+#: ../panels/sound/gvc-mixer-dialog.c:1784
 msgid "Sound Effects"
 msgstr "Sound Effects"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1789
+#: ../panels/sound/gvc-mixer-dialog.c:1791
 msgid "_Alert volume:"
 msgstr "_Alert volume:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1802
+#: ../panels/sound/gvc-mixer-dialog.c:1804
 msgid "Applications"
 msgstr "Applications"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1806
+#: ../panels/sound/gvc-mixer-dialog.c:1808
 msgid "No application is currently playing or recording audio."
 msgstr "No application is currently playing or recording audio."
 
@@ -3712,35 +5287,18 @@ msgstr "Test"
 msgid "Subwoofer"
 msgstr "Subwoofer"
 
-#: ../panels/sound/gvc-stream-status-icon.c:236
-#, c-format
-msgid "Failed to start Sound Preferences: %s"
-msgstr "Failed to start Sound Preferences: %s"
-
-#: ../panels/sound/gvc-stream-status-icon.c:262
-msgid "_Mute"
-msgstr "_Mute"
-
-#: ../panels/sound/gvc-stream-status-icon.c:271
-msgid "_Sound Preferences"
-msgstr "_Sound Preferences"
-
-#: ../panels/sound/gvc-stream-status-icon.c:416
-msgid "Muted"
-msgstr "Muted"
-
 #: ../panels/sound/sound-theme-file-utils.c:292
 msgid "Custom"
 msgstr "Custom"
 
-#: ../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 "No shortcut set"
 
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2
-msgid "Universal Access Preferences"
-msgstr "Universal Access Preferences"
+msgid "Make it easier to see, hear, type, point and click"
+msgstr "Make it easier to see, hear, type, point and click"
 
 #. Translators: those are keywords for the universal access control-center panel
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4
@@ -3752,6 +5310,7 @@ msgstr ""
 "AccessX;Sticky Keys;Slow Keys;Bounce Keys;Mouse Keys;"
 
 #: ../panels/universal-access/uap.ui.h:1
+#: ../panels/universal-access/zoom-options.ui.h:34
 msgctxt "universal access, contrast"
 msgid "Low"
 msgstr "Low"
@@ -3762,6 +5321,7 @@ msgid "Normal"
 msgstr "Normal"
 
 #: ../panels/universal-access/uap.ui.h:3
+#: ../panels/universal-access/zoom-options.ui.h:35
 msgctxt "universal access, contrast"
 msgid "High"
 msgstr "High"
@@ -3783,10 +5343,6 @@ msgstr "GOK"
 msgid "OnBoard"
 msgstr "OnBoard"
 
-#: ../panels/universal-access/uap.ui.h:8
-msgid "None"
-msgstr "None"
-
 #: ../panels/universal-access/uap.ui.h:10
 #, no-c-format
 msgid "75%"
@@ -3835,10 +5391,6 @@ msgstr "High Contrast"
 msgid "Beep on Caps and Num Lock"
 msgstr "Beep on Caps and Num Lock"
 
-#: ../panels/universal-access/uap.ui.h:23
-msgid "Options..."
-msgstr "Options…"
-
 #: ../panels/universal-access/uap.ui.h:24
 msgid "Screen Reader"
 msgstr "Screen Reader"
@@ -3932,117 +5484,127 @@ msgstr "Puts a delay between when a key is pressed and when it is accepted"
 msgid "A_cceptance delay:"
 msgstr "A_cceptance delay:"
 
-#: ../panels/universal-access/uap.ui.h:50
+#: ../panels/universal-access/uap.ui.h:48
+msgctxt "universal access, delay"
+msgid "Short"
+msgstr "Short"
+
+#: ../panels/universal-access/uap.ui.h:49
 msgid "Slow keys typing delay"
 msgstr "Slow keys typing delay"
 
+#: ../panels/universal-access/uap.ui.h:50
+msgctxt "universal access, delay"
+msgid "Long"
+msgstr "Long"
+
 #. 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 "Beep when a key is"
 
 #. 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 "pressed"
 
 #. 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 "accepted"
 
 #. 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 "rejected"
 
-#: ../panels/universal-access/uap.ui.h:61
+#: ../panels/universal-access/uap.ui.h:59
 msgid "Bounce Keys"
 msgstr "Bounce Keys"
 
-#: ../panels/universal-access/uap.ui.h:62
+#: ../panels/universal-access/uap.ui.h:60
 msgid "Ignores fast duplicate keypresses"
 msgstr "Ignores fast duplicate keypresses"
 
-#: ../panels/universal-access/uap.ui.h:63
+#: ../panels/universal-access/uap.ui.h:61
 msgid "Acc_eptance delay:"
 msgstr "Acc_eptance delay:"
 
-#: ../panels/universal-access/uap.ui.h:64
+#: ../panels/universal-access/uap.ui.h:62
 msgid "Bounce keys typing delay"
 msgstr "Bounce keys typing delay"
 
-#: ../panels/universal-access/uap.ui.h:65
+#: ../panels/universal-access/uap.ui.h:63
 msgid "Beep when a key is _rejected"
 msgstr "Beep when a key is _rejected"
 
-#: ../panels/universal-access/uap.ui.h:66
+#: ../panels/universal-access/uap.ui.h:64
 msgid "Enable by Keyboard"
 msgstr "Enable by Keyboard"
 
-#: ../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 "Turn accessibility features on and off using the keyboard"
 
-#: ../panels/universal-access/uap.ui.h:69
+#: ../panels/universal-access/uap.ui.h:67
 msgid "Mouse Keys"
 msgstr "Mouse Keys"
 
-#: ../panels/universal-access/uap.ui.h:70
+#: ../panels/universal-access/uap.ui.h:68
 msgid "Control the pointer using the keypad"
 msgstr "Control the pointer using the keypad"
 
-#: ../panels/universal-access/uap.ui.h:71
+#: ../panels/universal-access/uap.ui.h:69
 msgid "Video Mouse"
 msgstr "Video Mouse"
 
-#: ../panels/universal-access/uap.ui.h:72
+#: ../panels/universal-access/uap.ui.h:70
 msgid "Control the pointer using the video camera."
 msgstr "Control the pointer using the video camera."
 
-#: ../panels/universal-access/uap.ui.h:73
+#: ../panels/universal-access/uap.ui.h:71
 msgid "Simulated Secondary Click"
 msgstr "Simulated Secondary Click"
 
-#: ../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 "Trigger a secondary click by holding down the primary button"
 
-#: ../panels/universal-access/uap.ui.h:75
+#: ../panels/universal-access/uap.ui.h:73
 msgid "Secondary click delay"
 msgstr "Secondary click delay"
 
-#: ../panels/universal-access/uap.ui.h:76
+#: ../panels/universal-access/uap.ui.h:74
 msgid "Hover Click"
 msgstr "Hover Click"
 
-#: ../panels/universal-access/uap.ui.h:77
+#: ../panels/universal-access/uap.ui.h:75
 msgid "Trigger a click when the pointer hovers"
 msgstr "Trigger a click when the pointer hovers"
 
-#: ../panels/universal-access/uap.ui.h:78
+#: ../panels/universal-access/uap.ui.h:76
 msgid "D_elay:"
 msgstr "D_elay:"
 
-#: ../panels/universal-access/uap.ui.h:79
+#: ../panels/universal-access/uap.ui.h:77
 msgid "Motion _threshold:"
 msgstr "Motion _threshold:"
 
-#. small threshold
-#: ../panels/universal-access/uap.ui.h:81
+#: ../panels/universal-access/uap.ui.h:78
+msgctxt "universal access, threshold"
 msgid "Small"
 msgstr "Small"
 
-#. large threshold
-#: ../panels/universal-access/uap.ui.h:83
+#: ../panels/universal-access/uap.ui.h:79
+msgctxt "universal access, threshold"
 msgid "Large"
 msgstr "Large"
 
-#: ../panels/universal-access/uap.ui.h:84
+#: ../panels/universal-access/uap.ui.h:80
 msgid "Mouse Settings"
 msgstr "Mouse Settings"
 
-#: ../panels/universal-access/uap.ui.h:85
+#: ../panels/universal-access/uap.ui.h:81
 msgid "Pointing and Clicking"
 msgstr "Pointing and Clicking"
 
@@ -4139,78 +5701,79 @@ msgstr "Magnifier"
 msgid "Thickness:"
 msgstr "Thickness:"
 
-#. short delay
-#: ../panels/universal-access/zoom-options.ui.h:19
+#: ../panels/universal-access/zoom-options.ui.h:18
+msgctxt "universal access, thickness"
 msgid "Thin"
 msgstr "Thin"
 
-#. long delay
-#: ../panels/universal-access/zoom-options.ui.h:21
+#: ../panels/universal-access/zoom-options.ui.h:19
+msgctxt "universal access, thickness"
 msgid "Thick"
 msgstr "Thick"
 
-#: ../panels/universal-access/zoom-options.ui.h:22
+#: ../panels/universal-access/zoom-options.ui.h:20
 msgid "Length:"
 msgstr "Length:"
 
-#: ../panels/universal-access/zoom-options.ui.h:23
+#: ../panels/universal-access/zoom-options.ui.h:21
 msgid "Color:"
 msgstr "Colour:"
 
-#: ../panels/universal-access/zoom-options.ui.h:24
+#: ../panels/universal-access/zoom-options.ui.h:22
 msgid "Crosshairs:"
 msgstr "Crosshairs:"
 
-#: ../panels/universal-access/zoom-options.ui.h:25
+#: ../panels/universal-access/zoom-options.ui.h:23
 msgid "Overlaps mouse cursor"
 msgstr "Overlaps mouse cursor"
 
-#: ../panels/universal-access/zoom-options.ui.h:26
+#: ../panels/universal-access/zoom-options.ui.h:24
 msgid "Crosshairs"
 msgstr "Crosshairs"
 
-#: ../panels/universal-access/zoom-options.ui.h:27
+#: ../panels/universal-access/zoom-options.ui.h:25
 msgid "White on black:"
 msgstr "White on black:"
 
-#: ../panels/universal-access/zoom-options.ui.h:28
+#: ../panels/universal-access/zoom-options.ui.h:26
 msgid "Brightness:"
 msgstr "Brightness:"
 
-#: ../panels/universal-access/zoom-options.ui.h:29
+#: ../panels/universal-access/zoom-options.ui.h:27
 msgid "Contrast:"
 msgstr "Contrast:"
 
-#: ../panels/universal-access/zoom-options.ui.h:30
-msgctxt "Zoom Grayscale"
+#. The contrast scale goes from Color to None (grayscale)
+#: ../panels/universal-access/zoom-options.ui.h:29
+msgctxt "universal access, contrast"
 msgid "Color"
 msgstr "Colour"
 
-#: ../panels/universal-access/zoom-options.ui.h:31
-msgctxt "Zoom Grayscale"
+#: ../panels/universal-access/zoom-options.ui.h:30
+msgctxt "universal access, color"
 msgid "None"
 msgstr "None"
 
-#: ../panels/universal-access/zoom-options.ui.h:32
-msgctxt "Zoom Grayscale"
+#: ../panels/universal-access/zoom-options.ui.h:31
+msgctxt "universal access, color"
 msgid "Full"
 msgstr "Full"
 
-#. short delay
-#: ../panels/universal-access/zoom-options.ui.h:34
+#: ../panels/universal-access/zoom-options.ui.h:32
+msgctxt "universal access, brightness"
 msgid "Low"
 msgstr "Low"
 
-#. long delay
-#: ../panels/universal-access/zoom-options.ui.h:36
+#: ../panels/universal-access/zoom-options.ui.h:33
+msgctxt "universal access, brightness"
 msgid "High"
 msgstr "High"
 
-#: ../panels/universal-access/zoom-options.ui.h:37
+#: ../panels/universal-access/zoom-options.ui.h:36
 msgid "Color Effects:"
 msgstr "Colour Effects:"
 
-#: ../panels/universal-access/zoom-options.ui.h:38
+#: ../panels/universal-access/zoom-options.ui.h:37
 msgid "Color Effects"
 msgstr "Colour Effects"
 
@@ -4240,10 +5803,6 @@ msgstr "_Local Account"
 msgid "_Enterprise Login"
 msgstr "_Enterprise Login"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:6
-msgid "_Username"
-msgstr "_Username"
-
 #: ../panels/user-accounts/data/account-dialog.ui.h:7
 msgid "_Full name"
 msgstr "_Full name"
@@ -4261,11 +5820,6 @@ msgstr "_Domain"
 msgid "_Login Name"
 msgstr "_Login Name"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:11
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
-msgid "_Password"
-msgstr "_Password"
-
 #: ../panels/user-accounts/data/account-dialog.ui.h:12
 msgid "Tip: Enterprise domain or realm name"
 msgstr "Tip: Enterprise domain or realm name"
@@ -4329,7 +5883,7 @@ msgid "Right little finger"
 msgstr "Right little finger"
 
 #: ../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 "Enable Fingerprint Login"
 
@@ -4354,18 +5908,34 @@ msgstr ""
 "using your fingerprint reader."
 
 #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:1
-msgid "User Accounts"
-msgstr "User Accounts"
+msgid "Users"
+msgstr "Users"
 
 #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:2
-msgid "Add or remove users"
-msgstr "Add or remove users"
+msgid "Add or remove users and change your password"
+msgstr "Add or remove users and change your password"
 
 #. Translators: those are keywords for the user accounts control-center panel
 #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:4
 msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;"
 msgstr "Login;Name;Fingerprint;Avatar;Logo;Face;Password;"
 
+#: ../panels/user-accounts/data/history-dialog.ui.h:1
+msgid "Login History"
+msgstr "Login History"
+
+#: ../panels/user-accounts/data/history-dialog.ui.h:3
+msgid "Previous Week"
+msgstr "Previous Week"
+
+#: ../panels/user-accounts/data/history-dialog.ui.h:4
+msgid "Next Week"
+msgstr "Next Week"
+
+#: ../panels/user-accounts/data/history-dialog.ui.h:5
+msgid "Next week"
+msgstr "Next week"
+
 #: ../panels/user-accounts/data/password-dialog.ui.h:1
 msgid "Set a password now"
 msgstr "Set a password now"
@@ -4387,54 +5957,38 @@ msgid "Enable this account"
 msgstr "Enable this account"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:6
-msgid "_Hint"
-msgstr "_Hint"
-
-#: ../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 ""
-"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."
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:8
 msgid "C_onfirm password"
 msgstr "C_onfirm password"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:9
+#: ../panels/user-accounts/data/password-dialog.ui.h:7
 msgid "_New password"
 msgstr "_New password"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:10
+#: ../panels/user-accounts/data/password-dialog.ui.h:8
 msgid "Generate a password"
 msgstr "Generate a password"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:11
-msgid "Fair"
-msgstr "Fair"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:12
+#: ../panels/user-accounts/data/password-dialog.ui.h:9
 msgid "Current _password"
 msgstr "Current _password"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:13
+#: ../panels/user-accounts/data/password-dialog.ui.h:10
 msgid "_Action"
 msgstr "_Action"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:14
+#: ../panels/user-accounts/data/password-dialog.ui.h:11
 msgid "Changing password for"
 msgstr "Changing password for"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:15
+#: ../panels/user-accounts/data/password-dialog.ui.h:12
 msgid "_Show password"
 msgstr "_Show password"
 
-#: ../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 "How to choose a strong password"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:17
+#: ../panels/user-accounts/data/password-dialog.ui.h:14
 msgid "Ch_ange"
 msgstr "Ch_ange"
 
@@ -4501,6 +6055,10 @@ msgstr "User Icon"
 msgid "_Language"
 msgstr "_Language"
 
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
+msgid "Last Login"
+msgstr "Last Login"
+
 #: ../panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in.h:1
 msgid "Manage user accounts"
 msgstr "Manage user accounts"
@@ -4510,7 +6068,7 @@ msgid "Authentication is required to change user data"
 msgstr "Authentication is required to change user data"
 
 #: ../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 "Too short"
@@ -4521,25 +6079,25 @@ msgid "Not good enough"
 msgstr "Not good enough"
 
 #: ../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 "Weak"
 
 #: ../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 "Fair"
 
 #: ../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 "Good"
 
 #: ../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 "Strong"
@@ -4549,7 +6107,6 @@ msgid "Authentication failed"
 msgstr "Authentication failed"
 
 #: ../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 "The new password is too short"
@@ -4594,24 +6151,24 @@ msgstr "The new password does not contain enough different characters"
 msgid "Unknown error"
 msgstr "Unknown error"
 
-#: ../panels/user-accounts/um-account-dialog.c:180
+#: ../panels/user-accounts/um-account-dialog.c:182
 msgid "Failed to add account"
 msgstr "Failed to add account"
 
-#: ../panels/user-accounts/um-account-dialog.c:378
-#: ../panels/user-accounts/um-account-dialog.c:419
+#: ../panels/user-accounts/um-account-dialog.c:403
+#: ../panels/user-accounts/um-account-dialog.c:444
 msgid "Failed to register account"
 msgstr "Failed to register account"
 
-#: ../panels/user-accounts/um-account-dialog.c:551
+#: ../panels/user-accounts/um-account-dialog.c:577
 msgid "No supported way to authenticate with this domain"
 msgstr "No supported way to authenticate with this domain"
 
-#: ../panels/user-accounts/um-account-dialog.c:605
+#: ../panels/user-accounts/um-account-dialog.c:631
 msgid "Failed to join domain"
 msgstr "Failed to join domain"
 
-#: ../panels/user-accounts/um-account-dialog.c:662
+#: ../panels/user-accounts/um-account-dialog.c:688
 msgid "Failed to log into domain"
 msgstr "Failed to log into domain"
 
@@ -4666,16 +6223,16 @@ msgstr "Could not access '%s' device"
 #. 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 "Could not start finger capture on '%s' device"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:655
+#: ../panels/user-accounts/um-fingerprint-dialog.c:650
 msgid "Could not access any fingerprint readers"
 msgstr "Could not access any fingerprint readers"
 
-#: ../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 "Please contact your system administrator for help."
 
@@ -4684,7 +6241,7 @@ msgstr "Please contact your system administrator for help."
 #. * "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, "
@@ -4693,59 +6250,67 @@ msgstr ""
 "To enable fingerprint login, you need to save one of your fingerprints, "
 "using the '%s' device."
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:747
+#: ../panels/user-accounts/um-fingerprint-dialog.c:741
 msgid "Selecting finger"
 msgstr "Selecting finger"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:748
+#: ../panels/user-accounts/um-fingerprint-dialog.c:742
 msgid "Enrolling fingerprints"
 msgstr "Enrolling fingerprints"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:749
-msgid "Summary"
-msgstr "Summary"
+#: ../panels/user-accounts/um-history-dialog.c:88
+msgid "This Week"
+msgstr "This Week"
+
+#: ../panels/user-accounts/um-history-dialog.c:91
+msgid "Last Week"
+msgstr "Last Week"
 
-#: ../panels/user-accounts/um-password-dialog.c:96
+#: ../panels/user-accounts/um-password-dialog.c:128
 msgid "_Generate a password"
 msgstr "_Generate a password"
 
-#: ../panels/user-accounts/um-password-dialog.c:150
+#: ../panels/user-accounts/um-password-dialog.c:181
 msgid "Please choose another password."
 msgstr "Please choose another password."
 
-#: ../panels/user-accounts/um-password-dialog.c:159
+#: ../panels/user-accounts/um-password-dialog.c:190
 msgid "Please type your current password again."
 msgstr "Please type your current password again."
 
-#: ../panels/user-accounts/um-password-dialog.c:165
+#: ../panels/user-accounts/um-password-dialog.c:196
 msgid "Password could not be changed"
 msgstr "Password could not be changed"
 
-#: ../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 "You need to enter a new password"
 
-#: ../panels/user-accounts/um-password-dialog.c:245
+#: ../panels/user-accounts/um-password-dialog.c:304
+msgid "The new password is not strong enough"
+msgstr "The new password is not strong enough"
+
+#: ../panels/user-accounts/um-password-dialog.c:310
 msgid "You need to confirm the password"
 msgstr "You need to confirm the password"
 
-#: ../panels/user-accounts/um-password-dialog.c:248
+#: ../panels/user-accounts/um-password-dialog.c:313
 msgid "The passwords do not match"
 msgstr "The passwords do not match"
 
-#: ../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 "You need to enter your current password"
 
-#: ../panels/user-accounts/um-password-dialog.c:257
+#: ../panels/user-accounts/um-password-dialog.c:322
 msgid "The current password is not correct"
 msgstr "The current password is not correct"
 
-#: ../panels/user-accounts/um-password-dialog.c:347
+#: ../panels/user-accounts/um-password-dialog.c:385
 msgid "Passwords do not match"
 msgstr "Passwords do not match"
 
-#: ../panels/user-accounts/um-password-dialog.c:409
+#: ../panels/user-accounts/um-password-dialog.c:439
 msgid "Wrong password"
 msgstr "Wrong password"
 
@@ -4754,65 +6319,55 @@ msgid "Disable image"
 msgstr "Disable image"
 
 #: ../panels/user-accounts/um-photo-dialog.c:461
-msgid "Take a photo..."
+msgid "Take a photo…"
 msgstr "Take a photo…"
 
 #: ../panels/user-accounts/um-photo-dialog.c:479
-msgid "Browse for more pictures..."
+msgid "Browse for more pictures…"
 msgstr "Browse for more pictures…"
 
-#: ../panels/user-accounts/um-photo-dialog.c:704
+#: ../panels/user-accounts/um-photo-dialog.c:703
 #, c-format
 msgid "Used by %s"
 msgstr "Used by %s"
 
-#: ../panels/user-accounts/um-realm-manager.c:379
+#: ../panels/user-accounts/um-realm-manager.c:351
+msgid "Cannot automatically join this type of domain"
+msgstr "Cannot automatically join this type of domain"
+
+#: ../panels/user-accounts/um-realm-manager.c:414
 #, c-format
 msgid "No such domain or realm found"
 msgstr "No such domain or realm found"
 
-#: ../panels/user-accounts/um-realm-manager.c:780
+#: ../panels/user-accounts/um-realm-manager.c:815
 #, c-format
 msgid "Cannot log in as %s at the %s domain"
 msgstr "Cannot log in as %s at the %s domain"
 
-#: ../panels/user-accounts/um-realm-manager.c:785
+#: ../panels/user-accounts/um-realm-manager.c:820
 msgid "Invalid password, please try again"
 msgstr "Invalid password, please try again"
 
-#: ../panels/user-accounts/um-realm-manager.c:789
+#: ../panels/user-accounts/um-realm-manager.c:824
 #, c-format
 msgid "Couldn't connect to the %s domain: %s"
 msgstr "Couldn't connect to the %s domain: %s"
 
-#: ../panels/user-accounts/um-user-manager.c:466
-#, c-format
-msgid "A user with name '%s' already exists."
-msgstr "A user with name '%s' already exists."
-
-#: ../panels/user-accounts/um-user-manager.c:473
-#, c-format
-msgid "No user with the name '%s' exists."
-msgstr "No user with the name '%s' exists."
-
-#: ../panels/user-accounts/um-user-manager.c:631
-msgid "This user does not exist."
-msgstr "This user does not exist."
-
-#: ../panels/user-accounts/um-user-panel.c:371
+#: ../panels/user-accounts/um-user-panel.c:376
 msgid "Failed to delete user"
 msgstr "Failed to delete user"
 
-#: ../panels/user-accounts/um-user-panel.c:431
+#: ../panels/user-accounts/um-user-panel.c:436
 msgid "You cannot delete your own account."
 msgstr "You cannot delete your own account."
 
-#: ../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 is still logged in"
 
-#: ../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."
@@ -4820,12 +6375,12 @@ msgstr ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
 
-#: ../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 "Do you want to keep %s's files?"
 
-#: ../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."
@@ -4833,38 +6388,42 @@ msgstr ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
 
-#: ../panels/user-accounts/um-user-panel.c:460
+#: ../panels/user-accounts/um-user-panel.c:465
 msgid "_Delete Files"
 msgstr "_Delete Files"
 
-#: ../panels/user-accounts/um-user-panel.c:461
+#: ../panels/user-accounts/um-user-panel.c:466
 msgid "_Keep Files"
 msgstr "_Keep Files"
 
-#: ../panels/user-accounts/um-user-panel.c:513
+#: ../panels/user-accounts/um-user-panel.c:518
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "Account disabled"
 
-#: ../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 "To be set at next login"
 
-#: ../panels/user-accounts/um-user-panel.c:524
+#: ../panels/user-accounts/um-user-panel.c:529
 msgctxt "Password mode"
 msgid "None"
 msgstr "None"
 
-#: ../panels/user-accounts/um-user-panel.c:871
+#: ../panels/user-accounts/um-user-panel.c:578
+msgid "Logged in"
+msgstr "Logged in"
+
+#: ../panels/user-accounts/um-user-panel.c:942
 msgid "Failed to contact the accounts service"
 msgstr "Failed to contact the accounts service"
 
-#: ../panels/user-accounts/um-user-panel.c:873
+#: ../panels/user-accounts/um-user-panel.c:944
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "Please make sure that the AccountService is installed and enabled."
 
-#: ../panels/user-accounts/um-user-panel.c:913
+#: ../panels/user-accounts/um-user-panel.c:985
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -4872,12 +6431,12 @@ msgstr ""
 "To make changes,\n"
 "click the * icon first"
 
-#: ../panels/user-accounts/um-user-panel.c:951
+#: ../panels/user-accounts/um-user-panel.c:1023
 msgid "Create a user account"
 msgstr "Create a user account"
 
-#: ../panels/user-accounts/um-user-panel.c:962
-#: ../panels/user-accounts/um-user-panel.c:1273
+#: ../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"
@@ -4885,12 +6444,12 @@ msgstr ""
 "To create a user account,\n"
 "click the * icon first"
 
-#: ../panels/user-accounts/um-user-panel.c:971
+#: ../panels/user-accounts/um-user-panel.c:1043
 msgid "Delete the selected user account"
 msgstr "Delete the selected user account"
 
-#: ../panels/user-accounts/um-user-panel.c:983
-#: ../panels/user-accounts/um-user-panel.c:1278
+#: ../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"
@@ -4898,29 +6457,29 @@ msgstr ""
 "To delete the selected user account,\n"
 "click the * icon first"
 
-#: ../panels/user-accounts/um-user-panel.c:1176
+#: ../panels/user-accounts/um-user-panel.c:1229
 msgid "My Account"
 msgstr "My Account"
 
-#: ../panels/user-accounts/um-user-panel.c:1186
+#: ../panels/user-accounts/um-user-panel.c:1238
 msgid "Other Accounts"
 msgstr "Other Accounts"
 
-#: ../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 "A user with the username '%s' already exists"
 
-#: ../panels/user-accounts/um-utils.c:516
+#: ../panels/user-accounts/um-utils.c:520
 #, c-format
 msgid "The username is too long"
 msgstr "The username is too long"
 
-#: ../panels/user-accounts/um-utils.c:519
+#: ../panels/user-accounts/um-utils.c:523
 msgid "The username cannot start with a '-'"
 msgstr "The username cannot start with a '-'"
 
-#: ../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"
@@ -4940,11 +6499,6 @@ msgstr "Map Buttons"
 msgid "Map buttons to functions"
 msgstr "Map buttons to functions"
 
-#. Text printed on screen
-#: ../panels/wacom/calibrator/gui_gtk.c:78
-msgid "Screen Calibration"
-msgstr "Screen Calibration"
-
 #: ../panels/wacom/calibrator/gui_gtk.c:79
 msgid ""
 "Please tap the target markers as they appear on screen to calibrate the "
@@ -4976,7 +6530,7 @@ msgstr "Map to single monitor"
 msgid "%d of %d"
 msgstr "%d of %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 "None"
@@ -4991,28 +6545,35 @@ msgctxt "Wacom action-type"
 msgid "Switch Monitor"
 msgstr "Switch Monitor"
 
-#: ../panels/wacom/cc-wacom-page.c:601
+#: ../panels/wacom/cc-wacom-page.c:121
+msgctxt "Wacom action-type"
+msgid "Show On-Screen Help"
+msgstr "Show On-Screen Help"
+
+#: ../panels/wacom/cc-wacom-page.c:621
+msgctxt "Wacom tablet button"
 msgid "Up"
 msgstr "Up"
 
-#: ../panels/wacom/cc-wacom-page.c:601
+#: ../panels/wacom/cc-wacom-page.c:621
+msgctxt "Wacom tablet button"
 msgid "Down"
 msgstr "Down"
 
-#: ../panels/wacom/cc-wacom-page.c:638
+#: ../panels/wacom/cc-wacom-page.c:662
 msgid "Switch Modes"
 msgstr "Switch Modes"
 
-#: ../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 "Button"
 
-#: ../panels/wacom/cc-wacom-page.c:777
+#: ../panels/wacom/cc-wacom-page.c:810
 msgid "Action"
 msgstr "Action"
 
-#: ../panels/wacom/cc-wacom-page.c:886
+#: ../panels/wacom/cc-wacom-page.c:920
 msgid "Display Mapping"
 msgstr "Display Mapping"
 
@@ -5022,8 +6583,8 @@ msgid "Wacom Tablet"
 msgstr "Wacom Tablet"
 
 #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2
-msgid "Set your Wacom tablet preferences"
-msgstr "Set your Wacom tablet preferences"
+msgid "Set button mappings and adjust stylus sensitivity for graphics tablets"
+msgstr "Set button mappings and adjust stylus sensitivity for graphics tablets"
 
 #. Translators: those are keywords for the wacom tablet control-center panel
 #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4
@@ -5055,17 +6616,13 @@ msgid "Bluetooth Settings"
 msgstr "Bluetooth Settings"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:8
-msgid "Map to Monitor..."
+msgid "Map to Monitor…"
 msgstr "Map to Monitor…"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:9
-msgid "Map Buttons..."
+msgid "Map Buttons…"
 msgstr "Map Buttons…"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:10
-msgid "Calibrate..."
-msgstr "Calibrate…"
-
 #: ../panels/wacom/gnome-wacom-properties.ui.h:11
 msgid "Adjust display resolution"
 msgstr "Adjust display resolution"
@@ -5078,67 +6635,87 @@ msgstr "Tracking Mode"
 msgid "Left-Handed Orientation"
 msgstr "Left-Handed Orientation"
 
-#: ../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
+msgid "Left Ring"
+msgstr "Left Ring"
+
+#: ../panels/wacom/gsd-wacom-device.c:1086
 #, c-format
 msgid "Left Ring Mode #%d"
 msgstr "Left Ring Mode #%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
+msgid "Right Ring"
+msgstr "Right Ring"
+
+#: ../panels/wacom/gsd-wacom-device.c:1115
 #, c-format
 msgid "Right Ring Mode #%d"
 msgstr "Right Ring Mode #%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 "Left Touchstrip"
+
+#: ../panels/wacom/gsd-wacom-device.c:1166
 #, c-format
 msgid "Left Touchstrip Mode #%d"
 msgstr "Left Touchstrip Mode #%d"
 
-#: ../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 "Right Touchstrip"
+
+#: ../panels/wacom/gsd-wacom-device.c:1195
 #, c-format
 msgid "Right Touchstrip Mode #%d"
 msgstr "Right Touchstrip Mode #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1075
+#: ../panels/wacom/gsd-wacom-device.c:1220
 #, c-format
 msgid "Left Touchring Mode Switch"
 msgstr "Left Touchring Mode Switch"
 
-#: ../panels/wacom/gsd-wacom-device.c:1077
+#: ../panels/wacom/gsd-wacom-device.c:1222
 #, c-format
 msgid "Right Touchring Mode Switch"
 msgstr "Right Touchring Mode Switch"
 
-#: ../panels/wacom/gsd-wacom-device.c:1080
+#: ../panels/wacom/gsd-wacom-device.c:1225
 #, c-format
 msgid "Left Touchstrip Mode Switch"
 msgstr "Left Touchstrip Mode Switch"
 
-#: ../panels/wacom/gsd-wacom-device.c:1082
+#: ../panels/wacom/gsd-wacom-device.c:1227
 #, c-format
 msgid "Right Touchstrip Mode Switch"
 msgstr "Right Touchstrip Mode Switch"
 
-#: ../panels/wacom/gsd-wacom-device.c:1087
+#: ../panels/wacom/gsd-wacom-device.c:1232
 #, c-format
 msgid "Mode Switch #%d"
 msgstr "Mode Switch #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1159
+#: ../panels/wacom/gsd-wacom-device.c:1336
 #, c-format
 msgid "Left Button #%d"
 msgstr "Left Button #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1162
+#: ../panels/wacom/gsd-wacom-device.c:1339
 #, c-format
 msgid "Right Button #%d"
 msgstr "Right Button #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1165
+#: ../panels/wacom/gsd-wacom-device.c:1342
 #, c-format
 msgid "Top Button #%d"
 msgstr "Top Button #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1168
+#: ../panels/wacom/gsd-wacom-device.c:1345
 #, c-format
 msgid "Bottom Button #%d"
 msgstr "Bottom Button #%d"
@@ -5211,28 +6788,40 @@ msgstr "Lower Button"
 msgid "Tip Pressure Feel"
 msgstr "Tip Pressure Feel"
 
-#: ../shell/control-center.c:58
+#: ../shell/cc-application.c:67
 msgid "Enable verbose mode"
 msgstr "Enable verbose mode"
 
-#: ../shell/control-center.c:59
+#: ../shell/cc-application.c:68
 msgid "Show the overview"
 msgstr "Show the overview"
 
-#: ../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 "Search for the string"
+
+#: ../shell/cc-application.c:70
+msgid "List possible panel names and exit"
+msgstr "List possible panel names and exit"
+
+#: ../shell/cc-application.c:71 ../shell/cc-application.c:72
+#: ../shell/cc-application.c:73
 msgid "Show help options"
 msgstr "Show help options"
 
-#: ../shell/control-center.c:63
+#: ../shell/cc-application.c:74
 msgid "Panel to display"
 msgstr "Panel to display"
 
-#: ../shell/control-center.c:85
-msgid "- System Settings"
-msgstr "- System Settings"
+#: ../shell/cc-application.c:74
+msgid "[PANEL] [ARGUMENT…]"
+msgstr "[PANEL] [ARGUMENT…]"
 
-#: ../shell/control-center.c:93
+#: ../shell/cc-application.c:116
+msgid "- Settings"
+msgstr "- Settings"
+
+#: ../shell/cc-application.c:124
 #, c-format
 msgid ""
 "%s\n"
@@ -5241,29 +6830,548 @@ msgstr ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 
-#: ../shell/control-center.c:211
+#: ../shell/cc-application.c:154
+msgid "Available panels:"
+msgstr "Available panels:"
+
+#: ../shell/cc-application.c:273
 msgid "Help"
 msgstr "Help"
 
-#: ../shell/control-center.c:212
+#: ../shell/cc-application.c:274
 msgid "Quit"
 msgstr "Quit"
 
-#: ../shell/gnomecc.directory.in.h:1
-msgid "Control Center"
-msgstr "Control Centre"
+#: ../shell/cc-window.c:61 ../shell/gnome-control-center.desktop.in.in.h:1
+msgid "Settings"
+msgstr "Settings"
+
+#. Add categories
+#: ../shell/cc-window.c:857
+msgctxt "category"
+msgid "Personal"
+msgstr "Personal"
+
+#: ../shell/cc-window.c:858
+msgctxt "category"
+msgid "Hardware"
+msgstr "Hardware"
+
+#: ../shell/cc-window.c:859
+msgctxt "category"
+msgid "System"
+msgstr "System"
 
-#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/shell.ui.h:1
-msgid "System Settings"
-msgstr "System Settings"
+#: ../shell/cc-window.c:1413
+msgid "All Settings"
+msgstr "All Settings"
 
 #: ../shell/gnome-control-center.desktop.in.in.h:2
 msgid "Preferences;Settings;"
 msgstr "Preferences;Settings;"
 
-#: ../shell/shell.ui.h:2
-msgid "All Settings"
-msgstr "All Settings"
+#~ msgid "Change the background"
+#~ msgstr "Change the background"
+
+#~ msgid "Configure Bluetooth settings"
+#~ msgstr "Configure Bluetooth settings"
+
+#~ msgid "Browse Files..."
+#~ msgstr "Browse Files…"
+
+#~ msgctxt "Power"
+#~ msgid "Bluetooth"
+#~ msgstr "Bluetooth"
+
+#~ msgid "Create virtual device"
+#~ msgstr "Create virtual device"
+
+#~ msgid "Available Profiles for Displays"
+#~ msgstr "Available Profiles for Displays"
+
+#~ msgid "Available Profiles for Scanners"
+#~ msgstr "Available Profiles for Scanners"
+
+#~ msgid "Available Profiles for Printers"
+#~ msgstr "Available Profiles for Printers"
+
+#~ msgid "Available Profiles for Cameras"
+#~ msgstr "Available Profiles for Cameras"
+
+#~ msgid "Available Profiles for Webcams"
+#~ msgstr "Available Profiles for Webcams"
+
+#~ msgid "Available Profiles"
+#~ msgstr "Available Profiles"
+
+#~ msgid "%i year"
+#~ msgid_plural "%i years"
+#~ msgstr[0] "%i year"
+#~ msgstr[1] "%i years"
+
+#~ msgid "%i month"
+#~ msgid_plural "%i months"
+#~ msgstr[0] "%i month"
+#~ msgstr[1] "%i months"
+
+#~ msgid "%i week"
+#~ msgid_plural "%i weeks"
+#~ msgstr[0] "%i week"
+#~ msgstr[1] "%i weeks"
+
+#~ msgid "Less than 1 week"
+#~ msgstr "Less than 1 week"
+
+#~ msgid "This device is not color managed."
+#~ msgstr "This device is not colour managed."
+
+#~ msgid "This device is using manufacturing calibrated data."
+#~ msgstr "This device is using manufacturing calibrated data."
+
+#~ msgid ""
+#~ "This device does not have a profile suitable for whole-screen color "
+#~ "correction."
+#~ msgstr ""
+#~ "This device does not have a profile suitable for whole-screen colour "
+#~ "correction."
+
+#~ msgid "Not specified"
+#~ msgstr "Not specified"
+
+#~ msgid "No devices supporting color management detected"
+#~ msgstr "No devices supporting colour management detected"
+
+#~ msgid "Add device"
+#~ msgstr "Add device"
+
+#~ msgid "Add a virtual device"
+#~ msgstr "Add a virtual device"
+
+#~ msgid "Remove a device"
+#~ msgstr "Remove a device"
+
+#~ msgid "Color management settings"
+#~ msgstr "Colour management settings"
+
+#~ msgid "English"
+#~ msgstr "English"
+
+#~ msgid "British English"
+#~ msgstr "British English"
+
+#~ msgid "German"
+#~ msgstr "German"
+
+#~ msgid "French"
+#~ msgstr "French"
+
+#~ msgid "Spanish"
+#~ msgstr "Spanish"
+
+#~ msgid "Chinese (simplified)"
+#~ msgstr "Chinese (simplified)"
+
+#~ msgid "Russian"
+#~ msgstr "Russian"
+
+#~ msgid "Arabic"
+#~ msgstr "Arabic"
+
+#~ msgid "Select a region"
+#~ msgstr "Select a region"
+
+#~ msgid "Unspecified"
+#~ msgstr "Unspecified"
+
+#~ msgid "Select a language"
+#~ msgstr "Select a language"
+
+#~ msgid "_Select"
+#~ msgstr "_Select"
+
+#~ msgid "Date and Time preferences panel"
+#~ msgstr "Date and Time preferences panel"
+
+#~ 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 "Unknown model"
+
+#~ msgid "The next login will attempt to use the standard experience."
+#~ msgstr "The next login will attempt to use the standard experience."
+
+#~ msgid ""
+#~ "The next login will use the fallback mode intended for unsupported "
+#~ "graphics hardware."
+#~ msgstr ""
+#~ "The next login will use the fallback mode intended for unsupported "
+#~ "graphics hardware."
+
+#~ msgctxt "Experience"
+#~ msgid "Fallback"
+#~ msgstr "Fallback"
+
+#~ msgid "System Information"
+#~ msgstr "System Information"
+
+#~ msgid "OS type"
+#~ msgstr "OS type"
+
+#~ msgid "_Other Media..."
+#~ msgstr "_Other Media…"
+
+#~ msgid "Experience"
+#~ msgstr "Experience"
+
+#~ msgid "Forced _Fallback Mode"
+#~ msgstr "Forced _Fallback Mode"
+
+#~ msgid "Change keyboard settings"
+#~ msgstr "Change keyboard settings"
+
+#~ msgid "Layout Settings"
+#~ msgstr "Layout Settings"
+
+#~ msgid "Set your mouse and touchpad preferences"
+#~ msgstr "Set your mouse and touchpad preferences"
+
+#~ msgid "Network settings"
+#~ msgstr "Network settings"
+
+#~ msgid "Network;Wireless;IP;LAN;Proxy;"
+#~ msgstr "Network;Wireless;IP;LAN;Proxy;"
+
+#~ msgid "Out of range"
+#~ msgstr "Out of range"
+
+#~ msgid "_Options..."
+#~ msgstr "_Options…"
+
+#~ msgid "C_reate..."
+#~ msgstr "C_reate…"
+
+#~ msgid "_Configure..."
+#~ msgstr "_Configure…"
+
+#~ msgid "Wireless Hotspot"
+#~ msgstr "Wireless Hotspot"
+
+#~ msgid "Wireless"
+#~ msgstr "Wireless"
+
+#~ msgid "_Disconnect"
+#~ msgstr "_Disconnect"
+
+#~ msgid "_Connect"
+#~ msgstr "_Connect"
+
+#~ msgid "Wired"
+#~ msgstr "Wired"
+
+#~ msgid "Mesh"
+#~ msgstr "Mesh"
+
+#~ msgid "Disconnected"
+#~ msgstr "Disconnected"
+
+#~ msgid "Carrier/link changed"
+#~ msgstr "Carrier/link changed"
+
+#~ msgid "Expired credentials. Please log in again."
+#~ msgstr "Expired credentials. Please log in again."
+
+#~ msgid "_Log In"
+#~ msgstr "_Log In"
+
+#~ msgid "Manage online accounts"
+#~ msgstr "Manage online accounts"
+
+#~ msgid "Caution low battery, %s remaining"
+#~ msgstr "Caution low battery, %s remaining"
+
+#~ msgid "Using battery power - %s remaining"
+#~ msgstr "Using battery power - %s remaining"
+
+#~ msgid "Using battery power"
+#~ msgstr "Using battery power"
+
+#~ msgid "Charging - fully charged"
+#~ msgstr "Charging - fully charged"
+
+#~ msgid "Using UPS power - %s remaining"
+#~ msgstr "Using UPS power - %s remaining"
+
+#~ msgid "Caution low UPS"
+#~ msgstr "Caution low UPS"
+
+#~ msgid "Using UPS power"
+#~ msgstr "Using UPS power"
+
+#~ msgid "Your secondary battery is fully charged"
+#~ msgstr "Your secondary battery is fully charged"
+
+#~ msgid "Your secondary battery is empty"
+#~ msgstr "Your secondary battery is empty"
+
+#~ msgctxt "Battery power"
+#~ msgid "Charging - fully charged"
+#~ msgstr "Charging - fully charged"
+
+#~ msgid ""
+#~ "Tip: <a href=\"screen\">screen brightness</a> affects how much power is "
+#~ "used"
+#~ msgstr ""
+#~ "Tip: <a href=\"screen\">screen brightness</a> affects how much power is "
+#~ "used"
+
+#~ msgid "Power management settings"
+#~ msgstr "Power management settings"
+
+#~ msgid "Don't suspend"
+#~ msgstr "Don't suspend"
+
+#~ msgid "Suspend when inactive for"
+#~ msgstr "Suspend when inactive for"
+
+#~ msgctxt "printer state"
+#~ msgid "Paused"
+#~ msgstr "Paused"
+
+#~ msgid "Change printer settings"
+#~ msgstr "Change printer settings"
+
+#~ msgid "%s Options"
+#~ msgstr "%s Options"
+
+#~ msgid "Manufacturers"
+#~ msgstr "Manufacturers"
+
+#~ msgid "Drivers"
+#~ msgstr "Drivers"
+
+#~ msgid "_Show"
+#~ msgstr "_Show"
+
+#~ msgid "Change your region and language settings"
+#~ msgstr "Change your region and language settings"
+
+#~ msgid "Choose an input source"
+#~ msgstr "Choose an input source"
+
+#~ msgid "Select an input source to add"
+#~ msgstr "Select an input source to add"
+
+#~ msgid ""
+#~ "The login screen, system accounts and new user accounts use the system-"
+#~ "wide Region and Language settings."
+#~ msgstr ""
+#~ "The login screen, system accounts and new user accounts use the system-"
+#~ "wide Region and Language settings."
+
+#~ 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 ""
+#~ "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."
+
+#~ msgid "Copy Settings"
+#~ msgstr "Copy Settings"
+
+#~ msgid "Copy Settings..."
+#~ msgstr "Copy Settings…"
+
+#~ msgid "Region and Language"
+#~ msgstr "Region and Language"
+
+#~ msgid ""
+#~ "Select a display language (change will be applied next time you log in)"
+#~ msgstr ""
+#~ "Select a display language (change will be applied next time you log in)"
+
+#~ msgid "Add Language"
+#~ msgstr "Add Language"
+
+#~ msgid "Remove Language"
+#~ msgstr "Remove Language"
+
+#~ msgid "Install languages..."
+#~ msgstr "Install languages…"
+
+#~ msgid "Select a region (change will be applied the next time you log in)"
+#~ msgstr "Select a region (change will be applied the next time you log in)"
+
+#~ msgid "Add Region"
+#~ msgstr "Add Region"
+
+#~ msgid "Currency"
+#~ msgstr "Currency"
+
+#~ msgid "Examples"
+#~ msgstr "Examples"
+
+#~ msgid "Select keyboards or other input sources"
+#~ msgstr "Select keyboards or other input sources"
+
+#~ msgid "Remove Input Source"
+#~ msgstr "Remove Input Source"
+
+#~ msgid "Move Input Source Up"
+#~ msgstr "Move Input Source Up"
+
+#~ msgid "Show Keyboard Layout"
+#~ msgstr "Show Keyboard Layout"
+
+#~ msgid "Ctrl+Alt+Space"
+#~ msgstr "Ctrl+Alt+Space"
+
+#~ msgid "Shortcut Settings"
+#~ msgstr "Shortcut Settings"
+
+#~ msgid "Display language:"
+#~ msgstr "Display language:"
+
+#~ msgid "Input source:"
+#~ msgstr "Input source:"
+
+#~ msgid "Format:"
+#~ msgstr "Format:"
+
+#~ msgid "Your settings"
+#~ msgstr "Your settings"
+
+#~ msgid "System settings"
+#~ msgstr "System settings"
+
+#~ msgid "Brightness & Lock"
+#~ msgstr "Brightness & Lock"
+
+#~ msgid "Screen brightness and lock settings"
+#~ msgstr "Screen brightness and lock settings"
+
+#~ msgid "Brightness;Lock;Dim;Blank;Monitor;"
+#~ msgstr "Brightness;Lock;Dim;Blank;Monitor;"
+
+#~ msgid "_Dim screen to save power"
+#~ msgstr "_Dim screen to save power"
+
+#~ msgid "Don't lock when at home"
+#~ msgstr "Don't lock when at home"
+
+#~ msgid "Locations..."
+#~ msgstr "Locations…"
+
+#~ msgid "Lock"
+#~ msgstr "Lock"
+
+#~ msgid "Enable debugging code"
+#~ msgstr "Enable debugging code"
+
+#~ msgid "Version of this application"
+#~ msgstr "Version of this application"
+
+#~ msgid " — GNOME Volume Control Applet"
+#~ msgstr " — GNOME Volume Control Applet"
+
+#~ msgid "Show desktop volume control"
+#~ msgstr "Show desktop volume control"
+
+#~ msgid "Sound Output Volume"
+#~ msgstr "Sound Output Volume"
+
+#~ msgid "Microphone Volume"
+#~ msgstr "Microphone Volume"
+
+#~ msgid "%u Output"
+#~ msgid_plural "%u Outputs"
+#~ msgstr[0] "%u Output"
+#~ msgstr[1] "%u Outputs"
+
+#~ msgid "%u Input"
+#~ msgid_plural "%u Inputs"
+#~ msgstr[0] "%u Input"
+#~ msgstr[1] "%u Inputs"
+
+#~ msgid "System Sounds"
+#~ msgstr "System Sounds"
+
+#~ msgid "Failed to start Sound Preferences: %s"
+#~ msgstr "Failed to start Sound Preferences: %s"
+
+#~ msgid "_Mute"
+#~ msgstr "_Mute"
+
+#~ msgid "_Sound Preferences"
+#~ msgstr "_Sound Preferences"
+
+#~ msgid "Muted"
+#~ msgstr "Muted"
+
+#~ msgid "Universal Access Preferences"
+#~ msgstr "Universal Access Preferences"
+
+#~ msgid "Options..."
+#~ msgstr "Options…"
+
+#~ msgctxt "Zoom Grayscale"
+#~ msgid "Color"
+#~ msgstr "Colour"
+
+#~ msgctxt "Zoom Grayscale"
+#~ msgid "None"
+#~ msgstr "None"
+
+#~ msgid "User Accounts"
+#~ msgstr "User Accounts"
+
+#~ msgid "_Hint"
+#~ msgstr "_Hint"
+
+#~ 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 ""
+#~ "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."
+
+#~ msgid "Fair"
+#~ msgstr "Fair"
+
+#~ msgid "Browse for more pictures..."
+#~ msgstr "Browse for more pictures…"
+
+#~ msgid "No user with the name '%s' exists."
+#~ msgstr "No user with the name '%s' exists."
+
+#~ msgid "This user does not exist."
+#~ msgstr "This user does not exist."
+
+#~ msgid "Set your Wacom tablet preferences"
+#~ msgstr "Set your Wacom tablet preferences"
+
+#~ msgid "Map Buttons..."
+#~ msgstr "Map Buttons…"
+
+#~ msgid "Calibrate..."
+#~ msgstr "Calibrate…"
+
+#~ msgid "- System Settings"
+#~ msgstr "- System Settings"
+
+#~ msgid "Control Center"
+#~ msgstr "Control Centre"
+
+#~ msgid "System Settings"
+#~ msgstr "System Settings"
 
 #~ msgid "Security Key"
 #~ msgstr "Security Key"
@@ -5280,9 +7388,6 @@ msgstr "All Settings"
 #~ msgid "Getting devices..."
 #~ msgstr "Getting devices…"
 
-#~ msgid "No local printers found"
-#~ msgstr "No local printers found"
-
 #~ msgid ""
 #~ "FirewallD is not running. Network printer detection needs services mdns, "
 #~ "ipp, ipp-client and samba-client enabled on firewall."
@@ -5290,9 +7395,6 @@ msgstr "All Settings"
 #~ "FirewallD is not running. Network printer detection needs services mdns, "
 #~ "ipp, ipp-client and samba-client enabled on firewall."
 
-#~ msgid "Devices"
-#~ msgstr "Devices"
-
 #~ msgctxt "printer type"
 #~ msgid "Local"
 #~ msgstr "Local"
@@ -5337,9 +7439,6 @@ msgstr "All Settings"
 #~ msgid "Solid Color"
 #~ msgstr "Solid Colour"
 
-#~ msgid "Pictures Folder"
-#~ msgstr "Pictures Folder"
-
 #~ msgid "Colors & Gradients"
 #~ msgstr "Colours & Gradients"
 
@@ -5404,12 +7503,6 @@ msgstr "All Settings"
 #~ msgid "Other..."
 #~ msgstr "Other…"
 
-#~ msgid "Hotspot"
-#~ msgstr "Hotspot"
-
-#~ msgid "Not connected to the internet."
-#~ msgstr "Not connected to the internet."
-
 #~ msgid "Create the hotspot anyway?"
 #~ msgstr "Create the hotspot anyway?"
 
@@ -5422,9 +7515,6 @@ msgstr "All Settings"
 #~ msgid "Create _Hotspot"
 #~ msgstr "Create _Hotspot"
 
-#~ msgid "Device Off"
-#~ msgstr "Device Off"
-
 #~ msgid "_Network Name"
 #~ msgstr "_Network Name"
 
@@ -5443,9 +7533,6 @@ msgstr "All Settings"
 #~ msgid "FTP Port"
 #~ msgstr "FTP Port"
 
-#~ msgid "Socks Port"
-#~ msgstr "Socks Port"
-
 #~ msgid "To add a new account, first select the account type"
 #~ msgstr "To add a new account, first select the account type"
 
@@ -5470,18 +7557,9 @@ msgstr "All Settings"
 #~ msgid "Add User"
 #~ msgstr "Add User"
 
-#~ msgid "Remove User"
-#~ msgstr "Remove User"
-
 #~ msgid "Allowed users"
 #~ msgstr "Allowed users"
 
-#~ msgid "Choose a Layout"
-#~ msgstr "Choose a Layout"
-
-#~ msgid "Preview"
-#~ msgstr "Preview"
-
 #~ msgid "Keyboard Layout Options"
 #~ msgstr "Keyboard Layout Options"
 
@@ -5491,21 +7569,9 @@ msgstr "All Settings"
 #~ msgid "Remove Layout"
 #~ msgstr "Remove Layout"
 
-#~ msgid "Move Up"
-#~ msgstr "Move Up"
-
-#~ msgid "Move Down"
-#~ msgstr "Move Down"
-
 #~ msgid "Preview Layout"
 #~ msgstr "Preview Layout"
 
-#~ msgid "Use the same layout for all windows"
-#~ msgstr "Use the same layout for all windows"
-
-#~ msgid "Allow different layouts for individual windows"
-#~ msgstr "Allow different layouts for individual windows"
-
 #~ msgid "New windows use the default layout"
 #~ msgstr "New windows use the default layout"
 
@@ -5531,12 +7597,6 @@ msgstr "All Settings"
 #~ msgid "Layout"
 #~ msgstr "Layout"
 
-#~ msgid "Co_nnector:"
-#~ msgstr "Co_nnector:"
-
-#~ msgid "Hardware"
-#~ msgstr "Hardware"
-
 #~ msgid "C_hoose a device to configure:"
 #~ msgstr "C_hoose a device to configure:"
 
@@ -5665,9 +7725,6 @@ msgstr "All Settings"
 #~ msgid "Battery discharging"
 #~ msgstr "Battery discharging"
 
-#~ msgid "UPS discharging"
-#~ msgstr "UPS discharging"
-
 #~ msgid "%s until charged (%.0lf%%)"
 #~ msgstr "%s until charged (%.0lf%%)"
 
@@ -5817,11 +7874,6 @@ msgstr "All Settings"
 #~ msgid "24-Hour Time"
 #~ msgstr "24-Hour Time"
 
-#~ msgid "%u byte"
-#~ msgid_plural "%u bytes"
-#~ msgstr[0] "%u byte"
-#~ msgstr[1] "%u bytes"
-
 #~ msgid "%.1f KB"
 #~ msgstr "%.1f KB"
 
@@ -5849,9 +7901,6 @@ msgstr "All Settings"
 #~ msgid "Web"
 #~ msgstr "Web"
 
-#~ msgid "Add"
-#~ msgstr "Add"
-
 #~ msgid "---"
 #~ msgstr "---"
 
@@ -5934,12 +7983,6 @@ msgstr "All Settings"
 #~ msgid "2010"
 #~ msgstr "2010"
 
-#~ msgid "22"
-#~ msgstr "22"
-
-#~ msgid "45"
-#~ msgstr "45"
-
 #~ msgid "AM"
 #~ msgstr "AM"
 
@@ -5973,12 +8016,6 @@ msgstr "All Settings"
 #~ msgid "Preparing connection"
 #~ msgstr "Preparing connection"
 
-#~ msgid "Configuring connection"
-#~ msgstr "Configuring connection"
-
-#~ msgid "Authenticating"
-#~ msgstr "Authenticating"
-
 #~ msgid "Getting network address"
 #~ msgstr "Getting network address"
 
@@ -5999,9 +8036,6 @@ msgstr "All Settings"
 #~ msgid "%i kb/s"
 #~ msgstr "%i kb/s"
 
-#~ msgid "%i Gb/s"
-#~ msgstr "%i Gb/s"
-
 #~ msgid "Ctrl+Alt+0"
 #~ msgstr "Ctrl+Alt+0"
 
@@ -6017,12 +8051,6 @@ msgstr "All Settings"
 #~ msgid "LowContrast"
 #~ msgstr "LowContrast"
 
-#~ msgid "Off"
-#~ msgstr "Off"
-
-#~ msgid "On"
-#~ msgstr "On"
-
 #~ msgid "Shift+Ctrl+Alt+-"
 #~ msgstr "Shift+Ctrl+Alt+-"
 
@@ -6263,9 +8291,6 @@ msgstr "All Settings"
 #~ msgid "_Detect monitors"
 #~ msgstr "_Detect monitors"
 
-#~ msgid "_Show monitors in panel"
-#~ msgstr "_Show monitors in panel"
-
 #~ msgid "Monitors"
 #~ msgstr "Monitors"
 
@@ -6358,9 +8383,6 @@ msgstr "All Settings"
 #~ msgid "Desktop"
 #~ msgstr "Desktop"
 
-#~ msgid "Keyboard Shortcuts"
-#~ msgstr "Keyboard Shortcuts"
-
 #~ msgid "Assign shortcut keys to commands"
 #~ msgstr "Assign shortcut keys to commands"
 
@@ -6553,27 +8575,18 @@ msgstr "All Settings"
 #~ msgid "<b>_Manual proxy configuration</b>"
 #~ msgstr "<b>_Manual proxy configuration</b>"
 
-#~ msgid "<b>_Use authentication</b>"
-#~ msgstr "<b>_Use authentication</b>"
-
 #~ msgid "HTTP Proxy Details"
 #~ msgstr "HTTP Proxy Details"
 
 #~ msgid "Ignore Host List"
 #~ msgstr "Ignore Host List"
 
-#~ msgid "Ignored Hosts"
-#~ msgstr "Ignored Hosts"
-
 #~ msgid "Network Proxy Preferences"
 #~ msgstr "Network Proxy Preferences"
 
 #~ msgid "The location already exists."
 #~ msgstr "The location already exists."
 
-#~ msgid "_Delete Location"
-#~ msgstr "_Delete Location"
-
 #~ msgid "_Location name:"
 #~ msgstr "_Location name:"
 
@@ -6877,9 +8890,6 @@ msgstr "All Settings"
 #~ msgid "Co_untry:"
 #~ msgstr "Co_untry:"
 
-#~ msgid "Contact"
-#~ msgstr "Contact"
-
 #~ msgid "Cou_ntry:"
 #~ msgstr "Cou_ntry:"
 
@@ -6895,9 +8905,6 @@ msgstr "All Settings"
 #~ msgid "Hom_e:"
 #~ msgstr "Hom_e:"
 
-#~ msgid "Home"
-#~ msgstr "Home"
-
 #~ msgid "IC_Q:"
 #~ msgstr "IC_Q:"
 
@@ -6913,12 +8920,6 @@ msgstr "All Settings"
 #~ msgid "P._O. box:"
 #~ msgstr "P._O. box:"
 
-#~ msgid "Personal Info"
-#~ msgstr "Personal Info"
-
-#~ msgid "Select your photo"
-#~ msgstr "Select your photo"
-
 #~ msgid "State/Pro_vince:"
 #~ msgstr "Co_unty:"
 
@@ -6964,9 +8965,6 @@ msgstr "All Settings"
 #~ msgid "_ZIP/Postal code:"
 #~ msgstr "_Post code:"
 
-#~ msgid "Set your personal information"
-#~ msgstr "Set your personal information"
-
 #~ msgid "Swipe finger on reader"
 #~ msgstr "Swipe finger on reader"
 
@@ -7117,9 +9115,6 @@ msgstr "All Settings"
 #~ msgid "Specify the filename of a theme to install"
 #~ msgstr "Specify the filename of a theme to install"
 
-#~ msgid "filename"
-#~ msgstr "filename"
-
 #~ msgid ""
 #~ "Specify the name of the page to show (theme|background|fonts|interface)"
 #~ msgstr ""
@@ -7270,9 +9265,6 @@ msgstr "All Settings"
 #~ msgid "VB_GR"
 #~ msgstr "VB_GR"
 
-#~ msgid "_Application font:"
-#~ msgstr "_Application font:"
-
 #~ msgid "_BGR"
 #~ msgstr "_BGR"
 
@@ -7445,9 +9437,6 @@ msgstr "All Settings"
 #~ msgid "Would you like to delete this theme?"
 #~ msgstr "Would you like to delete this theme?"
 
-#~ msgid "Theme cannot be deleted"
-#~ msgstr "Theme cannot be deleted"
-
 #~ msgid "Could not install theme engine"
 #~ msgstr "Could not install theme engine"
 
@@ -7539,9 +9528,6 @@ msgstr "All Settings"
 #~ msgid "Large White Pointer - Current"
 #~ msgstr "Large White Pointer — Current"
 
-#~ msgid "Large White Pointer"
-#~ msgstr "Large White Pointer"
-
 #~ msgid ""
 #~ "This theme will not look as intended because the required GTK+ theme '%s' "
 #~ "is not installed."
@@ -7731,9 +9717,6 @@ msgstr "All Settings"
 #~ msgid "Your filter \"%s\" does not match any items."
 #~ msgstr "Your filter \"%s\" does not match any items."
 
-#~ msgid "Start %s"
-#~ msgstr "Start %s"
-
 #~ msgid "Upgrade"
 #~ msgstr "Upgrade"
 
@@ -7762,9 +9745,6 @@ msgstr "All Settings"
 #~ msgid "Documents"
 #~ msgstr "Documents"
 
-#~ msgid "File System"
-#~ msgstr "File System"
-
 #~ msgid "<b>Open</b>"
 #~ msgstr "<b>Open</b>"
 
@@ -7919,9 +9899,6 @@ msgstr "All Settings"
 #~ msgid "C_ut"
 #~ msgstr "C_ut"
 
-#~ msgid "Save File"
-#~ msgstr "Save File"
-
 #~ msgid ""
 #~ "Solid color\n"
 #~ "Horizontal gradient\n"
@@ -7955,9 +9932,6 @@ msgstr "All Settings"
 #~ "Scaled\n"
 #~ "Fill screen"
 
-#~ msgid "_Copy"
-#~ msgstr "_Copy"
-
 #~ msgid "_New"
 #~ msgstr "_New"
 
@@ -8365,9 +10339,6 @@ msgstr "All Settings"
 #~ "The theme you have selected suggests a new font. A preview of the font is "
 #~ "shown below."
 
-#~ msgid "_Apply font"
-#~ msgstr "_Apply font"
-
 #~ msgid "Themes"
 #~ msgstr "Themes"
 
@@ -8568,9 +10539,6 @@ msgstr "All Settings"
 #~ msgid "There was an error launching the keyboard tool: %s"
 #~ msgstr "There was an error launching the keyboard tool: %s"
 
-#~ msgid "Choose..."
-#~ msgstr "Choose…"
-
 #~ msgid "Microsoft Natural Keyboard"
 #~ msgstr "Microsoft Natural Keyboard"
 
@@ -8606,9 +10574,6 @@ msgstr "All Settings"
 #~ msgid "      "
 #~ msgstr "      "
 
-#~ msgid "Volume"
-#~ msgstr "Volume"
-
 #~ msgid ""
 #~ "You just held down the Shift key for 8 seconds.  This is the shortcut for "
 #~ "the Slow Keys feature, which affects the way your keyboard works."
@@ -9018,9 +10983,6 @@ msgstr "All Settings"
 #~ msgid "Accessible Login"
 #~ msgstr "Accessible Login"
 
-#~ msgid "Medium"
-#~ msgstr "Medium"
-
 #~ msgid "<b>Support</b>"
 #~ msgstr "<b>Support</b>"
 
@@ -9120,9 +11082,6 @@ msgstr "All Settings"
 #~ msgid "No description."
 #~ msgstr "No description."
 
-#~ msgid "Enable/disable installed plugins"
-#~ msgstr "Enable/disable installed plugins"
-
 #~ msgid "Keyboard Indicator plugins"
 #~ msgstr "Keyboard Indicator plugins"
 
@@ -9144,9 +11103,6 @@ msgstr "All Settings"
 #~ msgid "The list of active plugins"
 #~ msgstr "The list of active plugins"
 
-#~ msgid "_Available plugins:"
-#~ msgstr "_Available plugins:"
-
 #, fuzzy
 #~ msgid "Old pa_ssword:"
 #~ msgstr "_Password:"


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