Bump version to 3.12.2

To go along GNOME Shell 3.12.2

NEWS

@@ -1,14 +1,8 @@
-3.13.2
+3.12.2
 ======
-* Fix sorting of grouped buttons in window list
-* Tweak preference UIs
-* updated translations (en_GB)
-
-3.13.1
-======
-* add DesktopNames key to the classic session file
 * classic theme: remove rounded corners from tile previews
-* window-list: don't shift message tray on other monitors
+* several fixes and improvements to the window-list
+  (keep button order stable, don't shift message tray on other monitors)
 * auto-move-windows: several fixes and updates for api changes
 * launch-new-instances: updates for api changes
 * updated translations (ja, km)

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell-extensions],[3.13.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=extensions])
+AC_INIT([gnome-shell-extensions],[3.12.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=extensions])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([config])

data/gnome-classic.desktop.in

@@ -5,4 +5,3 @@ Exec=env GNOME_SHELL_SESSION_MODE=classic gnome-session --session gnome-classic
 TryExec=gnome-session
 Icon=
 Type=Application
-DesktopNames=GNOME-Classic;GNOME

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

@@ -11,14 +11,6 @@
       </_description>
     </key>
 
-    <key name="button-layout" type="s">
-      <default>"appmenu:minimize,maximize,close"</default>
-      <_summary>Arrangement of buttons on the titlebar</_summary>
-      <_description>
-        This key overrides the key in org.gnome.desktop.wm.preferences 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>

extensions/alternate-tab/prefs.js

@@ -29,24 +29,16 @@ const AltTabSettingsWidget = new GObject.Class({
 
     _init : function(params) {
         this.parent(params);
-        this.margin = 24;
+        this.margin = 10;
-        this.row_spacing = 6;
 	this.orientation = Gtk.Orientation.VERTICAL;
 
         this._settings = new Gio.Settings({ schema: 'org.gnome.shell.window-switcher' });
 
-        let presentLabel = '<b>' + _("Present windows as") + '</b>';
+        let presentLabel = _("Present windows as");
-        this.add(new Gtk.Label({ label: presentLabel, use_markup: true,
+        this.add(new Gtk.Label({ label: presentLabel, sensitive: true,
-                                 halign: Gtk.Align.START }));
+                                 margin_bottom: 10, margin_top: 5 }));
-
-        let align = new Gtk.Alignment({ left_padding: 12 });
-        this.add(align);
-
-        let grid = new Gtk.Grid({ orientation: Gtk.Orientation.VERTICAL,
-                                  row_spacing: 6,
-                                  column_spacing: 6 });
-        align.add(grid);
 
+        let top = 1;
         let radio = null;
         let currentMode = this._settings.get_string(SETTINGS_APP_ICON_MODE);
         for (let mode in MODES) {
@@ -60,14 +52,15 @@ const AltTabSettingsWidget = new GObject.Class({
                 if (widget.active)
                     this._settings.set_string(SETTINGS_APP_ICON_MODE, modeCapture);
             }));
-            grid.add(radio);
+            this.add(radio);
 
             if (mode == currentMode)
                 radio.active = true;
+            top += 1;
         }
 
 	let check = new Gtk.CheckButton({ label: _("Show only windows in the current workspace"),
-	                                  margin_top: 6 });
+					  margin_top: 12 });
 	this._settings.bind(SETTINGS_CURRENT_WORKSPACE_ONLY, check, 'active', Gio.SettingsBindFlags.DEFAULT);
 	this.add(check);
     },

extensions/auto-move-windows/prefs.js

@@ -37,7 +37,7 @@ const Widget = new GObject.Class({
 
     _init: function(params) {
 	this.parent(params);
-        this.set_orientation(Gtk.Orientation.VERTICAL);
+	this.set_orientation(Gtk.Orientation.VERTICAL);
 
 	this._settings = Convenience.getSettings();
 	this._settings.connect('changed', Lang.bind(this, this._refresh));
@@ -47,11 +47,6 @@ const Widget = new GObject.Class({
 	this._store.set_column_types([Gio.AppInfo, GObject.TYPE_STRING, Gio.Icon, GObject.TYPE_INT,
                                       Gtk.Adjustment]);
 
-        let scrolled = new Gtk.ScrolledWindow({ shadow_type: Gtk.ShadowType.IN});
-        scrolled.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
-        this.add(scrolled);
-
-
 	this._treeView = new Gtk.TreeView({ model: this._store,
                                             hexpand: true, vexpand: true });
 	this._treeView.get_selection().set_mode(Gtk.SelectionMode.SINGLE);
@@ -75,29 +70,22 @@ const Widget = new GObject.Class({
         workspaceColumn.add_attribute(workspaceRenderer, "text", Columns.WORKSPACE);
 	this._treeView.append_column(workspaceColumn);
 
-	scrolled.add(this._treeView);
+	this.add(this._treeView);
 
-	let toolbar = new Gtk.Toolbar({ icon_size: Gtk.IconSize.SMALL_TOOLBAR });
+	let toolbar = new Gtk.Toolbar();
 	toolbar.get_style_context().add_class(Gtk.STYLE_CLASS_INLINE_TOOLBAR);
 	this.add(toolbar);
 
-	let newButton = new Gtk.ToolButton({ icon_name: 'bookmark-new-symbolic',
+	let newButton = new Gtk.ToolButton({ stock_id: Gtk.STOCK_NEW,
-                                             label: _("Add Rule"),
+                                             label: _("Add rule"),
 					     is_important: true });
 	newButton.connect('clicked', Lang.bind(this, this._createNew));
 	toolbar.add(newButton);
 
-	let delButton = new Gtk.ToolButton({ icon_name: 'edit-delete-symbolic'  });
+	let delButton = new Gtk.ToolButton({ stock_id: Gtk.STOCK_DELETE });
 	delButton.connect('clicked', Lang.bind(this, this._deleteSelected));
 	toolbar.add(delButton);
 
-        let selection = this._treeView.get_selection();
-        selection.connect('changed',
-            function() {
-                delButton.sensitive = selection.count_selected_rows() > 0;
-            });
-        delButton.sensitive = selection.count_selected_rows() > 0;
-
 	this._changedPermitted = true;
 	this._refresh();
     },
@@ -105,27 +93,18 @@ const Widget = new GObject.Class({
     _createNew: function() {
 	let dialog = new Gtk.Dialog({ title: _("Create new matching rule"),
 				      transient_for: this.get_toplevel(),
-                                      use_header_bar: true,
 				      modal: true });
 	dialog.add_button(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL);
-	let addButton = dialog.add_button(_("Add"), Gtk.ResponseType.OK);
+	dialog.add_button(_("Add"), Gtk.ResponseType.OK);
         dialog.set_default_response(Gtk.ResponseType.OK);
 
 	let grid = new Gtk.Grid({ column_spacing: 10,
                                   row_spacing: 15,
                                   margin: 10 });
 	dialog._appChooser = new Gtk.AppChooserWidget({ show_all: true });
-        dialog._appChooser.connect('application-selected', Lang.bind(this,
-            function(w, appInfo) {
-                addButton.sensitive = appInfo &&
-                                      this._checkId(appInfo.get_id());
-            }));
-        let appInfo = dialog._appChooser.get_app_info();
-        addButton.sensitive = appInfo && this._checkId(appInfo.get_id());
-
 	grid.attach(dialog._appChooser, 0, 0, 2, 1);
-	grid.attach(new Gtk.Label({ label: _("Workspace"),
+	grid.attach(new Gtk.Label({ label: _("Workspace") }),
-                                    halign: Gtk.Align.END }), 0, 1, 1, 1);
+		    0, 1, 1, 1);
 	let adjustment = new Gtk.Adjustment({ lower: 1,
 					      upper: WORKSPACE_MAX,
 					      step_increment: 1
@@ -150,9 +129,10 @@ const Widget = new GObject.Class({
 		index = 1;
 
 	    this._changedPermitted = false;
-	    this._appendItem(appInfo.get_id(), index);
+	    if (!this._appendItem(appInfo.get_id(), index)) {
-	    this._changedPermitted = true;
+                this._changedPermitted = true;
-
+                return;
+            }
 	    let iter = this._store.append();
 	    let adj = new Gtk.Adjustment({ lower: 1,
 					   upper: WORKSPACE_MAX,
@@ -161,6 +141,7 @@ const Widget = new GObject.Class({
 	    this._store.set(iter,
 			    [Columns.APPINFO, Columns.ICON, Columns.DISPLAY_NAME, Columns.WORKSPACE, Columns.ADJUSTMENT],
 			    [appInfo, appInfo.get_icon(), appInfo.get_display_name(), index, adj]);
+	    this._changedPermitted = true;
 
             dialog.destroy();
 	}));
@@ -175,8 +156,8 @@ const Widget = new GObject.Class({
 
 	    this._changedPermitted = false;
 	    this._removeItem(appInfo.get_id());
-	    this._changedPermitted = true;
 	    this._store.remove(iter);
+	    this._changedPermitted = true;
 	}
     },
 
@@ -224,15 +205,20 @@ const Widget = new GObject.Class({
 	    this._settings.set_strv(SETTINGS_KEY, validItems);
     },
 
-    _checkId: function(id) {
-        let items = this._settings.get_strv(SETTINGS_KEY);
-        return !items.some(function(i) { return i.startsWith(id + ':'); });
-    },
-
     _appendItem: function(id, workspace) {
 	let currentItems = this._settings.get_strv(SETTINGS_KEY);
+	let alreadyHave = currentItems.map(function(el) {
+	    return el.split(':')[0];
+	}).indexOf(id) != -1;
+
+	if (alreadyHave) {
+            printerr("Already have an item for this id");
+	    return false;
+        }
+
 	currentItems.push(id + ':' + workspace);
 	this._settings.set_strv(SETTINGS_KEY, currentItems);
+        return true;
     },
 
     _removeItem: function(id) {
@@ -267,7 +253,7 @@ function init() {
 }
 
 function buildPrefsWidget() {
-    let widget = new Widget({ margin: 12 });
+    let widget = new Widget();
     widget.show_all();
 
     return widget;

extensions/window-list/extension.js

@@ -60,7 +60,7 @@ function _onMenuStateChanged(menu, isOpen) {
 function _getAppStableSequence(app) {
     return app.get_windows().reduce(function(prev, cur) {
         return Math.min(prev, cur.get_stable_sequence());
-    }, Infinity);
+    }, 0);
 }
 
 

extensions/workspace-indicator/prefs.js

@@ -135,16 +135,11 @@ const WorkspaceSettingsWidget = new GObject.Class({
 
     _init: function(params) {
         this.parent(params);
-        this.margin = 12;
+        this.margin = 10;
         this.orientation = Gtk.Orientation.VERTICAL;
 
-        this.add(new Gtk.Label({ label: '<b>' + _("Workspace Names") + '</b>',
+        this.add(new Gtk.Label({ label: _("Workspace names:"),
-                                 use_markup: true, margin_bottom: 6,
+                                 margin_bottom: 5 }));
-                                 hexpand: true, halign: Gtk.Align.START }));
-
-        let scrolled = new Gtk.ScrolledWindow({ shadow_type: Gtk.ShadowType.IN });
-        scrolled.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
-        this.add(scrolled);
 
         this._store = new WorkspaceNameModel();
         this._treeView = new Gtk.TreeView({ model: this._store,
@@ -161,26 +156,19 @@ const WorkspaceSettingsWidget = new GObject.Class({
         column.add_attribute(renderer, 'text', this._store.Columns.LABEL);
         this._treeView.append_column(column);
 
-        scrolled.add(this._treeView);
+        this.add(this._treeView);
 
-        let toolbar = new Gtk.Toolbar({ icon_size: Gtk.IconSize.SMALL_TOOLBAR });
+        let toolbar = new Gtk.Toolbar();
         toolbar.get_style_context().add_class(Gtk.STYLE_CLASS_INLINE_TOOLBAR);
 
-        let newButton = new Gtk.ToolButton({ icon_name: 'list-add-symbolic' });
+        let newButton = new Gtk.ToolButton({ stock_id: Gtk.STOCK_NEW });
         newButton.connect('clicked', Lang.bind(this, this._newClicked));
         toolbar.add(newButton);
 
-        let delButton = new Gtk.ToolButton({ icon_name: 'list-remove-symbolic' });
+        let delButton = new Gtk.ToolButton({ stock_id: Gtk.STOCK_DELETE });
         delButton.connect('clicked', Lang.bind(this, this._delClicked));
         toolbar.add(delButton);
 
-        let selection = this._treeView.get_selection();
-        selection.connect('changed',
-            function() {
-                delButton.sensitive = selection.count_selected_rows() > 0;
-            });
-        delButton.sensitive = selection.count_selected_rows() > 0;
-
         this.add(toolbar);
     },
 

po/en_GB.po

@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the gnome-shell-extensions package.
 # Bruce Cowan <bruce@bcowan.me.uk>, 2011.
 # Chris Leonard <cjlhomeaddress@gmail.com>, 2012.
-# Philip Withnall <philip@tecnocode.co.uk>, 2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"POT-Creation-Date: 2014-05-27 22:05+0100\n"
+"shell&keywords=I18N+L10N&component=extensions\n"
+"POT-Creation-Date: 2012-09-20 13:47+0000\n"
 "PO-Revision-Date: 2012-09-21 21:00-0400\n"
-"Last-Translator: Philip Withnall <philip@tecnocode.co.uk>\n"
+"Last-Translator: Chris Leonard <cjlhomeaddress@gmail.com>\n"
 "Language-Team: Sugar Labs\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
@@ -20,88 +20,68 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
-#: ../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 "The application icon mode."
-msgstr "GNOME Classic"
 
-#: ../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"
-msgstr "This session logs you into GNOME Classic"
-
-#: ../data/gnome-shell-classic.desktop.in.in.h:1
-msgid "GNOME Shell Classic"
-msgstr "GNOME Shell Classic"
-
-#: ../data/gnome-shell-classic.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "Window management and application launching"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:1
-msgid "Attach modal dialog to the parent window"
-msgstr "Attach modal dialogue to the parent window"
-
-#: ../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."
+"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 ""
-"This key overrides the key in org.gnome.mutter when running GNOME Shell."
+"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'."
 
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:3
+#: ../extensions/alternate-tab/prefs.js:26
-msgid "Arrangement of buttons on the titlebar"
-msgstr "Arrangement of buttons on the titlebar"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:4
-msgid ""
-"This key overrides the key in org.gnome.desktop.wm.preferences when running "
-"GNOME Shell."
-msgstr ""
-"This key overrides the key in org.gnome.desktop.wm.preferences when running "
-"GNOME Shell."
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:5
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr "Enable edge tiling when dropping windows on screen edges"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:6
-msgid "Workspaces only on primary monitor"
-msgstr "Workspaces only on primary monitor"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:7
-msgid "Delay focus changes in mouse mode until the pointer stops moving"
-msgstr "Delay focus changes in mouse mode until the pointer stops moving"
-
-#: ../extensions/alternate-tab/prefs.js:20
 msgid "Thumbnail only"
 msgstr "Thumbnail only"
 
-#: ../extensions/alternate-tab/prefs.js:21
+#: ../extensions/alternate-tab/prefs.js:27
 msgid "Application icon only"
 msgstr "Application icon only"
 
-#: ../extensions/alternate-tab/prefs.js:22
+#: ../extensions/alternate-tab/prefs.js:28
 msgid "Thumbnail and application icon"
 msgstr "Thumbnail and application icon"
 
-#: ../extensions/alternate-tab/prefs.js:37
+#: ../extensions/alternate-tab/prefs.js:43
 msgid "Present windows as"
 msgstr "Present windows as"
 
-#: ../extensions/alternate-tab/prefs.js:62
+#: ../extensions/alternate-tab/prefs.js:68
 msgid "Show only windows in the current workspace"
 msgstr "Show only windows in the current workspace"
 
-#: ../extensions/apps-menu/extension.js:39
+#. add the new entries
-msgid "Activities Overview"
+#: ../extensions/alternative-status-menu/extension.js:68
-msgstr "Activities Overview"
+msgid "Suspend"
+msgstr "Suspend"
 
-#: ../extensions/apps-menu/extension.js:113
+#: ../extensions/alternative-status-menu/extension.js:73
-msgid "Favorites"
+msgid "Hibernate"
-msgstr "Favourites"
+msgstr "Hibernate"
 
-#: ../extensions/apps-menu/extension.js:282
+#: ../extensions/alternative-status-menu/extension.js:78
-msgid "Applications"
+msgid "Power Off"
-msgstr "Applications"
+msgstr "Power Off"
+
+#: ../extensions/alternative-status-menu/org.gnome.shell.extensions.alternative-status-menu.gschema.xml.in.h:1
+msgid "Enable suspending"
+msgstr "Enable suspending"
+
+#: ../extensions/alternative-status-menu/org.gnome.shell.extensions.alternative-status-menu.gschema.xml.in.h:2
+msgid "Control the visibility of the Suspend menu item"
+msgstr "Control the visibility of the Suspend menu item"
+
+#: ../extensions/alternative-status-menu/org.gnome.shell.extensions.alternative-status-menu.gschema.xml.in.h:3
+msgid "Enable hibernating"
+msgstr "Enable hibernating"
+
+#: ../extensions/alternative-status-menu/org.gnome.shell.extensions.alternative-status-menu.gschema.xml.in.h:4
+msgid "Control the visibility of the Hibernate menu item"
+msgstr "Control the visibility of the Hibernate menu item"
 
 #: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:1
 msgid "Application and workspace list"
@@ -136,18 +116,89 @@ msgstr "Create new matching rule"
 msgid "Add"
 msgstr "Add"
 
-#: ../extensions/drive-menu/extension.js:106
+#: ../extensions/dock/extension.js:600
-#, javascript-format
+msgid "Drag here to add favorites"
-msgid "Ejecting drive '%s' failed:"
+msgstr "Drag here to add favourites"
-msgstr "Ejecting drive '%s' failed:"
 
-#: ../extensions/drive-menu/extension.js:123
+#: ../extensions/dock/extension.js:926
+msgid "New Window"
+msgstr "New Window"
+
+#: ../extensions/dock/extension.js:928
+msgid "Quit Application"
+msgstr "Quit Application"
+
+#: ../extensions/dock/extension.js:933
+msgid "Remove from Favorites"
+msgstr "Remove from Favourites"
+
+#: ../extensions/dock/extension.js:934
+msgid "Add to Favorites"
+msgstr "Add to Favourites"
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:1
+msgid "Position of the dock"
+msgstr "Position of the dock"
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:2
+msgid ""
+"Sets the position of the dock in the screen. Allowed values are 'right' or "
+"'left'"
+msgstr ""
+"Sets the position of the dock in the screen. Allowed values are 'right' or "
+"'left'"
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:3
+msgid "Icon size"
+msgstr "Icon size"
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:4
+msgid "Sets icon size of the dock."
+msgstr "Sets icon size of the dock."
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:5
+msgid "Enable/disable autohide"
+msgstr "Enable/disable autohide"
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:6
+msgid "Autohide effect"
+msgstr "Autohide effect"
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:7
+msgid ""
+"Sets the effect of the hide dock. Allowed values are 'resize', 'rescale' and "
+"'move'"
+msgstr ""
+"Sets the effect of the hide dock. Allowed values are 'resize', 'rescale' and "
+"'move'"
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:8
+msgid "Autohide duration"
+msgstr "Autohide duration"
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:9
+msgid "Sets the time duration of the autohide effect."
+msgstr "Sets the time duration of the autohide effect."
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:10
+msgid "Monitor"
+msgstr "Monitor"
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:11
+msgid ""
+"Sets monitor to display dock in. The default value (-1) is the primary "
+"monitor."
+msgstr ""
+"Sets monitor to display dock in. The default value (-1) is the primary "
+"monitor."
+
+#: ../extensions/drive-menu/extension.js:56
 msgid "Removable devices"
 msgstr "Removable devices"
 
-#: ../extensions/drive-menu/extension.js:150
+#: ../extensions/drive-menu/extension.js:67
-msgid "Open File"
+msgid "Open file manager"
-msgstr "Open File"
+msgstr "Open file manager"
 
 #: ../extensions/example/extension.js:17
 msgid "Hello, world!"
@@ -165,6 +216,8 @@ msgstr ""
 "If not empty, it contains the text that will be shown when clicking on the "
 "panel."
 
+#. TRANSLATORS: Example is the name of the extension, should not be
+#. translated
 #: ../extensions/example/prefs.js:30
 msgid ""
 "Example aims to show how to build well behaved extensions for the Shell and "
@@ -179,6 +232,26 @@ msgstr ""
 msgid "Message:"
 msgstr "Message:"
 
+#: ../extensions/gajim/extension.js:226
+#, c-format
+msgid "%s is away."
+msgstr "%s is away."
+
+#: ../extensions/gajim/extension.js:229
+#, c-format
+msgid "%s is offline."
+msgstr "%s is offline."
+
+#: ../extensions/gajim/extension.js:232
+#, c-format
+msgid "%s is online."
+msgstr "%s is online."
+
+#: ../extensions/gajim/extension.js:235
+#, c-format
+msgid "%s is busy."
+msgstr "%s is busy."
+
 #: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:1
 msgid "Use more screen for windows"
 msgstr "Use more screen for windows"
@@ -207,34 +280,44 @@ msgstr ""
 "shell default of placing it at the bottom. Changing this setting requires "
 "restarting the shell to have any effect."
 
-#: ../extensions/places-menu/extension.js:78
+#: ../extensions/places-menu/extension.js:46
-#: ../extensions/places-menu/extension.js:81
 msgid "Places"
 msgstr "Places"
 
-#: ../extensions/places-menu/placeDisplay.js:57
+#: ../extensions/places-menu/extension.js:47
-#, javascript-format
+msgid "Devices"
+msgstr "Devices"
+
+#: ../extensions/places-menu/extension.js:48
+msgid "Bookmarks"
+msgstr "Bookmarks"
+
+#: ../extensions/places-menu/extension.js:49
+msgid "Network"
+msgstr "Network"
+
+#: ../extensions/places-menu/placeDisplay.js:48
+#, c-format
 msgid "Failed to launch \"%s\""
 msgstr "Failed to launch \"%s\""
 
-#: ../extensions/places-menu/placeDisplay.js:99
+#: ../extensions/places-menu/placeDisplay.js:121
-#: ../extensions/places-menu/placeDisplay.js:122
-msgid "Computer"
-msgstr "Computer"
-
-#: ../extensions/places-menu/placeDisplay.js:200
 msgid "Home"
 msgstr "Home"
 
-#: ../extensions/places-menu/placeDisplay.js:287
+#: ../extensions/places-menu/placeDisplay.js:184
-msgid "Browse Network"
+msgid "File System"
-msgstr "Browse Network"
+msgstr "File System"
 
-#: ../extensions/systemMonitor/extension.js:214
+#: ../extensions/places-menu/placeDisplay.js:188
+msgid "Browse network"
+msgstr "Browse network"
+
+#: ../extensions/systemMonitor/extension.js:213
 msgid "CPU"
 msgstr "CPU"
 
-#: ../extensions/systemMonitor/extension.js:267
+#: ../extensions/systemMonitor/extension.js:266
 msgid "Memory"
 msgstr "Memory"
 
@@ -246,83 +329,10 @@ msgstr "Theme name"
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 
-#: ../extensions/window-list/extension.js:110
-msgid "Close"
-msgstr "Close"
-
-#: ../extensions/window-list/extension.js:120
-msgid "Unminimize"
-msgstr "Unminimise"
-
-#: ../extensions/window-list/extension.js:121
-msgid "Minimize"
-msgstr "Minimise"
-
-#: ../extensions/window-list/extension.js:127
-msgid "Unmaximize"
-msgstr "Unmaximise"
-
-#: ../extensions/window-list/extension.js:128
-msgid "Maximize"
-msgstr "Maximise"
-
-#: ../extensions/window-list/extension.js:300
-msgid "Minimize all"
-msgstr "Minimise all"
-
-#: ../extensions/window-list/extension.js:308
-msgid "Unminimize all"
-msgstr "Unminimise all"
-
-#: ../extensions/window-list/extension.js:316
-msgid "Maximize all"
-msgstr "Maximise all"
-
-#: ../extensions/window-list/extension.js:325
-msgid "Unmaximize all"
-msgstr "Unmaximise all"
-
-#: ../extensions/window-list/extension.js:334
-msgid "Close all"
-msgstr "Close all"
-
-#: ../extensions/window-list/extension.js:644
 #: ../extensions/workspace-indicator/extension.js:30
 msgid "Workspace Indicator"
 msgstr "Workspace Indicator"
 
-#: ../extensions/window-list/extension.js:798
-msgid "Window List"
-msgstr "Window List"
-
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:1
-msgid "When to group windows"
-msgstr "When to group windows"
-
-#: ../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 ""
-"Decides when to group windows from the same application on the window list. "
-"Possible values are \"never\", \"auto\" and \"always\"."
-
-#: ../extensions/window-list/prefs.js:30
-msgid "Window Grouping"
-msgstr "Window Grouping"
-
-#: ../extensions/window-list/prefs.js:49
-msgid "Never group windows"
-msgstr "Never group windows"
-
-#: ../extensions/window-list/prefs.js:50
-msgid "Group windows when space is limited"
-msgstr "Group windows when space is limited"
-
-#: ../extensions/window-list/prefs.js:51
-msgid "Always group windows"
-msgstr "Always group windows"
-
 #: ../extensions/workspace-indicator/prefs.js:141
 msgid "Workspace names:"
 msgstr "Workspace names:"
@@ -332,141 +342,33 @@ msgid "Name"
 msgstr "Name"
 
 #: ../extensions/workspace-indicator/prefs.js:186
-#, javascript-format
+#, c-format
 msgid "Workspace %d"
 msgstr "Workspace %d"
 
-#~ msgid "The application icon mode."
+#: ../extensions/xrandr-indicator/extension.js:30
-#~ msgstr "The application icon mode."
+msgid "Normal"
+msgstr "Normal"
 
-#~ msgid ""
+#: ../extensions/xrandr-indicator/extension.js:31
-#~ "Configures how the windows are shown in the switcher. Valid possibilities "
+msgid "Left"
-#~ "are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-"
+msgstr "Left"
-#~ "only' (shows only the application icon) or 'both'."
-#~ msgstr ""
-#~ "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'."
 
-#~ msgid "Suspend"
+#: ../extensions/xrandr-indicator/extension.js:32
-#~ msgstr "Suspend"
+msgid "Right"
+msgstr "Right"
 
-#~ msgid "Hibernate"
+#: ../extensions/xrandr-indicator/extension.js:33
-#~ msgstr "Hibernate"
+msgid "Upside-down"
+msgstr "Upside-down"
 
-#~ msgid "Power Off"
+#: ../extensions/xrandr-indicator/extension.js:50
-#~ msgstr "Power Off"
+msgid "Display"
+msgstr "Display"
 
-#~ msgid "Enable suspending"
+#: ../extensions/xrandr-indicator/extension.js:80
-#~ msgstr "Enable suspending"
+msgid "Display Settings"
-
+msgstr "Display Settings"
-#~ msgid "Control the visibility of the Suspend menu item"
-#~ msgstr "Control the visibility of the Suspend menu item"
-
-#~ msgid "Enable hibernating"
-#~ msgstr "Enable hibernating"
-
-#~ msgid "Control the visibility of the Hibernate menu item"
-#~ msgstr "Control the visibility of the Hibernate menu item"
-
-#~ msgid "Drag here to add favorites"
-#~ msgstr "Drag here to add favourites"
-
-#~ msgid "New Window"
-#~ msgstr "New Window"
-
-#~ msgid "Quit Application"
-#~ msgstr "Quit Application"
-
-#~ msgid "Remove from Favorites"
-#~ msgstr "Remove from Favourites"
-
-#~ msgid "Position of the dock"
-#~ msgstr "Position of the dock"
-
-#~ msgid ""
-#~ "Sets the position of the dock in the screen. Allowed values are 'right' "
-#~ "or 'left'"
-#~ msgstr ""
-#~ "Sets the position of the dock in the screen. Allowed values are 'right' "
-#~ "or 'left'"
-
-#~ msgid "Icon size"
-#~ msgstr "Icon size"
-
-#~ msgid "Sets icon size of the dock."
-#~ msgstr "Sets icon size of the dock."
-
-#~ msgid "Enable/disable autohide"
-#~ msgstr "Enable/disable autohide"
-
-#~ msgid "Autohide effect"
-#~ msgstr "Autohide effect"
-
-#~ msgid ""
-#~ "Sets the effect of the hide dock. Allowed values are 'resize', 'rescale' "
-#~ "and 'move'"
-#~ msgstr ""
-#~ "Sets the effect of the hide dock. Allowed values are 'resize', 'rescale' "
-#~ "and 'move'"
-
-#~ msgid "Autohide duration"
-#~ msgstr "Autohide duration"
-
-#~ msgid "Sets the time duration of the autohide effect."
-#~ msgstr "Sets the time duration of the autohide effect."
-
-#~ msgid "Monitor"
-#~ msgstr "Monitor"
-
-#~ msgid ""
-#~ "Sets monitor to display dock in. The default value (-1) is the primary "
-#~ "monitor."
-#~ msgstr ""
-#~ "Sets monitor to display dock in. The default value (-1) is the primary "
-#~ "monitor."
-
-#~ msgid "%s is away."
-#~ msgstr "%s is away."
-
-#~ msgid "%s is offline."
-#~ msgstr "%s is offline."
-
-#~ msgid "%s is online."
-#~ msgstr "%s is online."
-
-#~ msgid "%s is busy."
-#~ msgstr "%s is busy."
-
-#~ msgid "Devices"
-#~ msgstr "Devices"
-
-#~ msgid "Bookmarks"
-#~ msgstr "Bookmarks"
-
-#~ msgid "Network"
-#~ msgstr "Network"
-
-#~ msgid "File System"
-#~ msgstr "File System"
-
-#~ msgid "Normal"
-#~ msgstr "Normal"
-
-#~ msgid "Left"
-#~ msgstr "Left"
-
-#~ msgid "Right"
-#~ msgstr "Right"
-
-#~ msgid "Upside-down"
-#~ msgstr "Upside-down"
-
-#~ msgid "Display"
-#~ msgstr "Display"
-
-#~ msgid "Display Settings"
-#~ msgstr "Display Settings"
 
 #~ msgid "Do Not Disturb"
 #~ msgstr "Do Not Disturb"