Bump version to 3.31.90

Update NEWS.

.eslintrc.json

@@ -0,0 +1,6 @@
+{
+    "extends": [
+        "./lint/eslintrc-gjs.json",
+        "./lint/eslintrc-shell.json"
+    ]
+}

.gitlab-ci.yml

@@ -1,13 +1,25 @@
-image: fedora:rawhide
-
 stages:
+ - source_check
  - build
 
-before_script:
-  - dnf install -y meson gettext gjs-devel
+variables:
+ LINT_LOG: "eslint-report.txt"
+
+eslint:
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.static-analysis
+  stage: source_check
+  script:
+    - sh lint/generate-report.sh -o $LINT_LOG || { cat $LINT_LOG; false; }
+  artifacts:
+    paths:
+      - ${LINT_LOG}
+    when: on_failure
 
 build-shell-extensions:
+  image: fedora:latest
   stage: build
+  before_script:
+    - dnf install -y meson gettext mozjs60-devel
   script:
     - meson _build .
     - ninja -C _build test install

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "data/gnome-shell-sass"]
 	path = data/gnome-shell-sass
-	url = https://git.gnome.org/browse/gnome-shell-sass/
+	url = https://gitlab.gnome.org/GNOME/gnome-shell-sass.git

NEWS

@@ -1,3 +1,81 @@
+3.31.90
+=======
+* Misc. bug fixes and cleanups [Florian; !49, !50, !51]
+
+Contributors:
+  Florian Müllner
+
+Translators:
+  Ryuta Fujii [ja], Charles Monzat [fr], Pieter Schalk Schoeman [af]
+
+3.31.2
+======
+* Remove obsolete alternate-tab extension [Florian; #786496]
+* Adjust to gnome-shell changes [Florian; #113]
+
+Contributors:
+  Florian Müllner
+
+3.30.1
+======
+* apps-menu: Fix height on HiDPI systems [Florian; #102]
+* window-list: Only switch between windows on active workspace when scrolling
+  [Florian; #78]
+
+Contributors:
+  Florian Müllner
+
+3.30.0
+======
+* Bump version
+
+3.29.91
+=======
+* Misc. bug fixes [Florian; #90]
+
+Contributors:
+  Florian Müllner
+
+3.29.90
+=======
+* Misc. bug fixes [Florian; #786496]
+
+Contributors:
+  Florian Müllner
+
+3.29.3
+======
+* Adjust to global.screen removal [Jonas; #759538]
+
+Contributors:
+  Jonas Ådahl, Florian Müllner
+
+3.29.2
+======
+* Misc. bug fixes [Florian; #69]
+
+Contributors:
+  Florian Müllner
+
+3.28.1
+======
+* Misc. bug fixes [Xiaoguang, Florian; #59, #62]
+
+Contributors:
+  Florian Müllner, Xiaoguang Wang
+
+Translators:
+  Dz Chen [zh_CN]
+
+3.28.0
+======
+
+Contributors:
+  Florian Müllner, Xiaoguang Wang
+
+Translators:
+  Aman Alam [pa], Bruce Cowan [en_GB]
+
 3.27.92
 =======
 

README.md

@@ -15,10 +15,6 @@ Bugs should be reported to the GNOME [bug tracking system][bug-tracker].
 
 ## Extensions
 
- * alternate-tab
- 
-     Lets you use classic Alt+Tab (window-based instead of app-based) in GNOME Shell.
-
  * apps-menu
 
      Lets you reach an application using gnome 2.x style menu on the panel.
@@ -34,10 +30,6 @@ GSettings key.
      Shows a status menu for rapid unmount and power off of external storage devices
   (i.e. pendrives)
 
- * example
-
-     A minimal example illustrating how to write extensions.
-
  * launch-new-instance
 
      Changes application icons to always launch a new instance when activated.

data/00_org.gnome.shell.extensions.classic.gschema.override

@@ -0,0 +1,9 @@
+[org.gnome.mutter:GNOME-Classic]
+dynamic-workspaces=false
+
+[org.gnome.desktop.wm.preferences:GNOME-Classic]
+button-layout='appmenu:minimize,maximize,close'
+
+[org.gnome.desktop.wm.keybindings:GNOME-Classic]
+switch-applications=[]
+switch-windows=['<Super>Tab','<Alt>Tab']

data/gnome-classic.session.desktop.in

@@ -1,3 +1,3 @@
 [GNOME Session]
 Name=GNOME Classic
-RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;nautilus-classic;
+RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;

data/meson.build

@@ -59,5 +59,5 @@ custom_target(style + '.css',
 
 install_data(theme_data, install_dir: themedir)
 
-classic_schema = 'org.gnome.shell.extensions.classic-overrides.gschema.xml'
-install_data(classic_schema, install_dir: schemadir)
+classic_override = '00_org.gnome.shell.extensions.classic.gschema.override'
+install_data(classic_override, install_dir: schemadir)

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

@@ -1,46 +0,0 @@
-<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="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>
-      <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>

export-zips.sh

@@ -22,6 +22,7 @@ for f in $extensiondir/*; do
   schema=$schemadir/org.gnome.shell.extensions.$name.gschema.xml
 
   cp $srcdir/NEWS $srcdir/COPYING $f
+  cp -r $localedir $f
 
   if [ -f $schema ]; then
     mkdir $f/schemas

extensions/alternate-tab/extension.js

@@ -1,62 +0,0 @@
-/* -*- mode: js; js-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const Clutter = imports.gi.Clutter;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
-
-const AltTab = imports.ui.altTab;
-const Main = imports.ui.main;
-const WindowManager = imports.ui.windowManager;
-
-let injections = {};
-
-function init(metadata) {
-}
-
-function setKeybinding(name, func) {
-    Main.wm.setCustomKeybindingHandler(name, Shell.ActionMode.NORMAL, func);
-}
-
-function enable() {
-    injections['_keyPressHandler'] = AltTab.WindowSwitcherPopup.prototype._keyPressHandler;
-    AltTab.WindowSwitcherPopup.prototype._keyPressHandler = function(keysym, action) {
-        switch(action) {
-            case Meta.KeyBindingAction.SWITCH_APPLICATIONS:
-              action = Meta.KeyBindingAction.SWITCH_WINDOWS;
-              break;
-            case Meta.KeyBindingAction.SWITCH_APPLICATIONS_BACKWARD:
-              action = Meta.KeyBindingAction.SWITCH_WINDOWS_BACKWARD;
-              break;
-        }
-        return injections['_keyPressHandler'].call(this, keysym, action);
-    };
-
-    Main.wm._forcedWindowSwitcher = function(display, screen, window, binding) {
-        /* prevent a corner case where both popups show up at once */
-        if (this._workspaceSwitcherPopup != null)
-            this._workspaceSwitcherPopup.destroy();
-
-        let tabPopup = new AltTab.WindowSwitcherPopup();
-
-        if (!tabPopup.show(binding.is_reversed(), binding.get_name(), binding.get_mask()))
-            tabPopup.destroy();
-    };
-
-    setKeybinding('switch-applications',
-                  Main.wm._forcedWindowSwitcher.bind(Main.wm));
-    setKeybinding('switch-applications-backward',
-                  Main.wm._forcedWindowSwitcher.bind(Main.wm));
-}
-
-function disable() {
-    var prop;
-
-    setKeybinding('switch-applications',
-                  Main.wm._startSwitcher.bind(Main.wm));
-    setKeybinding('switch-applications-backward',
-                  Main.wm._startSwitcher.bind(Main.wm));
-
-    for (prop in injections)
-        AltTab.WindowSwitcherPopup.prototype[prop] = injections[prop];
-    delete Main.wm._forcedWindowSwitcher;
-}

extensions/alternate-tab/meson.build

@@ -1,7 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
-
-extension_sources += files('prefs.js')

extensions/alternate-tab/metadata.json.in

@@ -1,11 +0,0 @@
-{
-"extension-id": "@extension_id@",
-"uuid": "@uuid@",
-"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's GitLab instance instead.",
-"original-authors": [  "jw@bargsten.org", "thomas.bouffon@gmail.com" ],
-"shell-version": [ "@shell_current@" ],
-"url": "@url@"
-}

extensions/alternate-tab/prefs.js

@@ -1,81 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const Gio = imports.gi.Gio;
-const Gtk = imports.gi.Gtk;
-const GObject = imports.gi.GObject;
-
-const Gettext = imports.gettext.domain('gnome-shell-extensions');
-const _ = Gettext.gettext;
-const N_ = e => e;
-
-const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
-const Convenience = Me.imports.convenience;
-
-const SETTINGS_APP_ICON_MODE = 'app-icon-mode';
-const SETTINGS_CURRENT_WORKSPACE_ONLY = 'current-workspace-only';
-
-const MODES = {
-    'thumbnail-only': N_("Thumbnail only"),
-    'app-icon-only': N_("Application icon only"),
-    'both': N_("Thumbnail and application icon"),
-};
-
-const AltTabSettingsWidget = GObject.registerClass(
-class AltTabSettingsWidget extends Gtk.Grid {
-    _init(params) {
-        super._init(params);
-        this.margin = 24;
-        this.row_spacing = 6;
-        this.orientation = Gtk.Orientation.VERTICAL;
-
-        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell.window-switcher' });
-
-        let presentLabel = '<b>' + _("Present windows as") + '</b>';
-        this.add(new Gtk.Label({ label: presentLabel, use_markup: true,
-                                 halign: Gtk.Align.START }));
-
-        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 radio = null;
-        let currentMode = this._settings.get_string(SETTINGS_APP_ICON_MODE);
-        for (let mode in MODES) {
-            // copy the mode variable because it has function scope, not block scope
-            // so cannot be used in a closure
-            let modeCapture = mode;
-            let name = Gettext.gettext(MODES[mode]);
-
-            radio = new Gtk.RadioButton({ group: radio, label: name, valign: Gtk.Align.START });
-            radio.connect('toggled', widget => {
-                if (widget.active)
-                    this._settings.set_string(SETTINGS_APP_ICON_MODE, modeCapture);
-            });
-            grid.add(radio);
-
-            if (mode == currentMode)
-                radio.active = true;
-        }
-
-        let check = new Gtk.CheckButton({ label: _("Show only windows in the current workspace"),
-                                          margin_top: 6 });
-        this._settings.bind(SETTINGS_CURRENT_WORKSPACE_ONLY, check, 'active', Gio.SettingsBindFlags.DEFAULT);
-        this.add(check);
-    }
-});
-
-function init() {
-    Convenience.initTranslations();
-}
-
-function buildPrefsWidget() {
-    let widget = new AltTabSettingsWidget();
-    widget.show_all();
-
-    return widget;
-}

extensions/alternate-tab/stylesheet.css

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

extensions/apps-menu/extension.js

@@ -1,8 +1,10 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* exported init enable disable */
 
 const Atk = imports.gi.Atk;
 const DND = imports.ui.dnd;
 const GMenu = imports.gi.GMenu;
+const GObject = imports.gi.GObject;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 const Clutter = imports.gi.Clutter;
@@ -14,14 +16,11 @@ const Gtk = imports.gi.Gtk;
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const Signals = imports.signals;
-const Pango = imports.gi.Pango;
 
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
 
 const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
-const Convenience = Me.imports.convenience;
 
 const appSys = Shell.AppSystem.get_default();
 
@@ -42,7 +41,7 @@ class ActivitiesMenuItem extends PopupMenu.PopupBaseMenuItem {
         Main.overview.toggle();
         super.activate(event);
     }
-};
+}
 
 class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
     constructor(button, app) {
@@ -86,7 +85,7 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
 
     activate(event) {
         this._app.open_new_window(-1);
-        this._button.selectCategory(null, null);
+        this._button.selectCategory(null);
         this._button.menu.toggle();
         super.activate(event);
     }
@@ -112,7 +111,7 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
     _updateIcon() {
         this._iconBin.set_child(this.getDragActor());
     }
-};
+}
 
 class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
     constructor(button, category) {
@@ -134,7 +133,7 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
     }
 
     activate(event) {
-        this._button.selectCategory(this._category, this);
+        this._button.selectCategory(this._category);
         this._button.scrollToCatButton(this);
         super.activate(event);
     }
@@ -191,7 +190,7 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
         // cross-product of AB and AP. See:
         // http://stackoverflow.com/questions/3461453/determine-which-side-of-a-line-a-point-lies
         if (((this.actor.width * y) - (NAVIGATION_REGION_OVERSHOOT * x)) <= 0)
-             return true;
+            return true;
 
         return false;
     }
@@ -221,12 +220,12 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
 
     setActive(active, params) {
         if (active) {
-            this._button.selectCategory(this._category, this);
+            this._button.selectCategory(this._category);
             this._button.scrollToCatButton(this);
         }
         super.setActive(active, params);
     }
-};
+}
 
 class ApplicationsMenu extends PopupMenu.PopupMenu {
     constructor(sourceActor, arrowAlignment, arrowSide, button) {
@@ -255,14 +254,14 @@ class ApplicationsMenu extends PopupMenu.PopupMenu {
 
     toggle() {
         if (this.isOpen) {
-            this._button.selectCategory(null, null);
+            this._button.selectCategory(null);
         } else {
             if (Main.overview.visible)
                 Main.overview.hide();
         }
         super.toggle();
     }
-};
+}
 
 class DesktopTarget {
     constructor() {
@@ -326,8 +325,8 @@ class DesktopTarget {
             (o, res) => {
                 try {
                     o.set_attributes_finish(res);
-                } catch(e) {
-                    log('Failed to update access time: ' + e.message);
+                } catch (e) {
+                    log(`Failed to update access time: ${e.message}`);
                 }
             });
     }
@@ -353,8 +352,8 @@ class DesktopTarget {
                             // Hack: force nautilus to reload file info
                             this._touchFile(file);
                         });
-                } catch(e) {
-                    log('Failed to mark file as trusted: ' + e.message);
+                } catch (e) {
+                    log(`Failed to mark file as trusted: ${e.message}`);
                 }
             });
     }
@@ -367,7 +366,7 @@ class DesktopTarget {
         this._setDesktop(null);
     }
 
-    handleDragOver(source, actor, x, y, time) {
+    handleDragOver(source, _actor, _x, _y, _time) {
         let appInfo = this._getSourceAppInfo(source);
         if (!appInfo)
             return DND.DragMotionResult.CONTINUE;
@@ -375,7 +374,7 @@ class DesktopTarget {
         return DND.DragMotionResult.COPY_DROP;
     }
 
-    acceptDrop(source, actor, x, y, time) {
+    acceptDrop(source, _actor, _x, _y, _time) {
         let appInfo = this._getSourceAppInfo(source);
         if (!appInfo)
             return false;
@@ -391,26 +390,27 @@ class DesktopTarget {
             // copy_async() isn't introspectable :-(
             src.copy(dst, Gio.FileCopyFlags.OVERWRITE, null, null);
             this._markTrusted(dst);
-        } catch(e) {
-            log('Failed to copy to desktop: ' + e.message);
+        } catch (e) {
+            log(`Failed to copy to desktop: ${e.message}`);
         }
 
         return true;
     }
-};
+}
 Signals.addSignalMethods(DesktopTarget.prototype);
 
+let ApplicationsButton = GObject.registerClass(
 class ApplicationsButton extends PanelMenu.Button {
-    constructor() {
-        super(1.0, null, false);
+    _init() {
+        super._init(1.0, null, false);
 
-        this.setMenu(new ApplicationsMenu(this.actor, 1.0, St.Side.TOP, this));
+        this.setMenu(new ApplicationsMenu(this, 1.0, St.Side.TOP, this));
         Main.panel.menuManager.addMenu(this.menu);
 
         // At this moment applications menu is not keyboard navigable at
         // all (so not accessible), so it doesn't make sense to set as
         // role ATK_ROLE_MENU like other elements of the panel.
-        this.actor.accessible_role = Atk.Role.LABEL;
+        this.accessible_role = Atk.Role.LABEL;
 
         let hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
 
@@ -420,18 +420,17 @@ class ApplicationsButton extends PanelMenu.Button {
         hbox.add_child(this._label);
         hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
 
-        this.actor.add_actor(hbox);
-        this.actor.name = 'panelApplications';
-        this.actor.label_actor = this._label;
+        this.add_actor(hbox);
+        this.name = 'panelApplications';
+        this.label_actor = this._label;
 
-        this.actor.connect('captured-event', this._onCapturedEvent.bind(this));
-        this.actor.connect('destroy', this._onDestroy.bind(this));
+        this.connect('captured-event', this._onCapturedEvent.bind(this));
 
         this._showingId = Main.overview.connect('showing', () => {
-            this.actor.add_accessible_state (Atk.StateType.CHECKED);
+            this.add_accessible_state (Atk.StateType.CHECKED);
         });
         this._hidingId = Main.overview.connect('hiding', () => {
-            this.actor.remove_accessible_state (Atk.StateType.CHECKED);
+            this.remove_accessible_state (Atk.StateType.CHECKED);
         });
         Main.layoutManager.connect('startup-complete',
                                    this._setKeybinding.bind(this));
@@ -521,7 +520,7 @@ class ApplicationsButton extends PanelMenu.Button {
         let [width, height] = area.get_surface_size();
         let stippleColor = themeNode.get_color('-stipple-color');
         let stippleWidth = themeNode.get_length('-stipple-width');
-        let x = Math.floor(width/2) + 0.5;
+        let x = Math.floor(width / 2) + 0.5;
         cr.moveTo(x, 0);
         cr.lineTo(x, height);
         Clutter.cairo_set_source_color(cr, stippleColor);
@@ -531,14 +530,14 @@ class ApplicationsButton extends PanelMenu.Button {
     }
 
     _onOpenStateChanged(menu, open) {
-       if (open) {
-           if (this.reloadFlag) {
-               this._redisplay();
-               this.reloadFlag = false;
-           }
-           this.mainBox.show();
-       }
-       super._onOpenStateChanged(menu, open);
+        if (open) {
+            if (this.reloadFlag) {
+                this._redisplay();
+                this.reloadFlag = false;
+            }
+            this.mainBox.show();
+        }
+        super._onOpenStateChanged(menu, open);
     }
 
     _setKeybinding() {
@@ -563,7 +562,7 @@ class ApplicationsButton extends PanelMenu.Button {
                 let id;
                 try {
                     id = entry.get_desktop_file_id(); // catch non-UTF8 filenames
-                } catch(e) {
+                } catch (e) {
                     continue;
                 }
                 let app = appSys.lookup_app(id);
@@ -649,14 +648,14 @@ class ApplicationsButton extends PanelMenu.Button {
         this.categoriesScrollBox.add_actor(this.categoriesBox);
 
         this.mainBox.add(this.leftBox);
-        this.mainBox.add(this._createVertSeparator(), { expand: false, x_fill: false, y_fill: true});
+        this.mainBox.add(this._createVertSeparator(), { expand: false, x_fill: false, y_fill: true });
         this.mainBox.add(this.applicationsScrollBox, { expand: true, x_fill: true, y_fill: true });
         section.actor.add_actor(this.mainBox);
     }
 
     _display() {
         this._applicationsButtons.clear();
-        this.mainBox.style=('width: 35em;');
+        this.mainBox.style = 'width: 35em;';
         this.mainBox.hide();
 
         //Load categories
@@ -685,11 +684,14 @@ class ApplicationsButton extends PanelMenu.Button {
         //Load applications
         this._displayButtons(this._listApplications(null));
 
-        let height = this.categoriesBox.height + MENU_HEIGHT_OFFSET + 'px';
-        this.mainBox.style+=('height: ' + height);
+        let themeContext = St.ThemeContext.get_for_stage(global.stage);
+        let scaleFactor = themeContext.scale_factor;
+        let categoriesHeight = this.categoriesBox.height / scaleFactor;
+        let height = Math.round(categoriesHeight) + MENU_HEIGHT_OFFSET;
+        this.mainBox.style += `height: ${height}px`;
     }
 
-    selectCategory(dir, categoryMenuItem) {
+    selectCategory(dir) {
         this.applicationsBox.get_children().forEach(c => {
             if (c._delegate instanceof PopupMenu.PopupSeparatorMenuItem)
                 c._delegate.destroy();
@@ -704,30 +706,30 @@ class ApplicationsButton extends PanelMenu.Button {
     }
 
     _displayButtons(apps) {
-         if (apps) {
+        if (apps) {
             for (let i = 0; i < apps.length; i++) {
-               let app = apps[i];
-               let item;
-               if (app instanceof Shell.App)
-                   item = this._applicationsButtons.get(app);
-               else
-                   item = new PopupMenu.PopupSeparatorMenuItem();
-               if (!item) {
-                  item = new ApplicationMenuItem(this, app);
-                  item.setDragEnabled(this._desktopTarget.hasDesktop);
-                  this._applicationsButtons.set(app, item);
-               }
-               if (!item.actor.get_parent())
-                  this.applicationsBox.add_actor(item.actor);
+                let app = apps[i];
+                let item;
+                if (app instanceof Shell.App)
+                    item = this._applicationsButtons.get(app);
+                else
+                    item = new PopupMenu.PopupSeparatorMenuItem();
+                if (!item) {
+                    item = new ApplicationMenuItem(this, app);
+                    item.setDragEnabled(this._desktopTarget.hasDesktop);
+                    this._applicationsButtons.set(app, item);
+                }
+                if (!item.actor.get_parent())
+                    this.applicationsBox.add_actor(item.actor);
             }
-         }
+        }
     }
 
-    _listApplications(category_menu_id) {
+    _listApplications(categoryMenuId) {
         let applist;
 
-        if (category_menu_id) {
-            applist = this.applicationsByCategory[category_menu_id];
+        if (categoryMenuId) {
+            applist = this.applicationsByCategory[categoryMenuId];
         } else {
             applist = new Array();
             let favorites = global.settings.get_strv('favorite-apps');
@@ -740,12 +742,7 @@ class ApplicationsButton extends PanelMenu.Button {
 
         return applist;
     }
-
-    destroy() {
-        this.menu.actor.get_children().forEach(c => { c.destroy() });
-        super.destroy();
-    }
-};
+});
 
 let appsMenuButton;
 let activitiesButton;
@@ -763,6 +760,6 @@ function disable() {
     activitiesButton.container.show();
 }
 
-function init(metadata) {
-    Convenience.initTranslations();
+function init() {
+    ExtensionUtils.initTranslations();
 }

extensions/auto-move-windows/extension.js

@@ -1,17 +1,16 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
 // Start apps on custom workspaces
+/* exported init enable disable */
 
 const Shell = imports.gi.Shell;
 
 const Main = imports.ui.main;
 
 const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
-const Convenience = Me.imports.convenience;
 
 class WindowMover {
     constructor() {
-        this._settings = Convenience.getSettings();
+        this._settings = ExtensionUtils.getSettings();
         this._appSystem = Shell.AppSystem.get_default();
         this._appConfigs = new Map();
         this._appData = new Map();
@@ -54,7 +53,7 @@ class WindowMover {
                                               this._appWindowsChanged.bind(this)),
                 moveWindowsId: 0,
                 windows: app.get_windows()
-            }
+            };
             this._appData.set(app, data);
         });
     }
@@ -79,9 +78,10 @@ class WindowMover {
             return;
 
         // ensure we have the required number of workspaces
-        for (let i = global.screen.n_workspaces; i <= workspaceNum; i++) {
+        let workspaceManager = global.workspace_manager;
+        for (let i = workspaceManager.n_workspaces; i <= workspaceNum; i++) {
             window.change_workspace_by_index(i - 1, false);
-            global.screen.append_new_workspace(false, 0);
+            workspaceManager.append_new_workspace(false, 0);
         }
 
         window.change_workspace_by_index(workspaceNum, false);
@@ -105,13 +105,13 @@ class WindowMover {
         });
         data.windows = windows;
     }
-};
+}
 
 let prevCheckWorkspaces;
 let winMover;
 
 function init() {
-    Convenience.initTranslations();
+    ExtensionUtils.initTranslations();
 }
 
 function myCheckWorkspaces() {

extensions/auto-move-windows/prefs.js

@@ -1,5 +1,6 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
 // Start apps on custom workspaces
+/* exported init buildPrefsWidget */
 
 const Gio = imports.gi.Gio;
 const GObject = imports.gi.GObject;
@@ -10,8 +11,6 @@ const _ = Gettext.gettext;
 const N_ = e => e;
 
 const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
-const Convenience = Me.imports.convenience;
 
 const SETTINGS_KEY = 'application-list';
 
@@ -32,7 +31,7 @@ const Widget = GObject.registerClass({
         super._init(params);
         this.set_orientation(Gtk.Orientation.VERTICAL);
 
-        this._settings = Convenience.getSettings();
+        this._settings = ExtensionUtils.getSettings();
         this._settings.connect('changed', this._refresh.bind(this));
         this._changedPermitted = false;
 
@@ -40,7 +39,7 @@ const Widget = GObject.registerClass({
         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});
+        let scrolled = new Gtk.ScrolledWindow({ shadow_type: Gtk.ShadowType.IN });
         scrolled.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
         this.add(scrolled);
 
@@ -118,8 +117,7 @@ const Widget = GObject.registerClass({
                                     halign: Gtk.Align.END }), 0, 1, 1, 1);
         let adjustment = new Gtk.Adjustment({ lower: 1,
                                               upper: WORKSPACE_MAX,
-                                              step_increment: 1
-                                            });
+                                              step_increment: 1 });
         dialog._spin = new Gtk.SpinButton({ adjustment: adjustment,
                                             snap_to_ticks: true });
         dialog._spin.set_value(1);
@@ -158,7 +156,7 @@ const Widget = GObject.registerClass({
     }
 
     _deleteSelected() {
-        let [any, model, iter] = this._treeView.get_selection().get_selected();
+        let [any, model_, iter] = this._treeView.get_selection().get_selected();
 
         if (any) {
             let appInfo = this._store.get_value(iter, Columns.APPINFO);
@@ -175,7 +173,7 @@ const Widget = GObject.registerClass({
         if (isNaN(index) || index < 0)
             index = 1;
         let path = Gtk.TreePath.new_from_string(pathString);
-        let [model, iter] = this._store.get_iter(path);
+        let [model_, iter] = this._store.get_iter(path);
         let appInfo = this._store.get_value(iter, Columns.APPINFO);
 
         this._changedPermitted = false;
@@ -192,7 +190,7 @@ const Widget = GObject.registerClass({
         this._store.clear();
 
         let currentItems = this._settings.get_strv(SETTINGS_KEY);
-        let validItems = [ ];
+        let validItems = [];
         for (let i = 0; i < currentItems.length; i++) {
             let [id, index] = currentItems[i].split(':');
             let appInfo = Gio.DesktopAppInfo.new(id);
@@ -216,12 +214,12 @@ const Widget = GObject.registerClass({
 
     _checkId(id) {
         let items = this._settings.get_strv(SETTINGS_KEY);
-        return !items.some(i => i.startsWith(id + ':'));
+        return !items.some(i => i.startsWith(`${id}:`));
     }
 
     _appendItem(id, workspace) {
         let currentItems = this._settings.get_strv(SETTINGS_KEY);
-        currentItems.push(id + ':' + workspace);
+        currentItems.push(`${id}:${workspace}`);
         this._settings.set_strv(SETTINGS_KEY, currentItems);
     }
 
@@ -240,16 +238,16 @@ const Widget = GObject.registerClass({
         let index = currentItems.map(el => el.split(':')[0]).indexOf(id);
 
         if (index < 0)
-            currentItems.push(id + ':' + workspace);
+            currentItems.push(`${id}:${workspace}`);
         else
-            currentItems[index] = id + ':' + workspace;
+            currentItems[index] = `${id}:${workspace}`;
         this._settings.set_strv(SETTINGS_KEY, currentItems);
     }
 });
 
 
 function init() {
-    Convenience.initTranslations();
+    ExtensionUtils.initTranslations();
 }
 
 function buildPrefsWidget() {

extensions/drive-menu/extension.js

@@ -1,6 +1,7 @@
+/* exported init enable disable */
 // Drive menu extension
-const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
 const St = imports.gi.St;
 const Shell = imports.gi.Shell;
 
@@ -8,14 +9,11 @@ const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
 
 const Main = imports.ui.main;
-const Panel = imports.ui.panel;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 const ShellMountOperation = imports.ui.shellMountOperation;
 
 const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
-const Convenience = Me.imports.convenience;
 
 class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
     constructor(mount) {
@@ -85,7 +83,7 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
     _unmountFinish(mount, result) {
         try {
             mount.unmount_with_operation_finish(result);
-        } catch(e) {
+        } catch (e) {
             this._reportFailure(e);
         }
     }
@@ -93,7 +91,7 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
     _ejectFinish(mount, result) {
         try {
             mount.eject_with_operation_finish(result);
-        } catch(e) {
+        } catch (e) {
             this._reportFailure(e);
         }
     }
@@ -111,11 +109,12 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
 
         super.activate(event);
     }
-};
+}
 
+let DriveMenu = GObject.registerClass(
 class DriveMenu extends PanelMenu.Button {
-    constructor() {
-        super(0.0, _("Removable devices"));
+    _init() {
+        super._init(0.0, _("Removable devices"));
 
         let hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
         let icon = new St.Icon({ icon_name: 'media-eject-symbolic',
@@ -123,7 +122,7 @@ class DriveMenu extends PanelMenu.Button {
 
         hbox.add_child(icon);
         hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
-        this.actor.add_child(hbox);
+        this.add_child(hbox);
 
         this._monitor = Gio.VolumeMonitor.get();
         this._addedId = this._monitor.connect('mount-added', (monitor, mount) => {
@@ -135,7 +134,7 @@ class DriveMenu extends PanelMenu.Button {
             this._updateMenuVisibility();
         });
 
-        this._mounts = [ ];
+        this._mounts = [];
 
         this._monitor.get_mounts().forEach(this._addMount.bind(this));
 
@@ -151,9 +150,9 @@ class DriveMenu extends PanelMenu.Button {
 
     _updateMenuVisibility() {
         if (this._mounts.filter(i => i.actor.visible).length > 0)
-            this.actor.show();
+            this.show();
         else
-            this.actor.hide();
+            this.hide();
     }
 
     _addMount(mount) {
@@ -174,20 +173,20 @@ class DriveMenu extends PanelMenu.Button {
         log ('Removing a mount that was never added to the menu');
     }
 
-    destroy() {
-        if (this._connectedId) {
-            this._monitor.disconnect(this._connectedId);
-            this._monitor.disconnect(this._disconnectedId);
-            this._connectedId = 0;
-            this._disconnectedId = 0;
+    _onDestroy() {
+        if (this._addedId) {
+            this._monitor.disconnect(this._addedId);
+            this._monitor.disconnect(this._removedId);
+            this._addedId = 0;
+            this._removedId = 0;
         }
 
-        super.destroy();
+        super._onDestroy();
     }
-};
+});
 
 function init() {
-    Convenience.initTranslations();
+    ExtensionUtils.initTranslations();
 }
 
 let _indicator;

extensions/example/extension.js

@@ -1,49 +0,0 @@
-// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
-// Sample extension code, makes clicking on the panel show a message
-const St = imports.gi.St;
-const Mainloop = imports.mainloop;
-
-const Gettext = imports.gettext.domain('gnome-shell-extensions');
-const _ = Gettext.gettext;
-
-const Main = imports.ui.main;
-
-const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
-const Convenience = Me.imports.convenience;
-
-function _showHello() {
-    let settings = Convenience.getSettings();
-    let text = settings.get_string('hello-text') || _("Hello, world!");
-
-    let label = new St.Label({ style_class: 'helloworld-label', text: text });
-    let monitor = Main.layoutManager.primaryMonitor;
-    global.stage.add_actor(label);
-    label.set_position(Math.floor (monitor.width / 2 - label.width / 2), Math.floor(monitor.height / 2 - label.height / 2));
-    Mainloop.timeout_add(3000, () => { label.destroy(); });
-}
-
-// Put your extension initialization code here
-function init(metadata) {
-    log ('Example extension initalized');
-
-    Convenience.initTranslations();
-}
-
-let signalId;
-
-function enable() {
-    log ('Example extension enabled');
-
-    Main.panel.actor.reactive = true;
-    signalId = Main.panel.actor.connect('button-release-event', _showHello);
-}
-
-function disable() {
-    log ('Example extension disabled');
-
-    if (signalId) {
-        Main.panel.actor.disconnect(signalId);
-        signalId = 0;
-    }
-}

extensions/example/meson.build

@@ -1,8 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
-
-extension_sources += files('prefs.js')
-extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')

extensions/example/metadata.json.in

@@ -1,10 +0,0 @@
-{
- "extension-id": "@extension_id@",
- "uuid": "@uuid@",
- "settings-schema": "@gschemaname@",
- "gettext-domain": "@gettext_domain@",
- "name": "Hello, World!",
- "description": "An example extension to show how it works. Shows Hello, world when clicking on the top panel.",
- "shell-version": [ "@shell_current@" ],
- "url": "@url@"
-}

extensions/example/org.gnome.shell.extensions.example.gschema.xml

@@ -1,9 +0,0 @@
-<schemalist gettext-domain="gnome-shell-extensions">
-  <schema id="org.gnome.shell.extensions.example" path="/org/gnome/shell/extensions/example/">
-    <key name="hello-text" type="s">
-      <default>''</default>
-      <summary>Alternative greeting text.</summary>
-      <description>If not empty, it contains the text that will be shown when clicking on the panel.</description>
-    </key>
-  </schema>
-</schemalist>

extensions/example/prefs.js

@@ -1,54 +0,0 @@
-// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
-
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
-const Gio = imports.gi.Gio;
-const Gtk = imports.gi.Gtk;
-
-const Gettext = imports.gettext.domain('gnome-shell-extensions');
-const _ = Gettext.gettext;
-
-const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
-const Convenience = Me.imports.convenience;
-
-function init() {
-    Convenience.initTranslations();
-}
-
-const ExamplePrefsWidget = GObject.registerClass(
-class ExamplePrefsWidget extends Gtk.Grid {
-    _init(params) {
-        super._init(params);
-        this.margin = 12;
-        this.row_spacing = this.column_spacing = 6;
-        this.set_orientation(Gtk.Orientation.VERTICAL);
-
-        this.add(new Gtk.Label({ label: '<b>' + _("Message") + '</b>',
-                                 use_markup: true,
-                                 halign: Gtk.Align.START }));
-
-        let entry = new Gtk.Entry({ hexpand: true,
-                                    margin_bottom: 12 });
-        this.add(entry);
-
-        this._settings = Convenience.getSettings();
-        this._settings.bind('hello-text', entry, 'text', Gio.SettingsBindFlags.DEFAULT);
-
-        // TRANSLATORS: Example is the name of the extension, should not be
-        // translated
-        let primaryText = _("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.");
-
-        this.add(new Gtk.Label({ label: primaryText,
-                                 wrap: true, xalign: 0 }));
-    }
-});
-
-function buildPrefsWidget() {
-    let widget = new ExamplePrefsWidget();
-    widget.show_all();
-
-    return widget;
-}

extensions/example/stylesheet.css

@@ -1,8 +0,0 @@
-/* Example stylesheet */
-.helloworld-label {
-    font-size: 36px;
-    font-weight: bold;
-    color: #ffffff;
-    background-color: rgba(10,10,10,0.7);
-    border-radius: 5px;
-}

extensions/launch-new-instance/extension.js

@@ -1,17 +1,15 @@
+/* exported enable disable */
 const AppDisplay = imports.ui.appDisplay;
 
 let _activateOriginal = null;
 
-function init() {
-}
-
 function enable() {
-  _activateOriginal = AppDisplay.AppIcon.prototype.activate;
-  AppDisplay.AppIcon.prototype.activate = function() {
-      _activateOriginal.call(this, 2);
-  };
+    _activateOriginal = AppDisplay.AppIcon.prototype.activate;
+    AppDisplay.AppIcon.prototype.activate = function() {
+        _activateOriginal.call(this, 2);
+    };
 }
 
 function disable() {
-  AppDisplay.AppIcon.prototype.activate = _activateOriginal;
+    AppDisplay.AppIcon.prototype.activate = _activateOriginal;
 }

extensions/meson.build

@@ -1,5 +1,5 @@
 extension_schemas = []
-js_sources = extensionlib
+js_sources = []
 
 metadata_name = 'metadata.json'
 
@@ -22,7 +22,7 @@ foreach e : all_extensions
   js_sources += extension_sources
 
   if (enabled_extensions.contains(e))
-    install_data (extension_sources + extension_data + extensionlib,
+    install_data (extension_sources + extension_data,
       install_dir: join_paths(extensiondir, uuid)
     )
   endif
@@ -33,11 +33,11 @@ install_data (extension_schemas,
 )
 
 foreach js_source : js_sources
-  if (js52.found())
+  if (js60.found())
     path_array = '@0@'.format(js_source).split('/')
     name = join_paths(path_array[-2], path_array[-1])
 
-    test('Checking syntax of ' + name, js52,
+    test('Checking syntax of ' + name, js60,
       args: ['-s', '-c', js_source],
       workdir: meson.current_source_dir()
     )

extensions/native-window-placement/extension.js

@@ -1,13 +1,10 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+/* exported enable disable */
 const Workspace = imports.ui.workspace;
 
 const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
-const Convenience = Me.imports.convenience;
 
 // testing settings for natural window placement strategy:
-const WINDOW_PLACEMENT_NATURAL_FILLGAPS = true;                     // enlarge windows at the end to fill gaps         // not implemented yet
-const WINDOW_PLACEMENT_NATURAL_GRID_FALLBACK = true;                // fallback to grid mode if all windows have the same size and positions.     // not implemented yet
 const WINDOW_PLACEMENT_NATURAL_ACCURACY = 20;                       // accuracy of window translate moves  (KDE-default: 20)
 const WINDOW_PLACEMENT_NATURAL_GAPS = 5;                            // half of the minimum gap between windows
 const WINDOW_PLACEMENT_NATURAL_MAX_TRANSLATIONS = 5000;             // safety limit for preventing endless loop if something is wrong in the algorithm
@@ -26,20 +23,18 @@ class Rect {
 
     union(rect2) {
         let dest = this.copy();
-        if (rect2.x < dest.x)
-          {
+        if (rect2.x < dest.x) {
             dest.width += dest.x - rect2.x;
             dest.x = rect2.x;
-          }
-        if (rect2.y < dest.y)
-          {
+        }
+        if (rect2.y < dest.y) {
             dest.height += dest.y - rect2.y;
             dest.y = rect2.y;
-          }
+        }
         if (rect2.x + rect2.width > dest.x + dest.width)
-          dest.width = rect2.x + rect2.width - dest.x;
+            dest.width = rect2.x + rect2.width - dest.x;
         if (rect2.y + rect2.height > dest.y + dest.height)
-          dest.height = rect2.y + rect2.height - dest.y;
+            dest.height = rect2.y + rect2.height - dest.y;
 
         return dest;
     }
@@ -68,7 +63,7 @@ class Rect {
         this.x += dx;
         this.y += dy;
     }
-};
+}
 
 class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
     constructor(settings) {
@@ -90,8 +85,8 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
         // 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.
 
-        let area_rect = new Rect(area.x, area.y, area.width, area.height);
-        let bounds = area_rect.copy();
+        let areaRect = new Rect(area.x, area.y, area.width, area.height);
+        let bounds = areaRect.copy();
         let clones = layout.windows;
 
         let direction = 0;
@@ -111,31 +106,31 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
             }
         }
 
-        let loop_counter = 0;
+        let loopCounter = 0;
         let overlap;
         do {
             overlap = false;
             for (let i = 0; i < rects.length; i++) {
                 for (let j = 0; j < rects.length; j++) {
                     if (i != j && rects[i].adjusted(-WINDOW_PLACEMENT_NATURAL_GAPS, -WINDOW_PLACEMENT_NATURAL_GAPS,
-                                                    WINDOW_PLACEMENT_NATURAL_GAPS, WINDOW_PLACEMENT_NATURAL_GAPS).overlap(
-                                                     rects[j].adjusted(-WINDOW_PLACEMENT_NATURAL_GAPS, -WINDOW_PLACEMENT_NATURAL_GAPS,
-                                                                       WINDOW_PLACEMENT_NATURAL_GAPS, WINDOW_PLACEMENT_NATURAL_GAPS))) {
-                        loop_counter++;
+                                                    WINDOW_PLACEMENT_NATURAL_GAPS, WINDOW_PLACEMENT_NATURAL_GAPS)
+                                          .overlap(rects[j].adjusted(-WINDOW_PLACEMENT_NATURAL_GAPS, -WINDOW_PLACEMENT_NATURAL_GAPS,
+                                                                     WINDOW_PLACEMENT_NATURAL_GAPS, WINDOW_PLACEMENT_NATURAL_GAPS))) {
+                        loopCounter++;
                         overlap = true;
 
                         // TODO: something like a Point2D would be nicer here:
 
                         // Determine pushing direction
-                        let i_center = rects[i].center();
-                        let j_center = rects[j].center();
-                        let diff = [j_center[0] - i_center[0], j_center[1] - i_center[1]];
+                        let iCenter = rects[i].center();
+                        let jCenter = rects[j].center();
+                        let diff = [jCenter[0] - iCenter[0], jCenter[1] - iCenter[1]];
 
                         // Prevent dividing by zero and non-movement
                         if (diff[0] == 0 && diff[1] == 0)
                             diff[0] = 1;
                         // Try to keep screen/workspace aspect ratio
-                        if ( bounds.height / bounds.width > area_rect.height / area_rect.width )
+                        if ( bounds.height / bounds.width > areaRect.height / areaRect.width )
                             diff[0] *= 2;
                         else
                             diff[1] *= 2;
@@ -164,7 +159,7 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
                             let xSection = Math.round((rects[i].x - bounds.x) / (bounds.width / 3));
                             let ySection = Math.round((rects[i].y - bounds.y) / (bounds.height / 3));
 
-                            let i_center = rects[i].center();
+                            let iCenter = rects[i].center();
                             diff[0] = 0;
                             diff[1] = 0;
                             if (xSection != 1 || ySection != 1) { // Remove this if you want the center to pull as well
@@ -174,23 +169,23 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
                                     ySection = (directions[i] % 2 ? 2 : 0);
                             }
                             if (xSection == 0 && ySection == 0) {
-                                diff[0] = bounds.x - i_center[0];
-                                diff[1] = bounds.y - i_center[1];
+                                diff[0] = bounds.x - iCenter[0];
+                                diff[1] = bounds.y - iCenter[1];
                             }
                             if (xSection == 2 && ySection == 0) {
-                                diff[0] = bounds.x + bounds.width - i_center[0];
-                                diff[1] = bounds.y - i_center[1];
+                                diff[0] = bounds.x + bounds.width - iCenter[0];
+                                diff[1] = bounds.y - iCenter[1];
                             }
                             if (xSection == 2 && ySection == 2) {
-                                diff[0] = bounds.x + bounds.width - i_center[0];
-                                diff[1] = bounds.y + bounds.height - i_center[1];
+                                diff[0] = bounds.x + bounds.width - iCenter[0];
+                                diff[1] = bounds.y + bounds.height - iCenter[1];
                             }
                             if (xSection == 0 && ySection == 2) {
-                                diff[0] = bounds.x - i_center[0];
-                                diff[1] = bounds.y + bounds.height - i_center[1];
+                                diff[0] = bounds.x - iCenter[0];
+                                diff[1] = bounds.y + bounds.height - iCenter[1];
                             }
                             if (diff[0] != 0 || diff[1] != 0) {
-                                let length = Math.sqrt(diff[0]*diff[0] + diff[1]*diff[1]);
+                                let length = Math.sqrt(diff[0] * diff[0] + diff[1] * diff[1]);
                                 diff[0] *= WINDOW_PLACEMENT_NATURAL_ACCURACY / length / 2;   // /2 to make it less influencing than the normal center-move above
                                 diff[1] *= WINDOW_PLACEMENT_NATURAL_ACCURACY / length / 2;
                                 rects[i].translate(diff[0], diff[1]);
@@ -203,44 +198,37 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
                     }
                 }
             }
-        } while (overlap && loop_counter < WINDOW_PLACEMENT_NATURAL_MAX_TRANSLATIONS);
+        } while (overlap && loopCounter < WINDOW_PLACEMENT_NATURAL_MAX_TRANSLATIONS);
 
         // Work out scaling by getting the most top-left and most bottom-right window coords.
         let scale;
-        scale = Math.min(area_rect.width / bounds.width,
-                         area_rect.height / bounds.height,
+        scale = Math.min(areaRect.width / bounds.width,
+                         areaRect.height / bounds.height,
                          1.0);
 
         // Make bounding rect fill the screen size for later steps
-        bounds.x = bounds.x - (area_rect.width - bounds.width * scale) / 2;
-        bounds.y = bounds.y - (area_rect.height - bounds.height * scale) / 2;
-        bounds.width = area_rect.width / scale;
-        bounds.height = area_rect.height / scale;
+        bounds.x = bounds.x - (areaRect.width - bounds.width * scale) / 2;
+        bounds.y = bounds.y - (areaRect.height - bounds.height * scale) / 2;
+        bounds.width = areaRect.width / scale;
+        bounds.height = areaRect.height / scale;
 
         // Move all windows back onto the screen and set their scale
         for (let i = 0; i < rects.length; i++) {
             rects[i].translate(-bounds.x, -bounds.y);
         }
 
-        // TODO: Implement the KDE part "Try to fill the gaps by enlarging windows if they have the space" here. (If this is wanted)
-
         // rescale to workspace
-        let scales = [];
-
-        let buttonOuterHeight, captionHeight;
-        let buttonOuterWidth = 0;
-
         let slots = [];
         for (let i = 0; i < rects.length; i++) {
-            rects[i].x = rects[i].x * scale + area_rect.x;
-            rects[i].y = rects[i].y * scale + area_rect.y;
+            rects[i].x = rects[i].x * scale + areaRect.x;
+            rects[i].y = rects[i].y * scale + areaRect.y;
 
             slots.push([rects[i].x, rects[i].y, scale, clones[i]]);
         }
 
         return slots;
     }
-};
+}
 
 let winInjections, workspaceInjections;
 
@@ -252,7 +240,7 @@ function resetState() {
 function enable() {
     resetState();
 
-    let settings = Convenience.getSettings();
+    let settings = ExtensionUtils.getSettings();
 
     workspaceInjections['_getBestLayout'] = Workspace.Workspace.prototype._getBestLayout;
     Workspace.Workspace.prototype._getBestLayout = function(windows) {
@@ -261,7 +249,7 @@ function enable() {
         strategy.computeLayout(windows, layout);
 
         return layout;
-    }
+    };
 
     /// position window titles on top of windows in overlay ////
     winInjections['relayout'] = Workspace.WindowOverlay.prototype.relayout;
@@ -293,7 +281,3 @@ function disable() {
     global.stage.queue_relayout();
     resetState();
 }
-
-function init() {
-    /* do nothing */
-}

extensions/places-menu/extension.js

@@ -1,15 +1,13 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* exported init enable disable */
 
 const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Shell = imports.gi.Shell;
+const GObject = imports.gi.GObject;
 const St = imports.gi.St;
 
 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
-const Panel = imports.ui.panel;
 
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
@@ -17,7 +15,6 @@ const N_ = x => x;
 
 const ExtensionUtils = imports.misc.extensionUtils;
 const Me = ExtensionUtils.getCurrentExtension();
-const Convenience = Me.imports.convenience;
 const PlaceDisplay = Me.imports.placeDisplay;
 
 const PLACE_ICON_SIZE = 16;
@@ -65,18 +62,19 @@ class PlaceMenuItem extends PopupMenu.PopupBaseMenuItem {
         this._icon.gicon = info.icon;
         this._label.text = info.name;
     }
-};
+}
 
 const SECTIONS = [
     'special',
     'devices',
     'bookmarks',
     'network'
-]
+];
 
+let PlacesMenu = GObject.registerClass(
 class PlacesMenu extends PanelMenu.Button {
-    constructor() {
-        super(0.0, _("Places"));
+    _init() {
+        super._init(0.0, _("Places"));
 
         let hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
         let label = new St.Label({ text: _("Places"),
@@ -84,16 +82,16 @@ class PlacesMenu extends PanelMenu.Button {
                                    y_align: Clutter.ActorAlign.CENTER });
         hbox.add_child(label);
         hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
-        this.actor.add_actor(hbox);
+        this.add_actor(hbox);
 
         this.placesManager = new PlaceDisplay.PlacesManager();
 
         this._sections = { };
 
-        for (let i=0; i < SECTIONS.length; i++) {
+        for (let i = 0; i < SECTIONS.length; i++) {
             let id = SECTIONS[i];
             this._sections[id] = new PopupMenu.PopupMenuSection();
-            this.placesManager.connect(id + '-updated', () => {
+            this.placesManager.connect(`${id}-updated`, () => {
                 this._redisplay(id);
             });
 
@@ -103,10 +101,10 @@ class PlacesMenu extends PanelMenu.Button {
         }
     }
 
-    destroy() {
+    _onDestroy() {
         this.placesManager.destroy();
 
-        super.destroy();
+        super._onDestroy();
     }
 
     _redisplay(id) {
@@ -122,10 +120,10 @@ class PlacesMenu extends PanelMenu.Button {
 
         this._sections[id].actor.visible = places.length > 0;
     }
-};
+});
 
 function init() {
-    Convenience.initTranslations();
+    ExtensionUtils.initTranslations();
 }
 
 let _indicator;

extensions/places-menu/placeDisplay.js

@@ -5,14 +5,9 @@ const Gio = imports.gi.Gio;
 const Shell = imports.gi.Shell;
 const Mainloop = imports.mainloop;
 const Signals = imports.signals;
-const St = imports.gi.St;
 
-const DND = imports.ui.dnd;
 const Main = imports.ui.main;
-const Params = imports.misc.params;
-const Search = imports.ui.search;
 const ShellMountOperation = imports.ui.shellMountOperation;
-const Util = imports.misc.util;
 
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
@@ -50,35 +45,37 @@ class PlaceInfo {
         return (_ignored, result) => {
             try {
                 Gio.AppInfo.launch_default_for_uri_finish(result);
-            } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_MOUNTED)) {
-                let source = {
-                    get_icon: () => { return this.icon; }
-                };
-                let op = new ShellMountOperation.ShellMountOperation(source);
-                this.file.mount_enclosing_volume(0, op.mountOp, null, (file, result) => {
-                    try {
-                        op.close();
-                        file.mount_enclosing_volume_finish(result);
-                    } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED)) {
-                        // e.g. user canceled the password dialog
-                        return;
-                    } catch(e) {
-                        Main.notifyError(_("Failed to mount volume for “%s”").format(this.name), e.message);
-                        return;
-                    }
+            } catch (e) {
+                if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_MOUNTED)) {
+                    let source = {
+                        get_icon: () => { return this.icon; }
+                    };
+                    let op = new ShellMountOperation.ShellMountOperation(source);
+                    this.file.mount_enclosing_volume(0, op.mountOp, null, (file, result) => {
+                        try {
+                            op.close();
+                            file.mount_enclosing_volume_finish(result);
+                        } catch (e) {
+                            if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
+                                // e.g. user canceled the password dialog
+                                return;
+                            Main.notifyError(_("Failed to mount volume for “%s”").format(this.name), e.message);
+                            return;
+                        }
 
-                    if (tryMount) {
-                        let callback = this._createLaunchCallback(launchContext, false);
-                        Gio.AppInfo.launch_default_for_uri_async(file.get_uri(),
-                                                                 launchContext,
-                                                                 null,
-                                                                 callback);
-                    }
-                });
-            } catch(e) {
-                Main.notifyError(_("Failed to launch “%s”").format(this.name), e.message);
+                        if (tryMount) {
+                            let callback = this._createLaunchCallback(launchContext, false);
+                            Gio.AppInfo.launch_default_for_uri_async(file.get_uri(),
+                                                                     launchContext,
+                                                                     null,
+                                                                     callback);
+                        }
+                    });
+                } else {
+                    Main.notifyError(_("Failed to launch “%s”").format(this.name), e.message);
+                }
             }
-        }
+        };
     }
 
     launch(timestamp) {
@@ -97,8 +94,10 @@ class PlaceInfo {
                                            let info = file.query_info_finish(result);
                                            this.icon = info.get_symbolic_icon();
                                            this.emit('changed');
-                                       } catch(e if e instanceof Gio.IOErrorEnum) {
-                                           return;
+                                       } catch (e) {
+                                           if (e instanceof Gio.IOErrorEnum)
+                                               return;
+                                           throw e;
                                        }
                                    });
 
@@ -123,11 +122,13 @@ class PlaceInfo {
         try {
             let info = this.file.query_info('standard::display-name', 0, null);
             return info.get_display_name();
-        } catch(e if e instanceof Gio.IOErrorEnum) {
-            return this.file.get_basename();
+        } catch (e) {
+            if (e instanceof Gio.IOErrorEnum)
+                return this.file.get_basename();
+            throw e;
         }
     }
-};
+}
 Signals.addSignalMethods(PlaceInfo.prototype);
 
 class RootInfo extends PlaceInfo {
@@ -167,7 +168,7 @@ class RootInfo extends PlaceInfo {
         }
         super.destroy();
     }
-};
+}
 
 
 class PlaceDeviceInfo extends PlaceInfo {
@@ -202,7 +203,7 @@ class PlaceDeviceInfo extends PlaceInfo {
     _ejectFinish(mount, result) {
         try {
             mount.eject_with_operation_finish(result);
-        } catch(e) {
+        } catch (e) {
             this._reportFailure(e);
         }
     }
@@ -210,7 +211,7 @@ class PlaceDeviceInfo extends PlaceInfo {
     _unmountFinish(mount, result) {
         try {
             mount.unmount_with_operation_finish(result);
-        } catch(e) {
+        } catch (e) {
             this._reportFailure(e);
         }
     }
@@ -219,7 +220,7 @@ class PlaceDeviceInfo extends PlaceInfo {
         let msg = _("Ejecting drive “%s” failed:").format(this._mount.get_name());
         Main.notifyError(msg, exception.message);
     }
-};
+}
 
 class PlaceVolumeInfo extends PlaceInfo {
     _init(kind, volume) {
@@ -245,7 +246,7 @@ class PlaceVolumeInfo extends PlaceInfo {
     getIcon() {
         return this._volume.get_symbolic_icon();
     }
-};
+}
 
 const DEFAULT_DIRECTORIES = [
     GLib.UserDirectory.DIRECTORY_DOCUMENTS,
@@ -277,7 +278,7 @@ var PlacesManager = class {
         this._connectVolumeMonitorSignals();
         this._updateMounts();
 
-        this._bookmarksFile = this._findBookmarksFile()
+        this._bookmarksFile = this._findBookmarksFile();
         this._bookmarkTimeoutId = 0;
         this._monitor = null;
 
@@ -349,8 +350,10 @@ var PlacesManager = class {
             let file = Gio.File.new_for_path(specialPath), info;
             try {
                 info = new PlaceInfo('special', file);
-            } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND)) {
-                continue;
+            } catch (e) {
+                if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
+                    continue;
+                throw e;
             }
 
             specials.push(info);
@@ -383,13 +386,13 @@ var PlacesManager = class {
         for (let i = 0; i < drives.length; i++) {
             let volumes = drives[i].get_volumes();
 
-            for(let j = 0; j < volumes.length; j++) {
+            for (let j = 0; j < volumes.length; j++) {
                 let identifier = volumes[j].get_identifier('class');
-                if (identifier && identifier.indexOf('network') >= 0) {
+                if (identifier && identifier.includes('network')) {
                     networkVolumes.push(volumes[j]);
                 } else {
                     let mount = volumes[j].get_mount();
-                    if(mount != null)
+                    if (mount != null)
                         this._addMount('devices', mount);
                 }
             }
@@ -397,27 +400,27 @@ var PlacesManager = class {
 
         /* add all volumes that is not associated with a drive */
         let volumes = this._volumeMonitor.get_volumes();
-        for(let i = 0; i < volumes.length; i++) {
-            if(volumes[i].get_drive() != null)
+        for (let i = 0; i < volumes.length; i++) {
+            if (volumes[i].get_drive() != null)
                 continue;
 
             let identifier = volumes[i].get_identifier('class');
-            if (identifier && identifier.indexOf('network') >= 0) {
+            if (identifier && identifier.includes('network')) {
                 networkVolumes.push(volumes[i]);
             } else {
                 let mount = volumes[i].get_mount();
-                if(mount != null)
+                if (mount != null)
                     this._addMount('devices', mount);
             }
         }
 
         /* add mounts that have no volume (/etc/mtab mounts, ftp, sftp,...) */
         let mounts = this._volumeMonitor.get_mounts();
-        for(let i = 0; i < mounts.length; i++) {
-            if(mounts[i].is_shadowed())
+        for (let i = 0; i < mounts.length; i++) {
+            if (mounts[i].is_shadowed())
                 continue;
 
-            if(mounts[i].get_volume())
+            if (mounts[i].get_volume())
                 continue;
 
             let root = mounts[i].get_default_location();
@@ -514,8 +517,10 @@ var PlacesManager = class {
 
         try {
             devItem = new PlaceDeviceInfo(kind, mount);
-        } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND)) {
-            return;
+        } catch (e) {
+            if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
+                return;
+            throw e;
         }
 
         this._places[kind].push(devItem);
@@ -526,8 +531,10 @@ var PlacesManager = class {
 
         try {
             volItem = new PlaceVolumeInfo(kind, volume);
-        } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND)) {
-            return;
+        } catch (e) {
+            if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
+                return;
+            throw e;
         }
 
         this._places[kind].push(volItem);

extensions/screenshot-window-sizer/extension.js

@@ -1,3 +1,4 @@
+/* exported enable disable */
 /* Screenshot Window Sizer for Gnome Shell
  *
  * Copyright (c) 2013 Owen Taylor <otaylor@redhat.com>
@@ -18,7 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-const Gio = imports.gi.Gio;
 const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
@@ -27,12 +27,10 @@ const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
 
 const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
-const Convenience = Me.imports.convenience;
 
 const MESSAGE_FADE_TIME = 2;
 
-let text, button;
+let text;
 
 function hideMessage() {
     text.destroy();
@@ -69,7 +67,7 @@ let SIZES = [
     [1600, 900]
 ];
 
-function cycleScreenshotSizes(display, screen, window, binding) {
+function cycleScreenshotSizes(display, window, binding) {
     // Probably this isn't useful with 5 sizes, but you can decrease instead
     // of increase by holding down shift.
     let modifiers = binding.get_modifiers();
@@ -124,8 +122,8 @@ function cycleScreenshotSizes(display, screen, window, binding) {
 
     let newOuterRect = window.get_frame_rect();
     let message = '%d×%d'.format(
-            (newOuterRect.width / scaleFactor),
-            (newOuterRect.height / scaleFactor));
+        (newOuterRect.width / scaleFactor),
+        (newOuterRect.height / scaleFactor));
 
     // The new size might have been constrained by geometry hints (e.g. for
     // a terminal) - in that case, include the actual ratio to the message
@@ -137,17 +135,14 @@ function cycleScreenshotSizes(display, screen, window, binding) {
     flashMessage(message);
 }
 
-function init() {
-}
-
 function enable() {
     Main.wm.addKeybinding('cycle-screenshot-sizes',
-                          Convenience.getSettings(),
+                          ExtensionUtils.getSettings(),
                           Meta.KeyBindingFlags.PER_WINDOW,
                           Shell.ActionMode.NORMAL,
                           cycleScreenshotSizes);
     Main.wm.addKeybinding('cycle-screenshot-sizes-backward',
-                          Convenience.getSettings(),
+                          ExtensionUtils.getSettings(),
                           Meta.KeyBindingFlags.PER_WINDOW |
                           Meta.KeyBindingFlags.IS_REVERSED,
                           Shell.ActionMode.NORMAL,

extensions/user-theme/extension.js

@@ -1,5 +1,6 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
 // Load shell theme from ~/.themes/name/gnome-shell
+/* exported init */
 
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
@@ -8,16 +9,14 @@ const Main = imports.ui.main;
 const SETTINGS_KEY = 'name';
 
 const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
-const Convenience = Me.imports.convenience;
 
 class ThemeManager {
     constructor() {
-        this._settings = Convenience.getSettings();
+        this._settings = ExtensionUtils.getSettings();
     }
 
     enable() {
-        this._changedId = this._settings.connect('changed::'+SETTINGS_KEY, this._changeTheme.bind(this));
+        this._changedId = this._settings.connect(`changed::${SETTINGS_KEY}`, this._changeTheme.bind(this));
         this._changeTheme();
     }
 
@@ -36,7 +35,9 @@ class ThemeManager {
         let _themeName = this._settings.get_string(SETTINGS_KEY);
 
         if (_themeName) {
-            let _userCssStylesheet = GLib.get_home_dir() + '/.themes/' + _themeName + '/gnome-shell/gnome-shell.css';
+            let _userCssStylesheet = GLib.build_filenamev([
+                GLib.get_home_dir(), '.themes', _themeName, 'gnome-shell', 'gnome-shell.css'
+            ]);
             let file = Gio.file_new_for_path(_userCssStylesheet);
             if (file.query_exists(null))
                 _stylesheet = _userCssStylesheet;
@@ -44,7 +45,9 @@ class ThemeManager {
                 let sysdirs = GLib.get_system_data_dirs();
                 sysdirs.unshift(GLib.get_user_data_dir());
                 for (let i = 0; i < sysdirs.length; i++) {
-                    _userCssStylesheet = sysdirs[i] + '/themes/' + _themeName + '/gnome-shell/gnome-shell.css';
+                    _userCssStylesheet = GLib.build_filenamev([
+                        sysdirs[i], 'themes', _themeName, 'gnome-shell', 'gnome-shell.css'
+                    ]);
                     let file = Gio.file_new_for_path(_userCssStylesheet);
                     if (file.query_exists(null)) {
                         _stylesheet = _userCssStylesheet;
@@ -55,13 +58,13 @@ class ThemeManager {
         }
 
         if (_stylesheet)
-            global.log('loading user theme: ' + _stylesheet);
+            global.log(`loading user theme: ${_stylesheet}`);
         else
             global.log('loading default theme (Adwaita)');
         Main.setThemeStylesheet(_stylesheet);
         Main.loadTheme();
     }
-};
+}
 
 function init() {
     return new ThemeManager();

extensions/window-list/extension.js

@@ -1,6 +1,8 @@
+/* exported init */
 const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
 const Gtk = imports.gi.Gtk;
 const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
@@ -13,7 +15,6 @@ const PopupMenu = imports.ui.popupMenu;
 
 const ExtensionUtils = imports.misc.extensionUtils;
 const Me = ExtensionUtils.getCurrentExtension();
-const Convenience = Me.imports.convenience;
 
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
@@ -29,12 +30,12 @@ const GroupingMode = {
 
 
 function _minimizeOrActivateWindow(window) {
-        let focusWindow = global.display.focus_window;
-        if (focusWindow == window ||
-            focusWindow && focusWindow.get_transient_for() == window)
-            window.minimize();
-        else
-            window.activate(global.get_current_time());
+    let focusWindow = global.display.focus_window;
+    if (focusWindow == window ||
+        focusWindow && focusWindow.get_transient_for() == window)
+        window.minimize();
+    else
+        window.activate(global.get_current_time());
 }
 
 function _openMenu(menu) {
@@ -49,7 +50,7 @@ function _onMenuStateChanged(menu, isOpen) {
     if (isOpen)
         return;
 
-    let [x, y,] = global.get_pointer();
+    let [x, y] = global.get_pointer();
     let actor = global.stage.get_actor_at_pos(Clutter.PickMode.REACTIVE, x, y);
     if (Me.stateObj.someWindowListContains(actor))
         actor.sync_hover();
@@ -138,7 +139,7 @@ class WindowContextMenu extends PopupMenu.PopupMenu {
         this._metaWindow.disconnect(this._notifyMaximizedHId);
         this._metaWindow.disconnect(this._notifyMaximizedVId);
     }
-};
+}
 
 class WindowTitle {
     constructor(metaWindow) {
@@ -205,7 +206,7 @@ class WindowTitle {
         this._metaWindow.disconnect(this._notifyWmClass);
         this._metaWindow.disconnect(this._notifyAppId);
     }
-};
+}
 
 
 class BaseButton {
@@ -238,11 +239,11 @@ class BaseButton {
 
         if (this._perMonitor) {
             this._windowEnteredMonitorId =
-                global.screen.connect('window-entered-monitor',
-                    this._windowEnteredOrLeftMonitor.bind(this));
+                global.display.connect('window-entered-monitor',
+                                       this._windowEnteredOrLeftMonitor.bind(this));
             this._windowLeftMonitorId =
-                global.screen.connect('window-left-monitor',
-                    this._windowEnteredOrLeftMonitor.bind(this));
+                global.display.connect('window-left-monitor',
+                                       this._windowEnteredOrLeftMonitor.bind(this));
         }
     }
 
@@ -257,7 +258,7 @@ class BaseButton {
         this._onClicked(this.actor, 1);
     }
 
-    _onClicked(actor, button) {
+    _onClicked(_actor, _button) {
         throw new Error('Not implemented');
     }
 
@@ -265,7 +266,7 @@ class BaseButton {
         return true;
     }
 
-    _onPopupMenu(actor) {
+    _onPopupMenu(_actor) {
         if (!this._canOpenPopupMenu() || this._contextMenu.isOpen)
             return;
         _openMenu(this._contextMenu);
@@ -282,12 +283,12 @@ class BaseButton {
             this.actor.remove_style_class_name('focused');
     }
 
-    _windowEnteredOrLeftMonitor(metaScreen, monitorIndex, metaWindow) {
+    _windowEnteredOrLeftMonitor(_metaDisplay, _monitorIndex, _metaWindow) {
         throw new Error('Not implemented');
     }
 
     _isWindowVisible(window) {
-        let workspace = global.screen.get_active_workspace();
+        let workspace = global.workspace_manager.get_active_workspace();
 
         return !window.skip_taskbar &&
                window.located_on_workspace(workspace) &&
@@ -315,14 +316,14 @@ class BaseButton {
         global.window_manager.disconnect(this._switchWorkspaceId);
 
         if (this._windowEnteredMonitorId)
-            global.screen.disconnect(this._windowEnteredMonitorId);
+            global.display.disconnect(this._windowEnteredMonitorId);
         this._windowEnteredMonitorId = 0;
 
         if (this._windowLeftMonitorId)
-            global.screen.disconnect(this._windowLeftMonitorId);
+            global.display.disconnect(this._windowLeftMonitorId);
         this._windowLeftMonitorId = 0;
     }
-};
+}
 
 
 class WindowButton extends BaseButton {
@@ -377,7 +378,7 @@ class WindowButton extends BaseButton {
             this.actor.remove_style_class_name('minimized');
     }
 
-    _windowEnteredOrLeftMonitor(metaScreen, monitorIndex, metaWindow) {
+    _windowEnteredOrLeftMonitor(metaDisplay, monitorIndex, metaWindow) {
         if (monitorIndex == this._monitorIndex && metaWindow == this.metaWindow)
             this._updateVisibility();
     }
@@ -396,7 +397,7 @@ class WindowButton extends BaseButton {
         global.display.disconnect(this._notifyFocusId);
         this._contextMenu.destroy();
     }
-};
+}
 
 
 class AppContextMenu extends PopupMenu.PopupMenu {
@@ -457,7 +458,7 @@ class AppContextMenu extends PopupMenu.PopupMenu {
 
         super.open(animate);
     }
-};
+}
 
 class AppButton extends BaseButton {
     constructor(app, perMonitor, monitorIndex) {
@@ -518,7 +519,7 @@ class AppButton extends BaseButton {
         this._updateStyle();
     }
 
-    _windowEnteredOrLeftMonitor(metaScreen, monitorIndex, metaWindow) {
+    _windowEnteredOrLeftMonitor(metaDisplay, monitorIndex, metaWindow) {
         if (this._windowTracker.get_window_app(metaWindow) == this.app &&
             monitorIndex == this._monitorIndex) {
             this._updateVisibility();
@@ -529,7 +530,7 @@ class AppButton extends BaseButton {
     _updateVisibility() {
         if (!this._perMonitor) {
             // fast path: use ShellApp API to avoid iterating over all windows.
-            let workspace = global.screen.get_active_workspace();
+            let workspace = global.workspace_manager.get_active_workspace();
             this.actor.visible = this.app.is_on_workspace(workspace);
         } else {
             this.actor.visible = this.getWindowList().length >= 1;
@@ -638,21 +639,24 @@ class AppButton extends BaseButton {
         this.app.disconnect(this._windowsChangedId);
         this._menu.destroy();
     }
-};
+}
 
 
+let WorkspaceIndicator = GObject.registerClass(
 class WorkspaceIndicator extends PanelMenu.Button {
-    constructor() {
-        super(0.0, _("Workspace Indicator"), true);
-        this.setMenu(new PopupMenu.PopupMenu(this.actor, 0.0, St.Side.BOTTOM));
-        this.actor.add_style_class_name('window-list-workspace-indicator');
+    _init() {
+        super._init(0.0, _("Workspace Indicator"), true);
+        this.setMenu(new PopupMenu.PopupMenu(this, 0.0, St.Side.BOTTOM));
+        this.add_style_class_name('window-list-workspace-indicator');
         this.menu.actor.remove_style_class_name('panel-menu');
 
         let container = new St.Widget({ layout_manager: new Clutter.BinLayout(),
                                         x_expand: true, y_expand: true });
-        this.actor.add_actor(container);
+        this.add_actor(container);
 
-        this._currentWorkspace = global.screen.get_active_workspace().index();
+        let workspaceManager = global.workspace_manager;
+
+        this._currentWorkspace = workspaceManager.get_active_workspace().index();
         this.statusLabel = new St.Label({ text: this._getStatusText(),
                                           x_align: Clutter.ActorAlign.CENTER,
                                           y_align: Clutter.ActorAlign.CENTER });
@@ -660,13 +664,13 @@ class WorkspaceIndicator extends PanelMenu.Button {
 
         this.workspacesItems = [];
 
-        this._screenSignals = [];
-        this._screenSignals.push(global.screen.connect('notify::n-workspaces',
-                                                       this._updateMenu.bind(this)));
-        this._screenSignals.push(global.screen.connect_after('workspace-switched',
-                                                             this._updateIndicator.bind(this)));
+        this._workspaceManagerSignals = [];
+        this._workspaceManagerSignals.push(workspaceManager.connect('notify::n-workspaces',
+                                                                    this._updateMenu.bind(this)));
+        this._workspaceManagerSignals.push(workspaceManager.connect_after('workspace-switched',
+                                                                          this._updateIndicator.bind(this)));
 
-        this.actor.connect('scroll-event', this._onScrollEvent.bind(this));
+        this.connect('scroll-event', this._onScrollEvent.bind(this));
         this._updateMenu();
 
         this._settings = new Gio.Settings({ schema_id: 'org.gnome.desktop.wm.preferences' });
@@ -675,44 +679,47 @@ class WorkspaceIndicator extends PanelMenu.Button {
                                    this._updateMenu.bind(this));
     }
 
-    destroy() {
-        for (let i = 0; i < this._screenSignals.length; i++)
-            global.screen.disconnect(this._screenSignals[i]);
+    _onDestroy() {
+        for (let i = 0; i < this._workspaceManagerSignals.length; i++)
+            global.workspace_manager.disconnect(this._workspaceManagerSignals[i]);
 
         if (this._settingsChangedId) {
             this._settings.disconnect(this._settingsChangedId);
             this._settingsChangedId = 0;
         }
 
-        super.destroy();
+        super._onDestroy();
     }
 
     _updateIndicator() {
         this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.NONE);
-        this._currentWorkspace = global.screen.get_active_workspace().index();
+        this._currentWorkspace = global.workspace_manager.get_active_workspace().index();
         this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.DOT);
 
         this.statusLabel.set_text(this._getStatusText());
     }
 
     _getStatusText() {
-        let current = global.screen.get_active_workspace().index();
-        let total = global.screen.n_workspaces;
+        let workspaceManager = global.workspace_manager;
+        let current = workspaceManager.get_active_workspace().index();
+        let total = workspaceManager.n_workspaces;
 
         return '%d / %d'.format(current + 1, total);
     }
 
     _updateMenu() {
+        let workspaceManager = global.workspace_manager;
+
         this.menu.removeAll();
         this.workspacesItems = [];
-        this._currentWorkspace = global.screen.get_active_workspace().index();
+        this._currentWorkspace = workspaceManager.get_active_workspace().index();
 
-        for(let i = 0; i < global.screen.n_workspaces; i++) {
+        for (let i = 0; i < workspaceManager.n_workspaces; i++) {
             let name = Meta.prefs_get_workspace_name(i);
             let item = new PopupMenu.PopupMenuItem(name);
             item.workspaceId = i;
 
-            item.connect('activate', (item, event) => {
+            item.connect('activate', (item, _event) => {
                 this._activate(item.workspaceId);
             });
 
@@ -727,8 +734,10 @@ class WorkspaceIndicator extends PanelMenu.Button {
     }
 
     _activate(index) {
-        if(index >= 0 && index < global.screen.n_workspaces) {
-            let metaWorkspace = global.screen.get_workspace_by_index(index);
+        let workspaceManager = global.workspace_manager;
+
+        if (index >= 0 && index < workspaceManager.n_workspaces) {
+            let metaWorkspace = workspaceManager.get_workspace_by_index(index);
             metaWorkspace.activate(global.get_current_time());
         }
     }
@@ -752,7 +761,7 @@ class WorkspaceIndicator extends PanelMenu.Button {
         if (actor.get_n_children() > 0)
             actor.get_first_child().allocate(box, flags);
     }
-};
+});
 
 class WindowList {
     constructor(perMonitor, monitor) {
@@ -763,7 +772,7 @@ class WindowList {
                                      style_class: 'bottom-panel solid',
                                      reactive: true,
                                      track_hover: true,
-                                     layout_manager: new Clutter.BinLayout()});
+                                     layout_manager: new Clutter.BinLayout() });
         this.actor.connect('destroy', this._onDestroy.bind(this));
 
         let box = new St.BoxLayout({ x_expand: true, y_expand: true });
@@ -792,14 +801,12 @@ class WindowList {
         indicatorsBox.add(this._workspaceIndicator.container, { expand: false, y_fill: true });
 
         this._mutterSettings = new Gio.Settings({ schema_id: 'org.gnome.mutter' });
-        this._workspaceSettings = this._getWorkspaceSettings();
         this._workspacesOnlyOnPrimaryChangedId =
-            this._workspaceSettings.connect('changed::workspaces-only-on-primary',
-                                            this._updateWorkspaceIndicatorVisibility.bind(this));
-        this._dynamicWorkspacesSettings = this._getDynamicWorkspacesSettings();
+            this._mutterSettings.connect('changed::workspaces-only-on-primary',
+                                         this._updateWorkspaceIndicatorVisibility.bind(this));
         this._dynamicWorkspacesChangedId =
-            this._dynamicWorkspacesSettings.connect('changed::dynamic-workspaces',
-                                                    this._updateWorkspaceIndicatorVisibility.bind(this));
+            this._mutterSettings.connect('changed::dynamic-workspaces',
+                                         this._updateWorkspaceIndicatorVisibility.bind(this));
         this._updateWorkspaceIndicatorVisibility();
 
         this._menuManager = new PopupMenu.PopupMenuManager(this);
@@ -833,10 +840,12 @@ class WindowList {
                     this._updateKeyboardAnchor();
                 });
 
+        let workspaceManager = global.workspace_manager;
+
         this._workspaceSignals = new Map();
         this._nWorkspacesChangedId =
-            global.screen.connect('notify::n-workspaces',
-                                  this._onWorkspacesChanged.bind(this));
+            workspaceManager.connect('notify::n-workspaces',
+                                     this._onWorkspacesChanged.bind(this));
         this._onWorkspacesChanged();
 
         this._switchWorkspaceId =
@@ -856,7 +865,7 @@ class WindowList {
             });
 
         this._fullscreenChangedId =
-            global.screen.connect('in-fullscreen-changed', () => {
+            global.display.connect('in-fullscreen-changed', () => {
                 this._updateKeyboardAnchor();
             });
 
@@ -873,7 +882,7 @@ class WindowList {
         this._dndTimeoutId = 0;
         this._dndWindow = null;
 
-        this._settings = Convenience.getSettings();
+        this._settings = ExtensionUtils.getSettings();
         this._groupingModeChangedId =
             this._settings.connect('changed::grouping-mode',
                                    this._groupingModeChanged.bind(this));
@@ -881,19 +890,6 @@ class WindowList {
         this._groupingModeChanged();
     }
 
-    _getDynamicWorkspacesSettings() {
-        if (this._workspaceSettings.list_keys().indexOf('dynamic-workspaces') > -1)
-            return this._workspaceSettings;
-        return this._mutterSettings;
-    }
-
-    _getWorkspaceSettings() {
-        let settings = global.get_overrides_settings();
-        if (settings.list_keys().indexOf('workspaces-only-on-primary') > -1)
-            return settings;
-        return this._mutterSettings;
-    }
-
     _onScrollEvent(actor, event) {
         let direction = event.get_scroll_direction();
         let diff = 0;
@@ -904,17 +900,12 @@ class WindowList {
         else
             return;
 
-        let children = this._windowList.get_children().map(a => a._delegate);
-        let active = 0;
-        for (let i = 0; i < children.length; i++) {
-            if (children[i].active) {
-                active = i;
-                break;
-            }
-        }
-
-        active = Math.max(0, Math.min(active + diff, children.length-1));
-        children[active].activate();
+        let children = this._windowList.get_children()
+            .filter(c => c.visible)
+            .map(a => a._delegate);
+        let active = children.findIndex(c => c.active);
+        let newActive = Math.max(0, Math.min(active + diff, children.length - 1));
+        children[newActive].activate();
     }
 
     _updatePosition() {
@@ -923,10 +914,11 @@ class WindowList {
     }
 
     _updateWorkspaceIndicatorVisibility() {
-        let hasWorkspaces = this._dynamicWorkspacesSettings.get_boolean('dynamic-workspaces') ||
-                            global.screen.n_workspaces > 1;
+        let workspaceManager = global.workspace_manager;
+        let hasWorkspaces = this._mutterSettings.get_boolean('dynamic-workspaces') ||
+                            workspaceManager.n_workspaces > 1;
         let workspacesOnMonitor = this._monitor == Main.layoutManager.primaryMonitor ||
-                                  !this._workspaceSettings.get_boolean('workspaces-only-on-primary');
+                                  !this._mutterSettings.get_boolean('workspaces-only-on-primary');
 
         this._workspaceIndicator.actor.visible = hasWorkspaces && workspacesOnMonitor;
     }
@@ -939,7 +931,7 @@ class WindowList {
         let [, childWidth] = children[0].get_preferred_width(-1);
         let spacing = this._windowList.layout_manager.spacing;
 
-        let workspace = global.screen.get_active_workspace();
+        let workspace = global.workspace_manager.get_active_workspace();
         let windows = global.display.get_tab_list(Meta.TabList.NORMAL, workspace);
         if (this._perMonitor)
             windows = windows.filter(w => w.get_monitor() == this._monitor.index);
@@ -1028,12 +1020,9 @@ class WindowList {
 
     _removeApp(app) {
         let children = this._windowList.get_children();
-        for (let i = 0; i < children.length; i++) {
-            if (children[i]._delegate.app == app) {
-                children[i].destroy();
-                return;
-            }
-        }
+        let child = children.find(c => c._delegate.app == app);
+        if (child)
+            child.destroy();
     }
 
     _onWindowAdded(ws, win) {
@@ -1047,10 +1036,8 @@ class WindowList {
             return;
 
         let children = this._windowList.get_children();
-        for (let i = 0; i < children.length; i++) {
-            if (children[i]._delegate.metaWindow == win)
-                return;
-        }
+        if (children.find(c => c._delegate.metaWindow == win))
+            return;
 
         let button = new WindowButton(win, this._perMonitor, this._monitor.index);
         this._windowList.layout_manager.pack(button.actor,
@@ -1070,18 +1057,17 @@ class WindowList {
             return; // not actually removed, just moved to another workspace
 
         let children = this._windowList.get_children();
-        for (let i = 0; i < children.length; i++) {
-            if (children[i]._delegate.metaWindow == win) {
-                children[i].destroy();
-                return;
-            }
-        }
+        let child = children.find(c => c._delegate.metaWindow == win);
+        if (child)
+            child.destroy();
     }
 
     _onWorkspacesChanged() {
-        let numWorkspaces = global.screen.n_workspaces;
+        let workspaceManager = global.workspace_manager;
+        let numWorkspaces = workspaceManager.n_workspaces;
+
         for (let i = 0; i < numWorkspaces; i++) {
-            let workspace = global.screen.get_workspace_by_index(i);
+            let workspace = workspaceManager.get_workspace_by_index(i);
             if (this._workspaceSignals.has(workspace))
                 continue;
 
@@ -1099,9 +1085,11 @@ class WindowList {
     }
 
     _disconnectWorkspaceSignals() {
-        let numWorkspaces = global.screen.n_workspaces;
+        let workspaceManager = global.workspace_manager;
+        let numWorkspaces = workspaceManager.n_workspaces;
+
         for (let i = 0; i < numWorkspaces; i++) {
-            let workspace = global.screen.get_workspace_by_index(i);
+            let workspace = workspaceManager.get_workspace_by_index(i);
             let signals = this._workspaceSignals.get(workspace);
             this._workspaceSignals.delete(workspace);
             workspace.disconnect(signals._windowAddedId);
@@ -1163,8 +1151,8 @@ class WindowList {
     }
 
     _onDestroy() {
-        this._workspaceSettings.disconnect(this._workspacesOnlyOnPrimaryChangedId);
-        this._dynamicWorkspacesSettings.disconnect(this._dynamicWorkspacesChangedId);
+        this._mutterSettings.disconnect(this._workspacesOnlyOnPrimaryChangedId);
+        this._mutterSettings.disconnect(this._dynamicWorkspacesChangedId);
 
         this._workspaceIndicator.destroy();
 
@@ -1179,7 +1167,7 @@ class WindowList {
         Main.layoutManager.hideKeyboard();
 
         this._disconnectWorkspaceSignals();
-        global.screen.disconnect(this._nWorkspacesChangedId);
+        global.workspace_manager.disconnect(this._nWorkspacesChangedId);
         this._nWorkspacesChangedId = 0;
 
         global.window_manager.disconnect(this._switchWorkspaceId);
@@ -1189,7 +1177,7 @@ class WindowList {
         Main.overview.disconnect(this._overviewShowingId);
         Main.overview.disconnect(this._overviewHidingId);
 
-        global.screen.disconnect(this._fullscreenChangedId);
+        global.display.disconnect(this._fullscreenChangedId);
 
         Main.xdndHandler.disconnect(this._dragBeginId);
         Main.xdndHandler.disconnect(this._dragEndId);
@@ -1200,7 +1188,7 @@ class WindowList {
         for (let i = 0; i < windows.length; i++)
             windows[i].metaWindow.set_icon_geometry(null);
     }
-};
+}
 
 class Extension {
     constructor() {
@@ -1211,7 +1199,7 @@ class Extension {
     enable() {
         this._windowLists = [];
 
-        this._settings = Convenience.getSettings();
+        this._settings = ExtensionUtils.getSettings();
         this._showOnAllMonitorsChangedId =
             this._settings.connect('changed::show-on-all-monitors',
                                    this._buildWindowLists.bind(this));
@@ -1255,7 +1243,7 @@ class Extension {
     someWindowListContains(actor) {
         return this._windowLists.some(list => list.actor.contains(actor));
     }
-};
+}
 
 function init() {
     return new Extension();

extensions/window-list/prefs.js

@@ -1,4 +1,5 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+/* exported init buildPrefsWidget */
 
 const Gio = imports.gi.Gio;
 const GObject = imports.gi.GObject;
@@ -8,12 +9,10 @@ const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
 
 const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
-const Convenience = Me.imports.convenience;
 
 
 function init() {
-    Convenience.initTranslations();
+    ExtensionUtils.initTranslations();
 }
 
 const WindowListPrefsWidget = GObject.registerClass(
@@ -25,7 +24,7 @@ class WindowListPrefsWidget extends Gtk.Grid {
         this.row_spacing = 6;
         this.orientation = Gtk.Orientation.VERTICAL;
 
-        let groupingLabel = '<b>' + _("Window Grouping") + '</b>';
+        let groupingLabel = '<b>%s</b>'.format(_("Window Grouping"));
         this.add(new Gtk.Label({ label: groupingLabel, use_markup: true,
                                  halign: Gtk.Align.START }));
 
@@ -37,7 +36,7 @@ class WindowListPrefsWidget extends Gtk.Grid {
                                   column_spacing: 6 });
         align.add(grid);
 
-        this._settings = Convenience.getSettings();
+        this._settings = ExtensionUtils.getSettings();
         let currentMode = this._settings.get_string('grouping-mode');
         let range = this._settings.get_range('grouping-mode');
         let modes = range.deep_unpack()[1].deep_unpack();
@@ -53,8 +52,8 @@ class WindowListPrefsWidget extends Gtk.Grid {
             let mode = modes[i];
             let label = modeLabels[mode];
             if (!label) {
-               log('Unhandled option "%s" for grouping-mode'.format(mode));
-               continue;
+                log('Unhandled option "%s" for grouping-mode'.format(mode));
+                continue;
             }
 
             radio = new Gtk.RadioButton({ active: currentMode == mode,

extensions/windowsNavigator/extension.js

@@ -1,6 +1,6 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* exported enable disable */
 const Clutter = imports.gi.Clutter;
-const Mainloop = imports.mainloop;
 const St = imports.gi.St;
 
 const Main = imports.ui.main;
@@ -15,18 +15,18 @@ function injectToFunction(parent, name, func) {
         if (ret === undefined)
             ret = func.apply(this, arguments);
         return ret;
-    }
+    };
     return origin;
 }
 
 let winInjections, workspaceInjections, workViewInjections, createdActors, connectedSignals;
 
 function resetState() {
-    winInjections = { };
-    workspaceInjections = { };
-    workViewInjections = { };
-    createdActors = [ ];
-    connectedSignals = [ ];
+    winInjections = {};
+    workspaceInjections = {};
+    workViewInjections = {};
+    createdActors = [];
+    connectedSignals = [];
 }
 
 function enable() {
@@ -36,13 +36,13 @@ function enable() {
         this._text.raise_top();
         this._text.show();
         this._text.text = (this._windowClone.slotId + 1).toString();
-    }
+    };
     winInjections['showTooltip'] = undefined;
 
     Workspace.WindowOverlay.prototype.hideTooltip = function() {
         if (this._text && this._text.visible)
             this._text.hide();
-    }
+    };
     winInjections['hideTooltip'] = undefined;
 
     Workspace.Workspace.prototype.showTooltip = function() {
@@ -65,7 +65,7 @@ function enable() {
         this._tip.y = area.y;
         this._tip.show();
         this._tip.raise_top();
-    }
+    };
     workspaceInjections['showTooltip'] = undefined;
 
     Workspace.Workspace.prototype.hideTooltip = function() {
@@ -74,7 +74,7 @@ function enable() {
         if (!this._tip.get_parent())
             return;
         this._tip.hide();
-    }
+    };
     workspaceInjections['hideTooltip'] = undefined;
 
     Workspace.Workspace.prototype.getWindowWithTooltip = function(id) {
@@ -83,7 +83,7 @@ function enable() {
                 return this._windows[i].metaWindow;
         }
         return null;
-    }
+    };
     workspaceInjections['getWindowWithTooltip'] = undefined;
 
     Workspace.Workspace.prototype.showWindowsTooltips = function() {
@@ -91,7 +91,7 @@ function enable() {
             if (this._windowOverlays[i] != null)
                 this._windowOverlays[i].showTooltip();
         }
-    }
+    };
     workspaceInjections['showWindowsTooltips'] = undefined;
 
     Workspace.Workspace.prototype.hideWindowsTooltips = function() {
@@ -99,7 +99,7 @@ function enable() {
             if (this._windowOverlays[i] != null)
                 this._windowOverlays[i].hideTooltip();
         }
-    }
+    };
     workspaceInjections['hideWindowsTooltips'] = undefined;
 
     WorkspacesView.WorkspacesView.prototype._hideTooltips = function() {
@@ -108,7 +108,7 @@ function enable() {
         this._pickWindow = false;
         for (let i = 0; i < this._workspaces.length; i++)
             this._workspaces[i].hideWindowsTooltips();
-    }
+    };
     workViewInjections['_hideTooltips'] = undefined;
 
     WorkspacesView.WorkspacesView.prototype._hideWorkspacesTooltips = function() {
@@ -116,7 +116,7 @@ function enable() {
         this._pickWorkspace = false;
         for (let i = 0; i < this._workspaces.length; i++)
             this._workspaces[i].hideTooltip();
-    }
+    };
     workViewInjections['_hideWorkspacesTooltips'] = undefined;
 
     WorkspacesView.WorkspacesView.prototype._onKeyRelease = function(s, o) {
@@ -128,21 +128,23 @@ function enable() {
             (o.get_key_symbol() == Clutter.KEY_Control_L ||
              o.get_key_symbol() == Clutter.KEY_Control_R))
             this._hideWorkspacesTooltips();
-    }
+    };
     workViewInjections['_onKeyRelease'] = undefined;
 
     WorkspacesView.WorkspacesView.prototype._onKeyPress = function(s, o) {
-        if(Main.overview.viewSelector._activePage != Main.overview.viewSelector._workspacesPage)
+        if (Main.overview.viewSelector._activePage != Main.overview.viewSelector._workspacesPage)
             return false;
 
+        let workspaceManager = global.workspace_manager;
+
         if ((o.get_key_symbol() == Clutter.KEY_Alt_L ||
              o.get_key_symbol() == Clutter.KEY_Alt_R)
             && !this._pickWorkspace) {
             this._prevFocusActor = global.stage.get_key_focus();
             global.stage.set_key_focus(null);
-            this._active = global.screen.get_active_workspace_index();
+            this._active = workspaceManager.get_active_workspace_index();
             this._pickWindow = true;
-            this._workspaces[global.screen.get_active_workspace_index()].showWindowsTooltips();
+            this._workspaces[workspaceManager.get_active_workspace_index()].showWindowsTooltips();
             return true;
         }
         if ((o.get_key_symbol() == Clutter.KEY_Control_L ||
@@ -166,7 +168,7 @@ function enable() {
             return true;
 
         if (this._pickWindow) {
-            if (this._active != global.screen.get_active_workspace_index()) {
+            if (this._active != workspaceManager.get_active_workspace_index()) {
                 this._hideTooltips();
                 return false;
             }
@@ -207,7 +209,7 @@ function enable() {
             return true;
         }
         return false;
-    }
+    };
     workViewInjections['_onKeyPress'] = undefined;
 
     winInjections['_init'] = injectToFunction(Workspace.WindowOverlay.prototype, '_init', function(windowClone, parentActor) {
@@ -217,8 +219,8 @@ function enable() {
         parentActor.add_actor(this._text);
     });
 
-    winInjections['relayout'] = injectToFunction(Workspace.WindowOverlay.prototype, 'relayout', function(animate) {
-        let [cloneX, cloneY, cloneWidth, cloneHeight] = this._windowClone.slot;
+    winInjections['relayout'] = injectToFunction(Workspace.WindowOverlay.prototype, 'relayout', function(_animate) {
+        let [cloneX, cloneY, cloneWidth_, cloneHeight_] = this._windowClone.slot;
 
         let textX = cloneX - 2;
         let textY = cloneY - 2;
@@ -240,7 +242,7 @@ function enable() {
             this._tip = null;
     });
 
-    workViewInjections['_init'] = injectToFunction(WorkspacesView.WorkspacesView.prototype, '_init', function(width, height, x, y, workspaces) {
+    workViewInjections['_init'] = injectToFunction(WorkspacesView.WorkspacesView.prototype, '_init', function(_width, _height, _x, _y, _workspaces) {
         this._pickWorkspace = false;
         this._pickWindow = false;
         this._keyPressEventId =
@@ -254,7 +256,7 @@ function enable() {
     workViewInjections['_onDestroy'] = injectToFunction(WorkspacesView.WorkspacesView.prototype, '_onDestroy', function() {
         global.stage.disconnect(this._keyPressEventId);
         global.stage.disconnect(this._keyReleaseEventId);
-        connectedSignals = [ ];
+        connectedSignals = [];
     });
 }
 
@@ -283,7 +285,3 @@ function disable() {
 
     resetState();
 }
-
-function init() {
-    /* do nothing */
-}

extensions/workspace-indicator/extension.js

@@ -1,13 +1,13 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+/* exported init enable disable */
 
 const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
 const Meta = imports.gi.Meta;
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
-const Mainloop = imports.mainloop;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
-const Panel = imports.ui.panel;
 
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
@@ -15,34 +15,36 @@ const _ = Gettext.gettext;
 const Main = imports.ui.main;
 
 const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
-const Convenience = Me.imports.convenience;
 
 const WORKSPACE_SCHEMA = 'org.gnome.desktop.wm.preferences';
 const WORKSPACE_KEY = 'workspace-names';
 
+let WorkspaceIndicator = GObject.registerClass(
 class WorkspaceIndicator extends PanelMenu.Button {
-    constructor() {
-        super(0.0, _("Workspace Indicator"));
+    _init() {
+        super._init(0.0, _("Workspace Indicator"));
 
-        this._currentWorkspace = global.screen.get_active_workspace().index();
+        let workspaceManager = global.workspace_manager;
+
+        this._currentWorkspace = workspaceManager.get_active_workspace().index();
         this.statusLabel = new St.Label({ y_align: Clutter.ActorAlign.CENTER,
                                           text: this._labelText() });
 
-        this.actor.add_actor(this.statusLabel);
+        this.add_actor(this.statusLabel);
 
         this.workspacesItems = [];
         this._workspaceSection = new PopupMenu.PopupMenuSection();
         this.menu.addMenuItem(this._workspaceSection);
 
-        this._screenSignals = [];
-        this._screenSignals.push(global.screen.connect_after('workspace-added',                                                              this._createWorkspacesSection.bind(this)));
-        this._screenSignals.push(global.screen.connect_after('workspace-removed',
-                                                             this._createWorkspacesSection.bind(this)));
-        this._screenSignals.push(global.screen.connect_after('workspace-switched',
-                                                             this._updateIndicator.bind(this)));
+        this._workspaceManagerSignals = [];
+        this._workspaceManagerSignals.push(workspaceManager.connect_after('workspace-added',
+                                                                          this._createWorkspacesSection.bind(this)));
+        this._workspaceManagerSignals.push(workspaceManager.connect_after('workspace-removed',
+                                                                          this._createWorkspacesSection.bind(this)));
+        this._workspaceManagerSignals.push(workspaceManager.connect_after('workspace-switched',
+                                                                          this._updateIndicator.bind(this)));
 
-        this.actor.connect('scroll-event', this._onScrollEvent.bind(this));
+        this.connect('scroll-event', this._onScrollEvent.bind(this));
         this._createWorkspacesSection();
 
         //styling
@@ -50,32 +52,32 @@ class WorkspaceIndicator extends PanelMenu.Button {
 
         this._settings = new Gio.Settings({ schema_id: WORKSPACE_SCHEMA });
         this._settingsChangedId =
-            this._settings.connect('changed::' + WORKSPACE_KEY,
+            this._settings.connect(`changed::${WORKSPACE_KEY}`,
                                    this._createWorkspacesSection.bind(this));
     }
 
-    destroy() {
-        for (let i = 0; i < this._screenSignals.length; i++)
-            global.screen.disconnect(this._screenSignals[i]);
+    _onDestroy() {
+        for (let i = 0; i < this._workspaceManagerSignals.length; i++)
+            global.workspace_manager.disconnect(this._workspaceManagerSignals[i]);
 
         if (this._settingsChangedId) {
             this._settings.disconnect(this._settingsChangedId);
             this._settingsChangedId = 0;
         }
 
-        super.destroy();
+        super._onDestroy();
     }
 
     _updateIndicator() {
         this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.NONE);
-        this._currentWorkspace = global.screen.get_active_workspace().index();
+        this._currentWorkspace = global.workspace_manager.get_active_workspace().index();
         this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.DOT);
 
         this.statusLabel.set_text(this._labelText());
     }
 
     _labelText(workspaceIndex) {
-        if(workspaceIndex == undefined) {
+        if (workspaceIndex == undefined) {
             workspaceIndex = this._currentWorkspace;
             return (workspaceIndex + 1).toString();
         }
@@ -83,18 +85,19 @@ class WorkspaceIndicator extends PanelMenu.Button {
     }
 
     _createWorkspacesSection() {
+        let workspaceManager = global.workspace_manager;
+
         this._workspaceSection.removeAll();
         this.workspacesItems = [];
-        this._currentWorkspace = global.screen.get_active_workspace().index();
+        this._currentWorkspace = workspaceManager.get_active_workspace().index();
 
         let i = 0;
-        for(; i < global.screen.n_workspaces; i++) {
+        for (; i < workspaceManager.n_workspaces; i++) {
             this.workspacesItems[i] = new PopupMenu.PopupMenuItem(this._labelText(i));
             this._workspaceSection.addMenuItem(this.workspacesItems[i]);
             this.workspacesItems[i].workspaceId = i;
             this.workspacesItems[i].label_actor = this.statusLabel;
-            let self = this;
-            this.workspacesItems[i].connect('activate', (actor, event) => {
+            this.workspacesItems[i].connect('activate', (actor, _event) => {
                 this._activate(actor.workspaceId);
             });
 
@@ -106,8 +109,10 @@ class WorkspaceIndicator extends PanelMenu.Button {
     }
 
     _activate(index) {
-        if(index >= 0 && index <  global.screen.n_workspaces) {
-            let metaWorkspace = global.screen.get_workspace_by_index(index);
+        let workspaceManager = global.workspace_manager;
+
+        if (index >= 0 && index <  workspaceManager.n_workspaces) {
+            let metaWorkspace = workspaceManager.get_workspace_by_index(index);
             metaWorkspace.activate(global.get_current_time());
         }
     }
@@ -123,13 +128,13 @@ class WorkspaceIndicator extends PanelMenu.Button {
             return;
         }
 
-        let newIndex = global.screen.get_active_workspace().index() + diff;
+        let newIndex = global.workspace_manager.get_active_workspace().index() + diff;
         this._activate(newIndex);
     }
-};
+});
 
-function init(meta) {
-    Convenience.initTranslations();
+function init() {
+    ExtensionUtils.initTranslations();
 }
 
 let _indicator;

extensions/workspace-indicator/prefs.js

@@ -1,7 +1,7 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+/* exported init buildPrefsWidget */
 
 const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
 const GObject = imports.gi.GObject;
 const Gtk = imports.gi.Gtk;
 
@@ -10,8 +10,6 @@ const _ = Gettext.gettext;
 const N_ = e => e;
 
 const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
-const Convenience = Me.imports.convenience;
 
 const WORKSPACE_SCHEMA = 'org.gnome.desktop.wm.preferences';
 const WORKSPACE_KEY = 'workspace-names';
@@ -115,7 +113,7 @@ class WorkspaceNameModel extends Gtk.ListStore {
         names.splice(index, 1);
 
         // compact the array
-        for (let i = names.length -1; i >= 0 && !names[i]; i++)
+        for (let i = names.length - 1; i >= 0 && !names[i]; i++)
             names.pop();
 
         this._settings.set_strv(WORKSPACE_KEY, names);
@@ -131,7 +129,7 @@ class WorkspaceSettingsWidget extends Gtk.Grid {
         this.margin = 12;
         this.orientation = Gtk.Orientation.VERTICAL;
 
-        this.add(new Gtk.Label({ label: '<b>' + _("Workspace Names") + '</b>',
+        this.add(new Gtk.Label({ label: '<b>%s</b>'.format(_("Workspace Names")),
                                  use_markup: true, margin_bottom: 6,
                                  hexpand: true, halign: Gtk.Align.START }));
 
@@ -144,8 +142,7 @@ class WorkspaceSettingsWidget extends Gtk.Grid {
                                             headers_visible: false,
                                             reorderable: true,
                                             hexpand: true,
-                                            vexpand: true
-                                          });
+                                            vexpand: true });
 
         let column = new Gtk.TreeViewColumn({ title: _("Name") });
         let renderer = new Gtk.CellRendererText({ editable: true });
@@ -176,11 +173,11 @@ class WorkspaceSettingsWidget extends Gtk.Grid {
         this.add(toolbar);
     }
 
-    _cellEdited(renderer, path, new_text) {
+    _cellEdited(renderer, path, newText) {
         let [ok, iter] = this._store.get_iter_from_string(path);
 
         if (ok)
-            this._store.set(iter, [this._store.Columns.LABEL], [new_text]);
+            this._store.set(iter, [this._store.Columns.LABEL], [newText]);
     }
 
     _newClicked() {
@@ -192,7 +189,7 @@ class WorkspaceSettingsWidget extends Gtk.Grid {
     }
 
     _delClicked() {
-        let [any, model, iter] = this._treeView.get_selection().get_selected();
+        let [any, model_, iter] = this._treeView.get_selection().get_selected();
 
         if (any)
             this._store.remove(iter);
@@ -200,7 +197,7 @@ class WorkspaceSettingsWidget extends Gtk.Grid {
 });
 
 function init() {
-    Convenience.initTranslations();
+    ExtensionUtils.initTranslations();
 }
 
 function buildPrefsWidget() {

lib/convenience.js

@@ -1,93 +0,0 @@
-/* -*- mode: js; js-basic-offset: 4; indent-tabs-mode: nil -*- */
-/*
-  Copyright (c) 2011-2012, Giovanni Campagna <scampa.giovanni@gmail.com>
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of the GNOME nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-const Gettext = imports.gettext;
-const Gio = imports.gi.Gio;
-
-const Config = imports.misc.config;
-const ExtensionUtils = imports.misc.extensionUtils;
-
-/**
- * initTranslations:
- * @domain: (optional): the gettext domain to use
- *
- * Initialize Gettext to load translations from extensionsdir/locale.
- * If @domain is not provided, it will be taken from metadata['gettext-domain']
- */
-function initTranslations(domain) {
-    let extension = ExtensionUtils.getCurrentExtension();
-
-    domain = domain || extension.metadata['gettext-domain'];
-
-    // check if this extension was built with "make zip-file", and thus
-    // has the locale files in a subfolder
-    // otherwise assume that extension has been installed in the
-    // same prefix as gnome-shell
-    let localeDir = extension.dir.get_child('locale');
-    if (localeDir.query_exists(null))
-        Gettext.bindtextdomain(domain, localeDir.get_path());
-    else
-        Gettext.bindtextdomain(domain, Config.LOCALEDIR);
-}
-
-/**
- * getSettings:
- * @schema: (optional): the GSettings schema id
- *
- * Builds and return a GSettings schema for @schema, using schema files
- * in extensionsdir/schemas. If @schema is not provided, it is taken from
- * metadata['settings-schema'].
- */
-function getSettings(schema) {
-    let extension = ExtensionUtils.getCurrentExtension();
-
-    schema = schema || extension.metadata['settings-schema'];
-
-    const GioSSS = Gio.SettingsSchemaSource;
-
-    // check if this extension was built with "make zip-file", and thus
-    // has the schema files in a subfolder
-    // otherwise assume that extension has been installed in the
-    // same prefix as gnome-shell (and therefore schemas are available
-    // in the standard folders)
-    let schemaDir = extension.dir.get_child('schemas');
-    let schemaSource;
-    if (schemaDir.query_exists(null))
-        schemaSource = GioSSS.new_from_directory(schemaDir.get_path(),
-                                                 GioSSS.get_default(),
-                                                 false);
-    else
-        schemaSource = GioSSS.get_default();
-
-    let schemaObj = schemaSource.lookup(schema, true);
-    if (!schemaObj)
-        throw new Error('Schema ' + schema + ' could not be found for extension '
-                        + extension.metadata.uuid + '. Please check your installation.');
-
-    return new Gio.Settings({ settings_schema: schemaObj });
-}
-								  

lint/eslintrc-gjs.json

@@ -0,0 +1,113 @@
+{
+    "env": {
+        "es6": true
+    },
+    "extends": "eslint:recommended",
+    "rules": {
+        "array-bracket-newline": [
+            "error",
+            "consistent"
+        ],
+        "array-bracket-spacing": [
+            "error",
+            "never"
+        ],
+        "brace-style": "error",
+        "comma-spacing": [
+            "error",
+            {
+                "before": false,
+                "after": true
+            }
+        ],
+        "indent": [
+            "error",
+            4,
+            {
+                "MemberExpression": "off"
+            }
+        ],
+        "key-spacing": [
+            "error",
+            {
+                "beforeColon": false,
+                "afterColon": true
+            }
+        ],
+        "keyword-spacing": [
+            "error",
+            {
+                "before": true,
+                "after": true
+            }
+        ],
+        "linebreak-style": [
+            "error",
+            "unix"
+        ],
+        "no-empty": [
+            "error",
+            {
+                "allowEmptyCatch": true
+            }
+        ],
+        "no-implicit-coercion": [
+            "error",
+            {
+                "allow": ["!!"]
+            }
+        ],
+        "nonblock-statement-body-position": [
+            "error",
+            "below"
+        ],
+        "object-curly-newline": [
+            "error",
+            {
+                "consistent": true
+            }
+        ],
+        "object-curly-spacing": "error",
+        "prefer-template": "error",
+        "quotes": [
+            "error",
+            "single",
+            {
+                "avoidEscape": true
+            }
+        ],
+        "semi": [
+            "error",
+            "always"
+        ],
+        "semi-spacing": [
+            "error",
+            {
+                "before": false,
+                "after": true
+            }
+        ],
+        "space-before-blocks": "error",
+        "space-infix-ops": [
+            "error",
+            {
+                "int32Hint": false
+            }
+        ]
+    },
+    "globals": {
+        "ARGV": false,
+        "Debugger": false,
+        "GIRepositoryGType": false,
+        "imports": false,
+        "Intl": false,
+        "log": false,
+        "logError": false,
+        "print": false,
+        "printerr": false,
+        "window": false
+    },
+    "parserOptions": {
+        "ecmaVersion": 2017
+    }
+}

lint/eslintrc-legacy.json

@@ -0,0 +1,20 @@
+{
+    "rules": {
+        "indent": [
+            "error",
+            4,
+            {
+                "ignoredNodes": [
+                    "ConditionalExpression",
+                    "CallExpression > ArrowFunctionExpression",
+                    "CallExpression[callee.object.name=GObject][callee.property.name=registerClass] > ClassExpression:first-child"
+                ],
+                "CallExpression": { "arguments": "first" },
+                "ArrayExpression": "first",
+                "ObjectExpression": "first",
+                "MemberExpression": "off"
+            }
+        ],
+        "quotes": "off"
+   }
+}

lint/eslintrc-shell.json

@@ -0,0 +1,58 @@
+{
+    "rules": {
+        "arrow-spacing": "error",
+        "brace-style": [
+            "error",
+            "1tbs",
+            {
+                "allowSingleLine": true
+            }
+        ],
+        "camelcase": [
+            "error",
+            {
+                "properties": "never",
+                "allow": ["^vfunc_"]
+            }
+        ],
+        "indent": [
+            "error",
+            4,
+            {
+                "ignoredNodes": [
+                    "ArrayExpression > ObjectExpression",
+                    "CallExpression[callee.object.name=GObject][callee.property.name=registerClass] > ClassExpression:first-child",
+                    "ConditionalExpression"
+                ],
+                "MemberExpression": "off"
+            }
+        ],
+        "key-spacing": [
+            "error",
+            {
+                "mode": "minimum",
+                "beforeColon": false,
+                "afterColon": true
+            }
+        ],
+        "no-unused-vars": [
+            "error",
+            {
+                "argsIgnorePattern": "^_",
+                "varsIgnorePattern": "_$"
+            }
+        ],
+        "object-curly-spacing": [
+            "error",
+            "always"
+        ],
+        "prefer-arrow-callback": "error"
+    },
+    "globals": {
+        "global": false,
+        "_": false,
+        "C_": false,
+        "N_": false,
+        "ngettext": false
+    }
+}

lint/generate-report.sh

@@ -0,0 +1,61 @@
+#!/bin/sh
+SEP=`printf '\t'`
+OUTPUT=/dev/stderr
+CWD=`pwd`
+SRCDIR=`dirname $0`
+
+run_lint() {
+  eslint -f unix "$@" .
+}
+
+parse_opts() {
+  tmp=`getopt -l output: o: "$@"`
+  [ $? -ne 0 ] && exit 1
+
+  eval set -- $tmp
+  while true
+  do
+    case $1 in
+      --output|-o)
+        OUTPUT=`realpath $2`; shift 2; continue ;;
+      --)
+        shift; break ;;
+    esac
+  done
+}
+
+# delete lines that don't start with '/',
+# replace the first space with tab, sort
+process_for_join() {
+  sed -E "/\//!d; s|(\S+)\s|\1$SEP|" | sort -k 1b,1
+}
+
+# re-replace tab with space
+process_post_join() {
+  sed -E "s|$SEP| |"
+}
+
+create_report() {
+  tmp1=`mktemp --tmpdir lint-XXXX`
+  run_lint | process_for_join > $tmp1
+
+  tmp2=`mktemp --tmpdir lint-XXXX`
+  run_lint -c lint/eslintrc-legacy.json | process_for_join > $tmp2
+
+  join -t"$SEP" -o '0,1.2' $tmp1 $tmp2 | process_post_join
+  rm $tmp1 $tmp2
+}
+
+
+parse_opts "$@"
+
+cd $SRCDIR/..
+
+create_report | tee $OUTPUT | grep -q .
+rv=$(( $? == 0 ))
+
+cd $CWD
+
+[ $rv -eq 0 -a -f $OUTPUT ] && rm $OUTPUT
+
+exit $rv

meson.build

@@ -1,5 +1,5 @@
 project('gnome-shell-extensions',
-  version: '3.27.92',
+  version: '3.31.90',
   meson_version: '>= 0.44.0',
   license: 'GPL2+'
 )
@@ -20,9 +20,7 @@ schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
 sessiondir = join_paths(datadir, 'gnome-session', 'sessions')
 xsessiondir = join_paths(datadir, 'xsessions')
 
-extensionlib = files('lib/convenience.js')
-
-js52 = find_program('js52', required: false)
+js60 = find_program('js60', required: false)
 
 ver_arr = meson.project_version().split('.')
 if ver_arr[1].to_int().is_even()
@@ -34,7 +32,6 @@ endif
 uuid_suffix = '@gnome-shell-extensions.gcampax.github.com'
 
 classic_extensions = [
-  'alternate-tab',
   'apps-menu',
   'places-menu',
   'launch-new-instance',
@@ -52,7 +49,6 @@ default_extensions += [
 all_extensions = default_extensions
 all_extensions += [
   'auto-move-windows',
-  'example',
   'native-window-placement',
   'user-theme'
 ]

po/POTFILES.in

@@ -1,15 +1,10 @@
 data/gnome-classic.desktop.in
 data/gnome-classic.session.desktop.in
-data/org.gnome.shell.extensions.classic-overrides.gschema.xml
-extensions/alternate-tab/prefs.js
 extensions/apps-menu/extension.js
 extensions/auto-move-windows/extension.js
 extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml
 extensions/auto-move-windows/prefs.js
 extensions/drive-menu/extension.js
-extensions/example/extension.js
-extensions/example/org.gnome.shell.extensions.example.gschema.xml
-extensions/example/prefs.js
 extensions/native-window-placement/extension.js
 extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml
 extensions/places-menu/extension.js

po/af.po

@@ -1,311 +1,370 @@
 # Afrikaans translation for gnome-shell-extensions.
 # This file is distributed under the same license as the gnome-shell-extensions package.
 # F Wolff <friedel@translate.org.za>, 2013.
+# Pieter Schoeman <pieter@sonbesie.co.za>, 2017.
+#
 msgid ""
 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-09-26 20:32+0000\n"
-"PO-Revision-Date: 2013-09-27 16:17+0200\n"
-"Last-Translator: F Wolff <friedel@translate.org.za>\n"
-"Language-Team: translate-discuss-af@lists.sourceforge.net\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
+"issues\n"
+"POT-Creation-Date: 2018-09-06 10:29+0000\n"
+"PO-Revision-Date: 2018-02-06 17:47+0200\n"
+"Last-Translator: Pieter Schalk Schoeman <pieter@sonbesie.co.za>\n"
+"Language-Team: Afrikaans <pieter@sonbesie.co.za>\n"
 "Language: af\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.7.1\n"
+"X-Generator: Poedit 2.0.3\n"
 "X-Project-Style: gnome\n"
 
-#: ../data/gnome-classic.desktop.in.h:1
-#: ../data/gnome-classic.session.desktop.in.in.h:1
+#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
 msgid "GNOME Classic"
 msgstr "GNOME Klassiek"
 
-#: ../data/gnome-classic.desktop.in.h:2
+#: data/gnome-classic.desktop.in:4
 msgid "This session logs you into GNOME Classic"
 msgstr "Hierdie sessie laat mens aanmeld by GNOME Klassiek"
 
-#: ../data/gnome-shell-classic.desktop.in.in.h:1
-msgid "GNOME Shell Classic"
-msgstr "GNOME Shell Klassiek"
-
-#: ../data/gnome-shell-classic.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "Vensterbestuur en toepassinglansering"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:1
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:7
 msgid "Attach modal dialog to the parent window"
-msgstr ""
+msgstr "Heg modale dialoogvenster vas aan die ouervenster"
 
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:2
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:8
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:25
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:33
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:41
 msgid ""
 "This key overrides the key in org.gnome.mutter when running GNOME Shell."
 msgstr ""
+"Hierdie sleutel oorskryf die sleutel in org.gnome.mutter wanneer GNOME Shell "
+"uitgevoer word."
 
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:3
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
+msgid "Arrangement of buttons on the titlebar"
+msgstr "Knoppie rangskikking op die titelbalk"
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:17
+msgid ""
+"This key overrides the key in org.gnome.desktop.wm.preferences when running "
+"GNOME Shell."
+msgstr ""
+"Die sleutel oorheers die sleutel in org.gnome.desktop.wm.preferences wanneer "
+"GNOME uitgevoer word."
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:24
 msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr ""
+msgstr "Aktiveer rand-tilering wanneer vensters op skermrand laat val word"
 
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:4
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:32
 msgid "Workspaces only on primary monitor"
-msgstr "Werkruimtes slegs op primêre monitor"
+msgstr "Werkspasies slegs op primêre monitor"
 
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:5
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:40
 msgid "Delay focus changes in mouse mode until the pointer stops moving"
-msgstr ""
+msgstr "Vertraag fokusverandering in muismodus totdat die wyser ophou beweeg"
 
-#: ../extensions/alternate-tab/prefs.js:20
+#: extensions/alternate-tab/prefs.js:19
 msgid "Thumbnail only"
-msgstr ""
+msgstr "Slegs duimnael"
 
-#: ../extensions/alternate-tab/prefs.js:21
+#: extensions/alternate-tab/prefs.js:20
 msgid "Application icon only"
 msgstr "Slegs toepassingsikoon"
 
-#: ../extensions/alternate-tab/prefs.js:22
+#: extensions/alternate-tab/prefs.js:21
 msgid "Thumbnail and application icon"
 msgstr "Duimnael en toepassingsikoon"
 
-#: ../extensions/alternate-tab/prefs.js:37
+#: extensions/alternate-tab/prefs.js:34
 msgid "Present windows as"
 msgstr "Wys vensters as"
 
-#: ../extensions/alternate-tab/prefs.js:62
+#: extensions/alternate-tab/prefs.js:65
 msgid "Show only windows in the current workspace"
 msgstr "Wys slegs vensters van die huidige werkruimte"
 
-#: ../extensions/apps-menu/extension.js:39
+#: extensions/apps-menu/extension.js:37
 msgid "Activities Overview"
 msgstr "Aktiwiteite-oorsig"
 
-#: ../extensions/apps-menu/extension.js:113
+#: extensions/apps-menu/extension.js:130
 msgid "Favorites"
 msgstr "Gunstelinge"
 
-#: ../extensions/apps-menu/extension.js:282
+#: extensions/apps-menu/extension.js:417
 msgid "Applications"
 msgstr "Toepassings"
 
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:1
+#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
 msgid "Application and workspace list"
-msgstr "Toepassing- en werkruimtelys"
+msgstr "Toepassing- en werkspasielys"
 
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
+#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:7
 msgid ""
 "A list of strings, each containing an application id (desktop file name), "
 "followed by a colon and the workspace number"
 msgstr ""
+"'n Lys stringe wat elkeen 'n toepassing id (werkskerm en lêernaam) sowel as "
+"komma gevolg deur 'n werkspasie nommer bevat"
 
-#: ../extensions/auto-move-windows/prefs.js:55
+#: extensions/auto-move-windows/prefs.js:53
 msgid "Application"
 msgstr "Toepassing"
 
-#: ../extensions/auto-move-windows/prefs.js:64
-#: ../extensions/auto-move-windows/prefs.js:106
+#: extensions/auto-move-windows/prefs.js:62
+#: extensions/auto-move-windows/prefs.js:117
 msgid "Workspace"
-msgstr "Werkruimte"
+msgstr "Werkspasie"
 
-#: ../extensions/auto-move-windows/prefs.js:80
-msgid "Add rule"
+#: extensions/auto-move-windows/prefs.js:78
+msgid "Add Rule"
 msgstr "Voeg reël by"
 
-#: ../extensions/auto-move-windows/prefs.js:94
+#: extensions/auto-move-windows/prefs.js:98
 msgid "Create new matching rule"
-msgstr ""
+msgstr "Skep 'n nuwe ooreenstemmende reël"
 
-#: ../extensions/auto-move-windows/prefs.js:98
+#: extensions/auto-move-windows/prefs.js:103
 msgid "Add"
 msgstr "Voeg by"
 
-#: ../extensions/drive-menu/extension.js:73
-#, c-format
-msgid "Ejecting drive '%s' failed:"
-msgstr "Kon nie skyf '%s' uitskiet nie:"
+#. TRANSLATORS: %s is the filesystem name
+#: extensions/drive-menu/extension.js:103
+#: extensions/places-menu/placeDisplay.js:219
+#, javascript-format
+msgid "Ejecting drive “%s” failed:"
+msgstr "Kon nie skyf \"%s\" uitskiet nie:"
 
-#: ../extensions/drive-menu/extension.js:90
+#: extensions/drive-menu/extension.js:118
 msgid "Removable devices"
 msgstr "Verwyderbare toestelle"
 
-#: ../extensions/drive-menu/extension.js:117
-msgid "Open File"
+#: extensions/drive-menu/extension.js:143
+msgid "Open Files"
 msgstr "Open lêer"
 
-#: ../extensions/example/extension.js:17
+#: extensions/example/extension.js:17
 msgid "Hello, world!"
 msgstr "Hallo, wêreld!"
 
-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:1
+#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:5
 msgid "Alternative greeting text."
-msgstr ""
+msgstr "Alternatiewe groetboodskap."
 
-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:2
+#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:6
 msgid ""
 "If not empty, it contains the text that will be shown when clicking on the "
 "panel."
 msgstr ""
+"Indien dit nie leeg is nie bevat dit die teks wat op die paneel gewys word "
+"as daarop geklik word."
+
+#: extensions/example/prefs.js:27
+msgid "Message"
+msgstr "Boodskap"
 
 #. TRANSLATORS: Example is the name of the extension, should not be
 #. translated
-#: ../extensions/example/prefs.js:30
+#: extensions/example/prefs.js:40
 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."
+"Nevertheless it’s possible to customize the greeting message."
 msgstr ""
+"Example het ten doel om te wys hoe om goeie uitbreidings vir die Shell te "
+"skep en het dus min funksionaliteit.\n"
+"Tog is dit moontlik om die groeteboodskap aan te pas."
 
-#: ../extensions/example/prefs.js:36
-msgid "Message:"
-msgstr "Boodskap:"
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:1
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
 msgid "Use more screen for windows"
-msgstr ""
+msgstr "Gebruik meer skermspasie vir vensters"
 
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:2
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
 msgid ""
 "Try to use more screen for placing window thumbnails by adapting to screen "
 "aspect ratio, and consolidating them further to reduce the bounding box. "
 "This setting applies only with the natural placement strategy."
 msgstr ""
+"Probeer om meer skermspasie te gebruik vir die plasing van vensterduimnaels "
+"deur aan te pas by die skerm-aspekverhouding. Hierdie instelling is slegs "
+"van toepassing op die normale plasingstrategie."
 
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:3
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
 msgid "Place window captions on top"
-msgstr ""
+msgstr "Plaas venster opskrifte bo"
 
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:4
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:12
 msgid ""
 "If true, place window captions on top the respective thumbnail, overriding "
 "shell default of placing it at the bottom. Changing this setting requires "
 "restarting the shell to have any effect."
 msgstr ""
+"As waar, plaas venster opskrifte bo hul onderskeie duimnaels, anders as die "
+"shell standaard waar hulle onder sou verskyn. As u hierdie instelling "
+"verander, moet die shell weer begin word om enige effek te toon."
 
-#: ../extensions/places-menu/extension.js:78
-#: ../extensions/places-menu/extension.js:81
+#: extensions/places-menu/extension.js:79
+#: extensions/places-menu/extension.js:82
 msgid "Places"
 msgstr "Plekke"
 
-#: ../extensions/places-menu/placeDisplay.js:56
-#, c-format
-msgid "Failed to launch \"%s\""
+#: extensions/places-menu/placeDisplay.js:66
+#, javascript-format
+msgid "Failed to mount volume for “%s”"
+msgstr "Kon nie die \"%s\" volume heg nie"
+
+#: extensions/places-menu/placeDisplay.js:79
+#, javascript-format
+msgid "Failed to launch “%s”"
 msgstr "Kon nie \"%s\" lanseer nie"
 
-#: ../extensions/places-menu/placeDisplay.js:98
-#: ../extensions/places-menu/placeDisplay.js:121
+#: extensions/places-menu/placeDisplay.js:135
+#: extensions/places-menu/placeDisplay.js:158
 msgid "Computer"
 msgstr "Rekenaar"
 
-#: ../extensions/places-menu/placeDisplay.js:199
+#: extensions/places-menu/placeDisplay.js:336
 msgid "Home"
 msgstr "Tuis"
 
-#: ../extensions/places-menu/placeDisplay.js:286
+#: extensions/places-menu/placeDisplay.js:378
 msgid "Browse Network"
 msgstr "Blaai deur netwerk"
 
-#: ../extensions/systemMonitor/extension.js:214
-msgid "CPU"
-msgstr "SVE"
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
+msgid "Cycle Screenshot Sizes"
+msgstr "Rol deur skermkiekies"
 
-#: ../extensions/systemMonitor/extension.js:267
-msgid "Memory"
-msgstr "Geheue"
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
+msgid "Cycle Screenshot Sizes Backward"
+msgstr "Rol agteruit deur skermkiekies"
 
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:1
+#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
 msgstr "Temanaam"
 
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:2
+#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:6
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr ""
+"Die naam van die tema wat van ~/.themes/name/gnome-shell gelaai moet word"
 
-#: ../extensions/window-list/extension.js:92
+#: extensions/window-list/extension.js:106
 msgid "Close"
 msgstr "Sluit"
 
-#: ../extensions/window-list/extension.js:102
+#: extensions/window-list/extension.js:125
 msgid "Unminimize"
-msgstr ""
+msgstr "Onminimeer"
 
-#: ../extensions/window-list/extension.js:103
+#: extensions/window-list/extension.js:126
 msgid "Minimize"
 msgstr "Minimeer"
 
-#: ../extensions/window-list/extension.js:109
+#: extensions/window-list/extension.js:132
 msgid "Unmaximize"
-msgstr ""
+msgstr "Onmaksimeer"
 
-#: ../extensions/window-list/extension.js:110
+#: extensions/window-list/extension.js:133
 msgid "Maximize"
 msgstr "Maksimeer"
 
-#: ../extensions/window-list/extension.js:270
+#: extensions/window-list/extension.js:408
 msgid "Minimize all"
 msgstr "Minimeer almal"
 
-#: ../extensions/window-list/extension.js:278
+#: extensions/window-list/extension.js:414
 msgid "Unminimize all"
-msgstr ""
+msgstr "Onminimeer almal"
 
-#: ../extensions/window-list/extension.js:286
+#: extensions/window-list/extension.js:420
 msgid "Maximize all"
 msgstr "Maksimeer almal"
 
-#: ../extensions/window-list/extension.js:295
+#: extensions/window-list/extension.js:429
 msgid "Unmaximize all"
-msgstr ""
+msgstr "Ommaksimeer almal"
 
-#: ../extensions/window-list/extension.js:304
+#: extensions/window-list/extension.js:438
 msgid "Close all"
 msgstr "Sluit almal"
 
-#: ../extensions/window-list/extension.js:591
-#: ../extensions/workspace-indicator/extension.js:30
+#: extensions/window-list/extension.js:646
+#: extensions/workspace-indicator/extension.js:26
 msgid "Workspace Indicator"
-msgstr ""
+msgstr "Werkspasie aanwyser"
 
-#: ../extensions/window-list/extension.js:743
+#: extensions/window-list/extension.js:811
 msgid "Window List"
 msgstr "Vensterlys"
 
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:1
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:12
 msgid "When to group windows"
 msgstr "Wanneer om vensters te groepeer"
 
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:2
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
 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”, “auto” and “always”."
 msgstr ""
 "Besluit wanneer om vensters van dieselfde toepassing in die vensterlys te "
-"groepeer. Moontlike waardes is \"never\", \"auto\" en \"always\"."
+"groepeer. Moontlike waardes is \"nooit\", \"outomaties\" en \"altyd\"."
 
-#: ../extensions/window-list/prefs.js:30
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
+msgid "Show the window list on all monitors"
+msgstr "Wys vensterlys op alle skerms"
+
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
+msgid ""
+"Whether to show the window list on all connected monitors or only on the "
+"primary one."
+msgstr ""
+"Of die vensterlys op alle gekonnekteerde monitors vertoon moet word of slegs "
+"die primêre een."
+
+#: extensions/window-list/prefs.js:28
 msgid "Window Grouping"
 msgstr "Venstergroepering"
 
-#: ../extensions/window-list/prefs.js:49
+#: extensions/window-list/prefs.js:46
 msgid "Never group windows"
 msgstr "Moet nooit vensters groepeer nie"
 
-#: ../extensions/window-list/prefs.js:50
+#: extensions/window-list/prefs.js:47
 msgid "Group windows when space is limited"
 msgstr "Groepeer vensters wanneer ruimte beperk is"
 
-#: ../extensions/window-list/prefs.js:51
+#: extensions/window-list/prefs.js:48
 msgid "Always group windows"
 msgstr "Groepeer vensters altyd"
 
-#: ../extensions/workspace-indicator/prefs.js:141
-msgid "Workspace names:"
-msgstr "Werkruimtename:"
+#: extensions/window-list/prefs.js:71
+msgid "Show on all monitors"
+msgstr "Wys op alle skerms"
 
-#: ../extensions/workspace-indicator/prefs.js:152
+#: extensions/workspace-indicator/prefs.js:134
+msgid "Workspace Names"
+msgstr "Werkspasiename"
+
+#: extensions/workspace-indicator/prefs.js:150
 msgid "Name"
 msgstr "Naam"
 
-#: ../extensions/workspace-indicator/prefs.js:186
-#, c-format
+#: extensions/workspace-indicator/prefs.js:190
+#, javascript-format
 msgid "Workspace %d"
-msgstr "Werkruimte %d"
+msgstr "Werkspasie %d"
+
+#~ msgid "GNOME Shell Classic"
+#~ msgstr "GNOME Shell Klassiek"
+
+#~ msgid "Window management and application launching"
+#~ msgstr "Vensterbestuur en toepassinglansering"
+
+#~ msgid "CPU"
+#~ msgstr "SVE"
+
+#~ msgid "Memory"
+#~ msgstr "Geheue"

po/en_GB.po

@@ -1,24 +1,24 @@
 # British English translation of gnome-shell-extensions.
 # Copyright (C) 2011 gnome-shell-extensions'S COPYRIGHT HOLDER.
 # This file is distributed under the same license as the gnome-shell-extensions package.
-# Bruce Cowan <bruce@bcowan.me.uk>, 2011.
+# Bruce Cowan <bruce@bcowan.eu>, 2011, 2018.
 # 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: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2016-08-19 21:17+0000\n"
-"PO-Revision-Date: 2016-09-18 12:40+0200\n"
-"Last-Translator: David King <amigadave@amigadave.com>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
+"issues\n"
+"POT-Creation-Date: 2018-02-20 23:07+0000\n"
+"PO-Revision-Date: 2018-03-10 18:03+0000\n"
+"Last-Translator: Bruce Cowan <bruce@bcowan.eu>\n"
 "Language-Team: Sugar Labs\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.7.1\n"
+"X-Generator: Poedit 2.0.6\n"
 "X-Project-Style: gnome\n"
 
 #: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
@@ -66,35 +66,35 @@ msgstr "Workspaces only on primary monitor"
 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
+#: extensions/alternate-tab/prefs.js:19
 msgid "Thumbnail only"
 msgstr "Thumbnail only"
 
-#: extensions/alternate-tab/prefs.js:21
+#: extensions/alternate-tab/prefs.js:20
 msgid "Application icon only"
 msgstr "Application icon only"
 
-#: extensions/alternate-tab/prefs.js:22
+#: extensions/alternate-tab/prefs.js:21
 msgid "Thumbnail and application icon"
 msgstr "Thumbnail and application icon"
 
-#: extensions/alternate-tab/prefs.js:38
+#: extensions/alternate-tab/prefs.js:34
 msgid "Present windows as"
 msgstr "Present windows as"
 
-#: extensions/alternate-tab/prefs.js:69
+#: extensions/alternate-tab/prefs.js:65
 msgid "Show only windows in the current workspace"
 msgstr "Show only windows in the current workspace"
 
-#: extensions/apps-menu/extension.js:38
+#: extensions/apps-menu/extension.js:37
 msgid "Activities Overview"
 msgstr "Activities Overview"
 
-#: extensions/apps-menu/extension.js:109
+#: extensions/apps-menu/extension.js:130
 msgid "Favorites"
 msgstr "Favourites"
 
-#: extensions/apps-menu/extension.js:266
+#: extensions/apps-menu/extension.js:417
 msgid "Applications"
 msgstr "Applications"
 
@@ -110,39 +110,43 @@ msgstr ""
 "A list of strings, each containing an application id (desktop file name), "
 "followed by a colon and the workspace number"
 
-#: extensions/auto-move-windows/prefs.js:60
+#: extensions/auto-move-windows/prefs.js:53
 msgid "Application"
 msgstr "Application"
 
-#: extensions/auto-move-windows/prefs.js:69
-#: extensions/auto-move-windows/prefs.js:127
+#: extensions/auto-move-windows/prefs.js:62
+#: extensions/auto-move-windows/prefs.js:117
 msgid "Workspace"
 msgstr "Workspace"
 
-#: extensions/auto-move-windows/prefs.js:85
+#: extensions/auto-move-windows/prefs.js:78
 msgid "Add Rule"
 msgstr "Add Rule"
 
-#: extensions/auto-move-windows/prefs.js:106
+#: extensions/auto-move-windows/prefs.js:98
 msgid "Create new matching rule"
 msgstr "Create new matching rule"
 
-#: extensions/auto-move-windows/prefs.js:111
+#: extensions/auto-move-windows/prefs.js:103
 msgid "Add"
 msgstr "Add"
 
-#: extensions/drive-menu/extension.js:106
+#. TRANSLATORS: %s is the filesystem name
+#: extensions/drive-menu/extension.js:103
+#: extensions/places-menu/placeDisplay.js:219
 #, javascript-format
-msgid "Ejecting drive '%s' failed:"
-msgstr "Ejecting drive '%s' failed:"
+#| msgid "Ejecting drive '%s' failed:"
+msgid "Ejecting drive “%s” failed:"
+msgstr "Ejecting drive “%s” failed:"
 
-#: extensions/drive-menu/extension.js:124
+#: extensions/drive-menu/extension.js:118
 msgid "Removable devices"
 msgstr "Removable devices"
 
-#: extensions/drive-menu/extension.js:149
-msgid "Open File"
-msgstr "Open File"
+#: extensions/drive-menu/extension.js:143
+#| msgid "Open File"
+msgid "Open Files"
+msgstr "Open Files"
 
 #: extensions/example/extension.js:17
 msgid "Hello, world!"
@@ -160,21 +164,25 @@ msgstr ""
 "If not empty, it contains the text that will be shown when clicking on the "
 "panel."
 
-#: extensions/example/prefs.js:30
+#: extensions/example/prefs.js:27
 msgid "Message"
 msgstr "Message"
 
 #. TRANSLATORS: Example is the name of the extension, should not be
 #. translated
-#: extensions/example/prefs.js:43
+#: extensions/example/prefs.js:40
+#| 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."
 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."
+"Nevertheless it’s possible to customize the greeting message."
 msgstr ""
 "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."
+"Nevertheless it’s possible to customise the greeting message."
 
 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
 msgid "Use more screen for windows"
@@ -204,26 +212,32 @@ 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:81
+#: extensions/places-menu/extension.js:79
+#: extensions/places-menu/extension.js:82
 msgid "Places"
 msgstr "Places"
 
-#: extensions/places-menu/placeDisplay.js:59
+#: extensions/places-menu/placeDisplay.js:66
 #, javascript-format
-msgid "Failed to launch \"%s\""
-msgstr "Failed to launch \"%s\""
+msgid "Failed to mount volume for “%s”"
+msgstr "Failed to mount volume for “%s”"
 
-#: extensions/places-menu/placeDisplay.js:101
-#: extensions/places-menu/placeDisplay.js:124
+#: extensions/places-menu/placeDisplay.js:79
+#, javascript-format
+#| msgid "Failed to launch \"%s\""
+msgid "Failed to launch “%s”"
+msgstr "Failed to launch “%s”"
+
+#: extensions/places-menu/placeDisplay.js:135
+#: extensions/places-menu/placeDisplay.js:158
 msgid "Computer"
 msgstr "Computer"
 
-#: extensions/places-menu/placeDisplay.js:267
+#: extensions/places-menu/placeDisplay.js:336
 msgid "Home"
 msgstr "Home"
 
-#: extensions/places-menu/placeDisplay.js:311
+#: extensions/places-menu/placeDisplay.js:378
 msgid "Browse Network"
 msgstr "Browse Network"
 
@@ -231,6 +245,11 @@ msgstr "Browse Network"
 msgid "Cycle Screenshot Sizes"
 msgstr "Cycle Screenshot Sizes"
 
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
+#| msgid "Cycle Screenshot Sizes"
+msgid "Cycle Screenshot Sizes Backward"
+msgstr "Cycle Screenshot Sizes Backward"
+
 #: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
 msgstr "Theme name"
@@ -239,52 +258,52 @@ 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
+#: extensions/window-list/extension.js:106
 msgid "Close"
 msgstr "Close"
 
-#: extensions/window-list/extension.js:120
+#: extensions/window-list/extension.js:125
 msgid "Unminimize"
 msgstr "Unminimise"
 
-#: extensions/window-list/extension.js:121
+#: extensions/window-list/extension.js:126
 msgid "Minimize"
 msgstr "Minimise"
 
-#: extensions/window-list/extension.js:127
+#: extensions/window-list/extension.js:132
 msgid "Unmaximize"
 msgstr "Unmaximise"
 
-#: extensions/window-list/extension.js:128
+#: extensions/window-list/extension.js:133
 msgid "Maximize"
 msgstr "Maximise"
 
-#: extensions/window-list/extension.js:403
+#: extensions/window-list/extension.js:408
 msgid "Minimize all"
 msgstr "Minimise all"
 
-#: extensions/window-list/extension.js:411
+#: extensions/window-list/extension.js:414
 msgid "Unminimize all"
 msgstr "Unminimise all"
 
-#: extensions/window-list/extension.js:419
+#: extensions/window-list/extension.js:420
 msgid "Maximize all"
 msgstr "Maximise all"
 
-#: extensions/window-list/extension.js:428
+#: extensions/window-list/extension.js:429
 msgid "Unmaximize all"
 msgstr "Unmaximise all"
 
-#: extensions/window-list/extension.js:437
+#: extensions/window-list/extension.js:438
 msgid "Close all"
 msgstr "Close all"
 
-#: extensions/window-list/extension.js:661
-#: extensions/workspace-indicator/extension.js:30
+#: extensions/window-list/extension.js:646
+#: extensions/workspace-indicator/extension.js:26
 msgid "Workspace Indicator"
 msgstr "Workspace Indicator"
 
-#: extensions/window-list/extension.js:820
+#: extensions/window-list/extension.js:811
 msgid "Window List"
 msgstr "Window List"
 
@@ -293,12 +312,15 @@ msgid "When to group windows"
 msgstr "When to group windows"
 
 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
+#| msgid ""
+#| "Decides when to group windows from the same application on the window "
+#| "list. Possible values are \"never\", \"auto\" 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”, “auto” and “always”."
 msgstr ""
 "Decides when to group windows from the same application on the window list. "
-"Possible values are \"never\", \"auto\" and \"always\"."
+"Possible values are “never”, “auto” and “always”."
 
 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
 msgid "Show the window list on all monitors"
@@ -312,35 +334,35 @@ msgstr ""
 "Whether to show the window list on all connected monitors or only on the "
 "primary one."
 
-#: extensions/window-list/prefs.js:32
+#: extensions/window-list/prefs.js:28
 msgid "Window Grouping"
 msgstr "Window Grouping"
 
-#: extensions/window-list/prefs.js:50
+#: extensions/window-list/prefs.js:46
 msgid "Never group windows"
 msgstr "Never group windows"
 
-#: extensions/window-list/prefs.js:51
+#: extensions/window-list/prefs.js:47
 msgid "Group windows when space is limited"
 msgstr "Group windows when space is limited"
 
-#: extensions/window-list/prefs.js:52
+#: extensions/window-list/prefs.js:48
 msgid "Always group windows"
 msgstr "Always group windows"
 
-#: extensions/window-list/prefs.js:75
+#: extensions/window-list/prefs.js:71
 msgid "Show on all monitors"
 msgstr "Show on all monitors"
 
-#: extensions/workspace-indicator/prefs.js:141
+#: extensions/workspace-indicator/prefs.js:134
 msgid "Workspace Names"
 msgstr "Workspace Names"
 
-#: extensions/workspace-indicator/prefs.js:157
+#: extensions/workspace-indicator/prefs.js:150
 msgid "Name"
 msgstr "Name"
 
-#: extensions/workspace-indicator/prefs.js:198
+#: extensions/workspace-indicator/prefs.js:190
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Workspace %d"

po/fr.po

@@ -3,21 +3,23 @@
 # This file is distributed under the same license as the gnome-shell-extensions package.
 # Claude Paroz <claude@2xlibre.net>, 2011.
 # Alain Lojewski <allomervan@gmail.com>, 2012-2013.
+# Charles Monzat <charles.monzat@numericable.fr>, 2018.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2017-08-11 01:33+0000\n"
-"PO-Revision-Date: 2017-08-19 18:40+0200\n"
-"Last-Translator: Alain Lojewski <allomervan@gmail.com>\n"
-"Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
+"issues\n"
+"POT-Creation-Date: 2018-11-13 00:23+0000\n"
+"PO-Revision-Date: 2018-11-14 17:56+0100\n"
+"Last-Translator: Charles Monzat <charles.monzat@numericable.fr>\n"
+"Language-Team: français <gnomefr@traduc.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Gtranslator 3.30.0\n"
 
 #: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
 msgid "GNOME Classic"
@@ -25,79 +27,37 @@ msgstr "GNOME Classique"
 
 #: data/gnome-classic.desktop.in:4
 msgid "This session logs you into GNOME Classic"
-msgstr "Cette session vous connnecte à GNOME Classique"
+msgstr "Cette session vous connecte à GNOME Classique"
 
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:7
-msgid "Attach modal dialog to the parent window"
-msgstr "Attacher les boîtes de dialogue modales à leur fenêtre parente"
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:8
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:25
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:33
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:41
-msgid ""
-"This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgstr ""
-"Cette clé remplace la clé dans org.gnome.mutter lorsque GNOME Shell est en "
-"cours d’exécution."
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
-msgid "Arrangement of buttons on the titlebar"
-msgstr "Ordre des boutons dans la barre de titre"
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:17
-msgid ""
-"This key overrides the key in org.gnome.desktop.wm.preferences when running "
-"GNOME Shell."
-msgstr ""
-"Cette clé remplace la clé dans org.gnome.desktop.wm.preferences lorsque "
-"GNOME Shell est en cours d’exécution."
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:24
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr ""
-"Activer la disposition verticale lorsque les fenêtres sont déposées aux "
-"bords de l’écran"
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:32
-msgid "Workspaces only on primary monitor"
-msgstr "Espaces de travail uniquement sur l’écran principal"
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:40
-msgid "Delay focus changes in mouse mode until the pointer stops moving"
-msgstr ""
-"Retarder les changements de focus en mode souris jusqu’à ce que le pointeur "
-"arrête de bouger"
-
-#: extensions/alternate-tab/prefs.js:20
+#: extensions/alternate-tab/prefs.js:19
 msgid "Thumbnail only"
 msgstr "Vignette seulement"
 
-#: extensions/alternate-tab/prefs.js:21
+#: extensions/alternate-tab/prefs.js:20
 msgid "Application icon only"
 msgstr "Icône d’application seulement"
 
-#: extensions/alternate-tab/prefs.js:22
+#: extensions/alternate-tab/prefs.js:21
 msgid "Thumbnail and application icon"
 msgstr "Vignette et icône d’application"
 
-#: extensions/alternate-tab/prefs.js:38
+#: extensions/alternate-tab/prefs.js:34
 msgid "Present windows as"
 msgstr "Présenter la fenêtre comme"
 
-#: extensions/alternate-tab/prefs.js:69
+#: extensions/alternate-tab/prefs.js:65
 msgid "Show only windows in the current workspace"
 msgstr "N’afficher les fenêtres que sur l’espace de travail actuel"
 
-#: extensions/apps-menu/extension.js:41
+#: extensions/apps-menu/extension.js:37
 msgid "Activities Overview"
 msgstr "Vue d’ensemble des activités"
 
-#: extensions/apps-menu/extension.js:141
+#: extensions/apps-menu/extension.js:130
 msgid "Favorites"
 msgstr "Favoris"
 
-#: extensions/apps-menu/extension.js:436
+#: extensions/apps-menu/extension.js:417
 msgid "Applications"
 msgstr "Applications"
 
@@ -110,42 +70,43 @@ msgid ""
 "A list of strings, each containing an application id (desktop file name), "
 "followed by a colon and the workspace number"
 msgstr ""
-"Une liste de chaînes de caratères, contenant chacune un identifiant "
+"Une liste de chaînes de caractères, contenant chacune un identifiant "
 "d’application (nom de fichier desktop), suivi par un deux-points et le "
 "numéro de l’espace de travail"
 
-#: extensions/auto-move-windows/prefs.js:60
+#: extensions/auto-move-windows/prefs.js:53
 msgid "Application"
 msgstr "Application"
 
-#: extensions/auto-move-windows/prefs.js:69
-#: extensions/auto-move-windows/prefs.js:127
+#: extensions/auto-move-windows/prefs.js:62
+#: extensions/auto-move-windows/prefs.js:117
 msgid "Workspace"
 msgstr "Espace de travail"
 
-#: extensions/auto-move-windows/prefs.js:85
+#: extensions/auto-move-windows/prefs.js:78
 msgid "Add Rule"
 msgstr "Ajouter une règle"
 
-#: extensions/auto-move-windows/prefs.js:106
+#: extensions/auto-move-windows/prefs.js:98
 msgid "Create new matching rule"
 msgstr "Créer une nouvelle règle de concordance"
 
-#: extensions/auto-move-windows/prefs.js:111
+#: extensions/auto-move-windows/prefs.js:103
 msgid "Add"
 msgstr "Ajouter"
 
 #. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:107
+#: extensions/drive-menu/extension.js:103
+#: extensions/places-menu/placeDisplay.js:225
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "L’éjection du disque « %s » a échoué :"
 
-#: extensions/drive-menu/extension.js:125
+#: extensions/drive-menu/extension.js:118
 msgid "Removable devices"
 msgstr "Périphériques amovibles"
 
-#: extensions/drive-menu/extension.js:150
+#: extensions/drive-menu/extension.js:143
 msgid "Open Files"
 msgstr "Ouvrir Fichiers"
 
@@ -165,13 +126,13 @@ msgstr ""
 "S’il n’est pas vide, il contient le texte qui s’affiche lorsque vous cliquez "
 "sur le tableau de bord."
 
-#: extensions/example/prefs.js:30
+#: extensions/example/prefs.js:27
 msgid "Message"
 msgstr "Message"
 
 #. TRANSLATORS: Example is the name of the extension, should not be
 #. translated
-#: extensions/example/prefs.js:43
+#: extensions/example/prefs.js:40
 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"
@@ -211,31 +172,31 @@ msgstr ""
 "dessous. Pour que ce paramètre soit pris en compte, il faut redémarrer le "
 "Shell."
 
-#: extensions/places-menu/extension.js:78
-#: extensions/places-menu/extension.js:81
+#: extensions/places-menu/extension.js:79
+#: extensions/places-menu/extension.js:82
 msgid "Places"
 msgstr "Emplacements"
 
-#: extensions/places-menu/placeDisplay.js:65
+#: extensions/places-menu/placeDisplay.js:67
 #, javascript-format
 msgid "Failed to mount volume for “%s”"
 msgstr "Impossible de monter le volume « %s »"
 
-#: extensions/places-menu/placeDisplay.js:78
+#: extensions/places-menu/placeDisplay.js:80
 #, javascript-format
 msgid "Failed to launch “%s”"
 msgstr "Impossible de lancer « %s »"
 
-#: extensions/places-menu/placeDisplay.js:137
-#: extensions/places-menu/placeDisplay.js:160
+#: extensions/places-menu/placeDisplay.js:141
+#: extensions/places-menu/placeDisplay.js:164
 msgid "Computer"
 msgstr "Ordinateur"
 
-#: extensions/places-menu/placeDisplay.js:303
+#: extensions/places-menu/placeDisplay.js:342
 msgid "Home"
 msgstr "Dossier personnel"
 
-#: extensions/places-menu/placeDisplay.js:347
+#: extensions/places-menu/placeDisplay.js:386
 msgid "Browse Network"
 msgstr "Parcourir le réseau"
 
@@ -245,7 +206,7 @@ msgstr "Passer à la taille de capture suivante"
 
 #: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
 msgid "Cycle Screenshot Sizes Backward"
-msgstr "Passer à la taille de capture précédante"
+msgstr "Passer à la taille de capture précédente"
 
 #: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
@@ -255,52 +216,52 @@ msgstr "Nom du thème"
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "Le nom du thème, à charger à partir de ~/.themes/name/gnome-shell"
 
-#: extensions/window-list/extension.js:110
+#: extensions/window-list/extension.js:106
 msgid "Close"
 msgstr "Fermer"
 
-#: extensions/window-list/extension.js:129
+#: extensions/window-list/extension.js:125
 msgid "Unminimize"
 msgstr "Restaurer"
 
-#: extensions/window-list/extension.js:130
+#: extensions/window-list/extension.js:126
 msgid "Minimize"
 msgstr "Réduire"
 
-#: extensions/window-list/extension.js:136
+#: extensions/window-list/extension.js:132
 msgid "Unmaximize"
 msgstr "Restaurer"
 
-#: extensions/window-list/extension.js:137
+#: extensions/window-list/extension.js:133
 msgid "Maximize"
 msgstr "Maximiser"
 
-#: extensions/window-list/extension.js:420
+#: extensions/window-list/extension.js:408
 msgid "Minimize all"
-msgstr "Réduire tout"
+msgstr "Tout réduire"
 
-#: extensions/window-list/extension.js:428
+#: extensions/window-list/extension.js:414
 msgid "Unminimize all"
-msgstr "Restaurer tout"
+msgstr "Tout restaurer"
 
-#: extensions/window-list/extension.js:436
+#: extensions/window-list/extension.js:420
 msgid "Maximize all"
-msgstr "Maximiser tout"
+msgstr "Tout maximiser"
 
-#: extensions/window-list/extension.js:445
+#: extensions/window-list/extension.js:429
 msgid "Unmaximize all"
-msgstr "Restaurer tout"
+msgstr "Tout restaurer"
 
-#: extensions/window-list/extension.js:454
+#: extensions/window-list/extension.js:438
 msgid "Close all"
-msgstr "Fermer tout"
+msgstr "Tout fermer"
 
-#: extensions/window-list/extension.js:678
-#: extensions/workspace-indicator/extension.js:30
+#: extensions/window-list/extension.js:646
+#: extensions/workspace-indicator/extension.js:26
 msgid "Workspace Indicator"
 msgstr "Indicateur d’espace de travail"
 
-#: extensions/window-list/extension.js:842
+#: extensions/window-list/extension.js:816
 msgid "Window List"
 msgstr "Liste de fenêtres"
 
@@ -329,39 +290,71 @@ msgstr ""
 "Indique s’il faut afficher la liste des fenêtres sur tous les écrans "
 "connectés ou seulement l’écran principal."
 
-#: extensions/window-list/prefs.js:32
+#: extensions/window-list/prefs.js:28
 msgid "Window Grouping"
 msgstr "Regroupement de fenêtres"
 
-#: extensions/window-list/prefs.js:50
+#: extensions/window-list/prefs.js:46
 msgid "Never group windows"
 msgstr "Ne jamais regrouper les fenêtres"
 
-#: extensions/window-list/prefs.js:51
+#: extensions/window-list/prefs.js:47
 msgid "Group windows when space is limited"
 msgstr "Regrouper les fenêtres quand l’espace est limité"
 
-#: extensions/window-list/prefs.js:52
+#: extensions/window-list/prefs.js:48
 msgid "Always group windows"
 msgstr "Toujours regrouper les fenêtres"
 
-#: extensions/window-list/prefs.js:75
+#: extensions/window-list/prefs.js:71
 msgid "Show on all monitors"
 msgstr "Afficher sur tous les écrans"
 
-#: extensions/workspace-indicator/prefs.js:141
+#: extensions/workspace-indicator/prefs.js:134
 msgid "Workspace Names"
 msgstr "Noms des espaces de travail"
 
-#: extensions/workspace-indicator/prefs.js:157
+#: extensions/workspace-indicator/prefs.js:150
 msgid "Name"
 msgstr "Nom"
 
-#: extensions/workspace-indicator/prefs.js:198
+#: extensions/workspace-indicator/prefs.js:190
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Espace de travail %d"
 
+#~ msgid "Attach modal dialog to the parent window"
+#~ msgstr "Attacher les boîtes de dialogue modales à leur fenêtre parente"
+
+#~ msgid ""
+#~ "This key overrides the key in org.gnome.mutter when running GNOME Shell."
+#~ msgstr ""
+#~ "Cette clé remplace la clé dans org.gnome.mutter lorsque GNOME Shell est "
+#~ "en cours d’exécution."
+
+#~ msgid "Arrangement of buttons on the titlebar"
+#~ msgstr "Ordre des boutons dans la barre de titre"
+
+#~ msgid ""
+#~ "This key overrides the key in org.gnome.desktop.wm.preferences when "
+#~ "running GNOME Shell."
+#~ msgstr ""
+#~ "Cette clé remplace la clé dans org.gnome.desktop.wm.preferences lorsque "
+#~ "GNOME Shell est en cours d’exécution."
+
+#~ msgid "Enable edge tiling when dropping windows on screen edges"
+#~ msgstr ""
+#~ "Activer la disposition verticale lorsque les fenêtres sont déposées aux "
+#~ "bords de l’écran"
+
+#~ msgid "Workspaces only on primary monitor"
+#~ msgstr "Espaces de travail uniquement sur l’écran principal"
+
+#~ msgid "Delay focus changes in mouse mode until the pointer stops moving"
+#~ msgstr ""
+#~ "Retarder les changements de focus en mode souris jusqu’à ce que le "
+#~ "pointeur arrête de bouger"
+
 #~ msgid "CPU"
 #~ msgstr "CPU"
 

po/ja.po

@@ -10,8 +10,9 @@
 msgid ""
 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: 2015-03-24 13:21+0000\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
+"issues\n"
+"POT-Creation-Date: 2018-11-13 00:26+0000\n"
 "PO-Revision-Date: 2015-03-24 23:41+0900\n"
 "Last-Translator: Hajime Taira <htaira@redhat.com>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
@@ -21,290 +22,322 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/gnome-classic.desktop.in.h:1
-#: ../data/gnome-classic.session.desktop.in.in.h:1
+#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
 msgid "GNOME Classic"
 msgstr "GNOME クラシック"
 
-#: ../data/gnome-classic.desktop.in.h:2
+#: data/gnome-classic.desktop.in:4
 msgid "This session logs you into GNOME Classic"
 msgstr "GNOME クラシックモードでログインします"
 
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:1
-msgid "Attach modal dialog to the parent window"
-msgstr "モーダルダイアログを親ウィンドウに結び付ける"
-
-#: ../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 "GNOME Shell 使用時は、このキーが、org.gnome.mutter の同じキーよりも優先します。"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:3
-msgid "Arrangement of buttons on the titlebar"
-msgstr "タイトルバー上のボタンの配置"
-
-#: ../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 "GNOME Shell 使用時は、このキーが、org.gnome.desktop.wm.preferences の同じキーよりも優先します。"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:5
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr "ウィンドウを画面の端に移動させたときにタイル状に配置する"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:6
-msgid "Workspaces only on primary monitor"
-msgstr "プライマリモニターのみワークスペースを切り替える"
-
-#: ../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 "ポインターの動作が止まるまでマウスモードでのフォーカスの変更を遅らせる"
-
-#: ../extensions/alternate-tab/prefs.js:20
-msgid "Thumbnail only"
-msgstr "サムネイルのみ"
-
-#: ../extensions/alternate-tab/prefs.js:21
-msgid "Application icon only"
-msgstr "アプリケーションアイコンのみ"
-
-#: ../extensions/alternate-tab/prefs.js:22
-msgid "Thumbnail and application icon"
-msgstr "サムネイルとアプリケーションアイコン"
-
-#: ../extensions/alternate-tab/prefs.js:38
-msgid "Present windows as"
-msgstr "ウィンドウの表示方法"
-
-#: ../extensions/alternate-tab/prefs.js:69
-msgid "Show only windows in the current workspace"
-msgstr "現在のワークスペースのウィンドウのみ表示する"
-
-#: ../extensions/apps-menu/extension.js:39
+#: extensions/apps-menu/extension.js:38
 msgid "Activities Overview"
 msgstr "アクティビティ"
 
-#: ../extensions/apps-menu/extension.js:110
+#: extensions/apps-menu/extension.js:131
 msgid "Favorites"
 msgstr "お気に入り"
 
-#: ../extensions/apps-menu/extension.js:279
+#: extensions/apps-menu/extension.js:419
 msgid "Applications"
 msgstr "アプリケーション"
 
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:1
+#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
 msgid "Application and workspace list"
 msgstr "アプリケーションとワークスペースのリスト"
 
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
-msgid "A list of strings, each containing an application id (desktop file name), followed by a colon and the workspace number"
-msgstr "アプリケーションの識別子 (.desktop ファイル名) とコロンの後にワークスペース番号を付与した文字列を要素とするリストです"
+#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:7
+msgid ""
+"A list of strings, each containing an application id (desktop file name), "
+"followed by a colon and the workspace number"
+msgstr ""
+"アプリケーションの識別子 (.desktop ファイル名) とコロンの後にワークスペース番"
+"号を付与した文字列を要素とするリストです"
 
-#: ../extensions/auto-move-windows/prefs.js:60
+#: extensions/auto-move-windows/prefs.js:53
 msgid "Application"
 msgstr "アプリケーション"
 
-#: ../extensions/auto-move-windows/prefs.js:69
-#: ../extensions/auto-move-windows/prefs.js:127
+#: extensions/auto-move-windows/prefs.js:62
+#: extensions/auto-move-windows/prefs.js:117
 msgid "Workspace"
 msgstr "ワークスペース"
 
-#: ../extensions/auto-move-windows/prefs.js:85
+#: extensions/auto-move-windows/prefs.js:78
 msgid "Add Rule"
 msgstr "ルールを追加"
 
-#: ../extensions/auto-move-windows/prefs.js:106
+#: extensions/auto-move-windows/prefs.js:98
 msgid "Create new matching rule"
 msgstr "新規ルールの作成"
 
-#: ../extensions/auto-move-windows/prefs.js:111
+#: extensions/auto-move-windows/prefs.js:103
 msgid "Add"
 msgstr "追加"
 
-#: ../extensions/drive-menu/extension.js:106
+#. TRANSLATORS: %s is the filesystem name
+#: extensions/drive-menu/extension.js:104
+#: extensions/places-menu/placeDisplay.js:225
 #, javascript-format
-msgid "Ejecting drive '%s' failed:"
-msgstr "ドライブ '%s' の取り出しに失敗しました:"
+msgid "Ejecting drive “%s” failed:"
+msgstr "ドライブ“%s”の取り出しに失敗しました:"
 
-#: ../extensions/drive-menu/extension.js:124
+#: extensions/drive-menu/extension.js:120
 msgid "Removable devices"
 msgstr "リムーバブルデバイス"
 
-#: ../extensions/drive-menu/extension.js:149
-msgid "Open File"
+#: extensions/drive-menu/extension.js:145
+msgid "Open Files"
 msgstr "ファイルを開く"
 
-#: ../extensions/example/extension.js:17
-msgid "Hello, world!"
-msgstr "Hello, world!"
-
-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:1
-msgid "Alternative greeting text."
-msgstr "代わりの挨拶テキストです。"
-
-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:2
-msgid "If not empty, it contains the text that will be shown when clicking on the panel."
-msgstr "空でない場合、指定したテキストが、パネルをクリックした時に表示されます。"
-
-#: ../extensions/example/prefs.js:30
-msgid "Message"
-msgstr "メッセージ"
-
-#: ../extensions/example/prefs.js:43
-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 ""
-"Example は、うまく動作する GNOME Shell 拡張機能の構築方法を示すことを目的としています。それ自体の機能はほんとどありません。\n"
-"それでも、挨拶メッセージをカスタマイズすることはできます。"
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:1
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
 msgid "Use more screen for windows"
 msgstr "ウィンドウにたくさんの画面を使うかどうか"
 
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:2
-msgid "Try to use more screen for placing window thumbnails by adapting to screen aspect ratio, and consolidating them further to reduce the bounding box. This setting applies only with the natural placement strategy."
-msgstr "ウィンドウのサムネイルを複数配置する際に、画面のアスペクト比に合わせて、境界部分を減らすことにより、ウィンドウを統合することで、さらにたくさんの画面を使用できるようにするかどうかです。この設定は 'natural' の配置アルゴリズムを採用している場合にのみ適用されます。"
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
+msgid ""
+"Try to use more screen for placing window thumbnails by adapting to screen "
+"aspect ratio, and consolidating them further to reduce the bounding box. "
+"This setting applies only with the natural placement strategy."
+msgstr ""
+"ウィンドウのサムネイルを複数配置する際に、画面のアスペクト比に合わせて、境界"
+"部分を減らすことにより、ウィンドウを統合することで、さらにたくさんの画面を使"
+"用できるようにするかどうかです。この設定は 'natural' の配置アルゴリズムを採用"
+"している場合にのみ適用されます。"
 
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:3
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
 msgid "Place window captions on top"
 msgstr "ウィンドウのタイトルバーを上端に表示するかどうか"
 
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:4
-msgid "If true, place window captions on top the respective thumbnail, overriding shell default of placing it at the bottom. Changing this setting requires restarting the shell to have any effect."
-msgstr "TRUE にすると、ウィンドウのサムネイルの上端にそのウィンドウのタイトルバーを表示します (これは、サムネイルの下端にタイトルバーを表示する GNOME シェルのデフォルト値よりも優先されます)。この設定を適用する際は GNOME シェルを再起動してください。"
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:12
+msgid ""
+"If true, place window captions on top the respective thumbnail, overriding "
+"shell default of placing it at the bottom. Changing this setting requires "
+"restarting the shell to have any effect."
+msgstr ""
+"TRUE にすると、ウィンドウのサムネイルの上端にそのウィンドウのタイトルバーを表"
+"示します (これは、サムネイルの下端にタイトルバーを表示する GNOME シェルのデ"
+"フォルト値よりも優先されます)。この設定を適用する際は GNOME シェルを再起動し"
+"てください。"
 
-#: ../extensions/places-menu/extension.js:78
-#: ../extensions/places-menu/extension.js:81
+#: extensions/places-menu/extension.js:81
+#: extensions/places-menu/extension.js:84
 msgid "Places"
 msgstr "場所"
 
-#: ../extensions/places-menu/placeDisplay.js:57
+#: extensions/places-menu/placeDisplay.js:67
 #, javascript-format
-msgid "Failed to launch \"%s\""
-msgstr "\"%s\" の起動に失敗"
+msgid "Failed to mount volume for “%s”"
+msgstr ""
 
-#: ../extensions/places-menu/placeDisplay.js:99
-#: ../extensions/places-menu/placeDisplay.js:122
+#: extensions/places-menu/placeDisplay.js:80
+#, javascript-format
+msgid "Failed to launch “%s”"
+msgstr "“%s”の起動に失敗"
+
+#: extensions/places-menu/placeDisplay.js:141
+#: extensions/places-menu/placeDisplay.js:164
 msgid "Computer"
 msgstr "コンピューター"
 
-#: ../extensions/places-menu/placeDisplay.js:200
+#: extensions/places-menu/placeDisplay.js:342
 msgid "Home"
 msgstr "ホーム"
 
-#: ../extensions/places-menu/placeDisplay.js:287
+#: extensions/places-menu/placeDisplay.js:386
 msgid "Browse Network"
 msgstr "ネットワークを表示"
 
-#: ../extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml.in.h:1
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
 msgid "Cycle Screenshot Sizes"
 msgstr "スクリーンショットのサイズを変更する"
 
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:1
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
+msgid "Cycle Screenshot Sizes Backward"
+msgstr ""
+
+#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
 msgstr "テーマの名前"
 
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:2
+#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:6
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "テーマの名前です (~/.themes/name/gnome-shell 配下に格納します)"
 
-#: ../extensions/window-list/extension.js:109
+#: extensions/window-list/extension.js:107
 msgid "Close"
 msgstr "閉じる"
 
-#: ../extensions/window-list/extension.js:119
+#: extensions/window-list/extension.js:126
 msgid "Unminimize"
 msgstr "最小化解除"
 
-#: ../extensions/window-list/extension.js:120
+#: extensions/window-list/extension.js:127
 msgid "Minimize"
 msgstr "最小化"
 
-#: ../extensions/window-list/extension.js:126
+#: extensions/window-list/extension.js:133
 msgid "Unmaximize"
 msgstr "最大化解除"
 
-#: ../extensions/window-list/extension.js:127
+#: extensions/window-list/extension.js:134
 msgid "Maximize"
 msgstr "最大化"
 
-#: ../extensions/window-list/extension.js:399
+#: extensions/window-list/extension.js:409
 msgid "Minimize all"
 msgstr "全て最小化"
 
-#: ../extensions/window-list/extension.js:407
+#: extensions/window-list/extension.js:415
 msgid "Unminimize all"
 msgstr "全て最小化解除"
 
-#: ../extensions/window-list/extension.js:415
+#: extensions/window-list/extension.js:421
 msgid "Maximize all"
 msgstr "全て最大化"
 
-#: ../extensions/window-list/extension.js:424
+#: extensions/window-list/extension.js:430
 msgid "Unmaximize all"
 msgstr "全て最大化解除"
 
-#: ../extensions/window-list/extension.js:433
+#: extensions/window-list/extension.js:439
 msgid "Close all"
 msgstr "全て閉じる"
 
-#: ../extensions/window-list/extension.js:650
-#: ../extensions/workspace-indicator/extension.js:30
+#: extensions/window-list/extension.js:648
+#: extensions/workspace-indicator/extension.js:28
 msgid "Workspace Indicator"
 msgstr "ワークスペースインジケーター"
 
-#: ../extensions/window-list/extension.js:809
+#: extensions/window-list/extension.js:818
 msgid "Window List"
 msgstr "ウィンドウのリスト"
 
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:1
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml: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\", \"auto\" and \"always\"."
-msgstr "ウィンドウ一覧にある同じアプリケーションをグループ化する条件を指定します。指定可能な値は、\"never\", \"auto\", \"always\" です。"
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
+msgid ""
+"Decides when to group windows from the same application on the window list. "
+"Possible values are “never”, “auto” and “always”."
+msgstr ""
+"ウィンドウ一覧にある同じアプリケーションをグループ化する条件を指定します。指"
+"定可能な値は、“never”, “auto”, “always”です。"
 
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:3
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
 msgid "Show the window list on all monitors"
 msgstr "すべてのモニターにウィンドウリストを表示する"
 
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:4
-msgid "Whether to show the window list on all connected monitors or only on the primary one."
-msgstr "ウィンドウリストをすべての接続モニターに表示するかプライマリーモニターにのみ表示するかの設定です。"
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
+msgid ""
+"Whether to show the window list on all connected monitors or only on the "
+"primary one."
+msgstr ""
+"ウィンドウリストをすべての接続モニターに表示するかプライマリーモニターにのみ"
+"表示するかの設定です。"
 
-#: ../extensions/window-list/prefs.js:32
+#: extensions/window-list/prefs.js:28
 msgid "Window Grouping"
 msgstr "ウィンドウのグループ化"
 
-#: ../extensions/window-list/prefs.js:50
+#: extensions/window-list/prefs.js:46
 msgid "Never group windows"
 msgstr "ウィンドウをグループ化しない"
 
-#: ../extensions/window-list/prefs.js:51
+#: extensions/window-list/prefs.js:47
 msgid "Group windows when space is limited"
 msgstr "ウィンドウ一覧の幅が制限される時にグループ化する"
 
-#: ../extensions/window-list/prefs.js:52
+#: extensions/window-list/prefs.js:48
 msgid "Always group windows"
 msgstr "ウィンドウをグループ化する"
 
-#: ../extensions/window-list/prefs.js:75
+#: extensions/window-list/prefs.js:71
 msgid "Show on all monitors"
 msgstr "すべてのモニターに表示する"
 
-#: ../extensions/workspace-indicator/prefs.js:141
+#: extensions/workspace-indicator/prefs.js:134
 msgid "Workspace Names"
 msgstr "ワークスペース名"
 
-#: ../extensions/workspace-indicator/prefs.js:157
+#: extensions/workspace-indicator/prefs.js:150
 msgid "Name"
 msgstr "名前"
 
-#: ../extensions/workspace-indicator/prefs.js:198
+#: extensions/workspace-indicator/prefs.js:190
 #, javascript-format
 msgid "Workspace %d"
 msgstr "ワークスペース %d"
 
+#~ msgid "Attach modal dialog to the parent window"
+#~ msgstr "モーダルダイアログを親ウィンドウに結び付ける"
+
+#~ msgid ""
+#~ "This key overrides the key in org.gnome.mutter when running GNOME Shell."
+#~ msgstr ""
+#~ "GNOME Shell 使用時は、このキーが、org.gnome.mutter の同じキーよりも優先し"
+#~ "ます。"
+
+#~ msgid "Arrangement of buttons on the titlebar"
+#~ msgstr "タイトルバー上のボタンの配置"
+
+#~ msgid ""
+#~ "This key overrides the key in org.gnome.desktop.wm.preferences when "
+#~ "running GNOME Shell."
+#~ msgstr ""
+#~ "GNOME Shell 使用時は、このキーが、org.gnome.desktop.wm.preferences の同じ"
+#~ "キーよりも優先します。"
+
+#~ msgid "Enable edge tiling when dropping windows on screen edges"
+#~ msgstr "ウィンドウを画面の端に移動させたときにタイル状に配置する"
+
+#~ msgid "Workspaces only on primary monitor"
+#~ msgstr "プライマリモニターのみワークスペースを切り替える"
+
+#~ msgid "Delay focus changes in mouse mode until the pointer stops moving"
+#~ msgstr ""
+#~ "ポインターの動作が止まるまでマウスモードでのフォーカスの変更を遅らせる"
+
+#~ msgid "Thumbnail only"
+#~ msgstr "サムネイルのみ"
+
+#~ msgid "Application icon only"
+#~ msgstr "アプリケーションアイコンのみ"
+
+#~ msgid "Thumbnail and application icon"
+#~ msgstr "サムネイルとアプリケーションアイコン"
+
+#~ msgid "Present windows as"
+#~ msgstr "ウィンドウの表示方法"
+
+#~ msgid "Show only windows in the current workspace"
+#~ msgstr "現在のワークスペースのウィンドウのみ表示する"
+
+#~ msgid "Hello, world!"
+#~ msgstr "Hello, world!"
+
+#~ msgid "Alternative greeting text."
+#~ msgstr "代わりの挨拶テキストです。"
+
+#~ msgid ""
+#~ "If not empty, it contains the text that will be shown when clicking on "
+#~ "the panel."
+#~ msgstr ""
+#~ "空でない場合、指定したテキストが、パネルをクリックした時に表示されます。"
+
+#~ msgid "Message"
+#~ msgstr "メッセージ"
+
+#~ 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 ""
+#~ "Example は、うまく動作する GNOME Shell 拡張機能の構築方法を示すことを目的"
+#~ "としています。それ自体の機能はほんとどありません。\n"
+#~ "それでも、挨拶メッセージをカスタマイズすることはできます。"
+
 #~ msgid "GNOME Shell Classic"
 #~ msgstr "GNOME Shell クラシック"
 
@@ -390,11 +423,18 @@ msgstr "ワークスペース %d"
 #~ msgstr "ドックに表示するアイコンの大きさを指定します。"
 
 #, fuzzy
-#~ msgid "Sets the effect of the hide dock. Allowed values are 'resize' or 'rescale'"
-#~ msgstr "ドックをデスクトップに表示する位置を指定します。指定可能な値: 'right'、'left'"
+#~ msgid ""
+#~ "Sets the effect of the hide dock. Allowed values are 'resize' or 'rescale'"
+#~ msgstr ""
+#~ "ドックをデスクトップに表示する位置を指定します。指定可能な値: "
+#~ "'right'、'left'"
 
-#~ msgid "Sets the position of the dock in the screen. Allowed values are 'right' or 'left'"
-#~ msgstr "ドックをデスクトップに表示する位置を指定します。指定可能な値: 'right'、'left'"
+#~ msgid ""
+#~ "Sets the position of the dock in the screen. Allowed values are 'right' "
+#~ "or 'left'"
+#~ msgstr ""
+#~ "ドックをデスクトップに表示する位置を指定します。指定可能な値: "
+#~ "'right'、'left'"
 
 #~ msgid "%s is away."
 #~ msgstr "%s さんは離席中です。"
@@ -408,8 +448,15 @@ msgstr "ワークスペース %d"
 #~ msgid "%s is busy."
 #~ msgstr "%s さんは取り込み中です。"
 
-#~ msgid "The algorithm used to layout thumbnails in the overview. 'grid' to use the default grid based algorithm, 'natural' to use another one that reflects more the position and size of the actual window"
-#~ msgstr "オーバービュー・モードでウィンドウのサムネイルを配置する際のアルゴリズムです。指定可能な値: 'grid' (原則的に格子状に配置していくアルゴリズム)、'natural' (ウィンドウの実際の位置や大きさを考慮して配置していくアルゴリズム)"
+#~ msgid ""
+#~ "The algorithm used to layout thumbnails in the overview. 'grid' to use "
+#~ "the default grid based algorithm, 'natural' to use another one that "
+#~ "reflects more the position and size of the actual window"
+#~ msgstr ""
+#~ "オーバービュー・モードでウィンドウのサムネイルを配置する際のアルゴリズムで"
+#~ "す。指定可能な値: 'grid' (原則的に格子状に配置していくアルゴリズ"
+#~ "ム)、'natural' (ウィンドウの実際の位置や大きさを考慮して配置していくアルゴ"
+#~ "リズム)"
 
 #~ msgid "Window placement strategy"
 #~ msgstr "ウィンドウを配置するアルゴリズム"

po/pa.po

@@ -2,345 +2,371 @@
 # Copyright (C) 2011 gnome-shell-extensions's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-shell-extensions package.
 #
-# A S Alam <aalam@users.sf.net>, 2011, 2012, 2013, 2014, 2015.
+# A S Alam <aalam@users.sf.net>, 2011, 2012, 2013, 2014, 2015, 2018.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions gnome-3-0\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2015-03-13 20:45+0000\n"
-"PO-Revision-Date: 2015-03-13 21:34-0500\n"
-"Last-Translator: A S Alam <aalam@users.sf.net>\n"
-"Language-Team: Punjabi/Panjabi <punjabi-users@lists.sf.net>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/is"
+"sues\n"
+"POT-Creation-Date: 2018-02-20 23:07+0000\n"
+"PO-Revision-Date: 2018-03-10 09:36-0600\n"
+"Last-Translator: A S Alam <alam.yellow@gmail.com>\n"
+"Language-Team: Punjabi <punjabi-translation@googlegroups.com>\n"
 "Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../data/gnome-classic.desktop.in.h:1
-#: ../data/gnome-classic.session.desktop.in.in.h:1
+#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
 msgid "GNOME Classic"
 msgstr "ਗਨੋਮ ਕਲਾਸਿਕ"
 
-#: ../data/gnome-classic.desktop.in.h:2
+#: data/gnome-classic.desktop.in:4
 msgid "This session logs you into GNOME Classic"
 msgstr "ਇਹ ਸ਼ੈਸ਼ਨ ਤੁਹਾਨੂੰ ਗਨੋਮ ਕਲਾਸਿਕ ਵਿੱਚ ਲਾਗ ਕਰਦਾ ਹੈ"
 
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:1
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:7
 msgid "Attach modal dialog to the parent window"
 msgstr "ਮੁੱਢਲੀ ਵਿੰਡੋ ਵਿੱਚ ਮਾਡਲ ਡਾਈਲਾਗ ਜੋੜੋ"
 
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:2
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:8
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:25
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:33
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:41
 msgid ""
 "This key overrides the key in org.gnome.mutter when running GNOME Shell."
 msgstr ""
 "ਇਹ ਕੁੰਜੀ ਗਨੋਮ ਸ਼ੈੱਲ ਚੱਲਣ ਦੇ ਦੌਰਾਨ  org.gnome.mutter ਕੁੰਜੀ ਨੂੰ ਅਣਡਿੱਠਾ ਕਰਦੀ ਹੈ।"
 
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:3
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
 msgid "Arrangement of buttons on the titlebar"
 msgstr "ਟਾਈਟਲ-ਪੱਟੀ ਵਿੱਚ ਬਟਨਾਂ ਦਾ ਪ੍ਰਬੰਧ"
 
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:4
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:17
 msgid ""
 "This key overrides the key in org.gnome.desktop.wm.preferences when running "
 "GNOME Shell."
 msgstr ""
-"ਇਹ ਕੁੰਜੀ ਗਨੋਮ ਸ਼ੈੱਲ ਚੱਲਣ ਦੇ ਦੌਰਾਨ  org.gnome.desktop.wm.preferencesr ਕੁੰਜੀ ਨੂੰ "
-"ਅਣਡਿੱਠਾ "
+"ਇਹ ਕੁੰਜੀ ਗਨੋਮ ਸ਼ੈੱਲ ਚੱਲਣ ਦੇ ਦੌਰਾਨ  org.gnome.desktop.wm.preferencesr ਕੁੰਜੀ ਨੂੰ"
+" ਅਣਡਿੱਠਾ "
 "ਕਰਦੀ ਹੈ।"
 
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:5
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:24
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr "ਕੋਨਾ ਟਿਲਿੰਗ ਚਾਲੂ, ਜਦੋਂ ਵਿੰਡੋਜ਼ ਨੂੰ ਸਕਰੀਨ ਕੋਨਿਆਂ ਤੋਂ ਡਰਾਪ ਕਰਨਾ ਹੋਵੇ"
 
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:6
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:32
 msgid "Workspaces only on primary monitor"
 msgstr "ਪ੍ਰਾਈਮਰੀ ਮਾਨੀਟਰ ਉੱਤੇ ਕੇਵਲ ਵਰਕਸਪੇਸ"
 
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:7
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:40
 msgid "Delay focus changes in mouse mode until the pointer stops moving"
 msgstr "ਪੁਆਇੰਟਰ ਦੇ ਹਿਲਣ ਤੋਂ ਰੁਕਣ ਤੱਕ ਮਾਊਸ ਮੋਡ ਵਿੱਚ ਫੋਕਸ ਬਦਲਾਅ ਵਿੱਚ ਦੇਰੀ"
 
-#: ../extensions/alternate-tab/prefs.js:20
+#: extensions/alternate-tab/prefs.js:19
 msgid "Thumbnail only"
 msgstr "ਕੇਵਲ ਥੰਮਨੇਲ ਹੀ"
 
-#: ../extensions/alternate-tab/prefs.js:21
+#: extensions/alternate-tab/prefs.js:20
 msgid "Application icon only"
 msgstr "ਐਪਲੀਕੇਸ਼ਨ ਆਈਕਾਨ ਹੀ"
 
-#: ../extensions/alternate-tab/prefs.js:22
+#: extensions/alternate-tab/prefs.js:21
 msgid "Thumbnail and application icon"
 msgstr "ਥੰਮਨੇਲ ਅਤੇ ਐਪਲੀਕੇਸ਼ਨ ਆਈਕਾਨ"
 
-#: ../extensions/alternate-tab/prefs.js:38
+#: extensions/alternate-tab/prefs.js:34
 msgid "Present windows as"
 msgstr "ਵਿੰਡੋਜ਼ ਨੂੰ ਪੇਸ਼ ਕਰੋ"
 
-#: ../extensions/alternate-tab/prefs.js:69
+#: extensions/alternate-tab/prefs.js:65
 msgid "Show only windows in the current workspace"
 msgstr "ਮੌਜੂਦਾ ਵਰਕਸਪੇਸ ਵਿੱਚੋਂ ਹੀ ਵਿੰਡੋਜ਼ ਹੀ ਵੇਖਾਓ"
 
-#: ../extensions/apps-menu/extension.js:39
+#: extensions/apps-menu/extension.js:37
 msgid "Activities Overview"
 msgstr "ਸਰਗਰਮੀ ਝਲਕ"
 
-#: ../extensions/apps-menu/extension.js:110
+#: extensions/apps-menu/extension.js:130
 msgid "Favorites"
 msgstr "ਪਸੰਦੀਦਾ"
 
-#: ../extensions/apps-menu/extension.js:279
+#: extensions/apps-menu/extension.js:417
 msgid "Applications"
 msgstr "ਐਪਲੀਕੇਸ਼ਨ"
 
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:1
+#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
 msgid "Application and workspace list"
 msgstr "ਐਪਲੀਕੇਸ਼ਨ ਅਤੇ ਵਰਕਸਪੇਸ ਲਿਸਟ"
 
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
+#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:7
 msgid ""
 "A list of strings, each containing an application id (desktop file name), "
 "followed by a colon and the workspace number"
 msgstr ""
-"ਲਾਈਨਾਂ ਦੀ ਲਿਸਟ, ਜੋ ਕਿ ਐਪਲੀਕੇਸ਼ਨ ID (ਡੈਸਕਟਾਪ ਫਾਇਲ ਨਾਂ), ਬਾਅਦ 'ਚ ਕਾਲਮ ਅਤੇ "
-"ਵਰਕਸਪੇਸ ਨੰਬਰ "
+"ਲਾਈਨਾਂ ਦੀ ਲਿਸਟ, ਜੋ ਕਿ ਐਪਲੀਕੇਸ਼ਨ ID (ਡੈਸਕਟਾਪ ਫਾਇਲ ਨਾਂ), ਬਾਅਦ 'ਚ ਕਾਲਮ ਅਤੇ"
+" ਵਰਕਸਪੇਸ ਨੰਬਰ "
 "ਰੱਖਦਾ ਹੈ"
 
-#: ../extensions/auto-move-windows/prefs.js:60
+#: extensions/auto-move-windows/prefs.js:53
 msgid "Application"
 msgstr "ਐਪਲੀਕੇਸ਼ਨ"
 
-#: ../extensions/auto-move-windows/prefs.js:69
-#: ../extensions/auto-move-windows/prefs.js:127
+#: extensions/auto-move-windows/prefs.js:62
+#: extensions/auto-move-windows/prefs.js:117
 msgid "Workspace"
 msgstr "ਵਰਕਸਪੇਸ"
 
-#: ../extensions/auto-move-windows/prefs.js:85
+#: extensions/auto-move-windows/prefs.js:78
 msgid "Add Rule"
 msgstr "ਨਿਯਮ ਜੋੜੋ"
 
-#: ../extensions/auto-move-windows/prefs.js:106
+#: extensions/auto-move-windows/prefs.js:98
 msgid "Create new matching rule"
-msgstr "ਨਵਾਂ ਮਿਲਾਉਣ ਨਿਯਮ ਬਣਾਉ"
+msgstr "ਨਵਾਂ ਮਿਲਾਉਣ ਨਿਯਮ ਬਣਾਓ"
 
-#: ../extensions/auto-move-windows/prefs.js:111
+#: extensions/auto-move-windows/prefs.js:103
 msgid "Add"
-msgstr "ਸ਼ਾਮਲ"
+msgstr "ਜੋੜੋ"
 
-#: ../extensions/drive-menu/extension.js:106
+#. TRANSLATORS: %s is the filesystem name
+#: extensions/drive-menu/extension.js:103
+#: extensions/places-menu/placeDisplay.js:219
 #, javascript-format
-msgid "Ejecting drive '%s' failed:"
-msgstr "ਡਰਾਇਵ '%s' ਬਾਹਰ ਕੱਢਣ ਲਈ ਫੇਲ੍ਹ:"
+#| msgid "Ejecting drive '%s' failed:"
+msgid "Ejecting drive “%s” failed:"
+msgstr "ਡਰਾਇਵ “%s“ ਬਾਹਰ ਕੱਢਣ ਲਈ ਫੇਲ੍ਹ:"
 
-#: ../extensions/drive-menu/extension.js:124
+#: extensions/drive-menu/extension.js:118
 msgid "Removable devices"
 msgstr "ਹਟਾਉਣਯੋਗ ਜੰਤਰ"
 
-#: ../extensions/drive-menu/extension.js:149
-msgid "Open File"
-msgstr "ਫਾਇਲ ਖੋਲ੍ਹੋ"
+#: extensions/drive-menu/extension.js:143
+#| msgid "Open File"
+msgid "Open Files"
+msgstr "ਫਾਇਲਾਂ ਨੂੰ ਖੋਲ੍ਹੋ"
 
-#: ../extensions/example/extension.js:17
+#: extensions/example/extension.js:17
 msgid "Hello, world!"
 msgstr "ਹੈਲੋ, ਵਰਲਡ!"
 
-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:1
+#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:5
 msgid "Alternative greeting text."
 msgstr "ਬਦਲਵਾਂ ਸਵਾਗਤੀ ਟੈਕਸਟ ਹੈ।"
 
-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:2
+#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:6
 msgid ""
 "If not empty, it contains the text that will be shown when clicking on the "
 "panel."
 msgstr ""
-"ਜੇ ਖਾਲੀ ਨਹੀਂ ਤਾਂ ਇਹ ਟੈਕਸਟ ਰੱਖਦਾ ਹੈ, ਜੋ ਕਿ ਪੈਨਲ ਨੂੰ ਕਲਿੱਕ ਕਰਨ ਨਾਲ ਵੇਖਾਇਆ "
-"ਜਾਵੇਗਾ।"
+"ਜੇ ਖਾਲੀ ਨਹੀਂ ਤਾਂ ਇਹ ਟੈਕਸਟ ਰੱਖਦਾ ਹੈ, ਜੋ ਕਿ ਪੈਨਲ ਨੂੰ ਕਲਿੱਕ ਕਰਨ ਨਾਲ ਵੇਖਾਇਆ"
+" ਜਾਵੇਗਾ।"
 
-#: ../extensions/example/prefs.js:30
+#: extensions/example/prefs.js:27
 msgid "Message"
 msgstr "ਸੁਨੇਹਾ"
 
-#: ../extensions/example/prefs.js:43
+#. TRANSLATORS: Example is the name of the extension, should not be
+#. translated
+#: extensions/example/prefs.js:40
+#| 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."
 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."
+"Nevertheless it’s possible to customize the greeting message."
 msgstr ""
-"Example ਦਾ ਮਕਸਦ ਸ਼ੈਲ ਲਈ ਇੱਕ ਵਧੀਆ ਕੰਮ ਕਰਦੀ ਇਕਸਟੈਸ਼ਨ ਬਣਾਉਣ ਦੀ ਉਦਾਹਰਨ ਦੇਣਾ ਹੈ ਅਤੇ "
-"ਇਸ ਦਾ "
+"Example ਦਾ ਮਕਸਦ ਸ਼ੈਲ ਲਈ ਇੱਕ ਵਧੀਆ ਕੰਮ ਕਰਦੀ ਇਕਸਟੈਸ਼ਨ ਬਣਾਉਣ ਦੀ ਉਦਾਹਰਨ ਦੇਣਾ ਹੈ ਅਤੇ"
+" ਇਸ ਦਾ "
 "ਖੁਦ ਕੋਈ ਬਹੁਤਾ ਕੰਮ ਨਹੀਂ ਹੈ।\n"
 "ਫੇਰ ਵੀ ਸਵਾਗਤੀ ਸੁਨੇਹੇ ਨੂੰ ਬਦਲਣਾ ਸੰਭਵ ਹੈ।"
 
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:1
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
 msgid "Use more screen for windows"
 msgstr "ਵਿੰਡੋਜ਼ ਲਈ ਹੋਰ ਸਕਰੀਨ ਵਰਤੋਂ"
 
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:2
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
 msgid ""
 "Try to use more screen for placing window thumbnails by adapting to screen "
 "aspect ratio, and consolidating them further to reduce the bounding box. "
 "This setting applies only with the natural placement strategy."
 msgstr ""
-"ਸਕਰੀਨ ਆਕਾਰ ਅਨੁਪਾਤ ਨੂੰ ਧਿਆਨ ਵਿੱਚ ਰੱਖ ਕੇ ਵਿੰਡੋ ਥੰਮਨੇਲ ਨੂੰ ਰੱਖ ਕੇ ਹੋਰ ਸਕਰੀਨ ਵਰਤਣ "
-"ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਅਤੇ "
-"ਉਹਨਾਂ ਨੂੰ ਬਾਊਂਡ ਬਕਸ ਘਟਾਉਣ ਲਈ ਹੋਰ ਵੀ ਸੰਘਣਾ ਕਰੋ। ਇਹ ਸੈਟਿੰਗ ਕੇਵਲ ਸੁਭਾਵਿਕ ਥਾਂ "
-"ਨੀਤੀ ਨਾਲ ਹੀ "
+"ਸਕਰੀਨ ਆਕਾਰ ਅਨੁਪਾਤ ਨੂੰ ਧਿਆਨ ਵਿੱਚ ਰੱਖ ਕੇ ਵਿੰਡੋ ਥੰਮਨੇਲ ਨੂੰ ਰੱਖ ਕੇ ਹੋਰ ਸਕਰੀਨ ਵਰਤਣ"
+" ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਅਤੇ "
+"ਉਹਨਾਂ ਨੂੰ ਬਾਊਂਡ ਬਕਸ ਘਟਾਉਣ ਲਈ ਹੋਰ ਵੀ ਸੰਘਣਾ ਕਰੋ। ਇਹ ਸੈਟਿੰਗ ਕੇਵਲ ਸੁਭਾਵਿਕ ਥਾਂ"
+" ਨੀਤੀ ਨਾਲ ਹੀ "
 "ਲਾਗੂ ਹੁੰਦੀ ਹੈ।"
 
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:3
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
 msgid "Place window captions on top"
 msgstr "ਥਾਂ ਵਿੰਡੋ ਸੁਰਖੀ ਸਭ ਤੋਂ ਉੱਤੇ"
 
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:4
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:12
 msgid ""
 "If true, place window captions on top the respective thumbnail, overriding "
 "shell default of placing it at the bottom. Changing this setting requires "
 "restarting the shell to have any effect."
 msgstr ""
-"ਜੇ ਚੋਣ ਕੀਤੀ ਤਾਂ ਵਿੰਡੋ ਸੁਰਖੀਆਂ ਨੂੰ ਅਨੁਸਾਰੀ ਥੰਮਨੇਲ ਉੱਤੇ ਰੱਖਿਆ ਜਾਂਦਾ ਹੈ, ਜੋ ਕਿ "
-"ਸ਼ੈਲ ਮੂਲ ਰੂਪ (ਹੇਠਾਂ) ਰੱਖਣ "
-"ਨੂੰ ਅਣਡਿੱਠਾ ਕਰਦਾ ਹੈ। ਇਹ ਸੈਟਿੰਗ ਬਦਲਾਅ ਦੇ ਚਾਲੂ ਹੋਣ ਲਈ ਸ਼ੈਲ ਨੂੰ ਮੁੜ-ਚਾਲੂ ਕਰਨ ਦੀ "
-"ਲੋੜ ਹੈ।"
+"ਜੇ ਚੋਣ ਕੀਤੀ ਤਾਂ ਵਿੰਡੋ ਸੁਰਖੀਆਂ ਨੂੰ ਅਨੁਸਾਰੀ ਥੰਮਨੇਲ ਉੱਤੇ ਰੱਖਿਆ ਜਾਂਦਾ ਹੈ, ਜੋ ਕਿ"
+" ਸ਼ੈਲ ਮੂਲ ਰੂਪ (ਹੇਠਾਂ) ਰੱਖਣ "
+"ਨੂੰ ਅਣਡਿੱਠਾ ਕਰਦਾ ਹੈ। ਇਹ ਸੈਟਿੰਗ ਬਦਲਾਅ ਦੇ ਚਾਲੂ ਹੋਣ ਲਈ ਸ਼ੈਲ ਨੂੰ ਮੁੜ-ਚਾਲੂ ਕਰਨ ਦੀ"
+" ਲੋੜ ਹੈ।"
 
-#: ../extensions/places-menu/extension.js:78
-#: ../extensions/places-menu/extension.js:81
+#: extensions/places-menu/extension.js:79
+#: extensions/places-menu/extension.js:82
 msgid "Places"
 msgstr "ਥਾਵਾਂ"
 
-#: ../extensions/places-menu/placeDisplay.js:57
+#: extensions/places-menu/placeDisplay.js:66
 #, javascript-format
-msgid "Failed to launch \"%s\""
-msgstr "\"%s\" ਚਲਾਉਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+msgid "Failed to mount volume for “%s”"
+msgstr "“%s” ਲਈ ਵਾਲੀਅਮ ਮਾਊਂਟ ਕਰਨ ਲਈ ਅਸਫ਼ਲ"
 
-#: ../extensions/places-menu/placeDisplay.js:99
-#: ../extensions/places-menu/placeDisplay.js:122
+#: extensions/places-menu/placeDisplay.js:79
+#, javascript-format
+#| msgid "Failed to launch \"%s\""
+msgid "Failed to launch “%s”"
+msgstr "“%s“ ਚਲਾਉਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+
+#: extensions/places-menu/placeDisplay.js:135
+#: extensions/places-menu/placeDisplay.js:158
 msgid "Computer"
 msgstr "ਕੰਪਿਊਟਰ"
 
-#: ../extensions/places-menu/placeDisplay.js:200
+#: extensions/places-menu/placeDisplay.js:336
 msgid "Home"
 msgstr "ਘਰ"
 
-#: ../extensions/places-menu/placeDisplay.js:287
+#: extensions/places-menu/placeDisplay.js:378
 msgid "Browse Network"
 msgstr "ਨੈੱਟਵਰਕ ਝਲਕ ਵੇਖੋ"
 
-#: ../extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml.in.h:1
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
 msgid "Cycle Screenshot Sizes"
 msgstr "ਸਾਈਕਲ ਸਕਰੀਨਸ਼ਾਟ ਆਕਾਰ"
 
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:1
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
+#| msgid "Cycle Screenshot Sizes"
+msgid "Cycle Screenshot Sizes Backward"
+msgstr "ਸਾਈਕਲ ਸਕਰੀਨਸ਼ਾਟ ਆਕਾਰ ਪਿੱਛੇ ਵੱਲ"
+
+#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
 msgstr "ਥੀਮ ਨਾਂ"
 
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:2
+#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:6
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "ਥੀਮ ਦਾ ਨਾਂ, ਜੋ ~/.themes/name/gnome-shell ਤੋਂ ਲੋਡ ਕੀਤਾ ਜਾਵੇਗਾ"
 
-#: ../extensions/window-list/extension.js:109
+#: extensions/window-list/extension.js:106
 msgid "Close"
 msgstr "ਬੰਦ ਕਰੋ"
 
-#: ../extensions/window-list/extension.js:119
+#: extensions/window-list/extension.js:125
 msgid "Unminimize"
 msgstr "ਅਣ-ਨਿਊਨਤਮ"
 
-#: ../extensions/window-list/extension.js:120
+#: extensions/window-list/extension.js:126
 msgid "Minimize"
 msgstr "ਨਿਊਨਤਮ"
 
-#: ../extensions/window-list/extension.js:126
+#: extensions/window-list/extension.js:132
 msgid "Unmaximize"
 msgstr "ਅਣ-ਵੱਧੋ-ਵੱਧ"
 
-#: ../extensions/window-list/extension.js:127
+#: extensions/window-list/extension.js:133
 msgid "Maximize"
 msgstr "ਵੱਧੋ-ਵੱਧ"
 
-#: ../extensions/window-list/extension.js:399
+#: extensions/window-list/extension.js:408
 msgid "Minimize all"
 msgstr "ਸਭ ਨਿਊਨਤਮ ਕਰੋ"
 
-#: ../extensions/window-list/extension.js:407
+#: extensions/window-list/extension.js:414
 msgid "Unminimize all"
 msgstr "ਸਭ ਅਣ-ਨਿਊਨਤਮ ਕਰੋ"
 
-#: ../extensions/window-list/extension.js:415
+#: extensions/window-list/extension.js:420
 msgid "Maximize all"
 msgstr "ਸਭ ਵੱਧ-ਵੱਧ ਕਰੋ"
 
-#: ../extensions/window-list/extension.js:424
+#: extensions/window-list/extension.js:429
 msgid "Unmaximize all"
 msgstr "ਸਭ ਅਣ-ਵੱਧੋ-ਵੱਧ ਕਰੋ"
 
-#: ../extensions/window-list/extension.js:433
+#: extensions/window-list/extension.js:438
 msgid "Close all"
 msgstr "ਸਭ ਬੰਦ ਕਰੋ"
 
-#: ../extensions/window-list/extension.js:650
-#: ../extensions/workspace-indicator/extension.js:30
+#: extensions/window-list/extension.js:646
+#: extensions/workspace-indicator/extension.js:26
 msgid "Workspace Indicator"
 msgstr "ਵਰਕਸਪੇਸ ਇੰਡੀਕੇਟਰ"
 
-#: ../extensions/window-list/extension.js:808
+#: extensions/window-list/extension.js:811
 msgid "Window List"
-msgstr "ਵਿੰਡੋਜ਼ ਲਿਸਟ"
+msgstr "ਵਿੰਡੋਜ਼ ਸੂਚੀ"
 
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:1
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:12
 msgid "When to group windows"
 msgstr "ਵਿੰਡੋਜ਼ ਗਰੁੱਪ ਕਦੋਂ ਬਣਾਉਣਾ ਹੈ"
 
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:2
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
+#| msgid ""
+#| "Decides when to group windows from the same application on the window "
+#| "list. Possible values are \"never\", \"auto\" 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”, “auto” and “always”."
 msgstr ""
-"ਵਿੰਡੋ ਲਿਸਟ ਵਿੱਚ ਇਕੋ ਕੰਮ ਦੇ ਵਿੰਡੋ ਦਾ ਗਰੁੱਪ ਕਦੋਂ ਬਣਾਉਣਾ ਹੈ, ਇਹ ਦੱਸੋ। ਸੰਭਵ ਮੁੱਲ "
-"ਹਨ \"ਕਦੇ ਨਹੀਂ\", "
-"\"ਆਟੋ\" ਅਤੇ \"ਹਮੇਸ਼ਾ\"।"
+"ਵਿੰਡੋ ਲਿਸਟ ਵਿੱਚ ਇਕੋ ਕੰਮ ਦੇ ਵਿੰਡੋ ਦਾ ਗਰੁੱਪ ਕਦੋਂ ਬਣਾਉਣਾ ਹੈ, ਇਹ ਦੱਸੋ। ਸੰਭਵ ਮੁੱਲ"
+" ਹਨ “ਕਦੇ ਨਹੀਂ“, "
+"“ਆਟੋ“ ਅਤੇ “ਹਮੇਸ਼ਾ“।"
 
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:3
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
 msgid "Show the window list on all monitors"
 msgstr "ਸਭ ਮਾਨੀਟਰਾਂ ਉੱਤੇ ਵਿੰਡੋ ਸੂਚੀ ਵੇਖਾਓ"
 
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:4
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
 msgid ""
 "Whether to show the window list on all connected monitors or only on the "
 "primary one."
 msgstr ""
 "ਕੀ ਸਭ ਕਨੈਕਟ ਹੋਏ ਮਾਨੀਟਰਾਂ ਉੱਤੇ ਵਿੰਡੋ ਸੂਚੀ ਦੇਖਣੀ ਹੈ ਜਾਂ ਕੇਵਲ ਪ੍ਰਾਇਮਰੀ ਉੱਤੇ ਹੀ।"
 
-#: ../extensions/window-list/prefs.js:32
+#: extensions/window-list/prefs.js:28
 msgid "Window Grouping"
 msgstr "ਵਿੰਡੋ ਗਰੁੱਪਿੰਗ"
 
-#: ../extensions/window-list/prefs.js:50
+#: extensions/window-list/prefs.js:46
 msgid "Never group windows"
 msgstr "ਵਿੰਡੋ ਦਾ ਗਰੁੱਪ ਕਦੇ ਨਾ ਬਣਾਓ"
 
-#: ../extensions/window-list/prefs.js:51
+#: extensions/window-list/prefs.js:47
 msgid "Group windows when space is limited"
 msgstr "ਜਦੋਂ ਥਾਂ ਥੋੜੀ ਹੋਵੇ ਤਾਂ ਵਿੰਡੋਜ਼ ਦਾ ਗਰੁੱਪ ਬਣਾਓ"
 
-#: ../extensions/window-list/prefs.js:52
+#: extensions/window-list/prefs.js:48
 msgid "Always group windows"
 msgstr "ਵਿੰਡੋ ਦਾ ਗਰੁੱਪ ਹਮੇਸ਼ਾ ਬਣਾਓ"
 
-#: ../extensions/window-list/prefs.js:75
+#: extensions/window-list/prefs.js:71
 msgid "Show on all monitors"
 msgstr "ਸਭ ਮਾਨੀਟਰਾਂ ਉੱਤੇ ਵੇਖਾਓ"
 
-#: ../extensions/workspace-indicator/prefs.js:141
+#: extensions/workspace-indicator/prefs.js:134
 msgid "Workspace Names"
 msgstr "ਵਰਕਸਪੇਸ ਨਾਂ"
 
-#: ../extensions/workspace-indicator/prefs.js:157
+#: extensions/workspace-indicator/prefs.js:150
 msgid "Name"
 msgstr "ਨਾਂ"
 
-#: ../extensions/workspace-indicator/prefs.js:198
+#: extensions/workspace-indicator/prefs.js:190
 #, javascript-format
 msgid "Workspace %d"
 msgstr "ਵਰਕਸਪੇਸ %d"

po/zh_CN.po

@@ -5,21 +5,22 @@
 # Aron Xu <aronxu@gnome.org>, 2011.
 # tuhaihe <1132321739qq@gmail.com>, 2012, 2013.
 # 甘露(Gan Lu) <rhythm.gan@gmail.com>, 2013.
+# Mingcong Bai <jeffbai@aosc.xyz>, 2017.
 #
 msgid ""
 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: 2016-10-11 08:03+0000\n"
-"PO-Revision-Date: 2016-10-18 17:53+0800\n"
-"Last-Translator: YunQiang Su <wzssyqa@gmail.com>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
+"issues\n"
+"POT-Creation-Date: 2018-01-18 12:15+0000\n"
+"PO-Revision-Date: 2017-08-18 21:26+0800\n"
+"Last-Translator: Mingcong Bai <jeffbai@aosc.xyz>\n"
 "Language-Team: Chinese (China) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.9\n"
+"X-Generator: Poedit 2.0.2\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
@@ -65,35 +66,35 @@ msgstr "仅在主显示器上显示工作区"
 msgid "Delay focus changes in mouse mode until the pointer stops moving"
 msgstr "将鼠标模式下焦点的切换推迟到光标停止移动之后"
 
-#: extensions/alternate-tab/prefs.js:20
+#: extensions/alternate-tab/prefs.js:19
 msgid "Thumbnail only"
 msgstr "仅缩略图"
 
-#: extensions/alternate-tab/prefs.js:21
+#: extensions/alternate-tab/prefs.js:20
 msgid "Application icon only"
 msgstr "仅应用程序图标"
 
-#: extensions/alternate-tab/prefs.js:22
+#: extensions/alternate-tab/prefs.js:21
 msgid "Thumbnail and application icon"
 msgstr "缩略图和应用程序图标"
 
-#: extensions/alternate-tab/prefs.js:38
+#: extensions/alternate-tab/prefs.js:34
 msgid "Present windows as"
 msgstr "窗口展现为"
 
-#: extensions/alternate-tab/prefs.js:69
+#: extensions/alternate-tab/prefs.js:65
 msgid "Show only windows in the current workspace"
 msgstr "仅显示当前工作区中的窗口"
 
-#: extensions/apps-menu/extension.js:38
+#: extensions/apps-menu/extension.js:37
 msgid "Activities Overview"
 msgstr "活动概览"
 
-#: extensions/apps-menu/extension.js:109
+#: extensions/apps-menu/extension.js:130
 msgid "Favorites"
 msgstr "收藏"
 
-#: extensions/apps-menu/extension.js:266
+#: extensions/apps-menu/extension.js:417
 msgid "Applications"
 msgstr "应用程序"
 
@@ -106,41 +107,43 @@ msgid ""
 "A list of strings, each containing an application id (desktop file name), "
 "followed by a colon and the workspace number"
 msgstr ""
-"一系列字符串，每个字符串包含一个应用程序标识(桌面文件名称)、冒号加工作区号"
+"一系列字符串，每个字符串包含一个应用程序标识（桌面文件名称）、冒号加工作区号"
 
-#: extensions/auto-move-windows/prefs.js:60
+#: extensions/auto-move-windows/prefs.js:53
 msgid "Application"
 msgstr "应用程序"
 
-#: extensions/auto-move-windows/prefs.js:69
-#: extensions/auto-move-windows/prefs.js:127
+#: extensions/auto-move-windows/prefs.js:62
+#: extensions/auto-move-windows/prefs.js:117
 msgid "Workspace"
 msgstr "工作区"
 
-#: extensions/auto-move-windows/prefs.js:85
+#: extensions/auto-move-windows/prefs.js:78
 msgid "Add Rule"
 msgstr "添加规则"
 
-#: extensions/auto-move-windows/prefs.js:106
+#: extensions/auto-move-windows/prefs.js:98
 msgid "Create new matching rule"
 msgstr "创建新的匹配规则"
 
-#: extensions/auto-move-windows/prefs.js:111
+#: extensions/auto-move-windows/prefs.js:103
 msgid "Add"
 msgstr "添加"
 
-#: extensions/drive-menu/extension.js:106
+#. TRANSLATORS: %s is the filesystem name
+#: extensions/drive-menu/extension.js:103
+#: extensions/places-menu/placeDisplay.js:219
 #, javascript-format
-msgid "Ejecting drive '%s' failed:"
+msgid "Ejecting drive “%s” failed:"
 msgstr "弹出驱动器“%s”失败："
 
-#: extensions/drive-menu/extension.js:124
+#: extensions/drive-menu/extension.js:118
 msgid "Removable devices"
 msgstr "可移动设备"
 
-#: extensions/drive-menu/extension.js:149
-msgid "Open File"
-msgstr "打开文件管理器"
+#: extensions/drive-menu/extension.js:143
+msgid "Open Files"
+msgstr "打开文件"
 
 #: extensions/example/extension.js:17
 msgid "Hello, world!"
@@ -156,17 +159,17 @@ msgid ""
 "panel."
 msgstr "如果不为空，所包含的文本会在点击面板时显示。"
 
-#: extensions/example/prefs.js:30
+#: extensions/example/prefs.js:27
 msgid "Message"
 msgstr "消息"
 
 #. TRANSLATORS: Example is the name of the extension, should not be
 #. translated
-#: extensions/example/prefs.js:43
+#: extensions/example/prefs.js:40
 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."
+"Nevertheless it’s possible to customize the greeting message."
 msgstr ""
 "示例意在展示如何为 Shell 创建良好工作的扩展，本身功能有限。\n"
 "尽管如此，它还是具备定制祝福语的功能。"
@@ -197,32 +200,41 @@ msgstr ""
 "如果设置为 true，则将窗口说明文字放置在对应窗口的缩略图上方，而不是默认的下"
 "方。修改此设置需要重启 GNOME Shell 以使设置生效。"
 
-#: extensions/places-menu/extension.js:78
-#: extensions/places-menu/extension.js:81
+#: extensions/places-menu/extension.js:79
+#: extensions/places-menu/extension.js:82
 msgid "Places"
 msgstr "位置"
 
-#: extensions/places-menu/placeDisplay.js:59
+#: extensions/places-menu/placeDisplay.js:66
 #, javascript-format
-msgid "Failed to launch \"%s\""
+msgid "Failed to mount volume for “%s”"
+msgstr "无法为“%s”挂载卷"
+
+#: extensions/places-menu/placeDisplay.js:79
+#, javascript-format
+msgid "Failed to launch “%s”"
 msgstr "无法启动“%s”"
 
-#: extensions/places-menu/placeDisplay.js:101
-#: extensions/places-menu/placeDisplay.js:124
+#: extensions/places-menu/placeDisplay.js:135
+#: extensions/places-menu/placeDisplay.js:158
 msgid "Computer"
 msgstr "计算机"
 
-#: extensions/places-menu/placeDisplay.js:267
+#: extensions/places-menu/placeDisplay.js:336
 msgid "Home"
 msgstr "主文件夹"
 
-#: extensions/places-menu/placeDisplay.js:311
+#: extensions/places-menu/placeDisplay.js:378
 msgid "Browse Network"
 msgstr "浏览网络"
 
 #: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
 msgid "Cycle Screenshot Sizes"
-msgstr "循环调整窗口截图大小"
+msgstr "循环调整截图大小"
+
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
+msgid "Cycle Screenshot Sizes Backward"
+msgstr "反向循环调整截图大小"
 
 #: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
@@ -232,52 +244,52 @@ msgstr "主题名称"
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "从 ~/.themes/name/gnome-shell 加载的主题名称"
 
-#: extensions/window-list/extension.js:110
+#: extensions/window-list/extension.js:106
 msgid "Close"
 msgstr "关闭"
 
-#: extensions/window-list/extension.js:120
+#: extensions/window-list/extension.js:125
 msgid "Unminimize"
 msgstr "取消最小化"
 
-#: extensions/window-list/extension.js:121
+#: extensions/window-list/extension.js:126
 msgid "Minimize"
 msgstr "最小化"
 
-#: extensions/window-list/extension.js:127
+#: extensions/window-list/extension.js:132
 msgid "Unmaximize"
 msgstr "取消最大化"
 
-#: extensions/window-list/extension.js:128
+#: extensions/window-list/extension.js:133
 msgid "Maximize"
 msgstr "最大化"
 
-#: extensions/window-list/extension.js:411
+#: extensions/window-list/extension.js:408
 msgid "Minimize all"
 msgstr "全部最小化"
 
-#: extensions/window-list/extension.js:419
+#: extensions/window-list/extension.js:414
 msgid "Unminimize all"
 msgstr "全部取消最小化"
 
-#: extensions/window-list/extension.js:427
+#: extensions/window-list/extension.js:420
 msgid "Maximize all"
 msgstr "全部最大化"
 
-#: extensions/window-list/extension.js:436
+#: extensions/window-list/extension.js:429
 msgid "Unmaximize all"
 msgstr "全部取消最大化"
 
-#: extensions/window-list/extension.js:445
+#: extensions/window-list/extension.js:438
 msgid "Close all"
 msgstr "全部关闭"
 
-#: extensions/window-list/extension.js:669
-#: extensions/workspace-indicator/extension.js:30
+#: extensions/window-list/extension.js:646
+#: extensions/workspace-indicator/extension.js:26
 msgid "Workspace Indicator"
 msgstr "工作区指示器"
 
-#: extensions/window-list/extension.js:828
+#: extensions/window-list/extension.js:811
 msgid "Window List"
 msgstr "窗口列表"
 
@@ -288,10 +300,10 @@ msgstr "何时分组窗口"
 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
 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”, “auto” and “always”."
 msgstr ""
-"决定何时对窗口列表上的同一应用的窗口进行分组。可用值有“never”(从"
-"不)、“auto”(自动)和“always”(总是)。"
+"决定何时对窗口列表上的同一应用的窗口进行分组。可用值有“never”（从"
+"不）、“auto”（自动）和“always”（总是）。"
 
 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
 msgid "Show the window list on all monitors"
@@ -303,35 +315,35 @@ msgid ""
 "primary one."
 msgstr "是否在所有连接的显示器上显示窗口列表或仅在主显示器上显示。"
 
-#: extensions/window-list/prefs.js:32
+#: extensions/window-list/prefs.js:28
 msgid "Window Grouping"
 msgstr "窗口分组"
 
-#: extensions/window-list/prefs.js:50
+#: extensions/window-list/prefs.js:46
 msgid "Never group windows"
 msgstr "从不将窗口分组"
 
-#: extensions/window-list/prefs.js:51
+#: extensions/window-list/prefs.js:47
 msgid "Group windows when space is limited"
 msgstr "当空间有限时将窗口分组"
 
-#: extensions/window-list/prefs.js:52
+#: extensions/window-list/prefs.js:48
 msgid "Always group windows"
 msgstr "总是对窗口分组"
 
-#: extensions/window-list/prefs.js:75
+#: extensions/window-list/prefs.js:71
 msgid "Show on all monitors"
 msgstr "在所有显示器上显示"
 
-#: extensions/workspace-indicator/prefs.js:141
+#: extensions/workspace-indicator/prefs.js:134
 msgid "Workspace Names"
 msgstr "工作区名称"
 
-#: extensions/workspace-indicator/prefs.js:157
+#: extensions/workspace-indicator/prefs.js:150
 msgid "Name"
 msgstr "名称"
 
-#: extensions/workspace-indicator/prefs.js:198
+#: extensions/workspace-indicator/prefs.js:190
 #, javascript-format
 msgid "Workspace %d"
 msgstr "工作区 %d"