[gnome-control-center] Update British English translation



commit e46c8522dca0422eb0b28d3f65fa6dd29f911d83
Author: Bruce Cowan <bruce bcowan me uk>
Date:   Mon Sep 11 09:39:13 2017 +0000

    Update British English translation

 po/en_GB.po | 3796 +++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 2153 insertions(+), 1643 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index a6a135a..47a2009 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -4,16 +4,16 @@
 # Gareth Owen <gowen72 yahoo com>, David Lodge <dave cirt net>, 2004.
 # Philip Withnall <philip tecnocode co uk>, 2010, 2013.
 # Chris Leonard <cjl laptop org>, 2012.
-# Bruce Cowan <bruce bcowan me uk>, 2009, 2010, 2011, 2012, 2013, 2016.
+# Bruce Cowan <bruce bcowan eu>, 2009, 2010, 2011, 2012, 2013, 2016, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
 "control-center&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-09-10 14:47+0000\n"
-"PO-Revision-Date: 2016-09-18 12:59+0200\n"
-"Last-Translator: David King <amigadave amigadave com>\n"
+"POT-Creation-Date: 2017-08-25 14:57+0000\n"
+"PO-Revision-Date: 2017-09-11 10:38+0100\n"
+"Last-Translator: Bruce Cowan <bruce bcowan eu>\n"
 "Language-Team: British English <en li org>\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
@@ -67,73 +67,73 @@ msgctxt "background, style"
 msgid "Span"
 msgstr "Span"
 
-#: ../panels/background/cc-background-chooser-dialog.c:437
+#: ../panels/background/cc-background-chooser-dialog.c:430
 msgid "Wallpapers"
 msgstr "Wallpapers"
 
-#: ../panels/background/cc-background-chooser-dialog.c:446
+#: ../panels/background/cc-background-chooser-dialog.c:439
 msgid "Colors"
 msgstr "Colours"
 
 #. translators: This is the title of the wallpaper chooser dialog.
-#: ../panels/background/cc-background-chooser-dialog.c:483
+#: ../panels/background/cc-background-chooser-dialog.c:476
 msgid "Select Background"
 msgstr "Select Background"
 
-#: ../panels/background/cc-background-chooser-dialog.c:511
+#: ../panels/background/cc-background-chooser-dialog.c:504
 msgid "Pictures"
 msgstr "Pictures"
 
 #. translators: No pictures were found
-#: ../panels/background/cc-background-chooser-dialog.c:543
+#: ../panels/background/cc-background-chooser-dialog.c:536
 msgid "No Pictures Found"
 msgstr "No Pictures Found"
 
 #. translators: "Home" is used in place of the Pictures
 #. * directory in the string below when XDG_PICTURES_DIR is
 #. * undefined
-#: ../panels/background/cc-background-chooser-dialog.c:561
+#: ../panels/background/cc-background-chooser-dialog.c:554
 #: ../panels/search/cc-search-locations-dialog.c:302
 msgid "Home"
 msgstr "Home"
 
 #. translators: %s here is the name of the Pictures directory, the string should be translated in
 #. * the context "You can add images to your Pictures folder and they will show up here"
-#: ../panels/background/cc-background-chooser-dialog.c:573
+#: ../panels/background/cc-background-chooser-dialog.c:566
 #, c-format
 msgid "You can add images to your %s folder and they will show up here"
 msgstr "You can add images to your %s folder and they will show up here"
 
-#: ../panels/background/cc-background-chooser-dialog.c:580
+#: ../panels/background/cc-background-chooser-dialog.c:573
 #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963
 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30
 #: ../panels/common/language-chooser.ui.h:3
-#: ../panels/display/cc-display-panel.c:1561
-#: ../panels/display/cc-display-panel.c:2206
+#: ../panels/display/cc-display-panel.c:2718
 #: ../panels/network/connection-editor/connection-editor.ui.h:1
 #: ../panels/network/connection-editor/vpn-helpers.c:181
 #: ../panels/network/connection-editor/vpn-helpers.c:310
-#: ../panels/network/net-device-wifi.c:1298
-#: ../panels/network/net-device-wifi.c:1535
+#: ../panels/network/net-device-wifi.c:1318
+#: ../panels/network/net-device-wifi.c:1398
+#: ../panels/network/net-device-wifi.c:1633
 #: ../panels/network/network-wifi.ui.h:1
-#: ../panels/printers/cc-printers-panel.c:2076
-#: ../panels/printers/new-printer-dialog.ui.h:2
-#: ../panels/privacy/cc-privacy-panel.c:1048
+#: ../panels/printers/new-printer-dialog.ui.h:3
+#: ../panels/printers/pp-details-dialog.c:319
+#: ../panels/privacy/cc-privacy-panel.c:1049
 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2
-#: ../panels/search/cc-search-locations-dialog.c:637
-#: ../panels/sharing/cc-sharing-panel.c:372
+#: ../panels/search/cc-search-locations-dialog.c:642
+#: ../panels/sharing/cc-sharing-panel.c:375
 #: ../panels/user-accounts/data/account-dialog.ui.h:2
 #: ../panels/user-accounts/data/join-dialog.ui.h:2
 #: ../panels/user-accounts/data/password-dialog.ui.h:2
-#: ../panels/user-accounts/um-fingerprint-dialog.c:265
+#: ../panels/user-accounts/um-fingerprint-dialog.c:264
 #: ../panels/user-accounts/um-photo-dialog.c:94
-#: ../panels/user-accounts/um-photo-dialog.c:217
-#: ../panels/user-accounts/um-user-panel.c:705
-#: ../panels/user-accounts/um-user-panel.c:723
+#: ../panels/user-accounts/um-photo-dialog.c:221
+#: ../panels/user-accounts/um-user-panel.c:644
+#: ../panels/user-accounts/um-user-panel.c:662
 msgid "_Cancel"
 msgstr "_Cancel"
 
-#: ../panels/background/cc-background-chooser-dialog.c:581
+#: ../panels/background/cc-background-chooser-dialog.c:574
 msgid "_Select"
 msgstr "_Select"
 
@@ -170,39 +170,39 @@ msgstr "Change your background image to a wallpaper or photo"
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "Wallpaper;Screen;Desktop;"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:264
+#: ../panels/bluetooth/cc-bluetooth-panel.c:268
 msgid "Turn Off Airplane Mode"
 msgstr "Turn Off Aeroplane Mode"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:330
+#: ../panels/bluetooth/cc-bluetooth-panel.c:334
 msgid "No Bluetooth Found"
 msgstr "No Bluetooth Found"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:330
+#: ../panels/bluetooth/cc-bluetooth-panel.c:334
 msgid "Plug in a dongle to use Bluetooth."
 msgstr "Plug in a dongle to use Bluetooth."
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:331
+#: ../panels/bluetooth/cc-bluetooth-panel.c:335
 msgid "Bluetooth Turned Off"
 msgstr "Bluetooth Turned Off"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:331
+#: ../panels/bluetooth/cc-bluetooth-panel.c:335
 msgid "Turn on to connect devices and receive file transfers."
 msgstr "Turn on to connect devices and receive file transfers."
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:332
+#: ../panels/bluetooth/cc-bluetooth-panel.c:336
 msgid "Airplane Mode is on"
 msgstr "Aeroplane Mode is on"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:332
+#: ../panels/bluetooth/cc-bluetooth-panel.c:336
 msgid "Bluetooth is disabled when airplane mode is on."
 msgstr "Bluetooth is disabled when aeroplane mode is on."
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:333
+#: ../panels/bluetooth/cc-bluetooth-panel.c:337
 msgid "Hardware Airplane Mode is on"
 msgstr "Hardware Aeroplane Mode is on"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:333
+#: ../panels/bluetooth/cc-bluetooth-panel.c:337
 msgid "Turn off the Airplane mode switch to enable Bluetooth."
 msgstr "Turn off the Aeroplane mode switch to enable Bluetooth."
 
@@ -222,26 +222,32 @@ msgstr "share;sharing;bluetooth;obex;"
 
 #. TRANSLATORS: The user has to attach the sensor to the screen
 #: ../panels/color/cc-color-calibrate.c:361
-msgid "Place your calibration device over the square and press 'Start'"
-msgstr "Place your calibration device over the square and press ‘Start’"
+#| msgid "Place your calibration device over the square and press 'Start'"
+msgid "Place your calibration device over the square and press “Start”"
+msgstr "Place your calibration device over the square and press “Start”"
 
 #. TRANSLATORS: Some calibration devices need the user to move a
 #. * dial or switch manually. We also show a picture showing them
 #. * what to do...
 #: ../panels/color/cc-color-calibrate.c:367
+#| msgid ""
+#| "Move your calibration device to the calibrate position and press "
+#| "'Continue'"
 msgid ""
-"Move your calibration device to the calibrate position and press 'Continue'"
+"Move your calibration device to the calibrate position and press “Continue”"
 msgstr ""
-"Move your calibration device to the calibrate position and press ‘Continue’"
+"Move your calibration device to the calibrate position and press “Continue”"
 
 #. TRANSLATORS: Some calibration devices need the user to move a
 #. * dial or switch manually. We also show a picture showing them
 #. * what to do...
 #: ../panels/color/cc-color-calibrate.c:373
+#| msgid ""
+#| "Move your calibration device to the surface position and press 'Continue'"
 msgid ""
-"Move your calibration device to the surface position and press 'Continue'"
+"Move your calibration device to the surface position and press “Continue”"
 msgstr ""
-"Move your calibration device to the surface position and press ‘Continue’"
+"Move your calibration device to the surface position and press “Continue”"
 
 #. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor
 #. * is built into the palmrest and we need to fullscreen the
@@ -684,21 +690,22 @@ msgstr ""
 "\">Microsoft Windows</a> systems useful."
 
 #: ../panels/color/color.ui.h:27
-#: ../panels/user-accounts/um-fingerprint-dialog.c:730
+#: ../panels/user-accounts/um-fingerprint-dialog.c:723
 msgid "Summary"
 msgstr "Summary"
 
 #: ../panels/color/color.ui.h:28
-msgid "Add profile"
-msgstr "Add profile"
+#| msgid "Add profile"
+msgid "Add Profile"
+msgstr "Add Profile"
 
 #: ../panels/color/color.ui.h:29
 msgid "_Import File…"
 msgstr "_Import File…"
 
 #: ../panels/color/color.ui.h:31
-#: ../panels/network/connection-editor/net-connection-editor.c:546
-#: ../panels/printers/new-printer-dialog.ui.h:3
+#: ../panels/network/connection-editor/net-connection-editor.c:519
+#: ../panels/printers/new-printer-dialog.ui.h:4
 #: ../panels/region/input-chooser.ui.h:3
 #: ../panels/user-accounts/data/account-dialog.ui.h:3
 msgid "_Add"
@@ -869,7 +876,7 @@ msgid "Other…"
 msgstr "Other…"
 
 #: ../panels/common/cc-language-chooser.c:124
-#: ../panels/region/cc-format-chooser.c:271
+#: ../panels/region/cc-format-chooser.c:269
 #: ../panels/region/cc-input-chooser.c:169
 msgid "More…"
 msgstr "More…"
@@ -879,12 +886,12 @@ msgid "No languages found"
 msgstr "No languages found"
 
 #: ../panels/common/cc-util.c:127
-#: ../panels/network/connection-editor/ce-page-details.c:100
+#: ../panels/network/connection-editor/ce-page-details.c:106
 msgid "Today"
 msgstr "Today"
 
 #: ../panels/common/cc-util.c:131
-#: ../panels/network/connection-editor/ce-page-details.c:102
+#: ../panels/network/connection-editor/ce-page-details.c:108
 msgid "Yesterday"
 msgstr "Yesterday"
 
@@ -918,17 +925,17 @@ msgid "Year"
 msgstr "Year"
 
 #. Translators: This is the full date and time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:340
+#: ../panels/datetime/cc-datetime-panel.c:339
 msgid "%e %B %Y, %l:%M %p"
 msgstr "%e %B %Y, %l:%M %p"
 
 #. Translators: This is the full date and time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:345
+#: ../panels/datetime/cc-datetime-panel.c:344
 msgid "%e %B %Y, %R"
 msgstr "%e %B %Y, %R"
 
 #. Translators: "city, country"
-#: ../panels/datetime/cc-datetime-panel.c:523
+#: ../panels/datetime/cc-datetime-panel.c:522
 #, c-format
 msgctxt "timezone loc"
 msgid "%s, %s"
@@ -936,7 +943,7 @@ msgstr "%s, %s"
 
 #. Update the timezone on the listbow row
 #. Translators: "timezone (details)"
-#: ../panels/datetime/cc-datetime-panel.c:553
+#: ../panels/datetime/cc-datetime-panel.c:552
 #, c-format
 msgctxt "timezone desc"
 msgid "%s (%s)"
@@ -944,23 +951,23 @@ msgstr "%s (%s)"
 
 #. Translators: UTC here means the Coordinated Universal Time.
 #. * %:::z will be replaced by the offset from UTC e.g. UTC+02
-#: ../panels/datetime/cc-datetime-panel.c:561
+#: ../panels/datetime/cc-datetime-panel.c:560
 msgid "UTC%:::z"
 msgstr "UTC%:::z"
 
 #. Translators: This is the time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:566
+#: ../panels/datetime/cc-datetime-panel.c:565
 msgid "%l:%M %p"
 msgstr "%H:%M"
 
 #. Translators: This is the time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:571
+#: ../panels/datetime/cc-datetime-panel.c:570
 msgid "%R"
 msgstr "%R"
 
 #. Update the text bubble in the timezone map
 #. Translators: "timezone (utc shift)"
-#: ../panels/datetime/cc-datetime-panel.c:576
+#: ../panels/datetime/cc-datetime-panel.c:575
 #, c-format
 msgctxt "timezone map"
 msgid "%s (%s)"
@@ -1090,145 +1097,215 @@ 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:573
-msgid "Lid Closed"
-msgstr "Lid Closed"
+#: ../panels/display/cc-display-panel.c:738
+#| msgid "Landscape"
+msgctxt "Display rotation"
+msgid "Landscape"
+msgstr "Landscape"
 
-#. translators: "Mirrored" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:576
-msgid "Mirrored"
-msgstr "Mirrored"
+#: ../panels/display/cc-display-panel.c:741
+#| msgid "Portrait"
+msgctxt "Display rotation"
+msgid "Portrait Right"
+msgstr "Portrait Right"
 
-#: ../panels/display/cc-display-panel.c:578
-#: ../panels/display/cc-display-panel.c:2429
-msgid "Primary"
-msgstr "Primary"
+#: ../panels/display/cc-display-panel.c:744
+#| msgid "Portrait"
+msgctxt "Display rotation"
+msgid "Portrait Left"
+msgstr "Portrait Left"
 
-#: ../panels/display/cc-display-panel.c:580
-#: ../panels/notifications/cc-notifications-panel.c:257
-#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971
-#: ../panels/privacy/cc-privacy-panel.c:190
-#: ../panels/privacy/cc-privacy-panel.c:257
-#: ../panels/universal-access/cc-ua-panel.c:269
-#: ../panels/universal-access/cc-ua-panel.c:590
-#: ../panels/universal-access/cc-ua-panel.c:603
-#: ../panels/universal-access/cc-ua-panel.c:615
-#: ../panels/universal-access/cc-ua-panel.c:786
-#: ../panels/universal-access/uap.ui.h:6
-msgid "Off"
-msgstr "Off"
+#: ../panels/display/cc-display-panel.c:747
+#| msgid "Landscape"
+msgctxt "Display rotation"
+msgid "Landscape (flipped)"
+msgstr "Landscape (flipped)"
 
-#: ../panels/display/cc-display-panel.c:583
-msgid "Secondary"
-msgstr "Secondary"
+#. Translators: This option sets orientation of print (portrait, landscape...)
+#: ../panels/display/cc-display-panel.c:788
+#: ../panels/display/cc-display-panel.c:838
+#: ../panels/printers/pp-options-dialog.c:558
+msgid "Orientation"
+msgstr "Orientation"
 
-#. Title of displays dialog when multiple monitors are present.
-#: ../panels/display/cc-display-panel.c:1558
-msgid "Arrange Combined Displays"
-msgstr "Arrange Combined Displays"
+#: ../panels/display/cc-display-panel.c:881
+#: ../panels/display/cc-display-panel.c:933
+#: ../panels/display/cc-display-panel.c:1772
+#: ../panels/display/cc-display-panel.c:1818
+#: ../panels/printers/pp-options-dialog.c:87
+msgid "Resolution"
+msgstr "Resolution"
 
-#: ../panels/display/cc-display-panel.c:1562
-#: ../panels/display/cc-display-panel.c:2207
-#: ../panels/network/connection-editor/connection-editor.ui.h:2
-#: ../panels/network/network-wifi.ui.h:2
-msgid "_Apply"
-msgstr "_Apply"
+#: ../panels/display/cc-display-panel.c:978
+#: ../panels/display/cc-display-panel.c:1049
+msgid "Refresh Rate"
+msgstr "Refresh Rate"
 
-#: ../panels/display/cc-display-panel.c:1586
-msgid "Drag displays to rearrange them"
-msgstr "Drag displays to rearrange them"
+#: ../panels/display/cc-display-panel.c:1207
+#| msgctxt "background, style"
+#| msgid "Scale"
+msgid "Scale"
+msgstr "Scale"
 
-#. translators: example string is "60 Hz (NTSC)"
-#. * NTSC is https://en.wikipedia.org/wiki/NTSC
-#: ../panels/display/cc-display-panel.c:1793
-#, c-format
-msgid "%d Hz (NTSC)"
-msgstr "%d Hz (NTSC)"
+#: ../panels/display/cc-display-panel.c:1260
+msgid "Adjust for TV"
+msgstr "Adjust for TV"
 
-#. translators: example string is "60 Hz"
-#: ../panels/display/cc-display-panel.c:1799
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
+#: ../panels/display/cc-display-panel.c:1472
+#: ../panels/display/cc-display-panel.c:1518
+#| msgid "Secondary Display"
+msgid "Primary Display"
+msgstr "Primary Display"
 
-#: ../panels/display/cc-display-panel.c:2259
-msgid "Rotate counterclockwise by 90°"
-msgstr "Rotate anticlockwise by 90°"
+#: ../panels/display/cc-display-panel.c:1567
+#| msgid "Display language:"
+msgid "Display Arrangement"
+msgstr "Display Arrangement"
 
-#: ../panels/display/cc-display-panel.c:2277
-msgid "Rotate by 180°"
-msgstr "Rotate by 180°"
+#: ../panels/display/cc-display-panel.c:1568
+msgid ""
+"Drag displays to match your setup. The top bar is placed on the primary "
+"display."
+msgstr ""
+"Drag displays to match your setup. The top bar is placed on the primary "
+"display."
 
-#: ../panels/display/cc-display-panel.c:2295
-msgid "Rotate clockwise by 90°"
-msgstr "Rotate clockwise by 90°"
+#: ../panels/display/cc-display-panel.c:2006
+#| msgid "Display Type"
+msgid "Display Mode"
+msgstr "Display Mode"
 
-#: ../panels/display/cc-display-panel.c:2316
-msgid "Size"
-msgstr "Size"
+#: ../panels/display/cc-display-panel.c:2022
+#| msgctxt "universal access, seeing"
+#| msgid "Display"
+msgid "Join Displays"
+msgstr "Join Displays"
 
-#. aspect ratio
-#: ../panels/display/cc-display-panel.c:2331
-msgid "Aspect Ratio"
-msgstr "Aspect Ratio"
+#: ../panels/display/cc-display-panel.c:2025
+msgid "Mirror"
+msgstr "Mirror"
 
-#: ../panels/display/cc-display-panel.c:2354
-#: ../panels/printers/pp-options-dialog.c:85
-msgid "Resolution"
-msgstr "Resolution"
+#: ../panels/display/cc-display-panel.c:2028
+#| msgctxt "universal access, seeing"
+#| msgid "Display"
+msgid "Single Display"
+msgstr "Single Display"
 
-#: ../panels/display/cc-display-panel.c:2374
-msgid "Adjust for TV"
-msgstr "Adjust for TV"
+#: ../panels/display/cc-display-panel.c:2714
+msgid "Apply Changes?"
+msgstr "Apply Changes?"
 
-#: ../panels/display/cc-display-panel.c:2398
-msgid "Refresh Rate"
-msgstr "Refresh Rate"
+#: ../panels/display/cc-display-panel.c:2728
+#: ../panels/network/connection-editor/connection-editor.ui.h:2
+#: ../panels/network/network-wifi.ui.h:2
+msgid "_Apply"
+msgstr "_Apply"
+
+#: ../panels/display/cc-display-panel.c:3104
+#, c-format
+msgid "%.2lf Hz"
+msgstr "%.2lf Hz"
 
-#: ../panels/display/cc-display-panel.c:2430
-msgid "Show the top bar and Activities Overview on this display"
-msgstr "Show the top bar and Activities Overview on this display"
+#. TRANSLATORS: the state of the night light setting
+#: ../panels/display/cc-display-panel.c:3320
+#: ../panels/notifications/cc-notifications-panel.c:293
+#: ../panels/power/cc-power-panel.c:1970 ../panels/power/cc-power-panel.c:1977
+#: ../panels/privacy/cc-privacy-panel.c:190
+#: ../panels/privacy/cc-privacy-panel.c:257
+#: ../panels/universal-access/cc-ua-panel.c:331
+#: ../panels/universal-access/cc-ua-panel.c:712
+#: ../panels/universal-access/cc-ua-panel.c:725
+#: ../panels/universal-access/cc-ua-panel.c:737
+#: ../panels/universal-access/cc-ua-panel.c:908
+msgid "On"
+msgstr "On"
+
+#: ../panels/display/cc-display-panel.c:3320 ../panels/network/net-proxy.c:54
+#: ../panels/notifications/cc-notifications-panel.c:293
+#: ../panels/power/cc-power-panel.c:1964 ../panels/power/cc-power-panel.c:1975
+#: ../panels/privacy/cc-privacy-panel.c:190
+#: ../panels/privacy/cc-privacy-panel.c:257
+#: ../panels/universal-access/cc-ua-panel.c:331
+#: ../panels/universal-access/cc-ua-panel.c:712
+#: ../panels/universal-access/cc-ua-panel.c:725
+#: ../panels/universal-access/cc-ua-panel.c:737
+#: ../panels/universal-access/cc-ua-panel.c:908
+#: ../panels/universal-access/uap.ui.h:7
+msgid "Off"
+msgstr "Off"
 
-#: ../panels/display/cc-display-panel.c:2436
-msgid "Secondary Display"
-msgstr "Secondary Display"
+#: ../panels/display/cc-display-panel.c:3341
+#| msgid "Right Ring"
+msgid "_Night Light"
+msgstr "_Night Light"
 
-#: ../panels/display/cc-display-panel.c:2437
-msgid "Join this display with another to create an extra workspace"
-msgstr "Join this display with another to create an extra workspace"
+#: ../panels/display/cc-display-panel.c:3406
+msgid "Could not get screen information"
+msgstr "Could not get screen information"
 
-#: ../panels/display/cc-display-panel.c:2444
-msgid "Presentation"
-msgstr "Presentation"
+#. This cancels the redshift inhibit.
+#: ../panels/display/display.ui.h:2
+#| msgid "Restart Now"
+msgid "Restart Filter"
+msgstr "Restart Filter"
 
-#: ../panels/display/cc-display-panel.c:2445
-msgid "Show slideshows and media only"
-msgstr "Show slideshows and media only"
+#. Inhibit the redshift functionality until the next day starts
+#: ../panels/display/display.ui.h:4
+msgid "Temporarily Disabled Until Tomorrow"
+msgstr "Temporarily Disabled Until Tomorrow"
 
-#. translators: "Mirror" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:2450
-msgid "Mirror"
-msgstr "Mirror"
+#: ../panels/display/display.ui.h:5
+msgid ""
+"Night light makes the screen color warmer. This can help to prevent eye "
+"strain and sleeplessness."
+msgstr ""
+"Night light makes the screen colour warmer. This can help to prevent eye "
+"strain and sleeplessness."
 
-#: ../panels/display/cc-display-panel.c:2451
-msgid "Show your existing view on both displays"
-msgstr "Show your existing view on both displays"
+#. This is the redshift functionality where we suppress blue light when the sun has gone down
+#: ../panels/display/display.ui.h:7
+#| msgid "Right Ring"
+msgid "Night Light"
+msgstr "Night Light"
 
-#: ../panels/display/cc-display-panel.c:2457
-msgid "Turn Off"
-msgstr "Turn Off"
+#: ../panels/display/display.ui.h:8
+msgid "Schedule"
+msgstr "Schedule"
 
-#: ../panels/display/cc-display-panel.c:2458
-msgid "Don't use this display"
-msgstr "Don't use this display"
+#: ../panels/display/display.ui.h:9
+msgid "Sunset to Sunrise"
+msgstr "Sunset to Sunrise"
 
-#: ../panels/display/cc-display-panel.c:2769
-msgid "Could not get screen information"
-msgstr "Could not get screen information"
+#: ../panels/display/display.ui.h:10
+#: ../panels/network/connection-editor/ip4-page.ui.h:4
+#: ../panels/network/connection-editor/ip6-page.ui.h:5
+#: ../panels/network/net-proxy.c:56 ../panels/network/network-proxy.ui.h:3
+#: ../panels/network/network-wifi.ui.h:26
+#: ../panels/privacy/cc-privacy-panel.c:217
+msgid "Manual"
+msgstr "Manual"
+
+#: ../panels/display/display.ui.h:11
+msgid "From"
+msgstr "From"
+
+#: ../panels/display/display.ui.h:12
+msgid ":"
+msgstr ":"
+
+#. This is the short form for the time period in the morning
+#: ../panels/display/display.ui.h:14
+msgid "AM"
+msgstr "AM"
+
+#. This is the short form for the time period in the afternoon
+#: ../panels/display/display.ui.h:16
+msgid "PM"
+msgstr "PM"
 
-#: ../panels/display/cc-display-panel.c:2800
-msgid "_Arrange Combined Displays"
-msgstr "_Arrange Combined Displays"
+#: ../panels/display/display.ui.h:17
+msgid "To"
+msgstr "To"
 
 #. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:2
@@ -1241,71 +1318,99 @@ msgstr "Choose how to use connected monitors and projectors"
 
 #. Translators: those are keywords for the display control-center panel
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:5
-msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;"
-msgstr "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;"
-
-#: ../panels/info/cc-info-panel.c:345
-msgid "Wayland"
-msgstr "Wayland"
+#| msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;"
+msgid ""
+"Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;Night;Light;Blue;"
+"redshift;color;sunset;sunrise;"
+msgstr ""
+"Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;Night;Light;Blue;"
+"redshift;colour;sunset;sunrise;"
 
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123
+#: ../panels/info/cc-info-overview-panel.c:381
+#: ../panels/info/cc-info-overview-panel.c:468
+#: ../panels/network/panel-common.c:123
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../panels/info/cc-info-panel.c:481
+#. translators: This is the name of the OS, followed by the build ID, for
+#. * example:
+#. * "Fedora 25 (Workstation Edition); Build ID: xyz" or
+#. * "Ubuntu 16.04 LTS; Build ID: jki"
+#: ../panels/info/cc-info-overview-panel.c:476
 #, c-format
-msgid "%s %d-bit (Build ID: %s)"
-msgstr "%s %d-bit (Build ID: %s)"
+#| msgid "%d-bit (Build ID: %s)"
+msgid "%s; Build ID: %s"
+msgstr "%s; Build ID: %s"
 
-#: ../panels/info/cc-info-panel.c:483
+#. translators: This is the type of architecture for the OS
+#: ../panels/info/cc-info-overview-panel.c:493
 #, c-format
-msgid "%d-bit (Build ID: %s)"
-msgstr "%d-bit (Build ID: %s)"
+#| msgid "%d-bit"
+msgid "64-bit"
+msgstr "64-bit"
 
-#: ../panels/info/cc-info-panel.c:491
+#. translators: This is the type of architecture for the OS
+#: ../panels/info/cc-info-overview-panel.c:496
 #, c-format
-msgid "%s %d-bit"
-msgstr "%s %d-bit"
+#| msgid "%d-bit"
+msgid "32-bit"
+msgstr "32-bit"
 
-#: ../panels/info/cc-info-panel.c:493
+#: ../panels/info/cc-info-overview-panel.c:800
 #, c-format
-msgid "%d-bit"
-msgstr "%d-bit"
+msgid "Version %s"
+msgstr "Version %s"
+
+#: ../panels/info/cc-info-panel.c:138
+msgid "Section"
+msgstr "Section"
+
+#: ../panels/info/cc-info-panel.c:147 ../panels/info/info.ui.h:1
+msgid "Overview"
+msgstr "Overview"
 
-#: ../panels/info/cc-info-panel.c:1174
+#: ../panels/info/cc-info-panel.c:153 ../panels/info/info.ui.h:2
+msgid "Default Applications"
+msgstr "Default Applications"
+
+#: ../panels/info/cc-info-panel.c:158 ../panels/info/info.ui.h:3
+msgid "Removable Media"
+msgstr "Removable Media"
+
+#: ../panels/info/cc-info-removable-media-panel.c:312
 msgid "Ask what to do"
 msgstr "Ask what to do"
 
-#: ../panels/info/cc-info-panel.c:1178
+#: ../panels/info/cc-info-removable-media-panel.c:316
 msgid "Do nothing"
 msgstr "Do nothing"
 
-#: ../panels/info/cc-info-panel.c:1182
+#: ../panels/info/cc-info-removable-media-panel.c:320
 msgid "Open folder"
 msgstr "Open folder"
 
-#: ../panels/info/cc-info-panel.c:1273
+#: ../panels/info/cc-info-removable-media-panel.c:411
 msgid "Other Media"
 msgstr "Other Media"
 
-#: ../panels/info/cc-info-panel.c:1304
+#: ../panels/info/cc-info-removable-media-panel.c:444
 msgid "Select an application for audio CDs"
 msgstr "Select an application for audio CDs"
 
-#: ../panels/info/cc-info-panel.c:1305
+#: ../panels/info/cc-info-removable-media-panel.c:445
 msgid "Select an application for video DVDs"
 msgstr "Select an application for video DVDs"
 
-#: ../panels/info/cc-info-panel.c:1306
+#: ../panels/info/cc-info-removable-media-panel.c:446
 msgid "Select an application to run when a music player is connected"
 msgstr "Select an application to run when a music player is connected"
 
-#: ../panels/info/cc-info-panel.c:1307
+#: ../panels/info/cc-info-removable-media-panel.c:447
 msgid "Select an application to run when a camera is connected"
 msgstr "Select an application to run when a camera is connected"
 
-#: ../panels/info/cc-info-panel.c:1308
+#: ../panels/info/cc-info-removable-media-panel.c:448
 msgid "Select an application for software CDs"
 msgstr "Select an application for software CDs"
 
@@ -1314,85 +1419,82 @@ msgstr "Select an application for software CDs"
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-panel.c:1320
+#: ../panels/info/cc-info-removable-media-panel.c:460
 msgid "audio DVD"
 msgstr "audio DVD"
 
-#: ../panels/info/cc-info-panel.c:1321
+#: ../panels/info/cc-info-removable-media-panel.c:461
 msgid "blank Blu-ray disc"
 msgstr "blank Blu-ray disc"
 
-#: ../panels/info/cc-info-panel.c:1322
+#: ../panels/info/cc-info-removable-media-panel.c:462
 msgid "blank CD disc"
 msgstr "blank CD disc"
 
-#: ../panels/info/cc-info-panel.c:1323
+#: ../panels/info/cc-info-removable-media-panel.c:463
 msgid "blank DVD disc"
 msgstr "blank DVD disc"
 
-#: ../panels/info/cc-info-panel.c:1324
+#: ../panels/info/cc-info-removable-media-panel.c:464
 msgid "blank HD DVD disc"
 msgstr "blank HD DVD disc"
 
-#: ../panels/info/cc-info-panel.c:1325
+#: ../panels/info/cc-info-removable-media-panel.c:465
 msgid "Blu-ray video disc"
 msgstr "Blu-ray video disc"
 
-#: ../panels/info/cc-info-panel.c:1326
+#: ../panels/info/cc-info-removable-media-panel.c:466
 msgid "e-book reader"
 msgstr "e-book reader"
 
-#: ../panels/info/cc-info-panel.c:1327
+#: ../panels/info/cc-info-removable-media-panel.c:467
 msgid "HD DVD video disc"
 msgstr "HD DVD video disc"
 
-#: ../panels/info/cc-info-panel.c:1328
+#: ../panels/info/cc-info-removable-media-panel.c:468
 msgid "Picture CD"
 msgstr "Picture CD"
 
-#: ../panels/info/cc-info-panel.c:1329
+#: ../panels/info/cc-info-removable-media-panel.c:469
 msgid "Super Video CD"
 msgstr "Super Video CD"
 
-#: ../panels/info/cc-info-panel.c:1330
+#: ../panels/info/cc-info-removable-media-panel.c:470
 msgid "Video CD"
 msgstr "Video CD"
 
-#: ../panels/info/cc-info-panel.c:1331
+#: ../panels/info/cc-info-removable-media-panel.c:471
 msgid "Windows software"
 msgstr "Windows software"
 
-#: ../panels/info/cc-info-panel.c:1454
-msgid "Section"
-msgstr "Section"
-
-#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14
-msgid "Overview"
-msgstr "Overview"
-
-#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21
-msgid "Default Applications"
-msgstr "Default Applications"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:2
+#| msgid "Default Applications"
+msgid "Defa­ult Applications"
+msgstr "Defa­ult Applications"
 
-#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29
-msgid "Removable Media"
-msgstr "Removable Media"
+#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:3
+#| msgid "Default Applications"
+msgid "Configure Default Applications"
+msgstr "Configure Default Applications"
 
-#: ../panels/info/cc-info-panel.c:1499
-#, c-format
-msgid "Version %s"
-msgstr "Version %s"
+#. Translators: those are keywords for the Default Applications panel
+#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:5
+msgid "default;application;preferred;media;"
+msgstr "default;application;preferred;media;"
 
 #. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:2
-msgid "De­tails"
-msgstr "De­tails"
+#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:2
+msgid "Ab­out"
+msgstr "Ab­out"
 
+#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:3
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:3
 msgid "View information about your system"
 msgstr "View information about your system"
 
 #. sure that you use the same "translation" for those keywords
+#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:5
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:5
 msgid ""
 "device;system;information;memory;processor;version;default;application;"
@@ -1401,107 +1503,141 @@ msgstr ""
 "device;system;information;memory;processor;version;default;application;"
 "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
 
-#: ../panels/info/info.ui.h:1
-msgid "Select how other media should be handled"
-msgstr "Select how other media should be handled"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/info/gnome-info-panel.desktop.in.in.h:2
+msgid "De­tails"
+msgstr "De­tails"
 
-#: ../panels/info/info.ui.h:2
-msgid "_Action:"
-msgstr "_Action:"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:2
+#| msgid "Removable Media"
+msgid "Remo­vable Media"
+msgstr "Remo­vable Media"
+
+#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:3
+#| msgid "Configure Bluetooth settings"
+msgid "Configure Removable Media settings"
+msgstr "Configure Removable Media settings"
+
+#. Translators: those are keywords for the Removable Media panel
+#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:5
+#| msgid ""
+#| "device;system;information;memory;processor;version;default;application;"
+#| "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
+msgid ""
+"device;system;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;"
 
-#: ../panels/info/info.ui.h:3
-msgid "_Type:"
-msgstr "_Type:"
+#: ../panels/info/info-default-apps.ui.h:1
+msgid "_Web"
+msgstr "_Web"
+
+#: ../panels/info/info-default-apps.ui.h:2
+msgid "_Mail"
+msgstr "_Mail"
+
+#: ../panels/info/info-default-apps.ui.h:3
+msgid "_Calendar"
+msgstr "_Calendar"
 
-#: ../panels/info/info.ui.h:4
+#: ../panels/info/info-default-apps.ui.h:4
+msgid "M_usic"
+msgstr "M_usic"
+
+#: ../panels/info/info-default-apps.ui.h:5
+msgid "_Video"
+msgstr "_Video"
+
+#: ../panels/info/info-default-apps.ui.h:6
+#: ../panels/info/info-removable-media.ui.h:5
+msgid "_Photos"
+msgstr "_Photos"
+
+#: ../panels/info/info-overview.ui.h:1
 msgid "Device name"
 msgstr "Device name"
 
-#: ../panels/info/info.ui.h:5
+#: ../panels/info/info-overview.ui.h:2
 msgid "Memory"
 msgstr "Memory"
 
-#: ../panels/info/info.ui.h:6
+#: ../panels/info/info-overview.ui.h:3
 msgid "Processor"
 msgstr "Processor"
 
-#. To translators: this field contains the distro name, version and type
-#: ../panels/info/info.ui.h:8
-msgid "Base system"
-msgstr "Base system"
+#: ../panels/info/info-overview.ui.h:4
+msgid "Graphics"
+msgstr "Graphics"
+
+#. To translators: this field contains the distro name and version
+#: ../panels/info/info-overview.ui.h:6
+msgid "OS name"
+msgstr "OS name"
+
+#. To translators: this field contains the distro type
+#: ../panels/info/info-overview.ui.h:8
+msgid "OS type"
+msgstr "OS type"
+
+#: ../panels/info/info-overview.ui.h:9
+msgid "Virtualization"
+msgstr "Virtualisation"
 
-#: ../panels/info/info.ui.h:9
+#: ../panels/info/info-overview.ui.h:10
 msgid "Disk"
 msgstr "Disk"
 
-#: ../panels/info/info.ui.h:10
+#: ../panels/info/info-overview.ui.h:11
 msgid "Calculating…"
 msgstr "Calculating…"
 
-#: ../panels/info/info.ui.h:11
-msgid "Graphics"
-msgstr "Graphics"
-
-#: ../panels/info/info.ui.h:12
-msgid "Virtualization"
-msgstr "Virtualisation"
-
-#: ../panels/info/info.ui.h:13
+#: ../panels/info/info-overview.ui.h:12
 msgid "Check for updates"
 msgstr "Check for updates"
 
-#: ../panels/info/info.ui.h:15
-msgid "_Web"
-msgstr "_Web"
-
-#: ../panels/info/info.ui.h:16
-msgid "_Mail"
-msgstr "_Mail"
-
-#: ../panels/info/info.ui.h:17
-msgid "_Calendar"
-msgstr "_Calendar"
-
-#: ../panels/info/info.ui.h:18
-msgid "M_usic"
-msgstr "M_usic"
-
-#: ../panels/info/info.ui.h:19
-msgid "_Video"
-msgstr "_Video"
-
-#: ../panels/info/info.ui.h:20
-msgid "_Photos"
-msgstr "_Photos"
-
-#: ../panels/info/info.ui.h:22
+#: ../panels/info/info-removable-media.ui.h:1
 msgid "Select how media should be handled"
 msgstr "Select how media should be handled"
 
-#: ../panels/info/info.ui.h:23
+#: ../panels/info/info-removable-media.ui.h:2
 msgid "CD _audio"
 msgstr "CD _audio"
 
-#: ../panels/info/info.ui.h:24
+#: ../panels/info/info-removable-media.ui.h:3
 msgid "_DVD video"
 msgstr "_DVD video"
 
-#: ../panels/info/info.ui.h:25
+#: ../panels/info/info-removable-media.ui.h:4
 msgid "_Music player"
 msgstr "_Music player"
 
-#: ../panels/info/info.ui.h:26
+#: ../panels/info/info-removable-media.ui.h:6
 msgid "_Software"
 msgstr "_Software"
 
-#: ../panels/info/info.ui.h:27
+#: ../panels/info/info-removable-media.ui.h:7
 msgid "_Other Media…"
 msgstr "_Other Media…"
 
-#: ../panels/info/info.ui.h:28
+#: ../panels/info/info-removable-media.ui.h:8
 msgid "_Never prompt or start programs on media insertion"
 msgstr "_Never prompt or start programs on media insertion"
 
+#: ../panels/info/info-removable-media.ui.h:9
+msgid "Select how other media should be handled"
+msgstr "Select how other media should be handled"
+
+#: ../panels/info/info-removable-media.ui.h:10
+msgid "_Action:"
+msgstr "_Action:"
+
+#: ../panels/info/info-removable-media.ui.h:11
+msgid "_Type:"
+msgstr "_Type:"
+
 #: ../panels/keyboard/00-multimedia.xml.in.h:1
 msgid "Sound and Media"
 msgstr "Sound and Media"
@@ -1547,7 +1683,7 @@ msgid "Eject"
 msgstr "Eject"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:1
-#: ../panels/universal-access/uap.ui.h:11
+#: ../panels/universal-access/uap.ui.h:12
 msgid "Typing"
 msgstr "Typing"
 
@@ -1567,8 +1703,8 @@ msgstr "Launchers"
 msgid "Launch help browser"
 msgstr "Launch help browser"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274
-#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584
+#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:1590
+#: ../shell/cc-window.c:251 ../shell/cc-window.c:794
 #: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1
 msgid "Settings"
 msgstr "Settings"
@@ -1677,9 +1813,9 @@ msgstr "Decrease text size"
 msgid "High contrast on or off"
 msgstr "High contrast on or off"
 
+#: ../panels/keyboard/cc-keyboard-manager.c:506
 #: ../panels/keyboard/cc-keyboard-manager.c:514
-#: ../panels/keyboard/cc-keyboard-manager.c:522
-#: ../panels/keyboard/cc-keyboard-manager.c:830
+#: ../panels/keyboard/cc-keyboard-manager.c:822
 msgid "Custom Shortcuts"
 msgstr "Custom Shortcuts"
 
@@ -1690,11 +1826,12 @@ msgstr "Custom Shortcuts"
 #. * The device has been disabled
 #: ../panels/keyboard/cc-keyboard-option.c:276
 #: ../panels/keyboard/cc-keyboard-option.c:395
-#: ../panels/keyboard/keyboard-shortcuts.c:440
+#: ../panels/keyboard/keyboard-shortcuts.c:435
 #: ../panels/keyboard/shortcut-editor.ui.h:2
+#: ../panels/network/network-proxy.ui.h:4
 #: ../panels/network/network-wifi.ui.h:31
-#: ../panels/sound/gvc/gvc-mixer-control.c:1830
-#: ../panels/user-accounts/um-fingerprint-dialog.c:213
+#: ../panels/sound/gvc/gvc-mixer-control.c:1866
+#: ../panels/user-accounts/um-fingerprint-dialog.c:214
 msgid "Disabled"
 msgstr "Disabled"
 
@@ -1718,11 +1855,36 @@ msgstr "Compose Key"
 msgid "Modifiers-only switch to next source"
 msgstr "Modifiers-only switch to next source"
 
-#: ../panels/keyboard/cc-keyboard-panel.c:215
+#: ../panels/keyboard/cc-keyboard-panel.c:181
+#| msgid "Set Shortcut"
+msgid "Reset All Shortcuts?"
+msgstr "Reset All Shortcuts?"
+
+#: ../panels/keyboard/cc-keyboard-panel.c:184
+msgid ""
+"Resetting the shortcuts may affect your custom shortcuts. This cannot be "
+"undone."
+msgstr ""
+"Resetting the shortcuts may affect your custom shortcuts. This cannot be "
+"undone."
+
+#: ../panels/keyboard/cc-keyboard-panel.c:188
+#: ../panels/keyboard/shortcut-editor.ui.h:9
+#: ../panels/printers/authentication-dialog.ui.h:2
+#: ../panels/printers/ppd-selection-dialog.ui.h:2
+msgid "Cancel"
+msgstr "Cancel"
+
+#: ../panels/keyboard/cc-keyboard-panel.c:189
+#| msgid "Reset"
+msgid "Reset All"
+msgstr "Reset All"
+
+#: ../panels/keyboard/cc-keyboard-panel.c:281
 msgid "Reset the shortcut to its default value"
 msgstr "Reset the shortcut to its default value"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:427
 #, c-format
 msgid ""
 "%s is already being used for <b>%s</b>. If you replace it, %s will be "
@@ -1731,22 +1893,21 @@ msgstr ""
 "%s is already being used for <b>%s</b>. If you replace it, %s will be "
 "disabled"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:597
 msgid "Set Custom Shortcut"
 msgstr "Set Custom Shortcuts"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514
-#: ../panels/keyboard/shortcut-editor.ui.h:7
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:597
 msgid "Set Shortcut"
 msgstr "Set Shortcut"
 
 #. Setup the top label
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:606
 #, c-format
 msgid "Enter new shortcut to change <b>%s</b>."
 msgstr "Enter new shortcut to change <b>%s</b>."
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:937
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:1033
 msgid "Add Custom Shortcut"
 msgstr "Add Custom Shortcut"
 
@@ -1761,22 +1922,39 @@ msgstr "View and change keyboard shortcuts and set your typing preferences"
 
 #. Translators: those are keywords for the keyboard control-center panel
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5
-msgid "Shortcut;Repeat;Blink;"
-msgstr "Shortcut;Repeat;Blink;"
+msgid ""
+"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;"
+msgstr ""
+"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1
+#: ../panels/region/input-options.ui.h:4 ../shell/cc-application.c:251
+msgid "Keyboard Shortcuts"
+msgstr "Keyboard Shortcuts"
+
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
+msgid "Reset All…"
+msgstr "Reset All…"
+
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:3
+#| msgid "Reset the shortcut to its default value"
+msgid "Reset all shortcuts to their default keybindings"
+msgstr "Reset all shortcuts to their default keybindings"
+
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
 msgid "No keyboard shortcut found"
 msgstr "No keyboard shortcut found"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 ../shell/panel-list.ui.h:4
 msgid "Try a different search"
 msgstr "Try a different search"
 
 #: ../panels/keyboard/shortcut-editor.ui.h:1
-msgid "Press Esc to cancel."
-msgstr "Press Esc to cancel."
+msgid "Press Esc to cancel or Backspace to reset the keyboard shortcut."
+msgstr "Press Esc to cancel or Backspace to reset the keyboard shortcut."
 
 #: ../panels/keyboard/shortcut-editor.ui.h:3
+#: ../panels/printers/details-dialog.ui.h:1
 #: ../panels/sound/gvc-mixer-dialog.c:1493
 #: ../panels/sound/gvc-sound-theme-chooser.c:564
 msgid "Name"
@@ -1791,43 +1969,36 @@ msgid "Shortcut"
 msgstr "Shortcut"
 
 #: ../panels/keyboard/shortcut-editor.ui.h:6
-msgid "Edit"
-msgstr "Edit"
+#| msgid "Set Shortcut"
+msgid "Set Shortcut…"
+msgstr "Set Shortcut…"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:8
+#: ../panels/keyboard/shortcut-editor.ui.h:7
 #: ../panels/network/network-wifi.ui.h:20
 msgid "None"
 msgstr "None"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:9
-msgid "Remove"
-msgstr "Remove"
-
-#: ../panels/keyboard/shortcut-editor.ui.h:10
+#: ../panels/keyboard/shortcut-editor.ui.h:8
 msgid "Enter the new shortcut"
 msgstr "Enter the new shortcut"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:11
-#: ../panels/printers/authentication-dialog.ui.h:2
-#: ../panels/printers/ppd-selection-dialog.ui.h:2
-msgid "Cancel"
-msgstr "Cancel"
+#: ../panels/keyboard/shortcut-editor.ui.h:10
+msgid "Remove"
+msgstr "Remove"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:12
-#: ../panels/network/connection-editor/ce-page-ip4.c:276
-#: ../panels/network/connection-editor/ce-page-ip6.c:277
+#: ../panels/keyboard/shortcut-editor.ui.h:11
 msgid "Add"
 msgstr "Add"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:13
+#: ../panels/keyboard/shortcut-editor.ui.h:12
 msgid "Replace"
 msgstr "Replace"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:14
+#: ../panels/keyboard/shortcut-editor.ui.h:13
 msgid "Set"
 msgstr "Set"
 
-#: ../panels/mouse/cc-mouse-panel.c:82
+#: ../panels/mouse/cc-mouse-panel.c:82 ../panels/wacom/cc-wacom-panel.c:402
 msgid "Test Your _Settings"
 msgstr "Test Your _Settings"
 
@@ -1941,13 +2112,8 @@ msgstr "Double click, secondary button"
 msgid "Single click, secondary button"
 msgstr "Single click, secondary button"
 
-#. TRANSLATORS: this is to disable the radio hardware in the
-#. * network panel
-#: ../panels/network/cc-network-panel.c:349
-msgid "Air_plane Mode"
-msgstr "Aero_plane Mode"
-
-#: ../panels/network/cc-network-panel.c:953
+#. add proxy to device list
+#: ../panels/network/cc-network-panel.c:581
 msgid "Network proxy"
 msgstr "Network proxy"
 
@@ -1955,51 +2121,58 @@ msgstr "Network proxy"
 #. * window for vpn connections, it is also used to display
 #. * vpn connections in the device list.
 #.
-#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283
-#: ../panels/network/net-vpn.c:440
+#: ../panels/network/cc-network-panel.c:717 ../panels/network/net-vpn.c:192
+#: ../panels/network/net-vpn.c:321
 #, c-format
 msgid "%s VPN"
 msgstr "%s VPN"
 
-#: ../panels/network/cc-network-panel.c:1194
+#: ../panels/network/cc-network-panel.c:781 ../panels/network/wifi.ui.h:7
 msgid "Oops, something has gone wrong. Please contact your software vendor."
 msgstr "Oops, something has gone wrong. Please contact your software vendor."
 
-#: ../panels/network/cc-network-panel.c:1200
+#: ../panels/network/cc-network-panel.c:787
 msgid "NetworkManager needs to be running."
 msgstr "NetworkManager needs to be running."
 
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/network/cc-wifi-panel.c:209
+#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:2
+#: ../panels/network/network-wifi.ui.h:58
+msgid "Wi-Fi"
+msgstr "Wi-Fi"
+
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:1
 msgid "802.1x _Security"
 msgstr "802.1x _Security"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:2
-#: ../panels/network/connection-editor/security-page.ui.h:3
-#: ../panels/printers/printers.ui.h:14
+#: ../panels/network/connection-editor/security-page.ui.h:2
+#: ../panels/wacom/wacom-stylus-page.ui.h:8
 msgid "page 1"
 msgstr "page 1"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:3
-#: ../panels/network/connection-editor/security-page.ui.h:4
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:5
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:2
+#: ../panels/network/connection-editor/security-page.ui.h:3
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:4
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:1
 msgid "Anony_mous identity"
 msgstr "Anony_mous identity"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:4
-#: ../panels/network/connection-editor/security-page.ui.h:5
+#: ../panels/network/connection-editor/security-page.ui.h:4
 msgid "Inner _authentication"
 msgstr "Inner _authentication"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:5
-#: ../panels/network/connection-editor/security-page.ui.h:6
-#: ../panels/printers/printers.ui.h:16
+#: ../panels/network/connection-editor/security-page.ui.h:5
+#: ../panels/wacom/wacom-stylus-page.ui.h:16
 msgid "page 2"
 msgstr "page 2"
 
 #: ../panels/network/connection-editor/ce-page-8021x-security.c:101
-#: ../panels/network/connection-editor/ce-page-security.c:459
+#: ../panels/network/connection-editor/ce-page-security.c:445
 #: ../panels/network/connection-editor/details-page.ui.h:3
 #: ../panels/network/network-wifi.ui.h:6
 msgid "Security"
@@ -2015,47 +2188,47 @@ msgid "Profile %d"
 msgstr "Profile %d"
 
 #. TRANSLATORS: this WEP WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:50
-#: ../panels/network/net-device-wifi.c:214
-#: ../panels/network/net-device-wifi.c:390
+#: ../panels/network/connection-editor/ce-page-details.c:56
+#: ../panels/network/net-device-wifi.c:231
+#: ../panels/network/net-device-wifi.c:407
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:54
-#: ../panels/network/net-device-wifi.c:218
-#: ../panels/network/net-device-wifi.c:395
+#: ../panels/network/connection-editor/ce-page-details.c:60
+#: ../panels/network/net-device-wifi.c:235
+#: ../panels/network/net-device-wifi.c:412
 #: ../panels/network/network-wifi.ui.h:19
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:58
-#: ../panels/network/net-device-wifi.c:222
+#: ../panels/network/connection-editor/ce-page-details.c:64
+#: ../panels/network/net-device-wifi.c:239
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:63
-#: ../panels/network/net-device-wifi.c:227
+#: ../panels/network/connection-editor/ce-page-details.c:69
+#: ../panels/network/net-device-wifi.c:244
 msgid "Enterprise"
 msgstr "Enterprise"
 
-#: ../panels/network/connection-editor/ce-page-details.c:68
-#: ../panels/network/net-device-wifi.c:232
-#: ../panels/network/net-device-wifi.c:380
+#: ../panels/network/connection-editor/ce-page-details.c:74
+#: ../panels/network/net-device-wifi.c:249
+#: ../panels/network/net-device-wifi.c:397
 msgctxt "Wifi security"
 msgid "None"
 msgstr "None"
 
-#: ../panels/network/connection-editor/ce-page-details.c:89
+#: ../panels/network/connection-editor/ce-page-details.c:95
 #: ../panels/power/power.ui.h:17
 msgid "Never"
 msgstr "Never"
 
-#: ../panels/network/connection-editor/ce-page-details.c:104
+#: ../panels/network/connection-editor/ce-page-details.c:110
 #: ../panels/network/net-device-ethernet.c:120
-#: ../panels/network/net-device-wifi.c:485
+#: ../panels/network/net-device-wifi.c:505
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
@@ -2063,179 +2236,118 @@ msgstr[0] "%i day ago"
 msgstr[1] "%i days ago"
 
 #. Translators: network device speed
-#: ../panels/network/connection-editor/ce-page-details.c:153
+#: ../panels/network/connection-editor/ce-page-details.c:176
 #: ../panels/network/net-device-ethernet.c:50
-#: ../panels/network/net-device-wifi.c:542
+#: ../panels/network/net-device-wifi.c:561
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: ../panels/network/connection-editor/ce-page-details.c:179
-#: ../panels/network/net-device-wifi.c:571
+#: ../panels/network/connection-editor/ce-page-details.c:202
+#: ../panels/network/net-device-wifi.c:590
 msgctxt "Signal strength"
 msgid "None"
 msgstr "None"
 
-#: ../panels/network/connection-editor/ce-page-details.c:181
-#: ../panels/network/net-device-wifi.c:573
+#: ../panels/network/connection-editor/ce-page-details.c:204
+#: ../panels/network/net-device-wifi.c:592
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "Weak"
 
-#: ../panels/network/connection-editor/ce-page-details.c:183
-#: ../panels/network/net-device-wifi.c:575
+#: ../panels/network/connection-editor/ce-page-details.c:206
+#: ../panels/network/net-device-wifi.c:594
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "Ok"
 
-#: ../panels/network/connection-editor/ce-page-details.c:185
-#: ../panels/network/net-device-wifi.c:577
+#: ../panels/network/connection-editor/ce-page-details.c:208
+#: ../panels/network/net-device-wifi.c:596
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "Good"
 
-#: ../panels/network/connection-editor/ce-page-details.c:187
-#: ../panels/network/net-device-wifi.c:579
+#: ../panels/network/connection-editor/ce-page-details.c:210
+#: ../panels/network/net-device-wifi.c:598
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "Excellent"
 
-#: ../panels/network/connection-editor/ce-page-details.c:225
-#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266
+#: ../panels/network/connection-editor/ce-page-details.c:248
+#| msgid "Connection"
+msgid "Forget Connection"
+msgstr "Forget Connection"
+
+#: ../panels/network/connection-editor/ce-page-details.c:250
+#| msgid "Connection failed"
+msgid "Remove Connection Profile"
+msgstr "Remove Connection Profile"
+
+#: ../panels/network/connection-editor/ce-page-details.c:252
+#| msgid "Remove"
+msgid "Remove VPN"
+msgstr "Remove VPN"
+
+#: ../panels/network/connection-editor/ce-page-details.c:280
+#: ../panels/network/network-wifi.ui.h:46 ../shell/cc-window.c:243
+#: ../shell/panel-list.ui.h:2
 msgid "Details"
 msgstr "Details"
 
-#: ../panels/network/connection-editor/ce-page-ethernet.c:215
-#: ../panels/network/connection-editor/ce-page-vpn.c:221
-#: ../panels/network/connection-editor/ce-page-wifi.c:227
+#: ../panels/network/connection-editor/ce-page-ethernet.c:173
+#: ../panels/network/connection-editor/ce-page-vpn.c:188
+#: ../panels/network/connection-editor/ce-page-wifi.c:194
 #: ../panels/network/network-wifi.ui.h:47
 msgid "Identity"
 msgstr "Identity"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:178
-#: ../panels/network/connection-editor/ce-page-ip4.c:432
-#: ../panels/network/connection-editor/ce-page-ip6.c:180
-#: ../panels/network/connection-editor/ce-page-ip6.c:427
-msgid "Address"
-msgstr "Address"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:191
-#: ../panels/network/connection-editor/ce-page-ip4.c:445
-msgid "Netmask"
-msgstr "Netmask"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:205
-#: ../panels/network/connection-editor/ce-page-ip4.c:458
-#: ../panels/network/connection-editor/ce-page-ip6.c:206
-#: ../panels/network/connection-editor/ce-page-ip6.c:453
-#: ../panels/network/network-vpn.ui.h:2
-msgid "Gateway"
-msgstr "Gateway"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:222
-#: ../panels/network/connection-editor/ce-page-ip6.c:223
+#: ../panels/network/connection-editor/ce-page-ip4.c:251
+#: ../panels/network/connection-editor/ce-page-ip6.c:230
 msgid "Delete Address"
 msgstr "Delete Address"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:339
-#: ../panels/network/connection-editor/ce-page-ip6.c:334
-msgid "Server"
-msgstr "Server"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:356
-#: ../panels/network/connection-editor/ce-page-ip6.c:351
-msgid "Delete DNS Server"
-msgstr "Delete DNS Server"
-
-#. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
-#: ../panels/network/connection-editor/ce-page-ip4.c:472
-#: ../panels/network/connection-editor/ce-page-ip6.c:467
-msgctxt "network parameters"
-msgid "Metric"
-msgstr "Metric"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:493
-#: ../panels/network/connection-editor/ce-page-ip6.c:484
+#: ../panels/network/connection-editor/ce-page-ip4.c:422
+#: ../panels/network/connection-editor/ce-page-ip6.c:390
 msgid "Delete Route"
 msgstr "Delete Route"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:597
-#: ../panels/network/network-wifi.ui.h:27
-msgid "Automatic (DHCP)"
-msgstr "Automatic (DHCP)"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:601
-#: ../panels/network/connection-editor/ce-page-ip6.c:592
-#: ../panels/network/network-wifi.ui.h:26
-#: ../panels/privacy/cc-privacy-panel.c:217
-msgid "Manual"
-msgstr "Manual"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:605
-#: ../panels/network/connection-editor/ce-page-ip6.c:596
-msgid "Link-Local Only"
-msgstr "Link-Local Only"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:935
+#: ../panels/network/connection-editor/ce-page-ip4.c:896
 #: ../panels/network/network-wifi.ui.h:48
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:193
-#: ../panels/network/connection-editor/ce-page-ip6.c:440
-msgid "Prefix"
-msgstr "Prefix"
-
-#: ../panels/network/connection-editor/ce-page-ip6.c:584
-#: ../panels/network/connection-editor/ethernet-page.ui.h:1
-#: ../panels/network/connection-editor/ip4-page.ui.h:4
-#: ../panels/network/connection-editor/ip6-page.ui.h:4
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:2
-#: ../panels/privacy/cc-privacy-panel.c:217
-msgid "Automatic"
-msgstr "Automatic"
-
-#: ../panels/network/connection-editor/ce-page-ip6.c:588
-msgid "Automatic, DHCP only"
-msgstr "Automatic, DHCP only"
-
-#: ../panels/network/connection-editor/ce-page-ip6.c:898
+#: ../panels/network/connection-editor/ce-page-ip6.c:827
 #: ../panels/network/network-wifi.ui.h:49
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../panels/network/connection-editor/ce-page-reset.c:78
-#: ../panels/network/network-wifi.ui.h:51
-msgid "Reset"
-msgstr "Reset"
-
-#: ../panels/network/connection-editor/ce-page-security.c:248
+#: ../panels/network/connection-editor/ce-page-security.c:245
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "None"
 
-#: ../panels/network/connection-editor/ce-page-security.c:271
+#: ../panels/network/connection-editor/ce-page-security.c:268
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit Key (Hex or ASCII)"
 
-#: ../panels/network/connection-editor/ce-page-security.c:281
+#: ../panels/network/connection-editor/ce-page-security.c:278
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit Passphrase"
 
-#: ../panels/network/connection-editor/ce-page-security.c:294
-#: ../panels/network/wireless-security/wireless-security.c:463
+#: ../panels/network/connection-editor/ce-page-security.c:291
+#: ../panels/network/wireless-security/wireless-security.c:465
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../panels/network/connection-editor/ce-page-security.c:307
+#: ../panels/network/connection-editor/ce-page-security.c:304
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamic WEP (802.1x)"
 
-#: ../panels/network/connection-editor/ce-page-security.c:321
+#: ../panels/network/connection-editor/ce-page-security.c:318
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../panels/network/connection-editor/ce-page-security.c:335
+#: ../panels/network/connection-editor/ce-page-security.c:332
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
@@ -2251,7 +2363,6 @@ msgstr "Link speed"
 
 #: ../panels/network/connection-editor/details-page.ui.h:4
 #: ../panels/network/net-device-ethernet.c:153
-#: ../panels/network/network-simple.ui.h:3
 #: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644
 msgid "IPv4 Address"
 msgstr "IPv4 Address"
@@ -2260,14 +2371,12 @@ msgstr "IPv4 Address"
 #: ../panels/network/net-device-ethernet.c:154
 #: ../panels/network/net-device-ethernet.c:158
 #: ../panels/network/network-mobile.ui.h:4
-#: ../panels/network/network-simple.ui.h:4
 #: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645
 msgid "IPv6 Address"
 msgstr "IPv6 Address"
 
 #: ../panels/network/connection-editor/details-page.ui.h:6
 #: ../panels/network/net-device-ethernet.c:161
-#: ../panels/network/network-simple.ui.h:2
 #: ../panels/network/network-wifi.ui.h:9
 msgid "Hardware Address"
 msgstr "Hardware Address"
@@ -2275,17 +2384,15 @@ msgstr "Hardware Address"
 #: ../panels/network/connection-editor/details-page.ui.h:7
 #: ../panels/network/net-device-ethernet.c:165
 #: ../panels/network/network-mobile.ui.h:5
-#: ../panels/network/network-simple.ui.h:5
 #: ../panels/network/network-wifi.ui.h:10
 msgid "Default Route"
 msgstr "Default Route"
 
 #: ../panels/network/connection-editor/details-page.ui.h:8
-#: ../panels/network/connection-editor/ip4-page.ui.h:3
-#: ../panels/network/connection-editor/ip6-page.ui.h:3
+#: ../panels/network/connection-editor/ip4-page.ui.h:10
+#: ../panels/network/connection-editor/ip6-page.ui.h:11
 #: ../panels/network/net-device-ethernet.c:167
 #: ../panels/network/network-mobile.ui.h:6
-#: ../panels/network/network-simple.ui.h:6
 #: ../panels/network/network-wifi.ui.h:11
 msgid "DNS"
 msgstr "DNS"
@@ -2294,6 +2401,23 @@ msgstr "DNS"
 msgid "Last Used"
 msgstr "Last Used"
 
+#: ../panels/network/connection-editor/details-page.ui.h:10
+msgid "Connect _automatically"
+msgstr "Connect _automatically"
+
+#: ../panels/network/connection-editor/details-page.ui.h:11
+msgid "Make available to _other users"
+msgstr "Make available to _other users"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:1
+#: ../panels/network/connection-editor/ip4-page.ui.h:11
+#: ../panels/network/connection-editor/ip6-page.ui.h:2
+#: ../panels/network/net-proxy.c:58 ../panels/network/network-proxy.ui.h:2
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:1
+#: ../panels/privacy/cc-privacy-panel.c:217
+msgid "Automatic"
+msgstr "Automatic"
+
 #: ../panels/network/connection-editor/ethernet-page.ui.h:2
 msgid "Twisted Pair (TP)"
 msgstr "Twisted Pair (TP)"
@@ -2350,117 +2474,117 @@ msgstr "_Cloned Address"
 msgid "bytes"
 msgstr "bytes"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:15
-#: ../panels/network/connection-editor/vpn-page.ui.h:3
-msgid "Make available to other _users"
-msgstr "Make available to other _users"
+#: ../panels/network/connection-editor/ip4-page.ui.h:1
+#| msgid "_Method"
+msgid "IPv_4 Method"
+msgstr "IPv_4 Method"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:16
-#: ../panels/network/connection-editor/wifi-page.ui.h:7
-msgid "Connect _automatically"
-msgstr "Connect _automatically"
+#: ../panels/network/connection-editor/ip4-page.ui.h:2
+#: ../panels/network/network-wifi.ui.h:27
+msgid "Automatic (DHCP)"
+msgstr "Automatic (DHCP)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:17
-#: ../panels/network/connection-editor/security-page.ui.h:2
-#: ../panels/network/connection-editor/vpn-page.ui.h:2
-msgid "Firewall _Zone"
-msgstr "Firewall _Zone"
+#: ../panels/network/connection-editor/ip4-page.ui.h:3
+#: ../panels/network/connection-editor/ip6-page.ui.h:4
+msgid "Link-Local Only"
+msgstr "Link-Local Only"
 
-#: ../panels/network/connection-editor/firewall-helpers.c:49
-#: ../panels/network/connection-editor/firewall-helpers.c:118
-msgctxt "Firewall zone"
-msgid "Default"
-msgstr "Default"
+#: ../panels/network/connection-editor/ip4-page.ui.h:5
+#: ../panels/network/connection-editor/ip6-page.ui.h:6
+#| msgid "Disabled"
+msgid "Disable"
+msgstr "Disable"
 
-#: ../panels/network/connection-editor/firewall-helpers.c:50
-msgid "The zone defines the trust level of the connection"
-msgstr "The zone defines the trust level of the connection"
+#: ../panels/network/connection-editor/ip4-page.ui.h:6
+#: ../panels/network/connection-editor/ip6-page.ui.h:7
+#| msgid "_Addresses"
+msgid "Addresses"
+msgstr "Addresses"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:24
-msgid "IPv_4"
-msgstr "IPv_4"
+#: ../panels/network/connection-editor/ip4-page.ui.h:7
+#: ../panels/network/connection-editor/ip6-page.ui.h:8
+#: ../panels/printers/details-dialog.ui.h:3
+msgid "Address"
+msgstr "Address"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:2
-#: ../panels/network/connection-editor/ip6-page.ui.h:2
-#: ../panels/network/network-wifi.ui.h:25
-msgid "_Addresses"
-msgstr "_Addresses"
+#: ../panels/network/connection-editor/ip4-page.ui.h:8
+msgid "Netmask"
+msgstr "Netmask"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:5
-#: ../panels/network/connection-editor/ip6-page.ui.h:5
+#: ../panels/network/connection-editor/ip4-page.ui.h:9
+#: ../panels/network/connection-editor/ip6-page.ui.h:10
+msgid "Gateway"
+msgstr "Gateway"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:12
+#: ../panels/network/connection-editor/ip6-page.ui.h:12
 msgid "Automatic DNS"
 msgstr "Automatic DNS"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:6
-#: ../panels/network/connection-editor/ip6-page.ui.h:6
+#: ../panels/network/connection-editor/ip4-page.ui.h:13
+#: ../panels/network/connection-editor/ip6-page.ui.h:13
+msgid "Separate IP addresses with commas"
+msgstr "Separate IP addresses with commas"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:14
+#: ../panels/network/connection-editor/ip6-page.ui.h:14
 #: ../panels/network/network-wifi.ui.h:32
 msgid "Routes"
 msgstr "Routes"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:7
-#: ../panels/network/connection-editor/ip6-page.ui.h:7
+#: ../panels/network/connection-editor/ip4-page.ui.h:15
+#: ../panels/network/connection-editor/ip6-page.ui.h:15
 msgid "Automatic Routes"
 msgstr "Automatic Routes"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:8
-#: ../panels/network/connection-editor/ip6-page.ui.h:8
+#. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
+#: ../panels/network/connection-editor/ip4-page.ui.h:17
+#: ../panels/network/connection-editor/ip6-page.ui.h:17
+#| msgctxt "network parameters"
+#| msgid "Metric"
+msgid "Metric"
+msgstr "Metric"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:18
+#: ../panels/network/connection-editor/ip6-page.ui.h:18
 #: ../panels/network/network-wifi.ui.h:34
 msgid "Use this connection _only for resources on its network"
 msgstr "Use this connection _only for resources on its network"
 
 #: ../panels/network/connection-editor/ip6-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:36
-msgid "IPv_6"
-msgstr "IPv_6"
+#| msgid "_Method"
+msgid "IPv_6 Method"
+msgstr "IPv_6 Method"
+
+#: ../panels/network/connection-editor/ip6-page.ui.h:3
+msgid "Automatic, DHCP only"
+msgstr "Automatic, DHCP only"
+
+#: ../panels/network/connection-editor/ip6-page.ui.h:9
+msgid "Prefix"
+msgstr "Prefix"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:296
+#: ../panels/network/connection-editor/net-connection-editor.c:273
 msgid "Unable to open connection editor"
 msgstr "Unable to open connection editor"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:314
+#: ../panels/network/connection-editor/net-connection-editor.c:291
 msgid "New Profile"
 msgstr "New Profile"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:635
+#: ../panels/network/connection-editor/net-connection-editor.c:603
+#: ../panels/network/network.ui.h:2
 msgid "VPN"
 msgstr "VPN"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:783
+#: ../panels/network/connection-editor/net-connection-editor.c:751
 msgid "Import from file…"
 msgstr "Import from file…"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:817
+#: ../panels/network/connection-editor/net-connection-editor.c:785
 msgid "Add VPN"
 msgstr "Add VPN"
 
-#: ../panels/network/connection-editor/reset-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:41
-msgid "_Reset"
-msgstr "_Reset"
-
-#: ../panels/network/connection-editor/reset-page.ui.h:2
-#: ../panels/network/net-device-wifi.c:1536
-#: ../panels/network/network-wifi.ui.h:42
-msgid "_Forget"
-msgstr "_Forget"
-
-#: ../panels/network/connection-editor/reset-page.ui.h:3
-msgid ""
-"Reset the settings for this network, including passwords, but remember it as "
-"a preferred network"
-msgstr ""
-"Reset the settings for this network, including passwords, but remember it as "
-"a preferred network"
-
-#: ../panels/network/connection-editor/reset-page.ui.h:4
-msgid ""
-"Remove all details relating to this network and do not try to automatically "
-"connect"
-msgstr ""
-"Remove all details relating to this network and do not try to automatically "
-"connect"
-
 #: ../panels/network/connection-editor/security-page.ui.h:1
 #: ../panels/network/network-wifi.ui.h:16
 msgid "S_ecurity"
@@ -2472,13 +2596,18 @@ msgstr "Cannot import VPN connection"
 
 #: ../panels/network/connection-editor/vpn-helpers.c:143
 #, c-format
+#| msgid ""
+#| "The file '%s' could not be read or does not contain recognized VPN "
+#| "connection information\n"
+#| "\n"
+#| "Error: %s."
 msgid ""
-"The file '%s' could not be read or does not contain recognized VPN "
+"The file “%s” could not be read or does not contain recognized VPN "
 "connection information\n"
 "\n"
 "Error: %s."
 msgstr ""
-"The file ‘%s’ could not be read or does not contain recognised VPN "
+"The file “%s” could not be read or does not contain recognised VPN "
 "connection information\n"
 "\n"
 "Error: %s."
@@ -2488,16 +2617,17 @@ msgid "Select file to import"
 msgstr "Select file to import"
 
 #: ../panels/network/connection-editor/vpn-helpers.c:182
-#: ../panels/printers/cc-printers-panel.c:2077
-#: ../panels/sharing/cc-sharing-panel.c:373
-#: ../panels/user-accounts/um-photo-dialog.c:218
+#: ../panels/printers/pp-details-dialog.c:320
+#: ../panels/sharing/cc-sharing-panel.c:376
+#: ../panels/user-accounts/um-photo-dialog.c:222
 msgid "_Open"
 msgstr "_Open"
 
 #: ../panels/network/connection-editor/vpn-helpers.c:230
 #, c-format
-msgid "A file named \"%s\" already exists."
-msgstr "A file named \"%s\" already exists."
+#| msgid "A file named \"%s\" already exists."
+msgid "A file named “%s” already exists."
+msgstr "A file named “%s” already exists."
 
 #: ../panels/network/connection-editor/vpn-helpers.c:232
 msgid "_Replace"
@@ -2514,12 +2644,16 @@ msgstr "Cannot export VPN connection"
 
 #: ../panels/network/connection-editor/vpn-helpers.c:272
 #, c-format
+#| msgid ""
+#| "The VPN connection '%s' could not be exported to %s.\n"
+#| "\n"
+#| "Error: %s."
 msgid ""
-"The VPN connection '%s' could not be exported to %s.\n"
+"The VPN connection “%s” could not be exported to %s.\n"
 "\n"
 "Error: %s."
 msgstr ""
-"The VPN connection ‘%s’ could not be exported to %s.\n"
+"The VPN connection “%s” could not be exported to %s.\n"
 "\n"
 "Error: %s."
 
@@ -2527,7 +2661,7 @@ msgstr ""
 msgid "Export VPN connection"
 msgstr "Export VPN connection"
 
-#: ../panels/network/connection-editor/vpn-page.ui.h:4
+#: ../panels/network/connection-editor/vpn-page.ui.h:2
 msgid "(Error: unable to load VPN connection editor)"
 msgstr "(Error: unable to load VPN connection editor)"
 
@@ -2546,10 +2680,6 @@ msgstr "_BSSID"
 msgid "My Home Network"
 msgstr "My Home Network"
 
-#: ../panels/network/connection-editor/wifi-page.ui.h:6
-msgid "Make available to _other users"
-msgstr "Make available to _other users"
-
 #. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/network/gnome-network-panel.desktop.in.in.h:2
 msgid "Net­work"
@@ -2568,24 +2698,37 @@ msgstr ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
 "DNS;"
 
+#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:3
+#| msgid "Control how you connect to the Internet"
+msgid "Control how you connect to Wi-Fi networks"
+msgstr "Control how you connect to Wi-Fi networks"
+
+#. Translators: those are keywords for the wi-fi control-center panel
+#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:5
+#| msgid ""
+#| "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;"
+#| "vpn;DNS;"
+msgid "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;"
+msgstr "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;"
+
 #: ../panels/network/net-device-ethernet.c:106
-#: ../panels/network/net-device-wifi.c:471
+#: ../panels/network/net-device-wifi.c:491
 msgid "never"
 msgstr "never"
 
 #: ../panels/network/net-device-ethernet.c:116
-#: ../panels/network/net-device-wifi.c:481
+#: ../panels/network/net-device-wifi.c:501
 msgid "today"
 msgstr "today"
 
 #: ../panels/network/net-device-ethernet.c:118
-#: ../panels/network/net-device-wifi.c:483
+#: ../panels/network/net-device-wifi.c:503
 msgid "yesterday"
 msgstr "yesterday"
 
 #: ../panels/network/net-device-ethernet.c:156
 #: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647
-#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13
+#: ../panels/network/panel-common.c:649
 msgid "IP Address"
 msgstr "IP Address"
 
@@ -2599,38 +2742,30 @@ msgstr "Last used"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: ../panels/network/net-device-ethernet.c:280
+#: ../panels/network/net-device-ethernet.c:275
 #: ../panels/network/network-ethernet.ui.h:1
 #: ../panels/network/network-simple.ui.h:1
 msgid "Wired"
 msgstr "Wired"
 
-#: ../panels/network/net-device-ethernet.c:348
-#: ../panels/network/net-device-wifi.c:1694
-#: ../panels/network/network-ethernet.ui.h:3
+#: ../panels/network/net-device-ethernet.c:343
+#: ../panels/network/net-device-wifi.c:1792
+#: ../panels/network/network-ethernet.ui.h:2
 #: ../panels/network/network-mobile.ui.h:8
-#: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7
+#: ../panels/network/network-simple.ui.h:3 ../panels/network/network-vpn.ui.h:2
 msgid "Options…"
 msgstr "Options…"
 
-#: ../panels/network/net-device-mobile.c:223
+#: ../panels/network/net-device-mobile.c:238
 msgid "Add new connection"
 msgstr "Add new connection"
 
-#: ../panels/network/net-device-wifi.c:1205
-msgid ""
-"If you have a connection to the Internet other than wireless, you can set up "
-"a wireless hotspot to share the connection with others."
-msgstr ""
-"If you have a connection to the Internet other than wireless, you can set up "
-"a wireless hotspot to share the connection with others."
-
-#: ../panels/network/net-device-wifi.c:1209
+#: ../panels/network/net-device-wifi.c:1275
 #, 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:1213
+#: ../panels/network/net-device-wifi.c:1279
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
@@ -2638,23 +2773,40 @@ msgstr ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
 
-#: ../panels/network/net-device-wifi.c:1296
+#: ../panels/network/net-device-wifi.c:1286
+#| msgid "Wi-Fi Hotspot"
+msgid "Turn On Wi-Fi Hotspot?"
+msgstr "Turn On Wi-Fi Hotspot?"
+
+#: ../panels/network/net-device-wifi.c:1308
+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:1319
+msgid "_Turn On"
+msgstr "_Turn On"
+
+#: ../panels/network/net-device-wifi.c:1396
 msgid "Stop hotspot and disconnect any users?"
 msgstr "Stop hotspot and disconnect any users?"
 
-#: ../panels/network/net-device-wifi.c:1299
+#: ../panels/network/net-device-wifi.c:1399
 msgid "_Stop Hotspot"
 msgstr "_Stop Hotspot"
 
-#: ../panels/network/net-device-wifi.c:1397
+#: ../panels/network/net-device-wifi.c:1496
 msgid "System policy prohibits use as a Hotspot"
 msgstr "System policy prohibits use as a Hotspot"
 
-#: ../panels/network/net-device-wifi.c:1400
+#: ../panels/network/net-device-wifi.c:1499
 msgid "Wireless device does not support Hotspot mode"
 msgstr "Wireless device does not support Hotspot mode"
 
-#: ../panels/network/net-device-wifi.c:1532
+#: ../panels/network/net-device-wifi.c:1630
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
@@ -2662,25 +2814,24 @@ msgstr ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
 
-#: ../panels/network/net-device-wifi.c:1842
-msgid "History"
-msgstr "History"
+#: ../panels/network/net-device-wifi.c:1634
+#: ../panels/network/network-wifi.ui.h:42
+msgid "_Forget"
+msgstr "_Forget"
 
-#: ../panels/network/net-device-wifi.c:1846
-#: ../panels/printers/options-dialog.ui.h:2
-#: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525
-#: ../panels/wacom/gnome-wacom-properties.ui.h:5
-msgid "_Close"
-msgstr "_Close"
+#: ../panels/network/net-device-wifi.c:1943
+#: ../panels/network/net-device-wifi.c:1950
+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:1854
+#: ../panels/network/net-device-wifi.c:1983
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "_Forget"
 
 #. TRANSLATORS: this is when the use leaves the PAC textbox blank
-#: ../panels/network/net-proxy.c:67
+#: ../panels/network/net-proxy.c:102
 msgid ""
 "Web Proxy Autodiscovery is used when a Configuration URL is not provided."
 msgstr ""
@@ -2690,18 +2841,10 @@ 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:75
+#: ../panels/network/net-proxy.c:110
 msgid "This is not recommended for untrusted public networks."
 msgstr "This is not recommended for untrusted public networks."
 
-#: ../panels/network/net-proxy.c:410
-msgid "Proxy"
-msgstr "Proxy"
-
-#: ../panels/network/network-ethernet.ui.h:2
-msgid "_Add Profile…"
-msgstr "_Add Profile…"
-
 #: ../panels/network/network-mobile.ui.h:1
 msgid "IMEI"
 msgstr "IMEI"
@@ -2715,94 +2858,65 @@ msgid "Network"
 msgstr "Network"
 
 #: ../panels/network/network-proxy.ui.h:1
-msgctxt "proxy method"
-msgid "None"
-msgstr "None"
-
-#: ../panels/network/network-proxy.ui.h:2
-msgctxt "proxy method"
-msgid "Manual"
-msgstr "Manual"
-
-#: ../panels/network/network-proxy.ui.h:3
-msgctxt "proxy method"
-msgid "Automatic"
-msgstr "Automatic"
-
-#: ../panels/network/network-proxy.ui.h:4
-msgid "_Method"
-msgstr "_Method"
+#| msgid "Network proxy"
+msgid "Network Proxy"
+msgstr "Network Proxy"
 
 #: ../panels/network/network-proxy.ui.h:5
-msgid "_Configuration URL"
-msgstr "_Configuration URL"
-
-#: ../panels/network/network-proxy.ui.h:6
 msgid "_HTTP Proxy"
 msgstr "_HTTP Proxy"
 
-#: ../panels/network/network-proxy.ui.h:7
+#: ../panels/network/network-proxy.ui.h:6
 msgid "H_TTPS Proxy"
 msgstr "H_TTPS Proxy"
 
-#: ../panels/network/network-proxy.ui.h:8
+#: ../panels/network/network-proxy.ui.h:7
 msgid "_FTP Proxy"
 msgstr "_FTP Proxy"
 
-#: ../panels/network/network-proxy.ui.h:9
+#: ../panels/network/network-proxy.ui.h:8
 msgid "_Socks Host"
 msgstr "_Socks Host"
 
-#: ../panels/network/network-proxy.ui.h:10
+#: ../panels/network/network-proxy.ui.h:9
 msgid "_Ignore Hosts"
 msgstr "_Ignore Hosts"
 
-#: ../panels/network/network-proxy.ui.h:11
+#: ../panels/network/network-proxy.ui.h:10
 msgid "HTTP proxy port"
 msgstr "HTTP proxy port"
 
-#: ../panels/network/network-proxy.ui.h:12
+#: ../panels/network/network-proxy.ui.h:11
 msgid "HTTPS proxy port"
 msgstr "HTTPS proxy port"
 
-#: ../panels/network/network-proxy.ui.h:13
+#: ../panels/network/network-proxy.ui.h:12
 msgid "FTP proxy port"
 msgstr "FTP proxy port"
 
-#: ../panels/network/network-proxy.ui.h:14
+#: ../panels/network/network-proxy.ui.h:13
 msgid "Socks proxy port"
 msgstr "Socks proxy port"
 
-#: ../panels/network/network-simple.ui.h:7
+#: ../panels/network/network-proxy.ui.h:14
+msgid "_Configuration URL"
+msgstr "_Configuration URL"
+
+#: ../panels/network/network-simple.ui.h:2
 msgid "Turn device off"
 msgstr "Turn device off"
 
+#. Translators: The found device is a printer connected via Bluetooth
 #: ../panels/network/network.ui.h:1
-msgid "Add Device"
-msgstr "Add Device"
+#: ../panels/printers/pp-new-printer-dialog.c:1816
+msgid "Bluetooth"
+msgstr "Bluetooth"
 
-#: ../panels/network/network.ui.h:2
-msgid "Remove Device"
-msgstr "Remove Device"
+#: ../panels/network/network.ui.h:3
+msgid "Not set up"
+msgstr "Not set up"
 
 #: ../panels/network/network-vpn.ui.h:1
-msgid "VPN Type"
-msgstr "VPN Type"
-
-#: ../panels/network/network-vpn.ui.h:3
-msgid "Group Name"
-msgstr "Group Name"
-
-#: ../panels/network/network-vpn.ui.h:4
-msgid "Group Password"
-msgstr "Group Password"
-
-#: ../panels/network/network-vpn.ui.h:5
-#: ../panels/printers/authentication-dialog.ui.h:4
-msgid "Username"
-msgstr "Username"
-
-#: ../panels/network/network-vpn.ui.h:6
 msgid "Turn VPN connection off"
 msgstr "Turn VPN connection off"
 
@@ -2821,7 +2935,7 @@ msgstr "details"
 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1
 #: ../panels/sharing/sharing.ui.h:9
 #: ../panels/user-accounts/data/account-dialog.ui.h:12
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
 msgid "_Password"
 msgstr "_Password"
 
@@ -2837,6 +2951,14 @@ msgstr "Make available to other users"
 msgid "identity"
 msgstr "identity"
 
+#: ../panels/network/network-wifi.ui.h:24
+msgid "IPv_4"
+msgstr "IPv_4"
+
+#: ../panels/network/network-wifi.ui.h:25
+msgid "_Addresses"
+msgstr "_Addresses"
+
 #: ../panels/network/network-wifi.ui.h:28
 msgid "Automatic (DHCP) addresses only"
 msgstr "Automatic (DHCP) addresses only"
@@ -2857,6 +2979,10 @@ msgstr "_Ignore automatically obtained routes"
 msgid "ipv4"
 msgstr "ipv4"
 
+#: ../panels/network/network-wifi.ui.h:36
+msgid "IPv_6"
+msgstr "IPv_6"
+
 #: ../panels/network/network-wifi.ui.h:37
 msgid "ipv6"
 msgstr "ipv6"
@@ -2869,6 +2995,10 @@ msgstr "_Cloned MAC Address"
 msgid "hardware"
 msgstr "hardware"
 
+#: ../panels/network/network-wifi.ui.h:41
+msgid "_Reset"
+msgstr "_Reset"
+
 #: ../panels/network/network-wifi.ui.h:43
 msgid ""
 "Reset the settings for this connection to their defaults, but remember as a "
@@ -2893,55 +3023,83 @@ msgstr "reset"
 msgid "Hardware"
 msgstr "Hardware"
 
+#: ../panels/network/network-wifi.ui.h:51
+#| msgid "Reset"
+msgctxt "tab"
+msgid "Reset"
+msgstr "Reset"
+
 #: ../panels/network/network-wifi.ui.h:52
 msgid "Wi-Fi Hotspot"
 msgstr "Wi-Fi Hotspot"
 
 #: ../panels/network/network-wifi.ui.h:53
-msgid "_Turn On"
-msgstr "_Turn On"
+msgid "Switch off to connect to a Wi-Fi network"
+msgstr "Switch off to connect to a Wi-Fi network"
 
 #: ../panels/network/network-wifi.ui.h:54
-msgid "Wi-Fi"
-msgstr "Wi-Fi"
+msgid "Network Name"
+msgstr "Network Name"
 
 #: ../panels/network/network-wifi.ui.h:55
-msgid "Turn Wi-Fi off"
-msgstr "Turn Wi-Fi off"
+msgid "Connected Devices"
+msgstr "Connected Devices"
 
 #: ../panels/network/network-wifi.ui.h:56
-msgid "_Use as Hotspot…"
-msgstr "_Use as Hotspot…"
+msgid "Security type"
+msgstr "Security type"
 
 #: ../panels/network/network-wifi.ui.h:57
-msgid "_Connect to Hidden Network…"
-msgstr "_Connect to Hidden Network…"
-
-#: ../panels/network/network-wifi.ui.h:58
-msgid "_History"
-msgstr "_History"
+#: ../panels/printers/authentication-dialog.ui.h:5
+#: ../panels/printers/new-printer-dialog.ui.h:14
+#: ../panels/user-accounts/data/account-dialog.ui.h:9
+msgid "Password"
+msgstr "Password"
 
 #: ../panels/network/network-wifi.ui.h:59
-msgid "Switch off to connect to a Wi-Fi network"
-msgstr "Switch off to connect to a Wi-Fi network"
+msgid "Turn Wi-Fi off"
+msgstr "Turn Wi-Fi off"
 
 #: ../panels/network/network-wifi.ui.h:60
-msgid "Network Name"
-msgstr "Network Name"
+msgid "_Connect to Hidden Network…"
+msgstr "_Connect to Hidden Network…"
 
 #: ../panels/network/network-wifi.ui.h:61
-msgid "Connected Devices"
-msgstr "Connected Devices"
+#| msgid "Wi-Fi Hotspot"
+msgid "_Turn On Wi-Fi Hotspot…"
+msgstr "_Turn On Wi-Fi Hotspot…"
 
 #: ../panels/network/network-wifi.ui.h:62
-msgid "Security type"
-msgstr "Security type"
+msgid "_Known Wi-Fi Networks"
+msgstr "_Known Wi-Fi Networks"
 
-#: ../panels/network/network-wifi.ui.h:63
-#: ../panels/printers/authentication-dialog.ui.h:5
-#: ../panels/user-accounts/data/account-dialog.ui.h:9
-msgid "Password"
-msgstr "Password"
+#: ../panels/network/wifi.ui.h:1
+msgid "Make sure you have a Wi-Fi adapter plugged and turned on"
+msgstr "Make sure you have a Wi-Fi adapter plugged and turned on"
+
+#: ../panels/network/wifi.ui.h:2
+#| msgid "No Pictures Found"
+msgid "No Wi-Fi Adapter Found"
+msgstr "No Wi-Fi Adapter Found"
+
+#: ../panels/network/wifi.ui.h:3
+#| msgid "Air_plane Mode"
+msgid "Airplane Mode"
+msgstr "Aeroplane Mode"
+
+#: ../panels/network/wifi.ui.h:4
+msgid "Disables Wi-Fi, Bluetooth and mobile broadband"
+msgstr "Disables Wi-Fi, Bluetooth and mobile broadband"
+
+#: ../panels/network/wifi.ui.h:5
+#| msgid "Networks"
+msgid "Visible Networks"
+msgstr "Visible Networks"
+
+#: ../panels/network/wifi.ui.h:6
+#| msgid "NetworkManager needs to be running."
+msgid "NetworkManager needs to be running"
+msgstr "NetworkManager needs to be running"
 
 #. TRANSLATORS: AP type
 #: ../panels/network/panel-common.c:127
@@ -3224,23 +3382,24 @@ msgstr "Firmware missing"
 msgid "Cable unplugged"
 msgstr "Cable unplugged"
 
-#: ../panels/network/wireless-security/eap-method.c:69
-msgid "undefined error in 802.1x security (wpa-eap)"
-msgstr "undefined error in 802.1x security (wpa-eap)"
+#: ../panels/network/wireless-security/eap-method.c:57
+#| msgid "undefined error in 802.1x security (wpa-eap)"
+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:233
 msgid "no file selected"
 msgstr "no file selected"
 
-#: ../panels/network/wireless-security/eap-method.c:276
+#: ../panels/network/wireless-security/eap-method.c:264
 msgid "unspecified error validating eap-method file"
 msgstr "unspecified error validating eap-method file"
 
-#: ../panels/network/wireless-security/eap-method.c:480
+#: ../panels/network/wireless-security/eap-method.c:439
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 
-#: ../panels/network/wireless-security/eap-method.c:483
+#: ../panels/network/wireless-security/eap-method.c:442
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 
@@ -3250,13 +3409,13 @@ msgstr "missing EAP-FAST PAC file"
 
 #: ../panels/network/wireless-security/eap-method-fast.c:268
 #: ../panels/network/wireless-security/eap-method-peap.c:302
-#: ../panels/network/wireless-security/eap-method-ttls.c:333
+#: ../panels/network/wireless-security/eap-method-ttls.c:351
 msgid "GTC"
 msgstr "GTC"
 
 #: ../panels/network/wireless-security/eap-method-fast.c:283
 #: ../panels/network/wireless-security/eap-method-peap.c:272
-#: ../panels/network/wireless-security/eap-method-ttls.c:288
+#: ../panels/network/wireless-security/eap-method-ttls.c:289
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
@@ -3269,37 +3428,28 @@ msgid "PAC files (*.pac)"
 msgstr "PAC files (*.pac)"
 
 #: ../panels/network/wireless-security/eap-method-fast.ui.h:1
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:1
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:1
-#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1
-#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:1
-#: ../panels/printers/authentication-dialog.ui.h:1
-msgid " "
-msgstr " "
-
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
 msgid "Anonymous"
 msgstr "Anonymous"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
 msgid "Authenticated"
 msgstr "Authenticated"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
 msgid "Both"
 msgstr "Both"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
 msgid "PAC _file"
 msgstr "PAC _file"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:7
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
 msgid "_Inner authentication"
 msgstr "_Inner authentication"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:8
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Allow automatic PAC pro_visioning"
 
@@ -3336,38 +3486,38 @@ msgid "invalid EAP-PEAP CA certificate: no certificate specified"
 msgstr "invalid EAP-PEAP CA certificate: no certificate specified"
 
 #: ../panels/network/wireless-security/eap-method-peap.c:287
-#: ../panels/network/wireless-security/eap-method-ttls.c:318
-#: ../panels/network/wireless-security/wireless-security.c:439
+#: ../panels/network/wireless-security/eap-method-ttls.c:336
+#: ../panels/network/wireless-security/wireless-security.c:441
 msgid "MD5"
 msgstr "MD5"
 
 #: ../panels/network/wireless-security/eap-method-peap.c:381
 #: ../panels/network/wireless-security/eap-method-tls.c:501
-#: ../panels/network/wireless-security/eap-method-ttls.c:412
+#: ../panels/network/wireless-security/eap-method-ttls.c:430
 msgid "Choose a Certificate Authority certificate"
 msgstr "Choose a Certificate Authority certificate"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:3
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:2
 msgid "Version 0"
 msgstr "Version 0"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:4
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:3
 msgid "Version 1"
 msgstr "Version 1"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:6
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:5
 #: ../panels/network/wireless-security/eap-method-tls.ui.h:3
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:3
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:2
 msgid "C_A certificate"
 msgstr "C_A certificate"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:7
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:6
 #: ../panels/network/wireless-security/eap-method-tls.ui.h:4
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:3
 msgid "No CA certificate is _required"
 msgstr "No CA certificate is _required"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:9
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
 msgid "PEAP _version"
 msgstr "PEAP _version"
 
@@ -3411,16 +3561,22 @@ msgid "Unencrypted private keys are insecure"
 msgstr "Unencrypted private keys are insecure"
 
 #: ../panels/network/wireless-security/eap-method-tls.c:319
+#| msgid ""
+#| "The selected private key does not appear to be protected by a password.  "
+#| "This could allow your security credentials to be compromised.  Please "
+#| "select a password-protected private key.\n"
+#| "\n"
+#| "(You can password-protect your private key with openssl)"
 msgid ""
-"The selected private key does not appear to be protected by a password.  "
-"This could allow your security credentials to be compromised.  Please select "
-"a password-protected private key.\n"
+"The selected private key does not appear to be protected by a password. This "
+"could allow your security credentials to be compromised. Please select a "
+"password-protected private key.\n"
 "\n"
 "(You can password-protect your private key with openssl)"
 msgstr ""
-"The selected private key does not appear to be protected by a password.  "
-"This could allow your security credentials to be compromised.  Please select "
-"a password-protected private key.\n"
+"The selected private key does not appear to be protected by a password. This "
+"could allow your security credentials to be compromised. Please select a "
+"password-protected private key.\n"
 "\n"
 "(You can password-protect your private key with openssl)"
 
@@ -3457,45 +3613,51 @@ msgstr "invalid EAP-TTLS CA certificate: %s"
 msgid "invalid EAP-TTLS CA certificate: no certificate specified"
 msgstr "invalid EAP-TTLS CA certificate: no certificate specified"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:258
+#: ../panels/network/wireless-security/eap-method-ttls.c:259
 msgid "PAP"
 msgstr "PAP"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:273
+#: ../panels/network/wireless-security/eap-method-ttls.c:274
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:303
+#: ../panels/network/wireless-security/eap-method-ttls.c:305
+#| msgid "MSCHAPv2"
+msgid "MSCHAPv2 (no EAP)"
+msgstr "MSCHAPv2 (no EAP)"
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:321
 msgid "CHAP"
 msgstr "CHAP"
 
 #: ../panels/network/wireless-security/wireless-security.c:87
-msgid "Unknown error validating 802.1x security"
-msgstr "Unknown error validating 802.1x security"
+#| msgid "Unknown error validating 802.1x security"
+msgid "Unknown error validating 802.1X security"
+msgstr "Unknown error validating 802.1X security"
 
-#: ../panels/network/wireless-security/wireless-security.c:451
+#: ../panels/network/wireless-security/wireless-security.c:453
 msgid "TLS"
 msgstr "TLS"
 
-#: ../panels/network/wireless-security/wireless-security.c:475
+#: ../panels/network/wireless-security/wireless-security.c:477
 msgid "PWD"
 msgstr "PWD"
 
-#: ../panels/network/wireless-security/wireless-security.c:486
+#: ../panels/network/wireless-security/wireless-security.c:488
 msgid "FAST"
 msgstr "FAST"
 
-#: ../panels/network/wireless-security/wireless-security.c:497
+#: ../panels/network/wireless-security/wireless-security.c:499
 msgid "Tunneled TLS"
 msgstr "Tunnelled TLS"
 
-#: ../panels/network/wireless-security/wireless-security.c:508
+#: ../panels/network/wireless-security/wireless-security.c:510
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
-#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:2
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:9
-#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:2
+#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:6
+#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:1
 msgid "Au_thentication"
 msgstr "Au_thentication"
 
@@ -3545,34 +3707,22 @@ msgid "1 (Default)"
 msgstr "1 (Default)"
 
 #: ../panels/network/wireless-security/ws-wep-key.ui.h:2
-msgid "2"
-msgstr "2"
-
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:3
-msgid "3"
-msgstr "3"
-
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:4
-msgid "4"
-msgstr "4"
-
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:5
 msgid "Open System"
 msgstr "Open System"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:6
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:3
 msgid "Shared Key"
 msgstr "Shared Key"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:7
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:4
 msgid "_Key"
 msgstr "_Key"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:8
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:5
 msgid "Sho_w key"
 msgstr "Sho_w key"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:10
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:7
 msgid "WEP inde_x"
 msgstr "WEP inde_x"
 
@@ -3593,18 +3743,6 @@ msgstr "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgid "_Type"
 msgstr "_Type"
 
-#: ../panels/notifications/cc-notifications-panel.c:257
-#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973
-#: ../panels/privacy/cc-privacy-panel.c:190
-#: ../panels/privacy/cc-privacy-panel.c:257
-#: ../panels/universal-access/cc-ua-panel.c:269
-#: ../panels/universal-access/cc-ua-panel.c:590
-#: ../panels/universal-access/cc-ua-panel.c:603
-#: ../panels/universal-access/cc-ua-panel.c:615
-#: ../panels/universal-access/cc-ua-panel.c:786
-msgid "On"
-msgstr "On"
-
 #. This is the per application switch for message tray usage.
 #: ../panels/notifications/edit-dialog.ui.h:2
 msgctxt "notifications"
@@ -3618,22 +3756,34 @@ msgid "Sound _Alerts"
 msgstr "Sound _Alerts"
 
 #: ../panels/notifications/edit-dialog.ui.h:5
+#| msgctxt "notifications"
+#| msgid "_Notifications"
 msgctxt "notifications"
-msgid "Notification _Banners"
-msgstr "Notification _Banners"
+msgid "Notification _Popups"
+msgstr "Notification _Popups"
 
-#. Banners here refers to message tray notifications in the middle of the screen.
-#: ../panels/notifications/edit-dialog.ui.h:7
-msgctxt "notifications"
-msgid "Show Message _Content in Banners"
-msgstr "Show Message _Content in Banners"
+#: ../panels/notifications/edit-dialog.ui.h:6
+msgid ""
+"Notifications will continue to appear in the notification list when popups "
+"are disabled."
+msgstr ""
+"Notifications will continue to appear in the notification list when popups "
+"are disabled."
 
+#. Popups here refers to message tray notifications in the middle of the screen.
 #: ../panels/notifications/edit-dialog.ui.h:8
+#| msgctxt "notifications"
+#| msgid "Show Message _Content in Banners"
+msgctxt "notifications"
+msgid "Show Message _Content in Popups"
+msgstr "Show Message _Content in Popups"
+
+#: ../panels/notifications/edit-dialog.ui.h:9
 msgctxt "notifications"
 msgid "_Lock Screen Notifications"
 msgstr "_Lock Screen Notifications"
 
-#: ../panels/notifications/edit-dialog.ui.h:9
+#: ../panels/notifications/edit-dialog.ui.h:10
 msgctxt "notifications"
 msgid "Show Message C_ontent on Lock Screen"
 msgstr "Show Message C_ontent on Lock Screen"
@@ -3653,8 +3803,10 @@ msgid "Notifications;Banner;Message;Tray;Popup;"
 msgstr "Notifications;Banner;Message;Tray;Popup;"
 
 #: ../panels/notifications/notifications.ui.h:1
-msgid "Notification _Banners"
-msgstr "Notification _Banners"
+#| msgctxt "notifications"
+#| msgid "_Notifications"
+msgid "Notification _Popups"
+msgstr "Notification _Popups"
 
 #: ../panels/notifications/notifications.ui.h:2
 msgid "_Lock Screen Notifications"
@@ -3666,56 +3818,30 @@ msgstr "_Lock Screen Notifications"
 msgid "Applications"
 msgstr "Applications"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170
+#: ../panels/online-accounts/cc-online-accounts-panel.c:148
 msgctxt "Online Account"
 msgid "Other"
 msgstr "Other"
 
-#. translators: This is the title of the "Add Account" dialog.
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291
-#: ../panels/online-accounts/online-accounts.ui.h:2
-msgid "Add Account"
-msgstr "Add Account"
-
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328
-msgid "Mail"
-msgstr "Mail"
-
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334
-msgid "Calendar"
-msgstr "Calendar"
-
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340
-msgid "Contacts"
-msgstr "Contacts"
-
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346
-msgid "Chat"
-msgstr "Chat"
-
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352
-msgid "Resources"
-msgstr "Resources"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:640
-msgid "Error creating account"
-msgstr "Error creating account"
+#. translators: This is the title of the "Show Account" dialog. The
+#. * %s is the name of the provider. e.g., 'Google'.
+#: ../panels/online-accounts/cc-online-accounts-panel.c:603
+#, c-format
+#| msgid "My Account"
+msgid "%s Account"
+msgstr "%s Account"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:700
+#: ../panels/online-accounts/cc-online-accounts-panel.c:895
 msgid "Error removing account"
 msgstr "Error removing account"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:736
-msgid "Are you sure you want to remove the account?"
-msgstr "Are you sure you want to remove the account?"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:738
-msgid "This will not remove the account on the server."
-msgstr "This will not remove the account on the server."
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:739
-msgid "_Remove"
-msgstr "_Remove"
+#. Translators: The %s is the username (eg., debarshi ray gmail com
+#. * or rishi).
+#.
+#: ../panels/online-accounts/cc-online-accounts-panel.c:960
+#, c-format
+msgid "<b>%s</b> removed"
+msgstr "<b>%s</b> removed"
 
 #. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2
@@ -3735,26 +3861,28 @@ msgstr ""
 "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
 "Kerberos;IMAP;SMTP;Pocket;ReadItLater;"
 
+#. Translators: This is the button which allows undoing the removal of the printer.
 #: ../panels/online-accounts/online-accounts.ui.h:1
-msgid "No online accounts configured"
-msgstr "No online accounts configured"
+#: ../panels/printers/printers.ui.h:4
+msgid "Undo"
+msgstr "Undo"
+
+#: ../panels/online-accounts/online-accounts.ui.h:2
+msgid "Connect to your data in the cloud"
+msgstr "Connect to your data in the cloud"
 
 #: ../panels/online-accounts/online-accounts.ui.h:3
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
-msgid "Remove Account"
-msgstr "Remove Account"
+msgid "No internet connection — connect to set up new online accounts"
+msgstr "No internet connection — connect to set up new online accounts"
 
 #: ../panels/online-accounts/online-accounts.ui.h:4
-msgid "Add an online account"
-msgstr "Add an online account"
+#| msgid "Add account"
+msgid "Add an account"
+msgstr "Add an account"
 
 #: ../panels/online-accounts/online-accounts.ui.h:5
-msgid ""
-"Adding an account allows your applications to access it for documents, mail, "
-"contacts, calendar, chat and more."
-msgstr ""
-"Adding an account allows your applications to access it for documents, mail, "
-"contacts, calendar, chat and more."
+msgid "Remove Account"
+msgstr "Remove Account"
 
 #: ../panels/power/cc-power-panel.c:253
 msgid "Unknown time"
@@ -3872,7 +4000,7 @@ msgid "Media player"
 msgstr "Media player"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:555
+#: ../panels/power/cc-power-panel.c:555 ../panels/wacom/cc-wacom-panel.c:793
 msgid "Tablet"
 msgstr "Tablet"
 
@@ -3883,7 +4011,7 @@ msgstr "Computer"
 
 #. TRANSLATORS: secondary battery, misc
 #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801
-#: ../panels/power/cc-power-panel.c:2358
+#: ../panels/power/cc-power-panel.c:2356
 msgid "Battery"
 msgstr "Battery"
 
@@ -3931,88 +4059,93 @@ msgstr "Batteries"
 msgid "When _idle"
 msgstr "When _idle"
 
-#: ../panels/power/cc-power-panel.c:1680
+#: ../panels/power/cc-power-panel.c:1681
 msgid "Power Saving"
 msgstr "Power Saving"
 
-#: ../panels/power/cc-power-panel.c:1715
+#: ../panels/power/cc-power-panel.c:1712
 msgid "_Screen brightness"
 msgstr "_Screen brightness"
 
-#: ../panels/power/cc-power-panel.c:1734
+#: ../panels/power/cc-power-panel.c:1731
 msgid "Automatic brightness"
 msgstr "Automatic brightness"
 
-#: ../panels/power/cc-power-panel.c:1754
+#: ../panels/power/cc-power-panel.c:1751
 msgid "_Keyboard brightness"
 msgstr "_Keyboard brightness"
 
-#: ../panels/power/cc-power-panel.c:1764
+#: ../panels/power/cc-power-panel.c:1761
 msgid "_Dim screen when inactive"
 msgstr "_Dim screen when inactive"
 
-#: ../panels/power/cc-power-panel.c:1789
+#: ../panels/power/cc-power-panel.c:1786
 msgid "_Blank screen"
 msgstr "_Blank screen"
 
-#: ../panels/power/cc-power-panel.c:1826
+#: ../panels/power/cc-power-panel.c:1823
 msgid "_Wi-Fi"
 msgstr "_Wi-Fi"
 
-#: ../panels/power/cc-power-panel.c:1831
+#: ../panels/power/cc-power-panel.c:1828
 msgid "Turn off Wi-Fi to save power."
 msgstr "Turn off Wi-Fi to save power."
 
-#: ../panels/power/cc-power-panel.c:1856
+#: ../panels/power/cc-power-panel.c:1853
 msgid "_Mobile broadband"
 msgstr "_Mobile broadband"
 
-#: ../panels/power/cc-power-panel.c:1861
+#: ../panels/power/cc-power-panel.c:1858
 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power."
 msgstr "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power."
 
-#: ../panels/power/cc-power-panel.c:1906
+#: ../panels/power/cc-power-panel.c:1903
 msgid "_Bluetooth"
 msgstr "_Bluetooth"
 
-#: ../panels/power/cc-power-panel.c:1962
+#: ../panels/power/cc-power-panel.c:1966
 msgid "When on battery power"
 msgstr "When on battery power"
 
-#: ../panels/power/cc-power-panel.c:1964
+#: ../panels/power/cc-power-panel.c:1968
 msgid "When plugged in"
 msgstr "When plugged in"
 
-#: ../panels/power/cc-power-panel.c:2059
+#: ../panels/power/cc-power-panel.c:2063
 msgid "Suspend"
 msgstr "Suspend"
 
-#: ../panels/power/cc-power-panel.c:2060
+#: ../panels/power/cc-power-panel.c:2064
+msgid "Power Off"
+msgstr "Power Off"
+
+#: ../panels/power/cc-power-panel.c:2065
 msgid "Hibernate"
 msgstr "Hibernate"
 
-#: ../panels/power/cc-power-panel.c:2061
+#: ../panels/power/cc-power-panel.c:2066
 msgid "Nothing"
 msgstr "Nothing"
 
 #. Frame header
-#: ../panels/power/cc-power-panel.c:2175
+#: ../panels/power/cc-power-panel.c:2180
 msgid "Suspend & Power Button"
 msgstr "Suspend & Power Button"
 
-#: ../panels/power/cc-power-panel.c:2218
+#: ../panels/power/cc-power-panel.c:2219
 msgid "_Automatic suspend"
 msgstr "_Automatic suspend"
 
-#: ../panels/power/cc-power-panel.c:2219
+#: ../panels/power/cc-power-panel.c:2220
 msgid "Automatic suspend"
 msgstr "Automatic suspend"
 
-#: ../panels/power/cc-power-panel.c:2286
+#: ../panels/power/cc-power-panel.c:2287
 msgid "_When the Power Button is pressed"
 msgstr "_When the Power Button is pressed"
 
-#: ../panels/power/cc-power-panel.c:2412 ../shell/alt/cc-window.c:270
+#: ../panels/power/cc-power-panel.c:2406 ../shell/cc-window.c:247
+#: ../shell/panel-list.ui.h:1
 msgid "Devices"
 msgstr "Devices"
 
@@ -4100,201 +4233,74 @@ msgstr "_Plugged In"
 msgid "On _Battery Power"
 msgstr "On _Battery Power"
 
-#: ../panels/power/power.ui.h:21 ../panels/universal-access/uap.ui.h:33
+#: ../panels/power/power.ui.h:21 ../panels/universal-access/uap.ui.h:36
 msgid "Delay"
 msgstr "Delay"
 
+#: ../panels/printers/authentication-dialog.ui.h:1
+msgid " "
+msgstr " "
+
 #: ../panels/printers/authentication-dialog.ui.h:3
 msgid "Authenticate"
 msgstr "Authenticate"
 
+#: ../panels/printers/authentication-dialog.ui.h:4
+#: ../panels/printers/new-printer-dialog.ui.h:13
+msgid "Username"
+msgstr "Username"
+
 #: ../panels/printers/authentication-dialog.ui.h:6
+#: ../panels/printers/new-printer-dialog.ui.h:11
 msgid "Authentication Required"
 msgstr "Authentication Required"
 
-#. Translators: The printer is low on toner
-#: ../panels/printers/cc-printers-panel.c:683
-msgid "Low on toner"
-msgstr "Low on toner"
-
-#. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:685
-msgid "Out of toner"
-msgstr "Out of toner"
-
-#. Translators: "Developer" is a chemical for photo development,
-#. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:688
-msgid "Low on developer"
-msgstr "Low on developer"
-
-#. Translators: "Developer" is a chemical for photo development,
-#. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:691
-msgid "Out of developer"
-msgstr "Out of developer"
-
-#. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:693
-msgid "Low on a marker supply"
-msgstr "Low on a marker supply"
-
-#. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:695
-msgid "Out of a marker supply"
-msgstr "Out of a marker supply"
-
-#. Translators: One or more covers on the printer are open
-#: ../panels/printers/cc-printers-panel.c:697
-msgid "Open cover"
-msgstr "Open cover"
-
-#. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:699
-msgid "Open door"
-msgstr "Open door"
-
-#. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:701
-msgid "Low on paper"
-msgstr "Low on paper"
-
-#. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:703
-msgid "Out of paper"
-msgstr "Out of paper"
-
-#. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:705
-msgctxt "printer state"
-msgid "Offline"
-msgstr "Offline"
-
-#. Translators: Someone has stopped the Printer
-#. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/cc-printers-panel.c:707
-#: ../panels/printers/cc-printers-panel.c:897
-msgctxt "printer state"
-msgid "Stopped"
-msgstr "Stopped"
-
-#. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:709
-msgid "Waste receptacle almost full"
-msgstr "Waste receptacle almost full"
-
-#. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:711
-msgid "Waste receptacle full"
-msgstr "Waste receptacle full"
-
-#. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:713
-msgid "The optical photo conductor is near end of life"
-msgstr "The optical photo conductor is near end of life"
-
-#. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:715
-msgid "The optical photo conductor is no longer functioning"
-msgstr "The optical photo conductor is no longer functioning"
-
-#. Translators: Printer's state (printer is being configured right now)
-#: ../panels/printers/cc-printers-panel.c:824
-msgctxt "printer state"
-msgid "Configuring"
-msgstr "Configuring"
-
-#. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/cc-printers-panel.c:883
-msgctxt "printer state"
-msgid "Ready"
-msgstr "Ready"
-
-#. Translators: Printer's state (printer is ready but doesn't accept new jobs)
-#: ../panels/printers/cc-printers-panel.c:888
-msgctxt "printer state"
-msgid "Does not accept jobs"
-msgstr "Does not accept jobs"
-
-#. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/cc-printers-panel.c:893
-msgctxt "printer state"
-msgid "Processing"
-msgstr "Processing"
-
-#. Translators: Toner supply
-#: ../panels/printers/cc-printers-panel.c:1013
-msgid "Toner Level"
-msgstr "Toner Level"
-
-#. Translators: Ink supply
-#: ../panels/printers/cc-printers-panel.c:1016
-msgid "Ink Level"
-msgstr "Ink Level"
-
-#. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/cc-printers-panel.c:1019
-msgid "Supply Level"
-msgstr "Supply Level"
-
-#. Translators: Printer's state (printer is being installed right now)
-#: ../panels/printers/cc-printers-panel.c:1037
-msgctxt "printer state"
-msgid "Installing"
-msgstr "Installing"
-
-#. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:1551
+#. Translators: %s is the printer name
+#: ../panels/printers/cc-printers-panel.c:718
 #, c-format
-msgid "%u active"
-msgid_plural "%u active"
-msgstr[0] "%u active"
-msgstr[1] "%u active"
+msgid "Printer “%s” has been deleted"
+msgstr "Printer “%s” has been deleted"
 
 #. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:1892
+#: ../panels/printers/cc-printers-panel.c:909
 msgid "Failed to add new printer."
 msgstr "Failed to add new printer."
 
-#: ../panels/printers/cc-printers-panel.c:2073
-msgid "Select PPD File"
-msgstr "Select PPD File"
+#. Translators: The XML file containing user interface can not be loaded
+#: ../panels/printers/cc-printers-panel.c:1221
+#, c-format
+msgid "Could not load ui: %s"
+msgstr "Could not load ui: %s"
 
-#: ../panels/printers/cc-printers-panel.c:2082
-msgid ""
-"PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
-"PPD.GZ)"
-msgstr ""
-"PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
-"PPD.GZ)"
+#: ../panels/printers/details-dialog.ui.h:2
+#: ../panels/printers/printer-entry.ui.h:8
+msgid "Location"
+msgstr "Location"
 
-#: ../panels/printers/cc-printers-panel.c:2389
-msgid "No suitable driver found"
-msgstr "No suitable driver found"
+#. Translators: Name of column showing printer drivers
+#: ../panels/printers/details-dialog.ui.h:4
+#: ../panels/printers/pp-ppd-selection-dialog.c:250
+msgid "Driver"
+msgstr "Driver"
 
-#: ../panels/printers/cc-printers-panel.c:2460
+#: ../panels/printers/details-dialog.ui.h:5
 msgid "Searching for preferred drivers…"
 msgstr "Searching for preferred drivers…"
 
-#: ../panels/printers/cc-printers-panel.c:2481
-msgid "Select from database…"
-msgstr "Select from database…"
+#: ../panels/printers/details-dialog.ui.h:6
+#| msgid "Search for a city"
+msgid "Search for Drivers"
+msgstr "Search for Drivers"
 
-#: ../panels/printers/cc-printers-panel.c:2490
-msgid "Provide PPD File…"
-msgstr "Provide PPD File…"
+#: ../panels/printers/details-dialog.ui.h:7
+#| msgid "Select from database…"
+msgid "Select from Database…"
+msgstr "Select from Database…"
 
-#. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2637
-#: ../panels/printers/cc-printers-panel.c:2660
-msgid "Test page"
-msgstr "Test page"
-
-#. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:3115
-#, c-format
-msgid "Could not load ui: %s"
-msgstr "Could not load ui: %s"
+#: ../panels/printers/details-dialog.ui.h:8
+#| msgid "Provide PPD File…"
+msgid "Install PPD File…"
+msgstr "Install PPD File…"
 
 #. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2
@@ -4320,28 +4326,66 @@ msgstr "Clear All"
 msgid "No Active Printer Jobs"
 msgstr "No Active Printer Jobs"
 
-#: ../panels/printers/new-printer-dialog.ui.h:1
-msgid "Add a New Printer"
-msgstr "Add a New Printer"
+#. Translators: This is the title presented at top of the dialog.
+#: ../panels/printers/new-printer-dialog.ui.h:2
+#: ../panels/printers/pp-new-printer-dialog.c:384
+#: ../panels/printers/pp-new-printer-dialog.c:456
+msgid "Add Printer"
+msgstr "Add Printer"
 
-#. Translators: This button opens authentication dialog for selected server.
-#: ../panels/printers/new-printer-dialog.ui.h:5
-msgid "A_uthenticate"
-msgstr "A_uthenticate"
+#. Translators: This buttons submits the credentials for the selected server.
+#: ../panels/printers/new-printer-dialog.ui.h:6
+#| msgid "Unlock"
+msgid "_Unlock"
+msgstr "_Unlock"
 
-#. Translators: No printers were found
-#: ../panels/printers/new-printer-dialog.ui.h:7
-msgid "No printers detected."
-msgstr "No printers detected."
+#. Translators: No printers were detected
+#: ../panels/printers/new-printer-dialog.ui.h:8
+#| msgid "No Pictures Found"
+msgid "No Printers Found"
+msgstr "No Printers Found"
 
 #. Translators: The entered text should contain network address of a printer or a text which will filter 
found devices (their names and locations)
-#: ../panels/printers/new-printer-dialog.ui.h:9
+#: ../panels/printers/new-printer-dialog.ui.h:10
 msgid "Enter a network address or search for a printer"
 msgstr "Enter a network address or search for a printer"
 
-#: ../panels/printers/options-dialog.ui.h:1
-msgid "Loading options…"
-msgstr "Loading options…"
+#: ../panels/printers/new-printer-dialog.ui.h:12
+#| msgid "Enter your username and password to view printers available on %s."
+msgid "Enter username and password to view printers on Print Server."
+msgstr "Enter username and password to view printers on Print Server."
+
+#. Translators: This button triggers the printing of a test page.
+#. Translators: Name of job which makes printer to print test page
+#: ../panels/printers/options-dialog.ui.h:2
+#: ../panels/printers/pp-options-dialog.c:893
+#| msgid "Test page"
+msgid "Test Page"
+msgstr "Test Page"
+
+#. Translators: This is the title of the dialog. %s is the printer name.
+#: ../panels/printers/pp-details-dialog.c:123
+#: ../panels/printers/pp-details-dialog.c:415
+#, c-format
+#| msgid "Details"
+msgid "%s Details"
+msgstr "%s Details"
+
+#: ../panels/printers/pp-details-dialog.c:172
+msgid "No suitable driver found"
+msgstr "No suitable driver found"
+
+#: ../panels/printers/pp-details-dialog.c:316
+msgid "Select PPD File"
+msgstr "Select PPD File"
+
+#: ../panels/printers/pp-details-dialog.c:325
+msgid ""
+"PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
+"PPD.GZ)"
+msgstr ""
+"PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
+"PPD.GZ)"
 
 #: ../panels/printers/ppd-selection-dialog.ui.h:1
 msgid "Select Printer Driver"
@@ -4353,16 +4397,17 @@ msgid "Select"
 msgstr "Select"
 
 #: ../panels/printers/ppd-selection-dialog.ui.h:4
-msgid "Loading drivers database..."
+#| msgid "Loading drivers database..."
+msgid "Loading drivers database…"
 msgstr "Loading drivers database…"
 
 #. Translators: The found device is a JetDirect printer
-#: ../panels/printers/pp-host.c:526
+#: ../panels/printers/pp-host.c:539
 msgid "JetDirect Printer"
 msgstr "JetDirect Printer"
 
 #. Translators: The found device is a Line Printer Daemon printer
-#: ../panels/printers/pp-host.c:782
+#: ../panels/printers/pp-host.c:795
 msgid "LPD Printer"
 msgstr "LPD Printer"
 
@@ -4405,174 +4450,195 @@ msgid "Reverse portrait"
 msgstr "Reverse portrait"
 
 #. Translators: Job's state (job is waiting to be printed)
-#: ../panels/printers/pp-jobs-dialog.c:103
+#: ../panels/printers/pp-jobs-dialog.c:104
 msgctxt "print job"
 msgid "Pending"
 msgstr "Pending"
 
 #. Translators: Job's state (job is held for printing)
-#: ../panels/printers/pp-jobs-dialog.c:107
+#: ../panels/printers/pp-jobs-dialog.c:108
 msgctxt "print job"
 msgid "Paused"
 msgstr "Paused"
 
 #. Translators: Job's state (job is currently printing)
-#: ../panels/printers/pp-jobs-dialog.c:111
+#: ../panels/printers/pp-jobs-dialog.c:112
 msgctxt "print job"
 msgid "Processing"
 msgstr "Processing"
 
 #. Translators: Job's state (job has been stopped)
-#: ../panels/printers/pp-jobs-dialog.c:115
+#: ../panels/printers/pp-jobs-dialog.c:116
 msgctxt "print job"
 msgid "Stopped"
 msgstr "Stopped"
 
 #. Translators: Job's state (job has been canceled)
-#: ../panels/printers/pp-jobs-dialog.c:119
+#: ../panels/printers/pp-jobs-dialog.c:120
 msgctxt "print job"
 msgid "Canceled"
 msgstr "Cancelled"
 
 #. Translators: Job's state (job has aborted due to error)
-#: ../panels/printers/pp-jobs-dialog.c:123
+#: ../panels/printers/pp-jobs-dialog.c:124
 msgctxt "print job"
 msgid "Aborted"
 msgstr "Aborted"
 
 #. Translators: Job's state (job has completed successfully)
-#: ../panels/printers/pp-jobs-dialog.c:127
+#: ../panels/printers/pp-jobs-dialog.c:128
 msgctxt "print job"
 msgid "Completed"
 msgstr "Completed"
 
 #. Translators: This is the printer name for which we are showing the active jobs
-#: ../panels/printers/pp-jobs-dialog.c:289
+#: ../panels/printers/pp-jobs-dialog.c:310
 #, c-format
+#| msgctxt "Printer jobs dialog title"
+#| msgid "%s - Active Jobs"
 msgctxt "Printer jobs dialog title"
-msgid "%s - Active Jobs"
-msgstr "%s - Active Jobs"
+msgid "%s — Active Jobs"
+msgstr "%s — Active Jobs"
+
+#: ../panels/printers/pp-new-printer-dialog.c:402
+#| msgid "Select Printer Driver"
+msgid "Unlock Print Server"
+msgstr "Unlock Print Server"
+
+#. Translators: Samba server needs authentication of the user to show list of its printers.
+#: ../panels/printers/pp-new-printer-dialog.c:406
+#, c-format
+#| msgid "Unlock"
+msgid "Unlock %s."
+msgstr "Unlock %s."
+
+#. Translators: Samba server needs authentication of the user to show list of its printers.
+#: ../panels/printers/pp-new-printer-dialog.c:411
+#, c-format
+#| msgid "Enter your username and password to view printers available on %s."
+msgid "Enter username and password to view printers on %s."
+msgstr "Enter username and password to view printers on %s."
+
+#: ../panels/printers/pp-new-printer-dialog.c:876
+#| msgid "Not searching for networks"
+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:1659
+#: ../panels/printers/pp-new-printer-dialog.c:1799
 msgid "USB"
 msgstr "USB"
 
 #. Translators: The found device is a printer connected via serial port
-#: ../panels/printers/pp-new-printer-dialog.c:1664
+#: ../panels/printers/pp-new-printer-dialog.c:1804
 msgid "Serial Port"
 msgstr "Serial Port"
 
 #. Translators: The found device is a printer connected via parallel port
-#: ../panels/printers/pp-new-printer-dialog.c:1671
+#: ../panels/printers/pp-new-printer-dialog.c:1811
 msgid "Parallel Port"
 msgstr "Parallel Port"
 
-#. Translators: The found device is a printer connected via Bluetooth
-#: ../panels/printers/pp-new-printer-dialog.c:1676
-msgid "Bluetooth"
-msgstr "Bluetooth"
-
 #. Translators: Location of found network printer (e.g. Kitchen, Reception)
-#: ../panels/printers/pp-new-printer-dialog.c:1713
+#: ../panels/printers/pp-new-printer-dialog.c:1853
 #, c-format
 msgid "Location: %s"
 msgstr "Location: %s"
 
 #. Translators: Network address of found printer
-#: ../panels/printers/pp-new-printer-dialog.c:1718
+#: ../panels/printers/pp-new-printer-dialog.c:1858
 #, c-format
 msgid "Address: %s"
 msgstr "Address: %s"
 
 #. Translators: This item is a server which needs authentication to show its printers
-#: ../panels/printers/pp-new-printer-dialog.c:1747
+#: ../panels/printers/pp-new-printer-dialog.c:1887
 msgid "Server requires authentication"
 msgstr "Server requires authentication"
 
-#: ../panels/printers/pp-options-dialog.c:81
+#: ../panels/printers/pp-options-dialog.c:83
 msgid "Two Sided"
 msgstr "Two Sided"
 
-#: ../panels/printers/pp-options-dialog.c:82
+#: ../panels/printers/pp-options-dialog.c:84
 msgid "Paper Type"
 msgstr "Paper Type"
 
-#: ../panels/printers/pp-options-dialog.c:83
+#: ../panels/printers/pp-options-dialog.c:85
 msgid "Paper Source"
 msgstr "Paper Source"
 
-#: ../panels/printers/pp-options-dialog.c:84
+#: ../panels/printers/pp-options-dialog.c:86
 msgid "Output Tray"
 msgstr "Output Tray"
 
-#: ../panels/printers/pp-options-dialog.c:86
+#: ../panels/printers/pp-options-dialog.c:88
 msgid "GhostScript pre-filtering"
 msgstr "GhostScript pre-filtering"
 
 #. Translators: This option sets number of pages printed on one sheet
-#: ../panels/printers/pp-options-dialog.c:533
+#: ../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:545
+#: ../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:557
-msgid "Orientation"
-msgstr "Orientation"
-
 #. Translators: "General" tab contains general printer options
-#: ../panels/printers/pp-options-dialog.c:654
+#: ../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:657
+#: ../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:660
+#: ../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:663
+#: ../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:666
+#: ../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:669
+#: ../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:672
+#: ../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:675
+#: ../panels/printers/pp-options-dialog.c:676
 msgctxt "Printer Option Group"
 msgid "Advanced"
 msgstr "Advanced"
 
+#. Translators: Name of job which makes printer to print test page
+#: ../panels/printers/pp-options-dialog.c:908
+msgid "Test page"
+msgstr "Test page"
+
 #. Translators: this is an option of "Paper Source"
 #: ../panels/printers/pp-ppd-option-widget.c:76
 #: ../panels/printers/pp-ppd-option-widget.c:78
@@ -4614,89 +4680,196 @@ msgstr "No pre-filtering"
 msgid "Manufacturer"
 msgstr "Manufacturer"
 
-#. Translators: Name of column showing printer drivers
-#: ../panels/printers/pp-ppd-selection-dialog.c:250
-msgid "Driver"
-msgstr "Driver"
+#. Translators: This is the label of the button that opens the Jobs Dialog.
+#: ../panels/printers/pp-printer-entry.c:577
+#| msgid "Active Jobs"
+msgid "No Active Jobs"
+msgstr "No Active Jobs"
 
-#. Translators: Samba server needs authentication of the user to show list of its printers.
-#: ../panels/printers/pp-samba.c:248
+#. Translators: This is the label of the button that opens the Jobs Dialog.
+#: ../panels/printers/pp-printer-entry.c:582
 #, c-format
-msgid "Enter your username and password to view printers available on %s."
-msgstr "Enter your username and password to view printers available on %s."
+msgid "%u Job"
+msgid_plural "%u Jobs"
+msgstr[0] "%u Job"
+msgstr[1] "%u Jobs"
 
-#: ../panels/printers/printers.ui.h:1
-msgid "Add Printer"
-msgstr "Add Printer"
+#. Translators: The printer is low on toner
+#: ../panels/printers/pp-printer-entry.c:730
+msgid "Low on toner"
+msgstr "Low on toner"
 
-#: ../panels/printers/printers.ui.h:2
-msgid "Remove Printer"
-msgstr "Remove Printer"
+#. Translators: The printer has no toner left
+#: ../panels/printers/pp-printer-entry.c:732
+msgid "Out of toner"
+msgstr "Out of toner"
 
-#. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/printers.ui.h:4
-msgid "Supply"
-msgstr "Supply"
+#. Translators: "Developer" is a chemical for photo development,
+#. * http://en.wikipedia.org/wiki/Photographic_developer
+#: ../panels/printers/pp-printer-entry.c:735
+msgid "Low on developer"
+msgstr "Low on developer"
 
-#. Translators: Location of the printer (e.g. Lab, 1st floor,...).
-#: ../panels/printers/printers.ui.h:6
-msgid "Location"
-msgstr "Location"
+#. Translators: "Developer" is a chemical for photo development,
+#. * http://en.wikipedia.org/wiki/Photographic_developer
+#: ../panels/printers/pp-printer-entry.c:738
+msgid "Out of developer"
+msgstr "Out of developer"
 
-#. Translators: This checkbox is checked when the default printer is selected.
-#: ../panels/printers/printers.ui.h:8
-msgid "_Default printer"
-msgstr "_Default printer"
+#. Translators: "marker" is one color bin of the printer
+#: ../panels/printers/pp-printer-entry.c:740
+msgid "Low on a marker supply"
+msgstr "Low on a marker supply"
 
-#: ../panels/printers/printers.ui.h:9
-msgid "Jobs"
-msgstr "Jobs"
+#. Translators: "marker" is one color bin of the printer
+#: ../panels/printers/pp-printer-entry.c:742
+msgid "Out of a marker supply"
+msgstr "Out of a marker supply"
+
+#. Translators: One or more covers on the printer are open
+#: ../panels/printers/pp-printer-entry.c:744
+msgid "Open cover"
+msgstr "Open cover"
+
+#. Translators: One or more doors on the printer are open
+#: ../panels/printers/pp-printer-entry.c:746
+msgid "Open door"
+msgstr "Open door"
 
-#. Translators: Opens a dialog containing printer
-#: ../panels/printers/printers.ui.h:11
-msgid "Show _Jobs"
-msgstr "Show _Jobs"
+#. Translators: At least one input tray is low on media
+#: ../panels/printers/pp-printer-entry.c:748
+msgid "Low on paper"
+msgstr "Low on paper"
+
+#. Translators: At least one input tray is empty
+#: ../panels/printers/pp-printer-entry.c:750
+msgid "Out of paper"
+msgstr "Out of paper"
+
+#. Translators: The printer is offline
+#: ../panels/printers/pp-printer-entry.c:752
+msgctxt "printer state"
+msgid "Offline"
+msgstr "Offline"
+
+#. Translators: Someone has stopped the Printer
+#. Translators: Printer's state (no jobs can be processed)
+#: ../panels/printers/pp-printer-entry.c:754
+#: ../panels/printers/pp-printer-entry.c:884
+msgctxt "printer state"
+msgid "Stopped"
+msgstr "Stopped"
+
+#. Translators: The printer marker supply waste receptacle is almost full
+#: ../panels/printers/pp-printer-entry.c:756
+msgid "Waste receptacle almost full"
+msgstr "Waste receptacle almost full"
+
+#. Translators: The printer marker supply waste receptacle is full
+#: ../panels/printers/pp-printer-entry.c:758
+msgid "Waste receptacle full"
+msgstr "Waste receptacle full"
+
+#. Translators: Optical photo conductors are used in laser printers
+#: ../panels/printers/pp-printer-entry.c:760
+msgid "The optical photo conductor is near end of life"
+msgstr "The optical photo conductor is near end of life"
+
+#. Translators: Optical photo conductors are used in laser printers
+#: ../panels/printers/pp-printer-entry.c:762
+msgid "The optical photo conductor is no longer functioning"
+msgstr "The optical photo conductor is no longer functioning"
+
+#. Translators: Printer's state (can start new job without waiting)
+#: ../panels/printers/pp-printer-entry.c:870
+msgctxt "printer state"
+msgid "Ready"
+msgstr "Ready"
+
+#. Translators: Printer's state (printer is ready but doesn't accept new jobs)
+#: ../panels/printers/pp-printer-entry.c:875
+msgctxt "printer state"
+msgid "Does not accept jobs"
+msgstr "Does not accept jobs"
 
-#: ../panels/printers/printers.ui.h:12
+#. Translators: Printer's state (jobs are processing)
+#: ../panels/printers/pp-printer-entry.c:880
+msgctxt "printer state"
+msgid "Processing"
+msgstr "Processing"
+
+#. Translators: Name of job which makes printer to clean its heads
+#: ../panels/printers/pp-printer-entry.c:904
+msgid "Clean print heads"
+msgstr "Clean print heads"
+
+#: ../panels/printers/printer-entry.ui.h:1
+#| msgid "Login Options"
+msgid "Printing Options"
+msgstr "Printing Options"
+
+#: ../panels/printers/printer-entry.ui.h:2
+#| msgid "Printer Default"
+msgid "Printer Details"
+msgstr "Printer Details"
+
+#: ../panels/printers/printer-entry.ui.h:3
+#| msgid "Printer Default"
+msgid "Use Printer by Default"
+msgstr "Use Printer by Default"
+
+#. Translators: This button executes command which cleans print heads of the printer.
+#: ../panels/printers/printer-entry.ui.h:5
+#| msgid "Clean print heads"
+msgid "Clean Print Heads"
+msgstr "Clean Print Heads"
+
+#: ../panels/printers/printer-entry.ui.h:6
+msgid "Remove Printer"
+msgstr "Remove Printer"
+
+#: ../panels/printers/printer-entry.ui.h:7
 msgid "Model"
 msgstr "Model"
 
-#: ../panels/printers/printers.ui.h:15
-msgid "label"
-msgstr "label"
-
-#: ../panels/printers/printers.ui.h:17
-msgid "Setting new driver…"
-msgstr "Setting new driver…"
+#: ../panels/printers/printer-entry.ui.h:9
+msgid "Ink Level"
+msgstr "Ink Level"
 
-#: ../panels/printers/printers.ui.h:18
-msgid "page 3"
-msgstr "page 3"
+#. Translators: This is the message which follows the printer error.
+#: ../panels/printers/printer-entry.ui.h:11
+msgid "Please restart when the problem is resolved."
+msgstr "Please restart when the problem is resolved."
 
-#. Translators: This button executes command which prints test page.
-#: ../panels/printers/printers.ui.h:20
-msgid "Print _Test Page"
-msgstr "Print _Test Page"
+#. Translators: This is the button which restarts the printer.
+#: ../panels/printers/printer-entry.ui.h:13
+#| msgid "Restart Now"
+msgid "Restart"
+msgstr "Restart"
 
-#. Translators: This button opens printer
-#: ../panels/printers/printers.ui.h:22 ../panels/region/region.ui.h:6
-msgid "_Options"
-msgstr "_Options"
+#. Translators: This button adds new printer.
+#: ../panels/printers/printers.ui.h:2
+msgid "Add…"
+msgstr "Add…"
 
-#: ../panels/printers/printers.ui.h:23
+#: ../panels/printers/printers.ui.h:5
 msgid "No printers"
 msgstr "No printers"
 
 #. Translators: This button adds new printer.
-#: ../panels/printers/printers.ui.h:25
-msgid "Add a Printer"
-msgstr "Add a Printer"
+#: ../panels/printers/printers.ui.h:7
+#| msgid "Add a Printer"
+msgid "Add a Printer…"
+msgstr "Add a Printer…"
 
 #. Translators: The CUPS server is not running (we can not connect to it).
-#: ../panels/printers/printers.ui.h:27
+#: ../panels/printers/printers.ui.h:9
+#| msgid ""
+#| "Sorry! The system printing service\n"
+#| "doesn't seem to be available."
 msgid ""
 "Sorry! The system printing service\n"
-"doesn't seem to be available."
+"doesn’t seem to be available."
 msgstr ""
 "Sorry! The system printing service\n"
 "doesn’t seem to be available."
@@ -4727,44 +4900,44 @@ msgstr "Location Services"
 msgid "Usage & History"
 msgstr "Usage & History"
 
-#: ../panels/privacy/cc-privacy-panel.c:1067
+#: ../panels/privacy/cc-privacy-panel.c:1071
 msgid "Empty all items from Trash?"
 msgstr "Empty all items from Wastebasket?"
 
-#: ../panels/privacy/cc-privacy-panel.c:1068
+#: ../panels/privacy/cc-privacy-panel.c:1072
 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:1069 ../panels/privacy/privacy.ui.h:34
+#: ../panels/privacy/cc-privacy-panel.c:1073
 msgid "_Empty Trash"
 msgstr "_Empty Wastebasket"
 
-#: ../panels/privacy/cc-privacy-panel.c:1092
+#: ../panels/privacy/cc-privacy-panel.c:1096
 msgid "Delete all the temporary files?"
 msgstr "Delete all the temporary files?"
 
-#: ../panels/privacy/cc-privacy-panel.c:1093
+#: ../panels/privacy/cc-privacy-panel.c:1097
 msgid "All the temporary files will be permanently deleted."
 msgstr "All the temporary files will be permanently deleted."
 
-#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35
+#: ../panels/privacy/cc-privacy-panel.c:1098
 msgid "_Purge Temporary Files"
 msgstr "_Purge Temporary Files"
 
-#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29
+#: ../panels/privacy/cc-privacy-panel.c:1120 ../panels/privacy/privacy.ui.h:29
 msgid "Purge Trash & Temporary Files"
 msgstr "Purge Wastebasket & Temporary Files"
 
-#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36
+#: ../panels/privacy/cc-privacy-panel.c:1160 ../panels/privacy/privacy.ui.h:36
 msgid "Software Usage"
 msgstr "Software Usage"
 
-#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46
+#: ../panels/privacy/cc-privacy-panel.c:1201 ../panels/privacy/privacy.ui.h:46
 msgid "Problem Reporting"
 msgstr "Problem Reporting"
 
 #. translators: '%s' is the distributor's name, such as 'Fedora'
-#: ../panels/privacy/cc-privacy-panel.c:1211
+#: ../panels/privacy/cc-privacy-panel.c:1215
 #, c-format
 msgid ""
 "Sending reports of technical problems helps us improve %s. Reports are sent "
@@ -4773,7 +4946,7 @@ 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:1223 ../panels/privacy/privacy.ui.h:41
+#: ../panels/privacy/cc-privacy-panel.c:1227 ../panels/privacy/privacy.ui.h:41
 msgid "Privacy Policy"
 msgstr "Privacy Policy"
 
@@ -4899,6 +5072,16 @@ msgstr "Automatically purge Temporary _Files"
 msgid "Purge _After"
 msgstr "Purge _After"
 
+#: ../panels/privacy/privacy.ui.h:34
+#| msgid "_Empty Trash"
+msgid "_Empty Trash…"
+msgstr "_Empty Wastebasket…"
+
+#: ../panels/privacy/privacy.ui.h:35
+#| msgid "_Purge Temporary Files"
+msgid "_Purge Temporary Files…"
+msgstr "_Purge Temporary Files…"
+
 #: ../panels/privacy/privacy.ui.h:37
 msgid ""
 "Sending us information about which software you use helps us provide you "
@@ -4935,17 +5118,17 @@ msgstr "_Location Services"
 msgid "_Automatic Problem Reporting"
 msgstr "_Automatic Problem Reporting"
 
-#: ../panels/region/cc-format-chooser.c:120
+#: ../panels/region/cc-format-chooser.c:118
 msgctxt "measurement format"
 msgid "Imperial"
 msgstr "Imperial"
 
-#: ../panels/region/cc-format-chooser.c:122
+#: ../panels/region/cc-format-chooser.c:120
 msgctxt "measurement format"
 msgid "Metric"
 msgstr "Metric"
 
-#: ../panels/region/cc-format-chooser.c:287
+#: ../panels/region/cc-format-chooser.c:285
 msgid "No regions found"
 msgstr "No regions found"
 
@@ -4953,26 +5136,16 @@ msgstr "No regions found"
 msgid "No input sources found"
 msgstr "No input sources found"
 
-#: ../panels/region/cc-input-chooser.c:992
+#: ../panels/region/cc-input-chooser.c:1012
 msgctxt "Input Source"
 msgid "Other"
 msgstr "Other"
 
-#: ../panels/region/cc-region-panel.c:247
-#: ../panels/user-accounts/um-user-panel.c:1087
-msgid "Your session needs to be restarted for changes to take effect"
-msgstr "Your session needs to be restarted for changes to take effect"
-
-#: ../panels/region/cc-region-panel.c:251
-#: ../panels/user-accounts/um-user-panel.c:1091
-msgid "Restart Now"
-msgstr "Restart Now"
-
-#: ../panels/region/cc-region-panel.c:888
+#: ../panels/region/cc-region-panel.c:881
 msgid "No input source selected"
 msgstr "No input source selected"
 
-#: ../panels/region/cc-region-panel.c:1779
+#: ../panels/region/cc-region-panel.c:1773
 msgid "Login _Screen"
 msgstr "Login _Screen"
 
@@ -4993,14 +5166,19 @@ msgid "Times"
 msgstr "Times"
 
 #: ../panels/region/format-chooser.ui.h:7
+#| msgid "Date & Time"
+msgid "Dates & Times"
+msgstr "Dates & Times"
+
+#: ../panels/region/format-chooser.ui.h:8
 msgid "Numbers"
 msgstr "Numbers"
 
-#: ../panels/region/format-chooser.ui.h:8
+#: ../panels/region/format-chooser.ui.h:9
 msgid "Measurement"
 msgstr "Measurement"
 
-#: ../panels/region/format-chooser.ui.h:9
+#: ../panels/region/format-chooser.ui.h:10
 msgid "Paper"
 msgstr "Paper"
 
@@ -5025,7 +5203,8 @@ msgid "Add an Input Source"
 msgstr "Add an Input Source"
 
 #: ../panels/region/input-chooser.ui.h:4
-msgid "Input methods can't be used on the login screen"
+#| msgid "Input methods can't be used on the login screen"
+msgid "Input methods can’t be used on the login screen"
 msgstr "Input methods can’t be used on the login screen"
 
 #: ../panels/region/input-options.ui.h:1
@@ -5040,10 +5219,6 @@ msgstr "Use the _same source for all windows"
 msgid "Allow _different sources for each window"
 msgstr "Allow _different sources for each window"
 
-#: ../panels/region/input-options.ui.h:4 ../shell/cc-application.c:251
-msgid "Keyboard Shortcuts"
-msgstr "Keyboard Shortcuts"
-
 #: ../panels/region/input-options.ui.h:5
 msgid "Switch to previous source"
 msgstr "Switch to previous source"
@@ -5073,7 +5248,7 @@ msgid "Left+Right Alt"
 msgstr "Left+Right Alt"
 
 #: ../panels/region/region.ui.h:1
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
 msgid "_Language"
 msgstr "_Language"
 
@@ -5082,54 +5257,68 @@ msgid "English (United Kingdom)"
 msgstr "English (United Kingdom)"
 
 #: ../panels/region/region.ui.h:3
+#| msgid "Your session needs to be restarted for changes to take effect"
+msgid "Restart the session for changes to take effect"
+msgstr "Restart the session for changes to take effect"
+
+#: ../panels/region/region.ui.h:4
+#| msgid "Restart Now"
+msgid "Restart…"
+msgstr "Restart…"
+
+#: ../panels/region/region.ui.h:5
 msgid "_Formats"
 msgstr "_Formats"
 
-#: ../panels/region/region.ui.h:4
+#: ../panels/region/region.ui.h:6
 msgid "United Kingdom"
 msgstr "United Kingdom"
 
-#: ../panels/region/region.ui.h:5
+#: ../panels/region/region.ui.h:7
 msgid "Input Sources"
 msgstr "Input Sources"
 
-#: ../panels/region/region.ui.h:7
+#: ../panels/region/region.ui.h:8
+msgid "_Options"
+msgstr "_Options"
+
+#: ../panels/region/region.ui.h:9
 msgid "Add input source"
 msgstr "Add input source"
 
-#: ../panels/region/region.ui.h:8
+#: ../panels/region/region.ui.h:10
 msgid "Remove input source"
 msgstr "Remove input source"
 
-#: ../panels/region/region.ui.h:9
+#: ../panels/region/region.ui.h:11
 msgid "Move input source up"
 msgstr "Move input source up"
 
-#: ../panels/region/region.ui.h:10
+#: ../panels/region/region.ui.h:12
 msgid "Move input source down"
 msgstr "Move input source down"
 
-#: ../panels/region/region.ui.h:11
+#: ../panels/region/region.ui.h:13
 msgid "Configure input source"
 msgstr "Configure input source"
 
-#: ../panels/region/region.ui.h:12
+#: ../panels/region/region.ui.h:14
 msgid "Show input source keyboard layout"
 msgstr "Show input source keyboard layout"
 
-#: ../panels/region/region.ui.h:13
+#: ../panels/region/region.ui.h:15
 msgid "Login settings are used by all users when logging into the system"
 msgstr "Login settings are used by all users when logging into the system"
 
-#: ../panels/search/cc-search-locations-dialog.c:634
+#: ../panels/search/cc-search-locations-dialog.c:639
 msgid "Select Location"
 msgstr "Select Location"
 
-#: ../panels/search/cc-search-locations-dialog.c:638
+#: ../panels/search/cc-search-locations-dialog.c:643
 msgid "_OK"
 msgstr "_OK"
 
-#: ../panels/search/cc-search-panel.c:177
+#: ../panels/search/cc-search-panel.c:178
 msgid "No applications found"
 msgstr "No applications found"
 
@@ -5182,32 +5371,32 @@ msgstr "Preferences"
 msgid "No networks selected for sharing"
 msgstr "No networks selected for sharing"
 
-#: ../panels/sharing/cc-sharing-panel.c:263
+#: ../panels/sharing/cc-sharing-panel.c:266
 msgctxt "service is enabled"
 msgid "On"
 msgstr "On"
 
-#: ../panels/sharing/cc-sharing-panel.c:265
-#: ../panels/sharing/cc-sharing-panel.c:292
+#: ../panels/sharing/cc-sharing-panel.c:268
+#: ../panels/sharing/cc-sharing-panel.c:295
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "Off"
 
-#: ../panels/sharing/cc-sharing-panel.c:295
+#: ../panels/sharing/cc-sharing-panel.c:298
 msgctxt "service is enabled"
 msgid "Enabled"
 msgstr "Enabled"
 
-#: ../panels/sharing/cc-sharing-panel.c:298
+#: ../panels/sharing/cc-sharing-panel.c:301
 msgctxt "service is active"
 msgid "Active"
 msgstr "Active"
 
-#: ../panels/sharing/cc-sharing-panel.c:369
+#: ../panels/sharing/cc-sharing-panel.c:372
 msgid "Choose a Folder"
 msgstr "Choose a Folder"
 
-#: ../panels/sharing/cc-sharing-panel.c:680
+#: ../panels/sharing/cc-sharing-panel.c:683
 #, c-format
 msgid ""
 "Personal File Sharing allows you to share your Public folder with others on "
@@ -5216,7 +5405,7 @@ msgstr ""
 "Personal File Sharing allows you to share your Public folder with others on "
 "your current network using: <a href=\"dav://%s\">dav://%s</a>"
 
-#: ../panels/sharing/cc-sharing-panel.c:682
+#: ../panels/sharing/cc-sharing-panel.c:685
 #, c-format
 msgid ""
 "When remote login is enabled, remote users can connect using the Secure "
@@ -5227,7 +5416,7 @@ msgstr ""
 "Shell command:\n"
 "<a href=\"ssh %s\">ssh %s</a>"
 
-#: ../panels/sharing/cc-sharing-panel.c:684
+#: ../panels/sharing/cc-sharing-panel.c:687
 #, c-format
 msgid ""
 "Screen sharing allows remote users to view or control your screen by "
@@ -5236,11 +5425,11 @@ msgstr ""
 "Screen sharing allows remote users to view or control your screen by "
 "connecting to <a href=\"vnc://%s\">vnc://%s</a>"
 
-#: ../panels/sharing/cc-sharing-panel.c:796
+#: ../panels/sharing/cc-sharing-panel.c:799
 msgid "Copy"
 msgstr "Copy"
 
-#: ../panels/sharing/cc-sharing-panel.c:1122
+#: ../panels/sharing/cc-sharing-panel.c:1125
 msgid "Sharing"
 msgstr "Sharing"
 
@@ -5446,7 +5635,7 @@ msgstr "_Profile:"
 
 #. translators:
 #. * The number of sound outputs on a particular device
-#: ../panels/sound/gvc/gvc-mixer-control.c:1837
+#: ../panels/sound/gvc/gvc-mixer-control.c:1873
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@@ -5455,14 +5644,14 @@ msgstr[1] "%u Outputs"
 
 #. translators:
 #. * The number of sound inputs on a particular device
-#: ../panels/sound/gvc/gvc-mixer-control.c:1847
+#: ../panels/sound/gvc/gvc-mixer-control.c:1883
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
 msgstr[0] "%u Input"
 msgstr[1] "%u Inputs"
 
-#: ../panels/sound/gvc/gvc-mixer-control.c:2373
+#: ../panels/sound/gvc/gvc-mixer-control.c:2738
 msgid "System Sounds"
 msgstr "System Sounds"
 
@@ -5544,6 +5733,7 @@ msgid "Testing event sound"
 msgstr "Testing event sound"
 
 #: ../panels/sound/gvc-sound-theme-chooser.c:554
+#: ../panels/wacom/wacom-stylus-page.ui.h:1
 msgid "Default"
 msgstr "Default"
 
@@ -5572,6 +5762,51 @@ msgstr "Subwoofer"
 msgid "Custom"
 msgstr "Custom"
 
+#. translators: the labels will read:
+#. * Cursor Size: Default
+#: ../panels/universal-access/cc-ua-panel.c:351
+#| msgid "Default"
+msgctxt "cursor size"
+msgid "Default"
+msgstr "Default"
+
+#: ../panels/universal-access/cc-ua-panel.c:354
+#| msgctxt "Calibration quality"
+#| msgid "Medium"
+msgctxt "cursor size"
+msgid "Medium"
+msgstr "Medium"
+
+#: ../panels/universal-access/cc-ua-panel.c:357
+#| msgctxt "dwell click threshold"
+#| msgid "Large"
+msgctxt "cursor size"
+msgid "Large"
+msgstr "Large"
+
+#: ../panels/universal-access/cc-ua-panel.c:360
+#| msgctxt "universal access, text size"
+#| msgid "Larger"
+msgctxt "cursor size"
+msgid "Larger"
+msgstr "Larger"
+
+#: ../panels/universal-access/cc-ua-panel.c:363
+#| msgctxt "dwell click threshold"
+#| msgid "Large"
+msgctxt "cursor size"
+msgid "Largest"
+msgstr "Largest"
+
+#: ../panels/universal-access/cc-ua-panel.c:367
+#, c-format
+#| msgid "pixel"
+#| msgid_plural "pixels"
+msgid "%d pixel"
+msgid_plural "%d pixels"
+msgstr[0] "%d pixel"
+msgstr[1] "%d pixels"
+
 #. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2
 msgid "Uni­ver­sal Access"
@@ -5583,12 +5818,15 @@ msgstr "Make it easier to see, hear, type, point and click"
 
 #. Translators: those are keywords for the universal access control-center panel
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5
+#| msgid ""
+#| "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;"
+#| "size;AccessX;Sticky;Keys;Slow;Bounce;Mouse;"
 msgid ""
 "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
-"AccessX;Sticky;Keys;Slow;Bounce;Mouse;"
+"AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;Repeat;Blink;"
 msgstr ""
 "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
-"AccessX;Sticky;Keys;Slow;Bounce;Mouse;"
+"AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;Repeat;Blink;"
 
 #: ../panels/universal-access/uap.ui.h:1
 msgid "_Always Show Universal Access Menu"
@@ -5607,280 +5845,295 @@ msgid "_Large Text"
 msgstr "_Large Text"
 
 #: ../panels/universal-access/uap.ui.h:5
+msgid "C_ursor Size"
+msgstr "C_ursor Size"
+
+#: ../panels/universal-access/uap.ui.h:6
 #: ../panels/universal-access/zoom-options.ui.h:7
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../panels/universal-access/uap.ui.h:7
+#: ../panels/universal-access/uap.ui.h:8
 msgid "Screen _Reader"
 msgstr "Screen _Reader"
 
-#: ../panels/universal-access/uap.ui.h:8
+#: ../panels/universal-access/uap.ui.h:9
 msgid "_Sound Keys"
 msgstr "_Sound Keys"
 
-#: ../panels/universal-access/uap.ui.h:9
+#: ../panels/universal-access/uap.ui.h:10
 msgid "Hearing"
 msgstr "Hearing"
 
-#: ../panels/universal-access/uap.ui.h:10
+#: ../panels/universal-access/uap.ui.h:11
 msgid "_Visual Alerts"
 msgstr "_Visual Alerts"
 
-#: ../panels/universal-access/uap.ui.h:12
+#: ../panels/universal-access/uap.ui.h:13
 msgid "Screen _Keyboard"
 msgstr "Screen _Keyboard"
 
-#: ../panels/universal-access/uap.ui.h:13
+#: ../panels/universal-access/uap.ui.h:14
 msgid "R_epeat Keys"
 msgstr "R_epeat Keys"
 
-#: ../panels/universal-access/uap.ui.h:14
+#: ../panels/universal-access/uap.ui.h:15
 msgid "Cursor _Blinking"
 msgstr "Cursor _Blinking"
 
-#: ../panels/universal-access/uap.ui.h:15
+#: ../panels/universal-access/uap.ui.h:16
 msgid "_Typing Assist (AccessX)"
 msgstr "_Typing Assist (AccessX)"
 
-#: ../panels/universal-access/uap.ui.h:16
+#: ../panels/universal-access/uap.ui.h:17
 msgid "Pointing & Clicking"
 msgstr "Pointing & Clicking"
 
-#: ../panels/universal-access/uap.ui.h:17
+#: ../panels/universal-access/uap.ui.h:18
 msgid "_Mouse Keys"
 msgstr "_Mouse Keys"
 
-#: ../panels/universal-access/uap.ui.h:18
+#: ../panels/universal-access/uap.ui.h:19
 msgid "_Click Assist"
 msgstr "_Click Assist"
 
-#: ../panels/universal-access/uap.ui.h:19
+#: ../panels/universal-access/uap.ui.h:20
 msgid "_Double-Click Delay"
 msgstr "_Double-Click Delay"
 
-#: ../panels/universal-access/uap.ui.h:20
+#: ../panels/universal-access/uap.ui.h:21
 msgid "Double-Click Delay"
 msgstr "Double-Click Delay"
 
-#: ../panels/universal-access/uap.ui.h:21
+#: ../panels/universal-access/uap.ui.h:22
+#| msgid "Cursor Blinking"
+msgid "Cursor Size"
+msgstr "Cursor Size"
+
+#: ../panels/universal-access/uap.ui.h:23
+msgid ""
+"Cursor size can be combined with zoom to make it easier to see the cursor."
+msgstr ""
+"Cursor size can be combined with zoom to make it easier to see the cursor."
+
+#: ../panels/universal-access/uap.ui.h:24
 msgid "Screen Reader"
 msgstr "Screen Reader"
 
-#: ../panels/universal-access/uap.ui.h:22
+#: ../panels/universal-access/uap.ui.h:25
 msgid "The screen reader reads displayed text as you move the focus."
 msgstr "The screen reader reads displayed text as you move the focus."
 
-#: ../panels/universal-access/uap.ui.h:23
+#: ../panels/universal-access/uap.ui.h:26
 msgid "_Screen Reader"
 msgstr "_Screen Reader"
 
-#: ../panels/universal-access/uap.ui.h:24
+#: ../panels/universal-access/uap.ui.h:27
 msgid "Sound Keys"
 msgstr "Sound Keys"
 
-#: ../panels/universal-access/uap.ui.h:25
+#: ../panels/universal-access/uap.ui.h:28
 msgid "Beep when Num Lock or Caps Lock are turned on or off."
 msgstr "Beep when Num Lock or Caps Lock are turned on or off."
 
-#: ../panels/universal-access/uap.ui.h:26
+#: ../panels/universal-access/uap.ui.h:29
 msgid "Visual Alerts"
 msgstr "Visual Alerts"
 
-#: ../panels/universal-access/uap.ui.h:27
+#: ../panels/universal-access/uap.ui.h:30
 msgid "_Test flash"
 msgstr "_Test flash"
 
-#: ../panels/universal-access/uap.ui.h:28
+#: ../panels/universal-access/uap.ui.h:31
 msgid "Use a visual indication when an alert sound occurs."
 msgstr "Use a visual indication when an alert sound occurs."
 
-#: ../panels/universal-access/uap.ui.h:29
+#: ../panels/universal-access/uap.ui.h:32
 msgid "Flash the _window title"
 msgstr "Flash the _window title"
 
-#: ../panels/universal-access/uap.ui.h:30
+#: ../panels/universal-access/uap.ui.h:33
 msgid "Flash the entire _screen"
 msgstr "Flash the entire _screen"
 
-#: ../panels/universal-access/uap.ui.h:31
+#: ../panels/universal-access/uap.ui.h:34
 msgid "Repeat Keys"
 msgstr "Repeat Keys"
 
-#: ../panels/universal-access/uap.ui.h:32
+#: ../panels/universal-access/uap.ui.h:35
 msgid "Key presses repeat when key is held down."
 msgstr "Key presses repeat when key is held down."
 
-#: ../panels/universal-access/uap.ui.h:34
+#: ../panels/universal-access/uap.ui.h:37
 msgid "Repeat keys delay"
 msgstr "Repeat keys delay"
 
-#: ../panels/universal-access/uap.ui.h:35
+#: ../panels/universal-access/uap.ui.h:38
 msgid "Speed"
 msgstr "Speed"
 
-#: ../panels/universal-access/uap.ui.h:36
+#: ../panels/universal-access/uap.ui.h:39
 msgid "Repeat keys speed"
 msgstr "Repeat keys speed"
 
-#: ../panels/universal-access/uap.ui.h:37
+#: ../panels/universal-access/uap.ui.h:40
 msgid "Cursor Blinking"
 msgstr "Cursor Blinking"
 
-#: ../panels/universal-access/uap.ui.h:38
+#: ../panels/universal-access/uap.ui.h:41
 msgid "Cursor blinks in text fields."
 msgstr "Cursor blinks in text fields."
 
-#: ../panels/universal-access/uap.ui.h:39
+#: ../panels/universal-access/uap.ui.h:42
 msgid "Cursor blinking speed"
 msgstr "Cursor blinking speed"
 
-#: ../panels/universal-access/uap.ui.h:40
+#: ../panels/universal-access/uap.ui.h:43
 msgid "Typing Assist"
 msgstr "Typing Assist"
 
-#: ../panels/universal-access/uap.ui.h:41
+#: ../panels/universal-access/uap.ui.h:44
 msgid "_Sticky Keys"
 msgstr "_Sticky Keys"
 
-#: ../panels/universal-access/uap.ui.h:42
+#: ../panels/universal-access/uap.ui.h:45
 msgid "Treats a sequence of modifier keys as a key combination"
 msgstr "Treats a sequence of modifier keys as a key combination"
 
-#: ../panels/universal-access/uap.ui.h:43
+#: ../panels/universal-access/uap.ui.h:46
 msgid "_Disable if two keys are pressed together"
 msgstr "_Disable if two keys are pressed together"
 
-#: ../panels/universal-access/uap.ui.h:44
+#: ../panels/universal-access/uap.ui.h:47
 msgid "Beep when a _modifier key is pressed"
 msgstr "Beep when a _modifier key is pressed"
 
-#: ../panels/universal-access/uap.ui.h:45
+#: ../panels/universal-access/uap.ui.h:48
 msgid "S_low Keys"
 msgstr "S_low Keys"
 
-#: ../panels/universal-access/uap.ui.h:46
+#: ../panels/universal-access/uap.ui.h:49
 msgid "Puts a delay between when a key is pressed and when it is accepted"
 msgstr "Puts a delay between when a key is pressed and when it is accepted"
 
-#: ../panels/universal-access/uap.ui.h:47
+#: ../panels/universal-access/uap.ui.h:50
 msgid "A_cceptance delay:"
 msgstr "A_cceptance delay:"
 
-#: ../panels/universal-access/uap.ui.h:48
+#: ../panels/universal-access/uap.ui.h:51
 msgctxt "slow keys delay"
 msgid "Short"
 msgstr "Short"
 
-#: ../panels/universal-access/uap.ui.h:49
+#: ../panels/universal-access/uap.ui.h:52
 msgid "Slow keys typing delay"
 msgstr "Slow keys typing delay"
 
-#: ../panels/universal-access/uap.ui.h:50
+#: ../panels/universal-access/uap.ui.h:53
 msgctxt "slow keys delay"
 msgid "Long"
 msgstr "Long"
 
-#: ../panels/universal-access/uap.ui.h:51
+#: ../panels/universal-access/uap.ui.h:54
 msgid "Beep when a key is pr_essed"
 msgstr "Beep when a key is pr_essed"
 
-#: ../panels/universal-access/uap.ui.h:52
+#: ../panels/universal-access/uap.ui.h:55
 msgid "Beep when a key is _accepted"
 msgstr "Beep when a key is _accepted"
 
-#: ../panels/universal-access/uap.ui.h:53
+#: ../panels/universal-access/uap.ui.h:56
 msgid "Beep when a key is _rejected"
 msgstr "Beep when a key is _rejected"
 
-#: ../panels/universal-access/uap.ui.h:54
+#: ../panels/universal-access/uap.ui.h:57
 msgid "_Bounce Keys"
 msgstr "_Bounce Keys"
 
-#: ../panels/universal-access/uap.ui.h:55
+#: ../panels/universal-access/uap.ui.h:58
 msgid "Ignores fast duplicate keypresses"
 msgstr "Ignores fast duplicate keypresses"
 
-#: ../panels/universal-access/uap.ui.h:56
+#: ../panels/universal-access/uap.ui.h:59
 msgctxt "bounce keys delay"
 msgid "Short"
 msgstr "Short"
 
-#: ../panels/universal-access/uap.ui.h:57
+#: ../panels/universal-access/uap.ui.h:60
 msgid "Bounce keys typing delay"
 msgstr "Bounce keys typing delay"
 
-#: ../panels/universal-access/uap.ui.h:58
+#: ../panels/universal-access/uap.ui.h:61
 msgctxt "bounce keys delay"
 msgid "Long"
 msgstr "Long"
 
-#: ../panels/universal-access/uap.ui.h:59
+#: ../panels/universal-access/uap.ui.h:62
 msgid "_Enable by Keyboard"
 msgstr "_Enable by Keyboard"
 
-#: ../panels/universal-access/uap.ui.h:60
+#: ../panels/universal-access/uap.ui.h:63
 msgid "Turn accessibility features on and off using the keyboard"
 msgstr "Turn accessibility features on and off using the keyboard"
 
-#: ../panels/universal-access/uap.ui.h:61
+#: ../panels/universal-access/uap.ui.h:64
 msgid "Click Assist"
 msgstr "Click Assist"
 
-#: ../panels/universal-access/uap.ui.h:62
+#: ../panels/universal-access/uap.ui.h:65
 msgid "_Simulated Secondary Click"
 msgstr "_Simulated Secondary Click"
 
-#: ../panels/universal-access/uap.ui.h:63
+#: ../panels/universal-access/uap.ui.h:66
 msgid "Trigger a secondary click by holding down the primary button"
 msgstr "Trigger a secondary click by holding down the primary button"
 
-#: ../panels/universal-access/uap.ui.h:64
+#: ../panels/universal-access/uap.ui.h:67
 msgctxt "secondary click"
 msgid "Short"
 msgstr "Short"
 
-#: ../panels/universal-access/uap.ui.h:65
+#: ../panels/universal-access/uap.ui.h:68
 msgid "Secondary click delay"
 msgstr "Secondary click delay"
 
-#: ../panels/universal-access/uap.ui.h:66
+#: ../panels/universal-access/uap.ui.h:69
 msgctxt "secondary click delay"
 msgid "Long"
 msgstr "Long"
 
-#: ../panels/universal-access/uap.ui.h:67
+#: ../panels/universal-access/uap.ui.h:70
 msgid "_Hover Click"
 msgstr "_Hover Click"
 
-#: ../panels/universal-access/uap.ui.h:68
+#: ../panels/universal-access/uap.ui.h:71
 msgid "Trigger a click when the pointer hovers"
 msgstr "Trigger a click when the pointer hovers"
 
-#: ../panels/universal-access/uap.ui.h:69
+#: ../panels/universal-access/uap.ui.h:72
 msgid "D_elay:"
 msgstr "D_elay:"
 
-#: ../panels/universal-access/uap.ui.h:70
+#: ../panels/universal-access/uap.ui.h:73
 msgctxt "dwell click delay"
 msgid "Short"
 msgstr "Short"
 
-#: ../panels/universal-access/uap.ui.h:71
+#: ../panels/universal-access/uap.ui.h:74
 msgctxt "dwell click delay"
 msgid "Long"
 msgstr "Long"
 
-#: ../panels/universal-access/uap.ui.h:72
+#: ../panels/universal-access/uap.ui.h:75
 msgid "Motion _threshold:"
 msgstr "Motion _threshold:"
 
-#: ../panels/universal-access/uap.ui.h:73
+#: ../panels/universal-access/uap.ui.h:76
 msgctxt "dwell click threshold"
 msgid "Small"
 msgstr "Small"
 
-#: ../panels/universal-access/uap.ui.h:74
+#: ../panels/universal-access/uap.ui.h:77
 msgctxt "dwell click threshold"
 msgid "Large"
 msgstr "Large"
@@ -6071,17 +6324,17 @@ msgid "_Full Name"
 msgstr "_Full Name"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:6
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
 msgid "Standard"
 msgstr "Standard"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:7
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
 msgid "Administrator"
 msgstr "Administrator"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:8
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
 msgid "Account _Type"
 msgstr "Account _Type"
 
@@ -6157,7 +6410,7 @@ msgid "Right little finger"
 msgstr "Right little finger"
 
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:9
-#: ../panels/user-accounts/um-fingerprint-dialog.c:687
+#: ../panels/user-accounts/um-fingerprint-dialog.c:680
 msgid "Enable Fingerprint Login"
 msgstr "Enable Fingerprint Login"
 
@@ -6253,22 +6506,35 @@ msgstr "Set a password now"
 msgid "_Add User…"
 msgstr "_Add User…"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
+msgid "Your session needs to be restarted for changes to take effect"
+msgstr "Your session needs to be restarted for changes to take effect"
+
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
+msgid "Restart Now"
+msgstr "Restart Now"
+
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
 msgid "A_utomatic Login"
 msgstr "A_utomatic Login"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
 msgid "_Fingerprint Login"
 msgstr "_Fingerprint Login"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
 msgid "User Icon"
 msgstr "User Icon"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
 msgid "Last Login"
 msgstr "Last Login"
 
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
+#| msgid "Remove User Account"
+msgid "Remove User…"
+msgstr "Remove User…"
+
 #: ../panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in.h:1
 msgid "Manage user accounts"
 msgstr "Manage user accounts"
@@ -6362,9 +6628,15 @@ msgid "Try to avoid sequences like 1234 or abcd."
 msgstr "Try to avoid sequences like 1234 or abcd."
 
 #: ../panels/user-accounts/pw-utils.c:115
+#| msgctxt "Password hint"
+#| msgid "Try to use a mixture of letters, numbers and punctuation."
 msgctxt "Password hint"
-msgid "Try to add more letters, numbers and symbols."
-msgstr "Try to add more letters, numbers and symbols."
+msgid ""
+"Password needs to be longer. Try to add more letters, numbers and "
+"punctuation."
+msgstr ""
+"Password needs to be longer. Try to add more letters, numbers and "
+"punctuation."
 
 #: ../panels/user-accounts/pw-utils.c:117
 msgctxt "Password hint"
@@ -6372,43 +6644,15 @@ msgid "Mix uppercase and lowercase and try to use a number or two."
 msgstr "Mix uppercase and lowercase and try to use a number or two."
 
 #: ../panels/user-accounts/pw-utils.c:119
+#| msgctxt "Password hint"
+#| msgid ""
+#| "Good password! Adding more letters, numbers and punctuation will make it "
+#| "stronger."
 msgctxt "Password hint"
 msgid ""
-"Good password! Adding more letters, numbers and punctuation will make it "
-"stronger."
+"Adding more letters, numbers and punctuation will make the password stronger."
 msgstr ""
-"Good password! Adding more letters, numbers and punctuation will make it "
-"stronger."
-
-#: ../panels/user-accounts/pw-utils.c:141
-#: ../panels/user-accounts/pw-utils.c:171
-msgctxt "Password strength"
-msgid "Strength: Weak"
-msgstr "Strength: Weak"
-
-#: ../panels/user-accounts/pw-utils.c:145
-#: ../panels/user-accounts/pw-utils.c:172
-msgctxt "Password strength"
-msgid "Strength: Low"
-msgstr "Strength: Low"
-
-#: ../panels/user-accounts/pw-utils.c:148
-#: ../panels/user-accounts/pw-utils.c:173
-msgctxt "Password strength"
-msgid "Strength: Medium"
-msgstr "Strength: Medium"
-
-#: ../panels/user-accounts/pw-utils.c:151
-#: ../panels/user-accounts/pw-utils.c:174
-msgctxt "Password strength"
-msgid "Strength: Good"
-msgstr "Strength: Good"
-
-#: ../panels/user-accounts/pw-utils.c:154
-#: ../panels/user-accounts/pw-utils.c:175
-msgctxt "Password strength"
-msgid "Strength: High"
-msgstr "Strength: High"
+"Adding more letters, numbers and punctuation will make the password stronger."
 
 #: ../panels/user-accounts/run-passwd.c:422
 msgid "Authentication failed"
@@ -6463,51 +6707,58 @@ msgstr "Unknown error"
 msgid "Should match the web address of your login provider."
 msgstr "Should match the web address of your login provider."
 
-#: ../panels/user-accounts/um-account-dialog.c:228
+#: ../panels/user-accounts/um-account-dialog.c:229
 msgid "Failed to add account"
 msgstr "Failed to add account"
 
-#: ../panels/user-accounts/um-account-dialog.c:448
+#: ../panels/user-accounts/um-account-dialog.c:462
 msgid "Passwords do not match."
 msgstr "Passwords do not match."
 
-#: ../panels/user-accounts/um-account-dialog.c:702
-#: ../panels/user-accounts/um-account-dialog.c:748
-#: ../panels/user-accounts/um-account-dialog.c:769
+#: ../panels/user-accounts/um-account-dialog.c:717
+#: ../panels/user-accounts/um-account-dialog.c:763
+#: ../panels/user-accounts/um-account-dialog.c:784
 msgid "Failed to register account"
 msgstr "Failed to register account"
 
-#: ../panels/user-accounts/um-account-dialog.c:892
+#: ../panels/user-accounts/um-account-dialog.c:907
 msgid "No supported way to authenticate with this domain"
 msgstr "No supported way to authenticate with this domain"
 
-#: ../panels/user-accounts/um-account-dialog.c:965
+#: ../panels/user-accounts/um-account-dialog.c:980
 msgid "Failed to join domain"
 msgstr "Failed to join domain"
 
-#: ../panels/user-accounts/um-account-dialog.c:1026
+#: ../panels/user-accounts/um-account-dialog.c:1041
+#| msgid ""
+#| "That login name didn't work.\n"
+#| "Please try again."
 msgid ""
-"That login name didn't work.\n"
+"That login name didn’t work.\n"
 "Please try again."
 msgstr ""
 "That login name didn’t work.\n"
 "Please try again."
 
-#: ../panels/user-accounts/um-account-dialog.c:1033
+#: ../panels/user-accounts/um-account-dialog.c:1048
+#| msgid ""
+#| "That login password didn't work.\n"
+#| "Please try again."
 msgid ""
-"That login password didn't work.\n"
+"That login password didn’t work.\n"
 "Please try again."
 msgstr ""
 "That login password didn’t work.\n"
 "Please try again."
 
-#: ../panels/user-accounts/um-account-dialog.c:1041
+#: ../panels/user-accounts/um-account-dialog.c:1056
 msgid "Failed to log into domain"
 msgstr "Failed to log into domain"
 
-#: ../panels/user-accounts/um-account-dialog.c:1099
-msgid "Unable find the domain. Maybe you misspelled it?"
-msgstr "Unable find the domain. Maybe you misspelled it?"
+#: ../panels/user-accounts/um-account-dialog.c:1114
+#| msgid "Unable find the domain. Maybe you misspelled it?"
+msgid "Unable to find the domain. Maybe you misspelled it?"
+msgstr "Unable to find the domain. Maybe you misspelled it?"
 
 #: ../panels/user-accounts/um-account-type.c:34
 msgctxt "Account type"
@@ -6519,33 +6770,33 @@ msgctxt "Account type"
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:138
+#: ../panels/user-accounts/um-fingerprint-dialog.c:142
 msgid ""
 "You are not allowed to access the device. Contact your system administrator."
 msgstr ""
 "You are not allowed to access the device. Contact your system administrator."
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:140
+#: ../panels/user-accounts/um-fingerprint-dialog.c:144
 msgid "The device is already in use."
 msgstr "The device is already in use."
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:142
+#: ../panels/user-accounts/um-fingerprint-dialog.c:146
 msgid "An internal error occurred."
 msgstr "An internal error occurred."
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:216
+#: ../panels/user-accounts/um-fingerprint-dialog.c:217
 msgid "Enabled"
 msgstr "Enabled"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:264
+#: ../panels/user-accounts/um-fingerprint-dialog.c:263
 msgid "Delete registered fingerprints?"
 msgstr "Delete registered fingerprints?"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:268
+#: ../panels/user-accounts/um-fingerprint-dialog.c:267
 msgid "_Delete Fingerprints"
 msgstr "_Delete Fingerprints"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:274
+#: ../panels/user-accounts/um-fingerprint-dialog.c:273
 msgid ""
 "Do you want to delete your registered fingerprints so fingerprint login is "
 "disabled?"
@@ -6553,32 +6804,34 @@ msgstr ""
 "Do you want to delete your registered fingerprints so fingerprint login is "
 "disabled?"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:444
+#: ../panels/user-accounts/um-fingerprint-dialog.c:443
 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:505
-#: ../panels/user-accounts/um-fingerprint-dialog.c:547
+#: ../panels/user-accounts/um-fingerprint-dialog.c:504
+#: ../panels/user-accounts/um-fingerprint-dialog.c:546
 #, c-format
-msgid "Could not access '%s' device"
-msgstr "Could not access ‘%s’ device"
+#| msgid "Could not access '%s' device"
+msgid "Could not access “%s” device"
+msgstr "Could not access “%s” device"
 
 #. translators:
 #. * The variable is the name of the device, for example:
 #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: ../panels/user-accounts/um-fingerprint-dialog.c:588
+#: ../panels/user-accounts/um-fingerprint-dialog.c:587
 #, c-format
-msgid "Could not start finger capture on '%s' device"
-msgstr "Could not start finger capture on ‘%s’ device"
+#| msgid "Could not start finger capture on '%s' device"
+msgid "Could not start finger capture on “%s” device"
+msgstr "Could not start finger capture on “%s” device"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:638
+#: ../panels/user-accounts/um-fingerprint-dialog.c:631
 msgid "Could not access any fingerprint readers"
 msgstr "Could not access any fingerprint readers"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:639
+#: ../panels/user-accounts/um-fingerprint-dialog.c:632
 msgid "Please contact your system administrator for help."
 msgstr "Please contact your system administrator for help."
 
@@ -6587,20 +6840,23 @@ 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:721
+#: ../panels/user-accounts/um-fingerprint-dialog.c:714
 #, c-format
+#| msgid ""
+#| "To enable fingerprint login, you need to save one of your fingerprints, "
+#| "using the '%s' device."
 msgid ""
 "To enable fingerprint login, you need to save one of your fingerprints, "
-"using the '%s' device."
+"using the “%s” device."
 msgstr ""
 "To enable fingerprint login, you need to save one of your fingerprints, "
-"using the ‘%s’ device."
+"using the “%s” device."
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:728
+#: ../panels/user-accounts/um-fingerprint-dialog.c:721
 msgid "Selecting finger"
 msgstr "Selecting finger"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:729
+#: ../panels/user-accounts/um-fingerprint-dialog.c:722
 msgid "Enrolling fingerprints"
 msgstr "Enrolling fingerprints"
 
@@ -6634,13 +6890,13 @@ msgstr "%e %b, %Y"
 #: ../panels/user-accounts/um-history-dialog.c:93
 #, c-format
 msgctxt "login history week label"
-msgid "%s - %s"
-msgstr "%s–%s"
+msgid "%s — %s"
+msgstr "%s — %s"
 
 #. Translators: This is a time format string in the style of "22:58".
 #. It indicates a login time which follows a date.
 #: ../panels/user-accounts/um-history-dialog.c:177
-#: ../panels/user-accounts/um-user-panel.c:841
+#: ../panels/user-accounts/um-user-panel.c:776
 msgctxt "login date-time"
 msgid "%k:%M"
 msgstr "%k:%M"
@@ -6648,7 +6904,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/um-history-dialog.c:180
-#: ../panels/user-accounts/um-user-panel.c:845
+#: ../panels/user-accounts/um-user-panel.c:780
 #, c-format
 msgctxt "login date-time"
 msgid "%s, %s"
@@ -6666,42 +6922,43 @@ msgstr "Session Started"
 #. The %s is the user real name.
 #: ../panels/user-accounts/um-history-dialog.c:299
 #, c-format
-msgid "%s - Account Activity"
-msgstr "%s - Account Activity"
+#| msgid "%s - Account Activity"
+msgid "%s — Account Activity"
+msgstr "%s — Account Activity"
 
-#: ../panels/user-accounts/um-password-dialog.c:145
+#: ../panels/user-accounts/um-password-dialog.c:144
 msgid "Please choose another password."
 msgstr "Please choose another password."
 
-#: ../panels/user-accounts/um-password-dialog.c:154
+#: ../panels/user-accounts/um-password-dialog.c:153
 msgid "Please type your current password again."
 msgstr "Please type your current password again."
 
-#: ../panels/user-accounts/um-password-dialog.c:160
+#: ../panels/user-accounts/um-password-dialog.c:159
 msgid "Password could not be changed"
 msgstr "Password could not be changed"
 
-#: ../panels/user-accounts/um-password-dialog.c:286
+#: ../panels/user-accounts/um-password-dialog.c:285
 msgid "The passwords do not match."
 msgstr "The passwords do not match."
 
-#: ../panels/user-accounts/um-photo-dialog.c:214
+#: ../panels/user-accounts/um-photo-dialog.c:218
 msgid "Browse for more pictures"
 msgstr "Browse for more pictures"
 
-#: ../panels/user-accounts/um-photo-dialog.c:448
+#: ../panels/user-accounts/um-photo-dialog.c:452
 msgid "Disable image"
 msgstr "Disable image"
 
-#: ../panels/user-accounts/um-photo-dialog.c:466
+#: ../panels/user-accounts/um-photo-dialog.c:470
 msgid "Take a photo…"
 msgstr "Take a photo…"
 
-#: ../panels/user-accounts/um-photo-dialog.c:484
+#: ../panels/user-accounts/um-photo-dialog.c:488
 msgid "Browse for more pictures…"
 msgstr "Browse for more pictures…"
 
-#: ../panels/user-accounts/um-photo-dialog.c:708
+#: ../panels/user-accounts/um-photo-dialog.c:714
 #, c-format
 msgid "Used by %s"
 msgstr "Used by %s"
@@ -6727,33 +6984,35 @@ msgstr "Invalid password, please try again"
 
 #: ../panels/user-accounts/um-realm-manager.c:834
 #, c-format
-msgid "Couldn't connect to the %s domain: %s"
+#| msgid "Couldn't connect to the %s domain: %s"
+msgid "Couldn’t connect to the %s domain: %s"
 msgstr "Couldn’t connect to the %s domain: %s"
 
-#: ../panels/user-accounts/um-user-panel.c:239
-msgid "Other Accounts"
-msgstr "Other Accounts"
+#: ../panels/user-accounts/um-user-panel.c:195
+#| msgid "Add account"
+msgid "Your account"
+msgstr "Your account"
 
-#: ../panels/user-accounts/um-user-panel.c:447
+#: ../panels/user-accounts/um-user-panel.c:390
 msgid "Failed to delete user"
 msgstr "Failed to delete user"
 
+#: ../panels/user-accounts/um-user-panel.c:448
 #: ../panels/user-accounts/um-user-panel.c:507
-#: ../panels/user-accounts/um-user-panel.c:566
-#: ../panels/user-accounts/um-user-panel.c:618
+#: ../panels/user-accounts/um-user-panel.c:559
 msgid "Failed to revoke remotely managed user"
 msgstr "Failed to revoke remotely managed user"
 
-#: ../panels/user-accounts/um-user-panel.c:674
+#: ../panels/user-accounts/um-user-panel.c:613
 msgid "You cannot delete your own account."
 msgstr "You cannot delete your own account."
 
-#: ../panels/user-accounts/um-user-panel.c:683
+#: ../panels/user-accounts/um-user-panel.c:622
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s is still logged in"
 
-#: ../panels/user-accounts/um-user-panel.c:687
+#: ../panels/user-accounts/um-user-panel.c:626
 msgid ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
@@ -6761,12 +7020,13 @@ msgstr ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
 
-#: ../panels/user-accounts/um-user-panel.c:696
+#: ../panels/user-accounts/um-user-panel.c:635
 #, c-format
-msgid "Do you want to keep %s's files?"
+#| msgid "Do you want to keep %s's files?"
+msgid "Do you want to keep %s’s files?"
 msgstr "Do you want to keep %s’s files?"
 
-#: ../panels/user-accounts/um-user-panel.c:700
+#: ../panels/user-accounts/um-user-panel.c:639
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
@@ -6774,51 +7034,56 @@ msgstr ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
 
-#: ../panels/user-accounts/um-user-panel.c:703
+#: ../panels/user-accounts/um-user-panel.c:642
 msgid "_Delete Files"
 msgstr "_Delete Files"
 
-#: ../panels/user-accounts/um-user-panel.c:704
+#: ../panels/user-accounts/um-user-panel.c:643
 msgid "_Keep Files"
 msgstr "_Keep Files"
 
-#: ../panels/user-accounts/um-user-panel.c:718
+#: ../panels/user-accounts/um-user-panel.c:657
 #, 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?"
+#| msgid "Are you sure you want to revoke remotely managed %s's account?"
+msgid "Are you sure you want to revoke remotely managed %s’s account?"
+msgstr "Are you sure you want to revoke remotely managed %s’s account?"
 
-#: ../panels/user-accounts/um-user-panel.c:722
+#: ../panels/user-accounts/um-user-panel.c:661
 msgid "_Delete"
 msgstr "_Delete"
 
-#: ../panels/user-accounts/um-user-panel.c:774
+#: ../panels/user-accounts/um-user-panel.c:711
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "Account disabled"
 
-#: ../panels/user-accounts/um-user-panel.c:782
+#: ../panels/user-accounts/um-user-panel.c:719
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "To be set at next login"
 
-#: ../panels/user-accounts/um-user-panel.c:785
+#: ../panels/user-accounts/um-user-panel.c:722
 msgctxt "Password mode"
 msgid "None"
 msgstr "None"
 
-#: ../panels/user-accounts/um-user-panel.c:834
+#: ../panels/user-accounts/um-user-panel.c:769
 msgid "Logged in"
 msgstr "Logged in"
 
-#: ../panels/user-accounts/um-user-panel.c:1290
+#: ../panels/user-accounts/um-user-panel.c:1117
 msgid "Failed to contact the accounts service"
 msgstr "Failed to contact the accounts service"
 
-#: ../panels/user-accounts/um-user-panel.c:1292
+#: ../panels/user-accounts/um-user-panel.c:1119
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "Please make sure that the AccountService is installed and enabled."
 
-#: ../panels/user-accounts/um-user-panel.c:1334
+#. Translator comments:
+#. * We split the line in 2 here to "make it look good", as there's
+#. * no good way to do this in GTK+ for tooltips. See:
+#. * https://bugzilla.gnome.org/show_bug.cgi?id=657168
+#: ../panels/user-accounts/um-user-panel.c:1155
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -6826,12 +7091,12 @@ msgstr ""
 "To make changes,\n"
 "click the * icon first"
 
-#: ../panels/user-accounts/um-user-panel.c:1374
+#: ../panels/user-accounts/um-user-panel.c:1195
 msgid "Create a user account"
 msgstr "Create a user account"
 
+#: ../panels/user-accounts/um-user-panel.c:1206
 #: ../panels/user-accounts/um-user-panel.c:1385
-#: ../panels/user-accounts/um-user-panel.c:1677
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -6839,12 +7104,12 @@ msgstr ""
 "To create a user account,\n"
 "click the * icon first"
 
-#: ../panels/user-accounts/um-user-panel.c:1395
+#: ../panels/user-accounts/um-user-panel.c:1216
 msgid "Delete the selected user account"
 msgstr "Delete the selected user account"
 
-#: ../panels/user-accounts/um-user-panel.c:1407
-#: ../panels/user-accounts/um-user-panel.c:1682
+#: ../panels/user-accounts/um-user-panel.c:1228
+#: ../panels/user-accounts/um-user-panel.c:1390
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -6852,24 +7117,22 @@ msgstr ""
 "To delete the selected user account,\n"
 "click the * icon first"
 
-#: ../panels/user-accounts/um-user-panel.c:1591
-msgid "My Account"
-msgstr "My Account"
-
-#: ../panels/user-accounts/um-utils.c:563
-msgid "Sorry, that user name isn't available. Please try another."
-msgstr "Sorry, that user name isn't available. Please try another."
+#: ../panels/user-accounts/um-utils.c:507
+#| msgid "Sorry, that user name isn't available. Please try another."
+msgid "Sorry, that user name isn’t available. Please try another."
+msgstr "Sorry, that user name isn’t available. Please try another."
 
-#: ../panels/user-accounts/um-utils.c:566
+#: ../panels/user-accounts/um-utils.c:510
 #, c-format
 msgid "The username is too long."
 msgstr "The username is too long."
 
-#: ../panels/user-accounts/um-utils.c:569
-msgid "The username cannot start with a '-'."
-msgstr "The username cannot start with a '-'."
+#: ../panels/user-accounts/um-utils.c:513
+#| msgid "The username cannot start with a '-'."
+msgid "The username cannot start with a “-”."
+msgstr "The username cannot start with a “-”."
 
-#: ../panels/user-accounts/um-utils.c:572
+#: ../panels/user-accounts/um-utils.c:516
 msgid ""
 "The username should only consist of upper and lower case letters from a-z, "
 "digits and the following characters: . - _"
@@ -6877,24 +7140,34 @@ msgstr ""
 "The username should only consist of upper and lower case letters from a-z, "
 "digits and the following characters: . - _"
 
-#: ../panels/user-accounts/um-utils.c:576
-msgid "This will be used to name your home folder and can't be changed."
+#: ../panels/user-accounts/um-utils.c:520
+#| msgid "This will be used to name your home folder and can't be changed."
+msgid "This will be used to name your home folder and can’t be changed."
 msgstr "This will be used to name your home folder and can’t be changed."
 
 #: ../panels/wacom/button-mapping.ui.h:1
 msgid "Map Buttons"
 msgstr "Map Buttons"
 
+#: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:547
+#: ../panels/wacom/gnome-wacom-properties.ui.h:5
+msgid "_Close"
+msgstr "_Close"
+
 #: ../panels/wacom/button-mapping.ui.h:3
 msgid "Map buttons to functions"
 msgstr "Map buttons to functions"
 
 #: ../panels/wacom/button-mapping.ui.h:4
+#| msgid ""
+#| "To edit a shortcut, choose the \"Send Keystroke\" action, press the "
+#| "keyboard shortcut button and hold down the new keys or press Backspace to "
+#| "clear."
 msgid ""
-"To edit a shortcut, choose the \"Send Keystroke\" action, press the keyboard "
+"To edit a shortcut, choose the “Send Keystroke” action, press the keyboard "
 "shortcut button and hold down the new keys or press Backspace to clear."
 msgstr ""
-"To edit a shortcut, choose the ‘Send Keystroke’ action, press the keyboard "
+"To edit a shortcut, choose the “Send Keystroke” action, press the keyboard "
 "shortcut button and hold down the new keys or press Backspace to clear."
 
 #: ../panels/wacom/calibrator/calibrator-gui.c:83
@@ -6906,63 +7179,66 @@ msgstr ""
 "tablet."
 
 #: ../panels/wacom/calibrator/calibrator-gui.c:87
-msgid "Mis-click detected, restarting..."
+#| msgid "Mis-click detected, restarting..."
+msgid "Mis-click detected, restarting…"
 msgstr "Mis-click detected, restarting…"
 
-#: ../panels/wacom/cc-wacom-button-row.c:442
-msgctxt "Wacom tablet button"
-msgid "Up"
-msgstr "Up"
-
-#: ../panels/wacom/cc-wacom-button-row.c:443
-msgctxt "Wacom tablet button"
-msgid "Down"
-msgstr "Down"
+#: ../panels/wacom/cc-wacom-button-row.c:266
+#, c-format
+#| msgid "Button"
+msgid "Button %d"
+msgstr "Button %d"
 
-#: ../panels/wacom/cc-wacom-button-row.h:54
+#: ../panels/wacom/cc-wacom-button-row.h:53
+#| msgid "Applications"
 msgctxt "Wacom action-type"
-msgid "None"
-msgstr "None"
+msgid "Application defined"
+msgstr "Application defined"
 
-#: ../panels/wacom/cc-wacom-button-row.h:55
+#: ../panels/wacom/cc-wacom-button-row.h:54
 msgctxt "Wacom action-type"
 msgid "Send Keystroke"
 msgstr "Send Keystroke"
 
-#: ../panels/wacom/cc-wacom-button-row.h:56
+#: ../panels/wacom/cc-wacom-button-row.h:55
 msgctxt "Wacom action-type"
 msgid "Switch Monitor"
 msgstr "Switch Monitor"
 
-#: ../panels/wacom/cc-wacom-button-row.h:57
+#: ../panels/wacom/cc-wacom-button-row.h:56
 msgctxt "Wacom action-type"
 msgid "Show On-Screen Help"
 msgstr "Show On-Screen Help"
 
-#: ../panels/wacom/cc-wacom-mapping-panel.c:263
+#: ../panels/wacom/cc-wacom-mapping-panel.c:260
 msgid "Output:"
 msgstr "Output:"
 
 #. Keep ratio switch
-#: ../panels/wacom/cc-wacom-mapping-panel.c:275
+#: ../panels/wacom/cc-wacom-mapping-panel.c:272
 msgid "Keep aspect ratio (letterbox):"
 msgstr "Keep aspect ratio (letterbox):"
 
 #. Whole-desktop checkbox
-#: ../panels/wacom/cc-wacom-mapping-panel.c:286
+#: ../panels/wacom/cc-wacom-mapping-panel.c:283
 msgid "Map to single monitor"
 msgstr "Map to single monitor"
 
-#: ../panels/wacom/cc-wacom-nav-button.c:88
+#: ../panels/wacom/cc-wacom-nav-button.c:86
 #, c-format
 msgid "%d of %d"
 msgstr "%d of %d"
 
-#: ../panels/wacom/cc-wacom-page.c:522
+#: ../panels/wacom/cc-wacom-page.c:544
 msgid "Display Mapping"
 msgstr "Display Mapping"
 
-#: ../panels/wacom/cc-wacom-stylus-page.c:377
+#: ../panels/wacom/cc-wacom-panel.c:790
+#: ../panels/wacom/wacom-stylus-page.ui.h:9
+msgid "Stylus"
+msgstr "Stylus"
+
+#: ../panels/wacom/cc-wacom-stylus-page.c:347
 msgid "Button"
 msgstr "Button"
 
@@ -7040,168 +7316,84 @@ msgstr "Tracking Mode"
 msgid "Left-Handed Orientation"
 msgstr "Left-Handed Orientation"
 
-#. If no mode is available, we use "left-ring-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1028
-msgid "Left Ring"
-msgstr "Left Ring"
-
-#: ../panels/wacom/gsd-wacom-device.c:1039
-#, c-format
-msgid "Left Ring Mode #%d"
-msgstr "Left Ring Mode #%d"
-
-#. If no mode is available, we use "right-ring-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1059
-msgid "Right Ring"
-msgstr "Right Ring"
-
-#: ../panels/wacom/gsd-wacom-device.c:1070
-#, c-format
-msgid "Right Ring Mode #%d"
-msgstr "Right Ring Mode #%d"
-
-#. If no mode is available, we use "left-strip-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1112
-msgid "Left Touchstrip"
-msgstr "Left Touchstrip"
-
-#: ../panels/wacom/gsd-wacom-device.c:1123
-#, c-format
-msgid "Left Touchstrip Mode #%d"
-msgstr "Left Touchstrip Mode #%d"
-
-#. If no mode is available, we use "right-strip-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1143
-msgid "Right Touchstrip"
-msgstr "Right Touchstrip"
-
-#: ../panels/wacom/gsd-wacom-device.c:1154
-#, c-format
-msgid "Right Touchstrip Mode #%d"
-msgstr "Right Touchstrip Mode #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:1180
-#, c-format
-msgid "Left Touchring Mode Switch"
-msgstr "Left Touchring Mode Switch"
-
-#: ../panels/wacom/gsd-wacom-device.c:1182
-#, c-format
-msgid "Right Touchring Mode Switch"
-msgstr "Right Touchring Mode Switch"
-
-#: ../panels/wacom/gsd-wacom-device.c:1185
-#, c-format
-msgid "Left Touchstrip Mode Switch"
-msgstr "Left Touchstrip Mode Switch"
-
-#: ../panels/wacom/gsd-wacom-device.c:1187
-#, c-format
-msgid "Right Touchstrip Mode Switch"
-msgstr "Right Touchstrip Mode Switch"
-
-#: ../panels/wacom/gsd-wacom-device.c:1192
-#, c-format
-msgid "Mode Switch #%d"
-msgstr "Mode Switch #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:1238
-#, c-format
-msgid "Left Button #%d"
-msgstr "Left Button #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:1241
-#, c-format
-msgid "Right Button #%d"
-msgstr "Right Button #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:1244
-#, c-format
-msgid "Top Button #%d"
-msgstr "Top Button #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:1247
-#, c-format
-msgid "Bottom Button #%d"
-msgstr "Bottom Button #%d"
-
 #: ../panels/wacom/gsd-wacom-key-shortcut-button.c:263
 msgid "New shortcut…"
 msgstr "New shortcut…"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:1
-msgid "No Action"
-msgstr "No Action"
-
 #: ../panels/wacom/wacom-stylus-page.ui.h:2
-msgid "Left Mouse Button Click"
-msgstr "Left Mouse Button Click"
-
-#: ../panels/wacom/wacom-stylus-page.ui.h:3
 msgid "Middle Mouse Button Click"
 msgstr "Middle Mouse Button Click"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:4
+#: ../panels/wacom/wacom-stylus-page.ui.h:3
 msgid "Right Mouse Button Click"
 msgstr "Right Mouse Button Click"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:5
-msgid "Scroll Up"
-msgstr "Scroll Up"
-
-#: ../panels/wacom/wacom-stylus-page.ui.h:6
-msgid "Scroll Down"
-msgstr "Scroll Down"
-
-#: ../panels/wacom/wacom-stylus-page.ui.h:7
-msgid "Scroll Left"
-msgstr "Scroll Left"
-
-#: ../panels/wacom/wacom-stylus-page.ui.h:8
-msgid "Scroll Right"
-msgstr "Scroll Right"
-
-#: ../panels/wacom/wacom-stylus-page.ui.h:9
+#: ../panels/wacom/wacom-stylus-page.ui.h:4
 msgid "Back"
 msgstr "Back"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:10
+#: ../panels/wacom/wacom-stylus-page.ui.h:5
 msgid "Forward"
 msgstr "Forward"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:11
-msgid "Stylus"
-msgstr "Stylus"
+#: ../panels/wacom/wacom-stylus-page.ui.h:6
+#| msgid "No languages found"
+msgid "No stylus found"
+msgstr "No stylus found"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:12
+#: ../panels/wacom/wacom-stylus-page.ui.h:7
+msgid "Please move your stylus to the proximity of the tablet to configure it"
+msgstr "Please move your stylus to the proximity of the tablet to configure it"
+
+#: ../panels/wacom/wacom-stylus-page.ui.h:10
 msgid "Eraser Pressure Feel"
 msgstr "Eraser Pressure Feel"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:13
+#: ../panels/wacom/wacom-stylus-page.ui.h:11
 msgid "Soft"
 msgstr "Soft"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:14
+#: ../panels/wacom/wacom-stylus-page.ui.h:12
 msgid "Firm"
 msgstr "Firm"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:15
+#: ../panels/wacom/wacom-stylus-page.ui.h:13
 msgid "Top Button"
 msgstr "Top Button"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:16
+#: ../panels/wacom/wacom-stylus-page.ui.h:14
 msgid "Lower Button"
 msgstr "Lower Button"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:17
+#: ../panels/wacom/wacom-stylus-page.ui.h:15
 msgid "Tip Pressure Feel"
 msgstr "Tip Pressure Feel"
 
-#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53
-#: ../shell/cc-window.c:1478
+#: ../panels/wacom/wacom-stylus-page.ui.h:17
+msgid "page 3"
+msgstr "page 3"
+
+#: ../shell/alt/cc-window.c:53 ../shell/alt/cc-window.c:1484
+#: ../shell/cc-window.c:730
 msgid "All Settings"
 msgstr "All Settings"
 
+#. Add categories
+#: ../shell/alt/cc-window.c:875
+msgctxt "category"
+msgid "Personal"
+msgstr "Personal"
+
+#: ../shell/alt/cc-window.c:876
+msgctxt "category"
+msgid "Hardware"
+msgstr "Hardware"
+
+#: ../shell/alt/cc-window.c:877
+msgctxt "category"
+msgid "System"
+msgstr "System"
+
 #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1
 msgid "GNOME Control Center"
 msgstr "GNOME Control Center"
@@ -7211,11 +7403,14 @@ msgid "Utilities to configure the GNOME desktop"
 msgstr "Utilities to configure the GNOME desktop"
 
 #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:3
+#| msgid ""
+#| "The control center is GNOME's main interface for configuration of various "
+#| "aspects of your desktop."
 msgid ""
-"The control center is GNOME's main interface for configuration of various "
+"The control center is GNOME’s main interface for configuration of various "
 "aspects of your desktop."
 msgstr ""
-"The control centre is GNOME's main interface for configuration of various "
+"The control centre is GNOME’s main interface for configuration of various "
 "aspects of your desktop."
 
 #: ../shell/cc-application.c:45
@@ -7258,22 +7453,6 @@ msgstr "Help"
 msgid "Quit"
 msgstr "Quit"
 
-#. Add categories
-#: ../shell/cc-window.c:871
-msgctxt "category"
-msgid "Personal"
-msgstr "Personal"
-
-#: ../shell/cc-window.c:872
-msgctxt "category"
-msgid "Hardware"
-msgstr "Hardware"
-
-#: ../shell/cc-window.c:873
-msgctxt "category"
-msgid "System"
-msgstr "System"
-
 #: ../shell/gnome-control-center.desktop.in.in.h:2
 msgid "Preferences;Settings;"
 msgstr "Preferences;Settings;"
@@ -7314,6 +7493,397 @@ msgctxt "hotspot"
 msgid "Hotspot"
 msgstr "Hotspot"
 
+#: ../shell/panel-list.ui.h:3
+#| msgid "No regions found"
+msgid "No results found"
+msgstr "No results found"
+
+#~ msgid "Lid Closed"
+#~ msgstr "Lid Closed"
+
+#~ msgid "Mirrored"
+#~ msgstr "Mirrored"
+
+#~ msgid "Primary"
+#~ msgstr "Primary"
+
+#~ msgid "Secondary"
+#~ msgstr "Secondary"
+
+#~ msgid "Arrange Combined Displays"
+#~ msgstr "Arrange Combined Displays"
+
+#~ msgid "Drag displays to rearrange them"
+#~ msgstr "Drag displays to rearrange them"
+
+#~ msgid "%d Hz (NTSC)"
+#~ msgstr "%d Hz (NTSC)"
+
+#~ msgid "%d Hz"
+#~ msgstr "%d Hz"
+
+#~ msgid "Rotate counterclockwise by 90°"
+#~ msgstr "Rotate anticlockwise by 90°"
+
+#~ msgid "Rotate by 180°"
+#~ msgstr "Rotate by 180°"
+
+#~ msgid "Rotate clockwise by 90°"
+#~ msgstr "Rotate clockwise by 90°"
+
+#~ msgid "Size"
+#~ msgstr "Size"
+
+#~ msgid "Aspect Ratio"
+#~ msgstr "Aspect Ratio"
+
+#~ msgid "Show the top bar and Activities Overview on this display"
+#~ msgstr "Show the top bar and Activities Overview on this display"
+
+#~ msgid "Join this display with another to create an extra workspace"
+#~ msgstr "Join this display with another to create an extra workspace"
+
+#~ msgid "Presentation"
+#~ msgstr "Presentation"
+
+#~ msgid "Show slideshows and media only"
+#~ msgstr "Show slideshows and media only"
+
+#~ msgid "Show your existing view on both displays"
+#~ msgstr "Show your existing view on both displays"
+
+#~ msgid "Turn Off"
+#~ msgstr "Turn Off"
+
+#~ msgid "Don't use this display"
+#~ msgstr "Don't use this display"
+
+#~ 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)"
+
+#~ msgid "%s %d-bit"
+#~ msgstr "%s %d-bit"
+
+#~ msgid "Base system"
+#~ msgstr "Base system"
+
+#~ msgid "Shortcut;Repeat;Blink;"
+#~ msgstr "Shortcut;Repeat;Blink;"
+
+#~ msgid "Press Esc to cancel."
+#~ msgstr "Press Esc to cancel."
+
+#~ msgid "Edit"
+#~ msgstr "Edit"
+
+#~ msgid "Server"
+#~ msgstr "Server"
+
+#~ msgid "Delete DNS Server"
+#~ msgstr "Delete DNS Server"
+
+#~ msgid "Make available to other _users"
+#~ msgstr "Make available to other _users"
+
+#~ msgid "Firewall _Zone"
+#~ msgstr "Firewall _Zone"
+
+#~ msgctxt "Firewall zone"
+#~ msgid "Default"
+#~ msgstr "Default"
+
+#~ msgid "The zone defines the trust level of the connection"
+#~ msgstr "The zone defines the trust level of the connection"
+
+#~ msgid ""
+#~ "Reset the settings for this network, including passwords, but remember it "
+#~ "as a preferred network"
+#~ msgstr ""
+#~ "Reset the settings for this network, including passwords, but remember it "
+#~ "as a preferred network"
+
+#~ msgid ""
+#~ "Remove all details relating to this network and do not try to "
+#~ "automatically connect"
+#~ msgstr ""
+#~ "Remove all details relating to this network and do not try to "
+#~ "automatically connect"
+
+#~ msgid ""
+#~ "If you have a connection to the Internet other than wireless, you can set "
+#~ "up a wireless hotspot to share the connection with others."
+#~ msgstr ""
+#~ "If you have a connection to the Internet other than wireless, you can set "
+#~ "up a wireless hotspot to share the connection with others."
+
+#~ msgid "History"
+#~ msgstr "History"
+
+#~ msgid "Proxy"
+#~ msgstr "Proxy"
+
+#~ msgid "_Add Profile…"
+#~ msgstr "_Add Profile…"
+
+#~ msgctxt "proxy method"
+#~ msgid "None"
+#~ msgstr "None"
+
+#~ msgctxt "proxy method"
+#~ msgid "Manual"
+#~ msgstr "Manual"
+
+#~ msgctxt "proxy method"
+#~ msgid "Automatic"
+#~ msgstr "Automatic"
+
+#~ msgid "Add Device"
+#~ msgstr "Add Device"
+
+#~ msgid "Remove Device"
+#~ msgstr "Remove Device"
+
+#~ msgid "VPN Type"
+#~ msgstr "VPN Type"
+
+#~ msgid "Group Name"
+#~ msgstr "Group Name"
+
+#~ msgid "Group Password"
+#~ msgstr "Group Password"
+
+#~ msgid "_Use as Hotspot…"
+#~ msgstr "_Use as Hotspot…"
+
+#~ msgid "_History"
+#~ msgstr "_History"
+
+#~ msgid "2"
+#~ msgstr "2"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgctxt "notifications"
+#~ msgid "Notification _Banners"
+#~ msgstr "Notification _Banners"
+
+#~ msgid "Notification _Banners"
+#~ msgstr "Notification _Banners"
+
+#~ msgid "Add Account"
+#~ msgstr "Add Account"
+
+#~ msgid "Mail"
+#~ msgstr "Mail"
+
+#~ msgid "Calendar"
+#~ msgstr "Calendar"
+
+#~ msgid "Contacts"
+#~ msgstr "Contacts"
+
+#~ msgid "Chat"
+#~ msgstr "Chat"
+
+#~ msgid "Resources"
+#~ msgstr "Resources"
+
+#~ msgid "Error creating account"
+#~ msgstr "Error creating account"
+
+#~ msgid "Are you sure you want to remove the account?"
+#~ msgstr "Are you sure you want to remove the account?"
+
+#~ msgid "This will not remove the account on the server."
+#~ msgstr "This will not remove the account on the server."
+
+#~ msgid "_Remove"
+#~ msgstr "_Remove"
+
+#~ msgid "No online accounts configured"
+#~ msgstr "No online accounts configured"
+
+#~ msgid "Add an online account"
+#~ msgstr "Add an online account"
+
+#~ msgid ""
+#~ "Adding an account allows your applications to access it for documents, "
+#~ "mail, contacts, calendar, chat and more."
+#~ msgstr ""
+#~ "Adding an account allows your applications to access it for documents, "
+#~ "mail, contacts, calendar, chat and more."
+
+#~ msgctxt "printer state"
+#~ msgid "Configuring"
+#~ msgstr "Configuring"
+
+#~ msgid "Toner Level"
+#~ msgstr "Toner Level"
+
+#~ msgid "Supply Level"
+#~ msgstr "Supply Level"
+
+#~ msgctxt "printer state"
+#~ msgid "Installing"
+#~ msgstr "Installing"
+
+#~ msgid "%u active"
+#~ msgid_plural "%u active"
+#~ msgstr[0] "%u active"
+#~ msgstr[1] "%u active"
+
+#~ msgid "Add a New Printer"
+#~ msgstr "Add a New Printer"
+
+#~ msgid "A_uthenticate"
+#~ msgstr "A_uthenticate"
+
+#~ msgid "No printers detected."
+#~ msgstr "No printers detected."
+
+#~ msgid "Loading options…"
+#~ msgstr "Loading options…"
+
+#~ msgid "Supply"
+#~ msgstr "Supply"
+
+#~ msgid "_Default printer"
+#~ msgstr "_Default printer"
+
+#~ msgid "Jobs"
+#~ msgstr "Jobs"
+
+#~ msgid "Show _Jobs"
+#~ msgstr "Show _Jobs"
+
+#~ msgid "label"
+#~ msgstr "label"
+
+#~ msgid "Setting new driver…"
+#~ msgstr "Setting new driver…"
+
+#~ msgid "Print _Test Page"
+#~ msgstr "Print _Test Page"
+
+#~ msgctxt "Password hint"
+#~ msgid "Try to add more letters, numbers and symbols."
+#~ msgstr "Try to add more letters, numbers and symbols."
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Weak"
+#~ msgstr "Strength: Weak"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Low"
+#~ msgstr "Strength: Low"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Medium"
+#~ msgstr "Strength: Medium"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Good"
+#~ msgstr "Strength: Good"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: High"
+#~ msgstr "Strength: High"
+
+#~ msgctxt "login history week label"
+#~ msgid "%s - %s"
+#~ msgstr "%s–%s"
+
+#~ msgid "Other Accounts"
+#~ msgstr "Other Accounts"
+
+#~ msgctxt "Wacom tablet button"
+#~ msgid "Up"
+#~ msgstr "Up"
+
+#~ msgctxt "Wacom tablet button"
+#~ msgid "Down"
+#~ msgstr "Down"
+
+#~ msgctxt "Wacom action-type"
+#~ msgid "None"
+#~ msgstr "None"
+
+#~ msgid "Left Ring"
+#~ msgstr "Left Ring"
+
+#~ msgid "Left Ring Mode #%d"
+#~ msgstr "Left Ring Mode #%d"
+
+#~ msgid "Right Ring Mode #%d"
+#~ msgstr "Right Ring Mode #%d"
+
+#~ msgid "Left Touchstrip"
+#~ msgstr "Left Touchstrip"
+
+#~ msgid "Left Touchstrip Mode #%d"
+#~ msgstr "Left Touchstrip Mode #%d"
+
+#~ msgid "Right Touchstrip"
+#~ msgstr "Right Touchstrip"
+
+#~ msgid "Right Touchstrip Mode #%d"
+#~ msgstr "Right Touchstrip Mode #%d"
+
+#~ msgid "Left Touchring Mode Switch"
+#~ msgstr "Left Touchring Mode Switch"
+
+#~ msgid "Right Touchring Mode Switch"
+#~ msgstr "Right Touchring Mode Switch"
+
+#~ msgid "Left Touchstrip Mode Switch"
+#~ msgstr "Left Touchstrip Mode Switch"
+
+#~ msgid "Right Touchstrip Mode Switch"
+#~ msgstr "Right Touchstrip Mode Switch"
+
+#~ msgid "Mode Switch #%d"
+#~ msgstr "Mode Switch #%d"
+
+#~ msgid "Left Button #%d"
+#~ msgstr "Left Button #%d"
+
+#~ msgid "Right Button #%d"
+#~ msgstr "Right Button #%d"
+
+#~ msgid "Top Button #%d"
+#~ msgstr "Top Button #%d"
+
+#~ msgid "Bottom Button #%d"
+#~ msgstr "Bottom Button #%d"
+
+#~ msgid "No Action"
+#~ msgstr "No Action"
+
+#~ msgid "Left Mouse Button Click"
+#~ msgstr "Left Mouse Button Click"
+
+#~ msgid "Scroll Up"
+#~ msgstr "Scroll Up"
+
+#~ msgid "Scroll Down"
+#~ msgstr "Scroll Down"
+
+#~ msgid "Scroll Left"
+#~ msgstr "Scroll Left"
+
+#~ msgid "Scroll Right"
+#~ msgstr "Scroll Right"
+
 #~ msgid "Keyboard shortcut for <b>%s</b>. Enter new shortcut to change."
 #~ msgstr "Keyboard shortcut for <b>%s</b>. Enter new shortcut to change."
 
@@ -7330,9 +7900,6 @@ msgstr "Hotspot"
 #~ msgid "Set Up New Device"
 #~ msgstr "Set Up New Device"
 
-#~ msgid "Connection"
-#~ msgstr "Connection"
-
 #~ msgid "Paired"
 #~ msgstr "Paired"
 
@@ -7645,9 +8212,6 @@ msgstr "Hotspot"
 #~ msgid "When battery power is _critical"
 #~ msgstr "When battery power is _critical"
 
-#~ msgid "Power Off"
-#~ msgstr "Power Off"
-
 #~ msgid "Power"
 #~ msgstr "Power"
 
@@ -7657,9 +8221,6 @@ msgstr "Hotspot"
 #~ msgid "No printers available"
 #~ msgstr "No printers available"
 
-#~ msgid "Active Jobs"
-#~ msgstr "Active Jobs"
-
 #~ msgid "Close"
 #~ msgstr "Close"
 
@@ -7796,12 +8357,6 @@ msgstr "Hotspot"
 #~ msgid "Add User Account"
 #~ msgstr "Add User Account"
 
-#~ msgid "Remove User Account"
-#~ msgstr "Remove User Account"
-
-#~ msgid "Login Options"
-#~ msgstr "Login Options"
-
 #~ msgid "A user with the username '%s' already exists"
 #~ msgstr "A user with the username ‘%s’ already exists"
 
@@ -7887,9 +8442,6 @@ msgstr "Hotspot"
 #~ msgid "_Network Time"
 #~ msgstr "_Network Time"
 
-#~ msgid ":"
-#~ msgstr ":"
-
 #~ msgid "Set the time one hour ahead."
 #~ msgstr "Set the time one hour ahead."
 
@@ -8065,10 +8617,6 @@ msgstr "Hotspot"
 #~ msgid "150%"
 #~ msgstr "150%"
 
-#~ msgctxt "universal access, text size"
-#~ msgid "Larger"
-#~ msgstr "Larger"
-
 #~ msgid "Beep on Caps and Num Lock"
 #~ msgstr "Beep on Caps and Num Lock"
 
@@ -8134,9 +8682,6 @@ msgstr "Hotspot"
 #~ msgid "Large"
 #~ msgstr "Large"
 
-#~ msgid "Add account"
-#~ msgstr "Add account"
-
 #~ msgid "_Local Account"
 #~ msgstr "_Local Account"
 
@@ -8233,9 +8778,6 @@ msgstr "Hotspot"
 #~ msgid "Change the background"
 #~ msgstr "Change the background"
 
-#~ msgid "Configure Bluetooth settings"
-#~ msgstr "Configure Bluetooth settings"
-
 #~ msgid "Browse Files..."
 #~ msgstr "Browse Files…"
 
@@ -8375,9 +8917,6 @@ msgstr "Hotspot"
 #~ msgid "System Information"
 #~ msgstr "System Information"
 
-#~ msgid "OS type"
-#~ msgstr "OS type"
-
 #~ msgid "_Other Media..."
 #~ msgstr "_Other Media…"
 
@@ -8566,9 +9105,6 @@ msgstr "Hotspot"
 #~ msgid "Shortcut Settings"
 #~ msgstr "Shortcut Settings"
 
-#~ msgid "Display language:"
-#~ msgstr "Display language:"
-
 #~ msgid "Input source:"
 #~ msgstr "Input source:"
 
@@ -8914,10 +9450,6 @@ msgstr "Hotspot"
 #~ msgstr "Decrease size:"
 
 #~ msgctxt "universal access, seeing"
-#~ msgid "Display"
-#~ msgstr "Display"
-
-#~ msgctxt "universal access, seeing"
 #~ msgid "Zoom"
 #~ msgstr "Zoom"
 
@@ -8996,9 +9528,6 @@ msgstr "Hotspot"
 #~ msgid "cd;dvd;usb;audio;video;disc;"
 #~ msgstr "cd;dvd;usb;audio;video;disc;"
 
-#~ msgid "Unlock"
-#~ msgstr "Unlock"
-
 #~ msgid "Battery discharging"
 #~ msgstr "Battery discharging"
 
@@ -9254,12 +9783,6 @@ msgstr "Hotspot"
 #~ msgid "2010"
 #~ msgstr "2010"
 
-#~ msgid "AM"
-#~ msgstr "AM"
-
-#~ msgid "Clean print heads"
-#~ msgstr "Clean print heads"
-
 #~ msgid "An error has occured during a maintenance command."
 #~ msgstr "An error has occurred during a maintenance command."
 
@@ -10578,11 +11101,6 @@ msgstr "Hotspot"
 #~ msgid "Image"
 #~ msgstr "Image"
 
-#~ msgid "pixel"
-#~ msgid_plural "pixels"
-#~ msgstr[0] "pixel"
-#~ msgstr[1] "pixels"
-
 #~ msgid ""
 #~ "<b>%s</b>\n"
 #~ "%s, %s\n"
@@ -12308,14 +12826,6 @@ msgstr "Hotspot"
 #~ msgid "Old pa_ssword:"
 #~ msgstr "_Password:"
 
-#, fuzzy
-#~ msgid "From:"
-#~ msgstr "From: %s"
-
-#, fuzzy
-#~ msgid "To:"
-#~ msgstr "To: %s"
-
 #~ msgid "Epiphany"
 #~ msgstr "Epiphany"
 


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