Bump version to 3.8.3

To go along GNOME Shell 3.8.3

NEWS

@@ -1,3 +1,19 @@
+3.8.3
+=====
+* important: default-min-max and static-workspaces
+  were dropped and replaced with classic-mode schema overrides
+* apps-menu and classic-mode in general: fix the
+  scrollbar theming
+* alternative-status-menu honors again GSettings
+* native-window-placement respects again captions-on-top
+* translation updates (sk)
+
+3.8.2
+=====
+* window-list: fix styling in classic mode
+* window-list: code cleanups
+* translation updates (cs, es, lt, pl, pt_BR, sl)
+
 3.8.1
 =====
 * many improvements to window-list:

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell-extensions],[3.8.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=extensions])
+AC_INIT([gnome-shell-extensions],[3.8.3],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=extensions])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([config])
@@ -27,7 +27,7 @@ fi
 AC_SUBST([SHELL_VERSION])
 
 dnl keep this in alphabetic order
-CLASSIC_EXTENSIONS="apps-menu places-menu alternate-tab default-min-max launch-new-instance static-workspaces window-list"
+CLASSIC_EXTENSIONS="apps-menu places-menu alternate-tab launch-new-instance window-list"
 DEFAULT_EXTENSIONS="$CLASSIC_EXTENSIONS alternative-status-menu drive-menu windowsNavigator workspace-indicator"
 ALL_EXTENSIONS="$DEFAULT_EXTENSIONS auto-move-windows example native-window-placement systemMonitor user-theme xrandr-indicator"
 AC_SUBST(CLASSIC_EXTENSIONS, [$CLASSIC_EXTENSIONS])
@@ -71,7 +71,7 @@ for e in $enable_extensions; do
 					[AC_MSG_WARN([gnome-desktop-3.0 not found, disabling xrandr-indicator])])
 			;;
 dnl		keep this in alphabetic order
-		alternate-tab|alternative-status-menu|apps-menu|auto-move-windows|default-min-max|drive-menu|example|launch-new-instance|native-window-placement|places-menu|static-workspaces|user-theme|window-list|windowsNavigator|workspace-indicator)
+		alternate-tab|alternative-status-menu|apps-menu|auto-move-windows|drive-menu|example|launch-new-instance|native-window-placement|places-menu|user-theme|window-list|windowsNavigator|workspace-indicator)
 			ENABLED_EXTENSIONS="$ENABLED_EXTENSIONS $e"
 			;;
 		*)
@@ -88,13 +88,11 @@ AC_CONFIG_FILES([
   extensions/alternative-status-menu/Makefile
   extensions/apps-menu/Makefile
   extensions/auto-move-windows/Makefile
-  extensions/default-min-max/Makefile
   extensions/drive-menu/Makefile
   extensions/example/Makefile
   extensions/launch-new-instance/Makefile
   extensions/native-window-placement/Makefile
   extensions/places-menu/Makefile
-  extensions/static-workspaces/Makefile
   extensions/systemMonitor/Makefile
   extensions/user-theme/Makefile
   extensions/window-list/Makefile

data/Makefile.am

@@ -28,6 +28,12 @@ theme_DATA = 				\
 	$(srcdir)/gnome-classic.css		\
 	$(NULL)
 
+gsettings_in_files = org.gnome.shell.extensions.classic-overrides.gschema.xml.in
+gsettings_SCHEMAS = $(gsettings_in_files:.xml.in=.xml)
+
+@INTLTOOL_XML_NOMERGE_RULE@
+@GSETTINGS_RULES@
+
 %.desktop.in:%.desktop.in.in
 	$(AM_V_GEN) sed \
 		-e "s|\@libexecdir\@|$(libexecdir)|" \
@@ -54,6 +60,7 @@ EXTRA_DIST = \
 	$(session_in_in_files) \
 	$(xsession_in_files) \
 	$(mode_in_files) \
+	$(gsettings_in_files) \
 	$(theme_DATA) \
 	$(NULL)
 
@@ -62,4 +69,5 @@ CLEANFILES = \
 	$(session_DATA) \
 	$(xsession_DATA) \
 	$(mode_DATA) \
+	$(gsettings_SCHEMAS) \
 	$(NULL)

data/classic.json.in

@@ -1,6 +1,7 @@
 {
     "parentMode": "user",
     "stylesheetName": "gnome-classic.css",
+    "overridesSchema": "org.gnome.shell.extensions.classic-overrides",
     "enabledExtensions": [@CLASSIC_EXTENSIONS@],
     "panel": { "left": ["activities", "appMenu"],
                "center": [],

data/gnome-classic.css

@@ -147,6 +147,15 @@
     padding: 8px 0px;
   }
 
+  .popup-slider-menu-item {
+    -slider-handle-border-color: #888;
+    -slider-handle-border-width: 1px;
+  }
+
+  .popup-menu-item:hover .popup-slider-menu-item {
+    color: #fff;
+  }
+
   .popup-subtitle-menu-item, .popup-subtitle-menu-item:insensitive {
     color: #000;
   }
@@ -163,6 +172,25 @@
       box-shadow: inset 0px 1px 3px rgba(0,0,0,0.4);
   }
 
+  /*  SCROLLBARS for POPUP MENU  */
+
+  .popup-menu StScrollBar StBin#trough {
+    background-color: transparent;
+  }
+
+  .popup-menu StScrollBar StButton#vhandle, .popup-menu StScrollBar StButton#hhandle {
+    border-color: #e9e9e9;
+    background-color: #888;
+  }
+  .popup-menu StScrollBar StButton#vhandle:hover,
+  .popup-menu StScrollBar StButton#hhandle:hover {
+    background-color: #666;
+  }
+  .popup-menu StScrollBar StButton#vhandle:active,
+  .popup-menu StScrollBar StButton#hhandle:active {
+    background-color: #4a90d9;
+  }
+
 /* CALENDAR */
 
 .calendar {}

data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in

@@ -0,0 +1,38 @@
+<schemalist>
+  <schema id="org.gnome.shell.extensions.classic-overrides"
+          path="/org/gnome/shell/extensions/classic-overrides/"
+	  gettext-domain="gnome-shell-extensions">
+    <key name="attach-modal-dialogs" type="b">
+      <default>true</default>
+      <_summary>Attach modal dialog to the parent window</_summary>
+      <_description>
+        This key overrides the key in org.gnome.mutter when running
+        GNOME Shell.
+      </_description>
+    </key>
+
+    <key name="edge-tiling" type="b">
+      <default>true</default>
+      <_summary>Enable edge tiling when dropping windows on screen edges</_summary>
+      <_description>
+        This key overrides the key in org.gnome.mutter when running GNOME Shell.
+      </_description>
+    </key>
+
+    <key name="workspaces-only-on-primary" type="b">
+      <default>true</default>
+      <_summary>Workspaces only on primary monitor</_summary>
+      <_description>
+        This key overrides the key in org.gnome.mutter when running GNOME Shell.
+      </_description>
+    </key>
+
+    <key name="focus-change-on-pointer-rest" type="b">
+      <default>true</default>
+      <summary>Delay focus changes in mouse mode until the pointer stops moving</summary>
+      <description>
+        This key overrides the key in org.gnome.mutter when running GNOME Shell.
+      </description>
+    </key>
+  </schema>
+</schemalist>

extensions/alternative-status-menu/extension.js

@@ -76,8 +76,8 @@ function statusMenu_updateHaveHibernate() {
 function statusMenu_updateSuspendOrPowerOff() {
     this._suspendOrPowerOffItem.actor.hide();
 
-    extension.suspendItem.actor.visible = this._haveSuspend;
+    extension.suspendItem.actor.visible = this._haveSuspend && extension.settings.get_boolean('allow-suspend');
-    extension.hibernateItem.actor.visible = this._haveHibernate;
+    extension.hibernateItem.actor.visible = this._haveHibernate && extension.settings.get_boolean('allow-hibernate');
     extension.powerOffItem.actor.visible = this._haveShutdown;
 }
 
@@ -104,7 +104,7 @@ const Extension = new Lang.Class({
         this.powerOffItem = null;
 
         Convenience.initTranslations();
-        this._settings = Convenience.getSettings();
+        this.settings = Convenience.getSettings();
     },
 
     enable: function() {
@@ -145,7 +145,7 @@ const Extension = new Lang.Class({
         this._previousUpdateSuspendOrPowerOff = statusMenu._updateSuspendOrPowerOff;
         statusMenu._updateSuspendOrPowerOff = statusMenu_updateSuspendOrPowerOff;
 
-        this._settingsChangedId = this._settings.connect('changed', function() {
+        this._settingsChangedId = this.settings.connect('changed', function() {
             statusMenu._updateSuspendOrPowerOff();
         });
     },
@@ -158,7 +158,7 @@ const Extension = new Lang.Class({
         this.powerOffItem.destroy();
 
         statusMenu.menu.disconnect(this._openStateChangedId);
-        this._settings.disconnect(this._settingsChangedId);
+        this.settings.disconnect(this._settingsChangedId);
 
         statusMenu._updateSuspendOrPowerOff = this._previousUpdateSuspendOrPowerOff;
         statusMenu._updateSuspendOrPowerOff();

extensions/apps-menu/extension.js

@@ -424,7 +424,7 @@ const ApplicationsButton = new Lang.Class({
         this.leftBox = new St.BoxLayout({ vertical: true });
         this.applicationsScrollBox = new St.ScrollView({ x_fill: true, y_fill: false,
                                                          y_align: St.Align.START,
-                                                         style_class: 'vfade' });
+                                                         style_class: 'apps-menu vfade' });
         this.applicationsScrollBox.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
         let vscroll = this.applicationsScrollBox.get_vscroll_bar();
         vscroll.connect('scroll-start', Lang.bind(this, function() {

extensions/apps-menu/stylesheet.css

@@ -1 +1,7 @@
-/* none used*/
+.apps-menu:ltr {
+    padding-right: 3px;
+}
+
+.apps-menu:rtl {
+    padding-left: 3px;
+}

extensions/default-min-max/Makefile.am

@@ -1,3 +0,0 @@
-EXTENSION_ID = default-min-max
-
-include ../../extension.mk

extensions/default-min-max/extension.js

@@ -1,20 +0,0 @@
-// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
-
-const Meta = imports.gi.Meta;
-
-const BUTTON_LAYOUT_KEY = 'button-layout';
-const EXTENSION_SCHEMA = 'org.gnome.desktop.wm.preferences';
-const SHELL_OVERRIDES_SCHEMA = 'org.gnome.shell.overrides';
-
-function init(metadata) {
-}
-
-function enable() {
-    // Override gnome-shell's overrides
-    Meta.prefs_override_preference_schema(BUTTON_LAYOUT_KEY, EXTENSION_SCHEMA);
-}
-
-function disable() {
-    // Restore gnome-shell's overrides
-    Meta.prefs_override_preference_schema(BUTTON_LAYOUT_KEY, SHELL_OVERRIDES_SCHEMA);
-}

extensions/default-min-max/metadata.json.in

@@ -1,11 +0,0 @@
-{
-"extension-id": "@extension_id@",
-"uuid": "@uuid@",
-"settings-schema": "@gschemaname@",
-"gettext-domain": "@gettext_domain@",
-"name": "Default Minimize and Maximize",
-"description": "Adds minimize and maximize buttons to the titlebar by default",
-"original-authors": [ "debarshir@gnome.org" ],
-"shell-version": [ "@shell_current@" ],
-"url": "@url@"
-}

extensions/default-min-max/stylesheet.css

@@ -1 +0,0 @@
-/* This extensions requires no special styling */

extensions/native-window-placement/extension.js

@@ -141,9 +141,6 @@ function enable() {
     Workspace.Workspace.prototype._calculateWindowTransformationsNatural = function(clones) {
         // As we are using pseudo-random movement (See "slot") we need to make sure the list
         // is always sorted the same way no matter which window is currently active.
-        clones = clones.sort(function (win1, win2) {
-            return win2.metaWindow.get_stable_sequence() - win1.metaWindow.get_stable_sequence();
-        });
 
         let node = this.actor.get_theme_node();
         let columnSpacing = node.get_length('-horizontal-spacing');
@@ -319,94 +316,22 @@ function enable() {
         let buttonOuterHeight, captionHeight;
         let buttonOuterWidth = 0;
 
-        let targets = [];
+        let slots = [];
         for (let i = 0; i < rects.length; i++) {
             rects[i].x = rects[i].x * scale + area.x;
             rects[i].y = rects[i].y * scale + area.y;
 
-            targets[i] = [rects[i].x, rects[i].y, scale];
+            slots.push([rects[i].x, rects[i].y, scale, clones[i]]);
         }
 
-        return [clones, targets];
+        return slots;
     }
     workspaceInjections['_calculateWindowTransformationsNatural'] = undefined;
 
-    /**
+    /// map gnome shell's computeAllWindowSlots() to our window placement function
-     * _realPositionWindows:
+    workspaceInjections['_computeAllWindowSlots'] = Workspace.Workspace.prototype._computeAllWindowSlots;
-     * @flags:
+    Workspace.Workspace.prototype._computeAllWindowSlots = function(windows) {
-     *  INITIAL - this is the initial positioning of the windows.
+        return this._calculateWindowTransformationsNatural(windows);
-     *  ANIMATE - Indicates that we need animate changing position.
-     */
-    workspaceInjections['_realPositionWindows'] = Workspace.Workspace.prototype._realPositionWindows;
-    Workspace.Workspace.prototype._realPositionWindows = function(flags) {
-        if (this._repositionWindowsId > 0) {
-            Mainloop.source_remove(this._repositionWindowsId);
-            this._repositionWindowsId = 0;
-        }
-
-        let clones = this._windows.slice();
-        if (this._reservedSlot)
-            clones.push(this._reservedSlot);
-
-        let initialPositioning = flags & WindowPositionFlags.INITIAL;
-        let animate = flags & WindowPositionFlags.ANIMATE;
-
-        // Start the animations
-        let targets = [];
-        let scales = [];
-
-        [clones, targets] = this._calculateWindowTransformationsNatural(clones);
-
-        let currentWorkspace = global.screen.get_active_workspace();
-        let isOnCurrentWorkspace = this.metaWorkspace == null || this.metaWorkspace == currentWorkspace;
-
-        for (let i = 0; i < clones.length; i++) {
-            let clone = clones[i];
-            let [x, y , scale] = targets[i];
-            let metaWindow = clone.metaWindow;
-            let mainIndex = this._lookupIndex(metaWindow);
-            let overlay = this._windowOverlays[mainIndex];
-            clone.slotId = i;
-
-            // Positioning a window currently being dragged must be avoided;
-            // we'll just leave a blank spot in the layout for it.
-            if (clone.inDrag)
-                continue;
-
-            clone.slot = [x, y, clone.actor.width * scale, clone.actor.height * scale];
-
-            if (overlay && initialPositioning)
-                overlay.hide(initialPositioning);
-
-            if (animate && isOnCurrentWorkspace) {
-                if (!metaWindow.showing_on_its_workspace()) {
-                    /* Hidden windows should fade in and grow
-                     * therefore we need to resize them now so they
-                     * can be scaled up later */
-                    if (initialPositioning) {
-                        clone.actor.opacity = 0;
-                        clone.actor.scale_x = 0;
-                        clone.actor.scale_y = 0;
-                        clone.actor.x = x;
-                        clone.actor.y = y;
-                    }
-
-                    // Make the window slightly transparent to indicate it's hidden
-                    Tweener.addTween(clone.actor,
-                                     { opacity: 255,
-                                       time: Overview.ANIMATION_TIME,
-                                       transition: 'easeInQuad'
-                                     });
-                }
-
-                this._animateClone(clone, overlay, x, y, scale, initialPositioning);
-            } else {
-                clone.actor.set_position(x, y);
-                clone.actor.set_scale(scale, scale);
-                clone.overlay.relayout(false);
-                this._showWindowOverlay(clone, overlay, isOnCurrentWorkspace);
-            }
-        }
     }
 
     /// position window titles on top of windows in overlay ////
@@ -417,21 +342,20 @@ function enable() {
                     0];
         };
 
-        winInjections['updatePositions'] = Workspace.WindowOverlay.prototype.updatePositions;
+        winInjections['relayout'] = Workspace.WindowOverlay.prototype.relayout;
-        Workspace.WindowOverlay.prototype.updatePositions = function(cloneX, cloneY, cloneWidth, cloneHeight, animate) {
+        Workspace.WindowOverlay.prototype.relayout = function(animate) {
             let button = this.closeButton;
             let title = this.title;
+            let border = this.border;
 
-            let settings = new Gio.Settings({ schema: BUTTON_LAYOUT_SCHEMA });
+            Tweener.removeTweens(button);
-            let layout = settings.get_string(BUTTON_LAYOUT_KEY);
+            Tweener.removeTweens(title);
-            let rtl = Clutter.get_default_text_direction() == Clutter.TextDirection.RTL;
+            Tweener.removeTweens(border);
 
-            let split = layout.split(":");
+            let [cloneX, cloneY, cloneWidth, cloneHeight] = this._windowClone.slot;
-            let side;
+
-            if (split[0].indexOf("close") > -1)
+            let layout = Meta.prefs_get_button_layout();
-                side = rtl ? St.Side.RIGHT : St.Side.LEFT;
+            let side = layout.left_buttons.indexOf(Meta.ButtonFunction.CLOSE) > -1 ? St.Side.LEFT : St.Side.RIGHT;
-            else
-                side = rtl ? St.Side.LEFT : St.Side.RIGHT;
 
             let buttonX;
             let buttonY = cloneY - (button.height - button._overlap);
@@ -445,11 +369,21 @@ function enable() {
             else
                 button.set_position(Math.floor(buttonX), Math.floor(buttonY));
 
-            if (!title.fullWidth)
+            // Clutter.Actor.get_preferred_width() will return the fixed width if one
-                title.fullWidth = title.width;
+            // is set, so we need to reset the width by calling set_width(-1), to forward
-            let titleWidth = Math.min(title.fullWidth, cloneWidth);
+            // the call down to StLabel.
+            // We also need to save and restore the current width, otherwise the animation
+            // starts from the wrong point.
+            let prevTitleWidth = title.width;
+            title.set_width(-1);
+            let [titleMinWidth, titleNatWidth] = title.get_preferred_width(-1);
+            let titleWidth = Math.max(titleMinWidth, Math.min(titleNatWidth, cloneWidth));
+            title.width = prevTitleWidth;
 
             let titleX = cloneX + (cloneWidth - titleWidth) / 2;
+
+            /// this is the actual difference to original gnome-shell:
+            //let titleY = cloneY + cloneHeight + title._spacing;
             let titleY = cloneY - title.height + title._spacing;
 
             if (animate)
@@ -458,6 +392,19 @@ function enable() {
                 title.width = titleWidth;
                 title.set_position(Math.floor(titleX), Math.floor(titleY));
             }
+
+            let borderX = cloneX - this.borderSize;
+            let borderY = cloneY - this.borderSize;
+            let borderWidth = cloneWidth + 2 * this.borderSize;
+            let borderHeight = cloneHeight + 2 * this.borderSize;
+
+            if (animate) {
+                this._animateOverlayActor(this.border, borderX, borderY,
+                                          borderWidth, borderHeight);
+            } else {
+                this.border.set_position(borderX, borderY);
+                this.border.set_size(borderWidth, borderHeight);
+            }
         };
     }
 }

extensions/static-workspaces/Makefile.am

@@ -1,3 +0,0 @@
-EXTENSION_ID = static-workspaces
-
-include ../../extension.mk

extensions/static-workspaces/extension.js

@@ -1,18 +0,0 @@
-// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
-
-const Meta = imports.gi.Meta;
-
-function init(metadata) {
-}
-
-function enable() {
-    // Override gnome-shell's overrides
-    Meta.prefs_override_preference_schema('dynamic-workspaces',
-                                          'org.gnome.mutter');
-}
-
-function disable() {
-    // Restore gnome-shell's overrides
-    Meta.prefs_override_preference_schema('dynamic-workspaces',
-                                          'org.gnome.shell.overrides');
-}

extensions/static-workspaces/metadata.json.in

@@ -1,11 +0,0 @@
-{
-"extension-id": "@extension_id@",
-"uuid": "@uuid@",
-"settings-schema": "@gschemaname@",
-"gettext-domain": "@gettext_domain@",
-"name": "Static workspaces",
-"description": "Disable dynamic workspace management",
-"original-authors": [ "fmuellner@gnome.org" ],
-"shell-version": [ "@shell_current@" ],
-"url": "@url@"
-}

extensions/static-workspaces/stylesheet.css

@@ -1 +0,0 @@
-/* This extensions requires no special styling */

extensions/window-list/classic.css

@@ -3,6 +3,7 @@
 #panel.bottom-panel {
     border-top-width: 1px;
     border-bottom-width: 0px;
+    height: 32px !important;
   }
 
   .bottom-panel .window-button > StWidget {
@@ -11,6 +12,7 @@
     background-gradient-end: #d0d0d0;
     color: #555 !important;
     border-radius: 2px !important;
+    padding: 4px 6px 2px !important;
     text-shadow: 0 0 transparent;
     box-shadow: inset -1px -1px 1px rgba(0,0,0,0.5) !important;
   }

extensions/window-list/extension.js

@@ -390,8 +390,7 @@ const WorkspaceIndicator = new Lang.Class({
         this.workspacesItems = [];
 
         this._screenSignals = [];
-        this._screenSignals.push(global.screen.connect_after('workspace-added', Lang.bind(this,this._updateMenu)));
+        this._screenSignals.push(global.screen.connect('notify::n-workspaces', Lang.bind(this,this._updateMenu)));
-        this._screenSignals.push(global.screen.connect_after('workspace-removed', Lang.bind(this,this._updateMenu)));
         this._screenSignals.push(global.screen.connect_after('workspace-switched', Lang.bind(this,this._updateIndicator)));
 
         this.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));

po/POTFILES.in

@@ -1,6 +1,7 @@
 data/gnome-classic.desktop.in
 data/gnome-classic.session.desktop.in.in
 data/gnome-shell-classic.desktop.in.in
+data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in
 extensions/alternate-tab/prefs.js
 extensions/alternative-status-menu/extension.js
 extensions/alternative-status-menu/org.gnome.shell.extensions.alternative-status-menu.gschema.xml.in

po/sk.po

@@ -2,15 +2,15 @@
 # Copyright (C) 2012 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gnome-shell-extensions package.
 # Pavol Klačanský <pavol@klacansky.com>, 2012.
-#  Dušan Kazik <prescott66@gmail.com>, 2012.
+# Dušan Kazik <prescott66@gmail.com>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2012-10-26 15:22+0000\n"
+"POT-Creation-Date: 2013-06-05 18:52+0000\n"
-"PO-Revision-Date: 2012-11-04 21:46+0100\n"
+"PO-Revision-Date: 2013-05-31 14:24+0100\n"
 "Last-Translator: Dušan Kazik <prescott66@gmail.com>\n"
 "Language-Team: Slovak <gnome-sk-list@gnome.org>\n"
 "Language: sk\n"
@@ -20,60 +20,62 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
 "X-Generator: Poedit 1.5.4\n"
 
-# gsetting summary
+#: ../data/gnome-classic.desktop.in.h:1
-#: ../extensions/alternate-tab/org.gnome.shell.extensions.alternate-tab.gschema.xml.in.h:1
+#: ../data/gnome-classic.session.desktop.in.in.h:1
-msgid "The application icon mode."
+msgid "GNOME Classic"
-msgstr "Režim ikony aplikácie."
+msgstr "Klasické prostredie GNOME"
 
-# gsetting description
+#: ../data/gnome-classic.desktop.in.h:2
-#: ../extensions/alternate-tab/org.gnome.shell.extensions.alternate-tab.gschema.xml.in.h:2
+msgid "This session logs you into GNOME Classic"
-msgid ""
+msgstr "Táto relácia vás prihlási do klasického prostredia GNOME"
-"Configures how the windows are shown in the switcher. Valid possibilities "
+
-"are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-"
+#: ../data/gnome-shell-classic.desktop.in.in.h:1
-"only' (shows only the application icon) or 'both'."
+msgid "GNOME Shell Classic"
-msgstr ""
+msgstr "Klasický shell prostredia GNOME"
-"Nastaví ako budú zobrazené okná v prepínači. Platné možnosti sú „thumbnail-"
-"only“ (zobrazí len miniatúru okna), „app-icon-only“ (zobrazí len ikonu "
-"aplikácie) alebo „both“ (obe)."
 
 # RadioButton label
-#: ../extensions/alternate-tab/prefs.js:26
+#: ../data/gnome-shell-classic.desktop.in.in.h:2
+msgid "Window management and application launching"
+msgstr "Správca okien a spúšťanie aplikácií"
+
+# RadioButton label
+#: ../extensions/alternate-tab/prefs.js:20
 msgid "Thumbnail only"
 msgstr "Len miniatúra"
 
 # RadioButton label
-#: ../extensions/alternate-tab/prefs.js:27
+#: ../extensions/alternate-tab/prefs.js:21
 msgid "Application icon only"
 msgstr "Len ikona aplikácie"
 
 # RadioButton label
-#: ../extensions/alternate-tab/prefs.js:28
+#: ../extensions/alternate-tab/prefs.js:22
 msgid "Thumbnail and application icon"
 msgstr "Miniatúra a ikona aplikácie"
 
-# Label
+#  Label
-#: ../extensions/alternate-tab/prefs.js:43
+#: ../extensions/alternate-tab/prefs.js:37
 msgid "Present windows as"
 msgstr "Uvádzať okná ako"
 
 # CheckButton
-#: ../extensions/alternate-tab/prefs.js:68
+#: ../extensions/alternate-tab/prefs.js:62
 msgid "Show only windows in the current workspace"
 msgstr "Zobraziť len okná z aktuálneho pracovného priestoru"
 
 # PopupMenuItem
 #. add the new entries
-#: ../extensions/alternative-status-menu/extension.js:144
+#: ../extensions/alternative-status-menu/extension.js:125
 msgid "Suspend"
 msgstr "Uspať"
 
 # PopupMenuItem
-#: ../extensions/alternative-status-menu/extension.js:147
+#: ../extensions/alternative-status-menu/extension.js:128
 msgid "Hibernate"
 msgstr "Hibernovať"
 
 # PopupMenuItem
-#: ../extensions/alternative-status-menu/extension.js:150
+#: ../extensions/alternative-status-menu/extension.js:131
 msgid "Power Off"
 msgstr "Vypnúť"
 
@@ -97,6 +99,19 @@ msgstr "Povoliť hibernáciu"
 msgid "Control the visibility of the Hibernate menu item"
 msgstr "Nastaví viditeľnosť položky Hibernovať v ponuke"
 
+#: ../extensions/apps-menu/extension.js:39
+msgid "Activities Overview"
+msgstr "Prehľad aktivít"
+
+#: ../extensions/apps-menu/extension.js:113
+msgid "Favorites"
+msgstr "Obľúbené"
+
+# TreeViewColumn
+#: ../extensions/apps-menu/extension.js:278
+msgid "Applications"
+msgstr "Aplikácie"
+
 # summary
 #: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:1
 msgid "Application and workspace list"
@@ -143,7 +158,7 @@ msgstr "Pridať"
 msgid "Ejecting drive '%s' failed:"
 msgstr "Zlyhalo vysúvanie jednotky „%s“:"
 
-# Menu
+#  Menu
 #: ../extensions/drive-menu/extension.js:89
 msgid "Removable devices"
 msgstr "Vymeniteľné zariadenia"
@@ -176,14 +191,13 @@ msgstr "Obsahuje text, ktorý bude zobrazený po kliknutí na panel."
 #. TRANSLATORS: Example is the name of the extension, should not be
 #. translated
 #: ../extensions/example/prefs.js:30
-#, fuzzy
 msgid ""
 "Example aims to show how to build well behaved extensions for the Shell and "
 "as such it has little functionality on its own.\n"
 "Nevertheless it's possible to customize the greeting message."
 msgstr ""
-"Rozšírenie Example vám má ukázať, ako sa dajú zostaviť dobre vyzerajúce a jednoduché rozšírenia "
+"Rozšírenie Example vám má ukázať, ako sa dajú zostaviť dobre vyzerajúce a "
-"pre Shell.\n"
+"jednoduché rozšírenia pre Shell a demonštrovať tak funkčnosť.\n"
 "Napriek tomu je možné prispôsobiť správu privítania."
 
 #: ../extensions/example/prefs.js:36
@@ -222,42 +236,28 @@ msgstr ""
 "miniatúry. Prepíše sa tým predvolené nastavenie shellu, ktorý ho umiestňuje "
 "nadol. Aby sa prejavila zmena, je potrebné reštartovať shell."
 
-# menu item
+#  menu item
-#: ../extensions/places-menu/extension.js:46
+#: ../extensions/places-menu/extension.js:77
 msgid "Places"
 msgstr "Miesta"
 
-# menu item
+#: ../extensions/places-menu/placeDisplay.js:56
-#: ../extensions/places-menu/extension.js:47
-msgid "Devices"
-msgstr "Zariadenia"
-
-# menu item
-#: ../extensions/places-menu/extension.js:48
-msgid "Bookmarks"
-msgstr "Záložky"
-
-# menu item
-#: ../extensions/places-menu/extension.js:49
-msgid "Network"
-msgstr "Sieť"
-
-#: ../extensions/places-menu/placeDisplay.js:48
 #, c-format
 msgid "Failed to launch \"%s\""
 msgstr "Zlyhalo spustenie „%s“"
 
-# Places
+#: ../extensions/places-menu/placeDisplay.js:98
 #: ../extensions/places-menu/placeDisplay.js:121
+msgid "Computer"
+msgstr "Počítač"
+
+# Places
+#: ../extensions/places-menu/placeDisplay.js:199
 msgid "Home"
 msgstr "Domov"
 
-#: ../extensions/places-menu/placeDisplay.js:191
+#: ../extensions/places-menu/placeDisplay.js:286
-msgid "File System"
+msgid "Browse Network"
-msgstr "Súborový systém"
-
-#: ../extensions/places-menu/placeDisplay.js:195
-msgid "Browse network"
 msgstr "Prehliadať sieť"
 
 # Label
@@ -280,6 +280,34 @@ msgstr "Názov témy"
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "Názov témy, ktorá sa načíta z ~/.themes/nazov/gnome-shell"
 
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:1
+msgid "When to group windows"
+msgstr "Kedy zoskupiť okná"
+
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:2
+msgid ""
+"Decides when to group windows from the same application on the window list. "
+"Possible values are \"never\", \"auto\" and \"always\"."
+msgstr ""
+"Rozhoduje kedy sa majú v zozname okien zoskupiť okná tej istej aplikácie."
+"Možné hodnoty sú „never“ (nikdy), „auto“ (automaticky) a „always“ (vždy)."
+
+#: ../extensions/window-list/prefs.js:30
+msgid "Window Grouping"
+msgstr "Zoskupenie okien"
+
+#: ../extensions/window-list/prefs.js:49
+msgid "Never group windows"
+msgstr "Nikdy nezoskupovať okná"
+
+#: ../extensions/window-list/prefs.js:50
+msgid "Group windows when space is limited"
+msgstr "Zoskupovať okna ak je obmedzený priestor"
+
+#: ../extensions/window-list/prefs.js:51
+msgid "Always group windows"
+msgstr "Vždy zoskupovať okná"
+
 # Label
 #: ../extensions/workspace-indicator/extension.js:30
 msgid "Workspace Indicator"
@@ -321,8 +349,7 @@ msgstr "Vpravo"
 msgid "Upside-down"
 msgstr "Hore nohami"
 
-# PM: V tomto prípade by asi viac hodilo obrazovka
+#  menu
-# menu
 #: ../extensions/xrandr-indicator/extension.js:50
 msgid "Display"
 msgstr "Displej"