retrigger greeter

We don't need to export these publicly any more.

NEWS

@@ -1,77 +1,3 @@
-3.12.1
-======
-* Ensure the currently focused app icon is viewable [Rui; #726759]
-* Improve language in location menu [Zeeshan; #726498]
-* Improve HiDpi support [Cosimo; #726907]
-* Set accessible role for window previews [Alejandro; #726670]
-* Fix bad antialiasing on panel menu buttons [Carlos; #727336]
-* Don't hide location menu [Zeeshan; #727398]
-* Fix IM candidate window obscuring current text [Rui; #727579]
-* Fix extension-prefs tool when linked with --as-needed [Florian; #727948]
-* Don't always extend struts to the screen edge [Florian; #663690]
-
-Contributors:
-  Zeeshan Ali (Khattak), Cosimo Cecchi, Piotr Drąg, Rui Matos, Simon McVittie,
-  Florian Müllner, Alejandro Piñeiro, Carlos Soriano
-
-Translations:
-  Khaled Hosny [ar], Piotr Drąg [pl], Yosef Or Boczko [he],
-  Antonio Fernandes C. Neto [pt_BR], Marek Černocký [cs], maria thukididu [el],
-  Andika Triwidada [id], Daniel Mustieles [es], Changwoo Ryu [ko],
-  Benjamin Steinwender [de], Sphinx Jiang [zh_CN],
-  Inaki Larranaga Murgoitio [eu], Marcus Lundblad [sv], Aurimas Černius [lt],
-  Stas Solovey [ru], Alexandre Franke [fr], Matej Urbančič [sl],
-  Fran Diéguez [gl], Pau Iranzo [ca], Luca Ferretti [it], Milo Casagrande [it],
-  Tiago S [pt], Victor Ibragimov [tg], Dirgita [id], Khoem Sokhem [km],
-  Rūdolfs Mazurs [lv], Balázs Úr [hu], Ask H. Larsen [da], Ikuya Awashiro [ja],
-  Мирослав Николић [sr, sr@latin]
-
-3.12.0
-======
-* gdm: Reset greeter when coming back to login screen [Jasper; #726989]
-
-Contributors:
-  Jasper St. Pierre
-
-Translations:
-  Daniel Martinez [an], Yuri Myasoedov [ru], Inaki Larranaga Murgoitio [eu],
-  Abderrahim Kitouni [ar], Praveen Illa [te], Matej Urbančič [sl],
-  Chao-Hsiung Liao [zh_HK, zh_TW], Frédéric Péters [fr],
-  Мирослав Николић [sr, sr@latin], Ask H. Larsen [da], Kenneth Nielsen [da],
-  Jiro Matsuzawa [ja], Dušan Kazik [sk]
-
-3.11.92
-=======
-* calendar: Grab key focus after changing day [Volker; #725606]
-* gdm: Don't load user list if disabled [Florian; #725905]
-* Don't show network-offline in the top bar [Jasper; #725340]
-* Improve radial shade effect of modal dialogs [Giovanni; #725830]
-* Fix broken suspend-on-idle functionality [Giovanni; #712706]
-* Close wifi selection dialog when device disappears [Giovanni; #723935]
-* Don't close chats when pressing Escape [Giovanni; #724178]
-* Improve smartcard support in login/lock screen [Ray; #726262, #726263]
-* Wake up screen when resuming from suspend [Giovanni; #726378]
-* Make bluetooth and location items insensitive when locked [Florian; #726319]
-* Don't show bluetooth icon when there is no adapter [Giovanni; #725057]
-* Make sure to keep the OSK on top of modal dialogs [Rui; #719451]
-* Misc. bug fixes and cleanups [Giovanni, Ray, Adel, Daniel, Jasper, Florian;
-  #725832, #725958, #722149, #724977, #724798, #725020, #723976, #726119,
-  #726238, #585500, #704844, #726323, #726322, #726120, #726414]
-
-Contributors:
-  Giovanni Campagna, Daniel Drake, Adel Gadllah, Rui Matos, Florian Müllner,
-  Volker Sobek, Jasper St. Pierre, Ray Strode
-
-Translations:
-  Fabio Tomat [fur], Rafael Ferreira [pt_BR], Fran Diéguez [gl],
-  Marek Černocký [cs], Baurzhan Muftakhidinov [kk], Andika Triwidada [id],
-  A S Alam [pa], Rūdolfs Mazurs [lv], Wylmer Wang [zh_CN],
-  Aurimas Černius [lt], Cheng-Chia Tseng [zh_TW], Stas Solovey [ru],
-  Tiagosdot [pt], Benjamin Steinwender [de], Frédéric Peters [fr],
-  Daniel Korostil [uk], Yaron Shahrabani [he], Ville-Pekka Vainio [fi],
-  maria thukididu [el], Victor Ibragimov [tg], Kjartan Maraas [nb],
-  Gábor Kelemen [hu], Ask H. Larsen [da]
-
 3.11.91
 =======
 * Don't use network profile name in menu [Giovanni; #725586]

README

@@ -8,7 +8,7 @@ For more information about GNOME Shell, including instructions on how
 to build GNOME Shell from source and how to get involved with the project,
 see:
 
- https://wiki.gnome.org/Projects/GnomeShell
+ http://live.gnome.org/GnomeShell
 
 Bugs should be reported at http://bugzilla.gnome.org against the 'gnome-shell'
 product.

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.12.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.11.91],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
@@ -76,7 +76,7 @@ AC_MSG_RESULT($enable_systemd)
 CLUTTER_MIN_VERSION=1.15.90
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
 GJS_MIN_VERSION=1.39.0
-MUTTER_MIN_VERSION=3.12.1
+MUTTER_MIN_VERSION=3.11.91
 GTK_MIN_VERSION=3.7.9
 GIO_MIN_VERSION=2.37.0
 LIBECAL_MIN_VERSION=3.5.3

data/gnome-shell-wayland.desktop.in.in

@@ -2,7 +2,7 @@
 Type=Application
 _Name=GNOME Shell (wayland compositor)
 _Comment=Window management and application launching
-Exec=@bindir@/mutter-launch -- gnome-shell-wayland --wayland --display-server
+Exec=@bindir@/gnome-shell-wayland --wayland --display-server
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-shell
 X-GNOME-Bugzilla-Component=general

data/theme/gnome-shell.css

@@ -670,7 +670,7 @@ StScrollBar StButton#vhandle:active {
     color: #e6e6e6;
     border-radius: 32px; /* wish we could do 50% */
     padding: 13px;
-    border: 2px solid #5f5f5f; /* using rgba() is flaky unfortunately */
+    border: 1px solid #5f5f5f; /* using rgba() is flaky unfortunately */
 }
 
 .system-menu-action:hover,
@@ -678,7 +678,7 @@ StScrollBar StButton#vhandle:active {
     color: white;
     background-color: #4c4c4c;
     border: none;
-    padding: 15px;
+    padding: 14px;
 }
 
 .system-menu-action:active {
@@ -979,8 +979,6 @@ StScrollBar StButton#vhandle:active {
 
 .app-folder-icon {
     padding: 5px;
-    spacing-rows: 5px;
-    spacing-columns: 5px;
 }
 
 .dash-item-container > StButton {

gnome-shell.doap

@@ -17,15 +17,17 @@ packages. If you are interested in building GNOME Shell from source,
 we would recommend building from version control using the build
 script described at:
 
- https://wiki.gnome.org/Projects/GnomeShell
+ http://live.gnome.org/GnomeShell
 
 Not only will that give you the very latest version of this rapidly
 changing project, it will be much easier than get GNOME Shell and
 its dependencies to build from tarballs.</description>
-  <homepage rdf:resource="https://wiki.gnome.org/Projects/GnomeShell" />
+  <!--
+  <homepage rdf:resource="http://live.gnome.org/GnomeShell" />
+  -->
   <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/gnome-shell-list" />
   <download-page rdf:resource="http://download.gnome.org/sources/gnome-shell/" />
-  <bug-database rdf:resource="https://bugzilla.gnome.org/browse.cgi?product=gnome-shell" />
+  <bug-database rdf:resource="http://bugzilla.gnome.org/browse.cgi?product=gnome-shell" />
 
   <category rdf:resource="http://api.gnome.org/doap-extensions#desktop" />
 

js/gdm/authPrompt.js

@@ -24,24 +24,10 @@ const AuthPromptMode = {
     UNLOCK_OR_LOG_IN: 1
 };
 
-const AuthPromptStatus = {
-    NOT_VERIFYING: 0,
-    VERIFYING: 1,
-    VERIFICATION_FAILED: 2,
-    VERIFICATION_SUCCEEDED: 3
-};
-
-const BeginRequestType = {
-    PROVIDE_USERNAME: 0,
-    DONT_PROVIDE_USERNAME: 1
-};
-
 const AuthPrompt = new Lang.Class({
     Name: 'AuthPrompt',
 
     _init: function(gdmClient, mode) {
-        this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
-
         this._gdmClient = gdmClient;
         this._mode = mode;
 
@@ -53,14 +39,11 @@ const AuthPrompt = new Lang.Class({
 
         this._userVerifier = new GdmUtil.ShellUserVerifier(this._gdmClient, { reauthenticationOnly: reauthenticationOnly });
 
+        this._userVerifier.connect('needs-username', Lang.bind(this, this._onNeedsUserName));
         this._userVerifier.connect('ask-question', Lang.bind(this, this._onAskQuestion));
         this._userVerifier.connect('show-message', Lang.bind(this, this._onShowMessage));
         this._userVerifier.connect('verification-failed', Lang.bind(this, this._onVerificationFailed));
-        this._userVerifier.connect('verification-complete', Lang.bind(this, this._onVerificationComplete));
         this._userVerifier.connect('reset', Lang.bind(this, this._onReset));
-        this._userVerifier.connect('smartcard-status-changed', Lang.bind(this, this._onSmartcardStatusChanged));
-        this._userVerifier.connect('ovirt-user-authenticated', Lang.bind(this, this._onOVirtUserAuthenticated));
-        this.smartcardDetected = this._userVerifier.smartcardDetected;
 
         this.connect('next', Lang.bind(this, function() {
                          this.updateSensitivity(false);
@@ -133,6 +116,10 @@ const AuthPrompt = new Lang.Class({
         this._defaultButtonWell.add_child(this._spinner.actor);
     },
 
+    get verificationStatus() {
+        return this._userVerifier.verificationStatus;
+    },
+
     _onDestroy: function() {
         this._userVerifier.clear();
         this._userVerifier.disconnectAll();
@@ -193,6 +180,14 @@ const AuthPrompt = new Lang.Class({
         }));
     },
 
+    _onNeedsUserName: function() {
+        this.emit('needs-username');
+    },
+
+    gotUserName: function(userName) {
+        this._userVerifier.gotUserName(userName);
+    },
+
     _onAskQuestion: function(verifier, serviceName, question, passwordChar) {
         if (this._preemptiveAnswer) {
             if (this._queryingService)
@@ -221,30 +216,6 @@ const AuthPrompt = new Lang.Class({
         this.emit('prompted');
     },
 
-    _onOVirtUserAuthenticated: function() {
-        if (this.verificationStatus != AuthPromptStatus.VERIFICATION_SUCCEEDED)
-            this.reset();
-    },
-
-    _onSmartcardStatusChanged: function() {
-        this.smartcardDetected = this._userVerifier.smartcardDetected;
-
-        // Most of the time we want to reset if the user inserts or removes
-        // a smartcard. Smartcard insertion "preempts" what the user was
-        // doing, and smartcard removal aborts the preemption.
-        // The exceptions are: 1) Don't reset on smartcard insertion if we're already verifying
-        //                        with a smartcard
-        //                     2) Don't reset if we've already succeeded at verification and
-        //                        the user is getting logged in.
-        if (this._userVerifier.serviceIsDefault(GdmUtil.SMARTCARD_SERVICE_NAME) &&
-            this.verificationStatus == AuthPromptStatus.VERIFYING &&
-            this.smartcardDetected)
-            return;
-
-        if (this.verificationStatus != AuthPromptStatus.VERIFICATION_SUCCEEDED)
-            this.reset();
-    },
-
     _onShowMessage: function(userVerifier, message, type) {
         this.setMessage(message, type);
         this.emit('prompted');
@@ -256,15 +227,11 @@ const AuthPrompt = new Lang.Class({
 
         this.updateSensitivity(true);
         this.setActorInDefaultButtonWell(null);
-        this.verificationStatus = AuthPromptStatus.VERIFICATION_FAILED;
-    },
 
-    _onVerificationComplete: function() {
+        this.emit('failed');
-        this.verificationStatus = AuthPromptStatus.VERIFICATION_SUCCEEDED;
     },
 
     _onReset: function() {
-        this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
         this.reset();
     },
 
@@ -428,38 +395,13 @@ const AuthPrompt = new Lang.Class({
     },
 
     reset: function() {
-        let oldStatus = this.verificationStatus;
-        this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
-
-        if (oldStatus == AuthPromptStatus.VERIFYING)
-            this._userVerifier.cancel();
-
         this._queryingService = null;
         this.clear();
         this._message.opacity = 0;
         this.setUser(null);
         this.stopSpinning();
 
-        if (oldStatus == AuthPromptStatus.VERIFICATION_FAILED)
+        this.emit('reset');
-            this.emit('failed');
-
-        let beginRequestType;
-
-        if (this._mode == AuthPromptMode.UNLOCK_ONLY) {
-            // The user is constant at the unlock screen, so it will immediately
-            // respond to the request with the username
-            beginRequestType = BeginRequestType.PROVIDE_USERNAME;
-        } else if (this._userVerifier.serviceIsForeground(GdmUtil.OVIRT_SERVICE_NAME) ||
-                   this._userVerifier.serviceIsForeground(GdmUtil.SMARTCARD_SERVICE_NAME)) {
-            // We don't need to know the username if the user preempted the login screen
-            // with a smartcard or with preauthenticated oVirt credentials
-            beginRequestType = BeginRequestType.DONT_PROVIDE_USERNAME;
-        } else {
-            // In all other cases, we should get the username up front.
-            beginRequestType = BeginRequestType.PROVIDE_USERNAME;
-        }
-
-        this.emit('reset', beginRequestType);
     },
 
     addCharacter: function(unichar) {
@@ -470,18 +412,13 @@ const AuthPrompt = new Lang.Class({
         this._entry.clutter_text.insert_unichar(unichar);
     },
 
-    begin: function(params) {
+    begin: function() {
-        params = Params.parse(params, { userName: null,
-                                        hold: null });
-
         this.updateSensitivity(false);
+        this._userVerifier.begin();
+    },
 
-        let hold = params.hold;
+    needsUsername: function() {
-        if (!hold)
+        this._userVerifier.begin(userName);
-            hold = new Batch.Hold();
-
-        this._userVerifier.begin(params.userName, hold);
-        this.verificationStatus = AuthPromptStatus.VERIFYING;
     },
 
     finish: function(onComplete) {
@@ -499,7 +436,6 @@ const AuthPrompt = new Lang.Class({
 
     cancel: function() {
         this.reset();
-        this.emit('cancelled');
     }
 });
 Signals.addSignalMethods(AuthPrompt.prototype);

js/gdm/loginDialog.js

@@ -36,7 +36,6 @@ const BoxPointer = imports.ui.boxpointer;
 const CtrlAltTab = imports.ui.ctrlAltTab;
 const GdmUtil = imports.gdm.util;
 const Layout = imports.ui.layout;
-const LoginManager = imports.misc.loginManager;
 const Main = imports.ui.main;
 const PopupMenu = imports.ui.popupMenu;
 const Realmd = imports.gdm.realmd;
@@ -422,6 +421,7 @@ const LoginDialog = new Lang.Class({
         this._authPrompt = new AuthPrompt.AuthPrompt(gdmClient, AuthPrompt.AuthPromptMode.UNLOCK_OR_LOG_IN);
         this._authPrompt.connect('prompted', Lang.bind(this, this._onPrompted));
         this._authPrompt.connect('reset', Lang.bind(this, this._onReset));
+        this._authPrompt.connect('needs-username', Lang.bind(this, this._onNeedsUserName));
         this._authPrompt.hide();
         this.actor.add_child(this._authPrompt.actor);
 
@@ -470,7 +470,7 @@ const LoginDialog = new Lang.Class({
         this._sessionMenuButton.actor.show();
         this._authPrompt.addActorToDefaultButtonWell(this._sessionMenuButton.actor);
 
-        this._disableUserList = undefined;
+        this._updateDisableUserList();
         this._userListLoaded = false;
 
         LoginManager.getLoginManager().getCurrentSessionProxy(Lang.bind(this, this._gotGreeterSessionProxy));
@@ -478,8 +478,7 @@ const LoginDialog = new Lang.Class({
         // If the user list is enabled, it should take key focus; make sure the
         // screen shield is initialized first to prevent it from stealing the
         // focus later
-        Main.layoutManager.connect('startup-complete',
+        Main.layoutManager.connect('startup-complete', Lang.bind(this, this._reset));
-                                   Lang.bind(this, this._updateDisableUserList));
     },
 
     _ensureUserListLoaded: function() {
@@ -496,15 +495,20 @@ const LoginDialog = new Lang.Class({
             GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, this._loadUserList));
     },
 
+    _reset: function() {
+        this._authPrompt.reset();
+        this._authPrompt.begin();
+    },
+
     _updateDisableUserList: function() {
         let disableUserList = this._settings.get_boolean(GdmUtil.DISABLE_USER_LIST_KEY);
+        if (disableUserList == this._disableUserList)
+            return;
 
-        if (disableUserList != this._disableUserList) {
         this._disableUserList = disableUserList;
 
-            if (this._authPrompt.verificationStatus == AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
+        if (this._authPrompt.verificationStatus == GdmUtil.VerificationStatus.ASKING_FOR_USERNAME)
-                this._authPrompt.reset();
+            this._reset();
-        }
     },
 
     _updateCancelButton: function() {
@@ -512,7 +516,7 @@ const LoginDialog = new Lang.Class({
 
         // Hide the cancel button if the user list is disabled and we're asking for
         // a username
-        if (this._authPrompt.verificationStatus == AuthPrompt.AuthPromptStatus.NOT_VERIFYING && this._disableUserList)
+        if (this._authPrompt.verificationStatus == GdmUtil.VerificationStatus.ASKING_FOR_USERNAME && this._disableUserList)
             cancelVisible = false;
         else
             cancelVisible = true;
@@ -537,12 +541,9 @@ const LoginDialog = new Lang.Class({
             return;
 
         this._logoBin.destroy_all_children();
-        if (this._logoFileUri) {
+        if (this._logoFileUri)
-            let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
             this._logoBin.add_child(this._textureCache.load_uri_async(this._logoFileUri,
-                                                                      -1, _LOGO_ICON_HEIGHT,
+                                                                      -1, _LOGO_ICON_HEIGHT));
-                                                                      scaleFactor));
-        }
     },
 
     _updateLogo: function() {
@@ -560,19 +561,18 @@ const LoginDialog = new Lang.Class({
         this._showPrompt();
     },
 
-    _onReset: function(authPrompt, beginRequest) {
+    _onReset: function() {
         this._sessionMenuButton.updateSensitivity(true);
-
         this._user = null;
 
-        if (beginRequest == AuthPrompt.BeginRequestType.PROVIDE_USERNAME) {
+        this._reset();
+    },
+
+    _onNeedsUserName: function() {
         if (!this._disableUserList)
             this._showUserList();
         else
             this._hideUserListAskForUsernameAndBeginVerification();
-        } else {
-            this._hideUserListAndBeginVerification();
-        }
     },
 
     _onDefaultSessionChanged: function(client, sessionId) {
@@ -580,8 +580,8 @@ const LoginDialog = new Lang.Class({
     },
 
     _shouldShowSessionMenuButton: function() {
-        if (this._authPrompt.verificationStatus != AuthPrompt.AuthPromptStatus.VERIFYING &&
+        if (this._authPrompt.verificationStatus != GdmUtil.VerificationStatus.VERIFYING &&
-            this._authPrompt.verificationStatus != AuthPrompt.AuthPromptStatus.VERIFICATION_FAILED)
+            this._authPrompt.verificationStatus != GdmUtil.VerificationStatus.VERIFICATION_FAILED)
           return false;
 
         if (this._user && this._user.is_loaded && this._user.is_logged_in())
@@ -631,7 +631,7 @@ const LoginDialog = new Lang.Class({
                                                         this._user = this._userManager.get_user(answer);
                                                         this._authPrompt.clear();
                                                         this._authPrompt.startSpinning();
-                                                        this._authPrompt.begin({ userName: answer });
+                                                        this._authPrompt.gotUserName(answer);
                                                         this._updateCancelButton();
 
                                                         realmManager.disconnect(realmSignalId)
@@ -641,33 +641,29 @@ const LoginDialog = new Lang.Class({
         this._showPrompt();
     },
 
-    _loginScreenSessionActivated: function() {
+    _sessionActivated: function() {
-        if (this._authPrompt.verificationStatus != AuthPrompt.AuthPromptStatus.VERIFICATION_SUCCEEDED)
+        // We fade out the shell after logging in, and then re-set
-            return;
+        // the greeter wen we're VT switched to again.
+
+        // XXX: re-trigger startup animation
+        if (this._authPrompt.verificationStatus == GdmUtil.VerificationStatus.VERIFICATION_SUCCEEDED) {
+            this._reset();
+
+            // XXX: do something better here
+            this.actor.opacity = 255;
 
-        Tweener.addTween(this.actor,
-                         { opacity: 255,
-                           time: _FADE_ANIMATION_TIME,
-                           transition: 'easeOutQuad',
-                           onUpdate: function() {
             let children = Main.layoutManager.uiGroup.get_children();
-
             for (let i = 0; i < children.length; i++) {
                 if (children[i] != Main.layoutManager.screenShieldGroup)
-                                       children[i].opacity = this.actor.opacity;
+                    children[i].opacity = 255;
+            }
         }
-                           },
-                           onUpdateScope: this,
-                           onComplete: function() {
-                               this._authPrompt.reset();
-                           },
-                           onCompleteScope: this });
     },
 
     _gotGreeterSessionProxy: function(proxy) {
         proxy.connect('g-properties-changed', Lang.bind(this, function() {
             if (proxy.Active)
-                this._loginScreenSessionActivated();
+                this._sessionActivated();
         }));
     },
 
@@ -841,11 +837,6 @@ const LoginDialog = new Lang.Class({
         this._askForUsernameAndBeginVerification();
     },
 
-    _hideUserListAndBeginVerification: function() {
-        this._hideUserList();
-        this._authPrompt.begin();
-    },
-
     _showUserList: function() {
         this._ensureUserListLoaded();
         this._authPrompt.hide();
@@ -859,11 +850,7 @@ const LoginDialog = new Lang.Class({
         this._authPrompt.setUser(item.user);
 
         let userName = item.user.get_user_name();
-        let hold = new Batch.Hold();
+        this._authPrompt.gotUserName(userName);
-
-        this._authPrompt.begin({ userName: userName,
-                                 hold: hold });
-        return hold;
     },
 
     _onUserListActivated: function(activatedItem) {
@@ -878,9 +865,9 @@ const LoginDialog = new Lang.Class({
 
         this._updateCancelButton();
 
-        let batch = new Batch.ConcurrentBatch(this, [new Batch.ConsecutiveBatch(this, tasks),
+        let batch = new Batch.ConsecutiveBatch(this, tasks);
-                                                     this._beginVerificationForItem(activatedItem)]);
         batch.run();
+        this._beginVerificationForItem(activatedItem);
     },
 
     _onDestroy: function() {

js/gdm/util.js

@@ -119,6 +119,14 @@ function cloneAndFadeOutActor(actor) {
     return hold;
 }
 
+const VerificationStatus = {
+    NOT_VERIFYING: 0,
+    ASKING_FOR_USERNAME: 1,
+    VERIFYING: 2,
+    VERIFICATION_FAILED: 3,
+    VERIFICATION_SUCCEEDED: 4,
+};
+
 const ShellUserVerifier = new Lang.Class({
     Name: 'ShellUserVerifier',
 
@@ -131,7 +139,6 @@ const ShellUserVerifier = new Lang.Class({
         this._settings = new Gio.Settings({ schema: LOGIN_SCREEN_SCHEMA });
         this._settings.connect('changed',
                                Lang.bind(this, this._updateDefaultService));
-        this._updateDefaultService();
 
         this._fprintManager = new Fprint.FprintManager();
         this._smartcardManager = SmartcardManager.getSmartcardManager();
@@ -152,45 +159,69 @@ const ShellUserVerifier = new Lang.Class({
         this.hasPendingMessages = false;
         this.reauthenticating = false;
 
-        this._failCounter = 0;
-
         this._oVirtCredentialsManager = OVirt.getOVirtCredentialsManager();
-
+        this._oVirtCredentialsManager.connect('user-authenticated', Lang.bind(this, this._oVirtUserAuthenticated));
         if (this._oVirtCredentialsManager.hasToken())
             this._oVirtUserAuthenticated(this._oVirtCredentialsManager.getToken());
 
-        this._oVirtCredentialsManager.connect('user-authenticated',
+        this._reset();
-                                              Lang.bind(this, this._oVirtUserAuthenticated));
     },
 
-    begin: function(userName, hold) {
+    _reset: function() {
-        this._cancellable = new Gio.Cancellable();
+        // Clear previous attempts to authenticate
-        this._hold = hold;
+        this.verificationStatus = VerificationStatus.NOT_VERIFYING;
+        this._userName = null;
+        this._failCounter = 0;
+        this._updateDefaultService();
+        this.emit('reset');
+    },
+
+    begin: function() {
+        if (this._mode == AuthPromptMode.UNLOCK_ONLY) {
+            // The user is constant at the unlock screen, so it will immediately
+            // respond to the request with the username
+            needsUsername = true;
+        } else if (this._serviceIsForeground(GdmUtil.OVIRT_SERVICE_NAME) ||
+                   (this._smartcardDetected &&
+                    this._serviceIsForeground(GdmUtil.SMARTCARD_SERVICE_NAME))) {
+            // We don't need to know the username if the user preempted the login screen
+            // with a smartcard or with preauthenticated oVirt credentials
+            needsUsername = false;
+        } else {
+            // In all other cases, we should get the username up front.
+            needsUsername = true;
+        }
+
+        if (needsUsername) {
+            this.verificationStatus = VerificationStatus.ASKING_FOR_USERNAME;
+            this.emit('needs-username');
+        } else {
+            this._beginAuthentication();
+        }
+    },
+
+    gotUserName: function(userName) {
         this._userName = userName;
+        this._beginAuthentication();
+    },
+
+    _beginAuthentication: function() {
+        this.verificationStatus = VerificationStatus.VERIFYING;
+        this._cancellable = new Gio.Cancellable();
         this.reauthenticating = false;
 
         this._checkForFingerprintReader();
 
-        if (userName) {
+        if (this._userName) {
             // If possible, reauthenticate an already running session,
             // so any session specific credentials get updated appropriately
-            this._client.open_reauthentication_channel(userName, this._cancellable,
+            this._client.open_reauthentication_channel(this._userName, this._cancellable,
                                                        Lang.bind(this, this._reauthenticationChannelOpened));
         } else {
             this._client.get_user_verifier(this._cancellable, Lang.bind(this, this._userVerifierGot));
         }
     },
 
-    cancel: function() {
-        if (this._cancellable)
-            this._cancellable.cancel();
-
-        if (this._userVerifier) {
-            this._userVerifier.call_cancel_sync(null);
-            this.clear();
-        }
-    },
-
     clear: function() {
         if (this._cancellable) {
             this._cancellable.cancel();
@@ -198,6 +229,7 @@ const ShellUserVerifier = new Lang.Class({
         }
 
         if (this._userVerifier) {
+            this._userVerifier.call_cancel_sync(null);
             this._userVerifier.run_dispose();
             this._userVerifier = null;
         }
@@ -205,16 +237,21 @@ const ShellUserVerifier = new Lang.Class({
         this._clearMessageQueue();
     },
 
-    answerQuery: function(serviceName, answer) {
+    _doAfterPendingMessages: function(func) {
-        if (!this.hasPendingMessages) {
+        if (this.hasPendingMessages) {
-            this._userVerifier.call_answer_query(serviceName, answer, this._cancellable, null);
+            let signalId = this.connect('no-more-messages', Lang.bind(this, function() {
-        } else {
-            let signalId = this.connect('no-more-messages',
-                                        Lang.bind(this, function() {
                 this.disconnect(signalId);
+                func();
+            }));
+        } else {
+            func();
+        }
+    },
+
+    answerQuery: function(serviceName, answer) {
+        this._doAfterPendingMessages(Lang.bind(this, function() {
             this._userVerifier.call_answer_query(serviceName, answer, this._cancellable, null);
         }));
-        }
     },
 
     _getIntervalForMessage: function(message) {
@@ -222,7 +259,7 @@ const ShellUserVerifier = new Lang.Class({
         return message.length * USER_READ_TIME;
     },
 
-    finishMessageQueue: function() {
+    _finishMessageQueue: function() {
         if (!this.hasPendingMessages)
             return;
 
@@ -234,7 +271,7 @@ const ShellUserVerifier = new Lang.Class({
 
     _queueMessageTimeout: function() {
         if (this._messageQueue.length == 0) {
-            this.finishMessageQueue();
+            this._finishMessageQueue();
             return;
         }
 
@@ -263,7 +300,7 @@ const ShellUserVerifier = new Lang.Class({
     },
 
     _clearMessageQueue: function() {
-        this.finishMessageQueue();
+        this._finishMessageQueue();
 
         if (this._messageQueueTimeoutId != 0) {
             GLib.source_remove(this._messageQueueTimeoutId);
@@ -288,9 +325,9 @@ const ShellUserVerifier = new Lang.Class({
             }));
     },
 
-    _oVirtUserAuthenticated: function(token) {
+    _oVirtUserAuthenticated: function() {
-        this._preemptingService = OVIRT_SERVICE_NAME;
+        if (this.verificationStatus != GdmUtil.VerificationStatus.VERIFICATION_SUCCEEDED)
-        this.emit('ovirt-user-authenticated');
+            this._reset();
     },
 
     _checkForSmartcard: function() {
@@ -298,26 +335,34 @@ const ShellUserVerifier = new Lang.Class({
 
         if (!this._settings.get_boolean(SMARTCARD_AUTHENTICATION_KEY))
             smartcardDetected = false;
-        else if (this._reauthOnly)
+        else if (this.reauthenticating)
             smartcardDetected = this._smartcardManager.hasInsertedLoginToken();
         else
             smartcardDetected = this._smartcardManager.hasInsertedTokens();
 
-        if (smartcardDetected != this.smartcardDetected) {
+        if (this._smartcardDetected == smartcardDetected)
-            this.smartcardDetected = smartcardDetected;
+            return;
 
-            if (this.smartcardDetected)
+        this._smartcardDetected = smartcardDetected;
-                this._preemptingService = SMARTCARD_SERVICE_NAME;
-            else if (this._preemptingService == SMARTCARD_SERVICE_NAME)
-                this._preemptingService = null;
 
-            this.emit('smartcard-status-changed');
+        // Most of the time we want to reset if the user inserts or removes
-        }
+        // a smartcard. Smartcard insertion "preempts" what the user was
+        // doing, and smartcard removal aborts the preemption.
+        // The exceptions are: 1) Don't reset on smartcard insertion if we're already verifying
+        //                        with a smartcard
+        //                     2) Don't reset if we've already succeeded at verification and
+        //                        the user is getting logged in.
+        if (this._serviceIsDefault(SMARTCARD_SERVICE_NAME) &&
+            this.verificationStatus == VerificationStatus.VERIFYING &&
+            this._smartcardDetected)
+            return;
+
+        if (this.verificationStatus != VerificationStatus.VERIFICATION_SUCCEEDED)
+            this._reset();
     },
 
     _reportInitError: function(where, error) {
         logError(error, where);
-        this._hold.release();
 
         this._queueMessage(_("Authentication error"), MessageType.ERROR);
         this._verificationFailed(false);
@@ -343,7 +388,6 @@ const ShellUserVerifier = new Lang.Class({
         this.reauthenticating = true;
         this._connectSignals();
         this._beginVerification();
-        this._hold.release();
     },
 
     _userVerifierGot: function(client, result) {
@@ -358,7 +402,6 @@ const ShellUserVerifier = new Lang.Class({
 
         this._connectSignals();
         this._beginVerification();
-        this._hold.release();
     },
 
     _connectSignals: function() {
@@ -372,31 +415,32 @@ const ShellUserVerifier = new Lang.Class({
     },
 
     _getForegroundService: function() {
-        if (this._preemptingService)
+        if (this._oVirtCredentialsManager.hasToken())
-            return this._preemptingService;
+            return OVIRT_SERVICE_NAME;
+        if (this._smartcardDetected)
+            return SMARTCARD_SERVICE_NAME;
 
         return this._defaultService;
     },
 
-    serviceIsForeground: function(serviceName) {
+    _serviceIsForeground: function(serviceName) {
         return serviceName == this._getForegroundService();
     },
 
-    serviceIsDefault: function(serviceName) {
+    _serviceIsDefault: function(serviceName) {
         return serviceName == this._defaultService;
     },
 
     _updateDefaultService: function() {
         if (this._settings.get_boolean(PASSWORD_AUTHENTICATION_KEY))
             this._defaultService = PASSWORD_SERVICE_NAME;
-        else if (this.smartcardDetected)
+        else if (this._smartcardDetected)
             this._defaultService = SMARTCARD_SERVICE_NAME;
         else if (this._haveFingerprintReader)
             this._defaultService = FINGERPRINT_SERVICE_NAME;
     },
 
     _startService: function(serviceName) {
-        this._hold.acquire();
         if (this._userName) {
            this._userVerifier.call_begin_verification_for_user(serviceName,
                                                                this._userName,
@@ -410,8 +454,6 @@ const ShellUserVerifier = new Lang.Class({
                    this._reportInitError('Failed to start verification for user', e);
                    return;
                }
-
-               this._hold.release();
            }));
         } else {
            this._userVerifier.call_begin_verification(serviceName,
@@ -425,8 +467,6 @@ const ShellUserVerifier = new Lang.Class({
                    this._reportInitError('Failed to start verification', e);
                    return;
                }
-
-               this._hold.release();
            }));
         }
     },
@@ -434,12 +474,12 @@ const ShellUserVerifier = new Lang.Class({
     _beginVerification: function() {
         this._startService(this._getForegroundService());
 
-        if (this._userName && this._haveFingerprintReader && !this.serviceIsForeground(FINGERPRINT_SERVICE_NAME))
+        if (this._userName && this._haveFingerprintReader && !this._serviceIsForeground(FINGERPRINT_SERVICE_NAME))
             this._startService(FINGERPRINT_SERVICE_NAME);
     },
 
     _onInfo: function(client, serviceName, info) {
-        if (this.serviceIsForeground(serviceName)) {
+        if (this._serviceIsForeground(serviceName)) {
             this._queueMessage(info, MessageType.INFO);
         } else if (serviceName == FINGERPRINT_SERVICE_NAME &&
             this._haveFingerprintReader) {
@@ -454,21 +494,21 @@ const ShellUserVerifier = new Lang.Class({
     },
 
     _onProblem: function(client, serviceName, problem) {
-        if (!this.serviceIsForeground(serviceName))
+        if (!this._serviceIsForeground(serviceName))
             return;
 
         this._queueMessage(problem, MessageType.ERROR);
     },
 
     _onInfoQuery: function(client, serviceName, question) {
-        if (!this.serviceIsForeground(serviceName))
+        if (!this._serviceIsForeground(serviceName))
             return;
 
         this.emit('ask-question', serviceName, question, '');
     },
 
     _onSecretInfoQuery: function(client, serviceName, secretQuestion) {
-        if (!this.serviceIsForeground(serviceName))
+        if (!this._serviceIsForeground(serviceName))
             return;
 
         if (serviceName == OVIRT_SERVICE_NAME) {
@@ -481,24 +521,11 @@ const ShellUserVerifier = new Lang.Class({
     },
 
     _onReset: function() {
-        // Clear previous attempts to authenticate
+        this._reset();
-        this._failCounter = 0;
-        this._updateDefaultService();
-
-        this.emit('reset');
     },
 
     _onVerificationComplete: function() {
-        this.emit('verification-complete');
+        this.verificationStatus = VerificationStatus.VERIFICATION_SUCCEEDED;
-    },
-
-    _cancelAndReset: function() {
-        this.cancel();
-        this._onReset();
-    },
-
-    _retry: function() {
-        this.begin(this._userName, new Batch.Hold());
     },
 
     _verificationFailed: function(retry) {
@@ -511,38 +538,23 @@ const ShellUserVerifier = new Lang.Class({
         let canRetry = retry && this._userName &&
             this._failCounter < this._settings.get_int(ALLOWED_FAILURES_KEY);
 
-        if (canRetry) {
+        this.verificationStatus = VerificationStatus.VERIFICATION_FAILED;
-            if (!this.hasPendingMessages) {
-                this._retry();
-            } else {
-                let signalId = this.connect('no-more-messages',
-                                            Lang.bind(this, function() {
-                                                this.disconnect(signalId);
-                                                this._retry();
-                                            }));
-            }
-        } else {
-            if (!this.hasPendingMessages) {
-                this._cancelAndReset();
-            } else {
-                let signalId = this.connect('no-more-messages',
-                                            Lang.bind(this, function() {
-                                                this.disconnect(signalId);
-                                                this._cancelAndReset();
-                                            }));
-            }
-        }
-
         this.emit('verification-failed');
+
+        this._doAfterPendingMessages(Lang.bind(this, function() {
+            if (canRetry)
+                this._beginAuthentication();
+            else
+                this.clear();
+        }));
     },
 
     _onConversationStopped: function(client, serviceName) {
         // If the login failed with the preauthenticated oVirt credentials
         // then discard the credentials and revert to default authentication
         // mechanism.
-        if (this.serviceIsForeground(OVIRT_SERVICE_NAME)) {
+        if (this._serviceIsForeground(OVIRT_SERVICE_NAME)) {
             this._oVirtCredentialsManager.resetToken();
-            this._preemptingService = null;
             this._verificationFailed(false);
             return;
         }
@@ -550,7 +562,7 @@ const ShellUserVerifier = new Lang.Class({
         // if the password service fails, then cancel everything.
         // But if, e.g., fingerprint fails, still give
         // password authentication a chance to succeed
-        if (this.serviceIsForeground(serviceName)) {
+        if (this._serviceIsForeground(serviceName)) {
             this._verificationFailed(true);
         }
     },

js/misc/loginManager.js

@@ -39,7 +39,7 @@ const SystemdLoginSessionIface = '<node> \
 <interface name="org.freedesktop.login1.Session"> \
 <signal name="Lock" /> \
 <signal name="Unlock" /> \
-<property name="Active" type="b" access="read" /> \
+<property name="Active" access="readonly" /> \
 </interface> \
 </node>';
 

js/ui/animation.js

@@ -21,9 +21,7 @@ const Animation = new Lang.Class({
         this._isPlaying = false;
         this._timeoutId = 0;
         this._frame = 0;
-
+        this._animations = St.TextureCache.get_default().load_sliced_image (filename, width, height,
-        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-        this._animations = St.TextureCache.get_default().load_sliced_image (filename, width, height, scaleFactor,
                                                                             Lang.bind(this, this._animationsLoaded));
         this.actor.set_child(this._animations);
     },

js/ui/appDisplay.js

@@ -99,9 +99,6 @@ const BaseAppView = new Lang.Class({
         else
             this._grid = new IconGrid.IconGrid(gridParams);
 
-        this._grid.connect('key-focus-in', Lang.bind(this, function(grid, actor) {
-            this._keyFocusIn(actor);
-        }));
         // Standard hack for ClutterBinLayout
         this._grid.actor.x_expand = true;
 
@@ -109,10 +106,6 @@ const BaseAppView = new Lang.Class({
         this._allItems = [];
     },
 
-    _keyFocusIn: function(actor) {
-        // Nothing by default
-    },
-
     removeAll: function() {
         this._grid.destroyAll();
         this._items = {};
@@ -565,7 +558,7 @@ const AllView = new Lang.Class({
             }));
     },
 
-    _keyFocusIn: function(icon) {
+    _ensureIconVisible: function(icon) {
         let itemPage = this._grid.getItemPage(icon);
         this.goToPage(itemPage);
     },
@@ -936,26 +929,19 @@ const FolderView = new Lang.Class({
         this.actor.add_action(action);
     },
 
-    _keyFocusIn: function(actor) {
-        Util.ensureActorVisibleInScrollView(this.actor, actor);
-    },
-
     createFolderIcon: function(size) {
         let layout = new Clutter.TableLayout();
         let icon = new St.Widget({ layout_manager: layout,
                                    style_class: 'app-folder-icon' });
-        layout.hookup_style(icon);
         let subSize = Math.floor(FOLDER_SUBICON_FRACTION * size);
 
-        let numItems = this._allItems.length;
+        let aligns = [ Clutter.ActorAlign.START, Clutter.ActorAlign.END ];
-        for (let i = 0; i < 4; i++) {
+        for (let i = 0; i < Math.min(this._allItems.length, 4); i++) {
-            let bin;
-            if (i < numItems) {
             let texture = this._allItems[i].app.create_icon_texture(subSize);
-                bin = new St.Bin({ child: texture });
+            let bin = new St.Bin({ child: texture,
-            } else {
+                                   x_expand: true, y_expand: true });
-                bin = new St.Bin({ width: subSize, height: subSize });
+            bin.set_x_align(aligns[i % 2]);
-            }
+            bin.set_y_align(aligns[Math.floor(i / 2)]);
             layout.pack(bin, i % 2, Math.floor(i / 2));
         }
 

js/ui/background.js

@@ -132,25 +132,6 @@ const BackgroundCache = new Lang.Class({
         this._removeContent(this._images, content);
     },
 
-    _attachCallerToFileLoad: function(caller, fileLoad) {
-        fileLoad.callers.push(caller);
-
-        if (!caller.cancellable)
-            return;
-
-        caller.cancellable.connect(Lang.bind(this, function() {
-            let idx = fileLoad.callers.indexOf(caller);
-            fileLoad.callers.splice(idx, 1);
-
-            if (fileLoad.callers.length == 0) {
-                fileLoad.cancellable.cancel();
-
-                let idx = this._pendingFileLoads.indexOf(fileLoad);
-                this._pendingFileLoads.splice(idx, 1);
-            }
-        }));
-    },
-
     _loadImageContent: function(params) {
         params = Params.parse(params, { monitorIndex: 0,
                                         style: null,
@@ -159,28 +140,27 @@ const BackgroundCache = new Lang.Class({
                                         cancellable: null,
                                         onFinished: null });
 
-        let caller = { monitorIndex: params.monitorIndex,
-                       effects: params.effects,
-                       cancellable: params.cancellable,
-                       onFinished: params.onFinished };
-
         for (let i = 0; i < this._pendingFileLoads.length; i++) {
-            let fileLoad = this._pendingFileLoads[i];
+            if (this._pendingFileLoads[i].filename == params.filename &&
-
+                this._pendingFileLoads[i].style == params.style) {
-            if (fileLoad.filename == params.filename &&
+                this._pendingFileLoads[i].callers.push({ shouldCopy: true,
-                fileLoad.style == params.style) {
+                                                         monitorIndex: params.monitorIndex,
-                this._attachCallerToFileLoad(caller, fileLoad);
+                                                         effects: params.effects,
+                                                         onFinished: params.onFinished });
                 return;
             }
         }
 
-        let fileLoad = { filename: params.filename,
+        this._pendingFileLoads.push({ filename: params.filename,
                                       style: params.style,
-                         cancellable: new Gio.Cancellable(),
+                                      callers: [{ shouldCopy: false,
-                         callers: [] };
+                                                  monitorIndex: params.monitorIndex,
-        this._attachCallerToFileLoad(caller, fileLoad);
+                                                  effects: params.effects,
+                                                  onFinished: params.onFinished }] });
 
-        let content = new Meta.Background({ meta_screen: global.screen });
+        let content = new Meta.Background({ meta_screen: global.screen,
+                                            monitor: params.monitorIndex,
+                                            effects: params.effects });
 
         content.load_file_async(params.filename,
                                 params.style,
@@ -191,26 +171,35 @@ const BackgroundCache = new Lang.Class({
                                                   content.load_file_finish(result);
 
                                                   this._monitorFile(params.filename);
+                                                  this._images.push(content);
                                               } catch(e) {
                                                   content = null;
                                               }
 
-                                              for (let i = 0; i < fileLoad.callers.length; i++) {
+                                              for (let i = 0; i < this._pendingFileLoads.length; i++) {
-                                                  let caller = fileLoad.callers[i];
+                                                  let pendingLoad = this._pendingFileLoads[i];
-                                                  if (caller.onFinished) {
+                                                  if (pendingLoad.filename != params.filename ||
+                                                      pendingLoad.style != params.style)
+                                                      continue;
+
+                                                  for (let j = 0; j < pendingLoad.callers.length; j++) {
+                                                      if (pendingLoad.callers[j].onFinished) {
                                                           let newContent;
 
-                                                      if (content) {
+                                                          if (content && pendingLoad.callers[j].shouldCopy) {
-                                                          newContent = content.copy(caller.monitorIndex, caller.effects);
+                                                              newContent = content.copy(pendingLoad.callers[j].monitorIndex,
+                                                                                        pendingLoad.callers[j].effects);
                                                               this._images.push(newContent);
+                                                          } else {
+                                                              newContent = content;
                                                           }
 
-                                                      caller.onFinished(newContent);
+                                                          pendingLoad.callers[j].onFinished(newContent);
                                                       }
                                                   }
 
-                                              let idx = this._pendingFileLoads.indexOf(fileLoad);
+                                                  this._pendingFileLoads.splice(i, 1);
-                                              this._pendingFileLoads.splice(idx, 1);
+                                              }
                                           }));
     },
 
@@ -754,18 +743,17 @@ const BackgroundManager = new Lang.Class({
             Lang.bind(this, function() {
                 newBackground.disconnect(newBackground.loadedSignalId);
                 newBackground.loadedSignalId = 0;
-
+                Tweener.addTween(this.background.actor,
+                                 { opacity: 0,
+                                   time: FADE_ANIMATION_TIME,
+                                   transition: 'easeOutQuad',
+                                   onComplete: Lang.bind(this, function() {
                                        if (this._newBackground != newBackground) {
                                            /* Not interesting, we queued another load */
                                            newBackground.actor.destroy();
                                            return;
                                        }
 
-                Tweener.addTween(this.background.actor,
-                                 { opacity: 0,
-                                   time: FADE_ANIMATION_TIME,
-                                   transition: 'easeOutQuad',
-                                   onComplete: Lang.bind(this, function() {
                                        this.background.actor.destroy();
                                        this.background = newBackground;
                                        this._newBackground = null;

js/ui/backgroundMenu.js

@@ -35,7 +35,7 @@ function addBackgroundMenu(actor, layoutManager) {
 
     function openMenu() {
         let [x, y] = global.get_pointer();
-        Main.layoutManager.setDummyCursorGeometry(x, y, 0, 0);
+        Main.layoutManager.setDummyCursorPosition(x, y);
         actor._backgroundMenu.open(BoxPointer.PopupAnimation.NONE);
     }
 

js/ui/calendar.js

@@ -420,10 +420,8 @@ const Calendar = new Lang.Class({
     setEventSource: function(eventSource) {
         this._eventSource = eventSource;
         this._eventSource.connect('changed', Lang.bind(this, function() {
-            this._rebuildCalendar();
             this._update();
         }));
-        this._rebuildCalendar();
         this._update();
     },
 

js/ui/components/telepathyClient.js

@@ -1270,8 +1270,7 @@ const SubscriptionRequestNotification = new Lang.Class({
 
         if (file) {
             let uri = file.get_uri();
-            let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
+            iconBox.child = textureCache.load_uri_async(uri, iconBox._size, iconBox._size);
-            iconBox.child = textureCache.load_uri_async(uri, iconBox._size, iconBox._size, scaleFactor);
         }
         else {
             iconBox.child = new St.Icon({ icon_name: 'avatar-default',
@@ -1422,12 +1421,7 @@ const AccountNotification = new Lang.Class({
                 if (status == Tp.ConnectionStatus.CONNECTED) {
                     this.destroy();
                 } else if (status == Tp.ConnectionStatus.DISCONNECTED) {
-                    let connectionError = account.connection_error;
+                    this.update(this.title, this._getMessage(account.connection_error));
-
-                    if (connectionError == Tp.error_get_dbus_name(Tp.Error.CANCELLED))
-                        this.destroy();
-                    else
-                        this.update(this.title, this._getMessage(connectionError));
                 }
             }));
     },

js/ui/environment.js

@@ -5,8 +5,6 @@ imports.gi.versions.Gio = '2.0';
 imports.gi.versions.Gdk = '3.0';
 imports.gi.versions.GdkPixbuf = '2.0';
 imports.gi.versions.Gtk = '3.0';
-imports.gi.versions.TelepathyGLib = '0.12';
-imports.gi.versions.TelepathyLogger = '0.2';
 
 const Clutter = imports.gi.Clutter;;
 const Gettext = imports.gettext;

js/ui/ibusCandidatePopup.js

@@ -155,7 +155,7 @@ const CandidatePopup = new Lang.Class({
 
         panelService.connect('set-cursor-location',
                              Lang.bind(this, function(ps, x, y, w, h) {
-                                 Main.layoutManager.setDummyCursorGeometry(x, y, w, h);
+                                 Main.layoutManager.setDummyCursorPosition(x, y);
                                  if (this._boxPointer.actor.visible)
                                      this._boxPointer.setPosition(Main.layoutManager.dummyCursor, 0);
                              }));

js/ui/iconGrid.js

@@ -214,20 +214,6 @@ const IconGrid = new Lang.Class({
         this._grid.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
         this._grid.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
         this._grid.connect('allocate', Lang.bind(this, this._allocate));
-        this._grid.connect('actor-added', Lang.bind(this, this._childAdded));
-        this._grid.connect('actor-removed', Lang.bind(this, this._childRemoved));
-    },
-
-    _keyFocusIn: function(actor) {
-        this.emit('key-focus-in', actor);
-    },
-
-    _childAdded: function(grid, child) {
-        child._iconGridKeyFocusInId = child.connect('key-focus-in', Lang.bind(this, this._keyFocusIn));
-    },
-
-    _childRemoved: function(grid, child) {
-        child.disconnect(child._iconGridKeyFocusInId);
     },
 
     _getPreferredWidth: function (grid, forHeight, alloc) {
@@ -541,7 +527,6 @@ const IconGrid = new Lang.Class({
         }
     }
 });
-Signals.addSignalMethods(IconGrid.prototype);
 
 const PaginatedIconGrid = new Lang.Class({
     Name: 'PaginatedIconGrid',

js/ui/layout.js

@@ -4,6 +4,7 @@ const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;
 const GObject = imports.gi.GObject;
 const Lang = imports.lang;
+const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
@@ -212,10 +213,6 @@ const LayoutManager = new Lang.Class({
         this.addChrome(this.trayBox);
         this._setupTrayPressure();
 
-        this.modalDialogGroup = new St.Widget({ name: 'modalDialogGroup',
-                                                layout_manager: new Clutter.BinLayout() });
-        this.uiGroup.add_actor(this.modalDialogGroup);
-
         this.keyboardBox = new St.BoxLayout({ name: 'keyboardBox',
                                               reactive: true,
                                               track_hover: true });
@@ -223,7 +220,7 @@ const LayoutManager = new Lang.Class({
         this._keyboardHeightNotifyId = 0;
 
         // A dummy actor that tracks the mouse or text cursor, based on the
-        // position and size set in setDummyCursorGeometry.
+        // position set in setDummyCursorPosition.
         this.dummyCursor = new St.Widget({ width: 0, height: 0 });
         this.uiGroup.add_actor(this.dummyCursor);
 
@@ -728,7 +725,7 @@ const LayoutManager = new Lang.Class({
         this._updateRegions();
     },
 
-    // setDummyCursorGeometry:
+    // setDummyCursorPosition:
     //
     // The cursor dummy is a standard widget commonly used for popup
     // menus and box pointers to track, as the box pointer API only
@@ -737,10 +734,9 @@ const LayoutManager = new Lang.Class({
     // is what you should use. Given that the menu should not track
     // the actual mouse pointer as it moves, you need to call this
     // function before you show the menu to ensure it is at the right
-    // position and has the right size.
+    // position.
-    setDummyCursorGeometry: function(x, y, w, h) {
+    setDummyCursorPosition: function(x, y) {
         this.dummyCursor.set_position(Math.round(x), Math.round(y));
-        this.dummyCursor.set_size(Math.round(w), Math.round(h));
     },
 
     // addChrome:
@@ -911,8 +907,8 @@ const LayoutManager = new Lang.Class({
             return;
 
         if (!this._updateRegionIdle)
-            this._updateRegionIdle = Meta.later_add(Meta.LaterType.BEFORE_REDRAW,
+            this._updateRegionIdle = Mainloop.idle_add(Lang.bind(this, this._updateRegions),
-                                                    Lang.bind(this, this._updateRegions));
+                                                       Meta.PRIORITY_BEFORE_REDRAW);
     },
 
     _getWindowActorsForWorkspace: function(workspace) {
@@ -943,7 +939,7 @@ const LayoutManager = new Lang.Class({
         let rects = [], struts = [], i;
 
         if (this._updateRegionIdle) {
-            Meta.later_remove(this._updateRegionIdle);
+            Mainloop.source_remove(this._updateRegionIdle);
             delete this._updateRegionIdle;
         }
 
@@ -1017,38 +1013,18 @@ const LayoutManager = new Lang.Class({
                     continue;
 
                 // Ensure that the strut rects goes all the way to the screen edge,
-                // as this really what mutter expects. However skip this step
+                // as this really what mutter expects.
-                // in cases where this would render an entire monitor unusable.
                 switch (side) {
                 case Meta.Side.TOP:
-                    let hasMonitorsAbove = this.monitors.some(Lang.bind(this,
-                        function(mon) {
-                            return this._isAboveOrBelowPrimary(mon) &&
-                                   mon.y < primary.y;
-                        }));
-                    if (!hasMonitorsAbove)
                     y1 = 0;
                     break;
                 case Meta.Side.BOTTOM:
-                    if (this.primaryIndex == this.bottomIndex)
                     y2 = global.screen_height;
                     break;
                 case Meta.Side.LEFT:
-                    let hasMonitorsLeft = this.monitors.some(Lang.bind(this,
-                        function(mon) {
-                            return !this._isAboveOrBelowPrimary(mon) &&
-                                   mon.x < primary.x;
-                        }));
-                    if (!hasMonitorsLeft)
                     x1 = 0;
                     break;
                 case Meta.Side.RIGHT:
-                    let hasMonitorsRight = this.monitors.some(Lang.bind(this,
-                        function(mon) {
-                            return !this._isAboveOrBelowPrimary(mon) &&
-                                   mon.x > primary.x;
-                        }));
-                    if (!hasMonitorsRight)
                     x2 = global.screen_width;
                     break;
                 }

js/ui/lightbox.js

@@ -11,60 +11,30 @@ const Params = imports.misc.params;
 const Tweener = imports.ui.tweener;
 
 const DEFAULT_FADE_FACTOR = 0.4;
-const VIGNETTE_BRIGHTNESS = 0.8;
-const VIGNETTE_SHARPNESS = 0.7;
 
-const VIGNETTE_DECLARATIONS = '\
+const GLSL_DIM_EFFECT_DECLARATIONS = '\
-uniform float brightness;\n\
+float compute_dim_factor (const vec2 coords) {\
-uniform float vignette_sharpness;\n';
+   vec2 dist = coords - vec2(0.5, 0.5); \
-
+   float elipse_radius = 0.5; \
-const VIGNETTE_CODE = '\
+   /* interpolate darkening value, based on distance from screen center */ \
-cogl_color_out.a = cogl_color_in.a;\n\
+   float val = min(length(dist), elipse_radius); \
-cogl_color_out.rgb = vec3(0.0, 0.0, 0.0);\n\
+   return mix(0.3, 1.0, val / elipse_radius) * 0.4; \
-vec2 position = cogl_tex_coord_in[0].xy - 0.5;\n\
+}';
-float t = length(2.0 * position);\n\
+const GLSL_DIM_EFFECT_CODE = '\
-t = clamp(t, 0.0, 1.0);\n\
+   float a = compute_dim_factor (cogl_tex_coord0_in.xy);\
-float pixel_brightness = mix(1.0, 1.0 - vignette_sharpness, t);\n\
+   cogl_color_out = vec4(0, 0, 0, cogl_color_in.a * a);'
-cogl_color_out.a = cogl_color_out.a * (1 - pixel_brightness * brightness);';
+;
 
 const RadialShaderQuad = new Lang.Class({
     Name: 'RadialShaderQuad',
     Extends: Shell.GLSLQuad,
 
-    _init: function(params) {
-        this.parent(params);
-
-        this._brightnessLocation = this.get_uniform_location('brightness');
-        this._sharpnessLocation = this.get_uniform_location('vignette_sharpness');
-
-        this.brightness = 1.0;
-        this.vignetteSharpness = 0.0;
-    },
-
     vfunc_build_pipeline: function() {
         this.add_glsl_snippet(Shell.SnippetHook.FRAGMENT,
-                              VIGNETTE_DECLARATIONS, VIGNETTE_CODE, true);
+                              GLSL_DIM_EFFECT_DECLARATIONS,
+                              GLSL_DIM_EFFECT_CODE,
+                              true);
     },
-
-    get brightness() {
-        return this._brightness;
-    },
-
-    set brightness(v) {
-        this._brightness = v;
-        this.set_uniform_float(this._brightnessLocation,
-                               1, [this._brightness]);
-    },
-
-    get vignetteSharpness() {
-        return this._sharpness;
-    },
-
-    set vignetteSharpness(v) {
-        this._sharpness = v;
-        this.set_uniform_float(this._sharpnessLocation,
-                               1, [this._sharpness]);
-    }
 });
 
 /**
@@ -105,7 +75,6 @@ const Lightbox = new Lang.Class({
         this._container = container;
         this._children = container.get_children();
         this._fadeFactor = params.fadeFactor;
-        this._radialEffect = params.radialEffect;
         if (params.radialEffect)
             this.actor = new RadialShaderQuad({ x: 0,
                                                 y: 0,
@@ -113,7 +82,6 @@ const Lightbox = new Lang.Class({
         else
             this.actor = new St.Bin({ x: 0,
                                       y: 0,
-                                      opacity: 0,
                                       style_class: 'lightbox',
                                       reactive: params.inhibitEvents });
 
@@ -165,18 +133,9 @@ const Lightbox = new Lang.Class({
         fadeInTime = fadeInTime || 0;
 
         Tweener.removeTweens(this.actor);
-        if (this._radialEffect) {
+        if (fadeInTime != 0) {
-            Tweener.addTween(this.actor,
+            this.shown = false;
-                             { brightness: VIGNETTE_BRIGHTNESS,
+            this.actor.opacity = 0;
-                               vignetteSharpness: VIGNETTE_SHARPNESS,
-                               time: fadeInTime,
-                               transition: 'easeOutQuad',
-                               onComplete: Lang.bind(this, function() {
-                                   this.shown = true;
-                                   this.emit('shown');
-                               })
-                             });
-        } else {
             Tweener.addTween(this.actor,
                              { opacity: 255 * this._fadeFactor,
                                time: fadeInTime,
@@ -186,8 +145,11 @@ const Lightbox = new Lang.Class({
                                    this.emit('shown');
                                })
                              });
+        } else {
+            this.actor.opacity = 255 * this._fadeFactor;
+            this.shown = true;
+            this.emit('shown');
         }
-
         this.actor.show();
     },
 
@@ -196,18 +158,7 @@ const Lightbox = new Lang.Class({
 
         this.shown = false;
         Tweener.removeTweens(this.actor);
-        if (this._radialEffect) {
+        if (fadeOutTime != 0) {
-            Tweener.addTween(this.actor,
-                             { brightness: 1.0,
-                               vignetteSharpness: 0.0,
-                               opacity: 0,
-                               time: fadeOutTime,
-                               transition: 'easeOutQuad',
-                               onComplete: Lang.bind(this, function() {
-                                   this.actor.hide();
-                               })
-                             });
-        } else {
             Tweener.addTween(this.actor,
                              { opacity: 0,
                                time: fadeOutTime,
@@ -216,6 +167,8 @@ const Lightbox = new Lang.Class({
                                    this.actor.hide();
                                })
                              });
+        } else {
+            this.actor.hide();
         }
     },
 

js/ui/main.js

@@ -203,6 +203,10 @@ function _initializeUI() {
     ExtensionDownloader.init();
     ExtensionSystem.init();
 
+    layoutManager.connect('startup-prepared', function() {
+        Meta.activate_session();
+    });
+
     if (sessionMode.isGreeter && screenShield) {
         layoutManager.connect('startup-prepared', function() {
             screenShield.showDialog();

js/ui/messageTray.js

@@ -2027,18 +2027,13 @@ const MessageTray = new Lang.Class({
 
     _onNotificationKeyRelease: function(actor, event) {
         if (event.get_key_symbol() == Clutter.KEY_Escape && event.get_state() == 0) {
-            this._expireNotification();
+            this._closeNotification();
             return Clutter.EVENT_STOP;
         }
 
         return Clutter.EVENT_PROPAGATE;
     },
 
-    _expireNotification: function() {
-        this._notificationExpired = true;
-        this._updateState();
-    },
-
     _closeNotification: function() {
         if (this._notificationState == State.SHOWN) {
             this._closeButton.hide();
@@ -2403,7 +2398,7 @@ const MessageTray = new Lang.Class({
                            this._notificationTimeoutId == 0 &&
                            this._notification.urgency != Urgency.CRITICAL &&
                            !this._notification.focused &&
-                           !this._pointerInNotification) || this._notificationExpired;
+                           !this._pointerInNotification);
             let mustClose = (this._notificationRemoved || !hasNotifications || expired || this._traySummoned);
 
             if (mustClose) {
@@ -2464,10 +2459,6 @@ const MessageTray = new Lang.Class({
             this._hideDesktopClone();
 
         this._updatingState = false;
-
-        // Clean transient variables that are used to communicate actions
-        // to updateState()
-        this._notificationExpired = false;
     },
 
     _tween: function(actor, statevar, value, params) {
@@ -2790,12 +2781,7 @@ const MessageTray = new Lang.Class({
                              { y: expandedY,
                                opacity: 255,
                                time: ANIMATION_TIME,
-                               transition: 'easeOutQuad',
+                               transition: 'easeOutQuad'
-                               // HACK: Drive the state machine here better,
-                               // instead of overwriting tweens
-                               onComplete: Lang.bind(this, function() {
-                                   this._notificationState = State.SHOWN;
-                               }),
                              });
         }
     },

js/ui/modalDialog.js

@@ -41,6 +41,7 @@ const ModalDialog = new Lang.Class({
     _init: function(params) {
         params = Params.parse(params, { shellReactive: false,
                                         styleClass: null,
+                                        parentActor: Main.uiGroup,
                                         keybindingMode: Shell.KeyBindingMode.SYSTEM_MODAL,
                                         shouldFadeIn: true,
                                         destroyOnClose: true });
@@ -56,7 +57,7 @@ const ModalDialog = new Lang.Class({
                                       x: 0,
                                       y: 0,
                                       accessible_role: Atk.Role.DIALOG });
-        Main.layoutManager.modalDialogGroup.add_actor(this._group);
+        params.parentActor.add_actor(this._group);
 
         let constraint = new Clutter.BindConstraint({ source: global.stage,
                                                       coordinate: Clutter.BindCoordinate.ALL });

js/ui/overview.js

@@ -14,7 +14,6 @@ const Gdk = imports.gi.Gdk;
 const Background = imports.ui.background;
 const DND = imports.ui.dnd;
 const LayoutManager = imports.ui.layout;
-const Lightbox = imports.ui.lightbox;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
 const OverviewControls = imports.ui.overviewControls;
@@ -197,7 +196,11 @@ const Overview = new Lang.Class({
 
             Tweener.addTween(background,
                              { brightness: 1.0,
-                               vignetteSharpness: 0.0,
+                               time: SHADE_ANIMATION_TIME,
+                               transition: 'easeOutQuad'
+                             });
+            Tweener.addTween(background,
+                             { vignetteSharpness: 0.0,
                                time: SHADE_ANIMATION_TIME,
                                transition: 'easeOutQuad'
                              });
@@ -210,8 +213,12 @@ const Overview = new Lang.Class({
             let background = backgrounds[i]._delegate;
 
             Tweener.addTween(background,
-                             { brightness: Lightbox.VIGNETTE_BRIGHTNESS,
+                             { brightness: 0.8,
-                               vignetteSharpness: Lightbox.VIGNETTE_SHARPNESS,
+                               time: SHADE_ANIMATION_TIME,
+                               transition: 'easeOutQuad'
+                             });
+            Tweener.addTween(background,
+                             { vignetteSharpness: 0.7,
                                time: SHADE_ANIMATION_TIME,
                                transition: 'easeOutQuad'
                              });

js/ui/screenShield.js

@@ -301,7 +301,7 @@ const NotificationsBox = new Lang.Class({
                              });
 
             this._updateVisibility();
-            this.emit('wake-up-screen');
+            Shell.util_wake_up_screen();
         }
     },
 
@@ -327,7 +327,7 @@ const NotificationsBox = new Lang.Class({
 
         this._updateVisibility();
         if (obj.sourceBox.visible)
-            this.emit('wake-up-screen');
+            Shell.util_wake_up_screen();
     },
 
     _visibleChanged: function(source, obj) {
@@ -342,7 +342,7 @@ const NotificationsBox = new Lang.Class({
 
         this._updateVisibility();
         if (obj.sourceBox.visible)
-            this.emit('wake-up-screen');
+            Shell.util_wake_up_screen();
     },
 
     _detailedChanged: function(source, obj) {
@@ -380,7 +380,6 @@ const NotificationsBox = new Lang.Class({
         this._sources.delete(source);
     },
 });
-Signals.addSignalMethods(NotificationsBox.prototype);
 
 const Arrow = new Lang.Class({
     Name: 'Arrow',
@@ -537,7 +536,7 @@ const ScreenShield = new Lang.Class({
 
         this._smartcardManager = SmartcardManager.getSmartcardManager();
         this._smartcardManager.connect('smartcard-inserted',
-                                       Lang.bind(this, function(manager, token) {
+                                       Lang.bind(this, function(token) {
                                            if (this._isLocked && token.UsedToLogin)
                                                this._liftShield(true, 0);
                                        }));
@@ -729,7 +728,7 @@ const ScreenShield = new Lang.Class({
         } else {
             this._inhibitSuspend();
 
-            this._wakeUpScreen();
+            this._onUserBecameActive();
         }
     },
 
@@ -1152,7 +1151,6 @@ const ScreenShield = new Lang.Class({
         this._lockScreenContents.add_actor(this._lockScreenContentsBox);
 
         this._notificationsBox = new NotificationsBox();
-        this._wakeUpScreenId = this._notificationsBox.connect('wake-up-screen', Lang.bind(this, this._wakeUpScreen));
         this._lockScreenContentsBox.add(this._notificationsBox.actor, { x_fill: true,
                                                                         y_fill: true,
                                                                         expand: true });
@@ -1160,17 +1158,11 @@ const ScreenShield = new Lang.Class({
         this._hasLockScreen = true;
     },
 
-    _wakeUpScreen: function() {
-        this._onUserBecameActive();
-        this.emit('wake-up-screen');
-    },
-
     _clearLockScreen: function() {
         this._clock.destroy();
         this._clock = null;
 
         if (this._notificationsBox) {
-            this._notificationsBox.disconnect(this._wakeUpScreenId);
             this._notificationsBox.destroy();
             this._notificationsBox = null;
         }

js/ui/search.js

@@ -315,8 +315,6 @@ const SearchResultsBase = new Lang.Class({
     },
 
     clear: function() {
-        for (let resultId in this._resultDisplays)
-            this._resultDisplays[resultId].actor.destroy();
         this._resultDisplays = {};
         this._clearResultDisplay();
         this.actor.hide();
@@ -340,22 +338,12 @@ const SearchResultsBase = new Lang.Class({
         }));
 
         if (metasNeeded.length === 0) {
-            callback(true);
+            callback();
         } else {
             this._cancellable.cancel();
             this._cancellable.reset();
 
             this.provider.getResultMetas(metasNeeded, Lang.bind(this, function(metas) {
-                if (metas.length == 0) {
-                    callback(false);
-                    return;
-                }
-                if (metas.length != metasNeeded.length) {
-                    log('Wrong number of result metas returned by search provider');
-                    callback(false);
-                    return;
-                }
-
                 metasNeeded.forEach(Lang.bind(this, function(resultId, i) {
                     let meta = metas[i];
                     let display = this._createResultDisplay(meta);
@@ -363,7 +351,7 @@ const SearchResultsBase = new Lang.Class({
                     display.actor.connect('key-focus-in', Lang.bind(this, this._keyFocusIn));
                     this._resultDisplays[resultId] = display;
                 }));
-                callback(true);
+                callback();
             }), this._cancellable);
         }
     },
@@ -380,10 +368,8 @@ const SearchResultsBase = new Lang.Class({
             let results = this.provider.filterResults(providerResults, maxResults);
             let hasMoreResults = results.length < providerResults.length;
 
-            this._ensureResultActors(results, Lang.bind(this, function(successful) {
+            this._ensureResultActors(results, Lang.bind(this, function() {
                 this._clearResultDisplay();
-                if (!successful)
-                    return;
 
                 // To avoid CSS transitions causing flickering when
                 // the first search result stays the same, we hide the
@@ -629,11 +615,8 @@ const SearchResults = new Lang.Class({
         if (newDefaultResult != this._defaultResult) {
             if (this._defaultResult)
                 this._defaultResult.setSelected(false);
-            if (newDefaultResult) {
+            if (newDefaultResult)
                 newDefaultResult.setSelected(this._highlightDefault);
-                if (this._highlightDefault)
-                    Util.ensureActorVisibleInScrollView(this._scrollView, newDefaultResult.actor);
-            }
 
             this._defaultResult = newDefaultResult;
         }
@@ -670,11 +653,8 @@ const SearchResults = new Lang.Class({
 
     highlightDefault: function(highlight) {
         this._highlightDefault = highlight;
-        if (this._defaultResult) {
+        if (this._defaultResult)
             this._defaultResult.setSelected(highlight);
-            if (highlight)
-                Util.ensureActorVisibleInScrollView(this._scrollView, this._defaultResult.actor);
-        }
     },
 
     navigateFocus: function(direction) {

js/ui/shellDBus.js

@@ -69,7 +69,6 @@ const ScreenSaverIface = '<node> \
 <signal name="ActiveChanged"> \
     <arg name="new_value" type="b" /> \
 </signal> \
-<signal name="WakeUpScreen" /> \
 </interface> \
 </node>';
 
@@ -408,9 +407,6 @@ const ScreenSaverDBus = new Lang.Class({
         screenShield.connect('active-changed', Lang.bind(this, function(shield) {
             this._dbusImpl.emit_signal('ActiveChanged', GLib.Variant.new('(b)', [shield.active]));
         }));
-        screenShield.connect('wake-up-screen', Lang.bind(this, function(shield) {
-            this._dbusImpl.emit_signal('WakeUpScreen', null);
-        }));
 
         this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(ScreenSaverIface, this);
         this._dbusImpl.export(Gio.DBus.session, '/org/gnome/ScreenSaver');

js/ui/status/bluetooth.js

@@ -17,7 +17,6 @@ const OBJECT_PATH = '/org/gnome/SettingsDaemon/Rfkill';
 const RfkillManagerInterface = '<node> \
 <interface name="org.gnome.SettingsDaemon.Rfkill"> \
 <property name="BluetoothAirplaneMode" type="b" access="readwrite" /> \
-<property name="BluetoothHasAirplaneMode" type="b" access="read" /> \
 </interface> \
 </node>';
 
@@ -59,7 +58,6 @@ const Indicator = new Lang.Class({
         this._model.connect('row-changed', Lang.bind(this, this._sync));
         this._model.connect('row-deleted', Lang.bind(this, this._sync));
         this._model.connect('row-inserted', Lang.bind(this, this._sync));
-        Main.sessionMode.connect('updated', Lang.bind(this, this._sync));
         this._sync();
     },
 
@@ -94,11 +92,9 @@ const Indicator = new Lang.Class({
 
     _sync: function() {
         let nDevices = this._getNConnectedDevices();
-        let sensitive = !Main.sessionMode.isLocked && !Main.sessionMode.isGreeter;
 
-        this.menu.setSensitive(sensitive);
         this._indicator.visible = nDevices > 0;
-        this._item.actor.visible = this._proxy.BluetoothHasAirplaneMode && !this._proxy.BluetoothAirplaneMode;
+        this._item.actor.visible = !this._proxy.BluetoothAirplaneMode;
 
         if (nDevices > 0)
             this._item.status.text = ngettext("%d Connected Device", "%d Connected Devices", nDevices).format(nDevices);

js/ui/status/location.js

@@ -4,10 +4,9 @@ const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 
-const Main = imports.ui.main;
+const Shell = imports.gi.Shell;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
-const Shell = imports.gi.Shell;
 
 const LOCATION_SCHEMA = 'org.gnome.shell.location';
 const MAX_ACCURACY_LEVEL = 'max-accuracy-level';
@@ -56,8 +55,8 @@ const Indicator = new Lang.Class({
         this._agent = Gio.DBusExportedObject.wrapJSObject(AgentIface, this);
         this._agent.export(Gio.DBus.system, '/org/freedesktop/GeoClue2/Agent');
 
-        this._item.status.text = _("Enabled");
+        this._item.status.text = _("On");
-        this._onOffAction = this._item.menu.addAction(_("Disable"), Lang.bind(this, this._onOnOffAction));
+        this._onOffAction = this._item.menu.addAction(_("Turn Off"), Lang.bind(this, this._onOnOffAction));
 
         this.menu.addMenuItem(this._item);
 
@@ -66,8 +65,6 @@ const Indicator = new Lang.Class({
                                            0,
                                            Lang.bind(this, this._connectToGeoclue),
                                            Lang.bind(this, this._onGeoclueVanished));
-        Main.sessionMode.connect('updated', Lang.bind(this, this._onSessionUpdated));
-        this._onSessionUpdated();
         this._onMaxAccuracyLevelChanged();
         this._connectToGeoclue();
     },
@@ -97,7 +94,6 @@ const Indicator = new Lang.Class({
         }
 
         this._indicator.visible = this._proxy.InUse;
-        this._updateMenuLabels();
     },
 
     _connectToGeoclue: function() {
@@ -123,7 +119,7 @@ const Indicator = new Lang.Class({
         this._propertiesChangedId = this._proxy.connect('g-properties-changed',
                                                         Lang.bind(this, this._onGeocluePropsChanged));
 
-        this._availableAccuracyLevel = this._proxy.AvailableAccuracyLevel;
+        this._updateMenu();
         this._syncIndicator();
 
         this._proxy.AddAgentRemote('gnome-shell', Lang.bind(this, this._onAgentRegistered));
@@ -154,23 +150,14 @@ const Indicator = new Lang.Class({
             this._settings.set_enum(MAX_ACCURACY_LEVEL, 0);
     },
 
-    _onSessionUpdated: function() {
-        let sensitive = !Main.sessionMode.isLocked && !Main.sessionMode.isGreeter;
-        this.menu.setSensitive(sensitive);
-    },
-
-    _updateMenuLabels: function() {
-        if (this._getMaxAccuracyLevel() == 0) {
-            this._item.status.text = _("Disabled");
-            this._onOffAction.label.text = _("Enable");
-        } else {
-            this._item.status.text = this._indicator.visible ? _("In Use") : _("Enabled");
-            this._onOffAction.label.text = _("Disable");
-        }
-    },
-
     _onMaxAccuracyLevelChanged: function() {
-        this._updateMenuLabels();
+        if (this._getMaxAccuracyLevel() == 0) {
+            this._item.status.text = _("Off");
+            this._onOffAction.label.text = _("Turn On");
+        } else {
+            this._item.status.text = _("On");
+            this._onOffAction.label.text = _("Turn Off");
+        }
 
         // Gotta ensure geoclue is up and we are registered as agent to it
         // before we emit the notify for this property change.
@@ -187,12 +174,17 @@ const Indicator = new Lang.Class({
         this._agent.emit_property_changed('MaxAccuracyLevel', variant);
     },
 
+    _updateMenu: function() {
+        this._availableAccuracyLevel = this._proxy.AvailableAccuracyLevel;
+        this.menu.actor.visible = (this._availableAccuracyLevel != 0);
+    },
+
     _onGeocluePropsChanged: function(proxy, properties) {
         let unpacked = properties.deep_unpack();
         if ("InUse" in unpacked)
             this._syncIndicator();
         if ("AvailableAccuracyLevel" in unpacked)
-            this._availableAccuracyLevel = this._proxy.AvailableAccuracyLevel;
+            this._updateMenu();
     }
 });
 

js/ui/status/network.js

@@ -293,13 +293,8 @@ const NMConnectionSection = new Lang.Class({
     },
 
     removeConnection: function(connection) {
-        let uuid = connection.get_uuid();
+        this._connectionItems.get(connection.get_uuid()).destroy();
-        let item = this._connectionItems.get(uuid);
+        this._connectionItems.delete(connection.get_uuid());
-        if (item == undefined)
-            return;
-
-        item.destroy();
-        this._connectionItems.delete(uuid);
 
         let pos = this._connections.indexOf(connection);
         this._connections.splice(pos, 1);
@@ -1170,10 +1165,6 @@ const NMDeviceWireless = new Lang.Class({
             this._client.disconnect(this._wirelessHwEnabledChangedId);
             this._wirelessHwEnabledChangedId = 0;
         }
-        if (this._dialog) {
-            this._dialog.destroy();
-            this._dialog = null;
-        }
 
         this.item.destroy();
     },
@@ -1866,7 +1857,8 @@ const NMApplet = new Lang.Class({
 
     _updateIcon: function() {
         if (!this._client.networking_enabled || !this._mainConnection) {
-            this._primaryIndicator.visible = false;
+            this._primaryIndicator.icon_name = 'network-offline-symbolic';
+            this._primaryIndicator.visible = true;
         } else {
             let dev = this._mainConnection._primaryDevice;
             this._primaryIndicator.visible = (dev != null);

js/ui/unlockDialog.js

@@ -53,8 +53,8 @@ const UnlockDialog = new Lang.Class({
 
         this._authPrompt = new AuthPrompt.AuthPrompt(new Gdm.Client(), AuthPrompt.AuthPromptMode.UNLOCK_ONLY);
         this._authPrompt.connect('failed', Lang.bind(this, this._fail));
-        this._authPrompt.connect('cancelled', Lang.bind(this, this._fail));
         this._authPrompt.connect('reset', Lang.bind(this, this._onReset));
+        this._authPrompt.connect('needs-username', Lang.bind(this, this._onNeedsUserName));
         this._authPrompt.setPasswordChar('\u25cf');
         this._authPrompt.nextButton.label = _("Unlock");
 
@@ -101,6 +101,10 @@ const UnlockDialog = new Lang.Class({
     },
 
     _onReset: function(authPrompt, beginRequest) {
+        this._authPrompt.begin();
+    },
+
+    _onNeedsUserName: function() {
         let userName;
         if (beginRequest == AuthPrompt.BeginRequestType.PROVIDE_USERNAME) {
             this._authPrompt.setUser(this._user);
@@ -109,7 +113,7 @@ const UnlockDialog = new Lang.Class({
             userName = null;
         }
 
-        this._authPrompt.begin({ userName: userName });
+        this._authPrompt.gotUserName(userName);
     },
 
     _escape: function() {

js/ui/workspace.js

@@ -8,8 +8,6 @@ const Meta = imports.gi.Meta;
 const Pango = imports.gi.Pango;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
-const Atk = imports.gi.Atk;
-
 const Signals = imports.signals;
 
 const DND = imports.ui.dnd;
@@ -123,7 +121,6 @@ const WindowClone = new Lang.Class({
         // the hierarchy that is sized to only the visible portion.
         this.actor = new St.Widget({ reactive: true,
                                      can_focus: true,
-                                     accessible_role: Atk.Role.PUSH_BUTTON,
                                      layout_manager: new WindowCloneLayout() });
 
         this.actor.add_child(this._windowClone);
@@ -427,7 +424,6 @@ const WindowOverlay = new Lang.Class({
                                    text: metaWindow.title });
         title.clutter_text.ellipsize = Pango.EllipsizeMode.END;
         title._spacing = 0;
-        windowClone.actor.label_actor = title;
 
         this._updateCaptionId = metaWindow.connect('notify::title',
             Lang.bind(this, function(w) {

po/LINGUAS

@@ -33,7 +33,6 @@ id
 it
 ja
 kk
-km
 kn
 ko
 ku

po/ar.po

@@ -2,15 +2,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Khaled Hosny <khaledhosny@eglug.org>, 2009, 2010, 2011, 2012, 2013, 2014.
 # Muhammed Abd-ulaziz Abd-ullah <thenubianmuha_idrecy@yahoo.co.uk>, 2012.
-# Abderrahim Kitouni <a.kitouni@gmail.com>, 2012, 2014.
+# Abderrahim Kitouni <a.kitouni@gmail.com>, 2012.
 # Ibrahim Saed <ibraheem5000@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-26 01:34+0200\n"
+"POT-Creation-Date: 2014-02-28 22:55+0200\n"
-"PO-Revision-Date: 2014-03-21 11:05+0100\n"
+"PO-Revision-Date: 2014-02-28 23:08+0200\n"
-"Last-Translator: Abderrahim Kitouni <a.kitouni@gmail.com>\n"
+"Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
 "Language: ar\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Virtaal 0.7.1\n"
+"X-Generator: Virtaal 1.0.0-beta1\n"
 "&& n%100<=10 ? 3: n%100>=11 ? 4 : 5;\n"
 "X-Project-Style: gnome\n"
 
@@ -210,7 +210,7 @@ msgid ""
 "Configures the maximum level of location accuracy applications are allowed "
 "to see. Valid options are 'off' (disable location tracking), 'country', "
 "'city', 'neighborhood', 'street', and 'exact' (typically requires GPS "
-"receiver). Please keep in mind that this only controls what GeoClue will "
+"receiver). Please keep in mind that this only controls what Geoclue will "
 "allow applications to see and they can find user's location on their own "
 "using network resources (albeit with street-level accuracy at best)."
 msgstr ""
@@ -277,7 +277,7 @@ msgstr "اختر امتدادا لضبطه من القائمة أعلاه."
 #: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:136
 #: ../js/ui/components/polkitAgent.js:166 ../js/ui/endSessionDialog.js:429
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
-#: ../js/ui/status/network.js:878
+#: ../js/ui/status/network.js:883
 msgid "Cancel"
 msgstr "ألغِ"
 
@@ -295,25 +295,25 @@ msgctxt "button"
 msgid "Sign In"
 msgstr "ادخل"
 
-#: ../js/gdm/loginDialog.js:271
+#: ../js/gdm/loginDialog.js:270
 msgid "Choose Session"
 msgstr "أغلق الجلسة"
 
-#: ../js/gdm/loginDialog.js:431
+#: ../js/gdm/loginDialog.js:430
 msgid "Not listed?"
 msgstr "غير مدرج؟"
 
-#: ../js/gdm/loginDialog.js:611
+#: ../js/gdm/loginDialog.js:598
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(مثلا مستخدم أو %s)"
 
-#: ../js/gdm/loginDialog.js:616 ../js/ui/components/networkAgent.js:262
+#: ../js/gdm/loginDialog.js:603 ../js/ui/components/networkAgent.js:262
 #: ../js/ui/components/networkAgent.js:280
 msgid "Username: "
 msgstr "اسم المستخدم: "
 
-#: ../js/gdm/loginDialog.js:917
+#: ../js/gdm/loginDialog.js:868
 msgid "Login Window"
 msgstr "نافذة الولوج"
 
@@ -350,15 +350,15 @@ msgstr "شائعة"
 msgid "All"
 msgstr "الكل"
 
-#: ../js/ui/appDisplay.js:1555
+#: ../js/ui/appDisplay.js:1552
 msgid "New Window"
 msgstr "نافذة جديدة"
 
-#: ../js/ui/appDisplay.js:1577 ../js/ui/dash.js:285
+#: ../js/ui/appDisplay.js:1574 ../js/ui/dash.js:285
 msgid "Remove from Favorites"
 msgstr "أزِل من المفضّلة"
 
-#: ../js/ui/appDisplay.js:1583
+#: ../js/ui/appDisplay.js:1580
 msgid "Add to Favorites"
 msgstr "أضِف إلى المفضّلة"
 
@@ -501,44 +501,44 @@ msgstr "السبت"
 msgid "calendar:MY"
 msgstr ""
 
-#: ../js/ui/calendar.js:450
+#: ../js/ui/calendar.js:446
 msgid "Previous month"
 msgstr "الشهر السابق"
 
-#: ../js/ui/calendar.js:460
+#: ../js/ui/calendar.js:456
 msgid "Next month"
 msgstr "الشهر التالي"
 
 #. Translators: Text to show if there are no events */
-#: ../js/ui/calendar.js:772
+#: ../js/ui/calendar.js:762
 msgid "Nothing Scheduled"
 msgstr "الجدول خال"
 
 #. Translators: Shown on calendar heading when selected day occurs on current year */
-#: ../js/ui/calendar.js:790
+#: ../js/ui/calendar.js:780
 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:793
+#: ../js/ui/calendar.js:783
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A %d %B %Y"
 
-#: ../js/ui/calendar.js:804
+#: ../js/ui/calendar.js:794
 msgid "Today"
 msgstr "اليوم"
 
-#: ../js/ui/calendar.js:808
+#: ../js/ui/calendar.js:798
 msgid "Tomorrow"
 msgstr "غدا"
 
-#: ../js/ui/calendar.js:819
+#: ../js/ui/calendar.js:809
 msgid "This week"
 msgstr "هذا الأسبوع"
 
-#: ../js/ui/calendar.js:827
+#: ../js/ui/calendar.js:817
 msgid "Next week"
 msgstr "الأسبوع القادم"
 
@@ -571,8 +571,8 @@ msgstr "كلمة السرّ:"
 msgid "Type again:"
 msgstr "أدخلها ثانية:"
 
-#: ../js/ui/components/networkAgent.js:131 ../js/ui/status/network.js:240
+#: ../js/ui/components/networkAgent.js:131 ../js/ui/status/network.js:250
-#: ../js/ui/status/network.js:322 ../js/ui/status/network.js:881
+#: ../js/ui/status/network.js:327 ../js/ui/status/network.js:886
 msgid "Connect"
 msgstr "اتصل"
 
@@ -697,7 +697,7 @@ msgstr "%H:%M"
 #. time string in 24h format. i.e. "Yesterday, 14:30" */
 #: ../js/ui/components/telepathyClient.js:962
 msgid "Yesterday, %H∶%M"
-msgstr "بالأمس، %H∶%M"
+msgstr "بالأمس، %H:%M"
 
 #. Translators: this is the week day name followed by a time
 #. string in 24h format. i.e. "Monday, 14:30" */
@@ -717,7 +717,7 @@ msgstr "%d %B، %H:%M"
 #. i.e. "May 25 2012, 14:30" */
 #: ../js/ui/components/telepathyClient.js:982
 msgid "%B %d %Y, %H∶%M"
-msgstr "%d %B، %H:%M"
+msgstr "%d %B %Y، %H:%M"
 
 #. Translators: Time in 24h format */
 #: ../js/ui/components/telepathyClient.js:991
@@ -728,27 +728,27 @@ msgstr "%l:%M %p"
 #. time string in 12h format. i.e. "Yesterday, 2:30 pm" */
 #: ../js/ui/components/telepathyClient.js:998
 msgid "Yesterday, %l∶%M %p"
-msgstr "بالأمس، %l∶%M %p"
+msgstr "بالأمس، %l:%M %p"
 
 #. Translators: this is the week day name followed by a time
 #. string in 12h format. i.e. "Monday, 2:30 pm" */
 #: ../js/ui/components/telepathyClient.js:1005
 msgid "%A, %l∶%M %p"
-msgstr "%l:%M %p"
+msgstr "%A، %l:%M %p"
 
 #. Translators: this is the month name and day number
 #. followed by a time string in 12h format.
 #. i.e. "May 25, 2:30 pm" */
 #: ../js/ui/components/telepathyClient.js:1012
 msgid "%B %d, %l∶%M %p"
-msgstr "%d %B، %H:%M"
+msgstr "%d %B، %l:%M %p"
 
 #. Translators: this is the month name, day number, year
 #. number followed by a time string in 12h format.
 #. i.e. "May 25 2012, 2:30 pm"*/
 #: ../js/ui/components/telepathyClient.js:1018
 msgid "%B %d %Y, %l∶%M %p"
-msgstr "%d %B %Y، %l∶%M %p"
+msgstr "%d %B %Y، %l:%M %p"
 
 #. Translators: this is the other person changing their old IM name to their new
 #. IM name. */
@@ -931,7 +931,7 @@ msgstr "تعذّر الاتصال مع %s"
 msgid "View account"
 msgstr "أظهر الحساب"
 
-#: ../js/ui/components/telepathyClient.js:1439
+#: ../js/ui/components/telepathyClient.js:1434
 msgid "Unknown reason"
 msgstr "السبب غير معروف"
 
@@ -947,22 +947,22 @@ msgstr "أظهر التطبيقات"
 msgid "Dash"
 msgstr "الشريط"
 
-#: ../js/ui/dateMenu.js:91
+#: ../js/ui/dateMenu.js:86
 msgid "Open Calendar"
 msgstr "افتح التقويم"
 
-#: ../js/ui/dateMenu.js:95
+#: ../js/ui/dateMenu.js:90
 msgid "Open Clocks"
 msgstr "افتح الساعات"
 
-#: ../js/ui/dateMenu.js:102
+#: ../js/ui/dateMenu.js:97
 msgid "Date & Time Settings"
 msgstr "إعدادات الوقت و التّاريخ"
 
 #. 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:192
+#: ../js/ui/dateMenu.js:187
 msgid "%A %B %e, %Y"
 msgstr "%A %e %B، %Y"
 
@@ -978,6 +978,7 @@ msgid "Log Out"
 msgstr "خروج"
 
 #: ../js/ui/endSessionDialog.js:69
+#, 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] "سيُخرج %s تلقائيا الآن."
@@ -988,6 +989,7 @@ msgstr[4] "سيُخرج %s تلقائيا بعد %d ثانية."
 msgstr[5] "سيُخرج %s تلقائيا بعد %d ثانية."
 
 #: ../js/ui/endSessionDialog.js:74
+#, 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] "ستُخرج تلقائيا الآن."
@@ -1013,6 +1015,7 @@ msgid "Install Updates & Power Off"
 msgstr "ثبّت التحديثات ثم أطفئ"
 
 #: ../js/ui/endSessionDialog.js:89
+#, 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] "سيُطفأ النظام تلقائيا الآن."
@@ -1043,6 +1046,7 @@ msgid "Restart"
 msgstr "إعادة التشغيل"
 
 #: ../js/ui/endSessionDialog.js:107
+#, javascript-format
 msgid "The system will restart automatically in %d second."
 msgid_plural "The system will restart automatically in %d seconds."
 msgstr[0] "سيُعاد تشغيل النظام تلقائيا الآن."
@@ -1058,6 +1062,7 @@ msgid "Restart & Install Updates"
 msgstr "أعد التشغيل و ثبّت التحديثات"
 
 #: ../js/ui/endSessionDialog.js:123
+#, 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."
@@ -1120,25 +1125,25 @@ msgstr "هل تريد تنزيل و تثبيت ”%s“ من extensions.gnome.o
 msgid "Keyboard"
 msgstr "لوحة المفاتيح"
 
-#: ../js/ui/lookingGlass.js:643
+#: ../js/ui/lookingGlass.js:641
 msgid "No extensions installed"
 msgstr "لا امتدادات مثبّتة"
 
 #. Translators: argument is an extension UUID. */
-#: ../js/ui/lookingGlass.js:697
+#: ../js/ui/lookingGlass.js:695
 #, javascript-format
 msgid "%s has not emitted any errors."
 msgstr "لم يصدر %s أي خطأ."
 
-#: ../js/ui/lookingGlass.js:703
+#: ../js/ui/lookingGlass.js:701
 msgid "Hide Errors"
 msgstr "أخفِ الأخطاء"
 
-#: ../js/ui/lookingGlass.js:707 ../js/ui/lookingGlass.js:767
+#: ../js/ui/lookingGlass.js:705 ../js/ui/lookingGlass.js:765
 msgid "Show Errors"
 msgstr "اظهر الأخطاء"
 
-#: ../js/ui/lookingGlass.js:716
+#: ../js/ui/lookingGlass.js:714
 msgid "Enabled"
 msgstr "مفعّل"
 
@@ -1146,28 +1151,28 @@ msgstr "مفعّل"
 #. because it's disabled by rfkill (airplane mode) */
 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:719 ../js/ui/status/network.js:555
+#: ../js/ui/lookingGlass.js:717 ../js/ui/status/network.js:560
 #: ../src/gvc/gvc-mixer-control.c:1830
 msgid "Disabled"
 msgstr "معطّل"
 
-#: ../js/ui/lookingGlass.js:721
+#: ../js/ui/lookingGlass.js:719
 msgid "Error"
 msgstr "خطأ"
 
-#: ../js/ui/lookingGlass.js:723
+#: ../js/ui/lookingGlass.js:721
 msgid "Out of date"
 msgstr "قديم"
 
-#: ../js/ui/lookingGlass.js:725
+#: ../js/ui/lookingGlass.js:723
 msgid "Downloading"
 msgstr "ينزّل"
 
-#: ../js/ui/lookingGlass.js:749
+#: ../js/ui/lookingGlass.js:747
 msgid "View Source"
 msgstr "اعرض المصدر"
 
-#: ../js/ui/lookingGlass.js:758
+#: ../js/ui/lookingGlass.js:756
 msgid "Web Page"
 msgstr "صفحة الوب"
 
@@ -1203,7 +1208,7 @@ msgstr "لا رسائل"
 msgid "Message Tray"
 msgstr "لوحة الرسائل"
 
-#: ../js/ui/messageTray.js:2962
+#: ../js/ui/messageTray.js:2948
 msgid "System Information"
 msgstr "معلومات النظام"
 
@@ -1213,6 +1218,7 @@ msgid "Unknown"
 msgstr "غير معروف"
 
 #: ../js/ui/overviewControls.js:483 ../js/ui/screenShield.js:151
+#, javascript-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "لا رسائل جديدة"
@@ -1222,11 +1228,11 @@ msgstr[3] "%d رسائل جديدة"
 msgstr[4] "%d رسالة جديدة"
 msgstr[5] "%d رسالة جديدة"
 
-#: ../js/ui/overview.js:84
+#: ../js/ui/overview.js:83
 msgid "Undo"
 msgstr "تراجع"
 
-#: ../js/ui/overview.js:124
+#: ../js/ui/overview.js:123
 msgid "Overview"
 msgstr "نظرة عامة"
 
@@ -1234,7 +1240,7 @@ msgstr "نظرة عامة"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters. */
-#: ../js/ui/overview.js:250
+#: ../js/ui/overview.js:257
 msgid "Type to search…"
 msgstr "اكتب نصا للبحث عنه…"
 
@@ -1271,6 +1277,7 @@ msgid "%A, %B %d"
 msgstr "%A، %d %B"
 
 #: ../js/ui/screenShield.js:153
+#, javascript-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
 msgstr[0] "لا تنبيهات جديدة"
@@ -1280,27 +1287,27 @@ msgstr[3] "%d تنبيهات جديدة"
 msgstr[4] "%d تنبيها جديدا"
 msgstr[5] "%d تنبيه جديد"
 
-#: ../js/ui/screenShield.js:474 ../js/ui/status/system.js:342
+#: ../js/ui/screenShield.js:473 ../js/ui/status/system.js:342
 msgid "Lock"
 msgstr "أوصِد"
 
-#: ../js/ui/screenShield.js:708
+#: ../js/ui/screenShield.js:707
 msgid "GNOME needs to lock the screen"
 msgstr "تحتاج جنوم إلى إيصاد الشاشة"
 
-#: ../js/ui/screenShield.js:835 ../js/ui/screenShield.js:1309
+#: ../js/ui/screenShield.js:834 ../js/ui/screenShield.js:1301
 msgid "Unable to lock"
 msgstr "تعذّر الإيصاد"
 
-#: ../js/ui/screenShield.js:836 ../js/ui/screenShield.js:1310
+#: ../js/ui/screenShield.js:835 ../js/ui/screenShield.js:1302
 msgid "Lock was blocked by an application"
 msgstr "منع تطبيق الإيصاد"
 
-#: ../js/ui/search.js:603
+#: ../js/ui/search.js:589
 msgid "Searching…"
 msgstr "يبحث…"
 
-#: ../js/ui/search.js:646
+#: ../js/ui/search.js:632
 msgid "No results."
 msgstr "لا نتائج."
 
@@ -1372,23 +1379,24 @@ msgstr "تباين عال"
 msgid "Large Text"
 msgstr "نص كبير"
 
-#: ../js/ui/status/bluetooth.js:49
+#: ../js/ui/status/bluetooth.js:48
 msgid "Bluetooth"
 msgstr "بلوتوث"
 
-#: ../js/ui/status/bluetooth.js:51 ../js/ui/status/location.js:60
+#: ../js/ui/status/bluetooth.js:50 ../js/ui/status/location.js:59
-#: ../js/ui/status/location.js:167 ../js/ui/status/network.js:151
+#: ../js/ui/status/location.js:159 ../js/ui/status/network.js:151
-#: ../js/ui/status/network.js:323 ../js/ui/status/network.js:1234
+#: ../js/ui/status/network.js:328 ../js/ui/status/network.js:1235
-#: ../js/ui/status/network.js:1345 ../js/ui/status/rfkill.js:85
+#: ../js/ui/status/network.js:1346 ../js/ui/status/rfkill.js:85
 #: ../js/ui/status/rfkill.js:105
 msgid "Turn Off"
 msgstr "أوقف"
 
-#: ../js/ui/status/bluetooth.js:54
+#: ../js/ui/status/bluetooth.js:53
 msgid "Bluetooth Settings"
 msgstr "إعدادات بلوتوث"
 
-#: ../js/ui/status/bluetooth.js:104
+#: ../js/ui/status/bluetooth.js:100
+#, javascript-format
 msgid "%d Connected Device"
 msgid_plural "%d Connected Devices"
 msgstr[0] "لا أجهزة موصّلة"
@@ -1398,7 +1406,7 @@ msgstr[3] "%d أجهزة موصّلة"
 msgstr[4] "%d جهازًا موصّلا"
 msgstr[5] "%d جهاز موصّل"
 
-#: ../js/ui/status/bluetooth.js:106 ../js/ui/status/network.js:1262
+#: ../js/ui/status/bluetooth.js:102 ../js/ui/status/network.js:1263
 msgid "Not Connected"
 msgstr "غير متّصل"
 
@@ -1410,21 +1418,21 @@ msgstr "السطوع"
 msgid "Show Keyboard Layout"
 msgstr "أظهر تخطيط لوحة المفاتيح"
 
-#: ../js/ui/status/location.js:53
+#: ../js/ui/status/location.js:52
 msgid "Location"
 msgstr "المكان"
 
-#: ../js/ui/status/location.js:59 ../js/ui/status/location.js:166
+#: ../js/ui/status/location.js:58 ../js/ui/status/location.js:158
 #: ../js/ui/status/rfkill.js:84
 msgid "On"
 msgstr "مفعّل"
 
-#: ../js/ui/status/location.js:163 ../js/ui/status/network.js:420
+#: ../js/ui/status/location.js:155 ../js/ui/status/network.js:246
-#: ../js/ui/status/network.js:1260 ../js/ui/status/network.js:1464
+#: ../js/ui/status/network.js:425 ../js/ui/status/network.js:1261
 msgid "Off"
 msgstr "مغلق"
 
-#: ../js/ui/status/location.js:164 ../js/ui/status/network.js:1234
+#: ../js/ui/status/location.js:156 ../js/ui/status/network.js:1235
 msgid "Turn On"
 msgstr "شغّل"
 
@@ -1432,138 +1440,134 @@ msgstr "شغّل"
 msgid "<unknown>"
 msgstr "<غير معروفة>"
 
-#: ../js/ui/status/network.js:422
-msgid "Connected"
-msgstr "مُتصل"
-
 #. 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:426
+#: ../js/ui/status/network.js:431
 msgid "unmanaged"
 msgstr "غير مُدار"
 
-#: ../js/ui/status/network.js:428
+#: ../js/ui/status/network.js:433
 msgid "disconnecting..."
 msgstr "يقطع الاتّصال..."
 
-#: ../js/ui/status/network.js:434 ../js/ui/status/network.js:1362
+#: ../js/ui/status/network.js:439 ../js/ui/status/network.js:1363
 msgid "connecting..."
 msgstr "يتّصل..."
 
 #. Translators: this is for network connections that require some kind of key or password */
-#: ../js/ui/status/network.js:437 ../js/ui/status/network.js:1365
+#: ../js/ui/status/network.js:442 ../js/ui/status/network.js:1366
 msgid "authentication required"
 msgstr "الاستيثاق مطلوب"
 
 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing */
-#: ../js/ui/status/network.js:445
+#: ../js/ui/status/network.js:450
 msgid "firmware missing"
 msgstr "البرمجية الثابتة (Firmware) غير موجودة"
 
 #. 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:449
+#: ../js/ui/status/network.js:454
 msgid "unavailable"
 msgstr "غير متاح"
 
-#: ../js/ui/status/network.js:451 ../js/ui/status/network.js:1367
+#: ../js/ui/status/network.js:456 ../js/ui/status/network.js:1368
 msgid "connection failed"
 msgstr "فشل الاتصال"
 
-#: ../js/ui/status/network.js:467
+#: ../js/ui/status/network.js:472
 msgid "Wired Settings"
 msgstr "إعدادات الاتصال السلكي"
 
-#: ../js/ui/status/network.js:509 ../js/ui/status/network.js:587
+#: ../js/ui/status/network.js:514 ../js/ui/status/network.js:592
 msgid "Mobile Broadband Settings"
 msgstr "إعدادات شبكة الهاتف المحمول"
 
-#: ../js/ui/status/network.js:551 ../js/ui/status/network.js:1258
+#: ../js/ui/status/network.js:556 ../js/ui/status/network.js:1259
 msgid "Hardware Disabled"
 msgstr "العتاد مُعَطَّل"
 
-#: ../js/ui/status/network.js:595
+#: ../js/ui/status/network.js:600
 msgid "Use as Internet connection"
 msgstr "استخدمه اتّصالًا بالإنترنت"
 
-#: ../js/ui/status/network.js:776
+#: ../js/ui/status/network.js:781
 msgid "Airplane Mode is On"
 msgstr "وضع الطائرة مُفعّل"
 
-#: ../js/ui/status/network.js:777
+#: ../js/ui/status/network.js:782
 msgid "Wi-Fi is disabled when airplane mode is on."
 msgstr "الاتصال اللاسلكي مُعطّل في وضع الطائرة."
 
-#: ../js/ui/status/network.js:778
+#: ../js/ui/status/network.js:783
 msgid "Turn Off Airplane Mode"
 msgstr "عطّل وضع الطائرة"
 
-#: ../js/ui/status/network.js:787
+#: ../js/ui/status/network.js:792
 msgid "Wi-Fi is Off"
 msgstr "الاتصال اللاسلكي مغلق"
 
-#: ../js/ui/status/network.js:788
+#: ../js/ui/status/network.js:793
 msgid "Wi-Fi needs to be turned on in order to connect to a network."
 msgstr "تحتاج إلى تشغيل الاتصال اللاسلكي للاتصال بالشبكة."
 
-#: ../js/ui/status/network.js:789
+#: ../js/ui/status/network.js:794
 msgid "Turn On Wi-Fi"
 msgstr "شغّل الاتصال اللاسلكي"
 
-#: ../js/ui/status/network.js:814
+#: ../js/ui/status/network.js:819
 msgid "Wi-Fi Networks"
 msgstr "الشبكات اللاسلكية"
 
-#: ../js/ui/status/network.js:816
+#: ../js/ui/status/network.js:821
 msgid "Select a network"
 msgstr "اختر شبكة"
 
-#: ../js/ui/status/network.js:845
+#: ../js/ui/status/network.js:850
 msgid "No Networks"
 msgstr "لا شبكات"
 
-#: ../js/ui/status/network.js:866 ../js/ui/status/rfkill.js:103
+#: ../js/ui/status/network.js:871 ../js/ui/status/rfkill.js:103
 msgid "Use hardware switch to turn off"
 msgstr "استخدم زر العتاد للإغلاق"
 
-#: ../js/ui/status/network.js:1136
+#: ../js/ui/status/network.js:1141
 msgid "Select Network"
 msgstr "اختر شبكة"
 
-#: ../js/ui/status/network.js:1142
+#: ../js/ui/status/network.js:1147
 msgid "Wi-Fi Settings"
 msgstr "إعدادات الاتصال اللاسلكي"
 
-#: ../js/ui/status/network.js:1251
+#: ../js/ui/status/network.js:1252
 msgid "Hotspot Active"
 msgstr "نقطة الاتصال نشطة"
 
-#: ../js/ui/status/network.js:1254
+#: ../js/ui/status/network.js:1255
 msgid "Connecting"
 msgstr "يتّصل"
 
-#: ../js/ui/status/network.js:1433 ../js/ui/status/rfkill.js:88
+#: ../js/ui/status/network.js:1434 ../js/ui/status/rfkill.js:88
 msgid "Network Settings"
 msgstr "إعدادات الشّبكة"
 
-#: ../js/ui/status/network.js:1435
+#: ../js/ui/status/network.js:1436
 msgid "VPN Settings"
 msgstr "إعدادات ش‌خ‌ف (VPN)"
 
-#: ../js/ui/status/network.js:1454
+#: ../js/ui/status/network.js:1455
 msgid "VPN"
 msgstr "ش‌خ‌ف (VPN)"
 
-#: ../js/ui/status/network.js:1607
+#: ../js/ui/status/network.js:1598
 msgid "Network Manager"
 msgstr "مدير الشبكة"
 
-#: ../js/ui/status/network.js:1646
+#: ../js/ui/status/network.js:1637
 msgid "Connection failed"
 msgstr "فشل الاتصال"
 
-#: ../js/ui/status/network.js:1647
+#: ../js/ui/status/network.js:1638
 msgid "Activation of network connection failed"
 msgstr "فشل تفعيل اتصال الشبكة"
 
@@ -1582,12 +1586,12 @@ msgstr "يَحسِب…"
 #: ../js/ui/status/power.js:86
 #, javascript-format
 msgid "%d∶%02d Remaining (%d%%)"
-msgstr "بقي %d∶%02d ‏(%d%%)"
+msgstr "بقي %d:%02d ‏(%d%%)"
 
 #: ../js/ui/status/power.js:91
 #, javascript-format
 msgid "%d∶%02d Until Full (%d%%)"
-msgstr "بقي على الاكتمال %d∶%02d ‏(%d%%)"
+msgstr "بقي على الاكتمال %d:%02d ‏(%d%%)"
 
 #: ../js/ui/status/power.js:119
 msgid "UPS"
@@ -1670,6 +1674,7 @@ msgid "Keep Changes"
 msgstr "أبق على التغييرات"
 
 #: ../js/ui/windowManager.js:97
+#, javascript-format
 msgid "Settings changes will revert in %d second"
 msgid_plural "Settings changes will revert in %d seconds"
 msgstr[0] "سيُتراجع عن التغييرات الآن"
@@ -1746,35 +1751,6 @@ msgstr "لا يمكن أن تكون كلمة السرّ فارغة"
 msgid "Authentication dialog was dismissed by the user"
 msgstr "أغلق المستخدم مربع الاستيثاق الحِواري"
 
-#~ msgctxt "event list time"
-#~ msgid "%H\\u2236%M"
-#~ msgstr "%H:%M"
-
-#~ msgctxt "event list time"
-#~ msgid "%l\\u2236%M\\u2009%p"
-#~ msgstr "%l:%M\\u2009%p"
-
-#~ msgid "%H\\u2236%M"
-#~ msgstr "%H\\u2236%M"
-
-#~ msgid "%A, %H\\u2236%M"
-#~ msgstr "%A، %H\\u2236%M"
-
-#~ msgid "%B %d, %H\\u2236%M"
-#~ msgstr "%d %B، %H\\u2236%M"
-
-#~ msgid "%B %d %Y, %H\\u2236%M"
-#~ msgstr "%d %B %Y، %H\\u2236%M"
-
-#~ msgid "%l\\u2236%M %p"
-#~ msgstr "%H\\u2236%M"
-
-#~ msgid "%A, %l\\u2236%M %p"
-#~ msgstr "%A، %l\\u2236%M %p"
-
-#~ msgid "%B %d, %l\\u2236%M %p"
-#~ msgstr "%d %B، %l\\u2236%M %p"
-
 #~ msgid "<b>%A</b>, <b>%H:%M</b>"
 #~ msgstr "<b>%A</b>، <b>%H:%M</b>"
 
@@ -1784,6 +1760,14 @@ msgstr "أغلق المستخدم مربع الاستيثاق الحِواري"
 #~ msgid "<b>%B</b> <b>%d</b> <b>%Y</b>, <b>%H:%M</b> "
 #~ msgstr "<b>%d</b> <b>%B</b> <b>%Y</b>، <b>%H:%M</b> "
 
+#~ msgctxt "event list time"
+#~ msgid "%H\\u2236%M"
+#~ msgstr "%H:%M"
+
+#~ msgctxt "event list time"
+#~ msgid "%l\\u2236%M\\u2009%p"
+#~ msgstr "%l:%M\\u2009%p"
+
 #~ msgid "Settings Menu"
 #~ msgstr "قائمة الإعدادات"
 

po/cs.po

@@ -12,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: 2014-03-27 20:52+0000\n"
+"POT-Creation-Date: 2014-03-06 08:32+0000\n"
-"PO-Revision-Date: 2014-03-27 22:15+0100\n"
+"PO-Revision-Date: 2014-02-22 08:50+0100\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
@@ -310,7 +310,7 @@ msgstr ""
 #: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:136
 #: ../js/ui/components/polkitAgent.js:166 ../js/ui/endSessionDialog.js:429
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
-#: ../js/ui/status/network.js:878
+#: ../js/ui/status/network.js:873
 msgid "Cancel"
 msgstr "Zrušit"
 
@@ -328,25 +328,25 @@ msgctxt "button"
 msgid "Sign In"
 msgstr "Přihlásit se"
 
-#: ../js/gdm/loginDialog.js:271
+#: ../js/gdm/loginDialog.js:270
 msgid "Choose Session"
 msgstr "Vybrat sezení"
 
-#: ../js/gdm/loginDialog.js:431
+#: ../js/gdm/loginDialog.js:430
 msgid "Not listed?"
 msgstr "Nejste na seznamu?"
 
-#: ../js/gdm/loginDialog.js:611
+#: ../js/gdm/loginDialog.js:598
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(např. uživatel nebo %s)"
 
-#: ../js/gdm/loginDialog.js:616 ../js/ui/components/networkAgent.js:262
+#: ../js/gdm/loginDialog.js:603 ../js/ui/components/networkAgent.js:262
 #: ../js/ui/components/networkAgent.js:280
 msgid "Username: "
 msgstr "Uživatelské jméno: "
 
-#: ../js/gdm/loginDialog.js:917
+#: ../js/gdm/loginDialog.js:868
 msgid "Login Window"
 msgstr "Přihlašovací okno"
 
@@ -371,27 +371,27 @@ msgstr "Nelze analyzovat příkaz:"
 msgid "Execution of “%s” failed:"
 msgstr "Vykonání „%s“ selhalo:"
 
-#: ../js/ui/appDisplay.js:636
+#: ../js/ui/appDisplay.js:629
 msgid "Frequently used applications will appear here"
 msgstr "Zde se objeví často používané aplikace"
 
-#: ../js/ui/appDisplay.js:747
+#: ../js/ui/appDisplay.js:740
 msgid "Frequent"
 msgstr "Časté"
 
-#: ../js/ui/appDisplay.js:754
+#: ../js/ui/appDisplay.js:747
 msgid "All"
 msgstr "Všechny"
 
-#: ../js/ui/appDisplay.js:1566
+#: ../js/ui/appDisplay.js:1552
 msgid "New Window"
 msgstr "Nové okno"
 
-#: ../js/ui/appDisplay.js:1588 ../js/ui/dash.js:285
+#: ../js/ui/appDisplay.js:1574 ../js/ui/dash.js:285
 msgid "Remove from Favorites"
 msgstr "Odstranit z oblíbených"
 
-#: ../js/ui/appDisplay.js:1594
+#: ../js/ui/appDisplay.js:1580
 msgid "Add to Favorites"
 msgstr "Přidat mezi oblíbené"
 
@@ -427,7 +427,7 @@ msgstr "Celý den"
 #: ../js/ui/calendar.js:70
 msgctxt "event list time"
 msgid "%H∶%M"
-msgstr "%k∶%M"
+msgstr "%H∶%M"
 
 #. Translators: Shown in calendar event list, if 12h format,
 #. \u2236 is a ratio character, similar to : and \u2009 is
@@ -534,44 +534,44 @@ msgstr "So"
 msgid "calendar:MY"
 msgstr "calendar:MY"
 
-#: ../js/ui/calendar.js:450
+#: ../js/ui/calendar.js:446
 msgid "Previous month"
 msgstr "Předchozí měsíc"
 
-#: ../js/ui/calendar.js:460
+#: ../js/ui/calendar.js:456
 msgid "Next month"
 msgstr "Následující měsíc"
 
 #. Translators: Text to show if there are no events */
-#: ../js/ui/calendar.js:772
+#: ../js/ui/calendar.js:763
 msgid "Nothing Scheduled"
 msgstr "Nic nenaplánováno"
 
 #. Translators: Shown on calendar heading when selected day occurs on current year */
-#: ../js/ui/calendar.js:790
+#: ../js/ui/calendar.js:781
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %e. %B"
 
 #. Translators: Shown on calendar heading when selected day occurs on different year */
-#: ../js/ui/calendar.js:793
+#: ../js/ui/calendar.js:784
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %e. %B %Y"
 
-#: ../js/ui/calendar.js:804
+#: ../js/ui/calendar.js:795
 msgid "Today"
 msgstr "Dnes"
 
-#: ../js/ui/calendar.js:808
+#: ../js/ui/calendar.js:799
 msgid "Tomorrow"
 msgstr "Zítra"
 
-#: ../js/ui/calendar.js:819
+#: ../js/ui/calendar.js:810
 msgid "This week"
 msgstr "Tento týden"
 
-#: ../js/ui/calendar.js:827
+#: ../js/ui/calendar.js:818
 msgid "Next week"
 msgstr "Následující týden"
 
@@ -605,7 +605,7 @@ msgid "Type again:"
 msgstr "Napište znovu:"
 
 #: ../js/ui/components/networkAgent.js:131 ../js/ui/status/network.js:240
-#: ../js/ui/status/network.js:322 ../js/ui/status/network.js:881
+#: ../js/ui/status/network.js:317 ../js/ui/status/network.js:876
 msgid "Connect"
 msgstr "Připojit"
 
@@ -726,33 +726,33 @@ msgstr "Ztlumit"
 #. Translators: Time in 24h format */
 #: ../js/ui/components/telepathyClient.js:955
 msgid "%H∶%M"
-msgstr "%k∶%M"
+msgstr "%H∶%M"
 
 #. Translators: this is the word "Yesterday" followed by a
 #. time string in 24h format. i.e. "Yesterday, 14:30" */
 #: ../js/ui/components/telepathyClient.js:962
 msgid "Yesterday, %H∶%M"
-msgstr "včera, %k∶%M"
+msgstr "včera, %H∶%M"
 
 #. Translators: this is the week day name followed by a time
 #. string in 24h format. i.e. "Monday, 14:30" */
 #: ../js/ui/components/telepathyClient.js:969
 msgid "%A, %H∶%M"
-msgstr "%A, %k∶%M"
+msgstr "%A, %H∶%M"
 
 #. Translators: this is the month name and day number
 #. followed by a time string in 24h format.
 #. i.e. "May 25, 14:30" */
 #: ../js/ui/components/telepathyClient.js:976
 msgid "%B %d, %H∶%M"
-msgstr "%e. %B %k∶%M"
+msgstr "%e. %B %H∶%M"
 
 #. Translators: this is the month name, day number, year
 #. number followed by a time string in 24h format.
 #. i.e. "May 25 2012, 14:30" */
 #: ../js/ui/components/telepathyClient.js:982
 msgid "%B %d %Y, %H∶%M"
-msgstr "%e. %B %Y, %k∶%M"
+msgstr "%e. %B %Y, %H∶%M"
 
 #. Translators: Time in 24h format */
 #: ../js/ui/components/telepathyClient.js:991
@@ -968,7 +968,7 @@ msgstr "Nelze se připojit k „%s“"
 msgid "View account"
 msgstr "Zobrazit účet"
 
-#: ../js/ui/components/telepathyClient.js:1439
+#: ../js/ui/components/telepathyClient.js:1434
 msgid "Unknown reason"
 msgstr "Neznámý důvod"
 
@@ -1155,26 +1155,25 @@ msgstr "Stáhnout a nainstalovat „%s“ z extensions.gnome.org?"
 msgid "Keyboard"
 msgstr "Klávesnice"
 
-#: ../js/ui/lookingGlass.js:643
+#: ../js/ui/lookingGlass.js:641
 msgid "No extensions installed"
 msgstr "Nejsou nainstalována žádná rozšíření"
 
 #. Translators: argument is an extension UUID. */
-#: ../js/ui/lookingGlass.js:697
+#: ../js/ui/lookingGlass.js:695
 #, javascript-format
 msgid "%s has not emitted any errors."
 msgstr "Rozšíření %s nevyvolalo žádné chyby."
 
-#: ../js/ui/lookingGlass.js:703
+#: ../js/ui/lookingGlass.js:701
 msgid "Hide Errors"
 msgstr "Skrývat chyby"
 
-#: ../js/ui/lookingGlass.js:707 ../js/ui/lookingGlass.js:767
+#: ../js/ui/lookingGlass.js:705 ../js/ui/lookingGlass.js:765
 msgid "Show Errors"
 msgstr "Zobrazovat chyby"
 
-#: ../js/ui/lookingGlass.js:716 ../js/ui/status/location.js:59
+#: ../js/ui/lookingGlass.js:714
-#: ../js/ui/status/location.js:167
 msgid "Enabled"
 msgstr "Povoleno"
 
@@ -1182,28 +1181,28 @@ msgstr "Povoleno"
 #. because it's disabled by rfkill (airplane mode) */
 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:719 ../js/ui/status/location.js:164
+#: ../js/ui/lookingGlass.js:717 ../js/ui/status/network.js:550
-#: ../js/ui/status/network.js:555 ../src/gvc/gvc-mixer-control.c:1830
+#: ../src/gvc/gvc-mixer-control.c:1830
 msgid "Disabled"
 msgstr "Zakázáno"
 
-#: ../js/ui/lookingGlass.js:721
+#: ../js/ui/lookingGlass.js:719
 msgid "Error"
 msgstr "Chyba"
 
-#: ../js/ui/lookingGlass.js:723
+#: ../js/ui/lookingGlass.js:721
 msgid "Out of date"
 msgstr "Neaktuální"
 
-#: ../js/ui/lookingGlass.js:725
+#: ../js/ui/lookingGlass.js:723
 msgid "Downloading"
 msgstr "Stahování"
 
-#: ../js/ui/lookingGlass.js:749
+#: ../js/ui/lookingGlass.js:747
 msgid "View Source"
 msgstr "Zobrazit zdroj"
 
-#: ../js/ui/lookingGlass.js:758
+#: ../js/ui/lookingGlass.js:756
 msgid "Web Page"
 msgstr "Webová stránka"
 
@@ -1239,7 +1238,7 @@ msgstr "Žádné zprávy"
 msgid "Message Tray"
 msgstr "Lišta zpráv"
 
-#: ../js/ui/messageTray.js:2962
+#: ../js/ui/messageTray.js:2948
 msgid "System Information"
 msgstr "Informace o systému"
 
@@ -1256,11 +1255,11 @@ msgstr[0] "%d nová zpráva"
 msgstr[1] "%d nové zprávy"
 msgstr[2] "%d nových zpráv"
 
-#: ../js/ui/overview.js:84
+#: ../js/ui/overview.js:83
 msgid "Undo"
 msgstr "Zpět"
 
-#: ../js/ui/overview.js:124
+#: ../js/ui/overview.js:123
 msgid "Overview"
 msgstr "Přehled"
 
@@ -1268,7 +1267,7 @@ msgstr "Přehled"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters. */
-#: ../js/ui/overview.js:250
+#: ../js/ui/overview.js:257
 msgid "Type to search…"
 msgstr "Vyhledávejte psaním…"
 
@@ -1312,27 +1311,27 @@ msgstr[0] "%d nové upozornění"
 msgstr[1] "%d nová upozornění"
 msgstr[2] "%d nových upozornění"
 
-#: ../js/ui/screenShield.js:474 ../js/ui/status/system.js:342
+#: ../js/ui/screenShield.js:473 ../js/ui/status/system.js:342
 msgid "Lock"
 msgstr "Uzamknout"
 
-#: ../js/ui/screenShield.js:708
+#: ../js/ui/screenShield.js:707
 msgid "GNOME needs to lock the screen"
 msgstr "GNOME potřebuje uzamknout obrazovku"
 
-#: ../js/ui/screenShield.js:835 ../js/ui/screenShield.js:1309
+#: ../js/ui/screenShield.js:834 ../js/ui/screenShield.js:1301
 msgid "Unable to lock"
 msgstr "Nelze uzamknout obrazovku"
 
-#: ../js/ui/screenShield.js:836 ../js/ui/screenShield.js:1310
+#: ../js/ui/screenShield.js:835 ../js/ui/screenShield.js:1302
 msgid "Lock was blocked by an application"
 msgstr "Zamknutí bylo zablokováno některou z aplikací"
 
-#: ../js/ui/search.js:603
+#: ../js/ui/search.js:589
 msgid "Searching…"
 msgstr "Hledá se…"
 
-#: ../js/ui/search.js:649
+#: ../js/ui/search.js:632
 msgid "No results."
 msgstr "Žádné výsledky."
 
@@ -1404,22 +1403,23 @@ msgstr "Vysoký kontrast"
 msgid "Large Text"
 msgstr "Styl velkého textu"
 
-#: ../js/ui/status/bluetooth.js:49
+#: ../js/ui/status/bluetooth.js:48
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../js/ui/status/bluetooth.js:51 ../js/ui/status/network.js:151
+#: ../js/ui/status/bluetooth.js:50 ../js/ui/status/location.js:59
-#: ../js/ui/status/network.js:323 ../js/ui/status/network.js:1234
+#: ../js/ui/status/location.js:159 ../js/ui/status/network.js:151
-#: ../js/ui/status/network.js:1345 ../js/ui/status/rfkill.js:85
+#: ../js/ui/status/network.js:318 ../js/ui/status/network.js:1225
+#: ../js/ui/status/network.js:1336 ../js/ui/status/rfkill.js:85
 #: ../js/ui/status/rfkill.js:105
 msgid "Turn Off"
 msgstr "Vypnout"
 
-#: ../js/ui/status/bluetooth.js:54
+#: ../js/ui/status/bluetooth.js:53
 msgid "Bluetooth Settings"
 msgstr "Nastavení Bluetooth"
 
-#: ../js/ui/status/bluetooth.js:104
+#: ../js/ui/status/bluetooth.js:100
 #, javascript-format
 msgid "%d Connected Device"
 msgid_plural "%d Connected Devices"
@@ -1427,7 +1427,7 @@ msgstr[0] "%d připojené zařízení"
 msgstr[1] "%d připojená zařízení"
 msgstr[2] "%d připojených zařízení"
 
-#: ../js/ui/status/bluetooth.js:106 ../js/ui/status/network.js:1262
+#: ../js/ui/status/bluetooth.js:102 ../js/ui/status/network.js:1253
 msgid "Not Connected"
 msgstr "Nepřipojeno"
 
@@ -1439,167 +1439,160 @@ msgstr "Jas"
 msgid "Show Keyboard Layout"
 msgstr "Zobrazit rozložení klávesnice"
 
-#: ../js/ui/status/location.js:53
+#: ../js/ui/status/location.js:52
 msgid "Location"
 msgstr "Poloha"
 
-#: ../js/ui/status/location.js:60 ../js/ui/status/location.js:168
+#: ../js/ui/status/location.js:58 ../js/ui/status/location.js:158
-msgid "Disable"
+#: ../js/ui/status/rfkill.js:84
-msgstr "Zakázáno"
+msgid "On"
+msgstr "Zapnuto"
 
-#: ../js/ui/status/location.js:165
+#: ../js/ui/status/location.js:155 ../js/ui/status/network.js:415
-msgid "Enable"
+#: ../js/ui/status/network.js:1251 ../js/ui/status/network.js:1455
-msgstr "Povoleno"
+msgid "Off"
+msgstr "Vypnuto"
 
-#: ../js/ui/status/location.js:167
+#: ../js/ui/status/location.js:156 ../js/ui/status/network.js:1225
-msgid "In Use"
+msgid "Turn On"
-msgstr "Používá se"
+msgstr "Zapnout"
 
 #: ../js/ui/status/network.js:74
 msgid "<unknown>"
 msgstr "<neznámé>"
 
-#: ../js/ui/status/network.js:420 ../js/ui/status/network.js:1260
+#: ../js/ui/status/network.js:417
-#: ../js/ui/status/network.js:1464
-msgid "Off"
-msgstr "Vypnuto"
-
-#: ../js/ui/status/network.js:422
 msgid "Connected"
 msgstr "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:426
+#: ../js/ui/status/network.js:421
 msgid "unmanaged"
 msgstr "nespravováno"
 
-#: ../js/ui/status/network.js:428
+#: ../js/ui/status/network.js:423
 msgid "disconnecting..."
 msgstr "odpojování…"
 
-#: ../js/ui/status/network.js:434 ../js/ui/status/network.js:1362
+#: ../js/ui/status/network.js:429 ../js/ui/status/network.js:1353
 msgid "connecting..."
 msgstr "připojování…"
 
 #. Translators: this is for network connections that require some kind of key or password */
-#: ../js/ui/status/network.js:437 ../js/ui/status/network.js:1365
+#: ../js/ui/status/network.js:432 ../js/ui/status/network.js:1356
 msgid "authentication required"
 msgstr "je vyžadováno ověření"
 
 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing */
-#: ../js/ui/status/network.js:445
+#: ../js/ui/status/network.js:440
 msgid "firmware missing"
 msgstr "nedostupný firmware"
 
 #. 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:449
+#: ../js/ui/status/network.js:444
 msgid "unavailable"
 msgstr "nedostupné"
 
-#: ../js/ui/status/network.js:451 ../js/ui/status/network.js:1367
+#: ../js/ui/status/network.js:446 ../js/ui/status/network.js:1358
 msgid "connection failed"
 msgstr "připojení selhalo"
 
-#: ../js/ui/status/network.js:467
+#: ../js/ui/status/network.js:462
 msgid "Wired Settings"
 msgstr "Nastavení připojení po drátu"
 
-#: ../js/ui/status/network.js:509 ../js/ui/status/network.js:587
+#: ../js/ui/status/network.js:504 ../js/ui/status/network.js:582
 msgid "Mobile Broadband Settings"
 msgstr "Nastavení mobilní širokopásmové sítě"
 
-#: ../js/ui/status/network.js:551 ../js/ui/status/network.js:1258
+#: ../js/ui/status/network.js:546 ../js/ui/status/network.js:1249
 msgid "Hardware Disabled"
 msgstr "Hardware zakázán"
 
-#: ../js/ui/status/network.js:595
+#: ../js/ui/status/network.js:590
 msgid "Use as Internet connection"
 msgstr "Použít jako připojení k Internetu"
 
-#: ../js/ui/status/network.js:776
+#: ../js/ui/status/network.js:771
 msgid "Airplane Mode is On"
 msgstr "Režim „letadlo“ je zapnutý"
 
-#: ../js/ui/status/network.js:777
+#: ../js/ui/status/network.js:772
 msgid "Wi-Fi is disabled when airplane mode is on."
 msgstr "Když je zapnutý režim „letadlo“, je WiFi zakázána."
 
-#: ../js/ui/status/network.js:778
+#: ../js/ui/status/network.js:773
 msgid "Turn Off Airplane Mode"
 msgstr "Vypnout režim „letadlo“"
 
-#: ../js/ui/status/network.js:787
+#: ../js/ui/status/network.js:782
 msgid "Wi-Fi is Off"
 msgstr "WiFi je vypnutá"
 
-#: ../js/ui/status/network.js:788
+#: ../js/ui/status/network.js:783
 msgid "Wi-Fi needs to be turned on in order to connect to a network."
 msgstr "Abyste se připojili k síti, je zapotřebí zapnout WiFi."
 
-#: ../js/ui/status/network.js:789
+#: ../js/ui/status/network.js:784
 msgid "Turn On Wi-Fi"
 msgstr "Zapnout WiFi"
 
-#: ../js/ui/status/network.js:814
+#: ../js/ui/status/network.js:809
 msgid "Wi-Fi Networks"
 msgstr "Sítě WiFi"
 
-#: ../js/ui/status/network.js:816
+#: ../js/ui/status/network.js:811
 msgid "Select a network"
 msgstr "Vyberte síť"
 
-#: ../js/ui/status/network.js:845
+#: ../js/ui/status/network.js:840
 msgid "No Networks"
 msgstr "Žádné sítě"
 
-#: ../js/ui/status/network.js:866 ../js/ui/status/rfkill.js:103
+#: ../js/ui/status/network.js:861 ../js/ui/status/rfkill.js:103
 msgid "Use hardware switch to turn off"
 msgstr "K vypnutí použijte fyzický vypínač"
 
-#: ../js/ui/status/network.js:1136
+#: ../js/ui/status/network.js:1131
 msgid "Select Network"
 msgstr "Vybrat síť"
 
-#: ../js/ui/status/network.js:1142
+#: ../js/ui/status/network.js:1137
 msgid "Wi-Fi Settings"
 msgstr "Nastavení WiFi"
 
-#: ../js/ui/status/network.js:1234
+#: ../js/ui/status/network.js:1242
-msgid "Turn On"
-msgstr "Zapnout"
-
-#: ../js/ui/status/network.js:1251
 msgid "Hotspot Active"
 msgstr "Hotspot aktivní"
 
-#: ../js/ui/status/network.js:1254
+#: ../js/ui/status/network.js:1245
 msgid "Connecting"
 msgstr "Připojuje se…"
 
-#: ../js/ui/status/network.js:1433 ../js/ui/status/rfkill.js:88
+#: ../js/ui/status/network.js:1424 ../js/ui/status/rfkill.js:88
 msgid "Network Settings"
 msgstr "Nastavení sítě"
 
-#: ../js/ui/status/network.js:1435
+#: ../js/ui/status/network.js:1426
 msgid "VPN Settings"
 msgstr "Nastavení VPN"
 
-#: ../js/ui/status/network.js:1454
+#: ../js/ui/status/network.js:1445
 msgid "VPN"
 msgstr "VPN"
 
-#: ../js/ui/status/network.js:1607
+#: ../js/ui/status/network.js:1598
 msgid "Network Manager"
 msgstr "Network Manager"
 
-#: ../js/ui/status/network.js:1646
+#: ../js/ui/status/network.js:1637
 msgid "Connection failed"
 msgstr "Připojení selhalo"
 
-#: ../js/ui/status/network.js:1647
+#: ../js/ui/status/network.js:1638
 msgid "Activation of network connection failed"
 msgstr "Aktivace síťového připojení selhala"
 
@@ -1637,10 +1630,6 @@ msgstr "Baterie"
 msgid "Airplane Mode"
 msgstr "Režim „letadlo“"
 
-#: ../js/ui/status/rfkill.js:84
-msgid "On"
-msgstr "Zapnuto"
-
 #: ../js/ui/status/system.js:314
 msgid "Switch User"
 msgstr "Přepnout uživatele"

po/el.po

@@ -7,8 +7,8 @@ msgstr ""
 "Project-Id-Version: gnome-shell.po.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: 2014-03-27 21:19+0000\n"
+"POT-Creation-Date: 2014-02-19 23:39+0000\n"
-"PO-Revision-Date: 2014-03-28 08:41+0300\n"
+"PO-Revision-Date: 2014-02-20 08:18+0300\n"
 "Last-Translator: Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>\n"
 "Language-Team: team@lists.gnome.gr\n"
 "Language: el\n"
@@ -47,7 +47,7 @@ msgstr "Άνοιγμα του μενού εφαρμογών"
 
 #: ../data/gnome-shell.desktop.in.in.h:1
 msgid "GNOME Shell"
-msgstr "Κέλυφος GNOME Shell"
+msgstr "GNOME Shell"
 
 #: ../data/gnome-shell.desktop.in.in.h:2
 #: ../data/gnome-shell-wayland.desktop.in.in.h:2
@@ -57,21 +57,21 @@ msgstr "Διαχείριση παραθύρων και εκκίνηση εφαρ
 #: ../data/gnome-shell-extension-prefs.desktop.in.in.h:1
 #: ../js/extensionPrefs/main.js:155
 msgid "GNOME Shell Extension Preferences"
-msgstr "Προτιμήσεις επεκτάσεων του κελύφους GNOME Shell"
+msgstr "Προτιμήσεις επεκτάσεων του GNOME Shell"
 
 #: ../data/gnome-shell-extension-prefs.desktop.in.in.h:2
 msgid "Configure GNOME Shell Extensions"
-msgstr "Ρύθμιση επεκτάσεων του κελύφους GNOME Shell"
+msgstr "Ρύθμιση επεκτάσεων του GNOME Shell"
 
 #: ../data/gnome-shell-wayland.desktop.in.in.h:1
 msgid "GNOME Shell (wayland compositor)"
-msgstr "Κέλυφος GNOME Shell (συνθετητής wayland)"
+msgstr "GNOME Shell (συνθετητής wayland)"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:1
 msgid "Enable internal tools useful for developers and testers from Alt-F2"
 msgstr ""
 "Ενεργοποίηση εσωτερικών εργαλείων χρήσιμων για τους προγραμματιστές και τους "
-"δοκιμαστές, με το Alt-F2"
+"δοκιμαστές με το Alt-F2"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:2
 msgid ""
@@ -79,7 +79,7 @@ msgid ""
 "dialog."
 msgstr ""
 "Επιτρέπει την πρόσβαση σε εσωτερικά εργαλεία αποσφαλμάτωσης και "
-"παρακολούθησης, με τη χρήση του διαλόγου Alt-F2."
+"παρακολούθησης με τη χρήση του διαλόγου Alt-F2."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:3
 msgid "UUIDs of extensions to enable"
@@ -92,10 +92,10 @@ msgid ""
 "list. You can also manipulate this list with the EnableExtension and "
 "DisableExtension D-Bus methods on org.gnome.Shell."
 msgstr ""
-"Οι επεκτάσεις του κελύφους GNOME έχουν μια ιδιότητα UUID. Αυτό το κλειδί "
+"Η επεκτάσεις του κελύφους GNOME έχουν μια ιδιότητα UUID· αυτό το κλειδί "
 "εμφανίζει τις επεκτάσεις που πρέπει να φορτωθούν. Οποιαδήποτε επέκταση που "
 "επιθυμεί να φορτωθεί πρέπει να είναι στον κατάλογο. Μπορείτε ακόμη να "
-"χειρισθείτε αυτόν τον κατάλογο με τις μεθόδους διαύλου δεδομένων "
+"χειριστείτε αυτόν τον κατάλογο με τις μεθόδους διαύλου δεδομένων "
 "EnableExtension and DisableExtension στο org.gnome.Shell."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:5
@@ -152,7 +152,7 @@ msgid ""
 "Whether to remember password for mounting encrypted or remote filesystems"
 msgstr ""
 "Εάν θα θυμάται τον κωδικό πρόσβασης για προσάρτηση κρυπτογραφημένων ή "
-"απομεμακρυσμένων συστημάτων αρχείων"
+"απομακρυσμένων συστημάτων αρχείων"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:14
 msgid ""
@@ -161,9 +161,9 @@ msgid ""
 "'Remember Password' checkbox will be present. This key sets the default "
 "state of the checkbox."
 msgstr ""
-"Το κέλυφος θα ζητήσει έναν κωδικό όταν προσαρτάται μια κρυπτογραφημένη "
+"Το κέλυφος θα ζητήσει έναν κωδικό όταν μια κρυπτογραφημένη συσκευή ή ένα "
-"συσκευή ή ένα απομεμακρυσμένο σύστημα αρχείων. Εάν ο κωδικός μπορεί να "
+"απομακρυσμένο σύστημα αρχείων προσαρτάται. Εάν ο κωδικός μπορεί να "
-"αποθηκευθεί για μελλοντική χρήση, θα παρουσιάζεται ένα πλαίσιο ελέγχου 'Να "
+"αποθηκευτεί για μελλοντική χρήση θα παρουσιάζεται ένα πλαίσιο ελέγχου 'Να "
 "μην απαιτείται ο κωδικός πρόσβασης'. Αυτό το κλειδί ορίζει την προεπιλεγμένη "
 "κατάσταση του πλαισίου ελέγχου."
 
@@ -174,7 +174,7 @@ msgstr "Εμφάνιση του αριθμού εβδομάδας στο ημε
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:16
 msgid "If true, display the ISO week date in the calendar."
 msgstr ""
-"Αν true, εμφανίζει τον αριθμό εβδομάδας σύμφωνα με το ISO στο ημερολόγιο."
+"Αν αληθές, εμφανίζει τον αριθμό εβδομάδας σύμφωνα με το ISO στο ημερολόγιο."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:17
 msgid "Keybinding to open the application menu"
@@ -236,17 +236,17 @@ msgid ""
 "Configures the maximum level of location accuracy applications are allowed "
 "to see. Valid options are 'off' (disable location tracking), 'country', "
 "'city', 'neighborhood', 'street', and 'exact' (typically requires GPS "
-"receiver). Please keep in mind that this only controls what GeoClue will "
+"receiver). Please keep in mind that this only controls what Geoclue will "
 "allow applications to see and they can find user's location on their own "
 "using network resources (albeit with street-level accuracy at best)."
 msgstr ""
-"Ρυθμίζει το μέγιστο επίπεδο ακρίβειας στην εντόπιση θέσης το οποίο "
+"Ρυθμίζει το μέγιστο επίπεδο των εφαρμογών ακρίβειας της θέσης που "
-"επιτρέπεται να βλέπουν οι εφαρμογές. Οι έγκυρες επιλογές είναι "
+"επιτρέπεται να δείτε. Οι έγκυρες επιλογές είναι 'όχι' (απενεργοποίηση "
-"'όχι' (απενεργοποίηση εντοπισμού θέσης), 'χώρα', 'πόλη', 'γειτονιά', 'οδός' "
+"εντοπισμού θέσης), 'χώρα', 'πόλη', 'γειτονιά', 'οδός' και 'ακριβώς' (απαιτεί "
-"και 'ακριβώς' (τυπικά, απαιτεί δέκτη GPS). Παρακαλούμε να θυμάστε ότι αυτό "
+"τυπικά δέκτη GPS). Παρακαλούμε να θυμόσαστε ότι αυτό ελέγχει μόνο τι θα "
-"ελέγχει μόνο τι θα επιτρέπει το Geoclue να βλέπουν οι εφαρμογές, ενώ αυτές "
+"επιτρέψει στις εφαρμογές το Geoclue να δείτε και μπορούν να βρουν τη θέση "
-"μπορούν να βρουν τη θέση του χρήστη και από μόνες τους, χρησιμοποιώντας "
+"του χρήστη από μόνες τους χρησιμοποιώντας πόρους δικτύου (αν και με ακρίβεια "
-"πόρους δικτύου (αν και, στην καλύτερη περίπτωση, με ακρίβεια επιπέδου οδού)."
+"επιπέδου οδού στην καλύτερη περίπτωση)."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:31
 msgid "The application icon mode."
@@ -258,7 +258,7 @@ msgid ""
 "are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-"
 "only' (shows only the application icon) or 'both'."
 msgstr ""
-"Διαμορφώνει πώς θα εμφανίζονται τα παράθυρα κατά την εναλλαγή των παραθύρων. "
+"Διαμορφώνει πώς τα παράθυρα θα εμφανίζονται στην εναλλαγή των παραθύρων. "
 "Έγκυρες ρυθμίσεις είναι 'thumbnail-only' (εμφανίζει μια μικρογραφία του "
 "παραθύρου), 'app-icon-only' (εμφανίζει μόνο το εικονίδιο της εφαρμογής) ή "
 "'both' - και τα δύο."
@@ -271,8 +271,8 @@ msgstr "Προσάρτηση αποκλειστικού διαλόγου στο
 msgid ""
 "This key overrides the key in org.gnome.mutter when running GNOME Shell."
 msgstr ""
-"Αυτό το κλειδί υπερισχύει του κλειδιού που υπάρχει στο org.gnome.mutter όταν "
+"Αυτό το κλειδί υπερισχύει του κλειδιού στο org.gnome.mutter όταν εκτελείται "
-"εκτελείται το GNOME Shell."
+"το GNOME Shell."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:35
 msgid "Arrangement of buttons on the titlebar"
@@ -283,18 +283,18 @@ msgid ""
 "This key overrides the key in org.gnome.desktop.wm.preferences when running "
 "GNOME Shell."
 msgstr ""
-"Αυτό το κλειδί υπερισχύει του κλειδιού που υπάρχει στο org.gnome.desktop.wm."
+"Αυτό το κλειδί υπερισχύει του κλειδιού στο org.gnome.desktop.wm.preferences "
-"preferences όταν εκτελείται το GNOME Shell."
+"όταν εκτελείται το GNOME Shell."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:37
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr ""
-"Ενεργοποίηση της προσάρτησης άκρων, όταν αφήνετε παράθυρα στις άκρες της "
+"Ενεργοποίηση της προσάρτηση άκρων, όταν αφήνετε παράθυρα στις άκρες της "
 "οθόνης"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:38
 msgid "Workspaces are managed dynamically"
-msgstr "Η διαχείριση των χώρων γίνεται δυναμικά"
+msgstr "Οι χώροι εργασίας διαχειρίζονται δυναμικά"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:39
 msgid "Workspaces only on primary monitor"
@@ -310,8 +310,8 @@ msgstr ""
 #, javascript-format
 msgid "There was an error loading the preferences dialog for %s:"
 msgstr ""
-"Προέκυψε ένα σφάλμα κατά τη φόρτωση του παραθύρου διαλόγου των προτιμήσεων "
+"Προέκυψε ένα σφάλμα στη φόρτωση του παραθύρου διαλόγου των προτιμήσεων για "
-"για %s:"
+"%s:"
 
 #: ../js/extensionPrefs/main.js:167
 msgid "Extension"
@@ -326,7 +326,7 @@ msgstr ""
 #: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:136
 #: ../js/ui/components/polkitAgent.js:166 ../js/ui/endSessionDialog.js:429
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
-#: ../js/ui/status/network.js:878
+#: ../js/ui/status/network.js:883
 msgid "Cancel"
 msgstr "Ακύρωση"
 
@@ -344,25 +344,25 @@ msgctxt "button"
 msgid "Sign In"
 msgstr "Σύνδεση"
 
-#: ../js/gdm/loginDialog.js:271
+#: ../js/gdm/loginDialog.js:270
 msgid "Choose Session"
 msgstr "Επιλογή συνεδρίας"
 
-#: ../js/gdm/loginDialog.js:431
+#: ../js/gdm/loginDialog.js:430
 msgid "Not listed?"
 msgstr "Δεν είστε στη λίστα;"
 
-#: ../js/gdm/loginDialog.js:611
+#: ../js/gdm/loginDialog.js:598
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(π.χ., χρήστης ή %s)"
 
-#: ../js/gdm/loginDialog.js:616 ../js/ui/components/networkAgent.js:262
+#: ../js/gdm/loginDialog.js:603 ../js/ui/components/networkAgent.js:262
 #: ../js/ui/components/networkAgent.js:280
 msgid "Username: "
 msgstr "Όνομα χρήστη: "
 
-#: ../js/gdm/loginDialog.js:917
+#: ../js/gdm/loginDialog.js:868
 msgid "Login Window"
 msgstr "Παράθυρο σύνδεσης"
 
@@ -380,34 +380,34 @@ msgstr "Δε βρέθηκε η εντολή"
 
 #: ../js/misc/util.js:148
 msgid "Could not parse command:"
-msgstr "Δεν ήταν δυνατό να γίνει ανάλυση της εντολής:"
+msgstr "Δεν ήταν δυνατό να επεξεργαστεί η εντολή:"
 
 #: ../js/misc/util.js:156
 #, javascript-format
 msgid "Execution of “%s” failed:"
 msgstr "Η εκτέλεση του “%s” απέτυχε:"
 
-#: ../js/ui/appDisplay.js:636
+#: ../js/ui/appDisplay.js:629
 msgid "Frequently used applications will appear here"
-msgstr "Οι πιο συχνά χρησιμοποιούμενες εφαρμογές θα εμφανιστούν εδώ"
+msgstr "Οι συχνά χρησιμοποιούμενες εφαρμογές θα εμφανιστούν εδώ"
 
-#: ../js/ui/appDisplay.js:747
+#: ../js/ui/appDisplay.js:740
 msgid "Frequent"
 msgstr "Συχνά"
 
-#: ../js/ui/appDisplay.js:754
+#: ../js/ui/appDisplay.js:747
 msgid "All"
 msgstr "Όλα"
 
-#: ../js/ui/appDisplay.js:1566
+#: ../js/ui/appDisplay.js:1552
 msgid "New Window"
 msgstr "Νέο παράθυρο"
 
-#: ../js/ui/appDisplay.js:1588 ../js/ui/dash.js:285
+#: ../js/ui/appDisplay.js:1574 ../js/ui/dash.js:285
 msgid "Remove from Favorites"
 msgstr "Αφαίρεση από τα αγαπημένα"
 
-#: ../js/ui/appDisplay.js:1594
+#: ../js/ui/appDisplay.js:1580
 msgid "Add to Favorites"
 msgstr "Προσθήκη στα αγαπημένα"
 
@@ -550,44 +550,44 @@ msgstr "Σα"
 msgid "calendar:MY"
 msgstr "ημερολόγιο:MY"
 
-#: ../js/ui/calendar.js:450
+#: ../js/ui/calendar.js:446
 msgid "Previous month"
 msgstr "Προηγούμενος μήνας"
 
-#: ../js/ui/calendar.js:460
+#: ../js/ui/calendar.js:456
 msgid "Next month"
 msgstr "Επόμενος μήνας"
 
 #. Translators: Text to show if there are no events */
-#: ../js/ui/calendar.js:772
+#: ../js/ui/calendar.js:762
 msgid "Nothing Scheduled"
 msgstr "Τίποτα προγραμματισμένο"
 
 #. Translators: Shown on calendar heading when selected day occurs on current year */
-#: ../js/ui/calendar.js:790
+#: ../js/ui/calendar.js:780
 msgctxt "calendar heading"
 msgid "%A, %B %d"
-msgstr "%A, %d %B"
+msgstr "%A, %B %d"
 
 #. Translators: Shown on calendar heading when selected day occurs on different year */
-#: ../js/ui/calendar.js:793
+#: ../js/ui/calendar.js:783
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B %Y"
+msgstr "%A, %B %d, %Y"
 
-#: ../js/ui/calendar.js:804
+#: ../js/ui/calendar.js:794
 msgid "Today"
 msgstr "Σήμερα"
 
-#: ../js/ui/calendar.js:808
+#: ../js/ui/calendar.js:798
 msgid "Tomorrow"
 msgstr "Αύριο"
 
-#: ../js/ui/calendar.js:819
+#: ../js/ui/calendar.js:809
 msgid "This week"
 msgstr "Αυτή η εβδομάδα"
 
-#: ../js/ui/calendar.js:827
+#: ../js/ui/calendar.js:817
 msgid "Next week"
 msgstr "Επόμενη εβδομάδα"
 
@@ -620,8 +620,8 @@ msgstr "Κωδικός:"
 msgid "Type again:"
 msgstr "Πληκτρολογήστε ξανά:"
 
-#: ../js/ui/components/networkAgent.js:131 ../js/ui/status/network.js:240
+#: ../js/ui/components/networkAgent.js:131 ../js/ui/status/network.js:250
-#: ../js/ui/status/network.js:322 ../js/ui/status/network.js:881
+#: ../js/ui/status/network.js:327 ../js/ui/status/network.js:886
 msgid "Connect"
 msgstr "Σύνδεση"
 
@@ -960,8 +960,8 @@ msgstr "Το πιστοποιητικό έχει ανακληθεί"
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
-"Το πιστοποιητικό χρησιμοποιεί έναν μη ασφαλή αλγόριθμο αποκρυπτογράφησης "
+"Το πιστοποιητικό χρησιμοποιεί ένα μη ασφαλή αλγόριθμο αποτυπώματος ή είναι "
-"αποτυπώματος ή είναι κρυπτογραφικά ασθενές"
+"αδύναμο κρυπτογραφικά"
 
 #: ../js/ui/components/telepathyClient.js:1385
 msgid ""
@@ -987,7 +987,7 @@ msgstr "Αδυναμία σύνδεσης με %s"
 msgid "View account"
 msgstr "Προβολή λογαριασμού"
 
-#: ../js/ui/components/telepathyClient.js:1439
+#: ../js/ui/components/telepathyClient.js:1434
 msgid "Unknown reason"
 msgstr "Άγνωστος λόγος"
 
@@ -1003,24 +1003,24 @@ msgstr "Εμφάνιση εφαρμογών"
 msgid "Dash"
 msgstr "Ταμπλό"
 
-#: ../js/ui/dateMenu.js:91
+#: ../js/ui/dateMenu.js:86
 msgid "Open Calendar"
 msgstr "Άνοιγμα ημερολογίου"
 
-#: ../js/ui/dateMenu.js:95
+#: ../js/ui/dateMenu.js:90
 msgid "Open Clocks"
 msgstr "Άνοιγμα ρολογιών"
 
-#: ../js/ui/dateMenu.js:102
+#: ../js/ui/dateMenu.js:97
 msgid "Date & Time Settings"
 msgstr "Ρυθμίσεις ημερομηνίας & ώρας"
 
 #. 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:192
+#: ../js/ui/dateMenu.js:187
 msgid "%A %B %e, %Y"
-msgstr "%A, %e %B %Y"
+msgstr "%A %B %e, %Y"
 
 #: ../js/ui/endSessionDialog.js:66
 #, javascript-format
@@ -1066,8 +1066,8 @@ msgstr "Εγκατάσταση ενημερώσεων & τερματισμός"
 #, 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] "Το σύστημα θα τερματισθεί αυτόματα σε %d δευτερόλεπτο."
+msgstr[0] "Το σύστημα θα τερματιστεί αυτόματα σε %d δευτερόλεπτο."
-msgstr[1] "Το σύστημα θα τερματισθεί αυτόματα σε %d δευτερόλεπτα."
+msgstr[1] "Το σύστημα θα τερματιστεί αυτόματα σε %d δευτερόλεπτα."
 
 #: ../js/ui/endSessionDialog.js:93
 msgctxt "checkbox"
@@ -1137,11 +1137,11 @@ msgstr ""
 #: ../js/ui/endSessionDialog.js:332
 msgid "Some applications are busy or have unsaved work."
 msgstr ""
-"Κάποιες εφαρμογές είναι απασχολημένες ή έχουν εργασία που δεν αποθηκεύθηκε."
+"Κάποιες εφαρμογές είναι απασχολημένες ή έχουν εργασία που δεν αποθηκεύτηκε."
 
 #: ../js/ui/endSessionDialog.js:339
 msgid "Other users are logged in."
-msgstr "Είναι συνδεδεμένοι άλλοι χρήστες."
+msgstr "Είναι συνδεμένοι άλλοι χρήστες."
 
 #. Translators: Remote here refers to a remote session, like a ssh login */
 #: ../js/ui/endSessionDialog.js:618
@@ -1168,26 +1168,25 @@ msgstr "Λήψη και εγκατάσταση του “%s” από το exten
 msgid "Keyboard"
 msgstr "Πληκτρολόγιο"
 
-#: ../js/ui/lookingGlass.js:643
+#: ../js/ui/lookingGlass.js:641
 msgid "No extensions installed"
 msgstr "Δεν υπάρχουν εγκατεστημένες επεκτάσεις"
 
 #. Translators: argument is an extension UUID. */
-#: ../js/ui/lookingGlass.js:697
+#: ../js/ui/lookingGlass.js:695
 #, javascript-format
 msgid "%s has not emitted any errors."
 msgstr "Το %s δεν έδωσε σφάλματα."
 
-#: ../js/ui/lookingGlass.js:703
+#: ../js/ui/lookingGlass.js:701
 msgid "Hide Errors"
 msgstr "Απόκρυψη σφαλμάτων"
 
-#: ../js/ui/lookingGlass.js:707 ../js/ui/lookingGlass.js:767
+#: ../js/ui/lookingGlass.js:705 ../js/ui/lookingGlass.js:765
 msgid "Show Errors"
 msgstr "Εμφάνιση σφαλμάτων"
 
-#: ../js/ui/lookingGlass.js:716 ../js/ui/status/location.js:59
+#: ../js/ui/lookingGlass.js:714
-#: ../js/ui/status/location.js:167
 msgid "Enabled"
 msgstr "Ενεργοποιημένο"
 
@@ -1195,64 +1194,64 @@ msgstr "Ενεργοποιημένο"
 #. because it's disabled by rfkill (airplane mode) */
 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:719 ../js/ui/status/location.js:164
+#: ../js/ui/lookingGlass.js:717 ../js/ui/status/network.js:560
-#: ../js/ui/status/network.js:555 ../src/gvc/gvc-mixer-control.c:1830
+#: ../src/gvc/gvc-mixer-control.c:1830
 msgid "Disabled"
 msgstr "Απενεργοποιημένο"
 
-#: ../js/ui/lookingGlass.js:721
+#: ../js/ui/lookingGlass.js:719
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: ../js/ui/lookingGlass.js:723
+#: ../js/ui/lookingGlass.js:721
 msgid "Out of date"
 msgstr "Μη ενημερωμένο"
 
-#: ../js/ui/lookingGlass.js:725
+#: ../js/ui/lookingGlass.js:723
 msgid "Downloading"
 msgstr "Γίνεται λήψη"
 
-#: ../js/ui/lookingGlass.js:749
+#: ../js/ui/lookingGlass.js:747
 msgid "View Source"
 msgstr "Προβολή πηγής"
 
-#: ../js/ui/lookingGlass.js:758
+#: ../js/ui/lookingGlass.js:756
 msgid "Web Page"
 msgstr "Ιστοσελίδα"
 
-#: ../js/ui/messageTray.js:1326
+#: ../js/ui/messageTray.js:1324
 msgid "Open"
 msgstr "Άνοιγμα"
 
-#: ../js/ui/messageTray.js:1333
+#: ../js/ui/messageTray.js:1331
 msgid "Remove"
 msgstr "Αφαίρεση"
 
-#: ../js/ui/messageTray.js:1630
+#: ../js/ui/messageTray.js:1628
 msgid "Notifications"
 msgstr "Ειδοποιήσεις"
 
-#: ../js/ui/messageTray.js:1637
+#: ../js/ui/messageTray.js:1635
 msgid "Clear Messages"
 msgstr "Καθαρισμός μηνυμάτων"
 
-#: ../js/ui/messageTray.js:1656
+#: ../js/ui/messageTray.js:1654
 msgid "Notification Settings"
 msgstr "Ρυθμίσεις ειδοποιήσεων"
 
-#: ../js/ui/messageTray.js:1709
+#: ../js/ui/messageTray.js:1707
 msgid "Tray Menu"
 msgstr "Μενού περιοχής ειδοποιήσεων"
 
-#: ../js/ui/messageTray.js:1926
+#: ../js/ui/messageTray.js:1924
 msgid "No Messages"
 msgstr "Κανένα μήνυμα"
 
-#: ../js/ui/messageTray.js:1964
+#: ../js/ui/messageTray.js:1962
 msgid "Message Tray"
 msgstr "Περιοχή ειδοποιήσεων μηνυμάτων"
 
-#: ../js/ui/messageTray.js:2962
+#: ../js/ui/messageTray.js:2946
 msgid "System Information"
 msgstr "Πληροφορίες συστήματος"
 
@@ -1268,11 +1267,11 @@ msgid_plural "%d new messages"
 msgstr[0] "%d νέο μήνυμα"
 msgstr[1] "%d νέα μηνύματα"
 
-#: ../js/ui/overview.js:84
+#: ../js/ui/overview.js:83
 msgid "Undo"
 msgstr "Αναίρεση"
 
-#: ../js/ui/overview.js:124
+#: ../js/ui/overview.js:123
 msgid "Overview"
 msgstr "Επισκόπηση"
 
@@ -1280,7 +1279,7 @@ msgstr "Επισκόπηση"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters. */
-#: ../js/ui/overview.js:250
+#: ../js/ui/overview.js:257
 msgid "Type to search…"
 msgstr "Πληκτρολογήστε για αναζήτηση…"
 
@@ -1314,7 +1313,7 @@ msgstr "Κλείσιμο"
 #. long format */
 #: ../js/ui/screenShield.js:88
 msgid "%A, %B %d"
-msgstr "%A, %d %B"
+msgstr "%A, %B %d"
 
 #: ../js/ui/screenShield.js:153
 #, javascript-format
@@ -1323,27 +1322,27 @@ msgid_plural "%d new notifications"
 msgstr[0] "%d νέα ειδοποίηση"
 msgstr[1] "%d νέες ειδοποιήσεις"
 
-#: ../js/ui/screenShield.js:474 ../js/ui/status/system.js:342
+#: ../js/ui/screenShield.js:473 ../js/ui/status/system.js:342
 msgid "Lock"
 msgstr "Κλείδωμα"
 
-#: ../js/ui/screenShield.js:708
+#: ../js/ui/screenShield.js:707
 msgid "GNOME needs to lock the screen"
 msgstr "Το GNOME χρειάζεται να κλειδώσει την οθόνη"
 
-#: ../js/ui/screenShield.js:835 ../js/ui/screenShield.js:1309
+#: ../js/ui/screenShield.js:834 ../js/ui/screenShield.js:1301
 msgid "Unable to lock"
 msgstr "Αδυναμία κλειδώματος"
 
-#: ../js/ui/screenShield.js:836 ../js/ui/screenShield.js:1310
+#: ../js/ui/screenShield.js:835 ../js/ui/screenShield.js:1302
 msgid "Lock was blocked by an application"
-msgstr "Το κλείδωμα εμποδίσθηκε από μια εφαρμογή"
+msgstr "Το κλείδωμα εμποδίστηκε από μια εφαρμογή"
 
-#: ../js/ui/search.js:603
+#: ../js/ui/search.js:589
 msgid "Searching…"
 msgstr "Αναζήτηση…"
 
-#: ../js/ui/search.js:649
+#: ../js/ui/search.js:632
 msgid "No results."
 msgstr "Δε βρέθηκαν αποτελέσματα."
 
@@ -1415,29 +1414,30 @@ msgstr "Υψηλή αντίθεση"
 msgid "Large Text"
 msgstr "Μεγάλο κείμενο"
 
-#: ../js/ui/status/bluetooth.js:49
+#: ../js/ui/status/bluetooth.js:48
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../js/ui/status/bluetooth.js:51 ../js/ui/status/network.js:151
+#: ../js/ui/status/bluetooth.js:50 ../js/ui/status/location.js:62
-#: ../js/ui/status/network.js:323 ../js/ui/status/network.js:1234
+#: ../js/ui/status/location.js:162 ../js/ui/status/network.js:151
-#: ../js/ui/status/network.js:1345 ../js/ui/status/rfkill.js:85
+#: ../js/ui/status/network.js:328 ../js/ui/status/network.js:1235
+#: ../js/ui/status/network.js:1346 ../js/ui/status/rfkill.js:85
 #: ../js/ui/status/rfkill.js:105
 msgid "Turn Off"
 msgstr "Σβήσιμο"
 
-#: ../js/ui/status/bluetooth.js:54
+#: ../js/ui/status/bluetooth.js:53
 msgid "Bluetooth Settings"
 msgstr "Ρυθμίσεις Bluetooth"
 
-#: ../js/ui/status/bluetooth.js:104
+#: ../js/ui/status/bluetooth.js:100
 #, javascript-format
 msgid "%d Connected Device"
 msgid_plural "%d Connected Devices"
-msgstr[0] "%d συνδεδεμένη συσκευή"
+msgstr[0] "%d συνδεμένη συσκευή"
-msgstr[1] "%d συνδεδεμένες συσκευές"
+msgstr[1] "%d συνδεμένες συσκευές"
 
-#: ../js/ui/status/bluetooth.js:106 ../js/ui/status/network.js:1262
+#: ../js/ui/status/bluetooth.js:102 ../js/ui/status/network.js:1263
 msgid "Not Connected"
 msgstr "Χωρίς σύνδεση"
 
@@ -1449,170 +1449,159 @@ msgstr "Φωτεινότητα"
 msgid "Show Keyboard Layout"
 msgstr "Εμφάνιση διάταξης πληκτρολογίου"
 
-#: ../js/ui/status/location.js:53
+#: ../js/ui/status/location.js:52
 msgid "Location"
 msgstr "Θέση"
 
-#: ../js/ui/status/location.js:60 ../js/ui/status/location.js:168
+#: ../js/ui/status/location.js:61 ../js/ui/status/location.js:161
-msgid "Disable"
+#: ../js/ui/status/rfkill.js:84
-msgstr "Απενεργοποίηση"
+msgid "On"
-
-#: ../js/ui/status/location.js:165
-msgid "Enable"
 msgstr "Ενεργοποίηση"
 
-#: ../js/ui/status/location.js:167
+#: ../js/ui/status/location.js:158 ../js/ui/status/network.js:246
-msgid "In Use"
+#: ../js/ui/status/network.js:425 ../js/ui/status/network.js:1261
-msgstr "Σε χρήση"
+msgid "Off"
+msgstr "Εκτός σύνδεσης"
+
+#: ../js/ui/status/location.js:159 ../js/ui/status/network.js:1235
+msgid "Turn On"
+msgstr "Ενεργοποίηση"
 
 #: ../js/ui/status/network.js:74
 msgid "<unknown>"
 msgstr "<άγνωστο>"
 
-#: ../js/ui/status/network.js:420 ../js/ui/status/network.js:1260
-#: ../js/ui/status/network.js:1464
-msgid "Off"
-msgstr "Εκτός σύνδεσης"
-
-#: ../js/ui/status/network.js:422
-msgid "Connected"
-msgstr "Συνδέθηκε"
-
 #. 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:426
+#: ../js/ui/status/network.js:431
 msgid "unmanaged"
-msgstr "χωρίς διαχείριση"
+msgstr "μη διαχειριζόμενες"
 
-#: ../js/ui/status/network.js:428
+#: ../js/ui/status/network.js:433
 msgid "disconnecting..."
 msgstr "αποσύνδεση..."
 
-#: ../js/ui/status/network.js:434 ../js/ui/status/network.js:1362
+#: ../js/ui/status/network.js:439 ../js/ui/status/network.js:1363
 msgid "connecting..."
 msgstr "σύνδεση..."
 
 #. Translators: this is for network connections that require some kind of key or password */
-#: ../js/ui/status/network.js:437 ../js/ui/status/network.js:1365
+#: ../js/ui/status/network.js:442 ../js/ui/status/network.js:1366
 msgid "authentication required"
 msgstr "απαιτείται πιστοποίηση"
 
 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing */
-#: ../js/ui/status/network.js:445
+#: ../js/ui/status/network.js:450
 msgid "firmware missing"
-msgstr "έλλειψη λογισμικού υλικού (firmware)"
+msgstr "έλλειψη firmware"
 
 #. 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:449
+#: ../js/ui/status/network.js:454
 msgid "unavailable"
 msgstr "μη διαθέσιμο"
 
-#: ../js/ui/status/network.js:451 ../js/ui/status/network.js:1367
+#: ../js/ui/status/network.js:456 ../js/ui/status/network.js:1368
 msgid "connection failed"
 msgstr "αποτυχία σύνδεσης"
 
-#: ../js/ui/status/network.js:467
+#: ../js/ui/status/network.js:472
 msgid "Wired Settings"
 msgstr "Ενσύρματες ρυθμίσεις"
 
-#: ../js/ui/status/network.js:509 ../js/ui/status/network.js:587
+#: ../js/ui/status/network.js:514 ../js/ui/status/network.js:592
 msgid "Mobile Broadband Settings"
 msgstr "Ρυθμίσεις Κινήτης Ευρυζωνικής"
 
-#: ../js/ui/status/network.js:551 ../js/ui/status/network.js:1258
+#: ../js/ui/status/network.js:556 ../js/ui/status/network.js:1259
 msgid "Hardware Disabled"
-msgstr "Το Υλικό απενεργοποιήθηκε"
+msgstr "Το Υλικό Απενεργοποιήθηκε"
 
-#: ../js/ui/status/network.js:595
+#: ../js/ui/status/network.js:600
 msgid "Use as Internet connection"
 msgstr "Χρήση με σύνδεση διαδικτύου"
 
-#: ../js/ui/status/network.js:776
+#: ../js/ui/status/network.js:781
 msgid "Airplane Mode is On"
 msgstr "Η κατάσταση λειτουργίας αεροπλάνου είναι ενεργή"
 
-#: ../js/ui/status/network.js:777
+#: ../js/ui/status/network.js:782
 msgid "Wi-Fi is disabled when airplane mode is on."
 msgstr ""
 "Η ασύρματη σύνδεση είναι ανενεργή όταν η λειτουργία αεροπλάνου είναι ενεργή."
 
-#: ../js/ui/status/network.js:778
+#: ../js/ui/status/network.js:783
 msgid "Turn Off Airplane Mode"
 msgstr "Απενεργοποίηση της κατάστασης λειτουργίας αεροπλάνου"
 
-#: ../js/ui/status/network.js:787
+#: ../js/ui/status/network.js:792
 msgid "Wi-Fi is Off"
 msgstr "Το ασύρματο δίκτυο είναι ανενεργό"
 
-#: ../js/ui/status/network.js:788
+#: ../js/ui/status/network.js:793
 msgid "Wi-Fi needs to be turned on in order to connect to a network."
 msgstr ""
 "Το ασύρματο δίκτυο χρειάζεται να ενεργοποιηθεί για να συνδεθείτε με ένα "
 "δίκτυο."
 
-#: ../js/ui/status/network.js:789
+#: ../js/ui/status/network.js:794
 msgid "Turn On Wi-Fi"
-msgstr "Ενεργοποίηση του ασυρμάτου δικτύου Wi-Fi"
+msgstr "Ενεργοποιήστε το ασύρματο δικτύο"
 
-#: ../js/ui/status/network.js:814
+#: ../js/ui/status/network.js:819
 msgid "Wi-Fi Networks"
 msgstr "Δίκτυα Wi-Fi"
 
-#: ../js/ui/status/network.js:816
+#: ../js/ui/status/network.js:821
 msgid "Select a network"
 msgstr "Επιλογή δικτύου"
 
-#: ../js/ui/status/network.js:845
+#: ../js/ui/status/network.js:850
 msgid "No Networks"
 msgstr "Χωρίς δίκτυα"
 
-#: ../js/ui/status/network.js:866 ../js/ui/status/rfkill.js:103
+#: ../js/ui/status/network.js:871 ../js/ui/status/rfkill.js:103
 msgid "Use hardware switch to turn off"
-msgstr "Χρήση διακόπτη υλικού για τερματισμό"
+msgstr "Χρησιμοποιήστε διακόπτη υλικού για τερματισμό"
 
-#: ../js/ui/status/network.js:1136
+#: ../js/ui/status/network.js:1141
 msgid "Select Network"
 msgstr "Επιλογή δικτύου"
 
-#: ../js/ui/status/network.js:1142
+#: ../js/ui/status/network.js:1147
 msgid "Wi-Fi Settings"
 msgstr "Ρυθμίσεις Wi-Fi"
 
-#: ../js/ui/status/network.js:1234
+#: ../js/ui/status/network.js:1252
-msgid "Turn On"
-msgstr "Ενεργοποίηση"
-
-#: ../js/ui/status/network.js:1251
 msgid "Hotspot Active"
 msgstr "Ενεργό θερμό σημείο"
 
-#: ../js/ui/status/network.js:1254
+#: ../js/ui/status/network.js:1255
 msgid "Connecting"
 msgstr "Συνδέεται"
 
-#: ../js/ui/status/network.js:1433 ../js/ui/status/rfkill.js:88
+#: ../js/ui/status/network.js:1434 ../js/ui/status/rfkill.js:88
 msgid "Network Settings"
 msgstr "Ρυθμίσεις δικτύου"
 
-#: ../js/ui/status/network.js:1435
+#: ../js/ui/status/network.js:1436
 msgid "VPN Settings"
 msgstr "Ρυθμίσεις VPN"
 
-#: ../js/ui/status/network.js:1454
+#: ../js/ui/status/network.js:1455
 msgid "VPN"
 msgstr "VPN"
 
-#: ../js/ui/status/network.js:1607
+#: ../js/ui/status/network.js:1598
 msgid "Network Manager"
 msgstr "Διαχειριστής δικτύου"
 
-#: ../js/ui/status/network.js:1646
+#: ../js/ui/status/network.js:1637
 msgid "Connection failed"
 msgstr "Αποτυχία σύνδεσης"
 
-#: ../js/ui/status/network.js:1647
+#: ../js/ui/status/network.js:1638
 msgid "Activation of network connection failed"
 msgstr "Απέτυχε η ενεργοποίηση της σύνδεσης δικτύου"
 
@@ -1650,10 +1639,6 @@ msgstr "Μπαταρία"
 msgid "Airplane Mode"
 msgstr "Κατάσταση λειτουργίας αεροπλάνου"
 
-#: ../js/ui/status/rfkill.js:84
-msgid "On"
-msgstr "Ενεργοποίηση"
-
 #: ../js/ui/status/system.js:314
 msgid "Switch User"
 msgstr "Αλλαγή χρήστη"
@@ -1767,8 +1752,8 @@ msgstr ""
 #: ../src/main.c:361
 msgid "Use a specific mode, e.g. \"gdm\" for login screen"
 msgstr ""
-"Χρήση μιας συγκεκριμένης κατάστασης λειτουργίας, π.χ. \"gdm\" για την οθόνη "
+"Χρησιμοποιήστε μια συγκεκριμένη κατάσταση λειτουργίας, π.χ. \"gdm\" για την "
-"σύνδεσης"
+"οθόνη σύνδεσης"
 
 #: ../src/main.c:367
 msgid "List possible modes"

po/es.po

@@ -10,8 +10,8 @@ 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: 2014-03-28 08:56+0000\n"
+"POT-Creation-Date: 2014-03-05 15:39+0000\n"
-"PO-Revision-Date: 2014-03-28 12:03+0100\n"
+"PO-Revision-Date: 2014-03-05 16:54+0100\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "Language: es\n"
@@ -316,7 +316,7 @@ msgstr ""
 #: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:136
 #: ../js/ui/components/polkitAgent.js:166 ../js/ui/endSessionDialog.js:429
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
-#: ../js/ui/status/network.js:878
+#: ../js/ui/status/network.js:873
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -334,24 +334,24 @@ msgctxt "button"
 msgid "Sign In"
 msgstr "Iniciar sesión"
 
-#: ../js/gdm/loginDialog.js:271
+#: ../js/gdm/loginDialog.js:270
 msgid "Choose Session"
 msgstr "Elegir sesión"
 
-#: ../js/gdm/loginDialog.js:431
+#: ../js/gdm/loginDialog.js:430
 msgid "Not listed?"
 msgstr "¿No está en la lista?"
 
-#: ../js/gdm/loginDialog.js:611
+#: ../js/gdm/loginDialog.js:598
 msgid "(e.g., user or %s)"
 msgstr "(ej., usuario o %s)"
 
-#: ../js/gdm/loginDialog.js:616 ../js/ui/components/networkAgent.js:262
+#: ../js/gdm/loginDialog.js:603 ../js/ui/components/networkAgent.js:262
 #: ../js/ui/components/networkAgent.js:280
 msgid "Username: "
 msgstr "Nombre de usuario:"
 
-#: ../js/gdm/loginDialog.js:917
+#: ../js/gdm/loginDialog.js:868
 msgid "Login Window"
 msgstr "Ventana de inicio de sesión"
 
@@ -375,27 +375,27 @@ msgstr "No se pudo analizar el comando:"
 msgid "Execution of “%s” failed:"
 msgstr "Falló la ejecución de «%s»:"
 
-#: ../js/ui/appDisplay.js:636
+#: ../js/ui/appDisplay.js:629
 msgid "Frequently used applications will appear here"
 msgstr "Las aplicaciones usadas frecuentemente aparecerán aquí"
 
-#: ../js/ui/appDisplay.js:747
+#: ../js/ui/appDisplay.js:740
 msgid "Frequent"
 msgstr "Frecuentes"
 
-#: ../js/ui/appDisplay.js:754
+#: ../js/ui/appDisplay.js:747
 msgid "All"
 msgstr "Todas"
 
-#: ../js/ui/appDisplay.js:1566
+#: ../js/ui/appDisplay.js:1552
 msgid "New Window"
 msgstr "Ventana nueva"
 
-#: ../js/ui/appDisplay.js:1588 ../js/ui/dash.js:285
+#: ../js/ui/appDisplay.js:1574 ../js/ui/dash.js:285
 msgid "Remove from Favorites"
 msgstr "Quitar de los favoritos"
 
-#: ../js/ui/appDisplay.js:1594
+#: ../js/ui/appDisplay.js:1580
 msgid "Add to Favorites"
 msgstr "Añadir a los favoritos"
 
@@ -536,44 +536,44 @@ msgstr "S"
 msgid "calendar:MY"
 msgstr "calendario:MA"
 
-#: ../js/ui/calendar.js:450
+#: ../js/ui/calendar.js:446
 msgid "Previous month"
 msgstr "Mes anterior"
 
-#: ../js/ui/calendar.js:460
+#: ../js/ui/calendar.js:456
 msgid "Next month"
 msgstr "Siguiente mes"
 
 #. Translators: Text to show if there are no events */
-#: ../js/ui/calendar.js:772
+#: ../js/ui/calendar.js:762
 msgid "Nothing Scheduled"
 msgstr "Nada programado"
 
 #. Translators: Shown on calendar heading when selected day occurs on current year */
-#: ../js/ui/calendar.js:790
+#: ../js/ui/calendar.js:780
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %d de %B"
 
 #. Translators: Shown on calendar heading when selected day occurs on different year */
-#: ../js/ui/calendar.js:793
+#: ../js/ui/calendar.js:783
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: ../js/ui/calendar.js:804
+#: ../js/ui/calendar.js:794
 msgid "Today"
 msgstr "Hoy"
 
-#: ../js/ui/calendar.js:808
+#: ../js/ui/calendar.js:798
 msgid "Tomorrow"
 msgstr "Mañana"
 
-#: ../js/ui/calendar.js:819
+#: ../js/ui/calendar.js:809
 msgid "This week"
 msgstr "Esta semana"
 
-#: ../js/ui/calendar.js:827
+#: ../js/ui/calendar.js:817
 msgid "Next week"
 msgstr "La semana que viene"
 
@@ -606,7 +606,7 @@ msgid "Type again:"
 msgstr "Escriba de nuevo:"
 
 #: ../js/ui/components/networkAgent.js:131 ../js/ui/status/network.js:240
-#: ../js/ui/status/network.js:322 ../js/ui/status/network.js:881
+#: ../js/ui/status/network.js:317 ../js/ui/status/network.js:876
 msgid "Connect"
 msgstr "Conectar"
 
@@ -962,7 +962,7 @@ msgstr "No se pudo conectar a %s"
 msgid "View account"
 msgstr "Ver cuenta"
 
-#: ../js/ui/components/telepathyClient.js:1439
+#: ../js/ui/components/telepathyClient.js:1434
 msgid "Unknown reason"
 msgstr "Razón desconocida"
 
@@ -978,22 +978,22 @@ msgstr "Mostrar aplicaciones"
 msgid "Dash"
 msgstr "Tablero"
 
-#: ../js/ui/dateMenu.js:91
+#: ../js/ui/dateMenu.js:86
 msgid "Open Calendar"
 msgstr "Abrir calendario"
 
-#: ../js/ui/dateMenu.js:95
+#: ../js/ui/dateMenu.js:90
 msgid "Open Clocks"
 msgstr "Abrir Relojes"
 
-#: ../js/ui/dateMenu.js:102
+#: ../js/ui/dateMenu.js:97
 msgid "Date & Time Settings"
 msgstr "Configuración de hora y fecha"
 
 #. 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:192
+#: ../js/ui/dateMenu.js:187
 msgid "%A %B %e, %Y"
 msgstr "%A, %e de %B de %Y"
 
@@ -1132,25 +1132,24 @@ msgstr "¿Descargar e instalar «%s» desde extensions.gnome.org?"
 msgid "Keyboard"
 msgstr "Teclado"
 
-#: ../js/ui/lookingGlass.js:643
+#: ../js/ui/lookingGlass.js:641
 msgid "No extensions installed"
 msgstr "No hay extensiones instaladas"
 
 #. Translators: argument is an extension UUID. */
-#: ../js/ui/lookingGlass.js:697
+#: ../js/ui/lookingGlass.js:695
 msgid "%s has not emitted any errors."
 msgstr "%s no ha generado ningún error."
 
-#: ../js/ui/lookingGlass.js:703
+#: ../js/ui/lookingGlass.js:701
 msgid "Hide Errors"
 msgstr "Ocultar errores"
 
-#: ../js/ui/lookingGlass.js:707 ../js/ui/lookingGlass.js:767
+#: ../js/ui/lookingGlass.js:705 ../js/ui/lookingGlass.js:765
 msgid "Show Errors"
 msgstr "Mostrar errores"
 
-#: ../js/ui/lookingGlass.js:716 ../js/ui/status/location.js:59
+#: ../js/ui/lookingGlass.js:714
-#: ../js/ui/status/location.js:167
 msgid "Enabled"
 msgstr "Activado"
 
@@ -1158,28 +1157,28 @@ msgstr "Activado"
 #. because it's disabled by rfkill (airplane mode) */
 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:719 ../js/ui/status/location.js:164
+#: ../js/ui/lookingGlass.js:717 ../js/ui/status/network.js:550
-#: ../js/ui/status/network.js:555 ../src/gvc/gvc-mixer-control.c:1830
+#: ../src/gvc/gvc-mixer-control.c:1830
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: ../js/ui/lookingGlass.js:721
+#: ../js/ui/lookingGlass.js:719
 msgid "Error"
 msgstr "Error"
 
-#: ../js/ui/lookingGlass.js:723
+#: ../js/ui/lookingGlass.js:721
 msgid "Out of date"
 msgstr "Caducado"
 
-#: ../js/ui/lookingGlass.js:725
+#: ../js/ui/lookingGlass.js:723
 msgid "Downloading"
 msgstr "Descargando"
 
-#: ../js/ui/lookingGlass.js:749
+#: ../js/ui/lookingGlass.js:747
 msgid "View Source"
 msgstr "Ver fuente"
 
-#: ../js/ui/lookingGlass.js:758
+#: ../js/ui/lookingGlass.js:756
 msgid "Web Page"
 msgstr "Página web"
 
@@ -1215,7 +1214,7 @@ msgstr "No hay mensajes"
 msgid "Message Tray"
 msgstr "Bandeja de mensajes"
 
-#: ../js/ui/messageTray.js:2962
+#: ../js/ui/messageTray.js:2948
 msgid "System Information"
 msgstr "Información del sistema"
 
@@ -1230,11 +1229,11 @@ msgid_plural "%d new messages"
 msgstr[0] "%d mensaje nuevo"
 msgstr[1] "%d mensajes nuevos"
 
-#: ../js/ui/overview.js:84
+#: ../js/ui/overview.js:83
 msgid "Undo"
 msgstr "Deshacer"
 
-#: ../js/ui/overview.js:124
+#: ../js/ui/overview.js:123
 msgid "Overview"
 msgstr "Vista general"
 
@@ -1242,7 +1241,7 @@ msgstr "Vista general"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters. */
-#: ../js/ui/overview.js:250
+#: ../js/ui/overview.js:257
 msgid "Type to search…"
 msgstr "Escribir para buscar…"
 
@@ -1284,27 +1283,27 @@ msgid_plural "%d new notifications"
 msgstr[0] "%d notificación nueva"
 msgstr[1] "%d notificaciones nuevas"
 
-#: ../js/ui/screenShield.js:474 ../js/ui/status/system.js:342
+#: ../js/ui/screenShield.js:473 ../js/ui/status/system.js:342
 msgid "Lock"
 msgstr "Bloquear"
 
-#: ../js/ui/screenShield.js:708
+#: ../js/ui/screenShield.js:707
 msgid "GNOME needs to lock the screen"
 msgstr "GNOME necesita bloquear la pantalla"
 
-#: ../js/ui/screenShield.js:835 ../js/ui/screenShield.js:1309
+#: ../js/ui/screenShield.js:834 ../js/ui/screenShield.js:1301
 msgid "Unable to lock"
 msgstr "No se pudo bloquear"
 
-#: ../js/ui/screenShield.js:836 ../js/ui/screenShield.js:1310
+#: ../js/ui/screenShield.js:835 ../js/ui/screenShield.js:1302
 msgid "Lock was blocked by an application"
 msgstr "Una aplicación impidió el bloqueo"
 
-#: ../js/ui/search.js:603
+#: ../js/ui/search.js:589
 msgid "Searching…"
 msgstr "Buscando…"
 
-#: ../js/ui/search.js:649
+#: ../js/ui/search.js:632
 msgid "No results."
 msgstr "No se encontraron resultados."
 
@@ -1376,28 +1375,29 @@ msgstr "Contraste alto"
 msgid "Large Text"
 msgstr "Texto grande"
 
-#: ../js/ui/status/bluetooth.js:49
+#: ../js/ui/status/bluetooth.js:48
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../js/ui/status/bluetooth.js:51 ../js/ui/status/network.js:151
+#: ../js/ui/status/bluetooth.js:50 ../js/ui/status/location.js:59
-#: ../js/ui/status/network.js:323 ../js/ui/status/network.js:1234
+#: ../js/ui/status/location.js:159 ../js/ui/status/network.js:151
-#: ../js/ui/status/network.js:1345 ../js/ui/status/rfkill.js:85
+#: ../js/ui/status/network.js:318 ../js/ui/status/network.js:1225
+#: ../js/ui/status/network.js:1336 ../js/ui/status/rfkill.js:85
 #: ../js/ui/status/rfkill.js:105
 msgid "Turn Off"
 msgstr "Apagar"
 
-#: ../js/ui/status/bluetooth.js:54
+#: ../js/ui/status/bluetooth.js:53
 msgid "Bluetooth Settings"
 msgstr "Configuración de Bluetooth"
 
-#: ../js/ui/status/bluetooth.js:104
+#: ../js/ui/status/bluetooth.js:100
 msgid "%d Connected Device"
 msgid_plural "%d Connected Devices"
 msgstr[0] "%d dispositivo conectado"
 msgstr[1] "%d dispositivos conectados"
 
-#: ../js/ui/status/bluetooth.js:106 ../js/ui/status/network.js:1262
+#: ../js/ui/status/bluetooth.js:102 ../js/ui/status/network.js:1253
 msgid "Not Connected"
 msgstr "No conectado"
 
@@ -1409,169 +1409,161 @@ msgstr "Brillo"
 msgid "Show Keyboard Layout"
 msgstr "Mostrar la distribución del teclado"
 
-#: ../js/ui/status/location.js:53
+#: ../js/ui/status/location.js:52
 msgid "Location"
 msgstr "Ubicación"
 
-#: ../js/ui/status/location.js:60 ../js/ui/status/location.js:168
+#: ../js/ui/status/location.js:58 ../js/ui/status/location.js:158
-#| msgid "Disabled"
+#: ../js/ui/status/rfkill.js:84
-msgid "Disable"
+msgid "On"
-msgstr "Desactivar"
+msgstr "Encender"
 
-#: ../js/ui/status/location.js:165
+#: ../js/ui/status/location.js:155 ../js/ui/status/network.js:415
-#| msgid "Enabled"
+#: ../js/ui/status/network.js:1251 ../js/ui/status/network.js:1455
-msgid "Enable"
+msgid "Off"
-msgstr "Activar"
+msgstr "Desconectado"
 
-#: ../js/ui/status/location.js:167
+#: ../js/ui/status/location.js:156 ../js/ui/status/network.js:1225
-msgid "In Use"
+msgid "Turn On"
-msgstr "En uso"
+msgstr "Enceder"
 
 #: ../js/ui/status/network.js:74
 msgid "<unknown>"
 msgstr "<desconocido>"
 
-#: ../js/ui/status/network.js:420 ../js/ui/status/network.js:1260
+#: ../js/ui/status/network.js:417
-#: ../js/ui/status/network.js:1464
+#| msgid "Connect"
-msgid "Off"
-msgstr "Desconectado"
-
-#: ../js/ui/status/network.js:422
 msgid "Connected"
 msgstr "Conectada"
 
 #. 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:426
+#: ../js/ui/status/network.js:421
 msgid "unmanaged"
 msgstr "no gestionada"
 
-#: ../js/ui/status/network.js:428
+#: ../js/ui/status/network.js:423
 msgid "disconnecting..."
 msgstr "deconectando…"
 
-#: ../js/ui/status/network.js:434 ../js/ui/status/network.js:1362
+#: ../js/ui/status/network.js:429 ../js/ui/status/network.js:1353
 msgid "connecting..."
 msgstr "conectando…"
 
 #. Translators: this is for network connections that require some kind of key or password */
-#: ../js/ui/status/network.js:437 ../js/ui/status/network.js:1365
+#: ../js/ui/status/network.js:432 ../js/ui/status/network.js:1356
 msgid "authentication required"
 msgstr "se necesita autenticación"
 
 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing */
-#: ../js/ui/status/network.js:445
+#: ../js/ui/status/network.js:440
 msgid "firmware missing"
 msgstr "falta el «firmware»"
 
 #. 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:449
+#: ../js/ui/status/network.js:444
 msgid "unavailable"
 msgstr "no disponible"
 
-#: ../js/ui/status/network.js:451 ../js/ui/status/network.js:1367
+#: ../js/ui/status/network.js:446 ../js/ui/status/network.js:1358
 msgid "connection failed"
 msgstr "falló la conexión"
 
-#: ../js/ui/status/network.js:467
+#: ../js/ui/status/network.js:462
 msgid "Wired Settings"
 msgstr "Configuración de Wi-Fi"
 
-#: ../js/ui/status/network.js:509 ../js/ui/status/network.js:587
+#: ../js/ui/status/network.js:504 ../js/ui/status/network.js:582
 msgid "Mobile Broadband Settings"
 msgstr "Configuración de banda ancha móvil"
 
-#: ../js/ui/status/network.js:551 ../js/ui/status/network.js:1258
+#: ../js/ui/status/network.js:546 ../js/ui/status/network.js:1249
 msgid "Hardware Disabled"
 msgstr "Hardware desactivado"
 
-#: ../js/ui/status/network.js:595
+#: ../js/ui/status/network.js:590
 msgid "Use as Internet connection"
 msgstr "Usar como conexión a Internet"
 
-#: ../js/ui/status/network.js:776
+#: ../js/ui/status/network.js:771
 msgid "Airplane Mode is On"
 msgstr "El modo avión está activado"
 
-#: ../js/ui/status/network.js:777
+#: ../js/ui/status/network.js:772
 msgid "Wi-Fi is disabled when airplane mode is on."
 msgstr "La Wi-Fi se desactiva cuando se activa el modo avión."
 
-#: ../js/ui/status/network.js:778
+#: ../js/ui/status/network.js:773
 msgid "Turn Off Airplane Mode"
 msgstr "Apagar el modo avión"
 
-#: ../js/ui/status/network.js:787
+#: ../js/ui/status/network.js:782
 msgid "Wi-Fi is Off"
 msgstr "La Wi-Fi está desactivada"
 
-#: ../js/ui/status/network.js:788
+#: ../js/ui/status/network.js:783
 msgid "Wi-Fi needs to be turned on in order to connect to a network."
 msgstr "Se debe activar la Wi-Fi para poder conectarse a la red."
 
-#: ../js/ui/status/network.js:789
+#: ../js/ui/status/network.js:784
 msgid "Turn On Wi-Fi"
 msgstr "Activar la Wi-Fi"
 
-#: ../js/ui/status/network.js:814
+#: ../js/ui/status/network.js:809
 msgid "Wi-Fi Networks"
 msgstr "Redes Wi-Fi"
 
-#: ../js/ui/status/network.js:816
+#: ../js/ui/status/network.js:811
 msgid "Select a network"
 msgstr "Seleccionar una red"
 
-#: ../js/ui/status/network.js:845
+#: ../js/ui/status/network.js:840
 msgid "No Networks"
 msgstr "No hay redes"
 
-#: ../js/ui/status/network.js:866 ../js/ui/status/rfkill.js:103
+#: ../js/ui/status/network.js:861 ../js/ui/status/rfkill.js:103
 msgid "Use hardware switch to turn off"
 msgstr "Usar el interruptor hardware para apagar"
 
-#: ../js/ui/status/network.js:1136
+#: ../js/ui/status/network.js:1131
 msgid "Select Network"
 msgstr "Seleccionar red"
 
-#: ../js/ui/status/network.js:1142
+#: ../js/ui/status/network.js:1137
 msgid "Wi-Fi Settings"
 msgstr "Configuración de Wi-Fi"
 
-#: ../js/ui/status/network.js:1234
+#: ../js/ui/status/network.js:1242
-msgid "Turn On"
-msgstr "Enceder"
-
-#: ../js/ui/status/network.js:1251
 msgid "Hotspot Active"
 msgstr "Punto de acceso activo"
 
-#: ../js/ui/status/network.js:1254
+#: ../js/ui/status/network.js:1245
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../js/ui/status/network.js:1433 ../js/ui/status/rfkill.js:88
+#: ../js/ui/status/network.js:1424 ../js/ui/status/rfkill.js:88
 msgid "Network Settings"
 msgstr "Configuración de la red"
 
-#: ../js/ui/status/network.js:1435
+#: ../js/ui/status/network.js:1426
 msgid "VPN Settings"
 msgstr "Configuración de VPN"
 
-#: ../js/ui/status/network.js:1454
+#: ../js/ui/status/network.js:1445
 msgid "VPN"
 msgstr "VPN"
 
-#: ../js/ui/status/network.js:1607
+#: ../js/ui/status/network.js:1598
 msgid "Network Manager"
 msgstr "Gestor de la red"
 
-#: ../js/ui/status/network.js:1646
+#: ../js/ui/status/network.js:1637
 msgid "Connection failed"
 msgstr "Falló la conexión"
 
-#: ../js/ui/status/network.js:1647
+#: ../js/ui/status/network.js:1638
 msgid "Activation of network connection failed"
 msgstr "Falló la activación de la conexión de red"
 
@@ -1607,10 +1599,6 @@ msgstr "Batería"
 msgid "Airplane Mode"
 msgstr "Modo avión"
 
-#: ../js/ui/status/rfkill.js:84
-msgid "On"
-msgstr "Encender"
-
 #: ../js/ui/status/system.js:314
 msgid "Switch User"
 msgstr "Cambiar de usuario"

po/fi.po

@@ -26,8 +26,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: 2014-03-05 20:31+0000\n"
+"POT-Creation-Date: 2014-02-24 08:30+0000\n"
-"PO-Revision-Date: 2014-03-05 22:43+0200\n"
+"PO-Revision-Date: 2014-02-24 21:20+0200\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos+l10n@iki.fi>\n"
 "Language-Team: suomi <gnome-fi-laatu@lists.sourceforge.net>\n"
 "Language: fi\n"
@@ -100,9 +100,10 @@ msgstr ""
 "kautta."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:3
+#, fuzzy
 #| msgid "Uuids of extensions to enable"
 msgid "UUIDs of extensions to enable"
-msgstr "Käyttöön otettavien laajennusten UUID:t"
+msgstr "Käyttöön otettavien laajennosten UUID:t"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:4
 #, fuzzy
@@ -124,7 +125,7 @@ msgstr ""
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:5
 msgid "Disables the validation of extension version compatibility"
-msgstr "Poistaa käytöstä laajennusten versioyhteensopivuuden tarkistuksen"
+msgstr ""
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:6
 msgid ""
@@ -152,6 +153,7 @@ msgid "History for the looking glass dialog"
 msgstr "Historia näyttölasi-ikkunalle"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:11
+#| msgid "Always show the 'Log out' menuitem in the user menu."
 msgid "Always show the 'Log out' menu item in the user menu."
 msgstr "Näytä aina \"Kirjaudu ulos\"-toiminto käyttäjävalikossa."
 
@@ -249,7 +251,7 @@ msgid ""
 "Configures the maximum level of location accuracy applications are allowed "
 "to see. Valid options are 'off' (disable location tracking), 'country', "
 "'city', 'neighborhood', 'street', and 'exact' (typically requires GPS "
-"receiver). Please keep in mind that this only controls what GeoClue will "
+"receiver). Please keep in mind that this only controls what Geoclue will "
 "allow applications to see and they can find user's location on their own "
 "using network resources (albeit with street-level accuracy at best)."
 msgstr ""
@@ -322,7 +324,7 @@ msgstr "Valitse muokattava laajennus alta."
 #: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:136
 #: ../js/ui/components/polkitAgent.js:166 ../js/ui/endSessionDialog.js:429
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
-#: ../js/ui/status/network.js:873
+#: ../js/ui/status/network.js:883
 msgid "Cancel"
 msgstr "Peru"
 
@@ -380,6 +382,7 @@ msgstr "Komentoa ei voi jäsentää:"
 
 #: ../js/misc/util.js:156
 #, javascript-format
+#| msgid "Execution of '%s' failed:"
 msgid "Execution of “%s” failed:"
 msgstr "Kohteen ”%s” suorittaminen epäonnistui:"
 
@@ -555,35 +558,35 @@ msgid "Next month"
 msgstr "Seuraava kuukausi"
 
 #. Translators: Text to show if there are no events */
-#: ../js/ui/calendar.js:763
+#: ../js/ui/calendar.js:762
 msgid "Nothing Scheduled"
 msgstr "Ei merkintöjä"
 
 #. Translators: Shown on calendar heading when selected day occurs on current year */
-#: ../js/ui/calendar.js:781
+#: ../js/ui/calendar.js:780
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %e. %Bta"
 
 #. Translators: Shown on calendar heading when selected day occurs on different year */
-#: ../js/ui/calendar.js:784
+#: ../js/ui/calendar.js:783
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %e. %Bta %Y"
 
-#: ../js/ui/calendar.js:795
+#: ../js/ui/calendar.js:794
 msgid "Today"
 msgstr "Tänään"
 
-#: ../js/ui/calendar.js:799
+#: ../js/ui/calendar.js:798
 msgid "Tomorrow"
 msgstr "Huomenna"
 
-#: ../js/ui/calendar.js:810
+#: ../js/ui/calendar.js:809
 msgid "This week"
 msgstr "Tällä viikolla"
 
-#: ../js/ui/calendar.js:818
+#: ../js/ui/calendar.js:817
 msgid "Next week"
 msgstr "Ensi viikolla"
 
@@ -616,8 +619,8 @@ msgstr "Salasana:"
 msgid "Type again:"
 msgstr "Uudelleen:"
 
-#: ../js/ui/components/networkAgent.js:131 ../js/ui/status/network.js:240
+#: ../js/ui/components/networkAgent.js:131 ../js/ui/status/network.js:250
-#: ../js/ui/status/network.js:317 ../js/ui/status/network.js:876
+#: ../js/ui/status/network.js:327 ../js/ui/status/network.js:886
 msgid "Connect"
 msgstr "Yhdistä"
 
@@ -651,6 +654,9 @@ msgstr "Langaton verkko vaatii tunnistautumisen"
 
 #: ../js/ui/components/networkAgent.js:312
 #, javascript-format
+#| msgid ""
+#| "Passwords or encryption keys are required to access the wireless network "
+#| "'%s'."
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
 "“%s”."
@@ -686,6 +692,7 @@ msgstr "Mobiililaajakaistan verkkosalasana"
 
 #: ../js/ui/components/networkAgent.js:339
 #, javascript-format
+#| msgid "A password is required to connect to '%s'."
 msgid "A password is required to connect to “%s”."
 msgstr "Salasana vaaditaan kohteeseen \"%s\" yhdistämiseksi."
 
@@ -735,18 +742,23 @@ msgstr "Vaimenna"
 
 #. Translators: Time in 24h format */
 #: ../js/ui/components/telepathyClient.js:955
+#| msgctxt "event list time"
+#| msgid "%H∶%M"
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
 #. Translators: this is the word "Yesterday" followed by a
 #. time string in 24h format. i.e. "Yesterday, 14:30" */
 #: ../js/ui/components/telepathyClient.js:962
+#| msgid "<b>Yesterday</b>, <b>%H:%M</b>"
 msgid "Yesterday, %H∶%M"
 msgstr "Eilen, %H∶%M"
 
 #. Translators: this is the week day name followed by a time
 #. string in 24h format. i.e. "Monday, 14:30" */
 #: ../js/ui/components/telepathyClient.js:969
+#| msgctxt "event list time"
+#| msgid "%H∶%M"
 msgid "%A, %H∶%M"
 msgstr "%A, %H∶%M"
 
@@ -754,6 +766,8 @@ msgstr "%A, %H∶%M"
 #. followed by a time string in 24h format.
 #. i.e. "May 25, 14:30" */
 #: ../js/ui/components/telepathyClient.js:976
+#| msgctxt "event list time"
+#| msgid "%H∶%M"
 msgid "%B %d, %H∶%M"
 msgstr "%e. %Bta, %H∶%M"
 
@@ -766,6 +780,8 @@ msgstr "%e. %Bta %Y, %H∶%M"
 
 #. Translators: Time in 24h format */
 #: ../js/ui/components/telepathyClient.js:991
+#| msgctxt "event list time"
+#| msgid "%l∶%M %p"
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
@@ -778,6 +794,7 @@ msgstr "Eilen, %l∶%M %p"
 #. Translators: this is the week day name followed by a time
 #. string in 12h format. i.e. "Monday, 2:30 pm" */
 #: ../js/ui/components/telepathyClient.js:1005
+#| msgid "%a %l:%M %p"
 msgid "%A, %l∶%M %p"
 msgstr "%A, %l∶%M %p"
 
@@ -995,22 +1012,22 @@ msgstr "Näytä sovellukset"
 msgid "Dash"
 msgstr "Pikavalikko"
 
-#: ../js/ui/dateMenu.js:91
+#: ../js/ui/dateMenu.js:86
 msgid "Open Calendar"
 msgstr "Avaa kalenteri"
 
-#: ../js/ui/dateMenu.js:95
+#: ../js/ui/dateMenu.js:90
 msgid "Open Clocks"
 msgstr "Avaa kellot"
 
-#: ../js/ui/dateMenu.js:102
+#: ../js/ui/dateMenu.js:97
 msgid "Date & Time Settings"
 msgstr "Ajan & päiväyksen asetukset"
 
 #. 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:192
+#: ../js/ui/dateMenu.js:187
 msgid "%A %B %e, %Y"
 msgstr "%A, %e. %Bta %Y"
 
@@ -1108,6 +1125,8 @@ msgstr[1] ""
 "sekunnin kuluttua."
 
 #: ../js/ui/endSessionDialog.js:129
+#| msgctxt "button"
+#| msgid "Restart & Install"
 msgctxt "button"
 msgid "Restart &amp; Install"
 msgstr "Käynnistä uudelleen ja asenna"
@@ -1154,6 +1173,7 @@ msgstr "Asenna"
 
 #: ../js/ui/extensionDownloader.js:204
 #, javascript-format
+#| msgid "Download and install '%s' from extensions.gnome.org?"
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "Ladataanko ja asennetaanko ”%s” sivustolta extensions.gnome.org?"
 
@@ -1187,7 +1207,7 @@ msgstr "Käytössä"
 #. because it's disabled by rfkill (airplane mode) */
 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:717 ../js/ui/status/network.js:550
+#: ../js/ui/lookingGlass.js:717 ../js/ui/status/network.js:560
 #: ../src/gvc/gvc-mixer-control.c:1830
 msgid "Disabled"
 msgstr "Ei käytössä"
@@ -1212,39 +1232,39 @@ msgstr "Näytä lähde"
 msgid "Web Page"
 msgstr "Verkkosivusto"
 
-#: ../js/ui/messageTray.js:1326
+#: ../js/ui/messageTray.js:1324
 msgid "Open"
 msgstr "Avaa"
 
-#: ../js/ui/messageTray.js:1333
+#: ../js/ui/messageTray.js:1331
 msgid "Remove"
 msgstr "Poista"
 
-#: ../js/ui/messageTray.js:1630
+#: ../js/ui/messageTray.js:1628
 msgid "Notifications"
 msgstr "Ilmoitukset"
 
-#: ../js/ui/messageTray.js:1637
+#: ../js/ui/messageTray.js:1635
 msgid "Clear Messages"
 msgstr "Tyhjennä viestit"
 
-#: ../js/ui/messageTray.js:1656
+#: ../js/ui/messageTray.js:1654
 msgid "Notification Settings"
 msgstr "Ilmoitusasetukset"
 
-#: ../js/ui/messageTray.js:1709
+#: ../js/ui/messageTray.js:1707
 msgid "Tray Menu"
 msgstr "Viestialuevalikko"
 
-#: ../js/ui/messageTray.js:1926
+#: ../js/ui/messageTray.js:1924
 msgid "No Messages"
 msgstr "Ei viestejä"
 
-#: ../js/ui/messageTray.js:1964
+#: ../js/ui/messageTray.js:1962
 msgid "Message Tray"
 msgstr "Viestialue"
 
-#: ../js/ui/messageTray.js:2948
+#: ../js/ui/messageTray.js:2946
 msgid "System Information"
 msgstr "Järjestelmän tiedot"
 
@@ -1411,10 +1431,10 @@ msgstr "Suuri tekstin koko"
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../js/ui/status/bluetooth.js:50 ../js/ui/status/location.js:59
+#: ../js/ui/status/bluetooth.js:50 ../js/ui/status/location.js:62
-#: ../js/ui/status/location.js:159 ../js/ui/status/network.js:151
+#: ../js/ui/status/location.js:162 ../js/ui/status/network.js:151
-#: ../js/ui/status/network.js:318 ../js/ui/status/network.js:1225
+#: ../js/ui/status/network.js:328 ../js/ui/status/network.js:1235
-#: ../js/ui/status/network.js:1336 ../js/ui/status/rfkill.js:85
+#: ../js/ui/status/network.js:1346 ../js/ui/status/rfkill.js:85
 #: ../js/ui/status/rfkill.js:105
 msgid "Turn Off"
 msgstr "Sammuta"
@@ -1430,7 +1450,7 @@ msgid_plural "%d Connected Devices"
 msgstr[0] "%d yhdistetty laite"
 msgstr[1] "%d yhdistettyä laitetta"
 
-#: ../js/ui/status/bluetooth.js:102 ../js/ui/status/network.js:1253
+#: ../js/ui/status/bluetooth.js:102 ../js/ui/status/network.js:1263
 msgid "Not Connected"
 msgstr "Ei yhdistetty"
 
@@ -1443,20 +1463,21 @@ msgid "Show Keyboard Layout"
 msgstr "Näytä näppäimistön asettelu"
 
 #: ../js/ui/status/location.js:52
+#| msgid "Notifications"
 msgid "Location"
 msgstr "Sijainti"
 
-#: ../js/ui/status/location.js:58 ../js/ui/status/location.js:158
+#: ../js/ui/status/location.js:61 ../js/ui/status/location.js:161
 #: ../js/ui/status/rfkill.js:84
 msgid "On"
 msgstr "Päällä"
 
-#: ../js/ui/status/location.js:155 ../js/ui/status/network.js:415
+#: ../js/ui/status/location.js:158 ../js/ui/status/network.js:246
-#: ../js/ui/status/network.js:1251 ../js/ui/status/network.js:1455
+#: ../js/ui/status/network.js:425 ../js/ui/status/network.js:1261
 msgid "Off"
 msgstr "Pois"
 
-#: ../js/ui/status/location.js:156 ../js/ui/status/network.js:1225
+#: ../js/ui/status/location.js:159 ../js/ui/status/network.js:1235
 msgid "Turn On"
 msgstr "Ota käyttöön"
 
@@ -1464,127 +1485,130 @@ msgstr "Ota käyttöön"
 msgid "<unknown>"
 msgstr "<tuntematon>"
 
-#: ../js/ui/status/network.js:417
-#| msgid "Connect"
-msgid "Connected"
-msgstr "Yhdistetty"
-
 #. 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:421
+#: ../js/ui/status/network.js:431
 msgid "unmanaged"
 msgstr "ei hallinnassa"
 
-#: ../js/ui/status/network.js:423
+#: ../js/ui/status/network.js:433
 msgid "disconnecting..."
 msgstr "katkaistaan yhteyttä…"
 
-#: ../js/ui/status/network.js:429 ../js/ui/status/network.js:1353
+#: ../js/ui/status/network.js:439 ../js/ui/status/network.js:1363
 msgid "connecting..."
 msgstr "yhdistetään…"
 
 #. Translators: this is for network connections that require some kind of key or password */
-#: ../js/ui/status/network.js:432 ../js/ui/status/network.js:1356
+#: ../js/ui/status/network.js:442 ../js/ui/status/network.js:1366
 msgid "authentication required"
 msgstr "tunnistautuminen vaaditaan"
 
 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing */
-#: ../js/ui/status/network.js:440
+#: ../js/ui/status/network.js:450
 msgid "firmware missing"
 msgstr "laiteohjelmisto puuttuu"
 
 #. 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:444
+#: ../js/ui/status/network.js:454
 msgid "unavailable"
 msgstr "ei käytettävissä"
 
-#: ../js/ui/status/network.js:446 ../js/ui/status/network.js:1358
+#: ../js/ui/status/network.js:456 ../js/ui/status/network.js:1368
 msgid "connection failed"
 msgstr "yhteys katkesi"
 
-#: ../js/ui/status/network.js:462
+#: ../js/ui/status/network.js:472
+#| msgid "Wi-Fi Settings"
 msgid "Wired Settings"
 msgstr "Kiinteän yhteyden asetukset"
 
-#: ../js/ui/status/network.js:504 ../js/ui/status/network.js:582
+#: ../js/ui/status/network.js:514 ../js/ui/status/network.js:592
 msgid "Mobile Broadband Settings"
 msgstr "Mobiililaajakaistan asetukset"
 
-#: ../js/ui/status/network.js:546 ../js/ui/status/network.js:1249
+#: ../js/ui/status/network.js:556 ../js/ui/status/network.js:1259
+#| msgid "hardware disabled"
 msgid "Hardware Disabled"
 msgstr "Laite on pois käytöstä"
 
-#: ../js/ui/status/network.js:590
+#: ../js/ui/status/network.js:600
 msgid "Use as Internet connection"
 msgstr "Käytä internetyhteytenä"
 
-#: ../js/ui/status/network.js:771
+#: ../js/ui/status/network.js:781
+#| msgid "Airplane Mode"
 msgid "Airplane Mode is On"
 msgstr "Lentokonetila on päällä"
 
-#: ../js/ui/status/network.js:772
+#: ../js/ui/status/network.js:782
 msgid "Wi-Fi is disabled when airplane mode is on."
 msgstr "Wifi on pois päältä lentokonetilan ollessa päällä."
 
-#: ../js/ui/status/network.js:773
+#: ../js/ui/status/network.js:783
+#| msgid "Airplane Mode"
 msgid "Turn Off Airplane Mode"
 msgstr "Käytä lentokonetilaa"
 
-#: ../js/ui/status/network.js:782
+#: ../js/ui/status/network.js:792
+#| msgid "Wi-Fi Settings"
 msgid "Wi-Fi is Off"
 msgstr "Wifi on pois"
 
-#: ../js/ui/status/network.js:783
+#: ../js/ui/status/network.js:793
 msgid "Wi-Fi needs to be turned on in order to connect to a network."
 msgstr "Wifin tulee olla päällä, jotta yhteys verkkoon on mahdollinen."
 
-#: ../js/ui/status/network.js:784
+#: ../js/ui/status/network.js:794
+#| msgid "Turn On"
 msgid "Turn On Wi-Fi"
 msgstr "Ota wifi käyttöön"
 
-#: ../js/ui/status/network.js:809
+#: ../js/ui/status/network.js:819
 msgid "Wi-Fi Networks"
 msgstr "Wifi-verkot"
 
-#: ../js/ui/status/network.js:811
+#: ../js/ui/status/network.js:821
 msgid "Select a network"
 msgstr "Valitse verkko"
 
-#: ../js/ui/status/network.js:840
+#: ../js/ui/status/network.js:850
 msgid "No Networks"
 msgstr "Ei verkkoja"
 
-#: ../js/ui/status/network.js:861 ../js/ui/status/rfkill.js:103
+#: ../js/ui/status/network.js:871 ../js/ui/status/rfkill.js:103
 msgid "Use hardware switch to turn off"
-msgstr "Käytä laitepainiketta sammuttaaksesi"
+msgstr ""
 
-#: ../js/ui/status/network.js:1131
+#: ../js/ui/status/network.js:1141
 msgid "Select Network"
 msgstr "Valitse verkko"
 
-#: ../js/ui/status/network.js:1137
+#: ../js/ui/status/network.js:1147
 msgid "Wi-Fi Settings"
 msgstr "Wifin asetukset"
 
-#: ../js/ui/status/network.js:1242
+#: ../js/ui/status/network.js:1252
 msgid "Hotspot Active"
 msgstr "Yhteyspiste aktiivisena"
 
-#: ../js/ui/status/network.js:1245
+#: ../js/ui/status/network.js:1255
+#| msgid "Connection"
 msgid "Connecting"
 msgstr "Yhdistetään"
 
-#: ../js/ui/status/network.js:1424 ../js/ui/status/rfkill.js:88
+#: ../js/ui/status/network.js:1434 ../js/ui/status/rfkill.js:88
 msgid "Network Settings"
 msgstr "Verkkoasetukset"
 
-#: ../js/ui/status/network.js:1426
+#: ../js/ui/status/network.js:1436
+#| msgid "Settings"
 msgid "VPN Settings"
 msgstr "VPN-asetukset"
 
-#: ../js/ui/status/network.js:1445
+#: ../js/ui/status/network.js:1455
 msgid "VPN"
 msgstr "VPN"
 
@@ -1684,6 +1708,7 @@ msgstr "Haku"
 
 #: ../js/ui/windowAttentionHandler.js:19
 #, javascript-format
+#| msgid "'%s' is ready"
 msgid "“%s” is ready"
 msgstr "“%s” on valmis"
 
@@ -1753,6 +1778,7 @@ msgstr "Listaa mahdolliset tilat"
 
 #: ../src/shell-app.c:666
 #, c-format
+#| msgid "Failed to launch '%s'"
 msgid "Failed to launch “%s”"
 msgstr "Sovelluksen ”%s” käynnistäminen epäonnistui"
 

po/gl.po

@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-31 23:35+0200\n"
+"POT-Creation-Date: 2014-03-06 12:27+0100\n"
-"PO-Revision-Date: 2014-03-31 23:35+0200\n"
+"PO-Revision-Date: 2014-03-06 12:27+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
 "Language-Team: gnome-l10n-gl@gnome.org\n"
 "Language: gl\n"
@@ -314,7 +314,7 @@ msgstr ""
 #: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:136
 #: ../js/ui/components/polkitAgent.js:166 ../js/ui/endSessionDialog.js:429
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
-#: ../js/ui/status/network.js:878
+#: ../js/ui/status/network.js:873
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -332,25 +332,25 @@ msgctxt "button"
 msgid "Sign In"
 msgstr "Iniciar sesión"
 
-#: ../js/gdm/loginDialog.js:271
+#: ../js/gdm/loginDialog.js:270
 msgid "Choose Session"
 msgstr "Escolla unha sesión"
 
-#: ../js/gdm/loginDialog.js:431
+#: ../js/gdm/loginDialog.js:430
 msgid "Not listed?"
 msgstr "Non está na lista?"
 
-#: ../js/gdm/loginDialog.js:614
+#: ../js/gdm/loginDialog.js:598
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(p.ex., usuario ou %s)"
 
-#: ../js/gdm/loginDialog.js:619 ../js/ui/components/networkAgent.js:262
+#: ../js/gdm/loginDialog.js:603 ../js/ui/components/networkAgent.js:262
 #: ../js/ui/components/networkAgent.js:280
 msgid "Username: "
 msgstr "Nome de usuario: "
 
-#: ../js/gdm/loginDialog.js:920
+#: ../js/gdm/loginDialog.js:868
 msgid "Login Window"
 msgstr "Xanela de inicio de sesión"
 
@@ -375,27 +375,27 @@ msgstr "Non foi posíbel analizar a orde:"
 msgid "Execution of “%s” failed:"
 msgstr "Produciuse un fallo na execución de «%s»:"
 
-#: ../js/ui/appDisplay.js:636
+#: ../js/ui/appDisplay.js:629
 msgid "Frequently used applications will appear here"
 msgstr "Os aplicativos usados recentemente aparecerán aquí"
 
-#: ../js/ui/appDisplay.js:747
+#: ../js/ui/appDisplay.js:740
 msgid "Frequent"
 msgstr "Frecuentes"
 
-#: ../js/ui/appDisplay.js:754
+#: ../js/ui/appDisplay.js:747
 msgid "All"
 msgstr "Todos"
 
-#: ../js/ui/appDisplay.js:1566
+#: ../js/ui/appDisplay.js:1552
 msgid "New Window"
 msgstr "Xanela nova"
 
-#: ../js/ui/appDisplay.js:1588 ../js/ui/dash.js:285
+#: ../js/ui/appDisplay.js:1574 ../js/ui/dash.js:285
 msgid "Remove from Favorites"
 msgstr "Retirar dos marcadores"
 
-#: ../js/ui/appDisplay.js:1594
+#: ../js/ui/appDisplay.js:1580
 msgid "Add to Favorites"
 msgstr "Engadir aos favoritos"
 
@@ -538,44 +538,44 @@ msgstr "S"
 msgid "calendar:MY"
 msgstr "calendar:MY"
 
-#: ../js/ui/calendar.js:450
+#: ../js/ui/calendar.js:446
 msgid "Previous month"
 msgstr "Anterior mes"
 
-#: ../js/ui/calendar.js:460
+#: ../js/ui/calendar.js:456
 msgid "Next month"
 msgstr "Seguinte mes"
 
 #. Translators: Text to show if there are no events */
-#: ../js/ui/calendar.js:772
+#: ../js/ui/calendar.js:763
 msgid "Nothing Scheduled"
 msgstr "Nada programado"
 
 #. Translators: Shown on calendar heading when selected day occurs on current year */
-#: ../js/ui/calendar.js:790
+#: ../js/ui/calendar.js:781
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %d de %B"
 
 #. Translators: Shown on calendar heading when selected day occurs on different year */
-#: ../js/ui/calendar.js:793
+#: ../js/ui/calendar.js:784
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: ../js/ui/calendar.js:804
+#: ../js/ui/calendar.js:795
 msgid "Today"
 msgstr "Hoxe"
 
-#: ../js/ui/calendar.js:808
+#: ../js/ui/calendar.js:799
 msgid "Tomorrow"
 msgstr "Mañá"
 
-#: ../js/ui/calendar.js:819
+#: ../js/ui/calendar.js:810
 msgid "This week"
 msgstr "Esta semana"
 
-#: ../js/ui/calendar.js:827
+#: ../js/ui/calendar.js:818
 msgid "Next week"
 msgstr "A vindeira semana"
 
@@ -609,7 +609,7 @@ msgid "Type again:"
 msgstr "Escriba de novo:"
 
 #: ../js/ui/components/networkAgent.js:131 ../js/ui/status/network.js:240
-#: ../js/ui/status/network.js:322 ../js/ui/status/network.js:881
+#: ../js/ui/status/network.js:317 ../js/ui/status/network.js:876
 msgid "Connect"
 msgstr "Conectar"
 
@@ -814,13 +814,13 @@ msgstr "%s estalle convidando a unirse a %s"
 #: ../js/ui/components/telepathyClient.js:1164
 #: ../js/ui/components/telepathyClient.js:1199
 #: ../js/ui/components/telepathyClient.js:1233
-#: ../js/ui/components/telepathyClient.js:1291
+#: ../js/ui/components/telepathyClient.js:1290
 msgid "Decline"
 msgstr "Rexeitar"
 
 #: ../js/ui/components/telepathyClient.js:1170
 #: ../js/ui/components/telepathyClient.js:1239
-#: ../js/ui/components/telepathyClient.js:1296
+#: ../js/ui/components/telepathyClient.js:1295
 msgid "Accept"
 msgstr "Aceptar"
 
@@ -857,101 +857,101 @@ msgstr "%s esta enviándolle %s"
 msgid "%s would like permission to see when you are online"
 msgstr "%s solicítalle permiso para ver cando está en liña"
 
-#: ../js/ui/components/telepathyClient.js:1342
+#: ../js/ui/components/telepathyClient.js:1341
 msgid "Network error"
 msgstr "Erro da rede"
 
-#: ../js/ui/components/telepathyClient.js:1344
+#: ../js/ui/components/telepathyClient.js:1343
 msgid "Authentication failed"
 msgstr "Fallou a autenticación"
 
-#: ../js/ui/components/telepathyClient.js:1346
+#: ../js/ui/components/telepathyClient.js:1345
 msgid "Encryption error"
 msgstr "Erro de cifrado"
 
-#: ../js/ui/components/telepathyClient.js:1348
+#: ../js/ui/components/telepathyClient.js:1347
 msgid "Certificate not provided"
 msgstr "Certificado non fornecido"
 
-#: ../js/ui/components/telepathyClient.js:1350
+#: ../js/ui/components/telepathyClient.js:1349
 msgid "Certificate untrusted"
 msgstr "Non se confía no certificado"
 
-#: ../js/ui/components/telepathyClient.js:1352
+#: ../js/ui/components/telepathyClient.js:1351
 msgid "Certificate expired"
 msgstr "Certificado caducado"
 
-#: ../js/ui/components/telepathyClient.js:1354
+#: ../js/ui/components/telepathyClient.js:1353
 msgid "Certificate not activated"
 msgstr "Certificado non activado"
 
-#: ../js/ui/components/telepathyClient.js:1356
+#: ../js/ui/components/telepathyClient.js:1355
 msgid "Certificate hostname mismatch"
 msgstr "O nome do servidor do certificado non coincide"
 
-#: ../js/ui/components/telepathyClient.js:1358
+#: ../js/ui/components/telepathyClient.js:1357
 msgid "Certificate fingerprint mismatch"
 msgstr "A pegada do certificado non coincide"
 
-#: ../js/ui/components/telepathyClient.js:1360
+#: ../js/ui/components/telepathyClient.js:1359
 msgid "Certificate self-signed"
 msgstr "Certificado autoasinado"
 
-#: ../js/ui/components/telepathyClient.js:1362
+#: ../js/ui/components/telepathyClient.js:1361
 msgid "Status is set to offline"
 msgstr "O estado está definido a «desconectado»"
 
-#: ../js/ui/components/telepathyClient.js:1364
+#: ../js/ui/components/telepathyClient.js:1363
 msgid "Encryption is not available"
 msgstr "O cifrado non está dispoñíbel"
 
-#: ../js/ui/components/telepathyClient.js:1366
+#: ../js/ui/components/telepathyClient.js:1365
 msgid "Certificate is invalid"
 msgstr "O certificado non é válido"
 
-#: ../js/ui/components/telepathyClient.js:1368
+#: ../js/ui/components/telepathyClient.js:1367
 msgid "Connection has been refused"
 msgstr "Rexeitouse a conexión"
 
-#: ../js/ui/components/telepathyClient.js:1370
+#: ../js/ui/components/telepathyClient.js:1369
 msgid "Connection can't be established"
 msgstr "Non é posíbel estabelecer a conexión"
 
-#: ../js/ui/components/telepathyClient.js:1372
+#: ../js/ui/components/telepathyClient.js:1371
 msgid "Connection has been lost"
 msgstr "Perdeuse a conexión"
 
-#: ../js/ui/components/telepathyClient.js:1374
+#: ../js/ui/components/telepathyClient.js:1373
 msgid "This account is already connected to the server"
 msgstr "Esta cuenta xa está conectada ao servidor"
 
-#: ../js/ui/components/telepathyClient.js:1376
+#: ../js/ui/components/telepathyClient.js:1375
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Substituíuse a conexión por unha nova conexión empregando o mesmo recurso"
 
-#: ../js/ui/components/telepathyClient.js:1378
+#: ../js/ui/components/telepathyClient.js:1377
 msgid "The account already exists on the server"
 msgstr "Esta conta xa existe no servidor"
 
-#: ../js/ui/components/telepathyClient.js:1380
+#: ../js/ui/components/telepathyClient.js:1379
 msgid "Server is currently too busy to handle the connection"
 msgstr ""
 "Nestes intres o servidor está moi ocupado tentando xestionar a conexión"
 
-#: ../js/ui/components/telepathyClient.js:1382
+#: ../js/ui/components/telepathyClient.js:1381
 msgid "Certificate has been revoked"
 msgstr "Revogouse o certificado"
 
-#: ../js/ui/components/telepathyClient.js:1384
+#: ../js/ui/components/telepathyClient.js:1383
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "O certificado usa un algoritmo de cifrado inseguro ou é criptográficamente "
 "débil"
 
-#: ../js/ui/components/telepathyClient.js:1386
+#: ../js/ui/components/telepathyClient.js:1385
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -960,22 +960,22 @@ msgstr ""
 "certificado do servidor excede os límites impostos pola biblioteca de "
 "criptografía."
 
-#: ../js/ui/components/telepathyClient.js:1388
+#: ../js/ui/components/telepathyClient.js:1387
 msgid "Internal error"
 msgstr "Erro interno"
 
 #. translators: argument is the account name, like
 #. * name@jabber.org for example. */
-#: ../js/ui/components/telepathyClient.js:1398
+#: ../js/ui/components/telepathyClient.js:1397
 #, javascript-format
 msgid "Unable to connect to %s"
 msgstr "Non foi posíbel conectarse a %s"
 
-#: ../js/ui/components/telepathyClient.js:1403
+#: ../js/ui/components/telepathyClient.js:1402
 msgid "View account"
 msgstr "Ver conta"
 
-#: ../js/ui/components/telepathyClient.js:1440
+#: ../js/ui/components/telepathyClient.js:1434
 msgid "Unknown reason"
 msgstr "Razón descoñecida"
 
@@ -1153,26 +1153,25 @@ msgstr "Desexa descargar e instalar «%s» desde extensions.gnome.org?"
 msgid "Keyboard"
 msgstr "Teclado"
 
-#: ../js/ui/lookingGlass.js:643
+#: ../js/ui/lookingGlass.js:641
 msgid "No extensions installed"
 msgstr "Non hai ningunha extensión instalada"
 
 #. Translators: argument is an extension UUID. */
-#: ../js/ui/lookingGlass.js:697
+#: ../js/ui/lookingGlass.js:695
 #, javascript-format
 msgid "%s has not emitted any errors."
 msgstr "%s non emitiu ningún erro."
 
-#: ../js/ui/lookingGlass.js:703
+#: ../js/ui/lookingGlass.js:701
 msgid "Hide Errors"
 msgstr "Ocultar erros"
 
-#: ../js/ui/lookingGlass.js:707 ../js/ui/lookingGlass.js:767
+#: ../js/ui/lookingGlass.js:705 ../js/ui/lookingGlass.js:765
 msgid "Show Errors"
 msgstr "Mostrar erros"
 
-#: ../js/ui/lookingGlass.js:716 ../js/ui/status/location.js:59
+#: ../js/ui/lookingGlass.js:714
-#: ../js/ui/status/location.js:167
 msgid "Enabled"
 msgstr "Activado"
 
@@ -1180,28 +1179,28 @@ msgstr "Activado"
 #. because it's disabled by rfkill (airplane mode) */
 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:719 ../js/ui/status/location.js:164
+#: ../js/ui/lookingGlass.js:717 ../js/ui/status/network.js:550
-#: ../js/ui/status/network.js:555 ../src/gvc/gvc-mixer-control.c:1830
+#: ../src/gvc/gvc-mixer-control.c:1830
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: ../js/ui/lookingGlass.js:721
+#: ../js/ui/lookingGlass.js:719
 msgid "Error"
 msgstr "Erro"
 
-#: ../js/ui/lookingGlass.js:723
+#: ../js/ui/lookingGlass.js:721
 msgid "Out of date"
 msgstr "Obsoleto"
 
-#: ../js/ui/lookingGlass.js:725
+#: ../js/ui/lookingGlass.js:723
 msgid "Downloading"
 msgstr "Descargando"
 
-#: ../js/ui/lookingGlass.js:749
+#: ../js/ui/lookingGlass.js:747
 msgid "View Source"
 msgstr "Ver fonte"
 
-#: ../js/ui/lookingGlass.js:758
+#: ../js/ui/lookingGlass.js:756
 msgid "Web Page"
 msgstr "Páxina web"
 
@@ -1237,7 +1236,7 @@ msgstr "Non hai mensaxes"
 msgid "Message Tray"
 msgstr "Bandexa de mensaxes"
 
-#: ../js/ui/messageTray.js:2962
+#: ../js/ui/messageTray.js:2948
 msgid "System Information"
 msgstr "Información do sistema"
 
@@ -1253,11 +1252,11 @@ msgid_plural "%d new messages"
 msgstr[0] "%d mensaxe nova"
 msgstr[1] "%d mensaxes novas"
 
-#: ../js/ui/overview.js:84
+#: ../js/ui/overview.js:83
 msgid "Undo"
 msgstr "Desfacer"
 
-#: ../js/ui/overview.js:124
+#: ../js/ui/overview.js:123
 msgid "Overview"
 msgstr "Vista xeral"
 
@@ -1265,7 +1264,7 @@ msgstr "Vista xeral"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters. */
-#: ../js/ui/overview.js:250
+#: ../js/ui/overview.js:257
 msgid "Type to search…"
 msgstr "Escriba para buscar…"
 
@@ -1308,27 +1307,27 @@ msgid_plural "%d new notifications"
 msgstr[0] "%d notificación nova"
 msgstr[1] "%d notificacións novas"
 
-#: ../js/ui/screenShield.js:474 ../js/ui/status/system.js:342
+#: ../js/ui/screenShield.js:473 ../js/ui/status/system.js:342
 msgid "Lock"
 msgstr "Bloquear"
 
-#: ../js/ui/screenShield.js:708
+#: ../js/ui/screenShield.js:707
 msgid "GNOME needs to lock the screen"
 msgstr "GNOME precisa bloquear a pantalla"
 
-#: ../js/ui/screenShield.js:835 ../js/ui/screenShield.js:1309
+#: ../js/ui/screenShield.js:834 ../js/ui/screenShield.js:1301
 msgid "Unable to lock"
 msgstr "Non foi posíbel bloquear"
 
-#: ../js/ui/screenShield.js:836 ../js/ui/screenShield.js:1310
+#: ../js/ui/screenShield.js:835 ../js/ui/screenShield.js:1302
 msgid "Lock was blocked by an application"
 msgstr "Un aplicativo impediu o bloqueo"
 
-#: ../js/ui/search.js:603
+#: ../js/ui/search.js:589
 msgid "Searching…"
 msgstr "Buscando…"
 
-#: ../js/ui/search.js:649
+#: ../js/ui/search.js:632
 msgid "No results."
 msgstr "Sen resultados."
 
@@ -1400,29 +1399,30 @@ msgstr "Contraste alto"
 msgid "Large Text"
 msgstr "Texto grande"
 
-#: ../js/ui/status/bluetooth.js:49
+#: ../js/ui/status/bluetooth.js:48
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../js/ui/status/bluetooth.js:51 ../js/ui/status/network.js:151
+#: ../js/ui/status/bluetooth.js:50 ../js/ui/status/location.js:59
-#: ../js/ui/status/network.js:323 ../js/ui/status/network.js:1234
+#: ../js/ui/status/location.js:159 ../js/ui/status/network.js:151
-#: ../js/ui/status/network.js:1345 ../js/ui/status/rfkill.js:85
+#: ../js/ui/status/network.js:318 ../js/ui/status/network.js:1225
+#: ../js/ui/status/network.js:1336 ../js/ui/status/rfkill.js:85
 #: ../js/ui/status/rfkill.js:105
 msgid "Turn Off"
 msgstr "Apagar"
 
-#: ../js/ui/status/bluetooth.js:54
+#: ../js/ui/status/bluetooth.js:53
 msgid "Bluetooth Settings"
 msgstr "Preferencias do Bluetooth"
 
-#: ../js/ui/status/bluetooth.js:104
+#: ../js/ui/status/bluetooth.js:100
 #, javascript-format
 msgid "%d Connected Device"
 msgid_plural "%d Connected Devices"
 msgstr[0] "%d dispositivo conectado"
 msgstr[1] "%d dispositivos conectados"
 
-#: ../js/ui/status/bluetooth.js:106 ../js/ui/status/network.js:1262
+#: ../js/ui/status/bluetooth.js:102 ../js/ui/status/network.js:1253
 msgid "Not Connected"
 msgstr "Non conectado"
 
@@ -1434,167 +1434,160 @@ msgstr "Brillo"
 msgid "Show Keyboard Layout"
 msgstr "Mostrar a distribución do teclado"
 
-#: ../js/ui/status/location.js:53
+#: ../js/ui/status/location.js:52
 msgid "Location"
 msgstr "Localización"
 
-#: ../js/ui/status/location.js:60 ../js/ui/status/location.js:168
+#: ../js/ui/status/location.js:58 ../js/ui/status/location.js:158
-msgid "Disable"
+#: ../js/ui/status/rfkill.js:84
+msgid "On"
+msgstr "Activado"
+
+#: ../js/ui/status/location.js:155 ../js/ui/status/network.js:415
+#: ../js/ui/status/network.js:1251 ../js/ui/status/network.js:1455
+msgid "Off"
 msgstr "Desactivar"
 
-#: ../js/ui/status/location.js:165
+#: ../js/ui/status/location.js:156 ../js/ui/status/network.js:1225
-msgid "Enable"
+msgid "Turn On"
 msgstr "Activar"
 
-#: ../js/ui/status/location.js:167
-msgid "In Use"
-msgstr "En uso"
-
 #: ../js/ui/status/network.js:74
 msgid "<unknown>"
 msgstr "<descoñecido>"
 
-#: ../js/ui/status/network.js:420 ../js/ui/status/network.js:1260
+#: ../js/ui/status/network.js:417
-#: ../js/ui/status/network.js:1464
-msgid "Off"
-msgstr "Desactivar"
-
-#: ../js/ui/status/network.js:422
 msgid "Connected"
 msgstr "Conectado"
 
 #. 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:426
+#: ../js/ui/status/network.js:421
 msgid "unmanaged"
 msgstr "non xestionada"
 
-#: ../js/ui/status/network.js:428
+#: ../js/ui/status/network.js:423
 msgid "disconnecting..."
 msgstr "desconectando…"
 
-#: ../js/ui/status/network.js:434 ../js/ui/status/network.js:1362
+#: ../js/ui/status/network.js:429 ../js/ui/status/network.js:1353
 msgid "connecting..."
 msgstr "conectando…"
 
 #. Translators: this is for network connections that require some kind of key or password */
-#: ../js/ui/status/network.js:437 ../js/ui/status/network.js:1365
+#: ../js/ui/status/network.js:432 ../js/ui/status/network.js:1356
 msgid "authentication required"
 msgstr "requírese autenticación"
 
 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing */
-#: ../js/ui/status/network.js:445
+#: ../js/ui/status/network.js:440
 msgid "firmware missing"
 msgstr "falta o «firmware»"
 
 #. 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:449
+#: ../js/ui/status/network.js:444
 msgid "unavailable"
 msgstr "non dispoñíbel"
 
-#: ../js/ui/status/network.js:451 ../js/ui/status/network.js:1367
+#: ../js/ui/status/network.js:446 ../js/ui/status/network.js:1358
 msgid "connection failed"
 msgstr "conexión fallada"
 
-#: ../js/ui/status/network.js:467
+#: ../js/ui/status/network.js:462
 msgid "Wired Settings"
 msgstr "Preferencias da rede con fíos"
 
-#: ../js/ui/status/network.js:509 ../js/ui/status/network.js:587
+#: ../js/ui/status/network.js:504 ../js/ui/status/network.js:582
 msgid "Mobile Broadband Settings"
 msgstr "Preferencias da banda larga móbil"
 
-#: ../js/ui/status/network.js:551 ../js/ui/status/network.js:1258
+#: ../js/ui/status/network.js:546 ../js/ui/status/network.js:1249
 msgid "Hardware Disabled"
 msgstr "Hardware desactivado"
 
-#: ../js/ui/status/network.js:595
+#: ../js/ui/status/network.js:590
 msgid "Use as Internet connection"
 msgstr "Usar como conexión a Internet"
 
-#: ../js/ui/status/network.js:776
+#: ../js/ui/status/network.js:771
 msgid "Airplane Mode is On"
 msgstr "Modo avión activado"
 
-#: ../js/ui/status/network.js:777
+#: ../js/ui/status/network.js:772
 msgid "Wi-Fi is disabled when airplane mode is on."
 msgstr "A Wifi está desactivada cando o modo avión está activo."
 
-#: ../js/ui/status/network.js:778
+#: ../js/ui/status/network.js:773
 msgid "Turn Off Airplane Mode"
 msgstr "Desactivar o modo avión"
 
-#: ../js/ui/status/network.js:787
+#: ../js/ui/status/network.js:782
 msgid "Wi-Fi is Off"
 msgstr "Wifi desactivada"
 
-#: ../js/ui/status/network.js:788
+#: ../js/ui/status/network.js:783
 msgid "Wi-Fi needs to be turned on in order to connect to a network."
 msgstr "A Wifi precisa activarse para poder conectarse á rede."
 
-#: ../js/ui/status/network.js:789
+#: ../js/ui/status/network.js:784
 msgid "Turn On Wi-Fi"
 msgstr "Activar Wifi"
 
-#: ../js/ui/status/network.js:814
+#: ../js/ui/status/network.js:809
 msgid "Wi-Fi Networks"
 msgstr "Redes WiFi"
 
-#: ../js/ui/status/network.js:816
+#: ../js/ui/status/network.js:811
 msgid "Select a network"
 msgstr "Seleccione unha rede"
 
-#: ../js/ui/status/network.js:845
+#: ../js/ui/status/network.js:840
 msgid "No Networks"
 msgstr "Sen redes"
 
-#: ../js/ui/status/network.js:866 ../js/ui/status/rfkill.js:103
+#: ../js/ui/status/network.js:861 ../js/ui/status/rfkill.js:103
 msgid "Use hardware switch to turn off"
 msgstr "Usar interruptor hardware para apagar"
 
-#: ../js/ui/status/network.js:1136
+#: ../js/ui/status/network.js:1131
 msgid "Select Network"
 msgstr "Seleccione unha rede"
 
-#: ../js/ui/status/network.js:1142
+#: ../js/ui/status/network.js:1137
 msgid "Wi-Fi Settings"
 msgstr "Preferencias da WiFi"
 
-#: ../js/ui/status/network.js:1234
+#: ../js/ui/status/network.js:1242
-msgid "Turn On"
-msgstr "Activar"
-
-#: ../js/ui/status/network.js:1251
 msgid "Hotspot Active"
 msgstr "Punto wifi activo"
 
-#: ../js/ui/status/network.js:1254
+#: ../js/ui/status/network.js:1245
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../js/ui/status/network.js:1433 ../js/ui/status/rfkill.js:88
+#: ../js/ui/status/network.js:1424 ../js/ui/status/rfkill.js:88
 msgid "Network Settings"
 msgstr "Preferencias da rede"
 
-#: ../js/ui/status/network.js:1435
+#: ../js/ui/status/network.js:1426
 msgid "VPN Settings"
 msgstr "Preferencias de VPN"
 
-#: ../js/ui/status/network.js:1454
+#: ../js/ui/status/network.js:1445
 msgid "VPN"
 msgstr "VPN"
 
-#: ../js/ui/status/network.js:1607
+#: ../js/ui/status/network.js:1598
 msgid "Network Manager"
 msgstr "Xestor da rede"
 
-#: ../js/ui/status/network.js:1646
+#: ../js/ui/status/network.js:1637
 msgid "Connection failed"
 msgstr "Produciuse un fallo na conexión"
 
-#: ../js/ui/status/network.js:1647
+#: ../js/ui/status/network.js:1638
 msgid "Activation of network connection failed"
 msgstr "Produciuse un fallo na activación da conexión de rede"
 
@@ -1632,10 +1625,6 @@ msgstr "Batería"
 msgid "Airplane Mode"
 msgstr "Modo avión"
 
-#: ../js/ui/status/rfkill.js:84
-msgid "On"
-msgstr "Activado"
-
 #: ../js/ui/status/system.js:314
 msgid "Switch User"
 msgstr "Cambiar de usuario"

po/he.po

@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-27 20:22+0200\n"
+"POT-Creation-Date: 2014-03-05 18:57+0200\n"
-"PO-Revision-Date: 2014-03-27 20:24+0200\n"
+"PO-Revision-Date: 2014-03-05 18:58+0200\n"
 "Last-Translator: Yosef Or Boczko <yoseforb@gmail.com>\n"
 "Language-Team: עברית <>\n"
 "Language: he\n"
@@ -305,7 +305,7 @@ msgstr "יש לבחור את ההרחבה להגדרה באמצעות תיבת
 #: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:136
 #: ../js/ui/components/polkitAgent.js:166 ../js/ui/endSessionDialog.js:429
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
-#: ../js/ui/status/network.js:878
+#: ../js/ui/status/network.js:873
 msgid "Cancel"
 msgstr "ביטול"
 
@@ -323,25 +323,25 @@ msgctxt "button"
 msgid "Sign In"
 msgstr "כניסה"
 
-#: ../js/gdm/loginDialog.js:271
+#: ../js/gdm/loginDialog.js:270
 msgid "Choose Session"
 msgstr "בחירת הפעלה"
 
-#: ../js/gdm/loginDialog.js:431
+#: ../js/gdm/loginDialog.js:430
 msgid "Not listed?"
 msgstr "לא רשום?"
 
-#: ../js/gdm/loginDialog.js:611
+#: ../js/gdm/loginDialog.js:598
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(משתמש או %s לדוגמה)"
 
-#: ../js/gdm/loginDialog.js:616 ../js/ui/components/networkAgent.js:262
+#: ../js/gdm/loginDialog.js:603 ../js/ui/components/networkAgent.js:262
 #: ../js/ui/components/networkAgent.js:280
 msgid "Username: "
 msgstr "שם משתמש:"
 
-#: ../js/gdm/loginDialog.js:917
+#: ../js/gdm/loginDialog.js:868
 msgid "Login Window"
 msgstr "חלון כניסה"
 
@@ -366,27 +366,27 @@ msgstr "לא ניתן לפענח את הפקודה:"
 msgid "Execution of “%s” failed:"
 msgstr "ההרצה של „%s” נכשלה:"
 
-#: ../js/ui/appDisplay.js:636
+#: ../js/ui/appDisplay.js:629
 msgid "Frequently used applications will appear here"
 msgstr "יישומים בשימוש תדיר יופיעו כאן"
 
-#: ../js/ui/appDisplay.js:747
+#: ../js/ui/appDisplay.js:740
 msgid "Frequent"
 msgstr "תדיר"
 
-#: ../js/ui/appDisplay.js:754
+#: ../js/ui/appDisplay.js:747
 msgid "All"
 msgstr "הכול"
 
-#: ../js/ui/appDisplay.js:1566
+#: ../js/ui/appDisplay.js:1552
 msgid "New Window"
 msgstr "חלון חדש"
 
-#: ../js/ui/appDisplay.js:1588 ../js/ui/dash.js:285
+#: ../js/ui/appDisplay.js:1574 ../js/ui/dash.js:285
 msgid "Remove from Favorites"
 msgstr "הסרה מהמועדפים"
 
-#: ../js/ui/appDisplay.js:1594
+#: ../js/ui/appDisplay.js:1580
 msgid "Add to Favorites"
 msgstr "הוספה למועדפים"
 
@@ -529,44 +529,44 @@ msgstr "ש׳"
 msgid "calendar:MY"
 msgstr "calendar:YM"
 
-#: ../js/ui/calendar.js:450
+#: ../js/ui/calendar.js:446
 msgid "Previous month"
 msgstr "חודש קודם"
 
-#: ../js/ui/calendar.js:460
+#: ../js/ui/calendar.js:456
 msgid "Next month"
 msgstr "חודש הבא"
 
 #. Translators: Text to show if there are no events */
-#: ../js/ui/calendar.js:772
+#: ../js/ui/calendar.js:762
 msgid "Nothing Scheduled"
 msgstr "היומן ריק"
 
 #. Translators: Shown on calendar heading when selected day occurs on current year */
-#: ../js/ui/calendar.js:790
+#: ../js/ui/calendar.js:780
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, ה־%e ב%B"
 
 #. Translators: Shown on calendar heading when selected day occurs on different year */
-#: ../js/ui/calendar.js:793
+#: ../js/ui/calendar.js:783
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, ה־%e ב%B, %Y"
 
-#: ../js/ui/calendar.js:804
+#: ../js/ui/calendar.js:794
 msgid "Today"
 msgstr "היום"
 
-#: ../js/ui/calendar.js:808
+#: ../js/ui/calendar.js:798
 msgid "Tomorrow"
 msgstr "מחר"
 
-#: ../js/ui/calendar.js:819
+#: ../js/ui/calendar.js:809
 msgid "This week"
 msgstr "השבוע"
 
-#: ../js/ui/calendar.js:827
+#: ../js/ui/calendar.js:817
 msgid "Next week"
 msgstr "בשבוע הבא"
 
@@ -600,7 +600,7 @@ msgid "Type again:"
 msgstr "נא להקליד שוב:"
 
 #: ../js/ui/components/networkAgent.js:131 ../js/ui/status/network.js:240
-#: ../js/ui/status/network.js:322 ../js/ui/status/network.js:881
+#: ../js/ui/status/network.js:317 ../js/ui/status/network.js:876
 msgid "Connect"
 msgstr "התחברות"
 
@@ -725,7 +725,7 @@ msgstr "%H:%M"
 #. time string in 24h format. i.e. "Yesterday, 14:30" */
 #: ../js/ui/components/telepathyClient.js:962
 msgid "Yesterday, %H∶%M"
-msgstr "אתמול, %H\\u2236%M"
+msgstr "אתמול, %H:%M"
 
 #. Translators: this is the week day name followed by a time
 #. string in 24h format. i.e. "Monday, 14:30" */
@@ -745,7 +745,7 @@ msgstr "%d ב%B, %H:%M"
 #. i.e. "May 25 2012, 14:30" */
 #: ../js/ui/components/telepathyClient.js:982
 msgid "%B %d %Y, %H∶%M"
-msgstr "%d ב%B, %H:%M"
+msgstr "%d ב%B %Y, %H:%M"
 
 #. Translators: Time in 24h format */
 #: ../js/ui/components/telepathyClient.js:991
@@ -756,27 +756,27 @@ msgstr "%l:%M %p"
 #. time string in 12h format. i.e. "Yesterday, 2:30 pm" */
 #: ../js/ui/components/telepathyClient.js:998
 msgid "Yesterday, %l∶%M %p"
-msgstr "אתמול, %l\\u2236%M %p"
+msgstr "אתמול, %l:%M %p"
 
 #. Translators: this is the week day name followed by a time
 #. string in 12h format. i.e. "Monday, 2:30 pm" */
 #: ../js/ui/components/telepathyClient.js:1005
 msgid "%A, %l∶%M %p"
-msgstr "%l:%M %p"
+msgstr "%A, %l:%M %p"
 
 #. Translators: this is the month name and day number
 #. followed by a time string in 12h format.
 #. i.e. "May 25, 2:30 pm" */
 #: ../js/ui/components/telepathyClient.js:1012
 msgid "%B %d, %l∶%M %p"
-msgstr "%d ב%B, %H:%M"
+msgstr "%d ב%B, %l:%M %p"
 
 #. Translators: this is the month name, day number, year
 #. number followed by a time string in 12h format.
 #. i.e. "May 25 2012, 2:30 pm"*/
 #: ../js/ui/components/telepathyClient.js:1018
 msgid "%B %d %Y, %l∶%M %p"
-msgstr "%d ב%B %Y, %l\\u2236%M %p"
+msgstr "%d ב%B %Y, %l:%M %p"
 
 #. Translators: this is the other person changing their old IM name to their new
 #. IM name. */
@@ -959,7 +959,7 @@ msgstr "לא ניתן להתחבר אל %s"
 msgid "View account"
 msgstr "צפייה בחשבון"
 
-#: ../js/ui/components/telepathyClient.js:1439
+#: ../js/ui/components/telepathyClient.js:1434
 msgid "Unknown reason"
 msgstr "סיבה לא ידועה"
 
@@ -1044,7 +1044,7 @@ msgstr[1] "המערכת תכבה אוטומטית בעוד %d שניות."
 #: ../js/ui/endSessionDialog.js:93
 msgctxt "checkbox"
 msgid "Install pending software updates"
-msgstr "התקנת עדכוני תכנה בהמתנה"
+msgstr ""
 
 #: ../js/ui/endSessionDialog.js:96 ../js/ui/endSessionDialog.js:113
 msgctxt "button"
@@ -1133,26 +1133,25 @@ msgstr "הורדה והתקנה של „%s” מ־extensions.gnome.org?"
 msgid "Keyboard"
 msgstr "מקלדת"
 
-#: ../js/ui/lookingGlass.js:643
+#: ../js/ui/lookingGlass.js:641
 msgid "No extensions installed"
 msgstr "לא מותקנות הרחבות"
 
 #. Translators: argument is an extension UUID. */
-#: ../js/ui/lookingGlass.js:697
+#: ../js/ui/lookingGlass.js:695
 #, javascript-format
 msgid "%s has not emitted any errors."
 msgstr "‏%s לא העלה שגיאות כלשהן."
 
-#: ../js/ui/lookingGlass.js:703
+#: ../js/ui/lookingGlass.js:701
 msgid "Hide Errors"
 msgstr "הסתרת השגיאות"
 
-#: ../js/ui/lookingGlass.js:707 ../js/ui/lookingGlass.js:767
+#: ../js/ui/lookingGlass.js:705 ../js/ui/lookingGlass.js:765
 msgid "Show Errors"
 msgstr "הצגת השגיאות"
 
-#: ../js/ui/lookingGlass.js:716 ../js/ui/status/location.js:59
+#: ../js/ui/lookingGlass.js:714
-#: ../js/ui/status/location.js:167
 msgid "Enabled"
 msgstr "פעיל"
 
@@ -1160,28 +1159,28 @@ msgstr "פעיל"
 #. because it's disabled by rfkill (airplane mode) */
 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:719 ../js/ui/status/location.js:164
+#: ../js/ui/lookingGlass.js:717 ../js/ui/status/network.js:550
-#: ../js/ui/status/network.js:555 ../src/gvc/gvc-mixer-control.c:1830
+#: ../src/gvc/gvc-mixer-control.c:1830
 msgid "Disabled"
 msgstr "מנוטרל"
 
-#: ../js/ui/lookingGlass.js:721
+#: ../js/ui/lookingGlass.js:719
 msgid "Error"
 msgstr "שגיאה"
 
-#: ../js/ui/lookingGlass.js:723
+#: ../js/ui/lookingGlass.js:721
 msgid "Out of date"
 msgstr "לא בתוקף"
 
-#: ../js/ui/lookingGlass.js:725
+#: ../js/ui/lookingGlass.js:723
 msgid "Downloading"
 msgstr "בהורדה"
 
-#: ../js/ui/lookingGlass.js:749
+#: ../js/ui/lookingGlass.js:747
 msgid "View Source"
 msgstr "צפייה במקור"
 
-#: ../js/ui/lookingGlass.js:758
+#: ../js/ui/lookingGlass.js:756
 msgid "Web Page"
 msgstr "דף אינטרנט"
 
@@ -1217,7 +1216,7 @@ msgstr "אין הודעות"
 msgid "Message Tray"
 msgstr "אזור דיווח ההודעות"
 
-#: ../js/ui/messageTray.js:2962
+#: ../js/ui/messageTray.js:2948
 msgid "System Information"
 msgstr "פרטי המערכת"
 
@@ -1234,11 +1233,11 @@ msgid_plural "%d new messages"
 msgstr[0] "הודעה חדשה אחת"
 msgstr[1] "%d הודעות חדשות"
 
-#: ../js/ui/overview.js:84
+#: ../js/ui/overview.js:83
 msgid "Undo"
 msgstr "ביטול"
 
-#: ../js/ui/overview.js:124
+#: ../js/ui/overview.js:123
 msgid "Overview"
 msgstr "סקירה"
 
@@ -1246,7 +1245,7 @@ msgstr "סקירה"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters. */
-#: ../js/ui/overview.js:250
+#: ../js/ui/overview.js:257
 msgid "Type to search…"
 msgstr "יש להקליד כדי לחפש…"
 
@@ -1290,27 +1289,27 @@ msgid_plural "%d new notifications"
 msgstr[0] "התרעה חדשה אחת"
 msgstr[1] "%d התרעות חדשות"
 
-#: ../js/ui/screenShield.js:474 ../js/ui/status/system.js:342
+#: ../js/ui/screenShield.js:473 ../js/ui/status/system.js:342
 msgid "Lock"
 msgstr "נעילה"
 
-#: ../js/ui/screenShield.js:708
+#: ../js/ui/screenShield.js:707
 msgid "GNOME needs to lock the screen"
 msgstr "על GNOME לנעול את המסך"
 
-#: ../js/ui/screenShield.js:835 ../js/ui/screenShield.js:1309
+#: ../js/ui/screenShield.js:834 ../js/ui/screenShield.js:1301
 msgid "Unable to lock"
 msgstr "לא ניתן לנעול"
 
-#: ../js/ui/screenShield.js:836 ../js/ui/screenShield.js:1310
+#: ../js/ui/screenShield.js:835 ../js/ui/screenShield.js:1302
 msgid "Lock was blocked by an application"
 msgstr "הנעילה נחסמה ע״י היישום"
 
-#: ../js/ui/search.js:603
+#: ../js/ui/search.js:589
 msgid "Searching…"
 msgstr "בחיפוש…"
 
-#: ../js/ui/search.js:649
+#: ../js/ui/search.js:632
 msgid "No results."
 msgstr "אין תוצאות."
 
@@ -1382,30 +1381,31 @@ msgstr "ניגודיות גבוהה"
 msgid "Large Text"
 msgstr "טקסט גדול"
 
-#: ../js/ui/status/bluetooth.js:49
+#: ../js/ui/status/bluetooth.js:48
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../js/ui/status/bluetooth.js:51 ../js/ui/status/network.js:151
+#: ../js/ui/status/bluetooth.js:50 ../js/ui/status/location.js:59
-#: ../js/ui/status/network.js:323 ../js/ui/status/network.js:1234
+#: ../js/ui/status/location.js:159 ../js/ui/status/network.js:151
-#: ../js/ui/status/network.js:1345 ../js/ui/status/rfkill.js:85
+#: ../js/ui/status/network.js:318 ../js/ui/status/network.js:1225
+#: ../js/ui/status/network.js:1336 ../js/ui/status/rfkill.js:85
 #: ../js/ui/status/rfkill.js:105
 msgid "Turn Off"
 msgstr "כיבוי"
 
-#: ../js/ui/status/bluetooth.js:54
+#: ../js/ui/status/bluetooth.js:53
 msgid "Bluetooth Settings"
 msgstr "הגדרות Bluetooth"
 
 # javascript-format
-#: ../js/ui/status/bluetooth.js:104
+#: ../js/ui/status/bluetooth.js:100
 #, c-format
 msgid "%d Connected Device"
 msgid_plural "%d Connected Devices"
 msgstr[0] "התקן אחד מחובר"
 msgstr[1] "%d התקנים מחוברים"
 
-#: ../js/ui/status/bluetooth.js:106 ../js/ui/status/network.js:1262
+#: ../js/ui/status/bluetooth.js:102 ../js/ui/status/network.js:1253
 msgid "Not Connected"
 msgstr "לא מחובר"
 
@@ -1417,167 +1417,160 @@ msgstr "בהירות"
 msgid "Show Keyboard Layout"
 msgstr "הצגת פריסת המקלדת"
 
-#: ../js/ui/status/location.js:53
+#: ../js/ui/status/location.js:52
 msgid "Location"
 msgstr "מיקום"
 
-#: ../js/ui/status/location.js:60 ../js/ui/status/location.js:168
+#: ../js/ui/status/location.js:58 ../js/ui/status/location.js:158
-msgid "Disable"
+#: ../js/ui/status/rfkill.js:84
-msgstr "השבתה"
+msgid "On"
+msgstr "פועל"
 
-#: ../js/ui/status/location.js:165
+#: ../js/ui/status/location.js:155 ../js/ui/status/network.js:415
-msgid "Enable"
+#: ../js/ui/status/network.js:1251 ../js/ui/status/network.js:1455
-msgstr "אפשור"
+msgid "Off"
+msgstr "כבוי"
 
-#: ../js/ui/status/location.js:167
+#: ../js/ui/status/location.js:156 ../js/ui/status/network.js:1225
-msgid "In Use"
+msgid "Turn On"
-msgstr "בשימוש"
+msgstr "הפעלה"
 
 #: ../js/ui/status/network.js:74
 msgid "<unknown>"
 msgstr "<לא ידוע>"
 
-#: ../js/ui/status/network.js:420 ../js/ui/status/network.js:1260
+#: ../js/ui/status/network.js:417
-#: ../js/ui/status/network.js:1464
-msgid "Off"
-msgstr "כבוי"
-
-#: ../js/ui/status/network.js:422
 msgid "Connected"
 msgstr "מחובר"
 
 #. 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:426
+#: ../js/ui/status/network.js:421
 msgid "unmanaged"
 msgstr "לא מנוהל"
 
-#: ../js/ui/status/network.js:428
+#: ../js/ui/status/network.js:423
 msgid "disconnecting..."
 msgstr "בהליכי ניתוק..."
 
-#: ../js/ui/status/network.js:434 ../js/ui/status/network.js:1362
+#: ../js/ui/status/network.js:429 ../js/ui/status/network.js:1353
 msgid "connecting..."
 msgstr "בהתחברות..."
 
 #. Translators: this is for network connections that require some kind of key or password */
-#: ../js/ui/status/network.js:437 ../js/ui/status/network.js:1365
+#: ../js/ui/status/network.js:432 ../js/ui/status/network.js:1356
 msgid "authentication required"
 msgstr "נדרש אימות"
 
 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing */
-#: ../js/ui/status/network.js:445
+#: ../js/ui/status/network.js:440
 msgid "firmware missing"
 msgstr "הקושחה חסרה"
 
 #. 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:449
+#: ../js/ui/status/network.js:444
 msgid "unavailable"
 msgstr "לא זמין"
 
-#: ../js/ui/status/network.js:451 ../js/ui/status/network.js:1367
+#: ../js/ui/status/network.js:446 ../js/ui/status/network.js:1358
 msgid "connection failed"
 msgstr "החיבור נכשל"
 
-#: ../js/ui/status/network.js:467
+#: ../js/ui/status/network.js:462
 msgid "Wired Settings"
 msgstr "הגדרות רשת קווית"
 
-#: ../js/ui/status/network.js:509 ../js/ui/status/network.js:587
+#: ../js/ui/status/network.js:504 ../js/ui/status/network.js:582
 msgid "Mobile Broadband Settings"
 msgstr "הגדרות פס־רחב נייד"
 
-#: ../js/ui/status/network.js:551 ../js/ui/status/network.js:1258
+#: ../js/ui/status/network.js:546 ../js/ui/status/network.js:1249
 msgid "Hardware Disabled"
 msgstr "מנוטרל חומרתית"
 
-#: ../js/ui/status/network.js:595
+#: ../js/ui/status/network.js:590
 msgid "Use as Internet connection"
 msgstr "שימוש כחיבור לאינטרנט"
 
-#: ../js/ui/status/network.js:776
+#: ../js/ui/status/network.js:771
 msgid "Airplane Mode is On"
 msgstr "מצב טיסה מופעל"
 
-#: ../js/ui/status/network.js:777
+#: ../js/ui/status/network.js:772
 msgid "Wi-Fi is disabled when airplane mode is on."
 msgstr "רשת אלחוטית מושבתת כאשר מצב טיסה מופעל."
 
-#: ../js/ui/status/network.js:778
+#: ../js/ui/status/network.js:773
 msgid "Turn Off Airplane Mode"
 msgstr "כיבוי מצב טיסה"
 
-#: ../js/ui/status/network.js:787
+#: ../js/ui/status/network.js:782
 msgid "Wi-Fi is Off"
 msgstr "רשת אלחוטית כבויה"
 
-#: ../js/ui/status/network.js:788
+#: ../js/ui/status/network.js:783
 msgid "Wi-Fi needs to be turned on in order to connect to a network."
 msgstr "רשת אלחוטית צריכה להיות מופעלת על מנת להתחבר לרשת."
 
-#: ../js/ui/status/network.js:789
+#: ../js/ui/status/network.js:784
 msgid "Turn On Wi-Fi"
 msgstr "הפעלת רשת אלחוטית"
 
-#: ../js/ui/status/network.js:814
+#: ../js/ui/status/network.js:809
 msgid "Wi-Fi Networks"
 msgstr "רשתות אלחוטיות"
 
-#: ../js/ui/status/network.js:816
+#: ../js/ui/status/network.js:811
 msgid "Select a network"
 msgstr "בחירת רשת"
 
-#: ../js/ui/status/network.js:845
+#: ../js/ui/status/network.js:840
 msgid "No Networks"
 msgstr "אין רשתות"
 
-#: ../js/ui/status/network.js:866 ../js/ui/status/rfkill.js:103
+#: ../js/ui/status/network.js:861 ../js/ui/status/rfkill.js:103
 msgid "Use hardware switch to turn off"
 msgstr "שימוש במתג של החומרה לכיבוי"
 
-#: ../js/ui/status/network.js:1136
+#: ../js/ui/status/network.js:1131
 msgid "Select Network"
 msgstr "בחירת רשת"
 
-#: ../js/ui/status/network.js:1142
+#: ../js/ui/status/network.js:1137
 msgid "Wi-Fi Settings"
 msgstr "הגדרות רשת אלחוטית"
 
-#: ../js/ui/status/network.js:1234
+#: ../js/ui/status/network.js:1242
-msgid "Turn On"
-msgstr "הפעלה"
-
-#: ../js/ui/status/network.js:1251
 msgid "Hotspot Active"
 msgstr "נקודה חמה פעילה"
 
-#: ../js/ui/status/network.js:1254
+#: ../js/ui/status/network.js:1245
 msgid "Connecting"
 msgstr "מתחבר"
 
-#: ../js/ui/status/network.js:1433 ../js/ui/status/rfkill.js:88
+#: ../js/ui/status/network.js:1424 ../js/ui/status/rfkill.js:88
 msgid "Network Settings"
 msgstr "הגדרות הרשת"
 
-#: ../js/ui/status/network.js:1435
+#: ../js/ui/status/network.js:1426
 msgid "VPN Settings"
 msgstr "הגדרות VPN"
 
-#: ../js/ui/status/network.js:1454
+#: ../js/ui/status/network.js:1445
 msgid "VPN"
 msgstr "VPN"
 
-#: ../js/ui/status/network.js:1607
+#: ../js/ui/status/network.js:1598
 msgid "Network Manager"
 msgstr "מנהל הרשתות"
 
-#: ../js/ui/status/network.js:1646
+#: ../js/ui/status/network.js:1637
 msgid "Connection failed"
 msgstr "ההתחברות נכשל"
 
-#: ../js/ui/status/network.js:1647
+#: ../js/ui/status/network.js:1638
 msgid "Activation of network connection failed"
 msgstr "הפעלת חיבור הרשת נכשלה"
 
@@ -1594,12 +1587,12 @@ msgid "Estimating…"
 msgstr "מתבצע שערוך…"
 
 #: ../js/ui/status/power.js:86
-#, c-format
+#, javascript-format
 msgid "%d∶%02d Remaining (%d%%)"
 msgstr "%d\\u2236%02d נותרו (%d%%)"
 
 #: ../js/ui/status/power.js:91
-#, c-format
+#, javascript-format
 msgid "%d∶%02d Until Full (%d%%)"
 msgstr "%d\\u2236%02d עד לטעינה מלאה (%d%%)"
 
@@ -1615,10 +1608,6 @@ msgstr "סוללה"
 msgid "Airplane Mode"
 msgstr "מצב טיסה"
 
-#: ../js/ui/status/rfkill.js:84
-msgid "On"
-msgstr "פועל"
-
 #: ../js/ui/status/system.js:314
 msgid "Switch User"
 msgstr "החלפת משתמש"
@@ -1754,35 +1743,6 @@ msgstr "הססמה לא יכולה להישאר ריקה"
 msgid "Authentication dialog was dismissed by the user"
 msgstr "המשתמש בחר להתעלם מתיבת דו־שיח האימות"
 
-#~ msgctxt "event list time"
-#~ msgid "%H\\u2236%M"
-#~ msgstr "%H\\u2236%M"
-
-#~ msgctxt "event list time"
-#~ msgid "%l\\u2236%M\\u2009%p"
-#~ msgstr "%l\\u2236%M\\u2009%p"
-
-#~ msgid "%H\\u2236%M"
-#~ msgstr "%H\\u2236%M"
-
-#~ msgid "%A, %H\\u2236%M"
-#~ msgstr "%A, %H\\u2236%M"
-
-#~ msgid "%B %d, %H\\u2236%M"
-#~ msgstr "%d ב%B, %H\\u2236%M"
-
-#~ msgid "%B %d %Y, %H\\u2236%M"
-#~ msgstr "%d ב%B %Y, %H\\u2236%M"
-
-#~ msgid "%l\\u2236%M %p"
-#~ msgstr "%l\\u2236%M %p"
-
-#~ msgid "%A, %l\\u2236%M %p"
-#~ msgstr "%A, %l\\u2236%M %p"
-
-#~ msgid "%B %d, %l\\u2236%M %p"
-#~ msgstr "%d ב%B, %l\\u2236%M %p"
-
 #~ msgid "<b>%A</b>, <b>%H:%M</b>"
 #~ msgstr "<b>%A</b> ב־<b>%H:%M</b>"
 
@@ -1792,6 +1752,14 @@ msgstr "המשתמש בחר להתעלם מתיבת דו־שיח האימות"
 #~ msgid "<b>%B</b> <b>%d</b> <b>%Y</b>, <b>%H:%M</b> "
 #~ msgstr "ה־<b>%d</b> ב<b>%B</b> <b>%Y</b> ב־<b>%H:%M</b>"
 
+#~ msgctxt "event list time"
+#~ msgid "%H\\u2236%M"
+#~ msgstr "%H\\u2236%M"
+
+#~ msgctxt "event list time"
+#~ msgid "%l\\u2236%M\\u2009%p"
+#~ msgstr "%l\\u2236%M\\u2009%p"
+
 #~ msgid "List of categories that should be displayed as folders"
 #~ msgstr "List of categories that should be displayed as folders"
 

po/id.po

@@ -3,24 +3,24 @@
 # This file is distributed under the same license as the gnome-shell package.
 #
 # Andika Triwidada <andika@gmail.com>, 2010, 2011, 2012, 2013, 2014.
-# Dirgita <dirgitadevina@yahoo.co.id>, 2011, 2012, 2014.
+# Dirgita <dirgitadevina@yahoo.co.id>, 2011, 2012.
 # Wibiharto <wibinem@yahoo.com>, 2011.
 msgid ""
 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: 2014-04-05 19:59+0000\n"
+"POT-Creation-Date: 2014-03-06 08:32+0000\n"
-"PO-Revision-Date: 2014-04-09 05:35+0700\n"
+"PO-Revision-Date: 2014-03-07 13:47+0700\n"
-"Last-Translator: Dirgita <dirgitadevina@yahoo.co.id>\n"
+"Last-Translator: Andika Triwidada <andika@gmail.com>\n"
-"Language-Team: Indonesian <gnome-l10n-id@googlegroups.com>\n"
+"Language-Team: Indonesian <gnome@i15n.org>\n"
 "Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Poedit-SourceCharset: UTF-8\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Poedit 1.5.7\n"
 
 #: ../data/50-gnome-shell-system.xml.in.h:1
 msgid "System"
@@ -79,7 +79,7 @@ msgid ""
 "Allows access to internal debugging and monitoring tools using the Alt-F2 "
 "dialog."
 msgstr ""
-"Izinkan askes ke perkakas pemantauan dan pengawakutuan internal memakai "
+"Ijinkan askes ke perkakas pemantauan dan pengawakutuan internal memakai "
 "dialog Alt-F2."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:3
@@ -236,11 +236,11 @@ msgid ""
 "allow applications to see and they can find user's location on their own "
 "using network resources (albeit with street-level accuracy at best)."
 msgstr ""
-"Menata tingkat maksimum akurasi lokasi yang diizinkan diperoleh aplikasi. "
+"Menata tingkat maksimum akurasi lokasi yang diijinkan diperoleh aplikasi. "
 "Opsi yang valid adalah 'off' (nonaktifkan pelacakan lokasi), "
 "'country' (negara), 'city' (kota), 'neighborhood' (lingkungan tetangga), "
 "'street' (jalan), dan 'exact' (eksak, biasanya perlu penerima GPS). Harap "
-"diingat bahwa ini hanya mengendalikan apa yang diizinkan oleh GeoClue bagi "
+"diingat bahwa ini hanya mengendalikan apa yang diijinkan oleh GeoClue bagi "
 "aplikasi dan mereka bisa menemukan sendiri lokasi pengguna memakai sumber "
 "daya jaringan (walaupun paling baik pada tingkat jalan)."
 
@@ -315,7 +315,7 @@ msgstr "Pilih ekstensi yang ingin dikonfigurasi pada kotak di atas."
 #: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:136
 #: ../js/ui/components/polkitAgent.js:166 ../js/ui/endSessionDialog.js:429
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
-#: ../js/ui/status/network.js:878
+#: ../js/ui/status/network.js:873
 msgid "Cancel"
 msgstr "Batal"
 
@@ -333,25 +333,25 @@ msgctxt "button"
 msgid "Sign In"
 msgstr "Masuk"
 
-#: ../js/gdm/loginDialog.js:271
+#: ../js/gdm/loginDialog.js:270
 msgid "Choose Session"
 msgstr "Pilih Sesi"
 
-#: ../js/gdm/loginDialog.js:431
+#: ../js/gdm/loginDialog.js:430
 msgid "Not listed?"
 msgstr "Tak masuk daftar?"
 
-#: ../js/gdm/loginDialog.js:614
+#: ../js/gdm/loginDialog.js:598
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(cth., pengguna dari %s)"
 
-#: ../js/gdm/loginDialog.js:619 ../js/ui/components/networkAgent.js:262
+#: ../js/gdm/loginDialog.js:603 ../js/ui/components/networkAgent.js:262
 #: ../js/ui/components/networkAgent.js:280
 msgid "Username: "
 msgstr "Nama pengguna: "
 
-#: ../js/gdm/loginDialog.js:920
+#: ../js/gdm/loginDialog.js:868
 msgid "Login Window"
 msgstr "Jendela Log Masuk"
 
@@ -369,34 +369,34 @@ msgstr "Perintah tidak ditemukan"
 
 #: ../js/misc/util.js:148
 msgid "Could not parse command:"
-msgstr "Tak dapat mengurai perintah:"
+msgstr "Tidak dapat mengurai perintah:"
 
 #: ../js/misc/util.js:156
 #, javascript-format
 msgid "Execution of “%s” failed:"
 msgstr "Eksekusi \"%s\" gagal:"
 
-#: ../js/ui/appDisplay.js:636
+#: ../js/ui/appDisplay.js:629
 msgid "Frequently used applications will appear here"
 msgstr "Aplikasi yang sering dipakai akan muncul di sini"
 
-#: ../js/ui/appDisplay.js:747
+#: ../js/ui/appDisplay.js:740
 msgid "Frequent"
 msgstr "Sering"
 
-#: ../js/ui/appDisplay.js:754
+#: ../js/ui/appDisplay.js:747
 msgid "All"
 msgstr "Semua"
 
-#: ../js/ui/appDisplay.js:1566
+#: ../js/ui/appDisplay.js:1552
 msgid "New Window"
 msgstr "Jendela Baru"
 
-#: ../js/ui/appDisplay.js:1588 ../js/ui/dash.js:285
+#: ../js/ui/appDisplay.js:1574 ../js/ui/dash.js:285
 msgid "Remove from Favorites"
 msgstr "Hapus dari Favorit"
 
-#: ../js/ui/appDisplay.js:1594
+#: ../js/ui/appDisplay.js:1580
 msgid "Add to Favorites"
 msgstr "Tambah ke Favorit"
 
@@ -539,44 +539,44 @@ msgstr "Sab"
 msgid "calendar:MY"
 msgstr "calendar:MY"
 
-#: ../js/ui/calendar.js:450
+#: ../js/ui/calendar.js:446
 msgid "Previous month"
 msgstr "Bulan sebelumnya"
 
-#: ../js/ui/calendar.js:460
+#: ../js/ui/calendar.js:456
 msgid "Next month"
 msgstr "Bulan selanjutnya"
 
 #. Translators: Text to show if there are no events */
-#: ../js/ui/calendar.js:772
+#: ../js/ui/calendar.js:763
 msgid "Nothing Scheduled"
-msgstr "Tak Ada Jadwal"
+msgstr "Tidak Ada Jadwal"
 
 #. Translators: Shown on calendar heading when selected day occurs on current year */
-#: ../js/ui/calendar.js:790
+#: ../js/ui/calendar.js:781
 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:793
+#: ../js/ui/calendar.js:784
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B %Y"
 
-#: ../js/ui/calendar.js:804
+#: ../js/ui/calendar.js:795
 msgid "Today"
 msgstr "Hari ini"
 
-#: ../js/ui/calendar.js:808
+#: ../js/ui/calendar.js:799
 msgid "Tomorrow"
 msgstr "Besok"
 
-#: ../js/ui/calendar.js:819
+#: ../js/ui/calendar.js:810
 msgid "This week"
 msgstr "Minggu ini"
 
-#: ../js/ui/calendar.js:827
+#: ../js/ui/calendar.js:818
 msgid "Next week"
 msgstr "Minggu depan"
 
@@ -610,7 +610,7 @@ msgid "Type again:"
 msgstr "Ketik lagi:"
 
 #: ../js/ui/components/networkAgent.js:131 ../js/ui/status/network.js:240
-#: ../js/ui/status/network.js:322 ../js/ui/status/network.js:881
+#: ../js/ui/status/network.js:317 ../js/ui/status/network.js:876
 msgid "Connect"
 msgstr "Sambung"
 
@@ -640,7 +640,7 @@ msgstr "Layanan: "
 
 #: ../js/ui/components/networkAgent.js:311
 msgid "Authentication required by wireless network"
-msgstr "Otentikasi diperlukan oleh jaringan nirkabel"
+msgstr "Otentikasi dibutuhkan oleh jaringan nirkabel"
 
 #: ../js/ui/components/networkAgent.js:312
 #, javascript-format
@@ -669,7 +669,7 @@ msgstr "Perlu kode PIN"
 
 #: ../js/ui/components/networkAgent.js:331
 msgid "PIN code is needed for the mobile broadband device"
-msgstr "Kode PIN diperlukan untuk perangkat data seluler"
+msgstr "Kode PIN dibutuhkan untuk perangkat data seluler"
 
 #: ../js/ui/components/networkAgent.js:332
 msgid "PIN: "
@@ -815,13 +815,13 @@ msgstr "%s mengundang Anda untuk bergabung dengan %s"
 #: ../js/ui/components/telepathyClient.js:1164
 #: ../js/ui/components/telepathyClient.js:1199
 #: ../js/ui/components/telepathyClient.js:1233
-#: ../js/ui/components/telepathyClient.js:1291
+#: ../js/ui/components/telepathyClient.js:1290
 msgid "Decline"
 msgstr "Tolak"
 
 #: ../js/ui/components/telepathyClient.js:1170
 #: ../js/ui/components/telepathyClient.js:1239
-#: ../js/ui/components/telepathyClient.js:1296
+#: ../js/ui/components/telepathyClient.js:1295
 msgid "Accept"
 msgstr "Terima"
 
@@ -856,102 +856,102 @@ msgstr "%s sedang mengirimi Anda %s"
 #: ../js/ui/components/telepathyClient.js:1256
 #, javascript-format
 msgid "%s would like permission to see when you are online"
-msgstr "%s ingin minta izin melihat Anda ketika Anda daring"
+msgstr "%s ingin minta ijin melihat Anda ketika Anda daring"
 
-#: ../js/ui/components/telepathyClient.js:1342
+#: ../js/ui/components/telepathyClient.js:1341
 msgid "Network error"
 msgstr "Galat jaringan"
 
-#: ../js/ui/components/telepathyClient.js:1344
+#: ../js/ui/components/telepathyClient.js:1343
 msgid "Authentication failed"
 msgstr "Otentikasi gagal"
 
-#: ../js/ui/components/telepathyClient.js:1346
+#: ../js/ui/components/telepathyClient.js:1345
 msgid "Encryption error"
 msgstr "Galat enkripsi"
 
-#: ../js/ui/components/telepathyClient.js:1348
+#: ../js/ui/components/telepathyClient.js:1347
 msgid "Certificate not provided"
 msgstr "Sertifikat tidak disediakan"
 
-#: ../js/ui/components/telepathyClient.js:1350
+#: ../js/ui/components/telepathyClient.js:1349
 msgid "Certificate untrusted"
 msgstr "Sertifikat tidak dipercaya"
 
-#: ../js/ui/components/telepathyClient.js:1352
+#: ../js/ui/components/telepathyClient.js:1351
 msgid "Certificate expired"
 msgstr "Sertifikat kadaluarsa"
 
-#: ../js/ui/components/telepathyClient.js:1354
+#: ../js/ui/components/telepathyClient.js:1353
 msgid "Certificate not activated"
 msgstr "Sertifikat tidak diaktifkan"
 
-#: ../js/ui/components/telepathyClient.js:1356
+#: ../js/ui/components/telepathyClient.js:1355
 msgid "Certificate hostname mismatch"
 msgstr "Nama host sertifikat tidak cocok"
 
-#: ../js/ui/components/telepathyClient.js:1358
+#: ../js/ui/components/telepathyClient.js:1357
 msgid "Certificate fingerprint mismatch"
 msgstr "Sidik jari sertifikat tidak cocok"
 
-#: ../js/ui/components/telepathyClient.js:1360
+#: ../js/ui/components/telepathyClient.js:1359
 msgid "Certificate self-signed"
 msgstr "Sertifikat ditandatangani sendiri"
 
-#: ../js/ui/components/telepathyClient.js:1362
+#: ../js/ui/components/telepathyClient.js:1361
 msgid "Status is set to offline"
 msgstr "Status diatur ke luring"
 
-#: ../js/ui/components/telepathyClient.js:1364
+#: ../js/ui/components/telepathyClient.js:1363
 msgid "Encryption is not available"
 msgstr "Enkripsi tidak tersedia"
 
-#: ../js/ui/components/telepathyClient.js:1366
+#: ../js/ui/components/telepathyClient.js:1365
 msgid "Certificate is invalid"
 msgstr "Sertifikat tidak valid"
 
-#: ../js/ui/components/telepathyClient.js:1368
+#: ../js/ui/components/telepathyClient.js:1367
 msgid "Connection has been refused"
 msgstr "Koneksi telah ditolak"
 
-#: ../js/ui/components/telepathyClient.js:1370
+#: ../js/ui/components/telepathyClient.js:1369
 msgid "Connection can't be established"
 msgstr "Koneksi tak dapat dijalin"
 
-#: ../js/ui/components/telepathyClient.js:1372
+#: ../js/ui/components/telepathyClient.js:1371
 msgid "Connection has been lost"
 msgstr "Koneksi telah terputus"
 
-#: ../js/ui/components/telepathyClient.js:1374
+#: ../js/ui/components/telepathyClient.js:1373
 msgid "This account is already connected to the server"
 msgstr "Akun ini telah tersambung pada server"
 
-#: ../js/ui/components/telepathyClient.js:1376
+#: ../js/ui/components/telepathyClient.js:1375
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Koneksi telah digantikan oleh koneksi baru memakai sumberdaya yang sama"
 
-#: ../js/ui/components/telepathyClient.js:1378
+#: ../js/ui/components/telepathyClient.js:1377
 msgid "The account already exists on the server"
 msgstr "Akun ini sudah ada di server"
 
-#: ../js/ui/components/telepathyClient.js:1380
+#: ../js/ui/components/telepathyClient.js:1379
 msgid "Server is currently too busy to handle the connection"
 msgstr "Server kini terlalu sibuk untuk menangani koneksi"
 
-#: ../js/ui/components/telepathyClient.js:1382
+#: ../js/ui/components/telepathyClient.js:1381
 msgid "Certificate has been revoked"
 msgstr "Sertifikat telah dicabut"
 
-#: ../js/ui/components/telepathyClient.js:1384
+#: ../js/ui/components/telepathyClient.js:1383
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Sertifikat memakai algorima cipher yang tak aman atau lemah secara "
 "kriptografi"
 
-#: ../js/ui/components/telepathyClient.js:1386
+#: ../js/ui/components/telepathyClient.js:1385
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -959,22 +959,22 @@ msgstr ""
 "Panjang sertifikat server, atau kedalaman rantai sertifikat server, "
 "melampaui batas yang diberlakukan oleh pustaka kriptografi"
 
-#: ../js/ui/components/telepathyClient.js:1388
+#: ../js/ui/components/telepathyClient.js:1387
 msgid "Internal error"
 msgstr "Galat internal"
 
 #. translators: argument is the account name, like
 #. * name@jabber.org for example. */
-#: ../js/ui/components/telepathyClient.js:1398
+#: ../js/ui/components/telepathyClient.js:1397
 #, javascript-format
 msgid "Unable to connect to %s"
 msgstr "Tak bisa menyambung ke %s"
 
-#: ../js/ui/components/telepathyClient.js:1403
+#: ../js/ui/components/telepathyClient.js:1402
 msgid "View account"
 msgstr "Tilik akun"
 
-#: ../js/ui/components/telepathyClient.js:1440
+#: ../js/ui/components/telepathyClient.js:1434
 msgid "Unknown reason"
 msgstr "Alasan yang tidak diketahui"
 
@@ -1146,26 +1146,25 @@ msgstr "Unduh dan pasang \"%s\" dari extensions.gnome.org?"
 msgid "Keyboard"
 msgstr "Papan Ketik"
 
-#: ../js/ui/lookingGlass.js:643
+#: ../js/ui/lookingGlass.js:641
 msgid "No extensions installed"
 msgstr "Tak ada ekstensi terpasang"
 
 #. Translators: argument is an extension UUID. */
-#: ../js/ui/lookingGlass.js:697
+#: ../js/ui/lookingGlass.js:695
 #, javascript-format
 msgid "%s has not emitted any errors."
 msgstr "%s tidak menampilkan galat apa pun."
 
-#: ../js/ui/lookingGlass.js:703
+#: ../js/ui/lookingGlass.js:701
 msgid "Hide Errors"
 msgstr "Sembunyikan Galat"
 
-#: ../js/ui/lookingGlass.js:707 ../js/ui/lookingGlass.js:767
+#: ../js/ui/lookingGlass.js:705 ../js/ui/lookingGlass.js:765
 msgid "Show Errors"
 msgstr "Tampilkan Galat"
 
-#: ../js/ui/lookingGlass.js:716 ../js/ui/status/location.js:59
+#: ../js/ui/lookingGlass.js:714
-#: ../js/ui/status/location.js:167
 msgid "Enabled"
 msgstr "Diaktifkan"
 
@@ -1173,28 +1172,28 @@ msgstr "Diaktifkan"
 #. because it's disabled by rfkill (airplane mode) */
 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:719 ../js/ui/status/location.js:164
+#: ../js/ui/lookingGlass.js:717 ../js/ui/status/network.js:550
-#: ../js/ui/status/network.js:555 ../src/gvc/gvc-mixer-control.c:1830
+#: ../src/gvc/gvc-mixer-control.c:1830
 msgid "Disabled"
 msgstr "Dinonaktifkan"
 
-#: ../js/ui/lookingGlass.js:721
+#: ../js/ui/lookingGlass.js:719
 msgid "Error"
 msgstr "Galat"
 
-#: ../js/ui/lookingGlass.js:723
+#: ../js/ui/lookingGlass.js:721
 msgid "Out of date"
 msgstr "Kadaluarsa"
 
-#: ../js/ui/lookingGlass.js:725
+#: ../js/ui/lookingGlass.js:723
 msgid "Downloading"
 msgstr "Mengunduh"
 
-#: ../js/ui/lookingGlass.js:749
+#: ../js/ui/lookingGlass.js:747
 msgid "View Source"
 msgstr "Tilik Sumber"
 
-#: ../js/ui/lookingGlass.js:758
+#: ../js/ui/lookingGlass.js:756
 msgid "Web Page"
 msgstr "Halaman Web"
 
@@ -1230,7 +1229,7 @@ msgstr "Tiada Pesan"
 msgid "Message Tray"
 msgstr "Baki Pesan"
 
-#: ../js/ui/messageTray.js:2962
+#: ../js/ui/messageTray.js:2948
 msgid "System Information"
 msgstr "Informasi Sistem"
 
@@ -1245,11 +1244,11 @@ msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d pesan baru"
 
-#: ../js/ui/overview.js:84
+#: ../js/ui/overview.js:83
 msgid "Undo"
 msgstr "Batal"
 
-#: ../js/ui/overview.js:124
+#: ../js/ui/overview.js:123
 msgid "Overview"
 msgstr "Gambaran"
 
@@ -1257,7 +1256,7 @@ msgstr "Gambaran"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters. */
-#: ../js/ui/overview.js:250
+#: ../js/ui/overview.js:257
 msgid "Type to search…"
 msgstr "Ketik untuk mencari…"
 
@@ -1300,29 +1299,29 @@ msgid "%d new notification"
 msgid_plural "%d new notifications"
 msgstr[0] "%d pemberitahuan baru"
 
-#: ../js/ui/screenShield.js:474 ../js/ui/status/system.js:342
+#: ../js/ui/screenShield.js:473 ../js/ui/status/system.js:342
 msgid "Lock"
 msgstr "Kunci"
 
-#: ../js/ui/screenShield.js:708
+#: ../js/ui/screenShield.js:707
 msgid "GNOME needs to lock the screen"
 msgstr "GNOME perlu mengunci layar"
 
-#: ../js/ui/screenShield.js:835 ../js/ui/screenShield.js:1309
+#: ../js/ui/screenShield.js:834 ../js/ui/screenShield.js:1301
 msgid "Unable to lock"
 msgstr "Tak bisa mengunci"
 
-#: ../js/ui/screenShield.js:836 ../js/ui/screenShield.js:1310
+#: ../js/ui/screenShield.js:835 ../js/ui/screenShield.js:1302
 msgid "Lock was blocked by an application"
 msgstr "Kunci diblokir oleh suatu aplikasi"
 
-#: ../js/ui/search.js:603
+#: ../js/ui/search.js:589
 msgid "Searching…"
 msgstr "Mencari…"
 
-#: ../js/ui/search.js:649
+#: ../js/ui/search.js:632
 msgid "No results."
-msgstr "Tak ada yang cocok."
+msgstr "Tidak ada yang cocok."
 
 #: ../js/ui/shellEntry.js:27
 msgid "Copy"
@@ -1392,28 +1391,29 @@ msgstr "Kontras Tinggi"
 msgid "Large Text"
 msgstr "Teks Besar"
 
-#: ../js/ui/status/bluetooth.js:49
+#: ../js/ui/status/bluetooth.js:48
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../js/ui/status/bluetooth.js:51 ../js/ui/status/network.js:151
+#: ../js/ui/status/bluetooth.js:50 ../js/ui/status/location.js:59
-#: ../js/ui/status/network.js:323 ../js/ui/status/network.js:1234
+#: ../js/ui/status/location.js:159 ../js/ui/status/network.js:151
-#: ../js/ui/status/network.js:1345 ../js/ui/status/rfkill.js:85
+#: ../js/ui/status/network.js:318 ../js/ui/status/network.js:1225
+#: ../js/ui/status/network.js:1336 ../js/ui/status/rfkill.js:85
 #: ../js/ui/status/rfkill.js:105
 msgid "Turn Off"
 msgstr "Matikan"
 
-#: ../js/ui/status/bluetooth.js:54
+#: ../js/ui/status/bluetooth.js:53
 msgid "Bluetooth Settings"
 msgstr "Pengaturan Bluetooth"
 
-#: ../js/ui/status/bluetooth.js:104
+#: ../js/ui/status/bluetooth.js:100
 #, javascript-format
 msgid "%d Connected Device"
 msgid_plural "%d Connected Devices"
 msgstr[0] "%d Perangkat Tersambung"
 
-#: ../js/ui/status/bluetooth.js:106 ../js/ui/status/network.js:1262
+#: ../js/ui/status/bluetooth.js:102 ../js/ui/status/network.js:1253
 msgid "Not Connected"
 msgstr "Tak Tersambung"
 
@@ -1425,167 +1425,160 @@ msgstr "Kecerahan"
 msgid "Show Keyboard Layout"
 msgstr "Tampilkan Tata Letak Papan Tik"
 
-#: ../js/ui/status/location.js:53
+#: ../js/ui/status/location.js:52
 msgid "Location"
 msgstr "Lokasi"
 
-#: ../js/ui/status/location.js:60 ../js/ui/status/location.js:168
+#: ../js/ui/status/location.js:58 ../js/ui/status/location.js:158
-msgid "Disable"
+#: ../js/ui/status/rfkill.js:84
-msgstr "Nonaktifkan"
+msgid "On"
+msgstr "Nyala"
 
-#: ../js/ui/status/location.js:165
+#: ../js/ui/status/location.js:155 ../js/ui/status/network.js:415
-msgid "Enable"
+#: ../js/ui/status/network.js:1251 ../js/ui/status/network.js:1455
-msgstr "Fungsikan"
+msgid "Off"
+msgstr "Mati"
 
-#: ../js/ui/status/location.js:167
+#: ../js/ui/status/location.js:156 ../js/ui/status/network.js:1225
-msgid "In Use"
+msgid "Turn On"
-msgstr "Dipakai"
+msgstr "Nyalakan"
 
 #: ../js/ui/status/network.js:74
 msgid "<unknown>"
 msgstr "<tak dikenal>"
 
-#: ../js/ui/status/network.js:420 ../js/ui/status/network.js:1260
+#: ../js/ui/status/network.js:417
-#: ../js/ui/status/network.js:1464
-msgid "Off"
-msgstr "Mati"
-
-#: ../js/ui/status/network.js:422
 msgid "Connected"
 msgstr "Tersambung"
 
 #. 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:426
+#: ../js/ui/status/network.js:421
 msgid "unmanaged"
 msgstr "tak dikelola"
 
-#: ../js/ui/status/network.js:428
+#: ../js/ui/status/network.js:423
 msgid "disconnecting..."
 msgstr "memutus..."
 
-#: ../js/ui/status/network.js:434 ../js/ui/status/network.js:1362
+#: ../js/ui/status/network.js:429 ../js/ui/status/network.js:1353
 msgid "connecting..."
 msgstr "menghubungi..."
 
 #. Translators: this is for network connections that require some kind of key or password */
-#: ../js/ui/status/network.js:437 ../js/ui/status/network.js:1365
+#: ../js/ui/status/network.js:432 ../js/ui/status/network.js:1356
 msgid "authentication required"
 msgstr "diperlukan otentikasi"
 
 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing */
-#: ../js/ui/status/network.js:445
+#: ../js/ui/status/network.js:440
 msgid "firmware missing"
 msgstr "firmware hilang"
 
 #. 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:449
+#: ../js/ui/status/network.js:444
 msgid "unavailable"
 msgstr "tidak tersedia"
 
-#: ../js/ui/status/network.js:451 ../js/ui/status/network.js:1367
+#: ../js/ui/status/network.js:446 ../js/ui/status/network.js:1358
 msgid "connection failed"
 msgstr "koneksi gagal"
 
-#: ../js/ui/status/network.js:467
+#: ../js/ui/status/network.js:462
 msgid "Wired Settings"
 msgstr "Pengaturan Kabel"
 
-#: ../js/ui/status/network.js:509 ../js/ui/status/network.js:587
+#: ../js/ui/status/network.js:504 ../js/ui/status/network.js:582
 msgid "Mobile Broadband Settings"
 msgstr "Pengaturan Data Seluler"
 
-#: ../js/ui/status/network.js:551 ../js/ui/status/network.js:1258
+#: ../js/ui/status/network.js:546 ../js/ui/status/network.js:1249
 msgid "Hardware Disabled"
 msgstr "Perangkat Keras Dinonaktifkan"
 
-#: ../js/ui/status/network.js:595
+#: ../js/ui/status/network.js:590
 msgid "Use as Internet connection"
 msgstr "Pakai sebagai koneksi Internet"
 
-#: ../js/ui/status/network.js:776
+#: ../js/ui/status/network.js:771
 msgid "Airplane Mode is On"
 msgstr "Mode Pesawat Terbang Menyala"
 
-#: ../js/ui/status/network.js:777
+#: ../js/ui/status/network.js:772
 msgid "Wi-Fi is disabled when airplane mode is on."
 msgstr "Wi-Fi dinonaktifkan ketika mode pesawat terbang menyala."
 
-#: ../js/ui/status/network.js:778
+#: ../js/ui/status/network.js:773
 msgid "Turn Off Airplane Mode"
 msgstr "Matikan Mode Pesawat Terbang"
 
-#: ../js/ui/status/network.js:787
+#: ../js/ui/status/network.js:782
 msgid "Wi-Fi is Off"
 msgstr "Wi-Fi Mati"
 
-#: ../js/ui/status/network.js:788
+#: ../js/ui/status/network.js:783
 msgid "Wi-Fi needs to be turned on in order to connect to a network."
 msgstr "Wi-Fi perlu dinyalakan untuk menyambung ke suatu jaringan."
 
-#: ../js/ui/status/network.js:789
+#: ../js/ui/status/network.js:784
 msgid "Turn On Wi-Fi"
 msgstr "Nyalakan Wi-Fi"
 
-#: ../js/ui/status/network.js:814
+#: ../js/ui/status/network.js:809
 msgid "Wi-Fi Networks"
 msgstr "Jaringan Wi-Fi"
 
-#: ../js/ui/status/network.js:816
+#: ../js/ui/status/network.js:811
 msgid "Select a network"
 msgstr "Pilih jaringan"
 
-#: ../js/ui/status/network.js:845
+#: ../js/ui/status/network.js:840
 msgid "No Networks"
 msgstr "Tiada Jaringan"
 
-#: ../js/ui/status/network.js:866 ../js/ui/status/rfkill.js:103
+#: ../js/ui/status/network.js:861 ../js/ui/status/rfkill.js:103
 msgid "Use hardware switch to turn off"
 msgstr "Pakai saklar perangkat keras untuk mematikan"
 
-#: ../js/ui/status/network.js:1136
+#: ../js/ui/status/network.js:1131
 msgid "Select Network"
 msgstr "Pilih Jaringan"
 
-#: ../js/ui/status/network.js:1142
+#: ../js/ui/status/network.js:1137
 msgid "Wi-Fi Settings"
 msgstr "Pengaturan Wi-Fi"
 
-#: ../js/ui/status/network.js:1234
+#: ../js/ui/status/network.js:1242
-msgid "Turn On"
-msgstr "Nyalakan"
-
-#: ../js/ui/status/network.js:1251
 msgid "Hotspot Active"
 msgstr "Hotspot Aktif"
 
-#: ../js/ui/status/network.js:1254
+#: ../js/ui/status/network.js:1245
 msgid "Connecting"
 msgstr "Menyambung"
 
-#: ../js/ui/status/network.js:1433 ../js/ui/status/rfkill.js:88
+#: ../js/ui/status/network.js:1424 ../js/ui/status/rfkill.js:88
 msgid "Network Settings"
 msgstr "Pengaturan Jaringan"
 
-#: ../js/ui/status/network.js:1435
+#: ../js/ui/status/network.js:1426
 msgid "VPN Settings"
 msgstr "Pengaturan VPN"
 
-#: ../js/ui/status/network.js:1454
+#: ../js/ui/status/network.js:1445
 msgid "VPN"
 msgstr "VPN"
 
-#: ../js/ui/status/network.js:1607
+#: ../js/ui/status/network.js:1598
 msgid "Network Manager"
 msgstr "Manajer Jaringan"
 
-#: ../js/ui/status/network.js:1646
+#: ../js/ui/status/network.js:1637
 msgid "Connection failed"
 msgstr "Koneksi gagal"
 
-#: ../js/ui/status/network.js:1647
+#: ../js/ui/status/network.js:1638
 msgid "Activation of network connection failed"
 msgstr "Aktivasi koneksi jaringan gagal"
 
@@ -1623,10 +1616,6 @@ msgstr "Baterai"
 msgid "Airplane Mode"
 msgstr "Mode Pesawat Terbang"
 
-#: ../js/ui/status/rfkill.js:84
-msgid "On"
-msgstr "Nyala"
-
 #: ../js/ui/status/system.js:314
 msgid "Switch User"
 msgstr "Ganti Pengguna"
@@ -1757,5 +1746,3 @@ msgstr "Sandi tidak boleh kosong"
 #: ../src/shell-polkit-authentication-agent.c:343
 msgid "Authentication dialog was dismissed by the user"
 msgstr "Dialog otentikasi ditolak oleh pengguna"
-
-

po/ko.po

@@ -18,8 +18,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: 2014-03-28 20:56+0000\n"
+"POT-Creation-Date: 2014-03-05 08:30+0000\n"
-"PO-Revision-Date: 2014-03-29 16:13+0900\n"
+"PO-Revision-Date: 2014-03-05 19:53+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: GNOME Korea <gnome-kr@googlegroups.com>\n"
 "Language: Korean\n"
@@ -108,10 +108,7 @@ msgid ""
 "GNOME Shell will only load extensions that claim to support the current "
 "running version. Enabling this option will disable this check and try to "
 "load all extensions regardless of the versions they claim to support."
-msgstr ""
+msgstr "그놈 셸에서 현재 실행 중인 버전을 지원하는 확장 기능만 읽어들입니다. 이 옵션을 사용하면 이 버전 검사를 하지 않고, 지원한다고 지정된 버전에 관계없이 모든 확장 기능을 읽어들입니다."
-"그놈 셸에서 현재 실행 중인 버전을 지원하는 확장 기능만 읽어들입니다. 이 옵션"
-"을 사용하면 이 버전 검사를 하지 않고, 지원한다고 지정된 버전에 관계없이 모든 "
-"확장 기능을 읽어들입니다."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:7
 msgid "List of desktop file IDs for favorite applications"
@@ -139,9 +136,7 @@ msgstr "사용자 메뉴에 '로그아웃' 메뉴 항목을 항상 표시합니
 msgid ""
 "This key overrides the automatic hiding of the 'Log out' menu item in single-"
 "user, single-session situations."
-msgstr ""
+msgstr "이 키를 설정하면, 단일 사용자 및 단일 세션에서 '로그아웃' 메뉴 항목 자동 감추기 기능을 사용하지 않습니다."
-"이 키를 설정하면, 단일 사용자 및 단일 세션에서 '로그아웃' 메뉴 항목 자동 감추"
-"기 기능을 사용하지 않습니다."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:13
 msgid ""
@@ -230,13 +225,7 @@ msgid ""
 "receiver). Please keep in mind that this only controls what GeoClue will "
 "allow applications to see and they can find user's location on their own "
 "using network resources (albeit with street-level accuracy at best)."
-msgstr ""
+msgstr "프로그램에서 확인할 수 있는 위치의 정확도 최대 단계를 설정합니다. 쓸 수 있는 값은 'off'(위치 추적 기능 사용하지 않음), 'country'(국가), 'city'(도시), 'neighborhood'(이웃), 'street'(길), 'exact'(정확한 위치, 보통 GPS 리시버 필요)입니다. 단 이 옵션은 GeoClue를 사용하는 프로그램이 쓸 수 있는 위치 정보만 설정합니다. 그래서 응용 프로그램이 자체적으로 네트워크를 사용해 사용자 위치를 알아낼 수는 있습니다(이 경우 보통 길 위치 정도만 알아낼 수 있지만)."
-"프로그램에서 확인할 수 있는 위치의 정확도 최대 단계를 설정합니다. 쓸 수 있는 "
-"값은 'off'(위치 추적 기능 사용하지 않음), 'country'(국가), 'city'(도시), "
-"'neighborhood'(이웃), 'street'(길), 'exact'(정확한 위치, 보통 GPS 리시버 필"
-"요)입니다. 단 이 옵션은 GeoClue를 사용하는 프로그램이 쓸 수 있는 위치 정보만 "
-"설정합니다. 그래서 응용 프로그램이 자체적으로 네트워크를 사용해 사용자 위치"
-"를 알아낼 수는 있습니다(이 경우 보통 길 위치 정도만 알아낼 수 있지만)."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:31
 msgid "The application icon mode."
@@ -303,7 +292,7 @@ msgstr "위의 콤보상자를 사용해 설정할 확장을 선택하십시오.
 #: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:136
 #: ../js/ui/components/polkitAgent.js:166 ../js/ui/endSessionDialog.js:429
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
-#: ../js/ui/status/network.js:878
+#: ../js/ui/status/network.js:873
 msgid "Cancel"
 msgstr "취소"
 
@@ -321,25 +310,25 @@ msgctxt "button"
 msgid "Sign In"
 msgstr "로그인"
 
-#: ../js/gdm/loginDialog.js:271
+#: ../js/gdm/loginDialog.js:270
 msgid "Choose Session"
 msgstr "세션 선택"
 
-#: ../js/gdm/loginDialog.js:431
+#: ../js/gdm/loginDialog.js:430
 msgid "Not listed?"
 msgstr "목록에 없습니까?"
 
-#: ../js/gdm/loginDialog.js:614
+#: ../js/gdm/loginDialog.js:598
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(예를 들어, 사용자 또는 %s)"
 
-#: ../js/gdm/loginDialog.js:619 ../js/ui/components/networkAgent.js:262
+#: ../js/gdm/loginDialog.js:603 ../js/ui/components/networkAgent.js:262
 #: ../js/ui/components/networkAgent.js:280
 msgid "Username: "
 msgstr "사용자 이름: "
 
-#: ../js/gdm/loginDialog.js:920
+#: ../js/gdm/loginDialog.js:868
 msgid "Login Window"
 msgstr "로그인 창"
 
@@ -364,27 +353,27 @@ msgstr "명령어를 파싱할 수 없습니다:"
 msgid "Execution of “%s” failed:"
 msgstr "“%s” 실행이 실패했습니다:"
 
-#: ../js/ui/appDisplay.js:636
+#: ../js/ui/appDisplay.js:629
 msgid "Frequently used applications will appear here"
 msgstr "자주 사용하는 프로그램이 여기 나타납니다"
 
-#: ../js/ui/appDisplay.js:747
+#: ../js/ui/appDisplay.js:740
 msgid "Frequent"
 msgstr "자주"
 
-#: ../js/ui/appDisplay.js:754
+#: ../js/ui/appDisplay.js:747
 msgid "All"
 msgstr "모두"
 
-#: ../js/ui/appDisplay.js:1566
+#: ../js/ui/appDisplay.js:1552
 msgid "New Window"
 msgstr "새 창"
 
-#: ../js/ui/appDisplay.js:1588 ../js/ui/dash.js:285
+#: ../js/ui/appDisplay.js:1574 ../js/ui/dash.js:285
 msgid "Remove from Favorites"
 msgstr "즐겨찾기에서 제거"
 
-#: ../js/ui/appDisplay.js:1594
+#: ../js/ui/appDisplay.js:1580
 msgid "Add to Favorites"
 msgstr "즐겨찾기에 추가"
 
@@ -528,44 +517,44 @@ msgstr "토"
 msgid "calendar:MY"
 msgstr "calendar:YM"
 
-#: ../js/ui/calendar.js:450
+#: ../js/ui/calendar.js:446
 msgid "Previous month"
 msgstr "이전 달"
 
-#: ../js/ui/calendar.js:460
+#: ../js/ui/calendar.js:456
 msgid "Next month"
 msgstr "다음 달"
 
 #. Translators: Text to show if there are no events */
-#: ../js/ui/calendar.js:772
+#: ../js/ui/calendar.js:762
 msgid "Nothing Scheduled"
 msgstr "일정이 없습니다"
 
 #. Translators: Shown on calendar heading when selected day occurs on current year */
-#: ../js/ui/calendar.js:790
+#: ../js/ui/calendar.js:780
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%B %d일 %A"
 
 #. Translators: Shown on calendar heading when selected day occurs on different year */
-#: ../js/ui/calendar.js:793
+#: ../js/ui/calendar.js:783
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%Y년 %B %d일 %A"
 
-#: ../js/ui/calendar.js:804
+#: ../js/ui/calendar.js:794
 msgid "Today"
 msgstr "오늘"
 
-#: ../js/ui/calendar.js:808
+#: ../js/ui/calendar.js:798
 msgid "Tomorrow"
 msgstr "내일"
 
-#: ../js/ui/calendar.js:819
+#: ../js/ui/calendar.js:809
 msgid "This week"
 msgstr "이번주"
 
-#: ../js/ui/calendar.js:827
+#: ../js/ui/calendar.js:817
 msgid "Next week"
 msgstr "다음주"
 
@@ -599,7 +588,7 @@ msgid "Type again:"
 msgstr "다시 입력하십시오:"
 
 #: ../js/ui/components/networkAgent.js:131 ../js/ui/status/network.js:240
-#: ../js/ui/status/network.js:322 ../js/ui/status/network.js:881
+#: ../js/ui/status/network.js:317 ../js/ui/status/network.js:876
 msgid "Connect"
 msgstr "연결"
 
@@ -802,13 +791,13 @@ msgstr "%s 님이 %s에 입장하도록 초대합니다"
 #: ../js/ui/components/telepathyClient.js:1164
 #: ../js/ui/components/telepathyClient.js:1199
 #: ../js/ui/components/telepathyClient.js:1233
-#: ../js/ui/components/telepathyClient.js:1291
+#: ../js/ui/components/telepathyClient.js:1290
 msgid "Decline"
 msgstr "거부"
 
 #: ../js/ui/components/telepathyClient.js:1170
 #: ../js/ui/components/telepathyClient.js:1239
-#: ../js/ui/components/telepathyClient.js:1296
+#: ../js/ui/components/telepathyClient.js:1295
 msgid "Accept"
 msgstr "허용"
 
@@ -845,97 +834,97 @@ msgstr "%s님이 %s 파일을 보냅니다"
 msgid "%s would like permission to see when you are online"
 msgstr "연결 상태인지 알 수 있는 권한을 %s님이 요청합니다"
 
-#: ../js/ui/components/telepathyClient.js:1342
+#: ../js/ui/components/telepathyClient.js:1341
 msgid "Network error"
 msgstr "네트워크 오류"
 
-#: ../js/ui/components/telepathyClient.js:1344
+#: ../js/ui/components/telepathyClient.js:1343
 msgid "Authentication failed"
 msgstr "인증이 실패했습니다"
 
-#: ../js/ui/components/telepathyClient.js:1346
+#: ../js/ui/components/telepathyClient.js:1345
 msgid "Encryption error"
 msgstr "암호화 오류"
 
-#: ../js/ui/components/telepathyClient.js:1348
+#: ../js/ui/components/telepathyClient.js:1347
 msgid "Certificate not provided"
 msgstr "인증서가 없습니다"
 
-#: ../js/ui/components/telepathyClient.js:1350
+#: ../js/ui/components/telepathyClient.js:1349
 msgid "Certificate untrusted"
 msgstr "인증서를 신뢰할 수 없습니다"
 
-#: ../js/ui/components/telepathyClient.js:1352
+#: ../js/ui/components/telepathyClient.js:1351
 msgid "Certificate expired"
 msgstr "인증서가 만료되었습니다"
 
-#: ../js/ui/components/telepathyClient.js:1354
+#: ../js/ui/components/telepathyClient.js:1353
 msgid "Certificate not activated"
 msgstr "인증서를 활성화하지 않았습니다"
 
-#: ../js/ui/components/telepathyClient.js:1356
+#: ../js/ui/components/telepathyClient.js:1355
 msgid "Certificate hostname mismatch"
 msgstr "인증서 호스트 이름이 맞지 않습니다"
 
-#: ../js/ui/components/telepathyClient.js:1358
+#: ../js/ui/components/telepathyClient.js:1357
 msgid "Certificate fingerprint mismatch"
 msgstr "인증서 핑거프린트가 맞지 않습니다"
 
-#: ../js/ui/components/telepathyClient.js:1360
+#: ../js/ui/components/telepathyClient.js:1359
 msgid "Certificate self-signed"
 msgstr "인증서가 자기 서명한 인증서입니다"
 
-#: ../js/ui/components/telepathyClient.js:1362
+#: ../js/ui/components/telepathyClient.js:1361
 msgid "Status is set to offline"
 msgstr "상태를 오프라인으로 설정"
 
-#: ../js/ui/components/telepathyClient.js:1364
+#: ../js/ui/components/telepathyClient.js:1363
 msgid "Encryption is not available"
 msgstr "암호화를 사용할 수 없습니다"
 
-#: ../js/ui/components/telepathyClient.js:1366
+#: ../js/ui/components/telepathyClient.js:1365
 msgid "Certificate is invalid"
 msgstr "인증서가 올바르지 않습니다"
 
-#: ../js/ui/components/telepathyClient.js:1368
+#: ../js/ui/components/telepathyClient.js:1367
 msgid "Connection has been refused"
 msgstr "연결이 거부되었습니다"
 
-#: ../js/ui/components/telepathyClient.js:1370
+#: ../js/ui/components/telepathyClient.js:1369
 msgid "Connection can't be established"
 msgstr "연결할 수 없습니다"
 
-#: ../js/ui/components/telepathyClient.js:1372
+#: ../js/ui/components/telepathyClient.js:1371
 msgid "Connection has been lost"
 msgstr "연결이 끊어졌습니다"
 
-#: ../js/ui/components/telepathyClient.js:1374
+#: ../js/ui/components/telepathyClient.js:1373
 msgid "This account is already connected to the server"
 msgstr "이 계정은 이미 서버에 연결했습니다"
 
-#: ../js/ui/components/telepathyClient.js:1376
+#: ../js/ui/components/telepathyClient.js:1375
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "같은 자원을 사용하는 새로운 연결로 바꾸었습니다"
 
-#: ../js/ui/components/telepathyClient.js:1378
+#: ../js/ui/components/telepathyClient.js:1377
 msgid "The account already exists on the server"
 msgstr "계정이 이미 서버에 있습니다"
 
-#: ../js/ui/components/telepathyClient.js:1380
+#: ../js/ui/components/telepathyClient.js:1379
 msgid "Server is currently too busy to handle the connection"
 msgstr "서버가 처리할 작업이 많아 연결을 처리할 수 없습니다"
 
-#: ../js/ui/components/telepathyClient.js:1382
+#: ../js/ui/components/telepathyClient.js:1381
 msgid "Certificate has been revoked"
 msgstr "인증서를 철회했습니다"
 
-#: ../js/ui/components/telepathyClient.js:1384
+#: ../js/ui/components/telepathyClient.js:1383
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "인증서가 보안에 취약한 알고리즘을 사용하거나 암호화 기능이 취약합니다."
 
-#: ../js/ui/components/telepathyClient.js:1386
+#: ../js/ui/components/telepathyClient.js:1385
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -943,22 +932,22 @@ msgstr ""
 "서버 인증서의 길이, 또는 서버 인증서 체인의 단계가 암호화 라이브러리의 제한"
 "을 넘어갑니다."
 
-#: ../js/ui/components/telepathyClient.js:1388
+#: ../js/ui/components/telepathyClient.js:1387
 msgid "Internal error"
 msgstr "내부 오류"
 
 #. translators: argument is the account name, like
 #. * name@jabber.org for example. */
-#: ../js/ui/components/telepathyClient.js:1398
+#: ../js/ui/components/telepathyClient.js:1397
 #, javascript-format
 msgid "Unable to connect to %s"
 msgstr "%s에 연결할 수 없습니다"
 
-#: ../js/ui/components/telepathyClient.js:1403
+#: ../js/ui/components/telepathyClient.js:1402
 msgid "View account"
 msgstr "계정 보기"
 
-#: ../js/ui/components/telepathyClient.js:1440
+#: ../js/ui/components/telepathyClient.js:1434
 msgid "Unknown reason"
 msgstr "알 수 없는 이유"
 
@@ -974,22 +963,22 @@ msgstr "프로그램 표시"
 msgid "Dash"
 msgstr "대시보드"
 
-#: ../js/ui/dateMenu.js:91
+#: ../js/ui/dateMenu.js:86
 msgid "Open Calendar"
 msgstr "달력 열기"
 
-#: ../js/ui/dateMenu.js:95
+#: ../js/ui/dateMenu.js:90
 msgid "Open Clocks"
 msgstr "시계 열기"
 
-#: ../js/ui/dateMenu.js:102
+#: ../js/ui/dateMenu.js:97
 msgid "Date & Time Settings"
 msgstr "날짜 및 시각 설정"
 
 #. 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:192
+#: ../js/ui/dateMenu.js:187
 msgid "%A %B %e, %Y"
 msgstr "%Y년 %B %e일 %A"
 
@@ -1121,33 +1110,31 @@ msgstr "설치"
 #: ../js/ui/extensionDownloader.js:204
 #, javascript-format
 msgid "Download and install “%s” from extensions.gnome.org?"
-msgstr ""
+msgstr "extensions.gnome.org 사이트에서 “%s” 확장을 다운로드해 설치하시겠습니까?"
-"extensions.gnome.org 사이트에서 “%s” 확장을 다운로드해 설치하시겠습니까?"
 
 #: ../js/ui/keyboard.js:641 ../js/ui/status/keyboard.js:335
 msgid "Keyboard"
 msgstr "키보드"
 
-#: ../js/ui/lookingGlass.js:643
+#: ../js/ui/lookingGlass.js:641
 msgid "No extensions installed"
 msgstr "확장을 설치하지 않았습니다"
 
 #. Translators: argument is an extension UUID. */
-#: ../js/ui/lookingGlass.js:697
+#: ../js/ui/lookingGlass.js:695
 #, javascript-format
 msgid "%s has not emitted any errors."
 msgstr "%s에서 발생한 에러가 없습니다."
 
-#: ../js/ui/lookingGlass.js:703
+#: ../js/ui/lookingGlass.js:701
 msgid "Hide Errors"
 msgstr "오류 숨기기"
 
-#: ../js/ui/lookingGlass.js:707 ../js/ui/lookingGlass.js:767
+#: ../js/ui/lookingGlass.js:705 ../js/ui/lookingGlass.js:765
 msgid "Show Errors"
 msgstr "오류 보이기"
 
-#: ../js/ui/lookingGlass.js:716 ../js/ui/status/location.js:59
+#: ../js/ui/lookingGlass.js:714
-#: ../js/ui/status/location.js:167
 msgid "Enabled"
 msgstr "사용"
 
@@ -1155,28 +1142,28 @@ msgstr "사용"
 #. because it's disabled by rfkill (airplane mode) */
 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:719 ../js/ui/status/location.js:164
+#: ../js/ui/lookingGlass.js:717 ../js/ui/status/network.js:550
-#: ../js/ui/status/network.js:555 ../src/gvc/gvc-mixer-control.c:1830
+#: ../src/gvc/gvc-mixer-control.c:1830
 msgid "Disabled"
 msgstr "사용 않음"
 
-#: ../js/ui/lookingGlass.js:721
+#: ../js/ui/lookingGlass.js:719
 msgid "Error"
 msgstr "오류"
 
-#: ../js/ui/lookingGlass.js:723
+#: ../js/ui/lookingGlass.js:721
 msgid "Out of date"
 msgstr "오래 된 버전"
 
-#: ../js/ui/lookingGlass.js:725
+#: ../js/ui/lookingGlass.js:723
 msgid "Downloading"
 msgstr "다운로드 중"
 
-#: ../js/ui/lookingGlass.js:749
+#: ../js/ui/lookingGlass.js:747
 msgid "View Source"
 msgstr "소스 보기"
 
-#: ../js/ui/lookingGlass.js:758
+#: ../js/ui/lookingGlass.js:756
 msgid "Web Page"
 msgstr "웹페이지"
 
@@ -1212,7 +1199,7 @@ msgstr "메시지 없음"
 msgid "Message Tray"
 msgstr "메시지 트레이"
 
-#: ../js/ui/messageTray.js:2962
+#: ../js/ui/messageTray.js:2948
 msgid "System Information"
 msgstr "시스템 정보"
 
@@ -1227,11 +1214,11 @@ msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "새 메시지 %d개"
 
-#: ../js/ui/overview.js:84
+#: ../js/ui/overview.js:83
 msgid "Undo"
 msgstr "실행 취소"
 
-#: ../js/ui/overview.js:124
+#: ../js/ui/overview.js:123
 msgid "Overview"
 msgstr "개요"
 
@@ -1239,7 +1226,7 @@ msgstr "개요"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters. */
-#: ../js/ui/overview.js:250
+#: ../js/ui/overview.js:257
 msgid "Type to search…"
 msgstr "검색하려면 입력하십시오…"
 
@@ -1281,27 +1268,27 @@ msgid "%d new notification"
 msgid_plural "%d new notifications"
 msgstr[0] "새 알림 %d개"
 
-#: ../js/ui/screenShield.js:474 ../js/ui/status/system.js:342
+#: ../js/ui/screenShield.js:473 ../js/ui/status/system.js:342
 msgid "Lock"
 msgstr "잠그기"
 
-#: ../js/ui/screenShield.js:708
+#: ../js/ui/screenShield.js:707
 msgid "GNOME needs to lock the screen"
 msgstr "그놈에서 화면을 잠궈야 합니다"
 
-#: ../js/ui/screenShield.js:835 ../js/ui/screenShield.js:1309
+#: ../js/ui/screenShield.js:834 ../js/ui/screenShield.js:1301
 msgid "Unable to lock"
 msgstr "잠글 수 없습니다"
 
-#: ../js/ui/screenShield.js:836 ../js/ui/screenShield.js:1310
+#: ../js/ui/screenShield.js:835 ../js/ui/screenShield.js:1302
 msgid "Lock was blocked by an application"
 msgstr "프로그램이 잠금을 막았습니다"
 
-#: ../js/ui/search.js:603
+#: ../js/ui/search.js:589
 msgid "Searching…"
 msgstr "검색하는 중…"
 
-#: ../js/ui/search.js:649
+#: ../js/ui/search.js:632
 msgid "No results."
 msgstr "결과가 없습니다."
 
@@ -1373,28 +1360,29 @@ msgstr "고대비"
 msgid "Large Text"
 msgstr "큰 글자"
 
-#: ../js/ui/status/bluetooth.js:49
+#: ../js/ui/status/bluetooth.js:48
 msgid "Bluetooth"
 msgstr "블루투스"
 
-#: ../js/ui/status/bluetooth.js:51 ../js/ui/status/network.js:151
+#: ../js/ui/status/bluetooth.js:50 ../js/ui/status/location.js:59
-#: ../js/ui/status/network.js:323 ../js/ui/status/network.js:1234
+#: ../js/ui/status/location.js:159 ../js/ui/status/network.js:151
-#: ../js/ui/status/network.js:1345 ../js/ui/status/rfkill.js:85
+#: ../js/ui/status/network.js:318 ../js/ui/status/network.js:1225
+#: ../js/ui/status/network.js:1336 ../js/ui/status/rfkill.js:85
 #: ../js/ui/status/rfkill.js:105
 msgid "Turn Off"
 msgstr "끄기"
 
-#: ../js/ui/status/bluetooth.js:54
+#: ../js/ui/status/bluetooth.js:53
 msgid "Bluetooth Settings"
 msgstr "블루투스 설정"
 
-#: ../js/ui/status/bluetooth.js:104
+#: ../js/ui/status/bluetooth.js:100
 #, javascript-format
 msgid "%d Connected Device"
 msgid_plural "%d Connected Devices"
 msgstr[0] "연결된 장치 %d개"
 
-#: ../js/ui/status/bluetooth.js:106 ../js/ui/status/network.js:1262
+#: ../js/ui/status/bluetooth.js:102 ../js/ui/status/network.js:1253
 msgid "Not Connected"
 msgstr "연결되지 않음"
 
@@ -1406,167 +1394,160 @@ msgstr "밝기"
 msgid "Show Keyboard Layout"
 msgstr "키보드 배치 표시"
 
-#: ../js/ui/status/location.js:53
+#: ../js/ui/status/location.js:52
 msgid "Location"
 msgstr "위치"
 
-#: ../js/ui/status/location.js:60 ../js/ui/status/location.js:168
+#: ../js/ui/status/location.js:58 ../js/ui/status/location.js:158
-msgid "Disable"
+#: ../js/ui/status/rfkill.js:84
-msgstr "사용 않기"
+msgid "On"
+msgstr "켜기"
 
-#: ../js/ui/status/location.js:165
+#: ../js/ui/status/location.js:155 ../js/ui/status/network.js:415
-msgid "Enable"
+#: ../js/ui/status/network.js:1251 ../js/ui/status/network.js:1455
-msgstr "사용"
+msgid "Off"
+msgstr "끄기"
 
-#: ../js/ui/status/location.js:167
+#: ../js/ui/status/location.js:156 ../js/ui/status/network.js:1225
-msgid "In Use"
+msgid "Turn On"
-msgstr "사용 중"
+msgstr "켜기"
 
 #: ../js/ui/status/network.js:74
 msgid "<unknown>"
 msgstr "<알 수 없음>"
 
-#: ../js/ui/status/network.js:420 ../js/ui/status/network.js:1260
+#: ../js/ui/status/network.js:417
-#: ../js/ui/status/network.js:1464
-msgid "Off"
-msgstr "끄기"
-
-#: ../js/ui/status/network.js:422
 msgid "Connected"
 msgstr "연결됨"
 
 #. 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:426
+#: ../js/ui/status/network.js:421
 msgid "unmanaged"
 msgstr "관리되지 않음"
 
-#: ../js/ui/status/network.js:428
+#: ../js/ui/status/network.js:423
 msgid "disconnecting..."
 msgstr "연결 끊는 중..."
 
-#: ../js/ui/status/network.js:434 ../js/ui/status/network.js:1362
+#: ../js/ui/status/network.js:429 ../js/ui/status/network.js:1353
 msgid "connecting..."
 msgstr "연결하는 중..."
 
 #. Translators: this is for network connections that require some kind of key or password */
-#: ../js/ui/status/network.js:437 ../js/ui/status/network.js:1365
+#: ../js/ui/status/network.js:432 ../js/ui/status/network.js:1356
 msgid "authentication required"
 msgstr "인증 필요"
 
 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing */
-#: ../js/ui/status/network.js:445
+#: ../js/ui/status/network.js:440
 msgid "firmware missing"
 msgstr "펌웨어 없음"
 
 #. 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:449
+#: ../js/ui/status/network.js:444
 msgid "unavailable"
 msgstr "사용 불가"
 
-#: ../js/ui/status/network.js:451 ../js/ui/status/network.js:1367
+#: ../js/ui/status/network.js:446 ../js/ui/status/network.js:1358
 msgid "connection failed"
 msgstr "연결 실패"
 
-#: ../js/ui/status/network.js:467
+#: ../js/ui/status/network.js:462
 msgid "Wired Settings"
 msgstr "유선 네트워크 설정"
 
-#: ../js/ui/status/network.js:509 ../js/ui/status/network.js:587
+#: ../js/ui/status/network.js:504 ../js/ui/status/network.js:582
 msgid "Mobile Broadband Settings"
 msgstr "휴대전화 네트워크 설정"
 
-#: ../js/ui/status/network.js:551 ../js/ui/status/network.js:1258
+#: ../js/ui/status/network.js:546 ../js/ui/status/network.js:1249
 msgid "Hardware Disabled"
 msgstr "하드웨어 사용 않음"
 
-#: ../js/ui/status/network.js:595
+#: ../js/ui/status/network.js:590
 msgid "Use as Internet connection"
 msgstr "인터넷 연결에 사용"
 
-#: ../js/ui/status/network.js:776
+#: ../js/ui/status/network.js:771
 msgid "Airplane Mode is On"
 msgstr "비행기 모드 켜짐"
 
-#: ../js/ui/status/network.js:777
+#: ../js/ui/status/network.js:772
 msgid "Wi-Fi is disabled when airplane mode is on."
 msgstr "비행기 모드에서는 와이파이를 사용하지 않습니다."
 
-#: ../js/ui/status/network.js:778
+#: ../js/ui/status/network.js:773
 msgid "Turn Off Airplane Mode"
 msgstr "비행기 모드 끄기"
 
-#: ../js/ui/status/network.js:787
+#: ../js/ui/status/network.js:782
 msgid "Wi-Fi is Off"
 msgstr "와이파이 꺼짐"
 
-#: ../js/ui/status/network.js:788
+#: ../js/ui/status/network.js:783
 msgid "Wi-Fi needs to be turned on in order to connect to a network."
 msgstr "네트워크에 연결하려면 와이파이를 켜야 합니다."
 
-#: ../js/ui/status/network.js:789
+#: ../js/ui/status/network.js:784
 msgid "Turn On Wi-Fi"
 msgstr "와이파이 켜기"
 
-#: ../js/ui/status/network.js:814
+#: ../js/ui/status/network.js:809
 msgid "Wi-Fi Networks"
 msgstr "와이파이 네트워크"
 
-#: ../js/ui/status/network.js:816
+#: ../js/ui/status/network.js:811
 msgid "Select a network"
 msgstr "네트워크를 선택하십시오"
 
-#: ../js/ui/status/network.js:845
+#: ../js/ui/status/network.js:840
 msgid "No Networks"
 msgstr "네트워크 없음"
 
-#: ../js/ui/status/network.js:866 ../js/ui/status/rfkill.js:103
+#: ../js/ui/status/network.js:861 ../js/ui/status/rfkill.js:103
 msgid "Use hardware switch to turn off"
 msgstr "끄려면 하드웨어 스위치를 사용하십시오"
 
-#: ../js/ui/status/network.js:1136
+#: ../js/ui/status/network.js:1131
 msgid "Select Network"
 msgstr "네트워크 선택"
 
-#: ../js/ui/status/network.js:1142
+#: ../js/ui/status/network.js:1137
 msgid "Wi-Fi Settings"
 msgstr "와이파이 설정"
 
-#: ../js/ui/status/network.js:1234
+#: ../js/ui/status/network.js:1242
-msgid "Turn On"
-msgstr "켜기"
-
-#: ../js/ui/status/network.js:1251
 msgid "Hotspot Active"
 msgstr "핫스팟 사용 중"
 
-#: ../js/ui/status/network.js:1254
+#: ../js/ui/status/network.js:1245
 msgid "Connecting"
 msgstr "연결하는 중"
 
-#: ../js/ui/status/network.js:1433 ../js/ui/status/rfkill.js:88
+#: ../js/ui/status/network.js:1424 ../js/ui/status/rfkill.js:88
 msgid "Network Settings"
 msgstr "네트워크 설정"
 
-#: ../js/ui/status/network.js:1435
+#: ../js/ui/status/network.js:1426
 msgid "VPN Settings"
 msgstr "가상사설망 설정"
 
-#: ../js/ui/status/network.js:1454
+#: ../js/ui/status/network.js:1445
 msgid "VPN"
 msgstr "가상사설망"
 
-#: ../js/ui/status/network.js:1607
+#: ../js/ui/status/network.js:1598
 msgid "Network Manager"
 msgstr "네트워크 관리"
 
-#: ../js/ui/status/network.js:1646
+#: ../js/ui/status/network.js:1637
 msgid "Connection failed"
 msgstr "연결이 실패했습니다"
 
-#: ../js/ui/status/network.js:1647
+#: ../js/ui/status/network.js:1638
 msgid "Activation of network connection failed"
 msgstr "네트워크 연결이 실패했습니다"
 
@@ -1604,10 +1585,6 @@ msgstr "배터리"
 msgid "Airplane Mode"
 msgstr "비행기 모드"
 
-#: ../js/ui/status/rfkill.js:84
-msgid "On"
-msgstr "켜기"
-
 #: ../js/ui/status/system.js:314
 msgid "Switch User"
 msgstr "사용자 바꾸기"

po/lt.po

@@ -11,8 +11,8 @@ 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: 2014-03-30 19:57+0000\n"
+"POT-Creation-Date: 2014-03-02 16:24+0000\n"
-"PO-Revision-Date: 2014-03-30 23:02+0300\n"
+"PO-Revision-Date: 2014-03-02 19:56+0200\n"
 "Last-Translator: Aurimas Černius <aurisc4@gmail.com>\n"
 "Language-Team: Lietuvių <gnome-lt@lists.akl.lt>\n"
 "Language: lt\n"
@@ -228,6 +228,14 @@ msgid "The maximum accuracy level of location."
 msgstr "Didžiausias vietos tikslumo lygis."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:30
+#| msgid ""
+#| "Configures the maximum level of location accuracy applications are "
+#| "allowed to see. Valid options are 'off' (disable location tracking), "
+#| "'country', 'city', 'neighborhood', 'street', and 'exact' (typically "
+#| "requires GPS receiver). Please keep in mind that this only controls what "
+#| "Geoclue will allow applications to see and they can find user's location "
+#| "on their own using network resources (albeit with street-level accuracy "
+#| "at best)."
 msgid ""
 "Configures the maximum level of location accuracy applications are allowed "
 "to see. Valid options are 'off' (disable location tracking), 'country', "
@@ -310,7 +318,7 @@ msgstr "Išskleidžiamajame sąraše pasirinkite konfigūruotiną plėtinį."
 #: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:136
 #: ../js/ui/components/polkitAgent.js:166 ../js/ui/endSessionDialog.js:429
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
-#: ../js/ui/status/network.js:878
+#: ../js/ui/status/network.js:883
 msgid "Cancel"
 msgstr "Atsisakyti"
 
@@ -328,25 +336,25 @@ msgctxt "button"
 msgid "Sign In"
 msgstr "Prisijungti"
 
-#: ../js/gdm/loginDialog.js:271
+#: ../js/gdm/loginDialog.js:270
 msgid "Choose Session"
 msgstr "Pasirinkite seansą"
 
-#: ../js/gdm/loginDialog.js:431
+#: ../js/gdm/loginDialog.js:430
 msgid "Not listed?"
 msgstr "Nėra sąraše?"
 
-#: ../js/gdm/loginDialog.js:614
+#: ../js/gdm/loginDialog.js:598
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(pvz., naudotojas arba %s)"
 
-#: ../js/gdm/loginDialog.js:619 ../js/ui/components/networkAgent.js:262
+#: ../js/gdm/loginDialog.js:603 ../js/ui/components/networkAgent.js:262
 #: ../js/ui/components/networkAgent.js:280
 msgid "Username: "
 msgstr "Naudotojo vardas: "
 
-#: ../js/gdm/loginDialog.js:920
+#: ../js/gdm/loginDialog.js:868
 msgid "Login Window"
 msgstr "Prisijungimo langas"
 
@@ -371,27 +379,27 @@ msgstr "Nepavyko perskaityti komandos:"
 msgid "Execution of “%s” failed:"
 msgstr "Nepavyko įvykdyti „%s“:"
 
-#: ../js/ui/appDisplay.js:636
+#: ../js/ui/appDisplay.js:629
 msgid "Frequently used applications will appear here"
 msgstr "Čia bus matomos dažnai naudojamos programos"
 
-#: ../js/ui/appDisplay.js:747
+#: ../js/ui/appDisplay.js:740
 msgid "Frequent"
 msgstr "Dažnai naudojamos"
 
-#: ../js/ui/appDisplay.js:754
+#: ../js/ui/appDisplay.js:747
 msgid "All"
 msgstr "Visos"
 
-#: ../js/ui/appDisplay.js:1566
+#: ../js/ui/appDisplay.js:1552
 msgid "New Window"
 msgstr "Naujas langas"
 
-#: ../js/ui/appDisplay.js:1588 ../js/ui/dash.js:285
+#: ../js/ui/appDisplay.js:1574 ../js/ui/dash.js:285
 msgid "Remove from Favorites"
 msgstr "Pašalinti iš mėgstamų"
 
-#: ../js/ui/appDisplay.js:1594
+#: ../js/ui/appDisplay.js:1580
 msgid "Add to Favorites"
 msgstr "Pridėti prie mėgstamų"
 
@@ -534,44 +542,44 @@ msgstr "Št"
 msgid "calendar:MY"
 msgstr "calendar:YM"
 
-#: ../js/ui/calendar.js:450
+#: ../js/ui/calendar.js:446
 msgid "Previous month"
 msgstr "Ankstesnis mėnuo"
 
-#: ../js/ui/calendar.js:460
+#: ../js/ui/calendar.js:456
 msgid "Next month"
 msgstr "Kitas mėnuo"
 
 #. Translators: Text to show if there are no events */
-#: ../js/ui/calendar.js:772
+#: ../js/ui/calendar.js:762
 msgid "Nothing Scheduled"
 msgstr "Nieko nesuplanuota"
 
 #. Translators: Shown on calendar heading when selected day occurs on current year */
-#: ../js/ui/calendar.js:790
+#: ../js/ui/calendar.js:780
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %B %d d."
 
 #. Translators: Shown on calendar heading when selected day occurs on different year */
-#: ../js/ui/calendar.js:793
+#: ../js/ui/calendar.js:783
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %Y m. %B %d d."
 
-#: ../js/ui/calendar.js:804
+#: ../js/ui/calendar.js:794
 msgid "Today"
 msgstr "Šiandien"
 
-#: ../js/ui/calendar.js:808
+#: ../js/ui/calendar.js:798
 msgid "Tomorrow"
 msgstr "Rytoj"
 
-#: ../js/ui/calendar.js:819
+#: ../js/ui/calendar.js:809
 msgid "This week"
 msgstr "Šią savaitę"
 
-#: ../js/ui/calendar.js:827
+#: ../js/ui/calendar.js:817
 msgid "Next week"
 msgstr "Kitą savaitę"
 
@@ -604,8 +612,8 @@ msgstr "Slaptažodis:"
 msgid "Type again:"
 msgstr "Įveskite dar kartą:"
 
-#: ../js/ui/components/networkAgent.js:131 ../js/ui/status/network.js:240
+#: ../js/ui/components/networkAgent.js:131 ../js/ui/status/network.js:250
-#: ../js/ui/status/network.js:322 ../js/ui/status/network.js:881
+#: ../js/ui/status/network.js:327 ../js/ui/status/network.js:886
 msgid "Connect"
 msgstr "Prisijungti"
 
@@ -810,13 +818,13 @@ msgstr "%s jus kviečia prisijungti prie %s"
 #: ../js/ui/components/telepathyClient.js:1164
 #: ../js/ui/components/telepathyClient.js:1199
 #: ../js/ui/components/telepathyClient.js:1233
-#: ../js/ui/components/telepathyClient.js:1291
+#: ../js/ui/components/telepathyClient.js:1290
 msgid "Decline"
 msgstr "Atmesti"
 
 #: ../js/ui/components/telepathyClient.js:1170
 #: ../js/ui/components/telepathyClient.js:1239
-#: ../js/ui/components/telepathyClient.js:1296
+#: ../js/ui/components/telepathyClient.js:1295
 msgid "Accept"
 msgstr "Priimti"
 
@@ -853,99 +861,99 @@ msgstr "%s jums siunčia %s"
 msgid "%s would like permission to see when you are online"
 msgstr "%s pageidauja matyti, kai esate prisijungę prie interneto"
 
-#: ../js/ui/components/telepathyClient.js:1342
+#: ../js/ui/components/telepathyClient.js:1341
 msgid "Network error"
 msgstr "Tinklo klaida"
 
-#: ../js/ui/components/telepathyClient.js:1344
+#: ../js/ui/components/telepathyClient.js:1343
 msgid "Authentication failed"
 msgstr "Nepavyko patvirtinti tapatybės"
 
-#: ../js/ui/components/telepathyClient.js:1346
+#: ../js/ui/components/telepathyClient.js:1345
 msgid "Encryption error"
 msgstr "Šifravimo klaida"
 
-#: ../js/ui/components/telepathyClient.js:1348
+#: ../js/ui/components/telepathyClient.js:1347
 msgid "Certificate not provided"
 msgstr "Liudijimas nepateiktas"
 
-#: ../js/ui/components/telepathyClient.js:1350
+#: ../js/ui/components/telepathyClient.js:1349
 msgid "Certificate untrusted"
 msgstr "Liudijimas nepatikimas"
 
-#: ../js/ui/components/telepathyClient.js:1352
+#: ../js/ui/components/telepathyClient.js:1351
 msgid "Certificate expired"
 msgstr "Liudijimo galiojimas pasibaigęs"
 
-#: ../js/ui/components/telepathyClient.js:1354
+#: ../js/ui/components/telepathyClient.js:1353
 msgid "Certificate not activated"
 msgstr "Liudijimas neaktyvuotas"
 
-#: ../js/ui/components/telepathyClient.js:1356
+#: ../js/ui/components/telepathyClient.js:1355
 msgid "Certificate hostname mismatch"
 msgstr "Liudijimo serverio vardo nesutapimas"
 
-#: ../js/ui/components/telepathyClient.js:1358
+#: ../js/ui/components/telepathyClient.js:1357
 msgid "Certificate fingerprint mismatch"
 msgstr "Liudijimo piršto atspaudo nesutapimas"
 
-#: ../js/ui/components/telepathyClient.js:1360
+#: ../js/ui/components/telepathyClient.js:1359
 msgid "Certificate self-signed"
 msgstr "Liudijimas pačių pasirašytas"
 
-#: ../js/ui/components/telepathyClient.js:1362
+#: ../js/ui/components/telepathyClient.js:1361
 msgid "Status is set to offline"
 msgstr "Nustatyta atsijungimo būsena"
 
-#: ../js/ui/components/telepathyClient.js:1364
+#: ../js/ui/components/telepathyClient.js:1363
 msgid "Encryption is not available"
 msgstr "Šifravimas negalimas"
 
-#: ../js/ui/components/telepathyClient.js:1366
+#: ../js/ui/components/telepathyClient.js:1365
 msgid "Certificate is invalid"
 msgstr "Liudijimas netinkamas"
 
-#: ../js/ui/components/telepathyClient.js:1368
+#: ../js/ui/components/telepathyClient.js:1367
 msgid "Connection has been refused"
 msgstr "Ryšys atmestas"
 
-#: ../js/ui/components/telepathyClient.js:1370
+#: ../js/ui/components/telepathyClient.js:1369
 msgid "Connection can't be established"
 msgstr "Nepavyko užmegzti ryšio"
 
-#: ../js/ui/components/telepathyClient.js:1372
+#: ../js/ui/components/telepathyClient.js:1371
 msgid "Connection has been lost"
 msgstr "Ryšys nutrūko"
 
-#: ../js/ui/components/telepathyClient.js:1374
+#: ../js/ui/components/telepathyClient.js:1373
 msgid "This account is already connected to the server"
 msgstr "Ši paskyra jau prijungta prie serverio"
 
-#: ../js/ui/components/telepathyClient.js:1376
+#: ../js/ui/components/telepathyClient.js:1375
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Ryšys pakeistas nauju ryšiu naudojant tą patį išteklių"
 
-#: ../js/ui/components/telepathyClient.js:1378
+#: ../js/ui/components/telepathyClient.js:1377
 msgid "The account already exists on the server"
 msgstr "Tokia paskyra serveryje jau yra"
 
-#: ../js/ui/components/telepathyClient.js:1380
+#: ../js/ui/components/telepathyClient.js:1379
 msgid "Server is currently too busy to handle the connection"
 msgstr "Šiuo metu serveris per daug užimtas šiai užklausai apdoroti"
 
-#: ../js/ui/components/telepathyClient.js:1382
+#: ../js/ui/components/telepathyClient.js:1381
 msgid "Certificate has been revoked"
 msgstr "Liudijimas atšauktas"
 
-#: ../js/ui/components/telepathyClient.js:1384
+#: ../js/ui/components/telepathyClient.js:1383
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Liudijimui naudojamas nesaugus šifravimo algoritmas arba jis kriptografiškai "
 "silpnas"
 
-#: ../js/ui/components/telepathyClient.js:1386
+#: ../js/ui/components/telepathyClient.js:1385
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -953,22 +961,22 @@ msgstr ""
 "Serverio liudijimo ilgis arba liudijimų eilės dydis viršija kriptografijos "
 "bibliotekos apribojimus"
 
-#: ../js/ui/components/telepathyClient.js:1388
+#: ../js/ui/components/telepathyClient.js:1387
 msgid "Internal error"
 msgstr "Vidinė klaida"
 
 #. translators: argument is the account name, like
 #. * name@jabber.org for example. */
-#: ../js/ui/components/telepathyClient.js:1398
+#: ../js/ui/components/telepathyClient.js:1397
 #, javascript-format
 msgid "Unable to connect to %s"
 msgstr "Nepavyksta prisijungti prie %s"
 
-#: ../js/ui/components/telepathyClient.js:1403
+#: ../js/ui/components/telepathyClient.js:1402
 msgid "View account"
 msgstr "Rodyti paskyrą"
 
-#: ../js/ui/components/telepathyClient.js:1440
+#: ../js/ui/components/telepathyClient.js:1434
 msgid "Unknown reason"
 msgstr "Nežinoma priežastis"
 
@@ -984,22 +992,22 @@ msgstr "Paleisti programas"
 msgid "Dash"
 msgstr "Paleidimo sritis"
 
-#: ../js/ui/dateMenu.js:91
+#: ../js/ui/dateMenu.js:86
 msgid "Open Calendar"
 msgstr "Atverti kalendorių"
 
-#: ../js/ui/dateMenu.js:95
+#: ../js/ui/dateMenu.js:90
 msgid "Open Clocks"
 msgstr "Atverti laikrodžius"
 
-#: ../js/ui/dateMenu.js:102
+#: ../js/ui/dateMenu.js:97
 msgid "Date & Time Settings"
 msgstr "Datos ir laiko nustatymai"
 
 #. 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:192
+#: ../js/ui/dateMenu.js:187
 msgid "%A %B %e, %Y"
 msgstr "%A, %Y m. %B %d d."
 
@@ -1152,26 +1160,25 @@ msgstr "Parsiųsti ir įdiegti „%s“ iš extensions.gnome.org?"
 msgid "Keyboard"
 msgstr "Klaviatūra"
 
-#: ../js/ui/lookingGlass.js:643
+#: ../js/ui/lookingGlass.js:641
 msgid "No extensions installed"
 msgstr "Nėra įdiegtų plėtinių"
 
 #. Translators: argument is an extension UUID. */
-#: ../js/ui/lookingGlass.js:697
+#: ../js/ui/lookingGlass.js:695
 #, javascript-format
 msgid "%s has not emitted any errors."
 msgstr "%s nepranešė apie jokias klaidas."
 
-#: ../js/ui/lookingGlass.js:703
+#: ../js/ui/lookingGlass.js:701
 msgid "Hide Errors"
 msgstr "Slėpti klaidas"
 
-#: ../js/ui/lookingGlass.js:707 ../js/ui/lookingGlass.js:767
+#: ../js/ui/lookingGlass.js:705 ../js/ui/lookingGlass.js:765
 msgid "Show Errors"
 msgstr "Rodyti klaidas"
 
-#: ../js/ui/lookingGlass.js:716 ../js/ui/status/location.js:59
+#: ../js/ui/lookingGlass.js:714
-#: ../js/ui/status/location.js:167
 msgid "Enabled"
 msgstr "Įjungta"
 
@@ -1179,28 +1186,28 @@ msgstr "Įjungta"
 #. because it's disabled by rfkill (airplane mode) */
 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:719 ../js/ui/status/location.js:164
+#: ../js/ui/lookingGlass.js:717 ../js/ui/status/network.js:560
-#: ../js/ui/status/network.js:555 ../src/gvc/gvc-mixer-control.c:1830
+#: ../src/gvc/gvc-mixer-control.c:1830
 msgid "Disabled"
 msgstr "Išjungta"
 
-#: ../js/ui/lookingGlass.js:721
+#: ../js/ui/lookingGlass.js:719
 msgid "Error"
 msgstr "Klaida"
 
-#: ../js/ui/lookingGlass.js:723
+#: ../js/ui/lookingGlass.js:721
 msgid "Out of date"
 msgstr "Pasenęs"
 
-#: ../js/ui/lookingGlass.js:725
+#: ../js/ui/lookingGlass.js:723
 msgid "Downloading"
 msgstr "Atsiunčiama"
 
-#: ../js/ui/lookingGlass.js:749
+#: ../js/ui/lookingGlass.js:747
 msgid "View Source"
 msgstr "Žiūrėti šaltinį"
 
-#: ../js/ui/lookingGlass.js:758
+#: ../js/ui/lookingGlass.js:756
 msgid "Web Page"
 msgstr "Tinklalapis"
 
@@ -1236,7 +1243,7 @@ msgstr "Nėra pranešimų"
 msgid "Message Tray"
 msgstr "Pranešimų juosta"
 
-#: ../js/ui/messageTray.js:2962
+#: ../js/ui/messageTray.js:2948
 msgid "System Information"
 msgstr "Sistemos informacija"
 
@@ -1253,11 +1260,11 @@ msgstr[0] "%d naujas pranešimas"
 msgstr[1] "%d nauji pranešimai"
 msgstr[2] "%d naujų pranešimų"
 
-#: ../js/ui/overview.js:84
+#: ../js/ui/overview.js:83
 msgid "Undo"
 msgstr "Atšaukti"
 
-#: ../js/ui/overview.js:124
+#: ../js/ui/overview.js:123
 msgid "Overview"
 msgstr "Apžvalga"
 
@@ -1265,7 +1272,7 @@ msgstr "Apžvalga"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters. */
-#: ../js/ui/overview.js:250
+#: ../js/ui/overview.js:257
 msgid "Type to search…"
 msgstr "Rašykite, ko ieškote…"
 
@@ -1309,27 +1316,27 @@ msgstr[0] "%d naujas pranešimas"
 msgstr[1] "%d nauji pranešimai"
 msgstr[2] "%d naujų pranešimų"
 
-#: ../js/ui/screenShield.js:474 ../js/ui/status/system.js:342
+#: ../js/ui/screenShield.js:473 ../js/ui/status/system.js:342
 msgid "Lock"
 msgstr "Užrakinti"
 
-#: ../js/ui/screenShield.js:708
+#: ../js/ui/screenShield.js:707
 msgid "GNOME needs to lock the screen"
 msgstr "GNOME aplinkai reikia užrakinti ekraną"
 
-#: ../js/ui/screenShield.js:835 ../js/ui/screenShield.js:1309
+#: ../js/ui/screenShield.js:834 ../js/ui/screenShield.js:1301
 msgid "Unable to lock"
 msgstr "Nepavyksta užrakinti"
 
-#: ../js/ui/screenShield.js:836 ../js/ui/screenShield.js:1310
+#: ../js/ui/screenShield.js:835 ../js/ui/screenShield.js:1302
 msgid "Lock was blocked by an application"
 msgstr "Programa užblokavo užrakinimą"
 
-#: ../js/ui/search.js:603
+#: ../js/ui/search.js:589
 msgid "Searching…"
 msgstr "Ieškoma…"
 
-#: ../js/ui/search.js:649
+#: ../js/ui/search.js:632
 msgid "No results."
 msgstr "Nerasta atitikmenų."
 
@@ -1401,22 +1408,23 @@ msgstr "Didelis kontrastas"
 msgid "Large Text"
 msgstr "Didelis tekstas"
 
-#: ../js/ui/status/bluetooth.js:49
+#: ../js/ui/status/bluetooth.js:48
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../js/ui/status/bluetooth.js:51 ../js/ui/status/network.js:151
+#: ../js/ui/status/bluetooth.js:50 ../js/ui/status/location.js:59
-#: ../js/ui/status/network.js:323 ../js/ui/status/network.js:1234
+#: ../js/ui/status/location.js:159 ../js/ui/status/network.js:151
-#: ../js/ui/status/network.js:1345 ../js/ui/status/rfkill.js:85
+#: ../js/ui/status/network.js:328 ../js/ui/status/network.js:1235
+#: ../js/ui/status/network.js:1346 ../js/ui/status/rfkill.js:85
 #: ../js/ui/status/rfkill.js:105
 msgid "Turn Off"
 msgstr "Išjungti"
 
-#: ../js/ui/status/bluetooth.js:54
+#: ../js/ui/status/bluetooth.js:53
 msgid "Bluetooth Settings"
 msgstr "Bluetooth nustatymai"
 
-#: ../js/ui/status/bluetooth.js:104
+#: ../js/ui/status/bluetooth.js:100
 #, javascript-format
 msgid "%d Connected Device"
 msgid_plural "%d Connected Devices"
@@ -1424,7 +1432,7 @@ msgstr[0] "%d prijungtas įrenginys"
 msgstr[1] "%d prijungti įrenginiai"
 msgstr[2] "%d prijungtų įrenginių"
 
-#: ../js/ui/status/bluetooth.js:106 ../js/ui/status/network.js:1262
+#: ../js/ui/status/bluetooth.js:102 ../js/ui/status/network.js:1263
 msgid "Not Connected"
 msgstr "Atsijungta"
 
@@ -1436,169 +1444,156 @@ msgstr "Ryškumas"
 msgid "Show Keyboard Layout"
 msgstr "Rodyti klaviatūros išdėstymą"
 
-#: ../js/ui/status/location.js:53
+#: ../js/ui/status/location.js:52
 msgid "Location"
 msgstr "Vieta"
 
-#: ../js/ui/status/location.js:60 ../js/ui/status/location.js:168
+#: ../js/ui/status/location.js:58 ../js/ui/status/location.js:158
-#| msgid "Disabled"
+#: ../js/ui/status/rfkill.js:84
-msgid "Disable"
+msgid "On"
-msgstr "Išjungti"
+msgstr "Įjungta"
 
-#: ../js/ui/status/location.js:165
+#: ../js/ui/status/location.js:155 ../js/ui/status/network.js:246
-#| msgid "Enabled"
+#: ../js/ui/status/network.js:425 ../js/ui/status/network.js:1261
-msgid "Enable"
+msgid "Off"
+msgstr "Išjungta"
+
+#: ../js/ui/status/location.js:156 ../js/ui/status/network.js:1235
+msgid "Turn On"
 msgstr "Įjungti"
 
-#: ../js/ui/status/location.js:167
-msgid "In Use"
-msgstr "Naudojama"
-
 #: ../js/ui/status/network.js:74
 msgid "<unknown>"
 msgstr "<nežinoma>"
 
-#: ../js/ui/status/network.js:420 ../js/ui/status/network.js:1260
-#: ../js/ui/status/network.js:1464
-msgid "Off"
-msgstr "Išjungta"
-
-#: ../js/ui/status/network.js:422
-msgid "Connected"
-msgstr "Prisijungta"
-
 #. 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:426
+#: ../js/ui/status/network.js:431
 msgid "unmanaged"
 msgstr "nevaldomas"
 
-#: ../js/ui/status/network.js:428
+#: ../js/ui/status/network.js:433
 msgid "disconnecting..."
 msgstr "atsijungiama..."
 
-#: ../js/ui/status/network.js:434 ../js/ui/status/network.js:1362
+#: ../js/ui/status/network.js:439 ../js/ui/status/network.js:1363
 msgid "connecting..."
 msgstr "jungiamasi..."
 
 #. Translators: this is for network connections that require some kind of key or password */
-#: ../js/ui/status/network.js:437 ../js/ui/status/network.js:1365
+#: ../js/ui/status/network.js:442 ../js/ui/status/network.js:1366
 msgid "authentication required"
 msgstr "reikia patvirtinti tapatybę"
 
 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing */
-#: ../js/ui/status/network.js:445
+#: ../js/ui/status/network.js:450
 msgid "firmware missing"
 msgstr "Trūksta integruotos programinės įrangos (firmware)"
 
 #. 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:449
+#: ../js/ui/status/network.js:454
 msgid "unavailable"
 msgstr "nepasiekiamas"
 
-#: ../js/ui/status/network.js:451 ../js/ui/status/network.js:1367
+#: ../js/ui/status/network.js:456 ../js/ui/status/network.js:1368
 msgid "connection failed"
 msgstr "nepavyko prisijungti"
 
-#: ../js/ui/status/network.js:467
+#: ../js/ui/status/network.js:472
 msgid "Wired Settings"
 msgstr "Laidinio ryšio nustatymai"
 
-#: ../js/ui/status/network.js:509 ../js/ui/status/network.js:587
+#: ../js/ui/status/network.js:514 ../js/ui/status/network.js:592
 msgid "Mobile Broadband Settings"
 msgstr "Mobiliojo plačiajuosčio tinklo nustatymai"
 
-#: ../js/ui/status/network.js:551 ../js/ui/status/network.js:1258
+#: ../js/ui/status/network.js:556 ../js/ui/status/network.js:1259
 msgid "Hardware Disabled"
 msgstr "Aparatinė įranga išjungta"
 
-#: ../js/ui/status/network.js:595
+#: ../js/ui/status/network.js:600
 msgid "Use as Internet connection"
 msgstr "Naudoti kaip interneto ryšį"
 
-#: ../js/ui/status/network.js:776
+#: ../js/ui/status/network.js:781
 msgid "Airplane Mode is On"
 msgstr "Skrydžio veiksena įjungta"
 
-#: ../js/ui/status/network.js:777
+#: ../js/ui/status/network.js:782
 msgid "Wi-Fi is disabled when airplane mode is on."
 msgstr "Belaidis ryšys yra išjungta skrydžio veiksenoje."
 
-#: ../js/ui/status/network.js:778
+#: ../js/ui/status/network.js:783
 msgid "Turn Off Airplane Mode"
 msgstr "Išjungti skrydžio veikseną"
 
-#: ../js/ui/status/network.js:787
+#: ../js/ui/status/network.js:792
 msgid "Wi-Fi is Off"
 msgstr "Belaidžio ryšys išjungtas"
 
-#: ../js/ui/status/network.js:788
+#: ../js/ui/status/network.js:793
 msgid "Wi-Fi needs to be turned on in order to connect to a network."
 msgstr "Norint prisijungti prie tinklo reikia įjungti belaidį ryšį."
 
-#: ../js/ui/status/network.js:789
+#: ../js/ui/status/network.js:794
 msgid "Turn On Wi-Fi"
 msgstr "Įjungti belaidį ryšį"
 
-#: ../js/ui/status/network.js:814
+#: ../js/ui/status/network.js:819
 msgid "Wi-Fi Networks"
 msgstr "Wi-Fi tinklai"
 
-#: ../js/ui/status/network.js:816
+#: ../js/ui/status/network.js:821
 msgid "Select a network"
 msgstr "Pasirinkite tinklą"
 
-#: ../js/ui/status/network.js:845
+#: ../js/ui/status/network.js:850
 msgid "No Networks"
 msgstr "Nėra tinklų"
 
-#: ../js/ui/status/network.js:866 ../js/ui/status/rfkill.js:103
+#: ../js/ui/status/network.js:871 ../js/ui/status/rfkill.js:103
 msgid "Use hardware switch to turn off"
 msgstr "Išjungimui naudoti aparatinį jungiklį"
 
-#: ../js/ui/status/network.js:1136
+#: ../js/ui/status/network.js:1141
 msgid "Select Network"
 msgstr "Pasirinkite tinklą"
 
-#: ../js/ui/status/network.js:1142
+#: ../js/ui/status/network.js:1147
 msgid "Wi-Fi Settings"
 msgstr "Belaidžio ryšio nustatymai"
 
-#: ../js/ui/status/network.js:1234
+#: ../js/ui/status/network.js:1252
-msgid "Turn On"
-msgstr "Įjungti"
-
-#: ../js/ui/status/network.js:1251
 msgid "Hotspot Active"
 msgstr "Prieigos taškas aktyvus"
 
-#: ../js/ui/status/network.js:1254
+#: ../js/ui/status/network.js:1255
 msgid "Connecting"
 msgstr "Jungiamasi"
 
-#: ../js/ui/status/network.js:1433 ../js/ui/status/rfkill.js:88
+#: ../js/ui/status/network.js:1434 ../js/ui/status/rfkill.js:88
 msgid "Network Settings"
 msgstr "Tinklo nustatymai"
 
-#: ../js/ui/status/network.js:1435
+#: ../js/ui/status/network.js:1436
 msgid "VPN Settings"
 msgstr "VPN nustatymai"
 
-#: ../js/ui/status/network.js:1454
+#: ../js/ui/status/network.js:1455
 msgid "VPN"
 msgstr "VPN"
 
-#: ../js/ui/status/network.js:1607
+#: ../js/ui/status/network.js:1598
 msgid "Network Manager"
 msgstr "Tinklo valdymas"
 
-#: ../js/ui/status/network.js:1646
+#: ../js/ui/status/network.js:1637
 msgid "Connection failed"
 msgstr "Nepavyko prisijungti"
 
-#: ../js/ui/status/network.js:1647
+#: ../js/ui/status/network.js:1638
 msgid "Activation of network connection failed"
 msgstr "Tinklo ryšio nepavyko aktyvuoti"
 
@@ -1636,10 +1631,6 @@ msgstr "Baterija"
 msgid "Airplane Mode"
 msgstr "Skrydžio veiksena"
 
-#: ../js/ui/status/rfkill.js:84
-msgid "On"
-msgstr "Įjungta"
-
 #: ../js/ui/status/system.js:314
 msgid "Switch User"
 msgstr "Keisti naudotoją"

po/nb.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell 3.11.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-18 22:49+0100\n"
+"POT-Creation-Date: 2014-03-05 06:45+0100\n"
-"PO-Revision-Date: 2014-03-18 22:52+0100\n"
+"PO-Revision-Date: 2014-03-05 06:47+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: \n"
@@ -101,7 +101,7 @@ msgid ""
 "GNOME Shell will only load extensions that claim to support the current "
 "running version. Enabling this option will disable this check and try to "
 "load all extensions regardless of the versions they claim to support."
-msgstr "GNOME Shell vil kun laste utvidelser som hevder å støtte kjørende versjon. Hvis du slår på dette valget deaktiverer du denne sjekken og alle utvidelser vil lastes uavhengig av hvilke versjoner de hevder å støtte."
+msgstr ""
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:7
 msgid "List of desktop file IDs for favorite applications"
@@ -131,12 +131,12 @@ msgstr "Alltid vis menyoppføringen «Logg ut» i brukermenyen."
 msgid ""
 "This key overrides the automatic hiding of the 'Log out' menu item in single-"
 "user, single-session situations."
-msgstr "Denne nøkkelen overstyrer skjuling av menyoppføringen «Logg ut» i situasjonen én bruker, én sesjon."
+msgstr ""
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:13
 msgid ""
 "Whether to remember password for mounting encrypted or remote filesystems"
-msgstr "Hvorvidt passord for eksterne eller krypterte filsystemer skal huskes."
+msgstr ""
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:14
 msgid ""
@@ -283,7 +283,7 @@ msgstr "Velg en utvidelse som skal konfigureres med komboboksen over."
 #: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:136
 #: ../js/ui/components/polkitAgent.js:166 ../js/ui/endSessionDialog.js:429
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
-#: ../js/ui/status/network.js:878
+#: ../js/ui/status/network.js:873
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -309,17 +309,17 @@ msgstr "Velg økt"
 msgid "Not listed?"
 msgstr "Ikke listet?"
 
-#: ../js/gdm/loginDialog.js:608
+#: ../js/gdm/loginDialog.js:598
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(f.eks. bruker eller %s)"
 
-#: ../js/gdm/loginDialog.js:613 ../js/ui/components/networkAgent.js:262
+#: ../js/gdm/loginDialog.js:603 ../js/ui/components/networkAgent.js:262
 #: ../js/ui/components/networkAgent.js:280
 msgid "Username: "
 msgstr "Brukernavn: "
 
-#: ../js/gdm/loginDialog.js:884
+#: ../js/gdm/loginDialog.js:868
 msgid "Login Window"
 msgstr "Innloggingsvindu"
 
@@ -356,15 +356,15 @@ msgstr "Ofte"
 msgid "All"
 msgstr "Alle"
 
-#: ../js/ui/appDisplay.js:1555
+#: ../js/ui/appDisplay.js:1552
 msgid "New Window"
 msgstr "Nytt vindu"
 
-#: ../js/ui/appDisplay.js:1577 ../js/ui/dash.js:285
+#: ../js/ui/appDisplay.js:1574 ../js/ui/dash.js:285
 msgid "Remove from Favorites"
 msgstr "Fjern fra favoritter"
 
-#: ../js/ui/appDisplay.js:1583
+#: ../js/ui/appDisplay.js:1580
 msgid "Add to Favorites"
 msgstr "Legg til i favoritter"
 
@@ -507,44 +507,44 @@ msgstr "Lø"
 msgid "calendar:MY"
 msgstr "calendar:MY"
 
-#: ../js/ui/calendar.js:450
+#: ../js/ui/calendar.js:446
 msgid "Previous month"
 msgstr "Forrige måned"
 
-#: ../js/ui/calendar.js:460
+#: ../js/ui/calendar.js:456
 msgid "Next month"
 msgstr "Neste måned"
 
 #. Translators: Text to show if there are no events */
-#: ../js/ui/calendar.js:772
+#: ../js/ui/calendar.js:762
 msgid "Nothing Scheduled"
 msgstr "Ingenting planlagt"
 
 #. Translators: Shown on calendar heading when selected day occurs on current year */
-#: ../js/ui/calendar.js:790
+#: ../js/ui/calendar.js:780
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A %B %d"
 
 #. Translators: Shown on calendar heading when selected day occurs on different year */
-#: ../js/ui/calendar.js:793
+#: ../js/ui/calendar.js:783
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A %B %d, %Y"
 
-#: ../js/ui/calendar.js:804
+#: ../js/ui/calendar.js:794
 msgid "Today"
 msgstr "I dag"
 
-#: ../js/ui/calendar.js:808
+#: ../js/ui/calendar.js:798
 msgid "Tomorrow"
 msgstr "I morgen"
 
-#: ../js/ui/calendar.js:819
+#: ../js/ui/calendar.js:809
 msgid "This week"
 msgstr "Denne uken"
 
-#: ../js/ui/calendar.js:827
+#: ../js/ui/calendar.js:817
 msgid "Next week"
 msgstr "Neste uke"
 
@@ -578,7 +578,7 @@ msgid "Type again:"
 msgstr "Skriv på nytt:"
 
 #: ../js/ui/components/networkAgent.js:131 ../js/ui/status/network.js:240
-#: ../js/ui/status/network.js:322 ../js/ui/status/network.js:881
+#: ../js/ui/status/network.js:317 ../js/ui/status/network.js:876
 msgid "Connect"
 msgstr "Koble til"
 
@@ -941,7 +941,7 @@ msgstr "Kan ikke koble til %s"
 msgid "View account"
 msgstr "Vis konto"
 
-#: ../js/ui/components/telepathyClient.js:1439
+#: ../js/ui/components/telepathyClient.js:1434
 msgid "Unknown reason"
 msgstr "Ukjent årsak"
 
@@ -957,22 +957,22 @@ msgstr "Vis programmer"
 msgid "Dash"
 msgstr "Favoritter"
 
-#: ../js/ui/dateMenu.js:91
+#: ../js/ui/dateMenu.js:86
 msgid "Open Calendar"
 msgstr "Åpne kalender"
 
-#: ../js/ui/dateMenu.js:95
+#: ../js/ui/dateMenu.js:90
 msgid "Open Clocks"
 msgstr "Åpne Klokker"
 
-#: ../js/ui/dateMenu.js:102
+#: ../js/ui/dateMenu.js:97
 msgid "Date & Time Settings"
 msgstr "Innstillinger for dato og klokkeslett"
 
 #. 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:192
+#: ../js/ui/dateMenu.js:187
 msgid "%A %B %e, %Y"
 msgstr "%a %e %B, %Y"
 
@@ -1084,9 +1084,7 @@ msgstr "Slå av etter at oppdateringer er installert"
 
 #: ../js/ui/endSessionDialog.js:315
 msgid "Running on battery power: please plug in before installing updates."
-msgstr ""
+msgstr "Kjører på batteristrøm: vennligst koble til strøm før oppdateringer blir installert."
-"Kjører på batteristrøm: vennligst koble til strøm før oppdateringer blir "
-"installert."
 
 #: ../js/ui/endSessionDialog.js:332
 msgid "Some applications are busy or have unsaved work."
@@ -1121,25 +1119,25 @@ msgstr "Last ned og installer «%s» fra extensions.gnome.org?"
 msgid "Keyboard"
 msgstr "Tastatur"
 
-#: ../js/ui/lookingGlass.js:643
+#: ../js/ui/lookingGlass.js:641
 msgid "No extensions installed"
 msgstr "Ingen utvidelser installert"
 
 #. Translators: argument is an extension UUID. */
-#: ../js/ui/lookingGlass.js:697
+#: ../js/ui/lookingGlass.js:695
 #, javascript-format
 msgid "%s has not emitted any errors."
 msgstr "%s har ikke avgitt noen feil."
 
-#: ../js/ui/lookingGlass.js:703
+#: ../js/ui/lookingGlass.js:701
 msgid "Hide Errors"
 msgstr "Skjul feil"
 
-#: ../js/ui/lookingGlass.js:707 ../js/ui/lookingGlass.js:767
+#: ../js/ui/lookingGlass.js:705 ../js/ui/lookingGlass.js:765
 msgid "Show Errors"
 msgstr "Vis feil"
 
-#: ../js/ui/lookingGlass.js:716
+#: ../js/ui/lookingGlass.js:714
 msgid "Enabled"
 msgstr "Aktivert"
 
@@ -1147,28 +1145,28 @@ msgstr "Aktivert"
 #. because it's disabled by rfkill (airplane mode) */
 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:719 ../js/ui/status/network.js:555
+#: ../js/ui/lookingGlass.js:717 ../js/ui/status/network.js:550
 #: ../src/gvc/gvc-mixer-control.c:1830
 msgid "Disabled"
 msgstr "Deaktivert"
 
-#: ../js/ui/lookingGlass.js:721
+#: ../js/ui/lookingGlass.js:719
 msgid "Error"
 msgstr "Feil"
 
-#: ../js/ui/lookingGlass.js:723
+#: ../js/ui/lookingGlass.js:721
 msgid "Out of date"
 msgstr "Utdatert"
 
-#: ../js/ui/lookingGlass.js:725
+#: ../js/ui/lookingGlass.js:723
 msgid "Downloading"
 msgstr "Laster ned"
 
-#: ../js/ui/lookingGlass.js:749
+#: ../js/ui/lookingGlass.js:747
 msgid "View Source"
 msgstr "Vis kildekode"
 
-#: ../js/ui/lookingGlass.js:758
+#: ../js/ui/lookingGlass.js:756
 msgid "Web Page"
 msgstr "Nettside"
 
@@ -1204,7 +1202,7 @@ msgstr "Ingen meldinger"
 msgid "Message Tray"
 msgstr "Meldingstrau"
 
-#: ../js/ui/messageTray.js:2962
+#: ../js/ui/messageTray.js:2948
 msgid "System Information"
 msgstr "Systeminformasjon"
 
@@ -1220,11 +1218,11 @@ msgid_plural "%d new messages"
 msgstr[0] "%d ny melding"
 msgstr[1] "%d nye meldinger"
 
-#: ../js/ui/overview.js:84
+#: ../js/ui/overview.js:83
 msgid "Undo"
 msgstr "Angre"
 
-#: ../js/ui/overview.js:124
+#: ../js/ui/overview.js:123
 msgid "Overview"
 msgstr "Oversikt"
 
@@ -1232,7 +1230,7 @@ msgstr "Oversikt"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters. */
-#: ../js/ui/overview.js:250
+#: ../js/ui/overview.js:257
 msgid "Type to search…"
 msgstr "Skriv for å søke …"
 
@@ -1275,27 +1273,27 @@ msgid_plural "%d new notifications"
 msgstr[0] "%d ny varsling"
 msgstr[1] "%d nye varslinger"
 
-#: ../js/ui/screenShield.js:474 ../js/ui/status/system.js:342
+#: ../js/ui/screenShield.js:473 ../js/ui/status/system.js:342
 msgid "Lock"
 msgstr "Lås"
 
-#: ../js/ui/screenShield.js:708
+#: ../js/ui/screenShield.js:707
 msgid "GNOME needs to lock the screen"
 msgstr "GNOME må låse skjermen"
 
-#: ../js/ui/screenShield.js:835 ../js/ui/screenShield.js:1309
+#: ../js/ui/screenShield.js:834 ../js/ui/screenShield.js:1301
 msgid "Unable to lock"
 msgstr "Kan ikke låse"
 
-#: ../js/ui/screenShield.js:836 ../js/ui/screenShield.js:1310
+#: ../js/ui/screenShield.js:835 ../js/ui/screenShield.js:1302
 msgid "Lock was blocked by an application"
 msgstr "Låsing ble stoppet av et program"
 
-#: ../js/ui/search.js:603
+#: ../js/ui/search.js:589
 msgid "Searching…"
 msgstr "Søker …"
 
-#: ../js/ui/search.js:646
+#: ../js/ui/search.js:632
 msgid "No results."
 msgstr "Ingen resultater."
 
@@ -1367,30 +1365,30 @@ msgstr "Høy kontrast"
 msgid "Large Text"
 msgstr "Stor tekst"
 
-#: ../js/ui/status/bluetooth.js:49
+#: ../js/ui/status/bluetooth.js:48
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../js/ui/status/bluetooth.js:51 ../js/ui/status/location.js:60
+#: ../js/ui/status/bluetooth.js:50 ../js/ui/status/location.js:59
-#: ../js/ui/status/location.js:167 ../js/ui/status/network.js:151
+#: ../js/ui/status/location.js:159 ../js/ui/status/network.js:151
-#: ../js/ui/status/network.js:323 ../js/ui/status/network.js:1234
+#: ../js/ui/status/network.js:318 ../js/ui/status/network.js:1225
-#: ../js/ui/status/network.js:1345 ../js/ui/status/rfkill.js:85
+#: ../js/ui/status/network.js:1336 ../js/ui/status/rfkill.js:85
 #: ../js/ui/status/rfkill.js:105
 msgid "Turn Off"
 msgstr "Slå av"
 
-#: ../js/ui/status/bluetooth.js:54
+#: ../js/ui/status/bluetooth.js:53
 msgid "Bluetooth Settings"
 msgstr "Innstillinger for Bluetooth"
 
-#: ../js/ui/status/bluetooth.js:104
+#: ../js/ui/status/bluetooth.js:100
 #, javascript-format
 msgid "%d Connected Device"
 msgid_plural "%d Connected Devices"
 msgstr[0] "%d tilkoblet enhet"
 msgstr[1] "%d tilkoblede enheter"
 
-#: ../js/ui/status/bluetooth.js:106 ../js/ui/status/network.js:1262
+#: ../js/ui/status/bluetooth.js:102 ../js/ui/status/network.js:1253
 msgid "Not Connected"
 msgstr "Ikke koblet til"
 
@@ -1402,21 +1400,21 @@ msgstr "Lysstyrke"
 msgid "Show Keyboard Layout"
 msgstr "Vis tastaturutforming"
 
-#: ../js/ui/status/location.js:53
+#: ../js/ui/status/location.js:52
 msgid "Location"
 msgstr "Lokasjon"
 
-#: ../js/ui/status/location.js:59 ../js/ui/status/location.js:166
+#: ../js/ui/status/location.js:58 ../js/ui/status/location.js:158
 #: ../js/ui/status/rfkill.js:84
 msgid "On"
 msgstr "På"
 
-#: ../js/ui/status/location.js:163 ../js/ui/status/network.js:420
+#: ../js/ui/status/location.js:155 ../js/ui/status/network.js:415
-#: ../js/ui/status/network.js:1260 ../js/ui/status/network.js:1464
+#: ../js/ui/status/network.js:1251 ../js/ui/status/network.js:1455
 msgid "Off"
 msgstr "Av"
 
-#: ../js/ui/status/location.js:164 ../js/ui/status/network.js:1234
+#: ../js/ui/status/location.js:156 ../js/ui/status/network.js:1225
 msgid "Turn On"
 msgstr "Slå på"
 
@@ -1424,138 +1422,138 @@ msgstr "Slå på"
 msgid "<unknown>"
 msgstr "<ukjent>"
 
-#: ../js/ui/status/network.js:422
+#: ../js/ui/status/network.js:417
 msgid "Connected"
 msgstr "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:426
+#: ../js/ui/status/network.js:421
 msgid "unmanaged"
 msgstr "ikke håndtert"
 
-#: ../js/ui/status/network.js:428
+#: ../js/ui/status/network.js:423
 msgid "disconnecting..."
 msgstr "kobler fra …"
 
-#: ../js/ui/status/network.js:434 ../js/ui/status/network.js:1362
+#: ../js/ui/status/network.js:429 ../js/ui/status/network.js:1353
 msgid "connecting..."
 msgstr "kobler til …"
 
 #. Translators: this is for network connections that require some kind of key or password */
-#: ../js/ui/status/network.js:437 ../js/ui/status/network.js:1365
+#: ../js/ui/status/network.js:432 ../js/ui/status/network.js:1356
 msgid "authentication required"
 msgstr "autentisering kreves"
 
 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing */
-#: ../js/ui/status/network.js:445
+#: ../js/ui/status/network.js:440
 msgid "firmware missing"
 msgstr "fastvare mangler"
 
 #. 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:449
+#: ../js/ui/status/network.js:444
 msgid "unavailable"
 msgstr "ikke tilgjengelig"
 
-#: ../js/ui/status/network.js:451 ../js/ui/status/network.js:1367
+#: ../js/ui/status/network.js:446 ../js/ui/status/network.js:1358
 msgid "connection failed"
 msgstr "tilkobling feilet"
 
-#: ../js/ui/status/network.js:467
+#: ../js/ui/status/network.js:462
 msgid "Wired Settings"
 msgstr "Innstillinger for trådbundet nettverk"
 
-#: ../js/ui/status/network.js:509 ../js/ui/status/network.js:587
+#: ../js/ui/status/network.js:504 ../js/ui/status/network.js:582
 msgid "Mobile Broadband Settings"
 msgstr "Innstillinger for mobilt bredbånd"
 
-#: ../js/ui/status/network.js:551 ../js/ui/status/network.js:1258
+#: ../js/ui/status/network.js:546 ../js/ui/status/network.js:1249
 msgid "Hardware Disabled"
 msgstr "Maskinvare slått av"
 
-#: ../js/ui/status/network.js:595
+#: ../js/ui/status/network.js:590
 msgid "Use as Internet connection"
 msgstr "Bruk som internettforbindelse"
 
-#: ../js/ui/status/network.js:776
+#: ../js/ui/status/network.js:771
 msgid "Airplane Mode is On"
 msgstr "Flymodus er slått på"
 
-#: ../js/ui/status/network.js:777
+#: ../js/ui/status/network.js:772
 msgid "Wi-Fi is disabled when airplane mode is on."
 msgstr "Trådløst blir slått av når flymodus slås på."
 
-#: ../js/ui/status/network.js:778
+#: ../js/ui/status/network.js:773
 msgid "Turn Off Airplane Mode"
 msgstr "Slå av flymodus"
 
-#: ../js/ui/status/network.js:787
+#: ../js/ui/status/network.js:782
 msgid "Wi-Fi is Off"
 msgstr "Trådløs er av"
 
-#: ../js/ui/status/network.js:788
+#: ../js/ui/status/network.js:783
 msgid "Wi-Fi needs to be turned on in order to connect to a network."
 msgstr "Trådløs må slås på for å koble til et nettverk."
 
-#: ../js/ui/status/network.js:789
+#: ../js/ui/status/network.js:784
 msgid "Turn On Wi-Fi"
 msgstr "Slå på trådløs"
 
-#: ../js/ui/status/network.js:814
+#: ../js/ui/status/network.js:809
 msgid "Wi-Fi Networks"
 msgstr "Wi-Fi nettverk"
 
-#: ../js/ui/status/network.js:816
+#: ../js/ui/status/network.js:811
 msgid "Select a network"
 msgstr "Velg et nettverk"
 
-#: ../js/ui/status/network.js:845
+#: ../js/ui/status/network.js:840
 msgid "No Networks"
 msgstr "Ingen nettverk"
 
-#: ../js/ui/status/network.js:866 ../js/ui/status/rfkill.js:103
+#: ../js/ui/status/network.js:861 ../js/ui/status/rfkill.js:103
 msgid "Use hardware switch to turn off"
 msgstr "Bruk maskinvarebryter til å slå av"
 
-#: ../js/ui/status/network.js:1136
+#: ../js/ui/status/network.js:1131
 msgid "Select Network"
 msgstr "Velg nettverk"
 
-#: ../js/ui/status/network.js:1142
+#: ../js/ui/status/network.js:1137
 msgid "Wi-Fi Settings"
 msgstr "Innstillinger"
 
-#: ../js/ui/status/network.js:1251
+#: ../js/ui/status/network.js:1242
 msgid "Hotspot Active"
 msgstr "Trådløst aksesspunkt aktivt"
 
-#: ../js/ui/status/network.js:1254
+#: ../js/ui/status/network.js:1245
 msgid "Connecting"
 msgstr "Kobler til"
 
-#: ../js/ui/status/network.js:1433 ../js/ui/status/rfkill.js:88
+#: ../js/ui/status/network.js:1424 ../js/ui/status/rfkill.js:88
 msgid "Network Settings"
 msgstr "Innstillinger for nettverk"
 
-#: ../js/ui/status/network.js:1435
+#: ../js/ui/status/network.js:1426
 msgid "VPN Settings"
 msgstr "Innstillinger for VPN"
 
-#: ../js/ui/status/network.js:1454
+#: ../js/ui/status/network.js:1445
 msgid "VPN"
 msgstr "VPN"
 
-#: ../js/ui/status/network.js:1607
+#: ../js/ui/status/network.js:1598
 msgid "Network Manager"
 msgstr "Nettverkshåndtering"
 
-#: ../js/ui/status/network.js:1646
+#: ../js/ui/status/network.js:1637
 msgid "Connection failed"
 msgstr "Tilkobling feilet"
 
-#: ../js/ui/status/network.js:1647
+#: ../js/ui/status/network.js:1638
 msgid "Activation of network connection failed"
 msgstr "Aktivering av nettverkstilkobling feilet"
 

po/pl.po

@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-27 19:22+0100\n"
+"POT-Creation-Date: 2014-03-04 18:14+0100\n"
-"PO-Revision-Date: 2014-03-27 19:23+0100\n"
+"PO-Revision-Date: 2014-03-04 18:15+0100\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <gnomepl@aviary.pl>\n"
 "Language: pl\n"
@@ -325,7 +325,7 @@ msgstr ""
 #: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:136
 #: ../js/ui/components/polkitAgent.js:166 ../js/ui/endSessionDialog.js:429
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
-#: ../js/ui/status/network.js:878
+#: ../js/ui/status/network.js:873
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -343,25 +343,25 @@ msgctxt "button"
 msgid "Sign In"
 msgstr "Zaloguj"
 
-#: ../js/gdm/loginDialog.js:271
+#: ../js/gdm/loginDialog.js:270
 msgid "Choose Session"
 msgstr "Wybór sesji"
 
-#: ../js/gdm/loginDialog.js:431
+#: ../js/gdm/loginDialog.js:430
 msgid "Not listed?"
 msgstr "Inny użytkownik?"
 
-#: ../js/gdm/loginDialog.js:611
+#: ../js/gdm/loginDialog.js:598
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(np. użytkownik lub %s)"
 
-#: ../js/gdm/loginDialog.js:616 ../js/ui/components/networkAgent.js:262
+#: ../js/gdm/loginDialog.js:603 ../js/ui/components/networkAgent.js:262
 #: ../js/ui/components/networkAgent.js:280
 msgid "Username: "
 msgstr "Nazwa użytkownika: "
 
-#: ../js/gdm/loginDialog.js:917
+#: ../js/gdm/loginDialog.js:868
 msgid "Login Window"
 msgstr "Okno logowania"
 
@@ -386,27 +386,27 @@ msgstr "Nie można przetworzyć polecenia:"
 msgid "Execution of “%s” failed:"
 msgstr "Wykonanie polecenia \"%s\" się nie powiodło:"
 
-#: ../js/ui/appDisplay.js:636
+#: ../js/ui/appDisplay.js:629
 msgid "Frequently used applications will appear here"
 msgstr "W tym miejscu pojawią się często używane programy"
 
-#: ../js/ui/appDisplay.js:747
+#: ../js/ui/appDisplay.js:740
 msgid "Frequent"
 msgstr "Często używane"
 
-#: ../js/ui/appDisplay.js:754
+#: ../js/ui/appDisplay.js:747
 msgid "All"
 msgstr "Wszystkie"
 
-#: ../js/ui/appDisplay.js:1566
+#: ../js/ui/appDisplay.js:1552
 msgid "New Window"
 msgstr "Nowe okno"
 
-#: ../js/ui/appDisplay.js:1588 ../js/ui/dash.js:285
+#: ../js/ui/appDisplay.js:1574 ../js/ui/dash.js:285
 msgid "Remove from Favorites"
 msgstr "Usuń z ulubionych"
 
-#: ../js/ui/appDisplay.js:1594
+#: ../js/ui/appDisplay.js:1580
 msgid "Add to Favorites"
 msgstr "Dodaj do ulubionych"
 
@@ -549,44 +549,44 @@ msgstr "S"
 msgid "calendar:MY"
 msgstr "calendar:MY"
 
-#: ../js/ui/calendar.js:450
+#: ../js/ui/calendar.js:446
 msgid "Previous month"
 msgstr "Poprzedni miesiąc"
 
-#: ../js/ui/calendar.js:460
+#: ../js/ui/calendar.js:456
 msgid "Next month"
 msgstr "Następny miesiąc"
 
 #. Translators: Text to show if there are no events */
-#: ../js/ui/calendar.js:772
+#: ../js/ui/calendar.js:762
 msgid "Nothing Scheduled"
 msgstr "Nic nie zaplanowano"
 
 #. Translators: Shown on calendar heading when selected day occurs on current year */
-#: ../js/ui/calendar.js:790
+#: ../js/ui/calendar.js:780
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %e %B"
 
 #. Translators: Shown on calendar heading when selected day occurs on different year */
-#: ../js/ui/calendar.js:793
+#: ../js/ui/calendar.js:783
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %e %B %Y"
 
-#: ../js/ui/calendar.js:804
+#: ../js/ui/calendar.js:794
 msgid "Today"
 msgstr "Dzisiaj"
 
-#: ../js/ui/calendar.js:808
+#: ../js/ui/calendar.js:798
 msgid "Tomorrow"
 msgstr "Jutro"
 
-#: ../js/ui/calendar.js:819
+#: ../js/ui/calendar.js:809
 msgid "This week"
 msgstr "Ten tydzień"
 
-#: ../js/ui/calendar.js:827
+#: ../js/ui/calendar.js:817
 msgid "Next week"
 msgstr "Następny tydzień"
 
@@ -620,7 +620,7 @@ msgid "Type again:"
 msgstr "Proszę wpisać ponownie:"
 
 #: ../js/ui/components/networkAgent.js:131 ../js/ui/status/network.js:240
-#: ../js/ui/status/network.js:322 ../js/ui/status/network.js:881
+#: ../js/ui/status/network.js:317 ../js/ui/status/network.js:876
 msgid "Connect"
 msgstr "Połącz"
 
@@ -984,7 +984,7 @@ msgstr "Nie można połączyć się z kontem %s"
 msgid "View account"
 msgstr "Wyświetl konto"
 
-#: ../js/ui/components/telepathyClient.js:1439
+#: ../js/ui/components/telepathyClient.js:1434
 msgid "Unknown reason"
 msgstr "Nieznana przyczyna"
 
@@ -1000,22 +1000,22 @@ msgstr "Wyświetl programy"
 msgid "Dash"
 msgstr "Ulubione"
 
-#: ../js/ui/dateMenu.js:91
+#: ../js/ui/dateMenu.js:86
 msgid "Open Calendar"
 msgstr "Otwórz kalendarz"
 
-#: ../js/ui/dateMenu.js:95
+#: ../js/ui/dateMenu.js:90
 msgid "Open Clocks"
 msgstr "Otwórz zegar"
 
-#: ../js/ui/dateMenu.js:102
+#: ../js/ui/dateMenu.js:97
 msgid "Date & Time Settings"
 msgstr "Ustawienia daty i czasu"
 
 #. 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:192
+#: ../js/ui/dateMenu.js:187
 msgid "%A %B %e, %Y"
 msgstr "%A, %e %B %Y"
 
@@ -1169,26 +1169,25 @@ msgstr ""
 msgid "Keyboard"
 msgstr "Klawiatura"
 
-#: ../js/ui/lookingGlass.js:643
+#: ../js/ui/lookingGlass.js:641
 msgid "No extensions installed"
 msgstr "Nie zainstalowano rozszerzeń"
 
 #. Translators: argument is an extension UUID. */
-#: ../js/ui/lookingGlass.js:697
+#: ../js/ui/lookingGlass.js:695
 #, javascript-format
 msgid "%s has not emitted any errors."
 msgstr "Rozszerzenie %s nie wysłało żadnych błędów."
 
-#: ../js/ui/lookingGlass.js:703
+#: ../js/ui/lookingGlass.js:701
 msgid "Hide Errors"
 msgstr "Ukryj błędy"
 
-#: ../js/ui/lookingGlass.js:707 ../js/ui/lookingGlass.js:767
+#: ../js/ui/lookingGlass.js:705 ../js/ui/lookingGlass.js:765
 msgid "Show Errors"
 msgstr "Wyświetl błędy"
 
-#: ../js/ui/lookingGlass.js:716 ../js/ui/status/location.js:59
+#: ../js/ui/lookingGlass.js:714
-#: ../js/ui/status/location.js:167
 msgid "Enabled"
 msgstr "Włączone"
 
@@ -1196,28 +1195,28 @@ msgstr "Włączone"
 #. because it's disabled by rfkill (airplane mode) */
 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:719 ../js/ui/status/location.js:164
+#: ../js/ui/lookingGlass.js:717 ../js/ui/status/network.js:550
-#: ../js/ui/status/network.js:555 ../src/gvc/gvc-mixer-control.c:1830
+#: ../src/gvc/gvc-mixer-control.c:1830
 msgid "Disabled"
 msgstr "Wyłączone"
 
-#: ../js/ui/lookingGlass.js:721
+#: ../js/ui/lookingGlass.js:719
 msgid "Error"
 msgstr "Błąd"
 
-#: ../js/ui/lookingGlass.js:723
+#: ../js/ui/lookingGlass.js:721
 msgid "Out of date"
 msgstr "Nieaktualne"
 
-#: ../js/ui/lookingGlass.js:725
+#: ../js/ui/lookingGlass.js:723
 msgid "Downloading"
 msgstr "Pobieranie"
 
-#: ../js/ui/lookingGlass.js:749
+#: ../js/ui/lookingGlass.js:747
 msgid "View Source"
 msgstr "Wyświetl źródło"
 
-#: ../js/ui/lookingGlass.js:758
+#: ../js/ui/lookingGlass.js:756
 msgid "Web Page"
 msgstr "Strona WWW"
 
@@ -1253,7 +1252,7 @@ msgstr "Brak wiadomości"
 msgid "Message Tray"
 msgstr "Obszar powiadamiania"
 
-#: ../js/ui/messageTray.js:2962
+#: ../js/ui/messageTray.js:2948
 msgid "System Information"
 msgstr "Informacje systemowe"
 
@@ -1270,11 +1269,11 @@ msgstr[0] "%d nowa wiadomość"
 msgstr[1] "%d nowe wiadomości"
 msgstr[2] "%d nowych wiadomości"
 
-#: ../js/ui/overview.js:84
+#: ../js/ui/overview.js:83
 msgid "Undo"
 msgstr "Cofnij"
 
-#: ../js/ui/overview.js:124
+#: ../js/ui/overview.js:123
 msgid "Overview"
 msgstr "Podgląd"
 
@@ -1282,7 +1281,7 @@ msgstr "Podgląd"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters. */
-#: ../js/ui/overview.js:250
+#: ../js/ui/overview.js:257
 msgid "Type to search…"
 msgstr "Wyszukiwanie…"
 
@@ -1326,27 +1325,27 @@ msgstr[0] "%d nowe powiadomienie"
 msgstr[1] "%d nowe powiadomienia"
 msgstr[2] "%d nowych powiadomień"
 
-#: ../js/ui/screenShield.js:474 ../js/ui/status/system.js:342
+#: ../js/ui/screenShield.js:473 ../js/ui/status/system.js:342
 msgid "Lock"
 msgstr "Zablokuj ekran"
 
-#: ../js/ui/screenShield.js:708
+#: ../js/ui/screenShield.js:707
 msgid "GNOME needs to lock the screen"
 msgstr "Środowisko GNOME musi zablokować ekran"
 
-#: ../js/ui/screenShield.js:835 ../js/ui/screenShield.js:1309
+#: ../js/ui/screenShield.js:834 ../js/ui/screenShield.js:1301
 msgid "Unable to lock"
 msgstr "Nie można zablokować"
 
-#: ../js/ui/screenShield.js:836 ../js/ui/screenShield.js:1310
+#: ../js/ui/screenShield.js:835 ../js/ui/screenShield.js:1302
 msgid "Lock was blocked by an application"
 msgstr "Blokowanie zostało zablokowane przez program"
 
-#: ../js/ui/search.js:603
+#: ../js/ui/search.js:589
 msgid "Searching…"
 msgstr "Wyszukiwanie…"
 
-#: ../js/ui/search.js:649
+#: ../js/ui/search.js:632
 msgid "No results."
 msgstr "Brak wyników."
 
@@ -1418,22 +1417,23 @@ msgstr "Wysoki kontrast"
 msgid "Large Text"
 msgstr "Duży tekst"
 
-#: ../js/ui/status/bluetooth.js:49
+#: ../js/ui/status/bluetooth.js:48
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../js/ui/status/bluetooth.js:51 ../js/ui/status/network.js:151
+#: ../js/ui/status/bluetooth.js:50 ../js/ui/status/location.js:59
-#: ../js/ui/status/network.js:323 ../js/ui/status/network.js:1234
+#: ../js/ui/status/location.js:159 ../js/ui/status/network.js:151
-#: ../js/ui/status/network.js:1345 ../js/ui/status/rfkill.js:85
+#: ../js/ui/status/network.js:318 ../js/ui/status/network.js:1225
+#: ../js/ui/status/network.js:1336 ../js/ui/status/rfkill.js:85
 #: ../js/ui/status/rfkill.js:105
 msgid "Turn Off"
 msgstr "Wyłącz"
 
-#: ../js/ui/status/bluetooth.js:54
+#: ../js/ui/status/bluetooth.js:53
 msgid "Bluetooth Settings"
 msgstr "Ustawienia Bluetooth"
 
-#: ../js/ui/status/bluetooth.js:104
+#: ../js/ui/status/bluetooth.js:100
 #, javascript-format
 msgid "%d Connected Device"
 msgid_plural "%d Connected Devices"
@@ -1441,7 +1441,7 @@ msgstr[0] "%d połączone urządzenie"
 msgstr[1] "%d połączone urządzenia"
 msgstr[2] "%d połączonych urządzeń"
 
-#: ../js/ui/status/bluetooth.js:106 ../js/ui/status/network.js:1262
+#: ../js/ui/status/bluetooth.js:102 ../js/ui/status/network.js:1253
 msgid "Not Connected"
 msgstr "Nie połączono"
 
@@ -1453,167 +1453,160 @@ msgstr "Jasność"
 msgid "Show Keyboard Layout"
 msgstr "Wyświetl układ klawiatury"
 
-#: ../js/ui/status/location.js:53
+#: ../js/ui/status/location.js:52
 msgid "Location"
 msgstr "Położenie"
 
-#: ../js/ui/status/location.js:60 ../js/ui/status/location.js:168
+#: ../js/ui/status/location.js:58 ../js/ui/status/location.js:158
-msgid "Disable"
+#: ../js/ui/status/rfkill.js:84
-msgstr "Wyłącz"
+msgid "On"
+msgstr "Włączone"
 
-#: ../js/ui/status/location.js:165
+#: ../js/ui/status/location.js:155 ../js/ui/status/network.js:415
-msgid "Enable"
+#: ../js/ui/status/network.js:1251 ../js/ui/status/network.js:1455
+msgid "Off"
+msgstr "Wyłączone"
+
+#: ../js/ui/status/location.js:156 ../js/ui/status/network.js:1225
+msgid "Turn On"
 msgstr "Włącz"
 
-#: ../js/ui/status/location.js:167
-msgid "In Use"
-msgstr "Używane"
-
 #: ../js/ui/status/network.js:74
 msgid "<unknown>"
 msgstr "<nieznane>"
 
-#: ../js/ui/status/network.js:420 ../js/ui/status/network.js:1260
+#: ../js/ui/status/network.js:417
-#: ../js/ui/status/network.js:1464
-msgid "Off"
-msgstr "Wyłączone"
-
-#: ../js/ui/status/network.js:422
 msgid "Connected"
 msgstr "Połączono"
 
 #. 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:426
+#: ../js/ui/status/network.js:421
 msgid "unmanaged"
 msgstr "niezarządzane"
 
-#: ../js/ui/status/network.js:428
+#: ../js/ui/status/network.js:423
 msgid "disconnecting..."
 msgstr "rozłączanie…"
 
-#: ../js/ui/status/network.js:434 ../js/ui/status/network.js:1362
+#: ../js/ui/status/network.js:429 ../js/ui/status/network.js:1353
 msgid "connecting..."
 msgstr "łączenie…"
 
 #. Translators: this is for network connections that require some kind of key or password */
-#: ../js/ui/status/network.js:437 ../js/ui/status/network.js:1365
+#: ../js/ui/status/network.js:432 ../js/ui/status/network.js:1356
 msgid "authentication required"
 msgstr "wymagane jest uwierzytelnienie"
 
 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing */
-#: ../js/ui/status/network.js:445
+#: ../js/ui/status/network.js:440
 msgid "firmware missing"
 msgstr "brak oprogramowania sprzętowego"
 
 #. 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:449
+#: ../js/ui/status/network.js:444
 msgid "unavailable"
 msgstr "niedostępne"
 
-#: ../js/ui/status/network.js:451 ../js/ui/status/network.js:1367
+#: ../js/ui/status/network.js:446 ../js/ui/status/network.js:1358
 msgid "connection failed"
 msgstr "połączenie się nie powiodło"
 
-#: ../js/ui/status/network.js:467
+#: ../js/ui/status/network.js:462
 msgid "Wired Settings"
 msgstr "Ustawienia sieci przewodowej"
 
-#: ../js/ui/status/network.js:509 ../js/ui/status/network.js:587
+#: ../js/ui/status/network.js:504 ../js/ui/status/network.js:582
 msgid "Mobile Broadband Settings"
 msgstr "Ustawienia sieci komórkowej"
 
-#: ../js/ui/status/network.js:551 ../js/ui/status/network.js:1258
+#: ../js/ui/status/network.js:546 ../js/ui/status/network.js:1249
 msgid "Hardware Disabled"
 msgstr "Sprzęt jest wyłączony"
 
-#: ../js/ui/status/network.js:595
+#: ../js/ui/status/network.js:590
 msgid "Use as Internet connection"
 msgstr "Użyj jako połączenie internetowe"
 
-#: ../js/ui/status/network.js:776
+#: ../js/ui/status/network.js:771
 msgid "Airplane Mode is On"
 msgstr "Tryb samolotowy jest włączony"
 
-#: ../js/ui/status/network.js:777
+#: ../js/ui/status/network.js:772
 msgid "Wi-Fi is disabled when airplane mode is on."
 msgstr "Sieć Wi-Fi jest wyłączona, kiedy tryb samolotowy jest włączony."
 
-#: ../js/ui/status/network.js:778
+#: ../js/ui/status/network.js:773
 msgid "Turn Off Airplane Mode"
 msgstr "Wyłącz tryb samolotowy"
 
-#: ../js/ui/status/network.js:787
+#: ../js/ui/status/network.js:782
 msgid "Wi-Fi is Off"
 msgstr "Sieć Wi-Fi jest wyłączona"
 
-#: ../js/ui/status/network.js:788
+#: ../js/ui/status/network.js:783
 msgid "Wi-Fi needs to be turned on in order to connect to a network."
 msgstr "Wi-Fi musi być włączone, aby połączyć z siecią."
 
-#: ../js/ui/status/network.js:789
+#: ../js/ui/status/network.js:784
 msgid "Turn On Wi-Fi"
 msgstr "Włącz sieć Wi-Fi"
 
-#: ../js/ui/status/network.js:814
+#: ../js/ui/status/network.js:809
 msgid "Wi-Fi Networks"
 msgstr "Sieci Wi-Fi"
 
-#: ../js/ui/status/network.js:816
+#: ../js/ui/status/network.js:811
 msgid "Select a network"
 msgstr "Wybór sieci"
 
-#: ../js/ui/status/network.js:845
+#: ../js/ui/status/network.js:840
 msgid "No Networks"
 msgstr "Brak sieci"
 
-#: ../js/ui/status/network.js:866 ../js/ui/status/rfkill.js:103
+#: ../js/ui/status/network.js:861 ../js/ui/status/rfkill.js:103
 msgid "Use hardware switch to turn off"
 msgstr "Należy użyć przełącznika sprzętowego, aby wyłączyć"
 
-#: ../js/ui/status/network.js:1136
+#: ../js/ui/status/network.js:1131
 msgid "Select Network"
 msgstr "Wybierz sieć"
 
-#: ../js/ui/status/network.js:1142
+#: ../js/ui/status/network.js:1137
 msgid "Wi-Fi Settings"
 msgstr "Ustawienia sieci Wi-Fi"
 
-#: ../js/ui/status/network.js:1234
+#: ../js/ui/status/network.js:1242
-msgid "Turn On"
-msgstr "Włącz"
-
-#: ../js/ui/status/network.js:1251
 msgid "Hotspot Active"
 msgstr "Hotspot jest aktywny"
 
-#: ../js/ui/status/network.js:1254
+#: ../js/ui/status/network.js:1245
 msgid "Connecting"
 msgstr "Łączenie"
 
-#: ../js/ui/status/network.js:1433 ../js/ui/status/rfkill.js:88
+#: ../js/ui/status/network.js:1424 ../js/ui/status/rfkill.js:88
 msgid "Network Settings"
 msgstr "Ustawienia sieci"
 
-#: ../js/ui/status/network.js:1435
+#: ../js/ui/status/network.js:1426
 msgid "VPN Settings"
 msgstr "Ustawienia sieci VPN"
 
-#: ../js/ui/status/network.js:1454
+#: ../js/ui/status/network.js:1445
 msgid "VPN"
 msgstr "VPN"
 
-#: ../js/ui/status/network.js:1607
+#: ../js/ui/status/network.js:1598
 msgid "Network Manager"
 msgstr "Menedżer sieci"
 
-#: ../js/ui/status/network.js:1646
+#: ../js/ui/status/network.js:1637
 msgid "Connection failed"
 msgstr "Połączenie się nie powiodło"
 
-#: ../js/ui/status/network.js:1647
+#: ../js/ui/status/network.js:1638
 msgid "Activation of network connection failed"
 msgstr "Aktywacja połączenia sieciowego się nie powiodła"
 
@@ -1651,10 +1644,6 @@ msgstr "Akumulator"
 msgid "Airplane Mode"
 msgstr "Tryb samolotowy"
 
-#: ../js/ui/status/rfkill.js:84
-msgid "On"
-msgstr "Włączone"
-
 #: ../js/ui/status/system.js:314
 msgid "Switch User"
 msgstr "Przełącz użytkownika"

po/pt_BR.po

@@ -20,9 +20,9 @@ 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: 2014-03-27 18:23+0000\n"
+"POT-Creation-Date: 2014-03-05 20:31+0000\n"
-"PO-Revision-Date: 2014-03-27 15:29-0300\n"
+"PO-Revision-Date: 2014-03-05 19:02-0300\n"
-"Last-Translator: Antonio Fernandes C. Neto <fernandesn@gnome.org>\n"
+"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
@@ -242,6 +242,14 @@ msgid "The maximum accuracy level of location."
 msgstr "O nível máximo de precisão de local."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:30
+#| msgid ""
+#| "Configures the maximum level of location accuracy applications are "
+#| "allowed to see. Valid options are 'off' (disable location tracking), "
+#| "'country', 'city', 'neighborhood', 'street', and 'exact' (typically "
+#| "requires GPS receiver). Please keep in mind that this only controls what "
+#| "Geoclue will allow applications to see and they can find user's location "
+#| "on their own using network resources (albeit with street-level accuracy "
+#| "at best)."
 msgid ""
 "Configures the maximum level of location accuracy applications are allowed "
 "to see. Valid options are 'off' (disable location tracking), 'country', "
@@ -330,7 +338,7 @@ msgstr ""
 #: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:136
 #: ../js/ui/components/polkitAgent.js:166 ../js/ui/endSessionDialog.js:429
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
-#: ../js/ui/status/network.js:878
+#: ../js/ui/status/network.js:873
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -348,25 +356,25 @@ msgctxt "button"
 msgid "Sign In"
 msgstr "Entrar"
 
-#: ../js/gdm/loginDialog.js:271
+#: ../js/gdm/loginDialog.js:270
 msgid "Choose Session"
 msgstr "Escolher sessão"
 
-#: ../js/gdm/loginDialog.js:431
+#: ../js/gdm/loginDialog.js:430
 msgid "Not listed?"
 msgstr "Não está listado?"
 
-#: ../js/gdm/loginDialog.js:611
+#: ../js/gdm/loginDialog.js:598
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(ex.: usuário ou %s)"
 
-#: ../js/gdm/loginDialog.js:616 ../js/ui/components/networkAgent.js:262
+#: ../js/gdm/loginDialog.js:603 ../js/ui/components/networkAgent.js:262
 #: ../js/ui/components/networkAgent.js:280
 msgid "Username: "
 msgstr "Nome de usuário: "
 
-#: ../js/gdm/loginDialog.js:917
+#: ../js/gdm/loginDialog.js:868
 msgid "Login Window"
 msgstr "Janela de sessão"
 
@@ -391,27 +399,27 @@ msgstr "Não foi possível analisar comando:"
 msgid "Execution of “%s” failed:"
 msgstr "A execução de \"%s\" falhou:"
 
-#: ../js/ui/appDisplay.js:636
+#: ../js/ui/appDisplay.js:629
 msgid "Frequently used applications will appear here"
 msgstr "Aplicativos usados frequentemente vão aparecer aqui"
 
-#: ../js/ui/appDisplay.js:747
+#: ../js/ui/appDisplay.js:740
 msgid "Frequent"
 msgstr "Frequente"
 
-#: ../js/ui/appDisplay.js:754
+#: ../js/ui/appDisplay.js:747
 msgid "All"
 msgstr "Todos"
 
-#: ../js/ui/appDisplay.js:1566
+#: ../js/ui/appDisplay.js:1552
 msgid "New Window"
 msgstr "Nova janela"
 
-#: ../js/ui/appDisplay.js:1588 ../js/ui/dash.js:285
+#: ../js/ui/appDisplay.js:1574 ../js/ui/dash.js:285
 msgid "Remove from Favorites"
 msgstr "Remover dos favoritos"
 
-#: ../js/ui/appDisplay.js:1594
+#: ../js/ui/appDisplay.js:1580
 msgid "Add to Favorites"
 msgstr "Adicionar aos favoritos"
 
@@ -554,44 +562,44 @@ msgstr "Sab"
 msgid "calendar:MY"
 msgstr "calendar:MY"
 
-#: ../js/ui/calendar.js:450
+#: ../js/ui/calendar.js:446
 msgid "Previous month"
 msgstr "Mês anterior"
 
-#: ../js/ui/calendar.js:460
+#: ../js/ui/calendar.js:456
 msgid "Next month"
 msgstr "Próximo mês"
 
 #. Translators: Text to show if there are no events */
-#: ../js/ui/calendar.js:772
+#: ../js/ui/calendar.js:763
 msgid "Nothing Scheduled"
 msgstr "Nada agendado"
 
 #. Translators: Shown on calendar heading when selected day occurs on current year */
-#: ../js/ui/calendar.js:790
+#: ../js/ui/calendar.js:781
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %d de %B"
 
 #. Translators: Shown on calendar heading when selected day occurs on different year */
-#: ../js/ui/calendar.js:793
+#: ../js/ui/calendar.js:784
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: ../js/ui/calendar.js:804
+#: ../js/ui/calendar.js:795
 msgid "Today"
 msgstr "Hoje"
 
-#: ../js/ui/calendar.js:808
+#: ../js/ui/calendar.js:799
 msgid "Tomorrow"
 msgstr "Amanhã"
 
-#: ../js/ui/calendar.js:819
+#: ../js/ui/calendar.js:810
 msgid "This week"
 msgstr "Esta semana"
 
-#: ../js/ui/calendar.js:827
+#: ../js/ui/calendar.js:818
 msgid "Next week"
 msgstr "Próxima semana"
 
@@ -625,7 +633,7 @@ msgid "Type again:"
 msgstr "Digite novamente:"
 
 #: ../js/ui/components/networkAgent.js:131 ../js/ui/status/network.js:240
-#: ../js/ui/status/network.js:322 ../js/ui/status/network.js:881
+#: ../js/ui/status/network.js:317 ../js/ui/status/network.js:876
 msgid "Connect"
 msgstr "Conectar"
 
@@ -988,7 +996,7 @@ msgstr "Não foi possível conectar-se a %s"
 msgid "View account"
 msgstr "Visualizar conta"
 
-#: ../js/ui/components/telepathyClient.js:1439
+#: ../js/ui/components/telepathyClient.js:1434
 msgid "Unknown reason"
 msgstr "Razão desconhecida"
 
@@ -1169,26 +1177,25 @@ msgstr "Baixar e instalar \"%s\" de extensions.gnome.org?"
 msgid "Keyboard"
 msgstr "Teclado"
 
-#: ../js/ui/lookingGlass.js:643
+#: ../js/ui/lookingGlass.js:641
 msgid "No extensions installed"
 msgstr "Nenhuma extensão instalada"
 
 #. Translators: argument is an extension UUID. */
-#: ../js/ui/lookingGlass.js:697
+#: ../js/ui/lookingGlass.js:695
 #, javascript-format
 msgid "%s has not emitted any errors."
 msgstr "%s não emitiu erros."
 
-#: ../js/ui/lookingGlass.js:703
+#: ../js/ui/lookingGlass.js:701
 msgid "Hide Errors"
 msgstr "Ocultar erros"
 
-#: ../js/ui/lookingGlass.js:707 ../js/ui/lookingGlass.js:767
+#: ../js/ui/lookingGlass.js:705 ../js/ui/lookingGlass.js:765
 msgid "Show Errors"
 msgstr "Exibir erros"
 
-#: ../js/ui/lookingGlass.js:716 ../js/ui/status/location.js:59
+#: ../js/ui/lookingGlass.js:714
-#: ../js/ui/status/location.js:167
 msgid "Enabled"
 msgstr "Habilitado"
 
@@ -1196,28 +1203,28 @@ msgstr "Habilitado"
 #. because it's disabled by rfkill (airplane mode) */
 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:719 ../js/ui/status/location.js:164
+#: ../js/ui/lookingGlass.js:717 ../js/ui/status/network.js:550
-#: ../js/ui/status/network.js:555 ../src/gvc/gvc-mixer-control.c:1830
+#: ../src/gvc/gvc-mixer-control.c:1830
 msgid "Disabled"
 msgstr "Desabilitado"
 
-#: ../js/ui/lookingGlass.js:721
+#: ../js/ui/lookingGlass.js:719
 msgid "Error"
 msgstr "Erro"
 
-#: ../js/ui/lookingGlass.js:723
+#: ../js/ui/lookingGlass.js:721
 msgid "Out of date"
 msgstr "Expirado"
 
-#: ../js/ui/lookingGlass.js:725
+#: ../js/ui/lookingGlass.js:723
 msgid "Downloading"
 msgstr "Baixando"
 
-#: ../js/ui/lookingGlass.js:749
+#: ../js/ui/lookingGlass.js:747
 msgid "View Source"
 msgstr "Ver fonte"
 
-#: ../js/ui/lookingGlass.js:758
+#: ../js/ui/lookingGlass.js:756
 msgid "Web Page"
 msgstr "Página web"
 
@@ -1253,7 +1260,7 @@ msgstr "Sem mensagens"
 msgid "Message Tray"
 msgstr "Área de notificação"
 
-#: ../js/ui/messageTray.js:2962
+#: ../js/ui/messageTray.js:2948
 msgid "System Information"
 msgstr "Informações do sistema"
 
@@ -1269,11 +1276,11 @@ msgid_plural "%d new messages"
 msgstr[0] "%d nova mensagem"
 msgstr[1] "%d novas mensagens"
 
-#: ../js/ui/overview.js:84
+#: ../js/ui/overview.js:83
 msgid "Undo"
 msgstr "Desfazer"
 
-#: ../js/ui/overview.js:124
+#: ../js/ui/overview.js:123
 msgid "Overview"
 msgstr "Panorama"
 
@@ -1281,7 +1288,7 @@ msgstr "Panorama"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters. */
-#: ../js/ui/overview.js:250
+#: ../js/ui/overview.js:257
 msgid "Type to search…"
 msgstr "Digite para pesquisar…"
 
@@ -1324,27 +1331,27 @@ msgid_plural "%d new notifications"
 msgstr[0] "%d nova notificação"
 msgstr[1] "%d novas notificações"
 
-#: ../js/ui/screenShield.js:474 ../js/ui/status/system.js:342
+#: ../js/ui/screenShield.js:473 ../js/ui/status/system.js:342
 msgid "Lock"
 msgstr "Bloquear"
 
-#: ../js/ui/screenShield.js:708
+#: ../js/ui/screenShield.js:707
 msgid "GNOME needs to lock the screen"
 msgstr "GNOME precisa bloquear a tela"
 
-#: ../js/ui/screenShield.js:835 ../js/ui/screenShield.js:1309
+#: ../js/ui/screenShield.js:834 ../js/ui/screenShield.js:1301
 msgid "Unable to lock"
 msgstr "Não foi possível bloquear"
 
-#: ../js/ui/screenShield.js:836 ../js/ui/screenShield.js:1310
+#: ../js/ui/screenShield.js:835 ../js/ui/screenShield.js:1302
 msgid "Lock was blocked by an application"
 msgstr "O bloqueio foi impedido por um aplicativo"
 
-#: ../js/ui/search.js:603
+#: ../js/ui/search.js:589
 msgid "Searching…"
 msgstr "Pesquisando…"
 
-#: ../js/ui/search.js:649
+#: ../js/ui/search.js:632
 msgid "No results."
 msgstr "Nenhum resultado."
 
@@ -1416,29 +1423,30 @@ msgstr "Alto contraste"
 msgid "Large Text"
 msgstr "Texto grande"
 
-#: ../js/ui/status/bluetooth.js:49
+#: ../js/ui/status/bluetooth.js:48
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../js/ui/status/bluetooth.js:51 ../js/ui/status/network.js:151
+#: ../js/ui/status/bluetooth.js:50 ../js/ui/status/location.js:59
-#: ../js/ui/status/network.js:323 ../js/ui/status/network.js:1234
+#: ../js/ui/status/location.js:159 ../js/ui/status/network.js:151
-#: ../js/ui/status/network.js:1345 ../js/ui/status/rfkill.js:85
+#: ../js/ui/status/network.js:318 ../js/ui/status/network.js:1225
+#: ../js/ui/status/network.js:1336 ../js/ui/status/rfkill.js:85
 #: ../js/ui/status/rfkill.js:105
 msgid "Turn Off"
 msgstr "Desligar"
 
-#: ../js/ui/status/bluetooth.js:54
+#: ../js/ui/status/bluetooth.js:53
 msgid "Bluetooth Settings"
 msgstr "Configurações de Bluetooth"
 
-#: ../js/ui/status/bluetooth.js:104
+#: ../js/ui/status/bluetooth.js:100
 #, javascript-format
 msgid "%d Connected Device"
 msgid_plural "%d Connected Devices"
 msgstr[0] "%d dispositivo conectado"
 msgstr[1] "%d dispositivos conectados"
 
-#: ../js/ui/status/bluetooth.js:106 ../js/ui/status/network.js:1262
+#: ../js/ui/status/bluetooth.js:102 ../js/ui/status/network.js:1253
 msgid "Not Connected"
 msgstr "Não conectado"
 
@@ -1450,167 +1458,161 @@ msgstr "Brilho"
 msgid "Show Keyboard Layout"
 msgstr "Exibir disposição de teclado"
 
-#: ../js/ui/status/location.js:53
+#: ../js/ui/status/location.js:52
 msgid "Location"
 msgstr "Localização"
 
-#: ../js/ui/status/location.js:60 ../js/ui/status/location.js:168
+#: ../js/ui/status/location.js:58 ../js/ui/status/location.js:158
-msgid "Disable"
+#: ../js/ui/status/rfkill.js:84
-msgstr "Desabilitar"
+msgid "On"
+msgstr "On"
 
-#: ../js/ui/status/location.js:165
+#: ../js/ui/status/location.js:155 ../js/ui/status/network.js:415
-msgid "Enable"
+#: ../js/ui/status/network.js:1251 ../js/ui/status/network.js:1455
-msgstr "Habilitar"
+msgid "Off"
+msgstr "Off"
 
-#: ../js/ui/status/location.js:167
+#: ../js/ui/status/location.js:156 ../js/ui/status/network.js:1225
-msgid "In Use"
+msgid "Turn On"
-msgstr "Em uso"
+msgstr "Ligar"
 
 #: ../js/ui/status/network.js:74
 msgid "<unknown>"
 msgstr "<desconhecido>"
 
-#: ../js/ui/status/network.js:420 ../js/ui/status/network.js:1260
+#: ../js/ui/status/network.js:417
-#: ../js/ui/status/network.js:1464
+#| msgid "Connect"
-msgid "Off"
-msgstr "Off"
-
-#: ../js/ui/status/network.js:422
 msgid "Connected"
 msgstr "Conectado"
 
 #. 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:426
+#: ../js/ui/status/network.js:421
 msgid "unmanaged"
 msgstr "não gerenciado"
 
-#: ../js/ui/status/network.js:428
+#: ../js/ui/status/network.js:423
 msgid "disconnecting..."
 msgstr "desconectando..."
 
-#: ../js/ui/status/network.js:434 ../js/ui/status/network.js:1362
+#: ../js/ui/status/network.js:429 ../js/ui/status/network.js:1353
 msgid "connecting..."
 msgstr "conectando..."
 
 #. Translators: this is for network connections that require some kind of key or password */
-#: ../js/ui/status/network.js:437 ../js/ui/status/network.js:1365
+#: ../js/ui/status/network.js:432 ../js/ui/status/network.js:1356
 msgid "authentication required"
 msgstr "autenticação necessária"
 
 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing */
-#: ../js/ui/status/network.js:445
+#: ../js/ui/status/network.js:440
 msgid "firmware missing"
 msgstr "firmware faltando"
 
 #. 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:449
+#: ../js/ui/status/network.js:444
 msgid "unavailable"
 msgstr "indisponível"
 
-#: ../js/ui/status/network.js:451 ../js/ui/status/network.js:1367
+#: ../js/ui/status/network.js:446 ../js/ui/status/network.js:1358
 msgid "connection failed"
 msgstr "conexão falhou"
 
-#: ../js/ui/status/network.js:467
+#: ../js/ui/status/network.js:462
 msgid "Wired Settings"
 msgstr "Configurações da rede cabeada"
 
-#: ../js/ui/status/network.js:509 ../js/ui/status/network.js:587
+#: ../js/ui/status/network.js:504 ../js/ui/status/network.js:582
 msgid "Mobile Broadband Settings"
 msgstr "Configurações de banda larga móvel"
 
-#: ../js/ui/status/network.js:551 ../js/ui/status/network.js:1258
+#: ../js/ui/status/network.js:546 ../js/ui/status/network.js:1249
 msgid "Hardware Disabled"
 msgstr "Hardware desabilitado"
 
-#: ../js/ui/status/network.js:595
+#: ../js/ui/status/network.js:590
 msgid "Use as Internet connection"
 msgstr "Usar como conexão de Internet"
 
-#: ../js/ui/status/network.js:776
+#: ../js/ui/status/network.js:771
 msgid "Airplane Mode is On"
 msgstr "Modo avião ligado"
 
-#: ../js/ui/status/network.js:777
+#: ../js/ui/status/network.js:772
 msgid "Wi-Fi is disabled when airplane mode is on."
 msgstr "O Wi-Fi é desabilitado quando o modo avião está ligado."
 
-#: ../js/ui/status/network.js:778
+#: ../js/ui/status/network.js:773
 msgid "Turn Off Airplane Mode"
 msgstr "Desligar modo avião"
 
-#: ../js/ui/status/network.js:787
+#: ../js/ui/status/network.js:782
 msgid "Wi-Fi is Off"
 msgstr "Wi-Fi desligado"
 
-#: ../js/ui/status/network.js:788
+#: ../js/ui/status/network.js:783
 msgid "Wi-Fi needs to be turned on in order to connect to a network."
 msgstr "O Wi-Fi precisa ser ligado a fim de conectar-se a uma rede."
 
-#: ../js/ui/status/network.js:789
+#: ../js/ui/status/network.js:784
 msgid "Turn On Wi-Fi"
 msgstr "Ligar Wi-Fi"
 
-#: ../js/ui/status/network.js:814
+#: ../js/ui/status/network.js:809
 msgid "Wi-Fi Networks"
 msgstr "Redes Wi-Fi"
 
-#: ../js/ui/status/network.js:816
+#: ../js/ui/status/network.js:811
 msgid "Select a network"
 msgstr "Selecione uma rede"
 
-#: ../js/ui/status/network.js:845
+#: ../js/ui/status/network.js:840
 msgid "No Networks"
 msgstr "Nenhuma rede"
 
-#: ../js/ui/status/network.js:866 ../js/ui/status/rfkill.js:103
+#: ../js/ui/status/network.js:861 ../js/ui/status/rfkill.js:103
 msgid "Use hardware switch to turn off"
 msgstr "Usar alternador de hardware para desligar"
 
-#: ../js/ui/status/network.js:1136
+#: ../js/ui/status/network.js:1131
 msgid "Select Network"
 msgstr "Selecione a rede"
 
-#: ../js/ui/status/network.js:1142
+#: ../js/ui/status/network.js:1137
 msgid "Wi-Fi Settings"
 msgstr "Configurações de Wi-Fi"
 
-#: ../js/ui/status/network.js:1234
+#: ../js/ui/status/network.js:1242
-msgid "Turn On"
-msgstr "Ligar"
-
-#: ../js/ui/status/network.js:1251
 msgid "Hotspot Active"
 msgstr "Ponto de acesso ativo"
 
-#: ../js/ui/status/network.js:1254
+#: ../js/ui/status/network.js:1245
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../js/ui/status/network.js:1433 ../js/ui/status/rfkill.js:88
+#: ../js/ui/status/network.js:1424 ../js/ui/status/rfkill.js:88
 msgid "Network Settings"
 msgstr "Configurações de rede"
 
-#: ../js/ui/status/network.js:1435
+#: ../js/ui/status/network.js:1426
 msgid "VPN Settings"
 msgstr "Configurações de VPN"
 
-#: ../js/ui/status/network.js:1454
+#: ../js/ui/status/network.js:1445
 msgid "VPN"
 msgstr "VPN"
 
-#: ../js/ui/status/network.js:1607
+#: ../js/ui/status/network.js:1598
 msgid "Network Manager"
 msgstr "Gerenciador de rede"
 
-#: ../js/ui/status/network.js:1646
+#: ../js/ui/status/network.js:1637
 msgid "Connection failed"
 msgstr "Falha de conexão"
 
-#: ../js/ui/status/network.js:1647
+#: ../js/ui/status/network.js:1638
 msgid "Activation of network connection failed"
 msgstr "Falha ao ativar a conexão da rede"
 
@@ -1650,10 +1652,6 @@ msgstr "Bateria"
 msgid "Airplane Mode"
 msgstr "Modo avião"
 
-#: ../js/ui/status/rfkill.js:84
-msgid "On"
-msgstr "On"
-
 #: ../js/ui/status/system.js:314
 msgid "Switch User"
 msgstr "Alternar usuário"

po/tg.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: Tajik Gnome\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-04-08 20:00+0000\n"
+"POT-Creation-Date: 2014-02-26 20:31+0000\n"
-"PO-Revision-Date: 2014-04-09 11:36+0500\n"
+"PO-Revision-Date: 2014-02-27 12:10+0500\n"
 "Last-Translator: Victor Ibragimov <victor.ibragimov@gmail.com>\n"
 "Language-Team: \n"
 "Language: tg\n"
@@ -229,14 +229,14 @@ msgid ""
 "Configures the maximum level of location accuracy applications are allowed "
 "to see. Valid options are 'off' (disable location tracking), 'country', "
 "'city', 'neighborhood', 'street', and 'exact' (typically requires GPS "
-"receiver). Please keep in mind that this only controls what GeoClue will "
+"receiver). Please keep in mind that this only controls what Geoclue will "
 "allow applications to see and they can find user's location on their own "
 "using network resources (albeit with street-level accuracy at best)."
 msgstr ""
 "Сатҳи баландтарини саҳеҳии ҷойгиршавиро барои барномаҳо танзим мекунад. "
 "Имконоти боэътибор: 'хомӯш' (пайгирии ҷойгиршавии ғайрифаъол), 'кишвар', "
 "'шаҳр', 'ҳамсоягӣ', 'кӯча' ва 'дақиқ' (қабулкунандаи GPS лозим аст). Лутфан, "
-"қайд кнед, ки ин танҳо GeoClue-ро идора мекунад ва ба барномаҳо иҷозат "
+"қайд кнед, ки ин танҳо Geoclue-ро идора мекунад ва ба барномаҳо иҷозат "
 "медиҳад, то ки тавонанд ҷойгиршавии корбаронро тавассути манбаъи шабакавии "
 "онҳо пайдо кунанд (ақаллан ҷойгиршавии саҳеҳии кӯча)."
 
@@ -318,7 +318,7 @@ msgstr ""
 #: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:136
 #: ../js/ui/components/polkitAgent.js:166 ../js/ui/endSessionDialog.js:429
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
-#: ../js/ui/status/network.js:878
+#: ../js/ui/status/network.js:883
 msgid "Cancel"
 msgstr "Бекор кардан"
 
@@ -336,25 +336,25 @@ msgctxt "button"
 msgid "Sign In"
 msgstr "Ворид шудан"
 
-#: ../js/gdm/loginDialog.js:271
+#: ../js/gdm/loginDialog.js:270
 msgid "Choose Session"
 msgstr "Интихоби ҷаласа"
 
-#: ../js/gdm/loginDialog.js:431
+#: ../js/gdm/loginDialog.js:430
 msgid "Not listed?"
 msgstr "Вуҷуд надора?"
 
-#: ../js/gdm/loginDialog.js:614
+#: ../js/gdm/loginDialog.js:598
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(масалан, корбар ё %s)"
 
-#: ../js/gdm/loginDialog.js:619 ../js/ui/components/networkAgent.js:262
+#: ../js/gdm/loginDialog.js:603 ../js/ui/components/networkAgent.js:262
 #: ../js/ui/components/networkAgent.js:280
 msgid "Username: "
 msgstr "Номи корбар:"
 
-#: ../js/gdm/loginDialog.js:920
+#: ../js/gdm/loginDialog.js:868
 msgid "Login Window"
 msgstr "Равзанаи воридшавӣ"
 
@@ -379,27 +379,27 @@ msgstr "Фармон иҷро нашудааст:"
 msgid "Execution of “%s” failed:"
 msgstr "Иҷрокунии “%s” қатъ шудааст:"
 
-#: ../js/ui/appDisplay.js:636
+#: ../js/ui/appDisplay.js:629
 msgid "Frequently used applications will appear here"
 msgstr "Барномаҳои бештар истифодашуда ин ҷо намоиш дода мешаванд"
 
-#: ../js/ui/appDisplay.js:747
+#: ../js/ui/appDisplay.js:740
 msgid "Frequent"
 msgstr "Роиҷ"
 
-#: ../js/ui/appDisplay.js:754
+#: ../js/ui/appDisplay.js:747
 msgid "All"
 msgstr "Ҳама"
 
-#: ../js/ui/appDisplay.js:1566
+#: ../js/ui/appDisplay.js:1552
 msgid "New Window"
 msgstr "Равзанаи нав"
 
-#: ../js/ui/appDisplay.js:1588 ../js/ui/dash.js:285
+#: ../js/ui/appDisplay.js:1574 ../js/ui/dash.js:285
 msgid "Remove from Favorites"
 msgstr "Тоза кардан аз Баргузидаҳо"
 
-#: ../js/ui/appDisplay.js:1594
+#: ../js/ui/appDisplay.js:1580
 msgid "Add to Favorites"
 msgstr "Илова кардан ба Баргузидаҳо"
 
@@ -542,44 +542,44 @@ msgstr "Ш"
 msgid "calendar:MY"
 msgstr "тақвим:MY"
 
-#: ../js/ui/calendar.js:450
+#: ../js/ui/calendar.js:446
 msgid "Previous month"
 msgstr "Моҳи қаблӣ"
 
-#: ../js/ui/calendar.js:460
+#: ../js/ui/calendar.js:456
 msgid "Next month"
 msgstr "Моҳи навбатӣ"
 
 #. Translators: Text to show if there are no events */
-#: ../js/ui/calendar.js:772
+#: ../js/ui/calendar.js:762
 msgid "Nothing Scheduled"
 msgstr "Ягон чиз ба нақша нагирифтааст"
 
 #. Translators: Shown on calendar heading when selected day occurs on current year */
-#: ../js/ui/calendar.js:790
+#: ../js/ui/calendar.js:780
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %B %d"
 
 #. Translators: Shown on calendar heading when selected day occurs on different year */
-#: ../js/ui/calendar.js:793
+#: ../js/ui/calendar.js:783
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
-#: ../js/ui/calendar.js:804
+#: ../js/ui/calendar.js:794
 msgid "Today"
 msgstr "Имрӯз"
 
-#: ../js/ui/calendar.js:808
+#: ../js/ui/calendar.js:798
 msgid "Tomorrow"
 msgstr "Фардо"
 
-#: ../js/ui/calendar.js:819
+#: ../js/ui/calendar.js:809
 msgid "This week"
 msgstr "Ҳафтаи ҷорӣ"
 
-#: ../js/ui/calendar.js:827
+#: ../js/ui/calendar.js:817
 msgid "Next week"
 msgstr "Ҳафтаи навбатӣ"
 
@@ -612,8 +612,8 @@ msgstr "Парол:"
 msgid "Type again:"
 msgstr "Аз нав ворид кунед:"
 
-#: ../js/ui/components/networkAgent.js:131 ../js/ui/status/network.js:240
+#: ../js/ui/components/networkAgent.js:131 ../js/ui/status/network.js:250
-#: ../js/ui/status/network.js:322 ../js/ui/status/network.js:881
+#: ../js/ui/status/network.js:327 ../js/ui/status/network.js:886
 msgid "Connect"
 msgstr "Пайваст шудан"
 
@@ -818,13 +818,13 @@ msgstr "%s шуморо барои ҳамроҳ шудан ба %s даъват
 #: ../js/ui/components/telepathyClient.js:1164
 #: ../js/ui/components/telepathyClient.js:1199
 #: ../js/ui/components/telepathyClient.js:1233
-#: ../js/ui/components/telepathyClient.js:1291
+#: ../js/ui/components/telepathyClient.js:1290
 msgid "Decline"
 msgstr "Рад кардан"
 
 #: ../js/ui/components/telepathyClient.js:1170
 #: ../js/ui/components/telepathyClient.js:1239
-#: ../js/ui/components/telepathyClient.js:1296
+#: ../js/ui/components/telepathyClient.js:1295
 msgid "Accept"
 msgstr "Қабул кардан"
 
@@ -861,99 +861,99 @@ msgstr "%s ба шумо %s-ро мефиристад"
 msgid "%s would like permission to see when you are online"
 msgstr "%s аз шумо иҷозат мепурсад, ки тавонад шуморо дар онлайн бинад"
 
-#: ../js/ui/components/telepathyClient.js:1342
+#: ../js/ui/components/telepathyClient.js:1341
 msgid "Network error"
 msgstr "Хатои шабака"
 
-#: ../js/ui/components/telepathyClient.js:1344
+#: ../js/ui/components/telepathyClient.js:1343
 msgid "Authentication failed"
 msgstr "Санҷиши ҳаққоният қатъ шудааст."
 
-#: ../js/ui/components/telepathyClient.js:1346
+#: ../js/ui/components/telepathyClient.js:1345
 msgid "Encryption error"
 msgstr "Хатои рамзгузорӣ"
 
-#: ../js/ui/components/telepathyClient.js:1348
+#: ../js/ui/components/telepathyClient.js:1347
 msgid "Certificate not provided"
 msgstr "Гувоҳинома таъмин нашудааст"
 
-#: ../js/ui/components/telepathyClient.js:1350
+#: ../js/ui/components/telepathyClient.js:1349
 msgid "Certificate untrusted"
 msgstr "Гувоҳиномаи беэътибор"
 
-#: ../js/ui/components/telepathyClient.js:1352
+#: ../js/ui/components/telepathyClient.js:1351
 msgid "Certificate expired"
 msgstr "Гувоҳинома аз мӯҳлаташ гузашт"
 
-#: ../js/ui/components/telepathyClient.js:1354
+#: ../js/ui/components/telepathyClient.js:1353
 msgid "Certificate not activated"
 msgstr "Гувоҳинома фаъол нашудааст"
 
-#: ../js/ui/components/telepathyClient.js:1356
+#: ../js/ui/components/telepathyClient.js:1355
 msgid "Certificate hostname mismatch"
 msgstr "Номувофиқати гувоҳиномаи номи мизоҷон"
 
-#: ../js/ui/components/telepathyClient.js:1358
+#: ../js/ui/components/telepathyClient.js:1357
 msgid "Certificate fingerprint mismatch"
 msgstr "Номувофиқати гувоҳиномаи нақши ангуштон"
 
-#: ../js/ui/components/telepathyClient.js:1360
+#: ../js/ui/components/telepathyClient.js:1359
 msgid "Certificate self-signed"
 msgstr "Гувоҳиномаи худимзошуда"
 
-#: ../js/ui/components/telepathyClient.js:1362
+#: ../js/ui/components/telepathyClient.js:1361
 msgid "Status is set to offline"
 msgstr "Вазъият ба \"офлайн\" гузаштааст"
 
-#: ../js/ui/components/telepathyClient.js:1364
+#: ../js/ui/components/telepathyClient.js:1363
 msgid "Encryption is not available"
 msgstr "Рамзгузорӣ дастрас нест"
 
-#: ../js/ui/components/telepathyClient.js:1366
+#: ../js/ui/components/telepathyClient.js:1365
 msgid "Certificate is invalid"
 msgstr "Гувоҳинома нодуруст аст"
 
-#: ../js/ui/components/telepathyClient.js:1368
+#: ../js/ui/components/telepathyClient.js:1367
 msgid "Connection has been refused"
 msgstr "Пайваст рад карда шудааст"
 
-#: ../js/ui/components/telepathyClient.js:1370
+#: ../js/ui/components/telepathyClient.js:1369
 msgid "Connection can't be established"
 msgstr "Пайвастшавӣ имконнопазир аст"
 
-#: ../js/ui/components/telepathyClient.js:1372
+#: ../js/ui/components/telepathyClient.js:1371
 msgid "Connection has been lost"
 msgstr "Пайваст гум шудааст"
 
-#: ../js/ui/components/telepathyClient.js:1374
+#: ../js/ui/components/telepathyClient.js:1373
 msgid "This account is already connected to the server"
 msgstr "Ин ҳисоб аллакай ба сервер пайваст шудааст"
 
-#: ../js/ui/components/telepathyClient.js:1376
+#: ../js/ui/components/telepathyClient.js:1375
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Пайваст тавассути сарчашмаи якхела бо пайвасти нав ҷойиваз карда шуд"
 
-#: ../js/ui/components/telepathyClient.js:1378
+#: ../js/ui/components/telepathyClient.js:1377
 msgid "The account already exists on the server"
 msgstr "Ҳисоб дар сервер аллакай мавҷуд аст"
 
-#: ../js/ui/components/telepathyClient.js:1380
+#: ../js/ui/components/telepathyClient.js:1379
 msgid "Server is currently too busy to handle the connection"
 msgstr "Барои коркарди ин пайваст сервер дар айни ҳол хеле машғул мебошад"
 
-#: ../js/ui/components/telepathyClient.js:1382
+#: ../js/ui/components/telepathyClient.js:1381
 msgid "Certificate has been revoked"
 msgstr "Гувоҳинома лағв карда шуд"
 
-#: ../js/ui/components/telepathyClient.js:1384
+#: ../js/ui/components/telepathyClient.js:1383
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Гувоҳинома алгоритми хатарноки рамзро истифода мебарад, ё ки рамзгузории "
 "суст дорад"
 
-#: ../js/ui/components/telepathyClient.js:1386
+#: ../js/ui/components/telepathyClient.js:1385
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -961,22 +961,22 @@ msgstr ""
 "Дарозии гувоҳиномаи сервер, ё ки чуқурии занҷири гувоҳиномаи сервер, аз "
 "маҳдудиятҳое, ки бо китобхонаи рамзгузорӣ таъин шудаанд, дарозтар мебошад"
 
-#: ../js/ui/components/telepathyClient.js:1388
+#: ../js/ui/components/telepathyClient.js:1387
 msgid "Internal error"
 msgstr "Хатогии дохилӣ"
 
 #. translators: argument is the account name, like
 #. * name@jabber.org for example. */
-#: ../js/ui/components/telepathyClient.js:1398
+#: ../js/ui/components/telepathyClient.js:1397
 #, javascript-format
 msgid "Unable to connect to %s"
 msgstr "Пайвастшавӣ ба %s имконнопазир аст"
 
-#: ../js/ui/components/telepathyClient.js:1403
+#: ../js/ui/components/telepathyClient.js:1402
 msgid "View account"
 msgstr "Намоиш додани ҳисоб"
 
-#: ../js/ui/components/telepathyClient.js:1440
+#: ../js/ui/components/telepathyClient.js:1434
 msgid "Unknown reason"
 msgstr "Сабаби номаълум"
 
@@ -992,22 +992,22 @@ msgstr "Намоиш додани барномаҳо"
 msgid "Dash"
 msgstr "Рах"
 
-#: ../js/ui/dateMenu.js:91
+#: ../js/ui/dateMenu.js:86
 msgid "Open Calendar"
 msgstr "Кушодани тақвим"
 
-#: ../js/ui/dateMenu.js:95
+#: ../js/ui/dateMenu.js:90
 msgid "Open Clocks"
 msgstr "Кушодани соат"
 
-#: ../js/ui/dateMenu.js:102
+#: ../js/ui/dateMenu.js:97
 msgid "Date & Time Settings"
 msgstr "Танзимоти сана ва вақт"
 
 #. 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:192
+#: ../js/ui/dateMenu.js:187
 msgid "%A %B %e, %Y"
 msgstr "%A %B %e, %Y"
 
@@ -1103,6 +1103,8 @@ msgstr[1] ""
 "насб мекунад."
 
 #: ../js/ui/endSessionDialog.js:129
+#| msgctxt "button"
+#| msgid "Restart & Install"
 msgctxt "button"
 msgid "Restart &amp; Install"
 msgstr "Бозоғозӣ ва насб кардан"
@@ -1156,26 +1158,25 @@ msgstr "“%s”-ро аз extensions.gnome.org боргирӣ ва насб м
 msgid "Keyboard"
 msgstr "Клавиатура"
 
-#: ../js/ui/lookingGlass.js:643
+#: ../js/ui/lookingGlass.js:641
 msgid "No extensions installed"
 msgstr "Ягон пасванд насб нашудааст"
 
 #. Translators: argument is an extension UUID. */
-#: ../js/ui/lookingGlass.js:697
+#: ../js/ui/lookingGlass.js:695
 #, javascript-format
 msgid "%s has not emitted any errors."
 msgstr "%s ягон хато надорад."
 
-#: ../js/ui/lookingGlass.js:703
+#: ../js/ui/lookingGlass.js:701
 msgid "Hide Errors"
 msgstr "Пинҳон кардани хатоҳо"
 
-#: ../js/ui/lookingGlass.js:707 ../js/ui/lookingGlass.js:767
+#: ../js/ui/lookingGlass.js:705 ../js/ui/lookingGlass.js:765
 msgid "Show Errors"
 msgstr "Намоиш додани хатоҳо"
 
-#: ../js/ui/lookingGlass.js:716 ../js/ui/status/location.js:59
+#: ../js/ui/lookingGlass.js:714
-#: ../js/ui/status/location.js:167
 msgid "Enabled"
 msgstr "Фаъол"
 
@@ -1183,28 +1184,28 @@ msgstr "Фаъол"
 #. because it's disabled by rfkill (airplane mode) */
 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:719 ../js/ui/status/location.js:164
+#: ../js/ui/lookingGlass.js:717 ../js/ui/status/network.js:560
-#: ../js/ui/status/network.js:555 ../src/gvc/gvc-mixer-control.c:1830
+#: ../src/gvc/gvc-mixer-control.c:1830
 msgid "Disabled"
 msgstr "Ғайрифаъол"
 
-#: ../js/ui/lookingGlass.js:721
+#: ../js/ui/lookingGlass.js:719
 msgid "Error"
 msgstr "Хатогӣ"
 
-#: ../js/ui/lookingGlass.js:723
+#: ../js/ui/lookingGlass.js:721
 msgid "Out of date"
 msgstr "Аз мӯҳлат гузашта"
 
-#: ../js/ui/lookingGlass.js:725
+#: ../js/ui/lookingGlass.js:723
 msgid "Downloading"
 msgstr "Боргирӣ рафта истодааст"
 
-#: ../js/ui/lookingGlass.js:749
+#: ../js/ui/lookingGlass.js:747
 msgid "View Source"
 msgstr "Намоиш додани манбаъ"
 
-#: ../js/ui/lookingGlass.js:758
+#: ../js/ui/lookingGlass.js:756
 msgid "Web Page"
 msgstr "Саҳифаи веб"
 
@@ -1240,7 +1241,7 @@ msgstr "Ягон паём нест"
 msgid "Message Tray"
 msgstr "Қуттии паёмҳо"
 
-#: ../js/ui/messageTray.js:2962
+#: ../js/ui/messageTray.js:2948
 msgid "System Information"
 msgstr "Маълумоти система"
 
@@ -1256,11 +1257,11 @@ msgid_plural "%d new messages"
 msgstr[0] "%d паёми нав"
 msgstr[1] "%d паёми нав"
 
-#: ../js/ui/overview.js:84
+#: ../js/ui/overview.js:83
 msgid "Undo"
 msgstr "Ботил сохтан"
 
-#: ../js/ui/overview.js:124
+#: ../js/ui/overview.js:123
 msgid "Overview"
 msgstr "Хулоса"
 
@@ -1268,7 +1269,7 @@ msgstr "Хулоса"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters. */
-#: ../js/ui/overview.js:250
+#: ../js/ui/overview.js:257
 msgid "Type to search…"
 msgstr "Ҷустуҷӯ кардан..."
 
@@ -1311,27 +1312,27 @@ msgid_plural "%d new notifications"
 msgstr[0] "%d огоҳии нав"
 msgstr[1] "%d огоҳии нав"
 
-#: ../js/ui/screenShield.js:474 ../js/ui/status/system.js:342
+#: ../js/ui/screenShield.js:473 ../js/ui/status/system.js:342
 msgid "Lock"
 msgstr "Қулф кардан"
 
-#: ../js/ui/screenShield.js:708
+#: ../js/ui/screenShield.js:707
 msgid "GNOME needs to lock the screen"
 msgstr "GNOME бояд экранро қулф кунад"
 
-#: ../js/ui/screenShield.js:835 ../js/ui/screenShield.js:1309
+#: ../js/ui/screenShield.js:834 ../js/ui/screenShield.js:1301
 msgid "Unable to lock"
 msgstr "Қулф карда намешавад"
 
-#: ../js/ui/screenShield.js:836 ../js/ui/screenShield.js:1310
+#: ../js/ui/screenShield.js:835 ../js/ui/screenShield.js:1302
 msgid "Lock was blocked by an application"
 msgstr "Қулф аз тарави барнома баста шудааст"
 
-#: ../js/ui/search.js:603
+#: ../js/ui/search.js:589
 msgid "Searching…"
 msgstr "Ҷустуҷӯ рафта истодааст..."
 
-#: ../js/ui/search.js:649
+#: ../js/ui/search.js:632
 msgid "No results."
 msgstr "Ягон натиҷа нест."
 
@@ -1403,29 +1404,30 @@ msgstr "Контрасти баланд"
 msgid "Large Text"
 msgstr "Матни бузург"
 
-#: ../js/ui/status/bluetooth.js:49
+#: ../js/ui/status/bluetooth.js:48
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../js/ui/status/bluetooth.js:51 ../js/ui/status/network.js:151
+#: ../js/ui/status/bluetooth.js:50 ../js/ui/status/location.js:59
-#: ../js/ui/status/network.js:323 ../js/ui/status/network.js:1234
+#: ../js/ui/status/location.js:159 ../js/ui/status/network.js:151
-#: ../js/ui/status/network.js:1345 ../js/ui/status/rfkill.js:85
+#: ../js/ui/status/network.js:328 ../js/ui/status/network.js:1235
+#: ../js/ui/status/network.js:1346 ../js/ui/status/rfkill.js:85
 #: ../js/ui/status/rfkill.js:105
 msgid "Turn Off"
 msgstr "Хомӯш кардан"
 
-#: ../js/ui/status/bluetooth.js:54
+#: ../js/ui/status/bluetooth.js:53
 msgid "Bluetooth Settings"
 msgstr "Танзимоти Bluetooth"
 
-#: ../js/ui/status/bluetooth.js:104
+#: ../js/ui/status/bluetooth.js:100
 #, javascript-format
 msgid "%d Connected Device"
 msgid_plural "%d Connected Devices"
 msgstr[0] "%d дастгоҳи пайвастшуда"
 msgstr[1] "%d дастгоҳи пайвастшуда"
 
-#: ../js/ui/status/bluetooth.js:106 ../js/ui/status/network.js:1262
+#: ../js/ui/status/bluetooth.js:102 ../js/ui/status/network.js:1263
 msgid "Not Connected"
 msgstr "Пайваст нашудааст"
 
@@ -1437,169 +1439,156 @@ msgstr "Дурахшонӣ"
 msgid "Show Keyboard Layout"
 msgstr "Намоиш додани тарҳбандии клавиатура"
 
-#: ../js/ui/status/location.js:53
+#: ../js/ui/status/location.js:52
 msgid "Location"
 msgstr "Ҷойгиршавӣ"
 
-#: ../js/ui/status/location.js:60 ../js/ui/status/location.js:168
+#: ../js/ui/status/location.js:58 ../js/ui/status/location.js:158
-#| msgid "Disabled"
+#: ../js/ui/status/rfkill.js:84
-msgid "Disable"
+msgid "On"
-msgstr "Ғайрифаъол кардан"
+msgstr "Фаъол"
 
-#: ../js/ui/status/location.js:165
+#: ../js/ui/status/location.js:155 ../js/ui/status/network.js:246
-#| msgid "Enabled"
+#: ../js/ui/status/network.js:425 ../js/ui/status/network.js:1261
-msgid "Enable"
+msgid "Off"
+msgstr "Хомӯш"
+
+#: ../js/ui/status/location.js:156 ../js/ui/status/network.js:1235
+msgid "Turn On"
 msgstr "Фаъол кардан"
 
-#: ../js/ui/status/location.js:167
-msgid "In Use"
-msgstr "Дар истифода"
-
 #: ../js/ui/status/network.js:74
 msgid "<unknown>"
 msgstr "<номаълум>"
 
-#: ../js/ui/status/network.js:420 ../js/ui/status/network.js:1260
-#: ../js/ui/status/network.js:1464
-msgid "Off"
-msgstr "Хомӯш"
-
-#: ../js/ui/status/network.js:422
-msgid "Connected"
-msgstr "Пайваст шудааст"
-
 #. 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:426
+#: ../js/ui/status/network.js:431
 msgid "unmanaged"
 msgstr "идоранашуда"
 
-#: ../js/ui/status/network.js:428
+#: ../js/ui/status/network.js:433
 msgid "disconnecting..."
 msgstr "қатъ кардани пайваст..."
 
-#: ../js/ui/status/network.js:434 ../js/ui/status/network.js:1362
+#: ../js/ui/status/network.js:439 ../js/ui/status/network.js:1363
 msgid "connecting..."
 msgstr "пайвастшавӣ..."
 
 #. Translators: this is for network connections that require some kind of key or password */
-#: ../js/ui/status/network.js:437 ../js/ui/status/network.js:1365
+#: ../js/ui/status/network.js:442 ../js/ui/status/network.js:1366
 msgid "authentication required"
 msgstr "санҷиши ҳаққоният лозим аст"
 
 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing */
-#: ../js/ui/status/network.js:445
+#: ../js/ui/status/network.js:450
 msgid "firmware missing"
 msgstr "нармафзори дарунсохт вуҷуд надорад"
 
 #. 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:449
+#: ../js/ui/status/network.js:454
 msgid "unavailable"
 msgstr "дастнорас"
 
-#: ../js/ui/status/network.js:451 ../js/ui/status/network.js:1367
+#: ../js/ui/status/network.js:456 ../js/ui/status/network.js:1368
 msgid "connection failed"
 msgstr "пайваст қатъ шудааст"
 
-#: ../js/ui/status/network.js:467
+#: ../js/ui/status/network.js:472
 msgid "Wired Settings"
 msgstr "Танзимоти шабакаи симдор"
 
-#: ../js/ui/status/network.js:509 ../js/ui/status/network.js:587
+#: ../js/ui/status/network.js:514 ../js/ui/status/network.js:592
 msgid "Mobile Broadband Settings"
 msgstr "Танзимоти паҳннавори мобилӣ"
 
-#: ../js/ui/status/network.js:551 ../js/ui/status/network.js:1258
+#: ../js/ui/status/network.js:556 ../js/ui/status/network.js:1259
 msgid "Hardware Disabled"
 msgstr "Сахтафзор ғайрифаъол шудааст"
 
-#: ../js/ui/status/network.js:595
+#: ../js/ui/status/network.js:600
 msgid "Use as Internet connection"
 msgstr "Ҳамчун пайвасти Интернет истифода кардан"
 
-#: ../js/ui/status/network.js:776
+#: ../js/ui/status/network.js:781
 msgid "Airplane Mode is On"
 msgstr "Ҳолати ҳавопаймо фаъол аст"
 
-#: ../js/ui/status/network.js:777
+#: ../js/ui/status/network.js:782
 msgid "Wi-Fi is disabled when airplane mode is on."
 msgstr "Ҳангоми фаъол будани ҳолати ҳавопаймо Wi-Fi ғайрифаъол аст."
 
-#: ../js/ui/status/network.js:778
+#: ../js/ui/status/network.js:783
 msgid "Turn Off Airplane Mode"
 msgstr "Ҳолати ҳавопаймо хомӯш аст"
 
-#: ../js/ui/status/network.js:787
+#: ../js/ui/status/network.js:792
 msgid "Wi-Fi is Off"
 msgstr "Wi-Fi хомӯш аст"
 
-#: ../js/ui/status/network.js:788
+#: ../js/ui/status/network.js:793
 msgid "Wi-Fi needs to be turned on in order to connect to a network."
 msgstr "Барои пайваст шудан ба шабака, Wi-Fi бояд фаъол карда шавад."
 
-#: ../js/ui/status/network.js:789
+#: ../js/ui/status/network.js:794
 msgid "Turn On Wi-Fi"
 msgstr "Фаъол кардани Wi-Fi"
 
-#: ../js/ui/status/network.js:814
+#: ../js/ui/status/network.js:819
 msgid "Wi-Fi Networks"
 msgstr "Шабакаҳои Wi-Fi"
 
-#: ../js/ui/status/network.js:816
+#: ../js/ui/status/network.js:821
 msgid "Select a network"
 msgstr "Интихоб кардани шабака"
 
-#: ../js/ui/status/network.js:845
+#: ../js/ui/status/network.js:850
 msgid "No Networks"
 msgstr "Ягон шабака нест"
 
-#: ../js/ui/status/network.js:866 ../js/ui/status/rfkill.js:103
+#: ../js/ui/status/network.js:871 ../js/ui/status/rfkill.js:103
 msgid "Use hardware switch to turn off"
 msgstr "Истифодаи калиди сахтафзорӣ барои фаъолсозӣ ё хомӯшкунӣ"
 
-#: ../js/ui/status/network.js:1136
+#: ../js/ui/status/network.js:1141
 msgid "Select Network"
 msgstr "Интихоби шабака"
 
-#: ../js/ui/status/network.js:1142
+#: ../js/ui/status/network.js:1147
 msgid "Wi-Fi Settings"
 msgstr "Танзимоти Wi-Fi"
 
-#: ../js/ui/status/network.js:1234
+#: ../js/ui/status/network.js:1252
-msgid "Turn On"
-msgstr "Фаъол кардан"
-
-#: ../js/ui/status/network.js:1251
 msgid "Hotspot Active"
 msgstr "Hotspot фаъол аст"
 
-#: ../js/ui/status/network.js:1254
+#: ../js/ui/status/network.js:1255
 msgid "Connecting"
 msgstr "Пайвастшавӣ"
 
-#: ../js/ui/status/network.js:1433 ../js/ui/status/rfkill.js:88
+#: ../js/ui/status/network.js:1434 ../js/ui/status/rfkill.js:88
 msgid "Network Settings"
 msgstr "Танзимоти шабака"
 
-#: ../js/ui/status/network.js:1435
+#: ../js/ui/status/network.js:1436
 msgid "VPN Settings"
 msgstr "Танзимоти VPN"
 
-#: ../js/ui/status/network.js:1454
+#: ../js/ui/status/network.js:1455
 msgid "VPN"
 msgstr "VPN"
 
-#: ../js/ui/status/network.js:1607
+#: ../js/ui/status/network.js:1598
 msgid "Network Manager"
 msgstr "Мудири шабака"
 
-#: ../js/ui/status/network.js:1646
+#: ../js/ui/status/network.js:1637
 msgid "Connection failed"
 msgstr "Пайваст қатъ шудааст"
 
-#: ../js/ui/status/network.js:1647
+#: ../js/ui/status/network.js:1638
 msgid "Activation of network connection failed"
 msgstr "Фаъолсозии пайвасти шабака қатъ шудааст."
 
@@ -1637,10 +1626,6 @@ msgstr "Батарея"
 msgid "Airplane Mode"
 msgstr "Ҳолати ҳавопаймо"
 
-#: ../js/ui/status/rfkill.js:84
-msgid "On"
-msgstr "Фаъол"
-
 #: ../js/ui/status/system.js:314
 msgid "Switch User"
 msgstr "Таъвизи корбар"

po/zh_CN.po

@@ -21,9 +21,9 @@ 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: 2014-03-29 07:36+0000\n"
+"POT-Creation-Date: 2014-02-19 23:28+0000\n"
 "PO-Revision-Date: 2014-02-05 18:33+0800\n"
-"Last-Translator: Sphinx Jiang <yishanj13@gmail.com>\n"
+"Last-Translator: hui <www.eternalhui@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
@@ -112,9 +112,8 @@ msgid ""
 "GNOME Shell will only load extensions that claim to support the current "
 "running version. Enabling this option will disable this check and try to "
 "load all extensions regardless of the versions they claim to support."
-msgstr ""
+msgstr "GNOME 只会加载声明支持当前运行版本的扩展。启用该选项会禁止此检查，"
-"GNOME 只会加载声明支持当前运行版本的扩展。启用该选项会禁止此检查，并尝试加载"
+"并尝试加载所有扩展，无视它们声明支持的版本。"
-"所有扩展，无视它们声明支持的版本。"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:7
 msgid "List of desktop file IDs for favorite applications"
@@ -227,12 +226,11 @@ msgid ""
 "Configures the maximum level of location accuracy applications are allowed "
 "to see. Valid options are 'off' (disable location tracking), 'country', "
 "'city', 'neighborhood', 'street', and 'exact' (typically requires GPS "
-"receiver). Please keep in mind that this only controls what GeoClue will "
+"receiver). Please keep in mind that this only controls what Geoclue will "
 "allow applications to see and they can find user's location on their own "
 "using network resources (albeit with street-level accuracy at best)."
-msgstr ""
+msgstr "配置应用程序可见的最大位置精度级别。有效选项有“off”(禁止追踪位置)、"
-"配置应用程序可见的最大位置精度级别。有效选项有“off”(禁止追踪位"
+"“country”(国家)、“city”(城市)、“neighborhood”(邻近)、“street”(街道)、"
-"置)、“country”(国家)、“city”(城市)、“neighborhood”(邻近)、“street”(街道)、"
 "和“exact”(精确，通常需要 GPS 传感器)。注意，这一选项只控制 Geoclue 让应用程序"
 "知道多少，但程序自己可以自行通过网络资源找到用户的位置(即使最多精确到街道)。"
 
@@ -266,8 +264,7 @@ msgstr "标题栏上的按钮排列"
 msgid ""
 "This key overrides the key in org.gnome.desktop.wm.preferences when running "
 "GNOME Shell."
-msgstr ""
+msgstr "当 GNOME Shell 运行时，此键会覆盖 org.gnome.desktop.wm.preferences 键。"
-"当 GNOME Shell 运行时，此键会覆盖 org.gnome.desktop.wm.preferences 键。"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:37
 msgid "Enable edge tiling when dropping windows on screen edges"
@@ -301,7 +298,7 @@ msgstr "使用上面的下拉框选择一个要配置的扩展。"
 #: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:136
 #: ../js/ui/components/polkitAgent.js:166 ../js/ui/endSessionDialog.js:429
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
-#: ../js/ui/status/network.js:878
+#: ../js/ui/status/network.js:883
 msgid "Cancel"
 msgstr "取消"
 
@@ -319,25 +316,25 @@ msgctxt "button"
 msgid "Sign In"
 msgstr "登录"
 
-#: ../js/gdm/loginDialog.js:271
+#: ../js/gdm/loginDialog.js:270
 msgid "Choose Session"
 msgstr "选择会话"
 
-#: ../js/gdm/loginDialog.js:431
+#: ../js/gdm/loginDialog.js:430
 msgid "Not listed?"
 msgstr "未列出？"
 
-#: ../js/gdm/loginDialog.js:614
+#: ../js/gdm/loginDialog.js:598
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(如 user 或 %s)"
 
-#: ../js/gdm/loginDialog.js:619 ../js/ui/components/networkAgent.js:262
+#: ../js/gdm/loginDialog.js:603 ../js/ui/components/networkAgent.js:262
 #: ../js/ui/components/networkAgent.js:280
 msgid "Username: "
 msgstr "用户名："
 
-#: ../js/gdm/loginDialog.js:920
+#: ../js/gdm/loginDialog.js:868
 msgid "Login Window"
 msgstr "登录窗口"
 
@@ -362,27 +359,27 @@ msgstr "不能解析命令："
 msgid "Execution of “%s” failed:"
 msgstr "运行“%s”失败："
 
-#: ../js/ui/appDisplay.js:636
+#: ../js/ui/appDisplay.js:629
 msgid "Frequently used applications will appear here"
 msgstr "常用的应用程序会出现在这里"
 
-#: ../js/ui/appDisplay.js:747
+#: ../js/ui/appDisplay.js:740
 msgid "Frequent"
 msgstr "常用"
 
-#: ../js/ui/appDisplay.js:754
+#: ../js/ui/appDisplay.js:747
 msgid "All"
 msgstr "全部"
 
-#: ../js/ui/appDisplay.js:1566
+#: ../js/ui/appDisplay.js:1552
 msgid "New Window"
 msgstr "新窗口"
 
-#: ../js/ui/appDisplay.js:1588 ../js/ui/dash.js:285
+#: ../js/ui/appDisplay.js:1574 ../js/ui/dash.js:285
 msgid "Remove from Favorites"
 msgstr "从收藏夹中移除"
 
-#: ../js/ui/appDisplay.js:1594
+#: ../js/ui/appDisplay.js:1580
 msgid "Add to Favorites"
 msgstr "添加到收藏夹"
 
@@ -525,44 +522,44 @@ msgstr "周六"
 msgid "calendar:MY"
 msgstr "日历：我"
 
-#: ../js/ui/calendar.js:450
+#: ../js/ui/calendar.js:446
 msgid "Previous month"
 msgstr "上个月"
 
-#: ../js/ui/calendar.js:460
+#: ../js/ui/calendar.js:456
 msgid "Next month"
 msgstr "下个月"
 
 #. Translators: Text to show if there are no events */
-#: ../js/ui/calendar.js:772
+#: ../js/ui/calendar.js:762
 msgid "Nothing Scheduled"
 msgstr "无计划"
 
 #. Translators: Shown on calendar heading when selected day occurs on current year */
-#: ../js/ui/calendar.js:790
+#: ../js/ui/calendar.js:780
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%m月%d日%A"
 
 #. Translators: Shown on calendar heading when selected day occurs on different year */
-#: ../js/ui/calendar.js:793
+#: ../js/ui/calendar.js:783
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%Y年%m月%d日%A"
 
-#: ../js/ui/calendar.js:804
+#: ../js/ui/calendar.js:794
 msgid "Today"
 msgstr "今天"
 
-#: ../js/ui/calendar.js:808
+#: ../js/ui/calendar.js:798
 msgid "Tomorrow"
 msgstr "明天"
 
-#: ../js/ui/calendar.js:819
+#: ../js/ui/calendar.js:809
 msgid "This week"
 msgstr "本周"
 
-#: ../js/ui/calendar.js:827
+#: ../js/ui/calendar.js:817
 msgid "Next week"
 msgstr "下周"
 
@@ -595,8 +592,8 @@ msgstr "密码："
 msgid "Type again:"
 msgstr "再输一次："
 
-#: ../js/ui/components/networkAgent.js:131 ../js/ui/status/network.js:240
+#: ../js/ui/components/networkAgent.js:131 ../js/ui/status/network.js:250
-#: ../js/ui/status/network.js:322 ../js/ui/status/network.js:881
+#: ../js/ui/status/network.js:327 ../js/ui/status/network.js:886
 msgid "Connect"
 msgstr "连接"
 
@@ -714,18 +711,23 @@ msgstr "静音"
 
 #. Translators: Time in 24h format */
 #: ../js/ui/components/telepathyClient.js:955
+#| msgctxt "event list time"
+#| msgid "%H∶%M"
 msgid "%H∶%M"
 msgstr "%H:%M"
 
 #. Translators: this is the word "Yesterday" followed by a
 #. time string in 24h format. i.e. "Yesterday, 14:30" */
 #: ../js/ui/components/telepathyClient.js:962
+#| msgid "<b>Yesterday</b>, <b>%H:%M</b>"
 msgid "Yesterday, %H∶%M"
 msgstr "昨天 %H:%M"
 
 #. Translators: this is the week day name followed by a time
 #. string in 24h format. i.e. "Monday, 14:30" */
 #: ../js/ui/components/telepathyClient.js:969
+#| msgctxt "event list time"
+#| msgid "%H∶%M"
 msgid "%A, %H∶%M"
 msgstr "%A %H:%M"
 
@@ -733,6 +735,8 @@ msgstr "%A %H:%M"
 #. followed by a time string in 24h format.
 #. i.e. "May 25, 14:30" */
 #: ../js/ui/components/telepathyClient.js:976
+#| msgctxt "event list time"
+#| msgid "%H∶%M"
 msgid "%B %d, %H∶%M"
 msgstr "%m月%d日，%H:%M"
 
@@ -745,6 +749,8 @@ msgstr "%Y年%m月%d日，%H:%M"
 
 #. Translators: Time in 24h format */
 #: ../js/ui/components/telepathyClient.js:991
+#| msgctxt "event list time"
+#| msgid "%l∶%M %p"
 msgid "%l∶%M %p"
 msgstr "%p %l:%M"
 
@@ -757,6 +763,8 @@ msgstr "昨天%p %l:%M"
 #. Translators: this is the week day name followed by a time
 #. string in 12h format. i.e. "Monday, 2:30 pm" */
 #: ../js/ui/components/telepathyClient.js:1005
+#| msgctxt "event list time"
+#| msgid "%l∶%M %p"
 msgid "%A, %l∶%M %p"
 msgstr "%A%p %l:%M"
 
@@ -764,6 +772,8 @@ msgstr "%A%p %l:%M"
 #. followed by a time string in 12h format.
 #. i.e. "May 25, 2:30 pm" */
 #: ../js/ui/components/telepathyClient.js:1012
+#| msgctxt "event list time"
+#| msgid "%l∶%M %p"
 msgid "%B %d, %l∶%M %p"
 msgstr "%m月%d日%p %l:%M"
 
@@ -799,13 +809,13 @@ msgstr "%s 要请您加入 %s"
 #: ../js/ui/components/telepathyClient.js:1164
 #: ../js/ui/components/telepathyClient.js:1199
 #: ../js/ui/components/telepathyClient.js:1233
-#: ../js/ui/components/telepathyClient.js:1291
+#: ../js/ui/components/telepathyClient.js:1290
 msgid "Decline"
 msgstr "拒绝"
 
 #: ../js/ui/components/telepathyClient.js:1170
 #: ../js/ui/components/telepathyClient.js:1239
-#: ../js/ui/components/telepathyClient.js:1296
+#: ../js/ui/components/telepathyClient.js:1295
 msgid "Accept"
 msgstr "接受"
 
@@ -842,118 +852,118 @@ msgstr "%s 正在向您发送 %s"
 msgid "%s would like permission to see when you are online"
 msgstr "%s 想得到授权来查看您的在线状态"
 
-#: ../js/ui/components/telepathyClient.js:1342
+#: ../js/ui/components/telepathyClient.js:1341
 msgid "Network error"
 msgstr "网络错误"
 
-#: ../js/ui/components/telepathyClient.js:1344
+#: ../js/ui/components/telepathyClient.js:1343
 msgid "Authentication failed"
 msgstr "认证失败"
 
-#: ../js/ui/components/telepathyClient.js:1346
+#: ../js/ui/components/telepathyClient.js:1345
 msgid "Encryption error"
 msgstr "加密错误"
 
-#: ../js/ui/components/telepathyClient.js:1348
+#: ../js/ui/components/telepathyClient.js:1347
 msgid "Certificate not provided"
 msgstr "未提供证书"
 
-#: ../js/ui/components/telepathyClient.js:1350
+#: ../js/ui/components/telepathyClient.js:1349
 msgid "Certificate untrusted"
 msgstr "证书不受信任"
 
-#: ../js/ui/components/telepathyClient.js:1352
+#: ../js/ui/components/telepathyClient.js:1351
 msgid "Certificate expired"
 msgstr "证书过期"
 
-#: ../js/ui/components/telepathyClient.js:1354
+#: ../js/ui/components/telepathyClient.js:1353
 msgid "Certificate not activated"
 msgstr "证书未激活"
 
-#: ../js/ui/components/telepathyClient.js:1356
+#: ../js/ui/components/telepathyClient.js:1355
 msgid "Certificate hostname mismatch"
 msgstr "证书的主机名不匹配"
 
-#: ../js/ui/components/telepathyClient.js:1358
+#: ../js/ui/components/telepathyClient.js:1357
 msgid "Certificate fingerprint mismatch"
 msgstr "证书的指纹不匹配"
 
-#: ../js/ui/components/telepathyClient.js:1360
+#: ../js/ui/components/telepathyClient.js:1359
 msgid "Certificate self-signed"
 msgstr "证书是自已签发的"
 
-#: ../js/ui/components/telepathyClient.js:1362
+#: ../js/ui/components/telepathyClient.js:1361
 msgid "Status is set to offline"
 msgstr "已将状态设为离线。"
 
-#: ../js/ui/components/telepathyClient.js:1364
+#: ../js/ui/components/telepathyClient.js:1363
 msgid "Encryption is not available"
 msgstr "加密不可用"
 
-#: ../js/ui/components/telepathyClient.js:1366
+#: ../js/ui/components/telepathyClient.js:1365
 msgid "Certificate is invalid"
 msgstr "证书无效"
 
-#: ../js/ui/components/telepathyClient.js:1368
+#: ../js/ui/components/telepathyClient.js:1367
 msgid "Connection has been refused"
 msgstr "连接被拒绝"
 
-#: ../js/ui/components/telepathyClient.js:1370
+#: ../js/ui/components/telepathyClient.js:1369
 msgid "Connection can't be established"
 msgstr "无法建立连接"
 
-#: ../js/ui/components/telepathyClient.js:1372
+#: ../js/ui/components/telepathyClient.js:1371
 msgid "Connection has been lost"
 msgstr "连接丢失"
 
-#: ../js/ui/components/telepathyClient.js:1374
+#: ../js/ui/components/telepathyClient.js:1373
 msgid "This account is already connected to the server"
 msgstr "此帐号已经连接到服务器"
 
-#: ../js/ui/components/telepathyClient.js:1376
+#: ../js/ui/components/telepathyClient.js:1375
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "连接已经被使用相同资源的新连接所替换"
 
-#: ../js/ui/components/telepathyClient.js:1378
+#: ../js/ui/components/telepathyClient.js:1377
 msgid "The account already exists on the server"
 msgstr "服务器上已经存在该账户"
 
-#: ../js/ui/components/telepathyClient.js:1380
+#: ../js/ui/components/telepathyClient.js:1379
 msgid "Server is currently too busy to handle the connection"
 msgstr "服务器太忙，暂时无法处理该连接"
 
-#: ../js/ui/components/telepathyClient.js:1382
+#: ../js/ui/components/telepathyClient.js:1381
 msgid "Certificate has been revoked"
 msgstr "证书已撤销"
 
-#: ../js/ui/components/telepathyClient.js:1384
+#: ../js/ui/components/telepathyClient.js:1383
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "证书使用了不安全的加密算法或加密很弱"
 
-#: ../js/ui/components/telepathyClient.js:1386
+#: ../js/ui/components/telepathyClient.js:1385
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr "服务器证书的长度或证书链的长度超过了加密算法库的额定限制"
 
-#: ../js/ui/components/telepathyClient.js:1388
+#: ../js/ui/components/telepathyClient.js:1387
 msgid "Internal error"
 msgstr "内部错误"
 
 #. translators: argument is the account name, like
 #. * name@jabber.org for example. */
-#: ../js/ui/components/telepathyClient.js:1398
+#: ../js/ui/components/telepathyClient.js:1397
 #, javascript-format
 msgid "Unable to connect to %s"
 msgstr "无法连接到 %s"
 
-#: ../js/ui/components/telepathyClient.js:1403
+#: ../js/ui/components/telepathyClient.js:1402
 msgid "View account"
 msgstr "查看帐户"
 
-#: ../js/ui/components/telepathyClient.js:1440
+#: ../js/ui/components/telepathyClient.js:1434
 msgid "Unknown reason"
 msgstr "未知原因"
 
@@ -969,22 +979,22 @@ msgstr "显示应用程序"
 msgid "Dash"
 msgstr "Dash"
 
-#: ../js/ui/dateMenu.js:91
+#: ../js/ui/dateMenu.js:86
 msgid "Open Calendar"
 msgstr "打开日历"
 
-#: ../js/ui/dateMenu.js:95
+#: ../js/ui/dateMenu.js:90
 msgid "Open Clocks"
 msgstr "打开时钟"
 
-#: ../js/ui/dateMenu.js:102
+#: ../js/ui/dateMenu.js:97
 msgid "Date & Time Settings"
 msgstr "日期和时间设置"
 
 #. 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:192
+#: ../js/ui/dateMenu.js:187
 msgid "%A %B %e, %Y"
 msgstr "%Y年%m月%d日%A"
 
@@ -1071,6 +1081,8 @@ msgid_plural ""
 msgstr[0] "系统将在 %d 秒后自动重启并安装更新。"
 
 #: ../js/ui/endSessionDialog.js:129
+#| msgctxt "button"
+#| msgid "Restart & Install"
 msgctxt "button"
 msgid "Restart &amp; Install"
 msgstr "重启并安装"
@@ -1122,26 +1134,25 @@ msgstr "从 extensions.gnome.org 下载并安装“%s”？"
 msgid "Keyboard"
 msgstr "键盘"
 
-#: ../js/ui/lookingGlass.js:643
+#: ../js/ui/lookingGlass.js:641
 msgid "No extensions installed"
 msgstr "未安装扩展"
 
 #. Translators: argument is an extension UUID. */
-#: ../js/ui/lookingGlass.js:697
+#: ../js/ui/lookingGlass.js:695
 #, javascript-format
 msgid "%s has not emitted any errors."
 msgstr "%s 没有传出任何错误信息。"
 
-#: ../js/ui/lookingGlass.js:703
+#: ../js/ui/lookingGlass.js:701
 msgid "Hide Errors"
 msgstr "隐藏错误"
 
-#: ../js/ui/lookingGlass.js:707 ../js/ui/lookingGlass.js:767
+#: ../js/ui/lookingGlass.js:705 ../js/ui/lookingGlass.js:765
 msgid "Show Errors"
 msgstr "显示错误"
 
-#: ../js/ui/lookingGlass.js:716 ../js/ui/status/location.js:59
+#: ../js/ui/lookingGlass.js:714
-#: ../js/ui/status/location.js:167
 msgid "Enabled"
 msgstr "已启用"
 
@@ -1149,64 +1160,64 @@ msgstr "已启用"
 #. because it's disabled by rfkill (airplane mode) */
 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:719 ../js/ui/status/location.js:164
+#: ../js/ui/lookingGlass.js:717 ../js/ui/status/network.js:560
-#: ../js/ui/status/network.js:555 ../src/gvc/gvc-mixer-control.c:1830
+#: ../src/gvc/gvc-mixer-control.c:1830
 msgid "Disabled"
 msgstr "已禁用"
 
-#: ../js/ui/lookingGlass.js:721
+#: ../js/ui/lookingGlass.js:719
 msgid "Error"
 msgstr "错误"
 
-#: ../js/ui/lookingGlass.js:723
+#: ../js/ui/lookingGlass.js:721
 msgid "Out of date"
 msgstr "过时"
 
-#: ../js/ui/lookingGlass.js:725
+#: ../js/ui/lookingGlass.js:723
 msgid "Downloading"
 msgstr "正在下载"
 
-#: ../js/ui/lookingGlass.js:749
+#: ../js/ui/lookingGlass.js:747
 msgid "View Source"
 msgstr "查看源"
 
-#: ../js/ui/lookingGlass.js:758
+#: ../js/ui/lookingGlass.js:756
 msgid "Web Page"
 msgstr "网页"
 
-#: ../js/ui/messageTray.js:1326
+#: ../js/ui/messageTray.js:1324
 msgid "Open"
 msgstr "打开"
 
-#: ../js/ui/messageTray.js:1333
+#: ../js/ui/messageTray.js:1331
 msgid "Remove"
 msgstr "移除"
 
-#: ../js/ui/messageTray.js:1630
+#: ../js/ui/messageTray.js:1628
 msgid "Notifications"
 msgstr "提示"
 
-#: ../js/ui/messageTray.js:1637
+#: ../js/ui/messageTray.js:1635
 msgid "Clear Messages"
 msgstr "清空消息"
 
-#: ../js/ui/messageTray.js:1656
+#: ../js/ui/messageTray.js:1654
 msgid "Notification Settings"
 msgstr "通知设置"
 
-#: ../js/ui/messageTray.js:1709
+#: ../js/ui/messageTray.js:1707
 msgid "Tray Menu"
 msgstr "托盘菜单"
 
-#: ../js/ui/messageTray.js:1926
+#: ../js/ui/messageTray.js:1924
 msgid "No Messages"
 msgstr "无消息"
 
-#: ../js/ui/messageTray.js:1964
+#: ../js/ui/messageTray.js:1962
 msgid "Message Tray"
 msgstr "消息托盘"
 
-#: ../js/ui/messageTray.js:2962
+#: ../js/ui/messageTray.js:2946
 msgid "System Information"
 msgstr "系统信息"
 
@@ -1221,11 +1232,11 @@ msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d 条新消息"
 
-#: ../js/ui/overview.js:84
+#: ../js/ui/overview.js:83
 msgid "Undo"
 msgstr "撤销"
 
-#: ../js/ui/overview.js:124
+#: ../js/ui/overview.js:123
 msgid "Overview"
 msgstr "概览"
 
@@ -1233,7 +1244,7 @@ msgstr "概览"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters. */
-#: ../js/ui/overview.js:250
+#: ../js/ui/overview.js:257
 msgid "Type to search…"
 msgstr "输入以搜索..."
 
@@ -1275,27 +1286,27 @@ msgid "%d new notification"
 msgid_plural "%d new notifications"
 msgstr[0] "%d 条新通知"
 
-#: ../js/ui/screenShield.js:474 ../js/ui/status/system.js:342
+#: ../js/ui/screenShield.js:473 ../js/ui/status/system.js:342
 msgid "Lock"
 msgstr "锁定"
 
-#: ../js/ui/screenShield.js:708
+#: ../js/ui/screenShield.js:707
 msgid "GNOME needs to lock the screen"
 msgstr "GNOME 需要锁定屏幕"
 
-#: ../js/ui/screenShield.js:835 ../js/ui/screenShield.js:1309
+#: ../js/ui/screenShield.js:834 ../js/ui/screenShield.js:1301
 msgid "Unable to lock"
 msgstr "无法锁定"
 
-#: ../js/ui/screenShield.js:836 ../js/ui/screenShield.js:1310
+#: ../js/ui/screenShield.js:835 ../js/ui/screenShield.js:1302
 msgid "Lock was blocked by an application"
 msgstr "一个应用程序阻止了锁定"
 
-#: ../js/ui/search.js:603
+#: ../js/ui/search.js:589
 msgid "Searching…"
 msgstr "正在搜索..."
 
-#: ../js/ui/search.js:649
+#: ../js/ui/search.js:632
 msgid "No results."
 msgstr "无结果。"
 
@@ -1367,28 +1378,29 @@ msgstr "高对比度"
 msgid "Large Text"
 msgstr "大号文本"
 
-#: ../js/ui/status/bluetooth.js:49
+#: ../js/ui/status/bluetooth.js:48
 msgid "Bluetooth"
 msgstr "蓝牙"
 
-#: ../js/ui/status/bluetooth.js:51 ../js/ui/status/network.js:151
+#: ../js/ui/status/bluetooth.js:50 ../js/ui/status/location.js:62
-#: ../js/ui/status/network.js:323 ../js/ui/status/network.js:1234
+#: ../js/ui/status/location.js:162 ../js/ui/status/network.js:151
-#: ../js/ui/status/network.js:1345 ../js/ui/status/rfkill.js:85
+#: ../js/ui/status/network.js:328 ../js/ui/status/network.js:1235
+#: ../js/ui/status/network.js:1346 ../js/ui/status/rfkill.js:85
 #: ../js/ui/status/rfkill.js:105
 msgid "Turn Off"
 msgstr "关闭"
 
-#: ../js/ui/status/bluetooth.js:54
+#: ../js/ui/status/bluetooth.js:53
 msgid "Bluetooth Settings"
 msgstr "蓝牙设置"
 
-#: ../js/ui/status/bluetooth.js:104
+#: ../js/ui/status/bluetooth.js:100
 #, javascript-format
 msgid "%d Connected Device"
 msgid_plural "%d Connected Devices"
 msgstr[0] "已连接 %d 台设备"
 
-#: ../js/ui/status/bluetooth.js:106 ../js/ui/status/network.js:1262
+#: ../js/ui/status/bluetooth.js:102 ../js/ui/status/network.js:1263
 msgid "Not Connected"
 msgstr "无连接"
 
@@ -1400,167 +1412,164 @@ msgstr "亮度"
 msgid "Show Keyboard Layout"
 msgstr "显示键盘布局"
 
-#: ../js/ui/status/location.js:53
+#: ../js/ui/status/location.js:52
+#| msgid "Notifications"
 msgid "Location"
 msgstr "位置"
 
-#: ../js/ui/status/location.js:60 ../js/ui/status/location.js:168
+#: ../js/ui/status/location.js:61 ../js/ui/status/location.js:161
-msgid "Disable"
+#: ../js/ui/status/rfkill.js:84
-msgstr "禁用"
+msgid "On"
+msgstr "开"
 
-#: ../js/ui/status/location.js:165
+#: ../js/ui/status/location.js:158 ../js/ui/status/network.js:246
-msgid "Enable"
+#: ../js/ui/status/network.js:425 ../js/ui/status/network.js:1261
-msgstr "启用"
+msgid "Off"
+msgstr "关"
 
-#: ../js/ui/status/location.js:167
+#: ../js/ui/status/location.js:159 ../js/ui/status/network.js:1235
-msgid "In Use"
+msgid "Turn On"
-msgstr "已使用"
+msgstr "开启"
 
 #: ../js/ui/status/network.js:74
 msgid "<unknown>"
 msgstr "<未知>"
 
-#: ../js/ui/status/network.js:420 ../js/ui/status/network.js:1260
-#: ../js/ui/status/network.js:1464
-msgid "Off"
-msgstr "关"
-
-#: ../js/ui/status/network.js:422
-msgid "Connected"
-msgstr "已连接"
-
 #. 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:426
+#: ../js/ui/status/network.js:431
 msgid "unmanaged"
 msgstr "未托管"
 
-#: ../js/ui/status/network.js:428
+#: ../js/ui/status/network.js:433
 msgid "disconnecting..."
 msgstr "正在断开..."
 
-#: ../js/ui/status/network.js:434 ../js/ui/status/network.js:1362
+#: ../js/ui/status/network.js:439 ../js/ui/status/network.js:1363
 msgid "connecting..."
 msgstr "正在连接..."
 
 #. Translators: this is for network connections that require some kind of key or password */
-#: ../js/ui/status/network.js:437 ../js/ui/status/network.js:1365
+#: ../js/ui/status/network.js:442 ../js/ui/status/network.js:1366
 msgid "authentication required"
 msgstr "需要认证"
 
 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing */
-#: ../js/ui/status/network.js:445
+#: ../js/ui/status/network.js:450
 msgid "firmware missing"
 msgstr "固件缺失"
 
 #. 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:449
+#: ../js/ui/status/network.js:454
 msgid "unavailable"
 msgstr "不可用"
 
-#: ../js/ui/status/network.js:451 ../js/ui/status/network.js:1367
+#: ../js/ui/status/network.js:456 ../js/ui/status/network.js:1368
 msgid "connection failed"
 msgstr "连接失败"
 
-#: ../js/ui/status/network.js:467
+#: ../js/ui/status/network.js:472
+#| msgid "Wi-Fi Settings"
 msgid "Wired Settings"
 msgstr "有线设置"
 
-#: ../js/ui/status/network.js:509 ../js/ui/status/network.js:587
+#: ../js/ui/status/network.js:514 ../js/ui/status/network.js:592
 msgid "Mobile Broadband Settings"
 msgstr "移动宽带设置"
 
-#: ../js/ui/status/network.js:551 ../js/ui/status/network.js:1258
+#: ../js/ui/status/network.js:556 ../js/ui/status/network.js:1259
 msgid "Hardware Disabled"
 msgstr "已通过硬件禁用"
 
-#: ../js/ui/status/network.js:595
+#: ../js/ui/status/network.js:600
 msgid "Use as Internet connection"
 msgstr "使用互联网连接"
 
-#: ../js/ui/status/network.js:776
+#: ../js/ui/status/network.js:781
+#| msgid "Airplane Mode"
 msgid "Airplane Mode is On"
 msgstr "已开启乘机模式"
 
-#: ../js/ui/status/network.js:777
+#: ../js/ui/status/network.js:782
 msgid "Wi-Fi is disabled when airplane mode is on."
 msgstr "启用乘机模式时 Wi-Fi 会关闭"
 
-#: ../js/ui/status/network.js:778
+#: ../js/ui/status/network.js:783
+#| msgid "Airplane Mode"
 msgid "Turn Off Airplane Mode"
 msgstr "关闭乘机模式"
 
-#: ../js/ui/status/network.js:787
+#: ../js/ui/status/network.js:792
+#| msgid "Wi-Fi Settings"
 msgid "Wi-Fi is Off"
 msgstr "Wi-Fi 关闭"
 
-#: ../js/ui/status/network.js:788
+#: ../js/ui/status/network.js:793
 msgid "Wi-Fi needs to be turned on in order to connect to a network."
 msgstr "连接网络需要开启 Wi-Fi"
 
-#: ../js/ui/status/network.js:789
+#: ../js/ui/status/network.js:794
+#| msgid "Turn On"
 msgid "Turn On Wi-Fi"
 msgstr "开启 Wi-Fi"
 
-#: ../js/ui/status/network.js:814
+#: ../js/ui/status/network.js:819
 msgid "Wi-Fi Networks"
 msgstr "Wi-Fi 网络"
 
-#: ../js/ui/status/network.js:816
+#: ../js/ui/status/network.js:821
 msgid "Select a network"
 msgstr "选择网络"
 
-#: ../js/ui/status/network.js:845
+#: ../js/ui/status/network.js:850
 msgid "No Networks"
 msgstr "无网络"
 
-#: ../js/ui/status/network.js:866 ../js/ui/status/rfkill.js:103
+#: ../js/ui/status/network.js:871 ../js/ui/status/rfkill.js:103
 msgid "Use hardware switch to turn off"
 msgstr "使用硬件开关关闭"
 
-#: ../js/ui/status/network.js:1136
+#: ../js/ui/status/network.js:1141
 msgid "Select Network"
 msgstr "选择网络"
 
-#: ../js/ui/status/network.js:1142
+#: ../js/ui/status/network.js:1147
 msgid "Wi-Fi Settings"
 msgstr "Wi-Fi 设置"
 
-#: ../js/ui/status/network.js:1234
+#: ../js/ui/status/network.js:1252
-msgid "Turn On"
-msgstr "开启"
-
-#: ../js/ui/status/network.js:1251
 msgid "Hotspot Active"
 msgstr "热点已激活"
 
-#: ../js/ui/status/network.js:1254
+#: ../js/ui/status/network.js:1255
+#| msgid "Connection"
 msgid "Connecting"
 msgstr "正在连接"
 
-#: ../js/ui/status/network.js:1433 ../js/ui/status/rfkill.js:88
+#: ../js/ui/status/network.js:1434 ../js/ui/status/rfkill.js:88
 msgid "Network Settings"
 msgstr "网络设置"
 
-#: ../js/ui/status/network.js:1435
+#: ../js/ui/status/network.js:1436
+#| msgid "Settings"
 msgid "VPN Settings"
 msgstr "VPN 设置"
 
-#: ../js/ui/status/network.js:1454
+#: ../js/ui/status/network.js:1455
 msgid "VPN"
 msgstr "VPN"
 
-#: ../js/ui/status/network.js:1607
+#: ../js/ui/status/network.js:1598
 msgid "Network Manager"
 msgstr "网络管理器"
 
-#: ../js/ui/status/network.js:1646
+#: ../js/ui/status/network.js:1637
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: ../js/ui/status/network.js:1647
+#: ../js/ui/status/network.js:1638
 msgid "Activation of network connection failed"
 msgstr "启用网络连接失败"
 
@@ -1598,10 +1607,6 @@ msgstr "电池"
 msgid "Airplane Mode"
 msgstr "乘机模式"
 
-#: ../js/ui/status/rfkill.js:84
-msgid "On"
-msgstr "开"
-
 #: ../js/ui/status/system.js:314
 msgid "Switch User"
 msgstr "切换用户"

src/gnome-shell-extension-prefs.c

@@ -50,18 +50,3 @@ main (int argc, char *argv[])
 
   return 0;
 }
-
-
-/* HACK:
-   Add a dummy function that calls into libgnome-shell-js.so to ensure it's
-   linked to /usr/bin/gnome-shell-extension-prefs even when linking with
-   --as-needed. This function is never actually called.
-   https://bugzilla.gnome.org/show_bug.cgi?id=670477
-*/
-void _shell_link_to_shell_js (void);
-
-void
-_shell_link_to_shell_js (void)
-{
-  shell_js_add_extension_importer (NULL, NULL, NULL, NULL);
-}

src/shell-app-system.c

@@ -96,32 +96,6 @@ scan_startup_wm_class_to_id (ShellAppSystem *self)
   g_list_free_full (apps, g_object_unref);
 }
 
-static gboolean
-app_is_stale (ShellApp *app)
-{
-  GDesktopAppInfo *info;
-  gboolean is_stale;
-
-  if (shell_app_is_window_backed (app))
-    return FALSE;
-
-  info = g_desktop_app_info_new (shell_app_get_id (app));
-  is_stale = (info == NULL);
-
-  if (info)
-    g_object_unref (info);
-
-  return is_stale;
-}
-
-static gboolean
-stale_app_remove_func (gpointer key,
-                       gpointer value,
-                       gpointer user_data)
-{
-  return app_is_stale (value);
-}
-
 static void
 installed_changed (GAppInfoMonitor *monitor,
                    gpointer         user_data)
@@ -130,8 +104,6 @@ installed_changed (GAppInfoMonitor *monitor,
 
   scan_startup_wm_class_to_id (self);
 
-  g_hash_table_foreach_remove (self->priv->id_to_app, stale_app_remove_func, NULL);
-
   g_signal_emit (self, signals[INSTALLED_CHANGED], 0, NULL);
 }
 

src/shell-global.c

@@ -748,9 +748,7 @@ global_stage_after_paint (gpointer data)
 
 
 static void
-update_scale_factor (GtkSettings *settings,
+update_scale_factor (GdkScreen *screen, gpointer data)
-                     GParamSpec *pspec,
-                     gpointer data)
 {
   ShellGlobal *global = SHELL_GLOBAL (data);
   ClutterStage *stage = CLUTTER_STAGE (global->stage);
@@ -760,10 +758,6 @@ update_scale_factor (GtkSettings *settings,
   g_value_init (&value, G_TYPE_INT);
   if (gdk_screen_get_setting (global->gdk_screen, "gdk-window-scaling-factor", &value))
     g_object_set (context, "scale-factor", g_value_get_int (&value), NULL);
-
-  /* Make sure clutter and gdk scaling stays disabled */
-  g_object_set (clutter_settings_get_default (), "window-scaling-factor", 1, NULL);
-  gdk_x11_display_set_window_scale (gdk_display_get_default (), 1);
 }
 
 /* This is an IBus workaround. The flow of events with IBus is that every time
@@ -944,18 +938,19 @@ _shell_global_set_plugin (ShellGlobal *global,
   g_signal_connect (global->meta_display, "notify::focus-window",
                     G_CALLBACK (focus_window_changed), global);
 
-  /* gdk-window-scaling-factor is not exported to gtk-settings
+  /*
-   * because it is handled inside gdk, so we use gtk-xft-dpi instead
+   * We connect to GdkScreen's monitors-changed here to avoid
-   * which also changes when the scale factor changes.
+   * a race condition. GdkScreen's monitors-changed signal is
+   * emitted *after* the xsetting has been updated.
    */
-  g_signal_connect (gtk_settings_get_default (), "notify::gtk-xft-dpi",
+  g_signal_connect (global->gdk_screen, "monitors-changed",
                     G_CALLBACK (update_scale_factor), global);
 
   gdk_event_handler_set (gnome_shell_gdk_event_handler, global, NULL);
 
   global->focus_manager = st_focus_manager_get_for_stage (global->stage);
 
-  update_scale_factor (gtk_settings_get_default (), NULL, global);
+  update_scale_factor (global->gdk_screen, global);
 }
 
 GjsContext *

src/shell-glsl-quad.c

@@ -24,6 +24,7 @@ G_DEFINE_TYPE (ShellGLSLQuad, shell_glsl_quad, CLUTTER_TYPE_ACTOR);
 struct _ShellGLSLQuadPrivate
 {
   CoglPipeline  *pipeline;
+  CoglTexture2D *texture;
 };
 
 static void
@@ -39,10 +40,9 @@ shell_glsl_quad_paint (ClutterActor *actor)
   paint_opacity = clutter_actor_get_paint_opacity (actor);
   clutter_actor_get_allocation_box (actor, &box);
 
+  /* semi-transparent black */
   cogl_pipeline_set_color4ub (priv->pipeline,
-                              paint_opacity,
+                              0, 0, 0,
-                              paint_opacity,
-                              paint_opacity,
                               paint_opacity);
   cogl_framebuffer_draw_rectangle (cogl_get_draw_framebuffer (),
                                    priv->pipeline,
@@ -105,6 +105,7 @@ shell_glsl_quad_dispose (GObject *gobject)
   priv = self->priv;
 
   g_clear_pointer (&priv->pipeline, cogl_object_unref);
+  g_clear_pointer (&priv->texture, cogl_object_unref);
 
   G_OBJECT_CLASS (shell_glsl_quad_parent_class)->dispose (gobject);
 }
@@ -122,6 +123,7 @@ shell_glsl_quad_constructed (GObject *object)
   ShellGLSLQuadClass *klass;
   CoglContext *ctx =
     clutter_backend_get_cogl_context (clutter_get_default_backend ());
+  static const uint8_t tex_data[] = { 0, 0, 0, 0 };
 
   G_OBJECT_CLASS (shell_glsl_quad_parent_class)->constructed (object);
 
@@ -142,7 +144,11 @@ shell_glsl_quad_constructed (GObject *object)
 
   self->priv->pipeline = cogl_pipeline_copy (klass->base_pipeline);
 
-  cogl_pipeline_set_layer_null_texture (self->priv->pipeline, 0, COGL_TEXTURE_TYPE_2D);
+  self->priv->texture = cogl_texture_2d_new_from_data (ctx, 1, 1,
+                                                       COGL_PIXEL_FORMAT_RGBA_8888,
+                                                       0, tex_data, NULL);
+  cogl_pipeline_set_layer_texture (self->priv->pipeline, 0,
+                                   COGL_TEXTURE (self->priv->texture));
 }
 
 static void
@@ -158,38 +164,3 @@ shell_glsl_quad_class_init (ShellGLSLQuadClass *klass)
 
   g_type_class_add_private (klass, sizeof (ShellGLSLQuadPrivate));
 }
-
-/**
- * shell_glsl_quad_get_uniform_location:
- * @quad: a #ShellGLSLQuad
- * @name: the uniform name
- *
- * Returns: the location of the uniform named @name, that can be
- *          passed to shell_glsl_quad_set_uniform_float().
- */
-int
-shell_glsl_quad_get_uniform_location (ShellGLSLQuad *quad,
-                                      const char    *name)
-{
-  return cogl_pipeline_get_uniform_location (quad->priv->pipeline, name);
-}
-
-/**
- * shell_glsl_quad_set_uniform_float:
- * @quad: a #ShellGLSLQuad
- * @uniform: the uniform location (as returned by shell_glsl_quad_get_uniform_location())
- * @n_components: the number of components in the uniform (eg. 3 for a vec3)
- * @total_count: the total number of floats in @value
- * @value: (array length=total_count): the array of floats to set @uniform
- */
-void
-shell_glsl_quad_set_uniform_float (ShellGLSLQuad *quad,
-                                   int            uniform,
-                                   int            n_components,
-                                   int            total_count,
-                                   const float   *value)
-{
-  cogl_pipeline_set_uniform_float (quad->priv->pipeline, uniform,
-                                   n_components, total_count / n_components,
-                                   value);
-}

src/shell-glsl-quad.h

@@ -61,12 +61,4 @@ void shell_glsl_quad_add_glsl_snippet (ShellGLSLQuad    *quad,
                                        const char       *code,
                                        gboolean          is_replace);
 
-int  shell_glsl_quad_get_uniform_location (ShellGLSLQuad *quad,
-                                           const char    *name);
-void shell_glsl_quad_set_uniform_float    (ShellGLSLQuad *quad,
-                                           int            uniform,
-                                           int            n_components,
-                                           int            total_count,
-                                           const float   *value);
-
 #endif /* __SHELL_GLSL_QUAD_H__ */

src/shell-util.c

@@ -313,6 +313,33 @@ shell_util_create_pixbuf_from_data (const guchar      *data,
                                    (GdkPixbufDestroyNotify) g_free, NULL);
 }
 
+/**
+ * shell_util_wake_up_screen:
+ *
+ * Send a fake key event, resetting the IDLETIME counter and
+ * causing gnome-settings-daemon to wake up the screen.
+ */
+/* Shamelessly taken from gnome-settings-daemon/plugins/power/gpm-common.c */
+void
+shell_util_wake_up_screen (void)
+{
+  static gboolean inited = FALSE;
+  static KeyCode keycode1, keycode2;
+  static gboolean first_keycode = FALSE;
+
+  if (inited == FALSE) {
+    keycode1 = XKeysymToKeycode (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), GDK_KEY_Alt_L);
+    keycode2 = XKeysymToKeycode (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), GDK_KEY_Alt_R);
+  }
+
+  gdk_error_trap_push ();
+  /* send a left or right alt key; first press, then release */
+  XTestFakeKeyEvent (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), first_keycode ? keycode1 : keycode2, True, CurrentTime);
+  XTestFakeKeyEvent (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), first_keycode ? keycode1 : keycode2, False, CurrentTime);
+  first_keycode = !first_keycode;
+  gdk_error_trap_pop_ignored ();
+}
+
 void
 shell_util_cursor_tracker_to_clutter (MetaCursorTracker *tracker,
                                       ClutterTexture    *texture)

src/shell-util.h

@@ -41,6 +41,8 @@ GdkPixbuf *shell_util_create_pixbuf_from_data (const guchar      *data,
                                                int                height,
                                                int                rowstride);
 
+void    shell_util_wake_up_screen             (void);
+
 void    shell_util_cursor_tracker_to_clutter (MetaCursorTracker *tracker,
                                               ClutterTexture    *texture);
 

src/st/st-border-image.c

@@ -32,8 +32,6 @@ struct _StBorderImage {
   int border_right;
   int border_bottom;
   int border_left;
-
-  int scale_factor;
 };
 
 struct _StBorderImageClass {
@@ -71,8 +69,7 @@ st_border_image_new (const char *filename,
                        int         border_top,
                        int         border_right,
                        int         border_bottom,
-                       int         border_left,
+                       int         border_left)
-                       int         scale_factor)
 {
   StBorderImage *image;
 
@@ -83,7 +80,6 @@ st_border_image_new (const char *filename,
   image->border_right = border_right;
   image->border_bottom = border_bottom;
   image->border_left = border_left;
-  image->scale_factor = scale_factor;
 
   return image;
 }
@@ -106,13 +102,13 @@ st_border_image_get_borders (StBorderImage *image,
   g_return_if_fail (ST_IS_BORDER_IMAGE (image));
 
   if (border_top)
-    *border_top = image->border_top * image->scale_factor;
+    *border_top = image->border_top;
   if (border_right)
-    *border_right = image->border_right * image->scale_factor;
+    *border_right = image->border_right;
   if (border_bottom)
-    *border_bottom = image->border_bottom * image->scale_factor;
+    *border_bottom = image->border_bottom;
   if (border_left)
-    *border_left = image->border_left * image->scale_factor;
+    *border_left = image->border_left;
 }
 
 /**

src/st/st-border-image.h

@@ -43,8 +43,7 @@ StBorderImage *st_border_image_new (const char *filename,
                                     int         border_top,
                                     int         border_right,
                                     int         border_bottom,
-                                    int         border_left,
+                                    int         border_left);
-                                    int         scale_factor);
 
 const char *st_border_image_get_filename (StBorderImage *image);
 void        st_border_image_get_borders  (StBorderImage *image,

src/st/st-focus-manager.c

@@ -250,11 +250,9 @@ gboolean
 st_focus_manager_navigate_from_event (StFocusManager *manager,
                                       ClutterEvent   *event)
 {
-  ClutterActor *stage;
-
   if (event->type != CLUTTER_KEY_PRESS)
     return FALSE;
 
-  stage = CLUTTER_ACTOR (event->key.stage);
+  ClutterActor *stage = CLUTTER_ACTOR (event->key.stage);
   return st_focus_manager_stage_event (stage, event, manager);
 }

src/st/st-texture-cache.c

@@ -178,7 +178,7 @@ st_texture_cache_finalize (GObject *object)
   G_OBJECT_CLASS (st_texture_cache_parent_class)->finalize (object);
 }
 
-static void
+static gboolean
 compute_pixbuf_scale (gint      width,
                       gint      height,
                       gint      available_width,
@@ -189,10 +189,7 @@ compute_pixbuf_scale (gint      width,
   int scaled_width, scaled_height;
 
   if (width == 0 || height == 0)
-    {
+    return FALSE;
-      *new_width = *new_height = 0;
-      return;
-    }
 
   if (available_width >= 0 && available_height >= 0)
     {
@@ -228,12 +225,9 @@ compute_pixbuf_scale (gint      width,
     {
       *new_width = scaled_width;
       *new_height = scaled_height;
+      return TRUE;
     }
-  else
+  return FALSE;
-    {
-      *new_width = width;
-      *new_height = height;
-    }
 }
 
 static void
@@ -246,11 +240,10 @@ rgba_from_clutter (GdkRGBA      *rgba,
   rgba->alpha = color->alpha / 255.;
 }
 
-/* A private structure for keeping width, height and scale. */
+/* A private structure for keeping width and height. */
 typedef struct {
   int width;
   int height;
-  int scale;
 } Dimensions;
 
 /* This struct corresponds to a request for an texture.
@@ -265,7 +258,6 @@ typedef struct {
 
   guint width;
   guint height;
-  guint scale;
   GSList *textures;
 
   GtkIconInfo *icon_info;
@@ -319,16 +311,12 @@ on_image_size_prepared (GdkPixbufLoader *pixbuf_loader,
   Dimensions *available_dimensions = data;
   int available_width = available_dimensions->width;
   int available_height = available_dimensions->height;
-  int scale_factor = available_dimensions->scale;
   int scaled_width;
   int scaled_height;
 
-  compute_pixbuf_scale (width, height, available_width, available_height,
+  if (compute_pixbuf_scale (width, height, available_width, available_height,
-                        &scaled_width, &scaled_height);
+                            &scaled_width, &scaled_height))
-
+    gdk_pixbuf_loader_set_size (pixbuf_loader, scaled_width, scaled_height);
-  gdk_pixbuf_loader_set_size (pixbuf_loader,
-                              scaled_width * scale_factor,
-                              scaled_height * scale_factor);
 }
 
 static GdkPixbuf *
@@ -336,7 +324,6 @@ impl_load_pixbuf_data (const guchar   *data,
                        gsize           size,
                        int             available_width,
                        int             available_height,
-                       int             scale,
                        GError        **error)
 {
   GdkPixbufLoader *pixbuf_loader = NULL;
@@ -350,7 +337,6 @@ impl_load_pixbuf_data (const guchar   *data,
 
   available_dimensions.width = available_width;
   available_dimensions.height = available_height;
-  available_dimensions.scale = scale;
   g_signal_connect (pixbuf_loader, "size-prepared",
                     G_CALLBACK (on_image_size_prepared), &available_dimensions);
 
@@ -384,7 +370,6 @@ impl_load_pixbuf_data (const guchar   *data,
       /* We know that the image will later be rotated, so we reverse the available dimensions. */
       available_dimensions.width = available_height;
       available_dimensions.height = available_width;
-      available_dimensions.scale = scale;
       g_signal_connect (pixbuf_loader, "size-prepared",
                         G_CALLBACK (on_image_size_prepared), &available_dimensions);
 
@@ -472,7 +457,6 @@ static GdkPixbuf *
 impl_load_pixbuf_file (const char     *uri,
                        int             available_width,
                        int             available_height,
-                       int             scale,
                        GError        **error)
 {
   GdkPixbuf *pixbuf = NULL;
@@ -488,7 +472,6 @@ impl_load_pixbuf_file (const char     *uri,
     {
       pixbuf = impl_load_pixbuf_data ((const guchar *) contents, size,
                                       available_width, available_height,
-                                      scale,
                                       error);
     }
 
@@ -511,7 +494,7 @@ load_pixbuf_thread (GSimpleAsyncResult *result,
   g_assert (data != NULL);
   g_assert (data->uri != NULL);
 
-  pixbuf = impl_load_pixbuf_file (data->uri, data->width, data->height, data->scale, &error);
+  pixbuf = impl_load_pixbuf_file (data->uri, data->width, data->height, &error);
 
   if (error != NULL)
     {
@@ -544,7 +527,6 @@ data_to_cogl_handle (const guchar *data,
   CoglHandle texture, offscreen;
   CoglColor clear_color;
   guint size;
-  GError *error;
 
   size = MAX (width, height);
 
@@ -561,26 +543,7 @@ data_to_cogl_handle (const guchar *data,
                                         COGL_TEXTURE_NO_SLICING,
                                         COGL_PIXEL_FORMAT_ANY);
 
-  offscreen = cogl_offscreen_new_with_texture (texture);
+  offscreen = cogl_offscreen_new_to_texture (texture);
-
-  error = NULL;
-  if (!cogl_framebuffer_allocate (offscreen, &error))
-    {
-      g_warning ("Failed to allocate FBO (sized %d): %s", size, error->message);
-
-      cogl_object_unref (texture);
-      cogl_object_unref (offscreen);
-      g_clear_error (&error);
-
-      return cogl_texture_new_from_data (width,
-                                         height,
-                                         COGL_TEXTURE_NONE,
-                                         has_alpha ? COGL_PIXEL_FORMAT_RGBA_8888 : COGL_PIXEL_FORMAT_RGB_888,
-                                         COGL_PIXEL_FORMAT_ANY,
-                                         rowstride,
-                                         data);
-  }
-
   cogl_color_set_from_4ub (&clear_color, 0, 0, 0, 0);
   cogl_push_framebuffer (offscreen);
   cogl_clear (&clear_color, COGL_BUFFER_BIT_COLOR);
@@ -1007,8 +970,7 @@ load_gicon_with_colors (StTextureCache    *cache,
       request->policy = policy;
       request->colors = colors ? st_icon_colors_ref (colors) : NULL;
       request->icon_info = info;
-      request->width = request->height = size;
+      request->width = request->height = size * scale;
-      request->scale = scale;
       request->enforced_square = TRUE;
 
       load_texture_async (cache, request);
@@ -1111,7 +1073,6 @@ ensure_monitor_for_uri (StTextureCache *cache,
 typedef struct {
   gchar *path;
   gint   grid_width, grid_height;
-  gint   scale_factor;
   ClutterActor *actor;
   GFunc load_callback;
   gpointer load_callback_data;
@@ -1161,18 +1122,6 @@ free_glist_unref_gobjects (gpointer p)
   g_list_free (list);
 }
 
-static void
-on_loader_size_prepared (GdkPixbufLoader *loader,
-                         gint width,
-                         gint height,
-                         gpointer user_data)
-{
-  AsyncImageData *data = user_data;
-  gdk_pixbuf_loader_set_size (loader,
-                              width * data->scale_factor,
-                              height * data->scale_factor);
-}
-
 static void
 load_sliced_image (GSimpleAsyncResult *result,
                    GObject *object,
@@ -1182,47 +1131,29 @@ load_sliced_image (GSimpleAsyncResult *result,
   GList *res = NULL;
   GdkPixbuf *pix;
   gint width, height, y, x;
-  GdkPixbufLoader *loader;
-  gchar *buffer = NULL;
-  gsize length;
 
   g_assert (!cancellable);
 
   data = g_object_get_data (G_OBJECT (result), "load_sliced_image");
   g_assert (data);
 
-  loader = gdk_pixbuf_loader_new ();
+  if (!(pix = gdk_pixbuf_new_from_file (data->path, NULL)))
-  g_signal_connect (loader, "size-prepared", G_CALLBACK (on_loader_size_prepared), data);
+    return;
 
-  if (!g_file_get_contents (data->path, &buffer, &length, NULL))
-    goto out;
-
-  if (!gdk_pixbuf_loader_write (loader, buffer, length, NULL))
-    goto out;
-
-  if (!gdk_pixbuf_loader_close (loader, NULL))
-    goto out;
-
-  pix = gdk_pixbuf_loader_get_pixbuf (loader);
   width = gdk_pixbuf_get_width (pix);
   height = gdk_pixbuf_get_height (pix);
-  for (y = 0; y < height; y += data->grid_height * data->scale_factor)
+  for (y = 0; y < height; y += data->grid_height)
     {
-      for (x = 0; x < width; x += data->grid_width * data->scale_factor)
+      for (x = 0; x < width; x += data->grid_width)
         {
-          GdkPixbuf *pixbuf = gdk_pixbuf_new_subpixbuf (pix, x, y,
+          GdkPixbuf *pixbuf = gdk_pixbuf_new_subpixbuf (pix, x, y, data->grid_width, data->grid_height);
-                                                        data->grid_width * data->scale_factor,
-                                                        data->grid_height * data->scale_factor);
           g_assert (pixbuf != NULL);
           res = g_list_append (res, pixbuf);
         }
     }
-
+  /* We don't need the original pixbuf anymore, though the subpixbufs
- out:
+     will hold a reference. */
-  /* We don't need the original pixbuf anymore, which is owned by the loader,
+  g_object_unref (pix);
-   * though the subpixbufs will hold a reference. */
-  g_object_unref (loader);
-  g_free (buffer);
   g_simple_async_result_set_op_res_gpointer (result, res, free_glist_unref_gobjects);
 }
 
@@ -1232,7 +1163,6 @@ load_sliced_image (GSimpleAsyncResult *result,
  * @path: Path to a filename
  * @grid_width: Width in pixels
  * @grid_height: Height in pixels
- * @scale: Scale factor of the display
  * @load_callback: (scope async) (allow-none): Function called when the image is loaded, or %NULL
  * @user_data: Data to pass to the load callback
  *
@@ -1248,7 +1178,6 @@ st_texture_cache_load_sliced_image (StTextureCache *cache,
                                     const gchar    *path,
                                     gint            grid_width,
                                     gint            grid_height,
-                                    gint            scale,
                                     GFunc           load_callback,
                                     gpointer        user_data)
 {
@@ -1259,7 +1188,6 @@ st_texture_cache_load_sliced_image (StTextureCache *cache,
   data = g_new0 (AsyncImageData, 1);
   data->grid_width = grid_width;
   data->grid_height = grid_height;
-  data->scale_factor = scale;
   data->path = g_strdup (path);
   data->actor = actor;
   data->load_callback = load_callback;
@@ -1282,7 +1210,6 @@ st_texture_cache_load_sliced_image (StTextureCache *cache,
  * @uri: uri of the image file from which to create a pixbuf
  * @available_width: available width for the image, can be -1 if not limited
  * @available_height: available height for the image, can be -1 if not limited
- * @scale: scale factor of the display
  *
  * Asynchronously load an image.   Initially, the returned texture will have a natural
  * size of zero.  At some later point, either the image will be loaded successfully
@@ -1294,8 +1221,7 @@ ClutterActor *
 st_texture_cache_load_uri_async (StTextureCache *cache,
                                  const gchar    *uri,
                                  int             available_width,
-                                 int             available_height,
+                                 int             available_height)
-                                 int             scale)
 {
   ClutterActor *texture;
   AsyncTextureLoadData *request;
@@ -1324,7 +1250,6 @@ st_texture_cache_load_uri_async (StTextureCache *cache,
       request->policy = policy;
       request->width = available_width;
       request->height = available_height;
-      request->scale = scale;
 
       load_texture_async (cache, request);
     }
@@ -1340,7 +1265,6 @@ st_texture_cache_load_uri_sync_to_cogl_texture (StTextureCache *cache,
                                                 const gchar    *uri,
                                                 int             available_width,
                                                 int             available_height,
-                                                int             scale,
                                                 GError         **error)
 {
   CoglHandle texdata;
@@ -1353,7 +1277,7 @@ st_texture_cache_load_uri_sync_to_cogl_texture (StTextureCache *cache,
 
   if (texdata == NULL)
     {
-      pixbuf = impl_load_pixbuf_file (uri, available_width, available_height, scale, error);
+      pixbuf = impl_load_pixbuf_file (uri, available_width, available_height, error);
       if (!pixbuf)
         goto out;
 
@@ -1382,7 +1306,6 @@ st_texture_cache_load_uri_sync_to_cairo_surface (StTextureCache        *cache,
                                                  const gchar           *uri,
                                                  int                    available_width,
                                                  int                    available_height,
-                                                 int                    scale,
                                                  GError               **error)
 {
   cairo_surface_t *surface;
@@ -1395,7 +1318,7 @@ st_texture_cache_load_uri_sync_to_cairo_surface (StTextureCache        *cache,
 
   if (surface == NULL)
     {
-      pixbuf = impl_load_pixbuf_file (uri, available_width, available_height, scale, error);
+      pixbuf = impl_load_pixbuf_file (uri, available_width, available_height, error);
       if (!pixbuf)
         goto out;
 
@@ -1422,7 +1345,6 @@ out:
  * st_texture_cache_load_file_to_cogl_texture:
  * @cache: A #StTextureCache
  * @file_path: Path to a file in supported image format
- * @scale: Scale factor of the display
  *
  * This function synchronously loads the given file path
  * into a COGL texture.  On error, a warning is emitted
@@ -1432,8 +1354,7 @@ out:
  */
 CoglHandle
 st_texture_cache_load_file_to_cogl_texture (StTextureCache *cache,
-                                            const gchar    *file_path,
+                                            const gchar    *file_path)
-                                            gint            scale)
 {
   CoglHandle texture;
   GFile *file;
@@ -1444,7 +1365,7 @@ st_texture_cache_load_file_to_cogl_texture (StTextureCache *cache,
   uri = g_file_get_uri (file);
 
   texture = st_texture_cache_load_uri_sync_to_cogl_texture (cache, ST_TEXTURE_CACHE_POLICY_FOREVER,
-                                                            uri, -1, -1, scale, &error);
+                                                            uri, -1, -1, &error);
   g_object_unref (file);
   g_free (uri);
 
@@ -1461,7 +1382,6 @@ st_texture_cache_load_file_to_cogl_texture (StTextureCache *cache,
  * st_texture_cache_load_file_to_cairo_surface:
  * @cache: A #StTextureCache
  * @file_path: Path to a file in supported image format
- * @scale: Scale factor of the display
  *
  * This function synchronously loads the given file path
  * into a cairo surface.  On error, a warning is emitted
@@ -1471,8 +1391,7 @@ st_texture_cache_load_file_to_cogl_texture (StTextureCache *cache,
  */
 cairo_surface_t *
 st_texture_cache_load_file_to_cairo_surface (StTextureCache *cache,
-                                             const gchar    *file_path,
+                                             const gchar    *file_path)
-                                             gint            scale)
 {
   cairo_surface_t *surface;
   GFile *file;
@@ -1483,7 +1402,7 @@ st_texture_cache_load_file_to_cairo_surface (StTextureCache *cache,
   uri = g_file_get_uri (file);
 
   surface = st_texture_cache_load_uri_sync_to_cairo_surface (cache, ST_TEXTURE_CACHE_POLICY_FOREVER,
-                                                             uri, -1, -1, scale, &error);
+                                                             uri, -1, -1, &error);
   g_object_unref (file);
   g_free (uri);
 

src/st/st-texture-cache.h

@@ -73,7 +73,6 @@ st_texture_cache_load_sliced_image (StTextureCache *cache,
                                     const gchar    *path,
                                     gint            grid_width,
                                     gint            grid_height,
-                                    gint            scale,
                                     GFunc           load_callback,
                                     gpointer        user_data);
 
@@ -90,16 +89,13 @@ ClutterActor *st_texture_cache_load_gicon (StTextureCache *cache,
 ClutterActor *st_texture_cache_load_uri_async (StTextureCache    *cache,
                                                const gchar       *uri,
                                                int                available_width,
-                                               int                available_height,
+                                               int                available_height);
-                                               int                scale);
 
 CoglHandle    st_texture_cache_load_file_to_cogl_texture (StTextureCache *cache,
-                                                          const gchar    *file_path,
+                                                          const gchar    *file_path);
-                                                          gint            scale);
 
 cairo_surface_t *st_texture_cache_load_file_to_cairo_surface (StTextureCache *cache,
-                                                              const gchar    *file_path,
+                                                              const gchar    *file_path);
-                                                              gint            scale);
 
 /**
  * StTextureCacheLoader: (skip)

src/st/st-theme-node-drawing.c

@@ -606,14 +606,12 @@ create_cairo_pattern_of_background_image (StThemeNode *node,
   gdouble background_image_width, background_image_height;
   gdouble x, y;
   gdouble scale_w, scale_h;
-  int scale_factor;
 
   file = st_theme_node_get_background_image (node);
 
   texture_cache = st_texture_cache_get_default ();
 
-  g_object_get (node->context, "scale-factor", &scale_factor, NULL);
+  surface = st_texture_cache_load_file_to_cairo_surface (texture_cache, file);
-  surface = st_texture_cache_load_file_to_cairo_surface (texture_cache, file, scale_factor);
 
   if (surface == NULL)
     return NULL;
@@ -1303,12 +1301,8 @@ st_theme_node_load_border_image (StThemeNode *node)
 
       const char *filename;
       filename = st_border_image_get_filename (border_image);
-
-      int scale_factor;
-      g_object_get (node->context, "scale-factor", &scale_factor, NULL);
-
       node->border_slices_texture = st_texture_cache_load_file_to_cogl_texture (st_texture_cache_get_default (),
-                                                                                filename, scale_factor);
+                                                                                filename);
       if (node->border_slices_texture == COGL_INVALID_HANDLE)
         goto out;
 
@@ -1353,12 +1347,9 @@ st_theme_node_load_background_image (StThemeNode *node)
       if (background_image == NULL)
         goto out;
 
-      int scale_factor;
-      g_object_get (node->context, "scale-factor", &scale_factor, NULL);
-
       background_image_shadow_spec = st_theme_node_get_background_image_shadow (node);
       node->background_texture = st_texture_cache_load_file_to_cogl_texture (st_texture_cache_get_default (),
-                                                                             background_image, scale_factor);
+                                                                             background_image);
       if (node->background_texture == COGL_INVALID_HANDLE)
         goto out;
 

src/st/st-theme-node.c

@@ -2864,7 +2864,6 @@ StBorderImage *
 st_theme_node_get_border_image (StThemeNode *node)
 {
   int i;
-  int scale_factor;
 
   if (node->border_image_computed)
     return node->border_image;
@@ -2873,7 +2872,6 @@ st_theme_node_get_border_image (StThemeNode *node)
   node->border_image_computed = TRUE;
 
   ensure_properties (node);
-  g_object_get (node->context, "scale-factor", &scale_factor, NULL);
 
   for (i = node->n_properties - 1; i >= 0; i--)
     {
@@ -2980,8 +2978,7 @@ st_theme_node_get_border_image (StThemeNode *node)
             goto next_property;
 
           node->border_image = st_border_image_new (filename,
-                                                    border_top, border_right, border_bottom, border_left,
+                                                    border_top, border_right, border_bottom, border_left);
-                                                    scale_factor);
 
           g_free (filename);