[gnome-control-center] Updated British English translation

[Bruce Cowan <bcowan src gnome org>]

commit 72bf4895558173dcfbdeead2175fd619fc2264e8
Author: Bruce Cowan <bruce bcowan me uk>
Date:   Tue Sep 4 12:09:17 2012 +0100

    Updated British English translation

 po/en_GB.po | 3710 ++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 2288 insertions(+), 1422 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 89aa869..6972bb4 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-07 15:52+0000\n"
-"PO-Revision-Date: 2012-03-07 15:59+0100\n"
+"POT-Creation-Date: 2012-09-04 12:03+0100\n"
+"PO-Revision-Date: 2012-09-04 12:09+0100\n"
 "Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
 "Language-Team: British English <en li org>\n"
 "Language: en_GB\n"
@@ -20,66 +20,68 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
-#: ../panels/background/background.ui.h:1
-msgid "Add wallpaper"
-msgstr "Add wallpaper"
-
-#: ../panels/background/background.ui.h:2
-msgid "Remove wallpaper"
-msgstr "Remove wallpaper"
-
 #. This refers to a slideshow background
-#: ../panels/background/background.ui.h:4
+#: ../panels/background/background.ui.h:2
 msgid "Changes throughout the day"
 msgstr "Changes throughout the day"
 
-#: ../panels/background/background.ui.h:5
-msgid "Primary Color"
-msgstr "Primary Colour"
-
-#: ../panels/background/background.ui.h:6
-msgid "Swap colors"
-msgstr "Swap colours"
-
-#: ../panels/background/background.ui.h:7
-msgid "Secondary color"
-msgstr "Secondary colour"
-
-#: ../panels/background/background.ui.h:8
+#: ../panels/background/background.ui.h:3
+msgctxt "background, style"
 msgid "Tile"
 msgstr "Tile"
 
-#: ../panels/background/background.ui.h:9
+#: ../panels/background/background.ui.h:4
+msgctxt "background, style"
 msgid "Zoom"
 msgstr "Zoom"
 
-#: ../panels/background/background.ui.h:10
+#: ../panels/background/background.ui.h:5
+msgctxt "background, style"
 msgid "Center"
 msgstr "Centre"
 
-#: ../panels/background/background.ui.h:11
+#: ../panels/background/background.ui.h:6
+msgctxt "background, style"
 msgid "Scale"
 msgstr "Scale"
 
-#: ../panels/background/background.ui.h:12
+#: ../panels/background/background.ui.h:7
+msgctxt "background, style"
 msgid "Fill"
 msgstr "Fill"
 
-#: ../panels/background/background.ui.h:13
+#: ../panels/background/background.ui.h:8
+msgctxt "background, style"
 msgid "Span"
 msgstr "Span"
 
-#: ../panels/background/bg-colors-source.c:46
-msgid "Horizontal Gradient"
-msgstr "Horizontal Gradient"
+#. translators: This is the title of the wallpaper chooser dialog.
+#: ../panels/background/cc-background-chooser-dialog.c:199
+msgid "Select Background"
+msgstr "Select Background"
+
+#: ../panels/background/cc-background-chooser-dialog.c:218
+msgid "Wallpapers"
+msgstr "Wallpapers"
+
+#: ../panels/background/cc-background-chooser-dialog.c:227
+msgid "Pictures"
+msgstr "Pictures"
+
+#: ../panels/background/cc-background-chooser-dialog.c:235
+msgid "Colors"
+msgstr "Colours"
 
-#: ../panels/background/bg-colors-source.c:47
-msgid "Vertical Gradient"
-msgstr "Vertical Gradient"
+#: ../panels/background/cc-background-chooser-dialog.c:244
+msgid "Flickr"
+msgstr "Flickr"
 
-#: ../panels/background/bg-colors-source.c:48
-msgid "Solid Color"
-msgstr "Solid Colour"
+#: ../panels/background/cc-background-chooser-dialog.c:280
+#: ../panels/printers/ppd-selection-dialog.ui.h:3
+#: ../panels/user-accounts/data/photo-dialog.ui.h:9
+#: ../panels/user-accounts/um-photo-dialog.c:98
+msgid "Select"
+msgstr "Select"
 
 #: ../panels/background/cc-background-item.c:148
 msgid "multiple sizes"
@@ -96,32 +98,10 @@ msgstr "%d à %d"
 msgid "No Desktop Background"
 msgstr "No Desktop Background"
 
-#: ../panels/background/cc-background-panel.c:1001
-#: ../panels/user-accounts/data/photo-dialog.ui.h:4
-#: ../panels/user-accounts/um-photo-dialog.c:218
-msgid "Browse for more pictures"
-msgstr "Browse for more pictures"
-
-#: ../panels/background/cc-background-panel.c:1093
+#: ../panels/background/cc-background-panel.c:387
 msgid "Current background"
 msgstr "Current background"
 
-#: ../panels/background/cc-background-panel.c:1203
-msgid "Wallpapers"
-msgstr "Wallpapers"
-
-#: ../panels/background/cc-background-panel.c:1210
-msgid "Pictures Folder"
-msgstr "Pictures Folder"
-
-#: ../panels/background/cc-background-panel.c:1217
-msgid "Colors & Gradients"
-msgstr "Colours & Gradients"
-
-#: ../panels/background/cc-background-panel.c:1225
-msgid "Flickr"
-msgstr "Flickr"
-
 #: ../panels/background/gnome-background-panel.desktop.in.in.h:1
 msgid "Background"
 msgstr "Background"
@@ -137,7 +117,7 @@ msgstr "Wallpaper;Screen;Desktop;"
 
 #. TRANSLATORS: device type
 #: ../panels/bluetooth/bluetooth-properties.desktop.in.in.h:1
-#: ../panels/network/panel-common.c:99
+#: ../panels/network/panel-common.c:102
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -161,7 +141,7 @@ msgstr "Connection"
 msgid "Paired"
 msgstr "Paired"
 
-#: ../panels/bluetooth/bluetooth.ui.h:5
+#: ../panels/bluetooth/bluetooth.ui.h:5 ../panels/wacom/cc-wacom-page.c:756
 msgid "Type"
 msgstr "Type"
 
@@ -173,11 +153,11 @@ msgstr "Address"
 msgid "Mouse and Touchpad Settings"
 msgstr "Mouse and Touchpad Settings"
 
-#: ../panels/bluetooth/bluetooth.ui.h:8 ../panels/universal-access/uap.ui.h:43
+#: ../panels/bluetooth/bluetooth.ui.h:8 ../panels/universal-access/uap.ui.h:38
 msgid "Sound Settings"
 msgstr "Sound Settings"
 
-#: ../panels/bluetooth/bluetooth.ui.h:9 ../panels/universal-access/uap.ui.h:74
+#: ../panels/bluetooth/bluetooth.ui.h:9
 msgid "Keyboard Settings"
 msgstr "Keyboard Settings"
 
@@ -195,41 +175,41 @@ msgctxt "Power"
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:281
+#: ../panels/bluetooth/cc-bluetooth-panel.c:285
 msgid "Yes"
 msgstr "Yes"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:281
+#: ../panels/bluetooth/cc-bluetooth-panel.c:285
 msgid "No"
 msgstr "No"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:393
+#: ../panels/bluetooth/cc-bluetooth-panel.c:397
 msgid "Bluetooth is disabled"
 msgstr "Bluetooth is disabled"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:398
+#: ../panels/bluetooth/cc-bluetooth-panel.c:402
 msgid "Bluetooth is disabled by hardware switch"
 msgstr "Bluetooth is disabled by hardware switch"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:402
+#: ../panels/bluetooth/cc-bluetooth-panel.c:406
 msgid "No Bluetooth adapters found"
 msgstr "No Bluetooth adapters found"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:535
+#: ../panels/bluetooth/cc-bluetooth-panel.c:539
 msgid "Visibility"
 msgstr "Visibility"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:539
+#: ../panels/bluetooth/cc-bluetooth-panel.c:543
 #, c-format
 msgid "Visibility of â%sâ"
 msgstr "Visibility of â%sâ"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:583
+#: ../panels/bluetooth/cc-bluetooth-panel.c:587
 #, c-format
 msgid "Remove '%s' from the list of devices?"
 msgstr "Remove '%s' from the list of devices?"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:585
+#: ../panels/bluetooth/cc-bluetooth-panel.c:589
 msgid ""
 "If you remove the device, you will have to set it up again before next use."
 msgstr ""
@@ -288,55 +268,55 @@ msgid "All files"
 msgstr "All files"
 
 #. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#: ../panels/color/cc-color-panel.c:504
+#: ../panels/color/cc-color-panel.c:522
 msgid "Available Profiles for Displays"
 msgstr "Available Profiles for Displays"
 
 #. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#: ../panels/color/cc-color-panel.c:508
+#: ../panels/color/cc-color-panel.c:526
 msgid "Available Profiles for Scanners"
 msgstr "Available Profiles for Scanners"
 
 #. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#: ../panels/color/cc-color-panel.c:512
+#: ../panels/color/cc-color-panel.c:530
 msgid "Available Profiles for Printers"
 msgstr "Available Profiles for Printers"
 
 #. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#: ../panels/color/cc-color-panel.c:516
+#: ../panels/color/cc-color-panel.c:534
 msgid "Available Profiles for Cameras"
 msgstr "Available Profiles for Cameras"
 
 #. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#: ../panels/color/cc-color-panel.c:520
+#: ../panels/color/cc-color-panel.c:538
 msgid "Available Profiles for Webcams"
 msgstr "Available Profiles for Webcams"
 
 #. TRANSLATORS: this is the dialog title in the 'Add profile' UI
 #. * where the device type is not recognised
 #. Profiles that can be added to the device
-#: ../panels/color/cc-color-panel.c:525 ../panels/color/color.ui.h:2
+#: ../panels/color/cc-color-panel.c:543 ../panels/color/color.ui.h:2
 msgid "Available Profiles"
 msgstr "Available Profiles"
 
 #. TRANSLATORS: column for device list
-#: ../panels/color/cc-color-panel.c:806
-#: ../panels/sound/gvc-mixer-dialog.c:1516
+#: ../panels/color/cc-color-panel.c:824
+#: ../panels/sound/gvc-mixer-dialog.c:1525
 msgid "Device"
 msgstr "Device"
 
 #. TRANSLATORS: column for device list
-#: ../panels/color/cc-color-panel.c:841
+#: ../panels/color/cc-color-panel.c:859
 msgid "Calibration"
 msgstr "Calibration"
 
 #. TRANSLATORS: this is when the button is sensitive
-#: ../panels/color/cc-color-panel.c:873
+#: ../panels/color/cc-color-panel.c:891
 msgid "Create a color profile for the selected device"
 msgstr "Create a colour profile for the selected device"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:887 ../panels/color/cc-color-panel.c:911
+#: ../panels/color/cc-color-panel.c:905 ../panels/color/cc-color-panel.c:929
 msgid ""
 "The measuring instrument is not detected. Please check it is turned on and "
 "correctly connected."
@@ -345,40 +325,40 @@ msgstr ""
 "correctly connected."
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:920
+#: ../panels/color/cc-color-panel.c:938
 msgid "The measuring instrument does not support printer profiling."
 msgstr "The measuring instrument does not support printer profiling."
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:931
+#: ../panels/color/cc-color-panel.c:949
 msgid "The device type is not currently supported."
 msgstr "The device type is not currently supported."
 
 #. TRANSLATORS: this is when an auto-added profile cannot be removed
-#: ../panels/color/cc-color-panel.c:1004
+#: ../panels/color/cc-color-panel.c:1022
 msgid "Cannot remove automatically added profile"
 msgstr "Cannot remove automatically added profile"
 
 #. TRANSLATORS: this is when there is no profile for the device
-#: ../panels/color/cc-color-panel.c:1339
+#: ../panels/color/cc-color-panel.c:1359
 msgid "No profile"
 msgstr "No profile"
 
-#: ../panels/color/cc-color-panel.c:1370
+#: ../panels/color/cc-color-panel.c:1390
 #, c-format
 msgid "%i year"
 msgid_plural "%i years"
 msgstr[0] "%i year"
 msgstr[1] "%i years"
 
-#: ../panels/color/cc-color-panel.c:1381
+#: ../panels/color/cc-color-panel.c:1401
 #, c-format
 msgid "%i month"
 msgid_plural "%i months"
 msgstr[0] "%i month"
 msgstr[1] "%i months"
 
-#: ../panels/color/cc-color-panel.c:1392
+#: ../panels/color/cc-color-panel.c:1412
 #, c-format
 msgid "%i week"
 msgid_plural "%i weeks"
@@ -386,40 +366,40 @@ msgstr[0] "%i week"
 msgstr[1] "%i weeks"
 
 #. fallback
-#: ../panels/color/cc-color-panel.c:1399
+#: ../panels/color/cc-color-panel.c:1419
 #, c-format
 msgid "Less than 1 week"
 msgstr "Less than 1 week"
 
-#: ../panels/color/cc-color-panel.c:1461
+#: ../panels/color/cc-color-panel.c:1481
 msgctxt "Colorspace fallback"
 msgid "Default RGB"
 msgstr "Default RGB"
 
-#: ../panels/color/cc-color-panel.c:1466
+#: ../panels/color/cc-color-panel.c:1486
 msgctxt "Colorspace fallback"
 msgid "Default CMYK"
 msgstr "Default CMYK"
 
-#: ../panels/color/cc-color-panel.c:1471
+#: ../panels/color/cc-color-panel.c:1491
 msgctxt "Colorspace fallback"
 msgid "Default Gray"
 msgstr "Default Grey"
 
-#: ../panels/color/cc-color-panel.c:1589 ../panels/color/cc-color-panel.c:1630
-#: ../panels/color/cc-color-panel.c:1641 ../panels/color/cc-color-panel.c:1652
+#: ../panels/color/cc-color-panel.c:1609 ../panels/color/cc-color-panel.c:1650
+#: ../panels/color/cc-color-panel.c:1661 ../panels/color/cc-color-panel.c:1672
 msgid "Uncalibrated"
 msgstr "Uncalibrated"
 
-#: ../panels/color/cc-color-panel.c:1592
+#: ../panels/color/cc-color-panel.c:1612
 msgid "This device is not color managed."
 msgstr "This device is not colour managed."
 
-#: ../panels/color/cc-color-panel.c:1633
+#: ../panels/color/cc-color-panel.c:1653
 msgid "This device is using manufacturing calibrated data."
 msgstr "This device is using manufacturing calibrated data."
 
-#: ../panels/color/cc-color-panel.c:1644
+#: ../panels/color/cc-color-panel.c:1664
 msgid ""
 "This device does not have a profile suitable for whole-screen color "
 "correction."
@@ -427,42 +407,42 @@ msgstr ""
 "This device does not have a profile suitable for whole-screen colour "
 "correction."
 
-#: ../panels/color/cc-color-panel.c:1677
+#: ../panels/color/cc-color-panel.c:1697
 msgid "This device has an old profile that may no longer be accurate."
 msgstr "This device has an old profile that may no longer be accurate."
 
 #. TRANSLATORS: this is when the calibration profile age is not
 #. * specified as it has been autogenerated from the hardware
-#: ../panels/color/cc-color-panel.c:1705
+#: ../panels/color/cc-color-panel.c:1725
 msgid "Not specified"
 msgstr "Not specified"
 
 #. add the 'No devices detected' entry
-#: ../panels/color/cc-color-panel.c:1889
+#: ../panels/color/cc-color-panel.c:1910
 msgid "No devices supporting color management detected"
 msgstr "No devices supporting colour management detected"
 
-#: ../panels/color/cc-color-panel.c:2118
+#: ../panels/color/cc-color-panel.c:2139
 msgctxt "Device kind"
 msgid "Display"
 msgstr "Display"
 
-#: ../panels/color/cc-color-panel.c:2120
+#: ../panels/color/cc-color-panel.c:2141
 msgctxt "Device kind"
 msgid "Scanner"
 msgstr "Scanner"
 
-#: ../panels/color/cc-color-panel.c:2122
+#: ../panels/color/cc-color-panel.c:2143
 msgctxt "Device kind"
 msgid "Printer"
 msgstr "Printer"
 
-#: ../panels/color/cc-color-panel.c:2124
+#: ../panels/color/cc-color-panel.c:2145
 msgctxt "Device kind"
 msgid "Camera"
 msgstr "Camera"
 
-#: ../panels/color/cc-color-panel.c:2126
+#: ../panels/color/cc-color-panel.c:2147
 msgctxt "Device kind"
 msgid "Webcam"
 msgstr "Webcam"
@@ -501,8 +481,8 @@ msgid "Remove a device"
 msgstr "Remove a device"
 
 #: ../panels/color/color.ui.h:12
-msgid "Set this device for all users on this computer"
-msgstr "Set this device for all users on this computer"
+msgid "Set this profile for all users on this computer"
+msgstr "Set this profile for all users on this computer"
 
 #: ../panels/color/color.ui.h:13
 msgid "Add profile"
@@ -552,56 +532,64 @@ msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
 msgstr "Colour;ICC;Profile;Calibrate;Printer;Display;"
 
 #. Add some common languages first
-#: ../panels/common/cc-common-language.c:513
+#: ../panels/common/cc-common-language.c:523
 msgid "English"
 msgstr "English"
 
-#: ../panels/common/cc-common-language.c:515
+#: ../panels/common/cc-common-language.c:525
 msgid "British English"
 msgstr "British English"
 
-#: ../panels/common/cc-common-language.c:517
+#: ../panels/common/cc-common-language.c:528
 msgid "German"
 msgstr "German"
 
-#: ../panels/common/cc-common-language.c:519
+#: ../panels/common/cc-common-language.c:531
 msgid "French"
 msgstr "French"
 
-#: ../panels/common/cc-common-language.c:521
+#: ../panels/common/cc-common-language.c:534
 msgid "Spanish"
 msgstr "Spanish"
 
-#: ../panels/common/cc-common-language.c:523
+#: ../panels/common/cc-common-language.c:536
 msgid "Chinese (simplified)"
 msgstr "Chinese (simplified)"
 
+#: ../panels/common/cc-common-language.c:539
+msgid "Russian"
+msgstr "Russian"
+
+#: ../panels/common/cc-common-language.c:542
+msgid "Arabic"
+msgstr "Arabic"
+
 #. Add some common regions
-#: ../panels/common/cc-common-language.c:552
+#: ../panels/common/cc-common-language.c:571
 msgid "United States"
 msgstr "United States"
 
-#: ../panels/common/cc-common-language.c:553
+#: ../panels/common/cc-common-language.c:572
 msgid "Germany"
 msgstr "Germany"
 
-#: ../panels/common/cc-common-language.c:554
+#: ../panels/common/cc-common-language.c:573
 msgid "France"
 msgstr "France"
 
-#: ../panels/common/cc-common-language.c:555
+#: ../panels/common/cc-common-language.c:574
 msgid "Spain"
 msgstr "Spain"
 
-#: ../panels/common/cc-common-language.c:556
+#: ../panels/common/cc-common-language.c:575
 msgid "China"
 msgstr "China"
 
-#: ../panels/common/cc-language-chooser.c:119
+#: ../panels/common/cc-language-chooser.c:122
 msgid "Other..."
 msgstr "Otherâ"
 
-#: ../panels/common/cc-language-chooser.c:290
+#: ../panels/common/cc-language-chooser.c:296
 msgid "Select a region"
 msgstr "Select a region"
 
@@ -615,7 +603,7 @@ msgstr "Select a language"
 
 #: ../panels/common/language-chooser.ui.h:2
 #: ../panels/printers/new-printer-dialog.ui.h:4
-#: ../panels/user-accounts/um-user-panel.c:446
+#: ../panels/user-accounts/um-user-panel.c:462
 msgid "_Cancel"
 msgstr "_Cancel"
 
@@ -729,8 +717,8 @@ msgid "December"
 msgstr "December"
 
 #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1
-msgid "Date and Time"
-msgstr "Date and Time"
+msgid "Date & Time"
+msgstr "Date & Time"
 
 #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
 msgid "Date and Time preferences panel"
@@ -749,55 +737,56 @@ 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:475
+#: ../panels/display/cc-display-panel.c:481
 msgctxt "display panel, rotation"
 msgid "Normal"
 msgstr "Normal"
 
-#: ../panels/display/cc-display-panel.c:476
+#: ../panels/display/cc-display-panel.c:482
 msgctxt "display panel, rotation"
 msgid "Counterclockwise"
 msgstr "Anticlockwise"
 
-#: ../panels/display/cc-display-panel.c:477
+#: ../panels/display/cc-display-panel.c:483
 msgctxt "display panel, rotation"
 msgid "Clockwise"
 msgstr "Clockwise"
 
-#: ../panels/display/cc-display-panel.c:478
+#: ../panels/display/cc-display-panel.c:484
 msgctxt "display panel, rotation"
 msgid "180 Degrees"
 msgstr "180 Degrees"
 
+#. Keep this string in sync with gnome-desktop/libgnome-desktop/gnome-rr-labeler.c
 #. Translators:  this is the feature where what you see on your laptop's
-#. * screen is the same as your external monitor.  Here, "Mirror" is being
-#. * used as an adjective, not as a verb.  For example, the Spanish
-#. * translation could be "Pantallas en Espejo", *not* "Espejar Pantallas".
+#. * screen is the same as your external projector.  Here, "Mirrored" is being
+#. * used as an adjective.  For example, the Spanish translation could be
+#. * "Pantallas en Espejo".
 #.
-#: ../panels/display/cc-display-panel.c:615
-msgid "Mirror Displays"
-msgstr "Mirror Displays"
+#: ../panels/display/cc-display-panel.c:623
+msgid "Mirrored Displays"
+msgstr "Mirrored Displays"
 
-#: ../panels/display/cc-display-panel.c:639
+#: ../panels/display/cc-display-panel.c:647
 #: ../panels/display/display-capplet.ui.h:1
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../panels/display/cc-display-panel.c:745
+#: ../panels/display/cc-display-panel.c:748
 #, c-format
 msgid "%d x %d (%s)"
 msgstr "%d x %d (%s)"
 
-#: ../panels/display/cc-display-panel.c:747
+#: ../panels/display/cc-display-panel.c:750
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../panels/display/cc-display-panel.c:1654
+#: ../panels/display/cc-display-panel.c:1659
 msgid "Drag to change primary display."
 msgstr "Drag to change primary display."
 
-#: ../panels/display/cc-display-panel.c:1712
+#: ../panels/display/cc-display-panel.c:1717
 msgid ""
 "Select a monitor to change its properties; drag it to rearrange its "
 "placement."
@@ -805,29 +794,29 @@ msgstr ""
 "Select a monitor to change its properties; drag it to rearrange its "
 "placement."
 
-#: ../panels/display/cc-display-panel.c:2100
+#: ../panels/display/cc-display-panel.c:2105
 msgid "%a %R"
 msgstr "%a %R"
 
-#: ../panels/display/cc-display-panel.c:2102
+#: ../panels/display/cc-display-panel.c:2107
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: ../panels/display/cc-display-panel.c:2264
-#: ../panels/display/cc-display-panel.c:2316
+#: ../panels/display/cc-display-panel.c:2269
+#: ../panels/display/cc-display-panel.c:2321
 #, c-format
 msgid "Failed to apply configuration: %s"
 msgstr "Failed to apply configuration: %s"
 
-#: ../panels/display/cc-display-panel.c:2344
+#: ../panels/display/cc-display-panel.c:2349
 msgid "Could not save the monitor configuration"
 msgstr "Could not save the monitor configuration"
 
-#: ../panels/display/cc-display-panel.c:2404
+#: ../panels/display/cc-display-panel.c:2409
 msgid "Could not detect displays"
 msgstr "Could not detect displays"
 
-#: ../panels/display/cc-display-panel.c:2598
+#: ../panels/display/cc-display-panel.c:2603
 msgid "Could not get screen information"
 msgstr "Could not get screen information"
 
@@ -866,34 +855,34 @@ msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
 msgstr "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
 
 #. Translators: VESA is an techncial acronym, don't translate it.
-#: ../panels/info/cc-info-panel.c:401
+#: ../panels/info/cc-info-panel.c:413
 #, c-format
 msgid "VESA: %s"
 msgstr "VESA: %s"
 
 #. TRANSLATORS: device type
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:425 ../panels/network/panel-common.c:79
-#: ../panels/network/panel-common.c:158
+#: ../panels/info/cc-info-panel.c:437 ../panels/network/panel-common.c:82
+#: ../panels/network/panel-common.c:162
 msgid "Unknown"
 msgstr "Unknown"
 
 #. translators: This is the type of architecture, for example:
 #. * "64-bit" or "32-bit"
-#: ../panels/info/cc-info-panel.c:586
+#: ../panels/info/cc-info-panel.c:593
 #, c-format
 msgid "%d-bit"
 msgstr "%d-bit"
 
-#: ../panels/info/cc-info-panel.c:743
+#: ../panels/info/cc-info-panel.c:752
 msgid "Unknown model"
 msgstr "Unknown model"
 
-#: ../panels/info/cc-info-panel.c:826
+#: ../panels/info/cc-info-panel.c:835
 msgid "The next login will attempt to use the standard experience."
 msgstr "The next login will attempt to use the standard experience."
 
-#: ../panels/info/cc-info-panel.c:828
+#: ../panels/info/cc-info-panel.c:837
 msgid ""
 "The next login will use the fallback mode intended for unsupported graphics "
 "hardware."
@@ -903,47 +892,51 @@ msgstr ""
 
 #. translators: The hardware is not able to run GNOME 3's
 #. * shell, so we use the GNOME "Fallback" session
-#: ../panels/info/cc-info-panel.c:870
+#: ../panels/info/cc-info-panel.c:879
 msgctxt "Experience"
 msgid "Fallback"
 msgstr "Fallback"
 
 #. translators: The hardware is able to run GNOME 3's
 #. * shell, also called "Standard" experience
-#: ../panels/info/cc-info-panel.c:876
+#: ../panels/info/cc-info-panel.c:885
 msgctxt "Experience"
 msgid "Standard"
 msgstr "Standard"
 
-#: ../panels/info/cc-info-panel.c:1199
+#: ../panels/info/cc-info-panel.c:1227
 msgid "Ask what to do"
 msgstr "Ask what to do"
 
-#: ../panels/info/cc-info-panel.c:1203
+#: ../panels/info/cc-info-panel.c:1231
 msgid "Do nothing"
 msgstr "Do nothing"
 
-#: ../panels/info/cc-info-panel.c:1207
+#: ../panels/info/cc-info-panel.c:1235
 msgid "Open folder"
 msgstr "Open folder"
 
-#: ../panels/info/cc-info-panel.c:1322
+#: ../panels/info/cc-info-panel.c:1326
+msgid "Other Media"
+msgstr "Other Media"
+
+#: ../panels/info/cc-info-panel.c:1357
 msgid "Select an application for audio CDs"
 msgstr "Select an application for audio CDs"
 
-#: ../panels/info/cc-info-panel.c:1323
+#: ../panels/info/cc-info-panel.c:1358
 msgid "Select an application for video DVDs"
 msgstr "Select an application for video DVDs"
 
-#: ../panels/info/cc-info-panel.c:1324
+#: ../panels/info/cc-info-panel.c:1359
 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:1325
+#: ../panels/info/cc-info-panel.c:1360
 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:1326
+#: ../panels/info/cc-info-panel.c:1361
 msgid "Select an application for software CDs"
 msgstr "Select an application for software CDs"
 
@@ -952,85 +945,93 @@ 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:1338
+#: ../panels/info/cc-info-panel.c:1373
 msgid "audio DVD"
 msgstr "audio DVD"
 
-#: ../panels/info/cc-info-panel.c:1339
+#: ../panels/info/cc-info-panel.c:1374
 msgid "blank Blu-ray disc"
 msgstr "blank Blu-ray disc"
 
-#: ../panels/info/cc-info-panel.c:1340
+#: ../panels/info/cc-info-panel.c:1375
 msgid "blank CD disc"
 msgstr "blank CD disc"
 
-#: ../panels/info/cc-info-panel.c:1341
+#: ../panels/info/cc-info-panel.c:1376
 msgid "blank DVD disc"
 msgstr "blank DVD disc"
 
-#: ../panels/info/cc-info-panel.c:1342
+#: ../panels/info/cc-info-panel.c:1377
 msgid "blank HD DVD disc"
 msgstr "blank HD DVD disc"
 
-#: ../panels/info/cc-info-panel.c:1343
+#: ../panels/info/cc-info-panel.c:1378
 msgid "Blu-ray video disc"
 msgstr "Blu-ray video disc"
 
-#: ../panels/info/cc-info-panel.c:1344
+#: ../panels/info/cc-info-panel.c:1379
 msgid "e-book reader"
 msgstr "e-book reader"
 
-#: ../panels/info/cc-info-panel.c:1345
+#: ../panels/info/cc-info-panel.c:1380
 msgid "HD DVD video disc"
 msgstr "HD DVD video disc"
 
-#: ../panels/info/cc-info-panel.c:1346
+#: ../panels/info/cc-info-panel.c:1381
 msgid "Picture CD"
 msgstr "Picture CD"
 
-#: ../panels/info/cc-info-panel.c:1347
+#: ../panels/info/cc-info-panel.c:1382
 msgid "Super Video CD"
 msgstr "Super Video CD"
 
-#: ../panels/info/cc-info-panel.c:1348
+#: ../panels/info/cc-info-panel.c:1383
 msgid "Video CD"
 msgstr "Video CD"
 
-#: ../panels/info/cc-info-panel.c:1471
-#: ../panels/keyboard/keyboard-shortcuts.c:1569
+#: ../panels/info/cc-info-panel.c:1384
+msgid "Windows software"
+msgstr "Windows software"
+
+#: ../panels/info/cc-info-panel.c:1385
+msgid "Software"
+msgstr "Software"
+
+#: ../panels/info/cc-info-panel.c:1508
+#: ../panels/keyboard/keyboard-shortcuts.c:1647
 msgid "Section"
 msgstr "Section"
 
-#: ../panels/info/cc-info-panel.c:1480 ../panels/info/info.ui.h:11
+#: ../panels/info/cc-info-panel.c:1517 ../panels/info/info.ui.h:11
 msgid "Overview"
 msgstr "Overview"
 
-#: ../panels/info/cc-info-panel.c:1486 ../panels/info/info.ui.h:18
+#: ../panels/info/cc-info-panel.c:1523 ../panels/info/info.ui.h:18
 msgid "Default Applications"
 msgstr "Default Applications"
 
-#: ../panels/info/cc-info-panel.c:1491 ../panels/info/info.ui.h:26
+#: ../panels/info/cc-info-panel.c:1528 ../panels/info/info.ui.h:26
 msgid "Removable Media"
 msgstr "Removable Media"
 
-#: ../panels/info/cc-info-panel.c:1496 ../panels/info/info.ui.h:10
+#: ../panels/info/cc-info-panel.c:1533 ../panels/info/info.ui.h:10
 msgid "Graphics"
 msgstr "Graphics"
 
-#: ../panels/info/cc-info-panel.c:1698
+#: ../panels/info/cc-info-panel.c:1735
 #, c-format
 msgid "Version %s"
 msgstr "Version %s"
 
-#: ../panels/info/cc-info-panel.c:1748
+#: ../panels/info/cc-info-panel.c:1785
 msgid "Install Updates"
 msgstr "Install Updates"
 
-#: ../panels/info/cc-info-panel.c:1752
+#: ../panels/info/cc-info-panel.c:1789
 msgid "System Up-To-Date"
 msgstr "System Up-To-Date"
 
-#: ../panels/info/cc-info-panel.c:1756
+#: ../panels/info/cc-info-panel.c:1793
 msgid "Checking for Updates"
 msgstr "Checking for Updates"
 
@@ -1048,16 +1049,16 @@ msgid ""
 "device;system;information;memory;processor;version;default;application;"
 "fallback;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
 msgstr ""
-"device;system;information;memory;processor;version;default;application;fallb"
-"ack;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
+"device;system;information;memory;processor;version;default;application;"
+"fallback;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"
 
 #: ../panels/info/info.ui.h:2
-msgid "Acti_on:"
-msgstr "Acti_on:"
+msgid "_Action:"
+msgstr "_Action:"
 
 #: ../panels/info/info.ui.h:3
 msgid "_Type:"
@@ -1196,6 +1197,23 @@ msgstr "Next track"
 msgid "Eject"
 msgstr "Eject"
 
+#: ../panels/keyboard/01-input-sources.xml.in.h:1
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
+#: ../panels/keyboard/keyboard-shortcuts.c:858
+#: ../panels/universal-access/uap.ui.h:68
+msgid "Typing"
+msgstr "Typing"
+
+#: ../panels/keyboard/01-input-sources.xml.in.h:2
+#: ../panels/region/gnome-region-panel.ui.h:26
+msgid "Switch to next source"
+msgstr "Switch to next source"
+
+#: ../panels/keyboard/01-input-sources.xml.in.h:3
+#: ../panels/region/gnome-region-panel.ui.h:24
+msgid "Switch to previous source"
+msgstr "Switch to previous source"
+
 #: ../panels/keyboard/01-launchers.xml.in.h:1
 msgid "Launchers"
 msgstr "Launchers"
@@ -1228,32 +1246,35 @@ msgstr "Search"
 msgid "Screenshots"
 msgstr "Screenshots"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:2
-msgid "Take a screenshot"
-msgstr "Take a screenshot"
-
+#. translators: Pictures is the name of the XDG Pictures directory
 #: ../panels/keyboard/01-screenshot.xml.in.h:3
-msgid "Take a screenshot of a window"
-msgstr "Take a screenshot of a window"
-
-#: ../panels/keyboard/01-screenshot.xml.in.h:4
-msgid "Take a screenshot of an area"
-msgstr "Take a screenshot of an area"
+msgid "Save a screenshot to Pictures"
+msgstr "Save a screenshot to Pictures"
 
+#. translators: Pictures is the name of the XDG Pictures directory
 #: ../panels/keyboard/01-screenshot.xml.in.h:5
+msgid "Save a screenshot of a window to Pictures"
+msgstr "Save a screenshot of a window to Pictures"
+
+#. translators: Pictures is the name of the XDG Pictures directory
+#: ../panels/keyboard/01-screenshot.xml.in.h:7
+msgid "Save a screenshot of an area to Pictures"
+msgstr "Save a screenshot of an area to Pictures"
+
+#: ../panels/keyboard/01-screenshot.xml.in.h:8
 msgid "Copy a screenshot to clipboard"
 msgstr "Copy a screenshot to clipboard"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:6
+#: ../panels/keyboard/01-screenshot.xml.in.h:9
 msgid "Copy a screenshot of a window to clipboard"
 msgstr "Copy a screenshot of a window to clipboard"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:7
+#: ../panels/keyboard/01-screenshot.xml.in.h:10
 msgid "Copy a screenshot of an area to clipboard"
 msgstr "Copy a screenshot of an area to clipboard"
 
 #: ../panels/keyboard/01-system.xml.in.h:1
-#: ../panels/region/gnome-region-panel.ui.h:40
+#: ../panels/region/gnome-region-panel.ui.h:39
 msgid "System"
 msgstr "System"
 
@@ -1302,6 +1323,25 @@ msgstr "Decrease text size"
 msgid "High contrast on or off"
 msgstr "High contrast on or off"
 
+#. translators:
+#. * The device has been disabled
+#: ../panels/keyboard/cc-keyboard-option.c:241
+#: ../panels/keyboard/cc-keyboard-option.c:347
+#: ../panels/keyboard/keyboard-shortcuts.c:1112
+#: ../panels/sound/gvc-mixer-control.c:1834
+#: ../panels/user-accounts/um-fingerprint-dialog.c:215
+#: ../panels/user-accounts/um-fingerprint-dialog.c:216
+msgid "Disabled"
+msgstr "Disabled"
+
+#: ../panels/keyboard/cc-keyboard-option.c:315
+msgid "Alternative Characters Key"
+msgstr "Alternative Characters Key"
+
+#: ../panels/keyboard/cc-keyboard-option.c:320
+msgid "Compose Key"
+msgstr "Compose Key"
+
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
 msgid "Keyboard"
@@ -1346,15 +1386,13 @@ msgstr "_Speed:"
 
 #. short delay
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
-#: ../panels/mouse/gnome-mouse-properties.ui.h:26
-#: ../panels/universal-access/uap.ui.h:55
-#: ../panels/universal-access/zoom-options.c:333
+#: ../panels/universal-access/uap.ui.h:49
 msgid "Short"
 msgstr "Short"
 
 #. slow acceleration
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
-#: ../panels/mouse/gnome-mouse-properties.ui.h:10
+#: ../panels/mouse/gnome-mouse-properties.ui.h:4
 msgid "Slow"
 msgstr "Slow"
 
@@ -1364,15 +1402,13 @@ msgstr "Repeat keys speed"
 
 #. long delay
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
-#: ../panels/mouse/gnome-mouse-properties.ui.h:28
-#: ../panels/universal-access/uap.ui.h:58
-#: ../panels/universal-access/zoom-options.c:337
+#: ../panels/universal-access/uap.ui.h:52
 msgid "Long"
 msgstr "Long"
 
 #. fast acceleration
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
-#: ../panels/mouse/gnome-mouse-properties.ui.h:12
+#: ../panels/mouse/gnome-mouse-properties.ui.h:7
 msgid "Fast"
 msgstr "Fast"
 
@@ -1396,11 +1432,6 @@ msgstr "Cursor blink speed"
 msgid "Layout Settings"
 msgstr "Layout Settings"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
-#: ../panels/universal-access/uap.ui.h:75
-msgid "Typing"
-msgstr "Typing"
-
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
 msgid "Add Shortcut"
 msgstr "Add Shortcut"
@@ -1419,31 +1450,23 @@ msgstr ""
 "Backspace to clear."
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:23
+#: ../panels/region/gnome-region-panel.ui.h:29
 msgid "Shortcuts"
 msgstr "Shortcuts"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:553
-#: ../panels/keyboard/keyboard-shortcuts.c:561
-#: ../panels/keyboard/keyboard-shortcuts.c:873
-#: ../panels/keyboard/keyboard-shortcuts.c:1325
-#: ../panels/keyboard/keyboard-shortcuts.c:1329
+#: ../panels/keyboard/keyboard-shortcuts.c:552
+#: ../panels/keyboard/keyboard-shortcuts.c:560
+#: ../panels/keyboard/keyboard-shortcuts.c:942
+#: ../panels/keyboard/keyboard-shortcuts.c:1414
+#: ../panels/keyboard/keyboard-shortcuts.c:1418
 msgid "Custom Shortcuts"
 msgstr "Custom Shortcuts"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:721
+#: ../panels/keyboard/keyboard-shortcuts.c:756
 msgid "<Unknown Action>"
 msgstr "<Unknown Action>"
 
-#. translators:
-#. * The device has been disabled
-#: ../panels/keyboard/keyboard-shortcuts.c:1025
-#: ../panels/sound/gvc-mixer-control.c:1087
-#: ../panels/user-accounts/um-fingerprint-dialog.c:215
-#: ../panels/user-accounts/um-fingerprint-dialog.c:216
-msgid "Disabled"
-msgstr "Disabled"
-
-#: ../panels/keyboard/keyboard-shortcuts.c:1164
+#: ../panels/keyboard/keyboard-shortcuts.c:1253
 #, c-format
 msgid ""
 "The shortcut \"%s\" cannot be used because it will become impossible to type "
@@ -1454,7 +1477,7 @@ msgstr ""
 "using this key.\n"
 "Please try with a key such as Control, Alt or Shift at the same time."
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1196
+#: ../panels/keyboard/keyboard-shortcuts.c:1285
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for\n"
@@ -1463,29 +1486,24 @@ msgstr ""
 "The shortcut \"%s\" is already used for\n"
 "\"%s\""
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1201
+#: ../panels/keyboard/keyboard-shortcuts.c:1290
 #, c-format
 msgid ""
 "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
 msgstr ""
 "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1207
+#: ../panels/keyboard/keyboard-shortcuts.c:1296
 msgid "_Reassign"
 msgstr "_Reassign"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1618
-#: ../panels/wacom/cc-wacom-page.c:582
-msgid "Action"
-msgstr "Action"
-
-#: ../panels/keyboard/keyboard-shortcuts.c:1640
-msgid "Shortcut"
-msgstr "Shortcut"
+#: ../panels/mouse/cc-mouse-panel.c:152
+msgid "_Test Your Settings"
+msgstr "_Test Your Settings"
 
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1
-msgid "Mouse and Touchpad"
-msgstr "Mouse and Touchpad"
+msgid "Mouse & Touchpad"
+msgstr "Mouse & Touchpad"
 
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2
 msgid "Set your mouse and touchpad preferences"
@@ -1504,215 +1522,190 @@ msgstr "Mouse Preferences"
 msgid "General"
 msgstr "General"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:3
-msgid "_Right-handed"
-msgstr "_Right-handed"
+#: ../panels/mouse/gnome-mouse-properties.ui.h:5
+msgid "Double-click timeout"
+msgstr "Double-click timeout"
+
+#: ../panels/mouse/gnome-mouse-properties.ui.h:8
+msgid "_Double-click"
+msgstr "_Double-click"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:4
-msgid "_Left-handed"
-msgstr "_Left-handed"
+#: ../panels/mouse/gnome-mouse-properties.ui.h:9
+msgid "Primary _button"
+msgstr "Primary _button"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:5
-msgid "Sh_ow position of pointer when the Control key is pressed"
-msgstr "Sh_ow position of pointer when the Control key is pressed"
+#: ../panels/mouse/gnome-mouse-properties.ui.h:10
+msgid "_Left"
+msgstr "_Left"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:6
-msgid "Pointer Speed"
-msgstr "Pointer Speed"
+#: ../panels/mouse/gnome-mouse-properties.ui.h:11
+msgid "_Right"
+msgstr "_Right"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:7
-msgid "A_cceleration:"
-msgstr "A_cceleration:"
+#: ../panels/mouse/gnome-mouse-properties.ui.h:12
+msgid "Mouse"
+msgstr "Mouse"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:8
-msgid "_Sensitivity:"
-msgstr "_Sensitivity:"
+#: ../panels/mouse/gnome-mouse-properties.ui.h:13
+msgid "_Pointer speed"
+msgstr "_Pointer speed"
 
-#. low sensitivity
-#. TRANSLATORS: secondary battery
 #: ../panels/mouse/gnome-mouse-properties.ui.h:14
-#: ../panels/power/cc-power-panel.c:570
-msgid "Low"
-msgstr "Low"
+msgid "Touchpad"
+msgstr "Touchpad"
+
+#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+msgid "Disable while _typing"
+msgstr "Disable while _typing"
 
-#. high sensitivity
 #: ../panels/mouse/gnome-mouse-properties.ui.h:16
-msgid "High"
-msgstr "High"
+msgid "Tap to _click"
+msgstr "Tap to _click"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:17
-msgid "Drag and Drop"
-msgstr "Drag and Drop"
+msgid "Two _finger scroll"
+msgstr "Two _finger scroll"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:18
-msgid "Thr_eshold:"
-msgstr "Thr_eshold:"
-
-#. small threshold
-#: ../panels/mouse/gnome-mouse-properties.ui.h:20
-#: ../panels/universal-access/uap.ui.h:87
-msgid "Small"
-msgstr "Small"
+msgid "C_ontent sticks to fingers"
+msgstr "C_ontent sticks to fingers"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:21
-msgid "Drag Threshold"
-msgstr "Drag Threshold"
-
-#. large threshold
-#: ../panels/mouse/gnome-mouse-properties.ui.h:23
-#: ../panels/universal-access/uap.ui.h:89
-msgid "Large"
-msgstr "Large"
+#: ../panels/mouse/gnome-mouse-test.c:117
+#: ../panels/mouse/gnome-mouse-test.ui.h:1
+msgid "Try clicking, double clicking, scrolling"
+msgstr "Try clicking, double clicking, scrolling"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:24
-msgid "Double-Click Timeout"
-msgstr "Double-Click Timeout"
+#: ../panels/mouse/gnome-mouse-test.c:124
+msgid "Double click, primary button"
+msgstr "Double click, primary button"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:25
-msgid "_Timeout:"
-msgstr "_Timeout:"
+#: ../panels/mouse/gnome-mouse-test.c:124
+msgid "Single click, primary button"
+msgstr "Single click, primary button"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:27
-msgid "Double-click timeout"
-msgstr "Double-click timeout"
+#: ../panels/mouse/gnome-mouse-test.c:127
+msgid "Double click, middle button"
+msgstr "Double click, middle button"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:29
-msgid "To test your settings, try to double-click on the face."
-msgstr "To test your settings, try to double-click on the face."
+#: ../panels/mouse/gnome-mouse-test.c:127
+msgid "Single click, middle button"
+msgstr "Single click, middle button"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:30
-msgid "Mouse"
-msgstr "Mouse"
+#: ../panels/mouse/gnome-mouse-test.c:130
+msgid "Double click, secondary button"
+msgstr "Double click, secondary button"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:31
-msgid "Disable _touchpad while typing"
-msgstr "Disable _touchpad while typing"
+#: ../panels/mouse/gnome-mouse-test.c:130
+msgid "Single click, secondary button"
+msgstr "Single click, secondary button"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:32
-msgid "Enable _mouse clicks with touchpad"
-msgstr "Enable _mouse clicks with touchpad"
+#: ../panels/network/cc-network-panel.c:615
+msgid "Network proxy"
+msgstr "Network proxy"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:33
-msgid "Scrolling"
-msgstr "Scrolling"
+#: ../panels/network/cc-network-panel.c:799 ../panels/network/net-vpn.c:278
+#, c-format
+msgid "%s VPN"
+msgstr "%s VPN"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:34
-msgid "_Disabled"
-msgstr "_Disabled"
+#. TRANSLATORS: the user is running a NM that is not API compatible
+#: ../panels/network/cc-network-panel.c:866
+msgid "The system network services are not compatible with this version."
+msgstr "The system network services are not compatible with this version."
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:35
-msgid "_Edge scrolling"
-msgstr "_Edge scrolling"
+#. TRANSLATORS: this is to disable the radio hardware in the
+#. * network panel
+#: ../panels/network/cc-network-panel.c:1001
+msgid "Air_plane Mode"
+msgstr "Aero_plane Mode"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:36
-msgid "Two-_finger scrolling"
-msgstr "Two-_finger scrolling"
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:1
+#: ../panels/network/network-mobile.ui.h:7
+msgid "Network"
+msgstr "Network"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:37
-msgid "Enable h_orizontal scrolling"
-msgstr "Enable h_orizontal scrolling"
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
+msgid "Network settings"
+msgstr "Network settings"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:38
-msgid "Touchpad"
-msgstr "Touchpad"
+#. Translators: those are keywords for the network control-center panel
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:4
+msgid "Network;Wireless;IP;LAN;Proxy;"
+msgstr "Network;Wireless;IP;LAN;Proxy;"
 
-#. TRANSLATORS: this is when the use leaves the PAC textbox blank
-#: ../panels/network/cc-network-panel.c:273
-msgid ""
-"Web Proxy Autodiscovery is used when a Configuration URL is not provided."
-msgstr ""
-"Web Proxy Autodiscovery is used when a Configuration URL is not provided."
+#: ../panels/network/net-device-mobile.c:222
+msgid "Add new connection"
+msgstr "Add new connection"
 
-#. TRANSLATORS: WPAD is bad: if you enable it on an untrusted
-#. * network, then anyone else on that network can tell your
-#. * machine that it should proxy all of your web traffic
-#. * through them.
-#: ../panels/network/cc-network-panel.c:281
-msgid "This is not recommended for untrusted public networks."
-msgstr "This is not recommended for untrusted public networks."
+#. Translators: network device speed
+#: ../panels/network/net-device-mobile.c:261
+#: ../panels/network/net-device-wifi.c:699
+#: ../panels/network/net-device-wired.c:126
+#, c-format
+msgid "%d Mb/s"
+msgstr "%d Mb/s"
 
-#. TRANSLATORS: this is when the access point is not listed
-#. * in the dropdown (or hidden) and the user has to select
-#. * another entry manually
-#: ../panels/network/cc-network-panel.c:1001
-msgctxt "Wireless access point"
-msgid "Other..."
-msgstr "Otherâ"
+#. TRANSLATORS: this is when the access point is not listed in
+#. *  the dropdown (or hidden) and the user has to select another
+#. *  entry manually
+#: ../panels/network/net-device-wifi.c:196
+msgid "Connect to a Hidden Network"
+msgstr "Connect to a Hidden Network"
 
 #. TRANSLATORS: this WEP WiFi security
-#: ../panels/network/cc-network-panel.c:1159
-#: ../panels/network/cc-network-panel.c:1566
+#: ../panels/network/net-device-wifi.c:293
+#: ../panels/network/net-device-wifi.c:472
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/cc-network-panel.c:1163
-#: ../panels/network/cc-network-panel.c:1570
+#: ../panels/network/net-device-wifi.c:297
+#: ../panels/network/net-device-wifi.c:476
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/cc-network-panel.c:1167
+#: ../panels/network/net-device-wifi.c:301
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
-#: ../panels/network/cc-network-panel.c:1172
+#: ../panels/network/net-device-wifi.c:306
 msgid "Enterprise"
 msgstr "Enterprise"
 
-#. TRANSLATORS: this no (!) WiFi security
-#: ../panels/network/cc-network-panel.c:1178
-#: ../panels/network/cc-network-panel.c:1561
-#: ../panels/universal-access/uap.ui.h:5 ../panels/wacom/cc-wacom-page.c:297
-#: ../panels/wacom/cc-wacom-page.c:314
+#: ../panels/network/net-device-wifi.c:311
+#: ../panels/network/net-device-wifi.c:467
+msgctxt "Wifi security"
 msgid "None"
 msgstr "None"
 
-#: ../panels/network/cc-network-panel.c:1665
-msgid "Hotspot"
-msgstr "Hotspot"
-
-#. Translators: network device speed
-#: ../panels/network/cc-network-panel.c:1672
-#, c-format
-msgid "%d Mb/s"
-msgstr "%d Mb/s"
-
-#: ../panels/network/cc-network-panel.c:2018 ../panels/network/network.ui.h:11
-msgid "IPv4 Address"
-msgstr "IPv4 Address"
-
-#: ../panels/network/cc-network-panel.c:2019 ../panels/network/network.ui.h:12
-msgid "IPv6 Address"
-msgstr "IPv6 Address"
-
-#: ../panels/network/cc-network-panel.c:2022
-#: ../panels/network/cc-network-panel.c:2025 ../panels/network/network.ui.h:27
-#: ../panels/printers/printers.ui.h:13
-msgid "IP Address"
-msgstr "IP Address"
+#: ../panels/network/net-device-wifi.c:733
+msgctxt "Signal strength"
+msgid "None"
+msgstr "None"
 
-#: ../panels/network/cc-network-panel.c:2072
-#: ../panels/network/cc-network-panel.c:2447
-#, c-format
-msgid "%s VPN"
-msgstr "%s VPN"
+#: ../panels/network/net-device-wifi.c:735
+msgctxt "Signal strength"
+msgid "Weak"
+msgstr "Weak"
 
-#: ../panels/network/cc-network-panel.c:2180
-msgid "Proxy"
-msgstr "Proxy"
+#: ../panels/network/net-device-wifi.c:737
+msgctxt "Signal strength"
+msgid "Ok"
+msgstr "Ok"
 
-#: ../panels/network/cc-network-panel.c:2254
-msgid "Network proxy"
-msgstr "Network proxy"
+#: ../panels/network/net-device-wifi.c:739
+msgctxt "Signal strength"
+msgid "Good"
+msgstr "Good"
 
-#. TRANSLATORS: the user is running a NM that is not API compatible
-#: ../panels/network/cc-network-panel.c:2514
-msgid "The system network services are not compatible with this version."
-msgstr "The system network services are not compatible with this version."
+#: ../panels/network/net-device-wifi.c:741
+msgctxt "Signal strength"
+msgid "Excellent"
+msgstr "Excellent"
 
-#: ../panels/network/cc-network-panel.c:2712
+#: ../panels/network/net-device-wifi.c:901
 #, c-format
 msgid ""
 "Network details for %s including password and any custom configuration will "
@@ -1721,368 +1714,614 @@ msgstr ""
 "Network details for %s including password and any custom configuration will "
 "be lost"
 
-#: ../panels/network/cc-network-panel.c:2722
+#: ../panels/network/net-device-wifi.c:912
 msgid "Forget"
 msgstr "Forget"
 
-#: ../panels/network/cc-network-panel.c:3221
-msgid "Not connected to the internet."
-msgstr "Not connected to the internet."
-
-#: ../panels/network/cc-network-panel.c:3222
-msgid "Create the hotspot anyway?"
-msgstr "Create the hotspot anyway?"
+#: ../panels/network/net-device-wifi.c:1437
+msgid ""
+"If you have a connection to the Internet other than wireless, you can use it "
+"to share your internet connection with others."
+msgstr ""
+"If you have a connection to the Internet other than wireless, you can use it "
+"to share your internet connection with others."
 
-#: ../panels/network/cc-network-panel.c:3240
+#: ../panels/network/net-device-wifi.c:1441
 #, c-format
-msgid "Disconnect from %s and create a new hotspot?"
-msgstr "Disconnect from %s and create a new hotspot?"
-
-#: ../panels/network/cc-network-panel.c:3243
-msgid "This is your only connection to the internet."
-msgstr "This is your only connection to the internet."
+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/cc-network-panel.c:3261
-msgid "Create _Hotspot"
-msgstr "Create _Hotspot"
+#: ../panels/network/net-device-wifi.c:1445
+msgid ""
+"It is not possible to access the internet through your wireless while the "
+"hotspot is active."
+msgstr ""
+"It is not possible to access the internet through your wireless while the "
+"hotspot is active."
 
-#: ../panels/network/cc-network-panel.c:3321
+#: ../panels/network/net-device-wifi.c:1511
 msgid "Stop hotspot and disconnect any users?"
 msgstr "Stop hotspot and disconnect any users?"
 
-#: ../panels/network/cc-network-panel.c:3324
+#: ../panels/network/net-device-wifi.c:1514
 msgid "_Stop Hotspot"
 msgstr "_Stop Hotspot"
 
-#. TRANSLATORS: this is to disable the radio hardware in the
-#. * network panel
-#: ../panels/network/cc-network-panel.c:3342
-msgid "Airplane Mode"
-msgstr "Aeroplane Mode"
+#: ../panels/network/net-device-wifi.c:1579
+#, c-format
+msgid "%i day ago"
+msgid_plural "%i days ago"
+msgstr[0] "%i day ago"
+msgstr[1] "%i days ago"
 
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:1
-msgid "Network"
-msgstr "Network"
+#: ../panels/network/net-device-wifi.c:1933
+#: ../panels/network/network-wifi.ui.h:19
+msgid "Out of range"
+msgstr "Out of range"
 
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
-msgid "Network settings"
-msgstr "Network settings"
+#. TRANSLATORS: this is when the use leaves the PAC textbox blank
+#: ../panels/network/net-proxy.c:67
+msgid ""
+"Web Proxy Autodiscovery is used when a Configuration URL is not provided."
+msgstr ""
+"Web Proxy Autodiscovery is used when a Configuration URL is not provided."
 
-#. Translators: those are keywords for the network control-center panel
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:4
-msgid "Network;Wireless;IP;LAN;Proxy;"
-msgstr "Network;Wireless;IP;LAN;Proxy;"
+#. TRANSLATORS: WPAD is bad: if you enable it on an untrusted
+#. * 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
+msgid "This is not recommended for untrusted public networks."
+msgstr "This is not recommended for untrusted public networks."
 
-#: ../panels/network/network.ui.h:1
-msgid "Select the interface to use for the new service"
-msgstr "Select the interface to use for the new service"
+#: ../panels/network/net-proxy.c:367
+msgid "Proxy"
+msgstr "Proxy"
 
-#: ../panels/network/network.ui.h:2
-msgid "Create..."
-msgstr "Createâ"
+#: ../panels/network/network-mobile.ui.h:1
+msgid "IMEI"
+msgstr "IMEI"
 
-#: ../panels/network/network.ui.h:3
-msgid "Interface"
-msgstr "Interface"
+#: ../panels/network/network-mobile.ui.h:2
+msgid "Provider"
+msgstr "Provider"
 
-#: ../panels/network/network.ui.h:4
-msgid "VPN"
-msgstr "VPN"
+#: ../panels/network/network-mobile.ui.h:3
+#: ../panels/network/panel-common.c:697 ../panels/network/panel-common.c:699
+#: ../panels/printers/printers.ui.h:13
+msgid "IP Address"
+msgstr "IP Address"
 
-#: ../panels/network/network.ui.h:5
+#: ../panels/network/network-mobile.ui.h:4
+#: ../panels/network/network-wifi.ui.h:7
+#: ../panels/network/network-wired.ui.h:3 ../panels/network/panel-common.c:695
+msgid "IPv6 Address"
+msgstr "IPv6 Address"
+
+#: ../panels/network/network-mobile.ui.h:5
+#: ../panels/network/network-wifi.ui.h:8
+#: ../panels/network/network-wired.ui.h:5
+msgid "Default Route"
+msgstr "Default Route"
+
+#: ../panels/network/network-mobile.ui.h:6
+#: ../panels/network/network-wifi.ui.h:9
+#: ../panels/network/network-wired.ui.h:6
+msgid "DNS"
+msgstr "DNS"
+
+#: ../panels/network/network-mobile.ui.h:8
+#: ../panels/network/network-wired.ui.h:7
+msgid "_Options..."
+msgstr "_Optionsâ"
+
+#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:5
 msgctxt "proxy method"
 msgid "None"
 msgstr "None"
 
-#: ../panels/network/network.ui.h:6
+#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:6
 msgctxt "proxy method"
 msgid "Manual"
 msgstr "Manual"
 
-#: ../panels/network/network.ui.h:7
+#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:7
 msgctxt "proxy method"
 msgid "Automatic"
 msgstr "Automatic"
 
-#: ../panels/network/network.ui.h:8
-msgid "Add Device"
-msgstr "Add Device"
-
-#: ../panels/network/network.ui.h:10
-msgid "Hardware Address"
-msgstr "Hardware Address"
-
-#: ../panels/network/network.ui.h:13
-msgid "Subnet Mask"
-msgstr "Subnet Mask"
-
-#: ../panels/network/network.ui.h:14
-msgid "Default Route"
-msgstr "Default Route"
-
-#: ../panels/network/network.ui.h:15
-msgid "DNS"
-msgstr "DNS"
-
-#: ../panels/network/network.ui.h:16
-msgid "Device Off"
-msgstr "Device Off"
+#: ../panels/network/network-proxy.ui.h:4
+msgid "_Method"
+msgstr "_Method"
 
-#: ../panels/network/network.ui.h:17
-#: ../panels/region/gnome-region-panel.ui.h:26
-msgid "_Options..."
-msgstr "_Optionsâ"
+#: ../panels/network/network-proxy.ui.h:5
+msgid "_Configuration URL"
+msgstr "_Configuration URL"
 
-#: ../panels/network/network.ui.h:18
-msgid "Security"
-msgstr "Security"
+#: ../panels/network/network-proxy.ui.h:6
+msgid "_HTTP Proxy"
+msgstr "_HTTP Proxy"
 
-#: ../panels/network/network.ui.h:19
-msgid "_Network Name"
-msgstr "_Network Name"
+#: ../panels/network/network-proxy.ui.h:7
+msgid "H_TTPS Proxy"
+msgstr "H_TTPS Proxy"
 
-#: ../panels/network/network.ui.h:20
-msgid "Network Name"
-msgstr "Network Name"
+#: ../panels/network/network-proxy.ui.h:8
+msgid "_FTP Proxy"
+msgstr "_FTP Proxy"
 
-#: ../panels/network/network.ui.h:21
-msgid "Security Key"
-msgstr "Security Key"
+#: ../panels/network/network-proxy.ui.h:9
+msgid "_Socks Host"
+msgstr "_Socks Host"
 
-#: ../panels/network/network.ui.h:22
-msgid "Forget Network"
-msgstr "Forget Network"
+#: ../panels/network/network.ui.h:1
+msgid "Select the interface to use for the new service"
+msgstr "Select the interface to use for the new service"
 
-#: ../panels/network/network.ui.h:23
-msgid "_Use as Hotspot..."
-msgstr "_Use as Hotspotâ"
+#: ../panels/network/network.ui.h:2
+msgid "C_reate..."
+msgstr "C_reateâ"
 
-#: ../panels/network/network.ui.h:24
-msgid "_Stop Hotspot..."
-msgstr "_Stop Hotspotâ"
+#: ../panels/network/network.ui.h:3
+msgid "_Interface"
+msgstr "_Interface"
 
-#: ../panels/network/network.ui.h:25
-msgid "IMEI"
-msgstr "IMEI"
+#: ../panels/network/network.ui.h:4 ../panels/network/network-vpn.ui.h:1
+msgid "VPN"
+msgstr "VPN"
 
-#: ../panels/network/network.ui.h:26
-msgid "Provider"
-msgstr "Provider"
+#: ../panels/network/network.ui.h:8
+msgid "Add Device"
+msgstr "Add Device"
 
-#: ../panels/network/network.ui.h:28
+#: ../panels/network/network-vpn.ui.h:2
 msgid "VPN Type"
 msgstr "VPN Type"
 
-#: ../panels/network/network.ui.h:29
+#: ../panels/network/network-vpn.ui.h:3
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../panels/network/network.ui.h:30
+#: ../panels/network/network-vpn.ui.h:4
 msgid "Group Name"
 msgstr "Group Name"
 
-#: ../panels/network/network.ui.h:31
+#: ../panels/network/network-vpn.ui.h:5
 msgid "Group Password"
 msgstr "Group Password"
 
-#: ../panels/network/network.ui.h:32
+#: ../panels/network/network-vpn.ui.h:6
 msgid "Username"
 msgstr "Username"
 
-#: ../panels/network/network.ui.h:33
-msgid "Disable VPN"
-msgstr "Disable VPN"
-
-#: ../panels/network/network.ui.h:34
+#: ../panels/network/network-vpn.ui.h:7
 msgid "_Configure..."
 msgstr "_Configureâ"
 
-#: ../panels/network/network.ui.h:35
-msgid "_Method"
-msgstr "_Method"
+#: ../panels/network/network-wifi.ui.h:1
+msgid "Wireless Hotspot"
+msgstr "Wireless Hotspot"
 
-#: ../panels/network/network.ui.h:36
-msgid "_Configuration URL"
-msgstr "_Configuration URL"
+#: ../panels/network/network-wifi.ui.h:2
+msgid "_Turn On"
+msgstr "_Turn On"
 
-#: ../panels/network/network.ui.h:37
-msgid "_HTTP Proxy"
-msgstr "_HTTP Proxy"
+#. TRANSLATORS: device type
+#: ../panels/network/network-wifi.ui.h:3 ../panels/network/panel-common.c:90
+msgid "Wireless"
+msgstr "Wireless"
 
-#: ../panels/network/network.ui.h:38
-msgid "H_TTPS Proxy"
-msgstr "H_TTPS Proxy"
+#: ../panels/network/network-wifi.ui.h:4
+msgid "_Use as Hotspot..."
+msgstr "_Use as Hotspotâ"
 
-#: ../panels/network/network.ui.h:39
-msgid "_FTP Proxy"
-msgstr "_FTP Proxy"
+#: ../panels/network/network-wifi.ui.h:5
+#: ../panels/network/network-wired.ui.h:1
+msgid "Hardware Address"
+msgstr "Hardware Address"
 
-#: ../panels/network/network.ui.h:40
-msgid "_Socks Host"
-msgstr "_Socks Host"
+#: ../panels/network/network-wifi.ui.h:6
+#: ../panels/network/network-wired.ui.h:2 ../panels/network/panel-common.c:694
+msgid "IPv4 Address"
+msgstr "IPv4 Address"
+
+#: ../panels/network/network-wifi.ui.h:10
+msgid "Security"
+msgstr "Security"
+
+#: ../panels/network/network-wifi.ui.h:11
+msgid "Strength"
+msgstr "Strength"
+
+#: ../panels/network/network-wifi.ui.h:12
+msgid "Link speed"
+msgstr "Link speed"
+
+#: ../panels/network/network-wifi.ui.h:13
+msgid "_Settings..."
+msgstr "_Settingsâ"
+
+#: ../panels/network/network-wifi.ui.h:14
+msgid "Switch off to connect to a wireless network"
+msgstr "Switch off to connect to a wireless network"
+
+#: ../panels/network/network-wifi.ui.h:15
+msgid "Network Name"
+msgstr "Network Name"
+
+#: ../panels/network/network-wifi.ui.h:16
+msgid "Connected Devices"
+msgstr "Connected Devices"
+
+#: ../panels/network/network-wifi.ui.h:17
+msgid "Security type"
+msgstr "Security type"
+
+#: ../panels/network/network-wifi.ui.h:18
+msgid "Security key"
+msgstr "Security key"
 
-#: ../panels/network/network.ui.h:41
-msgid "HTTP Port"
-msgstr "HTTP Port"
+#: ../panels/network/network-wifi.ui.h:20
+msgid "Security Key"
+msgstr "Security Key"
 
-#: ../panels/network/network.ui.h:42
-msgid "HTTPS Port"
-msgstr "HTTPS Port"
+#: ../panels/network/network-wifi.ui.h:21
+msgid "Last used"
+msgstr "Last used"
 
-#: ../panels/network/network.ui.h:43
-msgid "FTP Port"
-msgstr "FTP Port"
+#: ../panels/network/network-wifi.ui.h:22
+msgid "_Forget Network"
+msgstr "_Forget Network"
 
-#: ../panels/network/network.ui.h:44
-msgid "Socks Port"
-msgstr "Socks Port"
+#: ../panels/network/network-wired.ui.h:4
+msgid "Subnet Mask"
+msgstr "Subnet Mask"
 
 #. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:83
+#: ../panels/network/panel-common.c:86
 msgid "Wired"
 msgstr "Wired"
 
 #. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:87
-msgid "Wireless"
-msgstr "Wireless"
-
-#. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:94
+#: ../panels/network/panel-common.c:97
 msgid "Mobile broadband"
 msgstr "Mobile broadband"
 
 #. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:103
+#: ../panels/network/panel-common.c:106
 msgid "Mesh"
 msgstr "Mesh"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:162
+#: ../panels/network/panel-common.c:166
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:166
+#: ../panels/network/panel-common.c:170
 msgid "Infrastructure"
 msgstr "Infrastructure"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:190 ../panels/network/panel-common.c:251
+#: ../panels/network/panel-common.c:194 ../panels/network/panel-common.c:255
 msgid "Status unknown"
 msgstr "Status unknown"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:194
+#: ../panels/network/panel-common.c:198
 msgid "Unmanaged"
 msgstr "Unmanaged"
 
-#: ../panels/network/panel-common.c:199
+#: ../panels/network/panel-common.c:203
 msgid "Firmware missing"
 msgstr "Firmware missing"
 
-#: ../panels/network/panel-common.c:202
+#: ../panels/network/panel-common.c:206
 msgid "Cable unplugged"
 msgstr "Cable unplugged"
 
-#: ../panels/network/panel-common.c:204
+#: ../panels/network/panel-common.c:208
 msgid "Unavailable"
 msgstr "Unavailable"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:208
+#: ../panels/network/panel-common.c:212
 msgid "Disconnected"
 msgstr "Disconnected"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:215 ../panels/network/panel-common.c:257
+#: ../panels/network/panel-common.c:219 ../panels/network/panel-common.c:261
 msgid "Connecting"
 msgstr "Connecting"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:219 ../panels/network/panel-common.c:261
+#: ../panels/network/panel-common.c:223 ../panels/network/panel-common.c:265
 msgid "Authentication required"
 msgstr "Authentication required"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:223 ../panels/network/panel-common.c:265
+#: ../panels/network/panel-common.c:227 ../panels/network/panel-common.c:269
 msgid "Connected"
 msgstr "Connected"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:227
+#: ../panels/network/panel-common.c:231
 msgid "Disconnecting"
 msgstr "Disconnecting"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:231 ../panels/network/panel-common.c:269
+#: ../panels/network/panel-common.c:235 ../panels/network/panel-common.c:273
 msgid "Connection failed"
 msgstr "Connection failed"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:235 ../panels/network/panel-common.c:277
+#: ../panels/network/panel-common.c:239 ../panels/network/panel-common.c:281
 msgid "Status unknown (missing)"
 msgstr "Status unknown (missing)"
 
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:273
+#: ../panels/network/panel-common.c:277
 msgid "Not connected"
 msgstr "Not connected"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:305
-msgid "Error logging into the account"
-msgstr "Error logging into the account"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:351
-msgid "Expired credentials. Please log in again."
-msgstr "Expired credentials. Please log in again."
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:354
-msgid "_Log In"
-msgstr "_Log In"
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:301
+msgid "Configuration failed"
+msgstr "Configuration failed"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:305
+msgid "IP configuration failed"
+msgstr "IP configuration failed"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:309
+msgid "IP configuration expired"
+msgstr "IP configuration expired"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:313
+msgid "Secrets were required, but not provided"
+msgstr "Secrets were required, but not provided"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:317
+msgid "802.1x supplicant disconnected"
+msgstr "802.1x supplicant disconnected"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:321
+msgid "802.1x supplicant configuration failed"
+msgstr "802.1x supplicant configuration failed"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:325
+msgid "802.1x supplicant failed"
+msgstr "802.1x supplicant failed"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:329
+msgid "802.1x supplicant took too long to authenticate"
+msgstr "802.1x supplicant took too long to authenticate"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:333
+msgid "PPP service failed to start"
+msgstr "PPP service failed to start"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:337
+msgid "PPP service disconnected"
+msgstr "PPP service disconnected"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:341
+msgid "PPP failed"
+msgstr "PPP failed"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:345
+msgid "DHCP client failed to start"
+msgstr "DHCP client failed to start"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:349
+msgid "DHCP client error"
+msgstr "DHCP client error"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:353
+msgid "DHCP client failed"
+msgstr "DHCP client failed"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:357
+msgid "Shared connection service failed to start"
+msgstr "Shared connection service failed to start"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:361
+msgid "Shared connection service failed"
+msgstr "Shared connection service failed"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:365
+msgid "AutoIP service failed to start"
+msgstr "AutoIP service failed to start"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:369
+msgid "AutoIP service error"
+msgstr "AutoIP service error"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:373
+msgid "AutoIP service failed"
+msgstr "AutoIP service failed"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:377
+msgid "Line busy"
+msgstr "Line busy"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:381
+msgid "No dial tone"
+msgstr "No dial tone"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:385
+msgid "No carrier could be established"
+msgstr "No carrier could be established"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:389
+msgid "Dialing request timed out"
+msgstr "Dialing request timed out"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:393
+msgid "Dialing attempt failed"
+msgstr "Dialing attempt failed"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:397
+msgid "Modem initialization failed"
+msgstr "Modem initialisation failed"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:401
+msgid "Failed to select the specified APN"
+msgstr "Failed to select the specified APN"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:405
+msgid "Not searching for networks"
+msgstr "Not searching for networks"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:409
+msgid "Network registration denied"
+msgstr "Network registration denied"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:413
+msgid "Network registration timed out"
+msgstr "Network registration timed out"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:417
+msgid "Failed to register with the requested network"
+msgstr "Failed to register with the requested network"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:421
+msgid "PIN check failed"
+msgstr "PIN check failed"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:425
+msgid "Firmware for the device may be missing"
+msgstr "Firmware for the device may be missing"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:429
+msgid "Connection disappeared"
+msgstr "Connection disappeared"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:433
+msgid "Carrier/link changed"
+msgstr "Carrier/link changed"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:437
+msgid "Existing connection was assumed"
+msgstr "Existing connection was assumed"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:441
+msgid "Modem not found"
+msgstr "Modem not found"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:445
+msgid "Bluetooth connection failed"
+msgstr "Bluetooth connection failed"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:449
+msgid "SIM Card not inserted"
+msgstr "SIM Card not inserted"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:453
+msgid "SIM Pin required"
+msgstr "SIM Pin required"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:457
+msgid "SIM Puk required"
+msgstr "SIM Puk required"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:461
+msgid "SIM wrong"
+msgstr "SIM wrong"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:465
+msgid "InfiniBand device does not support connected mode"
+msgstr "InfiniBand device does not support connected mode"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:469
+msgid "Connection dependency failed"
+msgstr "Connection dependency failed"
 
 #. translators: This is the title of the "Add Account" dialogue.
 #. * The title is not visible when using GNOME Shell
-#: ../panels/online-accounts/cc-online-accounts-panel.c:461
-#: ../panels/online-accounts/online-accounts.ui.h:1
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:252
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:263
+#: ../panels/online-accounts/online-accounts.ui.h:2
 msgid "Add Account"
 msgstr "Add Account"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:466
-msgid "To add a new account, first select the account type"
-msgstr "To add a new account, first select the account type"
+#: ../panels/online-accounts/cc-online-accounts-panel.c:383
+msgid "Error logging into the account"
+msgstr "Error logging into the account"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:469
-msgid "Account Type:"
-msgstr "Account Type:"
+#: ../panels/online-accounts/cc-online-accounts-panel.c:437
+msgid "Expired credentials. Please log in again."
+msgstr "Expired credentials. Please log in again."
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:497
-msgid "_Add..."
-msgstr "_Addâ"
+#: ../panels/online-accounts/cc-online-accounts-panel.c:440
+msgid "_Log In"
+msgstr "_Log In"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:550
+#: ../panels/online-accounts/cc-online-accounts-panel.c:676
 msgid "Error creating account"
 msgstr "Error creating account"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:584
+#: ../panels/online-accounts/cc-online-accounts-panel.c:718
 msgid "Error removing account"
 msgstr "Error removing account"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:620
+#: ../panels/online-accounts/cc-online-accounts-panel.c:754
 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:622
+#: ../panels/online-accounts/cc-online-accounts-panel.c:756
 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:623
+#: ../panels/online-accounts/cc-online-accounts-panel.c:757
 msgid "_Remove"
 msgstr "_Remove"
 
@@ -2099,26 +2338,38 @@ msgstr "Manage online accounts"
 msgid "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;"
 msgstr "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;"
 
-#: ../panels/online-accounts/online-accounts.ui.h:2
+#: ../panels/online-accounts/online-accounts.ui.h:1
+msgid "No online accounts configured"
+msgstr "No online accounts configured"
+
+#: ../panels/online-accounts/online-accounts.ui.h:3
 msgid "Remove Account"
 msgstr "Remove Account"
 
-#: ../panels/online-accounts/online-accounts.ui.h:3
-msgid "Select an account"
-msgstr "Select an account"
+#: ../panels/online-accounts/online-accounts.ui.h:4
+msgid "Add an online account"
+msgstr "Add an online 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."
 
-#: ../panels/power/cc-power-panel.c:162
+#: ../panels/power/cc-power-panel.c:165
 msgid "Unknown time"
 msgstr "Unknown time"
 
-#: ../panels/power/cc-power-panel.c:168
+#: ../panels/power/cc-power-panel.c:171
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i minute"
 msgstr[1] "%i minutes"
 
-#: ../panels/power/cc-power-panel.c:180
+#: ../panels/power/cc-power-panel.c:183
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -2127,160 +2378,173 @@ msgstr[1] "%i hours"
 
 #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
 #. * Swap order with "%2$s %2$i %1$s %1$i if needed
-#: ../panels/power/cc-power-panel.c:188
+#: ../panels/power/cc-power-panel.c:191
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: ../panels/power/cc-power-panel.c:189
+#: ../panels/power/cc-power-panel.c:192
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hour"
 msgstr[1] "hours"
 
-#: ../panels/power/cc-power-panel.c:190
+#: ../panels/power/cc-power-panel.c:193
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:233
+#: ../panels/power/cc-power-panel.c:236
 #, c-format
 msgid "Charging - %s until fully charged"
 msgstr "Charging - %s until fully charged"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:241
+#: ../panels/power/cc-power-panel.c:244
 #, c-format
 msgid "Caution low battery, %s remaining"
 msgstr "Caution low battery, %s remaining"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:249
+#: ../panels/power/cc-power-panel.c:252
 #, c-format
 msgid "Using battery power - %s remaining"
 msgstr "Using battery power - %s remaining"
 
 #. TRANSLATORS: primary battery
-#. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:266 ../panels/power/cc-power-panel.c:558
+#: ../panels/power/cc-power-panel.c:269
 msgid "Charging"
 msgstr "Charging"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:271
+#: ../panels/power/cc-power-panel.c:274
 msgid "Using battery power"
 msgstr "Using battery power"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:275 ../panels/power/cc-power-panel.c:580
+#: ../panels/power/cc-power-panel.c:278
 msgid "Charging - fully charged"
 msgstr "Charging - fully charged"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:279 ../panels/power/cc-power-panel.c:584
+#: ../panels/power/cc-power-panel.c:282
 msgid "Empty"
 msgstr "Empty"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:347
+#: ../panels/power/cc-power-panel.c:350
 #, c-format
 msgid "Caution low UPS, %s remaining"
 msgstr "Caution low UPS, %s remaining"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:353
+#: ../panels/power/cc-power-panel.c:356
 #, c-format
 msgid "Using UPS power - %s remaining"
 msgstr "Using UPS power - %s remaining"
 
 #. TRANSLATORS: UPS battery
-#: ../panels/power/cc-power-panel.c:371
+#: ../panels/power/cc-power-panel.c:374
 msgid "Caution low UPS"
 msgstr "Caution low UPS"
 
 #. TRANSLATORS: UPS battery
-#: ../panels/power/cc-power-panel.c:376
+#: ../panels/power/cc-power-panel.c:379
 msgid "Using UPS power"
 msgstr "Using UPS power"
 
 #. TRANSLATORS: secondary battery is normally in the media bay
-#: ../panels/power/cc-power-panel.c:428
+#: ../panels/power/cc-power-panel.c:431
 msgid "Your secondary battery is fully charged"
 msgstr "Your secondary battery is fully charged"
 
 #. TRANSLATORS: secondary battery is normally in the media bay
-#: ../panels/power/cc-power-panel.c:432
+#: ../panels/power/cc-power-panel.c:435
 msgid "Your secondary battery is empty"
 msgstr "Your secondary battery is empty"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:515
+#: ../panels/power/cc-power-panel.c:518
 msgid "Wireless mouse"
 msgstr "Wireless mouse"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:519
+#: ../panels/power/cc-power-panel.c:522
 msgid "Wireless keyboard"
 msgstr "Wireless keyboard"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:523
+#: ../panels/power/cc-power-panel.c:526
 msgid "Uninterruptible power supply"
 msgstr "Uninterruptible power supply"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:527
+#: ../panels/power/cc-power-panel.c:530
 msgid "Personal digital assistant"
 msgstr "Personal digital assistant"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:531
+#: ../panels/power/cc-power-panel.c:534
 msgid "Cellphone"
 msgstr "Mobile phone"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:535
+#: ../panels/power/cc-power-panel.c:538
 msgid "Media player"
 msgstr "Media player"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:539
+#: ../panels/power/cc-power-panel.c:542
 msgid "Tablet"
 msgstr "Tablet"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:543
+#: ../panels/power/cc-power-panel.c:546
 msgid "Computer"
 msgstr "Computer"
 
 #. TRANSLATORS: secondary battery, misc
-#: ../panels/power/cc-power-panel.c:547
+#: ../panels/power/cc-power-panel.c:550
 msgid "Battery"
 msgstr "Battery"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:565
+#: ../panels/power/cc-power-panel.c:561
+msgctxt "Battery power"
+msgid "Charging"
+msgstr "Charging"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:568
+msgctxt "Battery power"
 msgid "Caution"
 msgstr "Caution"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:575
+#: ../panels/power/cc-power-panel.c:573
+msgctxt "Battery power"
+msgid "Low"
+msgstr "Low"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:578
+msgctxt "Battery power"
 msgid "Good"
 msgstr "Good"
 
-#: ../panels/power/cc-power-panel.c:1077
-msgid "Tip:"
-msgstr "Tip:"
-
-#: ../panels/power/cc-power-panel.c:1078
-msgid "Brightness Settings"
-msgstr "Brightness Settings"
+#. TRANSLATORS: primary battery
+#: ../panels/power/cc-power-panel.c:583
+msgctxt "Battery power"
+msgid "Charging - fully charged"
+msgstr "Charging - fully charged"
 
-#: ../panels/power/cc-power-panel.c:1079
-msgid "affect how much power is used"
-msgstr "affect how much power is used"
+#. TRANSLATORS: primary battery
+#: ../panels/power/cc-power-panel.c:587
+msgctxt "Battery power"
+msgid "Empty"
+msgstr "Empty"
 
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:1
 msgid "Power"
@@ -2340,255 +2604,376 @@ msgid "When power is _critically low"
 msgstr "When power is _critically low"
 
 #. Translators: The printer is low on toner
-#: ../panels/printers/cc-printers-panel.c:541
+#: ../panels/printers/cc-printers-panel.c:582
 msgid "Low on toner"
 msgstr "Low on toner"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:543
+#: ../panels/printers/cc-printers-panel.c:584
 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:546
+#: ../panels/printers/cc-printers-panel.c:587
 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:549
+#: ../panels/printers/cc-printers-panel.c:590
 msgid "Out of developer"
 msgstr "Out of developer"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:551
+#: ../panels/printers/cc-printers-panel.c:592
 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:553
+#: ../panels/printers/cc-printers-panel.c:594
 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:555
+#: ../panels/printers/cc-printers-panel.c:596
 msgid "Open cover"
 msgstr "Open cover"
 
 #. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:557
+#: ../panels/printers/cc-printers-panel.c:598
 msgid "Open door"
 msgstr "Open door"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:559
+#: ../panels/printers/cc-printers-panel.c:600
 msgid "Low on paper"
 msgstr "Low on paper"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:561
+#: ../panels/printers/cc-printers-panel.c:602
 msgid "Out of paper"
 msgstr "Out of paper"
 
 #. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:563
+#: ../panels/printers/cc-printers-panel.c:604
 msgctxt "printer state"
 msgid "Offline"
 msgstr "Offline"
 
 #. Translators: Someone has paused the Printer
-#: ../panels/printers/cc-printers-panel.c:565
+#: ../panels/printers/cc-printers-panel.c:606
 msgctxt "printer state"
 msgid "Paused"
 msgstr "Paused"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:567
+#: ../panels/printers/cc-printers-panel.c:608
 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:569
+#: ../panels/printers/cc-printers-panel.c:610
 msgid "Waste receptacle full"
 msgstr "Waste receptacle full"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:571
+#: ../panels/printers/cc-printers-panel.c:612
 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:573
+#: ../panels/printers/cc-printers-panel.c:614
 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/cc-printers-panel.c:748
+#: ../panels/printers/cc-printers-panel.c:765
 msgctxt "printer state"
 msgid "Ready"
 msgstr "Ready"
 
 #. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/cc-printers-panel.c:752
+#: ../panels/printers/cc-printers-panel.c:769
 msgctxt "printer state"
 msgid "Processing"
 msgstr "Processing"
 
 #. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/cc-printers-panel.c:756
+#: ../panels/printers/cc-printers-panel.c:773
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "Stopped"
 
 #. Translators: Toner supply
-#: ../panels/printers/cc-printers-panel.c:868
+#: ../panels/printers/cc-printers-panel.c:892
 msgid "Toner Level"
 msgstr "Toner Level"
 
 #. Translators: Ink supply
-#: ../panels/printers/cc-printers-panel.c:871
+#: ../panels/printers/cc-printers-panel.c:895
 msgid "Ink Level"
 msgstr "Ink Level"
 
 #. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/cc-printers-panel.c:874
+#: ../panels/printers/cc-printers-panel.c:898
 msgid "Supply Level"
 msgstr "Supply Level"
 
+#. Translators: There are no printers available (none is configured or CUPS is not running)
+#: ../panels/printers/cc-printers-panel.c:1009
+msgid "No printers available"
+msgstr "No printers available"
+
 #. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:889
-#: ../panels/printers/cc-printers-panel.c:1284
+#: ../panels/printers/cc-printers-panel.c:1285
 #, c-format
 msgid "%u active"
 msgid_plural "%u active"
 msgstr[0] "%u active"
 msgstr[1] "%u active"
 
-#. Translators: There are no printers available (none is configured or CUPS is not running)
-#: ../panels/printers/cc-printers-panel.c:996
-msgid "No printers available"
-msgstr "No printers available"
+#. Translators: Addition of the new printer failed.
+#: ../panels/printers/cc-printers-panel.c:1581
+msgid "Failed to add new printer."
+msgstr "Failed to add new printer."
+
+#: ../panels/printers/cc-printers-panel.c:1739
+msgid "Select PPD File"
+msgstr "Select PPD File"
+
+#: ../panels/printers/cc-printers-panel.c:1748
+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/cc-printers-panel.c:2053
+msgid "No suitable driver found"
+msgstr "No suitable driver found"
+
+#: ../panels/printers/cc-printers-panel.c:2122
+msgid "Searching for preferred drivers..."
+msgstr "Searching for preferred driversâ"
+
+#: ../panels/printers/cc-printers-panel.c:2137
+msgid "Select from database..."
+msgstr "Select from databaseâ"
+
+#: ../panels/printers/cc-printers-panel.c:2146
+msgid "Provide PPD File..."
+msgstr "Provide PPD Fileâ"
+
+#. Translators: Name of job which makes printer to print test page
+#: ../panels/printers/cc-printers-panel.c:2284
+#: ../panels/printers/cc-printers-panel.c:2298
+msgid "Test page"
+msgstr "Test page"
+
+#. Translators: The XML file containing user interface can not be loaded
+#: ../panels/printers/cc-printers-panel.c:2668
+#, c-format
+msgid "Could not load ui: %s"
+msgstr "Could not load ui: %s"
+
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1
+#: ../panels/printers/pp-new-printer-dialog.c:155
+msgid "Printers"
+msgstr "Printers"
+
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2
+msgid "Change printer settings"
+msgstr "Change printer settings"
+
+#. Translators: those are keywords for the printing control-center panel
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4
+msgid "Printer;Queue;Print;Paper;Ink;Toner;"
+msgstr "Printer;Queue;Print;Paper;Ink;Toner;"
+
+#: ../panels/printers/jobs-dialog.ui.h:1
+#: ../panels/printers/options-dialog.ui.h:1
+#: ../panels/printers/ppd-selection-dialog.ui.h:1
+msgid " "
+msgstr " "
+
+#: ../panels/printers/jobs-dialog.ui.h:2
+#: ../panels/printers/options-dialog.ui.h:4
+msgid "Close"
+msgstr "Close"
+
+#. Translators: This tab contains list of active print jobs of the selected printer
+#: ../panels/printers/jobs-dialog.ui.h:4
+msgid "Active Jobs"
+msgstr "Active Jobs"
+
+#: ../panels/printers/jobs-dialog.ui.h:5
+msgid "Resume Printing"
+msgstr "Resume Printing"
+
+#: ../panels/printers/jobs-dialog.ui.h:6
+msgid "Pause Printing"
+msgstr "Pause Printing"
+
+#: ../panels/printers/jobs-dialog.ui.h:7
+msgid "Cancel Print Job"
+msgstr "Cancel Print Job"
+
+#: ../panels/printers/new-printer-dialog.ui.h:1
+msgid "Add a New Printer"
+msgstr "Add a New Printer"
+
+#: ../panels/printers/new-printer-dialog.ui.h:2
+msgid "A_ddress:"
+msgstr "A_ddress:"
+
+#: ../panels/printers/new-printer-dialog.ui.h:3
+msgid "_Search by Address"
+msgstr "_Search by Address"
+
+#: ../panels/printers/new-printer-dialog.ui.h:5
+#: ../panels/user-accounts/um-account-dialog.c:1017
+msgid "_Add"
+msgstr "_Add"
+
+#: ../panels/printers/options-dialog.ui.h:2
+msgid "Options"
+msgstr "Options"
+
+#: ../panels/printers/options-dialog.ui.h:3
+msgid "Loading options..."
+msgstr "Loading optionsâ"
+
+#: ../panels/printers/ppd-selection-dialog.ui.h:2
+#: ../panels/user-accounts/data/photo-dialog.ui.h:8
+#: ../panels/user-accounts/um-account-dialog.c:1016
+msgid "Cancel"
+msgstr "Cancel"
+
+#: ../panels/printers/ppd-selection-dialog.ui.h:4
+msgid "Loading drivers database..."
+msgstr "Loading drivers databaseâ"
+
+#: ../panels/printers/ppd-selection-dialog.ui.h:5
+msgid "Select Printer Driver"
+msgstr "Select Printer Driver"
+
+#. Translators: this is an option of "Two Sided"
+#: ../panels/printers/pp-ipp-option-widget.c:65
+#: ../panels/printers/pp-ppd-option-widget.c:69
+msgid "One Sided"
+msgstr "One Sided"
+
+#. Translators: this is an option of "Two Sided"
+#: ../panels/printers/pp-ipp-option-widget.c:67
+#: ../panels/printers/pp-ppd-option-widget.c:71
+msgid "Long Edge (Standard)"
+msgstr "Long Edge (Standard)"
+
+#. Translators: this is an option of "Two Sided"
+#: ../panels/printers/pp-ipp-option-widget.c:69
+#: ../panels/printers/pp-ppd-option-widget.c:73
+msgid "Short Edge (Flip)"
+msgstr "Short Edge (Flip)"
+
+#. Translators: this is an option of "Orientation"
+#: ../panels/printers/pp-ipp-option-widget.c:71
+msgid "Portrait"
+msgstr "Portrait"
+
+#. Translators: this is an option of "Orientation"
+#: ../panels/printers/pp-ipp-option-widget.c:73
+msgid "Landscape"
+msgstr "Landscape"
+
+#. Translators: this is an option of "Orientation"
+#: ../panels/printers/pp-ipp-option-widget.c:75
+msgid "Reverse landscape"
+msgstr "Reverse landscape"
+
+#. Translators: this is an option of "Orientation"
+#: ../panels/printers/pp-ipp-option-widget.c:77
+msgid "Reverse portrait"
+msgstr "Reverse portrait"
 
 #. Translators: Job's state (job is waiting to be printed)
-#: ../panels/printers/cc-printers-panel.c:1327
+#: ../panels/printers/pp-jobs-dialog.c:143
 msgctxt "print job"
 msgid "Pending"
 msgstr "Pending"
 
 #. Translators: Job's state (job is held for printing)
-#: ../panels/printers/cc-printers-panel.c:1331
+#: ../panels/printers/pp-jobs-dialog.c:147
 msgctxt "print job"
 msgid "Held"
 msgstr "Held"
 
 #. Translators: Job's state (job is currently printing)
-#: ../panels/printers/cc-printers-panel.c:1335
+#: ../panels/printers/pp-jobs-dialog.c:151
 msgctxt "print job"
 msgid "Processing"
 msgstr "Processing"
 
 #. Translators: Job's state (job has been stopped)
-#: ../panels/printers/cc-printers-panel.c:1339
+#: ../panels/printers/pp-jobs-dialog.c:155
 msgctxt "print job"
 msgid "Stopped"
 msgstr "Stopped"
 
 #. Translators: Job's state (job has been canceled)
-#: ../panels/printers/cc-printers-panel.c:1343
+#: ../panels/printers/pp-jobs-dialog.c:159
 msgctxt "print job"
 msgid "Canceled"
 msgstr "Cancelled"
 
 #. Translators: Job's state (job has aborted due to error)
-#: ../panels/printers/cc-printers-panel.c:1347
+#: ../panels/printers/pp-jobs-dialog.c:163
 msgctxt "print job"
 msgid "Aborted"
 msgstr "Aborted"
 
 #. Translators: Job's state (job has completed successfully)
-#: ../panels/printers/cc-printers-panel.c:1351
+#: ../panels/printers/pp-jobs-dialog.c:167
 msgctxt "print job"
 msgid "Completed"
 msgstr "Completed"
 
 #. Translators: Name of column showing titles of print jobs
-#: ../panels/printers/cc-printers-panel.c:1431
+#: ../panels/printers/pp-jobs-dialog.c:289
 msgid "Job Title"
 msgstr "Job Title"
 
 #. Translators: Name of column showing statuses of print jobs
-#: ../panels/printers/cc-printers-panel.c:1440
+#: ../panels/printers/pp-jobs-dialog.c:298
 msgid "Job State"
 msgstr "Job State"
 
 #. Translators: Name of column showing times of creation of print jobs
-#: ../panels/printers/cc-printers-panel.c:1446
+#: ../panels/printers/pp-jobs-dialog.c:304
 msgid "Time"
 msgstr "Time"
 
-#. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:2068
-msgid "Failed to add new printer."
-msgstr "Failed to add new printer."
-
-#. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2272
-#: ../panels/printers/cc-printers-panel.c:2286
-msgid "Test page"
-msgstr "Test page"
-
-#. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:2535
+#: ../panels/printers/pp-jobs-dialog.c:484
 #, c-format
-msgid "Could not load ui: %s"
-msgstr "Could not load ui: %s"
+msgid "%s Active Jobs"
+msgstr "%s Active Jobs"
 
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1
-#: ../panels/printers/pp-new-printer-dialog.c:147
-msgid "Printers"
-msgstr "Printers"
+#: ../panels/printers/pp-new-printer-dialog.c:659
+msgid "Getting devices..."
+msgstr "Getting devicesâ"
 
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2
-msgid "Change printer settings"
-msgstr "Change printer settings"
-
-#. Translators: those are keywords for the printing control-center panel
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4
-msgid "Printer;Queue;Print;Paper;Ink;Toner;"
-msgstr "Printer;Queue;Print;Paper;Ink;Toner;"
-
-#: ../panels/printers/new-printer-dialog.ui.h:1
-msgid "Add a New Printer"
-msgstr "Add a New Printer"
-
-#: ../panels/printers/new-printer-dialog.ui.h:2
-msgid "A_ddress:"
-msgstr "A_ddress:"
-
-#: ../panels/printers/new-printer-dialog.ui.h:3
-msgid "_Search by Address"
-msgstr "_Search by Address"
-
-#: ../panels/printers/new-printer-dialog.ui.h:5
-msgid "_Add"
-msgstr "_Add"
-
-#: ../panels/printers/pp-new-printer-dialog.c:649
-msgid "Getting devices..."
-msgstr "Getting devicesâ"
-
-#. Translators: No localy connected printers were found
-#: ../panels/printers/pp-new-printer-dialog.c:1232
-msgid "No local printers found"
-msgstr "No local printers found"
+#. Translators: No localy connected printers were found
+#: ../panels/printers/pp-new-printer-dialog.c:1242
+msgid "No local printers found"
+msgstr "No local printers found"
 
 #. Translators: No network printers were found
-#: ../panels/printers/pp-new-printer-dialog.c:1245
+#: ../panels/printers/pp-new-printer-dialog.c:1255
 msgid "No network printers found"
 msgstr "No network printers found"
 
-#: ../panels/printers/pp-new-printer-dialog.c:1337
+#: ../panels/printers/pp-new-printer-dialog.c:1347
 msgid ""
 "FirewallD is not running. Network printer detection needs services mdns, "
 "ipp, ipp-client and samba-client enabled on firewall."
@@ -2597,45 +2982,184 @@ msgstr ""
 "ipp, ipp-client and samba-client enabled on firewall."
 
 #. Translators: Column of devices which can be installed
-#: ../panels/printers/pp-new-printer-dialog.c:1365
-#: ../panels/printers/pp-new-printer-dialog.c:1370
+#: ../panels/printers/pp-new-printer-dialog.c:1375
+#: ../panels/printers/pp-new-printer-dialog.c:1380
 msgid "Devices"
 msgstr "Devices"
 
 #. Translators: Local means local printers
-#: ../panels/printers/pp-new-printer-dialog.c:1395
+#: ../panels/printers/pp-new-printer-dialog.c:1405
 msgctxt "printer type"
 msgid "Local"
 msgstr "Local"
 
 #. Translators: Network means network printers
-#: ../panels/printers/pp-new-printer-dialog.c:1397
+#: ../panels/printers/pp-new-printer-dialog.c:1407
 msgctxt "printer type"
 msgid "Network"
 msgstr "Network"
 
 #. Translators: Device types column (network or local)
-#: ../panels/printers/pp-new-printer-dialog.c:1438
+#: ../panels/printers/pp-new-printer-dialog.c:1448
 msgid "Device types"
 msgstr "Device types"
 
 #. Translators: Name of job which makes printer to autoconfigure itself
-#: ../panels/printers/pp-new-printer-dialog.c:1770
+#: ../panels/printers/pp-new-printer-dialog.c:1768
 msgid "Automatic configuration"
 msgstr "Automatic configuration"
 
-#: ../panels/printers/pp-new-printer-dialog.c:1869
+#: ../panels/printers/pp-new-printer-dialog.c:1791
 msgid "Opening firewall for mDNS connections"
 msgstr "Opening firewall for mDNS connections"
 
-#: ../panels/printers/pp-new-printer-dialog.c:1878
+#: ../panels/printers/pp-new-printer-dialog.c:1800
 msgid "Opening firewall for Samba connections"
 msgstr "Opening firewall for Samba connections"
 
-#: ../panels/printers/pp-new-printer-dialog.c:1887
+#: ../panels/printers/pp-new-printer-dialog.c:1809
 msgid "Opening firewall for IPP connections"
 msgstr "Opening firewall for IPP connections"
 
+#: ../panels/printers/pp-options-dialog.c:82
+msgid "Two Sided"
+msgstr "Two Sided"
+
+#: ../panels/printers/pp-options-dialog.c:83
+msgid "Paper Type"
+msgstr "Paper Type"
+
+#: ../panels/printers/pp-options-dialog.c:84
+msgid "Paper Source"
+msgstr "Paper Source"
+
+#: ../panels/printers/pp-options-dialog.c:85
+msgid "Output Tray"
+msgstr "Output Tray"
+
+#: ../panels/printers/pp-options-dialog.c:86
+msgid "Resolution"
+msgstr "Resolution"
+
+#: ../panels/printers/pp-options-dialog.c:87
+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
+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
+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
+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
+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
+msgctxt "Printer Option Group"
+msgid "Installable Options"
+msgstr "Installable Options"
+
+#. Translators: "Job" tab contains settings for jobs
+#: ../panels/printers/pp-options-dialog.c:663
+msgctxt "Printer Option Group"
+msgid "Job"
+msgstr "Job"
+
+#. Translators: "Image Quality" tab contains settings for quality of output print (e.g. resolution)
+#: ../panels/printers/pp-options-dialog.c:666
+msgctxt "Printer Option Group"
+msgid "Image Quality"
+msgstr "Image Quality"
+
+#. Translators: "Color" tab contains color settings (e.g. color printing)
+#: ../panels/printers/pp-options-dialog.c:669
+msgctxt "Printer Option Group"
+msgid "Color"
+msgstr "Colour"
+
+#. Translators: "Finishing" tab contains finishing settings (e.g. booklet printing)
+#: ../panels/printers/pp-options-dialog.c:672
+msgctxt "Printer Option Group"
+msgid "Finishing"
+msgstr "Finishing"
+
+#. Translators: "Advanced" tab contains all others settings
+#: ../panels/printers/pp-options-dialog.c:675
+msgctxt "Printer Option Group"
+msgid "Advanced"
+msgstr "Advanced"
+
+#. Translators: Options of given printer (e.g. "MyPrinter Options")
+#: ../panels/printers/pp-options-dialog.c:934
+#, c-format
+msgid "%s Options"
+msgstr "%s Options"
+
+#. Translators: this is an option of "Paper Source"
+#: ../panels/printers/pp-ppd-option-widget.c:75
+#: ../panels/printers/pp-ppd-option-widget.c:77
+#: ../panels/printers/pp-ppd-option-widget.c:85
+msgid "Auto Select"
+msgstr "Auto Select"
+
+#. Translators: this is an option of "Paper Source"
+#. Translators: this is an option of "Resolution"
+#: ../panels/printers/pp-ppd-option-widget.c:79
+#: ../panels/printers/pp-ppd-option-widget.c:81
+#: ../panels/printers/pp-ppd-option-widget.c:83
+#: ../panels/printers/pp-ppd-option-widget.c:87
+msgid "Printer Default"
+msgstr "Printer Default"
+
+#. Translators: this is an option of "GhostScript"
+#: ../panels/printers/pp-ppd-option-widget.c:89
+msgid "Embed GhostScript fonts only"
+msgstr "Embed GhostScript fonts only"
+
+#. Translators: this is an option of "GhostScript"
+#: ../panels/printers/pp-ppd-option-widget.c:91
+msgid "Convert to PS level 1"
+msgstr "Convert to PS level 1"
+
+#. Translators: this is an option of "GhostScript"
+#: ../panels/printers/pp-ppd-option-widget.c:93
+msgid "Convert to PS level 2"
+msgstr "Convert to PS level 2"
+
+#. Translators: this is an option of "GhostScript"
+#: ../panels/printers/pp-ppd-option-widget.c:95
+msgid "No pre-filtering"
+msgstr "No pre-filtering"
+
+#. Translators: Name of column showing printer manufacturers
+#: ../panels/printers/pp-ppd-selection-dialog.c:230
+msgid "Manufacturers"
+msgstr "Manufacturers"
+
+#. Translators: Name of column showing printer drivers
+#: ../panels/printers/pp-ppd-selection-dialog.c:242
+msgid "Drivers"
+msgstr "Drivers"
+
 #: ../panels/printers/printers.ui.h:1
 msgid "Add Printer"
 msgstr "Add Printer"
@@ -2663,7 +3187,7 @@ msgstr "_Default"
 msgid "Jobs"
 msgstr "Jobs"
 
-#. Tanslators: Switch to tab containing printer's jobs
+#. Tanslators: Opens a dialog containing printer's jobs
 #: ../panels/printers/printers.ui.h:11
 msgid "_Show"
 msgstr "_Show"
@@ -2672,62 +3196,43 @@ msgstr "_Show"
 msgid "Model"
 msgstr "Model"
 
-#. Translators: This button executes command which prints test page.
+#: ../panels/printers/printers.ui.h:14
+msgid "page 1"
+msgstr "page 1"
+
 #: ../panels/printers/printers.ui.h:15
-msgid "Print _Test Page"
-msgstr "Print _Test Page"
+msgid "label"
+msgstr "label"
+
+#: ../panels/printers/printers.ui.h:16
+msgid "page 2"
+msgstr "page 2"
 
-#. Translators: This button opens printer's options tab
 #: ../panels/printers/printers.ui.h:17
-msgid "_Options"
-msgstr "_Options"
+msgid "Setting new driver..."
+msgstr "Setting new driverâ"
 
-#. Translators: Switch back to printer's info tab
-#: ../panels/printers/printers.ui.h:19
-msgid "_Back"
-msgstr "_Back"
+#: ../panels/printers/printers.ui.h:18
+msgid "page 3"
+msgstr "page 3"
 
-#. Translators: This tab contains list of active print jobs of the selected printer
-#: ../panels/printers/printers.ui.h:21
-msgid "Active Print Jobs"
-msgstr "Active Print Jobs"
+#. 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 button opens printer's options tab
 #: ../panels/printers/printers.ui.h:22
-msgid "Resume Printing"
-msgstr "Resume Printing"
-
-#: ../panels/printers/printers.ui.h:23
-msgid "Pause Printing"
-msgstr "Pause Printing"
-
-#: ../panels/printers/printers.ui.h:24
-msgid "Cancel Print Job"
-msgstr "Cancel Print Job"
-
-#. Translators: This tab contains list of active print jobs of the selected printer
-#: ../panels/printers/printers.ui.h:26
-msgid "Printer Options"
-msgstr "Printer Options"
-
-#: ../panels/printers/printers.ui.h:27
-msgid "Add User"
-msgstr "Add User"
-
-#: ../panels/printers/printers.ui.h:28
-msgid "Remove User"
-msgstr "Remove User"
-
-#: ../panels/printers/printers.ui.h:29
-msgid "Allowed users"
-msgstr "Allowed users"
+msgid "_Options"
+msgstr "_Options"
 
 #. Translators: This button adds new printer.
-#: ../panels/printers/printers.ui.h:31
+#: ../panels/printers/printers.ui.h:24
 msgid "Add New Printer"
 msgstr "Add New Printer"
 
 #. Translators: The CUPS server is not running (we can not connect to it).
-#: ../panels/printers/printers.ui.h:33
+#: ../panels/printers/printers.ui.h:26
 msgid ""
 "Sorry! The system printing service\n"
 "doesn't seem to be available."
@@ -2736,9 +3241,8 @@ msgstr ""
 "doesn't seem to be available."
 
 #: ../panels/region/gnome-region-panel.desktop.in.in.h:1
-#: ../panels/region/gnome-region-panel.ui.h:1
-msgid "Region and Language"
-msgstr "Region and Language"
+msgid "Region & Language"
+msgstr "Region & Language"
 
 #: ../panels/region/gnome-region-panel.desktop.in.in.h:2
 msgid "Change your region and language settings"
@@ -2757,23 +3261,15 @@ msgstr "Imperial"
 msgid "Metric"
 msgstr "Metric"
 
-#: ../panels/region/gnome-region-panel-layout-chooser.ui.h:1
-msgid "Choose a Layout"
-msgstr "Choose a Layout"
-
-#: ../panels/region/gnome-region-panel-layout-chooser.ui.h:2
-msgid "Preview"
-msgstr "Preview"
+#: ../panels/region/gnome-region-panel-input-chooser.ui.h:1
+msgid "Choose an input source"
+msgstr "Choose an input source"
 
-#: ../panels/region/gnome-region-panel-layout-chooser.ui.h:3
+#: ../panels/region/gnome-region-panel-input-chooser.ui.h:2
 msgid "Select an input source to add"
 msgstr "Select an input source to add"
 
-#: ../panels/region/gnome-region-panel-options-dialog.ui.h:1
-msgid "Keyboard Layout Options"
-msgstr "Keyboard Layout Options"
-
-#: ../panels/region/gnome-region-panel-system.c:417
+#: ../panels/region/gnome-region-panel-system.c:330
 msgid ""
 "The login screen, system accounts and new user accounts use the system-wide "
 "Region and Language settings."
@@ -2781,8 +3277,8 @@ msgstr ""
 "The login screen, system accounts and new user accounts use the system-wide "
 "Region and Language settings."
 
-#: ../panels/region/gnome-region-panel-system.c:422
-#: ../panels/region/gnome-region-panel.ui.h:32
+#: ../panels/region/gnome-region-panel-system.c:335
+#: ../panels/region/gnome-region-panel.ui.h:31
 msgid ""
 "The login screen, system accounts and new user accounts use the system-wide "
 "Region and Language settings. You may change the system settings to match "
@@ -2792,32 +3288,36 @@ msgstr ""
 "Region and Language settings. You may change the system settings to match "
 "yours."
 
-#: ../panels/region/gnome-region-panel-system.c:425
+#: ../panels/region/gnome-region-panel-system.c:338
 msgid "Copy Settings"
 msgstr "Copy Settings"
 
-#: ../panels/region/gnome-region-panel-system.c:428
-#: ../panels/region/gnome-region-panel.ui.h:39
+#: ../panels/region/gnome-region-panel-system.c:341
+#: ../panels/region/gnome-region-panel.ui.h:38
 msgid "Copy Settings..."
 msgstr "Copy Settingsâ"
 
+#: ../panels/region/gnome-region-panel.ui.h:1
+msgid "Region and Language"
+msgstr "Region and Language"
+
 #: ../panels/region/gnome-region-panel.ui.h:2
 msgid "Select a display language (change will be applied next time you log in)"
 msgstr ""
 "Select a display language (change will be applied next time you log in)"
 
 #: ../panels/region/gnome-region-panel.ui.h:3
-msgid "Install languages..."
-msgstr "Install languagesâ"
-
-#: ../panels/region/gnome-region-panel.ui.h:4
 msgid "Add Language"
 msgstr "Add Language"
 
-#: ../panels/region/gnome-region-panel.ui.h:5
+#: ../panels/region/gnome-region-panel.ui.h:4
 msgid "Remove Language"
 msgstr "Remove Language"
 
+#: ../panels/region/gnome-region-panel.ui.h:5
+msgid "Install languages..."
+msgstr "Install languagesâ"
+
 #: ../panels/region/gnome-region-panel.ui.h:6
 msgid "Language"
 msgstr "Language"
@@ -2863,94 +3363,73 @@ msgid "Formats"
 msgstr "Formats"
 
 #: ../panels/region/gnome-region-panel.ui.h:17
-msgid "Add Layout"
-msgstr "Add Layout"
+msgid "Select keyboards or other input sources"
+msgstr "Select keyboards or other input sources"
 
 #: ../panels/region/gnome-region-panel.ui.h:18
-msgid "Remove Layout"
-msgstr "Remove Layout"
+msgid "Add Input Source"
+msgstr "Add Input Source"
 
 #: ../panels/region/gnome-region-panel.ui.h:19
-msgid "Move Up"
-msgstr "Move Up"
+msgid "Remove Input Source"
+msgstr "Remove Input Source"
 
 #: ../panels/region/gnome-region-panel.ui.h:20
-msgid "Move Down"
-msgstr "Move Down"
+msgid "Move Input Source Up"
+msgstr "Move Input Source Up"
 
 #: ../panels/region/gnome-region-panel.ui.h:21
-msgid "Preview Layout"
-msgstr "Preview Layout"
+msgid "Move Input Source Down"
+msgstr "Move Input Source Down"
 
 #: ../panels/region/gnome-region-panel.ui.h:22
-msgid "Use the same layout for all windows"
-msgstr "Use the same layout for all windows"
+msgid "Input Source Settings"
+msgstr "Input Source Settings"
 
 #: ../panels/region/gnome-region-panel.ui.h:23
-msgid "Allow different layouts for individual windows"
-msgstr "Allow different layouts for individual windows"
-
-#: ../panels/region/gnome-region-panel.ui.h:24
-msgid "New windows use the default layout"
-msgstr "New windows use the default layout"
+msgid "Show Keyboard Layout"
+msgstr "Show Keyboard Layout"
 
 #: ../panels/region/gnome-region-panel.ui.h:25
-msgid "New windows use the previous window's layout"
-msgstr "New windows use the previous window's layout"
+msgid "Ctrl+Alt+Space"
+msgstr "Ctrl+Alt+Space"
 
 #: ../panels/region/gnome-region-panel.ui.h:27
-msgid "View and edit keyboard layout options"
-msgstr "View and edit keyboard layout options"
+msgid "Ctrl+Alt+Shift+Space"
+msgstr "Ctrl+Alt+Shift+Space"
 
 #: ../panels/region/gnome-region-panel.ui.h:28
-msgid "Reset to De_faults"
-msgstr "Reset to De_faults"
+msgid "Shortcut Settings"
+msgstr "Shortcut Settings"
 
-#: ../panels/region/gnome-region-panel.ui.h:29
-msgid ""
-"Replace the current keyboard layout settings with the\n"
-"default settings"
-msgstr ""
-"Replace the current keyboard layout settings with the\n"
-"default settings"
-
-#: ../panels/region/gnome-region-panel.ui.h:31
-msgid "Layouts"
-msgstr "Layouts"
+#: ../panels/region/gnome-region-panel.ui.h:30
+msgid "Input Sources"
+msgstr "Input Sources"
 
 #. 'display' means 'output' here, as in 'translated messages that are displayed to the user'
-#: ../panels/region/gnome-region-panel.ui.h:34
+#: ../panels/region/gnome-region-panel.ui.h:33
 msgid "Display language:"
 msgstr "Display language:"
 
-#: ../panels/region/gnome-region-panel.ui.h:35
+#: ../panels/region/gnome-region-panel.ui.h:34
 msgid "Input source:"
 msgstr "Input source:"
 
-#: ../panels/region/gnome-region-panel.ui.h:36
+#: ../panels/region/gnome-region-panel.ui.h:35
 msgid "Format:"
 msgstr "Format:"
 
-#: ../panels/region/gnome-region-panel.ui.h:37
+#: ../panels/region/gnome-region-panel.ui.h:36
 msgid "Your settings"
 msgstr "Your settings"
 
-#: ../panels/region/gnome-region-panel.ui.h:38
+#: ../panels/region/gnome-region-panel.ui.h:37
 msgid "System settings"
 msgstr "System settings"
 
-#: ../panels/region/gnome-region-panel-xkblt.c:210
-msgid "Layout"
-msgstr "Layout"
-
-#: ../panels/region/gnome-region-panel-xkbot.c:229
-#: ../panels/sound/gvc-sound-theme-chooser.c:585
-msgid "Default"
-msgstr "Default"
-
 #: ../panels/screen/gnome-screen-panel.desktop.in.in.h:1
-msgid "Brightness and Lock"
-msgstr "Brightness and Lock"
+msgid "Brightness & Lock"
+msgstr "Brightness & Lock"
 
 #: ../panels/screen/gnome-screen-panel.desktop.in.in.h:2
 msgid "Screen brightness and lock settings"
@@ -3007,6 +3486,10 @@ msgid "Locations..."
 msgstr "Locationsâ"
 
 #: ../panels/screen/screen.ui.h:17
+msgid "Show _notifications when locked"
+msgstr "Show _notifications when locked"
+
+#: ../panels/screen/screen.ui.h:18
 msgid "Lock"
 msgstr "Lock"
 
@@ -3040,8 +3523,8 @@ msgstr "Change sound volume and sound events"
 
 #. Translators: those are keywords for the sound control-center panel
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:4
-msgid "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;"
-msgstr "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;"
+msgid "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;"
+msgstr "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;"
 
 #. Translators: This is the name of an audio file that sounds like the bark of a dog.
 #. You might want to translate it into the equivalent words of your language.
@@ -3067,7 +3550,7 @@ msgstr "Glass"
 msgid "Sonar"
 msgstr "Sonar"
 
-#: ../panels/sound/gvc-applet.c:270 ../panels/sound/gvc-mixer-dialog.c:1768
+#: ../panels/sound/gvc-applet.c:270 ../panels/sound/gvc-mixer-dialog.c:1656
 msgid "Output"
 msgstr "Output"
 
@@ -3075,7 +3558,7 @@ msgstr "Output"
 msgid "Sound Output Volume"
 msgstr "Sound Output Volume"
 
-#: ../panels/sound/gvc-applet.c:276 ../panels/sound/gvc-mixer-dialog.c:1809
+#: ../panels/sound/gvc-applet.c:276 ../panels/sound/gvc-mixer-dialog.c:1697
 msgid "Input"
 msgstr "Input"
 
@@ -3125,23 +3608,24 @@ msgstr "_Fade:"
 msgid "_Subwoofer:"
 msgstr "_Subwoofer:"
 
-#: ../panels/sound/gvc-channel-bar.c:603 ../panels/sound/gvc-channel-bar.c:612
+#: ../panels/sound/gvc-channel-bar.c:613 ../panels/sound/gvc-channel-bar.c:622
 msgctxt "volume"
 msgid "100%"
 msgstr "100%"
 
-#: ../panels/sound/gvc-channel-bar.c:607
+#: ../panels/sound/gvc-channel-bar.c:617
 msgctxt "volume"
 msgid "Unamplified"
 msgstr "Unamplified"
 
-#: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:1622
+#: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:260
+#: ../panels/sound/gvc-mixer-dialog.c:521
 msgid "_Profile:"
 msgstr "_Profile:"
 
 #. translators:
 #. * The number of sound outputs on a particular device
-#: ../panels/sound/gvc-mixer-control.c:1094
+#: ../panels/sound/gvc-mixer-control.c:1841
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@@ -3150,87 +3634,72 @@ msgstr[1] "%u Outputs"
 
 #. translators:
 #. * The number of sound inputs on a particular device
-#: ../panels/sound/gvc-mixer-control.c:1104
+#: ../panels/sound/gvc-mixer-control.c:1851
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
 msgstr[0] "%u Input"
 msgstr[1] "%u Inputs"
 
-#: ../panels/sound/gvc-mixer-control.c:1402
+#: ../panels/sound/gvc-mixer-control.c:2375
 msgid "System Sounds"
 msgstr "System Sounds"
 
-#: ../panels/sound/gvc-mixer-dialog.c:324
-#: ../panels/sound/gvc-mixer-dialog.c:635
-msgid "Co_nnector:"
-msgstr "Co_nnector:"
+#: ../panels/sound/gvc-mixer-dialog.c:262
+msgid "_Test Speakers"
+msgstr "_Test Speakers"
 
-#: ../panels/sound/gvc-mixer-dialog.c:541
+#: ../panels/sound/gvc-mixer-dialog.c:426
 msgid "Peak detect"
 msgstr "Peak detect"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1497
-#: ../panels/sound/gvc-mixer-dialog.c:1710
+#: ../panels/sound/gvc-mixer-dialog.c:1506
 #: ../panels/sound/gvc-sound-theme-chooser.c:595
 msgid "Name"
 msgstr "Name"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1564
+#: ../panels/sound/gvc-mixer-dialog.c:1588
 #, c-format
 msgid "Speaker Testing for %s"
 msgstr "Speaker Testing for %s"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1623
-msgid "_Test Speakers"
-msgstr "_Test Speakers"
-
-#: ../panels/sound/gvc-mixer-dialog.c:1754
+#: ../panels/sound/gvc-mixer-dialog.c:1642
 msgid "_Output volume:"
 msgstr "_Output volume:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1773
+#: ../panels/sound/gvc-mixer-dialog.c:1661
 msgid "C_hoose a device for sound output:"
 msgstr "C_hoose a device for sound output:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1798
-#: ../panels/sound/gvc-mixer-dialog.c:1927
+#: ../panels/sound/gvc-mixer-dialog.c:1686
 msgid "Settings for the selected device:"
 msgstr "Settings for the selected device:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1816
+#: ../panels/sound/gvc-mixer-dialog.c:1704
 msgid "_Input volume:"
 msgstr "_Input volume:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1839
+#: ../panels/sound/gvc-mixer-dialog.c:1727
 msgid "Input level:"
 msgstr "Input level:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1867
+#: ../panels/sound/gvc-mixer-dialog.c:1755
 msgid "C_hoose a device for sound input:"
 msgstr "C_hoose a device for sound input:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1894
-msgid "Hardware"
-msgstr "Hardware"
-
-#: ../panels/sound/gvc-mixer-dialog.c:1899
-msgid "C_hoose a device to configure:"
-msgstr "C_hoose a device to configure:"
-
-#: ../panels/sound/gvc-mixer-dialog.c:1938
+#: ../panels/sound/gvc-mixer-dialog.c:1782
 msgid "Sound Effects"
 msgstr "Sound Effects"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1945
+#: ../panels/sound/gvc-mixer-dialog.c:1789
 msgid "_Alert volume:"
 msgstr "_Alert volume:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1958
+#: ../panels/sound/gvc-mixer-dialog.c:1802
 msgid "Applications"
 msgstr "Applications"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1962
+#: ../panels/sound/gvc-mixer-dialog.c:1806
 msgid "No application is currently playing or recording audio."
 msgstr "No application is currently playing or recording audio."
 
@@ -3250,6 +3719,10 @@ msgstr "Sound Preferences"
 msgid "Testing event sound"
 msgstr "Testing event sound"
 
+#: ../panels/sound/gvc-sound-theme-chooser.c:585
+msgid "Default"
+msgstr "Default"
+
 #: ../panels/sound/gvc-sound-theme-chooser.c:586
 msgid "From theme"
 msgstr "From theme"
@@ -3258,16 +3731,16 @@ msgstr "From theme"
 msgid "C_hoose an alert sound:"
 msgstr "C_hoose an alert sound:"
 
-#: ../panels/sound/gvc-speaker-test.c:221
+#: ../panels/sound/gvc-speaker-test.c:220
 msgid "Stop"
 msgstr "Stop"
 
-#: ../panels/sound/gvc-speaker-test.c:221
-#: ../panels/sound/gvc-speaker-test.c:333
+#: ../panels/sound/gvc-speaker-test.c:220
+#: ../panels/sound/gvc-speaker-test.c:332
 msgid "Test"
 msgstr "Test"
 
-#: ../panels/sound/gvc-speaker-test.c:229
+#: ../panels/sound/gvc-speaker-test.c:228
 msgid "Subwoofer"
 msgstr "Subwoofer"
 
@@ -3292,8 +3765,8 @@ msgstr "Muted"
 msgid "Custom"
 msgstr "Custom"
 
-#: ../panels/universal-access/cc-ua-panel.c:446
-#: ../panels/universal-access/cc-ua-panel.c:452
+#: ../panels/universal-access/cc-ua-panel.c:286
+#: ../panels/universal-access/cc-ua-panel.c:292
 msgid "No shortcut set"
 msgstr "No shortcut set"
 
@@ -3307,422 +3780,471 @@ msgid ""
 "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen Reader;text;font;size;"
 "AccessX;Sticky Keys;Slow Keys;Bounce Keys;Mouse Keys;"
 msgstr ""
-"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen "
-"Reader;text;font;size;AccessX;Sticky Keys;Slow Keys;Bounce Keys;Mouse Keys;"
+"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen Reader;text;font;size;"
+"AccessX;Sticky Keys;Slow Keys;Bounce Keys;Mouse Keys;"
 
 #: ../panels/universal-access/uap.ui.h:1
-msgid "On screen keyboard"
-msgstr "On-screen keyboard"
+msgctxt "universal access, contrast"
+msgid "Low"
+msgstr "Low"
 
 #: ../panels/universal-access/uap.ui.h:2
-msgid "Dasher"
-msgstr "Dasher"
+msgctxt "universal access, contrast"
+msgid "Normal"
+msgstr "Normal"
 
 #: ../panels/universal-access/uap.ui.h:3
-msgid "Nomon"
-msgstr "Nomon"
+msgctxt "universal access, contrast"
+msgid "High"
+msgstr "High"
 
 #: ../panels/universal-access/uap.ui.h:4
-msgid "Caribou"
-msgstr "Caribou"
+msgctxt "universal access, contrast"
+msgid "High/Inverse"
+msgstr "High/Inverse"
+
+#: ../panels/universal-access/uap.ui.h:5
+msgid "On screen keyboard"
+msgstr "On-screen keyboard"
+
+#: ../panels/universal-access/uap.ui.h:6
+msgid "GOK"
+msgstr "GOK"
 
 #: ../panels/universal-access/uap.ui.h:7
+msgid "OnBoard"
+msgstr "OnBoard"
+
+#: ../panels/universal-access/uap.ui.h:8
+msgid "None"
+msgstr "None"
+
+#: ../panels/universal-access/uap.ui.h:10
 #, no-c-format
 msgid "75%"
 msgstr "75%"
 
-#: ../panels/universal-access/uap.ui.h:8
+#: ../panels/universal-access/uap.ui.h:11
 msgctxt "universal access, text size"
 msgid "Small"
 msgstr "Small"
 
-#: ../panels/universal-access/uap.ui.h:10
+#: ../panels/universal-access/uap.ui.h:13
 #, no-c-format
 msgid "100%"
 msgstr "100%"
 
-#: ../panels/universal-access/uap.ui.h:11
+#: ../panels/universal-access/uap.ui.h:14
 msgctxt "universal access, text size"
 msgid "Normal"
 msgstr "Normal"
 
-#: ../panels/universal-access/uap.ui.h:13
+#: ../panels/universal-access/uap.ui.h:16
 #, no-c-format
 msgid "125%"
 msgstr "125%"
 
-#: ../panels/universal-access/uap.ui.h:14
+#: ../panels/universal-access/uap.ui.h:17
 msgctxt "universal access, text size"
 msgid "Large"
 msgstr "Large"
 
-#: ../panels/universal-access/uap.ui.h:16
+#: ../panels/universal-access/uap.ui.h:19
 #, no-c-format
 msgid "150%"
 msgstr "150%"
 
-#: ../panels/universal-access/uap.ui.h:17
+#: ../panels/universal-access/uap.ui.h:20
 msgctxt "universal access, text size"
 msgid "Larger"
 msgstr "Larger"
 
-#: ../panels/universal-access/uap.ui.h:18
-msgid "GOK"
-msgstr "GOK"
-
-#: ../panels/universal-access/uap.ui.h:19
-msgid "OnBoard"
-msgstr "OnBoard"
-
-#: ../panels/universal-access/uap.ui.h:20
-msgid "Change contrast:"
-msgstr "Change contrast:"
-
 #: ../panels/universal-access/uap.ui.h:21
-msgid "_Contrast:"
-msgstr "_Contrast:"
+msgid "High Contrast"
+msgstr "High Contrast"
 
 #: ../panels/universal-access/uap.ui.h:22
-msgid "_Text size:"
-msgstr "_Text size:"
+msgid "Beep on Caps and Num Lock"
+msgstr "Beep on Caps and Num Lock"
 
 #: ../panels/universal-access/uap.ui.h:23
-msgid "Increase size:"
-msgstr "Increase size:"
+msgid "Options..."
+msgstr "Optionsâ"
 
 #: ../panels/universal-access/uap.ui.h:24
-msgid "Decrease size:"
-msgstr "Decrease size:"
-
-#. Translators: this refers to theme contrast and font size
-#: ../panels/universal-access/uap.ui.h:26
-msgctxt "universal access, seeing"
-msgid "Display"
-msgstr "Display"
+msgid "Screen Reader"
+msgstr "Screen Reader"
 
-#: ../panels/universal-access/uap.ui.h:27
+#: ../panels/universal-access/uap.ui.h:25
 msgid "Turn on or off:"
 msgstr "Turn on or off:"
 
-#: ../panels/universal-access/uap.ui.h:28
+#: ../panels/universal-access/uap.ui.h:26
+msgctxt "universal access, zoom"
+msgid "Zoom"
+msgstr "Zoom"
+
+#: ../panels/universal-access/uap.ui.h:27
 msgid "Zoom in:"
 msgstr "Zoom in:"
 
-#: ../panels/universal-access/uap.ui.h:29
+#: ../panels/universal-access/uap.ui.h:28
 msgid "Zoom out:"
 msgstr "Zoom out:"
 
-#: ../panels/universal-access/uap.ui.h:30
-msgid "Options..."
-msgstr "Optionsâ"
-
-#. Translators: this refers to screen magnifier
-#: ../panels/universal-access/uap.ui.h:32
-msgctxt "universal access, seeing"
-msgid "Zoom"
-msgstr "Zoom"
-
-#: ../panels/universal-access/uap.ui.h:33
-msgid "Screen Reader"
-msgstr "Screen Reader"
-
-#: ../panels/universal-access/uap.ui.h:34
-msgid "Beep when Caps and Num Lock are used"
-msgstr "Beep when Caps and Num Lock are used"
+#: ../panels/universal-access/uap.ui.h:29
+msgid "Large Text"
+msgstr "Large Text"
 
-#: ../panels/universal-access/uap.ui.h:35
+#: ../panels/universal-access/uap.ui.h:30
 msgid "Seeing"
 msgstr "Seeing"
 
-#: ../panels/universal-access/uap.ui.h:36
+#: ../panels/universal-access/uap.ui.h:31
+msgid "Visual Alerts"
+msgstr "Visual Alerts"
+
+#: ../panels/universal-access/uap.ui.h:32
 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:37
-msgid "_Test flash"
-msgstr "_Test flash"
-
-#: ../panels/universal-access/uap.ui.h:38
+#: ../panels/universal-access/uap.ui.h:33
 msgid "Flash the window title"
 msgstr "Flash the window title"
 
-#: ../panels/universal-access/uap.ui.h:39
+#: ../panels/universal-access/uap.ui.h:34
 msgid "Flash the entire screen"
 msgstr "Flash the entire screen"
 
-#: ../panels/universal-access/uap.ui.h:40
-msgid "Visual Alerts"
-msgstr "Visual Alerts"
+#: ../panels/universal-access/uap.ui.h:35
+msgid "Closed Captioning"
+msgstr "Closed Captioning"
 
-#: ../panels/universal-access/uap.ui.h:41
+#: ../panels/universal-access/uap.ui.h:36
 msgid "Display a textual description of speech and sounds"
 msgstr "Display a textual description of speech and sounds"
 
-#: ../panels/universal-access/uap.ui.h:42
-msgid "Closed Captioning"
-msgstr "Closed Captioning"
+#: ../panels/universal-access/uap.ui.h:37
+msgid "_Test flash"
+msgstr "_Test flash"
 
-#: ../panels/universal-access/uap.ui.h:44
+#: ../panels/universal-access/uap.ui.h:39
 msgid "Hearing"
 msgstr "Hearing"
 
-#: ../panels/universal-access/uap.ui.h:45
-msgid "Screen keyboard"
-msgstr "Screen keyboard"
-
-#: ../panels/universal-access/uap.ui.h:46
-msgid "Typing Assistant"
-msgstr "Typing Assistant"
+#: ../panels/universal-access/uap.ui.h:40
+msgid "On Screen Keyboard"
+msgstr "On Screen Keyboard"
 
-#: ../panels/universal-access/uap.ui.h:47
-msgid "_Turn on accessibility features from the keyboard"
-msgstr "_Turn on accessibility features from the keyboard"
+#: ../panels/universal-access/uap.ui.h:41
+msgid "Sticky Keys"
+msgstr "Sticky Keys"
 
-#: ../panels/universal-access/uap.ui.h:48
+#: ../panels/universal-access/uap.ui.h:42
 msgid "Treats a sequence of modifier keys as a key combination"
 msgstr "Treats a sequence of modifier keys as a key combination"
 
-#: ../panels/universal-access/uap.ui.h:49
+#: ../panels/universal-access/uap.ui.h:43
 msgid "_Disable if two keys are pressed together"
 msgstr "_Disable if two keys are pressed together"
 
-#: ../panels/universal-access/uap.ui.h:50
+#: ../panels/universal-access/uap.ui.h:44
 msgid "Beep when a _modifer key is pressed"
 msgstr "Beep when a _modifer key is pressed"
 
-#: ../panels/universal-access/uap.ui.h:51
-msgid "Sticky Keys"
-msgstr "Sticky Keys"
+#: ../panels/universal-access/uap.ui.h:45
+msgid "Slow Keys"
+msgstr "Slow Keys"
 
-#: ../panels/universal-access/uap.ui.h:52
+#: ../panels/universal-access/uap.ui.h:46
 msgid "Puts a delay between when a key is pressed and when it is accepted"
 msgstr "Puts a delay between when a key is pressed and when it is accepted"
 
-#: ../panels/universal-access/uap.ui.h:53
+#: ../panels/universal-access/uap.ui.h:47
 msgid "A_cceptance delay:"
 msgstr "A_cceptance delay:"
 
-#: ../panels/universal-access/uap.ui.h:56
+#: ../panels/universal-access/uap.ui.h:50
 msgid "Slow keys typing delay"
 msgstr "Slow keys typing delay"
 
 #. This string is part of a line of checkboxes: Beep when a key is [ ] pressed  [ ] accepted  [ ] rejected
-#: ../panels/universal-access/uap.ui.h:60
+#: ../panels/universal-access/uap.ui.h:54
 msgid "Beep when a key is"
 msgstr "Beep when a key is"
 
 #. This completes the sentence "Beep when a key is"
-#: ../panels/universal-access/uap.ui.h:62
+#: ../panels/universal-access/uap.ui.h:56
 msgid "pressed"
 msgstr "pressed"
 
 #. This completes the sentence "Beep when a key is"
-#: ../panels/universal-access/uap.ui.h:64
+#: ../panels/universal-access/uap.ui.h:58
 msgid "accepted"
 msgstr "accepted"
 
 #. This completes the sentence "Beep when a key is"
-#: ../panels/universal-access/uap.ui.h:66
+#: ../panels/universal-access/uap.ui.h:60
 msgid "rejected"
 msgstr "rejected"
 
-#: ../panels/universal-access/uap.ui.h:67
-msgid "Slow Keys"
-msgstr "Slow Keys"
+#: ../panels/universal-access/uap.ui.h:61
+msgid "Bounce Keys"
+msgstr "Bounce Keys"
 
-#: ../panels/universal-access/uap.ui.h:68
+#: ../panels/universal-access/uap.ui.h:62
 msgid "Ignores fast duplicate keypresses"
 msgstr "Ignores fast duplicate keypresses"
 
-#: ../panels/universal-access/uap.ui.h:69
+#: ../panels/universal-access/uap.ui.h:63
 msgid "Acc_eptance delay:"
 msgstr "Acc_eptance delay:"
 
-#: ../panels/universal-access/uap.ui.h:70
+#: ../panels/universal-access/uap.ui.h:64
 msgid "Bounce keys typing delay"
 msgstr "Bounce keys typing delay"
 
-#: ../panels/universal-access/uap.ui.h:71
+#: ../panels/universal-access/uap.ui.h:65
 msgid "Beep when a key is _rejected"
 msgstr "Beep when a key is _rejected"
 
-#: ../panels/universal-access/uap.ui.h:72
-msgid "Bounce Keys"
-msgstr "Bounce Keys"
+#: ../panels/universal-access/uap.ui.h:66
+msgid "Enable by Keyboard"
+msgstr "Enable by Keyboard"
 
-#: ../panels/universal-access/uap.ui.h:73
-msgid "Type here to test settings"
-msgstr "Type here to test settings"
+#: ../panels/universal-access/uap.ui.h:67
+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:76
+#: ../panels/universal-access/uap.ui.h:69
+msgid "Mouse Keys"
+msgstr "Mouse Keys"
+
+#: ../panels/universal-access/uap.ui.h:70
 msgid "Control the pointer using the keypad"
 msgstr "Control the pointer using the keypad"
 
-#: ../panels/universal-access/uap.ui.h:77
-msgid "Mouse Keys"
-msgstr "Mouse Keys"
+#: ../panels/universal-access/uap.ui.h:71
+msgid "Video Mouse"
+msgstr "Video Mouse"
 
-#: ../panels/universal-access/uap.ui.h:78
+#: ../panels/universal-access/uap.ui.h:72
 msgid "Control the pointer using the video camera."
 msgstr "Control the pointer using the video camera."
 
-#: ../panels/universal-access/uap.ui.h:79
-msgid "Video Mouse"
-msgstr "Video Mouse"
+#: ../panels/universal-access/uap.ui.h:73
+msgid "Simulated Secondary Click"
+msgstr "Simulated Secondary Click"
 
-#: ../panels/universal-access/uap.ui.h:80
+#: ../panels/universal-access/uap.ui.h:74
 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:81
+#: ../panels/universal-access/uap.ui.h:75
 msgid "Secondary click delay"
 msgstr "Secondary click delay"
 
-#: ../panels/universal-access/uap.ui.h:82
-msgid "Simulated Secondary Click"
-msgstr "Simulated Secondary Click"
+#: ../panels/universal-access/uap.ui.h:76
+msgid "Hover Click"
+msgstr "Hover Click"
 
-#: ../panels/universal-access/uap.ui.h:83
+#: ../panels/universal-access/uap.ui.h:77
 msgid "Trigger a click when the pointer hovers"
 msgstr "Trigger a click when the pointer hovers"
 
-#: ../panels/universal-access/uap.ui.h:84
+#: ../panels/universal-access/uap.ui.h:78
 msgid "D_elay:"
 msgstr "D_elay:"
 
-#: ../panels/universal-access/uap.ui.h:85
+#: ../panels/universal-access/uap.ui.h:79
 msgid "Motion _threshold:"
 msgstr "Motion _threshold:"
 
-#: ../panels/universal-access/uap.ui.h:90
-msgid "Hover Click"
-msgstr "Hover Click"
+#. small threshold
+#: ../panels/universal-access/uap.ui.h:81
+msgid "Small"
+msgstr "Small"
+
+#. large threshold
+#: ../panels/universal-access/uap.ui.h:83
+msgid "Large"
+msgstr "Large"
 
-#: ../panels/universal-access/uap.ui.h:91
+#: ../panels/universal-access/uap.ui.h:84
 msgid "Mouse Settings"
 msgstr "Mouse Settings"
 
-#: ../panels/universal-access/uap.ui.h:92
+#: ../panels/universal-access/uap.ui.h:85
 msgid "Pointing and Clicking"
 msgstr "Pointing and Clicking"
 
-#: ../panels/universal-access/uap.ui.h:93
-msgctxt "universal access, contrast"
-msgid "Low"
-msgstr "Low"
+#: ../panels/universal-access/zoom-options.c:357
+msgctxt "Distance"
+msgid "Short"
+msgstr "Short"
 
-#: ../panels/universal-access/uap.ui.h:94
-msgctxt "universal access, contrast"
-msgid "Normal"
-msgstr "Normal"
+#: ../panels/universal-access/zoom-options.c:358
+msgctxt "Distance"
+msgid "Â Screen"
+msgstr "Â Screen"
 
-#: ../panels/universal-access/uap.ui.h:95
-msgctxt "universal access, contrast"
-msgid "High"
-msgstr "High"
+#: ../panels/universal-access/zoom-options.c:359
+msgctxt "Distance"
+msgid "Â Screen"
+msgstr "Â Screen"
 
-#: ../panels/universal-access/uap.ui.h:96
-msgctxt "universal access, contrast"
-msgid "High/Inverse"
-msgstr "High/Inverse"
+#: ../panels/universal-access/zoom-options.c:360
+msgctxt "Distance"
+msgid "Â Screen"
+msgstr "Â Screen"
 
-#: ../panels/universal-access/zoom-options.c:334
-msgid "1/4 Screen"
-msgstr "1/4 Screen"
+#: ../panels/universal-access/zoom-options.c:361
+msgctxt "Distance"
+msgid "Long"
+msgstr "Long"
 
-#: ../panels/universal-access/zoom-options.c:335
-msgid "1/2 Screen"
-msgstr "1/2 Screen"
+#: ../panels/universal-access/zoom-options.ui.h:1
+msgid "Full Screen"
+msgstr "Full Screen"
 
-#: ../panels/universal-access/zoom-options.c:336
-msgid "3/4 Screen"
-msgstr "3/4 Screen"
+#: ../panels/universal-access/zoom-options.ui.h:2
+msgid "Top Half"
+msgstr "Top Half"
 
-#: ../panels/universal-access/zoom-options.ui.h:1
+#: ../panels/universal-access/zoom-options.ui.h:3
+msgid "Bottom Half"
+msgstr "Bottom Half"
+
+#: ../panels/universal-access/zoom-options.ui.h:4
+msgid "Left Half"
+msgstr "Left Half"
+
+#: ../panels/universal-access/zoom-options.ui.h:5
+msgid "Right Half"
+msgstr "Right Half"
+
+#: ../panels/universal-access/zoom-options.ui.h:6
 msgid "Zoom Options"
 msgstr "Zoom Options"
 
-#: ../panels/universal-access/zoom-options.ui.h:2
+#: ../panels/universal-access/zoom-options.ui.h:7
+msgid "Zoom"
+msgstr "Zoom"
+
+#: ../panels/universal-access/zoom-options.ui.h:8
 msgid "Magnification:"
 msgstr "Magnification:"
 
-#: ../panels/universal-access/zoom-options.ui.h:3
+#: ../panels/universal-access/zoom-options.ui.h:9
 msgid "Follow mouse cursor"
 msgstr "Follow mouse cursor"
 
-#: ../panels/universal-access/zoom-options.ui.h:4
+#: ../panels/universal-access/zoom-options.ui.h:10
 msgid "Screen part:"
 msgstr "Screen part:"
 
-#: ../panels/universal-access/zoom-options.ui.h:5
+#: ../panels/universal-access/zoom-options.ui.h:11
 msgid "Magnifier extends outside of screen"
 msgstr "Magnifier extends outside of screen"
 
-#: ../panels/universal-access/zoom-options.ui.h:6
+#: ../panels/universal-access/zoom-options.ui.h:12
 msgid "Keep magnifier cursor centered"
 msgstr "Keep magnifier cursor centred"
 
-#: ../panels/universal-access/zoom-options.ui.h:7
+#: ../panels/universal-access/zoom-options.ui.h:13
 msgid "Magnifier cursor pushes contents around"
 msgstr "Magnifier cursor pushes contents around"
 
-#: ../panels/universal-access/zoom-options.ui.h:8
+#: ../panels/universal-access/zoom-options.ui.h:14
 msgid "Magnifier cursor moves with contents"
 msgstr "Magnifier cursor moves with contents"
 
-#: ../panels/universal-access/zoom-options.ui.h:9
+#: ../panels/universal-access/zoom-options.ui.h:15
 msgid "Magnifier Position:"
 msgstr "Magnifier Position:"
 
-#: ../panels/universal-access/zoom-options.ui.h:10
+#: ../panels/universal-access/zoom-options.ui.h:16
+msgid "Magnifier"
+msgstr "Magnifier"
+
+#: ../panels/universal-access/zoom-options.ui.h:17
 msgid "Thickness:"
 msgstr "Thickness:"
 
 #. short delay
-#: ../panels/universal-access/zoom-options.ui.h:12
+#: ../panels/universal-access/zoom-options.ui.h:19
 msgid "Thin"
 msgstr "Thin"
 
 #. long delay
-#: ../panels/universal-access/zoom-options.ui.h:14
+#: ../panels/universal-access/zoom-options.ui.h:21
 msgid "Thick"
 msgstr "Thick"
 
-#: ../panels/universal-access/zoom-options.ui.h:15
+#: ../panels/universal-access/zoom-options.ui.h:22
 msgid "Length:"
 msgstr "Length:"
 
-#: ../panels/universal-access/zoom-options.ui.h:16
+#: ../panels/universal-access/zoom-options.ui.h:23
 msgid "Color:"
 msgstr "Colour:"
 
-#: ../panels/universal-access/zoom-options.ui.h:17
+#: ../panels/universal-access/zoom-options.ui.h:24
 msgid "Crosshairs:"
 msgstr "Crosshairs:"
 
-#: ../panels/universal-access/zoom-options.ui.h:18
+#: ../panels/universal-access/zoom-options.ui.h:25
 msgid "Overlaps mouse cursor"
 msgstr "Overlaps mouse cursor"
 
-#: ../panels/universal-access/zoom-options.ui.h:19
-msgid "Full Screen"
-msgstr "Full Screen"
+#: ../panels/universal-access/zoom-options.ui.h:26
+msgid "Crosshairs"
+msgstr "Crosshairs"
 
-#: ../panels/universal-access/zoom-options.ui.h:20
-msgid "Top Half"
-msgstr "Top Half"
+#: ../panels/universal-access/zoom-options.ui.h:27
+msgid "White on black:"
+msgstr "White on black:"
 
-#: ../panels/universal-access/zoom-options.ui.h:21
-msgid "Bottom Half"
-msgstr "Bottom Half"
+#: ../panels/universal-access/zoom-options.ui.h:28
+msgid "Brightness:"
+msgstr "Brightness:"
 
-#: ../panels/universal-access/zoom-options.ui.h:22
-msgid "Left Half"
-msgstr "Left Half"
+#: ../panels/universal-access/zoom-options.ui.h:29
+msgid "Contrast:"
+msgstr "Contrast:"
 
-#: ../panels/universal-access/zoom-options.ui.h:23
-msgid "Right Half"
-msgstr "Right Half"
+#: ../panels/universal-access/zoom-options.ui.h:30
+msgctxt "Zoom Grayscale"
+msgid "Color"
+msgstr "Colour"
+
+#: ../panels/universal-access/zoom-options.ui.h:31
+msgctxt "Zoom Grayscale"
+msgid "None"
+msgstr "None"
+
+#: ../panels/universal-access/zoom-options.ui.h:32
+msgctxt "Zoom Grayscale"
+msgid "Full"
+msgstr "Full"
+
+#. short delay
+#: ../panels/universal-access/zoom-options.ui.h:34
+msgid "Low"
+msgstr "Low"
+
+#. long delay
+#: ../panels/universal-access/zoom-options.ui.h:36
+msgid "High"
+msgstr "High"
+
+#: ../panels/universal-access/zoom-options.ui.h:37
+msgid "Color Effects:"
+msgstr "Colour Effects:"
+
+#: ../panels/universal-access/zoom-options.ui.h:38
+msgid "Color Effects"
+msgstr "Colour Effects"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:1
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1
@@ -3739,24 +4261,72 @@ msgid "Administrator"
 msgstr "Administrator"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:3
-msgid "_Username"
-msgstr "_Username"
+msgid "Add account"
+msgstr "Add account"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:4
-msgid "Create new account"
-msgstr "Create new account"
+msgid "_Local Account"
+msgstr "_Local Account"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:5
-msgid "_Full name"
-msgstr "_Full name"
+msgid "_Enterprise Login"
+msgstr "_Enterprise Login"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:6
-msgid "_Account Type"
-msgstr "_Account Type"
+msgid "_Username"
+msgstr "_Username"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:7
-msgid "Cr_eate"
-msgstr "Cr_eate"
+msgid "_Full name"
+msgstr "_Full name"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:8
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
+msgid "Account _Type"
+msgstr "Account _Type"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:9
+msgid "_Domain"
+msgstr "_Domain"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:10
+msgid "_Login Name"
+msgstr "_Login Name"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:11
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
+msgid "_Password"
+msgstr "_Password"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:12
+msgid "Tip: Enterprise domain or realm name"
+msgstr "Tip: Enterprise domain or realm name"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:13
+msgid "C_ontinue"
+msgstr "C_ontinue"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:14
+msgid "Domain Administrator Login"
+msgstr "Domain Administrator Login"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:15
+msgid ""
+"In order to use enterpise logins, this computer needs to be\n"
+"enrolled in the domain. Please have your network administrator\n"
+"type their domain password here."
+msgstr ""
+"In order to use enterpise logins, this computer needs to be\n"
+"enrolled in the domain. Please have your network administrator\n"
+"type their domain password here."
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:18
+msgid "Administrator _Name"
+msgstr "Administrator _Name"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:19
+msgid "Administrator Password"
+msgstr "Administrator Password"
 
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:1
 msgid "Left thumb"
@@ -3869,8 +4439,8 @@ msgid "_New password"
 msgstr "_New password"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:10
-msgid "Choose a generated password"
-msgstr "Choose a generated password"
+msgid "Generate a password"
+msgstr "Generate a password"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:11
 msgid "Fair"
@@ -3914,6 +4484,11 @@ msgstr ""
 msgid "Gallery"
 msgstr "Gallery"
 
+#: ../panels/user-accounts/data/photo-dialog.ui.h:4
+#: ../panels/user-accounts/um-photo-dialog.c:218
+msgid "Browse for more pictures"
+msgstr "Browse for more pictures"
+
 #: ../panels/user-accounts/data/photo-dialog.ui.h:5
 msgid "Take a photograph"
 msgstr "Take a photograph"
@@ -3926,15 +4501,6 @@ msgstr "Browse"
 msgid "Photograph"
 msgstr "Photograph"
 
-#: ../panels/user-accounts/data/photo-dialog.ui.h:8
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../panels/user-accounts/data/photo-dialog.ui.h:9
-#: ../panels/user-accounts/um-photo-dialog.c:98
-msgid "Select"
-msgstr "Select"
-
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
 msgid "Account Information"
 msgstr "Account Information"
@@ -3947,18 +4513,10 @@ msgstr "Add User Account"
 msgid "Remove User Account"
 msgstr "Remove User Account"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
-msgid "Account _type"
-msgstr "Account _type"
-
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
 msgid "Login Options"
 msgstr "Login Options"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
-msgid "_Password"
-msgstr "_Password"
-
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
 msgid "A_utomatic Login"
 msgstr "A_utomatic Login"
@@ -3975,59 +4533,119 @@ msgstr "User Icon"
 msgid "_Language"
 msgstr "_Language"
 
-#: ../panels/user-accounts/run-passwd.c:426
+#: ../panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in.h:1
+msgid "Manage user accounts"
+msgstr "Manage user accounts"
+
+#: ../panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in.h:2
+msgid "Authentication is required to change user data"
+msgstr "Authentication is required to change user data"
+
+#: ../panels/user-accounts/pw-utils.c:94
+#: ../panels/user-accounts/um-password-dialog.c:569
+msgctxt "Password strength"
+msgid "Too short"
+msgstr "Too short"
+
+#: ../panels/user-accounts/pw-utils.c:99
+msgctxt "Password strength"
+msgid "Not good enough"
+msgstr "Not good enough"
+
+#: ../panels/user-accounts/pw-utils.c:108
+#: ../panels/user-accounts/um-password-dialog.c:570
+msgctxt "Password strength"
+msgid "Weak"
+msgstr "Weak"
+
+#: ../panels/user-accounts/pw-utils.c:111
+#: ../panels/user-accounts/um-password-dialog.c:571
+msgctxt "Password strength"
+msgid "Fair"
+msgstr "Fair"
+
+#: ../panels/user-accounts/pw-utils.c:114
+#: ../panels/user-accounts/um-password-dialog.c:572
+msgctxt "Password strength"
+msgid "Good"
+msgstr "Good"
+
+#: ../panels/user-accounts/pw-utils.c:117
+#: ../panels/user-accounts/um-password-dialog.c:573
+msgctxt "Password strength"
+msgid "Strong"
+msgstr "Strong"
+
+#: ../panels/user-accounts/run-passwd.c:424
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
-#: ../panels/user-accounts/run-passwd.c:506
-#: ../panels/user-accounts/um-password-dialog.c:375
+#: ../panels/user-accounts/run-passwd.c:504
+#: ../panels/user-accounts/um-password-dialog.c:239
 #, c-format
 msgid "The new password is too short"
 msgstr "The new password is too short"
 
-#: ../panels/user-accounts/run-passwd.c:512
+#: ../panels/user-accounts/run-passwd.c:510
 #, c-format
 msgid "The new password is too simple"
 msgstr "The new password is too simple"
 
-#: ../panels/user-accounts/run-passwd.c:518
+#: ../panels/user-accounts/run-passwd.c:516
 #, c-format
 msgid "The old and new passwords are too similar"
 msgstr "The old and new passwords are too similar"
 
-#: ../panels/user-accounts/run-passwd.c:521
+#: ../panels/user-accounts/run-passwd.c:519
 #, c-format
 msgid "The new password has already been used recently."
 msgstr "The new password has already been used recently."
 
-#: ../panels/user-accounts/run-passwd.c:524
+#: ../panels/user-accounts/run-passwd.c:522
 #, c-format
 msgid "The new password must contain numeric or special characters"
 msgstr "The new password must contain numeric or special characters"
 
-#: ../panels/user-accounts/run-passwd.c:528
+#: ../panels/user-accounts/run-passwd.c:526
 #, c-format
 msgid "The old and new passwords are the same"
 msgstr "The old and new passwords are the same"
 
-#: ../panels/user-accounts/run-passwd.c:532
+#: ../panels/user-accounts/run-passwd.c:530
 #, c-format
 msgid "Your password has been changed since you initially authenticated!"
 msgstr "Your password has been changed since you initially authenticated!"
 
-#: ../panels/user-accounts/run-passwd.c:536
+#: ../panels/user-accounts/run-passwd.c:534
 #, c-format
 msgid "The new password does not contain enough different characters"
 msgstr "The new password does not contain enough different characters"
 
-#: ../panels/user-accounts/run-passwd.c:540
+#: ../panels/user-accounts/run-passwd.c:538
 #, c-format
 msgid "Unknown error"
 msgstr "Unknown error"
 
-#: ../panels/user-accounts/um-account-dialog.c:73
-msgid "Failed to create user"
-msgstr "Failed to create user"
+#: ../panels/user-accounts/um-account-dialog.c:175
+msgid "Failed to add account"
+msgstr "Failed to add account"
+
+#: ../panels/user-accounts/um-account-dialog.c:366
+#: ../panels/user-accounts/um-account-dialog.c:405
+msgid "Failed to register account"
+msgstr "Failed to register account"
+
+#: ../panels/user-accounts/um-account-dialog.c:530
+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:582
+msgid "Failed to join domain"
+msgstr "Failed to join domain"
+
+#: ../panels/user-accounts/um-account-dialog.c:635
+msgid "Failed to log into domain"
+msgstr "Failed to log into domain"
 
 #: ../panels/user-accounts/um-fingerprint-dialog.c:139
 msgid ""
@@ -4119,77 +4737,47 @@ msgstr "Enrolling fingerprints"
 msgid "Summary"
 msgstr "Summary"
 
-#: ../panels/user-accounts/um-password-dialog.c:179
-msgid "More choices..."
-msgstr "More choicesâ"
+#: ../panels/user-accounts/um-password-dialog.c:96
+msgid "_Generate a password"
+msgstr "_Generate a password"
 
-#: ../panels/user-accounts/um-password-dialog.c:285
+#: ../panels/user-accounts/um-password-dialog.c:150
 msgid "Please choose another password."
 msgstr "Please choose another password."
 
-#: ../panels/user-accounts/um-password-dialog.c:294
+#: ../panels/user-accounts/um-password-dialog.c:159
 msgid "Please type your current password again."
 msgstr "Please type your current password again."
 
-#: ../panels/user-accounts/um-password-dialog.c:300
+#: ../panels/user-accounts/um-password-dialog.c:165
 msgid "Password could not be changed"
 msgstr "Password could not be changed"
 
-#: ../panels/user-accounts/um-password-dialog.c:372
+#: ../panels/user-accounts/um-password-dialog.c:236
 msgid "You need to enter a new password"
 msgstr "You need to enter a new password"
 
-#: ../panels/user-accounts/um-password-dialog.c:381
+#: ../panels/user-accounts/um-password-dialog.c:245
 msgid "You need to confirm the password"
 msgstr "You need to confirm the password"
 
-#: ../panels/user-accounts/um-password-dialog.c:384
+#: ../panels/user-accounts/um-password-dialog.c:248
 msgid "The passwords do not match"
 msgstr "The passwords do not match"
 
-#: ../panels/user-accounts/um-password-dialog.c:390
+#: ../panels/user-accounts/um-password-dialog.c:254
 msgid "You need to enter your current password"
 msgstr "You need to enter your current password"
 
-#: ../panels/user-accounts/um-password-dialog.c:393
+#: ../panels/user-accounts/um-password-dialog.c:257
 msgid "The current password is not correct"
 msgstr "The current password is not correct"
 
-#: ../panels/user-accounts/um-password-dialog.c:466
-#: ../panels/user-accounts/um-password-dialog.c:693
-msgctxt "Password strength"
-msgid "Too short"
-msgstr "Too short"
-
-#: ../panels/user-accounts/um-password-dialog.c:469
-#: ../panels/user-accounts/um-password-dialog.c:694
-msgctxt "Password strength"
-msgid "Weak"
-msgstr "Weak"
-
-#: ../panels/user-accounts/um-password-dialog.c:471
-#: ../panels/user-accounts/um-password-dialog.c:695
-msgctxt "Password strength"
-msgid "Fair"
-msgstr "Fair"
-
-#: ../panels/user-accounts/um-password-dialog.c:473
-#: ../panels/user-accounts/um-password-dialog.c:696
-msgctxt "Password strength"
-msgid "Good"
-msgstr "Good"
-
-#: ../panels/user-accounts/um-password-dialog.c:475
-#: ../panels/user-accounts/um-password-dialog.c:697
-msgctxt "Password strength"
-msgid "Strong"
-msgstr "Strong"
-
-#: ../panels/user-accounts/um-password-dialog.c:514
+#: ../panels/user-accounts/um-password-dialog.c:347
 msgid "Passwords do not match"
 msgstr "Passwords do not match"
 
-#: ../panels/user-accounts/um-password-dialog.c:540
+#: ../panels/user-accounts/um-password-dialog.c:409
 msgid "Wrong password"
 msgstr "Wrong password"
 
@@ -4210,29 +4798,53 @@ msgstr "Browse for more picturesâ"
 msgid "Used by %s"
 msgstr "Used by %s"
 
-#: ../panels/user-accounts/um-user-manager.c:463
+#: ../panels/user-accounts/um-realm-manager.c:368
+#, c-format
+msgid "No such domain or realm found"
+msgstr "No such domain or realm found"
+
+#: ../panels/user-accounts/um-realm-manager.c:743
+#, c-format
+msgid "Cannot log in as %s at the %s domain"
+msgstr "Cannot log in as %s at the %s domain"
+
+#: ../panels/user-accounts/um-realm-manager.c:748
+msgid "Invalid password, please try again"
+msgstr "Invalid password, please try again"
+
+#: ../panels/user-accounts/um-realm-manager.c:752
+#, c-format
+msgid "Couldn't connect to the %s domain: %s"
+msgstr "Couldn't connect to the %s domain: %s"
+
+#: ../panels/user-accounts/um-user-manager.c:466
 #, c-format
 msgid "A user with name '%s' already exists."
 msgstr "A user with name '%s' already exists."
 
-#: ../panels/user-accounts/um-user-manager.c:569
+#: ../panels/user-accounts/um-user-manager.c:473
+#, c-format
+msgid "No user with the name '%s' exists."
+msgstr "No user with the name '%s' exists."
+
+#: ../panels/user-accounts/um-user-manager.c:631
 msgid "This user does not exist."
 msgstr "This user does not exist."
 
-#: ../panels/user-accounts/um-user-panel.c:355
+#: ../panels/user-accounts/um-user-panel.c:371
 msgid "Failed to delete user"
 msgstr "Failed to delete user"
 
-#: ../panels/user-accounts/um-user-panel.c:415
+#: ../panels/user-accounts/um-user-panel.c:431
 msgid "You cannot delete your own account."
 msgstr "You cannot delete your own account."
 
-#: ../panels/user-accounts/um-user-panel.c:424
+#: ../panels/user-accounts/um-user-panel.c:440
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s is still logged in"
 
-#: ../panels/user-accounts/um-user-panel.c:428
+#: ../panels/user-accounts/um-user-panel.c:444
 msgid ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
@@ -4240,12 +4852,12 @@ msgstr ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
 
-#: ../panels/user-accounts/um-user-panel.c:437
+#: ../panels/user-accounts/um-user-panel.c:453
 #, c-format
 msgid "Do you want to keep %s's files?"
 msgstr "Do you want to keep %s's files?"
 
-#: ../panels/user-accounts/um-user-panel.c:441
+#: ../panels/user-accounts/um-user-panel.c:457
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
@@ -4253,38 +4865,38 @@ 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:444
+#: ../panels/user-accounts/um-user-panel.c:460
 msgid "_Delete Files"
 msgstr "_Delete Files"
 
-#: ../panels/user-accounts/um-user-panel.c:445
+#: ../panels/user-accounts/um-user-panel.c:461
 msgid "_Keep Files"
 msgstr "_Keep Files"
 
-#: ../panels/user-accounts/um-user-panel.c:497
+#: ../panels/user-accounts/um-user-panel.c:513
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "Account disabled"
 
-#: ../panels/user-accounts/um-user-panel.c:505
+#: ../panels/user-accounts/um-user-panel.c:521
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "To be set at next login"
 
-#: ../panels/user-accounts/um-user-panel.c:508
+#: ../panels/user-accounts/um-user-panel.c:524
 msgctxt "Password mode"
 msgid "None"
 msgstr "None"
 
-#: ../panels/user-accounts/um-user-panel.c:843
+#: ../panels/user-accounts/um-user-panel.c:869
 msgid "Failed to contact the accounts service"
 msgstr "Failed to contact the accounts service"
 
-#: ../panels/user-accounts/um-user-panel.c:845
+#: ../panels/user-accounts/um-user-panel.c:871
 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:885
+#: ../panels/user-accounts/um-user-panel.c:911
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -4292,12 +4904,12 @@ msgstr ""
 "To make changes,\n"
 "click the * icon first"
 
-#: ../panels/user-accounts/um-user-panel.c:923
+#: ../panels/user-accounts/um-user-panel.c:949
 msgid "Create a user account"
 msgstr "Create a user account"
 
-#: ../panels/user-accounts/um-user-panel.c:934
-#: ../panels/user-accounts/um-user-panel.c:1221
+#: ../panels/user-accounts/um-user-panel.c:960
+#: ../panels/user-accounts/um-user-panel.c:1271
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -4305,12 +4917,12 @@ msgstr ""
 "To create a user account,\n"
 "click the * icon first"
 
-#: ../panels/user-accounts/um-user-panel.c:943
+#: ../panels/user-accounts/um-user-panel.c:969
 msgid "Delete the selected user account"
 msgstr "Delete the selected user account"
 
-#: ../panels/user-accounts/um-user-panel.c:955
-#: ../panels/user-accounts/um-user-panel.c:1226
+#: ../panels/user-accounts/um-user-panel.c:981
+#: ../panels/user-accounts/um-user-panel.c:1276
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -4318,11 +4930,11 @@ msgstr ""
 "To delete the selected user account,\n"
 "click the * icon first"
 
-#: ../panels/user-accounts/um-user-panel.c:1132
+#: ../panels/user-accounts/um-user-panel.c:1174
 msgid "My Account"
 msgstr "My Account"
 
-#: ../panels/user-accounts/um-user-panel.c:1142
+#: ../panels/user-accounts/um-user-panel.c:1184
 msgid "Other Accounts"
 msgstr "Other Accounts"
 
@@ -4352,9 +4964,94 @@ msgstr ""
 " â digits\n"
 " â any of the characters '.', '-' and '_'"
 
+#: ../panels/wacom/button-mapping.ui.h:1
+msgid "Map Buttons"
+msgstr "Map Buttons"
+
+#: ../panels/wacom/button-mapping.ui.h:2
+msgid "Map buttons to functions"
+msgstr "Map buttons to functions"
+
+#. Text printed on screen
+#: ../panels/wacom/calibrator/gui_gtk.c:78
+msgid "Screen Calibration"
+msgstr "Screen Calibration"
+
+#: ../panels/wacom/calibrator/gui_gtk.c:79
+msgid ""
+"Please tap the target markers as they appear on screen to calibrate the "
+"tablet."
+msgstr ""
+"Please tap the target markers as they appear on screen to calibrate the "
+"tablet."
+
+#: ../panels/wacom/calibrator/gui_gtk.c:368
+msgid "Mis-click detected, restarting..."
+msgstr "Mis-click detected, restartingâ"
+
+#: ../panels/wacom/cc-wacom-mapping-panel.c:275
+msgid "Output:"
+msgstr "Output:"
+
+#. Keep ratio switch
+#: ../panels/wacom/cc-wacom-mapping-panel.c:287
+msgid "Keep aspect ratio (letterbox):"
+msgstr "Keep aspect ratio (letterbox):"
+
+#. Whole-desktop checkbox
+#: ../panels/wacom/cc-wacom-mapping-panel.c:298
+msgid "Map to single monitor"
+msgstr "Map to single monitor"
+
+#: ../panels/wacom/cc-wacom-nav-button.c:89
+#, c-format
+msgid "%d of %d"
+msgstr "%d of %d"
+
+#: ../panels/wacom/cc-wacom-page.c:118 ../panels/wacom/cc-wacom-page.c:371
+msgctxt "Wacom action-type"
+msgid "None"
+msgstr "None"
+
+#: ../panels/wacom/cc-wacom-page.c:119
+msgctxt "Wacom action-type"
+msgid "Send Keystroke"
+msgstr "Send Keystroke"
+
+#: ../panels/wacom/cc-wacom-page.c:120
+msgctxt "Wacom action-type"
+msgid "Switch Monitor"
+msgstr "Switch Monitor"
+
+#: ../panels/wacom/cc-wacom-page.c:601
+msgid "Up"
+msgstr "Up"
+
+#: ../panels/wacom/cc-wacom-page.c:601
+msgid "Down"
+msgstr "Down"
+
+#: ../panels/wacom/cc-wacom-page.c:638
+msgid "Switch Modes"
+msgstr "Switch Modes"
+
+#: ../panels/wacom/cc-wacom-page.c:724
+#: ../panels/wacom/cc-wacom-stylus-page.c:376
+msgid "Button"
+msgstr "Button"
+
+#: ../panels/wacom/cc-wacom-page.c:777
+msgid "Action"
+msgstr "Action"
+
+#: ../panels/wacom/cc-wacom-page.c:886
+msgid "Display Mapping"
+msgstr "Display Mapping"
+
 #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1
-msgid "Wacom Graphics Tablet"
-msgstr "Wacom Graphics Tablet"
+#: ../panels/wacom/gnome-wacom-properties.ui.h:7
+msgid "Wacom Tablet"
+msgstr "Wacom Tablet"
 
 #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2
 msgid "Set your Wacom tablet preferences"
@@ -4389,33 +5086,94 @@ msgstr "Please plug in or turn on your Wacom tablet"
 msgid "Bluetooth Settings"
 msgstr "Bluetooth Settings"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:7
-msgid "Wacom Tablet"
-msgstr "Wacom Tablet"
+#: ../panels/wacom/gnome-wacom-properties.ui.h:8
+msgid "Map to Monitor..."
+msgstr "Map to Monitorâ"
+
+#: ../panels/wacom/gnome-wacom-properties.ui.h:9
+msgid "Map Buttons..."
+msgstr "Map Buttonsâ"
+
+#: ../panels/wacom/gnome-wacom-properties.ui.h:10
+msgid "Calibrate..."
+msgstr "Calibrateâ"
+
+#: ../panels/wacom/gnome-wacom-properties.ui.h:11
+msgid "Adjust display resolution"
+msgstr "Adjust display resolution"
+
+#: ../panels/wacom/gnome-wacom-properties.ui.h:12
+msgid "Tracking Mode"
+msgstr "Tracking Mode"
+
+#: ../panels/wacom/gnome-wacom-properties.ui.h:13
+msgid "Left-Handed Orientation"
+msgstr "Left-Handed Orientation"
+
+#: ../panels/wacom/gsd-wacom-device.c:1010
+#, c-format
+msgid "Left Ring Mode #%d"
+msgstr "Left Ring Mode #%d"
+
+#: ../panels/wacom/gsd-wacom-device.c:1019
+#, c-format
+msgid "Right Ring Mode #%d"
+msgstr "Right Ring Mode #%d"
+
+#: ../panels/wacom/gsd-wacom-device.c:1049
+#, c-format
+msgid "Left Touchstrip Mode #%d"
+msgstr "Left Touchstrip Mode #%d"
+
+#: ../panels/wacom/gsd-wacom-device.c:1058
+#, c-format
+msgid "Right Touchstrip Mode #%d"
+msgstr "Right Touchstrip Mode #%d"
+
+#: ../panels/wacom/gsd-wacom-device.c:1075
+#, c-format
+msgid "Left Touchring Mode Switch"
+msgstr "Left Touchring Mode Switch"
+
+#: ../panels/wacom/gsd-wacom-device.c:1077
+#, c-format
+msgid "Right Touchring Mode Switch"
+msgstr "Right Touchring Mode Switch"
+
+#: ../panels/wacom/gsd-wacom-device.c:1080
+#, c-format
+msgid "Left Touchstrip Mode Switch"
+msgstr "Left Touchstrip Mode Switch"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:8
-msgid "Map to Monitor..."
-msgstr "Map to Monitorâ"
+#: ../panels/wacom/gsd-wacom-device.c:1082
+#, c-format
+msgid "Right Touchstrip Mode Switch"
+msgstr "Right Touchstrip Mode Switch"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:9
-msgid "Map Buttons..."
-msgstr "Map Buttonsâ"
+#: ../panels/wacom/gsd-wacom-device.c:1087
+#, c-format
+msgid "Mode Switch #%d"
+msgstr "Mode Switch #%d"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:10
-msgid "Calibrate..."
-msgstr "Calibrateâ"
+#: ../panels/wacom/gsd-wacom-device.c:1159
+#, c-format
+msgid "Left Button #%d"
+msgstr "Left Button #%d"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:11
-msgid "Adjust display resolution"
-msgstr "Adjust display resolution"
+#: ../panels/wacom/gsd-wacom-device.c:1162
+#, c-format
+msgid "Right Button #%d"
+msgstr "Right Button #%d"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:12
-msgid "Tracking Mode"
-msgstr "Tracking Mode"
+#: ../panels/wacom/gsd-wacom-device.c:1165
+#, c-format
+msgid "Top Button #%d"
+msgstr "Top Button #%d"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:13
-msgid "Left-Handed Orientation"
-msgstr "Left-Handed Orientation"
+#: ../panels/wacom/gsd-wacom-device.c:1168
+#, c-format
+msgid "Bottom Button #%d"
+msgstr "Bottom Button #%d"
 
 #: ../panels/wacom/wacom-stylus-page.ui.h:1
 msgid "No Action"
@@ -4485,122 +5243,6 @@ msgstr "Lower Button"
 msgid "Tip Pressure Feel"
 msgstr "Tip Pressure Feel"
 
-#: ../panels/wacom/button-mapping.ui.h:1
-msgid "Map Buttons"
-msgstr "Map Buttons"
-
-#: ../panels/wacom/button-mapping.ui.h:2
-msgid "Map buttons to functions"
-msgstr "Map buttons to functions"
-
-#: ../panels/wacom/gsd-wacom-device.c:909
-#, c-format
-msgid "Left Ring Mode #%d"
-msgstr "Left Ring Mode #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:916
-#, c-format
-msgid "Right Ring Mode #%d"
-msgstr "Right Ring Mode #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:944
-#, c-format
-msgid "Left Touchstrip Mode #%d"
-msgstr "Left Touchstrip Mode #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:951
-#, c-format
-msgid "Right Touchstrip Mode #%d"
-msgstr "Right Touchstrip Mode #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:966
-#, c-format
-msgid "Left Touchring Mode Switch"
-msgstr "Left Touchring Mode Switch"
-
-#: ../panels/wacom/gsd-wacom-device.c:968
-#, c-format
-msgid "Right Touchring Mode Switch"
-msgstr "Right Touchring Mode Switch"
-
-#: ../panels/wacom/gsd-wacom-device.c:971
-#, c-format
-msgid "Left Touchstrip Mode Switch"
-msgstr "Left Touchstrip Mode Switch"
-
-#: ../panels/wacom/gsd-wacom-device.c:973
-#, c-format
-msgid "Right Touchstrip Mode Switch"
-msgstr "Right Touchstrip Mode Switch"
-
-#: ../panels/wacom/gsd-wacom-device.c:978
-#, c-format
-msgid "Mode Switch #%d"
-msgstr "Mode Switch #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:1050
-#, c-format
-msgid "Left Button #%d"
-msgstr "Left Button #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:1053
-#, c-format
-msgid "Right Button #%d"
-msgstr "Right Button #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:1056
-#, c-format
-msgid "Top Button #%d"
-msgstr "Top Button #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:1059
-#, c-format
-msgid "Bottom Button #%d"
-msgstr "Bottom Button #%d"
-
-#. Text printed on screen
-#: ../panels/wacom/calibrator/gui_gtk.c:70
-msgid "Screen Calibration"
-msgstr "Screen Calibration"
-
-#: ../panels/wacom/calibrator/gui_gtk.c:71
-msgid ""
-"Please tap the target markers as they appear on screen to calibrate the "
-"tablet."
-msgstr ""
-"Please tap the target markers as they appear on screen to calibrate the "
-"tablet."
-
-#: ../panels/wacom/calibrator/gui_gtk.c:271
-msgid "Mis-click detected, restarting..."
-msgstr "Mis-click detected, restartingâ"
-
-#: ../panels/wacom/cc-wacom-nav-button.c:89
-#, c-format
-msgid "%d of %d"
-msgstr "%d of %d"
-
-#: ../panels/wacom/cc-wacom-stylus-page.c:376
-#: ../panels/wacom/cc-wacom-page.c:561
-msgid "Button"
-msgstr "Button"
-
-#: ../panels/wacom/cc-wacom-page.c:279
-msgid "Switch Modes"
-msgstr "Switch Modes"
-
-#: ../panels/wacom/cc-wacom-page.c:526
-msgid "Up"
-msgstr "Up"
-
-#: ../panels/wacom/cc-wacom-page.c:526
-msgid "Down"
-msgstr "Down"
-
-#: ../panels/wacom/cc-wacom-page.c:681
-msgid "Display Mapping"
-msgstr "Display Mapping"
-
 #: ../shell/control-center.c:58
 msgid "Enable verbose mode"
 msgstr "Enable verbose mode"
@@ -4631,6 +5273,14 @@ msgstr ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 
+#: ../shell/control-center.c:211
+msgid "Help"
+msgstr "Help"
+
+#: ../shell/control-center.c:212
+msgid "Quit"
+msgstr "Quit"
+
 #: ../shell/gnomecc.directory.in.h:1
 msgid "Control Center"
 msgstr "Control Centre"
@@ -4647,15 +5297,301 @@ msgstr "Preferences;Settings;"
 msgid "All Settings"
 msgstr "All Settings"
 
+#~ msgid "Add wallpaper"
+#~ msgstr "Add wallpaper"
+
+#~ msgid "Remove wallpaper"
+#~ msgstr "Remove wallpaper"
+
+#~ msgid "Swap colors"
+#~ msgstr "Swap colours"
+
+#~ msgid "Secondary color"
+#~ msgstr "Secondary colour"
+
+#~ msgid "Horizontal Gradient"
+#~ msgstr "Horizontal Gradient"
+
+#~ msgid "Vertical Gradient"
+#~ msgstr "Vertical Gradient"
+
+#~ msgid "Solid Color"
+#~ msgstr "Solid Colour"
+
+#~ msgid "Pictures Folder"
+#~ msgstr "Pictures Folder"
+
+#~ msgid "Colors & Gradients"
+#~ msgstr "Colours & Gradients"
+
+#~ msgid "Acti_on:"
+#~ msgstr "Acti_on:"
+
+#~ msgid "Take a screenshot"
+#~ msgstr "Take a screenshot"
+
+#~ msgid "Shortcut"
+#~ msgstr "Shortcut"
+
+#~ msgid "_Right-handed"
+#~ msgstr "_Right-handed"
+
+#~ msgid "_Left-handed"
+#~ msgstr "_Left-handed"
+
+#~ msgid "Sh_ow position of pointer when the Control key is pressed"
+#~ msgstr "Sh_ow position of pointer when the Control key is pressed"
+
+#~ msgid "A_cceleration:"
+#~ msgstr "A_cceleration:"
+
+#~ msgid "_Sensitivity:"
+#~ msgstr "_Sensitivity:"
+
+#~ msgid "Drag and Drop"
+#~ msgstr "Drag and Drop"
+
+#~ msgid "Thr_eshold:"
+#~ msgstr "Thr_eshold:"
+
+#~ msgid "Drag Threshold"
+#~ msgstr "Drag Threshold"
+
+#~ msgid "Double-Click Timeout"
+#~ msgstr "Double-Click Timeout"
+
+#~ msgid "_Timeout:"
+#~ msgstr "_Timeout:"
+
+#~ msgid "To test your settings, try to double-click on the face."
+#~ msgstr "To test your settings, try to double-click on the face."
+
+#~ msgid "Enable _mouse clicks with touchpad"
+#~ msgstr "Enable _mouse clicks with touchpad"
+
+#~ msgid "Scrolling"
+#~ msgstr "Scrolling"
+
+#~ msgid "_Disabled"
+#~ msgstr "_Disabled"
+
+#~ msgid "_Edge scrolling"
+#~ msgstr "_Edge scrolling"
+
+#~ msgid "Enable h_orizontal scrolling"
+#~ msgstr "Enable h_orizontal scrolling"
+
+#~ msgctxt "Wireless access point"
+#~ msgid "Other..."
+#~ msgstr "Otherâ"
+
+#~ msgid "Hotspot"
+#~ msgstr "Hotspot"
+
+#~ msgid "Not connected to the internet."
+#~ msgstr "Not connected to the internet."
+
+#~ msgid "Create the hotspot anyway?"
+#~ msgstr "Create the hotspot anyway?"
+
+#~ msgid "Disconnect from %s and create a new hotspot?"
+#~ msgstr "Disconnect from %s and create a new hotspot?"
+
+#~ msgid "This is your only connection to the internet."
+#~ msgstr "This is your only connection to the internet."
+
+#~ msgid "Create _Hotspot"
+#~ msgstr "Create _Hotspot"
+
+#~ msgid "Device Off"
+#~ msgstr "Device Off"
+
+#~ msgid "_Network Name"
+#~ msgstr "_Network Name"
+
+#~ msgid "_Stop Hotspot..."
+#~ msgstr "_Stop Hotspotâ"
+
+#~ msgid "Disable VPN"
+#~ msgstr "Disable VPN"
+
+#~ msgid "HTTP Port"
+#~ msgstr "HTTP Port"
+
+#~ msgid "HTTPS Port"
+#~ msgstr "HTTPS Port"
+
+#~ msgid "FTP Port"
+#~ msgstr "FTP Port"
+
+#~ msgid "Socks Port"
+#~ msgstr "Socks Port"
+
+#~ msgid "To add a new account, first select the account type"
+#~ msgstr "To add a new account, first select the account type"
+
+#~ msgid "_Add..."
+#~ msgstr "_Addâ"
+
+#~ msgid "Select an account"
+#~ msgstr "Select an account"
+
+#~ msgid "Tip:"
+#~ msgstr "Tip:"
+
+#~ msgid "Brightness Settings"
+#~ msgstr "Brightness Settings"
+
+#~ msgid "affect how much power is used"
+#~ msgstr "affect how much power is used"
+
+#~ msgid "_Back"
+#~ msgstr "_Back"
+
+#~ msgid "Add User"
+#~ msgstr "Add User"
+
+#~ msgid "Remove User"
+#~ msgstr "Remove User"
+
+#~ msgid "Allowed users"
+#~ msgstr "Allowed users"
+
+#~ msgid "Choose a Layout"
+#~ msgstr "Choose a Layout"
+
+#~ msgid "Preview"
+#~ msgstr "Preview"
+
+#~ msgid "Keyboard Layout Options"
+#~ msgstr "Keyboard Layout Options"
+
+#~ msgid "Add Layout"
+#~ msgstr "Add Layout"
+
+#~ msgid "Remove Layout"
+#~ msgstr "Remove Layout"
+
+#~ msgid "Move Up"
+#~ msgstr "Move Up"
+
+#~ msgid "Move Down"
+#~ msgstr "Move Down"
+
+#~ msgid "Preview Layout"
+#~ msgstr "Preview Layout"
+
+#~ msgid "Use the same layout for all windows"
+#~ msgstr "Use the same layout for all windows"
+
+#~ msgid "Allow different layouts for individual windows"
+#~ msgstr "Allow different layouts for individual windows"
+
+#~ msgid "New windows use the default layout"
+#~ msgstr "New windows use the default layout"
+
+#~ msgid "New windows use the previous window's layout"
+#~ msgstr "New windows use the previous window's layout"
+
+#~ msgid "View and edit keyboard layout options"
+#~ msgstr "View and edit keyboard layout options"
+
+#~ msgid "Reset to De_faults"
+#~ msgstr "Reset to De_faults"
+
+#~ msgid ""
+#~ "Replace the current keyboard layout settings with the\n"
+#~ "default settings"
+#~ msgstr ""
+#~ "Replace the current keyboard layout settings with the\n"
+#~ "default settings"
+
+#~ msgid "Layouts"
+#~ msgstr "Layouts"
+
+#~ msgid "Layout"
+#~ msgstr "Layout"
+
+#~ msgid "Co_nnector:"
+#~ msgstr "Co_nnector:"
+
+#~ msgid "Hardware"
+#~ msgstr "Hardware"
+
+#~ msgid "C_hoose a device to configure:"
+#~ msgstr "C_hoose a device to configure:"
+
+#~ msgid "Dasher"
+#~ msgstr "Dasher"
+
+#~ msgid "Nomon"
+#~ msgstr "Nomon"
+
+#~ msgid "Caribou"
+#~ msgstr "Caribou"
+
+#~ msgid "Change contrast:"
+#~ msgstr "Change contrast:"
+
+#~ msgid "_Text size:"
+#~ msgstr "_Text size:"
+
+#~ msgid "Increase size:"
+#~ msgstr "Increase size:"
+
+#~ msgid "Decrease size:"
+#~ msgstr "Decrease size:"
+
+#~ msgctxt "universal access, seeing"
+#~ msgid "Display"
+#~ msgstr "Display"
+
+#~ msgctxt "universal access, seeing"
+#~ msgid "Zoom"
+#~ msgstr "Zoom"
+
+#~ msgid "Screen keyboard"
+#~ msgstr "Screen keyboard"
+
+#~ msgid "Typing Assistant"
+#~ msgstr "Typing Assistant"
+
+#~ msgid "Type here to test settings"
+#~ msgstr "Type here to test settings"
+
+#~ msgid "1/2 Screen"
+#~ msgstr "1/2 Screen"
+
+#~ msgid "3/4 Screen"
+#~ msgstr "3/4 Screen"
+
+#~ msgid "Create new account"
+#~ msgstr "Create new account"
+
+#~ msgid "_Account Type"
+#~ msgstr "_Account Type"
+
+#~ msgid "Cr_eate"
+#~ msgstr "Cr_eate"
+
+#~ msgid "Choose a generated password"
+#~ msgstr "Choose a generated password"
+
+#~ msgid "Account _type"
+#~ msgstr "Account _type"
+
+#~ msgid "More choices..."
+#~ msgstr "More choicesâ"
+
+#~ msgid "Wacom Graphics Tablet"
+#~ msgstr "Wacom Graphics Tablet"
+
 #~ msgid "Could not get session bus while applying display configuration"
 #~ msgstr "Could not get session bus while applying display configuration"
 
 #~ msgid "System Info"
 #~ msgstr "System Info"
 
-#~ msgid "Magnifier zoom out"
-#~ msgstr "Magnifier zoom out"
-
 #~ msgid "Toggle contrast"
 #~ msgstr "Toggle contrast"
 
@@ -5027,9 +5963,6 @@ msgstr "All Settings"
 #~ msgid "Getting network address"
 #~ msgstr "Getting network address"
 
-#~ msgid "Failed to connect"
-#~ msgstr "Failed to connect"
-
 #~ msgctxt "Account type"
 #~ msgid "Supervised"
 #~ msgstr "Supervised"
@@ -5044,18 +5977,12 @@ msgstr "All Settings"
 #~ msgid "Idle"
 #~ msgstr "Idle"
 
-#~ msgid "Could not connect to system bus: %s"
-#~ msgstr "Could not connect to system bus: %s"
-
 #~ msgid "%i kb/s"
 #~ msgstr "%i kb/s"
 
 #~ msgid "%i Gb/s"
 #~ msgstr "%i Gb/s"
 
-#~ msgid "Ctrl+Alt+-"
-#~ msgstr "Ctrl+Alt+-"
-
 #~ msgid "Ctrl+Alt+0"
 #~ msgstr "Ctrl+Alt+0"
 
@@ -5068,9 +5995,6 @@ msgstr "All Settings"
 #~ msgid "Ctrl+Alt+="
 #~ msgstr "Ctrl+Alt+="
 
-#~ msgid "HighContrastInverse"
-#~ msgstr "HighContrastInverse"
-
 #~ msgid "LowContrast"
 #~ msgstr "LowContrast"
 
@@ -5308,9 +6232,6 @@ msgstr "All Settings"
 #~ msgid "Include _panel"
 #~ msgstr "Include _panel"
 
-#~ msgid "Make Default"
-#~ msgstr "Make Default"
-
 #~ msgid "Panel icon"
 #~ msgstr "Panel icon"
 
@@ -5578,9 +6499,6 @@ msgstr "All Settings"
 #~ msgid "Choose type of click with mo_use gestures"
 #~ msgstr "Choose type of click with mo_use gestures"
 
-#~ msgid "D_ouble click:"
-#~ msgstr "D_ouble click:"
-
 #~ msgid "D_rag click:"
 #~ msgstr "D_rag click:"
 
@@ -5631,12 +6549,6 @@ msgstr "All Settings"
 #~ msgid "Network Proxy Preferences"
 #~ msgstr "Network Proxy Preferences"
 
-#~ msgid "Port:"
-#~ msgstr "Port:"
-
-#~ msgid "Proxy Configuration"
-#~ msgstr "Proxy Configuration"
-
 #~ msgid "The location already exists."
 #~ msgstr "The location already exists."
 
@@ -5822,9 +6734,6 @@ msgstr "All Settings"
 #~ msgid "Width of border around the label and image in the alert dialog"
 #~ msgstr "Width of border around the label and image in the alert dialogue"
 
-#~ msgid "Alert Type"
-#~ msgstr "Alert Type"
-
 #~ msgid "The type of alert"
 #~ msgstr "The type of alert"
 
@@ -5976,9 +6885,6 @@ msgstr "All Settings"
 #~ msgid "Instant Messaging"
 #~ msgstr "Instant Messaging"
 
-#~ msgid "Job"
-#~ msgstr "Job"
-
 #~ msgid "M_SN:"
 #~ msgstr "M_SN:"
 
@@ -6200,9 +7106,6 @@ msgstr "All Settings"
 #~ msgstr ""
 #~ "Specify the name of the page to show (theme|background|fonts|interface)"
 
-#~ msgid "page"
-#~ msgstr "page"
-
 #~ msgid "[WALLPAPER...]"
 #~ msgstr "[WALLPAPERâ]"
 
@@ -6321,9 +7224,6 @@ msgstr "All Settings"
 #~ msgid "Save _As..."
 #~ msgstr "Save _Asâ"
 
-#~ msgid "Stretch"
-#~ msgstr "Stretch"
-
 #~ msgid "Sub_pixel (LCDs)"
 #~ msgstr "Sub_pixel (LCDs)"
 
@@ -6354,9 +7254,6 @@ msgstr "All Settings"
 #~ msgid "VB_GR"
 #~ msgstr "VB_GR"
 
-#~ msgid "Window Border"
-#~ msgstr "Window Border"
-
 #~ msgid "_Application font:"
 #~ msgstr "_Application font:"
 
@@ -6372,9 +7269,6 @@ msgstr "All Settings"
 #~ msgid "_Fixed width font:"
 #~ msgstr "_Fixed width font:"
 
-#~ msgid "_Full"
-#~ msgstr "_Full"
-
 #~ msgid "_Install..."
 #~ msgstr "_Installâ"
 
@@ -6741,9 +7635,6 @@ msgstr "All Settings"
 #~ msgid "Roll up"
 #~ msgstr "Roll up"
 
-#~ msgid "key not found [%s]\n"
-#~ msgstr "key not found [%s]\n"
-
 #~ msgid "Hide on start (useful to preload the shell)"
 #~ msgstr "Hide on start (useful to preload the shell)"
 
@@ -6827,9 +7718,6 @@ msgstr "All Settings"
 #~ msgid "Start %s"
 #~ msgstr "Start %s"
 
-#~ msgid "Help"
-#~ msgstr "Help"
-
 #~ msgid "Upgrade"
 #~ msgstr "Upgrade"
 
@@ -7063,9 +7951,6 @@ msgstr "All Settings"
 #~ msgid "_Print"
 #~ msgstr "_Print"
 
-#~ msgid "_Quit"
-#~ msgstr "_Quit"
-
 #~ msgid "_Save"
 #~ msgstr "_Save"
 
@@ -7266,10 +8151,6 @@ msgstr "All Settings"
 #~ msgstr "Desktop"
 
 #~ msgctxt "Sound event"
-#~ msgid "Login"
-#~ msgstr "Login"
-
-#~ msgctxt "Sound event"
 #~ msgid "Logout"
 #~ msgstr "Logout"
 
@@ -7452,9 +8333,6 @@ msgstr "All Settings"
 #~ msgid "The file %s is not a valid wav file"
 #~ msgstr "The file %s is not a valid wav file"
 
-#~ msgid "Select sound file..."
-#~ msgstr "Select sound fileâ"
-
 #~ msgid "Sets the default application font"
 #~ msgstr "Sets the default application font"
 
@@ -7523,9 +8401,6 @@ msgstr "All Settings"
 #~ msgid "Sets the default theme"
 #~ msgstr "Sets the default theme"
 
-#~ msgid " "
-#~ msgstr " "
-
 #~ msgid "    "
 #~ msgstr "    "
 
@@ -8025,9 +8900,6 @@ msgstr "All Settings"
 #~ msgid "_Add Wallpaper"
 #~ msgstr "_Add Wallpaper"
 
-#~ msgid "_Finish"
-#~ msgstr "_Finish"
-
 #~ msgid "- Desktop Background Preferences"
 #~ msgstr "- Desktop Background Preferences"
 
@@ -8232,9 +9104,6 @@ msgstr "All Settings"
 #~ msgid "No description."
 #~ msgstr "No description."
 
-#~ msgid "Failed to init GConf: %s\n"
-#~ msgstr "Failed to init GConf: %s\n"
-
 #~ msgid "Enable/disable installed plugins"
 #~ msgstr "Enable/disable installed plugins"
 
@@ -8431,9 +9300,6 @@ msgstr "All Settings"
 #~ msgid "Keyboard Update Handlers"
 #~ msgstr "Keyboard Update Handlers"
 
-#~ msgid "Keyboard layout"
-#~ msgstr "Keyboard layout"
-
 #~ msgid "Keyboard model"
 #~ msgstr "Keyboard model"