[gnome-control-center] Updated British English translation

[Bruce Cowan <bcowan src gnome org>]

commit e98da620780ad1ad09ec1f1d6c36d958045f292b
Author: Bruce Cowan <bruce bcowan me uk>
Date:   Wed Mar 30 15:01:27 2011 +0100

    Updated British English translation

 po/en_GB.po |  836 +++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 475 insertions(+), 361 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 4774088..434b21c 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: 2011-03-09 16:54+0000\n"
-"PO-Revision-Date: 2011-03-09 16:54+0100\n"
+"POT-Creation-Date: 2011-03-30 14:59+0100\n"
+"PO-Revision-Date: 2011-03-30 15:00+0100\n"
 "Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
 "Language-Team: British English <en li org>\n"
 "Language: en_GB\n"
@@ -56,12 +56,12 @@ msgstr ""
 "will not appear."
 
 #: ../libgnome-control-center/cc-lockbutton.c:347
-#: ../panels/screen/screen.ui.h:13
+#: ../panels/screen/screen.ui.h:14
 msgid "Lock"
 msgstr "Lock"
 
 #: ../libgnome-control-center/cc-lockbutton.c:356
-#: ../panels/network/network.ui.h:23
+#: ../panels/network/network.ui.h:20
 msgid "Unlock"
 msgstr "Unlock"
 
@@ -163,7 +163,7 @@ msgstr "Property editor data freeing callback"
 msgid "Callback to be issued when property editor object data is to be freed"
 msgstr "Callback to be issued when property editor object data is to be freed"
 
-#: ../libgnome-control-center/gconf-property-editor.c:1473
+#: ../libgnome-control-center/gconf-property-editor.c:1474
 #, c-format
 msgid ""
 "Couldn't find the file '%s'.\n"
@@ -176,7 +176,7 @@ msgstr ""
 "Please make sure it exists and try again, or choose a different background "
 "picture."
 
-#: ../libgnome-control-center/gconf-property-editor.c:1481
+#: ../libgnome-control-center/gconf-property-editor.c:1482
 #, c-format
 msgid ""
 "I don't know how to open the file '%s'.\n"
@@ -189,11 +189,11 @@ msgstr ""
 "\n"
 "Please select a different picture instead."
 
-#: ../libgnome-control-center/gconf-property-editor.c:1603
+#: ../libgnome-control-center/gconf-property-editor.c:1604
 msgid "Please select an image."
 msgstr "Please select an image."
 
-#: ../libgnome-control-center/gconf-property-editor.c:1608
+#: ../libgnome-control-center/gconf-property-editor.c:1609
 msgid "_Select"
 msgstr "_Select"
 
@@ -252,7 +252,7 @@ msgid "Solid Color"
 msgstr "Solid Colour"
 
 #: ../panels/background/cc-background-panel.c:958
-#: ../panels/user-accounts/um-photo-dialog.c:216
+#: ../panels/user-accounts/um-photo-dialog.c:217
 #: ../panels/user-accounts/data/photo-dialog.ui.h:2
 msgid "Browse for more pictures"
 msgstr "Browse for more pictures"
@@ -261,19 +261,19 @@ msgstr "Browse for more pictures"
 msgid "Current background"
 msgstr "Current background"
 
-#: ../panels/background/cc-background-panel.c:1113
+#: ../panels/background/cc-background-panel.c:1133
 msgid "Wallpapers"
 msgstr "Wallpapers"
 
-#: ../panels/background/cc-background-panel.c:1120
+#: ../panels/background/cc-background-panel.c:1140
 msgid "Pictures Folder"
 msgstr "Pictures Folder"
 
-#: ../panels/background/cc-background-panel.c:1127
+#: ../panels/background/cc-background-panel.c:1147
 msgid "Colors & Gradients"
 msgstr "Colours & Gradients"
 
-#: ../panels/background/cc-background-panel.c:1135
+#: ../panels/background/cc-background-panel.c:1155
 msgid "Flickr"
 msgstr "Flickr"
 
@@ -297,90 +297,71 @@ msgid "Unspecified"
 msgstr "Unspecified"
 
 #: ../panels/datetime/datetime.ui.h:1
-msgid "16"
-msgstr "16"
-
-#: ../panels/datetime/datetime.ui.h:2
-msgid "2010"
-msgstr "2010"
-
-#: ../panels/datetime/datetime.ui.h:3
-msgid "22"
-msgstr "22"
-
-#: ../panels/datetime/datetime.ui.h:4
 msgid "24-Hour Time"
 msgstr "24-Hour Time"
 
-#: ../panels/datetime/datetime.ui.h:5
-msgid "45"
-msgstr "45"
-
-#: ../panels/datetime/datetime.ui.h:6
+#. Translator: this is the separator between hours and minutes, like in HH:MM
+#: ../panels/datetime/datetime.ui.h:3
 msgid ":"
 msgstr ":"
 
-#: ../panels/datetime/datetime.ui.h:7
-msgid "AM"
-msgstr "AM"
-
-#: ../panels/datetime/datetime.ui.h:8
+#: ../panels/datetime/datetime.ui.h:4
 msgid "April"
 msgstr "April"
 
-#: ../panels/datetime/datetime.ui.h:9
+#: ../panels/datetime/datetime.ui.h:5
 msgid "August"
 msgstr "August"
 
-#: ../panels/datetime/datetime.ui.h:10
+#: ../panels/datetime/datetime.ui.h:6
 msgid "City:"
 msgstr "City:"
 
-#: ../panels/datetime/datetime.ui.h:11
+#: ../panels/datetime/datetime.ui.h:7
 msgid "December"
 msgstr "December"
 
-#: ../panels/datetime/datetime.ui.h:12
+#: ../panels/datetime/datetime.ui.h:8
 msgid "February"
 msgstr "February"
 
-#: ../panels/datetime/datetime.ui.h:13
+#: ../panels/datetime/datetime.ui.h:9
 msgid "January"
 msgstr "January"
 
-#: ../panels/datetime/datetime.ui.h:14
+#: ../panels/datetime/datetime.ui.h:10
 msgid "July"
 msgstr "July"
 
-#: ../panels/datetime/datetime.ui.h:15
+#: ../panels/datetime/datetime.ui.h:11
 msgid "June"
 msgstr "June"
 
-#: ../panels/datetime/datetime.ui.h:16
+#: ../panels/datetime/datetime.ui.h:12
 msgid "March"
 msgstr "March"
 
-#: ../panels/datetime/datetime.ui.h:17
+#: ../panels/datetime/datetime.ui.h:13
 msgid "May"
 msgstr "May"
 
-#: ../panels/datetime/datetime.ui.h:18
+#: ../panels/datetime/datetime.ui.h:14
 msgid "Network Time"
 msgstr "Network Time"
 
-#: ../panels/datetime/datetime.ui.h:19
+#: ../panels/datetime/datetime.ui.h:15
 msgid "November"
 msgstr "November"
 
-#: ../panels/datetime/datetime.ui.h:20
+#: ../panels/datetime/datetime.ui.h:16
 msgid "October"
 msgstr "October"
 
-#: ../panels/datetime/datetime.ui.h:21
+#: ../panels/datetime/datetime.ui.h:17
 msgid "Region:"
 msgstr "Region:"
 
-#: ../panels/datetime/datetime.ui.h:22
+#: ../panels/datetime/datetime.ui.h:18
 msgid "September"
 msgstr "September"
 
@@ -486,11 +467,11 @@ msgstr "%d x %d (%s)"
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../panels/display/xrandr-capplet.c:1500
+#: ../panels/display/xrandr-capplet.c:1510
 msgid "Drag to change primary display."
 msgstr "Drag to change primary display."
 
-#: ../panels/display/xrandr-capplet.c:1558
+#: ../panels/display/xrandr-capplet.c:1568
 msgid ""
 "Select a monitor to change its properties; drag it to rearrange its "
 "placement."
@@ -498,27 +479,27 @@ msgstr ""
 "Select a monitor to change its properties; drag it to rearrange its "
 "placement."
 
-#: ../panels/display/xrandr-capplet.c:1947
+#: ../panels/display/xrandr-capplet.c:1957
 msgid "%a %R"
 msgstr "%a %R"
 
-#: ../panels/display/xrandr-capplet.c:1949
+#: ../panels/display/xrandr-capplet.c:1959
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: ../panels/display/xrandr-capplet.c:2195
+#: ../panels/display/xrandr-capplet.c:2205
 msgid "Could not save the monitor configuration"
 msgstr "Could not save the monitor configuration"
 
-#: ../panels/display/xrandr-capplet.c:2220
+#: ../panels/display/xrandr-capplet.c:2230
 msgid "Could not get session bus while applying display configuration"
 msgstr "Could not get session bus while applying display configuration"
 
-#: ../panels/display/xrandr-capplet.c:2265
+#: ../panels/display/xrandr-capplet.c:2275
 msgid "Could not detect displays"
 msgstr "Could not detect displays"
 
-#: ../panels/display/xrandr-capplet.c:2460
+#: ../panels/display/xrandr-capplet.c:2470
 msgid "Could not get screen information"
 msgstr "Could not get screen information"
 
@@ -530,8 +511,8 @@ msgstr "VESA: %s"
 
 #. TRANSLATORS: device type
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:390 ../panels/network/panel-common.c:72
-#: ../panels/network/panel-common.c:151
+#: ../panels/info/cc-info-panel.c:390 ../panels/network/panel-common.c:78
+#: ../panels/network/panel-common.c:157
 msgid "Unknown"
 msgstr "Unknown"
 
@@ -610,7 +591,7 @@ msgid "Standard"
 msgstr "Standard"
 
 #: ../panels/info/cc-info-panel.c:951
-#: ../panels/keyboard/keyboard-shortcuts.c:1711
+#: ../panels/keyboard/keyboard-shortcuts.c:1712
 msgid "Section"
 msgstr "Section"
 
@@ -860,8 +841,8 @@ msgstr "The type of accelerator."
 #. translators:
 #. * The device has been disabled
 #: ../panels/keyboard/eggcellrendererkeys.c:243
-#: ../panels/keyboard/keyboard-shortcuts.c:1152
-#: ../panels/sound/gvc-mixer-control.c:1091
+#: ../panels/keyboard/keyboard-shortcuts.c:1153
+#: ../panels/sound/gvc-mixer-control.c:1084
 #: ../panels/user-accounts/um-fingerprint-dialog.c:177
 #: ../panels/user-accounts/um-fingerprint-dialog.c:178
 msgid "Disabled"
@@ -881,22 +862,22 @@ msgstr "Keyboard"
 msgid "Shortcut;Repeat;Blink;"
 msgstr "Shortcut;Repeat;Blink;"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:645
-#: ../panels/keyboard/keyboard-shortcuts.c:927
-#: ../panels/keyboard/keyboard-shortcuts.c:1505
-#: ../panels/keyboard/keyboard-shortcuts.c:1509
+#: ../panels/keyboard/keyboard-shortcuts.c:646
+#: ../panels/keyboard/keyboard-shortcuts.c:928
+#: ../panels/keyboard/keyboard-shortcuts.c:1506
+#: ../panels/keyboard/keyboard-shortcuts.c:1510
 msgid "Custom Shortcuts"
 msgstr "Custom Shortcuts"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:779
+#: ../panels/keyboard/keyboard-shortcuts.c:780
 msgid "<Unknown Action>"
 msgstr "<Unknown Action>"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1178
+#: ../panels/keyboard/keyboard-shortcuts.c:1179
 msgid "Error saving the new shortcut"
 msgstr "Error saving the new shortcut"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1291
+#: ../panels/keyboard/keyboard-shortcuts.c:1292
 #, c-format
 msgid ""
 "The shortcut \"%s\" cannot be used because it will become impossible to type "
@@ -907,7 +888,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:1321
+#: ../panels/keyboard/keyboard-shortcuts.c:1322
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for\n"
@@ -916,26 +897,26 @@ msgstr ""
 "The shortcut \"%s\" is already used for\n"
 "\"%s\""
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1326
+#: ../panels/keyboard/keyboard-shortcuts.c:1327
 #, 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:1332
+#: ../panels/keyboard/keyboard-shortcuts.c:1333
 msgid "_Reassign"
 msgstr "_Reassign"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1444
+#: ../panels/keyboard/keyboard-shortcuts.c:1445
 msgid "Too many custom shortcuts"
 msgstr "Too many custom shortcuts"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1764
+#: ../panels/keyboard/keyboard-shortcuts.c:1765
 msgid "Action"
 msgstr "Action"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1787
+#: ../panels/keyboard/keyboard-shortcuts.c:1788
 msgid "Shortcut"
 msgstr "Shortcut"
 
@@ -978,7 +959,7 @@ msgstr "Key presses _repeat when key is held down"
 
 #. long delay
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
-#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+#: ../panels/mouse/gnome-mouse-properties.ui.h:14
 #: ../panels/universal-access/uap.ui.h:39
 msgid "Long"
 msgstr "Long"
@@ -997,7 +978,7 @@ msgstr "S_peed:"
 
 #. short delay
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
-#: ../panels/mouse/gnome-mouse-properties.ui.h:24
+#: ../panels/mouse/gnome-mouse-properties.ui.h:22
 #: ../panels/universal-access/uap.ui.h:54
 msgid "Short"
 msgstr "Short"
@@ -1008,7 +989,7 @@ msgstr "Shortcuts"
 
 #. slow acceleration
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
-#: ../panels/mouse/gnome-mouse-properties.ui.h:26
+#: ../panels/mouse/gnome-mouse-properties.ui.h:24
 msgid "Slow"
 msgstr "Slow"
 
@@ -1175,209 +1156,205 @@ msgid "cd;dvd;usb;audio;video;disc;"
 msgstr "cd;dvd;usb;audio;video;disc;"
 
 #. Translators: The printer is low on toner
-#: ../panels/printers/cc-printers-panel.c:239
+#: ../panels/printers/cc-printers-panel.c:256
 msgid "Low on toner"
 msgstr "Low on toner"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:241
+#: ../panels/printers/cc-printers-panel.c:258
 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:244
+#: ../panels/printers/cc-printers-panel.c:261
 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:247
+#: ../panels/printers/cc-printers-panel.c:264
 msgid "Out of developer"
 msgstr "Out of developer"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:249
+#: ../panels/printers/cc-printers-panel.c:266
 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:251
+#: ../panels/printers/cc-printers-panel.c:268
 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:253
+#: ../panels/printers/cc-printers-panel.c:270
 msgid "Open cover"
 msgstr "Open cover"
 
 #. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:255
+#: ../panels/printers/cc-printers-panel.c:272
 msgid "Open door"
 msgstr "Open door"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:257
+#: ../panels/printers/cc-printers-panel.c:274
 msgid "Low on paper"
 msgstr "Low on paper"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:259
+#: ../panels/printers/cc-printers-panel.c:276
 msgid "Out of paper"
 msgstr "Out of paper"
 
 #. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:261
+#: ../panels/printers/cc-printers-panel.c:278
 msgctxt "printer state"
 msgid "Offline"
 msgstr "Offline"
 
 #. Translators: Someone has paused the Printer
-#: ../panels/printers/cc-printers-panel.c:263
+#: ../panels/printers/cc-printers-panel.c:280
 msgctxt "printer state"
 msgid "Paused"
 msgstr "Paused"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:265
+#: ../panels/printers/cc-printers-panel.c:282
 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:267
+#: ../panels/printers/cc-printers-panel.c:284
 msgid "Waste receptacle full"
 msgstr "Waste receptacle full"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:269
+#: ../panels/printers/cc-printers-panel.c:286
 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:271
+#: ../panels/printers/cc-printers-panel.c:288
 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:408
+#: ../panels/printers/cc-printers-panel.c:432
 msgctxt "printer state"
 msgid "Ready"
 msgstr "Ready"
 
 #. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/cc-printers-panel.c:412
+#: ../panels/printers/cc-printers-panel.c:436
 msgctxt "printer state"
 msgid "Processing"
 msgstr "Processing"
 
 #. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/cc-printers-panel.c:416
+#: ../panels/printers/cc-printers-panel.c:440
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "Stopped"
 
 #. Translators: Toner supply
-#: ../panels/printers/cc-printers-panel.c:514
+#: ../panels/printers/cc-printers-panel.c:560
 msgid "Toner Level"
 msgstr "Toner Level"
 
 #. Translators: Ink supply
-#: ../panels/printers/cc-printers-panel.c:517
+#: ../panels/printers/cc-printers-panel.c:563
 msgid "Ink Level"
 msgstr "Ink Level"
 
 #. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/cc-printers-panel.c:520
+#: ../panels/printers/cc-printers-panel.c:566
 msgid "Supply Level"
 msgstr "Supply Level"
 
 #. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:535
+#: ../panels/printers/cc-printers-panel.c:581
 #, 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:735
+msgid "No printers available"
+msgstr "No printers available"
+
 #. Translators: Job's state (job is waiting to be printed)
-#: ../panels/printers/cc-printers-panel.c:1002
+#: ../panels/printers/cc-printers-panel.c:1026
 msgctxt "print job"
 msgid "Pending"
 msgstr "Pending"
 
 #. Translators: Job's state (job is held for printing)
-#: ../panels/printers/cc-printers-panel.c:1006
+#: ../panels/printers/cc-printers-panel.c:1030
 msgctxt "print job"
 msgid "Held"
 msgstr "Held"
 
 #. Translators: Job's state (job is currently printing)
-#: ../panels/printers/cc-printers-panel.c:1010
+#: ../panels/printers/cc-printers-panel.c:1034
 msgctxt "print job"
 msgid "Processing"
 msgstr "Processing"
 
 #. Translators: Job's state (job has been stopped)
-#: ../panels/printers/cc-printers-panel.c:1014
+#: ../panels/printers/cc-printers-panel.c:1038
 msgctxt "print job"
 msgid "Stopped"
 msgstr "Stopped"
 
 #. Translators: Job's state (job has been canceled)
-#: ../panels/printers/cc-printers-panel.c:1018
+#: ../panels/printers/cc-printers-panel.c:1042
 msgctxt "print job"
 msgid "Canceled"
 msgstr "Cancelled"
 
 #. Translators: Job's state (job has aborted due to error)
-#: ../panels/printers/cc-printers-panel.c:1022
+#: ../panels/printers/cc-printers-panel.c:1046
 msgctxt "print job"
 msgid "Aborted"
 msgstr "Aborted"
 
 #. Translators: Job's state (job has completed successfully)
-#: ../panels/printers/cc-printers-panel.c:1026
+#: ../panels/printers/cc-printers-panel.c:1050
 msgctxt "print job"
 msgid "Completed"
 msgstr "Completed"
 
 #. Translators: Name of column showing titles of print jobs
-#: ../panels/printers/cc-printers-panel.c:1118
+#: ../panels/printers/cc-printers-panel.c:1142
 msgid "Job Title"
 msgstr "Job Title"
 
 #. Translators: Name of column showing statuses of print jobs
-#: ../panels/printers/cc-printers-panel.c:1127
+#: ../panels/printers/cc-printers-panel.c:1151
 msgid "Job State"
 msgstr "Job State"
 
 #. Translators: Name of column showing times of creation of print jobs
-#: ../panels/printers/cc-printers-panel.c:1133
+#: ../panels/printers/cc-printers-panel.c:1157
 msgid "Time"
 msgstr "Time"
 
 #. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:1848
+#: ../panels/printers/cc-printers-panel.c:1872
 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:1948
+#: ../panels/printers/cc-printers-panel.c:2044
+#: ../panels/printers/cc-printers-panel.c:2058
 msgid "Test page"
 msgstr "Test page"
 
-#. Translators: Name of job which makes printer to clean its heads
-#: ../panels/printers/cc-printers-panel.c:1956
-msgid "Clean print heads"
-msgstr "Clean print heads"
-
-#. Translators: An error has occured during execution of a CUPS maintenance command
-#: ../panels/printers/cc-printers-panel.c:1961
-msgid "An error has occured during a maintenance command."
-msgstr "An error has occurred during a maintenance command."
-
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:2090
+#: ../panels/printers/cc-printers-panel.c:2208
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "Could not load ui: %s"
@@ -1395,31 +1372,57 @@ msgstr "Printer;Queue;Print;Paper;Ink;Toner;"
 msgid "Printers"
 msgstr "Printers"
 
+#: ../panels/printers/new-printer-dialog.ui.h:1
+msgid "Add"
+msgstr "Add"
+
+#: ../panels/printers/new-printer-dialog.ui.h:2
+msgid "Add a New Printer"
+msgstr "Add a New Printer"
+
+#: ../panels/printers/new-printer-dialog.ui.h:3
+msgid "Address"
+msgstr "Address"
+
+#: ../panels/printers/new-printer-dialog.ui.h:4
+#: ../panels/user-accounts/data/language-chooser.ui.h:1
+#: ../panels/user-accounts/data/photo-dialog.ui.h:3
+msgid "Cancel"
+msgstr "Cancel"
+
+#: ../panels/printers/new-printer-dialog.ui.h:5
+msgid "Search by Address"
+msgstr "Search by Address"
+
+#: ../panels/printers/pp-new-printer-dialog.c:381
+msgid "Getting devices..."
+msgstr "Getting devicesâ?¦"
+
 #. Translators: Column of devices which can be installed
-#: ../panels/printers/pp-new-printer-dialog.c:552
-#: ../panels/printers/pp-new-printer-dialog.c:557
+#: ../panels/printers/pp-new-printer-dialog.c:639
+#: ../panels/printers/pp-new-printer-dialog.c:644
 msgid "Devices"
 msgstr "Devices"
 
 #. Translators: Local means local printers
-#: ../panels/printers/pp-new-printer-dialog.c:582
+#: ../panels/printers/pp-new-printer-dialog.c:669
 msgid "Local"
 msgstr "Local"
 
 #. Translators: Network means network printers
-#: ../panels/printers/pp-new-printer-dialog.c:584
+#: ../panels/printers/pp-new-printer-dialog.c:671
 #: ../panels/network/gnome-network-panel.desktop.in.in.h:1
 msgid "Network"
 msgstr "Network"
 
 #. Translators: Device types column (network or local)
-#: ../panels/printers/pp-new-printer-dialog.c:625
+#: ../panels/printers/pp-new-printer-dialog.c:712
 msgid "Device types"
 msgstr "Device types"
 
 #. Translators: Name of job which makes printer to autoconfigure itself
-#: ../panels/printers/pp-new-printer-dialog.c:778
-#: ../panels/printers/pp-new-printer-dialog.c:944
+#: ../panels/printers/pp-new-printer-dialog.c:865
+#: ../panels/printers/pp-new-printer-dialog.c:1033
 msgid "Automatic configuration"
 msgstr "Automatic configuration"
 
@@ -1432,73 +1435,85 @@ msgstr "---"
 msgid "Active Print Jobs"
 msgstr "Active Print Jobs"
 
-#: ../panels/printers/printers.ui.h:4
+#. Translators: This button adds new printer.
+#: ../panels/printers/printers.ui.h:5
+msgid "Add New Printer"
+msgstr "Add New Printer"
+
+#: ../panels/printers/printers.ui.h:6
 msgid "Allowed users"
 msgstr "Allowed users"
 
 #. Translators: Switch back to printer's info tab
-#: ../panels/printers/printers.ui.h:6
+#: ../panels/printers/printers.ui.h:8
 msgid "Back"
 msgstr "Back"
 
 #. Translators: This checkbox is checked when the default printer is selected.
-#: ../panels/printers/printers.ui.h:8
+#: ../panels/printers/printers.ui.h:10
 #: ../panels/region/gnome-region-panel-xkbot.c:229
-#: ../panels/sound/gvc-sound-theme-chooser.c:581
+#: ../panels/sound/gvc-sound-theme-chooser.c:586
 msgid "Default"
 msgstr "Default"
 
-#: ../panels/printers/printers.ui.h:9
+#: ../panels/printers/printers.ui.h:11
+#: ../panels/network/cc-network-panel.c:1555
+#: ../panels/network/cc-network-panel.c:1558 ../panels/network/network.ui.h:11
 msgid "IP Address"
 msgstr "IP Address"
 
-#: ../panels/printers/printers.ui.h:10
-msgid "Info"
-msgstr "Info"
-
-#: ../panels/printers/printers.ui.h:11
+#: ../panels/printers/printers.ui.h:12
 msgid "Jobs"
 msgstr "Jobs"
 
 #. Translators: Location of the printer (e.g. Lab, 1st floor,...).
-#: ../panels/printers/printers.ui.h:13
+#: ../panels/printers/printers.ui.h:14
 msgid "Location"
 msgstr "Location"
 
-#: ../panels/printers/printers.ui.h:14
+#: ../panels/printers/printers.ui.h:15
 msgid "Model"
 msgstr "Model"
 
 #. Translators: This button opens printer's options tab
-#: ../panels/printers/printers.ui.h:16
+#: ../panels/printers/printers.ui.h:17
 msgid "Options"
 msgstr "Options"
 
 #. Translators: This button executes command which prints test page.
-#: ../panels/printers/printers.ui.h:18
+#: ../panels/printers/printers.ui.h:19
 msgid "Print Test Page"
 msgstr "Print Test Page"
 
-#: ../panels/printers/printers.ui.h:19
+#: ../panels/printers/printers.ui.h:20
 msgid "Printer"
 msgstr "Printer"
 
 #. Translators: This tab contains list of active print jobs of the selected printer
-#: ../panels/printers/printers.ui.h:21
+#: ../panels/printers/printers.ui.h:22
 msgid "Printer Options"
 msgstr "Printer Options"
 
-#: ../panels/printers/printers.ui.h:22
+#: ../panels/printers/printers.ui.h:23
 msgid "Printing..."
 msgstr "Printingâ?¦"
 
 #. Tanslators: Switch to tab containing printer's jobs
-#: ../panels/printers/printers.ui.h:24
+#: ../panels/printers/printers.ui.h:25
 msgid "Show"
 msgstr "Show"
 
+#. Translators: The CUPS server is not running (we can not connect to it).
+#: ../panels/printers/printers.ui.h:27
+msgid ""
+"Sorry! The system printing service\n"
+"doesn't seem to be available."
+msgstr ""
+"Sorry! The system printing service\n"
+"doesn't seem to be available."
+
 #. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/printers.ui.h:26
+#: ../panels/printers/printers.ui.h:30
 msgid "Supply"
 msgstr "Supply"
 
@@ -1511,7 +1526,7 @@ msgid "Install languages..."
 msgstr "Install languagesâ?¦"
 
 #: ../panels/region/gnome-region-panel.ui.h:3
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
 msgid "Language"
 msgstr "Language"
 
@@ -1537,8 +1552,8 @@ msgid "Reset to De_faults"
 msgstr "Reset to De_faults"
 
 #: ../panels/region/gnome-region-panel.ui.h:9
-msgid "Select a display language"
-msgstr "Select a display language"
+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:10
 msgid "Use default layout in new windows"
@@ -1557,6 +1572,7 @@ msgid "View and edit keyboard layout options"
 msgstr "View and edit keyboard layout options"
 
 #: ../panels/region/gnome-region-panel.ui.h:14
+#: ../panels/network/network.ui.h:28
 msgid "_Options..."
 msgstr "_Optionsâ?¦"
 
@@ -1576,7 +1592,7 @@ msgstr "Select an input source to add"
 msgid "Keyboard Layout Options"
 msgstr "Keyboard Layout Options"
 
-#: ../panels/region/gnome-region-panel-xkblt.c:220
+#: ../panels/region/gnome-region-panel-xkblt.c:222
 msgid "Layout"
 msgstr "Layout"
 
@@ -1620,86 +1636,78 @@ msgstr "High"
 msgid "Large"
 msgstr "Large"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:14
-msgid "Locate Pointer"
-msgstr "Locate Pointer"
-
 #. low sensitivity
-#: ../panels/mouse/gnome-mouse-properties.ui.h:17
+#: ../panels/mouse/gnome-mouse-properties.ui.h:16
 msgid "Low"
 msgstr "Low"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:18
+#: ../panels/mouse/gnome-mouse-properties.ui.h:17
 msgid "Mouse"
 msgstr "Mouse"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:19
-msgid "Mouse Orientation"
-msgstr "Mouse Orientation"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:20
+#: ../panels/mouse/gnome-mouse-properties.ui.h:18
 msgid "Mouse Preferences"
 msgstr "Mouse Preferences"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:21
+#: ../panels/mouse/gnome-mouse-properties.ui.h:19
 msgid "Pointer Speed"
 msgstr "Pointer Speed"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:22
+#: ../panels/mouse/gnome-mouse-properties.ui.h:20
 msgid "Scrolling"
 msgstr "Scrolling"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:23
+#: ../panels/mouse/gnome-mouse-properties.ui.h:21
 msgid "Sh_ow position of pointer when the Control key is pressed"
 msgstr "Sh_ow position of pointer when the Control key is pressed"
 
 #. small threshold
-#: ../panels/mouse/gnome-mouse-properties.ui.h:28
+#: ../panels/mouse/gnome-mouse-properties.ui.h:26
 #: ../panels/universal-access/uap.ui.h:58
 msgid "Small"
 msgstr "Small"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:29
+#: ../panels/mouse/gnome-mouse-properties.ui.h:27
 msgid "Thr_eshold:"
 msgstr "Thr_eshold:"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:30
+#: ../panels/mouse/gnome-mouse-properties.ui.h:28
 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-properties.ui.h:31
+#: ../panels/mouse/gnome-mouse-properties.ui.h:29
 msgid "Touchpad"
 msgstr "Touchpad"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:32
+#: ../panels/mouse/gnome-mouse-properties.ui.h:30
 msgid "Two-_finger scrolling"
 msgstr "Two-_finger scrolling"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:33
+#: ../panels/mouse/gnome-mouse-properties.ui.h:31
 msgid "_Acceleration:"
 msgstr "_Acceleration:"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:34
+#: ../panels/mouse/gnome-mouse-properties.ui.h:32
 msgid "_Disabled"
 msgstr "_Disabled"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:35
+#: ../panels/mouse/gnome-mouse-properties.ui.h:33
 msgid "_Edge scrolling"
 msgstr "_Edge scrolling"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:36
+#: ../panels/mouse/gnome-mouse-properties.ui.h:34
 msgid "_Left-handed"
 msgstr "_Left-handed"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:37
+#: ../panels/mouse/gnome-mouse-properties.ui.h:35
 msgid "_Right-handed"
 msgstr "_Right-handed"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:38
+#: ../panels/mouse/gnome-mouse-properties.ui.h:36
 msgid "_Sensitivity:"
 msgstr "_Sensitivity:"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:39
+#: ../panels/mouse/gnome-mouse-properties.ui.h:37
 msgid "_Timeout:"
 msgstr "_Timeout:"
 
@@ -1716,23 +1724,79 @@ msgstr "Set your mouse and touchpad preferences"
 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;"
 msgstr "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;"
 
-#: ../panels/network/cc-network-panel.c:969
+#. TRANSLATORS: this is when the use leaves the PAC textbox blank
+#: ../panels/network/cc-network-panel.c:193
+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: 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:201
+msgid "This is not recommended for untrusted public networks."
+msgstr "This is not recommended for untrusted public networks."
+
+#. TRANSLATORS: this WEP WiFi security
+#: ../panels/network/cc-network-panel.c:939
+msgid "WEP"
+msgstr "WEP"
+
+#. TRANSLATORS: this WPA WiFi security
+#: ../panels/network/cc-network-panel.c:943
+msgid "WPA"
+msgstr "WPA"
+
+#. TRANSLATORS: this WPA WiFi security
+#: ../panels/network/cc-network-panel.c:947
+msgid "WPA2"
+msgstr "WPA2"
+
+#. TRANSLATORS: this Enterprise WiFi security
+#: ../panels/network/cc-network-panel.c:952
+msgid "Enterprise"
+msgstr "Enterprise"
+
+#. TRANSLATORS: this no (!) WiFi security
+#: ../panels/network/cc-network-panel.c:958
+#: ../panels/universal-access/uap.ui.h:43
+msgid "None"
+msgstr "None"
+
+#. Translators: network device speed
+#: ../panels/network/cc-network-panel.c:1261
+#: ../panels/network/cc-network-panel.c:1306
+#, c-format
+msgid "%d Mb/s"
+msgstr "%d Mb/s"
+
+#: ../panels/network/cc-network-panel.c:1551 ../panels/network/network.ui.h:12
+msgid "IPv4 Address"
+msgstr "IPv4 Address"
+
+#: ../panels/network/cc-network-panel.c:1552 ../panels/network/network.ui.h:13
+msgid "IPv6 Address"
+msgstr "IPv6 Address"
+
+#: ../panels/network/cc-network-panel.c:1690
+msgid "Proxy"
+msgstr "Proxy"
+
+#: ../panels/network/cc-network-panel.c:1754
 msgid "Network proxy"
 msgstr "Network proxy"
 
-#: ../panels/network/cc-network-panel.c:978
-msgid "Set the system proxy settings"
-msgstr "Set the system proxy settings"
-
-#. TRANSLATORS: the user is running a NM that is too new and API compatible
-#: ../panels/network/cc-network-panel.c:1122
-msgid "The running NetworkManager version is not compatible (too new)."
-msgstr "The running NetworkManager version is not compatible (too new)."
+#: ../panels/network/cc-network-panel.c:1920
+#, c-format
+msgid "%s VPN"
+msgstr "%s VPN"
 
-#. TRANSLATORS: the user is running a NM that is too old and API compatible
-#: ../panels/network/cc-network-panel.c:1128
-msgid "The running NetworkManager version is not compatible (too old)."
-msgstr "The running NetworkManager version is not compatible (too old)."
+#. TRANSLATORS: the user is running a NM that is not API compatible
+#: ../panels/network/cc-network-panel.c:1988
+msgid "The system network services are not compatible with this version."
+msgstr "The system network services are not compatible with this version."
 
 #: ../panels/network/gnome-network-panel.desktop.in.in.h:2
 msgid "Network settings"
@@ -1744,194 +1808,190 @@ msgid "Network;Wireless;IP;LAN;"
 msgstr "Network;Wireless;IP;LAN;"
 
 #: ../panels/network/network.ui.h:1
-msgid "Airplane Mode"
-msgstr "Aeroplane Mode"
+msgid "Air_plane Mode"
+msgstr "Aero_plane Mode"
 
 #: ../panels/network/network.ui.h:2
-msgid "Configuration URL:"
-msgstr "Configuration URL:"
+msgid "Create..."
+msgstr "Createâ?¦"
 
 #: ../panels/network/network.ui.h:3
-msgid "DNS:"
-msgstr "DNS:"
+msgid "DNS"
+msgstr "DNS"
 
 #: ../panels/network/network.ui.h:4
-msgid "Default Route:"
-msgstr "Default Route:"
+msgid "Default Route"
+msgstr "Default Route"
 
 #: ../panels/network/network.ui.h:5
-msgid "FTP Proxy:"
-msgstr "FTP Proxy:"
+msgid "Gateway"
+msgstr "Gateway"
 
 #: ../panels/network/network.ui.h:6
-msgid "Gateway:"
-msgstr "Gateway:"
+msgid "Group Name"
+msgstr "Group Name"
 
 #: ../panels/network/network.ui.h:7
-msgid "Group Name:"
-msgstr "Group Name:"
+msgid "Group Password"
+msgstr "Group Password"
 
 #: ../panels/network/network.ui.h:8
-msgid "Group Password:"
-msgstr "Group Password:"
+msgid "H_TTPS Proxy"
+msgstr "H_TTPS Proxy"
 
 #: ../panels/network/network.ui.h:9
-msgid "HTTP Proxy:"
-msgstr "HTTP Proxy:"
+msgid "Hardware Address"
+msgstr "Hardware Address"
 
 #: ../panels/network/network.ui.h:10
-msgid "Hardware Address:"
-msgstr "Hardware Address:"
-
-#: ../panels/network/network.ui.h:11
-msgid "IMEI:"
-msgstr "IMEI:"
-
-#: ../panels/network/network.ui.h:12
-msgid "IP Address:"
-msgstr "IP Address:"
-
-#: ../panels/network/network.ui.h:13
-msgid "IPv4 Address:"
-msgstr "IPv4 Address:"
+msgid "IMEI"
+msgstr "IMEI"
 
 #: ../panels/network/network.ui.h:14
-msgid "IPv6 Address:"
-msgstr "IPv6 Address:"
+msgid "Interface"
+msgstr "Interface"
 
 #: ../panels/network/network.ui.h:15
-msgid "Method:"
-msgstr "Method:"
+msgid "Provider"
+msgstr "Provider"
 
 #: ../panels/network/network.ui.h:16
-msgid "Network Name:"
-msgstr "Network Name:"
+msgid "Security"
+msgstr "Security"
 
 #: ../panels/network/network.ui.h:17
-msgid "Provider:"
-msgstr "Provider:"
+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:18
-msgid "Secure HTTP Proxy:"
-msgstr "Secure HTTP Proxy:"
+msgid "Speed"
+msgstr "Speed"
 
 #: ../panels/network/network.ui.h:19
-msgid "Security:"
-msgstr "Security:"
-
-#: ../panels/network/network.ui.h:20
-msgid "Socks Host:"
-msgstr "Socks Host:"
+msgid "Subnet Mask"
+msgstr "Subnet Mask"
 
 #: ../panels/network/network.ui.h:21
-msgid "Speed:"
-msgstr "Speed:"
+msgid "Username"
+msgstr "Username"
 
 #: ../panels/network/network.ui.h:22
-msgid "Subnet Mask:"
-msgstr "Subnet Mask:"
+msgid "VPN"
+msgstr "VPN"
+
+#: ../panels/network/network.ui.h:23
+msgid "_Configuration URL"
+msgstr "_Configuration URL"
 
 #: ../panels/network/network.ui.h:24
-msgid "Username:"
-msgstr "Username:"
+msgid "_FTP Proxy"
+msgstr "_FTP Proxy"
 
 #: ../panels/network/network.ui.h:25
+msgid "_HTTP Proxy"
+msgstr "_HTTP Proxy"
+
+#: ../panels/network/network.ui.h:26
+msgid "_Method"
+msgstr "_Method"
+
+#: ../panels/network/network.ui.h:27
+msgid "_Network Name"
+msgstr "_Network Name"
+
+#: ../panels/network/network.ui.h:29
+msgid "_Socks Host"
+msgstr "_Socks Host"
+
+#: ../panels/network/network.ui.h:30
 msgctxt "proxy method"
 msgid "Automatic"
 msgstr "Automatic"
 
-#: ../panels/network/network.ui.h:26
+#: ../panels/network/network.ui.h:31
 msgctxt "proxy method"
 msgid "Manual"
 msgstr "Manual"
 
-#: ../panels/network/network.ui.h:27
+#: ../panels/network/network.ui.h:32
 msgctxt "proxy method"
 msgid "None"
 msgstr "None"
 
 #. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:76
+#: ../panels/network/panel-common.c:82
 msgid "Wired"
 msgstr "Wired"
 
 #. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:80
+#: ../panels/network/panel-common.c:86
 msgid "Wireless"
 msgstr "Wireless"
 
 #. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:87
+#: ../panels/network/panel-common.c:93
 msgid "Mobile broadband"
 msgstr "Mobile broadband"
 
 #. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:92
+#: ../panels/network/panel-common.c:98
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
 #. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:96
+#: ../panels/network/panel-common.c:102
 msgid "Mesh"
 msgstr "Mesh"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:155
+#: ../panels/network/panel-common.c:161
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:159
+#: ../panels/network/panel-common.c:165
 msgid "Infrastructure"
 msgstr "Infrastructure"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:177
+#. TRANSLATORS: VPN status
+#: ../panels/network/panel-common.c:183 ../panels/network/panel-common.c:241
 msgid "Status unknown"
 msgstr "Status unknown"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:181
+#: ../panels/network/panel-common.c:187
 msgid "Unmanaged"
 msgstr "Unmanaged"
 
-#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:185
+#: ../panels/network/panel-common.c:192
+msgid "Cable unplugged"
+msgstr "Cable unplugged"
+
+#: ../panels/network/panel-common.c:194
 msgid "Unavailable"
 msgstr "Unavailable"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:189
+#: ../panels/network/panel-common.c:198
 msgid "Disconnected"
 msgstr "Disconnected"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:193
-msgid "Preparing connection"
-msgstr "Preparing connection"
+#. TRANSLATORS: VPN status
+#: ../panels/network/panel-common.c:205 ../panels/network/panel-common.c:247
+msgid "Connecting"
+msgstr "Connecting"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:197
-msgid "Configuring connection"
-msgstr "Configuring connection"
+#. TRANSLATORS: VPN status
+#: ../panels/network/panel-common.c:209 ../panels/network/panel-common.c:251
+msgid "Authentication required"
+msgstr "Authentication required"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:201
-msgid "Authenticating"
-msgstr "Authenticating"
-
-#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:205
-msgid "Getting network address"
-msgstr "Getting network address"
-
-#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:209
-msgid "Checking network address"
-msgstr "Checking network address"
-
-#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:213
+#. TRANSLATORS: VPN status
+#: ../panels/network/panel-common.c:213 ../panels/network/panel-common.c:255
 msgid "Connected"
 msgstr "Connected"
 
@@ -1941,15 +2001,22 @@ msgid "Disconnecting"
 msgstr "Disconnecting"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:221
-msgid "Failed to connect"
-msgstr "Failed to connect"
+#. TRANSLATORS: VPN status
+#: ../panels/network/panel-common.c:221 ../panels/network/panel-common.c:259
+msgid "Connection failed"
+msgstr "Connection failed"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:225
+#. TRANSLATORS: VPN status
+#: ../panels/network/panel-common.c:225 ../panels/network/panel-common.c:267
 msgid "Status unknown (missing)"
 msgstr "Status unknown (missing)"
 
+#. TRANSLATORS: VPN status
+#: ../panels/network/panel-common.c:263
+msgid "Not connected"
+msgstr "Not connected"
+
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:1
 msgid "Power"
 msgstr "Power"
@@ -2047,7 +2114,7 @@ msgstr "10 minutes"
 msgid "30 minutes"
 msgstr "30 minutes"
 
-#: ../panels/power/power.ui.h:4 ../panels/screen/screen.ui.h:7
+#: ../panels/power/power.ui.h:4 ../panels/screen/screen.ui.h:8
 msgid "5 minutes"
 msgstr "5 minutes"
 
@@ -2116,32 +2183,36 @@ msgstr "2 minutes"
 msgid "3 minutes"
 msgstr "3 minutes"
 
-#: ../panels/screen/screen.ui.h:8
+#: ../panels/screen/screen.ui.h:7
+msgid "30 seconds"
+msgstr "30 seconds"
+
+#: ../panels/screen/screen.ui.h:9
 msgid "Brightness"
 msgstr "Brightness"
 
-#: ../panels/screen/screen.ui.h:9
+#: ../panels/screen/screen.ui.h:10
 msgid "Dim screen to save power"
 msgstr "Dim screen to save power"
 
 #. To translators: This asks whether you want to lock the screen (through the screensaver) when you're detected to be physically in your home (your house, etc.)
-#: ../panels/screen/screen.ui.h:11
+#: ../panels/screen/screen.ui.h:12
 msgid "Don't lock when at home"
 msgstr "Don't lock when at home"
 
-#: ../panels/screen/screen.ui.h:12
+#: ../panels/screen/screen.ui.h:13
 msgid "Locations..."
 msgstr "Locationsâ?¦"
 
-#: ../panels/screen/screen.ui.h:14
+#: ../panels/screen/screen.ui.h:15
 msgid "Lock screen after:"
 msgstr "Lock screen after:"
 
-#: ../panels/screen/screen.ui.h:15
+#: ../panels/screen/screen.ui.h:16
 msgid "Screen turns off"
 msgstr "Screen turns off"
 
-#: ../panels/screen/screen.ui.h:16
+#: ../panels/screen/screen.ui.h:17
 msgid "Turn off after:"
 msgstr "Turn off after:"
 
@@ -2215,17 +2286,17 @@ msgstr "_Fade:"
 msgid "_Subwoofer:"
 msgstr "_Subwoofer:"
 
-#: ../panels/sound/gvc-channel-bar.c:602 ../panels/sound/gvc-channel-bar.c:611
+#: ../panels/sound/gvc-channel-bar.c:603 ../panels/sound/gvc-channel-bar.c:612
 msgctxt "volume"
 msgid "100%"
 msgstr "100%"
 
-#: ../panels/sound/gvc-channel-bar.c:606
+#: ../panels/sound/gvc-channel-bar.c:607
 msgctxt "volume"
 msgid "Unamplified"
 msgstr "Unamplified"
 
-#: ../panels/sound/gvc-channel-bar.c:900
+#: ../panels/sound/gvc-channel-bar.c:901
 msgid "Mute"
 msgstr "Mute"
 
@@ -2235,7 +2306,7 @@ msgstr "_Profile:"
 
 #. translators:
 #. * The number of sound outputs on a particular device
-#: ../panels/sound/gvc-mixer-control.c:1098
+#: ../panels/sound/gvc-mixer-control.c:1091
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@@ -2244,14 +2315,14 @@ msgstr[1] "%u Outputs"
 
 #. translators:
 #. * The number of sound inputs on a particular device
-#: ../panels/sound/gvc-mixer-control.c:1108
+#: ../panels/sound/gvc-mixer-control.c:1101
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
 msgstr[0] "%u Input"
 msgstr[1] "%u Inputs"
 
-#: ../panels/sound/gvc-mixer-control.c:1406
+#: ../panels/sound/gvc-mixer-control.c:1399
 msgid "System Sounds"
 msgstr "System Sounds"
 
@@ -2266,7 +2337,7 @@ msgstr "Peak detect"
 
 #: ../panels/sound/gvc-mixer-dialog.c:1507
 #: ../panels/sound/gvc-mixer-dialog.c:1719
-#: ../panels/sound/gvc-sound-theme-chooser.c:591
+#: ../panels/sound/gvc-sound-theme-chooser.c:596
 msgid "Name"
 msgstr "Name"
 
@@ -2362,27 +2433,27 @@ msgstr "_Sound Preferences"
 msgid "Muted"
 msgstr "Muted"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:188
+#: ../panels/sound/gvc-sound-theme-chooser.c:190
 msgid "Built-in"
 msgstr "Built-in"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:451
-#: ../panels/sound/gvc-sound-theme-chooser.c:463
-#: ../panels/sound/gvc-sound-theme-chooser.c:475
+#: ../panels/sound/gvc-sound-theme-chooser.c:456
+#: ../panels/sound/gvc-sound-theme-chooser.c:468
+#: ../panels/sound/gvc-sound-theme-chooser.c:480
 msgid "Sound Preferences"
 msgstr "Sound Preferences"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:454
-#: ../panels/sound/gvc-sound-theme-chooser.c:465
-#: ../panels/sound/gvc-sound-theme-chooser.c:477
+#: ../panels/sound/gvc-sound-theme-chooser.c:459
+#: ../panels/sound/gvc-sound-theme-chooser.c:470
+#: ../panels/sound/gvc-sound-theme-chooser.c:482
 msgid "Testing event sound"
 msgstr "Testing event sound"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:582
+#: ../panels/sound/gvc-sound-theme-chooser.c:587
 msgid "From theme"
 msgstr "From theme"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:764
+#: ../panels/sound/gvc-sound-theme-chooser.c:782
 msgid "C_hoose an alert sound:"
 msgstr "C_hoose an alert sound:"
 
@@ -2585,10 +2656,6 @@ msgstr "Mouse Settings"
 msgid "Nomon"
 msgstr "Nomon"
 
-#: ../panels/universal-access/uap.ui.h:43
-msgid "None"
-msgstr "None"
-
 #: ../panels/universal-access/uap.ui.h:45
 msgid "On screen keyboard"
 msgstr "On-screen keyboard"
@@ -2859,13 +2926,6 @@ msgctxt "Account type"
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../panels/user-accounts/um-account-type.c:39
-#: ../panels/user-accounts/data/account-dialog.ui.h:3
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
-msgctxt "Account type"
-msgid "Supervised"
-msgstr "Supervised"
-
 #: ../panels/user-accounts/um-fingerprint-dialog.c:107
 msgid ""
 "You are not allowed to access the device. Contact your system administrator."
@@ -3042,29 +3102,29 @@ msgstr "Wrong password"
 msgid "Select"
 msgstr "Select"
 
-#: ../panels/user-accounts/um-photo-dialog.c:429
+#: ../panels/user-accounts/um-photo-dialog.c:445
 msgid "Disable image"
 msgstr "Disable image"
 
-#: ../panels/user-accounts/um-photo-dialog.c:447
+#: ../panels/user-accounts/um-photo-dialog.c:463
 msgid "Take a photo..."
 msgstr "Take a photoâ?¦"
 
-#: ../panels/user-accounts/um-photo-dialog.c:465
+#: ../panels/user-accounts/um-photo-dialog.c:481
 msgid "Browse for more pictures..."
 msgstr "Browse for more picturesâ?¦"
 
-#: ../panels/user-accounts/um-photo-dialog.c:690
+#: ../panels/user-accounts/um-photo-dialog.c:706
 #, c-format
 msgid "Used by %s"
 msgstr "Used by %s"
 
-#: ../panels/user-accounts/um-user-manager.c:430
+#: ../panels/user-accounts/um-user-manager.c:432
 #, 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:525
+#: ../panels/user-accounts/um-user-manager.c:527
 msgid "This user does not exist."
 msgstr "This user does not exist."
 
@@ -3192,31 +3252,26 @@ msgstr "Login;Name;Fingerprint;Avatar;Logo;Face;Password;"
 msgid "User Accounts"
 msgstr "User Accounts"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:4
+#: ../panels/user-accounts/data/account-dialog.ui.h:3
 msgid "Cr_eate"
 msgstr "Cr_eate"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:5
+#: ../panels/user-accounts/data/account-dialog.ui.h:4
 msgid "Create new account"
 msgstr "Create new account"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:6
+#: ../panels/user-accounts/data/account-dialog.ui.h:5
 msgid "_Account Type"
 msgstr "_Account Type"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:7
+#: ../panels/user-accounts/data/account-dialog.ui.h:6
 msgid "_Full name"
 msgstr "_Full name"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:8
+#: ../panels/user-accounts/data/account-dialog.ui.h:7
 msgid "_Username"
 msgstr "_Username"
 
-#: ../panels/user-accounts/data/language-chooser.ui.h:1
-#: ../panels/user-accounts/data/photo-dialog.ui.h:3
-msgid "Cancel"
-msgstr "Cancel"
-
 #: ../panels/user-accounts/data/password-dialog.ui.h:1
 msgid ""
 "<a href=\"http://wolfram.org/writing/howto/password.html\";>How to choose a "
@@ -3329,19 +3384,19 @@ msgstr "Account Information"
 msgid "Account type"
 msgstr "Account type"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
 msgid "Automatic Login"
 msgstr "Automatic Login"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
 msgid "Fingerprint Login"
 msgstr "Fingerprint Login"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
 msgid "Login Options"
 msgstr "Login Options"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
 msgid "Password"
 msgstr "Password"
 
@@ -3397,19 +3452,23 @@ msgstr ""
 "Your fingerprint was successfully saved. You should now be able to log in "
 "using your fingerprint reader."
 
-#: ../shell/control-center.c:47
+#: ../shell/control-center.c:50
+msgid "Enable verbose mode"
+msgstr "Enable verbose mode"
+
+#: ../shell/control-center.c:51
 msgid "Show the overview"
 msgstr "Show the overview"
 
-#: ../shell/control-center.c:48
+#: ../shell/control-center.c:52
 msgid "Panel to display"
 msgstr "Panel to display"
 
-#: ../shell/control-center.c:65
+#: ../shell/control-center.c:69
 msgid "- System Settings"
 msgstr "- System Settings"
 
-#: ../shell/control-center.c:72
+#: ../shell/control-center.c:76
 #, c-format
 msgid ""
 "%s\n"
@@ -3430,6 +3489,76 @@ msgstr "Control Centre"
 msgid "_All Settings"
 msgstr "_All Settings"
 
+#~ msgid "16"
+#~ msgstr "16"
+
+#~ msgid "2010"
+#~ msgstr "2010"
+
+#~ msgid "22"
+#~ msgstr "22"
+
+#~ msgid "45"
+#~ msgstr "45"
+
+#~ msgid "AM"
+#~ msgstr "AM"
+
+#~ msgid "Clean print heads"
+#~ msgstr "Clean print heads"
+
+#~ msgid "An error has occured during a maintenance command."
+#~ msgstr "An error has occurred during a maintenance command."
+
+#~ msgid "Info"
+#~ msgstr "Info"
+
+#~ msgid "Select a display language"
+#~ msgstr "Select a display language"
+
+#~ msgid "Locate Pointer"
+#~ msgstr "Locate Pointer"
+
+#~ msgid "Mouse Orientation"
+#~ msgstr "Mouse Orientation"
+
+#~ msgid "Set the system proxy settings"
+#~ msgstr "Set the system proxy settings"
+
+#~ msgid "The running NetworkManager version is not compatible (too new)."
+#~ msgstr "The running NetworkManager version is not compatible (too new)."
+
+#~ msgid "The running NetworkManager version is not compatible (too old)."
+#~ msgstr "The running NetworkManager version is not compatible (too old)."
+
+#~ msgid "IP Address:"
+#~ msgstr "IP Address:"
+
+#~ msgid "Secure HTTP Proxy:"
+#~ msgstr "Secure HTTP Proxy:"
+
+#~ msgid "Preparing connection"
+#~ msgstr "Preparing connection"
+
+#~ msgid "Configuring connection"
+#~ msgstr "Configuring connection"
+
+#~ msgid "Authenticating"
+#~ msgstr "Authenticating"
+
+#~ msgid "Getting network address"
+#~ msgstr "Getting network address"
+
+#~ msgid "Checking network address"
+#~ msgstr "Checking network address"
+
+#~ msgid "Failed to connect"
+#~ msgstr "Failed to connect"
+
+#~ msgctxt "Account type"
+#~ msgid "Supervised"
+#~ msgstr "Supervised"
+
 #~ msgid "More Info"
 #~ msgstr "More Info"
 
@@ -3449,9 +3578,6 @@ msgstr "_All Settings"
 #~ msgid "%i kb/s"
 #~ msgstr "%i kb/s"
 
-#~ msgid "%i Mb/s"
-#~ msgstr "%i Mb/s"
-
 #~ msgid "%i Gb/s"
 #~ msgstr "%i Gb/s"
 
@@ -4390,9 +4516,6 @@ msgstr "_All Settings"
 #~ msgid "A_IM/iChat:"
 #~ msgstr "A_IM/iChat:"
 
-#~ msgid "A_ddress:"
-#~ msgstr "A_ddress:"
-
 #~ msgid "About Me"
 #~ msgstr "About Me"
 
@@ -5209,9 +5332,6 @@ msgstr "_All Settings"
 #~ msgid "_Select windows when the mouse moves over them"
 #~ msgstr "_Select windows when the mouse moves over them"
 
-#~ msgid "seconds"
-#~ msgstr "seconds"
-
 #~ msgid "Set your window properties"
 #~ msgstr "Set your window properties"
 
@@ -5434,9 +5554,6 @@ msgstr "_All Settings"
 #~ msgid "Fill screen"
 #~ msgstr "Fill screen"
 
-#~ msgid "Interface"
-#~ msgstr "Interface"
-
 #~ msgid "Menus and Toolbars"
 #~ msgstr "Menus and Toolbars"
 
@@ -6824,9 +6941,6 @@ msgstr "_All Settings"
 #~ msgid "Please specify a name and a command for this editor."
 #~ msgstr "Please specify a name and a command for this editor."
 
-#~ msgid "Add..."
-#~ msgstr "Addâ?¦"
-
 #~ msgid "C_ustom:"
 #~ msgstr "C_ustom:"