[gnome-control-center] Update British English translation



commit ac33b612d5451a78830eef67132ac094501a9206
Author: Bruce Cowan <bruce bcowan eu>
Date:   Sun Feb 18 10:54:10 2018 +0000

    Update British English translation

 po/en_GB.po | 4251 +++++++++++++++++++++++++++++------------------------------
 1 files changed, 2117 insertions(+), 2134 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 47a2009..96733a1 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -4,15 +4,15 @@
 # Gareth Owen <gowen72 yahoo com>, David Lodge <dave cirt net>, 2004.
 # Philip Withnall <philip tecnocode co uk>, 2010, 2013.
 # Chris Leonard <cjl laptop org>, 2012.
-# Bruce Cowan <bruce bcowan eu>, 2009, 2010, 2011, 2012, 2013, 2016, 2017.
+# Bruce Cowan <bruce bcowan eu>, 2009, 2010, 2011, 2012, 2013, 2016, 2017, 2018.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
-"control-center&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-08-25 14:57+0000\n"
-"PO-Revision-Date: 2017-09-11 10:38+0100\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-control-center/";
+"issues\n"
+"POT-Creation-Date: 2018-02-09 11:38+0000\n"
+"PO-Revision-Date: 2018-02-18 10:53+0000\n"
 "Last-Translator: Bruce Cowan <bruce bcowan eu>\n"
 "Language-Team: British English <en li org>\n"
 "Language: en_GB\n"
@@ -23,216 +23,219 @@ msgstr ""
 "X-Generator: Gtranslator 2.91.7\n"
 "X-Project-Style: gnome\n"
 
-#: ../panels/background/background.ui.h:1
+#: panels/background/background.ui:49
 msgid "_Background"
 msgstr "_Background"
 
 #. This refers to a slideshow background
-#: ../panels/background/background.ui.h:3
+#: panels/background/background.ui:99 panels/background/background.ui:212
 msgid "Changes throughout the day"
 msgstr "Changes throughout the day"
 
 #. To translators: This is a noun, not a verb
-#: ../panels/background/background.ui.h:5
+#: panels/background/background.ui:162
 msgid "_Lock Screen"
 msgstr "_Lock Screen"
 
-#: ../panels/background/background.ui.h:6
+#: panels/background/background.ui:268
 msgctxt "background, style"
 msgid "Tile"
 msgstr "Tile"
 
-#: ../panels/background/background.ui.h:7
+#: panels/background/background.ui:272
 msgctxt "background, style"
 msgid "Zoom"
 msgstr "Zoom"
 
-#: ../panels/background/background.ui.h:8
+#: panels/background/background.ui:276
 msgctxt "background, style"
 msgid "Center"
 msgstr "Centre"
 
-#: ../panels/background/background.ui.h:9
+#: panels/background/background.ui:280
 msgctxt "background, style"
 msgid "Scale"
 msgstr "Scale"
 
-#: ../panels/background/background.ui.h:10
+#: panels/background/background.ui:284
 msgctxt "background, style"
 msgid "Fill"
 msgstr "Fill"
 
-#: ../panels/background/background.ui.h:11
+#: panels/background/background.ui:288
 msgctxt "background, style"
 msgid "Span"
 msgstr "Span"
 
-#: ../panels/background/cc-background-chooser-dialog.c:430
+#: panels/background/cc-background-chooser-dialog.c:424
 msgid "Wallpapers"
 msgstr "Wallpapers"
 
-#: ../panels/background/cc-background-chooser-dialog.c:439
+#: panels/background/cc-background-chooser-dialog.c:433
 msgid "Colors"
 msgstr "Colours"
 
 #. translators: This is the title of the wallpaper chooser dialog.
-#: ../panels/background/cc-background-chooser-dialog.c:476
+#: panels/background/cc-background-chooser-dialog.c:468
 msgid "Select Background"
 msgstr "Select Background"
 
-#: ../panels/background/cc-background-chooser-dialog.c:504
+#: panels/background/cc-background-chooser-dialog.c:496
 msgid "Pictures"
 msgstr "Pictures"
 
 #. translators: No pictures were found
-#: ../panels/background/cc-background-chooser-dialog.c:536
+#: panels/background/cc-background-chooser-dialog.c:528
 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:554
-#: ../panels/search/cc-search-locations-dialog.c:302
+#: panels/background/cc-background-chooser-dialog.c:545
+#: 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:566
+#: panels/background/cc-background-chooser-dialog.c:555
 #, 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:573
-#: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963
-#: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30
-#: ../panels/common/language-chooser.ui.h:3
-#: ../panels/display/cc-display-panel.c:2718
-#: ../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:1318
-#: ../panels/network/net-device-wifi.c:1398
-#: ../panels/network/net-device-wifi.c:1633
-#: ../panels/network/network-wifi.ui.h:1
-#: ../panels/printers/new-printer-dialog.ui.h:3
-#: ../panels/printers/pp-details-dialog.c:319
-#: ../panels/privacy/cc-privacy-panel.c:1049
-#: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2
-#: ../panels/search/cc-search-locations-dialog.c:642
-#: ../panels/sharing/cc-sharing-panel.c:375
-#: ../panels/user-accounts/data/account-dialog.ui.h:2
-#: ../panels/user-accounts/data/join-dialog.ui.h:2
-#: ../panels/user-accounts/data/password-dialog.ui.h:2
-#: ../panels/user-accounts/um-fingerprint-dialog.c:264
-#: ../panels/user-accounts/um-photo-dialog.c:94
-#: ../panels/user-accounts/um-photo-dialog.c:221
-#: ../panels/user-accounts/um-user-panel.c:644
-#: ../panels/user-accounts/um-user-panel.c:662
+#: panels/background/cc-background-chooser-dialog.c:560
+#: panels/color/cc-color-panel.c:225 panels/color/cc-color-panel.c:963
+#: panels/color/color-calibrate.ui:25 panels/color/color.ui:657
+#: panels/common/language-chooser.ui:23 panels/display/cc-display-panel.c:2594
+#: panels/network/connection-editor/connection-editor.ui:15
+#: panels/network/connection-editor/vpn-helpers.c:181
+#: panels/network/connection-editor/vpn-helpers.c:310
+#: panels/network/net-device-wifi.c:1387 panels/network/net-device-wifi.c:1467
+#: panels/network/net-device-wifi.c:1706 panels/network/network-wifi.ui:24
+#: panels/printers/new-printer-dialog.ui:45
+#: panels/printers/pp-details-dialog.c:331
+#: panels/privacy/cc-privacy-panel.c:1053 panels/region/format-chooser.ui:25
+#: panels/region/input-chooser.ui:13
+#: panels/search/cc-search-locations-dialog.c:642
+#: panels/sharing/cc-sharing-panel.c:384
+#: panels/user-accounts/data/account-dialog.ui:28
+#: panels/user-accounts/data/join-dialog.ui:20
+#: panels/user-accounts/data/password-dialog.ui:21
+#: panels/user-accounts/um-fingerprint-dialog.c:261
+#: panels/user-accounts/um-photo-dialog.c:102
+#: panels/user-accounts/um-photo-dialog.c:229
+#: panels/user-accounts/um-user-panel.c:635
+#: panels/user-accounts/um-user-panel.c:653
 msgid "_Cancel"
 msgstr "_Cancel"
 
-#: ../panels/background/cc-background-chooser-dialog.c:574
+#: panels/background/cc-background-chooser-dialog.c:561
 msgid "_Select"
 msgstr "_Select"
 
-#: ../panels/background/cc-background-item.c:203
+#: panels/background/cc-background-item.c:192
 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:207
+#: panels/background/cc-background-item.c:196
 #, c-format
 msgid "%d × %d"
 msgstr "%d × %d"
 
-#: ../panels/background/cc-background-item.c:333
+#: panels/background/cc-background-item.c:321
 msgid "No Desktop Background"
 msgstr "No Desktop Background"
 
-#: ../panels/background/cc-background-panel.c:493
+#: panels/background/cc-background-panel.c:291
 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 "Back­ground"
-msgstr "Back­ground"
+#: panels/background/gnome-background-panel.desktop.in.in:3
+#| msgid "_Background"
+msgid "Background"
+msgstr "Background"
 
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:3
+#: panels/background/gnome-background-panel.desktop.in.in:4
 msgid "Change your background image to a wallpaper or photo"
 msgstr "Change your background image to a wallpaper or photo"
 
+#: panels/background/gnome-background-panel.desktop.in.in:6
+msgid "preferences-desktop-wallpaper"
+msgstr "preferences-desktop-wallpaper"
+
 #. Translators: those are keywords for the background control-center panel
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:5
+#: panels/background/gnome-background-panel.desktop.in.in:14
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "Wallpaper;Screen;Desktop;"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:268
+#: panels/bluetooth/cc-bluetooth-panel.c:265
 msgid "Turn Off Airplane Mode"
 msgstr "Turn Off Aeroplane Mode"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:334
+#: panels/bluetooth/cc-bluetooth-panel.c:330
 msgid "No Bluetooth Found"
 msgstr "No Bluetooth Found"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:334
+#: 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:335
+#: panels/bluetooth/cc-bluetooth-panel.c:331
 msgid "Bluetooth Turned Off"
 msgstr "Bluetooth Turned Off"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:335
+#: 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:336
+#: panels/bluetooth/cc-bluetooth-panel.c:332
 msgid "Airplane Mode is on"
 msgstr "Aeroplane Mode is on"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:336
+#: panels/bluetooth/cc-bluetooth-panel.c:332
 msgid "Bluetooth is disabled when airplane mode is on."
 msgstr "Bluetooth is disabled when aeroplane mode is on."
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:337
+#: panels/bluetooth/cc-bluetooth-panel.c:333
 msgid "Hardware Airplane Mode is on"
 msgstr "Hardware Aeroplane Mode is on"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:337
+#: 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 "Blue­tooth"
-msgstr "Blue­tooth"
+#. Translators: The found device is a printer connected via Bluetooth
+#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:3
+#: panels/network/network.ui:101 panels/printers/pp-new-printer-dialog.c:1816
+msgid "Bluetooth"
+msgstr "Bluetooth"
 
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3
+#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:4
 msgid "Turn Bluetooth on and off and connect your devices"
 msgstr "Turn Bluetooth on and off and connect your devices"
 
+#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:5
+#| msgid "Bluetooth"
+msgid "bluetooth"
+msgstr "bluetooth"
+
 #. Translators: those are keywords for the bluetooth control-center panel
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5
+#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:18
 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:361
-#| msgid "Place your calibration device over the square and press 'Start'"
+#: 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:367
-#| msgid ""
-#| "Move your calibration device to the calibrate position and press "
-#| "'Continue'"
+#: panels/color/cc-color-calibrate.c:367
 msgid ""
 "Move your calibration device to the calibrate position and press “Continue”"
 msgstr ""
@@ -241,9 +244,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:373
-#| msgid ""
-#| "Move your calibration device to the surface position and press 'Continue'"
+#: panels/color/cc-color-calibrate.c:373
 msgid ""
 "Move your calibration device to the surface position and press “Continue”"
 msgstr ""
@@ -252,157 +253,157 @@ 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:379
+#: 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:410
+#: 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:415
+#: 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:421
+#: 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:427
+#: 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:467
+#: 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:475
+#: 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:482
+#: 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:553
+#: 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"
 
 #. TRANSLATORS: This refers to the TFT display on a laptop
-#: ../panels/color/cc-color-common.c:41
+#: panels/color/cc-color-common.c:41
 msgid "Laptop Screen"
 msgstr "Laptop Screen"
 
 #. TRANSLATORS: This refers to the embedded webcam on a laptop
-#: ../panels/color/cc-color-common.c:50
+#: panels/color/cc-color-common.c:50
 msgid "Built-in Webcam"
 msgstr "Built-in Webcam"
 
 #. TRANSLATORS: an externally connected display, where %s is either the
 #. * model, vendor or ID, e.g. 'LP2480zx Monitor'
-#: ../panels/color/cc-color-common.c:65
+#: panels/color/cc-color-common.c:65
 #, c-format
 msgid "%s Monitor"
 msgstr "%s Monitor"
 
 #. TRANSLATORS: a flatbed scanner device, e.g. 'Epson Scanner'
-#: ../panels/color/cc-color-common.c:69
+#: panels/color/cc-color-common.c:69
 #, c-format
 msgid "%s Scanner"
 msgstr "%s Scanner"
 
 #. TRANSLATORS: a camera device, e.g. 'Nikon D60 Camera'
-#: ../panels/color/cc-color-common.c:73
+#: panels/color/cc-color-common.c:73
 #, c-format
 msgid "%s Camera"
 msgstr "%s Camera"
 
 #. TRANSLATORS: a printer device, e.g. 'Epson Photosmart Printer'
-#: ../panels/color/cc-color-common.c:77
+#: panels/color/cc-color-common.c:77
 #, c-format
 msgid "%s Printer"
 msgstr "%s Printer"
 
 #. TRANSLATORS: a webcam device, e.g. 'Philips HiDef Camera'
-#: ../panels/color/cc-color-common.c:81
+#: panels/color/cc-color-common.c:81
 #, c-format
 msgid "%s Webcam"
 msgstr "%s Webcam"
 
-#: ../panels/color/cc-color-device.c:89
+#: panels/color/cc-color-device.c:89
 #, c-format
 msgid "Enable color management for %s"
 msgstr "Enable colour management for %s"
 
-#: ../panels/color/cc-color-device.c:93
+#: panels/color/cc-color-device.c:93
 #, c-format
 msgid "Show color profiles for %s"
 msgstr "Show colour profiles for %s"
 
 #. not calibrated
-#: ../panels/color/cc-color-device.c:323
+#: 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:141
+#: 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:149
+#: 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:156
+#: 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:223
+#: panels/color/cc-color-panel.c:223
 msgid "Select ICC Profile File"
 msgstr "Select ICC Profile File"
 
-#: ../panels/color/cc-color-panel.c:226
+#: 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:237
+#: 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:244
-#: ../panels/network/wireless-security/eap-method-fast.c:417
+#: 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:583
+#: 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:908
+#: panels/color/cc-color-panel.c:908
 #, c-format
 msgid "Failed to upload file: %s"
 msgstr "Failed to upload file: %s"
@@ -410,39 +411,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:922
+#: 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:924
+#: panels/color/cc-color-panel.c:924
 msgid "Write down this URL."
 msgstr "Write down this URL."
 
-#: ../panels/color/cc-color-panel.c:925
+#: 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:926
+#: 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:960
+#: panels/color/cc-color-panel.c:960
 msgid "Save Profile"
 msgstr "Save Profile"
 
-#: ../panels/color/cc-color-panel.c:964
-#: ../panels/network/connection-editor/vpn-helpers.c:311
+#: 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:1324
+#: panels/color/cc-color-panel.c:1325
 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:1339 ../panels/color/cc-color-panel.c:1363
+#: panels/color/cc-color-panel.c:1340 panels/color/cc-color-panel.c:1364
 msgid ""
 "The measuring instrument is not detected. Please check it is turned on and "
 "correctly connected."
@@ -451,24 +452,24 @@ msgstr ""
 "correctly connected."
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1373
+#: panels/color/cc-color-panel.c:1374
 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:1384
+#: panels/color/cc-color-panel.c:1385
 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:103
+#: 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:109
+#: panels/color/cc-color-profile.c:109
 msgid "Test Profile"
 msgstr "Test Profile"
 
@@ -476,7 +477,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:117
+#: panels/color/cc-color-profile.c:117
 msgctxt "Automatically generated profile"
 msgid "Automatic"
 msgstr "Automatic"
@@ -484,13 +485,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:127
+#: 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:132
+#: panels/color/cc-color-profile.c:132
 msgctxt "Profile quality"
 msgid "Medium Quality"
 msgstr "Medium Quality"
@@ -498,62 +499,61 @@ 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:139
+#: 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:156
+#: 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:163
+#: 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:170
+#: panels/color/cc-color-profile.c:170
 msgctxt "Colorspace fallback"
 msgid "Default Gray"
 msgstr "Default Grey"
 
-#: ../panels/color/cc-color-profile.c:194
+#: 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:203
+#: 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:225
+#: panels/color/cc-color-profile.c:225
 msgid "This profile may no longer be accurate"
 msgstr "This profile may no longer be accurate"
 
-#: ../panels/color/color-calibrate.ui.h:1
+#: panels/color/color-calibrate.ui:7
 msgid "Display Calibration"
 msgstr "Display Calibration"
 
 #. This starts the calibration process
-#: ../panels/color/color-calibrate.ui.h:4
+#: panels/color/color-calibrate.ui:40
 msgid "_Start"
 msgstr "_Start"
 
 #. This resumes the calibration process
-#: ../panels/color/color-calibrate.ui.h:6
+#: panels/color/color-calibrate.ui:54
 msgid "_Resume"
 msgstr "_Resume"
 
 #. This button returns the user back to the color control panel
-#: ../panels/color/color-calibrate.ui.h:8
-#: ../panels/common/language-chooser.ui.h:2
-#: ../panels/region/format-chooser.ui.h:2
+#: panels/color/color-calibrate.ui:67 panels/common/language-chooser.ui:12
+#: panels/region/format-chooser.ui:14
 msgid "_Done"
 msgstr "_Done"
 
@@ -561,11 +561,11 @@ msgstr "_Done"
 #. 15000 = 15 sec
 #. 750 = 0.75 sec
 #. Text printed on screen
-#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:82
+#: panels/color/color.ui:6 panels/wacom/calibrator/calibrator-gui.c:82
 msgid "Screen Calibration"
 msgstr "Screen Calibration"
 
-#: ../panels/color/color.ui.h:2
+#: panels/color/color.ui:23
 msgid ""
 "Calibration will produce a profile that you can use to color manage your "
 "screen. The longer you spend on calibration, the better the quality of the "
@@ -575,43 +575,43 @@ msgstr ""
 "screen. The longer you spend on calibration, the better the quality of the "
 "colour profile."
 
-#: ../panels/color/color.ui.h:3
+#: panels/color/color.ui:38
 msgid ""
 "You will not be able to use your computer while calibration takes place."
 msgstr ""
 "You will not be able to use your computer while calibration takes place."
 
 #. This is the approximate time it takes to calibrate the display.
-#: ../panels/color/color.ui.h:5
+#: panels/color/color.ui:58
 msgid "Quality"
 msgstr "Quality"
 
 #. This is the approximate time it takes to calibrate the display.
-#: ../panels/color/color.ui.h:7
+#: panels/color/color.ui:75
 msgid "Approximate Time"
 msgstr "Approximate Time"
 
-#: ../panels/color/color.ui.h:8
+#: panels/color/color.ui:121
 msgid "Calibration Quality"
 msgstr "Calibration Quality"
 
-#: ../panels/color/color.ui.h:9
+#: panels/color/color.ui:137
 msgid "Select the sensor device you want to use for calibration."
 msgstr "Select the sensor device you want to use for calibration."
 
-#: ../panels/color/color.ui.h:10
+#: panels/color/color.ui:174
 msgid "Calibration Device"
 msgstr "Calibration Device"
 
-#: ../panels/color/color.ui.h:11
+#: panels/color/color.ui:189
 msgid "Select the type of display that is connected."
 msgstr "Select the type of display that is connected."
 
-#: ../panels/color/color.ui.h:12
+#: panels/color/color.ui:226
 msgid "Display Type"
 msgstr "Display Type"
 
-#: ../panels/color/color.ui.h:13
+#: panels/color/color.ui:241
 msgid ""
 "Select a display target white point. Most displays should be calibrated to a "
 "D65 illuminant."
@@ -619,11 +619,11 @@ msgstr ""
 "Select a display target white point. Most displays should be calibrated to a "
 "D65 illuminant."
 
-#: ../panels/color/color.ui.h:14
+#: panels/color/color.ui:278
 msgid "Profile Whitepoint"
 msgstr "Profile Whitepoint"
 
-#: ../panels/color/color.ui.h:15
+#: panels/color/color.ui:293
 msgid ""
 "Please set the display to a brightness that is typical for you. Color "
 "management will be most accurate at this brightness level."
@@ -631,7 +631,7 @@ msgstr ""
 "Please set the display to a brightness that is typical for you. Colour "
 "management will be most accurate at this brightness level."
 
-#: ../panels/color/color.ui.h:16
+#: panels/color/color.ui:307
 msgid ""
 "Alternatively, you can use the brightness level used with one of the other "
 "profiles for this device."
@@ -639,11 +639,11 @@ msgstr ""
 "Alternatively, you can use the brightness level used with one of the other "
 "profiles for this device."
 
-#: ../panels/color/color.ui.h:17
+#: panels/color/color.ui:318
 msgid "Display Brightness"
 msgstr "Display Brightness"
 
-#: ../panels/color/color.ui.h:18
+#: panels/color/color.ui:333
 msgid ""
 "You can use a color profile on different computers, or even create profiles "
 "for different lighting conditions."
@@ -651,35 +651,35 @@ msgstr ""
 "You can use a colour profile on different computers, or even create profiles "
 "for different lighting conditions."
 
-#: ../panels/color/color.ui.h:19
+#: panels/color/color.ui:348
 msgid "Profile Name:"
 msgstr "Profile Name:"
 
-#: ../panels/color/color.ui.h:20
+#: panels/color/color.ui:377
 msgid "Profile Name"
 msgstr "Profile Name"
 
-#: ../panels/color/color.ui.h:21
+#: panels/color/color.ui:392
 msgid "Profile successfully created!"
 msgstr "Profile successfully created!"
 
-#: ../panels/color/color.ui.h:22
+#: panels/color/color.ui:443
 msgid "Copy profile"
 msgstr "Copy profile"
 
-#: ../panels/color/color.ui.h:23
+#: panels/color/color.ui:456
 msgid "Requires writable media"
 msgstr "Requires writeable media"
 
-#: ../panels/color/color.ui.h:24
+#: panels/color/color.ui:519
 msgid "Upload profile"
 msgstr "Upload profile"
 
-#: ../panels/color/color.ui.h:25
+#: panels/color/color.ui:532
 msgid "Requires Internet connection"
 msgstr "Requires Internet connection"
 
-#: ../panels/color/color.ui.h:26
+#: panels/color/color.ui:591
 msgid ""
 "You may find these instructions on how to use the profile on <a href=\"linux"
 "\">GNU/Linux</a>, <a href=\"osx\">Apple OS X</a> and <a href=\"windows"
@@ -689,29 +689,26 @@ msgstr ""
 "\">GNU/Linux</a>, <a href=\"osx\">Apple OS X</a> and <a href=\"windows"
 "\">Microsoft Windows</a> systems useful."
 
-#: ../panels/color/color.ui.h:27
-#: ../panels/user-accounts/um-fingerprint-dialog.c:723
+#: panels/color/color.ui:607 panels/user-accounts/um-fingerprint-dialog.c:720
 msgid "Summary"
 msgstr "Summary"
 
-#: ../panels/color/color.ui.h:28
-#| msgid "Add profile"
+#: panels/color/color.ui:621
 msgid "Add Profile"
 msgstr "Add Profile"
 
-#: ../panels/color/color.ui.h:29
+#: panels/color/color.ui:643
 msgid "_Import File…"
 msgstr "_Import File…"
 
-#: ../panels/color/color.ui.h:31
-#: ../panels/network/connection-editor/net-connection-editor.c:519
-#: ../panels/printers/new-printer-dialog.ui.h:4
-#: ../panels/region/input-chooser.ui.h:3
-#: ../panels/user-accounts/data/account-dialog.ui.h:3
+#: panels/color/color.ui:672
+#: panels/network/connection-editor/net-connection-editor.c:519
+#: panels/printers/new-printer-dialog.ui:80 panels/region/input-chooser.ui:22
+#: panels/user-accounts/data/account-dialog.ui:47
 msgid "_Add"
 msgstr "_Add"
 
-#: ../panels/color/color.ui.h:32
+#: panels/color/color.ui:732
 msgid ""
 "Problems detected. The profile may not work correctly. <a href=\"\">Show "
 "details.</a>"
@@ -719,223 +716,227 @@ msgstr ""
 "Problems detected. The profile may not work correctly. <a href=\"\">Show "
 "details.</a>"
 
-#: ../panels/color/color.ui.h:33
+#: panels/color/color.ui:807
 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:34
+#: panels/color/color.ui:829
 msgid "Learn more"
 msgstr "Learn more"
 
-#: ../panels/color/color.ui.h:35
+#: panels/color/color.ui:834
 msgid "Learn more about color management"
 msgstr "Learn more about colour management"
 
-#: ../panels/color/color.ui.h:36
+#: panels/color/color.ui:882
 msgid "_Set for all users"
 msgstr "_Set for all users"
 
-#: ../panels/color/color.ui.h:37
+#: panels/color/color.ui:886 panels/color/color.ui:901
+#: panels/color/color.ui:902
 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
+#: panels/color/color.ui:897
 msgid "_Enable"
 msgstr "_Enable"
 
-#: ../panels/color/color.ui.h:39
+#: panels/color/color.ui:928
 msgid "_Add profile"
 msgstr "_Add profile"
 
-#: ../panels/color/color.ui.h:40
+#: panels/color/color.ui:941
 msgid "_Calibrate…"
 msgstr "_Calibrate…"
 
-#: ../panels/color/color.ui.h:41
+#: panels/color/color.ui:945
 msgid "Calibrate the device"
 msgstr "Calibrate the device"
 
-#: ../panels/color/color.ui.h:42
+#: panels/color/color.ui:956
 msgid "_Remove profile"
 msgstr "_Remove profile"
 
-#: ../panels/color/color.ui.h:43
+#: panels/color/color.ui:969
 msgid "_View details"
 msgstr "_View details"
 
-#: ../panels/color/color.ui.h:44
+#: panels/color/color.ui:1005
 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:45
+#: panels/color/color.ui:1047
 msgid "LCD"
 msgstr "LCD"
 
-#: ../panels/color/color.ui.h:46
+#: panels/color/color.ui:1052
 msgid "LED"
 msgstr "LED"
 
-#: ../panels/color/color.ui.h:47
+#: panels/color/color.ui:1057
 msgid "CRT"
 msgstr "CRT"
 
-#: ../panels/color/color.ui.h:48
+#: panels/color/color.ui:1062
 msgid "Projector"
 msgstr "Projector"
 
-#: ../panels/color/color.ui.h:49
+#: panels/color/color.ui:1067
 msgid "Plasma"
 msgstr "Plasma"
 
-#: ../panels/color/color.ui.h:50
+#: panels/color/color.ui:1072
 msgid "LCD (CCFL backlight)"
 msgstr "LCD (CCFL backlight)"
 
-#: ../panels/color/color.ui.h:51
+#: panels/color/color.ui:1077
 msgid "LCD (RGB LED backlight)"
 msgstr "LCD (RGB LED backlight)"
 
-#: ../panels/color/color.ui.h:52
+#: panels/color/color.ui:1082
 msgid "LCD (white LED backlight)"
 msgstr "LCD (white LED backlight)"
 
-#: ../panels/color/color.ui.h:53
+#: panels/color/color.ui:1087
 msgid "Wide gamut LCD (CCFL backlight)"
 msgstr "Wide gamut LCD (CCFL backlight)"
 
-#: ../panels/color/color.ui.h:54
+#: panels/color/color.ui:1092
 msgid "Wide gamut LCD (RGB LED backlight)"
 msgstr "Wide gamut LCD (RGB LED backlight)"
 
-#: ../panels/color/color.ui.h:55
+#: panels/color/color.ui:1109
 msgctxt "Calibration quality"
 msgid "High"
 msgstr "High"
 
-#: ../panels/color/color.ui.h:56
+#: panels/color/color.ui:1110
 msgid "40 minutes"
 msgstr "40 minutes"
 
-#: ../panels/color/color.ui.h:57
+#: panels/color/color.ui:1114
 msgctxt "Calibration quality"
 msgid "Medium"
 msgstr "Medium"
 
-#: ../panels/color/color.ui.h:58 ../panels/power/power.ui.h:2
-#: ../panels/privacy/privacy.ui.h:7
+#: panels/color/color.ui:1115 panels/power/power.ui:25
+#: panels/privacy/privacy.ui:38
 msgid "30 minutes"
 msgstr "30 minutes"
 
-#: ../panels/color/color.ui.h:59
+#: panels/color/color.ui:1119
 msgctxt "Calibration quality"
 msgid "Low"
 msgstr "Low"
 
-#: ../panels/color/color.ui.h:60 ../panels/power/power.ui.h:1
+#: panels/color/color.ui:1120 panels/power/power.ui:13 panels/power/power.ui:95
 msgid "15 minutes"
 msgstr "15 minutes"
 
-#: ../panels/color/color.ui.h:61
+#: panels/color/color.ui:1142
 msgid "Native to display"
 msgstr "Native to display"
 
-#: ../panels/color/color.ui.h:62
+#: panels/color/color.ui:1146
 msgid "D50 (Printing and publishing)"
 msgstr "D50 (Printing and publishing)"
 
-#: ../panels/color/color.ui.h:63
+#: panels/color/color.ui:1150
 msgid "D55"
 msgstr "D55"
 
-#: ../panels/color/color.ui.h:64
+#: panels/color/color.ui:1154
 msgid "D65 (Photography and graphics)"
 msgstr "D65 (Photography and graphics)"
 
-#: ../panels/color/color.ui.h:65
+#: panels/color/color.ui:1158
 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"
+#: panels/color/gnome-color-panel.desktop.in.in:3
+msgid "Color"
 msgstr "Colour"
 
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:3
+#: panels/color/gnome-color-panel.desktop.in.in:4
 msgid ""
 "Calibrate the color of your devices, such as displays, cameras or printers"
 msgstr ""
 "Calibrate the colour of your devices, such as displays, cameras or printers"
 
+#: panels/color/gnome-color-panel.desktop.in.in:6
+#| msgid "Preferences"
+msgid "preferences-color"
+msgstr "preferences-color"
+
 #. Translators: those are keywords for the color control-center panel
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:5
+#: panels/color/gnome-color-panel.desktop.in.in:18
 msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
 msgstr "Colour;ICC;Profile;Calibrate;Printer;Display;"
 
-#: ../panels/common/cc-common-language.c:323
+#: panels/common/cc-common-language.c:323
 msgid "Other…"
 msgstr "Other…"
 
-#: ../panels/common/cc-language-chooser.c:124
-#: ../panels/region/cc-format-chooser.c:269
-#: ../panels/region/cc-input-chooser.c:169
+#: panels/common/cc-language-chooser.c:124
+#: panels/region/cc-format-chooser.c:269 panels/region/cc-input-chooser.c:169
 msgid "More…"
 msgstr "More…"
 
-#: ../panels/common/cc-language-chooser.c:140
+#: panels/common/cc-language-chooser.c:140
 msgid "No languages found"
 msgstr "No languages found"
 
-#: ../panels/common/cc-util.c:127
-#: ../panels/network/connection-editor/ce-page-details.c:106
+#: panels/common/cc-util.c:127
+#: panels/network/connection-editor/ce-page-details.c:106
 msgid "Today"
 msgstr "Today"
 
-#: ../panels/common/cc-util.c:131
-#: ../panels/network/connection-editor/ce-page-details.c:108
+#: panels/common/cc-util.c:131
+#: panels/network/connection-editor/ce-page-details.c:108
 msgid "Yesterday"
 msgstr "Yesterday"
 
 #. Translators: This is a date format string in the style of "Feb 24".
-#: ../panels/common/cc-util.c:138
+#: 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
+#: panels/common/cc-util.c:143
 msgid "%b %e, %Y"
 msgstr "%e %b, %Y"
 
-#: ../panels/common/language-chooser.ui.h:1
+#: panels/common/language-chooser.ui:5
 msgid "Language"
 msgstr "Language"
 
-#: ../panels/datetime/big.ui.h:1 ../panels/datetime/little.ui.h:1
-#: ../panels/datetime/middle.ui.h:1 ../panels/datetime/ydm.ui.h:1
+#: panels/datetime/big.ui:16 panels/datetime/little.ui:16
+#: panels/datetime/middle.ui:16 panels/datetime/ydm.ui:16
 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
+#: panels/datetime/big.ui:32 panels/datetime/little.ui:32
+#: panels/datetime/middle.ui:32 panels/datetime/ydm.ui:32
 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
+#: panels/datetime/big.ui:48 panels/datetime/little.ui:48
+#: panels/datetime/middle.ui:48 panels/datetime/ydm.ui:48
 msgid "Year"
 msgstr "Year"
 
 #. Translators: This is the full date and time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:339
+#: panels/datetime/cc-datetime-panel.c:333
 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:344
+#: panels/datetime/cc-datetime-panel.c:338
 msgid "%e %B %Y, %R"
 msgstr "%e %B %Y, %R"
 
 #. Translators: "city, country"
-#: ../panels/datetime/cc-datetime-panel.c:522
+#: panels/datetime/cc-datetime-panel.c:503
 #, c-format
 msgctxt "timezone loc"
 msgid "%s, %s"
@@ -943,7 +944,7 @@ msgstr "%s, %s"
 
 #. Update the timezone on the listbow row
 #. Translators: "timezone (details)"
-#: ../panels/datetime/cc-datetime-panel.c:552
+#: panels/datetime/cc-datetime-panel.c:530
 #, c-format
 msgctxt "timezone desc"
 msgid "%s (%s)"
@@ -951,218 +952,207 @@ 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:560
+#: panels/datetime/cc-datetime-panel.c:537
 msgid "UTC%:::z"
 msgstr "UTC%:::z"
 
 #. Translators: This is the time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:565
+#: panels/datetime/cc-datetime-panel.c:542
 msgid "%l:%M %p"
 msgstr "%H:%M"
 
 #. Translators: This is the time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:570
+#: panels/datetime/cc-datetime-panel.c:547
 msgid "%R"
 msgstr "%R"
 
 #. Update the text bubble in the timezone map
 #. Translators: "timezone (utc shift)"
-#: ../panels/datetime/cc-datetime-panel.c:575
+#: panels/datetime/cc-datetime-panel.c:552
 #, c-format
 msgctxt "timezone map"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../panels/datetime/datetime.ui.h:1
+#: panels/datetime/datetime.ui:22
 msgid "January"
 msgstr "January"
 
-#: ../panels/datetime/datetime.ui.h:2
+#: panels/datetime/datetime.ui:25
 msgid "February"
 msgstr "February"
 
-#: ../panels/datetime/datetime.ui.h:3
+#: panels/datetime/datetime.ui:28
 msgid "March"
 msgstr "March"
 
-#: ../panels/datetime/datetime.ui.h:4
+#: panels/datetime/datetime.ui:31
 msgid "April"
 msgstr "April"
 
-#: ../panels/datetime/datetime.ui.h:5
+#: panels/datetime/datetime.ui:34
 msgid "May"
 msgstr "May"
 
-#: ../panels/datetime/datetime.ui.h:6
+#: panels/datetime/datetime.ui:37
 msgid "June"
 msgstr "June"
 
-#: ../panels/datetime/datetime.ui.h:7
+#: panels/datetime/datetime.ui:40
 msgid "July"
 msgstr "July"
 
-#: ../panels/datetime/datetime.ui.h:8
+#: panels/datetime/datetime.ui:43
 msgid "August"
 msgstr "August"
 
-#: ../panels/datetime/datetime.ui.h:9
+#: panels/datetime/datetime.ui:46
 msgid "September"
 msgstr "September"
 
-#: ../panels/datetime/datetime.ui.h:10
+#: panels/datetime/datetime.ui:49
 msgid "October"
 msgstr "October"
 
-#: ../panels/datetime/datetime.ui.h:11
+#: panels/datetime/datetime.ui:52
 msgid "November"
 msgstr "November"
 
-#: ../panels/datetime/datetime.ui.h:12
+#: panels/datetime/datetime.ui:55
 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:2
+#: panels/datetime/datetime.ui:61
+#: panels/datetime/gnome-datetime-panel.desktop.in.in:3
 msgid "Date & Time"
 msgstr "Date & Time"
 
-#: ../panels/datetime/datetime.ui.h:14
+#: panels/datetime/datetime.ui:106
 msgid "Hour"
 msgstr "Hour"
 
 #. Translator: this is the separator between hours and minutes, like in HH∶MM
-#: ../panels/datetime/datetime.ui.h:16
+#: panels/datetime/datetime.ui:121
 msgid "∶"
 msgstr ":"
 
-#: ../panels/datetime/datetime.ui.h:17
+#: panels/datetime/datetime.ui:143
 msgid "Minute"
 msgstr "Minute"
 
-#: ../panels/datetime/datetime.ui.h:18
+#: panels/datetime/datetime.ui:208
 msgid "Time Zone"
 msgstr "Time Zone"
 
-#: ../panels/datetime/datetime.ui.h:19
+#: panels/datetime/datetime.ui:228
 msgid "Search for a city"
 msgstr "Search for a city"
 
-#: ../panels/datetime/datetime.ui.h:20
+#: panels/datetime/datetime.ui:304
 msgid "Automatic _Date & Time"
 msgstr "Automatic _Date & Time"
 
-#: ../panels/datetime/datetime.ui.h:21
+#: panels/datetime/datetime.ui:319 panels/datetime/datetime.ui:397
 msgid "Requires internet access"
 msgstr "Requires internet access"
 
-#: ../panels/datetime/datetime.ui.h:22
+#: panels/datetime/datetime.ui:382
 msgid "Automatic Time _Zone"
 msgstr "Automatic Time _Zone"
 
-#: ../panels/datetime/datetime.ui.h:23
+#: panels/datetime/datetime.ui:454
 msgid "Date & _Time"
 msgstr "Date & _Time"
 
-#: ../panels/datetime/datetime.ui.h:24
+#: panels/datetime/datetime.ui:502
 msgid "Time Z_one"
 msgstr "Time Z_one"
 
-#: ../panels/datetime/datetime.ui.h:25
+#: panels/datetime/datetime.ui:570
 msgid "Time _Format"
 msgstr "Time _Format"
 
-#: ../panels/datetime/datetime.ui.h:26
+#: panels/datetime/datetime.ui:588
 msgid "24-hour"
 msgstr "24-hour"
 
-#: ../panels/datetime/datetime.ui.h:27
+#: panels/datetime/datetime.ui:589
 msgid "AM / PM"
 msgstr "AM/PM"
 
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3
+#: panels/datetime/gnome-datetime-panel.desktop.in.in:4
 msgid "Change the date and time, including time zone"
 msgstr "Change the date and time, including time zone"
 
+#: panels/datetime/gnome-datetime-panel.desktop.in.in:6
+msgid "preferences-system-time"
+msgstr "preferences-system-time"
+
 #. Translators: those are keywords for the date and time control-center panel
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5
+#: panels/datetime/gnome-datetime-panel.desktop.in.in:14
 msgid "Clock;Timezone;Location;"
 msgstr "Clock;Timezone;Location;"
 
-#: ../panels/datetime/org.gnome.controlcenter.datetime.policy.in.h:1
+#: panels/datetime/org.gnome.controlcenter.datetime.policy.in:11
 msgid "Change system time and date settings"
 msgstr "Change system time and date settings"
 
-#: ../panels/datetime/org.gnome.controlcenter.datetime.policy.in.h:2
+#: panels/datetime/org.gnome.controlcenter.datetime.policy.in:12
 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:738
-#| msgid "Landscape"
+#: panels/display/cc-display-panel.c:729
 msgctxt "Display rotation"
 msgid "Landscape"
 msgstr "Landscape"
 
-#: ../panels/display/cc-display-panel.c:741
-#| msgid "Portrait"
+#: panels/display/cc-display-panel.c:732
 msgctxt "Display rotation"
 msgid "Portrait Right"
 msgstr "Portrait Right"
 
-#: ../panels/display/cc-display-panel.c:744
-#| msgid "Portrait"
+#: panels/display/cc-display-panel.c:735
 msgctxt "Display rotation"
 msgid "Portrait Left"
 msgstr "Portrait Left"
 
-#: ../panels/display/cc-display-panel.c:747
-#| msgid "Landscape"
+#: panels/display/cc-display-panel.c:738
 msgctxt "Display rotation"
 msgid "Landscape (flipped)"
 msgstr "Landscape (flipped)"
 
 #. Translators: This option sets orientation of print (portrait, landscape...)
-#: ../panels/display/cc-display-panel.c:788
-#: ../panels/display/cc-display-panel.c:838
-#: ../panels/printers/pp-options-dialog.c:558
+#: panels/display/cc-display-panel.c:805
+#: panels/printers/pp-options-dialog.c:558
 msgid "Orientation"
 msgstr "Orientation"
 
-#: ../panels/display/cc-display-panel.c:881
-#: ../panels/display/cc-display-panel.c:933
-#: ../panels/display/cc-display-panel.c:1772
-#: ../panels/display/cc-display-panel.c:1818
-#: ../panels/printers/pp-options-dialog.c:87
+#: panels/display/cc-display-panel.c:870 panels/display/cc-display-panel.c:1673
+#: panels/printers/pp-options-dialog.c:87
 msgid "Resolution"
 msgstr "Resolution"
 
-#: ../panels/display/cc-display-panel.c:978
-#: ../panels/display/cc-display-panel.c:1049
+#: panels/display/cc-display-panel.c:958
 msgid "Refresh Rate"
 msgstr "Refresh Rate"
 
-#: ../panels/display/cc-display-panel.c:1207
-#| msgctxt "background, style"
-#| msgid "Scale"
+#: panels/display/cc-display-panel.c:1095
 msgid "Scale"
 msgstr "Scale"
 
-#: ../panels/display/cc-display-panel.c:1260
+#: panels/display/cc-display-panel.c:1148
 msgid "Adjust for TV"
 msgstr "Adjust for TV"
 
-#: ../panels/display/cc-display-panel.c:1472
-#: ../panels/display/cc-display-panel.c:1518
-#| msgid "Secondary Display"
+#: panels/display/cc-display-panel.c:1410
 msgid "Primary Display"
 msgstr "Primary Display"
 
-#: ../panels/display/cc-display-panel.c:1567
-#| msgid "Display language:"
+#: panels/display/cc-display-panel.c:1439
 msgid "Display Arrangement"
 msgstr "Display Arrangement"
 
-#: ../panels/display/cc-display-panel.c:1568
+#: panels/display/cc-display-panel.c:1440
 msgid ""
 "Drag displays to match your setup. The top bar is placed on the primary "
 "display."
@@ -1170,91 +1160,85 @@ msgstr ""
 "Drag displays to match your setup. The top bar is placed on the primary "
 "display."
 
-#: ../panels/display/cc-display-panel.c:2006
-#| msgid "Display Type"
+#: panels/display/cc-display-panel.c:1863
 msgid "Display Mode"
 msgstr "Display Mode"
 
-#: ../panels/display/cc-display-panel.c:2022
-#| msgctxt "universal access, seeing"
-#| msgid "Display"
+#: panels/display/cc-display-panel.c:1879
 msgid "Join Displays"
 msgstr "Join Displays"
 
-#: ../panels/display/cc-display-panel.c:2025
+#: panels/display/cc-display-panel.c:1882
 msgid "Mirror"
 msgstr "Mirror"
 
-#: ../panels/display/cc-display-panel.c:2028
-#| msgctxt "universal access, seeing"
-#| msgid "Display"
+#: panels/display/cc-display-panel.c:1885
 msgid "Single Display"
 msgstr "Single Display"
 
-#: ../panels/display/cc-display-panel.c:2714
+#: panels/display/cc-display-panel.c:2590
 msgid "Apply Changes?"
 msgstr "Apply Changes?"
 
-#: ../panels/display/cc-display-panel.c:2728
-#: ../panels/network/connection-editor/connection-editor.ui.h:2
-#: ../panels/network/network-wifi.ui.h:2
+#: panels/display/cc-display-panel.c:2604
+#: panels/network/connection-editor/connection-editor.ui:24
+#: panels/network/network-wifi.ui:38
 msgid "_Apply"
 msgstr "_Apply"
 
-#: ../panels/display/cc-display-panel.c:3104
+#: panels/display/cc-display-panel.c:2979
 #, c-format
 msgid "%.2lf Hz"
 msgstr "%.2lf Hz"
 
 #. TRANSLATORS: the state of the night light setting
-#: ../panels/display/cc-display-panel.c:3320
-#: ../panels/notifications/cc-notifications-panel.c:293
-#: ../panels/power/cc-power-panel.c:1970 ../panels/power/cc-power-panel.c:1977
-#: ../panels/privacy/cc-privacy-panel.c:190
-#: ../panels/privacy/cc-privacy-panel.c:257
-#: ../panels/universal-access/cc-ua-panel.c:331
-#: ../panels/universal-access/cc-ua-panel.c:712
-#: ../panels/universal-access/cc-ua-panel.c:725
-#: ../panels/universal-access/cc-ua-panel.c:737
-#: ../panels/universal-access/cc-ua-panel.c:908
+#: panels/display/cc-display-panel.c:3195
+#: panels/notifications/cc-notifications-panel.c:292
+#: panels/power/cc-power-panel.c:1982 panels/power/cc-power-panel.c:1989
+#: panels/privacy/cc-privacy-panel.c:190 panels/privacy/cc-privacy-panel.c:257
+#: panels/universal-access/cc-ua-panel.c:331
+#: panels/universal-access/cc-ua-panel.c:712
+#: panels/universal-access/cc-ua-panel.c:725
+#: panels/universal-access/cc-ua-panel.c:737
+#: panels/universal-access/cc-ua-panel.c:908
 msgid "On"
 msgstr "On"
 
-#: ../panels/display/cc-display-panel.c:3320 ../panels/network/net-proxy.c:54
-#: ../panels/notifications/cc-notifications-panel.c:293
-#: ../panels/power/cc-power-panel.c:1964 ../panels/power/cc-power-panel.c:1975
-#: ../panels/privacy/cc-privacy-panel.c:190
-#: ../panels/privacy/cc-privacy-panel.c:257
-#: ../panels/universal-access/cc-ua-panel.c:331
-#: ../panels/universal-access/cc-ua-panel.c:712
-#: ../panels/universal-access/cc-ua-panel.c:725
-#: ../panels/universal-access/cc-ua-panel.c:737
-#: ../panels/universal-access/cc-ua-panel.c:908
-#: ../panels/universal-access/uap.ui.h:7
+#: panels/display/cc-display-panel.c:3195 panels/network/net-proxy.c:54
+#: panels/notifications/cc-notifications-panel.c:292
+#: panels/power/cc-power-panel.c:1976 panels/power/cc-power-panel.c:1987
+#: panels/privacy/cc-privacy-panel.c:190 panels/privacy/cc-privacy-panel.c:257
+#: panels/universal-access/cc-ua-panel.c:331
+#: panels/universal-access/cc-ua-panel.c:712
+#: panels/universal-access/cc-ua-panel.c:725
+#: panels/universal-access/cc-ua-panel.c:737
+#: panels/universal-access/cc-ua-panel.c:908 panels/universal-access/uap.ui:334
+#: panels/universal-access/uap.ui:380 panels/universal-access/uap.ui:426
+#: panels/universal-access/uap.ui:532 panels/universal-access/uap.ui:685
+#: panels/universal-access/uap.ui:731 panels/universal-access/uap.ui:777
+#: panels/universal-access/uap.ui:929
 msgid "Off"
 msgstr "Off"
 
-#: ../panels/display/cc-display-panel.c:3341
-#| msgid "Right Ring"
+#: panels/display/cc-display-panel.c:3216
 msgid "_Night Light"
 msgstr "_Night Light"
 
-#: ../panels/display/cc-display-panel.c:3406
+#: panels/display/cc-display-panel.c:3281
 msgid "Could not get screen information"
 msgstr "Could not get screen information"
 
 #. This cancels the redshift inhibit.
-#: ../panels/display/display.ui.h:2
-#| msgid "Restart Now"
+#: panels/display/display.ui:71
 msgid "Restart Filter"
 msgstr "Restart Filter"
 
 #. Inhibit the redshift functionality until the next day starts
-#: ../panels/display/display.ui.h:4
+#: panels/display/display.ui:103
 msgid "Temporarily Disabled Until Tomorrow"
 msgstr "Temporarily Disabled Until Tomorrow"
 
-#: ../panels/display/display.ui.h:5
+#: panels/display/display.ui:144
 msgid ""
 "Night light makes the screen color warmer. This can help to prevent eye "
 "strain and sleeplessness."
@@ -1263,62 +1247,64 @@ msgstr ""
 "strain and sleeplessness."
 
 #. This is the redshift functionality where we suppress blue light when the sun has gone down
-#: ../panels/display/display.ui.h:7
-#| msgid "Right Ring"
+#: panels/display/display.ui:171 panels/display/display.ui:567
 msgid "Night Light"
 msgstr "Night Light"
 
-#: ../panels/display/display.ui.h:8
+#: panels/display/display.ui:187
 msgid "Schedule"
 msgstr "Schedule"
 
-#: ../panels/display/display.ui.h:9
+#: panels/display/display.ui:215
 msgid "Sunset to Sunrise"
 msgstr "Sunset to Sunrise"
 
-#: ../panels/display/display.ui.h:10
-#: ../panels/network/connection-editor/ip4-page.ui.h:4
-#: ../panels/network/connection-editor/ip6-page.ui.h:5
-#: ../panels/network/net-proxy.c:56 ../panels/network/network-proxy.ui.h:3
-#: ../panels/network/network-wifi.ui.h:26
-#: ../panels/privacy/cc-privacy-panel.c:217
+#: panels/display/display.ui:229
+#: panels/network/connection-editor/ip4-page.ui:69
+#: panels/network/connection-editor/ip6-page.ui:83
+#: panels/network/net-proxy.c:56 panels/network/network-proxy.ui:113
+#: panels/network/network-wifi.ui:777 panels/network/network-wifi.ui:1054
+#: panels/privacy/cc-privacy-panel.c:217
 msgid "Manual"
 msgstr "Manual"
 
-#: ../panels/display/display.ui.h:11
+#: panels/display/display.ui:268
 msgid "From"
 msgstr "From"
 
-#: ../panels/display/display.ui.h:12
+#: panels/display/display.ui:309 panels/display/display.ui:430
 msgid ":"
 msgstr ":"
 
 #. This is the short form for the time period in the morning
-#: ../panels/display/display.ui.h:14
+#: panels/display/display.ui:343 panels/display/display.ui:464
 msgid "AM"
 msgstr "AM"
 
 #. This is the short form for the time period in the afternoon
-#: ../panels/display/display.ui.h:16
+#: panels/display/display.ui:359 panels/display/display.ui:480
 msgid "PM"
 msgstr "PM"
 
-#: ../panels/display/display.ui.h:17
+#: panels/display/display.ui:528
 msgid "To"
 msgstr "To"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:2
-msgid "Dis­plays"
-msgstr "Dis­plays"
+#: panels/display/gnome-display-panel.desktop.in.in:3
+#| msgid "Dis­plays"
+msgid "Displays"
+msgstr "Displays"
 
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:3
+#: panels/display/gnome-display-panel.desktop.in.in:4
 msgid "Choose how to use connected monitors and projectors"
 msgstr "Choose how to use connected monitors and projectors"
 
+#: panels/display/gnome-display-panel.desktop.in.in:6
+msgid "preferences-desktop-display"
+msgstr "preferences-desktop-display"
+
 #. Translators: those are keywords for the display control-center panel
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:5
-#| msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;"
+#: panels/display/gnome-display-panel.desktop.in.in:18
 msgid ""
 "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;Night;Light;Blue;"
 "redshift;color;sunset;sunrise;"
@@ -1327,9 +1313,8 @@ msgstr ""
 "redshift;colour;sunset;sunrise;"
 
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-overview-panel.c:381
-#: ../panels/info/cc-info-overview-panel.c:468
-#: ../panels/network/panel-common.c:123
+#: panels/info/cc-info-overview-panel.c:374
+#: panels/info/cc-info-overview-panel.c:457 panels/network/panel-common.c:123
 msgid "Unknown"
 msgstr "Unknown"
 
@@ -1337,80 +1322,61 @@ msgstr "Unknown"
 #. * example:
 #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or
 #. * "Ubuntu 16.04 LTS; Build ID: jki"
-#: ../panels/info/cc-info-overview-panel.c:476
+#: panels/info/cc-info-overview-panel.c:465
 #, c-format
-#| msgid "%d-bit (Build ID: %s)"
 msgid "%s; Build ID: %s"
 msgstr "%s; Build ID: %s"
 
 #. translators: This is the type of architecture for the OS
-#: ../panels/info/cc-info-overview-panel.c:493
+#: panels/info/cc-info-overview-panel.c:482
 #, c-format
-#| msgid "%d-bit"
 msgid "64-bit"
 msgstr "64-bit"
 
 #. translators: This is the type of architecture for the OS
-#: ../panels/info/cc-info-overview-panel.c:496
+#: panels/info/cc-info-overview-panel.c:485
 #, c-format
-#| msgid "%d-bit"
 msgid "32-bit"
 msgstr "32-bit"
 
-#: ../panels/info/cc-info-overview-panel.c:800
+#: panels/info/cc-info-overview-panel.c:775
 #, c-format
 msgid "Version %s"
 msgstr "Version %s"
 
-#: ../panels/info/cc-info-panel.c:138
-msgid "Section"
-msgstr "Section"
-
-#: ../panels/info/cc-info-panel.c:147 ../panels/info/info.ui.h:1
-msgid "Overview"
-msgstr "Overview"
-
-#: ../panels/info/cc-info-panel.c:153 ../panels/info/info.ui.h:2
-msgid "Default Applications"
-msgstr "Default Applications"
-
-#: ../panels/info/cc-info-panel.c:158 ../panels/info/info.ui.h:3
-msgid "Removable Media"
-msgstr "Removable Media"
-
-#: ../panels/info/cc-info-removable-media-panel.c:312
+#: panels/info/cc-info-removable-media-panel.c:298
 msgid "Ask what to do"
 msgstr "Ask what to do"
 
-#: ../panels/info/cc-info-removable-media-panel.c:316
+#: panels/info/cc-info-removable-media-panel.c:302
 msgid "Do nothing"
 msgstr "Do nothing"
 
-#: ../panels/info/cc-info-removable-media-panel.c:320
+#: panels/info/cc-info-removable-media-panel.c:306
 msgid "Open folder"
 msgstr "Open folder"
 
-#: ../panels/info/cc-info-removable-media-panel.c:411
+#: panels/info/cc-info-removable-media-panel.c:391
 msgid "Other Media"
 msgstr "Other Media"
 
-#: ../panels/info/cc-info-removable-media-panel.c:444
+#: panels/info/cc-info-removable-media-panel.c:424
 msgid "Select an application for audio CDs"
 msgstr "Select an application for audio CDs"
 
-#: ../panels/info/cc-info-removable-media-panel.c:445
+#: panels/info/cc-info-removable-media-panel.c:425
 msgid "Select an application for video DVDs"
 msgstr "Select an application for video DVDs"
 
-#: ../panels/info/cc-info-removable-media-panel.c:446
+#: panels/info/cc-info-removable-media-panel.c:426
 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-removable-media-panel.c:447
+#: panels/info/cc-info-removable-media-panel.c:427
 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-removable-media-panel.c:448
+#: panels/info/cc-info-removable-media-panel.c:428
 msgid "Select an application for software CDs"
 msgstr "Select an application for software CDs"
 
@@ -1419,83 +1385,88 @@ 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-removable-media-panel.c:460
+#: panels/info/cc-info-removable-media-panel.c:440
 msgid "audio DVD"
 msgstr "audio DVD"
 
-#: ../panels/info/cc-info-removable-media-panel.c:461
+#: panels/info/cc-info-removable-media-panel.c:441
 msgid "blank Blu-ray disc"
 msgstr "blank Blu-ray disc"
 
-#: ../panels/info/cc-info-removable-media-panel.c:462
+#: panels/info/cc-info-removable-media-panel.c:442
 msgid "blank CD disc"
 msgstr "blank CD disc"
 
-#: ../panels/info/cc-info-removable-media-panel.c:463
+#: panels/info/cc-info-removable-media-panel.c:443
 msgid "blank DVD disc"
 msgstr "blank DVD disc"
 
-#: ../panels/info/cc-info-removable-media-panel.c:464
+#: panels/info/cc-info-removable-media-panel.c:444
 msgid "blank HD DVD disc"
 msgstr "blank HD DVD disc"
 
-#: ../panels/info/cc-info-removable-media-panel.c:465
+#: panels/info/cc-info-removable-media-panel.c:445
 msgid "Blu-ray video disc"
 msgstr "Blu-ray video disc"
 
-#: ../panels/info/cc-info-removable-media-panel.c:466
+#: panels/info/cc-info-removable-media-panel.c:446
 msgid "e-book reader"
 msgstr "e-book reader"
 
-#: ../panels/info/cc-info-removable-media-panel.c:467
+#: panels/info/cc-info-removable-media-panel.c:447
 msgid "HD DVD video disc"
 msgstr "HD DVD video disc"
 
-#: ../panels/info/cc-info-removable-media-panel.c:468
+#: panels/info/cc-info-removable-media-panel.c:448
 msgid "Picture CD"
 msgstr "Picture CD"
 
-#: ../panels/info/cc-info-removable-media-panel.c:469
+#: panels/info/cc-info-removable-media-panel.c:449
 msgid "Super Video CD"
 msgstr "Super Video CD"
 
-#: ../panels/info/cc-info-removable-media-panel.c:470
+#: panels/info/cc-info-removable-media-panel.c:450
 msgid "Video CD"
 msgstr "Video CD"
 
-#: ../panels/info/cc-info-removable-media-panel.c:471
+#: panels/info/cc-info-removable-media-panel.c:451
 msgid "Windows software"
 msgstr "Windows software"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:2
-#| msgid "Default Applications"
-msgid "Defa­ult Applications"
-msgstr "Defa­ult Applications"
+#: panels/info/gnome-default-apps-panel.desktop.in.in:3
+msgid "Default Applications"
+msgstr "Default Applications"
 
-#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:3
-#| msgid "Default Applications"
+#: panels/info/gnome-default-apps-panel.desktop.in.in:4
 msgid "Configure Default Applications"
 msgstr "Configure Default Applications"
 
+#: panels/info/gnome-default-apps-panel.desktop.in.in:6
+msgid "starred"
+msgstr "starred"
+
 #. Translators: those are keywords for the Default Applications panel
-#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:5
+#: panels/info/gnome-default-apps-panel.desktop.in.in:18
 msgid "default;application;preferred;media;"
 msgstr "default;application;preferred;media;"
 
-#. 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-overview-panel.desktop.in.in.h:2
-msgid "Ab­out"
-msgstr "Ab­out"
+#: panels/info/gnome-info-overview-panel.desktop.in.in:3
+#| msgid "/_About"
+msgid "About"
+msgstr "About"
 
-#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:3
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:3
+#: panels/info/gnome-info-overview-panel.desktop.in.in:4
 msgid "View information about your system"
 msgstr "View information about your system"
 
+#: panels/info/gnome-info-overview-panel.desktop.in.in:6
+msgid "help-about"
+msgstr "help-about"
+
+#. Translators: those are keywords for the System Information panel
+#. "Preferred Applications" is the old name for the preference, so make
 #. sure that you use the same "translation" for those keywords
-#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:5
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:5
+#: panels/info/gnome-info-overview-panel.desktop.in.in:20
 msgid ""
 "device;system;information;memory;processor;version;default;application;"
 "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
@@ -1503,27 +1474,20 @@ msgstr ""
 "device;system;information;memory;processor;version;default;application;"
 "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:2
-msgid "De­tails"
-msgstr "De­tails"
-
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:2
-#| msgid "Removable Media"
-msgid "Remo­vable Media"
-msgstr "Remo­vable Media"
+#: panels/info/gnome-removable-media-panel.desktop.in.in:3
+msgid "Removable Media"
+msgstr "Removable Media"
 
-#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:3
-#| msgid "Configure Bluetooth settings"
+#: panels/info/gnome-removable-media-panel.desktop.in.in:4
 msgid "Configure Removable Media settings"
 msgstr "Configure Removable Media settings"
 
+#: panels/info/gnome-removable-media-panel.desktop.in.in:6
+msgid "media-removable"
+msgstr "media-removable"
+
 #. Translators: those are keywords for the Removable Media panel
-#: ../panels/info/gnome-removable-media-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;"
+#: panels/info/gnome-removable-media-panel.desktop.in.in:18
 msgid ""
 "device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;"
 "removable;media;autorun;"
@@ -1531,291 +1495,287 @@ msgstr ""
 "device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;"
 "removable;media;autorun;"
 
-#: ../panels/info/info-default-apps.ui.h:1
+#: panels/info/info-default-apps.ui:31
 msgid "_Web"
 msgstr "_Web"
 
-#: ../panels/info/info-default-apps.ui.h:2
+#: panels/info/info-default-apps.ui:43
 msgid "_Mail"
 msgstr "_Mail"
 
-#: ../panels/info/info-default-apps.ui.h:3
+#: panels/info/info-default-apps.ui:59
 msgid "_Calendar"
 msgstr "_Calendar"
 
-#: ../panels/info/info-default-apps.ui.h:4
+#: panels/info/info-default-apps.ui:75
 msgid "M_usic"
 msgstr "M_usic"
 
-#: ../panels/info/info-default-apps.ui.h:5
+#: panels/info/info-default-apps.ui:91
 msgid "_Video"
 msgstr "_Video"
 
-#: ../panels/info/info-default-apps.ui.h:6
-#: ../panels/info/info-removable-media.ui.h:5
+#: panels/info/info-default-apps.ui:162 panels/info/info-removable-media.ui:161
 msgid "_Photos"
 msgstr "_Photos"
 
-#: ../panels/info/info-overview.ui.h:1
+#: panels/info/info-overview.ui:58
 msgid "Device name"
 msgstr "Device name"
 
-#: ../panels/info/info-overview.ui.h:2
+#: panels/info/info-overview.ui:74
 msgid "Memory"
 msgstr "Memory"
 
-#: ../panels/info/info-overview.ui.h:3
+#: panels/info/info-overview.ui:90
 msgid "Processor"
 msgstr "Processor"
 
-#: ../panels/info/info-overview.ui.h:4
+#: panels/info/info-overview.ui:106
 msgid "Graphics"
 msgstr "Graphics"
 
 #. To translators: this field contains the distro name and version
-#: ../panels/info/info-overview.ui.h:6
+#: panels/info/info-overview.ui:121
 msgid "OS name"
 msgstr "OS name"
 
 #. To translators: this field contains the distro type
-#: ../panels/info/info-overview.ui.h:8
+#: panels/info/info-overview.ui:137
 msgid "OS type"
 msgstr "OS type"
 
-#: ../panels/info/info-overview.ui.h:9
+#: panels/info/info-overview.ui:153
 msgid "Virtualization"
 msgstr "Virtualisation"
 
-#: ../panels/info/info-overview.ui.h:10
+#: panels/info/info-overview.ui:169
 msgid "Disk"
 msgstr "Disk"
 
-#: ../panels/info/info-overview.ui.h:11
+#: panels/info/info-overview.ui:274
 msgid "Calculating…"
 msgstr "Calculating…"
 
-#: ../panels/info/info-overview.ui.h:12
+#: panels/info/info-overview.ui:314
 msgid "Check for updates"
 msgstr "Check for updates"
 
-#: ../panels/info/info-removable-media.ui.h:1
+#: panels/info/info-removable-media.ui:43
 msgid "Select how media should be handled"
 msgstr "Select how media should be handled"
 
-#: ../panels/info/info-removable-media.ui.h:2
+#: panels/info/info-removable-media.ui:74
 msgid "CD _audio"
 msgstr "CD _audio"
 
-#: ../panels/info/info-removable-media.ui.h:3
+#: panels/info/info-removable-media.ui:91
 msgid "_DVD video"
 msgstr "_DVD video"
 
-#: ../panels/info/info-removable-media.ui.h:4
+#: panels/info/info-removable-media.ui:132
 msgid "_Music player"
 msgstr "_Music player"
 
-#: ../panels/info/info-removable-media.ui.h:6
+#: panels/info/info-removable-media.ui:190
 msgid "_Software"
 msgstr "_Software"
 
-#: ../panels/info/info-removable-media.ui.h:7
+#: panels/info/info-removable-media.ui:228
 msgid "_Other Media…"
 msgstr "_Other Media…"
 
-#: ../panels/info/info-removable-media.ui.h:8
+#: panels/info/info-removable-media.ui:272
 msgid "_Never prompt or start programs on media insertion"
 msgstr "_Never prompt or start programs on media insertion"
 
-#: ../panels/info/info-removable-media.ui.h:9
+#: panels/info/info-removable-media.ui:331
 msgid "Select how other media should be handled"
 msgstr "Select how other media should be handled"
 
-#: ../panels/info/info-removable-media.ui.h:10
+#: panels/info/info-removable-media.ui:370
 msgid "_Action:"
 msgstr "_Action:"
 
-#: ../panels/info/info-removable-media.ui.h:11
+#: panels/info/info-removable-media.ui:393
 msgid "_Type:"
 msgstr "_Type:"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:1
+#: panels/keyboard/00-multimedia.xml.in:2
 msgid "Sound and Media"
 msgstr "Sound and Media"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:2
+#: panels/keyboard/00-multimedia.xml.in:4
 msgid "Volume mute"
 msgstr "Volume mute"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:3
+#: panels/keyboard/00-multimedia.xml.in:6
 msgid "Volume down"
 msgstr "Volume down"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:4
+#: panels/keyboard/00-multimedia.xml.in:8
 msgid "Volume up"
 msgstr "Volume up"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:5
+#: panels/keyboard/00-multimedia.xml.in:10
 msgid "Launch media player"
 msgstr "Launch media player"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:6
+#: panels/keyboard/00-multimedia.xml.in:12
 msgid "Play (or play/pause)"
 msgstr "Play (or play/pause)"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:7
+#: panels/keyboard/00-multimedia.xml.in:14
 msgid "Pause playback"
 msgstr "Pause playback"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:8
+#: panels/keyboard/00-multimedia.xml.in:16
 msgid "Stop playback"
 msgstr "Stop playback"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:9
+#: panels/keyboard/00-multimedia.xml.in:18
 msgid "Previous track"
 msgstr "Previous track"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:10
+#: panels/keyboard/00-multimedia.xml.in:20
 msgid "Next track"
 msgstr "Next track"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:11
+#: panels/keyboard/00-multimedia.xml.in:22
 msgid "Eject"
 msgstr "Eject"
 
-#: ../panels/keyboard/01-input-sources.xml.in.h:1
-#: ../panels/universal-access/uap.ui.h:12
+#: panels/keyboard/01-input-sources.xml.in:4 panels/universal-access/uap.ui:576
 msgid "Typing"
 msgstr "Typing"
 
-#: ../panels/keyboard/01-input-sources.xml.in.h:2
+#: panels/keyboard/01-input-sources.xml.in:8
 msgid "Switch to next input source"
 msgstr "Switch to next input source"
 
-#: ../panels/keyboard/01-input-sources.xml.in.h:3
+#: panels/keyboard/01-input-sources.xml.in:13
 msgid "Switch to previous input source"
 msgstr "Switch to previous input source"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:1
+#: panels/keyboard/01-launchers.xml.in:2
 msgid "Launchers"
 msgstr "Launchers"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:2
+#: panels/keyboard/01-launchers.xml.in:4
 msgid "Launch help browser"
 msgstr "Launch help browser"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:1590
-#: ../shell/cc-window.c:251 ../shell/cc-window.c:794
-#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1
+#: panels/keyboard/01-launchers.xml.in:6 shell/cc-window.c:223
+#: shell/cc-window.c:761 shell/gnome-control-center.desktop.in.in:3
+#: shell/window.ui:125
 msgid "Settings"
 msgstr "Settings"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:4
+#: panels/keyboard/01-launchers.xml.in:8
 msgid "Launch calculator"
 msgstr "Launch calculator"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:5
+#: panels/keyboard/01-launchers.xml.in:10
 msgid "Launch email client"
 msgstr "Launch e-mail client"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:6
+#: panels/keyboard/01-launchers.xml.in:12
 msgid "Launch web browser"
 msgstr "Launch web browser"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:7
+#: panels/keyboard/01-launchers.xml.in:14
 msgid "Home folder"
 msgstr "Home folder"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:8
-msgctxt "keybinding"
+#: panels/keyboard/01-launchers.xml.in:16
+#: panels/search/gnome-search-panel.desktop.in.in:3 shell/window.ui:157
 msgid "Search"
 msgstr "Search"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:1
+#: panels/keyboard/01-screenshot.xml.in:2
 msgid "Screenshots"
 msgstr "Screenshots"
 
-#. translators: $PICTURES will be replaced by the name of the XDG Pictures directory
-#: ../panels/keyboard/01-screenshot.xml.in.h:3
+#: panels/keyboard/01-screenshot.xml.in:6
 msgid "Save a screenshot to $PICTURES"
 msgstr "Save a screenshot to $PICTURES"
 
-#. translators: $PICTURES will be replaced by the name of the XDG Pictures directory
-#: ../panels/keyboard/01-screenshot.xml.in.h:5
+#: panels/keyboard/01-screenshot.xml.in:10
 msgid "Save a screenshot of a window to $PICTURES"
 msgstr "Save a screenshot of a window to $PICTURES"
 
-#. translators: $PICTURES will be replaced by the name of the XDG Pictures directory
-#: ../panels/keyboard/01-screenshot.xml.in.h:7
+#: panels/keyboard/01-screenshot.xml.in:14
 msgid "Save a screenshot of an area to $PICTURES"
 msgstr "Save a screenshot of an area to $PICTURES"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:8
+#: panels/keyboard/01-screenshot.xml.in:17
 msgid "Copy a screenshot to clipboard"
 msgstr "Copy a screenshot to clipboard"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:9
+#: panels/keyboard/01-screenshot.xml.in:20
 msgid "Copy a screenshot of a window to clipboard"
 msgstr "Copy a screenshot of a window to clipboard"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:10
+#: panels/keyboard/01-screenshot.xml.in:23
 msgid "Copy a screenshot of an area to clipboard"
 msgstr "Copy a screenshot of an area to clipboard"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:11
+#: panels/keyboard/01-screenshot.xml.in:26
 msgid "Record a short screencast"
 msgstr "Record a short screencast"
 
-#: ../panels/keyboard/01-system.xml.in.h:1
+#: panels/keyboard/01-system.xml.in:2
 msgid "System"
 msgstr "System"
 
-#: ../panels/keyboard/01-system.xml.in.h:2
+#: panels/keyboard/01-system.xml.in:4
 msgid "Log out"
 msgstr "Log out"
 
-#: ../panels/keyboard/01-system.xml.in.h:3
+#: panels/keyboard/01-system.xml.in:6
 msgid "Lock screen"
 msgstr "Lock screen"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:1
+#: panels/keyboard/50-accessibility.xml.in:2
+#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:3
 msgid "Universal Access"
 msgstr "Universal Access"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:2
+#: panels/keyboard/50-accessibility.xml.in:4
 msgid "Turn zoom on or off"
 msgstr "Turn zoom on or off"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:3
+#: panels/keyboard/50-accessibility.xml.in:6
 msgid "Zoom in"
 msgstr "Zoom in"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:4
+#: panels/keyboard/50-accessibility.xml.in:8
 msgid "Zoom out"
 msgstr "Zoom out"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:5
+#: panels/keyboard/50-accessibility.xml.in:10
 msgid "Turn screen reader on or off"
 msgstr "Turn screen reader on or off"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:6
+#: panels/keyboard/50-accessibility.xml.in:12
 msgid "Turn on-screen keyboard on or off"
 msgstr "Turn on-screen keyboard on or off"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:7
+#: panels/keyboard/50-accessibility.xml.in:14
 msgid "Increase text size"
 msgstr "Increase text size"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:8
+#: panels/keyboard/50-accessibility.xml.in:16
 msgid "Decrease text size"
 msgstr "Decrease text size"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:9
+#: panels/keyboard/50-accessibility.xml.in:18
 msgid "High contrast on or off"
 msgstr "High contrast on or off"
 
-#: ../panels/keyboard/cc-keyboard-manager.c:506
-#: ../panels/keyboard/cc-keyboard-manager.c:514
-#: ../panels/keyboard/cc-keyboard-manager.c:822
+#: panels/keyboard/cc-keyboard-manager.c:506
+#: panels/keyboard/cc-keyboard-manager.c:514
+#: panels/keyboard/cc-keyboard-manager.c:822
 msgid "Custom Shortcuts"
 msgstr "Custom Shortcuts"
 
@@ -1824,14 +1784,13 @@ msgstr "Custom Shortcuts"
 #.
 #. translators:
 #. * The device has been disabled
-#: ../panels/keyboard/cc-keyboard-option.c:276
-#: ../panels/keyboard/cc-keyboard-option.c:395
-#: ../panels/keyboard/keyboard-shortcuts.c:435
-#: ../panels/keyboard/shortcut-editor.ui.h:2
-#: ../panels/network/network-proxy.ui.h:4
-#: ../panels/network/network-wifi.ui.h:31
-#: ../panels/sound/gvc/gvc-mixer-control.c:1866
-#: ../panels/user-accounts/um-fingerprint-dialog.c:214
+#: panels/keyboard/cc-keyboard-option.c:263
+#: panels/keyboard/cc-keyboard-option.c:382
+#: panels/keyboard/keyboard-shortcuts.c:435
+#: panels/keyboard/shortcut-editor.ui:96 panels/network/network-proxy.ui:123
+#: panels/network/network-wifi.ui:782 panels/network/network-wifi.ui:1059
+#: panels/user-accounts/um-fingerprint-dialog.c:211
+#: subprojects/gvc/gvc-mixer-control.c:1866
 msgid "Disabled"
 msgstr "Disabled"
 
@@ -1839,7 +1798,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:354
+#: panels/keyboard/cc-keyboard-option.c:341
 msgid "Alternative Characters Key"
 msgstr "Alternative Characters Key"
 
@@ -1847,20 +1806,19 @@ 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:363
+#: panels/keyboard/cc-keyboard-option.c:350
 msgid "Compose Key"
 msgstr "Compose Key"
 
-#: ../panels/keyboard/cc-keyboard-option.c:368
+#: panels/keyboard/cc-keyboard-option.c:355
 msgid "Modifiers-only switch to next source"
 msgstr "Modifiers-only switch to next source"
 
-#: ../panels/keyboard/cc-keyboard-panel.c:181
-#| msgid "Set Shortcut"
+#: panels/keyboard/cc-keyboard-panel.c:181
 msgid "Reset All Shortcuts?"
 msgstr "Reset All Shortcuts?"
 
-#: ../panels/keyboard/cc-keyboard-panel.c:184
+#: panels/keyboard/cc-keyboard-panel.c:184
 msgid ""
 "Resetting the shortcuts may affect your custom shortcuts. This cannot be "
 "undone."
@@ -1868,23 +1826,22 @@ msgstr ""
 "Resetting the shortcuts may affect your custom shortcuts. This cannot be "
 "undone."
 
-#: ../panels/keyboard/cc-keyboard-panel.c:188
-#: ../panels/keyboard/shortcut-editor.ui.h:9
-#: ../panels/printers/authentication-dialog.ui.h:2
-#: ../panels/printers/ppd-selection-dialog.ui.h:2
+#: panels/keyboard/cc-keyboard-panel.c:188
+#: panels/keyboard/shortcut-editor.ui:346
+#: panels/printers/authentication-dialog.ui:29
+#: panels/printers/ppd-selection-dialog.ui:27
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../panels/keyboard/cc-keyboard-panel.c:189
-#| msgid "Reset"
+#: panels/keyboard/cc-keyboard-panel.c:189
 msgid "Reset All"
 msgstr "Reset All"
 
-#: ../panels/keyboard/cc-keyboard-panel.c:281
+#: panels/keyboard/cc-keyboard-panel.c:281
 msgid "Reset the shortcut to its default value"
 msgstr "Reset the shortcut to its default value"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:427
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:413
 #, c-format
 msgid ""
 "%s is already being used for <b>%s</b>. If you replace it, %s will be "
@@ -1893,227 +1850,235 @@ msgstr ""
 "%s is already being used for <b>%s</b>. If you replace it, %s will be "
 "disabled"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:597
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:583
 msgid "Set Custom Shortcut"
 msgstr "Set Custom Shortcuts"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:597
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:583
 msgid "Set Shortcut"
 msgstr "Set Shortcut"
 
 #. Setup the top label
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:606
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:592
 #, c-format
 msgid "Enter new shortcut to change <b>%s</b>."
 msgstr "Enter new shortcut to change <b>%s</b>."
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:1033
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:1019
 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 "Key­board"
-msgstr "Key­board"
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:3
+#| msgid "Key­board"
+msgid "Keyboard"
+msgstr "Keyboard"
 
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:4
 msgid "View and change keyboard shortcuts and set your typing preferences"
 msgstr "View and change keyboard shortcuts and set your typing preferences"
 
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:6
+msgid "input-keyboard"
+msgstr "input-keyboard"
+
 #. Translators: those are keywords for the keyboard control-center panel
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:18
 msgid ""
 "Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;"
 msgstr ""
 "Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:1
-#: ../panels/region/input-options.ui.h:4 ../shell/cc-application.c:251
+#: panels/keyboard/gnome-keyboard-panel.ui:67 panels/region/input-options.ui:68
+#: shell/cc-application.c:255
 msgid "Keyboard Shortcuts"
 msgstr "Keyboard Shortcuts"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
+#: panels/keyboard/gnome-keyboard-panel.ui:77
 msgid "Reset All…"
 msgstr "Reset All…"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:3
-#| msgid "Reset the shortcut to its default value"
+#: panels/keyboard/gnome-keyboard-panel.ui:78
 msgid "Reset all shortcuts to their default keybindings"
 msgstr "Reset all shortcuts to their default keybindings"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
+#: panels/keyboard/gnome-keyboard-panel.ui:164
 msgid "No keyboard shortcut found"
 msgstr "No keyboard shortcut found"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 ../shell/panel-list.ui.h:4
+#: panels/keyboard/gnome-keyboard-panel.ui:175 shell/panel-list.ui:206
 msgid "Try a different search"
 msgstr "Try a different search"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:1
+#: panels/keyboard/shortcut-editor.ui:68 panels/keyboard/shortcut-editor.ui:318
 msgid "Press Esc to cancel or Backspace to reset the keyboard shortcut."
 msgstr "Press Esc to cancel or Backspace to reset the keyboard shortcut."
 
-#: ../panels/keyboard/shortcut-editor.ui.h:3
-#: ../panels/printers/details-dialog.ui.h:1
-#: ../panels/sound/gvc-mixer-dialog.c:1493
-#: ../panels/sound/gvc-sound-theme-chooser.c:564
+#: panels/keyboard/shortcut-editor.ui:156 panels/printers/details-dialog.ui:38
+#: panels/sound/gvc-mixer-dialog.c:1480
+#: panels/sound/gvc-sound-theme-chooser.c:554
 msgid "Name"
 msgstr "Name"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:4
+#: panels/keyboard/shortcut-editor.ui:168
 msgid "Command"
 msgstr "Command"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:5
+#: panels/keyboard/shortcut-editor.ui:180
 msgid "Shortcut"
 msgstr "Shortcut"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:6
-#| msgid "Set Shortcut"
+#: panels/keyboard/shortcut-editor.ui:259
 msgid "Set Shortcut…"
 msgstr "Set Shortcut…"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:7
-#: ../panels/network/network-wifi.ui.h:20
+#: panels/keyboard/shortcut-editor.ui:272 panels/network/network-wifi.ui:594
 msgid "None"
 msgstr "None"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:8
+#: panels/keyboard/shortcut-editor.ui:303
 msgid "Enter the new shortcut"
 msgstr "Enter the new shortcut"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:10
+#: panels/keyboard/shortcut-editor.ui:357
 msgid "Remove"
 msgstr "Remove"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:11
+#: panels/keyboard/shortcut-editor.ui:367
 msgid "Add"
 msgstr "Add"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:12
+#: panels/keyboard/shortcut-editor.ui:382
 msgid "Replace"
 msgstr "Replace"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:13
+#: panels/keyboard/shortcut-editor.ui:395
 msgid "Set"
 msgstr "Set"
 
-#: ../panels/mouse/cc-mouse-panel.c:82 ../panels/wacom/cc-wacom-panel.c:402
+#: panels/mouse/cc-mouse-panel.c:82 panels/wacom/cc-wacom-panel.c:402
 msgid "Test Your _Settings"
 msgstr "Test Your _Settings"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2
-msgid "Mouse & Touch­pad"
-msgstr "Mouse & Touch­pad"
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:3
+#| msgid "Mouse & Touch­pad"
+msgid "Mouse & Touchpad"
+msgstr "Mouse & Touchpad"
 
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:4
 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"
 
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:6
+msgid "input-mouse"
+msgstr "input-mouse"
+
 #. Translators: those are keywords for the mouse and touchpad control-center panel
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:18
 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
+#: panels/mouse/gnome-mouse-properties.ui:45
 msgid "General"
 msgstr "General"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:2
+#: panels/mouse/gnome-mouse-properties.ui:83
 msgid "Primary Button"
 msgstr "Primary Button"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:3
+#: panels/mouse/gnome-mouse-properties.ui:102
 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
+#: panels/mouse/gnome-mouse-properties.ui:131
 msgid "Left"
 msgstr "Left"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:5
+#: panels/mouse/gnome-mouse-properties.ui:141
 msgid "Right"
 msgstr "Right"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:6
+#: panels/mouse/gnome-mouse-properties.ui:177
 msgid "Mouse"
 msgstr "Mouse"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:7
+#: panels/mouse/gnome-mouse-properties.ui:216
 msgid "Mouse Speed"
 msgstr "Mouse Speed"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:8
+#: panels/mouse/gnome-mouse-properties.ui:238
+#: panels/mouse/gnome-mouse-properties.ui:543
 msgid "Double-click timeout"
 msgstr "Double-click timeout"
 
+#. Translators: This switch reverses the scrolling direction for mices. The term used comes from OS X so use 
the same translation if possible.
 #. 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
+#: panels/mouse/gnome-mouse-properties.ui:275
+#: panels/mouse/gnome-mouse-properties.ui:451
 msgid "Natural Scrolling"
 msgstr "Natural Scrolling"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:11
+#: panels/mouse/gnome-mouse-properties.ui:291
+#: panels/mouse/gnome-mouse-properties.ui:467
 msgid "Scrolling moves the content, not the view."
 msgstr "Scrolling moves the content, not the view."
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:12
+#: panels/mouse/gnome-mouse-properties.ui:341
+#: panels/mouse/gnome-mouse-properties.ui:386
 msgid "Touchpad"
 msgstr "Touchpad"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:13
+#: panels/mouse/gnome-mouse-properties.ui:522
 msgid "Touchpad Speed"
 msgstr "Touchpad Speed"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:14
+#: panels/mouse/gnome-mouse-properties.ui:581
 msgid "Tap to Click"
 msgstr "Tap to Click"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+#: panels/mouse/gnome-mouse-properties.ui:634
 msgid "Two-finger Scrolling"
 msgstr "Two-finger Scrolling"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:16
+#: panels/mouse/gnome-mouse-properties.ui:687
 msgid "Edge Scrolling"
 msgstr "Edge Scrolling"
 
-#: ../panels/mouse/gnome-mouse-test.c:130
-#: ../panels/mouse/gnome-mouse-test.ui.h:1
+#: panels/mouse/gnome-mouse-test.c:130 panels/mouse/gnome-mouse-test.ui:23
 msgid "Try clicking, double clicking, scrolling"
 msgstr "Try clicking, double clicking, scrolling"
 
-#: ../panels/mouse/gnome-mouse-test.c:135
+#: panels/mouse/gnome-mouse-test.c:135
 msgid "Five clicks, GEGL time!"
 msgstr "Five clicks, GEGL time!"
 
-#: ../panels/mouse/gnome-mouse-test.c:140
+#: panels/mouse/gnome-mouse-test.c:140
 msgid "Double click, primary button"
 msgstr "Double click, primary button"
 
-#: ../panels/mouse/gnome-mouse-test.c:140
+#: panels/mouse/gnome-mouse-test.c:140
 msgid "Single click, primary button"
 msgstr "Single click, primary button"
 
-#: ../panels/mouse/gnome-mouse-test.c:143
+#: panels/mouse/gnome-mouse-test.c:143
 msgid "Double click, middle button"
 msgstr "Double click, middle button"
 
-#: ../panels/mouse/gnome-mouse-test.c:143
+#: panels/mouse/gnome-mouse-test.c:143
 msgid "Single click, middle button"
 msgstr "Single click, middle button"
 
-#: ../panels/mouse/gnome-mouse-test.c:146
+#: panels/mouse/gnome-mouse-test.c:146
 msgid "Double click, secondary button"
 msgstr "Double click, secondary button"
 
-#: ../panels/mouse/gnome-mouse-test.c:146
+#: panels/mouse/gnome-mouse-test.c:146
 msgid "Single click, secondary button"
 msgstr "Single click, secondary button"
 
 #. add proxy to device list
-#: ../panels/network/cc-network-panel.c:581
+#: panels/network/cc-network-panel.c:579
 msgid "Network proxy"
 msgstr "Network proxy"
 
@@ -2121,114 +2086,110 @@ 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:717 ../panels/network/net-vpn.c:192
-#: ../panels/network/net-vpn.c:321
+#: panels/network/cc-network-panel.c:715 panels/network/net-vpn.c:192
+#: panels/network/net-vpn.c:321
 #, c-format
 msgid "%s VPN"
 msgstr "%s VPN"
 
-#: ../panels/network/cc-network-panel.c:781 ../panels/network/wifi.ui.h:7
+#: panels/network/cc-network-panel.c:779 panels/network/wifi.ui:307
 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:787
+#: panels/network/cc-network-panel.c:785
 msgid "NetworkManager needs to be running."
 msgstr "NetworkManager needs to be running."
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/network/cc-wifi-panel.c:209
-#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:2
-#: ../panels/network/network-wifi.ui.h:58
+#: panels/network/cc-wifi-panel.c:212
+#: panels/network/gnome-wifi-panel.desktop.in.in:3
+#: panels/network/network-wifi.ui:1766
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:1
+#: panels/network/connection-editor/8021x-security-page.ui:26
 msgid "802.1x _Security"
 msgstr "802.1x _Security"
 
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:2
-#: ../panels/network/connection-editor/security-page.ui.h:2
-#: ../panels/wacom/wacom-stylus-page.ui.h:8
+#: panels/network/connection-editor/8021x-security-page.ui:73
+#: panels/network/connection-editor/security-page.ui:72
+#: panels/wacom/wacom-stylus-page.ui:108
 msgid "page 1"
 msgstr "page 1"
 
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:3
-#: ../panels/network/connection-editor/security-page.ui.h:3
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:4
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:1
+#: panels/network/connection-editor/8021x-security-page.ui:224
+#: panels/network/connection-editor/security-page.ui:223
+#: panels/network/wireless-security/eap-method-fast.ui:50
+#: panels/network/wireless-security/eap-method-peap.ui:48
+#: panels/network/wireless-security/eap-method-ttls.ui:31
 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/8021x-security-page.ui:238
+#: panels/network/connection-editor/security-page.ui:237
 msgid "Inner _authentication"
 msgstr "Inner _authentication"
 
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:5
-#: ../panels/network/connection-editor/security-page.ui.h:5
-#: ../panels/wacom/wacom-stylus-page.ui.h:16
+#: panels/network/connection-editor/8021x-security-page.ui:281
+#: panels/network/connection-editor/security-page.ui:280
+#: panels/wacom/wacom-stylus-page.ui:426
 msgid "page 2"
 msgstr "page 2"
 
-#: ../panels/network/connection-editor/ce-page-8021x-security.c:101
-#: ../panels/network/connection-editor/ce-page-security.c:445
-#: ../panels/network/connection-editor/details-page.ui.h:3
-#: ../panels/network/network-wifi.ui.h:6
+#: panels/network/connection-editor/ce-page-8021x-security.c:101
+#: panels/network/connection-editor/ce-page-security.c:445
+#: panels/network/connection-editor/details-page.ui:86
+#: panels/network/network-wifi.ui:239
 msgid "Security"
 msgstr "Security"
 
-#: ../panels/network/connection-editor/ce-page.c:481
+#: panels/network/connection-editor/ce-page.c:481
 msgid "automatic"
 msgstr "automatic"
 
-#: ../panels/network/connection-editor/ce-page.c:521
+#: 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:56
-#: ../panels/network/net-device-wifi.c:231
-#: ../panels/network/net-device-wifi.c:407
+#: panels/network/connection-editor/ce-page-details.c:56
+#: panels/network/net-device-wifi.c:247 panels/network/net-device-wifi.c:469
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:60
-#: ../panels/network/net-device-wifi.c:235
-#: ../panels/network/net-device-wifi.c:412
-#: ../panels/network/network-wifi.ui.h:19
+#: panels/network/connection-editor/ce-page-details.c:60
+#: panels/network/net-device-wifi.c:251 panels/network/net-device-wifi.c:474
+#: panels/network/network-wifi.ui:593
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:64
-#: ../panels/network/net-device-wifi.c:239
+#: panels/network/connection-editor/ce-page-details.c:64
+#: panels/network/net-device-wifi.c:255
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:69
-#: ../panels/network/net-device-wifi.c:244
+#: panels/network/connection-editor/ce-page-details.c:69
+#: panels/network/net-device-wifi.c:260
 msgid "Enterprise"
 msgstr "Enterprise"
 
-#: ../panels/network/connection-editor/ce-page-details.c:74
-#: ../panels/network/net-device-wifi.c:249
-#: ../panels/network/net-device-wifi.c:397
+#: panels/network/connection-editor/ce-page-details.c:74
+#: panels/network/net-device-wifi.c:265 panels/network/net-device-wifi.c:459
 msgctxt "Wifi security"
 msgid "None"
 msgstr "None"
 
-#: ../panels/network/connection-editor/ce-page-details.c:95
-#: ../panels/power/power.ui.h:17
+#: panels/network/connection-editor/ce-page-details.c:95
+#: panels/power/power.ui:99
 msgid "Never"
 msgstr "Never"
 
-#: ../panels/network/connection-editor/ce-page-details.c:110
-#: ../panels/network/net-device-ethernet.c:120
-#: ../panels/network/net-device-wifi.c:505
+#: panels/network/connection-editor/ce-page-details.c:110
+#: panels/network/net-device-ethernet.c:121
+#: panels/network/net-device-wifi.c:568
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
@@ -2236,371 +2197,372 @@ msgstr[0] "%i day ago"
 msgstr[1] "%i days ago"
 
 #. Translators: network device speed
-#: ../panels/network/connection-editor/ce-page-details.c:176
-#: ../panels/network/net-device-ethernet.c:50
-#: ../panels/network/net-device-wifi.c:561
+#: panels/network/connection-editor/ce-page-details.c:222
+#: panels/network/net-device-ethernet.c:50 panels/network/net-device-wifi.c:624
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: ../panels/network/connection-editor/ce-page-details.c:202
-#: ../panels/network/net-device-wifi.c:590
+#: panels/network/connection-editor/ce-page-details.c:248
+#: panels/network/net-device-wifi.c:653
 msgctxt "Signal strength"
 msgid "None"
 msgstr "None"
 
-#: ../panels/network/connection-editor/ce-page-details.c:204
-#: ../panels/network/net-device-wifi.c:592
+#: panels/network/connection-editor/ce-page-details.c:250
+#: panels/network/net-device-wifi.c:655
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "Weak"
 
-#: ../panels/network/connection-editor/ce-page-details.c:206
-#: ../panels/network/net-device-wifi.c:594
+#: panels/network/connection-editor/ce-page-details.c:252
+#: panels/network/net-device-wifi.c:657
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "Ok"
 
-#: ../panels/network/connection-editor/ce-page-details.c:208
-#: ../panels/network/net-device-wifi.c:596
+#: panels/network/connection-editor/ce-page-details.c:254
+#: panels/network/net-device-wifi.c:659
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "Good"
 
-#: ../panels/network/connection-editor/ce-page-details.c:210
-#: ../panels/network/net-device-wifi.c:598
+#: panels/network/connection-editor/ce-page-details.c:256
+#: panels/network/net-device-wifi.c:661
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "Excellent"
 
-#: ../panels/network/connection-editor/ce-page-details.c:248
-#| msgid "Connection"
+#: panels/network/connection-editor/ce-page-details.c:297
 msgid "Forget Connection"
 msgstr "Forget Connection"
 
-#: ../panels/network/connection-editor/ce-page-details.c:250
-#| msgid "Connection failed"
+#: panels/network/connection-editor/ce-page-details.c:299
 msgid "Remove Connection Profile"
 msgstr "Remove Connection Profile"
 
-#: ../panels/network/connection-editor/ce-page-details.c:252
-#| msgid "Remove"
+#: panels/network/connection-editor/ce-page-details.c:301
 msgid "Remove VPN"
 msgstr "Remove VPN"
 
-#: ../panels/network/connection-editor/ce-page-details.c:280
-#: ../panels/network/network-wifi.ui.h:46 ../shell/cc-window.c:243
-#: ../shell/panel-list.ui.h:2
+#: panels/network/connection-editor/ce-page-details.c:329
+#: panels/network/network-wifi.ui:1456 shell/cc-window.c:215
+#: shell/panel-list.ui:103
 msgid "Details"
 msgstr "Details"
 
-#: ../panels/network/connection-editor/ce-page-ethernet.c:173
-#: ../panels/network/connection-editor/ce-page-vpn.c:188
-#: ../panels/network/connection-editor/ce-page-wifi.c:194
-#: ../panels/network/network-wifi.ui.h:47
+#: panels/network/connection-editor/ce-page-ethernet.c:174
+#: panels/network/connection-editor/ce-page-vpn.c:188
+#: panels/network/connection-editor/ce-page-wifi.c:194
+#: panels/network/network-wifi.ui:1460
 msgid "Identity"
 msgstr "Identity"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:251
-#: ../panels/network/connection-editor/ce-page-ip6.c:230
+#: panels/network/connection-editor/ce-page-ip4.c:251
+#: panels/network/connection-editor/ce-page-ip6.c:230
 msgid "Delete Address"
 msgstr "Delete Address"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:422
-#: ../panels/network/connection-editor/ce-page-ip6.c:390
+#: panels/network/connection-editor/ce-page-ip4.c:422
+#: panels/network/connection-editor/ce-page-ip6.c:390
 msgid "Delete Route"
 msgstr "Delete Route"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:896
-#: ../panels/network/network-wifi.ui.h:48
+#: panels/network/connection-editor/ce-page-ip4.c:896
+#: panels/network/network-wifi.ui:1464
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:827
-#: ../panels/network/network-wifi.ui.h:49
+#: panels/network/connection-editor/ce-page-ip6.c:828
+#: panels/network/network-wifi.ui:1468
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../panels/network/connection-editor/ce-page-security.c:245
+#: panels/network/connection-editor/ce-page-security.c:245
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "None"
 
-#: ../panels/network/connection-editor/ce-page-security.c:268
+#: panels/network/connection-editor/ce-page-security.c:268
 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:278
+#: panels/network/connection-editor/ce-page-security.c:278
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit Passphrase"
 
-#: ../panels/network/connection-editor/ce-page-security.c:291
-#: ../panels/network/wireless-security/wireless-security.c:465
+#: panels/network/connection-editor/ce-page-security.c:291
+#: panels/network/wireless-security/wireless-security.c:465
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../panels/network/connection-editor/ce-page-security.c:304
+#: panels/network/connection-editor/ce-page-security.c:304
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamic WEP (802.1x)"
 
-#: ../panels/network/connection-editor/ce-page-security.c:318
+#: panels/network/connection-editor/ce-page-security.c:318
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../panels/network/connection-editor/ce-page-security.c:332
+#: panels/network/connection-editor/ce-page-security.c:332
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../panels/network/connection-editor/details-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:4
+#: panels/network/connection-editor/details-page.ui:18
+#: panels/network/network-wifi.ui:174
 msgid "Signal Strength"
 msgstr "Signal Strength"
 
-#: ../panels/network/connection-editor/details-page.ui.h:2
-#: ../panels/network/network-wifi.ui.h:5
+#: panels/network/connection-editor/details-page.ui:52
+#: panels/network/network-wifi.ui:207
 msgid "Link speed"
 msgstr "Link speed"
 
-#: ../panels/network/connection-editor/details-page.ui.h:4
-#: ../panels/network/net-device-ethernet.c:153
-#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644
+#: panels/network/connection-editor/details-page.ui:104
+#: panels/network/net-device-ethernet.c:154 panels/network/network-wifi.ui:256
+#: 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:154
-#: ../panels/network/net-device-ethernet.c:158
-#: ../panels/network/network-mobile.ui.h:4
-#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645
+#: panels/network/connection-editor/details-page.ui:122
+#: panels/network/net-device-ethernet.c:155
+#: panels/network/net-device-ethernet.c:159
+#: panels/network/network-mobile.ui:189 panels/network/network-wifi.ui:273
+#: 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:161
-#: ../panels/network/network-wifi.ui.h:9
+#: panels/network/connection-editor/details-page.ui:140
+#: panels/network/net-device-ethernet.c:162 panels/network/network-wifi.ui:290
 msgid "Hardware Address"
 msgstr "Hardware Address"
 
-#: ../panels/network/connection-editor/details-page.ui.h:7
-#: ../panels/network/net-device-ethernet.c:165
-#: ../panels/network/network-mobile.ui.h:5
-#: ../panels/network/network-wifi.ui.h:10
+#: panels/network/connection-editor/details-page.ui:158
+#: panels/network/net-device-ethernet.c:166
+#: panels/network/network-mobile.ui:206 panels/network/network-wifi.ui:307
 msgid "Default Route"
 msgstr "Default Route"
 
-#: ../panels/network/connection-editor/details-page.ui.h:8
-#: ../panels/network/connection-editor/ip4-page.ui.h:10
-#: ../panels/network/connection-editor/ip6-page.ui.h:11
-#: ../panels/network/net-device-ethernet.c:167
-#: ../panels/network/network-mobile.ui.h:6
-#: ../panels/network/network-wifi.ui.h:11
+#: panels/network/connection-editor/details-page.ui:177
+#: panels/network/connection-editor/ip4-page.ui:197
+#: panels/network/connection-editor/ip6-page.ui:211
+#: panels/network/net-device-ethernet.c:168
+#: panels/network/network-mobile.ui:224 panels/network/network-wifi.ui:325
+#: panels/network/network-wifi.ui:832 panels/network/network-wifi.ui:1109
 msgid "DNS"
 msgstr "DNS"
 
-#: ../panels/network/connection-editor/details-page.ui.h:9
+#: panels/network/connection-editor/details-page.ui:195
 msgid "Last Used"
 msgstr "Last Used"
 
-#: ../panels/network/connection-editor/details-page.ui.h:10
+#: panels/network/connection-editor/details-page.ui:324
 msgid "Connect _automatically"
 msgstr "Connect _automatically"
 
-#: ../panels/network/connection-editor/details-page.ui.h:11
+#: panels/network/connection-editor/details-page.ui:343
 msgid "Make available to _other users"
 msgstr "Make available to _other users"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:1
-#: ../panels/network/connection-editor/ip4-page.ui.h:11
-#: ../panels/network/connection-editor/ip6-page.ui.h:2
-#: ../panels/network/net-proxy.c:58 ../panels/network/network-proxy.ui.h:2
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:1
-#: ../panels/privacy/cc-privacy-panel.c:217
+#: panels/network/connection-editor/details-page.ui:376
+msgid "Restrict background data usage"
+msgstr "Restrict background data usage"
+
+#: panels/network/connection-editor/details-page.ui:386
+msgid "Appropriate for connections that have data charges or limits."
+msgstr "Appropriate for connections that have data charges or limits."
+
+#: panels/network/connection-editor/ethernet-page.ui:16
+#: panels/network/connection-editor/ethernet-page.ui:39
+#: panels/network/connection-editor/ip4-page.ui:209
+#: panels/network/connection-editor/ip4-page.ui:277
+#: panels/network/connection-editor/ip6-page.ui:42
+#: panels/network/connection-editor/ip6-page.ui:223
+#: panels/network/connection-editor/ip6-page.ui:291
+#: panels/network/net-proxy.c:58 panels/network/network-proxy.ui:103
+#: panels/network/wireless-security/eap-method-peap.ui:22
+#: panels/privacy/cc-privacy-panel.c:217
 msgid "Automatic"
 msgstr "Automatic"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:2
+#: panels/network/connection-editor/ethernet-page.ui:19
 msgid "Twisted Pair (TP)"
 msgstr "Twisted Pair (TP)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:3
+#: panels/network/connection-editor/ethernet-page.ui:22
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Attachment Unit Interface (AUI)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:4
+#: panels/network/connection-editor/ethernet-page.ui:25
 msgid "BNC"
 msgstr "BNC"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:5
+#: panels/network/connection-editor/ethernet-page.ui:28
 msgid "Media Independent Interface (MII)"
 msgstr "Media Independent Interface (MII)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:6
+#: panels/network/connection-editor/ethernet-page.ui:42
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:7
+#: panels/network/connection-editor/ethernet-page.ui:45
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:8
+#: panels/network/connection-editor/ethernet-page.ui:48
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:9
+#: panels/network/connection-editor/ethernet-page.ui:51
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:10
-#: ../panels/network/connection-editor/vpn-page.ui.h:1
+#: panels/network/connection-editor/ethernet-page.ui:71
+#: panels/network/connection-editor/vpn-page.ui:23
 msgid "_Name"
 msgstr "_Name"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:11
-#: ../panels/network/connection-editor/wifi-page.ui.h:4
-#: ../panels/network/network-wifi.ui.h:38
+#: panels/network/connection-editor/ethernet-page.ui:100
+#: panels/network/connection-editor/wifi-page.ui:68
+#: panels/network/network-wifi.ui:1261
 msgid "_MAC Address"
 msgstr "_MAC Address"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:12
+#: panels/network/connection-editor/ethernet-page.ui:146
 msgid "M_TU"
 msgstr "M_TU"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:13
-#: ../panels/network/connection-editor/wifi-page.ui.h:5
+#: panels/network/connection-editor/ethernet-page.ui:163
+#: panels/network/connection-editor/wifi-page.ui:98
 msgid "_Cloned Address"
 msgstr "_Cloned Address"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:14
+#: panels/network/connection-editor/ethernet-page.ui:178
 msgid "bytes"
 msgstr "bytes"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:1
-#| msgid "_Method"
+#: panels/network/connection-editor/ip4-page.ui:27
 msgid "IPv_4 Method"
 msgstr "IPv_4 Method"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:2
-#: ../panels/network/network-wifi.ui.h:27
+#: panels/network/connection-editor/ip4-page.ui:42
+#: panels/network/network-wifi.ui:778 panels/network/network-wifi.ui:1055
 msgid "Automatic (DHCP)"
 msgstr "Automatic (DHCP)"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:3
-#: ../panels/network/connection-editor/ip6-page.ui.h:4
+#: panels/network/connection-editor/ip4-page.ui:55
+#: panels/network/connection-editor/ip6-page.ui:69
 msgid "Link-Local Only"
 msgstr "Link-Local Only"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:5
-#: ../panels/network/connection-editor/ip6-page.ui.h:6
-#| msgid "Disabled"
+#: panels/network/connection-editor/ip4-page.ui:83
+#: panels/network/connection-editor/ip6-page.ui:97
 msgid "Disable"
 msgstr "Disable"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:6
-#: ../panels/network/connection-editor/ip6-page.ui.h:7
-#| msgid "_Addresses"
+#: panels/network/connection-editor/ip4-page.ui:111
+#: panels/network/connection-editor/ip6-page.ui:125
 msgid "Addresses"
 msgstr "Addresses"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:7
-#: ../panels/network/connection-editor/ip6-page.ui.h:8
-#: ../panels/printers/details-dialog.ui.h:3
+#: panels/network/connection-editor/ip4-page.ui:129
+#: panels/network/connection-editor/ip4-page.ui:313
+#: panels/network/connection-editor/ip6-page.ui:143
+#: panels/network/connection-editor/ip6-page.ui:327
+#: panels/printers/details-dialog.ui:87
 msgid "Address"
 msgstr "Address"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:8
+#: panels/network/connection-editor/ip4-page.ui:143
+#: panels/network/connection-editor/ip4-page.ui:327
 msgid "Netmask"
 msgstr "Netmask"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:9
-#: ../panels/network/connection-editor/ip6-page.ui.h:10
+#: panels/network/connection-editor/ip4-page.ui:157
+#: panels/network/connection-editor/ip4-page.ui:341
+#: panels/network/connection-editor/ip6-page.ui:171
+#: panels/network/connection-editor/ip6-page.ui:355
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:12
-#: ../panels/network/connection-editor/ip6-page.ui.h:12
+#: panels/network/connection-editor/ip4-page.ui:220
+#: panels/network/connection-editor/ip6-page.ui:234
 msgid "Automatic DNS"
 msgstr "Automatic DNS"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:13
-#: ../panels/network/connection-editor/ip6-page.ui.h:13
+#: panels/network/connection-editor/ip4-page.ui:244
+#: panels/network/connection-editor/ip6-page.ui:258
 msgid "Separate IP addresses with commas"
 msgstr "Separate IP addresses with commas"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:14
-#: ../panels/network/connection-editor/ip6-page.ui.h:14
-#: ../panels/network/network-wifi.ui.h:32
+#: panels/network/connection-editor/ip4-page.ui:265
+#: panels/network/connection-editor/ip6-page.ui:279
+#: panels/network/network-wifi.ui:877 panels/network/network-wifi.ui:1154
 msgid "Routes"
 msgstr "Routes"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:15
-#: ../panels/network/connection-editor/ip6-page.ui.h:15
+#: panels/network/connection-editor/ip4-page.ui:288
+#: panels/network/connection-editor/ip6-page.ui:302
 msgid "Automatic Routes"
 msgstr "Automatic Routes"
 
 #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
-#: ../panels/network/connection-editor/ip4-page.ui.h:17
-#: ../panels/network/connection-editor/ip6-page.ui.h:17
-#| msgctxt "network parameters"
-#| msgid "Metric"
+#: panels/network/connection-editor/ip4-page.ui:354
+#: panels/network/connection-editor/ip6-page.ui:368
 msgid "Metric"
 msgstr "Metric"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:18
-#: ../panels/network/connection-editor/ip6-page.ui.h:18
-#: ../panels/network/network-wifi.ui.h:34
+#: panels/network/connection-editor/ip4-page.ui:384
+#: panels/network/connection-editor/ip6-page.ui:398
+#: panels/network/network-wifi.ui:933 panels/network/network-wifi.ui:1210
 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
-#| msgid "_Method"
+#: panels/network/connection-editor/ip6-page.ui:27
 msgid "IPv_6 Method"
 msgstr "IPv_6 Method"
 
-#: ../panels/network/connection-editor/ip6-page.ui.h:3
+#: panels/network/connection-editor/ip6-page.ui:55
 msgid "Automatic, DHCP only"
 msgstr "Automatic, DHCP only"
 
-#: ../panels/network/connection-editor/ip6-page.ui.h:9
+#: panels/network/connection-editor/ip6-page.ui:157
+#: panels/network/connection-editor/ip6-page.ui:341
 msgid "Prefix"
 msgstr "Prefix"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:273
+#: panels/network/connection-editor/net-connection-editor.c:273
 msgid "Unable to open connection editor"
 msgstr "Unable to open connection editor"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:291
+#: panels/network/connection-editor/net-connection-editor.c:291
 msgid "New Profile"
 msgstr "New Profile"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:603
-#: ../panels/network/network.ui.h:2
+#: panels/network/connection-editor/net-connection-editor.c:603
+#: panels/network/network.ui:142
 msgid "VPN"
 msgstr "VPN"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:751
+#: panels/network/connection-editor/net-connection-editor.c:751
 msgid "Import from file…"
 msgstr "Import from file…"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:785
+#: panels/network/connection-editor/net-connection-editor.c:785
 msgid "Add VPN"
 msgstr "Add VPN"
 
-#: ../panels/network/connection-editor/security-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:16
+#: panels/network/connection-editor/security-page.ui:26
+#: panels/network/network-wifi.ui:529
 msgid "S_ecurity"
 msgstr "S_ecurity"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:141
+#: 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:143
+#: panels/network/connection-editor/vpn-helpers.c:143
 #, c-format
-#| msgid ""
-#| "The file '%s' could not be read or does not contain recognized VPN "
-#| "connection information\n"
-#| "\n"
-#| "Error: %s."
 msgid ""
 "The file “%s” could not be read or does not contain recognized VPN "
 "connection information\n"
@@ -2612,42 +2574,37 @@ msgstr ""
 "\n"
 "Error: %s."
 
-#: ../panels/network/connection-editor/vpn-helpers.c:178
+#: 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:182
-#: ../panels/printers/pp-details-dialog.c:320
-#: ../panels/sharing/cc-sharing-panel.c:376
-#: ../panels/user-accounts/um-photo-dialog.c:222
+#: panels/network/connection-editor/vpn-helpers.c:182
+#: panels/printers/pp-details-dialog.c:332
+#: panels/sharing/cc-sharing-panel.c:385
+#: panels/user-accounts/um-photo-dialog.c:230
 msgid "_Open"
 msgstr "_Open"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:230
+#: panels/network/connection-editor/vpn-helpers.c:230
 #, c-format
-#| msgid "A file named \"%s\" already exists."
 msgid "A file named “%s” already exists."
 msgstr "A file named “%s” already exists."
 
-#: ../panels/network/connection-editor/vpn-helpers.c:232
+#: panels/network/connection-editor/vpn-helpers.c:232
 msgid "_Replace"
 msgstr "_Replace"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:234
+#: 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:270
+#: 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:272
+#: panels/network/connection-editor/vpn-helpers.c:272
 #, c-format
-#| msgid ""
-#| "The VPN connection '%s' could not be exported to %s.\n"
-#| "\n"
-#| "Error: %s."
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
 "\n"
@@ -2657,40 +2614,44 @@ msgstr ""
 "\n"
 "Error: %s."
 
-#: ../panels/network/connection-editor/vpn-helpers.c:307
+#: panels/network/connection-editor/vpn-helpers.c:307
 msgid "Export VPN connection"
 msgstr "Export VPN connection"
 
-#: ../panels/network/connection-editor/vpn-page.ui.h:2
+#: panels/network/connection-editor/vpn-page.ui:58
 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:14
+#: panels/network/connection-editor/wifi-page.ui:20
+#: panels/network/network-wifi.ui:497
 msgid "_SSID"
 msgstr "_SSID"
 
-#: ../panels/network/connection-editor/wifi-page.ui.h:2
-#: ../panels/network/network-wifi.ui.h:15
+#: panels/network/connection-editor/wifi-page.ui:36
+#: panels/network/network-wifi.ui:513
 msgid "_BSSID"
 msgstr "_BSSID"
 
-#: ../panels/network/connection-editor/wifi-page.ui.h:3
-#: ../panels/network/network-wifi.ui.h:18
+#: panels/network/connection-editor/wifi-page.ui:53
+#: panels/network/network-wifi.ui:562
 msgid "My Home Network"
 msgstr "My Home Network"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
-msgid "Net­work"
-msgstr "Net­work"
+#: panels/network/gnome-network-panel.desktop.in.in:3
+#: panels/network/network-mobile.ui:241
+msgid "Network"
+msgstr "Network"
 
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:3
+#: panels/network/gnome-network-panel.desktop.in.in:4
 msgid "Control how you connect to the Internet"
 msgstr "Control how you connect to the Internet"
 
+#: panels/network/gnome-network-panel.desktop.in.in:6
+msgid "network-workgroup"
+msgstr "network-workgroup"
+
 #. Translators: those are keywords for the network control-center panel
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:5
+#: panels/network/gnome-network-panel.desktop.in.in:18
 msgid ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
 "DNS;"
@@ -2698,42 +2659,41 @@ msgstr ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
 "DNS;"
 
-#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:3
-#| msgid "Control how you connect to the Internet"
+#: panels/network/gnome-wifi-panel.desktop.in.in:4
 msgid "Control how you connect to Wi-Fi networks"
 msgstr "Control how you connect to Wi-Fi networks"
 
+#: panels/network/gnome-wifi-panel.desktop.in.in:6
+msgid "network-wireless"
+msgstr "network-wireless"
+
 #. Translators: those are keywords for the wi-fi control-center panel
-#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:5
-#| msgid ""
-#| "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;"
-#| "vpn;DNS;"
+#: panels/network/gnome-wifi-panel.desktop.in.in:18
 msgid "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;"
 msgstr "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;"
 
-#: ../panels/network/net-device-ethernet.c:106
-#: ../panels/network/net-device-wifi.c:491
+#: panels/network/net-device-ethernet.c:107
+#: panels/network/net-device-wifi.c:554
 msgid "never"
 msgstr "never"
 
-#: ../panels/network/net-device-ethernet.c:116
-#: ../panels/network/net-device-wifi.c:501
+#: panels/network/net-device-ethernet.c:117
+#: panels/network/net-device-wifi.c:564
 msgid "today"
 msgstr "today"
 
-#: ../panels/network/net-device-ethernet.c:118
-#: ../panels/network/net-device-wifi.c:503
+#: panels/network/net-device-ethernet.c:119
+#: panels/network/net-device-wifi.c:566
 msgid "yesterday"
 msgstr "yesterday"
 
-#: ../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/network/net-device-ethernet.c:157
+#: panels/network/network-mobile.ui:172 panels/network/panel-common.c:647
+#: panels/network/panel-common.c:649
 msgid "IP Address"
 msgstr "IP Address"
 
-#: ../panels/network/net-device-ethernet.c:172
-#: ../panels/network/network-wifi.ui.h:12
+#: panels/network/net-device-ethernet.c:173 panels/network/network-wifi.ui:342
 msgid "Last used"
 msgstr "Last used"
 
@@ -2742,30 +2702,28 @@ msgstr "Last used"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: ../panels/network/net-device-ethernet.c:275
-#: ../panels/network/network-ethernet.ui.h:1
-#: ../panels/network/network-simple.ui.h:1
+#: panels/network/net-device-ethernet.c:276
+#: panels/network/network-ethernet.ui:19 panels/network/network-simple.ui:39
 msgid "Wired"
 msgstr "Wired"
 
-#: ../panels/network/net-device-ethernet.c:343
-#: ../panels/network/net-device-wifi.c:1792
-#: ../panels/network/network-ethernet.ui.h:2
-#: ../panels/network/network-mobile.ui.h:8
-#: ../panels/network/network-simple.ui.h:3 ../panels/network/network-vpn.ui.h:2
+#: panels/network/net-device-ethernet.c:344
+#: panels/network/net-device-wifi.c:1865 panels/network/network-ethernet.ui:120
+#: panels/network/network-mobile.ui:394 panels/network/network-simple.ui:75
+#: panels/network/network-vpn.ui:79
 msgid "Options…"
 msgstr "Options…"
 
-#: ../panels/network/net-device-mobile.c:238
+#: panels/network/net-device-mobile.c:238
 msgid "Add new connection"
 msgstr "Add new connection"
 
-#: ../panels/network/net-device-wifi.c:1275
+#: panels/network/net-device-wifi.c:1344
 #, 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:1279
+#: panels/network/net-device-wifi.c:1348
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
@@ -2773,12 +2731,11 @@ msgstr ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
 
-#: ../panels/network/net-device-wifi.c:1286
-#| msgid "Wi-Fi Hotspot"
+#: panels/network/net-device-wifi.c:1355
 msgid "Turn On Wi-Fi Hotspot?"
 msgstr "Turn On Wi-Fi Hotspot?"
 
-#: ../panels/network/net-device-wifi.c:1308
+#: panels/network/net-device-wifi.c:1377
 msgid ""
 "Wi-Fi hotspots are usually used to share an additional Internet connection "
 "over Wi-Fi."
@@ -2786,27 +2743,27 @@ msgstr ""
 "Wi-Fi hotspots are usually used to share an additional Internet connection "
 "over Wi-Fi."
 
-#: ../panels/network/net-device-wifi.c:1319
+#: panels/network/net-device-wifi.c:1388
 msgid "_Turn On"
 msgstr "_Turn On"
 
-#: ../panels/network/net-device-wifi.c:1396
+#: panels/network/net-device-wifi.c:1465
 msgid "Stop hotspot and disconnect any users?"
 msgstr "Stop hotspot and disconnect any users?"
 
-#: ../panels/network/net-device-wifi.c:1399
+#: panels/network/net-device-wifi.c:1468
 msgid "_Stop Hotspot"
 msgstr "_Stop Hotspot"
 
-#: ../panels/network/net-device-wifi.c:1496
+#: panels/network/net-device-wifi.c:1568
 msgid "System policy prohibits use as a Hotspot"
 msgstr "System policy prohibits use as a Hotspot"
 
-#: ../panels/network/net-device-wifi.c:1499
+#: panels/network/net-device-wifi.c:1571
 msgid "Wireless device does not support Hotspot mode"
 msgstr "Wireless device does not support Hotspot mode"
 
-#: ../panels/network/net-device-wifi.c:1630
+#: panels/network/net-device-wifi.c:1703
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
@@ -2814,24 +2771,22 @@ msgstr ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
 
-#: ../panels/network/net-device-wifi.c:1634
-#: ../panels/network/network-wifi.ui.h:42
+#: panels/network/net-device-wifi.c:1707 panels/network/network-wifi.ui:1362
 msgid "_Forget"
 msgstr "_Forget"
 
-#: ../panels/network/net-device-wifi.c:1943
-#: ../panels/network/net-device-wifi.c:1950
+#: panels/network/net-device-wifi.c:2016 panels/network/net-device-wifi.c:2023
 msgid "Known Wi-Fi Networks"
 msgstr "Known Wi-Fi Networks"
 
 #. translators: This is the label for the "Forget wireless network" functionality
-#: ../panels/network/net-device-wifi.c:1983
+#: panels/network/net-device-wifi.c:2056
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "_Forget"
 
 #. TRANSLATORS: this is when the use leaves the PAC textbox blank
-#: ../panels/network/net-proxy.c:102
+#: panels/network/net-proxy.c:102
 msgid ""
 "Web Proxy Autodiscovery is used when a Configuration URL is not provided."
 msgstr ""
@@ -2841,165 +2796,155 @@ msgstr ""
 #. * network, then anyone else on that network can tell your
 #. * machine that it should proxy all of your web traffic
 #. * through them.
-#: ../panels/network/net-proxy.c:110
+#: panels/network/net-proxy.c:110
 msgid "This is not recommended for untrusted public networks."
 msgstr "This is not recommended for untrusted public networks."
 
-#: ../panels/network/network-mobile.ui.h:1
+#: panels/network/network-mobile.ui:30
 msgid "IMEI"
 msgstr "IMEI"
 
-#: ../panels/network/network-mobile.ui.h:2
+#: panels/network/network-mobile.ui:48
 msgid "Provider"
 msgstr "Provider"
 
-#: ../panels/network/network-mobile.ui.h:7
-msgid "Network"
-msgstr "Network"
-
-#: ../panels/network/network-proxy.ui.h:1
-#| msgid "Network proxy"
+#: panels/network/network-proxy.ui:47 panels/network/network-proxy.ui:92
 msgid "Network Proxy"
 msgstr "Network Proxy"
 
-#: ../panels/network/network-proxy.ui.h:5
+#: panels/network/network-proxy.ui:173
 msgid "_HTTP Proxy"
 msgstr "_HTTP Proxy"
 
-#: ../panels/network/network-proxy.ui.h:6
+#: panels/network/network-proxy.ui:192
 msgid "H_TTPS Proxy"
 msgstr "H_TTPS Proxy"
 
-#: ../panels/network/network-proxy.ui.h:7
+#: panels/network/network-proxy.ui:211
 msgid "_FTP Proxy"
 msgstr "_FTP Proxy"
 
-#: ../panels/network/network-proxy.ui.h:8
+#: panels/network/network-proxy.ui:230
 msgid "_Socks Host"
 msgstr "_Socks Host"
 
-#: ../panels/network/network-proxy.ui.h:9
+#: panels/network/network-proxy.ui:249
 msgid "_Ignore Hosts"
 msgstr "_Ignore Hosts"
 
-#: ../panels/network/network-proxy.ui.h:10
+#: panels/network/network-proxy.ui:287
 msgid "HTTP proxy port"
 msgstr "HTTP proxy port"
 
-#: ../panels/network/network-proxy.ui.h:11
+#: panels/network/network-proxy.ui:364
 msgid "HTTPS proxy port"
 msgstr "HTTPS proxy port"
 
-#: ../panels/network/network-proxy.ui.h:12
+#: panels/network/network-proxy.ui:385
 msgid "FTP proxy port"
 msgstr "FTP proxy port"
 
-#: ../panels/network/network-proxy.ui.h:13
+#: panels/network/network-proxy.ui:406
 msgid "Socks proxy port"
 msgstr "Socks proxy port"
 
-#: ../panels/network/network-proxy.ui.h:14
+#: panels/network/network-proxy.ui:435
 msgid "_Configuration URL"
 msgstr "_Configuration URL"
 
-#: ../panels/network/network-simple.ui.h:2
+#: panels/network/network-simple.ui:50
 msgid "Turn device off"
 msgstr "Turn device off"
 
-#. Translators: The found device is a printer connected via Bluetooth
-#: ../panels/network/network.ui.h:1
-#: ../panels/printers/pp-new-printer-dialog.c:1816
-msgid "Bluetooth"
-msgstr "Bluetooth"
-
-#: ../panels/network/network.ui.h:3
+#: panels/network/network.ui:194
 msgid "Not set up"
 msgstr "Not set up"
 
-#: ../panels/network/network-vpn.ui.h:1
+#: panels/network/network-vpn.ui:56
 msgid "Turn VPN connection off"
 msgstr "Turn VPN connection off"
 
-#: ../panels/network/network-wifi.ui.h:3
+#: panels/network/network-wifi.ui:127
 msgid "Automatic _Connect"
 msgstr "Automatic _Connect"
 
-#: ../panels/network/network-wifi.ui.h:13
+#: panels/network/network-wifi.ui:474
 msgid "details"
 msgstr "details"
 
-#: ../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/sharing/sharing.ui.h:9
-#: ../panels/user-accounts/data/account-dialog.ui.h:12
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
+#: panels/network/network-wifi.ui:545
+#: panels/network/wireless-security/eap-method-leap.ui:40
+#: panels/network/wireless-security/eap-method-simple.ui:40
+#: panels/network/wireless-security/ws-leap.ui:40
+#: panels/network/wireless-security/ws-wpa-psk.ui:22
+#: panels/sharing/sharing.ui:351
+#: panels/user-accounts/data/account-dialog.ui:300
+#: panels/user-accounts/data/account-dialog.ui:525
+#: panels/user-accounts/data/user-accounts-dialog.ui:205
 msgid "_Password"
 msgstr "_Password"
 
-#: ../panels/network/network-wifi.ui.h:21
+#: panels/network/network-wifi.ui:622
 msgid "Show P_assword"
 msgstr "Show P_assword"
 
-#: ../panels/network/network-wifi.ui.h:22
+#: panels/network/network-wifi.ui:652
 msgid "Make available to other users"
 msgstr "Make available to other users"
 
-#: ../panels/network/network-wifi.ui.h:23
+#: panels/network/network-wifi.ui:680
 msgid "identity"
 msgstr "identity"
 
-#: ../panels/network/network-wifi.ui.h:24
+#: panels/network/network-wifi.ui:714
 msgid "IPv_4"
 msgstr "IPv_4"
 
-#: ../panels/network/network-wifi.ui.h:25
+#: panels/network/network-wifi.ui:755 panels/network/network-wifi.ui:1032
 msgid "_Addresses"
 msgstr "_Addresses"
 
-#: ../panels/network/network-wifi.ui.h:28
+#: panels/network/network-wifi.ui:779 panels/network/network-wifi.ui:1056
 msgid "Automatic (DHCP) addresses only"
 msgstr "Automatic (DHCP) addresses only"
 
-#: ../panels/network/network-wifi.ui.h:29
+#: panels/network/network-wifi.ui:780 panels/network/network-wifi.ui:1057
 msgid "Link-local only"
 msgstr "Link-local only"
 
-#: ../panels/network/network-wifi.ui.h:30
+#: panels/network/network-wifi.ui:781 panels/network/network-wifi.ui:1058
 msgid "Shared with other computers"
 msgstr "Shared with other computers"
 
-#: ../panels/network/network-wifi.ui.h:33
+#: panels/network/network-wifi.ui:917 panels/network/network-wifi.ui:1194
 msgid "_Ignore automatically obtained routes"
 msgstr "_Ignore automatically obtained routes"
 
-#: ../panels/network/network-wifi.ui.h:35
+#: panels/network/network-wifi.ui:960
 msgid "ipv4"
 msgstr "ipv4"
 
-#: ../panels/network/network-wifi.ui.h:36
+#: panels/network/network-wifi.ui:991
 msgid "IPv_6"
 msgstr "IPv_6"
 
-#: ../panels/network/network-wifi.ui.h:37
+#: panels/network/network-wifi.ui:1237
 msgid "ipv6"
 msgstr "ipv6"
 
-#: ../panels/network/network-wifi.ui.h:39
+#: panels/network/network-wifi.ui:1277
 msgid "_Cloned MAC Address"
 msgstr "_Cloned MAC Address"
 
-#: ../panels/network/network-wifi.ui.h:40
+#: panels/network/network-wifi.ui:1327
 msgid "hardware"
 msgstr "hardware"
 
-#: ../panels/network/network-wifi.ui.h:41
+#: panels/network/network-wifi.ui:1346
 msgid "_Reset"
 msgstr "_Reset"
 
-#: ../panels/network/network-wifi.ui.h:43
+#: panels/network/network-wifi.ui:1382
 msgid ""
 "Reset the settings for this connection to their defaults, but remember as a "
 "preferred connection."
@@ -3007,7 +2952,7 @@ msgstr ""
 "Reset the settings for this connection to their defaults, but remember as a "
 "preferred connection."
 
-#: ../panels/network/network-wifi.ui.h:44
+#: panels/network/network-wifi.ui:1399
 msgid ""
 "Remove all details relating to this network and do not try to automatically "
 "connect to it."
@@ -3015,558 +2960,541 @@ msgstr ""
 "Remove all details relating to this network and do not try to automatically "
 "connect to it."
 
-#: ../panels/network/network-wifi.ui.h:45
+#: panels/network/network-wifi.ui:1419
 msgid "reset"
 msgstr "reset"
 
-#: ../panels/network/network-wifi.ui.h:50
+#: panels/network/network-wifi.ui:1472
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../panels/network/network-wifi.ui.h:51
-#| msgid "Reset"
+#: panels/network/network-wifi.ui:1476
 msgctxt "tab"
 msgid "Reset"
 msgstr "Reset"
 
-#: ../panels/network/network-wifi.ui.h:52
+#: panels/network/network-wifi.ui:1537
 msgid "Wi-Fi Hotspot"
 msgstr "Wi-Fi Hotspot"
 
-#: ../panels/network/network-wifi.ui.h:53
+#: panels/network/network-wifi.ui:1554
 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:54
+#: panels/network/network-wifi.ui:1603
 msgid "Network Name"
 msgstr "Network Name"
 
-#: ../panels/network/network-wifi.ui.h:55
+#: panels/network/network-wifi.ui:1621
 msgid "Connected Devices"
 msgstr "Connected Devices"
 
-#: ../panels/network/network-wifi.ui.h:56
+#: panels/network/network-wifi.ui:1639
 msgid "Security type"
 msgstr "Security type"
 
-#: ../panels/network/network-wifi.ui.h:57
-#: ../panels/printers/authentication-dialog.ui.h:5
-#: ../panels/printers/new-printer-dialog.ui.h:14
-#: ../panels/user-accounts/data/account-dialog.ui.h:9
+#: panels/network/network-wifi.ui:1702
+#| msgid "Password"
+msgctxt "Wi-Fi passkey"
 msgid "Password"
 msgstr "Password"
 
-#: ../panels/network/network-wifi.ui.h:59
+#: panels/network/network-wifi.ui:1796
 msgid "Turn Wi-Fi off"
 msgstr "Turn Wi-Fi off"
 
-#: ../panels/network/network-wifi.ui.h:60
+#: panels/network/network-wifi.ui:1828
 msgid "_Connect to Hidden Network…"
 msgstr "_Connect to Hidden Network…"
 
-#: ../panels/network/network-wifi.ui.h:61
-#| msgid "Wi-Fi Hotspot"
+#: panels/network/network-wifi.ui:1838
 msgid "_Turn On Wi-Fi Hotspot…"
 msgstr "_Turn On Wi-Fi Hotspot…"
 
-#: ../panels/network/network-wifi.ui.h:62
+#: panels/network/network-wifi.ui:1848
 msgid "_Known Wi-Fi Networks"
 msgstr "_Known Wi-Fi Networks"
 
-#: ../panels/network/wifi.ui.h:1
-msgid "Make sure you have a Wi-Fi adapter plugged and turned on"
-msgstr "Make sure you have a Wi-Fi adapter plugged and turned on"
-
-#: ../panels/network/wifi.ui.h:2
-#| msgid "No Pictures Found"
+#: panels/network/wifi.ui:40
 msgid "No Wi-Fi Adapter Found"
 msgstr "No Wi-Fi Adapter Found"
 
-#: ../panels/network/wifi.ui.h:3
-#| msgid "Air_plane Mode"
+#: panels/network/wifi.ui:52
+msgid "Make sure you have a Wi-Fi adapter plugged and turned on"
+msgstr "Make sure you have a Wi-Fi adapter plugged and turned on"
+
+#: panels/network/wifi.ui:127
 msgid "Airplane Mode"
 msgstr "Aeroplane Mode"
 
-#: ../panels/network/wifi.ui.h:4
+#: panels/network/wifi.ui:142
 msgid "Disables Wi-Fi, Bluetooth and mobile broadband"
 msgstr "Disables Wi-Fi, Bluetooth and mobile broadband"
 
-#: ../panels/network/wifi.ui.h:5
-#| msgid "Networks"
+#: panels/network/wifi.ui:192
 msgid "Visible Networks"
 msgstr "Visible Networks"
 
-#: ../panels/network/wifi.ui.h:6
-#| msgid "NetworkManager needs to be running."
+#: panels/network/wifi.ui:296
 msgid "NetworkManager needs to be running"
 msgstr "NetworkManager needs to be running"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:127
+#: panels/network/panel-common.c:127
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:131
+#: panels/network/panel-common.c:131
 msgid "Infrastructure"
 msgstr "Infrastructure"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201
+#: 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:151
+#: panels/network/panel-common.c:151
 msgid "Unmanaged"
 msgstr "Unmanaged"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:155
+#: panels/network/panel-common.c:155
 msgid "Unavailable"
 msgstr "Unavailable"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207
+#: 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:169 ../panels/network/panel-common.c:211
+#: 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:173 ../panels/network/panel-common.c:215
+#: panels/network/panel-common.c:173 panels/network/panel-common.c:215
 msgid "Connected"
 msgstr "Connected"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:177
+#: panels/network/panel-common.c:177
 msgid "Disconnecting"
 msgstr "Disconnecting"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219
+#: 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:185 ../panels/network/panel-common.c:227
+#: 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:223
+#: panels/network/panel-common.c:223
 msgid "Not connected"
 msgstr "Not connected"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:248
+#: panels/network/panel-common.c:248
 msgid "Configuration failed"
 msgstr "Configuration failed"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:252
+#: panels/network/panel-common.c:252
 msgid "IP configuration failed"
 msgstr "IP configuration failed"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:256
+#: panels/network/panel-common.c:256
 msgid "IP configuration expired"
 msgstr "IP configuration expired"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:260
+#: 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:264
+#: 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:268
+#: 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:272
+#: 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:276
+#: 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:280
+#: 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:284
+#: panels/network/panel-common.c:284
 msgid "PPP service disconnected"
 msgstr "PPP service disconnected"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:288
+#: panels/network/panel-common.c:288
 msgid "PPP failed"
 msgstr "PPP failed"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:292
+#: 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:296
+#: panels/network/panel-common.c:296
 msgid "DHCP client error"
 msgstr "DHCP client error"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:300
+#: panels/network/panel-common.c:300
 msgid "DHCP client failed"
 msgstr "DHCP client failed"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:304
+#: 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:308
+#: 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:312
+#: 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:316
+#: panels/network/panel-common.c:316
 msgid "AutoIP service error"
 msgstr "AutoIP service error"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:320
+#: panels/network/panel-common.c:320
 msgid "AutoIP service failed"
 msgstr "AutoIP service failed"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:324
+#: panels/network/panel-common.c:324
 msgid "Line busy"
 msgstr "Line busy"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:328
+#: panels/network/panel-common.c:328
 msgid "No dial tone"
 msgstr "No dial tone"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:332
+#: 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:336
+#: 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:340
+#: panels/network/panel-common.c:340
 msgid "Dialing attempt failed"
 msgstr "Dialing attempt failed"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:344
+#: panels/network/panel-common.c:344
 msgid "Modem initialization failed"
 msgstr "Modem initialisation failed"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:348
+#: 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:352
+#: 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:356
+#: panels/network/panel-common.c:356
 msgid "Network registration denied"
 msgstr "Network registration denied"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:360
+#: 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:364
+#: 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:368
+#: panels/network/panel-common.c:368
 msgid "PIN check failed"
 msgstr "PIN check failed"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:372
+#: 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:376
+#: panels/network/panel-common.c:376
 msgid "Connection disappeared"
 msgstr "Connection disappeared"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:380
+#: 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:384
+#: panels/network/panel-common.c:384
 msgid "Modem not found"
 msgstr "Modem not found"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:388
+#: panels/network/panel-common.c:388
 msgid "Bluetooth connection failed"
 msgstr "Bluetooth connection failed"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:392
+#: 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:396
+#: panels/network/panel-common.c:396
 msgid "SIM Pin required"
 msgstr "SIM Pin required"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:400
+#: panels/network/panel-common.c:400
 msgid "SIM Puk required"
 msgstr "SIM Puk required"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:404
+#: panels/network/panel-common.c:404
 msgid "SIM wrong"
 msgstr "SIM wrong"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:408
+#: panels/network/panel-common.c:408
 msgid "Connection dependency failed"
 msgstr "Connection dependency failed"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:433
+#: panels/network/panel-common.c:433
 msgid "Firmware missing"
 msgstr "Firmware missing"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:437
+#: panels/network/panel-common.c:437
 msgid "Cable unplugged"
 msgstr "Cable unplugged"
 
-#: ../panels/network/wireless-security/eap-method.c:57
-#| msgid "undefined error in 802.1x security (wpa-eap)"
+#: panels/network/wireless-security/eap-method.c:57
 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:233
+#: panels/network/wireless-security/eap-method.c:233
 msgid "no file selected"
 msgstr "no file selected"
 
-#: ../panels/network/wireless-security/eap-method.c:264
+#: panels/network/wireless-security/eap-method.c:264
 msgid "unspecified error validating eap-method file"
 msgstr "unspecified error validating eap-method file"
 
-#: ../panels/network/wireless-security/eap-method.c:439
+#: panels/network/wireless-security/eap-method.c:439
 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:442
+#: panels/network/wireless-security/eap-method.c:442
 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:72
+#: 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:351
+#: 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:351
 msgid "GTC"
 msgstr "GTC"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:283
-#: ../panels/network/wireless-security/eap-method-peap.c:272
-#: ../panels/network/wireless-security/eap-method-ttls.c:289
+#: 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:289
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:406
+#: panels/network/wireless-security/eap-method-fast.c:406
 msgid "Choose a PAC file"
 msgstr "Choose a PAC file"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:413
+#: 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:1
+#: panels/network/wireless-security/eap-method-fast.ui:22
 msgid "Anonymous"
 msgstr "Anonymous"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
+#: panels/network/wireless-security/eap-method-fast.ui:25
 msgid "Authenticated"
 msgstr "Authenticated"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
+#: panels/network/wireless-security/eap-method-fast.ui:28
 msgid "Both"
 msgstr "Both"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
+#: panels/network/wireless-security/eap-method-fast.ui:76
 msgid "PAC _file"
 msgstr "PAC _file"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:7
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
+#: panels/network/wireless-security/eap-method-fast.ui:122
+#: panels/network/wireless-security/eap-method-peap.ui:146
+#: panels/network/wireless-security/eap-method-ttls.ui:97
 msgid "_Inner authentication"
 msgstr "_Inner authentication"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
+#: panels/network/wireless-security/eap-method-fast.ui:156
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Allow automatic PAC pro_visioning"
 
-#: ../panels/network/wireless-security/eap-method-leap.c:65
+#: 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
+#: 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:4
+#: panels/network/wireless-security/eap-method-leap.ui:26
+#: panels/network/wireless-security/eap-method-simple.ui:26
+#: panels/network/wireless-security/ws-leap.ui:26
+#: panels/user-accounts/data/account-dialog.ui:142
+#: panels/user-accounts/data/account-dialog.ui:505
 msgid "_Username"
 msgstr "_Username"
 
-#: ../panels/network/wireless-security/eap-method-leap.ui.h:3
-#: ../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
+#: panels/network/wireless-security/eap-method-leap.ui:68
+#: panels/network/wireless-security/eap-method-simple.ui:85
+#: panels/network/wireless-security/eap-method-tls.ui:164
+#: panels/network/wireless-security/ws-leap.ui:68
+#: panels/network/wireless-security/ws-wpa-psk.ui:76
 msgid "Sho_w password"
 msgstr "Sho_w password"
 
-#: ../panels/network/wireless-security/eap-method-peap.c:63
+#: 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
+#: 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:336
-#: ../panels/network/wireless-security/wireless-security.c:441
+#: panels/network/wireless-security/eap-method-peap.c:287
+#: panels/network/wireless-security/eap-method-ttls.c:336
+#: panels/network/wireless-security/wireless-security.c:441
 msgid "MD5"
 msgstr "MD5"
 
-#: ../panels/network/wireless-security/eap-method-peap.c:381
-#: ../panels/network/wireless-security/eap-method-tls.c:501
-#: ../panels/network/wireless-security/eap-method-ttls.c:430
+#: panels/network/wireless-security/eap-method-peap.c:381
+#: panels/network/wireless-security/eap-method-tls.c:492
+#: panels/network/wireless-security/eap-method-ttls.c:430
 msgid "Choose a Certificate Authority certificate"
 msgstr "Choose a Certificate Authority certificate"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:2
+#: panels/network/wireless-security/eap-method-peap.ui:25
 msgid "Version 0"
 msgstr "Version 0"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:3
+#: panels/network/wireless-security/eap-method-peap.ui:28
 msgid "Version 1"
 msgstr "Version 1"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:5
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:3
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:2
+#: panels/network/wireless-security/eap-method-peap.ui:74
+#: panels/network/wireless-security/eap-method-tls.ui:75
+#: panels/network/wireless-security/eap-method-ttls.ui:57
 msgid "C_A certificate"
 msgstr "C_A certificate"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:6
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:4
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:3
+#: panels/network/wireless-security/eap-method-peap.ui:96
+#: panels/network/wireless-security/eap-method-tls.ui:97
+#: panels/network/wireless-security/eap-method-ttls.ui:79
 msgid "No CA certificate is _required"
 msgstr "No CA certificate is _required"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
+#: panels/network/wireless-security/eap-method-peap.ui:114
 msgid "PEAP _version"
 msgstr "PEAP _version"
 
-#: ../panels/network/wireless-security/eap-method-simple.c:74
+#: 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
+#: panels/network/wireless-security/eap-method-simple.c:87
 msgid "missing EAP password"
 msgstr "missing EAP password"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:68
+#: 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
+#: 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
+#: 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
+#: panels/network/wireless-security/eap-method-tls.c:100
 #, 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
+#: panels/network/wireless-security/eap-method-tls.c:110
 #, c-format
 msgid "invalid EAP-TLS user-certificate: %s"
 msgstr "invalid EAP-TLS user-certificate: %s"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:316
+#: panels/network/wireless-security/eap-method-tls.c:307
 msgid "Unencrypted private keys are insecure"
 msgstr "Unencrypted private keys are insecure"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:319
-#| msgid ""
-#| "The selected private key does not appear to be protected by a password.  "
-#| "This could allow your security credentials to be compromised.  Please "
-#| "select a password-protected private key.\n"
-#| "\n"
-#| "(You can password-protect your private key with openssl)"
+#: panels/network/wireless-security/eap-method-tls.c:310
 msgid ""
 "The selected private key does not appear to be protected by a password. This "
 "could allow your security credentials to be compromised. Please select a "
@@ -3580,112 +3508,110 @@ msgstr ""
 "\n"
 "(You can password-protect your private key with openssl)"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:495
+#: panels/network/wireless-security/eap-method-tls.c:486
 msgid "Choose your personal certificate"
 msgstr "Choose your personal certificate"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:507
+#: panels/network/wireless-security/eap-method-tls.c:498
 msgid "Choose your private key"
 msgstr "Choose your private key"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:1
+#: panels/network/wireless-security/eap-method-tls.ui:24
 msgid "I_dentity"
 msgstr "I_dentity"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:2
+#: panels/network/wireless-security/eap-method-tls.ui:50
 msgid "_User certificate"
 msgstr "_User certificate"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:5
+#: panels/network/wireless-security/eap-method-tls.ui:115
 msgid "Private _key"
 msgstr "Private _key"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:6
+#: panels/network/wireless-security/eap-method-tls.ui:140
 msgid "_Private key password"
 msgstr "_Private key password"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:63
+#: 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
+#: 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:259
+#: panels/network/wireless-security/eap-method-ttls.c:259
 msgid "PAP"
 msgstr "PAP"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:274
+#: panels/network/wireless-security/eap-method-ttls.c:274
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:305
-#| msgid "MSCHAPv2"
+#: panels/network/wireless-security/eap-method-ttls.c:305
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (no EAP)"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:321
+#: panels/network/wireless-security/eap-method-ttls.c:321
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../panels/network/wireless-security/wireless-security.c:87
-#| msgid "Unknown error validating 802.1x security"
+#: 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:453
+#: panels/network/wireless-security/wireless-security.c:453
 msgid "TLS"
 msgstr "TLS"
 
-#: ../panels/network/wireless-security/wireless-security.c:477
+#: panels/network/wireless-security/wireless-security.c:477
 msgid "PWD"
 msgstr "PWD"
 
-#: ../panels/network/wireless-security/wireless-security.c:488
+#: panels/network/wireless-security/wireless-security.c:488
 msgid "FAST"
 msgstr "FAST"
 
-#: ../panels/network/wireless-security/wireless-security.c:499
+#: panels/network/wireless-security/wireless-security.c:499
 msgid "Tunneled TLS"
 msgstr "Tunnelled TLS"
 
-#: ../panels/network/wireless-security/wireless-security.c:510
+#: panels/network/wireless-security/wireless-security.c:510
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
-#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:6
-#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:1
+#: panels/network/wireless-security/ws-dynamic-wep.ui:39
+#: panels/network/wireless-security/ws-wep-key.ui:115
+#: panels/network/wireless-security/ws-wpa-eap.ui:33
 msgid "Au_thentication"
 msgstr "Au_thentication"
 
-#: ../panels/network/wireless-security/ws-leap.c:63
+#: panels/network/wireless-security/ws-leap.c:63
 msgid "missing leap-username"
 msgstr "missing leap-username"
 
-#: ../panels/network/wireless-security/ws-leap.c:74
+#: panels/network/wireless-security/ws-leap.c:74
 msgid "missing leap-password"
 msgstr "missing leap-password"
 
-#: ../panels/network/wireless-security/ws-wep-key.c:107
+#: 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
+#: 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
+#: 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
+#: 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 "
@@ -3694,39 +3620,39 @@ 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
+#: 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
+#: 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
+#: panels/network/wireless-security/ws-wep-key.ui:11
 msgid "1 (Default)"
 msgstr "1 (Default)"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:2
+#: panels/network/wireless-security/ws-wep-key.ui:31
 msgid "Open System"
 msgstr "Open System"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:3
+#: panels/network/wireless-security/ws-wep-key.ui:34
 msgid "Shared Key"
 msgstr "Shared Key"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:4
+#: panels/network/wireless-security/ws-wep-key.ui:56
 msgid "_Key"
 msgstr "_Key"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:5
+#: panels/network/wireless-security/ws-wep-key.ui:94
 msgid "Sho_w key"
 msgstr "Sho_w key"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:7
+#: panels/network/wireless-security/ws-wep-key.ui:152
 msgid "WEP inde_x"
 msgstr "WEP inde_x"
 
-#: ../panels/network/wireless-security/ws-wpa-psk.c:70
+#: 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 "
@@ -3735,34 +3661,32 @@ 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
+#: 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
+#: panels/network/wireless-security/ws-wpa-psk.ui:50
 msgid "_Type"
 msgstr "_Type"
 
 #. This is the per application switch for message tray usage.
-#: ../panels/notifications/edit-dialog.ui.h:2
+#: panels/notifications/edit-dialog.ui:64
 msgctxt "notifications"
 msgid "_Notifications"
 msgstr "_Notifications"
 
 #. This is the setting to configure sounds associated with notifications.
-#: ../panels/notifications/edit-dialog.ui.h:4
+#: panels/notifications/edit-dialog.ui:116
 msgctxt "notifications"
 msgid "Sound _Alerts"
 msgstr "Sound _Alerts"
 
-#: ../panels/notifications/edit-dialog.ui.h:5
-#| msgctxt "notifications"
-#| msgid "_Notifications"
+#: panels/notifications/edit-dialog.ui:172
 msgctxt "notifications"
 msgid "Notification _Popups"
 msgstr "Notification _Popups"
 
-#: ../panels/notifications/edit-dialog.ui.h:6
+#: panels/notifications/edit-dialog.ui:188
 msgid ""
 "Notifications will continue to appear in the notification list when popups "
 "are disabled."
@@ -3771,89 +3695,95 @@ msgstr ""
 "are disabled."
 
 #. Popups here refers to message tray notifications in the middle of the screen.
-#: ../panels/notifications/edit-dialog.ui.h:8
-#| msgctxt "notifications"
-#| msgid "Show Message _Content in Banners"
+#: panels/notifications/edit-dialog.ui:253
 msgctxt "notifications"
 msgid "Show Message _Content in Popups"
 msgstr "Show Message _Content in Popups"
 
-#: ../panels/notifications/edit-dialog.ui.h:9
+#: panels/notifications/edit-dialog.ui:304
 msgctxt "notifications"
 msgid "_Lock Screen Notifications"
 msgstr "_Lock Screen Notifications"
 
-#: ../panels/notifications/edit-dialog.ui.h:10
+#: panels/notifications/edit-dialog.ui:355
 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 "No­ti­fi­ca­tions"
-msgstr "No­ti­fi­ca­tions"
+#: panels/notifications/gnome-notifications-panel.desktop.in.in:3
+#| msgctxt "notifications"
+#| msgid "_Notifications"
+msgid "Notifications"
+msgstr "Notifications"
 
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3
+#: panels/notifications/gnome-notifications-panel.desktop.in.in:4
 msgid "Control which notifications are displayed and what they show"
 msgstr "Control which notifications are displayed and what they show"
 
+#: panels/notifications/gnome-notifications-panel.desktop.in.in:6
+#| msgid "Preferences;Settings;"
+msgid "preferences-system-notifications"
+msgstr "preferences-system-notifications"
+
 #. Translators: those are keywords for the notifications control-center panel
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5
+#: panels/notifications/gnome-notifications-panel.desktop.in.in:19
 msgid "Notifications;Banner;Message;Tray;Popup;"
 msgstr "Notifications;Banner;Message;Tray;Popup;"
 
-#: ../panels/notifications/notifications.ui.h:1
-#| msgctxt "notifications"
-#| msgid "_Notifications"
+#: panels/notifications/notifications.ui:84
 msgid "Notification _Popups"
 msgstr "Notification _Popups"
 
-#: ../panels/notifications/notifications.ui.h:2
+#: panels/notifications/notifications.ui:134
 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
+#: panels/notifications/notifications.ui:180 panels/privacy/privacy.ui:875
+#: panels/sound/gvc-mixer-dialog.c:1768
 msgid "Applications"
 msgstr "Applications"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:148
+#: panels/online-accounts/cc-online-accounts-panel.c:148
 msgctxt "Online Account"
 msgid "Other"
 msgstr "Other"
 
 #. translators: This is the title of the "Show Account" dialog. The
 #. * %s is the name of the provider. e.g., 'Google'.
-#: ../panels/online-accounts/cc-online-accounts-panel.c:603
+#: panels/online-accounts/cc-online-accounts-panel.c:551
 #, c-format
-#| msgid "My Account"
 msgid "%s Account"
 msgstr "%s Account"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:895
+#: panels/online-accounts/cc-online-accounts-panel.c:843
 msgid "Error removing account"
 msgstr "Error removing account"
 
 #. Translators: The %s is the username (eg., debarshi ray gmail com
 #. * or rishi).
 #.
-#: ../panels/online-accounts/cc-online-accounts-panel.c:960
+#: panels/online-accounts/cc-online-accounts-panel.c:908
 #, c-format
 msgid "<b>%s</b> removed"
 msgstr "<b>%s</b> removed"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2
-msgid "On­line Accounts"
-msgstr "On­line Accounts"
+#: panels/online-accounts/gnome-online-accounts-panel.desktop.in.in:3
+#| msgid "On­line Accounts"
+msgid "Online Accounts"
+msgstr "Online Accounts"
 
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3
+#: panels/online-accounts/gnome-online-accounts-panel.desktop.in.in:4
 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"
 
+#: panels/online-accounts/gnome-online-accounts-panel.desktop.in.in:6
+msgid "goa-panel"
+msgstr "goa-panel"
+
+#. Translators: those are keywords for the online-accounts control-center panel
 #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application)
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5
+#: panels/online-accounts/gnome-online-accounts-panel.desktop.in.in:19
 msgid ""
 "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
 "Kerberos;IMAP;SMTP;Pocket;ReadItLater;"
@@ -3862,40 +3792,38 @@ msgstr ""
 "Kerberos;IMAP;SMTP;Pocket;ReadItLater;"
 
 #. Translators: This is the button which allows undoing the removal of the printer.
-#: ../panels/online-accounts/online-accounts.ui.h:1
-#: ../panels/printers/printers.ui.h:4
+#: panels/online-accounts/online-accounts.ui:38 panels/printers/printers.ui:71
 msgid "Undo"
 msgstr "Undo"
 
-#: ../panels/online-accounts/online-accounts.ui.h:2
+#: panels/online-accounts/online-accounts.ui:125
 msgid "Connect to your data in the cloud"
 msgstr "Connect to your data in the cloud"
 
-#: ../panels/online-accounts/online-accounts.ui.h:3
+#: panels/online-accounts/online-accounts.ui:137
 msgid "No internet connection — connect to set up new online accounts"
 msgstr "No internet connection — connect to set up new online accounts"
 
-#: ../panels/online-accounts/online-accounts.ui.h:4
-#| msgid "Add account"
+#: panels/online-accounts/online-accounts.ui:159
 msgid "Add an account"
 msgstr "Add an account"
 
-#: ../panels/online-accounts/online-accounts.ui.h:5
+#: panels/online-accounts/online-accounts.ui:264
 msgid "Remove Account"
 msgstr "Remove Account"
 
-#: ../panels/power/cc-power-panel.c:253
+#: panels/power/cc-power-panel.c:253
 msgid "Unknown time"
 msgstr "Unknown time"
 
-#: ../panels/power/cc-power-panel.c:259
+#: 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:271
+#: panels/power/cc-power-panel.c:271
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -3904,482 +3832,510 @@ 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:279
+#: 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:280
+#: panels/power/cc-power-panel.c:280
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hour"
 msgstr[1] "hours"
 
-#: ../panels/power/cc-power-panel.c:281
+#: 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:300
+#: 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:307
+#: 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:312
+#: panels/power/cc-power-panel.c:312
 #, c-format
 msgid "%s remaining"
 msgstr "%s remaining"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:317 ../panels/power/cc-power-panel.c:345
+#: 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:321 ../panels/power/cc-power-panel.c:349
+#: 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:336
+#: panels/power/cc-power-panel.c:336
 msgid "Charging"
 msgstr "Charging"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:341
+#: panels/power/cc-power-panel.c:341
 msgid "Discharging"
 msgstr "Discharging"
 
-#: ../panels/power/cc-power-panel.c:464
+#: panels/power/cc-power-panel.c:464
 msgctxt "Battery name"
 msgid "Main"
 msgstr "Main"
 
-#: ../panels/power/cc-power-panel.c:466
+#: panels/power/cc-power-panel.c:466
 msgctxt "Battery name"
 msgid "Extra"
 msgstr "Extra"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:537
+#: panels/power/cc-power-panel.c:537
 msgid "Wireless mouse"
 msgstr "Wireless mouse"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:540
+#: panels/power/cc-power-panel.c:540
 msgid "Wireless keyboard"
 msgstr "Wireless keyboard"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:543
+#: panels/power/cc-power-panel.c:543
 msgid "Uninterruptible power supply"
 msgstr "Uninterruptible power supply"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:546
+#: panels/power/cc-power-panel.c:546
 msgid "Personal digital assistant"
 msgstr "Personal digital assistant"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:549
+#: panels/power/cc-power-panel.c:549
 msgid "Cellphone"
 msgstr "Mobile phone"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:552
+#: panels/power/cc-power-panel.c:552
 msgid "Media player"
 msgstr "Media player"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:555 ../panels/wacom/cc-wacom-panel.c:793
+#: panels/power/cc-power-panel.c:555 panels/wacom/cc-wacom-panel.c:793
 msgid "Tablet"
 msgstr "Tablet"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:558
+#: panels/power/cc-power-panel.c:558
 msgid "Computer"
 msgstr "Computer"
 
+#. TRANSLATORS: secondary battery
+#: panels/power/cc-power-panel.c:561
+msgid "Gaming input device"
+msgstr "Gaming input device"
+
 #. TRANSLATORS: secondary battery, misc
-#: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801
-#: ../panels/power/cc-power-panel.c:2356
+#: panels/power/cc-power-panel.c:564 panels/power/cc-power-panel.c:804
+#: panels/power/cc-power-panel.c:2368
 msgid "Battery"
 msgstr "Battery"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:615
+#: panels/power/cc-power-panel.c:618
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "Charging"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:622
+#: panels/power/cc-power-panel.c:625
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "Caution"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:627
+#: panels/power/cc-power-panel.c:630
 msgctxt "Battery power"
 msgid "Low"
 msgstr "Low"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:632
+#: panels/power/cc-power-panel.c:635
 msgctxt "Battery power"
 msgid "Good"
 msgstr "Good"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:637
+#: panels/power/cc-power-panel.c:640
 msgctxt "Battery power"
 msgid "Fully charged"
 msgstr "Fully charged"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:641
+#: panels/power/cc-power-panel.c:644
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "Empty"
 
-#: ../panels/power/cc-power-panel.c:799
+#: panels/power/cc-power-panel.c:802
 msgid "Batteries"
 msgstr "Batteries"
 
-#: ../panels/power/cc-power-panel.c:1227
+#: panels/power/cc-power-panel.c:1230
 msgid "When _idle"
 msgstr "When _idle"
 
-#: ../panels/power/cc-power-panel.c:1681
+#: panels/power/cc-power-panel.c:1684
 msgid "Power Saving"
 msgstr "Power Saving"
 
-#: ../panels/power/cc-power-panel.c:1712
+#: panels/power/cc-power-panel.c:1715
 msgid "_Screen brightness"
 msgstr "_Screen brightness"
 
-#: ../panels/power/cc-power-panel.c:1731
+#: panels/power/cc-power-panel.c:1734
 msgid "Automatic brightness"
 msgstr "Automatic brightness"
 
-#: ../panels/power/cc-power-panel.c:1751
+#: panels/power/cc-power-panel.c:1754
 msgid "_Keyboard brightness"
 msgstr "_Keyboard brightness"
 
-#: ../panels/power/cc-power-panel.c:1761
+#: panels/power/cc-power-panel.c:1764
 msgid "_Dim screen when inactive"
 msgstr "_Dim screen when inactive"
 
-#: ../panels/power/cc-power-panel.c:1786
+#: panels/power/cc-power-panel.c:1789
 msgid "_Blank screen"
 msgstr "_Blank screen"
 
-#: ../panels/power/cc-power-panel.c:1823
+#: panels/power/cc-power-panel.c:1826
 msgid "_Wi-Fi"
 msgstr "_Wi-Fi"
 
-#: ../panels/power/cc-power-panel.c:1828
+#: 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:1853
+#: panels/power/cc-power-panel.c:1856
 msgid "_Mobile broadband"
 msgstr "_Mobile broadband"
 
-#: ../panels/power/cc-power-panel.c:1858
+#: panels/power/cc-power-panel.c:1861
 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:1903
+#: panels/power/cc-power-panel.c:1914
 msgid "_Bluetooth"
 msgstr "_Bluetooth"
 
-#: ../panels/power/cc-power-panel.c:1966
+#: panels/power/cc-power-panel.c:1919
+#| msgid "Turn off Wi-Fi to save power."
+msgid "Turn off Bluetooth to save power."
+msgstr "Turn off Bluetooth to save power."
+
+#: panels/power/cc-power-panel.c:1978
 msgid "When on battery power"
 msgstr "When on battery power"
 
-#: ../panels/power/cc-power-panel.c:1968
+#: panels/power/cc-power-panel.c:1980
 msgid "When plugged in"
 msgstr "When plugged in"
 
-#: ../panels/power/cc-power-panel.c:2063
+#: panels/power/cc-power-panel.c:2075
 msgid "Suspend"
 msgstr "Suspend"
 
-#: ../panels/power/cc-power-panel.c:2064
+#: panels/power/cc-power-panel.c:2076
 msgid "Power Off"
 msgstr "Power Off"
 
-#: ../panels/power/cc-power-panel.c:2065
+#: panels/power/cc-power-panel.c:2077
 msgid "Hibernate"
 msgstr "Hibernate"
 
-#: ../panels/power/cc-power-panel.c:2066
+#: panels/power/cc-power-panel.c:2078
 msgid "Nothing"
 msgstr "Nothing"
 
 #. Frame header
-#: ../panels/power/cc-power-panel.c:2180
+#: panels/power/cc-power-panel.c:2192
 msgid "Suspend & Power Button"
 msgstr "Suspend & Power Button"
 
-#: ../panels/power/cc-power-panel.c:2219
+#: panels/power/cc-power-panel.c:2231
 msgid "_Automatic suspend"
 msgstr "_Automatic suspend"
 
-#: ../panels/power/cc-power-panel.c:2220
+#: panels/power/cc-power-panel.c:2232
 msgid "Automatic suspend"
 msgstr "Automatic suspend"
 
-#: ../panels/power/cc-power-panel.c:2287
+#: panels/power/cc-power-panel.c:2299
 msgid "_When the Power Button is pressed"
 msgstr "_When the Power Button is pressed"
 
-#: ../panels/power/cc-power-panel.c:2406 ../shell/cc-window.c:247
-#: ../shell/panel-list.ui.h:1
+#: panels/power/cc-power-panel.c:2418 shell/cc-window.c:219
+#: shell/panel-list.ui:45
 msgid "Devices"
 msgstr "Devices"
 
-#. 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:3
+msgid "Power"
+msgstr "Power"
 
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:3
+#: panels/power/gnome-power-panel.desktop.in.in:4
 msgid "View your battery status and change power saving settings"
 msgstr "View your battery status and change power saving settings"
 
+#: panels/power/gnome-power-panel.desktop.in.in:6
+msgid "gnome-power-manager"
+msgstr "gnome-power-manager"
+
 #. Translators: those are keywords for the power control-center panel
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:5
+#: panels/power/gnome-power-panel.desktop.in.in:18
 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:3
+#: panels/power/power.ui:17
+#| msgid "2 minutes"
+msgid "20 minutes"
+msgstr "20 minutes"
+
+#: panels/power/power.ui:21
+#| msgid "5 minutes"
+msgid "25 minutes"
+msgstr "25 minutes"
+
+#: panels/power/power.ui:29
 msgid "45 minutes"
 msgstr "45 minutes"
 
-#: ../panels/power/power.ui.h:4 ../panels/privacy/privacy.ui.h:8
+#: panels/power/power.ui:33 panels/privacy/privacy.ui:42
+#: panels/privacy/privacy.ui:56
 msgid "1 hour"
 msgstr "1 hour"
 
-#: ../panels/power/power.ui.h:5
+#: panels/power/power.ui:37
 msgid "80 minutes"
 msgstr "80 minutes"
 
-#: ../panels/power/power.ui.h:6
+#: panels/power/power.ui:41
 msgid "90 minutes"
 msgstr "90 minutes"
 
-#: ../panels/power/power.ui.h:7
+#: panels/power/power.ui:45
 msgid "100 minutes"
 msgstr "100 minutes"
 
-#: ../panels/power/power.ui.h:8
+#: panels/power/power.ui:49
 msgid "2 hours"
 msgstr "2 hours"
 
-#: ../panels/power/power.ui.h:9 ../panels/privacy/privacy.ui.h:3
+#: panels/power/power.ui:63 panels/privacy/privacy.ui:22
 msgid "1 minute"
 msgstr "1 minute"
 
-#: ../panels/power/power.ui.h:10 ../panels/privacy/privacy.ui.h:4
+#: panels/power/power.ui:67 panels/privacy/privacy.ui:26
 msgid "2 minutes"
 msgstr "2 minutes"
 
-#: ../panels/power/power.ui.h:11 ../panels/privacy/privacy.ui.h:5
+#: panels/power/power.ui:71 panels/privacy/privacy.ui:30
 msgid "3 minutes"
 msgstr "3 minutes"
 
-#: ../panels/power/power.ui.h:12
+#: panels/power/power.ui:75
 msgid "4 minutes"
 msgstr "4 minutes"
 
-#: ../panels/power/power.ui.h:13 ../panels/privacy/privacy.ui.h:6
+#: panels/power/power.ui:79 panels/privacy/privacy.ui:34
 msgid "5 minutes"
 msgstr "5 minutes"
 
-#: ../panels/power/power.ui.h:14
+#: panels/power/power.ui:83
 msgid "8 minutes"
 msgstr "8 minutes"
 
-#: ../panels/power/power.ui.h:15
+#: panels/power/power.ui:87
 msgid "10 minutes"
 msgstr "10 minutes"
 
-#: ../panels/power/power.ui.h:16
+#: panels/power/power.ui:91
 msgid "12 minutes"
 msgstr "12 minutes"
 
-#: ../panels/power/power.ui.h:18
+#: panels/power/power.ui:155
 msgid "Automatic Suspend"
 msgstr "Automatic Suspend"
 
-#: ../panels/power/power.ui.h:19
+#: panels/power/power.ui:180
 msgid "_Plugged In"
 msgstr "_Plugged In"
 
-#: ../panels/power/power.ui.h:20
+#: panels/power/power.ui:196
 msgid "On _Battery Power"
 msgstr "On _Battery Power"
 
-#: ../panels/power/power.ui.h:21 ../panels/universal-access/uap.ui.h:36
+#: panels/power/power.ui:241 panels/power/power.ui:301
+#: panels/universal-access/uap.ui:1501
 msgid "Delay"
 msgstr "Delay"
 
-#: ../panels/printers/authentication-dialog.ui.h:1
+#: panels/printers/authentication-dialog.ui:11
 msgid " "
 msgstr " "
 
-#: ../panels/printers/authentication-dialog.ui.h:3
+#: panels/printers/authentication-dialog.ui:42
 msgid "Authenticate"
 msgstr "Authenticate"
 
-#: ../panels/printers/authentication-dialog.ui.h:4
-#: ../panels/printers/new-printer-dialog.ui.h:13
+#: panels/printers/authentication-dialog.ui:80
+#: panels/printers/new-printer-dialog.ui:361
 msgid "Username"
 msgstr "Username"
 
-#: ../panels/printers/authentication-dialog.ui.h:6
-#: ../panels/printers/new-printer-dialog.ui.h:11
+#: panels/printers/authentication-dialog.ui:96
+#: panels/printers/new-printer-dialog.ui:382
+#: panels/user-accounts/data/account-dialog.ui:240
+msgid "Password"
+msgstr "Password"
+
+#: panels/printers/authentication-dialog.ui:139
+#: panels/printers/new-printer-dialog.ui:336
 msgid "Authentication Required"
 msgstr "Authentication Required"
 
 #. Translators: %s is the printer name
-#: ../panels/printers/cc-printers-panel.c:718
+#: panels/printers/cc-printers-panel.c:720
 #, c-format
 msgid "Printer “%s” has been deleted"
 msgstr "Printer “%s” has been deleted"
 
 #. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:909
+#: panels/printers/cc-printers-panel.c:953
 msgid "Failed to add new printer."
 msgstr "Failed to add new printer."
 
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:1221
+#: panels/printers/cc-printers-panel.c:1275
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "Could not load ui: %s"
 
-#: ../panels/printers/details-dialog.ui.h:2
-#: ../panels/printers/printer-entry.ui.h:8
+#: panels/printers/details-dialog.ui:63 panels/printers/printer-entry.ui:223
 msgid "Location"
 msgstr "Location"
 
 #. Translators: Name of column showing printer drivers
-#: ../panels/printers/details-dialog.ui.h:4
-#: ../panels/printers/pp-ppd-selection-dialog.c:250
+#: panels/printers/details-dialog.ui:111
+#: panels/printers/pp-ppd-selection-dialog.c:250
 msgid "Driver"
 msgstr "Driver"
 
-#: ../panels/printers/details-dialog.ui.h:5
+#: panels/printers/details-dialog.ui:147
 msgid "Searching for preferred drivers…"
 msgstr "Searching for preferred drivers…"
 
-#: ../panels/printers/details-dialog.ui.h:6
-#| msgid "Search for a city"
+#: panels/printers/details-dialog.ui:169
 msgid "Search for Drivers"
 msgstr "Search for Drivers"
 
-#: ../panels/printers/details-dialog.ui.h:7
-#| msgid "Select from database…"
+#: panels/printers/details-dialog.ui:177
 msgid "Select from Database…"
 msgstr "Select from Database…"
 
-#: ../panels/printers/details-dialog.ui.h:8
-#| msgid "Provide PPD File…"
+#: panels/printers/details-dialog.ui:185
 msgid "Install PPD File…"
 msgstr "Install PPD File…"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2
-msgid "Prin­ters"
-msgstr "Prin­ters"
+#: panels/printers/gnome-printers-panel.desktop.in.in:3
+#| msgid "Prin­ters"
+msgid "Printers"
+msgstr "Printers"
 
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3
+#: panels/printers/gnome-printers-panel.desktop.in.in:4
 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"
 
+#: panels/printers/gnome-printers-panel.desktop.in.in:6
+#| msgid "No printers"
+msgid "printer"
+msgstr "printer"
+
 #. Translators: those are keywords for the printing control-center panel
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5
+#: panels/printers/gnome-printers-panel.desktop.in.in:15
 msgid "Printer;Queue;Print;Paper;Ink;Toner;"
 msgstr "Printer;Queue;Print;Paper;Ink;Toner;"
 
 #. Translators: this action removes (purges) all the listed jobs from the list.
-#: ../panels/printers/jobs-dialog.ui.h:2
+#: panels/printers/jobs-dialog.ui:22
 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
+#: panels/printers/jobs-dialog.ui:96
 msgid "No Active Printer Jobs"
 msgstr "No Active Printer Jobs"
 
 #. Translators: This is the title presented at top of the dialog.
-#: ../panels/printers/new-printer-dialog.ui.h:2
-#: ../panels/printers/pp-new-printer-dialog.c:384
-#: ../panels/printers/pp-new-printer-dialog.c:456
+#: panels/printers/new-printer-dialog.ui:29
+#: panels/printers/pp-new-printer-dialog.c:384
+#: panels/printers/pp-new-printer-dialog.c:456
 msgid "Add Printer"
 msgstr "Add Printer"
 
+#. Translators: This button opens authentication dialog for selected server.
 #. Translators: This buttons submits the credentials for the selected server.
-#: ../panels/printers/new-printer-dialog.ui.h:6
-#| msgid "Unlock"
+#: panels/printers/new-printer-dialog.ui:96
+#: panels/printers/new-printer-dialog.ui:111
 msgid "_Unlock"
 msgstr "_Unlock"
 
 #. Translators: No printers were detected
-#: ../panels/printers/new-printer-dialog.ui.h:8
-#| msgid "No Pictures Found"
+#: panels/printers/new-printer-dialog.ui:210
 msgid "No Printers Found"
 msgstr "No Printers Found"
 
 #. 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:10
+#: panels/printers/new-printer-dialog.ui:283
 msgid "Enter a network address or search for a printer"
 msgstr "Enter a network address or search for a printer"
 
-#: ../panels/printers/new-printer-dialog.ui.h:12
-#| msgid "Enter your username and password to view printers available on %s."
+#: panels/printers/new-printer-dialog.ui:352
 msgid "Enter username and password to view printers on Print Server."
 msgstr "Enter username and password to view printers on Print Server."
 
 #. Translators: This button triggers the printing of a test page.
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/options-dialog.ui.h:2
-#: ../panels/printers/pp-options-dialog.c:893
-#| msgid "Test page"
+#: panels/printers/options-dialog.ui:22 panels/printers/pp-options-dialog.c:893
 msgid "Test Page"
 msgstr "Test Page"
 
 #. Translators: This is the title of the dialog. %s is the printer name.
-#: ../panels/printers/pp-details-dialog.c:123
-#: ../panels/printers/pp-details-dialog.c:415
+#: panels/printers/pp-details-dialog.c:135
+#: panels/printers/pp-details-dialog.c:435
 #, c-format
-#| msgid "Details"
 msgid "%s Details"
 msgstr "%s Details"
 
-#: ../panels/printers/pp-details-dialog.c:172
+#: panels/printers/pp-details-dialog.c:184
 msgid "No suitable driver found"
 msgstr "No suitable driver found"
 
-#: ../panels/printers/pp-details-dialog.c:316
+#: panels/printers/pp-details-dialog.c:328
 msgid "Select PPD File"
 msgstr "Select PPD File"
 
-#: ../panels/printers/pp-details-dialog.c:325
+#: panels/printers/pp-details-dialog.c:337
 msgid ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
@@ -4387,307 +4343,299 @@ msgstr ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
 
-#: ../panels/printers/ppd-selection-dialog.ui.h:1
+#: panels/printers/ppd-selection-dialog.ui:10
 msgid "Select Printer Driver"
 msgstr "Select Printer Driver"
 
-#: ../panels/printers/ppd-selection-dialog.ui.h:3
-#: ../panels/user-accounts/um-photo-dialog.c:96
+#: panels/printers/ppd-selection-dialog.ui:40
+#: panels/user-accounts/um-photo-dialog.c:104
 msgid "Select"
 msgstr "Select"
 
-#: ../panels/printers/ppd-selection-dialog.ui.h:4
-#| msgid "Loading drivers database..."
+#: panels/printers/ppd-selection-dialog.ui:73
 msgid "Loading drivers database…"
 msgstr "Loading drivers database…"
 
 #. Translators: The found device is a JetDirect printer
-#: ../panels/printers/pp-host.c:539
+#: panels/printers/pp-host.c:539
 msgid "JetDirect Printer"
 msgstr "JetDirect Printer"
 
 #. Translators: The found device is a Line Printer Daemon printer
-#: ../panels/printers/pp-host.c:795
+#: panels/printers/pp-host.c:795
 msgid "LPD Printer"
 msgstr "LPD Printer"
 
 #. Translators: this is an option of "Two Sided"
-#: ../panels/printers/pp-ipp-option-widget.c:66
-#: ../panels/printers/pp-ppd-option-widget.c:70
+#: 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:68
-#: ../panels/printers/pp-ppd-option-widget.c:72
+#: 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:70
-#: ../panels/printers/pp-ppd-option-widget.c:74
+#: 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:72
+#: 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:74
+#: 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:76
+#: 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:78
+#: 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:104
+#: panels/printers/pp-jobs-dialog.c:104
 msgctxt "print job"
 msgid "Pending"
 msgstr "Pending"
 
 #. Translators: Job's state (job is held for printing)
-#: ../panels/printers/pp-jobs-dialog.c:108
+#: panels/printers/pp-jobs-dialog.c:108
 msgctxt "print job"
 msgid "Paused"
 msgstr "Paused"
 
 #. Translators: Job's state (job is currently printing)
-#: ../panels/printers/pp-jobs-dialog.c:112
+#: panels/printers/pp-jobs-dialog.c:112
 msgctxt "print job"
 msgid "Processing"
 msgstr "Processing"
 
 #. Translators: Job's state (job has been stopped)
-#: ../panels/printers/pp-jobs-dialog.c:116
+#: panels/printers/pp-jobs-dialog.c:116
 msgctxt "print job"
 msgid "Stopped"
 msgstr "Stopped"
 
 #. Translators: Job's state (job has been canceled)
-#: ../panels/printers/pp-jobs-dialog.c:120
+#: panels/printers/pp-jobs-dialog.c:120
 msgctxt "print job"
 msgid "Canceled"
 msgstr "Cancelled"
 
 #. Translators: Job's state (job has aborted due to error)
-#: ../panels/printers/pp-jobs-dialog.c:124
+#: panels/printers/pp-jobs-dialog.c:124
 msgctxt "print job"
 msgid "Aborted"
 msgstr "Aborted"
 
 #. Translators: Job's state (job has completed successfully)
-#: ../panels/printers/pp-jobs-dialog.c:128
+#: panels/printers/pp-jobs-dialog.c:128
 msgctxt "print job"
 msgid "Completed"
 msgstr "Completed"
 
 #. Translators: This is the printer name for which we are showing the active jobs
-#: ../panels/printers/pp-jobs-dialog.c:310
+#: panels/printers/pp-jobs-dialog.c:310
 #, c-format
-#| msgctxt "Printer jobs dialog title"
-#| msgid "%s - Active Jobs"
 msgctxt "Printer jobs dialog title"
 msgid "%s — Active Jobs"
 msgstr "%s — Active Jobs"
 
-#: ../panels/printers/pp-new-printer-dialog.c:402
-#| msgid "Select Printer Driver"
+#: panels/printers/pp-new-printer-dialog.c:402
 msgid "Unlock Print Server"
 msgstr "Unlock Print Server"
 
 #. Translators: Samba server needs authentication of the user to show list of its printers.
-#: ../panels/printers/pp-new-printer-dialog.c:406
+#: panels/printers/pp-new-printer-dialog.c:406
 #, c-format
-#| msgid "Unlock"
 msgid "Unlock %s."
 msgstr "Unlock %s."
 
 #. Translators: Samba server needs authentication of the user to show list of its printers.
-#: ../panels/printers/pp-new-printer-dialog.c:411
+#: panels/printers/pp-new-printer-dialog.c:411
 #, c-format
-#| msgid "Enter your username and password to view printers available on %s."
 msgid "Enter username and password to view printers on %s."
 msgstr "Enter username and password to view printers on %s."
 
-#: ../panels/printers/pp-new-printer-dialog.c:876
-#| msgid "Not searching for networks"
+#: panels/printers/pp-new-printer-dialog.c:876
 msgid "Searching for Printers"
 msgstr "Searching for Printers"
 
 #. Translators: The found device is a printer connected via USB
-#: ../panels/printers/pp-new-printer-dialog.c:1799
+#: panels/printers/pp-new-printer-dialog.c:1799
 msgid "USB"
 msgstr "USB"
 
 #. Translators: The found device is a printer connected via serial port
-#: ../panels/printers/pp-new-printer-dialog.c:1804
+#: panels/printers/pp-new-printer-dialog.c:1804
 msgid "Serial Port"
 msgstr "Serial Port"
 
 #. Translators: The found device is a printer connected via parallel port
-#: ../panels/printers/pp-new-printer-dialog.c:1811
+#: panels/printers/pp-new-printer-dialog.c:1811
 msgid "Parallel Port"
 msgstr "Parallel Port"
 
 #. Translators: Location of found network printer (e.g. Kitchen, Reception)
-#: ../panels/printers/pp-new-printer-dialog.c:1853
+#: panels/printers/pp-new-printer-dialog.c:1853
 #, c-format
 msgid "Location: %s"
 msgstr "Location: %s"
 
 #. Translators: Network address of found printer
-#: ../panels/printers/pp-new-printer-dialog.c:1858
+#: panels/printers/pp-new-printer-dialog.c:1858
 #, c-format
 msgid "Address: %s"
 msgstr "Address: %s"
 
 #. Translators: This item is a server which needs authentication to show its printers
-#: ../panels/printers/pp-new-printer-dialog.c:1887
+#: panels/printers/pp-new-printer-dialog.c:1887
 msgid "Server requires authentication"
 msgstr "Server requires authentication"
 
-#: ../panels/printers/pp-options-dialog.c:83
+#: panels/printers/pp-options-dialog.c:83
 msgid "Two Sided"
 msgstr "Two Sided"
 
-#: ../panels/printers/pp-options-dialog.c:84
+#: panels/printers/pp-options-dialog.c:84
 msgid "Paper Type"
 msgstr "Paper Type"
 
-#: ../panels/printers/pp-options-dialog.c:85
+#: panels/printers/pp-options-dialog.c:85
 msgid "Paper Source"
 msgstr "Paper Source"
 
-#: ../panels/printers/pp-options-dialog.c:86
+#: panels/printers/pp-options-dialog.c:86
 msgid "Output Tray"
 msgstr "Output Tray"
 
-#: ../panels/printers/pp-options-dialog.c:88
+#: panels/printers/pp-options-dialog.c:88
 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:534
+#: panels/printers/pp-options-dialog.c:534
 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:546
+#: panels/printers/pp-options-dialog.c:546
 msgid "Two-sided"
 msgstr "Two-sided"
 
 #. Translators: "General" tab contains general printer options
-#: ../panels/printers/pp-options-dialog.c:655
+#: panels/printers/pp-options-dialog.c:655
 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:658
+#: panels/printers/pp-options-dialog.c:658
 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:661
+#: panels/printers/pp-options-dialog.c:661
 msgctxt "Printer Option Group"
 msgid "Installable Options"
 msgstr "Installable Options"
 
 #. Translators: "Job" tab contains settings for jobs
-#: ../panels/printers/pp-options-dialog.c:664
+#: panels/printers/pp-options-dialog.c:664
 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:667
+#: panels/printers/pp-options-dialog.c:667
 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:670
+#: panels/printers/pp-options-dialog.c:670
 msgctxt "Printer Option Group"
 msgid "Color"
 msgstr "Colour"
 
 #. Translators: "Finishing" tab contains finishing settings (e.g. booklet printing)
-#: ../panels/printers/pp-options-dialog.c:673
+#: panels/printers/pp-options-dialog.c:673
 msgctxt "Printer Option Group"
 msgid "Finishing"
 msgstr "Finishing"
 
 #. Translators: "Advanced" tab contains all others settings
-#: ../panels/printers/pp-options-dialog.c:676
+#: panels/printers/pp-options-dialog.c:676
 msgctxt "Printer Option Group"
 msgid "Advanced"
 msgstr "Advanced"
 
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/pp-options-dialog.c:908
+#: panels/printers/pp-options-dialog.c:908
 msgid "Test page"
 msgstr "Test page"
 
 #. Translators: this is an option of "Paper Source"
-#: ../panels/printers/pp-ppd-option-widget.c:76
-#: ../panels/printers/pp-ppd-option-widget.c:78
-#: ../panels/printers/pp-ppd-option-widget.c:86
+#: 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: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
+#: 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:90
+#: 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:92
+#: 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:94
+#: 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:96
+#: panels/printers/pp-ppd-option-widget.c:96
 msgid "No pre-filtering"
 msgstr "No pre-filtering"
 
 #. Translators: Name of column showing printer manufacturers
-#: ../panels/printers/pp-ppd-selection-dialog.c:233
+#: panels/printers/pp-ppd-selection-dialog.c:233
 msgid "Manufacturer"
 msgstr "Manufacturer"
 
 #. Translators: This is the label of the button that opens the Jobs Dialog.
-#: ../panels/printers/pp-printer-entry.c:577
-#| msgid "Active Jobs"
+#: panels/printers/pp-printer-entry.c:598 panels/printers/printer-entry.ui:166
 msgid "No Active Jobs"
 msgstr "No Active Jobs"
 
 #. Translators: This is the label of the button that opens the Jobs Dialog.
-#: ../panels/printers/pp-printer-entry.c:582
+#: panels/printers/pp-printer-entry.c:603
 #, c-format
 msgid "%u Job"
 msgid_plural "%u Jobs"
@@ -4695,178 +4643,170 @@ msgstr[0] "%u Job"
 msgstr[1] "%u Jobs"
 
 #. Translators: The printer is low on toner
-#: ../panels/printers/pp-printer-entry.c:730
+#: panels/printers/pp-printer-entry.c:752
 msgid "Low on toner"
 msgstr "Low on toner"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/pp-printer-entry.c:732
+#: panels/printers/pp-printer-entry.c:754
 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/pp-printer-entry.c:735
+#: panels/printers/pp-printer-entry.c:757
 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/pp-printer-entry.c:738
+#: panels/printers/pp-printer-entry.c:760
 msgid "Out of developer"
 msgstr "Out of developer"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/pp-printer-entry.c:740
+#: panels/printers/pp-printer-entry.c:762
 msgid "Low on a marker supply"
 msgstr "Low on a marker supply"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/pp-printer-entry.c:742
+#: panels/printers/pp-printer-entry.c:764
 msgid "Out of a marker supply"
 msgstr "Out of a marker supply"
 
 #. Translators: One or more covers on the printer are open
-#: ../panels/printers/pp-printer-entry.c:744
+#: panels/printers/pp-printer-entry.c:766
 msgid "Open cover"
 msgstr "Open cover"
 
 #. Translators: One or more doors on the printer are open
-#: ../panels/printers/pp-printer-entry.c:746
+#: panels/printers/pp-printer-entry.c:768
 msgid "Open door"
 msgstr "Open door"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/pp-printer-entry.c:748
+#: panels/printers/pp-printer-entry.c:770
 msgid "Low on paper"
 msgstr "Low on paper"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/pp-printer-entry.c:750
+#: panels/printers/pp-printer-entry.c:772
 msgid "Out of paper"
 msgstr "Out of paper"
 
 #. Translators: The printer is offline
-#: ../panels/printers/pp-printer-entry.c:752
+#: panels/printers/pp-printer-entry.c:774
 msgctxt "printer state"
 msgid "Offline"
 msgstr "Offline"
 
 #. Translators: Someone has stopped the Printer
 #. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/pp-printer-entry.c:754
-#: ../panels/printers/pp-printer-entry.c:884
+#: panels/printers/pp-printer-entry.c:776
+#: panels/printers/pp-printer-entry.c:906
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "Stopped"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/pp-printer-entry.c:756
+#: panels/printers/pp-printer-entry.c:778
 msgid "Waste receptacle almost full"
 msgstr "Waste receptacle almost full"
 
 #. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/pp-printer-entry.c:758
+#: panels/printers/pp-printer-entry.c:780
 msgid "Waste receptacle full"
 msgstr "Waste receptacle full"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/pp-printer-entry.c:760
+#: panels/printers/pp-printer-entry.c:782
 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/pp-printer-entry.c:762
+#: panels/printers/pp-printer-entry.c:784
 msgid "The optical photo conductor is no longer functioning"
 msgstr "The optical photo conductor is no longer functioning"
 
 #. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/pp-printer-entry.c:870
+#: panels/printers/pp-printer-entry.c:892
 msgctxt "printer state"
 msgid "Ready"
 msgstr "Ready"
 
 #. Translators: Printer's state (printer is ready but doesn't accept new jobs)
-#: ../panels/printers/pp-printer-entry.c:875
+#: panels/printers/pp-printer-entry.c:897
 msgctxt "printer state"
 msgid "Does not accept jobs"
 msgstr "Does not accept jobs"
 
 #. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/pp-printer-entry.c:880
+#: panels/printers/pp-printer-entry.c:902
 msgctxt "printer state"
 msgid "Processing"
 msgstr "Processing"
 
 #. Translators: Name of job which makes printer to clean its heads
-#: ../panels/printers/pp-printer-entry.c:904
+#: panels/printers/pp-printer-entry.c:926
 msgid "Clean print heads"
 msgstr "Clean print heads"
 
-#: ../panels/printers/printer-entry.ui.h:1
-#| msgid "Login Options"
+#: panels/printers/printer-entry.ui:14
 msgid "Printing Options"
 msgstr "Printing Options"
 
-#: ../panels/printers/printer-entry.ui.h:2
-#| msgid "Printer Default"
+#: panels/printers/printer-entry.ui:26
 msgid "Printer Details"
 msgstr "Printer Details"
 
-#: ../panels/printers/printer-entry.ui.h:3
-#| msgid "Printer Default"
+#. Set this printer as default
+#: panels/printers/printer-entry.ui:38
 msgid "Use Printer by Default"
 msgstr "Use Printer by Default"
 
 #. Translators: This button executes command which cleans print heads of the printer.
-#: ../panels/printers/printer-entry.ui.h:5
-#| msgid "Clean print heads"
+#: panels/printers/printer-entry.ui:50
 msgid "Clean Print Heads"
 msgstr "Clean Print Heads"
 
-#: ../panels/printers/printer-entry.ui.h:6
+#: panels/printers/printer-entry.ui:61
 msgid "Remove Printer"
 msgstr "Remove Printer"
 
-#: ../panels/printers/printer-entry.ui.h:7
+#: panels/printers/printer-entry.ui:193
 msgid "Model"
 msgstr "Model"
 
-#: ../panels/printers/printer-entry.ui.h:9
+#: panels/printers/printer-entry.ui:251
 msgid "Ink Level"
 msgstr "Ink Level"
 
 #. Translators: This is the message which follows the printer error.
-#: ../panels/printers/printer-entry.ui.h:11
+#: panels/printers/printer-entry.ui:312
 msgid "Please restart when the problem is resolved."
 msgstr "Please restart when the problem is resolved."
 
 #. Translators: This is the button which restarts the printer.
-#: ../panels/printers/printer-entry.ui.h:13
-#| msgid "Restart Now"
+#: panels/printers/printer-entry.ui:319
 msgid "Restart"
 msgstr "Restart"
 
 #. Translators: This button adds new printer.
-#: ../panels/printers/printers.ui.h:2
+#: panels/printers/printers.ui:20
 msgid "Add…"
 msgstr "Add…"
 
-#: ../panels/printers/printers.ui.h:5
+#: panels/printers/printers.ui:186
 msgid "No printers"
 msgstr "No printers"
 
 #. Translators: This button adds new printer.
-#: ../panels/printers/printers.ui.h:7
-#| msgid "Add a Printer"
+#: panels/printers/printers.ui:200
 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:9
-#| msgid ""
-#| "Sorry! The system printing service\n"
-#| "doesn't seem to be available."
+#: panels/printers/printers.ui:232
 msgid ""
 "Sorry! The system printing service\n"
 "doesn’t seem to be available."
@@ -4874,70 +4814,70 @@ msgstr ""
 "Sorry! The system printing service\n"
 "doesn’t seem to be available."
 
-#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24
+#: panels/privacy/cc-privacy-panel.c:387 panels/privacy/privacy.ui:280
 msgid "Screen Lock"
 msgstr "Screen Lock"
 
-#: ../panels/privacy/cc-privacy-panel.c:438
+#: panels/privacy/cc-privacy-panel.c:438
 msgid "In use"
 msgstr "In use"
 
-#: ../panels/privacy/cc-privacy-panel.c:443
+#: panels/privacy/cc-privacy-panel.c:443
 msgctxt "Location services status"
 msgid "On"
 msgstr "On"
 
-#: ../panels/privacy/cc-privacy-panel.c:444
+#: panels/privacy/cc-privacy-panel.c:444
 msgctxt "Location services status"
 msgid "Off"
 msgstr "Off"
 
-#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42
+#: panels/privacy/cc-privacy-panel.c:823 panels/privacy/privacy.ui:745
 msgid "Location Services"
 msgstr "Location Services"
 
-#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19
+#: panels/privacy/cc-privacy-panel.c:946 panels/privacy/privacy.ui:127
 msgid "Usage & History"
 msgstr "Usage & History"
 
-#: ../panels/privacy/cc-privacy-panel.c:1071
+#: panels/privacy/cc-privacy-panel.c:1075
 msgid "Empty all items from Trash?"
 msgstr "Empty all items from Wastebasket?"
 
-#: ../panels/privacy/cc-privacy-panel.c:1072
+#: panels/privacy/cc-privacy-panel.c:1076
 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:1073
+#: panels/privacy/cc-privacy-panel.c:1077
 msgid "_Empty Trash"
 msgstr "_Empty Wastebasket"
 
-#: ../panels/privacy/cc-privacy-panel.c:1096
+#: panels/privacy/cc-privacy-panel.c:1100
 msgid "Delete all the temporary files?"
 msgstr "Delete all the temporary files?"
 
-#: ../panels/privacy/cc-privacy-panel.c:1097
+#: panels/privacy/cc-privacy-panel.c:1101
 msgid "All the temporary files will be permanently deleted."
 msgstr "All the temporary files will be permanently deleted."
 
-#: ../panels/privacy/cc-privacy-panel.c:1098
+#: panels/privacy/cc-privacy-panel.c:1102
 msgid "_Purge Temporary Files"
 msgstr "_Purge Temporary Files"
 
-#: ../panels/privacy/cc-privacy-panel.c:1120 ../panels/privacy/privacy.ui.h:29
+#: panels/privacy/cc-privacy-panel.c:1124 panels/privacy/privacy.ui:432
 msgid "Purge Trash & Temporary Files"
 msgstr "Purge Wastebasket & Temporary Files"
 
-#: ../panels/privacy/cc-privacy-panel.c:1160 ../panels/privacy/privacy.ui.h:36
+#: panels/privacy/cc-privacy-panel.c:1164 panels/privacy/privacy.ui:637
 msgid "Software Usage"
 msgstr "Software Usage"
 
-#: ../panels/privacy/cc-privacy-panel.c:1201 ../panels/privacy/privacy.ui.h:46
+#: panels/privacy/cc-privacy-panel.c:1205 panels/privacy/privacy.ui:959
 msgid "Problem Reporting"
 msgstr "Problem Reporting"
 
 #. translators: '%s' is the distributor's name, such as 'Fedora'
-#: ../panels/privacy/cc-privacy-panel.c:1215
+#: panels/privacy/cc-privacy-panel.c:1219
 #, c-format
 msgid ""
 "Sending reports of technical problems helps us improve %s. Reports are sent "
@@ -4946,21 +4886,26 @@ 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:1227 ../panels/privacy/privacy.ui.h:41
+#: panels/privacy/cc-privacy-panel.c:1231 panels/privacy/privacy.ui:719
 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:3
+#| msgid "Privacy Policy"
+msgid "Privacy"
+msgstr "Privacy"
 
-#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3
+#: panels/privacy/gnome-privacy-panel.desktop.in.in:4
 msgid "Protect your personal information and control what others might see"
 msgstr "Protect your personal information and control what others might see"
 
+#. FIXME
+#: panels/privacy/gnome-privacy-panel.desktop.in.in:7
+msgid "preferences-system-privacy"
+msgstr "preferences-system-privacy"
+
 #. Translators: those are keywords for the privacy control-center panel
-#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5
+#: panels/privacy/gnome-privacy-panel.desktop.in.in:19
 msgid ""
 "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
 "network;identity;"
@@ -4968,55 +4913,55 @@ msgstr ""
 "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
 "network;identity;"
 
-#: ../panels/privacy/privacy.ui.h:1
+#: panels/privacy/privacy.ui:14
 msgid "Screen Turns Off"
 msgstr "Screen Turns Off"
 
-#: ../panels/privacy/privacy.ui.h:2
+#: panels/privacy/privacy.ui:18
 msgid "30 seconds"
 msgstr "30 seconds"
 
-#: ../panels/privacy/privacy.ui.h:9
+#: panels/privacy/privacy.ui:60 panels/privacy/privacy.ui:106
 msgid "1 day"
 msgstr "1 day"
 
-#: ../panels/privacy/privacy.ui.h:10
+#: panels/privacy/privacy.ui:64
 msgid "2 days"
 msgstr "2 days"
 
-#: ../panels/privacy/privacy.ui.h:11
+#: panels/privacy/privacy.ui:68
 msgid "3 days"
 msgstr "3 days"
 
-#: ../panels/privacy/privacy.ui.h:12
+#: panels/privacy/privacy.ui:72
 msgid "4 days"
 msgstr "4 days"
 
-#: ../panels/privacy/privacy.ui.h:13
+#: panels/privacy/privacy.ui:76
 msgid "5 days"
 msgstr "5 days"
 
-#: ../panels/privacy/privacy.ui.h:14
+#: panels/privacy/privacy.ui:80
 msgid "6 days"
 msgstr "6 days"
 
-#: ../panels/privacy/privacy.ui.h:15
+#: panels/privacy/privacy.ui:84 panels/privacy/privacy.ui:110
 msgid "7 days"
 msgstr "7 days"
 
-#: ../panels/privacy/privacy.ui.h:16
+#: panels/privacy/privacy.ui:88
 msgid "14 days"
 msgstr "14 days"
 
-#: ../panels/privacy/privacy.ui.h:17
+#: panels/privacy/privacy.ui:92 panels/privacy/privacy.ui:114
 msgid "30 days"
 msgstr "30 days"
 
-#: ../panels/privacy/privacy.ui.h:18
+#: panels/privacy/privacy.ui:118
 msgid "Forever"
 msgstr "Forever"
 
-#: ../panels/privacy/privacy.ui.h:20
+#: panels/privacy/privacy.ui:148
 msgid ""
 "Remembering your history makes things easier to find again. These items are "
 "never shared over the network."
@@ -5024,35 +4969,35 @@ msgstr ""
 "Remembering your history makes things easier to find again. These items are "
 "never shared over the network."
 
-#: ../panels/privacy/privacy.ui.h:21
+#: panels/privacy/privacy.ui:176
 msgid "_Recently Used"
 msgstr "_Recently Used"
 
-#: ../panels/privacy/privacy.ui.h:22
+#: panels/privacy/privacy.ui:207
 msgid "Retain _History"
 msgstr "Retain _History"
 
-#: ../panels/privacy/privacy.ui.h:23
+#: panels/privacy/privacy.ui:247
 msgid "Cl_ear Recent History"
 msgstr "Cl_ear Recent History"
 
-#: ../panels/privacy/privacy.ui.h:25
+#: panels/privacy/privacy.ui:301
 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:26
+#: panels/privacy/privacy.ui:328
 msgid "Automatic Screen _Lock"
 msgstr "Automatic Screen _Lock"
 
-#: ../panels/privacy/privacy.ui.h:27
+#: panels/privacy/privacy.ui:362
 msgid "Lock screen _after blank for"
 msgstr "Lock screen _after blank for"
 
-#: ../panels/privacy/privacy.ui.h:28
+#: panels/privacy/privacy.ui:394
 msgid "Show _Notifications"
 msgstr "Show _Notifications"
 
-#: ../panels/privacy/privacy.ui.h:30
+#: panels/privacy/privacy.ui:454
 msgid ""
 "Automatically purge the Trash and temporary files to help keep your computer "
 "free of unnecessary sensitive information."
@@ -5060,29 +5005,27 @@ msgstr ""
 "Automatically purge the Wastebasket and temporary files to help keep your "
 "computer free of unnecessary sensitive information."
 
-#: ../panels/privacy/privacy.ui.h:31
+#: panels/privacy/privacy.ui:483
 msgid "Automatically empty _Trash"
 msgstr "Automatically empty _Wastebasket"
 
-#: ../panels/privacy/privacy.ui.h:32
+#: panels/privacy/privacy.ui:515
 msgid "Automatically purge Temporary _Files"
 msgstr "Automatically purge Temporary _Files"
 
-#: ../panels/privacy/privacy.ui.h:33
+#: panels/privacy/privacy.ui:546
 msgid "Purge _After"
 msgstr "Purge _After"
 
-#: ../panels/privacy/privacy.ui.h:34
-#| msgid "_Empty Trash"
+#: panels/privacy/privacy.ui:590
 msgid "_Empty Trash…"
 msgstr "_Empty Wastebasket…"
 
-#: ../panels/privacy/privacy.ui.h:35
-#| msgid "_Purge Temporary Files"
+#: panels/privacy/privacy.ui:606
 msgid "_Purge Temporary Files…"
 msgstr "_Purge Temporary Files…"
 
-#: ../panels/privacy/privacy.ui.h:37
+#: panels/privacy/privacy.ui:654
 msgid ""
 "Sending us information about which software you use helps us provide you "
 "with more accurate recommendations. It also helps us to improve our "
@@ -5098,11 +5041,11 @@ msgstr ""
 "All the information we collect is made anonymous, and we will never share "
 "your data with third parties."
 
-#: ../panels/privacy/privacy.ui.h:40
+#: panels/privacy/privacy.ui:681
 msgid "_Send software usage statistics"
 msgstr "_Send software usage statistics"
 
-#: ../panels/privacy/privacy.ui.h:43
+#: panels/privacy/privacy.ui:764
 msgid ""
 "Location services allow applications to know your location. Using Wi-Fi and "
 "mobile broadband increases accuracy."
@@ -5110,302 +5053,311 @@ msgstr ""
 "Location services allow applications to know your location. Using Wi-Fi and "
 "mobile broadband increases accuracy."
 
-#: ../panels/privacy/privacy.ui.h:44
+#: panels/privacy/privacy.ui:778
+msgid ""
+"Uses Mozilla Location Service: <a href='https://location.services.mozilla.";
+"com/privacy'>Privacy Policy</a>"
+msgstr ""
+"Uses Mozilla Location Service: <a href='https://location.services.mozilla.";
+"com/privacy'>Privacy Policy</a>"
+
+#: panels/privacy/privacy.ui:828
 msgid "_Location Services"
 msgstr "_Location Services"
 
-#: ../panels/privacy/privacy.ui.h:47
+#: panels/privacy/privacy.ui:1026
 msgid "_Automatic Problem Reporting"
 msgstr "_Automatic Problem Reporting"
 
-#: ../panels/region/cc-format-chooser.c:118
+#: panels/region/cc-format-chooser.c:118
 msgctxt "measurement format"
 msgid "Imperial"
 msgstr "Imperial"
 
-#: ../panels/region/cc-format-chooser.c:120
+#: panels/region/cc-format-chooser.c:120
 msgctxt "measurement format"
 msgid "Metric"
 msgstr "Metric"
 
-#: ../panels/region/cc-format-chooser.c:285
+#: panels/region/cc-format-chooser.c:285
 msgid "No regions found"
 msgstr "No regions found"
 
-#: ../panels/region/cc-input-chooser.c:182
+#: panels/region/cc-input-chooser.c:182
 msgid "No input sources found"
 msgstr "No input sources found"
 
-#: ../panels/region/cc-input-chooser.c:1012
+#: panels/region/cc-input-chooser.c:1012
 msgctxt "Input Source"
 msgid "Other"
 msgstr "Other"
 
-#: ../panels/region/cc-region-panel.c:881
+#: panels/region/cc-region-panel.c:881
 msgid "No input source selected"
 msgstr "No input source selected"
 
-#: ../panels/region/cc-region-panel.c:1773
+#: panels/region/cc-region-panel.c:1773
 msgid "Login _Screen"
 msgstr "Login _Screen"
 
-#: ../panels/region/format-chooser.ui.h:1
+#: panels/region/format-chooser.ui:7
 msgid "Formats"
 msgstr "Formats"
 
-#: ../panels/region/format-chooser.ui.h:4
+#: panels/region/format-chooser.ui:120
 msgid "Preview"
 msgstr "Preview"
 
-#: ../panels/region/format-chooser.ui.h:5
+#: panels/region/format-chooser.ui:137
 msgid "Dates"
 msgstr "Dates"
 
-#: ../panels/region/format-chooser.ui.h:6
+#: panels/region/format-chooser.ui:168
 msgid "Times"
 msgstr "Times"
 
-#: ../panels/region/format-chooser.ui.h:7
-#| msgid "Date & Time"
+#: panels/region/format-chooser.ui:199
 msgid "Dates & Times"
 msgstr "Dates & Times"
 
-#: ../panels/region/format-chooser.ui.h:8
+#: panels/region/format-chooser.ui:230
 msgid "Numbers"
 msgstr "Numbers"
 
-#: ../panels/region/format-chooser.ui.h:9
+#: panels/region/format-chooser.ui:247
 msgid "Measurement"
 msgstr "Measurement"
 
-#: ../panels/region/format-chooser.ui.h:10
+#: panels/region/format-chooser.ui:264
 msgid "Paper"
 msgstr "Paper"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:2
-msgid "Re­gion & Lan­guage"
-msgstr "Re­gion & Lan­guage"
+#: panels/region/gnome-region-panel.desktop.in.in:3
+#| msgid "Re­gion & Lan­guage"
+msgid "Region & Language"
+msgstr "Region & Language"
 
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:3
+#: panels/region/gnome-region-panel.desktop.in.in:4
 msgid ""
 "Select your display language, formats, keyboard layouts and input sources"
 msgstr ""
 "Select your display language, formats, keyboard layouts and input sources"
 
+#: panels/region/gnome-region-panel.desktop.in.in:6
+msgid "preferences-desktop-locale"
+msgstr "preferences-desktop-locale"
+
 #. Translators: those are keywords for the region control-center panel
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:5
+#: panels/region/gnome-region-panel.desktop.in.in:18
 msgid "Language;Layout;Keyboard;Input;"
 msgstr "Language;Layout;Keyboard;Input;"
 
-#: ../panels/region/input-chooser.ui.h:1
+#: panels/region/input-chooser.ui:5
 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"
+#: panels/region/input-chooser.ui:76
 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
+#: panels/region/input-options.ui:7
 msgid "Input Source Options"
 msgstr "Input Source Options"
 
-#: ../panels/region/input-options.ui.h:2
+#: panels/region/input-options.ui:27
 msgid "Use the _same source for all windows"
 msgstr "Use the _same source for all windows"
 
-#: ../panels/region/input-options.ui.h:3
+#: panels/region/input-options.ui:45
 msgid "Allow _different sources for each window"
 msgstr "Allow _different sources for each window"
 
-#: ../panels/region/input-options.ui.h:5
+#: panels/region/input-options.ui:85
 msgid "Switch to previous source"
 msgstr "Switch to previous source"
 
-#: ../panels/region/input-options.ui.h:6
+#: panels/region/input-options.ui:102
 msgid "Super+Shift+Space"
 msgstr "Super+Shift+Space"
 
-#: ../panels/region/input-options.ui.h:7
+#: panels/region/input-options.ui:116
 msgid "Switch to next source"
 msgstr "Switch to next source"
 
-#: ../panels/region/input-options.ui.h:8
+#: panels/region/input-options.ui:133
 msgid "Super+Space"
 msgstr "Super+Space"
 
-#: ../panels/region/input-options.ui.h:9
+#: panels/region/input-options.ui:147
 msgid "You can change these shortcuts in the keyboard settings"
 msgstr "You can change these shortcuts in the keyboard settings"
 
-#: ../panels/region/input-options.ui.h:10
+#: panels/region/input-options.ui:164
 msgid "Alternative switch to next source"
 msgstr "Alternative switch to next source"
 
-#: ../panels/region/input-options.ui.h:11
+#: panels/region/input-options.ui:181
 msgid "Left+Right Alt"
 msgstr "Left+Right Alt"
 
-#: ../panels/region/region.ui.h:1
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
+#: panels/region/region.ui:67
+#: panels/user-accounts/data/user-accounts-dialog.ui:348
 msgid "_Language"
 msgstr "_Language"
 
-#: ../panels/region/region.ui.h:2
+#: panels/region/region.ui:85
 msgid "English (United Kingdom)"
 msgstr "English (United Kingdom)"
 
-#: ../panels/region/region.ui.h:3
-#| msgid "Your session needs to be restarted for changes to take effect"
+#: panels/region/region.ui:112
 msgid "Restart the session for changes to take effect"
 msgstr "Restart the session for changes to take effect"
 
-#: ../panels/region/region.ui.h:4
-#| msgid "Restart Now"
+#: panels/region/region.ui:134
 msgid "Restart…"
 msgstr "Restart…"
 
-#: ../panels/region/region.ui.h:5
+#: panels/region/region.ui:169
 msgid "_Formats"
 msgstr "_Formats"
 
-#: ../panels/region/region.ui.h:6
+#: panels/region/region.ui:187
 msgid "United Kingdom"
 msgstr "United Kingdom"
 
-#: ../panels/region/region.ui.h:7
+#: panels/region/region.ui:229
 msgid "Input Sources"
 msgstr "Input Sources"
 
-#: ../panels/region/region.ui.h:8
+#: panels/region/region.ui:245
 msgid "_Options"
 msgstr "_Options"
 
-#: ../panels/region/region.ui.h:9
+#: panels/region/region.ui:311
 msgid "Add input source"
 msgstr "Add input source"
 
-#: ../panels/region/region.ui.h:10
+#: panels/region/region.ui:336
 msgid "Remove input source"
 msgstr "Remove input source"
 
-#: ../panels/region/region.ui.h:11
+#: panels/region/region.ui:386
 msgid "Move input source up"
 msgstr "Move input source up"
 
-#: ../panels/region/region.ui.h:12
+#: panels/region/region.ui:411
 msgid "Move input source down"
 msgstr "Move input source down"
 
-#: ../panels/region/region.ui.h:13
+#: panels/region/region.ui:461
 msgid "Configure input source"
 msgstr "Configure input source"
 
-#: ../panels/region/region.ui.h:14
+#: panels/region/region.ui:486
 msgid "Show input source keyboard layout"
 msgstr "Show input source keyboard layout"
 
-#: ../panels/region/region.ui.h:15
+#: panels/region/region.ui:530
 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:639
+#: panels/search/cc-search-locations-dialog.c:639
 msgid "Select Location"
 msgstr "Select Location"
 
-#: ../panels/search/cc-search-locations-dialog.c:643
+#: panels/search/cc-search-locations-dialog.c:643
 msgid "_OK"
 msgstr "_OK"
 
-#: ../panels/search/cc-search-panel.c:178
+#: panels/search/cc-search-panel.c:178
 msgid "No applications found"
 msgstr "No applications found"
 
-#. 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:3
+#: panels/search/gnome-search-panel.desktop.in.in:4
 msgid ""
 "Control which applications show search results in the Activities Overview"
 msgstr ""
 "Control which applications show search results in the Activities Overview"
 
+#: panels/search/gnome-search-panel.desktop.in.in:6
+msgid "preferences-system-search"
+msgstr "preferences-system-search"
+
 #. Translators: those are keywords for the search control-center panel
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:5
+#: panels/search/gnome-search-panel.desktop.in.in:18
 msgid "Search;Find;Index;Hide;Privacy;Results;"
 msgstr "Search;Find;Index;Hide;Privacy;Results;"
 
-#: ../panels/search/search-locations-dialog.ui.h:1
+#: panels/search/search-locations-dialog.ui:9
 msgid "Search Locations"
 msgstr "Search Locations"
 
-#: ../panels/search/search-locations-dialog.ui.h:2
+#: panels/search/search-locations-dialog.ui:43
 msgid "Places"
 msgstr "Places"
 
-#: ../panels/search/search-locations-dialog.ui.h:3
+#: panels/search/search-locations-dialog.ui:73
 msgid "Bookmarks"
 msgstr "Bookmarks"
 
-#: ../panels/search/search-locations-dialog.ui.h:4
+#: panels/search/search-locations-dialog.ui:130
 msgid "Other"
 msgstr "Other"
 
-#: ../panels/search/search.ui.h:1
+#: panels/search/search.ui:66
 msgid "Move Up"
 msgstr "Move Up"
 
-#: ../panels/search/search.ui.h:2
+#: panels/search/search.ui:83
 msgid "Move Down"
 msgstr "Move Down"
 
-#: ../panels/search/search.ui.h:3
+#: panels/search/search.ui:119
 msgid "Preferences"
 msgstr "Preferences"
 
 #. Label
-#: ../panels/sharing/cc-sharing-networks.c:303
+#: panels/sharing/cc-sharing-networks.c:305
 msgid "No networks selected for sharing"
 msgstr "No networks selected for sharing"
 
-#: ../panels/sharing/cc-sharing-panel.c:266
+#: panels/sharing/cc-sharing-panel.c:275
 msgctxt "service is enabled"
 msgid "On"
 msgstr "On"
 
-#: ../panels/sharing/cc-sharing-panel.c:268
-#: ../panels/sharing/cc-sharing-panel.c:295
+#: panels/sharing/cc-sharing-panel.c:277 panels/sharing/cc-sharing-panel.c:304
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "Off"
 
-#: ../panels/sharing/cc-sharing-panel.c:298
+#: panels/sharing/cc-sharing-panel.c:307
 msgctxt "service is enabled"
 msgid "Enabled"
 msgstr "Enabled"
 
-#: ../panels/sharing/cc-sharing-panel.c:301
+#: panels/sharing/cc-sharing-panel.c:310
 msgctxt "service is active"
 msgid "Active"
 msgstr "Active"
 
-#: ../panels/sharing/cc-sharing-panel.c:372
+#: panels/sharing/cc-sharing-panel.c:381
 msgid "Choose a Folder"
 msgstr "Choose a Folder"
 
-#: ../panels/sharing/cc-sharing-panel.c:683
+#: panels/sharing/cc-sharing-panel.c:693
 #, 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>"
 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>"
+"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>"
+"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:685
+#: panels/sharing/cc-sharing-panel.c:695
 #, c-format
 msgid ""
 "When remote login is enabled, remote users can connect using the Secure "
@@ -5416,7 +5368,7 @@ msgstr ""
 "Shell command:\n"
 "<a href=\"ssh %s\">ssh %s</a>"
 
-#: ../panels/sharing/cc-sharing-panel.c:687
+#: panels/sharing/cc-sharing-panel.c:697
 #, c-format
 msgid ""
 "Screen sharing allows remote users to view or control your screen by "
@@ -5425,25 +5377,25 @@ 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:799
+#: panels/sharing/cc-sharing-panel.c:809
 msgid "Copy"
 msgstr "Copy"
 
-#: ../panels/sharing/cc-sharing-panel.c:1125
+#: panels/sharing/cc-sharing-panel.c:1236
+#: panels/sharing/gnome-sharing-panel.desktop.in.in:3
 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 "Sha­ring"
-msgstr "Sha­ring"
-
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3
+#: panels/sharing/gnome-sharing-panel.desktop.in.in:4
 msgid "Control what you want to share with others"
 msgstr "Control what you want to share with others"
 
+#: panels/sharing/gnome-sharing-panel.desktop.in.in:6
+msgid "preferences-system-sharing"
+msgstr "preferences-system-sharing"
+
 #. Translators: those are keywords for the sharing control-center panel
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5
+#: panels/sharing/gnome-sharing-panel.desktop.in.in:15
 msgid ""
 "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
 "movies;server;renderer;"
@@ -5451,376 +5403,342 @@ msgstr ""
 "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
 "movies;server;renderer;"
 
-#: ../panels/sharing/networks.ui.h:1
+#: panels/sharing/networks.ui:19
 msgid "Networks"
 msgstr "Networks"
 
-#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1
+#: panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in:11
 msgid "Enable or disable remote login"
 msgstr "Enable or disable remote login"
 
-#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:2
+#: panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in:12
 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
+#: panels/sharing/sharing.ui:46
 msgid "_Computer Name"
 msgstr "_Computer Name"
 
-#: ../panels/sharing/sharing.ui.h:2
+#: panels/sharing/sharing.ui:104
 msgid "_File Sharing"
 msgstr "_File Sharing"
 
-#: ../panels/sharing/sharing.ui.h:3
+#: panels/sharing/sharing.ui:147
 msgid "_Screen Sharing"
 msgstr "_Screen Sharing"
 
-#: ../panels/sharing/sharing.ui.h:4
+#: panels/sharing/sharing.ui:190
 msgid "_Media Sharing"
 msgstr "_Media Sharing"
 
-#: ../panels/sharing/sharing.ui.h:5
+#: panels/sharing/sharing.ui:233
 msgid "_Remote Login"
 msgstr "_Remote Login"
 
-#: ../panels/sharing/sharing.ui.h:6
+#: panels/sharing/sharing.ui:272
 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
+#: panels/sharing/sharing.ui:286 panels/sharing/sharing.ui:413
 msgid "File Sharing"
 msgstr "File Sharing"
 
-#: ../panels/sharing/sharing.ui.h:8
+#: panels/sharing/sharing.ui:333
 msgid "_Require Password"
 msgstr "_Require Password"
 
-#: ../panels/sharing/sharing.ui.h:10
+#: panels/sharing/sharing.ui:424 panels/sharing/sharing.ui:496
 msgid "Remote Login"
 msgstr "Remote Login"
 
-#: ../panels/sharing/sharing.ui.h:11
+#: panels/sharing/sharing.ui:519 panels/sharing/sharing.ui:765
 msgid "Screen Sharing"
 msgstr "Screen Sharing"
 
-#: ../panels/sharing/sharing.ui.h:12
+#: panels/sharing/sharing.ui:577
 msgid "_Allow connections to control the screen"
 msgstr "_Allow connections to control the screen"
 
-#: ../panels/sharing/sharing.ui.h:13
+#: panels/sharing/sharing.ui:622
 msgid "_Password:"
 msgstr "_Password:"
 
-#: ../panels/sharing/sharing.ui.h:14
+#: panels/sharing/sharing.ui:652
 msgid "_Show Password"
 msgstr "_Show Password"
 
-#: ../panels/sharing/sharing.ui.h:15
+#: panels/sharing/sharing.ui:683
 msgid "Access Options"
 msgstr "Access Options"
 
-#: ../panels/sharing/sharing.ui.h:16
+#: panels/sharing/sharing.ui:697
 msgid "_New connections must ask for access"
 msgstr "_New connections must ask for access"
 
-#: ../panels/sharing/sharing.ui.h:17
+#: panels/sharing/sharing.ui:715
 msgid "_Require a password"
 msgstr "_Require a password"
 
-#: ../panels/sharing/sharing.ui.h:18
+#: panels/sharing/sharing.ui:776 panels/sharing/sharing.ui:870
 msgid "Media Sharing"
 msgstr "Media Sharing"
 
-#: ../panels/sharing/sharing.ui.h:19
+#: panels/sharing/sharing.ui:809
 msgid "Share music, photos and videos over the network."
 msgstr "Share music, photos and videos over the network."
 
-#: ../panels/sharing/sharing.ui.h:20
+#: panels/sharing/sharing.ui:824
 msgid "Folders"
 msgstr "Folders"
 
-#: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:1
+#: panels/sound/data/gnome-sound-panel.desktop.in.in:3
 msgid "Sound"
 msgstr "Sound"
 
-#: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:2
+#: panels/sound/data/gnome-sound-panel.desktop.in.in:4
 msgid "Change sound levels, inputs, outputs, and alert sounds"
 msgstr "Change sound levels, inputs, outputs, and alert sounds"
 
+#: panels/sound/data/gnome-sound-panel.desktop.in.in:6
+msgid "multimedia-volume-control"
+msgstr "multimedia-volume-control"
+
 #. Translators: those are keywords for the sound control-center panel
-#: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:4
+#: panels/sound/data/gnome-sound-panel.desktop.in.in:19
 msgid "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;"
 msgstr "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;"
 
 #. Translators: This is the name of an audio file that sounds like the bark of a dog.
 #. You might want to translate it into the equivalent words of your language.
-#: ../panels/sound/data/sounds/gnome-sounds-default.xml.in.in.h:3
+#: panels/sound/data/sounds/gnome-sounds-default.xml.in.in:6
 msgid "Bark"
 msgstr "Bark"
 
 #. Translators: This is the name of an audio file that sounds like a water drip.
 #. You might want to translate it into the equivalent words of your language.
-#: ../panels/sound/data/sounds/gnome-sounds-default.xml.in.in.h:6
+#: panels/sound/data/sounds/gnome-sounds-default.xml.in.in:12
 msgid "Drip"
 msgstr "Drip"
 
 #. Translators: This is the name of an audio file that sounds like tapping glass.
 #. You might want to translate it into the equivalent words of your language.
-#: ../panels/sound/data/sounds/gnome-sounds-default.xml.in.in.h:9
+#: panels/sound/data/sounds/gnome-sounds-default.xml.in.in:18
 msgid "Glass"
 msgstr "Glass"
 
 #. Translators: This is the name of an audio file that sounds sort of like a submarine sonar ping.
 #. You might want to translate it into the equivalent words of your language.
-#: ../panels/sound/data/sounds/gnome-sounds-default.xml.in.in.h:12
+#: panels/sound/data/sounds/gnome-sounds-default.xml.in.in:24
 msgid "Sonar"
 msgstr "Sonar"
 
-#: ../panels/sound/gvc-balance-bar.c:105
+#: panels/sound/gvc-balance-bar.c:104
 msgctxt "balance"
 msgid "Left"
 msgstr "Left"
 
-#: ../panels/sound/gvc-balance-bar.c:106
+#: panels/sound/gvc-balance-bar.c:105
 msgctxt "balance"
 msgid "Right"
 msgstr "Right"
 
-#: ../panels/sound/gvc-balance-bar.c:109
+#: panels/sound/gvc-balance-bar.c:108
 msgctxt "balance"
 msgid "Rear"
 msgstr "Rear"
 
-#: ../panels/sound/gvc-balance-bar.c:110
+#: panels/sound/gvc-balance-bar.c:109
 msgctxt "balance"
 msgid "Front"
 msgstr "Front"
 
-#: ../panels/sound/gvc-balance-bar.c:113
+#: panels/sound/gvc-balance-bar.c:112
 msgctxt "balance"
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../panels/sound/gvc-balance-bar.c:114
+#: panels/sound/gvc-balance-bar.c:113
 msgctxt "balance"
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../panels/sound/gvc-balance-bar.c:289
+#: panels/sound/gvc-balance-bar.c:288
 msgid "_Balance:"
 msgstr "_Balance:"
 
-#: ../panels/sound/gvc-balance-bar.c:292
+#: panels/sound/gvc-balance-bar.c:291
 msgid "_Fade:"
 msgstr "_Fade:"
 
-#: ../panels/sound/gvc-balance-bar.c:295
+#: panels/sound/gvc-balance-bar.c:294
 msgid "_Subwoofer:"
 msgstr "_Subwoofer:"
 
-#: ../panels/sound/gvc-channel-bar.c:611 ../panels/sound/gvc-channel-bar.c:620
+#: panels/sound/gvc-channel-bar.c:610 panels/sound/gvc-channel-bar.c:619
 msgctxt "volume"
 msgid "100%"
 msgstr "100%"
 
-#: ../panels/sound/gvc-channel-bar.c:615
+#: panels/sound/gvc-channel-bar.c:614
 msgctxt "volume"
 msgid "Unamplified"
 msgstr "Unamplified"
 
-#: ../panels/sound/gvc-combo-box.c:166 ../panels/sound/gvc-mixer-dialog.c:249
-#: ../panels/sound/gvc-mixer-dialog.c:515
+#: panels/sound/gvc-combo-box.c:166 panels/sound/gvc-mixer-dialog.c:253
+#: panels/sound/gvc-mixer-dialog.c:520
 msgid "_Profile:"
 msgstr "_Profile:"
 
-#. translators:
-#. * The number of sound outputs on a particular device
-#: ../panels/sound/gvc/gvc-mixer-control.c:1873
-#, c-format
-msgid "%u Output"
-msgid_plural "%u Outputs"
-msgstr[0] "%u Output"
-msgstr[1] "%u Outputs"
-
-#. translators:
-#. * The number of sound inputs on a particular device
-#: ../panels/sound/gvc/gvc-mixer-control.c:1883
-#, c-format
-msgid "%u Input"
-msgid_plural "%u Inputs"
-msgstr[0] "%u Input"
-msgstr[1] "%u Inputs"
-
-#: ../panels/sound/gvc/gvc-mixer-control.c:2738
-msgid "System Sounds"
-msgstr "System Sounds"
-
-#: ../panels/sound/gvc-mixer-dialog.c:251
+#: panels/sound/gvc-mixer-dialog.c:255
 msgid "_Test Speakers"
 msgstr "_Test Speakers"
 
-#: ../panels/sound/gvc-mixer-dialog.c:420
+#: panels/sound/gvc-mixer-dialog.c:424
 msgid "Peak detect"
 msgstr "Peak detect"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1512
+#: panels/sound/gvc-mixer-dialog.c:1499
 msgid "Device"
 msgstr "Device"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1575
+#: panels/sound/gvc-mixer-dialog.c:1562
 #, c-format
 msgid "Speaker Testing for %s"
 msgstr "Speaker Testing for %s"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1631
+#: panels/sound/gvc-mixer-dialog.c:1617
 msgid "_Output volume:"
 msgstr "_Output volume:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1645
+#: panels/sound/gvc-mixer-dialog.c:1631
 msgid "Output"
 msgstr "Output"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1650
+#: panels/sound/gvc-mixer-dialog.c:1636
 msgid "C_hoose a device for sound output:"
 msgstr "C_hoose a device for sound output:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1672
+#: panels/sound/gvc-mixer-dialog.c:1658
 msgid "Settings for the selected device:"
 msgstr "Settings for the selected device:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1683
+#: panels/sound/gvc-mixer-dialog.c:1669
 msgid "Input"
 msgstr "Input"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1690
+#: panels/sound/gvc-mixer-dialog.c:1676
 msgid "_Input volume:"
 msgstr "_Input volume:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1711
+#: panels/sound/gvc-mixer-dialog.c:1697
 msgid "Input level:"
 msgstr "Input level:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1737
+#: panels/sound/gvc-mixer-dialog.c:1723
 msgid "C_hoose a device for sound input:"
 msgstr "C_hoose a device for sound input:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1761
+#: panels/sound/gvc-mixer-dialog.c:1747
 msgid "Sound Effects"
 msgstr "Sound Effects"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1768
+#: panels/sound/gvc-mixer-dialog.c:1754
 msgid "_Alert volume:"
 msgstr "_Alert volume:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1785
+#: panels/sound/gvc-mixer-dialog.c:1775
 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:188
+#: panels/sound/gvc-sound-theme-chooser.c:187
 msgid "Built-in"
 msgstr "Built-in"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:454
-#: ../panels/sound/gvc-sound-theme-chooser.c:466
-#: ../panels/sound/gvc-sound-theme-chooser.c:478
+#: panels/sound/gvc-sound-theme-chooser.c:446
+#: panels/sound/gvc-sound-theme-chooser.c:458
+#: panels/sound/gvc-sound-theme-chooser.c:470
 msgid "Sound Preferences"
 msgstr "Sound Preferences"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:457
-#: ../panels/sound/gvc-sound-theme-chooser.c:468
-#: ../panels/sound/gvc-sound-theme-chooser.c:480
+#: panels/sound/gvc-sound-theme-chooser.c:449
+#: panels/sound/gvc-sound-theme-chooser.c:460
+#: panels/sound/gvc-sound-theme-chooser.c:472
 msgid "Testing event sound"
 msgstr "Testing event sound"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:554
-#: ../panels/wacom/wacom-stylus-page.ui.h:1
+#: panels/sound/gvc-sound-theme-chooser.c:544
+#: panels/wacom/wacom-stylus-page.ui:25
 msgid "Default"
 msgstr "Default"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:555
+#: panels/sound/gvc-sound-theme-chooser.c:545
 msgid "From theme"
 msgstr "From theme"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:740
+#: panels/sound/gvc-sound-theme-chooser.c:720
 msgid "C_hoose an alert sound:"
 msgstr "C_hoose an alert sound:"
 
-#: ../panels/sound/gvc-speaker-test.c:231
+#: panels/sound/gvc-speaker-test.c:229
 msgid "Stop"
 msgstr "Stop"
 
-#: ../panels/sound/gvc-speaker-test.c:231
-#: ../panels/sound/gvc-speaker-test.c:343
+#: panels/sound/gvc-speaker-test.c:229 panels/sound/gvc-speaker-test.c:341
 msgid "Test"
 msgstr "Test"
 
-#: ../panels/sound/gvc-speaker-test.c:239
+#: panels/sound/gvc-speaker-test.c:237
 msgid "Subwoofer"
 msgstr "Subwoofer"
 
-#: ../panels/sound/sound-theme-file-utils.c:304
+#: panels/sound/sound-theme-file-utils.c:288
 msgid "Custom"
 msgstr "Custom"
 
 #. translators: the labels will read:
 #. * Cursor Size: Default
-#: ../panels/universal-access/cc-ua-panel.c:351
-#| msgid "Default"
+#: panels/universal-access/cc-ua-panel.c:351
 msgctxt "cursor size"
 msgid "Default"
 msgstr "Default"
 
-#: ../panels/universal-access/cc-ua-panel.c:354
-#| msgctxt "Calibration quality"
-#| msgid "Medium"
+#: panels/universal-access/cc-ua-panel.c:354
 msgctxt "cursor size"
 msgid "Medium"
 msgstr "Medium"
 
-#: ../panels/universal-access/cc-ua-panel.c:357
-#| msgctxt "dwell click threshold"
-#| msgid "Large"
+#: panels/universal-access/cc-ua-panel.c:357
 msgctxt "cursor size"
 msgid "Large"
 msgstr "Large"
 
-#: ../panels/universal-access/cc-ua-panel.c:360
-#| msgctxt "universal access, text size"
-#| msgid "Larger"
+#: panels/universal-access/cc-ua-panel.c:360
 msgctxt "cursor size"
 msgid "Larger"
 msgstr "Larger"
 
-#: ../panels/universal-access/cc-ua-panel.c:363
-#| msgctxt "dwell click threshold"
-#| msgid "Large"
+#: panels/universal-access/cc-ua-panel.c:363
 msgctxt "cursor size"
 msgid "Largest"
 msgstr "Largest"
 
-#: ../panels/universal-access/cc-ua-panel.c:367
+#: panels/universal-access/cc-ua-panel.c:367
 #, c-format
-#| msgid "pixel"
-#| msgid_plural "pixels"
 msgid "%d pixel"
 msgid_plural "%d pixels"
 msgstr[0] "%d pixel"
 msgstr[1] "%d pixels"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2
-msgid "Uni­ver­sal Access"
-msgstr "Uni­ver­sal Access"
-
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3
+#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:4
 msgid "Make it easier to see, hear, type, point and click"
 msgstr "Make it easier to see, hear, type, point and click"
 
+#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:6
+msgid "preferences-desktop-accessibility"
+msgstr "preferences-desktop-accessibility"
+
 #. Translators: those are keywords for the universal access control-center panel
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5
-#| msgid ""
-#| "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;"
-#| "size;AccessX;Sticky;Keys;Slow;Bounce;Mouse;"
+#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:18
 msgid ""
 "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
 "AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;Repeat;Blink;"
@@ -5828,529 +5746,530 @@ msgstr ""
 "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
 "AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;Repeat;Blink;"
 
-#: ../panels/universal-access/uap.ui.h:1
+#: panels/universal-access/uap.ui:89
 msgid "_Always Show Universal Access Menu"
 msgstr "_Always Show Universal Access Menu"
 
-#: ../panels/universal-access/uap.ui.h:2
+#: panels/universal-access/uap.ui:131
 msgid "Seeing"
 msgstr "Seeing"
 
-#: ../panels/universal-access/uap.ui.h:3
+#: panels/universal-access/uap.ui:177
 msgid "_High Contrast"
 msgstr "_High Contrast"
 
-#: ../panels/universal-access/uap.ui.h:4
+#: panels/universal-access/uap.ui:224
 msgid "_Large Text"
 msgstr "_Large Text"
 
-#: ../panels/universal-access/uap.ui.h:5
+#: panels/universal-access/uap.ui:269
 msgid "C_ursor Size"
 msgstr "C_ursor Size"
 
-#: ../panels/universal-access/uap.ui.h:6
-#: ../panels/universal-access/zoom-options.ui.h:7
+#: panels/universal-access/uap.ui:316
+#: panels/universal-access/zoom-options.ui:98
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../panels/universal-access/uap.ui.h:8
+#: panels/universal-access/uap.ui:362
 msgid "Screen _Reader"
 msgstr "Screen _Reader"
 
-#: ../panels/universal-access/uap.ui.h:9
+#: panels/universal-access/uap.ui:408 panels/universal-access/uap.ui:1237
 msgid "_Sound Keys"
 msgstr "_Sound Keys"
 
-#: ../panels/universal-access/uap.ui.h:10
+#: panels/universal-access/uap.ui:470
 msgid "Hearing"
 msgstr "Hearing"
 
-#: ../panels/universal-access/uap.ui.h:11
+#: panels/universal-access/uap.ui:514 panels/universal-access/uap.ui:1340
 msgid "_Visual Alerts"
 msgstr "_Visual Alerts"
 
-#: ../panels/universal-access/uap.ui.h:13
+#: panels/universal-access/uap.ui:622
 msgid "Screen _Keyboard"
 msgstr "Screen _Keyboard"
 
-#: ../panels/universal-access/uap.ui.h:14
+#: panels/universal-access/uap.ui:667
 msgid "R_epeat Keys"
 msgstr "R_epeat Keys"
 
-#: ../panels/universal-access/uap.ui.h:15
+#: panels/universal-access/uap.ui:713
 msgid "Cursor _Blinking"
 msgstr "Cursor _Blinking"
 
-#: ../panels/universal-access/uap.ui.h:16
+#: panels/universal-access/uap.ui:759
 msgid "_Typing Assist (AccessX)"
 msgstr "_Typing Assist (AccessX)"
 
-#: ../panels/universal-access/uap.ui.h:17
+#: panels/universal-access/uap.ui:820
 msgid "Pointing & Clicking"
 msgstr "Pointing & Clicking"
 
-#: ../panels/universal-access/uap.ui.h:18
+#: panels/universal-access/uap.ui:866
 msgid "_Mouse Keys"
 msgstr "_Mouse Keys"
 
-#: ../panels/universal-access/uap.ui.h:19
+#: panels/universal-access/uap.ui:911
 msgid "_Click Assist"
 msgstr "_Click Assist"
 
-#: ../panels/universal-access/uap.ui.h:20
+#: panels/universal-access/uap.ui:957
 msgid "_Double-Click Delay"
 msgstr "_Double-Click Delay"
 
-#: ../panels/universal-access/uap.ui.h:21
+#: panels/universal-access/uap.ui:977
 msgid "Double-Click Delay"
 msgstr "Double-Click Delay"
 
-#: ../panels/universal-access/uap.ui.h:22
-#| msgid "Cursor Blinking"
+#: panels/universal-access/uap.ui:1042
 msgid "Cursor Size"
 msgstr "Cursor Size"
 
-#: ../panels/universal-access/uap.ui.h:23
+#: panels/universal-access/uap.ui:1069
 msgid ""
 "Cursor size can be combined with zoom to make it easier to see the cursor."
 msgstr ""
 "Cursor size can be combined with zoom to make it easier to see the cursor."
 
-#: ../panels/universal-access/uap.ui.h:24
+#: panels/universal-access/uap.ui:1105
 msgid "Screen Reader"
 msgstr "Screen Reader"
 
-#: ../panels/universal-access/uap.ui.h:25
+#: panels/universal-access/uap.ui:1122
 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:26
+#: panels/universal-access/uap.ui:1155
 msgid "_Screen Reader"
 msgstr "_Screen Reader"
 
-#: ../panels/universal-access/uap.ui.h:27
+#: panels/universal-access/uap.ui:1194
 msgid "Sound Keys"
 msgstr "Sound Keys"
 
-#: ../panels/universal-access/uap.ui.h:28
+#: panels/universal-access/uap.ui:1212
 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:29
+#: panels/universal-access/uap.ui:1282
 msgid "Visual Alerts"
 msgstr "Visual Alerts"
 
-#: ../panels/universal-access/uap.ui.h:30
+#: panels/universal-access/uap.ui:1286
 msgid "_Test flash"
 msgstr "_Test flash"
 
-#: ../panels/universal-access/uap.ui.h:31
+#: panels/universal-access/uap.ui:1315
 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:32
+#: panels/universal-access/uap.ui:1366
 msgid "Flash the _window title"
 msgstr "Flash the _window title"
 
-#: ../panels/universal-access/uap.ui.h:33
+#: panels/universal-access/uap.ui:1384
 msgid "Flash the entire _screen"
 msgstr "Flash the entire _screen"
 
-#: ../panels/universal-access/uap.ui.h:34
+#: panels/universal-access/uap.ui:1429
 msgid "Repeat Keys"
 msgstr "Repeat Keys"
 
-#: ../panels/universal-access/uap.ui.h:35
+#: panels/universal-access/uap.ui:1459
 msgid "Key presses repeat when key is held down."
 msgstr "Key presses repeat when key is held down."
 
-#: ../panels/universal-access/uap.ui.h:37
+#: panels/universal-access/uap.ui:1538
 msgid "Repeat keys delay"
 msgstr "Repeat keys delay"
 
-#: ../panels/universal-access/uap.ui.h:38
+#: panels/universal-access/uap.ui:1586 panels/universal-access/uap.ui:1719
 msgid "Speed"
 msgstr "Speed"
 
-#: ../panels/universal-access/uap.ui.h:39
+#: panels/universal-access/uap.ui:1623
 msgid "Repeat keys speed"
 msgstr "Repeat keys speed"
 
-#: ../panels/universal-access/uap.ui.h:40
+#: panels/universal-access/uap.ui:1647
 msgid "Cursor Blinking"
 msgstr "Cursor Blinking"
 
-#: ../panels/universal-access/uap.ui.h:41
+#: panels/universal-access/uap.ui:1677
 msgid "Cursor blinks in text fields."
 msgstr "Cursor blinks in text fields."
 
-#: ../panels/universal-access/uap.ui.h:42
+#: panels/universal-access/uap.ui:1756
 msgid "Cursor blinking speed"
 msgstr "Cursor blinking speed"
 
-#: ../panels/universal-access/uap.ui.h:43
+#: panels/universal-access/uap.ui:1792
 msgid "Typing Assist"
 msgstr "Typing Assist"
 
-#: ../panels/universal-access/uap.ui.h:44
+#: panels/universal-access/uap.ui:1831
 msgid "_Sticky Keys"
 msgstr "_Sticky Keys"
 
-#: ../panels/universal-access/uap.ui.h:45
+#: panels/universal-access/uap.ui:1848
 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:46
+#: panels/universal-access/uap.ui:1872
 msgid "_Disable if two keys are pressed together"
 msgstr "_Disable if two keys are pressed together"
 
-#: ../panels/universal-access/uap.ui.h:47
+#: panels/universal-access/uap.ui:1890
 msgid "Beep when a _modifier key is pressed"
 msgstr "Beep when a _modifier key is pressed"
 
-#: ../panels/universal-access/uap.ui.h:48
+#: panels/universal-access/uap.ui:1938
 msgid "S_low Keys"
 msgstr "S_low Keys"
 
-#: ../panels/universal-access/uap.ui.h:49
+#: panels/universal-access/uap.ui:1955
 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:50
+#: panels/universal-access/uap.ui:1988 panels/universal-access/uap.ui:2201
+#: panels/universal-access/uap.ui:2538
 msgid "A_cceptance delay:"
 msgstr "A_cceptance delay:"
 
-#: ../panels/universal-access/uap.ui.h:51
+#: panels/universal-access/uap.ui:2010
 msgctxt "slow keys delay"
 msgid "Short"
 msgstr "Short"
 
-#: ../panels/universal-access/uap.ui.h:52
+#: panels/universal-access/uap.ui:2029
 msgid "Slow keys typing delay"
 msgstr "Slow keys typing delay"
 
-#: ../panels/universal-access/uap.ui.h:53
+#: panels/universal-access/uap.ui:2044
 msgctxt "slow keys delay"
 msgid "Long"
 msgstr "Long"
 
-#: ../panels/universal-access/uap.ui.h:54
+#: panels/universal-access/uap.ui:2071
 msgid "Beep when a key is pr_essed"
 msgstr "Beep when a key is pr_essed"
 
-#: ../panels/universal-access/uap.ui.h:55
+#: panels/universal-access/uap.ui:2088
 msgid "Beep when a key is _accepted"
 msgstr "Beep when a key is _accepted"
 
-#: ../panels/universal-access/uap.ui.h:56
+#: panels/universal-access/uap.ui:2105 panels/universal-access/uap.ui:2284
 msgid "Beep when a key is _rejected"
 msgstr "Beep when a key is _rejected"
 
-#: ../panels/universal-access/uap.ui.h:57
+#: panels/universal-access/uap.ui:2151
 msgid "_Bounce Keys"
 msgstr "_Bounce Keys"
 
-#: ../panels/universal-access/uap.ui.h:58
+#: panels/universal-access/uap.ui:2168
 msgid "Ignores fast duplicate keypresses"
 msgstr "Ignores fast duplicate keypresses"
 
-#: ../panels/universal-access/uap.ui.h:59
+#: panels/universal-access/uap.ui:2223
 msgctxt "bounce keys delay"
 msgid "Short"
 msgstr "Short"
 
-#: ../panels/universal-access/uap.ui.h:60
+#: panels/universal-access/uap.ui:2242
 msgid "Bounce keys typing delay"
 msgstr "Bounce keys typing delay"
 
-#: ../panels/universal-access/uap.ui.h:61
+#: panels/universal-access/uap.ui:2257
 msgctxt "bounce keys delay"
 msgid "Long"
 msgstr "Long"
 
-#: ../panels/universal-access/uap.ui.h:62
+#: panels/universal-access/uap.ui:2370
 msgid "_Enable by Keyboard"
 msgstr "_Enable by Keyboard"
 
-#: ../panels/universal-access/uap.ui.h:63
+#: panels/universal-access/uap.ui:2387
 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:64
+#: panels/universal-access/uap.ui:2451
 msgid "Click Assist"
 msgstr "Click Assist"
 
-#: ../panels/universal-access/uap.ui.h:65
+#: panels/universal-access/uap.ui:2487
 msgid "_Simulated Secondary Click"
 msgstr "_Simulated Secondary Click"
 
-#: ../panels/universal-access/uap.ui.h:66
+#: panels/universal-access/uap.ui:2505
 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:67
+#: panels/universal-access/uap.ui:2559
 msgctxt "secondary click"
 msgid "Short"
 msgstr "Short"
 
-#: ../panels/universal-access/uap.ui.h:68
+#: panels/universal-access/uap.ui:2578
 msgid "Secondary click delay"
 msgstr "Secondary click delay"
 
-#: ../panels/universal-access/uap.ui.h:69
+#: panels/universal-access/uap.ui:2593
 msgctxt "secondary click delay"
 msgid "Long"
 msgstr "Long"
 
-#: ../panels/universal-access/uap.ui.h:70
+#: panels/universal-access/uap.ui:2650
 msgid "_Hover Click"
 msgstr "_Hover Click"
 
-#: ../panels/universal-access/uap.ui.h:71
+#: panels/universal-access/uap.ui:2668
 msgid "Trigger a click when the pointer hovers"
 msgstr "Trigger a click when the pointer hovers"
 
-#: ../panels/universal-access/uap.ui.h:72
+#: panels/universal-access/uap.ui:2701
 msgid "D_elay:"
 msgstr "D_elay:"
 
-#: ../panels/universal-access/uap.ui.h:73
+#: panels/universal-access/uap.ui:2723
 msgctxt "dwell click delay"
 msgid "Short"
 msgstr "Short"
 
-#: ../panels/universal-access/uap.ui.h:74
+#: panels/universal-access/uap.ui:2754
 msgctxt "dwell click delay"
 msgid "Long"
 msgstr "Long"
 
-#: ../panels/universal-access/uap.ui.h:75
+#: panels/universal-access/uap.ui:2790
 msgid "Motion _threshold:"
 msgstr "Motion _threshold:"
 
-#: ../panels/universal-access/uap.ui.h:76
+#: panels/universal-access/uap.ui:2812
 msgctxt "dwell click threshold"
 msgid "Small"
 msgstr "Small"
 
-#: ../panels/universal-access/uap.ui.h:77
+#: panels/universal-access/uap.ui:2843
 msgctxt "dwell click threshold"
 msgid "Large"
 msgstr "Large"
 
-#: ../panels/universal-access/zoom-options.c:333
+#: panels/universal-access/zoom-options.c:333
 msgctxt "Distance"
 msgid "Short"
 msgstr "Short"
 
-#: ../panels/universal-access/zoom-options.c:334
+#: panels/universal-access/zoom-options.c:334
 msgctxt "Distance"
 msgid "¼ Screen"
 msgstr "¼ Screen"
 
-#: ../panels/universal-access/zoom-options.c:335
+#: panels/universal-access/zoom-options.c:335
 msgctxt "Distance"
 msgid "½ Screen"
 msgstr "½ Screen"
 
-#: ../panels/universal-access/zoom-options.c:336
+#: panels/universal-access/zoom-options.c:336
 msgctxt "Distance"
 msgid "¾ Screen"
 msgstr "¾ Screen"
 
-#: ../panels/universal-access/zoom-options.c:337
+#: panels/universal-access/zoom-options.c:337
 msgctxt "Distance"
 msgid "Long"
 msgstr "Long"
 
-#: ../panels/universal-access/zoom-options.ui.h:1
+#: panels/universal-access/zoom-options.ui:48
 msgid "Full Screen"
 msgstr "Full Screen"
 
-#: ../panels/universal-access/zoom-options.ui.h:2
+#: panels/universal-access/zoom-options.ui:53
 msgid "Top Half"
 msgstr "Top Half"
 
-#: ../panels/universal-access/zoom-options.ui.h:3
+#: panels/universal-access/zoom-options.ui:58
 msgid "Bottom Half"
 msgstr "Bottom Half"
 
-#: ../panels/universal-access/zoom-options.ui.h:4
+#: panels/universal-access/zoom-options.ui:63
 msgid "Left Half"
 msgstr "Left Half"
 
-#: ../panels/universal-access/zoom-options.ui.h:5
+#: panels/universal-access/zoom-options.ui:68
 msgid "Right Half"
 msgstr "Right Half"
 
-#: ../panels/universal-access/zoom-options.ui.h:6
+#: panels/universal-access/zoom-options.ui:77
 msgid "Zoom Options"
 msgstr "Zoom Options"
 
-#: ../panels/universal-access/zoom-options.ui.h:8
+#: panels/universal-access/zoom-options.ui:186
 msgid "_Magnification:"
 msgstr "_Magnification:"
 
-#: ../panels/universal-access/zoom-options.ui.h:9
+#: panels/universal-access/zoom-options.ui:250
 msgid "_Follow mouse cursor"
 msgstr "_Follow mouse cursor"
 
-#: ../panels/universal-access/zoom-options.ui.h:10
+#: panels/universal-access/zoom-options.ui:270
 msgid "_Screen part:"
 msgstr "_Screen part:"
 
-#: ../panels/universal-access/zoom-options.ui.h:11
+#: panels/universal-access/zoom-options.ui:332
 msgid "Magnifier _extends outside of screen"
 msgstr "Magnifier _extends outside of screen"
 
-#: ../panels/universal-access/zoom-options.ui.h:12
+#: panels/universal-access/zoom-options.ui:351
 msgid "_Keep magnifier cursor centered"
 msgstr "_Keep magnifier cursor centered"
 
-#: ../panels/universal-access/zoom-options.ui.h:13
+#: panels/universal-access/zoom-options.ui:370
 msgid "Magnifier cursor _pushes contents around"
 msgstr "Magnifier cursor _pushes contents around"
 
-#: ../panels/universal-access/zoom-options.ui.h:14
+#: panels/universal-access/zoom-options.ui:389
 msgid "Magnifier cursor moves with _contents"
 msgstr "Magnifier cursor moves with _contents"
 
-#: ../panels/universal-access/zoom-options.ui.h:15
+#: panels/universal-access/zoom-options.ui:423
 msgid "Magnifier Position:"
 msgstr "Magnifier Position:"
 
-#: ../panels/universal-access/zoom-options.ui.h:16
+#: panels/universal-access/zoom-options.ui:444
 msgid "Magnifier"
 msgstr "Magnifier"
 
-#: ../panels/universal-access/zoom-options.ui.h:17
+#: panels/universal-access/zoom-options.ui:490
 msgid "_Thickness:"
 msgstr "_Thickness:"
 
-#: ../panels/universal-access/zoom-options.ui.h:18
+#: panels/universal-access/zoom-options.ui:516
 msgctxt "universal access, thickness"
 msgid "Thin"
 msgstr "Thin"
 
-#: ../panels/universal-access/zoom-options.ui.h:19
+#: panels/universal-access/zoom-options.ui:548
 msgctxt "universal access, thickness"
 msgid "Thick"
 msgstr "Thick"
 
-#: ../panels/universal-access/zoom-options.ui.h:20
+#: panels/universal-access/zoom-options.ui:574
 msgid "_Length:"
 msgstr "_Length:"
 
 #. The color of the accessibility crosshair
-#: ../panels/universal-access/zoom-options.ui.h:22
+#: panels/universal-access/zoom-options.ui:626
 msgid "Co_lor:"
 msgstr "Co_lour:"
 
-#: ../panels/universal-access/zoom-options.ui.h:23
+#: panels/universal-access/zoom-options.ui:690
 msgid "_Crosshairs:"
 msgstr "_Crosshairs:"
 
-#: ../panels/universal-access/zoom-options.ui.h:24
+#: panels/universal-access/zoom-options.ui:741
 msgid "_Overlaps mouse cursor"
 msgstr "_Overlaps mouse cursor"
 
-#: ../panels/universal-access/zoom-options.ui.h:25
+#: panels/universal-access/zoom-options.ui:779
 msgid "Crosshairs"
 msgstr "Crosshairs"
 
-#: ../panels/universal-access/zoom-options.ui.h:26
+#: panels/universal-access/zoom-options.ui:827
 msgid "_White on black:"
 msgstr "_White on black:"
 
-#: ../panels/universal-access/zoom-options.ui.h:27
+#: panels/universal-access/zoom-options.ui:850
 msgid "_Brightness:"
 msgstr "_Brightness:"
 
-#: ../panels/universal-access/zoom-options.ui.h:28
+#: panels/universal-access/zoom-options.ui:874
 msgid "_Contrast:"
 msgstr "_Contrast:"
 
 #. The contrast scale goes from Color to None (grayscale)
-#: ../panels/universal-access/zoom-options.ui.h:30
+#: panels/universal-access/zoom-options.ui:897
 msgctxt "universal access, contrast"
 msgid "Co_lor"
 msgstr "Co_lour"
 
-#: ../panels/universal-access/zoom-options.ui.h:31
+#: panels/universal-access/zoom-options.ui:925
 msgctxt "universal access, color"
 msgid "None"
 msgstr "None"
 
-#: ../panels/universal-access/zoom-options.ui.h:32
+#: panels/universal-access/zoom-options.ui:957
 msgctxt "universal access, color"
 msgid "Full"
 msgstr "Full"
 
-#: ../panels/universal-access/zoom-options.ui.h:33
+#: panels/universal-access/zoom-options.ui:1023
 msgctxt "universal access, brightness"
 msgid "Low"
 msgstr "Low"
 
-#: ../panels/universal-access/zoom-options.ui.h:34
+#: panels/universal-access/zoom-options.ui:1056
 msgctxt "universal access, brightness"
 msgid "High"
 msgstr "High"
 
-#: ../panels/universal-access/zoom-options.ui.h:35
+#: panels/universal-access/zoom-options.ui:1087
 msgctxt "universal access, contrast"
 msgid "Low"
 msgstr "Low"
 
-#: ../panels/universal-access/zoom-options.ui.h:36
+#: panels/universal-access/zoom-options.ui:1120
 msgctxt "universal access, contrast"
 msgid "High"
 msgstr "High"
 
-#: ../panels/universal-access/zoom-options.ui.h:37
+#: panels/universal-access/zoom-options.ui:1156
 msgid "Color Effects:"
 msgstr "Colour Effects:"
 
-#: ../panels/universal-access/zoom-options.ui.h:38
+#: panels/universal-access/zoom-options.ui:1181
 msgid "Color Effects"
 msgstr "Colour Effects"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:1
-#: ../panels/user-accounts/data/join-dialog.ui.h:1
+#: panels/user-accounts/data/account-dialog.ui:18
+#: panels/user-accounts/data/join-dialog.ui:11
 msgid "Add User"
 msgstr "Add User"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:5
+#: panels/user-accounts/data/account-dialog.ui:171
 msgid "_Full Name"
 msgstr "_Full Name"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:6
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
+#: panels/user-accounts/data/account-dialog.ui:197
+#: panels/user-accounts/data/user-accounts-dialog.ui:146
 msgid "Standard"
 msgstr "Standard"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:7
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
+#: panels/user-accounts/data/account-dialog.ui:207
+#: panels/user-accounts/data/user-accounts-dialog.ui:155
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:8
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
+#: panels/user-accounts/data/account-dialog.ui:223
+#: panels/user-accounts/data/user-accounts-dialog.ui:173
 msgid "Account _Type"
 msgstr "Account _Type"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:10
+#: panels/user-accounts/data/account-dialog.ui:260
 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
+#: panels/user-accounts/data/account-dialog.ui:274
 msgid "Set a password _now"
 msgstr "Set a password _now"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:13
+#: panels/user-accounts/data/account-dialog.ui:387
 msgid "_Confirm"
 msgstr "_Confirm"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:14
+#: panels/user-accounts/data/account-dialog.ui:463
+#: panels/user-accounts/data/account-dialog.ui:667
 msgid ""
 "Enterprise login allows an existing centrally managed user account to be "
 "used on this device. You can also use this account to access company "
@@ -6360,73 +6279,73 @@ msgstr ""
 "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:15
-#: ../panels/user-accounts/data/join-dialog.ui.h:9
+#: panels/user-accounts/data/account-dialog.ui:485
+#: panels/user-accounts/data/join-dialog.ui:116
 msgid "_Domain"
 msgstr "_Domain"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:16
+#: panels/user-accounts/data/account-dialog.ui:707
 msgid "You are Offline"
 msgstr "You are Offline"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:17
+#: panels/user-accounts/data/account-dialog.ui:726
 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
+#: panels/user-accounts/data/account-dialog.ui:760
 msgid "_Enterprise Login"
 msgstr "_Enterprise Login"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:1
+#: panels/user-accounts/data/account-fingerprint.ui:12
 msgid "Left thumb"
 msgstr "Left thumb"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:2
+#: panels/user-accounts/data/account-fingerprint.ui:15
 msgid "Left middle finger"
 msgstr "Left middle finger"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:3
+#: panels/user-accounts/data/account-fingerprint.ui:18
 msgid "Left ring finger"
 msgstr "Left ring finger"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:4
+#: panels/user-accounts/data/account-fingerprint.ui:21
 msgid "Left little finger"
 msgstr "Left little finger"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:5
+#: panels/user-accounts/data/account-fingerprint.ui:24
 msgid "Right thumb"
 msgstr "Right thumb"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:6
+#: panels/user-accounts/data/account-fingerprint.ui:27
 msgid "Right middle finger"
 msgstr "Right middle finger"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:7
+#: panels/user-accounts/data/account-fingerprint.ui:30
 msgid "Right ring finger"
 msgstr "Right ring finger"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:8
+#: panels/user-accounts/data/account-fingerprint.ui:33
 msgid "Right little finger"
 msgstr "Right little finger"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:9
-#: ../panels/user-accounts/um-fingerprint-dialog.c:680
+#: panels/user-accounts/data/account-fingerprint.ui:39
+#: panels/user-accounts/um-fingerprint-dialog.c:677
 msgid "Enable Fingerprint Login"
 msgstr "Enable Fingerprint Login"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:10
+#: panels/user-accounts/data/account-fingerprint.ui:89
 msgid "_Right index finger"
 msgstr "_Right index finger"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:11
+#: panels/user-accounts/data/account-fingerprint.ui:105
 msgid "_Left index finger"
 msgstr "_Left index finger"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:12
+#: panels/user-accounts/data/account-fingerprint.ui:126
 msgid "_Other finger:"
 msgstr "_Other finger:"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:13
+#: panels/user-accounts/data/account-fingerprint.ui:262
 msgid ""
 "Your fingerprint was successfully saved. You should now be able to log in "
 "using your fingerprint reader."
@@ -6434,29 +6353,43 @@ msgstr ""
 "Your fingerprint was successfully saved. You should now be able to log in "
 "using your fingerprint reader."
 
-#: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:1
+#: panels/user-accounts/data/avatar-chooser.ui:27
+#| msgid "Take a photo…"
+msgid "Take a Picture…"
+msgstr "Take a Picture…"
+
+#: panels/user-accounts/data/avatar-chooser.ui:34
+#| msgid "Select PPD File"
+msgid "Select a File…"
+msgstr "Select a File…"
+
+#: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:3
 msgid "Users"
 msgstr "Users"
 
-#: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:2
+#: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:4
 msgid "Add or remove users and change your password"
 msgstr "Add or remove users and change your password"
 
+#: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:6
+msgid "system-users"
+msgstr "system-users"
+
 #. Translators: those are keywords for the user accounts control-center panel
-#: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:4
+#: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:19
 msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;"
 msgstr "Login;Name;Fingerprint;Avatar;Logo;Face;Password;"
 
 #. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
-#: ../panels/user-accounts/data/join-dialog.ui.h:4
+#: panels/user-accounts/data/join-dialog.ui:39
 msgid "_Enroll"
 msgstr "_Enroll"
 
-#: ../panels/user-accounts/data/join-dialog.ui.h:5
+#: panels/user-accounts/data/join-dialog.ui:75
 msgid "Domain Administrator Login"
 msgstr "Domain Administrator Login"
 
-#: ../panels/user-accounts/data/join-dialog.ui.h:6
+#: panels/user-accounts/data/join-dialog.ui:93
 msgid ""
 "In order to use enterprise logins, this computer needs to be\n"
 "enrolled in the domain. Please have your network administrator\n"
@@ -6466,154 +6399,165 @@ msgstr ""
 "enrolled in the domain. Please have your network administrator\n"
 "type their domain password here."
 
-#: ../panels/user-accounts/data/join-dialog.ui.h:10
+#: panels/user-accounts/data/join-dialog.ui:150
 msgid "Administrator _Name"
 msgstr "Administrator _Name"
 
-#: ../panels/user-accounts/data/join-dialog.ui.h:11
+#: panels/user-accounts/data/join-dialog.ui:185
 msgid "Administrator Password"
 msgstr "Administrator Password"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:1
+#: panels/user-accounts/data/password-dialog.ui:7
 msgid "Change Password"
 msgstr "Change Password"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:3
+#: panels/user-accounts/data/password-dialog.ui:38
 msgid "Ch_ange"
 msgstr "Ch_ange"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:4
+#: panels/user-accounts/data/password-dialog.ui:142
 msgid "_Verify New Password"
 msgstr "_Verify New Password"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:5
+#: panels/user-accounts/data/password-dialog.ui:159
 msgid "_New Password"
 msgstr "_New Password"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:6
+#: panels/user-accounts/data/password-dialog.ui:208
 msgid "Current _Password"
 msgstr "Current _Password"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:7
+#: panels/user-accounts/data/password-dialog.ui:243
 msgid "Allow user to change their password on next login"
 msgstr "Allow user to change their password on next login"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:8
+#: panels/user-accounts/data/password-dialog.ui:256
 msgid "Set a password now"
 msgstr "Set a password now"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1
+#: panels/user-accounts/data/user-accounts-dialog.ui:20
 msgid "_Add User…"
 msgstr "_Add User…"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
+#: panels/user-accounts/data/user-accounts-dialog.ui:69
 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/user-accounts/data/user-accounts-dialog.ui.h:3
+#: panels/user-accounts/data/user-accounts-dialog.ui:77
 msgid "Restart Now"
 msgstr "Restart Now"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
+#: panels/user-accounts/data/user-accounts-dialog.ui:244
 msgid "A_utomatic Login"
 msgstr "A_utomatic Login"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+#: panels/user-accounts/data/user-accounts-dialog.ui:285
 msgid "_Fingerprint Login"
 msgstr "_Fingerprint Login"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
+#: panels/user-accounts/data/user-accounts-dialog.ui:311
+#: panels/user-accounts/data/user-accounts-dialog.ui:324
 msgid "User Icon"
 msgstr "User Icon"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
+#: panels/user-accounts/data/user-accounts-dialog.ui:387
 msgid "Last Login"
 msgstr "Last Login"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
-#| msgid "Remove User Account"
+#: panels/user-accounts/data/user-accounts-dialog.ui:434
 msgid "Remove User…"
 msgstr "Remove User…"
 
-#: ../panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in.h:1
+#. Translators: This is the empty state page label which states that there are no users to show in the panel.
+#: panels/user-accounts/data/user-accounts-dialog.ui:466
+#| msgid "No Printers Found"
+msgid "No Users Found"
+msgstr "No Users Found"
+
+#: panels/user-accounts/data/user-accounts-dialog.ui:476
+#| msgid "Create a user account"
+msgid "Unlock to add a user account."
+msgstr "Unlock to add a user account."
+
+#: panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in:11
 msgid "Manage user accounts"
 msgstr "Manage user accounts"
 
-#: ../panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in.h:2
+#: panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in:12
 msgid "Authentication is required to change user data"
 msgstr "Authentication is required to change user data"
 
-#: ../panels/user-accounts/pw-utils.c:81
+#: 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:83
+#: 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:85 ../panels/user-accounts/pw-utils.c:93
+#: 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:87
+#: 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:89
+#: 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:91
+#: 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:95
+#: 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:97
+#: 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:99
+#: 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:101
+#: 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:103
+#: 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:105
+#: 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:107
+#: 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:109
+#: 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:111
+#: 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 "
@@ -6622,14 +6566,12 @@ 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:113
+#: 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:115
-#| msgctxt "Password hint"
-#| msgid "Try to use a mixture of letters, numbers and punctuation."
+#: panels/user-accounts/pw-utils.c:115
 msgctxt "Password hint"
 msgid ""
 "Password needs to be longer. Try to add more letters, numbers and "
@@ -6638,101 +6580,94 @@ msgstr ""
 "Password needs to be longer. Try to add more letters, numbers and "
 "punctuation."
 
-#: ../panels/user-accounts/pw-utils.c:117
+#: panels/user-accounts/pw-utils.c:117
 msgctxt "Password hint"
 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:119
-#| msgctxt "Password hint"
-#| msgid ""
-#| "Good password! Adding more letters, numbers and punctuation will make it "
-#| "stronger."
+#: panels/user-accounts/pw-utils.c:119
 msgctxt "Password hint"
 msgid ""
 "Adding more letters, numbers and punctuation will make the password stronger."
 msgstr ""
 "Adding more letters, numbers and punctuation will make the password stronger."
 
-#: ../panels/user-accounts/run-passwd.c:422
+#: panels/user-accounts/run-passwd.c:422
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
-#: ../panels/user-accounts/run-passwd.c:502
+#: 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:508
+#: 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:514
+#: 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:517
+#: 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:520
+#: 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:524
+#: 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:528
+#: 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:532
+#: 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:536
+#: panels/user-accounts/run-passwd.c:536
 #, c-format
 msgid "Unknown error"
 msgstr "Unknown error"
 
-#: ../panels/user-accounts/um-account-dialog.c:34
+#: panels/user-accounts/um-account-dialog.c:34
 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:229
+#: panels/user-accounts/um-account-dialog.c:229
 msgid "Failed to add account"
 msgstr "Failed to add account"
 
-#: ../panels/user-accounts/um-account-dialog.c:462
+#: panels/user-accounts/um-account-dialog.c:462
 msgid "Passwords do not match."
 msgstr "Passwords do not match."
 
-#: ../panels/user-accounts/um-account-dialog.c:717
-#: ../panels/user-accounts/um-account-dialog.c:763
-#: ../panels/user-accounts/um-account-dialog.c:784
+#: panels/user-accounts/um-account-dialog.c:717
+#: panels/user-accounts/um-account-dialog.c:763
+#: panels/user-accounts/um-account-dialog.c:784
 msgid "Failed to register account"
 msgstr "Failed to register account"
 
-#: ../panels/user-accounts/um-account-dialog.c:907
+#: panels/user-accounts/um-account-dialog.c:907
 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:980
+#: panels/user-accounts/um-account-dialog.c:980
 msgid "Failed to join domain"
 msgstr "Failed to join domain"
 
-#: ../panels/user-accounts/um-account-dialog.c:1041
-#| msgid ""
-#| "That login name didn't work.\n"
-#| "Please try again."
+#: panels/user-accounts/um-account-dialog.c:1041
 msgid ""
 "That login name didn’t work.\n"
 "Please try again."
@@ -6740,10 +6675,7 @@ msgstr ""
 "That login name didn’t work.\n"
 "Please try again."
 
-#: ../panels/user-accounts/um-account-dialog.c:1048
-#| msgid ""
-#| "That login password didn't work.\n"
-#| "Please try again."
+#: panels/user-accounts/um-account-dialog.c:1048
 msgid ""
 "That login password didn’t work.\n"
 "Please try again."
@@ -6751,52 +6683,51 @@ msgstr ""
 "That login password didn’t work.\n"
 "Please try again."
 
-#: ../panels/user-accounts/um-account-dialog.c:1056
+#: panels/user-accounts/um-account-dialog.c:1056
 msgid "Failed to log into domain"
 msgstr "Failed to log into domain"
 
-#: ../panels/user-accounts/um-account-dialog.c:1114
-#| msgid "Unable find the domain. Maybe you misspelled it?"
+#: panels/user-accounts/um-account-dialog.c:1114
 msgid "Unable to find the domain. Maybe you misspelled it?"
 msgstr "Unable to find the domain. Maybe you misspelled it?"
 
-#: ../panels/user-accounts/um-account-type.c:34
+#: panels/user-accounts/um-account-type.c:34
 msgctxt "Account type"
 msgid "Standard"
 msgstr "Standard"
 
-#: ../panels/user-accounts/um-account-type.c:36
+#: panels/user-accounts/um-account-type.c:36
 msgctxt "Account type"
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:142
+#: panels/user-accounts/um-fingerprint-dialog.c:139
 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:144
+#: panels/user-accounts/um-fingerprint-dialog.c:141
 msgid "The device is already in use."
 msgstr "The device is already in use."
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:146
+#: panels/user-accounts/um-fingerprint-dialog.c:143
 msgid "An internal error occurred."
 msgstr "An internal error occurred."
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:217
+#: panels/user-accounts/um-fingerprint-dialog.c:214
 msgid "Enabled"
 msgstr "Enabled"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:263
+#: panels/user-accounts/um-fingerprint-dialog.c:260
 msgid "Delete registered fingerprints?"
 msgstr "Delete registered fingerprints?"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:267
+#: panels/user-accounts/um-fingerprint-dialog.c:264
 msgid "_Delete Fingerprints"
 msgstr "_Delete Fingerprints"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:273
+#: panels/user-accounts/um-fingerprint-dialog.c:270
 msgid ""
 "Do you want to delete your registered fingerprints so fingerprint login is "
 "disabled?"
@@ -6804,34 +6735,32 @@ msgstr ""
 "Do you want to delete your registered fingerprints so fingerprint login is "
 "disabled?"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:443
+#: panels/user-accounts/um-fingerprint-dialog.c:440
 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:504
-#: ../panels/user-accounts/um-fingerprint-dialog.c:546
+#: panels/user-accounts/um-fingerprint-dialog.c:501
+#: panels/user-accounts/um-fingerprint-dialog.c:543
 #, c-format
-#| msgid "Could not access '%s' device"
 msgid "Could not access “%s” device"
 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:587
+#: panels/user-accounts/um-fingerprint-dialog.c:584
 #, c-format
-#| msgid "Could not start finger capture on '%s' device"
 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:631
+#: panels/user-accounts/um-fingerprint-dialog.c:628
 msgid "Could not access any fingerprint readers"
 msgstr "Could not access any fingerprint readers"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:632
+#: panels/user-accounts/um-fingerprint-dialog.c:629
 msgid "Please contact your system administrator for help."
 msgstr "Please contact your system administrator for help."
 
@@ -6840,11 +6769,8 @@ 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:714
+#: panels/user-accounts/um-fingerprint-dialog.c:711
 #, c-format
-#| msgid ""
-#| "To enable fingerprint login, you need to save one of your fingerprints, "
-#| "using the '%s' device."
 msgid ""
 "To enable fingerprint login, you need to save one of your fingerprints, "
 "using the “%s” device."
@@ -6852,19 +6778,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:721
+#: panels/user-accounts/um-fingerprint-dialog.c:718
 msgid "Selecting finger"
 msgstr "Selecting finger"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:722
+#: panels/user-accounts/um-fingerprint-dialog.c:719
 msgid "Enrolling fingerprints"
 msgstr "Enrolling fingerprints"
 
-#: ../panels/user-accounts/um-history-dialog.c:70
+#: panels/user-accounts/um-history-dialog.c:70
 msgid "This Week"
 msgstr "This Week"
 
-#: ../panels/user-accounts/um-history-dialog.c:73
+#: panels/user-accounts/um-history-dialog.c:73
 msgid "Last Week"
 msgstr "Last Week"
 
@@ -6872,22 +6798,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:79
-#: ../panels/user-accounts/um-history-dialog.c:83
+#: 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:88
+#: 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:93
+#: panels/user-accounts/um-history-dialog.c:93
 #, c-format
 msgctxt "login history week label"
 msgid "%s — %s"
@@ -6895,124 +6821,104 @@ 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:177
-#: ../panels/user-accounts/um-user-panel.c:776
+#: panels/user-accounts/um-history-dialog.c:177
+#: panels/user-accounts/um-user-panel.c:767
 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:180
-#: ../panels/user-accounts/um-user-panel.c:780
+#: panels/user-accounts/um-history-dialog.c:180
+#: panels/user-accounts/um-user-panel.c:771
 #, c-format
 msgctxt "login date-time"
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../panels/user-accounts/um-history-dialog.c:250
+#: panels/user-accounts/um-history-dialog.c:250
 msgid "Session Ended"
 msgstr "Session Ended"
 
-#: ../panels/user-accounts/um-history-dialog.c:256
+#: panels/user-accounts/um-history-dialog.c:256
 msgid "Session Started"
 msgstr "Session Started"
 
 #. 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
+#: panels/user-accounts/um-history-dialog.c:299
 #, c-format
-#| msgid "%s - Account Activity"
 msgid "%s — Account Activity"
 msgstr "%s — Account Activity"
 
-#: ../panels/user-accounts/um-password-dialog.c:144
+#: panels/user-accounts/um-password-dialog.c:144
 msgid "Please choose another password."
 msgstr "Please choose another password."
 
-#: ../panels/user-accounts/um-password-dialog.c:153
+#: panels/user-accounts/um-password-dialog.c:153
 msgid "Please type your current password again."
 msgstr "Please type your current password again."
 
-#: ../panels/user-accounts/um-password-dialog.c:159
+#: panels/user-accounts/um-password-dialog.c:159
 msgid "Password could not be changed"
 msgstr "Password could not be changed"
 
-#: ../panels/user-accounts/um-password-dialog.c:285
+#: panels/user-accounts/um-password-dialog.c:285
 msgid "The passwords do not match."
 msgstr "The passwords do not match."
 
-#: ../panels/user-accounts/um-photo-dialog.c:218
+#: panels/user-accounts/um-photo-dialog.c:226
 msgid "Browse for more pictures"
 msgstr "Browse for more pictures"
 
-#: ../panels/user-accounts/um-photo-dialog.c:452
-msgid "Disable image"
-msgstr "Disable image"
-
-#: ../panels/user-accounts/um-photo-dialog.c:470
-msgid "Take a photo…"
-msgstr "Take a photo…"
-
-#: ../panels/user-accounts/um-photo-dialog.c:488
-msgid "Browse for more pictures…"
-msgstr "Browse for more pictures…"
-
-#: ../panels/user-accounts/um-photo-dialog.c:714
-#, c-format
-msgid "Used by %s"
-msgstr "Used by %s"
-
-#: ../panels/user-accounts/um-realm-manager.c:350
+#: 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:413
+#: 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:815
-#: ../panels/user-accounts/um-realm-manager.c:829
+#: 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:821
+#: 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:834
+#: panels/user-accounts/um-realm-manager.c:834
 #, c-format
-#| msgid "Couldn't connect to the %s domain: %s"
 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:195
-#| msgid "Add account"
+#: panels/user-accounts/um-user-panel.c:201
 msgid "Your account"
 msgstr "Your account"
 
-#: ../panels/user-accounts/um-user-panel.c:390
+#: panels/user-accounts/um-user-panel.c:381
 msgid "Failed to delete user"
 msgstr "Failed to delete user"
 
-#: ../panels/user-accounts/um-user-panel.c:448
-#: ../panels/user-accounts/um-user-panel.c:507
-#: ../panels/user-accounts/um-user-panel.c:559
+#: panels/user-accounts/um-user-panel.c:439
+#: panels/user-accounts/um-user-panel.c:498
+#: panels/user-accounts/um-user-panel.c:550
 msgid "Failed to revoke remotely managed user"
 msgstr "Failed to revoke remotely managed user"
 
-#: ../panels/user-accounts/um-user-panel.c:613
+#: panels/user-accounts/um-user-panel.c:604
 msgid "You cannot delete your own account."
 msgstr "You cannot delete your own account."
 
-#: ../panels/user-accounts/um-user-panel.c:622
+#: panels/user-accounts/um-user-panel.c:613
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s is still logged in"
 
-#: ../panels/user-accounts/um-user-panel.c:626
+#: panels/user-accounts/um-user-panel.c:617
 msgid ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
@@ -7020,13 +6926,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:635
+#: panels/user-accounts/um-user-panel.c:626
 #, c-format
-#| msgid "Do you want to keep %s's files?"
 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:639
+#: panels/user-accounts/um-user-panel.c:630
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
@@ -7034,48 +6939,47 @@ 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:642
+#: panels/user-accounts/um-user-panel.c:633
 msgid "_Delete Files"
 msgstr "_Delete Files"
 
-#: ../panels/user-accounts/um-user-panel.c:643
+#: panels/user-accounts/um-user-panel.c:634
 msgid "_Keep Files"
 msgstr "_Keep Files"
 
-#: ../panels/user-accounts/um-user-panel.c:657
+#: panels/user-accounts/um-user-panel.c:648
 #, c-format
-#| msgid "Are you sure you want to revoke remotely managed %s's 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:661
+#: panels/user-accounts/um-user-panel.c:652
 msgid "_Delete"
 msgstr "_Delete"
 
-#: ../panels/user-accounts/um-user-panel.c:711
+#: panels/user-accounts/um-user-panel.c:702
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "Account disabled"
 
-#: ../panels/user-accounts/um-user-panel.c:719
+#: panels/user-accounts/um-user-panel.c:710
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "To be set at next login"
 
-#: ../panels/user-accounts/um-user-panel.c:722
+#: panels/user-accounts/um-user-panel.c:713
 msgctxt "Password mode"
 msgid "None"
 msgstr "None"
 
-#: ../panels/user-accounts/um-user-panel.c:769
+#: panels/user-accounts/um-user-panel.c:760
 msgid "Logged in"
 msgstr "Logged in"
 
-#: ../panels/user-accounts/um-user-panel.c:1117
+#: panels/user-accounts/um-user-panel.c:1107
 msgid "Failed to contact the accounts service"
 msgstr "Failed to contact the accounts service"
 
-#: ../panels/user-accounts/um-user-panel.c:1119
+#: panels/user-accounts/um-user-panel.c:1109
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "Please make sure that the AccountService is installed and enabled."
 
@@ -7083,7 +6987,7 @@ msgstr "Please make sure that the AccountService is installed and enabled."
 #. * We split the line in 2 here to "make it look good", as there's
 #. * no good way to do this in GTK+ for tooltips. See:
 #. * https://bugzilla.gnome.org/show_bug.cgi?id=657168
-#: ../panels/user-accounts/um-user-panel.c:1155
+#: panels/user-accounts/um-user-panel.c:1141
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -7091,12 +6995,12 @@ msgstr ""
 "To make changes,\n"
 "click the * icon first"
 
-#: ../panels/user-accounts/um-user-panel.c:1195
+#: panels/user-accounts/um-user-panel.c:1181
 msgid "Create a user account"
 msgstr "Create a user account"
 
-#: ../panels/user-accounts/um-user-panel.c:1206
-#: ../panels/user-accounts/um-user-panel.c:1385
+#: panels/user-accounts/um-user-panel.c:1192
+#: panels/user-accounts/um-user-panel.c:1371
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -7104,12 +7008,12 @@ msgstr ""
 "To create a user account,\n"
 "click the * icon first"
 
-#: ../panels/user-accounts/um-user-panel.c:1216
+#: panels/user-accounts/um-user-panel.c:1202
 msgid "Delete the selected user account"
 msgstr "Delete the selected user account"
 
-#: ../panels/user-accounts/um-user-panel.c:1228
-#: ../panels/user-accounts/um-user-panel.c:1390
+#: panels/user-accounts/um-user-panel.c:1214
+#: panels/user-accounts/um-user-panel.c:1376
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -7117,22 +7021,20 @@ msgstr ""
 "To delete the selected user account,\n"
 "click the * icon first"
 
-#: ../panels/user-accounts/um-utils.c:507
-#| msgid "Sorry, that user name isn't available. Please try another."
+#: panels/user-accounts/um-utils.c:496
 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:510
+#: panels/user-accounts/um-utils.c:499
 #, c-format
 msgid "The username is too long."
 msgstr "The username is too long."
 
-#: ../panels/user-accounts/um-utils.c:513
-#| msgid "The username cannot start with a '-'."
+#: panels/user-accounts/um-utils.c:502
 msgid "The username cannot start with a “-”."
 msgstr "The username cannot start with a “-”."
 
-#: ../panels/user-accounts/um-utils.c:516
+#: panels/user-accounts/um-utils.c:505
 msgid ""
 "The username should only consist of upper and lower case letters from a-z, "
 "digits and the following characters: . - _"
@@ -7140,29 +7042,24 @@ msgstr ""
 "The username should only consist of upper and lower case letters from a-z, "
 "digits and the following characters: . - _"
 
-#: ../panels/user-accounts/um-utils.c:520
-#| msgid "This will be used to name your home folder and can't be changed."
+#: panels/user-accounts/um-utils.c:509
 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
+#: panels/wacom/button-mapping.ui:9
 msgid "Map Buttons"
 msgstr "Map Buttons"
 
-#: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:547
-#: ../panels/wacom/gnome-wacom-properties.ui.h:5
+#: panels/wacom/button-mapping.ui:37 panels/wacom/cc-wacom-page.c:547
+#: panels/wacom/gnome-wacom-properties.ui:60
 msgid "_Close"
 msgstr "_Close"
 
-#: ../panels/wacom/button-mapping.ui.h:3
+#: panels/wacom/button-mapping.ui:71
 msgid "Map buttons to functions"
 msgstr "Map buttons to functions"
 
-#: ../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."
+#: panels/wacom/button-mapping.ui:119
 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."
@@ -7170,7 +7067,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:83
+#: panels/wacom/calibrator/calibrator-gui.c:83
 msgid ""
 "Please tap the target markers as they appear on screen to calibrate the "
 "tablet."
@@ -7178,234 +7075,210 @@ msgstr ""
 "Please tap the target markers as they appear on screen to calibrate the "
 "tablet."
 
-#: ../panels/wacom/calibrator/calibrator-gui.c:87
-#| msgid "Mis-click detected, restarting..."
+#: panels/wacom/calibrator/calibrator-gui.c:87
 msgid "Mis-click detected, restarting…"
 msgstr "Mis-click detected, restarting…"
 
-#: ../panels/wacom/cc-wacom-button-row.c:266
+#: panels/wacom/cc-wacom-button-row.c:266
 #, c-format
-#| msgid "Button"
 msgid "Button %d"
 msgstr "Button %d"
 
-#: ../panels/wacom/cc-wacom-button-row.h:53
-#| msgid "Applications"
+#: panels/wacom/cc-wacom-button-row.h:53
 msgctxt "Wacom action-type"
 msgid "Application defined"
 msgstr "Application defined"
 
-#: ../panels/wacom/cc-wacom-button-row.h:54
+#: panels/wacom/cc-wacom-button-row.h:54
 msgctxt "Wacom action-type"
 msgid "Send Keystroke"
 msgstr "Send Keystroke"
 
-#: ../panels/wacom/cc-wacom-button-row.h:55
+#: panels/wacom/cc-wacom-button-row.h:55
 msgctxt "Wacom action-type"
 msgid "Switch Monitor"
 msgstr "Switch Monitor"
 
-#: ../panels/wacom/cc-wacom-button-row.h:56
+#: panels/wacom/cc-wacom-button-row.h:56
 msgctxt "Wacom action-type"
 msgid "Show On-Screen Help"
 msgstr "Show On-Screen Help"
 
-#: ../panels/wacom/cc-wacom-mapping-panel.c:260
+#: panels/wacom/cc-wacom-mapping-panel.c:260
 msgid "Output:"
 msgstr "Output:"
 
 #. Keep ratio switch
-#: ../panels/wacom/cc-wacom-mapping-panel.c:272
+#: panels/wacom/cc-wacom-mapping-panel.c:272
 msgid "Keep aspect ratio (letterbox):"
 msgstr "Keep aspect ratio (letterbox):"
 
 #. Whole-desktop checkbox
-#: ../panels/wacom/cc-wacom-mapping-panel.c:283
+#: panels/wacom/cc-wacom-mapping-panel.c:283
 msgid "Map to single monitor"
 msgstr "Map to single monitor"
 
-#: ../panels/wacom/cc-wacom-nav-button.c:86
+#: panels/wacom/cc-wacom-nav-button.c:86
 #, c-format
 msgid "%d of %d"
 msgstr "%d of %d"
 
-#: ../panels/wacom/cc-wacom-page.c:544
+#: panels/wacom/cc-wacom-page.c:544
 msgid "Display Mapping"
 msgstr "Display Mapping"
 
-#: ../panels/wacom/cc-wacom-panel.c:790
-#: ../panels/wacom/wacom-stylus-page.ui.h:9
+#: panels/wacom/cc-wacom-panel.c:790 panels/wacom/wacom-stylus-page.ui:127
 msgid "Stylus"
 msgstr "Stylus"
 
-#: ../panels/wacom/cc-wacom-stylus-page.c:347
+#: panels/wacom/cc-wacom-stylus-page.c:362
 msgid "Button"
 msgstr "Button"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2
-msgid "Wa­com Tab­let"
-msgstr "Wa­com Tab­let"
+#: panels/wacom/gnome-wacom-panel.desktop.in.in:3
+#: panels/wacom/gnome-wacom-properties.ui:198
+msgid "Wacom Tablet"
+msgstr "Wacom Tablet"
 
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3
+#: panels/wacom/gnome-wacom-panel.desktop.in.in:4
 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets"
 msgstr "Set button mappings and adjust stylus sensitivity for graphics tablets"
 
+#: panels/wacom/gnome-wacom-panel.desktop.in.in:6
+msgid "input-tablet"
+msgstr "input-tablet"
+
 #. Translators: those are keywords for the wacom tablet control-center panel
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5
+#: panels/wacom/gnome-wacom-panel.desktop.in.in:18
 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;"
 msgstr "Tablet;Wacom;Stylus;Eraser;Mouse;"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:1
+#: panels/wacom/gnome-wacom-properties.ui:15
 msgid "Tablet (absolute)"
 msgstr "Tablet (absolute)"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:2
+#: panels/wacom/gnome-wacom-properties.ui:19
 msgid "Touchpad (relative)"
 msgstr "Touchpad (relative)"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:3
+#: panels/wacom/gnome-wacom-properties.ui:27
 msgid "Tablet Preferences"
 msgstr "Tablet Preferences"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:4
+#: panels/wacom/gnome-wacom-properties.ui:44
 msgid "_Help"
 msgstr "_Help"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:6
+#: panels/wacom/gnome-wacom-properties.ui:123
 msgid "No tablet detected"
 msgstr "No tablet detected"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:7
+#: panels/wacom/gnome-wacom-properties.ui:139
 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:8
+#: panels/wacom/gnome-wacom-properties.ui:159
 msgid "Bluetooth Settings"
 msgstr "Bluetooth Settings"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:9
-msgid "Wacom Tablet"
-msgstr "Wacom Tablet"
-
-#: ../panels/wacom/gnome-wacom-properties.ui.h:10
+#: panels/wacom/gnome-wacom-properties.ui:231
 msgid "Map to Monitor…"
 msgstr "Map to Monitor…"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:11
+#: panels/wacom/gnome-wacom-properties.ui:247
 msgid "Map Buttons…"
 msgstr "Map Buttons…"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:12
+#: panels/wacom/gnome-wacom-properties.ui:263
 msgid "Calibrate…"
 msgstr "Calibrate…"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:13
+#: panels/wacom/gnome-wacom-properties.ui:284
 msgid "Adjust display resolution"
 msgstr "Adjust display resolution"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:14
+#: panels/wacom/gnome-wacom-properties.ui:300
 msgid "Adjust mouse settings"
 msgstr "Adjust mouse settings"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:15
+#: panels/wacom/gnome-wacom-properties.ui:328
 msgid "Tracking Mode"
 msgstr "Tracking Mode"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:16
+#: panels/wacom/gnome-wacom-properties.ui:356
 msgid "Left-Handed Orientation"
 msgstr "Left-Handed Orientation"
 
-#: ../panels/wacom/gsd-wacom-key-shortcut-button.c:263
+#: panels/wacom/gsd-wacom-key-shortcut-button.c:263
 msgid "New shortcut…"
 msgstr "New shortcut…"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:2
+#: panels/wacom/wacom-stylus-page.ui:29
 msgid "Middle Mouse Button Click"
 msgstr "Middle Mouse Button Click"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:3
+#: panels/wacom/wacom-stylus-page.ui:33
 msgid "Right Mouse Button Click"
 msgstr "Right Mouse Button Click"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:4
+#: panels/wacom/wacom-stylus-page.ui:37
 msgid "Back"
 msgstr "Back"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:5
+#: panels/wacom/wacom-stylus-page.ui:41
 msgid "Forward"
 msgstr "Forward"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:6
-#| msgid "No languages found"
+#: panels/wacom/wacom-stylus-page.ui:77
 msgid "No stylus found"
 msgstr "No stylus found"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:7
+#: panels/wacom/wacom-stylus-page.ui:91
 msgid "Please move your stylus to the proximity of the tablet to configure it"
 msgstr "Please move your stylus to the proximity of the tablet to configure it"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:10
+#: panels/wacom/wacom-stylus-page.ui:167
 msgid "Eraser Pressure Feel"
 msgstr "Eraser Pressure Feel"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:11
+#: panels/wacom/wacom-stylus-page.ui:188 panels/wacom/wacom-stylus-page.ui:348
 msgid "Soft"
 msgstr "Soft"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:12
+#: panels/wacom/wacom-stylus-page.ui:218 panels/wacom/wacom-stylus-page.ui:378
 msgid "Firm"
 msgstr "Firm"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:13
+#: panels/wacom/wacom-stylus-page.ui:241
 msgid "Top Button"
 msgstr "Top Button"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:14
+#: panels/wacom/wacom-stylus-page.ui:270
 msgid "Lower Button"
 msgstr "Lower Button"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:15
+#: panels/wacom/wacom-stylus-page.ui:299
+#| msgid "Lower Button"
+msgid "Lowest Button"
+msgstr "Lowest Button"
+
+#: panels/wacom/wacom-stylus-page.ui:328
 msgid "Tip Pressure Feel"
 msgstr "Tip Pressure Feel"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:17
+#: panels/wacom/wacom-stylus-page.ui:440
 msgid "page 3"
 msgstr "page 3"
 
-#: ../shell/alt/cc-window.c:53 ../shell/alt/cc-window.c:1484
-#: ../shell/cc-window.c:730
-msgid "All Settings"
-msgstr "All Settings"
-
-#. Add categories
-#: ../shell/alt/cc-window.c:875
-msgctxt "category"
-msgid "Personal"
-msgstr "Personal"
-
-#: ../shell/alt/cc-window.c:876
-msgctxt "category"
-msgid "Hardware"
-msgstr "Hardware"
-
-#: ../shell/alt/cc-window.c:877
-msgctxt "category"
-msgid "System"
-msgstr "System"
-
-#: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1
+#: shell/appdata/gnome-control-center.appdata.xml.in:7
 msgid "GNOME Control Center"
 msgstr "GNOME Control Center"
 
-#: ../shell/appdata/gnome-control-center.appdata.xml.in.h:2
+#: shell/appdata/gnome-control-center.appdata.xml.in:8
 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."
+#: shell/appdata/gnome-control-center.appdata.xml.in:10
 msgid ""
 "The control center is GNOME’s main interface for configuration of various "
 "aspects of your desktop."
@@ -7413,91 +7286,210 @@ msgstr ""
 "The control centre is GNOME’s main interface for configuration of various "
 "aspects of your desktop."
 
-#: ../shell/cc-application.c:45
+#: shell/cc-application.c:47
 msgid "Display version number"
 msgstr "Display version number"
 
-#: ../shell/cc-application.c:46
+#: shell/cc-application.c:48
 msgid "Enable verbose mode"
 msgstr "Enable verbose mode"
 
-#: ../shell/cc-application.c:47
+#: shell/cc-application.c:49
 msgid "Show the overview"
 msgstr "Show the overview"
 
-#: ../shell/cc-application.c:48
+#: shell/cc-application.c:50
 msgid "Search for the string"
 msgstr "Search for the string"
 
-#: ../shell/cc-application.c:49
+#: shell/cc-application.c:51
 msgid "List possible panel names and exit"
 msgstr "List possible panel names and exit"
 
-#: ../shell/cc-application.c:50
+#: shell/cc-application.c:52
 msgid "Panel to display"
 msgstr "Panel to display"
 
-#: ../shell/cc-application.c:50
+#: shell/cc-application.c:52
 msgid "[PANEL] [ARGUMENT…]"
 msgstr "[PANEL] [ARGUMENT…]"
 
-#: ../shell/cc-application.c:113
+#: shell/cc-application.c:117
 msgid "Available panels:"
 msgstr "Available panels:"
 
-#: ../shell/cc-application.c:252
+#: shell/cc-application.c:256
 msgid "Help"
 msgstr "Help"
 
-#: ../shell/cc-application.c:253
+#: shell/cc-application.c:257
 msgid "Quit"
 msgstr "Quit"
 
-#: ../shell/gnome-control-center.desktop.in.in.h:2
+#: shell/gnome-control-center.desktop.in.in:4
+msgid "gnome-control-center"
+msgstr "gnome-control-center"
+
+#: shell/gnome-control-center.desktop.in.in:15
 msgid "Preferences;Settings;"
 msgstr "Preferences;Settings;"
 
-#: ../shell/help-overlay.ui.h:1
+#: shell/help-overlay.ui:15
 msgctxt "shortcut window"
 msgid "General"
 msgstr "General"
 
-#: ../shell/help-overlay.ui.h:2
+#: shell/help-overlay.ui:20
 msgctxt "shortcut window"
 msgid "Quit"
 msgstr "Quit"
 
-#: ../shell/help-overlay.ui.h:3
+#: shell/help-overlay.ui:27 shell/help-overlay.ui:48
 msgctxt "shortcut window"
 msgid "Search"
 msgstr "Search"
 
-#: ../shell/help-overlay.ui.h:4
+#: shell/help-overlay.ui:35
 msgctxt "shortcut window"
 msgid "Panels"
 msgstr "Panels"
 
-#: ../shell/help-overlay.ui.h:5
+#: shell/help-overlay.ui:40
 msgctxt "shortcut window"
 msgid "Go back to the overview"
 msgstr "Go back to the overview"
 
-#: ../shell/help-overlay.ui.h:6
+#: shell/help-overlay.ui:53
 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
+#: shell/hostname-helper.c:189
 msgctxt "hotspot"
 msgid "Hotspot"
 msgstr "Hotspot"
 
-#: ../shell/panel-list.ui.h:3
-#| msgid "No regions found"
+#: shell/org.gnome.ControlCenter.gschema.xml:5
+msgid "The identifier for the last Settings panel to be opened"
+msgstr "The identifier for the last Settings panel to be opened"
+
+#: shell/org.gnome.ControlCenter.gschema.xml:6
+msgid ""
+"The identifier for the last Settings panel to be opened. Unrecognised values "
+"will be ignored and the first panel in the list selected."
+msgstr ""
+"The identifier for the last Settings panel to be opened. Unrecognised values "
+"will be ignored and the first panel in the list selected."
+
+#: shell/panel-list.ui:195
 msgid "No results found"
 msgstr "No results found"
 
+#: shell/window.ui:141
+msgid "All Settings"
+msgstr "All Settings"
+
+#. translators:
+#. * The number of sound outputs on a particular device
+#: subprojects/gvc/gvc-mixer-control.c:1873
+#, c-format
+msgid "%u Output"
+msgid_plural "%u Outputs"
+msgstr[0] "%u Output"
+msgstr[1] "%u Outputs"
+
+#. translators:
+#. * The number of sound inputs on a particular device
+#: subprojects/gvc/gvc-mixer-control.c:1883
+#, c-format
+msgid "%u Input"
+msgid_plural "%u Inputs"
+msgstr[0] "%u Input"
+msgstr[1] "%u Inputs"
+
+#: subprojects/gvc/gvc-mixer-control.c:2738
+msgid "System Sounds"
+msgstr "System Sounds"
+
+#~ msgid "Back­ground"
+#~ msgstr "Back­ground"
+
+#~ msgid "Blue­tooth"
+#~ msgstr "Blue­tooth"
+
+#~ msgid "Co­lor"
+#~ msgstr "Colour"
+
+#~ msgid "Section"
+#~ msgstr "Section"
+
+#~ msgid "Overview"
+#~ msgstr "Overview"
+
+#~| msgid "Default Applications"
+#~ msgid "Defa­ult Applications"
+#~ msgstr "Defa­ult Applications"
+
+#~ msgid "Ab­out"
+#~ msgstr "Ab­out"
+
+#~ msgid "De­tails"
+#~ msgstr "De­tails"
+
+#~| msgid "Removable Media"
+#~ msgid "Remo­vable Media"
+#~ msgstr "Remo­vable Media"
+
+#~ msgctxt "keybinding"
+#~ msgid "Search"
+#~ msgstr "Search"
+
+#~ msgid "Net­work"
+#~ msgstr "Net­work"
+
+#~ msgid "invalid EAP-TLS password: missing"
+#~ msgstr "invalid EAP-TLS password: missing"
+
+#~ msgid "No­ti­fi­ca­tions"
+#~ msgstr "No­ti­fi­ca­tions"
+
+#~ msgid "Po­wer"
+#~ msgstr "Po­wer"
+
+#~ msgid "Pri­va­cy"
+#~ msgstr "Pri­va­cy"
+
+#~ msgid "Sha­ring"
+#~ msgstr "Sha­ring"
+
+#~ msgid "Uni­ver­sal Access"
+#~ msgstr "Uni­ver­sal Access"
+
+#~ msgid "Disable image"
+#~ msgstr "Disable image"
+
+#~ msgid "Browse for more pictures…"
+#~ msgstr "Browse for more pictures…"
+
+#~ msgid "Used by %s"
+#~ msgstr "Used by %s"
+
+#~ msgid "Wa­com Tab­let"
+#~ msgstr "Wa­com Tab­let"
+
+#~ msgctxt "category"
+#~ msgid "Personal"
+#~ msgstr "Personal"
+
+#~ msgctxt "category"
+#~ msgid "Hardware"
+#~ msgstr "Hardware"
+
+#~ msgctxt "category"
+#~ msgid "System"
+#~ msgstr "System"
+
 #~ msgid "Lid Closed"
 #~ msgstr "Lid Closed"
 
@@ -7962,9 +7954,6 @@ msgstr "No results found"
 #~ "Image files can be dragged on this window to auto-complete the above "
 #~ "fields."
 
-#~ msgid "Color"
-#~ msgstr "Colour"
-
 #~ msgid "United States"
 #~ msgstr "United States"
 
@@ -8212,9 +8201,6 @@ msgstr "No results found"
 #~ msgid "When battery power is _critical"
 #~ msgstr "When battery power is _critical"
 
-#~ msgid "Power"
-#~ msgstr "Power"
-
 #~ msgid "Power off"
 #~ msgstr "Power off"
 
@@ -11747,9 +11733,6 @@ msgstr "No results found"
 #~ "\n"
 #~ " Your filter \"<b>%s</b>\" does not match any items.</span>"
 
-#~ msgid "/_About"
-#~ msgstr "/_About"
-
 #~ msgid "<b>_Wallpaper</b>"
 #~ msgstr "<b>_Wallpaper</b>"
 



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