[gnome-control-center] Updated British English translation



commit 4b5cc100e5098bc4409207ca69c5e14be196f0cd
Author: Bruce Cowan <bruce bcowan me uk>
Date:   Thu Sep 8 11:20:36 2016 +0000

    Updated British English translation

 po/en_GB.po | 5407 ++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 3113 insertions(+), 2294 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 1c733a6..5b5f398 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,281 +2,243 @@
 # 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, 2013.
 # Philip Withnall <philip tecnocode co uk>, 2010, 2013.
 # Chris Leonard <cjl laptop org>, 2012.
+# Bruce Cowan <bruce bcowan me uk>, 2009, 2010, 2011, 2012, 2013, 2016.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-03 23:08-0600\n"
-"PO-Revision-Date: 2013-03-05 20:07+0100\n"
-"Last-Translator: Philip Withnall <philip tecnocode co uk>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
+"control-center&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2016-08-16 20:59+0000\n"
+"PO-Revision-Date: 2016-09-08 12:17+0100\n"
+"Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
 "Language-Team: British English <en li org>\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.7.1\n"
+"X-Generator: Gtranslator 2.91.7\n"
 "X-Project-Style: gnome\n"
 
 #: ../panels/background/background.ui.h:1
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:1
-msgid "Background"
-msgstr "Background"
+#| msgid "Background"
+msgid "_Background"
+msgstr "_Background"
 
 #. This refers to a slideshow background
 #: ../panels/background/background.ui.h:3
 msgid "Changes throughout the day"
 msgstr "Changes throughout the day"
 
-#: ../panels/background/background.ui.h:4
-msgid "Lock Screen"
-msgstr "Lock Screen"
-
+#. To translators: This is a noun, not a verb
 #: ../panels/background/background.ui.h:5
+#| msgid "Lock Screen"
+msgid "_Lock Screen"
+msgstr "_Lock Screen"
+
+#: ../panels/background/background.ui.h:6
 msgctxt "background, style"
 msgid "Tile"
 msgstr "Tile"
 
-#: ../panels/background/background.ui.h:6
+#: ../panels/background/background.ui.h:7
 msgctxt "background, style"
 msgid "Zoom"
 msgstr "Zoom"
 
-#: ../panels/background/background.ui.h:7
+#: ../panels/background/background.ui.h:8
 msgctxt "background, style"
 msgid "Center"
 msgstr "Centre"
 
-#: ../panels/background/background.ui.h:8
+#: ../panels/background/background.ui.h:9
 msgctxt "background, style"
 msgid "Scale"
 msgstr "Scale"
 
-#: ../panels/background/background.ui.h:9
+#: ../panels/background/background.ui.h:10
 msgctxt "background, style"
 msgid "Fill"
 msgstr "Fill"
 
-#: ../panels/background/background.ui.h:10
+#: ../panels/background/background.ui.h:11
 msgctxt "background, style"
 msgid "Span"
 msgstr "Span"
 
-#. translators: This is the title of the wallpaper chooser dialog.
-#: ../panels/background/cc-background-chooser-dialog.c:300
-msgid "Select Background"
-msgstr "Select Background"
-
-#: ../panels/background/cc-background-chooser-dialog.c:319
+#: ../panels/background/cc-background-chooser-dialog.c:437
 msgid "Wallpapers"
 msgstr "Wallpapers"
 
-#: ../panels/background/cc-background-chooser-dialog.c:328
-msgid "Pictures"
-msgstr "Pictures"
-
-#: ../panels/background/cc-background-chooser-dialog.c:336
+#: ../panels/background/cc-background-chooser-dialog.c:446
 msgid "Colors"
 msgstr "Colours"
 
-#: ../panels/background/cc-background-chooser-dialog.c:345
-msgid "Flickr"
-msgstr "Flickr"
+#. translators: This is the title of the wallpaper chooser dialog.
+#: ../panels/background/cc-background-chooser-dialog.c:483
+msgid "Select Background"
+msgstr "Select Background"
+
+#: ../panels/background/cc-background-chooser-dialog.c:511
+msgid "Pictures"
+msgstr "Pictures"
 
 #. translators: No pictures were found
-#: ../panels/background/cc-background-chooser-dialog.c:400
+#: ../panels/background/cc-background-chooser-dialog.c:543
 msgid "No Pictures Found"
 msgstr "No Pictures Found"
 
+#. translators: "Home" is used in place of the Pictures
+#. * directory in the string below when XDG_PICTURES_DIR is
+#. * undefined
+#: ../panels/background/cc-background-chooser-dialog.c:561
+#: ../panels/search/cc-search-locations-dialog.c:302
+msgid "Home"
+msgstr "Home"
+
 #. translators: %s here is the name of the Pictures directory, the string should be translated in
 #. * the context "You can add images to your Pictures folder and they will show up here"
-#: ../panels/background/cc-background-chooser-dialog.c:415
+#: ../panels/background/cc-background-chooser-dialog.c:573
 #, c-format
 msgid "You can add images to your %s folder and they will show up here"
 msgstr "You can add images to your %s folder and they will show up here"
 
-#: ../panels/background/cc-background-chooser-dialog.c:443
-#: ../panels/bluetooth/cc-bluetooth-panel.c:631
-#: ../panels/color/cc-color-panel.c:220 ../panels/color/cc-color-panel.c:967
-#: ../panels/display/cc-display-panel.c:1385
-#: ../panels/display/cc-display-panel.c:1783
-#: ../panels/network/connection-editor/vpn-helpers.c:245
-#: ../panels/network/connection-editor/vpn-helpers.c:374
-#: ../panels/network/net-device-wifi.c:1201
-#: ../panels/network/net-device-wifi.c:1407
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:379
-#: ../panels/printers/cc-printers-panel.c:1946
+#: ../panels/background/cc-background-chooser-dialog.c:580
+#: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963
+#: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30
+#: ../panels/common/language-chooser.ui.h:3
+#: ../panels/display/cc-display-panel.c:1561
+#: ../panels/display/cc-display-panel.c:2206
+#: ../panels/network/connection-editor/connection-editor.ui.h:1
+#: ../panels/network/connection-editor/vpn-helpers.c:181
+#: ../panels/network/connection-editor/vpn-helpers.c:310
+#: ../panels/network/net-device-wifi.c:1295
+#: ../panels/network/net-device-wifi.c:1532
+#: ../panels/network/network-wifi.ui.h:1
+#: ../panels/printers/cc-printers-panel.c:2076
 #: ../panels/printers/new-printer-dialog.ui.h:2
-#: ../panels/privacy/cc-privacy-panel.c:467
-#: ../panels/search/cc-search-locations-dialog.c:682
-#: ../panels/sharing/cc-sharing-panel.c:421
-#: ../panels/user-accounts/um-fingerprint-dialog.c:269
-#: ../panels/user-accounts/um-photo-dialog.c:96
-#: ../panels/user-accounts/um-photo-dialog.c:221
-#: ../panels/user-accounts/um-user-panel.c:508
+#: ../panels/privacy/cc-privacy-panel.c:1032
+#: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2
+#: ../panels/search/cc-search-locations-dialog.c:637
+#: ../panels/sharing/cc-sharing-panel.c:372
+#: ../panels/user-accounts/data/account-dialog.ui.h:2
+#: ../panels/user-accounts/data/join-dialog.ui.h:2
+#: ../panels/user-accounts/data/password-dialog.ui.h:2
+#: ../panels/user-accounts/um-fingerprint-dialog.c:265
+#: ../panels/user-accounts/um-photo-dialog.c:94
+#: ../panels/user-accounts/um-photo-dialog.c:217
+#: ../panels/user-accounts/um-user-panel.c:705
+#: ../panels/user-accounts/um-user-panel.c:723
 msgid "_Cancel"
 msgstr "_Cancel"
 
-#: ../panels/background/cc-background-chooser-dialog.c:444
-#: ../panels/printers/ppd-selection-dialog.ui.h:3
-#: ../panels/user-accounts/data/photo-dialog.ui.h:9
-#: ../panels/user-accounts/um-photo-dialog.c:98
-msgid "Select"
-msgstr "Select"
+#: ../panels/background/cc-background-chooser-dialog.c:581
+msgid "_Select"
+msgstr "_Select"
 
-#: ../panels/background/cc-background-item.c:150
+#: ../panels/background/cc-background-item.c:203
 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:154
+#: ../panels/background/cc-background-item.c:207
 #, c-format
 msgid "%d × %d"
 msgstr "%d × %d"
 
-#: ../panels/background/cc-background-item.c:283
+#: ../panels/background/cc-background-item.c:333
 msgid "No Desktop Background"
 msgstr "No Desktop Background"
 
-#: ../panels/background/cc-background-panel.c:497
+#: ../panels/background/cc-background-panel.c:493
 msgid "Current background"
 msgstr "Current background"
 
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/background/gnome-background-panel.desktop.in.in.h:2
+#| msgid "Background"
+msgid "Back­ground"
+msgstr "Back­ground"
+
+#: ../panels/background/gnome-background-panel.desktop.in.in.h:3
 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
+#: ../panels/background/gnome-background-panel.desktop.in.in.h:5
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "Wallpaper;Screen;Desktop;"
 
-#: ../panels/bluetooth/bluetooth.ui.h:1
-msgid "Set Up New Device"
-msgstr "Set Up New Device"
-
-#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:9
-msgid "Remove Device"
-msgstr "Remove Device"
-
-#: ../panels/bluetooth/bluetooth.ui.h:3
-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:7
-msgid "Type"
-msgstr "Type"
-
-#: ../panels/bluetooth/bluetooth.ui.h:8
-#: ../panels/network/connection-editor/ce-page-ip4.c:194
-#: ../panels/network/connection-editor/ce-page-ip4.c:456
-#: ../panels/network/connection-editor/ce-page-ip6.c:196
-#: ../panels/network/connection-editor/ce-page-ip6.c:460
-msgid "Address"
-msgstr "Address"
-
-#: ../panels/bluetooth/bluetooth.ui.h:9
-msgid "Mouse & Touchpad Settings"
-msgstr "Mouse & Touchpad Settings"
-
-#: ../panels/bluetooth/bluetooth.ui.h:10
-msgid "Sound Settings"
-msgstr "Sound Settings"
-
-#: ../panels/bluetooth/bluetooth.ui.h:11
-msgid "Keyboard Settings"
-msgstr "Keyboard Settings"
-
-#: ../panels/bluetooth/bluetooth.ui.h:12
-msgid "Send Files…"
-msgstr "Send Files…"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:357
-#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "Yes"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:357
-#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "No"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:470
-msgid "Bluetooth is disabled"
-msgstr "Bluetooth is disabled"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:475
-msgid "Bluetooth is disabled by hardware switch"
-msgstr "Bluetooth is disabled by hardware switch"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:479
-msgid "No Bluetooth adapters found"
-msgstr "No Bluetooth adapters found"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:578
-msgid "Visibility"
-msgstr "Visibility"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:582
-#, c-format
-msgid "Visibility of “%s”"
-msgstr "Visibility of “%s”"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:626
-#, c-format
-msgid "Remove '%s' from the list of devices?"
-msgstr "Remove ‘%s’ from the list of devices?"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:628
-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."
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:632
-#: ../panels/online-accounts/cc-online-accounts-panel.c:844
-msgid "_Remove"
-msgstr "_Remove"
-
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1
-msgid "Bluetooth"
-msgstr "Bluetooth"
-
+#: ../panels/bluetooth/cc-bluetooth-panel.c:264
+#| msgid "Air_plane Mode"
+msgid "Turn Off Airplane Mode"
+msgstr "Turn Off Aeroplane Mode"
+
+#: ../panels/bluetooth/cc-bluetooth-panel.c:330
+#| msgid "No Bluetooth adapters found"
+msgid "No Bluetooth Found"
+msgstr "No Bluetooth Found"
+
+#: ../panels/bluetooth/cc-bluetooth-panel.c:330
+msgid "Plug in a dongle to use Bluetooth."
+msgstr "Plug in a dongle to use Bluetooth."
+
+#: ../panels/bluetooth/cc-bluetooth-panel.c:331
+#| msgid "Bluetooth Sharing"
+msgid "Bluetooth Turned Off"
+msgstr "Bluetooth Turned Off"
+
+#: ../panels/bluetooth/cc-bluetooth-panel.c:331
+msgid "Turn on to connect devices and receive file transfers."
+msgstr "Turn on to connect devices and receive file transfers."
+
+#: ../panels/bluetooth/cc-bluetooth-panel.c:332
+#| msgid "Air_plane Mode"
+msgid "Airplane Mode is on"
+msgstr "Aeroplane Mode is on"
+
+#: ../panels/bluetooth/cc-bluetooth-panel.c:332
+#| msgid "Bluetooth is disabled by hardware switch"
+msgid "Bluetooth is disabled when airplane mode is on."
+msgstr "Bluetooth is disabled when aeroplane mode is on."
+
+#: ../panels/bluetooth/cc-bluetooth-panel.c:333
+#| msgid "Air_plane Mode"
+msgid "Hardware Airplane Mode is on"
+msgstr "Hardware Aeroplane Mode is on"
+
+#: ../panels/bluetooth/cc-bluetooth-panel.c:333
+msgid "Turn off the Airplane mode switch to enable Bluetooth."
+msgstr "Turn off the Aeroplane mode switch to enable Bluetooth."
+
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2
+#| msgid "Bluetooth"
+msgid "Blue­tooth"
+msgstr "Blue­tooth"
+
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3
 msgid "Turn Bluetooth on and off and connect your devices"
 msgstr "Turn Bluetooth on and off and connect your devices"
 
+#. Translators: those are keywords for the bluetooth control-center panel
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5
+msgid "share;sharing;bluetooth;obex;"
+msgstr "share;sharing;bluetooth;obex;"
+
 #. TRANSLATORS: The user has to attach the sensor to the screen
-#: ../panels/color/cc-color-calibrate.c:360
+#: ../panels/color/cc-color-calibrate.c:361
 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
+#: ../panels/color/cc-color-calibrate.c:367
 msgid ""
 "Move your calibration device to the calibrate position and press 'Continue'"
 msgstr ""
@@ -285,7 +247,7 @@ msgstr ""
 #. TRANSLATORS: Some calibration devices need the user to move a
 #. * dial or switch manually. We also show a picture showing them
 #. * what to do...
-#: ../panels/color/cc-color-calibrate.c:372
+#: ../panels/color/cc-color-calibrate.c:373
 msgid ""
 "Move your calibration device to the surface position and press 'Continue'"
 msgstr ""
@@ -294,54 +256,54 @@ msgstr ""
 #. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor
 #. * is built into the palmrest and we need to fullscreen the
 #. * sample widget and shut the lid.
-#: ../panels/color/cc-color-calibrate.c:378
+#: ../panels/color/cc-color-calibrate.c:379
 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
+#: ../panels/color/cc-color-calibrate.c:410
 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
+#: ../panels/color/cc-color-calibrate.c:415
 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
+#: ../panels/color/cc-color-calibrate.c:421
 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
+#: ../panels/color/cc-color-calibrate.c:427
 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
+#: ../panels/color/cc-color-calibrate.c:467
 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
+#: ../panels/color/cc-color-calibrate.c:475
 msgid "Calibration failed!"
 msgstr "Calibration failed!"
 
 #. TRANSLATORS: The user can now remove the sensor from the screen
-#: ../panels/color/cc-color-calibrate.c:481
+#: ../panels/color/cc-color-calibrate.c:482
 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
+#: ../panels/color/cc-color-calibrate.c:553
 msgid "Do not disturb the calibration device while in progress"
 msgstr "Do not disturb the calibration device while in progress"
 
@@ -397,54 +359,54 @@ msgid "Show color profiles for %s"
 msgstr "Show colour profiles for %s"
 
 #. not calibrated
-#: ../panels/color/cc-color-device.c:322
+#: ../panels/color/cc-color-device.c:323
 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:135
+#: ../panels/color/cc-color-panel.c:141
 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:143
+#: ../panels/color/cc-color-panel.c:149
 msgid "Colorspace: "
 msgstr "Colourspace: "
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile is a test profile
-#: ../panels/color/cc-color-panel.c:150
+#: ../panels/color/cc-color-panel.c:156
 msgid "Test profile: "
 msgstr "Test profile: "
 
 #. TRANSLATORS: an ICC profile is a file containing colorspace data
-#: ../panels/color/cc-color-panel.c:218
+#: ../panels/color/cc-color-panel.c:223
 msgid "Select ICC Profile File"
 msgstr "Select ICC Profile File"
 
-#: ../panels/color/cc-color-panel.c:221
+#: ../panels/color/cc-color-panel.c:226
 msgid "_Import"
 msgstr "_Import"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:232
+#: ../panels/color/cc-color-panel.c:237
 msgid "Supported ICC profiles"
 msgstr "Supported ICC profiles"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:239
-#: ../panels/network/wireless-security/eap-method-fast.c:410
+#: ../panels/color/cc-color-panel.c:244
+#: ../panels/network/wireless-security/eap-method-fast.c:417
 msgid "All files"
 msgstr "All files"
 
-#: ../panels/color/cc-color-panel.c:586
+#: ../panels/color/cc-color-panel.c:583
 msgid "Screen"
 msgstr "Screen"
 
 #. TRANSLATORS: this is when the upload of the profile failed
-#: ../panels/color/cc-color-panel.c:912
+#: ../panels/color/cc-color-panel.c:908
 #, c-format
 msgid "Failed to upload file: %s"
 msgstr "Failed to upload file: %s"
@@ -452,39 +414,39 @@ msgstr "Failed to upload file: %s"
 #. TRANSLATORS: these are instructions on how to recover
 #. * the ICC profile on the native operating system and are
 #. * only shown when the user uses a LiveCD to calibrate
-#: ../panels/color/cc-color-panel.c:926
+#: ../panels/color/cc-color-panel.c:922
 msgid "The profile has been uploaded to:"
 msgstr "The profile has been uploaded to:"
 
-#: ../panels/color/cc-color-panel.c:928
+#: ../panels/color/cc-color-panel.c:924
 msgid "Write down this URL."
 msgstr "Write down this URL."
 
-#: ../panels/color/cc-color-panel.c:929
+#: ../panels/color/cc-color-panel.c:925
 msgid "Restart this computer and boot your normal operating system."
 msgstr "Restart this computer and boot your normal operating system."
 
-#: ../panels/color/cc-color-panel.c:930
+#: ../panels/color/cc-color-panel.c:926
 msgid "Type the URL into your browser to download and install the profile."
 msgstr "Type the URL into your browser to download and install the profile."
 
 #. TRANSLATORS: this is the dialog to save the ICC profile
-#: ../panels/color/cc-color-panel.c:964
+#: ../panels/color/cc-color-panel.c:960
 msgid "Save Profile"
 msgstr "Save Profile"
 
-#: ../panels/color/cc-color-panel.c:968
-#: ../panels/network/connection-editor/vpn-helpers.c:375
+#: ../panels/color/cc-color-panel.c:964
+#: ../panels/network/connection-editor/vpn-helpers.c:311
 msgid "_Save"
 msgstr "_Save"
 
 #. TRANSLATORS: this is when the button is sensitive
-#: ../panels/color/cc-color-panel.c:1328
+#: ../panels/color/cc-color-panel.c:1324
 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:1343 ../panels/color/cc-color-panel.c:1367
+#: ../panels/color/cc-color-panel.c:1339 ../panels/color/cc-color-panel.c:1363
 msgid ""
 "The measuring instrument is not detected. Please check it is turned on and "
 "correctly connected."
@@ -493,24 +455,24 @@ msgstr ""
 "correctly connected."
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1377
+#: ../panels/color/cc-color-panel.c:1373
 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:1388
+#: ../panels/color/cc-color-panel.c:1384
 msgid "The device type is not currently supported."
 msgstr "The device type is not currently supported."
 
 #. TRANSLATORS: standard spaces are well known colorspaces like
 #. * sRGB, AdobeRGB and ProPhotoRGB
-#: ../panels/color/cc-color-profile.c:102
+#: ../panels/color/cc-color-profile.c:103
 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:108
+#: ../panels/color/cc-color-profile.c:109
 msgid "Test Profile"
 msgstr "Test Profile"
 
@@ -518,7 +480,7 @@ msgstr "Test Profile"
 #. * 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:116
+#: ../panels/color/cc-color-profile.c:117
 msgctxt "Automatically generated profile"
 msgid "Automatic"
 msgstr "Automatic"
@@ -526,13 +488,13 @@ msgstr "Automatic"
 #. 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:126
+#: ../panels/color/cc-color-profile.c:127
 msgctxt "Profile quality"
 msgid "Low Quality"
 msgstr "Low Quality"
 
 #. TRANSLATORS: the profile quality
-#: ../panels/color/cc-color-profile.c:131
+#: ../panels/color/cc-color-profile.c:132
 msgctxt "Profile quality"
 msgid "Medium Quality"
 msgstr "Medium Quality"
@@ -540,41 +502,41 @@ 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:138
+#: ../panels/color/cc-color-profile.c:139
 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:155
+#: ../panels/color/cc-color-profile.c:156
 msgctxt "Colorspace fallback"
 msgid "Default RGB"
 msgstr "Default RGB"
 
 #. 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:162
+#: ../panels/color/cc-color-profile.c:163
 msgctxt "Colorspace fallback"
 msgid "Default CMYK"
 msgstr "Default CMYK"
 
 #. 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:169
+#: ../panels/color/cc-color-profile.c:170
 msgctxt "Colorspace fallback"
 msgid "Default Gray"
 msgstr "Default Grey"
 
-#: ../panels/color/cc-color-profile.c:193
+#: ../panels/color/cc-color-profile.c:194
 msgid "Vendor supplied factory calibration data"
 msgstr "Vendor supplied factory calibration data"
 
-#: ../panels/color/cc-color-profile.c:202
+#: ../panels/color/cc-color-profile.c:203
 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:224
+#: ../panels/color/cc-color-profile.c:225
 msgid "This profile may no longer be accurate"
 msgstr "This profile may no longer be accurate"
 
@@ -582,34 +544,30 @@ msgstr "This profile may no longer be accurate"
 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:1470
-msgid "Cancel"
-msgstr "Cancel"
-
 #. This starts the calibration process
 #: ../panels/color/color-calibrate.ui.h:4
-msgid "Start"
-msgstr "Start"
+#| msgid "Start"
+msgid "_Start"
+msgstr "_Start"
 
 #. This resumes the calibration process
 #: ../panels/color/color-calibrate.ui.h:6
-msgid "Resume"
-msgstr "Resume"
+#| msgid "Resume"
+msgid "_Resume"
+msgstr "_Resume"
 
 #. This button returns the user back to the color control panel
 #: ../panels/color/color-calibrate.ui.h:8
-msgid "Done"
-msgstr "Done"
+#: ../panels/common/language-chooser.ui.h:2
+#: ../panels/region/format-chooser.ui.h:2
+msgid "_Done"
+msgstr "_Done"
 
 #. Timeout parameters
-#. 5000 = 5 sec
+#. 15000 = 15 sec
 #. 750 = 0.75 sec
 #. Text printed on screen
-#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:81
+#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:82
 msgid "Screen Calibration"
 msgstr "Screen Calibration"
 
@@ -738,15 +696,28 @@ msgstr ""
 "\">Microsoft Windows</a> systems useful."
 
 #: ../panels/color/color.ui.h:27
-#: ../panels/user-accounts/um-fingerprint-dialog.c:742
+#: ../panels/user-accounts/um-fingerprint-dialog.c:730
 msgid "Summary"
 msgstr "Summary"
 
 #: ../panels/color/color.ui.h:28
-msgid "Import File…"
-msgstr "Import File…"
+msgid "Add profile"
+msgstr "Add profile"
 
 #: ../panels/color/color.ui.h:29
+#| msgid "Import File…"
+msgid "_Import File…"
+msgstr "_Import File…"
+
+#: ../panels/color/color.ui.h:31
+#: ../panels/network/connection-editor/net-connection-editor.c:546
+#: ../panels/printers/new-printer-dialog.ui.h:3
+#: ../panels/region/input-chooser.ui.h:3
+#: ../panels/user-accounts/data/account-dialog.ui.h:3
+msgid "_Add"
+msgstr "_Add"
+
+#: ../panels/color/color.ui.h:32
 msgid ""
 "Problems detected. The profile may not work correctly. <a href=\"\">Show "
 "details.</a>"
@@ -754,205 +725,171 @@ msgstr ""
 "Problems detected. The profile may not work correctly. <a href=\"\">Show "
 "details.</a>"
 
-#: ../panels/color/color.ui.h:30
-msgid "Device type:"
-msgstr "Device type:"
-
-#: ../panels/color/color.ui.h:31
-msgid "Manufacturer:"
-msgstr "Manufacturer:"
-
-#: ../panels/color/color.ui.h:32
-msgid "Model:"
-msgstr "Model:"
-
 #: ../panels/color/color.ui.h:33
-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/color.ui.h:34
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
-msgid "Color"
-msgstr "Colour"
-
-#: ../panels/color/color.ui.h:35
 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:36
+#: ../panels/color/color.ui.h:34
 msgid "Learn more"
 msgstr "Learn more"
 
-#: ../panels/color/color.ui.h:37
+#: ../panels/color/color.ui.h:35
 msgid "Learn more about color management"
 msgstr "Learn more about colour management"
 
-#: ../panels/color/color.ui.h:38
-msgid "Set for all users"
-msgstr "Set for all users"
+#: ../panels/color/color.ui.h:36
+#| msgid "Set for all users"
+msgid "_Set for all users"
+msgstr "_Set for all users"
 
-#: ../panels/color/color.ui.h:39
+#: ../panels/color/color.ui.h:37
 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:38
+#| msgid "Enable"
+msgid "_Enable"
+msgstr "_Enable"
+
+#: ../panels/color/color.ui.h:39
+#| msgid "Add profile"
+msgid "_Add profile"
+msgstr "_Add profile"
+
 #: ../panels/color/color.ui.h:40
-msgid "Enable"
-msgstr "Enable"
+#| msgid "Calibrate…"
+msgid "_Calibrate…"
+msgstr "_Calibrate…"
 
 #: ../panels/color/color.ui.h:41
-msgid "Add profile"
-msgstr "Add profile"
+msgid "Calibrate the device"
+msgstr "Calibrate the device"
 
 #: ../panels/color/color.ui.h:42
-#: ../panels/wacom/gnome-wacom-properties.ui.h:10
-msgid "Calibrate…"
-msgstr "Calibrate…"
+#| msgid "Remove profile"
+msgid "_Remove profile"
+msgstr "_Remove profile"
 
 #: ../panels/color/color.ui.h:43
-msgid "Calibrate the device"
-msgstr "Calibrate the device"
+#| msgid "View details"
+msgid "_View details"
+msgstr "_View details"
 
 #: ../panels/color/color.ui.h:44
-msgid "Remove profile"
-msgstr "Remove profile"
-
-#: ../panels/color/color.ui.h:45
-msgid "View details"
-msgstr "View details"
-
-#: ../panels/color/color.ui.h:46
 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:47
+#: ../panels/color/color.ui.h:45
 msgid "LCD"
 msgstr "LCD"
 
-#: ../panels/color/color.ui.h:48
+#: ../panels/color/color.ui.h:46
 msgid "LED"
 msgstr "LED"
 
-#: ../panels/color/color.ui.h:49
+#: ../panels/color/color.ui.h:47
 msgid "CRT"
 msgstr "CRT"
 
-#: ../panels/color/color.ui.h:50
+#: ../panels/color/color.ui.h:48
 msgid "Projector"
 msgstr "Projector"
 
-#: ../panels/color/color.ui.h:51
+#: ../panels/color/color.ui.h:49
 msgid "Plasma"
 msgstr "Plasma"
 
-#: ../panels/color/color.ui.h:52
+#: ../panels/color/color.ui.h:50
 msgid "LCD (CCFL backlight)"
 msgstr "LCD (CCFL backlight)"
 
-#: ../panels/color/color.ui.h:53
+#: ../panels/color/color.ui.h:51
 msgid "LCD (RGB LED backlight)"
 msgstr "LCD (RGB LED backlight)"
 
-#: ../panels/color/color.ui.h:54
+#: ../panels/color/color.ui.h:52
 msgid "LCD (white LED backlight)"
 msgstr "LCD (white LED backlight)"
 
-#: ../panels/color/color.ui.h:55
+#: ../panels/color/color.ui.h:53
 msgid "Wide gamut LCD (CCFL backlight)"
 msgstr "Wide gamut LCD (CCFL backlight)"
 
-#: ../panels/color/color.ui.h:56
+#: ../panels/color/color.ui.h:54
 msgid "Wide gamut LCD (RGB LED backlight)"
 msgstr "Wide gamut LCD (RGB LED backlight)"
 
-#: ../panels/color/color.ui.h:57
+#: ../panels/color/color.ui.h:55
 msgctxt "Calibration quality"
 msgid "High"
 msgstr "High"
 
-#: ../panels/color/color.ui.h:58
+#: ../panels/color/color.ui.h:56
 msgid "40 minutes"
 msgstr "40 minutes"
 
-#: ../panels/color/color.ui.h:59
+#: ../panels/color/color.ui.h:57
 msgctxt "Calibration quality"
 msgid "Medium"
 msgstr "Medium"
 
-#: ../panels/color/color.ui.h:60 ../panels/power/power.ui.h:4
+#: ../panels/color/color.ui.h:58 ../panels/power/power.ui.h:2
 #: ../panels/privacy/privacy.ui.h:7
 msgid "30 minutes"
 msgstr "30 minutes"
 
-#: ../panels/color/color.ui.h:61
+#: ../panels/color/color.ui.h:59
 msgctxt "Calibration quality"
 msgid "Low"
 msgstr "Low"
 
-#: ../panels/color/color.ui.h:62 ../panels/power/power.ui.h:3
+#: ../panels/color/color.ui.h:60 ../panels/power/power.ui.h:1
 msgid "15 minutes"
 msgstr "15 minutes"
 
-#: ../panels/color/color.ui.h:63
+#: ../panels/color/color.ui.h:61
 msgid "Native to display"
 msgstr "Native to display"
 
-#: ../panels/color/color.ui.h:64
+#: ../panels/color/color.ui.h:62
 msgid "D50 (Printing and publishing)"
 msgstr "D50 (Printing and publishing)"
 
-#: ../panels/color/color.ui.h:65
+#: ../panels/color/color.ui.h:63
 msgid "D55"
 msgstr "D55"
 
-#: ../panels/color/color.ui.h:66
+#: ../panels/color/color.ui.h:64
 msgid "D65 (Photography and graphics)"
 msgstr "D65 (Photography and graphics)"
 
-#: ../panels/color/color.ui.h:67
+#: ../panels/color/color.ui.h:65
 msgid "D75"
 msgstr "D75"
 
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/color/gnome-color-panel.desktop.in.in.h:2
+msgid "Co­lor"
+msgstr "Colour"
+
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:3
 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"
 
 #. Translators: those are keywords for the color control-center panel
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:4
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:5
 msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
 msgstr "Colour;ICC;Profile;Calibrate;Printer;Display;"
 
-#. Add some common regions
-#: ../panels/common/cc-common-language.c:685
-msgid "United States"
-msgstr "United States"
-
-#: ../panels/common/cc-common-language.c:686
-msgid "Germany"
-msgstr "Germany"
-
-#: ../panels/common/cc-common-language.c:687
-msgid "France"
-msgstr "France"
-
-#: ../panels/common/cc-common-language.c:688
-msgid "Spain"
-msgstr "Spain"
-
-#: ../panels/common/cc-common-language.c:689
-msgid "China"
-msgstr "China"
-
-#: ../panels/common/cc-common-language.c:759
+#: ../panels/common/cc-common-language.c:323
 msgid "Other…"
 msgstr "Other…"
 
-#: ../panels/common/cc-language-chooser.c:123
-#: ../panels/region/cc-format-chooser.c:268
-#: ../panels/region/cc-input-chooser.c:172
+#: ../panels/common/cc-language-chooser.c:124
+#: ../panels/region/cc-format-chooser.c:271
+#: ../panels/region/cc-input-chooser.c:169
 msgid "More…"
 msgstr "More…"
 
@@ -960,41 +897,98 @@ msgstr "More…"
 msgid "No languages found"
 msgstr "No languages found"
 
-#: ../panels/common/language-chooser.ui.h:1 ../panels/region/region.ui.h:1
+#: ../panels/common/cc-util.c:127
+#: ../panels/network/connection-editor/ce-page-details.c:100
+msgid "Today"
+msgstr "Today"
+
+#: ../panels/common/cc-util.c:131
+#: ../panels/network/connection-editor/ce-page-details.c:102
+msgid "Yesterday"
+msgstr "Yesterday"
+
+#. Translators: This is a date format string in the style of "Feb 24".
+#: ../panels/common/cc-util.c:138
+msgid "%b %e"
+msgstr "%e %b"
+
+#. Translators: This is a date format string in the style of "Feb 24, 2013".
+#: ../panels/common/cc-util.c:143
+msgid "%b %e, %Y"
+msgstr "%e %b, %Y"
+
+#: ../panels/common/language-chooser.ui.h:1
 msgid "Language"
 msgstr "Language"
 
-#: ../panels/common/language-chooser.ui.h:2
-#: ../panels/mouse/cc-mouse-panel.c:120 ../panels/region/format-chooser.ui.h:2
-msgid "_Done"
-msgstr "_Done"
+#: ../panels/datetime/big.ui.h:1 ../panels/datetime/little.ui.h:1
+#: ../panels/datetime/middle.ui.h:1 ../panels/datetime/ydm.ui.h:1
+msgid "Day"
+msgstr "Day"
+
+#: ../panels/datetime/big.ui.h:2 ../panels/datetime/little.ui.h:2
+#: ../panels/datetime/middle.ui.h:2 ../panels/datetime/ydm.ui.h:2
+msgid "Month"
+msgstr "Month"
+
+#: ../panels/datetime/big.ui.h:3 ../panels/datetime/little.ui.h:3
+#: ../panels/datetime/middle.ui.h:3 ../panels/datetime/ydm.ui.h:3
+msgid "Year"
+msgstr "Year"
 
 #. Translators: This is the full date and time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:328
+#: ../panels/datetime/cc-datetime-panel.c:340
 msgid "%e %B %Y, %l:%M %p"
 msgstr "%e %B %Y, %l:%M %p"
 
 #. Translators: This is the full date and time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:333
+#: ../panels/datetime/cc-datetime-panel.c:345
 msgid "%e %B %Y, %R"
 msgstr "%e %B %Y, %R"
 
+#. Translators: "city, country"
+#: ../panels/datetime/cc-datetime-panel.c:523
+#, c-format
+#| msgctxt "login date-time"
+#| msgid "%s, %s"
+msgctxt "timezone loc"
+msgid "%s, %s"
+msgstr "%s, %s"
+
+#. Update the timezone on the listbow row
+#. Translators: "timezone (details)"
+#: ../panels/datetime/cc-datetime-panel.c:553
+#, c-format
+#| msgid "%d x %d (%s)"
+msgctxt "timezone desc"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #. Translators: UTC here means the Coordinated Universal Time.
 #. * %:::z will be replaced by the offset from UTC e.g. UTC+02
-#: ../panels/datetime/cc-datetime-panel.c:549
+#: ../panels/datetime/cc-datetime-panel.c:561
 msgid "UTC%:::z"
 msgstr "UTC%:::z"
 
 #. Translators: This is the time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:554
+#: ../panels/datetime/cc-datetime-panel.c:566
 msgid "%l:%M %p"
 msgstr "%H:%M"
 
 #. Translators: This is the time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:559
+#: ../panels/datetime/cc-datetime-panel.c:571
 msgid "%R"
 msgstr "%R"
 
+#. Update the text bubble in the timezone map
+#. Translators: "timezone (utc shift)"
+#: ../panels/datetime/cc-datetime-panel.c:576
+#, c-format
+#| msgid "%d x %d (%s)"
+msgctxt "timezone map"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #: ../panels/datetime/datetime.ui.h:1
 msgid "January"
 msgstr "January"
@@ -1043,8 +1037,9 @@ msgstr "November"
 msgid "December"
 msgstr "December"
 
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/datetime/datetime.ui.h:13
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1
+#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
 msgid "Date & Time"
 msgstr "Date & Time"
 
@@ -1062,67 +1057,52 @@ msgid "Minute"
 msgstr "Minute"
 
 #: ../panels/datetime/datetime.ui.h:18
-msgid "Switch between AM and PM."
-msgstr "Switch between AM and PM."
-
-#: ../panels/datetime/datetime.ui.h:19
-msgid "Day"
-msgstr "Day"
-
-#: ../panels/datetime/datetime.ui.h:20
-msgid "Month"
-msgstr "Month"
-
-#: ../panels/datetime/datetime.ui.h:21
-msgid "Year"
-msgstr "Year"
-
-#: ../panels/datetime/datetime.ui.h:22
 msgid "Time Zone"
 msgstr "Time Zone"
 
-#: ../panels/datetime/datetime.ui.h:23
+#: ../panels/datetime/datetime.ui.h:19
 msgid "Search for a city"
 msgstr "Search for a city"
 
-#: ../panels/datetime/datetime.ui.h:24
+#: ../panels/datetime/datetime.ui.h:20
 msgid "Automatic _Date & Time"
 msgstr "Automatic _Date & Time"
 
-#: ../panels/datetime/datetime.ui.h:25
+#: ../panels/datetime/datetime.ui.h:21
 msgid "Requires internet access"
 msgstr "Requires internet access"
 
-#: ../panels/datetime/datetime.ui.h:26
+#: ../panels/datetime/datetime.ui.h:22
 msgid "Automatic Time _Zone"
 msgstr "Automatic Time _Zone"
 
-#: ../panels/datetime/datetime.ui.h:27
+#: ../panels/datetime/datetime.ui.h:23
 msgid "Date & _Time"
 msgstr "Date & _Time"
 
-#: ../panels/datetime/datetime.ui.h:28
-msgid "Time _Zone"
-msgstr "Time _Zone"
+#: ../panels/datetime/datetime.ui.h:24
+#| msgid "Time Zone"
+msgid "Time Z_one"
+msgstr "Time Z_one"
 
-#: ../panels/datetime/datetime.ui.h:29
+#: ../panels/datetime/datetime.ui.h:25
 msgid "Time _Format"
 msgstr "Time _Format"
 
-#: ../panels/datetime/datetime.ui.h:30
+#: ../panels/datetime/datetime.ui.h:26
 msgid "24-hour"
 msgstr "24-hour"
 
-#: ../panels/datetime/datetime.ui.h:31
+#: ../panels/datetime/datetime.ui.h:27
 msgid "AM / PM"
 msgstr "AM/PM"
 
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
+#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3
 msgid "Change the date and time, including time zone"
 msgstr "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
+#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5
 msgid "Clock;Timezone;Location;"
 msgstr "Clock;Timezone;Location;"
 
@@ -1134,199 +1114,227 @@ 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:458
+#: ../panels/display/cc-display-panel.c:573
 msgid "Lid Closed"
 msgstr "Lid Closed"
 
 #. translators: "Mirrored" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:461
+#: ../panels/display/cc-display-panel.c:576
 msgid "Mirrored"
 msgstr "Mirrored"
 
-#: ../panels/display/cc-display-panel.c:463
-#: ../panels/display/cc-display-panel.c:1914
-#: ../panels/display/display-capplet.ui.h:1
+#: ../panels/display/cc-display-panel.c:578
+#: ../panels/display/cc-display-panel.c:2429
 msgid "Primary"
 msgstr "Primary"
 
-#: ../panels/display/cc-display-panel.c:465
-#: ../panels/notifications/cc-notifications-panel.c:205
-#: ../panels/power/cc-power-panel.c:1745 ../panels/power/cc-power-panel.c:1756
-#: ../panels/privacy/cc-privacy-panel.c:77
-#: ../panels/privacy/cc-privacy-panel.c:117
-#: ../panels/universal-access/cc-ua-panel.c:253
-#: ../panels/universal-access/cc-ua-panel.c:573
-#: ../panels/universal-access/cc-ua-panel.c:699
+#: ../panels/display/cc-display-panel.c:580
+#: ../panels/notifications/cc-notifications-panel.c:257
+#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971
+#: ../panels/privacy/cc-privacy-panel.c:174
+#: ../panels/privacy/cc-privacy-panel.c:241
+#: ../panels/universal-access/cc-ua-panel.c:269
+#: ../panels/universal-access/cc-ua-panel.c:590
+#: ../panels/universal-access/cc-ua-panel.c:603
+#: ../panels/universal-access/cc-ua-panel.c:615
+#: ../panels/universal-access/cc-ua-panel.c:786
 #: ../panels/universal-access/uap.ui.h:6
 msgid "Off"
 msgstr "Off"
 
-#: ../panels/display/cc-display-panel.c:468
+#: ../panels/display/cc-display-panel.c:583
 msgid "Secondary"
 msgstr "Secondary"
 
-#: ../panels/display/cc-display-panel.c:1382
+#. Title of displays dialog when multiple monitors are present.
+#: ../panels/display/cc-display-panel.c:1558
 msgid "Arrange Combined Displays"
 msgstr "Arrange Combined Displays"
 
-#: ../panels/display/cc-display-panel.c:1386
-#: ../panels/display/cc-display-panel.c:1784
-#: ../panels/network/connection-editor/connection-editor.ui.h:1
+#: ../panels/display/cc-display-panel.c:1562
+#: ../panels/display/cc-display-panel.c:2207
+#: ../panels/network/connection-editor/connection-editor.ui.h:2
+#: ../panels/network/network-wifi.ui.h:2
 msgid "_Apply"
 msgstr "_Apply"
 
-#: ../panels/display/cc-display-panel.c:1406
+#: ../panels/display/cc-display-panel.c:1586
 msgid "Drag displays to rearrange them"
 msgstr "Drag displays to rearrange them"
 
-#. size
-#: ../panels/display/cc-display-panel.c:1848
+#. translators: example string is "60 Hz (NTSC)"
+#. * NTSC is https://en.wikipedia.org/wiki/NTSC
+#: ../panels/display/cc-display-panel.c:1793
+#, c-format
+msgid "%d Hz (NTSC)"
+msgstr "%d Hz (NTSC)"
+
+#. translators: example string is "60 Hz"
+#: ../panels/display/cc-display-panel.c:1799
+#, c-format
+msgid "%d Hz"
+msgstr "%d Hz"
+
+#: ../panels/display/cc-display-panel.c:2259
+#| msgctxt "display panel, rotation"
+#| msgid "Counterclockwise"
+msgid "Rotate counterclockwise by 90°"
+msgstr "Rotate anticlockwise by 90°"
+
+#: ../panels/display/cc-display-panel.c:2277
+msgid "Rotate by 180°"
+msgstr "Rotate by 180°"
+
+#: ../panels/display/cc-display-panel.c:2295
+msgid "Rotate clockwise by 90°"
+msgstr "Rotate clockwise by 90°"
+
+#: ../panels/display/cc-display-panel.c:2316
 msgid "Size"
 msgstr "Size"
 
 #. aspect ratio
-#: ../panels/display/cc-display-panel.c:1863
-#: ../panels/display/display-capplet.ui.h:12
+#: ../panels/display/cc-display-panel.c:2331
 msgid "Aspect Ratio"
 msgstr "Aspect Ratio"
 
-#: ../panels/display/cc-display-panel.c:1884
-#: ../panels/display/display-capplet.ui.h:13
-#: ../panels/printers/pp-options-dialog.c:86
+#: ../panels/display/cc-display-panel.c:2354
+#: ../panels/printers/pp-options-dialog.c:85
 msgid "Resolution"
 msgstr "Resolution"
 
-#: ../panels/display/cc-display-panel.c:1915
-#: ../panels/display/display-capplet.ui.h:2
+#: ../panels/display/cc-display-panel.c:2374
+msgid "Adjust for TV"
+msgstr "Adjust for TV"
+
+#: ../panels/display/cc-display-panel.c:2398
+msgid "Refresh Rate"
+msgstr "Refresh Rate"
+
+#: ../panels/display/cc-display-panel.c:2430
 msgid "Show the top bar and Activities Overview on this display"
 msgstr "Show the top bar and Activities Overview on this display"
 
-#: ../panels/display/cc-display-panel.c:1921
+#: ../panels/display/cc-display-panel.c:2436
 msgid "Secondary Display"
 msgstr "Secondary Display"
 
-#: ../panels/display/cc-display-panel.c:1922
+#: ../panels/display/cc-display-panel.c:2437
 msgid "Join this display with another to create an extra workspace"
 msgstr "Join this display with another to create an extra workspace"
 
-#: ../panels/display/cc-display-panel.c:1929
-#: ../panels/display/display-capplet.ui.h:3
+#: ../panels/display/cc-display-panel.c:2444
 msgid "Presentation"
 msgstr "Presentation"
 
-#: ../panels/display/cc-display-panel.c:1930
-#: ../panels/display/display-capplet.ui.h:4
+#: ../panels/display/cc-display-panel.c:2445
 msgid "Show slideshows and media only"
 msgstr "Show slideshows and media only"
 
 #. translators: "Mirror" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:1935
-#: ../panels/display/display-capplet.ui.h:5
+#: ../panels/display/cc-display-panel.c:2450
 msgid "Mirror"
 msgstr "Mirror"
 
-#: ../panels/display/cc-display-panel.c:1936
+#: ../panels/display/cc-display-panel.c:2451
 msgid "Show your existing view on both displays"
 msgstr "Show your existing view on both displays"
 
-#: ../panels/display/cc-display-panel.c:2138
-msgid "Could not get screen information"
-msgstr "Could not get screen information"
-
-#: ../panels/display/cc-display-panel.c:2169
-msgid "_Arrange Combined Displays"
-msgstr "_Arrange Combined Displays"
-
-#: ../panels/display/display-capplet.ui.h:6
-msgid "Show your primary display on this screen also"
-msgstr "Show your primary display on this screen also"
-
-#: ../panels/display/display-capplet.ui.h:7
-msgid "Combine"
-msgstr "Combine"
-
-#: ../panels/display/display-capplet.ui.h:8
-msgid "Join with the primary display to create an extra space"
-msgstr "Join with the primary display to create an extra space"
-
-#: ../panels/display/display-capplet.ui.h:9
+#: ../panels/display/cc-display-panel.c:2457
 msgid "Turn Off"
 msgstr "Turn Off"
 
-#: ../panels/display/display-capplet.ui.h:10
-msgid "Don't use the display"
-msgstr "Don’t use the display"
-
-#: ../panels/display/display-capplet.ui.h:11
-#: ../panels/printers/printers.ui.h:12
-msgid "Model"
-msgstr "Model"
+#: ../panels/display/cc-display-panel.c:2458
+#| msgid "Don't use the display"
+msgid "Don't use this display"
+msgstr "Don't use this display"
 
-#: ../panels/display/display-capplet.ui.h:14
-msgid "Refresh Rate"
-msgstr "Refresh Rate"
+#: ../panels/display/cc-display-panel.c:2769
+msgid "Could not get screen information"
+msgstr "Could not get screen information"
 
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:1
-msgid "Displays"
-msgstr "Displays"
+#: ../panels/display/cc-display-panel.c:2800
+msgid "_Arrange Combined Displays"
+msgstr "_Arrange Combined Displays"
 
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:2
+#| msgid "Displays"
+msgid "Dis­plays"
+msgstr "Dis­plays"
+
+#: ../panels/display/gnome-display-panel.desktop.in.in.h:3
 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;"
+#: ../panels/display/gnome-display-panel.desktop.in.in.h:5
+#| msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
+msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;"
+msgstr "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;"
+
+#: ../panels/info/cc-info-panel.c:345
+msgid "Wayland"
+msgstr "Wayland"
 
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:450 ../panels/network/panel-common.c:127
+#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../panels/info/cc-info-panel.c:532
+#: ../panels/info/cc-info-panel.c:481
+#, c-format
+msgid "%s %d-bit (Build ID: %s)"
+msgstr "%s %d-bit (Build ID: %s)"
+
+#: ../panels/info/cc-info-panel.c:483
+#, c-format
+msgid "%d-bit (Build ID: %s)"
+msgstr "%d-bit (Build ID: %s)"
+
+#: ../panels/info/cc-info-panel.c:491
 #, c-format
 msgid "%s %d-bit"
 msgstr "%s %d-bit"
 
-#: ../panels/info/cc-info-panel.c:534
+#: ../panels/info/cc-info-panel.c:493
 #, c-format
 msgid "%d-bit"
 msgstr "%d-bit"
 
-#: ../panels/info/cc-info-panel.c:1214
+#: ../panels/info/cc-info-panel.c:1174
 msgid "Ask what to do"
 msgstr "Ask what to do"
 
-#: ../panels/info/cc-info-panel.c:1218
+#: ../panels/info/cc-info-panel.c:1178
 msgid "Do nothing"
 msgstr "Do nothing"
 
-#: ../panels/info/cc-info-panel.c:1222
+#: ../panels/info/cc-info-panel.c:1182
 msgid "Open folder"
 msgstr "Open folder"
 
-#: ../panels/info/cc-info-panel.c:1313
+#: ../panels/info/cc-info-panel.c:1273
 msgid "Other Media"
 msgstr "Other Media"
 
-#: ../panels/info/cc-info-panel.c:1344
+#: ../panels/info/cc-info-panel.c:1304
 msgid "Select an application for audio CDs"
 msgstr "Select an application for audio CDs"
 
-#: ../panels/info/cc-info-panel.c:1345
+#: ../panels/info/cc-info-panel.c:1305
 msgid "Select an application for video DVDs"
 msgstr "Select an application for video DVDs"
 
-#: ../panels/info/cc-info-panel.c:1346
+#: ../panels/info/cc-info-panel.c:1306
 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:1347
+#: ../panels/info/cc-info-panel.c:1307
 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:1348
+#: ../panels/info/cc-info-panel.c:1308
 msgid "Select an application for software CDs"
 msgstr "Select an application for software CDs"
 
@@ -1335,104 +1343,87 @@ 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:1360
+#: ../panels/info/cc-info-panel.c:1320
 msgid "audio DVD"
 msgstr "audio DVD"
 
-#: ../panels/info/cc-info-panel.c:1361
+#: ../panels/info/cc-info-panel.c:1321
 msgid "blank Blu-ray disc"
 msgstr "blank Blu-ray disc"
 
-#: ../panels/info/cc-info-panel.c:1362
+#: ../panels/info/cc-info-panel.c:1322
 msgid "blank CD disc"
 msgstr "blank CD disc"
 
-#: ../panels/info/cc-info-panel.c:1363
+#: ../panels/info/cc-info-panel.c:1323
 msgid "blank DVD disc"
 msgstr "blank DVD disc"
 
-#: ../panels/info/cc-info-panel.c:1364
+#: ../panels/info/cc-info-panel.c:1324
 msgid "blank HD DVD disc"
 msgstr "blank HD DVD disc"
 
-#: ../panels/info/cc-info-panel.c:1365
+#: ../panels/info/cc-info-panel.c:1325
 msgid "Blu-ray video disc"
 msgstr "Blu-ray video disc"
 
-#: ../panels/info/cc-info-panel.c:1366
+#: ../panels/info/cc-info-panel.c:1326
 msgid "e-book reader"
 msgstr "e-book reader"
 
-#: ../panels/info/cc-info-panel.c:1367
+#: ../panels/info/cc-info-panel.c:1327
 msgid "HD DVD video disc"
 msgstr "HD DVD video disc"
 
-#: ../panels/info/cc-info-panel.c:1368
+#: ../panels/info/cc-info-panel.c:1328
 msgid "Picture CD"
 msgstr "Picture CD"
 
-#: ../panels/info/cc-info-panel.c:1369
+#: ../panels/info/cc-info-panel.c:1329
 msgid "Super Video CD"
 msgstr "Super Video CD"
 
-#: ../panels/info/cc-info-panel.c:1370
+#: ../panels/info/cc-info-panel.c:1330
 msgid "Video CD"
 msgstr "Video CD"
 
-#: ../panels/info/cc-info-panel.c:1371
+#: ../panels/info/cc-info-panel.c:1331
 msgid "Windows software"
 msgstr "Windows software"
 
-#: ../panels/info/cc-info-panel.c:1372
-msgid "Software"
-msgstr "Software"
-
-#: ../panels/info/cc-info-panel.c:1495
-#: ../panels/keyboard/keyboard-shortcuts.c:1696
+#: ../panels/info/cc-info-panel.c:1454
 msgid "Section"
 msgstr "Section"
 
-#: ../panels/info/cc-info-panel.c:1504 ../panels/info/info.ui.h:13
+#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14
 msgid "Overview"
 msgstr "Overview"
 
-#: ../panels/info/cc-info-panel.c:1510 ../panels/info/info.ui.h:20
+#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21
 msgid "Default Applications"
 msgstr "Default Applications"
 
-#: ../panels/info/cc-info-panel.c:1515 ../panels/info/info.ui.h:28
+#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29
 msgid "Removable Media"
 msgstr "Removable Media"
 
-#: ../panels/info/cc-info-panel.c:1540
+#: ../panels/info/cc-info-panel.c:1499
 #, c-format
 msgid "Version %s"
 msgstr "Version %s"
 
-#: ../panels/info/cc-info-panel.c:1590
-msgid "Install Updates"
-msgstr "Install Updates"
-
-#: ../panels/info/cc-info-panel.c:1594
-msgid "System Up-To-Date"
-msgstr "System Up-To-Date"
-
-#: ../panels/info/cc-info-panel.c:1598
-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:44
-msgid "Details"
-msgstr "Details"
-
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:2
+#| msgid "Details"
+msgid "De­tails"
+msgstr "De­tails"
+
+#: ../panels/info/gnome-info-panel.desktop.in.in.h:3
 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
+#: ../panels/info/gnome-info-panel.desktop.in.in.h:5
 msgid ""
 "device;system;information;memory;processor;version;default;application;"
 "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
@@ -1485,55 +1476,60 @@ msgstr "Graphics"
 msgid "Virtualization"
 msgstr "Virtualisation"
 
-#: ../panels/info/info.ui.h:14
+#: ../panels/info/info.ui.h:13
+#| msgid "Checking for Updates"
+msgid "Check for updates"
+msgstr "Check for updates"
+
+#: ../panels/info/info.ui.h:15
 msgid "_Web"
 msgstr "_Web"
 
-#: ../panels/info/info.ui.h:15
+#: ../panels/info/info.ui.h:16
 msgid "_Mail"
 msgstr "_Mail"
 
-#: ../panels/info/info.ui.h:16
+#: ../panels/info/info.ui.h:17
 msgid "_Calendar"
 msgstr "_Calendar"
 
-#: ../panels/info/info.ui.h:17
+#: ../panels/info/info.ui.h:18
 msgid "M_usic"
 msgstr "M_usic"
 
-#: ../panels/info/info.ui.h:18
+#: ../panels/info/info.ui.h:19
 msgid "_Video"
 msgstr "_Video"
 
-#: ../panels/info/info.ui.h:19
+#: ../panels/info/info.ui.h:20
 msgid "_Photos"
 msgstr "_Photos"
 
-#: ../panels/info/info.ui.h:21
+#: ../panels/info/info.ui.h:22
 msgid "Select how media should be handled"
 msgstr "Select how media should be handled"
 
-#: ../panels/info/info.ui.h:22
+#: ../panels/info/info.ui.h:23
 msgid "CD _audio"
 msgstr "CD _audio"
 
-#: ../panels/info/info.ui.h:23
+#: ../panels/info/info.ui.h:24
 msgid "_DVD video"
 msgstr "_DVD video"
 
-#: ../panels/info/info.ui.h:24
+#: ../panels/info/info.ui.h:25
 msgid "_Music player"
 msgstr "_Music player"
 
-#: ../panels/info/info.ui.h:25
+#: ../panels/info/info.ui.h:26
 msgid "_Software"
 msgstr "_Software"
 
-#: ../panels/info/info.ui.h:26
+#: ../panels/info/info.ui.h:27
 msgid "_Other Media…"
 msgstr "_Other Media…"
 
-#: ../panels/info/info.ui.h:27
+#: ../panels/info/info.ui.h:28
 msgid "_Never prompt or start programs on media insertion"
 msgstr "_Never prompt or start programs on media insertion"
 
@@ -1582,7 +1578,6 @@ msgid "Eject"
 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:11
 msgid "Typing"
 msgstr "Typing"
@@ -1603,23 +1598,29 @@ msgstr "Launchers"
 msgid "Launch help browser"
 msgstr "Launch help browser"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:3
+#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274
+#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584
+#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1
+msgid "Settings"
+msgstr "Settings"
+
+#: ../panels/keyboard/01-launchers.xml.in.h:4
 msgid "Launch calculator"
 msgstr "Launch calculator"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:4
+#: ../panels/keyboard/01-launchers.xml.in.h:5
 msgid "Launch email client"
 msgstr "Launch e-mail client"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:5
+#: ../panels/keyboard/01-launchers.xml.in.h:6
 msgid "Launch web browser"
 msgstr "Launch web browser"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:6
+#: ../panels/keyboard/01-launchers.xml.in.h:7
 msgid "Home folder"
 msgstr "Home folder"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:7
+#: ../panels/keyboard/01-launchers.xml.in.h:8
 msgctxt "keybinding"
 msgid "Search"
 msgstr "Search"
@@ -1672,7 +1673,6 @@ msgid "Lock screen"
 msgstr "Lock screen"
 
 #: ../panels/keyboard/50-accessibility.xml.in.h:1
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1
 msgid "Universal Access"
 msgstr "Universal Access"
 
@@ -1708,15 +1708,24 @@ msgstr "Decrease text size"
 msgid "High contrast on or off"
 msgstr "High contrast on or off"
 
+#: ../panels/keyboard/cc-keyboard-manager.c:514
+#: ../panels/keyboard/cc-keyboard-manager.c:522
+#: ../panels/keyboard/cc-keyboard-manager.c:830
+msgid "Custom Shortcuts"
+msgstr "Custom Shortcuts"
+
+#. This label is displayed in a treeview cell displaying
+#. * a disabled accelerator key combination.
+#.
 #. translators:
 #. * The device has been disabled
-#: ../panels/keyboard/cc-keyboard-option.c:271
-#: ../panels/keyboard/cc-keyboard-option.c:390
-#: ../panels/keyboard/keyboard-shortcuts.c:1159
-#: ../panels/network/network-wifi.ui.h:29
+#: ../panels/keyboard/cc-keyboard-option.c:276
+#: ../panels/keyboard/cc-keyboard-option.c:395
+#: ../panels/keyboard/keyboard-shortcuts.c:417
+#: ../panels/keyboard/shortcut-editor.ui.h:1
+#: ../panels/network/network-wifi.ui.h:31
 #: ../panels/sound/gvc/gvc-mixer-control.c:1830
-#: ../panels/user-accounts/um-fingerprint-dialog.c:215
-#: ../panels/user-accounts/um-fingerprint-dialog.c:216
+#: ../panels/user-accounts/um-fingerprint-dialog.c:213
 msgid "Disabled"
 msgstr "Disabled"
 
@@ -1724,7 +1733,7 @@ msgstr "Disabled"
 #. * chooser'. AltGr is often used for this purpose. See
 #. * https://live.gnome.org/Design/SystemSettings/RegionAndLanguage
 #.
-#: ../panels/keyboard/cc-keyboard-option.c:349
+#: ../panels/keyboard/cc-keyboard-option.c:354
 msgid "Alternative Characters Key"
 msgstr "Alternative Characters Key"
 
@@ -1732,313 +1741,256 @@ msgstr "Alternative Characters Key"
 #. * sequences that are combined to form a single character.
 #. * See http://en.wikipedia.org/wiki/Compose_key
 #.
-#: ../panels/keyboard/cc-keyboard-option.c:358
+#: ../panels/keyboard/cc-keyboard-option.c:363
 msgid "Compose Key"
 msgstr "Compose Key"
 
-#: ../panels/keyboard/cc-keyboard-option.c:363
+#: ../panels/keyboard/cc-keyboard-option.c:368
 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/cc-keyboard-panel.c:215
+msgid "Reset the shortcut to its default value"
+msgstr "Reset the shortcut to its default value"
+
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:308
+#, c-format
+msgid ""
+"%s is already being used for <b>%s</b>. If you replace it, %s will be "
+"disabled"
+msgstr ""
+"%s is already being used for <b>%s</b>. If you replace it, %s will be "
+"disabled"
+
+#. Setup the top label
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:444
+#, c-format
+msgid "Keyboard shortcut for <b>%s</b>. Enter new shortcut to change."
+msgstr "Keyboard shortcut for <b>%s</b>. Enter new shortcut to change."
 
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:799
+#| msgid "Custom Shortcut"
+msgid "Add Custom Shortcut"
+msgstr "Add Custom Shortcut"
+
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2
+#| msgid "Keyboard"
+msgid "Key­board"
+msgstr "Key­board"
+
+#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3
 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
+#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5
 msgid "Shortcut;Repeat;Blink;"
 msgstr "Shortcut;Repeat;Blink;"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1
-msgid "Custom Shortcut"
-msgstr "Custom Shortcut"
+msgid ""
+"To edit a shortcut, click the row and hold down the new keys or press "
+"Backspace to clear."
+msgstr ""
+"To edit a shortcut, click the row and hold down the new keys or press "
+"Backspace to clear."
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
-msgid "_Name:"
-msgstr "_Name:"
+#| msgid "Keyboard Shortcuts"
+msgid "No keyboard shortcut found"
+msgstr "No keyboard shortcut found"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:3
-msgid "C_ommand:"
-msgstr "C_ommand:"
+msgid "Try a different search"
+msgstr "Try a different search"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
-msgid "Repeat Keys"
-msgstr "Repeat Keys"
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
-msgid "Key presses _repeat when key is held down"
-msgstr "Key presses _repeat when key is held down"
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
-msgid "_Delay:"
-msgstr "_Delay:"
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
-msgid "_Speed:"
-msgstr "_Speed:"
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
-msgctxt "keyboard, delay"
-msgid "Short"
-msgstr "Short"
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
-msgctxt "keyboard, speed"
-msgid "Slow"
-msgstr "Slow"
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
-msgid "Repeat keys speed"
-msgstr "Repeat keys speed"
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
-msgctxt "keyboard, delay"
-msgid "Long"
-msgstr "Long"
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
-msgctxt "keyboard, speed"
-msgid "Fast"
-msgstr "Fast"
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
-msgid "Cursor Blinking"
-msgstr "Cursor Blinking"
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
-msgid "Cursor _blinks in text fields"
-msgstr "Cursor _blinks in text fields"
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
-msgid "S_peed:"
-msgstr "S_peed:"
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
-msgid "Cursor blink speed"
-msgstr "Cursor blink speed"
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
-#: ../panels/region/region.ui.h:5
-msgid "Input Sources"
-msgstr "Input Sources"
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
-msgid "Add Shortcut"
-msgstr "Add Shortcut"
+#: ../panels/keyboard/shortcut-editor.ui.h:2
+#: ../panels/network/connection-editor/ce-page-reset.c:89
+#: ../panels/network/network-wifi.ui.h:51
+msgid "Reset"
+msgstr "Reset"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
-msgid "Remove Shortcut"
-msgstr "Remove Shortcut"
+#: ../panels/keyboard/shortcut-editor.ui.h:3
+#: ../panels/sound/gvc-mixer-dialog.c:1493
+#: ../panels/sound/gvc-sound-theme-chooser.c:564
+msgid "Name"
+msgstr "Name"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
-msgid ""
-"To edit a shortcut, click the row and hold down the new keys or press "
-"Backspace to clear."
-msgstr ""
-"To edit a shortcut, click the row and hold down the new keys or press "
-"Backspace to clear."
+#: ../panels/keyboard/shortcut-editor.ui.h:4
+#| msgid "_Command:"
+msgid "Command"
+msgstr "Command"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:23
-msgid "Shortcuts"
-msgstr "Shortcuts"
+#: ../panels/keyboard/shortcut-editor.ui.h:5
+msgid "Shortcut"
+msgstr "Shortcut"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:585
-#: ../panels/keyboard/keyboard-shortcuts.c:593
-msgid "Custom Shortcuts"
-msgstr "Custom Shortcuts"
+#: ../panels/keyboard/shortcut-editor.ui.h:6
+msgid "Edit"
+msgstr "Edit"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:804
-msgid "<Unknown Action>"
-msgstr "<Unknown Action>"
+#: ../panels/keyboard/shortcut-editor.ui.h:7
+#: ../panels/network/network-wifi.ui.h:20
+msgid "None"
+msgstr "None"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1300
-#, c-format
-msgid ""
-"The shortcut \"%s\" cannot be used because it will become impossible to type "
-"using this key.\n"
-"Please try with a key such as Control, Alt or Shift at the same time."
-msgstr ""
-"The shortcut \"%s\" cannot be used because it will become impossible to type "
-"using this key.\n"
-"Please try with a key such as Control, Alt or Shift at the same time."
+#: ../panels/keyboard/shortcut-editor.ui.h:8
+#| msgid "_Remove"
+msgid "Remove"
+msgstr "Remove"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1332
-#, c-format
-msgid ""
-"The shortcut \"%s\" is already used for\n"
-"\"%s\""
-msgstr ""
-"The shortcut \"%s\" is already used for\n"
-"\"%s\""
+#: ../panels/keyboard/shortcut-editor.ui.h:9
+#: ../panels/printers/authentication-dialog.ui.h:2
+#: ../panels/printers/ppd-selection-dialog.ui.h:2
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1337
-#, 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/shortcut-editor.ui.h:10
+#: ../panels/network/connection-editor/ce-page-ip4.c:276
+#: ../panels/network/connection-editor/ce-page-ip6.c:277
+msgid "Add"
+msgstr "Add"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1343
-msgid "_Reassign"
-msgstr "_Reassign"
+#: ../panels/keyboard/shortcut-editor.ui.h:11
+#| msgid "_Replace"
+msgid "Replace"
+msgstr "Replace"
 
-#: ../panels/mouse/cc-mouse-panel.c:100
+#: ../panels/mouse/cc-mouse-panel.c:82
 msgid "Test Your _Settings"
 msgstr "Test Your _Settings"
 
-#: ../panels/mouse/cc-mouse-panel.c:117
-msgid "Test Your Settings"
-msgstr "Test Your Settings"
-
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1
-msgid "Mouse & Touchpad"
-msgstr "Mouse & Touchpad"
-
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2
+#| msgid "Mouse & Touchpad"
+msgid "Mouse & Touch­pad"
+msgstr "Mouse & Touch­pad"
+
+#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3
 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
+#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5
 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;"
 msgstr "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;Touchpad;"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:1
-msgid "Mouse Preferences"
-msgstr "Mouse Preferences"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:2
 msgid "General"
 msgstr "General"
 
+#: ../panels/mouse/gnome-mouse-properties.ui.h:2
+#| msgid "Primary _button"
+msgid "Primary Button"
+msgstr "Primary Button"
+
 #: ../panels/mouse/gnome-mouse-properties.ui.h:3
-msgctxt "double click, speed"
-msgid "Slow"
-msgstr "Slow"
+msgid "Sets the order of physical buttons on mice and touchpads."
+msgstr "Sets the order of physical buttons on mice and touchpads."
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:4
-msgid "Double-click timeout"
-msgstr "Double-click timeout"
+#| msgctxt "balance"
+#| msgid "Left"
+msgid "Left"
+msgstr "Left"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:5
-msgctxt "double click, speed"
-msgid "Fast"
-msgstr "Fast"
+#| msgctxt "balance"
+#| msgid "Right"
+msgid "Right"
+msgstr "Right"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:6
-msgid "_Double-click"
-msgstr "_Double-click"
+msgid "Mouse"
+msgstr "Mouse"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:7
-msgid "Primary _button"
-msgstr "Primary _button"
+#| msgid "_Mouse Keys"
+msgid "Mouse Speed"
+msgstr "Mouse Speed"
 
 #: ../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:9
-msgctxt "mouse, right button as primary"
-msgid "_Right"
-msgstr "_Right"
+msgid "Double-click timeout"
+msgstr "Double-click timeout"
 
+#. Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so 
use the same translation if possible.
 #: ../panels/mouse/gnome-mouse-properties.ui.h:10
-msgid "Mouse"
-msgstr "Mouse"
+#| msgid "_Natural scrolling"
+msgid "Natural Scrolling"
+msgstr "Natural Scrolling"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:11
-msgid "_Pointer speed"
-msgstr "_Pointer speed"
+#| msgid "This will not remove the account on the server."
+msgid "Scrolling moves the content, not the view."
+msgstr "Scrolling moves the content, not the view."
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:12
-msgctxt "mouse pointer, speed"
-msgid "Slow"
-msgstr "Slow"
+msgid "Touchpad"
+msgstr "Touchpad"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:13
-msgctxt "mouse pointer, speed"
-msgid "Fast"
-msgstr "Fast"
+#| msgid "Touchpad"
+msgid "Touchpad Speed"
+msgstr "Touchpad Speed"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:14
-msgid "Touchpad"
-msgstr "Touchpad"
+#| msgid "Tap to _click"
+msgid "Tap to Click"
+msgstr "Tap to Click"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:15
-msgctxt "touchpad pointer, speed"
-msgid "Slow"
-msgstr "Slow"
+#| msgid "Two _finger scroll"
+msgid "Two-finger Scrolling"
+msgstr "Two-finger Scrolling"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:16
-msgctxt "touchpad pointer, speed"
-msgid "Fast"
-msgstr "Fast"
+#| msgid "Scrolling"
+msgid "Edge Scrolling"
+msgstr "Edge Scrolling"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:17
-msgid "Disable while _typing"
-msgstr "Disable while _typing"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:18
-msgid "Tap to _click"
-msgstr "Tap to _click"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:19
-msgid "Two _finger scroll"
-msgstr "Two _finger scroll"
-
-#. Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so 
use the same translation if possible.
-#: ../panels/mouse/gnome-mouse-properties.ui.h:21
-msgid "_Natural scrolling"
-msgstr "_Natural scrolling"
-
-#: ../panels/mouse/gnome-mouse-test.c:132
+#: ../panels/mouse/gnome-mouse-test.c:130
 #: ../panels/mouse/gnome-mouse-test.ui.h:1
 msgid "Try clicking, double clicking, scrolling"
 msgstr "Try clicking, double clicking, scrolling"
 
-#: ../panels/mouse/gnome-mouse-test.c:137
+#: ../panels/mouse/gnome-mouse-test.c:135
 msgid "Five clicks, GEGL time!"
 msgstr "Five clicks, GEGL time!"
 
-#: ../panels/mouse/gnome-mouse-test.c:142
+#: ../panels/mouse/gnome-mouse-test.c:140
 msgid "Double click, primary button"
 msgstr "Double click, primary button"
 
-#: ../panels/mouse/gnome-mouse-test.c:142
+#: ../panels/mouse/gnome-mouse-test.c:140
 msgid "Single click, primary button"
 msgstr "Single click, primary button"
 
-#: ../panels/mouse/gnome-mouse-test.c:145
+#: ../panels/mouse/gnome-mouse-test.c:143
 msgid "Double click, middle button"
 msgstr "Double click, middle button"
 
-#: ../panels/mouse/gnome-mouse-test.c:145
+#: ../panels/mouse/gnome-mouse-test.c:143
 msgid "Single click, middle button"
 msgstr "Single click, middle button"
 
-#: ../panels/mouse/gnome-mouse-test.c:148
+#: ../panels/mouse/gnome-mouse-test.c:146
 msgid "Double click, secondary button"
 msgstr "Double click, secondary button"
 
-#: ../panels/mouse/gnome-mouse-test.c:148
+#: ../panels/mouse/gnome-mouse-test.c:146
 msgid "Single click, secondary button"
 msgstr "Single click, secondary button"
 
 #. TRANSLATORS: this is to disable the radio hardware in the
 #. * network panel
-#: ../panels/network/cc-network-panel.c:358
+#: ../panels/network/cc-network-panel.c:349
 msgid "Air_plane Mode"
 msgstr "Aero_plane Mode"
 
-#: ../panels/network/cc-network-panel.c:925
+#: ../panels/network/cc-network-panel.c:953
 msgid "Network proxy"
 msgstr "Network proxy"
 
@@ -2046,97 +1998,107 @@ msgstr "Network proxy"
 #. * window for vpn connections, it is also used to display
 #. * vpn connections in the device list.
 #.
-#: ../panels/network/cc-network-panel.c:1104 ../panels/network/net-vpn.c:285
-#: ../panels/network/net-vpn.c:438
+#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283
+#: ../panels/network/net-vpn.c:440
 #, c-format
 msgid "%s VPN"
 msgstr "%s VPN"
 
-#. TRANSLATORS: the user is running a NM that is not API compatible
-#: ../panels/network/cc-network-panel.c:1239
-msgid "The system network services are not compatible with this version."
-msgstr "The system network services are not compatible with this version."
+#: ../panels/network/cc-network-panel.c:1194
+msgid "Oops, something has gone wrong. Please contact your software vendor."
+msgstr "Oops, something has gone wrong. Please contact your software vendor."
+
+#: ../panels/network/cc-network-panel.c:1200
+msgid "NetworkManager needs to be running."
+msgstr "NetworkManager needs to be running."
 
 #: ../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/8021x-security-page.ui.h:2
 #: ../panels/network/connection-editor/security-page.ui.h:3
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:1
+#: ../panels/printers/printers.ui.h:14
+msgid "page 1"
+msgstr "page 1"
+
+#: ../panels/network/connection-editor/8021x-security-page.ui.h:3
+#: ../panels/network/connection-editor/security-page.ui.h:4
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5
 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2
 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
+#: ../panels/network/connection-editor/security-page.ui.h:5
 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/8021x-security-page.ui.h:5
+#: ../panels/network/connection-editor/security-page.ui.h:6
+#: ../panels/printers/printers.ui.h:16
+msgid "page 2"
+msgstr "page 2"
+
+#: ../panels/network/connection-editor/ce-page-8021x-security.c:101
+#: ../panels/network/connection-editor/ce-page-security.c:458
 #: ../panels/network/connection-editor/details-page.ui.h:3
-#: ../panels/network/network-wifi.ui.h:4
+#: ../panels/network/network-wifi.ui.h:6
 msgid "Security"
 msgstr "Security"
 
-#: ../panels/network/connection-editor/ce-page.c:507
+#: ../panels/network/connection-editor/ce-page.c:481
 msgid "automatic"
 msgstr "automatic"
 
+#: ../panels/network/connection-editor/ce-page.c:521
+#, c-format
+msgid "Profile %d"
+msgstr "Profile %d"
+
 #. TRANSLATORS: this WEP WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:52
-#: ../panels/network/net-device-wifi.c:221
-#: ../panels/network/net-device-wifi.c:382
+#: ../panels/network/connection-editor/ce-page-details.c:50
+#: ../panels/network/net-device-wifi.c:214
+#: ../panels/network/net-device-wifi.c:390
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:56
-#: ../panels/network/net-device-wifi.c:225
-#: ../panels/network/net-device-wifi.c:387
-#: ../panels/network/network-wifi.ui.h:17
+#: ../panels/network/connection-editor/ce-page-details.c:54
+#: ../panels/network/net-device-wifi.c:218
+#: ../panels/network/net-device-wifi.c:395
+#: ../panels/network/network-wifi.ui.h:19
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:60
-#: ../panels/network/net-device-wifi.c:229
+#: ../panels/network/connection-editor/ce-page-details.c:58
+#: ../panels/network/net-device-wifi.c:222
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:65
-#: ../panels/network/net-device-wifi.c:234
+#: ../panels/network/connection-editor/ce-page-details.c:63
+#: ../panels/network/net-device-wifi.c:227
 msgid "Enterprise"
 msgstr "Enterprise"
 
-#: ../panels/network/connection-editor/ce-page-details.c:70
-#: ../panels/network/net-device-wifi.c:239
-#: ../panels/network/net-device-wifi.c:372
+#: ../panels/network/connection-editor/ce-page-details.c:68
+#: ../panels/network/net-device-wifi.c:232
+#: ../panels/network/net-device-wifi.c:380
 msgctxt "Wifi security"
 msgid "None"
 msgstr "None"
 
-#: ../panels/network/connection-editor/ce-page-details.c:91
-#: ../panels/power/power.ui.h:19
+#: ../panels/network/connection-editor/ce-page-details.c:89
+#: ../panels/power/power.ui.h:17
 msgid "Never"
 msgstr "Never"
 
-#: ../panels/network/connection-editor/ce-page-details.c:102
-#: ../panels/user-accounts/um-utils.c:803
-msgid "Today"
-msgstr "Today"
-
 #: ../panels/network/connection-editor/ce-page-details.c:104
-#: ../panels/user-accounts/um-utils.c:806
-msgid "Yesterday"
-msgstr "Yesterday"
-
-#: ../panels/network/connection-editor/ce-page-details.c:106
-#: ../panels/network/net-device-ethernet.c:125
-#: ../panels/network/net-device-wifi.c:476
+#: ../panels/network/net-device-ethernet.c:120
+#: ../panels/network/net-device-wifi.c:485
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
@@ -2144,221 +2106,225 @@ msgstr[0] "%i day ago"
 msgstr[1] "%i days ago"
 
 #. Translators: network device speed
-#: ../panels/network/connection-editor/ce-page-details.c:155
-#: ../panels/network/net-device-ethernet.c:53
-#: ../panels/network/net-device-wifi.c:534
+#: ../panels/network/connection-editor/ce-page-details.c:153
+#: ../panels/network/net-device-ethernet.c:50
+#: ../panels/network/net-device-wifi.c:542
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: ../panels/network/connection-editor/ce-page-details.c:181
-#: ../panels/network/net-device-wifi.c:563
+#: ../panels/network/connection-editor/ce-page-details.c:179
+#: ../panels/network/net-device-wifi.c:571
 msgctxt "Signal strength"
 msgid "None"
 msgstr "None"
 
-#: ../panels/network/connection-editor/ce-page-details.c:183
-#: ../panels/network/net-device-wifi.c:565
+#: ../panels/network/connection-editor/ce-page-details.c:181
+#: ../panels/network/net-device-wifi.c:573
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "Weak"
 
-#: ../panels/network/connection-editor/ce-page-details.c:185
-#: ../panels/network/net-device-wifi.c:567
+#: ../panels/network/connection-editor/ce-page-details.c:183
+#: ../panels/network/net-device-wifi.c:575
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "Ok"
 
-#: ../panels/network/connection-editor/ce-page-details.c:187
-#: ../panels/network/net-device-wifi.c:569
+#: ../panels/network/connection-editor/ce-page-details.c:185
+#: ../panels/network/net-device-wifi.c:577
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "Good"
 
-#: ../panels/network/connection-editor/ce-page-details.c:189
-#: ../panels/network/net-device-wifi.c:571
+#: ../panels/network/connection-editor/ce-page-details.c:187
+#: ../panels/network/net-device-wifi.c:579
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "Excellent"
 
-#: ../panels/network/connection-editor/ce-page-ethernet.c:213
-#: ../panels/network/connection-editor/ce-page-vpn.c:204
-#: ../panels/network/connection-editor/ce-page-wifi.c:255
-#: ../panels/network/network-wifi.ui.h:45
+#: ../panels/network/connection-editor/ce-page-details.c:236
+#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266
+msgid "Details"
+msgstr "Details"
+
+#: ../panels/network/connection-editor/ce-page-ethernet.c:215
+#: ../panels/network/connection-editor/ce-page-vpn.c:221
+#: ../panels/network/connection-editor/ce-page-wifi.c:227
+#: ../panels/network/network-wifi.ui.h:47
 msgid "Identity"
 msgstr "Identity"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:207
-#: ../panels/network/connection-editor/ce-page-ip4.c:469
+#: ../panels/network/connection-editor/ce-page-ip4.c:178
+#: ../panels/network/connection-editor/ce-page-ip4.c:432
+#: ../panels/network/connection-editor/ce-page-ip6.c:180
+#: ../panels/network/connection-editor/ce-page-ip6.c:427
+msgid "Address"
+msgstr "Address"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:191
+#: ../panels/network/connection-editor/ce-page-ip4.c:445
 msgid "Netmask"
 msgstr "Netmask"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:221
-#: ../panels/network/connection-editor/ce-page-ip4.c:482
-#: ../panels/network/connection-editor/ce-page-ip6.c:222
-#: ../panels/network/connection-editor/ce-page-ip6.c:490
-#: ../panels/network/network-vpn.ui.h:3
+#: ../panels/network/connection-editor/ce-page-ip4.c:205
+#: ../panels/network/connection-editor/ce-page-ip4.c:458
+#: ../panels/network/connection-editor/ce-page-ip6.c:206
+#: ../panels/network/connection-editor/ce-page-ip6.c:453
+#: ../panels/network/network-vpn.ui.h:2
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:238
-#: ../panels/network/connection-editor/ce-page-ip6.c:239
+#: ../panels/network/connection-editor/ce-page-ip4.c:222
+#: ../panels/network/connection-editor/ce-page-ip6.c:223
 msgid "Delete Address"
 msgstr "Delete Address"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:292
-#: ../panels/network/connection-editor/ce-page-ip6.c:293
-msgid "Add"
-msgstr "Add"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:360
-#: ../panels/network/connection-editor/ce-page-ip6.c:364
+#: ../panels/network/connection-editor/ce-page-ip4.c:339
+#: ../panels/network/connection-editor/ce-page-ip6.c:334
 msgid "Server"
 msgstr "Server"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:377
-#: ../panels/network/connection-editor/ce-page-ip6.c:381
+#: ../panels/network/connection-editor/ce-page-ip4.c:356
+#: ../panels/network/connection-editor/ce-page-ip6.c:351
 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:496
-#: ../panels/network/connection-editor/ce-page-ip6.c:504
+#: ../panels/network/connection-editor/ce-page-ip4.c:472
+#: ../panels/network/connection-editor/ce-page-ip6.c:467
 msgctxt "network parameters"
 msgid "Metric"
 msgstr "Metric"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:517
-#: ../panels/network/connection-editor/ce-page-ip6.c:525
+#: ../panels/network/connection-editor/ce-page-ip4.c:493
+#: ../panels/network/connection-editor/ce-page-ip6.c:484
 msgid "Delete Route"
 msgstr "Delete Route"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:632
-#: ../panels/network/network-wifi.ui.h:25
+#: ../panels/network/connection-editor/ce-page-ip4.c:597
+#: ../panels/network/network-wifi.ui.h:27
 msgid "Automatic (DHCP)"
 msgstr "Automatic (DHCP)"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:636
-#: ../panels/network/connection-editor/ce-page-ip6.c:638
-#: ../panels/network/network-wifi.ui.h:24
+#: ../panels/network/connection-editor/ce-page-ip4.c:601
+#: ../panels/network/connection-editor/ce-page-ip6.c:592
+#: ../panels/network/network-wifi.ui.h:26
+#: ../panels/privacy/cc-privacy-panel.c:201
 msgid "Manual"
 msgstr "Manual"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:640
-#: ../panels/network/connection-editor/ce-page-ip6.c:642
+#: ../panels/network/connection-editor/ce-page-ip4.c:605
+#: ../panels/network/connection-editor/ce-page-ip6.c:596
 msgid "Link-Local Only"
 msgstr "Link-Local Only"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:942
-#: ../panels/network/network-wifi.ui.h:46
+#: ../panels/network/connection-editor/ce-page-ip4.c:935
+#: ../panels/network/network-wifi.ui.h:48
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:209
-#: ../panels/network/connection-editor/ce-page-ip6.c:473
+#: ../panels/network/connection-editor/ce-page-ip6.c:193
+#: ../panels/network/connection-editor/ce-page-ip6.c:440
 msgid "Prefix"
 msgstr "Prefix"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:630
+#: ../panels/network/connection-editor/ce-page-ip6.c:584
 #: ../panels/network/connection-editor/ethernet-page.ui.h:1
 #: ../panels/network/connection-editor/ip4-page.ui.h:4
 #: ../panels/network/connection-editor/ip6-page.ui.h:4
 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2
+#: ../panels/privacy/cc-privacy-panel.c:201
 msgid "Automatic"
 msgstr "Automatic"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:634
+#: ../panels/network/connection-editor/ce-page-ip6.c:588
 msgid "Automatic, DHCP only"
 msgstr "Automatic, DHCP only"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:902
-#: ../panels/network/network-wifi.ui.h:47
+#: ../panels/network/connection-editor/ce-page-ip6.c:893
+#: ../panels/network/network-wifi.ui.h:49
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../panels/network/connection-editor/ce-page-reset.c:91
-#: ../panels/network/network-wifi.ui.h:49
-msgid "Reset"
-msgstr "Reset"
-
-#: ../panels/network/connection-editor/ce-page-security.c:250
+#: ../panels/network/connection-editor/ce-page-security.c:248
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "None"
 
-#: ../panels/network/connection-editor/ce-page-security.c:273
+#: ../panels/network/connection-editor/ce-page-security.c:271
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit Key (Hex or ASCII)"
 
-#: ../panels/network/connection-editor/ce-page-security.c:283
+#: ../panels/network/connection-editor/ce-page-security.c:281
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit Passphrase"
 
-#: ../panels/network/connection-editor/ce-page-security.c:296
-#: ../panels/network/wireless-security/wireless-security.c:409
+#: ../panels/network/connection-editor/ce-page-security.c:294
+#: ../panels/network/wireless-security/wireless-security.c:463
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../panels/network/connection-editor/ce-page-security.c:309
+#: ../panels/network/connection-editor/ce-page-security.c:307
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamic WEP (802.1x)"
 
-#: ../panels/network/connection-editor/ce-page-security.c:323
+#: ../panels/network/connection-editor/ce-page-security.c:321
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../panels/network/connection-editor/ce-page-security.c:337
+#: ../panels/network/connection-editor/ce-page-security.c:335
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
 #: ../panels/network/connection-editor/details-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:2
+#: ../panels/network/network-wifi.ui.h:4
 msgid "Signal Strength"
 msgstr "Signal Strength"
 
 #: ../panels/network/connection-editor/details-page.ui.h:2
-#: ../panels/network/network-wifi.ui.h:3
+#: ../panels/network/network-wifi.ui.h:5
 msgid "Link speed"
 msgstr "Link speed"
 
 #: ../panels/network/connection-editor/details-page.ui.h:4
-#: ../panels/network/net-device-ethernet.c:158
+#: ../panels/network/net-device-ethernet.c:153
 #: ../panels/network/network-simple.ui.h:3
-#: ../panels/network/network-wifi.ui.h:5 ../panels/network/panel-common.c:693
+#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644
 msgid "IPv4 Address"
 msgstr "IPv4 Address"
 
 #: ../panels/network/connection-editor/details-page.ui.h:5
-#: ../panels/network/net-device-ethernet.c:159
-#: ../panels/network/net-device-ethernet.c:163
+#: ../panels/network/net-device-ethernet.c:154
+#: ../panels/network/net-device-ethernet.c:158
 #: ../panels/network/network-mobile.ui.h:4
 #: ../panels/network/network-simple.ui.h:4
-#: ../panels/network/network-wifi.ui.h:6 ../panels/network/panel-common.c:694
+#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645
 msgid "IPv6 Address"
 msgstr "IPv6 Address"
 
 #: ../panels/network/connection-editor/details-page.ui.h:6
-#: ../panels/network/net-device-ethernet.c:166
+#: ../panels/network/net-device-ethernet.c:161
 #: ../panels/network/network-simple.ui.h:2
-#: ../panels/network/network-wifi.ui.h:7
+#: ../panels/network/network-wifi.ui.h:9
 msgid "Hardware Address"
 msgstr "Hardware Address"
 
 #: ../panels/network/connection-editor/details-page.ui.h:7
-#: ../panels/network/net-device-ethernet.c:170
+#: ../panels/network/net-device-ethernet.c:165
 #: ../panels/network/network-mobile.ui.h:5
 #: ../panels/network/network-simple.ui.h:5
-#: ../panels/network/network-wifi.ui.h:8
+#: ../panels/network/network-wifi.ui.h:10
 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:172
+#: ../panels/network/net-device-ethernet.c:167
 #: ../panels/network/network-mobile.ui.h:6
 #: ../panels/network/network-simple.ui.h:6
-#: ../panels/network/network-wifi.ui.h:9
+#: ../panels/network/network-wifi.ui.h:11
 msgid "DNS"
 msgstr "DNS"
 
@@ -2405,7 +2371,7 @@ 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:36
+#: ../panels/network/network-wifi.ui.h:38
 msgid "_MAC Address"
 msgstr "_MAC Address"
 
@@ -2433,29 +2399,29 @@ msgid "Connect _automatically"
 msgstr "Connect _automatically"
 
 #: ../panels/network/connection-editor/ethernet-page.ui.h:17
+#: ../panels/network/connection-editor/security-page.ui.h:2
 #: ../panels/network/connection-editor/vpn-page.ui.h:2
-#: ../panels/network/connection-editor/wifi-page.ui.h:8
 msgid "Firewall _Zone"
 msgstr "Firewall _Zone"
 
-#: ../panels/network/connection-editor/firewall-helpers.c:48
-#: ../panels/network/connection-editor/firewall-helpers.c:112
+#: ../panels/network/connection-editor/firewall-helpers.c:49
+#: ../panels/network/connection-editor/firewall-helpers.c:118
 msgctxt "Firewall zone"
 msgid "Default"
 msgstr "Default"
 
-#: ../panels/network/connection-editor/firewall-helpers.c:49
+#: ../panels/network/connection-editor/firewall-helpers.c:50
 msgid "The zone defines the trust level of the connection"
 msgstr "The zone defines the trust level of the connection"
 
 #: ../panels/network/connection-editor/ip4-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:22
+#: ../panels/network/network-wifi.ui.h:24
 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:23
+#: ../panels/network/network-wifi.ui.h:25
 msgid "_Addresses"
 msgstr "_Addresses"
 
@@ -2466,7 +2432,7 @@ 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:30
+#: ../panels/network/network-wifi.ui.h:32
 msgid "Routes"
 msgstr "Routes"
 
@@ -2477,66 +2443,44 @@ 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:32
+#: ../panels/network/network-wifi.ui.h:34
 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:34
+#: ../panels/network/network-wifi.ui.h:36
 msgid "IPv_6"
 msgstr "IPv_6"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:266
+#: ../panels/network/connection-editor/net-connection-editor.c:296
 msgid "Unable to open connection editor"
 msgstr "Unable to open connection editor"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:284
+#: ../panels/network/connection-editor/net-connection-editor.c:314
 msgid "New Profile"
 msgstr "New Profile"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:509
-#: ../panels/printers/new-printer-dialog.ui.h:3
-#: ../panels/user-accounts/um-account-dialog.c:1471
-msgid "_Add"
-msgstr "_Add"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:593
-#: ../panels/network/network.ui.h:4 ../panels/network/network-vpn.ui.h:1
+#: ../panels/network/connection-editor/net-connection-editor.c:635
 msgid "VPN"
 msgstr "VPN"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:594
-msgid "Bond"
-msgstr "Bond"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:595
-msgid "Bridge"
-msgstr "Bridge"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:596
-msgid "VLAN"
-msgstr "VLAN"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:747
-msgid "Could not load VPN plugins"
-msgstr "Could not load VPN plugins"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:816
+#: ../panels/network/connection-editor/net-connection-editor.c:783
 msgid "Import from file…"
 msgstr "Import from file…"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:887
-msgid "Add Network Connection"
-msgstr "Add Network Connection"
+#: ../panels/network/connection-editor/net-connection-editor.c:817
+#| msgid "%s VPN"
+msgid "Add VPN"
+msgstr "Add VPN"
 
 #: ../panels/network/connection-editor/reset-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:39
+#: ../panels/network/network-wifi.ui.h:41
 msgid "_Reset"
 msgstr "_Reset"
 
 #: ../panels/network/connection-editor/reset-page.ui.h:2
-#: ../panels/network/net-device-wifi.c:1408
-#: ../panels/network/network-wifi.ui.h:40
+#: ../panels/network/net-device-wifi.c:1533
+#: ../panels/network/network-wifi.ui.h:42
 msgid "_Forget"
 msgstr "_Forget"
 
@@ -2557,15 +2501,15 @@ msgstr ""
 "connect"
 
 #: ../panels/network/connection-editor/security-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:14
+#: ../panels/network/network-wifi.ui.h:16
 msgid "S_ecurity"
 msgstr "S_ecurity"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:205
+#: ../panels/network/connection-editor/vpn-helpers.c:141
 msgid "Cannot import VPN connection"
 msgstr "Cannot import VPN connection"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:207
+#: ../panels/network/connection-editor/vpn-helpers.c:143
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2578,36 +2522,36 @@ msgstr ""
 "\n"
 "Error: %s."
 
-#: ../panels/network/connection-editor/vpn-helpers.c:242
+#: ../panels/network/connection-editor/vpn-helpers.c:178
 msgid "Select file to import"
 msgstr "Select file to import"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:246
-#: ../panels/printers/cc-printers-panel.c:1947
-#: ../panels/sharing/cc-sharing-panel.c:422
-#: ../panels/user-accounts/um-photo-dialog.c:222
+#: ../panels/network/connection-editor/vpn-helpers.c:182
+#: ../panels/printers/cc-printers-panel.c:2077
+#: ../panels/sharing/cc-sharing-panel.c:373
+#: ../panels/user-accounts/um-photo-dialog.c:218
 msgid "_Open"
 msgstr "_Open"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:294
+#: ../panels/network/connection-editor/vpn-helpers.c:230
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "A file named \"%s\" already exists."
 
-#: ../panels/network/connection-editor/vpn-helpers.c:296
+#: ../panels/network/connection-editor/vpn-helpers.c:232
 msgid "_Replace"
 msgstr "_Replace"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:298
+#: ../panels/network/connection-editor/vpn-helpers.c:234
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Do you want to replace %s with the VPN connection you are saving?"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:334
+#: ../panels/network/connection-editor/vpn-helpers.c:270
 msgid "Cannot export VPN connection"
 msgstr "Cannot export VPN connection"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:336
+#: ../panels/network/connection-editor/vpn-helpers.c:272
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2618,26 +2562,27 @@ msgstr ""
 "\n"
 "Error: %s."
 
-#: ../panels/network/connection-editor/vpn-helpers.c:371
-msgid "Export VPN connection..."
-msgstr "Export VPN connection…"
+#: ../panels/network/connection-editor/vpn-helpers.c:307
+#| msgid "Export VPN connection..."
+msgid "Export VPN connection"
+msgstr "Export VPN connection"
 
 #: ../panels/network/connection-editor/vpn-page.ui.h:4
 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
+#: ../panels/network/network-wifi.ui.h:14
 msgid "_SSID"
 msgstr "_SSID"
 
 #: ../panels/network/connection-editor/wifi-page.ui.h:2
-#: ../panels/network/network-wifi.ui.h:13
+#: ../panels/network/network-wifi.ui.h:15
 msgid "_BSSID"
 msgstr "_BSSID"
 
 #: ../panels/network/connection-editor/wifi-page.ui.h:3
-#: ../panels/network/network-wifi.ui.h:16
+#: ../panels/network/network-wifi.ui.h:18
 msgid "My Home Network"
 msgstr "My Home Network"
 
@@ -2645,56 +2590,51 @@ msgstr "My Home Network"
 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"
-
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/network/gnome-network-panel.desktop.in.in.h:2
+#| msgid "Network"
+msgid "Net­work"
+msgstr "Net­work"
+
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:3
 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
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:5
+#| msgid ""
+#| "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;"
+#| "vpn;vlan;bridge;bond;"
 msgid ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
-"vlan;bridge;bond;"
+"DNS;"
 msgstr ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
-"vlan;bridge;bond;"
-
-#: ../panels/network/net-device-bond.c:77
-msgid "Bond slaves"
-msgstr "Bond slaves"
+"DNS;"
 
-#: ../panels/network/net-device-bridge.c:77
-msgid "Bridge slaves"
-msgstr "Bridge slaves"
-
-#: ../panels/network/net-device-ethernet.c:111
-#: ../panels/network/net-device-wifi.c:462
+#: ../panels/network/net-device-ethernet.c:106
+#: ../panels/network/net-device-wifi.c:471
 msgid "never"
 msgstr "never"
 
-#: ../panels/network/net-device-ethernet.c:121
-#: ../panels/network/net-device-wifi.c:472
+#: ../panels/network/net-device-ethernet.c:116
+#: ../panels/network/net-device-wifi.c:481
 msgid "today"
 msgstr "today"
 
-#: ../panels/network/net-device-ethernet.c:123
-#: ../panels/network/net-device-wifi.c:474
+#: ../panels/network/net-device-ethernet.c:118
+#: ../panels/network/net-device-wifi.c:483
 msgid "yesterday"
 msgstr "yesterday"
 
-#: ../panels/network/net-device-ethernet.c:161
-#: ../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
+#: ../panels/network/net-device-ethernet.c:156
+#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647
+#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13
 msgid "IP Address"
 msgstr "IP Address"
 
-#: ../panels/network/net-device-ethernet.c:177
-#: ../panels/network/network-wifi.ui.h:10
+#: ../panels/network/net-device-ethernet.c:172
+#: ../panels/network/network-wifi.ui.h:12
 msgid "Last used"
 msgstr "Last used"
 
@@ -2703,31 +2643,25 @@ msgstr "Last used"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: ../panels/network/net-device-ethernet.c:287
+#: ../panels/network/net-device-ethernet.c:280
 #: ../panels/network/network-ethernet.ui.h:1
 #: ../panels/network/network-simple.ui.h:1
 msgid "Wired"
 msgstr "Wired"
 
-#: ../panels/network/net-device-ethernet.c:355
-#: ../panels/network/net-device-wifi.c:1549
+#: ../panels/network/net-device-ethernet.c:348
+#: ../panels/network/net-device-wifi.c:1691
 #: ../panels/network/network-ethernet.ui.h:3
 #: ../panels/network/network-mobile.ui.h:8
-#: ../panels/network/network-simple.ui.h:8
-#: ../panels/network/network-vpn.ui.h:8
+#: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7
 msgid "Options…"
 msgstr "Options…"
 
-#: ../panels/network/net-device-ethernet.c:492
-#, c-format
-msgid "Profile %d"
-msgstr "Profile %d"
-
-#: ../panels/network/net-device-mobile.c:239
+#: ../panels/network/net-device-mobile.c:223
 msgid "Add new connection"
 msgstr "Add new connection"
 
-#: ../panels/network/net-device-wifi.c:1117
+#: ../panels/network/net-device-wifi.c:1202
 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."
@@ -2735,12 +2669,12 @@ 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:1121
+#: ../panels/network/net-device-wifi.c:1206
 #, 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:1125
+#: ../panels/network/net-device-wifi.c:1210
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
@@ -2748,23 +2682,23 @@ msgstr ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
 
-#: ../panels/network/net-device-wifi.c:1199
+#: ../panels/network/net-device-wifi.c:1293
 msgid "Stop hotspot and disconnect any users?"
 msgstr "Stop hotspot and disconnect any users?"
 
-#: ../panels/network/net-device-wifi.c:1202
+#: ../panels/network/net-device-wifi.c:1296
 msgid "_Stop Hotspot"
 msgstr "_Stop Hotspot"
 
-#: ../panels/network/net-device-wifi.c:1274
+#: ../panels/network/net-device-wifi.c:1394
 msgid "System policy prohibits use as a Hotspot"
 msgstr "System policy prohibits use as a Hotspot"
 
-#: ../panels/network/net-device-wifi.c:1277
+#: ../panels/network/net-device-wifi.c:1397
 msgid "Wireless device does not support Hotspot mode"
 msgstr "Wireless device does not support Hotspot mode"
 
-#: ../panels/network/net-device-wifi.c:1404
+#: ../panels/network/net-device-wifi.c:1529
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
@@ -2772,19 +2706,19 @@ 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
+#: ../panels/network/net-device-wifi.c:1839
 msgid "History"
 msgstr "History"
 
-#: ../panels/network/net-device-wifi.c:1718 ../panels/power/power.ui.h:21
-#: ../panels/privacy/privacy.ui.h:23 ../panels/sound/gvc-mixer-dialog.c:1596
-#: ../panels/wacom/cc-wacom-page.c:525
+#: ../panels/network/net-device-wifi.c:1843
+#: ../panels/printers/options-dialog.ui.h:2
+#: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525
+#: ../panels/wacom/gnome-wacom-properties.ui.h:5
 msgid "_Close"
 msgstr "_Close"
 
 #. translators: This is the label for the "Forget wireless network" functionality
-#: ../panels/network/net-device-wifi.c:1726
+#: ../panels/network/net-device-wifi.c:1851
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "_Forget"
@@ -2804,7 +2738,7 @@ msgstr ""
 msgid "This is not recommended for untrusted public networks."
 msgstr "This is not recommended for untrusted public networks."
 
-#: ../panels/network/net-proxy.c:408
+#: ../panels/network/net-proxy.c:410
 msgid "Proxy"
 msgstr "Proxy"
 
@@ -2820,17 +2754,21 @@ msgstr "IMEI"
 msgid "Provider"
 msgstr "Provider"
 
-#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:5
+#: ../panels/network/network-mobile.ui.h:7
+msgid "Network"
+msgstr "Network"
+
+#: ../panels/network/network-proxy.ui.h:1
 msgctxt "proxy method"
 msgid "None"
 msgstr "None"
 
-#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:6
+#: ../panels/network/network-proxy.ui.h:2
 msgctxt "proxy method"
 msgid "Manual"
 msgstr "Manual"
 
-#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:7
+#: ../panels/network/network-proxy.ui.h:3
 msgctxt "proxy method"
 msgid "Automatic"
 msgstr "Automatic"
@@ -2884,109 +2822,98 @@ 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:8
 msgid "Add Device"
 msgstr "Add Device"
 
-#: ../panels/network/network-vpn.ui.h:2
+#: ../panels/network/network.ui.h:2
+msgid "Remove Device"
+msgstr "Remove Device"
+
+#: ../panels/network/network-vpn.ui.h:1
 msgid "VPN Type"
 msgstr "VPN Type"
 
-#: ../panels/network/network-vpn.ui.h:4
+#: ../panels/network/network-vpn.ui.h:3
 msgid "Group Name"
 msgstr "Group Name"
 
-#: ../panels/network/network-vpn.ui.h:5
+#: ../panels/network/network-vpn.ui.h:4
 msgid "Group Password"
 msgstr "Group Password"
 
-#: ../panels/network/network-vpn.ui.h:6
+#: ../panels/network/network-vpn.ui.h:5
 #: ../panels/printers/authentication-dialog.ui.h:4
 msgid "Username"
 msgstr "Username"
 
-#: ../panels/network/network-vpn.ui.h:7
+#: ../panels/network/network-vpn.ui.h:6
 msgid "Turn VPN connection off"
 msgstr "Turn VPN connection off"
 
-#: ../panels/network/network-wifi.ui.h:1
+#: ../panels/network/network-wifi.ui.h:3
 msgid "Automatic _Connect"
 msgstr "Automatic _Connect"
 
-#: ../panels/network/network-wifi.ui.h:11
+#: ../panels/network/network-wifi.ui.h:13
 msgid "details"
 msgstr "details"
 
-#: ../panels/network/network-wifi.ui.h:15
+#: ../panels/network/network-wifi.ui.h:17
 #: ../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:9
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
+#: ../panels/sharing/sharing.ui.h:9
+#: ../panels/user-accounts/data/account-dialog.ui.h:12
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
 msgid "_Password"
 msgstr "_Password"
 
-#: ../panels/network/network-wifi.ui.h:18
-msgid "None"
-msgstr "None"
-
-#: ../panels/network/network-wifi.ui.h:19
+#: ../panels/network/network-wifi.ui.h:21
 msgid "Show P_assword"
 msgstr "Show P_assword"
 
-#: ../panels/network/network-wifi.ui.h:20
+#: ../panels/network/network-wifi.ui.h:22
 msgid "Make available to other users"
 msgstr "Make available to other users"
 
-#: ../panels/network/network-wifi.ui.h:21
+#: ../panels/network/network-wifi.ui.h:23
 msgid "identity"
 msgstr "identity"
 
-#: ../panels/network/network-wifi.ui.h:26
+#: ../panels/network/network-wifi.ui.h:28
 msgid "Automatic (DHCP) addresses only"
 msgstr "Automatic (DHCP) addresses only"
 
-#: ../panels/network/network-wifi.ui.h:27
+#: ../panels/network/network-wifi.ui.h:29
 msgid "Link-local only"
 msgstr "Link-local only"
 
-#: ../panels/network/network-wifi.ui.h:28
+#: ../panels/network/network-wifi.ui.h:30
 msgid "Shared with other computers"
 msgstr "Shared with other computers"
 
-#: ../panels/network/network-wifi.ui.h:31
+#: ../panels/network/network-wifi.ui.h:33
 msgid "_Ignore automatically obtained routes"
 msgstr "_Ignore automatically obtained routes"
 
-#: ../panels/network/network-wifi.ui.h:33
+#: ../panels/network/network-wifi.ui.h:35
 msgid "ipv4"
 msgstr "ipv4"
 
-#: ../panels/network/network-wifi.ui.h:35
+#: ../panels/network/network-wifi.ui.h:37
 msgid "ipv6"
 msgstr "ipv6"
 
-#: ../panels/network/network-wifi.ui.h:37
+#: ../panels/network/network-wifi.ui.h:39
 msgid "_Cloned MAC Address"
 msgstr "_Cloned MAC Address"
 
-#: ../panels/network/network-wifi.ui.h:38
+#: ../panels/network/network-wifi.ui.h:40
 msgid "hardware"
 msgstr "hardware"
 
-#: ../panels/network/network-wifi.ui.h:41
+#: ../panels/network/network-wifi.ui.h:43
 msgid ""
 "Reset the settings for this connection to their defaults, but remember as a "
 "preferred connection."
@@ -2994,7 +2921,7 @@ msgstr ""
 "Reset the settings for this connection to their defaults, but remember as a "
 "preferred connection."
 
-#: ../panels/network/network-wifi.ui.h:42
+#: ../panels/network/network-wifi.ui.h:44
 msgid ""
 "Remove all details relating to this network and do not try to automatically "
 "connect to it."
@@ -3002,412 +2929,393 @@ msgstr ""
 "Remove all details relating to this network and do not try to automatically "
 "connect to it."
 
-#: ../panels/network/network-wifi.ui.h:43
+#: ../panels/network/network-wifi.ui.h:45
 msgid "reset"
 msgstr "reset"
 
-#: ../panels/network/network-wifi.ui.h:48
+#: ../panels/network/network-wifi.ui.h:50
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../panels/network/network-wifi.ui.h:50
+#: ../panels/network/network-wifi.ui.h:52
 msgid "Wi-Fi Hotspot"
 msgstr "Wi-Fi Hotspot"
 
-#: ../panels/network/network-wifi.ui.h:51
+#: ../panels/network/network-wifi.ui.h:53
 msgid "_Turn On"
 msgstr "_Turn On"
 
-#: ../panels/network/network-wifi.ui.h:52
+#: ../panels/network/network-wifi.ui.h:54
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../panels/network/network-wifi.ui.h:53
+#: ../panels/network/network-wifi.ui.h:55
 msgid "Turn Wi-Fi off"
 msgstr "Turn Wi-Fi off"
 
-#: ../panels/network/network-wifi.ui.h:54
+#: ../panels/network/network-wifi.ui.h:56
 msgid "_Use as Hotspot…"
 msgstr "_Use as Hotspot…"
 
-#: ../panels/network/network-wifi.ui.h:55
+#: ../panels/network/network-wifi.ui.h:57
 msgid "_Connect to Hidden Network…"
 msgstr "_Connect to Hidden Network…"
 
-#: ../panels/network/network-wifi.ui.h:56
+#: ../panels/network/network-wifi.ui.h:58
 msgid "_History"
 msgstr "_History"
 
-#: ../panels/network/network-wifi.ui.h:57
+#: ../panels/network/network-wifi.ui.h:59
 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:58
+#: ../panels/network/network-wifi.ui.h:60
 msgid "Network Name"
 msgstr "Network Name"
 
-#: ../panels/network/network-wifi.ui.h:59
+#: ../panels/network/network-wifi.ui.h:61
 msgid "Connected Devices"
 msgstr "Connected Devices"
 
-#: ../panels/network/network-wifi.ui.h:60
+#: ../panels/network/network-wifi.ui.h:62
 msgid "Security type"
 msgstr "Security type"
 
-#: ../panels/network/network-wifi.ui.h:61
-msgid "Security key"
-msgstr "Security key"
+#: ../panels/network/network-wifi.ui.h:63
+#: ../panels/printers/authentication-dialog.ui.h:5
+#: ../panels/user-accounts/data/account-dialog.ui.h:9
+msgid "Password"
+msgstr "Password"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:131
+#: ../panels/network/panel-common.c:127
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:135
+#: ../panels/network/panel-common.c:131
 msgid "Infrastructure"
 msgstr "Infrastructure"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205
+#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201
 msgid "Status unknown"
 msgstr "Status unknown"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:155
+#: ../panels/network/panel-common.c:151
 msgid "Unmanaged"
 msgstr "Unmanaged"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:159
+#: ../panels/network/panel-common.c:155
 msgid "Unavailable"
 msgstr "Unavailable"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211
+#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207
 msgid "Connecting"
 msgstr "Connecting"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215
+#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211
 msgid "Authentication required"
 msgstr "Authentication required"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219
+#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215
 msgid "Connected"
 msgstr "Connected"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:181
+#: ../panels/network/panel-common.c:177
 msgid "Disconnecting"
 msgstr "Disconnecting"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223
+#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219
 msgid "Connection failed"
 msgstr "Connection failed"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231
+#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227
 msgid "Status unknown (missing)"
 msgstr "Status unknown (missing)"
 
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:227
+#: ../panels/network/panel-common.c:223
 msgid "Not connected"
 msgstr "Not connected"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:252
+#: ../panels/network/panel-common.c:248
 msgid "Configuration failed"
 msgstr "Configuration failed"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:256
+#: ../panels/network/panel-common.c:252
 msgid "IP configuration failed"
 msgstr "IP configuration failed"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:260
+#: ../panels/network/panel-common.c:256
 msgid "IP configuration expired"
 msgstr "IP configuration expired"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:264
+#: ../panels/network/panel-common.c:260
 msgid "Secrets were required, but not provided"
 msgstr "Secrets were required, but not provided"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:268
+#: ../panels/network/panel-common.c:264
 msgid "802.1x supplicant disconnected"
 msgstr "802.1x supplicant disconnected"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:272
+#: ../panels/network/panel-common.c:268
 msgid "802.1x supplicant configuration failed"
 msgstr "802.1x supplicant configuration failed"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:276
+#: ../panels/network/panel-common.c:272
 msgid "802.1x supplicant failed"
 msgstr "802.1x supplicant failed"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:280
+#: ../panels/network/panel-common.c:276
 msgid "802.1x supplicant took too long to authenticate"
 msgstr "802.1x supplicant took too long to authenticate"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:284
+#: ../panels/network/panel-common.c:280
 msgid "PPP service failed to start"
 msgstr "PPP service failed to start"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:288
+#: ../panels/network/panel-common.c:284
 msgid "PPP service disconnected"
 msgstr "PPP service disconnected"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:292
+#: ../panels/network/panel-common.c:288
 msgid "PPP failed"
 msgstr "PPP failed"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:296
+#: ../panels/network/panel-common.c:292
 msgid "DHCP client failed to start"
 msgstr "DHCP client failed to start"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:300
+#: ../panels/network/panel-common.c:296
 msgid "DHCP client error"
 msgstr "DHCP client error"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:304
+#: ../panels/network/panel-common.c:300
 msgid "DHCP client failed"
 msgstr "DHCP client failed"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:308
+#: ../panels/network/panel-common.c:304
 msgid "Shared connection service failed to start"
 msgstr "Shared connection service failed to start"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:312
+#: ../panels/network/panel-common.c:308
 msgid "Shared connection service failed"
 msgstr "Shared connection service failed"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:316
+#: ../panels/network/panel-common.c:312
 msgid "AutoIP service failed to start"
 msgstr "AutoIP service failed to start"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:320
+#: ../panels/network/panel-common.c:316
 msgid "AutoIP service error"
 msgstr "AutoIP service error"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:324
+#: ../panels/network/panel-common.c:320
 msgid "AutoIP service failed"
 msgstr "AutoIP service failed"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:328
+#: ../panels/network/panel-common.c:324
 msgid "Line busy"
 msgstr "Line busy"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:332
+#: ../panels/network/panel-common.c:328
 msgid "No dial tone"
 msgstr "No dial tone"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:336
+#: ../panels/network/panel-common.c:332
 msgid "No carrier could be established"
 msgstr "No carrier could be established"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:340
+#: ../panels/network/panel-common.c:336
 msgid "Dialing request timed out"
 msgstr "Dialing request timed out"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:344
+#: ../panels/network/panel-common.c:340
 msgid "Dialing attempt failed"
 msgstr "Dialing attempt failed"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:348
+#: ../panels/network/panel-common.c:344
 msgid "Modem initialization failed"
 msgstr "Modem initialisation failed"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:352
+#: ../panels/network/panel-common.c:348
 msgid "Failed to select the specified APN"
 msgstr "Failed to select the specified APN"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:356
+#: ../panels/network/panel-common.c:352
 msgid "Not searching for networks"
 msgstr "Not searching for networks"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:360
+#: ../panels/network/panel-common.c:356
 msgid "Network registration denied"
 msgstr "Network registration denied"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:364
+#: ../panels/network/panel-common.c:360
 msgid "Network registration timed out"
 msgstr "Network registration timed out"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:368
+#: ../panels/network/panel-common.c:364
 msgid "Failed to register with the requested network"
 msgstr "Failed to register with the requested network"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:372
+#: ../panels/network/panel-common.c:368
 msgid "PIN check failed"
 msgstr "PIN check failed"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:376
+#: ../panels/network/panel-common.c:372
 msgid "Firmware for the device may be missing"
 msgstr "Firmware for the device may be missing"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:380
+#: ../panels/network/panel-common.c:376
 msgid "Connection disappeared"
 msgstr "Connection disappeared"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:384
+#: ../panels/network/panel-common.c:380
 msgid "Existing connection was assumed"
 msgstr "Existing connection was assumed"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:388
+#: ../panels/network/panel-common.c:384
 msgid "Modem not found"
 msgstr "Modem not found"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:392
+#: ../panels/network/panel-common.c:388
 msgid "Bluetooth connection failed"
 msgstr "Bluetooth connection failed"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:396
+#: ../panels/network/panel-common.c:392
 msgid "SIM Card not inserted"
 msgstr "SIM Card not inserted"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:400
+#: ../panels/network/panel-common.c:396
 msgid "SIM Pin required"
 msgstr "SIM Pin required"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:404
+#: ../panels/network/panel-common.c:400
 msgid "SIM Puk required"
 msgstr "SIM Puk required"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:408
+#: ../panels/network/panel-common.c:404
 msgid "SIM wrong"
 msgstr "SIM wrong"
 
 #. TRANSLATORS: device status reason
-#: ../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:416
+#: ../panels/network/panel-common.c:408
 msgid "Connection dependency failed"
 msgstr "Connection dependency failed"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:440
+#: ../panels/network/panel-common.c:433
 msgid "Firmware missing"
 msgstr "Firmware missing"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447
+#: ../panels/network/panel-common.c:437
 msgid "Cable unplugged"
 msgstr "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:69
+msgid "undefined error in 802.1x security (wpa-eap)"
+msgstr "undefined error in 802.1x security (wpa-eap)"
 
-#: ../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:245
+#| msgid "No input source selected"
+msgid "no file selected"
+msgstr "no file selected"
 
-#: ../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:276
+msgid "unspecified error validating eap-method file"
+msgstr "unspecified error validating eap-method file"
 
-#: ../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:480
+#| msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 
-#: ../panels/network/wireless-security/eap-method.c:648
+#: ../panels/network/wireless-security/eap-method.c:483
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "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
+#: ../panels/network/wireless-security/eap-method-fast.c:72
+msgid "missing EAP-FAST PAC file"
+msgstr "missing EAP-FAST PAC file"
+
+#: ../panels/network/wireless-security/eap-method-fast.c:268
+#: ../panels/network/wireless-security/eap-method-peap.c:302
+#: ../panels/network/wireless-security/eap-method-ttls.c:333
 msgid "GTC"
 msgstr "GTC"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:277
-#: ../panels/network/wireless-security/eap-method-peap.c:246
-#: ../panels/network/wireless-security/eap-method-ttls.c:263
+#: ../panels/network/wireless-security/eap-method-fast.c:283
+#: ../panels/network/wireless-security/eap-method-peap.c:272
+#: ../panels/network/wireless-security/eap-method-ttls.c:288
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:399
-msgid "Choose a PAC file..."
-msgstr "Choose a PAC file…"
-
 #: ../panels/network/wireless-security/eap-method-fast.c:406
+#| msgid "Choose a PAC file..."
+msgid "Choose a PAC file"
+msgstr "Choose a PAC file"
+
+#: ../panels/network/wireless-security/eap-method-fast.c:413
 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-fast.ui.h:1
 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1
 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1
 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1
@@ -3416,43 +3324,77 @@ msgstr "PAC pro_visioning"
 msgid " "
 msgstr " "
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
 msgid "Anonymous"
 msgstr "Anonymous"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
 msgid "Authenticated"
 msgstr "Authenticated"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:8
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
 msgid "Both"
 msgstr "Both"
 
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
+msgid "PAC _file"
+msgstr "PAC _file"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5
+msgid "_Inner authentication"
+msgstr "_Inner authentication"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:8
+#| msgid "PAC pro_visioning"
+msgid "Allow automatic PAC pro_visioning"
+msgstr "Allow automatic PAC pro_visioning"
+
+#: ../panels/network/wireless-security/eap-method-leap.c:65
+msgid "missing EAP-LEAP username"
+msgstr "missing EAP-LEAP username"
+
+#: ../panels/network/wireless-security/eap-method-leap.c:74
+msgid "missing EAP-LEAP password"
+msgstr "missing EAP-LEAP password"
+
 #: ../panels/network/wireless-security/eap-method-leap.ui.h:1
 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1
 #: ../panels/network/wireless-security/ws-leap.ui.h:1
-#: ../panels/user-accounts/data/account-dialog.ui.h:3
+#: ../panels/user-accounts/data/account-dialog.ui.h:4
 msgid "_Username"
 msgstr "_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/eap-method-simple.ui.h:3
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:7
 #: ../panels/network/wireless-security/ws-leap.ui.h:3
 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3
 msgid "Sho_w password"
 msgstr "Sho_w password"
 
-#: ../panels/network/wireless-security/eap-method-peap.c:263
-#: ../panels/network/wireless-security/wireless-security.c:385
+#: ../panels/network/wireless-security/eap-method-peap.c:63
+#, c-format
+msgid "invalid EAP-PEAP CA certificate: %s"
+msgstr "invalid EAP-PEAP CA certificate: %s"
+
+#: ../panels/network/wireless-security/eap-method-peap.c:68
+msgid "invalid EAP-PEAP CA certificate: no certificate specified"
+msgstr "invalid EAP-PEAP CA certificate: no certificate specified"
+
+#: ../panels/network/wireless-security/eap-method-peap.c:287
+#: ../panels/network/wireless-security/eap-method-ttls.c:318
+#: ../panels/network/wireless-security/wireless-security.c:439
 msgid "MD5"
 msgstr "MD5"
 
-#: ../panels/network/wireless-security/eap-method-peap.c:350
-#: ../panels/network/wireless-security/eap-method-tls.c: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.c:381
+#: ../panels/network/wireless-security/eap-method-tls.c:501
+#: ../panels/network/wireless-security/eap-method-ttls.c:412
+#| msgid "Choose a Certificate Authority certificate..."
+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"
@@ -3468,19 +3410,58 @@ msgstr "Version 1"
 msgid "C_A certificate"
 msgstr "C_A certificate"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:7
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:4
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
+#| msgid "Authentication required"
+msgid "No CA certificate is _required"
+msgstr "No CA certificate is _required"
+
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:9
 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-simple.c:74
+msgid "missing EAP username"
+msgstr "missing EAP username"
+
+#: ../panels/network/wireless-security/eap-method-simple.c:87
+#| msgid "Wrong password"
+msgid "missing EAP password"
+msgstr "missing EAP password"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:68
+msgid "missing EAP-TLS identity"
+msgstr "missing EAP-TLS identity"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:77
+#, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "invalid EAP-TLS CA certificate: %s"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr "invalid EAP-TLS CA certificate: no certificate specified"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:95
+msgid "invalid EAP-TLS password: missing"
+msgstr "invalid EAP-TLS password: missing"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:109
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr "invalid EAP-TLS private-key: %s"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:119
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr "invalid EAP-TLS user-certificate: %s"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:260
+#: ../panels/network/wireless-security/eap-method-tls.c:316
 msgid "Unencrypted private keys are insecure"
 msgstr "Unencrypted private keys are insecure"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:263
+#: ../panels/network/wireless-security/eap-method-tls.c:319
 msgid ""
 "The selected private key does not appear to be protected by a password.  "
 "This could allow your security credentials to be compromised.  Please select "
@@ -3494,13 +3475,15 @@ msgstr ""
 "\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:495
+#| msgid "Choose your personal certificate..."
+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.c:507
+#| msgid "Choose your private key..."
+msgid "Choose your private key"
+msgstr "Choose your private key"
 
 #: ../panels/network/wireless-security/eap-method-tls.ui.h:1
 msgid "I_dentity"
@@ -3510,43 +3493,56 @@ msgstr "I_dentity"
 msgid "_User certificate"
 msgstr "_User certificate"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:4
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:5
 msgid "Private _key"
 msgstr "Private _key"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:5
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:6
 msgid "_Private key password"
 msgstr "_Private key password"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:230
+#: ../panels/network/wireless-security/eap-method-ttls.c:63
+#, c-format
+msgid "invalid EAP-TTLS CA certificate: %s"
+msgstr "invalid EAP-TTLS CA certificate: %s"
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:68
+msgid "invalid EAP-TTLS CA certificate: no certificate specified"
+msgstr "invalid EAP-TTLS CA certificate: no certificate specified"
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:247
+#: ../panels/network/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:280
+#: ../panels/network/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "Don’t _warn me again"
+#: ../panels/network/wireless-security/wireless-security.c:87
+msgid "Unknown error validating 802.1x security"
+msgstr "Unknown error validating 802.1x security"
 
-#: ../panels/network/wireless-security/wireless-security.c:397
+#: ../panels/network/wireless-security/wireless-security.c:451
 msgid "TLS"
 msgstr "TLS"
 
-#: ../panels/network/wireless-security/wireless-security.c:421
+#: ../panels/network/wireless-security/wireless-security.c:475
+msgid "PWD"
+msgstr "PWD"
+
+#: ../panels/network/wireless-security/wireless-security.c:486
 msgid "FAST"
 msgstr "FAST"
 
-#: ../panels/network/wireless-security/wireless-security.c:432
+#: ../panels/network/wireless-security/wireless-security.c:497
 msgid "Tunneled TLS"
 msgstr "Tunnelled TLS"
 
-#: ../panels/network/wireless-security/wireless-security.c:443
+#: ../panels/network/wireless-security/wireless-security.c:508
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
@@ -3556,6 +3552,48 @@ msgstr "Protected EAP (PEAP)"
 msgid "Au_thentication"
 msgstr "Au_thentication"
 
+#: ../panels/network/wireless-security/ws-leap.c:63
+msgid "missing leap-username"
+msgstr "missing leap-username"
+
+#: ../panels/network/wireless-security/ws-leap.c:74
+#| msgid "Wrong password"
+msgid "missing leap-password"
+msgstr "missing leap-password"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:107
+msgid "missing wep-key"
+msgstr "missing wep-key"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:116
+#, c-format
+msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
+msgstr "invalid wep-key: key with a length of %zu must contain only hex-digits"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:124
+#, c-format
+msgid ""
+"invalid wep-key: key with a length of %zu must contain only ascii characters"
+msgstr ""
+"invalid wep-key: key with a length of %zu must contain only ascii characters"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:130
+#, c-format
+msgid ""
+"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
+"(ascii) or 10/26 (hex)"
+msgstr ""
+"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
+"(ascii) or 10/26 (hex)"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:137
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr "invalid wep-key: passphrase must be non-empty"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:139
+msgid "invalid wep-key: passphrase must be shorter than 64 characters"
+msgstr "invalid wep-key: passphrase must be shorter than 64 characters"
+
 #: ../panels/network/wireless-security/ws-wep-key.ui.h:1
 msgid "1 (Default)"
 msgstr "1 (Default)"
@@ -3592,155 +3630,191 @@ msgstr "Sho_w key"
 msgid "WEP inde_x"
 msgstr "WEP inde_x"
 
+#: ../panels/network/wireless-security/ws-wpa-psk.c:70
+#, c-format
+msgid ""
+"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
+"digits"
+msgstr ""
+"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
+"digits"
+
+#: ../panels/network/wireless-security/ws-wpa-psk.c:79
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+
 #: ../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"
+#: ../panels/notifications/cc-notifications-panel.c:257
+#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973
+#: ../panels/privacy/cc-privacy-panel.c:174
+#: ../panels/privacy/cc-privacy-panel.c:241
+#: ../panels/universal-access/cc-ua-panel.c:269
+#: ../panels/universal-access/cc-ua-panel.c:590
+#: ../panels/universal-access/cc-ua-panel.c:603
+#: ../panels/universal-access/cc-ua-panel.c:615
+#: ../panels/universal-access/cc-ua-panel.c:786
+msgid "On"
+msgstr "On"
 
-#. TRANSLATORS: this is the setting to configure sounds associated with notifications
-#: ../panels/notifications/cc-edit-dialog.c:41
+#. This is the per application switch for message tray usage.
+#: ../panels/notifications/edit-dialog.ui.h:2
+#| msgctxt "notifications"
+#| msgid "Notifications"
 msgctxt "notifications"
-msgid "Sound Alerts"
-msgstr "Sound Alerts"
+msgid "_Notifications"
+msgstr "_Notifications"
 
-#: ../panels/notifications/cc-edit-dialog.c:42
+#. This is the setting to configure sounds associated with notifications.
+#: ../panels/notifications/edit-dialog.ui.h:4
+#| msgctxt "notifications"
+#| msgid "Sound Alerts"
 msgctxt "notifications"
-msgid "Show Popup Banners"
-msgstr "Show Popup Banners"
+msgid "Sound _Alerts"
+msgstr "Sound _Alerts"
 
-#. TRANSLATORS: banners here refers to message tray notifications in the middle of the screen
-#: ../panels/notifications/cc-edit-dialog.c:44
+#: ../panels/notifications/edit-dialog.ui.h:5
+#| msgctxt "notifications"
+#| msgid "Notifications"
 msgctxt "notifications"
-msgid "Show Details in Banners"
-msgstr "Show Details in Banners"
+msgid "Notification _Banners"
+msgstr "Notification _Banners"
 
-#: ../panels/notifications/cc-edit-dialog.c:45
+#. Banners here refers to message tray notifications in the middle of the screen.
+#: ../panels/notifications/edit-dialog.ui.h:7
+#| msgctxt "notifications"
+#| msgid "Show Details in Banners"
 msgctxt "notifications"
-msgid "View in Lock Screen"
-msgstr "View in Lock Screen"
+msgid "Show Message _Content in Banners"
+msgstr "Show Message _Content in Banners"
 
-#: ../panels/notifications/cc-edit-dialog.c:46
+#: ../panels/notifications/edit-dialog.ui.h:8
+#| msgctxt "notifications"
+#| msgid "Notifications"
 msgctxt "notifications"
-msgid "Show Details in Lock Screen"
-msgstr "Show Details in Lock Screen"
-
-#: ../panels/notifications/cc-notifications-panel.c:205
-#: ../panels/power/cc-power-panel.c:1751 ../panels/power/cc-power-panel.c:1758
-#: ../panels/privacy/cc-privacy-panel.c:77
-#: ../panels/privacy/cc-privacy-panel.c:117
-#: ../panels/universal-access/cc-ua-panel.c:253
-#: ../panels/universal-access/cc-ua-panel.c:573
-#: ../panels/universal-access/cc-ua-panel.c:699
-msgid "On"
-msgstr "On"
+msgid "_Lock Screen Notifications"
+msgstr "_Lock Screen Notifications"
 
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1
-msgid "Notifications"
-msgstr "Notifications"
+#: ../panels/notifications/edit-dialog.ui.h:9
+#| msgctxt "notifications"
+#| msgid "Show Details in Lock Screen"
+msgctxt "notifications"
+msgid "Show Message C_ontent on Lock Screen"
+msgstr "Show Message C_ontent on Lock Screen"
 
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2
+#| msgid "Notifications"
+msgid "No­ti­fi­ca­tions"
+msgstr "No­ti­fi­ca­tions"
+
+#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3
 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
+#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5
 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"
+#| msgid "Notifications"
+msgid "Notification _Banners"
+msgstr "Notification _Banners"
 
 #: ../panels/notifications/notifications.ui.h:2
-msgid "Show in Lock Screen"
-msgstr "Show in Lock Screen"
+#| msgid "Notifications"
+msgid "_Lock Screen Notifications"
+msgstr "_Lock Screen Notifications"
+
+#. List of applications.
+#: ../panels/notifications/notifications.ui.h:4
+#: ../panels/privacy/privacy.ui.h:45 ../panels/sound/gvc-mixer-dialog.c:1781
+msgid "Applications"
+msgstr "Applications"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:200
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170
 msgctxt "Online Account"
 msgid "Other"
 msgstr "Other"
 
 #. translators: This is the title of the "Add Account" dialog.
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:318
+#: ../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-add-account-dialog.c:357
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328
 msgid "Mail"
 msgstr "Mail"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:363
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334
+#| msgid "_Calendar"
+msgid "Calendar"
+msgstr "Calendar"
+
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340
 msgid "Contacts"
 msgstr "Contacts"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:369
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346
 msgid "Chat"
 msgstr "Chat"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:375
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352
 msgid "Resources"
 msgstr "Resources"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:425
-msgid "Error logging into the account"
-msgstr "Error logging into the account"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:495
-msgid "Credentials have expired."
-msgstr "Credentials have expired."
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:499
-msgid "Sign in to enable this account."
-msgstr "Sign in to enable this account."
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:504
-msgid "_Sign In"
-msgstr "_Sign In"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:745
+#: ../panels/online-accounts/cc-online-accounts-panel.c:640
 msgid "Error creating account"
 msgstr "Error creating account"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:805
+#: ../panels/online-accounts/cc-online-accounts-panel.c:700
 msgid "Error removing account"
 msgstr "Error removing account"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:841
+#: ../panels/online-accounts/cc-online-accounts-panel.c:736
 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:843
+#: ../panels/online-accounts/cc-online-accounts-panel.c:738
 msgid "This will not remove the account on the server."
 msgstr "This will not remove the account on the server."
 
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1
-msgid "Online Accounts"
-msgstr "Online Accounts"
+#: ../panels/online-accounts/cc-online-accounts-panel.c:739
+msgid "_Remove"
+msgstr "_Remove"
 
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2
+#| msgid "Online Accounts"
+msgid "On­line Accounts"
+msgstr "On­line Accounts"
+
+#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3
 msgid "Connect to your online accounts and decide what to use them for"
 msgstr "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
+#. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application)
+#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5
+#| msgid ""
+#| "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;"
+#| "ownCloud;Kerberos;IMAP;SMTP;"
 msgid ""
 "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
-"Kerberos;IMAP;SMTP;"
+"Kerberos;IMAP;SMTP;Pocket;ReadItLater;"
 msgstr ""
 "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
-"Kerberos;IMAP;SMTP;"
+"Kerberos;IMAP;SMTP;Pocket;ReadItLater;"
 
 #: ../panels/online-accounts/online-accounts.ui.h:1
 msgid "No online accounts configured"
 msgstr "No online accounts configured"
 
 #: ../panels/online-accounts/online-accounts.ui.h:3
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
 msgid "Remove Account"
 msgstr "Remove Account"
 
@@ -3756,18 +3830,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:188
+#: ../panels/power/cc-power-panel.c:253
 msgid "Unknown time"
 msgstr "Unknown time"
 
-#: ../panels/power/cc-power-panel.c:194
+#: ../panels/power/cc-power-panel.c:259
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i minute"
 msgstr[1] "%i minutes"
 
-#: ../panels/power/cc-power-panel.c:206
+#: ../panels/power/cc-power-panel.c:271
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -3776,326 +3850,337 @@ 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:214
+#: ../panels/power/cc-power-panel.c:279
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: ../panels/power/cc-power-panel.c:215
+#: ../panels/power/cc-power-panel.c:280
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hour"
 msgstr[1] "hours"
 
-#: ../panels/power/cc-power-panel.c:216
+#: ../panels/power/cc-power-panel.c:281
 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:235
+#: ../panels/power/cc-power-panel.c:300
 #, c-format
 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:242
+#: ../panels/power/cc-power-panel.c:307
 #, c-format
 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:247
+#: ../panels/power/cc-power-panel.c:312
 #, c-format
 msgid "%s remaining"
 msgstr "%s remaining"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:252 ../panels/power/cc-power-panel.c:280
+#: ../panels/power/cc-power-panel.c:317 ../panels/power/cc-power-panel.c:345
 msgid "Fully charged"
 msgstr "Fully charged"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:256 ../panels/power/cc-power-panel.c:284
+#: ../panels/power/cc-power-panel.c:321 ../panels/power/cc-power-panel.c:349
 msgid "Empty"
 msgstr "Empty"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:271
+#: ../panels/power/cc-power-panel.c:336
 msgid "Charging"
 msgstr "Charging"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:276
+#: ../panels/power/cc-power-panel.c:341
 msgid "Discharging"
 msgstr "Discharging"
 
-#: ../panels/power/cc-power-panel.c:328
-#, c-format
-msgid "Estimated battery capacity: %s"
-msgstr "Estimated battery capacity: %s"
-
-#: ../panels/power/cc-power-panel.c:411
+#: ../panels/power/cc-power-panel.c:464
 msgctxt "Battery name"
 msgid "Main"
 msgstr "Main"
 
-#: ../panels/power/cc-power-panel.c:413
+#: ../panels/power/cc-power-panel.c:466
 msgctxt "Battery name"
 msgid "Extra"
 msgstr "Extra"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:504
+#: ../panels/power/cc-power-panel.c:537
 msgid "Wireless mouse"
 msgstr "Wireless mouse"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:508
+#: ../panels/power/cc-power-panel.c:540
 msgid "Wireless keyboard"
 msgstr "Wireless keyboard"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:512
+#: ../panels/power/cc-power-panel.c:543
 msgid "Uninterruptible power supply"
 msgstr "Uninterruptible power supply"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:517
+#: ../panels/power/cc-power-panel.c:546
 msgid "Personal digital assistant"
 msgstr "Personal digital assistant"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:521
+#: ../panels/power/cc-power-panel.c:549
 msgid "Cellphone"
 msgstr "Mobile phone"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:525
+#: ../panels/power/cc-power-panel.c:552
 msgid "Media player"
 msgstr "Media player"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:529
+#: ../panels/power/cc-power-panel.c:555
 msgid "Tablet"
 msgstr "Tablet"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:533
+#: ../panels/power/cc-power-panel.c:558
 msgid "Computer"
 msgstr "Computer"
 
 #. TRANSLATORS: secondary battery, misc
-#: ../panels/power/cc-power-panel.c:537 ../panels/power/cc-power-panel.c:747
-#: ../panels/power/cc-power-panel.c:2082
+#: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801
+#: ../panels/power/cc-power-panel.c:2358
 msgid "Battery"
 msgstr "Battery"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:546
+#: ../panels/power/cc-power-panel.c:615
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "Charging"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:553
+#: ../panels/power/cc-power-panel.c:622
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "Caution"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:558
+#: ../panels/power/cc-power-panel.c:627
 msgctxt "Battery power"
 msgid "Low"
 msgstr "Low"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:563
+#: ../panels/power/cc-power-panel.c:632
 msgctxt "Battery power"
 msgid "Good"
 msgstr "Good"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:568
+#: ../panels/power/cc-power-panel.c:637
 msgctxt "Battery power"
 msgid "Fully charged"
 msgstr "Fully charged"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:572
+#: ../panels/power/cc-power-panel.c:641
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "Empty"
 
-#: ../panels/power/cc-power-panel.c:745
+#: ../panels/power/cc-power-panel.c:799
 msgid "Batteries"
 msgstr "Batteries"
 
-#: ../panels/power/cc-power-panel.c:1151
+#: ../panels/power/cc-power-panel.c:1227
 msgid "When _idle"
 msgstr "When _idle"
 
-#: ../panels/power/cc-power-panel.c:1520
+#: ../panels/power/cc-power-panel.c:1680
 msgid "Power Saving"
 msgstr "Power Saving"
 
-#: ../panels/power/cc-power-panel.c:1548
+#: ../panels/power/cc-power-panel.c:1715
 msgid "_Screen brightness"
 msgstr "_Screen brightness"
 
-#: ../panels/power/cc-power-panel.c:1554
+#: ../panels/power/cc-power-panel.c:1734
+#| msgid "Automatic Routes"
+msgid "Automatic brightness"
+msgstr "Automatic brightness"
+
+#: ../panels/power/cc-power-panel.c:1754
 msgid "_Keyboard brightness"
 msgstr "_Keyboard brightness"
 
-#: ../panels/power/cc-power-panel.c:1564
+#: ../panels/power/cc-power-panel.c:1764
 msgid "_Dim screen when inactive"
 msgstr "_Dim screen when inactive"
 
-#: ../panels/power/cc-power-panel.c:1589
+#: ../panels/power/cc-power-panel.c:1789
 msgid "_Blank screen"
 msgstr "_Blank screen"
 
-#: ../panels/power/cc-power-panel.c:1626
+#: ../panels/power/cc-power-panel.c:1826
 msgid "_Wi-Fi"
 msgstr "_Wi-Fi"
 
-#: ../panels/power/cc-power-panel.c:1631
-msgid "Turns off wireless devices"
-msgstr "Turns off wireless devices"
+#: ../panels/power/cc-power-panel.c:1831
+msgid "Turn off Wi-Fi to save power."
+msgstr "Turn off Wi-Fi to save power."
 
-#: ../panels/power/cc-power-panel.c:1656
+#: ../panels/power/cc-power-panel.c:1856
 msgid "_Mobile broadband"
 msgstr "_Mobile broadband"
 
-#: ../panels/power/cc-power-panel.c:1661
-msgid "Turns off mobile broadband (3G, 4G, WiMax, etc.) devices"
-msgstr "Turns off mobile broadband (3G, 4G, WiMax, etc.) devices"
+#: ../panels/power/cc-power-panel.c:1861
+#| msgid "Turns off mobile broadband (3G, 4G, WiMax, etc.) devices"
+msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power."
+msgstr "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power."
 
-#: ../panels/power/cc-power-panel.c:1696
+#: ../panels/power/cc-power-panel.c:1906
 msgid "_Bluetooth"
 msgstr "_Bluetooth"
 
-#: ../panels/power/cc-power-panel.c:1747
+#: ../panels/power/cc-power-panel.c:1962
 msgid "When on battery power"
 msgstr "When on battery power"
 
-#: ../panels/power/cc-power-panel.c:1749
+#: ../panels/power/cc-power-panel.c:1964
 msgid "When plugged in"
 msgstr "When plugged in"
 
-#: ../panels/power/cc-power-panel.c:1878
-msgid "Suspend & Power Off"
-msgstr "Suspend & Power Off"
+#: ../panels/power/cc-power-panel.c:2059
+msgid "Suspend"
+msgstr "Suspend"
+
+#: ../panels/power/cc-power-panel.c:2060
+msgid "Hibernate"
+msgstr "Hibernate"
+
+#: ../panels/power/cc-power-panel.c:2061
+#| msgid "Do nothing"
+msgid "Nothing"
+msgstr "Nothing"
+
+#. Frame header
+#: ../panels/power/cc-power-panel.c:2175
+#| msgid "Suspend & Power Off"
+msgid "Suspend & Power Button"
+msgstr "Suspend & Power Button"
 
-#: ../panels/power/cc-power-panel.c:1911
+#: ../panels/power/cc-power-panel.c:2218
 msgid "_Automatic suspend"
 msgstr "_Automatic suspend"
 
-#: ../panels/power/cc-power-panel.c:1935
-msgid "When battery power is _critical"
-msgstr "When battery power is _critical"
+#: ../panels/power/cc-power-panel.c:2219
+#| msgid "_Automatic suspend"
+msgid "Automatic suspend"
+msgstr "Automatic suspend"
 
-#: ../panels/power/cc-power-panel.c:1992
-msgid "Power Off"
-msgstr "Power Off"
+#: ../panels/power/cc-power-panel.c:2286
+#| msgid "When the power button is pressed:"
+msgid "_When the Power Button is pressed"
+msgstr "_When the Power Button is pressed"
 
-#: ../panels/power/cc-power-panel.c:2134
+#: ../panels/power/cc-power-panel.c:2412 ../shell/alt/cc-window.c:270
 msgid "Devices"
 msgstr "Devices"
 
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:1
-msgid "Power"
-msgstr "Power"
-
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:2
+msgid "Po­wer"
+msgstr "Po­wer"
+
+#: ../panels/power/gnome-power-panel.desktop.in.in.h:3
 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
+#: ../panels/power/gnome-power-panel.desktop.in.in.h:5
 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"
-msgstr "Hibernate"
-
-#: ../panels/power/power.ui.h:2
-msgid "Power off"
-msgstr "Power off"
-
-#: ../panels/power/power.ui.h:5
+#: ../panels/power/power.ui.h:3
 msgid "45 minutes"
 msgstr "45 minutes"
 
-#: ../panels/power/power.ui.h:6 ../panels/privacy/privacy.ui.h:8
+#: ../panels/power/power.ui.h:4 ../panels/privacy/privacy.ui.h:8
 msgid "1 hour"
 msgstr "1 hour"
 
-#: ../panels/power/power.ui.h:7
+#: ../panels/power/power.ui.h:5
 msgid "80 minutes"
 msgstr "80 minutes"
 
-#: ../panels/power/power.ui.h:8
+#: ../panels/power/power.ui.h:6
 msgid "90 minutes"
 msgstr "90 minutes"
 
-#: ../panels/power/power.ui.h:9
+#: ../panels/power/power.ui.h:7
 msgid "100 minutes"
 msgstr "100 minutes"
 
-#: ../panels/power/power.ui.h:10
+#: ../panels/power/power.ui.h:8
 msgid "2 hours"
 msgstr "2 hours"
 
-#: ../panels/power/power.ui.h:11 ../panels/privacy/privacy.ui.h:3
+#: ../panels/power/power.ui.h:9 ../panels/privacy/privacy.ui.h:3
 msgid "1 minute"
 msgstr "1 minute"
 
-#: ../panels/power/power.ui.h:12 ../panels/privacy/privacy.ui.h:4
+#: ../panels/power/power.ui.h:10 ../panels/privacy/privacy.ui.h:4
 msgid "2 minutes"
 msgstr "2 minutes"
 
-#: ../panels/power/power.ui.h:13 ../panels/privacy/privacy.ui.h:5
+#: ../panels/power/power.ui.h:11 ../panels/privacy/privacy.ui.h:5
 msgid "3 minutes"
 msgstr "3 minutes"
 
-#: ../panels/power/power.ui.h:14
+#: ../panels/power/power.ui.h:12
 msgid "4 minutes"
 msgstr "4 minutes"
 
-#: ../panels/power/power.ui.h:15 ../panels/privacy/privacy.ui.h:6
+#: ../panels/power/power.ui.h:13 ../panels/privacy/privacy.ui.h:6
 msgid "5 minutes"
 msgstr "5 minutes"
 
-#: ../panels/power/power.ui.h:16
+#: ../panels/power/power.ui.h:14
 msgid "8 minutes"
 msgstr "8 minutes"
 
-#: ../panels/power/power.ui.h:17
+#: ../panels/power/power.ui.h:15
 msgid "10 minutes"
 msgstr "10 minutes"
 
-#: ../panels/power/power.ui.h:18
+#: ../panels/power/power.ui.h:16
 msgid "12 minutes"
 msgstr "12 minutes"
 
-#: ../panels/power/power.ui.h:20
+#: ../panels/power/power.ui.h:18
 msgid "Automatic Suspend"
 msgstr "Automatic Suspend"
 
-#: ../panels/power/power.ui.h:22
+#: ../panels/power/power.ui.h:19
 msgid "_Plugged In"
 msgstr "_Plugged In"
 
-#: ../panels/power/power.ui.h:23
+#: ../panels/power/power.ui.h:20
 msgid "On _Battery Power"
 msgstr "On _Battery Power"
 
-#: ../panels/power/power.ui.h:24
+#: ../panels/power/power.ui.h:21 ../panels/universal-access/uap.ui.h:33
 msgid "Delay"
 msgstr "Delay"
 
@@ -4103,154 +4188,143 @@ msgstr "Delay"
 msgid "Authenticate"
 msgstr "Authenticate"
 
-#: ../panels/printers/authentication-dialog.ui.h:5
-#: ../panels/sharing/sharing.ui.h:23
-#: ../panels/user-accounts/data/account-dialog.ui.h:6
-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:591
+#: ../panels/printers/cc-printers-panel.c:683
 msgid "Low on toner"
 msgstr "Low on toner"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:593
+#: ../panels/printers/cc-printers-panel.c:685
 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:596
+#: ../panels/printers/cc-printers-panel.c:688
 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:599
+#: ../panels/printers/cc-printers-panel.c:691
 msgid "Out of developer"
 msgstr "Out of developer"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:601
+#: ../panels/printers/cc-printers-panel.c:693
 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:603
+#: ../panels/printers/cc-printers-panel.c:695
 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:605
+#: ../panels/printers/cc-printers-panel.c:697
 msgid "Open cover"
 msgstr "Open cover"
 
 #. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:607
+#: ../panels/printers/cc-printers-panel.c:699
 msgid "Open door"
 msgstr "Open door"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:609
+#: ../panels/printers/cc-printers-panel.c:701
 msgid "Low on paper"
 msgstr "Low on paper"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:611
+#: ../panels/printers/cc-printers-panel.c:703
 msgid "Out of paper"
 msgstr "Out of paper"
 
 #. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:613
+#: ../panels/printers/cc-printers-panel.c:705
 msgctxt "printer state"
 msgid "Offline"
 msgstr "Offline"
 
 #. 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
+#: ../panels/printers/cc-printers-panel.c:707
+#: ../panels/printers/cc-printers-panel.c:897
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "Stopped"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:617
+#: ../panels/printers/cc-printers-panel.c:709
 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:619
+#: ../panels/printers/cc-printers-panel.c:711
 msgid "Waste receptacle full"
 msgstr "Waste receptacle full"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:621
+#: ../panels/printers/cc-printers-panel.c:713
 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:623
+#: ../panels/printers/cc-printers-panel.c:715
 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:733
+#: ../panels/printers/cc-printers-panel.c:824
 msgctxt "printer state"
 msgid "Configuring"
 msgstr "Configuring"
 
 #. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/cc-printers-panel.c:792
+#: ../panels/printers/cc-printers-panel.c:883
 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
+#: ../panels/printers/cc-printers-panel.c:888
 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:802
+#: ../panels/printers/cc-printers-panel.c:893
 msgctxt "printer state"
 msgid "Processing"
 msgstr "Processing"
 
 #. Translators: Toner supply
-#: ../panels/printers/cc-printers-panel.c:923
+#: ../panels/printers/cc-printers-panel.c:1013
 msgid "Toner Level"
 msgstr "Toner Level"
 
 #. Translators: Ink supply
-#: ../panels/printers/cc-printers-panel.c:926
+#: ../panels/printers/cc-printers-panel.c:1016
 msgid "Ink Level"
 msgstr "Ink Level"
 
 #. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/cc-printers-panel.c:929
+#: ../panels/printers/cc-printers-panel.c:1019
 msgid "Supply Level"
 msgstr "Supply Level"
 
 #. Translators: Printer's state (printer is being installed right now)
-#: ../panels/printers/cc-printers-panel.c:947
+#: ../panels/printers/cc-printers-panel.c:1037
 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: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:1432
+#: ../panels/printers/cc-printers-panel.c:1551
 #, c-format
 msgid "%u active"
 msgid_plural "%u active"
@@ -4258,15 +4332,15 @@ msgstr[0] "%u active"
 msgstr[1] "%u active"
 
 #. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:1776
+#: ../panels/printers/cc-printers-panel.c:1892
 msgid "Failed to add new printer."
 msgstr "Failed to add new printer."
 
-#: ../panels/printers/cc-printers-panel.c:1943
+#: ../panels/printers/cc-printers-panel.c:2073
 msgid "Select PPD File"
 msgstr "Select PPD File"
 
-#: ../panels/printers/cc-printers-panel.c:1952
+#: ../panels/printers/cc-printers-panel.c:2082
 msgid ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
@@ -4274,82 +4348,79 @@ msgstr ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
 
-#: ../panels/printers/cc-printers-panel.c:2257
+#: ../panels/printers/cc-printers-panel.c:2389
 msgid "No suitable driver found"
 msgstr "No suitable driver found"
 
-#: ../panels/printers/cc-printers-panel.c:2326
+#: ../panels/printers/cc-printers-panel.c:2460
 msgid "Searching for preferred drivers…"
 msgstr "Searching for preferred drivers…"
 
-#: ../panels/printers/cc-printers-panel.c:2341
+#: ../panels/printers/cc-printers-panel.c:2481
 msgid "Select from database…"
 msgstr "Select from database…"
 
-#: ../panels/printers/cc-printers-panel.c:2350
+#: ../panels/printers/cc-printers-panel.c:2490
 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:2501
-#: ../panels/printers/cc-printers-panel.c:2524
+#: ../panels/printers/cc-printers-panel.c:2637
+#: ../panels/printers/cc-printers-panel.c:2660
 msgid "Test page"
 msgstr "Test page"
 
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:2932
+#: ../panels/printers/cc-printers-panel.c:3115
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "Could not load ui: %s"
 
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1
-msgid "Printers"
-msgstr "Printers"
-
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2
+#| msgid "Printers"
+msgid "Prin­ters"
+msgstr "Prin­ters"
+
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3
 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
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5
 msgid "Printer;Queue;Print;Paper;Ink;Toner;"
 msgstr "Printer;Queue;Print;Paper;Ink;Toner;"
 
-#. Translators: This dialog contains list of active print jobs of the selected printer
+#. Translators: this action removes (purges) all the listed jobs from the list.
 #: ../panels/printers/jobs-dialog.ui.h:2
-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"
+msgid "Clear All"
+msgstr "Clear All"
 
+#. Translators: this label describes the dialog empty state, with no jobs listed.
 #: ../panels/printers/jobs-dialog.ui.h:4
-msgid "Resume Printing"
-msgstr "Resume Printing"
-
-#: ../panels/printers/jobs-dialog.ui.h:5
-msgid "Pause Printing"
-msgstr "Pause Printing"
-
-#: ../panels/printers/jobs-dialog.ui.h:6
-msgid "Cancel Print Job"
-msgstr "Cancel Print Job"
+#| msgid "%s Active Jobs"
+msgid "No Active Printer Jobs"
+msgstr "No Active Printer Jobs"
 
 #: ../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:4
-msgid "Search for network printers or filter result"
-msgstr "Search for network printers or filter result"
+#. Translators: This button opens authentication dialog for selected server.
+#: ../panels/printers/new-printer-dialog.ui.h:5
+#| msgid "Authenticate"
+msgid "A_uthenticate"
+msgstr "A_uthenticate"
+
+#. Translators: No printers were found
+#: ../panels/printers/new-printer-dialog.ui.h:7
+msgid "No printers detected."
+msgstr "No printers detected."
 
 #. Translators: The entered text should contain network address of a printer or a text which will filter 
found devices (their names and locations)
-#: ../panels/printers/new-printer-dialog.ui.h:6
-msgid "Enter address of a printer or a text to filter results"
-msgstr "Enter address of a printer or a text to filter results"
+#: ../panels/printers/new-printer-dialog.ui.h:9
+msgid "Enter a network address or search for a printer"
+msgstr "Enter a network address or search for a printer"
 
 #: ../panels/printers/options-dialog.ui.h:1
 msgid "Loading options…"
@@ -4359,231 +4430,273 @@ msgstr "Loading options…"
 msgid "Select Printer Driver"
 msgstr "Select Printer Driver"
 
+#: ../panels/printers/ppd-selection-dialog.ui.h:3
+#: ../panels/user-accounts/um-photo-dialog.c:96
+msgid "Select"
+msgstr "Select"
+
 #: ../panels/printers/ppd-selection-dialog.ui.h:4
 msgid "Loading drivers database..."
 msgstr "Loading drivers database…"
 
+#. Translators: The found device is a JetDirect printer
+#: ../panels/printers/pp-host.c:526
+#| msgid "Remove Printer"
+msgid "JetDirect Printer"
+msgstr "JetDirect Printer"
+
+#. Translators: The found device is a Line Printer Daemon printer
+#: ../panels/printers/pp-host.c:782
+#| msgid "%s Printer"
+msgid "LPD Printer"
+msgstr "LPD Printer"
+
 #. 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:66
+#: ../panels/printers/pp-ppd-option-widget.c:70
 msgid "One Sided"
 msgstr "One Sided"
 
 #. 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:68
+#: ../panels/printers/pp-ppd-option-widget.c:72
 msgid "Long Edge (Standard)"
 msgstr "Long Edge (Standard)"
 
 #. Translators: this is an option of "Two Sided"
-#: ../panels/printers/pp-ipp-option-widget.c:71
-#: ../panels/printers/pp-ppd-option-widget.c:75
+#: ../panels/printers/pp-ipp-option-widget.c:70
+#: ../panels/printers/pp-ppd-option-widget.c:74
 msgid "Short Edge (Flip)"
 msgstr "Short Edge (Flip)"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:73
+#: ../panels/printers/pp-ipp-option-widget.c:72
 msgid "Portrait"
 msgstr "Portrait"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:75
+#: ../panels/printers/pp-ipp-option-widget.c:74
 msgid "Landscape"
 msgstr "Landscape"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:77
+#: ../panels/printers/pp-ipp-option-widget.c:76
 msgid "Reverse landscape"
 msgstr "Reverse landscape"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:79
+#: ../panels/printers/pp-ipp-option-widget.c:78
 msgid "Reverse portrait"
 msgstr "Reverse portrait"
 
 #. Translators: Job's state (job is waiting to be printed)
-#: ../panels/printers/pp-jobs-dialog.c:143
+#: ../panels/printers/pp-jobs-dialog.c:103
 msgctxt "print job"
 msgid "Pending"
 msgstr "Pending"
 
 #. Translators: Job's state (job is held for printing)
-#: ../panels/printers/pp-jobs-dialog.c:147
+#: ../panels/printers/pp-jobs-dialog.c:107
+#| msgctxt "printer state"
+#| msgid "Paused"
 msgctxt "print job"
-msgid "Held"
-msgstr "Held"
+msgid "Paused"
+msgstr "Paused"
 
 #. Translators: Job's state (job is currently printing)
-#: ../panels/printers/pp-jobs-dialog.c:151
+#: ../panels/printers/pp-jobs-dialog.c:111
 msgctxt "print job"
 msgid "Processing"
 msgstr "Processing"
 
 #. Translators: Job's state (job has been stopped)
-#: ../panels/printers/pp-jobs-dialog.c:155
+#: ../panels/printers/pp-jobs-dialog.c:115
 msgctxt "print job"
 msgid "Stopped"
 msgstr "Stopped"
 
 #. Translators: Job's state (job has been canceled)
-#: ../panels/printers/pp-jobs-dialog.c:159
+#: ../panels/printers/pp-jobs-dialog.c:119
 msgctxt "print job"
 msgid "Canceled"
 msgstr "Cancelled"
 
 #. Translators: Job's state (job has aborted due to error)
-#: ../panels/printers/pp-jobs-dialog.c:163
+#: ../panels/printers/pp-jobs-dialog.c:123
 msgctxt "print job"
 msgid "Aborted"
 msgstr "Aborted"
 
 #. Translators: Job's state (job has completed successfully)
-#: ../panels/printers/pp-jobs-dialog.c:167
+#: ../panels/printers/pp-jobs-dialog.c:127
 msgctxt "print job"
 msgid "Completed"
 msgstr "Completed"
 
-#. Translators: Name of column showing titles of print jobs
+#. Translators: This is the printer name for which we are showing the active jobs
 #: ../panels/printers/pp-jobs-dialog.c:289
-msgid "Job Title"
-msgstr "Job Title"
-
-#. Translators: Name of column showing statuses of print jobs
-#: ../panels/printers/pp-jobs-dialog.c:298
-msgid "Job State"
-msgstr "Job State"
+#, c-format
+#| msgid "%s Active Jobs"
+msgctxt "Printer jobs dialog title"
+msgid "%s - Active Jobs"
+msgstr "%s - Active Jobs"
+
+#. Translators: The found device is a printer connected via USB
+#: ../panels/printers/pp-new-printer-dialog.c:1659
+msgid "USB"
+msgstr "USB"
+
+#. Translators: The found device is a printer connected via serial port
+#: ../panels/printers/pp-new-printer-dialog.c:1664
+msgid "Serial Port"
+msgstr "Serial Port"
+
+#. Translators: The found device is a printer connected via parallel port
+#: ../panels/printers/pp-new-printer-dialog.c:1671
+msgid "Parallel Port"
+msgstr "Parallel Port"
+
+#. Translators: The found device is a printer connected via Bluetooth
+#: ../panels/printers/pp-new-printer-dialog.c:1676
+msgid "Bluetooth"
+msgstr "Bluetooth"
 
-#. Translators: Name of column showing times of creation of print jobs
-#: ../panels/printers/pp-jobs-dialog.c:304
-msgid "Time"
-msgstr "Time"
+#. Translators: Location of found network printer (e.g. Kitchen, Reception)
+#: ../panels/printers/pp-new-printer-dialog.c:1713
+#, c-format
+#| msgid "Location"
+msgid "Location: %s"
+msgstr "Location: %s"
 
-#: ../panels/printers/pp-jobs-dialog.c:496
+#. Translators: Network address of found printer
+#: ../panels/printers/pp-new-printer-dialog.c:1718
 #, c-format
-msgid "%s Active Jobs"
-msgstr "%s Active Jobs"
+#| msgid "A_ddress:"
+msgid "Address: %s"
+msgstr "Address: %s"
 
-#. Translators: No printers were found
-#: ../panels/printers/pp-new-printer-dialog.c:1468
-msgid "No printers detected."
-msgstr "No printers detected."
+#. Translators: This item is a server which needs authentication to show its printers
+#: ../panels/printers/pp-new-printer-dialog.c:1747
+#| msgid "_Inner authentication"
+msgid "Server requires authentication"
+msgstr "Server requires authentication"
 
-#: ../panels/printers/pp-options-dialog.c:82
+#: ../panels/printers/pp-options-dialog.c:81
 msgid "Two Sided"
 msgstr "Two Sided"
 
-#: ../panels/printers/pp-options-dialog.c:83
+#: ../panels/printers/pp-options-dialog.c:82
 msgid "Paper Type"
 msgstr "Paper Type"
 
-#: ../panels/printers/pp-options-dialog.c:84
+#: ../panels/printers/pp-options-dialog.c:83
 msgid "Paper Source"
 msgstr "Paper Source"
 
-#: ../panels/printers/pp-options-dialog.c:85
+#: ../panels/printers/pp-options-dialog.c:84
 msgid "Output Tray"
 msgstr "Output Tray"
 
-#: ../panels/printers/pp-options-dialog.c:87
+#: ../panels/printers/pp-options-dialog.c:86
 msgid "GhostScript pre-filtering"
 msgstr "GhostScript pre-filtering"
 
 #. Translators: This option sets number of pages printed on one sheet
-#: ../panels/printers/pp-options-dialog.c:532
+#: ../panels/printers/pp-options-dialog.c:533
 msgid "Pages per side"
 msgstr "Pages per side"
 
 #. Translators: This option sets whether to print on both sides of paper
-#: ../panels/printers/pp-options-dialog.c:544
+#: ../panels/printers/pp-options-dialog.c:545
 msgid "Two-sided"
 msgstr "Two-sided"
 
 #. Translators: This option sets orientation of print (portrait, landscape...)
-#: ../panels/printers/pp-options-dialog.c:556
+#: ../panels/printers/pp-options-dialog.c:557
 msgid "Orientation"
 msgstr "Orientation"
 
 #. Translators: "General" tab contains general printer options
-#: ../panels/printers/pp-options-dialog.c:653
+#: ../panels/printers/pp-options-dialog.c:654
 msgctxt "Printer Option Group"
 msgid "General"
 msgstr "General"
 
 #. Translators: "Page Setup" tab contains settings related to pages (page size, paper source, etc.)
-#: ../panels/printers/pp-options-dialog.c:656
+#: ../panels/printers/pp-options-dialog.c:657
 msgctxt "Printer Option Group"
 msgid "Page Setup"
 msgstr "Page Setup"
 
 #. Translators: "Installable Options" tab contains settings of presence of installed options (amount of RAM, 
duplex unit, etc.)
-#: ../panels/printers/pp-options-dialog.c:659
+#: ../panels/printers/pp-options-dialog.c:660
 msgctxt "Printer Option Group"
 msgid "Installable Options"
 msgstr "Installable Options"
 
 #. Translators: "Job" tab contains settings for jobs
-#: ../panels/printers/pp-options-dialog.c:662
+#: ../panels/printers/pp-options-dialog.c:663
 msgctxt "Printer Option Group"
 msgid "Job"
 msgstr "Job"
 
 #. Translators: "Image Quality" tab contains settings for quality of output print (e.g. resolution)
-#: ../panels/printers/pp-options-dialog.c:665
+#: ../panels/printers/pp-options-dialog.c:666
 msgctxt "Printer Option Group"
 msgid "Image Quality"
 msgstr "Image Quality"
 
 #. Translators: "Color" tab contains color settings (e.g. color printing)
-#: ../panels/printers/pp-options-dialog.c:668
+#: ../panels/printers/pp-options-dialog.c:669
 msgctxt "Printer Option Group"
 msgid "Color"
 msgstr "Colour"
 
 #. Translators: "Finishing" tab contains finishing settings (e.g. booklet printing)
-#: ../panels/printers/pp-options-dialog.c:671
+#: ../panels/printers/pp-options-dialog.c:672
 msgctxt "Printer Option Group"
 msgid "Finishing"
 msgstr "Finishing"
 
 #. Translators: "Advanced" tab contains all others settings
-#: ../panels/printers/pp-options-dialog.c:674
+#: ../panels/printers/pp-options-dialog.c:675
 msgctxt "Printer Option Group"
 msgid "Advanced"
 msgstr "Advanced"
 
 #. Translators: this is an option of "Paper Source"
-#: ../panels/printers/pp-ppd-option-widget.c:77
-#: ../panels/printers/pp-ppd-option-widget.c:79
-#: ../panels/printers/pp-ppd-option-widget.c:87
+#: ../panels/printers/pp-ppd-option-widget.c:76
+#: ../panels/printers/pp-ppd-option-widget.c:78
+#: ../panels/printers/pp-ppd-option-widget.c:86
 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:81
-#: ../panels/printers/pp-ppd-option-widget.c:83
-#: ../panels/printers/pp-ppd-option-widget.c:85
-#: ../panels/printers/pp-ppd-option-widget.c:89
+#: ../panels/printers/pp-ppd-option-widget.c:80
+#: ../panels/printers/pp-ppd-option-widget.c:82
+#: ../panels/printers/pp-ppd-option-widget.c:84
+#: ../panels/printers/pp-ppd-option-widget.c:88
 msgid "Printer Default"
 msgstr "Printer Default"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:91
+#: ../panels/printers/pp-ppd-option-widget.c:90
 msgid "Embed GhostScript fonts only"
 msgstr "Embed GhostScript fonts only"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:93
+#: ../panels/printers/pp-ppd-option-widget.c:92
 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:95
+#: ../panels/printers/pp-ppd-option-widget.c:94
 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:97
+#: ../panels/printers/pp-ppd-option-widget.c:96
 msgid "No pre-filtering"
 msgstr "No pre-filtering"
 
@@ -4598,7 +4711,7 @@ msgid "Driver"
 msgstr "Driver"
 
 #. Translators: Samba server needs authentication of the user to show list of its printers.
-#: ../panels/printers/pp-samba.c:247
+#: ../panels/printers/pp-samba.c:248
 #, 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."
@@ -4623,18 +4736,23 @@ msgstr "Location"
 
 #. Translators: This checkbox is checked when the default printer is selected.
 #: ../panels/printers/printers.ui.h:8
-msgid "_Default"
-msgstr "_Default"
+#| msgid "Default Route"
+msgid "_Default printer"
+msgstr "_Default printer"
 
 #: ../panels/printers/printers.ui.h:9
 msgid "Jobs"
 msgstr "Jobs"
 
-#. Translators: Opens a dialog containing printer's jobs
+#. Translators: Opens a dialog containing printer
 #: ../panels/printers/printers.ui.h:11
 msgid "Show _Jobs"
 msgstr "Show _Jobs"
 
+#: ../panels/printers/printers.ui.h:12
+msgid "Model"
+msgstr "Model"
+
 #: ../panels/printers/printers.ui.h:15
 msgid "label"
 msgstr "label"
@@ -4652,18 +4770,24 @@ msgstr "page 3"
 msgid "Print _Test Page"
 msgstr "Print _Test Page"
 
-#. Translators: This button opens printer's options tab
-#: ../panels/printers/printers.ui.h:22
+#. Translators: This button opens printer
+#: ../panels/printers/printers.ui.h:22 ../panels/region/region.ui.h:6
 msgid "_Options"
 msgstr "_Options"
 
+#: ../panels/printers/printers.ui.h:23
+#| msgid "Printers"
+msgid "No printers"
+msgstr "No printers"
+
 #. Translators: This button adds new printer.
-#: ../panels/printers/printers.ui.h:24
-msgid "Add New Printer"
-msgstr "Add New Printer"
+#: ../panels/printers/printers.ui.h:25
+#| msgid "Add Printer"
+msgid "Add a Printer"
+msgstr "Add a Printer"
 
 #. Translators: The CUPS server is not running (we can not connect to it).
-#: ../panels/printers/printers.ui.h:26
+#: ../panels/printers/printers.ui.h:27
 msgid ""
 "Sorry! The system printing service\n"
 "doesn't seem to be available."
@@ -4671,52 +4795,98 @@ msgstr ""
 "Sorry! The system printing service\n"
 "doesn’t seem to be available."
 
-#: ../panels/privacy/cc-privacy-panel.c:245 ../panels/privacy/privacy.ui.h:26
+#: ../panels/privacy/cc-privacy-panel.c:371 ../panels/privacy/privacy.ui.h:24
 msgid "Screen Lock"
 msgstr "Screen Lock"
 
-#: ../panels/privacy/cc-privacy-panel.c:358 ../panels/privacy/privacy.ui.h:20
+#: ../panels/privacy/cc-privacy-panel.c:422
+msgid "In use"
+msgstr "In use"
+
+#: ../panels/privacy/cc-privacy-panel.c:427
+#| msgid "On"
+msgctxt "Location services status"
+msgid "On"
+msgstr "On"
+
+#: ../panels/privacy/cc-privacy-panel.c:428
+#| msgid "Off"
+msgctxt "Location services status"
+msgid "Off"
+msgstr "Off"
+
+#: ../panels/privacy/cc-privacy-panel.c:807 ../panels/privacy/privacy.ui.h:42
+#| msgid "Location"
+msgid "Location Services"
+msgstr "Location Services"
+
+#: ../panels/privacy/cc-privacy-panel.c:926 ../panels/privacy/privacy.ui.h:19
 msgid "Usage & History"
 msgstr "Usage & History"
 
-#: ../panels/privacy/cc-privacy-panel.c:486
+#: ../panels/privacy/cc-privacy-panel.c:1051
 msgid "Empty all items from Trash?"
 msgstr "Empty all items from Wastebasket?"
 
-#: ../panels/privacy/cc-privacy-panel.c:487
+#: ../panels/privacy/cc-privacy-panel.c:1052
 msgid "All items in the Trash will be permanently deleted."
 msgstr "All items in the Wastebasket will be permanently deleted."
 
-#: ../panels/privacy/cc-privacy-panel.c:488 ../panels/privacy/privacy.ui.h:32
+#: ../panels/privacy/cc-privacy-panel.c:1053 ../panels/privacy/privacy.ui.h:34
 msgid "_Empty Trash"
 msgstr "_Empty Wastebasket"
 
-#: ../panels/privacy/cc-privacy-panel.c:511
+#: ../panels/privacy/cc-privacy-panel.c:1076
 msgid "Delete all the temporary files?"
 msgstr "Delete all the temporary files?"
 
-#: ../panels/privacy/cc-privacy-panel.c:512
+#: ../panels/privacy/cc-privacy-panel.c:1077
 msgid "All the temporary files will be permanently deleted."
 msgstr "All the temporary files will be permanently deleted."
 
-#: ../panels/privacy/cc-privacy-panel.c:513 ../panels/privacy/privacy.ui.h:33
+#: ../panels/privacy/cc-privacy-panel.c:1078 ../panels/privacy/privacy.ui.h:35
 msgid "_Purge Temporary Files"
 msgstr "_Purge Temporary Files"
 
-#: ../panels/privacy/cc-privacy-panel.c:535 ../panels/privacy/privacy.ui.h:31
+#: ../panels/privacy/cc-privacy-panel.c:1100 ../panels/privacy/privacy.ui.h:29
 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/cc-privacy-panel.c:1140 ../panels/privacy/privacy.ui.h:36
+#| msgid "Software"
+msgid "Software Usage"
+msgstr "Software Usage"
+
+#: ../panels/privacy/cc-privacy-panel.c:1181 ../panels/privacy/privacy.ui.h:46
+msgid "Problem Reporting"
+msgstr "Problem Reporting"
 
+#. translators: '%s' is the distributor's name, such as 'Fedora'
+#: ../panels/privacy/cc-privacy-panel.c:1195
+#, c-format
+msgid ""
+"Sending reports of technical problems helps us improve %s. Reports are sent "
+"anonymously and are scrubbed of personal data."
+msgstr ""
+"Sending reports of technical problems helps us improve %s. Reports are sent "
+"anonymously and are scrubbed of personal data."
+
+#: ../panels/privacy/cc-privacy-panel.c:1207 ../panels/privacy/privacy.ui.h:41
+#| msgid "Privacy"
+msgid "Privacy Policy"
+msgstr "Privacy Policy"
+
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2
+msgid "Pri­va­cy"
+msgstr "Pri­va­cy"
+
+#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3
 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
+#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5
 msgid ""
 "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
 "network;identity;"
@@ -4733,50 +4903,46 @@ msgid "30 seconds"
 msgstr "30 seconds"
 
 #: ../panels/privacy/privacy.ui.h:9
-msgid "Immediately"
-msgstr "Immediately"
-
-#: ../panels/privacy/privacy.ui.h:10
 msgid "1 day"
 msgstr "1 day"
 
-#: ../panels/privacy/privacy.ui.h:11
+#: ../panels/privacy/privacy.ui.h:10
 msgid "2 days"
 msgstr "2 days"
 
-#: ../panels/privacy/privacy.ui.h:12
+#: ../panels/privacy/privacy.ui.h:11
 msgid "3 days"
 msgstr "3 days"
 
-#: ../panels/privacy/privacy.ui.h:13
+#: ../panels/privacy/privacy.ui.h:12
 msgid "4 days"
 msgstr "4 days"
 
-#: ../panels/privacy/privacy.ui.h:14
+#: ../panels/privacy/privacy.ui.h:13
 msgid "5 days"
 msgstr "5 days"
 
-#: ../panels/privacy/privacy.ui.h:15
+#: ../panels/privacy/privacy.ui.h:14
 msgid "6 days"
 msgstr "6 days"
 
-#: ../panels/privacy/privacy.ui.h:16
+#: ../panels/privacy/privacy.ui.h:15
 msgid "7 days"
 msgstr "7 days"
 
-#: ../panels/privacy/privacy.ui.h:17
+#: ../panels/privacy/privacy.ui.h:16
 msgid "14 days"
 msgstr "14 days"
 
-#: ../panels/privacy/privacy.ui.h:18
+#: ../panels/privacy/privacy.ui.h:17
 msgid "30 days"
 msgstr "30 days"
 
-#: ../panels/privacy/privacy.ui.h:19
+#: ../panels/privacy/privacy.ui.h:18
 msgid "Forever"
 msgstr "Forever"
 
-#: ../panels/privacy/privacy.ui.h:21
+#: ../panels/privacy/privacy.ui.h:20
 msgid ""
 "Remembering your history makes things easier to find again. These items are "
 "never shared over the network."
@@ -4784,35 +4950,35 @@ msgstr ""
 "Remembering your history makes things easier to find again. These items are "
 "never shared over the network."
 
-#: ../panels/privacy/privacy.ui.h:22
-msgid "Cl_ear Recent History"
-msgstr "Cl_ear Recent History"
-
-#: ../panels/privacy/privacy.ui.h:24
+#: ../panels/privacy/privacy.ui.h:21
 msgid "_Recently Used"
 msgstr "_Recently Used"
 
-#: ../panels/privacy/privacy.ui.h:25
+#: ../panels/privacy/privacy.ui.h:22
 msgid "Retain _History"
 msgstr "Retain _History"
 
-#: ../panels/privacy/privacy.ui.h:27
+#: ../panels/privacy/privacy.ui.h:23
+msgid "Cl_ear Recent History"
+msgstr "Cl_ear Recent History"
+
+#: ../panels/privacy/privacy.ui.h:25
 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:28
+#: ../panels/privacy/privacy.ui.h:26
 msgid "Automatic Screen _Lock"
 msgstr "Automatic Screen _Lock"
 
-#: ../panels/privacy/privacy.ui.h:29
+#: ../panels/privacy/privacy.ui.h:27
 msgid "Lock screen _after blank for"
 msgstr "Lock screen _after blank for"
 
-#: ../panels/privacy/privacy.ui.h:30
+#: ../panels/privacy/privacy.ui.h:28
 msgid "Show _Notifications"
 msgstr "Show _Notifications"
 
-#: ../panels/privacy/privacy.ui.h:34
+#: ../panels/privacy/privacy.ui.h:30
 msgid ""
 "Automatically purge the Trash and temporary files to help keep your computer "
 "free of unnecessary sensitive information."
@@ -4820,18 +4986,55 @@ msgstr ""
 "Automatically purge the Wastebasket and temporary files to help keep your "
 "computer free of unnecessary sensitive information."
 
-#: ../panels/privacy/privacy.ui.h:35
+#: ../panels/privacy/privacy.ui.h:31
 msgid "Automatically empty _Trash"
 msgstr "Automatically empty _Wastebasket"
 
-#: ../panels/privacy/privacy.ui.h:36
+#: ../panels/privacy/privacy.ui.h:32
 msgid "Automatically purge Temporary _Files"
 msgstr "Automatically purge Temporary _Files"
 
-#: ../panels/privacy/privacy.ui.h:37
+#: ../panels/privacy/privacy.ui.h:33
 msgid "Purge _After"
 msgstr "Purge _After"
 
+#: ../panels/privacy/privacy.ui.h:37
+msgid ""
+"Sending us information about which software you use helps us provide you "
+"with more accurate recommendations. It also helps us to improve our "
+"software.\n"
+"\n"
+"All the information we collect is made anonymous, and we will never share "
+"your data with third parties."
+msgstr ""
+"Sending us information about which software you use helps us provide you "
+"with more accurate recommendations. It also helps us to improve our "
+"software.\n"
+"\n"
+"All the information we collect is made anonymous, and we will never share "
+"your data with third parties."
+
+#: ../panels/privacy/privacy.ui.h:40
+msgid "_Send software usage statistics"
+msgstr "_Send software usage statistics"
+
+#: ../panels/privacy/privacy.ui.h:43
+msgid ""
+"Location services allow applications to know your location. Using Wi-Fi and "
+"mobile broadband increases accuracy."
+msgstr ""
+"Location services allow applications to know your location. Using Wi-Fi and "
+"mobile broadband increases accuracy."
+
+#: ../panels/privacy/privacy.ui.h:44
+#| msgid "_Location name:"
+msgid "_Location Services"
+msgstr "_Location Services"
+
+#: ../panels/privacy/privacy.ui.h:47
+msgid "_Automatic Problem Reporting"
+msgstr "_Automatic Problem Reporting"
+
 #: ../panels/region/cc-format-chooser.c:120
 msgctxt "measurement format"
 msgid "Imperial"
@@ -4842,88 +5045,80 @@ msgctxt "measurement format"
 msgid "Metric"
 msgstr "Metric"
 
-#: ../panels/region/cc-format-chooser.c:285
+#: ../panels/region/cc-format-chooser.c:287
 msgid "No regions found"
 msgstr "No regions found"
 
-#: ../panels/region/cc-input-chooser.c:186
+#: ../panels/region/cc-input-chooser.c:182
 msgid "No input sources found"
 msgstr "No input sources found"
 
-#: ../panels/region/cc-input-chooser.c:1070
+#: ../panels/region/cc-input-chooser.c:992
 msgctxt "Input Source"
 msgid "Other"
 msgstr "Other"
 
-#: ../panels/region/cc-region-panel.c:239
+#: ../panels/region/cc-region-panel.c:247
+#: ../panels/user-accounts/um-user-panel.c:1087
 msgid "Your session needs to be restarted for changes to take effect"
 msgstr "Your session needs to be restarted for changes to take effect"
 
-#: ../panels/region/cc-region-panel.c:240
+#: ../panels/region/cc-region-panel.c:251
+#: ../panels/user-accounts/um-user-panel.c:1091
 msgid "Restart Now"
 msgstr "Restart Now"
 
-#: ../panels/region/cc-region-panel.c:569
-msgctxt "Language"
-msgid "None"
-msgstr "None"
-
-#: ../panels/region/cc-region-panel.c:853
+#: ../panels/region/cc-region-panel.c:888
 msgid "No input source selected"
 msgstr "No input source selected"
 
-#: ../panels/region/cc-region-panel.c:1084
-msgid "Sorry"
-msgstr "Sorry"
-
-#: ../panels/region/cc-region-panel.c:1086
-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:1716
-msgid "Login Screen"
-msgstr "Login Screen"
+#: ../panels/region/cc-region-panel.c:1779
+#| msgid "Login Screen"
+msgid "Login _Screen"
+msgstr "Login _Screen"
 
-#: ../panels/region/format-chooser.ui.h:1 ../panels/region/region.ui.h:3
+#: ../panels/region/format-chooser.ui.h:1
 msgid "Formats"
 msgstr "Formats"
 
-#: ../panels/region/format-chooser.ui.h:3
+#: ../panels/region/format-chooser.ui.h:4
 msgid "Preview"
 msgstr "Preview"
 
-#: ../panels/region/format-chooser.ui.h:4
+#: ../panels/region/format-chooser.ui.h:5
 msgid "Dates"
 msgstr "Dates"
 
-#: ../panels/region/format-chooser.ui.h:5
+#: ../panels/region/format-chooser.ui.h:6
 msgid "Times"
 msgstr "Times"
 
-#: ../panels/region/format-chooser.ui.h:6
+#: ../panels/region/format-chooser.ui.h:7
 msgid "Numbers"
 msgstr "Numbers"
 
-#: ../panels/region/format-chooser.ui.h:7
+#: ../panels/region/format-chooser.ui.h:8
 msgid "Measurement"
 msgstr "Measurement"
 
-#: ../panels/region/format-chooser.ui.h:8
+#: ../panels/region/format-chooser.ui.h:9
 msgid "Paper"
 msgstr "Paper"
 
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:1
-msgid "Region & Language"
-msgstr "Region & Language"
-
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/region/gnome-region-panel.desktop.in.in.h:2
+#| msgid "Region & Language"
+msgid "Re­gion & Lan­guage"
+msgstr "Re­gion & Lan­guage"
+
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:3
 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
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:5
 msgid "Language;Layout;Keyboard;Input;"
 msgstr "Language;Layout;Keyboard;Input;"
 
@@ -4931,6 +5126,10 @@ msgstr "Language;Layout;Keyboard;Input;"
 msgid "Add an Input Source"
 msgstr "Add an Input Source"
 
+#: ../panels/region/input-chooser.ui.h:4
+msgid "Input methods can't be used on the login screen"
+msgstr "Input methods can’t be used on the login screen"
+
 #: ../panels/region/input-options.ui.h:1
 msgid "Input Source Options"
 msgstr "Input Source Options"
@@ -4943,7 +5142,7 @@ msgstr "Use the _same source for all windows"
 msgid "Allow _different sources for each window"
 msgstr "Allow _different sources for each window"
 
-#: ../panels/region/input-options.ui.h:4
+#: ../panels/region/input-options.ui.h:4 ../shell/cc-application.c:251
 msgid "Keyboard Shortcuts"
 msgstr "Keyboard Shortcuts"
 
@@ -4975,46 +5174,67 @@ msgstr "Alternative switch to next source"
 msgid "Left+Right Alt"
 msgstr "Left+Right Alt"
 
+#: ../panels/region/region.ui.h:1
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+msgid "_Language"
+msgstr "_Language"
+
 #: ../panels/region/region.ui.h:2
 msgid "English (United Kingdom)"
 msgstr "English (United Kingdom)"
 
+#: ../panels/region/region.ui.h:3
+#| msgid "Formats"
+msgid "_Formats"
+msgstr "_Formats"
+
 #: ../panels/region/region.ui.h:4
 msgid "United Kingdom"
 msgstr "United Kingdom"
 
-#: ../panels/region/region.ui.h:6
-msgid "Options"
-msgstr "Options"
+#: ../panels/region/region.ui.h:5
+msgid "Input Sources"
+msgstr "Input Sources"
 
 #: ../panels/region/region.ui.h:7
+#| msgid "Add an Input Source"
+msgid "Add input source"
+msgstr "Add input source"
+
+#: ../panels/region/region.ui.h:8
+#| msgid "Remove Input Source"
+msgid "Remove input source"
+msgstr "Remove input source"
+
+#: ../panels/region/region.ui.h:9
+#| msgid "Move Input Source Up"
+msgid "Move input source up"
+msgstr "Move input source up"
+
+#: ../panels/region/region.ui.h:10
+#| msgid "No input sources found"
+msgid "Move input source down"
+msgstr "Move input source down"
+
+#: ../panels/region/region.ui.h:11
+#| msgid "Choose an input source"
+msgid "Configure input source"
+msgstr "Configure input source"
+
+#: ../panels/region/region.ui.h:12
+#| msgid "Show Keyboard Layout"
+msgid "Show input source keyboard layout"
+msgstr "Show input source keyboard layout"
+
+#: ../panels/region/region.ui.h:13
 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/search/cc-search-locations-dialog.c:275
-msgid "Home"
-msgstr "Home"
-
-#: ../panels/search/cc-search-locations-dialog.c:477
-msgctxt "Search Location"
-msgid "Places"
-msgstr "Places"
-
-#: ../panels/search/cc-search-locations-dialog.c:479
-msgctxt "Search Location"
-msgid "Bookmarks"
-msgstr "Bookmarks"
-
-#: ../panels/search/cc-search-locations-dialog.c:481
-msgctxt "Search Location"
-msgid "Other"
-msgstr "Other"
-
-#: ../panels/search/cc-search-locations-dialog.c:679
+#: ../panels/search/cc-search-locations-dialog.c:634
 msgid "Select Location"
 msgstr "Select Location"
 
-#: ../panels/search/cc-search-locations-dialog.c:683
+#: ../panels/search/cc-search-locations-dialog.c:638
 msgid "_OK"
 msgstr "_OK"
 
@@ -5022,18 +5242,19 @@ msgstr "_OK"
 msgid "No applications found"
 msgstr "No applications found"
 
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:1
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:2
 msgid "Search"
 msgstr "Search"
 
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:2
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:3
 msgid ""
 "Control which applications show search results in the Activities Overview"
 msgstr ""
 "Control which applications show search results in the Activities Overview"
 
 #. Translators: those are keywords for the search control-center panel
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:4
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:5
 msgid "Search;Find;Index;Hide;Privacy;Results;"
 msgstr "Search;Find;Index;Hide;Privacy;Results;"
 
@@ -5041,6 +5262,24 @@ msgstr "Search;Find;Index;Hide;Privacy;Results;"
 msgid "Search Locations"
 msgstr "Search Locations"
 
+#: ../panels/search/search-locations-dialog.ui.h:2
+#| msgctxt "Search Location"
+#| msgid "Places"
+msgid "Places"
+msgstr "Places"
+
+#: ../panels/search/search-locations-dialog.ui.h:3
+#| msgctxt "Search Location"
+#| msgid "Bookmarks"
+msgid "Bookmarks"
+msgstr "Bookmarks"
+
+#: ../panels/search/search-locations-dialog.ui.h:4
+#| msgctxt "Online Account"
+#| msgid "Other"
+msgid "Other"
+msgstr "Other"
+
 #: ../panels/search/search.ui.h:1
 msgid "Move Up"
 msgstr "Move Up"
@@ -5053,40 +5292,108 @@ msgstr "Move Down"
 msgid "Preferences"
 msgstr "Preferences"
 
-#: ../panels/sharing/cc-sharing-panel.c:274
+#. Label
+#: ../panels/sharing/cc-sharing-networks.c:303
+#| msgid "List of keyboard layouts selected for usage"
+msgid "No networks selected for sharing"
+msgstr "No networks selected for sharing"
+
+#: ../panels/sharing/cc-sharing-panel.c:263
 msgctxt "service is enabled"
 msgid "On"
 msgstr "On"
 
-#: ../panels/sharing/cc-sharing-panel.c:276
+#: ../panels/sharing/cc-sharing-panel.c:265
+#: ../panels/sharing/cc-sharing-panel.c:292
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "Off"
 
-#: ../panels/sharing/cc-sharing-panel.c:418
+#: ../panels/sharing/cc-sharing-panel.c:295
+#| msgid "Enabled"
+msgctxt "service is enabled"
+msgid "Enabled"
+msgstr "Enabled"
+
+#: ../panels/sharing/cc-sharing-panel.c:298
+#| msgid "_Activate"
+msgctxt "service is active"
+msgid "Active"
+msgstr "Active"
+
+#: ../panels/sharing/cc-sharing-panel.c:369
 msgid "Choose a Folder"
 msgstr "Choose a Folder"
 
-#: ../panels/sharing/cc-sharing-panel.c:702
+#: ../panels/sharing/cc-sharing-panel.c:680
+#, 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>"
+
+#: ../panels/sharing/cc-sharing-panel.c:682
+#, c-format
+#| msgid ""
+#| "Allow remote users to connect using the Secure Shell command:\n"
+#| "<a href=\"ssh %s\">ssh %s</a>"
+msgid ""
+"When remote login is enabled, remote users can connect using the Secure "
+"Shell command:\n"
+"<a href=\"ssh %s\">ssh %s</a>"
+msgstr ""
+"When remote login is enabled, remote users can connect using the Secure "
+"Shell command:\n"
+"<a href=\"ssh %s\">ssh %s</a>"
+
+#: ../panels/sharing/cc-sharing-panel.c:684
+#, c-format
+#| msgid ""
+#| "Allow remote users to view or control your screen by connecting to: <a "
+#| "href=\"vnc://%s\">vnc://%s</a>"
+msgid ""
+"Screen sharing allows remote users to view or control your screen by "
+"connecting to <a href=\"vnc://%s\">vnc://%s</a>"
+msgstr ""
+"Screen sharing allows remote users to view or control your screen by "
+"connecting to <a href=\"vnc://%s\">vnc://%s</a>"
+
+#: ../panels/sharing/cc-sharing-panel.c:796
 msgid "Copy"
 msgstr "Copy"
 
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1
+#: ../panels/sharing/cc-sharing-panel.c:1122
 msgid "Sharing"
 msgstr "Sharing"
 
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2
+#| msgid "Sharing"
+msgid "Sha­ring"
+msgstr "Sha­ring"
+
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3
 msgid "Control what you want to share with others"
 msgstr "Control what you want to share with others"
 
 #. Translators: those are keywords for the sharing control-center panel
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5
+#| msgid ""
+#| "share;sharing;ssh;host;name;remote;desktop;bluetooth;obex;media;audio;"
+#| "video;pictures;photos;movies;server;renderer;"
 msgid ""
-"share;sharing;ssh;host;name;remote;desktop;bluetooth;obex;media;audio;video;"
-"pictures;photos;movies;server;renderer;"
+"share;sharing;ssh;host;name;remote;desktop;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;"
+"share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
+"movies;server;renderer;"
+
+#: ../panels/sharing/networks.ui.h:1
+#| msgid "Network"
+msgid "Networks"
+msgstr "Networks"
 
 #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1
 msgid "Enable or disable remote login"
@@ -5097,131 +5404,93 @@ msgid "Authentication is required to enable or disable remote login"
 msgstr "Authentication is required to enable or disable remote login"
 
 #: ../panels/sharing/sharing.ui.h:1
-msgid "Bluetooth Sharing"
-msgstr "Bluetooth Sharing"
+#| msgid "Computer Name"
+msgid "_Computer Name"
+msgstr "_Computer Name"
 
 #: ../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"
+#| msgid "Personal File Sharing"
+msgid "_File Sharing"
+msgstr "_File Sharing"
 
 #: ../panels/sharing/sharing.ui.h:3
-msgid "Share Public Folder"
-msgstr "Share Public Folder"
+#| msgid "Screen Sharing"
+msgid "_Screen Sharing"
+msgstr "_Screen Sharing"
 
 #: ../panels/sharing/sharing.ui.h:4
-msgid "Only Receive From Trusted Devices"
-msgstr "Only Receive From Trusted Devices"
+#| msgid "Media Sharing"
+msgid "_Media Sharing"
+msgstr "_Media Sharing"
 
 #: ../panels/sharing/sharing.ui.h:5
-msgid "Save Received Files to Downloads Folder"
-msgstr "Save Received Files to Downloads Folder"
+#| msgid "Remote Login"
+msgid "_Remote Login"
+msgstr "_Remote Login"
 
 #: ../panels/sharing/sharing.ui.h:6
-msgid "Only share with Trusted Devices"
-msgstr "Only share with Trusted Devices"
+msgid "Some services are disabled because of no network access."
+msgstr "Some services are disabled because of no network access."
 
 #: ../panels/sharing/sharing.ui.h:7
-msgid "Computer Name"
-msgstr "Computer Name"
+#| msgid "Sharing"
+msgid "File Sharing"
+msgstr "File Sharing"
 
 #: ../panels/sharing/sharing.ui.h:8
-msgid "Personal File Sharing"
-msgstr "Personal File Sharing"
-
-#: ../panels/sharing/sharing.ui.h:9
-msgid "Screen Sharing"
-msgstr "Screen Sharing"
+#| msgid "Require Password"
+msgid "_Require Password"
+msgstr "_Require Password"
 
 #: ../panels/sharing/sharing.ui.h:10
-msgid "Media Sharing"
-msgstr "Media Sharing"
-
-#: ../panels/sharing/sharing.ui.h:11
 msgid "Remote Login"
 msgstr "Remote Login"
 
+#: ../panels/sharing/sharing.ui.h:11
+msgid "Screen Sharing"
+msgstr "Screen Sharing"
+
 #: ../panels/sharing/sharing.ui.h:12
-msgid "Some services are disabled because of no network access."
-msgstr "Some services are disabled because of no network access."
+msgid "_Allow connections to control the screen"
+msgstr "_Allow connections to control the screen"
 
 #: ../panels/sharing/sharing.ui.h:13
-msgid "Share Music, Photos and Videos with others on the current network."
-msgstr "Share Music, Photos and Videos with others on the current network."
+#| msgid "_Password"
+msgid "_Password:"
+msgstr "_Password:"
 
 #: ../panels/sharing/sharing.ui.h:14
-msgid "Share Media On This Network"
-msgstr "Share Media On This Network"
+#| msgid "Show Password"
+msgid "_Show Password"
+msgstr "_Show Password"
 
 #: ../panels/sharing/sharing.ui.h:15
-msgid "Shared Folders"
-msgstr "Shared Folders"
+#| msgid "%s Options"
+msgid "Access Options"
+msgstr "Access Options"
 
 #: ../panels/sharing/sharing.ui.h:16
-msgid "column"
-msgstr "column"
+msgid "_New connections must ask for access"
+msgstr "_New connections must ask for access"
 
 #: ../panels/sharing/sharing.ui.h:17
-msgid "Add Folder"
-msgstr "Add Folder"
+#| msgid "Require Password"
+msgid "_Require a password"
+msgstr "_Require a password"
 
 #: ../panels/sharing/sharing.ui.h:18
-msgid "Remove Folder"
-msgstr "Remove Folder"
-
-#: ../panels/sharing/sharing.ui.h:20
-#, 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>"
-
-#: ../panels/sharing/sharing.ui.h:21
-msgid "Share Public Folder On This Network"
-msgstr "Share Public Folder On This Network"
-
-#: ../panels/sharing/sharing.ui.h:22
-msgid "Require Password"
-msgstr "Require Password"
-
-#: ../panels/sharing/sharing.ui.h:25
-#, 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/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/sharing/sharing.ui.h:29
-msgid "Remote View"
-msgstr "Remote View"
-
-#: ../panels/sharing/sharing.ui.h:30
-msgid "Remote Control"
-msgstr "Remote Control"
+msgid "Media Sharing"
+msgstr "Media Sharing"
 
-#: ../panels/sharing/sharing.ui.h:31
-msgid "Approve All Connections"
-msgstr "Approve All Connections"
+#: ../panels/sharing/sharing.ui.h:19
+#| msgid "Share Music, Photos and Videos with others on the current network."
+msgid "Share music, photos and videos over the network."
+msgstr "Share music, photos and videos over the network."
 
-#: ../panels/sharing/sharing.ui.h:32
-msgid "Show Password"
-msgstr "Show Password"
+#: ../panels/sharing/sharing.ui.h:20
+#| msgid "Add Folder"
+msgid "Folders"
+msgstr "Folders"
 
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:1
 msgid "Sound"
@@ -5260,60 +5529,60 @@ msgstr "Glass"
 msgid "Sonar"
 msgstr "Sonar"
 
-#: ../panels/sound/gvc-balance-bar.c:106
+#: ../panels/sound/gvc-balance-bar.c:105
 msgctxt "balance"
 msgid "Left"
 msgstr "Left"
 
-#: ../panels/sound/gvc-balance-bar.c:107
+#: ../panels/sound/gvc-balance-bar.c:106
 msgctxt "balance"
 msgid "Right"
 msgstr "Right"
 
-#: ../panels/sound/gvc-balance-bar.c:110
+#: ../panels/sound/gvc-balance-bar.c:109
 msgctxt "balance"
 msgid "Rear"
 msgstr "Rear"
 
-#: ../panels/sound/gvc-balance-bar.c:111
+#: ../panels/sound/gvc-balance-bar.c:110
 msgctxt "balance"
 msgid "Front"
 msgstr "Front"
 
-#: ../panels/sound/gvc-balance-bar.c:114
+#: ../panels/sound/gvc-balance-bar.c:113
 msgctxt "balance"
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../panels/sound/gvc-balance-bar.c:115
+#: ../panels/sound/gvc-balance-bar.c:114
 msgctxt "balance"
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../panels/sound/gvc-balance-bar.c:290
+#: ../panels/sound/gvc-balance-bar.c:289
 msgid "_Balance:"
 msgstr "_Balance:"
 
-#: ../panels/sound/gvc-balance-bar.c:293
+#: ../panels/sound/gvc-balance-bar.c:292
 msgid "_Fade:"
 msgstr "_Fade:"
 
-#: ../panels/sound/gvc-balance-bar.c:296
+#: ../panels/sound/gvc-balance-bar.c:295
 msgid "_Subwoofer:"
 msgstr "_Subwoofer:"
 
-#: ../panels/sound/gvc-channel-bar.c:613 ../panels/sound/gvc-channel-bar.c:622
+#: ../panels/sound/gvc-channel-bar.c:611 ../panels/sound/gvc-channel-bar.c:620
 msgctxt "volume"
 msgid "100%"
 msgstr "100%"
 
-#: ../panels/sound/gvc-channel-bar.c:617
+#: ../panels/sound/gvc-channel-bar.c:615
 msgctxt "volume"
 msgid "Unamplified"
 msgstr "Unamplified"
 
-#: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:261
-#: ../panels/sound/gvc-mixer-dialog.c:527
+#: ../panels/sound/gvc-combo-box.c:166 ../panels/sound/gvc-mixer-dialog.c:249
+#: ../panels/sound/gvc-mixer-dialog.c:515
 msgid "_Profile:"
 msgstr "_Profile:"
 
@@ -5339,133 +5608,133 @@ msgstr[1] "%u Inputs"
 msgid "System Sounds"
 msgstr "System Sounds"
 
-#: ../panels/sound/gvc-mixer-dialog.c:263
+#: ../panels/sound/gvc-mixer-dialog.c:251
 msgid "_Test Speakers"
 msgstr "_Test Speakers"
 
-#: ../panels/sound/gvc-mixer-dialog.c:432
+#: ../panels/sound/gvc-mixer-dialog.c:420
 msgid "Peak detect"
 msgstr "Peak detect"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1510
-#: ../panels/sound/gvc-sound-theme-chooser.c:595
-msgid "Name"
-msgstr "Name"
-
-#: ../panels/sound/gvc-mixer-dialog.c:1529
+#: ../panels/sound/gvc-mixer-dialog.c:1512
 msgid "Device"
 msgstr "Device"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1592
+#: ../panels/sound/gvc-mixer-dialog.c:1575
 #, c-format
 msgid "Speaker Testing for %s"
 msgstr "Speaker Testing for %s"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1649
+#: ../panels/sound/gvc-mixer-dialog.c:1631
 msgid "_Output volume:"
 msgstr "_Output volume:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1663
+#: ../panels/sound/gvc-mixer-dialog.c:1645
 msgid "Output"
 msgstr "Output"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1668
+#: ../panels/sound/gvc-mixer-dialog.c:1650
 msgid "C_hoose a device for sound output:"
 msgstr "C_hoose a device for sound output:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1693
+#: ../panels/sound/gvc-mixer-dialog.c:1672
 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:1683
 msgid "Input"
 msgstr "Input"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1711
+#: ../panels/sound/gvc-mixer-dialog.c:1690
 msgid "_Input volume:"
 msgstr "_Input volume:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1734
+#: ../panels/sound/gvc-mixer-dialog.c:1711
 msgid "Input level:"
 msgstr "Input level:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1762
+#: ../panels/sound/gvc-mixer-dialog.c:1737
 msgid "C_hoose a device for sound input:"
 msgstr "C_hoose a device for sound input:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1789
+#: ../panels/sound/gvc-mixer-dialog.c:1761
 msgid "Sound Effects"
 msgstr "Sound Effects"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1796
+#: ../panels/sound/gvc-mixer-dialog.c:1768
 msgid "_Alert volume:"
 msgstr "_Alert volume:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1809
-msgid "Applications"
-msgstr "Applications"
-
-#: ../panels/sound/gvc-mixer-dialog.c:1813
+#: ../panels/sound/gvc-mixer-dialog.c:1785
 msgid "No application is currently playing or recording audio."
 msgstr "No application is currently playing or recording audio."
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:189
+#: ../panels/sound/gvc-sound-theme-chooser.c:188
 msgid "Built-in"
 msgstr "Built-in"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:455
-#: ../panels/sound/gvc-sound-theme-chooser.c:467
-#: ../panels/sound/gvc-sound-theme-chooser.c:479
+#: ../panels/sound/gvc-sound-theme-chooser.c:454
+#: ../panels/sound/gvc-sound-theme-chooser.c:466
+#: ../panels/sound/gvc-sound-theme-chooser.c:478
 msgid "Sound Preferences"
 msgstr "Sound Preferences"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:458
-#: ../panels/sound/gvc-sound-theme-chooser.c:469
-#: ../panels/sound/gvc-sound-theme-chooser.c:481
+#: ../panels/sound/gvc-sound-theme-chooser.c:457
+#: ../panels/sound/gvc-sound-theme-chooser.c:468
+#: ../panels/sound/gvc-sound-theme-chooser.c:480
 msgid "Testing event sound"
 msgstr "Testing event sound"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:585
+#: ../panels/sound/gvc-sound-theme-chooser.c:554
 msgid "Default"
 msgstr "Default"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:586
+#: ../panels/sound/gvc-sound-theme-chooser.c:555
 msgid "From theme"
 msgstr "From theme"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:770
+#: ../panels/sound/gvc-sound-theme-chooser.c:740
 msgid "C_hoose an alert sound:"
 msgstr "C_hoose an alert sound:"
 
-#: ../panels/sound/gvc-speaker-test.c:220
+#: ../panels/sound/gvc-speaker-test.c:231
 msgid "Stop"
 msgstr "Stop"
 
-#: ../panels/sound/gvc-speaker-test.c:220
-#: ../panels/sound/gvc-speaker-test.c:332
+#: ../panels/sound/gvc-speaker-test.c:231
+#: ../panels/sound/gvc-speaker-test.c:343
 msgid "Test"
 msgstr "Test"
 
-#: ../panels/sound/gvc-speaker-test.c:228
+#: ../panels/sound/gvc-speaker-test.c:239
 msgid "Subwoofer"
 msgstr "Subwoofer"
 
-#: ../panels/sound/sound-theme-file-utils.c:292
+#: ../panels/sound/sound-theme-file-utils.c:304
 msgid "Custom"
 msgstr "Custom"
 
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2
+#| msgid "Universal Access"
+msgid "Uni­ver­sal Access"
+msgstr "Uni­ver­sal Access"
+
+#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3
 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
+#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5
+#| msgid ""
+#| "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen Reader;text;font;"
+#| "size;AccessX;Sticky Keys;Slow Keys;Bounce Keys;Mouse Keys;"
 msgid ""
-"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen Reader;text;font;size;"
-"AccessX;Sticky Keys;Slow Keys;Bounce Keys;Mouse Keys;"
+"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
+"AccessX;Sticky;Keys;Slow;Bounce;Mouse;"
 msgstr ""
-"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen Reader;text;font;size;"
-"AccessX;Sticky Keys;Slow Keys;Bounce Keys;Mouse Keys;"
+"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
+"AccessX;Sticky;Keys;Slow;Bounce;Mouse;"
 
 #: ../panels/universal-access/uap.ui.h:1
 msgid "_Always Show Universal Access Menu"
@@ -5484,6 +5753,7 @@ msgid "_Large Text"
 msgstr "_Large Text"
 
 #: ../panels/universal-access/uap.ui.h:5
+#: ../panels/universal-access/zoom-options.ui.h:7
 msgid "_Zoom"
 msgstr "_Zoom"
 
@@ -5508,232 +5778,291 @@ msgid "Screen _Keyboard"
 msgstr "Screen _Keyboard"
 
 #: ../panels/universal-access/uap.ui.h:13
-msgid "_Typing Assist (AccessX)"
-msgstr "_Typing Assist (AccessX)"
+#| msgid "Repeat Keys"
+msgid "R_epeat Keys"
+msgstr "R_epeat Keys"
 
 #: ../panels/universal-access/uap.ui.h:14
-msgid "Pointing and Clicking"
-msgstr "Pointing and Clicking"
+#| msgid "Cursor Blinking"
+msgid "Cursor _Blinking"
+msgstr "Cursor _Blinking"
 
 #: ../panels/universal-access/uap.ui.h:15
+msgid "_Typing Assist (AccessX)"
+msgstr "_Typing Assist (AccessX)"
+
+#: ../panels/universal-access/uap.ui.h:16
+#| msgid "Pointing and Clicking"
+msgid "Pointing & Clicking"
+msgstr "Pointing & Clicking"
+
+#: ../panels/universal-access/uap.ui.h:17
 msgid "_Mouse Keys"
 msgstr "_Mouse Keys"
 
-#: ../panels/universal-access/uap.ui.h:16
+#: ../panels/universal-access/uap.ui.h:18
 msgid "_Click Assist"
 msgstr "_Click Assist"
 
-#: ../panels/universal-access/uap.ui.h:17
+#: ../panels/universal-access/uap.ui.h:19
+#| msgid "_Double-click"
+msgid "_Double-Click Delay"
+msgstr "_Double-Click Delay"
+
+#: ../panels/universal-access/uap.ui.h:20
+#| msgid "Double-Click Timeout"
+msgid "Double-Click Delay"
+msgstr "Double-Click Delay"
+
+#: ../panels/universal-access/uap.ui.h:21
 msgid "Screen Reader"
 msgstr "Screen Reader"
 
-#: ../panels/universal-access/uap.ui.h:18
+#: ../panels/universal-access/uap.ui.h:22
 msgid "The screen reader reads displayed text as you move the focus."
 msgstr "The screen reader reads displayed text as you move the focus."
 
-#: ../panels/universal-access/uap.ui.h:19
+#: ../panels/universal-access/uap.ui.h:23
 msgid "_Screen Reader"
 msgstr "_Screen Reader"
 
-#: ../panels/universal-access/uap.ui.h:20
+#: ../panels/universal-access/uap.ui.h:24
 msgid "Sound Keys"
 msgstr "Sound Keys"
 
-#: ../panels/universal-access/uap.ui.h:21
-msgid "Beep when Num Lock or Caps Lock are turned on."
-msgstr "Beep when Num Lock or Caps Lock are turned on."
+#: ../panels/universal-access/uap.ui.h:25
+#| msgid "Beep when Num Lock or Caps Lock are turned on."
+msgid "Beep when Num Lock or Caps Lock are turned on or off."
+msgstr "Beep when Num Lock or Caps Lock are turned on or off."
 
-#: ../panels/universal-access/uap.ui.h:22
+#: ../panels/universal-access/uap.ui.h:26
 msgid "Visual Alerts"
 msgstr "Visual Alerts"
 
-#: ../panels/universal-access/uap.ui.h:23
-msgid "Use a visual indication when an alert sound occurs."
-msgstr "Use a visual indication when an alert sound occurs."
-
-#: ../panels/universal-access/uap.ui.h:24
+#: ../panels/universal-access/uap.ui.h:27
 msgid "_Test flash"
 msgstr "_Test flash"
 
-#: ../panels/universal-access/uap.ui.h:25
+#: ../panels/universal-access/uap.ui.h:28
+msgid "Use a visual indication when an alert sound occurs."
+msgstr "Use a visual indication when an alert sound occurs."
+
+#: ../panels/universal-access/uap.ui.h:29
 msgid "Flash the _window title"
 msgstr "Flash the _window title"
 
-#: ../panels/universal-access/uap.ui.h:26
+#: ../panels/universal-access/uap.ui.h:30
 msgid "Flash the entire _screen"
 msgstr "Flash the entire _screen"
 
-#: ../panels/universal-access/uap.ui.h:27
+#: ../panels/universal-access/uap.ui.h:31
+msgid "Repeat Keys"
+msgstr "Repeat Keys"
+
+#: ../panels/universal-access/uap.ui.h:32
+#| msgid "Key presses _repeat when key is held down"
+msgid "Key presses repeat when key is held down."
+msgstr "Key presses repeat when key is held down."
+
+#: ../panels/universal-access/uap.ui.h:34
+#| msgid "Repeat keys speed"
+msgid "Repeat keys delay"
+msgstr "Repeat keys delay"
+
+#: ../panels/universal-access/uap.ui.h:35
+msgid "Speed"
+msgstr "Speed"
+
+#: ../panels/universal-access/uap.ui.h:36
+msgid "Repeat keys speed"
+msgstr "Repeat keys speed"
+
+#: ../panels/universal-access/uap.ui.h:37
+msgid "Cursor Blinking"
+msgstr "Cursor Blinking"
+
+#: ../panels/universal-access/uap.ui.h:38
+#| msgid "Cursor _blinks in text fields"
+msgid "Cursor blinks in text fields."
+msgstr "Cursor blinks in text fields."
+
+#: ../panels/universal-access/uap.ui.h:39
+#| msgid "Cursor blink speed"
+msgid "Cursor blinking speed"
+msgstr "Cursor blinking speed"
+
+#: ../panels/universal-access/uap.ui.h:40
 msgid "Typing Assist"
 msgstr "Typing Assist"
 
-#: ../panels/universal-access/uap.ui.h:28
+#: ../panels/universal-access/uap.ui.h:41
 msgid "_Sticky Keys"
 msgstr "_Sticky Keys"
 
-#: ../panels/universal-access/uap.ui.h:29
+#: ../panels/universal-access/uap.ui.h:42
 msgid "Treats a sequence of modifier keys as a key combination"
 msgstr "Treats a sequence of modifier keys as a key combination"
 
-#: ../panels/universal-access/uap.ui.h:30
+#: ../panels/universal-access/uap.ui.h:43
 msgid "_Disable if two keys are pressed together"
 msgstr "_Disable if two keys are pressed together"
 
-#: ../panels/universal-access/uap.ui.h:31
-msgid "Beep when a _modifer key is pressed"
-msgstr "Beep when a _modifer key is pressed"
+#: ../panels/universal-access/uap.ui.h:44
+#| msgid "Beep when a _modifer key is pressed"
+msgid "Beep when a _modifier key is pressed"
+msgstr "Beep when a _modifier key is pressed"
 
-#: ../panels/universal-access/uap.ui.h:32
+#: ../panels/universal-access/uap.ui.h:45
 msgid "S_low Keys"
 msgstr "S_low Keys"
 
-#: ../panels/universal-access/uap.ui.h:33
+#: ../panels/universal-access/uap.ui.h:46
 msgid "Puts a delay between when a key is pressed and when it is accepted"
 msgstr "Puts a delay between when a key is pressed and when it is accepted"
 
-#: ../panels/universal-access/uap.ui.h:34
+#: ../panels/universal-access/uap.ui.h:47
 msgid "A_cceptance delay:"
 msgstr "A_cceptance delay:"
 
-#: ../panels/universal-access/uap.ui.h:35
+#: ../panels/universal-access/uap.ui.h:48
 msgctxt "slow keys delay"
 msgid "Short"
 msgstr "Short"
 
-#: ../panels/universal-access/uap.ui.h:36
+#: ../panels/universal-access/uap.ui.h:49
 msgid "Slow keys typing delay"
 msgstr "Slow keys typing delay"
 
-#: ../panels/universal-access/uap.ui.h:37
+#: ../panels/universal-access/uap.ui.h:50
 msgctxt "slow keys delay"
 msgid "Long"
 msgstr "Long"
 
-#: ../panels/universal-access/uap.ui.h:38
+#: ../panels/universal-access/uap.ui.h:51
 msgid "Beep when a key is pr_essed"
 msgstr "Beep when a key is pr_essed"
 
-#: ../panels/universal-access/uap.ui.h:39
+#: ../panels/universal-access/uap.ui.h:52
 msgid "Beep when a key is _accepted"
 msgstr "Beep when a key is _accepted"
 
-#: ../panels/universal-access/uap.ui.h:40
+#: ../panels/universal-access/uap.ui.h:53
 msgid "Beep when a key is _rejected"
 msgstr "Beep when a key is _rejected"
 
-#: ../panels/universal-access/uap.ui.h:41
+#: ../panels/universal-access/uap.ui.h:54
 msgid "_Bounce Keys"
 msgstr "_Bounce Keys"
 
-#: ../panels/universal-access/uap.ui.h:42
+#: ../panels/universal-access/uap.ui.h:55
 msgid "Ignores fast duplicate keypresses"
 msgstr "Ignores fast duplicate keypresses"
 
-#: ../panels/universal-access/uap.ui.h:43
+#: ../panels/universal-access/uap.ui.h:56
 msgctxt "bounce keys delay"
 msgid "Short"
 msgstr "Short"
 
-#: ../panels/universal-access/uap.ui.h:44
+#: ../panels/universal-access/uap.ui.h:57
 msgid "Bounce keys typing delay"
 msgstr "Bounce keys typing delay"
 
-#: ../panels/universal-access/uap.ui.h:45
+#: ../panels/universal-access/uap.ui.h:58
 msgctxt "bounce keys delay"
 msgid "Long"
 msgstr "Long"
 
-#: ../panels/universal-access/uap.ui.h:46
+#: ../panels/universal-access/uap.ui.h:59
 msgid "_Enable by Keyboard"
 msgstr "_Enable by Keyboard"
 
-#: ../panels/universal-access/uap.ui.h:47
+#: ../panels/universal-access/uap.ui.h:60
 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:48
+#: ../panels/universal-access/uap.ui.h:61
 msgid "Click Assist"
 msgstr "Click Assist"
 
-#: ../panels/universal-access/uap.ui.h:49
+#: ../panels/universal-access/uap.ui.h:62
 msgid "_Simulated Secondary Click"
 msgstr "_Simulated Secondary Click"
 
-#: ../panels/universal-access/uap.ui.h:50
+#: ../panels/universal-access/uap.ui.h:63
 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:51
+#: ../panels/universal-access/uap.ui.h:64
 msgctxt "secondary click"
 msgid "Short"
 msgstr "Short"
 
-#: ../panels/universal-access/uap.ui.h:52
+#: ../panels/universal-access/uap.ui.h:65
 msgid "Secondary click delay"
 msgstr "Secondary click delay"
 
-#: ../panels/universal-access/uap.ui.h:53
+#: ../panels/universal-access/uap.ui.h:66
 msgctxt "secondary click delay"
 msgid "Long"
 msgstr "Long"
 
-#: ../panels/universal-access/uap.ui.h:54
+#: ../panels/universal-access/uap.ui.h:67
 msgid "_Hover Click"
 msgstr "_Hover Click"
 
-#: ../panels/universal-access/uap.ui.h:55
+#: ../panels/universal-access/uap.ui.h:68
 msgid "Trigger a click when the pointer hovers"
 msgstr "Trigger a click when the pointer hovers"
 
-#: ../panels/universal-access/uap.ui.h:56
+#: ../panels/universal-access/uap.ui.h:69
 msgid "D_elay:"
 msgstr "D_elay:"
 
-#: ../panels/universal-access/uap.ui.h:57
+#: ../panels/universal-access/uap.ui.h:70
 msgctxt "dwell click delay"
 msgid "Short"
 msgstr "Short"
 
-#: ../panels/universal-access/uap.ui.h:58
+#: ../panels/universal-access/uap.ui.h:71
 msgctxt "dwell click delay"
 msgid "Long"
 msgstr "Long"
 
-#: ../panels/universal-access/uap.ui.h:59
+#: ../panels/universal-access/uap.ui.h:72
 msgid "Motion _threshold:"
 msgstr "Motion _threshold:"
 
-#: ../panels/universal-access/uap.ui.h:60
+#: ../panels/universal-access/uap.ui.h:73
 msgctxt "dwell click threshold"
 msgid "Small"
 msgstr "Small"
 
-#: ../panels/universal-access/uap.ui.h:61
+#: ../panels/universal-access/uap.ui.h:74
 msgctxt "dwell click threshold"
 msgid "Large"
 msgstr "Large"
 
-#: ../panels/universal-access/zoom-options.c:357
+#: ../panels/universal-access/zoom-options.c:333
 msgctxt "Distance"
 msgid "Short"
 msgstr "Short"
 
-#: ../panels/universal-access/zoom-options.c:358
+#: ../panels/universal-access/zoom-options.c:334
 msgctxt "Distance"
 msgid "¼ Screen"
 msgstr "¼ Screen"
 
-#: ../panels/universal-access/zoom-options.c:359
+#: ../panels/universal-access/zoom-options.c:335
 msgctxt "Distance"
 msgid "½ Screen"
 msgstr "½ Screen"
 
-#: ../panels/universal-access/zoom-options.c:360
+#: ../panels/universal-access/zoom-options.c:336
 msgctxt "Distance"
 msgid "¾ Screen"
 msgstr "¾ Screen"
 
-#: ../panels/universal-access/zoom-options.c:361
+#: ../panels/universal-access/zoom-options.c:337
 msgctxt "Distance"
 msgid "Long"
 msgstr "Long"
@@ -5762,37 +6091,40 @@ msgstr "Right Half"
 msgid "Zoom Options"
 msgstr "Zoom Options"
 
-#: ../panels/universal-access/zoom-options.ui.h:7
-msgid "Zoom"
-msgstr "Zoom"
-
 #: ../panels/universal-access/zoom-options.ui.h:8
-msgid "Magnification:"
-msgstr "Magnification:"
+#| msgid "Magnification:"
+msgid "_Magnification:"
+msgstr "_Magnification:"
 
 #: ../panels/universal-access/zoom-options.ui.h:9
-msgid "Follow mouse cursor"
-msgstr "Follow mouse cursor"
+#| msgid "Follow mouse cursor"
+msgid "_Follow mouse cursor"
+msgstr "_Follow mouse cursor"
 
 #: ../panels/universal-access/zoom-options.ui.h:10
-msgid "Screen part:"
-msgstr "Screen part:"
+#| msgid "Screen part:"
+msgid "_Screen part:"
+msgstr "_Screen part:"
 
 #: ../panels/universal-access/zoom-options.ui.h:11
-msgid "Magnifier extends outside of screen"
-msgstr "Magnifier extends outside of screen"
+#| msgid "Magnifier extends outside of screen"
+msgid "Magnifier _extends outside of screen"
+msgstr "Magnifier _extends outside of screen"
 
 #: ../panels/universal-access/zoom-options.ui.h:12
-msgid "Keep magnifier cursor centered"
-msgstr "Keep magnifier cursor centred"
+#| msgid "Keep magnifier cursor centered"
+msgid "_Keep magnifier cursor centered"
+msgstr "_Keep magnifier cursor centered"
 
 #: ../panels/universal-access/zoom-options.ui.h:13
-msgid "Magnifier cursor pushes contents around"
-msgstr "Magnifier cursor pushes contents around"
+#| msgid "Magnifier cursor pushes contents around"
+msgid "Magnifier cursor _pushes contents around"
+msgstr "Magnifier cursor _pushes contents around"
 
 #: ../panels/universal-access/zoom-options.ui.h:14
-msgid "Magnifier cursor moves with contents"
-msgstr "Magnifier cursor moves with contents"
+#| msgid "Magnifier cursor moves with contents"
+msgid "Magnifier cursor moves with _contents"
+msgstr "Magnifier cursor moves with _contents"
 
 #: ../panels/universal-access/zoom-options.ui.h:15
 msgid "Magnifier Position:"
@@ -5803,8 +6135,9 @@ msgid "Magnifier"
 msgstr "Magnifier"
 
 #: ../panels/universal-access/zoom-options.ui.h:17
-msgid "Thickness:"
-msgstr "Thickness:"
+#| msgid "Thickness:"
+msgid "_Thickness:"
+msgstr "_Thickness:"
 
 #: ../panels/universal-access/zoom-options.ui.h:18
 msgctxt "universal access, thickness"
@@ -5817,43 +6150,50 @@ msgid "Thick"
 msgstr "Thick"
 
 #: ../panels/universal-access/zoom-options.ui.h:20
-msgid "Length:"
-msgstr "Length:"
+#| msgid "Length:"
+msgid "_Length:"
+msgstr "_Length:"
 
 #. The color of the accessibility crosshair
 #: ../panels/universal-access/zoom-options.ui.h:22
-msgid "Color:"
-msgstr "Colour:"
+#| msgid "Color:"
+msgid "Co_lor:"
+msgstr "Co_lour:"
 
 #: ../panels/universal-access/zoom-options.ui.h:23
-msgid "Crosshairs:"
-msgstr "Crosshairs:"
+#| msgid "Crosshairs:"
+msgid "_Crosshairs:"
+msgstr "_Crosshairs:"
 
 #: ../panels/universal-access/zoom-options.ui.h:24
-msgid "Overlaps mouse cursor"
-msgstr "Overlaps mouse cursor"
+#| msgid "Overlaps mouse cursor"
+msgid "_Overlaps mouse cursor"
+msgstr "_Overlaps mouse cursor"
 
 #: ../panels/universal-access/zoom-options.ui.h:25
 msgid "Crosshairs"
 msgstr "Crosshairs"
 
 #: ../panels/universal-access/zoom-options.ui.h:26
-msgid "White on black:"
-msgstr "White on black:"
+#| msgid "White on black:"
+msgid "_White on black:"
+msgstr "_White on black:"
 
 #: ../panels/universal-access/zoom-options.ui.h:27
-msgid "Brightness:"
-msgstr "Brightness:"
+#| msgid "Brightness:"
+msgid "_Brightness:"
+msgstr "_Brightness:"
 
 #: ../panels/universal-access/zoom-options.ui.h:28
-msgid "Contrast:"
-msgstr "Contrast:"
+#| msgid "Contrast:"
+msgid "_Contrast:"
+msgstr "_Contrast:"
 
 #. The contrast scale goes from Color to None (grayscale)
 #: ../panels/universal-access/zoom-options.ui.h:30
 msgctxt "universal access, contrast"
-msgid "Color"
-msgstr "Colour"
+msgid "Co_lor"
+msgstr "Co_lour"
 
 #: ../panels/universal-access/zoom-options.ui.h:31
 msgctxt "universal access, color"
@@ -5894,88 +6234,82 @@ msgid "Color Effects"
 msgstr "Colour Effects"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:1
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1
-#: ../panels/user-accounts/um-account-type.c:35
-msgctxt "Account type"
-msgid "Standard"
-msgstr "Standard"
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:2
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
-#: ../panels/user-accounts/um-account-type.c:37
-msgctxt "Account type"
-msgid "Administrator"
-msgstr "Administrator"
+#: ../panels/user-accounts/data/join-dialog.ui.h:1
+msgid "Add User"
+msgstr "Add User"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:4
+#: ../panels/user-accounts/data/account-dialog.ui.h:5
 msgid "_Full Name"
 msgstr "_Full Name"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:5
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
-msgid "Account _Type"
-msgstr "Account _Type"
+#: ../panels/user-accounts/data/account-dialog.ui.h:6
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
+#| msgctxt "Account type"
+#| msgid "Standard"
+msgid "Standard"
+msgstr "Standard"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:7
-#: ../panels/user-accounts/data/password-dialog.ui.h:4
-msgid "Allow user to set a password when they next login"
-msgstr "Allow user to set a password when they next log in"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
+#| msgctxt "Account type"
+#| msgid "Administrator"
+msgid "Administrator"
+msgstr "Administrator"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:8
-#: ../panels/user-accounts/data/password-dialog.ui.h:5
-msgid "Set a password now"
-msgstr "Set a password now"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
+msgid "Account _Type"
+msgstr "Account _Type"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:10
-msgid "_Verify"
-msgstr "_Verify"
+#| msgid "Allow user to set a password when they next login"
+msgid "Allow user to set a password when they next _login"
+msgstr "Allow user to set a password when they next _login"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:11
+#| msgid "Set a password now"
+msgid "Set a password _now"
+msgstr "Set a password _now"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:13
+#| msgid "_Configure..."
+msgid "_Confirm"
+msgstr "_Confirm"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:14
+#| msgid ""
+#| "Enterprise login allows an existing centrally managed user account to be "
+#| "used on this device."
 msgid ""
 "Enterprise login allows an existing centrally managed user account to be "
-"used on this device."
+"used on this device. You can also use this account to access company "
+"resources on the internet."
 msgstr ""
 "Enterprise login allows an existing centrally managed user account to be "
-"used on this device."
+"used on this device. You can also use this account to access company "
+"resources on the internet."
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:12
+#: ../panels/user-accounts/data/account-dialog.ui.h:15
+#: ../panels/user-accounts/data/join-dialog.ui.h:9
 msgid "_Domain"
 msgstr "_Domain"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:13
-msgid ""
-"Go online to add\n"
-"enterprise login accounts."
-msgstr ""
-"Go online to add\n"
-"enterprise login accounts."
-
-#. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
 #: ../panels/user-accounts/data/account-dialog.ui.h:16
-msgid "_Enroll"
-msgstr "_Enroll"
+#| msgctxt "printer state"
+#| msgid "Offline"
+msgid "You are Offline"
+msgstr "You are Offline"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:17
-msgid "Domain Administrator Login"
-msgstr "Domain Administrator Login"
+#| msgid ""
+#| "Go online to add\n"
+#| "enterprise login accounts."
+msgid "You must be online in order to add enterprise users."
+msgstr "You must be online in order to add enterprise users."
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:18
-msgid ""
-"In order to use enterprise logins, this computer needs to be\n"
-"enrolled in the domain. Please have your network administrator\n"
-"type their domain password here."
-msgstr ""
-"In order to use enterprise logins, this computer needs to be\n"
-"enrolled in the domain. Please have your network administrator\n"
-"type their domain password here."
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:21
-msgid "Administrator _Name"
-msgstr "Administrator _Name"
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:22
-msgid "Administrator Password"
-msgstr "Administrator Password"
+msgid "_Enterprise Login"
+msgstr "_Enterprise Login"
 
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:1
 msgid "Left thumb"
@@ -6010,7 +6344,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:699
+#: ../panels/user-accounts/um-fingerprint-dialog.c:687
 msgid "Enable Fingerprint Login"
 msgstr "Enable Fingerprint Login"
 
@@ -6047,90 +6381,81 @@ msgstr "Add or remove users and change your password"
 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/password-dialog.ui.h:1
-msgid "_Verify New Password"
-msgstr "_Verify New Password"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:2
-msgid "_New Password"
-msgstr "_New Password"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:3
-msgid "Current _Password"
-msgstr "Current _Password"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:6
-msgid "Ch_ange"
-msgstr "Ch_ange"
+#. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
+#: ../panels/user-accounts/data/join-dialog.ui.h:4
+msgid "_Enroll"
+msgstr "_Enroll"
 
-#: ../panels/user-accounts/data/photo-dialog.ui.h:1
-msgid "Changing photo for:"
-msgstr "Changing photo for:"
+#: ../panels/user-accounts/data/join-dialog.ui.h:5
+msgid "Domain Administrator Login"
+msgstr "Domain Administrator Login"
 
-#: ../panels/user-accounts/data/photo-dialog.ui.h:2
+#: ../panels/user-accounts/data/join-dialog.ui.h:6
 msgid ""
-"Choose a picture that will be shown at the login screen for this account."
+"In order to use enterprise logins, this computer needs to be\n"
+"enrolled in the domain. Please have your network administrator\n"
+"type their domain password here."
 msgstr ""
-"Choose a picture that will be shown at the login screen for this account."
+"In order to use enterprise logins, this computer needs to be\n"
+"enrolled in the domain. Please have your network administrator\n"
+"type their domain password here."
 
-#: ../panels/user-accounts/data/photo-dialog.ui.h:3
-msgid "Gallery"
-msgstr "Gallery"
+#: ../panels/user-accounts/data/join-dialog.ui.h:10
+msgid "Administrator _Name"
+msgstr "Administrator _Name"
 
-#: ../panels/user-accounts/data/photo-dialog.ui.h:4
-#: ../panels/user-accounts/um-photo-dialog.c:218
-msgid "Browse for more pictures"
-msgstr "Browse for more pictures"
+#: ../panels/user-accounts/data/join-dialog.ui.h:11
+msgid "Administrator Password"
+msgstr "Administrator Password"
 
-#: ../panels/user-accounts/data/photo-dialog.ui.h:5
-msgid "Take a photograph"
-msgstr "Take a photograph"
+#: ../panels/user-accounts/data/password-dialog.ui.h:1
+#| msgid "Change pa_ssword"
+msgid "Change Password"
+msgstr "Change Password"
 
-#: ../panels/user-accounts/data/photo-dialog.ui.h:6
-msgid "Browse"
-msgstr "Browse"
+#: ../panels/user-accounts/data/password-dialog.ui.h:3
+msgid "Ch_ange"
+msgstr "Ch_ange"
 
-#: ../panels/user-accounts/data/photo-dialog.ui.h:7
-msgid "Photograph"
-msgstr "Photograph"
+#: ../panels/user-accounts/data/password-dialog.ui.h:4
+msgid "_Verify New Password"
+msgstr "_Verify New Password"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
-msgid "Account Information"
-msgstr "Account Information"
+#: ../panels/user-accounts/data/password-dialog.ui.h:5
+msgid "_New Password"
+msgstr "_New Password"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
-msgid "Add User Account"
-msgstr "Add User Account"
+#: ../panels/user-accounts/data/password-dialog.ui.h:6
+msgid "Current _Password"
+msgstr "Current _Password"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
-msgid "Remove User Account"
-msgstr "Remove User Account"
+#: ../panels/user-accounts/data/password-dialog.ui.h:7
+#| msgid "Allow user to set a password when they next login"
+msgid "Allow user to change their password on next login"
+msgstr "Allow user to change their password on next login"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
-msgid "Login Options"
-msgstr "Login Options"
+#: ../panels/user-accounts/data/password-dialog.ui.h:8
+msgid "Set a password now"
+msgstr "Set a password now"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1
+#| msgid "Add User"
+msgid "_Add User…"
+msgstr "_Add User…"
+
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
 msgid "A_utomatic Login"
 msgstr "A_utomatic Login"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
 msgid "_Fingerprint Login"
 msgstr "_Fingerprint Login"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
 msgid "User Icon"
 msgstr "User Icon"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
-msgid "_Language"
-msgstr "_Language"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
 msgid "Last Login"
 msgstr "Last Login"
 
@@ -6142,77 +6467,77 @@ msgstr "Manage user accounts"
 msgid "Authentication is required to change user data"
 msgstr "Authentication is required to change user data"
 
-#: ../panels/user-accounts/pw-utils.c:82
+#: ../panels/user-accounts/pw-utils.c:81
 msgctxt "Password hint"
 msgid "The new password needs to be different from the old one."
 msgstr "The new password needs to be different from the old one."
 
-#: ../panels/user-accounts/pw-utils.c:84
+#: ../panels/user-accounts/pw-utils.c:83
 msgctxt "Password hint"
 msgid "Try changing some letters and numbers."
 msgstr "Try changing some letters and numbers."
 
-#: ../panels/user-accounts/pw-utils.c:86 ../panels/user-accounts/pw-utils.c:94
+#: ../panels/user-accounts/pw-utils.c:85 ../panels/user-accounts/pw-utils.c:93
 msgctxt "Password hint"
 msgid "Try changing the password a bit more."
 msgstr "Try changing the password a bit more."
 
-#: ../panels/user-accounts/pw-utils.c:88
+#: ../panels/user-accounts/pw-utils.c:87
 msgctxt "Password hint"
 msgid "A password without your user name would be stronger."
 msgstr "A password without your username would be stronger."
 
-#: ../panels/user-accounts/pw-utils.c:90
+#: ../panels/user-accounts/pw-utils.c:89
 msgctxt "Password hint"
 msgid "Try to avoid using your name in the password."
 msgstr "Try to avoid using your name in the password."
 
-#: ../panels/user-accounts/pw-utils.c:92
+#: ../panels/user-accounts/pw-utils.c:91
 msgctxt "Password hint"
 msgid "Try to avoid some of the words included in the password."
 msgstr "Try to avoid some of the words included in the password."
 
-#: ../panels/user-accounts/pw-utils.c:96
+#: ../panels/user-accounts/pw-utils.c:95
 msgctxt "Password hint"
 msgid "Try to avoid common words."
 msgstr "Try to avoid common words."
 
-#: ../panels/user-accounts/pw-utils.c:98
+#: ../panels/user-accounts/pw-utils.c:97
 msgctxt "Password hint"
 msgid "Try to avoid reordering existing words."
 msgstr "Try to avoid reordering existing words."
 
-#: ../panels/user-accounts/pw-utils.c:100
+#: ../panels/user-accounts/pw-utils.c:99
 msgctxt "Password hint"
 msgid "Try to use more numbers."
 msgstr "Try to use more numbers."
 
-#: ../panels/user-accounts/pw-utils.c:102
+#: ../panels/user-accounts/pw-utils.c:101
 msgctxt "Password hint"
 msgid "Try to use more uppercase letters."
 msgstr "Try to use more uppercase letters."
 
-#: ../panels/user-accounts/pw-utils.c:104
+#: ../panels/user-accounts/pw-utils.c:103
 msgctxt "Password hint"
 msgid "Try to use more lowercase letters."
 msgstr "Try to use more lowercase letters."
 
-#: ../panels/user-accounts/pw-utils.c:106
+#: ../panels/user-accounts/pw-utils.c:105
 msgctxt "Password hint"
 msgid "Try to use more special characters, like punctuation."
 msgstr "Try to use more special characters, like punctuation."
 
-#: ../panels/user-accounts/pw-utils.c:108
+#: ../panels/user-accounts/pw-utils.c:107
 msgctxt "Password hint"
 msgid "Try to use a mixture of letters, numbers and punctuation."
 msgstr "Try to use a mixture of letters, numbers and punctuation."
 
-#: ../panels/user-accounts/pw-utils.c:110
+#: ../panels/user-accounts/pw-utils.c:109
 msgctxt "Password hint"
 msgid "Try to avoid repeating the same character."
 msgstr "Try to avoid repeating the same character."
 
-#: ../panels/user-accounts/pw-utils.c:112
+#: ../panels/user-accounts/pw-utils.c:111
 msgctxt "Password hint"
 msgid ""
 "Try to avoid repeating the same type of character: you need to mix up "
@@ -6221,22 +6546,24 @@ msgstr ""
 "Try to avoid repeating the same type of character: you need to mix up "
 "letters, numbers and punctuation."
 
-#: ../panels/user-accounts/pw-utils.c:114
+#: ../panels/user-accounts/pw-utils.c:113
 msgctxt "Password hint"
 msgid "Try to avoid sequences like 1234 or abcd."
 msgstr "Try to avoid sequences like 1234 or abcd."
 
-#: ../panels/user-accounts/pw-utils.c:116
+#: ../panels/user-accounts/pw-utils.c:115
 msgctxt "Password hint"
 msgid "Try to add more letters, numbers and symbols."
 msgstr "Try to add more letters, numbers and symbols."
 
-#: ../panels/user-accounts/pw-utils.c:118
+#: ../panels/user-accounts/pw-utils.c:117
+#| msgctxt "Password hint"
+#| msgid "Mix uppercase and lowercase and use a number or two."
 msgctxt "Password hint"
-msgid "Mix uppercase and lowercase and use a number or two."
-msgstr "Mix uppercase and lowercase and use a number or two."
+msgid "Mix uppercase and lowercase and try to use a number or two."
+msgstr "Mix uppercase and lowercase and try to use a number or two."
 
-#: ../panels/user-accounts/pw-utils.c:120
+#: ../panels/user-accounts/pw-utils.c:119
 msgctxt "Password hint"
 msgid ""
 "Good password! Adding more letters, numbers and punctuation will make it "
@@ -6245,115 +6572,113 @@ msgstr ""
 "Good password! Adding more letters, numbers and punctuation will make it "
 "stronger."
 
-#: ../panels/user-accounts/pw-utils.c:142
-#: ../panels/user-accounts/pw-utils.c:172
+#: ../panels/user-accounts/pw-utils.c:141
+#: ../panels/user-accounts/pw-utils.c:171
 msgctxt "Password strength"
 msgid "Strength: Weak"
 msgstr "Strength: Weak"
 
-#: ../panels/user-accounts/pw-utils.c:146
-#: ../panels/user-accounts/pw-utils.c:173
+#: ../panels/user-accounts/pw-utils.c:145
+#: ../panels/user-accounts/pw-utils.c:172
 msgctxt "Password strength"
 msgid "Strength: Low"
 msgstr "Strength: Low"
 
-#: ../panels/user-accounts/pw-utils.c:149
-#: ../panels/user-accounts/pw-utils.c:174
+#: ../panels/user-accounts/pw-utils.c:148
+#: ../panels/user-accounts/pw-utils.c:173
 msgctxt "Password strength"
 msgid "Strength: Medium"
 msgstr "Strength: Medium"
 
-#: ../panels/user-accounts/pw-utils.c:152
-#: ../panels/user-accounts/pw-utils.c:175
+#: ../panels/user-accounts/pw-utils.c:151
+#: ../panels/user-accounts/pw-utils.c:174
 msgctxt "Password strength"
 msgid "Strength: Good"
 msgstr "Strength: Good"
 
-#: ../panels/user-accounts/pw-utils.c:155
-#: ../panels/user-accounts/pw-utils.c:176
+#: ../panels/user-accounts/pw-utils.c:154
+#: ../panels/user-accounts/pw-utils.c:175
 msgctxt "Password strength"
 msgid "Strength: High"
 msgstr "Strength: High"
 
-#: ../panels/user-accounts/run-passwd.c:424
+#: ../panels/user-accounts/run-passwd.c:422
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
-#: ../panels/user-accounts/run-passwd.c:504
+#: ../panels/user-accounts/run-passwd.c:502
 #, c-format
 msgid "The new password is too short"
 msgstr "The new password is too short"
 
-#: ../panels/user-accounts/run-passwd.c:510
+#: ../panels/user-accounts/run-passwd.c:508
 #, c-format
 msgid "The new password is too simple"
 msgstr "The new password is too simple"
 
-#: ../panels/user-accounts/run-passwd.c:516
+#: ../panels/user-accounts/run-passwd.c:514
 #, c-format
 msgid "The old and new passwords are too similar"
 msgstr "The old and new passwords are too similar"
 
-#: ../panels/user-accounts/run-passwd.c:519
+#: ../panels/user-accounts/run-passwd.c:517
 #, c-format
 msgid "The new password has already been used recently."
 msgstr "The new password has already been used recently."
 
-#: ../panels/user-accounts/run-passwd.c:522
+#: ../panels/user-accounts/run-passwd.c:520
 #, c-format
 msgid "The new password must contain numeric or special characters"
 msgstr "The new password must contain numeric or special characters"
 
-#: ../panels/user-accounts/run-passwd.c:526
+#: ../panels/user-accounts/run-passwd.c:524
 #, c-format
 msgid "The old and new passwords are the same"
 msgstr "The old and new passwords are the same"
 
-#: ../panels/user-accounts/run-passwd.c:530
+#: ../panels/user-accounts/run-passwd.c:528
 #, c-format
 msgid "Your password has been changed since you initially authenticated!"
 msgstr "Your password has been changed since you initially authenticated!"
 
-#: ../panels/user-accounts/run-passwd.c:534
+#: ../panels/user-accounts/run-passwd.c:532
 #, c-format
 msgid "The new password does not contain enough different characters"
 msgstr "The new password does not contain enough different characters"
 
-#: ../panels/user-accounts/run-passwd.c:538
+#: ../panels/user-accounts/run-passwd.c:536
 #, c-format
 msgid "Unknown error"
 msgstr "Unknown error"
 
-#: ../panels/user-accounts/um-account-dialog.c:35
-msgid "Should match the web address of your account provider."
-msgstr "Should match the web address of your account provider."
+#: ../panels/user-accounts/um-account-dialog.c:34
+#| msgid "Should match the web address of your account provider."
+msgid "Should match the web address of your login provider."
+msgstr "Should match the web address of your login provider."
 
-#: ../panels/user-accounts/um-account-dialog.c:222
+#: ../panels/user-accounts/um-account-dialog.c:228
 msgid "Failed to add account"
 msgstr "Failed to add account"
 
-#: ../panels/user-accounts/um-account-dialog.c:316
-msgid "This will be used to name your home folder and can't be changed."
-msgstr "This will be used to name your home folder and can’t be changed."
-
-#: ../panels/user-accounts/um-account-dialog.c:449
+#: ../panels/user-accounts/um-account-dialog.c:448
 msgid "Passwords do not match."
 msgstr "Passwords do not match."
 
-#: ../panels/user-accounts/um-account-dialog.c:719
-#: ../panels/user-accounts/um-account-dialog.c:765
+#: ../panels/user-accounts/um-account-dialog.c:702
+#: ../panels/user-accounts/um-account-dialog.c:748
+#: ../panels/user-accounts/um-account-dialog.c:769
 msgid "Failed to register account"
 msgstr "Failed to register account"
 
-#: ../panels/user-accounts/um-account-dialog.c:903
+#: ../panels/user-accounts/um-account-dialog.c:892
 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:962
+#: ../panels/user-accounts/um-account-dialog.c:965
 msgid "Failed to join domain"
 msgstr "Failed to join domain"
 
-#: ../panels/user-accounts/um-account-dialog.c:1023
+#: ../panels/user-accounts/um-account-dialog.c:1026
 msgid ""
 "That login name didn't work.\n"
 "Please try again."
@@ -6361,7 +6686,7 @@ msgstr ""
 "That login name didn’t work.\n"
 "Please try again."
 
-#: ../panels/user-accounts/um-account-dialog.c:1030
+#: ../panels/user-accounts/um-account-dialog.c:1033
 msgid ""
 "That login password didn't work.\n"
 "Please try again."
@@ -6369,51 +6694,51 @@ msgstr ""
 "That login password didn’t work.\n"
 "Please try again."
 
-#: ../panels/user-accounts/um-account-dialog.c:1038
+#: ../panels/user-accounts/um-account-dialog.c:1041
 msgid "Failed to log into domain"
 msgstr "Failed to log into domain"
 
-#: ../panels/user-accounts/um-account-dialog.c:1096
+#: ../panels/user-accounts/um-account-dialog.c:1099
 msgid "Unable find the domain. Maybe you misspelled it?"
 msgstr "Unable find the domain. Maybe you misspelled it?"
 
-#: ../panels/user-accounts/um-account-dialog.c:1446
-msgid "Add User"
-msgstr "Add User"
+#: ../panels/user-accounts/um-account-type.c:34
+msgctxt "Account type"
+msgid "Standard"
+msgstr "Standard"
 
-#. Create enterprise toggle button.
-#: ../panels/user-accounts/um-account-dialog.c:1459
-msgid "_Enterprise Login"
-msgstr "_Enterprise Login"
+#: ../panels/user-accounts/um-account-type.c:36
+msgctxt "Account type"
+msgid "Administrator"
+msgstr "Administrator"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:139
+#: ../panels/user-accounts/um-fingerprint-dialog.c:138
 msgid ""
 "You are not allowed to access the device. Contact your system administrator."
 msgstr ""
 "You are not allowed to access the device. Contact your system administrator."
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:141
+#: ../panels/user-accounts/um-fingerprint-dialog.c:140
 msgid "The device is already in use."
 msgstr "The device is already in use."
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:143
+#: ../panels/user-accounts/um-fingerprint-dialog.c:142
 msgid "An internal error occurred."
 msgstr "An internal error occurred."
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:219
-#: ../panels/user-accounts/um-fingerprint-dialog.c:220
+#: ../panels/user-accounts/um-fingerprint-dialog.c:216
 msgid "Enabled"
 msgstr "Enabled"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:268
+#: ../panels/user-accounts/um-fingerprint-dialog.c:264
 msgid "Delete registered fingerprints?"
 msgstr "Delete registered fingerprints?"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:272
+#: ../panels/user-accounts/um-fingerprint-dialog.c:268
 msgid "_Delete Fingerprints"
 msgstr "_Delete Fingerprints"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:278
+#: ../panels/user-accounts/um-fingerprint-dialog.c:274
 msgid ""
 "Do you want to delete your registered fingerprints so fingerprint login is "
 "disabled?"
@@ -6421,15 +6746,15 @@ msgstr ""
 "Do you want to delete your registered fingerprints so fingerprint login is "
 "disabled?"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:454
+#: ../panels/user-accounts/um-fingerprint-dialog.c:444
 msgid "Done!"
 msgstr "Done!"
 
 #. 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:515
-#: ../panels/user-accounts/um-fingerprint-dialog.c:557
+#: ../panels/user-accounts/um-fingerprint-dialog.c:505
+#: ../panels/user-accounts/um-fingerprint-dialog.c:547
 #, c-format
 msgid "Could not access '%s' device"
 msgstr "Could not access ‘%s’ device"
@@ -6437,16 +6762,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:598
+#: ../panels/user-accounts/um-fingerprint-dialog.c:588
 #, 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:649
+#: ../panels/user-accounts/um-fingerprint-dialog.c:638
 msgid "Could not access any fingerprint readers"
 msgstr "Could not access any fingerprint readers"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:650
+#: ../panels/user-accounts/um-fingerprint-dialog.c:639
 msgid "Please contact your system administrator for help."
 msgstr "Please contact your system administrator for help."
 
@@ -6455,7 +6780,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:733
+#: ../panels/user-accounts/um-fingerprint-dialog.c:721
 #, c-format
 msgid ""
 "To enable fingerprint login, you need to save one of your fingerprints, "
@@ -6464,19 +6789,19 @@ msgstr ""
 "To enable fingerprint login, you need to save one of your fingerprints, "
 "using the ‘%s’ device."
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:740
+#: ../panels/user-accounts/um-fingerprint-dialog.c:728
 msgid "Selecting finger"
 msgstr "Selecting finger"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:741
+#: ../panels/user-accounts/um-fingerprint-dialog.c:729
 msgid "Enrolling fingerprints"
 msgstr "Enrolling fingerprints"
 
-#: ../panels/user-accounts/um-history-dialog.c:88
+#: ../panels/user-accounts/um-history-dialog.c:70
 msgid "This Week"
 msgstr "This Week"
 
-#: ../panels/user-accounts/um-history-dialog.c:91
+#: ../panels/user-accounts/um-history-dialog.c:73
 msgid "Last Week"
 msgstr "Last Week"
 
@@ -6484,22 +6809,22 @@ msgstr "Last Week"
 #. shown as the first day of a week on login history dialog.
 #. Translators: This is a date format string in the style of "Feb 24",
 #. shown as the last day of a week on login history dialog.
-#: ../panels/user-accounts/um-history-dialog.c:97
-#: ../panels/user-accounts/um-history-dialog.c:101
+#: ../panels/user-accounts/um-history-dialog.c:79
+#: ../panels/user-accounts/um-history-dialog.c:83
 msgctxt "login history week label"
 msgid "%b %e"
 msgstr "%e %b"
 
 #. Translators: This is a date format string in the style of "Feb 24, 2013",
 #. shown as the last day of a week on login history dialog.
-#: ../panels/user-accounts/um-history-dialog.c:106
+#: ../panels/user-accounts/um-history-dialog.c:88
 msgctxt "login history week label"
 msgid "%b %e, %Y"
 msgstr "%e %b, %Y"
 
 #. Translators: This indicates a week label on a login history.
 #. The first %s is the first day of a week, and the second %s the last day.
-#: ../panels/user-accounts/um-history-dialog.c:111
+#: ../panels/user-accounts/um-history-dialog.c:93
 #, c-format
 msgctxt "login history week label"
 msgid "%s - %s"
@@ -6507,104 +6832,122 @@ msgstr "%s–%s"
 
 #. Translators: This is a time format string in the style of "22:58".
 #. It indicates a login time which follows a date.
-#: ../panels/user-accounts/um-history-dialog.c:195
-#: ../panels/user-accounts/um-user-panel.c:626
+#: ../panels/user-accounts/um-history-dialog.c:177
+#: ../panels/user-accounts/um-user-panel.c:841
 msgctxt "login date-time"
 msgid "%k:%M"
 msgstr "%k:%M"
 
 #. Translators: This indicates a login date-time.
 #. The first %s is a date, and the second %s a time.
-#: ../panels/user-accounts/um-history-dialog.c:198
-#: ../panels/user-accounts/um-user-panel.c:630
+#: ../panels/user-accounts/um-history-dialog.c:180
+#: ../panels/user-accounts/um-user-panel.c:845
 #, c-format
 msgctxt "login date-time"
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../panels/user-accounts/um-history-dialog.c:260
+#: ../panels/user-accounts/um-history-dialog.c:250
 msgid "Session Ended"
 msgstr "Session Ended"
 
-#: ../panels/user-accounts/um-history-dialog.c:266
+#: ../panels/user-accounts/um-history-dialog.c:256
 msgid "Session Started"
 msgstr "Session Started"
 
-#: ../panels/user-accounts/um-password-dialog.c:146
+#. Translators: This is the title of the "Account Activity" dialog.
+#. The %s is the user real name.
+#: ../panels/user-accounts/um-history-dialog.c:299
+#, c-format
+msgid "%s - Account Activity"
+msgstr "%s - Account Activity"
+
+#: ../panels/user-accounts/um-password-dialog.c:145
 msgid "Please choose another password."
 msgstr "Please choose another password."
 
-#: ../panels/user-accounts/um-password-dialog.c:155
+#: ../panels/user-accounts/um-password-dialog.c:154
 msgid "Please type your current password again."
 msgstr "Please type your current password again."
 
-#: ../panels/user-accounts/um-password-dialog.c:161
+#: ../panels/user-accounts/um-password-dialog.c:160
 msgid "Password could not be changed"
 msgstr "Password could not be changed"
 
-#: ../panels/user-accounts/um-password-dialog.c:287
+#: ../panels/user-accounts/um-password-dialog.c:286
 msgid "The passwords do not match."
 msgstr "The passwords do not match."
 
-#: ../panels/user-accounts/um-photo-dialog.c:443
+#: ../panels/user-accounts/um-photo-dialog.c:214
+msgid "Browse for more pictures"
+msgstr "Browse for more pictures"
+
+#: ../panels/user-accounts/um-photo-dialog.c:448
 msgid "Disable image"
 msgstr "Disable image"
 
-#: ../panels/user-accounts/um-photo-dialog.c:461
+#: ../panels/user-accounts/um-photo-dialog.c:466
 msgid "Take a photo…"
 msgstr "Take a photo…"
 
-#: ../panels/user-accounts/um-photo-dialog.c:479
+#: ../panels/user-accounts/um-photo-dialog.c:484
 msgid "Browse for more pictures…"
 msgstr "Browse for more pictures…"
 
-#: ../panels/user-accounts/um-photo-dialog.c:703
+#: ../panels/user-accounts/um-photo-dialog.c:708
 #, c-format
 msgid "Used by %s"
 msgstr "Used by %s"
 
-#: ../panels/user-accounts/um-realm-manager.c:351
+#: ../panels/user-accounts/um-realm-manager.c:350
 msgid "Cannot automatically join this type of domain"
 msgstr "Cannot automatically join this type of domain"
 
-#: ../panels/user-accounts/um-realm-manager.c:414
+#: ../panels/user-accounts/um-realm-manager.c:413
 #, c-format
 msgid "No such domain or realm found"
 msgstr "No such domain or realm found"
 
-#: ../panels/user-accounts/um-realm-manager.c:814
-#: ../panels/user-accounts/um-realm-manager.c:828
+#: ../panels/user-accounts/um-realm-manager.c:815
+#: ../panels/user-accounts/um-realm-manager.c:829
 #, 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:820
+#: ../panels/user-accounts/um-realm-manager.c:821
 msgid "Invalid password, please try again"
 msgstr "Invalid password, please try again"
 
-#: ../panels/user-accounts/um-realm-manager.c:833
+#: ../panels/user-accounts/um-realm-manager.c:834
 #, 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-panel.c:193
+#: ../panels/user-accounts/um-user-panel.c:239
 msgid "Other Accounts"
 msgstr "Other Accounts"
 
-#: ../panels/user-accounts/um-user-panel.c:412
+#: ../panels/user-accounts/um-user-panel.c:447
 msgid "Failed to delete user"
 msgstr "Failed to delete user"
 
-#: ../panels/user-accounts/um-user-panel.c:477
+#: ../panels/user-accounts/um-user-panel.c:507
+#: ../panels/user-accounts/um-user-panel.c:566
+#: ../panels/user-accounts/um-user-panel.c:618
+#| msgid "Failed to delete user"
+msgid "Failed to revoke remotely managed user"
+msgstr "Failed to revoke remotely managed user"
+
+#: ../panels/user-accounts/um-user-panel.c:674
 msgid "You cannot delete your own account."
 msgstr "You cannot delete your own account."
 
-#: ../panels/user-accounts/um-user-panel.c:486
+#: ../panels/user-accounts/um-user-panel.c:683
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s is still logged in"
 
-#: ../panels/user-accounts/um-user-panel.c:490
+#: ../panels/user-accounts/um-user-panel.c:687
 msgid ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
@@ -6612,12 +6955,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:499
+#: ../panels/user-accounts/um-user-panel.c:696
 #, 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:503
+#: ../panels/user-accounts/um-user-panel.c:700
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
@@ -6625,42 +6968,53 @@ 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:506
+#: ../panels/user-accounts/um-user-panel.c:703
 msgid "_Delete Files"
 msgstr "_Delete Files"
 
-#: ../panels/user-accounts/um-user-panel.c:507
+#: ../panels/user-accounts/um-user-panel.c:704
 msgid "_Keep Files"
 msgstr "_Keep Files"
 
-#: ../panels/user-accounts/um-user-panel.c:559
+#: ../panels/user-accounts/um-user-panel.c:718
+#, c-format
+#| msgid "Are you sure you want to remove the account?"
+msgid "Are you sure you want to revoke remotely managed %s's account?"
+msgstr "Are you sure you want to revoke remotely managed %s's account?"
+
+#: ../panels/user-accounts/um-user-panel.c:722
+#| msgid "Delete"
+msgid "_Delete"
+msgstr "_Delete"
+
+#: ../panels/user-accounts/um-user-panel.c:774
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "Account disabled"
 
-#: ../panels/user-accounts/um-user-panel.c:567
+#: ../panels/user-accounts/um-user-panel.c:782
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "To be set at next login"
 
-#: ../panels/user-accounts/um-user-panel.c:570
+#: ../panels/user-accounts/um-user-panel.c:785
 msgctxt "Password mode"
 msgid "None"
 msgstr "None"
 
-#: ../panels/user-accounts/um-user-panel.c:619
+#: ../panels/user-accounts/um-user-panel.c:834
 msgid "Logged in"
 msgstr "Logged in"
 
-#: ../panels/user-accounts/um-user-panel.c:999
+#: ../panels/user-accounts/um-user-panel.c:1290
 msgid "Failed to contact the accounts service"
 msgstr "Failed to contact the accounts service"
 
-#: ../panels/user-accounts/um-user-panel.c:1001
+#: ../panels/user-accounts/um-user-panel.c:1292
 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:1042
+#: ../panels/user-accounts/um-user-panel.c:1334
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -6668,12 +7022,12 @@ msgstr ""
 "To make changes,\n"
 "click the * icon first"
 
-#: ../panels/user-accounts/um-user-panel.c:1080
+#: ../panels/user-accounts/um-user-panel.c:1374
 msgid "Create a user account"
 msgstr "Create a user account"
 
-#: ../panels/user-accounts/um-user-panel.c:1091
-#: ../panels/user-accounts/um-user-panel.c:1380
+#: ../panels/user-accounts/um-user-panel.c:1385
+#: ../panels/user-accounts/um-user-panel.c:1677
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -6681,12 +7035,12 @@ msgstr ""
 "To create a user account,\n"
 "click the * icon first"
 
-#: ../panels/user-accounts/um-user-panel.c:1101
+#: ../panels/user-accounts/um-user-panel.c:1395
 msgid "Delete the selected user account"
 msgstr "Delete the selected user account"
 
-#: ../panels/user-accounts/um-user-panel.c:1113
-#: ../panels/user-accounts/um-user-panel.c:1385
+#: ../panels/user-accounts/um-user-panel.c:1407
+#: ../panels/user-accounts/um-user-panel.c:1682
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -6694,51 +7048,49 @@ msgstr ""
 "To delete the selected user account,\n"
 "click the * icon first"
 
-#: ../panels/user-accounts/um-user-panel.c:1295
+#: ../panels/user-accounts/um-user-panel.c:1591
 msgid "My Account"
 msgstr "My Account"
 
-#: ../panels/user-accounts/um-utils.c:551
-#, 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:563
+msgid "Sorry, that user name isn't available. Please try another."
+msgstr "Sorry, that user name isn't available. Please try another."
 
-#: ../panels/user-accounts/um-utils.c:555
+#: ../panels/user-accounts/um-utils.c:566
 #, c-format
-msgid "The username is too long"
-msgstr "The username is too long"
-
-#: ../panels/user-accounts/um-utils.c:558
-msgid "The username cannot start with a '-'"
-msgstr "The username cannot start with a ‘-’"
-
-#: ../panels/user-accounts/um-utils.c:561
+#| msgid "The username is too long"
+msgid "The username is too long."
+msgstr "The username is too long."
+
+#: ../panels/user-accounts/um-utils.c:569
+#| msgid "The username cannot start with a '-'"
+msgid "The username cannot start with a '-'."
+msgstr "The username cannot start with a '-'."
+
+#: ../panels/user-accounts/um-utils.c:572
+#| msgid ""
+#| "The username should only consist of lower and upper case letters from a-"
+#| "z, digits and any of characters '.', '-' and '_'"
 msgid ""
-"The username should only consist of lower and upper case letters from a-z, "
-"digits and any of characters '.', '-' and '_'"
+"The username should only consist of upper and lower case letters from a-z, "
+"digits and the following characters: . - _"
 msgstr ""
-"The username should only consist of lower- and uppercase letters from a–z, "
-"digits and any of the characters ‘.’, ‘-’ and ‘_’."
-
-#. Translators: This is a date format string in the style of "Feb 24".
-#: ../panels/user-accounts/um-utils.c:811
-msgid "%b %e"
-msgstr "%e %b"
+"The username should only consist of upper and lower case letters from a-z, "
+"digits and the following characters: . - _"
 
-#. Translators: This is a date format string in the style of "Feb 24, 2013".
-#: ../panels/user-accounts/um-utils.c:815
-msgid "%b %e, %Y"
-msgstr "%e %b, %Y"
+#: ../panels/user-accounts/um-utils.c:576
+msgid "This will be used to name your home folder and can't be changed."
+msgstr "This will be used to name your home folder and can’t be changed."
 
 #: ../panels/wacom/button-mapping.ui.h:1
 msgid "Map Buttons"
 msgstr "Map Buttons"
 
-#: ../panels/wacom/button-mapping.ui.h:2
+#: ../panels/wacom/button-mapping.ui.h:3
 msgid "Map buttons to functions"
 msgstr "Map buttons to functions"
 
-#: ../panels/wacom/button-mapping.ui.h:3
+#: ../panels/wacom/button-mapping.ui.h:4
 msgid ""
 "To edit a shortcut, choose the \"Send Keystroke\" action, press the keyboard "
 "shortcut button and hold down the new keys or press Backspace to clear."
@@ -6746,7 +7098,7 @@ msgstr ""
 "To edit a shortcut, choose the ‘Send Keystroke’ action, press the keyboard "
 "shortcut button and hold down the new keys or press Backspace to clear."
 
-#: ../panels/wacom/calibrator/calibrator-gui.c:82
+#: ../panels/wacom/calibrator/calibrator-gui.c:83
 msgid ""
 "Please tap the target markers as they appear on screen to calibrate the "
 "tablet."
@@ -6754,55 +7106,55 @@ msgstr ""
 "Please tap the target markers as they appear on screen to calibrate the "
 "tablet."
 
-#: ../panels/wacom/calibrator/calibrator-gui.c:86
+#: ../panels/wacom/calibrator/calibrator-gui.c:87
 msgid "Mis-click detected, restarting..."
 msgstr "Mis-click detected, restarting…"
 
-#: ../panels/wacom/cc-wacom-button-row.c:443
+#: ../panels/wacom/cc-wacom-button-row.c:442
 msgctxt "Wacom tablet button"
 msgid "Up"
 msgstr "Up"
 
-#: ../panels/wacom/cc-wacom-button-row.c:444
+#: ../panels/wacom/cc-wacom-button-row.c:443
 msgctxt "Wacom tablet button"
 msgid "Down"
 msgstr "Down"
 
-#: ../panels/wacom/cc-wacom-button-row.h:55
+#: ../panels/wacom/cc-wacom-button-row.h:54
 msgctxt "Wacom action-type"
 msgid "None"
 msgstr "None"
 
-#: ../panels/wacom/cc-wacom-button-row.h:56
+#: ../panels/wacom/cc-wacom-button-row.h:55
 msgctxt "Wacom action-type"
 msgid "Send Keystroke"
 msgstr "Send Keystroke"
 
-#: ../panels/wacom/cc-wacom-button-row.h:57
+#: ../panels/wacom/cc-wacom-button-row.h:56
 msgctxt "Wacom action-type"
 msgid "Switch Monitor"
 msgstr "Switch Monitor"
 
-#: ../panels/wacom/cc-wacom-button-row.h:58
+#: ../panels/wacom/cc-wacom-button-row.h:57
 msgctxt "Wacom action-type"
 msgid "Show On-Screen Help"
 msgstr "Show On-Screen Help"
 
-#: ../panels/wacom/cc-wacom-mapping-panel.c:264
+#: ../panels/wacom/cc-wacom-mapping-panel.c:263
 msgid "Output:"
 msgstr "Output:"
 
 #. Keep ratio switch
-#: ../panels/wacom/cc-wacom-mapping-panel.c:276
+#: ../panels/wacom/cc-wacom-mapping-panel.c:275
 msgid "Keep aspect ratio (letterbox):"
 msgstr "Keep aspect ratio (letterbox):"
 
 #. Whole-desktop checkbox
-#: ../panels/wacom/cc-wacom-mapping-panel.c:287
+#: ../panels/wacom/cc-wacom-mapping-panel.c:286
 msgid "Map to single monitor"
 msgstr "Map to single monitor"
 
-#: ../panels/wacom/cc-wacom-nav-button.c:89
+#: ../panels/wacom/cc-wacom-nav-button.c:88
 #, c-format
 msgid "%d of %d"
 msgstr "%d of %d"
@@ -6811,21 +7163,22 @@ msgstr "%d of %d"
 msgid "Display Mapping"
 msgstr "Display Mapping"
 
-#: ../panels/wacom/cc-wacom-stylus-page.c:373
+#: ../panels/wacom/cc-wacom-stylus-page.c:377
 msgid "Button"
 msgstr "Button"
 
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1
-#: ../panels/wacom/gnome-wacom-properties.ui.h:7
-msgid "Wacom Tablet"
-msgstr "Wacom Tablet"
-
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2
+#| msgid "Wacom Tablet"
+msgid "Wa­com Tab­let"
+msgstr "Wa­com Tab­let"
+
+#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3
 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
+#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5
 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;"
 msgstr "Tablet;Wacom;Stylus;Eraser;Mouse;"
 
@@ -6842,127 +7195,140 @@ msgid "Tablet Preferences"
 msgstr "Tablet Preferences"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:4
+#| msgid "Help"
+msgid "_Help"
+msgstr "_Help"
+
+#: ../panels/wacom/gnome-wacom-properties.ui.h:6
 msgid "No tablet detected"
 msgstr "No tablet detected"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:5
+#: ../panels/wacom/gnome-wacom-properties.ui.h:7
 msgid "Please plug in or turn on your Wacom tablet"
 msgstr "Please plug in or turn on your Wacom tablet"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:6
+#: ../panels/wacom/gnome-wacom-properties.ui.h:8
 msgid "Bluetooth Settings"
 msgstr "Bluetooth Settings"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:8
+#: ../panels/wacom/gnome-wacom-properties.ui.h:9
+msgid "Wacom Tablet"
+msgstr "Wacom Tablet"
+
+#: ../panels/wacom/gnome-wacom-properties.ui.h:10
 msgid "Map to Monitor…"
 msgstr "Map to Monitor…"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:9
+#: ../panels/wacom/gnome-wacom-properties.ui.h:11
 msgid "Map Buttons…"
 msgstr "Map Buttons…"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:11
+#: ../panels/wacom/gnome-wacom-properties.ui.h:12
+msgid "Calibrate…"
+msgstr "Calibrate…"
+
+#: ../panels/wacom/gnome-wacom-properties.ui.h:13
 msgid "Adjust display resolution"
 msgstr "Adjust display resolution"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:12
+#: ../panels/wacom/gnome-wacom-properties.ui.h:14
 msgid "Adjust mouse settings"
 msgstr "Adjust mouse settings"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:13
+#: ../panels/wacom/gnome-wacom-properties.ui.h:15
 msgid "Tracking Mode"
 msgstr "Tracking Mode"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:14
+#: ../panels/wacom/gnome-wacom-properties.ui.h:16
 msgid "Left-Handed Orientation"
 msgstr "Left-Handed Orientation"
 
 #. If no mode is available, we use "left-ring-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1063
+#: ../panels/wacom/gsd-wacom-device.c:1028
 msgid "Left Ring"
 msgstr "Left Ring"
 
-#: ../panels/wacom/gsd-wacom-device.c:1074
+#: ../panels/wacom/gsd-wacom-device.c:1039
 #, c-format
 msgid "Left Ring Mode #%d"
 msgstr "Left Ring Mode #%d"
 
 #. If no mode is available, we use "right-ring-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1094
+#: ../panels/wacom/gsd-wacom-device.c:1059
 msgid "Right Ring"
 msgstr "Right Ring"
 
-#: ../panels/wacom/gsd-wacom-device.c:1105
+#: ../panels/wacom/gsd-wacom-device.c:1070
 #, c-format
 msgid "Right Ring Mode #%d"
 msgstr "Right Ring Mode #%d"
 
 #. If no mode is available, we use "left-strip-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1147
+#: ../panels/wacom/gsd-wacom-device.c:1112
 msgid "Left Touchstrip"
 msgstr "Left Touchstrip"
 
-#: ../panels/wacom/gsd-wacom-device.c:1158
+#: ../panels/wacom/gsd-wacom-device.c:1123
 #, c-format
 msgid "Left Touchstrip Mode #%d"
 msgstr "Left Touchstrip Mode #%d"
 
 #. If no mode is available, we use "right-strip-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1178
+#: ../panels/wacom/gsd-wacom-device.c:1143
 msgid "Right Touchstrip"
 msgstr "Right Touchstrip"
 
-#: ../panels/wacom/gsd-wacom-device.c:1189
+#: ../panels/wacom/gsd-wacom-device.c:1154
 #, c-format
 msgid "Right Touchstrip Mode #%d"
 msgstr "Right Touchstrip Mode #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1215
+#: ../panels/wacom/gsd-wacom-device.c:1180
 #, c-format
 msgid "Left Touchring Mode Switch"
 msgstr "Left Touchring Mode Switch"
 
-#: ../panels/wacom/gsd-wacom-device.c:1217
+#: ../panels/wacom/gsd-wacom-device.c:1182
 #, c-format
 msgid "Right Touchring Mode Switch"
 msgstr "Right Touchring Mode Switch"
 
-#: ../panels/wacom/gsd-wacom-device.c:1220
+#: ../panels/wacom/gsd-wacom-device.c:1185
 #, c-format
 msgid "Left Touchstrip Mode Switch"
 msgstr "Left Touchstrip Mode Switch"
 
-#: ../panels/wacom/gsd-wacom-device.c:1222
+#: ../panels/wacom/gsd-wacom-device.c:1187
 #, c-format
 msgid "Right Touchstrip Mode Switch"
 msgstr "Right Touchstrip Mode Switch"
 
-#: ../panels/wacom/gsd-wacom-device.c:1227
+#: ../panels/wacom/gsd-wacom-device.c:1192
 #, c-format
 msgid "Mode Switch #%d"
 msgstr "Mode Switch #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1336
+#: ../panels/wacom/gsd-wacom-device.c:1238
 #, c-format
 msgid "Left Button #%d"
 msgstr "Left Button #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1339
+#: ../panels/wacom/gsd-wacom-device.c:1241
 #, c-format
 msgid "Right Button #%d"
 msgstr "Right Button #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1342
+#: ../panels/wacom/gsd-wacom-device.c:1244
 #, c-format
 msgid "Top Button #%d"
 msgstr "Top Button #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1345
+#: ../panels/wacom/gsd-wacom-device.c:1247
 #, c-format
 msgid "Bottom Button #%d"
 msgstr "Bottom Button #%d"
 
-#: ../panels/wacom/gsd-wacom-key-shortcut-button.c:264
+#: ../panels/wacom/gsd-wacom-key-shortcut-button.c:263
 msgid "New shortcut…"
 msgstr "New shortcut…"
 
@@ -7034,88 +7400,627 @@ msgstr "Lower Button"
 msgid "Tip Pressure Feel"
 msgstr "Tip Pressure Feel"
 
-#: ../shell/cc-application.c:69
+#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53
+#: ../shell/cc-window.c:1478
+msgid "All Settings"
+msgstr "All Settings"
+
+#: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1
+#| msgid "Control Center"
+msgid "GNOME Control Center"
+msgstr "GNOME Control Center"
+
+#: ../shell/appdata/gnome-control-center.appdata.xml.in.h:2
+msgid "Utilities to configure the GNOME desktop"
+msgstr "Utilities to configure the GNOME desktop"
+
+#: ../shell/appdata/gnome-control-center.appdata.xml.in.h:3
+msgid ""
+"The control center is GNOME's main interface for configuration of various "
+"aspects of your desktop."
+msgstr ""
+"The control centre is GNOME's main interface for configuration of various "
+"aspects of your desktop."
+
+#: ../shell/cc-application.c:45
+#| msgid "Display Brightness"
+msgid "Display version number"
+msgstr "Display version number"
+
+#: ../shell/cc-application.c:46
 msgid "Enable verbose mode"
 msgstr "Enable verbose mode"
 
-#: ../shell/cc-application.c:70
+#: ../shell/cc-application.c:47
 msgid "Show the overview"
 msgstr "Show the overview"
 
-#: ../shell/cc-application.c:71
+#: ../shell/cc-application.c:48
 msgid "Search for the string"
 msgstr "Search for the string"
 
-#: ../shell/cc-application.c:72
+#: ../shell/cc-application.c:49
 msgid "List possible panel names and exit"
 msgstr "List possible panel names and exit"
 
-#: ../shell/cc-application.c:73 ../shell/cc-application.c:74
-#: ../shell/cc-application.c:75
-msgid "Show help options"
-msgstr "Show help options"
-
-#: ../shell/cc-application.c:76
+#: ../shell/cc-application.c:50
 msgid "Panel to display"
 msgstr "Panel to display"
 
-#: ../shell/cc-application.c:76
+#: ../shell/cc-application.c:50
 msgid "[PANEL] [ARGUMENT…]"
 msgstr "[PANEL] [ARGUMENT…]"
 
-#: ../shell/cc-application.c:142
-msgid "- Settings"
-msgstr "- Settings"
-
-#: ../shell/cc-application.c:160
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"Run ‘%s --help’ to see a full list of available command line options.\n"
-
-#: ../shell/cc-application.c:190
+#: ../shell/cc-application.c:113
 msgid "Available panels:"
 msgstr "Available panels:"
 
-#: ../shell/cc-application.c:325
+#: ../shell/cc-application.c:252
 msgid "Help"
 msgstr "Help"
 
-#: ../shell/cc-application.c:326
+#: ../shell/cc-application.c:253
 msgid "Quit"
 msgstr "Quit"
 
-#: ../shell/cc-window.c:61 ../shell/cc-window.c:1467
-msgid "All Settings"
-msgstr "All Settings"
-
 #. Add categories
-#: ../shell/cc-window.c:866
+#: ../shell/cc-window.c:871
 msgctxt "category"
 msgid "Personal"
 msgstr "Personal"
 
-#: ../shell/cc-window.c:867
+#: ../shell/cc-window.c:872
 msgctxt "category"
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../shell/cc-window.c:868
+#: ../shell/cc-window.c:873
 msgctxt "category"
 msgid "System"
 msgstr "System"
 
-#: ../shell/cc-window.c:1576 ../shell/gnome-control-center.desktop.in.in.h:1
-msgid "Settings"
-msgstr "Settings"
-
 #: ../shell/gnome-control-center.desktop.in.in.h:2
 msgid "Preferences;Settings;"
 msgstr "Preferences;Settings;"
 
+#: ../shell/help-overlay.ui.h:1
+#| msgid "General"
+msgctxt "shortcut window"
+msgid "General"
+msgstr "General"
+
+#: ../shell/help-overlay.ui.h:2
+#| msgid "Quit"
+msgctxt "shortcut window"
+msgid "Quit"
+msgstr "Quit"
+
+#: ../shell/help-overlay.ui.h:3
+#| msgid "Search"
+msgctxt "shortcut window"
+msgid "Search"
+msgstr "Search"
+
+#: ../shell/help-overlay.ui.h:4
+#| msgid "Panel icon"
+msgctxt "shortcut window"
+msgid "Panels"
+msgstr "Panels"
+
+#: ../shell/help-overlay.ui.h:5
+#| msgid "Show the overview"
+msgctxt "shortcut window"
+msgid "Go back to the overview"
+msgstr "Go back to the overview"
+
+#: ../shell/help-overlay.ui.h:6
+#| msgctxt "print job"
+#| msgid "Canceled"
+msgctxt "shortcut window"
+msgid "Cancel search"
+msgstr "Cancel search"
+
+#. translators: This is the default hotspot name, need to be less than 32-bytes
+#: ../shell/hostname-helper.c:189
+#| msgid "_Stop Hotspot"
+msgctxt "hotspot"
+msgid "Hotspot"
+msgstr "Hotspot"
+
+#~ msgid "Flickr"
+#~ msgstr "Flickr"
+
+#~ msgid "Set Up New Device"
+#~ msgstr "Set Up New Device"
+
+#~ msgid "Connection"
+#~ msgstr "Connection"
+
+#~ msgid "Paired"
+#~ msgstr "Paired"
+
+#~ msgid "Type"
+#~ msgstr "Type"
+
+#~ msgid "Mouse & Touchpad Settings"
+#~ msgstr "Mouse & Touchpad Settings"
+
+#~ msgid "Sound Settings"
+#~ msgstr "Sound Settings"
+
+#~ msgid "Keyboard Settings"
+#~ msgstr "Keyboard Settings"
+
+#~ msgid "Send Files…"
+#~ msgstr "Send Files…"
+
+#~ msgid "Yes"
+#~ msgstr "Yes"
+
+#~ msgid "No"
+#~ msgstr "No"
+
+#~ msgid "Bluetooth is disabled"
+#~ msgstr "Bluetooth is disabled"
+
+#~ msgid "Visibility"
+#~ msgstr "Visibility"
+
+#~ msgid "Visibility of “%s”"
+#~ msgstr "Visibility of “%s”"
+
+#~ msgid "Remove '%s' from the list of devices?"
+#~ msgstr "Remove ‘%s’ from the list of devices?"
+
+#~ 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."
+
+#~ msgid "Done"
+#~ msgstr "Done"
+
+#~ msgid "Device type:"
+#~ msgstr "Device type:"
+
+#~ msgid "Manufacturer:"
+#~ msgstr "Manufacturer:"
+
+#~ msgid "Model:"
+#~ msgstr "Model:"
+
+#~ 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."
+
+#~ msgid "Color"
+#~ msgstr "Colour"
+
+#~ msgid "United States"
+#~ msgstr "United States"
+
+#~ msgid "Germany"
+#~ msgstr "Germany"
+
+#~ msgid "France"
+#~ msgstr "France"
+
+#~ msgid "Spain"
+#~ msgstr "Spain"
+
+#~ msgid "China"
+#~ msgstr "China"
+
+#~ msgid "Switch between AM and PM."
+#~ msgstr "Switch between AM and PM."
+
+#~ msgid "Time _Zone"
+#~ msgstr "Time _Zone"
+
+#~ msgid "Show your primary display on this screen also"
+#~ msgstr "Show your primary display on this screen also"
+
+#~ msgid "Combine"
+#~ msgstr "Combine"
+
+#~ msgid "Join with the primary display to create an extra space"
+#~ msgstr "Join with the primary display to create an extra space"
+
+#~ msgid "Install Updates"
+#~ msgstr "Install Updates"
+
+#~ msgid "System Up-To-Date"
+#~ msgstr "System Up-To-Date"
+
+#~ msgid "_Name:"
+#~ msgstr "_Name:"
+
+#~ msgid "C_ommand:"
+#~ msgstr "C_ommand:"
+
+#~ msgid "_Delay:"
+#~ msgstr "_Delay:"
+
+#~ msgid "_Speed:"
+#~ msgstr "_Speed:"
+
+#~ msgctxt "keyboard, delay"
+#~ msgid "Short"
+#~ msgstr "Short"
+
+#~ msgctxt "keyboard, speed"
+#~ msgid "Slow"
+#~ msgstr "Slow"
+
+#~ msgctxt "keyboard, delay"
+#~ msgid "Long"
+#~ msgstr "Long"
+
+#~ msgctxt "keyboard, speed"
+#~ msgid "Fast"
+#~ msgstr "Fast"
+
+#~ msgid "S_peed:"
+#~ msgstr "S_peed:"
+
+#~ msgid "Add Shortcut"
+#~ msgstr "Add Shortcut"
+
+#~ msgid "Remove Shortcut"
+#~ msgstr "Remove Shortcut"
+
+#~ msgid "Shortcuts"
+#~ msgstr "Shortcuts"
+
+#~ msgid "<Unknown Action>"
+#~ msgstr "<Unknown Action>"
+
+#~ msgid ""
+#~ "The shortcut \"%s\" cannot be used because it will become impossible to "
+#~ "type using this key.\n"
+#~ "Please try with a key such as Control, Alt or Shift at the same time."
+#~ msgstr ""
+#~ "The shortcut \"%s\" cannot be used because it will become impossible to "
+#~ "type using this key.\n"
+#~ "Please try with a key such as Control, Alt or Shift at the same time."
+
+#~ msgid ""
+#~ "The shortcut \"%s\" is already used for\n"
+#~ "\"%s\""
+#~ msgstr ""
+#~ "The shortcut \"%s\" is already used for\n"
+#~ "\"%s\""
+
+#~ 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."
+
+#~ msgid "_Reassign"
+#~ msgstr "_Reassign"
+
+#~ msgid "Test Your Settings"
+#~ msgstr "Test Your Settings"
+
+#~ msgid "Mouse Preferences"
+#~ msgstr "Mouse Preferences"
+
+#~ msgctxt "double click, speed"
+#~ msgid "Slow"
+#~ msgstr "Slow"
+
+#~ msgctxt "double click, speed"
+#~ msgid "Fast"
+#~ msgstr "Fast"
+
+#~ msgctxt "mouse, left button as primary"
+#~ msgid "_Left"
+#~ msgstr "_Left"
+
+#~ msgctxt "mouse, right button as primary"
+#~ msgid "_Right"
+#~ msgstr "_Right"
+
+#~ msgid "_Pointer speed"
+#~ msgstr "_Pointer speed"
+
+#~ msgctxt "mouse pointer, speed"
+#~ msgid "Slow"
+#~ msgstr "Slow"
+
+#~ msgctxt "mouse pointer, speed"
+#~ msgid "Fast"
+#~ msgstr "Fast"
+
+#~ msgctxt "touchpad pointer, speed"
+#~ msgid "Slow"
+#~ msgstr "Slow"
+
+#~ msgctxt "touchpad pointer, speed"
+#~ msgid "Fast"
+#~ msgstr "Fast"
+
+#~ msgid "Disable while _typing"
+#~ msgstr "Disable while _typing"
+
+#~ msgid "The system network services are not compatible with this version."
+#~ msgstr "The system network services are not compatible with this version."
+
+#~ msgid "Bond"
+#~ msgstr "Bond"
+
+#~ msgid "Bridge"
+#~ msgstr "Bridge"
+
+#~ msgid "VLAN"
+#~ msgstr "VLAN"
+
+#~ msgid "Could not load VPN plugins"
+#~ msgstr "Could not load VPN plugins"
+
+#~ msgid "Add Network Connection"
+#~ msgstr "Add Network Connection"
+
+#~ msgid "Bond slaves"
+#~ msgstr "Bond slaves"
+
+#~ msgid "Bridge slaves"
+#~ msgstr "Bridge slaves"
+
+#~ msgid "Select the interface to use for the new service"
+#~ msgstr "Select the interface to use for the new service"
+
+#~ msgid "C_reate…"
+#~ msgstr "C_reate…"
+
+#~ msgid "_Interface"
+#~ msgstr "_Interface"
+
+#~ msgid "Security key"
+#~ msgstr "Security key"
+
+#~ msgid "InfiniBand device does not support connected mode"
+#~ msgstr "InfiniBand device does not support connected mode"
+
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "No Certificate Authority certificate chosen"
+
+#~ 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?"
+
+#~ msgid "Ignore"
+#~ msgstr "Ignore"
+
+#~ msgid "Choose CA Certificate"
+#~ msgstr "Choose CA Certificate"
+
+#~ msgid "As_k for this password every time"
+#~ msgstr "As_k for this password every time"
+
+#~ msgid "Don't _warn me again"
+#~ msgstr "Don’t _warn me again"
+
+#~ msgctxt "notifications"
+#~ msgid "Show Popup Banners"
+#~ msgstr "Show Popup Banners"
+
+#~ msgctxt "notifications"
+#~ msgid "View in Lock Screen"
+#~ msgstr "View in Lock Screen"
+
+#~ msgid "Show Pop Up Banners"
+#~ msgstr "Show Pop Up Banners"
+
+#~ msgid "Show in Lock Screen"
+#~ msgstr "Show in Lock Screen"
+
+#~ msgid "Error logging into the account"
+#~ msgstr "Error logging into the account"
+
+#~ msgid "Credentials have expired."
+#~ msgstr "Credentials have expired."
+
+#~ msgid "Sign in to enable this account."
+#~ msgstr "Sign in to enable this account."
+
+#~ msgid "_Sign In"
+#~ msgstr "_Sign In"
+
+#~ msgid "Estimated battery capacity: %s"
+#~ msgstr "Estimated battery capacity: %s"
+
+#~ msgid "Turns off wireless devices"
+#~ msgstr "Turns off wireless devices"
+
+#~ msgid "When battery power is _critical"
+#~ msgstr "When battery power is _critical"
+
+#~ msgid "Power Off"
+#~ msgstr "Power Off"
+
+#~ msgid "Power"
+#~ msgstr "Power"
+
+#~ msgid "Power off"
+#~ msgstr "Power off"
+
+#~ msgid "No printers available"
+#~ msgstr "No printers available"
+
+#~ msgid "Active Jobs"
+#~ msgstr "Active Jobs"
+
+#~ msgid "Close"
+#~ msgstr "Close"
+
+#~ msgid "Resume Printing"
+#~ msgstr "Resume Printing"
+
+#~ msgid "Pause Printing"
+#~ msgstr "Pause Printing"
+
+#~ msgid "Cancel Print Job"
+#~ msgstr "Cancel Print Job"
+
+#~ msgid "Search for network printers or filter result"
+#~ msgstr "Search for network printers or filter result"
+
+#~ msgid "Enter address of a printer or a text to filter results"
+#~ msgstr "Enter address of a printer or a text to filter results"
+
+#~ msgctxt "print job"
+#~ msgid "Held"
+#~ msgstr "Held"
+
+#~ msgid "Job Title"
+#~ msgstr "Job Title"
+
+#~ msgid "Job State"
+#~ msgstr "Job State"
+
+#~ msgid "Time"
+#~ msgstr "Time"
+
+#~ msgid "_Default"
+#~ msgstr "_Default"
+
+#~ msgid "Add New Printer"
+#~ msgstr "Add New Printer"
+
+#~ msgid "Immediately"
+#~ msgstr "Immediately"
+
+#~ msgctxt "Language"
+#~ msgid "None"
+#~ msgstr "None"
+
+#~ msgid "Sorry"
+#~ msgstr "Sorry"
+
+#~ msgid "Options"
+#~ msgstr "Options"
+
+#~ msgctxt "Search Location"
+#~ msgid "Other"
+#~ msgstr "Other"
+
+#~ 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"
+
+#~ msgid "Share Public Folder"
+#~ msgstr "Share Public Folder"
+
+#~ msgid "Only Receive From Trusted Devices"
+#~ msgstr "Only Receive From Trusted Devices"
+
+#~ msgid "Save Received Files to Downloads Folder"
+#~ msgstr "Save Received Files to Downloads Folder"
+
+#~ msgid "Only share with Trusted Devices"
+#~ msgstr "Only share with Trusted Devices"
+
+#~ msgid "Share Media On This Network"
+#~ msgstr "Share Media On This Network"
+
+#~ msgid "Shared Folders"
+#~ msgstr "Shared Folders"
+
+#~ msgid "column"
+#~ msgstr "column"
+
+#~ msgid "Remove Folder"
+#~ msgstr "Remove Folder"
+
+#~ msgid "Share Public Folder On This Network"
+#~ msgstr "Share Public Folder On This Network"
+
+#~ msgid "Remote View"
+#~ msgstr "Remote View"
+
+#~ msgid "Remote Control"
+#~ msgstr "Remote Control"
+
+#~ msgid "Approve All Connections"
+#~ msgstr "Approve All Connections"
+
+#~ msgid "Zoom"
+#~ msgstr "Zoom"
+
+#~ msgctxt "universal access, contrast"
+#~ msgid "Color"
+#~ msgstr "Colour"
+
+#~ msgid "_Verify"
+#~ msgstr "_Verify"
+
+#~ msgid "Login History"
+#~ msgstr "Login History"
+
+#~ msgid "Changing photo for:"
+#~ msgstr "Changing photo for:"
+
+#~ msgid ""
+#~ "Choose a picture that will be shown at the login screen for this account."
+#~ msgstr ""
+#~ "Choose a picture that will be shown at the login screen for this account."
+
+#~ msgid "Gallery"
+#~ msgstr "Gallery"
+
+#~ msgid "Take a photograph"
+#~ msgstr "Take a photograph"
+
+#~ msgid "Browse"
+#~ msgstr "Browse"
+
+#~ msgid "Photograph"
+#~ msgstr "Photograph"
+
+#~ msgid "Account Information"
+#~ msgstr "Account Information"
+
+#~ msgid "Add User Account"
+#~ msgstr "Add User Account"
+
+#~ msgid "Remove User Account"
+#~ msgstr "Remove User Account"
+
+#~ msgid "Login Options"
+#~ msgstr "Login Options"
+
+#~ msgid "A user with the username '%s' already exists"
+#~ msgstr "A user with the username ‘%s’ already exists"
+
+#~ msgid "Show help options"
+#~ msgstr "Show help options"
+
+#~ msgid "- Settings"
+#~ msgstr "- Settings"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "Run '%s --help' to see a full list of available command line options.\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "Run ‘%s --help’ to see a full list of available command line options.\n"
+
 #~ msgid "Export"
 #~ msgstr "Export"
 
@@ -7208,10 +8113,6 @@ msgstr "Preferences;Settings;"
 #~ msgstr "Normal"
 
 #~ msgctxt "display panel, rotation"
-#~ msgid "Counterclockwise"
-#~ msgstr "Anticlockwise"
-
-#~ msgctxt "display panel, rotation"
 #~ msgid "Clockwise"
 #~ msgstr "Clockwise"
 
@@ -7526,9 +8427,6 @@ msgstr "Preferences;Settings;"
 #~ msgid "The current password is not correct"
 #~ msgstr "The current password is not correct"
 
-#~ msgid "Wrong password"
-#~ msgstr "Wrong password"
-
 #~ msgid "Switch Modes"
 #~ msgstr "Switch Modes"
 
@@ -7651,15 +8549,9 @@ msgstr "Preferences;Settings;"
 #~ 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"
 
@@ -7722,9 +8614,6 @@ msgstr "Preferences;Settings;"
 #~ msgid "C_reate..."
 #~ msgstr "C_reate…"
 
-#~ msgid "_Configure..."
-#~ msgstr "_Configure…"
-
 #~ msgid "Wireless Hotspot"
 #~ msgstr "Wireless Hotspot"
 
@@ -7802,16 +8691,9 @@ msgstr "Preferences;Settings;"
 #~ 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"
 
@@ -7824,9 +8706,6 @@ msgstr "Preferences;Settings;"
 #~ 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"
 
@@ -7884,15 +8763,6 @@ msgstr "Preferences;Settings;"
 #~ 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"
 
@@ -8016,9 +8886,6 @@ msgstr "Preferences;Settings;"
 #~ msgid "- System Settings"
 #~ msgstr "- System Settings"
 
-#~ msgid "Control Center"
-#~ msgstr "Control Centre"
-
 #~ msgid "System Settings"
 #~ msgstr "System Settings"
 
@@ -8028,9 +8895,6 @@ msgstr "Preferences;Settings;"
 #~ msgid "Subnet Mask"
 #~ msgstr "Subnet Mask"
 
-#~ msgid "A_ddress:"
-#~ msgstr "A_ddress:"
-
 #~ msgid "_Search by Address"
 #~ msgstr "_Search by Address"
 
@@ -8094,9 +8958,6 @@ msgstr "Preferences;Settings;"
 #~ msgid "Take a screenshot"
 #~ msgstr "Take a screenshot"
 
-#~ msgid "Shortcut"
-#~ msgstr "Shortcut"
-
 #~ msgid "_Right-handed"
 #~ msgstr "_Right-handed"
 
@@ -8121,9 +8982,6 @@ msgstr "Preferences;Settings;"
 #~ msgid "Drag Threshold"
 #~ msgstr "Drag Threshold"
 
-#~ msgid "Double-Click Timeout"
-#~ msgstr "Double-Click Timeout"
-
 #~ msgid "_Timeout:"
 #~ msgstr "_Timeout:"
 
@@ -8133,9 +8991,6 @@ msgstr "Preferences;Settings;"
 #~ msgid "Enable _mouse clicks with touchpad"
 #~ msgstr "Enable _mouse clicks with touchpad"
 
-#~ msgid "Scrolling"
-#~ msgstr "Scrolling"
-
 #~ msgid "_Disabled"
 #~ msgstr "_Disabled"
 
@@ -8347,9 +9202,6 @@ msgstr "Preferences;Settings;"
 #~ msgid "cd;dvd;usb;audio;video;disc;"
 #~ msgstr "cd;dvd;usb;audio;video;disc;"
 
-#~ msgid "Speed"
-#~ msgstr "Speed"
-
 #~ msgid "Unlock"
 #~ msgstr "Unlock"
 
@@ -8371,9 +9223,6 @@ msgstr "Preferences;Settings;"
 #~ msgid "Shutdown"
 #~ msgstr "Shutdown"
 
-#~ msgid "Suspend"
-#~ msgstr "Suspend"
-
 #~ msgid ""
 #~ "Only profiles that are compatible with the device will be listed above."
 #~ msgstr ""
@@ -8550,9 +9399,6 @@ msgstr "Preferences;Settings;"
 #~ msgid "Put the computer to sleep when inactive:"
 #~ msgstr "Put the computer to sleep when inactive:"
 
-#~ msgid "When the power button is pressed:"
-#~ msgstr "When the power button is pressed:"
-
 #~ msgid "When the sleep button is pressed:"
 #~ msgstr "When the sleep button is pressed:"
 
@@ -8910,9 +9756,6 @@ msgstr "Preferences;Settings;"
 #~ msgid "Include _panel"
 #~ msgstr "Include _panel"
 
-#~ msgid "Panel icon"
-#~ msgstr "Panel icon"
-
 #~ msgid "Sa_me image in all monitors"
 #~ msgstr "Sa_me image in all monitors"
 
@@ -8990,9 +9833,6 @@ msgstr "Preferences;Settings;"
 #~ msgid "Upside Down"
 #~ msgstr "Upside Down"
 
-#~ msgid "%d Hz"
-#~ msgstr "%d Hz"
-
 #~ msgid "Mirror Screens"
 #~ msgstr "Mirror Screens"
 
@@ -9059,9 +9899,6 @@ msgstr "Preferences;Settings;"
 #~ msgid "Keyboard _model:"
 #~ msgstr "Keyboard _model:"
 
-#~ msgid "List of keyboard layouts selected for usage"
-#~ msgstr "List of keyboard layouts selected for usage"
-
 #~ msgid ""
 #~ "Lock screen after a certain duration to help prevent repetitive keyboard "
 #~ "use injuries"
@@ -9203,9 +10040,6 @@ msgstr "Preferences;Settings;"
 #~ msgid "The location already exists."
 #~ msgstr "The location already exists."
 
-#~ msgid "_Location name:"
-#~ msgstr "_Location name:"
-
 #~ msgid "_Use the same proxy for all protocols"
 #~ msgstr "_Use the same proxy for all protocols"
 
@@ -9616,9 +10450,6 @@ msgstr "Preferences;Settings;"
 #~ msgid "The two passwords are not equal."
 #~ msgstr "The two passwords are not equal."
 
-#~ msgid "Change pa_ssword"
-#~ msgstr "Change pa_ssword"
-
 #~ msgid "Change your password"
 #~ msgstr "Change your password"
 
@@ -10361,9 +11192,6 @@ msgstr "Preferences;Settings;"
 #~ msgid "Move to Trash"
 #~ msgstr "Move to the Wastebasket"
 
-#~ msgid "Delete"
-#~ msgstr "Delete"
-
 #~ msgid "If you delete an item, it is permanently lost."
 #~ msgstr "If you delete an item, it is permanently lost."
 
@@ -10409,9 +11237,6 @@ msgstr "Preferences;Settings;"
 #~ msgid "Change screen resolution"
 #~ msgstr "Change screen resolution"
 
-#~ msgid "Edit"
-#~ msgstr "Edit"
-
 #~ msgid "Menus and Toolbars"
 #~ msgstr "Menus and Toolbars"
 
@@ -10559,9 +11384,6 @@ msgstr "Preferences;Settings;"
 #~ msgid "Could not get org.gnome.SettingsDaemon.XRANDR"
 #~ msgstr "Could not get org.gnome.SettingsDaemon.XRANDR"
 
-#~ msgid "_Command:"
-#~ msgstr "_Command:"
-
 #~ msgid "<b>Bounce Keys</b>"
 #~ msgstr "<b>Bounce Keys</b>"
 
@@ -11175,9 +11997,6 @@ msgstr "Preferences;Settings;"
 #~ msgid "Do you want to deactivate Slow Keys?"
 #~ msgstr "Do you want to deactivate Slow Keys?"
 
-#~ msgid "_Activate"
-#~ msgstr "_Activate"
-
 #~ msgid "Do_n't activate"
 #~ msgstr "Do_n't activate"
 



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