diff --git a/po/en_GB.po b/po/en_GB.po
index db46d418b..8adf977a8 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-30 14:52+0100\n"
-"PO-Revision-Date: 2011-03-30 14:55+0100\n"
+"POT-Creation-Date: 2011-09-11 14:56+0100\n"
+"PO-Revision-Date: 2011-09-11 15:02+0100\n"
 "Last-Translator: Bruce Cowan <bruce@bcowan.me.uk>\n"
 "Language-Team: British English <en@li.org>\n"
 "Language: en_GB\n"
@@ -16,7 +16,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.6.1\n"
+"X-Generator: Virtaal 0.7.1-beta1\n"
+"X-Project-Style: gnome\n"
 
 #: ../data/gnome-shell.desktop.in.in.h:1
 msgid "GNOME Shell"
@@ -49,10 +50,12 @@ msgstr "Framerate used for recording screencasts."
 #: ../data/org.gnome.shell.gschema.xml.in.h:5
 msgid ""
 "GNOME Shell extensions have a uuid property; this key lists extensions which "
-"should not be loaded."
+"should be loaded. disabled-extensions overrides this setting for extensions "
+"that appear in both lists."
 msgstr ""
-"GNOME Shell extensions have a 'uuid' property; this key lists extensions "
-"which should not be loaded."
+"GNOME Shell extensions have a uuid property; this key lists extensions which "
+"should be loaded. disabled-extensions overrides this setting for extensions "
+"that appear in both lists."
 
 #: ../data/org.gnome.shell.gschema.xml.in.h:6
 msgid "History for command (Alt-F2) dialog"
@@ -67,18 +70,22 @@ msgid "If true, display date in the clock, in addition to time."
 msgstr "If true, display date in the clock, in addition to time."
 
 #: ../data/org.gnome.shell.gschema.xml.in.h:9
+msgid "If true, display onscreen keyboard."
+msgstr "If true, display on-screen keyboard."
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:10
 msgid "If true, display seconds in time."
 msgstr "If true, display seconds in time."
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:10
+#: ../data/org.gnome.shell.gschema.xml.in.h:11
 msgid "If true, display the ISO week date in the calendar."
 msgstr "If true, display the ISO week date in the calendar."
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:11
+#: ../data/org.gnome.shell.gschema.xml.in.h:12
 msgid "List of desktop file IDs for favorite applications"
 msgstr "List of desktop file IDs for favourite applications"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:13
+#: ../data/org.gnome.shell.gschema.xml.in.h:14
 #, no-c-format
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
@@ -103,19 +110,23 @@ msgstr ""
 "records to WEBM using the VP8 codec. %T is used as a placeholder for a guess "
 "at the optimal thread count on the system."
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.h:15
 msgid "Show date in clock"
 msgstr "Show date in clock"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:15
+#: ../data/org.gnome.shell.gschema.xml.in.h:16
+msgid "Show the onscreen keyboard"
+msgstr "Show the on-screen keyboard"
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:17
 msgid "Show the week date in the calendar"
 msgstr "Show the week date in the calendar"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.h:18
 msgid "Show time with seconds"
 msgstr "Show time with seconds"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:17
+#: ../data/org.gnome.shell.gschema.xml.in.h:19
 msgid ""
 "The applications corresponding to these identifiers will be displayed in the "
 "favorites area."
@@ -123,7 +134,7 @@ msgstr ""
 "The applications corresponding to these identifiers will be displayed in the "
 "favourites area."
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:18
+#: ../data/org.gnome.shell.gschema.xml.in.h:20
 msgid ""
 "The filename for recorded screencasts will be a unique filename based on the "
 "current date, and use this extension. It should be changed when recording to "
@@ -133,7 +144,7 @@ msgstr ""
 "current date, and use this extension. It should be changed when recording to "
 "a different container format."
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:19
+#: ../data/org.gnome.shell.gschema.xml.in.h:21
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
@@ -141,11 +152,11 @@ msgstr ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames per second."
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:20
+#: ../data/org.gnome.shell.gschema.xml.in.h:22
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "The GStreamer pipeline used to encode the screencast"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.h:23
 msgid ""
 "The shell normally monitors active applications in order to present the most "
 "used ones (e.g. in launchers). While this data will be kept private, you may "
@@ -157,84 +168,129 @@ msgstr ""
 "want to disable this for privacy reasons. Please note that doing so won't "
 "remove existing data."
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:22
-msgid "Uuids of extensions to disable"
-msgstr "UUIDs of extensions to disable"
+#: ../data/org.gnome.shell.gschema.xml.in.h:24
+msgid "The type of keyboard to use."
+msgstr "The type of keyboard to use."
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:23
+#: ../data/org.gnome.shell.gschema.xml.in.h:25
+msgid "Uuids of extensions to enable"
+msgstr "Uuids of extensions to enable"
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:26
 msgid "Whether to collect stats about applications usage"
 msgstr "Whether to collect statistics about application usage"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:24
+#: ../data/org.gnome.shell.gschema.xml.in.h:27
+msgid "Which keyboard to use"
+msgstr "Which keyboard to use"
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:28
 msgid "disabled OpenSearch providers"
 msgstr "disabled OpenSearch providers"
 
-#: ../js/misc/util.js:71
+#: ../js/gdm/loginDialog.js:604
+msgid "Session..."
+msgstr "Session…"
+
+#: ../js/gdm/loginDialog.js:761
+msgctxt "title"
+msgid "Sign In"
+msgstr "Sign In"
+
+#: ../js/gdm/loginDialog.js:818
+msgid "Not listed?"
+msgstr "Not listed?"
+
+#: ../js/gdm/loginDialog.js:928 ../js/ui/endSessionDialog.js:410
+#: ../js/ui/networkAgent.js:158 ../js/ui/polkitAuthenticationAgent.js:170
+#: ../js/ui/status/bluetooth.js:480
+msgid "Cancel"
+msgstr "Cancel"
+
+#: ../js/gdm/loginDialog.js:933
+msgctxt "button"
+msgid "Sign In"
+msgstr "Sign In"
+
+#: ../js/gdm/loginDialog.js:1253
+msgid "Login Window"
+msgstr "Login Window"
+
+#: ../js/misc/util.js:92
 msgid "Command not found"
 msgstr "Command not found"
 
 #. Replace "Error invoking GLib.shell_parse_argv: " with
 #. something nicer
-#: ../js/misc/util.js:98
+#: ../js/misc/util.js:119
 msgid "Could not parse command:"
 msgstr "Could not parse command:"
 
-#: ../js/misc/util.js:106
+#: ../js/misc/util.js:127
 #, c-format
 msgid "Execution of '%s' failed:"
 msgstr "Execution of '%s' failed:"
 
 #. Translators: Filter to display all applications
-#: ../js/ui/appDisplay.js:230
+#: ../js/ui/appDisplay.js:255
 msgid "All"
 msgstr "All"
 
-#: ../js/ui/appDisplay.js:328
+#: ../js/ui/appDisplay.js:319
 msgid "APPLICATIONS"
 msgstr "APPLICATIONS"
 
-#: ../js/ui/appDisplay.js:354
+#: ../js/ui/appDisplay.js:377
 msgid "SETTINGS"
 msgstr "SETTINGS"
 
-#: ../js/ui/appDisplay.js:625
+#: ../js/ui/appDisplay.js:685
 msgid "New Window"
 msgstr "New Window"
 
-#: ../js/ui/appDisplay.js:628
+#: ../js/ui/appDisplay.js:688
 msgid "Remove from Favorites"
 msgstr "Remove from Favourites"
 
-#: ../js/ui/appDisplay.js:629
+#: ../js/ui/appDisplay.js:689
 msgid "Add to Favorites"
 msgstr "Add to Favourites"
 
-#: ../js/ui/appFavorites.js:91
+#: ../js/ui/appFavorites.js:89
 #, c-format
 msgid "%s has been added to your favorites."
 msgstr "%s has been added to your favourites."
 
-#: ../js/ui/appFavorites.js:122
+#: ../js/ui/appFavorites.js:120
 #, c-format
 msgid "%s has been removed from your favorites."
 msgstr "%s has been removed from your favourites."
 
+#: ../js/ui/autorunManager.js:592
+#, c-format
+msgid "Open with %s"
+msgstr "Open with %s"
+
+#: ../js/ui/autorunManager.js:618
+msgid "Eject"
+msgstr "Eject"
+
 #. Translators: Shown in calendar event list for all day events
 #. * Keep it short, best if you can use less then 10 characters
 #.
-#: ../js/ui/calendar.js:66
+#: ../js/ui/calendar.js:63
 msgctxt "event list time"
 msgid "All Day"
 msgstr "All Day"
 
 #. Translators: Shown in calendar event list, if 24h format
-#: ../js/ui/calendar.js:71
+#: ../js/ui/calendar.js:68
 msgctxt "event list time"
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. Transators: Shown in calendar event list, if 12h format
-#: ../js/ui/calendar.js:78
+#: ../js/ui/calendar.js:75
 msgctxt "event list time"
 msgid "%l:%M %p"
 msgstr "%l:%M %p"
@@ -244,43 +300,43 @@ msgstr "%l:%M %p"
 #. * NOTE: These grid abbreviations are always shown together
 #. * and in order, e.g. "S M T W T F S".
 #.
-#: ../js/ui/calendar.js:118
+#: ../js/ui/calendar.js:115
 msgctxt "grid sunday"
 msgid "S"
 msgstr "S"
 
 #. Translators: Calendar grid abbreviation for Monday
-#: ../js/ui/calendar.js:120
+#: ../js/ui/calendar.js:117
 msgctxt "grid monday"
 msgid "M"
 msgstr "M"
 
 #. Translators: Calendar grid abbreviation for Tuesday
-#: ../js/ui/calendar.js:122
+#: ../js/ui/calendar.js:119
 msgctxt "grid tuesday"
 msgid "T"
 msgstr "T"
 
 #. Translators: Calendar grid abbreviation for Wednesday
-#: ../js/ui/calendar.js:124
+#: ../js/ui/calendar.js:121
 msgctxt "grid wednesday"
 msgid "W"
 msgstr "W"
 
 #. Translators: Calendar grid abbreviation for Thursday
-#: ../js/ui/calendar.js:126
+#: ../js/ui/calendar.js:123
 msgctxt "grid thursday"
 msgid "T"
 msgstr "T"
 
 #. Translators: Calendar grid abbreviation for Friday
-#: ../js/ui/calendar.js:128
+#: ../js/ui/calendar.js:125
 msgctxt "grid friday"
 msgid "F"
 msgstr "F"
 
 #. Translators: Calendar grid abbreviation for Saturday
-#: ../js/ui/calendar.js:130
+#: ../js/ui/calendar.js:127
 msgctxt "grid saturday"
 msgid "S"
 msgstr "S"
@@ -291,308 +347,421 @@ msgstr "S"
 #. * so they need to be unique (e.g. Tuesday and Thursday cannot
 #. * both be 'T').
 #.
-#: ../js/ui/calendar.js:143
+#: ../js/ui/calendar.js:140
 msgctxt "list sunday"
 msgid "Su"
 msgstr "Su"
 
 #. Translators: Event list abbreviation for Monday
-#: ../js/ui/calendar.js:145
+#: ../js/ui/calendar.js:142
 msgctxt "list monday"
 msgid "M"
 msgstr "M"
 
 #. Translators: Event list abbreviation for Tuesday
-#: ../js/ui/calendar.js:147
+#: ../js/ui/calendar.js:144
 msgctxt "list tuesday"
 msgid "T"
 msgstr "Tu"
 
 #. Translators: Event list abbreviation for Wednesday
-#: ../js/ui/calendar.js:149
+#: ../js/ui/calendar.js:146
 msgctxt "list wednesday"
 msgid "W"
 msgstr "W"
 
 #. Translators: Event list abbreviation for Thursday
-#: ../js/ui/calendar.js:151
+#: ../js/ui/calendar.js:148
 msgctxt "list thursday"
 msgid "Th"
 msgstr "Th"
 
 #. Translators: Event list abbreviation for Friday
-#: ../js/ui/calendar.js:153
+#: ../js/ui/calendar.js:150
 msgctxt "list friday"
 msgid "F"
 msgstr "F"
 
 #. Translators: Event list abbreviation for Saturday
-#: ../js/ui/calendar.js:155
+#: ../js/ui/calendar.js:152
 msgctxt "list saturday"
 msgid "S"
 msgstr "Sa"
 
 #. Translators: Text to show if there are no events
-#: ../js/ui/calendar.js:704
+#: ../js/ui/calendar.js:687
 msgid "Nothing Scheduled"
 msgstr "Nothing Scheduled"
 
 #. Translators: Shown on calendar heading when selected day occurs on current year
-#: ../js/ui/calendar.js:720 ../js/ui/telepathyClient.js:490
+#: ../js/ui/calendar.js:703
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %d %B"
 
 #. Translators: Shown on calendar heading when selected day occurs on different year
-#: ../js/ui/calendar.js:723 ../js/ui/telepathyClient.js:493
+#: ../js/ui/calendar.js:706
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
-#: ../js/ui/calendar.js:733
+#: ../js/ui/calendar.js:716
 msgid "Today"
 msgstr "Today"
 
-#: ../js/ui/calendar.js:737
+#: ../js/ui/calendar.js:720
 msgid "Tomorrow"
 msgstr "Tomorrow"
 
-#: ../js/ui/calendar.js:746
+#: ../js/ui/calendar.js:729
 msgid "This week"
 msgstr "This week"
 
-#: ../js/ui/calendar.js:754
+#: ../js/ui/calendar.js:737
 msgid "Next week"
 msgstr "Next week"
 
-#: ../js/ui/dash.js:174 ../js/ui/messageTray.js:1007
+#: ../js/ui/contactDisplay.js:59 ../js/ui/notificationDaemon.js:444
+#: ../js/ui/status/power.js:223 ../src/shell-app.c:355
+msgid "Unknown"
+msgstr "Unknown"
+
+#: ../js/ui/contactDisplay.js:80 ../js/ui/userMenu.js:147
+msgid "Available"
+msgstr "Available"
+
+#: ../js/ui/contactDisplay.js:85 ../js/ui/userMenu.js:156
+msgid "Away"
+msgstr "Away"
+
+#: ../js/ui/contactDisplay.js:89 ../js/ui/userMenu.js:150
+msgid "Busy"
+msgstr "Busy"
+
+#: ../js/ui/contactDisplay.js:93
+msgid "Offline"
+msgstr "Offline"
+
+#: ../js/ui/contactDisplay.js:140
+msgid "CONTACTS"
+msgstr "CONTACTS"
+
+#: ../js/ui/dash.js:172 ../js/ui/messageTray.js:1195
 msgid "Remove"
 msgstr "Remove"
 
-#: ../js/ui/dateMenu.js:91
+#: ../js/ui/dateMenu.js:99
 msgid "Date and Time Settings"
 msgstr "Date and Time Settings"
 
-#: ../js/ui/dateMenu.js:111
+#: ../js/ui/dateMenu.js:125
 msgid "Open Calendar"
 msgstr "Open Calendar"
 
 #. Translators: This is the time format with date used
 #. in 24-hour mode.
-#: ../js/ui/dateMenu.js:164
+#: ../js/ui/dateMenu.js:183
 msgid "%a %b %e, %R:%S"
 msgstr "%a %e %b, %R:%S"
 
-#: ../js/ui/dateMenu.js:165
+#: ../js/ui/dateMenu.js:184
 msgid "%a %b %e, %R"
 msgstr "%a %e %b, %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
-#: ../js/ui/dateMenu.js:169
+#: ../js/ui/dateMenu.js:188
 msgid "%a %R:%S"
 msgstr "%a %R:%S"
 
-#: ../js/ui/dateMenu.js:170
+#: ../js/ui/dateMenu.js:189
 msgid "%a %R"
 msgstr "%a %R"
 
 #. Translators: This is a time format with date used
 #. for AM/PM.
-#: ../js/ui/dateMenu.js:177
+#: ../js/ui/dateMenu.js:196
 msgid "%a %b %e, %l:%M:%S %p"
 msgstr "%a %e %b, %l:%M:%S %p"
 
-#: ../js/ui/dateMenu.js:178
+#: ../js/ui/dateMenu.js:197
 msgid "%a %b %e, %l:%M %p"
 msgstr "%a %e %b, %l:%M %p"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../js/ui/dateMenu.js:182
+#: ../js/ui/dateMenu.js:201
 msgid "%a %l:%M:%S %p"
 msgstr "%a %l:%M:%S %p"
 
-#: ../js/ui/dateMenu.js:183
+#: ../js/ui/dateMenu.js:202
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
 #. Translators: This is the date format to use when the calendar popup is
 #. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
 #.
-#: ../js/ui/dateMenu.js:194
+#: ../js/ui/dateMenu.js:213
 msgid "%A %B %e, %Y"
 msgstr "%A %e %B, %Y"
 
-#: ../js/ui/docDisplay.js:19
+#: ../js/ui/docDisplay.js:16
 msgid "RECENT ITEMS"
 msgstr "RECENT ITEMS"
 
-#: ../js/ui/endSessionDialog.js:63
+#: ../js/ui/endSessionDialog.js:60
 #, c-format
 msgid "Log Out %s"
 msgstr "Log Out %s"
 
-#: ../js/ui/endSessionDialog.js:64 ../js/ui/endSessionDialog.js:70
+#: ../js/ui/endSessionDialog.js:61 ../js/ui/endSessionDialog.js:67
 msgid "Log Out"
 msgstr "Log Out"
 
-#: ../js/ui/endSessionDialog.js:65
+#: ../js/ui/endSessionDialog.js:62
 msgid "Click Log Out to quit these applications and log out of the system."
 msgstr "Click Log Out to quit these applications and log out of the system."
 
-#: ../js/ui/endSessionDialog.js:66
+#: ../js/ui/endSessionDialog.js:63
 #, c-format
 msgid "%s will be logged out automatically in %d seconds."
 msgstr "%s will be logged out automatically in %d seconds."
 
-#: ../js/ui/endSessionDialog.js:67
+#: ../js/ui/endSessionDialog.js:64
 #, c-format
 msgid "You will be logged out automatically in %d seconds."
 msgstr "You will be logged out automatically in %d seconds."
 
-#: ../js/ui/endSessionDialog.js:68
+#: ../js/ui/endSessionDialog.js:65
 msgid "Logging out of the system."
 msgstr "Logging out of the system."
 
-#: ../js/ui/endSessionDialog.js:75 ../js/ui/endSessionDialog.js:82
+#: ../js/ui/endSessionDialog.js:72 ../js/ui/endSessionDialog.js:79
 msgid "Power Off"
 msgstr "Power Off"
 
-#: ../js/ui/endSessionDialog.js:76
+#: ../js/ui/endSessionDialog.js:73
 msgid "Click Power Off to quit these applications and power off the system."
 msgstr "Click Power Off to quit these applications and power off the system."
 
-#: ../js/ui/endSessionDialog.js:77
+#: ../js/ui/endSessionDialog.js:74
 #, c-format
 msgid "The system will power off automatically in %d seconds."
 msgstr "The system will power off automatically in %d seconds."
 
-#: ../js/ui/endSessionDialog.js:78
+#: ../js/ui/endSessionDialog.js:75
 msgid "Powering off the system."
 msgstr "Powering off the system."
 
-#: ../js/ui/endSessionDialog.js:80 ../js/ui/endSessionDialog.js:88
-#: ../js/ui/endSessionDialog.js:93
+#: ../js/ui/endSessionDialog.js:77 ../js/ui/endSessionDialog.js:85
+#: ../js/ui/endSessionDialog.js:90
 msgid "Restart"
 msgstr "Restart"
 
-#: ../js/ui/endSessionDialog.js:89
+#: ../js/ui/endSessionDialog.js:86
 msgid "Click Restart to quit these applications and restart the system."
 msgstr "Click Restart to quit these applications and restart the system."
 
-#: ../js/ui/endSessionDialog.js:90
+#: ../js/ui/endSessionDialog.js:87
 #, c-format
 msgid "The system will restart automatically in %d seconds."
 msgstr "The system will restart automatically in %d seconds."
 
-#: ../js/ui/endSessionDialog.js:91
+#: ../js/ui/endSessionDialog.js:88
 msgid "Restarting the system."
 msgstr "Restarting the system."
 
-#: ../js/ui/endSessionDialog.js:415 ../js/ui/polkitAuthenticationAgent.js:172
-#: ../js/ui/status/bluetooth.js:466
-msgid "Cancel"
-msgstr "Cancel"
+#: ../js/ui/keyboard.js:513 ../js/ui/status/power.js:211
+msgid "Keyboard"
+msgstr "Keyboard"
 
-#: ../js/ui/lookingGlass.js:588
+#: ../js/ui/lookingGlass.js:641
 msgid "No extensions installed"
 msgstr "No extensions installed"
 
-#: ../js/ui/lookingGlass.js:625
+#: ../js/ui/lookingGlass.js:687
 msgid "Enabled"
 msgstr "Enabled"
 
 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:627 ../src/gvc/gvc-mixer-control.c:1091
+#: ../js/ui/lookingGlass.js:689 ../src/gvc/gvc-mixer-control.c:1093
 msgid "Disabled"
 msgstr "Disabled"
 
-#: ../js/ui/lookingGlass.js:629
+#: ../js/ui/lookingGlass.js:691
 msgid "Error"
 msgstr "Error"
 
-#: ../js/ui/lookingGlass.js:631
+#: ../js/ui/lookingGlass.js:693
 msgid "Out of date"
 msgstr "Out of date"
 
-#: ../js/ui/lookingGlass.js:656
+#: ../js/ui/lookingGlass.js:695
+msgid "Downloading"
+msgstr "Downloading"
+
+#: ../js/ui/lookingGlass.js:720
 msgid "View Source"
 msgstr "View Source"
 
-#: ../js/ui/lookingGlass.js:662
+#: ../js/ui/lookingGlass.js:726
 msgid "Web Page"
 msgstr "Web Page"
 
-#: ../js/ui/messageTray.js:1000
+#: ../js/ui/messageTray.js:1188
 msgid "Open"
 msgstr "Open"
 
-#: ../js/ui/messageTray.js:2164
+#: ../js/ui/messageTray.js:2367
 msgid "System Information"
 msgstr "System Information"
 
+#: ../js/ui/networkAgent.js:138
+msgid "Show password"
+msgstr "Show password"
+
+#: ../js/ui/networkAgent.js:153
+msgid "Connect"
+msgstr "Connect"
+
+#. Cisco LEAP
+#: ../js/ui/networkAgent.js:248 ../js/ui/networkAgent.js:260
+#: ../js/ui/networkAgent.js:287 ../js/ui/networkAgent.js:307
+#: ../js/ui/networkAgent.js:317
+msgid "Password: "
+msgstr "Password: "
+
+#. static WEP
+#: ../js/ui/networkAgent.js:253
+msgid "Key: "
+msgstr "Key: "
+
+#. TTLS and PEAP are actually much more complicated, but this complication
+#. is not visible here since we only care about phase2 authentication
+#. (and don't even care of which one)
+#: ../js/ui/networkAgent.js:285 ../js/ui/networkAgent.js:303
+msgid "Username: "
+msgstr "Username: "
+
+#: ../js/ui/networkAgent.js:291
+msgid "Identity: "
+msgstr "Identity: "
+
+#: ../js/ui/networkAgent.js:293
+msgid "Private key password: "
+msgstr "Private key password: "
+
+#: ../js/ui/networkAgent.js:305
+msgid "Service: "
+msgstr "Service: "
+
+#: ../js/ui/networkAgent.js:334
+msgid "Authentication required by wireless network"
+msgstr "Authentication required by wireless network"
+
+#: ../js/ui/networkAgent.js:335
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the wireless network "
+"'%s'."
+msgstr ""
+"Passwords or encryption keys are required to access the wireless network "
+"'%s'."
+
+#: ../js/ui/networkAgent.js:339
+msgid "Wired 802.1X authentication"
+msgstr "Wired 802.1X authentication"
+
+#: ../js/ui/networkAgent.js:341
+msgid "Network name: "
+msgstr "Network name: "
+
+#: ../js/ui/networkAgent.js:346
+msgid "DSL authentication"
+msgstr "DSL authentication"
+
+#: ../js/ui/networkAgent.js:353
+msgid "PIN code required"
+msgstr "PIN code required"
+
+#: ../js/ui/networkAgent.js:354
+msgid "PIN code is needed for the mobile broadband device"
+msgstr "PIN code is needed for the mobile broadband device"
+
+#: ../js/ui/networkAgent.js:355
+msgid "PIN: "
+msgstr "PIN: "
+
+#: ../js/ui/networkAgent.js:361
+msgid "Mobile broadband network password"
+msgstr "Mobile broadband network password"
+
+#: ../js/ui/networkAgent.js:362
+#, c-format
+msgid "A password is required to connect to '%s'."
+msgstr "A password is required to connect to '%s'."
+
 #: ../js/ui/overview.js:91
 msgid "Undo"
 msgstr "Undo"
 
-#: ../js/ui/overview.js:186
+#: ../js/ui/overview.js:205
 msgid "Windows"
 msgstr "Windows"
 
-#: ../js/ui/overview.js:189
+#: ../js/ui/overview.js:208
 msgid "Applications"
 msgstr "Applications"
 
 #. Translators: this is the name of the dock/favorites area on
 #. the left of the overview
-#: ../js/ui/overview.js:205
+#: ../js/ui/overview.js:230
 msgid "Dash"
 msgstr "Dash"
 
 #. TODO - _quit() doesn't really work on apps in state STARTING yet
-#: ../js/ui/panel.js:524
+#: ../js/ui/panel.js:538
 #, c-format
 msgid "Quit %s"
 msgstr "Quit %s"
 
-#. Button on the left side of the panel.
-#. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:902
+#. Translators: If there is no suitable word for "Activities"
+#. in your language, you can use the word for "Overview".
+#: ../js/ui/panel.js:574
 msgid "Activities"
 msgstr "Activities"
 
-#: ../js/ui/panel.js:1003
+#: ../js/ui/panel.js:967
 msgid "Top Bar"
 msgstr "Top Bar"
 
-#: ../js/ui/placeDisplay.js:122
+#: ../js/ui/placeDisplay.js:120
 #, c-format
 msgid "Failed to unmount '%s'"
 msgstr "Failed to unmount '%s'"
 
-#: ../js/ui/placeDisplay.js:125
+#: ../js/ui/placeDisplay.js:123
 msgid "Retry"
 msgstr "Retry"
 
-#: ../js/ui/placeDisplay.js:165
+#: ../js/ui/placeDisplay.js:163
 msgid "Connect to..."
 msgstr "Connect to…"
 
-#: ../js/ui/placeDisplay.js:380
+#: ../js/ui/placeDisplay.js:375
 msgid "PLACES & DEVICES"
 msgstr "PLACES & DEVICES"
 
-#: ../js/ui/polkitAuthenticationAgent.js:74
+#: ../js/ui/polkitAuthenticationAgent.js:72
 msgid "Authentication Required"
 msgstr "Authentication Required"
 
-#: ../js/ui/polkitAuthenticationAgent.js:108
+#: ../js/ui/polkitAuthenticationAgent.js:106
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../js/ui/polkitAuthenticationAgent.js:176
+#: ../js/ui/polkitAuthenticationAgent.js:174
 msgid "Authenticate"
 msgstr "Authenticate"
 
@@ -600,11 +769,11 @@ msgstr "Authenticate"
 #. * requested authentication was not gained; this can happen
 #. * because of an authentication error (like invalid password),
 #. * for instance.
-#: ../js/ui/polkitAuthenticationAgent.js:264
+#: ../js/ui/polkitAuthenticationAgent.js:262
 msgid "Sorry, that didn't work. Please try again."
 msgstr "Sorry, that didn't work. Please try again."
 
-#: ../js/ui/polkitAuthenticationAgent.js:276
+#: ../js/ui/polkitAuthenticationAgent.js:274
 msgid "Password:"
 msgstr "Password:"
 
@@ -613,60 +782,27 @@ msgstr "Password:"
 #. "ON" and "OFF") or "toggle-switch-intl" (for toggle
 #. switches containing "◯" and "|"). Other values will
 #. simply result in invisible toggle switches.
-#: ../js/ui/popupMenu.js:679
+#: ../js/ui/popupMenu.js:687
 msgid "toggle-switch-us"
 msgstr "toggle-switch-us"
 
-#: ../js/ui/runDialog.js:205
+#: ../js/ui/runDialog.js:208
 msgid "Please enter a command:"
 msgstr "Please enter a command:"
 
-#: ../js/ui/searchDisplay.js:310
+#: ../js/ui/searchDisplay.js:340
 msgid "Searching..."
 msgstr "Searching…"
 
-#: ../js/ui/searchDisplay.js:324
+#: ../js/ui/searchDisplay.js:363
 msgid "No matching results."
 msgstr "No matching results."
 
-#: ../js/ui/statusMenu.js:161 ../js/ui/statusMenu.js:163
-#: ../js/ui/statusMenu.js:228
-msgid "Power Off..."
-msgstr "Power Off…"
+#: ../js/ui/shellMountOperation.js:285
+msgid "Wrong password, please try again"
+msgstr "Wrong password, please try again"
 
-#: ../js/ui/statusMenu.js:163 ../js/ui/statusMenu.js:227
-msgid "Suspend"
-msgstr "Suspend"
-
-#: ../js/ui/statusMenu.js:184
-msgid "Available"
-msgstr "Available"
-
-#: ../js/ui/statusMenu.js:189
-msgid "Busy"
-msgstr "Busy"
-
-#: ../js/ui/statusMenu.js:197
-msgid "My Account"
-msgstr "My Account"
-
-#: ../js/ui/statusMenu.js:201
-msgid "System Settings"
-msgstr "System Settings"
-
-#: ../js/ui/statusMenu.js:208
-msgid "Lock Screen"
-msgstr "Lock Screen"
-
-#: ../js/ui/statusMenu.js:213
-msgid "Switch User"
-msgstr "Switch User"
-
-#: ../js/ui/statusMenu.js:218
-msgid "Log Out..."
-msgstr "Log Out…"
-
-#: ../js/ui/status/accessibility.js:62
+#: ../js/ui/status/accessibility.js:60
 msgid "Zoom"
 msgstr "Zoom"
 
@@ -676,306 +812,308 @@ msgstr "Zoom"
 #. let screenKeyboard = this._buildItem(_("Screen Keyboard"), APPLICATIONS_SCHEMA,
 #. 'screen-keyboard-enabled');
 #. this.menu.addMenuItem(screenKeyboard);
-#: ../js/ui/status/accessibility.js:77
+#: ../js/ui/status/accessibility.js:75
 msgid "Visual Alerts"
 msgstr "Visual Alerts"
 
-#: ../js/ui/status/accessibility.js:80
+#: ../js/ui/status/accessibility.js:78
 msgid "Sticky Keys"
 msgstr "Sticky Keys"
 
-#: ../js/ui/status/accessibility.js:83
+#: ../js/ui/status/accessibility.js:81
 msgid "Slow Keys"
 msgstr "Slow Keys"
 
-#: ../js/ui/status/accessibility.js:86
+#: ../js/ui/status/accessibility.js:84
 msgid "Bounce Keys"
 msgstr "Bounce Keys"
 
-#: ../js/ui/status/accessibility.js:89
+#: ../js/ui/status/accessibility.js:87
 msgid "Mouse Keys"
 msgstr "Mouse Keys"
 
-#: ../js/ui/status/accessibility.js:93
+#: ../js/ui/status/accessibility.js:91
 msgid "Universal Access Settings"
 msgstr "Universal Access Settings"
 
-#: ../js/ui/status/accessibility.js:146
+#: ../js/ui/status/accessibility.js:141
 msgid "High Contrast"
 msgstr "High Contrast"
 
-#: ../js/ui/status/accessibility.js:183
+#: ../js/ui/status/accessibility.js:178
 msgid "Large Text"
 msgstr "Large Text"
 
-#: ../js/ui/status/bluetooth.js:42 ../js/ui/status/bluetooth.js:237
-#: ../js/ui/status/bluetooth.js:333 ../js/ui/status/bluetooth.js:367
-#: ../js/ui/status/bluetooth.js:407 ../js/ui/status/bluetooth.js:440
+#: ../js/ui/status/bluetooth.js:39 ../js/ui/status/bluetooth.js:261
+#: ../js/ui/status/bluetooth.js:347 ../js/ui/status/bluetooth.js:381
+#: ../js/ui/status/bluetooth.js:421 ../js/ui/status/bluetooth.js:454
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../js/ui/status/bluetooth.js:55
+#: ../js/ui/status/bluetooth.js:52
 msgid "Visibility"
 msgstr "Visibility"
 
-#: ../js/ui/status/bluetooth.js:69
+#: ../js/ui/status/bluetooth.js:66
 msgid "Send Files to Device..."
 msgstr "Send Files to Device…"
 
-#: ../js/ui/status/bluetooth.js:70
-msgid "Setup a New Device..."
-msgstr "Setup a New Device…"
+#: ../js/ui/status/bluetooth.js:67
+msgid "Set up a New Device..."
+msgstr "Set up a New Device…"
 
-#: ../js/ui/status/bluetooth.js:95
+#: ../js/ui/status/bluetooth.js:91
 msgid "Bluetooth Settings"
 msgstr "Bluetooth Settings"
 
-#: ../js/ui/status/bluetooth.js:188
+#. TRANSLATORS: this means that bluetooth was disabled by hardware rfkill
+#: ../js/ui/status/bluetooth.js:111
+msgid "hardware disabled"
+msgstr "hardware disabled"
+
+#: ../js/ui/status/bluetooth.js:208
 msgid "Connection"
 msgstr "Connection"
 
-#: ../js/ui/status/bluetooth.js:224
+#: ../js/ui/status/bluetooth.js:217 ../js/ui/status/network.js:486
+msgid "disconnecting..."
+msgstr "disconnecting…"
+
+#: ../js/ui/status/bluetooth.js:230 ../js/ui/status/network.js:492
+msgid "connecting..."
+msgstr "connecting…"
+
+#: ../js/ui/status/bluetooth.js:248
 msgid "Send Files..."
 msgstr "Send Files…"
 
-#: ../js/ui/status/bluetooth.js:229
+#: ../js/ui/status/bluetooth.js:253
 msgid "Browse Files..."
 msgstr "Browse Files…"
 
-#: ../js/ui/status/bluetooth.js:238
+#: ../js/ui/status/bluetooth.js:262
 msgid "Error browsing device"
 msgstr "Error browsing device"
 
-#: ../js/ui/status/bluetooth.js:239
+#: ../js/ui/status/bluetooth.js:263
 #, c-format
 msgid "The requested device cannot be browsed, error is '%s'"
 msgstr "The requested device cannot be browsed, error is '%s'"
 
-#: ../js/ui/status/bluetooth.js:247
+#: ../js/ui/status/bluetooth.js:271
 msgid "Keyboard Settings"
 msgstr "Keyboard Settings"
 
-#: ../js/ui/status/bluetooth.js:252
+#: ../js/ui/status/bluetooth.js:274
 msgid "Mouse Settings"
 msgstr "Mouse Settings"
 
-#: ../js/ui/status/bluetooth.js:259 ../js/ui/status/volume.js:66
+#: ../js/ui/status/bluetooth.js:279 ../js/ui/status/volume.js:62
 msgid "Sound Settings"
 msgstr "Sound Settings"
 
-#: ../js/ui/status/bluetooth.js:368
+#: ../js/ui/status/bluetooth.js:382
 #, c-format
 msgid "Authorization request from %s"
 msgstr "Authorisation request from %s"
 
-#: ../js/ui/status/bluetooth.js:374
+#: ../js/ui/status/bluetooth.js:388
 #, c-format
 msgid "Device %s wants access to the service '%s'"
 msgstr "Device %s wants access to the service '%s'"
 
-#: ../js/ui/status/bluetooth.js:376
+#: ../js/ui/status/bluetooth.js:390
 msgid "Always grant access"
 msgstr "Always grant access"
 
-#: ../js/ui/status/bluetooth.js:377
+#: ../js/ui/status/bluetooth.js:391
 msgid "Grant this time only"
 msgstr "Grant this time only"
 
-#: ../js/ui/status/bluetooth.js:378
+#: ../js/ui/status/bluetooth.js:392 ../js/ui/telepathyClient.js:1185
 msgid "Reject"
 msgstr "Reject"
 
-#: ../js/ui/status/bluetooth.js:408
+#: ../js/ui/status/bluetooth.js:422
 #, c-format
 msgid "Pairing confirmation for %s"
 msgstr "Pairing confirmation for %s"
 
-#: ../js/ui/status/bluetooth.js:414 ../js/ui/status/bluetooth.js:448
+#: ../js/ui/status/bluetooth.js:428 ../js/ui/status/bluetooth.js:462
 #, c-format
 msgid "Device %s wants to pair with this computer"
 msgstr "Device %s wants to pair with this computer"
 
-#: ../js/ui/status/bluetooth.js:415
+#: ../js/ui/status/bluetooth.js:429
 #, c-format
 msgid "Please confirm whether the PIN '%s' matches the one on the device."
 msgstr "Please confirm whether the PIN '%s' matches the one on the device."
 
-#: ../js/ui/status/bluetooth.js:417
+#: ../js/ui/status/bluetooth.js:431
 msgid "Matches"
 msgstr "Matches"
 
-#: ../js/ui/status/bluetooth.js:418
+#: ../js/ui/status/bluetooth.js:432
 msgid "Does not match"
 msgstr "Does not match"
 
-#: ../js/ui/status/bluetooth.js:441
+#: ../js/ui/status/bluetooth.js:455
 #, c-format
 msgid "Pairing request for %s"
 msgstr "Pairing request for %s"
 
-#: ../js/ui/status/bluetooth.js:449
+#: ../js/ui/status/bluetooth.js:463
 msgid "Please enter the PIN mentioned on the device."
 msgstr "Please enter the PIN mentioned on the device."
 
-#: ../js/ui/status/bluetooth.js:465
+#: ../js/ui/status/bluetooth.js:479
 msgid "OK"
 msgstr "OK"
 
-#: ../js/ui/status/keyboard.js:73
-msgid "Show Keyboard Layout..."
-msgstr "Show Keyboard Layout…"
+#: ../js/ui/status/keyboard.js:71
+msgid "Show Keyboard Layout"
+msgstr "Show Keyboard Layout"
 
-#: ../js/ui/status/keyboard.js:76
-msgid "Localization Settings"
-msgstr "Localisation Settings"
+#: ../js/ui/status/keyboard.js:75
+msgid "Region and Language Settings"
+msgstr "Region and Language Settings"
 
-#: ../js/ui/status/network.js:104 ../js/ui/status/network.js:1454
+#: ../js/ui/status/network.js:97
 msgid "<unknown>"
 msgstr "<unknown>"
 
 #. Translators: this indicates that wireless or wwan is disabled by hardware killswitch
-#: ../js/ui/status/network.js:311
+#: ../js/ui/status/network.js:285
 msgid "disabled"
 msgstr "disabled"
 
-#: ../js/ui/status/network.js:494
-msgid "connecting..."
-msgstr "connecting…"
+#. Translators: this is for network devices that are physically present but are not
+#. under NetworkManager's control (and thus cannot be used in the menu)
+#: ../js/ui/status/network.js:484
+msgid "unmanaged"
+msgstr "unmanaged"
 
 #. Translators: this is for network connections that require some kind of key or password
-#: ../js/ui/status/network.js:497
+#: ../js/ui/status/network.js:495
 msgid "authentication required"
 msgstr "authentication required"
 
 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing
-#: ../js/ui/status/network.js:507
+#: ../js/ui/status/network.js:505
 msgid "firmware missing"
 msgstr "firmware missing"
 
 #. Translators: this is for wired network devices that are physically disconnected
-#: ../js/ui/status/network.js:514
+#: ../js/ui/status/network.js:512
 msgid "cable unplugged"
 msgstr "cable unplugged"
 
 #. Translators: this is for a network device that cannot be activated (for example it
 #. is disabled by rfkill, or it has no coverage
-#: ../js/ui/status/network.js:519
+#: ../js/ui/status/network.js:517
 msgid "unavailable"
 msgstr "unavailable"
 
-#: ../js/ui/status/network.js:521
+#: ../js/ui/status/network.js:519
 msgid "connection failed"
 msgstr "connection failed"
 
+#: ../js/ui/status/network.js:575 ../js/ui/status/network.js:1515
+msgid "More..."
+msgstr "More…"
+
 #. TRANSLATORS: this is the indication that a connection for another logged in user is active,
 #. and we cannot access its settings (including the name)
-#: ../js/ui/status/network.js:602 ../js/ui/status/network.js:1402
+#: ../js/ui/status/network.js:611 ../js/ui/status/network.js:1455
 msgid "Connected (private)"
 msgstr "Connected (private)"
 
-#: ../js/ui/status/network.js:683
+#: ../js/ui/status/network.js:689
 msgid "Auto Ethernet"
 msgstr "Auto Ethernet"
 
-#: ../js/ui/status/network.js:758
+#: ../js/ui/status/network.js:753
 msgid "Auto broadband"
 msgstr "Auto broadband"
 
-#: ../js/ui/status/network.js:761
+#: ../js/ui/status/network.js:756
 msgid "Auto dial-up"
 msgstr "Auto dial-up"
 
 #. TRANSLATORS: this the automatic wireless connection name (including the network name)
-#: ../js/ui/status/network.js:904 ../js/ui/status/network.js:1414
+#: ../js/ui/status/network.js:878 ../js/ui/status/network.js:1467
 #, c-format
 msgid "Auto %s"
 msgstr "Auto %s"
 
-#: ../js/ui/status/network.js:906
+#: ../js/ui/status/network.js:880
 msgid "Auto bluetooth"
 msgstr "Auto bluetooth"
 
-#: ../js/ui/status/network.js:1416
+#: ../js/ui/status/network.js:1469
 msgid "Auto wireless"
 msgstr "Auto wireless"
 
-#: ../js/ui/status/network.js:1474
-msgid "More..."
-msgstr "More…"
-
-#: ../js/ui/status/network.js:1497
+#: ../js/ui/status/network.js:1558
 msgid "Enable networking"
 msgstr "Enable networking"
 
-#: ../js/ui/status/network.js:1509
+#: ../js/ui/status/network.js:1570
 msgid "Wired"
 msgstr "Wired"
 
-#: ../js/ui/status/network.js:1520
+#: ../js/ui/status/network.js:1581
 msgid "Wireless"
 msgstr "Wireless"
 
-#: ../js/ui/status/network.js:1530
+#: ../js/ui/status/network.js:1591
 msgid "Mobile broadband"
 msgstr "Mobile broadband"
 
-#: ../js/ui/status/network.js:1540
+#: ../js/ui/status/network.js:1601
 msgid "VPN Connections"
 msgstr "VPN Connections"
 
-#: ../js/ui/status/network.js:1549
+#: ../js/ui/status/network.js:1612
 msgid "Network Settings"
 msgstr "Network Settings"
 
-#: ../js/ui/status/network.js:1844
-#, c-format
-msgid "You're now connected to mobile broadband connection '%s'"
-msgstr "You're now connected to mobile broadband connection '%s'"
+#: ../js/ui/status/network.js:1747
+msgid "Connectivity lost"
+msgstr "Connectivity lost"
 
-#: ../js/ui/status/network.js:1848
-#, c-format
-msgid "You're now connected to wireless network '%s'"
-msgstr "You're now connected to wireless network '%s'"
+#: ../js/ui/status/network.js:1748
+msgid "You're no longer connected to the network"
+msgstr "You're no longer connected to the network"
 
-#: ../js/ui/status/network.js:1852
-#, c-format
-msgid "You're now connected to wired network '%s'"
-msgstr "You're now connected to wired network '%s'"
+#: ../js/ui/status/network.js:1756
+msgid "Connection failed"
+msgstr "Connection failed"
 
-#: ../js/ui/status/network.js:1856
-#, c-format
-msgid "You're now connected to VPN network '%s'"
-msgstr "You're now connected to VPN network '%s'"
+#: ../js/ui/status/network.js:1757
+msgid "Activation of network connection failed"
+msgstr "Activation of network connection failed"
 
-#: ../js/ui/status/network.js:1861
-#, c-format
-msgid "You're now connected to '%s'"
-msgstr "You're now connected to '%s'"
-
-#: ../js/ui/status/network.js:1869
-msgid "Connection established"
-msgstr "Connection established"
-
-#: ../js/ui/status/network.js:1991
+#: ../js/ui/status/network.js:2008
 msgid "Networking is disabled"
 msgstr "Networking is disabled"
 
-#: ../js/ui/status/network.js:2116
+#: ../js/ui/status/network.js:2133
 msgid "Network Manager"
 msgstr "Network Manager"
 
-#: ../js/ui/status/power.js:85
+#: ../js/ui/status/power.js:82
 msgid "Power Settings"
 msgstr "Power Settings"
 
 #. 0 is reported when UPower does not have enough data
 #. to estimate battery life
-#: ../js/ui/status/power.js:111
+#: ../js/ui/status/power.js:103
 msgid "Estimating..."
 msgstr "Estimating…"
 
-#: ../js/ui/status/power.js:118
+#: ../js/ui/status/power.js:110
 #, c-format
 msgid "%d hour remaining"
 msgid_plural "%d hours remaining"
@@ -983,102 +1121,119 @@ msgstr[0] "%d hour remaining"
 msgstr[1] "%d hours remaining"
 
 #. TRANSLATORS: this is a time string, as in "%d hours %d minutes remaining"
-#: ../js/ui/status/power.js:121
+#: ../js/ui/status/power.js:113
 #, c-format
 msgid "%d %s %d %s remaining"
 msgstr "%d %s %d %s remaining"
 
-#: ../js/ui/status/power.js:123
+#: ../js/ui/status/power.js:115
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hour"
 msgstr[1] "hours"
 
-#: ../js/ui/status/power.js:123
+#: ../js/ui/status/power.js:115
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
-#: ../js/ui/status/power.js:126
+#: ../js/ui/status/power.js:118
 #, c-format
 msgid "%d minute remaining"
 msgid_plural "%d minutes remaining"
 msgstr[0] "%d minute remaining"
 msgstr[1] "%d minutes remaining"
 
-#: ../js/ui/status/power.js:228
+#: ../js/ui/status/power.js:201
 msgid "AC adapter"
 msgstr "AC adapter"
 
-#: ../js/ui/status/power.js:230
+#: ../js/ui/status/power.js:203
 msgid "Laptop battery"
 msgstr "Laptop battery"
 
-#: ../js/ui/status/power.js:232
+#: ../js/ui/status/power.js:205
 msgid "UPS"
 msgstr "UPS"
 
-#: ../js/ui/status/power.js:234
+#: ../js/ui/status/power.js:207
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../js/ui/status/power.js:236
+#: ../js/ui/status/power.js:209
 msgid "Mouse"
 msgstr "Mouse"
 
-#: ../js/ui/status/power.js:238
-msgid "Keyboard"
-msgstr "Keyboard"
-
-#: ../js/ui/status/power.js:240
+#: ../js/ui/status/power.js:213
 msgid "PDA"
 msgstr "PDA"
 
-#: ../js/ui/status/power.js:242
+#: ../js/ui/status/power.js:215
 msgid "Cell phone"
 msgstr "Mobile phone"
 
-#: ../js/ui/status/power.js:244
+#: ../js/ui/status/power.js:217
 msgid "Media player"
 msgstr "Media player"
 
-#: ../js/ui/status/power.js:246
+#: ../js/ui/status/power.js:219
 msgid "Tablet"
 msgstr "Tablet"
 
-#: ../js/ui/status/power.js:248
+#: ../js/ui/status/power.js:221
 msgid "Computer"
 msgstr "Computer"
 
-#: ../js/ui/status/power.js:250 ../src/shell-app-system.c:1088
-msgid "Unknown"
-msgstr "Unknown"
-
-#: ../js/ui/status/volume.js:45
+#: ../js/ui/status/volume.js:42
 msgid "Volume"
 msgstr "Volume"
 
-#: ../js/ui/status/volume.js:58
+#: ../js/ui/status/volume.js:54
 msgid "Microphone"
 msgstr "Microphone"
 
-#: ../js/ui/telepathyClient.js:335
+#. We got the TpContact
+#. FIXME: We don't have a 'chat room' icon (bgo #653737) use
+#. system-users for now as Empathy does.
+#: ../js/ui/telepathyClient.js:256
+msgid "Invitation"
+msgstr "Invitation"
+
+#. We got the TpContact
+#: ../js/ui/telepathyClient.js:322
+msgid "Call"
+msgstr "Call"
+
+#. We got the TpContact
+#: ../js/ui/telepathyClient.js:350
+msgid "File Transfer"
+msgstr "File Transfer"
+
+#: ../js/ui/telepathyClient.js:432
+msgid "Subscription request"
+msgstr "Subscription request"
+
+#: ../js/ui/telepathyClient.js:460
+msgid "Connection error"
+msgstr "Connection error"
+
+#: ../js/ui/telepathyClient.js:722
 #, c-format
 msgid "%s is online."
 msgstr "%s is online."
 
-#: ../js/ui/telepathyClient.js:340
+#: ../js/ui/telepathyClient.js:727
 #, c-format
 msgid "%s is offline."
 msgstr "%s is offline."
 
-#: ../js/ui/telepathyClient.js:343
+#: ../js/ui/telepathyClient.js:730
 #, c-format
 msgid "%s is away."
 msgstr "%s is away."
 
-#: ../js/ui/telepathyClient.js:346
+#: ../js/ui/telepathyClient.js:733
 #, c-format
 msgid "%s is busy."
 msgstr "%s is busy."
@@ -1086,36 +1241,277 @@ msgstr "%s is busy."
 #. Translators: this is a time format string followed by a date.
 #. If applicable, replace %X with a strftime format valid for your
 #. locale, without seconds.
-#: ../js/ui/telepathyClient.js:482
+#: ../js/ui/telepathyClient.js:967
 #, no-c-format
-msgid "Sent at %X on %A"
-msgstr "Sent at %X on %A"
+msgid "Sent at <b>%X</b> on <b>%A</b>"
+msgstr "Sent at <b>%X</b> on <b>%A</b>"
+
+#. Translators: this is a time format in the style of "Wednesday, May 25",
+#. shown when you get a chat message in the same year.
+#: ../js/ui/telepathyClient.js:973
+#, no-c-format
+msgid "Sent on <b>%A</b>, <b>%B %d</b>"
+msgstr "Sent on <b>%A</b>, <b>%d B</b>"
+
+#. Translators: this is a time format in the style of "Wednesday, May 25, 2012",
+#. shown when you get a chat message in a different year.
+#: ../js/ui/telepathyClient.js:978
+#, no-c-format
+msgid "Sent on <b>%A</b>, <b>%B %d</b>, %Y"
+msgstr "Sent on <b>%A</b>, <b>%d %B</b>, %Y"
+
+#. Translators: this is the other person changing their old IM name to their new
+#. IM name.
+#: ../js/ui/telepathyClient.js:1020
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s is now known as %s"
+
+#. translators: argument is a room name like
+#. * room@jabber.org for example.
+#: ../js/ui/telepathyClient.js:1129
+#, c-format
+msgid "Invitation to %s"
+msgstr "Invitation to %s"
+
+#. translators: first argument is the name of a contact and the second
+#. * one the name of a room. "Alice is inviting you to join room@jabber.org
+#. * for example.
+#: ../js/ui/telepathyClient.js:1137
+#, c-format
+msgid "%s is inviting you to join %s"
+msgstr "%s is inviting you to join %s"
+
+#: ../js/ui/telepathyClient.js:1139 ../js/ui/telepathyClient.js:1228
+#: ../js/ui/telepathyClient.js:1332
+msgid "Decline"
+msgstr "Decline"
+
+#: ../js/ui/telepathyClient.js:1140 ../js/ui/telepathyClient.js:1229
+#: ../js/ui/telepathyClient.js:1333
+msgid "Accept"
+msgstr "Accept"
+
+#. translators: argument is a contact name like Alice for example.
+#: ../js/ui/telepathyClient.js:1173
+#, c-format
+msgid "Video call from %s"
+msgstr "Video call from %s"
+
+#. translators: argument is a contact name like Alice for example.
+#: ../js/ui/telepathyClient.js:1176
+#, c-format
+msgid "Call from %s"
+msgstr "Call from %s"
+
+#: ../js/ui/telepathyClient.js:1186
+msgid "Answer"
+msgstr "Answer"
+
+#. To translators: The first parameter is
+#. * the contact's alias and the second one is the
+#. * file name. The string will be something
+#. * like: "Alice is sending you test.ogg"
+#.
+#: ../js/ui/telepathyClient.js:1222
+#, c-format
+msgid "%s is sending you %s"
+msgstr "%s is sending you %s"
+
+#. To translators: The parameter is the contact's alias
+#: ../js/ui/telepathyClient.js:1297
+#, c-format
+msgid "%s would like permission to see when you are online"
+msgstr "%s would like permission to see when you are online"
+
+#: ../js/ui/telepathyClient.js:1395
+msgid "Network error"
+msgstr "Network error"
+
+#: ../js/ui/telepathyClient.js:1397
+msgid "Authentication failed"
+msgstr "Authentication failed"
+
+#: ../js/ui/telepathyClient.js:1399
+msgid "Encryption error"
+msgstr "Encryption error"
+
+#: ../js/ui/telepathyClient.js:1401
+msgid "Certificate not provided"
+msgstr "Certificate not provided"
+
+#: ../js/ui/telepathyClient.js:1403
+msgid "Certificate untrusted"
+msgstr "Certificate untrusted"
+
+#: ../js/ui/telepathyClient.js:1405
+msgid "Certificate expired"
+msgstr "Certificate expired"
+
+#: ../js/ui/telepathyClient.js:1407
+msgid "Certificate not activated"
+msgstr "Certificate not activated"
+
+#: ../js/ui/telepathyClient.js:1409
+msgid "Certificate hostname mismatch"
+msgstr "Certificate hostname mismatch"
+
+#: ../js/ui/telepathyClient.js:1411
+msgid "Certificate fingerprint mismatch"
+msgstr "Certificate fingerprint mismatch"
+
+#: ../js/ui/telepathyClient.js:1413
+msgid "Certificate self-signed"
+msgstr "Certificate self-signed"
+
+#: ../js/ui/telepathyClient.js:1415
+msgid "Status is set to offline"
+msgstr "Status is set to offline"
+
+#: ../js/ui/telepathyClient.js:1417
+msgid "Encryption is not available"
+msgstr "Encryption is not available"
+
+#: ../js/ui/telepathyClient.js:1419
+msgid "Certificate is invalid"
+msgstr "Certificate is invalid"
+
+#: ../js/ui/telepathyClient.js:1421
+msgid "Connection has been refused"
+msgstr "Connection has been refused"
+
+#: ../js/ui/telepathyClient.js:1423
+msgid "Connection can't be established"
+msgstr "Connection can't be established"
+
+#: ../js/ui/telepathyClient.js:1425
+msgid "Connection has been lost"
+msgstr "Connection has been lost"
+
+#: ../js/ui/telepathyClient.js:1427
+msgid "This resource is already connected to the server"
+msgstr "This resource is already connected to the server"
+
+#: ../js/ui/telepathyClient.js:1429
+msgid ""
+"Connection has been replaced by a new connection using the same resource"
+msgstr ""
+"Connection has been replaced by a new connection using the same resource"
+
+#: ../js/ui/telepathyClient.js:1431
+msgid "The account already exists on the server"
+msgstr "The account already exists on the server"
+
+#: ../js/ui/telepathyClient.js:1433
+msgid "Server is currently too busy to handle the connection"
+msgstr "Server is currently too busy to handle the connection"
+
+#: ../js/ui/telepathyClient.js:1435
+msgid "Certificate has been revoked"
+msgstr "Certificate has been revoked"
+
+#: ../js/ui/telepathyClient.js:1437
+msgid ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr ""
+"Certificate uses an insecure cypher algorithm or is cryptographically weak"
+
+#: ../js/ui/telepathyClient.js:1439
+msgid ""
+"The length of the server certificate, or the depth of the server certificate "
+"chain, exceed the limits imposed by the cryptography library"
+msgstr ""
+"The length of the server certificate, or the depth of the server certificate "
+"chain, exceed the limits imposed by the cryptography library"
+
+#. translators: argument is the account name, like
+#. * name@jabber.org for example.
+#: ../js/ui/telepathyClient.js:1448
+#, c-format
+msgid "Connection to %s failed"
+msgstr "Connection to %s failed"
+
+#: ../js/ui/telepathyClient.js:1455
+msgid "Unknown reason"
+msgstr "Unknown reason"
+
+#: ../js/ui/telepathyClient.js:1462
+msgid "Reconnect"
+msgstr "Reconnect"
+
+#: ../js/ui/telepathyClient.js:1463
+msgid "Edit account"
+msgstr "Edit account"
+
+#: ../js/ui/userMenu.js:153
+msgid "Hidden"
+msgstr "Hidden"
+
+#: ../js/ui/userMenu.js:159
+msgid "Idle"
+msgstr "Idle"
+
+#: ../js/ui/userMenu.js:162
+msgid "Unavailable"
+msgstr "Unavailable"
+
+#: ../js/ui/userMenu.js:516 ../js/ui/userMenu.js:520 ../js/ui/userMenu.js:589
+msgid "Power Off..."
+msgstr "Power Off…"
+
+#: ../js/ui/userMenu.js:518 ../js/ui/userMenu.js:520 ../js/ui/userMenu.js:588
+msgid "Suspend"
+msgstr "Suspend"
+
+#: ../js/ui/userMenu.js:551
+msgid "Notifications"
+msgstr "Notifications"
+
+#: ../js/ui/userMenu.js:559
+msgid "Online Accounts"
+msgstr "Online Accounts"
+
+#: ../js/ui/userMenu.js:563
+msgid "System Settings"
+msgstr "System Settings"
+
+#: ../js/ui/userMenu.js:570
+msgid "Lock Screen"
+msgstr "Lock Screen"
+
+#: ../js/ui/userMenu.js:575
+msgid "Switch User"
+msgstr "Switch User"
+
+#: ../js/ui/userMenu.js:580
+msgid "Log Out..."
+msgstr "Log Out…"
 
 #. Translators: this is the text displayed
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters.
-#: ../js/ui/viewSelector.js:122
+#: ../js/ui/viewSelector.js:120
 msgid "Type to search..."
 msgstr "Type to search…"
 
-#: ../js/ui/viewSelector.js:142 ../src/shell-util.c:250
+#: ../js/ui/viewSelector.js:140 ../src/shell-util.c:261
 msgid "Search"
 msgstr "Search"
 
-#: ../js/ui/windowAttentionHandler.js:42
+#: ../js/ui/windowAttentionHandler.js:39
 #, c-format
 msgid "%s has finished starting"
 msgstr "%s has finished starting"
 
-#: ../js/ui/windowAttentionHandler.js:44
+#: ../js/ui/windowAttentionHandler.js:41
 #, c-format
 msgid "'%s' is ready"
 msgstr "'%s' is ready"
 
 #. translators:
 #. * The number of sound outputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1098
+#: ../src/gvc/gvc-mixer-control.c:1100
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@@ -1124,58 +1520,30 @@ msgstr[1] "%u Outputs"
 
 #. translators:
 #. * The number of sound inputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1108
+#: ../src/gvc/gvc-mixer-control.c:1110
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
 msgstr[0] "%u Input"
 msgstr[1] "%u Inputs"
 
-#: ../src/gvc/gvc-mixer-control.c:1406
+#: ../src/gvc/gvc-mixer-control.c:1408
 msgid "System Sounds"
 msgstr "System Sounds"
 
-#: ../src/main.c:446
+#: ../src/main.c:480
 msgid "Print version"
 msgstr "Print version"
 
-#: ../src/shell-app.c:454
+#: ../src/main.c:486
+msgid "Mode used by GDM for login screen"
+msgstr "Mode used by GDM for login screen"
+
+#: ../src/shell-app.c:581
 #, c-format
 msgid "Failed to launch '%s'"
 msgstr "Failed to launch '%s'"
 
-#: ../src/shell-global.c:1395
-msgid "Less than a minute ago"
-msgstr "Less than a minute ago"
-
-#: ../src/shell-global.c:1399
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d minute ago"
-msgstr[1] "%d minutes ago"
-
-#: ../src/shell-global.c:1404
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d hour ago"
-msgstr[1] "%d hours ago"
-
-#: ../src/shell-global.c:1409
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d day ago"
-msgstr[1] "%d days ago"
-
-#: ../src/shell-global.c:1414
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d week ago"
-msgstr[1] "%d weeks ago"
-
 #: ../src/shell-mobile-providers.c:80
 msgid "United Kingdom"
 msgstr "United Kingdom"
@@ -1188,13 +1556,13 @@ msgstr "Default"
 msgid "Authentication dialog was dismissed by the user"
 msgstr "Authentication dialogue was dismissed by the user"
 
-#: ../src/shell-util.c:89
+#: ../src/shell-util.c:100
 msgid "Home Folder"
 msgstr "Home Folder"
 
 #. Translators: this is the same string as the one found in
 #. * nautilus
-#: ../src/shell-util.c:104
+#: ../src/shell-util.c:115
 msgid "File System"
 msgstr "File System"
 
@@ -1203,11 +1571,46 @@ msgstr "File System"
 #. * example, "Trash: some-directory". It means that the
 #. * directory called "some-directory" is in the trash.
 #.
-#: ../src/shell-util.c:300
+#: ../src/shell-util.c:311
 #, c-format
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"
 
+#~ msgid "Localization Settings"
+#~ msgstr "Localisation Settings"
+
+#~ msgid "You're now connected to mobile broadband connection '%s'"
+#~ msgstr "You're now connected to mobile broadband connection '%s'"
+
+#~ msgid "You're now connected to wireless network '%s'"
+#~ msgstr "You're now connected to wireless network '%s'"
+
+#~ msgid "You're now connected to VPN network '%s'"
+#~ msgstr "You're now connected to VPN network '%s'"
+
+#~ msgid "Less than a minute ago"
+#~ msgstr "Less than a minute ago"
+
+#~ msgid "%d minute ago"
+#~ msgid_plural "%d minutes ago"
+#~ msgstr[0] "%d minute ago"
+#~ msgstr[1] "%d minutes ago"
+
+#~ msgid "%d hour ago"
+#~ msgid_plural "%d hours ago"
+#~ msgstr[0] "%d hour ago"
+#~ msgstr[1] "%d hours ago"
+
+#~ msgid "%d day ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%d day ago"
+#~ msgstr[1] "%d days ago"
+
+#~ msgid "%d week ago"
+#~ msgid_plural "%d weeks ago"
+#~ msgstr[0] "%d week ago"
+#~ msgstr[1] "%d weeks ago"
+
 #~ msgid "No such application"
 #~ msgstr "No such application"
 
@@ -1233,9 +1636,6 @@ msgstr "%1$s: %2$s"
 #~ msgid "Screen Reader"
 #~ msgstr "Screen Reader"
 
-#~ msgid "Screen Keyboard"
-#~ msgstr "Screen Keyboard"
-
 #~ msgid "Clock"
 #~ msgstr "Clock"