Bump version to 3.31.92

Update NEWS.

.eslintrc.json

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

.gitlab-ci.yml

@@ -1,13 +1,40 @@
-image: fedora:latest
-
 stages:
+ - commit_check
+ - source_check
  - build
 
-before_script:
-  - dnf install -y meson gettext mozjs52-devel
+variables:
+ LINT_LOG: "eslint-report.txt"
+
+.only_default: &only_default
+    only:
+        - branches
+        - tags
+        - merge_requests
+
+check_commit_log:
+    image: registry.gitlab.gnome.org/gnome/gjs:fedora.static-analysis
+    stage: commit_check
+    script:
+        - ./.gitlab-ci/check-commit-log.sh
+    only:
+        - merge_requests
+
+eslint:
+  image: registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v1
+  stage: source_check
+  script:
+    - sh lint/generate-report.sh -o $LINT_LOG || { cat $LINT_LOG; false; }
+  <<: *only_default
+  artifacts:
+    paths:
+      - ${LINT_LOG}
+    when: on_failure
 
 build-shell-extensions:
+  image: registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v1
   stage: build
   script:
     - meson _build .
     - ninja -C _build test install
+  <<: *only_default

.gitlab-ci/check-commit-log.sh

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+
+if [ -z "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then
+  echo Cannot review non-merge request
+  exit 1
+fi
+
+git fetch $CI_MERGE_REQUEST_PROJECT_URL.git $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
+
+branch_point=$(git merge-base HEAD FETCH_HEAD)
+
+commits=$(git log --format='format:%H' $branch_point..$CI_COMMIT_SHA)
+
+if [ -z "$commits" ]; then
+  echo Commit range empty
+  exit 1
+fi
+
+function commit_message_has_url() {
+  commit=$1
+  commit_message=$(git show -s --format='format:%b' $commit)
+  echo "$commit_message" | grep -qe "\($CI_MERGE_REQUEST_PROJECT_URL/\(issues\|merge_requests\)/[0-9]\+\|https://bugzilla.gnome.org/show_bug.cgi?id=[0-9]\+\)"
+  return $?
+}
+
+for commit in $commits; do
+  if ! commit_message_has_url $commit; then
+    echo "Missing merge request or issue URL on commit $(echo $commit | cut -c -8)"
+    exit 1
+  fi
+done

NEWS

@@ -1,3 +1,53 @@
+3.31.92
+=======
+* Misc. bug fixes and cleanups [Florian; !57, !58, !59, !60]
+
+Contributors:
+  Florian Müllner
+
+3.31.91
+=======
+* apps-menu: Remove outdated legacy-tray handling [Florian; !53]
+* user-theme: Allow using XDG user data dir [Tomasz; !55]
+* Misc. bug fixes and cleanups [Florian; !52, !54, !56]
+
+Contributors:
+  Tomasz Gąsior, Florian Müllner
+
+Translators:
+  Matej Urbančič [sl], Gun Chleoc [gd]
+
+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]

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.

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, 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,27 +1,19 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* exported init enable disable */
 
-const Atk = imports.gi.Atk;
+const {
+    Atk, Clutter, Gio, GLib, GMenu, GObject, Gtk, Meta, Shell, St
+} = imports.gi;
 const DND = imports.ui.dnd;
-const GMenu = imports.gi.GMenu;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
-const Clutter = imports.gi.Clutter;
 const Main = imports.ui.main;
-const Meta = imports.gi.Meta;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
-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();
 
@@ -30,11 +22,14 @@ const HORIZ_FACTOR = 5;
 const MENU_HEIGHT_OFFSET = 132;
 const NAVIGATION_REGION_OVERSHOOT = 50;
 
+Gio._promisify(Gio._LocalFilePrototype, 'query_info_async', 'query_info_finish');
+Gio._promisify(Gio._LocalFilePrototype, 'set_attributes_async', 'set_attributes_finish');
+
 class ActivitiesMenuItem extends PopupMenu.PopupBaseMenuItem {
     constructor(button) {
         super();
         this._button = button;
-        this.actor.add_child(new St.Label({ text: _("Activities Overview") }));
+        this.actor.add_child(new St.Label({ text: _('Activities Overview') }));
     }
 
     activate(event) {
@@ -42,7 +37,7 @@ class ActivitiesMenuItem extends PopupMenu.PopupBaseMenuItem {
         Main.overview.toggle();
         super.activate(event);
     }
-};
+}
 
 class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
     constructor(button, app) {
@@ -53,8 +48,11 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
         this._iconBin = new St.Bin();
         this.actor.add_child(this._iconBin);
 
-        let appLabel = new St.Label({ text: app.get_name(), y_expand: true,
-                                      y_align: Clutter.ActorAlign.CENTER });
+        let appLabel = new St.Label({
+            text: app.get_name(),
+            y_expand: true,
+            y_align: Clutter.ActorAlign.CENTER
+        });
         this.actor.add_child(appLabel);
         this.actor.label_actor = appLabel;
 
@@ -75,18 +73,11 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
                 return maybeStartDrag.call(draggable, event);
             return false;
         };
-
-        draggable.connect('drag-begin', () => {
-            Shell.util_set_hidden_from_pick(Main.legacyTray.actor, true);
-        });
-        draggable.connect('drag-end', () => {
-            Shell.util_set_hidden_from_pick(Main.legacyTray.actor, false);
-        });
     }
 
     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 +103,7 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
     _updateIcon() {
         this._iconBin.set_child(this.getDragActor());
     }
-};
+}
 
 class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
     constructor(button, category) {
@@ -127,14 +118,14 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
         if (this._category)
             name = this._category.get_name();
         else
-            name = _("Favorites");
+            name = _('Favorites');
 
         this.actor.add_child(new St.Label({ text: name }));
         this.actor.connect('motion-event', this._onMotionEvent.bind(this));
     }
 
     activate(event) {
-        this._button.selectCategory(this._category, this);
+        this._button.selectCategory(this._category);
         this._button.scrollToCatButton(this);
         super.activate(event);
     }
@@ -191,7 +182,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 +212,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 +246,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() {
@@ -315,48 +306,32 @@ class DesktopTarget {
         return source._app.app_info;
     }
 
-    _touchFile(file) {
-        let queryFlags = Gio.FileQueryInfoFlags.NONE;
-        let ioPriority = GLib.PRIORITY_DEFAULT;
-
-        let info = new Gio.FileInfo();
-        info.set_attribute_uint64(Gio.FILE_ATTRIBUTE_TIME_ACCESS,
-                                  GLib.get_real_time());
-        file.set_attributes_async (info, queryFlags, ioPriority, null,
-            (o, res) => {
-                try {
-                    o.set_attributes_finish(res);
-                } catch(e) {
-                    log('Failed to update access time: ' + e.message);
-                }
-            });
-    }
-
-    _markTrusted(file) {
+    async _markTrusted(file) {
         let modeAttr = Gio.FILE_ATTRIBUTE_UNIX_MODE;
         let trustedAttr = 'metadata::trusted';
         let queryFlags = Gio.FileQueryInfoFlags.NONE;
         let ioPriority = GLib.PRIORITY_DEFAULT;
 
-        file.query_info_async(modeAttr, queryFlags, ioPriority, null,
-            (o, res) => {
-                try {
-                    let info = o.query_info_finish(res);
-                    let mode = info.get_attribute_uint32(modeAttr) | 0o100;
+        try {
+            let info = await file.query_info_async(modeAttr, queryFlags, ioPriority, null);
 
-                    info.set_attribute_uint32(modeAttr, mode);
-                    info.set_attribute_string(trustedAttr, 'yes');
-                    file.set_attributes_async (info, queryFlags, ioPriority, null,
-                        (o, res) => {
-                            o.set_attributes_finish(res);
+            let mode = info.get_attribute_uint32(modeAttr) | 0o100;
+            info.set_attribute_uint32(modeAttr, mode);
+            info.set_attribute_string(trustedAttr, 'yes');
+            await file.set_attributes_async(info, queryFlags, ioPriority, null);
 
-                            // Hack: force nautilus to reload file info
-                            this._touchFile(file);
-                        });
-                } catch(e) {
-                    log('Failed to mark file as trusted: ' + e.message);
-                }
-            });
+            // Hack: force nautilus to reload file info
+            info = new Gio.FileInfo();
+            info.set_attribute_uint64(Gio.FILE_ATTRIBUTE_TIME_ACCESS,
+                                      GLib.get_real_time());
+            try {
+                await file.set_attributes_async(info, queryFlags, ioPriority, null);
+            } catch (e) {
+                log(`Failed to update access time: ${e.message}`);
+            }
+        } catch (e) {
+            log(`Failed to mark file as trusted: ${e.message}`);
+        }
     }
 
     destroy() {
@@ -367,7 +342,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 +350,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,47 +366,49 @@ 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' });
 
-        this._label = new St.Label({ text: _("Applications"),
-                                     y_expand: true,
-                                     y_align: Clutter.ActorAlign.CENTER });
+        this._label = new St.Label({
+            text: _('Applications'),
+            y_expand: true,
+            y_align: Clutter.ActorAlign.CENTER
+        });
         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));
@@ -473,8 +450,10 @@ class ApplicationsButton extends PanelMenu.Button {
     }
 
     _createVertSeparator() {
-        let separator = new St.DrawingArea({ style_class: 'calendar-vertical-separator',
-                                             pseudo_class: 'highlighted' });
+        let separator = new St.DrawingArea({
+            style_class: 'calendar-vertical-separator',
+            pseudo_class: 'highlighted'
+        });
         separator.connect('repaint', this._onVertSepRepaint.bind(this));
         return separator;
     }
@@ -486,12 +465,12 @@ class ApplicationsButton extends PanelMenu.Button {
         this._tree.disconnect(this._treeChangedId);
         this._tree = null;
 
+        let handler = Main.sessionMode.hasOverview ?
+            Main.overview.toggle.bind(Main.overview) : null;
         Main.wm.setCustomKeybindingHandler('panel-main-menu',
                                            Shell.ActionMode.NORMAL |
                                            Shell.ActionMode.OVERVIEW,
-                                           Main.sessionMode.hasOverview ?
-                                           Main.overview.toggle.bind(Main.overview) :
-                                           null);
+                                           handler);
 
         this._desktopTarget.destroy();
     }
@@ -507,8 +486,8 @@ class ApplicationsButton extends PanelMenu.Button {
     _onMenuKeyPress(actor, event) {
         let symbol = event.get_key_symbol();
         if (symbol == Clutter.KEY_Left || symbol == Clutter.KEY_Right) {
-            let direction = symbol == Clutter.KEY_Left ? Gtk.DirectionType.LEFT
-                                                       : Gtk.DirectionType.RIGHT;
+            let direction = symbol == Clutter.KEY_Left ?
+                Gtk.DirectionType.LEFT : Gtk.DirectionType.RIGHT;
             if (this.menu.actor.navigate_focus(global.stage.key_focus, direction, false))
                 return true;
         }
@@ -521,7 +500,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,21 +510,21 @@ 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() {
         Main.wm.setCustomKeybindingHandler('panel-main-menu',
                                            Shell.ActionMode.NORMAL |
                                            Shell.ActionMode.OVERVIEW,
-                                           () => { this.menu.toggle(); });
+                                           () => this.menu.toggle());
     }
 
     _redisplay() {
@@ -563,7 +542,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);
@@ -616,9 +595,12 @@ class ApplicationsButton extends PanelMenu.Button {
         this.menu.addMenuItem(section);
         this.mainBox = new St.BoxLayout({ vertical: false });
         this.leftBox = new St.BoxLayout({ vertical: true });
-        this.applicationsScrollBox = new St.ScrollView({ x_fill: true, y_fill: false,
-                                                         y_align: St.Align.START,
-                                                         style_class: 'apps-menu vfade' });
+        this.applicationsScrollBox = new St.ScrollView({
+            x_fill: true,
+            y_fill: false,
+            y_align: St.Align.START,
+            style_class: 'apps-menu vfade'
+        });
         this.applicationsScrollBox.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
         let vscroll = this.applicationsScrollBox.get_vscroll_bar();
         vscroll.connect('scroll-start', () => {
@@ -627,21 +609,30 @@ class ApplicationsButton extends PanelMenu.Button {
         vscroll.connect('scroll-stop', () => {
             this.menu.passEvents = false;
         });
-        this.categoriesScrollBox = new St.ScrollView({ x_fill: true, y_fill: false,
-                                                       y_align: St.Align.START,
-                                                       style_class: 'vfade' });
+        this.categoriesScrollBox = new St.ScrollView({
+            x_fill: true,
+            y_fill: false,
+            y_align: St.Align.START,
+            style_class: 'vfade'
+        });
         this.categoriesScrollBox.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
         vscroll = this.categoriesScrollBox.get_vscroll_bar();
-        vscroll.connect('scroll-start', () => { this.menu.passEvents = true; });
-        vscroll.connect('scroll-stop', () => { this.menu.passEvents = false; });
-        this.leftBox.add(this.categoriesScrollBox, { expand: true,
-                                                     x_fill: true, y_fill: true,
-                                                     y_align: St.Align.START });
+        vscroll.connect('scroll-start', () => this.menu.passEvents = true);
+        vscroll.connect('scroll-stop', () => this.menu.passEvents = false);
+        this.leftBox.add(this.categoriesScrollBox, {
+            expand: true,
+            x_fill: true,
+            y_fill: true,
+            y_align: St.Align.START
+        });
 
         let activities = new ActivitiesMenuItem(this);
-        this.leftBox.add(activities.actor, { expand: false,
-                                             x_fill: true, y_fill: false,
-                                             y_align: St.Align.START });
+        this.leftBox.add(activities.actor, {
+            expand: false,
+            x_fill: true,
+            y_fill: false,
+            y_align: St.Align.START
+        });
 
         this.applicationsBox = new St.BoxLayout({ vertical: true });
         this.applicationsScrollBox.add_actor(this.applicationsBox);
@@ -649,14 +640,22 @@ 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.applicationsScrollBox, { expand: true, x_fill: true, 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
@@ -668,28 +667,33 @@ class ApplicationsButton extends PanelMenu.Button {
         let iter = root.iter();
         let nextType;
         while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
-            if (nextType == GMenu.TreeItemType.DIRECTORY) {
-                let dir = iter.get_directory();
-                if (!dir.get_is_nodisplay()) {
-                    let categoryId = dir.get_menu_id();
-                    this.applicationsByCategory[categoryId] = [];
-                    this._loadCategory(categoryId, dir);
-                    if (this.applicationsByCategory[categoryId].length > 0) {
-                        let categoryMenuItem = new CategoryMenuItem(this, dir);
-                        this.categoriesBox.add_actor(categoryMenuItem.actor);
-                    }
-                }
+            if (nextType != GMenu.TreeItemType.DIRECTORY)
+                continue;
+
+            let dir = iter.get_directory();
+            if (dir.get_is_nodisplay())
+                continue;
+
+            let categoryId = dir.get_menu_id();
+            this.applicationsByCategory[categoryId] = [];
+            this._loadCategory(categoryId, dir);
+            if (this.applicationsByCategory[categoryId].length > 0) {
+                let categoryMenuItem = new CategoryMenuItem(this, dir);
+                this.categoriesBox.add_actor(categoryMenuItem.actor);
             }
         }
 
         //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 +708,28 @@ class ApplicationsButton extends PanelMenu.Button {
     }
 
     _displayButtons(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);
+        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);
+        }
     }
 
-    _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,11 +742,7 @@ class ApplicationsButton extends PanelMenu.Button {
 
         return applist;
     }
-
-    destroy() {
-        super.destroy();
-    }
-};
+});
 
 let appsMenuButton;
 let activitiesButton;
@@ -762,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);
         });
     }
@@ -106,13 +105,13 @@ class WindowMover {
         });
         data.windows = windows;
     }
-};
+}
 
 let prevCheckWorkspaces;
 let winMover;
 
 function init() {
-    Convenience.initTranslations();
+    ExtensionUtils.initTranslations();
 }
 
 function myCheckWorkspaces() {
@@ -126,9 +125,9 @@ function myCheckWorkspaces() {
     }
 
     // make sure the original method only removes empty workspaces at the end
-    keepAliveWorkspaces.forEach(ws => { ws._keepAliveId = 1; });
+    keepAliveWorkspaces.forEach(ws => ws._keepAliveId = 1);
     prevCheckWorkspaces.call(this);
-    keepAliveWorkspaces.forEach(ws => { delete ws._keepAliveId; });
+    keepAliveWorkspaces.forEach(ws => delete ws._keepAliveId);
 
     return false;
 }

extensions/auto-move-windows/prefs.js

@@ -1,17 +1,14 @@
 // -*- 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;
-const Gtk = imports.gi.Gtk;
+const { Gio, GObject, Gtk } = imports.gi;
 
 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_KEY = 'application-list';
 
@@ -32,40 +29,53 @@ 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;
 
         this._store = new Gtk.ListStore();
-        this._store.set_column_types([Gio.AppInfo, GObject.TYPE_STRING, Gio.Icon, GObject.TYPE_INT,
-                                      Gtk.Adjustment]);
+        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);
 
 
-        this._treeView = new Gtk.TreeView({ model: this._store,
-                                            hexpand: true, vexpand: true });
+        this._treeView = new Gtk.TreeView({
+            model: this._store,
+            hexpand: true,
+            vexpand: true
+        });
         this._treeView.get_selection().set_mode(Gtk.SelectionMode.SINGLE);
 
-        let appColumn = new Gtk.TreeViewColumn({ expand: true, sort_column_id: Columns.DISPLAY_NAME,
-                                                 title: _("Application") });
+        let appColumn = new Gtk.TreeViewColumn({
+            expand: true,
+            sort_column_id: Columns.DISPLAY_NAME,
+            title: _('Application')
+        });
         let iconRenderer = new Gtk.CellRendererPixbuf;
         appColumn.pack_start(iconRenderer, false);
-        appColumn.add_attribute(iconRenderer, "gicon", Columns.ICON);
+        appColumn.add_attribute(iconRenderer, 'gicon', Columns.ICON);
         let nameRenderer = new Gtk.CellRendererText;
         appColumn.pack_start(nameRenderer, true);
-        appColumn.add_attribute(nameRenderer, "text", Columns.DISPLAY_NAME);
+        appColumn.add_attribute(nameRenderer, 'text', Columns.DISPLAY_NAME);
         this._treeView.append_column(appColumn);
 
-        let workspaceColumn = new Gtk.TreeViewColumn({ title: _("Workspace"),
-                                                       sort_column_id: Columns.WORKSPACE });
+        let workspaceColumn = new Gtk.TreeViewColumn({
+            title: _('Workspace'),
+            sort_column_id: Columns.WORKSPACE
+        });
         let workspaceRenderer = new Gtk.CellRendererSpin({ editable: true });
         workspaceRenderer.connect('edited', this._workspaceEdited.bind(this));
         workspaceColumn.pack_start(workspaceRenderer, true);
-        workspaceColumn.add_attribute(workspaceRenderer, "adjustment", Columns.ADJUSTMENT);
-        workspaceColumn.add_attribute(workspaceRenderer, "text", Columns.WORKSPACE);
+        workspaceColumn.add_attribute(workspaceRenderer, 'adjustment', Columns.ADJUSTMENT);
+        workspaceColumn.add_attribute(workspaceRenderer, 'text', Columns.WORKSPACE);
         this._treeView.append_column(workspaceColumn);
 
         scrolled.add(this._treeView);
@@ -74,13 +84,15 @@ const Widget = GObject.registerClass({
         toolbar.get_style_context().add_class(Gtk.STYLE_CLASS_INLINE_TOOLBAR);
         this.add(toolbar);
 
-        let newButton = new Gtk.ToolButton({ icon_name: 'bookmark-new-symbolic',
-                                             label: _("Add Rule"),
-                                             is_important: true });
+        let newButton = new Gtk.ToolButton({
+            icon_name: 'bookmark-new-symbolic',
+            label: _('Add Rule'),
+            is_important: true
+        });
         newButton.connect('clicked', this._createNew.bind(this));
         toolbar.add(newButton);
 
-        let delButton = new Gtk.ToolButton({ icon_name: 'edit-delete-symbolic'  });
+        let delButton = new Gtk.ToolButton({ icon_name: 'edit-delete-symbolic' });
         delButton.connect('clicked', this._deleteSelected.bind(this));
         toolbar.add(delButton);
 
@@ -95,17 +107,21 @@ const Widget = GObject.registerClass({
     }
 
     _createNew() {
-        let dialog = new Gtk.Dialog({ title: _("Create new matching rule"),
-                                      transient_for: this.get_toplevel(),
-                                      use_header_bar: true,
-                                      modal: true });
+        let dialog = new Gtk.Dialog({
+            title: _('Create new matching rule'),
+            transient_for: this.get_toplevel(),
+            use_header_bar: true,
+            modal: true
+        });
         dialog.add_button(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL);
-        let addButton = dialog.add_button(_("Add"), Gtk.ResponseType.OK);
+        let addButton = dialog.add_button(_('Add'), Gtk.ResponseType.OK);
         dialog.set_default_response(Gtk.ResponseType.OK);
 
-        let grid = new Gtk.Grid({ column_spacing: 10,
-                                  row_spacing: 15,
-                                  margin: 10 });
+        let grid = new Gtk.Grid({
+            column_spacing: 10,
+            row_spacing: 15,
+            margin: 10
+        });
         dialog._appChooser = new Gtk.AppChooserWidget({ show_all: true });
         dialog._appChooser.connect('application-selected', (w, appInfo) => {
             addButton.sensitive = appInfo && this._checkId(appInfo.get_id());
@@ -114,14 +130,19 @@ const Widget = GObject.registerClass({
         addButton.sensitive = appInfo && this._checkId(appInfo.get_id());
 
         grid.attach(dialog._appChooser, 0, 0, 2, 1);
-        grid.attach(new Gtk.Label({ label: _("Workspace"),
-                                    halign: Gtk.Align.END }), 0, 1, 1, 1);
-        let adjustment = new Gtk.Adjustment({ lower: 1,
-                                              upper: WORKSPACE_MAX,
-                                              step_increment: 1
-                                            });
-        dialog._spin = new Gtk.SpinButton({ adjustment: adjustment,
-                                            snap_to_ticks: true });
+        grid.attach(new Gtk.Label({
+            label: _('Workspace'),
+            halign: Gtk.Align.END
+        }), 0, 1, 1, 1);
+        let adjustment = new Gtk.Adjustment({
+            lower: 1,
+            upper: WORKSPACE_MAX,
+            step_increment: 1
+        });
+        dialog._spin = new Gtk.SpinButton({
+            adjustment: adjustment,
+            snap_to_ticks: true
+        });
         dialog._spin.set_value(1);
         grid.attach(dialog._spin, 1, 1, 1, 1);
         dialog.get_content_area().add(grid);
@@ -143,14 +164,7 @@ const Widget = GObject.registerClass({
             this._appendItem(appInfo.get_id(), index);
             this._changedPermitted = true;
 
-            let iter = this._store.append();
-            let adj = new Gtk.Adjustment({ lower: 1,
-                                           upper: WORKSPACE_MAX,
-                                           step_increment: 1,
-                                           value: index });
-            this._store.set(iter,
-                            [Columns.APPINFO, Columns.ICON, Columns.DISPLAY_NAME, Columns.WORKSPACE, Columns.ADJUSTMENT],
-                            [appInfo, appInfo.get_icon(), appInfo.get_display_name(), index, adj]);
+            this._appendRow(appInfo, index);
 
             dialog.destroy();
         });
@@ -158,7 +172,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 +189,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 +206,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);
@@ -200,28 +214,37 @@ const Widget = GObject.registerClass({
                 continue;
             validItems.push(currentItems[i]);
 
-            let iter = this._store.append();
-            let adj = new Gtk.Adjustment({ lower: 1,
-                                           upper: WORKSPACE_MAX,
-                                           step_increment: 1,
-                                           value: index });
-            this._store.set(iter,
-                            [Columns.APPINFO, Columns.ICON, Columns.DISPLAY_NAME, Columns.WORKSPACE, Columns.ADJUSTMENT],
-                            [appInfo, appInfo.get_icon(), appInfo.get_display_name(), parseInt(index), adj]);
+            this._appendRow(appInfo, parseInt(index));
         }
 
         if (validItems.length != currentItems.length) // some items were filtered out
             this._settings.set_strv(SETTINGS_KEY, validItems);
     }
 
+    _appendRow(appInfo, workspace) {
+        let iter = this._store.append();
+        let icon = appInfo.get_icon();
+        let displayName = appInfo.get_display_name();
+        let adj = new Gtk.Adjustment({
+            lower: 1,
+            upper: WORKSPACE_MAX,
+            step_increment: 1,
+            value: workspace
+        });
+        let { APPINFO, ICON, DISPLAY_NAME, WORKSPACE, ADJUSTMENT } = Columns;
+        this._store.set(iter,
+                        [APPINFO, ICON, DISPLAY_NAME, WORKSPACE, ADJUSTMENT],
+                        [appInfo, icon, displayName, workspace, adj]);
+    }
+
     _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 +263,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,21 +1,16 @@
+/* exported init enable disable */
 // Drive menu extension
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const St = imports.gi.St;
-const Shell = imports.gi.Shell;
+const { Gio, GObject, Shell, St } = imports.gi;
 
 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) {
@@ -27,8 +22,10 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
 
         this.mount = mount;
 
-        let ejectIcon = new St.Icon({ icon_name: 'media-eject-symbolic',
-                                      style_class: 'popup-menu-icon ' });
+        let ejectIcon = new St.Icon({
+            icon_name: 'media-eject-symbolic',
+            style_class: 'popup-menu-icon'
+        });
         let ejectButton = new St.Button({ child: ejectIcon });
         ejectButton.connect('clicked', this._eject.bind(this));
         this.actor.add(ejectButton);
@@ -68,24 +65,24 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
     }
 
     _eject() {
-        let mountOp = new ShellMountOperation.ShellMountOperation(this.mount);
+        let unmountArgs = [
+            Gio.MountUnmountFlags.NONE,
+            (new ShellMountOperation.ShellMountOperation(this.mount)).mountOp,
+            null // Gio.Cancellable
+        ];
 
         if (this.mount.can_eject())
-            this.mount.eject_with_operation(Gio.MountUnmountFlags.NONE,
-                                            mountOp.mountOp,
-                                            null, // Gio.Cancellable
+            this.mount.eject_with_operation(...unmountArgs,
                                             this._ejectFinish.bind(this));
         else
-            this.mount.unmount_with_operation(Gio.MountUnmountFlags.NONE,
-                                              mountOp.mountOp,
-                                              null, // Gio.Cancellable
+            this.mount.unmount_with_operation(...unmountArgs,
                                               this._unmountFinish.bind(this));
     }
 
     _unmountFinish(mount, result) {
         try {
             mount.unmount_with_operation_finish(result);
-        } catch(e) {
+        } catch (e) {
             this._reportFailure(e);
         }
     }
@@ -93,14 +90,14 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
     _ejectFinish(mount, result) {
         try {
             mount.eject_with_operation_finish(result);
-        } catch(e) {
+        } catch (e) {
             this._reportFailure(e);
         }
     }
 
     _reportFailure(exception) {
         // TRANSLATORS: %s is the filesystem name
-        let msg = _("Ejecting drive “%s” failed:").format(this.mount.get_name());
+        let msg = _('Ejecting drive “%s” failed:').format(this.mount.get_name());
         Main.notifyError(msg, exception.message);
     }
 
@@ -111,19 +108,22 @@ 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',
-                                 style_class: 'system-status-icon' });
+        let icon = new St.Icon({
+            icon_name: 'media-eject-symbolic',
+            style_class: 'system-status-icon'
+        });
 
         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,12 +135,12 @@ class DriveMenu extends PanelMenu.Button {
             this._updateMenuVisibility();
         });
 
-        this._mounts = [ ];
+        this._mounts = [];
 
         this._monitor.get_mounts().forEach(this._addMount.bind(this));
 
         this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-        this.menu.addAction(_("Open Files"), event => {
+        this.menu.addAction(_('Open Files'), event => {
             let appSystem = Shell.AppSystem.get_default();
             let app = appSystem.lookup_app('org.gnome.Nautilus.desktop');
             app.activate_full(-1, event.get_time());
@@ -151,9 +151,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,7 +174,7 @@ class DriveMenu extends PanelMenu.Button {
         log ('Removing a mount that was never added to the menu');
     }
 
-    destroy() {
+    _onDestroy() {
         if (this._addedId) {
             this._monitor.disconnect(this._addedId);
             this._monitor.disconnect(this._removedId);
@@ -182,12 +182,12 @@ class DriveMenu extends PanelMenu.Button {
             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,32 @@ 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++;
+                    let adjustments = [-1, -1, 1, 1]
+                        .map(v => v *= WINDOW_PLACEMENT_NATURAL_GAPS);
+                    let iAdjusted = rects[i].adjusted(...adjustments);
+                    let jAdjusted = rects[j].adjusted(...adjustments);
+                    if (i != j && iAdjusted.overlap(jAdjusted)) {
+                        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 +160,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 +170,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 +199,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 +241,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 +250,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 +282,3 @@ function disable() {
     global.stage.queue_relayout();
     resetState();
 }
-
-function init() {
-    /* do nothing */
-}

extensions/places-menu/extension.js

@@ -1,15 +1,11 @@
 /* -*- 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 St = imports.gi.St;
+const { Clutter, GObject, St } = imports.gi;
 
 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 +13,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;
@@ -27,16 +22,20 @@ class PlaceMenuItem extends PopupMenu.PopupBaseMenuItem {
         super();
         this._info = info;
 
-        this._icon = new St.Icon({ gicon: info.icon,
-                                   icon_size: PLACE_ICON_SIZE });
+        this._icon = new St.Icon({
+            gicon: info.icon,
+            icon_size: PLACE_ICON_SIZE
+        });
         this.actor.add_child(this._icon);
 
         this._label = new St.Label({ text: info.name, x_expand: true });
         this.actor.add_child(this._label);
 
         if (info.isRemovable()) {
-            this._ejectIcon = new St.Icon({ icon_name: 'media-eject-symbolic',
-                                            style_class: 'popup-menu-icon ' });
+            this._ejectIcon = new St.Icon({
+                icon_name: 'media-eject-symbolic',
+                style_class: 'popup-menu-icon'
+            });
             this._ejectButton = new St.Button({ child: this._ejectIcon });
             this._ejectButton.connect('clicked', info.eject.bind(info));
             this.actor.add_child(this._ejectButton);
@@ -65,35 +64,38 @@ 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"),
-                                   y_expand: true,
-                                   y_align: Clutter.ActorAlign.CENTER });
+        let label = new St.Label({
+            text: _('Places'),
+            y_expand: true,
+            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 +105,10 @@ class PlacesMenu extends PanelMenu.Button {
         }
     }
 
-    destroy() {
+    _onDestroy() {
         this.placesManager.destroy();
 
-        super.destroy();
+        super._onDestroy();
     }
 
     _redisplay(id) {
@@ -122,10 +124,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

@@ -1,18 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
-const Shell = imports.gi.Shell;
-const Mainloop = imports.mainloop;
+const { Gio, GLib, Shell } = imports.gi;
 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;
@@ -46,50 +38,36 @@ class PlaceInfo {
         return false;
     }
 
-    _createLaunchCallback(launchContext, tryMount) {
-        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;
-                            Main.notifyError(_("Failed to mount volume for “%s”").format(this.name), e.message);
-                            return;
-                        }
+    async _ensureMountAndLaunch(context, tryMount) {
+        try {
+            await this._launchDefaultForUri(this.file.get_uri(), context, null);
+        } catch (e) {
+            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_MOUNTED)) {
+                Main.notifyError(_('Failed to launch “%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);
-                        }
-                    });
-                } else {
-                    Main.notifyError(_("Failed to launch “%s”").format(this.name), e.message);
-                }
+            let source = {
+                get_icon: () => this.icon
+            };
+            let op = new ShellMountOperation.ShellMountOperation(source);
+            try {
+                await this._mountEnclosingVolume(0, op.mountOp, null);
+
+                if (tryMount)
+                    this._ensureMountAndLaunch(context, false);
+            } catch (e) {
+                if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
+                    Main.notifyError(_('Failed to mount volume for “%s”').format(this.name), e.message);
+            } finally {
+                op.close();
             }
         }
     }
 
     launch(timestamp) {
         let launchContext = global.create_app_launch_context(timestamp, -1);
-        let callback = this._createLaunchCallback(launchContext, true);
-        Gio.AppInfo.launch_default_for_uri_async(this.file.get_uri(),
-                                                 launchContext,
-                                                 null,
-                                                 callback);
+        this._ensureMountAndLaunch(launchContext, true);
     }
 
     getIcon() {
@@ -99,7 +77,7 @@ class PlaceInfo {
                                            let info = file.query_info_finish(result);
                                            this.icon = info.get_symbolic_icon();
                                            this.emit('changed');
-                                       } catch(e) {
+                                       } catch (e) {
                                            if (e instanceof Gio.IOErrorEnum)
                                                return;
                                            throw e;
@@ -127,18 +105,44 @@ class PlaceInfo {
         try {
             let info = this.file.query_info('standard::display-name', 0, null);
             return info.get_display_name();
-        } catch(e) {
+        } catch (e) {
             if (e instanceof Gio.IOErrorEnum)
                 return this.file.get_basename();
             throw e;
         }
     }
-};
+
+    _launchDefaultForUri(uri, context, cancel) {
+        return new Promise((resolve, reject) => {
+            Gio.AppInfo.launch_default_for_uri_async(uri, context, cancel, (o, res) => {
+                try {
+                    Gio.AppInfo.launch_default_for_uri_finish(res);
+                    resolve();
+                } catch (e) {
+                    reject(e);
+                }
+            });
+        });
+    }
+
+    _mountEnclosingVolume(flags, mountOp, cancel) {
+        return new Promise((resolve, reject) => {
+            this.file.mount_enclosing_volume(flags, mountOp, cancel, (o, res) => {
+                try {
+                    this.file.mount_enclosing_volume_finish(res);
+                    resolve();
+                } catch (e) {
+                    reject(e);
+                }
+            });
+        });
+    }
+}
 Signals.addSignalMethods(PlaceInfo.prototype);
 
 class RootInfo extends PlaceInfo {
     _init() {
-        super._init('devices', Gio.File.new_for_path('/'), _("Computer"));
+        super._init('devices', Gio.File.new_for_path('/'), _('Computer'));
 
         let busName = 'org.freedesktop.hostname1';
         let objPath = '/org/freedesktop/hostname1';
@@ -161,7 +165,7 @@ class RootInfo extends PlaceInfo {
         // GDBusProxy will emit a g-properties-changed when hostname1 goes down
         // ignore it
         if (proxy.g_name_owner) {
-            this.name = proxy.PrettyHostname || _("Computer");
+            this.name = proxy.PrettyHostname || _('Computer');
             this.emit('changed');
         }
     }
@@ -173,7 +177,7 @@ class RootInfo extends PlaceInfo {
         }
         super.destroy();
     }
-};
+}
 
 
 class PlaceDeviceInfo extends PlaceInfo {
@@ -191,24 +195,24 @@ class PlaceDeviceInfo extends PlaceInfo {
     }
 
     eject() {
-        let mountOp = new ShellMountOperation.ShellMountOperation(this._mount);
+        let unmountArgs = [
+            Gio.MountUnmountFlags.NONE,
+            (new ShellMountOperation.ShellMountOperation(this._mount)).mountOp,
+            null // Gio.Cancellable
+        ];
 
         if (this._mount.can_eject())
-            this._mount.eject_with_operation(Gio.MountUnmountFlags.NONE,
-                                             mountOp.mountOp,
-                                             null, // Gio.Cancellable
+            this._mount.eject_with_operation(...unmountArgs,
                                              this._ejectFinish.bind(this));
         else
-            this._mount.unmount_with_operation(Gio.MountUnmountFlags.NONE,
-                                               mountOp.mountOp,
-                                               null, // Gio.Cancellable
+            this._mount.unmount_with_operation(...unmountArgs,
                                                this._unmountFinish.bind(this));
     }
 
     _ejectFinish(mount, result) {
         try {
             mount.eject_with_operation_finish(result);
-        } catch(e) {
+        } catch (e) {
             this._reportFailure(e);
         }
     }
@@ -216,16 +220,16 @@ class PlaceDeviceInfo extends PlaceInfo {
     _unmountFinish(mount, result) {
         try {
             mount.unmount_with_operation_finish(result);
-        } catch(e) {
+        } catch (e) {
             this._reportFailure(e);
         }
     }
 
     _reportFailure(exception) {
-        let msg = _("Ejecting drive “%s” failed:").format(this._mount.get_name());
+        let msg = _('Ejecting drive “%s” failed:').format(this._mount.get_name());
         Main.notifyError(msg, exception.message);
     }
-};
+}
 
 class PlaceVolumeInfo extends PlaceInfo {
     _init(kind, volume) {
@@ -251,7 +255,7 @@ class PlaceVolumeInfo extends PlaceInfo {
     getIcon() {
         return this._volume.get_symbolic_icon();
     }
-};
+}
 
 const DEFAULT_DIRECTORIES = [
     GLib.UserDirectory.DIRECTORY_DOCUMENTS,
@@ -283,7 +287,7 @@ var PlacesManager = class {
         this._connectVolumeMonitorSignals();
         this._updateMounts();
 
-        this._bookmarksFile = this._findBookmarksFile()
+        this._bookmarksFile = this._findBookmarksFile();
         this._bookmarkTimeoutId = 0;
         this._monitor = null;
 
@@ -293,11 +297,12 @@ var PlacesManager = class {
                 if (this._bookmarkTimeoutId > 0)
                     return;
                 /* Defensive event compression */
-                this._bookmarkTimeoutId = Mainloop.timeout_add(100, () => {
-                    this._bookmarkTimeoutId = 0;
-                    this._reloadBookmarks();
-                    return false;
-                });
+                this._bookmarkTimeoutId = GLib.timeout_add(
+                    GLib.PRIORITY_DEFAULT, 100, () => {
+                        this._bookmarkTimeoutId = 0;
+                        this._reloadBookmarks();
+                        return false;
+                    });
             });
 
             this._reloadBookmarks();
@@ -305,9 +310,17 @@ var PlacesManager = class {
     }
 
     _connectVolumeMonitorSignals() {
-        const signals = ['volume-added', 'volume-removed', 'volume-changed',
-                         'mount-added', 'mount-removed', 'mount-changed',
-                         'drive-connected', 'drive-disconnected', 'drive-changed'];
+        const signals = [
+            'volume-added',
+            'volume-removed',
+            'volume-changed',
+            'mount-added',
+            'mount-removed',
+            'mount-changed',
+            'drive-connected',
+            'drive-disconnected',
+            'drive-changed'
+        ];
 
         this._volumeMonitorSignals = [];
         let func = this._updateMounts.bind(this);
@@ -328,18 +341,18 @@ var PlacesManager = class {
         if (this._monitor)
             this._monitor.cancel();
         if (this._bookmarkTimeoutId)
-            Mainloop.source_remove(this._bookmarkTimeoutId);
+            GLib.source_remove(this._bookmarkTimeoutId);
     }
 
     _updateSpecials() {
-        this._places.special.forEach(p => { p.destroy(); });
+        this._places.special.forEach(p => p.destroy());
         this._places.special = [];
 
         let homePath = GLib.get_home_dir();
 
         this._places.special.push(new PlaceInfo('special',
                                                 Gio.File.new_for_path(homePath),
-                                                _("Home")));
+                                                _('Home')));
 
         let specials = [];
         let dirs = DEFAULT_DIRECTORIES.slice();
@@ -355,7 +368,7 @@ var PlacesManager = class {
             let file = Gio.File.new_for_path(specialPath), info;
             try {
                 info = new PlaceInfo('special', file);
-            } catch(e) {
+            } catch (e) {
                 if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
                     continue;
                 throw e;
@@ -374,16 +387,16 @@ var PlacesManager = class {
         let networkMounts = [];
         let networkVolumes = [];
 
-        this._places.devices.forEach(p => { p.destroy(); });
+        this._places.devices.forEach(p => p.destroy());
         this._places.devices = [];
-        this._places.network.forEach(p => { p.destroy(); });
+        this._places.network.forEach(p => p.destroy());
         this._places.network = [];
 
         /* Add standard places */
         this._places.devices.push(new RootInfo());
         this._places.network.push(new PlaceInfo('network',
                                                 Gio.File.new_for_uri('network:///'),
-                                                _("Browse Network"),
+                                                _('Browse Network'),
                                                 'network-workgroup-symbolic'));
 
         /* first go through all connected drives */
@@ -391,13 +404,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.includes('network')) {
                     networkVolumes.push(volumes[j]);
                 } else {
                     let mount = volumes[j].get_mount();
-                    if(mount != null)
+                    if (mount != null)
                         this._addMount('devices', mount);
                 }
             }
@@ -405,8 +418,8 @@ 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');
@@ -414,18 +427,18 @@ var PlacesManager = class {
                 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();
@@ -522,7 +535,7 @@ var PlacesManager = class {
 
         try {
             devItem = new PlaceDeviceInfo(kind, mount);
-        } catch(e) {
+        } catch (e) {
             if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
                 return;
             throw e;
@@ -536,7 +549,7 @@ var PlacesManager = class {
 
         try {
             volItem = new PlaceVolumeInfo(kind, volume);
-        } catch(e) {
+        } catch (e) {
             if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
                 return;
             throw e;

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,21 +19,16 @@
  * 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;
+const { Meta, Shell, St } = imports.gi;
 
 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();
@@ -54,11 +50,12 @@ function flashMessage(message) {
     text.set_position(monitor.x + Math.floor(monitor.width / 2 - text.width / 2),
                       monitor.y + Math.floor(monitor.height / 2 - text.height / 2));
 
-    Tweener.addTween(text,
-                     { opacity: 0,
-                       time: MESSAGE_FADE_TIME,
-                       transition: 'easeOutQuad',
-                       onComplete: hideMessage });
+    Tweener.addTween(text, {
+        opacity: 0,
+        time: MESSAGE_FADE_TIME,
+        transition: 'easeOutQuad',
+        onComplete: hideMessage
+    });
 }
 
 let SIZES = [
@@ -76,8 +73,8 @@ function cycleScreenshotSizes(display, window, binding) {
     let backwards = (modifiers & Meta.VirtualModifier.SHIFT_MASK) != 0;
 
     // Unmaximize first
-    if (window.maximized_horizontally || window.maximizedVertically)
-        window.unmaximize(Meta.MaximizeFlags.HORIZONTAL | Meta.MaximizeFlags.VERTICAL);
+    if (window.get_maximized() != 0)
+        window.unmaximize(Meta.MaximizeFlags.BOTH);
 
     let workArea = window.get_work_area_current_monitor();
     let outerRect = window.get_frame_rect();
@@ -124,8 +121,8 @@ function cycleScreenshotSizes(display, 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 +134,14 @@ function cycleScreenshotSizes(display, 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,23 +1,21 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
-// Load shell theme from ~/.themes/name/gnome-shell
+// Load shell theme from ~/.local/share/themes/name/gnome-shell
+/* exported init */
 
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
+const { Gio, GLib } = imports.gi;
 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();
     }
 
@@ -32,36 +30,32 @@ class ThemeManager {
     }
 
     _changeTheme() {
-        let _stylesheet = null;
-        let _themeName = this._settings.get_string(SETTINGS_KEY);
+        let stylesheet = null;
+        let themeName = this._settings.get_string(SETTINGS_KEY);
 
-        if (_themeName) {
-            let _userCssStylesheet = 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;
-            else {
-                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';
-                    let file = Gio.file_new_for_path(_userCssStylesheet);
-                    if (file.query_exists(null)) {
-                        _stylesheet = _userCssStylesheet;
-                        break;
-                    }
-                }
-            }
+        if (themeName) {
+            let stylesheetPaths = [
+                [GLib.get_home_dir(), '.themes'],
+                [GLib.get_user_data_dir(), 'themes'],
+                ...GLib.get_system_data_dirs().map(dir => [dir, 'themes'])
+            ].map(themeDir => GLib.build_filenamev([
+                ...themeDir, themeName, 'gnome-shell', 'gnome-shell.css'
+            ]));
+
+            stylesheet = stylesheetPaths.find(path => {
+                let file = Gio.file_new_for_path(path);
+                return file.query_exists(null);
+            });
         }
 
-        if (_stylesheet)
-            global.log('loading user theme: ' + _stylesheet);
+        if (stylesheet)
+            global.log(`loading user theme: ${stylesheet}`);
         else
             global.log('loading default theme (Adwaita)');
-        Main.setThemeStylesheet(_stylesheet);
+        Main.setThemeStylesheet(stylesheet);
         Main.loadTheme();
     }
-};
+}
 
 function init() {
     return new ThemeManager();

extensions/window-list/extension.js

@@ -1,10 +1,5 @@
-const Clutter = imports.gi.Clutter;
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
-const Gtk = imports.gi.Gtk;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
+/* exported init */
+const { Clutter, Gio, GLib, GObject, Gtk, Meta, Shell, St } = imports.gi;
 
 const DND = imports.ui.dnd;
 const Main = imports.ui.main;
@@ -13,7 +8,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 +23,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 +43,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();
@@ -85,13 +79,10 @@ class WindowContextMenu extends PopupMenu.PopupMenu {
 
         this._maximizeItem = new PopupMenu.PopupMenuItem('');
         this._maximizeItem.connect('activate', () => {
-            if (this._metaWindow.maximized_vertically &&
-                this._metaWindow.maximized_horizontally)
-                this._metaWindow.unmaximize(Meta.MaximizeFlags.HORIZONTAL |
-                                            Meta.MaximizeFlags.VERTICAL);
+            if (this._metaWindow.get_maximized() == Meta.MaximizeFlags.BOTH)
+                this._metaWindow.unmaximize(Meta.MaximizeFlags.BOTH);
             else
-                this._metaWindow.maximize(Meta.MaximizeFlags.HORIZONTAL |
-                                          Meta.MaximizeFlags.VERTICAL);
+                this._metaWindow.maximize(Meta.MaximizeFlags.BOTH);
         });
         this.addMenuItem(this._maximizeItem);
 
@@ -103,7 +94,7 @@ class WindowContextMenu extends PopupMenu.PopupMenu {
                                      this._updateMaximizeItem.bind(this));
         this._updateMaximizeItem();
 
-        this._closeItem = new PopupMenu.PopupMenuItem(_("Close"));
+        this._closeItem = new PopupMenu.PopupMenuItem(_('Close'));
         this._closeItem.connect('activate', () => {
             this._metaWindow.delete(global.get_current_time());
         });
@@ -122,15 +113,15 @@ class WindowContextMenu extends PopupMenu.PopupMenu {
     }
 
     _updateMinimizeItem() {
-        this._minimizeItem.label.text = this._metaWindow.minimized ? _("Unminimize")
-                                                                   : _("Minimize");
+        this._minimizeItem.label.text = this._metaWindow.minimized ?
+            _('Unminimize') : _('Minimize');
     }
 
     _updateMaximizeItem() {
         let maximized = this._metaWindow.maximized_vertically &&
                         this._metaWindow.maximized_horizontally;
-        this._maximizeItem.label.text = maximized ? _("Unmaximize")
-                                                  : _("Maximize");
+        this._maximizeItem.label.text = maximized ?
+            _('Unmaximize') : _('Maximize');
     }
 
     _onDestroy() {
@@ -138,13 +129,16 @@ class WindowContextMenu extends PopupMenu.PopupMenu {
         this._metaWindow.disconnect(this._notifyMaximizedHId);
         this._metaWindow.disconnect(this._notifyMaximizedVId);
     }
-};
+}
 
 class WindowTitle {
     constructor(metaWindow) {
         this._metaWindow = metaWindow;
-        this.actor = new St.BoxLayout({ style_class: 'window-button-box',
-                                        x_expand: true, y_expand: true });
+        this.actor = new St.BoxLayout({
+            style_class: 'window-button-box',
+            x_expand: true,
+            y_expand: true
+        });
 
         this._icon = new St.Bin({ style_class: 'window-button-icon' });
         this.actor.add(this._icon);
@@ -194,8 +188,10 @@ class WindowTitle {
         if (app)
             this._icon.child = app.create_icon_texture(ICON_TEXTURE_SIZE);
         else
-            this._icon.child = new St.Icon({ icon_name: 'icon-missing',
-                                             icon_size: ICON_TEXTURE_SIZE });
+            this._icon.child = new St.Icon({
+                icon_name: 'icon-missing',
+                icon_size: ICON_TEXTURE_SIZE
+            });
     }
 
     _onDestroy() {
@@ -205,7 +201,7 @@ class WindowTitle {
         this._metaWindow.disconnect(this._notifyWmClass);
         this._metaWindow.disconnect(this._notifyAppId);
     }
-};
+}
 
 
 class BaseButton {
@@ -216,12 +212,13 @@ class BaseButton {
         this._perMonitor = perMonitor;
         this._monitorIndex = monitorIndex;
 
-        this.actor = new St.Button({ style_class: 'window-button',
-                                     x_fill: true,
-                                     y_fill: true,
-                                     can_focus: true,
-                                     button_mask: St.ButtonMask.ONE |
-                                                  St.ButtonMask.THREE });
+        this.actor = new St.Button({
+            style_class: 'window-button',
+            x_fill: true,
+            y_fill: true,
+            can_focus: true,
+            button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE
+        });
         this.actor._delegate = this;
 
         this.actor.connect('allocation-changed',
@@ -239,10 +236,10 @@ class BaseButton {
         if (this._perMonitor) {
             this._windowEnteredMonitorId =
                 global.display.connect('window-entered-monitor',
-                    this._windowEnteredOrLeftMonitor.bind(this));
+                                       this._windowEnteredOrLeftMonitor.bind(this));
             this._windowLeftMonitorId =
                 global.display.connect('window-left-monitor',
-                    this._windowEnteredOrLeftMonitor.bind(this));
+                                       this._windowEnteredOrLeftMonitor.bind(this));
         }
     }
 
@@ -257,7 +254,7 @@ class BaseButton {
         this._onClicked(this.actor, 1);
     }
 
-    _onClicked(actor, button) {
+    _onClicked(_actor, _button) {
         throw new Error('Not implemented');
     }
 
@@ -265,7 +262,7 @@ class BaseButton {
         return true;
     }
 
-    _onPopupMenu(actor) {
+    _onPopupMenu(_actor) {
         if (!this._canOpenPopupMenu() || this._contextMenu.isOpen)
             return;
         _openMenu(this._contextMenu);
@@ -282,7 +279,7 @@ class BaseButton {
             this.actor.remove_style_class_name('focused');
     }
 
-    _windowEnteredOrLeftMonitor(metaDisplay, monitorIndex, metaWindow) {
+    _windowEnteredOrLeftMonitor(_metaDisplay, _monitorIndex, _metaWindow) {
         throw new Error('Not implemented');
     }
 
@@ -322,7 +319,7 @@ class BaseButton {
             global.display.disconnect(this._windowLeftMonitorId);
         this._windowLeftMonitorId = 0;
     }
-};
+}
 
 
 class WindowButton extends BaseButton {
@@ -396,7 +393,7 @@ class WindowButton extends BaseButton {
         global.display.disconnect(this._notifyFocusId);
         this._contextMenu.destroy();
     }
-};
+}
 
 
 class AppContextMenu extends PopupMenu.PopupMenu {
@@ -405,37 +402,35 @@ class AppContextMenu extends PopupMenu.PopupMenu {
 
         this._appButton = appButton;
 
-        this._minimizeItem = new PopupMenu.PopupMenuItem(_("Minimize all"));
+        this._minimizeItem = new PopupMenu.PopupMenuItem(_('Minimize all'));
         this._minimizeItem.connect('activate', () => {
-            this._appButton.getWindowList().forEach(w => { w.minimize(); });
+            this._appButton.getWindowList().forEach(w => w.minimize());
         });
         this.addMenuItem(this._minimizeItem);
 
-        this._unminimizeItem = new PopupMenu.PopupMenuItem(_("Unminimize all"));
+        this._unminimizeItem = new PopupMenu.PopupMenuItem(_('Unminimize all'));
         this._unminimizeItem.connect('activate', () => {
-            this._appButton.getWindowList().forEach(w => { w.unminimize(); });
+            this._appButton.getWindowList().forEach(w => w.unminimize());
         });
         this.addMenuItem(this._unminimizeItem);
 
-        this._maximizeItem = new PopupMenu.PopupMenuItem(_("Maximize all"));
+        this._maximizeItem = new PopupMenu.PopupMenuItem(_('Maximize all'));
         this._maximizeItem.connect('activate', () => {
             this._appButton.getWindowList().forEach(w => {
-                w.maximize(Meta.MaximizeFlags.HORIZONTAL |
-                           Meta.MaximizeFlags.VERTICAL);
+                w.maximize(Meta.MaximizeFlags.BOTH);
             });
         });
         this.addMenuItem(this._maximizeItem);
 
-        this._unmaximizeItem = new PopupMenu.PopupMenuItem(_("Unmaximize all"));
+        this._unmaximizeItem = new PopupMenu.PopupMenuItem(_('Unmaximize all'));
         this._unmaximizeItem.connect('activate', () => {
             this._appButton.getWindowList().forEach(w => {
-                w.unmaximize(Meta.MaximizeFlags.HORIZONTAL |
-                             Meta.MaximizeFlags.VERTICAL);
+                w.unmaximize(Meta.MaximizeFlags.BOTH);
             });
         });
         this.addMenuItem(this._unmaximizeItem);
 
-        let item = new PopupMenu.PopupMenuItem(_("Close all"));
+        let item = new PopupMenu.PopupMenuItem(_('Close all'));
         item.connect('activate', () => {
             this._appButton.getWindowList().forEach(w => {
                 w.delete(global.get_current_time());
@@ -449,15 +444,15 @@ class AppContextMenu extends PopupMenu.PopupMenu {
         this._minimizeItem.actor.visible = windows.some(w => !w.minimized);
         this._unminimizeItem.actor.visible = windows.some(w => w.minimized);
         this._maximizeItem.actor.visible = windows.some(w => {
-            return !(w.maximized_horizontally && w.maximized_vertically);
+            return w.get_maximized() != Meta.MaximizeFlags.BOTH;
         });
         this._unmaximizeItem.actor.visible = windows.some(w => {
-            return w.maximized_horizontally && w.maximized_vertically;
+            return w.get_maximized() == Meta.MaximizeFlags.BOTH;
         });
 
         super.open(animate);
     }
-};
+}
 
 class AppButton extends BaseButton {
     constructor(app, perMonitor, monitorIndex) {
@@ -469,21 +464,29 @@ class AppButton extends BaseButton {
         let stack = new St.Widget({ layout_manager: new Clutter.BinLayout() });
         this.actor.set_child(stack);
 
-        this._singleWindowTitle = new St.Bin({ x_expand: true,
-                                               y_fill: true,
-                                               x_align: St.Align.START });
+        this._singleWindowTitle = new St.Bin({
+            x_expand: true,
+            y_fill: true,
+            x_align: St.Align.START
+        });
         stack.add_actor(this._singleWindowTitle);
 
-        this._multiWindowTitle = new St.BoxLayout({ style_class: 'window-button-box',
-                                                    x_expand: true });
+        this._multiWindowTitle = new St.BoxLayout({
+            style_class: 'window-button-box',
+            x_expand: true
+        });
         stack.add_actor(this._multiWindowTitle);
 
-        this._icon = new St.Bin({ style_class: 'window-button-icon',
-                                  child: app.create_icon_texture(ICON_TEXTURE_SIZE) });
+        this._icon = new St.Bin({
+            style_class: 'window-button-icon',
+            child: app.create_icon_texture(ICON_TEXTURE_SIZE)
+        });
         this._multiWindowTitle.add(this._icon);
 
-        let label = new St.Label({ text: app.get_name(),
-                                   y_align: Clutter.ActorAlign.CENTER });
+        let label = new St.Label({
+            text: app.get_name(),
+            y_align: Clutter.ActorAlign.CENTER
+        });
         this._multiWindowTitle.add(label);
         this._multiWindowTitle.label_actor = label;
 
@@ -544,7 +547,7 @@ class AppButton extends BaseButton {
         let rect = this._getIconGeometry();
 
         let windows = this.app.get_windows();
-        windows.forEach(w => { w.set_icon_geometry(rect); });
+        windows.forEach(w => w.set_icon_geometry(rect));
     }
 
     getWindowList() {
@@ -638,26 +641,32 @@ 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);
+        let container = new St.Widget({
+            layout_manager: new Clutter.BinLayout(),
+            x_expand: true,
+            y_expand: true
+        });
+        this.add_actor(container);
 
         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 });
+        this.statusLabel = new St.Label({
+            text: this._getStatusText(),
+            x_align: Clutter.ActorAlign.CENTER,
+            y_align: Clutter.ActorAlign.CENTER
+        });
         container.add_actor(this.statusLabel);
 
         this.workspacesItems = [];
@@ -668,7 +677,7 @@ class WorkspaceIndicator extends PanelMenu.Button {
         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' });
@@ -677,7 +686,7 @@ class WorkspaceIndicator extends PanelMenu.Button {
                                    this._updateMenu.bind(this));
     }
 
-    destroy() {
+    _onDestroy() {
         for (let i = 0; i < this._workspaceManagerSignals.length; i++)
             global.workspace_manager.disconnect(this._workspaceManagerSignals[i]);
 
@@ -686,7 +695,7 @@ class WorkspaceIndicator extends PanelMenu.Button {
             this._settingsChangedId = 0;
         }
 
-        super.destroy();
+        super._onDestroy();
     }
 
     _updateIndicator() {
@@ -712,12 +721,12 @@ class WorkspaceIndicator extends PanelMenu.Button {
         this.workspacesItems = [];
         this._currentWorkspace = workspaceManager.get_active_workspace().index();
 
-        for(let i = 0; i < workspaceManager.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);
             });
 
@@ -734,7 +743,7 @@ class WorkspaceIndicator extends PanelMenu.Button {
     _activate(index) {
         let workspaceManager = global.workspace_manager;
 
-        if(index >= 0 && index < workspaceManager.n_workspaces) {
+        if (index >= 0 && index < workspaceManager.n_workspaces) {
             let metaWorkspace = workspaceManager.get_workspace_by_index(index);
             metaWorkspace.activate(global.get_current_time());
         }
@@ -759,30 +768,34 @@ class WorkspaceIndicator extends PanelMenu.Button {
         if (actor.get_n_children() > 0)
             actor.get_first_child().allocate(box, flags);
     }
-};
+});
 
 class WindowList {
     constructor(perMonitor, monitor) {
         this._perMonitor = perMonitor;
         this._monitor = monitor;
 
-        this.actor = new St.Widget({ name: 'panel',
-                                     style_class: 'bottom-panel solid',
-                                     reactive: true,
-                                     track_hover: true,
-                                     layout_manager: new Clutter.BinLayout()});
+        this.actor = new St.Widget({
+            name: 'panel',
+            style_class: 'bottom-panel solid',
+            reactive: true,
+            track_hover: true,
+            layout_manager: new Clutter.BinLayout()
+        });
         this.actor.connect('destroy', this._onDestroy.bind(this));
 
         let box = new St.BoxLayout({ x_expand: true, y_expand: true });
         this.actor.add_actor(box);
 
         let layout = new Clutter.BoxLayout({ homogeneous: true });
-        this._windowList = new St.Widget({ style_class: 'window-list',
-                                           reactive: true,
-                                           layout_manager: layout,
-                                           x_align: Clutter.ActorAlign.START,
-                                           x_expand: true,
-                                           y_expand: true });
+        this._windowList = new St.Widget({
+            style_class: 'window-list',
+            reactive: true,
+            layout_manager: layout,
+            x_align: Clutter.ActorAlign.START,
+            x_expand: true,
+            y_expand: true
+        });
         box.add(this._windowList, { expand: true });
 
         this._windowList.connect('style-changed', () => {
@@ -810,10 +823,12 @@ class WindowList {
         this._menuManager = new PopupMenu.PopupMenuManager(this);
         this._menuManager.addMenu(this._workspaceIndicator.menu);
 
-        Main.layoutManager.addChrome(this.actor, { affectsStruts: true,
-                                                   trackFullscreen: true });
+        Main.layoutManager.addChrome(this.actor, {
+            affectsStruts: true,
+            trackFullscreen: true
+        });
         Main.uiGroup.set_child_above_sibling(this.actor, Main.layoutManager.panelBox);
-        Main.ctrlAltTabManager.addGroup(this.actor, _("Window List"), 'start-here-symbolic');
+        Main.ctrlAltTabManager.addGroup(this.actor, _('Window List'), 'start-here-symbolic');
 
         this.actor.width = this._monitor.width;
         this.actor.connect('notify::height', this._updatePosition.bind(this));
@@ -880,7 +895,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));
@@ -898,17 +913,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() {
@@ -1023,12 +1033,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) {
@@ -1042,10 +1049,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,
@@ -1065,12 +1070,9 @@ 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() {
@@ -1199,7 +1201,7 @@ class WindowList {
         for (let i = 0; i < windows.length; i++)
             windows[i].metaWindow.set_icon_geometry(null);
     }
-};
+}
 
 class Extension {
     constructor() {
@@ -1210,7 +1212,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));
@@ -1223,7 +1225,7 @@ class Extension {
     }
 
     _buildWindowLists() {
-        this._windowLists.forEach(list => { list.actor.destroy(); });
+        this._windowLists.forEach(list => list.actor.destroy());
         this._windowLists = [];
 
         let showOnAllMonitors = this._settings.get_boolean('show-on-all-monitors');
@@ -1254,7 +1256,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,19 +1,16 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+/* exported init buildPrefsWidget */
 
-const Gio = imports.gi.Gio;
-const GObject = imports.gi.GObject;
-const Gtk = imports.gi.Gtk;
+const { Gio, GObject, Gtk } = imports.gi;
 
 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,27 +22,31 @@ class WindowListPrefsWidget extends Gtk.Grid {
         this.row_spacing = 6;
         this.orientation = Gtk.Orientation.VERTICAL;
 
-        let groupingLabel = '<b>' + _("Window Grouping") + '</b>';
-        this.add(new Gtk.Label({ label: groupingLabel, use_markup: true,
-                                 halign: Gtk.Align.START }));
+        let groupingLabel = '<b>%s</b>'.format(_('Window Grouping'));
+        this.add(new Gtk.Label({
+            label: groupingLabel, 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 });
+        let grid = new Gtk.Grid({
+            orientation: Gtk.Orientation.VERTICAL,
+            row_spacing: 6,
+            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();
 
         let modeLabels = {
-            'never': _("Never group windows"),
-            'auto': _("Group windows when space is limited"),
-            'always': _("Always group windows")
+            'never': _('Never group windows'),
+            'auto': _('Group windows when space is limited'),
+            'always': _('Always group windows')
         };
 
         let radio = null;
@@ -53,13 +54,15 @@ 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,
-                                          label: label,
-                                          group: radio });
+            radio = new Gtk.RadioButton({
+                active: currentMode == mode,
+                label: label,
+                group: radio
+            });
             grid.add(radio);
 
             radio.connect('toggled', button => {
@@ -68,8 +71,10 @@ class WindowListPrefsWidget extends Gtk.Grid {
             });
         }
 
-        let check = new Gtk.CheckButton({ label: _("Show on all monitors"),
-                                          margin_top: 6 });
+        let check = new Gtk.CheckButton({
+            label: _('Show on all monitors'),
+            margin_top: 6
+        });
         this._settings.bind('show-on-all-monitors', check, 'active', Gio.SettingsBindFlags.DEFAULT);
         this.add(check);
     }

extensions/windowsNavigator/extension.js

@@ -1,7 +1,6 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-const Clutter = imports.gi.Clutter;
-const Mainloop = imports.mainloop;
-const St = imports.gi.St;
+/* exported enable disable */
+const { Clutter, St } = imports.gi;
 
 const Main = imports.ui.main;
 const Workspace = imports.ui.workspace;
@@ -15,18 +14,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 +35,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 +64,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 +73,7 @@ function enable() {
         if (!this._tip.get_parent())
             return;
         this._tip.hide();
-    }
+    };
     workspaceInjections['hideTooltip'] = undefined;
 
     Workspace.Workspace.prototype.getWindowWithTooltip = function(id) {
@@ -83,7 +82,7 @@ function enable() {
                 return this._windows[i].metaWindow;
         }
         return null;
-    }
+    };
     workspaceInjections['getWindowWithTooltip'] = undefined;
 
     Workspace.Workspace.prototype.showWindowsTooltips = function() {
@@ -91,7 +90,7 @@ function enable() {
             if (this._windowOverlays[i] != null)
                 this._windowOverlays[i].showTooltip();
         }
-    }
+    };
     workspaceInjections['showWindowsTooltips'] = undefined;
 
     Workspace.Workspace.prototype.hideWindowsTooltips = function() {
@@ -99,7 +98,7 @@ function enable() {
             if (this._windowOverlays[i] != null)
                 this._windowOverlays[i].hideTooltip();
         }
-    }
+    };
     workspaceInjections['hideWindowsTooltips'] = undefined;
 
     WorkspacesView.WorkspacesView.prototype._hideTooltips = function() {
@@ -108,7 +107,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 +115,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,11 +127,11 @@ 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;
@@ -209,7 +208,7 @@ function enable() {
             return true;
         }
         return false;
-    }
+    };
     workViewInjections['_onKeyPress'] = undefined;
 
     winInjections['_init'] = injectToFunction(Workspace.WindowOverlay.prototype, '_init', function(windowClone, parentActor) {
@@ -219,8 +218,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;
@@ -230,8 +229,10 @@ function enable() {
 
     workspaceInjections['_init'] = injectToFunction(Workspace.Workspace.prototype, '_init', function(metaWorkspace) {
         if (metaWorkspace && metaWorkspace.index() < 9) {
-            createdActors.push(this._tip = new St.Label({ style_class: 'extension-windowsNavigator-window-tooltip',
-                                                          visible: false }));
+            createdActors.push(this._tip = new St.Label({
+                style_class: 'extension-windowsNavigator-window-tooltip',
+                visible: false
+            }));
 
             this.actor.add_actor(this._tip);
             let signalId = this.actor.connect('notify::scale-x', () => {
@@ -242,7 +243,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 =
@@ -256,7 +257,7 @@ function enable() {
     workViewInjections['_onDestroy'] = injectToFunction(WorkspacesView.WorkspacesView.prototype, '_onDestroy', function() {
         global.stage.disconnect(this._keyPressEventId);
         global.stage.disconnect(this._keyReleaseEventId);
-        connectedSignals = [ ];
+        connectedSignals = [];
     });
 }
 
@@ -285,7 +286,3 @@ function disable() {
 
     resetState();
 }
-
-function init() {
-    /* do nothing */
-}

extensions/workspace-indicator/extension.js

@@ -1,13 +1,9 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+/* exported init enable disable */
 
-const Gio = imports.gi.Gio;
-const Meta = imports.gi.Meta;
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
-const Mainloop = imports.mainloop;
+const { Clutter, Gio, GObject, Meta, St } = imports.gi;
 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,23 +11,24 @@ 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'));
 
         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.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();
@@ -45,7 +42,7 @@ class WorkspaceIndicator extends PanelMenu.Button {
         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
@@ -53,11 +50,11 @@ 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() {
+    _onDestroy() {
         for (let i = 0; i < this._workspaceManagerSignals.length; i++)
             global.workspace_manager.disconnect(this._workspaceManagerSignals[i]);
 
@@ -66,7 +63,7 @@ class WorkspaceIndicator extends PanelMenu.Button {
             this._settingsChangedId = 0;
         }
 
-        super.destroy();
+        super._onDestroy();
     }
 
     _updateIndicator() {
@@ -78,7 +75,7 @@ class WorkspaceIndicator extends PanelMenu.Button {
     }
 
     _labelText(workspaceIndex) {
-        if(workspaceIndex == undefined) {
+        if (workspaceIndex == undefined) {
             workspaceIndex = this._currentWorkspace;
             return (workspaceIndex + 1).toString();
         }
@@ -93,13 +90,12 @@ class WorkspaceIndicator extends PanelMenu.Button {
         this._currentWorkspace = workspaceManager.get_active_workspace().index();
 
         let i = 0;
-        for(; i < workspaceManager.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);
             });
 
@@ -113,7 +109,7 @@ class WorkspaceIndicator extends PanelMenu.Button {
     _activate(index) {
         let workspaceManager = global.workspace_manager;
 
-        if(index >= 0 && index <  workspaceManager.n_workspaces) {
+        if (index >= 0 && index <  workspaceManager.n_workspaces) {
             let metaWorkspace = workspaceManager.get_workspace_by_index(index);
             metaWorkspace.activate(global.get_current_time());
         }
@@ -133,10 +129,10 @@ class WorkspaceIndicator extends PanelMenu.Button {
         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,17 +1,13 @@
 // -*- 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;
+const { Gio, GObject, Gtk } = imports.gi;
 
 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 WORKSPACE_SCHEMA = 'org.gnome.desktop.wm.preferences';
 const WORKSPACE_KEY = 'workspace-names';
@@ -115,7 +111,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,23 +127,28 @@ class WorkspaceSettingsWidget extends Gtk.Grid {
         this.margin = 12;
         this.orientation = Gtk.Orientation.VERTICAL;
 
-        this.add(new Gtk.Label({ label: '<b>' + _("Workspace Names") + '</b>',
-                                 use_markup: true, margin_bottom: 6,
-                                 hexpand: true, halign: Gtk.Align.START }));
+        this.add(new Gtk.Label({
+            label: '<b>%s</b>'.format(_('Workspace Names')),
+            use_markup: true,
+            margin_bottom: 6,
+            hexpand: true,
+            halign: Gtk.Align.START
+        }));
 
         let scrolled = new Gtk.ScrolledWindow({ shadow_type: Gtk.ShadowType.IN });
         scrolled.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
         this.add(scrolled);
 
         this._store = new WorkspaceNameModel();
-        this._treeView = new Gtk.TreeView({ model: this._store,
-                                            headers_visible: false,
-                                            reorderable: true,
-                                            hexpand: true,
-                                            vexpand: true
-                                          });
+        this._treeView = new Gtk.TreeView({
+            model: this._store,
+            headers_visible: false,
+            reorderable: true,
+            hexpand: true,
+            vexpand: true
+        });
 
-        let column = new Gtk.TreeViewColumn({ title: _("Name") });
+        let column = new Gtk.TreeViewColumn({ title: _('Name') });
         let renderer = new Gtk.CellRendererText({ editable: true });
         renderer.connect('edited', this._cellEdited.bind(this));
         column.pack_start(renderer, true);
@@ -176,23 +177,23 @@ 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() {
         let iter = this._store.append();
         let index = this._store.get_path(iter).get_indices()[0];
 
-        let label = _("Workspace %d").format(index + 1);
+        let label = _('Workspace %d').format(index + 1);
         this._store.set(iter, [this._store.Columns.LABEL], [label]);
     }
 
     _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 +201,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,130 @@
+{
+    "env": {
+        "es6": true
+    },
+    "extends": "eslint:recommended",
+    "rules": {
+        "array-bracket-newline": [
+            "error",
+            "consistent"
+        ],
+        "array-bracket-spacing": [
+            "error",
+            "never"
+        ],
+        "arrow-spacing": "error",
+        "brace-style": "error",
+        "comma-spacing": [
+            "error",
+            {
+                "before": false,
+                "after": true
+            }
+        ],
+        "indent": [
+            "error",
+            4,
+            {
+                "ignoredNodes": [
+                    "CallExpression[callee.object.name=GObject][callee.property.name=registerClass] > ClassExpression:first-child"
+                ],
+                "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": ["!!"]
+            }
+        ],
+        "no-restricted-properties": [
+            "error",
+            {
+                "object": "Lang",
+                "property": "bind",
+                "message": "Use arrow notation or Function.prototype.bind()"
+            },
+            {
+                "object": "Lang",
+                "property": "Class",
+                "message": "Use ES6 classes"
+            }
+        ],
+        "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,16 @@
+{
+    "rules": {
+        "indent": [
+            "error",
+            4,
+            {
+                "ignoredNodes": [
+                    "CallExpression > ArrowFunctionExpression",
+                    "CallExpression[callee.object.name=GObject][callee.property.name=registerClass] > ClassExpression:first-child"
+                ],
+                "CallExpression": { "arguments": "first" },
+                "MemberExpression": "off"
+            }
+        ]
+   }
+}

lint/eslintrc-shell.json

@@ -0,0 +1,30 @@
+{
+    "rules": {
+        "camelcase": [
+            "error",
+            {
+                "properties": "never",
+                "allow": ["^vfunc_"]
+            }
+        ],
+        "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.29.91',
+  version: '3.31.92',
   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()
@@ -42,7 +40,6 @@ classic_extensions = [
 
 default_extensions = classic_extensions
 default_extensions += [
-  'alternate-tab',
   'drive-menu',
   'screenshot-window-sizer',
   'windowsNavigator',
@@ -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,14 +1,10 @@
 data/gnome-classic.desktop.in
 data/gnome-classic.session.desktop.in
-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/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/gd.po

@@ -5,9 +5,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-"
-"extensions/issues\n"
-"POT-Creation-Date: 2017-12-18 18:40+0000\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-02-26 12:52+0100\n"
 "Last-Translator: GunChleoc <fios@foramnagaidhlig.net>\n"
 "Language-Team: Fòram na Gàidhlig\n"
@@ -29,126 +29,81 @@ msgstr "GNOME clasaigeach"
 msgid "This session logs you into GNOME Classic"
 msgstr "Clàraidh an seisean seo a-steach gu GNOME clasaigeach thu"
 
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:7
-msgid "Attach modal dialog to the parent window"
-msgstr "Ceangail còmhradh mòdach ris an uinneag-pàraint"
-
-#: 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 ""
-"Tar-àithnidh an iuchair seo an iuchair ann an org.gnome.mutter nuair a thèid "
-"Slige GNOME a ruith."
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
-msgid "Arrangement of buttons on the titlebar"
-msgstr "Seòrsachadh nam putanan air a’ bhàr-tiotail"
-
-#: 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 ""
-"Tar-àithnidh an iuchair seo an iuchair ann an org.gnome.desktop.wm."
-"preferences nuair a thèid Slige GNOME a ruith."
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:24
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr ""
-"Cuir leacadh nan oirean an comas nuair a thèid uinneagan a leigeil às aig "
-"oir na sgrìn"
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:32
-msgid "Workspaces only on primary monitor"
-msgstr "Rumannan-obrach air a’ phrìomh-sgrìn a-mhàin"
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:40
-msgid "Delay focus changes in mouse mode until the pointer stops moving"
-msgstr ""
-"Cuir dàil air atharraichean an fòcais ann am modh luchaige gus an sguir an "
-"tomhaire air gluasad"
+#: extensions/alternate-tab/prefs.js:19
+msgid "Thumbnail only"
+msgstr "Dealbhag a-mhàin"
 
 #: extensions/alternate-tab/prefs.js:20
-msgid "Thumbnail only"
-msgstr "Dealbhagan a-mhàin"
-
-#: extensions/alternate-tab/prefs.js:21
 msgid "Application icon only"
 msgstr "Ìomhaigheag na h-aplacaid a-mhàin"
 
-#: extensions/alternate-tab/prefs.js:22
+#: extensions/alternate-tab/prefs.js:21
 msgid "Thumbnail and application icon"
 msgstr "Dealbhag is ìomhaigheag na h-aplacaid"
 
-#: extensions/alternate-tab/prefs.js:38
+#: extensions/alternate-tab/prefs.js:34
 msgid "Present windows as"
 msgstr "Seall uinneagan mar"
 
-#: extensions/alternate-tab/prefs.js:69
+#: extensions/alternate-tab/prefs.js:65
 msgid "Show only windows in the current workspace"
-msgstr "Na seall ach na h-uinneagan san rum-obrach làithreach"
+msgstr "Na seall ach na h-uinneagan san rùm-obrach làithreach"
 
-#: extensions/apps-menu/extension.js:41
+#: extensions/apps-menu/extension.js:37
 msgid "Activities Overview"
 msgstr "Foir-shealladh nan gnìomhachdan"
 
-#: extensions/apps-menu/extension.js:141
+#: extensions/apps-menu/extension.js:130
 msgid "Favorites"
 msgstr "Annsachdan"
 
-#: extensions/apps-menu/extension.js:436
+#: extensions/apps-menu/extension.js:417
 msgid "Applications"
 msgstr "Aplacaidean"
 
 #: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
 msgid "Application and workspace list"
-msgstr "Ìomhaigheag na h-aplacaid is liosta nan rumannan-obrach"
+msgstr "Liosta nan aplacaidean is rumannan-obrach"
 
 #: 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 ""
-"Liosta dhe shreangan le id aplacaid (ainm faidhle desktop) aig gach tè air a "
-"leantainn le còilean is àireamh an ruim-obrach"
+msgstr "Liosta dhe shreangan le id aplacaid (ainm faidhle desktop) aig gach tè ’ga leantainn le còilean is àireamh an ruim-obrach"
 
-#: extensions/auto-move-windows/prefs.js:56
+#: extensions/auto-move-windows/prefs.js:53
 msgid "Application"
 msgstr "Aplacaid"
 
-#: extensions/auto-move-windows/prefs.js:65
-#: extensions/auto-move-windows/prefs.js:123
+#: extensions/auto-move-windows/prefs.js:62
+#: extensions/auto-move-windows/prefs.js:117
 msgid "Workspace"
-msgstr "Rum-obrach"
+msgstr "Rùm-obrach"
 
-#: extensions/auto-move-windows/prefs.js:81
+#: extensions/auto-move-windows/prefs.js:78
 msgid "Add Rule"
 msgstr "Cuir riaghailt ris"
 
-#: extensions/auto-move-windows/prefs.js:102
+#: extensions/auto-move-windows/prefs.js:98
 msgid "Create new matching rule"
 msgstr "Cruthaich riaghailt maidsidh ùr"
 
-#: extensions/auto-move-windows/prefs.js:107
+#: extensions/auto-move-windows/prefs.js:103
 msgid "Add"
 msgstr "Cuir ris"
 
 #. 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:"
 msgid "Ejecting drive “%s” failed:"
 msgstr "Cha deach leinn draibh “%s” a ghluasad a-mach:"
 
-#: extensions/drive-menu/extension.js:125
+#: extensions/drive-menu/extension.js:118
 msgid "Removable devices"
-msgstr "Draibhean so-ghiùlain"
+msgstr "Uidheaman so-ghiùlain"
 
-#: extensions/drive-menu/extension.js:150
-#| msgid "Open File"
+#: extensions/drive-menu/extension.js:143
 msgid "Open Files"
 msgstr "Fosgail faidhlichean"
 
@@ -164,86 +119,68 @@ msgstr "Teacsa fàilteachaidh eile."
 msgid ""
 "If not empty, it contains the text that will be shown when clicking on the "
 "panel."
-msgstr ""
-"Mur eil seo falamh, tha an teacsa ’na bhroinn a thèid a shealltainn le "
-"briogadh air a’ phanail."
+msgstr "Mur eil seo falamh, tha an teacsa ’na bhroinn a thèid a shealltainn le briogadh air a’ phanail."
 
-#: extensions/example/prefs.js:30
+#: extensions/example/prefs.js:27
 msgid "Message"
 msgstr "Teachdaireachd"
 
 #. TRANSLATORS: Example is the name of the extension, should not be
 #. translated
-#: 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."
+#: 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."
-msgstr ""
-"Tha am ball-eisimpleir airson sealltainn dhut mar a thogas tu leudachain le "
-"deagh-ghiùlan airson na Slige agus mar sin cha dèan e fhèin mòran.\n"
-"’S urrainn dhut an teachdaireachd fàilteachaidh a ghnàthachadh co-dhiù."
+msgstr "Tha am ball-eisimpleir airson sealltainn dhut mar a thogas tu leudachain le deagh-ghiùlan airson na Slige agus mar sin cha dèan e fhèin mòran.\n’S urrainn dhut an teachdaireachd fàilteachaidh a ghnàthachadh co-dhiù."
 
 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
 msgid "Use more screen for windows"
-msgstr "Cleachd cuid nas motha dhen sgrìn airson uinneagan"
+msgstr "Cleachd barrachd dhen sgrìn airson uinneagan"
 
 #: 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 ""
-"Feuch barrachd rum air an sgrìn a chleachdadh nuair a thèid dealbhagan nan "
-"uinneagan a chur ann le gleusadh a-rèir co-mheas deilbh na sgrìn agus le "
-"barrachd co-dhaingneachaidh ach am bi am bogsa-iadhaidh nas lugha. Cha bhi "
-"an roghainn seo an sàs ach leis an ro-innleachd suidheachaidh nàdarra."
+msgstr "Feuch barrachd rùm air an sgrìn a chleachdadh nuair a thèid dealbhagan nan uinneagan a chur ann le gleusadh a-rèir co-mheas deilbh na sgrìn agus le barrachd co-dhaingneachaidh ach am bi am bogsa-iadhaidh nas lugha. Cha bhi an roghainn seo an sàs ach leis an ro-innleachd suidheachaidh nàdarra."
 
 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
 msgid "Place window captions on top"
-msgstr "Cuir caipseanan nan uinneagan air a’ bharr"
+msgstr "Cuir caipseanan nan uinneagan air a’ bhàrr"
 
 #: 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 ""
-"Mas e true a th’ ann, thèid caipseanan nan uinneagan a chur ri barr nan "
-"dealbhagan, a’ tar-àithneadh bun-roghainn na slige a chuireas aig a’ bhonn "
-"iad. Ma dh’atharraicheas tu an roghainn seo, feumaidh tu an t-slige a "
-"thòiseachadh às ùr gus an dèid a cur an sàs."
+msgstr "Mas e true a th’ ann, thèid caipseanan nan uinneagan a chur ri bàrr nan dealbhagan, a’ tar-àithneadh bun-roghainn na slige a chuireas aig a’ bhonn iad. Ma dh’atharraicheas tu an roghainn seo, feumaidh tu an t-slige ath-thòiseachadh gus an dèid a cur an sàs."
 
-#: 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 "Ionadan"
 
-#: extensions/places-menu/placeDisplay.js:65
+#: extensions/places-menu/placeDisplay.js:67
 #, javascript-format
 msgid "Failed to mount volume for “%s”"
 msgstr "Cha b’ urrainn dhuinn an t-iom-dhraibh airson “%s” a mhunntachadh"
 
-#: extensions/places-menu/placeDisplay.js:78
+#: extensions/places-menu/placeDisplay.js:80
 #, javascript-format
-#| msgid "Failed to launch \"%s\""
 msgid "Failed to launch “%s”"
 msgstr "Cha b’ urrainn dhuinn “%s” a chur gu dol"
 
-#: 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 "Coimpiutair"
 
-#: extensions/places-menu/placeDisplay.js:303
+#: extensions/places-menu/placeDisplay.js:342
 msgid "Home"
 msgstr "Dachaigh"
 
-#: extensions/places-menu/placeDisplay.js:347
+#: extensions/places-menu/placeDisplay.js:386
 msgid "Browse Network"
 msgstr "Brabhsaich an lìonra"
 
@@ -252,7 +189,6 @@ msgid "Cycle Screenshot Sizes"
 msgstr "Cuartaich meudan nan glacaidhean-sgrìn"
 
 #: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
-#| msgid "Cycle Screenshot Sizes"
 msgid "Cycle Screenshot Sizes Backward"
 msgstr "Cuartaich meudan nan glacaidhean-sgrìn gu contrarra"
 
@@ -264,115 +200,143 @@ msgstr "Ainm an ùrlair"
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "Ainm an ùrlair a thèid a luchdadh o ~/.themes/name/gnome-shell"
 
-#: extensions/window-list/extension.js:110
+#: extensions/window-list/extension.js:106
 msgid "Close"
 msgstr "Dùin"
 
-#: extensions/window-list/extension.js:129
+#: extensions/window-list/extension.js:125
 msgid "Unminimize"
 msgstr "Neo-fhìor-lùghdaich"
 
-#: extensions/window-list/extension.js:130
+#: extensions/window-list/extension.js:126
 msgid "Minimize"
 msgstr "Fìor-lùghdaich"
 
-#: extensions/window-list/extension.js:136
+#: extensions/window-list/extension.js:132
 msgid "Unmaximize"
 msgstr "Neo-làn-mheudaich"
 
-#: extensions/window-list/extension.js:137
+#: extensions/window-list/extension.js:133
 msgid "Maximize"
 msgstr "Làn-mheudaich"
 
-#: extensions/window-list/extension.js:420
+#: extensions/window-list/extension.js:408
 msgid "Minimize all"
 msgstr "Fìor-lùghdaich na h-uile"
 
-#: extensions/window-list/extension.js:428
+#: extensions/window-list/extension.js:414
 msgid "Unminimize all"
 msgstr "Neo-fhìor-lùghdaich na h-uile"
 
-#: extensions/window-list/extension.js:436
+#: extensions/window-list/extension.js:420
 msgid "Maximize all"
 msgstr "Làn-mheudaich na h-uile"
 
-#: extensions/window-list/extension.js:445
+#: extensions/window-list/extension.js:429
 msgid "Unmaximize all"
 msgstr "Neo-làn-mheudaich na h-uile"
 
-#: extensions/window-list/extension.js:454
+#: extensions/window-list/extension.js:438
 msgid "Close all"
 msgstr "Dùin na h-uile"
 
-#: 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 "Taisbeanair ruim-obrach"
+msgstr "Taisbeanair rùim-obrach"
 
-#: extensions/window-list/extension.js:842
+#: extensions/window-list/extension.js:816
 msgid "Window List"
 msgstr "Liosta nan uinneagan"
 
 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:12
 msgid "When to group windows"
-msgstr "Cuin a thèid na h-uinneagan a bhuidhneachadh"
+msgstr "Cuin a thèid uinneagan a bhuidhneachadh"
 
 #: 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”."
-msgstr ""
-"Mìnichidh seo cuin a thèid uinneagan aig an aon aplacaid a bhuidhneachadh "
-"air liosta nan uinneagan. ’S e “never”, “auto” agus “always” a tha sna "
-"roghainnean dligheach."
+msgstr "Taghaidh seo cuin a thèid na h-uinneagan aig aplacaid a bhuidhneachadh air liosta nan uinneagan. ’S e “never”, “auto” agus “always” a tha sna roghainnean dligheach."
 
 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
 msgid "Show the window list on all monitors"
-msgstr "Seall liosta nan uinneagan air a h-uile sgrìn"
+msgstr "Seall liosta nan uinneagan air a h-uile monatair"
 
 #: 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 ""
-"Co-dhiù an dèid liosta nan uinneagan a shealltainn air gach sgrìn "
-"cheangailte no air a’ phrìomh-thè a-mhàin."
+msgstr "Co-dhiù an dèid liosta nan uinneagan a shealltainn air gach monatair ceangailte no air a’ phrìomh-fhear a-mhàin."
 
-#: extensions/window-list/prefs.js:32
+#: extensions/window-list/prefs.js:28
 msgid "Window Grouping"
 msgstr "Buidhneachadh nan uinneagan"
 
-#: extensions/window-list/prefs.js:50
+#: extensions/window-list/prefs.js:46
 msgid "Never group windows"
 msgstr "Na buidhnich na h-uinneagan idir"
 
-#: extensions/window-list/prefs.js:51
+#: extensions/window-list/prefs.js:47
 msgid "Group windows when space is limited"
-msgstr "Buidhnich na h-uinneagan nuair a bhios an rum gann"
+msgstr "Buidhnich na h-uinneagan nuair a bhios an rùm gann"
 
-#: extensions/window-list/prefs.js:52
+#: extensions/window-list/prefs.js:48
 msgid "Always group windows"
 msgstr "Buidhnich na h-uinneagan an-còmhnaidh"
 
-#: extensions/window-list/prefs.js:75
+#: extensions/window-list/prefs.js:71
 msgid "Show on all monitors"
-msgstr "Seall air a h-uile sgrìn"
+msgstr "Seall air a h-uile monatair"
 
-#: extensions/workspace-indicator/prefs.js:141
+#: extensions/workspace-indicator/prefs.js:134
 msgid "Workspace Names"
 msgstr "Ainmean nan rumannan-obrach"
 
-#: extensions/workspace-indicator/prefs.js:157
+#: extensions/workspace-indicator/prefs.js:150
 msgid "Name"
 msgstr "Ainm"
 
-#: extensions/workspace-indicator/prefs.js:198
+#: extensions/workspace-indicator/prefs.js:190
 #, javascript-format
 msgid "Workspace %d"
-msgstr "Rum-obrach %d"
+msgstr "Rùm-obrach %d"
+
+#~ msgid "Attach modal dialog to the parent window"
+#~ msgstr "Ceangail còmhradh mòdach ris an uinneag-pàraint"
+
+#~ msgid ""
+#~ "This key overrides the key in org.gnome.mutter when running GNOME Shell."
+#~ msgstr ""
+
+#~ "Tar-àithnidh an iuchair seo an iuchair ann an org.gnome.mutter nuair a "
+#~ "thèid Slige GNOME a ruith."
+
+#~ msgid "Arrangement of buttons on the titlebar"
+#~ msgstr "Seòrsachadh nam putanan air a’ bhàr-tiotail"
+
+#~ msgid ""
+#~ "This key overrides the key in org.gnome.desktop.wm.preferences when "
+#~ "running GNOME Shell."
+#~ msgstr ""
+
+#~ "Tar-àithnidh an iuchair seo an iuchair ann an org.gnome.desktop.wm."
+#~ "preferences nuair a thèid Slige GNOME a ruith."
+
+#~ msgid "Enable edge tiling when dropping windows on screen edges"
+#~ msgstr ""
+
+#~ "Cuir leacadh nan oirean an comas nuair a thèid uinneagan a leigeil às aig "
+#~ "oir na sgrìn"
+
+#~ msgid "Workspaces only on primary monitor"
+#~ msgstr "Rumannan-obrach air a’ phrìomh-sgrìn a-mhàin"
+
+#~ msgid "Delay focus changes in mouse mode until the pointer stops moving"
+#~ msgstr ""
+
+#~ "Cuir dàil air atharraichean an fòcais ann am modh luchaige gus an sguir "
+#~ "an tomhaire air gluasad"
 
 #~ msgid "Notifications"
 #~ msgstr "Brathan"
@@ -427,6 +391,7 @@ msgstr "Rum-obrach %d"
 #~ "Clicking \n"
 #~ "    native switches the Alternate Tab extension off. \n"
 #~ msgstr ""
+
 #~ "Seo a' chiad turas a chì thu leudachan Alt Taba chaochlaidich. \n"
 #~ "Tagh an giùlan as fhearr leat:\n"
 #~ "\n"

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/sl.po

@@ -2,7 +2,7 @@
 # Copyright (C) 2011 gnome-shell-extensions's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-shell-extensions package.
 #
-# Matej Urbančič <mateju@svn.gnome.org>, + 2011–2017.
+# Matej Urbančič <mateju@svn.gnome.org>, + 2011–2019.
 #
 msgid ""
 msgstr ""
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=extensions\n"
 "POT-Creation-Date: 2017-07-07 10:35+0200\n"
-"PO-Revision-Date: 2017-07-07 10:36+0200\n"
+"PO-Revision-Date: 2019-02-12 20:43+0100\n"
 "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
 "Language: sl_SI\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 2.0.1\n"
+"X-Generator: Poedit 2.1.1\n"
 
 #: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
 msgid "GNOME Classic"
@@ -32,7 +32,7 @@ msgstr "Seja omogoča prijavo v običajno namizje GNOME."
 
 #: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:7
 msgid "Attach modal dialog to the parent window"
-msgstr "Priponi modalno pogovorno okno nadrejenemu oknu"
+msgstr "Pripni modalno pogovorno okno nadrejenemu oknu"
 
 #: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:8
 #: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:25
@@ -41,8 +41,8 @@ msgstr "Priponi modalno pogovorno okno nadrejenemu oknu"
 msgid ""
 "This key overrides the key in org.gnome.mutter when running GNOME Shell."
 msgstr ""
-"Možnost prepiše ključ med nastavitvami org.gnome.mutter med zagonom lupine "
-"GNOME."
+"Možnost med zagonom lupine GNOME prepiše ključ med nastavitvami org.gnome."
+"mutter."
 
 #: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
 msgid "Arrangement of buttons on the titlebar"
@@ -53,8 +53,8 @@ msgid ""
 "This key overrides the key in org.gnome.desktop.wm.preferences when running "
 "GNOME Shell."
 msgstr ""
-"Možnost prepiše ključ med nastavitvami org.gnome.desktop.wm med zagonom "
-"lupine GNOME."
+"Možnost med zagonom lupine GNOME prepiše ključ med nastavitvami org.gnome."
+"desktop.wm."
 
 #: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:24
 msgid "Enable edge tiling when dropping windows on screen edges"
@@ -111,8 +111,8 @@ msgid ""
 "A list of strings, each containing an application id (desktop file name), "
 "followed by a colon and the workspace number"
 msgstr ""
-"Seznam nizov z določilom ID programa (ime programa), ki mu sledi "
-"dvopičje in nato številka delovne površine."
+"Seznam nizov z določilom ID programa (ime programa), ki mu sledi dvopičje in "
+"nato številka delovne površine."
 
 #: extensions/auto-move-windows/prefs.js:60
 msgid "Application"
@@ -174,8 +174,8 @@ msgid ""
 "as such it has little functionality on its own.\n"
 "Nevertheless it’s possible to customize the greeting message."
 msgstr ""
-"Primer je oblikovan kot predloga za izgradnjo kakovostnih razširitev "
-"za lupino, zato je delovanje deloma prilagojeno.\n"
+"Primer je oblikovan kot predloga za izgradnjo kakovostnih razširitev za "
+"lupino, zato je delovanje deloma prilagojeno.\n"
 "Kljub vsemu je mogoče prilagajati pozdravno sporočilo."
 
 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
@@ -202,9 +202,9 @@ msgid ""
 "shell default of placing it at the bottom. Changing this setting requires "
 "restarting the shell to have any effect."
 msgstr ""
-"Izbrana možnost določi postavitev nazivov oken na vrh posamezne sličice"
-"in s tem prepiše privzeti izpis pod sličico. Za uveljavitev sprememb je "
-"treba lupino ponovno zagnati."
+"Izbrana možnost določi postavitev nazivov oken na vrh posamezne sličice in s "
+"tem prepiše privzeti izpis pod sličico. Za uveljavitev sprememb je treba "
+"lupino ponovno zagnati."
 
 #: extensions/places-menu/extension.js:78
 #: extensions/places-menu/extension.js:81