shell-global: import environment from $XDG_RUNTIME_DIR/gnome/environment

environment variables are normally propagated from parent to child, but they're used to convey information that's typically scoped to the session. gnome-shell needs to know about environment variables that are set in the session after it's already been started. gnome-session now exports its environment to $XDG_RUNTIME_DIR/gnome/environment so that programs in the session can pick up on the latest environment variables. This commit changes gnome-shell to propagate the gnome-session's latest environment when launching new children.
Bump version to 3.17.92
2015-09-16 21:14:48 -04:00 · 2015-09-16 17:20:30 +02:00 · 2015-09-15 11:34:41 +00:00 · 2015-09-14 16:04:24 +02:00 · 2015-09-14 00:20:39 +09:00 · 2015-09-12 16:08:38 +00:00
16 changed files with 3075 additions and 2484 deletions
--- a/12
+++ b/12
@@ -1,3 +1,15 @@
+3.17.92
+=======
+* Fix race when loading multiple background animations [Josselin; #741453]
+
+Contributors:
+  Michael Biebl, Josselin Mouette, Florian Müllner
+
+Translations:
+  Baurzhan Muftakhidinov [kk], Changwoo Ryu [ko], Christian Kirbach [de],
+  Kjartan Maraas [nb], Jiri Grönroos [fi], Arash Mousavi [fa],
+  Jiro Matsuzawa [ja], Marek Černocký [cs], Milo Casagrande [it]
+
 3.17.91
 =======
 * Fix login screen spinner causing wakeups while VT-switched away
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.17.91],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.17.92],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])

 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
@@ -74,9 +74,9 @@ AS_IF([test x$enable_systemd != xno], [
 AC_MSG_RESULT($enable_systemd)

 CLUTTER_MIN_VERSION=1.21.5
-GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
+GOBJECT_INTROSPECTION_MIN_VERSION=1.45.4
 GJS_MIN_VERSION=1.39.0
-MUTTER_MIN_VERSION=3.17.91
+MUTTER_MIN_VERSION=3.17.92
 GTK_MIN_VERSION=3.15.0
 GIO_MIN_VERSION=2.45.3
 LIBECAL_MIN_VERSION=3.5.3
--- a/data/theme/gnome-shell-high-contrast.css
+++ b/data/theme/gnome-shell-high-contrast.css
@@ -808,9 +808,13 @@ StScrollBar {
  padding: 8px;
  font-size: .9em; }

-.system-switch-user-submenu-icon {
-  icon-size: 24px;
-  border: 1px solid rgba(255, 255, 255, 0.4); }
+.system-switch-user-submenu-icon.user-icon {
+  icon-size: 20px;
+  padding: 0 2px; }
+
+.system-switch-user-submenu-icon.default-icon {
+  icon-size: 16px;
+  padding: 0 4px; }

 #appMenu {
  spinner-image: url("resource:///org/gnome/shell/theme/process-working.svg");
--- a/data/theme/gnome-shell-sass
+++ b/data/theme/gnome-shell-sass
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -811,6 +811,7 @@ StScrollBar {
 .system-switch-user-submenu-icon.user-icon {
  icon-size: 20px;
  padding: 0 2px; }
+
 .system-switch-user-submenu-icon.default-icon {
  icon-size: 16px;
  padding: 0 4px; }
--- a/js/ui/background.js
+++ b/js/ui/background.js
@@ -144,6 +144,7 @@ const BackgroundCache = new Lang.Class({
        this._pendingFileLoads = [];
        this._fileMonitors = {};
        this._backgroundSources = {};
+        this._animations = {};
    },

    monitorFile: function(file) {
@@ -162,12 +163,13 @@ const BackgroundCache = new Lang.Class({

    getAnimation: function(params) {
        params = Params.parse(params, { file: null,
+                                        settingsSchema: null,
                                        onLoaded: null });

-        if (_fileEqual0(this._animationFile, params.file)) {
+        if (this._animations[params.settingsSchema] && _fileEqual0(this._animationFile, params.file)) {
            if (params.onLoaded) {
                let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
-                    params.onLoaded(this._animation);
+                    params.onLoaded(this._animations[params.settingsSchema]);
                    return GLib.SOURCE_REMOVE;
                }));
                GLib.Source.set_name_by_id(id, '[gnome-shell] params.onLoaded');
@@ -178,12 +180,11 @@ const BackgroundCache = new Lang.Class({
        let animation = new Animation({ file: params.file });

        animation.load(Lang.bind(this, function() {
-                           this._animationFile = params.file;
-                           this._animation = animation;
+                           this._animations[params.settingsSchema] = animation;

                           if (params.onLoaded) {
                               let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
-                                   params.onLoaded(this._animation);
+                                   params.onLoaded(this._animations[params.settingsSchema]);
                                   return GLib.SOURCE_REMOVE;
                               }));
                               GLib.Source.set_name_by_id(id, '[gnome-shell] params.onLoaded');
@@ -403,17 +404,18 @@ const Background = new Lang.Class({

    _loadAnimation: function(file) {
        this._cache.getAnimation({ file: file,
-                                         onLoaded: Lang.bind(this, function(animation) {
-                                             this._animation = animation;
+                                   settingsSchema: this._settings.schema_id,
+                                   onLoaded: Lang.bind(this, function(animation) {
+                                       this._animation = animation;

-                                             if (!this._animation || this._cancellable.is_cancelled()) {
-                                                 this._setLoaded();
-                                                 return;
-                                             }
+                                       if (!this._animation || this._cancellable.is_cancelled()) {
+                                           this._setLoaded();
+                                           return;
+                                       }

-                                             this._updateAnimation();
-                                             this._watchFile(file);
-                                         })
+                                       this._updateAnimation();
+                                       this._watchFile(file);
+                                   })
                                 });
    },

--- a/po/cs.po
+++ b/po/cs.po
@@ -1,6 +1,7 @@
 # Czech translation of gnome-shell.
 # Copyright (C) 2009, 2010, 2011 the author(s) of gnome-shell.
 # This file is distributed under the same license as the gnome-shell package.
+#
 # Andre Klapper <ak-47@gmx.net>, 2009.
 # Petr Kovar <pknbe@volny.cz>, 2009, 2010, 2011, 2012, 2014.
 # Adam Matoušek <adamatousek@gmail.com>, 2012, 2013.
@@ -11,8 +12,8 @@ msgstr ""
 "Project-Id-Version: gnome-shell\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-07-24 08:09+0000\n"
-"PO-Revision-Date: 2015-07-24 22:04+0200\n"
+"POT-Creation-Date: 2015-09-14 08:20+0000\n"
+"PO-Revision-Date: 2015-09-14 16:03+0200\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
@@ -299,7 +300,6 @@ msgid "Network Login"
 msgstr "Přihlášení do sítě"

 #: ../js/extensionPrefs/main.js:122
-#, javascript-format
 msgid "There was an error loading the preferences dialog for %s:"
 msgstr ""
 "Nastala chyba při načítání dialogového okna předvoleb pro rozšíření %s:"
@@ -309,13 +309,14 @@ msgid "GNOME Shell Extensions"
 msgstr "Rozšíření GNOME Shell"

 #: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:145
-#: ../js/ui/components/polkitAgent.js:166 ../js/ui/endSessionDialog.js:452
+#: ../js/ui/components/polkitAgent.js:179 ../js/ui/endSessionDialog.js:452
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
 #: ../js/ui/status/network.js:916
 msgid "Cancel"
 msgstr "Zrušit"

 #: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:215
+#: ../js/gdm/authPrompt.js:447
 msgid "Next"
 msgstr "Následující"

@@ -337,17 +338,16 @@ msgstr "Vybrat sezení"
 msgid "Not listed?"
 msgstr "Nejste na seznamu?"

-#: ../js/gdm/loginDialog.js:847
-#, javascript-format
+#: ../js/gdm/loginDialog.js:850
 msgid "(e.g., user or %s)"
 msgstr "(např. uživatel nebo %s)"

-#: ../js/gdm/loginDialog.js:852 ../js/ui/components/networkAgent.js:271
+#: ../js/gdm/loginDialog.js:855 ../js/ui/components/networkAgent.js:271
 #: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "Uživatelské jméno: "

-#: ../js/gdm/loginDialog.js:1180
+#: ../js/gdm/loginDialog.js:1184
 msgid "Login Window"
 msgstr "Přihlašovací okno"

@@ -368,7 +368,6 @@ msgid "Could not parse command:"
 msgstr "Nelze analyzovat příkaz:"

 #: ../js/misc/util.js:160
-#, javascript-format
 msgid "Execution of “%s” failed:"
 msgstr "Vykonání „%s“ selhalo:"

@@ -440,41 +439,39 @@ msgstr "%e. %B %Y, %l∶%M %p"
 msgid "Web Authentication Redirect"
 msgstr "Přesměrováno na ověření přes web"

-#: ../js/ui/appDisplay.js:789
+#: ../js/ui/appDisplay.js:794
 msgid "Frequently used applications will appear here"
 msgstr "Zde se objeví často používané aplikace"

-#: ../js/ui/appDisplay.js:909
+#: ../js/ui/appDisplay.js:914
 msgid "Frequent"
 msgstr "Časté"

-#: ../js/ui/appDisplay.js:916
+#: ../js/ui/appDisplay.js:921
 msgid "All"
 msgstr "Všechny"

-#: ../js/ui/appDisplay.js:1845
+#: ../js/ui/appDisplay.js:1853
 msgid "New Window"
 msgstr "Nové okno"

-#: ../js/ui/appDisplay.js:1873 ../js/ui/dash.js:289
+#: ../js/ui/appDisplay.js:1881 ../js/ui/dash.js:289
 msgid "Remove from Favorites"
 msgstr "Odstranit z oblíbených"

-#: ../js/ui/appDisplay.js:1879
+#: ../js/ui/appDisplay.js:1887
 msgid "Add to Favorites"
 msgstr "Přidat mezi oblíbené"

-#: ../js/ui/appDisplay.js:1889
+#: ../js/ui/appDisplay.js:1897
 msgid "Show Details"
 msgstr "Zobrazit podrobnosti"

 #: ../js/ui/appFavorites.js:132
-#, javascript-format
 msgid "%s has been added to your favorites."
 msgstr "%s byl přidán mezi oblíbené."

 #: ../js/ui/appFavorites.js:166
-#, javascript-format
 msgid "%s has been removed from your favorites."
 msgstr "%s byl odstraněn z oblíbených."

@@ -487,12 +484,12 @@ msgid "Display Settings"
 msgstr "Nastavení displeje"

 #: ../js/ui/backgroundMenu.js:22 ../js/ui/panel.js:650
-#: ../js/ui/status/system.js:357
+#: ../js/ui/status/system.js:366
 msgid "Settings"
 msgstr "Nastavení"

 #. Translators: Enter 0-6 (Sunday-Saturday) for non-work days. Examples: "0" (Sunday) "6" (Saturday) "06" (Sunday and Saturday). */
-#: ../js/ui/calendar.js:53
+#: ../js/ui/calendar.js:55
 msgctxt "calendar-no-work"
 msgid "06"
 msgstr "06"
@@ -502,94 +499,94 @@ msgstr "06"
 #. * NOTE: These grid abbreviations are always shown together
 #. * and in order, e.g. "S M T W T F S".
 #. */
-#: ../js/ui/calendar.js:82
+#: ../js/ui/calendar.js:84
 msgctxt "grid sunday"
 msgid "S"
 msgstr "Ne"

 #. Translators: Calendar grid abbreviation for Monday */
-#: ../js/ui/calendar.js:84
+#: ../js/ui/calendar.js:86
 msgctxt "grid monday"
 msgid "M"
 msgstr "Po"

 #. Translators: Calendar grid abbreviation for Tuesday */
-#: ../js/ui/calendar.js:86
+#: ../js/ui/calendar.js:88
 msgctxt "grid tuesday"
 msgid "T"
 msgstr "Út"

 #. Translators: Calendar grid abbreviation for Wednesday */
-#: ../js/ui/calendar.js:88
+#: ../js/ui/calendar.js:90
 msgctxt "grid wednesday"
 msgid "W"
 msgstr "St"

 #. Translators: Calendar grid abbreviation for Thursday */
-#: ../js/ui/calendar.js:90
+#: ../js/ui/calendar.js:92
 msgctxt "grid thursday"
 msgid "T"
 msgstr "Čt"

 #. Translators: Calendar grid abbreviation for Friday */
-#: ../js/ui/calendar.js:92
+#: ../js/ui/calendar.js:94
 msgctxt "grid friday"
 msgid "F"
 msgstr "Pá"

 #. Translators: Calendar grid abbreviation for Saturday */
-#: ../js/ui/calendar.js:94
+#: ../js/ui/calendar.js:96
 msgctxt "grid saturday"
 msgid "S"
 msgstr "So"

-#: ../js/ui/calendar.js:564
+#: ../js/ui/calendar.js:566
 msgid "Previous month"
 msgstr "Předchozí měsíc"

-#: ../js/ui/calendar.js:574
+#: ../js/ui/calendar.js:576
 msgid "Next month"
 msgstr "Následující měsíc"

-#: ../js/ui/calendar.js:781
+#: ../js/ui/calendar.js:783
 msgid "Week %V"
 msgstr "Týden %V"

 #. 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:1187
+#: ../js/ui/calendar.js:1188
 msgctxt "event list time"
 msgid "All Day"
 msgstr "Celý den"

-#: ../js/ui/calendar.js:1289
+#: ../js/ui/calendar.js:1291
 msgid "Clear section"
 msgstr "Vymazat část"

-#: ../js/ui/calendar.js:1516
+#: ../js/ui/calendar.js:1518
 msgid "Events"
 msgstr "Události"

-#: ../js/ui/calendar.js:1525
+#: ../js/ui/calendar.js:1527
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %e. %B"

-#: ../js/ui/calendar.js:1529
+#: ../js/ui/calendar.js:1531
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %e. %B %Y"

-#: ../js/ui/calendar.js:1614
+#: ../js/ui/calendar.js:1616
 msgid "Notifications"
 msgstr "Upozornění"

-#: ../js/ui/calendar.js:1765
+#: ../js/ui/calendar.js:1767
 msgid "No Notifications"
 msgstr "Žádná upozornění"

-#: ../js/ui/calendar.js:1768
+#: ../js/ui/calendar.js:1770
 msgid "No Events"
 msgstr "Žádné události"

@@ -602,20 +599,19 @@ msgid "External drive disconnected"
 msgstr "Externí svazek odpojen"

 #: ../js/ui/components/autorunManager.js:354
-#, javascript-format
 msgid "Open with %s"
 msgstr "Otevřít s %s"

-#: ../js/ui/components/keyring.js:94 ../js/ui/components/polkitAgent.js:285
+#: ../js/ui/components/keyring.js:120 ../js/ui/components/polkitAgent.js:315
 msgid "Password:"
 msgstr "Heslo:"

-#: ../js/ui/components/keyring.js:120
+#: ../js/ui/components/keyring.js:153
 msgid "Type again:"
 msgstr "Napište znovu:"

-#: ../js/ui/components/networkAgent.js:140 ../js/ui/status/network.js:277
-#: ../js/ui/status/network.js:359 ../js/ui/status/network.js:919
+#: ../js/ui/components/networkAgent.js:140 ../js/ui/status/network.js:269
+#: ../js/ui/status/network.js:352 ../js/ui/status/network.js:919
 msgid "Connect"
 msgstr "Připojit"

@@ -650,7 +646,6 @@ msgstr "K bezdrátové síti je vyžadováno ověření"

 #: ../js/ui/components/networkAgent.js:321
 #: ../js/ui/components/networkAgent.js:659
-#, javascript-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
 "“%s”."
@@ -695,23 +690,22 @@ msgstr "Heslo k mobilní širokopásmové síti"
 #: ../js/ui/components/networkAgent.js:663
 #: ../js/ui/components/networkAgent.js:667
 #: ../js/ui/components/networkAgent.js:680
-#, javascript-format
 msgid "A password is required to connect to “%s”."
 msgstr "Pro připojení k „%s“ je vyžadováno heslo."

-#: ../js/ui/components/networkAgent.js:647 ../js/ui/status/network.js:1657
+#: ../js/ui/components/networkAgent.js:647 ../js/ui/status/network.js:1658
 msgid "Network Manager"
 msgstr "Network Manager"

-#: ../js/ui/components/polkitAgent.js:54
+#: ../js/ui/components/polkitAgent.js:60
 msgid "Authentication Required"
 msgstr "Je vyžadováno ověření"

-#: ../js/ui/components/polkitAgent.js:96
+#: ../js/ui/components/polkitAgent.js:102
 msgid "Administrator"
 msgstr "Správce"

-#: ../js/ui/components/polkitAgent.js:175
+#: ../js/ui/components/polkitAgent.js:182
 msgid "Authenticate"
 msgstr "Ověřit"

@@ -719,14 +713,13 @@ msgstr "Ověřit"
 #. * requested authentication was not gained; this can happen
 #. * because of an authentication error (like invalid password),
 #. * for instance. */
-#: ../js/ui/components/polkitAgent.js:271 ../js/ui/shellMountOperation.js:383
+#: ../js/ui/components/polkitAgent.js:301 ../js/ui/shellMountOperation.js:383
 msgid "Sorry, that didn't work. Please try again."
 msgstr "Ověření bohužel nebylo úspěšné. Zkuste to prosím znovu."

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name. */
-#: ../js/ui/components/telepathyClient.js:757
-#, javascript-format
+#: ../js/ui/components/telepathyClient.js:759
 msgid "%s is now known as %s"
 msgstr "%s je teď znám jako %s"

@@ -768,7 +761,6 @@ msgid "World Clocks"
 msgstr "Světové hodiny"

 #: ../js/ui/endSessionDialog.js:64
-#, javascript-format
 msgctxt "title"
 msgid "Log Out %s"
 msgstr "Odhlásit uživatele %s"
@@ -779,7 +771,6 @@ msgid "Log Out"
 msgstr "Odhlášení"

 #: ../js/ui/endSessionDialog.js:67
-#, javascript-format
 msgid "%s will be logged out automatically in %d second."
 msgid_plural "%s will be logged out automatically in %d seconds."
 msgstr[0] "Uživatel %s bude automaticky odhlášen za %d sekundu."
@@ -787,7 +778,6 @@ msgstr[1] "Uživatel %s bude automaticky odhlášen za %d sekundy."
 msgstr[2] "Uživatel %s bude automaticky odhlášen za %d sekund."

 #: ../js/ui/endSessionDialog.js:72
-#, javascript-format
 msgid "You will be logged out automatically in %d second."
 msgid_plural "You will be logged out automatically in %d seconds."
 msgstr[0] "Budete automaticky odhlášeni za %d sekundu."
@@ -810,7 +800,6 @@ msgid "Install Updates & Power Off"
 msgstr "Nainstalovat aktualizace a vypnout"

 #: ../js/ui/endSessionDialog.js:87
-#, javascript-format
 msgid "The system will power off automatically in %d second."
 msgid_plural "The system will power off automatically in %d seconds."
 msgstr[0] "Systém bude automaticky vypnut za %d sekundu."
@@ -838,7 +827,6 @@ msgid "Restart"
 msgstr "Restart"

 #: ../js/ui/endSessionDialog.js:105
-#, javascript-format
 msgid "The system will restart automatically in %d second."
 msgid_plural "The system will restart automatically in %d seconds."
 msgstr[0] "Systém bude automaticky restartován za %d sekundu."
@@ -851,7 +839,6 @@ msgid "Restart & Install Updates"
 msgstr "Restartovat a nainstalovat aktualizace"

 #: ../js/ui/endSessionDialog.js:121
-#, javascript-format
 msgid "The system will automatically restart and install updates in %d second."
 msgid_plural ""
 "The system will automatically restart and install updates in %d seconds."
@@ -895,13 +882,11 @@ msgstr "Jsou přihlášeni jiní uživatelé."

 #. Translators: Remote here refers to a remote session, like a ssh login */
 #: ../js/ui/endSessionDialog.js:640
-#, javascript-format
 msgid "%s (remote)"
 msgstr "%s (vzdálený)"

 #. Translators: Console here refers to a tty like a VT console */
 #: ../js/ui/endSessionDialog.js:643
-#, javascript-format
 msgid "%s (console)"
 msgstr "%s (konzola)"

@@ -910,7 +895,6 @@ msgid "Install"
 msgstr "Instalovat"

 #: ../js/ui/extensionDownloader.js:204
-#, javascript-format
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "Stáhnout a nainstalovat „%s“ z extensions.gnome.org?"

@@ -933,7 +917,6 @@ msgstr "Nejsou nainstalována žádná rozšíření"

 #. Translators: argument is an extension UUID. */
 #: ../js/ui/lookingGlass.js:697
-#, javascript-format
 msgid "%s has not emitted any errors."
 msgstr "Rozšíření %s nevyvolalo žádné chyby."

@@ -945,17 +928,13 @@ msgstr "Skrývat chyby"
 msgid "Show Errors"
 msgstr "Zobrazovat chyby"

-#: ../js/ui/lookingGlass.js:716 ../js/ui/status/location.js:71
-#: ../js/ui/status/location.js:176
+#: ../js/ui/lookingGlass.js:716
 msgid "Enabled"
 msgstr "Povoleno"

-#. Translators: this is for a network device that cannot be activated
-#. because it's disabled by rfkill (airplane mode) */
 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:719 ../js/ui/status/location.js:179
-#: ../js/ui/status/network.js:592 ../src/gvc/gvc-mixer-control.c:1830
+#: ../js/ui/lookingGlass.js:719 ../src/gvc/gvc-mixer-control.c:1830
 msgid "Disabled"
 msgstr "Zakázáno"

@@ -1009,7 +988,7 @@ msgstr "Ukončit"
 msgid "Activities"
 msgstr "Činnosti"

-#: ../js/ui/panel.js:755
+#: ../js/ui/panel.js:754
 msgid "Top Bar"
 msgstr "Horní lišta"

@@ -1036,7 +1015,6 @@ msgid "%A, %B %d"
 msgstr "%A, %e. %B"

 #: ../js/ui/screenShield.js:144
-#, javascript-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d nová zpráva"
@@ -1044,14 +1022,13 @@ msgstr[1] "%d nové zprávy"
 msgstr[2] "%d nových zpráv"

 #: ../js/ui/screenShield.js:146
-#, javascript-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
 msgstr[0] "%d nové upozornění"
 msgstr[1] "%d nová upozornění"
 msgstr[2] "%d nových upozornění"

-#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:365
+#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:374
 msgid "Lock"
 msgstr "Uzamknout"

@@ -1143,14 +1120,10 @@ msgstr "Vysoký kontrast"
 msgid "Large Text"
 msgstr "Styl velkého textu"

-#: ../js/ui/status/bluetooth.js:49
-msgid "Bluetooth"
-msgstr "Bluetooth"
-
 #: ../js/ui/status/bluetooth.js:51 ../js/ui/status/network.js:178
-#: ../js/ui/status/network.js:360 ../js/ui/status/network.js:1282
-#: ../js/ui/status/network.js:1393 ../js/ui/status/rfkill.js:91
-#: ../js/ui/status/rfkill.js:118
+#: ../js/ui/status/network.js:353 ../js/ui/status/network.js:1279
+#: ../js/ui/status/network.js:1394 ../js/ui/status/rfkill.js:90
+#: ../js/ui/status/rfkill.js:117
 msgid "Turn Off"
 msgstr "Vypnout"

@@ -1158,17 +1131,18 @@ msgstr "Vypnout"
 msgid "Bluetooth Settings"
 msgstr "Nastavení Bluetooth"

-#: ../js/ui/status/bluetooth.js:104
-#, javascript-format
-msgid "%d Connected Device"
-msgid_plural "%d Connected Devices"
-msgstr[0] "%d připojené zařízení"
-msgstr[1] "%d připojená zařízení"
-msgstr[2] "%d připojených zařízení"
+#. Translators: this is the number of connected bluetooth devices */
+#: ../js/ui/status/bluetooth.js:105
+#| msgid "Connected"
+msgid "%d Connected"
+msgid_plural "%d Connected"
+msgstr[0] "%d připojené"
+msgstr[1] "%d připojená"
+msgstr[2] "%d připojených"

-#: ../js/ui/status/bluetooth.js:106 ../js/ui/status/network.js:1310
-msgid "Not Connected"
-msgstr "Nepřipojeno"
+#: ../js/ui/status/bluetooth.js:107
+msgid "Not In Use"
+msgstr "Nepoužívá se"

 #: ../js/ui/status/brightness.js:44
 msgid "Brightness"
@@ -1178,11 +1152,12 @@ msgstr "Jas"
 msgid "Show Keyboard Layout"
 msgstr "Zobrazit rozložení klávesnice"

-#: ../js/ui/status/location.js:65
-msgid "Location"
-msgstr "Poloha"
+#: ../js/ui/status/location.js:71 ../js/ui/status/location.js:177
+#| msgid "Location"
+msgid "Location Enabled"
+msgstr "Zjišťování polohy je povoleno"

-#: ../js/ui/status/location.js:72 ../js/ui/status/location.js:177
+#: ../js/ui/status/location.js:72 ../js/ui/status/location.js:178
 msgid "Disable"
 msgstr "Zakázáno"

@@ -1191,10 +1166,16 @@ msgid "Privacy Settings"
 msgstr "Nastavení ochrany osobních údajů"

 #: ../js/ui/status/location.js:176
-msgid "In Use"
-msgstr "Používá se"
+#| msgid "Location"
+msgid "Location In Use"
+msgstr "Zjišťování polohy se používá"

 #: ../js/ui/status/location.js:180
+#| msgid "Connection failed"
+msgid "Location Disabled"
+msgstr "Zjišťování polohy je zakázáno"
+
+#: ../js/ui/status/location.js:181
 msgid "Enable"
 msgstr "Povoleno"

@@ -1202,61 +1183,74 @@ msgstr "Povoleno"
 msgid "<unknown>"
 msgstr "<neznámé>"

-#: ../js/ui/status/network.js:457 ../js/ui/status/network.js:1308
-#: ../js/ui/status/network.js:1512
-msgid "Off"
-msgstr "Vypnuto"
+#. Translators: %s is a network identifier */
+#: ../js/ui/status/network.js:451 ../js/ui/status/network.js:1308
+msgid "%s Off"
+msgstr "%s je vypnuto"

-#: ../js/ui/status/network.js:459
-msgid "Connected"
-msgstr "Připojeno"
+#. Translators: %s is a network identifier */
+#: ../js/ui/status/network.js:454
+msgid "%s Connected"
+msgstr "%s je připojeno"

 #. 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:463
-msgid "Unmanaged"
-msgstr "Nespravováno"
+#. under NetworkManager's control (and thus cannot be used in the menu);
+#. %s is a network identifier */
+#: ../js/ui/status/network.js:459
+msgid "%s Unmanaged"
+msgstr "%s není spravováno"

-#: ../js/ui/status/network.js:465
-msgid "Disconnecting"
-msgstr "Odpojuje se…"
+#. Translators: %s is a network identifier */
+#: ../js/ui/status/network.js:462
+msgid "%s Disconnecting"
+msgstr "%s se odpojuje"

-#: ../js/ui/status/network.js:471 ../js/ui/status/network.js:1302
-msgid "Connecting"
-msgstr "Připojuje se…"
+#. Translators: %s is a network identifier */
+#: ../js/ui/status/network.js:469 ../js/ui/status/network.js:1300
+msgid "%s Connecting"
+msgstr "%s se připojuje"

-#. Translators: this is for network connections that require some kind of key or password */
-#: ../js/ui/status/network.js:474
-msgid "Authentication required"
-msgstr "Je vyžadováno ověření"
+#. Translators: this is for network connections that require some kind of key or password; %s is a network identifier */
+#: ../js/ui/status/network.js:472
+msgid "%s Requires Authentication"
+msgstr "%s požaduje ověření"

 #. Translators: this is for devices that require some kind of firmware or kernel
-#. module, which is missing */
-#: ../js/ui/status/network.js:482
-msgid "Firmware missing"
-msgstr "Schází firmware"
+#. module, which is missing; %s is a network identifier */
+#: ../js/ui/status/network.js:480
+msgid "Firmware Missing For %s"
+msgstr "Schází firmware pro %s"

 #. 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:486
-msgid "Unavailable"
-msgstr "Nedostupné"
+#. is disabled by rfkill, or it has no coverage; %s is a network identifier */
+#: ../js/ui/status/network.js:484
+msgid "%s Unavailable"
+msgstr "%s je nedostupné"

-#: ../js/ui/status/network.js:488 ../js/ui/status/network.js:1696
-msgid "Connection failed"
-msgstr "Připojení selhalo"
+#. Translators: %s is a network identifier */
+#: ../js/ui/status/network.js:487
+#| msgid "Connection failed"
+msgid "%s Connection Failed"
+msgstr "%s selhalo připojení"

-#: ../js/ui/status/network.js:504
+#: ../js/ui/status/network.js:503
 msgid "Wired Settings"
 msgstr "Nastavení připojení po drátu"

-#: ../js/ui/status/network.js:546 ../js/ui/status/network.js:624
+#: ../js/ui/status/network.js:545 ../js/ui/status/network.js:624
 msgid "Mobile Broadband Settings"
 msgstr "Nastavení mobilní širokopásmové sítě"

-#: ../js/ui/status/network.js:588 ../js/ui/status/network.js:1306
-msgid "Hardware Disabled"
-msgstr "Hardware zakázán"
+#. Translators: %s is a network identifier */
+#: ../js/ui/status/network.js:588 ../js/ui/status/network.js:1305
+msgid "%s Hardware Disabled"
+msgstr "%s je hardwarově zakázáno"
+
+#. Translators: this is for a network device that cannot be activated
+#. because it's disabled by rfkill (airplane mode); %s is a network identifier */
+#: ../js/ui/status/network.js:592
+msgid "%s Disabled"
+msgstr "%s je zakázáno"

 #: ../js/ui/status/network.js:632
 msgid "Use as Internet connection"
@@ -1298,52 +1292,67 @@ msgstr "Vyberte síť"
 msgid "No Networks"
 msgstr "Žádné sítě"

-#: ../js/ui/status/network.js:904 ../js/ui/status/rfkill.js:116
+#: ../js/ui/status/network.js:904 ../js/ui/status/rfkill.js:115
 msgid "Use hardware switch to turn off"
 msgstr "K vypnutí použijte fyzický vypínač"

-#: ../js/ui/status/network.js:1174
+#: ../js/ui/status/network.js:1171
 msgid "Select Network"
 msgstr "Vybrat síť"

-#: ../js/ui/status/network.js:1180
+#: ../js/ui/status/network.js:1177
 msgid "Wi-Fi Settings"
 msgstr "Nastavení WiFi"

-#: ../js/ui/status/network.js:1282
+#: ../js/ui/status/network.js:1279
 msgid "Turn On"
 msgstr "Zapnout"

-#: ../js/ui/status/network.js:1299
-msgid "Hotspot Active"
-msgstr "Hotspot aktivní"
+#. Translators: %s is a network identifier */
+#: ../js/ui/status/network.js:1296
+#| msgid "Hotspot Active"
+msgid "%s Hotspot Active"
+msgstr "%s je aktivní přístupový bod"

-#: ../js/ui/status/network.js:1410
+#. Translators: %s is a network identifier */
+#: ../js/ui/status/network.js:1311
+msgid "%s Not Connected"
+msgstr "%s není připojeno"
+
+#: ../js/ui/status/network.js:1411
 msgid "connecting..."
-msgstr "připojování…"
+msgstr "připojuje se…"

 #. Translators: this is for network connections that require some kind of key or password */
-#: ../js/ui/status/network.js:1413
+#: ../js/ui/status/network.js:1414
 msgid "authentication required"
-msgstr "je vyžadováno ověření"
+msgstr "je požadováno ověření"

-#: ../js/ui/status/network.js:1415
+#: ../js/ui/status/network.js:1416
 msgid "connection failed"
 msgstr "připojení selhalo"

-#: ../js/ui/status/network.js:1481 ../js/ui/status/rfkill.js:94
+#: ../js/ui/status/network.js:1482 ../js/ui/status/rfkill.js:93
 msgid "Network Settings"
 msgstr "Nastavení sítě"

-#: ../js/ui/status/network.js:1483
+#: ../js/ui/status/network.js:1484
 msgid "VPN Settings"
 msgstr "Nastavení VPN"

-#: ../js/ui/status/network.js:1502
+#: ../js/ui/status/network.js:1503
 msgid "VPN"
 msgstr "VPN"

+#: ../js/ui/status/network.js:1513
+msgid "VPN Off"
+msgstr "VPN je vypnuta"
+
 #: ../js/ui/status/network.js:1697
+msgid "Connection failed"
+msgstr "Připojení selhalo"
+
+#: ../js/ui/status/network.js:1698
 msgid "Activation of network connection failed"
 msgstr "Aktivace síťového připojení selhala"

@@ -1360,48 +1369,38 @@ msgid "Estimating…"
 msgstr "Odhaduje se…"

 #: ../js/ui/status/power.js:86
-#, javascript-format
 msgid "%d∶%02d Remaining (%d%%)"
 msgstr "Zbývá %d∶%02d (%d %%)"

 #: ../js/ui/status/power.js:91
-#, javascript-format
 msgid "%d∶%02d Until Full (%d%%)"
 msgstr "%d∶%02d do nabití (%d %%)"

-#: ../js/ui/status/power.js:119
-msgid "UPS"
-msgstr "Záložní zdroj"
-
-#: ../js/ui/status/power.js:121
-msgid "Battery"
-msgstr "Baterie"
-
 #: ../js/ui/status/rfkill.js:88
-msgid "Airplane Mode"
-msgstr "Režim „letadlo“"
+msgid "Airplane Mode On"
+msgstr "Režim „letadlo“ je zapnutý"

-#: ../js/ui/status/rfkill.js:90
-msgid "On"
-msgstr "Zapnuto"
-
-#: ../js/ui/status/system.js:337
+#: ../js/ui/status/system.js:343
 msgid "Switch User"
 msgstr "Přepnout uživatele"

-#: ../js/ui/status/system.js:342
+#: ../js/ui/status/system.js:348
 msgid "Log Out"
 msgstr "Odhlásit se"

-#: ../js/ui/status/system.js:361
+#: ../js/ui/status/system.js:353
+msgid "Account Settings"
+msgstr "Nastavení účtu"
+
+#: ../js/ui/status/system.js:370
 msgid "Orientation Lock"
 msgstr "Zámek otočení"

-#: ../js/ui/status/system.js:369
+#: ../js/ui/status/system.js:378
 msgid "Suspend"
 msgstr "Uspat do paměti"

-#: ../js/ui/status/system.js:372
+#: ../js/ui/status/system.js:381
 msgid "Power Off"
 msgstr "Vypnout"

@@ -1434,7 +1433,6 @@ msgid "Search"
 msgstr "Hledat"

 #: ../js/ui/windowAttentionHandler.js:20
-#, javascript-format
 msgid "“%s” is ready"
 msgstr "Připraveno „%s“"

@@ -1449,12 +1447,11 @@ msgstr "Chcete zachovat nastavení displeje?"
 msgid "Revert Settings"
 msgstr "Obnovit původní"

-#: ../js/ui/windowManager.js:86
+#: ../js/ui/windowManager.js:85
 msgid "Keep Changes"
 msgstr "Zachovat"

-#: ../js/ui/windowManager.js:105
-#, javascript-format
+#: ../js/ui/windowManager.js:103
 msgid "Settings changes will revert in %d second"
 msgid_plural "Settings changes will revert in %d seconds"
 msgstr[0] "Nastavení se obnoví na původní za %d sekundu"
@@ -1463,8 +1460,7 @@ msgstr[2] "Nastavení se obnoví na původní za %d sekund"

 #. Translators: This represents the size of a window. The first number is
 #. * the width of the window and the second is the height. */
-#: ../js/ui/windowManager.js:660
-#, javascript-format
+#: ../js/ui/windowManager.js:658
 msgid "%d x %d"
 msgstr "%d × %d"

--- a/po/de.po
+++ b/po/de.po
@@ -21,16 +21,16 @@ msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-07-03 08:08+0000\n"
-"PO-Revision-Date: 2015-07-03 19:24+0100\n"
-"Last-Translator: Benjamin Steinwender <b@stbe.at>\n"
+"POT-Creation-Date: 2015-09-03 14:04+0000\n"
+"PO-Revision-Date: 2015-09-05 09:35+0100\n"
+"Last-Translator: Christian Kirbach <christian.kirbach@gmail.com>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.1\n"
+"X-Generator: Poedit 1.7.5\n"

 #: ../data/50-gnome-shell-system.xml.in.h:1
 msgid "System"
@@ -79,7 +79,7 @@ msgstr "GNOME-Shell (Wayland Compositor)"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:1
 msgid "Enable internal tools useful for developers and testers from Alt-F2"
-msgstr "Interne Werkzeuge für Entwickler und Tester mit Alt+F2 aktivieren"
+msgstr "Interne Werkzeuge für Entwickler und Tester mit Alt+F2 einschalten"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:2
 msgid ""
@@ -117,7 +117,7 @@ msgid ""
 "all extensions regardless of the versions they claim to support."
 msgstr ""
 "GNOME-Shell lädt nur Erweiterungen, die die aktuelle Version unterstützen. "
-"Durch Aktivieren dieser Option wird die interne Kompatibilitätsprüfung "
+"Durch Einschalten dieser Option wird die interne Kompatibilitätsprüfung "
 "deaktiviert und alle Erweiterungen werden versucht zu laden, unabhängig von "
 "der Version, die die Erweiterung offiziell unterstützt."

@@ -145,15 +145,16 @@ msgstr "Index der aktuell gewählten Ansicht in der Anwendungsauswahl."
 msgid "History for command (Alt-F2) dialog"
 msgstr "Verlauf des Befehlsdialogs (Alt+F2)"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:12
+#. Translators: looking glass is a debugger and inspector tool, see https://live.gnome.org/GnomeShell/LookingGlass
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:13
 msgid "History for the looking glass dialog"
 msgstr "Chronik des Dialogs »looking glass«"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:13
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
 msgid "Always show the 'Log out' menu item in the user menu."
 msgstr "Den Menüeintrag »Abmelden« immer im Benutzermenü anzeigen."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
 msgid ""
 "This key overrides the automatic hiding of the 'Log out' menu item in single-"
 "user, single-session situations."
@@ -161,13 +162,13 @@ msgstr ""
 "Dieser Schlüssel überschreibt das automatische Verbergen des Menüeintrags "
 "»Abmelden« in Einzelbenutzer, Einzelsitzungssituationen."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
 msgid "Whether to remember password for mounting encrypted or remote filesystems"
 msgstr ""
 "Legt fest, ob Passwörter für eingehängte, verschlüsselte oder entfernte "
 "Dateisysteme gespeichert werden"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
 msgid ""
 "The shell will request a password when an encrypted device or a remote "
 "filesystem is mounted. If the password can be saved for future use a 'Remember "
@@ -180,80 +181,80 @@ msgstr ""
 "angeboten. Dieser Schlüssel stellt den Standardstatus für dieses Ankreuzfeld "
 "ein."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
 msgid "Show the week date in the calendar"
 msgstr "Kalenderwoche im Kalender anzeigen"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
 msgid "If true, display the ISO week date in the calendar."
 msgstr ""
 "Wenn dieser Wert gesetzt ist, wird der ISO-Wochentag im Kalender angezeigt."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
 msgid "Keybinding to open the application menu"
 msgstr "Tastenkombination zum Öffnen des Anwendungsmenüs"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
 msgid "Keybinding to open the application menu."
 msgstr "Tastenkombination zum Öffnen des Anwendungsmenüs."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
 msgid "Keybinding to open the \"Show Applications\" view"
 msgstr "Tastenkombination zum Öffnen der »Anwendungen anzeigen«-Ansicht"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
 msgid ""
 "Keybinding to open the \"Show Applications\" view of the Activities Overview."
 msgstr ""
 "Tastenkombination zum Öffnen der »Anwendungen anzeigen«-Ansicht der "
 "Aktivitätenübersicht."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
 msgid "Keybinding to open the overview"
 msgstr "Tastenkombination zum Öffnen der Übersicht"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
 msgid "Keybinding to open the Activities Overview."
 msgstr "Tastenkombination zum Öffnen der »Aktivitäten«-Übersicht"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
 msgid "Keybinding to toggle the visibility of the notification list"
 msgstr ""
 "Tastenkombination zum Umschalten der Sichtbarkeit der Benachrichtigungsliste"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 msgid "Keybinding to toggle the visibility of the notification list."
 msgstr ""
 "Tastenkombination zum Umschalten der Sichtbarkeit der Benachrichtigungsliste."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
 msgid "Keybinding to focus the active notification"
 msgstr "Tastenkombination zur Ausrichtung auf die aktiven Benachrichtigungen"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
 msgid "Keybinding to focus the active notification."
 msgstr "Tastenkombination zur Ausrichtung auf die aktiven Benachrichtigungen."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
 msgid ""
 "Keybinding that pauses and resumes all running tweens, for debugging purposes"
 msgstr ""
 "Tastenkombination, die alle laufenden Zwischenbilder anhält und fortsetzt. Zur "
 "Fehlerdiagnose."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
 msgid "Which keyboard to use"
 msgstr "Zu verwendende Tastatur"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:32
 msgid "The type of keyboard to use."
 msgstr "Der Typ der zu verwendenden Tastatur"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:32
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:33
 msgid "Limit switcher to current workspace."
 msgstr "Fensterwechsler auf aktuelle Arbeitsfläche einschränken."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:33
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:34
 msgid ""
 "If true, only applications that have windows on the current workspace are "
 "shown in the switcher. Otherwise, all applications are included."
@@ -262,11 +263,11 @@ msgstr ""
 "Fenster auf der aktuellen Arbeitsfläche haben. Andernfalls sind alle "
 "Anwendungen enthalten."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:34
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:35
 msgid "The application icon mode."
 msgstr "Der Modus der Anwendungssymbole."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:35
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:36
 msgid ""
 "Configures how the windows are shown in the switcher. Valid possibilities are "
 "'thumbnail-only' (shows a thumbnail of the window), 'app-icon-only' (shows "
@@ -276,7 +277,7 @@ msgstr ""
 "sind »thumbnail-only« (Vorschaubilder der Fenster werden angezeigt), »app-icon-"
 "only« (Nur das Anwendungssymbol wird angezeigt) oder »both« (beides)."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:36
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:37
 msgid ""
 "If true, only windows from the current workspace are shown in the switcher. "
 "Otherwise, all windows are included."
@@ -284,31 +285,31 @@ msgstr ""
 "Legt fest, ob Fenster der aktuellen Arbeitsfläche im Fensterwechsler "
 "aufgeführt werden. Andernfalls sind alle Fenster enthalten."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:37
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:38
 msgid "Attach modal dialog to the parent window"
 msgstr "Modalen Dialog an übergeordnetes Fenster binden"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:38
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:39
 msgid "This key overrides the key in org.gnome.mutter when running GNOME Shell."
 msgstr ""
 "Dieser Schlüssel überschreibt den Schlüssel in org.gnome.mutter, wenn die "
 "GNOME-Shell läuft."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:39
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:40
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr ""
-"Größenanpassung aktivieren, wenn ein Fenster an die Bildschirmkante verschoben "
-"wird"
+"Größenanpassung einschalten, wenn ein Fenster an die Bildschirmkante "
+"verschoben wird"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:40
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:41
 msgid "Workspaces are managed dynamically"
 msgstr "Arbeitsflächen dynamisch verwalten"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:41
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:42
 msgid "Workspaces only on primary monitor"
 msgstr "Arbeitsflächen nur auf dem primären Bildschirm"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:42
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:43
 msgid "Delay focus changes in mouse mode until the pointer stops moving"
 msgstr ""
 "Fokuswechsel im Mausmodus verzögern, bis sich der Zeiger nicht mehr bewegt"
@@ -327,13 +328,14 @@ msgid "GNOME Shell Extensions"
 msgstr "GNOME-Shell-Erweiterungen"

 #: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:145
-#: ../js/ui/components/polkitAgent.js:166 ../js/ui/endSessionDialog.js:452
+#: ../js/ui/components/polkitAgent.js:179 ../js/ui/endSessionDialog.js:452
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
 #: ../js/ui/status/network.js:916
 msgid "Cancel"
 msgstr "Abbrechen"

 #: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:215
+#: ../js/gdm/authPrompt.js:447
 msgid "Next"
 msgstr "Weiter"

@@ -355,17 +357,17 @@ msgstr "Sitzung wählen"
 msgid "Not listed?"
 msgstr "Nicht aufgeführt?"

-#: ../js/gdm/loginDialog.js:847
+#: ../js/gdm/loginDialog.js:850
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(z.B. Benutzer oder %s)"

-#: ../js/gdm/loginDialog.js:852 ../js/ui/components/networkAgent.js:271
+#: ../js/gdm/loginDialog.js:855 ../js/ui/components/networkAgent.js:271
 #: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "Benutzername:"

-#: ../js/gdm/loginDialog.js:1180
+#: ../js/gdm/loginDialog.js:1184
 msgid "Login Window"
 msgstr "Anmeldefenster"

@@ -459,31 +461,31 @@ msgstr "%e. %B %Y, %H:%M"
 msgid "Web Authentication Redirect"
 msgstr "Umleitung zu einer Internet-Anmeldung"

-#: ../js/ui/appDisplay.js:789
+#: ../js/ui/appDisplay.js:794
 msgid "Frequently used applications will appear here"
 msgstr "Häufig genutzte Anwendungen werden hier erscheinen"

-#: ../js/ui/appDisplay.js:909
+#: ../js/ui/appDisplay.js:914
 msgid "Frequent"
 msgstr "Häufig"

-#: ../js/ui/appDisplay.js:916
+#: ../js/ui/appDisplay.js:921
 msgid "All"
 msgstr "Alle"

-#: ../js/ui/appDisplay.js:1845
+#: ../js/ui/appDisplay.js:1853
 msgid "New Window"
 msgstr "Neues Fenster"

-#: ../js/ui/appDisplay.js:1873 ../js/ui/dash.js:289
+#: ../js/ui/appDisplay.js:1881 ../js/ui/dash.js:289
 msgid "Remove from Favorites"
 msgstr "Aus Favoriten entfernen"

-#: ../js/ui/appDisplay.js:1879
+#: ../js/ui/appDisplay.js:1887
 msgid "Add to Favorites"
 msgstr "Zu Favoriten hinzufügen"

-#: ../js/ui/appDisplay.js:1889
+#: ../js/ui/appDisplay.js:1897
 msgid "Show Details"
 msgstr "Details anzeigen"

@@ -506,12 +508,12 @@ msgid "Display Settings"
 msgstr "Anzeigeeinstellungen"

 #: ../js/ui/backgroundMenu.js:22 ../js/ui/panel.js:650
-#: ../js/ui/status/system.js:357
+#: ../js/ui/status/system.js:366
 msgid "Settings"
 msgstr "Einstellungen"

 #. Translators: Enter 0-6 (Sunday-Saturday) for non-work days. Examples: "0" (Sunday) "6" (Saturday) "06" (Sunday and Saturday). */
-#: ../js/ui/calendar.js:53
+#: ../js/ui/calendar.js:55
 msgctxt "calendar-no-work"
 msgid "06"
 msgstr "06"
@@ -521,94 +523,94 @@ msgstr "06"
 #. * NOTE: These grid abbreviations are always shown together
 #. * and in order, e.g. "S M T W T F S".
 #. */
-#: ../js/ui/calendar.js:82
+#: ../js/ui/calendar.js:84
 msgctxt "grid sunday"
 msgid "S"
 msgstr "S"

 #. Translators: Calendar grid abbreviation for Monday */
-#: ../js/ui/calendar.js:84
+#: ../js/ui/calendar.js:86
 msgctxt "grid monday"
 msgid "M"
 msgstr "M"

 #. Translators: Calendar grid abbreviation for Tuesday */
-#: ../js/ui/calendar.js:86
+#: ../js/ui/calendar.js:88
 msgctxt "grid tuesday"
 msgid "T"
 msgstr "D"

 #. Translators: Calendar grid abbreviation for Wednesday */
-#: ../js/ui/calendar.js:88
+#: ../js/ui/calendar.js:90
 msgctxt "grid wednesday"
 msgid "W"
 msgstr "M"

 #. Translators: Calendar grid abbreviation for Thursday */
-#: ../js/ui/calendar.js:90
+#: ../js/ui/calendar.js:92
 msgctxt "grid thursday"
 msgid "T"
 msgstr "D"

 #. Translators: Calendar grid abbreviation for Friday */
-#: ../js/ui/calendar.js:92
+#: ../js/ui/calendar.js:94
 msgctxt "grid friday"
 msgid "F"
 msgstr "F"

 #. Translators: Calendar grid abbreviation for Saturday */
-#: ../js/ui/calendar.js:94
+#: ../js/ui/calendar.js:96
 msgctxt "grid saturday"
 msgid "S"
 msgstr "S"

-#: ../js/ui/calendar.js:564
+#: ../js/ui/calendar.js:566
 msgid "Previous month"
 msgstr "Vorheriger Monat"

-#: ../js/ui/calendar.js:574
+#: ../js/ui/calendar.js:576
 msgid "Next month"
 msgstr "Nächster Monat"

-#: ../js/ui/calendar.js:781
+#: ../js/ui/calendar.js:783
 msgid "Week %V"
 msgstr "Woche %V"

 #. 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:1187
+#: ../js/ui/calendar.js:1188
 msgctxt "event list time"
 msgid "All Day"
 msgstr "Ganztägig"

-#: ../js/ui/calendar.js:1289
+#: ../js/ui/calendar.js:1291
 msgid "Clear section"
 msgstr "Abschnitt löschen"

-#: ../js/ui/calendar.js:1516
+#: ../js/ui/calendar.js:1518
 msgid "Events"
 msgstr "Termine"

-#: ../js/ui/calendar.js:1525
+#: ../js/ui/calendar.js:1527
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %d. %B"

-#: ../js/ui/calendar.js:1529
+#: ../js/ui/calendar.js:1531
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%a, %d. %B %Y"

-#: ../js/ui/calendar.js:1614
+#: ../js/ui/calendar.js:1616
 msgid "Notifications"
 msgstr "Benachrichtigungen"

-#: ../js/ui/calendar.js:1765
+#: ../js/ui/calendar.js:1767
 msgid "No Notifications"
 msgstr "Keine Benachrichtigungen"

-#: ../js/ui/calendar.js:1768
+#: ../js/ui/calendar.js:1770
 msgid "No Events"
 msgstr "Keine Termine"

@@ -625,16 +627,16 @@ msgstr "Externes Laufwerk getrennt"
 msgid "Open with %s"
 msgstr "Öffnen mit %s"

-#: ../js/ui/components/keyring.js:94 ../js/ui/components/polkitAgent.js:285
+#: ../js/ui/components/keyring.js:120 ../js/ui/components/polkitAgent.js:315
 msgid "Password:"
 msgstr "Passwort:"

-#: ../js/ui/components/keyring.js:120
+#: ../js/ui/components/keyring.js:153
 msgid "Type again:"
 msgstr "Erneut eingeben:"

-#: ../js/ui/components/networkAgent.js:140 ../js/ui/status/network.js:277
-#: ../js/ui/status/network.js:359 ../js/ui/status/network.js:919
+#: ../js/ui/components/networkAgent.js:140 ../js/ui/status/network.js:269
+#: ../js/ui/status/network.js:352 ../js/ui/status/network.js:919
 msgid "Connect"
 msgstr "Verbinden"

@@ -717,19 +719,19 @@ msgstr "Passwort der mobilen Breitbandverbindung"
 msgid "A password is required to connect to “%s”."
 msgstr "Es wird ein Passwort benötigt, um sich mit »%s« zu verbinden."

-#: ../js/ui/components/networkAgent.js:647 ../js/ui/status/network.js:1657
+#: ../js/ui/components/networkAgent.js:647 ../js/ui/status/network.js:1658
 msgid "Network Manager"
 msgstr "Netzwerk-Verwaltung"

-#: ../js/ui/components/polkitAgent.js:54
+#: ../js/ui/components/polkitAgent.js:60
 msgid "Authentication Required"
 msgstr "Anmeldung erforderlich"

-#: ../js/ui/components/polkitAgent.js:96
+#: ../js/ui/components/polkitAgent.js:102
 msgid "Administrator"
 msgstr "Systemverwalter"

-#: ../js/ui/components/polkitAgent.js:175
+#: ../js/ui/components/polkitAgent.js:182
 msgid "Authenticate"
 msgstr "Anmelden"

@@ -737,13 +739,13 @@ msgstr "Anmelden"
 #. * requested authentication was not gained; this can happen
 #. * because of an authentication error (like invalid password),
 #. * for instance. */
-#: ../js/ui/components/polkitAgent.js:271 ../js/ui/shellMountOperation.js:383
+#: ../js/ui/components/polkitAgent.js:301 ../js/ui/shellMountOperation.js:383
 msgid "Sorry, that didn't work. Please try again."
 msgstr "Entschuldigung, das hat nicht geklappt. Bitte versuchen Sie es erneut."

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name. */
-#: ../js/ui/components/telepathyClient.js:757
+#: ../js/ui/components/telepathyClient.js:759
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "%s heißt jetzt %s"
@@ -924,7 +926,7 @@ msgstr "Installieren"
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "»%s« von extensions.gnome.org herunterladen und installieren?"

-#: ../js/ui/keyboard.js:747 ../js/ui/status/keyboard.js:713
+#: ../js/ui/keyboard.js:741 ../js/ui/status/keyboard.js:713
 msgid "Keyboard"
 msgstr "Tastatur"

@@ -955,19 +957,15 @@ msgstr "Fehler verbergen"
 msgid "Show Errors"
 msgstr "Fehler anzeigen"

-#: ../js/ui/lookingGlass.js:716 ../js/ui/status/location.js:71
-#: ../js/ui/status/location.js:176
+#: ../js/ui/lookingGlass.js:716
 msgid "Enabled"
-msgstr "Aktiviert"
+msgstr "Eingeschaltet"

-#. Translators: this is for a network device that cannot be activated
-#. because it's disabled by rfkill (airplane mode) */
 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:719 ../js/ui/status/location.js:179
-#: ../js/ui/status/network.js:592 ../src/gvc/gvc-mixer-control.c:1830
+#: ../js/ui/lookingGlass.js:719 ../src/gvc/gvc-mixer-control.c:1830
 msgid "Disabled"
-msgstr "Deaktiviert"
+msgstr "Ausgeschaltet"

 #: ../js/ui/lookingGlass.js:721
 msgid "Error"
@@ -997,7 +995,7 @@ msgstr "Systeminformationen"
 msgid "Undo"
 msgstr "Rückgängig"

-#: ../js/ui/overview.js:124
+#: ../js/ui/overview.js:117
 msgid "Overview"
 msgstr "Übersicht"

@@ -1005,7 +1003,7 @@ msgstr "Übersicht"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters. */
-#: ../js/ui/overview.js:246
+#: ../js/ui/overview.js:244
 msgid "Type to search…"
 msgstr "Suchbegriff eingeben …"

@@ -1019,7 +1017,7 @@ msgstr "Beenden"
 msgid "Activities"
 msgstr "Aktivitäten"

-#: ../js/ui/panel.js:755
+#: ../js/ui/panel.js:754
 msgid "Top Bar"
 msgstr "Oberes Panel"

@@ -1062,7 +1060,7 @@ msgid_plural "%d new notifications"
 msgstr[0] "%d neue Benachrichtigung"
 msgstr[1] "%d neue Benachrichtigungen"

-#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:365
+#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:374
 msgid "Lock"
 msgstr "Sperren"

@@ -1154,14 +1152,10 @@ msgstr "Hoher Kontrast"
 msgid "Large Text"
 msgstr "Große Schrift"

-#: ../js/ui/status/bluetooth.js:49
-msgid "Bluetooth"
-msgstr "Bluetooth"
-
 #: ../js/ui/status/bluetooth.js:51 ../js/ui/status/network.js:178
-#: ../js/ui/status/network.js:360 ../js/ui/status/network.js:1282
-#: ../js/ui/status/network.js:1393 ../js/ui/status/rfkill.js:91
-#: ../js/ui/status/rfkill.js:118
+#: ../js/ui/status/network.js:353 ../js/ui/status/network.js:1279
+#: ../js/ui/status/network.js:1394 ../js/ui/status/rfkill.js:90
+#: ../js/ui/status/rfkill.js:117
 msgid "Turn Off"
 msgstr "Ausschalten"

@@ -1169,16 +1163,17 @@ msgstr "Ausschalten"
 msgid "Bluetooth Settings"
 msgstr "Bluetooth-Einstellungen"

-#: ../js/ui/status/bluetooth.js:104
+#. Translators: this is the number of connected bluetooth devices */
+#: ../js/ui/status/bluetooth.js:105
 #, javascript-format
-msgid "%d Connected Device"
-msgid_plural "%d Connected Devices"
-msgstr[0] "%d Verbundes Gerät"
-msgstr[1] "%d Verbundene Geräte"
+msgid "%d Connected"
+msgid_plural "%d Connected"
+msgstr[0] "%d verbunden"
+msgstr[1] "%d verbunden"

-#: ../js/ui/status/bluetooth.js:106 ../js/ui/status/network.js:1310
-msgid "Not Connected"
-msgstr "Nicht verbunden"
+#: ../js/ui/status/bluetooth.js:107
+msgid "Not In Use"
+msgstr "Nicht in Verwendung"

 #: ../js/ui/status/brightness.js:44
 msgid "Brightness"
@@ -1188,85 +1183,112 @@ msgstr "Helligkeit"
 msgid "Show Keyboard Layout"
 msgstr "Tastaturbelegung anzeigen"

-#: ../js/ui/status/location.js:65
-msgid "Location"
-msgstr "Ort"
+#: ../js/ui/status/location.js:71 ../js/ui/status/location.js:177
+msgid "Location Enabled"
+msgstr "Ortsdienst eingeschaltet"

-#: ../js/ui/status/location.js:72 ../js/ui/status/location.js:177
+#: ../js/ui/status/location.js:72 ../js/ui/status/location.js:178
 msgid "Disable"
-msgstr "Deaktivieren"
+msgstr "Ausschalten"

 #: ../js/ui/status/location.js:73
 msgid "Privacy Settings"
 msgstr "Einstellungen zur Privatsphäre"

 #: ../js/ui/status/location.js:176
-msgid "In Use"
-msgstr "In Verwendung"
+msgid "Location In Use"
+msgstr "Ortsdienst in Verwendung"

 #: ../js/ui/status/location.js:180
+msgid "Location Disabled"
+msgstr "Ortsdienst ausgeschaltet"
+
+#: ../js/ui/status/location.js:181
 msgid "Enable"
-msgstr "Aktivieren"
+msgstr "Einschalten"

 #: ../js/ui/status/network.js:101
 msgid "<unknown>"
 msgstr "<Unbekannt>"

-#: ../js/ui/status/network.js:457 ../js/ui/status/network.js:1308
-#: ../js/ui/status/network.js:1512
-msgid "Off"
-msgstr "Aus"
+#. Translators: %s is a network identifier */
+#: ../js/ui/status/network.js:451 ../js/ui/status/network.js:1308
+#, javascript-format
+msgid "%s Off"
+msgstr "%s ausgeschaltet"

-#: ../js/ui/status/network.js:459
-msgid "Connected"
-msgstr "Verbunden"
+#. Translators: %s is a network identifier */
+#: ../js/ui/status/network.js:454
+#, javascript-format
+msgid "%s Connected"
+msgstr "%s verbunden"

 #. 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:463
-msgid "Unmanaged"
-msgstr "Nicht verwaltet"
+#. under NetworkManager's control (and thus cannot be used in the menu);
+#. %s is a network identifier */
+#: ../js/ui/status/network.js:459
+#, javascript-format
+msgid "%s Unmanaged"
+msgstr "%s nicht verwaltet"

-#: ../js/ui/status/network.js:465
-msgid "Disconnecting"
-msgstr "Verbindungsabbau"
+#. Translators: %s is a network identifier */
+#: ../js/ui/status/network.js:462
+#, javascript-format
+msgid "%s Disconnecting"
+msgstr "Verbindungsabbau von %s"

-#: ../js/ui/status/network.js:471 ../js/ui/status/network.js:1302
-msgid "Connecting"
-msgstr "Verbinden"
+#. Translators: %s is a network identifier */
+#: ../js/ui/status/network.js:469 ../js/ui/status/network.js:1300
+#, javascript-format
+msgid "%s Connecting"
+msgstr "Verbindungsaufbau von %s"

-#. Translators: this is for network connections that require some kind of key or password */
-#: ../js/ui/status/network.js:474
-msgid "Authentication required"
-msgstr "Anmeldung erforderlich"
+#. Translators: this is for network connections that require some kind of key or password; %s is a network identifier */
+#: ../js/ui/status/network.js:472
+#, javascript-format
+msgid "%s Requires Authentication"
+msgstr "%s erfordert eine Anmeldung"

 #. Translators: this is for devices that require some kind of firmware or kernel
-#. module, which is missing */
-#: ../js/ui/status/network.js:482
-msgid "Firmware missing"
-msgstr "Firmware fehlt"
+#. module, which is missing; %s is a network identifier */
+#: ../js/ui/status/network.js:480
+#, javascript-format
+msgid "Firmware Missing For %s"
+msgstr "Firmware fehlt für %s"

 #. 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:486
-msgid "Unavailable"
-msgstr "Nicht verfügbar"
+#. is disabled by rfkill, or it has no coverage; %s is a network identifier */
+#: ../js/ui/status/network.js:484
+#, javascript-format
+msgid "%s Unavailable"
+msgstr "%s nicht verfügbar"

-#: ../js/ui/status/network.js:488 ../js/ui/status/network.js:1696
-msgid "Connection failed"
-msgstr "Verbindung gescheitert"
+#. Translators: %s is a network identifier */
+#: ../js/ui/status/network.js:487
+#, javascript-format
+msgid "%s Connection Failed"
+msgstr "Verbindung von %s gescheitert"

-#: ../js/ui/status/network.js:504
+#: ../js/ui/status/network.js:503
 msgid "Wired Settings"
 msgstr "LAN-Einstellungen"

-#: ../js/ui/status/network.js:546 ../js/ui/status/network.js:624
+#: ../js/ui/status/network.js:545 ../js/ui/status/network.js:624
 msgid "Mobile Broadband Settings"
 msgstr "Einstellungen der mobilen Breitbandverbindung"

-#: ../js/ui/status/network.js:588 ../js/ui/status/network.js:1306
-msgid "Hardware Disabled"
-msgstr "Hardware deaktiviert"
+#. Translators: %s is a network identifier */
+#: ../js/ui/status/network.js:588 ../js/ui/status/network.js:1305
+#, javascript-format
+msgid "%s Hardware Disabled"
+msgstr "Hardware von %s ausgeschaltet"
+
+#. Translators: this is for a network device that cannot be activated
+#. because it's disabled by rfkill (airplane mode); %s is a network identifier */
+#: ../js/ui/status/network.js:592
+#, javascript-format
+msgid "%s Disabled"
+msgstr "%s ausgeschaltet"

 #: ../js/ui/status/network.js:632
 msgid "Use as Internet connection"
@@ -1274,23 +1296,23 @@ msgstr "Als Internet-Verbindung verwenden"

 #: ../js/ui/status/network.js:813
 msgid "Airplane Mode is On"
-msgstr "Flugmodus ist aktiviert"
+msgstr "Flugmodus ist eingeschaltet"

 #: ../js/ui/status/network.js:814
 msgid "Wi-Fi is disabled when airplane mode is on."
-msgstr "WLAN ist deaktiviert, während sich ihr Gerät im Flugmodus befindet."
+msgstr "WLAN ist ausgeschaltet, während sich ihr Gerät im Flugmodus befindet."

 #: ../js/ui/status/network.js:815
 msgid "Turn Off Airplane Mode"
-msgstr "Flugmodus deaktivieren"
+msgstr "Flugmodus ausschalten"

 #: ../js/ui/status/network.js:824
 msgid "Wi-Fi is Off"
-msgstr "WLAN ist deaktiviert"
+msgstr "WLAN ist ausgeschaltet"

 #: ../js/ui/status/network.js:825
 msgid "Wi-Fi needs to be turned on in order to connect to a network."
-msgstr "WLAN muss aktiviert werden, um eine Netzwerkverbindung herzustellen."
+msgstr "WLAN muss eingeschaltet werden, um eine Netzwerkverbindung herzustellen."

 # Wi-Fi einschalten
 # oder
@@ -1311,52 +1333,68 @@ msgstr "Wählen Sie ein Netzwerk"
 msgid "No Networks"
 msgstr "Keine Netzwerke"

-#: ../js/ui/status/network.js:904 ../js/ui/status/rfkill.js:116
+#: ../js/ui/status/network.js:904 ../js/ui/status/rfkill.js:115
 msgid "Use hardware switch to turn off"
 msgstr "Benutzen Sie zum Ausschalten den Gehäuseschalter"

-#: ../js/ui/status/network.js:1174
+#: ../js/ui/status/network.js:1171
 msgid "Select Network"
 msgstr "Wählen Sie ein Netzwerk aus"

-#: ../js/ui/status/network.js:1180
+#: ../js/ui/status/network.js:1177
 msgid "Wi-Fi Settings"
 msgstr "Drahtlos-Einstellungen"

-#: ../js/ui/status/network.js:1282
+#: ../js/ui/status/network.js:1279
 msgid "Turn On"
 msgstr "Einschalten"

-#: ../js/ui/status/network.js:1299
-msgid "Hotspot Active"
-msgstr "Hotspot aktiv"
+#. Translators: %s is a network identifier */
+#: ../js/ui/status/network.js:1296
+#, javascript-format
+msgid "%s Hotspot Active"
+msgstr "Hotspot %s eingeschaltet"

-#: ../js/ui/status/network.js:1410
+#. Translators: %s is a network identifier */
+#: ../js/ui/status/network.js:1311
+#, javascript-format
+msgid "%s Not Connected"
+msgstr "%s nicht verbunden"
+
+#: ../js/ui/status/network.js:1411
 msgid "connecting..."
 msgstr "Verbindungsaufbau …"

 #. Translators: this is for network connections that require some kind of key or password */
-#: ../js/ui/status/network.js:1413
+#: ../js/ui/status/network.js:1414
 msgid "authentication required"
 msgstr "Anmeldung erforderlich"

-#: ../js/ui/status/network.js:1415
+#: ../js/ui/status/network.js:1416
 msgid "connection failed"
 msgstr "Verbindung gescheitert"

-#: ../js/ui/status/network.js:1481 ../js/ui/status/rfkill.js:94
+#: ../js/ui/status/network.js:1482 ../js/ui/status/rfkill.js:93
 msgid "Network Settings"
 msgstr "Netzwerkeinstellungen"

-#: ../js/ui/status/network.js:1483
+#: ../js/ui/status/network.js:1484
 msgid "VPN Settings"
 msgstr "VPN-Einstellungen"

-#: ../js/ui/status/network.js:1502
+#: ../js/ui/status/network.js:1503
 msgid "VPN"
 msgstr "VPN"

+#: ../js/ui/status/network.js:1513
+msgid "VPN Off"
+msgstr "VPN ausgeschaltet"
+
 #: ../js/ui/status/network.js:1697
+msgid "Connection failed"
+msgstr "Verbindung gescheitert"
+
+#: ../js/ui/status/network.js:1698
 msgid "Activation of network connection failed"
 msgstr "Aktivierung der Netzwerkverbindung ist gescheitert"

@@ -1382,39 +1420,31 @@ msgstr "%d∶%02d verbleibend (%d%%)"
 msgid "%d∶%02d Until Full (%d%%)"
 msgstr "%d∶%02d bis geladen (%d%%)"

-#: ../js/ui/status/power.js:119
-msgid "UPS"
-msgstr "USV"
-
-#: ../js/ui/status/power.js:121
-msgid "Battery"
-msgstr "Akku"
-
 #: ../js/ui/status/rfkill.js:88
-msgid "Airplane Mode"
-msgstr "Flugzeugmodus"
+msgid "Airplane Mode On"
+msgstr "Flugmodus ist eingeschaltet"

-#: ../js/ui/status/rfkill.js:90
-msgid "On"
-msgstr "An"
-
-#: ../js/ui/status/system.js:337
+#: ../js/ui/status/system.js:343
 msgid "Switch User"
 msgstr "Benutzer wechseln"

-#: ../js/ui/status/system.js:342
+#: ../js/ui/status/system.js:348
 msgid "Log Out"
 msgstr "Abmelden"

-#: ../js/ui/status/system.js:361
+#: ../js/ui/status/system.js:353
+msgid "Account Settings"
+msgstr "Kontoeinstellungen"
+
+#: ../js/ui/status/system.js:370
 msgid "Orientation Lock"
 msgstr "Hoch-/Querformats-Fixierung"

-#: ../js/ui/status/system.js:369
+#: ../js/ui/status/system.js:378
 msgid "Suspend"
 msgstr "In Bereitschaft versetzen"

-#: ../js/ui/status/system.js:372
+#: ../js/ui/status/system.js:381
 msgid "Power Off"
 msgstr "Ausschalten"

@@ -1451,22 +1481,22 @@ msgstr "Suchen"
 msgid "“%s” is ready"
 msgstr "»%s« ist bereit"

-#: ../js/ui/windowManager.js:65
+#: ../js/ui/windowManager.js:63
 msgid "Do you want to keep these display settings?"
 msgstr "Wollen Sie diese Anzeigeeinstellungen beibehalten?"

 #. Translators: this and the following message should be limited in lenght,
 #. to avoid ellipsizing the labels.
 #. */
-#: ../js/ui/windowManager.js:84
+#: ../js/ui/windowManager.js:82
 msgid "Revert Settings"
 msgstr "Zurücksetzen"

-#: ../js/ui/windowManager.js:88
+#: ../js/ui/windowManager.js:85
 msgid "Keep Changes"
 msgstr "Beibehalten"

-#: ../js/ui/windowManager.js:107
+#: ../js/ui/windowManager.js:103
 #, javascript-format
 msgid "Settings changes will revert in %d second"
 msgid_plural "Settings changes will revert in %d seconds"
@@ -1475,7 +1505,7 @@ msgstr[1] "Die Änderungen der Einstellungen werden in %d Sekunden zurückgesetz

 #. Translators: This represents the size of a window. The first number is
 #. * the width of the window and the second is the height. */
-#: ../js/ui/windowManager.js:605
+#: ../js/ui/windowManager.js:658
 #, javascript-format
 msgid "%d x %d"
 msgstr "%d x %d"
@@ -1609,6 +1639,32 @@ msgstr "Es muss ein Passwort angegeben werden"
 msgid "Authentication dialog was dismissed by the user"
 msgstr "Der Dialog zur Anmeldung wurde vom Benutzer geschlossen"

+#~ msgid "Bluetooth"
+#~ msgstr "Bluetooth"
+
+#~ msgid "%d Connected Device"
+#~ msgid_plural "%d Connected Devices"
+#~ msgstr[0] "%d Verbundes Gerät"
+#~ msgstr[1] "%d Verbundene Geräte"
+
+#~ msgid "Off"
+#~ msgstr "Aus"
+
+#~ msgid "Authentication required"
+#~ msgstr "Anmeldung erforderlich"
+
+#~ msgid "UPS"
+#~ msgstr "USV"
+
+#~ msgid "Battery"
+#~ msgstr "Akku"
+
+#~ msgid "Airplane Mode"
+#~ msgstr "Flugzeugmodus"
+
+#~ msgid "On"
+#~ msgstr "An"
+
 #~ msgid "Show the message tray"
 #~ msgstr "Benachrichtigungssymbol anzeigen"

--- a/po/fa.po
+++ b/po/fa.po
--- a/po/fi.po
+++ b/po/fi.po
--- a/po/it.po
+++ b/po/it.po
--- a/po/ja.po
+++ b/po/ja.po
--- a/po/kk.po
+++ b/po/kk.po
--- a/po/ko.po
+++ b/po/ko.po
--- a/po/nb.po
+++ b/po/nb.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell 3.17.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-30 11:36+0200\n"
-"PO-Revision-Date: 2015-07-30 11:36+0200\n"
-"Last-Translator: Åka Sikrom <a4NOSPAMPLEASETHANKYOU@hush.com>\n"
+"POT-Creation-Date: 2015-09-07 19:22+0200\n"
+"PO-Revision-Date: 2015-09-07 19:31+0200\n"
+"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: Norwegian bokmål\n"
 "MIME-Version: 1.0\n"
@@ -307,14 +307,14 @@ msgid "GNOME Shell Extensions"
 msgstr "Utvidelser for GNOME Shell"

 #: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:145
-#: ../js/ui/components/polkitAgent.js:166 ../js/ui/endSessionDialog.js:452
+#: ../js/ui/components/polkitAgent.js:179 ../js/ui/endSessionDialog.js:452
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
 #: ../js/ui/status/network.js:916
 msgid "Cancel"
 msgstr "Avbryt"

 #: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:215
-#: ../js/gdm/authPrompt.js:435
+#: ../js/gdm/authPrompt.js:447
 msgid "Next"
 msgstr "Neste"

@@ -341,7 +341,7 @@ msgstr "Ikke listet?"

 #. Translators: this message is shown below the username entry field
 #. to clue the user in on how to login to the local network realm
-#: ../js/gdm/loginDialog.js:847
+#: ../js/gdm/loginDialog.js:850
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(f.eks. bruker eller %s)"
@@ -349,12 +349,12 @@ msgstr "(f.eks. bruker eller %s)"
 #. 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/gdm/loginDialog.js:852 ../js/ui/components/networkAgent.js:271
+#: ../js/gdm/loginDialog.js:855 ../js/ui/components/networkAgent.js:271
 #: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "Brukernavn: "

-#: ../js/gdm/loginDialog.js:1180
+#: ../js/gdm/loginDialog.js:1184
 msgid "Login Window"
 msgstr "Innloggingsvindu"

@@ -462,31 +462,31 @@ msgstr "%d %B %Y, %H.%M"
 msgid "Web Authentication Redirect"
 msgstr "Omdirigering av autentisering på nett"

-#: ../js/ui/appDisplay.js:789
+#: ../js/ui/appDisplay.js:794
 msgid "Frequently used applications will appear here"
 msgstr "Ofte brukte programmer vises her"

-#: ../js/ui/appDisplay.js:909
+#: ../js/ui/appDisplay.js:914
 msgid "Frequent"
 msgstr "Ofte"

-#: ../js/ui/appDisplay.js:916
+#: ../js/ui/appDisplay.js:921
 msgid "All"
 msgstr "Alle"

-#: ../js/ui/appDisplay.js:1845
+#: ../js/ui/appDisplay.js:1853
 msgid "New Window"
 msgstr "Nytt vindu"

-#: ../js/ui/appDisplay.js:1873 ../js/ui/dash.js:289
+#: ../js/ui/appDisplay.js:1881 ../js/ui/dash.js:289
 msgid "Remove from Favorites"
 msgstr "Fjern fra favoritter"

-#: ../js/ui/appDisplay.js:1879
+#: ../js/ui/appDisplay.js:1887
 msgid "Add to Favorites"
 msgstr "Legg til i favoritter"

-#: ../js/ui/appDisplay.js:1889
+#: ../js/ui/appDisplay.js:1897
 msgid "Show Details"
 msgstr "Vis detaljer"

@@ -509,12 +509,12 @@ msgid "Display Settings"
 msgstr "Innstillinger for skjerm"

 #: ../js/ui/backgroundMenu.js:22 ../js/ui/panel.js:650
-#: ../js/ui/status/system.js:357
+#: ../js/ui/status/system.js:366
 msgid "Settings"
 msgstr "Innstillinger"

 #. Translators: Enter 0-6 (Sunday-Saturday) for non-work days. Examples: "0" (Sunday) "6" (Saturday) "06" (Sunday and Saturday).
-#: ../js/ui/calendar.js:53
+#: ../js/ui/calendar.js:55
 msgctxt "calendar-no-work"
 msgid "06"
 msgstr "06"
@@ -524,94 +524,94 @@ msgstr "06"
 #. * NOTE: These grid abbreviations are always shown together
 #. * and in order, e.g. "S M T W T F S".
 #.
-#: ../js/ui/calendar.js:82
+#: ../js/ui/calendar.js:84
 msgctxt "grid sunday"
 msgid "S"
 msgstr "S"

 #. Translators: Calendar grid abbreviation for Monday
-#: ../js/ui/calendar.js:84
+#: ../js/ui/calendar.js:86
 msgctxt "grid monday"
 msgid "M"
 msgstr "M"

 #. Translators: Calendar grid abbreviation for Tuesday
-#: ../js/ui/calendar.js:86
+#: ../js/ui/calendar.js:88
 msgctxt "grid tuesday"
 msgid "T"
 msgstr "T"

 #. Translators: Calendar grid abbreviation for Wednesday
-#: ../js/ui/calendar.js:88
+#: ../js/ui/calendar.js:90
 msgctxt "grid wednesday"
 msgid "W"
 msgstr "O"

 #. Translators: Calendar grid abbreviation for Thursday
-#: ../js/ui/calendar.js:90
+#: ../js/ui/calendar.js:92
 msgctxt "grid thursday"
 msgid "T"
 msgstr "T"

 #. Translators: Calendar grid abbreviation for Friday
-#: ../js/ui/calendar.js:92
+#: ../js/ui/calendar.js:94
 msgctxt "grid friday"
 msgid "F"
 msgstr "F"

 #. Translators: Calendar grid abbreviation for Saturday
-#: ../js/ui/calendar.js:94
+#: ../js/ui/calendar.js:96
 msgctxt "grid saturday"
 msgid "S"
 msgstr "L"

-#: ../js/ui/calendar.js:564
+#: ../js/ui/calendar.js:566
 msgid "Previous month"
 msgstr "Forrige måned"

-#: ../js/ui/calendar.js:574
+#: ../js/ui/calendar.js:576
 msgid "Next month"
 msgstr "Neste måned"

-#: ../js/ui/calendar.js:781
+#: ../js/ui/calendar.js:783
 msgid "Week %V"
 msgstr "Uke %V"

 #. 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:1187
+#: ../js/ui/calendar.js:1188
 msgctxt "event list time"
 msgid "All Day"
 msgstr "Hele dagen"

-#: ../js/ui/calendar.js:1289
+#: ../js/ui/calendar.js:1291
 msgid "Clear section"
 msgstr "Tøm seksjon"

-#: ../js/ui/calendar.js:1516
+#: ../js/ui/calendar.js:1518
 msgid "Events"
 msgstr "Hendelser"

-#: ../js/ui/calendar.js:1525
+#: ../js/ui/calendar.js:1527
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A %B %d"

-#: ../js/ui/calendar.js:1529
+#: ../js/ui/calendar.js:1531
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A %B %d, %Y"

-#: ../js/ui/calendar.js:1614
+#: ../js/ui/calendar.js:1616
 msgid "Notifications"
 msgstr "Varslinger"

-#: ../js/ui/calendar.js:1765
+#: ../js/ui/calendar.js:1767
 msgid "No Notifications"
 msgstr "Ingen varslinger"

-#: ../js/ui/calendar.js:1768
+#: ../js/ui/calendar.js:1770
 msgid "No Events"
 msgstr "Ingen hendelser"

@@ -628,16 +628,16 @@ msgstr "Ekstern stasjon koblet fra"
 msgid "Open with %s"
 msgstr "Åpne med %s"

-#: ../js/ui/components/keyring.js:94 ../js/ui/components/polkitAgent.js:285
+#: ../js/ui/components/keyring.js:120 ../js/ui/components/polkitAgent.js:315
 msgid "Password:"
 msgstr "Passord:"

-#: ../js/ui/components/keyring.js:120
+#: ../js/ui/components/keyring.js:153
 msgid "Type again:"
 msgstr "Skriv på nytt:"

-#: ../js/ui/components/networkAgent.js:140 ../js/ui/status/network.js:277
-#: ../js/ui/status/network.js:359 ../js/ui/status/network.js:919
+#: ../js/ui/components/networkAgent.js:140 ../js/ui/status/network.js:269
+#: ../js/ui/status/network.js:352 ../js/ui/status/network.js:919
 msgid "Connect"
 msgstr "Koble til"

@@ -723,19 +723,19 @@ msgstr "Nettverkspassord for mobilt bredbånd"
 msgid "A password is required to connect to “%s”."
 msgstr "Du må oppgi et passord for å koble til «%s»."

-#: ../js/ui/components/networkAgent.js:647 ../js/ui/status/network.js:1657
+#: ../js/ui/components/networkAgent.js:647 ../js/ui/status/network.js:1658
 msgid "Network Manager"
 msgstr "Nettverkshåndtering"

-#: ../js/ui/components/polkitAgent.js:54
+#: ../js/ui/components/polkitAgent.js:60
 msgid "Authentication Required"
 msgstr "Autentisering kreves"

-#: ../js/ui/components/polkitAgent.js:96
+#: ../js/ui/components/polkitAgent.js:102
 msgid "Administrator"
 msgstr "Administrator"

-#: ../js/ui/components/polkitAgent.js:175
+#: ../js/ui/components/polkitAgent.js:182
 msgid "Authenticate"
 msgstr "Autentiser"

@@ -743,13 +743,13 @@ msgstr "Autentiser"
 #. * requested authentication was not gained; this can happen
 #. * because of an authentication error (like invalid password),
 #. * for instance.
-#: ../js/ui/components/polkitAgent.js:271 ../js/ui/shellMountOperation.js:383
+#: ../js/ui/components/polkitAgent.js:301 ../js/ui/shellMountOperation.js:383
 msgid "Sorry, that didn't work. Please try again."
 msgstr "Beklager, det virket ikke. Prøv igjen."

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: ../js/ui/components/telepathyClient.js:757
+#: ../js/ui/components/telepathyClient.js:759
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "%s er nå kjent som %s"
@@ -962,17 +962,13 @@ msgstr "Skjul feil"
 msgid "Show Errors"
 msgstr "Vis feil"

-#: ../js/ui/lookingGlass.js:716 ../js/ui/status/location.js:71
-#: ../js/ui/status/location.js:176
+#: ../js/ui/lookingGlass.js:716
 msgid "Enabled"
 msgstr "Slått på"

-#. Translators: this is for a network device that cannot be activated
-#. because it's disabled by rfkill (airplane mode)
 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:719 ../js/ui/status/location.js:179
-#: ../js/ui/status/network.js:592 ../src/gvc/gvc-mixer-control.c:1830
+#: ../js/ui/lookingGlass.js:719 ../src/gvc/gvc-mixer-control.c:1830
 msgid "Disabled"
 msgstr "Slått av"

@@ -1026,7 +1022,7 @@ msgstr "Avslutt"
 msgid "Activities"
 msgstr "Aktiviteter"

-#: ../js/ui/panel.js:755
+#: ../js/ui/panel.js:754
 msgid "Top Bar"
 msgstr "Topp-panel"

@@ -1071,7 +1067,7 @@ msgid_plural "%d new notifications"
 msgstr[0] "%d ny varsling"
 msgstr[1] "%d nye varslinger"

-#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:365
+#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:374
 msgid "Lock"
 msgstr "Lås"

@@ -1170,16 +1166,10 @@ msgstr "Høy kontrast"
 msgid "Large Text"
 msgstr "Stor tekst"

-#. The Bluetooth menu only appears when Bluetooth is in use,
-#. so just statically build it with a "Turn Off" menu item.
-#: ../js/ui/status/bluetooth.js:49
-msgid "Bluetooth"
-msgstr "Bluetooth"
-
 #: ../js/ui/status/bluetooth.js:51 ../js/ui/status/network.js:178
-#: ../js/ui/status/network.js:360 ../js/ui/status/network.js:1282
-#: ../js/ui/status/network.js:1393 ../js/ui/status/rfkill.js:91
-#: ../js/ui/status/rfkill.js:118
+#: ../js/ui/status/network.js:353 ../js/ui/status/network.js:1279
+#: ../js/ui/status/network.js:1394 ../js/ui/status/rfkill.js:90
+#: ../js/ui/status/rfkill.js:117
 msgid "Turn Off"
 msgstr "Slå av"

@@ -1187,16 +1177,17 @@ msgstr "Slå av"
 msgid "Bluetooth Settings"
 msgstr "Bluetooth-innstillinger"

-#: ../js/ui/status/bluetooth.js:104
+#. Translators: this is the number of connected bluetooth devices
+#: ../js/ui/status/bluetooth.js:105
 #, javascript-format
-msgid "%d Connected Device"
-msgid_plural "%d Connected Devices"
-msgstr[0] "%d tilkoblet enhet"
-msgstr[1] "%d tilkoblede enheter"
+msgid "%d Connected"
+msgid_plural "%d Connected"
+msgstr[0] "%d koblet til"
+msgstr[1] "%d koblet til"

-#: ../js/ui/status/bluetooth.js:106 ../js/ui/status/network.js:1310
-msgid "Not Connected"
-msgstr "Ikke koblet til"
+#: ../js/ui/status/bluetooth.js:107
+msgid "Not In Use"
+msgstr "Ikke i bruk"

 #: ../js/ui/status/brightness.js:44
 msgid "Brightness"
@@ -1206,11 +1197,11 @@ msgstr "Lysstyrke"
 msgid "Show Keyboard Layout"
 msgstr "Vis tastaturutforming"

-#: ../js/ui/status/location.js:65
-msgid "Location"
-msgstr "Plassering"
+#: ../js/ui/status/location.js:71 ../js/ui/status/location.js:177
+msgid "Location Enabled"
+msgstr "Plassering slått på"

-#: ../js/ui/status/location.js:72 ../js/ui/status/location.js:177
+#: ../js/ui/status/location.js:72 ../js/ui/status/location.js:178
 msgid "Disable"
 msgstr "Slå av"

@@ -1219,10 +1210,14 @@ msgid "Privacy Settings"
 msgstr "Innstillinger for personvern"

 #: ../js/ui/status/location.js:176
-msgid "In Use"
-msgstr "I bruk"
+msgid "Location In Use"
+msgstr "Plassering i bruk"

 #: ../js/ui/status/location.js:180
+msgid "Location Disabled"
+msgstr "Plassering slått av"
+
+#: ../js/ui/status/location.js:181
 msgid "Enable"
 msgstr "Slå på"

@@ -1230,61 +1225,84 @@ msgstr "Slå på"
 msgid "<unknown>"
 msgstr "<ukjent>"

-#: ../js/ui/status/network.js:457 ../js/ui/status/network.js:1308
-#: ../js/ui/status/network.js:1512
-msgid "Off"
-msgstr "Av"
+#. Translators: %s is a network identifier
+#: ../js/ui/status/network.js:451 ../js/ui/status/network.js:1308
+#, javascript-format
+msgid "%s Off"
+msgstr "%s av"

-#: ../js/ui/status/network.js:459
-msgid "Connected"
-msgstr "Koblet til"
+#. Translators: %s is a network identifier
+#: ../js/ui/status/network.js:454
+#, javascript-format
+msgid "%s Connected"
+msgstr "%s koblet til"

 #. 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:463
-msgid "Unmanaged"
-msgstr "Håndteres ikke"
+#. under NetworkManager's control (and thus cannot be used in the menu);
+#. %s is a network identifier
+#: ../js/ui/status/network.js:459
+#, javascript-format
+msgid "%s Unmanaged"
+msgstr "%s håndteres ikke"

-#: ../js/ui/status/network.js:465
-msgid "Disconnecting"
-msgstr "Kobler fra"
+#. Translators: %s is a network identifier
+#: ../js/ui/status/network.js:462
+#, javascript-format
+msgid "%s Disconnecting"
+msgstr "%s kobler fra"

-#: ../js/ui/status/network.js:471 ../js/ui/status/network.js:1302
-msgid "Connecting"
-msgstr "Kobler til"
+#. Translators: %s is a network identifier
+#: ../js/ui/status/network.js:469 ../js/ui/status/network.js:1300
+#, javascript-format
+msgid "%s Connecting"
+msgstr "%s kobler til"

-#. Translators: this is for network connections that require some kind of key or password
-#: ../js/ui/status/network.js:474
-msgid "Authentication required"
-msgstr "Denne tilkoblingen krever autentisering"
+#. Translators: this is for network connections that require some kind of key or password; %s is a network identifier
+#: ../js/ui/status/network.js:472
+#, javascript-format
+msgid "%s Requires Authentication"
+msgstr "%s krever autentisering"

 #. Translators: this is for devices that require some kind of firmware or kernel
-#. module, which is missing
-#: ../js/ui/status/network.js:482
-msgid "Firmware missing"
-msgstr "Fastvare mangler"
+#. module, which is missing; %s is a network identifier
+#: ../js/ui/status/network.js:480
+#, javascript-format
+msgid "Firmware Missing For %s"
+msgstr "Fastvare mangler for %s"

 #. 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:486
-msgid "Unavailable"
-msgstr "Ikke tilgjengelig"
+#. is disabled by rfkill, or it has no coverage; %s is a network identifier
+#: ../js/ui/status/network.js:484
+#, javascript-format
+msgid "%s Unavailable"
+msgstr "%s er ikke tilgjengelig"

-#: ../js/ui/status/network.js:488 ../js/ui/status/network.js:1696
-msgid "Connection failed"
-msgstr "Tilkobling mislyktes"
+#. Translators: %s is a network identifier
+#: ../js/ui/status/network.js:487
+#, javascript-format
+msgid "%s Connection Failed"
+msgstr "%s tilkobling mislyktes"

-#: ../js/ui/status/network.js:504
+#: ../js/ui/status/network.js:503
 msgid "Wired Settings"
 msgstr "Innstillinger for trådbundet nettverk"

-#: ../js/ui/status/network.js:546 ../js/ui/status/network.js:624
+#: ../js/ui/status/network.js:545 ../js/ui/status/network.js:624
 msgid "Mobile Broadband Settings"
 msgstr "Innstillinger for mobilt bredbånd"

-#: ../js/ui/status/network.js:588 ../js/ui/status/network.js:1306
-msgid "Hardware Disabled"
-msgstr "Maskinvare slått av"
+#. Translators: %s is a network identifier
+#: ../js/ui/status/network.js:588 ../js/ui/status/network.js:1305
+#, javascript-format
+msgid "%s Hardware Disabled"
+msgstr "%s maskinvare slått av"
+
+#. Translators: this is for a network device that cannot be activated
+#. because it's disabled by rfkill (airplane mode); %s is a network identifier
+#: ../js/ui/status/network.js:592
+#, javascript-format
+msgid "%s Disabled"
+msgstr "%s slått av"

 #: ../js/ui/status/network.js:632
 msgid "Use as Internet connection"
@@ -1326,52 +1344,68 @@ msgstr "Velg et nettverk"
 msgid "No Networks"
 msgstr "Ingen nettverk"

-#: ../js/ui/status/network.js:904 ../js/ui/status/rfkill.js:116
+#: ../js/ui/status/network.js:904 ../js/ui/status/rfkill.js:115
 msgid "Use hardware switch to turn off"
 msgstr "Bruk maskinvarebryter til å slå av"

-#: ../js/ui/status/network.js:1174
+#: ../js/ui/status/network.js:1171
 msgid "Select Network"
 msgstr "Velg nettverk"

-#: ../js/ui/status/network.js:1180
+#: ../js/ui/status/network.js:1177
 msgid "Wi-Fi Settings"
 msgstr "Innstillinger"

-#: ../js/ui/status/network.js:1282
+#: ../js/ui/status/network.js:1279
 msgid "Turn On"
 msgstr "Slå på"

-#: ../js/ui/status/network.js:1299
-msgid "Hotspot Active"
-msgstr "Trådløst aksesspunkt aktivt"
+#. Translators: %s is a network identifier
+#: ../js/ui/status/network.js:1296
+#, javascript-format
+msgid "%s Hotspot Active"
+msgstr "%s aksesspunkt aktivt"

-#: ../js/ui/status/network.js:1410
+#. Translators: %s is a network identifier
+#: ../js/ui/status/network.js:1311
+#, javascript-format
+msgid "%s Not Connected"
+msgstr "%s ikke koblet til"
+
+#: ../js/ui/status/network.js:1411
 msgid "connecting..."
 msgstr "kobler til …"

 #. Translators: this is for network connections that require some kind of key or password
-#: ../js/ui/status/network.js:1413
+#: ../js/ui/status/network.js:1414
 msgid "authentication required"
 msgstr "autentisering kreves"

-#: ../js/ui/status/network.js:1415
+#: ../js/ui/status/network.js:1416
 msgid "connection failed"
 msgstr "tilkobling mislyktes"

-#: ../js/ui/status/network.js:1481 ../js/ui/status/rfkill.js:94
+#: ../js/ui/status/network.js:1482 ../js/ui/status/rfkill.js:93
 msgid "Network Settings"
 msgstr "Innstillinger for nettverk"

-#: ../js/ui/status/network.js:1483
+#: ../js/ui/status/network.js:1484
 msgid "VPN Settings"
 msgstr "Innstillinger for VPN"

-#: ../js/ui/status/network.js:1502
+#: ../js/ui/status/network.js:1503
 msgid "VPN"
 msgstr "VPN"

+#: ../js/ui/status/network.js:1513
+msgid "VPN Off"
+msgstr "VPN av"
+
 #: ../js/ui/status/network.js:1697
+msgid "Connection failed"
+msgstr "Tilkobling mislyktes"
+
+#: ../js/ui/status/network.js:1698
 msgid "Activation of network connection failed"
 msgstr "Aktivering av nettverkstilkobling mislyktes"

@@ -1401,42 +1435,34 @@ msgstr "%d:%02d gjenstår (%d%%)"
 msgid "%d∶%02d Until Full (%d%%)"
 msgstr "%d:%02d til batteriet er fullt (%d%%)"

-#: ../js/ui/status/power.js:119
-msgid "UPS"
-msgstr "UPS"
-
-#: ../js/ui/status/power.js:121
-msgid "Battery"
-msgstr "Batteri"
-
 #. The menu only appears when airplane mode is on, so just
 #. statically build it as if it was on, rather than dynamically
 #. changing the menu contents.
 #: ../js/ui/status/rfkill.js:88
-msgid "Airplane Mode"
-msgstr "Flymodus"
+msgid "Airplane Mode On"
+msgstr "Flymodus er slått på"

-#: ../js/ui/status/rfkill.js:90
-msgid "On"
-msgstr "På"
-
-#: ../js/ui/status/system.js:337
+#: ../js/ui/status/system.js:343
 msgid "Switch User"
 msgstr "Bytt bruker"

-#: ../js/ui/status/system.js:342
+#: ../js/ui/status/system.js:348
 msgid "Log Out"
 msgstr "Logg ut"

-#: ../js/ui/status/system.js:361
+#: ../js/ui/status/system.js:353
+msgid "Account Settings"
+msgstr "Innstillinger for konto"
+
+#: ../js/ui/status/system.js:370
 msgid "Orientation Lock"
 msgstr "Lås for orientering"

-#: ../js/ui/status/system.js:369
+#: ../js/ui/status/system.js:378
 msgid "Suspend"
 msgstr "Hvilemodus"

-#: ../js/ui/status/system.js:372
+#: ../js/ui/status/system.js:381
 msgid "Power Off"
 msgstr "Slå av"

@@ -1484,11 +1510,11 @@ msgstr "Vil du beholde disse skjerminnstillingene?"
 msgid "Revert Settings"
 msgstr "Forkast innstillinger"

-#: ../js/ui/windowManager.js:86
+#: ../js/ui/windowManager.js:85
 msgid "Keep Changes"
 msgstr "Behold endringer"

-#: ../js/ui/windowManager.js:105
+#: ../js/ui/windowManager.js:103
 #, javascript-format
 msgid "Settings changes will revert in %d second"
 msgid_plural "Settings changes will revert in %d seconds"
@@ -1497,7 +1523,7 @@ msgstr[1] "Endringer i innstillingene forkastes om %d sekunder"

 #. Translators: This represents the size of a window. The first number is
 #. * the width of the window and the second is the height.
-#: ../js/ui/windowManager.js:660
+#: ../js/ui/windowManager.js:658
 #, javascript-format
 msgid "%d x %d"
 msgstr "%d x %d"
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -1566,6 +1566,64 @@ shell_global_get_current_time (ShellGlobal *global)
  return clutter_get_current_event_time ();
 }

+static void
+import_session_environment_to_app_launch_context (ShellGlobal       *global,
+                                                  GAppLaunchContext *context)
+{
+  char *environment_dir, *environment_filename;
+  GMappedFile *environment_file;
+
+  environment_dir = g_build_filename (g_get_user_runtime_dir (), "gnome", NULL);
+  environment_filename = g_build_filename (environment_dir, "environment", NULL);
+  g_free (environment_dir);
+
+  environment_file = g_mapped_file_new (environment_filename, FALSE, NULL);
+  g_free (environment_filename);
+
+  if (environment_file != NULL)
+    {
+      GVariant *environment_variant;
+      const char **environment;
+      int i = 0;
+      gconstpointer environment_data;
+      gsize environment_size;
+
+      environment_data = g_mapped_file_get_contents (environment_file);
+      environment_size = g_mapped_file_get_length (environment_file);
+
+      environment_variant = g_variant_new_from_data (G_VARIANT_TYPE_BYTESTRING_ARRAY,
+                                                     environment_data,
+                                                     environment_size,
+                                                     FALSE,
+                                                     NULL,
+                                                     NULL);
+      environment = g_variant_get_bytestring_array (environment_variant, NULL);
+
+      if (environment != NULL)
+        {
+          for (i = 0; environment[i] != NULL; i++)
+            {
+              char **entry;
+              const char *key;
+              const char *value;
+
+              entry = g_strsplit (environment[i], "=", 2);
+              key = entry[0];
+              value = entry[1];
+
+              if (value != NULL)
+                  g_app_launch_context_setenv (context, key, value);
+
+              g_free (entry);
+            }
+
+          g_free (environment);
+        }
+      g_variant_unref (environment_variant);
+    }
+  g_mapped_file_unref (environment_file);
+}
+
 /**
 * shell_global_create_app_launch_context:
 * @global: A #ShellGlobal
@@ -1586,6 +1644,8 @@ shell_global_create_app_launch_context (ShellGlobal *global,

  context = gdk_display_get_app_launch_context (global->gdk_display);

+  import_session_environment_to_app_launch_context (global, G_APP_LAUNCH_CONTEXT (context));
+
  if (timestamp == 0)
    timestamp = shell_global_get_current_time (global);
  gdk_app_launch_context_set_timestamp (context, timestamp);
Author	SHA1	Message	Date
Ray Strode	832240a80b	shell-global: import environment from $XDG_RUNTIME_DIR/gnome/environment environment variables are normally propagated from parent to child, but they're used to convey information that's typically scoped to the session. gnome-shell needs to know about environment variables that are set in the session after it's already been started. gnome-session now exports its environment to $XDG_RUNTIME_DIR/gnome/environment so that programs in the session can pick up on the latest environment variables. This commit changes gnome-shell to propagate the gnome-session's latest environment when launching new children.	2015-09-16 21:14:48 -04:00
Florian Müllner	629f408fe5	Bump version to 3.17.92 Update NEWS.	2015-09-16 17:20:30 +02:00
Milo Casagrande	86c6ab3c01	Updated Italian translation	2015-09-15 11:34:41 +00:00
Marek Černocký	4a6ff94701	Updated Czech translation	2015-09-14 16:04:24 +02:00
Jiro Matsuzawa	e480b08d58	Updated Japanese translation	2015-09-14 00:20:39 +09:00
Baurzhan Muftakhidinov	caf53861d1	Updated Kazakh translation	2015-09-12 16:08:38 +00:00
Arash Mousavi	d0480648ba	Updated Persian translation	2015-09-11 23:55:57 +04:30
Jiri Grönroos	eb8cfe799f	Finnish translation update	2015-09-10 18:46:33 +03:00
Kjartan Maraas	b9f2541880	Updated Norwegian bokmål translation.	2015-09-07 19:31:59 +02:00
Kjartan Maraas	bde9b08bfe	Updated Norwegian bokmål translation.	2015-09-07 19:29:28 +02:00
Josselin Mouette	8a4c862633	background: fix a race condition when loading several animations When loading several animations at the same time, the last call overrides the result for all of them. This commit caches all animations separately based on the source's schemas. https://bugzilla.gnome.org/show_bug.cgi?id=741453	2015-09-07 06:51:42 +02:00
Michael Biebl	785c90f4b8	background: fix indentation	2015-09-07 06:49:55 +02:00
Christian Kirbach	dd6a11e4c7	Updated German translation	2015-09-05 19:42:18 +00:00
Changwoo Ryu	64e9503adb	Updated Korean translation	2015-09-06 02:06:45 +09:00
Florian Müllner	36c885bf34	style: Update from sass	2015-09-04 19:15:42 +02:00
Florian Müllner	ad7cde805d	style: Update high-contrast theme This was missed in `fa0e54edbb` ...	2015-09-04 18:56:11 +02:00
Florian Müllner	2c2c67f4dc	Fix accidental gnome-shell-sass downgrade ... from commit `030a22d795`.	2015-09-04 18:46:11 +02:00
Baurzhan Muftakhidinov	cc4f8dfab0	Updated Kazakh translation	2015-09-04 15:51:16 +00:00