[gnome-control-center] Update British English translation



commit 82f622abef278b5b0c6744b633e9792f0ca7673c
Author: Zander Brown <zbrown gnome org>
Date:   Sat Feb 8 12:58:46 2020 +0000

    Update British English translation

 po/en_GB.po | 4980 ++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 2736 insertions(+), 2244 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 17a4b77ff..1c008f0dc 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -4,90 +4,91 @@
 # Gareth Owen <gowen72 yahoo com>, David Lodge <dave cirt net>, 2004.
 # Philip Withnall <philip tecnocode co uk>, 2010, 2013.
 # Chris Leonard <cjl laptop org>, 2012.
-# Zander Brown <zbrown gnome org>, 2019.
-# Bruce Cowan <bruce bcowan me uk>, 2009-2019.
+# Zander Brown <zbrown gnome org>, 2019-2020.
+# Bruce Cowan <bruce bcowan me uk>, 2009-2020.
 #
 msgid ""
 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: 2019-08-26 13:31+0000\n"
-"PO-Revision-Date: 2019-08-26 22:31+0100\n"
+"POT-Creation-Date: 2020-02-02 15:51+0000\n"
+"PO-Revision-Date: 2020-02-03 18:36+0000\n"
 "Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
-"Language-Team: British English <en li org>\n"
+"Language-Team: English - United Kingdom <en_GB li org>\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 3.32.1\n"
+"X-Generator: Gtranslator 3.34.0\n"
 "X-Project-Style: gnome\n"
 
-#: panels/applications/cc-applications-panel.c:561
+#: panels/applications/cc-applications-panel.c:739
 msgid "System Bus"
 msgstr "System Bus"
 
-#: panels/applications/cc-applications-panel.c:561
-#: panels/applications/cc-applications-panel.c:563
-#: panels/applications/cc-applications-panel.c:579
-#: panels/applications/cc-applications-panel.c:584
+#: panels/applications/cc-applications-panel.c:739
+#: panels/applications/cc-applications-panel.c:741
+#: panels/applications/cc-applications-panel.c:754
+#: panels/applications/cc-applications-panel.c:759
 msgid "Full access"
 msgstr "Full access"
 
-#: panels/applications/cc-applications-panel.c:563
+#: panels/applications/cc-applications-panel.c:741
 msgid "Session Bus"
 msgstr "Session Bus"
 
-#: panels/applications/cc-applications-panel.c:568
-#: panels/power/cc-power-panel.c:2477 panels/thunderbolt/cc-bolt-panel.ui:466
-#: panels/thunderbolt/cc-bolt-panel.ui:525 shell/cc-panel-list.ui:45
-#: shell/cc-window.c:273
+#: panels/applications/cc-applications-panel.c:745
+#: panels/power/cc-power-panel.c:2470 panels/thunderbolt/cc-bolt-panel.ui:466
+#: panels/thunderbolt/cc-bolt-panel.ui:525
 msgid "Devices"
 msgstr "Devices"
 
-#: panels/applications/cc-applications-panel.c:568
+#: panels/applications/cc-applications-panel.c:745
 msgid "Full access to /dev"
 msgstr "Full access to /dev"
 
-#: panels/applications/cc-applications-panel.c:573
+#: panels/applications/cc-applications-panel.c:749
 #: panels/network/gnome-network-panel.desktop.in.in:3
-#: panels/network/network-mobile.ui:241
+#: panels/network/network-mobile.ui:252
 msgid "Network"
 msgstr "Network"
 
-#: panels/applications/cc-applications-panel.c:573
+#: panels/applications/cc-applications-panel.c:749
+#: panels/applications/cc-snap-row.c:109
 msgid "Has network access"
 msgstr "Has network access"
 
-#: panels/applications/cc-applications-panel.c:579
-#: panels/applications/cc-applications-panel.c:581
-#: panels/search/cc-search-locations-dialog.c:292
+#: panels/applications/cc-applications-panel.c:754
+#: panels/applications/cc-applications-panel.c:756
+#: panels/search/cc-search-locations-dialog.c:361
 msgid "Home"
 msgstr "Home"
 
-#: panels/applications/cc-applications-panel.c:581
-#: panels/applications/cc-applications-panel.c:586
+#: panels/applications/cc-applications-panel.c:756
+#: panels/applications/cc-applications-panel.c:761
 msgid "Read-only"
 msgstr "Read-only"
 
-#: panels/applications/cc-applications-panel.c:584
-#: panels/applications/cc-applications-panel.c:586
+#: panels/applications/cc-applications-panel.c:759
+#: panels/applications/cc-applications-panel.c:761
 msgid "File System"
 msgstr "File System"
 
-#: panels/applications/cc-applications-panel.c:591
-#: panels/keyboard/01-launchers.xml.in:6 shell/cc-window.c:277
-#: shell/cc-window.c:959 shell/cc-window.ui:131
+#: panels/applications/cc-applications-panel.c:765
+#: panels/keyboard/01-launchers.xml.in:6 shell/cc-window.c:281
+#: shell/cc-window.c:964 shell/cc-window.ui:125
 #: shell/gnome-control-center.desktop.in.in:3
 msgid "Settings"
 msgstr "Settings"
 
-#: panels/applications/cc-applications-panel.c:591
+#: panels/applications/cc-applications-panel.c:765
+#: panels/applications/cc-snap-row.c:73
 msgid "Can change settings"
 msgstr "Can change settings"
 
-#: panels/applications/cc-applications-panel.c:596
+#: panels/applications/cc-applications-panel.c:767
 #, c-format
 msgid ""
 "%s has the following permissions built-in. These cannot be altered. If you "
@@ -96,70 +97,69 @@ 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:738
+#: panels/applications/cc-applications-panel.c:928
 msgid "Web Links"
 msgstr "Web Links"
 
-#: panels/applications/cc-applications-panel.c:748
+#: panels/applications/cc-applications-panel.c:938
 msgid "Git Links"
 msgstr "Git Links"
 
-#: panels/applications/cc-applications-panel.c:754
+#: panels/applications/cc-applications-panel.c:944
 #, c-format
 msgid "%s Links"
 msgstr "%s Links"
 
-#: panels/applications/cc-applications-panel.c:762
-#: panels/applications/cc-applications-panel.c:798
+#: panels/applications/cc-applications-panel.c:952
+#: panels/applications/cc-applications-panel.c:988
 msgid "Unset"
 msgstr "Unset"
 
-#: panels/applications/cc-applications-panel.c:853
+#: panels/applications/cc-applications-panel.c:1043
 msgid "Links"
 msgstr "Links"
 
-#: panels/applications/cc-applications-panel.c:861
+#: panels/applications/cc-applications-panel.c:1051
 msgid "Hypertext Files"
 msgstr "Hypertext Files"
 
-#: panels/applications/cc-applications-panel.c:875
+#: panels/applications/cc-applications-panel.c:1065
 msgid "Text Files"
 msgstr "Text Files"
 
-#: panels/applications/cc-applications-panel.c:889
+#: panels/applications/cc-applications-panel.c:1079
 msgid "Image Files"
 msgstr "Image Files"
 
-#: panels/applications/cc-applications-panel.c:905
+#: panels/applications/cc-applications-panel.c:1095
 msgid "Font Files"
 msgstr "Font Files"
 
-#: panels/applications/cc-applications-panel.c:966
+#: panels/applications/cc-applications-panel.c:1156
 msgid "Archive Files"
 msgstr "Archive Files"
 
-#: panels/applications/cc-applications-panel.c:986
+#: panels/applications/cc-applications-panel.c:1176
 msgid "Package Files"
 msgstr "Package Files"
 
-#: panels/applications/cc-applications-panel.c:1009
+#: panels/applications/cc-applications-panel.c:1199
 msgid "Audio Files"
 msgstr "Audio Files"
 
-#: panels/applications/cc-applications-panel.c:1026
+#: panels/applications/cc-applications-panel.c:1216
 msgid "Video Files"
 msgstr "Video Files"
 
-#: panels/applications/cc-applications-panel.c:1034
+#: panels/applications/cc-applications-panel.c:1224
 msgid "Other Files"
 msgstr "Other Files"
 
 #. List of applications.
-#: panels/applications/cc-applications-panel.c:1376
-#: panels/applications/cc-applications-panel.ui:406
+#: panels/applications/cc-applications-panel.c:1566
+#: panels/applications/cc-applications-panel.ui:418
 #: 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"
 
@@ -185,7 +185,7 @@ msgstr ""
 
 #: 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
+#: panels/camera/gnome-camera-panel.desktop.in.in:3
 msgid "Camera"
 msgstr "Camera"
 
@@ -198,12 +198,11 @@ msgstr "Camera"
 #: 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/applications/cc-applications-panel.ui:267
 #: 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/keyboard/cc-keyboard-shortcut-editor.ui:96
+#: panels/keyboard/keyboard-shortcuts.c:425 panels/network/network-proxy.ui:126
 #: panels/user-accounts/um-fingerprint-dialog.c:211
 #: subprojects/gvc/gvc-mixer-control.c:1876
 msgid "Disabled"
@@ -211,18 +210,18 @@ 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
+#: panels/microphone/gnome-microphone-panel.desktop.in.in:3
 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
+#: panels/location/gnome-location-panel.desktop.in.in:3
 msgid "Location Services"
 msgstr "Location Services"
 
 #: panels/applications/cc-applications-panel.ui:162
-#: panels/applications/cc-applications-panel.ui:489
+#: panels/applications/cc-applications-panel.ui:501
 msgid "Built-in Permissions"
 msgstr "Built-in Permissions"
 
@@ -249,7 +248,7 @@ 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:161
+#: panels/search/gnome-search-panel.desktop.in.in:3 shell/cc-window.ui:155
 msgid "Search"
 msgstr "Search"
 
@@ -259,74 +258,307 @@ msgid "Notifications"
 msgstr "Notifications"
 
 #: panels/applications/cc-applications-panel.ui:248
+msgid "Run in background"
+msgstr "Run in background"
+
 #: panels/applications/cc-applications-panel.ui:254
+#| msgid "No Desktop Background"
+msgid "Set Desktop Background"
+msgstr "Set Desktop Background"
+
+#: panels/applications/cc-applications-panel.ui:260
+#: panels/applications/cc-applications-panel.ui:266
 msgid "Sounds"
 msgstr "Sounds"
 
-#: panels/applications/cc-applications-panel.ui:287
+#: panels/applications/cc-applications-panel.ui:299
 msgid "Default Handlers"
 msgstr "Default Handlers"
 
-#: panels/applications/cc-applications-panel.ui:299
+#: panels/applications/cc-applications-panel.ui:311
 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
+#: panels/applications/cc-applications-panel.ui:327
 msgid "Reset"
 msgstr "Reset"
 
-#: panels/applications/cc-applications-panel.ui:351
+#: panels/applications/cc-applications-panel.ui:363
 msgid "Usage"
 msgstr "Usage"
 
-#: panels/applications/cc-applications-panel.ui:363
+#: panels/applications/cc-applications-panel.ui:375
 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:525
+#: panels/applications/cc-applications-panel.ui:390
+#: panels/applications/cc-applications-panel.ui:537
 msgid "Storage"
 msgstr "Storage"
 
-#: panels/applications/cc-applications-panel.ui:413
+#: panels/applications/cc-applications-panel.ui:425
 msgid "Open in Software"
 msgstr "Open in Software"
 
-#: panels/applications/cc-applications-panel.ui:463 shell/cc-panel-list.ui:190
+#: panels/applications/cc-applications-panel.ui:475 shell/cc-panel-list.ui:121
 msgid "No results found"
 msgstr "No results found"
 
-#: panels/applications/cc-applications-panel.ui:474
-#: panels/keyboard/cc-keyboard-panel.ui:157 shell/cc-panel-list.ui:201
+#: panels/applications/cc-applications-panel.ui:486
+#: panels/keyboard/cc-keyboard-panel.ui:188 shell/cc-panel-list.ui:132
 msgid "Try a different search"
 msgstr "Try a different search"
 
-#: panels/applications/cc-applications-panel.ui:542
+#: panels/applications/cc-applications-panel.ui:554
 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:551
+#: panels/applications/cc-applications-panel.ui:563
 msgid "Application"
 msgstr "Application"
 
-#: panels/applications/cc-applications-panel.ui:557
+#: panels/applications/cc-applications-panel.ui:569
 msgid "Data"
 msgstr "Data"
 
-#: panels/applications/cc-applications-panel.ui:563
+#: panels/applications/cc-applications-panel.ui:575
 msgid "Cache"
 msgstr "Cache"
 
-#: panels/applications/cc-applications-panel.ui:569
+#: panels/applications/cc-applications-panel.ui:581
 msgid "<b>Total</b>"
 msgstr "<b>Total</b>"
 
-#: panels/applications/cc-applications-panel.ui:586
+#: panels/applications/cc-applications-panel.ui:598
 msgid "Clear Cache…"
 msgstr "Clear Cache…"
 
+#: panels/applications/cc-snap-row.c:55
+msgid "Add user accounts and change passwords"
+msgstr "Add user accounts and change passwords"
+
+#: panels/applications/cc-snap-row.c:57 panels/applications/cc-snap-row.c:133
+msgid "Play and record sound"
+msgstr "Play and record sound"
+
+#: panels/applications/cc-snap-row.c:59
+msgid "Detect network devices using mDNS/DNS-SD (Bonjour/zeroconf)"
+msgstr "Detect network devices using mDNS/DNS-SD (Bonjour/zeroconf)"
+
+#: panels/applications/cc-snap-row.c:61
+msgid "Access bluetooth hardware directly"
+msgstr "Access bluetooth hardware directly"
+
+#: panels/applications/cc-snap-row.c:63
+msgid "Use bluetooth devices"
+msgstr "Use bluetooth devices"
+
+#: panels/applications/cc-snap-row.c:65
+msgid "Use your camera"
+msgstr "Use your camera"
+
+#: panels/applications/cc-snap-row.c:67
+msgid "Print documents"
+msgstr "Print documents"
+
+#: panels/applications/cc-snap-row.c:69
+msgid "Use any connected joystick"
+msgstr "Use any connected joystick"
+
+#: panels/applications/cc-snap-row.c:71
+msgid "Allow connecting to the Docker service"
+msgstr "Allow connecting to the Docker service"
+
+#: panels/applications/cc-snap-row.c:75
+msgid "Configure network firewall"
+msgstr "Configure network firewall"
+
+#: panels/applications/cc-snap-row.c:77
+msgid "Setup and use privileged FUSE filesystems"
+msgstr "Setup and use privileged FUSE filesystems"
+
+#: panels/applications/cc-snap-row.c:79
+msgid "Update firmware on this device"
+msgstr "Update firmware on this device"
+
+#: panels/applications/cc-snap-row.c:81
+msgid "Access hardware information"
+msgstr "Access hardware information"
+
+#: panels/applications/cc-snap-row.c:83
+msgid "Provide entropy to hardware random number generator"
+msgstr "Provide entropy to hardware random number generator"
+
+#: panels/applications/cc-snap-row.c:85
+msgid "Use hardware-generated random numbers"
+msgstr "Use hardware-generated random numbers"
+
+#: panels/applications/cc-snap-row.c:87
+msgid "Access files in your home folder"
+msgstr "Access files in your home folder"
+
+#: panels/applications/cc-snap-row.c:89
+msgid "Access libvirt service"
+msgstr "Access libvirt service"
+
+#: panels/applications/cc-snap-row.c:91
+msgid "Change system language and region settings"
+msgstr "Change system language and region settings"
+
+#: panels/applications/cc-snap-row.c:93
+msgid "Change location settings and providers"
+msgstr "Change location settings and providers"
+
+#: panels/applications/cc-snap-row.c:95
+msgid "Access your location"
+msgstr "Access your location"
+
+#: panels/applications/cc-snap-row.c:97
+msgid "Read system and application logs"
+msgstr "Read system and application logs"
+
+#: panels/applications/cc-snap-row.c:99
+msgid "Access LXD service"
+msgstr "Access LXD service"
+
+#: panels/applications/cc-snap-row.c:101
+msgid "access the media-hub service"
+msgstr "access the media-hub service"
+
+#: panels/applications/cc-snap-row.c:103
+msgid "Use and configure modems"
+msgstr "Use and configure modems"
+
+#: panels/applications/cc-snap-row.c:105
+msgid "Read system mount information and disk quotas"
+msgstr "Read system mount information and disk quotas"
+
+#: panels/applications/cc-snap-row.c:107
+msgid "Control music and video players"
+msgstr "Control music and video players"
+
+#: panels/applications/cc-snap-row.c:111
+msgid "Change low-level network settings"
+msgstr "Change low-level network settings"
+
+#: panels/applications/cc-snap-row.c:113
+msgid "Access the NetworkManager service to read and change network settings"
+msgstr "Access the NetworkManager service to read and change network settings"
+
+#: panels/applications/cc-snap-row.c:115
+msgid "Read access to network settings"
+msgstr "Read access to network settings"
+
+#: panels/applications/cc-snap-row.c:117
+msgid "Change network settings"
+msgstr "Change network settings"
+
+#: panels/applications/cc-snap-row.c:119
+msgid "Read network settings"
+msgstr "Read network settings"
+
+#: panels/applications/cc-snap-row.c:121
+msgid ""
+"Access the ofono service to read and change network settings for mobile "
+"telephony"
+msgstr ""
+"Access the ofono service to read and change network settings for mobile "
+"telephony"
+
+#: panels/applications/cc-snap-row.c:123
+msgid "Control Open vSwitch hardware"
+msgstr "Control Open vSwitch hardware"
+
+#: panels/applications/cc-snap-row.c:125
+msgid "Read from CD/DVD"
+msgstr "Read from CD/DVD"
+
+#: panels/applications/cc-snap-row.c:127
+msgid "Read, add, change, or remove saved passwords"
+msgstr "Read, add, change, or remove saved passwords"
+
+#: panels/applications/cc-snap-row.c:129
+msgid ""
+"Access pppd and ppp devices for configuring Point-to-Point Protocol "
+"connections"
+msgstr ""
+"Access pppd and ppp devices for configuring Point-to-Point Protocol "
+"connections"
+
+#: panels/applications/cc-snap-row.c:131
+msgid "Pause or end any process on the system"
+msgstr "Pause or end any process on the system"
+
+#: panels/applications/cc-snap-row.c:135
+msgid "Access USB hardware directly"
+msgstr "Access USB hardware directly"
+
+#: panels/applications/cc-snap-row.c:137
+msgid "Read/write files on removable storage devices"
+msgstr "Read/write files on removable storage devices"
+
+#: panels/applications/cc-snap-row.c:139
+msgid "Prevent screen sleep/lock"
+msgstr "Prevent screen sleep/lock"
+
+#: panels/applications/cc-snap-row.c:141
+msgid "Access serial port hardware"
+msgstr "Access serial port hardware"
+
+#: panels/applications/cc-snap-row.c:143
+msgid "Restart or power off the device"
+msgstr "Restart or power off the device"
+
+#: panels/applications/cc-snap-row.c:145
+msgid "Install, remove and configure software"
+msgstr "Install, remove and configure software"
+
+#: panels/applications/cc-snap-row.c:147
+msgid "Access Storage Framework service"
+msgstr "Access Storage Framework service"
+
+#: panels/applications/cc-snap-row.c:149
+msgid "Read process and system information"
+msgstr "Read process and system information"
+
+#: panels/applications/cc-snap-row.c:151
+msgid "Monitor and control any running program"
+msgstr "Monitor and control any running program"
+
+#: panels/applications/cc-snap-row.c:153
+msgid "Change the date and time"
+msgstr "Change the date and time"
+
+#: panels/applications/cc-snap-row.c:155
+msgid "Change time server settings"
+msgstr "Change time server settings"
+
+#: panels/applications/cc-snap-row.c:157
+msgid "Change the time zone"
+msgstr "Change the time zone"
+
+#: panels/applications/cc-snap-row.c:159
+msgid "Access the UDisks2 service for configuring disks and removable media"
+msgstr "Access the UDisks2 service for configuring disks and removable media"
+
+#: panels/applications/cc-snap-row.c:161
+msgid "Read/change shared calendar events in Ubuntu Unity 8"
+msgstr "Read/change shared calendar events in Ubuntu Unity 8"
+
+#: panels/applications/cc-snap-row.c:163
+msgid "Read/change shared contacts in Ubuntu Unity 8"
+msgstr "Read/change shared contacts in Ubuntu Unity 8"
+
+#: panels/applications/cc-snap-row.c:165
+msgid "Access energy usage data"
+msgstr "Access energy usage data"
+
+#: panels/applications/cc-snap-row.c:167
+msgid "Read/write access to U2F devices exposed"
+msgstr "Read/write access to U2F devices exposed"
+
 #: panels/applications/gnome-applications-panel.desktop.in.in:4
 msgid "Control various application permissions and settings"
 msgstr "Control various application permissions and settings"
@@ -337,40 +569,40 @@ msgstr "Control various application permissions and settings"
 msgid "application;flatpak;permission;setting;"
 msgstr "application;flatpak;permission;setting;"
 
-#: panels/background/cc-background-chooser.c:348
+#: panels/background/cc-background-chooser.c:350
 msgid "Select a picture"
 msgstr "Select a picture"
 
-#: panels/background/cc-background-chooser.c:351
-#: 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/background/cc-background-chooser.c:353
+#: panels/color/cc-color-calibrate.ui:25 panels/color/cc-color-panel.c:241
+#: panels/color/cc-color-panel.c:894 panels/color/cc-color-panel.ui:657
 #: panels/common/cc-language-chooser.ui:24
-#: panels/display/cc-display-panel.c:947
+#: panels/display/cc-display-panel.c:950
+#: panels/info-overview/cc-info-overview-panel.ui:235
+#: panels/network/cc-wifi-hotspot-dialog.ui:122
 #: 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:1260 panels/network/net-device-wifi.c:1340
-#: panels/network/net-device-wifi.c:1561 panels/network/network-wifi.ui:24
+#: panels/network/connection-editor/vpn-helpers.c:176
+#: panels/network/connection-editor/vpn-helpers.c:299
+#: panels/network/net-device-wifi.c:800 panels/network/net-device-wifi.c:908
 #: panels/printers/new-printer-dialog.ui:45
-#: 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:613
-#: panels/sharing/cc-sharing-panel.c:428
+#: panels/printers/pp-details-dialog.c:252
+#: panels/region/cc-format-chooser.ui:28 panels/region/cc-input-chooser.ui:11
+#: panels/search/cc-search-locations-dialog.c:638
+#: panels/sharing/cc-sharing-panel.c:428 panels/usage/cc-usage-panel.c:134
 #: panels/user-accounts/cc-add-user-dialog.ui:28
 #: panels/user-accounts/cc-avatar-chooser.c:107
 #: panels/user-accounts/cc-avatar-chooser.c:235
 #: panels/user-accounts/cc-password-dialog.ui:20
-#: panels/user-accounts/cc-user-panel.c:641
-#: panels/user-accounts/cc-user-panel.c:659
+#: panels/user-accounts/cc-user-panel.c:637
+#: panels/user-accounts/cc-user-panel.c:655
 #: panels/user-accounts/data/join-dialog.ui:20
-#: panels/user-accounts/um-fingerprint-dialog.c:261
+#: panels/user-accounts/um-fingerprint-dialog.c:260
 msgid "_Cancel"
 msgstr "_Cancel"
 
-#: panels/background/cc-background-chooser.c:352
-#: panels/network/connection-editor/vpn-helpers.c:182
-#: panels/printers/pp-details-dialog.c:314
+#: panels/background/cc-background-chooser.c:354
+#: panels/network/connection-editor/vpn-helpers.c:177
+#: panels/printers/pp-details-dialog.c:253
 #: panels/sharing/cc-sharing-panel.c:429
 #: panels/user-accounts/cc-avatar-chooser.c:236
 msgid "_Open"
@@ -403,7 +635,7 @@ msgstr "multiple sizes"
 msgid "%d × %d"
 msgstr "%d × %d"
 
-#: panels/background/cc-background-item.c:278
+#: panels/background/cc-background-item.c:282
 msgid "No Desktop Background"
 msgstr "No Desktop Background"
 
@@ -432,45 +664,45 @@ msgstr "Change your background image to a wallpaper or photo"
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "Wallpaper;Screen;Desktop;"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:309
+#: panels/bluetooth/cc-bluetooth-panel.ui:31
 msgid "No Bluetooth Found"
 msgstr "No Bluetooth Found"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:310
+#: panels/bluetooth/cc-bluetooth-panel.ui:42
 msgid "Plug in a dongle to use Bluetooth."
 msgstr "Plug in a dongle to use Bluetooth."
 
-#: panels/bluetooth/cc-bluetooth-panel.c:313
+#: panels/bluetooth/cc-bluetooth-panel.ui:69
 msgid "Bluetooth Turned Off"
 msgstr "Bluetooth Turned Off"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:314
+#: panels/bluetooth/cc-bluetooth-panel.ui:80
 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:317
+#: panels/bluetooth/cc-bluetooth-panel.ui:107
 msgid "Airplane Mode is on"
 msgstr "Aeroplane Mode is on"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:318
+#: panels/bluetooth/cc-bluetooth-panel.ui:118
 msgid "Bluetooth is disabled when airplane mode is on."
 msgstr "Bluetooth is disabled when aeroplane mode is on."
 
-#: panels/bluetooth/cc-bluetooth-panel.c:321
+#: panels/bluetooth/cc-bluetooth-panel.ui:124
+msgid "Turn Off Airplane Mode"
+msgstr "Turn Off Aeroplane Mode"
+
+#: panels/bluetooth/cc-bluetooth-panel.ui:154
 msgid "Hardware Airplane Mode is on"
 msgstr "Hardware Aeroplane Mode is on"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:322
+#: panels/bluetooth/cc-bluetooth-panel.ui:165
 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/printers/pp-new-printer-dialog.c:1697
+#: panels/printers/pp-new-printer-dialog.c:1714
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -483,6 +715,49 @@ msgstr "Turn Bluetooth on and off and connect your devices"
 msgid "share;sharing;bluetooth;obex;"
 msgstr "share;sharing;bluetooth;obex;"
 
+#: panels/camera/cc-camera-panel.ui:34
+msgid "Camera is turned off"
+msgstr "Camera is turned off"
+
+#: panels/camera/cc-camera-panel.ui:43
+msgid "No applications can capture photos or video."
+msgstr "No applications can capture photos or video."
+
+#: panels/camera/cc-camera-panel.ui:77
+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/camera/cc-camera-panel.ui:87
+msgid "Allow the applications below to use your camera."
+msgstr "Allow the applications below to use your camera."
+
+#: panels/camera/cc-camera-panel.ui:107
+msgid "No Applications Have Asked for Camera Access"
+msgstr "No Applications Have Asked for Camera Access"
+
+#: panels/camera/gnome-camera-panel.desktop.in.in:4
+msgid "Protect your pictures"
+msgstr "Protect your pictures"
+
+#. FIXME
+#. Translators: Search terms to find the Privacy panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/camera/gnome-camera-panel.desktop.in.in:20
+#: panels/diagnostics/gnome-diagnostics-panel.desktop.in.in:20
+#: panels/location/gnome-location-panel.desktop.in.in:20
+#: panels/lock/gnome-lock-panel.desktop.in.in:20
+#: panels/microphone/gnome-microphone-panel.desktop.in.in:20
+#: panels/usage/gnome-usage-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;"
+
 #. TRANSLATORS: The user has to attach the sensor to the screen
 #: panels/color/cc-color-calibrate.c:348
 msgid "Place your calibration device over the square and press “Start”"
@@ -560,6 +835,25 @@ msgstr "You can remove the calibration device."
 msgid "Do not disturb the calibration device while in progress"
 msgstr "Do not disturb the calibration device while in progress"
 
+#: panels/color/cc-color-calibrate.ui:7
+msgid "Display Calibration"
+msgstr "Display Calibration"
+
+#. This starts the calibration process
+#: panels/color/cc-color-calibrate.ui:40
+msgid "_Start"
+msgstr "_Start"
+
+#. This resumes the calibration process
+#: panels/color/cc-color-calibrate.ui:54
+msgid "_Resume"
+msgstr "_Resume"
+
+#. This button returns the user back to the color control panel
+#: panels/color/cc-color-calibrate.ui:67 panels/region/cc-format-chooser.ui:64
+msgid "_Done"
+msgstr "_Done"
+
 #. TRANSLATORS: This refers to the TFT display on a laptop
 #: panels/color/cc-color-common.c:41
 msgid "Laptop Screen"
@@ -650,7 +944,7 @@ msgstr "Supported ICC profiles"
 
 #. TRANSLATORS: filter name on the file->open dialog
 #: panels/color/cc-color-panel.c:260
-#: panels/network/wireless-security/eap-method-fast.c:417
+#: panels/network/wireless-security/eap-method-fast.c:356
 msgid "All files"
 msgstr "All files"
 
@@ -689,7 +983,7 @@ msgid "Save Profile"
 msgstr "Save Profile"
 
 #: panels/color/cc-color-panel.c:895
-#: panels/network/connection-editor/vpn-helpers.c:311
+#: panels/network/connection-editor/vpn-helpers.c:300
 msgid "_Save"
 msgstr "_Save"
 
@@ -846,7 +1140,7 @@ msgstr ""
 "\">Microsoft Windows</a> systems useful."
 
 #: panels/color/cc-color-panel.ui:607
-#: panels/user-accounts/um-fingerprint-dialog.c:720
+#: panels/user-accounts/um-fingerprint-dialog.c:719
 msgid "Summary"
 msgstr "Summary"
 
@@ -859,7 +1153,7 @@ msgid "_Import File…"
 msgstr "_Import File…"
 
 #: panels/color/cc-color-panel.ui:672
-#: panels/network/connection-editor/net-connection-editor.c:497
+#: panels/network/connection-editor/net-connection-editor.c:513
 #: panels/printers/new-printer-dialog.ui:80
 #: panels/region/cc-input-chooser.ui:20
 #: panels/user-accounts/cc-add-user-dialog.ui:47
@@ -1086,25 +1380,6 @@ msgstr "Full-screen display correction not possible with this profile"
 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/color/gnome-color-panel.desktop.in.in:3
 msgid "Color"
 msgstr "Colour"
@@ -1124,12 +1399,11 @@ msgstr "Colour;ICC;Profile;Calibrate;Printer;Display;"
 msgid "Other…"
 msgstr "Other…"
 
-#: panels/common/cc-language-chooser.c:125
-#: panels/region/cc-format-chooser.c:296 panels/region/cc-input-chooser.c:178
+#: panels/common/cc-language-chooser.c:127 panels/region/cc-input-chooser.c:178
 msgid "More…"
 msgstr "More…"
 
-#: panels/common/cc-language-chooser.c:142
+#: panels/common/cc-language-chooser.c:144
 msgid "No languages found"
 msgstr "No languages found"
 
@@ -1141,13 +1415,25 @@ msgstr "Select Language"
 msgid "_Select"
 msgstr "_Select"
 
+#: panels/common/cc-permission-infobar.ui:20
+msgid "Unlock…"
+msgstr "Unlock…"
+
+#: panels/common/cc-permission-infobar.ui:45
+msgid "Unlock to Change Settings"
+msgstr "Unlock to Change Settings"
+
+#: panels/common/cc-permission-infobar.ui:55
+msgid "Some settings must be unlocked before they can be changed."
+msgstr "Some settings must be unlocked before they can be changed."
+
 #: panels/common/cc-util.c:127
-#: panels/network/connection-editor/ce-page-details.c:106
+#: panels/network/connection-editor/ce-page-details.c:152
 msgid "Today"
 msgstr "Today"
 
 #: panels/common/cc-util.c:131
-#: panels/network/connection-editor/ce-page-details.c:108
+#: panels/network/connection-editor/ce-page-details.c:154
 msgid "Yesterday"
 msgstr "Yesterday"
 
@@ -1161,6 +1447,46 @@ msgstr "%e %b"
 msgid "%b %e, %Y"
 msgstr "%e %b, %Y"
 
+#: panels/common/cc-util.c:165
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hour"
+msgstr[1] "%d hours"
+
+#: panels/common/cc-util.c:166
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minute"
+msgstr[1] "%d minutes"
+
+#: panels/common/cc-util.c:167
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d second"
+msgstr[1] "%d seconds"
+
+#. 5 hours 2 minutes 12 seconds
+#: panels/common/cc-util.c:172
+#, c-format
+msgctxt "time"
+msgid "%s %s %s"
+msgstr "%s %s %s"
+
+#. 2 minutes 12 seconds
+#: panels/common/cc-util.c:177
+#, c-format
+msgctxt "time"
+msgid "%s %s"
+msgstr "%s %s"
+
+#. 0 seconds
+#: panels/common/cc-util.c:187
+msgid "0 seconds"
+msgstr "0 seconds"
+
 #. translators: This is the default hotspot name, need to be less than 32-bytes
 #: panels/common/hostname-helper.c:177
 msgctxt "hotspot"
@@ -1362,21 +1688,96 @@ 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:958
+#: panels/default-apps/cc-default-apps-panel.ui:31
+msgid "_Web"
+msgstr "_Web"
+
+#: panels/default-apps/cc-default-apps-panel.ui:43
+msgid "_Mail"
+msgstr "_Mail"
+
+#: panels/default-apps/cc-default-apps-panel.ui:59
+msgid "_Calendar"
+msgstr "_Calendar"
+
+#: panels/default-apps/cc-default-apps-panel.ui:75
+msgid "M_usic"
+msgstr "M_usic"
+
+#: panels/default-apps/cc-default-apps-panel.ui:91
+msgid "_Video"
+msgstr "_Video"
+
+#: panels/default-apps/cc-default-apps-panel.ui:162
+#: panels/removable-media/cc-removable-media-panel.ui:162
+msgid "_Photos"
+msgstr "_Photos"
+
+#: panels/default-apps/gnome-default-apps-panel.desktop.in.in:3
+msgid "Default Applications"
+msgstr "Default Applications"
+
+#: panels/default-apps/gnome-default-apps-panel.desktop.in.in:4
+msgid "Configure Default Applications"
+msgstr "Configure Default Applications"
+
+#. Translators: Search terms to find the Default Applications panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
+#: panels/default-apps/gnome-default-apps-panel.desktop.in.in:19
+msgid "default;application;preferred;media;"
+msgstr "default;application;preferred;media;"
+
+#. translators: '%s' is the distributor's name, such as 'Fedora'
+#: panels/diagnostics/cc-diagnostics-panel.c:141
+#, c-format
+msgid ""
+"Sending reports of technical problems helps us improve %s. Reports are sent "
+"anonymously and are scrubbed of personal data."
+msgstr ""
+"Sending reports of technical problems helps us improve %s. Reports are sent "
+"anonymously and are scrubbed of personal data."
+
+#: panels/diagnostics/cc-diagnostics-panel.c:151
+#: panels/diagnostics/cc-diagnostics-panel.ui:53
+msgid "Reports are sent anonymously and are scrubbed of personal data."
+msgstr "Reports are sent anonymously and are scrubbed of personal data."
+
+#: panels/diagnostics/cc-diagnostics-panel.ui:30
+msgid "Problem Reporting"
+msgstr "Problem Reporting"
+
+#: panels/diagnostics/cc-diagnostics-panel.ui:43
+msgid ""
+"Sending reports of technical problems help us improve this operating system."
+msgstr ""
+"Sending reports of technical problems help us improve this operating system."
+
+#: panels/diagnostics/cc-diagnostics-panel.ui:78
+msgid "_Automatic Problem Reporting"
+msgstr "_Automatic Problem Reporting"
+
+#: panels/diagnostics/gnome-diagnostics-panel.desktop.in.in:3
+msgid "Diagnostics"
+msgstr "Diagnostics"
+
+#: panels/diagnostics/gnome-diagnostics-panel.desktop.in.in:4
+msgid "Report your problems"
+msgstr "Report your problems"
+
+#. FIXME
+#: panels/display/cc-display-panel.c:961
 #: panels/network/connection-editor/connection-editor.ui:27
-#: panels/network/network-wifi.ui:38
 msgid "_Apply"
 msgstr "_Apply"
 
-#: panels/display/cc-display-panel.c:979
+#: panels/display/cc-display-panel.c:982
 msgid "Apply Changes?"
 msgstr "Apply Changes?"
 
-#: panels/display/cc-display-panel.c:984
+#: panels/display/cc-display-panel.c:987
 msgid "Changes Cannot be Applied"
 msgstr "Changes Cannot be Applied"
 
-#: panels/display/cc-display-panel.c:985
+#: panels/display/cc-display-panel.c:988
 msgid "This could be due to hardware limitations."
 msgstr "This could be due to hardware limitations."
 
@@ -1397,6 +1798,14 @@ msgstr "Mirror"
 msgid "Display Mode"
 msgstr "Display Mode"
 
+#: panels/display/cc-display-panel.ui:222
+msgid "Contains top bar and Activities"
+msgstr "Contains top bar and Activities"
+
+#: panels/display/cc-display-panel.ui:223
+msgid "Primary Display"
+msgstr "Primary Display"
+
 #: panels/display/cc-display-panel.ui:245
 msgid ""
 "Drag displays to match your physical display setup. Select a display to "
@@ -1409,6 +1818,10 @@ msgstr ""
 msgid "Display Arrangement"
 msgstr "Display Arrangement"
 
+#: panels/display/cc-display-panel.ui:387
+msgid "Active Display"
+msgstr "Active Display"
+
 #: panels/display/cc-display-panel.ui:434
 msgid "Display Configuration"
 msgstr "Display Configuration"
@@ -1511,7 +1924,7 @@ msgid "Manual Schedule"
 msgstr "Manual Schedule"
 
 #: panels/display/cc-night-light-page.ui:148
-#: panels/region/cc-format-chooser.ui:154
+#: panels/region/cc-format-chooser.ui:346
 msgid "Times"
 msgstr "Times"
 
@@ -1557,37 +1970,11 @@ 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:162
-msgid "_Photos"
-msgstr "_Photos"
-
-#. TRANSLATORS: AP type
-#: panels/info/cc-info-overview-panel.c:369
-#: panels/info/cc-info-overview-panel.c:440
-#: panels/info/cc-info-overview-panel.c:452
-#: panels/info/cc-info-overview-panel.c:497
-#: panels/info/cc-info-overview-panel.c:527 panels/network/panel-common.c:123
+#: panels/info-overview/cc-info-overview-panel.c:406
+#: panels/info-overview/cc-info-overview-panel.c:421
+#: panels/info-overview/cc-info-overview-panel.c:433
+#: panels/info-overview/cc-info-overview-panel.c:479
+#: panels/info-overview/cc-info-overview-panel.c:509
 msgid "Unknown"
 msgstr "Unknown"
 
@@ -1595,217 +1982,106 @@ 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:460
+#: panels/info-overview/cc-info-overview-panel.c:441
 #, 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:477
+#: panels/info-overview/cc-info-overview-panel.c:456
 #, 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:480
+#: panels/info-overview/cc-info-overview-panel.c:459
 #, c-format
 msgid "32-bit"
 msgstr "32-bit"
 
-#: panels/info/cc-info-overview-panel.c:710
-#, c-format
-msgid "Version %s"
-msgstr "Version %s"
+#: panels/info-overview/cc-info-overview-panel.c:665
+msgid "X11"
+msgstr "X11"
 
-#: panels/info/cc-info-overview-panel.ui:70
-msgid "Device name"
-msgstr "Device name"
+#: panels/info-overview/cc-info-overview-panel.c:669
+msgid "Wayland"
+msgstr "Wayland"
 
-#: panels/info/cc-info-overview-panel.ui:86
+#: panels/info-overview/cc-info-overview-panel.c:671
+msgctxt "Windowing system (Wayland, X11, or Unknown)"
+msgid "Unknown"
+msgstr "Unknown"
+
+#: panels/info-overview/cc-info-overview-panel.ui:54
+msgid "Device Name"
+msgstr "Device Name"
+
+#: panels/info-overview/cc-info-overview-panel.ui:76
 msgid "Memory"
 msgstr "Memory"
 
-#: panels/info/cc-info-overview-panel.ui:102
+#: panels/info-overview/cc-info-overview-panel.ui:85
 msgid "Processor"
 msgstr "Processor"
 
-#: panels/info/cc-info-overview-panel.ui:118
+#: panels/info-overview/cc-info-overview-panel.ui:94
 msgid "Graphics"
 msgstr "Graphics"
 
-#. To translators: this field contains the distro name and version
-#: panels/info/cc-info-overview-panel.ui:133
-msgid "OS name"
-msgstr "OS name"
+#: panels/info-overview/cc-info-overview-panel.ui:103
+msgid "Disk Capacity"
+msgstr "Disk Capacity"
+
+#: panels/info-overview/cc-info-overview-panel.ui:104
+msgid "Calculating…"
+msgstr "Calculating…"
+
+#. translators: this field contains the distro name and version
+#: panels/info-overview/cc-info-overview-panel.ui:126
+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-overview/cc-info-overview-panel.ui:135
+msgid "OS Type"
+msgstr "OS Type"
 
-#: panels/info/cc-info-overview-panel.ui:165
+#: panels/info-overview/cc-info-overview-panel.ui:144
+msgid "GNOME Version"
+msgstr "GNOME Version"
+
+#: panels/info-overview/cc-info-overview-panel.ui:154
+msgid "Windowing System"
+msgstr "Windowing System"
+
+#: panels/info-overview/cc-info-overview-panel.ui:162
 msgid "Virtualization"
 msgstr "Virtualisation"
 
-#: panels/info/cc-info-overview-panel.ui:181
-msgid "Disk"
-msgstr "Disk"
+#: panels/info-overview/cc-info-overview-panel.ui:171
+msgid "Software Updates"
+msgstr "Software Updates"
 
-#: panels/info/cc-info-overview-panel.ui:293
-msgid "Calculating…"
-msgstr "Calculating…"
+#: panels/info-overview/cc-info-overview-panel.ui:192
+msgid "Rename Device"
+msgstr "Rename Device"
 
-#: panels/info/cc-info-overview-panel.ui:333
-msgid "Check for updates"
-msgstr "Check for updates"
+#: panels/info-overview/cc-info-overview-panel.ui:209
+msgid ""
+"The device name is used to identify this device when it is viewed over the "
+"network, or when pairing Bluetooth devices."
+msgstr ""
+"The device name is used to identify this device when it is viewed over the "
+"network, or when pairing Bluetooth devices."
 
-#: panels/info/cc-info-removable-media-panel.c:307
-msgid "Ask what to do"
-msgstr "Ask what to do"
+#: panels/info-overview/cc-info-overview-panel.ui:226
+msgid "_Rename"
+msgstr "_Rename"
 
-#: panels/info/cc-info-removable-media-panel.c:311
-msgid "Do nothing"
-msgstr "Do nothing"
-
-#: panels/info/cc-info-removable-media-panel.c:315
-msgid "Open folder"
-msgstr "Open folder"
-
-#: panels/info/cc-info-removable-media-panel.c:401
-msgid "Other Media"
-msgstr "Other Media"
-
-#: panels/info/cc-info-removable-media-panel.c:434
-msgid "Select an application for audio CDs"
-msgstr "Select an application for audio CDs"
-
-#: panels/info/cc-info-removable-media-panel.c:435
-msgid "Select an application for video DVDs"
-msgstr "Select an application for video DVDs"
-
-#: panels/info/cc-info-removable-media-panel.c:436
-msgid "Select an application to run when a music player is connected"
-msgstr "Select an application to run when a music player is connected"
-
-#: panels/info/cc-info-removable-media-panel.c:437
-msgid "Select an application to run when a camera is connected"
-msgstr "Select an application to run when a camera is connected"
-
-#: panels/info/cc-info-removable-media-panel.c:438
-msgid "Select an application for software CDs"
-msgstr "Select an application for software CDs"
-
-#. translators: these strings are duplicates of shared-mime-info
-#. * strings, just here to fix capitalization of the English originals.
-#. * If the shared-mime-info translation works for your language,
-#. * simply leave these untranslated.
-#.
-#: panels/info/cc-info-removable-media-panel.c:450
-msgid "audio DVD"
-msgstr "audio DVD"
-
-#: panels/info/cc-info-removable-media-panel.c:451
-msgid "blank Blu-ray disc"
-msgstr "blank Blu-ray disc"
-
-#: panels/info/cc-info-removable-media-panel.c:452
-msgid "blank CD disc"
-msgstr "blank CD disc"
-
-#: panels/info/cc-info-removable-media-panel.c:453
-msgid "blank DVD disc"
-msgstr "blank DVD disc"
-
-#: panels/info/cc-info-removable-media-panel.c:454
-msgid "blank HD DVD disc"
-msgstr "blank HD DVD disc"
-
-#: panels/info/cc-info-removable-media-panel.c:455
-msgid "Blu-ray video disc"
-msgstr "Blu-ray video disc"
-
-#: panels/info/cc-info-removable-media-panel.c:456
-msgid "e-book reader"
-msgstr "e-book reader"
-
-#: panels/info/cc-info-removable-media-panel.c:457
-msgid "HD DVD video disc"
-msgstr "HD DVD video disc"
-
-#: panels/info/cc-info-removable-media-panel.c:458
-msgid "Picture CD"
-msgstr "Picture CD"
-
-#: panels/info/cc-info-removable-media-panel.c:459
-msgid "Super Video CD"
-msgstr "Super Video CD"
-
-#: panels/info/cc-info-removable-media-panel.c:460
-msgid "Video CD"
-msgstr "Video CD"
-
-#: panels/info/cc-info-removable-media-panel.c:461
-msgid "Windows software"
-msgstr "Windows software"
-
-#: panels/info/cc-info-removable-media-panel.ui:44
-msgid "Select how media should be handled"
-msgstr "Select how media should be handled"
-
-#: panels/info/cc-info-removable-media-panel.ui:75
-msgid "CD _audio"
-msgstr "CD _audio"
-
-#: panels/info/cc-info-removable-media-panel.ui:92
-msgid "_DVD video"
-msgstr "_DVD video"
-
-#: panels/info/cc-info-removable-media-panel.ui:133
-msgid "_Music player"
-msgstr "_Music player"
-
-#: panels/info/cc-info-removable-media-panel.ui:191
-msgid "_Software"
-msgstr "_Software"
-
-#: panels/info/cc-info-removable-media-panel.ui:229
-msgid "_Other Media…"
-msgstr "_Other Media…"
-
-#: panels/info/cc-info-removable-media-panel.ui:287
-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:339
-msgid "Select how other media should be handled"
-msgstr "Select how other media should be handled"
-
-#: panels/info/cc-info-removable-media-panel.ui:378
-msgid "_Action:"
-msgstr "_Action:"
-
-#: panels/info/cc-info-removable-media-panel.ui:401
-msgid "_Type:"
-msgstr "_Type:"
-
-#: panels/info/gnome-default-apps-panel.desktop.in.in:3
-msgid "Default Applications"
-msgstr "Default Applications"
-
-#: panels/info/gnome-default-apps-panel.desktop.in.in:4
-msgid "Configure Default Applications"
-msgstr "Configure Default Applications"
-
-#. Translators: Search terms to find the Default Applications panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
-#: panels/info/gnome-default-apps-panel.desktop.in.in:19
-msgid "default;application;preferred;media;"
-msgstr "default;application;preferred;media;"
-
-#: panels/info/gnome-info-overview-panel.desktop.in.in:3
+#: panels/info-overview/gnome-info-overview-panel.desktop.in.in:3
 msgid "About"
 msgstr "About"
 
-#: panels/info/gnome-info-overview-panel.desktop.in.in:4
+#: panels/info-overview/gnome-info-overview-panel.desktop.in.in:4
 msgid "View information about your system"
 msgstr "View information about your system"
 
@@ -1814,30 +2090,13 @@ msgstr "View information about your system"
 #. The list MUST also end with a semicolon!
 #. "Preferred Applications" is the old name for the preference, so make
 #. sure that you use the same "translation" for those keywords
-#: panels/info/gnome-info-overview-panel.desktop.in.in:23
-msgid ""
-"device;system;information;memory;processor;version;default;application;"
-"preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
-msgstr ""
-"device;system;information;memory;processor;version;default;application;"
-"preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
-
-#: panels/info/gnome-removable-media-panel.desktop.in.in:3
-msgid "Removable Media"
-msgstr "Removable Media"
-
-#: panels/info/gnome-removable-media-panel.desktop.in.in:4
-msgid "Configure Removable Media settings"
-msgstr "Configure Removable Media settings"
-
-#. Translators: Search terms to find the Removable Media panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
-#: panels/info/gnome-removable-media-panel.desktop.in.in:19
+#: panels/info-overview/gnome-info-overview-panel.desktop.in.in:23
 msgid ""
-"device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;"
-"removable;media;autorun;"
+"device;system;information;hostname;memory;processor;version;default;"
+"application;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
 msgstr ""
-"device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;"
-"removable;media;autorun;"
+"device;system;information;hostname;memory;processor;version;default;"
+"application;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
 
 #: panels/keyboard/00-multimedia.xml.in:2
 msgid "Sound and Media"
@@ -2010,6 +2269,43 @@ msgstr "Decrease text size"
 msgid "High contrast on or off"
 msgstr "High contrast on or off"
 
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:8
+#: panels/keyboard/cc-keyboard-panel.ui:72
+msgid "Alternate Characters Key"
+msgstr "Alternative Characters Key"
+
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:28
+msgid ""
+"The alternate characters key can be used to enter additional characters. "
+"These are sometimes printed as a third-option on your keyboard."
+msgstr ""
+"The alternate characters key can be used to enter additional characters. "
+"These are sometimes printed as a third-option on your keyboard."
+
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:45
+msgid "Left Alt"
+msgstr "Left Alt"
+
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:61
+msgid "Right Alt"
+msgstr "Right Alt"
+
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:77
+msgid "Left Super"
+msgstr "Left Super"
+
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:93
+msgid "Right Super"
+msgstr "Right Super"
+
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:109
+msgid "Menu key"
+msgstr "Menu key"
+
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:125
+msgid "Right Ctrl"
+msgstr "Right Ctrl"
+
 #: panels/keyboard/cc-keyboard-manager.c:501
 #: panels/keyboard/cc-keyboard-manager.c:509
 #: panels/keyboard/cc-keyboard-manager.c:809
@@ -2036,11 +2332,41 @@ msgstr "Compose Key"
 msgid "Modifiers-only switch to next source"
 msgstr "Modifiers-only switch to next source"
 
-#: panels/keyboard/cc-keyboard-panel.c:180
+#: panels/keyboard/cc-keyboard-panel.c:94
+msgctxt "keyboard key"
+msgid "Right Ctrl"
+msgstr "Right Ctrl"
+
+#: panels/keyboard/cc-keyboard-panel.c:95
+msgctxt "keyboard key"
+msgid "Menu Key"
+msgstr "Menu Key"
+
+#: panels/keyboard/cc-keyboard-panel.c:96
+msgctxt "keyboard key"
+msgid "Left Super"
+msgstr "Left Super"
+
+#: panels/keyboard/cc-keyboard-panel.c:97
+msgctxt "keyboard key"
+msgid "Right Super"
+msgstr "Right Super"
+
+#: panels/keyboard/cc-keyboard-panel.c:98
+msgctxt "keyboard key"
+msgid "Left Alt"
+msgstr "Left Alt"
+
+#: panels/keyboard/cc-keyboard-panel.c:99
+msgctxt "keyboard key"
+msgid "Right Alt"
+msgstr "Right Alt"
+
+#: panels/keyboard/cc-keyboard-panel.c:201
 msgid "Reset All Shortcuts?"
 msgstr "Reset All Shortcuts?"
 
-#: panels/keyboard/cc-keyboard-panel.c:183
+#: panels/keyboard/cc-keyboard-panel.c:204
 msgid ""
 "Resetting the shortcuts may affect your custom shortcuts. This cannot be "
 "undone."
@@ -2048,41 +2374,42 @@ msgstr ""
 "Resetting the shortcuts may affect your custom shortcuts. This cannot be "
 "undone."
 
-#: panels/keyboard/cc-keyboard-panel.c:187
-#: panels/keyboard/shortcut-editor.ui:346
+#: panels/keyboard/cc-keyboard-panel.c:208
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:346
 #: panels/printers/authentication-dialog.ui:29
 #: panels/printers/ppd-selection-dialog.ui:27
 msgid "Cancel"
 msgstr "Cancel"
 
-#: panels/keyboard/cc-keyboard-panel.c:188
+#: panels/keyboard/cc-keyboard-panel.c:209
 msgid "Reset All"
 msgstr "Reset All"
 
-#: panels/keyboard/cc-keyboard-panel.c:284
+#: panels/keyboard/cc-keyboard-panel.c:305
 msgid "Reset the shortcut to its default value"
 msgstr "Reset the shortcut to its default value"
 
-#: panels/keyboard/cc-keyboard-panel.ui:116
+#: panels/keyboard/cc-keyboard-panel.ui:73
+msgid "Hold down and type to enter different characters"
+msgstr "Hold down and type to enter different characters"
+
+#: panels/keyboard/cc-keyboard-panel.ui:147
 msgid "Reset All…"
 msgstr "Reset All…"
 
-#: panels/keyboard/cc-keyboard-panel.ui:117
+#: panels/keyboard/cc-keyboard-panel.ui:148
 msgid "Reset all shortcuts to their default keybindings"
 msgstr "Reset all shortcuts to their default keybindings"
 
-#: panels/keyboard/cc-keyboard-panel.ui:146
+#: panels/keyboard/cc-keyboard-panel.ui:177
 msgid "No keyboard shortcut found"
 msgstr "No keyboard shortcut found"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.c:411
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:413
 #, c-format
-msgid ""
-"%s is already being used for <b>%s</b>. If you replace it, %s will be "
-"disabled"
+msgid "%s is already being used for %s. If you replace it, %s will be disabled"
 msgstr ""
-"%s is already being used for <b>%s</b>. If you replace it, %s will be "
-"disabled"
+"%s is already being used for %s. If you replace it, %s will be disabled"
 
 #: panels/keyboard/cc-keyboard-shortcut-editor.c:581
 msgid "Set Custom Shortcut"
@@ -2092,248 +2419,522 @@ msgstr "Set Custom Shortcuts"
 msgid "Set Shortcut"
 msgstr "Set Shortcut"
 
-#. Setup the top label
-#: panels/keyboard/cc-keyboard-shortcut-editor.c:590
+#. TRANSLATORS: %s is replaced with a description of the keyboard shortcut
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:592
 #, c-format
-msgid "Enter new shortcut to change <b>%s</b>."
-msgstr "Enter new shortcut to change <b>%s</b>."
+msgid "Enter new shortcut to change %s."
+msgstr "Enter new shortcut to change %s."
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.c:1017
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:1016
 msgid "Add Custom Shortcut"
 msgstr "Add Custom Shortcut"
 
-#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:3
-#: panels/region/cc-region-panel.ui:394 shell/cc-window.ui:339
-msgid "Keyboard Shortcuts"
-msgstr "Keyboard Shortcuts"
-
-#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:4
-msgid "View and change keyboard shortcuts and set your typing preferences"
-msgstr "View and change keyboard shortcuts and set your typing preferences"
-
-#. Translators: Search terms to find the Keyboard panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
-#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:19
-msgid ""
-"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;"
-msgstr ""
-"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;"
-
-#: panels/keyboard/shortcut-editor.ui:68 panels/keyboard/shortcut-editor.ui:318
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:68
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:318
 msgid "Press Esc to cancel or Backspace to disable the keyboard shortcut."
 msgstr "Press Esc to cancel or Backspace to disable the keyboard shortcut."
 
-#: panels/keyboard/shortcut-editor.ui:156 panels/printers/details-dialog.ui:38
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:156
+#: panels/printers/pp-details-dialog.ui:40
 msgid "Name"
 msgstr "Name"
 
-#: panels/keyboard/shortcut-editor.ui:168
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:168
 msgid "Command"
 msgstr "Command"
 
-#: panels/keyboard/shortcut-editor.ui:180
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:180
 msgid "Shortcut"
 msgstr "Shortcut"
 
-#: panels/keyboard/shortcut-editor.ui:259
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:259
 msgid "Set Shortcut…"
 msgstr "Set Shortcut…"
 
-#: panels/keyboard/shortcut-editor.ui:272 panels/network/network-wifi.ui:593
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:272
 msgid "None"
 msgstr "None"
 
-#: panels/keyboard/shortcut-editor.ui:303
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:303
 msgid "Enter the new shortcut"
 msgstr "Enter the new shortcut"
 
-#: panels/keyboard/shortcut-editor.ui:357
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:357
 msgid "Remove"
 msgstr "Remove"
 
-#: panels/keyboard/shortcut-editor.ui:367
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:367
 msgid "Add"
 msgstr "Add"
 
-#: panels/keyboard/shortcut-editor.ui:382
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:382
 msgid "Replace"
 msgstr "Replace"
 
-#: panels/keyboard/shortcut-editor.ui:395
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:395
 msgid "Set"
 msgstr "Set"
 
-#: panels/mouse/cc-mouse-panel.c:80 panels/wacom/cc-wacom-panel.c:463
-msgid "Test Your _Settings"
-msgstr "Test Your _Settings"
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:3
+#: panels/region/cc-region-panel.ui:394 shell/cc-window.ui:327
+msgid "Keyboard Shortcuts"
+msgstr "Keyboard Shortcuts"
 
-#: panels/mouse/gnome-mouse-panel.desktop.in.in:3
-msgid "Mouse & Touchpad"
-msgstr "Mouse & Touchpad"
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:4
+msgid "View and change keyboard shortcuts and set your typing preferences"
+msgstr "View and change keyboard shortcuts and set your typing preferences"
 
-#: panels/mouse/gnome-mouse-panel.desktop.in.in:4
+#. Translators: Search terms to find the Keyboard panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:19
 msgid ""
-"Change your mouse or touchpad sensitivity and select right or left-handed"
+"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;"
 msgstr ""
-"Change your mouse or touchpad sensitivity and select right or left-handed"
-
-#. Translators: Search terms to find the Mouse and Touchpad panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
-#: panels/mouse/gnome-mouse-panel.desktop.in.in:19
-msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;"
-msgstr "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;Touchpad;"
+"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;"
 
-#: panels/mouse/gnome-mouse-properties.ui:50
-msgid "General"
-msgstr "General"
+#: panels/location/cc-location-panel.ui:31
+msgid "Location services turned off"
+msgstr "Location services turned off"
 
-#: panels/mouse/gnome-mouse-properties.ui:88
-msgid "Primary Button"
-msgstr "Primary Button"
+#: panels/location/cc-location-panel.ui:40
+msgid "No applications can obtain location information."
+msgstr "No applications can obtain location information."
 
-#: panels/mouse/gnome-mouse-properties.ui:107
-msgid "Sets the order of physical buttons on mice and touchpads."
-msgstr "Sets the order of physical buttons on mice and touchpads."
+#: panels/location/cc-location-panel.ui:74
+msgid ""
+"Location services allow applications to know your location. Using Wi-Fi and "
+"mobile broadband increases accuracy."
+msgstr ""
+"Location services allow applications to know your location. Using Wi-Fi and "
+"mobile broadband increases accuracy."
 
-#: panels/mouse/gnome-mouse-properties.ui:136
-#: panels/sound/cc-balance-slider.ui:13
-msgid "Left"
-msgstr "Left"
+#: panels/location/cc-location-panel.ui:83
+msgid ""
+"Uses Mozilla Location Service: <a href='https://location.services.mozilla.";
+"com/privacy'>Privacy Policy</a>"
+msgstr ""
+"Uses Mozilla Location Service: <a href='https://location.services.mozilla.";
+"com/privacy'>Privacy Policy</a>"
 
-#: panels/mouse/gnome-mouse-properties.ui:146
-#: panels/sound/cc-balance-slider.ui:15
-msgid "Right"
-msgstr "Right"
+#: panels/location/cc-location-panel.ui:95
+msgid "Allow the applications below to determine your location."
+msgstr "Allow the applications below to determine your location."
 
-#: panels/mouse/gnome-mouse-properties.ui:182
-msgid "Mouse"
-msgstr "Mouse"
+#: panels/location/cc-location-panel.ui:115
+msgid "No Applications Have Asked for Location Access"
+msgstr "No Applications Have Asked for Location Access"
 
-#: panels/mouse/gnome-mouse-properties.ui:221
-msgid "Mouse Speed"
-msgstr "Mouse Speed"
+#: panels/location/gnome-location-panel.desktop.in.in:4
+msgid "Protect your location information"
+msgstr "Protect your location information"
 
-#: panels/mouse/gnome-mouse-properties.ui:243
-#: panels/mouse/gnome-mouse-properties.ui:535
-msgid "Double-click timeout"
-msgstr "Double-click timeout"
+#. FIXME
+#: panels/lock/cc-lock-panel.ui:29
+msgid ""
+"Automatically locking the screen prevents others from access the computer "
+"while you're away."
+msgstr ""
+"Automatically locking the screen prevents others from using the computer "
+"while you're away."
 
-#. 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:443
-msgid "Natural Scrolling"
-msgstr "Natural Scrolling"
+#: panels/lock/cc-lock-panel.ui:46
+msgid "Blank Screen Delay"
+msgstr "Blank Screen Delay"
 
-#: panels/mouse/gnome-mouse-properties.ui:296
-#: panels/mouse/gnome-mouse-properties.ui:459
-msgid "Scrolling moves the content, not the view."
-msgstr "Scrolling moves the content, not the view."
+#: panels/lock/cc-lock-panel.ui:47
+msgid "Period of inactivity after which the screen will go blank."
+msgstr "Period of inactivity after which the screen will go blank."
 
-#: panels/mouse/gnome-mouse-properties.ui:346
-#: panels/mouse/gnome-mouse-properties.ui:391
-msgid "Touchpad"
-msgstr "Touchpad"
+#: panels/lock/cc-lock-panel.ui:67
+msgid "Automatic Screen _Lock"
+msgstr "Automatic Screen _Lock"
 
-#: panels/mouse/gnome-mouse-properties.ui:514
-msgid "Touchpad Speed"
-msgstr "Touchpad Speed"
+#: panels/lock/cc-lock-panel.ui:84
+msgid "Automatic _Screen Lock Delay"
+msgstr "Automatic _Screen Lock Delay"
 
-#: panels/mouse/gnome-mouse-properties.ui:573
-msgid "Tap to Click"
-msgstr "Tap to Click"
+#: panels/lock/cc-lock-panel.ui:85
+msgid "Period after the screen blanks when the screen is automatically locked."
+msgstr ""
+"Period after the screen blanks when the screen is automatically locked."
 
-#: panels/mouse/gnome-mouse-properties.ui:625
-msgid "Two-finger Scrolling"
-msgstr "Two-finger Scrolling"
+#: panels/lock/cc-lock-panel.ui:105
+msgid "Show _Notifications on Lock Screen"
+msgstr "Show _Notifications on Lock Screen"
 
-#: panels/mouse/gnome-mouse-properties.ui:678
-msgid "Edge Scrolling"
-msgstr "Edge Scrolling"
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:149
+msgctxt "lock_screen"
+msgid "Screen Turns Off"
+msgstr "Screen Turns Off"
 
-#: panels/mouse/gnome-mouse-test.c:132 panels/mouse/gnome-mouse-test.ui:25
-msgid "Try clicking, double clicking, scrolling"
-msgstr "Try clicking, double clicking, scrolling"
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:153
+msgctxt "lock_screen"
+msgid "30 seconds"
+msgstr "30 seconds"
 
-#: panels/mouse/gnome-mouse-test.c:137
-msgid "Five clicks, GEGL time!"
-msgstr "Five clicks, GEGL time!"
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:157
+msgctxt "lock_screen"
+msgid "1 minute"
+msgstr "1 minute"
 
-#: panels/mouse/gnome-mouse-test.c:142
-msgid "Double click, primary button"
-msgstr "Double click, primary button"
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:161
+msgctxt "lock_screen"
+msgid "2 minutes"
+msgstr "2 minutes"
 
-#: panels/mouse/gnome-mouse-test.c:142
-msgid "Single click, primary button"
-msgstr "Single click, primary button"
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:165
+msgctxt "lock_screen"
+msgid "3 minutes"
+msgstr "3 minutes"
 
-#: panels/mouse/gnome-mouse-test.c:145
-msgid "Double click, middle button"
-msgstr "Double click, middle button"
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:169
+msgctxt "lock_screen"
+msgid "5 minutes"
+msgstr "5 minutes"
 
-#: panels/mouse/gnome-mouse-test.c:145
-msgid "Single click, middle button"
-msgstr "Single click, middle button"
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:173
+msgctxt "lock_screen"
+msgid "30 minutes"
+msgstr "30 minutes"
+
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:177
+msgctxt "lock_screen"
+msgid "1 hour"
+msgstr "1 hour"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:192 panels/power/cc-power-panel.ui:63
+msgctxt "blank_screen"
+msgid "1 minute"
+msgstr "1 minute"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:196 panels/power/cc-power-panel.ui:67
+msgctxt "blank_screen"
+msgid "2 minutes"
+msgstr "2 minutes"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:200 panels/power/cc-power-panel.ui:71
+msgctxt "blank_screen"
+msgid "3 minutes"
+msgstr "3 minutes"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:204 panels/power/cc-power-panel.ui:75
+msgctxt "blank_screen"
+msgid "4 minutes"
+msgstr "4 minutes"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:208 panels/power/cc-power-panel.ui:79
+msgctxt "blank_screen"
+msgid "5 minutes"
+msgstr "5 minutes"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:212 panels/power/cc-power-panel.ui:83
+msgctxt "blank_screen"
+msgid "8 minutes"
+msgstr "8 minutes"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:216 panels/power/cc-power-panel.ui:87
+msgctxt "blank_screen"
+msgid "10 minutes"
+msgstr "10 minutes"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:220 panels/power/cc-power-panel.ui:91
+msgctxt "blank_screen"
+msgid "12 minutes"
+msgstr "12 minutes"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:224 panels/power/cc-power-panel.ui:95
+msgctxt "blank_screen"
+msgid "15 minutes"
+msgstr "15 minutes"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:228 panels/power/cc-power-panel.ui:99
+msgctxt "blank_screen"
+msgid "Never"
+msgstr "Never"
+
+#: panels/lock/gnome-lock-panel.desktop.in.in:3
+msgid "Screen Lock"
+msgstr "Screen Lock"
+
+#: panels/lock/gnome-lock-panel.desktop.in.in:4
+msgid "Lock your screen"
+msgstr "Lock your screen"
+
+#. FIXME
+#: panels/microphone/cc-microphone-panel.ui:34
+msgid "Microphone is turned off"
+msgstr "Microphone is turned off"
+
+#: panels/microphone/cc-microphone-panel.ui:43
+msgid "No applications can record sound."
+msgstr "No applications can record sound."
+
+#: panels/microphone/cc-microphone-panel.ui:77
+msgid ""
+"Use of the microphone allows applications to record and listen to audio. "
+"Disabling the microphone may cause some applications to not function "
+"properly."
+msgstr ""
+"Use of the microphone allows applications to record and listen to sounds. "
+"Disabling the microphone may cause some applications to function incorrectly."
+
+#: panels/microphone/cc-microphone-panel.ui:87
+msgid "Allow the applications below to use your microphone."
+msgstr "Allow the applications below to use your microphone."
+
+#: panels/microphone/cc-microphone-panel.ui:107
+msgid "No Applications Have Asked for Microphone Access"
+msgstr "No Applications Have Asked for Microphone Access"
+
+#: panels/microphone/gnome-microphone-panel.desktop.in.in:4
+msgid "Protect your conversations"
+msgstr "Protect your conversations"
+
+#. FIXME
+#: panels/mouse/cc-mouse-panel.ui:37
+msgid "General"
+msgstr "General"
+
+#: panels/mouse/cc-mouse-panel.ui:75
+msgid "Primary Button"
+msgstr "Primary Button"
+
+#: panels/mouse/cc-mouse-panel.ui:94
+msgid "Sets the order of physical buttons on mice and touchpads."
+msgstr "Sets the order of physical buttons on mice and touchpads."
+
+#: panels/mouse/cc-mouse-panel.ui:123 panels/sound/cc-balance-slider.ui:13
+msgid "Left"
+msgstr "Left"
+
+#: panels/mouse/cc-mouse-panel.ui:133 panels/sound/cc-balance-slider.ui:15
+msgid "Right"
+msgstr "Right"
+
+#: panels/mouse/cc-mouse-panel.ui:169
+msgid "Mouse"
+msgstr "Mouse"
+
+#: panels/mouse/cc-mouse-panel.ui:208
+msgid "Mouse Speed"
+msgstr "Mouse Speed"
+
+#: panels/mouse/cc-mouse-panel.ui:230 panels/mouse/cc-mouse-panel.ui:522
+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/cc-mouse-panel.ui:267 panels/mouse/cc-mouse-panel.ui:430
+msgid "Natural Scrolling"
+msgstr "Natural Scrolling"
+
+#: panels/mouse/cc-mouse-panel.ui:283 panels/mouse/cc-mouse-panel.ui:446
+msgid "Scrolling moves the content, not the view."
+msgstr "Scrolling moves the content, not the view."
+
+#: panels/mouse/cc-mouse-panel.ui:333 panels/mouse/cc-mouse-panel.ui:378
+msgid "Touchpad"
+msgstr "Touchpad"
+
+#: panels/mouse/cc-mouse-panel.ui:501
+msgid "Touchpad Speed"
+msgstr "Touchpad Speed"
+
+#: panels/mouse/cc-mouse-panel.ui:560
+msgid "Tap to Click"
+msgstr "Tap to Click"
+
+#: panels/mouse/cc-mouse-panel.ui:612
+msgid "Two-finger Scrolling"
+msgstr "Two-finger Scrolling"
+
+#: panels/mouse/cc-mouse-panel.ui:665
+msgid "Edge Scrolling"
+msgstr "Edge Scrolling"
+
+#: panels/mouse/cc-mouse-panel.ui:719 panels/wacom/cc-wacom-panel.c:438
+msgid "Test Your _Settings"
+msgstr "Test Your _Settings"
+
+#: panels/mouse/cc-mouse-test.c:132 panels/mouse/cc-mouse-test.ui:25
+msgid "Try clicking, double clicking, scrolling"
+msgstr "Try clicking, double clicking, scrolling"
+
+#: panels/mouse/cc-mouse-test.c:137
+msgid "Five clicks, GEGL time!"
+msgstr "Five clicks, GEGL time!"
+
+#: panels/mouse/cc-mouse-test.c:142
+msgid "Double click, primary button"
+msgstr "Double click, primary button"
+
+#: panels/mouse/cc-mouse-test.c:142
+msgid "Single click, primary button"
+msgstr "Single click, primary button"
+
+#: panels/mouse/cc-mouse-test.c:145
+msgid "Double click, middle button"
+msgstr "Double click, middle button"
+
+#: panels/mouse/cc-mouse-test.c:145
+msgid "Single click, middle button"
+msgstr "Single click, middle button"
 
-#: panels/mouse/gnome-mouse-test.c:148
+#: panels/mouse/cc-mouse-test.c:148
 msgid "Double click, secondary button"
 msgstr "Double click, secondary button"
 
-#: panels/mouse/gnome-mouse-test.c:148
+#: panels/mouse/cc-mouse-test.c:148
 msgid "Single click, secondary button"
 msgstr "Single click, secondary button"
 
-#. add proxy to device list
-#: panels/network/cc-network-panel.c:590
-msgid "Network proxy"
-msgstr "Network proxy"
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:3
+msgid "Mouse & Touchpad"
+msgstr "Mouse & Touchpad"
+
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:4
+msgid ""
+"Change your mouse or touchpad sensitivity and select right or left-handed"
+msgstr ""
+"Change your mouse or touchpad sensitivity and select right or left-handed"
 
-#. Translators: this is the title of the connection details
-#. * window for vpn connections, it is also used to display
-#. * vpn connections in the device list.
-#.
-#: panels/network/cc-network-panel.c:725 panels/network/net-vpn.c:167
-#: panels/network/net-vpn.c:295
-#, c-format
-msgid "%s VPN"
-msgstr "%s VPN"
+#. Translators: Search terms to find the Mouse and Touchpad panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:19
+msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;"
+msgstr "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;Touchpad;"
 
-#: panels/network/cc-network-panel.c:789 panels/network/cc-wifi-panel.ui:306
+#: panels/network/cc-network-panel.c:648 panels/network/cc-wifi-panel.ui:306
 msgid "Oops, something has gone wrong. Please contact your software vendor."
 msgstr "Oops, something has gone wrong. Please contact your software vendor."
 
-#: panels/network/cc-network-panel.c:795
+#: panels/network/cc-network-panel.c:654
 msgid "NetworkManager needs to be running."
 msgstr "NetworkManager needs to be running."
 
-#: panels/network/cc-network-panel.ui:102
+#: panels/network/cc-network-panel.ui:68
 msgid "Other Devices"
 msgstr "Other Devices"
 
-#: panels/network/cc-network-panel.ui:143
-#: panels/network/connection-editor/net-connection-editor.c:581
+#: panels/network/cc-network-panel.ui:109
+#: panels/network/connection-editor/net-connection-editor.c:596
 msgid "VPN"
 msgstr "VPN"
 
-#: panels/network/cc-network-panel.ui:195
+#: panels/network/cc-network-panel.ui:153
 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
+#: panels/network/cc-wifi-connection-row.c:198
 #, c-format
 msgctxt "Wi-Fi Connection"
 msgid "%s (SSID: %s)"
 msgstr "%s (SSID: %s)"
 
+#: panels/network/cc-wifi-connection-row.c:258
+msgid "Insecure network (WEP)"
+msgstr "Insecure network (WEP)"
+
+#: panels/network/cc-wifi-connection-row.c:263
+msgid "Secure network (WPA)"
+msgstr "Secure network (WPA)"
+
+#: panels/network/cc-wifi-connection-row.c:268
+msgid "Secure network (WPA2)"
+msgstr "Secure network (WPA2)"
+
+#: panels/network/cc-wifi-connection-row.c:273
+#| msgid "Secure network (WPA)"
+msgid "Secure network (WPA3)"
+msgstr "Secure network (WPA3)"
+
+#: panels/network/cc-wifi-connection-row.c:278
+msgid "Secure network"
+msgstr "Secure network"
+
 #: panels/network/cc-wifi-connection-row.ui:102
-#: 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
+#: panels/network/net-device-ethernet.c:318
+#: panels/network/network-bluetooth.ui:76
+#: panels/network/network-ethernet.ui:102 panels/network/network-mobile.ui:414
+#: panels/network/network-vpn.ui:78
 msgid "Options…"
 msgstr "Options…"
 
-#: panels/network/cc-wifi-panel.c:284
+#. TRANSLATORS: ‘%s’ is a Wi-Fi Network(SSID) name
+#: panels/network/cc-wifi-hotspot-dialog.c:132
+#, c-format
+msgid ""
+"Turning on the hotspot will disconnect from %s, and it will not be possible "
+"to access the internet through Wi-Fi."
+msgstr ""
+"Turning on the hotspot will disconnect from %s, and it will not be possible "
+"to access the internet through Wi-Fi."
+
+#: panels/network/cc-wifi-hotspot-dialog.c:248
+msgid "Must have a minimum of 8 characters"
+msgstr "Must have a minimum of 8 characters"
+
+#: panels/network/cc-wifi-hotspot-dialog.c:458
+msgid "Turn On Wi-Fi Hotspot?"
+msgstr "Turn On Wi-Fi Hotspot?"
+
+#: panels/network/cc-wifi-hotspot-dialog.ui:19
+msgid ""
+"Wi-Fi hotspot allows others to share your internet connection, by creating a "
+"Wi-Fi network that they can connect to. To do this, you must have an "
+"internet connection through a source other than Wi-Fi."
+msgstr ""
+"Wi-Fi hotspot allows others to share your internet connection, by creating a "
+"Wi-Fi network that they can connect to. To do this, you must have an "
+"internet connection through a source other than Wi-Fi."
+
+#: panels/network/cc-wifi-hotspot-dialog.ui:44
+#: panels/network/network-wifi.ui:105
+msgid "Network Name"
+msgstr "Network Name"
+
+#. Translators: This is a password needed for printing.
+#: panels/network/cc-wifi-hotspot-dialog.ui:69
+#: panels/printers/authentication-dialog.ui:96
+#: panels/printers/new-printer-dialog.ui:383
+#: panels/printers/pp-jobs-dialog.ui:70
+#: panels/user-accounts/cc-add-user-dialog.ui:249
+msgid "Password"
+msgstr "Password"
+
+#: panels/network/cc-wifi-hotspot-dialog.ui:83
+msgid "Generate Random Password"
+msgstr "Generate Random Password"
+
+#: panels/network/cc-wifi-hotspot-dialog.ui:84
+msgid "Autogenerate Password"
+msgstr "Autogenerate Password"
+
+#: panels/network/cc-wifi-hotspot-dialog.ui:130
+msgid "_Turn On"
+msgstr "_Turn On"
+
+#: panels/network/cc-wifi-panel.c:277
 #: panels/network/gnome-wifi-panel.desktop.in.in:3
-#: panels/network/network-wifi.ui:1738
+#: panels/network/network-wifi.ui:233
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
@@ -2369,57 +2970,33 @@ msgstr "Visible Networks"
 msgid "NetworkManager needs to be running"
 msgstr "NetworkManager needs to be running"
 
-#: panels/network/connection-editor/8021x-security-page.ui:26
+#: panels/network/connection-editor/8021x-security-page.ui:20
 msgid "802.1x _Security"
 msgstr "802.1x _Security"
 
-#: panels/network/connection-editor/8021x-security-page.ui:73
-#: panels/network/connection-editor/security-page.ui:72
-msgid "page 1"
-msgstr "page 1"
-
-#: panels/network/connection-editor/8021x-security-page.ui:224
-#: panels/network/connection-editor/security-page.ui:223
-#: panels/network/wireless-security/eap-method-fast.ui:50
-#: panels/network/wireless-security/eap-method-peap.ui:48
-#: panels/network/wireless-security/eap-method-ttls.ui:31
-msgid "Anony_mous identity"
-msgstr "Anony_mous identity"
-
-#: panels/network/connection-editor/8021x-security-page.ui:238
-#: panels/network/connection-editor/security-page.ui:237
-msgid "Inner _authentication"
-msgstr "Inner _authentication"
-
-#: panels/network/connection-editor/8021x-security-page.ui:281
-#: panels/network/connection-editor/security-page.ui:280
-msgid "page 2"
-msgstr "page 2"
-
-#: panels/network/connection-editor/ce-page-8021x-security.c:101
-#: panels/network/connection-editor/ce-page-security.c:445
-#: panels/network/connection-editor/details-page.ui:86
-#: panels/network/network-wifi.ui:239
+#: panels/network/connection-editor/ce-page-8021x-security.c:112
+#: panels/network/connection-editor/ce-page-security.c:404
+#: panels/network/connection-editor/details-page.ui:90
 msgid "Security"
 msgstr "Security"
 
-#: panels/network/connection-editor/ce-page.c:396
+#: panels/network/connection-editor/ce-page.c:234
 msgid "Preserve"
 msgstr "Preserve"
 
-#: panels/network/connection-editor/ce-page.c:397
+#: panels/network/connection-editor/ce-page.c:235
 msgid "Permanent"
 msgstr "Permanent"
 
-#: panels/network/connection-editor/ce-page.c:398
+#: panels/network/connection-editor/ce-page.c:236
 msgid "Random"
 msgstr "Random"
 
-#: panels/network/connection-editor/ce-page.c:399
+#: panels/network/connection-editor/ce-page.c:237
 msgid "Stable"
 msgstr "Stable"
 
-#: panels/network/connection-editor/ce-page.c:403
+#: panels/network/connection-editor/ce-page.c:241
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
 "network device this connection is activated on. This feature is known as MAC "
@@ -2429,301 +3006,282 @@ msgstr ""
 "network device this connection is activated on. This feature is known as MAC "
 "cloning or spoofing. Example: 00:11:22:33:44:55"
 
-#: panels/network/connection-editor/ce-page.c:538
-msgid "automatic"
-msgstr "automatic"
-
-#: panels/network/connection-editor/ce-page.c:578
+#: panels/network/connection-editor/ce-page.c:399
 #, c-format
 msgid "Profile %d"
 msgstr "Profile %d"
 
 #. TRANSLATORS: this WEP WiFi security
-#: panels/network/connection-editor/ce-page-details.c:56
-#: panels/network/net-device-wifi.c:134 panels/network/net-device-wifi.c:314
+#: panels/network/connection-editor/ce-page-details.c:93
+#: panels/network/net-device-wifi.c:235
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
-#: panels/network/connection-editor/ce-page-details.c:60
-#: panels/network/net-device-wifi.c:138 panels/network/net-device-wifi.c:319
-#: panels/network/network-wifi.ui:592
+#: panels/network/connection-editor/ce-page-details.c:97
+#: panels/network/net-device-wifi.c:240
 msgid "WPA"
 msgstr "WPA"
 
+#. TRANSLATORS: this WPA3 WiFi security
+#: panels/network/connection-editor/ce-page-details.c:103
+msgid "WPA3"
+msgstr "WPA3"
+
 #. TRANSLATORS: this WPA WiFi security
-#: panels/network/connection-editor/ce-page-details.c:64
-#: panels/network/net-device-wifi.c:142
+#: panels/network/connection-editor/ce-page-details.c:109
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
-#: panels/network/connection-editor/ce-page-details.c:69
-#: panels/network/net-device-wifi.c:147
+#: panels/network/connection-editor/ce-page-details.c:115
 msgid "Enterprise"
 msgstr "Enterprise"
 
-#: panels/network/connection-editor/ce-page-details.c:74
-#: panels/network/net-device-wifi.c:152 panels/network/net-device-wifi.c:304
+#: panels/network/connection-editor/ce-page-details.c:120
+#: panels/network/net-device-wifi.c:225
 msgctxt "Wifi security"
 msgid "None"
 msgstr "None"
 
-#: panels/network/connection-editor/ce-page-details.c:95
+#: panels/network/connection-editor/ce-page-details.c:141
 msgid "Never"
 msgstr "Never"
 
-#: panels/network/connection-editor/ce-page-details.c:110
-#: panels/network/net-device-ethernet.c:137
-#: panels/network/net-device-wifi.c:413
+#: panels/network/connection-editor/ce-page-details.c:156
+#: panels/network/net-device-ethernet.c:108
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
 msgstr[0] "%i day ago"
 msgstr[1] "%i days ago"
 
+#: panels/network/connection-editor/ce-page-details.c:281
+#, c-format
+msgid "%d Mb/s (%1.1f GHz)"
+msgstr "%d Mb/s (%1.1f GHz)"
+
 #. Translators: network device speed
-#: panels/network/connection-editor/ce-page-details.c:228
-#: panels/network/net-device-ethernet.c:66 panels/network/net-device-wifi.c:536
+#: panels/network/connection-editor/ce-page-details.c:283
+#: panels/network/net-device-ethernet.c:202
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: panels/network/connection-editor/ce-page-details.c:249
-#: panels/network/net-device-wifi.c:565
+#: panels/network/connection-editor/ce-page-details.c:300
+msgid "2.4 GHz / 5 GHz"
+msgstr "2.4 GHz / 5 GHz"
+
+#: panels/network/connection-editor/ce-page-details.c:302
+msgid "2.4 GHz"
+msgstr "2.4 GHz"
+
+#: panels/network/connection-editor/ce-page-details.c:304
+msgid "5 GHz"
+msgstr "5 GHz"
+
+#: panels/network/connection-editor/ce-page-details.c:324
 msgctxt "Signal strength"
 msgid "None"
 msgstr "None"
 
-#: panels/network/connection-editor/ce-page-details.c:251
-#: panels/network/net-device-wifi.c:567
+#: panels/network/connection-editor/ce-page-details.c:326
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "Weak"
 
-#: panels/network/connection-editor/ce-page-details.c:253
-#: panels/network/net-device-wifi.c:569
+#: panels/network/connection-editor/ce-page-details.c:328
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "Ok"
 
-#: panels/network/connection-editor/ce-page-details.c:255
-#: panels/network/net-device-wifi.c:571
+#: panels/network/connection-editor/ce-page-details.c:330
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "Good"
 
-#: panels/network/connection-editor/ce-page-details.c:257
-#: panels/network/net-device-wifi.c:573
+#: panels/network/connection-editor/ce-page-details.c:332
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "Excellent"
 
-#: panels/network/connection-editor/ce-page-details.c:300
+#: panels/network/connection-editor/ce-page-details.c:390
+#: panels/network/connection-editor/details-page.ui:108
+#: panels/network/net-device-ethernet.c:143
+#: panels/network/net-device-mobile.c:431
+msgid "IPv4 Address"
+msgstr "IPv4 Address"
+
+#: panels/network/connection-editor/ce-page-details.c:391
+#: panels/network/connection-editor/details-page.ui:126
+#: panels/network/net-device-ethernet.c:144
+#: panels/network/net-device-ethernet.c:148
+#: panels/network/net-device-mobile.c:432 panels/network/network-mobile.ui:200
+msgid "IPv6 Address"
+msgstr "IPv6 Address"
+
+#: panels/network/connection-editor/ce-page-details.c:394
+#: panels/network/connection-editor/ce-page-details.c:395
+#: panels/network/net-device-ethernet.c:146
+#: panels/network/net-device-mobile.c:435
+#: panels/network/net-device-mobile.c:436 panels/network/network-mobile.ui:183
+msgid "IP Address"
+msgstr "IP Address"
+
+#: panels/network/connection-editor/ce-page-details.c:429
 msgid "Forget Connection"
 msgstr "Forget Connection"
 
-#: panels/network/connection-editor/ce-page-details.c:302
+#: panels/network/connection-editor/ce-page-details.c:431
 msgid "Remove Connection Profile"
 msgstr "Remove Connection Profile"
 
-#: panels/network/connection-editor/ce-page-details.c:304
+#: panels/network/connection-editor/ce-page-details.c:433
 msgid "Remove VPN"
 msgstr "Remove VPN"
 
-#: 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:269
+#: panels/network/connection-editor/ce-page-details.c:451
 msgid "Details"
 msgstr "Details"
 
-#: panels/network/connection-editor/ce-page-ethernet.c:177
-#: panels/network/connection-editor/ce-page-vpn.c:188
-#: panels/network/connection-editor/ce-page-wifi.c:196
-#: panels/network/network-wifi.ui:1437
+#: panels/network/connection-editor/ce-page-ethernet.c:71
+msgid "automatic"
+msgstr "automatic"
+
+#: panels/network/connection-editor/ce-page-ethernet.c:144
+#: panels/network/connection-editor/ce-page-vpn.c:150
+#: panels/network/connection-editor/ce-page-wifi.c:129
 msgid "Identity"
 msgstr "Identity"
 
-#: panels/network/connection-editor/ce-page-ip4.c:251
-#: panels/network/connection-editor/ce-page-ip6.c:230
+#: panels/network/connection-editor/ce-page-ip4.c:268
+#: panels/network/connection-editor/ce-page-ip6.c:249
 msgid "Delete Address"
 msgstr "Delete Address"
 
-#: panels/network/connection-editor/ce-page-ip4.c:422
-#: panels/network/connection-editor/ce-page-ip6.c:390
+#: panels/network/connection-editor/ce-page-ip4.c:428
+#: panels/network/connection-editor/ce-page-ip6.c:398
 msgid "Delete Route"
 msgstr "Delete Route"
 
-#: panels/network/connection-editor/ce-page-ip4.c:896
-#: panels/network/network-wifi.ui:1441
+#: panels/network/connection-editor/ce-page-ip4.c:852
 msgid "IPv4"
 msgstr "IPv4"
 
-#: panels/network/connection-editor/ce-page-ip6.c:828
-#: panels/network/network-wifi.ui:1445
+#: panels/network/connection-editor/ce-page-ip6.c:783
 msgid "IPv6"
 msgstr "IPv6"
 
-#: panels/network/connection-editor/ce-page-security.c:245
+#: panels/network/connection-editor/ce-page-security.c:260
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "None"
 
-#: panels/network/connection-editor/ce-page-security.c:268
+#: panels/network/connection-editor/ce-page-security.c:283
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit Key (Hex or ASCII)"
 
-#: panels/network/connection-editor/ce-page-security.c:278
+#: panels/network/connection-editor/ce-page-security.c:293
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit Passphrase"
 
-#: panels/network/connection-editor/ce-page-security.c:291
-#: panels/network/wireless-security/wireless-security.c:465
+#: panels/network/connection-editor/ce-page-security.c:306
+#: panels/network/wireless-security/ws-dynamic-wep.ui:20
+#: panels/network/wireless-security/ws-wpa-eap.ui:25
 msgid "LEAP"
 msgstr "LEAP"
 
-#: panels/network/connection-editor/ce-page-security.c:304
+#: panels/network/connection-editor/ce-page-security.c:319
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamic WEP (802.1x)"
 
-#: panels/network/connection-editor/ce-page-security.c:318
+#: panels/network/connection-editor/ce-page-security.c:333
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: panels/network/connection-editor/ce-page-security.c:332
+#: panels/network/connection-editor/ce-page-security.c:347
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
+#: panels/network/connection-editor/ce-page-security.c:361
+#| msgctxt "category"
+#| msgid "Personal"
+msgid "WPA3 Personal"
+msgstr "WPA3 Personal"
+
 #: panels/network/connection-editor/details-page.ui:18
-#: panels/network/network-wifi.ui:174
 msgid "Signal Strength"
 msgstr "Signal Strength"
 
-#: panels/network/connection-editor/details-page.ui:52
-#: panels/network/network-wifi.ui:207
+#: panels/network/connection-editor/details-page.ui:54
 msgid "Link speed"
 msgstr "Link speed"
 
-#: panels/network/connection-editor/details-page.ui:104
-#: 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: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:178 panels/network/network-wifi.ui:290
+#: panels/network/connection-editor/details-page.ui:144
+#: panels/network/net-device-ethernet.c:151
 msgid "Hardware Address"
 msgstr "Hardware Address"
 
-#: panels/network/connection-editor/details-page.ui:158
-#: panels/network/net-device-ethernet.c:182
-#: panels/network/network-mobile.ui:206 panels/network/network-wifi.ui:307
+#: panels/network/connection-editor/details-page.ui:162
+msgid "Supported Frequencies"
+msgstr "Supported Frequencies"
+
+#: panels/network/connection-editor/details-page.ui:180
+#: panels/network/net-device-ethernet.c:155
+#: panels/network/network-mobile.ui:217
 msgid "Default Route"
 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:184
-#: panels/network/network-mobile.ui:224 panels/network/network-wifi.ui:325
-#: panels/network/network-wifi.ui:831 panels/network/network-wifi.ui:1108
+#: panels/network/connection-editor/details-page.ui:199
+#: panels/network/connection-editor/ip4-page.ui:211
+#: panels/network/connection-editor/ip6-page.ui:225
+#: panels/network/net-device-ethernet.c:157
+#: panels/network/network-mobile.ui:235
 msgid "DNS"
 msgstr "DNS"
 
-#: panels/network/connection-editor/details-page.ui:195
+#: panels/network/connection-editor/details-page.ui:217
 msgid "Last Used"
 msgstr "Last Used"
 
-#: panels/network/connection-editor/details-page.ui:324
+#: panels/network/connection-editor/details-page.ui:376
 msgid "Connect _automatically"
 msgstr "Connect _automatically"
 
-#: panels/network/connection-editor/details-page.ui:343
+#: panels/network/connection-editor/details-page.ui:395
 msgid "Make available to _other users"
 msgstr "Make available to _other users"
 
-#: panels/network/connection-editor/details-page.ui:376
-msgid "Restrict background data usage"
-msgstr "Restrict background data usage"
-
-#: panels/network/connection-editor/details-page.ui:386
-msgid "Appropriate for connections that have data charges or limits."
-msgstr "Appropriate for connections that have data charges or limits."
-
-#: panels/network/connection-editor/ethernet-page.ui:16
-#: panels/network/connection-editor/ethernet-page.ui:39
-#: panels/network/connection-editor/ip4-page.ui:209
-#: panels/network/connection-editor/ip4-page.ui:277
-#: panels/network/connection-editor/ip6-page.ui:42
-#: panels/network/connection-editor/ip6-page.ui:223
-#: panels/network/connection-editor/ip6-page.ui:291
-#: panels/network/net-proxy.c:58 panels/network/network-proxy.ui:103
-#: panels/network/wireless-security/eap-method-peap.ui:22
-#: panels/privacy/cc-privacy-panel.c:239
-msgid "Automatic"
-msgstr "Automatic"
-
-#: panels/network/connection-editor/ethernet-page.ui:19
-msgid "Twisted Pair (TP)"
-msgstr "Twisted Pair (TP)"
+#: panels/network/connection-editor/details-page.ui:428
+msgid "_Metered connection: has data limits or can incur charges"
+msgstr "_Metered connection: has data limits or can incur charges"
 
-#: panels/network/connection-editor/ethernet-page.ui:22
-msgid "Attachment Unit Interface (AUI)"
-msgstr "Attachment Unit Interface (AUI)"
+#: panels/network/connection-editor/details-page.ui:439
+msgid ""
+"Software updates and other large downloads will not be started automatically."
+msgstr ""
+"Software updates and other large downloads will not be started automatically."
 
 #: panels/network/connection-editor/ethernet-page.ui:25
-msgid "BNC"
-msgstr "BNC"
-
-#: panels/network/connection-editor/ethernet-page.ui:28
-msgid "Media Independent Interface (MII)"
-msgstr "Media Independent Interface (MII)"
-
-#: panels/network/connection-editor/ethernet-page.ui:42
-msgid "10 Mb/s"
-msgstr "10 Mb/s"
-
-#: panels/network/connection-editor/ethernet-page.ui:45
-msgid "100 Mb/s"
-msgstr "100 Mb/s"
-
-#: panels/network/connection-editor/ethernet-page.ui:48
-msgid "1 Gb/s"
-msgstr "1 Gb/s"
-
-#: panels/network/connection-editor/ethernet-page.ui:51
-msgid "10 Gb/s"
-msgstr "10 Gb/s"
-
-#: panels/network/connection-editor/ethernet-page.ui:71
 #: panels/network/connection-editor/vpn-page.ui:23
 msgid "_Name"
 msgstr "_Name"
 
-#: panels/network/connection-editor/ethernet-page.ui:100
+#: panels/network/connection-editor/ethernet-page.ui:54
 #: panels/network/connection-editor/wifi-page.ui:67
-#: panels/network/network-wifi.ui:1260
 msgid "_MAC Address"
 msgstr "_MAC Address"
 
-#: panels/network/connection-editor/ethernet-page.ui:151
+#: panels/network/connection-editor/ethernet-page.ui:105
 msgid "M_TU"
 msgstr "M_TU"
 
-#: panels/network/connection-editor/ethernet-page.ui:168
+#: panels/network/connection-editor/ethernet-page.ui:122
 #: panels/network/connection-editor/wifi-page.ui:102
 msgid "_Cloned Address"
 msgstr "_Cloned Address"
 
-#: panels/network/connection-editor/ethernet-page.ui:183
+#: panels/network/connection-editor/ethernet-page.ui:137
 msgid "bytes"
 msgstr "bytes"
 
@@ -2732,7 +3290,6 @@ msgid "IPv_4 Method"
 msgstr "IPv_4 Method"
 
 #: panels/network/connection-editor/ip4-page.ui:42
-#: panels/network/network-wifi.ui:777 panels/network/network-wifi.ui:1054
 msgid "Automatic (DHCP)"
 msgstr "Automatic (DHCP)"
 
@@ -2743,9 +3300,7 @@ msgstr "Link-Local Only"
 
 #: 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:776 panels/network/network-wifi.ui:1053
-#: panels/privacy/cc-privacy-panel.c:239
+#: panels/network/net-proxy.c:72 panels/network/network-proxy.ui:116
 msgid "Manual"
 msgstr "Manual"
 
@@ -2754,61 +3309,74 @@ msgstr "Manual"
 msgid "Disable"
 msgstr "Disable"
 
-#: panels/network/connection-editor/ip4-page.ui:111
-#: panels/network/connection-editor/ip6-page.ui:125
+#: panels/network/connection-editor/ip4-page.ui:97
+#: panels/network/connection-editor/ip6-page.ui:111
+msgid "Shared to other computers"
+msgstr "Shared to other computers"
+
+#: panels/network/connection-editor/ip4-page.ui:125
+#: panels/network/connection-editor/ip6-page.ui:139
 msgid "Addresses"
 msgstr "Addresses"
 
-#: panels/network/connection-editor/ip4-page.ui:129
-#: panels/network/connection-editor/ip4-page.ui:313
-#: panels/network/connection-editor/ip6-page.ui:143
-#: panels/network/connection-editor/ip6-page.ui:327
-#: panels/printers/details-dialog.ui:89
-msgid "Address"
-msgstr "Address"
-
 #: panels/network/connection-editor/ip4-page.ui:143
 #: panels/network/connection-editor/ip4-page.ui:327
-msgid "Netmask"
-msgstr "Netmask"
+#: panels/network/connection-editor/ip6-page.ui:157
+#: panels/network/connection-editor/ip6-page.ui:341
+#: panels/printers/pp-details-dialog.ui:95
+msgid "Address"
+msgstr "Address"
 
 #: panels/network/connection-editor/ip4-page.ui:157
 #: panels/network/connection-editor/ip4-page.ui:341
-#: panels/network/connection-editor/ip6-page.ui:171
-#: panels/network/connection-editor/ip6-page.ui:355
+msgid "Netmask"
+msgstr "Netmask"
+
+#: panels/network/connection-editor/ip4-page.ui:171
+#: panels/network/connection-editor/ip4-page.ui:355
+#: panels/network/connection-editor/ip6-page.ui:185
+#: panels/network/connection-editor/ip6-page.ui:369
 msgid "Gateway"
 msgstr "Gateway"
 
-#: panels/network/connection-editor/ip4-page.ui:220
-#: panels/network/connection-editor/ip6-page.ui:234
+#: panels/network/connection-editor/ip4-page.ui:223
+#: panels/network/connection-editor/ip4-page.ui:291
+#: panels/network/connection-editor/ip6-page.ui:42
+#: panels/network/connection-editor/ip6-page.ui:237
+#: panels/network/connection-editor/ip6-page.ui:305
+#: panels/network/net-proxy.c:74 panels/network/network-proxy.ui:106
+#: panels/network/wireless-security/eap-method-peap.ui:33
+msgid "Automatic"
+msgstr "Automatic"
+
+#: panels/network/connection-editor/ip4-page.ui:234
+#: panels/network/connection-editor/ip6-page.ui:248
 msgid "Automatic DNS"
 msgstr "Automatic DNS"
 
-#: panels/network/connection-editor/ip4-page.ui:244
-#: panels/network/connection-editor/ip6-page.ui:258
+#: panels/network/connection-editor/ip4-page.ui:258
+#: panels/network/connection-editor/ip6-page.ui:272
 msgid "Separate IP addresses with commas"
 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:876 panels/network/network-wifi.ui:1153
+#: panels/network/connection-editor/ip4-page.ui:279
+#: panels/network/connection-editor/ip6-page.ui:293
 msgid "Routes"
 msgstr "Routes"
 
-#: panels/network/connection-editor/ip4-page.ui:288
-#: panels/network/connection-editor/ip6-page.ui:302
+#: panels/network/connection-editor/ip4-page.ui:302
+#: panels/network/connection-editor/ip6-page.ui:316
 msgid "Automatic Routes"
 msgstr "Automatic Routes"
 
 #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
-#: panels/network/connection-editor/ip4-page.ui:354
-#: panels/network/connection-editor/ip6-page.ui:368
+#: panels/network/connection-editor/ip4-page.ui:368
+#: panels/network/connection-editor/ip6-page.ui:382
 msgid "Metric"
 msgstr "Metric"
 
-#: panels/network/connection-editor/ip4-page.ui:384
-#: panels/network/connection-editor/ip6-page.ui:398
-#: panels/network/network-wifi.ui:932 panels/network/network-wifi.ui:1209
+#: panels/network/connection-editor/ip4-page.ui:398
+#: panels/network/connection-editor/ip6-page.ui:412
 msgid "Use this connection _only for resources on its network"
 msgstr "Use this connection _only for resources on its network"
 
@@ -2820,37 +3388,36 @@ msgstr "IPv_6 Method"
 msgid "Automatic, DHCP only"
 msgstr "Automatic, DHCP only"
 
-#: panels/network/connection-editor/ip6-page.ui:157
-#: panels/network/connection-editor/ip6-page.ui:341
+#: panels/network/connection-editor/ip6-page.ui:171
+#: panels/network/connection-editor/ip6-page.ui:355
 msgid "Prefix"
 msgstr "Prefix"
 
-#: panels/network/connection-editor/net-connection-editor.c:261
+#: panels/network/connection-editor/net-connection-editor.c:291
 msgid "Unable to open connection editor"
 msgstr "Unable to open connection editor"
 
-#: panels/network/connection-editor/net-connection-editor.c:279
+#: panels/network/connection-editor/net-connection-editor.c:307
 msgid "New Profile"
 msgstr "New Profile"
 
-#: panels/network/connection-editor/net-connection-editor.c:727
+#: panels/network/connection-editor/net-connection-editor.c:740
 msgid "Import from file…"
 msgstr "Import from file…"
 
-#: panels/network/connection-editor/net-connection-editor.c:759
+#: panels/network/connection-editor/net-connection-editor.c:772
 msgid "Add VPN"
 msgstr "Add VPN"
 
-#: panels/network/connection-editor/security-page.ui:26
-#: panels/network/network-wifi.ui:529
+#: panels/network/connection-editor/security-page.ui:20
 msgid "S_ecurity"
 msgstr "S_ecurity"
 
-#: panels/network/connection-editor/vpn-helpers.c:141
+#: panels/network/connection-editor/vpn-helpers.c:139
 msgid "Cannot import VPN connection"
 msgstr "Cannot import VPN connection"
 
-#: panels/network/connection-editor/vpn-helpers.c:143
+#: panels/network/connection-editor/vpn-helpers.c:141
 #, c-format
 msgid ""
 "The file “%s” could not be read or does not contain recognized VPN "
@@ -2863,29 +3430,29 @@ msgstr ""
 "\n"
 "Error: %s."
 
-#: panels/network/connection-editor/vpn-helpers.c:178
+#: panels/network/connection-editor/vpn-helpers.c:173
 msgid "Select file to import"
 msgstr "Select file to import"
 
-#: panels/network/connection-editor/vpn-helpers.c:230
+#: panels/network/connection-editor/vpn-helpers.c:225
 #, c-format
 msgid "A file named “%s” already exists."
 msgstr "A file named “%s” already exists."
 
-#: panels/network/connection-editor/vpn-helpers.c:232
+#: panels/network/connection-editor/vpn-helpers.c:227
 msgid "_Replace"
 msgstr "_Replace"
 
-#: panels/network/connection-editor/vpn-helpers.c:234
+#: panels/network/connection-editor/vpn-helpers.c:229
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Do you want to replace %s with the VPN connection you are saving?"
 
-#: panels/network/connection-editor/vpn-helpers.c:270
+#: panels/network/connection-editor/vpn-helpers.c:264
 msgid "Cannot export VPN connection"
 msgstr "Cannot export VPN connection"
 
-#: panels/network/connection-editor/vpn-helpers.c:272
+#: panels/network/connection-editor/vpn-helpers.c:266
 #, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -2896,7 +3463,7 @@ msgstr ""
 "\n"
 "Error: %s."
 
-#: panels/network/connection-editor/vpn-helpers.c:307
+#: panels/network/connection-editor/vpn-helpers.c:296
 msgid "Export VPN connection"
 msgstr "Export VPN connection"
 
@@ -2905,12 +3472,10 @@ msgid "(Error: unable to load VPN connection editor)"
 msgstr "(Error: unable to load VPN connection editor)"
 
 #: panels/network/connection-editor/wifi-page.ui:20
-#: panels/network/network-wifi.ui:497
 msgid "_SSID"
 msgstr "_SSID"
 
 #: panels/network/connection-editor/wifi-page.ui:36
-#: panels/network/network-wifi.ui:513
 msgid "_BSSID"
 msgstr "_BSSID"
 
@@ -2934,28 +3499,19 @@ msgstr "Control how you connect to Wi-Fi networks"
 msgid "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;Hotspot;"
 msgstr "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;Hotspot;"
 
-#: panels/network/net-device-ethernet.c:123
-#: panels/network/net-device-wifi.c:399
+#: panels/network/net-device-ethernet.c:96
 msgid "never"
 msgstr "never"
 
-#: panels/network/net-device-ethernet.c:133
-#: panels/network/net-device-wifi.c:409
+#: panels/network/net-device-ethernet.c:104
 msgid "today"
 msgstr "today"
 
-#: panels/network/net-device-ethernet.c:135
-#: panels/network/net-device-wifi.c:411
+#: panels/network/net-device-ethernet.c:106
 msgid "yesterday"
 msgstr "yesterday"
 
-#: 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:189 panels/network/network-wifi.ui:342
+#: panels/network/net-device-ethernet.c:162
 msgid "Last used"
 msgstr "Last used"
 
@@ -2964,61 +3520,24 @@ msgstr "Last used"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: panels/network/net-device-ethernet.c:291
-#: panels/network/network-ethernet.ui:19 panels/network/network-simple.ui:39
+#: panels/network/net-device-ethernet.c:252
+#: panels/network/network-bluetooth.ui:38 panels/network/network-ethernet.ui:18
 msgid "Wired"
 msgstr "Wired"
 
-#: panels/network/net-device-mobile.c:236
+#: panels/network/net-device-mobile.c:208
 msgid "Add new connection"
 msgstr "Add new connection"
 
-#: panels/network/net-device-wifi.c:1217
-#, 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:1221
-msgid ""
-"It is not possible to access the Internet through your wireless while the "
-"hotspot is active."
-msgstr ""
-"It is not possible to access the Internet through your wireless while the "
-"hotspot is active."
-
-#: panels/network/net-device-wifi.c:1228
-msgid "Turn On Wi-Fi Hotspot?"
-msgstr "Turn On Wi-Fi Hotspot?"
-
-#: panels/network/net-device-wifi.c:1250
-msgid ""
-"Wi-Fi hotspots are usually used to share an additional Internet connection "
-"over Wi-Fi."
-msgstr ""
-"Wi-Fi hotspots are usually used to share an additional Internet connection "
-"over Wi-Fi."
-
-#: panels/network/net-device-wifi.c:1261
-msgid "_Turn On"
-msgstr "_Turn On"
-
-#: panels/network/net-device-wifi.c:1338
+#: panels/network/net-device-wifi.c:798
 msgid "Stop hotspot and disconnect any users?"
 msgstr "Stop hotspot and disconnect any users?"
 
-#: panels/network/net-device-wifi.c:1341
+#: panels/network/net-device-wifi.c:801
 msgid "_Stop Hotspot"
 msgstr "_Stop Hotspot"
 
-#: panels/network/net-device-wifi.c:1397
-msgid "System policy prohibits use as a Hotspot"
-msgstr "System policy prohibits use as a Hotspot"
-
-#: panels/network/net-device-wifi.c:1400
-msgid "Wireless device does not support Hotspot mode"
-msgstr "Wireless device does not support Hotspot mode"
-
-#: panels/network/net-device-wifi.c:1558
+#: panels/network/net-device-wifi.c:905
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
@@ -3026,29 +3545,36 @@ msgstr ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
 
-#: panels/network/net-device-wifi.c:1562 panels/network/network-wifi.ui:1350
+#: panels/network/net-device-wifi.c:909
 msgid "_Forget"
 msgstr "_Forget"
 
-#: panels/network/net-device-wifi.c:1725 panels/network/net-device-wifi.c:1732
+#: panels/network/net-device-wifi.c:1065 panels/network/net-device-wifi.c:1072
 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:1769
+#: panels/network/net-device-wifi.c:1107
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "_Forget"
 
-#: panels/network/net-proxy.c:54
+#: panels/network/net-device-wifi.c:1268
+msgid "System policy prohibits use as a Hotspot"
+msgstr "System policy prohibits use as a Hotspot"
+
+#: panels/network/net-device-wifi.c:1271
+msgid "Wireless device does not support Hotspot mode"
+msgstr "Wireless device does not support Hotspot mode"
+
+#: panels/network/net-proxy.c:70
 #: panels/notifications/cc-notifications-panel.c:270
-#: panels/power/cc-power-panel.c:2074 panels/power/cc-power-panel.c:2085
-#: panels/privacy/cc-privacy-panel.c:212 panels/privacy/cc-privacy-panel.c:289
-#: panels/universal-access/cc-ua-panel.c:477
-#: panels/universal-access/cc-ua-panel.c:840
-#: panels/universal-access/cc-ua-panel.c:853
-#: panels/universal-access/cc-ua-panel.c:865
-#: panels/universal-access/cc-ua-panel.c:1030
+#: panels/power/cc-power-panel.c:2066 panels/power/cc-power-panel.c:2077
+#: panels/universal-access/cc-ua-panel.c:480
+#: panels/universal-access/cc-ua-panel.c:843
+#: panels/universal-access/cc-ua-panel.c:856
+#: panels/universal-access/cc-ua-panel.c:868
+#: panels/universal-access/cc-ua-panel.c:1033
 #: panels/universal-access/cc-ua-panel.ui:323
 #: panels/universal-access/cc-ua-panel.ui:369
 #: panels/universal-access/cc-ua-panel.ui:415
@@ -3056,12 +3582,12 @@ msgstr "_Forget"
 #: panels/universal-access/cc-ua-panel.ui:674
 #: panels/universal-access/cc-ua-panel.ui:720
 #: panels/universal-access/cc-ua-panel.ui:766
-#: panels/universal-access/cc-ua-panel.ui:918
+#: panels/universal-access/cc-ua-panel.ui:950
 msgid "Off"
 msgstr "Off"
 
 #. TRANSLATORS: this is when the use leaves the PAC textbox blank
-#: panels/network/net-proxy.c:102
+#: panels/network/net-proxy.c:113
 msgid ""
 "Web Proxy Autodiscovery is used when a Configuration URL is not provided."
 msgstr ""
@@ -3071,668 +3597,565 @@ msgstr ""
 #. * network, then anyone else on that network can tell your
 #. * machine that it should proxy all of your web traffic
 #. * through them.
-#: panels/network/net-proxy.c:110
+#: panels/network/net-proxy.c:121
 msgid "This is not recommended for untrusted public networks."
 msgstr "This is not recommended for untrusted public networks."
 
-#: panels/network/network-mobile.ui:30
+#. update title
+#. Translators: this is the title of the connection details
+#. * window for vpn connections, it is also used to display
+#. * vpn connections in the device list.
+#.
+#: panels/network/net-vpn.c:66 panels/network/net-vpn.c:163
+#, c-format
+msgid "%s VPN"
+msgstr "%s VPN"
+
+#: panels/network/network-bluetooth.ui:50
+msgid "Turn device off"
+msgstr "Turn device off"
+
+#: panels/network/network-mobile.ui:29
 msgid "IMEI"
 msgstr "IMEI"
 
-#: panels/network/network-mobile.ui:48
+#: panels/network/network-mobile.ui:47
 msgid "Provider"
 msgstr "Provider"
 
-#: panels/network/network-proxy.ui:47 panels/network/network-proxy.ui:92
+#: panels/network/network-proxy.ui:47 panels/network/network-proxy.ui:95
 msgid "Network Proxy"
 msgstr "Network Proxy"
 
-#: panels/network/network-proxy.ui:173
+#: panels/network/network-proxy.ui:176
 msgid "_HTTP Proxy"
 msgstr "_HTTP Proxy"
 
-#: panels/network/network-proxy.ui:192
+#: panels/network/network-proxy.ui:195
 msgid "H_TTPS Proxy"
 msgstr "H_TTPS Proxy"
 
-#: panels/network/network-proxy.ui:211
+#: panels/network/network-proxy.ui:214
 msgid "_FTP Proxy"
 msgstr "_FTP Proxy"
 
-#: panels/network/network-proxy.ui:230
+#: panels/network/network-proxy.ui:233
 msgid "_Socks Host"
 msgstr "_Socks Host"
 
-#: panels/network/network-proxy.ui:249
+#: panels/network/network-proxy.ui:252
 msgid "_Ignore Hosts"
 msgstr "_Ignore Hosts"
 
-#: panels/network/network-proxy.ui:287
+#: panels/network/network-proxy.ui:290
 msgid "HTTP proxy port"
 msgstr "HTTP proxy port"
 
-#: panels/network/network-proxy.ui:364
+#: panels/network/network-proxy.ui:367
 msgid "HTTPS proxy port"
 msgstr "HTTPS proxy port"
 
-#: panels/network/network-proxy.ui:385
+#: panels/network/network-proxy.ui:388
 msgid "FTP proxy port"
 msgstr "FTP proxy port"
 
-#: panels/network/network-proxy.ui:406
+#: panels/network/network-proxy.ui:409
 msgid "Socks proxy port"
 msgstr "Socks proxy port"
 
-#: panels/network/network-proxy.ui:435
+#: panels/network/network-proxy.ui:438
 msgid "_Configuration URL"
 msgstr "_Configuration URL"
 
-#: panels/network/network-simple.ui:50
-msgid "Turn device off"
-msgstr "Turn device off"
-
-#: panels/network/network-vpn.ui:56
+#: panels/network/network-vpn.ui:55
 msgid "Turn VPN connection off"
 msgstr "Turn VPN connection off"
 
-#: panels/network/network-wifi.ui:127
-msgid "Automatic _Connect"
-msgstr "Automatic _Connect"
-
-#: panels/network/network-wifi.ui:474
-msgid "details"
-msgstr "details"
-
-#: panels/network/network-wifi.ui:545
-#: panels/network/wireless-security/eap-method-leap.ui:40
-#: panels/network/wireless-security/eap-method-simple.ui:40
-#: panels/network/wireless-security/ws-leap.ui:40
-#: panels/network/wireless-security/ws-wpa-psk.ui:22
-#: panels/sharing/cc-sharing-panel.ui:351
-#: 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:216
-msgid "_Password"
-msgstr "_Password"
-
-#: panels/network/network-wifi.ui:621
-msgid "Show P_assword"
-msgstr "Show P_assword"
-
-#: panels/network/network-wifi.ui:651
-msgid "Make available to other users"
-msgstr "Make available to other users"
-
-#: panels/network/network-wifi.ui:679
-msgid "identity"
-msgstr "identity"
-
-#: panels/network/network-wifi.ui:713
-msgid "IPv_4"
-msgstr "IPv_4"
-
-#: panels/network/network-wifi.ui:754 panels/network/network-wifi.ui:1031
-msgid "_Addresses"
-msgstr "_Addresses"
-
-#: 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:779 panels/network/network-wifi.ui:1056
-msgid "Link-local only"
-msgstr "Link-local only"
-
-#: 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:916 panels/network/network-wifi.ui:1193
-msgid "_Ignore automatically obtained routes"
-msgstr "_Ignore automatically obtained routes"
-
-#: panels/network/network-wifi.ui:959
-msgid "ipv4"
-msgstr "ipv4"
-
-#: panels/network/network-wifi.ui:990
-msgid "IPv_6"
-msgstr "IPv_6"
-
-#: panels/network/network-wifi.ui:1236
-msgid "ipv6"
-msgstr "ipv6"
-
-#: panels/network/network-wifi.ui:1276
-msgid "_Cloned MAC Address"
-msgstr "_Cloned MAC Address"
-
-#: panels/network/network-wifi.ui:1334
-msgid "_Reset"
-msgstr "_Reset"
-
-#: panels/network/network-wifi.ui:1370
-msgid ""
-"Reset the settings for this connection to their defaults, but remember as a "
-"preferred connection."
-msgstr ""
-"Reset the settings for this connection to their defaults, but remember as a "
-"preferred connection."
-
-#: panels/network/network-wifi.ui:1387
-msgid ""
-"Remove all details relating to this network and do not try to automatically "
-"connect to it."
-msgstr ""
-"Remove all details relating to this network and do not try to automatically "
-"connect to it."
-
-#: panels/network/network-wifi.ui:1449
-msgid "Hardware"
-msgstr "Hardware"
-
-#: panels/network/network-wifi.ui:1453
-msgctxt "tab"
-msgid "Reset"
-msgstr "Reset"
-
-#: panels/network/network-wifi.ui:1505
+#: panels/network/network-wifi.ui:37
 msgid "Wi-Fi Hotspot"
 msgstr "Wi-Fi Hotspot"
 
-#: panels/network/network-wifi.ui:1523
+#: panels/network/network-wifi.ui:55
 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:1572
-msgid "Network Name"
-msgstr "Network Name"
-
-#: panels/network/network-wifi.ui:1590
-msgid "Connected Devices"
-msgstr "Connected Devices"
-
-#: panels/network/network-wifi.ui:1608
+#: panels/network/network-wifi.ui:123
 msgid "Security type"
 msgstr "Security type"
 
-#: panels/network/network-wifi.ui:1671
+#: panels/network/network-wifi.ui:175
 msgctxt "Wi-Fi passkey"
 msgid "Password"
 msgstr "Password"
 
-#: panels/network/network-wifi.ui:1768
+#: panels/network/network-wifi.ui:264
 msgid "Turn Wi-Fi off"
 msgstr "Turn Wi-Fi off"
 
-#: panels/network/network-wifi.ui:1800
+#: panels/network/network-wifi.ui:296
 msgid "_Connect to Hidden Network…"
 msgstr "_Connect to Hidden Network…"
 
-#: panels/network/network-wifi.ui:1810
+#: panels/network/network-wifi.ui:307
 msgid "_Turn On Wi-Fi Hotspot…"
 msgstr "_Turn On Wi-Fi Hotspot…"
 
-#: panels/network/network-wifi.ui:1820
+#: panels/network/network-wifi.ui:318
 msgid "_Known Wi-Fi Networks"
 msgstr "_Known Wi-Fi Networks"
 
-#. TRANSLATORS: AP type
-#: panels/network/panel-common.c:127
-msgid "Ad-hoc"
-msgstr "Ad-hoc"
-
-#. TRANSLATORS: AP type
-#: panels/network/panel-common.c:131
-msgid "Infrastructure"
-msgstr "Infrastructure"
-
 #. TRANSLATORS: device status
-#. TRANSLATORS: VPN status
-#: panels/network/panel-common.c:147 panels/network/panel-common.c:201
+#: panels/network/panel-common.c:37
 msgid "Status unknown"
 msgstr "Status unknown"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:151
+#: panels/network/panel-common.c:41
 msgid "Unmanaged"
 msgstr "Unmanaged"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:155
+#: panels/network/panel-common.c:45
 msgid "Unavailable"
 msgstr "Unavailable"
 
 #. TRANSLATORS: device status
-#. TRANSLATORS: VPN status
-#: panels/network/panel-common.c:165 panels/network/panel-common.c:207
+#: panels/network/panel-common.c:55
 msgid "Connecting"
 msgstr "Connecting"
 
 #. TRANSLATORS: device status
-#. TRANSLATORS: VPN status
-#: panels/network/panel-common.c:169 panels/network/panel-common.c:211
+#: panels/network/panel-common.c:59
 msgid "Authentication required"
 msgstr "Authentication required"
 
 #. TRANSLATORS: device status
-#. TRANSLATORS: VPN status
-#: panels/network/panel-common.c:173 panels/network/panel-common.c:215
+#: panels/network/panel-common.c:63
 msgid "Connected"
 msgstr "Connected"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:177
+#: panels/network/panel-common.c:67
 msgid "Disconnecting"
 msgstr "Disconnecting"
 
 #. TRANSLATORS: device status
-#. TRANSLATORS: VPN status
-#: panels/network/panel-common.c:181 panels/network/panel-common.c:219
+#: panels/network/panel-common.c:71
 msgid "Connection failed"
 msgstr "Connection failed"
 
 #. TRANSLATORS: device status
-#. TRANSLATORS: VPN status
-#: panels/network/panel-common.c:185 panels/network/panel-common.c:227
+#: panels/network/panel-common.c:75
 msgid "Status unknown (missing)"
 msgstr "Status unknown (missing)"
 
-#. TRANSLATORS: VPN status
-#: panels/network/panel-common.c:223
-msgid "Not connected"
-msgstr "Not connected"
-
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:248
+#: panels/network/panel-common.c:96
 msgid "Configuration failed"
 msgstr "Configuration failed"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:252
+#: panels/network/panel-common.c:100
 msgid "IP configuration failed"
 msgstr "IP configuration failed"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:256
+#: panels/network/panel-common.c:104
 msgid "IP configuration expired"
 msgstr "IP configuration expired"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:260
+#: panels/network/panel-common.c:108
 msgid "Secrets were required, but not provided"
 msgstr "Secrets were required, but not provided"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:264
+#: panels/network/panel-common.c:112
 msgid "802.1x supplicant disconnected"
 msgstr "802.1x supplicant disconnected"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:268
+#: panels/network/panel-common.c:116
 msgid "802.1x supplicant configuration failed"
 msgstr "802.1x supplicant configuration failed"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:272
+#: panels/network/panel-common.c:120
 msgid "802.1x supplicant failed"
 msgstr "802.1x supplicant failed"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:276
+#: panels/network/panel-common.c:124
 msgid "802.1x supplicant took too long to authenticate"
 msgstr "802.1x supplicant took too long to authenticate"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:280
+#: panels/network/panel-common.c:128
 msgid "PPP service failed to start"
 msgstr "PPP service failed to start"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:284
+#: panels/network/panel-common.c:132
 msgid "PPP service disconnected"
 msgstr "PPP service disconnected"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:288
+#: panels/network/panel-common.c:136
 msgid "PPP failed"
 msgstr "PPP failed"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:292
+#: panels/network/panel-common.c:140
 msgid "DHCP client failed to start"
 msgstr "DHCP client failed to start"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:296
+#: panels/network/panel-common.c:144
 msgid "DHCP client error"
 msgstr "DHCP client error"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:300
+#: panels/network/panel-common.c:148
 msgid "DHCP client failed"
 msgstr "DHCP client failed"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:304
+#: panels/network/panel-common.c:152
 msgid "Shared connection service failed to start"
 msgstr "Shared connection service failed to start"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:308
+#: panels/network/panel-common.c:156
 msgid "Shared connection service failed"
 msgstr "Shared connection service failed"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:312
+#: panels/network/panel-common.c:160
 msgid "AutoIP service failed to start"
 msgstr "AutoIP service failed to start"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:316
+#: panels/network/panel-common.c:164
 msgid "AutoIP service error"
 msgstr "AutoIP service error"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:320
+#: panels/network/panel-common.c:168
 msgid "AutoIP service failed"
 msgstr "AutoIP service failed"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:324
+#: panels/network/panel-common.c:172
 msgid "Line busy"
 msgstr "Line busy"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:328
+#: panels/network/panel-common.c:176
 msgid "No dial tone"
 msgstr "No dial tone"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:332
+#: panels/network/panel-common.c:180
 msgid "No carrier could be established"
 msgstr "No carrier could be established"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:336
+#: panels/network/panel-common.c:184
 msgid "Dialing request timed out"
 msgstr "Dialing request timed out"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:340
+#: panels/network/panel-common.c:188
 msgid "Dialing attempt failed"
 msgstr "Dialing attempt failed"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:344
+#: panels/network/panel-common.c:192
 msgid "Modem initialization failed"
 msgstr "Modem initialisation failed"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:348
+#: panels/network/panel-common.c:196
 msgid "Failed to select the specified APN"
 msgstr "Failed to select the specified APN"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:352
+#: panels/network/panel-common.c:200
 msgid "Not searching for networks"
 msgstr "Not searching for networks"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:356
+#: panels/network/panel-common.c:204
 msgid "Network registration denied"
 msgstr "Network registration denied"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:360
+#: panels/network/panel-common.c:208
 msgid "Network registration timed out"
 msgstr "Network registration timed out"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:364
+#: panels/network/panel-common.c:212
 msgid "Failed to register with the requested network"
 msgstr "Failed to register with the requested network"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:368
+#: panels/network/panel-common.c:216
 msgid "PIN check failed"
 msgstr "PIN check failed"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:372
+#: panels/network/panel-common.c:220
 msgid "Firmware for the device may be missing"
 msgstr "Firmware for the device may be missing"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:376
+#: panels/network/panel-common.c:224
 msgid "Connection disappeared"
 msgstr "Connection disappeared"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:380
+#: panels/network/panel-common.c:228
 msgid "Existing connection was assumed"
 msgstr "Existing connection was assumed"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:384
+#: panels/network/panel-common.c:232
 msgid "Modem not found"
 msgstr "Modem not found"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:388
+#: panels/network/panel-common.c:236
 msgid "Bluetooth connection failed"
 msgstr "Bluetooth connection failed"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:392
+#: panels/network/panel-common.c:240
 msgid "SIM Card not inserted"
 msgstr "SIM Card not inserted"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:396
+#: panels/network/panel-common.c:244
 msgid "SIM Pin required"
 msgstr "SIM Pin required"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:400
+#: panels/network/panel-common.c:248
 msgid "SIM Puk required"
 msgstr "SIM Puk required"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:404
+#: panels/network/panel-common.c:252
 msgid "SIM wrong"
 msgstr "SIM wrong"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:408
+#: panels/network/panel-common.c:256
 msgid "Connection dependency failed"
 msgstr "Connection dependency failed"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:433
+#: panels/network/panel-common.c:351
 msgid "Firmware missing"
 msgstr "Firmware missing"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:437
+#: panels/network/panel-common.c:355
 msgid "Cable unplugged"
 msgstr "Cable unplugged"
 
-#: panels/network/wireless-security/eap-method.c:69
+#: panels/network/wireless-security/eap-method.c:92
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "undefined error in 802.1X security (wpa-eap)"
 
-#: panels/network/wireless-security/eap-method.c:245
+#: panels/network/wireless-security/eap-method.c:195
 msgid "no file selected"
 msgstr "no file selected"
 
-#: panels/network/wireless-security/eap-method.c:276
+#: panels/network/wireless-security/eap-method.c:222
 msgid "unspecified error validating eap-method file"
 msgstr "unspecified error validating eap-method file"
 
-#: panels/network/wireless-security/eap-method.c:451
+#: panels/network/wireless-security/eap-method.c:397
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 
-#: panels/network/wireless-security/eap-method.c:454
+#: panels/network/wireless-security/eap-method.c:400
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 
-#: panels/network/wireless-security/eap-method-fast.c:72
+#: panels/network/wireless-security/eap-method-fast.c:87
 msgid "missing EAP-FAST PAC file"
 msgstr "missing EAP-FAST PAC file"
 
-#: panels/network/wireless-security/eap-method-fast.c:268
-#: panels/network/wireless-security/eap-method-peap.c:302
-#: panels/network/wireless-security/eap-method-ttls.c:361
-msgid "GTC"
-msgstr "GTC"
-
-#: panels/network/wireless-security/eap-method-fast.c:283
-#: panels/network/wireless-security/eap-method-peap.c:272
-#: panels/network/wireless-security/eap-method-ttls.c:299
-msgid "MSCHAPv2"
-msgstr "MSCHAPv2"
-
-#: panels/network/wireless-security/eap-method-fast.c:406
+#: panels/network/wireless-security/eap-method-fast.c:347
 msgid "Choose a PAC file"
 msgstr "Choose a PAC file"
 
-#: panels/network/wireless-security/eap-method-fast.c:413
+#: panels/network/wireless-security/eap-method-fast.c:352
 msgid "PAC files (*.pac)"
 msgstr "PAC files (*.pac)"
 
-#: panels/network/wireless-security/eap-method-fast.ui:22
+#: panels/network/wireless-security/eap-method-fast.ui:13
+#: panels/network/wireless-security/eap-method-peap.ui:21
+#: panels/network/wireless-security/eap-method-ttls.ui:37
+msgid "GTC"
+msgstr "GTC"
+
+#: panels/network/wireless-security/eap-method-fast.ui:17
+#: panels/network/wireless-security/eap-method-peap.ui:13
+#: panels/network/wireless-security/eap-method-ttls.ui:21
+msgid "MSCHAPv2"
+msgstr "MSCHAPv2"
+
+#: panels/network/wireless-security/eap-method-fast.ui:29
 msgid "Anonymous"
 msgstr "Anonymous"
 
-#: panels/network/wireless-security/eap-method-fast.ui:25
+#: panels/network/wireless-security/eap-method-fast.ui:32
 msgid "Authenticated"
 msgstr "Authenticated"
 
-#: panels/network/wireless-security/eap-method-fast.ui:28
+#: panels/network/wireless-security/eap-method-fast.ui:35
 msgid "Both"
 msgstr "Both"
 
-#: panels/network/wireless-security/eap-method-fast.ui:76
+#: panels/network/wireless-security/eap-method-fast.ui:49
+#: panels/network/wireless-security/eap-method-peap.ui:52
+#: panels/network/wireless-security/eap-method-ttls.ui:51
+msgid "Anony_mous identity"
+msgstr "Anony_mous identity"
+
+#: panels/network/wireless-security/eap-method-fast.ui:75
 msgid "PAC _file"
 msgstr "PAC _file"
 
-#: panels/network/wireless-security/eap-method-fast.ui:122
-#: panels/network/wireless-security/eap-method-peap.ui:146
-#: panels/network/wireless-security/eap-method-ttls.ui:123
+#: panels/network/wireless-security/eap-method-fast.ui:115
+#: panels/network/wireless-security/eap-method-peap.ui:150
+#: panels/network/wireless-security/eap-method-ttls.ui:143
 msgid "_Inner authentication"
 msgstr "_Inner authentication"
 
-#: panels/network/wireless-security/eap-method-fast.ui:156
+#: panels/network/wireless-security/eap-method-fast.ui:144
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Allow automatic PAC pro_visioning"
 
-#: panels/network/wireless-security/eap-method-leap.c:65
+#: panels/network/wireless-security/eap-method-leap.c:64
 msgid "missing EAP-LEAP username"
 msgstr "missing EAP-LEAP username"
 
-#: panels/network/wireless-security/eap-method-leap.c:74
+#: panels/network/wireless-security/eap-method-leap.c:73
 msgid "missing EAP-LEAP password"
 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/network/wireless-security/eap-method-leap.ui:17
+#: panels/network/wireless-security/eap-method-simple.ui:17
+#: panels/network/wireless-security/ws-leap.ui:18
 #: panels/user-accounts/cc-add-user-dialog.ui:146
 #: panels/user-accounts/cc-add-user-dialog.ui:527
 msgid "_Username"
 msgstr "_Username"
 
-#: panels/network/wireless-security/eap-method-leap.ui:68
-#: panels/network/wireless-security/eap-method-simple.ui:85
-#: panels/network/wireless-security/eap-method-tls.ui:164
-#: panels/network/wireless-security/ws-leap.ui:68
-#: panels/network/wireless-security/ws-wpa-psk.ui:76
+#: panels/network/wireless-security/eap-method-leap.ui:31
+#: panels/network/wireless-security/eap-method-simple.ui:31
+#: panels/network/wireless-security/ws-leap.ui:32
+#: panels/network/wireless-security/ws-wpa-psk.ui:14
+#: panels/sharing/cc-sharing-panel.ui:351
+#: 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:385
+msgid "_Password"
+msgstr "_Password"
+
+#: panels/network/wireless-security/eap-method-leap.ui:55
+#: panels/network/wireless-security/eap-method-simple.ui:73
+#: panels/network/wireless-security/eap-method-tls.ui:157
+#: panels/network/wireless-security/ws-leap.ui:56
+#: panels/network/wireless-security/ws-wpa-psk.ui:64
 msgid "Sho_w password"
 msgstr "Sho_w password"
 
-#: panels/network/wireless-security/eap-method-peap.c:63
+#: panels/network/wireless-security/eap-method-peap.c:87
 #, c-format
 msgid "invalid EAP-PEAP CA certificate: %s"
 msgstr "invalid EAP-PEAP CA certificate: %s"
 
-#: panels/network/wireless-security/eap-method-peap.c:68
+#: panels/network/wireless-security/eap-method-peap.c:96
 msgid "invalid EAP-PEAP CA certificate: no certificate specified"
 msgstr "invalid EAP-PEAP CA certificate: no certificate specified"
 
-#: panels/network/wireless-security/eap-method-peap.c:287
-#: panels/network/wireless-security/eap-method-ttls.c:346
-#: panels/network/wireless-security/wireless-security.c:441
-msgid "MD5"
-msgstr "MD5"
-
-#: panels/network/wireless-security/eap-method-peap.c:381
-#: panels/network/wireless-security/eap-method-tls.c:492
-#: panels/network/wireless-security/eap-method-ttls.c:440
+#: panels/network/wireless-security/eap-method-peap.c:328
+#: panels/network/wireless-security/eap-method-tls.c:507
+#: panels/network/wireless-security/eap-method-ttls.c:336
 msgid "Choose a Certificate Authority certificate"
 msgstr "Choose a Certificate Authority certificate"
 
-#: panels/network/wireless-security/eap-method-peap.ui:25
+#: panels/network/wireless-security/eap-method-peap.ui:17
+#: panels/network/wireless-security/eap-method-ttls.ui:33
+#: panels/network/wireless-security/ws-wpa-eap.ui:15
+msgid "MD5"
+msgstr "MD5"
+
+#: panels/network/wireless-security/eap-method-peap.ui:36
 msgid "Version 0"
 msgstr "Version 0"
 
-#: panels/network/wireless-security/eap-method-peap.ui:28
+#: panels/network/wireless-security/eap-method-peap.ui:39
 msgid "Version 1"
 msgstr "Version 1"
 
-#: panels/network/wireless-security/eap-method-peap.ui:74
-#: panels/network/wireless-security/eap-method-tls.ui:75
-#: panels/network/wireless-security/eap-method-ttls.ui:82
+#: panels/network/wireless-security/eap-method-peap.ui:78
+#: panels/network/wireless-security/eap-method-tls.ui:68
+#: panels/network/wireless-security/eap-method-ttls.ui:102
 msgid "C_A certificate"
 msgstr "C_A certificate"
 
-#: panels/network/wireless-security/eap-method-peap.ui:96
-#: panels/network/wireless-security/eap-method-tls.ui:97
-#: panels/network/wireless-security/eap-method-ttls.ui:105
+#: panels/network/wireless-security/eap-method-peap.ui:100
+#: panels/network/wireless-security/eap-method-tls.ui:90
+#: panels/network/wireless-security/eap-method-ttls.ui:125
 msgid "No CA certificate is _required"
 msgstr "No CA certificate is _required"
 
-#: panels/network/wireless-security/eap-method-peap.ui:114
+#: panels/network/wireless-security/eap-method-peap.ui:118
 msgid "PEAP _version"
 msgstr "PEAP _version"
 
-#: panels/network/wireless-security/eap-method-simple.c:74
+#: panels/network/wireless-security/eap-method-simple.c:78
 msgid "missing EAP username"
 msgstr "missing EAP username"
 
-#: panels/network/wireless-security/eap-method-simple.c:87
+#: panels/network/wireless-security/eap-method-simple.c:91
 msgid "missing EAP password"
 msgstr "missing EAP password"
 
-#: panels/network/wireless-security/eap-method-tls.c:68
+#: panels/network/wireless-security/eap-method-tls.c:91
 msgid "missing EAP-TLS identity"
 msgstr "missing EAP-TLS identity"
 
-#: panels/network/wireless-security/eap-method-tls.c:77
+#: panels/network/wireless-security/eap-method-tls.c:101
 #, c-format
 msgid "invalid EAP-TLS CA certificate: %s"
 msgstr "invalid EAP-TLS CA certificate: %s"
 
-#: panels/network/wireless-security/eap-method-tls.c:84
+#: panels/network/wireless-security/eap-method-tls.c:111
 msgid "invalid EAP-TLS CA certificate: no certificate specified"
 msgstr "invalid EAP-TLS CA certificate: no certificate specified"
 
-#: panels/network/wireless-security/eap-method-tls.c:100
+#: panels/network/wireless-security/eap-method-tls.c:125
 #, c-format
 msgid "invalid EAP-TLS private-key: %s"
 msgstr "invalid EAP-TLS private-key: %s"
 
-#: panels/network/wireless-security/eap-method-tls.c:110
+#: panels/network/wireless-security/eap-method-tls.c:135
 #, c-format
 msgid "invalid EAP-TLS user-certificate: %s"
 msgstr "invalid EAP-TLS user-certificate: %s"
 
-#: panels/network/wireless-security/eap-method-tls.c:307
+#: panels/network/wireless-security/eap-method-tls.c:266
 msgid "Unencrypted private keys are insecure"
 msgstr "Unencrypted private keys are insecure"
 
-#: panels/network/wireless-security/eap-method-tls.c:310
+#: panels/network/wireless-security/eap-method-tls.c:269
 msgid ""
 "The selected private key does not appear to be protected by a password. This "
 "could allow your security credentials to be compromised. Please select a "
@@ -3746,92 +4169,97 @@ msgstr ""
 "\n"
 "(You can password-protect your private key with openssl)"
 
-#: panels/network/wireless-security/eap-method-tls.c:486
+#: panels/network/wireless-security/eap-method-tls.c:500
 msgid "Choose your personal certificate"
 msgstr "Choose your personal certificate"
 
-#: panels/network/wireless-security/eap-method-tls.c:498
+#: panels/network/wireless-security/eap-method-tls.c:514
 msgid "Choose your private key"
 msgstr "Choose your private key"
 
-#: panels/network/wireless-security/eap-method-tls.ui:24
+#: panels/network/wireless-security/eap-method-tls.ui:17
 msgid "I_dentity"
 msgstr "I_dentity"
 
-#: panels/network/wireless-security/eap-method-tls.ui:50
+#: panels/network/wireless-security/eap-method-tls.ui:43
 msgid "_User certificate"
 msgstr "_User certificate"
 
-#: panels/network/wireless-security/eap-method-tls.ui:115
+#: panels/network/wireless-security/eap-method-tls.ui:108
 msgid "Private _key"
 msgstr "Private _key"
 
-#: panels/network/wireless-security/eap-method-tls.ui:140
+#: panels/network/wireless-security/eap-method-tls.ui:133
 msgid "_Private key password"
 msgstr "_Private key password"
 
-#: panels/network/wireless-security/eap-method-ttls.c:63
+#: panels/network/wireless-security/eap-method-ttls.c:98
 #, c-format
 msgid "invalid EAP-TTLS CA certificate: %s"
 msgstr "invalid EAP-TTLS CA certificate: %s"
 
-#: panels/network/wireless-security/eap-method-ttls.c:68
+#: panels/network/wireless-security/eap-method-ttls.c:106
 msgid "invalid EAP-TTLS CA certificate: no certificate specified"
 msgstr "invalid EAP-TTLS CA certificate: no certificate specified"
 
-#: panels/network/wireless-security/eap-method-ttls.c:269
+#: panels/network/wireless-security/eap-method-ttls.ui:13
 msgid "PAP"
 msgstr "PAP"
 
-#: panels/network/wireless-security/eap-method-ttls.c:284
+#: panels/network/wireless-security/eap-method-ttls.ui:17
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: panels/network/wireless-security/eap-method-ttls.c:315
+#: panels/network/wireless-security/eap-method-ttls.ui:25
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (no EAP)"
 
-#: panels/network/wireless-security/eap-method-ttls.c:331
+#: panels/network/wireless-security/eap-method-ttls.ui:29
 msgid "CHAP"
 msgstr "CHAP"
 
-#: panels/network/wireless-security/eap-method-ttls.ui:56
+#: panels/network/wireless-security/eap-method-ttls.ui:76
 #: panels/user-accounts/cc-add-user-dialog.ui:507
 #: panels/user-accounts/data/join-dialog.ui:116
 msgid "_Domain"
 msgstr "_Domain"
 
-#: panels/network/wireless-security/wireless-security.c:87
+#: panels/network/wireless-security/wireless-security.c:71
 msgid "Unknown error validating 802.1X security"
 msgstr "Unknown error validating 802.1X security"
 
-#: panels/network/wireless-security/wireless-security.c:453
+#: panels/network/wireless-security/ws-dynamic-wep.ui:15
+#: panels/network/wireless-security/ws-wpa-eap.ui:20
 msgid "TLS"
 msgstr "TLS"
 
-#: panels/network/wireless-security/wireless-security.c:477
+#: panels/network/wireless-security/ws-dynamic-wep.ui:25
+#: panels/network/wireless-security/ws-wpa-eap.ui:30
 msgid "PWD"
 msgstr "PWD"
 
-#: panels/network/wireless-security/wireless-security.c:488
+#: panels/network/wireless-security/ws-dynamic-wep.ui:30
+#: panels/network/wireless-security/ws-wpa-eap.ui:35
 msgid "FAST"
 msgstr "FAST"
 
-#: panels/network/wireless-security/wireless-security.c:499
+#: panels/network/wireless-security/ws-dynamic-wep.ui:35
+#: panels/network/wireless-security/ws-wpa-eap.ui:40
 msgid "Tunneled TLS"
 msgstr "Tunnelled TLS"
 
-#: panels/network/wireless-security/wireless-security.c:510
+#: panels/network/wireless-security/ws-dynamic-wep.ui:40
+#: panels/network/wireless-security/ws-wpa-eap.ui:45
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
-#: panels/network/wireless-security/ws-dynamic-wep.ui:39
-#: panels/network/wireless-security/ws-wep-key.ui:115
-#: panels/network/wireless-security/ws-wpa-eap.ui:33
+#: panels/network/wireless-security/ws-dynamic-wep.ui:56
+#: panels/network/wireless-security/ws-wep-key.ui:102
+#: panels/network/wireless-security/ws-wpa-eap.ui:61
 msgid "Au_thentication"
 msgstr "Au_thentication"
 
-#: panels/network/wireless-security/ws-leap.c:63
+#: panels/network/wireless-security/ws-leap.c:65
 msgid "missing leap-username"
 msgstr "missing leap-username"
 
@@ -3884,15 +4312,15 @@ msgstr "Open System"
 msgid "Shared Key"
 msgstr "Shared Key"
 
-#: panels/network/wireless-security/ws-wep-key.ui:56
+#: panels/network/wireless-security/ws-wep-key.ui:48
 msgid "_Key"
 msgstr "_Key"
 
-#: panels/network/wireless-security/ws-wep-key.ui:94
+#: panels/network/wireless-security/ws-wep-key.ui:84
 msgid "Sho_w key"
 msgstr "Sho_w key"
 
-#: panels/network/wireless-security/ws-wep-key.ui:152
+#: panels/network/wireless-security/ws-wep-key.ui:134
 msgid "WEP inde_x"
 msgstr "WEP inde_x"
 
@@ -3909,7 +4337,7 @@ msgstr ""
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 
-#: panels/network/wireless-security/ws-wpa-psk.ui:50
+#: panels/network/wireless-security/ws-wpa-psk.ui:42
 msgid "_Type"
 msgstr "_Type"
 
@@ -3955,19 +4383,18 @@ msgid "Show Message C_ontent on Lock Screen"
 msgstr "Show Message C_ontent on Lock Screen"
 
 #: panels/notifications/cc-notifications-panel.c:270
-#: panels/power/cc-power-panel.c:2080 panels/power/cc-power-panel.c:2087
-#: panels/privacy/cc-privacy-panel.c:212 panels/privacy/cc-privacy-panel.c:289
-#: panels/universal-access/cc-ua-panel.c:477
-#: panels/universal-access/cc-ua-panel.c:840
-#: panels/universal-access/cc-ua-panel.c:853
-#: panels/universal-access/cc-ua-panel.c:865
-#: panels/universal-access/cc-ua-panel.c:1030
+#: panels/power/cc-power-panel.c:2072 panels/power/cc-power-panel.c:2079
+#: panels/universal-access/cc-ua-panel.c:480
+#: panels/universal-access/cc-ua-panel.c:843
+#: panels/universal-access/cc-ua-panel.c:856
+#: panels/universal-access/cc-ua-panel.c:868
+#: panels/universal-access/cc-ua-panel.c:1033
 msgid "On"
 msgstr "On"
 
 #: panels/notifications/cc-notifications-panel.ui:70
-msgid "Notification _Popups"
-msgstr "Notification _Popups"
+msgid "_Do Not Disturb"
+msgstr "_Do Not Disturb"
 
 #: panels/notifications/cc-notifications-panel.ui:121
 msgid "_Lock Screen Notifications"
@@ -3989,22 +4416,22 @@ 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:626
+#: panels/online-accounts/cc-online-accounts-panel.c:627
 #, c-format
 msgid "%s Account"
 msgstr "%s Account"
 
-#: panels/online-accounts/cc-online-accounts-panel.c:923
+#: panels/online-accounts/cc-online-accounts-panel.c:924
 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:988
+#: panels/online-accounts/cc-online-accounts-panel.c:991
 #, c-format
-msgid "<b>%s</b> removed"
-msgstr "<b>%s</b> removed"
+msgid "%s removed"
+msgstr "%s removed"
 
 #: panels/online-accounts/gnome-online-accounts-panel.desktop.in.in:3
 msgid "Online Accounts"
@@ -4027,7 +4454,7 @@ msgstr ""
 "Kerberos;IMAP;SMTP;Pocket;ReadItLater;"
 
 #. Translators: This is the button which allows undoing the removal of the printer.
-#: panels/online-accounts/online-accounts.ui:38 panels/printers/printers.ui:71
+#: panels/online-accounts/online-accounts.ui:38 panels/printers/printers.ui:54
 msgid "Undo"
 msgstr "Undo"
 
@@ -4047,18 +4474,18 @@ msgstr "Add an account"
 msgid "Remove Account"
 msgstr "Remove Account"
 
-#: panels/power/cc-power-panel.c:327
+#: panels/power/cc-power-panel.c:334
 msgid "Unknown time"
 msgstr "Unknown time"
 
-#: panels/power/cc-power-panel.c:333
+#: panels/power/cc-power-panel.c:340
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i minute"
 msgstr[1] "%i minutes"
 
-#: panels/power/cc-power-panel.c:345
+#: panels/power/cc-power-panel.c:352
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -4067,297 +4494,257 @@ msgstr[1] "%i hours"
 
 #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
 #. * Swap order with "%2$s %2$i %1$s %1$i if needed
-#: panels/power/cc-power-panel.c:353
+#: panels/power/cc-power-panel.c:360
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: panels/power/cc-power-panel.c:354
+#: panels/power/cc-power-panel.c:361
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hour"
 msgstr[1] "hours"
 
-#: panels/power/cc-power-panel.c:355
+#: panels/power/cc-power-panel.c:362
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: panels/power/cc-power-panel.c:373
+#: panels/power/cc-power-panel.c:380
 #, 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:380
+#: panels/power/cc-power-panel.c:387
 #, 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:385
+#: panels/power/cc-power-panel.c:392
 #, c-format
 msgid "%s remaining"
 msgstr "%s remaining"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:390 panels/power/cc-power-panel.c:420
+#: panels/power/cc-power-panel.c:397 panels/power/cc-power-panel.c:427
 msgid "Fully charged"
 msgstr "Fully charged"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:394 panels/power/cc-power-panel.c:424
+#: panels/power/cc-power-panel.c:401 panels/power/cc-power-panel.c:431
 msgid "Not charging"
 msgstr "Not charging"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:398 panels/power/cc-power-panel.c:428
+#: panels/power/cc-power-panel.c:405 panels/power/cc-power-panel.c:435
 msgid "Empty"
 msgstr "Empty"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:411
+#: panels/power/cc-power-panel.c:418
 msgid "Charging"
 msgstr "Charging"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:416
+#: panels/power/cc-power-panel.c:423
 msgid "Discharging"
 msgstr "Discharging"
 
-#: panels/power/cc-power-panel.c:549
+#: panels/power/cc-power-panel.c:556
 msgctxt "Battery name"
 msgid "Main"
 msgstr "Main"
 
-#: panels/power/cc-power-panel.c:551
+#: panels/power/cc-power-panel.c:558
 msgctxt "Battery name"
 msgid "Extra"
 msgstr "Extra"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:626
+#: panels/power/cc-power-panel.c:633
 msgid "Wireless mouse"
 msgstr "Wireless mouse"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:629
+#: panels/power/cc-power-panel.c:636
 msgid "Wireless keyboard"
 msgstr "Wireless keyboard"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:632
+#: panels/power/cc-power-panel.c:639
 msgid "Uninterruptible power supply"
 msgstr "Uninterruptible power supply"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:635
+#: panels/power/cc-power-panel.c:642
 msgid "Personal digital assistant"
 msgstr "Personal digital assistant"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:638
+#: panels/power/cc-power-panel.c:645
 msgid "Cellphone"
 msgstr "Mobile phone"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:641
+#: panels/power/cc-power-panel.c:648
 msgid "Media player"
 msgstr "Media player"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:644 panels/wacom/cc-wacom-panel.c:848
+#: panels/power/cc-power-panel.c:651 panels/wacom/cc-wacom-panel.c:815
 msgid "Tablet"
 msgstr "Tablet"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:647
+#: panels/power/cc-power-panel.c:654
 msgid "Computer"
 msgstr "Computer"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:650
+#: panels/power/cc-power-panel.c:657
 msgid "Gaming input device"
 msgstr "Gaming input device"
 
 #. TRANSLATORS: secondary battery, misc
-#: panels/power/cc-power-panel.c:653 panels/power/cc-power-panel.c:911
-#: panels/power/cc-power-panel.c:2430
+#: panels/power/cc-power-panel.c:660 panels/power/cc-power-panel.c:942
+#: panels/power/cc-power-panel.c:2423
 msgid "Battery"
 msgstr "Battery"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:714
+#: panels/power/cc-power-panel.c:721
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "Charging"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:721
+#: panels/power/cc-power-panel.c:728
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "Caution"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:726
+#: panels/power/cc-power-panel.c:733
 msgctxt "Battery power"
 msgid "Low"
 msgstr "Low"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:731
+#: panels/power/cc-power-panel.c:738
 msgctxt "Battery power"
 msgid "Good"
 msgstr "Good"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:736
+#: panels/power/cc-power-panel.c:743
 msgctxt "Battery power"
 msgid "Fully charged"
 msgstr "Fully charged"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:740
+#: panels/power/cc-power-panel.c:747
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "Empty"
 
-#: panels/power/cc-power-panel.c:909
+#: panels/power/cc-power-panel.c:940
 msgid "Batteries"
 msgstr "Batteries"
 
-#: panels/power/cc-power-panel.c:1274
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d hour"
-msgstr[1] "%d hours"
-
-#: panels/power/cc-power-panel.c:1276
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minute"
-msgstr[1] "%d minutes"
-
-#: panels/power/cc-power-panel.c:1279
-#, c-format
-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:1284
-#, c-format
-msgctxt "time"
-msgid "%s %s %s"
-msgstr "%s %s %s"
-
-#. 2 minutes 12 seconds
-#: panels/power/cc-power-panel.c:1287
-#, c-format
-msgctxt "time"
-msgid "%s %s"
-msgstr "%s %s"
-
-#. 0 seconds
-#: panels/power/cc-power-panel.c:1293
-msgid "0 seconds"
-msgstr "0 seconds"
-
-#: panels/power/cc-power-panel.c:1390
+#: panels/power/cc-power-panel.c:1381
 msgid "When _idle"
 msgstr "When _idle"
 
-#: panels/power/cc-power-panel.c:1835
+#: panels/power/cc-power-panel.c:1827
 msgid "Power Saving"
 msgstr "Power Saving"
 
-#: panels/power/cc-power-panel.c:1869
+#: panels/power/cc-power-panel.c:1861
 msgid "_Screen Brightness"
 msgstr "_Screen Brightness"
 
-#: panels/power/cc-power-panel.c:1890
+#: panels/power/cc-power-panel.c:1882
 msgid "Automatic Brightness"
 msgstr "Automatic brightness"
 
-#: panels/power/cc-power-panel.c:1903
+#: panels/power/cc-power-panel.c:1895
 msgid "_Keyboard Brightness"
 msgstr "_Keyboard Brightness"
 
-#: panels/power/cc-power-panel.c:1914
+#: panels/power/cc-power-panel.c:1906
 msgid "_Dim Screen When Inactive"
 msgstr "_Dim screen when inactive"
 
-#: panels/power/cc-power-panel.c:1932
+#: panels/power/cc-power-panel.c:1924
 msgid "_Blank Screen"
 msgstr "_Blank Screen"
 
-#: panels/power/cc-power-panel.c:1955
+#: panels/power/cc-power-panel.c:1947
 msgid "_Wi-Fi"
 msgstr "_Wi-Fi"
 
-#: panels/power/cc-power-panel.c:1956
+#: panels/power/cc-power-panel.c:1948
 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:1972
+#: panels/power/cc-power-panel.c:1964
 msgid "_Mobile Broadband"
 msgstr "_Mobile Broadband"
 
-#: panels/power/cc-power-panel.c:1973
+#: panels/power/cc-power-panel.c:1965
 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:2023
+#: panels/power/cc-power-panel.c:2015
 msgid "_Bluetooth"
 msgstr "_Bluetooth"
 
-#: panels/power/cc-power-panel.c:2024
+#: panels/power/cc-power-panel.c:2016
 msgid "Bluetooth can be turned off to save power."
 msgstr "Bluetooth can be turned off to save power."
 
-#: panels/power/cc-power-panel.c:2076
+#: panels/power/cc-power-panel.c:2068
 msgid "When on battery power"
 msgstr "When on battery power"
 
-#: panels/power/cc-power-panel.c:2078
+#: panels/power/cc-power-panel.c:2070
 msgid "When plugged in"
 msgstr "When plugged in"
 
-#: panels/power/cc-power-panel.c:2172
+#: panels/power/cc-power-panel.c:2164
 msgid "Suspend"
 msgstr "Suspend"
 
-#: panels/power/cc-power-panel.c:2173
+#: panels/power/cc-power-panel.c:2165
 msgid "Power Off"
 msgstr "Power Off"
 
-#: panels/power/cc-power-panel.c:2174
+#: panels/power/cc-power-panel.c:2166
 msgid "Hibernate"
 msgstr "Hibernate"
 
-#: panels/power/cc-power-panel.c:2175
+#: panels/power/cc-power-panel.c:2167
 msgid "Nothing"
 msgstr "Nothing"
 
 #. Frame header
-#: panels/power/cc-power-panel.c:2275
+#: panels/power/cc-power-panel.c:2267
 msgid "Suspend & Power Button"
 msgstr "Suspend & Power Button"
 
-#: panels/power/cc-power-panel.c:2316
+#: panels/power/cc-power-panel.c:2308
 msgid "_Automatic Suspend"
 msgstr "_Automatic Suspend"
 
-#: panels/power/cc-power-panel.c:2317
+#: panels/power/cc-power-panel.c:2309
 msgid "Automatic suspend"
 msgstr "Automatic suspend"
 
-#: panels/power/cc-power-panel.c:2374
+#: panels/power/cc-power-panel.c:2367
 msgid "Po_wer Button Action"
 msgstr "Po_wer Button Action"
 
@@ -4421,66 +4808,6 @@ msgctxt "automatic_suspend"
 msgid "2 hours"
 msgstr "2 hours"
 
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:63
-msgctxt "blank_screen"
-msgid "1 minute"
-msgstr "1 minute"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:67
-msgctxt "blank_screen"
-msgid "2 minutes"
-msgstr "2 minutes"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:71
-msgctxt "blank_screen"
-msgid "3 minutes"
-msgstr "3 minutes"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:75
-msgctxt "blank_screen"
-msgid "4 minutes"
-msgstr "4 minutes"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:79
-msgctxt "blank_screen"
-msgid "5 minutes"
-msgstr "5 minutes"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:83
-msgctxt "blank_screen"
-msgid "8 minutes"
-msgstr "8 minutes"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:87
-msgctxt "blank_screen"
-msgid "10 minutes"
-msgstr "10 minutes"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:91
-msgctxt "blank_screen"
-msgid "12 minutes"
-msgstr "12 minutes"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:95
-msgctxt "blank_screen"
-msgid "15 minutes"
-msgstr "15 minutes"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:99
-msgctxt "blank_screen"
-msgid "Never"
-msgstr "Never"
-
 #: panels/power/cc-power-panel.ui:147
 msgid "Automatic Suspend"
 msgstr "Automatic Suspend"
@@ -4494,7 +4821,7 @@ msgid "On _Battery Power"
 msgstr "On _Battery Power"
 
 #: panels/power/cc-power-panel.ui:233 panels/power/cc-power-panel.ui:293
-#: panels/universal-access/cc-ua-panel.ui:1495
+#: panels/universal-access/cc-ua-panel.ui:1527
 msgid "Delay"
 msgstr "Delay"
 
@@ -4523,17 +4850,11 @@ msgstr "Authenticate"
 
 #. Translators: This is a username on a print server.
 #: panels/printers/authentication-dialog.ui:80
-#: panels/printers/jobs-dialog.ui:57 panels/printers/new-printer-dialog.ui:362
+#: panels/printers/new-printer-dialog.ui:362
+#: panels/printers/pp-jobs-dialog.ui:57
 msgid "Username"
 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/cc-add-user-dialog.ui:249
-msgid "Password"
-msgstr "Password"
-
 #: panels/printers/authentication-dialog.ui:139
 #: panels/printers/new-printer-dialog.ui:337
 msgid "Authentication Required"
@@ -4551,37 +4872,11 @@ 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:1242
+#: panels/printers/cc-printers-panel.c:1239
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "Could not load ui: %s"
 
-#: 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:114
-#: panels/printers/pp-ppd-selection-dialog.c:250
-msgid "Driver"
-msgstr "Driver"
-
-#: panels/printers/details-dialog.ui:152
-msgid "Searching for preferred drivers…"
-msgstr "Searching for preferred drivers…"
-
-#: panels/printers/details-dialog.ui:174
-msgid "Search for Drivers"
-msgstr "Search for Drivers"
-
-#: panels/printers/details-dialog.ui:182
-msgid "Select from Database…"
-msgstr "Select from Database…"
-
-#: panels/printers/details-dialog.ui:190
-msgid "Install PPD File…"
-msgstr "Install PPD File…"
-
 #: panels/printers/gnome-printers-panel.desktop.in.in:3
 msgid "Printers"
 msgstr "Printers"
@@ -4595,31 +4890,6 @@ msgstr "Add printers, view printer jobs and decide how you want to print"
 msgid "Printer;Queue;Print;Paper;Ink;Toner;"
 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"
-msgstr "Domain"
-
-#. Translators: This button authenticates all print jobs and send them for printing.
-#: panels/printers/jobs-dialog.ui:123
-msgid "A_uthenticate"
-msgstr "A_uthenticate"
-
-#. Translators: this action removes (purges) all the listed jobs from the list.
-#: panels/printers/jobs-dialog.ui:163
-msgid "Clear All"
-msgstr "Clear All"
-
-#. Translators: This button pop up authentication dialog for print jobs which need credentials.
-#: panels/printers/jobs-dialog.ui:225
-msgid "_Authenticate"
-msgstr "_Authenticate"
-
-#. Translators: this label describes the dialog empty state, with no jobs listed.
-#: panels/printers/jobs-dialog.ui:354
-msgid "No Active Printer Jobs"
-msgstr "No Active Printer Jobs"
-
 #. Translators: This is the title presented at top of the dialog.
 #: panels/printers/new-printer-dialog.ui:29
 #: panels/printers/pp-new-printer-dialog.c:363
@@ -4648,28 +4918,22 @@ msgstr "Enter a network address or search for a printer"
 msgid "Enter username and password to view printers on Print Server."
 msgstr "Enter username and password to view printers on Print Server."
 
-#. Translators: This button triggers the printing of a test page.
-#. Translators: Name of job which makes printer to print test page
-#: panels/printers/options-dialog.ui: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:133
-#: panels/printers/pp-details-dialog.c:417
+#: panels/printers/pp-details-dialog.c:75
+#: panels/printers/pp-details-dialog.c:370
 #, c-format
 msgid "%s Details"
 msgstr "%s Details"
 
-#: panels/printers/pp-details-dialog.c:180
+#: panels/printers/pp-details-dialog.c:122
 msgid "No suitable driver found"
 msgstr "No suitable driver found"
 
-#: panels/printers/pp-details-dialog.c:310
+#: panels/printers/pp-details-dialog.c:249
 msgid "Select PPD File"
 msgstr "Select PPD File"
 
-#: panels/printers/pp-details-dialog.c:319
+#: panels/printers/pp-details-dialog.c:258
 msgid ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
@@ -4677,6 +4941,32 @@ msgstr ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
 
+#: panels/printers/pp-details-dialog.ui:68 panels/printers/printer-entry.ui:223
+msgid "Location"
+msgstr "Location"
+
+#. Translators: Name of column showing printer drivers
+#: panels/printers/pp-details-dialog.ui:122
+#: panels/printers/pp-ppd-selection-dialog.c:250
+msgid "Driver"
+msgstr "Driver"
+
+#: panels/printers/pp-details-dialog.ui:162
+msgid "Searching for preferred drivers…"
+msgstr "Searching for preferred drivers…"
+
+#: panels/printers/pp-details-dialog.ui:183
+msgid "Search for Drivers"
+msgstr "Search for Drivers"
+
+#: panels/printers/pp-details-dialog.ui:192
+msgid "Select from Database…"
+msgstr "Select from Database…"
+
+#: panels/printers/pp-details-dialog.ui:201
+msgid "Install PPD File…"
+msgstr "Install PPD File…"
+
 #: panels/printers/ppd-selection-dialog.ui:10
 msgid "Select Printer Driver"
 msgstr "Select Printer Driver"
@@ -4691,12 +4981,12 @@ msgid "Loading drivers database…"
 msgstr "Loading drivers database…"
 
 #. Translators: The found device is a JetDirect printer
-#: panels/printers/pp-host.c:472
+#: panels/printers/pp-host.c:479
 msgid "JetDirect Printer"
 msgstr "JetDirect Printer"
 
 #. Translators: The found device is a Line Printer Daemon printer
-#: panels/printers/pp-host.c:707
+#: panels/printers/pp-host.c:714
 msgid "LPD Printer"
 msgstr "LPD Printer"
 
@@ -4739,55 +5029,55 @@ msgid "Reverse portrait"
 msgstr "Reverse portrait"
 
 #. Translators: Job's state (job is waiting to be printed)
-#: panels/printers/pp-jobs-dialog.c:234
+#: panels/printers/pp-jobs-dialog.c:222
 msgctxt "print job"
 msgid "Pending"
 msgstr "Pending"
 
 #. Translators: Job's state (job is held for printing)
-#: panels/printers/pp-jobs-dialog.c:240
+#: panels/printers/pp-jobs-dialog.c:228
 msgctxt "print job"
 msgid "Paused"
 msgstr "Paused"
 
 #. Translators: Job's state (job needs authentication to proceed further)
-#: panels/printers/pp-jobs-dialog.c:245
+#: panels/printers/pp-jobs-dialog.c:233
 msgctxt "print job"
 msgid "Authentication required"
 msgstr "Authentication required"
 
 #. Translators: Job's state (job is currently printing)
-#: panels/printers/pp-jobs-dialog.c:250
+#: panels/printers/pp-jobs-dialog.c:238
 msgctxt "print job"
 msgid "Processing"
 msgstr "Processing"
 
 #. Translators: Job's state (job has been stopped)
-#: panels/printers/pp-jobs-dialog.c:254
+#: panels/printers/pp-jobs-dialog.c:242
 msgctxt "print job"
 msgid "Stopped"
 msgstr "Stopped"
 
 #. Translators: Job's state (job has been canceled)
-#: panels/printers/pp-jobs-dialog.c:258
+#: panels/printers/pp-jobs-dialog.c:246
 msgctxt "print job"
 msgid "Canceled"
 msgstr "Cancelled"
 
 #. Translators: Job's state (job has aborted due to error)
-#: panels/printers/pp-jobs-dialog.c:262
+#: panels/printers/pp-jobs-dialog.c:250
 msgctxt "print job"
 msgid "Aborted"
 msgstr "Aborted"
 
 #. Translators: Job's state (job has completed successfully)
-#: panels/printers/pp-jobs-dialog.c:266
+#: panels/printers/pp-jobs-dialog.c:254
 msgctxt "print job"
 msgid "Completed"
 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
+#: panels/printers/pp-jobs-dialog.c:363
 #, c-format
 msgid "%u Job Requires Authentication"
 msgid_plural "%u Jobs Require Authentication"
@@ -4795,18 +5085,43 @@ 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:613
+#: panels/printers/pp-jobs-dialog.c:520
 #, 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:617
+#: panels/printers/pp-jobs-dialog.c:524
 #, c-format
 msgid "Enter credentials to print from %s."
 msgstr "Enter credentials to print from %s."
 
+#. Translators: This is a windows domain used with SMB protocol.
+#: panels/printers/pp-jobs-dialog.ui:44
+msgid "Domain"
+msgstr "Domain"
+
+#. Translators: This button authenticates all print jobs and send them for printing.
+#: panels/printers/pp-jobs-dialog.ui:129
+msgid "A_uthenticate"
+msgstr "A_uthenticate"
+
+#. Translators: this action removes (purges) all the listed jobs from the list.
+#: panels/printers/pp-jobs-dialog.ui:169
+msgid "Clear All"
+msgstr "Clear All"
+
+#. Translators: This button pop up authentication dialog for print jobs which need credentials.
+#: panels/printers/pp-jobs-dialog.ui:232
+msgid "_Authenticate"
+msgstr "_Authenticate"
+
+#. Translators: this label describes the dialog empty state, with no jobs listed.
+#: panels/printers/pp-jobs-dialog.ui:358
+msgid "No Active Printer Jobs"
+msgstr "No Active Printer Jobs"
+
 #: panels/printers/pp-new-printer-dialog.c:380
 msgid "Unlock Print Server"
 msgstr "Unlock Print Server"
@@ -4828,127 +5143,134 @@ 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:1680
+#: panels/printers/pp-new-printer-dialog.c:1697
 msgid "USB"
 msgstr "USB"
 
 #. Translators: The found device is a printer connected via serial port
-#: panels/printers/pp-new-printer-dialog.c:1685
+#: panels/printers/pp-new-printer-dialog.c:1702
 msgid "Serial Port"
 msgstr "Serial Port"
 
 #. Translators: The found device is a printer connected via parallel port
-#: panels/printers/pp-new-printer-dialog.c:1692
+#: panels/printers/pp-new-printer-dialog.c:1709
 msgid "Parallel Port"
 msgstr "Parallel Port"
 
 #. Translators: Location of found network printer (e.g. Kitchen, Reception)
-#: panels/printers/pp-new-printer-dialog.c:1734
+#: panels/printers/pp-new-printer-dialog.c:1751
 #, c-format
 msgid "Location: %s"
 msgstr "Location: %s"
 
 #. Translators: Network address of found printer
-#: panels/printers/pp-new-printer-dialog.c:1739
+#: panels/printers/pp-new-printer-dialog.c:1756
 #, 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:1766
+#: panels/printers/pp-new-printer-dialog.c:1783
 msgid "Server requires authentication"
 msgstr "Server requires authentication"
 
-#: panels/printers/pp-options-dialog.c:90
+#: panels/printers/pp-options-dialog.c:91
 msgid "Two Sided"
 msgstr "Two Sided"
 
-#: panels/printers/pp-options-dialog.c:91
+#: panels/printers/pp-options-dialog.c:92
 msgid "Paper Type"
 msgstr "Paper Type"
 
-#: panels/printers/pp-options-dialog.c:92
+#: panels/printers/pp-options-dialog.c:93
 msgid "Paper Source"
 msgstr "Paper Source"
 
-#: panels/printers/pp-options-dialog.c:93
+#: panels/printers/pp-options-dialog.c:94
 msgid "Output Tray"
 msgstr "Output Tray"
 
-#: panels/printers/pp-options-dialog.c:94
+#: panels/printers/pp-options-dialog.c:95
 msgctxt "printing option"
 msgid "Resolution"
 msgstr "Resolution"
 
-#: panels/printers/pp-options-dialog.c:95
+#: panels/printers/pp-options-dialog.c:96
 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:548
+#: panels/printers/pp-options-dialog.c:534
 msgid "Pages per side"
 msgstr "Pages per side"
 
 #. Translators: This option sets whether to print on both sides of paper
-#: panels/printers/pp-options-dialog.c:560
+#: panels/printers/pp-options-dialog.c:546
 msgid "Two-sided"
 msgstr "Two-sided"
 
 #. Translators: This option sets orientation of print (portrait, landscape...)
-#: panels/printers/pp-options-dialog.c:572
+#: panels/printers/pp-options-dialog.c:558
 msgid "Orientation"
 msgstr "Orientation"
 
 #. Translators: "General" tab contains general printer options
-#: panels/printers/pp-options-dialog.c:669
+#: panels/printers/pp-options-dialog.c:655
 msgctxt "Printer Option Group"
 msgid "General"
 msgstr "General"
 
 #. Translators: "Page Setup" tab contains settings related to pages (page size, paper source, etc.)
-#: panels/printers/pp-options-dialog.c:672
+#: panels/printers/pp-options-dialog.c:658
 msgctxt "Printer Option Group"
 msgid "Page Setup"
 msgstr "Page Setup"
 
 #. Translators: "Installable Options" tab contains settings of presence of installed options (amount of RAM, 
duplex unit, etc.)
-#: panels/printers/pp-options-dialog.c:675
+#: panels/printers/pp-options-dialog.c:661
 msgctxt "Printer Option Group"
 msgid "Installable Options"
 msgstr "Installable Options"
 
 #. Translators: "Job" tab contains settings for jobs
-#: panels/printers/pp-options-dialog.c:678
+#: panels/printers/pp-options-dialog.c:664
 msgctxt "Printer Option Group"
 msgid "Job"
 msgstr "Job"
 
 #. Translators: "Image Quality" tab contains settings for quality of output print (e.g. resolution)
-#: panels/printers/pp-options-dialog.c:681
+#: panels/printers/pp-options-dialog.c:667
 msgctxt "Printer Option Group"
 msgid "Image Quality"
 msgstr "Image Quality"
 
 #. Translators: "Color" tab contains color settings (e.g. color printing)
-#: panels/printers/pp-options-dialog.c:684
+#: panels/printers/pp-options-dialog.c:670
 msgctxt "Printer Option Group"
 msgid "Color"
 msgstr "Colour"
 
 #. Translators: "Finishing" tab contains finishing settings (e.g. booklet printing)
-#: panels/printers/pp-options-dialog.c:687
+#: panels/printers/pp-options-dialog.c:673
 msgctxt "Printer Option Group"
 msgid "Finishing"
 msgstr "Finishing"
 
 #. Translators: "Advanced" tab contains all others settings
-#: panels/printers/pp-options-dialog.c:690
+#: panels/printers/pp-options-dialog.c:676
 msgctxt "Printer Option Group"
 msgid "Advanced"
 msgstr "Advanced"
 
 #. Translators: Name of job which makes printer to print test page
-#: panels/printers/pp-options-dialog.c:920
+#. Translators: This button triggers the printing of a test page.
+#: panels/printers/pp-options-dialog.c:869
+#: panels/printers/pp-options-dialog.ui:18
+msgid "Test Page"
+msgstr "Test Page"
+
+#. Translators: Name of job which makes printer to print test page
+#: panels/printers/pp-options-dialog.c:882
 msgid "Test page"
 msgstr "Test page"
 
@@ -4994,12 +5316,12 @@ msgid "Manufacturer"
 msgstr "Manufacturer"
 
 #. Translators: This is the label of the button that opens the Jobs Dialog.
-#: panels/printers/pp-printer-entry.c:606 panels/printers/printer-entry.ui:166
+#: panels/printers/pp-printer-entry.c:594 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:611
+#: panels/printers/pp-printer-entry.c:599
 #, c-format
 msgid "%u Job"
 msgid_plural "%u Jobs"
@@ -5007,111 +5329,111 @@ msgstr[0] "%u Job"
 msgstr[1] "%u Jobs"
 
 #. Translators: The printer is low on toner
-#: panels/printers/pp-printer-entry.c:766
+#: panels/printers/pp-printer-entry.c:745
 msgid "Low on toner"
 msgstr "Low on toner"
 
 #. Translators: The printer has no toner left
-#: panels/printers/pp-printer-entry.c:768
+#: panels/printers/pp-printer-entry.c:747
 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:771
+#: panels/printers/pp-printer-entry.c:750
 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:774
+#: panels/printers/pp-printer-entry.c:753
 msgid "Out of developer"
 msgstr "Out of developer"
 
 #. Translators: "marker" is one color bin of the printer
-#: panels/printers/pp-printer-entry.c:776
+#: panels/printers/pp-printer-entry.c:755
 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:778
+#: panels/printers/pp-printer-entry.c:757
 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:780
+#: panels/printers/pp-printer-entry.c:759
 msgid "Open cover"
 msgstr "Open cover"
 
 #. Translators: One or more doors on the printer are open
-#: panels/printers/pp-printer-entry.c:782
+#: panels/printers/pp-printer-entry.c:761
 msgid "Open door"
 msgstr "Open door"
 
 #. Translators: At least one input tray is low on media
-#: panels/printers/pp-printer-entry.c:784
+#: panels/printers/pp-printer-entry.c:763
 msgid "Low on paper"
 msgstr "Low on paper"
 
 #. Translators: At least one input tray is empty
-#: panels/printers/pp-printer-entry.c:786
+#: panels/printers/pp-printer-entry.c:765
 msgid "Out of paper"
 msgstr "Out of paper"
 
 #. Translators: The printer is offline
-#: panels/printers/pp-printer-entry.c:788
+#: panels/printers/pp-printer-entry.c:767
 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:790
-#: panels/printers/pp-printer-entry.c:918
+#: panels/printers/pp-printer-entry.c:769
+#: panels/printers/pp-printer-entry.c:897
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "Stopped"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: panels/printers/pp-printer-entry.c:792
+#: panels/printers/pp-printer-entry.c:771
 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:794
+#: panels/printers/pp-printer-entry.c:773
 msgid "Waste receptacle full"
 msgstr "Waste receptacle full"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: panels/printers/pp-printer-entry.c:796
+#: panels/printers/pp-printer-entry.c:775
 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:798
+#: panels/printers/pp-printer-entry.c:777
 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:904
+#: panels/printers/pp-printer-entry.c:883
 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:909
+#: panels/printers/pp-printer-entry.c:888
 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:914
+#: panels/printers/pp-printer-entry.c:893
 msgctxt "printer state"
 msgid "Processing"
 msgstr "Processing"
 
 #. Translators: Name of job which makes printer to clean its heads
-#: panels/printers/pp-printer-entry.c:938
+#: panels/printers/pp-printer-entry.c:917
 msgid "Clean print heads"
 msgstr "Clean print heads"
 
@@ -5156,21 +5478,21 @@ msgid "Restart"
 msgstr "Restart"
 
 #. Translators: This button adds new printer.
-#: panels/printers/printers.ui:20
+#: panels/printers/printers.ui:8
 msgid "Add…"
 msgstr "Add…"
 
-#: panels/printers/printers.ui:186
+#: panels/printers/printers.ui:174
 msgid "No printers"
 msgstr "No printers"
 
 #. Translators: This button adds new printer.
-#: panels/printers/printers.ui:200
+#: panels/printers/printers.ui:188
 msgid "Add a Printer…"
 msgstr "Add a Printer…"
 
 #. Translators: The CUPS server is not running (we can not connect to it).
-#: panels/printers/printers.ui:232
+#: panels/printers/printers.ui:220
 msgid ""
 "Sorry! The system printing service\n"
 "doesn’t seem to be available."
@@ -5178,424 +5500,75 @@ msgstr ""
 "Sorry! The system printing service\n"
 "doesn’t seem to be available."
 
-#: 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:467
-msgid "In use"
-msgstr "In use"
-
-#: panels/privacy/cc-privacy-panel.c:472
-msgctxt "Location services status"
-msgid "On"
-msgstr "On"
-
-#: panels/privacy/cc-privacy-panel.c:473
-msgctxt "Location services status"
-msgid "Off"
-msgstr "Off"
-
-#: panels/privacy/cc-privacy-panel.c:895
-msgctxt "Camera status"
-msgid "Off"
-msgstr "Off"
-
-#: panels/privacy/cc-privacy-panel.c:897
-msgctxt "Camera status"
-msgid "On"
-msgstr "On"
-
-#: panels/privacy/cc-privacy-panel.c:928
-msgctxt "Microphone status"
-msgid "Off"
-msgstr "Off"
-
-#: panels/privacy/cc-privacy-panel.c:930
-msgctxt "Microphone status"
-msgid "On"
-msgstr "On"
-
-#: 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:1157
-msgid "Empty all items from Trash?"
-msgstr "Empty all items from Wastebasket?"
-
-#: 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:1159
-msgid "_Empty Trash"
-msgstr "_Empty Wastebasket"
-
-#: 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: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:1182
-msgid "_Purge Temporary Files"
-msgstr "_Purge Temporary Files"
-
-#: 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:1237
-#: panels/privacy/cc-privacy-panel.ui:637
-msgid "Software Usage"
-msgstr "Software Usage"
-
-#: 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:1288
-#, c-format
-msgid ""
-"Sending reports of technical problems helps us improve %s. Reports are sent "
-"anonymously and are scrubbed of personal data."
-msgstr ""
-"Sending reports of technical problems helps us improve %s. Reports are sent "
-"anonymously and are scrubbed of personal data."
-
-#: panels/privacy/cc-privacy-panel.c:1300
-#: panels/privacy/cc-privacy-panel.ui:719
-msgid "Privacy Policy"
-msgstr "Privacy Policy"
-
-#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
-#: panels/privacy/cc-privacy-panel.ui:14
-msgctxt "lock_screen"
-msgid "Screen Turns Off"
-msgstr "Screen Turns Off"
-
-#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
-#: panels/privacy/cc-privacy-panel.ui:18
-msgctxt "lock_screen"
-msgid "30 seconds"
-msgstr "30 seconds"
-
-#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
-#: panels/privacy/cc-privacy-panel.ui:22
-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
-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
-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
-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
-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
-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
-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
-msgctxt "purge_files"
-msgid "1 day"
-msgstr "1 day"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:64
-msgctxt "purge_files"
-msgid "2 days"
-msgstr "2 days"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:68
-msgctxt "purge_files"
-msgid "3 days"
-msgstr "3 days"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:72
-msgctxt "purge_files"
-msgid "4 days"
-msgstr "4 days"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:76
-msgctxt "purge_files"
-msgid "5 days"
-msgstr "5 days"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:80
-msgctxt "purge_files"
-msgid "6 days"
-msgstr "6 days"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:84
-msgctxt "purge_files"
-msgid "7 days"
-msgstr "7 days"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:88
-msgctxt "purge_files"
-msgid "14 days"
-msgstr "14 days"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:92
-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
-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
-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
-msgctxt "retain_history"
-msgid "30 days"
-msgstr "30 days"
-
-#. Translators: Option for "Retain History" in "Usage & History" dialog.
-#: panels/privacy/cc-privacy-panel.ui:118
-msgctxt "retain_history"
-msgid "Forever"
-msgstr "Forever"
-
-#: 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."
-msgstr ""
-"Remembering your history makes things easier to find again. These items are "
-"never shared over the network."
-
-#: panels/privacy/cc-privacy-panel.ui:176
-msgid "_Recently Used"
-msgstr "_Recently Used"
-
-#: panels/privacy/cc-privacy-panel.ui:207
-msgid "Retain _History"
-msgstr "Retain _History"
-
-#: panels/privacy/cc-privacy-panel.ui:247
-msgid "Cl_ear Recent History"
-msgstr "Cl_ear Recent History"
-
-#: 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/cc-privacy-panel.ui:328
-msgid "Automatic Screen _Lock"
-msgstr "Automatic Screen _Lock"
-
-#: panels/privacy/cc-privacy-panel.ui:362
-msgid "Lock screen _after blank for"
-msgstr "Lock screen _after blank for"
-
-#: panels/privacy/cc-privacy-panel.ui:394
-msgid "Lock Screen _Notifications"
-msgstr "Lock Screen _Notifications"
-
-#: 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."
-msgstr ""
-"Automatically purge the Wastebasket and temporary files to help keep your "
-"computer free of unnecessary sensitive information."
-
-#: panels/privacy/cc-privacy-panel.ui:483
-msgid "Automatically empty _Trash"
-msgstr "Automatically empty _Wastebasket"
-
-#: panels/privacy/cc-privacy-panel.ui:515
-msgid "Automatically purge Temporary _Files"
-msgstr "Automatically purge Temporary _Files"
-
-#: panels/privacy/cc-privacy-panel.ui:546
-msgid "Purge _After"
-msgstr "Purge _After"
-
-#: panels/privacy/cc-privacy-panel.ui:590
-msgid "_Empty Trash…"
-msgstr "_Empty Wastebasket…"
-
-#: panels/privacy/cc-privacy-panel.ui:606
-msgid "_Purge Temporary Files…"
-msgstr "_Purge Temporary Files…"
-
-#: 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 "
-"software.\n"
-"\n"
-"All the information we collect is made anonymous, and we will never share "
-"your data with third parties."
-msgstr ""
-"Sending us information about which software you use helps us provide you "
-"with more accurate recommendations. It also helps us to improve our "
-"software.\n"
-"\n"
-"All the information we collect is made anonymous, and we will never share "
-"your data with third parties."
-
-#: panels/privacy/cc-privacy-panel.ui:681
-msgid "_Send software usage statistics"
-msgstr "_Send software usage statistics"
-
-#: 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 "_Camera"
-msgstr "_Camera"
+#: panels/region/cc-format-chooser.c:148
+msgctxt "measurement format"
+msgid "Imperial"
+msgstr "Imperial"
 
-#: 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/region/cc-format-chooser.c:150
+msgctxt "measurement format"
+msgid "Metric"
+msgstr "Metric"
 
-#: panels/privacy/cc-privacy-panel.ui:917
-msgid "_Microphone"
-msgstr "_Microphone"
+#: panels/region/cc-format-chooser.c:255 panels/region/cc-format-chooser.c:296
+#: panels/region/cc-format-chooser.ui:6
+msgid "Formats"
+msgstr "Formats"
 
-#: panels/privacy/cc-privacy-panel.ui:974
-msgid ""
-"Location services allow applications to know your location. Using Wi-Fi and "
-"mobile broadband increases accuracy."
-msgstr ""
-"Location services allow applications to know your location. Using Wi-Fi and "
-"mobile broadband increases accuracy."
+#: panels/region/cc-format-chooser.ui:48 panels/wacom/wacom-stylus-page.ui:37
+#: shell/cc-window.ui:232
+msgid "Back"
+msgstr "Back"
 
-#: panels/privacy/cc-privacy-panel.ui:988
+#: panels/region/cc-format-chooser.ui:103
 msgid ""
-"Uses Mozilla Location Service: <a href='https://location.services.mozilla.";
-"com/privacy'>Privacy Policy</a>"
+"Choose the format for numbers, dates and currencies. Changes take effect on "
+"next login."
 msgstr ""
-"Uses Mozilla Location Service: <a href='https://location.services.mozilla.";
-"com/privacy'>Privacy Policy</a>"
+"Choose the format for numbers, dates and currencies. Changes take effect on "
+"next login."
 
-#: panels/privacy/cc-privacy-panel.ui:1038
-msgid "_Location Services"
-msgstr "_Location Services"
+#: panels/region/cc-format-chooser.ui:119
+msgid "Search locales..."
+msgstr "Search locales..."
 
-#: panels/privacy/cc-privacy-panel.ui:1236
-msgid "_Automatic Problem Reporting"
-msgstr "_Automatic Problem Reporting"
+#: panels/region/cc-format-chooser.ui:160
+msgid "Common Formats"
+msgstr "Common Formats"
 
-#: panels/privacy/gnome-privacy-panel.desktop.in.in:3
-msgid "Privacy"
-msgstr "Privacy"
+#: panels/region/cc-format-chooser.ui:191
+msgid "All Formats"
+msgstr "All Formats"
 
-#: 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"
+#: panels/region/cc-format-chooser.ui:244
+msgid "No Search Results"
+msgstr "No Search Results"
 
-#. FIXME
-#. 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:133
-msgctxt "measurement format"
-msgid "Imperial"
-msgstr "Imperial"
-
-#: panels/region/cc-format-chooser.c:135
-msgctxt "measurement format"
-msgid "Metric"
-msgstr "Metric"
-
-#: panels/region/cc-format-chooser.c:314
-msgid "No regions found"
-msgstr "No regions found"
-
-#: panels/region/cc-format-chooser.ui:7
-msgid "Formats"
-msgstr "Formats"
+#: panels/region/cc-format-chooser.ui:257
+msgid "Searches can be for countries or languages."
+msgstr "Searches can be for countries or languages."
 
-#: panels/region/cc-format-chooser.ui:106
+#: panels/region/cc-format-chooser.ui:309
 msgid "Preview"
 msgstr "Preview"
 
-#: panels/region/cc-format-chooser.ui:123
+#: panels/region/cc-format-chooser.ui:324
 msgid "Dates"
 msgstr "Dates"
 
-#: panels/region/cc-format-chooser.ui:185
+#: panels/region/cc-format-chooser.ui:368
 msgid "Dates & Times"
 msgstr "Dates & Times"
 
-#: panels/region/cc-format-chooser.ui:216
+#: panels/region/cc-format-chooser.ui:390
 msgid "Numbers"
 msgstr "Numbers"
 
-#: panels/region/cc-format-chooser.ui:233
+#: panels/region/cc-format-chooser.ui:412
 msgid "Measurement"
 msgstr "Measurement"
 
-#: panels/region/cc-format-chooser.ui:250
+#: panels/region/cc-format-chooser.ui:434
 msgid "Paper"
 msgstr "Paper"
 
@@ -5621,7 +5594,7 @@ msgid "Login _Screen"
 msgstr "Login _Screen"
 
 #: panels/region/cc-region-panel.ui:64
-#: panels/user-accounts/cc-user-panel.ui:364
+#: panels/user-accounts/cc-user-panel.ui:313
 msgid "_Language"
 msgstr "_Language"
 
@@ -5633,85 +5606,258 @@ msgstr "Restart the session for changes to take effect"
 msgid "Restart…"
 msgstr "Restart…"
 
-#: panels/region/cc-region-panel.ui:147
-msgid "_Formats"
-msgstr "_Formats"
+#: panels/region/cc-region-panel.ui:147
+msgid "_Formats"
+msgstr "_Formats"
+
+#: panels/region/cc-region-panel.ui:195
+msgid "Input Sources"
+msgstr "Input Sources"
+
+#: panels/region/cc-region-panel.ui:209
+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/cc-region-panel.ui:337
+msgid "Input Source Options"
+msgstr "Input Source Options"
+
+#: panels/region/cc-region-panel.ui:352
+msgid "Use the _same source for all windows"
+msgstr "Use the _same source for all windows"
+
+#: panels/region/cc-region-panel.ui:370
+msgid "Allow _different sources for each window"
+msgstr "Allow _different sources for each window"
+
+#: panels/region/cc-region-panel.ui:412
+msgid "Previous source"
+msgstr "Previous source"
+
+#: panels/region/cc-region-panel.ui:430
+msgid "Super+Shift+Space"
+msgstr "Super+Shift+Space"
+
+#: panels/region/cc-region-panel.ui:445
+msgid "Next source"
+msgstr "Next source"
+
+#: panels/region/cc-region-panel.ui:463
+msgid "Super+Space"
+msgstr "Super+Space"
+
+#: panels/region/cc-region-panel.ui:478
+msgid "Left+Right Alt"
+msgstr "Left+Right Alt"
+
+#: panels/region/cc-region-panel.ui:494
+msgid "These keyboard shortcuts can be changed in the keyboard settings"
+msgstr "These keyboard shortcuts can be changed in the keyboard settings"
+
+#: panels/region/gnome-region-panel.desktop.in.in:3
+msgid "Region & Language"
+msgstr "Region & 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"
+
+#. 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/removable-media/cc-removable-media-panel.c:267
+msgid "Ask what to do"
+msgstr "Ask what to do"
+
+#: panels/removable-media/cc-removable-media-panel.c:271
+msgid "Do nothing"
+msgstr "Do nothing"
+
+#: panels/removable-media/cc-removable-media-panel.c:275
+msgid "Open folder"
+msgstr "Open folder"
+
+#: panels/removable-media/cc-removable-media-panel.c:341
+msgid "Other Media"
+msgstr "Other Media"
+
+#: panels/removable-media/cc-removable-media-panel.c:362
+msgid "Select an application for audio CDs"
+msgstr "Select an application for audio CDs"
+
+#: panels/removable-media/cc-removable-media-panel.c:363
+msgid "Select an application for video DVDs"
+msgstr "Select an application for video DVDs"
+
+#: panels/removable-media/cc-removable-media-panel.c:364
+msgid "Select an application to run when a music player is connected"
+msgstr "Select an application to run when a music player is connected"
+
+#: panels/removable-media/cc-removable-media-panel.c:365
+msgid "Select an application to run when a camera is connected"
+msgstr "Select an application to run when a camera is connected"
+
+#: panels/removable-media/cc-removable-media-panel.c:366
+msgid "Select an application for software CDs"
+msgstr "Select an application for software CDs"
+
+#. translators: these strings are duplicates of shared-mime-info
+#. * strings, just here to fix capitalization of the English originals.
+#. * If the shared-mime-info translation works for your language,
+#. * simply leave these untranslated.
+#.
+#: panels/removable-media/cc-removable-media-panel.c:378
+msgid "audio DVD"
+msgstr "audio DVD"
+
+#: panels/removable-media/cc-removable-media-panel.c:379
+msgid "blank Blu-ray disc"
+msgstr "blank Blu-ray disc"
+
+#: panels/removable-media/cc-removable-media-panel.c:380
+msgid "blank CD disc"
+msgstr "blank CD disc"
+
+#: panels/removable-media/cc-removable-media-panel.c:381
+msgid "blank DVD disc"
+msgstr "blank DVD disc"
+
+#: panels/removable-media/cc-removable-media-panel.c:382
+msgid "blank HD DVD disc"
+msgstr "blank HD DVD disc"
+
+#: panels/removable-media/cc-removable-media-panel.c:383
+msgid "Blu-ray video disc"
+msgstr "Blu-ray video disc"
+
+#: panels/removable-media/cc-removable-media-panel.c:384
+msgid "e-book reader"
+msgstr "e-book reader"
+
+#: panels/removable-media/cc-removable-media-panel.c:385
+msgid "HD DVD video disc"
+msgstr "HD DVD video disc"
+
+#: panels/removable-media/cc-removable-media-panel.c:386
+msgid "Picture CD"
+msgstr "Picture CD"
 
-#: panels/region/cc-region-panel.ui:195
-msgid "Input Sources"
-msgstr "Input Sources"
+#: panels/removable-media/cc-removable-media-panel.c:387
+msgid "Super Video CD"
+msgstr "Super Video CD"
 
-#: panels/region/cc-region-panel.ui:209
-msgid "Choose keyboard layouts or input methods."
-msgstr "Choose keyboard layouts or input methods."
+#: panels/removable-media/cc-removable-media-panel.c:388
+msgid "Video CD"
+msgstr "Video CD"
 
-#: panels/region/cc-region-panel.ui:266
-msgid "No input source selected"
-msgstr "No input source selected"
+#: panels/removable-media/cc-removable-media-panel.c:389
+msgid "Windows software"
+msgstr "Windows software"
 
-#: 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/removable-media/cc-removable-media-panel.ui:44
+msgid "Select how media should be handled"
+msgstr "Select how media should be handled"
 
-#: panels/region/cc-region-panel.ui:337
-msgid "Input Source Options"
-msgstr "Input Source Options"
+#: panels/removable-media/cc-removable-media-panel.ui:75
+msgid "CD _audio"
+msgstr "CD _audio"
 
-#: panels/region/cc-region-panel.ui:352
-msgid "Use the _same source for all windows"
-msgstr "Use the _same source for all windows"
+#: panels/removable-media/cc-removable-media-panel.ui:92
+msgid "_DVD video"
+msgstr "_DVD video"
 
-#: panels/region/cc-region-panel.ui:370
-msgid "Allow _different sources for each window"
-msgstr "Allow _different sources for each window"
+#: panels/removable-media/cc-removable-media-panel.ui:133
+msgid "_Music player"
+msgstr "_Music player"
 
-#: panels/region/cc-region-panel.ui:412
-msgid "Previous source"
-msgstr "Previous source"
+#: panels/removable-media/cc-removable-media-panel.ui:191
+msgid "_Software"
+msgstr "_Software"
 
-#: panels/region/cc-region-panel.ui:430
-msgid "Super+Shift+Space"
-msgstr "Super+Shift+Space"
+#: panels/removable-media/cc-removable-media-panel.ui:229
+msgid "_Other Media…"
+msgstr "_Other Media…"
 
-#: panels/region/cc-region-panel.ui:445
-msgid "Next source"
-msgstr "Next source"
+#: panels/removable-media/cc-removable-media-panel.ui:288
+msgid "_Never prompt or start programs on media insertion"
+msgstr "_Never prompt or start programs on media insertion"
 
-#: panels/region/cc-region-panel.ui:463
-msgid "Super+Space"
-msgstr "Super+Space"
+#: panels/removable-media/cc-removable-media-panel.ui:342
+msgid "Select how other media should be handled"
+msgstr "Select how other media should be handled"
 
-#: panels/region/cc-region-panel.ui:478
-msgid "Left+Right Alt"
-msgstr "Left+Right Alt"
+#: panels/removable-media/cc-removable-media-panel.ui:389
+msgid "_Action:"
+msgstr "_Action:"
 
-#: panels/region/cc-region-panel.ui:494
-msgid "These keyboard shortcuts can be changed in the keyboard settings"
-msgstr "These keyboard shortcuts can be changed in the keyboard settings"
+#: panels/removable-media/cc-removable-media-panel.ui:412
+msgid "_Type:"
+msgstr "_Type:"
 
-#: panels/region/gnome-region-panel.desktop.in.in:3
-msgid "Region & Language"
-msgstr "Region & Language"
+#: panels/removable-media/gnome-removable-media-panel.desktop.in.in:3
+msgid "Removable Media"
+msgstr "Removable Media"
 
-#: panels/region/gnome-region-panel.desktop.in.in:4
+#: panels/removable-media/gnome-removable-media-panel.desktop.in.in:4
+msgid "Configure Removable Media settings"
+msgstr "Configure Removable Media settings"
+
+#. Translators: Search terms to find the Removable Media panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
+#: panels/removable-media/gnome-removable-media-panel.desktop.in.in:19
 msgid ""
-"Select your display language, formats, keyboard layouts and input sources"
+"device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;"
+"removable;media;autorun;"
 msgstr ""
-"Select your display language, formats, keyboard layouts and input sources"
-
-#. 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;"
+"device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;"
+"removable;media;autorun;"
 
-#: panels/search/cc-search-locations-dialog.c:610
+#: panels/search/cc-search-locations-dialog.c:635
 msgid "Select Location"
 msgstr "Select Location"
 
-#: panels/search/cc-search-locations-dialog.c:614
+#: panels/search/cc-search-locations-dialog.c:639
 msgid "_OK"
 msgstr "_OK"
 
+#: panels/search/cc-search-locations-dialog.ui:9
+#: panels/search/cc-search-panel.ui:61
+msgid "Search Locations"
+msgstr "Search Locations"
+
+#: panels/search/cc-search-locations-dialog.ui:32
+#: panels/search/cc-search-locations-dialog.ui:69
+#: panels/search/cc-search-locations-dialog.ui:107
+msgid ""
+"Folders which are searched by system applications, such as Files, Photos and "
+"Videos."
+msgstr ""
+"Folders which are searched by system applications, such as Files, Photos and "
+"Videos."
+
+#: panels/search/cc-search-locations-dialog.ui:52
+msgid "Places"
+msgstr "Places"
+
+#: panels/search/cc-search-locations-dialog.ui:91
+msgid "Bookmarks"
+msgstr "Bookmarks"
+
+#: panels/search/cc-search-locations-dialog.ui:156
+msgid "Other"
+msgstr "Other"
+
 #: panels/search/cc-search-panel.c:153
 msgid "No applications found"
 msgstr "No applications found"
@@ -5724,7 +5870,7 @@ msgstr "Move Up"
 msgid "Move Down"
 msgstr "Move Down"
 
-#: panels/search/cc-search-panel.ui:32
+#: panels/search/cc-search-panel.ui:33
 msgid ""
 "Control which search results are shown in the Activities Overview. The order "
 "of search results can also be changed by moving rows in the list."
@@ -5732,11 +5878,6 @@ msgstr ""
 "Control which search results are shown in the Activities Overview. The order "
 "of search results can also be changed by moving rows in the list."
 
-#: panels/search/cc-search-panel.ui:60
-#: panels/search/search-locations-dialog.ui:9
-msgid "Search Locations"
-msgstr "Search Locations"
-
 #: panels/search/gnome-search-panel.desktop.in.in:4
 msgid ""
 "Control which applications show search results in the Activities Overview"
@@ -5748,33 +5889,15 @@ msgstr ""
 msgid "Search;Find;Index;Hide;Privacy;Results;"
 msgstr "Search;Find;Index;Hide;Privacy;Results;"
 
-#: panels/search/search-locations-dialog.ui:32
-#: panels/search/search-locations-dialog.ui:69
-#: panels/search/search-locations-dialog.ui:107
-msgid ""
-"Folders which are searched by system applications, such as Files, Photos and "
-"Videos."
-msgstr ""
-"Folders which are searched by system applications, such as Files, Photos and "
-"Videos."
-
-#: panels/search/search-locations-dialog.ui:52
-msgid "Places"
-msgstr "Places"
-
-#: panels/search/search-locations-dialog.ui:91
-msgid "Bookmarks"
-msgstr "Bookmarks"
-
-#: panels/search/search-locations-dialog.ui:156
-msgid "Other"
-msgstr "Other"
-
 #. Label
 #: panels/sharing/cc-sharing-networks.c:307
 msgid "No networks selected for sharing"
 msgstr "No networks selected for sharing"
 
+#: panels/sharing/cc-sharing-networks.ui:19
+msgid "Networks"
+msgstr "Networks"
+
 #: panels/sharing/cc-sharing-panel.c:320
 msgctxt "service is enabled"
 msgid "On"
@@ -5799,40 +5922,43 @@ msgstr "Active"
 msgid "Choose a Folder"
 msgstr "Choose a Folder"
 
-#: panels/sharing/cc-sharing-panel.c:725
+#. TRANSLATORS: %s is replaced with a link to a dav://<hostname> URL
+#: panels/sharing/cc-sharing-panel.c:729
 #, c-format
 msgid ""
 "File Sharing allows you to share your Public folder with others on your "
-"current network using: <a href=\"dav://%s\">dav://%s</a>"
+"current network using: %s"
 msgstr ""
 "File Sharing allows you to share your Public folder with others on your "
-"current network using: <a href=\"dav://%s\">dav://%s</a>"
+"current network using: %s"
 
-#: panels/sharing/cc-sharing-panel.c:727
+#. TRANSLATORS: %s is replaced with a link to a "ssh <hostname>" command to run
+#: panels/sharing/cc-sharing-panel.c:735
 #, c-format
 msgid ""
 "When remote login is enabled, remote users can connect using the Secure "
 "Shell command:\n"
-"<a href=\"ssh %s\">ssh %s</a>"
+"%s"
 msgstr ""
 "When remote login is enabled, remote users can connect using the Secure "
 "Shell command:\n"
-"<a href=\"ssh %s\">ssh %s</a>"
+"%s"
 
-#: panels/sharing/cc-sharing-panel.c:729
+#. TRANSLATORS: %s is replaced with a link to a vnc://<hostname> URL
+#: panels/sharing/cc-sharing-panel.c:741
 #, c-format
 msgid ""
 "Screen sharing allows remote users to view or control your screen by "
-"connecting to <a href=\"vnc://%s\">vnc://%s</a>"
+"connecting to %s"
 msgstr ""
 "Screen sharing allows remote users to view or control your screen by "
-"connecting to <a href=\"vnc://%s\">vnc://%s</a>"
+"connecting to %s"
 
-#: panels/sharing/cc-sharing-panel.c:833
+#: panels/sharing/cc-sharing-panel.c:846
 msgid "Copy"
 msgstr "Copy"
 
-#: panels/sharing/cc-sharing-panel.c:1286
+#: panels/sharing/cc-sharing-panel.c:1299
 #: panels/sharing/gnome-sharing-panel.desktop.in.in:3
 msgid "Sharing"
 msgstr "Sharing"
@@ -5930,10 +6056,6 @@ 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"
@@ -6031,7 +6153,7 @@ msgstr "Volume"
 msgid "Alert Sound"
 msgstr "Alert Sound"
 
-#: panels/sound/cc-volume-slider.c:63
+#: panels/sound/cc-volume-slider.c:115
 msgctxt "volume"
 msgid "100%"
 msgstr "100%"
@@ -6226,32 +6348,32 @@ msgstr "Thunderbolt;"
 
 #. translators: the labels will read:
 #. * Cursor Size: Default
-#: panels/universal-access/cc-ua-panel.c:497
+#: panels/universal-access/cc-ua-panel.c:500
 msgctxt "cursor size"
 msgid "Default"
 msgstr "Default"
 
-#: panels/universal-access/cc-ua-panel.c:500
+#: panels/universal-access/cc-ua-panel.c:503
 msgctxt "cursor size"
 msgid "Medium"
 msgstr "Medium"
 
-#: panels/universal-access/cc-ua-panel.c:503
+#: panels/universal-access/cc-ua-panel.c:506
 msgctxt "cursor size"
 msgid "Large"
 msgstr "Large"
 
-#: panels/universal-access/cc-ua-panel.c:506
+#: panels/universal-access/cc-ua-panel.c:509
 msgctxt "cursor size"
 msgid "Larger"
 msgstr "Larger"
 
-#: panels/universal-access/cc-ua-panel.c:509
+#: panels/universal-access/cc-ua-panel.c:512
 msgctxt "cursor size"
 msgid "Largest"
 msgstr "Largest"
 
-#: panels/universal-access/cc-ua-panel.c:513
+#: panels/universal-access/cc-ua-panel.c:516
 #, c-format
 msgid "%d pixel"
 msgid_plural "%d pixels"
@@ -6288,7 +6410,7 @@ msgid "Screen _Reader"
 msgstr "Screen _Reader"
 
 #: panels/universal-access/cc-ua-panel.ui:397
-#: panels/universal-access/cc-ua-panel.ui:1231
+#: panels/universal-access/cc-ua-panel.ui:1263
 msgid "_Sound Keys"
 msgstr "_Sound Keys"
 
@@ -6297,7 +6419,7 @@ msgid "Hearing"
 msgstr "Hearing"
 
 #: panels/universal-access/cc-ua-panel.ui:503
-#: panels/universal-access/cc-ua-panel.ui:1334
+#: panels/universal-access/cc-ua-panel.ui:1366
 msgid "_Visual Alerts"
 msgstr "_Visual Alerts"
 
@@ -6326,249 +6448,253 @@ msgid "_Mouse Keys"
 msgstr "_Mouse Keys"
 
 #: panels/universal-access/cc-ua-panel.ui:900
+msgid "_Locate Pointer"
+msgstr "_Locate Pointer"
+
+#: panels/universal-access/cc-ua-panel.ui:932
 msgid "_Click Assist"
 msgstr "_Click Assist"
 
-#: panels/universal-access/cc-ua-panel.ui:946
+#: panels/universal-access/cc-ua-panel.ui:978
 msgid "_Double-Click Delay"
 msgstr "_Double-Click Delay"
 
-#: panels/universal-access/cc-ua-panel.ui:966
+#: panels/universal-access/cc-ua-panel.ui:998
 msgid "Double-Click Delay"
 msgstr "Double-Click Delay"
 
-#: panels/universal-access/cc-ua-panel.ui:1036
+#: panels/universal-access/cc-ua-panel.ui:1068
 msgid "Cursor Size"
 msgstr "Cursor Size"
 
-#: panels/universal-access/cc-ua-panel.ui:1063
+#: panels/universal-access/cc-ua-panel.ui:1095
 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/cc-ua-panel.ui:1099
+#: panels/universal-access/cc-ua-panel.ui:1131
 msgid "Screen Reader"
 msgstr "Screen Reader"
 
-#: panels/universal-access/cc-ua-panel.ui:1116
+#: panels/universal-access/cc-ua-panel.ui:1148
 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/cc-ua-panel.ui:1149
+#: panels/universal-access/cc-ua-panel.ui:1181
 msgid "_Screen Reader"
 msgstr "_Screen Reader"
 
-#: panels/universal-access/cc-ua-panel.ui:1188
+#: panels/universal-access/cc-ua-panel.ui:1220
 msgid "Sound Keys"
 msgstr "Sound Keys"
 
-#: panels/universal-access/cc-ua-panel.ui:1206
+#: panels/universal-access/cc-ua-panel.ui:1238
 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/cc-ua-panel.ui:1276
+#: panels/universal-access/cc-ua-panel.ui:1308
 msgid "Visual Alerts"
 msgstr "Visual Alerts"
 
-#: panels/universal-access/cc-ua-panel.ui:1280
+#: panels/universal-access/cc-ua-panel.ui:1312
 msgid "_Test flash"
 msgstr "_Test flash"
 
-#: panels/universal-access/cc-ua-panel.ui:1309
+#: panels/universal-access/cc-ua-panel.ui:1341
 msgid "Use a visual indication when an alert sound occurs."
 msgstr "Use a visual indication when an alert sound occurs."
 
-#: panels/universal-access/cc-ua-panel.ui:1360
-msgid "Flash the _window title"
-msgstr "Flash the _window title"
+#: panels/universal-access/cc-ua-panel.ui:1392
+msgid "Flash the entire _window"
+msgstr "Flash the entire _window"
 
-#: panels/universal-access/cc-ua-panel.ui:1378
+#: panels/universal-access/cc-ua-panel.ui:1410
 msgid "Flash the entire _screen"
 msgstr "Flash the entire _screen"
 
-#: panels/universal-access/cc-ua-panel.ui:1423
+#: panels/universal-access/cc-ua-panel.ui:1455
 msgid "Repeat Keys"
 msgstr "Repeat Keys"
 
-#: panels/universal-access/cc-ua-panel.ui:1453
+#: panels/universal-access/cc-ua-panel.ui:1485
 msgid "Key presses repeat when key is held down."
 msgstr "Key presses repeat when key is held down."
 
-#: panels/universal-access/cc-ua-panel.ui:1533
+#: panels/universal-access/cc-ua-panel.ui:1565
 msgid "Repeat keys delay"
 msgstr "Repeat keys delay"
 
-#: panels/universal-access/cc-ua-panel.ui:1581
-#: panels/universal-access/cc-ua-panel.ui:1716
+#: panels/universal-access/cc-ua-panel.ui:1613
+#: panels/universal-access/cc-ua-panel.ui:1748
 msgid "Speed"
 msgstr "Speed"
 
-#: panels/universal-access/cc-ua-panel.ui:1620
+#: panels/universal-access/cc-ua-panel.ui:1652
 msgid "Repeat keys speed"
 msgstr "Repeat keys speed"
 
-#: panels/universal-access/cc-ua-panel.ui:1644
+#: panels/universal-access/cc-ua-panel.ui:1676
 msgid "Cursor Blinking"
 msgstr "Cursor Blinking"
 
-#: panels/universal-access/cc-ua-panel.ui:1674
+#: panels/universal-access/cc-ua-panel.ui:1706
 msgid "Cursor blinks in text fields."
 msgstr "Cursor blinks in text fields."
 
-#: panels/universal-access/cc-ua-panel.ui:1753
+#: panels/universal-access/cc-ua-panel.ui:1785
 msgid "Cursor blinking speed"
 msgstr "Cursor blinking speed"
 
-#: panels/universal-access/cc-ua-panel.ui:1789
+#: panels/universal-access/cc-ua-panel.ui:1821
 msgid "Typing Assist"
 msgstr "Typing Assist"
 
-#: panels/universal-access/cc-ua-panel.ui:1828
+#: panels/universal-access/cc-ua-panel.ui:1860
 msgid "_Sticky Keys"
 msgstr "_Sticky Keys"
 
-#: panels/universal-access/cc-ua-panel.ui:1845
+#: panels/universal-access/cc-ua-panel.ui:1877
 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/cc-ua-panel.ui:1869
+#: panels/universal-access/cc-ua-panel.ui:1901
 msgid "_Disable if two keys are pressed together"
 msgstr "_Disable if two keys are pressed together"
 
-#: panels/universal-access/cc-ua-panel.ui:1887
+#: panels/universal-access/cc-ua-panel.ui:1919
 msgid "Beep when a _modifier key is pressed"
 msgstr "Beep when a _modifier key is pressed"
 
-#: panels/universal-access/cc-ua-panel.ui:1935
+#: panels/universal-access/cc-ua-panel.ui:1967
 msgid "S_low Keys"
 msgstr "S_low Keys"
 
-#: panels/universal-access/cc-ua-panel.ui:1952
+#: panels/universal-access/cc-ua-panel.ui:1984
 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/cc-ua-panel.ui:1985
-#: panels/universal-access/cc-ua-panel.ui:2198
-#: panels/universal-access/cc-ua-panel.ui:2535
+#: panels/universal-access/cc-ua-panel.ui:2017
+#: panels/universal-access/cc-ua-panel.ui:2230
+#: panels/universal-access/cc-ua-panel.ui:2567
 msgid "A_cceptance delay:"
 msgstr "A_cceptance delay:"
 
-#: panels/universal-access/cc-ua-panel.ui:2007
+#: panels/universal-access/cc-ua-panel.ui:2039
 msgctxt "slow keys delay"
 msgid "Short"
 msgstr "Short"
 
-#: panels/universal-access/cc-ua-panel.ui:2026
+#: panels/universal-access/cc-ua-panel.ui:2058
 msgid "Slow keys typing delay"
 msgstr "Slow keys typing delay"
 
-#: panels/universal-access/cc-ua-panel.ui:2041
+#: panels/universal-access/cc-ua-panel.ui:2073
 msgctxt "slow keys delay"
 msgid "Long"
 msgstr "Long"
 
-#: panels/universal-access/cc-ua-panel.ui:2068
+#: panels/universal-access/cc-ua-panel.ui:2100
 msgid "Beep when a key is pr_essed"
 msgstr "Beep when a key is pr_essed"
 
-#: panels/universal-access/cc-ua-panel.ui:2085
+#: panels/universal-access/cc-ua-panel.ui:2117
 msgid "Beep when a key is _accepted"
 msgstr "Beep when a key is _accepted"
 
-#: panels/universal-access/cc-ua-panel.ui:2102
-#: panels/universal-access/cc-ua-panel.ui:2281
+#: panels/universal-access/cc-ua-panel.ui:2134
+#: panels/universal-access/cc-ua-panel.ui:2313
 msgid "Beep when a key is _rejected"
 msgstr "Beep when a key is _rejected"
 
-#: panels/universal-access/cc-ua-panel.ui:2148
+#: panels/universal-access/cc-ua-panel.ui:2180
 msgid "_Bounce Keys"
 msgstr "_Bounce Keys"
 
-#: panels/universal-access/cc-ua-panel.ui:2165
+#: panels/universal-access/cc-ua-panel.ui:2197
 msgid "Ignores fast duplicate keypresses"
 msgstr "Ignores fast duplicate keypresses"
 
-#: panels/universal-access/cc-ua-panel.ui:2220
+#: panels/universal-access/cc-ua-panel.ui:2252
 msgctxt "bounce keys delay"
 msgid "Short"
 msgstr "Short"
 
-#: panels/universal-access/cc-ua-panel.ui:2239
+#: panels/universal-access/cc-ua-panel.ui:2271
 msgid "Bounce keys typing delay"
 msgstr "Bounce keys typing delay"
 
-#: panels/universal-access/cc-ua-panel.ui:2254
+#: panels/universal-access/cc-ua-panel.ui:2286
 msgctxt "bounce keys delay"
 msgid "Long"
 msgstr "Long"
 
-#: panels/universal-access/cc-ua-panel.ui:2367
+#: panels/universal-access/cc-ua-panel.ui:2399
 msgid "_Enable by Keyboard"
 msgstr "_Enable by Keyboard"
 
-#: panels/universal-access/cc-ua-panel.ui:2384
+#: panels/universal-access/cc-ua-panel.ui:2416
 msgid "Turn accessibility features on and off using the keyboard"
 msgstr "Turn accessibility features on and off using the keyboard"
 
-#: panels/universal-access/cc-ua-panel.ui:2448
+#: panels/universal-access/cc-ua-panel.ui:2480
 msgid "Click Assist"
 msgstr "Click Assist"
 
-#: panels/universal-access/cc-ua-panel.ui:2484
+#: panels/universal-access/cc-ua-panel.ui:2516
 msgid "_Simulated Secondary Click"
 msgstr "_Simulated Secondary Click"
 
-#: panels/universal-access/cc-ua-panel.ui:2502
+#: panels/universal-access/cc-ua-panel.ui:2534
 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/cc-ua-panel.ui:2556
+#: panels/universal-access/cc-ua-panel.ui:2588
 msgctxt "secondary click"
 msgid "Short"
 msgstr "Short"
 
-#: panels/universal-access/cc-ua-panel.ui:2575
+#: panels/universal-access/cc-ua-panel.ui:2607
 msgid "Secondary click delay"
 msgstr "Secondary click delay"
 
-#: panels/universal-access/cc-ua-panel.ui:2590
+#: panels/universal-access/cc-ua-panel.ui:2622
 msgctxt "secondary click delay"
 msgid "Long"
 msgstr "Long"
 
-#: panels/universal-access/cc-ua-panel.ui:2647
+#: panels/universal-access/cc-ua-panel.ui:2679
 msgid "_Hover Click"
 msgstr "_Hover Click"
 
-#: panels/universal-access/cc-ua-panel.ui:2665
+#: panels/universal-access/cc-ua-panel.ui:2697
 msgid "Trigger a click when the pointer hovers"
 msgstr "Trigger a click when the pointer hovers"
 
-#: panels/universal-access/cc-ua-panel.ui:2698
+#: panels/universal-access/cc-ua-panel.ui:2730
 msgid "D_elay:"
 msgstr "D_elay:"
 
-#: panels/universal-access/cc-ua-panel.ui:2720
+#: panels/universal-access/cc-ua-panel.ui:2752
 msgctxt "dwell click delay"
 msgid "Short"
 msgstr "Short"
 
-#: panels/universal-access/cc-ua-panel.ui:2751
+#: panels/universal-access/cc-ua-panel.ui:2783
 msgctxt "dwell click delay"
 msgid "Long"
 msgstr "Long"
 
-#: panels/universal-access/cc-ua-panel.ui:2787
+#: panels/universal-access/cc-ua-panel.ui:2819
 msgid "Motion _threshold:"
 msgstr "Motion _threshold:"
 
-#: panels/universal-access/cc-ua-panel.ui:2809
+#: panels/universal-access/cc-ua-panel.ui:2841
 msgctxt "dwell click threshold"
 msgid "Small"
 msgstr "Small"
 
-#: panels/universal-access/cc-ua-panel.ui:2840
+#: panels/universal-access/cc-ua-panel.ui:2872
 msgctxt "dwell click threshold"
 msgid "Large"
 msgstr "Large"
@@ -6726,44 +6852,220 @@ msgctxt "universal access, contrast"
 msgid "Co_lor"
 msgstr "Co_lour"
 
-#: panels/universal-access/zoom-options.ui:911
-msgctxt "universal access, color"
-msgid "None"
-msgstr "None"
+#: panels/universal-access/zoom-options.ui:911
+msgctxt "universal access, color"
+msgid "None"
+msgstr "None"
+
+#: panels/universal-access/zoom-options.ui:943
+msgctxt "universal access, color"
+msgid "Full"
+msgstr "Full"
+
+#: panels/universal-access/zoom-options.ui:1006
+msgctxt "universal access, brightness"
+msgid "Low"
+msgstr "Low"
+
+#: panels/universal-access/zoom-options.ui:1039
+msgctxt "universal access, brightness"
+msgid "High"
+msgstr "High"
+
+#: panels/universal-access/zoom-options.ui:1070
+msgctxt "universal access, contrast"
+msgid "Low"
+msgstr "Low"
+
+#: panels/universal-access/zoom-options.ui:1103
+msgctxt "universal access, contrast"
+msgid "High"
+msgstr "High"
+
+#: panels/universal-access/zoom-options.ui:1139
+msgid "Color Effects:"
+msgstr "Colour Effects:"
+
+#: panels/universal-access/zoom-options.ui:1164
+msgid "Color Effects"
+msgstr "Colour Effects"
+
+#: panels/usage/cc-usage-panel.c:155
+msgid "Empty all items from Trash?"
+msgstr "Empty all items from Wastebasket?"
+
+#: panels/usage/cc-usage-panel.c:156
+msgid "All items in the Trash will be permanently deleted."
+msgstr "All items in the Wastebasket will be permanently deleted."
+
+#: panels/usage/cc-usage-panel.c:157
+msgid "_Empty Trash"
+msgstr "_Empty Wastebasket"
+
+#: panels/usage/cc-usage-panel.c:178
+msgid "Delete all the temporary files?"
+msgstr "Delete all the temporary files?"
+
+#: panels/usage/cc-usage-panel.c:179
+msgid "All the temporary files will be permanently deleted."
+msgstr "All the temporary files will be permanently deleted."
+
+#: panels/usage/cc-usage-panel.c:180
+msgid "_Purge Temporary Files"
+msgstr "_Purge Temporary Files"
+
+#: panels/usage/cc-usage-panel.ui:31
+msgid "File History"
+msgstr "File History"
+
+#: panels/usage/cc-usage-panel.ui:43
+msgid ""
+"File history keeps a record of files that you have used. This information is "
+"shared between applications, and makes it easier to find files that you "
+"might want to use."
+msgstr ""
+"File history keeps a record of files that you have used. This information is "
+"shared between applications, and makes it easier to find files that you "
+"might want to use."
+
+#: panels/usage/cc-usage-panel.ui:58
+msgid "File H_istory"
+msgstr "File H_istory"
+
+#: panels/usage/cc-usage-panel.ui:80
+msgid "File _History Duration"
+msgstr "File _History Duration"
+
+#: panels/usage/cc-usage-panel.ui:121
+msgid "_Clear History…"
+msgstr "_Clear History…"
+
+#: panels/usage/cc-usage-panel.ui:137
+msgid "Trash & Temporary Files"
+msgstr "Wastebasket & Temporary Files"
+
+#: panels/usage/cc-usage-panel.ui:147
+msgid ""
+"Trash and temporary files can sometimes include personal or sensitive "
+"information. Automatically deleting them can help to protect privacy."
+msgstr ""
+"The Wastebasket and temporary files can sometimes include personal or "
+"sensitive information. Automatically deleting them can help to protect "
+"privacy."
+
+#: panels/usage/cc-usage-panel.ui:161
+msgid "Automatically Delete _Trash Content"
+msgstr "Automatically Empty _Wastebasket"
+
+#: panels/usage/cc-usage-panel.ui:176
+msgid "Automatically Delete Temporary _Files"
+msgstr "Automatically Delete Temporary _Files"
+
+#: panels/usage/cc-usage-panel.ui:198
+msgid "Automatically Delete _Period"
+msgstr "Automatically Empty _Wastebasket"
+
+#: panels/usage/cc-usage-panel.ui:240
+msgid "_Empty Trash…"
+msgstr "_Empty Wastebasket…"
+
+#: panels/usage/cc-usage-panel.ui:252
+msgid "_Delete Temporary Files…"
+msgstr "_Delete Temporary Files…"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:280
+msgctxt "purge_files"
+msgid "1 hour"
+msgstr "1 hour"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:284
+msgctxt "purge_files"
+msgid "1 day"
+msgstr "1 day"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:288
+msgctxt "purge_files"
+msgid "2 days"
+msgstr "2 days"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:292
+msgctxt "purge_files"
+msgid "3 days"
+msgstr "3 days"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:296
+msgctxt "purge_files"
+msgid "4 days"
+msgstr "4 days"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:300
+msgctxt "purge_files"
+msgid "5 days"
+msgstr "5 days"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:304
+msgctxt "purge_files"
+msgid "6 days"
+msgstr "6 days"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:308
+msgctxt "purge_files"
+msgid "7 days"
+msgstr "7 days"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:312
+msgctxt "purge_files"
+msgid "14 days"
+msgstr "14 days"
 
-#: panels/universal-access/zoom-options.ui:943
-msgctxt "universal access, color"
-msgid "Full"
-msgstr "Full"
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:316
+msgctxt "purge_files"
+msgid "30 days"
+msgstr "30 days"
 
-#: panels/universal-access/zoom-options.ui:1006
-msgctxt "universal access, brightness"
-msgid "Low"
-msgstr "Low"
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/usage/cc-usage-panel.ui:331
+msgctxt "retain_history"
+msgid "1 day"
+msgstr "1 day"
 
-#: panels/universal-access/zoom-options.ui:1039
-msgctxt "universal access, brightness"
-msgid "High"
-msgstr "High"
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/usage/cc-usage-panel.ui:335
+msgctxt "retain_history"
+msgid "7 days"
+msgstr "7 days"
 
-#: panels/universal-access/zoom-options.ui:1070
-msgctxt "universal access, contrast"
-msgid "Low"
-msgstr "Low"
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/usage/cc-usage-panel.ui:339
+msgctxt "retain_history"
+msgid "30 days"
+msgstr "30 days"
 
-#: panels/universal-access/zoom-options.ui:1103
-msgctxt "universal access, contrast"
-msgid "High"
-msgstr "High"
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/usage/cc-usage-panel.ui:343
+msgctxt "retain_history"
+msgid "Forever"
+msgstr "Forever"
 
-#: panels/universal-access/zoom-options.ui:1139
-msgid "Color Effects:"
-msgstr "Colour Effects:"
+#: panels/usage/gnome-usage-panel.desktop.in.in:3
+msgid "File History & Trash"
+msgstr "File History & Wastebasket"
 
-#: panels/universal-access/zoom-options.ui:1164
-msgid "Color Effects"
-msgstr "Colour Effects"
+#: panels/usage/gnome-usage-panel.desktop.in.in:4
+msgid "Don't leave traces"
+msgstr "Don't leave traces"
 
+#. FIXME
 #: 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."
@@ -6825,17 +7127,14 @@ msgid "_Full Name"
 msgstr "_Full Name"
 
 #: panels/user-accounts/cc-add-user-dialog.ui:206
-#: panels/user-accounts/cc-user-panel.ui:153
 msgid "Standard"
 msgstr "Standard"
 
 #: panels/user-accounts/cc-add-user-dialog.ui:216
-#: panels/user-accounts/cc-user-panel.ui:163
 msgid "Administrator"
 msgstr "Administrator"
 
 #: panels/user-accounts/cc-add-user-dialog.ui:232
-#: panels/user-accounts/cc-user-panel.ui:181
 msgid "Account _Type"
 msgstr "Account _Type"
 
@@ -6922,7 +7221,7 @@ 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:771
+#: panels/user-accounts/cc-user-panel.c:767
 msgctxt "login date-time"
 msgid "%k:%M"
 msgstr "%k:%M"
@@ -6930,7 +7229,7 @@ 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:775
+#: panels/user-accounts/cc-user-panel.c:771
 #, c-format
 msgctxt "login date-time"
 msgid "%s, %s"
@@ -7014,30 +7313,30 @@ msgstr "Invalid password, please try again"
 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:214
+#: panels/user-accounts/cc-user-panel.c:210
 msgid "Your account"
 msgstr "Your account"
 
-#: panels/user-accounts/cc-user-panel.c:389
+#: panels/user-accounts/cc-user-panel.c:385
 msgid "Failed to delete user"
 msgstr "Failed to delete user"
 
-#: panels/user-accounts/cc-user-panel.c:447
-#: panels/user-accounts/cc-user-panel.c:506
-#: panels/user-accounts/cc-user-panel.c:558
+#: panels/user-accounts/cc-user-panel.c:443
+#: panels/user-accounts/cc-user-panel.c:502
+#: panels/user-accounts/cc-user-panel.c:554
 msgid "Failed to revoke remotely managed user"
 msgstr "Failed to revoke remotely managed user"
 
-#: panels/user-accounts/cc-user-panel.c:610
+#: panels/user-accounts/cc-user-panel.c:606
 msgid "You cannot delete your own account."
 msgstr "You cannot delete your own account."
 
-#: panels/user-accounts/cc-user-panel.c:619
+#: panels/user-accounts/cc-user-panel.c:615
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s is still logged in"
 
-#: panels/user-accounts/cc-user-panel.c:623
+#: panels/user-accounts/cc-user-panel.c:619
 msgid ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
@@ -7045,12 +7344,12 @@ msgstr ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
 
-#: panels/user-accounts/cc-user-panel.c:632
+#: panels/user-accounts/cc-user-panel.c:628
 #, 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:636
+#: panels/user-accounts/cc-user-panel.c:632
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
@@ -7058,47 +7357,47 @@ 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:639
+#: panels/user-accounts/cc-user-panel.c:635
 msgid "_Delete Files"
 msgstr "_Delete Files"
 
-#: panels/user-accounts/cc-user-panel.c:640
+#: panels/user-accounts/cc-user-panel.c:636
 msgid "_Keep Files"
 msgstr "_Keep Files"
 
-#: panels/user-accounts/cc-user-panel.c:654
+#: panels/user-accounts/cc-user-panel.c:650
 #, 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:658
+#: panels/user-accounts/cc-user-panel.c:654
 msgid "_Delete"
 msgstr "_Delete"
 
-#: panels/user-accounts/cc-user-panel.c:708
+#: panels/user-accounts/cc-user-panel.c:704
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "Account disabled"
 
-#: panels/user-accounts/cc-user-panel.c:716
+#: panels/user-accounts/cc-user-panel.c:712
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "To be set at next login"
 
-#: panels/user-accounts/cc-user-panel.c:719
+#: panels/user-accounts/cc-user-panel.c:715
 msgctxt "Password mode"
 msgid "None"
 msgstr "None"
 
-#: panels/user-accounts/cc-user-panel.c:764
+#: panels/user-accounts/cc-user-panel.c:760
 msgid "Logged in"
 msgstr "Logged in"
 
-#: panels/user-accounts/cc-user-panel.c:1098
+#: panels/user-accounts/cc-user-panel.c:1138
 msgid "Failed to contact the accounts service"
 msgstr "Failed to contact the accounts service"
 
-#: panels/user-accounts/cc-user-panel.c:1100
+#: panels/user-accounts/cc-user-panel.c:1140
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "Please make sure that the AccountService is installed and enabled."
 
@@ -7106,7 +7405,7 @@ msgstr "Please make sure that the AccountService is installed and enabled."
 #. * We split the line in 2 here to "make it look good", as there's
 #. * no good way to do this in GTK+ for tooltips. See:
 #. * https://bugzilla.gnome.org/show_bug.cgi?id=657168
-#: panels/user-accounts/cc-user-panel.c:1132
+#: panels/user-accounts/cc-user-panel.c:1172
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -7114,12 +7413,12 @@ msgstr ""
 "To make changes,\n"
 "click the * icon first"
 
-#: panels/user-accounts/cc-user-panel.c:1205
+#: panels/user-accounts/cc-user-panel.c:1245
 msgid "Create a user account"
 msgstr "Create a user account"
 
-#: panels/user-accounts/cc-user-panel.c:1216
-#: panels/user-accounts/cc-user-panel.c:1344
+#: panels/user-accounts/cc-user-panel.c:1256
+#: panels/user-accounts/cc-user-panel.c:1384
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -7127,12 +7426,12 @@ msgstr ""
 "To create a user account,\n"
 "click the * icon first"
 
-#: panels/user-accounts/cc-user-panel.c:1225
+#: panels/user-accounts/cc-user-panel.c:1265
 msgid "Delete the selected user account"
 msgstr "Delete the selected user account"
 
-#: panels/user-accounts/cc-user-panel.c:1237
-#: panels/user-accounts/cc-user-panel.c:1348
+#: panels/user-accounts/cc-user-panel.c:1277
+#: panels/user-accounts/cc-user-panel.c:1388
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -7140,45 +7439,69 @@ msgstr ""
 "To delete the selected user account,\n"
 "click the * icon first"
 
-#: panels/user-accounts/cc-user-panel.ui:18
+#: panels/user-accounts/cc-user-panel.ui:5
 msgid "_Add User…"
 msgstr "_Add User…"
 
-#: panels/user-accounts/cc-user-panel.ui:70
+#: panels/user-accounts/cc-user-panel.ui:52
 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
+#: panels/user-accounts/cc-user-panel.ui:60
 msgid "Restart Now"
 msgstr "Restart Now"
 
-#: panels/user-accounts/cc-user-panel.ui:256
-msgid "A_utomatic Login"
-msgstr "A_utomatic Login"
+#: panels/user-accounts/cc-user-panel.ui:146
+#: panels/user-accounts/cc-user-panel.ui:162
+msgid "User Icon"
+msgstr "User Icon"
+
+#: panels/user-accounts/cc-user-panel.ui:238
+#| msgid "Sound Settings"
+msgid "Account Settings"
+msgstr "Account Settings"
+
+#: panels/user-accounts/cc-user-panel.ui:265
+#| msgid "Administrator"
+msgid "_Administrator"
+msgstr "_Administrator"
+
+#: panels/user-accounts/cc-user-panel.ui:285
+msgid ""
+"Administrators can add and remove other users, and can change settings for "
+"all users."
+msgstr ""
+"Administrators can add and remove other users, and can change settings for "
+"all users."
 
-#: panels/user-accounts/cc-user-panel.ui:298
+#: panels/user-accounts/cc-user-panel.ui:359
+#| msgid "Au_thentication"
+msgid "Authentication & Login"
+msgstr "Authentication & Login"
+
+#: panels/user-accounts/cc-user-panel.ui:428
 msgid "_Fingerprint Login"
 msgstr "_Fingerprint Login"
 
-#: panels/user-accounts/cc-user-panel.ui:324
-#: panels/user-accounts/cc-user-panel.ui:340
-msgid "User Icon"
-msgstr "User Icon"
+#: panels/user-accounts/cc-user-panel.ui:470
+msgid "A_utomatic Login"
+msgstr "A_utomatic Login"
 
-#: panels/user-accounts/cc-user-panel.ui:404
-msgid "Last Login"
-msgstr "Last Login"
+#: panels/user-accounts/cc-user-panel.ui:500
+#| msgid "%s — Account Activity"
+msgid "Account Activity"
+msgstr "Account Activity"
 
-#: panels/user-accounts/cc-user-panel.ui:453
+#: panels/user-accounts/cc-user-panel.ui:541
 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:486
+#: panels/user-accounts/cc-user-panel.ui:580
 msgid "No Users Found"
 msgstr "No Users Found"
 
-#: panels/user-accounts/cc-user-panel.ui:496
+#: panels/user-accounts/cc-user-panel.ui:590
 msgid "Unlock to add a user account."
 msgstr "Unlock to add a user account."
 
@@ -7215,7 +7538,7 @@ msgid "Right little finger"
 msgstr "Right little finger"
 
 #: panels/user-accounts/data/account-fingerprint.ui:39
-#: panels/user-accounts/um-fingerprint-dialog.c:677
+#: panels/user-accounts/um-fingerprint-dialog.c:676
 msgid "Enable Fingerprint Login"
 msgstr "Enable Fingerprint Login"
 
@@ -7392,78 +7715,55 @@ msgid ""
 msgstr ""
 "Adding more letters, numbers and punctuation will make the password stronger."
 
-#: panels/user-accounts/run-passwd.c:422
+#: panels/user-accounts/run-passwd.c:424
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
-#: panels/user-accounts/run-passwd.c:502
+#: panels/user-accounts/run-passwd.c:504
 #, c-format
 msgid "The new password is too short"
 msgstr "The new password is too short"
 
-#: panels/user-accounts/run-passwd.c:508
+#: panels/user-accounts/run-passwd.c:510
 #, c-format
 msgid "The new password is too simple"
 msgstr "The new password is too simple"
 
-#: panels/user-accounts/run-passwd.c:514
+#: panels/user-accounts/run-passwd.c:516
 #, c-format
 msgid "The old and new passwords are too similar"
 msgstr "The old and new passwords are too similar"
 
-#: panels/user-accounts/run-passwd.c:517
+#: panels/user-accounts/run-passwd.c:519
 #, c-format
 msgid "The new password has already been used recently."
 msgstr "The new password has already been used recently."
 
-#: panels/user-accounts/run-passwd.c:520
+#: panels/user-accounts/run-passwd.c:522
 #, c-format
 msgid "The new password must contain numeric or special characters"
 msgstr "The new password must contain numeric or special characters"
 
-#: panels/user-accounts/run-passwd.c:524
+#: panels/user-accounts/run-passwd.c:526
 #, c-format
 msgid "The old and new passwords are the same"
 msgstr "The old and new passwords are the same"
 
-#: panels/user-accounts/run-passwd.c:528
+#: panels/user-accounts/run-passwd.c:530
 #, c-format
 msgid "Your password has been changed since you initially authenticated!"
 msgstr "Your password has been changed since you initially authenticated!"
 
-#: panels/user-accounts/run-passwd.c:532
+#: panels/user-accounts/run-passwd.c:534
 #, c-format
 msgid "The new password does not contain enough different characters"
 msgstr "The new password does not contain enough different characters"
 
-#: panels/user-accounts/run-passwd.c:536
+#: panels/user-accounts/run-passwd.c:538
 #, c-format
 msgid "Unknown error"
 msgstr "Unknown error"
 
-#: panels/user-accounts/user-utils.c:427
-#| msgid ""
-#| "The username should only consist of upper and lower case letters from a-"
-#| "z, digits and the following characters: . - _"
-msgid ""
-"The username should usually only consist of lower case letters from a-z, "
-"digits and the following characters: - _"
-msgstr ""
-"The username should usually only consist of lower case letters from a-z, "
-"digits and the following characters: - _"
-
-#: panels/user-accounts/user-utils.c:431
-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/user-utils.c:476
-msgid "The username is too long."
-msgstr "The username is too long."
-
-#: panels/user-accounts/user-utils.c:526
-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."
@@ -7482,15 +7782,15 @@ msgstr "An internal error occurred."
 msgid "Enabled"
 msgstr "Enabled"
 
-#: panels/user-accounts/um-fingerprint-dialog.c:260
+#: panels/user-accounts/um-fingerprint-dialog.c:259
 msgid "Delete registered fingerprints?"
 msgstr "Delete registered fingerprints?"
 
-#: panels/user-accounts/um-fingerprint-dialog.c:264
+#: panels/user-accounts/um-fingerprint-dialog.c:263
 msgid "_Delete Fingerprints"
 msgstr "_Delete Fingerprints"
 
-#: panels/user-accounts/um-fingerprint-dialog.c:270
+#: panels/user-accounts/um-fingerprint-dialog.c:269
 msgid ""
 "Do you want to delete your registered fingerprints so fingerprint login is "
 "disabled?"
@@ -7498,15 +7798,15 @@ msgstr ""
 "Do you want to delete your registered fingerprints so fingerprint login is "
 "disabled?"
 
-#: panels/user-accounts/um-fingerprint-dialog.c:440
+#: panels/user-accounts/um-fingerprint-dialog.c:439
 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
+#: panels/user-accounts/um-fingerprint-dialog.c:500
+#: panels/user-accounts/um-fingerprint-dialog.c:542
 #, c-format
 msgid "Could not access “%s” device"
 msgstr "Could not access “%s” device"
@@ -7514,16 +7814,16 @@ msgstr "Could not access “%s” device"
 #. translators:
 #. * The variable is the name of the device, for example:
 #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: panels/user-accounts/um-fingerprint-dialog.c:584
+#: panels/user-accounts/um-fingerprint-dialog.c:583
 #, 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
+#: panels/user-accounts/um-fingerprint-dialog.c:627
 msgid "Could not access any fingerprint readers"
 msgstr "Could not access any fingerprint readers"
 
-#: panels/user-accounts/um-fingerprint-dialog.c:629
+#: panels/user-accounts/um-fingerprint-dialog.c:628
 msgid "Please contact your system administrator for help."
 msgstr "Please contact your system administrator for help."
 
@@ -7532,7 +7832,7 @@ msgstr "Please contact your system administrator for help."
 #. * "To enable fingerprint login, you need to save one of your fingerprints, using the
 #. * 'Digital Persona U.are.U 4000/4000B' device."
 #.
-#: panels/user-accounts/um-fingerprint-dialog.c:711
+#: panels/user-accounts/um-fingerprint-dialog.c:710
 #, c-format
 msgid ""
 "To enable fingerprint login, you need to save one of your fingerprints, "
@@ -7541,19 +7841,39 @@ 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
+#: panels/user-accounts/um-fingerprint-dialog.c:717
 msgid "Selecting finger"
 msgstr "Selecting finger"
 
-#: panels/user-accounts/um-fingerprint-dialog.c:719
+#: panels/user-accounts/um-fingerprint-dialog.c:718
 msgid "Enrolling fingerprints"
 msgstr "Enrolling fingerprints"
 
+#: panels/user-accounts/user-utils.c:439
+msgid ""
+"The username should usually only consist of lower case letters from a-z, "
+"digits and the following characters: - _"
+msgstr ""
+"The username should usually only consist of lower case letters from a-z, "
+"digits and the following characters: - _"
+
+#: panels/user-accounts/user-utils.c:443
+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/user-utils.c:488
+msgid "The username is too long."
+msgstr "The username is too long."
+
+#: panels/user-accounts/user-utils.c:550
+msgid "This will be used to name your home folder and can’t be changed."
+msgstr "This will be used to name your home folder and can’t be changed."
+
 #: panels/wacom/button-mapping.ui:9
 msgid "Map Buttons"
 msgstr "Map Buttons"
 
-#: panels/wacom/button-mapping.ui:37 panels/wacom/cc-wacom-page.c:533
+#: panels/wacom/button-mapping.ui:37 panels/wacom/cc-wacom-page.c:519
 #: panels/wacom/gnome-wacom-properties.ui:60
 msgid "_Close"
 msgstr "_Close"
@@ -7582,7 +7902,7 @@ msgstr ""
 msgid "Mis-click detected, restarting…"
 msgstr "Mis-click detected, restarting…"
 
-#: panels/wacom/cc-wacom-button-row.c:253
+#: panels/wacom/cc-wacom-button-row.c:249
 #, c-format
 msgid "Button %d"
 msgstr "Button %d"
@@ -7607,17 +7927,17 @@ msgctxt "Wacom action-type"
 msgid "Show On-Screen Help"
 msgstr "Show On-Screen Help"
 
-#: panels/wacom/cc-wacom-mapping-panel.c:256
+#: panels/wacom/cc-wacom-mapping-panel.c:249
 msgid "Output:"
 msgstr "Output:"
 
 #. Keep ratio switch
-#: panels/wacom/cc-wacom-mapping-panel.c:268
+#: panels/wacom/cc-wacom-mapping-panel.c:261
 msgid "Keep aspect ratio (letterbox):"
 msgstr "Keep aspect ratio (letterbox):"
 
 #. Whole-desktop checkbox
-#: panels/wacom/cc-wacom-mapping-panel.c:279
+#: panels/wacom/cc-wacom-mapping-panel.c:272
 msgid "Map to single monitor"
 msgstr "Map to single monitor"
 
@@ -7626,15 +7946,15 @@ msgstr "Map to single monitor"
 msgid "%d of %d"
 msgstr "%d of %d"
 
-#: panels/wacom/cc-wacom-page.c:530
+#: panels/wacom/cc-wacom-page.c:516
 msgid "Display Mapping"
 msgstr "Display Mapping"
 
-#: panels/wacom/cc-wacom-panel.c:845 panels/wacom/wacom-stylus-page.ui:119
+#: panels/wacom/cc-wacom-panel.c:812 panels/wacom/wacom-stylus-page.ui:119
 msgid "Stylus"
 msgstr "Stylus"
 
-#: panels/wacom/cc-wacom-stylus-page.c:355
+#: panels/wacom/cc-wacom-stylus-page.c:360
 msgid "Button"
 msgstr "Button"
 
@@ -7689,6 +8009,7 @@ msgid "Left-Handed Orientation"
 msgstr "Left-Handed Orientation"
 
 #: panels/wacom/gnome-wacom-properties.ui:296
+#: panels/wacom/gnome-wacom-properties.ui:401
 msgid "Map to Monitor…"
 msgstr "Map to Monitor…"
 
@@ -7708,6 +8029,10 @@ msgstr "Adjust mouse settings"
 msgid "Adjust display resolution"
 msgstr "Adjust display resolution"
 
+#: panels/wacom/gnome-wacom-properties.ui:376
+msgid "Decouple Display"
+msgstr "Decouple Display"
+
 #: panels/wacom/gsd-wacom-key-shortcut-button.c:217
 msgid "New shortcut…"
 msgstr "New shortcut…"
@@ -7724,10 +8049,6 @@ msgstr "Middle Mouse Button Click"
 msgid "Right Mouse Button Click"
 msgstr "Right Mouse Button Click"
 
-#: panels/wacom/wacom-stylus-page.ui:37 shell/cc-window.ui:241
-msgid "Back"
-msgstr "Back"
-
 #: panels/wacom/wacom-stylus-page.ui:41
 msgid "Forward"
 msgstr "Forward"
@@ -7744,27 +8065,27 @@ msgstr "Please move your stylus to the proximity of the tablet to configure it"
 msgid "Eraser Pressure Feel"
 msgstr "Eraser Pressure Feel"
 
-#: panels/wacom/wacom-stylus-page.ui:180 panels/wacom/wacom-stylus-page.ui:340
+#: panels/wacom/wacom-stylus-page.ui:180 panels/wacom/wacom-stylus-page.ui:341
 msgid "Soft"
 msgstr "Soft"
 
-#: panels/wacom/wacom-stylus-page.ui:210 panels/wacom/wacom-stylus-page.ui:370
+#: panels/wacom/wacom-stylus-page.ui:211 panels/wacom/wacom-stylus-page.ui:372
 msgid "Firm"
 msgstr "Firm"
 
-#: panels/wacom/wacom-stylus-page.ui:233
+#: panels/wacom/wacom-stylus-page.ui:234
 msgid "Top Button"
 msgstr "Top Button"
 
-#: panels/wacom/wacom-stylus-page.ui:262
+#: panels/wacom/wacom-stylus-page.ui:263
 msgid "Lower Button"
 msgstr "Lower Button"
 
-#: panels/wacom/wacom-stylus-page.ui:291
+#: panels/wacom/wacom-stylus-page.ui:292
 msgid "Lowest Button"
 msgstr "Lowest Button"
 
-#: panels/wacom/wacom-stylus-page.ui:320
+#: panels/wacom/wacom-stylus-page.ui:321
 msgid "Tip Pressure Feel"
 msgstr "Tip Pressure Feel"
 
@@ -7808,23 +8129,27 @@ msgstr "Panel to display"
 msgid "[PANEL] [ARGUMENT…]"
 msgstr "[PANEL] [ARGUMENT…]"
 
-#: shell/cc-panel-loader.c:279
+#: shell/cc-panel-list.ui:45 shell/cc-window.c:277
+msgid "Privacy"
+msgstr "Privacy"
+
+#: shell/cc-panel-loader.c:292
 msgid "Available panels:"
 msgstr "Available panels:"
 
-#: shell/cc-window.ui:146
+#: shell/cc-window.ui:140
 msgid "All Settings"
 msgstr "All Settings"
 
-#: shell/cc-window.ui:184
+#: shell/cc-window.ui:178
 msgid "Primary Menu"
 msgstr "Primary Menu"
 
-#: shell/cc-window.ui:331
+#: shell/cc-window.ui:319
 msgid "Warning: Development Version"
 msgstr "Warning: Development Version"
 
-#: shell/cc-window.ui:332
+#: shell/cc-window.ui:320
 msgid ""
 "This version of Settings should only be used for development purposes. You "
 "may experience incorrect system behavior, data loss, and other unexpected "
@@ -7834,7 +8159,7 @@ msgstr ""
 "may experience incorrect system behaviour, data loss, and other unexpected "
 "issues. "
 
-#: shell/cc-window.ui:343
+#: shell/cc-window.ui:331
 msgid "Help"
 msgstr "Help"
 
@@ -7917,6 +8242,267 @@ msgstr[1] "%u Inputs"
 msgid "System Sounds"
 msgstr "System Sounds"
 
+#~ msgid "Notification _Popups"
+#~ msgstr "Notification _Popups"
+
+#~ msgid "Last Login"
+#~ msgstr "Last Login"
+
+#~ msgid "Version %s"
+#~ msgstr "Version %s"
+
+#~ msgid "OS name"
+#~ msgstr "OS name"
+
+#~ msgid "OS type"
+#~ msgstr "OS type"
+
+#~ msgid "Disk"
+#~ msgstr "Disk"
+
+#~ msgid "Check for updates"
+#~ msgstr "Check for updates"
+
+#~ msgid "Network proxy"
+#~ msgstr "Network proxy"
+
+#~ msgid "page 1"
+#~ msgstr "page 1"
+
+#~ msgid "Inner _authentication"
+#~ msgstr "Inner _authentication"
+
+#~ msgid "page 2"
+#~ msgstr "page 2"
+
+#~ msgid "Restrict background data usage"
+#~ msgstr "Restrict background data usage"
+
+#~ msgid "Appropriate for connections that have data charges or limits."
+#~ msgstr "Appropriate for connections that have data charges or limits."
+
+#~ msgid "Twisted Pair (TP)"
+#~ msgstr "Twisted Pair (TP)"
+
+#~ msgid "Attachment Unit Interface (AUI)"
+#~ msgstr "Attachment Unit Interface (AUI)"
+
+#~ msgid "BNC"
+#~ msgstr "BNC"
+
+#~ msgid "Media Independent Interface (MII)"
+#~ msgstr "Media Independent Interface (MII)"
+
+#~ msgid "10 Mb/s"
+#~ msgstr "10 Mb/s"
+
+#~ msgid "100 Mb/s"
+#~ msgstr "100 Mb/s"
+
+#~ msgid "1 Gb/s"
+#~ msgstr "1 Gb/s"
+
+#~ msgid "10 Gb/s"
+#~ msgstr "10 Gb/s"
+
+#~ 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>."
+
+#~ msgid ""
+#~ "It is not possible to access the Internet through your wireless while the "
+#~ "hotspot is active."
+#~ msgstr ""
+#~ "It is not possible to access the Internet through your wireless while the "
+#~ "hotspot is active."
+
+#~ msgid ""
+#~ "Wi-Fi hotspots are usually used to share an additional Internet "
+#~ "connection over Wi-Fi."
+#~ msgstr ""
+#~ "Wi-Fi hotspots are usually used to share an additional Internet "
+#~ "connection over Wi-Fi."
+
+#~ msgid "Automatic _Connect"
+#~ msgstr "Automatic _Connect"
+
+#~ msgid "details"
+#~ msgstr "details"
+
+#~ msgid "Show P_assword"
+#~ msgstr "Show P_assword"
+
+#~ msgid "Make available to other users"
+#~ msgstr "Make available to other users"
+
+#~ msgid "identity"
+#~ msgstr "identity"
+
+#~ msgid "IPv_4"
+#~ msgstr "IPv_4"
+
+#~ msgid "_Addresses"
+#~ msgstr "_Addresses"
+
+#~ msgid "Automatic (DHCP) addresses only"
+#~ msgstr "Automatic (DHCP) addresses only"
+
+#~ msgid "Link-local only"
+#~ msgstr "Link-local only"
+
+#~ msgid "_Ignore automatically obtained routes"
+#~ msgstr "_Ignore automatically obtained routes"
+
+#~ msgid "ipv4"
+#~ msgstr "ipv4"
+
+#~ msgid "IPv_6"
+#~ msgstr "IPv_6"
+
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
+
+#~ msgid "_Cloned MAC Address"
+#~ msgstr "_Cloned MAC Address"
+
+#~ msgid "_Reset"
+#~ msgstr "_Reset"
+
+#~ msgid ""
+#~ "Reset the settings for this connection to their defaults, but remember as "
+#~ "a preferred connection."
+#~ msgstr ""
+#~ "Reset the settings for this connection to their defaults, but remember as "
+#~ "a preferred connection."
+
+#~ msgid ""
+#~ "Remove all details relating to this network and do not try to "
+#~ "automatically connect to it."
+#~ msgstr ""
+#~ "Remove all details relating to this network and do not try to "
+#~ "automatically connect to it."
+
+#~ msgid "Hardware"
+#~ msgstr "Hardware"
+
+#~ msgctxt "tab"
+#~ msgid "Reset"
+#~ msgstr "Reset"
+
+#~ msgid "Connected Devices"
+#~ msgstr "Connected Devices"
+
+#~ msgid "Ad-hoc"
+#~ msgstr "Ad-hoc"
+
+#~ msgid "Infrastructure"
+#~ msgstr "Infrastructure"
+
+#~ msgid "Not connected"
+#~ msgstr "Not connected"
+
+#~ msgid "In use"
+#~ msgstr "In use"
+
+#~ msgctxt "Location services status"
+#~ msgid "On"
+#~ msgstr "On"
+
+#~ msgctxt "Location services status"
+#~ msgid "Off"
+#~ msgstr "Off"
+
+#~ msgctxt "Camera status"
+#~ msgid "Off"
+#~ msgstr "Off"
+
+#~ msgctxt "Camera status"
+#~ msgid "On"
+#~ msgstr "On"
+
+#~ msgctxt "Microphone status"
+#~ msgid "Off"
+#~ msgstr "Off"
+
+#~ msgctxt "Microphone status"
+#~ msgid "On"
+#~ msgstr "On"
+
+#~ msgid "Usage & History"
+#~ msgstr "Usage & History"
+
+#~ msgid "Privacy Policy"
+#~ msgstr "Privacy Policy"
+
+#~ msgid ""
+#~ "Remembering your history makes things easier to find again. These items "
+#~ "are never shared over the network."
+#~ msgstr ""
+#~ "Remembering your history makes things easier to find again. These items "
+#~ "are never shared over the network."
+
+#~ msgid "_Recently Used"
+#~ msgstr "_Recently Used"
+
+#~ msgid "Retain _History"
+#~ msgstr "Retain _History"
+
+#~ msgid "The Screen Lock protects your privacy when you are away."
+#~ msgstr "The Screen Lock protects your privacy when you are away."
+
+#~ msgid "Lock screen _after blank for"
+#~ msgstr "Lock screen _after blank for"
+
+#~ msgid "Lock Screen _Notifications"
+#~ msgstr "Lock Screen _Notifications"
+
+#~ msgid ""
+#~ "Automatically purge the Trash and temporary files to help keep your "
+#~ "computer free of unnecessary sensitive information."
+#~ msgstr ""
+#~ "Automatically purge the Wastebasket and temporary files to help keep your "
+#~ "computer free of unnecessary sensitive information."
+
+#~ msgid "Purge _After"
+#~ msgstr "Purge _After"
+
+#~ msgid ""
+#~ "Sending us information about which software you use helps us provide you "
+#~ "with more accurate recommendations. It also helps us to improve our "
+#~ "software.\n"
+#~ "\n"
+#~ "All the information we collect is made anonymous, and we will never share "
+#~ "your data with third parties."
+#~ msgstr ""
+#~ "Sending us information about which software you use helps us provide you "
+#~ "with more accurate recommendations. It also helps us to improve our "
+#~ "software.\n"
+#~ "\n"
+#~ "All the information we collect is made anonymous, and we will never share "
+#~ "your data with third parties."
+
+#~ msgid "_Send software usage statistics"
+#~ msgstr "_Send software usage statistics"
+
+#~ msgid "_Camera"
+#~ msgstr "_Camera"
+
+#~ msgid "_Microphone"
+#~ msgstr "_Microphone"
+
+#~ msgid "_Location Services"
+#~ msgstr "_Location Services"
+
+#~ msgid "Protect your personal information and control what others might see"
+#~ msgstr "Protect your personal information and control what others might see"
+
+#~ msgid "No regions found"
+#~ msgstr "No regions found"
+
+#~ msgid "Flash the _window title"
+#~ msgstr "Flash the _window title"
+
 #~ msgid "The username cannot start with a “-”."
 #~ msgstr "The username cannot start with a “-”."
 
@@ -8032,9 +8618,6 @@ msgstr "System Sounds"
 #~ msgid "printer"
 #~ msgstr "printer"
 
-#~ msgid "Show _Notifications"
-#~ msgstr "Show _Notifications"
-
 #~ msgid "preferences-system-privacy"
 #~ msgstr "preferences-system-privacy"
 
@@ -8072,9 +8655,6 @@ msgstr "System Sounds"
 #~ msgid "Language"
 #~ msgstr "Language"
 
-#~ msgid "Primary Display"
-#~ msgstr "Primary Display"
-
 #~ msgid "_Night Light"
 #~ msgstr "_Night Light"
 
@@ -8117,9 +8697,6 @@ msgstr "System Sounds"
 #~ 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"
 
@@ -8179,9 +8756,6 @@ msgstr "System Sounds"
 #~ 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"
 
@@ -8298,10 +8872,6 @@ msgstr "System Sounds"
 #~ msgid "Wa­com Tab­let"
 #~ msgstr "Wa­com Tab­let"
 
-#~ msgctxt "category"
-#~ msgid "Personal"
-#~ msgstr "Personal"
-
 #~ msgctxt "category"
 #~ msgid "Hardware"
 #~ msgstr "Hardware"
@@ -8370,9 +8940,6 @@ msgstr "System Sounds"
 #~ msgid "_Arrange Combined Displays"
 #~ msgstr "_Arrange Combined Displays"
 
-#~ msgid "Wayland"
-#~ msgstr "Wayland"
-
 #~ msgid "%s %d-bit (Build ID: %s)"
 #~ msgstr "%s %d-bit (Build ID: %s)"
 
@@ -8431,9 +8998,6 @@ msgstr "System Sounds"
 #~ "If you have a connection to the Internet other than wireless, you can set "
 #~ "up a wireless hotspot to share the connection with others."
 
-#~ msgid "History"
-#~ msgstr "History"
-
 #~ msgid "Proxy"
 #~ msgstr "Proxy"
 
@@ -8700,15 +9264,9 @@ msgstr "System Sounds"
 #~ msgid "Paired"
 #~ msgstr "Paired"
 
-#~ msgid "Type"
-#~ msgstr "Type"
-
 #~ msgid "Mouse & Touchpad Settings"
 #~ msgstr "Mouse & Touchpad Settings"
 
-#~ msgid "Sound Settings"
-#~ msgstr "Sound Settings"
-
 #~ msgid "Keyboard Settings"
 #~ msgstr "Keyboard Settings"
 
@@ -8938,9 +9496,6 @@ msgstr "System Sounds"
 #~ msgid "_Interface"
 #~ msgstr "_Interface"
 
-#~ msgid "Security key"
-#~ msgstr "Security key"
-
 #~ msgid "InfiniBand device does not support connected mode"
 #~ msgstr "InfiniBand device does not support connected mode"
 
@@ -9136,9 +9691,6 @@ msgstr "System Sounds"
 #~ msgid "Photograph"
 #~ msgstr "Photograph"
 
-#~ msgid "Account Information"
-#~ msgstr "Account Information"
-
 #~ msgid "Add User Account"
 #~ msgstr "Add User Account"
 
@@ -9164,21 +9716,9 @@ msgstr "System Sounds"
 #~ msgid "Left Shift"
 #~ msgstr "Left Shift"
 
-#~ msgid "Left Alt"
-#~ msgstr "Left Alt"
-
-#~ msgid "Left Ctrl"
-#~ msgstr "Left Ctrl"
-
 #~ msgid "Right Shift"
 #~ msgstr "Right Shift"
 
-#~ msgid "Right Alt"
-#~ msgstr "Right Alt"
-
-#~ msgid "Right Ctrl"
-#~ msgstr "Right Ctrl"
-
 #~ msgid "Left Alt+Shift"
 #~ msgstr "Left Alt+Shift"
 
@@ -9288,9 +9828,6 @@ msgstr "System Sounds"
 #~ msgid "Note: may limit resolution options"
 #~ msgstr "Note: may limit resolution options"
 
-#~ msgid "_Detect Displays"
-#~ msgstr "_Detect Displays"
-
 #~ msgctxt "mouse, speed"
 #~ msgid "Slow"
 #~ msgstr "Slow"
@@ -9497,9 +10034,6 @@ msgstr "System Sounds"
 #~ msgid "Enable this account"
 #~ msgstr "Enable this account"
 
-#~ msgid "Generate a password"
-#~ msgstr "Generate a password"
-
 #~ msgid "_Action"
 #~ msgstr "_Action"
 
@@ -9557,9 +10091,6 @@ msgstr "System Sounds"
 #~ msgid "Action"
 #~ msgstr "Action"
 
-#~ msgid "Change the background"
-#~ msgstr "Change the background"
-
 #~ msgid "Browse Files..."
 #~ msgstr "Browse Files…"
 
@@ -9631,9 +10162,6 @@ msgstr "System Sounds"
 #~ msgid "Add a virtual device"
 #~ msgstr "Add a virtual device"
 
-#~ msgid "Remove a device"
-#~ msgstr "Remove a device"
-
 #~ msgid "Color management settings"
 #~ msgstr "Colour management settings"
 
@@ -9687,9 +10215,6 @@ msgstr "System Sounds"
 #~ msgid "Fallback"
 #~ msgstr "Fallback"
 
-#~ msgid "System Information"
-#~ msgstr "System Information"
-
 #~ msgid "_Other Media..."
 #~ msgstr "_Other Media…"
 
@@ -9699,18 +10224,12 @@ msgstr "System Sounds"
 #~ msgid "Forced _Fallback Mode"
 #~ msgstr "Forced _Fallback Mode"
 
-#~ msgid "Change keyboard settings"
-#~ msgstr "Change keyboard settings"
-
 #~ msgid "Layout Settings"
 #~ msgstr "Layout Settings"
 
 #~ msgid "Set your mouse and touchpad preferences"
 #~ msgstr "Set your mouse and touchpad preferences"
 
-#~ msgid "Network settings"
-#~ msgstr "Network settings"
-
 #~ msgid "Network;Wireless;IP;LAN;Proxy;"
 #~ msgstr "Network;Wireless;IP;LAN;Proxy;"
 
@@ -10544,9 +11063,6 @@ msgstr "System Sounds"
 #~ msgid "Info"
 #~ msgstr "Info"
 
-#~ msgid "Locate Pointer"
-#~ msgstr "Locate Pointer"
-
 #~ msgid "Set the system proxy settings"
 #~ msgstr "Set the system proxy settings"
 
@@ -10714,9 +11230,6 @@ msgstr "System Sounds"
 #~ msgid "GNOME OnScreen Keyboard"
 #~ msgstr "GNOME OnScreen Keyboard"
 
-#~ msgid "GNOME Terminal"
-#~ msgstr "GNOME Terminal"
-
 #~ msgid "Galeon"
 #~ msgstr "Galeon"
 
@@ -12076,9 +12589,6 @@ msgstr "System Sounds"
 #~ msgid "_Meta"
 #~ msgstr "_Meta"
 
-#~ msgid "Movement Key"
-#~ msgstr "Movement Key"
-
 #~ msgid "Titlebar Action"
 #~ msgstr "Titlebar Action"
 
@@ -12130,9 +12640,6 @@ msgstr "System Sounds"
 #~ msgid "Groups"
 #~ msgstr "Groups"
 
-#~ msgid "Common Tasks"
-#~ msgstr "Common Tasks"
-
 #~ msgid "Close the control-center when a task is activated"
 #~ msgstr "Close the control-centre when a task is activated"
 
@@ -12226,18 +12733,9 @@ msgstr "System Sounds"
 #~ msgid "Home"
 #~ msgstr "Home"
 
-#~ msgid "Documents"
-#~ msgstr "Documents"
-
 #~ msgid "<b>Open</b>"
 #~ msgstr "<b>Open</b>"
 
-#~ msgid "Rename..."
-#~ msgstr "Rename…"
-
-#~ msgid "Move to Trash"
-#~ msgstr "Move to the Wastebasket"
-
 #~ msgid "If you delete an item, it is permanently lost."
 #~ msgstr "If you delete an item, it is permanently lost."
 
@@ -12767,9 +13265,6 @@ msgstr "System Sounds"
 #~ msgid "The file %s is not a valid wav file"
 #~ msgstr "The file %s is not a valid wav file"
 
-#~ msgid "Sets the default application font"
-#~ msgstr "Sets the default application font"
-
 #~ msgid "<span weight=\"bold\" size=\"larger\">Apply new font?</span>"
 #~ msgstr "<span weight=\"bold\" size=\"larger\">Apply new font?</span>"
 
@@ -13029,9 +13524,6 @@ msgstr "System Sounds"
 #~ msgid "Do_n't activate"
 #~ msgstr "Do_n't activate"
 
-#~ msgid "Do_n't deactivate"
-#~ msgstr "Do_n't deactivate"
-
 #~ msgid ""
 #~ "You just pressed the Shift key 5 times in a row.  This is the shortcut "
 #~ "for the Sticky Keys feature, which affects the way your keyboard works."



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