places-menu: null-check g_volume_get_identifier()

Not all volumes have the 'class' identifier (for example MTP doesn't), and we can't apply indexOf on null.
Updated Slovenian translation
2013-06-17 21:42:52 +02:00 · 2013-06-13 21:47:19 +02:00 · 2013-06-13 11:26:46 +02:00 · 2013-06-08 20:46:39 -04:00 · 2013-06-08 21:05:56 +02:00 · 2013-06-08 01:03:01 +02:00
42 changed files with 331 additions and 320 deletions
--- a/21
+++ b/21
@@ -1,16 +1,17 @@
-3.9.2
+3.8.3
 =====
-* apps-menu: appearance of the scrollbars was improved
-* window-list is a little taller in classic mode (to account
-  for the workspace switcher)
-* alternative-status-menu honors again the dconf configuration
-* translation updates (sr)
+* 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.9.1
+3.8.2
 =====
-* updates to window-list, xrandr-indicator,
-  workspace-indicator, windowsNavigator for gnome-shell
-  changes
+* window-list: fix styling in classic mode
+* window-list: code cleanups
 * translation updates (cs, es, lt, pl, pt_BR, sl)

 3.8.1
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell-extensions],[3.9.2],[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
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -28,9 +28,14 @@ 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)|" \
 		-e "s|\@bindir\@|$(bindir)|" \
 		-e "s|\@VERSION\@|$(VERSION)|" \
 		$< > $@
@@ -54,6 +59,7 @@ EXTRA_DIST = \
 	$(session_in_in_files) \
 	$(xsession_in_files) \
 	$(mode_in_files) \
+	$(gsettings_in_files) \
 	$(theme_DATA) \
 	$(NULL)

@@ -62,4 +68,5 @@ CLEANFILES = \
 	$(session_DATA) \
 	$(xsession_DATA) \
 	$(mode_DATA) \
+	$(gsettings_SCHEMAS) \
 	$(NULL)
--- a/data/classic.json.in
+++ b/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": [],
--- a/data/gnome-classic.css
+++ b/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 {}
--- a/data/gnome-classic.session.desktop.in.in
+++ b/data/gnome-classic.session.desktop.in.in
@@ -1,4 +1,3 @@
 [GNOME Session]
 _Name=GNOME Classic
 RequiredComponents=gnome-shell-classic;gnome-settings-daemon;nautilus-classic;
-IsRunnableHelper=@libexecdir@/gnome-session-check-accelerated
--- a/data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in
+++ b/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>
--- a/extensions/alternate-tab/metadata.json.in
+++ b/extensions/alternate-tab/metadata.json.in
@@ -4,7 +4,7 @@
 "settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
 "name": "AlternateTab",
-"description": "Substitute Alt-Tab with a window based switcher that does not group by application.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME Bugzilla instead.",
+"description": "A replacement for Alt-Tab, allows to cycle between windows and does not group by application",
 "original-authors": [  "jw@bargsten.org", "thomas.bouffon@gmail.com" ],
 "shell-version": [ "@shell_current@" ],
 "url": "@url@"
--- a/extensions/alternative-status-menu/metadata.json.in
+++ b/extensions/alternative-status-menu/metadata.json.in
@@ -4,7 +4,7 @@
 "settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
 "name": "Alternative Status Menu",
- "description": "Replaces GNOME Shell Status Menu with one showing Suspend/Hibernate and Power Off as separate items.",
+ "description": "Replaces GNOME Shell Status Menu with one showing Suspend/Hibernate and Power Off as separate items",
 "shell-version": [ "@shell_current@" ],
 "url": "@url@"
 }
--- a/extensions/apps-menu/metadata.json.in
+++ b/extensions/apps-menu/metadata.json.in
@@ -3,7 +3,7 @@
 "uuid": "@uuid@",
 "gettext-domain": "@gettext_domain@",
 "name": "Applications Menu",
-"description": "Add a category-based menu for applications.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME Bugzilla instead.",
+"description": "Add a gnome 2.x style menu for applications",
 "original-authors": [ "e2002@bk.ru", "debarshir@gnome.org" ],
 "shell-version": [ "@shell_current@" ],
 "url": "@url@"
--- a/extensions/auto-move-windows/metadata.json.in
+++ b/extensions/auto-move-windows/metadata.json.in
@@ -4,7 +4,7 @@
 "settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
 "name": "Auto Move Windows",
- "description": "Move applications to specific workspaces when they create windows.",
+ "description": "Move applications to specific workspaces when they create windows",
 "shell-version": [ "@shell_current@" ],
 "original-authors": [ "alessandro.crismani@gmail.com", "thomas.bouffon@gmail.com" ],
 "url": "@url@"
--- a/extensions/default-min-max/Makefile.am
+++ b/extensions/default-min-max/Makefile.am
@@ -1,3 +0,0 @@
-EXTENSION_ID = default-min-max
-
-include ../../extension.mk
--- a/extensions/default-min-max/extension.js
+++ b/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);
-}
--- a/extensions/default-min-max/metadata.json.in
+++ b/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.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME Bugzilla instead.",
-"original-authors": [ "debarshir@gnome.org" ],
-"shell-version": [ "@shell_current@" ],
-"url": "@url@"
-}
--- a/extensions/default-min-max/stylesheet.css
+++ b/extensions/default-min-max/stylesheet.css
@@ -1 +0,0 @@
-/* This extensions requires no special styling */
--- a/extensions/drive-menu/metadata.json.in
+++ b/extensions/drive-menu/metadata.json.in
@@ -4,7 +4,7 @@
 "settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
 "name": "Removable Drive Menu",
- "description": "A status menu for accessing and unmounting removable devices.",
+ "description": "A status menu for accessing and unmounting removable devices",
 "shell-version": [ "@shell_current@" ],
 "url": "@url@"
 }
--- a/extensions/launch-new-instance/metadata.json.in
+++ b/extensions/launch-new-instance/metadata.json.in
@@ -4,7 +4,7 @@
 "settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
 "name": "Launch new instance",
-"description": "Always launch a new instance when clicking in the dash or the application view.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME Bugzilla instead.",
+"description": "Always launch a new instance",
 "shell-version": [ "@shell_current@" ],
 "url": "@url@"
 }
--- a/extensions/native-window-placement/extension.js
+++ b/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;

-    /**
-     * _realPositionWindows:
-     * @flags:
-     *  INITIAL - this is the initial positioning of the 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);
-            }
-        }
+    /// map gnome shell's computeAllWindowSlots() to our window placement function
+    workspaceInjections['_computeAllWindowSlots'] = Workspace.Workspace.prototype._computeAllWindowSlots;
+    Workspace.Workspace.prototype._computeAllWindowSlots = function(windows) {
+        return this._calculateWindowTransformationsNatural(windows);
    }

    /// position window titles on top of windows in overlay ////
@@ -417,21 +342,20 @@ function enable() {
                    0];
        };

-        winInjections['updatePositions'] = Workspace.WindowOverlay.prototype.updatePositions;
-        Workspace.WindowOverlay.prototype.updatePositions = function(cloneX, cloneY, cloneWidth, cloneHeight, animate) {
+        winInjections['relayout'] = Workspace.WindowOverlay.prototype.relayout;
+        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 });
-            let layout = settings.get_string(BUTTON_LAYOUT_KEY);
-            let rtl = Clutter.get_default_text_direction() == Clutter.TextDirection.RTL;
+            Tweener.removeTweens(button);
+            Tweener.removeTweens(title);
+            Tweener.removeTweens(border);

-            let split = layout.split(":");
-            let side;
-            if (split[0].indexOf("close") > -1)
-                side = rtl ? St.Side.RIGHT : St.Side.LEFT;
-            else
-                side = rtl ? St.Side.LEFT : St.Side.RIGHT;
+            let [cloneX, cloneY, cloneWidth, cloneHeight] = this._windowClone.slot;
+
+            let layout = Meta.prefs_get_button_layout();
+            let side = layout.left_buttons.indexOf(Meta.ButtonFunction.CLOSE) > -1 ? 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)
-                title.fullWidth = title.width;
-            let titleWidth = Math.min(title.fullWidth, cloneWidth);
+            // Clutter.Actor.get_preferred_width() will return the fixed width if one
+            // is set, so we need to reset the width by calling set_width(-1), to forward
+            // 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);
+            }
        };
    }
 }
--- a/extensions/native-window-placement/metadata.json.in
+++ b/extensions/native-window-placement/metadata.json.in
@@ -4,7 +4,7 @@
 "settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
 "name": "Native Window Placement",
- "description": "Arrange windows in overview in a more compact way.",
+ "description": "Arrange windows in overview in a more native way",
 "shell-version": [ "@shell_current@" ],
 "url": "@url@",
 "original-authors": [ "wepmaschda@gmx.de" ]
--- a/extensions/places-menu/metadata.json.in
+++ b/extensions/places-menu/metadata.json.in
@@ -4,7 +4,7 @@
 "settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
 "name": "Places Status Indicator",
-"description": "Add a menu for quickly navigating places in the system.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME Bugzilla instead.",
+"description": "Add a systems status menu for quickly navigating places in the system",
 "shell-version": [ "@shell_current@" ],
 "url": "@url@"
 }
--- a/extensions/places-menu/placeDisplay.js
+++ b/extensions/places-menu/placeDisplay.js
@@ -292,8 +292,9 @@ const PlacesManager = new Lang.Class({
            let volumes = drives[i].get_volumes();

            for(let j = 0; j < volumes.length; j++) {
-                if (volumes[j].get_identifier('class').indexOf('network') >= 0) {
-                    networkVolumes.push(volumes[i]);
+                let identifier = volumes[j].get_identifier('class');
+                if (identifier && identifier.indexOf('network') >= 0) {
+                    networkVolumes.push(volumes[j]);
                } else {
                    let mount = volumes[j].get_mount();
                    if(mount != null)
@@ -308,7 +309,8 @@ const PlacesManager = new Lang.Class({
            if(volumes[i].get_drive() != null)
                continue;

-            if (volumes[i].get_identifier('class').indexOf('network') >= 0) {
+            let identifier = volumes[i].get_identifier('class');
+            if (identifier && identifier.indexOf('network') >= 0) {
                networkVolumes.push(volumes[i]);
            } else {
                let mount = volumes[i].get_mount();
--- a/extensions/static-workspaces/Makefile.am
+++ b/extensions/static-workspaces/Makefile.am
@@ -1,3 +0,0 @@
-EXTENSION_ID = static-workspaces
-
-include ../../extension.mk
--- a/extensions/static-workspaces/extension.js
+++ b/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');
-}
--- a/extensions/static-workspaces/metadata.json.in
+++ b/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.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME Bugzilla instead.",
-"original-authors": [ "fmuellner@gnome.org" ],
-"shell-version": [ "@shell_current@" ],
-"url": "@url@"
-}
--- a/extensions/static-workspaces/stylesheet.css
+++ b/extensions/static-workspaces/stylesheet.css
@@ -1 +0,0 @@
-/* This extensions requires no special styling */
--- a/extensions/systemMonitor/metadata.json.in
+++ b/extensions/systemMonitor/metadata.json.in
@@ -6,6 +6,6 @@
    "gettext-domain": "@gettext_domain@",
    "original-author": "zaspire@rambler.ru",
    "name": "SystemMonitor",
-    "description": "System monitor showing CPU and memory usage in the message tray.",
+    "description": "System Monitor",
    "url": "@url@"
 }
--- a/extensions/user-theme/metadata.json.in
+++ b/extensions/user-theme/metadata.json.in
@@ -4,7 +4,7 @@
 "settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
 "name": "User Themes",
- "description": "Load shell themes from user directory.",
+ "description": "Load shell themes from user directory",
 "shell-version": [ "@shell_current@" ],
 "original-authors": [ "john.stowers@gmail.com" ],
 "url": "@url@"
--- a/extensions/window-list/extension.js
+++ b/extensions/window-list/extension.js
@@ -413,9 +413,9 @@ const WorkspaceIndicator = new Lang.Class({
    },

    _updateIndicator: function() {
-        this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.NONE);
+        this.workspacesItems[this._currentWorkspace].setShowDot(false);
        this._currentWorkspace = global.screen.get_active_workspace().index();
-        this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.DOT);
+        this.workspacesItems[this._currentWorkspace].setShowDot(true);

        this.statusLabel.set_text(this._getStatusText());
    },
@@ -442,7 +442,7 @@ const WorkspaceIndicator = new Lang.Class({
            }));

            if (i == this._currentWorkspace)
-                item.setOrnament(PopupMenu.Ornament.DOT);
+                item.setShowDot(true);

            this.menu.addMenuItem(item);
            this.workspacesItems[i] = item;
--- a/extensions/window-list/metadata.json.in
+++ b/extensions/window-list/metadata.json.in
@@ -4,7 +4,7 @@
 "settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
 "name": "Window List",
-"description": "Display a window list at the bottom of the screen.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME Bugzilla instead.",
+"description": "Display a window list at the bottom of the screen",
 "shell-version": [ "@shell_current@" ],
 "url": "@url@"
 }
--- a/extensions/windowsNavigator/extension.js
+++ b/extensions/windowsNavigator/extension.js
@@ -47,23 +47,11 @@ function enable() {
    winInjections['hideTooltip'] = undefined;

    Workspace.Workspace.prototype.showTooltip = function() {
-        if (this._tip == null || this._actualGeometry == null)
+        if (this._tip == null)
            return;
        this._tip.text = (this.metaWorkspace.index() + 1).toString();
-
-        // Hand code this instead of using _getSpacingAndPadding
-        // because that fails on empty workspaces
-        let node = this.actor.get_theme_node();
-        let padding = {
-            left: node.get_padding(St.Side.LEFT),
-            top: node.get_padding(St.Side.TOP),
-            bottom: node.get_padding(St.Side.BOTTOM),
-            right: node.get_padding(St.Side.RIGHT),
-        };
-
-        let area = Workspace.padArea(this._actualGeometry, padding);
-        this._tip.x = area.x;
-        this._tip.y = area.y;
+        this._tip.x = this._x;
+        this._tip.y = this._y;
        this._tip.show();
        this._tip.raise_top();
    }
--- a/extensions/windowsNavigator/metadata.json.in
+++ b/extensions/windowsNavigator/metadata.json.in
@@ -6,6 +6,6 @@
    "gettext-domain": "@gettext_domain@",
    "original-author": "zaspire@rambler.ru",
    "name": "windowNavigator",
-    "description": "Allow keyboard selection of windows and workspaces in overlay mode. <Ctrl>number selects a workspace, and <Alt>number selects a window.",
+    "description": "Allow keyboard selection of windows and workspaces in overlay mode",
    "url": "@url@"
 }
--- a/extensions/workspace-indicator/extension.js
+++ b/extensions/workspace-indicator/extension.js
@@ -66,9 +66,9 @@ const WorkspaceIndicator = new Lang.Class({
    },

    _updateIndicator: function() {
-	this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.NONE);
+	this.workspacesItems[this._currentWorkspace].setShowDot(false);
 	this._currentWorkspace = global.screen.get_active_workspace().index();
-	this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.DOT);
+	this.workspacesItems[this._currentWorkspace].setShowDot(true);

 	this.statusLabel.set_text(this._labelText());
    },
@@ -98,7 +98,7 @@ const WorkspaceIndicator = new Lang.Class({
 	    }));

 	    if (i == this._currentWorkspace)
-		this.workspacesItems[i].setOrnament(PopupMenu.Ornament.DOT);
+		this.workspacesItems[i].setShowDot(true);
 	}

 	this.statusLabel.set_text(this._labelText());
--- a/extensions/workspace-indicator/metadata.json.in
+++ b/extensions/workspace-indicator/metadata.json.in
@@ -4,7 +4,7 @@
    "settings-schema": "@gschemaname@",
    "gettext-domain": "@gettext_domain@",
    "name": "Workspace Indicator",
-    "description": "Put an indicator on the panel signaling in which workspace you are, and give you the possibility of switching to another one.",
+    "description": "Put an indicator on the panel signaling in which workspace you are, and give you the possibility of switching to another one",
    "shell-version": [ "@shell_current@" ],
    "original-authors": [ "erick.red@gmail.com" ],
    "url": "@url@"
--- a/extensions/xrandr-indicator/extension.js
+++ b/extensions/xrandr-indicator/extension.js
@@ -94,7 +94,7 @@ const Indicator = new Lang.Class({
            if (bitmask & allowedRotations) {
                let item = new PopupMenu.PopupMenuItem(Gettext.gettext(name));
                if (bitmask & currentRotation)
-                    item.setOrnament(PopupMenu.Ornament.DOT);
+                    item.setShowDot(true);
                item.connect('activate', Lang.bind(this, function(item, event) {
                    /* ensure config is saved so we get a backup if anything goes wrong */
                    config.save();
--- a/extensions/xrandr-indicator/metadata.json.in
+++ b/extensions/xrandr-indicator/metadata.json.in
@@ -4,7 +4,7 @@
 "settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
 "name": "Monitor Status Indicator",
-"description": "Add a system status menu for rotating monitors.",
+"description": "Add a systems status menu for rotating monitors (overrides what is currently provided by gnome-settings-daemon)",
 "shell-version": [ "@shell_current@" ],
 "url": "@url@"
 }
--- a/po/POTFILES.in
+++ b/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
--- a/po/es.po
+++ b/po/es.po
@@ -11,8 +11,8 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2013-04-16 19:31+0000\n"
+"shell&keywords=I18N+L10N&component=extensions\n"
+"POT-Creation-Date: 2013-06-07 23:00+0000\n"
 "PO-Revision-Date: 2013-06-13 11:24+0200\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
@@ -39,6 +39,27 @@ msgstr "GNOME Shell clásico"
 #: ../data/gnome-shell-classic.desktop.in.in.h:2
 msgid "Window management and application launching"
 msgstr "Gestión de ventanas e inicio de aplicaciones"
+
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:1
+msgid "Attach modal dialog to the parent window"
+msgstr "Acoplar un diálogo modal a la ventana padre"
+
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:2
+msgid ""
+"This key overrides the key in org.gnome.mutter when running GNOME Shell."
+msgstr ""
+"Esta clave sobreescribe la clave en org.gnome.mutter al ejecutar GNOME Shell."
+
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:3
+msgid "Enable edge tiling when dropping windows on screen edges"
+msgstr ""
+"Activar el mosaico en los bordes al arrastrar ventanas a los bordes de la "
+"ventana"
+
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:4
+#| msgid "Workspace Indicator"
+msgid "Workspaces only on primary monitor"
+msgstr "Áreas de trabajo solo en la pantalla principal"

 #: ../extensions/alternate-tab/prefs.js:20
 msgid "Thumbnail only"
@@ -251,9 +272,6 @@ msgid "When to group windows"
 msgid "When to group windows"
 msgstr "Cuándo agrupar las ventanas"

-#: ../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 "
 #: ../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. "
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-19 21:13+0200\n"
-"PO-Revision-Date: 2013-04-19 21:14+0200\n"
+"POT-Creation-Date: 2013-06-08 21:04+0200\n"
+"PO-Revision-Date: 2013-06-08 21:05+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <gnomepl@aviary.pl>\n"
 "Language: pl\n"
@@ -40,6 +40,27 @@ msgstr "Klasyczna powłoka GNOME"
 msgid "Window management and application launching"
 msgstr "Zarządzanie oknami i uruchamianie programów"

+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:1
+msgid "Attach modal dialog to the parent window"
+msgstr "Dołączanie modalnych okien dialogowych do okien nadrzędnych"
+
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:2
+msgid ""
+"This key overrides the key in org.gnome.mutter when running GNOME Shell."
+msgstr ""
+"Ten klucz zastępuje klucz w \"org.gnome.mutter\", kiedy uruchomiona jest "
+"powłoka GNOME."
+
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:3
+msgid "Enable edge tiling when dropping windows on screen edges"
+msgstr ""
+"Włączenie kafelkowania przy krawędziach podczas przenoszenia okien do "
+"krawędzi ekranu"
+
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:4
+msgid "Workspaces only on primary monitor"
+msgstr "Obszary robocze tylko na pierwszym monitorze"
+
 #: ../extensions/alternate-tab/prefs.js:20
 msgid "Thumbnail only"
 msgstr "Tylko miniatury"
--- a/po/sk.po
+++ b/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"
-"PO-Revision-Date: 2012-11-04 21:46+0100\n"
+"POT-Creation-Date: 2013-06-05 18:52+0000\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
-#: ../extensions/alternate-tab/org.gnome.shell.extensions.alternate-tab.gschema.xml.in.h:1
-msgid "The application icon mode."
-msgstr "Režim ikony aplikácie."
+#: ../data/gnome-classic.desktop.in.h:1
+#: ../data/gnome-classic.session.desktop.in.in.h:1
+msgid "GNOME Classic"
+msgstr "Klasické prostredie GNOME"

-# gsetting description
-#: ../extensions/alternate-tab/org.gnome.shell.extensions.alternate-tab.gschema.xml.in.h:2
-msgid ""
-"Configures how the windows are shown in the switcher. Valid possibilities "
-"are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-"
-"only' (shows only the application icon) or 'both'."
-msgstr ""
-"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)."
+#: ../data/gnome-classic.desktop.in.h:2
+msgid "This session logs you into GNOME Classic"
+msgstr "Táto relácia vás prihlási do klasického prostredia GNOME"
+
+#: ../data/gnome-shell-classic.desktop.in.in.h:1
+msgid "GNOME Shell Classic"
+msgstr "Klasický shell prostredia GNOME"

 # 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
-#: ../extensions/alternate-tab/prefs.js:43
+#  Label
+#: ../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 "
-"pre Shell.\n"
+"Rozšírenie Example vám má ukázať, ako sa dajú zostaviť dobre vyzerajúce a "
+"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
-#: ../extensions/places-menu/extension.js:46
+#  menu item
+#: ../extensions/places-menu/extension.js:77
 msgid "Places"
 msgstr "Miesta"

-# menu item
-#: ../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
+#: ../extensions/places-menu/placeDisplay.js:56
 #, 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
-msgid "File System"
-msgstr "Súborový systém"
-
-#: ../extensions/places-menu/placeDisplay.js:195
-msgid "Browse network"
+#: ../extensions/places-menu/placeDisplay.js:286
+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"
--- a/po/sl.po
+++ b/po/sl.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2013-04-20 13:37+0000\n"
-"PO-Revision-Date: 2013-04-21 08:07+0100\n"
+"POT-Creation-Date: 2013-06-07 23:00+0000\n"
+"PO-Revision-Date: 2013-06-13 21:46+0100\n"
 "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
 "Language: sl_SI\n"
@@ -39,6 +39,25 @@ msgstr "Običajna lupina GNOME"
 msgid "Window management and application launching"
 msgstr "Upravljanje oken in zaganjanje programov"

+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:1
+msgid "Attach modal dialog to the parent window"
+msgstr "Pripni modalno pogovorno okno na nadrejeno okno"
+
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:2
+msgid ""
+"This key overrides the key in org.gnome.mutter when running GNOME Shell."
+msgstr ""
+"Ključ prepiše nastavitev org.gnome.mutter, kadar je zagnana lupina GNOME."
+
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:3
+msgid "Enable edge tiling when dropping windows on screen edges"
+msgstr "Omogoči zlaganje robov ob spuščanju oken na robove zaslona"
+
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:4
+#| msgid "Workspace Indicator"
+msgid "Workspaces only on primary monitor"
+msgstr "Delovne površine so le na osnovnem zasnonu"
+
 #: ../extensions/alternate-tab/prefs.js:20
 msgid "Thumbnail only"
 msgstr "Le sličice"
--- a/po/sr.po
+++ b/po/sr.po
@@ -8,16 +8,16 @@ msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2013-04-19 19:12+0000\n"
-"PO-Revision-Date: 2013-05-14 18:48+0200\n"
+"POT-Creation-Date: 2013-02-20 11:19+0000\n"
+"PO-Revision-Date: 2013-02-20 12:19+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
-"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"

 #: ../data/gnome-classic.desktop.in.h:1
@@ -86,15 +86,15 @@ msgstr "Укључује замрзавање"
 msgid "Control the visibility of the Hibernate menu item"
 msgstr "Управља видљивошћу ставке изборника замрзавања"

-#: ../extensions/apps-menu/extension.js:39
+#: ../extensions/apps-menu/extension.js:37
 msgid "Activities Overview"
 msgstr "Преглед активности"

-#: ../extensions/apps-menu/extension.js:113
+#: ../extensions/apps-menu/extension.js:95
 msgid "Favorites"
 msgstr "Омиљено"

-#: ../extensions/apps-menu/extension.js:278
+#: ../extensions/apps-menu/extension.js:189
 msgid "Applications"
 msgstr "Програми"

@@ -246,16 +246,12 @@ msgid "When to group windows"
 msgstr "Када груписати прозоре"

 #: ../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\" and \"always\"."
 msgid ""
 "Decides when to group windows from the same application on the window list. "
-"Possible values are \"never\", \"auto\" and \"always\"."
+"Possible values are \"never\" and \"always\"."
 msgstr ""
 "Одређује када ће бити груписани прозори истог програма у списку прозора. "
-"Дозвољене вредности су „never“ (никад), „auto“ (аутоматски) и „always“ "
-"(увек)."
+"Дозвољене вредности су „never“ (никад) и „always“ (увек)."

 #: ../extensions/window-list/prefs.js:30
 msgid "Window Grouping"
@@ -266,10 +262,6 @@ msgid "Never group windows"
 msgstr "Никад не групиши прозоре"

 #: ../extensions/window-list/prefs.js:50
-msgid "Group windows when space is limited"
-msgstr "Групиши прозоре када је простор ограничен"
-
-#: ../extensions/window-list/prefs.js:51
 msgid "Always group windows"
 msgstr "Увек групиши прозоре"

--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -8,16 +8,16 @@ msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2013-04-19 19:12+0000\n"
-"PO-Revision-Date: 2013-05-14 18:48+0200\n"
+"POT-Creation-Date: 2013-02-20 11:19+0000\n"
+"PO-Revision-Date: 2013-02-20 12:19+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
-"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"

 #: ../data/gnome-classic.desktop.in.h:1
@@ -86,15 +86,15 @@ msgstr "Uključuje zamrzavanje"
 msgid "Control the visibility of the Hibernate menu item"
 msgstr "Upravlja vidljivošću stavke izbornika zamrzavanja"

-#: ../extensions/apps-menu/extension.js:39
+#: ../extensions/apps-menu/extension.js:37
 msgid "Activities Overview"
 msgstr "Pregled aktivnosti"

-#: ../extensions/apps-menu/extension.js:113
+#: ../extensions/apps-menu/extension.js:95
 msgid "Favorites"
 msgstr "Omiljeno"

-#: ../extensions/apps-menu/extension.js:278
+#: ../extensions/apps-menu/extension.js:189
 msgid "Applications"
 msgstr "Programi"

@@ -246,16 +246,12 @@ msgid "When to group windows"
 msgstr "Kada grupisati prozore"

 #: ../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\" and \"always\"."
 msgid ""
 "Decides when to group windows from the same application on the window list. "
-"Possible values are \"never\", \"auto\" and \"always\"."
+"Possible values are \"never\" and \"always\"."
 msgstr ""
 "Određuje kada će biti grupisani prozori istog programa u spisku prozora. "
-"Dozvoljene vrednosti su „never“ (nikad), „auto“ (automatski) i „always“ "
-"(uvek)."
+"Dozvoljene vrednosti su „never“ (nikad) i „always“ (uvek)."

 #: ../extensions/window-list/prefs.js:30
 msgid "Window Grouping"
@@ -266,10 +262,6 @@ msgid "Never group windows"
 msgstr "Nikad ne grupiši prozore"

 #: ../extensions/window-list/prefs.js:50
-msgid "Group windows when space is limited"
-msgstr "Grupiši prozore kada je prostor ograničen"
-
-#: ../extensions/window-list/prefs.js:51
 msgid "Always group windows"
 msgstr "Uvek grupiši prozore"
Author	SHA1	Message	Date
Giovanni Campagna	fa30f93615	places-menu: null-check g_volume_get_identifier() Not all volumes have the 'class' identifier (for example MTP doesn't), and we can't apply indexOf on null.	2013-06-17 21:42:52 +02:00
Matej Urbančič	d5ca1ab497	Updated Slovenian translation	2013-06-13 21:47:19 +02:00
Daniel Mustieles	2df85711e4	Updated Spanish translation	2013-06-13 11:26:46 +02:00
Jeremy Bicha	1557eef5d9	classic: Drop IsRunnableHelper https://bugzilla.gnome.org/show_bug.cgi?id=701886	2013-06-08 20:46:39 -04:00
Piotr Drąg	f238f29728	Updated Polish translation	2013-06-08 21:05:56 +02:00
Giovanni Campagna	3ef8d50556	Bump version to 3.8.3 To go along GNOME Shell 3.8.3	2013-06-08 01:03:01 +02:00
Florian Müllner	222eaa04c9	classic: Replace mini-extensions with mode-specific overridesSchema Some default values differ between classic and normal sessions. We used to implement this by overriding the shell's default values in mini-extensions (or more precisely: reversing the shell's overrides). Use a mode-specific overridesSchema instead, which has the advantage that settings defaults will not change unexpectedly when extensions are disabled/enabled (for instance during screen locks). https://bugzilla.gnome.org/show_bug.cgi?id=701717	2013-06-08 00:59:22 +02:00
Jakub Steiner	b4f602e0dd	Style scrollbar in classic bubbles https://bugzilla.gnome.org/show_bug.cgi?id=700485	2013-06-07 20:19:16 +02:00
Florian Müllner	d43ee6831a	classic: Adjust popup menu slider style https://bugzilla.gnome.org/show_bug.cgi?id=697917	2013-06-07 20:19:14 +02:00
Dušan Kazik	aa3ca5ff4a	Updated slovak translation	2013-06-05 20:54:56 +02:00
Wepmaschda	beb3e4acfb	make windowCaptionsOnTop working again * changed positionWindows() to relayout() * additionally marked the difference to the original relayout() function. https://bugzilla.gnome.org/show_bug.cgi?id=699054	2013-05-24 22:32:54 +02:00
Wepmaschda	71b03c8878	reduce gnome-shell modifications * use original realPositionWindows() and map _computeAllWindowSlots() to our function (_calculateWindowTransformationsNatural()). * adapted _calculateWindowTransformationsNatural() to _computeAllWindowSlots()' behaviour https://bugzilla.gnome.org/show_bug.cgi?id=699054	2013-05-24 22:32:54 +02:00
Giovanni Campagna	fe6a391cd0	alternative-status-menu: take GSettings in consideration for item visibility Seems this was lost at some point.	2013-05-24 19:15:23 +02:00
Florian Müllner	1fc86978d2	apps-menu: Add some padding to ScrollView In case the scroll bar is visible, is is currently positioned at the very edge of the popup, which looks fairly bad; so add some minimal padding. https://bugzilla.gnome.org/show_bug.cgi?id=700852	2013-05-22 19:41:16 +02:00
Giovanni Campagna	3c100c393a	Bump version to 3.8.2 To go along GNOME Shell 3.8.2	2013-05-14 07:16:36 +02:00
Florian Müllner	2e1856ab34	window-list: Make bottom panel taller in classic mode Consider additional borders in classic styling for the panel height. https://bugzilla.gnome.org/show_bug.cgi?id=698169	2013-05-13 22:02:27 +02:00
Florian Müllner	0861745de4	window-list: Use notify::n-workspaces to recreate workspace menu When the number of workspaces changes, we clear the existing menu and recreate it based on the screen::n-workspaces property, so it is slightly more correct to track changes to the property directly instead of using the workspace-added/workspace-removed signals. This change also fixes a corner case, where changes to the property before workspaces are initialized are missed and we end up with the wrong number of workspaces. https://bugzilla.gnome.org/show_bug.cgi?id=699350	2013-04-30 21:54:54 +02:00
				`@@ -1 +0,0 @@`
				`/* This extensions requires no special styling */`