Bump version to 3.32.0

Update NEWS.

.eslintrc.json

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

.gitlab-ci.yml

@@ -0,0 +1,40 @@
+stages:
+ - commit_check
+ - source_check
+ - build
+
+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

.gitmodules

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

HACKING

@@ -1,31 +0,0 @@
---- Creating a New Extension ---
-
-To create a new extension, add a subdirectory in extensions.
-Then create a Makefile.am like the one in example, replacing
-the EXTENSION_ID with the basename of your extension, which
-must match the UUID in metadata.json.
-If you need additional files, add them to EXTENSION_EXTRA.
-
-Then modify extensions/Makefile.am and configure.ac. It should
-be pretty self-explanatory.
-
-Don't forget to add any translatable file to po/POTFILES.in, and
-then you're done.
-The Gettext domain you should choose is gnome-shell-extensions,
-not gnome-shell, unless you're sure there is the string you
-need in gnome-shell.
-
---- Coding Style ---
-
-Generally, we follow GJS coding style (you can find it at
-http://git.gnome.org/browse/gjs/tree/doc/Style_Guide.txt), which
-in short is: indent 4 spaces, no tabs, space after comma, no space
-after function call.
-
-The Emacs mode line for this
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-Imports should be at the top, in two groups, one for standard
-imports (like imports.lang or imports.dbus) and introspection,
-the other for Shell API. Within the same group, put everything
-in alphabetic order.

HACKING.md

@@ -0,0 +1,31 @@
+## Creating a New Extension
+
+To create a new extension, add a subdirectory in extensions. Then create
+a meson.build from the provided [template](extensions/meson.build.template).
+If you need additional sources, add them to extension_sources. Similarily add
+GSettings schemas to extension_schemas and other files to extension_data.
+
+Then modify the [toplevel Meson file](meson.build) to add the new
+extension name in the appropriate set (that is one of classic_extensions,
+default_extensions or all_extensions).
+
+Don't forget to add any translatable file to po/POTFILES.in, and
+then you're done.
+The Gettext domain you should choose is gnome-shell-extensions,
+not gnome-shell, unless you're sure there is the string you
+need in gnome-shell.
+
+## Coding Style
+
+Generally, we follow [GJS coding style][coding-style], which in short is:
+indent 4 spaces, no tabs, space after comma, no space after function call.
+
+The Emacs mode line for this
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+Imports should be at the top, in two groups, one for standard
+imports (like imports.lang or imports.dbus) and introspection,
+the other for Shell API. Within the same group, put everything
+in alphabetic order.
+
+[coding-style]: https://gitlab.gnome.org/GNOME/gjs/blob/master/doc/Style_Guide.md

Makefile.am

@@ -1,52 +0,0 @@
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
-DIST_SUBDIRS = data extensions po
-
-SUBDIRS = extensions po
-
-if CLASSIC_MODE
-SUBDIRS += data
-endif
-
-EXTRA_DIST = lib/convenience.js
-
-DISTCHECK_CONFIGURE_FLAGS = --enable-extensions=all
-
-include include.mk
-
-zip-file: all
-	-rm -fR $(builddir)/_build
-	-rm -fR $(builddir)/zip-files
-	$(MKDIR_P) $(builddir)/_build; \
-	$(MKDIR_P) $(builddir)/zip-files; \
-	$(MAKE) install DESTDIR="$(abs_builddir)/_build"; \
-	for i in $(ENABLED_EXTENSIONS); do \
-		mv "$(builddir)/_build$(topextensiondir)/$${i}$(extensionbase)" "$(builddir)/_build/"; \
-		cp -r "$(builddir)/_build$(datadir)/locale" "$(builddir)/_build/$${i}$(extensionbase)"; \
-		cp "$(srcdir)/COPYING" -t "$(builddir)/_build/$${i}$(extensionbase)"; \
-		cp "$(srcdir)/NEWS" -t "$(builddir)/_build/$${i}$(extensionbase)"; \
-		if [ -f "$(builddir)/_build$(datadir)/glib-2.0/schemas/$(gschemabase).$${i}.gschema.xml" ]; then \
-			$(MKDIR_P) "$(builddir)/_build/$${i}$(extensionbase)/schemas"; \
-			mv "$(builddir)/_build$(datadir)/glib-2.0/schemas/$(gschemabase).$${i}.gschema.xml" "$(builddir)/_build/$${i}$(extensionbase)/schemas"; \
-			glib-compile-schemas "$(builddir)/_build/$${i}$(extensionbase)/schemas"; \
-		fi; \
-		(cd "$(builddir)/_build/$${i}$(extensionbase)"; \
-		 zip -qr "$(abs_builddir)/zip-files/$${i}$(extensionbase).shell-extension.zip" .; \
-		); \
-	done
-	-rm -fR $(builddir)/_build
-
-localprefix = $(HOME)/.local/share/gnome-shell/extensions
-
-local-install: zip-file
-	for i in $(ENABLED_EXTENSIONS); do \
-	    uuid="$${i}$(extensionbase)"; \
-	    zip_file="$(abs_builddir)/zip-files/$${uuid}.shell-extension.zip"; \
-	    if [ -d "$(localprefix)/$${uuid}" ]; then \
-		rm -fR "$(localprefix)/$${uuid}"; \
-	    fi; \
-	    $(MKDIR_P) $(localprefix)/$${uuid}; \
-	    (cd $(localprefix)/$${uuid}; \
-		unzip -q $${zip_file}; \
-	    ); \
-	done

NEWS

@@ -1,3 +1,211 @@
+3.32.0
+======
+
+Contributors:
+  Florian Müllner
+
+Translations:
+  Victor Ibragimov [tg], Kristjan SCHMIDT [eo], Mart Raudsepp [et]
+
+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]
+
+Contributors:
+  Florian Müllner
+
+3.29.90
+=======
+* Misc. bug fixes [Florian; #786496]
+
+Contributors:
+  Florian Müllner
+
+3.29.3
+======
+* Adjust to global.screen removal [Jonas; #759538]
+
+Contributors:
+  Jonas Ådahl, Florian Müllner
+
+3.29.2
+======
+* Misc. bug fixes [Florian; #69]
+
+Contributors:
+  Florian Müllner
+
+3.28.1
+======
+* Misc. bug fixes [Xiaoguang, Florian; #59, #62]
+
+Contributors:
+  Florian Müllner, Xiaoguang Wang
+
+Translators:
+  Dz Chen [zh_CN]
+
+3.28.0
+======
+
+Contributors:
+  Florian Müllner, Xiaoguang Wang
+
+Translators:
+  Aman Alam [pa], Bruce Cowan [en_GB]
+
+3.27.92
+=======
+
+Contributors:
+  Florian Müllner
+
+Translators:
+  Piotr Drąg [es], GNOME Translation Robot [gd], Daniel Șerbănescu [ro]
+
+3.27.91
+=======
+* places-menu: Support unmounting ejectable places [Rémy; #17]
+* apps-menu: Support separators and custom sort order [Florian; #27]
+* Port to meson [Florian; #31, #45]
+* window-list: Fix missing icons on wayland [Florian; #10]
+* places-menu: Fix terminating gnome-shell with recent gjs [Florian; #44]
+* auto-move: Make it work with wayland windows [Florian; #33]
+* Classic theme fixes [Florian, Jonas; #26, #41, #39, #40]
+* Require sassc for classic styling [Florian; !28]
+* Misc. bug fixes [Piotr, Florian; #772211, #32, #30]
+
+Contributors:
+  Jeremy Bicha, Piotr Drąg, Jonas Kümmerlin, Rémy Lefevre, Iñigo Martínez,
+  Florian Müllner
+
+Translators:
+  Matej Urbančič [sl], Kjartan Maraas [nb]
+
+3.27.1
+======
+* updated translations (ca@valencia)
+
+3.26.1
+======
+* native-window-placement: Adjust to gnome-shell changes
+* updated translations: el, fa, ru, sv
+
+3.26.0
+======
+* updated translations (be, bg, ca, da, eu, fi, is, it, ko, lv, ml,
+  nl, pt_BR, vi, zh_TW)
+
+3.25.91
+=======
+* updated translations (ca, fr, it, pl, pt_BR, sr, sr@latin, tr)
+
+3.25.90
+=======
+* updated translations (es, gl, hr, hu, kk, sl, sv, sv)
+
+3.25.4
+======
+* screenshot-window-sizer: Fix backward cycling
+* updated translations (ar, be, ca, cs, de, fur, id, lt, pl, sk)
+
+3.25.3
+======
+* places-menu: Use mount operation if necessary
+* window-list: Respect MWM hints
+* updated translations (es, fur, kk)
+
+3.25.2
+======
+* places-menu: Make URI launching asynchronous
+* updated translations (de, fur, hr, hu, id, sl)
+
+3.25.1
+======
+* apps-menu: Mark copied launchers as trusted
+* places-menu: Make icon lookup asynchronous
+* updated translations (hr)
+
+3.24.1
+======
+* apps-menu: Allow creating desktop launchers via DND
+* updated translations (el, vi)
+
+3.24.0
+======
+* updated translations (lv, tr)
+
+3.23.92
+=======
+* update classic theme
+* updated translations (be, ko, ca, da, cs, ru, lt)
+
+3.23.91
+=======
+* updated translations (de, es, eu, fi, fr, fur, gl, hu, id, it, kk, nb, pl, pt_BR,
+  sk, sr, sr@latin, sv, uk, zh_TW)
+
+3.23.90
+=======
+* window-list: Improve styling
+* window-list: Hide workspace indicator when there's a single (static) workspace
+* new translation (be)
+
+3.23.2
+======
+* alternateTab: Don't take over 'switch-group' shortcut
+* updated translations (zh_CN)
+
 3.22.1
 ======
 * window-list: Update icon on app changes

README

@@ -1,74 +0,0 @@
-GNOME Shell Extensions is a collection of extensions providing additional
-and optional functionality to GNOME Shell.
-
-Since GNOME Shell is not API stable, extensions work only against a very
-specific version of the shell, usually the same as this package (see
-"configure --version"). The extensions in this package are supported by GNOME
-and will be updated to reflect future API changes in GNOME Shell.
-
-For more information about GNOME Shell Extensions
- https://wiki.gnome.org/Projects/GnomeShell/Extensions
-
-For general information about GNOME Shell
- https://wiki.gnome.org/Projects/GnomeShell
-
-Bugs should be reported at https://bugzilla.gnome.org against the 'gnome-shell'
-product, with the 'extensions' component.
-
-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.
-
-auto-move-windows
-
-  Lets you manage your workspaces more easily, assigning a specific workspace to
-each application as soon as it creates a window, in a manner configurable with a
-GSettings key.
-
-dock
-
-  Shows a dock-style task switcher on the right side of the screen.
-
-drive-menu
-  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.
-
-gajim
-
-  Integration with Gajim, a Jabber/XMPP instant messaging client.
-
-native-window-placement
-
-  An alternative algorithm for layouting the thumbnails in the windows overview, that
-  more closely reflects the actual positions and sizes.
-
-places-menu
-
-  Shows a status Indicator for navigating to Places.
-
-user-theme
-
-  Loads a shell theme from ~/.themes/<name>/gnome-shell.
-
-windowsNavigator
-
-  Allow keyboard selection of windows and workspaces in overlay mode.
-
-License
-=======
-GNOME Shell Extensions are distributed under the terms of the GNU General Public License,
-version 2 or later. See the COPYING file for details.
-Individual extensions may be licensed under different terms, see each source
-file for details.
-

README.md

@@ -0,0 +1,76 @@
+# GNOME Shell Extensions
+
+GNOME Shell Extensions is a collection of extensions providing additional
+and optional functionality to GNOME Shell.
+
+Since GNOME Shell is not API stable, extensions work only against a very
+specific version of the shell, usually the same as this package (see
+"configure --version"). The extensions in this package are supported by GNOME
+and will be updated to reflect future API changes in GNOME Shell.
+
+The GNOME wiki has more information about [GNOME Shell Extensions][project-page],
+as well as some general information about [GNOME Shell][shell-page].
+
+Bugs should be reported to the GNOME [bug tracking system][bug-tracker].
+
+## Extensions
+
+ * apps-menu
+
+     Lets you reach an application using gnome 2.x style menu on the panel.
+
+ * auto-move-windows
+
+     Lets you manage your workspaces more easily, assigning a specific workspace to
+each application as soon as it creates a window, in a manner configurable with a
+GSettings key.
+
+ * drive-menu
+ 
+     Shows a status menu for rapid unmount and power off of external storage devices
+  (i.e. pendrives)
+
+ * launch-new-instance
+
+     Changes application icons to always launch a new instance when activated.
+
+ * native-window-placement
+
+     An alternative algorithm for layouting the thumbnails in the windows overview, that
+  more closely reflects the actual positions and sizes.
+
+ * places-menu
+
+     Shows a status Indicator for navigating to Places.
+
+ * screenshot-window-sizer
+
+     Adds a shortcut for resizing the focus window to a size that is suitable for GNOME Software screenshots
+
+ * user-theme
+
+     Loads a shell theme from ~/.themes/<name>/gnome-shell.
+
+ * window-list
+
+     Adds a bottom panel with a traditional window list.
+
+ * windowsNavigator
+
+     Allow keyboard selection of windows and workspaces in overlay mode.
+
+ * workspace-indicator
+
+     Adds a simple workspace switcher to the top bar.
+
+## License
+
+GNOME Shell Extensions are distributed under the terms of the GNU General
+Public License, version 2 or later. See the [COPYING file][license] for details.
+Individual extensions may be licensed under different terms, see each source
+file for details.
+
+[project-page]: https://wiki.gnome.org/Projects/GnomeShell/Extensions
+[shell-page]: https://wiki.gnome.org/Projects/GnomeShell
+[bug-tracker]: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/issues
+[license]: COPYING

autogen.sh

@@ -1,26 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-test -f $srcdir/configure.ac || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level gnome-shell-extensions directory"
-    exit 1
-}
-
-# Fetch submodules if needed
-if test ! -f data/gnome-shell-sass/COPYING;
-then
-  echo "+ Setting up submodules"
-  git submodule init
-fi
-git submodule update
-
-which gnome-autogen.sh || {
-    echo "You need to install gnome-common from GNOME Git (or from"
-    echo "your OS vendor's package manager)."
-    exit 1
-}
-. gnome-autogen.sh

config/.gitignore

@@ -1,3 +0,0 @@
-install-sh
-mkinstalldirs
-missing

configure.ac

@@ -1,98 +0,0 @@
-AC_PREREQ(2.63)
-AC_INIT([gnome-shell-extensions],[3.22.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=extensions])
-
-AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_AUX_DIR([config])
-
-AM_INIT_AUTOMAKE([1.10 dist-xz no-dist-gzip foreign tar-ustar])
-
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-
-GETTEXT_PACKAGE=gnome-shell-extensions
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
-                   [The prefix for our gettext translation domains.])
-
-AM_GNU_GETTEXT_VERSION([0.19.6])
-AM_GNU_GETTEXT([external])
-
-PKG_PROG_PKG_CONFIG([0.22])
-
-GLIB_GSETTINGS
-
-SHELL_VERSION="$PACKAGE_VERSION"
-shell_major=`echo "$PACKAGE_VERSION" | cut -d'.' -f1`
-shell_minor=`echo "$PACKAGE_VERSION" | cut -d'.' -f2`
-if test "$(($shell_minor % 2))" -eq 0; then
-	SHELL_VERSION="$shell_major.$shell_minor"
-fi
-AC_SUBST([SHELL_VERSION])
-
-dnl keep this in alphabetic order
-CLASSIC_EXTENSIONS="apps-menu places-menu alternate-tab launch-new-instance window-list"
-DEFAULT_EXTENSIONS="$CLASSIC_EXTENSIONS drive-menu screenshot-window-sizer windowsNavigator workspace-indicator"
-ALL_EXTENSIONS="$DEFAULT_EXTENSIONS auto-move-windows example native-window-placement user-theme"
-AC_SUBST(CLASSIC_EXTENSIONS, [$CLASSIC_EXTENSIONS])
-AC_SUBST(ALL_EXTENSIONS, [$ALL_EXTENSIONS])
-AC_ARG_ENABLE([extensions],
-	[AS_HELP_STRING([--enable-extensions],[Space separated list of extensions to enable.
-	The default is to build and distribute all extensions that can be installed in the home directory and have no external depedencies.
-	Use "all" to enable all available extensions, or "classic-mode" to enable extensions that restore GNOME 2 functionality.])],
-	[],
-	[enable_extensions=$DEFAULT_EXTENSIONS]
-)
-
-if test x"$enable_extensions" = xall; then
-   enable_extensions="$ALL_EXTENSIONS"
-   enable_classic_mode_default=yes
-elif test x"$enable_extensions" = xclassic-mode; then
-   enable_extensions="$CLASSIC_EXTENSIONS"
-   enable_classic_mode_default=yes
-else
-   enable_classic_mode_default=no
-fi
-
-AC_ARG_ENABLE([classic-mode],
-        [AS_HELP_STRING([--enable-classic-mode],[Enable installing data files for classic mode.
-        Defaults to yes if enabling all or classic-mode extensions, and no otherwise.])],
-        [],
-        [enable_classic_mode=$enable_classic_mode_default])
-AM_CONDITIONAL([CLASSIC_MODE], [test x"$enable_classic_mode" != xno])
-
-ENABLED_EXTENSIONS=
-for e in $enable_extensions; do
-	case $e in
-dnl		keep this in alphabetic order
-		alternate-tab|apps-menu|auto-move-windows|drive-menu|example|launch-new-instance|native-window-placement|places-menu|screenshot-window-sizer|user-theme|window-list|windowsNavigator|workspace-indicator)
-			ENABLED_EXTENSIONS="$ENABLED_EXTENSIONS $e"
-			;;
-		*)
-			AC_MSG_ERROR([invalid extension $e])
-	esac
-done
-
-AC_SUBST(ENABLED_EXTENSIONS, [$ENABLED_EXTENSIONS])
-
-AC_PATH_PROG([SASS],[sass],[])
-
-dnl Please keep this sorted alphabetically
-AC_CONFIG_FILES([
-  data/Makefile
-  extensions/alternate-tab/Makefile
-  extensions/apps-menu/Makefile
-  extensions/auto-move-windows/Makefile
-  extensions/drive-menu/Makefile
-  extensions/example/Makefile
-  extensions/launch-new-instance/Makefile
-  extensions/native-window-placement/Makefile
-  extensions/places-menu/Makefile
-  extensions/screenshot-window-sizer/Makefile
-  extensions/user-theme/Makefile
-  extensions/window-list/Makefile
-  extensions/windowsNavigator/Makefile
-  extensions/workspace-indicator/Makefile
-  extensions/Makefile
-  Makefile
-  po/Makefile.in
-])
-AC_OUTPUT

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

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

data/HACKING

@@ -1,6 +1,2 @@
-To generate the css files, from the project directory:
-
-sass --sourcemap=none --update .
-
 To update the gnome-shell-sass submodule to latest upstream commit:
 git submodule update --rebase

data/Makefile.am

@@ -1,73 +0,0 @@
-include $(top_srcdir)/include.mk
-
-sessiondir = $(datadir)/gnome-session/sessions
-session_in_files = gnome-classic.session.desktop.in
-session_DATA = $(session_in_files:.session.desktop.in=.session)
-
-xsessiondir = $(datadir)/xsessions
-xsession_in_files = gnome-classic.desktop.in
-xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
-
-modedir = $(datadir)/gnome-shell/modes
-mode_in_files = classic.json.in
-mode_DATA = $(mode_in_files:.json.in=.json)
-
-themedir = $(datadir)/gnome-shell/theme
-theme_DATA = 				\
-	$(srcdir)/calendar-today.svg		\
-	$(srcdir)/classic-process-working.svg		\
-	$(srcdir)/classic-toggle-off-intl.svg		\
-	$(srcdir)/classic-toggle-off-us.svg		\
-	$(srcdir)/classic-toggle-on-intl.svg		\
-	$(srcdir)/classic-toggle-on-us.svg		\
-	$(srcdir)/gnome-classic.css			\
-	$(srcdir)/gnome-classic-high-contrast.css	\
-	$(NULL)
-
-theme_sources =							\
-	$(srcdir)/gnome-classic.scss				\
-	$(srcdir)/gnome-shell-sass/_colors.scss			\
-	$(srcdir)/gnome-shell-sass/_common.scss			\
-	$(srcdir)/gnome-shell-sass/_drawing.scss		\
-	$(srcdir)/gnome-shell-sass/_high-contrast-colors.scss	\
-	$(NULL)
-
-%.css: %.scss $(theme_sources)
-	@if test -n "$(SASS)"; then \
-		if $(AM_V_P); then PS4= set -x; else echo "  GEN      $@"; fi; \
-		$(SASS) --sourcemap=none --update -f -q $<; \
-	fi
-
-gsettings_SCHEMAS = org.gnome.shell.extensions.classic-overrides.gschema.xml
-
-@GSETTINGS_RULES@
-
-%.desktop:%.desktop.in
-	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
-
-%.session: %.session.desktop.in
-	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
-
-comma:=,
-empty:=
-space:= $(empty) $(empty)
-extensions:=$(patsubst %,\"%$(extensionbase)\",$(CLASSIC_EXTENSIONS))
-extension_list:=$(subst $(space),$(comma),$(extensions))
-%.json:%.json.in
-	$(AM_V_GEN) sed \
-		-e "s|\@CLASSIC_EXTENSIONS\@|$(extension_list)|g" \
-		$< > $@
-
-EXTRA_DIST = \
-	$(session_in_files) \
-	$(xsession_in_files) \
-	$(mode_in_files) \
-	$(gsettings_SCHEMAS) \
-	$(theme_DATA) \
-	$(NULL)
-
-CLEANFILES = \
-	$(session_DATA) \
-	$(xsession_DATA) \
-	$(mode_DATA) \
-	$(NULL)

data/gnome-classic.scss

@@ -7,7 +7,7 @@ $variant: 'light';
 
 /* Overrides */
 
-#panel {
+#panel, #panel.solid {
   font-weight: normal;
   background-color: $bg_color;
   background-gradient-direction: vertical;
@@ -31,6 +31,7 @@ $variant: 'light';
     -minimum-hpadding: 4px;
     font-weight: normal;
     color: $fg_color;
+    text-shadow: none;
     &:active, &:overview, &:focus, &:checked {
       // Trick due to St limitations. It needs a background to draw
       // a box-shadow
@@ -39,7 +40,15 @@ $variant: 'light';
       box-shadow: none;
       & > .system-status-icon { icon-shadow: none; }
     }
+    &:hover {
+      text-shadow: none;
+      & .system-status-icon { icon-shadow: none; }
+    }
     .app-menu-icon { width: 0; height: 0; margin: 0; } // shell's display:none; :D
+
+    .system-status-icon {
+      icon-shadow: none;
+    }
   }
 
   .panel-corner,
@@ -81,3 +90,16 @@ $variant: 'light';
 .calendar-day-with-events {
   background-image: url("calendar-today.svg");
 }
+
+.message-list-clear-button.button {
+  color: $fg_color
+}
+
+.notification-banner {
+  background-color: $bg_color !important;
+  color: $fg_color;
+  .notification-button {
+    background-color: darken($bg_color,5%);
+    &:hover, &focus { background-color: darken($bg_color,2%); }
+  }
+}

data/gnome-classic.session.desktop.in

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

data/meson.build

@@ -0,0 +1,63 @@
+sessions = [
+  ['gnome-classic.session.desktop.in', sessiondir],
+  ['gnome-classic.desktop.in', xsessiondir]
+]
+foreach s : sessions
+  name_array = s[0].split('.')
+  i18n.merge_file('',
+    input:  s[0],
+    output: '.'.join([name_array[0], name_array[1]]),
+    po_dir: '../po',
+    install: true,
+    install_dir: s[1],
+    type: 'desktop'
+  )
+endforeach
+
+classic_uuids = []
+foreach e : classic_extensions
+    classic_uuids += e + uuid_suffix
+endforeach
+
+mode_conf = configuration_data()
+mode_conf.set('CLASSIC_EXTENSIONS', '"' + '", "'.join(classic_uuids) + '"')
+
+mode_file = 'classic.json'
+configure_file(
+  input: mode_file + '.in',
+  output: mode_file,
+  configuration: mode_conf,
+  install_dir: modedir
+)
+
+theme_sources = files(
+  'gnome-shell-sass/_colors.scss',
+  'gnome-shell-sass/_common.scss',
+  'gnome-shell-sass/_drawing.scss',
+  'gnome-shell-sass/_high-contrast-colors.scss'
+)
+
+theme_data = [
+  'calendar-today.svg',
+  'classic-process-working.svg',
+  'classic-toggle-off-intl.svg',
+  'classic-toggle-off-us.svg',
+  'classic-toggle-on-intl.svg',
+  'classic-toggle-on-us.svg',
+  'gnome-classic-high-contrast.css'
+]
+
+style = 'gnome-classic'
+custom_target(style + '.css',
+  input: style + '.scss',
+  output: style + '.css',
+  depend_files: theme_sources,
+  command: [sassc, '-a', '@INPUT@', '@OUTPUT@'],
+  install: true,
+  install_dir: themedir
+)
+
+install_data(theme_data, install_dir: themedir)
+
+classic_override = '00_org.gnome.shell.extensions.classic.gschema.override'
+install_data(classic_override, install_dir: schemadir)

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

@@ -1,46 +0,0 @@
-<schemalist>
-  <schema id="org.gnome.shell.extensions.classic-overrides"
-          path="/org/gnome/shell/extensions/classic-overrides/"
-	  gettext-domain="gnome-shell-extensions">
-    <key name="attach-modal-dialogs" type="b">
-      <default>true</default>
-      <summary>Attach modal dialog to the parent window</summary>
-      <description>
-        This key overrides the key in org.gnome.mutter when running
-        GNOME Shell.
-      </description>
-    </key>
-
-    <key name="button-layout" type="s">
-      <default>"appmenu:minimize,maximize,close"</default>
-      <summary>Arrangement of buttons on the titlebar</summary>
-      <description>
-        This key overrides the key in org.gnome.desktop.wm.preferences when running GNOME Shell.
-      </description>
-    </key>
-
-    <key name="edge-tiling" type="b">
-      <default>true</default>
-      <summary>Enable edge tiling when dropping windows on screen edges</summary>
-      <description>
-        This key overrides the key in org.gnome.mutter when running GNOME Shell.
-      </description>
-    </key>
-
-    <key name="workspaces-only-on-primary" type="b">
-      <default>true</default>
-      <summary>Workspaces only on primary monitor</summary>
-      <description>
-        This key overrides the key in org.gnome.mutter when running GNOME Shell.
-      </description>
-    </key>
-
-    <key name="focus-change-on-pointer-rest" type="b">
-      <default>true</default>
-      <summary>Delay focus changes in mouse mode until the pointer stops moving</summary>
-      <description>
-        This key overrides the key in org.gnome.mutter when running GNOME Shell.
-      </description>
-    </key>
-  </schema>
-</schemalist>

export-zips.sh

@@ -0,0 +1,37 @@
+#!/bin/sh
+
+srcdir=`dirname $0`
+srcdir=`(cd $srcdir && pwd)`
+
+builddir=`mktemp -p $srcdir -d _build.XXXXXX` || exit 1
+installdir=`mktemp -p $srcdir -d _install.XXXXXX` || exit 1
+
+meson setup --prefix=$installdir -Dextension_set=all $srcdir $builddir
+ninja -C$builddir install
+
+rm -rf $srcdir/zip-files
+mkdir $srcdir/zip-files
+
+extensiondir=$installdir/share/gnome-shell/extensions
+schemadir=$installdir/share/glib-2.0/schemas
+localedir=$installdir/share/locale
+
+for f in $extensiondir/*; do
+  name=`basename ${f%%@*}`
+  uuid=$name@gnome-shell-extensions.gcampax.github.com
+  schema=$schemadir/org.gnome.shell.extensions.$name.gschema.xml
+
+  cp $srcdir/NEWS $srcdir/COPYING $f
+  cp -r $localedir $f
+
+  if [ -f $schema ]; then
+    mkdir $f/schemas
+    cp $schema $f/schemas;
+    glib-compile-schemas $f/schemas
+  fi
+
+  (cd $f && zip -rmq $srcdir/zip-files/$uuid.shell-extension.zip .)
+done
+
+rm -rf $builddir
+rm -rf $installdir

extension.mk

@@ -1,18 +0,0 @@
-include $(top_srcdir)/include.mk
-
-dist_extension_DATA = extension.js stylesheet.css $(EXTRA_MODULES)
-nodist_extension_DATA = metadata.json $(top_srcdir)/lib/convenience.js $(EXTRA_EXTENSION)
-
-EXTRA_DIST = metadata.json.in
-
-metadata.json: metadata.json.in $(top_builddir)/config.status
-	$(AM_V_GEN) sed \
-            -e "s|[@]extension_id@|$(EXTENSION_ID)|" \
-	    -e "s|[@]uuid@|$(uuid)|" \
-	    -e "s|[@]gschemaname@|$(gschemaname)|" \
-	    -e "s|[@]gettext_domain@|$(GETTEXT_PACKAGE)|" \
-	    -e "s|[@]shell_current@|$(SHELL_VERSION)|" \
-	    -e "s|[@]url@|$(extensionurl)|" \
-	    $< > $@
-
-CLEANFILES = metadata.json

extensions/Makefile.am

@@ -1,3 +0,0 @@
-DIST_SUBDIRS = $(ALL_EXTENSIONS)
-
-SUBDIRS = $(ENABLED_EXTENSIONS)

extensions/alternate-tab/Makefile.am

@@ -1,5 +0,0 @@
-EXTENSION_ID = alternate-tab
-
-EXTRA_MODULES = prefs.js
-
-include ../../extension.mk

extensions/alternate-tab/extension.js

@@ -1,65 +0,0 @@
-/* -*- mode: js; js-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const Clutter = imports.gi.Clutter;
-const Lang = imports.lang;
-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:
-            case Meta.KeyBindingAction.SWITCH_GROUP:
-              action = Meta.KeyBindingAction.SWITCH_WINDOWS;
-              break;
-            case Meta.KeyBindingAction.SWITCH_APPLICATIONS_BACKWARD:
-            case Meta.KeyBindingAction.SWITCH_GROUP_BACKWARD:
-              action = Meta.KeyBindingAction.SWITCH_WINDOWS_BACKWARD;
-              break;
-        }
-        return injections['_keyPressHandler'].call(this, keysym, action);
-    };
-
-    Main.wm._forcedWindowSwitcher = function(display, screen, window, binding) {
-        /* prevent a corner case where both popups show up at once */
-        if (this._workspaceSwitcherPopup != null)
-            this._workspaceSwitcherPopup.destroy();
-
-        let tabPopup = new AltTab.WindowSwitcherPopup();
-
-        if (!tabPopup.show(binding.is_reversed(), binding.get_name(), binding.get_mask()))
-            tabPopup.destroy();
-    };
-
-    setKeybinding('switch-applications', Lang.bind(Main.wm, Main.wm._forcedWindowSwitcher));
-    setKeybinding('switch-group', Lang.bind(Main.wm, Main.wm._forcedWindowSwitcher));
-    setKeybinding('switch-applications-backward', Lang.bind(Main.wm, Main.wm._forcedWindowSwitcher));
-    setKeybinding('switch-group-backward', Lang.bind(Main.wm, Main.wm._forcedWindowSwitcher));
-}
-
-function disable() {
-    var prop;
-
-    setKeybinding('switch-applications', Lang.bind(Main.wm, Main.wm._startSwitcher));
-    setKeybinding('switch-group', Lang.bind(Main.wm, Main.wm._startSwitcher));
-    setKeybinding('switch-applications-backward', Lang.bind(Main.wm, Main.wm._startSwitcher));
-    setKeybinding('switch-group-backward', Lang.bind(Main.wm, Main.wm._startSwitcher));
-
-    for (prop in injections)
-        AltTab.WindowSwitcherPopup.prototype[prop] = injections[prop];
-    delete Main.wm._forcedWindowSwitcher;
-}

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 Bugzilla instead.",
-"original-authors": [  "jw@bargsten.org", "thomas.bouffon@gmail.com" ],
-"shell-version": [ "@shell_current@" ],
-"url": "@url@"
-}

extensions/alternate-tab/prefs.js

@@ -1,85 +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 Lang = imports.lang;
-
-const Gettext = imports.gettext.domain('gnome-shell-extensions');
-const _ = Gettext.gettext;
-const N_ = function(e) { return 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 = new GObject.Class({
-    Name: 'AlternateTab.Prefs.AltTabSettingsWidget',
-    GTypeName: 'AltTabSettingsWidget',
-    Extends: Gtk.Grid,
-
-    _init : function(params) {
-        this.parent(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', Lang.bind(this, function(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/Makefile.am

@@ -1,3 +0,0 @@
-EXTENSION_ID = apps-menu
-
-include ../../extension.mk

extensions/apps-menu/extension.js

@@ -1,25 +1,19 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* exported init enable disable */
 
-const Atk = imports.gi.Atk;
+const {
-const GMenu = imports.gi.GMenu;
+    Atk, Clutter, Gio, GLib, GMenu, GObject, Gtk, Meta, Shell, St
-const Lang = imports.lang;
+} = imports.gi;
-const Shell = imports.gi.Shell;
+const DND = imports.ui.dnd;
-const St = imports.gi.St;
-const Clutter = imports.gi.Clutter;
 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
-const Gtk = imports.gi.Gtk;
-const GLib = imports.gi.GLib;
 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();
 
@@ -28,75 +22,93 @@ const HORIZ_FACTOR = 5;
 const MENU_HEIGHT_OFFSET = 132;
 const NAVIGATION_REGION_OVERSHOOT = 50;
 
-const ActivitiesMenuItem = new Lang.Class({
+Gio._promisify(Gio._LocalFilePrototype, 'query_info_async', 'query_info_finish');
-    Name: 'ActivitiesMenuItem',
+Gio._promisify(Gio._LocalFilePrototype, 'set_attributes_async', 'set_attributes_finish');
-    Extends: PopupMenu.PopupBaseMenuItem,
 
-    _init: function(button) {
+class ActivitiesMenuItem extends PopupMenu.PopupBaseMenuItem {
-	this.parent();
+    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: function(event) {
+    activate(event) {
         this._button.menu.toggle();
         Main.overview.toggle();
-	this.parent(event);
+        super.activate(event);
-    },
+    }
-});
+}
 
-const ApplicationMenuItem = new Lang.Class({
+class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
-    Name: 'ApplicationMenuItem',
+    constructor(button, app) {
-    Extends: PopupMenu.PopupBaseMenuItem,
+        super();
-
+        this._app = app;
-    _init: function(button, app) {
-	this.parent();
-	this._app = app;
         this._button = button;
 
         this._iconBin = new St.Bin();
         this.actor.add_child(this._iconBin);
 
-        let appLabel = new St.Label({ text: app.get_name(), y_expand: true,
+        let appLabel = new St.Label({
-                                      y_align: Clutter.ActorAlign.CENTER });
+            text: app.get_name(),
-        this.actor.add_child(appLabel, { expand: true });
+            y_expand: true,
+            y_align: Clutter.ActorAlign.CENTER
+        });
+        this.actor.add_child(appLabel);
         this.actor.label_actor = appLabel;
 
         let textureCache = St.TextureCache.get_default();
         let iconThemeChangedId = textureCache.connect('icon-theme-changed',
-                                                      Lang.bind(this, this._updateIcon));
+                                                      this._updateIcon.bind(this));
-        this.actor.connect('destroy', Lang.bind(this,
+        this.actor.connect('destroy', () => {
-            function() {
+            textureCache.disconnect(iconThemeChangedId);
-                textureCache.disconnect(iconThemeChangedId);
+        });
-            }));
         this._updateIcon();
-    },
 
-    activate: function(event) {
+        this.actor._delegate = this;
-	this._app.open_new_window(-1);
+        let draggable = DND.makeDraggable(this.actor);
-        this._button.selectCategory(null, null);
+
+        let maybeStartDrag = draggable._maybeStartDrag;
+        draggable._maybeStartDrag = (event) => {
+            if (this._dragEnabled)
+                return maybeStartDrag.call(draggable, event);
+            return false;
+        };
+    }
+
+    activate(event) {
+        this._app.open_new_window(-1);
+        this._button.selectCategory(null);
         this._button.menu.toggle();
-	this.parent(event);
+        super.activate(event);
-    },
+    }
 
-    setActive: function(active, params) {
+    setActive(active, params) {
         if (active)
             this._button.scrollToButton(this);
-        this.parent(active, params);
+        super.setActive(active, params);
-    },
-
-    _updateIcon: function() {
-        this._iconBin.set_child(this._app.create_icon_texture(APPLICATION_ICON_SIZE));
     }
-});
 
-const CategoryMenuItem = new Lang.Class({
+    setDragEnabled(enable) {
-    Name: 'CategoryMenuItem',
+        this._dragEnabled = enable;
-    Extends: PopupMenu.PopupBaseMenuItem,
+    }
 
-    _init: function(button, category) {
+    getDragActor() {
-	this.parent();
+        return this._app.create_icon_texture(APPLICATION_ICON_SIZE);
-	this._category = category;
+    }
+
+    getDragActorSource() {
+        return this._iconBin;
+    }
+
+    _updateIcon() {
+        this._iconBin.set_child(this.getDragActor());
+    }
+}
+
+class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
+    constructor(button, category) {
+        super();
+        this._category = category;
         this._button = button;
 
         this._oldX = -1;
@@ -106,19 +118,19 @@ const CategoryMenuItem = new Lang.Class({
         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', Lang.bind(this, this._onMotionEvent));
+        this.actor.connect('motion-event', this._onMotionEvent.bind(this));
-    },
+    }
 
-    activate: function(event) {
+    activate(event) {
-        this._button.selectCategory(this._category, this);
+        this._button.selectCategory(this._category);
         this._button.scrollToCatButton(this);
-	this.parent(event);
+        super.activate(event);
-    },
+    }
 
-    _isNavigatingSubmenu: function([x, y]) {
+    _isNavigatingSubmenu([x, y]) {
         let [posX, posY] = this.actor.get_transformed_position();
 
         if (this._oldX == -1) {
@@ -170,12 +182,12 @@ const CategoryMenuItem = new Lang.Class({
         // 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;
-    },
+    }
 
-    _onMotionEvent: function(actor, event) {
+    _onMotionEvent(actor, event) {
         if (!Clutter.get_pointer_grab()) {
             this._oldX = -1;
             this._oldY = -1;
@@ -196,202 +208,332 @@ const CategoryMenuItem = new Lang.Class({
             source.sync_hover();
 
         return false;
-    },
+    }
 
-    setActive: function(active, params) {
+    setActive(active, params) {
         if (active) {
-            this._button.selectCategory(this._category, this);
+            this._button.selectCategory(this._category);
             this._button.scrollToCatButton(this);
         }
-        this.parent(active, params);
+        super.setActive(active, params);
     }
-});
+}
 
-const ApplicationsMenu = new Lang.Class({
+class ApplicationsMenu extends PopupMenu.PopupMenu {
-    Name: 'ApplicationsMenu',
+    constructor(sourceActor, arrowAlignment, arrowSide, button) {
-    Extends: PopupMenu.PopupMenu,
+        super(sourceActor, arrowAlignment, arrowSide);
-
-    _init: function(sourceActor, arrowAlignment, arrowSide, button) {
-        this.parent(sourceActor, arrowAlignment, arrowSide);
         this._button = button;
-    },
+    }
 
-    isEmpty: function() {
+    isEmpty() {
-	return false;
+        return false;
-    },
+    }
 
-    open: function(animate) {
+    open(animate) {
         this._button.hotCorner.setBarrierSize(0);
         if (this._button.hotCorner.actor) // fallback corner
             this._button.hotCorner.actor.hide();
-        this.parent(animate);
+        super.open(animate);
-    },
+    }
 
-    close: function(animate) {
+    close(animate) {
         let size = Main.layoutManager.panelBox.height;
         this._button.hotCorner.setBarrierSize(size);
         if (this._button.hotCorner.actor) // fallback corner
             this._button.hotCorner.actor.show();
-        this.parent(animate);
+        super.close(animate);
-    },
+    }
 
-    toggle: function() {
+    toggle() {
         if (this.isOpen) {
-            this._button.selectCategory(null, null);
+            this._button.selectCategory(null);
         } else {
             if (Main.overview.visible)
                 Main.overview.hide();
         }
-        this.parent();
+        super.toggle();
     }
-});
+}
 
-const ApplicationsButton = new Lang.Class({
+class DesktopTarget {
-    Name: 'ApplicationsButton',
+    constructor() {
-    Extends: PanelMenu.Button,
+        this._desktop = null;
+        this._desktopDestroyedId = 0;
 
-    _init: function() {
+        this._windowAddedId =
-        this.parent(1.0, null, false);
+            global.window_group.connect('actor-added',
+                                        this._onWindowAdded.bind(this));
 
-        this.setMenu(new ApplicationsMenu(this.actor, 1.0, St.Side.TOP, this));
+        global.get_window_actors().forEach(a => {
+            this._onWindowAdded(a.get_parent(), a);
+        });
+    }
+
+    get hasDesktop() {
+        return this._desktop != null;
+    }
+
+    _onWindowAdded(group, actor) {
+        if (!(actor instanceof Meta.WindowActor))
+            return;
+
+        if (actor.meta_window.get_window_type() == Meta.WindowType.DESKTOP)
+            this._setDesktop(actor);
+    }
+
+    _setDesktop(desktop) {
+        if (this._desktop) {
+            this._desktop.disconnect(this._desktopDestroyedId);
+            this._desktopDestroyedId = 0;
+
+            delete this._desktop._delegate;
+        }
+
+        this._desktop = desktop;
+        this.emit('desktop-changed');
+
+        if (this._desktop) {
+            this._desktopDestroyedId = this._desktop.connect('destroy', () => {
+                this._setDesktop(null);
+            });
+            this._desktop._delegate = this;
+        }
+    }
+
+    _getSourceAppInfo(source) {
+        if (!(source instanceof ApplicationMenuItem))
+            return null;
+        return source._app.app_info;
+    }
+
+    async _markTrusted(file) {
+        let modeAttr = Gio.FILE_ATTRIBUTE_UNIX_MODE;
+        let trustedAttr = 'metadata::trusted';
+        let queryFlags = Gio.FileQueryInfoFlags.NONE;
+        let ioPriority = GLib.PRIORITY_DEFAULT;
+
+        try {
+            let info = await file.query_info_async(modeAttr, queryFlags, ioPriority, null);
+
+            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
+            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() {
+        if (this._windowAddedId)
+            global.window_group.disconnect(this._windowAddedId);
+        this._windowAddedId = 0;
+
+        this._setDesktop(null);
+    }
+
+    handleDragOver(source, _actor, _x, _y, _time) {
+        let appInfo = this._getSourceAppInfo(source);
+        if (!appInfo)
+            return DND.DragMotionResult.CONTINUE;
+
+        return DND.DragMotionResult.COPY_DROP;
+    }
+
+    acceptDrop(source, _actor, _x, _y, _time) {
+        let appInfo = this._getSourceAppInfo(source);
+        if (!appInfo)
+            return false;
+
+        this.emit('app-dropped');
+
+        let desktop = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_DESKTOP);
+
+        let src = Gio.File.new_for_path(appInfo.get_filename());
+        let dst = Gio.File.new_for_path(GLib.build_filenamev([desktop, src.get_basename()]));
+
+        try {
+            // 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}`);
+        }
+
+        return true;
+    }
+}
+Signals.addSignalMethods(DesktopTarget.prototype);
+
+let ApplicationsButton = GObject.registerClass(
+class ApplicationsButton extends PanelMenu.Button {
+    _init() {
+        super._init(1.0, null, false);
+
+        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"),
+        this._label = new St.Label({
-                                     y_expand: true,
+            text: _('Applications'),
-                                     y_align: Clutter.ActorAlign.CENTER });
+            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.add_actor(hbox);
-        this.actor.name = 'panelApplications';
+        this.name = 'panelApplications';
-        this.actor.label_actor = this._label;
+        this.label_actor = this._label;
 
-        this.actor.connect('captured-event', Lang.bind(this, this._onCapturedEvent));
+        this.connect('captured-event', this._onCapturedEvent.bind(this));
-        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
 
-        this._showingId = Main.overview.connect('showing', Lang.bind(this, function() {
+        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', Lang.bind(this, function() {
+        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',
-                                   Lang.bind(this, this._setKeybinding));
+                                   this._setKeybinding.bind(this));
         this._setKeybinding();
 
+        this._desktopTarget = new DesktopTarget();
+        this._desktopTarget.connect('app-dropped', () => {
+            this.menu.close();
+        });
+        this._desktopTarget.connect('desktop-changed', () => {
+            this._applicationsButtons.forEach(item => {
+                item.setDragEnabled(this._desktopTarget.hasDesktop);
+            });
+        });
+
+        this._tree = new GMenu.Tree({ menu_basename: 'applications.menu' });
+        this._treeChangedId = this._tree.connect('changed',
+                                                 this._onTreeChanged.bind(this));
+
+        this._applicationsButtons = new Map();
         this.reloadFlag = false;
         this._createLayout();
         this._display();
-        this._installedChangedId = appSys.connect('installed-changed', Lang.bind(this, function() {
+        this._installedChangedId = appSys.connect('installed-changed',
-            if (this.menu.isOpen) {
+                                                  this._onTreeChanged.bind(this));
-                this._redisplay();
+    }
-                this.mainBox.show();
-            } else {
-                this.reloadFlag = true;
-            }
-        }));
 
-        // Since the hot corner uses stage coordinates, Clutter won't
+    _onTreeChanged() {
-        // queue relayouts for us when the panel moves. Queue a relayout
+        if (this.menu.isOpen) {
-        // when that happens.
+            this._redisplay();
-        this._panelBoxChangedId = Main.layoutManager.connect('panel-box-changed', Lang.bind(this, function() {
+            this.mainBox.show();
-            container.queue_relayout();
+        } else {
-        }));
+            this.reloadFlag = true;
-    },
+        }
+    }
 
     get hotCorner() {
         return Main.layoutManager.hotCorners[Main.layoutManager.primaryIndex];
-    },
+    }
 
-    _createVertSeparator: function() {
+    _createVertSeparator() {
-        let separator = new St.DrawingArea({ style_class: 'calendar-vertical-separator',
+        let separator = new St.DrawingArea({
-                                             pseudo_class: 'highlighted' });
+            style_class: 'calendar-vertical-separator',
-        separator.connect('repaint', Lang.bind(this, this._onVertSepRepaint));
+            pseudo_class: 'highlighted'
+        });
+        separator.connect('repaint', this._onVertSepRepaint.bind(this));
         return separator;
-    },
+    }
 
-    _onDestroy: function() {
+    _onDestroy() {
         Main.overview.disconnect(this._showingId);
         Main.overview.disconnect(this._hidingId);
-        Main.layoutManager.disconnect(this._panelBoxChangedId);
         appSys.disconnect(this._installedChangedId);
+        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 ?
+                                           handler);
-                                           Lang.bind(Main.overview, Main.overview.toggle) :
-                                           null);
-    },
 
-    _onCapturedEvent: function(actor, event) {
+        this._desktopTarget.destroy();
+    }
+
+    _onCapturedEvent(actor, event) {
         if (event.type() == Clutter.EventType.BUTTON_PRESS) {
             if (!Main.overview.shouldToggleByCornerOrButton())
                 return true;
         }
         return false;
-    },
+    }
 
-    _onMenuKeyPress: function(actor, event) {
+    _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
+            let direction = symbol == Clutter.KEY_Left ?
-                                                       : Gtk.DirectionType.RIGHT;
+                Gtk.DirectionType.LEFT : Gtk.DirectionType.RIGHT;
             if (this.menu.actor.navigate_focus(global.stage.key_focus, direction, false))
                 return true;
         }
-        return this.parent(actor, event);
+        return super._onMenuKeyPress(actor, event);
-    },
+    }
 
-    _onVertSepRepaint: function(area) {
+    _onVertSepRepaint(area) {
         let cr = area.get_context();
         let themeNode = area.get_theme_node();
         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);
         cr.setDash([1, 3], 1); // Hard-code for now
         cr.setLineWidth(stippleWidth);
         cr.stroke();
-    },
+    }
 
-    _onOpenStateChanged: function(menu, open) {
+    _onOpenStateChanged(menu, open) {
-       if (open) {
+        if (open) {
-           if (this.reloadFlag) {
+            if (this.reloadFlag) {
-               this._redisplay();
+                this._redisplay();
-               this.reloadFlag = false;
+                this.reloadFlag = false;
-           }
+            }
-           this.mainBox.show();
+            this.mainBox.show();
-       }
+        }
-       this.parent(menu, open);
+        super._onOpenStateChanged(menu, open);
-    },
+    }
 
-    _setKeybinding: function() {
+    _setKeybinding() {
         Main.wm.setCustomKeybindingHandler('panel-main-menu',
                                            Shell.ActionMode.NORMAL |
                                            Shell.ActionMode.OVERVIEW,
-                                           Lang.bind(this, function() {
+                                           () => this.menu.toggle());
-                                               this.menu.toggle();
+    }
-                                           }));
-    },
 
-    _redisplay: function() {
+    _redisplay() {
         this.applicationsBox.destroy_all_children();
         this.categoriesBox.destroy_all_children();
         this._display();
-    },
+    }
 
-    _loadCategory: function(categoryId, dir) {
+    _loadCategory(categoryId, dir) {
         let iter = dir.iter();
         let nextType;
         while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
@@ -400,7 +542,7 @@ const ApplicationsButton = new Lang.Class({
                 let id;
                 try {
                     id = entry.get_desktop_file_id(); // catch non-UTF8 filenames
-                } catch(e) {
+                } catch (e) {
                     continue;
                 }
                 let app = appSys.lookup_app(id);
@@ -408,15 +550,17 @@ const ApplicationsButton = new Lang.Class({
                     app = new Shell.App({ app_info: entry.get_app_info() });
                 if (app.get_app_info().should_show())
                     this.applicationsByCategory[categoryId].push(app);
+            } else if (nextType == GMenu.TreeItemType.SEPARATOR) {
+                this.applicationsByCategory[categoryId].push('separator');
             } else if (nextType == GMenu.TreeItemType.DIRECTORY) {
                 let subdir = iter.get_directory();
                 if (!subdir.get_is_nodisplay())
                     this._loadCategory(categoryId, subdir);
             }
         }
-    },
+    }
 
-    scrollToButton: function(button) {
+    scrollToButton(button) {
         let appsScrollBoxAdj = this.applicationsScrollBox.get_vscroll_bar().get_adjustment();
         let appsScrollBoxAlloc = this.applicationsScrollBox.get_allocation_box();
         let currentScrollValue = appsScrollBoxAdj.get_value();
@@ -429,9 +573,9 @@ const ApplicationsButton = new Lang.Class({
             newScrollValue = buttonAlloc.y2 - boxHeight + 10;
         if (newScrollValue != currentScrollValue)
             appsScrollBoxAdj.set_value(newScrollValue);
-    },
+    }
 
-    scrollToCatButton: function(button) {
+    scrollToCatButton(button) {
         let catsScrollBoxAdj = this.categoriesScrollBox.get_vscroll_bar().get_adjustment();
         let catsScrollBoxAlloc = this.categoriesScrollBox.get_allocation_box();
         let currentScrollValue = catsScrollBoxAdj.get_value();
@@ -444,133 +588,148 @@ const ApplicationsButton = new Lang.Class({
             newScrollValue = buttonAlloc.y2 - boxHeight + 10;
         if (newScrollValue != currentScrollValue)
             catsScrollBoxAdj.set_value(newScrollValue);
-    },
+    }
 
-    _createLayout: function() {
+    _createLayout() {
         let section = new PopupMenu.PopupMenuSection();
         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,
+        this.applicationsScrollBox = new St.ScrollView({
-                                                         y_align: St.Align.START,
+            x_fill: true,
-                                                         style_class: 'apps-menu vfade' });
+            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', Lang.bind(this, function() {
+        vscroll.connect('scroll-start', () => {
             this.menu.passEvents = true;
-        }));
+        });
-        vscroll.connect('scroll-stop', Lang.bind(this, function() {
+        vscroll.connect('scroll-stop', () => {
             this.menu.passEvents = false;
-        }));
+        });
-        this.categoriesScrollBox = new St.ScrollView({ x_fill: true, y_fill: false,
+        this.categoriesScrollBox = new St.ScrollView({
-                                                       y_align: St.Align.START,
+            x_fill: true,
-                                                       style_class: 'vfade' });
+            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', Lang.bind(this, function() {
+        vscroll.connect('scroll-start', () => this.menu.passEvents = true);
-                              this.menu.passEvents = true;
+        vscroll.connect('scroll-stop', () => this.menu.passEvents = false);
-                          }));
+        this.leftBox.add(this.categoriesScrollBox, {
-        vscroll.connect('scroll-stop', Lang.bind(this, function() {
+            expand: true,
-            this.menu.passEvents = false;
+            x_fill: true,
-        }));
+            y_fill: true,
-        this.leftBox.add(this.categoriesScrollBox, { expand: true,
+            y_align: St.Align.START
-                                                     x_fill: true, y_fill: true,
+        });
-                                                     y_align: St.Align.START });
 
         let activities = new ActivitiesMenuItem(this);
-        this.leftBox.add(activities.actor, { expand: false,
+        this.leftBox.add(activities.actor, {
-                                             x_fill: true, y_fill: false,
+            expand: false,
-                                             y_align: St.Align.START });
+            x_fill: true,
+            y_fill: false,
+            y_align: St.Align.START
+        });
 
         this.applicationsBox = new St.BoxLayout({ vertical: true });
         this.applicationsScrollBox.add_actor(this.applicationsBox);
         this.categoriesBox = new St.BoxLayout({ vertical: true });
-        this.categoriesScrollBox.add_actor(this.categoriesBox, { expand: true, x_fill: false });
+        this.categoriesScrollBox.add_actor(this.categoriesBox);
 
         this.mainBox.add(this.leftBox);
-        this.mainBox.add(this._createVertSeparator(), { expand: false, x_fill: false, y_fill: true});
+        this.mainBox.add(this._createVertSeparator(), {
-        this.mainBox.add(this.applicationsScrollBox, { expand: true, x_fill: true, y_fill: true });
+            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: function() {
+    _display() {
-        this._applicationsButtons = new Array();
+        this._applicationsButtons.clear();
-        this.mainBox.style=('width: 35em;');
+        this.mainBox.style = 'width: 35em;';
         this.mainBox.hide();
 
         //Load categories
         this.applicationsByCategory = {};
-        let tree = new GMenu.Tree({ menu_basename: 'applications.menu' });
+        this._tree.load_sync();
-        tree.load_sync();
+        let root = this._tree.get_root_directory();
-        let root = tree.get_root_directory();
         let categoryMenuItem = new CategoryMenuItem(this, null);
         this.categoriesBox.add_actor(categoryMenuItem.actor);
         let iter = root.iter();
         let nextType;
         while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
-            if (nextType == GMenu.TreeItemType.DIRECTORY) {
+            if (nextType != GMenu.TreeItemType.DIRECTORY)
-                let dir = iter.get_directory();
+                continue;
-                if (!dir.get_is_nodisplay()) {
+
-                    let categoryId = dir.get_menu_id();
+            let dir = iter.get_directory();
-                    this.applicationsByCategory[categoryId] = [];
+            if (dir.get_is_nodisplay())
-                    this._loadCategory(categoryId, dir);
+                continue;
-                    if (this.applicationsByCategory[categoryId].length > 0) {
+
-                        let categoryMenuItem = new CategoryMenuItem(this, dir);
+            let categoryId = dir.get_menu_id();
-                        this.categoriesBox.add_actor(categoryMenuItem.actor);
+            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';
+        let themeContext = St.ThemeContext.get_for_stage(global.stage);
-        this.mainBox.style+=('height: ' + height);
+        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`;
+    }
 
-    _clearApplicationsBox: function(selectedActor) {
+    selectCategory(dir) {
-        let actors = this.applicationsBox.get_children();
+        this.applicationsBox.get_children().forEach(c => {
-        for (let i = 0; i < actors.length; i++) {
+            if (c._delegate instanceof PopupMenu.PopupSeparatorMenuItem)
-            let actor = actors[i];
+                c._delegate.destroy();
-            this.applicationsBox.remove_actor(actor);
+            else
-        }
+                this.applicationsBox.remove_actor(c);
-    },
+        });
-
-    selectCategory: function(dir, categoryMenuItem) {
-        if (categoryMenuItem)
-            this._clearApplicationsBox(categoryMenuItem.actor);
-        else
-            this._clearApplicationsBox(null);
 
         if (dir)
             this._displayButtons(this._listApplications(dir.get_menu_id()));
         else
             this._displayButtons(this._listApplications(null));
-    },
+    }
 
-    _displayButtons: function(apps) {
+    _displayButtons(apps) {
-         if (apps) {
+        for (let i = 0; i < apps.length; i++) {
-            for (let i = 0; i < apps.length; i++) {
+            let app = apps[i];
-               let app = apps[i];
+            let item;
-               if (!this._applicationsButtons[app]) {
+            if (app instanceof Shell.App)
-                  let applicationMenuItem = new ApplicationMenuItem(this, app);
+                item = this._applicationsButtons.get(app);
-                  this._applicationsButtons[app] = applicationMenuItem;
+            else
-               }
+                item = new PopupMenu.PopupSeparatorMenuItem();
-               if (!this._applicationsButtons[app].actor.get_parent())
+            if (!item) {
-                  this.applicationsBox.add_actor(this._applicationsButtons[app].actor);
+                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: function(category_menu_id) {
+    _listApplications(categoryMenuId) {
         let applist;
 
-        if (category_menu_id) {
+        if (categoryMenuId) {
-            applist = this.applicationsByCategory[category_menu_id];
+            applist = this.applicationsByCategory[categoryMenuId];
-            applist.sort(function(a,b) {
-                return a.get_name().toLowerCase() > b.get_name().toLowerCase();
-            });
         } else {
             applist = new Array();
             let favorites = global.settings.get_strv('favorite-apps');
@@ -582,11 +741,6 @@ const ApplicationsButton = new Lang.Class({
         }
 
         return applist;
-    },
-
-    destroy: function() {
-        this.menu.actor.get_children().forEach(function(c) { c.destroy() });
-        this.parent();
     }
 });
 
@@ -606,6 +760,6 @@ function disable() {
     activitiesButton.container.show();
 }
 
-function init(metadata) {
+function init() {
-    Convenience.initTranslations();
+    ExtensionUtils.initTranslations();
 }

extensions/apps-menu/meson.build

@@ -0,0 +1,5 @@
+extension_data += configure_file(
+  input: metadata_name + '.in',
+  output: metadata_name,
+  configuration: metadata_conf
+)

extensions/apps-menu/metadata.json.in

@@ -3,7 +3,7 @@
 "uuid": "@uuid@",
 "gettext-domain": "@gettext_domain@",
 "name": "Applications Menu",
-"description": "Add a category-based menu for applications.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME Bugzilla instead.",
+"description": "Add a category-based menu for applications.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance instead.",
 "original-authors": [ "e2002@bk.ru", "debarshir@gnome.org" ],
 "shell-version": [ "@shell_current@" ],
 "url": "@url@"

extensions/auto-move-windows/Makefile.am

@@ -1,7 +0,0 @@
-EXTENSION_ID = auto-move-windows
-
-EXTRA_MODULES = prefs.js
-
-include ../../extension.mk
-include ../../settings.mk
-

extensions/auto-move-windows/extension.js

@@ -1,149 +1,134 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
 // Start apps on custom workspaces
+/* exported init enable disable */
 
-const Glib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
-const St = imports.gi.St;
 
 const Main = imports.ui.main;
 
 const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
-const Convenience = Me.imports.convenience;
 
-const SETTINGS_KEY = 'application-list';
+class WindowMover {
+    constructor() {
+        this._settings = ExtensionUtils.getSettings();
+        this._appSystem = Shell.AppSystem.get_default();
+        this._appConfigs = new Map();
+        this._appData = new Map();
 
-let settings;
+        this._appsChangedId =
+            this._appSystem.connect('installed-changed',
+                                    this._updateAppData.bind(this));
 
-const WindowMover = new Lang.Class({
+        this._settings.connect('changed', this._updateAppConfigs.bind(this));
-    Name: 'AutoMoveWindows.WindowMover',
+        this._updateAppConfigs();
+    }
 
-    _init: function() {
+    _updateAppConfigs() {
-        this._settings = settings;
+        this._appConfigs.clear();
-        this._windowTracker = Shell.WindowTracker.get_default();
 
-        let display = global.screen.get_display();
+        this._settings.get_strv('application-list').forEach(v => {
-        // Connect after so the handler from ShellWindowTracker has already run
+            let [appId, num] = v.split(':');
-        this._windowCreatedId = display.connect_after('window-created', Lang.bind(this, this._findAndMove));
+            this._appConfigs.set(appId, parseInt(num) - 1);
-    },
+        });
 
-    destroy: function() {
+        this._updateAppData();
-        if (this._windowCreatedId) {
+    }
-            global.screen.get_display().disconnect(this._windowCreatedId);
+
-            this._windowCreatedId = 0;
+    _updateAppData() {
+        let ids = [...this._appConfigs.keys()];
+        let removedApps = [...this._appData.keys()].filter(
+            a => !ids.includes(a.id)
+        );
+        removedApps.forEach(app => {
+            app.disconnect(this._appData.get(app).windowsChangedId);
+            this._appData.delete(app);
+        });
+
+        let addedApps = ids.map(id => this._appSystem.lookup_app(id)).filter(
+            app => app != null && !this._appData.has(app)
+        );
+        addedApps.forEach(app => {
+            let data = {
+                windowsChangedId: app.connect('windows-changed',
+                                              this._appWindowsChanged.bind(this)),
+                moveWindowsId: 0,
+                windows: app.get_windows()
+            };
+            this._appData.set(app, data);
+        });
+    }
+
+    destroy() {
+        if (this._appsChangedId) {
+            this._appSystem.disconnect(this._appsChangedId);
+            this._appsChangedId = 0;
         }
-    },
 
-    _ensureAtLeastWorkspaces: function(num, window) {
+        if (this._settings) {
-        for (let j = global.screen.n_workspaces; j <= num; j++) {
+            this._settings.run_dispose();
-            window.change_workspace_by_index(j-1, false);
+            this._settings = null;
-            global.screen.append_new_workspace(false, 0);
         }
-    },
 
-    _findAndMove: function(display, window, noRecurse) {
+        this._appConfigs.clear();
+        this._updateAppData();
+    }
+
+    _moveWindow(window, workspaceNum) {
         if (window.skip_taskbar)
             return;
 
-        let spaces = this._settings.get_strv(SETTINGS_KEY);
+        // ensure we have the required number of workspaces
-
+        let workspaceManager = global.workspace_manager;
-        let app = this._windowTracker.get_window_app(window);
+        for (let i = workspaceManager.n_workspaces; i <= workspaceNum; i++) {
-        if (!app) {
+            window.change_workspace_by_index(i - 1, false);
-            if (!noRecurse) {
+            workspaceManager.append_new_workspace(false, 0);
-                // window is not tracked yet
-                Mainloop.idle_add(Lang.bind(this, function() {
-                    this._findAndMove(display, window, true);
-                    return false;
-                }));
-            } else
-                log ('Cannot find application for window');
-            return;
         }
-        let app_id = app.get_id();
-        for ( let j = 0 ; j < spaces.length; j++ ) {
-            let apps_to_space = spaces[j].split(":");
-            // Match application id
-            if (apps_to_space[0] == app_id) {
-                let workspace_num = parseInt(apps_to_space[1]) - 1;
 
-                if (workspace_num >= global.screen.n_workspaces)
+        window.change_workspace_by_index(workspaceNum, false);
-                    this._ensureAtLeastWorkspaces(workspace_num, window);
-
-                window.change_workspace_by_index(workspace_num, false);
-            }
-        }
     }
-});
+
+    _appWindowsChanged(app) {
+        let data = this._appData.get(app);
+        let windows = app.get_windows();
+
+        // If get_compositor_private() returns non-NULL on a removed windows,
+        // the window still exists and is just moved to a different workspace
+        // or something; assume it'll be added back immediately, so keep it
+        // to avoid moving it again
+        windows.push(...data.windows.filter(
+            w => !windows.includes(w) && w.get_compositor_private() != null
+        ));
+
+        let workspaceNum = this._appConfigs.get(app.id);
+        windows.filter(w => !data.windows.includes(w)).forEach(window => {
+            this._moveWindow(window, workspaceNum);
+        });
+        data.windows = windows;
+    }
+}
 
 let prevCheckWorkspaces;
 let winMover;
 
 function init() {
-    Convenience.initTranslations();
+    ExtensionUtils.initTranslations();
-    settings = Convenience.getSettings();
 }
 
 function myCheckWorkspaces() {
-    let i;
+    let keepAliveWorkspaces = [];
-    let emptyWorkspaces = new Array(this._workspaces.length);
+    let foundNonEmpty = false;
-
+    for (let i = this._workspaces.length - 1; i >= 0; i--) {
-    if (!Meta.prefs_get_dynamic_workspaces()) {
+        if (!foundNonEmpty)
-        this._checkWorkspacesId = 0;
+            foundNonEmpty = this._workspaces[i].list_windows().length > 0;
-        return false;
+        else if (!this._workspaces[i]._keepAliveId)
+            keepAliveWorkspaces.push(this._workspaces[i]);
     }
 
-    for (i = 0; i < this._workspaces.length; i++) {
+    // make sure the original method only removes empty workspaces at the end
-        let lastRemoved = this._workspaces[i]._lastRemovedWindow;
+    keepAliveWorkspaces.forEach(ws => ws._keepAliveId = 1);
-        if ((lastRemoved &&
+    prevCheckWorkspaces.call(this);
-             (lastRemoved.get_window_type() == Meta.WindowType.SPLASHSCREEN ||
+    keepAliveWorkspaces.forEach(ws => delete ws._keepAliveId);
-              lastRemoved.get_window_type() == Meta.WindowType.DIALOG ||
-              lastRemoved.get_window_type() == Meta.WindowType.MODAL_DIALOG)) ||
-            this._workspaces[i]._keepAliveId)
-            emptyWorkspaces[i] = false;
-        else
-            emptyWorkspaces[i] = true;
-    }
 
-    let sequences = Shell.WindowTracker.get_default().get_startup_sequences();
-    for (i = 0; i < sequences.length; i++) {
-        let index = sequences[i].get_workspace();
-        if (index >= 0 && index <= global.screen.n_workspaces)
-            emptyWorkspaces[index] = false;
-    }
-
-    let windows = global.get_window_actors();
-    for (i = 0; i < windows.length; i++) {
-	let winActor = windows[i];
-        let win = winActor.meta_window;
-	if (win.is_on_all_workspaces())
-            continue;
-
-	let workspaceIndex = win.get_workspace().index();
-	emptyWorkspaces[workspaceIndex] = false;
-    }
-
-    // If we don't have an empty workspace at the end, add one
-    if (!emptyWorkspaces[emptyWorkspaces.length -1]) {
-	global.screen.append_new_workspace(false, global.get_current_time());
-	emptyWorkspaces.push(false);
-    }
-
-    let activeWorkspaceIndex = global.screen.get_active_workspace_index();
-    emptyWorkspaces[activeWorkspaceIndex] = false;
-
-    // Delete other empty workspaces; do it from the end to avoid index changes
-    for (i = emptyWorkspaces.length - 2; i >= 0; i--) {
-        if (emptyWorkspaces[i])
-            global.screen.remove_workspace(this._workspaces[i], global.get_current_time());
-        else
-            break;
-    }
-
-    this._checkWorkspacesId = 0;
     return false;
 }
 

extensions/auto-move-windows/meson.build

@@ -0,0 +1,8 @@
+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/auto-move-windows/prefs.js

@@ -1,22 +1,14 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
 // Start apps on custom workspaces
+/* exported init buildPrefsWidget */
 
-const GdkPixbuf = imports.gi.GdkPixbuf;
+const { Gio, GObject, Gtk } = imports.gi;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
-const GMenu = imports.gi.GMenu;
-const Gtk = imports.gi.Gtk;
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
 
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
-const N_ = function(e) { return e };
+const N_ = e => e;
 
 const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
-const Convenience = Me.imports.convenience;
 
 const SETTINGS_KEY = 'application-list';
 
@@ -30,240 +22,257 @@ const Columns = {
     ADJUSTMENT: 4
 };
 
-const Widget = new GObject.Class({
+const Widget = GObject.registerClass({
-    Name: 'AutoMoveWindows.Prefs.Widget',
     GTypeName: 'AutoMoveWindowsPrefsWidget',
-    Extends: Gtk.Grid,
+}, class Widget extends Gtk.Grid {
-
+    _init(params) {
-    _init: function(params) {
+        super._init(params);
-	this.parent(params);
         this.set_orientation(Gtk.Orientation.VERTICAL);
 
-	this._settings = Convenience.getSettings();
+        this._settings = ExtensionUtils.getSettings();
-	this._settings.connect('changed', Lang.bind(this, this._refresh));
+        this._settings.connect('changed', this._refresh.bind(this));
-	this._changedPermitted = false;
+        this._changedPermitted = false;
 
-	this._store = new Gtk.ListStore();
+        this._store = new Gtk.ListStore();
-	this._store.set_column_types([Gio.AppInfo, GObject.TYPE_STRING, Gio.Icon, GObject.TYPE_INT,
+        this._store.set_column_types([
-                                      Gtk.Adjustment]);
+            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,
+        this._treeView = new Gtk.TreeView({
-                                            hexpand: true, vexpand: true });
+            model: this._store,
-	this._treeView.get_selection().set_mode(Gtk.SelectionMode.SINGLE);
+            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,
+        let appColumn = new Gtk.TreeViewColumn({
-						 title: _("Application") });
+            expand: true,
-	let iconRenderer = new Gtk.CellRendererPixbuf;
+            sort_column_id: Columns.DISPLAY_NAME,
-	appColumn.pack_start(iconRenderer, false);
+            title: _('Application')
-	appColumn.add_attribute(iconRenderer, "gicon", Columns.ICON);
+        });
-	let nameRenderer = new Gtk.CellRendererText;
+        let iconRenderer = new Gtk.CellRendererPixbuf;
-	appColumn.pack_start(nameRenderer, true);
+        appColumn.pack_start(iconRenderer, false);
-	appColumn.add_attribute(nameRenderer, "text", Columns.DISPLAY_NAME);
+        appColumn.add_attribute(iconRenderer, 'gicon', Columns.ICON);
-	this._treeView.append_column(appColumn);
+        let nameRenderer = new Gtk.CellRendererText;
+        appColumn.pack_start(nameRenderer, true);
+        appColumn.add_attribute(nameRenderer, 'text', Columns.DISPLAY_NAME);
+        this._treeView.append_column(appColumn);
 
-	let workspaceColumn = new Gtk.TreeViewColumn({ title: _("Workspace"),
+        let workspaceColumn = new Gtk.TreeViewColumn({
-                                                       sort_column_id: Columns.WORKSPACE });
+            title: _('Workspace'),
-	let workspaceRenderer = new Gtk.CellRendererSpin({ editable: true });
+            sort_column_id: Columns.WORKSPACE
-	workspaceRenderer.connect('edited', Lang.bind(this, this._workspaceEdited));
+        });
-	workspaceColumn.pack_start(workspaceRenderer, true);
+        let workspaceRenderer = new Gtk.CellRendererSpin({ editable: true });
-	workspaceColumn.add_attribute(workspaceRenderer, "adjustment", Columns.ADJUSTMENT);
+        workspaceRenderer.connect('edited', this._workspaceEdited.bind(this));
-        workspaceColumn.add_attribute(workspaceRenderer, "text", Columns.WORKSPACE);
+        workspaceColumn.pack_start(workspaceRenderer, true);
-	this._treeView.append_column(workspaceColumn);
+        workspaceColumn.add_attribute(workspaceRenderer, 'adjustment', Columns.ADJUSTMENT);
+        workspaceColumn.add_attribute(workspaceRenderer, 'text', Columns.WORKSPACE);
+        this._treeView.append_column(workspaceColumn);
 
-	scrolled.add(this._treeView);
+        scrolled.add(this._treeView);
 
-	let toolbar = new Gtk.Toolbar({ icon_size: Gtk.IconSize.SMALL_TOOLBAR });
+        let toolbar = new Gtk.Toolbar({ icon_size: Gtk.IconSize.SMALL_TOOLBAR });
-	toolbar.get_style_context().add_class(Gtk.STYLE_CLASS_INLINE_TOOLBAR);
+        toolbar.get_style_context().add_class(Gtk.STYLE_CLASS_INLINE_TOOLBAR);
-	this.add(toolbar);
+        this.add(toolbar);
 
-	let newButton = new Gtk.ToolButton({ icon_name: 'bookmark-new-symbolic',
+        let newButton = new Gtk.ToolButton({
-                                             label: _("Add Rule"),
+            icon_name: 'bookmark-new-symbolic',
-					     is_important: true });
+            label: _('Add Rule'),
-	newButton.connect('clicked', Lang.bind(this, this._createNew));
+            is_important: true
-	toolbar.add(newButton);
+        });
+        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', Lang.bind(this, this._deleteSelected));
+        delButton.connect('clicked', this._deleteSelected.bind(this));
-	toolbar.add(delButton);
+        toolbar.add(delButton);
 
         let selection = this._treeView.get_selection();
-        selection.connect('changed',
+        selection.connect('changed', () => {
-            function() {
+            delButton.sensitive = selection.count_selected_rows() > 0;
-                delButton.sensitive = selection.count_selected_rows() > 0;
+        });
-            });
         delButton.sensitive = selection.count_selected_rows() > 0;
 
-	this._changedPermitted = true;
+        this._changedPermitted = true;
-	this._refresh();
+        this._refresh();
-    },
+    }
 
-    _createNew: function() {
+    _createNew() {
-	let dialog = new Gtk.Dialog({ title: _("Create new matching rule"),
+        let dialog = new Gtk.Dialog({
-				      transient_for: this.get_toplevel(),
+            title: _('Create new matching rule'),
-                                      use_header_bar: true,
+            transient_for: this.get_toplevel(),
-				      modal: true });
+            use_header_bar: true,
-	dialog.add_button(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL);
+            modal: true
-	let addButton = dialog.add_button(_("Add"), Gtk.ResponseType.OK);
+        });
+        dialog.add_button(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL);
+        let addButton = dialog.add_button(_('Add'), Gtk.ResponseType.OK);
         dialog.set_default_response(Gtk.ResponseType.OK);
 
-	let grid = new Gtk.Grid({ column_spacing: 10,
+        let grid = new Gtk.Grid({
-                                  row_spacing: 15,
+            column_spacing: 10,
-                                  margin: 10 });
+            row_spacing: 15,
-	dialog._appChooser = new Gtk.AppChooserWidget({ show_all: true });
+            margin: 10
-        dialog._appChooser.connect('application-selected', Lang.bind(this,
+        });
-            function(w, appInfo) {
+        dialog._appChooser = new Gtk.AppChooserWidget({ show_all: true });
-                addButton.sensitive = appInfo &&
+        dialog._appChooser.connect('application-selected', (w, appInfo) => {
-                                      this._checkId(appInfo.get_id());
+            addButton.sensitive = appInfo && this._checkId(appInfo.get_id());
-            }));
+        });
         let appInfo = dialog._appChooser.get_app_info();
         addButton.sensitive = appInfo && this._checkId(appInfo.get_id());
 
-	grid.attach(dialog._appChooser, 0, 0, 2, 1);
+        grid.attach(dialog._appChooser, 0, 0, 2, 1);
-	grid.attach(new Gtk.Label({ label: _("Workspace"),
+        grid.attach(new Gtk.Label({
-                                    halign: Gtk.Align.END }), 0, 1, 1, 1);
+            label: _('Workspace'),
-	let adjustment = new Gtk.Adjustment({ lower: 1,
+            halign: Gtk.Align.END
-					      upper: WORKSPACE_MAX,
+        }), 0, 1, 1, 1);
-					      step_increment: 1
+        let adjustment = new Gtk.Adjustment({
-                                            });
+            lower: 1,
-	dialog._spin = new Gtk.SpinButton({ adjustment: adjustment,
+            upper: WORKSPACE_MAX,
-					    snap_to_ticks: true });
+            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);
+        grid.attach(dialog._spin, 1, 1, 1, 1);
-	dialog.get_content_area().add(grid);
+        dialog.get_content_area().add(grid);
 
-	dialog.connect('response', Lang.bind(this, function(dialog, id) {
+        dialog.connect('response', (dialog, id) => {
-	    if (id != Gtk.ResponseType.OK) {
+            if (id != Gtk.ResponseType.OK) {
                 dialog.destroy();
-		return;
+                return;
             }
 
-	    let appInfo = dialog._appChooser.get_app_info();
+            let appInfo = dialog._appChooser.get_app_info();
-	    if (!appInfo)
+            if (!appInfo)
-		return;
+                return;
-	    let index = Math.floor(dialog._spin.value);
+            let index = Math.floor(dialog._spin.value);
-	    if (isNaN(index) || index < 0)
+            if (isNaN(index) || index < 0)
-		index = 1;
+                index = 1;
 
-	    this._changedPermitted = false;
+            this._changedPermitted = false;
-	    this._appendItem(appInfo.get_id(), index);
+            this._appendItem(appInfo.get_id(), index);
-	    this._changedPermitted = true;
+            this._changedPermitted = true;
 
-	    let iter = this._store.append();
+            this._appendRow(appInfo, index);
-	    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]);
 
             dialog.destroy();
-	}));
+        });
-	dialog.show_all();
+        dialog.show_all();
-    },
+    }
 
-    _deleteSelected: function() {
+    _deleteSelected() {
-	let [any, model, iter] = this._treeView.get_selection().get_selected();
+        let [any, model_, iter] = this._treeView.get_selection().get_selected();
 
-	if (any) {
+        if (any) {
-	    let appInfo = this._store.get_value(iter, Columns.APPINFO);
+            let appInfo = this._store.get_value(iter, Columns.APPINFO);
 
-	    this._changedPermitted = false;
+            this._changedPermitted = false;
-	    this._removeItem(appInfo.get_id());
+            this._removeItem(appInfo.get_id());
-	    this._changedPermitted = true;
+            this._changedPermitted = true;
-	    this._store.remove(iter);
+            this._store.remove(iter);
-	}
+        }
-    },
+    }
 
-    _workspaceEdited: function(renderer, pathString, text) {
+    _workspaceEdited(renderer, pathString, text) {
-	let index = parseInt(text);
+        let index = parseInt(text);
-	if (isNaN(index) || index < 0)
+        if (isNaN(index) || index < 0)
-	    index = 1;
+            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);
+        let appInfo = this._store.get_value(iter, Columns.APPINFO);
 
-	this._changedPermitted = false;
+        this._changedPermitted = false;
-	this._changeItem(appInfo.get_id(), index);
+        this._changeItem(appInfo.get_id(), index);
-	this._store.set_value(iter, Columns.WORKSPACE, index);
+        this._store.set_value(iter, Columns.WORKSPACE, index);
-	this._changedPermitted = true;
+        this._changedPermitted = true;
-    },
+    }
 
-    _refresh: function() {
+    _refresh() {
-	if (!this._changedPermitted)
+        if (!this._changedPermitted)
-	    // Ignore this notification, model is being modified outside
+            // Ignore this notification, model is being modified outside
-	    return;
+            return;
 
-	this._store.clear();
+        this._store.clear();
 
-	let currentItems = this._settings.get_strv(SETTINGS_KEY);
+        let currentItems = this._settings.get_strv(SETTINGS_KEY);
-	let validItems = [ ];
+        let validItems = [];
-	for (let i = 0; i < currentItems.length; i++) {
+        for (let i = 0; i < currentItems.length; i++) {
-	    let [id, index] = currentItems[i].split(':');
+            let [id, index] = currentItems[i].split(':');
-	    let appInfo = Gio.DesktopAppInfo.new(id);
+            let appInfo = Gio.DesktopAppInfo.new(id);
-	    if (!appInfo)
+            if (!appInfo)
-		continue;
+                continue;
-	    validItems.push(currentItems[i]);
+            validItems.push(currentItems[i]);
 
-	    let iter = this._store.append();
+            this._appendRow(appInfo, parseInt(index));
-	    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]);
-	}
 
-	if (validItems.length != currentItems.length) // some items were filtered out
+        if (validItems.length != currentItems.length) // some items were filtered out
-	    this._settings.set_strv(SETTINGS_KEY, validItems);
+            this._settings.set_strv(SETTINGS_KEY, validItems);
-    },
+    }
 
-    _checkId: function(id) {
+    _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(function(i) { return i.startsWith(id + ':'); });
+        return !items.some(i => i.startsWith(`${id}:`));
-    },
+    }
 
-    _appendItem: function(id, workspace) {
+    _appendItem(id, workspace) {
-	let currentItems = this._settings.get_strv(SETTINGS_KEY);
+        let currentItems = this._settings.get_strv(SETTINGS_KEY);
-	currentItems.push(id + ':' + workspace);
+        currentItems.push(`${id}:${workspace}`);
-	this._settings.set_strv(SETTINGS_KEY, currentItems);
+        this._settings.set_strv(SETTINGS_KEY, currentItems);
-    },
+    }
 
-    _removeItem: function(id) {
+    _removeItem(id) {
-	let currentItems = this._settings.get_strv(SETTINGS_KEY);
+        let currentItems = this._settings.get_strv(SETTINGS_KEY);
-	let index = currentItems.map(function(el) {
+        let index = currentItems.map(el => el.split(':')[0]).indexOf(id);
-	    return el.split(':')[0];
-	}).indexOf(id);
 
-	if (index < 0)
+        if (index < 0)
-	    return;
+            return;
-	currentItems.splice(index, 1);
+        currentItems.splice(index, 1);
-	this._settings.set_strv(SETTINGS_KEY, currentItems);
+        this._settings.set_strv(SETTINGS_KEY, currentItems);
-    },
+    }
 
-    _changeItem: function(id, workspace) {
+    _changeItem(id, workspace) {
-	let currentItems = this._settings.get_strv(SETTINGS_KEY);
+        let currentItems = this._settings.get_strv(SETTINGS_KEY);
-	let index = currentItems.map(function(el) {
+        let index = currentItems.map(el => el.split(':')[0]).indexOf(id);
-	    return el.split(':')[0];
-	}).indexOf(id);
 
-	if (index < 0)
+        if (index < 0)
-	    currentItems.push(id + ':' + workspace);
+            currentItems.push(`${id}:${workspace}`);
-	else
+        else
-	    currentItems[index] = id + ':' + workspace;
+            currentItems[index] = `${id}:${workspace}`;
-	this._settings.set_strv(SETTINGS_KEY, currentItems);
+        this._settings.set_strv(SETTINGS_KEY, currentItems);
     }
 });
 
 
 function init() {
-    Convenience.initTranslations();
+    ExtensionUtils.initTranslations();
 }
 
 function buildPrefsWidget() {

extensions/drive-menu/Makefile.am

@@ -1,3 +0,0 @@
-EXTENSION_ID = drive-menu
-
-include ../../extension.mk

extensions/drive-menu/extension.js

@@ -1,56 +1,49 @@
+/* exported init enable disable */
 // Drive menu extension
-const Clutter = imports.gi.Clutter;
+const { Gio, GObject, Shell, St } = imports.gi;
-const Gio = imports.gi.Gio;
-const Lang = imports.lang;
-const St = imports.gi.St;
-const Shell = imports.gi.Shell;
 
 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;
 
-const MountMenuItem = new Lang.Class({
+class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
-    Name: 'DriveMenu.MountMenuItem',
+    constructor(mount) {
-    Extends: PopupMenu.PopupBaseMenuItem,
+        super();
 
-    _init: function(mount) {
+        this.label = new St.Label({ text: mount.get_name() });
-	this.parent();
+        this.actor.add(this.label, { expand: true });
-
-	this.label = new St.Label({ text: mount.get_name() });
-	this.actor.add(this.label, { expand: true });
         this.actor.label_actor = this.label;
 
-	this.mount = mount;
+        this.mount = mount;
 
-	let ejectIcon = new St.Icon({ icon_name: 'media-eject-symbolic',
+        let ejectIcon = new St.Icon({
-				      style_class: 'popup-menu-icon ' });
+            icon_name: 'media-eject-symbolic',
-	let ejectButton = new St.Button({ child: ejectIcon });
+            style_class: 'popup-menu-icon'
-	ejectButton.connect('clicked', Lang.bind(this, this._eject));
+        });
-	this.actor.add(ejectButton);
+        let ejectButton = new St.Button({ child: ejectIcon });
+        ejectButton.connect('clicked', this._eject.bind(this));
+        this.actor.add(ejectButton);
 
-        this._changedId = mount.connect('changed', Lang.bind(this, this._syncVisibility));
+        this._changedId = mount.connect('changed', this._syncVisibility.bind(this));
         this._syncVisibility();
-    },
+    }
 
-    destroy: function() {
+    destroy() {
         if (this._changedId) {
             this.mount.disconnect(this._changedId);
             this._changedId = 0;
         }
 
-        this.parent();
+        super.destroy();
-    },
+    }
 
-    _isInteresting: function() {
+    _isInteresting() {
         if (!this.mount.can_eject() && !this.mount.can_unmount())
             return false;
         if (this.mount.is_shadowed())
@@ -65,135 +58,136 @@ const MountMenuItem = new Lang.Class({
         }
 
         return volume.get_identifier('class') != 'network';
-    },
+    }
 
-    _syncVisibility: function() {
+    _syncVisibility() {
         this.actor.visible = this._isInteresting();
-    },
+    }
 
-    _eject: function() {
+    _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())
+        if (this.mount.can_eject())
-	    this.mount.eject_with_operation(Gio.MountUnmountFlags.NONE,
+            this.mount.eject_with_operation(...unmountArgs,
-                                            mountOp.mountOp,
+                                            this._ejectFinish.bind(this));
-					    null, // Gio.Cancellable
+        else
-					    Lang.bind(this, this._ejectFinish));
+            this.mount.unmount_with_operation(...unmountArgs,
-	else
+                                              this._unmountFinish.bind(this));
-	    this.mount.unmount_with_operation(Gio.MountUnmountFlags.NONE,
+    }
-                                              mountOp.mountOp,
-			                      null, // Gio.Cancellable
-			                      Lang.bind(this, this._unmountFinish));
-    },
 
-    _unmountFinish: function(mount, result) {
+    _unmountFinish(mount, result) {
-	try {
+        try {
-	    mount.unmount_with_operation_finish(result);
+            mount.unmount_with_operation_finish(result);
-	} catch(e) {
+        } catch (e) {
-	    this._reportFailure(e);
+            this._reportFailure(e);
-	}
+        }
-    },
+    }
 
-    _ejectFinish: function(mount, result) {
+    _ejectFinish(mount, result) {
-	try {
+        try {
-	    mount.eject_with_operation_finish(result);
+            mount.eject_with_operation_finish(result);
-	} catch(e) {
+        } catch (e) {
-	    this._reportFailure(e);
+            this._reportFailure(e);
-	}
+        }
-    },
+    }
 
-    _reportFailure: function(exception) {
+    _reportFailure(exception) {
-	let msg = _("Ejecting drive '%s' failed:").format(this.mount.get_name());
+        // TRANSLATORS: %s is the filesystem name
-	Main.notifyError(msg, exception.message);
+        let msg = _('Ejecting drive “%s” failed:').format(this.mount.get_name());
-    },
+        Main.notifyError(msg, exception.message);
+    }
 
-    activate: function(event) {
+    activate(event) {
         let context = global.create_app_launch_context(event.get_time(), -1);
         Gio.AppInfo.launch_default_for_uri(this.mount.get_root().get_uri(),
                                            context);
 
-	this.parent(event);
+        super.activate(event);
     }
-});
+}
 
-const DriveMenu = new Lang.Class({
+let DriveMenu = GObject.registerClass(
-    Name: 'DriveMenu.DriveMenu',
+class DriveMenu extends PanelMenu.Button {
-    Extends: PanelMenu.Button,
+    _init() {
-
+        super._init(0.0, _('Removable devices'));
-    _init: function() {
-        this.parent(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',
+        let icon = new St.Icon({
-                                 style_class: 'system-status-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._monitor = Gio.VolumeMonitor.get();
-	this._addedId = this._monitor.connect('mount-added', Lang.bind(this, function(monitor, mount) {
+        this._addedId = this._monitor.connect('mount-added', (monitor, mount) => {
-	    this._addMount(mount);
+            this._addMount(mount);
-	    this._updateMenuVisibility();
+            this._updateMenuVisibility();
-	}));
+        });
-	this._removedId = this._monitor.connect('mount-removed', Lang.bind(this, function(monitor, mount) {
+        this._removedId = this._monitor.connect('mount-removed', (monitor, mount) => {
-	    this._removeMount(mount);
+            this._removeMount(mount);
-	    this._updateMenuVisibility();
+            this._updateMenuVisibility();
-	}));
+        });
 
-	this._mounts = [ ];
+        this._mounts = [];
 
-	this._monitor.get_mounts().forEach(Lang.bind(this, this._addMount));
+        this._monitor.get_mounts().forEach(this._addMount.bind(this));
 
-	this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-	this.menu.addAction(_("Open File"), function(event) {
+        this.menu.addAction(_('Open Files'), event => {
-	    let appSystem = Shell.AppSystem.get_default();
+            let appSystem = Shell.AppSystem.get_default();
-	    let app = appSystem.lookup_app('org.gnome.Nautilus.desktop');
+            let app = appSystem.lookup_app('org.gnome.Nautilus.desktop');
-	    app.activate_full(-1, event.get_time());
+            app.activate_full(-1, event.get_time());
-	});
+        });
 
-	this._updateMenuVisibility();
+        this._updateMenuVisibility();
-    },
+    }
 
-    _updateMenuVisibility: function() {
+    _updateMenuVisibility() {
-	if (this._mounts.filter(function(i) i.actor.visible).length > 0)
+        if (this._mounts.filter(i => i.actor.visible).length > 0)
-	    this.actor.show();
+            this.show();
-	else
+        else
-	    this.actor.hide();
+            this.hide();
-    },
+    }
 
-    _addMount: function(mount) {
+    _addMount(mount) {
-	let item = new MountMenuItem(mount);
+        let item = new MountMenuItem(mount);
-	this._mounts.unshift(item);
+        this._mounts.unshift(item);
-	this.menu.addMenuItem(item, 0);
+        this.menu.addMenuItem(item, 0);
-    },
+    }
 
-    _removeMount: function(mount) {
+    _removeMount(mount) {
-	for (let i = 0; i < this._mounts.length; i++) {
+        for (let i = 0; i < this._mounts.length; i++) {
-	    let item = this._mounts[i];
+            let item = this._mounts[i];
-	    if (item.mount == mount) {
+            if (item.mount == mount) {
-		item.destroy();
+                item.destroy();
-		this._mounts.splice(i, 1);
+                this._mounts.splice(i, 1);
-		return;
+                return;
-	    }
+            }
-	}
+        }
-	log ('Removing a mount that was never added to the menu');
+        log ('Removing a mount that was never added to the menu');
-    },
+    }
 
-    destroy: function() {
+    _onDestroy() {
-        if (this._connectedId) {
+        if (this._addedId) {
-	    this._monitor.disconnect(this._connectedId);
+            this._monitor.disconnect(this._addedId);
-	    this._monitor.disconnect(this._disconnectedId);
+            this._monitor.disconnect(this._removedId);
-            this._connectedId = 0;
+            this._addedId = 0;
-            this._disconnectedId = 0;
+            this._removedId = 0;
         }
 
-	this.parent();
+        super._onDestroy();
-    },
+    }
 });
 
 function init() {
-    Convenience.initTranslations();
+    ExtensionUtils.initTranslations();
 }
 
 let _indicator;

extensions/drive-menu/meson.build

@@ -0,0 +1,5 @@
+extension_data += configure_file(
+  input: metadata_name + '.in',
+  output: metadata_name,
+  configuration: metadata_conf
+)

extensions/example/Makefile.am

@@ -1,6 +0,0 @@
-EXTENSION_ID = example
-
-EXTRA_MODULES = prefs.js
-
-include ../../extension.mk
-include ../../settings.mk

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, function () { 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/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,57 +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 = new GObject.Class({
-    Name: 'Example.Prefs.Widget',
-    GTypeName: 'ExamplePrefsWidget',
-    Extends: Gtk.Grid,
-
-    _init: function(params) {
-	this.parent(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/Makefile.am

@@ -1,3 +0,0 @@
-EXTENSION_ID = launch-new-instance
-
-include ../../extension.mk

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;
+    _activateOriginal = AppDisplay.AppIcon.prototype.activate;
-  AppDisplay.AppIcon.prototype.activate = function() {
+    AppDisplay.AppIcon.prototype.activate = function() {
-      _activateOriginal.call(this, 2);
+        _activateOriginal.call(this, 2);
-  };
+    };
 }
 
 function disable() {
-  AppDisplay.AppIcon.prototype.activate = _activateOriginal;
+    AppDisplay.AppIcon.prototype.activate = _activateOriginal;
 }

extensions/launch-new-instance/meson.build

@@ -0,0 +1,5 @@
+extension_data += configure_file(
+  input: metadata_name + '.in',
+  output: metadata_name,
+  configuration: metadata_conf
+)

extensions/launch-new-instance/metadata.json.in

@@ -4,7 +4,7 @@
 "settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
 "name": "Launch new instance",
-"description": "Always launch a new instance when clicking in the dash or the application view.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME Bugzilla instead.",
+"description": "Always launch a new instance when clicking in the dash or the application view.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance instead.",
 "shell-version": [ "@shell_current@" ],
 "url": "@url@"
 }

extensions/meson.build

@@ -0,0 +1,45 @@
+extension_schemas = []
+js_sources = []
+
+metadata_name = 'metadata.json'
+
+foreach e : all_extensions
+  uuid = e + uuid_suffix
+
+  metadata_conf = configuration_data()
+  metadata_conf.set('extension_id', e)
+  metadata_conf.set('uuid', uuid)
+  metadata_conf.set('gschemaname', 'org.gnome.shell.extensions.' + e)
+  metadata_conf.set('gettext_domain', gettext_domain)
+  metadata_conf.set('shell_current', shell_version)
+  metadata_conf.set('url', 'https://gitlab.gnome.org/GNOME/gnome-shell-extensions')
+
+  extension_sources = files(e + '/extension.js')
+  extension_data = files(e + '/stylesheet.css')
+
+  subdir(e)
+
+  js_sources += extension_sources
+
+  if (enabled_extensions.contains(e))
+    install_data (extension_sources + extension_data,
+      install_dir: join_paths(extensiondir, uuid)
+    )
+  endif
+endforeach
+
+install_data (extension_schemas,
+  install_dir: schemadir
+)
+
+foreach js_source : js_sources
+  if (js60.found())
+    path_array = '@0@'.format(js_source).split('/')
+    name = join_paths(path_array[-2], path_array[-1])
+
+    test('Checking syntax of ' + name, js60,
+      args: ['-s', '-c', js_source],
+      workdir: meson.current_source_dir()
+    )
+  endif
+endforeach

extensions/meson.build.template

@@ -0,0 +1,8 @@
+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/native-window-placement/Makefile.am

@@ -1,5 +0,0 @@
-EXTENSION_ID = native-window-placement
-
-include ../../extension.mk
-include ../../settings.mk
-

extensions/native-window-placement/extension.js

@@ -1,149 +1,93 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
-// import just everything from workspace.js:
+/* exported enable disable */
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
-const Pango = imports.gi.Pango;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
-const Signals = imports.signals;
-
-const DND = imports.ui.dnd;
-const Lightbox = imports.ui.lightbox;
-const Main = imports.ui.main;
-const Overview = imports.ui.overview;
-const Panel = imports.ui.panel;
-const Tweener = imports.ui.tweener;
-
 const Workspace = imports.ui.workspace;
-const WindowPositionFlags = Workspace.WindowPositionFlags;
 
 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
 
-const PLACE_WINDOW_CAPTIONS_ON_TOP = true;                          // place window titles in overview on top of windows with overlap parameter
+class Rect {
-
+    constructor(x, y, width, height) {
-const WORKSPACE_BORDER_GAP = 10;                                    // minimum gap between the workspace area and the workspace selector
-const WINDOW_AREA_TOP_GAP = 20;                                     // minimum gap between the workspace area and the top border. This keeps window captions and close buttons visible. 13px (26/2) should currently be enough.
-
-const BUTTON_LAYOUT_SCHEMA = 'org.gnome.desktop.wm.preferences';
-const BUTTON_LAYOUT_KEY = 'button-layout';
-
-function injectToFunction(parent, name, func) {
-    let origin = parent[name];
-    parent[name] = function() {
-        let ret;
-        ret = origin.apply(this, arguments);
-        if (ret === undefined)
-            ret = func.apply(this, arguments);
-        return ret;
-    }
-}
-
-const Rect = new Lang.Class({
-    Name: 'NativeWindowPlacement.Rect',
-
-    _init: function(x, y, width, height) {
         [this.x, this.y, this.width, this.height] = [x, y, width, height];
-    },
+    }
 
     /**
      * used in _calculateWindowTransformationsNatural to replace Meta.Rectangle that is too slow.
      */
-    copy: function() {
+    copy() {
         return new Rect(this.x, this.y, this.width, this.height);
-    },
+    }
 
-    union: function(rect2) {
+    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;
-    },
+    }
 
-    adjusted: function(dx, dy, dx2, dy2) {
+    adjusted(dx, dy, dx2, dy2) {
         let dest = this.copy();
         dest.x += dx;
         dest.y += dy;
         dest.width += -dx + dx2;
         dest.height += -dy + dy2;
         return dest;
-    },
+    }
 
-    overlap: function(rect2) {
+    overlap(rect2) {
         return !((this.x + this.width    <= rect2.x) ||
                  (rect2.x + rect2.width  <= this.x) ||
                  (this.y + this.height   <= rect2.y) ||
                  (rect2.y + rect2.height <= this.y));
-    },
+    }
 
-    center: function() {
+    center() {
         return [this.x + this.width / 2, this.y + this.height / 2];
-    },
+    }
 
-    translate: function(dx, dy) {
+    translate(dx, dy) {
         this.x += dx;
         this.y += dy;
     }
-});
-
-let winInjections, workspaceInjections, connectedSignals;
-
-function resetState() {
-    winInjections = { };
-    workspaceInjections = { };
-    connectedSignals = [ ];
 }
 
-function enable() {
+class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
-    resetState();
+    constructor(settings) {
+        super();
+        this._settings = settings;
+    }
 
-    let settings = Convenience.getSettings();
+    computeLayout(windows, layout) {
-    let useMoreScreen = settings.get_boolean('use-more-screen');
+        layout.windows = windows;
-    let windowCaptionsOnTop = settings.get_boolean('window-captions-on-top');
+    }
-    let signalId = settings.connect('changed::use-more-screen', function() {
-        useMoreScreen = settings.get_boolean('use-more-screen');
-    });
-    connectedSignals.push({ obj: settings, id: signalId });
 
     /**
-     * _calculateWindowTransformationsNatural:
-     * @clones: Array of #MetaWindow
-     *
      * Returns clones with matching target coordinates and scales to arrange windows in a natural way that no overlap exists and relative window size is preserved.
      * This function is almost a 1:1 copy of the function
      * PresentWindowsEffect::calculateWindowTransformationsNatural() from KDE, see:
      * https://projects.kde.org/projects/kde/kdebase/kde-workspace/repository/revisions/master/entry/kwin/effects/presentwindows/presentwindows.cpp
      */
-    Workspace.Workspace.prototype._calculateWindowTransformationsNatural = function(clones, area) {
+    computeWindowSlots(layout, area) {
         // 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 areaRect = new Rect(area.x, area.y, area.width, area.height);
-        let bounds = area_rect.copy();
+        let bounds = areaRect.copy();
+        let clones = layout.windows;
 
         let direction = 0;
         let directions = [];
@@ -162,31 +106,32 @@ function enable() {
             }
         }
 
-        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,
+                    let adjustments = [-1, -1, 1, 1]
-                                                    WINDOW_PLACEMENT_NATURAL_GAPS, WINDOW_PLACEMENT_NATURAL_GAPS).overlap(
+                        .map(v => v *= WINDOW_PLACEMENT_NATURAL_GAPS);
-                                                     rects[j].adjusted(-WINDOW_PLACEMENT_NATURAL_GAPS, -WINDOW_PLACEMENT_NATURAL_GAPS,
+                    let iAdjusted = rects[i].adjusted(...adjustments);
-                                                                       WINDOW_PLACEMENT_NATURAL_GAPS, WINDOW_PLACEMENT_NATURAL_GAPS))) {
+                    let jAdjusted = rects[j].adjusted(...adjustments);
-                        loop_counter++;
+                    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 iCenter = rects[i].center();
-                        let j_center = rects[j].center();
+                        let jCenter = rects[j].center();
-                        let diff = [j_center[0] - i_center[0], j_center[1] - i_center[1]];
+                        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;
@@ -201,7 +146,7 @@ function enable() {
                         rects[j].translate(diff[0], diff[1]);
 
 
-                        if (useMoreScreen) {
+                        if (this._settings.get_boolean('use-more-screen')) {
                             // Try to keep the bounding rect the same aspect as the screen so that more
                             // screen real estate is utilised. We do this by splitting the screen into nine
                             // equal sections, if the window center is in any of the corner sections pull the
@@ -215,7 +160,7 @@ function enable() {
                             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
@@ -225,23 +170,23 @@ function enable() {
                                     ySection = (directions[i] % 2 ? 2 : 0);
                             }
                             if (xSection == 0 && ySection == 0) {
-                                diff[0] = bounds.x - i_center[0];
+                                diff[0] = bounds.x - iCenter[0];
-                                diff[1] = bounds.y - i_center[1];
+                                diff[1] = bounds.y - iCenter[1];
                             }
                             if (xSection == 2 && ySection == 0) {
-                                diff[0] = bounds.x + bounds.width - i_center[0];
+                                diff[0] = bounds.x + bounds.width - iCenter[0];
-                                diff[1] = bounds.y - i_center[1];
+                                diff[1] = bounds.y - iCenter[1];
                             }
                             if (xSection == 2 && ySection == 2) {
-                                diff[0] = bounds.x + bounds.width - i_center[0];
+                                diff[0] = bounds.x + bounds.width - iCenter[0];
-                                diff[1] = bounds.y + bounds.height - i_center[1];
+                                diff[1] = bounds.y + bounds.height - iCenter[1];
                             }
                             if (xSection == 0 && ySection == 2) {
-                                diff[0] = bounds.x - i_center[0];
+                                diff[0] = bounds.x - iCenter[0];
-                                diff[1] = bounds.y + bounds.height - i_center[1];
+                                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]);
@@ -254,194 +199,69 @@ function enable() {
                     }
                 }
             }
-        } 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,
+        scale = Math.min(areaRect.width / bounds.width,
-                         area_rect.height / bounds.height,
+                         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.x = bounds.x - (areaRect.width - bounds.width * scale) / 2;
-        bounds.y = bounds.y - (area_rect.height - bounds.height * scale) / 2;
+        bounds.y = bounds.y - (areaRect.height - bounds.height * scale) / 2;
-        bounds.width = area_rect.width / scale;
+        bounds.width = areaRect.width / scale;
-        bounds.height = area_rect.height / 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].x = rects[i].x * scale + areaRect.x;
-            rects[i].y = rects[i].y * scale + area_rect.y;
+            rects[i].y = rects[i].y * scale + areaRect.y;
 
             slots.push([rects[i].x, rects[i].y, scale, clones[i]]);
         }
 
         return slots;
     }
-    workspaceInjections['_calculateWindowTransformationsNatural'] = undefined;
+}
 
-    /**
+let winInjections, workspaceInjections;
-     * _updateWindowPositions:
-     * @flags:
-     *  INITIAL - this is the initial positioning of the windows.
-     *  ANIMATE - Indicates that we need animate changing position.
-     */
-    workspaceInjections['_updateWindowPositions'] = Workspace.Workspace.prototype._updateWindowPositions;
-    Workspace.Workspace.prototype._updateWindowPositions = function(flags) {
-            if (this._currentLayout == null) {
-                this._recalculateWindowPositions(flags);
-                return;
-            }
 
-            let initialPositioning = flags & WindowPositionFlags.INITIAL;
+function resetState() {
-            let animate = flags & WindowPositionFlags.ANIMATE;
+    winInjections = { };
+    workspaceInjections = { };
+}
 
-            let layout = this._currentLayout;
+function enable() {
-            let strategy = layout.strategy;
+    resetState();
 
-            let [, , padding] = this._getSpacingAndPadding();
+    let settings = ExtensionUtils.getSettings();
-            let area = Workspace.padArea(this._actualGeometry, padding);
-
-            /// EDIT replace this version by our own:
-            //let slots = strategy.computeWindowSlots(layout, area);
-
-
-            /// EDIT copied from _realRecalculateWindowPositions:
-            let clones = this._windows.slice();
-            if (clones.length == 0)
-                return;
-
-            clones.sort(function(a, b) {
-                return a.metaWindow.get_stable_sequence() - b.metaWindow.get_stable_sequence();
-            });
-
-            if (this._reservedSlot)
-                clones.push(this._reservedSlot);
-
-            /// EDIT our own window placement function:
-            let slots = this._calculateWindowTransformationsNatural(clones, area);
-
-
-            let currentWorkspace = global.screen.get_active_workspace();
-            let isOnCurrentWorkspace = this.metaWorkspace == null || this.metaWorkspace == currentWorkspace;
-
-            for (let i = 0; i < slots.length; i++) {
-                let slot = slots[i];
-                let [x, y, scale, clone] = slot;
-                let metaWindow = clone.metaWindow;
-                let overlay = clone.overlay;
-                clone.slotId = i;
-
-                // Positioning a window currently being dragged must be avoided;
-                // we'll just leave a blank spot in the layout for it.
-                if (clone.inDrag)
-                    continue;
-
-                let cloneWidth = clone.actor.width * scale;
-                let cloneHeight = clone.actor.height * scale;
-                clone.slot = [x, y, cloneWidth, cloneHeight];
-
-                if (overlay && (initialPositioning || !clone.positioned))
-                    overlay.hide();
-
-                if (!clone.positioned) {
-                    // This window appeared after the overview was already up
-                    // Grow the clone from the center of the slot
-                    clone.actor.x = x + cloneWidth / 2;
-                    clone.actor.y = y + cloneHeight / 2;
-                    clone.actor.scale_x = 0;
-                    clone.actor.scale_y = 0;
-                    clone.positioned = true;
-                }
-
-                if (animate && isOnCurrentWorkspace) {
-                    if (!metaWindow.showing_on_its_workspace()) {
-                        /* Hidden windows should fade in and grow
-                         * therefore we need to resize them now so they
-                         * can be scaled up later */
-                        if (initialPositioning) {
-                            clone.actor.opacity = 0;
-                            clone.actor.scale_x = 0;
-                            clone.actor.scale_y = 0;
-                            clone.actor.x = x;
-                            clone.actor.y = y;
-                        }
-
-                        Tweener.addTween(clone.actor,
-                                         { opacity: 255,
-                                           time: Overview.ANIMATION_TIME,
-                                           transition: 'easeInQuad'
-                                         });
-                    }
-
-                    this._animateClone(clone, overlay, x, y, scale, initialPositioning);
-                } else {
-                    // cancel any active tweens (otherwise they might override our changes)
-                    Tweener.removeTweens(clone.actor);
-                    clone.actor.set_position(x, y);
-                    clone.actor.set_scale(scale, scale);
-                    clone.overlay.relayout(false);
-                    this._showWindowOverlay(clone, overlay, isOnCurrentWorkspace);
-                }
-            }
-        }
 
+    workspaceInjections['_getBestLayout'] = Workspace.Workspace.prototype._getBestLayout;
+    Workspace.Workspace.prototype._getBestLayout = function(windows) {
+        let strategy = new NaturalLayoutStrategy(settings);
+        let layout = { strategy };
+        strategy.computeLayout(windows, layout);
 
+        return layout;
+    };
 
     /// position window titles on top of windows in overlay ////
-    if (windowCaptionsOnTop) {
+    winInjections['relayout'] = Workspace.WindowOverlay.prototype.relayout;
+    Workspace.WindowOverlay.prototype.relayout = function(animate) {
+        if (settings.get_boolean('window-captions-on-top')) {
+            let [, , , cloneHeight] = this._windowClone.slot;
+            this.title.translation_y = -cloneHeight;
+        }
 
-        /// This is almost a direct copy of the original relayout function. Differences are marked.
+        winInjections['relayout'].call(this, animate);
-        winInjections['relayout'] = Workspace.WindowOverlay.prototype.relayout;
+    };
-        Workspace.WindowOverlay.prototype.relayout = function(animate) {
-            winInjections['relayout'].call(this, animate);
-            let title = this.title;
-            let border = this.border;
-
-            this._parentActor.set_child_above_sibling(title, border);
-
-            Tweener.removeTweens(title);
-
-            let [cloneX, cloneY, cloneWidth, cloneHeight] = this._windowClone.slot;
-
-            // Clutter.Actor.get_preferred_width() will return the fixed width if one
-            // is set, so we need to reset the width by calling set_width(-1), to forward
-            // the call down to StLabel.
-            // We also need to save and restore the current width, otherwise the animation
-            // starts from the wrong point.
-            let prevTitleWidth = title.width;
-            title.set_width(-1);
-            let [titleMinWidth, titleNatWidth] = title.get_preferred_width(-1);
-            let titleWidth = Math.max(titleMinWidth, Math.min(titleNatWidth, cloneWidth));
-            title.width = prevTitleWidth;
-
-            let titleX = cloneX + (cloneWidth - titleWidth) / 2;
-
-            /// this is the actual difference to original gnome-shell:
-            //let titleY = cloneY + cloneHeight + title._spacing;
-            let titleY = cloneY - title.height + title._spacing;
-
-            if (animate)
-                this._animateOverlayActor(title, Math.floor(titleX), Math.floor(titleY), titleWidth);
-            else {
-                title.width = titleWidth;
-                title.set_position(Math.floor(titleX), Math.floor(titleY));
-            }
-        };
-    }
 }
 
 function removeInjection(object, injection, name) {
@@ -459,13 +279,6 @@ function disable() {
     for (i in winInjections)
         removeInjection(Workspace.WindowOverlay.prototype, winInjections, i);
 
-    for each (i in connectedSignals)
-        i.obj.disconnect(i.id);
-
     global.stage.queue_relayout();
     resetState();
 }
-
-function init() {
-    /* do nothing */
-}

extensions/native-window-placement/meson.build

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

extensions/places-menu/Makefile.am

@@ -1,5 +0,0 @@
-EXTENSION_ID = places-menu
-
-EXTRA_MODULES = placeDisplay.js
-
-include ../../extension.mk

extensions/places-menu/extension.js

@@ -1,130 +1,133 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* exported init enable disable */
 
-const Clutter = imports.gi.Clutter;
+const { Clutter, GObject, St } = imports.gi;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Lang = imports.lang;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
 
 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
-const Panel = imports.ui.panel;
 
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
-const N_ = function(x) { return x; }
+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;
 
-const PlaceMenuItem = new Lang.Class({
+class PlaceMenuItem extends PopupMenu.PopupBaseMenuItem {
-    Name: 'PlaceMenuItem',
+    constructor(info) {
-    Extends: PopupMenu.PopupBaseMenuItem,
+        super();
+        this._info = info;
 
-    _init: function(info) {
+        this._icon = new St.Icon({
-	this.parent();
+            gicon: info.icon,
-	this._info = info;
+            icon_size: PLACE_ICON_SIZE
+        });
+        this.actor.add_child(this._icon);
 
-        this._icon = new St.Icon({ gicon: info.icon,
+        this._label = new St.Label({ text: info.name, x_expand: true });
-                                   icon_size: PLACE_ICON_SIZE });
-	this.actor.add_child(this._icon);
-
-        this._label = new St.Label({ text: info.name });
         this.actor.add_child(this._label);
 
-        this._changedId = info.connect('changed',
+        if (info.isRemovable()) {
-                                       Lang.bind(this, this._propertiesChanged));
+            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);
+        }
 
-    destroy: function() {
+        this._changedId = info.connect('changed',
+                                       this._propertiesChanged.bind(this));
+    }
+
+    destroy() {
         if (this._changedId) {
             this._info.disconnect(this._changedId);
             this._changedId = 0;
         }
 
-        this.parent();
+        super.destroy();
-    },
+    }
 
-    activate: function(event) {
+    activate(event) {
-	this._info.launch(event.get_time());
+        this._info.launch(event.get_time());
 
-	this.parent(event);
+        super.activate(event);
-    },
+    }
 
-    _propertiesChanged: function(info) {
+    _propertiesChanged(info) {
         this._icon.gicon = info.icon;
         this._label.text = info.name;
-    },
+    }
-});
+}
 
 const SECTIONS = [
     'special',
     'devices',
     'bookmarks',
     'network'
-]
+];
 
-const PlacesMenu = new Lang.Class({
+let PlacesMenu = GObject.registerClass(
-    Name: 'PlacesMenu.PlacesMenu',
+class PlacesMenu extends PanelMenu.Button {
-    Extends: PanelMenu.Button,
+    _init() {
-
+        super._init(0.0, _('Places'));
-    _init: function() {
-        this.parent(0.0, _("Places"));
 
         let hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
-        let label = new St.Label({ text: _("Places"),
+        let label = new St.Label({
-                                   y_expand: true,
+            text: _('Places'),
-                                   y_align: Clutter.ActorAlign.CENTER });
+            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 = { };
+        this._sections = { };
 
-	for (let i=0; i < SECTIONS.length; i++) {
+        for (let i = 0; i < SECTIONS.length; i++) {
-	    let id = SECTIONS[i];
+            let id = SECTIONS[i];
-	    this._sections[id] = new PopupMenu.PopupMenuSection();
+            this._sections[id] = new PopupMenu.PopupMenuSection();
-	    this.placesManager.connect(id + '-updated', Lang.bind(this, function() {
+            this.placesManager.connect(`${id}-updated`, () => {
-		this._redisplay(id);
+                this._redisplay(id);
-	    }));
+            });
 
-	    this._create(id);
+            this._create(id);
-	    this.menu.addMenuItem(this._sections[id]);
+            this.menu.addMenuItem(this._sections[id]);
-	    this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+            this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-	}
+        }
-    },
+    }
 
-    destroy: function() {
+    _onDestroy() {
-	this.placesManager.destroy();
+        this.placesManager.destroy();
 
-        this.parent();
+        super._onDestroy();
-    },
+    }
 
-    _redisplay: function(id) {
+    _redisplay(id) {
-	this._sections[id].removeAll();
+        this._sections[id].removeAll();
         this._create(id);
-    },
+    }
 
-    _create: function(id) {
+    _create(id) {
         let places = this.placesManager.get(id);
 
         for (let i = 0; i < places.length; i++)
             this._sections[id].addMenuItem(new PlaceMenuItem(places[i]));
 
-	this._sections[id].actor.visible = places.length > 0;
+        this._sections[id].actor.visible = places.length > 0;
     }
 });
 
 function init() {
-    Convenience.initTranslations();
+    ExtensionUtils.initTranslations();
 }
 
 let _indicator;
@@ -134,7 +137,7 @@ function enable() {
 
     let pos = 1;
     if ('apps-menu' in Main.panel.statusArea)
-	pos = 2;
+        pos = 2;
     Main.panel.addToStatusArea('places-menu', _indicator, pos, 'left');
 }
 

extensions/places-menu/meson.build

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

extensions/places-menu/metadata.json.in

@@ -4,7 +4,7 @@
 "settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
 "name": "Places Status Indicator",
-"description": "Add a menu for quickly navigating places in the system.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME Bugzilla instead.",
+"description": "Add a menu for quickly navigating places in the system.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance instead.",
 "shell-version": [ "@shell_current@" ],
 "url": "@url@"
 }

extensions/places-menu/placeDisplay.js

@@ -1,22 +1,14 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const GLib = imports.gi.GLib;
+const { Gio, GLib, Shell } = imports.gi;
-const Gio = imports.gi.Gio;
-const Shell = imports.gi.Shell;
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
 const Signals = imports.signals;
-const St = imports.gi.St;
 
-const DND = imports.ui.dnd;
 const Main = imports.ui.main;
-const Params = imports.misc.params;
+const ShellMountOperation = imports.ui.shellMountOperation;
-const Search = imports.ui.search;
-const Util = imports.misc.util;
 
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
-const N_ = function(x) { return x; }
+const N_ = x => x;
 
 const BACKGROUND_SCHEMA = 'org.gnome.desktop.background';
 
@@ -27,154 +19,243 @@ const Hostname1Iface = '<node> \
 </node>';
 const Hostname1 = Gio.DBusProxy.makeProxyWrapper(Hostname1Iface);
 
-const PlaceInfo = new Lang.Class({
+class PlaceInfo {
-    Name: 'PlaceInfo',
+    constructor() {
+        this._init.apply(this, arguments);
+    }
 
-    _init: function(kind, file, name, icon) {
+    _init(kind, file, name, icon) {
         this.kind = kind;
         this.file = file;
         this.name = name || this._getFileName();
         this.icon = icon ? new Gio.ThemedIcon({ name: icon }) : this.getIcon();
-    },
+    }
 
-    destroy: function() {
+    destroy() {
-    },
+    }
 
-    isRemovable: function() {
+    isRemovable() {
         return false;
-    },
+    }
-
-    launch: function(timestamp) {
-        let launchContext = global.create_app_launch_context(timestamp, -1);
 
+    async _ensureMountAndLaunch(context, tryMount) {
         try {
-            Gio.AppInfo.launch_default_for_uri(this.file.get_uri(),
+            await this._launchDefaultForUri(this.file.get_uri(), context, null);
-                                               launchContext);
+        } catch (e) {
-        } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_MOUNTED)) {
+            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_MOUNTED)) {
-            this.file.mount_enclosing_volume(0, null, null, function(file, result) {
+                Main.notifyError(_('Failed to launch “%s”').format(this.name), e.message);
-                file.mount_enclosing_volume_finish(result);
+                return;
-                Gio.AppInfo.launch_default_for_uri(file.get_uri(), launchContext);
+            }
-            });
-        } catch(e) {
-            Main.notifyError(_("Failed to launch \"%s\"").format(this.name), e.message);
-        }
-    },
 
-    getIcon: function() {
+            let source = {
-        try {
+                get_icon: () => this.icon
-            let info = this.file.query_info('standard::symbolic-icon', 0, null);
+            };
-	    return info.get_symbolic_icon();
+            let op = new ShellMountOperation.ShellMountOperation(source);
-        } catch(e if e instanceof Gio.IOErrorEnum) {
+            try {
-            // return a generic icon for this kind
+                await this._mountEnclosingVolume(0, op.mountOp, null);
-            switch (this.kind) {
+
-            case 'network':
+                if (tryMount)
-                return new Gio.ThemedIcon({ name: 'folder-remote-symbolic' });
+                    this._ensureMountAndLaunch(context, false);
-            case 'devices':
+            } catch (e) {
-                return new Gio.ThemedIcon({ name: 'drive-harddisk-symbolic' });
+                if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
-            case 'special':
+                    Main.notifyError(_('Failed to mount volume for “%s”').format(this.name), e.message);
-            case 'bookmarks':
+            } finally {
-            default:
+                op.close();
-                if (!this.file.is_native())
-                    return new Gio.ThemedIcon({ name: 'folder-remote-symbolic' });
-                else
-                    return new Gio.ThemedIcon({ name: 'folder-symbolic' });
             }
         }
-    },
+    }
 
-    _getFileName: function() {
+    launch(timestamp) {
+        let launchContext = global.create_app_launch_context(timestamp, -1);
+        this._ensureMountAndLaunch(launchContext, true);
+    }
+
+    getIcon() {
+        this.file.query_info_async('standard::symbolic-icon', 0, 0, null,
+                                   (file, result) => {
+                                       try {
+                                           let info = file.query_info_finish(result);
+                                           this.icon = info.get_symbolic_icon();
+                                           this.emit('changed');
+                                       } catch (e) {
+                                           if (e instanceof Gio.IOErrorEnum)
+                                               return;
+                                           throw e;
+                                       }
+                                   });
+
+        // return a generic icon for this kind for now, until we have the
+        // icon from the query info above
+        switch (this.kind) {
+        case 'network':
+            return new Gio.ThemedIcon({ name: 'folder-remote-symbolic' });
+        case 'devices':
+            return new Gio.ThemedIcon({ name: 'drive-harddisk-symbolic' });
+        case 'special':
+        case 'bookmarks':
+        default:
+            if (!this.file.is_native())
+                return new Gio.ThemedIcon({ name: 'folder-remote-symbolic' });
+            else
+                return new Gio.ThemedIcon({ name: 'folder-symbolic' });
+        }
+    }
+
+    _getFileName() {
         try {
             let info = this.file.query_info('standard::display-name', 0, null);
             return info.get_display_name();
-        } catch(e if e instanceof Gio.IOErrorEnum) {
+        } catch (e) {
-            return this.file.get_basename();
+            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);
 
-const RootInfo = new Lang.Class({
+class RootInfo extends PlaceInfo {
-    Name: 'RootInfo',
+    _init() {
-    Extends: PlaceInfo,
+        super._init('devices', Gio.File.new_for_path('/'), _('Computer'));
 
-    _init: function() {
+        let busName = 'org.freedesktop.hostname1';
-        this.parent('devices', Gio.File.new_for_path('/'), _("Computer"));
+        let objPath = '/org/freedesktop/hostname1';
+        new Hostname1(Gio.DBus.system, busName, objPath, (obj, error) => {
+            if (error)
+                return;
 
-        this._proxy = new Hostname1(Gio.DBus.system,
+            this._proxy = obj;
-                                    'org.freedesktop.hostname1',
+            this._proxy.connect('g-properties-changed',
-                                    '/org/freedesktop/hostname1',
+                                this._propertiesChanged.bind(this));
-                                    Lang.bind(this, function(obj, error) {
+            this._propertiesChanged(obj);
-                                        if (error)
+        });
-                                            return;
+    }
 
-                                        this._proxy.connect('g-properties-changed',
+    getIcon() {
-                                                            Lang.bind(this, this._propertiesChanged));
-                                        this._propertiesChanged(obj);
-                                    }));
-    },
-
-    getIcon: function() {
         return new Gio.ThemedIcon({ name: 'drive-harddisk-symbolic' });
-    },
+    }
 
-    _propertiesChanged: function(proxy) {
+    _propertiesChanged(proxy) {
         // 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');
         }
-    },
-
-    destroy: function() {
-        this._proxy.run_dispose();
-        this.parent();
     }
-});
+
+    destroy() {
+        if (this._proxy) {
+            this._proxy.run_dispose();
+            this._proxy = null;
+        }
+        super.destroy();
+    }
+}
 
 
-const PlaceDeviceInfo = new Lang.Class({
+class PlaceDeviceInfo extends PlaceInfo {
-    Name: 'PlaceDeviceInfo',
+    _init(kind, mount) {
-    Extends: PlaceInfo,
-
-    _init: function(kind, mount) {
         this._mount = mount;
-        this.parent(kind, mount.get_root(), mount.get_name());
+        super._init(kind, mount.get_root(), mount.get_name());
-    },
+    }
 
-    getIcon: function() {
+    getIcon() {
         return this._mount.get_symbolic_icon();
     }
-});
 
-const PlaceVolumeInfo = new Lang.Class({
+    isRemovable() {
-    Name: 'PlaceVolumeInfo',
+        return this._mount.can_eject();
-    Extends: PlaceInfo,
+    }
 
-    _init: function(kind, volume) {
+    eject() {
+        let unmountArgs = [
+            Gio.MountUnmountFlags.NONE,
+            (new ShellMountOperation.ShellMountOperation(this._mount)).mountOp,
+            null // Gio.Cancellable
+        ];
+
+        if (this._mount.can_eject())
+            this._mount.eject_with_operation(...unmountArgs,
+                                             this._ejectFinish.bind(this));
+        else
+            this._mount.unmount_with_operation(...unmountArgs,
+                                               this._unmountFinish.bind(this));
+    }
+
+    _ejectFinish(mount, result) {
+        try {
+            mount.eject_with_operation_finish(result);
+        } catch (e) {
+            this._reportFailure(e);
+        }
+    }
+
+    _unmountFinish(mount, result) {
+        try {
+            mount.unmount_with_operation_finish(result);
+        } catch (e) {
+            this._reportFailure(e);
+        }
+    }
+
+    _reportFailure(exception) {
+        let msg = _('Ejecting drive “%s” failed:').format(this._mount.get_name());
+        Main.notifyError(msg, exception.message);
+    }
+}
+
+class PlaceVolumeInfo extends PlaceInfo {
+    _init(kind, volume) {
         this._volume = volume;
-        this.parent(kind, volume.get_activation_root(), volume.get_name());
+        super._init(kind, volume.get_activation_root(), volume.get_name());
-    },
+    }
 
-    launch: function(timestamp) {
+    launch(timestamp) {
         if (this.file) {
-            this.parent(timestamp);
+            super.launch(timestamp);
             return;
         }
 
-        this._volume.mount(0, null, null, Lang.bind(this, function(volume, result) {
+        this._volume.mount(0, null, null, (volume, result) => {
             volume.mount_finish(result);
 
             let mount = volume.get_mount();
             this.file = mount.get_root();
-            this.parent(timestamp);
+            super.launch(timestamp);
-        }));
+        });
-    },
+    }
 
-    getIcon: function() {
+    getIcon() {
         return this._volume.get_symbolic_icon();
     }
-});
+}
 
 const DEFAULT_DIRECTORIES = [
     GLib.UserDirectory.DIRECTORY_DOCUMENTS,
@@ -184,10 +265,8 @@ const DEFAULT_DIRECTORIES = [
     GLib.UserDirectory.DIRECTORY_VIDEOS,
 ];
 
-const PlacesManager = new Lang.Class({
+var PlacesManager = class {
-    Name: 'PlacesManager',
+    constructor() {
-
-    _init: function() {
         this._places = {
             special: [],
             devices: [],
@@ -198,7 +277,7 @@ const PlacesManager = new Lang.Class({
         this._settings = new Gio.Settings({ schema_id: BACKGROUND_SCHEMA });
         this._showDesktopIconsChangedId =
             this._settings.connect('changed::show-desktop-icons',
-                                   Lang.bind(this, this._updateSpecials));
+                                   this._updateSpecials.bind(this));
         this._updateSpecials();
 
         /*
@@ -208,41 +287,50 @@ const PlacesManager = new Lang.Class({
         this._connectVolumeMonitorSignals();
         this._updateMounts();
 
-        this._bookmarksFile = this._findBookmarksFile()
+        this._bookmarksFile = this._findBookmarksFile();
         this._bookmarkTimeoutId = 0;
         this._monitor = null;
 
         if (this._bookmarksFile) {
             this._monitor = this._bookmarksFile.monitor_file(Gio.FileMonitorFlags.NONE, null);
-            this._monitor.connect('changed', Lang.bind(this, function () {
+            this._monitor.connect('changed', () => {
                 if (this._bookmarkTimeoutId > 0)
                     return;
                 /* Defensive event compression */
-                this._bookmarkTimeoutId = Mainloop.timeout_add(100, Lang.bind(this, function () {
+                this._bookmarkTimeoutId = GLib.timeout_add(
-                    this._bookmarkTimeoutId = 0;
+                    GLib.PRIORITY_DEFAULT, 100, () => {
-                    this._reloadBookmarks();
+                        this._bookmarkTimeoutId = 0;
-                    return false;
+                        this._reloadBookmarks();
-                }));
+                        return false;
-            }));
+                    });
+            });
 
             this._reloadBookmarks();
         }
-    },
+    }
 
-    _connectVolumeMonitorSignals: function() {
+    _connectVolumeMonitorSignals() {
-        const signals = ['volume-added', 'volume-removed', 'volume-changed',
+        const signals = [
-                         'mount-added', 'mount-removed', 'mount-changed',
+            'volume-added',
-                         'drive-connected', 'drive-disconnected', 'drive-changed'];
+            'volume-removed',
+            'volume-changed',
+            'mount-added',
+            'mount-removed',
+            'mount-changed',
+            'drive-connected',
+            'drive-disconnected',
+            'drive-changed'
+        ];
 
         this._volumeMonitorSignals = [];
-        let func = Lang.bind(this, this._updateMounts);
+        let func = this._updateMounts.bind(this);
         for (let i = 0; i < signals.length; i++) {
             let id = this._volumeMonitor.connect(signals[i], func);
             this._volumeMonitorSignals.push(id);
         }
-    },
+    }
 
-    destroy: function() {
+    destroy() {
         if (this._settings)
             this._settings.disconnect(this._showDesktopIconsChangedId);
         this._settings = null;
@@ -253,18 +341,18 @@ const PlacesManager = new Lang.Class({
         if (this._monitor)
             this._monitor.cancel();
         if (this._bookmarkTimeoutId)
-            Mainloop.source_remove(this._bookmarkTimeoutId);
+            GLib.source_remove(this._bookmarkTimeoutId);
-    },
+    }
 
-    _updateSpecials: function() {
+    _updateSpecials() {
-        this._places.special.forEach(function (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();
@@ -280,35 +368,35 @@ const PlacesManager = new Lang.Class({
             let file = Gio.File.new_for_path(specialPath), info;
             try {
                 info = new PlaceInfo('special', file);
-            } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND)) {
+            } catch (e) {
-                continue;
+                if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
+                    continue;
+                throw e;
             }
 
             specials.push(info);
         }
 
-        specials.sort(function(a, b) {
+        specials.sort((a, b) => GLib.utf8_collate(a.name, b.name));
-            return GLib.utf8_collate(a.name, b.name);
-        });
         this._places.special = this._places.special.concat(specials);
 
         this.emit('special-updated');
-    },
+    }
 
-    _updateMounts: function() {
+    _updateMounts() {
         let networkMounts = [];
         let networkVolumes = [];
 
-        this._places.devices.forEach(function (p) { p.destroy(); });
+        this._places.devices.forEach(p => p.destroy());
         this._places.devices = [];
-        this._places.network.forEach(function (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 */
@@ -316,13 +404,13 @@ const PlacesManager = new Lang.Class({
         for (let i = 0; i < drives.length; i++) {
             let volumes = drives[i].get_volumes();
 
-            for(let j = 0; j < volumes.length; j++) {
+            for (let j = 0; j < volumes.length; j++) {
                 let identifier = volumes[j].get_identifier('class');
-                if (identifier && identifier.indexOf('network') >= 0) {
+                if (identifier && identifier.includes('network')) {
                     networkVolumes.push(volumes[j]);
                 } else {
                     let mount = volumes[j].get_mount();
-                    if(mount != null)
+                    if (mount != null)
                         this._addMount('devices', mount);
                 }
             }
@@ -330,27 +418,27 @@ const PlacesManager = new Lang.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++) {
+        for (let i = 0; i < volumes.length; i++) {
-            if(volumes[i].get_drive() != null)
+            if (volumes[i].get_drive() != null)
                 continue;
 
             let identifier = volumes[i].get_identifier('class');
-            if (identifier && identifier.indexOf('network') >= 0) {
+            if (identifier && identifier.includes('network')) {
                 networkVolumes.push(volumes[i]);
             } else {
                 let mount = volumes[i].get_mount();
-                if(mount != null)
+                if (mount != null)
                     this._addMount('devices', mount);
             }
         }
 
         /* add mounts that have no volume (/etc/mtab mounts, ftp, sftp,...) */
         let mounts = this._volumeMonitor.get_mounts();
-        for(let i = 0; i < mounts.length; i++) {
+        for (let i = 0; i < mounts.length; i++) {
-            if(mounts[i].is_shadowed())
+            if (mounts[i].is_shadowed())
                 continue;
 
-            if(mounts[i].get_volume())
+            if (mounts[i].get_volume())
                 continue;
 
             let root = mounts[i].get_default_location();
@@ -376,9 +464,9 @@ const PlacesManager = new Lang.Class({
 
         this.emit('devices-updated');
         this.emit('network-updated');
-    },
+    }
 
-    _findBookmarksFile: function() {
+    _findBookmarksFile() {
         let paths = [
             GLib.build_filenamev([GLib.get_user_config_dir(), 'gtk-3.0', 'bookmarks']),
             GLib.build_filenamev([GLib.get_home_dir(), '.gtk-bookmarks']),
@@ -390,9 +478,9 @@ const PlacesManager = new Lang.Class({
         }
 
         return null;
-    },
+    }
 
-    _reloadBookmarks: function() {
+    _reloadBookmarks() {
 
         this._bookmarks = [];
 
@@ -440,34 +528,38 @@ const PlacesManager = new Lang.Class({
         this._places.bookmarks = bookmarks;
 
         this.emit('bookmarks-updated');
-    },
+    }
 
-    _addMount: function(kind, mount) {
+    _addMount(kind, mount) {
         let devItem;
 
         try {
             devItem = new PlaceDeviceInfo(kind, mount);
-        } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND)) {
+        } catch (e) {
-            return;
+            if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
+                return;
+            throw e;
         }
 
         this._places[kind].push(devItem);
-    },
+    }
 
-    _addVolume: function(kind, volume) {
+    _addVolume(kind, volume) {
         let volItem;
 
         try {
             volItem = new PlaceVolumeInfo(kind, volume);
-        } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND)) {
+        } catch (e) {
-            return;
+            if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
+                return;
+            throw e;
         }
 
         this._places[kind].push(volItem);
-    },
+    }
 
-    get: function (kind) {
+    get(kind) {
         return this._places[kind];
     }
-});
+};
 Signals.addSignalMethods(PlacesManager.prototype);

extensions/screenshot-window-sizer/Makefile.am

@@ -1,4 +0,0 @@
-EXTENSION_ID = screenshot-window-sizer
-
-include ../../extension.mk
-include ../../settings.mk

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, Shell, St } = imports.gi;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
 
 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,
+    Tweener.addTween(text, {
-                     { opacity: 0,
+        opacity: 0,
-                       time: MESSAGE_FADE_TIME,
+        time: MESSAGE_FADE_TIME,
-                       transition: 'easeOutQuad',
+        transition: 'easeOutQuad',
-                       onComplete: hideMessage });
+        onComplete: hideMessage
+    });
 }
 
 let SIZES = [
@@ -69,26 +66,22 @@ let SIZES = [
     [1600, 900]
 ];
 
-function cycleScreenshotSizes(display, screen, window, binding) {
+function cycleScreenshotSizes(display, window, binding) {
     // Probably this isn't useful with 5 sizes, but you can decrease instead
     // of increase by holding down shift.
     let modifiers = binding.get_modifiers();
     let backwards = (modifiers & Meta.VirtualModifier.SHIFT_MASK) != 0;
 
     // Unmaximize first
-    if (window.maximized_horizontally || window.maximizedVertically)
+    if (window.get_maximized() != 0)
-        window.unmaximize(Meta.MaximizeFlags.HORIZONTAL | Meta.MaximizeFlags.VERTICAL);
+        window.unmaximize(Meta.MaximizeFlags.BOTH);
 
     let workArea = window.get_work_area_current_monitor();
     let outerRect = window.get_frame_rect();
 
     // Double both axes if on a hidpi display
     let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-    let scaledSizes = SIZES.map(function(size) {
+    let scaledSizes = SIZES.map(size => size.map(wh => wh * scaleFactor));
-        return size.map(function(wh) {
-            return wh * scaleFactor;
-        });
-    });
 
     // Find the nearest 16:9 size for the current window size
     let nearestIndex;
@@ -128,8 +121,8 @@ function cycleScreenshotSizes(display, screen, window, binding) {
 
     let newOuterRect = window.get_frame_rect();
     let message = '%d×%d'.format(
-            (newOuterRect.width / scaleFactor),
+        (newOuterRect.width / scaleFactor),
-            (newOuterRect.height / 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
@@ -141,17 +134,21 @@ function cycleScreenshotSizes(display, screen, window, binding) {
     flashMessage(message);
 }
 
-function init() {
-}
-
 function enable() {
     Main.wm.addKeybinding('cycle-screenshot-sizes',
-                          Convenience.getSettings(),
+                          ExtensionUtils.getSettings(),
-                          Meta.KeyBindingFlags.PER_WINDOW | Meta.KeyBindingFlags.REVERSES,
+                          Meta.KeyBindingFlags.PER_WINDOW,
+                          Shell.ActionMode.NORMAL,
+                          cycleScreenshotSizes);
+    Main.wm.addKeybinding('cycle-screenshot-sizes-backward',
+                          ExtensionUtils.getSettings(),
+                          Meta.KeyBindingFlags.PER_WINDOW |
+                          Meta.KeyBindingFlags.IS_REVERSED,
                           Shell.ActionMode.NORMAL,
                           cycleScreenshotSizes);
 }
 
 function disable() {
     Main.wm.removeKeybinding('cycle-screenshot-sizes');
+    Main.wm.removeKeybinding('cycle-screenshot-sizes-backward');
 }

extensions/screenshot-window-sizer/meson.build

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

extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml

@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schemalist>
+<schemalist gettext-domain="gnome-shell-extensions">
   <schema id="org.gnome.shell.extensions.screenshot-window-sizer"
           path="/org/gnome/shell/extensions/screenshot-window-sizer/">
     <key type="as" name="cycle-screenshot-sizes">
       <default><![CDATA[['<Alt><Control>s']]]></default>
       <summary>Cycle Screenshot Sizes</summary>
     </key>
+    <key type="as" name="cycle-screenshot-sizes-backward">
+      <default><![CDATA[['<Shift><Alt><Control>s']]]></default>
+      <summary>Cycle Screenshot Sizes Backward</summary>
+    </key>
   </schema>
 </schemalist>

extensions/user-theme/Makefile.am

@@ -1,5 +0,0 @@
-EXTENSION_ID = user-theme
-
-include ../../extension.mk
-include ../../settings.mk
-

extensions/user-theme/extension.js

@@ -1,30 +1,25 @@
 // -*- 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, GLib } = imports.gi;
-const Gio = imports.gi.Gio;
-const Lang = imports.lang;
 const Main = imports.ui.main;
 
 const SETTINGS_KEY = 'name';
 
 const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
-const Convenience = Me.imports.convenience;
 
-const ThemeManager = new Lang.Class({
+class ThemeManager {
-    Name: 'UserTheme.ThemeManager',
+    constructor() {
+        this._settings = ExtensionUtils.getSettings();
+    }
 
-    _init: function() {
+    enable() {
-        this._settings = Convenience.getSettings();
+        this._changedId = this._settings.connect(`changed::${SETTINGS_KEY}`, this._changeTheme.bind(this));
-    },
-
-    enable: function() {
-        this._changedId = this._settings.connect('changed::'+SETTINGS_KEY, Lang.bind(this, this._changeTheme));
         this._changeTheme();
-    },
+    }
 
-    disable: function() {
+    disable() {
         if (this._changedId) {
             this._settings.disconnect(this._changedId);
             this._changedId = 0;
@@ -32,39 +27,35 @@ const ThemeManager = new Lang.Class({
 
         Main.setThemeStylesheet(null);
         Main.loadTheme();
-    },
+    }
 
-    _changeTheme: function() {
+    _changeTheme() {
-        let _stylesheet = null;
+        let stylesheet = null;
-        let _themeName = this._settings.get_string(SETTINGS_KEY);
+        let themeName = this._settings.get_string(SETTINGS_KEY);
 
-        if (_themeName) {
+        if (themeName) {
-            let _userCssStylesheet = GLib.get_home_dir() + '/.themes/' + _themeName + '/gnome-shell/gnome-shell.css';
+            let stylesheetPaths = [
-            let file = Gio.file_new_for_path(_userCssStylesheet);
+                [GLib.get_home_dir(), '.themes'],
-            if (file.query_exists(null))
+                [GLib.get_user_data_dir(), 'themes'],
-                _stylesheet = _userCssStylesheet;
+                ...GLib.get_system_data_dirs().map(dir => [dir, 'themes'])
-            else {
+            ].map(themeDir => GLib.build_filenamev([
-                let sysdirs = GLib.get_system_data_dirs();
+                ...themeDir, themeName, 'gnome-shell', 'gnome-shell.css'
-                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';
+            stylesheet = stylesheetPaths.find(path => {
-                    let file = Gio.file_new_for_path(_userCssStylesheet);
+                let file = Gio.file_new_for_path(path);
-                    if (file.query_exists(null)) {
+                return file.query_exists(null);
-                        _stylesheet = _userCssStylesheet;
+            });
-                        break;
-                    }
-                }
-            }
         }
 
-        if (_stylesheet)
+        if (stylesheet)
-            global.log('loading user theme: ' + _stylesheet);
+            global.log(`loading user theme: ${stylesheet}`);
         else
             global.log('loading default theme (Adwaita)');
-        Main.setThemeStylesheet(_stylesheet);
+        Main.setThemeStylesheet(stylesheet);
         Main.loadTheme();
     }
-});
+}
 
 function init() {
     return new ThemeManager();

extensions/user-theme/meson.build

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

extensions/window-list/Makefile.am

@@ -1,10 +0,0 @@
-EXTENSION_ID = window-list
-
-EXTRA_MODULES = prefs.js
-
-if CLASSIC_MODE
-  EXTRA_MODULES += classic.css
-endif
-
-include ../../extension.mk
-include ../../settings.mk

extensions/window-list/classic.css

@@ -44,7 +44,3 @@
     color: #888;
     box-shadow: inset -1px -1px 1px rgba(0,0,0,0.5);
   }
-
-  .bottom-panel .window-button.minimized > StWidget {
-    box-shadow: inset 1px 1px 1px rgba(0,0,0,0.5);
-  }

extensions/window-list/meson.build

@@ -0,0 +1,12 @@
+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')
+
+if classic_mode_enabled
+  extension_data += files('classic.css')
+endif

extensions/window-list/metadata.json.in

@@ -4,7 +4,7 @@
 "settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
 "name": "Window List",
-"description": "Display a window list at the bottom of the screen.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME Bugzilla instead.",
+"description": "Display a window list at the bottom of the screen.\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.",
 "shell-version": [ "@shell_current@" ],
 "url": "@url@"
 }

extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml

@@ -12,7 +12,7 @@
       <summary>When to group windows</summary>
       <description>
         Decides when to group windows from the same application on the
-        window list. Possible values are "never", "auto" and "always".
+        window list. Possible values are “never”, “auto” and “always”.
       </description>
     </key>
     <key name="show-on-all-monitors" type="b">

extensions/window-list/prefs.js

@@ -1,55 +1,52 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+/* exported init buildPrefsWidget */
 
-const Gio = imports.gi.Gio;
+const { Gio, GObject, Gtk } = imports.gi;
-const GObject = imports.gi.GObject;
-const Gtk = imports.gi.Gtk;
-const Lang = imports.lang;
 
 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 = new GObject.Class({
+const WindowListPrefsWidget = GObject.registerClass(
-    Name: 'WindowList.Prefs.Widget',
+class WindowListPrefsWidget extends Gtk.Grid {
-    GTypeName: 'WindowListPrefsWidget',
+    _init(params) {
-    Extends: Gtk.Grid,
+        super._init(params);
-
-    _init: function(params) {
-        this.parent(params);
 
         this.margin = 24;
         this.row_spacing = 6;
         this.orientation = Gtk.Orientation.VERTICAL;
 
-        let groupingLabel = '<b>' + _("Window Grouping") + '</b>';
+        let groupingLabel = '<b>%s</b>'.format(_('Window Grouping'));
-        this.add(new Gtk.Label({ label: groupingLabel, use_markup: true,
+        this.add(new Gtk.Label({
-                                 halign: Gtk.Align.START }));
+            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,
+        let grid = new Gtk.Grid({
-                                  row_spacing: 6,
+            orientation: Gtk.Orientation.VERTICAL,
-                                  column_spacing: 6 });
+            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"),
+            'never': _('Never group windows'),
-            'auto': _("Group windows when space is limited"),
+            'auto': _('Group windows when space is limited'),
-            'always': _("Always group windows")
+            'always': _('Always group windows')
         };
 
         let radio = null;
@@ -57,23 +54,27 @@ const WindowListPrefsWidget = new GObject.Class({
             let mode = modes[i];
             let label = modeLabels[mode];
             if (!label) {
-               log('Unhandled option "%s" for grouping-mode'.format(mode));
+                log('Unhandled option "%s" for grouping-mode'.format(mode));
-               continue;
+                continue;
             }
 
-            radio = new Gtk.RadioButton({ active: currentMode == mode,
+            radio = new Gtk.RadioButton({
-                                          label: label,
+                active: currentMode == mode,
-                                          group: radio });
+                label: label,
+                group: radio
+            });
             grid.add(radio);
 
-            radio.connect('toggled', Lang.bind(this, function(button) {
+            radio.connect('toggled', button => {
                 if (button.active)
                     this._settings.set_string('grouping-mode', mode);
-            }));
+            });
         }
 
-        let check = new Gtk.CheckButton({ label: _("Show on all monitors"),
+        let check = new Gtk.CheckButton({
-                                          margin_top: 6 });
+            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/Makefile.am

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

extensions/windowsNavigator/extension.js

@@ -1,8 +1,6 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-const Clutter = imports.gi.Clutter;
+/* exported enable disable */
-const Lang = imports.lang;
+const { Clutter, St } = imports.gi;
-const Mainloop = imports.mainloop;
-const St = imports.gi.St;
 
 const Main = imports.ui.main;
 const Workspace = imports.ui.workspace;
@@ -16,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 = { };
+    winInjections = {};
-    workspaceInjections = { };
+    workspaceInjections = {};
-    workViewInjections = { };
+    workViewInjections = {};
-    createdActors = [ ];
+    createdActors = [];
-    connectedSignals = [ ];
+    connectedSignals = [];
 }
 
 function enable() {
@@ -37,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() {
@@ -66,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() {
@@ -75,7 +73,7 @@ function enable() {
         if (!this._tip.get_parent())
             return;
         this._tip.hide();
-    }
+    };
     workspaceInjections['hideTooltip'] = undefined;
 
     Workspace.Workspace.prototype.getWindowWithTooltip = function(id) {
@@ -84,7 +82,7 @@ function enable() {
                 return this._windows[i].metaWindow;
         }
         return null;
-    }
+    };
     workspaceInjections['getWindowWithTooltip'] = undefined;
 
     Workspace.Workspace.prototype.showWindowsTooltips = function() {
@@ -92,7 +90,7 @@ function enable() {
             if (this._windowOverlays[i] != null)
                 this._windowOverlays[i].showTooltip();
         }
-    }
+    };
     workspaceInjections['showWindowsTooltips'] = undefined;
 
     Workspace.Workspace.prototype.hideWindowsTooltips = function() {
@@ -100,7 +98,7 @@ function enable() {
             if (this._windowOverlays[i] != null)
                 this._windowOverlays[i].hideTooltip();
         }
-    }
+    };
     workspaceInjections['hideWindowsTooltips'] = undefined;
 
     WorkspacesView.WorkspacesView.prototype._hideTooltips = function() {
@@ -109,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() {
@@ -117,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) {
@@ -129,21 +127,23 @@ function enable() {
             (o.get_key_symbol() == Clutter.KEY_Control_L ||
              o.get_key_symbol() == Clutter.KEY_Control_R))
             this._hideWorkspacesTooltips();
-    }
+    };
     workViewInjections['_onKeyRelease'] = undefined;
 
     WorkspacesView.WorkspacesView.prototype._onKeyPress = function(s, o) {
-        if(Main.overview.viewSelector._activePage != Main.overview.viewSelector._workspacesPage)
+        if (Main.overview.viewSelector._activePage != Main.overview.viewSelector._workspacesPage)
             return false;
 
+        let workspaceManager = global.workspace_manager;
+
         if ((o.get_key_symbol() == Clutter.KEY_Alt_L ||
              o.get_key_symbol() == Clutter.KEY_Alt_R)
             && !this._pickWorkspace) {
             this._prevFocusActor = global.stage.get_key_focus();
             global.stage.set_key_focus(null);
-            this._active = global.screen.get_active_workspace_index();
+            this._active = workspaceManager.get_active_workspace_index();
             this._pickWindow = true;
-            this._workspaces[global.screen.get_active_workspace_index()].showWindowsTooltips();
+            this._workspaces[workspaceManager.get_active_workspace_index()].showWindowsTooltips();
             return true;
         }
         if ((o.get_key_symbol() == Clutter.KEY_Control_L ||
@@ -167,7 +167,7 @@ function enable() {
             return true;
 
         if (this._pickWindow) {
-            if (this._active != global.screen.get_active_workspace_index()) {
+            if (this._active != workspaceManager.get_active_workspace_index()) {
                 this._hideTooltips();
                 return false;
             }
@@ -208,7 +208,7 @@ function enable() {
             return true;
         }
         return false;
-    }
+    };
     workViewInjections['_onKeyPress'] = undefined;
 
     winInjections['_init'] = injectToFunction(Workspace.WindowOverlay.prototype, '_init', function(windowClone, parentActor) {
@@ -218,8 +218,8 @@ function enable() {
         parentActor.add_actor(this._text);
     });
 
-    winInjections['relayout'] = injectToFunction(Workspace.WindowOverlay.prototype, 'relayout', function(animate) {
+    winInjections['relayout'] = injectToFunction(Workspace.WindowOverlay.prototype, 'relayout', function(_animate) {
-        let [cloneX, cloneY, cloneWidth, cloneHeight] = this._windowClone.slot;
+        let [cloneX, cloneY, cloneWidth_, cloneHeight_] = this._windowClone.slot;
 
         let textX = cloneX - 2;
         let textY = cloneY - 2;
@@ -229,23 +229,27 @@ 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',
+            createdActors.push(this._tip = new St.Label({
-                                                          visible: false }));
+                style_class: 'extension-windowsNavigator-window-tooltip',
+                visible: false
+            }));
 
             this.actor.add_actor(this._tip);
-            let signalId = this.actor.connect('notify::scale-x', Lang.bind(this, function() {
+            let signalId = this.actor.connect('notify::scale-x', () => {
                 this._tip.set_scale(1 / this.actor.scale_x, 1 / this.actor.scale_x);
-            }));
+            });
             connectedSignals.push({ obj: this.actor, id: signalId });
         } else
             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 = global.stage.connect('key-press-event', Lang.bind(this, this._onKeyPress));
+        this._keyPressEventId =
-        this._keyReleaseEventId = global.stage.connect('key-release-event', Lang.bind(this, this._onKeyRelease));
+            global.stage.connect('key-press-event', this._onKeyPress.bind(this));
+        this._keyReleaseEventId =
+            global.stage.connect('key-release-event', this._onKeyRelease.bind(this));
         connectedSignals.push({ obj: global.stage, id: this._keyPressEventId });
         connectedSignals.push({ obj: global.stage, id: this._keyReleaseEventId });
     });
@@ -253,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 = [];
     });
 }
 
@@ -274,15 +278,11 @@ function disable() {
     for (i in workViewInjections)
         removeInjection(WorkspacesView.WorkspacesView.prototype, workViewInjections, i);
 
-    for each (i in connectedSignals)
+    for (i of connectedSignals)
         i.obj.disconnect(i.id);
 
-    for each (i in createdActors)
+    for (i of createdActors)
         i.destroy();
 
     resetState();
 }
-
-function init() {
-    /* do nothing */
-}

extensions/windowsNavigator/meson.build

@@ -0,0 +1,5 @@
+extension_data += configure_file(
+  input: metadata_name + '.in',
+  output: metadata_name,
+  configuration: metadata_conf
+)

extensions/workspace-indicator/Makefile.am

@@ -1,5 +0,0 @@
-EXTENSION_ID = workspace-indicator
-
-EXTRA_MODULES = prefs.js
-
-include ../../extension.mk

extensions/workspace-indicator/extension.js

@@ -1,14 +1,9 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+/* exported init enable disable */
 
-const Gio = imports.gi.Gio;
+const { Clutter, Gio, GObject, Meta, St } = imports.gi;
-const Meta = imports.gi.Meta;
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
-const Panel = imports.ui.panel;
 
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
@@ -16,120 +11,128 @@ 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';
 
-const WorkspaceIndicator = new Lang.Class({
+let WorkspaceIndicator = GObject.registerClass(
-    Name: 'WorkspaceIndicator.WorkspaceIndicator',
+class WorkspaceIndicator extends PanelMenu.Button {
-    Extends: PanelMenu.Button,
+    _init() {
+        super._init(0.0, _('Workspace Indicator'));
 
-    _init: function(){
+        let workspaceManager = global.workspace_manager;
-	this.parent(0.0, _("Workspace Indicator"));
 
-	this._currentWorkspace = global.screen.get_active_workspace().index();
+        this._currentWorkspace = workspaceManager.get_active_workspace().index();
-	this.statusLabel = new St.Label({ y_align: Clutter.ActorAlign.CENTER,
+        this.statusLabel = new St.Label({
-                                          text: this._labelText() });
+            y_align: Clutter.ActorAlign.CENTER,
+            text: this._labelText()
+        });
 
-	this.actor.add_actor(this.statusLabel);
+        this.add_actor(this.statusLabel);
 
-	this.workspacesItems = [];
+        this.workspacesItems = [];
-	this._workspaceSection = new PopupMenu.PopupMenuSection();
+        this._workspaceSection = new PopupMenu.PopupMenuSection();
-	this.menu.addMenuItem(this._workspaceSection);
+        this.menu.addMenuItem(this._workspaceSection);
 
-	this._screenSignals = [];
+        this._workspaceManagerSignals = [];
-	this._screenSignals.push(global.screen.connect_after('workspace-added', Lang.bind(this,this._createWorkspacesSection)));
+        this._workspaceManagerSignals.push(workspaceManager.connect_after('workspace-added',
-	this._screenSignals.push(global.screen.connect_after('workspace-removed', Lang.bind(this,this._createWorkspacesSection)));
+                                                                          this._createWorkspacesSection.bind(this)));
-	this._screenSignals.push(global.screen.connect_after('workspace-switched', Lang.bind(this,this._updateIndicator)));
+        this._workspaceManagerSignals.push(workspaceManager.connect_after('workspace-removed',
+                                                                          this._createWorkspacesSection.bind(this)));
+        this._workspaceManagerSignals.push(workspaceManager.connect_after('workspace-switched',
+                                                                          this._updateIndicator.bind(this)));
 
-	this.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
+        this.connect('scroll-event', this._onScrollEvent.bind(this));
-	this._createWorkspacesSection();
+        this._createWorkspacesSection();
 
-	//styling
+        //styling
-	this.statusLabel.add_style_class_name('panel-workspace-indicator');
+        this.statusLabel.add_style_class_name('panel-workspace-indicator');
 
         this._settings = new Gio.Settings({ schema_id: WORKSPACE_SCHEMA });
-        this._settingsChangedId = this._settings.connect('changed::' + WORKSPACE_KEY, Lang.bind(this, this._createWorkspacesSection));
+        this._settingsChangedId =
-    },
+            this._settings.connect(`changed::${WORKSPACE_KEY}`,
+                                   this._createWorkspacesSection.bind(this));
+    }
 
-    destroy: function() {
+    _onDestroy() {
-	for (let i = 0; i < this._screenSignals.length; i++)
+        for (let i = 0; i < this._workspaceManagerSignals.length; i++)
-	    global.screen.disconnect(this._screenSignals[i]);
+            global.workspace_manager.disconnect(this._workspaceManagerSignals[i]);
 
         if (this._settingsChangedId) {
             this._settings.disconnect(this._settingsChangedId);
             this._settingsChangedId = 0;
         }
 
-	this.parent();
+        super._onDestroy();
-    },
+    }
 
-    _updateIndicator: function() {
+    _updateIndicator() {
-	this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.NONE);
+        this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.NONE);
-	this._currentWorkspace = global.screen.get_active_workspace().index();
+        this._currentWorkspace = global.workspace_manager.get_active_workspace().index();
-	this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.DOT);
+        this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.DOT);
 
-	this.statusLabel.set_text(this._labelText());
+        this.statusLabel.set_text(this._labelText());
-    },
+    }
 
-    _labelText : function(workspaceIndex) {
+    _labelText(workspaceIndex) {
-	if(workspaceIndex == undefined) {
+        if (workspaceIndex == undefined) {
-	    workspaceIndex = this._currentWorkspace;
+            workspaceIndex = this._currentWorkspace;
-	    return (workspaceIndex + 1).toString();
+            return (workspaceIndex + 1).toString();
-	}
+        }
-	return Meta.prefs_get_workspace_name(workspaceIndex);
+        return Meta.prefs_get_workspace_name(workspaceIndex);
-    },
+    }
 
-    _createWorkspacesSection : function() {
+    _createWorkspacesSection() {
-	this._workspaceSection.removeAll();
+        let workspaceManager = global.workspace_manager;
-	this.workspacesItems = [];
-	this._currentWorkspace = global.screen.get_active_workspace().index();
 
-	let i = 0;
+        this._workspaceSection.removeAll();
-	for(; i < global.screen.n_workspaces; i++) {
+        this.workspacesItems = [];
-	    this.workspacesItems[i] = new PopupMenu.PopupMenuItem(this._labelText(i));
+        this._currentWorkspace = workspaceManager.get_active_workspace().index();
-	    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', Lang.bind(this, function(actor, event) {
-		this._activate(actor.workspaceId);
-	    }));
 
-	    if (i == this._currentWorkspace)
+        let i = 0;
-		this.workspacesItems[i].setOrnament(PopupMenu.Ornament.DOT);
+        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;
+            this.workspacesItems[i].connect('activate', (actor, _event) => {
+                this._activate(actor.workspaceId);
+            });
 
-	this.statusLabel.set_text(this._labelText());
+            if (i == this._currentWorkspace)
-    },
+                this.workspacesItems[i].setOrnament(PopupMenu.Ornament.DOT);
+        }
 
-    _activate : function (index) {
+        this.statusLabel.set_text(this._labelText());
-	if(index >= 0 && index <  global.screen.n_workspaces) {
+    }
-	    let metaWorkspace = global.screen.get_workspace_by_index(index);
-	    metaWorkspace.activate(global.get_current_time());
-	}
-    },
 
-    _onScrollEvent : function(actor, event) {
+    _activate(index) {
-	let direction = event.get_scroll_direction();
+        let workspaceManager = global.workspace_manager;
-	let diff = 0;
-	if (direction == Clutter.ScrollDirection.DOWN) {
-	    diff = 1;
-	} else if (direction == Clutter.ScrollDirection.UP) {
-	    diff = -1;
-	} else {
-	    return;
-	}
 
-	let newIndex = global.screen.get_active_workspace().index() + diff;
+        if (index >= 0 && index <  workspaceManager.n_workspaces) {
-	this._activate(newIndex);
+            let metaWorkspace = workspaceManager.get_workspace_by_index(index);
-    },
+            metaWorkspace.activate(global.get_current_time());
+        }
+    }
+
+    _onScrollEvent(actor, event) {
+        let direction = event.get_scroll_direction();
+        let diff = 0;
+        if (direction == Clutter.ScrollDirection.DOWN) {
+            diff = 1;
+        } else if (direction == Clutter.ScrollDirection.UP) {
+            diff = -1;
+        } else {
+            return;
+        }
+
+        let newIndex = global.workspace_manager.get_active_workspace().index() + diff;
+        this._activate(newIndex);
+    }
 });
 
-function init(meta) {
+function init() {
-    Convenience.initTranslations();
+    ExtensionUtils.initTranslations();
 }
 
 let _indicator;

extensions/workspace-indicator/meson.build

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

extensions/workspace-indicator/prefs.js

@@ -1,48 +1,40 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+/* exported init buildPrefsWidget */
 
-const Gio = imports.gi.Gio;
+const { Gio, GObject, Gtk } = imports.gi;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
-const Gtk = imports.gi.Gtk;
-const Lang = imports.lang;
 
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
-const N_ = function(e) { return e };
+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';
 
-const WorkspaceNameModel = new GObject.Class({
+const WorkspaceNameModel = GObject.registerClass(
-    Name: 'WorkspaceIndicator.WorkspaceNameModel',
+class WorkspaceNameModel extends Gtk.ListStore {
-    GTypeName: 'WorkspaceNameModel',
+    _init(params) {
-    Extends: Gtk.ListStore,
+        super._init(params);
-
-    Columns: {
-        LABEL: 0,
-    },
-
-    _init: function(params) {
-        this.parent(params);
         this.set_column_types([GObject.TYPE_STRING]);
 
+        this.Columns = {
+            LABEL: 0,
+        };
+
         this._settings = new Gio.Settings({ schema_id: WORKSPACE_SCHEMA });
-        //this._settings.connect('changed::workspace-names', Lang.bind(this, this._reloadFromSettings));
+        //this._settings.connect('changed::workspace-names', this._reloadFromSettings.bind(this));
 
         this._reloadFromSettings();
 
         // overriding class closure doesn't work, because GtkTreeModel
         // plays tricks with marshallers and class closures
-        this.connect('row-changed', Lang.bind(this, this._onRowChanged));
+        this.connect('row-changed', this._onRowChanged.bind(this));
-        this.connect('row-inserted', Lang.bind(this, this._onRowInserted));
+        this.connect('row-inserted', this._onRowInserted.bind(this));
-        this.connect('row-deleted', Lang.bind(this, this._onRowDeleted));
+        this.connect('row-deleted', this._onRowDeleted.bind(this));
-    },
+    }
 
-    _reloadFromSettings: function() {
+    _reloadFromSettings() {
         if (this._preventChanges)
             return;
         this._preventChanges = true;
@@ -67,9 +59,9 @@ const WorkspaceNameModel = new GObject.Class({
         }
 
         this._preventChanges = false;
-    },
+    }
 
-    _onRowChanged: function(self, path, iter) {
+    _onRowChanged(self, path, iter) {
         if (this._preventChanges)
             return;
         this._preventChanges = true;
@@ -88,9 +80,9 @@ const WorkspaceNameModel = new GObject.Class({
         this._settings.set_strv(WORKSPACE_KEY, names);
 
         this._preventChanges = false;
-    },
+    }
 
-    _onRowInserted: function(self, path, iter) {
+    _onRowInserted(self, path, iter) {
         if (this._preventChanges)
             return;
         this._preventChanges = true;
@@ -103,9 +95,9 @@ const WorkspaceNameModel = new GObject.Class({
         this._settings.set_strv(WORKSPACE_KEY, names);
 
         this._preventChanges = false;
-    },
+    }
 
-    _onRowDeleted: function(self, path) {
+    _onRowDeleted(self, path) {
         if (this._preventChanges)
             return;
         this._preventChanges = true;
@@ -119,44 +111,46 @@ const WorkspaceNameModel = new GObject.Class({
         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);
 
         this._preventChanges = false;
-    },
+    }
 });
 
-const WorkspaceSettingsWidget = new GObject.Class({
+const WorkspaceSettingsWidget = GObject.registerClass(
-    Name: 'WorkspaceIndicator.WorkspaceSettingsWidget',
+class WorkspaceSettingsWidget extends Gtk.Grid {
-    GTypeName: 'WorkspaceSettingsWidget',
+    _init(params) {
-    Extends: Gtk.Grid,
+        super._init(params);
-
-    _init: function(params) {
-        this.parent(params);
         this.margin = 12;
         this.orientation = Gtk.Orientation.VERTICAL;
 
-        this.add(new Gtk.Label({ label: '<b>' + _("Workspace Names") + '</b>',
+        this.add(new Gtk.Label({
-                                 use_markup: true, margin_bottom: 6,
+            label: '<b>%s</b>'.format(_('Workspace Names')),
-                                 hexpand: true, halign: Gtk.Align.START }));
+            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,
+        this._treeView = new Gtk.TreeView({
-                                            headers_visible: false,
+            model: this._store,
-                                            reorderable: true,
+            headers_visible: false,
-                                            hexpand: true,
+            reorderable: true,
-                                            vexpand: 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', Lang.bind(this, this._cellEdited));
+        renderer.connect('edited', this._cellEdited.bind(this));
         column.pack_start(renderer, true);
         column.add_attribute(renderer, 'text', this._store.Columns.LABEL);
         this._treeView.append_column(column);
@@ -167,40 +161,39 @@ const WorkspaceSettingsWidget = new GObject.Class({
         toolbar.get_style_context().add_class(Gtk.STYLE_CLASS_INLINE_TOOLBAR);
 
         let newButton = new Gtk.ToolButton({ icon_name: 'list-add-symbolic' });
-        newButton.connect('clicked', Lang.bind(this, this._newClicked));
+        newButton.connect('clicked', this._newClicked.bind(this));
         toolbar.add(newButton);
 
         let delButton = new Gtk.ToolButton({ icon_name: 'list-remove-symbolic' });
-        delButton.connect('clicked', Lang.bind(this, this._delClicked));
+        delButton.connect('clicked', this._delClicked.bind(this));
         toolbar.add(delButton);
 
         let selection = this._treeView.get_selection();
-        selection.connect('changed',
+        selection.connect('changed', () => {
-            function() {
+            delButton.sensitive = selection.count_selected_rows() > 0;
-                delButton.sensitive = selection.count_selected_rows() > 0;
+        });
-            });
         delButton.sensitive = selection.count_selected_rows() > 0;
 
         this.add(toolbar);
-    },
+    }
 
-    _cellEdited: function(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: function() {
+    _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: function() {
+    _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);
@@ -208,7 +201,7 @@ const WorkspaceSettingsWidget = new GObject.Class({
 });
 
 function init() {
-    Convenience.initTranslations();
+    ExtensionUtils.initTranslations();
 }
 
 function buildPrefsWidget() {

gnome-shell-extensions.doap

@@ -15,7 +15,7 @@ and will be picked automatically at next login.
   <homepage rdf:resource="https://wiki.gnome.org/Projects/GnomeShell/Extensions" />
   <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/gnome-shell-list" />
   <download-page rdf:resource="http://download.gnome.org/sources/gnome-shell-extensions/" />
-  <bug-database rdf:resource="http://bugzilla.gnome.org/browse.cgi?product=gnome-shell&amp;component=extensions" />
+  <bug-database rdf:resource="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/issues" />
 
   <category rdf:resource="http://api.gnome.org/doap-extensions#core" />
   <programming-language>JavaScript</programming-language>

include.mk

@@ -1,12 +0,0 @@
-extensionurl = http://git.gnome.org/gnome-shell-extensions
-
-# Change these to modify how installation is performed
-topextensiondir = $(datadir)/gnome-shell/extensions
-extensionbase = @gnome-shell-extensions.gcampax.github.com
-
-gschemabase = org.gnome.shell.extensions
-
-uuid = $(EXTENSION_ID)$(extensionbase)
-gschemaname = $(gschemabase).$(EXTENSION_ID)
-
-extensiondir = $(topextensiondir)/$(uuid)

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

m4/.gitignore

@@ -1 +0,0 @@
-intltool.m4

meson.build

@@ -0,0 +1,95 @@
+project('gnome-shell-extensions',
+  version: '3.32.0',
+  meson_version: '>= 0.44.0',
+  license: 'GPL2+'
+)
+
+gettext_domain = meson.project_name()
+
+gnome = import('gnome')
+i18n = import('i18n')
+
+datadir = get_option('datadir')
+
+shelldir = join_paths(datadir, 'gnome-shell')
+extensiondir = join_paths(shelldir, 'extensions')
+modedir = join_paths(shelldir, 'modes')
+themedir = join_paths(shelldir, 'theme')
+
+schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
+sessiondir = join_paths(datadir, 'gnome-session', 'sessions')
+xsessiondir = join_paths(datadir, 'xsessions')
+
+js60 = find_program('js60', required: false)
+
+ver_arr = meson.project_version().split('.')
+if ver_arr[1].to_int().is_even()
+  shell_version = '@0@.@1@'.format(ver_arr[0], ver_arr[1])
+else
+  shell_version = '.'.join(ver_arr)
+endif
+
+uuid_suffix = '@gnome-shell-extensions.gcampax.github.com'
+
+classic_extensions = [
+  'apps-menu',
+  'places-menu',
+  'launch-new-instance',
+  'window-list'
+]
+
+default_extensions = classic_extensions
+default_extensions += [
+  'drive-menu',
+  'screenshot-window-sizer',
+  'windowsNavigator',
+  'workspace-indicator'
+]
+
+all_extensions = default_extensions
+all_extensions += [
+  'auto-move-windows',
+  'native-window-placement',
+  'user-theme'
+]
+
+enabled_extensions = get_option('enable_extensions')
+
+if enabled_extensions.length() == 0
+  set = get_option('extension_set')
+
+  if set == 'classic'
+    enabled_extensions += classic_extensions
+  elif set == 'default'
+    enabled_extensions += default_extensions
+  elif set == 'all'
+    enabled_extensions += all_extensions
+  endif
+endif
+
+classic_mode_enabled = get_option('classic_mode')
+
+if classic_mode_enabled
+  # Sanity check: Make sure all classic extensions are enabled
+  foreach e : classic_extensions
+    if not enabled_extensions.contains(e)
+      error('Classic mode is enabled, ' +
+            'but the required extension @0@ is not.'.format(e))
+    endif
+  endforeach
+endif
+
+# Sanity check: Make sure enabled extensions are valid
+foreach e : enabled_extensions
+  if not all_extensions.contains(e)
+    error('Invalid extension @0@.'.format(e))
+  endif
+endforeach
+
+if classic_mode_enabled
+  sassc = find_program('sassc', required: true)
+  subdir('data')
+endif
+
+subdir('extensions')
+subdir('po')

meson_options.txt

@@ -0,0 +1,18 @@
+option('extension_set',
+  type: 'combo',
+  choices: ['classic', 'default', 'all'],
+  value: 'default',
+  description: 'Predefined sets of extensions'
+)
+
+option('enable_extensions',
+  type: 'array',
+  value: [],
+  description: 'Comma separated list of extensions to enable instead of a predefined set.'
+)
+
+option('classic_mode',
+  type: 'boolean',
+  value: false,
+  description: 'Enable installing data files for classic mode.'
+)

po/LINGUAS

@@ -2,6 +2,7 @@ af
 an
 ar
 as
+be
 bg
 bn_IN
 bs
@@ -25,6 +26,7 @@ gl
 gu
 he
 hi
+hr
 hu
 id
 is

po/Makevars

@@ -1,68 +0,0 @@
-# Makefile variables for PO directory in any package using GNU gettext.
-
-# Usually the message domain is the same as the package name.
-DOMAIN = $(PACKAGE)
-
-# These two variables depend on the location of this directory.
-subdir = po
-top_builddir = ..
-
-# These options get passed to xgettext.
-XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ \
-        --keyword=C_:1c,2 --keyword=NC_:1c,2 \
-        --keyword=g_dngettext:2,3 --add-comments \
-        --flag=g_dngettext:2:pass-c-format \
-        --flag=g_strdup_printf:1:c-format \
-        --flag=g_string_printf:2:c-format \
-        --flag=g_string_append_printf:2:c-format \
-        --flag=g_error_new:3:c-format \
-        --flag=g_set_error:4:c-format \
-        --flag=g_markup_printf_escaped:1:c-format \
-        --flag=g_log:3:c-format \
-        --flag=g_print:1:c-format \
-        --flag=g_printerr:1:c-format \
-        --flag=g_printf:1:c-format \
-        --flag=g_fprintf:2:c-format \
-        --flag=g_sprintf:2:c-format \
-        --flag=g_snprintf:3:c-format
-
-
-# This is the copyright holder that gets inserted into the header of the
-# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
-# package.  (Note that the msgstr strings, extracted from the package's
-# sources, belong to the copyright holder of the package.)  Translators are
-# expected to transfer the copyright for their translations to this person
-# or entity, or to disclaim their copyright.  The empty string stands for
-# the public domain; in this case the translators are expected to disclaim
-# their copyright.
-COPYRIGHT_HOLDER = Translation copyright holder
-# This is the email address or URL to which the translators shall report
-# bugs in the untranslated strings:
-# - Strings which are not entire sentences, see the maintainer guidelines
-#   in the GNU gettext documentation, section 'Preparing Strings'.
-# - Strings which use unclear terms or require additional context to be
-#   understood.
-# - Strings which make invalid assumptions about notation of date, time or
-#   money.
-# - Pluralisation problems.
-# - Incorrect English spelling.
-# - Incorrect formatting.
-# It can be your email address, or a mailing list address where translators
-# can write to without being subscribed, or the URL of a web page through
-# which the translators can contact you.
-MSGID_BUGS_ADDRESS = http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&keywords=I18N+L10N&component=extensions
-
-# This is the list of locale categories, beyond LC_MESSAGES, for which the
-# message catalogs shall be used.  It is usually empty.
-EXTRA_LOCALE_CATEGORIES =
-
-# Ignore the timestamp of the .pot file, as git clones do not have
-# deterministic timestamps, and .po files are updated by translators
-# (only) in GNOME projects.
-PO_DEPENDS_ON_POT = no
-
-# This tells whether or not to forcibly update $(DOMAIN).pot and
-# regenerate PO files on "make dist".  Possible values are "yes" and
-# "no".  Set this to no if the POT file and PO files are maintained
-# externally.
-DIST_DEPENDS_ON_UPDATE_PO = no

po/POTFILES.in

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

po/af.po

@@ -1,311 +1,370 @@
 # Afrikaans translation for gnome-shell-extensions.
 # This file is distributed under the same license as the gnome-shell-extensions package.
 # F Wolff <friedel@translate.org.za>, 2013.
+# Pieter Schoeman <pieter@sonbesie.co.za>, 2017.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
-"shell&keywords=I18N+L10N&component=extensions\n"
+"issues\n"
-"POT-Creation-Date: 2013-09-26 20:32+0000\n"
+"POT-Creation-Date: 2018-09-06 10:29+0000\n"
-"PO-Revision-Date: 2013-09-27 16:17+0200\n"
+"PO-Revision-Date: 2018-02-06 17:47+0200\n"
-"Last-Translator: F Wolff <friedel@translate.org.za>\n"
+"Last-Translator: Pieter Schalk Schoeman <pieter@sonbesie.co.za>\n"
-"Language-Team: translate-discuss-af@lists.sourceforge.net\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.desktop.in:3 data/gnome-classic.session.desktop.in:3
-#: ../data/gnome-classic.session.desktop.in.in.h:1
 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
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:7
-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
 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:62
-#: ../extensions/auto-move-windows/prefs.js:106
+#: extensions/auto-move-windows/prefs.js:117
 msgid "Workspace"
-msgstr "Werkruimte"
+msgstr "Werkspasie"
 
-#: ../extensions/auto-move-windows/prefs.js:80
+#: extensions/auto-move-windows/prefs.js:78
-msgid "Add rule"
+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
+#. TRANSLATORS: %s is the filesystem name
-#, c-format
+#: extensions/drive-menu/extension.js:103
-msgid "Ejecting drive '%s' failed:"
+#: extensions/places-menu/placeDisplay.js:219
-msgstr "Kon nie skyf '%s' uitskiet nie:"
+#, 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
+#: extensions/drive-menu/extension.js:143
-msgid "Open File"
+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
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
-msgid "Message:"
-msgstr "Boodskap:"
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:1
 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:79
-#: ../extensions/places-menu/extension.js:81
+#: extensions/places-menu/extension.js:82
 msgid "Places"
 msgstr "Plekke"
 
-#: ../extensions/places-menu/placeDisplay.js:56
+#: extensions/places-menu/placeDisplay.js:66
-#, c-format
+#, javascript-format
-msgid "Failed to launch \"%s\""
+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:135
-#: ../extensions/places-menu/placeDisplay.js:121
+#: 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
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
-msgid "CPU"
+msgid "Cycle Screenshot Sizes"
-msgstr "SVE"
+msgstr "Rol deur skermkiekies"
 
-#: ../extensions/systemMonitor/extension.js:267
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
-msgid "Memory"
+msgid "Cycle Screenshot Sizes Backward"
-msgstr "Geheue"
+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/window-list/extension.js:646
-#: ../extensions/workspace-indicator/extension.js:30
+#: 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
+#: extensions/window-list/prefs.js:71
-msgid "Workspace names:"
+msgid "Show on all monitors"
-msgstr "Werkruimtename:"
+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
+#: extensions/workspace-indicator/prefs.js:190
-#, c-format
+#, 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/ar.po

@@ -1,13 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Khaled Hosny <khaledhosny@eglug.org>, 2012, 2013, 2015.
+# Khaled Hosny <khaledhosny@eglug.org>, 2012, 2013, 2015, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"POT-Creation-Date: 2015-09-23 23:54+0200\n"
+"shell&keywords=I18N+L10N&component=extensions\n"
-"PO-Revision-Date: 2015-09-23 23:56+0200\n"
+"POT-Creation-Date: 2017-07-02 06:04+0200\n"
+"PO-Revision-Date: 2017-07-02 06:12+0200\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
 "Language: ar\n"
@@ -16,310 +17,319 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Virtaal 0.7.1\n"
+"X-Generator: Virtaal 1.0.0-beta1\n"
 "X-Project-Style: gnome\n"
 
-#: ../data/gnome-classic.desktop.in.h:1
+#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
-#: ../data/gnome-classic.session.desktop.in.in.h:1
 msgid "GNOME Classic"
 msgstr "جنوم تقليدية"
 
-#: ../data/gnome-classic.desktop.in.h:2
+#: data/gnome-classic.desktop.in:4
 msgid "This session logs you into GNOME Classic"
 msgstr "تولجك هذه الجلسة في جنوم التقليدية"
 
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:1
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:7
 msgid "Attach modal dialog to the parent window"
 msgstr "اربط المربعات الحوارية العائمة بالنافذة الأم"
 
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:2
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:8
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:25
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:33
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:41
 msgid ""
 "This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgstr ""
+msgstr "يغلب هذا المفتاح على مفتاح org.gnome.mutter عند استخدام صدفة جنوم."
 
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:3
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
 msgid "Arrangement of buttons on the titlebar"
 msgstr "ترتيب الأزرار في شريط العناوين"
 
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:4
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:17
 msgid ""
 "This key overrides the key in org.gnome.desktop.wm.preferences when running "
 "GNOME Shell."
 msgstr ""
+"يغلب هذا المفتاح على مفتاح org.gnome.desktop.wm.preferences عند استخدام صدفة "
+"جنوم."
 
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:5
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:24
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr ""
 
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:6
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:32
 msgid "Workspaces only on primary monitor"
 msgstr "مساحات عمل على الشاشة الرئيسية فقط"
 
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:7
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:40
 msgid "Delay focus changes in mouse mode until the pointer stops moving"
 msgstr ""
 
-#: ../extensions/alternate-tab/prefs.js:20
+#: extensions/alternate-tab/prefs.js:20
 msgid "Thumbnail only"
 msgstr "مصغّرة فقط"
 
-#: ../extensions/alternate-tab/prefs.js:21
+#: extensions/alternate-tab/prefs.js:21
 msgid "Application icon only"
 msgstr "أيقونة التطبيق فقط"
 
-#: ../extensions/alternate-tab/prefs.js:22
+#: extensions/alternate-tab/prefs.js:22
 msgid "Thumbnail and application icon"
 msgstr "مصغّرة وأيقونة التطبيق"
 
-#: ../extensions/alternate-tab/prefs.js:38
+#: extensions/alternate-tab/prefs.js:38
 msgid "Present windows as"
 msgstr "كيفية عرض التطبيقات"
 
-#: ../extensions/alternate-tab/prefs.js:69
+#: extensions/alternate-tab/prefs.js:69
 msgid "Show only windows in the current workspace"
 msgstr "أظهر نوافذ مساحات العمل الحالية فقط"
 
-#: ../extensions/apps-menu/extension.js:38
+#: extensions/apps-menu/extension.js:41
 msgid "Activities Overview"
 msgstr "ملخص الأنشطة"
 
-#: ../extensions/apps-menu/extension.js:109
+#: extensions/apps-menu/extension.js:141
 msgid "Favorites"
 msgstr "المفضّلات"
 
-#: ../extensions/apps-menu/extension.js:261
+#: extensions/apps-menu/extension.js:436
 msgid "Applications"
 msgstr "التطبيقات"
 
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:1
+#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
 msgid "Application and workspace list"
 msgstr "قائمة التطبيقات ومساحات العمل"
 
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
+#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:7
 msgid ""
 "A list of strings, each containing an application id (desktop file name), "
 "followed by a colon and the workspace number"
 msgstr ""
 
-#: ../extensions/auto-move-windows/prefs.js:60
+#: extensions/auto-move-windows/prefs.js:60
 msgid "Application"
 msgstr "التطبيق"
 
-#: ../extensions/auto-move-windows/prefs.js:69
+#: extensions/auto-move-windows/prefs.js:69
-#: ../extensions/auto-move-windows/prefs.js:127
+#: extensions/auto-move-windows/prefs.js:127
 msgid "Workspace"
 msgstr "مساحة العمل"
 
-#: ../extensions/auto-move-windows/prefs.js:85
+#: extensions/auto-move-windows/prefs.js:85
 msgid "Add Rule"
 msgstr "أضِف قاعدة"
 
-#: ../extensions/auto-move-windows/prefs.js:106
+#: extensions/auto-move-windows/prefs.js:106
 msgid "Create new matching rule"
 msgstr "أنشئ قاعدة تطابق"
 
-#: ../extensions/auto-move-windows/prefs.js:111
+#: extensions/auto-move-windows/prefs.js:111
 msgid "Add"
 msgstr "أضِف"
 
-#: ../extensions/drive-menu/extension.js:106
+#: extensions/drive-menu/extension.js:106
 #, javascript-format
-msgid "Ejecting drive '%s' failed:"
+msgid "Ejecting drive “%s” failed:"
-msgstr "فشل إخراج '%s':"
+msgstr "فشل إخراج ”%s“:"
 
-#: ../extensions/drive-menu/extension.js:124
+#: extensions/drive-menu/extension.js:124
 msgid "Removable devices"
 msgstr "الأجهزة المنفصلة"
 
-#: ../extensions/drive-menu/extension.js:149
+#: extensions/drive-menu/extension.js:149
-msgid "Open File"
+msgid "Open Files"
-msgstr "افتح الملف"
+msgstr "افتح الملفات"
 
-#: ../extensions/example/extension.js:17
+#: extensions/example/extension.js:17
 msgid "Hello, world!"
 msgstr "أهلا، يا عالم!"
 
-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:1
+#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:5
 msgid "Alternative greeting text."
 msgstr "نص ترحيب بديل"
 
-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:2
+#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:6
 msgid ""
 "If not empty, it contains the text that will be shown when clicking on the "
 "panel."
 msgstr ""
 
-#: ../extensions/example/prefs.js:30
+#: extensions/example/prefs.js:30
 msgid "Message"
 msgstr "الرسالة"
 
 #. TRANSLATORS: Example is the name of the extension, should not be
 #. translated
-#: ../extensions/example/prefs.js:43
+#: 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."
+"Nevertheless it’s possible to customize the greeting message."
 msgstr ""
 
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:1
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
 msgid "Use more screen for windows"
 msgstr ""
 
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:2
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
 msgid ""
 "Try to use more screen for placing window thumbnails by adapting to screen "
 "aspect ratio, and consolidating them further to reduce the bounding box. "
 "This setting applies only with the natural placement strategy."
 msgstr ""
 
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:3
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
 msgid "Place window captions on top"
 msgstr ""
 
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:4
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:12
 msgid ""
 "If true, place window captions on top the respective thumbnail, overriding "
 "shell default of placing it at the bottom. Changing this setting requires "
 "restarting the shell to have any effect."
 msgstr ""
 
-#: ../extensions/places-menu/extension.js:78
+#: extensions/places-menu/extension.js:78
-#: ../extensions/places-menu/extension.js:81
+#: extensions/places-menu/extension.js:81
 msgid "Places"
 msgstr "الأماكن"
 
-#: ../extensions/places-menu/placeDisplay.js:59
+#: extensions/places-menu/placeDisplay.js:65
 #, javascript-format
-msgid "Failed to launch \"%s\""
+msgid "Failed to mount volume for “%s”"
-msgstr "فشل تشغيل \"%s\""
+msgstr "فشل وصل الجزء ”%s“"
 
-#: ../extensions/places-menu/placeDisplay.js:101
+#: extensions/places-menu/placeDisplay.js:78
-#: ../extensions/places-menu/placeDisplay.js:124
+#, javascript-format
+msgid "Failed to launch “%s”"
+msgstr "فشل تشغيل ”%s“"
+
+#: extensions/places-menu/placeDisplay.js:137
+#: extensions/places-menu/placeDisplay.js:160
 msgid "Computer"
 msgstr "الحاسوب"
 
-#: ../extensions/places-menu/placeDisplay.js:267
+#: extensions/places-menu/placeDisplay.js:303
 msgid "Home"
 msgstr "المنزل"
 
-#: ../extensions/places-menu/placeDisplay.js:311
+#: extensions/places-menu/placeDisplay.js:347
 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/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 ""
+msgstr "اسم السمة، يمكن تحميلة من ‪~/.themes/name/gnome-shell‬"
 
-#: ../extensions/window-list/extension.js:110
+#: extensions/window-list/extension.js:110
 msgid "Close"
 msgstr "أغلق"
 
-#: ../extensions/window-list/extension.js:120
+#: extensions/window-list/extension.js:129
 msgid "Unminimize"
 msgstr "ألغِ التصغير"
 
-#: ../extensions/window-list/extension.js:121
+#: extensions/window-list/extension.js:130
 msgid "Minimize"
 msgstr "صغّر"
 
-#: ../extensions/window-list/extension.js:127
+#: extensions/window-list/extension.js:136
 msgid "Unmaximize"
 msgstr "ألغِ التكبير"
 
-#: ../extensions/window-list/extension.js:128
+#: extensions/window-list/extension.js:137
 msgid "Maximize"
 msgstr "كبّر"
 
-#: ../extensions/window-list/extension.js:403
+#: extensions/window-list/extension.js:420
 msgid "Minimize all"
 msgstr "صغّر الكل"
 
-#: ../extensions/window-list/extension.js:411
+#: extensions/window-list/extension.js:428
 msgid "Unminimize all"
 msgstr "ألغِ تصغير الكل"
 
-#: ../extensions/window-list/extension.js:419
+#: extensions/window-list/extension.js:436
 msgid "Maximize all"
 msgstr "كبّر الكل"
 
-#: ../extensions/window-list/extension.js:428
+#: extensions/window-list/extension.js:445
 msgid "Unmaximize all"
 msgstr "ألغِ تكبير الكل"
 
-#: ../extensions/window-list/extension.js:437
+#: extensions/window-list/extension.js:454
 msgid "Close all"
 msgstr "أغلق الكل"
 
-#: ../extensions/window-list/extension.js:661
+#: extensions/window-list/extension.js:678
-#: ../extensions/workspace-indicator/extension.js:30
+#: extensions/workspace-indicator/extension.js:30
 msgid "Workspace Indicator"
 msgstr "مؤشر مساحات العمل"
 
-#: ../extensions/window-list/extension.js:820
+#: extensions/window-list/extension.js:842
 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
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
 msgid ""
 "Decides when to group windows from the same application on the window list. "
-"Possible values are \"never\", \"auto\" and \"always\"."
+"Possible values are “never”, “auto” and “always”."
 msgstr ""
-"يقرر متى تجمع نوافذ نفس التطبيق في قائمة النوافذ. القيم الممكنة هي \"never"
+"يقرر متى تجمع نوافذ نفس التطبيق في قائمة النوافذ. القيم الممكنة هي ”never“،‏ "
-"\"، \"auto\" و \"always\"."
+"”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 ""
+msgstr "اعرض قائمة النوافذ على كل الشاشات"
 
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:4
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
 msgid ""
 "Whether to show the window list on all connected monitors or only on the "
 "primary one."
 msgstr ""
+"ما إذا كانت قائمة النوافذ ستعرض على كل الشاشات المتصلة أم الشاشة الرئيسية."
 
-#: ../extensions/window-list/prefs.js:32
+#: extensions/window-list/prefs.js:32
 msgid "Window Grouping"
 msgstr "تجميع النوافذ"
 
-#: ../extensions/window-list/prefs.js:50
+#: extensions/window-list/prefs.js:50
 msgid "Never group windows"
 msgstr "لا تجمّع النوافذ أبدا"
 
-#: ../extensions/window-list/prefs.js:51
+#: extensions/window-list/prefs.js:51
 msgid "Group windows when space is limited"
 msgstr "جمّع النوافذ عندما تكون المساحة محدودة"
 
-#: ../extensions/window-list/prefs.js:52
+#: extensions/window-list/prefs.js:52
 msgid "Always group windows"
 msgstr "جمّع النوافذ دائما"
 
-#: ../extensions/window-list/prefs.js:75
+#: extensions/window-list/prefs.js:75
 msgid "Show on all monitors"
-msgstr ""
+msgstr "اعرض على كل الشاشات"
 
-#: ../extensions/workspace-indicator/prefs.js:141
+#: extensions/workspace-indicator/prefs.js:141
-#, fuzzy
 msgid "Workspace Names"
 msgstr "أسماء مساحات العمل"
 
-#: ../extensions/workspace-indicator/prefs.js:157
+#: extensions/workspace-indicator/prefs.js:157
 msgid "Name"
 msgstr "الاسم"
 
-#: ../extensions/workspace-indicator/prefs.js:198
+#: extensions/workspace-indicator/prefs.js:198
 #, javascript-format
 msgid "Workspace %d"
 msgstr "مساحة العمل %Id"

po/be.po

@@ -0,0 +1,355 @@
+# Belarusian translation for gnome-shell-extensions.
+# Copyright (C) 2017 gnome-shell-extensions's COPYRIGHT HOLDER
+# This file is distributed under the same license as the gnome-shell-extensions package.
+# Yuras Shumovich <shumovichy@gmail.com>, 2017
+#
+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-19 16:41+0000\n"
+"PO-Revision-Date: 2017-09-01 17:56+0300\n"
+"Last-Translator: Yuras Shumovich <shumovichy@gmail.com>\n"
+"Language-Team: Belarusian <i18n-bel-gnome@googlegroups.com>\n"
+"Language: be\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.11\n"
+
+#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
+msgid "GNOME Classic"
+msgstr "Класічны GNOME"
+
+#: 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:7
+msgid "Attach modal dialog to the parent window"
+msgstr "Прымацаваць мадальны дыялог да бацькоўскага акна"
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:8
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:25
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:33
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:41
+msgid ""
+"This key overrides the key in org.gnome.mutter when running GNOME Shell."
+msgstr "Гэты ключ засланяе ключ у org.gnome.mutter калі запушчаны GNOME Shell."
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
+msgid "Arrangement of buttons on the titlebar"
+msgstr "Парадак кнопак у загалоўнай стужцы"
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:17
+msgid ""
+"This key overrides the key in org.gnome.desktop.wm.preferences when running "
+"GNOME Shell."
+msgstr ""
+"Гэты ключ засланяе ключ у org.gnome.desktop.wm.preferences калі запушчаны "
+"GNOME Shell."
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:24
+msgid "Enable edge tiling when dropping windows on screen edges"
+msgstr "Аўтаматычна змяняць памеры акна пры перамяшчэнні да края экрана"
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:32
+msgid "Workspaces only on primary monitor"
+msgstr "Працоўныя прасторы толькі на асноўным маніторы"
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:40
+msgid "Delay focus changes in mouse mode until the pointer stops moving"
+msgstr "Затрымліваць змяненні фокуса ў рэжыме мышы да спынення паказальніка"
+
+#: extensions/alternate-tab/prefs.js:20
+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:41
+msgid "Activities Overview"
+msgstr "Агляд заняткаў"
+
+#: extensions/apps-menu/extension.js:141
+msgid "Favorites"
+msgstr "Упадабаныя"
+
+#: extensions/apps-menu/extension.js:436
+msgid "Applications"
+msgstr "Праграмы"
+
+#: 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: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
+msgid "Application"
+msgstr "Праграма"
+
+#: extensions/auto-move-windows/prefs.js:69
+#: extensions/auto-move-windows/prefs.js:127
+msgid "Workspace"
+msgstr "Працоўная прастора"
+
+#: extensions/auto-move-windows/prefs.js:85
+msgid "Add Rule"
+msgstr "Дадаць правіла"
+
+#: extensions/auto-move-windows/prefs.js:106
+msgid "Create new matching rule"
+msgstr "Стварыць новае правіла адпаведнасці"
+
+#: extensions/auto-move-windows/prefs.js:111
+msgid "Add"
+msgstr "Дадаць"
+
+#. TRANSLATORS: %s is the filesystem name
+#: extensions/drive-menu/extension.js:107
+#, javascript-format
+msgid "Ejecting drive “%s” failed:"
+msgstr "Не ўдалося выняць прывод \"%s\":"
+
+#: extensions/drive-menu/extension.js:125
+msgid "Removable devices"
+msgstr "Зменныя прыстасаванні"
+
+#: extensions/drive-menu/extension.js:150
+msgid "Open Files"
+msgstr "Адкрыць файлы"
+
+#: extensions/example/extension.js:17
+msgid "Hello, world!"
+msgstr "Прывітанне, свет!"
+
+#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:5
+msgid "Alternative greeting text."
+msgstr "Альтэрнатыўны тэкст вітання."
+
+#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:6
+msgid ""
+"If not empty, it contains the text that will be shown when clicking on the "
+"panel."
+msgstr ""
+"Калі не пуста, ўтрымлівае тэкст, які будзе паказвацца пры націсканні на "
+"панэль."
+
+#: extensions/example/prefs.js:30
+msgid "Message"
+msgstr "Паведамленне"
+
+#. 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."
+msgstr ""
+"Example пакажа як ствараць пашырэнні для Shell. Сам па сабе ён мае мала "
+"функцыянальнасці.\n"
+"Тым не менш, можна змяніць тэкст прывітання."
+
+#: 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:6
+msgid ""
+"Try to use more screen for placing window thumbnails by adapting to screen "
+"aspect ratio, and consolidating them further to reduce the bounding box. "
+"This setting applies only with the natural placement strategy."
+msgstr ""
+"Спрабаваць выкарыстаць большую плошчу экрана для размяшчэння мініяцюр шляхам "
+"змянення суадносінаў бакоў экрана і ўшчыльняючы іх з мэтай змяншэння памераў "
+"абмежавальнай рамкі. Гэты параметр ужываецца толькі разам з звычайным "
+"размяшчэннем мініяцюр."
+
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
+msgid "Place window captions on top"
+msgstr "Змяшчаць загалоўкі вокнаў зверху"
+
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:12
+msgid ""
+"If true, place window captions on top the respective thumbnail, overriding "
+"shell default of placing it at the bottom. Changing this setting requires "
+"restarting the shell to have any effect."
+msgstr ""
+"Калі выбрана, загалоўкі вокнаў будуць размешчаны ўверсе мініяцюры, а не "
+"знізу, як прадвызначана. Для таго, каб гэтая настройка ўступіла ў сілу, "
+"трэба перазапусціць абалонку."
+
+#: extensions/places-menu/extension.js:78
+#: extensions/places-menu/extension.js:81
+msgid "Places"
+msgstr "Месцы"
+
+#: extensions/places-menu/placeDisplay.js:65
+#, javascript-format
+msgid "Failed to mount volume for “%s”"
+msgstr "Не ўдалося прымацаваць том для \"%s\"."
+
+#: extensions/places-menu/placeDisplay.js:78
+#, javascript-format
+msgid "Failed to launch “%s”"
+msgstr "Не ўдалося запусціць \"%s\""
+
+#: extensions/places-menu/placeDisplay.js:137
+#: extensions/places-menu/placeDisplay.js:160
+msgid "Computer"
+msgstr "Камп'ютар"
+
+#: extensions/places-menu/placeDisplay.js:303
+msgid "Home"
+msgstr "Дамашняя папка"
+
+#: extensions/places-menu/placeDisplay.js:347
+msgid "Browse Network"
+msgstr "Агляд сеткі"
+
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
+msgid "Cycle Screenshot Sizes"
+msgstr "Чаргаваць памеры экраннага здымка"
+
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
+msgid "Cycle Screenshot Sizes Backward"
+msgstr "Чаргаваць памеры экраннага здымка ў адваротным напрамку"
+
+#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
+msgid "Theme name"
+msgstr "Імя матыву аздаблення"
+
+#: 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:110
+msgid "Close"
+msgstr "Закрыць"
+
+#: extensions/window-list/extension.js:129
+msgid "Unminimize"
+msgstr "Скасаваць мінімалізацыю"
+
+#: extensions/window-list/extension.js:130
+msgid "Minimize"
+msgstr "Мінімалізаваць"
+
+#: extensions/window-list/extension.js:136
+msgid "Unmaximize"
+msgstr "Скасаваць максімалізацыю"
+
+#: extensions/window-list/extension.js:137
+msgid "Maximize"
+msgstr "Максімалізаваць"
+
+#: extensions/window-list/extension.js:420
+msgid "Minimize all"
+msgstr "Мінімалізаваць усе"
+
+#: extensions/window-list/extension.js:428
+msgid "Unminimize all"
+msgstr "Скасаваць мінімалізацыю для ўсіх"
+
+#: extensions/window-list/extension.js:436
+msgid "Maximize all"
+msgstr "Максімалізаваць усе"
+
+#: extensions/window-list/extension.js:445
+msgid "Unmaximize all"
+msgstr "Скасаваць максімалізацыю для ўсіх"
+
+#: extensions/window-list/extension.js:454
+msgid "Close all"
+msgstr "Закрыць усе"
+
+#: extensions/window-list/extension.js:678
+#: extensions/workspace-indicator/extension.js:30
+msgid "Workspace Indicator"
+msgstr "Індыкатар працоўнай прасторы"
+
+#: extensions/window-list/extension.js:842
+msgid "Window List"
+msgstr "Спіс вокнаў"
+
+#: 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: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:20
+msgid "Show the window list on all monitors"
+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
+msgid "Window Grouping"
+msgstr "Групаванне вокнаў"
+
+#: extensions/window-list/prefs.js:50
+msgid "Never group windows"
+msgstr "Ніколі не групаваць вокны"
+
+#: extensions/window-list/prefs.js:51
+msgid "Group windows when space is limited"
+msgstr "Групаваць вокны калі не хапае месца"
+
+#: extensions/window-list/prefs.js:52
+msgid "Always group windows"
+msgstr "Заўсёды групаваць вокны"
+
+#: extensions/window-list/prefs.js:75
+msgid "Show on all monitors"
+msgstr "Паказаць усе маніторы"
+
+#: extensions/workspace-indicator/prefs.js:141
+msgid "Workspace Names"
+msgstr "Назвы працоўных прастораў"
+
+#: extensions/workspace-indicator/prefs.js:157
+msgid "Name"
+msgstr "Імя"
+
+#: extensions/workspace-indicator/prefs.js:198
+#, javascript-format
+msgid "Workspace %d"
+msgstr "Працоўная прастора %d"

po/bg.po

@@ -1,345 +1,359 @@
-# Bulgarian translation for gnome-shell-extensions po-file.
+# Bulgarian translation for gnome-shell-extensions po-file.
-# Copyright (C) 2014, 2015 Free Software Foundation, Inc.
+# Copyright (C) 2014, 2015, 2017 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gnome-shell-extensions package.
+# This file is distributed under the same license as the gnome-shell-extensions package.
-# Ivaylo Valkov <ivaylo@e-valkov.org>, 2014.
+# Ivaylo Valkov <ivaylo@e-valkov.org>, 2014.
-# Alexander Shopov <ash@kambanaria.org>, 2014, 2015.
+# Alexander Shopov <ash@kambanaria.org>, 2014, 2015.
-msgid ""
+# Lyubomir Vasilev <lyubomirv@abv.bg>, 2017.
-msgstr ""
+msgid ""
-"Project-Id-Version: gnome-shell-extensions master\n"
+msgstr ""
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: gnome-shell-extensions master\n"
-"POT-Creation-Date: 2015-03-09 21:10+0200\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"PO-Revision-Date: 2015-03-09 21:10+0200\n"
+"shell&keywords=I18N+L10N&component=extensions\n"
-"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
+"POT-Creation-Date: 2017-09-09 15:20+0000\n"
-"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
+"PO-Revision-Date: 2017-09-08 08:47+0300\n"
-"Language: bg\n"
+"Last-Translator: Lyubomir Vasilev <lyubomirv@abv.bg>\n"
-"MIME-Version: 1.0\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Language: bg\n"
-"Content-Transfer-Encoding: 8bit\n"
+"MIME-Version: 1.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Content-Type: text/plain; charset=UTF-8\n"
-
+"Content-Transfer-Encoding: 8bit\n"
-#: ../data/gnome-classic.desktop.in.h:1
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../data/gnome-classic.session.desktop.in.in.h:1
+
-msgid "GNOME Classic"
+#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
-msgstr "Класически GNOME"
+msgid "GNOME Classic"
-
+msgstr "Класически GNOME"
-#: ../data/gnome-classic.desktop.in.h:2
+
-msgid "This session logs you into GNOME Classic"
+#: data/gnome-classic.desktop.in:4
-msgstr "Работната среда изглежда като класическия GNOME (2.x)"
+msgid "This session logs you into GNOME Classic"
-
+msgstr "Работната среда изглежда като класическия GNOME (2.x)"
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:1
+
-msgid "Attach modal dialog to the parent window"
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:7
-msgstr "Прикрепяне на модалните прозорци към родителските им прозорци"
+msgid "Attach modal dialog to the parent window"
-
+msgstr "Прикрепяне на модалните прозорци към родителските им прозорци"
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:2
+
-msgid ""
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:8
-"This key overrides the key in org.gnome.mutter when running GNOME Shell."
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:25
-msgstr ""
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:33
-"Този ключ при е с по-голям приоритет от „org.gnome.mutter“ при изпълнението "
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:41
-"на обвивката на GNOME."
+msgid ""
-
+"This key overrides the key in org.gnome.mutter when running GNOME Shell."
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:3
+msgstr ""
-msgid "Arrangement of buttons on the titlebar"
+"Този ключ при е с по-голям приоритет от „org.gnome.mutter“ при изпълнението "
-msgstr "Подредба на бутоните на заглавната лента"
+"на обвивката на GNOME."
-
+
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:4
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
-msgid ""
+msgid "Arrangement of buttons on the titlebar"
-"This key overrides the key in org.gnome.desktop.wm.preferences when running "
+msgstr "Подредба на бутоните на заглавната лента"
-"GNOME Shell."
+
-msgstr ""
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:17
-"Този ключ при е с по-голям приоритет от „org.gnome.desktop.wm.preferences“ "
+msgid ""
-"при изпълнението на обвивката на GNOME."
+"This key overrides the key in org.gnome.desktop.wm.preferences when running "
-
+"GNOME Shell."
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:5
+msgstr ""
-msgid "Enable edge tiling when dropping windows on screen edges"
+"Този ключ при е с по-голям приоритет от „org.gnome.desktop.wm.preferences“ "
-msgstr ""
+"при изпълнението на обвивката на GNOME."
-"Включване на специална подредба при приближаване на прозорец до ръбовете на "
+
-"екрана"
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:24
-
+msgid "Enable edge tiling when dropping windows on screen edges"
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:6
+msgstr ""
-msgid "Workspaces only on primary monitor"
+"Включване на специална подредба при приближаване на прозорец до ръбовете на "
-msgstr "Работни плотове само на основния екран"
+"екрана"
-
+
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:7
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:32
-msgid "Delay focus changes in mouse mode until the pointer stops moving"
+msgid "Workspaces only on primary monitor"
-msgstr "Забавяне на смяната на фокуса до спирането на движението на показалеца"
+msgstr "Работни плотове само на основния екран"
-
+
-#: ../extensions/alternate-tab/prefs.js:20
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:40
-msgid "Thumbnail only"
+msgid "Delay focus changes in mouse mode until the pointer stops moving"
-msgstr "Само миниатюри"
+msgstr "Забавяне на смяната на фокуса до спирането на движението на показалеца"
-
+
-#: ../extensions/alternate-tab/prefs.js:21
+#: extensions/alternate-tab/prefs.js:20
-msgid "Application icon only"
+msgid "Thumbnail only"
-msgstr "Само икони на приложенията"
+msgstr "Само миниатюри"
-
+
-#: ../extensions/alternate-tab/prefs.js:22
+#: extensions/alternate-tab/prefs.js:21
-msgid "Thumbnail and application icon"
+msgid "Application icon only"
-msgstr "Миниатюри и икони на приложенията"
+msgstr "Само икони на приложенията"
-
+
-#: ../extensions/alternate-tab/prefs.js:38
+#: extensions/alternate-tab/prefs.js:22
-msgid "Present windows as"
+msgid "Thumbnail and application icon"
-msgstr "Показване на прозорците като"
+msgstr "Миниатюри и икони на приложенията"
-
+
-#: ../extensions/alternate-tab/prefs.js:69
+#: extensions/alternate-tab/prefs.js:38
-msgid "Show only windows in the current workspace"
+msgid "Present windows as"
-msgstr "Да се показват само прозорците на текущия работен плот"
+msgstr "Показване на прозорците като"
-
+
-#: ../extensions/apps-menu/extension.js:39
+#: extensions/alternate-tab/prefs.js:69
-msgid "Activities Overview"
+msgid "Show only windows in the current workspace"
-msgstr "Показване на програмите"
+msgstr "Да се показват само прозорците на текущия работен плот"
-
+
-#: ../extensions/apps-menu/extension.js:110
+#: extensions/apps-menu/extension.js:41
-msgid "Favorites"
+msgid "Activities Overview"
-msgstr "Любими"
+msgstr "Показване на програмите"
-
+
-#: ../extensions/apps-menu/extension.js:279
+#: extensions/apps-menu/extension.js:141
-msgid "Applications"
+msgid "Favorites"
-msgstr "Програми"
+msgstr "Любими"
-
+
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:1
+#: extensions/apps-menu/extension.js:436
-msgid "Application and workspace list"
+msgid "Applications"
-msgstr "Списък с програмите и работните плотове"
+msgstr "Програми"
-
+
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
+#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
-msgid ""
+msgid "Application and workspace list"
-"A list of strings, each containing an application id (desktop file name), "
+msgstr "Списък с програмите и работните плотове"
-"followed by a colon and the workspace number"
+
-msgstr ""
+#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:7
-"Списък от низове. Всеки съдържа идентификатор на програма (име на файл „."
+msgid ""
-"desktop“ file name), следван от знака „:“ и номер на работен плот"
+"A list of strings, each containing an application id (desktop file name), "
-
+"followed by a colon and the workspace number"
-#: ../extensions/auto-move-windows/prefs.js:60
+msgstr ""
-msgid "Application"
+"Списък от низове. Всеки съдържа идентификатор на програма (име на файл „."
-msgstr "Програма"
+"desktop“ file name), следван от знака „:“ и номер на работен плот"
-
+
-#: ../extensions/auto-move-windows/prefs.js:69
+#: extensions/auto-move-windows/prefs.js:60
-#: ../extensions/auto-move-windows/prefs.js:127
+msgid "Application"
-msgid "Workspace"
+msgstr "Програма"
-msgstr "Работен плот"
+
-
+#: extensions/auto-move-windows/prefs.js:69
-#: ../extensions/auto-move-windows/prefs.js:85
+#: extensions/auto-move-windows/prefs.js:127
-msgid "Add Rule"
+msgid "Workspace"
-msgstr "Добавяне на правило"
+msgstr "Работен плот"
-
+
-#: ../extensions/auto-move-windows/prefs.js:106
+#: extensions/auto-move-windows/prefs.js:85
-msgid "Create new matching rule"
+msgid "Add Rule"
-msgstr "Създаване на правило за съвпадение"
+msgstr "Добавяне на правило"
-
+
-#: ../extensions/auto-move-windows/prefs.js:111
+#: extensions/auto-move-windows/prefs.js:106
-msgid "Add"
+msgid "Create new matching rule"
-msgstr "Добавяне"
+msgstr "Създаване на правило за съвпадение"
-
+
-#: ../extensions/drive-menu/extension.js:106
+#: extensions/auto-move-windows/prefs.js:111
-#, javascript-format
+msgid "Add"
-msgid "Ejecting drive '%s' failed:"
+msgstr "Добавяне"
-msgstr "Неуспешно изваждане на устройство „%s“:"
+
-
+#. TRANSLATORS: %s is the filesystem name
-#: ../extensions/drive-menu/extension.js:124
+#: extensions/drive-menu/extension.js:107
-msgid "Removable devices"
+#, javascript-format
-msgstr "Преносими медии"
+msgid "Ejecting drive “%s” failed:"
-
+msgstr "Неуспешно изваждане на устройство „%s“:"
-#: ../extensions/drive-menu/extension.js:151
+
-msgid "Open File"
+#: extensions/drive-menu/extension.js:125
-msgstr "Отваряне на файл"
+msgid "Removable devices"
-
+msgstr "Преносими медии"
-#: ../extensions/example/extension.js:17
+
-msgid "Hello, world!"
+#: extensions/drive-menu/extension.js:150
-msgstr "Здравей, свят!"
+msgid "Open Files"
-
+msgstr "Отваряне на файлове"
-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:1
+
-msgid "Alternative greeting text."
+#: extensions/example/extension.js:17
-msgstr "Друго приветстващо съобщение."
+msgid "Hello, world!"
-
+msgstr "Здравей, свят!"
-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:2
+
-msgid ""
+#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:5
-"If not empty, it contains the text that will be shown when clicking on the "
+msgid "Alternative greeting text."
-"panel."
+msgstr "Друго приветстващо съобщение."
-msgstr ""
+
-"Ако ключът не е празен, съдържанието му се извежда при натискането на панела."
+#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:6
-
+msgid ""
-#: ../extensions/example/prefs.js:30
+"If not empty, it contains the text that will be shown when clicking on the "
-msgid "Message"
+"panel."
-msgstr "Съобщение"
+msgstr ""
-
+"Ако ключът не е празен, съдържанието му се извежда при натискането на панела."
-#. TRANSLATORS: Example is the name of the extension, should not be
+
-#. translated
+#: extensions/example/prefs.js:30
-#: ../extensions/example/prefs.js:43
+msgid "Message"
-msgid ""
+msgstr "Съобщение"
-"Example aims to show how to build well behaved extensions for the Shell and "
+
-"as such it has little functionality on its own.\n"
+#. TRANSLATORS: Example is the name of the extension, should not be
-"Nevertheless it's possible to customize the greeting message."
+#. translated
-msgstr ""
+#: extensions/example/prefs.js:43
-"Това е пример за добре работещо разширение на обвивката на GNOME и има "
+msgid ""
-"минимална функционалност.\n"
+"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/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:1
+msgstr ""
-msgid "Use more screen for windows"
+"Това е пример за добре работещо разширение на обвивката на GNOME и има "
-msgstr "Повече пространство за прозорците"
+"минимална функционалност.\n"
-
+"С него можете да промените приветстващото съобщение на панела."
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:2
+
-msgid ""
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
-"Try to use more screen for placing window thumbnails by adapting to screen "
+msgid "Use more screen for windows"
-"aspect ratio, and consolidating them further to reduce the bounding box. "
+msgstr "Повече пространство за прозорците"
-"This setting applies only with the natural placement strategy."
+
-msgstr ""
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
-"Използване на по-голяма част от екрана за поставянето на мини изображения "
+msgid ""
-"чрез промяна на съотношението на страните и допълнително обединяване за "
+"Try to use more screen for placing window thumbnails by adapting to screen "
-"смаляване на обхващащия ги правоъгълник. Тази настройка се прилага само при "
+"aspect ratio, and consolidating them further to reduce the bounding box. "
-"естествената стратегия за поставяне на прозорците."
+"This setting applies only with the natural placement strategy."
-
+msgstr ""
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:3
+"Използване на по-голяма част от екрана за поставянето на мини изображения "
-msgid "Place window captions on top"
+"чрез промяна на съотношението на страните и допълнително обединяване за "
-msgstr "Заглавия на прозорците отгоре"
+"смаляване на обхващащия ги правоъгълник. Тази настройка се прилага само при "
-
+"естествената стратегия за поставяне на прозорците."
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:4
+
-msgid ""
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
-"If true, place window captions on top the respective thumbnail, overriding "
+msgid "Place window captions on top"
-"shell default of placing it at the bottom. Changing this setting requires "
+msgstr "Заглавия на прозорците отгоре"
-"restarting the shell to have any effect."
+
-msgstr ""
+#: 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 "
-"настройката трябва да рестартирате обвивката на GNOME."
+"shell default of placing it at the bottom. Changing this setting requires "
-
+"restarting the shell to have any effect."
-#: ../extensions/places-menu/extension.js:78
+msgstr ""
-#: ../extensions/places-menu/extension.js:81
+"Ако е истина, заглавията на прозорците се поставят над мини изображенията "
-msgid "Places"
+"им, а не както е стандартно — отдолу. За прилагане на промяната на "
-msgstr "Места"
+"настройката трябва да рестартирате обвивката на GNOME."
-
+
-#: ../extensions/places-menu/placeDisplay.js:57
+#: extensions/places-menu/extension.js:78
-#, javascript-format
+#: extensions/places-menu/extension.js:81
-msgid "Failed to launch \"%s\""
+msgid "Places"
-msgstr "Неуспешно стартиране на „%s“"
+msgstr "Места"
-
+
-#: ../extensions/places-menu/placeDisplay.js:99
+#: extensions/places-menu/placeDisplay.js:65
-#: ../extensions/places-menu/placeDisplay.js:122
+#, javascript-format
-msgid "Computer"
+msgid "Failed to mount volume for “%s”"
-msgstr "Компютър"
+msgstr "Неуспешно монтиране на тома „%s“"
-
+
-#: ../extensions/places-menu/placeDisplay.js:200
+#: extensions/places-menu/placeDisplay.js:78
-msgid "Home"
+#, javascript-format
-msgstr "Домашна папка"
+msgid "Failed to launch “%s”"
-
+msgstr "Неуспешно стартиране на „%s“"
-#: ../extensions/places-menu/placeDisplay.js:287
+
-msgid "Browse Network"
+#: extensions/places-menu/placeDisplay.js:137
-msgstr "Мрежа"
+#: extensions/places-menu/placeDisplay.js:160
-
+msgid "Computer"
-#: ../extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml.in.h:1
+msgstr "Компютър"
-msgid "Cycle Screenshot Sizes"
+
-msgstr "Смяна на размера на снимката на екрана"
+#: extensions/places-menu/placeDisplay.js:303
-
+msgid "Home"
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:1
+msgstr "Домашна папка"
-msgid "Theme name"
+
-msgstr "Име на темата"
+#: extensions/places-menu/placeDisplay.js:347
-
+msgid "Browse Network"
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:2
+msgstr "Мрежа"
-msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
+
-msgstr ""
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
-"Името на темата, която да бъде заредена от „~/.themes/name/gnome-shell“"
+msgid "Cycle Screenshot Sizes"
-
+msgstr "Смяна на размерите на снимката на екрана"
-#: ../extensions/window-list/extension.js:109
+
-msgid "Close"
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
-msgstr "Затваряне"
+msgid "Cycle Screenshot Sizes Backward"
-
+msgstr "Смяна на размерите на снимката на екрана наобратно"
-#: ../extensions/window-list/extension.js:119
+
-msgid "Unminimize"
+#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
-msgstr "Деминимизиране"
+msgid "Theme name"
-
+msgstr "Име на темата"
-#: ../extensions/window-list/extension.js:120
+
-msgid "Minimize"
+#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:6
-msgstr "Минимизиране"
+msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
-
+msgstr ""
-#: ../extensions/window-list/extension.js:126
+"Името на темата, която да бъде заредена от „~/.themes/name/gnome-shell“"
-msgid "Unmaximize"
+
-msgstr "Демаксимизиране"
+#: extensions/window-list/extension.js:110
-
+msgid "Close"
-#: ../extensions/window-list/extension.js:127
+msgstr "Затваряне"
-msgid "Maximize"
+
-msgstr "Максимизиране"
+#: extensions/window-list/extension.js:129
-
+msgid "Unminimize"
-#: ../extensions/window-list/extension.js:399
+msgstr "Деминимизиране"
-msgid "Minimize all"
+
-msgstr "Минимизиране на всички"
+#: extensions/window-list/extension.js:130
-
+msgid "Minimize"
-#: ../extensions/window-list/extension.js:407
+msgstr "Минимизиране"
-msgid "Unminimize all"
+
-msgstr "Деминимизиране на всички"
+#: extensions/window-list/extension.js:136
-
+msgid "Unmaximize"
-#: ../extensions/window-list/extension.js:415
+msgstr "Демаксимизиране"
-msgid "Maximize all"
+
-msgstr "Максимизиране на всички"
+#: extensions/window-list/extension.js:137
-
+msgid "Maximize"
-#: ../extensions/window-list/extension.js:424
+msgstr "Максимизиране"
-msgid "Unmaximize all"
+
-msgstr "Демаксимизиране на всички"
+#: extensions/window-list/extension.js:420
-
+msgid "Minimize all"
-#: ../extensions/window-list/extension.js:433
+msgstr "Минимизиране на всички"
-msgid "Close all"
+
-msgstr "Затваряне на всички"
+#: extensions/window-list/extension.js:428
-
+msgid "Unminimize all"
-#: ../extensions/window-list/extension.js:650
+msgstr "Деминимизиране на всички"
-#: ../extensions/workspace-indicator/extension.js:30
+
-msgid "Workspace Indicator"
+#: extensions/window-list/extension.js:436
-msgstr "Индикатор на работните плотове"
+msgid "Maximize all"
-
+msgstr "Максимизиране на всички"
-#: ../extensions/window-list/extension.js:807
+
-msgid "Window List"
+#: extensions/window-list/extension.js:445
-msgstr "Списък на прозорците"
+msgid "Unmaximize all"
-
+msgstr "Демаксимизиране на всички"
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:1
+
-msgid "When to group windows"
+#: extensions/window-list/extension.js:454
-msgstr "Кога да се групират прозорците"
+msgid "Close all"
-
+msgstr "Затваряне на всички"
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:2
+
-msgid ""
+#: extensions/window-list/extension.js:678
-"Decides when to group windows from the same application on the window list. "
+#: extensions/workspace-indicator/extension.js:30
-"Possible values are \"never\", \"auto\" and \"always\"."
+msgid "Workspace Indicator"
-msgstr ""
+msgstr "Индикатор на работните плотове"
-"Кога да се групират прозорците на една програма в списъка с прозорците. "
+
-"Възможните стойности са „never“ (никога), „auto“ (автоматично) и "
+#: extensions/window-list/extension.js:842
-"„always“ (винаги)."
+msgid "Window List"
-
+msgstr "Списък на прозорците"
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:3
+
-msgid "Show the window list on all monitors"
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:12
-msgstr "Извеждане на списъка с прозорци на всички монитори"
+msgid "When to group windows"
-
+msgstr "Кога да се групират прозорците"
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:4
+
-msgid ""
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
-"Whether to show the window list on all connected monitors or only on the "
+msgid ""
-"primary one."
+"Decides when to group windows from the same application on the window list. "
-msgstr ""
+"Possible values are “never”, “auto” and “always”."
-"Дали списъкът с прозорци да се извежда на всички монитори или само на "
+msgstr ""
-"основния"
+"Кога да се групират прозорците на една програма в списъка с прозорците. "
-
+"Възможните стойности са „never“ (никога), „auto“ (автоматично) и "
-#: ../extensions/window-list/prefs.js:32
+"„always“ (винаги)."
-msgid "Window Grouping"
+
-msgstr "Групиране на прозорци"
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-
+msgid "Show the window list on all monitors"
-#: ../extensions/window-list/prefs.js:50
+msgstr "Извеждане на списъка с прозорци на всички монитори"
-msgid "Never group windows"
+
-msgstr "Никога да не се групират"
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
-
+msgid ""
-#: ../extensions/window-list/prefs.js:51
+"Whether to show the window list on all connected monitors or only on the "
-msgid "Group windows when space is limited"
+"primary one."
-msgstr "Групиране при ограничено място"
+msgstr ""
-
+"Дали списъкът с прозорци да се извежда на всички монитори или само на "
-#: ../extensions/window-list/prefs.js:52
+"основния"
-msgid "Always group windows"
+
-msgstr "Винаги да се групират"
+#: extensions/window-list/prefs.js:32
-
+msgid "Window Grouping"
-#: ../extensions/window-list/prefs.js:75
+msgstr "Групиране на прозорци"
-msgid "Show on all monitors"
+
-msgstr "На всички монитори"
+#: extensions/window-list/prefs.js:50
-
+msgid "Never group windows"
-#: ../extensions/workspace-indicator/prefs.js:141
+msgstr "Никога да не се групират"
-msgid "Workspace Names"
+
-msgstr "Имена на работните плотове"
+#: extensions/window-list/prefs.js:51
-
+msgid "Group windows when space is limited"
-#: ../extensions/workspace-indicator/prefs.js:157
+msgstr "Групиране при ограничено място"
-msgid "Name"
+
-msgstr "Име"
+#: extensions/window-list/prefs.js:52
-
+msgid "Always group windows"
-#: ../extensions/workspace-indicator/prefs.js:198
+msgstr "Винаги да се групират"
-#, javascript-format
+
-msgid "Workspace %d"
+#: extensions/window-list/prefs.js:75
-msgstr "Работен плот %d"
+msgid "Show on all monitors"
+msgstr "На всички монитори"
+
+#: extensions/workspace-indicator/prefs.js:141
+msgid "Workspace Names"
+msgstr "Имена на работните плотове"
+
+#: extensions/workspace-indicator/prefs.js:157
+msgid "Name"
+msgstr "Име"
+
+#: extensions/workspace-indicator/prefs.js:198
+#, javascript-format
+msgid "Workspace %d"
+msgstr "Работен плот %d"

po/ca.po

@@ -7,42 +7,45 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"POT-Creation-Date: 2015-03-18 04:43-0400\n"
+"shell&keywords=I18N+L10N&component=extensions\n"
-"PO-Revision-Date: 2014-08-17 14:38+0200\n"
+"POT-Creation-Date: 2017-08-19 16:41+0000\n"
-"Last-Translator: Gil Forcada <gilforcada@guifi.net>\n"
+"PO-Revision-Date: 2017-07-08 13:29+0100\n"
+"Last-Translator: Jordi Mas <jmas@softcatala.org>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bits\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../data/gnome-classic.desktop.in.h:1
+#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
-#: ../data/gnome-classic.session.desktop.in.in.h:1
 msgid "GNOME Classic"
 msgstr "GNOME clàssic"
 
-#: ../data/gnome-classic.desktop.in.h:2
+#: data/gnome-classic.desktop.in:4
 msgid "This session logs you into GNOME Classic"
 msgstr "Aquesta sessió us permet utilitzar el GNOME clàssic"
 
-#: ../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 "Adjunta el diàleg modal a la finestra pare"
 
-#: ../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 ""
 "Si s'executa el GNOME Shell, aquesta clau sobreescriu la clau «org.gnome."
 "mutter»."
 
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:3
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
 msgid "Arrangement of buttons on the titlebar"
-msgstr "Disposició dels botons en la barra de títol"
+msgstr "Disposició dels botons en la barra de títol"
 
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:4
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:17
 msgid ""
 "This key overrides the key in org.gnome.desktop.wm.preferences when running "
 "GNOME Shell."
@@ -50,58 +53,58 @@ msgstr ""
 "Si s'executa el GNOME Shell, aquesta clau sobreescriu la clau «org.gnome."
 "desktop.wm.preferences»."
 
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:5
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:24
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr ""
-"Habilita la tesselització a les vores en deixar anar les finestres a les "
+"Habilita la tessel·lització a les vores en deixar anar les finestres a les "
 "vores de la pantalla"
 
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:6
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:32
 msgid "Workspaces only on primary monitor"
 msgstr "Els espais de treball només es mostren en el monitor principal"
 
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:7
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:40
 msgid "Delay focus changes in mouse mode until the pointer stops moving"
 msgstr ""
 "Retarda el canvi de focus, en mode ratolí, fins que el punter estigui quiet"
 
-#: ../extensions/alternate-tab/prefs.js:20
+#: extensions/alternate-tab/prefs.js:20
 msgid "Thumbnail only"
 msgstr "Només miniatures"
 
-#: ../extensions/alternate-tab/prefs.js:21
+#: extensions/alternate-tab/prefs.js:21
 msgid "Application icon only"
 msgstr "Només la icona de l'aplicació"
 
-#: ../extensions/alternate-tab/prefs.js:22
+#: extensions/alternate-tab/prefs.js:22
 msgid "Thumbnail and application icon"
 msgstr "Miniatura i icona de l'aplicació"
 
-#: ../extensions/alternate-tab/prefs.js:38
+#: extensions/alternate-tab/prefs.js:38
 msgid "Present windows as"
 msgstr "Mostra les finestres com a"
 
-#: ../extensions/alternate-tab/prefs.js:69
+#: extensions/alternate-tab/prefs.js:69
 msgid "Show only windows in the current workspace"
 msgstr "Mostra només les icones de l'espai de treball actual"
 
-#: ../extensions/apps-menu/extension.js:39
+#: extensions/apps-menu/extension.js:41
 msgid "Activities Overview"
 msgstr "Vista general d'activitats"
 
-#: ../extensions/apps-menu/extension.js:110
+#: extensions/apps-menu/extension.js:141
 msgid "Favorites"
 msgstr "Preferides"
 
-#: ../extensions/apps-menu/extension.js:279
+#: extensions/apps-menu/extension.js:436
 msgid "Applications"
 msgstr "Aplicacions"
 
-#: ../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 "Aplicació i llista d'espais de treball"
 
-#: ../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"
@@ -110,93 +113,94 @@ msgstr ""
 "d'aplicació (nom del fitxer de l'escriptori), seguit de dos punts i el "
 "número de l'espai de treball"
 
-#: ../extensions/auto-move-windows/prefs.js:60
+#: extensions/auto-move-windows/prefs.js:60
 msgid "Application"
 msgstr "Aplicació"
 
-#: ../extensions/auto-move-windows/prefs.js:69
+#: extensions/auto-move-windows/prefs.js:69
-#: ../extensions/auto-move-windows/prefs.js:127
+#: extensions/auto-move-windows/prefs.js:127
 msgid "Workspace"
 msgstr "Espai de treball"
 
-#: ../extensions/auto-move-windows/prefs.js:85
+#: extensions/auto-move-windows/prefs.js:85
 msgid "Add Rule"
 msgstr "Afegeix una regla"
 
-#: ../extensions/auto-move-windows/prefs.js:106
+#: extensions/auto-move-windows/prefs.js:106
 msgid "Create new matching rule"
 msgstr "Crea una regla de coincidència nova"
 
-#: ../extensions/auto-move-windows/prefs.js:111
+#: extensions/auto-move-windows/prefs.js:111
 msgid "Add"
 msgstr "Afegeix"
 
-#: ../extensions/drive-menu/extension.js:106
+#. TRANSLATORS: %s is the filesystem name
+#: extensions/drive-menu/extension.js:107
 #, javascript-format
-msgid "Ejecting drive '%s' failed:"
+msgid "Ejecting drive “%s” failed:"
 msgstr "Ha fallat l'expulsió de la unitat «%s»:"
 
-#: ../extensions/drive-menu/extension.js:124
+#: extensions/drive-menu/extension.js:125
 msgid "Removable devices"
 msgstr "Dispositius extraïbles"
 
-#: ../extensions/drive-menu/extension.js:149
+#: extensions/drive-menu/extension.js:150
-msgid "Open File"
+msgid "Open Files"
-msgstr "Obre el fitxer"
+msgstr "Obre els fitxers"
 
-#: ../extensions/example/extension.js:17
+#: extensions/example/extension.js:17
 msgid "Hello, world!"
 msgstr "Hola, món!"
 
-#: ../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 "Text de rebuda alternatiu."
 
-#: ../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 ""
 "Si no és buit, conté el text que es mostrarà quan es faci clic en el quadre."
 
-#: ../extensions/example/prefs.js:30
+#: extensions/example/prefs.js:30
 msgid "Message"
 msgstr "Missatge"
 
 #. TRANSLATORS: Example is the name of the extension, should not be
 #. translated
-#: ../extensions/example/prefs.js:43
+#: 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."
+"Nevertheless it’s possible to customize the greeting message."
 msgstr ""
 "L'«Example» està pensat com una extensió del GNOME Shell que demostri la "
 "manera correcta de crear extensions. Com a extensió pròpiament dita no fa "
 "gairebé res.\n"
-"Tot i així permet personalitzar el missatge del rebedor."
+"Tot i així permet personalitzar el missatge de benvinguda."
 
-#: ../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 "Utilitza més pantalla per les finestres"
 
-#: ../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 ""
 "Intenta utilitzar més espai de la pantalla per posicionar les miniatures de "
-"les finestres adaptant-les al ràtio d'aspecte de la pantalla, consolidant-"
+"les finestres adaptant-les a la ràtio d'aspecte de la pantalla, consolidant-"
 "les més per reduir la capsa que les envolta. Aquest paràmetre de "
 "configuració només s'aplica a l'estratègia de posicionament de finestres "
 "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 "Posiciona els títols de les finestres al damunt"
 
-#: ../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 "
@@ -204,111 +208,120 @@ msgid ""
 msgstr ""
 "Si és «true» (cert), posiciona el títol de la finestra damunt de la "
 "miniatura corresponent, substituint el comportament per defecte del Shell de "
-"posicionar-lo a baix. Cal reiniciar el Shell per tal de que aquest canvi "
+"posicionar-lo a baix. Cal reiniciar el Shell per tal que aquest canvi tingui "
-"tingui efecte."
+"efecte."
 
-#: ../extensions/places-menu/extension.js:78
+#: extensions/places-menu/extension.js:78
-#: ../extensions/places-menu/extension.js:81
+#: extensions/places-menu/extension.js:81
 msgid "Places"
 msgstr "Llocs"
 
-#: ../extensions/places-menu/placeDisplay.js:57
+#: extensions/places-menu/placeDisplay.js:65
 #, javascript-format
-msgid "Failed to launch \"%s\""
+msgid "Failed to mount volume for “%s”"
+msgstr "No s'ha pogut muntar el volum «%s»"
+
+#: extensions/places-menu/placeDisplay.js:78
+#, javascript-format
+msgid "Failed to launch “%s”"
 msgstr "No s'ha pogut iniciar «%s»"
 
-#: ../extensions/places-menu/placeDisplay.js:99
+#: extensions/places-menu/placeDisplay.js:137
-#: ../extensions/places-menu/placeDisplay.js:122
+#: extensions/places-menu/placeDisplay.js:160
 msgid "Computer"
 msgstr "Ordinador"
 
-#: ../extensions/places-menu/placeDisplay.js:200
+#: extensions/places-menu/placeDisplay.js:303
 msgid "Home"
 msgstr "Inici"
 
-#: ../extensions/places-menu/placeDisplay.js:287
+#: extensions/places-menu/placeDisplay.js:347
 msgid "Browse Network"
 msgstr "Navega per la xarxa"
 
-#: ../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 "Mostra cíclicament mides de captura de pantalla"
 
-#: ../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 "Mostra cíclicament cap enrere mides de captura de pantalla"
+
+#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
 msgstr "Nom del tema"
 
-#: ../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 "El nom del tema que es carregarà des de ~/.themes/name/gnome-shell"
 
-#: ../extensions/window-list/extension.js:109
+#: extensions/window-list/extension.js:110
 msgid "Close"
 msgstr "Tanca"
 
-#: ../extensions/window-list/extension.js:119
+#: extensions/window-list/extension.js:129
 msgid "Unminimize"
 msgstr "Desminimitza"
 
-#: ../extensions/window-list/extension.js:120
+#: extensions/window-list/extension.js:130
 msgid "Minimize"
 msgstr "Minimitza"
 
-#: ../extensions/window-list/extension.js:126
+#: extensions/window-list/extension.js:136
 msgid "Unmaximize"
 msgstr "Desmaximitza"
 
-#: ../extensions/window-list/extension.js:127
+#: extensions/window-list/extension.js:137
 msgid "Maximize"
 msgstr "Maximitza"
 
-#: ../extensions/window-list/extension.js:399
+#: extensions/window-list/extension.js:420
 msgid "Minimize all"
 msgstr "Minimitza-ho tot"
 
-#: ../extensions/window-list/extension.js:407
+#: extensions/window-list/extension.js:428
 msgid "Unminimize all"
 msgstr "Desminimitza-ho tot"
 
-#: ../extensions/window-list/extension.js:415
+#: extensions/window-list/extension.js:436
 msgid "Maximize all"
 msgstr "Maximitza-ho tot"
 
-#: ../extensions/window-list/extension.js:424
+#: extensions/window-list/extension.js:445
 msgid "Unmaximize all"
 msgstr "Desmaximitza-ho tot"
 
-#: ../extensions/window-list/extension.js:433
+#: extensions/window-list/extension.js:454
 msgid "Close all"
 msgstr "Tanca-ho tot"
 
-#: ../extensions/window-list/extension.js:650
+#: extensions/window-list/extension.js:678
-#: ../extensions/workspace-indicator/extension.js:30
+#: extensions/workspace-indicator/extension.js:30
 msgid "Workspace Indicator"
 msgstr "Indicador de l'espai de treball"
 
-#: ../extensions/window-list/extension.js:808
+#: extensions/window-list/extension.js:842
 msgid "Window List"
 msgstr "Llista de finestres"
 
-#: ../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 "Quan s'han d'agrupar les finestres"
 
-#: ../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 ""
 "Decideix quan s'han d'agrupar les finestres de la mateixa aplicació a la "
 "llista de finestres. Els valors possibles són: «never» (mai), "
 "«auto» (automàticament) i «always» (sempre)."
 
-#: ../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 "Mostra la llista de finestres a tots els monitors"
 
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:4
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
 msgid ""
 "Whether to show the window list on all connected monitors or only on the "
 "primary one."
@@ -316,35 +329,35 @@ msgstr ""
 "Si es mostra la llista de finestres en tots els monitors connectats o només "
 "al primari."
 
-#: ../extensions/window-list/prefs.js:32
+#: extensions/window-list/prefs.js:32
 msgid "Window Grouping"
 msgstr "Agrupació de finestres"
 
-#: ../extensions/window-list/prefs.js:50
+#: extensions/window-list/prefs.js:50
 msgid "Never group windows"
 msgstr "Mai agrupis les finestres"
 
-#: ../extensions/window-list/prefs.js:51
+#: extensions/window-list/prefs.js:51
 msgid "Group windows when space is limited"
 msgstr "Agrupa les finestres quan l'espai estigui limitat"
 
-#: ../extensions/window-list/prefs.js:52
+#: extensions/window-list/prefs.js:52
 msgid "Always group windows"
 msgstr "Agrupa les finestres sempre"
 
-#: ../extensions/window-list/prefs.js:75
+#: extensions/window-list/prefs.js:75
 msgid "Show on all monitors"
 msgstr "Mostra a tots els monitors"
 
-#: ../extensions/workspace-indicator/prefs.js:141
+#: extensions/workspace-indicator/prefs.js:141
 msgid "Workspace Names"
 msgstr "Noms dels espais de treball"
 
-#: ../extensions/workspace-indicator/prefs.js:157
+#: extensions/workspace-indicator/prefs.js:157
 msgid "Name"
 msgstr "Nom"
 
-#: ../extensions/workspace-indicator/prefs.js:198
+#: extensions/workspace-indicator/prefs.js:198
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Espai de treball %d"