[gnome-control-center] Update British English translation



commit 2b805db8860346d69834ed9686b8cbdd8ce84d48
Author: Bruce Cowan <bruce bcowan me uk>
Date:   Sat Mar 16 11:10:53 2019 +0000

    Update British English translation

 po/en_GB.po | 5076 +++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 2805 insertions(+), 2271 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 200d00a34..06c2da5cf 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-control-center/";
 "issues\n"
-"POT-Creation-Date: 2018-07-23 14:26+0000\n"
-"PO-Revision-Date: 2018-08-19 17:17+0100\n"
+"POT-Creation-Date: 2019-02-27 10:46+0000\n"
+"PO-Revision-Date: 2019-03-16 11:09+0000\n"
 "Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
 "Language-Team: British English <en li org>\n"
 "Language: en_GB\n"
@@ -20,9 +20,353 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.7\n"
+"X-Generator: Poedit 2.2.1\n"
 "X-Project-Style: gnome\n"
 
+#: panels/applications/cc-applications-panel.c:558
+#| msgid "System Sounds"
+msgid "System Bus"
+msgstr "System Bus"
+
+#: panels/applications/cc-applications-panel.c:558
+#: panels/applications/cc-applications-panel.c:560
+#: panels/applications/cc-applications-panel.c:576
+#: panels/applications/cc-applications-panel.c:581
+#| msgid "_Full Name"
+msgid "Full access"
+msgstr "Full access"
+
+#: panels/applications/cc-applications-panel.c:560
+#| msgid "Session Ended"
+msgid "Session Bus"
+msgstr "Session Bus"
+
+#: panels/applications/cc-applications-panel.c:565
+#: panels/power/cc-power-panel.c:2528 panels/thunderbolt/cc-bolt-panel.ui:466
+#: panels/thunderbolt/cc-bolt-panel.ui:525 shell/cc-panel-list.ui:45
+#: shell/cc-window.c:251
+msgid "Devices"
+msgstr "Devices"
+
+#: panels/applications/cc-applications-panel.c:565
+msgid "Full access to /dev"
+msgstr "Full access to /dev"
+
+#: panels/applications/cc-applications-panel.c:570
+#: panels/network/gnome-network-panel.desktop.in.in:3
+#: panels/network/network-mobile.ui:241
+msgid "Network"
+msgstr "Network"
+
+#: panels/applications/cc-applications-panel.c:570
+#| msgid "Getting network address"
+msgid "Has network access"
+msgstr "Has network access"
+
+#. translators: "Home" is used in place of the Pictures
+#. * directory in the string below when XDG_PICTURES_DIR is
+#. * undefined
+#: panels/applications/cc-applications-panel.c:576
+#: panels/applications/cc-applications-panel.c:578
+#: panels/background/cc-background-chooser-dialog.c:536
+#: panels/search/cc-search-locations-dialog.c:286
+msgid "Home"
+msgstr "Home"
+
+#: panels/applications/cc-applications-panel.c:578
+#: panels/applications/cc-applications-panel.c:583
+#| msgctxt "printer state"
+#| msgid "Ready"
+msgid "Read-only"
+msgstr "Read-only"
+
+#: panels/applications/cc-applications-panel.c:581
+#: panels/applications/cc-applications-panel.c:583
+#| msgid "Open System"
+msgid "File System"
+msgstr "File System"
+
+#: panels/applications/cc-applications-panel.c:588
+#: panels/keyboard/01-launchers.xml.in:6 shell/cc-window.c:255
+#: shell/cc-window.c:867 shell/cc-window.ui:116
+#: shell/gnome-control-center.desktop.in.in:3
+msgid "Settings"
+msgstr "Settings"
+
+#: panels/applications/cc-applications-panel.c:588
+#| msgid "Change printer settings"
+msgid "Can change settings"
+msgstr "Can change settings"
+
+#: panels/applications/cc-applications-panel.c:593
+#, c-format
+msgid ""
+"%s has the following permissions built-in. These cannot be altered. If you "
+"are concerned about these permissions, consider removing this application."
+msgstr ""
+"%s has the following permissions built-in. These cannot be altered. If you "
+"are concerned about these permissions, consider removing this application."
+
+#: panels/applications/cc-applications-panel.c:735
+msgid "Web Links"
+msgstr "Web Links"
+
+#: panels/applications/cc-applications-panel.c:745
+msgid "Git Links"
+msgstr "Git Links"
+
+#: panels/applications/cc-applications-panel.c:751
+#, c-format
+msgid "%s Links"
+msgstr "%s Links"
+
+#: panels/applications/cc-applications-panel.c:759
+#: panels/applications/cc-applications-panel.c:795
+msgid "Unset"
+msgstr "Unset"
+
+#: panels/applications/cc-applications-panel.c:850
+#| msgid "Link speed"
+msgid "Links"
+msgstr "Links"
+
+#: panels/applications/cc-applications-panel.c:858
+#| msgid "_Delete Files"
+msgid "Hypertext Files"
+msgstr "Hypertext Files"
+
+#: panels/applications/cc-applications-panel.c:872
+#| msgid "_Delete Files"
+msgid "Text Files"
+msgstr "Text Files"
+
+#: panels/applications/cc-applications-panel.c:886
+#| msgid "Images"
+msgid "Image Files"
+msgstr "Image Files"
+
+#: panels/applications/cc-applications-panel.c:902
+#| msgid "Font Viewer"
+msgid "Font Files"
+msgstr "Font Files"
+
+#: panels/applications/cc-applications-panel.c:963
+#| msgid "All Files"
+msgid "Archive Files"
+msgstr "Archive Files"
+
+#: panels/applications/cc-applications-panel.c:983
+msgid "Package Files"
+msgstr "Package Files"
+
+#: panels/applications/cc-applications-panel.c:1006
+#| msgid "All Files"
+msgid "Audio Files"
+msgstr "Audio Files"
+
+#: panels/applications/cc-applications-panel.c:1023
+#| msgid "Video Player"
+msgid "Video Files"
+msgstr "Video Files"
+
+#: panels/applications/cc-applications-panel.c:1031
+#| msgid "_Delete Files"
+msgid "Other Files"
+msgstr "Other Files"
+
+#. List of applications.
+#: panels/applications/cc-applications-panel.c:1353
+#: panels/applications/cc-applications-panel.ui:406
+#: panels/applications/gnome-applications-panel.desktop.in.in:3
+#: panels/notifications/cc-notifications-panel.ui:167
+#: panels/privacy/cc-privacy-panel.ui:1085
+msgid "Applications"
+msgstr "Applications"
+
+#: panels/applications/cc-applications-panel.ui:45
+#| msgid "No applications found"
+msgid "No applications"
+msgstr "No applications"
+
+#: panels/applications/cc-applications-panel.ui:59
+#| msgid "Install PPD File…"
+msgid "Install some…"
+msgstr "Install some…"
+
+#: panels/applications/cc-applications-panel.ui:99
+msgid "Permissions & Access"
+msgstr "Permissions & Access"
+
+#: panels/applications/cc-applications-panel.ui:111
+msgid ""
+"Data and services that this app has asked for access to and permissions that "
+"it requires."
+msgstr ""
+"Data and services that this app has asked for access to and permissions that "
+"it requires."
+
+#: panels/applications/cc-applications-panel.ui:126
+#: panels/applications/cc-applications-panel.ui:132
+#: panels/privacy/cc-privacy-panel.c:908 panels/privacy/cc-privacy-panel.ui:745
+#| msgid "%s Camera"
+msgid "Camera"
+msgstr "Camera"
+
+#. This label is displayed in a treeview cell displaying
+#. * a disabled accelerator key combination.
+#.
+#. translators:
+#. * The device has been disabled
+#: panels/applications/cc-applications-panel.ui:133
+#: panels/applications/cc-applications-panel.ui:145
+#: panels/applications/cc-applications-panel.ui:157
+#: panels/applications/cc-applications-panel.ui:237
+#: panels/applications/cc-applications-panel.ui:255
+#: panels/keyboard/cc-keyboard-option.c:259
+#: panels/keyboard/cc-keyboard-option.c:378
+#: panels/keyboard/keyboard-shortcuts.c:425
+#: panels/keyboard/shortcut-editor.ui:96 panels/network/network-proxy.ui:123
+#: panels/network/network-wifi.ui:781 panels/network/network-wifi.ui:1058
+#: panels/user-accounts/um-fingerprint-dialog.c:211
+#: subprojects/gvc/gvc-mixer-control.c:1864
+msgid "Disabled"
+msgstr "Disabled"
+
+#: panels/applications/cc-applications-panel.ui:138
+#: panels/applications/cc-applications-panel.ui:144
+#: panels/privacy/cc-privacy-panel.c:941 panels/privacy/cc-privacy-panel.ui:850
+#| msgid "Microphone Volume"
+msgid "Microphone"
+msgstr "Microphone"
+
+#: panels/applications/cc-applications-panel.ui:150
+#: panels/applications/cc-applications-panel.ui:156
+#: panels/privacy/cc-privacy-panel.c:850 panels/privacy/cc-privacy-panel.ui:955
+msgid "Location Services"
+msgstr "Location Services"
+
+#: panels/applications/cc-applications-panel.ui:162
+#: panels/applications/cc-applications-panel.ui:422
+#| msgid "Built-in Webcam"
+msgid "Built-in Permissions"
+msgstr "Built-in Permissions"
+
+#: panels/applications/cc-applications-panel.ui:163
+#| msgid "Password could not be changed"
+msgid "Cannot be changed"
+msgstr "Cannot be changed"
+
+#: panels/applications/cc-applications-panel.ui:180
+msgid ""
+"Individual permissions for applications can be reviewed in the <a href="
+"\"privacy\">Privacy</a> Settings."
+msgstr ""
+"Individual permissions for applications can be reviewed in the <a href="
+"\"privacy\">Privacy</a> Settings."
+
+#: panels/applications/cc-applications-panel.ui:204
+#| msgid "Orientation"
+msgid "Integration"
+msgstr "Integration"
+
+#: panels/applications/cc-applications-panel.ui:216
+#| msgid "Version of this application"
+msgid "System features used by this application."
+msgstr "System features used by this application."
+
+#: panels/applications/cc-applications-panel.ui:230
+#: panels/applications/cc-applications-panel.ui:236
+#: panels/keyboard/01-launchers.xml.in:16
+#: panels/search/gnome-search-panel.desktop.in.in:3 shell/cc-window.ui:146
+msgid "Search"
+msgstr "Search"
+
+#: panels/applications/cc-applications-panel.ui:242
+#: panels/notifications/gnome-notifications-panel.desktop.in.in:3
+msgid "Notifications"
+msgstr "Notifications"
+
+#: panels/applications/cc-applications-panel.ui:248
+#: panels/applications/cc-applications-panel.ui:254
+msgid "Sounds"
+msgstr "Sounds"
+
+#: panels/applications/cc-applications-panel.ui:287
+#| msgid "_Default printer"
+msgid "Default Handlers"
+msgstr "Default Handlers"
+
+#: panels/applications/cc-applications-panel.ui:299
+msgid "Types of files and links that this application opens."
+msgstr "Types of files and links that this application opens."
+
+#: panels/applications/cc-applications-panel.ui:315
+#| msgctxt "tab"
+#| msgid "Reset"
+msgid "Reset"
+msgstr "Reset"
+
+#: panels/applications/cc-applications-panel.ui:351
+msgid "Usage"
+msgstr "Usage"
+
+#: panels/applications/cc-applications-panel.ui:363
+msgid "How much resources this application is using."
+msgstr "How much resources this application is using."
+
+#: panels/applications/cc-applications-panel.ui:378
+#: panels/applications/cc-applications-panel.ui:458
+msgid "Storage"
+msgstr "Storage"
+
+#: panels/applications/cc-applications-panel.ui:413
+#| msgid "_Software"
+msgid "Open in Software"
+msgstr "Open in Software"
+
+#: panels/applications/cc-applications-panel.ui:475
+msgid ""
+"How much disk space this application is occupying with app data and caches."
+msgstr ""
+"How much disk space this application is occupying with app data and caches."
+
+#: panels/applications/cc-applications-panel.ui:484
+#| msgid "Applications"
+msgid "Application"
+msgstr "Application"
+
+#: panels/applications/cc-applications-panel.ui:490
+msgid "Data"
+msgstr "Data"
+
+#: panels/applications/cc-applications-panel.ui:496
+msgid "Cache"
+msgstr "Cache"
+
+#: panels/applications/cc-applications-panel.ui:502
+#| msgid "<b>Email</b>"
+msgid "<b>Total</b>"
+msgstr "<b>Total</b>"
+
+#: panels/applications/cc-applications-panel.ui:519
+msgid "Clear Cache…"
+msgstr "Clear Cache…"
+
+#: panels/applications/gnome-applications-panel.desktop.in.in:4
+msgid "Control various application permissions and settings"
+msgstr "Control various application permissions and settings"
+
+#. FIXME
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/applications/gnome-applications-panel.desktop.in.in:8
+msgid "application-x-executable"
+msgstr "application-x-executable"
+
+#. Translators: Search terms to find the Privacy panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/applications/gnome-applications-panel.desktop.in.in:16
+msgid "application;flatpak;permission;setting;"
+msgstr "application;flatpak;permission;setting;"
+
 #: panels/background/background.ui:49
 msgid "_Background"
 msgstr "_Background"
@@ -67,71 +411,64 @@ msgctxt "background, style"
 msgid "Span"
 msgstr "Span"
 
-#: panels/background/cc-background-chooser-dialog.c:424
+#: panels/background/cc-background-chooser-dialog.c:412
 msgid "Wallpapers"
 msgstr "Wallpapers"
 
-#: panels/background/cc-background-chooser-dialog.c:433
+#: panels/background/cc-background-chooser-dialog.c:423
 msgid "Colors"
 msgstr "Colours"
 
 #. translators: This is the title of the wallpaper chooser dialog.
-#: panels/background/cc-background-chooser-dialog.c:468
+#: panels/background/cc-background-chooser-dialog.c:455
 msgid "Select Background"
 msgstr "Select Background"
 
-#: panels/background/cc-background-chooser-dialog.c:496
+#: panels/background/cc-background-chooser-dialog.c:484
 msgid "Pictures"
 msgstr "Pictures"
 
 #. translators: No pictures were found
-#: panels/background/cc-background-chooser-dialog.c:528
+#: panels/background/cc-background-chooser-dialog.c:519
 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:545
-#: panels/search/cc-search-locations-dialog.c:286
-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:555
+#: panels/background/cc-background-chooser-dialog.c:546
 #, 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:560
-#: panels/color/cc-color-panel.c:240 panels/color/cc-color-panel.c:893
-#: panels/color/color-calibrate.ui:25 panels/color/color.ui:657
-#: panels/common/cc-language-chooser.ui:22
-#: panels/display/cc-display-panel.c:1896
-#: panels/network/connection-editor/connection-editor.ui:15
+#: panels/background/cc-background-chooser-dialog.c:550
+#: panels/color/cc-color-panel.c:241 panels/color/cc-color-panel.c:894
+#: panels/color/cc-color-panel.ui:657 panels/color/color-calibrate.ui:25
+#: panels/common/cc-language-chooser.ui:24
+#: panels/display/cc-display-panel.c:880
+#: panels/network/connection-editor/connection-editor.ui:17
 #: panels/network/connection-editor/vpn-helpers.c:181
 #: panels/network/connection-editor/vpn-helpers.c:310
-#: panels/network/net-device-wifi.c:1411 panels/network/net-device-wifi.c:1491
-#: panels/network/net-device-wifi.c:1736 panels/network/network-wifi.ui:24
+#: panels/network/net-device-wifi.c:1200 panels/network/net-device-wifi.c:1280
+#: panels/network/net-device-wifi.c:1474 panels/network/network-wifi.ui:24
 #: panels/printers/new-printer-dialog.ui:45
-#: panels/printers/pp-details-dialog.c:330
-#: panels/privacy/cc-privacy-panel.c:1049 panels/region/cc-format-chooser.ui:24
-#: panels/region/input-chooser.ui:13
-#: panels/search/cc-search-locations-dialog.c:603
-#: panels/sharing/cc-sharing-panel.c:426
-#: panels/user-accounts/data/account-dialog.ui:28
+#: panels/printers/pp-details-dialog.c:313
+#: panels/privacy/cc-privacy-panel.c:1137 panels/region/cc-format-chooser.ui:24
+#: panels/region/cc-input-chooser.ui:11
+#: panels/search/cc-search-locations-dialog.c:607
+#: panels/sharing/cc-sharing-panel.c:427
+#: panels/user-accounts/cc-add-user-dialog.ui:28
+#: panels/user-accounts/cc-avatar-chooser.c:105
+#: panels/user-accounts/cc-avatar-chooser.c:233
+#: panels/user-accounts/cc-password-dialog.ui:20
+#: panels/user-accounts/cc-user-panel.c:640
+#: panels/user-accounts/cc-user-panel.c:658
 #: 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:103
-#: panels/user-accounts/um-photo-dialog.c:230
-#: panels/user-accounts/um-user-panel.c:631
-#: panels/user-accounts/um-user-panel.c:649
 msgid "_Cancel"
 msgstr "_Cancel"
 
-#: panels/background/cc-background-chooser-dialog.c:561
+#: panels/background/cc-background-chooser-dialog.c:551
+#: panels/common/cc-language-chooser.ui:12
 msgid "_Select"
 msgstr "_Select"
 
@@ -172,46 +509,46 @@ msgstr "preferences-desktop-wallpaper"
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "Wallpaper;Screen;Desktop;"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:266
-msgid "Turn Off Airplane Mode"
-msgstr "Turn Off Aeroplane Mode"
-
-#: panels/bluetooth/cc-bluetooth-panel.c:329
+#: panels/bluetooth/cc-bluetooth-panel.c:309
 msgid "No Bluetooth Found"
 msgstr "No Bluetooth Found"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:329
+#: panels/bluetooth/cc-bluetooth-panel.c:310
 msgid "Plug in a dongle to use Bluetooth."
 msgstr "Plug in a dongle to use Bluetooth."
 
-#: panels/bluetooth/cc-bluetooth-panel.c:330
+#: panels/bluetooth/cc-bluetooth-panel.c:313
 msgid "Bluetooth Turned Off"
 msgstr "Bluetooth Turned Off"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:330
+#: panels/bluetooth/cc-bluetooth-panel.c:314
 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:331
+#: panels/bluetooth/cc-bluetooth-panel.c:317
 msgid "Airplane Mode is on"
 msgstr "Aeroplane Mode is on"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:331
+#: panels/bluetooth/cc-bluetooth-panel.c:318
 msgid "Bluetooth is disabled when airplane mode is on."
 msgstr "Bluetooth is disabled when aeroplane mode is on."
 
-#: panels/bluetooth/cc-bluetooth-panel.c:332
+#: panels/bluetooth/cc-bluetooth-panel.c:321
 msgid "Hardware Airplane Mode is on"
 msgstr "Hardware Aeroplane Mode is on"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:332
+#: panels/bluetooth/cc-bluetooth-panel.c:322
 msgid "Turn off the Airplane mode switch to enable Bluetooth."
 msgstr "Turn off the Aeroplane mode switch to enable Bluetooth."
 
+#: panels/bluetooth/cc-bluetooth-panel.c:324
+msgid "Turn Off Airplane Mode"
+msgstr "Turn Off Aeroplane Mode"
+
 #. Translators: The found device is a printer connected via Bluetooth
 #: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:3
 #: panels/network/cc-network-panel.ui:101
-#: panels/printers/pp-new-printer-dialog.c:1831
+#: panels/printers/pp-new-printer-dialog.c:1697
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -230,14 +567,14 @@ 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:350
+#: panels/color/cc-color-calibrate.c:348
 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:356
+#: panels/color/cc-color-calibrate.c:354
 msgid ""
 "Move your calibration device to the calibrate position and press “Continue”"
 msgstr ""
@@ -246,7 +583,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:362
+#: panels/color/cc-color-calibrate.c:360
 msgid ""
 "Move your calibration device to the surface position and press “Continue”"
 msgstr ""
@@ -255,54 +592,54 @@ msgstr ""
 #. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor
 #. * is built into the palmrest and we need to fullscreen the
 #. * sample widget and shut the lid.
-#: panels/color/cc-color-calibrate.c:368
+#: panels/color/cc-color-calibrate.c:366
 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:399
+#: panels/color/cc-color-calibrate.c:397
 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:404
+#: panels/color/cc-color-calibrate.c:402
 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:410
+#: panels/color/cc-color-calibrate.c:408
 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:416
+#: panels/color/cc-color-calibrate.c:414
 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:455
+#: panels/color/cc-color-calibrate.c:453
 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:463
+#: panels/color/cc-color-calibrate.c:461
 msgid "Calibration failed!"
 msgstr "Calibration failed!"
 
 #. TRANSLATORS: The user can now remove the sensor from the screen
-#: panels/color/cc-color-calibrate.c:470
+#: panels/color/cc-color-calibrate.c:468
 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:539
+#: panels/color/cc-color-calibrate.c:537
 msgid "Do not disturb the calibration device while in progress"
 msgstr "Do not disturb the calibration device while in progress"
 
@@ -358,54 +695,54 @@ msgid "Show color profiles for %s"
 msgstr "Show colour profiles for %s"
 
 #. not calibrated
-#: panels/color/cc-color-device.c:301
+#: panels/color/cc-color-device.c:303
 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:169
+#: panels/color/cc-color-panel.c:170
 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:177
+#: panels/color/cc-color-panel.c:178
 msgid "Colorspace: "
 msgstr "Colourspace: "
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile is a test profile
-#: panels/color/cc-color-panel.c:184
+#: panels/color/cc-color-panel.c:185
 msgid "Test profile: "
 msgstr "Test profile: "
 
 #. TRANSLATORS: an ICC profile is a file containing colorspace data
-#: panels/color/cc-color-panel.c:238
+#: panels/color/cc-color-panel.c:239
 msgid "Select ICC Profile File"
 msgstr "Select ICC Profile File"
 
-#: panels/color/cc-color-panel.c:241
+#: panels/color/cc-color-panel.c:242
 msgid "_Import"
 msgstr "_Import"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: panels/color/cc-color-panel.c:252
+#: panels/color/cc-color-panel.c:253
 msgid "Supported ICC profiles"
 msgstr "Supported ICC profiles"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: panels/color/cc-color-panel.c:259
+#: panels/color/cc-color-panel.c:260
 #: panels/network/wireless-security/eap-method-fast.c:417
 msgid "All files"
 msgstr "All files"
 
-#: panels/color/cc-color-panel.c:554
+#: panels/color/cc-color-panel.c:555
 msgid "Screen"
 msgstr "Screen"
 
 #. TRANSLATORS: this is when the upload of the profile failed
-#: panels/color/cc-color-panel.c:846
+#: panels/color/cc-color-panel.c:847
 #, c-format
 msgid "Failed to upload file: %s"
 msgstr "Failed to upload file: %s"
@@ -413,39 +750,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:858
+#: panels/color/cc-color-panel.c:859
 msgid "The profile has been uploaded to:"
 msgstr "The profile has been uploaded to:"
 
-#: panels/color/cc-color-panel.c:860
+#: panels/color/cc-color-panel.c:861
 msgid "Write down this URL."
 msgstr "Write down this URL."
 
-#: panels/color/cc-color-panel.c:861
+#: panels/color/cc-color-panel.c:862
 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:862
+#: panels/color/cc-color-panel.c:863
 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:890
+#: panels/color/cc-color-panel.c:891
 msgid "Save Profile"
 msgstr "Save Profile"
 
-#: panels/color/cc-color-panel.c:894
+#: panels/color/cc-color-panel.c:895
 #: 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:1208
+#: panels/color/cc-color-panel.c:1209
 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:1223 panels/color/cc-color-panel.c:1247
+#: panels/color/cc-color-panel.c:1224 panels/color/cc-color-panel.c:1248
 msgid ""
 "The measuring instrument is not detected. Please check it is turned on and "
 "correctly connected."
@@ -454,120 +791,20 @@ msgstr ""
 "correctly connected."
 
 #. TRANSLATORS: this is when the button is insensitive
-#: panels/color/cc-color-panel.c:1257
+#: panels/color/cc-color-panel.c:1258
 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:1268
+#: panels/color/cc-color-panel.c:1269
 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:100
-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:106
-msgid "Test Profile"
-msgstr "Test Profile"
-
-#. TRANSLATORS: automatic profiles are generated automatically
-#. * by the color management system based on manufacturing data,
-#. * for instance the default monitor profile is created from the
-#. * primaries specified in the monitor EDID
-#: panels/color/cc-color-profile.c:114
-msgctxt "Automatically generated profile"
-msgid "Automatic"
-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:124
-msgctxt "Profile quality"
-msgid "Low Quality"
-msgstr "Low Quality"
-
-#. TRANSLATORS: the profile quality
-#: panels/color/cc-color-profile.c:129
-msgctxt "Profile quality"
-msgid "Medium Quality"
-msgstr "Medium Quality"
-
-#. TRANSLATORS: the profile quality - high quality profiles take
-#. * a *long* time, and have the best calibration and
-#. * characterisation data.
-#: panels/color/cc-color-profile.c:136
-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:153
-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:160
-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:167
-msgctxt "Colorspace fallback"
-msgid "Default Gray"
-msgstr "Default Grey"
-
-#: panels/color/cc-color-profile.c:190
-msgid "Vendor supplied factory calibration data"
-msgstr "Vendor supplied factory calibration data"
-
-#: panels/color/cc-color-profile.c:199
-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:221
-msgid "This profile may no longer be accurate"
-msgstr "This profile may no longer be accurate"
-
-#: panels/color/color-calibrate.ui:7
-msgid "Display Calibration"
-msgstr "Display Calibration"
-
-#. This starts the calibration process
-#: panels/color/color-calibrate.ui:40
-msgid "_Start"
-msgstr "_Start"
-
-#. This resumes the calibration process
-#: 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:67 panels/common/cc-language-chooser.ui:11
-#: panels/region/cc-format-chooser.ui:13
-msgid "_Done"
-msgstr "_Done"
-
-#. Timeout parameters
-#. 15000 = 15 sec
-#. 750 = 0.75 sec
-#. Text printed on screen
-#: panels/color/color.ui:6 panels/wacom/calibrator/calibrator-gui.c:82
+#: panels/color/cc-color-panel.ui:6 panels/wacom/calibrator/calibrator.ui:47
 msgid "Screen Calibration"
 msgstr "Screen Calibration"
 
-#: panels/color/color.ui:23
+#: panels/color/cc-color-panel.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 "
@@ -577,43 +814,43 @@ msgstr ""
 "screen. The longer you spend on calibration, the better the quality of the "
 "colour profile."
 
-#: panels/color/color.ui:38
+#: panels/color/cc-color-panel.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:58
+#: panels/color/cc-color-panel.ui:58
 msgid "Quality"
 msgstr "Quality"
 
 #. This is the approximate time it takes to calibrate the display.
-#: panels/color/color.ui:75
+#: panels/color/cc-color-panel.ui:75
 msgid "Approximate Time"
 msgstr "Approximate Time"
 
-#: panels/color/color.ui:121
+#: panels/color/cc-color-panel.ui:121
 msgid "Calibration Quality"
 msgstr "Calibration Quality"
 
-#: panels/color/color.ui:137
+#: panels/color/cc-color-panel.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:174
+#: panels/color/cc-color-panel.ui:174
 msgid "Calibration Device"
 msgstr "Calibration Device"
 
-#: panels/color/color.ui:189
+#: panels/color/cc-color-panel.ui:189
 msgid "Select the type of display that is connected."
 msgstr "Select the type of display that is connected."
 
-#: panels/color/color.ui:226
+#: panels/color/cc-color-panel.ui:226
 msgid "Display Type"
 msgstr "Display Type"
 
-#: panels/color/color.ui:241
+#: panels/color/cc-color-panel.ui:241
 msgid ""
 "Select a display target white point. Most displays should be calibrated to a "
 "D65 illuminant."
@@ -621,11 +858,11 @@ msgstr ""
 "Select a display target white point. Most displays should be calibrated to a "
 "D65 illuminant."
 
-#: panels/color/color.ui:278
+#: panels/color/cc-color-panel.ui:278
 msgid "Profile Whitepoint"
 msgstr "Profile Whitepoint"
 
-#: panels/color/color.ui:293
+#: panels/color/cc-color-panel.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."
@@ -633,7 +870,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:307
+#: panels/color/cc-color-panel.ui:307
 msgid ""
 "Alternatively, you can use the brightness level used with one of the other "
 "profiles for this device."
@@ -641,11 +878,11 @@ msgstr ""
 "Alternatively, you can use the brightness level used with one of the other "
 "profiles for this device."
 
-#: panels/color/color.ui:318
+#: panels/color/cc-color-panel.ui:318
 msgid "Display Brightness"
 msgstr "Display Brightness"
 
-#: panels/color/color.ui:333
+#: panels/color/cc-color-panel.ui:333
 msgid ""
 "You can use a color profile on different computers, or even create profiles "
 "for different lighting conditions."
@@ -653,35 +890,35 @@ msgstr ""
 "You can use a colour profile on different computers, or even create profiles "
 "for different lighting conditions."
 
-#: panels/color/color.ui:348
+#: panels/color/cc-color-panel.ui:348
 msgid "Profile Name:"
 msgstr "Profile Name:"
 
-#: panels/color/color.ui:377
+#: panels/color/cc-color-panel.ui:377
 msgid "Profile Name"
 msgstr "Profile Name"
 
-#: panels/color/color.ui:392
+#: panels/color/cc-color-panel.ui:392
 msgid "Profile successfully created!"
 msgstr "Profile successfully created!"
 
-#: panels/color/color.ui:443
+#: panels/color/cc-color-panel.ui:443
 msgid "Copy profile"
 msgstr "Copy profile"
 
-#: panels/color/color.ui:456
+#: panels/color/cc-color-panel.ui:456
 msgid "Requires writable media"
 msgstr "Requires writeable media"
 
-#: panels/color/color.ui:519
+#: panels/color/cc-color-panel.ui:519
 msgid "Upload profile"
 msgstr "Upload profile"
 
-#: panels/color/color.ui:532
+#: panels/color/cc-color-panel.ui:532
 msgid "Requires Internet connection"
 msgstr "Requires Internet connection"
 
-#: panels/color/color.ui:591
+#: panels/color/cc-color-panel.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"
@@ -691,26 +928,28 @@ msgstr ""
 "\">GNU/Linux</a>, <a href=\"osx\">Apple OS X</a> and <a href=\"windows"
 "\">Microsoft Windows</a> systems useful."
 
-#: panels/color/color.ui:607 panels/user-accounts/um-fingerprint-dialog.c:720
+#: panels/color/cc-color-panel.ui:607
+#: panels/user-accounts/um-fingerprint-dialog.c:720
 msgid "Summary"
 msgstr "Summary"
 
-#: panels/color/color.ui:621
+#: panels/color/cc-color-panel.ui:621
 msgid "Add Profile"
 msgstr "Add Profile"
 
-#: panels/color/color.ui:643
+#: panels/color/cc-color-panel.ui:643
 msgid "_Import File…"
 msgstr "_Import File…"
 
-#: 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
+#: panels/color/cc-color-panel.ui:672
+#: panels/network/connection-editor/net-connection-editor.c:497
+#: panels/printers/new-printer-dialog.ui:80
+#: panels/region/cc-input-chooser.ui:20
+#: panels/user-accounts/cc-add-user-dialog.ui:47
 msgid "_Add"
 msgstr "_Add"
 
-#: panels/color/color.ui:732
+#: panels/color/cc-color-panel.ui:732
 msgid ""
 "Problems detected. The profile may not work correctly. <a href=\"\">Show "
 "details.</a>"
@@ -718,169 +957,263 @@ msgstr ""
 "Problems detected. The profile may not work correctly. <a href=\"\">Show "
 "details.</a>"
 
-#: panels/color/color.ui:811
+#: panels/color/cc-color-panel.ui:790
 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:833
+#: panels/color/cc-color-panel.ui:812
 msgid "Learn more"
 msgstr "Learn more"
 
-#: panels/color/color.ui:838
+#: panels/color/cc-color-panel.ui:817
 msgid "Learn more about color management"
 msgstr "Learn more about colour management"
 
-#: panels/color/color.ui:886
+#: panels/color/cc-color-panel.ui:865
 msgid "_Set for all users"
 msgstr "_Set for all users"
 
-#: panels/color/color.ui:890 panels/color/color.ui:905
-#: panels/color/color.ui:906
+#: panels/color/cc-color-panel.ui:869 panels/color/cc-color-panel.ui:884
+#: panels/color/cc-color-panel.ui:885
 msgid "Set this profile for all users on this computer"
 msgstr "Set this profile for all users on this computer"
 
-#: panels/color/color.ui:901
+#: panels/color/cc-color-panel.ui:880
 msgid "_Enable"
 msgstr "_Enable"
 
-#: panels/color/color.ui:932
+#: panels/color/cc-color-panel.ui:911
 msgid "_Add profile"
 msgstr "_Add profile"
 
-#: panels/color/color.ui:945
+#: panels/color/cc-color-panel.ui:924
 msgid "_Calibrate…"
 msgstr "_Calibrate…"
 
-#: panels/color/color.ui:949
+#: panels/color/cc-color-panel.ui:928
 msgid "Calibrate the device"
 msgstr "Calibrate the device"
 
-#: panels/color/color.ui:960
+#: panels/color/cc-color-panel.ui:939
 msgid "_Remove profile"
 msgstr "_Remove profile"
 
-#: panels/color/color.ui:973
+#: panels/color/cc-color-panel.ui:952
 msgid "_View details"
 msgstr "_View details"
 
-#: panels/color/color.ui:1009
+#: panels/color/cc-color-panel.ui:988
 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:1053
+#: panels/color/cc-color-panel.ui:1032
 msgid "LCD"
 msgstr "LCD"
 
-#: panels/color/color.ui:1058
+#: panels/color/cc-color-panel.ui:1037
 msgid "LED"
 msgstr "LED"
 
-#: panels/color/color.ui:1063
+#: panels/color/cc-color-panel.ui:1042
 msgid "CRT"
 msgstr "CRT"
 
-#: panels/color/color.ui:1068
+#: panels/color/cc-color-panel.ui:1047
 msgid "Projector"
 msgstr "Projector"
 
-#: panels/color/color.ui:1073
+#: panels/color/cc-color-panel.ui:1052
 msgid "Plasma"
 msgstr "Plasma"
 
-#: panels/color/color.ui:1078
+#: panels/color/cc-color-panel.ui:1057
 msgid "LCD (CCFL backlight)"
 msgstr "LCD (CCFL backlight)"
 
-#: panels/color/color.ui:1083
+#: panels/color/cc-color-panel.ui:1062
 msgid "LCD (RGB LED backlight)"
 msgstr "LCD (RGB LED backlight)"
 
-#: panels/color/color.ui:1088
+#: panels/color/cc-color-panel.ui:1067
 msgid "LCD (white LED backlight)"
 msgstr "LCD (white LED backlight)"
 
-#: panels/color/color.ui:1093
+#: panels/color/cc-color-panel.ui:1072
 msgid "Wide gamut LCD (CCFL backlight)"
 msgstr "Wide gamut LCD (CCFL backlight)"
 
-#: panels/color/color.ui:1098
+#: panels/color/cc-color-panel.ui:1077
 msgid "Wide gamut LCD (RGB LED backlight)"
 msgstr "Wide gamut LCD (RGB LED backlight)"
 
-#: panels/color/color.ui:1115
+#: panels/color/cc-color-panel.ui:1094
 msgctxt "Calibration quality"
 msgid "High"
 msgstr "High"
 
-#: panels/color/color.ui:1116
+#: panels/color/cc-color-panel.ui:1095
 msgid "40 minutes"
 msgstr "40 minutes"
 
-#: panels/color/color.ui:1120
+#: panels/color/cc-color-panel.ui:1099
 msgctxt "Calibration quality"
 msgid "Medium"
 msgstr "Medium"
 
-#: panels/color/color.ui:1121 panels/power/power.ui:25
-#: panels/privacy/privacy.ui:38
+#: panels/color/cc-color-panel.ui:1100
 msgid "30 minutes"
 msgstr "30 minutes"
 
-#: panels/color/color.ui:1125
+#: panels/color/cc-color-panel.ui:1104
 msgctxt "Calibration quality"
 msgid "Low"
 msgstr "Low"
 
-#: panels/color/color.ui:1126 panels/power/power.ui:13 panels/power/power.ui:95
+#: panels/color/cc-color-panel.ui:1105
 msgid "15 minutes"
 msgstr "15 minutes"
 
-#: panels/color/color.ui:1148
+#: panels/color/cc-color-panel.ui:1127
 msgid "Native to display"
 msgstr "Native to display"
 
-#: panels/color/color.ui:1152
+#: panels/color/cc-color-panel.ui:1131
 msgid "D50 (Printing and publishing)"
 msgstr "D50 (Printing and publishing)"
 
-#: panels/color/color.ui:1156
+#: panels/color/cc-color-panel.ui:1135
 msgid "D55"
 msgstr "D55"
 
-#: panels/color/color.ui:1160
+#: panels/color/cc-color-panel.ui:1139
 msgid "D65 (Photography and graphics)"
 msgstr "D65 (Photography and graphics)"
 
-#: panels/color/color.ui:1164
+#: panels/color/cc-color-panel.ui:1143
 msgid "D75"
 msgstr "D75"
 
-#: panels/color/gnome-color-panel.desktop.in.in:3
-msgid "Color"
-msgstr "Colour"
+#. TRANSLATORS: standard spaces are well known colorspaces like
+#. * sRGB, AdobeRGB and ProPhotoRGB
+#: panels/color/cc-color-profile.c:100
+msgid "Standard Space"
+msgstr "Standard Space"
 
-#: 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"
+#. 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:106
+msgid "Test Profile"
+msgstr "Test Profile"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/color/gnome-color-panel.desktop.in.in:7
-msgid "preferences-color"
-msgstr "preferences-color"
+#. TRANSLATORS: automatic profiles are generated automatically
+#. * by the color management system based on manufacturing data,
+#. * for instance the default monitor profile is created from the
+#. * primaries specified in the monitor EDID
+#: panels/color/cc-color-profile.c:114
+msgctxt "Automatically generated profile"
+msgid "Automatic"
+msgstr "Automatic"
 
-#. Translators: Search terms to find the Color panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
-#: panels/color/gnome-color-panel.desktop.in.in:19
-msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
-msgstr "Colour;ICC;Profile;Calibrate;Printer;Display;"
+#. 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:124
+msgctxt "Profile quality"
+msgid "Low Quality"
+msgstr "Low Quality"
 
-#: panels/common/cc-common-language.c:300
-msgid "Other…"
-msgstr "Other…"
+#. TRANSLATORS: the profile quality
+#: panels/color/cc-color-profile.c:129
+msgctxt "Profile quality"
+msgid "Medium Quality"
+msgstr "Medium Quality"
+
+#. TRANSLATORS: the profile quality - high quality profiles take
+#. * a *long* time, and have the best calibration and
+#. * characterisation data.
+#: panels/color/cc-color-profile.c:136
+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:153
+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:160
+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:167
+msgctxt "Colorspace fallback"
+msgid "Default Gray"
+msgstr "Default Grey"
+
+#: panels/color/cc-color-profile.c:190
+msgid "Vendor supplied factory calibration data"
+msgstr "Vendor supplied factory calibration data"
+
+#: panels/color/cc-color-profile.c:199
+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:221
+msgid "This profile may no longer be accurate"
+msgstr "This profile may no longer be accurate"
+
+#: panels/color/color-calibrate.ui:7
+msgid "Display Calibration"
+msgstr "Display Calibration"
+
+#. This starts the calibration process
+#: panels/color/color-calibrate.ui:40
+msgid "_Start"
+msgstr "_Start"
+
+#. This resumes the calibration process
+#: 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:67 panels/region/cc-format-chooser.ui:13
+msgid "_Done"
+msgstr "_Done"
 
-#: panels/common/cc-language-chooser.c:126
-#: panels/region/cc-format-chooser.c:261 panels/region/cc-input-chooser.c:169
+#: panels/color/gnome-color-panel.desktop.in.in:3
+msgid "Color"
+msgstr "Colour"
+
+#: 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"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/color/gnome-color-panel.desktop.in.in:7
+msgid "preferences-color"
+msgstr "preferences-color"
+
+#. Translators: Search terms to find the Color panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/color/gnome-color-panel.desktop.in.in:19
+msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
+msgstr "Colour;ICC;Profile;Calibrate;Printer;Display;"
+
+#: panels/common/cc-common-language.c:300
+msgid "Other…"
+msgstr "Other…"
+
+#: panels/common/cc-language-chooser.c:125
+#: panels/region/cc-format-chooser.c:268 panels/region/cc-input-chooser.c:178
 msgid "More…"
 msgstr "More…"
 
@@ -889,8 +1222,9 @@ msgid "No languages found"
 msgstr "No languages found"
 
 #: panels/common/cc-language-chooser.ui:5
-msgid "Language"
-msgstr "Language"
+#| msgid "Select a language"
+msgid "Select Language"
+msgstr "Select Language"
 
 #: panels/common/cc-util.c:127
 #: panels/network/connection-editor/ce-page-details.c:106
@@ -934,17 +1268,17 @@ msgid "Year"
 msgstr "Year"
 
 #. Translators: This is the full date and time format used in 12-hour mode.
-#: panels/datetime/cc-datetime-panel.c:326
+#: panels/datetime/cc-datetime-panel.c:332
 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:331
+#: panels/datetime/cc-datetime-panel.c:337
 msgid "%e %B %Y, %R"
 msgstr "%e %B %Y, %R"
 
 #. Translators: "city, country"
-#: panels/datetime/cc-datetime-panel.c:496
+#: panels/datetime/cc-datetime-panel.c:502
 #, c-format
 msgctxt "timezone loc"
 msgid "%s, %s"
@@ -952,7 +1286,7 @@ msgstr "%s, %s"
 
 #. Update the timezone on the listbow row
 #. Translators: "timezone (details)"
-#: panels/datetime/cc-datetime-panel.c:523
+#: panels/datetime/cc-datetime-panel.c:529
 #, c-format
 msgctxt "timezone desc"
 msgid "%s (%s)"
@@ -960,131 +1294,140 @@ 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:530
+#: panels/datetime/cc-datetime-panel.c:536
 msgid "UTC%:::z"
 msgstr "UTC%:::z"
 
 #. Translators: This is the time format used in 12-hour mode.
-#: panels/datetime/cc-datetime-panel.c:535
+#: panels/datetime/cc-datetime-panel.c:541
 msgid "%l:%M %p"
 msgstr "%H:%M"
 
 #. Translators: This is the time format used in 24-hour mode.
-#: panels/datetime/cc-datetime-panel.c:540
+#: panels/datetime/cc-datetime-panel.c:546
 msgid "%R"
 msgstr "%R"
 
 #. Update the text bubble in the timezone map
 #. Translators: "timezone (utc shift)"
-#: panels/datetime/cc-datetime-panel.c:545
+#: panels/datetime/cc-datetime-panel.c:551
 #, c-format
 msgctxt "timezone map"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: panels/datetime/datetime.ui:22
+#: panels/datetime/cc-datetime-panel.ui:26
 msgid "January"
 msgstr "January"
 
-#: panels/datetime/datetime.ui:25
+#: panels/datetime/cc-datetime-panel.ui:29
 msgid "February"
 msgstr "February"
 
-#: panels/datetime/datetime.ui:28
+#: panels/datetime/cc-datetime-panel.ui:32
 msgid "March"
 msgstr "March"
 
-#: panels/datetime/datetime.ui:31
+#: panels/datetime/cc-datetime-panel.ui:35
 msgid "April"
 msgstr "April"
 
-#: panels/datetime/datetime.ui:34
+#: panels/datetime/cc-datetime-panel.ui:38
 msgid "May"
 msgstr "May"
 
-#: panels/datetime/datetime.ui:37
+#: panels/datetime/cc-datetime-panel.ui:41
 msgid "June"
 msgstr "June"
 
-#: panels/datetime/datetime.ui:40
+#: panels/datetime/cc-datetime-panel.ui:44
 msgid "July"
 msgstr "July"
 
-#: panels/datetime/datetime.ui:43
+#: panels/datetime/cc-datetime-panel.ui:47
 msgid "August"
 msgstr "August"
 
-#: panels/datetime/datetime.ui:46
+#: panels/datetime/cc-datetime-panel.ui:50
 msgid "September"
 msgstr "September"
 
-#: panels/datetime/datetime.ui:49
+#: panels/datetime/cc-datetime-panel.ui:53
 msgid "October"
 msgstr "October"
 
-#: panels/datetime/datetime.ui:52
+#: panels/datetime/cc-datetime-panel.ui:56
 msgid "November"
 msgstr "November"
 
-#: panels/datetime/datetime.ui:55
+#: panels/datetime/cc-datetime-panel.ui:59
 msgid "December"
 msgstr "December"
 
-#: panels/datetime/datetime.ui:61
+#: panels/datetime/cc-datetime-panel.ui:65
 #: panels/datetime/gnome-datetime-panel.desktop.in.in:3
 msgid "Date & Time"
 msgstr "Date & Time"
 
-#: panels/datetime/datetime.ui:109
+#: panels/datetime/cc-datetime-panel.ui:113
+#: panels/display/cc-night-light-dialog.ui:245
+#: panels/display/cc-night-light-dialog.ui:352
 msgid "Hour"
 msgstr "Hour"
 
 #. Translator: this is the separator between hours and minutes, like in HH∶MM
-#: panels/datetime/datetime.ui:124
+#: panels/datetime/cc-datetime-panel.ui:128
 msgid "∶"
 msgstr ":"
 
-#: panels/datetime/datetime.ui:148
+#: panels/datetime/cc-datetime-panel.ui:152
+#: panels/display/cc-night-light-dialog.ui:273
+#: panels/display/cc-night-light-dialog.ui:380
 msgid "Minute"
 msgstr "Minute"
 
-#: panels/datetime/datetime.ui:215
+#: panels/datetime/cc-datetime-panel.ui:219
 msgid "Time Zone"
 msgstr "Time Zone"
 
-#: panels/datetime/datetime.ui:236
+#: panels/datetime/cc-datetime-panel.ui:240
 msgid "Search for a city"
 msgstr "Search for a city"
 
-#: panels/datetime/datetime.ui:318
+#: panels/datetime/cc-datetime-panel.ui:313
 msgid "Automatic _Date & Time"
 msgstr "Automatic _Date & Time"
 
-#: panels/datetime/datetime.ui:333 panels/datetime/datetime.ui:411
+#: panels/datetime/cc-datetime-panel.ui:314
 msgid "Requires internet access"
 msgstr "Requires internet access"
 
-#: panels/datetime/datetime.ui:396
+#: panels/datetime/cc-datetime-panel.ui:334
 msgid "Automatic Time _Zone"
 msgstr "Automatic Time _Zone"
 
-#: panels/datetime/datetime.ui:468
+#: panels/datetime/cc-datetime-panel.ui:335
+#| msgid "Requires internet access"
+msgid "Requires location services enabled and internet access"
+msgstr "Requires location services enabled and internet access"
+
+#: panels/datetime/cc-datetime-panel.ui:350
 msgid "Date & _Time"
 msgstr "Date & _Time"
 
-#: panels/datetime/datetime.ui:516
+#: panels/datetime/cc-datetime-panel.ui:366
 msgid "Time Z_one"
 msgstr "Time Z_one"
 
-#: panels/datetime/datetime.ui:586
+#: panels/datetime/cc-datetime-panel.ui:405
 msgid "Time _Format"
 msgstr "Time _Format"
 
-#: panels/datetime/datetime.ui:605
+#: panels/datetime/cc-datetime-panel.ui:414
 msgid "24-hour"
 msgstr "24-hour"
 
-#: panels/datetime/datetime.ui:606
+#: panels/datetime/cc-datetime-panel.ui:415
 msgid "AM / PM"
 msgstr "AM/PM"
 
@@ -1110,109 +1453,29 @@ msgstr "Change system time and date settings"
 msgid "To change time or date settings, you need to authenticate."
 msgstr "To change time or date settings, you need to authenticate."
 
-#: panels/display/cc-display-panel.c:515
-msgctxt "Display rotation"
-msgid "Landscape"
-msgstr "Landscape"
-
-#: panels/display/cc-display-panel.c:518
-msgctxt "Display rotation"
-msgid "Portrait Right"
-msgstr "Portrait Right"
-
-#: panels/display/cc-display-panel.c:521
-msgctxt "Display rotation"
-msgid "Portrait Left"
-msgstr "Portrait Left"
-
-#: panels/display/cc-display-panel.c:524
-msgctxt "Display rotation"
-msgid "Landscape (flipped)"
-msgstr "Landscape (flipped)"
-
-#. Translators: This option sets orientation of print (portrait, landscape...)
-#: panels/display/cc-display-panel.c:591
-#: panels/printers/pp-options-dialog.c:558
-msgid "Orientation"
-msgstr "Orientation"
-
-#: panels/display/cc-display-panel.c:658 panels/display/cc-display-panel.c:1423
-#: panels/printers/pp-options-dialog.c:87
-msgid "Resolution"
-msgstr "Resolution"
-
-#: panels/display/cc-display-panel.c:745
-msgid "Refresh Rate"
-msgstr "Refresh Rate"
-
-#: panels/display/cc-display-panel.c:880
-msgid "Scale"
-msgstr "Scale"
-
-#: panels/display/cc-display-panel.c:932
-msgid "Adjust for TV"
-msgstr "Adjust for TV"
-
-#: panels/display/cc-display-panel.c:1167
-msgid "Primary Display"
-msgstr "Primary Display"
-
-#: panels/display/cc-display-panel.c:1195
-msgid "Display Arrangement"
-msgstr "Display Arrangement"
-
-#: panels/display/cc-display-panel.c:1196
-msgid ""
-"Drag displays to match your setup. The top bar is placed on the primary "
-"display."
-msgstr ""
-"Drag displays to match your setup. The top bar is placed on the primary "
-"display."
-
-#: panels/display/cc-display-panel.c:1610
-msgid "Display Mode"
-msgstr "Display Mode"
-
-#: panels/display/cc-display-panel.c:1626
-msgid "Join Displays"
-msgstr "Join Displays"
-
-#: panels/display/cc-display-panel.c:1629
-msgid "Mirror"
-msgstr "Mirror"
-
-#: panels/display/cc-display-panel.c:1632
-msgid "Single Display"
-msgstr "Single Display"
-
-#: panels/display/cc-display-panel.c:1906
-#: panels/network/connection-editor/connection-editor.ui:24
+#: panels/display/cc-display-panel.c:891
+#: panels/network/connection-editor/connection-editor.ui:27
 #: panels/network/network-wifi.ui:38
 msgid "_Apply"
 msgstr "_Apply"
 
-#: panels/display/cc-display-panel.c:1927
+#: panels/display/cc-display-panel.c:912
 msgid "Apply Changes?"
 msgstr "Apply Changes?"
 
-#: panels/display/cc-display-panel.c:1932
+#: panels/display/cc-display-panel.c:917
 msgid "Changes Cannot be Applied"
 msgstr "Changes Cannot be Applied"
 
-#: panels/display/cc-display-panel.c:1933
+#: panels/display/cc-display-panel.c:918
 msgid "This could be due to hardware limitations."
 msgstr "This could be due to hardware limitations."
 
-#: panels/display/cc-display-panel.c:2064
-#, c-format
-msgid "%.2lf Hz"
-msgstr "%.2lf Hz"
-
 #. TRANSLATORS: the state of the night light setting
-#: panels/display/cc-display-panel.c:2236
-#: panels/notifications/cc-notifications-panel.c:288
-#: panels/power/cc-power-panel.c:2038 panels/power/cc-power-panel.c:2045
-#: panels/privacy/cc-privacy-panel.c:193 panels/privacy/cc-privacy-panel.c:260
+#: panels/display/cc-display-panel.c:1091
+#: panels/notifications/cc-notifications-panel.c:270
+#: panels/power/cc-power-panel.c:2111 panels/power/cc-power-panel.c:2118
+#: panels/privacy/cc-privacy-panel.c:212 panels/privacy/cc-privacy-panel.c:289
 #: panels/universal-access/cc-ua-panel.c:478
 #: panels/universal-access/cc-ua-panel.c:841
 #: panels/universal-access/cc-ua-panel.c:854
@@ -1221,41 +1484,130 @@ msgstr "%.2lf Hz"
 msgid "On"
 msgstr "On"
 
-#: panels/display/cc-display-panel.c:2236 panels/network/net-proxy.c:54
-#: panels/notifications/cc-notifications-panel.c:288
-#: panels/power/cc-power-panel.c:2032 panels/power/cc-power-panel.c:2043
-#: panels/privacy/cc-privacy-panel.c:193 panels/privacy/cc-privacy-panel.c:260
+#: panels/display/cc-display-panel.c:1091 panels/network/net-proxy.c:54
+#: panels/notifications/cc-notifications-panel.c:270
+#: panels/power/cc-power-panel.c:2105 panels/power/cc-power-panel.c:2116
+#: panels/privacy/cc-privacy-panel.c:212 panels/privacy/cc-privacy-panel.c:289
 #: panels/universal-access/cc-ua-panel.c:478
 #: panels/universal-access/cc-ua-panel.c:841
 #: panels/universal-access/cc-ua-panel.c:854
 #: panels/universal-access/cc-ua-panel.c:866
 #: panels/universal-access/cc-ua-panel.c:1031
-#: panels/universal-access/uap.ui:338 panels/universal-access/uap.ui:384
-#: panels/universal-access/uap.ui:430 panels/universal-access/uap.ui:536
-#: panels/universal-access/uap.ui:689 panels/universal-access/uap.ui:735
-#: panels/universal-access/uap.ui:781 panels/universal-access/uap.ui:933
+#: panels/universal-access/cc-ua-panel.ui:338
+#: panels/universal-access/cc-ua-panel.ui:384
+#: panels/universal-access/cc-ua-panel.ui:430
+#: panels/universal-access/cc-ua-panel.ui:536
+#: panels/universal-access/cc-ua-panel.ui:689
+#: panels/universal-access/cc-ua-panel.ui:735
+#: panels/universal-access/cc-ua-panel.ui:781
+#: panels/universal-access/cc-ua-panel.ui:933
 msgid "Off"
 msgstr "Off"
 
-#: panels/display/cc-display-panel.c:2256
-msgid "_Night Light"
-msgstr "_Night Light"
+#: panels/display/cc-display-panel.ui:81
+msgid "Single Display"
+msgstr "Single Display"
+
+#: panels/display/cc-display-panel.ui:100
+#: panels/display/cc-display-panel.ui:305
+msgid "Join Displays"
+msgstr "Join Displays"
+
+#: panels/display/cc-display-panel.ui:118
+msgid "Mirror"
+msgstr "Mirror"
+
+#: panels/display/cc-display-panel.ui:143
+msgid "Display Mode"
+msgstr "Display Mode"
+
+#: panels/display/cc-display-panel.ui:235
+#| msgid ""
+#| "Drag displays to match your setup. The top bar is placed on the primary "
+#| "display."
+msgid ""
+"Drag displays to match your physical display setup. Select a display to "
+"change its settings."
+msgstr ""
+"Drag displays to match your physical display setup. Select a display to "
+"change its settings."
+
+#: panels/display/cc-display-panel.ui:242
+msgid "Display Arrangement"
+msgstr "Display Arrangement"
+
+#: panels/display/cc-display-panel.ui:424
+#| msgid "Display Calibration"
+msgid "Display Configuration"
+msgstr "Display Configuration"
+
+#. This is the redshift functionality where we suppress blue light when the sun has gone down
+#: panels/display/cc-display-panel.ui:451
+#: panels/display/cc-display-panel.ui:469
+#: panels/display/cc-night-light-dialog.ui:505
+msgid "Night Light"
+msgstr "Night Light"
+
+#: panels/display/cc-display-settings.c:109
+msgctxt "Display rotation"
+msgid "Landscape"
+msgstr "Landscape"
+
+#: panels/display/cc-display-settings.c:112
+msgctxt "Display rotation"
+msgid "Portrait Right"
+msgstr "Portrait Right"
+
+#: panels/display/cc-display-settings.c:115
+msgctxt "Display rotation"
+msgid "Portrait Left"
+msgstr "Portrait Left"
+
+#: panels/display/cc-display-settings.c:118
+msgctxt "Display rotation"
+msgid "Landscape (flipped)"
+msgstr "Landscape (flipped)"
+
+#: panels/display/cc-display-settings.c:192
+#, c-format
+msgid "%.2lf Hz"
+msgstr "%.2lf Hz"
+
+#: panels/display/cc-display-settings.ui:15
+#| msgid "Orientation"
+msgctxt "display setting"
+msgid "Orientation"
+msgstr "Orientation"
+
+#: panels/display/cc-display-settings.ui:24
+#| msgid "Resolution"
+msgctxt "display setting"
+msgid "Resolution"
+msgstr "Resolution"
+
+#: panels/display/cc-display-settings.ui:33
+msgid "Refresh Rate"
+msgstr "Refresh Rate"
+
+#: panels/display/cc-display-settings.ui:42
+msgid "Adjust for TV"
+msgstr "Adjust for TV"
 
-#: panels/display/cc-display-panel.c:2317
-msgid "Could not get screen information"
-msgstr "Could not get screen information"
+#: panels/display/cc-display-settings.ui:59
+msgid "Scale"
+msgstr "Scale"
 
 #. This cancels the redshift inhibit.
-#: panels/display/cc-night-light-dialog.ui:47
+#: panels/display/cc-night-light-dialog.ui:46
 msgid "Restart Filter"
 msgstr "Restart Filter"
 
 #. Inhibit the redshift functionality until the next day starts
-#: panels/display/cc-night-light-dialog.ui:80
+#: panels/display/cc-night-light-dialog.ui:79
 msgid "Temporarily Disabled Until Tomorrow"
 msgstr "Temporarily Disabled Until Tomorrow"
 
-#: panels/display/cc-night-light-dialog.ui:107
+#: panels/display/cc-night-light-dialog.ui:106
 msgid ""
 "Night light makes the screen color warmer. This can help to prevent eye "
 "strain and sleeplessness."
@@ -1263,54 +1615,56 @@ msgstr ""
 "Night light makes the screen colour warmer. This can help to prevent eye "
 "strain and sleeplessness."
 
-#. This is the redshift functionality where we suppress blue light when the sun has gone down
-#: panels/display/cc-night-light-dialog.ui:129
-#: panels/display/cc-night-light-dialog.ui:466
-msgid "Night Light"
-msgstr "Night Light"
-
-#: panels/display/cc-night-light-dialog.ui:145
+#: panels/display/cc-night-light-dialog.ui:127
 msgid "Schedule"
 msgstr "Schedule"
 
-#: panels/display/cc-night-light-dialog.ui:174
+#: panels/display/cc-night-light-dialog.ui:148
 msgid "Sunset to Sunrise"
 msgstr "Sunset to Sunrise"
 
-#: panels/display/cc-night-light-dialog.ui:189
+#: panels/display/cc-night-light-dialog.ui:164
 #: 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:220
+#: panels/network/network-wifi.ui:776 panels/network/network-wifi.ui:1053
+#: panels/privacy/cc-privacy-panel.c:239
 msgid "Manual"
 msgstr "Manual"
 
-#: panels/display/cc-night-light-dialog.ui:224
+#: panels/display/cc-night-light-dialog.ui:180
+msgid "_Off"
+msgstr "_Off"
+
+#: panels/display/cc-night-light-dialog.ui:216
 msgid "From"
 msgstr "From"
 
-#: panels/display/cc-night-light-dialog.ui:256
-#: panels/display/cc-night-light-dialog.ui:353
+#: panels/display/cc-night-light-dialog.ui:254
+#: panels/display/cc-night-light-dialog.ui:361
 msgid ":"
 msgstr ":"
 
 #. This is the short form for the time period in the morning
-#: panels/display/cc-night-light-dialog.ui:281
-#: panels/display/cc-night-light-dialog.ui:378
+#: panels/display/cc-night-light-dialog.ui:284
+#: panels/display/cc-night-light-dialog.ui:391
 msgid "AM"
 msgstr "AM"
 
 #. This is the short form for the time period in the afternoon
-#: panels/display/cc-night-light-dialog.ui:297
-#: panels/display/cc-night-light-dialog.ui:394
+#: panels/display/cc-night-light-dialog.ui:300
+#: panels/display/cc-night-light-dialog.ui:407
 msgid "PM"
 msgstr "PM"
 
-#: panels/display/cc-night-light-dialog.ui:436
+#: panels/display/cc-night-light-dialog.ui:449
 msgid "To"
 msgstr "To"
 
+#: panels/display/cc-night-light-dialog.ui:470
+msgid "Color Temperature"
+msgstr "Colour Temperature"
+
 #: panels/display/gnome-display-panel.desktop.in.in:3
 msgid "Displays"
 msgstr "Displays"
@@ -1333,9 +1687,36 @@ msgstr ""
 "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;Night;Light;Blue;"
 "redshift;colour;sunset;sunrise;"
 
+#: panels/info/cc-info-default-apps-panel.ui:31
+msgid "_Web"
+msgstr "_Web"
+
+#: panels/info/cc-info-default-apps-panel.ui:43
+msgid "_Mail"
+msgstr "_Mail"
+
+#: panels/info/cc-info-default-apps-panel.ui:59
+msgid "_Calendar"
+msgstr "_Calendar"
+
+#: panels/info/cc-info-default-apps-panel.ui:75
+msgid "M_usic"
+msgstr "M_usic"
+
+#: panels/info/cc-info-default-apps-panel.ui:91
+msgid "_Video"
+msgstr "_Video"
+
+#: panels/info/cc-info-default-apps-panel.ui:162
+#: panels/info/cc-info-removable-media-panel.ui:161
+msgid "_Photos"
+msgstr "_Photos"
+
 #. TRANSLATORS: AP type
-#: panels/info/cc-info-overview-panel.c:373
-#: panels/info/cc-info-overview-panel.c:456 panels/network/panel-common.c:123
+#: panels/info/cc-info-overview-panel.c:371
+#: panels/info/cc-info-overview-panel.c:454
+#: panels/info/cc-info-overview-panel.c:499
+#: panels/info/cc-info-overview-panel.c:529 panels/network/panel-common.c:123
 msgid "Unknown"
 msgstr "Unknown"
 
@@ -1343,51 +1724,93 @@ 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:464
+#: panels/info/cc-info-overview-panel.c:462
 #, c-format
 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:481
+#: panels/info/cc-info-overview-panel.c:479
 #, c-format
 msgid "64-bit"
 msgstr "64-bit"
 
 #. translators: This is the type of architecture for the OS
-#: panels/info/cc-info-overview-panel.c:484
+#: panels/info/cc-info-overview-panel.c:482
 #, c-format
 msgid "32-bit"
 msgstr "32-bit"
 
-#: panels/info/cc-info-overview-panel.c:773
+#: panels/info/cc-info-overview-panel.c:712
 #, c-format
 msgid "Version %s"
 msgstr "Version %s"
 
-#: 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:302
-msgid "Do nothing"
-msgstr "Do nothing"
+#: panels/info/cc-info-overview-panel.ui:70
+msgid "Device name"
+msgstr "Device name"
 
-#: panels/info/cc-info-removable-media-panel.c:306
-msgid "Open folder"
-msgstr "Open folder"
+#: panels/info/cc-info-overview-panel.ui:86
+msgid "Memory"
+msgstr "Memory"
 
-#: panels/info/cc-info-removable-media-panel.c:391
-msgid "Other Media"
-msgstr "Other Media"
+#: panels/info/cc-info-overview-panel.ui:102
+msgid "Processor"
+msgstr "Processor"
 
-#: 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-overview-panel.ui:118
+msgid "Graphics"
+msgstr "Graphics"
 
-#: panels/info/cc-info-removable-media-panel.c:425
-msgid "Select an application for video DVDs"
-msgstr "Select an application for video DVDs"
+#. To translators: this field contains the distro name and version
+#: panels/info/cc-info-overview-panel.ui:133
+msgid "OS name"
+msgstr "OS name"
+
+#. To translators: this field contains the distro type
+#: panels/info/cc-info-overview-panel.ui:149
+msgid "OS type"
+msgstr "OS type"
+
+#: panels/info/cc-info-overview-panel.ui:165
+msgid "Virtualization"
+msgstr "Virtualisation"
+
+#: panels/info/cc-info-overview-panel.ui:181
+msgid "Disk"
+msgstr "Disk"
+
+#: panels/info/cc-info-overview-panel.ui:293
+msgid "Calculating…"
+msgstr "Calculating…"
+
+#: panels/info/cc-info-overview-panel.ui:333
+msgid "Check for updates"
+msgstr "Check for updates"
+
+#: 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:302
+msgid "Do nothing"
+msgstr "Do nothing"
+
+#: panels/info/cc-info-removable-media-panel.c:306
+msgid "Open folder"
+msgstr "Open folder"
+
+#: panels/info/cc-info-removable-media-panel.c:391
+msgid "Other Media"
+msgstr "Other Media"
+
+#: 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:425
+msgid "Select an application for video DVDs"
+msgstr "Select an application for video DVDs"
 
 #: panels/info/cc-info-removable-media-panel.c:426
 msgid "Select an application to run when a music player is connected"
@@ -1454,6 +1877,46 @@ msgstr "Video CD"
 msgid "Windows software"
 msgstr "Windows software"
 
+#: panels/info/cc-info-removable-media-panel.ui:43
+msgid "Select how media should be handled"
+msgstr "Select how media should be handled"
+
+#: panels/info/cc-info-removable-media-panel.ui:74
+msgid "CD _audio"
+msgstr "CD _audio"
+
+#: panels/info/cc-info-removable-media-panel.ui:91
+msgid "_DVD video"
+msgstr "_DVD video"
+
+#: panels/info/cc-info-removable-media-panel.ui:132
+msgid "_Music player"
+msgstr "_Music player"
+
+#: panels/info/cc-info-removable-media-panel.ui:190
+msgid "_Software"
+msgstr "_Software"
+
+#: panels/info/cc-info-removable-media-panel.ui:228
+msgid "_Other Media…"
+msgstr "_Other Media…"
+
+#: panels/info/cc-info-removable-media-panel.ui:272
+msgid "_Never prompt or start programs on media insertion"
+msgstr "_Never prompt or start programs on media insertion"
+
+#: panels/info/cc-info-removable-media-panel.ui:331
+msgid "Select how other media should be handled"
+msgstr "Select how other media should be handled"
+
+#: panels/info/cc-info-removable-media-panel.ui:370
+msgid "_Action:"
+msgstr "_Action:"
+
+#: panels/info/cc-info-removable-media-panel.ui:393
+msgid "_Type:"
+msgstr "_Type:"
+
 #: panels/info/gnome-default-apps-panel.desktop.in.in:3
 msgid "Default Applications"
 msgstr "Default Applications"
@@ -1520,112 +1983,6 @@ msgstr ""
 "device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;"
 "removable;media;autorun;"
 
-#: panels/info/info-default-apps.ui:31
-msgid "_Web"
-msgstr "_Web"
-
-#: panels/info/info-default-apps.ui:43
-msgid "_Mail"
-msgstr "_Mail"
-
-#: panels/info/info-default-apps.ui:59
-msgid "_Calendar"
-msgstr "_Calendar"
-
-#: panels/info/info-default-apps.ui:75
-msgid "M_usic"
-msgstr "M_usic"
-
-#: panels/info/info-default-apps.ui:91
-msgid "_Video"
-msgstr "_Video"
-
-#: panels/info/info-default-apps.ui:162 panels/info/info-removable-media.ui:161
-msgid "_Photos"
-msgstr "_Photos"
-
-#: panels/info/info-overview.ui:58
-msgid "Device name"
-msgstr "Device name"
-
-#: panels/info/info-overview.ui:74
-msgid "Memory"
-msgstr "Memory"
-
-#: panels/info/info-overview.ui:90
-msgid "Processor"
-msgstr "Processor"
-
-#: 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:121
-msgid "OS name"
-msgstr "OS name"
-
-#. To translators: this field contains the distro type
-#: panels/info/info-overview.ui:137
-msgid "OS type"
-msgstr "OS type"
-
-#: panels/info/info-overview.ui:153
-msgid "Virtualization"
-msgstr "Virtualisation"
-
-#: panels/info/info-overview.ui:169
-msgid "Disk"
-msgstr "Disk"
-
-#: panels/info/info-overview.ui:274
-msgid "Calculating…"
-msgstr "Calculating…"
-
-#: panels/info/info-overview.ui:314
-msgid "Check for updates"
-msgstr "Check for updates"
-
-#: 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:74
-msgid "CD _audio"
-msgstr "CD _audio"
-
-#: panels/info/info-removable-media.ui:91
-msgid "_DVD video"
-msgstr "_DVD video"
-
-#: panels/info/info-removable-media.ui:132
-msgid "_Music player"
-msgstr "_Music player"
-
-#: panels/info/info-removable-media.ui:190
-msgid "_Software"
-msgstr "_Software"
-
-#: panels/info/info-removable-media.ui:228
-msgid "_Other Media…"
-msgstr "_Other Media…"
-
-#: 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:331
-msgid "Select how other media should be handled"
-msgstr "Select how other media should be handled"
-
-#: panels/info/info-removable-media.ui:370
-msgid "_Action:"
-msgstr "_Action:"
-
-#: panels/info/info-removable-media.ui:393
-msgid "_Type:"
-msgstr "_Type:"
-
 #: panels/keyboard/00-multimedia.xml.in:2
 msgid "Sound and Media"
 msgstr "Sound and Media"
@@ -1670,7 +2027,8 @@ msgstr "Next track"
 msgid "Eject"
 msgstr "Eject"
 
-#: panels/keyboard/01-input-sources.xml.in:4 panels/universal-access/uap.ui:580
+#: panels/keyboard/01-input-sources.xml.in:4
+#: panels/universal-access/cc-ua-panel.ui:580
 msgid "Typing"
 msgstr "Typing"
 
@@ -1690,12 +2048,6 @@ msgstr "Launchers"
 msgid "Launch help browser"
 msgstr "Launch help browser"
 
-#: panels/keyboard/01-launchers.xml.in:6 shell/cc-window.c:276
-#: shell/cc-window.c:912 shell/cc-window.ui:124
-#: shell/gnome-control-center.desktop.in.in:3
-msgid "Settings"
-msgstr "Settings"
-
 #: panels/keyboard/01-launchers.xml.in:8
 msgid "Launch calculator"
 msgstr "Launch calculator"
@@ -1712,11 +2064,6 @@ msgstr "Launch web browser"
 msgid "Home folder"
 msgstr "Home folder"
 
-#: panels/keyboard/01-launchers.xml.in:16
-#: panels/search/gnome-search-panel.desktop.in.in:3 shell/cc-window.ui:156
-msgid "Search"
-msgstr "Search"
-
 #: panels/keyboard/01-screenshot.xml.in:2
 msgid "Screenshots"
 msgstr "Screenshots"
@@ -1804,21 +2151,6 @@ msgstr "High contrast on or off"
 msgid "Custom Shortcuts"
 msgstr "Custom Shortcuts"
 
-#. This label is displayed in a treeview cell displaying
-#. * a disabled accelerator key combination.
-#.
-#. translators:
-#. * The device has been disabled
-#: panels/keyboard/cc-keyboard-option.c:259
-#: panels/keyboard/cc-keyboard-option.c:378
-#: panels/keyboard/keyboard-shortcuts.c:425
-#: 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"
-
 #. Translators: This key is also known as 'third level
 #. * chooser'. AltGr is often used for this purpose. See
 #. * https://live.gnome.org/Design/SystemSettings/RegionAndLanguage
@@ -1862,10 +2194,31 @@ msgstr "Cancel"
 msgid "Reset All"
 msgstr "Reset All"
 
-#: panels/keyboard/cc-keyboard-panel.c:279
+#: panels/keyboard/cc-keyboard-panel.c:283
 msgid "Reset the shortcut to its default value"
 msgstr "Reset the shortcut to its default value"
 
+#: panels/keyboard/cc-keyboard-panel.ui:67 panels/region/cc-region-panel.ui:395
+#: shell/cc-window.ui:279
+msgid "Keyboard Shortcuts"
+msgstr "Keyboard Shortcuts"
+
+#: panels/keyboard/cc-keyboard-panel.ui:77
+msgid "Reset All…"
+msgstr "Reset All…"
+
+#: panels/keyboard/cc-keyboard-panel.ui:78
+msgid "Reset all shortcuts to their default keybindings"
+msgstr "Reset all shortcuts to their default keybindings"
+
+#: panels/keyboard/cc-keyboard-panel.ui:164
+msgid "No keyboard shortcut found"
+msgstr "No keyboard shortcut found"
+
+#: panels/keyboard/cc-keyboard-panel.ui:175 shell/cc-panel-list.ui:206
+msgid "Try a different search"
+msgstr "Try a different search"
+
 #: panels/keyboard/cc-keyboard-shortcut-editor.c:411
 #, c-format
 msgid ""
@@ -1913,34 +2266,11 @@ msgid ""
 msgstr ""
 "Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;"
 
-#: panels/keyboard/gnome-keyboard-panel.ui:67 panels/region/input-options.ui:68
-#: shell/cc-application.c:252
-msgid "Keyboard Shortcuts"
-msgstr "Keyboard Shortcuts"
-
-#: panels/keyboard/gnome-keyboard-panel.ui:77
-msgid "Reset All…"
-msgstr "Reset All…"
-
-#: 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:164
-msgid "No keyboard shortcut found"
-msgstr "No keyboard shortcut found"
-
-#: panels/keyboard/gnome-keyboard-panel.ui:175 shell/cc-panel-list.ui:206
-msgid "Try a different search"
-msgstr "Try a different search"
-
 #: 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: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"
 
@@ -1956,7 +2286,7 @@ msgstr "Shortcut"
 msgid "Set Shortcut…"
 msgstr "Set Shortcut…"
 
-#: panels/keyboard/shortcut-editor.ui:272 panels/network/network-wifi.ui:594
+#: panels/keyboard/shortcut-editor.ui:272 panels/network/network-wifi.ui:593
 msgid "None"
 msgstr "None"
 
@@ -1980,7 +2310,7 @@ msgstr "Replace"
 msgid "Set"
 msgstr "Set"
 
-#: panels/mouse/cc-mouse-panel.c:80 panels/wacom/cc-wacom-panel.c:439
+#: panels/mouse/cc-mouse-panel.c:80 panels/wacom/cc-wacom-panel.c:463
 msgid "Test Your _Settings"
 msgstr "Test Your _Settings"
 
@@ -2017,10 +2347,12 @@ 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:136
+#: panels/sound/cc-balance-slider.ui:13
 msgid "Left"
 msgstr "Left"
 
 #: panels/mouse/gnome-mouse-properties.ui:146
+#: panels/sound/cc-balance-slider.ui:15
 msgid "Right"
 msgstr "Right"
 
@@ -2033,19 +2365,19 @@ msgid "Mouse Speed"
 msgstr "Mouse Speed"
 
 #: panels/mouse/gnome-mouse-properties.ui:243
-#: panels/mouse/gnome-mouse-properties.ui:548
+#: panels/mouse/gnome-mouse-properties.ui:535
 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:280
-#: panels/mouse/gnome-mouse-properties.ui:456
+#: panels/mouse/gnome-mouse-properties.ui:443
 msgid "Natural Scrolling"
 msgstr "Natural Scrolling"
 
 #: panels/mouse/gnome-mouse-properties.ui:296
-#: panels/mouse/gnome-mouse-properties.ui:472
+#: panels/mouse/gnome-mouse-properties.ui:459
 msgid "Scrolling moves the content, not the view."
 msgstr "Scrolling moves the content, not the view."
 
@@ -2054,19 +2386,19 @@ msgstr "Scrolling moves the content, not the view."
 msgid "Touchpad"
 msgstr "Touchpad"
 
-#: panels/mouse/gnome-mouse-properties.ui:527
+#: panels/mouse/gnome-mouse-properties.ui:514
 msgid "Touchpad Speed"
 msgstr "Touchpad Speed"
 
-#: panels/mouse/gnome-mouse-properties.ui:586
+#: panels/mouse/gnome-mouse-properties.ui:573
 msgid "Tap to Click"
 msgstr "Tap to Click"
 
-#: panels/mouse/gnome-mouse-properties.ui:639
+#: panels/mouse/gnome-mouse-properties.ui:625
 msgid "Two-finger Scrolling"
 msgstr "Two-finger Scrolling"
 
-#: panels/mouse/gnome-mouse-properties.ui:693
+#: panels/mouse/gnome-mouse-properties.ui:678
 msgid "Edge Scrolling"
 msgstr "Edge Scrolling"
 
@@ -2111,13 +2443,13 @@ 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:719 panels/network/net-vpn.c:170
-#: panels/network/net-vpn.c:299
+#: panels/network/cc-network-panel.c:719 panels/network/net-vpn.c:167
+#: panels/network/net-vpn.c:295
 #, c-format
 msgid "%s VPN"
 msgstr "%s VPN"
 
-#: panels/network/cc-network-panel.c:783 panels/network/cc-wifi-panel.ui:320
+#: panels/network/cc-network-panel.c:783 panels/network/cc-wifi-panel.ui:304
 msgid "Oops, something has gone wrong. Please contact your software vendor."
 msgstr "Oops, something has gone wrong. Please contact your software vendor."
 
@@ -2126,7 +2458,7 @@ msgid "NetworkManager needs to be running."
 msgstr "NetworkManager needs to be running."
 
 #: panels/network/cc-network-panel.ui:142
-#: panels/network/connection-editor/net-connection-editor.c:603
+#: panels/network/connection-editor/net-connection-editor.c:581
 msgid "VPN"
 msgstr "VPN"
 
@@ -2134,42 +2466,62 @@ msgstr "VPN"
 msgid "Not set up"
 msgstr "Not set up"
 
+#. TRANSLATORS: This happens when the connection name does not contain the SSID.
+#: panels/network/cc-wifi-connection-row.c:189
+#, c-format
+#| msgctxt "timezone desc"
+#| msgid "%s (%s)"
+msgctxt "Wi-Fi Connection"
+msgid "%s (SSID: %s)"
+msgstr "%s (SSID: %s)"
+
+#: panels/network/cc-wifi-connection-row.ui:36
+#| msgid "Connecting"
+msgid "Connection/SSID"
+msgstr "Connection/SSID"
+
+#: panels/network/cc-wifi-connection-row.ui:73
+#: panels/network/net-device-ethernet.c:359
+#: 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/cc-wifi-panel.c:281
 #: panels/network/gnome-wifi-panel.desktop.in.in:3
-#: panels/network/network-wifi.ui:1769
+#: panels/network/network-wifi.ui:1738
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: panels/network/cc-wifi-panel.ui:73
+#: panels/network/cc-wifi-panel.ui:56
 msgid "Airplane Mode"
 msgstr "Aeroplane Mode"
 
-#: panels/network/cc-wifi-panel.ui:88
+#: panels/network/cc-wifi-panel.ui:72
 msgid "Disables Wi-Fi, Bluetooth and mobile broadband"
 msgstr "Disables Wi-Fi, Bluetooth and mobile broadband"
 
-#: panels/network/cc-wifi-panel.ui:157
+#: panels/network/cc-wifi-panel.ui:141
 msgid "No Wi-Fi Adapter Found"
 msgstr "No Wi-Fi Adapter Found"
 
-#: panels/network/cc-wifi-panel.ui:169
+#: panels/network/cc-wifi-panel.ui:153
 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/cc-wifi-panel.ui:204
+#: panels/network/cc-wifi-panel.ui:188
 msgid "Airplane Mode On"
 msgstr "Aeroplane Mode On"
 
-#: panels/network/cc-wifi-panel.ui:216
-#| msgid "Turn off Wi-Fi to save power."
+#: panels/network/cc-wifi-panel.ui:200
 msgid "Turn off to use Wi-Fi"
 msgstr "Turn off to use Wi-Fi"
 
-#: panels/network/cc-wifi-panel.ui:242
+#: panels/network/cc-wifi-panel.ui:226
 msgid "Visible Networks"
 msgstr "Visible Networks"
 
-#: panels/network/cc-wifi-panel.ui:309
+#: panels/network/cc-wifi-panel.ui:293
 msgid "NetworkManager needs to be running"
 msgstr "NetworkManager needs to be running"
 
@@ -2179,7 +2531,6 @@ msgstr "802.1x _Security"
 
 #: panels/network/connection-editor/8021x-security-page.ui:73
 #: panels/network/connection-editor/security-page.ui:72
-#: panels/wacom/wacom-stylus-page.ui:110
 msgid "page 1"
 msgstr "page 1"
 
@@ -2198,7 +2549,6 @@ msgstr "Inner _authentication"
 
 #: panels/network/connection-editor/8021x-security-page.ui:281
 #: panels/network/connection-editor/security-page.ui:280
-#: panels/wacom/wacom-stylus-page.ui:428
 msgid "page 2"
 msgstr "page 2"
 
@@ -2220,43 +2570,42 @@ msgstr "Profile %d"
 
 #. TRANSLATORS: this WEP WiFi security
 #: panels/network/connection-editor/ce-page-details.c:56
-#: panels/network/net-device-wifi.c:235 panels/network/net-device-wifi.c:468
+#: panels/network/net-device-wifi.c:123 panels/network/net-device-wifi.c:299
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
 #: panels/network/connection-editor/ce-page-details.c:60
-#: panels/network/net-device-wifi.c:239 panels/network/net-device-wifi.c:473
-#: panels/network/network-wifi.ui:593
+#: panels/network/net-device-wifi.c:127 panels/network/net-device-wifi.c:304
+#: panels/network/network-wifi.ui:592
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
 #: panels/network/connection-editor/ce-page-details.c:64
-#: panels/network/net-device-wifi.c:243
+#: panels/network/net-device-wifi.c:131
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
 #: panels/network/connection-editor/ce-page-details.c:69
-#: panels/network/net-device-wifi.c:248
+#: panels/network/net-device-wifi.c:136
 msgid "Enterprise"
 msgstr "Enterprise"
 
 #: panels/network/connection-editor/ce-page-details.c:74
-#: panels/network/net-device-wifi.c:253 panels/network/net-device-wifi.c:458
+#: panels/network/net-device-wifi.c:141 panels/network/net-device-wifi.c:289
 msgctxt "Wifi security"
 msgid "None"
 msgstr "None"
 
 #: 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:121
-#: panels/network/net-device-wifi.c:567
+#: panels/network/net-device-ethernet.c:137
+#: panels/network/net-device-wifi.c:398
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
@@ -2264,64 +2613,64 @@ msgstr[0] "%i day ago"
 msgstr[1] "%i days ago"
 
 #. Translators: network device speed
-#: panels/network/connection-editor/ce-page-details.c:225
-#: panels/network/net-device-ethernet.c:50 panels/network/net-device-wifi.c:646
+#: panels/network/connection-editor/ce-page-details.c:228
+#: panels/network/net-device-ethernet.c:66 panels/network/net-device-wifi.c:476
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: panels/network/connection-editor/ce-page-details.c:251
-#: panels/network/net-device-wifi.c:675
+#: panels/network/connection-editor/ce-page-details.c:249
+#: panels/network/net-device-wifi.c:505
 msgctxt "Signal strength"
 msgid "None"
 msgstr "None"
 
-#: panels/network/connection-editor/ce-page-details.c:253
-#: panels/network/net-device-wifi.c:677
+#: panels/network/connection-editor/ce-page-details.c:251
+#: panels/network/net-device-wifi.c:507
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "Weak"
 
-#: panels/network/connection-editor/ce-page-details.c:255
-#: panels/network/net-device-wifi.c:679
+#: panels/network/connection-editor/ce-page-details.c:253
+#: panels/network/net-device-wifi.c:509
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "Ok"
 
-#: panels/network/connection-editor/ce-page-details.c:257
-#: panels/network/net-device-wifi.c:681
+#: panels/network/connection-editor/ce-page-details.c:255
+#: panels/network/net-device-wifi.c:511
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "Good"
 
-#: panels/network/connection-editor/ce-page-details.c:259
-#: panels/network/net-device-wifi.c:683
+#: panels/network/connection-editor/ce-page-details.c:257
+#: panels/network/net-device-wifi.c:513
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "Excellent"
 
-#: panels/network/connection-editor/ce-page-details.c:302
+#: panels/network/connection-editor/ce-page-details.c:300
 msgid "Forget Connection"
 msgstr "Forget Connection"
 
-#: panels/network/connection-editor/ce-page-details.c:304
+#: panels/network/connection-editor/ce-page-details.c:302
 msgid "Remove Connection Profile"
 msgstr "Remove Connection Profile"
 
-#: panels/network/connection-editor/ce-page-details.c:306
+#: panels/network/connection-editor/ce-page-details.c:304
 msgid "Remove VPN"
 msgstr "Remove VPN"
 
-#: panels/network/connection-editor/ce-page-details.c:334
-#: panels/network/network-wifi.ui:1456 shell/cc-panel-list.ui:103
-#: shell/cc-window.c:268
+#: panels/network/connection-editor/ce-page-details.c:332
+#: panels/network/network-wifi.ui:1433 shell/cc-panel-list.ui:103
+#: shell/cc-window.c:247
 msgid "Details"
 msgstr "Details"
 
 #: 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
+#: panels/network/network-wifi.ui:1437
 msgid "Identity"
 msgstr "Identity"
 
@@ -2336,12 +2685,12 @@ msgid "Delete Route"
 msgstr "Delete Route"
 
 #: panels/network/connection-editor/ce-page-ip4.c:896
-#: panels/network/network-wifi.ui:1464
+#: panels/network/network-wifi.ui:1441
 msgid "IPv4"
 msgstr "IPv4"
 
 #: panels/network/connection-editor/ce-page-ip6.c:828
-#: panels/network/network-wifi.ui:1468
+#: panels/network/network-wifi.ui:1445
 msgid "IPv6"
 msgstr "IPv6"
 
@@ -2386,26 +2735,26 @@ msgid "Link speed"
 msgstr "Link speed"
 
 #: panels/network/connection-editor/details-page.ui:104
-#: panels/network/net-device-ethernet.c:154 panels/network/network-wifi.ui:256
+#: panels/network/net-device-ethernet.c:170 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:122
-#: panels/network/net-device-ethernet.c:155
-#: panels/network/net-device-ethernet.c:159
+#: panels/network/net-device-ethernet.c:171
+#: panels/network/net-device-ethernet.c:175
 #: 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:140
-#: panels/network/net-device-ethernet.c:162 panels/network/network-wifi.ui:290
+#: panels/network/net-device-ethernet.c:178 panels/network/network-wifi.ui:290
 msgid "Hardware Address"
 msgstr "Hardware Address"
 
 #: panels/network/connection-editor/details-page.ui:158
-#: panels/network/net-device-ethernet.c:166
+#: panels/network/net-device-ethernet.c:182
 #: panels/network/network-mobile.ui:206 panels/network/network-wifi.ui:307
 msgid "Default Route"
 msgstr "Default Route"
@@ -2413,9 +2762,9 @@ msgstr "Default Route"
 #: 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/net-device-ethernet.c:184
 #: panels/network/network-mobile.ui:224 panels/network/network-wifi.ui:325
-#: panels/network/network-wifi.ui:832 panels/network/network-wifi.ui:1109
+#: panels/network/network-wifi.ui:831 panels/network/network-wifi.ui:1108
 msgid "DNS"
 msgstr "DNS"
 
@@ -2448,7 +2797,7 @@ msgstr "Appropriate for connections that have data charges or limits."
 #: 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:220
+#: panels/privacy/cc-privacy-panel.c:239
 msgid "Automatic"
 msgstr "Automatic"
 
@@ -2490,8 +2839,8 @@ msgid "_Name"
 msgstr "_Name"
 
 #: panels/network/connection-editor/ethernet-page.ui:100
-#: panels/network/connection-editor/wifi-page.ui:68
-#: panels/network/network-wifi.ui:1261
+#: panels/network/connection-editor/wifi-page.ui:67
+#: panels/network/network-wifi.ui:1260
 msgid "_MAC Address"
 msgstr "_MAC Address"
 
@@ -2500,7 +2849,7 @@ msgid "M_TU"
 msgstr "M_TU"
 
 #: panels/network/connection-editor/ethernet-page.ui:163
-#: panels/network/connection-editor/wifi-page.ui:98
+#: panels/network/connection-editor/wifi-page.ui:97
 msgid "_Cloned Address"
 msgstr "_Cloned Address"
 
@@ -2513,7 +2862,7 @@ msgid "IPv_4 Method"
 msgstr "IPv_4 Method"
 
 #: panels/network/connection-editor/ip4-page.ui:42
-#: panels/network/network-wifi.ui:778 panels/network/network-wifi.ui:1055
+#: panels/network/network-wifi.ui:777 panels/network/network-wifi.ui:1054
 msgid "Automatic (DHCP)"
 msgstr "Automatic (DHCP)"
 
@@ -2536,7 +2885,7 @@ msgstr "Addresses"
 #: 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
+#: panels/printers/details-dialog.ui:89
 msgid "Address"
 msgstr "Address"
 
@@ -2564,7 +2913,7 @@ msgstr "Separate IP addresses with commas"
 
 #: 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
+#: panels/network/network-wifi.ui:876 panels/network/network-wifi.ui:1153
 msgid "Routes"
 msgstr "Routes"
 
@@ -2581,7 +2930,7 @@ msgstr "Metric"
 
 #: 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
+#: panels/network/network-wifi.ui:932 panels/network/network-wifi.ui:1209
 msgid "Use this connection _only for resources on its network"
 msgstr "Use this connection _only for resources on its network"
 
@@ -2598,19 +2947,19 @@ msgstr "Automatic, DHCP only"
 msgid "Prefix"
 msgstr "Prefix"
 
-#: panels/network/connection-editor/net-connection-editor.c:273
+#: panels/network/connection-editor/net-connection-editor.c:261
 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:279
 msgid "New Profile"
 msgstr "New Profile"
 
-#: panels/network/connection-editor/net-connection-editor.c:751
+#: panels/network/connection-editor/net-connection-editor.c:727
 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:759
 msgid "Add VPN"
 msgstr "Add VPN"
 
@@ -2641,9 +2990,9 @@ msgid "Select file to import"
 msgstr "Select file to import"
 
 #: panels/network/connection-editor/vpn-helpers.c:182
-#: panels/printers/pp-details-dialog.c:331
-#: panels/sharing/cc-sharing-panel.c:427
-#: panels/user-accounts/um-photo-dialog.c:231
+#: panels/printers/pp-details-dialog.c:314
+#: panels/sharing/cc-sharing-panel.c:428
+#: panels/user-accounts/cc-avatar-chooser.c:234
 msgid "_Open"
 msgstr "_Open"
 
@@ -2694,16 +3043,6 @@ msgstr "_SSID"
 msgid "_BSSID"
 msgstr "_BSSID"
 
-#: panels/network/connection-editor/wifi-page.ui:53
-#: panels/network/network-wifi.ui:562
-msgid "My Home Network"
-msgstr "My Home Network"
-
-#: 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:4
 msgid "Control how you connect to the Internet"
 msgstr "Control how you connect to the Internet"
@@ -2736,28 +3075,28 @@ msgstr "network-wireless"
 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:107
-#: panels/network/net-device-wifi.c:553
+#: panels/network/net-device-ethernet.c:123
+#: panels/network/net-device-wifi.c:384
 msgid "never"
 msgstr "never"
 
-#: panels/network/net-device-ethernet.c:117
-#: panels/network/net-device-wifi.c:563
+#: panels/network/net-device-ethernet.c:133
+#: panels/network/net-device-wifi.c:394
 msgid "today"
 msgstr "today"
 
-#: panels/network/net-device-ethernet.c:119
-#: panels/network/net-device-wifi.c:565
+#: panels/network/net-device-ethernet.c:135
+#: panels/network/net-device-wifi.c:396
 msgid "yesterday"
 msgstr "yesterday"
 
-#: panels/network/net-device-ethernet.c:157
+#: panels/network/net-device-ethernet.c:173
 #: 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:173 panels/network/network-wifi.ui:342
+#: panels/network/net-device-ethernet.c:189 panels/network/network-wifi.ui:342
 msgid "Last used"
 msgstr "Last used"
 
@@ -2766,28 +3105,21 @@ msgstr "Last used"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: panels/network/net-device-ethernet.c:276
+#: panels/network/net-device-ethernet.c:291
 #: panels/network/network-ethernet.ui:19 panels/network/network-simple.ui:39
 msgid "Wired"
 msgstr "Wired"
 
-#: panels/network/net-device-ethernet.c:344
-#: panels/network/net-device-wifi.c:1895 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:236
 msgid "Add new connection"
 msgstr "Add new connection"
 
-#: panels/network/net-device-wifi.c:1368
+#: panels/network/net-device-wifi.c:1157
 #, 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:1372
+#: panels/network/net-device-wifi.c:1161
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
@@ -2795,11 +3127,11 @@ msgstr ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
 
-#: panels/network/net-device-wifi.c:1379
+#: panels/network/net-device-wifi.c:1168
 msgid "Turn On Wi-Fi Hotspot?"
 msgstr "Turn On Wi-Fi Hotspot?"
 
-#: panels/network/net-device-wifi.c:1401
+#: panels/network/net-device-wifi.c:1190
 msgid ""
 "Wi-Fi hotspots are usually used to share an additional Internet connection "
 "over Wi-Fi."
@@ -2807,27 +3139,27 @@ msgstr ""
 "Wi-Fi hotspots are usually used to share an additional Internet connection "
 "over Wi-Fi."
 
-#: panels/network/net-device-wifi.c:1412
+#: panels/network/net-device-wifi.c:1201
 msgid "_Turn On"
 msgstr "_Turn On"
 
-#: panels/network/net-device-wifi.c:1489
+#: panels/network/net-device-wifi.c:1278
 msgid "Stop hotspot and disconnect any users?"
 msgstr "Stop hotspot and disconnect any users?"
 
-#: panels/network/net-device-wifi.c:1492
+#: panels/network/net-device-wifi.c:1281
 msgid "_Stop Hotspot"
 msgstr "_Stop Hotspot"
 
-#: panels/network/net-device-wifi.c:1592
+#: panels/network/net-device-wifi.c:1337
 msgid "System policy prohibits use as a Hotspot"
 msgstr "System policy prohibits use as a Hotspot"
 
-#: panels/network/net-device-wifi.c:1595
+#: panels/network/net-device-wifi.c:1340
 msgid "Wireless device does not support Hotspot mode"
 msgstr "Wireless device does not support Hotspot mode"
 
-#: panels/network/net-device-wifi.c:1733
+#: panels/network/net-device-wifi.c:1471
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
@@ -2835,16 +3167,16 @@ msgstr ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
 
-#: panels/network/net-device-wifi.c:1737 panels/network/network-wifi.ui:1362
+#: panels/network/net-device-wifi.c:1475 panels/network/network-wifi.ui:1350
 msgid "_Forget"
 msgstr "_Forget"
 
-#: panels/network/net-device-wifi.c:2046 panels/network/net-device-wifi.c:2053
+#: panels/network/net-device-wifi.c:1638 panels/network/net-device-wifi.c:1645
 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:2086
+#: panels/network/net-device-wifi.c:1682
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "_Forget"
@@ -2937,74 +3269,70 @@ msgstr "details"
 #: 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:357
-#: 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
+#: panels/sharing/cc-sharing-panel.ui:357
+#: panels/user-accounts/cc-add-user-dialog.ui:310
+#: panels/user-accounts/cc-add-user-dialog.ui:547
+#: panels/user-accounts/cc-user-panel.ui:214
 msgid "_Password"
 msgstr "_Password"
 
-#: panels/network/network-wifi.ui:622
+#: panels/network/network-wifi.ui:621
 msgid "Show P_assword"
 msgstr "Show P_assword"
 
-#: panels/network/network-wifi.ui:652
+#: panels/network/network-wifi.ui:651
 msgid "Make available to other users"
 msgstr "Make available to other users"
 
-#: panels/network/network-wifi.ui:680
+#: panels/network/network-wifi.ui:679
 msgid "identity"
 msgstr "identity"
 
-#: panels/network/network-wifi.ui:714
+#: panels/network/network-wifi.ui:713
 msgid "IPv_4"
 msgstr "IPv_4"
 
-#: panels/network/network-wifi.ui:755 panels/network/network-wifi.ui:1032
+#: panels/network/network-wifi.ui:754 panels/network/network-wifi.ui:1031
 msgid "_Addresses"
 msgstr "_Addresses"
 
-#: panels/network/network-wifi.ui:779 panels/network/network-wifi.ui:1056
+#: panels/network/network-wifi.ui:778 panels/network/network-wifi.ui:1055
 msgid "Automatic (DHCP) addresses only"
 msgstr "Automatic (DHCP) addresses only"
 
-#: panels/network/network-wifi.ui:780 panels/network/network-wifi.ui:1057
+#: panels/network/network-wifi.ui:779 panels/network/network-wifi.ui:1056
 msgid "Link-local only"
 msgstr "Link-local only"
 
-#: panels/network/network-wifi.ui:781 panels/network/network-wifi.ui:1058
+#: panels/network/network-wifi.ui:780 panels/network/network-wifi.ui:1057
 msgid "Shared with other computers"
 msgstr "Shared with other computers"
 
-#: panels/network/network-wifi.ui:917 panels/network/network-wifi.ui:1194
+#: panels/network/network-wifi.ui:916 panels/network/network-wifi.ui:1193
 msgid "_Ignore automatically obtained routes"
 msgstr "_Ignore automatically obtained routes"
 
-#: panels/network/network-wifi.ui:960
+#: panels/network/network-wifi.ui:959
 msgid "ipv4"
 msgstr "ipv4"
 
-#: panels/network/network-wifi.ui:991
+#: panels/network/network-wifi.ui:990
 msgid "IPv_6"
 msgstr "IPv_6"
 
-#: panels/network/network-wifi.ui:1237
+#: panels/network/network-wifi.ui:1236
 msgid "ipv6"
 msgstr "ipv6"
 
-#: panels/network/network-wifi.ui:1277
+#: panels/network/network-wifi.ui:1276
 msgid "_Cloned MAC Address"
 msgstr "_Cloned MAC Address"
 
-#: panels/network/network-wifi.ui:1327
-msgid "hardware"
-msgstr "hardware"
-
-#: panels/network/network-wifi.ui:1346
+#: panels/network/network-wifi.ui:1334
 msgid "_Reset"
 msgstr "_Reset"
 
-#: panels/network/network-wifi.ui:1382
+#: panels/network/network-wifi.ui:1370
 msgid ""
 "Reset the settings for this connection to their defaults, but remember as a "
 "preferred connection."
@@ -3012,7 +3340,7 @@ msgstr ""
 "Reset the settings for this connection to their defaults, but remember as a "
 "preferred connection."
 
-#: panels/network/network-wifi.ui:1399
+#: panels/network/network-wifi.ui:1387
 msgid ""
 "Remove all details relating to this network and do not try to automatically "
 "connect to it."
@@ -3020,57 +3348,53 @@ msgstr ""
 "Remove all details relating to this network and do not try to automatically "
 "connect to it."
 
-#: panels/network/network-wifi.ui:1419
-msgid "reset"
-msgstr "reset"
-
-#: panels/network/network-wifi.ui:1472
+#: panels/network/network-wifi.ui:1449
 msgid "Hardware"
 msgstr "Hardware"
 
-#: panels/network/network-wifi.ui:1476
+#: panels/network/network-wifi.ui:1453
 msgctxt "tab"
 msgid "Reset"
 msgstr "Reset"
 
-#: panels/network/network-wifi.ui:1537
+#: panels/network/network-wifi.ui:1505
 msgid "Wi-Fi Hotspot"
 msgstr "Wi-Fi Hotspot"
 
-#: panels/network/network-wifi.ui:1554
+#: panels/network/network-wifi.ui:1523
 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:1603
+#: panels/network/network-wifi.ui:1572
 msgid "Network Name"
 msgstr "Network Name"
 
-#: panels/network/network-wifi.ui:1621
+#: panels/network/network-wifi.ui:1590
 msgid "Connected Devices"
 msgstr "Connected Devices"
 
-#: panels/network/network-wifi.ui:1639
+#: panels/network/network-wifi.ui:1608
 msgid "Security type"
 msgstr "Security type"
 
-#: panels/network/network-wifi.ui:1702
+#: panels/network/network-wifi.ui:1671
 msgctxt "Wi-Fi passkey"
 msgid "Password"
 msgstr "Password"
 
-#: panels/network/network-wifi.ui:1799
+#: panels/network/network-wifi.ui:1768
 msgid "Turn Wi-Fi off"
 msgstr "Turn Wi-Fi off"
 
-#: panels/network/network-wifi.ui:1831
+#: panels/network/network-wifi.ui:1800
 msgid "_Connect to Hidden Network…"
 msgstr "_Connect to Hidden Network…"
 
-#: panels/network/network-wifi.ui:1841
+#: panels/network/network-wifi.ui:1810
 msgid "_Turn On Wi-Fi Hotspot…"
 msgstr "_Turn On Wi-Fi Hotspot…"
 
-#: panels/network/network-wifi.ui:1851
+#: panels/network/network-wifi.ui:1820
 msgid "_Known Wi-Fi Networks"
 msgstr "_Known Wi-Fi Networks"
 
@@ -3436,8 +3760,8 @@ msgstr "missing EAP-LEAP password"
 #: 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
+#: panels/user-accounts/cc-add-user-dialog.ui:146
+#: panels/user-accounts/cc-add-user-dialog.ui:527
 msgid "_Username"
 msgstr "_Username"
 
@@ -3745,9 +4069,13 @@ msgctxt "notifications"
 msgid "Show Message C_ontent on Lock Screen"
 msgstr "Show Message C_ontent on Lock Screen"
 
-#: panels/notifications/gnome-notifications-panel.desktop.in.in:3
-msgid "Notifications"
-msgstr "Notifications"
+#: panels/notifications/cc-notifications-panel.ui:70
+msgid "Notification _Popups"
+msgstr "Notification _Popups"
+
+#: panels/notifications/cc-notifications-panel.ui:121
+msgid "_Lock Screen Notifications"
+msgstr "_Lock Screen Notifications"
 
 #: panels/notifications/gnome-notifications-panel.desktop.in.in:4
 msgid "Control which notifications are displayed and what they show"
@@ -3763,40 +4091,26 @@ msgstr "preferences-system-notifications"
 msgid "Notifications;Banner;Message;Tray;Popup;"
 msgstr "Notifications;Banner;Message;Tray;Popup;"
 
-#: panels/notifications/notifications.ui:84
-msgid "Notification _Popups"
-msgstr "Notification _Popups"
-
-#: panels/notifications/notifications.ui:134
-msgid "_Lock Screen Notifications"
-msgstr "_Lock Screen Notifications"
-
-#. List of applications.
-#: 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
-msgctxt "Online Account"
-msgid "Other"
-msgstr "Other"
+#: panels/online-accounts/cc-online-accounts-panel.c:150
+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:612
+#: panels/online-accounts/cc-online-accounts-panel.c:620
 #, c-format
 msgid "%s Account"
 msgstr "%s Account"
 
-#: panels/online-accounts/cc-online-accounts-panel.c:904
+#: panels/online-accounts/cc-online-accounts-panel.c:917
 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:969
+#: panels/online-accounts/cc-online-accounts-panel.c:982
 #, c-format
 msgid "<b>%s</b> removed"
 msgstr "<b>%s</b> removed"
@@ -3831,19 +4145,19 @@ msgstr ""
 msgid "Undo"
 msgstr "Undo"
 
-#: panels/online-accounts/online-accounts.ui:125
+#: panels/online-accounts/online-accounts.ui:96
 msgid "Connect to your data in the cloud"
 msgstr "Connect to your data in the cloud"
 
-#: panels/online-accounts/online-accounts.ui:137
+#: panels/online-accounts/online-accounts.ui:111
 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:159
+#: panels/online-accounts/online-accounts.ui:136
 msgid "Add an account"
 msgstr "Add an account"
 
-#: panels/online-accounts/online-accounts.ui:264
+#: panels/online-accounts/online-accounts.ui:243
 msgid "Remove Account"
 msgstr "Remove Account"
 
@@ -3885,397 +4199,460 @@ msgstr[0] "minute"
 msgstr[1] "minutes"
 
 #. 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:306
 #, 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:314
+#: panels/power/cc-power-panel.c:313
 #, 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:319
+#: panels/power/cc-power-panel.c:318
 #, c-format
 msgid "%s remaining"
 msgstr "%s remaining"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:324 panels/power/cc-power-panel.c:351
+#: panels/power/cc-power-panel.c:323 panels/power/cc-power-panel.c:353
 msgid "Fully charged"
 msgstr "Fully charged"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:328 panels/power/cc-power-panel.c:355
+#: panels/power/cc-power-panel.c:327 panels/power/cc-power-panel.c:357
+#| msgid "Charging"
+msgid "Not charging"
+msgstr "Not charging"
+
+#. TRANSLATORS: primary battery
+#: panels/power/cc-power-panel.c:331 panels/power/cc-power-panel.c:361
 msgid "Empty"
 msgstr "Empty"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:342
+#: panels/power/cc-power-panel.c:344
 msgid "Charging"
 msgstr "Charging"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:347
+#: panels/power/cc-power-panel.c:349
 msgid "Discharging"
 msgstr "Discharging"
 
-#: panels/power/cc-power-panel.c:465
+#: panels/power/cc-power-panel.c:479
 msgctxt "Battery name"
 msgid "Main"
 msgstr "Main"
 
-#: panels/power/cc-power-panel.c:467
+#: panels/power/cc-power-panel.c:481
 msgctxt "Battery name"
 msgid "Extra"
 msgstr "Extra"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:535
+#: panels/power/cc-power-panel.c:559
 msgid "Wireless mouse"
 msgstr "Wireless mouse"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:538
+#: panels/power/cc-power-panel.c:562
 msgid "Wireless keyboard"
 msgstr "Wireless keyboard"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:541
+#: panels/power/cc-power-panel.c:565
 msgid "Uninterruptible power supply"
 msgstr "Uninterruptible power supply"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:544
+#: panels/power/cc-power-panel.c:568
 msgid "Personal digital assistant"
 msgstr "Personal digital assistant"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:547
+#: panels/power/cc-power-panel.c:571
 msgid "Cellphone"
 msgstr "Mobile phone"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:550
+#: panels/power/cc-power-panel.c:574
 msgid "Media player"
 msgstr "Media player"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:553 panels/wacom/cc-wacom-panel.c:830
+#: panels/power/cc-power-panel.c:577 panels/wacom/cc-wacom-panel.c:848
 msgid "Tablet"
 msgstr "Tablet"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:556
+#: panels/power/cc-power-panel.c:580
 msgid "Computer"
 msgstr "Computer"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:559
+#: panels/power/cc-power-panel.c:583
 msgid "Gaming input device"
 msgstr "Gaming input device"
 
 #. TRANSLATORS: secondary battery, misc
-#: panels/power/cc-power-panel.c:562 panels/power/cc-power-panel.c:814
-#: panels/power/cc-power-panel.c:2400
+#: panels/power/cc-power-panel.c:586 panels/power/cc-power-panel.c:847
+#: panels/power/cc-power-panel.c:2481
 msgid "Battery"
 msgstr "Battery"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:622
+#: panels/power/cc-power-panel.c:646
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "Charging"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:629
+#: panels/power/cc-power-panel.c:653
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "Caution"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:634
+#: panels/power/cc-power-panel.c:658
 msgctxt "Battery power"
 msgid "Low"
 msgstr "Low"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:639
+#: panels/power/cc-power-panel.c:663
 msgctxt "Battery power"
 msgid "Good"
 msgstr "Good"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:644
+#: panels/power/cc-power-panel.c:668
 msgctxt "Battery power"
 msgid "Fully charged"
 msgstr "Fully charged"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:648
+#: panels/power/cc-power-panel.c:672
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "Empty"
 
-#: panels/power/cc-power-panel.c:812
+#: panels/power/cc-power-panel.c:845
 msgid "Batteries"
 msgstr "Batteries"
 
-#: panels/power/cc-power-panel.c:1172
+#: panels/power/cc-power-panel.c:1206
 #, c-format
-#| msgid "%i hour"
-#| msgid_plural "%i hours"
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hour"
 msgstr[1] "%d hours"
 
-#: panels/power/cc-power-panel.c:1174
+#: panels/power/cc-power-panel.c:1208
 #, c-format
-#| msgid "%i minute"
-#| msgid_plural "%i minutes"
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: panels/power/cc-power-panel.c:1177
+#: panels/power/cc-power-panel.c:1211
 #, c-format
-#| msgid "%d millisecond"
-#| msgid_plural "%d milliseconds"
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d second"
 msgstr[1] "%d seconds"
 
 #. 5 hours 2 minutes 12 seconds
-#: panels/power/cc-power-panel.c:1182
+#: panels/power/cc-power-panel.c:1216
 #, c-format
-#| msgid "%i %s %i %s"
 msgctxt "time"
 msgid "%s %s %s"
 msgstr "%s %s %s"
 
 #. 2 minutes 12 seconds
-#: panels/power/cc-power-panel.c:1185
+#: panels/power/cc-power-panel.c:1219
 #, c-format
-#| msgid "%i %s %i %s"
 msgctxt "time"
 msgid "%s %s"
 msgstr "%s %s"
 
 #. 0 seconds
-#: panels/power/cc-power-panel.c:1191
-#| msgid "30 seconds"
+#: panels/power/cc-power-panel.c:1225
 msgid "0 seconds"
 msgstr "0 seconds"
 
-#: panels/power/cc-power-panel.c:1286
+#: panels/power/cc-power-panel.c:1322
 msgid "When _idle"
 msgstr "When _idle"
 
-#: panels/power/cc-power-panel.c:1736
+#: panels/power/cc-power-panel.c:1779
 msgid "Power Saving"
 msgstr "Power Saving"
 
-#: panels/power/cc-power-panel.c:1766
+#: panels/power/cc-power-panel.c:1811
 msgid "_Screen brightness"
 msgstr "_Screen brightness"
 
-#: panels/power/cc-power-panel.c:1785
+#: panels/power/cc-power-panel.c:1833
 msgid "Automatic brightness"
 msgstr "Automatic brightness"
 
-#: panels/power/cc-power-panel.c:1805
+#: panels/power/cc-power-panel.c:1855
 msgid "_Keyboard brightness"
 msgstr "_Keyboard brightness"
 
-#: panels/power/cc-power-panel.c:1815
+#: panels/power/cc-power-panel.c:1868
 msgid "_Dim screen when inactive"
 msgstr "_Dim screen when inactive"
 
-#: panels/power/cc-power-panel.c:1840
+#: panels/power/cc-power-panel.c:1897
 msgid "_Blank screen"
 msgstr "_Blank screen"
 
-#: panels/power/cc-power-panel.c:1877
+#: panels/power/cc-power-panel.c:1939
 msgid "_Wi-Fi"
 msgstr "_Wi-Fi"
 
-#: panels/power/cc-power-panel.c:1882
-#| msgid "Turn off Wi-Fi to save power."
+#: panels/power/cc-power-panel.c:1945
 msgid "Wi-Fi can be turned off to save power."
 msgstr "Wi-Fi can be turned off to save power."
 
-#: panels/power/cc-power-panel.c:1907
+#: panels/power/cc-power-panel.c:1975
 msgid "_Mobile broadband"
 msgstr "_Mobile broadband"
 
-#: panels/power/cc-power-panel.c:1912
-#| msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power."
+#: panels/power/cc-power-panel.c:1981
 msgid "Mobile broadband (LTE, 4G, 3G, etc.) can be turned off to save power."
 msgstr "Mobile broadband (LTE, 4G, 3G, etc.) can be turned off to save power."
 
-#: panels/power/cc-power-panel.c:1971
+#: panels/power/cc-power-panel.c:2045
 msgid "_Bluetooth"
 msgstr "_Bluetooth"
 
-#: panels/power/cc-power-panel.c:1976
-#| msgid "Turn off Bluetooth to save power."
+#: panels/power/cc-power-panel.c:2051
 msgid "Bluetooth can be turned off to save power."
 msgstr "Bluetooth can be turned off to save power."
 
-#: panels/power/cc-power-panel.c:2034
+#: panels/power/cc-power-panel.c:2107
 msgid "When on battery power"
 msgstr "When on battery power"
 
-#: panels/power/cc-power-panel.c:2036
+#: panels/power/cc-power-panel.c:2109
 msgid "When plugged in"
 msgstr "When plugged in"
 
-#: panels/power/cc-power-panel.c:2130
+#: panels/power/cc-power-panel.c:2203
 msgid "Suspend"
 msgstr "Suspend"
 
-#: panels/power/cc-power-panel.c:2131
+#: panels/power/cc-power-panel.c:2204
 msgid "Power Off"
 msgstr "Power Off"
 
-#: panels/power/cc-power-panel.c:2132
+#: panels/power/cc-power-panel.c:2205
 msgid "Hibernate"
 msgstr "Hibernate"
 
-#: panels/power/cc-power-panel.c:2133
+#: panels/power/cc-power-panel.c:2206
 msgid "Nothing"
 msgstr "Nothing"
 
 #. Frame header
-#: panels/power/cc-power-panel.c:2233
+#: panels/power/cc-power-panel.c:2306
 msgid "Suspend & Power Button"
 msgstr "Suspend & Power Button"
 
-#: panels/power/cc-power-panel.c:2271
+#: panels/power/cc-power-panel.c:2348
 msgid "_Automatic suspend"
 msgstr "_Automatic suspend"
 
-#: panels/power/cc-power-panel.c:2272
+#: panels/power/cc-power-panel.c:2350
 msgid "Automatic suspend"
 msgstr "Automatic suspend"
 
-#: panels/power/cc-power-panel.c:2335
+#: panels/power/cc-power-panel.c:2416
 msgid "_When the Power Button is pressed"
 msgstr "_When the Power Button is pressed"
 
-#: panels/power/cc-power-panel.c:2445 panels/thunderbolt/cc-bolt-panel.ui:466
-#: panels/thunderbolt/cc-bolt-panel.ui:525 shell/cc-panel-list.ui:45
-#: shell/cc-window.c:272
-msgid "Devices"
-msgstr "Devices"
-
-#: panels/power/gnome-power-panel.desktop.in.in:3
-msgid "Power"
-msgstr "Power"
-
-#: 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"
-
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/power/gnome-power-panel.desktop.in.in:7
-msgid "gnome-power-manager"
-msgstr "gnome-power-manager"
-
-#. Translators: Search terms to find the Power panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
-#: panels/power/gnome-power-panel.desktop.in.in:19
-msgid ""
-"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
-msgstr ""
-"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:13
+#| msgid "15 minutes"
+msgctxt "automatic_suspend"
+msgid "15 minutes"
+msgstr "15 minutes"
 
-#: panels/power/power.ui:17
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:17
+#| msgid "20 minutes"
+msgctxt "automatic_suspend"
 msgid "20 minutes"
 msgstr "20 minutes"
 
-#: panels/power/power.ui:21
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:21
+#| msgid "25 minutes"
+msgctxt "automatic_suspend"
 msgid "25 minutes"
 msgstr "25 minutes"
 
-#: panels/power/power.ui:29
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:25
+#| msgid "30 minutes"
+msgctxt "automatic_suspend"
+msgid "30 minutes"
+msgstr "30 minutes"
+
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:29
+#| msgid "45 minutes"
+msgctxt "automatic_suspend"
 msgid "45 minutes"
 msgstr "45 minutes"
 
-#: panels/power/power.ui:33 panels/privacy/privacy.ui:42
-#: panels/privacy/privacy.ui:56
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:33
+#| msgid "1 hour"
+msgctxt "automatic_suspend"
 msgid "1 hour"
 msgstr "1 hour"
 
-#: panels/power/power.ui:37
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:37
+#| msgid "80 minutes"
+msgctxt "automatic_suspend"
 msgid "80 minutes"
 msgstr "80 minutes"
 
-#: panels/power/power.ui:41
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:41
+#| msgid "90 minutes"
+msgctxt "automatic_suspend"
 msgid "90 minutes"
 msgstr "90 minutes"
 
-#: panels/power/power.ui:45
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:45
+#| msgid "100 minutes"
+msgctxt "automatic_suspend"
 msgid "100 minutes"
 msgstr "100 minutes"
 
-#: panels/power/power.ui:49
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:49
+#| msgid "2 hours"
+msgctxt "automatic_suspend"
 msgid "2 hours"
 msgstr "2 hours"
 
-#: panels/power/power.ui:63 panels/privacy/privacy.ui:22
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:63
+#| msgid "1 minute"
+msgctxt "blank_screen"
 msgid "1 minute"
 msgstr "1 minute"
 
-#: panels/power/power.ui:67 panels/privacy/privacy.ui:26
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:67
+#| msgid "2 minutes"
+msgctxt "blank_screen"
 msgid "2 minutes"
 msgstr "2 minutes"
 
-#: panels/power/power.ui:71 panels/privacy/privacy.ui:30
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:71
+#| msgid "3 minutes"
+msgctxt "blank_screen"
 msgid "3 minutes"
 msgstr "3 minutes"
 
-#: panels/power/power.ui:75
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:75
+#| msgid "4 minutes"
+msgctxt "blank_screen"
 msgid "4 minutes"
 msgstr "4 minutes"
 
-#: panels/power/power.ui:79 panels/privacy/privacy.ui:34
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:79
+#| msgid "5 minutes"
+msgctxt "blank_screen"
 msgid "5 minutes"
 msgstr "5 minutes"
 
-#: panels/power/power.ui:83
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:83
+#| msgid "8 minutes"
+msgctxt "blank_screen"
 msgid "8 minutes"
 msgstr "8 minutes"
 
-#: panels/power/power.ui:87
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:87
+#| msgid "10 minutes"
+msgctxt "blank_screen"
 msgid "10 minutes"
 msgstr "10 minutes"
 
-#: panels/power/power.ui:91
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:91
+#| msgid "12 minutes"
+msgctxt "blank_screen"
 msgid "12 minutes"
 msgstr "12 minutes"
 
-#: panels/power/power.ui:167
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:95
+#| msgid "15 minutes"
+msgctxt "blank_screen"
+msgid "15 minutes"
+msgstr "15 minutes"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:99
+#| msgid "Never"
+msgctxt "blank_screen"
+msgid "Never"
+msgstr "Never"
+
+#: panels/power/cc-power-panel.ui:167
 msgid "Automatic Suspend"
 msgstr "Automatic Suspend"
 
-#: panels/power/power.ui:192
+#: panels/power/cc-power-panel.ui:192
 msgid "_Plugged In"
 msgstr "_Plugged In"
 
-#: panels/power/power.ui:208
+#: panels/power/cc-power-panel.ui:208
 msgid "On _Battery Power"
 msgstr "On _Battery Power"
 
-#: panels/power/power.ui:253 panels/power/power.ui:313
-#: panels/universal-access/uap.ui:1507
+#: panels/power/cc-power-panel.ui:253 panels/power/cc-power-panel.ui:313
+#: panels/universal-access/cc-ua-panel.ui:1507
 msgid "Delay"
 msgstr "Delay"
 
+#: panels/power/gnome-power-panel.desktop.in.in:3
+msgid "Power"
+msgstr "Power"
+
+#: 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"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/power/gnome-power-panel.desktop.in.in:7
+msgid "gnome-power-manager"
+msgstr "gnome-power-manager"
+
+#. Translators: Search terms to find the Power panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/power/gnome-power-panel.desktop.in.in:19
+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/printers/authentication-dialog.ui:11
 msgid " "
 msgstr " "
@@ -4293,7 +4670,7 @@ msgstr "Username"
 #. Translators: This is a password needed for printing.
 #: panels/printers/authentication-dialog.ui:96
 #: panels/printers/jobs-dialog.ui:70 panels/printers/new-printer-dialog.ui:383
-#: panels/user-accounts/data/account-dialog.ui:240
+#: panels/user-accounts/cc-add-user-dialog.ui:249
 msgid "Password"
 msgstr "Password"
 
@@ -4303,45 +4680,45 @@ msgid "Authentication Required"
 msgstr "Authentication Required"
 
 #. Translators: %s is the printer name
-#: panels/printers/cc-printers-panel.c:809
+#: panels/printers/cc-printers-panel.c:715
 #, 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:1057
+#: panels/printers/cc-printers-panel.c:938
 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:1394
+#: panels/printers/cc-printers-panel.c:1242
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "Could not load ui: %s"
 
-#: panels/printers/details-dialog.ui:63 panels/printers/printer-entry.ui:223
+#: panels/printers/details-dialog.ui:64 panels/printers/printer-entry.ui:223
 msgid "Location"
 msgstr "Location"
 
 #. Translators: Name of column showing printer drivers
-#: panels/printers/details-dialog.ui:111
+#: panels/printers/details-dialog.ui:114
 #: panels/printers/pp-ppd-selection-dialog.c:250
 msgid "Driver"
 msgstr "Driver"
 
-#: panels/printers/details-dialog.ui:147
+#: panels/printers/details-dialog.ui:152
 msgid "Searching for preferred drivers…"
 msgstr "Searching for preferred drivers…"
 
-#: panels/printers/details-dialog.ui:169
+#: panels/printers/details-dialog.ui:174
 msgid "Search for Drivers"
 msgstr "Search for Drivers"
 
-#: panels/printers/details-dialog.ui:177
+#: panels/printers/details-dialog.ui:182
 msgid "Select from Database…"
 msgstr "Select from Database…"
 
-#: panels/printers/details-dialog.ui:185
+#: panels/printers/details-dialog.ui:190
 msgid "Install PPD File…"
 msgstr "Install PPD File…"
 
@@ -4365,7 +4742,6 @@ msgstr "Printer;Queue;Print;Paper;Ink;Toner;"
 
 #. Translators: This is a windows domain used with SMB protocol.
 #: panels/printers/jobs-dialog.ui:44
-#| msgid "_Domain"
 msgid "Domain"
 msgstr "Domain"
 
@@ -4381,7 +4757,6 @@ msgstr "Clear All"
 
 #. Translators: This button pop up authentication dialog for print jobs which need credentials.
 #: panels/printers/jobs-dialog.ui:225
-#| msgid "Authenticate"
 msgid "_Authenticate"
 msgstr "_Authenticate"
 
@@ -4392,8 +4767,8 @@ msgstr "No Active Printer Jobs"
 
 #. Translators: This is the title presented at top of the dialog.
 #: panels/printers/new-printer-dialog.ui:29
-#: panels/printers/pp-new-printer-dialog.c:384
-#: panels/printers/pp-new-printer-dialog.c:456
+#: panels/printers/pp-new-printer-dialog.c:363
+#: panels/printers/pp-new-printer-dialog.c:427
 msgid "Add Printer"
 msgstr "Add Printer"
 
@@ -4420,26 +4795,26 @@ 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:22 panels/printers/pp-options-dialog.c:893
+#: panels/printers/options-dialog.ui:22 panels/printers/pp-options-dialog.c:907
 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:134
-#: panels/printers/pp-details-dialog.c:434
+#: panels/printers/pp-details-dialog.c:133
+#: panels/printers/pp-details-dialog.c:417
 #, c-format
 msgid "%s Details"
 msgstr "%s Details"
 
-#: panels/printers/pp-details-dialog.c:183
+#: panels/printers/pp-details-dialog.c:180
 msgid "No suitable driver found"
 msgstr "No suitable driver found"
 
-#: panels/printers/pp-details-dialog.c:327
+#: panels/printers/pp-details-dialog.c:310
 msgid "Select PPD File"
 msgstr "Select PPD File"
 
-#: panels/printers/pp-details-dialog.c:336
+#: panels/printers/pp-details-dialog.c:319
 msgid ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
@@ -4452,7 +4827,7 @@ msgid "Select Printer Driver"
 msgstr "Select Printer Driver"
 
 #: panels/printers/ppd-selection-dialog.ui:40
-#: panels/user-accounts/um-photo-dialog.c:105
+#: panels/user-accounts/cc-avatar-chooser.c:107
 msgid "Select"
 msgstr "Select"
 
@@ -4461,50 +4836,50 @@ 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:472
 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:707
 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:65
+#: panels/printers/pp-ppd-option-widget.c:69
 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:67
+#: panels/printers/pp-ppd-option-widget.c:71
 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:69
+#: panels/printers/pp-ppd-option-widget.c:73
 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:71
 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:73
 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:75
 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:77
 msgid "Reverse portrait"
 msgstr "Reverse portrait"
 
@@ -4522,7 +4897,6 @@ msgstr "Paused"
 
 #. Translators: Job's state (job needs authentication to proceed further)
 #: panels/printers/pp-jobs-dialog.c:245
-#| msgid "Authentication required"
 msgctxt "print job"
 msgid "Authentication required"
 msgstr "Authentication required"
@@ -4560,194 +4934,203 @@ msgstr "Completed"
 #. Translators: This label shows how many jobs of this printer needs to be authenticated to be printed.
 #: panels/printers/pp-jobs-dialog.c:390
 #, c-format
-#| msgid "Server requires authentication"
 msgid "%u Job Requires Authentication"
 msgid_plural "%u Jobs Require Authentication"
 msgstr[0] "%u Job Requires Authentication"
 msgstr[1] "%u Jobs Require Authentication"
 
 #. Translators: This is the printer name for which we are showing the active jobs
-#: panels/printers/pp-jobs-dialog.c:617
+#: panels/printers/pp-jobs-dialog.c:613
 #, c-format
 msgctxt "Printer jobs dialog title"
 msgid "%s — Active Jobs"
 msgstr "%s — Active Jobs"
 
 #. Translators: The printer needs authentication info to print.
-#: panels/printers/pp-jobs-dialog.c:622
+#: panels/printers/pp-jobs-dialog.c:617
 #, c-format
-#| msgid "Enter username and password to view printers on %s."
 msgid "Enter credentials to print from %s."
 msgstr "Enter credentials to print from %s."
 
-#: panels/printers/pp-new-printer-dialog.c:402
+#: panels/printers/pp-new-printer-dialog.c:380
 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:384
 #, c-format
 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:388
 #, c-format
 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:894
+#: panels/printers/pp-new-printer-dialog.c:838
 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:1814
+#: panels/printers/pp-new-printer-dialog.c:1680
 msgid "USB"
 msgstr "USB"
 
 #. Translators: The found device is a printer connected via serial port
-#: panels/printers/pp-new-printer-dialog.c:1819
+#: panels/printers/pp-new-printer-dialog.c:1685
 msgid "Serial Port"
 msgstr "Serial Port"
 
 #. Translators: The found device is a printer connected via parallel port
-#: panels/printers/pp-new-printer-dialog.c:1826
+#: panels/printers/pp-new-printer-dialog.c:1692
 msgid "Parallel Port"
 msgstr "Parallel Port"
 
 #. Translators: Location of found network printer (e.g. Kitchen, Reception)
-#: panels/printers/pp-new-printer-dialog.c:1868
+#: panels/printers/pp-new-printer-dialog.c:1734
 #, c-format
 msgid "Location: %s"
 msgstr "Location: %s"
 
 #. Translators: Network address of found printer
-#: panels/printers/pp-new-printer-dialog.c:1873
+#: panels/printers/pp-new-printer-dialog.c:1739
 #, 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:1902
+#: panels/printers/pp-new-printer-dialog.c:1766
 msgid "Server requires authentication"
 msgstr "Server requires authentication"
 
-#: panels/printers/pp-options-dialog.c:83
+#: panels/printers/pp-options-dialog.c:90
 msgid "Two Sided"
 msgstr "Two Sided"
 
-#: panels/printers/pp-options-dialog.c:84
+#: panels/printers/pp-options-dialog.c:91
 msgid "Paper Type"
 msgstr "Paper Type"
 
-#: panels/printers/pp-options-dialog.c:85
+#: panels/printers/pp-options-dialog.c:92
 msgid "Paper Source"
 msgstr "Paper Source"
 
-#: panels/printers/pp-options-dialog.c:86
+#: panels/printers/pp-options-dialog.c:93
 msgid "Output Tray"
 msgstr "Output Tray"
 
-#: panels/printers/pp-options-dialog.c:88
+#: panels/printers/pp-options-dialog.c:94
+#| msgid "Resolution"
+msgctxt "printing option"
+msgid "Resolution"
+msgstr "Resolution"
+
+#: panels/printers/pp-options-dialog.c:95
 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:548
 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:560
 msgid "Two-sided"
 msgstr "Two-sided"
 
+#. Translators: This option sets orientation of print (portrait, landscape...)
+#: panels/printers/pp-options-dialog.c:572
+msgid "Orientation"
+msgstr "Orientation"
+
 #. Translators: "General" tab contains general printer options
-#: panels/printers/pp-options-dialog.c:655
+#: panels/printers/pp-options-dialog.c:669
 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:672
 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:675
 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:678
 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:681
 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:684
 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:687
 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:690
 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:920
 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:75
+#: panels/printers/pp-ppd-option-widget.c:77
+#: panels/printers/pp-ppd-option-widget.c:85
 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:79
+#: panels/printers/pp-ppd-option-widget.c:81
+#: panels/printers/pp-ppd-option-widget.c:83
+#: panels/printers/pp-ppd-option-widget.c:87
 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:89
 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:91
 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:93
 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:95
 msgid "No pre-filtering"
 msgstr "No pre-filtering"
 
@@ -4757,12 +5140,12 @@ msgid "Manufacturer"
 msgstr "Manufacturer"
 
 #. Translators: This is the label of the button that opens the Jobs Dialog.
-#: panels/printers/pp-printer-entry.c:615 panels/printers/printer-entry.ui:166
+#: panels/printers/pp-printer-entry.c:606 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:620
+#: panels/printers/pp-printer-entry.c:611
 #, c-format
 msgid "%u Job"
 msgid_plural "%u Jobs"
@@ -4770,111 +5153,111 @@ msgstr[0] "%u Job"
 msgstr[1] "%u Jobs"
 
 #. Translators: The printer is low on toner
-#: panels/printers/pp-printer-entry.c:780
+#: panels/printers/pp-printer-entry.c:766
 msgid "Low on toner"
 msgstr "Low on toner"
 
 #. Translators: The printer has no toner left
-#: panels/printers/pp-printer-entry.c:782
+#: panels/printers/pp-printer-entry.c:768
 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:785
+#: panels/printers/pp-printer-entry.c:771
 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:788
+#: panels/printers/pp-printer-entry.c:774
 msgid "Out of developer"
 msgstr "Out of developer"
 
 #. Translators: "marker" is one color bin of the printer
-#: panels/printers/pp-printer-entry.c:790
+#: panels/printers/pp-printer-entry.c:776
 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:792
+#: panels/printers/pp-printer-entry.c:778
 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:794
+#: panels/printers/pp-printer-entry.c:780
 msgid "Open cover"
 msgstr "Open cover"
 
 #. Translators: One or more doors on the printer are open
-#: panels/printers/pp-printer-entry.c:796
+#: panels/printers/pp-printer-entry.c:782
 msgid "Open door"
 msgstr "Open door"
 
 #. Translators: At least one input tray is low on media
-#: panels/printers/pp-printer-entry.c:798
+#: panels/printers/pp-printer-entry.c:784
 msgid "Low on paper"
 msgstr "Low on paper"
 
 #. Translators: At least one input tray is empty
-#: panels/printers/pp-printer-entry.c:800
+#: panels/printers/pp-printer-entry.c:786
 msgid "Out of paper"
 msgstr "Out of paper"
 
 #. Translators: The printer is offline
-#: panels/printers/pp-printer-entry.c:802
+#: panels/printers/pp-printer-entry.c:788
 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:804
-#: panels/printers/pp-printer-entry.c:932
+#: panels/printers/pp-printer-entry.c:790
+#: panels/printers/pp-printer-entry.c:918
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "Stopped"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: panels/printers/pp-printer-entry.c:806
+#: panels/printers/pp-printer-entry.c:792
 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:808
+#: panels/printers/pp-printer-entry.c:794
 msgid "Waste receptacle full"
 msgstr "Waste receptacle full"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: panels/printers/pp-printer-entry.c:810
+#: panels/printers/pp-printer-entry.c:796
 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:812
+#: panels/printers/pp-printer-entry.c:798
 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:918
+#: panels/printers/pp-printer-entry.c:904
 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:923
+#: panels/printers/pp-printer-entry.c:909
 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:928
+#: panels/printers/pp-printer-entry.c:914
 msgctxt "printer state"
 msgid "Processing"
 msgstr "Processing"
 
 #. Translators: Name of job which makes printer to clean its heads
-#: panels/printers/pp-printer-entry.c:952
+#: panels/printers/pp-printer-entry.c:938
 msgid "Clean print heads"
 msgstr "Clean print heads"
 
@@ -4941,70 +5324,94 @@ msgstr ""
 "Sorry! The system printing service\n"
 "doesn’t seem to be available."
 
-#: panels/privacy/cc-privacy-panel.c:390 panels/privacy/privacy.ui:280
+#: panels/privacy/cc-privacy-panel.c:423 panels/privacy/cc-privacy-panel.ui:280
 msgid "Screen Lock"
 msgstr "Screen Lock"
 
-#: panels/privacy/cc-privacy-panel.c:440
+#: panels/privacy/cc-privacy-panel.c:467
 msgid "In use"
 msgstr "In use"
 
-#: panels/privacy/cc-privacy-panel.c:445
+#: panels/privacy/cc-privacy-panel.c:472
 msgctxt "Location services status"
 msgid "On"
 msgstr "On"
 
-#: panels/privacy/cc-privacy-panel.c:446
+#: panels/privacy/cc-privacy-panel.c:473
 msgctxt "Location services status"
 msgid "Off"
 msgstr "Off"
 
-#: panels/privacy/cc-privacy-panel.c:821 panels/privacy/privacy.ui:745
-msgid "Location Services"
-msgstr "Location Services"
+#: panels/privacy/cc-privacy-panel.c:895
+#| msgid "Off"
+msgctxt "Camera status"
+msgid "Off"
+msgstr "Off"
+
+#: panels/privacy/cc-privacy-panel.c:897
+#| msgid "On"
+msgctxt "Camera status"
+msgid "On"
+msgstr "On"
+
+#: panels/privacy/cc-privacy-panel.c:928
+#| msgid "Off"
+msgctxt "Microphone status"
+msgid "Off"
+msgstr "Off"
+
+#: panels/privacy/cc-privacy-panel.c:930
+#| msgid "On"
+msgctxt "Microphone status"
+msgid "On"
+msgstr "On"
 
-#: panels/privacy/cc-privacy-panel.c:942 panels/privacy/privacy.ui:127
+#: panels/privacy/cc-privacy-panel.c:1036
+#: panels/privacy/cc-privacy-panel.ui:127
 msgid "Usage & History"
 msgstr "Usage & History"
 
-#: panels/privacy/cc-privacy-panel.c:1071
+#: panels/privacy/cc-privacy-panel.c:1157
 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:1158
 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:1159
 msgid "_Empty Trash"
 msgstr "_Empty Wastebasket"
 
-#: panels/privacy/cc-privacy-panel.c:1096
+#: panels/privacy/cc-privacy-panel.c:1180
 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:1181
 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:1182
 msgid "_Purge Temporary Files"
 msgstr "_Purge Temporary Files"
 
-#: panels/privacy/cc-privacy-panel.c:1120 panels/privacy/privacy.ui:432
+#: panels/privacy/cc-privacy-panel.c:1204
+#: panels/privacy/cc-privacy-panel.ui:432
 msgid "Purge Trash & Temporary Files"
 msgstr "Purge Wastebasket & Temporary Files"
 
-#: panels/privacy/cc-privacy-panel.c:1160 panels/privacy/privacy.ui:637
+#: panels/privacy/cc-privacy-panel.c:1237
+#: panels/privacy/cc-privacy-panel.ui:637
 msgid "Software Usage"
 msgstr "Software Usage"
 
-#: panels/privacy/cc-privacy-panel.c:1201 panels/privacy/privacy.ui:959
+#: panels/privacy/cc-privacy-panel.c:1276
+#: panels/privacy/cc-privacy-panel.ui:1169
 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:1288
 #, c-format
 msgid ""
 "Sending reports of technical problems helps us improve %s. Reports are sent "
@@ -5013,82 +5420,166 @@ 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:719
+#: panels/privacy/cc-privacy-panel.c:1300
+#: panels/privacy/cc-privacy-panel.ui:719
 msgid "Privacy Policy"
 msgstr "Privacy Policy"
 
-#: panels/privacy/gnome-privacy-panel.desktop.in.in:3
-msgid "Privacy"
-msgstr "Privacy"
-
-#: 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
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/privacy/gnome-privacy-panel.desktop.in.in:8
-msgid "preferences-system-privacy"
-msgstr "preferences-system-privacy"
-
-#. Translators: Search terms to find the Privacy panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
-#: panels/privacy/gnome-privacy-panel.desktop.in.in:20
-msgid ""
-"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
-"network;identity;"
-msgstr ""
-"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
-"network;identity;"
-
-#: panels/privacy/privacy.ui:14
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/privacy/cc-privacy-panel.ui:14
+#| msgid "Screen Turns Off"
+msgctxt "lock_screen"
 msgid "Screen Turns Off"
 msgstr "Screen Turns Off"
 
-#: panels/privacy/privacy.ui:18
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/privacy/cc-privacy-panel.ui:18
+#| msgid "30 seconds"
+msgctxt "lock_screen"
 msgid "30 seconds"
 msgstr "30 seconds"
 
-#: panels/privacy/privacy.ui:60 panels/privacy/privacy.ui:106
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/privacy/cc-privacy-panel.ui:22
+#| msgid "1 minute"
+msgctxt "lock_screen"
+msgid "1 minute"
+msgstr "1 minute"
+
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/privacy/cc-privacy-panel.ui:26
+#| msgid "2 minutes"
+msgctxt "lock_screen"
+msgid "2 minutes"
+msgstr "2 minutes"
+
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/privacy/cc-privacy-panel.ui:30
+#| msgid "3 minutes"
+msgctxt "lock_screen"
+msgid "3 minutes"
+msgstr "3 minutes"
+
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/privacy/cc-privacy-panel.ui:34
+#| msgid "5 minutes"
+msgctxt "lock_screen"
+msgid "5 minutes"
+msgstr "5 minutes"
+
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/privacy/cc-privacy-panel.ui:38
+#| msgid "30 minutes"
+msgctxt "lock_screen"
+msgid "30 minutes"
+msgstr "30 minutes"
+
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/privacy/cc-privacy-panel.ui:42
+#| msgid "1 hour"
+msgctxt "lock_screen"
+msgid "1 hour"
+msgstr "1 hour"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:56
+#| msgid "1 hour"
+msgctxt "purge_files"
+msgid "1 hour"
+msgstr "1 hour"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:60
+#| msgid "1 day"
+msgctxt "purge_files"
 msgid "1 day"
 msgstr "1 day"
 
-#: panels/privacy/privacy.ui:64
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:64
+#| msgid "2 days"
+msgctxt "purge_files"
 msgid "2 days"
 msgstr "2 days"
 
-#: panels/privacy/privacy.ui:68
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:68
+#| msgid "3 days"
+msgctxt "purge_files"
 msgid "3 days"
 msgstr "3 days"
 
-#: panels/privacy/privacy.ui:72
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:72
+#| msgid "4 days"
+msgctxt "purge_files"
 msgid "4 days"
 msgstr "4 days"
 
-#: panels/privacy/privacy.ui:76
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:76
+#| msgid "5 days"
+msgctxt "purge_files"
 msgid "5 days"
 msgstr "5 days"
 
-#: panels/privacy/privacy.ui:80
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:80
+#| msgid "6 days"
+msgctxt "purge_files"
 msgid "6 days"
 msgstr "6 days"
 
-#: panels/privacy/privacy.ui:84 panels/privacy/privacy.ui:110
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:84
+#| msgid "7 days"
+msgctxt "purge_files"
 msgid "7 days"
 msgstr "7 days"
 
-#: panels/privacy/privacy.ui:88
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:88
+#| msgid "14 days"
+msgctxt "purge_files"
 msgid "14 days"
 msgstr "14 days"
 
-#: panels/privacy/privacy.ui:92 panels/privacy/privacy.ui:114
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:92
+#| msgid "30 days"
+msgctxt "purge_files"
+msgid "30 days"
+msgstr "30 days"
+
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/privacy/cc-privacy-panel.ui:106
+#| msgid "1 day"
+msgctxt "retain_history"
+msgid "1 day"
+msgstr "1 day"
+
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/privacy/cc-privacy-panel.ui:110
+#| msgid "7 days"
+msgctxt "retain_history"
+msgid "7 days"
+msgstr "7 days"
+
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/privacy/cc-privacy-panel.ui:114
+#| msgid "30 days"
+msgctxt "retain_history"
 msgid "30 days"
 msgstr "30 days"
 
-#: panels/privacy/privacy.ui:118
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/privacy/cc-privacy-panel.ui:118
+#| msgid "Forever"
+msgctxt "retain_history"
 msgid "Forever"
 msgstr "Forever"
 
-#: panels/privacy/privacy.ui:148
+#: panels/privacy/cc-privacy-panel.ui:148
 msgid ""
 "Remembering your history makes things easier to find again. These items are "
 "never shared over the network."
@@ -5096,35 +5587,35 @@ msgstr ""
 "Remembering your history makes things easier to find again. These items are "
 "never shared over the network."
 
-#: panels/privacy/privacy.ui:176
+#: panels/privacy/cc-privacy-panel.ui:176
 msgid "_Recently Used"
 msgstr "_Recently Used"
 
-#: panels/privacy/privacy.ui:207
+#: panels/privacy/cc-privacy-panel.ui:207
 msgid "Retain _History"
 msgstr "Retain _History"
 
-#: panels/privacy/privacy.ui:247
+#: panels/privacy/cc-privacy-panel.ui:247
 msgid "Cl_ear Recent History"
 msgstr "Cl_ear Recent History"
 
-#: panels/privacy/privacy.ui:301
+#: panels/privacy/cc-privacy-panel.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:328
+#: panels/privacy/cc-privacy-panel.ui:328
 msgid "Automatic Screen _Lock"
 msgstr "Automatic Screen _Lock"
 
-#: panels/privacy/privacy.ui:362
+#: panels/privacy/cc-privacy-panel.ui:362
 msgid "Lock screen _after blank for"
 msgstr "Lock screen _after blank for"
 
-#: panels/privacy/privacy.ui:394
+#: panels/privacy/cc-privacy-panel.ui:394
 msgid "Show _Notifications"
 msgstr "Show _Notifications"
 
-#: panels/privacy/privacy.ui:454
+#: panels/privacy/cc-privacy-panel.ui:454
 msgid ""
 "Automatically purge the Trash and temporary files to help keep your computer "
 "free of unnecessary sensitive information."
@@ -5132,27 +5623,27 @@ msgstr ""
 "Automatically purge the Wastebasket and temporary files to help keep your "
 "computer free of unnecessary sensitive information."
 
-#: panels/privacy/privacy.ui:483
+#: panels/privacy/cc-privacy-panel.ui:483
 msgid "Automatically empty _Trash"
 msgstr "Automatically empty _Wastebasket"
 
-#: panels/privacy/privacy.ui:515
+#: panels/privacy/cc-privacy-panel.ui:515
 msgid "Automatically purge Temporary _Files"
 msgstr "Automatically purge Temporary _Files"
 
-#: panels/privacy/privacy.ui:546
+#: panels/privacy/cc-privacy-panel.ui:546
 msgid "Purge _After"
 msgstr "Purge _After"
 
-#: panels/privacy/privacy.ui:590
+#: panels/privacy/cc-privacy-panel.ui:590
 msgid "_Empty Trash…"
 msgstr "_Empty Wastebasket…"
 
-#: panels/privacy/privacy.ui:606
+#: panels/privacy/cc-privacy-panel.ui:606
 msgid "_Purge Temporary Files…"
 msgstr "_Purge Temporary Files…"
 
-#: panels/privacy/privacy.ui:654
+#: panels/privacy/cc-privacy-panel.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 "
@@ -5168,11 +5659,37 @@ msgstr ""
 "All the information we collect is made anonymous, and we will never share "
 "your data with third parties."
 
-#: panels/privacy/privacy.ui:681
+#: panels/privacy/cc-privacy-panel.ui:681
 msgid "_Send software usage statistics"
 msgstr "_Send software usage statistics"
 
-#: panels/privacy/privacy.ui:764
+#: panels/privacy/cc-privacy-panel.ui:764
+msgid ""
+"Use of the camera allows applications to capture photos and video. Disabling "
+"the camera may cause some applications to not function properly."
+msgstr ""
+"Use of the camera allows applications to capture photos and video. Disabling "
+"the camera may cause some applications to not function properly."
+
+#: panels/privacy/cc-privacy-panel.ui:812
+#| msgid "%s Camera"
+msgid "_Camera"
+msgstr "_Camera"
+
+#: panels/privacy/cc-privacy-panel.ui:869
+msgid ""
+"Use of the microphone allows applications to capture sounds. Disabling the "
+"microphone may cause some applications to not function properly."
+msgstr ""
+"Use of the microphone allows applications to capture sounds. Disabling the "
+"microphone may cause some applications to not function properly."
+
+#: panels/privacy/cc-privacy-panel.ui:917
+#| msgid "Microphone Volume"
+msgid "_Microphone"
+msgstr "_Microphone"
+
+#: panels/privacy/cc-privacy-panel.ui:974
 msgid ""
 "Location services allow applications to know your location. Using Wi-Fi and "
 "mobile broadband increases accuracy."
@@ -5180,7 +5697,7 @@ msgstr ""
 "Location services allow applications to know your location. Using Wi-Fi and "
 "mobile broadband increases accuracy."
 
-#: panels/privacy/privacy.ui:778
+#: panels/privacy/cc-privacy-panel.ui:988
 msgid ""
 "Uses Mozilla Location Service: <a href='https://location.services.mozilla.";
 "com/privacy'>Privacy Policy</a>"
@@ -5188,14 +5705,37 @@ msgstr ""
 "Uses Mozilla Location Service: <a href='https://location.services.mozilla.";
 "com/privacy'>Privacy Policy</a>"
 
-#: panels/privacy/privacy.ui:828
+#: panels/privacy/cc-privacy-panel.ui:1038
 msgid "_Location Services"
 msgstr "_Location Services"
 
-#: panels/privacy/privacy.ui:1026
+#: panels/privacy/cc-privacy-panel.ui:1236
 msgid "_Automatic Problem Reporting"
 msgstr "_Automatic Problem Reporting"
 
+#: panels/privacy/gnome-privacy-panel.desktop.in.in:3
+msgid "Privacy"
+msgstr "Privacy"
+
+#: 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
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/privacy/gnome-privacy-panel.desktop.in.in:8
+msgid "preferences-system-privacy"
+msgstr "preferences-system-privacy"
+
+#. Translators: Search terms to find the Privacy panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/privacy/gnome-privacy-panel.desktop.in.in:20
+msgid ""
+"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
+"network;identity;"
+msgstr ""
+"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
+"network;identity;"
+
 #: panels/region/cc-format-chooser.c:114
 msgctxt "measurement format"
 msgid "Imperial"
@@ -5206,7 +5746,7 @@ msgctxt "measurement format"
 msgid "Metric"
 msgstr "Metric"
 
-#: panels/region/cc-format-chooser.c:277
+#: panels/region/cc-format-chooser.c:286
 msgid "No regions found"
 msgstr "No regions found"
 
@@ -5214,185 +5754,153 @@ msgstr "No regions found"
 msgid "Formats"
 msgstr "Formats"
 
-#: panels/region/cc-format-chooser.ui:120
+#: panels/region/cc-format-chooser.ui:106
 msgid "Preview"
 msgstr "Preview"
 
-#: panels/region/cc-format-chooser.ui:137
+#: panels/region/cc-format-chooser.ui:123
 msgid "Dates"
 msgstr "Dates"
 
-#: panels/region/cc-format-chooser.ui:168
+#: panels/region/cc-format-chooser.ui:154
 msgid "Times"
 msgstr "Times"
 
-#: panels/region/cc-format-chooser.ui:199
+#: panels/region/cc-format-chooser.ui:185
 msgid "Dates & Times"
 msgstr "Dates & Times"
 
-#: panels/region/cc-format-chooser.ui:230
+#: panels/region/cc-format-chooser.ui:216
 msgid "Numbers"
 msgstr "Numbers"
 
-#: panels/region/cc-format-chooser.ui:247
+#: panels/region/cc-format-chooser.ui:233
 msgid "Measurement"
 msgstr "Measurement"
 
-#: panels/region/cc-format-chooser.ui:264
+#: panels/region/cc-format-chooser.ui:250
 msgid "Paper"
 msgstr "Paper"
 
-#: panels/region/cc-input-chooser.c:182
+#: panels/region/cc-input-chooser.c:193
 msgid "No input sources found"
 msgstr "No input sources found"
 
-#: panels/region/cc-input-chooser.c:981
+#: panels/region/cc-input-chooser.c:948
 msgctxt "Input Source"
 msgid "Other"
 msgstr "Other"
 
-#: panels/region/cc-region-panel.c:802
-msgid "No input source selected"
-msgstr "No input source selected"
+#: panels/region/cc-input-chooser.ui:5
+msgid "Add an Input Source"
+msgstr "Add an Input Source"
+
+#: panels/region/cc-input-chooser.ui:77
+msgid "Input methods can’t be used on the login screen"
+msgstr "Input methods can’t be used on the login screen"
 
-#: panels/region/cc-region-panel.c:1597
+#: panels/region/cc-region-panel.c:1505
 msgid "Login _Screen"
 msgstr "Login _Screen"
 
-#: panels/region/gnome-region-panel.desktop.in.in:3
-msgid "Region & Language"
-msgstr "Region & Language"
+#: panels/region/cc-region-panel.ui:64
+#: panels/user-accounts/cc-user-panel.ui:362
+msgid "_Language"
+msgstr "_Language"
 
-#: 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/cc-region-panel.ui:99
+msgid "Restart the session for changes to take effect"
+msgstr "Restart the session for changes to take effect"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/region/gnome-region-panel.desktop.in.in:7
-msgid "preferences-desktop-locale"
-msgstr "preferences-desktop-locale"
+#: panels/region/cc-region-panel.ui:114
+msgid "Restart…"
+msgstr "Restart…"
 
-#. Translators: Search terms to find the Region and Language panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
-#: panels/region/gnome-region-panel.desktop.in.in:19
-msgid "Language;Layout;Keyboard;Input;"
-msgstr "Language;Layout;Keyboard;Input;"
+#: panels/region/cc-region-panel.ui:147
+msgid "_Formats"
+msgstr "_Formats"
 
-#: panels/region/input-chooser.ui:5
-msgid "Add an Input Source"
-msgstr "Add an Input Source"
+#: panels/region/cc-region-panel.ui:195
+msgid "Input Sources"
+msgstr "Input Sources"
 
-#: panels/region/input-chooser.ui:77
-msgid "Input methods can’t be used on the login screen"
-msgstr "Input methods can’t be used on the login screen"
+#: panels/region/cc-region-panel.ui:209
+#| msgid "Move the selected keyboard layout down in the list"
+msgid "Choose keyboard layouts or input methods."
+msgstr "Choose keyboard layouts or input methods."
+
+#: panels/region/cc-region-panel.ui:266
+msgid "No input source selected"
+msgstr "No input source selected"
+
+#: panels/region/cc-region-panel.ui:300
+msgid "Login settings are used by all users when logging into the system"
+msgstr "Login settings are used by all users when logging into the system"
 
-#: panels/region/input-options.ui:7
+#: panels/region/cc-region-panel.ui:338
 msgid "Input Source Options"
 msgstr "Input Source Options"
 
-#: panels/region/input-options.ui:27
+#: panels/region/cc-region-panel.ui:353
 msgid "Use the _same source for all windows"
 msgstr "Use the _same source for all windows"
 
-#: panels/region/input-options.ui:45
+#: panels/region/cc-region-panel.ui:371
 msgid "Allow _different sources for each window"
 msgstr "Allow _different sources for each window"
 
-#: panels/region/input-options.ui:85
-msgid "Switch to previous source"
-msgstr "Switch to previous source"
+#: panels/region/cc-region-panel.ui:413
+#| msgid "Previous track"
+msgid "Previous source"
+msgstr "Previous source"
 
-#: panels/region/input-options.ui:102
+#: panels/region/cc-region-panel.ui:431
 msgid "Super+Shift+Space"
 msgstr "Super+Shift+Space"
 
-#: panels/region/input-options.ui:116
-msgid "Switch to next source"
-msgstr "Switch to next source"
+#: panels/region/cc-region-panel.ui:446
+#| msgid "Resources"
+msgid "Next source"
+msgstr "Next source"
 
-#: panels/region/input-options.ui:133
+#: panels/region/cc-region-panel.ui:464
 msgid "Super+Space"
 msgstr "Super+Space"
 
-#: 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:164
-msgid "Alternative switch to next source"
-msgstr "Alternative switch to next source"
-
-#: panels/region/input-options.ui:181
+#: panels/region/cc-region-panel.ui:479
 msgid "Left+Right Alt"
 msgstr "Left+Right Alt"
 
-#: panels/region/region.ui:71
-#: panels/user-accounts/data/user-accounts-dialog.ui:348
-msgid "_Language"
-msgstr "_Language"
-
-#: panels/region/region.ui:89
-msgid "English (United Kingdom)"
-msgstr "English (United Kingdom)"
+#: panels/region/cc-region-panel.ui:495
+#| msgid "You can change these shortcuts in the keyboard settings"
+msgid "These keyboard shortcuts can be changed in the keyboard settings"
+msgstr "These keyboard shortcuts can be changed in the keyboard settings"
 
-#: panels/region/region.ui:116
-msgid "Restart the session for changes to take effect"
-msgstr "Restart the session for changes to take effect"
+#: panels/region/gnome-region-panel.desktop.in.in:3
+msgid "Region & Language"
+msgstr "Region & Language"
 
-#: panels/region/region.ui:138
-msgid "Restart…"
-msgstr "Restart…"
+#: 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/region.ui:174
-msgid "_Formats"
-msgstr "_Formats"
-
-#: panels/region/region.ui:192
-msgid "United Kingdom"
-msgstr "United Kingdom"
-
-#: panels/region/region.ui:234
-msgid "Input Sources"
-msgstr "Input Sources"
-
-#: panels/region/region.ui:250
-msgid "_Options"
-msgstr "_Options"
-
-#: panels/region/region.ui:318
-msgid "Add input source"
-msgstr "Add input source"
-
-#: panels/region/region.ui:344
-msgid "Remove input source"
-msgstr "Remove input source"
-
-#: panels/region/region.ui:395
-msgid "Move input source up"
-msgstr "Move input source up"
-
-#: panels/region/region.ui:421
-msgid "Move input source down"
-msgstr "Move input source down"
-
-#: panels/region/region.ui:472
-msgid "Configure input source"
-msgstr "Configure input source"
-
-#: panels/region/region.ui:498
-msgid "Show input source keyboard layout"
-msgstr "Show input source keyboard layout"
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/region/gnome-region-panel.desktop.in.in:7
+msgid "preferences-desktop-locale"
+msgstr "preferences-desktop-locale"
 
-#: panels/region/region.ui:542
-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"
+#. Translators: Search terms to find the Region and Language panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
+#: panels/region/gnome-region-panel.desktop.in.in:19
+msgid "Language;Layout;Keyboard;Input;"
+msgstr "Language;Layout;Keyboard;Input;"
 
-#: panels/search/cc-search-locations-dialog.c:600
+#: panels/search/cc-search-locations-dialog.c:604
 msgid "Select Location"
 msgstr "Select Location"
 
-#: panels/search/cc-search-locations-dialog.c:604
+#: panels/search/cc-search-locations-dialog.c:608
 msgid "_OK"
 msgstr "_OK"
 
@@ -5400,6 +5908,18 @@ msgstr "_OK"
 msgid "No applications found"
 msgstr "No applications found"
 
+#: panels/search/cc-search-panel.ui:52
+msgid "Move Up"
+msgstr "Move Up"
+
+#: panels/search/cc-search-panel.ui:69
+msgid "Move Down"
+msgstr "Move Down"
+
+#: panels/search/cc-search-panel.ui:105
+msgid "Preferences"
+msgstr "Preferences"
+
 #: panels/search/gnome-search-panel.desktop.in.in:4
 msgid ""
 "Control which applications show search results in the Activities Overview"
@@ -5432,48 +5952,36 @@ msgstr "Bookmarks"
 msgid "Other"
 msgstr "Other"
 
-#: panels/search/search.ui:71
-msgid "Move Up"
-msgstr "Move Up"
-
-#: panels/search/search.ui:88
-msgid "Move Down"
-msgstr "Move Down"
-
-#: panels/search/search.ui:124
-msgid "Preferences"
-msgstr "Preferences"
-
 #. Label
-#: panels/sharing/cc-sharing-networks.c:302
+#: panels/sharing/cc-sharing-networks.c:307
 msgid "No networks selected for sharing"
 msgstr "No networks selected for sharing"
 
-#: panels/sharing/cc-sharing-panel.c:318
+#: panels/sharing/cc-sharing-panel.c:319
 msgctxt "service is enabled"
 msgid "On"
 msgstr "On"
 
-#: panels/sharing/cc-sharing-panel.c:320 panels/sharing/cc-sharing-panel.c:347
+#: panels/sharing/cc-sharing-panel.c:321 panels/sharing/cc-sharing-panel.c:348
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "Off"
 
-#: panels/sharing/cc-sharing-panel.c:350
+#: panels/sharing/cc-sharing-panel.c:351
 msgctxt "service is enabled"
 msgid "Enabled"
 msgstr "Enabled"
 
-#: panels/sharing/cc-sharing-panel.c:353
+#: panels/sharing/cc-sharing-panel.c:354
 msgctxt "service is active"
 msgid "Active"
 msgstr "Active"
 
-#: panels/sharing/cc-sharing-panel.c:423
+#: panels/sharing/cc-sharing-panel.c:424
 msgid "Choose a Folder"
 msgstr "Choose a Folder"
 
-#: panels/sharing/cc-sharing-panel.c:720
+#: panels/sharing/cc-sharing-panel.c:724
 #, c-format
 msgid ""
 "File Sharing allows you to share your Public folder with others on your "
@@ -5482,7 +5990,7 @@ msgstr ""
 "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:722
+#: panels/sharing/cc-sharing-panel.c:726
 #, c-format
 msgid ""
 "When remote login is enabled, remote users can connect using the Secure "
@@ -5493,7 +6001,7 @@ msgstr ""
 "Shell command:\n"
 "<a href=\"ssh %s\">ssh %s</a>"
 
-#: panels/sharing/cc-sharing-panel.c:724
+#: panels/sharing/cc-sharing-panel.c:728
 #, c-format
 msgid ""
 "Screen sharing allows remote users to view or control your screen by "
@@ -5502,408 +6010,329 @@ 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:828
+#: panels/sharing/cc-sharing-panel.c:832
 msgid "Copy"
 msgstr "Copy"
 
-#: panels/sharing/cc-sharing-panel.c:1279
+#: panels/sharing/cc-sharing-panel.c:1285
 #: panels/sharing/gnome-sharing-panel.desktop.in.in:3
 msgid "Sharing"
 msgstr "Sharing"
 
-#: 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"
-
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/sharing/gnome-sharing-panel.desktop.in.in:7
-msgid "preferences-system-sharing"
-msgstr "preferences-system-sharing"
-
-#. Translators: Search terms to find the Sharing panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
-#: panels/sharing/gnome-sharing-panel.desktop.in.in:16
-msgid ""
-"share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
-"movies;server;renderer;"
-msgstr ""
-"share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
-"movies;server;renderer;"
-
-#: panels/sharing/networks.ui:19
-msgid "Networks"
-msgstr "Networks"
-
-#: 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: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:50
+#: panels/sharing/cc-sharing-panel.ui:50
 msgid "_Computer Name"
 msgstr "_Computer Name"
 
-#: panels/sharing/sharing.ui:108
+#: panels/sharing/cc-sharing-panel.ui:108
 msgid "_File Sharing"
 msgstr "_File Sharing"
 
-#: panels/sharing/sharing.ui:151
+#: panels/sharing/cc-sharing-panel.ui:151
 msgid "_Screen Sharing"
 msgstr "_Screen Sharing"
 
-#: panels/sharing/sharing.ui:194
+#: panels/sharing/cc-sharing-panel.ui:194
 msgid "_Media Sharing"
 msgstr "_Media Sharing"
 
-#: panels/sharing/sharing.ui:237
+#: panels/sharing/cc-sharing-panel.ui:237
 msgid "_Remote Login"
 msgstr "_Remote Login"
 
-#: panels/sharing/sharing.ui:276
+#: panels/sharing/cc-sharing-panel.ui:276
 msgid "Some services are disabled because of no network access."
 msgstr "Some services are disabled because of no network access."
 
-#: panels/sharing/sharing.ui:292 panels/sharing/sharing.ui:419
+#: panels/sharing/cc-sharing-panel.ui:292
+#: panels/sharing/cc-sharing-panel.ui:419
 msgid "File Sharing"
 msgstr "File Sharing"
 
-#: panels/sharing/sharing.ui:339
+#: panels/sharing/cc-sharing-panel.ui:339
 msgid "_Require Password"
 msgstr "_Require Password"
 
-#: panels/sharing/sharing.ui:430 panels/sharing/sharing.ui:502
+#: panels/sharing/cc-sharing-panel.ui:430
+#: panels/sharing/cc-sharing-panel.ui:502
 msgid "Remote Login"
 msgstr "Remote Login"
 
-#: panels/sharing/sharing.ui:525 panels/sharing/sharing.ui:771
+#: panels/sharing/cc-sharing-panel.ui:525
+#: panels/sharing/cc-sharing-panel.ui:771
 msgid "Screen Sharing"
 msgstr "Screen Sharing"
 
-#: panels/sharing/sharing.ui:583
+#: panels/sharing/cc-sharing-panel.ui:583
 msgid "_Allow connections to control the screen"
 msgstr "_Allow connections to control the screen"
 
-#: panels/sharing/sharing.ui:628
+#: panels/sharing/cc-sharing-panel.ui:628
 msgid "_Password:"
 msgstr "_Password:"
 
-#: panels/sharing/sharing.ui:658
+#: panels/sharing/cc-sharing-panel.ui:658
 msgid "_Show Password"
 msgstr "_Show Password"
 
-#: panels/sharing/sharing.ui:689
+#: panels/sharing/cc-sharing-panel.ui:689
 msgid "Access Options"
 msgstr "Access Options"
 
-#: panels/sharing/sharing.ui:703
+#: panels/sharing/cc-sharing-panel.ui:703
 msgid "_New connections must ask for access"
 msgstr "_New connections must ask for access"
 
-#: panels/sharing/sharing.ui:721
+#: panels/sharing/cc-sharing-panel.ui:721
 msgid "_Require a password"
 msgstr "_Require a password"
 
-#: panels/sharing/sharing.ui:782 panels/sharing/sharing.ui:876
+#: panels/sharing/cc-sharing-panel.ui:782
+#: panels/sharing/cc-sharing-panel.ui:876
 msgid "Media Sharing"
 msgstr "Media Sharing"
 
-#: panels/sharing/sharing.ui:815
+#: panels/sharing/cc-sharing-panel.ui:815
 msgid "Share music, photos and videos over the network."
 msgstr "Share music, photos and videos over the network."
 
-#: panels/sharing/sharing.ui:830
+#: panels/sharing/cc-sharing-panel.ui:830
 msgid "Folders"
 msgstr "Folders"
 
-#: panels/sound/data/gnome-sound-panel.desktop.in.in:3
-msgid "Sound"
-msgstr "Sound"
-
-#: 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/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"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/sound/data/gnome-sound-panel.desktop.in.in:7
-msgid "multimedia-volume-control"
-msgstr "multimedia-volume-control"
+#: panels/sharing/gnome-sharing-panel.desktop.in.in:7
+msgid "preferences-system-sharing"
+msgstr "preferences-system-sharing"
 
-#. Translators: Search terms to find the Sound panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
-#: panels/sound/data/gnome-sound-panel.desktop.in.in:20
-msgid "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;"
-msgstr "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;"
+#. Translators: Search terms to find the Sharing panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/sharing/gnome-sharing-panel.desktop.in.in:16
+msgid ""
+"share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
+"movies;server;renderer;"
+msgstr ""
+"share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
+"movies;server;renderer;"
+
+#: panels/sharing/networks.ui:19
+msgid "Networks"
+msgstr "Networks"
+
+#: 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:12
+msgid "Authentication is required to enable or disable remote login"
+msgstr "Authentication is required to enable or disable remote login"
+
+#: panels/sound/cc-alert-chooser.c:151
+msgid "Custom"
+msgstr "Custom"
 
-#. 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:6
+#: panels/sound/cc-alert-chooser.ui:12 panels/sound/cc-alert-selector.ui:9
 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:12
+#: panels/sound/cc-alert-chooser.ui:19 panels/sound/cc-alert-selector.ui:15
 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:18
+#: panels/sound/cc-alert-chooser.ui:26 panels/sound/cc-alert-selector.ui:21
 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:24
+#: panels/sound/cc-alert-chooser.ui:33 panels/sound/cc-alert-selector.ui:27
 msgid "Sonar"
 msgstr "Sonar"
 
-#: panels/sound/gvc-balance-bar.c:104
-msgctxt "balance"
-msgid "Left"
-msgstr "Left"
-
-#: panels/sound/gvc-balance-bar.c:105
-msgctxt "balance"
-msgid "Right"
-msgstr "Right"
-
-#: panels/sound/gvc-balance-bar.c:108
-msgctxt "balance"
+#: panels/sound/cc-fade-slider.ui:13
+#| msgctxt "balance"
+#| msgid "Rear"
 msgid "Rear"
 msgstr "Rear"
 
-#: panels/sound/gvc-balance-bar.c:109
-msgctxt "balance"
+#: panels/sound/cc-fade-slider.ui:15
+#| msgctxt "balance"
+#| msgid "Front"
 msgid "Front"
 msgstr "Front"
 
-#: panels/sound/gvc-balance-bar.c:112
-msgctxt "balance"
-msgid "Minimum"
-msgstr "Minimum"
-
-#: panels/sound/gvc-balance-bar.c:113
-msgctxt "balance"
-msgid "Maximum"
-msgstr "Maximum"
-
-#: panels/sound/gvc-balance-bar.c:288
-msgid "_Balance:"
-msgstr "_Balance:"
-
-#: panels/sound/gvc-balance-bar.c:291
-msgid "_Fade:"
-msgstr "_Fade:"
-
-#: panels/sound/gvc-balance-bar.c:294
-msgid "_Subwoofer:"
-msgstr "_Subwoofer:"
-
-#: 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:614
-msgctxt "volume"
-msgid "Unamplified"
-msgstr "Unamplified"
-
-#: 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:"
-
-#: panels/sound/gvc-mixer-dialog.c:255
-msgid "_Test Speakers"
-msgstr "_Test Speakers"
-
-#: panels/sound/gvc-mixer-dialog.c:424
-msgid "Peak detect"
-msgstr "Peak detect"
+#: panels/sound/cc-output-test-dialog.c:134
+#, c-format
+#| msgid "Settings"
+msgid "Testing %s"
+msgstr "Testing %s"
 
-#: panels/sound/gvc-mixer-dialog.c:1499
-msgid "Device"
-msgstr "Device"
+#: panels/sound/cc-output-test-dialog.ui:127
+msgid "Click a speaker to test"
+msgstr "Click a speaker to test"
 
-#: panels/sound/gvc-mixer-dialog.c:1562
-#, c-format
-msgid "Speaker Testing for %s"
-msgstr "Speaker Testing for %s"
+#: panels/sound/cc-sound-panel.ui:29
+#| msgid "System Sounds"
+msgid "System Volume"
+msgstr "System Volume"
 
-#: panels/sound/gvc-mixer-dialog.c:1617
-msgid "_Output volume:"
-msgstr "_Output volume:"
+#: panels/sound/cc-sound-panel.ui:45
+#| msgid "Volume mute"
+msgid "Volume Levels"
+msgstr "Volume Levels"
 
-#: panels/sound/gvc-mixer-dialog.c:1631
+#: panels/sound/cc-sound-panel.ui:67
 msgid "Output"
 msgstr "Output"
 
-#: 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:1658
-msgid "Settings for the selected device:"
-msgstr "Settings for the selected device:"
-
-#: panels/sound/gvc-mixer-dialog.c:1669
-msgid "Input"
-msgstr "Input"
-
-#: panels/sound/gvc-mixer-dialog.c:1676
-msgid "_Input volume:"
-msgstr "_Input volume:"
+#: panels/sound/cc-sound-panel.ui:94
+#| msgid "_Output volume:"
+msgid "Output Device"
+msgstr "Output Device"
 
-#: panels/sound/gvc-mixer-dialog.c:1697
-msgid "Input level:"
-msgstr "Input level:"
-
-#: 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/cc-sound-panel.ui:117
+msgid "Test"
+msgstr "Test"
 
-#: panels/sound/gvc-mixer-dialog.c:1747
-msgid "Sound Effects"
-msgstr "Sound Effects"
+#: panels/sound/cc-sound-panel.ui:148 panels/sound/cc-sound-panel.ui:325
+#| msgid "_Configuration URL"
+msgid "Configuration"
+msgstr "Configuration"
 
-#: panels/sound/gvc-mixer-dialog.c:1754
-msgid "_Alert volume:"
-msgstr "_Alert volume:"
+#: panels/sound/cc-sound-panel.ui:181
+#| msgid "_Balance:"
+msgid "Balance"
+msgstr "Balance"
 
-#: 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/cc-sound-panel.ui:208
+#| msgid "_Fade:"
+msgid "Fade"
+msgstr "Fade"
 
-#: panels/sound/gvc-sound-theme-chooser.c:187
-msgid "Built-in"
-msgstr "Built-in"
+#: panels/sound/cc-sound-panel.ui:235
+msgid "Subwoofer"
+msgstr "Subwoofer"
 
-#: 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/cc-sound-panel.ui:257
+msgid "Input"
+msgstr "Input"
 
-#: 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/cc-sound-panel.ui:284
+#| msgid "Input level:"
+msgid "Input Device"
+msgstr "Input Device"
 
-#: panels/sound/gvc-sound-theme-chooser.c:544
-#: panels/wacom/wacom-stylus-page.ui:25
-msgid "Default"
-msgstr "Default"
+#: panels/sound/cc-sound-panel.ui:358
+#| msgid "Volume up"
+msgid "Volume"
+msgstr "Volume"
 
-#: panels/sound/gvc-sound-theme-chooser.c:545
-msgid "From theme"
-msgstr "From theme"
+#: panels/sound/cc-sound-panel.ui:380
+#| msgid "Test Sound"
+msgid "Alert Sound"
+msgstr "Alert Sound"
 
-#: panels/sound/gvc-sound-theme-chooser.c:720
-msgid "C_hoose an alert sound:"
-msgstr "C_hoose an alert sound:"
+#: panels/sound/cc-volume-slider.c:178
+msgctxt "volume"
+msgid "100%"
+msgstr "100%"
 
-#: panels/sound/gvc-speaker-test.c:229
-msgid "Stop"
-msgstr "Stop"
+#: panels/sound/gnome-sound-panel.desktop.in.in:3
+msgid "Sound"
+msgstr "Sound"
 
-#: panels/sound/gvc-speaker-test.c:229 panels/sound/gvc-speaker-test.c:341
-msgid "Test"
-msgstr "Test"
+#: panels/sound/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/gvc-speaker-test.c:237
-msgid "Subwoofer"
-msgstr "Subwoofer"
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/sound/gnome-sound-panel.desktop.in.in:7
+msgid "multimedia-volume-control"
+msgstr "multimedia-volume-control"
 
-#: panels/sound/sound-theme-file-utils.c:288
-msgid "Custom"
-msgstr "Custom"
+#. Translators: Search terms to find the Sound panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/sound/gnome-sound-panel.desktop.in.in:20
+msgid "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;"
+msgstr "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:86
-#: panels/thunderbolt/cc-bolt-device-entry.c:119
-#| msgid "Disconnected"
+#: panels/thunderbolt/cc-bolt-device-dialog.c:94
+#: panels/thunderbolt/cc-bolt-device-entry.c:125
 msgctxt "Thunderbolt Device Status"
 msgid "Disconnected"
 msgstr "Disconnected"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:89
-#: panels/thunderbolt/cc-bolt-device-entry.c:122
-#| msgid "Connecting"
+#: panels/thunderbolt/cc-bolt-device-dialog.c:97
+#: panels/thunderbolt/cc-bolt-device-entry.c:128
 msgctxt "Thunderbolt Device Status"
 msgid "Connecting"
 msgstr "Connecting"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:92
-#: panels/thunderbolt/cc-bolt-device-entry.c:126
-#: panels/thunderbolt/cc-bolt-device-entry.c:138
-#| msgid "Connected"
+#: panels/thunderbolt/cc-bolt-device-dialog.c:100
+#: panels/thunderbolt/cc-bolt-device-entry.c:132
+#: panels/thunderbolt/cc-bolt-device-entry.c:144
 msgctxt "Thunderbolt Device Status"
 msgid "Connected"
 msgstr "Connected"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:95
-#| msgid "Authentication required"
+#: panels/thunderbolt/cc-bolt-device-dialog.c:103
 msgctxt "Thunderbolt Device Status"
 msgid "Authorization Error"
 msgstr "Authorisation Error"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:98
-#: panels/thunderbolt/cc-bolt-device-entry.c:132
+#: panels/thunderbolt/cc-bolt-device-dialog.c:106
+#: panels/thunderbolt/cc-bolt-device-entry.c:138
 msgctxt "Thunderbolt Device Status"
 msgid "Authorizing"
 msgstr "Authorising"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:105
+#: panels/thunderbolt/cc-bolt-device-dialog.c:113
 msgctxt "Thunderbolt Device Status"
 msgid "Reduced Functionality"
 msgstr "Reduced Functionality"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:107
-#| msgid "Connected Devices"
+#: panels/thunderbolt/cc-bolt-device-dialog.c:115
 msgctxt "Thunderbolt Device Status"
 msgid "Connected & Authorized"
 msgstr "Connected & Authorised"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:113
-#: panels/thunderbolt/cc-bolt-device-entry.c:146
-#| msgid "Unknown"
+#: panels/thunderbolt/cc-bolt-device-dialog.c:121
+#: panels/thunderbolt/cc-bolt-device-entry.c:152
 msgctxt "Thunderbolt Device Status"
 msgid "Unknown"
 msgstr "Unknown"
 
 #. Translators: The time point the device was authorized.
-#: panels/thunderbolt/cc-bolt-device-dialog.c:169
+#: panels/thunderbolt/cc-bolt-device-dialog.c:177
 msgid "Authorized at:"
 msgstr "Authorised at:"
 
 #. Translators: The time point the device was connected.
-#: panels/thunderbolt/cc-bolt-device-dialog.c:175
-#| msgid "Connected"
+#: panels/thunderbolt/cc-bolt-device-dialog.c:183
 msgid "Connected at:"
 msgstr "Connected at:"
 
 #. Translators: The time point the device was enrolled,
 #. * i.e. authorized and stored in the device database.
-#: panels/thunderbolt/cc-bolt-device-dialog.c:182
-#| msgid "_Enroll"
+#: panels/thunderbolt/cc-bolt-device-dialog.c:190
 msgid "Enrolled at:"
 msgstr "Enrolled at:"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:250
-#| msgid "Failed to upload file: %s"
+#: panels/thunderbolt/cc-bolt-device-dialog.c:264
 msgid "Failed to authorize device: "
 msgstr "Failed to authorise device: "
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:327
-#| msgid "Failed to upload file: %s"
+#: panels/thunderbolt/cc-bolt-device-dialog.c:333
 msgid "Failed to forget device: "
 msgstr "Failed to forget device: "
 
+#: panels/thunderbolt/cc-bolt-device-dialog.c:491
+#, c-format
+msgid "Depends on %u other device"
+msgid_plural "Depends on %u other devices"
+msgstr[0] "Depends on %u other device"
+msgstr[1] "Depends on %u other devices"
+
 #: panels/thunderbolt/cc-bolt-device-dialog.ui:109
-#| msgid "_Name:"
 msgid "Name:"
 msgstr "Name:"
 
@@ -5915,35 +6344,31 @@ msgstr "Status:"
 msgid "UUID:"
 msgstr "UUID:"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.ui:280
-#| msgid "Automatic _Connect"
+#: panels/thunderbolt/cc-bolt-device-dialog.ui:324
 msgid "Authorize and Connect"
 msgstr "Authorise and Connect"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.ui:303
-#| msgid "Remove Device"
+#: panels/thunderbolt/cc-bolt-device-dialog.ui:346
 msgid "Forget Device"
 msgstr "Forget Device"
 
-#: panels/thunderbolt/cc-bolt-device-entry.c:129
-#| msgid "Mirror"
+#: panels/thunderbolt/cc-bolt-device-entry.c:135
 msgctxt "Thunderbolt Device Status"
 msgid "Error"
 msgstr "Error"
 
-#: panels/thunderbolt/cc-bolt-device-entry.c:140
-#| msgid "Authenticated"
+#: panels/thunderbolt/cc-bolt-device-entry.c:146
 msgctxt "Thunderbolt Device Status"
 msgid "Authorized"
 msgstr "Authorised"
 
-#: panels/thunderbolt/cc-bolt-panel.c:175
+#: panels/thunderbolt/cc-bolt-panel.c:176
 msgid ""
 "The Thunderbolt subsystem (boltd) is not installed or not set up properly."
 msgstr ""
 "The Thunderbolt subsystem (boltd) is not installed or not set up properly."
 
-#: panels/thunderbolt/cc-bolt-panel.c:460
+#: panels/thunderbolt/cc-bolt-panel.c:469
 msgid ""
 "Thunderbolt could not be detected.\n"
 "Either the system lacks Thunderbolt support, it has been disabled in the "
@@ -5953,11 +6378,16 @@ msgstr ""
 "Either the system lacks Thunderbolt support, it has been disabled in the "
 "BIOS or is set to an unsupported security level in the BIOS."
 
-#: panels/thunderbolt/cc-bolt-panel.c:504
+#: panels/thunderbolt/cc-bolt-panel.c:513
 msgid "Thunderbolt support has been disabled in the BIOS."
 msgstr "Thunderbolt support has been disabled in the BIOS."
 
-#: panels/thunderbolt/cc-bolt-panel.c:613
+#: panels/thunderbolt/cc-bolt-panel.c:517
+#| msgid "The profile could not be generated."
+msgid "Thunderbolt security level could not be determined."
+msgstr "Thunderbolt security level could not be determined."
+
+#: panels/thunderbolt/cc-bolt-panel.c:622
 #, c-format
 msgid "Error switching direct mode: %s"
 msgstr "Error switching direct mode: %s"
@@ -5967,7 +6397,6 @@ msgid "No Thunderbolt support"
 msgstr "No Thunderbolt support"
 
 #: panels/thunderbolt/cc-bolt-panel.ui:246
-#| msgid "Universal Access"
 msgid "Direct Access"
 msgstr "Direct Access"
 
@@ -5980,7 +6409,6 @@ msgid "Only USB and Display Port devices can attach."
 msgstr "Only USB and Display Port devices can attach."
 
 #: panels/thunderbolt/cc-bolt-panel.ui:397
-#| msgid "Getting devices..."
 msgid "Pending Devices"
 msgstr "Pending Devices"
 
@@ -5989,7 +6417,6 @@ msgid "No devices attached"
 msgstr "No devices attached"
 
 #: panels/thunderbolt/gnome-thunderbolt-panel.desktop.in.in:3
-#| msgid "Thunderbird"
 msgid "Thunderbolt"
 msgstr "Thunderbolt"
 
@@ -5999,13 +6426,11 @@ msgstr "Manage Thunderbolt devices"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: panels/thunderbolt/gnome-thunderbolt-panel.desktop.in.in:7
-#| msgid "Thunderbird"
 msgid "thunderbolt"
 msgstr "thunderbolt"
 
 #. Translators: those are keywords for the thunderbolt control-center panel. Do NOT translate or localize 
the semicolons! The list MUST also end with a semicolon!
 #: panels/thunderbolt/gnome-thunderbolt-panel.desktop.in.in:19
-#| msgid "Thunderbird"
 msgid "Thunderbolt;"
 msgstr "Thunderbolt;"
 
@@ -6043,334 +6468,345 @@ msgid_plural "%d pixels"
 msgstr[0] "%d pixel"
 msgstr[1] "%d pixels"
 
-#: 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"
-
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:7
-msgid "preferences-desktop-accessibility"
-msgstr "preferences-desktop-accessibility"
-
-#. Translators: Search terms to find the Universal Access panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
-#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:19
-msgid ""
-"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
-"AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;Repeat;Blink;"
-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:93
+#: panels/universal-access/cc-ua-panel.ui:93
 msgid "_Always Show Universal Access Menu"
 msgstr "_Always Show Universal Access Menu"
 
-#: panels/universal-access/uap.ui:135
+#: panels/universal-access/cc-ua-panel.ui:135
 msgid "Seeing"
 msgstr "Seeing"
 
-#: panels/universal-access/uap.ui:181
+#: panels/universal-access/cc-ua-panel.ui:181
 msgid "_High Contrast"
 msgstr "_High Contrast"
 
-#: panels/universal-access/uap.ui:228
+#: panels/universal-access/cc-ua-panel.ui:228
 msgid "_Large Text"
 msgstr "_Large Text"
 
-#: panels/universal-access/uap.ui:273
+#: panels/universal-access/cc-ua-panel.ui:273
 msgid "C_ursor Size"
 msgstr "C_ursor Size"
 
-#: panels/universal-access/uap.ui:320
+#: panels/universal-access/cc-ua-panel.ui:320
 #: panels/universal-access/zoom-options.ui:99
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: panels/universal-access/uap.ui:366
+#: panels/universal-access/cc-ua-panel.ui:366
 msgid "Screen _Reader"
 msgstr "Screen _Reader"
 
-#: panels/universal-access/uap.ui:412 panels/universal-access/uap.ui:1243
+#: panels/universal-access/cc-ua-panel.ui:412
+#: panels/universal-access/cc-ua-panel.ui:1243
 msgid "_Sound Keys"
 msgstr "_Sound Keys"
 
-#: panels/universal-access/uap.ui:474
+#: panels/universal-access/cc-ua-panel.ui:474
 msgid "Hearing"
 msgstr "Hearing"
 
-#: panels/universal-access/uap.ui:518 panels/universal-access/uap.ui:1346
+#: panels/universal-access/cc-ua-panel.ui:518
+#: panels/universal-access/cc-ua-panel.ui:1346
 msgid "_Visual Alerts"
 msgstr "_Visual Alerts"
 
-#: panels/universal-access/uap.ui:626
+#: panels/universal-access/cc-ua-panel.ui:626
 msgid "Screen _Keyboard"
 msgstr "Screen _Keyboard"
 
-#: panels/universal-access/uap.ui:671
+#: panels/universal-access/cc-ua-panel.ui:671
 msgid "R_epeat Keys"
 msgstr "R_epeat Keys"
 
-#: panels/universal-access/uap.ui:717
+#: panels/universal-access/cc-ua-panel.ui:717
 msgid "Cursor _Blinking"
 msgstr "Cursor _Blinking"
 
-#: panels/universal-access/uap.ui:763
+#: panels/universal-access/cc-ua-panel.ui:763
 msgid "_Typing Assist (AccessX)"
 msgstr "_Typing Assist (AccessX)"
 
-#: panels/universal-access/uap.ui:824
+#: panels/universal-access/cc-ua-panel.ui:824
 msgid "Pointing & Clicking"
 msgstr "Pointing & Clicking"
 
-#: panels/universal-access/uap.ui:870
+#: panels/universal-access/cc-ua-panel.ui:870
 msgid "_Mouse Keys"
 msgstr "_Mouse Keys"
 
-#: panels/universal-access/uap.ui:915
+#: panels/universal-access/cc-ua-panel.ui:915
 msgid "_Click Assist"
 msgstr "_Click Assist"
 
-#: panels/universal-access/uap.ui:961
+#: panels/universal-access/cc-ua-panel.ui:961
 msgid "_Double-Click Delay"
 msgstr "_Double-Click Delay"
 
-#: panels/universal-access/uap.ui:981
+#: panels/universal-access/cc-ua-panel.ui:981
 msgid "Double-Click Delay"
 msgstr "Double-Click Delay"
 
-#: panels/universal-access/uap.ui:1048
+#: panels/universal-access/cc-ua-panel.ui:1048
 msgid "Cursor Size"
 msgstr "Cursor Size"
 
-#: panels/universal-access/uap.ui:1075
+#: panels/universal-access/cc-ua-panel.ui:1075
 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:1111
+#: panels/universal-access/cc-ua-panel.ui:1111
 msgid "Screen Reader"
 msgstr "Screen Reader"
 
-#: panels/universal-access/uap.ui:1128
+#: panels/universal-access/cc-ua-panel.ui:1128
 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:1161
+#: panels/universal-access/cc-ua-panel.ui:1161
 msgid "_Screen Reader"
 msgstr "_Screen Reader"
 
-#: panels/universal-access/uap.ui:1200
+#: panels/universal-access/cc-ua-panel.ui:1200
 msgid "Sound Keys"
 msgstr "Sound Keys"
 
-#: panels/universal-access/uap.ui:1218
+#: panels/universal-access/cc-ua-panel.ui:1218
 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:1288
+#: panels/universal-access/cc-ua-panel.ui:1288
 msgid "Visual Alerts"
 msgstr "Visual Alerts"
 
-#: panels/universal-access/uap.ui:1292
+#: panels/universal-access/cc-ua-panel.ui:1292
 msgid "_Test flash"
 msgstr "_Test flash"
 
-#: panels/universal-access/uap.ui:1321
+#: panels/universal-access/cc-ua-panel.ui:1321
 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:1372
+#: panels/universal-access/cc-ua-panel.ui:1372
 msgid "Flash the _window title"
 msgstr "Flash the _window title"
 
-#: panels/universal-access/uap.ui:1390
+#: panels/universal-access/cc-ua-panel.ui:1390
 msgid "Flash the entire _screen"
 msgstr "Flash the entire _screen"
 
-#: panels/universal-access/uap.ui:1435
+#: panels/universal-access/cc-ua-panel.ui:1435
 msgid "Repeat Keys"
 msgstr "Repeat Keys"
 
-#: panels/universal-access/uap.ui:1465
+#: panels/universal-access/cc-ua-panel.ui:1465
 msgid "Key presses repeat when key is held down."
 msgstr "Key presses repeat when key is held down."
 
-#: panels/universal-access/uap.ui:1544
+#: panels/universal-access/cc-ua-panel.ui:1545
 msgid "Repeat keys delay"
 msgstr "Repeat keys delay"
 
-#: panels/universal-access/uap.ui:1592 panels/universal-access/uap.ui:1725
+#: panels/universal-access/cc-ua-panel.ui:1593
+#: panels/universal-access/cc-ua-panel.ui:1728
 msgid "Speed"
 msgstr "Speed"
 
-#: panels/universal-access/uap.ui:1629
+#: panels/universal-access/cc-ua-panel.ui:1632
 msgid "Repeat keys speed"
 msgstr "Repeat keys speed"
 
-#: panels/universal-access/uap.ui:1653
+#: panels/universal-access/cc-ua-panel.ui:1656
 msgid "Cursor Blinking"
 msgstr "Cursor Blinking"
 
-#: panels/universal-access/uap.ui:1683
+#: panels/universal-access/cc-ua-panel.ui:1686
 msgid "Cursor blinks in text fields."
 msgstr "Cursor blinks in text fields."
 
-#: panels/universal-access/uap.ui:1762
+#: panels/universal-access/cc-ua-panel.ui:1765
 msgid "Cursor blinking speed"
 msgstr "Cursor blinking speed"
 
-#: panels/universal-access/uap.ui:1798
+#: panels/universal-access/cc-ua-panel.ui:1801
 msgid "Typing Assist"
 msgstr "Typing Assist"
 
-#: panels/universal-access/uap.ui:1837
+#: panels/universal-access/cc-ua-panel.ui:1840
 msgid "_Sticky Keys"
 msgstr "_Sticky Keys"
 
-#: panels/universal-access/uap.ui:1854
+#: panels/universal-access/cc-ua-panel.ui:1857
 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:1878
+#: panels/universal-access/cc-ua-panel.ui:1881
 msgid "_Disable if two keys are pressed together"
 msgstr "_Disable if two keys are pressed together"
 
-#: panels/universal-access/uap.ui:1896
+#: panels/universal-access/cc-ua-panel.ui:1899
 msgid "Beep when a _modifier key is pressed"
 msgstr "Beep when a _modifier key is pressed"
 
-#: panels/universal-access/uap.ui:1944
+#: panels/universal-access/cc-ua-panel.ui:1947
 msgid "S_low Keys"
 msgstr "S_low Keys"
 
-#: panels/universal-access/uap.ui:1961
+#: panels/universal-access/cc-ua-panel.ui:1964
 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:1994 panels/universal-access/uap.ui:2207
-#: panels/universal-access/uap.ui:2544
+#: panels/universal-access/cc-ua-panel.ui:1997
+#: panels/universal-access/cc-ua-panel.ui:2210
+#: panels/universal-access/cc-ua-panel.ui:2547
 msgid "A_cceptance delay:"
 msgstr "A_cceptance delay:"
 
-#: panels/universal-access/uap.ui:2016
+#: panels/universal-access/cc-ua-panel.ui:2019
 msgctxt "slow keys delay"
 msgid "Short"
 msgstr "Short"
 
-#: panels/universal-access/uap.ui:2035
+#: panels/universal-access/cc-ua-panel.ui:2038
 msgid "Slow keys typing delay"
 msgstr "Slow keys typing delay"
 
-#: panels/universal-access/uap.ui:2050
+#: panels/universal-access/cc-ua-panel.ui:2053
 msgctxt "slow keys delay"
 msgid "Long"
 msgstr "Long"
 
-#: panels/universal-access/uap.ui:2077
+#: panels/universal-access/cc-ua-panel.ui:2080
 msgid "Beep when a key is pr_essed"
 msgstr "Beep when a key is pr_essed"
 
-#: panels/universal-access/uap.ui:2094
+#: panels/universal-access/cc-ua-panel.ui:2097
 msgid "Beep when a key is _accepted"
 msgstr "Beep when a key is _accepted"
 
-#: panels/universal-access/uap.ui:2111 panels/universal-access/uap.ui:2290
+#: panels/universal-access/cc-ua-panel.ui:2114
+#: panels/universal-access/cc-ua-panel.ui:2293
 msgid "Beep when a key is _rejected"
 msgstr "Beep when a key is _rejected"
 
-#: panels/universal-access/uap.ui:2157
+#: panels/universal-access/cc-ua-panel.ui:2160
 msgid "_Bounce Keys"
 msgstr "_Bounce Keys"
 
-#: panels/universal-access/uap.ui:2174
+#: panels/universal-access/cc-ua-panel.ui:2177
 msgid "Ignores fast duplicate keypresses"
 msgstr "Ignores fast duplicate keypresses"
 
-#: panels/universal-access/uap.ui:2229
+#: panels/universal-access/cc-ua-panel.ui:2232
 msgctxt "bounce keys delay"
 msgid "Short"
 msgstr "Short"
 
-#: panels/universal-access/uap.ui:2248
+#: panels/universal-access/cc-ua-panel.ui:2251
 msgid "Bounce keys typing delay"
 msgstr "Bounce keys typing delay"
 
-#: panels/universal-access/uap.ui:2263
+#: panels/universal-access/cc-ua-panel.ui:2266
 msgctxt "bounce keys delay"
 msgid "Long"
 msgstr "Long"
 
-#: panels/universal-access/uap.ui:2376
+#: panels/universal-access/cc-ua-panel.ui:2379
 msgid "_Enable by Keyboard"
 msgstr "_Enable by Keyboard"
 
-#: panels/universal-access/uap.ui:2393
+#: panels/universal-access/cc-ua-panel.ui:2396
 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:2457
+#: panels/universal-access/cc-ua-panel.ui:2460
 msgid "Click Assist"
 msgstr "Click Assist"
 
-#: panels/universal-access/uap.ui:2493
+#: panels/universal-access/cc-ua-panel.ui:2496
 msgid "_Simulated Secondary Click"
 msgstr "_Simulated Secondary Click"
 
-#: panels/universal-access/uap.ui:2511
+#: panels/universal-access/cc-ua-panel.ui:2514
 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:2565
+#: panels/universal-access/cc-ua-panel.ui:2568
 msgctxt "secondary click"
 msgid "Short"
 msgstr "Short"
 
-#: panels/universal-access/uap.ui:2584
+#: panels/universal-access/cc-ua-panel.ui:2587
 msgid "Secondary click delay"
 msgstr "Secondary click delay"
 
-#: panels/universal-access/uap.ui:2599
+#: panels/universal-access/cc-ua-panel.ui:2602
 msgctxt "secondary click delay"
 msgid "Long"
 msgstr "Long"
 
-#: panels/universal-access/uap.ui:2656
+#: panels/universal-access/cc-ua-panel.ui:2659
 msgid "_Hover Click"
 msgstr "_Hover Click"
 
-#: panels/universal-access/uap.ui:2674
+#: panels/universal-access/cc-ua-panel.ui:2677
 msgid "Trigger a click when the pointer hovers"
 msgstr "Trigger a click when the pointer hovers"
 
-#: panels/universal-access/uap.ui:2707
+#: panels/universal-access/cc-ua-panel.ui:2710
 msgid "D_elay:"
 msgstr "D_elay:"
 
-#: panels/universal-access/uap.ui:2729
+#: panels/universal-access/cc-ua-panel.ui:2732
 msgctxt "dwell click delay"
 msgid "Short"
 msgstr "Short"
 
-#: panels/universal-access/uap.ui:2760
+#: panels/universal-access/cc-ua-panel.ui:2763
 msgctxt "dwell click delay"
 msgid "Long"
 msgstr "Long"
 
-#: panels/universal-access/uap.ui:2796
+#: panels/universal-access/cc-ua-panel.ui:2799
 msgid "Motion _threshold:"
 msgstr "Motion _threshold:"
 
-#: panels/universal-access/uap.ui:2818
+#: panels/universal-access/cc-ua-panel.ui:2821
 msgctxt "dwell click threshold"
 msgid "Small"
 msgstr "Small"
 
-#: panels/universal-access/uap.ui:2849
+#: panels/universal-access/cc-ua-panel.ui:2852
 msgctxt "dwell click threshold"
 msgid "Large"
 msgstr "Large"
 
+#: 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"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:7
+msgid "preferences-desktop-accessibility"
+msgstr "preferences-desktop-accessibility"
+
+#. Translators: Search terms to find the Universal Access panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
+#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:19
+#| msgid ""
+#| "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;"
+#| "size;AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;"
+#| "Repeat;Blink;"
+msgid ""
+"Keyboard;Mouse;a11y;Accessibility;Contrast;Cursor;Sound;Zoom;Screen;Reader;"
+"big;high;large;text;font;size;AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;"
+"click;Delay;Speed;Assist;Repeat;Blink;visual;hearing;audio;typing;"
+msgstr ""
+"Keyboard;Mouse;a11y;Accessibility;Contrast;Cursor;Sound;Zoom;Screen;Reader;"
+"big;high;large;text;font;size;AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;"
+"click;Delay;Speed;Assist;Repeat;Blink;visual;hearing;audio;typing;"
+
 #: panels/universal-access/zoom-options.c:334
 msgctxt "Distance"
 msgid "Short"
@@ -6420,171 +6856,222 @@ msgstr "Right Half"
 msgid "Zoom Options"
 msgstr "Zoom Options"
 
-#: panels/universal-access/zoom-options.ui:188
+#: panels/universal-access/zoom-options.ui:185
 msgid "_Magnification:"
 msgstr "_Magnification:"
 
-#: panels/universal-access/zoom-options.ui:252
+#: panels/universal-access/zoom-options.ui:249
 msgid "_Follow mouse cursor"
 msgstr "_Follow mouse cursor"
 
-#: panels/universal-access/zoom-options.ui:272
+#: panels/universal-access/zoom-options.ui:269
 msgid "_Screen part:"
 msgstr "_Screen part:"
 
-#: panels/universal-access/zoom-options.ui:334
+#: panels/universal-access/zoom-options.ui:331
 msgid "Magnifier _extends outside of screen"
 msgstr "Magnifier _extends outside of screen"
 
-#: panels/universal-access/zoom-options.ui:353
+#: panels/universal-access/zoom-options.ui:350
 msgid "_Keep magnifier cursor centered"
 msgstr "_Keep magnifier cursor centered"
 
-#: panels/universal-access/zoom-options.ui:372
+#: panels/universal-access/zoom-options.ui:369
 msgid "Magnifier cursor _pushes contents around"
 msgstr "Magnifier cursor _pushes contents around"
 
-#: panels/universal-access/zoom-options.ui:391
+#: panels/universal-access/zoom-options.ui:388
 msgid "Magnifier cursor moves with _contents"
 msgstr "Magnifier cursor moves with _contents"
 
-#: panels/universal-access/zoom-options.ui:425
+#: panels/universal-access/zoom-options.ui:422
 msgid "Magnifier Position:"
 msgstr "Magnifier Position:"
 
-#: panels/universal-access/zoom-options.ui:446
+#: panels/universal-access/zoom-options.ui:443
 msgid "Magnifier"
 msgstr "Magnifier"
 
-#: panels/universal-access/zoom-options.ui:493
+#: panels/universal-access/zoom-options.ui:490
 msgid "_Thickness:"
 msgstr "_Thickness:"
 
-#: panels/universal-access/zoom-options.ui:519
+#: panels/universal-access/zoom-options.ui:516
 msgctxt "universal access, thickness"
 msgid "Thin"
 msgstr "Thin"
 
-#: panels/universal-access/zoom-options.ui:551
+#: panels/universal-access/zoom-options.ui:548
 msgctxt "universal access, thickness"
 msgid "Thick"
 msgstr "Thick"
 
-#: panels/universal-access/zoom-options.ui:577
+#: panels/universal-access/zoom-options.ui:574
 msgid "_Length:"
 msgstr "_Length:"
 
 #. The color of the accessibility crosshair
-#: panels/universal-access/zoom-options.ui:629
+#: panels/universal-access/zoom-options.ui:623
 msgid "Co_lor:"
 msgstr "Co_lour:"
 
-#: panels/universal-access/zoom-options.ui:693
+#: panels/universal-access/zoom-options.ui:687
 msgid "_Crosshairs:"
 msgstr "_Crosshairs:"
 
-#: panels/universal-access/zoom-options.ui:744
+#: panels/universal-access/zoom-options.ui:735
 msgid "_Overlaps mouse cursor"
 msgstr "_Overlaps mouse cursor"
 
-#: panels/universal-access/zoom-options.ui:782
+#: panels/universal-access/zoom-options.ui:773
 msgid "Crosshairs"
 msgstr "Crosshairs"
 
-#: panels/universal-access/zoom-options.ui:831
+#: panels/universal-access/zoom-options.ui:822
 msgid "_White on black:"
 msgstr "_White on black:"
 
-#: panels/universal-access/zoom-options.ui:854
+#: panels/universal-access/zoom-options.ui:842
 msgid "_Brightness:"
 msgstr "_Brightness:"
 
-#: panels/universal-access/zoom-options.ui:878
+#: panels/universal-access/zoom-options.ui:863
 msgid "_Contrast:"
 msgstr "_Contrast:"
 
 #. The contrast scale goes from Color to None (grayscale)
-#: panels/universal-access/zoom-options.ui:901
+#: panels/universal-access/zoom-options.ui:883
 msgctxt "universal access, contrast"
 msgid "Co_lor"
 msgstr "Co_lour"
 
-#: panels/universal-access/zoom-options.ui:929
+#: panels/universal-access/zoom-options.ui:908
 msgctxt "universal access, color"
 msgid "None"
 msgstr "None"
 
-#: panels/universal-access/zoom-options.ui:961
+#: panels/universal-access/zoom-options.ui:940
 msgctxt "universal access, color"
 msgid "Full"
 msgstr "Full"
 
-#: panels/universal-access/zoom-options.ui:1027
+#: panels/universal-access/zoom-options.ui:1003
 msgctxt "universal access, brightness"
 msgid "Low"
 msgstr "Low"
 
-#: panels/universal-access/zoom-options.ui:1060
+#: panels/universal-access/zoom-options.ui:1036
 msgctxt "universal access, brightness"
 msgid "High"
 msgstr "High"
 
-#: panels/universal-access/zoom-options.ui:1091
+#: panels/universal-access/zoom-options.ui:1067
 msgctxt "universal access, contrast"
 msgid "Low"
 msgstr "Low"
 
-#: panels/universal-access/zoom-options.ui:1124
+#: panels/universal-access/zoom-options.ui:1100
 msgctxt "universal access, contrast"
 msgid "High"
 msgstr "High"
 
-#: panels/universal-access/zoom-options.ui:1160
+#: panels/universal-access/zoom-options.ui:1136
 msgid "Color Effects:"
 msgstr "Colour Effects:"
 
-#: panels/universal-access/zoom-options.ui:1185
+#: panels/universal-access/zoom-options.ui:1161
 msgid "Color Effects"
 msgstr "Colour Effects"
 
-#: panels/user-accounts/data/account-dialog.ui:18
+#: panels/user-accounts/cc-add-user-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/cc-add-user-dialog.c:204
+msgid "Failed to add account"
+msgstr "Failed to add account"
+
+#: panels/user-accounts/cc-add-user-dialog.c:652
+#: panels/user-accounts/cc-password-dialog.c:261
+msgid "The passwords do not match."
+msgstr "The passwords do not match."
+
+#: panels/user-accounts/cc-add-user-dialog.c:874
+#: panels/user-accounts/cc-add-user-dialog.c:920
+#: panels/user-accounts/cc-add-user-dialog.c:941
+msgid "Failed to register account"
+msgstr "Failed to register account"
+
+#: panels/user-accounts/cc-add-user-dialog.c:1064
+msgid "No supported way to authenticate with this domain"
+msgstr "No supported way to authenticate with this domain"
+
+#: panels/user-accounts/cc-add-user-dialog.c:1137
+msgid "Failed to join domain"
+msgstr "Failed to join domain"
+
+#: panels/user-accounts/cc-add-user-dialog.c:1198
+msgid ""
+"That login name didn’t work.\n"
+"Please try again."
+msgstr ""
+"That login name didn’t work.\n"
+"Please try again."
+
+#: panels/user-accounts/cc-add-user-dialog.c:1205
+msgid ""
+"That login password didn’t work.\n"
+"Please try again."
+msgstr ""
+"That login password didn’t work.\n"
+"Please try again."
+
+#: panels/user-accounts/cc-add-user-dialog.c:1213
+msgid "Failed to log into domain"
+msgstr "Failed to log into domain"
+
+#: panels/user-accounts/cc-add-user-dialog.c:1271
+msgid "Unable to find the domain. Maybe you misspelled it?"
+msgstr "Unable to find the domain. Maybe you misspelled it?"
+
+#: panels/user-accounts/cc-add-user-dialog.ui:18
 #: panels/user-accounts/data/join-dialog.ui:11
 msgid "Add User"
 msgstr "Add User"
 
-#: panels/user-accounts/data/account-dialog.ui:171
+#: panels/user-accounts/cc-add-user-dialog.ui:180
 msgid "_Full Name"
 msgstr "_Full Name"
 
-#: panels/user-accounts/data/account-dialog.ui:197
-#: panels/user-accounts/data/user-accounts-dialog.ui:146
+#: panels/user-accounts/cc-add-user-dialog.ui:206
+#: panels/user-accounts/cc-user-panel.ui:151
 msgid "Standard"
 msgstr "Standard"
 
-#: panels/user-accounts/data/account-dialog.ui:207
-#: panels/user-accounts/data/user-accounts-dialog.ui:155
+#: panels/user-accounts/cc-add-user-dialog.ui:216
+#: panels/user-accounts/cc-user-panel.ui:161
 msgid "Administrator"
 msgstr "Administrator"
 
-#: panels/user-accounts/data/account-dialog.ui:223
-#: panels/user-accounts/data/user-accounts-dialog.ui:173
+#: panels/user-accounts/cc-add-user-dialog.ui:232
+#: panels/user-accounts/cc-user-panel.ui:179
 msgid "Account _Type"
 msgstr "Account _Type"
 
-#: panels/user-accounts/data/account-dialog.ui:260
+#: panels/user-accounts/cc-add-user-dialog.ui:269
 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:274
+#: panels/user-accounts/cc-add-user-dialog.ui:283
 msgid "Set a password _now"
 msgstr "Set a password _now"
 
-#: panels/user-accounts/data/account-dialog.ui:387
+#: panels/user-accounts/cc-add-user-dialog.ui:405
 msgid "_Confirm"
 msgstr "_Confirm"
 
-#: panels/user-accounts/data/account-dialog.ui:463
-#: panels/user-accounts/data/account-dialog.ui:667
+#: panels/user-accounts/cc-add-user-dialog.ui:485
+#: panels/user-accounts/cc-add-user-dialog.ui:692
 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 "
@@ -6594,32 +7081,340 @@ 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:485
+#: panels/user-accounts/cc-add-user-dialog.ui:507
 #: panels/user-accounts/data/join-dialog.ui:116
 msgid "_Domain"
 msgstr "_Domain"
 
-#: panels/user-accounts/data/account-dialog.ui:707
+#: panels/user-accounts/cc-add-user-dialog.ui:732
 msgid "You are Offline"
 msgstr "You are Offline"
 
-#: panels/user-accounts/data/account-dialog.ui:726
+#: panels/user-accounts/cc-add-user-dialog.ui:751
 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:760
+#: panels/user-accounts/cc-add-user-dialog.ui:782
 msgid "_Enterprise Login"
 msgstr "_Enterprise Login"
 
-#: panels/user-accounts/data/account-fingerprint.ui:12
-msgid "Left thumb"
-msgstr "Left thumb"
+#: panels/user-accounts/cc-avatar-chooser.c:230
+msgid "Browse for more pictures"
+msgstr "Browse for more pictures"
 
-#: panels/user-accounts/data/account-fingerprint.ui:15
-msgid "Left middle finger"
-msgstr "Left middle finger"
+#: panels/user-accounts/cc-avatar-chooser.ui:27
+msgid "Take a Picture…"
+msgstr "Take a Picture…"
 
-#: panels/user-accounts/data/account-fingerprint.ui:18
+#: panels/user-accounts/cc-avatar-chooser.ui:34
+msgid "Select a File…"
+msgstr "Select a File…"
+
+#: panels/user-accounts/cc-login-history-dialog.c:69
+msgid "This Week"
+msgstr "This Week"
+
+#: panels/user-accounts/cc-login-history-dialog.c:72
+msgid "Last Week"
+msgstr "Last Week"
+
+#. Translators: This is a date format string in the style of "Feb 18",
+#. 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/cc-login-history-dialog.c:82
+#: panels/user-accounts/cc-login-history-dialog.c:86
+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/cc-login-history-dialog.c:91
+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/cc-login-history-dialog.c:96
+#, c-format
+msgctxt "login history week label"
+msgid "%s — %s"
+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/cc-login-history-dialog.c:173
+#: panels/user-accounts/cc-user-panel.c:770
+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/cc-login-history-dialog.c:176
+#: panels/user-accounts/cc-user-panel.c:774
+#, c-format
+msgctxt "login date-time"
+msgid "%s, %s"
+msgstr "%s, %s"
+
+#: panels/user-accounts/cc-login-history-dialog.c:243
+msgid "Session Ended"
+msgstr "Session Ended"
+
+#: panels/user-accounts/cc-login-history-dialog.c:249
+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/cc-login-history-dialog.c:343
+#, c-format
+msgid "%s — Account Activity"
+msgstr "%s — Account Activity"
+
+#: panels/user-accounts/cc-password-dialog.c:125
+msgid "Please choose another password."
+msgstr "Please choose another password."
+
+#: panels/user-accounts/cc-password-dialog.c:134
+msgid "Please type your current password again."
+msgstr "Please type your current password again."
+
+#: panels/user-accounts/cc-password-dialog.c:140
+msgid "Password could not be changed"
+msgstr "Password could not be changed"
+
+#: panels/user-accounts/cc-password-dialog.ui:7
+msgid "Change Password"
+msgstr "Change Password"
+
+#: panels/user-accounts/cc-password-dialog.ui:37
+msgid "Ch_ange"
+msgstr "Ch_ange"
+
+#: panels/user-accounts/cc-password-dialog.ui:145
+msgid "_Confirm New Password"
+msgstr "_Confirm New Password"
+
+#: panels/user-accounts/cc-password-dialog.ui:162
+msgid "_New Password"
+msgstr "_New Password"
+
+#: panels/user-accounts/cc-password-dialog.ui:216
+msgid "Current _Password"
+msgstr "Current _Password"
+
+#: panels/user-accounts/cc-password-dialog.ui:254
+msgid "Allow user to change their password on next login"
+msgstr "Allow user to change their password on next login"
+
+#: panels/user-accounts/cc-password-dialog.ui:267
+msgid "Set a password now"
+msgstr "Set a password now"
+
+#: panels/user-accounts/cc-realm-manager.c:307
+msgid "Cannot automatically join this type of domain"
+msgstr "Cannot automatically join this type of domain"
+
+#: panels/user-accounts/cc-realm-manager.c:310
+msgid "No such domain or realm found"
+msgstr "No such domain or realm found"
+
+#: panels/user-accounts/cc-realm-manager.c:732
+#: panels/user-accounts/cc-realm-manager.c:746
+#, 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/cc-realm-manager.c:738
+msgid "Invalid password, please try again"
+msgstr "Invalid password, please try again"
+
+#: panels/user-accounts/cc-realm-manager.c:751
+#, c-format
+msgid "Couldn’t connect to the %s domain: %s"
+msgstr "Couldn’t connect to the %s domain: %s"
+
+#: panels/user-accounts/cc-user-panel.c:213
+msgid "Your account"
+msgstr "Your account"
+
+#: panels/user-accounts/cc-user-panel.c:388
+msgid "Failed to delete user"
+msgstr "Failed to delete user"
+
+#: panels/user-accounts/cc-user-panel.c:446
+#: panels/user-accounts/cc-user-panel.c:505
+#: panels/user-accounts/cc-user-panel.c:557
+msgid "Failed to revoke remotely managed user"
+msgstr "Failed to revoke remotely managed user"
+
+#: panels/user-accounts/cc-user-panel.c:609
+msgid "You cannot delete your own account."
+msgstr "You cannot delete your own account."
+
+#: panels/user-accounts/cc-user-panel.c:618
+#, c-format
+msgid "%s is still logged in"
+msgstr "%s is still logged in"
+
+#: panels/user-accounts/cc-user-panel.c:622
+msgid ""
+"Deleting a user while they are logged in can leave the system in an "
+"inconsistent state."
+msgstr ""
+"Deleting a user while they are logged in can leave the system in an "
+"inconsistent state."
+
+#: panels/user-accounts/cc-user-panel.c:631
+#, c-format
+msgid "Do you want to keep %s’s files?"
+msgstr "Do you want to keep %s’s files?"
+
+#: panels/user-accounts/cc-user-panel.c:635
+msgid ""
+"It is possible to keep the home directory, mail spool and temporary files "
+"around when deleting a user account."
+msgstr ""
+"It is possible to keep the home directory, mail spool and temporary files "
+"around when deleting a user account."
+
+#: panels/user-accounts/cc-user-panel.c:638
+msgid "_Delete Files"
+msgstr "_Delete Files"
+
+#: panels/user-accounts/cc-user-panel.c:639
+msgid "_Keep Files"
+msgstr "_Keep Files"
+
+#: panels/user-accounts/cc-user-panel.c:653
+#, c-format
+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/cc-user-panel.c:657
+msgid "_Delete"
+msgstr "_Delete"
+
+#: panels/user-accounts/cc-user-panel.c:707
+msgctxt "Password mode"
+msgid "Account disabled"
+msgstr "Account disabled"
+
+#: panels/user-accounts/cc-user-panel.c:715
+msgctxt "Password mode"
+msgid "To be set at next login"
+msgstr "To be set at next login"
+
+#: panels/user-accounts/cc-user-panel.c:718
+msgctxt "Password mode"
+msgid "None"
+msgstr "None"
+
+#: panels/user-accounts/cc-user-panel.c:763
+msgid "Logged in"
+msgstr "Logged in"
+
+#: panels/user-accounts/cc-user-panel.c:1093
+msgid "Failed to contact the accounts service"
+msgstr "Failed to contact the accounts service"
+
+#: panels/user-accounts/cc-user-panel.c:1095
+msgid "Please make sure that the AccountService is installed and enabled."
+msgstr "Please make sure that the AccountService is installed and enabled."
+
+#. Translator comments:
+#. * 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/cc-user-panel.c:1127
+msgid ""
+"To make changes,\n"
+"click the * icon first"
+msgstr ""
+"To make changes,\n"
+"click the * icon first"
+
+#: panels/user-accounts/cc-user-panel.c:1200
+msgid "Create a user account"
+msgstr "Create a user account"
+
+#: panels/user-accounts/cc-user-panel.c:1211
+#: panels/user-accounts/cc-user-panel.c:1339
+msgid ""
+"To create a user account,\n"
+"click the * icon first"
+msgstr ""
+"To create a user account,\n"
+"click the * icon first"
+
+#: panels/user-accounts/cc-user-panel.c:1220
+msgid "Delete the selected user account"
+msgstr "Delete the selected user account"
+
+#: panels/user-accounts/cc-user-panel.c:1232
+#: panels/user-accounts/cc-user-panel.c:1343
+msgid ""
+"To delete the selected user account,\n"
+"click the * icon first"
+msgstr ""
+"To delete the selected user account,\n"
+"click the * icon first"
+
+#: panels/user-accounts/cc-user-panel.ui:18
+msgid "_Add User…"
+msgstr "_Add User…"
+
+#: panels/user-accounts/cc-user-panel.ui:70
+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/cc-user-panel.ui:78
+msgid "Restart Now"
+msgstr "Restart Now"
+
+#: panels/user-accounts/cc-user-panel.ui:254
+msgid "A_utomatic Login"
+msgstr "A_utomatic Login"
+
+#: panels/user-accounts/cc-user-panel.ui:296
+msgid "_Fingerprint Login"
+msgstr "_Fingerprint Login"
+
+#: panels/user-accounts/cc-user-panel.ui:322
+#: panels/user-accounts/cc-user-panel.ui:338
+msgid "User Icon"
+msgstr "User Icon"
+
+#: panels/user-accounts/cc-user-panel.ui:402
+msgid "Last Login"
+msgstr "Last Login"
+
+#: panels/user-accounts/cc-user-panel.ui:451
+msgid "Remove User…"
+msgstr "Remove User…"
+
+#. Translators: This is the empty state page label which states that there are no users to show in the panel.
+#: panels/user-accounts/cc-user-panel.ui:484
+msgid "No Users Found"
+msgstr "No Users Found"
+
+#: panels/user-accounts/cc-user-panel.ui:494
+msgid "Unlock to add a user account."
+msgstr "Unlock to add a user account."
+
+#: panels/user-accounts/data/account-fingerprint.ui:12
+msgid "Left thumb"
+msgstr "Left thumb"
+
+#: panels/user-accounts/data/account-fingerprint.ui:15
+msgid "Left middle finger"
+msgstr "Left middle finger"
+
+#: panels/user-accounts/data/account-fingerprint.ui:18
 msgid "Left ring finger"
 msgstr "Left ring finger"
 
@@ -6668,14 +7463,6 @@ msgstr ""
 "Your fingerprint was successfully saved. You should now be able to log in "
 "using your fingerprint reader."
 
-#: panels/user-accounts/data/avatar-chooser.ui:27
-msgid "Take a Picture…"
-msgstr "Take a Picture…"
-
-#: panels/user-accounts/data/avatar-chooser.ui:34
-msgid "Select a File…"
-msgstr "Select a File…"
-
 #: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:3
 msgid "Users"
 msgstr "Users"
@@ -6721,156 +7508,85 @@ msgstr "Administrator _Name"
 msgid "Administrator Password"
 msgstr "Administrator Password"
 
-#: panels/user-accounts/data/password-dialog.ui:7
-msgid "Change Password"
-msgstr "Change Password"
-
-#: panels/user-accounts/data/password-dialog.ui:38
-msgid "Ch_ange"
-msgstr "Ch_ange"
-
-#: panels/user-accounts/data/password-dialog.ui:142
-#| msgid "C_onfirm password"
-msgid "_Confirm New Password"
-msgstr "_Confirm New Password"
-
-#: panels/user-accounts/data/password-dialog.ui:159
-msgid "_New Password"
-msgstr "_New Password"
-
-#: panels/user-accounts/data/password-dialog.ui:208
-msgid "Current _Password"
-msgstr "Current _Password"
-
-#: 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:256
-msgid "Set a password now"
-msgstr "Set a password now"
-
-#: panels/user-accounts/data/user-accounts-dialog.ui:20
-msgid "_Add User…"
-msgstr "_Add User…"
-
-#: 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:77
-msgid "Restart Now"
-msgstr "Restart Now"
-
-#: 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:285
-msgid "_Fingerprint Login"
-msgstr "_Fingerprint Login"
-
-#: 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:387
-msgid "Last Login"
-msgstr "Last Login"
-
-#: panels/user-accounts/data/user-accounts-dialog.ui:434
-msgid "Remove User…"
-msgstr "Remove User…"
-
-#. 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 Users Found"
-msgstr "No Users Found"
-
-#: panels/user-accounts/data/user-accounts-dialog.ui:476
-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:11
+msgid "Manage user accounts"
+msgstr "Manage user accounts"
 
 #: 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:94
 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:96
 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:98 panels/user-accounts/pw-utils.c:106
 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:100
 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:102
 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:104
 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:108
 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:110
 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:112
 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:114
 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:116
 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:118
 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:120
 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:122
 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:124
 msgctxt "Password hint"
 msgid ""
 "Try to avoid repeating the same type of character: you need to mix up "
@@ -6879,12 +7595,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:126
 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
+#: panels/user-accounts/pw-utils.c:128
 msgctxt "Password hint"
 msgid ""
 "Password needs to be longer. Try to add more letters, numbers and "
@@ -6893,12 +7609,12 @@ 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:130
 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
+#: panels/user-accounts/pw-utils.c:132
 msgctxt "Password hint"
 msgid ""
 "Adding more letters, numbers and punctuation will make the password stronger."
@@ -6919,431 +7635,55 @@ msgstr "The new password is too short"
 msgid "The new password is too simple"
 msgstr "The new password is too simple"
 
-#: 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
-#, 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
-#, 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
-#, 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
-#, 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
-#, 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
-#, c-format
-msgid "Unknown error"
-msgstr "Unknown error"
-
-#: 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:225
-msgid "Failed to add account"
-msgstr "Failed to add account"
-
-#: panels/user-accounts/um-account-dialog.c:465
-#: panels/user-accounts/um-password-dialog.c:291
-msgid "The passwords do not match."
-msgstr "The passwords do not match."
-
-#: panels/user-accounts/um-account-dialog.c:736
-#: panels/user-accounts/um-account-dialog.c:782
-#: panels/user-accounts/um-account-dialog.c:803
-msgid "Failed to register account"
-msgstr "Failed to register account"
-
-#: panels/user-accounts/um-account-dialog.c:926
-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:999
-msgid "Failed to join domain"
-msgstr "Failed to join domain"
-
-#: panels/user-accounts/um-account-dialog.c:1060
-msgid ""
-"That login name didn’t work.\n"
-"Please try again."
-msgstr ""
-"That login name didn’t work.\n"
-"Please try again."
-
-#: panels/user-accounts/um-account-dialog.c:1067
-msgid ""
-"That login password didn’t work.\n"
-"Please try again."
-msgstr ""
-"That login password didn’t work.\n"
-"Please try again."
-
-#: panels/user-accounts/um-account-dialog.c:1075
-msgid "Failed to log into domain"
-msgstr "Failed to log into domain"
-
-#: panels/user-accounts/um-account-dialog.c:1133
-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
-msgctxt "Account type"
-msgid "Standard"
-msgstr "Standard"
-
-#: panels/user-accounts/um-account-type.c:36
-msgctxt "Account type"
-msgid "Administrator"
-msgstr "Administrator"
-
-#: 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:141
-msgid "The device is already in use."
-msgstr "The device is already in use."
-
-#: 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:214
-msgid "Enabled"
-msgstr "Enabled"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:260
-msgid "Delete registered fingerprints?"
-msgstr "Delete registered fingerprints?"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:264
-msgid "_Delete Fingerprints"
-msgstr "_Delete Fingerprints"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:270
-msgid ""
-"Do you want to delete your registered fingerprints so fingerprint login is "
-"disabled?"
-msgstr ""
-"Do you want to delete your registered fingerprints so fingerprint login is "
-"disabled?"
-
-#: 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:501
-#: panels/user-accounts/um-fingerprint-dialog.c:543
-#, c-format
-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:584
-#, c-format
-msgid "Could not start finger capture on “%s” device"
-msgstr "Could not start finger capture on “%s” device"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:628
-msgid "Could not access any fingerprint readers"
-msgstr "Could not access any fingerprint readers"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:629
-msgid "Please contact your system administrator for help."
-msgstr "Please contact your system administrator for help."
-
-#. translators:
-#. * The variable is the name of the device, for example:
-#. * "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:711
-#, c-format
-msgid ""
-"To enable fingerprint login, you need to save one of your fingerprints, "
-"using the “%s” device."
-msgstr ""
-"To enable fingerprint login, you need to save one of your fingerprints, "
-"using the “%s” device."
-
-#: panels/user-accounts/um-fingerprint-dialog.c:718
-msgid "Selecting finger"
-msgstr "Selecting finger"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:719
-msgid "Enrolling fingerprints"
-msgstr "Enrolling fingerprints"
-
-#: panels/user-accounts/um-history-dialog.c:70
-msgid "This Week"
-msgstr "This Week"
-
-#: panels/user-accounts/um-history-dialog.c:73
-msgid "Last Week"
-msgstr "Last Week"
-
-#. Translators: This is a date format string in the style of "Feb 18",
-#. 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
-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
-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
-#, c-format
-msgctxt "login history week label"
-msgid "%s — %s"
-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:763
-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:767
-#, c-format
-msgctxt "login date-time"
-msgid "%s, %s"
-msgstr "%s, %s"
-
-#: panels/user-accounts/um-history-dialog.c:250
-msgid "Session Ended"
-msgstr "Session Ended"
-
-#: 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
-#, c-format
-msgid "%s — Account Activity"
-msgstr "%s — Account Activity"
-
-#: panels/user-accounts/um-password-dialog.c:150
-msgid "Please choose another password."
-msgstr "Please choose another password."
-
-#: panels/user-accounts/um-password-dialog.c:159
-msgid "Please type your current password again."
-msgstr "Please type your current password again."
-
-#: panels/user-accounts/um-password-dialog.c:165
-msgid "Password could not be changed"
-msgstr "Password could not be changed"
-
-#: panels/user-accounts/um-photo-dialog.c:227
-msgid "Browse for more pictures"
-msgstr "Browse for more pictures"
-
-#: panels/user-accounts/um-realm-manager.c:307
-msgid "Cannot automatically join this type of domain"
-msgstr "Cannot automatically join this type of domain"
-
-#: panels/user-accounts/um-realm-manager.c:310
-msgid "No such domain or realm found"
-msgstr "No such domain or realm found"
-
-#: panels/user-accounts/um-realm-manager.c:732
-#: panels/user-accounts/um-realm-manager.c:746
-#, 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:738
-msgid "Invalid password, please try again"
-msgstr "Invalid password, please try again"
-
-#: panels/user-accounts/um-realm-manager.c:751
-#, c-format
-msgid "Couldn’t connect to the %s domain: %s"
-msgstr "Couldn’t connect to the %s domain: %s"
-
-#: panels/user-accounts/um-user-panel.c:199
-msgid "Your account"
-msgstr "Your account"
-
-#: panels/user-accounts/um-user-panel.c:379
-msgid "Failed to delete user"
-msgstr "Failed to delete user"
-
-#: panels/user-accounts/um-user-panel.c:437
-#: panels/user-accounts/um-user-panel.c:496
-#: panels/user-accounts/um-user-panel.c:548
-msgid "Failed to revoke remotely managed user"
-msgstr "Failed to revoke remotely managed user"
-
-#: panels/user-accounts/um-user-panel.c:600
-msgid "You cannot delete your own account."
-msgstr "You cannot delete your own account."
-
-#: panels/user-accounts/um-user-panel.c:609
-#, c-format
-msgid "%s is still logged in"
-msgstr "%s is still logged in"
-
-#: panels/user-accounts/um-user-panel.c:613
-msgid ""
-"Deleting a user while they are logged in can leave the system in an "
-"inconsistent state."
-msgstr ""
-"Deleting a user while they are logged in can leave the system in an "
-"inconsistent state."
-
-#: panels/user-accounts/um-user-panel.c:622
-#, c-format
-msgid "Do you want to keep %s’s files?"
-msgstr "Do you want to keep %s’s files?"
-
-#: panels/user-accounts/um-user-panel.c:626
-msgid ""
-"It is possible to keep the home directory, mail spool and temporary files "
-"around when deleting a user account."
-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:629
-msgid "_Delete Files"
-msgstr "_Delete Files"
-
-#: panels/user-accounts/um-user-panel.c:630
-msgid "_Keep Files"
-msgstr "_Keep Files"
-
-#: panels/user-accounts/um-user-panel.c:644
-#, c-format
-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:648
-msgid "_Delete"
-msgstr "_Delete"
-
-#: panels/user-accounts/um-user-panel.c:698
-msgctxt "Password mode"
-msgid "Account disabled"
-msgstr "Account disabled"
-
-#: panels/user-accounts/um-user-panel.c:706
-msgctxt "Password mode"
-msgid "To be set at next login"
-msgstr "To be set at next login"
-
-#: panels/user-accounts/um-user-panel.c:709
-msgctxt "Password mode"
-msgid "None"
-msgstr "None"
-
-#: panels/user-accounts/um-user-panel.c:756
-msgid "Logged in"
-msgstr "Logged in"
-
-#: panels/user-accounts/um-user-panel.c:1105
-msgid "Failed to contact the accounts service"
-msgstr "Failed to contact the accounts service"
+#: 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/um-user-panel.c:1107
-msgid "Please make sure that the AccountService is installed and enabled."
-msgstr "Please make sure that the AccountService is installed and enabled."
+#: panels/user-accounts/run-passwd.c:517
+#, c-format
+msgid "The new password has already been used recently."
+msgstr "The new password has already been used recently."
 
-#. Translator comments:
-#. * 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:1139
-msgid ""
-"To make changes,\n"
-"click the * icon first"
-msgstr ""
-"To make changes,\n"
-"click the * icon first"
+#: 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/um-user-panel.c:1179
-msgid "Create a user account"
-msgstr "Create a user account"
+#: 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/um-user-panel.c:1190
-#: panels/user-accounts/um-user-panel.c:1368
-msgid ""
-"To create a user account,\n"
-"click the * icon first"
-msgstr ""
-"To create a user account,\n"
-"click the * icon first"
+#: 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/um-user-panel.c:1200
-msgid "Delete the selected user account"
-msgstr "Delete the selected user account"
+#: 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/um-user-panel.c:1212
-#: panels/user-accounts/um-user-panel.c:1373
-msgid ""
-"To delete the selected user account,\n"
-"click the * icon first"
-msgstr ""
-"To delete the selected user account,\n"
-"click the * icon first"
+#: panels/user-accounts/run-passwd.c:536
+#, c-format
+msgid "Unknown error"
+msgstr "Unknown error"
 
-#: panels/user-accounts/um-utils.c:496
+#: panels/user-accounts/user-utils.c:430
 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:499
+#: panels/user-accounts/user-utils.c:433
 #, c-format
 msgid "The username is too long."
 msgstr "The username is too long."
 
-#: panels/user-accounts/um-utils.c:502
+#: panels/user-accounts/user-utils.c:436
 msgid "The username cannot start with a “-”."
 msgstr "The username cannot start with a “-”."
 
-#: panels/user-accounts/um-utils.c:505
+#: panels/user-accounts/user-utils.c:439
 msgid ""
 "The username should only consist of upper and lower case letters from a-z, "
 "digits and the following characters: . - _"
@@ -7351,15 +7691,100 @@ 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:509
+#: panels/user-accounts/user-utils.c:443
 msgid "This will be used to name your home folder and can’t be changed."
 msgstr "This will be used to name your home folder and can’t be changed."
 
+#: panels/user-accounts/um-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:141
+msgid "The device is already in use."
+msgstr "The device is already in use."
+
+#: 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:214
+msgid "Enabled"
+msgstr "Enabled"
+
+#: panels/user-accounts/um-fingerprint-dialog.c:260
+msgid "Delete registered fingerprints?"
+msgstr "Delete registered fingerprints?"
+
+#: panels/user-accounts/um-fingerprint-dialog.c:264
+msgid "_Delete Fingerprints"
+msgstr "_Delete Fingerprints"
+
+#: panels/user-accounts/um-fingerprint-dialog.c:270
+msgid ""
+"Do you want to delete your registered fingerprints so fingerprint login is "
+"disabled?"
+msgstr ""
+"Do you want to delete your registered fingerprints so fingerprint login is "
+"disabled?"
+
+#: 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:501
+#: panels/user-accounts/um-fingerprint-dialog.c:543
+#, c-format
+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:584
+#, c-format
+msgid "Could not start finger capture on “%s” device"
+msgstr "Could not start finger capture on “%s” device"
+
+#: panels/user-accounts/um-fingerprint-dialog.c:628
+msgid "Could not access any fingerprint readers"
+msgstr "Could not access any fingerprint readers"
+
+#: panels/user-accounts/um-fingerprint-dialog.c:629
+msgid "Please contact your system administrator for help."
+msgstr "Please contact your system administrator for help."
+
+#. translators:
+#. * The variable is the name of the device, for example:
+#. * "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:711
+#, c-format
+msgid ""
+"To enable fingerprint login, you need to save one of your fingerprints, "
+"using the “%s” device."
+msgstr ""
+"To enable fingerprint login, you need to save one of your fingerprints, "
+"using the “%s” device."
+
+#: panels/user-accounts/um-fingerprint-dialog.c:718
+msgid "Selecting finger"
+msgstr "Selecting finger"
+
+#: panels/user-accounts/um-fingerprint-dialog.c:719
+msgid "Enrolling fingerprints"
+msgstr "Enrolling fingerprints"
+
 #: panels/wacom/button-mapping.ui:9
 msgid "Map Buttons"
 msgstr "Map Buttons"
 
-#: panels/wacom/button-mapping.ui:37 panels/wacom/cc-wacom-page.c:556
+#: panels/wacom/button-mapping.ui:37 panels/wacom/cc-wacom-page.c:533
 #: panels/wacom/gnome-wacom-properties.ui:60
 msgid "_Close"
 msgstr "_Close"
@@ -7376,7 +7801,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.ui:60
 msgid ""
 "Please tap the target markers as they appear on screen to calibrate the "
 "tablet."
@@ -7384,63 +7809,63 @@ msgstr ""
 "Please tap the target markers as they appear on screen to calibrate the "
 "tablet."
 
-#: panels/wacom/calibrator/calibrator-gui.c:87
+#: panels/wacom/calibrator/calibrator.ui:77
 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:253
 #, c-format
 msgid "Button %d"
 msgstr "Button %d"
 
-#: panels/wacom/cc-wacom-button-row.h:53
+#: panels/wacom/cc-wacom-button-row.h:34
 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:35
 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:36
 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:37
 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:256
 msgid "Output:"
 msgstr "Output:"
 
 #. Keep ratio switch
-#: panels/wacom/cc-wacom-mapping-panel.c:272
+#: panels/wacom/cc-wacom-mapping-panel.c:268
 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:279
 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:84
 #, c-format
 msgid "%d of %d"
 msgstr "%d of %d"
 
-#: panels/wacom/cc-wacom-page.c:553
+#: panels/wacom/cc-wacom-page.c:530
 msgid "Display Mapping"
 msgstr "Display Mapping"
 
-#: panels/wacom/cc-wacom-panel.c:827 panels/wacom/wacom-stylus-page.ui:129
+#: panels/wacom/cc-wacom-panel.c:845 panels/wacom/wacom-stylus-page.ui:119
 msgid "Stylus"
 msgstr "Stylus"
 
-#: panels/wacom/cc-wacom-stylus-page.c:362
+#: panels/wacom/cc-wacom-stylus-page.c:355
 msgid "Button"
 msgstr "Button"
 
@@ -7491,38 +7916,42 @@ msgstr "Please plug in or turn on your Wacom tablet"
 msgid "Bluetooth Settings"
 msgstr "Bluetooth Settings"
 
-#: panels/wacom/gnome-wacom-properties.ui:233
+#: panels/wacom/gnome-wacom-properties.ui:238
+msgid "Tracking Mode"
+msgstr "Tracking Mode"
+
+#: panels/wacom/gnome-wacom-properties.ui:266
+msgid "Left-Handed Orientation"
+msgstr "Left-Handed Orientation"
+
+#: panels/wacom/gnome-wacom-properties.ui:296
 msgid "Map to Monitor…"
 msgstr "Map to Monitor…"
 
-#: panels/wacom/gnome-wacom-properties.ui:249
+#: panels/wacom/gnome-wacom-properties.ui:309
 msgid "Map Buttons…"
 msgstr "Map Buttons…"
 
-#: panels/wacom/gnome-wacom-properties.ui:265
+#: panels/wacom/gnome-wacom-properties.ui:322
 msgid "Calibrate…"
 msgstr "Calibrate…"
 
-#: panels/wacom/gnome-wacom-properties.ui:286
-msgid "Adjust display resolution"
-msgstr "Adjust display resolution"
-
-#: panels/wacom/gnome-wacom-properties.ui:302
+#: panels/wacom/gnome-wacom-properties.ui:340
 msgid "Adjust mouse settings"
 msgstr "Adjust mouse settings"
 
-#: panels/wacom/gnome-wacom-properties.ui:330
-msgid "Tracking Mode"
-msgstr "Tracking Mode"
-
-#: panels/wacom/gnome-wacom-properties.ui:358
-msgid "Left-Handed Orientation"
-msgstr "Left-Handed Orientation"
+#: panels/wacom/gnome-wacom-properties.ui:356
+msgid "Adjust display resolution"
+msgstr "Adjust display resolution"
 
-#: panels/wacom/gsd-wacom-key-shortcut-button.c:222
+#: panels/wacom/gsd-wacom-key-shortcut-button.c:217
 msgid "New shortcut…"
 msgstr "New shortcut…"
 
+#: panels/wacom/wacom-stylus-page.ui:25
+msgid "Default"
+msgstr "Default"
+
 #: panels/wacom/wacom-stylus-page.ui:29
 msgid "Middle Mouse Button Click"
 msgstr "Middle Mouse Button Click"
@@ -7547,103 +7976,98 @@ msgstr "No stylus found"
 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:169
+#: panels/wacom/wacom-stylus-page.ui:159
 msgid "Eraser Pressure Feel"
 msgstr "Eraser Pressure Feel"
 
-#: panels/wacom/wacom-stylus-page.ui:190 panels/wacom/wacom-stylus-page.ui:350
+#: panels/wacom/wacom-stylus-page.ui:180 panels/wacom/wacom-stylus-page.ui:340
 msgid "Soft"
 msgstr "Soft"
 
-#: panels/wacom/wacom-stylus-page.ui:220 panels/wacom/wacom-stylus-page.ui:380
+#: panels/wacom/wacom-stylus-page.ui:210 panels/wacom/wacom-stylus-page.ui:370
 msgid "Firm"
 msgstr "Firm"
 
-#: panels/wacom/wacom-stylus-page.ui:243
+#: panels/wacom/wacom-stylus-page.ui:233
 msgid "Top Button"
 msgstr "Top Button"
 
-#: panels/wacom/wacom-stylus-page.ui:272
+#: panels/wacom/wacom-stylus-page.ui:262
 msgid "Lower Button"
 msgstr "Lower Button"
 
-#: panels/wacom/wacom-stylus-page.ui:301
+#: panels/wacom/wacom-stylus-page.ui:291
 msgid "Lowest Button"
 msgstr "Lowest Button"
 
-#: panels/wacom/wacom-stylus-page.ui:330
+#: panels/wacom/wacom-stylus-page.ui:320
 msgid "Tip Pressure Feel"
 msgstr "Tip Pressure Feel"
 
-#: panels/wacom/wacom-stylus-page.ui:442
-msgid "page 3"
-msgstr "page 3"
-
 #: shell/appdata/gnome-control-center.appdata.xml.in:7
-msgid "GNOME Control Center"
-msgstr "GNOME Control Center"
+#| msgid "Keep GNOME settings"
+msgid "GNOME Settings"
+msgstr "GNOME Settings"
 
 #: shell/appdata/gnome-control-center.appdata.xml.in:8
-msgid "Utilities to configure the GNOME desktop"
-msgstr "Utilities to configure the GNOME desktop"
+#| msgid "Utilities to configure the GNOME desktop"
+msgid "Utility to configure the GNOME desktop"
+msgstr "Utility to configure the GNOME 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."
-msgstr ""
-"The control centre is GNOME’s main interface for configuration of various "
-"aspects of your desktop."
+msgid "Settings is the primary interface for configuring your system."
+msgstr "Settings is the primary interface for configuring your system."
 
-#: shell/cc-application.c:62
+#: shell/appdata/gnome-control-center.appdata.xml.in:20
+msgid "The GNOME Project"
+msgstr "The GNOME Project"
+
+#: shell/cc-application.c:58
 msgid "Display version number"
 msgstr "Display version number"
 
-#: shell/cc-application.c:63
+#: shell/cc-application.c:59
 msgid "Enable verbose mode"
 msgstr "Enable verbose mode"
 
-#: shell/cc-application.c:64
+#: shell/cc-application.c:60
 msgid "Search for the string"
 msgstr "Search for the string"
 
-#: shell/cc-application.c:65
+#: shell/cc-application.c:61
 msgid "List possible panel names and exit"
 msgstr "List possible panel names and exit"
 
-#: shell/cc-application.c:66
+#: shell/cc-application.c:62
 msgid "Panel to display"
 msgstr "Panel to display"
 
-#: shell/cc-application.c:66
+#: shell/cc-application.c:62
 msgid "[PANEL] [ARGUMENT…]"
 msgstr "[PANEL] [ARGUMENT…]"
 
-#: shell/cc-application.c:137
-msgid "Available panels:"
-msgstr "Available panels:"
-
-#: shell/cc-application.c:253
-msgid "Help"
-msgstr "Help"
-
-#: shell/cc-application.c:254
-msgid "Quit"
-msgstr "Quit"
-
 #: shell/cc-panel-list.ui:195
 msgid "No results found"
 msgstr "No results found"
 
-#: shell/cc-window.ui:140
+#: shell/cc-panel-loader.c:279
+msgid "Available panels:"
+msgstr "Available panels:"
+
+#: shell/cc-window.ui:131
 msgid "All Settings"
 msgstr "All Settings"
 
-#: shell/cc-window.ui:234
+#: shell/cc-window.ui:169
+#| msgid "Primary"
+msgid "Primary Menu"
+msgstr "Primary Menu"
+
+#: shell/cc-window.ui:271
 msgid "Warning: Development Version"
 msgstr "Warning: Development Version"
 
-#: shell/cc-window.ui:235
+#: shell/cc-window.ui:272
 msgid ""
 "This version of Settings should only be used for development purposes. You "
 "may experience incorrect system behavior, data loss, and other unexpected "
@@ -7653,10 +8077,15 @@ msgstr ""
 "may experience incorrect system behaviour, data loss, and other unexpected "
 "issues. "
 
+#: shell/cc-window.ui:283
+msgid "Help"
+msgstr "Help"
+
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: shell/gnome-control-center.desktop.in.in:5
-msgid "gnome-control-center"
-msgstr "gnome-control-center"
+#| msgid "Brightness Settings"
+msgid "org.gnome.Settings"
+msgstr "org.gnome.Settings"
 
 #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 #: shell/gnome-control-center.desktop.in.in:17
@@ -7684,8 +8113,6 @@ msgid "Panels"
 msgstr "Panels"
 
 #: shell/help-overlay.ui:40
-#| msgctxt "shortcut window"
-#| msgid "Go back to the overview"
 msgctxt "shortcut window"
 msgid "Go back to previous panel"
 msgstr "Go back to previous panel"
@@ -7719,7 +8146,7 @@ msgstr ""
 
 #. translators:
 #. * The number of sound outputs on a particular device
-#: subprojects/gvc/gvc-mixer-control.c:1873
+#: subprojects/gvc/gvc-mixer-control.c:1871
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@@ -7728,17 +8155,178 @@ msgstr[1] "%u Outputs"
 
 #. translators:
 #. * The number of sound inputs on a particular device
-#: subprojects/gvc/gvc-mixer-control.c:1883
+#: subprojects/gvc/gvc-mixer-control.c:1881
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
 msgstr[0] "%u Input"
 msgstr[1] "%u Inputs"
 
-#: subprojects/gvc/gvc-mixer-control.c:2738
+#: subprojects/gvc/gvc-mixer-control.c:2736
 msgid "System Sounds"
 msgstr "System Sounds"
 
+#~ msgid "Language"
+#~ msgstr "Language"
+
+#~ msgid "Primary Display"
+#~ msgstr "Primary Display"
+
+#~ msgid "_Night Light"
+#~ msgstr "_Night Light"
+
+#~ msgid "Could not get screen information"
+#~ msgstr "Could not get screen information"
+
+#~ msgid "My Home Network"
+#~ msgstr "My Home Network"
+
+#~ msgid "hardware"
+#~ msgstr "hardware"
+
+#~ msgid "reset"
+#~ msgstr "reset"
+
+#~ msgid "Switch to previous source"
+#~ msgstr "Switch to previous source"
+
+#~ msgid "Switch to next source"
+#~ msgstr "Switch to next source"
+
+#~ msgid "Alternative switch to next source"
+#~ msgstr "Alternative switch to next source"
+
+#~ msgid "English (United Kingdom)"
+#~ msgstr "English (United Kingdom)"
+
+#~ msgid "United Kingdom"
+#~ msgstr "United Kingdom"
+
+#~ msgid "_Options"
+#~ msgstr "_Options"
+
+#~ msgid "Add input source"
+#~ msgstr "Add input source"
+
+#~ msgid "Remove input source"
+#~ msgstr "Remove input source"
+
+#~ msgid "Move input source up"
+#~ msgstr "Move input source up"
+
+#~ msgid "Move input source down"
+#~ msgstr "Move input source down"
+
+#~ msgid "Configure input source"
+#~ msgstr "Configure input source"
+
+#~ msgid "Show input source keyboard layout"
+#~ msgstr "Show input source keyboard layout"
+
+#~ msgctxt "balance"
+#~ msgid "Left"
+#~ msgstr "Left"
+
+#~ msgctxt "balance"
+#~ msgid "Right"
+#~ msgstr "Right"
+
+#~ msgctxt "balance"
+#~ msgid "Minimum"
+#~ msgstr "Minimum"
+
+#~ msgctxt "balance"
+#~ msgid "Maximum"
+#~ msgstr "Maximum"
+
+#~ msgid "_Subwoofer:"
+#~ msgstr "_Subwoofer:"
+
+#~ msgctxt "volume"
+#~ msgid "Unamplified"
+#~ msgstr "Unamplified"
+
+#~ msgid "_Profile:"
+#~ msgstr "_Profile:"
+
+#~ msgid "_Test Speakers"
+#~ msgstr "_Test Speakers"
+
+#~ msgid "Peak detect"
+#~ msgstr "Peak detect"
+
+#~ msgid "Device"
+#~ msgstr "Device"
+
+#~ msgid "Speaker Testing for %s"
+#~ msgstr "Speaker Testing for %s"
+
+#~ msgid "C_hoose a device for sound output:"
+#~ msgstr "C_hoose a device for sound output:"
+
+#~ msgid "Settings for the selected device:"
+#~ msgstr "Settings for the selected device:"
+
+#~ msgid "_Input volume:"
+#~ msgstr "_Input volume:"
+
+#~ msgid "C_hoose a device for sound input:"
+#~ msgstr "C_hoose a device for sound input:"
+
+#~ msgid "Sound Effects"
+#~ msgstr "Sound Effects"
+
+#~ msgid "_Alert volume:"
+#~ msgstr "_Alert volume:"
+
+#~ msgid "No application is currently playing or recording audio."
+#~ msgstr "No application is currently playing or recording audio."
+
+#~ msgid "Built-in"
+#~ msgstr "Built-in"
+
+#~ msgid "Sound Preferences"
+#~ msgstr "Sound Preferences"
+
+#~ msgid "Testing event sound"
+#~ msgstr "Testing event sound"
+
+#~ msgid "From theme"
+#~ msgstr "From theme"
+
+#~ msgid "C_hoose an alert sound:"
+#~ msgstr "C_hoose an alert sound:"
+
+#~ msgid "Stop"
+#~ msgstr "Stop"
+
+#~ msgctxt "Account type"
+#~ msgid "Standard"
+#~ msgstr "Standard"
+
+#~ msgctxt "Account type"
+#~ msgid "Administrator"
+#~ msgstr "Administrator"
+
+#~ msgid "page 3"
+#~ msgstr "page 3"
+
+#~ msgid "GNOME Control Center"
+#~ msgstr "GNOME Control Center"
+
+#~ msgid ""
+#~ "The control center is GNOME’s main interface for configuration of various "
+#~ "aspects of your desktop."
+#~ msgstr ""
+#~ "The control centre is GNOME’s main interface for configuration of various "
+#~ "aspects of your desktop."
+
+#~ msgid "Quit"
+#~ msgstr "Quit"
+
+#~ msgid "gnome-control-center"
+#~ msgstr "gnome-control-center"
+
 #~ msgid "_Verify New Password"
 #~ msgstr "_Verify New Password"
 
@@ -7832,9 +8420,6 @@ msgstr "System Sounds"
 #~ msgid "Mirrored"
 #~ msgstr "Mirrored"
 
-#~ msgid "Primary"
-#~ msgstr "Primary"
-
 #~ msgid "Secondary"
 #~ msgstr "Secondary"
 
@@ -8020,9 +8605,6 @@ msgstr "System Sounds"
 #~ msgid "Chat"
 #~ msgstr "Chat"
 
-#~ msgid "Resources"
-#~ msgstr "Resources"
-
 #~ msgid "Error creating account"
 #~ msgstr "Error creating account"
 
@@ -8079,9 +8661,6 @@ msgstr "System Sounds"
 #~ msgid "Supply"
 #~ msgstr "Supply"
 
-#~ msgid "_Default printer"
-#~ msgstr "_Default printer"
-
 #~ msgid "Jobs"
 #~ msgstr "Jobs"
 
@@ -9195,9 +9774,6 @@ msgstr "System Sounds"
 #~ msgid "Unspecified"
 #~ msgstr "Unspecified"
 
-#~ msgid "Select a language"
-#~ msgstr "Select a language"
-
 #~ msgid "Date and Time preferences panel"
 #~ msgstr "Date and Time preferences panel"
 
@@ -9334,9 +9910,6 @@ msgstr "System Sounds"
 #~ msgid "Suspend when inactive for"
 #~ msgstr "Suspend when inactive for"
 
-#~ msgid "Change printer settings"
-#~ msgstr "Change printer settings"
-
 #~ msgid "Manufacturers"
 #~ msgstr "Manufacturers"
 
@@ -9448,9 +10021,6 @@ msgstr "System Sounds"
 #~ msgid "Enable debugging code"
 #~ msgstr "Enable debugging code"
 
-#~ msgid "Version of this application"
-#~ msgstr "Version of this application"
-
 #~ msgid " — GNOME Volume Control Applet"
 #~ msgstr " — GNOME Volume Control Applet"
 
@@ -9460,9 +10030,6 @@ msgstr "System Sounds"
 #~ msgid "Sound Output Volume"
 #~ msgstr "Sound Output Volume"
 
-#~ msgid "Microphone Volume"
-#~ msgstr "Microphone Volume"
-
 #~ msgid "Failed to start Sound Preferences: %s"
 #~ msgstr "Failed to start Sound Preferences: %s"
 
@@ -9680,9 +10247,6 @@ msgstr "System Sounds"
 #~ msgid "Tip:"
 #~ msgstr "Tip:"
 
-#~ msgid "Brightness Settings"
-#~ msgstr "Brightness Settings"
-
 #~ msgid "affect how much power is used"
 #~ msgstr "affect how much power is used"
 
@@ -10114,9 +10678,6 @@ msgstr "System Sounds"
 #~ msgid "Preparing connection"
 #~ msgstr "Preparing connection"
 
-#~ msgid "Getting network address"
-#~ msgstr "Getting network address"
-
 #~ msgctxt "Account type"
 #~ msgid "Supervised"
 #~ msgstr "Supervised"
@@ -10221,9 +10782,6 @@ msgstr "System Sounds"
 #~ msgid "Text Editor"
 #~ msgstr "Text Editor"
 
-#~ msgid "Video Player"
-#~ msgstr "Video Player"
-
 #~ msgid "Visual"
 #~ msgstr "Visual"
 
@@ -10524,9 +11082,6 @@ msgstr "System Sounds"
 #~ "Lock screen after a certain duration to help prevent repetitive keyboard "
 #~ "use injuries"
 
-#~ msgid "Move the selected keyboard layout down in the list"
-#~ msgstr "Move the selected keyboard layout down in the list"
-
 #~ msgid "Move the selected keyboard layout up in the list"
 #~ msgstr "Move the selected keyboard layout up in the list"
 
@@ -10801,9 +11356,6 @@ msgstr "System Sounds"
 #~ msgid "I_nstall Font"
 #~ msgstr "I_nstall Font"
 
-#~ msgid "Font Viewer"
-#~ msgstr "Font Viewer"
-
 #~ msgid "Text to thumbnail (default: Aa)"
 #~ msgstr "Text to thumbnail (default: Aa)"
 
@@ -10915,12 +11467,6 @@ msgstr "System Sounds"
 #~ msgid "No Image"
 #~ msgstr "No Image"
 
-#~ msgid "Images"
-#~ msgstr "Images"
-
-#~ msgid "All Files"
-#~ msgstr "All Files"
-
 #~ msgid ""
 #~ "There was an error while trying to get the addressbook information\n"
 #~ "Evolution Data Server can't handle the protocol"
@@ -11899,9 +12445,6 @@ msgstr "System Sounds"
 #~ "Right ring finger\n"
 #~ "Right little finger"
 
-#~ msgid "<b>Email</b>"
-#~ msgstr "<b>E-mail</b>"
-
 #~ msgid "<b>Home</b>"
 #~ msgstr "<b>Home</b>"
 
@@ -12078,9 +12621,6 @@ msgstr "System Sounds"
 #~ msgid "PulseAudio Sound Server"
 #~ msgstr "PulseAudio Sound Server"
 
-#~ msgid "Test Sound"
-#~ msgstr "Test Sound"
-
 #~ msgid "Silence"
 #~ msgstr "Silence"
 
@@ -12124,9 +12664,6 @@ msgstr "System Sounds"
 #~ msgid "Sou_nd capture:"
 #~ msgstr "Sou_nd capture:"
 
-#~ msgid "Sounds"
-#~ msgstr "Sounds"
-
 #~ msgid "Testing Pipeline"
 #~ msgstr "Testing Pipeline"
 
@@ -12724,9 +13261,6 @@ msgstr "System Sounds"
 #~ "\n"
 #~ "Which set would you like to use?"
 
-#~ msgid "Keep GNOME settings"
-#~ msgstr "Keep GNOME settings"
-
 #~ msgid ""
 #~ "Could not get default terminal. Verify that your default terminal command "
 #~ "is set and points to a valid application."


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