Bump version to 3.24.2

Update NEWS.
2017-05-11 15:18:59 +02:00
124 changed files with 6937 additions and 5095 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,13 +0,0 @@
-image: fedora:latest
-
-stages:
- - build
-
-before_script:
-  - dnf install -y meson gettext mozjs52-devel
-
-build-shell-extensions:
-  stage: build
-  script:
-    - meson _build .
-    - ninja -C _build test install
--- a/31
+++ b/31
@@ -0,0 +1,31 @@
+--- 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.
--- a/HACKING.md
+++ b/HACKING.md
@@ -1,31 +0,0 @@
-## 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
--- a/Makefile.am
+++ b/Makefile.am
@@ -0,0 +1,52 @@
+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
--- a/87
+++ b/87
@@ -1,89 +1,4 @@
-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
+3.24.2
 ======
 * apps-menu: Mark copied launchers as trusted
 * places-menu: Make icon lookup asynchronous
--- a/74
+++ b/74
@@ -0,0 +1,74 @@
+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.
+
--- a/README.md
+++ b/README.md
@@ -1,84 +0,0 @@
-# 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
-
- * 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.
-
- * 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.
-
- * 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
--- a/autogen.sh
+++ b/autogen.sh
@@ -0,0 +1,26 @@
+#!/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
--- a/config/.gitignore
+++ b/config/.gitignore
@@ -0,0 +1,3 @@
+install-sh
+mkinstalldirs
+missing
--- a/configure.ac
+++ b/configure.ac
@@ -0,0 +1,98 @@
+AC_PREREQ(2.63)
+AC_INIT([gnome-shell-extensions],[3.24.2],[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
--- a/data/HACKING
+++ b/data/HACKING
@@ -1,2 +1,6 @@
+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
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -0,0 +1,73 @@
+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)
--- a/data/gnome-classic.css
+++ b/data/gnome-classic.css
--- a/data/gnome-classic.scss
+++ b/data/gnome-classic.scss
@@ -7,7 +7,7 @@ $variant: 'light';

 /* Overrides */

-#panel, #panel.solid {
+#panel {
  font-weight: normal;
  background-color: $bg_color;
  background-gradient-direction: vertical;
@@ -31,7 +31,6 @@ $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
@@ -40,15 +39,7 @@ $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,
@@ -90,16 +81,3 @@ $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%); }
-  }
-}
--- a/data/gnome-classic.session.desktop.in
+++ b/data/gnome-classic.session.desktop.in
@@ -1,3 +1,3 @@
 [GNOME Session]
 Name=GNOME Classic
-RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;
+RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11yKeyboard;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.Orientation;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.XRANDR;org.gnome.SettingsDaemon.XSettings;nautilus-classic;
--- a/data/gnome-shell-sass
+++ b/data/gnome-shell-sass
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,63 +0,0 @@
-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_schema = 'org.gnome.shell.extensions.classic-overrides.gschema.xml'
-install_data(classic_schema, install_dir: schemadir)
--- a/export-zips.sh
+++ b/export-zips.sh
@@ -1,36 +0,0 @@
-#!/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
-
-  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
--- a/extension.mk
+++ b/extension.mk
@@ -0,0 +1,18 @@
+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
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -0,0 +1,3 @@
+DIST_SUBDIRS = $(ALL_EXTENSIONS)
+
+SUBDIRS = $(ENABLED_EXTENSIONS)
--- a/extensions/alternate-tab/Makefile.am
+++ b/extensions/alternate-tab/Makefile.am
@@ -0,0 +1,5 @@
+EXTENSION_ID = alternate-tab
+
+EXTRA_MODULES = prefs.js
+
+include ../../extension.mk
--- a/extensions/alternate-tab/extension.js
+++ b/extensions/alternate-tab/extension.js
@@ -1,6 +1,7 @@
 /* -*- 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;

@@ -42,19 +43,15 @@ function enable() {
            tabPopup.destroy();
    };

-    setKeybinding('switch-applications',
-                  Main.wm._forcedWindowSwitcher.bind(Main.wm));
-    setKeybinding('switch-applications-backward',
-                  Main.wm._forcedWindowSwitcher.bind(Main.wm));
+    setKeybinding('switch-applications', Lang.bind(Main.wm, Main.wm._forcedWindowSwitcher));
+    setKeybinding('switch-applications-backward', Lang.bind(Main.wm, Main.wm._forcedWindowSwitcher));
 }

 function disable() {
    var prop;

-    setKeybinding('switch-applications',
-                  Main.wm._startSwitcher.bind(Main.wm));
-    setKeybinding('switch-applications-backward',
-                  Main.wm._startSwitcher.bind(Main.wm));
+    setKeybinding('switch-applications', Lang.bind(Main.wm, Main.wm._startSwitcher));
+    setKeybinding('switch-applications-backward', Lang.bind(Main.wm, Main.wm._startSwitcher));

    for (prop in injections)
        AltTab.WindowSwitcherPopup.prototype[prop] = injections[prop];
--- a/extensions/alternate-tab/meson.build
+++ b/extensions/alternate-tab/meson.build
@@ -1,7 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
-
-extension_sources += files('prefs.js')
--- a/extensions/alternate-tab/metadata.json.in
+++ b/extensions/alternate-tab/metadata.json.in
@@ -4,7 +4,7 @@
 "settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
 "name": "AlternateTab",
-"description": "Substitute Alt-Tab with a window based switcher that does not group by application.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance instead.",
+"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@"
--- a/extensions/alternate-tab/prefs.js
+++ b/extensions/alternate-tab/prefs.js
@@ -3,10 +3,11 @@
 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_ = e => e;
+const N_ = function(e) { return e };

 const ExtensionUtils = imports.misc.extensionUtils;
 const Me = ExtensionUtils.getCurrentExtension();
@@ -21,13 +22,16 @@ const MODES = {
    'both': N_("Thumbnail and application icon"),
 };

-const AltTabSettingsWidget = GObject.registerClass(
-class AltTabSettingsWidget extends Gtk.Grid {
-    _init(params) {
-        super._init(params);
+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.orientation = Gtk.Orientation.VERTICAL;

        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell.window-switcher' });

@@ -52,21 +56,21 @@ class AltTabSettingsWidget extends Gtk.Grid {
            let name = Gettext.gettext(MODES[mode]);

            radio = new Gtk.RadioButton({ group: radio, label: name, valign: Gtk.Align.START });
-            radio.connect('toggled', widget => {
+            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);
-    }
+	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() {
--- a/extensions/apps-menu/Makefile.am
+++ b/extensions/apps-menu/Makefile.am
@@ -0,0 +1,3 @@
+EXTENSION_ID = apps-menu
+
+include ../../extension.mk
--- a/extensions/apps-menu/extension.js
+++ b/extensions/apps-menu/extension.js
@@ -3,6 +3,7 @@
 const Atk = imports.gi.Atk;
 const DND = imports.ui.dnd;
 const GMenu = imports.gi.GMenu;
+const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 const Clutter = imports.gi.Clutter;
@@ -30,24 +31,30 @@ const HORIZ_FACTOR = 5;
 const MENU_HEIGHT_OFFSET = 132;
 const NAVIGATION_REGION_OVERSHOOT = 50;

-class ActivitiesMenuItem extends PopupMenu.PopupBaseMenuItem {
-    constructor(button) {
-        super();
+const ActivitiesMenuItem = new Lang.Class({
+    Name: 'ActivitiesMenuItem',
+    Extends: PopupMenu.PopupBaseMenuItem,
+
+    _init: function(button) {
+	this.parent();
        this._button = button;
        this.actor.add_child(new St.Label({ text: _("Activities Overview") }));
-    }
+    },

-    activate(event) {
+    activate: function(event) {
        this._button.menu.toggle();
        Main.overview.toggle();
-        super.activate(event);
-    }
-};
+	this.parent(event);
+    },
+});

-class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
-    constructor(button, app) {
-        super();
-        this._app = app;
+const ApplicationMenuItem = new Lang.Class({
+    Name: 'ApplicationMenuItem',
+    Extends: PopupMenu.PopupBaseMenuItem,
+
+    _init: function(button, app) {
+	this.parent();
+	this._app = app;
        this._button = button;

        this._iconBin = new St.Bin();
@@ -55,15 +62,16 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {

        let appLabel = new St.Label({ text: app.get_name(), y_expand: true,
                                      y_align: Clutter.ActorAlign.CENTER });
-        this.actor.add_child(appLabel);
+        this.actor.add_child(appLabel, { expand: true });
        this.actor.label_actor = appLabel;

        let textureCache = St.TextureCache.get_default();
        let iconThemeChangedId = textureCache.connect('icon-theme-changed',
-                                                      this._updateIcon.bind(this));
-        this.actor.connect('destroy', () => {
-            textureCache.disconnect(iconThemeChangedId);
-        });
+                                                      Lang.bind(this, this._updateIcon));
+        this.actor.connect('destroy', Lang.bind(this,
+            function() {
+                textureCache.disconnect(iconThemeChangedId);
+            }));
        this._updateIcon();

        this.actor._delegate = this;
@@ -82,42 +90,45 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
        draggable.connect('drag-end', () => {
            Shell.util_set_hidden_from_pick(Main.legacyTray.actor, false);
        });
-    }
+    },

-    activate(event) {
-        this._app.open_new_window(-1);
+    activate: function(event) {
+	this._app.open_new_window(-1);
        this._button.selectCategory(null, null);
        this._button.menu.toggle();
-        super.activate(event);
-    }
+	this.parent(event);
+    },

-    setActive(active, params) {
+    setActive: function(active, params) {
        if (active)
            this._button.scrollToButton(this);
-        super.setActive(active, params);
-    }
+        this.parent(active, params);
+    },

-    setDragEnabled(enable) {
+    setDragEnabled: function(enable) {
        this._dragEnabled = enable;
-    }
+    },

-    getDragActor() {
+    getDragActor: function() {
        return this._app.create_icon_texture(APPLICATION_ICON_SIZE);
-    }
+    },

-    getDragActorSource() {
+    getDragActorSource: function() {
        return this._iconBin;
-    }
+    },

-    _updateIcon() {
+    _updateIcon: function() {
        this._iconBin.set_child(this.getDragActor());
    }
-};
+});

-class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
-    constructor(button, category) {
-        super();
-        this._category = category;
+const CategoryMenuItem = new Lang.Class({
+    Name: 'CategoryMenuItem',
+    Extends: PopupMenu.PopupBaseMenuItem,
+
+    _init: function(button, category) {
+	this.parent();
+	this._category = category;
        this._button = button;

        this._oldX = -1;
@@ -130,16 +141,16 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
            name = _("Favorites");

        this.actor.add_child(new St.Label({ text: name }));
-        this.actor.connect('motion-event', this._onMotionEvent.bind(this));
-    }
+        this.actor.connect('motion-event', Lang.bind(this, this._onMotionEvent));
+    },

-    activate(event) {
+    activate: function(event) {
        this._button.selectCategory(this._category, this);
        this._button.scrollToCatButton(this);
-        super.activate(event);
-    }
+	this.parent(event);
+    },

-    _isNavigatingSubmenu([x, y]) {
+    _isNavigatingSubmenu: function([x, y]) {
        let [posX, posY] = this.actor.get_transformed_position();

        if (this._oldX == -1) {
@@ -194,9 +205,9 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
             return true;

        return false;
-    }
+    },

-    _onMotionEvent(actor, event) {
+    _onMotionEvent: function(actor, event) {
        if (!Clutter.get_pointer_grab()) {
            this._oldX = -1;
            this._oldY = -1;
@@ -217,80 +228,85 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
            source.sync_hover();

        return false;
-    }
+    },

-    setActive(active, params) {
+    setActive: function(active, params) {
        if (active) {
            this._button.selectCategory(this._category, this);
            this._button.scrollToCatButton(this);
        }
-        super.setActive(active, params);
+        this.parent(active, params);
    }
-};
+});

-class ApplicationsMenu extends PopupMenu.PopupMenu {
-    constructor(sourceActor, arrowAlignment, arrowSide, button) {
-        super(sourceActor, arrowAlignment, arrowSide);
+const ApplicationsMenu = new Lang.Class({
+    Name: 'ApplicationsMenu',
+    Extends: PopupMenu.PopupMenu,
+
+    _init: function(sourceActor, arrowAlignment, arrowSide, button) {
+        this.parent(sourceActor, arrowAlignment, arrowSide);
        this._button = button;
-    }
+    },

-    isEmpty() {
-        return false;
-    }
+    isEmpty: function() {
+	return false;
+    },

-    open(animate) {
+    open: function(animate) {
        this._button.hotCorner.setBarrierSize(0);
        if (this._button.hotCorner.actor) // fallback corner
            this._button.hotCorner.actor.hide();
-        super.open(animate);
-    }
+        this.parent(animate);
+    },

-    close(animate) {
+    close: function(animate) {
        let size = Main.layoutManager.panelBox.height;
        this._button.hotCorner.setBarrierSize(size);
        if (this._button.hotCorner.actor) // fallback corner
            this._button.hotCorner.actor.show();
-        super.close(animate);
-    }
+        this.parent(animate);
+    },

-    toggle() {
+    toggle: function() {
        if (this.isOpen) {
            this._button.selectCategory(null, null);
        } else {
            if (Main.overview.visible)
                Main.overview.hide();
        }
-        super.toggle();
+        this.parent();
    }
-};
+});

-class DesktopTarget {
-    constructor() {
+const DesktopTarget = new Lang.Class({
+    Name: 'DesktopTarget',
+
+    _init: function() {
        this._desktop = null;
        this._desktopDestroyedId = 0;

        this._windowAddedId =
            global.window_group.connect('actor-added',
-                                        this._onWindowAdded.bind(this));
+                                        Lang.bind(this, this._onWindowAdded));

        global.get_window_actors().forEach(a => {
            this._onWindowAdded(a.get_parent(), a);
        });
-    }
+    },

    get hasDesktop() {
        return this._desktop != null;
-    }
+    },

-    _onWindowAdded(group, actor) {
+    _onWindowAdded: function(group, actor) {
        if (!(actor instanceof Meta.WindowActor))
            return;

        if (actor.meta_window.get_window_type() == Meta.WindowType.DESKTOP)
            this._setDesktop(actor);
-    }
+    },

-    _setDesktop(desktop) {
+    _setDesktop: function(desktop) {
        if (this._desktop) {
            this._desktop.disconnect(this._desktopDestroyedId);
            this._desktopDestroyedId = 0;
@@ -307,15 +323,15 @@ class DesktopTarget {
            });
            this._desktop._delegate = this;
        }
-    }
+    },

-    _getSourceAppInfo(source) {
+    _getSourceAppInfo: function(source) {
        if (!(source instanceof ApplicationMenuItem))
            return null;
        return source._app.app_info;
-    }
+    },

-    _touchFile(file) {
+    _touchFile: function(file) {
        let queryFlags = Gio.FileQueryInfoFlags.NONE;
        let ioPriority = GLib.PRIORITY_DEFAULT;

@@ -330,9 +346,9 @@ class DesktopTarget {
                    log('Failed to update access time: ' + e.message);
                }
            });
-    }
+    },

-    _markTrusted(file) {
+    _markTrusted: function(file) {
        let modeAttr = Gio.FILE_ATTRIBUTE_UNIX_MODE;
        let trustedAttr = 'metadata::trusted';
        let queryFlags = Gio.FileQueryInfoFlags.NONE;
@@ -342,7 +358,7 @@ class DesktopTarget {
            (o, res) => {
                try {
                    let info = o.query_info_finish(res);
-                    let mode = info.get_attribute_uint32(modeAttr) | 0o100;
+                    let mode = info.get_attribute_uint32(modeAttr) | 0100;

                    info.set_attribute_uint32(modeAttr, mode);
                    info.set_attribute_string(trustedAttr, 'yes');
@@ -357,25 +373,25 @@ class DesktopTarget {
                    log('Failed to mark file as trusted: ' + e.message);
                }
            });
-    }
+    },

-    destroy() {
+    destroy: function() {
        if (this._windowAddedId)
            global.window_group.disconnect(this._windowAddedId);
        this._windowAddedId = 0;

        this._setDesktop(null);
-    }
+    },

-    handleDragOver(source, actor, x, y, time) {
+    handleDragOver: function(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) {
+    acceptDrop: function(source, actor, x, y, time) {
        let appInfo = this._getSourceAppInfo(source);
        if (!appInfo)
            return false;
@@ -397,12 +413,15 @@ class DesktopTarget {

        return true;
    }
-};
+});
 Signals.addSignalMethods(DesktopTarget.prototype);

-class ApplicationsButton extends PanelMenu.Button {
-    constructor() {
-        super(1.0, null, false);
+const ApplicationsButton = new Lang.Class({
+    Name: 'ApplicationsButton',
+    Extends: PanelMenu.Button,
+
+    _init: function() {
+        this.parent(1.0, null, false);

        this.setMenu(new ApplicationsMenu(this.actor, 1.0, St.Side.TOP, this));
        Main.panel.menuManager.addMenu(this.menu);
@@ -424,17 +443,17 @@ class ApplicationsButton extends PanelMenu.Button {
        this.actor.name = 'panelApplications';
        this.actor.label_actor = this._label;

-        this.actor.connect('captured-event', this._onCapturedEvent.bind(this));
-        this.actor.connect('destroy', this._onDestroy.bind(this));
+        this.actor.connect('captured-event', Lang.bind(this, this._onCapturedEvent));
+        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));

-        this._showingId = Main.overview.connect('showing', () => {
+        this._showingId = Main.overview.connect('showing', Lang.bind(this, function() {
            this.actor.add_accessible_state (Atk.StateType.CHECKED);
-        });
-        this._hidingId = Main.overview.connect('hiding', () => {
+        }));
+        this._hidingId = Main.overview.connect('hiding', Lang.bind(this, function() {
            this.actor.remove_accessible_state (Atk.StateType.CHECKED);
-        });
+        }));
        Main.layoutManager.connect('startup-complete',
-                                   this._setKeybinding.bind(this));
+                                   Lang.bind(this, this._setKeybinding));
        this._setKeybinding();

        this._desktopTarget = new DesktopTarget();
@@ -447,64 +466,63 @@ class ApplicationsButton extends PanelMenu.Button {
            });
        });

-        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',
-                                                  this._onTreeChanged.bind(this));
-    }
+        this._installedChangedId = appSys.connect('installed-changed', Lang.bind(this, function() {
+            if (this.menu.isOpen) {
+                this._redisplay();
+                this.mainBox.show();
+            } else {
+                this.reloadFlag = true;
+            }
+        }));

-    _onTreeChanged() {
-        if (this.menu.isOpen) {
-            this._redisplay();
-            this.mainBox.show();
-        } else {
-            this.reloadFlag = true;
-        }
-    }
+        // Since the hot corner uses stage coordinates, Clutter won't
+        // queue relayouts for us when the panel moves. Queue a relayout
+        // when that happens.
+        this._panelBoxChangedId = Main.layoutManager.connect('panel-box-changed', Lang.bind(this, function() {
+            container.queue_relayout();
+        }));
+    },

    get hotCorner() {
        return Main.layoutManager.hotCorners[Main.layoutManager.primaryIndex];
-    }
+    },

-    _createVertSeparator() {
+    _createVertSeparator: function() {
        let separator = new St.DrawingArea({ style_class: 'calendar-vertical-separator',
                                             pseudo_class: 'highlighted' });
-        separator.connect('repaint', this._onVertSepRepaint.bind(this));
+        separator.connect('repaint', Lang.bind(this, this._onVertSepRepaint));
        return separator;
-    }
+    },

-    _onDestroy() {
+    _onDestroy: function() {
        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;

        Main.wm.setCustomKeybindingHandler('panel-main-menu',
                                           Shell.ActionMode.NORMAL |
                                           Shell.ActionMode.OVERVIEW,
                                           Main.sessionMode.hasOverview ?
-                                           Main.overview.toggle.bind(Main.overview) :
+                                           Lang.bind(Main.overview, Main.overview.toggle) :
                                           null);

        this._desktopTarget.destroy();
-    }
+    },

-    _onCapturedEvent(actor, event) {
+    _onCapturedEvent: function(actor, event) {
        if (event.type() == Clutter.EventType.BUTTON_PRESS) {
            if (!Main.overview.shouldToggleByCornerOrButton())
                return true;
        }
        return false;
-    }
+    },

-    _onMenuKeyPress(actor, event) {
+    _onMenuKeyPress: function(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
@@ -512,10 +530,10 @@ class ApplicationsButton extends PanelMenu.Button {
            if (this.menu.actor.navigate_focus(global.stage.key_focus, direction, false))
                return true;
        }
-        return super._onMenuKeyPress(actor, event);
-    }
+        return this.parent(actor, event);
+    },

-    _onVertSepRepaint(area) {
+    _onVertSepRepaint: function(area) {
        let cr = area.get_context();
        let themeNode = area.get_theme_node();
        let [width, height] = area.get_surface_size();
@@ -528,9 +546,9 @@ class ApplicationsButton extends PanelMenu.Button {
        cr.setDash([1, 3], 1); // Hard-code for now
        cr.setLineWidth(stippleWidth);
        cr.stroke();
-    }
+    },

-    _onOpenStateChanged(menu, open) {
+    _onOpenStateChanged: function(menu, open) {
       if (open) {
           if (this.reloadFlag) {
               this._redisplay();
@@ -538,23 +556,25 @@ class ApplicationsButton extends PanelMenu.Button {
           }
           this.mainBox.show();
       }
-       super._onOpenStateChanged(menu, open);
-    }
+       this.parent(menu, open);
+    },

-    _setKeybinding() {
+    _setKeybinding: function() {
        Main.wm.setCustomKeybindingHandler('panel-main-menu',
                                           Shell.ActionMode.NORMAL |
                                           Shell.ActionMode.OVERVIEW,
-                                           () => { this.menu.toggle(); });
-    }
+                                           Lang.bind(this, function() {
+                                               this.menu.toggle();
+                                           }));
+    },

-    _redisplay() {
+    _redisplay: function() {
        this.applicationsBox.destroy_all_children();
        this.categoriesBox.destroy_all_children();
        this._display();
-    }
+    },

-    _loadCategory(categoryId, dir) {
+    _loadCategory: function(categoryId, dir) {
        let iter = dir.iter();
        let nextType;
        while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
@@ -571,17 +591,15 @@ class ApplicationsButton extends PanelMenu.Button {
                    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(button) {
+    scrollToButton: function(button) {
        let appsScrollBoxAdj = this.applicationsScrollBox.get_vscroll_bar().get_adjustment();
        let appsScrollBoxAlloc = this.applicationsScrollBox.get_allocation_box();
        let currentScrollValue = appsScrollBoxAdj.get_value();
@@ -594,9 +612,9 @@ class ApplicationsButton extends PanelMenu.Button {
            newScrollValue = buttonAlloc.y2 - boxHeight + 10;
        if (newScrollValue != currentScrollValue)
            appsScrollBoxAdj.set_value(newScrollValue);
-    }
+    },

-    scrollToCatButton(button) {
+    scrollToCatButton: function(button) {
        let catsScrollBoxAdj = this.categoriesScrollBox.get_vscroll_bar().get_adjustment();
        let catsScrollBoxAlloc = this.categoriesScrollBox.get_allocation_box();
        let currentScrollValue = catsScrollBoxAdj.get_value();
@@ -609,9 +627,9 @@ class ApplicationsButton extends PanelMenu.Button {
            newScrollValue = buttonAlloc.y2 - boxHeight + 10;
        if (newScrollValue != currentScrollValue)
            catsScrollBoxAdj.set_value(newScrollValue);
-    }
+    },

-    _createLayout() {
+    _createLayout: function() {
        let section = new PopupMenu.PopupMenuSection();
        this.menu.addMenuItem(section);
        this.mainBox = new St.BoxLayout({ vertical: false });
@@ -621,19 +639,23 @@ class ApplicationsButton extends PanelMenu.Button {
                                                         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', () => {
+        vscroll.connect('scroll-start', Lang.bind(this, function() {
            this.menu.passEvents = true;
-        });
-        vscroll.connect('scroll-stop', () => {
+        }));
+        vscroll.connect('scroll-stop', Lang.bind(this, function() {
            this.menu.passEvents = false;
-        });
+        }));
        this.categoriesScrollBox = new St.ScrollView({ x_fill: true, y_fill: false,
                                                       y_align: St.Align.START,
                                                       style_class: 'vfade' });
        this.categoriesScrollBox.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
        vscroll = this.categoriesScrollBox.get_vscroll_bar();
-        vscroll.connect('scroll-start', () => { this.menu.passEvents = true; });
-        vscroll.connect('scroll-stop', () => { this.menu.passEvents = false; });
+        vscroll.connect('scroll-start', Lang.bind(this, function() {
+                              this.menu.passEvents = true;
+                          }));
+        vscroll.connect('scroll-stop', Lang.bind(this, function() {
+            this.menu.passEvents = false;
+        }));
        this.leftBox.add(this.categoriesScrollBox, { expand: true,
                                                     x_fill: true, y_fill: true,
                                                     y_align: St.Align.START });
@@ -652,17 +674,18 @@ class ApplicationsButton extends PanelMenu.Button {
        this.mainBox.add(this._createVertSeparator(), { expand: false, x_fill: false, y_fill: true});
        this.mainBox.add(this.applicationsScrollBox, { expand: true, x_fill: true, y_fill: true });
        section.actor.add_actor(this.mainBox);
-    }
+    },

-    _display() {
+    _display: function() {
        this._applicationsButtons.clear();
        this.mainBox.style=('width: 35em;');
        this.mainBox.hide();

        //Load categories
        this.applicationsByCategory = {};
-        this._tree.load_sync();
-        let root = this._tree.get_root_directory();
+        let tree = new GMenu.Tree({ menu_basename: 'applications.menu' });
+        tree.load_sync();
+        let root = tree.get_root_directory();
        let categoryMenuItem = new CategoryMenuItem(this, null);
        this.categoriesBox.add_actor(categoryMenuItem.actor);
        let iter = root.iter();
@@ -687,31 +710,33 @@ class ApplicationsButton extends PanelMenu.Button {

        let height = this.categoriesBox.height + MENU_HEIGHT_OFFSET + 'px';
        this.mainBox.style+=('height: ' + height);
-    }
+    },

-    selectCategory(dir, categoryMenuItem) {
-        this.applicationsBox.get_children().forEach(c => {
-            if (c._delegate instanceof PopupMenu.PopupSeparatorMenuItem)
-                c._delegate.destroy();
-            else
-                this.applicationsBox.remove_actor(c);
-        });
+    _clearApplicationsBox: function(selectedActor) {
+        let actors = this.applicationsBox.get_children();
+        for (let i = 0; i < actors.length; i++) {
+            let actor = actors[i];
+            this.applicationsBox.remove_actor(actor);
+        }
+    },
+
+    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(apps) {
+    _displayButtons: function(apps) {
         if (apps) {
            for (let i = 0; i < apps.length; i++) {
               let app = apps[i];
-               let item;
-               if (app instanceof Shell.App)
-                   item = this._applicationsButtons.get(app);
-               else
-                   item = new PopupMenu.PopupSeparatorMenuItem();
+               let item = this._applicationsButtons.get(app);
               if (!item) {
                  item = new ApplicationMenuItem(this, app);
                  item.setDragEnabled(this._desktopTarget.hasDesktop);
@@ -721,13 +746,16 @@ class ApplicationsButton extends PanelMenu.Button {
                  this.applicationsBox.add_actor(item.actor);
            }
         }
-    }
+    },

-    _listApplications(category_menu_id) {
+    _listApplications: function(category_menu_id) {
        let applist;

        if (category_menu_id) {
            applist = this.applicationsByCategory[category_menu_id];
+            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');
@@ -739,12 +767,13 @@ class ApplicationsButton extends PanelMenu.Button {
        }

        return applist;
-    }
+    },

-    destroy() {
-        super.destroy();
+    destroy: function() {
+        this.menu.actor.get_children().forEach(function(c) { c.destroy() });
+        this.parent();
    }
-};
+});

 let appsMenuButton;
 let activitiesButton;
--- a/extensions/apps-menu/meson.build
+++ b/extensions/apps-menu/meson.build
@@ -1,5 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
--- a/extensions/apps-menu/metadata.json.in
+++ b/extensions/apps-menu/metadata.json.in
@@ -3,7 +3,7 @@
 "uuid": "@uuid@",
 "gettext-domain": "@gettext_domain@",
 "name": "Applications Menu",
-"description": "Add a category-based menu for applications.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance 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 Bugzilla instead.",
 "original-authors": [ "e2002@bk.ru", "debarshir@gnome.org" ],
 "shell-version": [ "@shell_current@" ],
 "url": "@url@"
--- a/extensions/auto-move-windows/Makefile.am
+++ b/extensions/auto-move-windows/Makefile.am
@@ -0,0 +1,7 @@
+EXTENSION_ID = auto-move-windows
+
+EXTRA_MODULES = prefs.js
+
+include ../../extension.mk
+include ../../settings.mk
+
--- a/extensions/auto-move-windows/extension.js
+++ b/extensions/auto-move-windows/extension.js
@@ -1,7 +1,13 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
 // Start apps on custom workspaces

+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;

@@ -9,126 +15,135 @@ const ExtensionUtils = imports.misc.extensionUtils;
 const Me = ExtensionUtils.getCurrentExtension();
 const Convenience = Me.imports.convenience;

-class WindowMover {
-    constructor() {
-        this._settings = Convenience.getSettings();
-        this._appSystem = Shell.AppSystem.get_default();
-        this._appConfigs = new Map();
-        this._appData = new Map();
+const SETTINGS_KEY = 'application-list';

-        this._appsChangedId =
-            this._appSystem.connect('installed-changed',
-                                    this._updateAppData.bind(this));
+let settings;

-        this._settings.connect('changed', this._updateAppConfigs.bind(this));
-        this._updateAppConfigs();
-    }
+const WindowMover = new Lang.Class({
+    Name: 'AutoMoveWindows.WindowMover',

-    _updateAppConfigs() {
-        this._appConfigs.clear();
+    _init: function() {
+        this._settings = settings;
+        this._windowTracker = Shell.WindowTracker.get_default();

-        this._settings.get_strv('application-list').forEach(v => {
-            let [appId, num] = v.split(':');
-            this._appConfigs.set(appId, parseInt(num) - 1);
-        });
+        let display = global.screen.get_display();
+        // Connect after so the handler from ShellWindowTracker has already run
+        this._windowCreatedId = display.connect_after('window-created', Lang.bind(this, this._findAndMove));
+    },

-        this._updateAppData();
-    }
-
-    _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;
+    destroy: function() {
+        if (this._windowCreatedId) {
+            global.screen.get_display().disconnect(this._windowCreatedId);
+            this._windowCreatedId = 0;
        }
+    },

-        if (this._settings) {
-            this._settings.run_dispose();
-            this._settings = null;
+    _ensureAtLeastWorkspaces: function(num, window) {
+        for (let j = global.screen.n_workspaces; j <= num; j++) {
+            window.change_workspace_by_index(j-1, false);
+            global.screen.append_new_workspace(false, 0);
        }
+    },

-        this._appConfigs.clear();
-        this._updateAppData();
-    }
-
-    _moveWindow(window, workspaceNum) {
+    _findAndMove: function(display, window, noRecurse) {
        if (window.skip_taskbar)
            return;

-        // ensure we have the required number of workspaces
-        for (let i = global.screen.n_workspaces; i <= workspaceNum; i++) {
-            window.change_workspace_by_index(i - 1, false);
-            global.screen.append_new_workspace(false, 0);
+        let spaces = this._settings.get_strv(SETTINGS_KEY);
+
+        let app = this._windowTracker.get_window_app(window);
+        if (!app) {
+            if (!noRecurse) {
+                // 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;

-        window.change_workspace_by_index(workspaceNum, false);
+                if (workspace_num >= global.screen.n_workspaces)
+                    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();
+    settings = Convenience.getSettings();
 }

 function myCheckWorkspaces() {
-    let keepAliveWorkspaces = [];
-    let foundNonEmpty = false;
-    for (let i = this._workspaces.length - 1; i >= 0; i--) {
-        if (!foundNonEmpty)
-            foundNonEmpty = this._workspaces[i].list_windows().length > 0;
-        else if (!this._workspaces[i]._keepAliveId)
-            keepAliveWorkspaces.push(this._workspaces[i]);
+    let i;
+    let emptyWorkspaces = new Array(this._workspaces.length);
+
+    if (!Meta.prefs_get_dynamic_workspaces()) {
+        this._checkWorkspacesId = 0;
+        return false;
    }

-    // make sure the original method only removes empty workspaces at the end
-    keepAliveWorkspaces.forEach(ws => { ws._keepAliveId = 1; });
-    prevCheckWorkspaces.call(this);
-    keepAliveWorkspaces.forEach(ws => { delete ws._keepAliveId; });
+    for (i = 0; i < this._workspaces.length; i++) {
+        let lastRemoved = this._workspaces[i]._lastRemovedWindow;
+        if ((lastRemoved &&
+             (lastRemoved.get_window_type() == Meta.WindowType.SPLASHSCREEN ||
+              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;
 }

--- a/extensions/auto-move-windows/meson.build
+++ b/extensions/auto-move-windows/meson.build
@@ -1,8 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
-
-extension_sources += files('prefs.js')
-extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')
--- a/extensions/auto-move-windows/prefs.js
+++ b/extensions/auto-move-windows/prefs.js
@@ -1,13 +1,18 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
 // Start apps on custom workspaces

+const GdkPixbuf = imports.gi.GdkPixbuf;
 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_ = e => e;
+const N_ = function(e) { return e };

 const ExtensionUtils = imports.misc.extensionUtils;
 const Me = ExtensionUtils.getCurrentExtension();
@@ -25,19 +30,21 @@ const Columns = {
    ADJUSTMENT: 4
 };

-const Widget = GObject.registerClass({
+const Widget = new GObject.Class({
+    Name: 'AutoMoveWindows.Prefs.Widget',
    GTypeName: 'AutoMoveWindowsPrefsWidget',
-}, class Widget extends Gtk.Grid {
-    _init(params) {
-        super._init(params);
+    Extends: Gtk.Grid,
+
+    _init: function(params) {
+	this.parent(params);
        this.set_orientation(Gtk.Orientation.VERTICAL);

-        this._settings = Convenience.getSettings();
-        this._settings.connect('changed', this._refresh.bind(this));
-        this._changedPermitted = false;
+	this._settings = Convenience.getSettings();
+	this._settings.connect('changed', Lang.bind(this, this._refresh));
+	this._changedPermitted = false;

-        this._store = new Gtk.ListStore();
-        this._store.set_column_types([Gio.AppInfo, GObject.TYPE_STRING, Gio.Icon, GObject.TYPE_INT,
+	this._store = new Gtk.ListStore();
+	this._store.set_column_types([Gio.AppInfo, GObject.TYPE_STRING, Gio.Icon, GObject.TYPE_INT,
                                      Gtk.Adjustment]);

        let scrolled = new Gtk.ScrolledWindow({ shadow_type: Gtk.ShadowType.IN});
@@ -45,205 +52,212 @@ const Widget = GObject.registerClass({
        this.add(scrolled);


-        this._treeView = new Gtk.TreeView({ model: this._store,
+	this._treeView = new Gtk.TreeView({ model: this._store,
                                            hexpand: true, vexpand: true });
-        this._treeView.get_selection().set_mode(Gtk.SelectionMode.SINGLE);
+	this._treeView.get_selection().set_mode(Gtk.SelectionMode.SINGLE);

-        let appColumn = new Gtk.TreeViewColumn({ expand: true, sort_column_id: Columns.DISPLAY_NAME,
-                                                 title: _("Application") });
-        let iconRenderer = new Gtk.CellRendererPixbuf;
-        appColumn.pack_start(iconRenderer, false);
-        appColumn.add_attribute(iconRenderer, "gicon", Columns.ICON);
-        let nameRenderer = new Gtk.CellRendererText;
-        appColumn.pack_start(nameRenderer, true);
-        appColumn.add_attribute(nameRenderer, "text", Columns.DISPLAY_NAME);
-        this._treeView.append_column(appColumn);
+	let appColumn = new Gtk.TreeViewColumn({ expand: true, sort_column_id: Columns.DISPLAY_NAME,
+						 title: _("Application") });
+	let iconRenderer = new Gtk.CellRendererPixbuf;
+	appColumn.pack_start(iconRenderer, false);
+	appColumn.add_attribute(iconRenderer, "gicon", Columns.ICON);
+	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({ title: _("Workspace"),
                                                       sort_column_id: Columns.WORKSPACE });
-        let workspaceRenderer = new Gtk.CellRendererSpin({ editable: true });
-        workspaceRenderer.connect('edited', this._workspaceEdited.bind(this));
-        workspaceColumn.pack_start(workspaceRenderer, true);
-        workspaceColumn.add_attribute(workspaceRenderer, "adjustment", Columns.ADJUSTMENT);
+	let workspaceRenderer = new Gtk.CellRendererSpin({ editable: true });
+	workspaceRenderer.connect('edited', Lang.bind(this, this._workspaceEdited));
+	workspaceColumn.pack_start(workspaceRenderer, true);
+	workspaceColumn.add_attribute(workspaceRenderer, "adjustment", Columns.ADJUSTMENT);
        workspaceColumn.add_attribute(workspaceRenderer, "text", Columns.WORKSPACE);
-        this._treeView.append_column(workspaceColumn);
+	this._treeView.append_column(workspaceColumn);

-        scrolled.add(this._treeView);
+	scrolled.add(this._treeView);

-        let toolbar = new Gtk.Toolbar({ icon_size: Gtk.IconSize.SMALL_TOOLBAR });
-        toolbar.get_style_context().add_class(Gtk.STYLE_CLASS_INLINE_TOOLBAR);
-        this.add(toolbar);
+	let toolbar = new Gtk.Toolbar({ icon_size: Gtk.IconSize.SMALL_TOOLBAR });
+	toolbar.get_style_context().add_class(Gtk.STYLE_CLASS_INLINE_TOOLBAR);
+	this.add(toolbar);

-        let newButton = new Gtk.ToolButton({ icon_name: 'bookmark-new-symbolic',
+	let newButton = new Gtk.ToolButton({ icon_name: 'bookmark-new-symbolic',
                                             label: _("Add Rule"),
-                                             is_important: true });
-        newButton.connect('clicked', this._createNew.bind(this));
-        toolbar.add(newButton);
+					     is_important: true });
+	newButton.connect('clicked', Lang.bind(this, this._createNew));
+	toolbar.add(newButton);

-        let delButton = new Gtk.ToolButton({ icon_name: 'edit-delete-symbolic'  });
-        delButton.connect('clicked', this._deleteSelected.bind(this));
-        toolbar.add(delButton);
+	let delButton = new Gtk.ToolButton({ icon_name: 'edit-delete-symbolic'  });
+	delButton.connect('clicked', Lang.bind(this, this._deleteSelected));
+	toolbar.add(delButton);

        let selection = this._treeView.get_selection();
-        selection.connect('changed', () => {
-            delButton.sensitive = selection.count_selected_rows() > 0;
-        });
+        selection.connect('changed',
+            function() {
+                delButton.sensitive = selection.count_selected_rows() > 0;
+            });
        delButton.sensitive = selection.count_selected_rows() > 0;

-        this._changedPermitted = true;
-        this._refresh();
-    }
+	this._changedPermitted = true;
+	this._refresh();
+    },

-    _createNew() {
-        let dialog = new Gtk.Dialog({ title: _("Create new matching rule"),
-                                      transient_for: this.get_toplevel(),
+    _createNew: function() {
+	let dialog = new Gtk.Dialog({ title: _("Create new matching rule"),
+				      transient_for: this.get_toplevel(),
                                      use_header_bar: true,
-                                      modal: true });
-        dialog.add_button(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL);
-        let addButton = dialog.add_button(_("Add"), Gtk.ResponseType.OK);
+				      modal: true });
+	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({ column_spacing: 10,
                                  row_spacing: 15,
                                  margin: 10 });
-        dialog._appChooser = new Gtk.AppChooserWidget({ show_all: true });
-        dialog._appChooser.connect('application-selected', (w, appInfo) => {
-            addButton.sensitive = appInfo && this._checkId(appInfo.get_id());
-        });
+	dialog._appChooser = new Gtk.AppChooserWidget({ show_all: true });
+        dialog._appChooser.connect('application-selected', Lang.bind(this,
+            function(w, appInfo) {
+                addButton.sensitive = appInfo &&
+                                      this._checkId(appInfo.get_id());
+            }));
        let appInfo = dialog._appChooser.get_app_info();
        addButton.sensitive = appInfo && this._checkId(appInfo.get_id());

-        grid.attach(dialog._appChooser, 0, 0, 2, 1);
-        grid.attach(new Gtk.Label({ label: _("Workspace"),
+	grid.attach(dialog._appChooser, 0, 0, 2, 1);
+	grid.attach(new Gtk.Label({ label: _("Workspace"),
                                    halign: Gtk.Align.END }), 0, 1, 1, 1);
-        let adjustment = new Gtk.Adjustment({ lower: 1,
-                                              upper: WORKSPACE_MAX,
-                                              step_increment: 1
+	let adjustment = new Gtk.Adjustment({ lower: 1,
+					      upper: WORKSPACE_MAX,
+					      step_increment: 1
                                            });
-        dialog._spin = new Gtk.SpinButton({ adjustment: adjustment,
-                                            snap_to_ticks: true });
+	dialog._spin = new Gtk.SpinButton({ adjustment: adjustment,
+					    snap_to_ticks: true });
        dialog._spin.set_value(1);
-        grid.attach(dialog._spin, 1, 1, 1, 1);
-        dialog.get_content_area().add(grid);
+	grid.attach(dialog._spin, 1, 1, 1, 1);
+	dialog.get_content_area().add(grid);

-        dialog.connect('response', (dialog, id) => {
-            if (id != Gtk.ResponseType.OK) {
+	dialog.connect('response', Lang.bind(this, function(dialog, id) {
+	    if (id != Gtk.ResponseType.OK) {
                dialog.destroy();
-                return;
+		return;
            }

-            let appInfo = dialog._appChooser.get_app_info();
-            if (!appInfo)
-                return;
-            let index = Math.floor(dialog._spin.value);
-            if (isNaN(index) || index < 0)
-                index = 1;
+	    let appInfo = dialog._appChooser.get_app_info();
+	    if (!appInfo)
+		return;
+	    let index = Math.floor(dialog._spin.value);
+	    if (isNaN(index) || index < 0)
+		index = 1;

-            this._changedPermitted = false;
-            this._appendItem(appInfo.get_id(), index);
-            this._changedPermitted = true;
+	    this._changedPermitted = false;
+	    this._appendItem(appInfo.get_id(), index);
+	    this._changedPermitted = true;

-            let iter = this._store.append();
-            let adj = new Gtk.Adjustment({ lower: 1,
-                                           upper: WORKSPACE_MAX,
-                                           step_increment: 1,
+	    let iter = this._store.append();
+	    let adj = new Gtk.Adjustment({ lower: 1,
+					   upper: WORKSPACE_MAX,
+					   step_increment: 1,
                                           value: index });
-            this._store.set(iter,
-                            [Columns.APPINFO, Columns.ICON, Columns.DISPLAY_NAME, Columns.WORKSPACE, Columns.ADJUSTMENT],
-                            [appInfo, appInfo.get_icon(), appInfo.get_display_name(), index, adj]);
+	    this._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() {
-        let [any, model, iter] = this._treeView.get_selection().get_selected();
+    _deleteSelected: function() {
+	let [any, model, iter] = this._treeView.get_selection().get_selected();

-        if (any) {
-            let appInfo = this._store.get_value(iter, Columns.APPINFO);
+	if (any) {
+	    let appInfo = this._store.get_value(iter, Columns.APPINFO);

-            this._changedPermitted = false;
-            this._removeItem(appInfo.get_id());
-            this._changedPermitted = true;
-            this._store.remove(iter);
-        }
-    }
+	    this._changedPermitted = false;
+	    this._removeItem(appInfo.get_id());
+	    this._changedPermitted = true;
+	    this._store.remove(iter);
+	}
+    },

-    _workspaceEdited(renderer, pathString, text) {
-        let index = parseInt(text);
-        if (isNaN(index) || index < 0)
-            index = 1;
+    _workspaceEdited: function(renderer, pathString, text) {
+	let index = parseInt(text);
+	if (isNaN(index) || index < 0)
+	    index = 1;
        let path = Gtk.TreePath.new_from_string(pathString);
-        let [model, iter] = this._store.get_iter(path);
-        let appInfo = this._store.get_value(iter, Columns.APPINFO);
+	let [model, iter] = this._store.get_iter(path);
+	let appInfo = this._store.get_value(iter, Columns.APPINFO);

-        this._changedPermitted = false;
-        this._changeItem(appInfo.get_id(), index);
-        this._store.set_value(iter, Columns.WORKSPACE, index);
-        this._changedPermitted = true;
-    }
+	this._changedPermitted = false;
+	this._changeItem(appInfo.get_id(), index);
+	this._store.set_value(iter, Columns.WORKSPACE, index);
+	this._changedPermitted = true;
+    },

-    _refresh() {
-        if (!this._changedPermitted)
-            // Ignore this notification, model is being modified outside
-            return;
+    _refresh: function() {
+	if (!this._changedPermitted)
+	    // Ignore this notification, model is being modified outside
+	    return;

-        this._store.clear();
+	this._store.clear();

-        let currentItems = this._settings.get_strv(SETTINGS_KEY);
-        let validItems = [ ];
-        for (let i = 0; i < currentItems.length; i++) {
-            let [id, index] = currentItems[i].split(':');
-            let appInfo = Gio.DesktopAppInfo.new(id);
-            if (!appInfo)
-                continue;
-            validItems.push(currentItems[i]);
+	let currentItems = this._settings.get_strv(SETTINGS_KEY);
+	let validItems = [ ];
+	for (let i = 0; i < currentItems.length; i++) {
+	    let [id, index] = currentItems[i].split(':');
+	    let appInfo = Gio.DesktopAppInfo.new(id);
+	    if (!appInfo)
+		continue;
+	    validItems.push(currentItems[i]);

-            let iter = this._store.append();
-            let adj = new Gtk.Adjustment({ lower: 1,
-                                           upper: WORKSPACE_MAX,
-                                           step_increment: 1,
+	    let iter = this._store.append();
+	    let adj = new Gtk.Adjustment({ lower: 1,
+					   upper: WORKSPACE_MAX,
+					   step_increment: 1,
                                           value: index });
-            this._store.set(iter,
-                            [Columns.APPINFO, Columns.ICON, Columns.DISPLAY_NAME, Columns.WORKSPACE, Columns.ADJUSTMENT],
-                            [appInfo, appInfo.get_icon(), appInfo.get_display_name(), parseInt(index), adj]);
-        }
+	    this._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
-            this._settings.set_strv(SETTINGS_KEY, validItems);
-    }
+	if (validItems.length != currentItems.length) // some items were filtered out
+	    this._settings.set_strv(SETTINGS_KEY, validItems);
+    },

-    _checkId(id) {
+    _checkId: function(id) {
        let items = this._settings.get_strv(SETTINGS_KEY);
-        return !items.some(i => i.startsWith(id + ':'));
-    }
+        return !items.some(function(i) { return i.startsWith(id + ':'); });
+    },

-    _appendItem(id, workspace) {
-        let currentItems = this._settings.get_strv(SETTINGS_KEY);
-        currentItems.push(id + ':' + workspace);
-        this._settings.set_strv(SETTINGS_KEY, currentItems);
-    }
+    _appendItem: function(id, workspace) {
+	let currentItems = this._settings.get_strv(SETTINGS_KEY);
+	currentItems.push(id + ':' + workspace);
+	this._settings.set_strv(SETTINGS_KEY, currentItems);
+    },

-    _removeItem(id) {
-        let currentItems = this._settings.get_strv(SETTINGS_KEY);
-        let index = currentItems.map(el => el.split(':')[0]).indexOf(id);
+    _removeItem: function(id) {
+	let currentItems = this._settings.get_strv(SETTINGS_KEY);
+	let index = currentItems.map(function(el) {
+	    return el.split(':')[0];
+	}).indexOf(id);

-        if (index < 0)
-            return;
-        currentItems.splice(index, 1);
-        this._settings.set_strv(SETTINGS_KEY, currentItems);
-    }
+	if (index < 0)
+	    return;
+	currentItems.splice(index, 1);
+	this._settings.set_strv(SETTINGS_KEY, currentItems);
+    },

-    _changeItem(id, workspace) {
-        let currentItems = this._settings.get_strv(SETTINGS_KEY);
-        let index = currentItems.map(el => el.split(':')[0]).indexOf(id);
+    _changeItem: function(id, workspace) {
+	let currentItems = this._settings.get_strv(SETTINGS_KEY);
+	let index = currentItems.map(function(el) {
+	    return el.split(':')[0];
+	}).indexOf(id);

-        if (index < 0)
-            currentItems.push(id + ':' + workspace);
-        else
-            currentItems[index] = id + ':' + workspace;
-        this._settings.set_strv(SETTINGS_KEY, currentItems);
+	if (index < 0)
+	    currentItems.push(id + ':' + workspace);
+	else
+	    currentItems[index] = id + ':' + workspace;
+	this._settings.set_strv(SETTINGS_KEY, currentItems);
    }
 });

--- a/extensions/drive-menu/Makefile.am
+++ b/extensions/drive-menu/Makefile.am
@@ -0,0 +1,3 @@
+EXTENSION_ID = drive-menu
+
+include ../../extension.mk
--- a/extensions/drive-menu/extension.js
+++ b/extensions/drive-menu/extension.js
@@ -1,6 +1,7 @@
 // Drive menu extension
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
+const Lang = imports.lang;
 const St = imports.gi.St;
 const Shell = imports.gi.Shell;

@@ -17,36 +18,39 @@ const ExtensionUtils = imports.misc.extensionUtils;
 const Me = ExtensionUtils.getCurrentExtension();
 const Convenience = Me.imports.convenience;

-class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
-    constructor(mount) {
-        super();
+const MountMenuItem = new Lang.Class({
+    Name: 'DriveMenu.MountMenuItem',
+    Extends: PopupMenu.PopupBaseMenuItem,

-        this.label = new St.Label({ text: mount.get_name() });
-        this.actor.add(this.label, { expand: true });
+    _init: function(mount) {
+	this.parent();
+
+	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',
-                                      style_class: 'popup-menu-icon ' });
-        let ejectButton = new St.Button({ child: ejectIcon });
-        ejectButton.connect('clicked', this._eject.bind(this));
-        this.actor.add(ejectButton);
+	let ejectIcon = new St.Icon({ icon_name: 'media-eject-symbolic',
+				      style_class: 'popup-menu-icon ' });
+	let ejectButton = new St.Button({ child: ejectIcon });
+	ejectButton.connect('clicked', Lang.bind(this, this._eject));
+	this.actor.add(ejectButton);

-        this._changedId = mount.connect('changed', this._syncVisibility.bind(this));
+        this._changedId = mount.connect('changed', Lang.bind(this, this._syncVisibility));
        this._syncVisibility();
-    }
+    },

-    destroy() {
+    destroy: function() {
        if (this._changedId) {
            this.mount.disconnect(this._changedId);
            this._changedId = 0;
        }

-        super.destroy();
-    }
+        this.parent();
+    },

-    _isInteresting() {
+    _isInteresting: function() {
        if (!this.mount.can_eject() && !this.mount.can_unmount())
            return false;
        if (this.mount.is_shadowed())
@@ -61,61 +65,63 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
        }

        return volume.get_identifier('class') != 'network';
-    }
+    },

-    _syncVisibility() {
+    _syncVisibility: function() {
        this.actor.visible = this._isInteresting();
-    }
+    },

-    _eject() {
+    _eject: function() {
        let mountOp = new ShellMountOperation.ShellMountOperation(this.mount);

-        if (this.mount.can_eject())
-            this.mount.eject_with_operation(Gio.MountUnmountFlags.NONE,
+	if (this.mount.can_eject())
+	    this.mount.eject_with_operation(Gio.MountUnmountFlags.NONE,
                                            mountOp.mountOp,
-                                            null, // Gio.Cancellable
-                                            this._ejectFinish.bind(this));
-        else
-            this.mount.unmount_with_operation(Gio.MountUnmountFlags.NONE,
+					    null, // Gio.Cancellable
+					    Lang.bind(this, this._ejectFinish));
+	else
+	    this.mount.unmount_with_operation(Gio.MountUnmountFlags.NONE,
                                              mountOp.mountOp,
-                                              null, // Gio.Cancellable
-                                              this._unmountFinish.bind(this));
-    }
+			                      null, // Gio.Cancellable
+			                      Lang.bind(this, this._unmountFinish));
+    },

-    _unmountFinish(mount, result) {
-        try {
-            mount.unmount_with_operation_finish(result);
-        } catch(e) {
-            this._reportFailure(e);
-        }
-    }
+    _unmountFinish: function(mount, result) {
+	try {
+	    mount.unmount_with_operation_finish(result);
+	} catch(e) {
+	    this._reportFailure(e);
+	}
+    },

-    _ejectFinish(mount, result) {
-        try {
-            mount.eject_with_operation_finish(result);
-        } catch(e) {
-            this._reportFailure(e);
-        }
-    }
+    _ejectFinish: function(mount, result) {
+	try {
+	    mount.eject_with_operation_finish(result);
+	} catch(e) {
+	    this._reportFailure(e);
+	}
+    },

-    _reportFailure(exception) {
-        // TRANSLATORS: %s is the filesystem name
-        let msg = _("Ejecting drive “%s” failed:").format(this.mount.get_name());
-        Main.notifyError(msg, exception.message);
-    }
+    _reportFailure: function(exception) {
+	let msg = _("Ejecting drive “%s” failed:").format(this.mount.get_name());
+	Main.notifyError(msg, exception.message);
+    },

-    activate(event) {
+    activate: function(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);

-        super.activate(event);
+	this.parent(event);
    }
-};
+});

-class DriveMenu extends PanelMenu.Button {
-    constructor() {
-        super(0.0, _("Removable devices"));
+const DriveMenu = new Lang.Class({
+    Name: 'DriveMenu.DriveMenu',
+    Extends: PanelMenu.Button,
+
+    _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',
@@ -125,66 +131,66 @@ class DriveMenu extends PanelMenu.Button {
        hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
        this.actor.add_child(hbox);

-        this._monitor = Gio.VolumeMonitor.get();
-        this._addedId = this._monitor.connect('mount-added', (monitor, mount) => {
-            this._addMount(mount);
-            this._updateMenuVisibility();
-        });
-        this._removedId = this._monitor.connect('mount-removed', (monitor, mount) => {
-            this._removeMount(mount);
-            this._updateMenuVisibility();
-        });
+	this._monitor = Gio.VolumeMonitor.get();
+	this._addedId = this._monitor.connect('mount-added', Lang.bind(this, function(monitor, mount) {
+	    this._addMount(mount);
+	    this._updateMenuVisibility();
+	}));
+	this._removedId = this._monitor.connect('mount-removed', Lang.bind(this, function(monitor, mount) {
+	    this._removeMount(mount);
+	    this._updateMenuVisibility();
+	}));

-        this._mounts = [ ];
+	this._mounts = [ ];

-        this._monitor.get_mounts().forEach(this._addMount.bind(this));
+	this._monitor.get_mounts().forEach(Lang.bind(this, this._addMount));

-        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-        this.menu.addAction(_("Open Files"), event => {
-            let appSystem = Shell.AppSystem.get_default();
-            let app = appSystem.lookup_app('org.gnome.Nautilus.desktop');
-            app.activate_full(-1, event.get_time());
-        });
+	this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+	this.menu.addAction(_("Open File"), function(event) {
+	    let appSystem = Shell.AppSystem.get_default();
+	    let app = appSystem.lookup_app('org.gnome.Nautilus.desktop');
+	    app.activate_full(-1, event.get_time());
+	});

-        this._updateMenuVisibility();
-    }
+	this._updateMenuVisibility();
+    },

-    _updateMenuVisibility() {
-        if (this._mounts.filter(i => i.actor.visible).length > 0)
-            this.actor.show();
-        else
-            this.actor.hide();
-    }
+    _updateMenuVisibility: function() {
+	if (this._mounts.filter(function(i) i.actor.visible).length > 0)
+	    this.actor.show();
+	else
+	    this.actor.hide();
+    },

-    _addMount(mount) {
-        let item = new MountMenuItem(mount);
-        this._mounts.unshift(item);
-        this.menu.addMenuItem(item, 0);
-    }
+    _addMount: function(mount) {
+	let item = new MountMenuItem(mount);
+	this._mounts.unshift(item);
+	this.menu.addMenuItem(item, 0);
+    },

-    _removeMount(mount) {
-        for (let i = 0; i < this._mounts.length; i++) {
-            let item = this._mounts[i];
-            if (item.mount == mount) {
-                item.destroy();
-                this._mounts.splice(i, 1);
-                return;
-            }
-        }
-        log ('Removing a mount that was never added to the menu');
-    }
+    _removeMount: function(mount) {
+	for (let i = 0; i < this._mounts.length; i++) {
+	    let item = this._mounts[i];
+	    if (item.mount == mount) {
+		item.destroy();
+		this._mounts.splice(i, 1);
+		return;
+	    }
+	}
+	log ('Removing a mount that was never added to the menu');
+    },

-    destroy() {
+    destroy: function() {
        if (this._connectedId) {
-            this._monitor.disconnect(this._connectedId);
-            this._monitor.disconnect(this._disconnectedId);
+	    this._monitor.disconnect(this._connectedId);
+	    this._monitor.disconnect(this._disconnectedId);
            this._connectedId = 0;
            this._disconnectedId = 0;
        }

-        super.destroy();
-    }
-};
+	this.parent();
+    },
+});

 function init() {
    Convenience.initTranslations();
--- a/extensions/drive-menu/meson.build
+++ b/extensions/drive-menu/meson.build
@@ -1,5 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
--- a/extensions/example/Makefile.am
+++ b/extensions/example/Makefile.am
@@ -0,0 +1,6 @@
+EXTENSION_ID = example
+
+EXTRA_MODULES = prefs.js
+
+include ../../extension.mk
+include ../../settings.mk
--- a/extensions/example/extension.js
+++ b/extensions/example/extension.js
@@ -20,7 +20,7 @@ function _showHello() {
    let monitor = Main.layoutManager.primaryMonitor;
    global.stage.add_actor(label);
    label.set_position(Math.floor (monitor.width / 2 - label.width / 2), Math.floor(monitor.height / 2 - label.height / 2));
-    Mainloop.timeout_add(3000, () => { label.destroy(); });
+    Mainloop.timeout_add(3000, function () { label.destroy(); });
 }

 // Put your extension initialization code here
@@ -43,7 +43,7 @@ function disable() {
    log ('Example extension disabled');

    if (signalId) {
-        Main.panel.actor.disconnect(signalId);
-        signalId = 0;
+	Main.panel.actor.disconnect(signalId);
+	signalId = 0;
    }
 }
--- a/extensions/example/meson.build
+++ b/extensions/example/meson.build
@@ -1,8 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
-
-extension_sources += files('prefs.js')
-extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')
--- a/extensions/example/prefs.js
+++ b/extensions/example/prefs.js
@@ -16,15 +16,18 @@ function init() {
    Convenience.initTranslations();
 }

-const ExamplePrefsWidget = GObject.registerClass(
-class ExamplePrefsWidget extends Gtk.Grid {
-    _init(params) {
-        super._init(params);
+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>',
+	this.add(new Gtk.Label({ label: '<b>' + _("Message") + '</b>',
                                 use_markup: true,
                                 halign: Gtk.Align.START }));

@@ -32,16 +35,16 @@ class ExamplePrefsWidget extends Gtk.Grid {
                                    margin_bottom: 12 });
        this.add(entry);

-        this._settings = Convenience.getSettings();
-        this._settings.bind('hello-text', entry, 'text', Gio.SettingsBindFlags.DEFAULT);
+	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 \
+	// 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,
+	this.add(new Gtk.Label({ label: primaryText,
                                 wrap: true, xalign: 0 }));
    }
 });
--- a/extensions/launch-new-instance/Makefile.am
+++ b/extensions/launch-new-instance/Makefile.am
@@ -0,0 +1,3 @@
+EXTENSION_ID = launch-new-instance
+
+include ../../extension.mk
--- a/extensions/launch-new-instance/meson.build
+++ b/extensions/launch-new-instance/meson.build
@@ -1,5 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
--- a/extensions/launch-new-instance/metadata.json.in
+++ b/extensions/launch-new-instance/metadata.json.in
@@ -4,7 +4,7 @@
 "settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
 "name": "Launch new instance",
-"description": "Always launch a new instance when clicking in the dash or the application view.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance 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 Bugzilla instead.",
 "shell-version": [ "@shell_current@" ],
 "url": "@url@"
 }
--- a/extensions/meson.build
+++ b/extensions/meson.build
@@ -1,45 +0,0 @@
-extension_schemas = []
-js_sources = extensionlib
-
-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 + extensionlib,
-      install_dir: join_paths(extensiondir, uuid)
-    )
-  endif
-endforeach
-
-install_data (extension_schemas,
-  install_dir: schemadir
-)
-
-foreach js_source : js_sources
-  if (js52.found())
-    path_array = '@0@'.format(js_source).split('/')
-    name = join_paths(path_array[-2], path_array[-1])
-
-    test('Checking syntax of ' + name, js52,
-      args: ['-s', '-c', js_source],
-      workdir: meson.current_source_dir()
-    )
-  endif
-endforeach
--- a/extensions/meson.build.template
+++ b/extensions/meson.build.template
@@ -1,8 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
-
-# extension_sources += files('prefs.js')
-# extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')
--- a/extensions/native-window-placement/Makefile.am
+++ b/extensions/native-window-placement/Makefile.am
@@ -0,0 +1,5 @@
+EXTENSION_ID = native-window-placement
+
+include ../../extension.mk
+include ../../settings.mk
+
--- a/extensions/native-window-placement/extension.js
+++ b/extensions/native-window-placement/extension.js
@@ -1,5 +1,24 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+// import just everything from workspace.js:
+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();
@@ -12,19 +31,40 @@ const WINDOW_PLACEMENT_NATURAL_ACCURACY = 20;                       // accuracy
 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

-class Rect {
-    constructor(x, y, width, height) {
-        [this.x, this.y, this.width, this.height] = [x, y, width, height];
+const PLACE_WINDOW_CAPTIONS_ON_TOP = true;                          // place window titles in overview on top of windows with overlap parameter
+
+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() {
+    copy: function() {
        return new Rect(this.x, this.y, this.width, this.height);
-    }
+    },

-    union(rect2) {
+    union: function(rect2) {
        let dest = this.copy();
        if (rect2.x < dest.x)
          {
@@ -42,57 +82,68 @@ class Rect {
          dest.height = rect2.y + rect2.height - dest.y;

        return dest;
-    }
+    },

-    adjusted(dx, dy, dx2, dy2) {
+    adjusted: function(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(rect2) {
+    overlap: function(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() {
+    center: function() {
        return [this.x + this.width / 2, this.y + this.height / 2];
-    }
+    },

-    translate(dx, dy) {
+    translate: function(dx, dy) {
        this.x += dx;
        this.y += dy;
    }
-};
+});

-class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
-    constructor(settings) {
-        super();
-        this._settings = settings;
-    }
+let winInjections, workspaceInjections, connectedSignals;

-    computeLayout(windows, layout) {
-        layout.windows = windows;
-    }
+function resetState() {
+    winInjections = { };
+    workspaceInjections = { };
+    connectedSignals = [ ];
+}
+
+function enable() {
+    resetState();
+
+    let settings = Convenience.getSettings();
+    let useMoreScreen = settings.get_boolean('use-more-screen');
+    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
     */
-    computeWindowSlots(layout, area) {
+    Workspace.Workspace.prototype._calculateWindowTransformationsNatural = function(clones, 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 bounds = area_rect.copy();
-        let clones = layout.windows;

        let direction = 0;
        let directions = [];
@@ -150,7 +201,7 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
                        rects[j].translate(diff[0], diff[1]);


-                        if (this._settings.get_boolean('use-more-screen')) {
+                        if (useMoreScreen) {
                            // 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
@@ -240,39 +291,157 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {

        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;
+            }

-function resetState() {
-    winInjections = { };
-    workspaceInjections = { };
-}
+            let initialPositioning = flags & WindowPositionFlags.INITIAL;
+            let animate = flags & WindowPositionFlags.ANIMATE;

-function enable() {
-    resetState();
+            let layout = this._currentLayout;
+            let strategy = layout.strategy;

-    let settings = Convenience.getSettings();
+            let [, , padding] = this._getSpacingAndPadding();
+            let area = Workspace.padArea(this._actualGeometry, padding);

-    workspaceInjections['_getBestLayout'] = Workspace.Workspace.prototype._getBestLayout;
-    Workspace.Workspace.prototype._getBestLayout = function(windows) {
-        let strategy = new NaturalLayoutStrategy(settings);
-        let layout = { strategy };
-        strategy.computeLayout(windows, layout);
+            /// EDIT replace this version by our own:
+            //let slots = strategy.computeWindowSlots(layout, area);

-        return layout;
-    }

-    /// position window titles on top of windows in overlay ////
-    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;
+            /// 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);
+                }
+            }
        }

-        winInjections['relayout'].call(this, animate);
-    };
+
+
+    /// position window titles on top of windows in overlay ////
+    if (windowCaptionsOnTop) {
+
+        /// This is almost a direct copy of the original relayout function. Differences are marked.
+        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) {
@@ -290,6 +459,9 @@ 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();
 }
--- a/extensions/native-window-placement/meson.build
+++ b/extensions/native-window-placement/meson.build
@@ -1,7 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
-
-extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')
--- a/extensions/places-menu/Makefile.am
+++ b/extensions/places-menu/Makefile.am
@@ -0,0 +1,5 @@
+EXTENSION_ID = places-menu
+
+EXTRA_MODULES = placeDisplay.js
+
+include ../../extension.mk
--- a/extensions/places-menu/extension.js
+++ b/extensions/places-menu/extension.js
@@ -3,6 +3,7 @@
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
+const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;

@@ -13,7 +14,7 @@ const Panel = imports.ui.panel;

 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
-const N_ = x => x;
+const N_ = function(x) { return x; }

 const ExtensionUtils = imports.misc.extensionUtils;
 const Me = ExtensionUtils.getCurrentExtension();
@@ -22,50 +23,45 @@ const PlaceDisplay = Me.imports.placeDisplay;

 const PLACE_ICON_SIZE = 16;

-class PlaceMenuItem extends PopupMenu.PopupBaseMenuItem {
-    constructor(info) {
-        super();
-        this._info = info;
+const PlaceMenuItem = new Lang.Class({
+    Name: 'PlaceMenuItem',
+    Extends: PopupMenu.PopupBaseMenuItem,
+
+    _init: function(info) {
+	this.parent();
+	this._info = info;

        this._icon = new St.Icon({ gicon: info.icon,
                                   icon_size: PLACE_ICON_SIZE });
-        this.actor.add_child(this._icon);
+	this.actor.add_child(this._icon);

-        this._label = new St.Label({ text: info.name, x_expand: true });
+        this._label = new St.Label({ text: info.name });
        this.actor.add_child(this._label);

-        if (info.isRemovable()) {
-            this._ejectIcon = new St.Icon({ icon_name: 'media-eject-symbolic',
-                                            style_class: 'popup-menu-icon ' });
-            this._ejectButton = new St.Button({ child: this._ejectIcon });
-            this._ejectButton.connect('clicked', info.eject.bind(info));
-            this.actor.add_child(this._ejectButton);
-        }
-
        this._changedId = info.connect('changed',
-                                       this._propertiesChanged.bind(this));
-    }
+                                       Lang.bind(this, this._propertiesChanged));
+    },

-    destroy() {
+    destroy: function() {
        if (this._changedId) {
            this._info.disconnect(this._changedId);
            this._changedId = 0;
        }

-        super.destroy();
-    }
+        this.parent();
+    },

-    activate(event) {
-        this._info.launch(event.get_time());
+    activate: function(event) {
+	this._info.launch(event.get_time());

-        super.activate(event);
-    }
+	this.parent(event);
+    },

-    _propertiesChanged(info) {
+    _propertiesChanged: function(info) {
        this._icon.gicon = info.icon;
        this._label.text = info.name;
-    }
-};
+    },
+});

 const SECTIONS = [
    'special',
@@ -74,9 +70,12 @@ const SECTIONS = [
    'network'
 ]

-class PlacesMenu extends PanelMenu.Button {
-    constructor() {
-        super(0.0, _("Places"));
+const PlacesMenu = new Lang.Class({
+    Name: 'PlacesMenu.PlacesMenu',
+    Extends: PanelMenu.Button,
+
+    _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"),
@@ -88,41 +87,41 @@ class PlacesMenu extends PanelMenu.Button {

        this.placesManager = new PlaceDisplay.PlacesManager();

-        this._sections = { };
+	this._sections = { };

-        for (let i=0; i < SECTIONS.length; i++) {
-            let id = SECTIONS[i];
-            this._sections[id] = new PopupMenu.PopupMenuSection();
-            this.placesManager.connect(id + '-updated', () => {
-                this._redisplay(id);
-            });
+	for (let i=0; i < SECTIONS.length; i++) {
+	    let id = SECTIONS[i];
+	    this._sections[id] = new PopupMenu.PopupMenuSection();
+	    this.placesManager.connect(id + '-updated', Lang.bind(this, function() {
+		this._redisplay(id);
+	    }));

-            this._create(id);
-            this.menu.addMenuItem(this._sections[id]);
-            this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-        }
-    }
+	    this._create(id);
+	    this.menu.addMenuItem(this._sections[id]);
+	    this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+	}
+    },

-    destroy() {
-        this.placesManager.destroy();
+    destroy: function() {
+	this.placesManager.destroy();

-        super.destroy();
-    }
+        this.parent();
+    },

-    _redisplay(id) {
-        this._sections[id].removeAll();
+    _redisplay: function(id) {
+	this._sections[id].removeAll();
        this._create(id);
-    }
+    },

-    _create(id) {
+    _create: function(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();
@@ -135,7 +134,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');
 }

--- a/extensions/places-menu/meson.build
+++ b/extensions/places-menu/meson.build
@@ -1,7 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
-
-extension_sources += files('placeDisplay.js')
--- a/extensions/places-menu/metadata.json.in
+++ b/extensions/places-menu/metadata.json.in
@@ -4,7 +4,7 @@
 "settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
 "name": "Places Status Indicator",
-"description": "Add a menu for quickly navigating places in the system.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance 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 Bugzilla instead.",
 "shell-version": [ "@shell_current@" ],
 "url": "@url@"
 }
--- a/extensions/places-menu/placeDisplay.js
+++ b/extensions/places-menu/placeDisplay.js
@@ -3,6 +3,7 @@
 const GLib = imports.gi.GLib;
 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;
@@ -11,12 +12,11 @@ const DND = imports.ui.dnd;
 const Main = imports.ui.main;
 const Params = imports.misc.params;
 const Search = imports.ui.search;
-const ShellMountOperation = imports.ui.shellMountOperation;
 const Util = imports.misc.util;

 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
-const N_ = x => x;
+const N_ = function(x) { return x; }

 const BACKGROUND_SCHEMA = 'org.gnome.desktop.background';

@@ -27,72 +27,42 @@ const Hostname1Iface = '<node> \
 </node>';
 const Hostname1 = Gio.DBusProxy.makeProxyWrapper(Hostname1Iface);

-class PlaceInfo {
-    constructor() {
-        this._init.apply(this, arguments);
-    }
+const PlaceInfo = new Lang.Class({
+    Name: 'PlaceInfo',

-    _init(kind, file, name, icon) {
+    _init: function(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() {
-    }
+    destroy: function() {
+    },

-    isRemovable() {
+    isRemovable: function() {
        return false;
-    }
+    },

-    _createLaunchCallback(launchContext, tryMount) {
-        return (_ignored, result) => {
-            try {
-                Gio.AppInfo.launch_default_for_uri_finish(result);
-            } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_MOUNTED)) {
-                let source = {
-                    get_icon: () => { return this.icon; }
-                };
-                let op = new ShellMountOperation.ShellMountOperation(source);
-                this.file.mount_enclosing_volume(0, op.mountOp, null, (file, result) => {
-                    try {
-                        op.close();
-                        file.mount_enclosing_volume_finish(result);
-                    } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED)) {
-                        // e.g. user canceled the password dialog
-                        return;
-                    } catch(e) {
-                        Main.notifyError(_("Failed to mount volume for “%s”").format(this.name), e.message);
-                        return;
-                    }
-
-                    if (tryMount) {
-                        let callback = this._createLaunchCallback(launchContext, false);
-                        Gio.AppInfo.launch_default_for_uri_async(file.get_uri(),
-                                                                 launchContext,
-                                                                 null,
-                                                                 callback);
-                    }
-                });
-            } catch(e) {
-                Main.notifyError(_("Failed to launch “%s”").format(this.name), e.message);
-            }
-        }
-    }
-
-    launch(timestamp) {
+    launch: function(timestamp) {
        let launchContext = global.create_app_launch_context(timestamp, -1);
-        let callback = this._createLaunchCallback(launchContext, true);
-        Gio.AppInfo.launch_default_for_uri_async(this.file.get_uri(),
-                                                 launchContext,
-                                                 null,
-                                                 callback);
-    }

-    getIcon() {
+        try {
+            Gio.AppInfo.launch_default_for_uri(this.file.get_uri(),
+                                               launchContext);
+        } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_MOUNTED)) {
+            this.file.mount_enclosing_volume(0, null, null, function(file, result) {
+                file.mount_enclosing_volume_finish(result);
+                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() {
        this.file.query_info_async('standard::symbolic-icon', 0, 0, null,
-                                   (file, result) => {
+                                   Lang.bind(this, function(file, result) {
                                       try {
                                           let info = file.query_info_finish(result);
                                           this.icon = info.get_symbolic_icon();
@@ -100,7 +70,7 @@ class PlaceInfo {
                                       } catch(e if e instanceof Gio.IOErrorEnum) {
                                           return;
                                       }
-                                   });
+                                   }));

        // return a generic icon for this kind for now, until we have the
        // icon from the query info above
@@ -117,135 +87,101 @@ class PlaceInfo {
            else
                return new Gio.ThemedIcon({ name: 'folder-symbolic' });
        }
-    }
+    },

-    _getFileName() {
+    _getFileName: function() {
        try {
            let info = this.file.query_info('standard::display-name', 0, null);
            return info.get_display_name();
        } catch(e if e instanceof Gio.IOErrorEnum) {
            return this.file.get_basename();
        }
-    }
-};
+    },
+});
 Signals.addSignalMethods(PlaceInfo.prototype);

-class RootInfo extends PlaceInfo {
-    _init() {
-        super._init('devices', Gio.File.new_for_path('/'), _("Computer"));
+const RootInfo = new Lang.Class({
+    Name: 'RootInfo',
+    Extends: PlaceInfo,

-        let busName = 'org.freedesktop.hostname1';
-        let objPath = '/org/freedesktop/hostname1';
-        new Hostname1(Gio.DBus.system, busName, objPath, (obj, error) => {
-            if (error)
-                return;
+    _init: function() {
+        this.parent('devices', Gio.File.new_for_path('/'), _("Computer"));

-            this._proxy = obj;
-            this._proxy.connect('g-properties-changed',
-                                this._propertiesChanged.bind(this));
-            this._propertiesChanged(obj);
-        });
-    }
+        this._proxy = new Hostname1(Gio.DBus.system,
+                                    'org.freedesktop.hostname1',
+                                    '/org/freedesktop/hostname1',
+                                    Lang.bind(this, function(obj, error) {
+                                        if (error)
+                                            return;

-    getIcon() {
+                                        this._proxy.connect('g-properties-changed',
+                                                            Lang.bind(this, this._propertiesChanged));
+                                        this._propertiesChanged(obj);
+                                    }));
+    },
+
+    getIcon: function() {
        return new Gio.ThemedIcon({ name: 'drive-harddisk-symbolic' });
-    }
+    },

-    _propertiesChanged(proxy) {
+    _propertiesChanged: function(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.emit('changed');
        }
+    },
+
+    destroy: function() {
+        this._proxy.run_dispose();
+        this.parent();
    }
-
-    destroy() {
-        if (this._proxy) {
-            this._proxy.run_dispose();
-            this._proxy = null;
-        }
-        super.destroy();
-    }
-};
+});


-class PlaceDeviceInfo extends PlaceInfo {
-    _init(kind, mount) {
+const PlaceDeviceInfo = new Lang.Class({
+    Name: 'PlaceDeviceInfo',
+    Extends: PlaceInfo,
+
+    _init: function(kind, mount) {
        this._mount = mount;
-        super._init(kind, mount.get_root(), mount.get_name());
-    }
+        this.parent(kind, mount.get_root(), mount.get_name());
+    },

-    getIcon() {
+    getIcon: function() {
        return this._mount.get_symbolic_icon();
    }
+});

-    isRemovable() {
-        return this._mount.can_eject();
-    }
+const PlaceVolumeInfo = new Lang.Class({
+    Name: 'PlaceVolumeInfo',
+    Extends: PlaceInfo,

-    eject() {
-        let mountOp = new ShellMountOperation.ShellMountOperation(this._mount);
-
-        if (this._mount.can_eject())
-            this._mount.eject_with_operation(Gio.MountUnmountFlags.NONE,
-                                             mountOp.mountOp,
-                                             null, // Gio.Cancellable
-                                             this._ejectFinish.bind(this));
-        else
-            this._mount.unmount_with_operation(Gio.MountUnmountFlags.NONE,
-                                               mountOp.mountOp,
-                                               null, // Gio.Cancellable
-                                               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) {
+    _init: function(kind, volume) {
        this._volume = volume;
-        super._init(kind, volume.get_activation_root(), volume.get_name());
-    }
+        this.parent(kind, volume.get_activation_root(), volume.get_name());
+    },

-    launch(timestamp) {
+    launch: function(timestamp) {
        if (this.file) {
-            super.launch(timestamp);
+            this.parent(timestamp);
            return;
        }

-        this._volume.mount(0, null, null, (volume, result) => {
+        this._volume.mount(0, null, null, Lang.bind(this, function(volume, result) {
            volume.mount_finish(result);

            let mount = volume.get_mount();
            this.file = mount.get_root();
-            super.launch(timestamp);
-        });
-    }
+            this.parent(timestamp);
+        }));
+    },

-    getIcon() {
+    getIcon: function() {
        return this._volume.get_symbolic_icon();
    }
-};
+});

 const DEFAULT_DIRECTORIES = [
    GLib.UserDirectory.DIRECTORY_DOCUMENTS,
@@ -255,8 +191,10 @@ const DEFAULT_DIRECTORIES = [
    GLib.UserDirectory.DIRECTORY_VIDEOS,
 ];

-var PlacesManager = class {
-    constructor() {
+const PlacesManager = new Lang.Class({
+    Name: 'PlacesManager',
+
+    _init: function() {
        this._places = {
            special: [],
            devices: [],
@@ -267,7 +205,7 @@ var PlacesManager = class {
        this._settings = new Gio.Settings({ schema_id: BACKGROUND_SCHEMA });
        this._showDesktopIconsChangedId =
            this._settings.connect('changed::show-desktop-icons',
-                                   this._updateSpecials.bind(this));
+                                   Lang.bind(this, this._updateSpecials));
        this._updateSpecials();

        /*
@@ -283,35 +221,35 @@ var PlacesManager = class {

        if (this._bookmarksFile) {
            this._monitor = this._bookmarksFile.monitor_file(Gio.FileMonitorFlags.NONE, null);
-            this._monitor.connect('changed', () => {
+            this._monitor.connect('changed', Lang.bind(this, function () {
                if (this._bookmarkTimeoutId > 0)
                    return;
                /* Defensive event compression */
-                this._bookmarkTimeoutId = Mainloop.timeout_add(100, () => {
+                this._bookmarkTimeoutId = Mainloop.timeout_add(100, Lang.bind(this, function () {
                    this._bookmarkTimeoutId = 0;
                    this._reloadBookmarks();
                    return false;
-                });
-            });
+                }));
+            }));

            this._reloadBookmarks();
        }
-    }
+    },

-    _connectVolumeMonitorSignals() {
+    _connectVolumeMonitorSignals: function() {
        const signals = ['volume-added', 'volume-removed', 'volume-changed',
                         'mount-added', 'mount-removed', 'mount-changed',
                         'drive-connected', 'drive-disconnected', 'drive-changed'];

        this._volumeMonitorSignals = [];
-        let func = this._updateMounts.bind(this);
+        let func = Lang.bind(this, this._updateMounts);
        for (let i = 0; i < signals.length; i++) {
            let id = this._volumeMonitor.connect(signals[i], func);
            this._volumeMonitorSignals.push(id);
        }
-    }
+    },

-    destroy() {
+    destroy: function() {
        if (this._settings)
            this._settings.disconnect(this._showDesktopIconsChangedId);
        this._settings = null;
@@ -323,10 +261,10 @@ var PlacesManager = class {
            this._monitor.cancel();
        if (this._bookmarkTimeoutId)
            Mainloop.source_remove(this._bookmarkTimeoutId);
-    }
+    },

-    _updateSpecials() {
-        this._places.special.forEach(p => { p.destroy(); });
+    _updateSpecials: function() {
+        this._places.special.forEach(function (p) { p.destroy(); });
        this._places.special = [];

        let homePath = GLib.get_home_dir();
@@ -356,19 +294,21 @@ var PlacesManager = class {
            specials.push(info);
        }

-        specials.sort((a, b) => GLib.utf8_collate(a.name, b.name));
+        specials.sort(function(a, b) {
+            return GLib.utf8_collate(a.name, b.name);
+        });
        this._places.special = this._places.special.concat(specials);

        this.emit('special-updated');
-    }
+    },

-    _updateMounts() {
+    _updateMounts: function() {
        let networkMounts = [];
        let networkVolumes = [];

-        this._places.devices.forEach(p => { p.destroy(); });
+        this._places.devices.forEach(function (p) { p.destroy(); });
        this._places.devices = [];
-        this._places.network.forEach(p => { p.destroy(); });
+        this._places.network.forEach(function (p) { p.destroy(); });
        this._places.network = [];

        /* Add standard places */
@@ -385,7 +325,7 @@ var PlacesManager = class {

            for(let j = 0; j < volumes.length; j++) {
                let identifier = volumes[j].get_identifier('class');
-                if (identifier && identifier.includes('network')) {
+                if (identifier && identifier.indexOf('network') >= 0) {
                    networkVolumes.push(volumes[j]);
                } else {
                    let mount = volumes[j].get_mount();
@@ -402,7 +342,7 @@ var PlacesManager = class {
                continue;

            let identifier = volumes[i].get_identifier('class');
-            if (identifier && identifier.includes('network')) {
+            if (identifier && identifier.indexOf('network') >= 0) {
                networkVolumes.push(volumes[i]);
            } else {
                let mount = volumes[i].get_mount();
@@ -443,9 +383,9 @@ var PlacesManager = class {

        this.emit('devices-updated');
        this.emit('network-updated');
-    }
+    },

-    _findBookmarksFile() {
+    _findBookmarksFile: function() {
        let paths = [
            GLib.build_filenamev([GLib.get_user_config_dir(), 'gtk-3.0', 'bookmarks']),
            GLib.build_filenamev([GLib.get_home_dir(), '.gtk-bookmarks']),
@@ -457,9 +397,9 @@ var PlacesManager = class {
        }

        return null;
-    }
+    },

-    _reloadBookmarks() {
+    _reloadBookmarks: function() {

        this._bookmarks = [];

@@ -507,9 +447,9 @@ var PlacesManager = class {
        this._places.bookmarks = bookmarks;

        this.emit('bookmarks-updated');
-    }
+    },

-    _addMount(kind, mount) {
+    _addMount: function(kind, mount) {
        let devItem;

        try {
@@ -519,9 +459,9 @@ var PlacesManager = class {
        }

        this._places[kind].push(devItem);
-    }
+    },

-    _addVolume(kind, volume) {
+    _addVolume: function(kind, volume) {
        let volItem;

        try {
@@ -531,10 +471,10 @@ var PlacesManager = class {
        }

        this._places[kind].push(volItem);
-    }
+    },

-    get(kind) {
+    get: function (kind) {
        return this._places[kind];
    }
-};
+});
 Signals.addSignalMethods(PlacesManager.prototype);
--- a/extensions/screenshot-window-sizer/Makefile.am
+++ b/extensions/screenshot-window-sizer/Makefile.am
@@ -0,0 +1,4 @@
+EXTENSION_ID = screenshot-window-sizer
+
+include ../../extension.mk
+include ../../settings.mk
--- a/extensions/screenshot-window-sizer/extension.js
+++ b/extensions/screenshot-window-sizer/extension.js
@@ -84,7 +84,11 @@ function cycleScreenshotSizes(display, screen, window, binding) {

    // Double both axes if on a hidpi display
    let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-    let scaledSizes = SIZES.map(size => size.map(wh => wh * scaleFactor));
+    let scaledSizes = SIZES.map(function(size) {
+        return size.map(function(wh) {
+            return wh * scaleFactor;
+        });
+    });

    // Find the nearest 16:9 size for the current window size
    let nearestIndex;
@@ -143,18 +147,11 @@ function init() {
 function enable() {
    Main.wm.addKeybinding('cycle-screenshot-sizes',
                          Convenience.getSettings(),
-                          Meta.KeyBindingFlags.PER_WINDOW,
-                          Shell.ActionMode.NORMAL,
-                          cycleScreenshotSizes);
-    Main.wm.addKeybinding('cycle-screenshot-sizes-backward',
-                          Convenience.getSettings(),
-                          Meta.KeyBindingFlags.PER_WINDOW |
-                          Meta.KeyBindingFlags.IS_REVERSED,
+                          Meta.KeyBindingFlags.PER_WINDOW | Meta.KeyBindingFlags.REVERSES,
                          Shell.ActionMode.NORMAL,
                          cycleScreenshotSizes);
 }

 function disable() {
    Main.wm.removeKeybinding('cycle-screenshot-sizes');
-    Main.wm.removeKeybinding('cycle-screenshot-sizes-backward');
 }
--- a/extensions/screenshot-window-sizer/meson.build
+++ b/extensions/screenshot-window-sizer/meson.build
@@ -1,7 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
-
-extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')
--- a/extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml
+++ b/extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schemalist gettext-domain="gnome-shell-extensions">
+<schemalist>
  <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>
--- a/extensions/user-theme/Makefile.am
+++ b/extensions/user-theme/Makefile.am
@@ -0,0 +1,5 @@
+EXTENSION_ID = user-theme
+
+include ../../extension.mk
+include ../../settings.mk
+
--- a/extensions/user-theme/extension.js
+++ b/extensions/user-theme/extension.js
@@ -3,6 +3,7 @@

 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
+const Lang = imports.lang;
 const Main = imports.ui.main;

 const SETTINGS_KEY = 'name';
@@ -11,17 +12,19 @@ const ExtensionUtils = imports.misc.extensionUtils;
 const Me = ExtensionUtils.getCurrentExtension();
 const Convenience = Me.imports.convenience;

-class ThemeManager {
-    constructor() {
+const ThemeManager = new Lang.Class({
+    Name: 'UserTheme.ThemeManager',
+
+    _init: function() {
        this._settings = Convenience.getSettings();
-    }
+    },

-    enable() {
-        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() {
+    disable: function() {
        if (this._changedId) {
            this._settings.disconnect(this._changedId);
            this._changedId = 0;
@@ -29,9 +32,9 @@ class ThemeManager {

        Main.setThemeStylesheet(null);
        Main.loadTheme();
-    }
+    },

-    _changeTheme() {
+    _changeTheme: function() {
        let _stylesheet = null;
        let _themeName = this._settings.get_string(SETTINGS_KEY);

@@ -61,7 +64,7 @@ class ThemeManager {
        Main.setThemeStylesheet(_stylesheet);
        Main.loadTheme();
    }
-};
+});

 function init() {
    return new ThemeManager();
--- a/extensions/user-theme/meson.build
+++ b/extensions/user-theme/meson.build
@@ -1,7 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
-
-extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')
--- a/extensions/window-list/Makefile.am
+++ b/extensions/window-list/Makefile.am
@@ -0,0 +1,10 @@
+EXTENSION_ID = window-list
+
+EXTRA_MODULES = prefs.js
+
+if CLASSIC_MODE
+  EXTRA_MODULES += classic.css
+endif
+
+include ../../extension.mk
+include ../../settings.mk
--- a/extensions/window-list/extension.js
+++ b/extensions/window-list/extension.js
--- a/extensions/window-list/meson.build
+++ b/extensions/window-list/meson.build
@@ -1,12 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
-
-extension_sources += files('prefs.js')
-extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')
-
-if classic_mode_enabled
-  extension_data += files('classic.css')
-endif
--- a/extensions/window-list/metadata.json.in
+++ b/extensions/window-list/metadata.json.in
@@ -4,7 +4,7 @@
 "settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
 "name": "Window List",
-"description": "Display a window list at the bottom of the screen.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance 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 Bugzilla instead.",
 "shell-version": [ "@shell_current@" ],
 "url": "@url@"
 }
--- a/extensions/window-list/prefs.js
+++ b/extensions/window-list/prefs.js
@@ -3,6 +3,7 @@
 const Gio = imports.gi.Gio;
 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;
@@ -16,10 +17,13 @@ function init() {
    Convenience.initTranslations();
 }

-const WindowListPrefsWidget = GObject.registerClass(
-class WindowListPrefsWidget extends Gtk.Grid {
-    _init(params) {
-        super._init(params);
+const WindowListPrefsWidget = new GObject.Class({
+    Name: 'WindowList.Prefs.Widget',
+    GTypeName: 'WindowListPrefsWidget',
+    Extends: Gtk.Grid,
+
+    _init: function(params) {
+        this.parent(params);

        this.margin = 24;
        this.row_spacing = 6;
@@ -62,10 +66,10 @@ class WindowListPrefsWidget extends Gtk.Grid {
                                          group: radio });
            grid.add(radio);

-            radio.connect('toggled', button => {
+            radio.connect('toggled', Lang.bind(this, function(button) {
                if (button.active)
                    this._settings.set_string('grouping-mode', mode);
-            });
+            }));
        }

        let check = new Gtk.CheckButton({ label: _("Show on all monitors"),
--- a/extensions/windowsNavigator/Makefile.am
+++ b/extensions/windowsNavigator/Makefile.am
@@ -0,0 +1,3 @@
+EXTENSION_ID = windowsNavigator
+
+include ../../extension.mk
--- a/extensions/windowsNavigator/extension.js
+++ b/extensions/windowsNavigator/extension.js
@@ -1,5 +1,6 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 const Clutter = imports.gi.Clutter;
+const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const St = imports.gi.St;

@@ -232,9 +233,9 @@ function enable() {
                                                          visible: false }));

            this.actor.add_actor(this._tip);
-            let signalId = this.actor.connect('notify::scale-x', () => {
+            let signalId = this.actor.connect('notify::scale-x', Lang.bind(this, function() {
                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;
@@ -243,10 +244,8 @@ function enable() {
    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', this._onKeyPress.bind(this));
-        this._keyReleaseEventId =
-            global.stage.connect('key-release-event', this._onKeyRelease.bind(this));
+        this._keyPressEventId = global.stage.connect('key-press-event', Lang.bind(this, this._onKeyPress));
+        this._keyReleaseEventId = global.stage.connect('key-release-event', Lang.bind(this, this._onKeyRelease));
        connectedSignals.push({ obj: global.stage, id: this._keyPressEventId });
        connectedSignals.push({ obj: global.stage, id: this._keyReleaseEventId });
    });
@@ -275,10 +274,10 @@ function disable() {
    for (i in workViewInjections)
        removeInjection(WorkspacesView.WorkspacesView.prototype, workViewInjections, i);

-    for (i of connectedSignals)
+    for each (i in connectedSignals)
        i.obj.disconnect(i.id);

-    for (i of createdActors)
+    for each (i in createdActors)
        i.destroy();

    resetState();
--- a/extensions/windowsNavigator/meson.build
+++ b/extensions/windowsNavigator/meson.build
@@ -1,5 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
--- a/extensions/workspace-indicator/Makefile.am
+++ b/extensions/workspace-indicator/Makefile.am
@@ -0,0 +1,5 @@
+EXTENSION_ID = workspace-indicator
+
+EXTRA_MODULES = prefs.js
+
+include ../../extension.mk
--- a/extensions/workspace-indicator/extension.js
+++ b/extensions/workspace-indicator/extension.js
@@ -4,6 +4,7 @@ const Gio = imports.gi.Gio;
 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;
@@ -21,112 +22,111 @@ const Convenience = Me.imports.convenience;
 const WORKSPACE_SCHEMA = 'org.gnome.desktop.wm.preferences';
 const WORKSPACE_KEY = 'workspace-names';

-class WorkspaceIndicator extends PanelMenu.Button {
-    constructor() {
-        super(0.0, _("Workspace Indicator"));
+const WorkspaceIndicator = new Lang.Class({
+    Name: 'WorkspaceIndicator.WorkspaceIndicator',
+    Extends: PanelMenu.Button,

-        this._currentWorkspace = global.screen.get_active_workspace().index();
-        this.statusLabel = new St.Label({ y_align: Clutter.ActorAlign.CENTER,
+    _init: function(){
+	this.parent(0.0, _("Workspace Indicator"));
+
+	this._currentWorkspace = global.screen.get_active_workspace().index();
+	this.statusLabel = new St.Label({ y_align: Clutter.ActorAlign.CENTER,
                                          text: this._labelText() });

-        this.actor.add_actor(this.statusLabel);
+	this.actor.add_actor(this.statusLabel);

-        this.workspacesItems = [];
-        this._workspaceSection = new PopupMenu.PopupMenuSection();
-        this.menu.addMenuItem(this._workspaceSection);
+	this.workspacesItems = [];
+	this._workspaceSection = new PopupMenu.PopupMenuSection();
+	this.menu.addMenuItem(this._workspaceSection);

-        this._screenSignals = [];
-        this._screenSignals.push(global.screen.connect_after('workspace-added',                                                              this._createWorkspacesSection.bind(this)));
-        this._screenSignals.push(global.screen.connect_after('workspace-removed',
-                                                             this._createWorkspacesSection.bind(this)));
-        this._screenSignals.push(global.screen.connect_after('workspace-switched',
-                                                             this._updateIndicator.bind(this)));
+	this._screenSignals = [];
+	this._screenSignals.push(global.screen.connect_after('workspace-added', Lang.bind(this,this._createWorkspacesSection)));
+	this._screenSignals.push(global.screen.connect_after('workspace-removed', Lang.bind(this,this._createWorkspacesSection)));
+	this._screenSignals.push(global.screen.connect_after('workspace-switched', Lang.bind(this,this._updateIndicator)));

-        this.actor.connect('scroll-event', this._onScrollEvent.bind(this));
-        this._createWorkspacesSection();
+	this.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
+	this._createWorkspacesSection();

-        //styling
-        this.statusLabel.add_style_class_name('panel-workspace-indicator');
+	//styling
+	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,
-                                   this._createWorkspacesSection.bind(this));
-    }
+        this._settingsChangedId = this._settings.connect('changed::' + WORKSPACE_KEY, Lang.bind(this, this._createWorkspacesSection));
+    },

-    destroy() {
-        for (let i = 0; i < this._screenSignals.length; i++)
-            global.screen.disconnect(this._screenSignals[i]);
+    destroy: function() {
+	for (let i = 0; i < this._screenSignals.length; i++)
+	    global.screen.disconnect(this._screenSignals[i]);

        if (this._settingsChangedId) {
            this._settings.disconnect(this._settingsChangedId);
            this._settingsChangedId = 0;
        }

-        super.destroy();
-    }
+	this.parent();
+    },

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

-        this.statusLabel.set_text(this._labelText());
-    }
+	this.statusLabel.set_text(this._labelText());
+    },

-    _labelText(workspaceIndex) {
-        if(workspaceIndex == undefined) {
-            workspaceIndex = this._currentWorkspace;
-            return (workspaceIndex + 1).toString();
-        }
-        return Meta.prefs_get_workspace_name(workspaceIndex);
-    }
+    _labelText : function(workspaceIndex) {
+	if(workspaceIndex == undefined) {
+	    workspaceIndex = this._currentWorkspace;
+	    return (workspaceIndex + 1).toString();
+	}
+	return Meta.prefs_get_workspace_name(workspaceIndex);
+    },

-    _createWorkspacesSection() {
-        this._workspaceSection.removeAll();
-        this.workspacesItems = [];
-        this._currentWorkspace = global.screen.get_active_workspace().index();
+    _createWorkspacesSection : function() {
+	this._workspaceSection.removeAll();
+	this.workspacesItems = [];
+	this._currentWorkspace = global.screen.get_active_workspace().index();

-        let i = 0;
-        for(; i < global.screen.n_workspaces; i++) {
-            this.workspacesItems[i] = new PopupMenu.PopupMenuItem(this._labelText(i));
-            this._workspaceSection.addMenuItem(this.workspacesItems[i]);
-            this.workspacesItems[i].workspaceId = i;
-            this.workspacesItems[i].label_actor = this.statusLabel;
-            let self = this;
-            this.workspacesItems[i].connect('activate', (actor, event) => {
-                this._activate(actor.workspaceId);
-            });
+	let i = 0;
+	for(; i < global.screen.n_workspaces; i++) {
+	    this.workspacesItems[i] = new PopupMenu.PopupMenuItem(this._labelText(i));
+	    this._workspaceSection.addMenuItem(this.workspacesItems[i]);
+	    this.workspacesItems[i].workspaceId = i;
+	    this.workspacesItems[i].label_actor = this.statusLabel;
+	    let self = this;
+	    this.workspacesItems[i].connect('activate', Lang.bind(this, function(actor, event) {
+		this._activate(actor.workspaceId);
+	    }));

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

-        this.statusLabel.set_text(this._labelText());
-    }
+	this.statusLabel.set_text(this._labelText());
+    },

-    _activate(index) {
-        if(index >= 0 && index <  global.screen.n_workspaces) {
-            let metaWorkspace = global.screen.get_workspace_by_index(index);
-            metaWorkspace.activate(global.get_current_time());
-        }
-    }
+    _activate : function (index) {
+	if(index >= 0 && index <  global.screen.n_workspaces) {
+	    let metaWorkspace = global.screen.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;
-        }
+    _onScrollEvent : function(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.screen.get_active_workspace().index() + diff;
-        this._activate(newIndex);
-    }
-};
+	let newIndex = global.screen.get_active_workspace().index() + diff;
+	this._activate(newIndex);
+    },
+});

 function init(meta) {
    Convenience.initTranslations();
--- a/extensions/workspace-indicator/meson.build
+++ b/extensions/workspace-indicator/meson.build
@@ -1,7 +0,0 @@
-extension_data += configure_file(
-  input: metadata_name + '.in',
-  output: metadata_name,
-  configuration: metadata_conf
-)
-
-extension_sources += files('prefs.js')
--- a/extensions/workspace-indicator/prefs.js
+++ b/extensions/workspace-indicator/prefs.js
@@ -4,10 +4,11 @@ const Gio = imports.gi.Gio;
 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_ = e => e;
+const N_ = function(e) { return e };

 const ExtensionUtils = imports.misc.extensionUtils;
 const Me = ExtensionUtils.getCurrentExtension();
@@ -16,29 +17,32 @@ const Convenience = Me.imports.convenience;
 const WORKSPACE_SCHEMA = 'org.gnome.desktop.wm.preferences';
 const WORKSPACE_KEY = 'workspace-names';

-const WorkspaceNameModel = GObject.registerClass(
-class WorkspaceNameModel extends Gtk.ListStore {
-    _init(params) {
-        super._init(params);
+const WorkspaceNameModel = new GObject.Class({
+    Name: 'WorkspaceIndicator.WorkspaceNameModel',
+    GTypeName: 'WorkspaceNameModel',
+    Extends: Gtk.ListStore,
+
+    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', this._reloadFromSettings.bind(this));
+        //this._settings.connect('changed::workspace-names', Lang.bind(this, this._reloadFromSettings));

        this._reloadFromSettings();

        // overriding class closure doesn't work, because GtkTreeModel
        // plays tricks with marshallers and class closures
-        this.connect('row-changed', this._onRowChanged.bind(this));
-        this.connect('row-inserted', this._onRowInserted.bind(this));
-        this.connect('row-deleted', this._onRowDeleted.bind(this));
-    }
+        this.connect('row-changed', Lang.bind(this, this._onRowChanged));
+        this.connect('row-inserted', Lang.bind(this, this._onRowInserted));
+        this.connect('row-deleted', Lang.bind(this, this._onRowDeleted));
+    },

-    _reloadFromSettings() {
+    _reloadFromSettings: function() {
        if (this._preventChanges)
            return;
        this._preventChanges = true;
@@ -63,9 +67,9 @@ class WorkspaceNameModel extends Gtk.ListStore {
        }

        this._preventChanges = false;
-    }
+    },

-    _onRowChanged(self, path, iter) {
+    _onRowChanged: function(self, path, iter) {
        if (this._preventChanges)
            return;
        this._preventChanges = true;
@@ -84,9 +88,9 @@ class WorkspaceNameModel extends Gtk.ListStore {
        this._settings.set_strv(WORKSPACE_KEY, names);

        this._preventChanges = false;
-    }
+    },

-    _onRowInserted(self, path, iter) {
+    _onRowInserted: function(self, path, iter) {
        if (this._preventChanges)
            return;
        this._preventChanges = true;
@@ -99,9 +103,9 @@ class WorkspaceNameModel extends Gtk.ListStore {
        this._settings.set_strv(WORKSPACE_KEY, names);

        this._preventChanges = false;
-    }
+    },

-    _onRowDeleted(self, path) {
+    _onRowDeleted: function(self, path) {
        if (this._preventChanges)
            return;
        this._preventChanges = true;
@@ -121,13 +125,16 @@ class WorkspaceNameModel extends Gtk.ListStore {
        this._settings.set_strv(WORKSPACE_KEY, names);

        this._preventChanges = false;
-    }
+    },
 });

-const WorkspaceSettingsWidget = GObject.registerClass(
-class WorkspaceSettingsWidget extends Gtk.Grid {
-    _init(params) {
-        super._init(params);
+const WorkspaceSettingsWidget = new GObject.Class({
+    Name: 'WorkspaceIndicator.WorkspaceSettingsWidget',
+    GTypeName: 'WorkspaceSettingsWidget',
+    Extends: Gtk.Grid,
+
+    _init: function(params) {
+        this.parent(params);
        this.margin = 12;
        this.orientation = Gtk.Orientation.VERTICAL;

@@ -149,7 +156,7 @@ class WorkspaceSettingsWidget extends Gtk.Grid {

        let column = new Gtk.TreeViewColumn({ title: _("Name") });
        let renderer = new Gtk.CellRendererText({ editable: true });
-        renderer.connect('edited', this._cellEdited.bind(this));
+        renderer.connect('edited', Lang.bind(this, this._cellEdited));
        column.pack_start(renderer, true);
        column.add_attribute(renderer, 'text', this._store.Columns.LABEL);
        this._treeView.append_column(column);
@@ -160,38 +167,39 @@ class WorkspaceSettingsWidget extends Gtk.Grid {
        toolbar.get_style_context().add_class(Gtk.STYLE_CLASS_INLINE_TOOLBAR);

        let newButton = new Gtk.ToolButton({ icon_name: 'list-add-symbolic' });
-        newButton.connect('clicked', this._newClicked.bind(this));
+        newButton.connect('clicked', Lang.bind(this, this._newClicked));
        toolbar.add(newButton);

        let delButton = new Gtk.ToolButton({ icon_name: 'list-remove-symbolic' });
-        delButton.connect('clicked', this._delClicked.bind(this));
+        delButton.connect('clicked', Lang.bind(this, this._delClicked));
        toolbar.add(delButton);

        let selection = this._treeView.get_selection();
-        selection.connect('changed', () => {
-            delButton.sensitive = selection.count_selected_rows() > 0;
-        });
+        selection.connect('changed',
+            function() {
+                delButton.sensitive = selection.count_selected_rows() > 0;
+            });
        delButton.sensitive = selection.count_selected_rows() > 0;

        this.add(toolbar);
-    }
+    },

-    _cellEdited(renderer, path, new_text) {
+    _cellEdited: function(renderer, path, new_text) {
        let [ok, iter] = this._store.get_iter_from_string(path);

        if (ok)
            this._store.set(iter, [this._store.Columns.LABEL], [new_text]);
-    }
+    },

-    _newClicked() {
+    _newClicked: function() {
        let iter = this._store.append();
        let index = this._store.get_path(iter).get_indices()[0];

        let label = _("Workspace %d").format(index + 1);
        this._store.set(iter, [this._store.Columns.LABEL], [label]);
-    }
+    },

-    _delClicked() {
+    _delClicked: function() {
        let [any, model, iter] = this._treeView.get_selection().get_selected();

        if (any)
--- a/gnome-shell-extensions.doap
+++ b/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="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/issues" />
+  <bug-database rdf:resource="http://bugzilla.gnome.org/browse.cgi?product=gnome-shell&amp;component=extensions" />

  <category rdf:resource="http://api.gnome.org/doap-extensions#core" />
  <programming-language>JavaScript</programming-language>
--- a/include.mk
+++ b/include.mk
@@ -0,0 +1,12 @@
+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)
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -0,0 +1 @@
+intltool.m4
--- a/meson.build
+++ b/meson.build
@@ -1,99 +0,0 @@
-project('gnome-shell-extensions',
-  version: '3.28.1',
-  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')
-
-extensionlib = files('lib/convenience.js')
-
-js52 = find_program('js52', 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 = [
-  'alternate-tab',
-  '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',
-  'example',
-  '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')
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,18 +0,0 @@
-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.'
-)
--- a/po/Makevars
+++ b/po/Makevars
@@ -0,0 +1,68 @@
+# 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
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,14 +1,13 @@
 # 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, 2017.
+# Khaled Hosny <khaledhosny@eglug.org>, 2012, 2013, 2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2017-07-02 06:04+0200\n"
-"PO-Revision-Date: 2017-07-02 06:12+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-23 23:54+0200\n"
+"PO-Revision-Date: 2015-09-23 23:56+0200\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
 "Language: ar\n"
@@ -17,319 +16,310 @@ 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 1.0.0-beta1\n"
+"X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"

-#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
+#: ../data/gnome-classic.desktop.in.h:1
+#: ../data/gnome-classic.session.desktop.in.in.h:1
 msgid "GNOME Classic"
 msgstr "جنوم تقليدية"

-#: data/gnome-classic.desktop.in:4
+#: ../data/gnome-classic.desktop.in.h:2
 msgid "This session logs you into GNOME Classic"
 msgstr "تولجك هذه الجلسة في جنوم التقليدية"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:7
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:1
 msgid "Attach modal dialog to the parent window"
 msgstr "اربط المربعات الحوارية العائمة بالنافذة الأم"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml: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
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:2
 msgid ""
 "This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgstr "يغلب هذا المفتاح على مفتاح org.gnome.mutter عند استخدام صدفة جنوم."
+msgstr ""

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:3
 msgid "Arrangement of buttons on the titlebar"
 msgstr "ترتيب الأزرار في شريط العناوين"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:17
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:4
 msgid ""
 "This key overrides the key in org.gnome.desktop.wm.preferences when running "
 "GNOME Shell."
 msgstr ""
-"يغلب هذا المفتاح على مفتاح org.gnome.desktop.wm.preferences عند استخدام صدفة "
-"جنوم."

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:24
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:5
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr ""

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:32
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:6
 msgid "Workspaces only on primary monitor"
 msgstr "مساحات عمل على الشاشة الرئيسية فقط"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:40
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:7
 msgid "Delay focus changes in mouse mode until the pointer stops moving"
 msgstr ""

-#: extensions/alternate-tab/prefs.js:20
+#: ../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:41
+#: ../extensions/apps-menu/extension.js:38
 msgid "Activities Overview"
 msgstr "ملخص الأنشطة"

-#: extensions/apps-menu/extension.js:141
+#: ../extensions/apps-menu/extension.js:109
 msgid "Favorites"
 msgstr "المفضّلات"

-#: extensions/apps-menu/extension.js:436
+#: ../extensions/apps-menu/extension.js:261
 msgid "Applications"
 msgstr "التطبيقات"

-#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
+#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:1
 msgid "Application and workspace list"
 msgstr "قائمة التطبيقات ومساحات العمل"

-#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:7
+#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
 msgid ""
 "A list of strings, each containing an application id (desktop file name), "
 "followed by a colon and the workspace number"
 msgstr ""

-#: 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:127
+#: ../extensions/auto-move-windows/prefs.js:69
+#: ../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:"
-msgstr "فشل إخراج ”%s“:"
+msgid "Ejecting drive '%s' failed:"
+msgstr "فشل إخراج '%s':"

-#: extensions/drive-menu/extension.js:124
+#: ../extensions/drive-menu/extension.js:124
 msgid "Removable devices"
 msgstr "الأجهزة المنفصلة"

-#: extensions/drive-menu/extension.js:149
-msgid "Open Files"
-msgstr "افتح الملفات"
+#: ../extensions/drive-menu/extension.js:149
+msgid "Open File"
+msgstr "افتح الملف"

-#: extensions/example/extension.js:17
+#: ../extensions/example/extension.js:17
 msgid "Hello, world!"
 msgstr "أهلا، يا عالم!"

-#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:5
+#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:1
 msgid "Alternative greeting text."
 msgstr "نص ترحيب بديل"

-#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:6
+#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:2
 msgid ""
 "If not empty, it contains the text that will be shown when clicking on the "
 "panel."
 msgstr ""

-#: extensions/example/prefs.js:30
+#: ../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:5
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:1
 msgid "Use more screen for windows"
 msgstr ""

-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:2
 msgid ""
 "Try to use more screen for placing window thumbnails by adapting to screen "
 "aspect ratio, and consolidating them further to reduce the bounding box. "
 "This setting applies only with the natural placement strategy."
 msgstr ""

-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
+#: ../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:12
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:4
 msgid ""
 "If true, place window captions on top the respective thumbnail, overriding "
 "shell default of placing it at the bottom. Changing this setting requires "
 "restarting the shell to have any effect."
 msgstr ""

-#: extensions/places-menu/extension.js:78
-#: extensions/places-menu/extension.js:81
+#: ../extensions/places-menu/extension.js:78
+#: ../extensions/places-menu/extension.js:81
 msgid "Places"
 msgstr "الأماكن"

-#: extensions/places-menu/placeDisplay.js:65
+#: ../extensions/places-menu/placeDisplay.js:59
 #, javascript-format
-msgid "Failed to mount volume for “%s”"
-msgstr "فشل وصل الجزء ”%s“"
+msgid "Failed to launch \"%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
+#: ../extensions/places-menu/placeDisplay.js:101
+#: ../extensions/places-menu/placeDisplay.js:124
 msgid "Computer"
 msgstr "الحاسوب"

-#: extensions/places-menu/placeDisplay.js:303
+#: ../extensions/places-menu/placeDisplay.js:267
 msgid "Home"
 msgstr "المنزل"

-#: extensions/places-menu/placeDisplay.js:347
+#: ../extensions/places-menu/placeDisplay.js:311
 msgid "Browse Network"
 msgstr "تصفّح الشبكة"

-#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
+#: ../extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml.in.h:1
 msgid "Cycle Screenshot Sizes"
 msgstr ""

-#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
+#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:1
 msgid "Theme name"
 msgstr "اسم السمة"

-#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:6
+#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:2
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
-msgstr "اسم السمة، يمكن تحميلة من ‪~/.themes/name/gnome-shell‬"
+msgstr ""

-#: extensions/window-list/extension.js:110
+#: ../extensions/window-list/extension.js:110
 msgid "Close"
 msgstr "أغلق"

-#: extensions/window-list/extension.js:129
+#: ../extensions/window-list/extension.js:120
 msgid "Unminimize"
 msgstr "ألغِ التصغير"

-#: extensions/window-list/extension.js:130
+#: ../extensions/window-list/extension.js:121
 msgid "Minimize"
 msgstr "صغّر"

-#: extensions/window-list/extension.js:136
+#: ../extensions/window-list/extension.js:127
 msgid "Unmaximize"
 msgstr "ألغِ التكبير"

-#: extensions/window-list/extension.js:137
+#: ../extensions/window-list/extension.js:128
 msgid "Maximize"
 msgstr "كبّر"

-#: extensions/window-list/extension.js:420
+#: ../extensions/window-list/extension.js:403
 msgid "Minimize all"
 msgstr "صغّر الكل"

-#: extensions/window-list/extension.js:428
+#: ../extensions/window-list/extension.js:411
 msgid "Unminimize all"
 msgstr "ألغِ تصغير الكل"

-#: extensions/window-list/extension.js:436
+#: ../extensions/window-list/extension.js:419
 msgid "Maximize all"
 msgstr "كبّر الكل"

-#: extensions/window-list/extension.js:445
+#: ../extensions/window-list/extension.js:428
 msgid "Unmaximize all"
 msgstr "ألغِ تكبير الكل"

-#: extensions/window-list/extension.js:454
+#: ../extensions/window-list/extension.js:437
 msgid "Close all"
 msgstr "أغلق الكل"

-#: extensions/window-list/extension.js:678
-#: extensions/workspace-indicator/extension.js:30
+#: ../extensions/window-list/extension.js:661
+#: ../extensions/workspace-indicator/extension.js:30
 msgid "Workspace Indicator"
 msgstr "مؤشر مساحات العمل"

-#: extensions/window-list/extension.js:842
+#: ../extensions/window-list/extension.js:820
 msgid "Window List"
 msgstr "قائمة النوافذ"

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:12
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:1
 msgid "When to group windows"
 msgstr "متى تجمّع النوافذ"

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:2
 msgid ""
 "Decides when to group windows from the same application on the window list. "
-"Possible values are “never”, “auto” and “always”."
+"Possible values are \"never\", \"auto\" and \"always\"."
 msgstr ""
-"يقرر متى تجمع نوافذ نفس التطبيق في قائمة النوافذ. القيم الممكنة هي ”never“،‏ "
-"”auto“ و ”always“."
+"يقرر متى تجمع نوافذ نفس التطبيق في قائمة النوافذ. القيم الممكنة هي \"never"
+"\"، \"auto\" و \"always\"."

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:3
 msgid "Show the window list on all monitors"
-msgstr "اعرض قائمة النوافذ على كل الشاشات"
+msgstr ""

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:4
 msgid ""
 "Whether to show the window list on all connected monitors or only on the "
 "primary one."
 msgstr ""
-"ما إذا كانت قائمة النوافذ ستعرض على كل الشاشات المتصلة أم الشاشة الرئيسية."

-#: extensions/window-list/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"
--- a/po/be.po
+++ b/po/be.po
@@ -8,8 +8,8 @@ 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"
+"POT-Creation-Date: 2017-02-22 18:40+0000\n"
+"PO-Revision-Date: 2017-03-02 19:49+0300\n"
 "Last-Translator: Yuras Shumovich <shumovichy@gmail.com>\n"
 "Language-Team: Belarusian <i18n-bel-gnome@googlegroups.com>\n"
 "Language: be\n"
@@ -84,15 +84,15 @@ msgstr "Адлюстроўваць вокны як"
 msgid "Show only windows in the current workspace"
 msgstr "Паказваць вокны толькі з бягучай працоўная прасторы"

-#: extensions/apps-menu/extension.js:41
+#: extensions/apps-menu/extension.js:38
 msgid "Activities Overview"
 msgstr "Агляд заняткаў"

-#: extensions/apps-menu/extension.js:141
+#: extensions/apps-menu/extension.js:109
 msgid "Favorites"
 msgstr "Упадабаныя"

-#: extensions/apps-menu/extension.js:436
+#: extensions/apps-menu/extension.js:266
 msgid "Applications"
 msgstr "Праграмы"

@@ -129,19 +129,18 @@ msgstr "Стварыць новае правіла адпаведнасці"
 msgid "Add"
 msgstr "Дадаць"

-#. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:107
+#: extensions/drive-menu/extension.js:106
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "Не ўдалося выняць прывод \"%s\":"

-#: extensions/drive-menu/extension.js:125
+#: extensions/drive-menu/extension.js:124
 msgid "Removable devices"
 msgstr "Зменныя прыстасаванні"

-#: extensions/drive-menu/extension.js:150
-msgid "Open Files"
-msgstr "Адкрыць файлы"
+#: extensions/drive-menu/extension.js:149
+msgid "Open File"
+msgstr "Адкрыць файл"

 #: extensions/example/extension.js:17
 msgid "Hello, world!"
@@ -209,26 +208,21 @@ msgstr ""
 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
+#: extensions/places-menu/placeDisplay.js:59
 #, javascript-format
 msgid "Failed to launch “%s”"
 msgstr "Не ўдалося запусціць \"%s\""

-#: extensions/places-menu/placeDisplay.js:137
-#: extensions/places-menu/placeDisplay.js:160
+#: extensions/places-menu/placeDisplay.js:101
+#: extensions/places-menu/placeDisplay.js:124
 msgid "Computer"
 msgstr "Камп'ютар"

-#: extensions/places-menu/placeDisplay.js:303
+#: extensions/places-menu/placeDisplay.js:267
 msgid "Home"
 msgstr "Дамашняя папка"

-#: extensions/places-menu/placeDisplay.js:347
+#: extensions/places-menu/placeDisplay.js:311
 msgid "Browse Network"
 msgstr "Агляд сеткі"

@@ -236,10 +230,6 @@ msgstr "Агляд сеткі"
 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 "Імя матыву аздаблення"
@@ -253,48 +243,48 @@ msgstr ""
 msgid "Close"
 msgstr "Закрыць"

-#: extensions/window-list/extension.js:129
+#: extensions/window-list/extension.js:120
 msgid "Unminimize"
 msgstr "Скасаваць мінімалізацыю"

-#: extensions/window-list/extension.js:130
+#: extensions/window-list/extension.js:121
 msgid "Minimize"
 msgstr "Мінімалізаваць"

-#: extensions/window-list/extension.js:136
+#: extensions/window-list/extension.js:127
 msgid "Unmaximize"
 msgstr "Скасаваць максімалізацыю"

-#: extensions/window-list/extension.js:137
+#: extensions/window-list/extension.js:128
 msgid "Maximize"
 msgstr "Максімалізаваць"

-#: extensions/window-list/extension.js:420
+#: extensions/window-list/extension.js:411
 msgid "Minimize all"
 msgstr "Мінімалізаваць усе"

-#: extensions/window-list/extension.js:428
+#: extensions/window-list/extension.js:419
 msgid "Unminimize all"
 msgstr "Скасаваць мінімалізацыю для ўсіх"

-#: extensions/window-list/extension.js:436
+#: extensions/window-list/extension.js:427
 msgid "Maximize all"
 msgstr "Максімалізаваць усе"

-#: extensions/window-list/extension.js:445
+#: extensions/window-list/extension.js:436
 msgid "Unmaximize all"
 msgstr "Скасаваць максімалізацыю для ўсіх"

-#: extensions/window-list/extension.js:454
+#: extensions/window-list/extension.js:445
 msgid "Close all"
 msgstr "Закрыць усе"

-#: extensions/window-list/extension.js:678
+#: extensions/window-list/extension.js:669
 #: extensions/workspace-indicator/extension.js:30
 msgid "Workspace Indicator"
 msgstr "Індыкатар працоўнай прасторы"

-#: extensions/window-list/extension.js:842
+#: extensions/window-list/extension.js:833
 msgid "Window List"
 msgstr "Спіс вокнаў"

--- a/po/bg.po
+++ b/po/bg.po
@@ -1,359 +1,345 @@
-# Bulgarian translation for gnome-shell-extensions po-file.
-# Copyright (C) 2014, 2015, 2017 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gnome-shell-extensions package.
-# Ivaylo Valkov <ivaylo@e-valkov.org>, 2014.
-# Alexander Shopov <ash@kambanaria.org>, 2014, 2015.
-# Lyubomir Vasilev <lyubomirv@abv.bg>, 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-09-09 15:20+0000\n"
-"PO-Revision-Date: 2017-09-08 08:47+0300\n"
-"Last-Translator: Lyubomir Vasilev <lyubomirv@abv.bg>\n"
-"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
-"Language: bg\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"
-
-#: 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 (2.x)"
-
-#: 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."
-
-#: 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."
-
-#: 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“ file name), следван от знака „:“ и номер на работен плот"
-
-#: 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 ""
-"Това е пример за добре работещо разширение на обвивката на GNOME и има "
-"минимална функционалност.\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 ""
-"Ако е истина, заглавията на прозорците се поставят над мини изображенията "
-"им, а не както е стандартно — отдолу. За прилагане на промяната на "
-"настройката трябва да рестартирате обвивката на GNOME."
-
-#: 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"
+# Bulgarian translation for gnome-shell-extensions po-file.
+# Copyright (C) 2014, 2015 Free Software Foundation, Inc.
+# This file is distributed under the same license as the gnome-shell-extensions package.
+# Ivaylo Valkov <ivaylo@e-valkov.org>, 2014.
+# Alexander Shopov <ash@kambanaria.org>, 2014, 2015.
+msgid ""
+msgstr ""
+"Project-Id-Version: gnome-shell-extensions master\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-09 21:10+0200\n"
+"PO-Revision-Date: 2015-03-09 21:10+0200\n"
+"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
+"Language: bg\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"
+
+#: ../data/gnome-classic.desktop.in.h:1
+#: ../data/gnome-classic.session.desktop.in.in.h:1
+msgid "GNOME Classic"
+msgstr "Класически GNOME"
+
+#: ../data/gnome-classic.desktop.in.h:2
+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"
+msgstr "Прикрепяне на модалните прозорци към родителските им прозорци"
+
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:2
+msgid ""
+"This key overrides the key in org.gnome.mutter when running GNOME Shell."
+msgstr ""
+"Този ключ при е с по-голям приоритет от „org.gnome.mutter“ при изпълнението "
+"на обвивката на GNOME."
+
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:3
+msgid "Arrangement of buttons on the titlebar"
+msgstr "Подредба на бутоните на заглавната лента"
+
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:4
+msgid ""
+"This key overrides the key in org.gnome.desktop.wm.preferences when running "
+"GNOME Shell."
+msgstr ""
+"Този ключ при е с по-голям приоритет от „org.gnome.desktop.wm.preferences“ "
+"при изпълнението на обвивката на GNOME."
+
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:5
+msgid "Enable edge tiling when dropping windows on screen edges"
+msgstr ""
+"Включване на специална подредба при приближаване на прозорец до ръбовете на "
+"екрана"
+
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:6
+msgid "Workspaces only on primary monitor"
+msgstr "Работни плотове само на основния екран"
+
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:7
+msgid "Delay focus changes in mouse mode until the pointer stops moving"
+msgstr "Забавяне на смяната на фокуса до спирането на движението на показалеца"
+
+#: ../extensions/alternate-tab/prefs.js:20
+msgid "Thumbnail only"
+msgstr "Само миниатюри"
+
+#: ../extensions/alternate-tab/prefs.js:21
+msgid "Application icon only"
+msgstr "Само икони на приложенията"
+
+#: ../extensions/alternate-tab/prefs.js:22
+msgid "Thumbnail and application icon"
+msgstr "Миниатюри и икони на приложенията"
+
+#: ../extensions/alternate-tab/prefs.js:38
+msgid "Present windows as"
+msgstr "Показване на прозорците като"
+
+#: ../extensions/alternate-tab/prefs.js:69
+msgid "Show only windows in the current workspace"
+msgstr "Да се показват само прозорците на текущия работен плот"
+
+#: ../extensions/apps-menu/extension.js:39
+msgid "Activities Overview"
+msgstr "Показване на програмите"
+
+#: ../extensions/apps-menu/extension.js:110
+msgid "Favorites"
+msgstr "Любими"
+
+#: ../extensions/apps-menu/extension.js:279
+msgid "Applications"
+msgstr "Програми"
+
+#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:1
+msgid "Application and workspace list"
+msgstr "Списък с програмите и работните плотове"
+
+#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
+msgid ""
+"A list of strings, each containing an application id (desktop file name), "
+"followed by a colon and the workspace number"
+msgstr ""
+"Списък от низове. Всеки съдържа идентификатор на програма (име на файл „."
+"desktop“ file name), следван от знака „:“ и номер на работен плот"
+
+#: ../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 "Добавяне"
+
+#: ../extensions/drive-menu/extension.js:106
+#, javascript-format
+msgid "Ejecting drive '%s' failed:"
+msgstr "Неуспешно изваждане на устройство „%s“:"
+
+#: ../extensions/drive-menu/extension.js:124
+msgid "Removable devices"
+msgstr "Преносими медии"
+
+#: ../extensions/drive-menu/extension.js:151
+msgid "Open File"
+msgstr "Отваряне на файл"
+
+#: ../extensions/example/extension.js:17
+msgid "Hello, world!"
+msgstr "Здравей, свят!"
+
+#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:1
+msgid "Alternative greeting text."
+msgstr "Друго приветстващо съобщение."
+
+#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:2
+msgid ""
+"If not empty, it contains the text that will be shown when clicking on the "
+"panel."
+msgstr ""
+"Ако ключът не е празен, съдържанието му се извежда при натискането на панела."
+
+#: ../extensions/example/prefs.js:30
+msgid "Message"
+msgstr "Съобщение"
+
+#. 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 ""
+"Това е пример за добре работещо разширение на обвивката на GNOME и има "
+"минимална функционалност.\n"
+"С него можете да промените приветстващото съобщение на панела."
+
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:1
+msgid "Use more screen for windows"
+msgstr "Повече пространство за прозорците"
+
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:2
+msgid ""
+"Try to use more screen for placing window thumbnails by adapting to screen "
+"aspect ratio, and consolidating them further to reduce the bounding box. "
+"This setting applies only with the natural placement strategy."
+msgstr ""
+"Използване на по-голяма част от екрана за поставянето на мини изображения "
+"чрез промяна на съотношението на страните и допълнително обединяване за "
+"смаляване на обхващащия ги правоъгълник. Тази настройка се прилага само при "
+"естествената стратегия за поставяне на прозорците."
+
+#: ../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 ""
+"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 ""
+"Ако е истина, заглавията на прозорците се поставят над мини изображенията "
+"им, а не както е стандартно — отдолу. За прилагане на промяната на "
+"настройката трябва да рестартирате обвивката на GNOME."
+
+#: ../extensions/places-menu/extension.js:78
+#: ../extensions/places-menu/extension.js:81
+msgid "Places"
+msgstr "Места"
+
+#: ../extensions/places-menu/placeDisplay.js:57
+#, javascript-format
+msgid "Failed to launch \"%s\""
+msgstr "Неуспешно стартиране на „%s“"
+
+#: ../extensions/places-menu/placeDisplay.js:99
+#: ../extensions/places-menu/placeDisplay.js:122
+msgid "Computer"
+msgstr "Компютър"
+
+#: ../extensions/places-menu/placeDisplay.js:200
+msgid "Home"
+msgstr "Домашна папка"
+
+#: ../extensions/places-menu/placeDisplay.js:287
+msgid "Browse Network"
+msgstr "Мрежа"
+
+#: ../extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml.in.h:1
+msgid "Cycle Screenshot Sizes"
+msgstr "Смяна на размера на снимката на екрана"
+
+#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:1
+msgid "Theme name"
+msgstr "Име на темата"
+
+#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:2
+msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
+msgstr ""
+"Името на темата, която да бъде заредена от „~/.themes/name/gnome-shell“"
+
+#: ../extensions/window-list/extension.js:109
+msgid "Close"
+msgstr "Затваряне"
+
+#: ../extensions/window-list/extension.js:119
+msgid "Unminimize"
+msgstr "Деминимизиране"
+
+#: ../extensions/window-list/extension.js:120
+msgid "Minimize"
+msgstr "Минимизиране"
+
+#: ../extensions/window-list/extension.js:126
+msgid "Unmaximize"
+msgstr "Демаксимизиране"
+
+#: ../extensions/window-list/extension.js:127
+msgid "Maximize"
+msgstr "Максимизиране"
+
+#: ../extensions/window-list/extension.js:399
+msgid "Minimize all"
+msgstr "Минимизиране на всички"
+
+#: ../extensions/window-list/extension.js:407
+msgid "Unminimize all"
+msgstr "Деминимизиране на всички"
+
+#: ../extensions/window-list/extension.js:415
+msgid "Maximize all"
+msgstr "Максимизиране на всички"
+
+#: ../extensions/window-list/extension.js:424
+msgid "Unmaximize all"
+msgstr "Демаксимизиране на всички"
+
+#: ../extensions/window-list/extension.js:433
+msgid "Close all"
+msgstr "Затваряне на всички"
+
+#: ../extensions/window-list/extension.js:650
+#: ../extensions/workspace-indicator/extension.js:30
+msgid "Workspace Indicator"
+msgstr "Индикатор на работните плотове"
+
+#: ../extensions/window-list/extension.js:807
+msgid "Window List"
+msgstr "Списък на прозорците"
+
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:1
+msgid "When to group windows"
+msgstr "Кога да се групират прозорците"
+
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:2
+msgid ""
+"Decides when to group windows from the same application on the window list. "
+"Possible values are \"never\", \"auto\" and \"always\"."
+msgstr ""
+"Кога да се групират прозорците на една програма в списъка с прозорците. "
+"Възможните стойности са „never“ (никога), „auto“ (автоматично) и "
+"„always“ (винаги)."
+
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:3
+msgid "Show the window list on all monitors"
+msgstr "Извеждане на списъка с прозорци на всички монитори"
+
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:4
+msgid ""
+"Whether to show the window list on all connected monitors or only on the "
+"primary one."
+msgstr ""
+"Дали списъкът с прозорци да се извежда на всички монитори или само на "
+"основния"
+
+#: ../extensions/window-list/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"
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,45 +7,34 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"Report-Msgid-Bugs-To: http://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-07-08 13:29+0100\n"
-"Last-Translator: Jordi Mas <jmas@softcatala.org>\n"
+"POT-Creation-Date: 2017-03-04 10:07+0100\n"
+"PO-Revision-Date: 2014-08-17 14:38+0200\n"
+"Last-Translator: Gil Forcada <gilforcada@guifi.net>\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: 8bit\n"
+"Content-Transfer-Encoding: 8bits\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"

-#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
-msgid "GNOME Classic"
-msgstr "GNOME clàssic"
-
-#: 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:7
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.h:1
 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: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
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.h:2
 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:16
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.h:3
 msgid "Arrangement of buttons on the titlebar"
 msgstr "Disposició dels botons en la barra de títol"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:17
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.h:4
 msgid ""
 "This key overrides the key in org.gnome.desktop.wm.preferences when running "
 "GNOME Shell."
@@ -53,58 +42,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:24
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.h:5
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr ""
-"Habilita la tessel·lització a les vores en deixar anar les finestres a les "
+"Habilita la tesselització a les vores en deixar anar les finestres a les "
 "vores de la pantalla"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:32
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.h:6
 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:40
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.h:7
 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:41
+#: ../extensions/apps-menu/extension.js:38
 msgid "Activities Overview"
 msgstr "Vista general d'activitats"

-#: extensions/apps-menu/extension.js:141
+#: ../extensions/apps-menu/extension.js:109
 msgid "Favorites"
 msgstr "Preferides"

-#: extensions/apps-menu/extension.js:436
+#: ../extensions/apps-menu/extension.js:266
 msgid "Applications"
 msgstr "Aplicacions"

-#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
+#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.h:1
 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:7
+#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.h:2
 msgid ""
 "A list of strings, each containing an application id (desktop file name), "
 "followed by a colon and the workspace number"
@@ -113,63 +102,62 @@ 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:127
+#: ../extensions/auto-move-windows/prefs.js:69
+#: ../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"

-#. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:107
+#: ../extensions/drive-menu/extension.js:106
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "Ha fallat l'expulsió de la unitat «%s»:"

-#: extensions/drive-menu/extension.js:125
+#: ../extensions/drive-menu/extension.js:124
 msgid "Removable devices"
 msgstr "Dispositius extraïbles"

-#: extensions/drive-menu/extension.js:150
-msgid "Open Files"
-msgstr "Obre els fitxers"
+#: ../extensions/drive-menu/extension.js:149
+msgid "Open File"
+msgstr "Obre el fitxer"

-#: 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:5
+#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.h:1
 msgid "Alternative greeting text."
 msgstr "Text de rebuda alternatiu."

-#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:6
+#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.h:2
 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"
@@ -180,11 +168,11 @@ msgstr ""
 "gairebé res.\n"
 "Tot i així permet personalitzar el missatge de benvinguda."

-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.h:1
 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:6
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.h:2
 msgid ""
 "Try to use more screen for placing window thumbnails by adapting to screen "
 "aspect ratio, and consolidating them further to reduce the bounding box. "
@@ -196,11 +184,11 @@ msgstr ""
 "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:11
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.h:3
 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:12
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.h:4
 msgid ""
 "If true, place window captions on top the respective thumbnail, overriding "
 "shell default of placing it at the bottom. Changing this setting requires "
@@ -208,107 +196,98 @@ 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 que aquest canvi tingui "
-"efecte."
+"posicionar-lo a baix. Cal reiniciar el Shell per tal que aquest canvi "
+"tingui efecte."

-#: extensions/places-menu/extension.js:78
-#: extensions/places-menu/extension.js:81
+#: ../extensions/places-menu/extension.js:78
+#: ../extensions/places-menu/extension.js:81
 msgid "Places"
 msgstr "Llocs"

-#: extensions/places-menu/placeDisplay.js:65
-#, javascript-format
-msgid "Failed to mount volume for “%s”"
-msgstr "No s'ha pogut muntar el volum «%s»"
-
-#: extensions/places-menu/placeDisplay.js:78
+#: ../extensions/places-menu/placeDisplay.js:59
 #, javascript-format
 msgid "Failed to launch “%s”"
 msgstr "No s'ha pogut iniciar «%s»"

-#: extensions/places-menu/placeDisplay.js:137
-#: extensions/places-menu/placeDisplay.js:160
+#: ../extensions/places-menu/placeDisplay.js:101
+#: ../extensions/places-menu/placeDisplay.js:124
 msgid "Computer"
 msgstr "Ordinador"

-#: extensions/places-menu/placeDisplay.js:303
+#: ../extensions/places-menu/placeDisplay.js:267
 msgid "Home"
 msgstr "Inici"

-#: extensions/places-menu/placeDisplay.js:347
+#: ../extensions/places-menu/placeDisplay.js:311
 msgid "Browse Network"
 msgstr "Navega per la xarxa"

-#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
+#: ../extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml.h:1
 msgid "Cycle Screenshot Sizes"
 msgstr "Mostra cíclicament mides de captura de pantalla"

-#: 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
+#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.h:1
 msgid "Theme name"
 msgstr "Nom del tema"

-#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:6
+#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.h:2
 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:110
+#: ../extensions/window-list/extension.js:110
 msgid "Close"
 msgstr "Tanca"

-#: extensions/window-list/extension.js:129
+#: ../extensions/window-list/extension.js:120
 msgid "Unminimize"
 msgstr "Desminimitza"

-#: extensions/window-list/extension.js:130
+#: ../extensions/window-list/extension.js:121
 msgid "Minimize"
 msgstr "Minimitza"

-#: extensions/window-list/extension.js:136
+#: ../extensions/window-list/extension.js:127
 msgid "Unmaximize"
 msgstr "Desmaximitza"

-#: extensions/window-list/extension.js:137
+#: ../extensions/window-list/extension.js:128
 msgid "Maximize"
 msgstr "Maximitza"

-#: extensions/window-list/extension.js:420
+#: ../extensions/window-list/extension.js:411
 msgid "Minimize all"
 msgstr "Minimitza-ho tot"

-#: extensions/window-list/extension.js:428
+#: ../extensions/window-list/extension.js:419
 msgid "Unminimize all"
 msgstr "Desminimitza-ho tot"

-#: extensions/window-list/extension.js:436
+#: ../extensions/window-list/extension.js:427
 msgid "Maximize all"
 msgstr "Maximitza-ho tot"

-#: extensions/window-list/extension.js:445
+#: ../extensions/window-list/extension.js:436
 msgid "Unmaximize all"
 msgstr "Desmaximitza-ho tot"

-#: extensions/window-list/extension.js:454
+#: ../extensions/window-list/extension.js:445
 msgid "Close all"
 msgstr "Tanca-ho tot"

-#: extensions/window-list/extension.js:678
-#: extensions/workspace-indicator/extension.js:30
+#: ../extensions/window-list/extension.js:669
+#: ../extensions/workspace-indicator/extension.js:30
 msgid "Workspace Indicator"
 msgstr "Indicador de l'espai de treball"

-#: extensions/window-list/extension.js:842
+#: ../extensions/window-list/extension.js:833
 msgid "Window List"
 msgstr "Llista de finestres"

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:12
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.h:1
 msgid "When to group windows"
 msgstr "Quan s'han d'agrupar les finestres"

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.h:2
 msgid ""
 "Decides when to group windows from the same application on the window list. "
 "Possible values are “never”, “auto” and “always”."
@@ -317,11 +296,11 @@ msgstr ""
 "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:20
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.h:3
 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:21
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.h:4
 msgid ""
 "Whether to show the window list on all connected monitors or only on the "
 "primary one."
@@ -329,39 +308,45 @@ 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"

+#~ msgid "GNOME Classic"
+#~ msgstr "GNOME clàssic"
+
+#~ msgid "This session logs you into GNOME Classic"
+#~ msgstr "Aquesta sessió us permet utilitzar el GNOME clàssic"
+
 #~ msgid "GNOME Shell Classic"
 #~ msgstr "GNOME Shell clàssic"

--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
@@ -7,45 +7,50 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions\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-09-08 06:09+0000\n"
-"PO-Revision-Date: 2017-07-08 13:29+0100\n"
-"Last-Translator: Xavi Ivars <xavi.ivars@gmail.com>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-08-17 14:40+0200\n"
+"PO-Revision-Date: 2014-08-17 14:38+0200\n"
+"Last-Translator: Gil Forcada <gilforcada@guifi.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
-"Language: ca-valencia\n"
+"Language: ca@valencia\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8bits\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"

-#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
+#: ../data/gnome-classic.desktop.in.h:1
+#: ../data/gnome-classic.session.desktop.in.in.h:1
 msgid "GNOME Classic"
 msgstr "GNOME clàssic"

-#: data/gnome-classic.desktop.in:4
+#: ../data/gnome-classic.desktop.in.h:2
 msgid "This session logs you into GNOME Classic"
 msgstr "Esta sessió vos permet utilitzar el GNOME clàssic"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:7
+#: ../data/gnome-shell-classic.desktop.in.in.h:1
+msgid "GNOME Shell Classic"
+msgstr "GNOME Shell clàssic"
+
+#: ../data/gnome-shell-classic.desktop.in.in.h:2
+msgid "Window management and application launching"
+msgstr "Gestió de finestres i iniciació d'aplicacions"
+
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:1
 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: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
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:2
 msgid ""
 "This key overrides the key in org.gnome.mutter when running GNOME Shell."
 msgstr ""
 "Si s'executa el GNOME Shell, esta clau sobreescriu la clau «org.gnome."
 "mutter»."

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:3
 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 títol"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:17
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:4
 msgid ""
 "This key overrides the key in org.gnome.desktop.wm.preferences when running "
 "GNOME Shell."
@@ -53,58 +58,58 @@ msgstr ""
 "Si s'executa el GNOME Shell, esta clau sobreescriu la clau «org.gnome."
 "desktop.wm.preferences»."

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:24
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:5
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr ""
-"Habilita la tessel·lització a les vores en deixar anar les finestres a les "
+"Habilita la tesselització a les vores en deixar anar les finestres a les "
 "vores de la pantalla"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:32
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:6
 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:40
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:7
 msgid "Delay focus changes in mouse mode until the pointer stops moving"
 msgstr ""
 "Retarda el canvi de focus, en mode ratolí, fins que el punter estiga 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:41
+#: ../extensions/apps-menu/extension.js:39
 msgid "Activities Overview"
 msgstr "Vista general d'activitats"

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

-#: extensions/apps-menu/extension.js:436
+#: ../extensions/apps-menu/extension.js:282
 msgid "Applications"
 msgstr "Aplicacions"

-#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
+#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:1
 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:7
+#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
 msgid ""
 "A list of strings, each containing an application id (desktop file name), "
 "followed by a colon and the workspace number"
@@ -113,94 +118,90 @@ 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:127
+#: ../extensions/auto-move-windows/prefs.js:69
+#: ../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 "Afig 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 "Afig"

-#. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:107
+#: ../extensions/drive-menu/extension.js:106
 #, 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:125
+#: ../extensions/drive-menu/extension.js:123
 msgid "Removable devices"
 msgstr "Dispositius extraïbles"

-#: extensions/drive-menu/extension.js:150
-msgid "Open Files"
-msgstr "Obri els fitxers"
+#: ../extensions/drive-menu/extension.js:150
+msgid "Open File"
+msgstr "Obri el fitxer"

-#: 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:5
+#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:1
 msgid "Alternative greeting text."
 msgstr "Text de rebuda alternatiu."

-#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:6
+#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:2
 msgid ""
 "If not empty, it contains the text that will be shown when clicking on the "
 "panel."
 msgstr ""
 "Si no és buit, conté el text que es mostrarà quan es faça 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 de benvinguda."
+"Tot i així permet personalitzar el missatge del rebedor."

-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:1
 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:6
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:2
 msgid ""
 "Try to use more screen for placing window thumbnails by adapting to screen "
 "aspect ratio, and consolidating them further to reduce the bounding box. "
 "This setting applies only with the natural placement strategy."
 msgstr ""
 "Intenta utilitzar més espai de la pantalla per posicionar les miniatures de "
-"les finestres adaptant-les a la ràtio d'aspecte de la pantalla, consolidant-"
-"les més per reduir la capsa que les envolta. Este paràmetre de "
-"configuració només s'aplica a l'estratègia de posicionament de finestres "
-"natural."
+"les finestres adaptant-les al ràtio d'aspecte de la pantalla, consolidant-"
+"les més per reduir la capsa que les envolta. Este 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:11
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:3
 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:12
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:4
 msgid ""
 "If true, place window captions on top the respective thumbnail, overriding "
 "shell default of placing it at the bottom. Changing this setting requires "
@@ -208,168 +209,135 @@ 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 que este canvi tinga "
+"posicionar-lo a baix. Cal reiniciar el Shell per tal de que este canvi tinga "
 "efecte."

-#: extensions/places-menu/extension.js:78
-#: extensions/places-menu/extension.js:81
+#: ../extensions/places-menu/extension.js:78
+#: ../extensions/places-menu/extension.js:81
 msgid "Places"
 msgstr "Llocs"

-#: extensions/places-menu/placeDisplay.js:65
+#: ../extensions/places-menu/placeDisplay.js:57
 #, javascript-format
-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”"
+msgid "Failed to launch \"%s\""
 msgstr "No s'ha pogut iniciar «%s»"

-#: extensions/places-menu/placeDisplay.js:137
-#: extensions/places-menu/placeDisplay.js:160
+#: ../extensions/places-menu/placeDisplay.js:99
+#: ../extensions/places-menu/placeDisplay.js:122
 msgid "Computer"
 msgstr "Ordinador"

-#: extensions/places-menu/placeDisplay.js:303
+#: ../extensions/places-menu/placeDisplay.js:200
 msgid "Home"
 msgstr "Inici"

-#: extensions/places-menu/placeDisplay.js:347
+#: ../extensions/places-menu/placeDisplay.js:287
 msgid "Browse Network"
 msgstr "Navega per la xarxa"

-#: 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/systemMonitor/extension.js:214
+msgid "CPU"
+msgstr "CPU"

-#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
-msgid "Cycle Screenshot Sizes Backward"
-msgstr "Mostra cíclicament cap arrere mides de captura de pantalla"
+#: ../extensions/systemMonitor/extension.js:267
+msgid "Memory"
+msgstr "Memòria"

-#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
+#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:1
 msgid "Theme name"
 msgstr "Nom del tema"

-#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:6
+#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:2
 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:110
+#: ../extensions/window-list/extension.js:110
 msgid "Close"
 msgstr "Tanca"

-#: extensions/window-list/extension.js:129
+#: ../extensions/window-list/extension.js:120
 msgid "Unminimize"
 msgstr "Desminimitza"

-#: extensions/window-list/extension.js:130
+#: ../extensions/window-list/extension.js:121
 msgid "Minimize"
 msgstr "Minimitza"

-#: extensions/window-list/extension.js:136
+#: ../extensions/window-list/extension.js:127
 msgid "Unmaximize"
 msgstr "Desmaximitza"

-#: extensions/window-list/extension.js:137
+#: ../extensions/window-list/extension.js:128
 msgid "Maximize"
 msgstr "Maximitza"

-#: extensions/window-list/extension.js:420
+#: ../extensions/window-list/extension.js:300
 msgid "Minimize all"
 msgstr "Minimitza-ho tot"

-#: extensions/window-list/extension.js:428
+#: ../extensions/window-list/extension.js:308
 msgid "Unminimize all"
 msgstr "Desminimitza-ho tot"

-#: extensions/window-list/extension.js:436
+#: ../extensions/window-list/extension.js:316
 msgid "Maximize all"
 msgstr "Maximitza-ho tot"

-#: extensions/window-list/extension.js:445
+#: ../extensions/window-list/extension.js:325
 msgid "Unmaximize all"
 msgstr "Desmaximitza-ho tot"

-#: extensions/window-list/extension.js:454
+#: ../extensions/window-list/extension.js:334
 msgid "Close all"
 msgstr "Tanca-ho tot"

-#: extensions/window-list/extension.js:678
-#: extensions/workspace-indicator/extension.js:30
+#: ../extensions/window-list/extension.js:644
+#: ../extensions/workspace-indicator/extension.js:30
 msgid "Workspace Indicator"
 msgstr "Indicador de l'espai de treball"

-#: extensions/window-list/extension.js:842
+#: ../extensions/window-list/extension.js:798
 msgid "Window List"
 msgstr "Llista de finestres"

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:12
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:1
 msgid "When to group windows"
 msgstr "Quan s'han d'agrupar les finestres"

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:2
 msgid ""
 "Decides when to group windows from the same application on the window list. "
-"Possible values are “never”, “auto” and “always”."
+"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: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:21
-msgid ""
-"Whether to show the window list on all connected monitors or only on the "
-"primary one."
-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:30
 msgid "Window Grouping"
 msgstr "Agrupació de finestres"

-#: extensions/window-list/prefs.js:50
+#: ../extensions/window-list/prefs.js:49
 msgid "Never group windows"
 msgstr "Mai agrupes les finestres"

-#: extensions/window-list/prefs.js:51
+#: ../extensions/window-list/prefs.js:50
 msgid "Group windows when space is limited"
 msgstr "Agrupa les finestres quan l'espai estiga limitat"

-#: extensions/window-list/prefs.js:52
+#: ../extensions/window-list/prefs.js:51
 msgid "Always group windows"
 msgstr "Agrupa les finestres sempre"

-#: 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"
-
-#~ msgid "GNOME Shell Classic"
-#~ msgstr "GNOME Shell clàssic"
-
-#~ msgid "Window management and application launching"
-#~ msgstr "Gestió de finestres i iniciació d'aplicacions"
-
-#~ msgid "CPU"
-#~ msgstr "CPU"
-
-#~ msgid "Memory"
-#~ msgstr "Memòria"
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,11 +6,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-shell-extensions\n"
+"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-07-05 15:07+0000\n"
-"PO-Revision-Date: 2017-07-10 16:48+0200\n"
+"POT-Creation-Date: 2017-02-22 18:40+0000\n"
+"PO-Revision-Date: 2017-03-08 17:42+0100\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
@@ -84,15 +84,15 @@ msgstr "Představovat okna jako"
 msgid "Show only windows in the current workspace"
 msgstr "Zobrazovat pouze okna z aktuální pracovní plochy"

-#: extensions/apps-menu/extension.js:41
+#: extensions/apps-menu/extension.js:38
 msgid "Activities Overview"
 msgstr "Přehled činností"

-#: extensions/apps-menu/extension.js:141
+#: extensions/apps-menu/extension.js:109
 msgid "Favorites"
 msgstr "Oblíbené"

-#: extensions/apps-menu/extension.js:436
+#: extensions/apps-menu/extension.js:266
 msgid "Applications"
 msgstr "Aplikace"

@@ -139,8 +139,8 @@ msgid "Removable devices"
 msgstr "Výměnná zařízení"

 #: extensions/drive-menu/extension.js:149
-msgid "Open Files"
-msgstr "Otevřít soubory"
+msgid "Open File"
+msgstr "Otevřít soubor"

 #: extensions/example/extension.js:17
 msgid "Hello, world!"
@@ -206,26 +206,21 @@ msgstr ""
 msgid "Places"
 msgstr "Místa"

-#: extensions/places-menu/placeDisplay.js:65
-#, javascript-format
-msgid "Failed to mount volume for “%s”"
-msgstr "Selhalo připojení svazku pro „%s“"
-
-#: extensions/places-menu/placeDisplay.js:78
+#: extensions/places-menu/placeDisplay.js:59
 #, javascript-format
 msgid "Failed to launch “%s”"
 msgstr "Selhalo spuštění „%s“"

-#: extensions/places-menu/placeDisplay.js:137
-#: extensions/places-menu/placeDisplay.js:160
+#: extensions/places-menu/placeDisplay.js:101
+#: extensions/places-menu/placeDisplay.js:124
 msgid "Computer"
 msgstr "Počítač"

-#: extensions/places-menu/placeDisplay.js:303
+#: extensions/places-menu/placeDisplay.js:267
 msgid "Home"
 msgstr "Domů"

-#: extensions/places-menu/placeDisplay.js:347
+#: extensions/places-menu/placeDisplay.js:311
 msgid "Browse Network"
 msgstr "Procházet síť"

@@ -233,10 +228,6 @@ msgstr "Procházet síť"
 msgid "Cycle Screenshot Sizes"
 msgstr "Mění velikost pro snímky obrazovky"

-#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
-msgid "Cycle Screenshot Sizes Backward"
-msgstr "Mění pozpátku velikost pro snímky obrazovky"
-
 #: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
 msgstr "Název motivu"
@@ -249,48 +240,48 @@ msgstr "Název motivu, který se má načíst z ~/.themes/name/gnome-shell"
 msgid "Close"
 msgstr "Zavřít"

-#: extensions/window-list/extension.js:129
+#: extensions/window-list/extension.js:120
 msgid "Unminimize"
 msgstr "Zrušit minimalizaci"

-#: extensions/window-list/extension.js:130
+#: extensions/window-list/extension.js:121
 msgid "Minimize"
 msgstr "Minimalizovat"

-#: extensions/window-list/extension.js:136
+#: extensions/window-list/extension.js:127
 msgid "Unmaximize"
 msgstr "Zrušit maximalizaci"

-#: extensions/window-list/extension.js:137
+#: extensions/window-list/extension.js:128
 msgid "Maximize"
 msgstr "Maximalizovat"

-#: extensions/window-list/extension.js:420
+#: extensions/window-list/extension.js:411
 msgid "Minimize all"
 msgstr "Minimalizovat všechna"

-#: extensions/window-list/extension.js:428
+#: extensions/window-list/extension.js:419
 msgid "Unminimize all"
 msgstr "Zrušit minimalizaci všech"

-#: extensions/window-list/extension.js:436
+#: extensions/window-list/extension.js:427
 msgid "Maximize all"
 msgstr "Maximalizovat všechna"

-#: extensions/window-list/extension.js:445
+#: extensions/window-list/extension.js:436
 msgid "Unmaximize all"
 msgstr "Zrušit maximalizaci všech"

-#: extensions/window-list/extension.js:454
+#: extensions/window-list/extension.js:445
 msgid "Close all"
 msgstr "Zavřít všechna"

-#: extensions/window-list/extension.js:678
+#: extensions/window-list/extension.js:669
 #: extensions/workspace-indicator/extension.js:30
 msgid "Workspace Indicator"
 msgstr "Ukazatel pracovní plochy"

-#: extensions/window-list/extension.js:842
+#: extensions/window-list/extension.js:833
 msgid "Window List"
 msgstr "Seznam oken"

@@ -350,3 +341,4 @@ msgstr "Název"
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Pracovní plocha %d"
+
--- a/po/da.po
+++ b/po/da.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the gnome-shell-extensions package.
 #
 # Kris Thomsen <mail@kristhomsen.dk>, 2011-2014.
-# Ask Hjorth Larsen <asklarsen@gmail.com>, 2015, 2017.
+# Ask Hjorth Larsen <asklarsen@gmail.com>, 2015.
 # Joe Hansen <joedalton2@yahoo.dk>, 2017.
 #
 msgid ""
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2017-08-11 01:33+0000\n"
-"PO-Revision-Date: 2017-09-10 17:13+0200\n"
+"POT-Creation-Date: 2017-02-22 18:40+0000\n"
+"PO-Revision-Date: 2017-03-05 02:26+0100\n"
 "Last-Translator: Kris Thomsen <mail@kristhomsen.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
@@ -88,15 +88,15 @@ msgstr "Præsentér vindue som"
 msgid "Show only windows in the current workspace"
 msgstr "Vis kun vinduer i det nuværende arbejdsområde"

-#: extensions/apps-menu/extension.js:41
+#: extensions/apps-menu/extension.js:38
 msgid "Activities Overview"
 msgstr "Aktivitetsoversigt"

-#: extensions/apps-menu/extension.js:141
+#: extensions/apps-menu/extension.js:109
 msgid "Favorites"
 msgstr "Favoritter"

-#: extensions/apps-menu/extension.js:436
+#: extensions/apps-menu/extension.js:266
 msgid "Applications"
 msgstr "Programmer"

@@ -133,19 +133,18 @@ msgstr "Opret ny regel for match"
 msgid "Add"
 msgstr "Tilføj"

-#. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:107
+#: extensions/drive-menu/extension.js:106
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "Udskubning af drevet “%s” mislykkedes:"

-#: extensions/drive-menu/extension.js:125
+#: extensions/drive-menu/extension.js:124
 msgid "Removable devices"
 msgstr "Flytbare enheder"

-#: extensions/drive-menu/extension.js:150
-msgid "Open Files"
-msgstr "Åbn filer"
+#: extensions/drive-menu/extension.js:149
+msgid "Open File"
+msgstr "Åbn fil"

 #: extensions/example/extension.js:17
 msgid "Hello, world!"
@@ -215,26 +214,21 @@ msgstr ""
 msgid "Places"
 msgstr "Steder"

-#: extensions/places-menu/placeDisplay.js:65
-#, javascript-format
-msgid "Failed to mount volume for “%s”"
-msgstr "Kunne ikke montere diskenhed for “%s”"
-
-#: extensions/places-menu/placeDisplay.js:78
+#: extensions/places-menu/placeDisplay.js:59
 #, javascript-format
 msgid "Failed to launch “%s”"
 msgstr "Kunne ikke åbne “%s”"

-#: extensions/places-menu/placeDisplay.js:137
-#: extensions/places-menu/placeDisplay.js:160
+#: extensions/places-menu/placeDisplay.js:101
+#: extensions/places-menu/placeDisplay.js:124
 msgid "Computer"
 msgstr "Computer"

-#: extensions/places-menu/placeDisplay.js:303
+#: extensions/places-menu/placeDisplay.js:267
 msgid "Home"
 msgstr "Hjem"

-#: extensions/places-menu/placeDisplay.js:347
+#: extensions/places-menu/placeDisplay.js:311
 msgid "Browse Network"
 msgstr "Gennemse netværk"

@@ -242,10 +236,6 @@ msgstr "Gennemse netværk"
 msgid "Cycle Screenshot Sizes"
 msgstr "Gennemgå størrelser af skærmbillede"

-#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
-msgid "Cycle Screenshot Sizes Backward"
-msgstr "Gennemgå størrelser af skærmbillede baglæns"
-
 #: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
 msgstr "Temanavn"
@@ -258,48 +248,48 @@ msgstr "Navnet på temaet, som indlæses fra ~/.themes/name/gnome-shell"
 msgid "Close"
 msgstr "Luk"

-#: extensions/window-list/extension.js:129
+#: extensions/window-list/extension.js:120
 msgid "Unminimize"
 msgstr "Afminimér"

-#: extensions/window-list/extension.js:130
+#: extensions/window-list/extension.js:121
 msgid "Minimize"
 msgstr "Minimér"

-#: extensions/window-list/extension.js:136
+#: extensions/window-list/extension.js:127
 msgid "Unmaximize"
 msgstr "Afmaksimér"

-#: extensions/window-list/extension.js:137
+#: extensions/window-list/extension.js:128
 msgid "Maximize"
 msgstr "Maksimér"

-#: extensions/window-list/extension.js:420
+#: extensions/window-list/extension.js:411
 msgid "Minimize all"
 msgstr "Minimér"

-#: extensions/window-list/extension.js:428
+#: extensions/window-list/extension.js:419
 msgid "Unminimize all"
 msgstr "Afminimér alle"

-#: extensions/window-list/extension.js:436
+#: extensions/window-list/extension.js:427
 msgid "Maximize all"
 msgstr "Maksimér alle"

-#: extensions/window-list/extension.js:445
+#: extensions/window-list/extension.js:436
 msgid "Unmaximize all"
 msgstr "Afmaksimér alle"

-#: extensions/window-list/extension.js:454
+#: extensions/window-list/extension.js:445
 msgid "Close all"
 msgstr "Luk alle"

-#: extensions/window-list/extension.js:678
+#: extensions/window-list/extension.js:669
 #: extensions/workspace-indicator/extension.js:30
 msgid "Workspace Indicator"
 msgstr "Arbejdsområdeindikator"

-#: extensions/window-list/extension.js:842
+#: extensions/window-list/extension.js:833
 msgid "Window List"
 msgstr "Vinduesliste"

@@ -313,7 +303,8 @@ msgid ""
 "Possible values are “never”, “auto” and “always”."
 msgstr ""
 "Afgør hvornår vinduer fra samme program skal grupperes i vindueslisten. "
-"Mulige værdier er “never” (aldrig), “auto” (automatisk) og “always” (altid)."
+"Mulige værdier er “never” (aldrig), “auto” (automatisk) og “always” "
+"(altid)."

 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
 msgid "Show the window list on all monitors"
@@ -359,3 +350,4 @@ msgstr "Navn"
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Arbejdsområde %d"
+
--- a/po/de.po
+++ b/po/de.po
@@ -1,7 +1,7 @@
 # German translation for gnome-shell-extensions.
 # Copyright (C) 2011 gnome-shell-extensions's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-shell-extensions package.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2011-2013, 2017.
+# Mario Blättermann <mario.blaettermann@gmail.com>, 2011-2013.
 # Christian Kirbach <Christian.Kirbach@googlemail.com>, 2011, 2012.
 # Benjamin Steinwender <b@stbe.at>, 2013.
 # Wolfgang Stöggl <c72578@yahoo.de>, 2014.
@@ -12,16 +12,16 @@ 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-07-06 14:32+0000\n"
-"PO-Revision-Date: 2017-07-07 21:43+0200\n"
-"Last-Translator: Christian Kirbach <christian.kirbach@gmail.com>\n"
+"POT-Creation-Date: 2017-02-22 18:40+0000\n"
+"PO-Revision-Date: 2017-02-28 20:40+0100\n"
+"Last-Translator: Paul Seyfert <pseyfert@mathphys.fsk.uni-heidelberg.de>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "Language: de\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: Poedit 2.0.2\n"
+"X-Generator: Poedit 1.6.10\n"

 #: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
 msgid "GNOME Classic"
@@ -93,15 +93,15 @@ msgstr "Fenster darstellen als"
 msgid "Show only windows in the current workspace"
 msgstr "Nur Fenster der aktuellen Arbeitsfläche anzeigen"

-#: extensions/apps-menu/extension.js:41
+#: extensions/apps-menu/extension.js:38
 msgid "Activities Overview"
 msgstr "Aktivitäten-Übersicht"

-#: extensions/apps-menu/extension.js:141
+#: extensions/apps-menu/extension.js:109
 msgid "Favorites"
 msgstr "Favoriten"

-#: extensions/apps-menu/extension.js:436
+#: extensions/apps-menu/extension.js:266
 msgid "Applications"
 msgstr "Anwendungen"

@@ -149,8 +149,8 @@ msgid "Removable devices"
 msgstr "Wechseldatenträger"

 #: extensions/drive-menu/extension.js:149
-msgid "Open Files"
-msgstr "Dateien öffnen"
+msgid "Open File"
+msgstr "Datei öffnen"

 #: extensions/example/extension.js:17
 msgid "Hello, world!"
@@ -219,26 +219,21 @@ msgstr ""
 msgid "Places"
 msgstr "Orte"

-#: extensions/places-menu/placeDisplay.js:65
-#, javascript-format
-msgid "Failed to mount volume for “%s”"
-msgstr "Datenträger für »%s« konnte nicht eingebunden werden"
-
-#: extensions/places-menu/placeDisplay.js:78
+#: extensions/places-menu/placeDisplay.js:59
 #, javascript-format
 msgid "Failed to launch “%s”"
 msgstr "Starten von »%s« fehlgeschlagen"

-#: extensions/places-menu/placeDisplay.js:137
-#: extensions/places-menu/placeDisplay.js:160
+#: extensions/places-menu/placeDisplay.js:101
+#: extensions/places-menu/placeDisplay.js:124
 msgid "Computer"
 msgstr "Rechner"

-#: extensions/places-menu/placeDisplay.js:303
+#: extensions/places-menu/placeDisplay.js:267
 msgid "Home"
 msgstr "Persönlicher Ordner"

-#: extensions/places-menu/placeDisplay.js:347
+#: extensions/places-menu/placeDisplay.js:311
 msgid "Browse Network"
 msgstr "Netzwerk durchsuchen"

@@ -246,10 +241,6 @@ msgstr "Netzwerk durchsuchen"
 msgid "Cycle Screenshot Sizes"
 msgstr "Bildschirmfotogrößen nacheinander anzeigen"

-#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
-msgid "Cycle Screenshot Sizes Backward"
-msgstr "Bildschirmfotogrößen in umgekehrter Reihenfolge anzeigen"
-
 #: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
 msgstr "Themenname"
@@ -264,48 +255,48 @@ msgstr ""
 msgid "Close"
 msgstr "Schließen"

-#: extensions/window-list/extension.js:129
+#: extensions/window-list/extension.js:120
 msgid "Unminimize"
 msgstr "Minimieren rückgängig"

-#: extensions/window-list/extension.js:130
+#: extensions/window-list/extension.js:121
 msgid "Minimize"
 msgstr "Minimieren"

-#: extensions/window-list/extension.js:136
+#: extensions/window-list/extension.js:127
 msgid "Unmaximize"
 msgstr "Maximieren rückgängig"

-#: extensions/window-list/extension.js:137
+#: extensions/window-list/extension.js:128
 msgid "Maximize"
 msgstr "Maximieren"

-#: extensions/window-list/extension.js:420
+#: extensions/window-list/extension.js:411
 msgid "Minimize all"
 msgstr "Alle minimieren"

-#: extensions/window-list/extension.js:428
+#: extensions/window-list/extension.js:419
 msgid "Unminimize all"
 msgstr "Alle minimieren rückgängig"

-#: extensions/window-list/extension.js:436
+#: extensions/window-list/extension.js:427
 msgid "Maximize all"
 msgstr "Alle maximieren"

-#: extensions/window-list/extension.js:445
+#: extensions/window-list/extension.js:436
 msgid "Unmaximize all"
 msgstr "Alle maximieren rückgängig"

-#: extensions/window-list/extension.js:454
+#: extensions/window-list/extension.js:445
 msgid "Close all"
 msgstr "Alle schließen"

-#: extensions/window-list/extension.js:678
+#: extensions/window-list/extension.js:669
 #: extensions/workspace-indicator/extension.js:30
 msgid "Workspace Indicator"
 msgstr "Arbeitsflächenindikator"

-#: extensions/window-list/extension.js:842
+#: extensions/window-list/extension.js:833
 msgid "Window List"
 msgstr "Fensterliste"

@@ -366,3 +357,90 @@ msgstr "Name"
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Arbeitsfläche %d"
+
+#~ msgid "CPU"
+#~ msgstr "CPU"
+
+#~ msgid "Memory"
+#~ msgstr "Speicher"
+
+#~ msgid "GNOME Shell Classic"
+#~ msgstr "GNOME Shell Classic"
+
+#~ msgid "Window management and application launching"
+#~ msgstr "Fensterverwaltung und Anwendungsstart"
+
+#~ msgid "Suspend"
+#~ msgstr "Bereitschaft"
+
+#~ msgid "Hibernate"
+#~ msgstr "Ruhezustand"
+
+#~ msgid "Power Off"
+#~ msgstr "Ausschalten …"
+
+#~ msgid "Enable suspending"
+#~ msgstr "Bereitschaft einblenden"
+
+#~ msgid "Control the visibility of the Suspend menu item"
+#~ msgstr "Die Sichtbarkeit des Menüeintrags »Bereitschaft« festlegen"
+
+#~ msgid "Enable hibernating"
+#~ msgstr "Ruhezustand einblenden"
+
+#~ msgid "Control the visibility of the Hibernate menu item"
+#~ msgstr "Die Sichtbarkeit des Menüeintrags »Ruhezustand« festlegen"
+
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#~ msgid "Left"
+#~ msgstr "Links"
+
+#~ msgid "Right"
+#~ msgstr "Rechts"
+
+#~ msgid "Upside-down"
+#~ msgstr "Kopfüber"
+
+#~ msgid "Display"
+#~ msgstr "Anzeige"
+
+#~ msgid "Display Settings"
+#~ msgstr "Bildschirmeinstellungen"
+
+#~ msgid "The application icon mode."
+#~ msgstr "Der Modus des Anwendungssymbols."
+
+#~ msgid ""
+#~ "Configures how the windows are shown in the switcher. Valid possibilities "
+#~ "are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-"
+#~ "only' (shows only the application icon) or 'both'."
+#~ msgstr ""
+#~ "Legt fest, wie die Fenster im Fensterumschalter angezeigt werden. Gültige "
+#~ "Werte sind »thumbnail-only« (zeigt ein Vorschaubild des Fensters), »app-"
+#~ "icon-only« (zeigt das Anwendungssymbol) oder »both« (beides)."
+
+#~ msgid "Devices"
+#~ msgstr "Geräte"
+
+#~ msgid "Bookmarks"
+#~ msgstr "Lesezeichen"
+
+#~ msgid "Network"
+#~ msgstr "Netzwerk"
+
+#~ msgid "File System"
+#~ msgstr "Dateisystem"
+
+#~ msgid "Drag here to add favorites"
+#~ msgstr "Hierher ziehen, um zu Favoriten hinzuzufügen"
+
+#~ msgid "New Window"
+#~ msgstr "Neues Fenster"
+
+#~ msgid "Quit Application"
+#~ msgstr "Anwendung beenden"
+
+#~ msgid "Remove from Favorites"
+#~ msgstr "Aus Favoriten entfernen"
--- a/po/el.po
+++ b/po/el.po
@@ -11,16 +11,16 @@ msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2017-08-11 01:33+0000\n"
-"PO-Revision-Date: 2017-09-09 14:10+0200\n"
-"Last-Translator: Efstathios Iosifidis <iosifidis@opensuse.org>\n"
+"POT-Creation-Date: 2017-02-22 18:40+0000\n"
+"PO-Revision-Date: 2017-04-08 22:12+0300\n"
+"Last-Translator: Tom Tryfonidis <tomtryf@gnome.org>\n"
 "Language-Team: team@lists.gnome.gr\n"
 "Language: el\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: Poedit 1.5.7\n"
+"X-Generator: Poedit 1.8.11\n"
 "X-Project-Style: gnome\n"

 #: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
@@ -93,15 +93,15 @@ msgstr "Παρουσίαση παραθύρων ως"
 msgid "Show only windows in the current workspace"
 msgstr "Εμφάνιση μόνο των παραθύρων του τρέχοντος χώρου εργασίας"

-#: extensions/apps-menu/extension.js:41
+#: extensions/apps-menu/extension.js:38
 msgid "Activities Overview"
 msgstr "Επισκόπηση δραστηριοτήτων"

-#: extensions/apps-menu/extension.js:141
+#: extensions/apps-menu/extension.js:109
 msgid "Favorites"
 msgstr "Αγαπημένα"

-#: extensions/apps-menu/extension.js:436
+#: extensions/apps-menu/extension.js:266
 msgid "Applications"
 msgstr "Εφαρμογές"

@@ -139,19 +139,18 @@ msgstr "Δημιουργία νέου κανόνα αντιστοίχισης"
 msgid "Add"
 msgstr "Προσθήκη"

-#. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:107
+#: extensions/drive-menu/extension.js:106
+#, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "Αποτυχία εξαγωγής του δίσκου «%s»:"

-#: extensions/drive-menu/extension.js:125
+#: extensions/drive-menu/extension.js:124
 msgid "Removable devices"
 msgstr "Αφαιρούμενες συσκευές"

-#: extensions/drive-menu/extension.js:150
-#| msgid "Open File"
-msgid "Open Files"
-msgstr "Άνοιγμα αρχείων"
+#: extensions/drive-menu/extension.js:149
+msgid "Open File"
+msgstr "Άνοιγμα αρχείου"

 #: extensions/example/extension.js:17
 msgid "Hello, world!"
@@ -221,25 +220,21 @@ msgstr ""
 msgid "Places"
 msgstr "Τοποθεσίες"

-#: extensions/places-menu/placeDisplay.js:65
-#| msgid "Failed to launch “%s”"
-msgid "Failed to mount volume for “%s”"
-msgstr "Αποτυχία προσάρτησης τόμου για «%s»"
-
-#: extensions/places-menu/placeDisplay.js:78
+#: extensions/places-menu/placeDisplay.js:59
+#, javascript-format
 msgid "Failed to launch “%s”"
 msgstr "Αποτυχία εκκίνησης «%s»"

-#: extensions/places-menu/placeDisplay.js:137
-#: extensions/places-menu/placeDisplay.js:160
+#: extensions/places-menu/placeDisplay.js:101
+#: extensions/places-menu/placeDisplay.js:124
 msgid "Computer"
 msgstr "Υπολογιστής"

-#: extensions/places-menu/placeDisplay.js:303
+#: extensions/places-menu/placeDisplay.js:267
 msgid "Home"
 msgstr "Προσωπικός φάκελος"

-#: extensions/places-menu/placeDisplay.js:347
+#: extensions/places-menu/placeDisplay.js:311
 msgid "Browse Network"
 msgstr "Περιήγηση δικτύου"

@@ -247,11 +242,6 @@ msgstr "Περιήγηση δικτύου"
 msgid "Cycle Screenshot Sizes"
 msgstr "Περιδιάβαση τα μεγέθη των στιγμιοτύπων"

-#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
-#| msgid "Cycle Screenshot Sizes"
-msgid "Cycle Screenshot Sizes Backward"
-msgstr "Μεγέθη κυκλικών στιγμιοτύπων προς τα πίσω"
-
 #: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
 msgstr "Όνομα θέματος"
@@ -265,48 +255,48 @@ msgstr ""
 msgid "Close"
 msgstr "Κλείσιμο"

-#: extensions/window-list/extension.js:129
+#: extensions/window-list/extension.js:120
 msgid "Unminimize"
 msgstr "Αποελαχιστοποίηση"

-#: extensions/window-list/extension.js:130
+#: extensions/window-list/extension.js:121
 msgid "Minimize"
 msgstr "Ελαχιστοποίηση"

-#: extensions/window-list/extension.js:136
+#: extensions/window-list/extension.js:127
 msgid "Unmaximize"
 msgstr "Απομεγιστοποίηση"

-#: extensions/window-list/extension.js:137
+#: extensions/window-list/extension.js:128
 msgid "Maximize"
 msgstr "Μεγιστοποίηση"

-#: extensions/window-list/extension.js:420
+#: extensions/window-list/extension.js:411
 msgid "Minimize all"
 msgstr "Ελαχιστοποίηση όλων"

-#: extensions/window-list/extension.js:428
+#: extensions/window-list/extension.js:419
 msgid "Unminimize all"
 msgstr "Αποελαχιστοποίηση όλων"

-#: extensions/window-list/extension.js:436
+#: extensions/window-list/extension.js:427
 msgid "Maximize all"
 msgstr "Μεγιστοποίηση όλων"

-#: extensions/window-list/extension.js:445
+#: extensions/window-list/extension.js:436
 msgid "Unmaximize all"
 msgstr "Απομεγιστοποίηση όλων"

-#: extensions/window-list/extension.js:454
+#: extensions/window-list/extension.js:445
 msgid "Close all"
 msgstr "Κλείσιμο όλων"

-#: extensions/window-list/extension.js:678
+#: extensions/window-list/extension.js:669
 #: extensions/workspace-indicator/extension.js:30
 msgid "Workspace Indicator"
 msgstr "Δείκτης χώρου εργασίας"

-#: extensions/window-list/extension.js:842
+#: extensions/window-list/extension.js:833
 msgid "Window List"
 msgstr "Λίστα παραθύρου"

@@ -364,6 +354,7 @@ msgid "Name"
 msgstr "Όνομα"

 #: extensions/workspace-indicator/prefs.js:198
+#, javascript-format
 msgid "Workspace %d"
 msgstr "Χώρος εργασίας %d"

--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1,24 +1,24 @@
 # British English translation of gnome-shell-extensions.
 # Copyright (C) 2011 gnome-shell-extensions'S COPYRIGHT HOLDER.
 # This file is distributed under the same license as the gnome-shell-extensions package.
-# Bruce Cowan <bruce@bcowan.eu>, 2011, 2018.
+# Bruce Cowan <bruce@bcowan.me.uk>, 2011.
 # Chris Leonard <cjlhomeaddress@gmail.com>, 2012.
 # Philip Withnall <philip@tecnocode.co.uk>, 2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
-"issues\n"
-"POT-Creation-Date: 2018-02-20 23:07+0000\n"
-"PO-Revision-Date: 2018-03-10 18:03+0000\n"
-"Last-Translator: Bruce Cowan <bruce@bcowan.eu>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"shell&keywords=I18N+L10N&component=extensions\n"
+"POT-Creation-Date: 2016-08-19 21:17+0000\n"
+"PO-Revision-Date: 2016-09-18 12:40+0200\n"
+"Last-Translator: David King <amigadave@amigadave.com>\n"
 "Language-Team: Sugar Labs\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"

 #: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
@@ -66,35 +66,35 @@ msgstr "Workspaces only on primary monitor"
 msgid "Delay focus changes in mouse mode until the pointer stops moving"
 msgstr "Delay focus changes in mouse mode until the pointer stops moving"

-#: extensions/alternate-tab/prefs.js:19
+#: extensions/alternate-tab/prefs.js:20
 msgid "Thumbnail only"
 msgstr "Thumbnail only"

-#: extensions/alternate-tab/prefs.js:20
+#: extensions/alternate-tab/prefs.js:21
 msgid "Application icon only"
 msgstr "Application icon only"

-#: extensions/alternate-tab/prefs.js:21
+#: extensions/alternate-tab/prefs.js:22
 msgid "Thumbnail and application icon"
 msgstr "Thumbnail and application icon"

-#: extensions/alternate-tab/prefs.js:34
+#: extensions/alternate-tab/prefs.js:38
 msgid "Present windows as"
 msgstr "Present windows as"

-#: extensions/alternate-tab/prefs.js:65
+#: extensions/alternate-tab/prefs.js:69
 msgid "Show only windows in the current workspace"
 msgstr "Show only windows in the current workspace"

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

-#: extensions/apps-menu/extension.js:130
+#: extensions/apps-menu/extension.js:109
 msgid "Favorites"
 msgstr "Favourites"

-#: extensions/apps-menu/extension.js:417
+#: extensions/apps-menu/extension.js:266
 msgid "Applications"
 msgstr "Applications"

@@ -110,43 +110,39 @@ msgstr ""
 "A list of strings, each containing an application id (desktop file name), "
 "followed by a colon and the workspace number"

-#: extensions/auto-move-windows/prefs.js:53
+#: extensions/auto-move-windows/prefs.js:60
 msgid "Application"
 msgstr "Application"

-#: extensions/auto-move-windows/prefs.js:62
-#: extensions/auto-move-windows/prefs.js:117
+#: extensions/auto-move-windows/prefs.js:69
+#: extensions/auto-move-windows/prefs.js:127
 msgid "Workspace"
 msgstr "Workspace"

-#: extensions/auto-move-windows/prefs.js:78
+#: extensions/auto-move-windows/prefs.js:85
 msgid "Add Rule"
 msgstr "Add Rule"

-#: extensions/auto-move-windows/prefs.js:98
+#: extensions/auto-move-windows/prefs.js:106
 msgid "Create new matching rule"
 msgstr "Create new matching rule"

-#: extensions/auto-move-windows/prefs.js:103
+#: extensions/auto-move-windows/prefs.js:111
 msgid "Add"
 msgstr "Add"

-#. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:103
-#: extensions/places-menu/placeDisplay.js:219
+#: extensions/drive-menu/extension.js:106
 #, javascript-format
-#| msgid "Ejecting drive '%s' failed:"
-msgid "Ejecting drive “%s” failed:"
-msgstr "Ejecting drive “%s” failed:"
+msgid "Ejecting drive '%s' failed:"
+msgstr "Ejecting drive '%s' failed:"

-#: extensions/drive-menu/extension.js:118
+#: extensions/drive-menu/extension.js:124
 msgid "Removable devices"
 msgstr "Removable devices"

-#: extensions/drive-menu/extension.js:143
-#| msgid "Open File"
-msgid "Open Files"
-msgstr "Open Files"
+#: extensions/drive-menu/extension.js:149
+msgid "Open File"
+msgstr "Open File"

 #: extensions/example/extension.js:17
 msgid "Hello, world!"
@@ -164,25 +160,21 @@ msgstr ""
 "If not empty, it contains the text that will be shown when clicking on the "
 "panel."

-#: extensions/example/prefs.js:27
+#: extensions/example/prefs.js:30
 msgid "Message"
 msgstr "Message"

 #. TRANSLATORS: Example is the name of the extension, should not be
 #. translated
-#: extensions/example/prefs.js:40
-#| msgid ""
-#| "Example aims to show how to build well behaved extensions for the Shell "
-#| "and as such it has little functionality on its own.\n"
-#| "Nevertheless it's possible to customize the greeting message."
+#: 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 ""
 "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 customise the greeting message."
+"Nevertheless it's possible to customize the greeting message."

 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
 msgid "Use more screen for windows"
@@ -212,32 +204,26 @@ msgstr ""
 "shell default of placing it at the bottom. Changing this setting requires "
 "restarting the shell to have any effect."

-#: extensions/places-menu/extension.js:79
-#: extensions/places-menu/extension.js:82
+#: extensions/places-menu/extension.js:78
+#: extensions/places-menu/extension.js:81
 msgid "Places"
 msgstr "Places"

-#: extensions/places-menu/placeDisplay.js:66
+#: extensions/places-menu/placeDisplay.js:59
 #, javascript-format
-msgid "Failed to mount volume for “%s”"
-msgstr "Failed to mount volume for “%s”"
+msgid "Failed to launch \"%s\""
+msgstr "Failed to launch \"%s\""

-#: extensions/places-menu/placeDisplay.js:79
-#, javascript-format
-#| msgid "Failed to launch \"%s\""
-msgid "Failed to launch “%s”"
-msgstr "Failed to launch “%s”"
-
-#: extensions/places-menu/placeDisplay.js:135
-#: extensions/places-menu/placeDisplay.js:158
+#: extensions/places-menu/placeDisplay.js:101
+#: extensions/places-menu/placeDisplay.js:124
 msgid "Computer"
 msgstr "Computer"

-#: extensions/places-menu/placeDisplay.js:336
+#: extensions/places-menu/placeDisplay.js:267
 msgid "Home"
 msgstr "Home"

-#: extensions/places-menu/placeDisplay.js:378
+#: extensions/places-menu/placeDisplay.js:311
 msgid "Browse Network"
 msgstr "Browse Network"

@@ -245,11 +231,6 @@ msgstr "Browse Network"
 msgid "Cycle Screenshot Sizes"
 msgstr "Cycle Screenshot Sizes"

-#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
-#| msgid "Cycle Screenshot Sizes"
-msgid "Cycle Screenshot Sizes Backward"
-msgstr "Cycle Screenshot Sizes Backward"
-
 #: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
 msgstr "Theme name"
@@ -258,52 +239,52 @@ msgstr "Theme name"
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"

-#: extensions/window-list/extension.js:106
+#: extensions/window-list/extension.js:110
 msgid "Close"
 msgstr "Close"

-#: extensions/window-list/extension.js:125
+#: extensions/window-list/extension.js:120
 msgid "Unminimize"
 msgstr "Unminimise"

-#: extensions/window-list/extension.js:126
+#: extensions/window-list/extension.js:121
 msgid "Minimize"
 msgstr "Minimise"

-#: extensions/window-list/extension.js:132
+#: extensions/window-list/extension.js:127
 msgid "Unmaximize"
 msgstr "Unmaximise"

-#: extensions/window-list/extension.js:133
+#: extensions/window-list/extension.js:128
 msgid "Maximize"
 msgstr "Maximise"

-#: extensions/window-list/extension.js:408
+#: extensions/window-list/extension.js:403
 msgid "Minimize all"
 msgstr "Minimise all"

-#: extensions/window-list/extension.js:414
+#: extensions/window-list/extension.js:411
 msgid "Unminimize all"
 msgstr "Unminimise all"

-#: extensions/window-list/extension.js:420
+#: extensions/window-list/extension.js:419
 msgid "Maximize all"
 msgstr "Maximise all"

-#: extensions/window-list/extension.js:429
+#: extensions/window-list/extension.js:428
 msgid "Unmaximize all"
 msgstr "Unmaximise all"

-#: extensions/window-list/extension.js:438
+#: extensions/window-list/extension.js:437
 msgid "Close all"
 msgstr "Close all"

-#: extensions/window-list/extension.js:646
-#: extensions/workspace-indicator/extension.js:26
+#: extensions/window-list/extension.js:661
+#: extensions/workspace-indicator/extension.js:30
 msgid "Workspace Indicator"
 msgstr "Workspace Indicator"

-#: extensions/window-list/extension.js:811
+#: extensions/window-list/extension.js:820
 msgid "Window List"
 msgstr "Window List"

@@ -312,15 +293,12 @@ msgid "When to group windows"
 msgstr "When to group windows"

 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
-#| msgid ""
-#| "Decides when to group windows from the same application on the window "
-#| "list. Possible values are \"never\", \"auto\" and \"always\"."
 msgid ""
 "Decides when to group windows from the same application on the window list. "
-"Possible values are “never”, “auto” and “always”."
+"Possible values are \"never\", \"auto\" and \"always\"."
 msgstr ""
 "Decides when to group windows from the same application on the window list. "
-"Possible values are “never”, “auto” and “always”."
+"Possible values are \"never\", \"auto\" and \"always\"."

 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
 msgid "Show the window list on all monitors"
@@ -334,35 +312,35 @@ msgstr ""
 "Whether to show the window list on all connected monitors or only on the "
 "primary one."

-#: extensions/window-list/prefs.js:28
+#: extensions/window-list/prefs.js:32
 msgid "Window Grouping"
 msgstr "Window Grouping"

-#: extensions/window-list/prefs.js:46
+#: extensions/window-list/prefs.js:50
 msgid "Never group windows"
 msgstr "Never group windows"

-#: extensions/window-list/prefs.js:47
+#: extensions/window-list/prefs.js:51
 msgid "Group windows when space is limited"
 msgstr "Group windows when space is limited"

-#: extensions/window-list/prefs.js:48
+#: extensions/window-list/prefs.js:52
 msgid "Always group windows"
 msgstr "Always group windows"

-#: extensions/window-list/prefs.js:71
+#: extensions/window-list/prefs.js:75
 msgid "Show on all monitors"
 msgstr "Show on all monitors"

-#: extensions/workspace-indicator/prefs.js:134
+#: extensions/workspace-indicator/prefs.js:141
 msgid "Workspace Names"
 msgstr "Workspace Names"

-#: extensions/workspace-indicator/prefs.js:150
+#: extensions/workspace-indicator/prefs.js:157
 msgid "Name"
 msgstr "Name"

-#: extensions/workspace-indicator/prefs.js:190
+#: extensions/workspace-indicator/prefs.js:198
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Workspace %d"
--- a/po/es.po
+++ b/po/es.po
@@ -4,15 +4,15 @@
 # Jorge González <jorgegonz@svn.gnome.org>, 2011.
 # Nicolás Satragno <nsatragno@gmail.com>, 2011.
 # 
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011-2015, 2017.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011, 2012.
 , 2013, 2014, 2015, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"POT-Creation-Date: 2017-07-20 23:40+0000\n"
-"PO-Revision-Date: 2017-07-24 15:40+0200\n"
+"shell&keywords=I18N+L10N&component=extensions\n"
+"POT-Creation-Date: 2017-02-22 18:40+0000\n"
 "PO-Revision-Date: 2017-02-27 10:04+0100\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: es <gnome-es-list@gnome.org>\n"
@@ -90,15 +90,15 @@ msgstr "Presentar ventanas como"
 #: extensions/alternate-tab/prefs.js:69
 msgid "Show only windows in the current workspace"
 msgstr "Mostrar ventanas solamente en el área de trabajo actual"
-#: extensions/apps-menu/extension.js:41
+
 #: extensions/apps-menu/extension.js:38
 msgid "Activities Overview"
 msgstr "Vista de actividades"
-#: extensions/apps-menu/extension.js:141
+
 #: extensions/apps-menu/extension.js:109
 msgid "Favorites"
 msgstr "Favoritos"
-#: extensions/apps-menu/extension.js:436
+
 #: extensions/apps-menu/extension.js:266
 msgid "Applications"
 msgstr "Aplicaciones"
@@ -137,6 +137,7 @@ msgstr "Añadir"
 msgstr "Añadir"

 #: extensions/drive-menu/extension.js:106
+#, javascript-format
 #| msgid "Ejecting drive '%s' failed:"
 msgid "Ejecting drive “%s” failed:"
 msgstr "Falló al expulsar el dispositivo «%s»:"
@@ -145,8 +146,8 @@ msgid "Removable devices"
 msgid "Removable devices"
 msgstr "Dispositivos extraíbles"

-msgid "Open Files"
-msgstr "Abrir archivos"
+#: extensions/drive-menu/extension.js:149
+msgid "Open File"
 msgstr "Abrir archivo"

 #: extensions/example/extension.js:17
@@ -171,6 +172,10 @@ msgstr "Mensaje"

 #. 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."
 msgid ""
 "Example aims to show how to build well behaved extensions for the Shell and "
@@ -215,26 +220,22 @@ msgstr ""
 #: extensions/places-menu/extension.js:81
 msgid "Places"
 msgstr "Lugares"
-#: extensions/places-menu/placeDisplay.js:65
-#, javascript-format
-msgid "Failed to mount volume for “%s”"
-msgstr "Falló al montar el volumen para «%s»"
-
-#: extensions/places-menu/placeDisplay.js:78
+
 #: extensions/places-menu/placeDisplay.js:59
+#, javascript-format
 #| msgid "Failed to launch \"%s\""
 msgid "Failed to launch “%s”"
 msgstr "Falló al lanzar «%s»"
-#: extensions/places-menu/placeDisplay.js:137
-#: extensions/places-menu/placeDisplay.js:160
+
+#: extensions/places-menu/placeDisplay.js:101
 #: extensions/places-menu/placeDisplay.js:124
 msgid "Computer"
 msgstr "Equipo"
-#: extensions/places-menu/placeDisplay.js:303
+
 #: extensions/places-menu/placeDisplay.js:267
 msgid "Home"
 msgstr "Carpeta personal"
-#: extensions/places-menu/placeDisplay.js:347
+
 #: extensions/places-menu/placeDisplay.js:311
 msgid "Browse Network"
 msgstr "Examinar la red"
@@ -242,11 +243,6 @@ msgstr "Examinar la red"
 #: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
 msgid "Cycle Screenshot Sizes"
 msgstr "Tamaños de capturas de pantalla cíclicos"
-#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
-#| msgid "Cycle Screenshot Sizes"
-msgid "Cycle Screenshot Sizes Backward"
-msgstr "Tamaños de capturas de pantalla cíclicos"
-

 #: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
@@ -259,48 +255,48 @@ msgstr "El nombre del tema, que se carga desde ~/.themes/nombre/gnome-shell"
 #: extensions/window-list/extension.js:110
 msgid "Close"
 msgstr "Cerrar"
-#: extensions/window-list/extension.js:129
+
 #: extensions/window-list/extension.js:120
 msgid "Unminimize"
 msgstr "Desminimizar"
-#: extensions/window-list/extension.js:130
+
 #: extensions/window-list/extension.js:121
 msgid "Minimize"
 msgstr "Minimizar"
-#: extensions/window-list/extension.js:136
+
 #: extensions/window-list/extension.js:127
 msgid "Unmaximize"
 msgstr "Desmaximizar"
-#: extensions/window-list/extension.js:137
+
 #: extensions/window-list/extension.js:128
 msgid "Maximize"
 msgstr "Maximizar"
-#: extensions/window-list/extension.js:420
+
 #: extensions/window-list/extension.js:411
 msgid "Minimize all"
 msgstr "Minimizar todo"
-#: extensions/window-list/extension.js:428
+
 #: extensions/window-list/extension.js:419
 msgid "Unminimize all"
 msgstr "Desminimizar todo"
-#: extensions/window-list/extension.js:436
+
 #: extensions/window-list/extension.js:427
 msgid "Maximize all"
 msgstr "Maximizar todo"
-#: extensions/window-list/extension.js:445
+
 #: extensions/window-list/extension.js:436
 msgid "Unmaximize all"
 msgstr "Desmaximizar todo"
-#: extensions/window-list/extension.js:454
+
 #: extensions/window-list/extension.js:445
 msgid "Close all"
 msgstr "Cerrar todo"
-#: extensions/window-list/extension.js:678
+
 #: extensions/window-list/extension.js:669
 #: extensions/workspace-indicator/extension.js:30
 msgid "Workspace Indicator"
 msgstr "Indicador de área de trabajo"
-#: extensions/window-list/extension.js:842
+
 #: extensions/window-list/extension.js:833
 msgid "Window List"
 msgstr "Lista de ventanas"
@@ -309,6 +305,9 @@ msgid "When to group windows"
 msgid "When to group windows"
 msgstr "Cuándo agrupar las ventanas"

+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
+#| msgid ""
+#| "Decides when to group windows from the same application on the window "
 #| "list. Possible values are \"never\", \"auto\" and \"always\"."
 msgid ""
 "Decides when to group windows from the same application on the window list. "
--- a/po/eu.po
+++ b/po/eu.po
@@ -8,10 +8,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2017-08-11 01:33+0000\n"
-"PO-Revision-Date: 2017-08-27 15:49+0200\n"
+"POT-Creation-Date: 2017-02-16 01:20+0000\n"
+"PO-Revision-Date: 2017-02-16 18:30+0100\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@zundan.com>\n"
 "Language-Team: Basque <librezale@librezale.eus>\n"
 "Language: eu\n"
@@ -91,15 +91,15 @@ msgstr "Aurkeztu leihoa honela"
 msgid "Show only windows in the current workspace"
 msgstr "Erakutsi leihoak bakarrik uneko laneko arean"

-#: extensions/apps-menu/extension.js:41
+#: extensions/apps-menu/extension.js:38
 msgid "Activities Overview"
 msgstr "Jardueren ikuspegi orokorra"

-#: extensions/apps-menu/extension.js:141
+#: extensions/apps-menu/extension.js:109
 msgid "Favorites"
 msgstr "Gogokoak"

-#: extensions/apps-menu/extension.js:436
+#: extensions/apps-menu/extension.js:266
 msgid "Applications"
 msgstr "Aplikazioak"

@@ -136,20 +136,19 @@ msgstr "Sortu bat datorren arau berria"
 msgid "Add"
 msgstr "Gehitu"

-#. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:107
+#: extensions/drive-menu/extension.js:106
 #, javascript-format
+#| msgid "Ejecting drive '%s' failed:"
 msgid "Ejecting drive “%s” failed:"
 msgstr "Huts egin du “%s“ unitatea egoztean: "

-#: extensions/drive-menu/extension.js:125
+#: extensions/drive-menu/extension.js:124
 msgid "Removable devices"
 msgstr "Gailu aldagarriak"

-#: extensions/drive-menu/extension.js:150
-#| msgid "Open File"
-msgid "Open Files"
-msgstr "Ireki fitxategiak"
+#: extensions/drive-menu/extension.js:149
+msgid "Open File"
+msgstr "Ireki fitxategia"

 #: extensions/example/extension.js:17
 msgid "Hello, world!"
@@ -172,6 +171,10 @@ msgstr "Mezua"
 #. 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."
 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"
@@ -215,27 +218,22 @@ msgstr ""
 msgid "Places"
 msgstr "Lekuak"

-#: extensions/places-menu/placeDisplay.js:65
-#, javascript-format
-#| msgid "Failed to launch “%s”"
-msgid "Failed to mount volume for “%s”"
-msgstr "Huts egin du “%s“(r)en bolumena muntatzean"
-
-#: extensions/places-menu/placeDisplay.js:78
+#: extensions/places-menu/placeDisplay.js:59
 #, javascript-format
+#| msgid "Failed to launch \"%s\""
 msgid "Failed to launch “%s”"
 msgstr "Huts egin du “%s“ abiaraztean"

-#: extensions/places-menu/placeDisplay.js:137
-#: extensions/places-menu/placeDisplay.js:160
+#: extensions/places-menu/placeDisplay.js:101
+#: extensions/places-menu/placeDisplay.js:124
 msgid "Computer"
 msgstr "Ordenagailua"

-#: extensions/places-menu/placeDisplay.js:303
+#: extensions/places-menu/placeDisplay.js:267
 msgid "Home"
 msgstr "Karpeta nagusia"

-#: extensions/places-menu/placeDisplay.js:347
+#: extensions/places-menu/placeDisplay.js:311
 msgid "Browse Network"
 msgstr "Arakatu sarea"

@@ -243,11 +241,6 @@ msgstr "Arakatu sarea"
 msgid "Cycle Screenshot Sizes"
 msgstr "Pantaila-argazkien tamainak begiztan"

-#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
-#| msgid "Cycle Screenshot Sizes"
-msgid "Cycle Screenshot Sizes Backward"
-msgstr "Pantaila-argazkien tamainak atzerantz begiztan"
-
 #: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
 msgstr "Gaiaren izena"
@@ -260,48 +253,48 @@ msgstr "Gaiaren izena, ~/.themes/izena/gnome-shell direktoriotik kargatzeko"
 msgid "Close"
 msgstr "Itxi"

-#: extensions/window-list/extension.js:129
+#: extensions/window-list/extension.js:120
 msgid "Unminimize"
 msgstr "Leheneratu"

-#: extensions/window-list/extension.js:130
+#: extensions/window-list/extension.js:121
 msgid "Minimize"
 msgstr "Minimizatu"

-#: extensions/window-list/extension.js:136
+#: extensions/window-list/extension.js:127
 msgid "Unmaximize"
 msgstr "Desmaximizatu"

-#: extensions/window-list/extension.js:137
+#: extensions/window-list/extension.js:128
 msgid "Maximize"
 msgstr "Maximizatu"

-#: extensions/window-list/extension.js:420
+#: extensions/window-list/extension.js:411
 msgid "Minimize all"
 msgstr "Minimizatu denak"

-#: extensions/window-list/extension.js:428
+#: extensions/window-list/extension.js:419
 msgid "Unminimize all"
 msgstr "Leheneratu denak"

-#: extensions/window-list/extension.js:436
+#: extensions/window-list/extension.js:427
 msgid "Maximize all"
 msgstr "Maximizatu denak"

-#: extensions/window-list/extension.js:445
+#: extensions/window-list/extension.js:436
 msgid "Unmaximize all"
 msgstr "Desmaximizatu denak"

-#: extensions/window-list/extension.js:454
+#: extensions/window-list/extension.js:445
 msgid "Close all"
 msgstr "Itxi denak"

-#: extensions/window-list/extension.js:678
+#: extensions/window-list/extension.js:669
 #: extensions/workspace-indicator/extension.js:30
 msgid "Workspace Indicator"
 msgstr "Lan arearen adierazlea"

-#: extensions/window-list/extension.js:842
+#: extensions/window-list/extension.js:833
 msgid "Window List"
 msgstr "Leihoen zerrenda"

@@ -310,6 +303,9 @@ msgid "When to group windows"
 msgstr "Noiz elkartu leihoak"

 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
+#| msgid ""
+#| "Decides when to group windows from the same application on the window "
+#| "list. Possible values are \"never\", \"auto\" and \"always\"."
 msgid ""
 "Decides when to group windows from the same application on the window list. "
 "Possible values are “never”, “auto” and “always”."
--- a/po/fa.po
+++ b/po/fa.po
@@ -1,15 +1,15 @@
 # Persian translation for gnome-shell-extensions.
 # Copyright (C) 2011 Iranian Free Software Users Group (IFSUG.org) translation team.
 # This file is distributed under the same license as the gnome-shell-extensions package.
-# Arash Mousavi <mousavi.arash@gmail.com>, 2011, 2013, 2014, 2015, 2016, 2017.
+# Arash Mousavi <mousavi.arash@gmail.com>, 2011, 2013, 2014, 2015.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions gnome-3-0\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2017-09-20 08:40+0000\n"
-"PO-Revision-Date: 2017-09-22 22:09+0330\n"
+"POT-Creation-Date: 2015-09-10 20:20+0000\n"
+"PO-Revision-Date: 2015-09-11 23:44+0430\n"
 "Last-Translator: Arash Mousavi <mousavi.arash@gmail.com>\n"
 "Language-Team: Persian <>\n"
 "Language: fa\n"
@@ -17,337 +17,316 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 2.0.3\n"
+"X-Generator: Poedit 1.8.4\n"
 "Plural-Forms: nplurals=1; plural=0;\n"

-#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
+#: ../data/gnome-classic.desktop.in.h:1 ../data/gnome-classic.session.desktop.in.in.h:1
 msgid "GNOME Classic"
 msgstr "گنوم کلاسیک"

-#: data/gnome-classic.desktop.in:4
+#: ../data/gnome-classic.desktop.in.h:2
 msgid "This session logs you into GNOME Classic"
 msgstr "این نشست شما را به گنوم کلاسیک وارد می‌کند"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:7
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:1
 msgid "Attach modal dialog to the parent window"
 msgstr "اتصال محاوره modal به پنجره والد"

-#: 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
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:2
 msgid "This key overrides the key in org.gnome.mutter when running GNOME Shell."
 msgstr "این کلید، کلید org.gnome.mutter را در هنگام اجرای گنوم‌شل بازنویسی می‌کند."

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:3
 msgid "Arrangement of buttons on the titlebar"
 msgstr "چینش دکمه‌ها در نوار عنوان"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:17
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:4
 msgid ""
-"This key overrides the key in org.gnome.desktop.wm.preferences when running "
-"GNOME Shell."
+"This key overrides the key in org.gnome.desktop.wm.preferences when running GNOME "
+"Shell."
 msgstr ""
-"این کلید، کلید org.gnome.desktop.wm.preferences را در هنگام اجرای گنوم‌شل "
-"بازنویسی می‌کند."
+"این کلید، کلید org.gnome.desktop.wm.preferences را در هنگام اجرای گنوم‌شل بازنویسی "
+"می‌کند."

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:24
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:5
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr "فعال‌سازی چینش در گوشه‌ها هنگامی که پنجره‌ها در گوشه‌های صفحه‌نمایش می‌اندازید"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:32
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:6
 msgid "Workspaces only on primary monitor"
 msgstr "فضا‌های کاری تنها در نمایشگر اصلی"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:40
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:7
 msgid "Delay focus changes in mouse mode until the pointer stops moving"
-msgstr ""
-"به تاخیر انداختن تغییر تمرکز در حالت موشی تا زمانی که نشانگر از حرکت باز ایستد"
+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:41
+#: ../extensions/apps-menu/extension.js:38
 msgid "Activities Overview"
 msgstr "نمای‌کلی فعالیت‌ها"

-#: extensions/apps-menu/extension.js:141
+#: ../extensions/apps-menu/extension.js:109
 msgid "Favorites"
 msgstr "علاقه‌مندی‌ها"

-#: extensions/apps-menu/extension.js:436
+#: ../extensions/apps-menu/extension.js:261
 msgid "Applications"
 msgstr "برنامه‌ها"

-#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
+#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:1
 msgid "Application and workspace list"
 msgstr "فهرست برنامه‌ها و فضای‌کاری"

-#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:7
+#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
 msgid ""
-"A list of strings, each containing an application id (desktop file name), "
-"followed by a colon and the workspace number"
+"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:127
+#: ../extensions/auto-move-windows/prefs.js:69
+#: ../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 "اضافه"

-#. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:107
+#: ../extensions/drive-menu/extension.js:106
 #, javascript-format
-msgid "Ejecting drive “%s” failed:"
+msgid "Ejecting drive '%s' failed:"
 msgstr "بیرون دادن دیسک‌گردان «%s» شکست خورد:"

-#: extensions/drive-menu/extension.js:125
+#: ../extensions/drive-menu/extension.js:124
 msgid "Removable devices"
 msgstr "دستگاه‌های جداشدنی"

-#: extensions/drive-menu/extension.js:150
-msgid "Open Files"
-msgstr "باز کردن پرونده‌ها"
+#: ../extensions/drive-menu/extension.js:149
+msgid "Open File"
+msgstr "باز کردن پرونده"

-#: extensions/example/extension.js:17
+#: ../extensions/example/extension.js:17
 msgid "Hello, world!"
 msgstr "سلام دنیا!"

-#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:5
+#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:1
 msgid "Alternative greeting text."
-msgstr "متن خوش‌آمدِ جایگزین."
+msgstr "متن خوش‌آمد جای‌گزین"

-#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:6
+#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:2
 msgid ""
-"If not empty, it contains the text that will be shown when clicking on the "
-"panel."
+"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."
+"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 ""
-"هدف مثال نمایش چگونگی ساخت افزونه‌های خوش‌رفتار برای پوسته است، پس خودش قابلیت‌های "
-"کمی دارد.\n"
+"هدف Example این است که نشان دهد چگونه می‌توان متصل‌شونده‌های صحیح برای گنوم‌شل ساخت و "
+"برای نمونه کمی قابلیت از خود نیز دارد.\n"
 "با این وجود می‌توان پیام خوش‌آمد را تغییر داد."

-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:1
 msgid "Use more screen for windows"
 msgstr "استفاده از صفحه بیشتر برای پنجره"

-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:2
 msgid ""
-"Try to use more screen for placing window thumbnails by adapting to screen "
-"aspect ratio, and consolidating them further to reduce the bounding box. This "
-"setting applies only with the natural placement strategy."
+"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 ""
-"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."
+"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."

-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
+#: ../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:12
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:4
 msgid ""
-"If true, place window captions on top the respective thumbnail, overriding "
-"shell default of placing it at the bottom. Changing this setting requires "
-"restarting the shell to have any effect."
+"If true, place window captions on top the respective thumbnail, overriding shell "
+"default of placing it at the bottom. Changing this setting requires restarting the "
+"shell to have any effect."
 msgstr ""
-"اگر بر روی درست باشد، عنوان پنجره را بالای تصویر آن قرار می‌دهد، که حالت پیش‌فرض "
-"شل در پایین را تغییر می‌دهد. تغییر این گزینه، نیاز به راه‌اندازی مجدد شل دارد تا "
-"تاثیر بگذارد."
+"اگر بر روی درست باشد، عنوان پنجره را بالای تصویر آن قرار می‌دهد، که حالت پیش‌فرض شل در "
+"پایین را تغییر می‌دهد. تغییر این گزینه، نیاز به راه‌اندازی مجدد شل دارد تا تاثیر بگذارد."

-#: extensions/places-menu/extension.js:78 extensions/places-menu/extension.js:81
+#: ../extensions/places-menu/extension.js:78 ../extensions/places-menu/extension.js:81
 msgid "Places"
 msgstr "مکان‌ها"

-#: extensions/places-menu/placeDisplay.js:65
+#: ../extensions/places-menu/placeDisplay.js:59
 #, javascript-format
-msgid "Failed to mount volume for “%s”"
-msgstr "شکست در سوار کردن جلد برای «%s»"
+msgid "Failed to launch \"%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
+#: ../extensions/places-menu/placeDisplay.js:101
+#: ../extensions/places-menu/placeDisplay.js:124
 msgid "Computer"
 msgstr "رایانه"

-#: extensions/places-menu/placeDisplay.js:303
+#: ../extensions/places-menu/placeDisplay.js:267
 msgid "Home"
 msgstr "خانه"

-#: extensions/places-menu/placeDisplay.js:347
+#: ../extensions/places-menu/placeDisplay.js:311
 msgid "Browse Network"
 msgstr "مرور شبکه"

-#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
+#: ../extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml.in.h:1
 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
+#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:1
 msgid "Theme name"
 msgstr "نام تم"

-#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:6
+#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:2
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "نام تم، جهت بارگیری از شاخه themes/name/gnome-shell./~"

-#: extensions/window-list/extension.js:110
+#: ../extensions/window-list/extension.js:110
 msgid "Close"
 msgstr "خروج"

-#: extensions/window-list/extension.js:129
+#: ../extensions/window-list/extension.js:120
 msgid "Unminimize"
 msgstr "ناحداقل کردن"

-#: extensions/window-list/extension.js:130
+#: ../extensions/window-list/extension.js:121
 msgid "Minimize"
 msgstr "حداکثر کردن"

-#: extensions/window-list/extension.js:136
+#: ../extensions/window-list/extension.js:127
 msgid "Unmaximize"
 msgstr "ناحداکثر کردن"

-#: extensions/window-list/extension.js:137
+#: ../extensions/window-list/extension.js:128
 msgid "Maximize"
 msgstr "حداکثر کردن"

-#: extensions/window-list/extension.js:420
+#: ../extensions/window-list/extension.js:402
 msgid "Minimize all"
 msgstr "حداقل کردن همه"

-#: extensions/window-list/extension.js:428
+#: ../extensions/window-list/extension.js:410
 msgid "Unminimize all"
 msgstr "ناحداقل کردن همه"

-#: extensions/window-list/extension.js:436
+#: ../extensions/window-list/extension.js:418
 msgid "Maximize all"
 msgstr "حداکثر کردن همه"

-#: extensions/window-list/extension.js:445
+#: ../extensions/window-list/extension.js:427
 msgid "Unmaximize all"
 msgstr "ناحداکثر کردن همه"

-#: extensions/window-list/extension.js:454
+#: ../extensions/window-list/extension.js:436
 msgid "Close all"
 msgstr "بستن همه"

-#: extensions/window-list/extension.js:678
-#: extensions/workspace-indicator/extension.js:30
+#: ../extensions/window-list/extension.js:655
+#: ../extensions/workspace-indicator/extension.js:30
 msgid "Workspace Indicator"
 msgstr "نشانگر فضای‌کاری"

-#: extensions/window-list/extension.js:842
+#: ../extensions/window-list/extension.js:814
 msgid "Window List"
 msgstr "فهرست پنجره"

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:12
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:1
 msgid "When to group windows"
 msgstr "زمان گروه کردن پنجره‌ها"

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:2
 msgid ""
-"Decides when to group windows from the same application on the window list. "
-"Possible values are “never”, “auto” and “always”."
+"Decides when to group windows from the same application on the window list. Possible "
+"values are \"never\", \"auto\" and \"always\"."
 msgstr ""
-"تصمیم می‌گیرد چه زمانی پنجره‌های یک برنامه در فهرست پنجره‌ها گروه شوند. مقدارهای "
-"ممکن عبارتند از «never»، «auto» و «always»."
+"تصمیم می‌گیرد که چه زمانی پنجره‌های یک برنامه واحد در فهرست پنجره‌ها گروه شوند. مقادیر "
+"ممکن عبارتند از «never»، «auto» و «always»"

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:3
 msgid "Show the window list on all monitors"
 msgstr "نمایش فهرست پنجره‌ها در تمام نمایشگرها"

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:4
 msgid ""
-"Whether to show the window list on all connected monitors or only on the "
-"primary one."
+"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 "نمایش در تمام نمایشگرها"

-#: extensions/workspace-indicator/prefs.js:141
+#: ../extensions/workspace-indicator/prefs.js:141
 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"
@@ -381,11 +360,11 @@ msgstr "فضای‌کاری %Id"
 #~ msgstr "انتقالِ انتخاب فعلی به بالا قبل از بستن پنجره واشو"

 #~ msgid ""
-#~ "The Alternate Tab can be used in different modes, that affect the way "
-#~ "windows are chosen and presented."
+#~ "The Alternate Tab can be used in different modes, that affect the way windows are "
+#~ "chosen and presented."
 #~ msgstr ""
-#~ "«جای‌گزین Tab» می‌تواند در حالت‌های مختلفی استفاده شود، که در نحوه باز شدن و "
-#~ "انتخاب پنجره‌ها تاثیر می‌گذارد."
+#~ "«جای‌گزین Tab» می‌تواند در حالت‌های مختلفی استفاده شود، که در نحوه باز شدن و انتخاب "
+#~ "پنجره‌ها تاثیر می‌گذارد."

 #~ msgid "Suspend"
 #~ msgstr "تعلیق"
--- a/po/fi.po
+++ b/po/fi.po
@@ -10,10 +10,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2017-08-11 01:33+0000\n"
-"PO-Revision-Date: 2017-08-29 12:32+0300\n"
+"POT-Creation-Date: 2017-02-16 01:20+0000\n"
+"PO-Revision-Date: 2017-02-18 20:43+0200\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos+l10n@iki.fi>\n"
 "Language-Team: suomi <lokalisointi-lista@googlegroups.com>\n"
 "Language: fi\n"
@@ -89,15 +89,15 @@ msgstr "Ikkunoiden esittäminen"
 msgid "Show only windows in the current workspace"
 msgstr "Näytä vain nykyisessä työtilassa olevat ikkunat"

-#: extensions/apps-menu/extension.js:41
+#: extensions/apps-menu/extension.js:38
 msgid "Activities Overview"
 msgstr "Yleisnäkymä"

-#: extensions/apps-menu/extension.js:141
+#: extensions/apps-menu/extension.js:109
 msgid "Favorites"
 msgstr "Suosikit"

-#: extensions/apps-menu/extension.js:436
+#: extensions/apps-menu/extension.js:266
 msgid "Applications"
 msgstr "Sovellukset"

@@ -132,20 +132,19 @@ msgstr "Luo uusi vastaava sääntö"
 msgid "Add"
 msgstr "Lisää"

-#. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:107
+#: extensions/drive-menu/extension.js:106
 #, javascript-format
+#| msgid "Ejecting drive '%s' failed:"
 msgid "Ejecting drive “%s” failed:"
 msgstr "Aseman “%s” irrottaminen epäonnistui:"

-#: extensions/drive-menu/extension.js:125
+#: extensions/drive-menu/extension.js:124
 msgid "Removable devices"
 msgstr "Erilliset tallennusvälineet"

-#: extensions/drive-menu/extension.js:150
-#| msgid "Open File"
-msgid "Open Files"
-msgstr "Avaa tiedostonhallinta"
+#: extensions/drive-menu/extension.js:149
+msgid "Open File"
+msgstr "Avaa tiedosto"

 #: extensions/example/extension.js:17
 msgid "Hello, world!"
@@ -204,27 +203,22 @@ msgstr ""
 msgid "Places"
 msgstr "Sijainnit"

-#: extensions/places-menu/placeDisplay.js:65
-#, javascript-format
-#| msgid "Failed to launch “%s”"
-msgid "Failed to mount volume for “%s”"
-msgstr "Taltion “%s” liittäminen epäonnistui"
-
-#: extensions/places-menu/placeDisplay.js:78
+#: extensions/places-menu/placeDisplay.js:59
 #, javascript-format
+#| msgid "Failed to launch \"%s\""
 msgid "Failed to launch “%s”"
 msgstr "Kohteen “%s” käynnistys epäonnistui"

-#: extensions/places-menu/placeDisplay.js:137
-#: extensions/places-menu/placeDisplay.js:160
+#: extensions/places-menu/placeDisplay.js:101
+#: extensions/places-menu/placeDisplay.js:124
 msgid "Computer"
 msgstr "Tietokone"

-#: extensions/places-menu/placeDisplay.js:303
+#: extensions/places-menu/placeDisplay.js:267
 msgid "Home"
 msgstr "Koti"

-#: extensions/places-menu/placeDisplay.js:347
+#: extensions/places-menu/placeDisplay.js:311
 msgid "Browse Network"
 msgstr "Selaa verkkoa"

@@ -232,12 +226,6 @@ msgstr "Selaa verkkoa"
 msgid "Cycle Screenshot Sizes"
 msgstr "Vaihtele kuvakaappausten kokojen välillä"

-#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
-#, fuzzy
-#| msgid "Cycle Screenshot Sizes"
-msgid "Cycle Screenshot Sizes Backward"
-msgstr "Vaihtele kuvakaappausten kokojen välillä"
-
 #: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
 msgstr "Teeman nimi"
@@ -250,48 +238,48 @@ msgstr "Teeman nimi, ladataan sijainnista ~/.themes/name/gnome-shell"
 msgid "Close"
 msgstr "Sulje"

-#: extensions/window-list/extension.js:129
+#: extensions/window-list/extension.js:120
 msgid "Unminimize"
 msgstr "Palauta pienennys"

-#: extensions/window-list/extension.js:130
+#: extensions/window-list/extension.js:121
 msgid "Minimize"
 msgstr "Pienennä"

-#: extensions/window-list/extension.js:136
+#: extensions/window-list/extension.js:127
 msgid "Unmaximize"
 msgstr "Palauta suurennus"

-#: extensions/window-list/extension.js:137
+#: extensions/window-list/extension.js:128
 msgid "Maximize"
 msgstr "Suurenna"

-#: extensions/window-list/extension.js:420
+#: extensions/window-list/extension.js:411
 msgid "Minimize all"
 msgstr "Pienennä kaikki"

-#: extensions/window-list/extension.js:428
+#: extensions/window-list/extension.js:419
 msgid "Unminimize all"
 msgstr "Palauta kaikkien koko"

-#: extensions/window-list/extension.js:436
+#: extensions/window-list/extension.js:427
 msgid "Maximize all"
 msgstr "Suurenna kaikki"

-#: extensions/window-list/extension.js:445
+#: extensions/window-list/extension.js:436
 msgid "Unmaximize all"
 msgstr "Palauta kaikkien koko"

-#: extensions/window-list/extension.js:454
+#: extensions/window-list/extension.js:445
 msgid "Close all"
 msgstr "Sulje kaikki"

-#: extensions/window-list/extension.js:678
+#: extensions/window-list/extension.js:669
 #: extensions/workspace-indicator/extension.js:30
 msgid "Workspace Indicator"
 msgstr "Työtilan ilmaisin"

-#: extensions/window-list/extension.js:842
+#: extensions/window-list/extension.js:833
 msgid "Window List"
 msgstr "Ikkunaluettelo"

@@ -300,6 +288,9 @@ msgid "When to group windows"
 msgstr "Milloin ikkunat ryhmitetään"

 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
+#| msgid ""
+#| "Decides when to group windows from the same application on the window "
+#| "list. Possible values are \"never\", \"auto\" and \"always\"."
 msgid ""
 "Decides when to group windows from the same application on the window list. "
 "Possible values are “never”, “auto” and “always”."
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,10 +7,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2017-08-11 01:33+0000\n"
-"PO-Revision-Date: 2017-08-19 18:40+0200\n"
+"POT-Creation-Date: 2017-02-16 01:20+0000\n"
+"PO-Revision-Date: 2017-02-22 19:33+0100\n"
 "Last-Translator: Alain Lojewski <allomervan@gmail.com>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "Language: fr\n"
@@ -39,7 +39,7 @@ msgid ""
 "This key overrides the key in org.gnome.mutter when running GNOME Shell."
 msgstr ""
 "Cette clé remplace la clé dans org.gnome.mutter lorsque GNOME Shell est en "
-"cours d’exécution."
+"cours d'exécution."

 #: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
 msgid "Arrangement of buttons on the titlebar"
@@ -51,22 +51,22 @@ msgid ""
 "GNOME Shell."
 msgstr ""
 "Cette clé remplace la clé dans org.gnome.desktop.wm.preferences lorsque "
-"GNOME Shell est en cours d’exécution."
+"GNOME Shell est en cours d'exécution."

 #: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:24
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr ""
 "Activer la disposition verticale lorsque les fenêtres sont déposées aux "
-"bords de l’écran"
+"bords de l'écran"

 #: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:32
 msgid "Workspaces only on primary monitor"
-msgstr "Espaces de travail uniquement sur l’écran principal"
+msgstr "Espaces de travail uniquement sur l'écran principal"

 #: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:40
 msgid "Delay focus changes in mouse mode until the pointer stops moving"
 msgstr ""
-"Retarder les changements de focus en mode souris jusqu’à ce que le pointeur "
+"Retarder les changements de focus en mode souris jusqu'à ce que le pointeur "
 "arrête de bouger"

 #: extensions/alternate-tab/prefs.js:20
@@ -75,11 +75,11 @@ msgstr "Vignette seulement"

 #: extensions/alternate-tab/prefs.js:21
 msgid "Application icon only"
-msgstr "Icône d’application seulement"
+msgstr "Icône d'application seulement"

 #: extensions/alternate-tab/prefs.js:22
 msgid "Thumbnail and application icon"
-msgstr "Vignette et icône d’application"
+msgstr "Vignette et icône d'application"

 #: extensions/alternate-tab/prefs.js:38
 msgid "Present windows as"
@@ -87,23 +87,23 @@ msgstr "Présenter la fenêtre comme"

 #: extensions/alternate-tab/prefs.js:69
 msgid "Show only windows in the current workspace"
-msgstr "N’afficher les fenêtres que sur l’espace de travail actuel"
+msgstr "N'afficher les fenêtres que sur l'espace de travail actuel"

-#: extensions/apps-menu/extension.js:41
+#: extensions/apps-menu/extension.js:38
 msgid "Activities Overview"
-msgstr "Vue d’ensemble des activités"
+msgstr "Vue d'ensemble des activités"

-#: extensions/apps-menu/extension.js:141
+#: extensions/apps-menu/extension.js:109
 msgid "Favorites"
 msgstr "Favoris"

-#: extensions/apps-menu/extension.js:436
+#: extensions/apps-menu/extension.js:266
 msgid "Applications"
 msgstr "Applications"

 #: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
 msgid "Application and workspace list"
-msgstr "Liste d’applications et d’espaces de travail"
+msgstr "Liste d'applications et d'espaces de travail"

 #: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:7
 msgid ""
@@ -111,8 +111,8 @@ msgid ""
 "followed by a colon and the workspace number"
 msgstr ""
 "Une liste de chaînes de caratères, contenant chacune un identifiant "
-"d’application (nom de fichier desktop), suivi par un deux-points et le "
-"numéro de l’espace de travail"
+"d'application (nom de fichier desktop), suivi par un deux-points et le "
+"numéro de l'espace de travail"

 #: extensions/auto-move-windows/prefs.js:60
 msgid "Application"
@@ -135,19 +135,18 @@ msgstr "Créer une nouvelle règle de concordance"
 msgid "Add"
 msgstr "Ajouter"

-#. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:107
+#: extensions/drive-menu/extension.js:106
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
-msgstr "L’éjection du disque « %s » a échoué :"
+msgstr "L'éjection du disque « %s » a échoué :"

-#: extensions/drive-menu/extension.js:125
+#: extensions/drive-menu/extension.js:124
 msgid "Removable devices"
 msgstr "Périphériques amovibles"

-#: extensions/drive-menu/extension.js:150
-msgid "Open Files"
-msgstr "Ouvrir Fichiers"
+#: extensions/drive-menu/extension.js:149
+msgid "Open File"
+msgstr "Ouvrir le fichier"

 #: extensions/example/extension.js:17
 msgid "Hello, world!"
@@ -155,14 +154,14 @@ msgstr "Bonjour le monde !"

 #: extensions/example/org.gnome.shell.extensions.example.gschema.xml:5
 msgid "Alternative greeting text."
-msgstr "Autre texte d’accueil."
+msgstr "Autre texte d'accueil."

 #: 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 ""
-"S’il n’est pas vide, il contient le texte qui s’affiche lorsque vous cliquez "
+"S'il n'est pas vide, il contient le texte qui s'affiche lorsque vous cliquez "
 "sur le tableau de bord."

 #: extensions/example/prefs.js:30
@@ -178,12 +177,12 @@ msgid ""
 "Nevertheless it’s possible to customize the greeting message."
 msgstr ""
 "Example a pour but de montrer comment construire de bonnes extensions pour "
-"le Shell et en tant que tel, il n’a que peu de fonctionnalités en soi.\n"
-"Il est néanmoins possible de personnaliser le message d’accueil."
+"le Shell et en tant que tel, il n'a que peu de fonctionnalités en soi.\n"
+"Il est néanmoins possible de personnaliser le message d'accueil."

 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
 msgid "Use more screen for windows"
-msgstr "Utiliser plus d’écran pour les fenêtres"
+msgstr "Utiliser plus d'écran pour les fenêtres"

 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
 msgid ""
@@ -191,9 +190,9 @@ msgid ""
 "aspect ratio, and consolidating them further to reduce the bounding box. "
 "This setting applies only with the natural placement strategy."
 msgstr ""
-"Essaye d’utiliser plus d’espace écran pour placer les vignettes des fenêtres "
-"en s’adaptant aux proportions de l’écran et en les consolidant davantage "
-"pour réduire la zone englobante. Ce paramètre ne s’applique qu’en utilisant "
+"Essaye d'utiliser plus d'espace écran pour placer les vignettes des fenêtres "
+"en s'adaptant aux proportions de l'écran et en les consolidant davantage "
+"pour réduire la zone englobante. Ce paramètre ne s'applique qu'en utilisant "
 "la stratégie de placement « natural »."

 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
@@ -216,26 +215,21 @@ msgstr ""
 msgid "Places"
 msgstr "Emplacements"

-#: extensions/places-menu/placeDisplay.js:65
-#, javascript-format
-msgid "Failed to mount volume for “%s”"
-msgstr "Impossible de monter le volume « %s »"
-
-#: extensions/places-menu/placeDisplay.js:78
+#: extensions/places-menu/placeDisplay.js:59
 #, javascript-format
 msgid "Failed to launch “%s”"
 msgstr "Impossible de lancer « %s »"

-#: extensions/places-menu/placeDisplay.js:137
-#: extensions/places-menu/placeDisplay.js:160
+#: extensions/places-menu/placeDisplay.js:101
+#: extensions/places-menu/placeDisplay.js:124
 msgid "Computer"
 msgstr "Ordinateur"

-#: extensions/places-menu/placeDisplay.js:303
+#: extensions/places-menu/placeDisplay.js:267
 msgid "Home"
 msgstr "Dossier personnel"

-#: extensions/places-menu/placeDisplay.js:347
+#: extensions/places-menu/placeDisplay.js:311
 msgid "Browse Network"
 msgstr "Parcourir le réseau"

@@ -243,10 +237,6 @@ msgstr "Parcourir le réseau"
 msgid "Cycle Screenshot Sizes"
 msgstr "Passer à la taille de capture suivante"

-#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
-msgid "Cycle Screenshot Sizes Backward"
-msgstr "Passer à la taille de capture précédante"
-
 #: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
 msgstr "Nom du thème"
@@ -259,48 +249,48 @@ msgstr "Le nom du thème, à charger à partir de ~/.themes/name/gnome-shell"
 msgid "Close"
 msgstr "Fermer"

-#: extensions/window-list/extension.js:129
+#: extensions/window-list/extension.js:120
 msgid "Unminimize"
 msgstr "Restaurer"

-#: extensions/window-list/extension.js:130
+#: extensions/window-list/extension.js:121
 msgid "Minimize"
 msgstr "Réduire"

-#: extensions/window-list/extension.js:136
+#: extensions/window-list/extension.js:127
 msgid "Unmaximize"
 msgstr "Restaurer"

-#: extensions/window-list/extension.js:137
+#: extensions/window-list/extension.js:128
 msgid "Maximize"
 msgstr "Maximiser"

-#: extensions/window-list/extension.js:420
+#: extensions/window-list/extension.js:411
 msgid "Minimize all"
 msgstr "Réduire tout"

-#: extensions/window-list/extension.js:428
+#: extensions/window-list/extension.js:419
 msgid "Unminimize all"
 msgstr "Restaurer tout"

-#: extensions/window-list/extension.js:436
+#: extensions/window-list/extension.js:427
 msgid "Maximize all"
 msgstr "Maximiser tout"

-#: extensions/window-list/extension.js:445
+#: extensions/window-list/extension.js:436
 msgid "Unmaximize all"
 msgstr "Restaurer tout"

-#: extensions/window-list/extension.js:454
+#: extensions/window-list/extension.js:445
 msgid "Close all"
 msgstr "Fermer tout"

-#: extensions/window-list/extension.js:678
+#: extensions/window-list/extension.js:669
 #: extensions/workspace-indicator/extension.js:30
 msgid "Workspace Indicator"
-msgstr "Indicateur d’espace de travail"
+msgstr "Indicateur d'espace de travail"

-#: extensions/window-list/extension.js:842
+#: extensions/window-list/extension.js:833
 msgid "Window List"
 msgstr "Liste de fenêtres"

@@ -313,7 +303,7 @@ msgid ""
 "Decides when to group windows from the same application on the window list. "
 "Possible values are “never”, “auto” and “always”."
 msgstr ""
-"Décide quand regrouper les fenêtres d’une même application sur la liste des "
+"Décide quand regrouper les fenêtres d'une même application sur la liste des "
 "fenêtres. Les valeurs possibles sont « never » (jamais), « auto » et "
 "« always » (toujours)."

@@ -326,8 +316,8 @@ msgid ""
 "Whether to show the window list on all connected monitors or only on the "
 "primary one."
 msgstr ""
-"Indique s’il faut afficher la liste des fenêtres sur tous les écrans "
-"connectés ou seulement l’écran principal."
+"Indique s'il faut afficher la liste des fenêtres sur tous les écrans "
+"connectés ou seulement l'écran principal."

 #: extensions/window-list/prefs.js:32
 msgid "Window Grouping"
@@ -339,7 +329,7 @@ msgstr "Ne jamais regrouper les fenêtres"

 #: extensions/window-list/prefs.js:51
 msgid "Group windows when space is limited"
-msgstr "Regrouper les fenêtres quand l’espace est limité"
+msgstr "Regrouper les fenêtres quand l'espace est limité"

 #: extensions/window-list/prefs.js:52
 msgid "Always group windows"
--- a/po/fur.po
+++ b/po/fur.po
@@ -8,15 +8,15 @@ 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-07-06 14:32+0000\n"
-"PO-Revision-Date: 2017-07-07 00:55+0200\n"
+"POT-Creation-Date: 2017-02-22 18:40+0000\n"
+"PO-Revision-Date: 2017-02-24 00:51+0100\n"
 "Last-Translator: Fabio Tomat <f.t.public@gmail.com>\n"
 "Language-Team: Friulian <fur@li.org>\n"
 "Language: fur\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.12\n"
+"X-Generator: Poedit 1.8.11\n"

 #: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
 msgid "GNOME Classic"
@@ -88,15 +88,15 @@ msgstr "Mostre i barcons come"
 msgid "Show only windows in the current workspace"
 msgstr "Mostre dome i balcons dal spazi di lavôr corint"

-#: extensions/apps-menu/extension.js:41
+#: extensions/apps-menu/extension.js:38
 msgid "Activities Overview"
 msgstr "Panoramiche ativitâts"

-#: extensions/apps-menu/extension.js:141
+#: extensions/apps-menu/extension.js:109
 msgid "Favorites"
 msgstr "Preferîts"

-#: extensions/apps-menu/extension.js:436
+#: extensions/apps-menu/extension.js:266
 msgid "Applications"
 msgstr "Aplicazions"

@@ -143,8 +143,8 @@ msgid "Removable devices"
 msgstr "Argagn rimovibil"

 #: extensions/drive-menu/extension.js:149
-msgid "Open Files"
-msgstr "Vierç i file"
+msgid "Open File"
+msgstr "Vierç File"

 #: extensions/example/extension.js:17
 msgid "Hello, world!"
@@ -210,36 +210,27 @@ msgstr ""
 msgid "Places"
 msgstr "Puescj"

-#: extensions/places-menu/placeDisplay.js:65
-#, javascript-format
-msgid "Failed to mount volume for “%s”"
-msgstr "No si è rivâts a montâ il volum par “%s”"
-
-#: extensions/places-menu/placeDisplay.js:78
+#: extensions/places-menu/placeDisplay.js:59
 #, javascript-format
 msgid "Failed to launch “%s”"
 msgstr "No si è rivâts a inviâ “%s”"

-#: extensions/places-menu/placeDisplay.js:137
-#: extensions/places-menu/placeDisplay.js:160
+#: extensions/places-menu/placeDisplay.js:101
+#: extensions/places-menu/placeDisplay.js:124
 msgid "Computer"
 msgstr "Computer"

-#: extensions/places-menu/placeDisplay.js:303
+#: extensions/places-menu/placeDisplay.js:267
 msgid "Home"
 msgstr "Cjase"

-#: extensions/places-menu/placeDisplay.js:347
+#: extensions/places-menu/placeDisplay.js:311
 msgid "Browse Network"
 msgstr "Esplore rêt"

 #: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
 msgid "Cycle Screenshot Sizes"
-msgstr "Dimensions caturis di schermi ciclichis"
-
-#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
-msgid "Cycle Screenshot Sizes Backward"
-msgstr "Dimensions caturis di schermi ciclichis indaûr"
+msgstr "Dimensions screenshot ciclic"

 #: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
@@ -253,48 +244,48 @@ msgstr "Il non dal teme, che si cjame da ~/.themes/name/gnome-shell"
 msgid "Close"
 msgstr "Siere"

-#: extensions/window-list/extension.js:129
+#: extensions/window-list/extension.js:120
 msgid "Unminimize"
 msgstr "Gjave minimizazion"

-#: extensions/window-list/extension.js:130
+#: extensions/window-list/extension.js:121
 msgid "Minimize"
 msgstr "Minimize"

-#: extensions/window-list/extension.js:136
+#: extensions/window-list/extension.js:127
 msgid "Unmaximize"
 msgstr "Gjave massimizazion"

-#: extensions/window-list/extension.js:137
+#: extensions/window-list/extension.js:128
 msgid "Maximize"
 msgstr "Massimize"

-#: extensions/window-list/extension.js:420
+#: extensions/window-list/extension.js:411
 msgid "Minimize all"
 msgstr "Minimize ducj"

-#: extensions/window-list/extension.js:428
+#: extensions/window-list/extension.js:419
 msgid "Unminimize all"
 msgstr "Gjave a ducj la minimizazion"

-#: extensions/window-list/extension.js:436
+#: extensions/window-list/extension.js:427
 msgid "Maximize all"
 msgstr "Massimize ducj"

-#: extensions/window-list/extension.js:445
+#: extensions/window-list/extension.js:436
 msgid "Unmaximize all"
 msgstr "Gjave a ducj la massimizazion"

-#: extensions/window-list/extension.js:454
+#: extensions/window-list/extension.js:445
 msgid "Close all"
 msgstr "Siere ducj"

-#: extensions/window-list/extension.js:678
+#: extensions/window-list/extension.js:669
 #: extensions/workspace-indicator/extension.js:30
 msgid "Workspace Indicator"
 msgstr "Indicadôr spazi di lavôr"

-#: extensions/window-list/extension.js:842
+#: extensions/window-list/extension.js:833
 msgid "Window List"
 msgstr "Liste balcons"

--- a/po/gd.po
+++ b/po/gd.po
@@ -1,14 +1,14 @@
 # Scottish Gaelic translation for gnome-shell-extensions.
 # Copyright (C) 2015 gnome-shell-extensions's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-shell-extensions package.
-# GunChleoc <fios@foramnagaidhlig.net>, 2015, 2016, 2018.
+# GunChleoc <fios@foramnagaidhlig.net>, 2015, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-"
-"extensions/issues\n"
-"POT-Creation-Date: 2017-12-18 18:40+0000\n"
-"PO-Revision-Date: 2018-02-26 12:52+0100\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"shell&keywords=I18N+L10N&component=extensions\n"
+"POT-Creation-Date: 2016-04-29 09:49+0000\n"
+"PO-Revision-Date: 2016-04-29 11:09+0100\n"
 "Last-Translator: GunChleoc <fios@foramnagaidhlig.net>\n"
 "Language-Team: Fòram na Gàidhlig\n"
 "Language: gd\n"
@@ -21,93 +21,91 @@ msgstr ""
 "X-DamnedLies-Scope: partial\n"
 "X-Project-Style: gnome\n"

-#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
+#: ../data/gnome-classic.desktop.in.h:1
+#: ../data/gnome-classic.session.desktop.in.in.h:1
 msgid "GNOME Classic"
 msgstr "GNOME clasaigeach"

-#: data/gnome-classic.desktop.in:4
+#: ../data/gnome-classic.desktop.in.h:2
 msgid "This session logs you into GNOME Classic"
 msgstr "Clàraidh an seisean seo a-steach gu GNOME clasaigeach thu"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:7
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:1
 msgid "Attach modal dialog to the parent window"
 msgstr "Ceangail còmhradh mòdach ris an uinneag-pàraint"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:8
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:25
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:33
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:41
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:2
 msgid ""
 "This key overrides the key in org.gnome.mutter when running GNOME Shell."
 msgstr ""
 "Tar-àithnidh an iuchair seo an iuchair ann an org.gnome.mutter nuair a thèid "
 "Slige GNOME a ruith."

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:3
 msgid "Arrangement of buttons on the titlebar"
-msgstr "Seòrsachadh nam putanan air a’ bhàr-tiotail"
+msgstr "Seòrsachadh nam putanan air a' bhàr-tiotail"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:17
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:4
 msgid ""
 "This key overrides the key in org.gnome.desktop.wm.preferences when running "
 "GNOME Shell."
 msgstr ""
-"Tar-àithnidh an iuchair seo an iuchair ann an org.gnome.desktop.wm."
-"preferences nuair a thèid Slige GNOME a ruith."
+"Tar-àithnidh an iuchair seo an iuchair ann an "
+"org.gnome.desktop.wm.preferences nuair a thèid Slige GNOME a ruith."

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:24
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:5
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr ""
 "Cuir leacadh nan oirean an comas nuair a thèid uinneagan a leigeil às aig "
 "oir na sgrìn"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:32
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:6
 msgid "Workspaces only on primary monitor"
-msgstr "Rumannan-obrach air a’ phrìomh-sgrìn a-mhàin"
+msgstr "Rumannan-obrach air a' phrìomh-sgrìn a-mhàin"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:40
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:7
 msgid "Delay focus changes in mouse mode until the pointer stops moving"
 msgstr ""
 "Cuir dàil air atharraichean an fòcais ann am modh luchaige gus an sguir an "
 "tomhaire air gluasad"

-#: extensions/alternate-tab/prefs.js:20
+#: ../extensions/alternate-tab/prefs.js:20
 msgid "Thumbnail only"
 msgstr "Dealbhagan a-mhàin"

-#: extensions/alternate-tab/prefs.js:21
+#: ../extensions/alternate-tab/prefs.js:21
 msgid "Application icon only"
 msgstr "Ìomhaigheag na h-aplacaid a-mhàin"

-#: extensions/alternate-tab/prefs.js:22
+#: ../extensions/alternate-tab/prefs.js:22
 msgid "Thumbnail and application icon"
 msgstr "Dealbhag is ìomhaigheag na h-aplacaid"

-#: extensions/alternate-tab/prefs.js:38
+#: ../extensions/alternate-tab/prefs.js:38
 msgid "Present windows as"
 msgstr "Seall uinneagan mar"

-#: extensions/alternate-tab/prefs.js:69
+#: ../extensions/alternate-tab/prefs.js:69
 msgid "Show only windows in the current workspace"
 msgstr "Na seall ach na h-uinneagan san rum-obrach làithreach"

-#: extensions/apps-menu/extension.js:41
+#: ../extensions/apps-menu/extension.js:38
 msgid "Activities Overview"
 msgstr "Foir-shealladh nan gnìomhachdan"

-#: extensions/apps-menu/extension.js:141
+#: ../extensions/apps-menu/extension.js:109
 msgid "Favorites"
 msgstr "Annsachdan"

-#: extensions/apps-menu/extension.js:436
+#: ../extensions/apps-menu/extension.js:266
 msgid "Applications"
 msgstr "Aplacaidean"

-#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
+#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:1
 msgid "Application and workspace list"
 msgstr "Ìomhaigheag na h-aplacaid is liosta nan rumannan-obrach"

-#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:7
+#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
 msgid ""
 "A list of strings, each containing an application id (desktop file name), "
 "followed by a colon and the workspace number"
@@ -115,84 +113,77 @@ msgstr ""
 "Liosta dhe shreangan le id aplacaid (ainm faidhle desktop) aig gach tè air a "
 "leantainn le còilean is àireamh an ruim-obrach"

-#: extensions/auto-move-windows/prefs.js:56
+#: ../extensions/auto-move-windows/prefs.js:60
 msgid "Application"
 msgstr "Aplacaid"

-#: extensions/auto-move-windows/prefs.js:65
-#: extensions/auto-move-windows/prefs.js:123
+#: ../extensions/auto-move-windows/prefs.js:69
+#: ../extensions/auto-move-windows/prefs.js:127
 msgid "Workspace"
 msgstr "Rum-obrach"

-#: extensions/auto-move-windows/prefs.js:81
+#: ../extensions/auto-move-windows/prefs.js:85
 msgid "Add Rule"
 msgstr "Cuir riaghailt ris"

-#: extensions/auto-move-windows/prefs.js:102
+#: ../extensions/auto-move-windows/prefs.js:106
 msgid "Create new matching rule"
 msgstr "Cruthaich riaghailt maidsidh ùr"

-#: extensions/auto-move-windows/prefs.js:107
+#: ../extensions/auto-move-windows/prefs.js:111
 msgid "Add"
 msgstr "Cuir ris"

-#. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:107
+#: ../extensions/drive-menu/extension.js:106
 #, javascript-format
-#| msgid "Ejecting drive '%s' failed:"
-msgid "Ejecting drive “%s” failed:"
-msgstr "Cha deach leinn draibh “%s” a ghluasad a-mach:"
+msgid "Ejecting drive '%s' failed:"
+msgstr "Cha deach leinn draibh \"%s\" a ghluasad a-mach:"

-#: extensions/drive-menu/extension.js:125
+#: ../extensions/drive-menu/extension.js:124
 msgid "Removable devices"
 msgstr "Draibhean so-ghiùlain"

-#: extensions/drive-menu/extension.js:150
-#| msgid "Open File"
-msgid "Open Files"
-msgstr "Fosgail faidhlichean"
+#: ../extensions/drive-menu/extension.js:149
+msgid "Open File"
+msgstr "Fosgail am faidhle"

-#: extensions/example/extension.js:17
+#: ../extensions/example/extension.js:17
 msgid "Hello, world!"
 msgstr "Shin thu, a shaoghail!"

-#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:5
+#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:1
 msgid "Alternative greeting text."
 msgstr "Teacsa fàilteachaidh eile."

-#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:6
+#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:2
 msgid ""
 "If not empty, it contains the text that will be shown when clicking on the "
 "panel."
 msgstr ""
-"Mur eil seo falamh, tha an teacsa ’na bhroinn a thèid a shealltainn le "
-"briogadh air a’ phanail."
+"Mur eil seo falamh, tha an teacsa 'na bhroinn a thèid a shealltainn le "
+"briogadh air a' phanail."

-#: extensions/example/prefs.js:30
+#: ../extensions/example/prefs.js:30
 msgid "Message"
 msgstr "Teachdaireachd"

 #. TRANSLATORS: Example is the name of the extension, should not be
 #. translated
-#: extensions/example/prefs.js:43
-#| msgid ""
-#| "Example aims to show how to build well behaved extensions for the Shell "
-#| "and as such it has little functionality on its own.\n"
-#| "Nevertheless it's possible to customize the greeting message."
+#: ../extensions/example/prefs.js: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 ""
 "Tha am ball-eisimpleir airson sealltainn dhut mar a thogas tu leudachain le "
 "deagh-ghiùlan airson na Slige agus mar sin cha dèan e fhèin mòran.\n"
-"’S urrainn dhut an teachdaireachd fàilteachaidh a ghnàthachadh co-dhiù."
+"'S urrainn dhut an teachdaireachd fàilteachaidh a ghnàthachadh co-dhiù."

-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:1
 msgid "Use more screen for windows"
 msgstr "Cleachd cuid nas motha dhen sgrìn airson uinneagan"

-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:2
 msgid ""
 "Try to use more screen for placing window thumbnails by adapting to screen "
 "aspect ratio, and consolidating them further to reduce the bounding box. "
@@ -203,173 +194,159 @@ msgstr ""
 "barrachd co-dhaingneachaidh ach am bi am bogsa-iadhaidh nas lugha. Cha bhi "
 "an roghainn seo an sàs ach leis an ro-innleachd suidheachaidh nàdarra."

-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:3
 msgid "Place window captions on top"
-msgstr "Cuir caipseanan nan uinneagan air a’ bharr"
+msgstr "Cuir caipseanan nan uinneagan air a' bharr"

-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:12
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:4
 msgid ""
 "If true, place window captions on top the respective thumbnail, overriding "
 "shell default of placing it at the bottom. Changing this setting requires "
 "restarting the shell to have any effect."
 msgstr ""
-"Mas e true a th’ ann, thèid caipseanan nan uinneagan a chur ri barr nan "
-"dealbhagan, a’ tar-àithneadh bun-roghainn na slige a chuireas aig a’ bhonn "
-"iad. Ma dh’atharraicheas tu an roghainn seo, feumaidh tu an t-slige a "
+"Mas e true a th' ann, thèid caipseanan nan uinneagan a chur ri barr nan "
+"dealbhagan, a' tar-àithneadh bun-roghainn na slige a chuireas aig a' bhonn "
+"iad. Ma dh'atharraicheas tu an roghainn seo, feumaidh tu an t-slige a "
 "thòiseachadh às ùr gus an dèid a cur an sàs."

-#: extensions/places-menu/extension.js:78
-#: extensions/places-menu/extension.js:81
+#: ../extensions/places-menu/extension.js:78
+#: ../extensions/places-menu/extension.js:81
 msgid "Places"
 msgstr "Ionadan"

-#: extensions/places-menu/placeDisplay.js:65
+#: ../extensions/places-menu/placeDisplay.js:59
 #, javascript-format
-msgid "Failed to mount volume for “%s”"
-msgstr "Cha b’ urrainn dhuinn an t-iom-dhraibh airson “%s” a mhunntachadh"
+msgid "Failed to launch \"%s\""
+msgstr "Cha b' urrainn dhuinn \"%s\" a chur gu dol"

-#: extensions/places-menu/placeDisplay.js:78
-#, javascript-format
-#| msgid "Failed to launch \"%s\""
-msgid "Failed to launch “%s”"
-msgstr "Cha b’ urrainn dhuinn “%s” a chur gu dol"
-
-#: extensions/places-menu/placeDisplay.js:137
-#: extensions/places-menu/placeDisplay.js:160
+#: ../extensions/places-menu/placeDisplay.js:101
+#: ../extensions/places-menu/placeDisplay.js:124
 msgid "Computer"
 msgstr "Coimpiutair"

-#: extensions/places-menu/placeDisplay.js:303
+#: ../extensions/places-menu/placeDisplay.js:267
 msgid "Home"
 msgstr "Dachaigh"

-#: extensions/places-menu/placeDisplay.js:347
+#: ../extensions/places-menu/placeDisplay.js:311
 msgid "Browse Network"
 msgstr "Brabhsaich an lìonra"

-#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
+#: ../extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml.in.h:1
 msgid "Cycle Screenshot Sizes"
 msgstr "Cuartaich meudan nan glacaidhean-sgrìn"

-#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
-#| msgid "Cycle Screenshot Sizes"
-msgid "Cycle Screenshot Sizes Backward"
-msgstr "Cuartaich meudan nan glacaidhean-sgrìn gu contrarra"
-
-#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
+#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:1
 msgid "Theme name"
 msgstr "Ainm an ùrlair"

-#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:6
+#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:2
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "Ainm an ùrlair a thèid a luchdadh o ~/.themes/name/gnome-shell"

-#: extensions/window-list/extension.js:110
+#: ../extensions/window-list/extension.js:110
 msgid "Close"
 msgstr "Dùin"

-#: extensions/window-list/extension.js:129
+#: ../extensions/window-list/extension.js:120
 msgid "Unminimize"
 msgstr "Neo-fhìor-lùghdaich"

-#: extensions/window-list/extension.js:130
+#: ../extensions/window-list/extension.js:121
 msgid "Minimize"
 msgstr "Fìor-lùghdaich"

-#: extensions/window-list/extension.js:136
+#: ../extensions/window-list/extension.js:127
 msgid "Unmaximize"
 msgstr "Neo-làn-mheudaich"

-#: extensions/window-list/extension.js:137
+#: ../extensions/window-list/extension.js:128
 msgid "Maximize"
 msgstr "Làn-mheudaich"

-#: extensions/window-list/extension.js:420
+#: ../extensions/window-list/extension.js:403
 msgid "Minimize all"
 msgstr "Fìor-lùghdaich na h-uile"

-#: extensions/window-list/extension.js:428
+#: ../extensions/window-list/extension.js:411
 msgid "Unminimize all"
 msgstr "Neo-fhìor-lùghdaich na h-uile"

-#: extensions/window-list/extension.js:436
+#: ../extensions/window-list/extension.js:419
 msgid "Maximize all"
 msgstr "Làn-mheudaich na h-uile"

-#: extensions/window-list/extension.js:445
+#: ../extensions/window-list/extension.js:428
 msgid "Unmaximize all"
 msgstr "Neo-làn-mheudaich na h-uile"

-#: extensions/window-list/extension.js:454
+#: ../extensions/window-list/extension.js:437
 msgid "Close all"
 msgstr "Dùin na h-uile"

-#: extensions/window-list/extension.js:678
-#: extensions/workspace-indicator/extension.js:30
+#: ../extensions/window-list/extension.js:661
+#: ../extensions/workspace-indicator/extension.js:30
 msgid "Workspace Indicator"
 msgstr "Taisbeanair ruim-obrach"

-#: extensions/window-list/extension.js:842
+#: ../extensions/window-list/extension.js:820
 msgid "Window List"
 msgstr "Liosta nan uinneagan"

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:12
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:1
 msgid "When to group windows"
 msgstr "Cuin a thèid na h-uinneagan a bhuidhneachadh"

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
-#| msgid ""
-#| "Decides when to group windows from the same application on the window "
-#| "list. Possible values are \"never\", \"auto\" and \"always\"."
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:2
 msgid ""
 "Decides when to group windows from the same application on the window list. "
-"Possible values are “never”, “auto” and “always”."
+"Possible values are \"never\", \"auto\" and \"always\"."
 msgstr ""
 "Mìnichidh seo cuin a thèid uinneagan aig an aon aplacaid a bhuidhneachadh "
-"air liosta nan uinneagan. ’S e “never”, “auto” agus “always” a tha sna "
+"air liosta nan uinneagan. 'S e \"never\", \"auto\" agus \"always\" a tha sna "
 "roghainnean dligheach."

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:3
 msgid "Show the window list on all monitors"
 msgstr "Seall liosta nan uinneagan air a h-uile sgrìn"

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:4
 msgid ""
 "Whether to show the window list on all connected monitors or only on the "
 "primary one."
 msgstr ""
 "Co-dhiù an dèid liosta nan uinneagan a shealltainn air gach sgrìn "
-"cheangailte no air a’ phrìomh-thè a-mhàin."
+"cheangailte no air a' phrìomh-thè a-mhàin."

-#: extensions/window-list/prefs.js:32
+#: ../extensions/window-list/prefs.js:32
 msgid "Window Grouping"
 msgstr "Buidhneachadh nan uinneagan"

-#: extensions/window-list/prefs.js:50
+#: ../extensions/window-list/prefs.js:50
 msgid "Never group windows"
 msgstr "Na buidhnich na h-uinneagan idir"

-#: extensions/window-list/prefs.js:51
+#: ../extensions/window-list/prefs.js:51
 msgid "Group windows when space is limited"
 msgstr "Buidhnich na h-uinneagan nuair a bhios an rum gann"

-#: extensions/window-list/prefs.js:52
+#: ../extensions/window-list/prefs.js:52
 msgid "Always group windows"
 msgstr "Buidhnich na h-uinneagan an-còmhnaidh"

-#: extensions/window-list/prefs.js:75
+#: ../extensions/window-list/prefs.js:75
 msgid "Show on all monitors"
 msgstr "Seall air a h-uile sgrìn"

-#: extensions/workspace-indicator/prefs.js:141
+#: ../extensions/workspace-indicator/prefs.js:141
 msgid "Workspace Names"
 msgstr "Ainmean nan rumannan-obrach"

-#: extensions/workspace-indicator/prefs.js:157
+#: ../extensions/workspace-indicator/prefs.js:157
 msgid "Name"
 msgstr "Ainm"

-#: extensions/workspace-indicator/prefs.js:198
+#: ../extensions/workspace-indicator/prefs.js:198
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Rum-obrach %d"
--- a/po/gl.po
+++ b/po/gl.po
@@ -3,49 +3,39 @@
 # This file is distributed under the same license as the gnome-shell-extensions package.
 # Fran Diéguez <frandieguez@gnome.org>, 2011.
 # Fran Dieguez <frandieguez@gnome.org>, 2011, 2012, 2013, 2014, 2015, 2017.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2017-07-05 15:07+0000\n"
-"PO-Revision-Date: 2017-08-07 15:04+0200\n"
+"POT-Creation-Date: 2017-02-26 01:13+0100\n"
+"PO-Revision-Date: 2017-02-26 01:15+0100\n"
 "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
-"Language-Team: Galician\n"
+"Language-Team: Galician <gnome-l10n-gl@gnome.org>\n"
 "Language: gl\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: Gtranslator 2.91.7\n"
 "X-Project-Style: gnome\n"

-#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
-msgid "GNOME Classic"
-msgstr "GNOME clasico"
-
-#: data/gnome-classic.desktop.in:4
-msgid "This session logs you into GNOME Classic"
-msgstr "Esta sesión iniciarao en GNOME clásico"
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:7
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.h:1
 msgid "Attach modal dialog to the parent window"
 msgstr "Anexar o diálogo modal á xanela pai"

-#: 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
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.h:2
 msgid ""
 "This key overrides the key in org.gnome.mutter when running GNOME Shell."
 msgstr ""
 "Esta chave sobrescribe a chave en org.gnome.mutter cando executa GNOME Shell."

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.h:3
 msgid "Arrangement of buttons on the titlebar"
 msgstr "Ordenación dos botóns na barra de título"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:17
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.h:4
 msgid ""
 "This key overrides the key in org.gnome.desktop.wm.preferences when running "
 "GNOME Shell."
@@ -53,56 +43,56 @@ msgstr ""
 "Esta chave sobrescribe a chave en org.gnome.desktop.wm.preferences ao "
 "executar GNOME Shell."

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:24
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.h:5
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr "Activar o mosaico nos bordos ao arrastrar xanelas aos bordos da xanela"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:32
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.h:6
 msgid "Workspaces only on primary monitor"
 msgstr "Espazos de traballo só no monitor primario"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:40
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.h:7
 msgid "Delay focus changes in mouse mode until the pointer stops moving"
 msgstr ""
 "Atrasar o cambio de foco no modo rato até que o punteiro se deteña ao moverse"

-#: extensions/alternate-tab/prefs.js:20
+#: ../extensions/alternate-tab/prefs.js:20
 msgid "Thumbnail only"
 msgstr "Só miniaturas"

-#: extensions/alternate-tab/prefs.js:21
+#: ../extensions/alternate-tab/prefs.js:21
 msgid "Application icon only"
 msgstr "Só icona do aplicativo"

-#: extensions/alternate-tab/prefs.js:22
+#: ../extensions/alternate-tab/prefs.js:22
 msgid "Thumbnail and application icon"
 msgstr "Miniatura e icona do aplicativo"

-#: extensions/alternate-tab/prefs.js:38
+#: ../extensions/alternate-tab/prefs.js:38
 msgid "Present windows as"
 msgstr "Presentar xanelas como"

-#: extensions/alternate-tab/prefs.js:69
+#: ../extensions/alternate-tab/prefs.js:69
 msgid "Show only windows in the current workspace"
 msgstr "Mostrar só as xanelas na área de traballo actual"

-#: extensions/apps-menu/extension.js:41
+#: ../extensions/apps-menu/extension.js:38
 msgid "Activities Overview"
 msgstr "Vista xeral de actividades"

-#: extensions/apps-menu/extension.js:141
+#: ../extensions/apps-menu/extension.js:109
 msgid "Favorites"
 msgstr "Favoritos"

-#: extensions/apps-menu/extension.js:436
+#: ../extensions/apps-menu/extension.js:266
 msgid "Applications"
 msgstr "Aplicativos"

-#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
+#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.h:1
 msgid "Application and workspace list"
 msgstr "Lista de aplicativos e espazos de traballo"

-#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:7
+#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.h:2
 msgid ""
 "A list of strings, each containing an application id (desktop file name), "
 "followed by a colon and the workspace number"
@@ -110,63 +100,62 @@ msgstr ""
 "Unha lista de cadeas, cada unha das cales contén un id de aplicativo (nome "
 "de ficheiro desktop), seguido por unha coma e o número do espazo de traballo"

-#: extensions/auto-move-windows/prefs.js:60
+#: ../extensions/auto-move-windows/prefs.js:60
 msgid "Application"
 msgstr "Aplicativo"

-#: extensions/auto-move-windows/prefs.js:69
-#: extensions/auto-move-windows/prefs.js:127
+#: ../extensions/auto-move-windows/prefs.js:69
+#: ../extensions/auto-move-windows/prefs.js:127
 msgid "Workspace"
 msgstr "Área de traballo"

-#: extensions/auto-move-windows/prefs.js:85
+#: ../extensions/auto-move-windows/prefs.js:85
 msgid "Add Rule"
 msgstr "Engadir regra"

-#: extensions/auto-move-windows/prefs.js:106
+#: ../extensions/auto-move-windows/prefs.js:106
 msgid "Create new matching rule"
 msgstr "Crear regra de coincidencia nova"

-#: extensions/auto-move-windows/prefs.js:111
+#: ../extensions/auto-move-windows/prefs.js:111
 msgid "Add"
 msgstr "Engadir"

-#: extensions/drive-menu/extension.js:106
+#: ../extensions/drive-menu/extension.js:106
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "Fallo ao extraer a unidade «%s»:"

-#: extensions/drive-menu/extension.js:124
+#: ../extensions/drive-menu/extension.js:124
 msgid "Removable devices"
 msgstr "Dispositivos extraíbeis"

-#: extensions/drive-menu/extension.js:149
-#| msgid "Open File"
-msgid "Open Files"
-msgstr "Abrir ficheiros"
+#: ../extensions/drive-menu/extension.js:149
+msgid "Open File"
+msgstr "Abrir ficheiro"

-#: extensions/example/extension.js:17
+#: ../extensions/example/extension.js:17
 msgid "Hello, world!"
 msgstr "Hola, mundo!"

-#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:5
+#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.h:1
 msgid "Alternative greeting text."
 msgstr "Texto de benvida alternativo"

-#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:6
+#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.h:2
 msgid ""
 "If not empty, it contains the text that will be shown when clicking on the "
 "panel."
 msgstr ""
 "Se non está baleiro, contén o texto que se despregará ao premer sobre o panel"

-#: extensions/example/prefs.js:30
+#: ../extensions/example/prefs.js:30
 msgid "Message"
 msgstr "Mensaxe"

 #. 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"
@@ -176,11 +165,11 @@ msgstr ""
 "para a Shell e por iso ten pouca funcionalidade por si só.\n"
 "Porén, é posíbel personalizar a mensaxe de benvida."

-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.h:1
 msgid "Use more screen for windows"
 msgstr "Usar máis pantalla para as xanelas"

-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.h:2
 msgid ""
 "Try to use more screen for placing window thumbnails by adapting to screen "
 "aspect ratio, and consolidating them further to reduce the bounding box. "
@@ -190,11 +179,11 @@ msgstr ""
 "taxa de aspecto da pantalla e consolidalas para reducir a caixa saltante. "
 "Esta configuración aplícase só para a estratexia de disposición natural."

-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.h:3
 msgid "Place window captions on top"
 msgstr "Pór a xanela sempre na parte superior"

-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:12
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.h:4
 msgid ""
 "If true, place window captions on top the respective thumbnail, overriding "
 "shell default of placing it at the bottom. Changing this setting requires "
@@ -204,106 +193,95 @@ msgstr ""
 "respectiva, omitindo a disposición inferior por omisión do shell. Se cambia "
 "esta configuración deberá reiniciar o shell para que se apliquen os cambios."

-#: extensions/places-menu/extension.js:78
-#: extensions/places-menu/extension.js:81
+#: ../extensions/places-menu/extension.js:78
+#: ../extensions/places-menu/extension.js:81
 msgid "Places"
 msgstr "Lugares"

-#: extensions/places-menu/placeDisplay.js:65
-#, javascript-format
-#| msgid "Failed to launch “%s”"
-msgid "Failed to mount volume for “%s”"
-msgstr "Produciuse un fallo ao montar o volume para «%s»"
-
-#: extensions/places-menu/placeDisplay.js:78
+#: ../extensions/places-menu/placeDisplay.js:59
 #, javascript-format
 msgid "Failed to launch “%s”"
 msgstr "Produciuse un fallo ao iniciar «%s»"

-#: extensions/places-menu/placeDisplay.js:137
-#: extensions/places-menu/placeDisplay.js:160
+#: ../extensions/places-menu/placeDisplay.js:101
+#: ../extensions/places-menu/placeDisplay.js:124
 msgid "Computer"
 msgstr "Computador"

-#: extensions/places-menu/placeDisplay.js:303
+#: ../extensions/places-menu/placeDisplay.js:267
 msgid "Home"
 msgstr "Cartafol persoal"

-#: extensions/places-menu/placeDisplay.js:347
+#: ../extensions/places-menu/placeDisplay.js:311
 msgid "Browse Network"
 msgstr "Explorar a rede"

-#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
+#: ../extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml.h:1
 msgid "Cycle Screenshot Sizes"
 msgstr "Tamaño de capturas de pantalla cíclicos"

-#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
-#| msgid "Cycle Screenshot Sizes"
-msgid "Cycle Screenshot Sizes Backward"
-msgstr "Tamaño de capturas de pantalla cíclicos cara atrás"
-
-#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
+#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.h:1
 msgid "Theme name"
 msgstr "Nome do tema"

-#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:6
+#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.h:2
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "O nome do tema, a cargar desde ~/.themes/name/gnome-shell"

-#: extensions/window-list/extension.js:110
+#: ../extensions/window-list/extension.js:110
 msgid "Close"
 msgstr "Pechar"

-#: extensions/window-list/extension.js:129
+#: ../extensions/window-list/extension.js:120
 msgid "Unminimize"
 msgstr "Restabelecer"

-#: extensions/window-list/extension.js:130
+#: ../extensions/window-list/extension.js:121
 msgid "Minimize"
 msgstr "Minimizar"

-#: extensions/window-list/extension.js:136
+#: ../extensions/window-list/extension.js:127
 msgid "Unmaximize"
 msgstr "Restaurar"

-#: extensions/window-list/extension.js:137
+#: ../extensions/window-list/extension.js:128
 msgid "Maximize"
 msgstr "Maximizar"

-#: extensions/window-list/extension.js:420
+#: ../extensions/window-list/extension.js:411
 msgid "Minimize all"
 msgstr "Minimizar todo"

-#: extensions/window-list/extension.js:428
+#: ../extensions/window-list/extension.js:419
 msgid "Unminimize all"
 msgstr "Restaurar todo"

-#: extensions/window-list/extension.js:436
+#: ../extensions/window-list/extension.js:427
 msgid "Maximize all"
 msgstr "Maximizar todo"

-#: extensions/window-list/extension.js:445
+#: ../extensions/window-list/extension.js:436
 msgid "Unmaximize all"
 msgstr "Restaurar todo"

-#: extensions/window-list/extension.js:454
+#: ../extensions/window-list/extension.js:445
 msgid "Close all"
 msgstr "Pechar todo"

-#: extensions/window-list/extension.js:678
-#: extensions/workspace-indicator/extension.js:30
+#: ../extensions/window-list/extension.js:669
+#: ../extensions/workspace-indicator/extension.js:30
 msgid "Workspace Indicator"
 msgstr "Indicador de espazo de traballo"

-#: extensions/window-list/extension.js:842
+#: ../extensions/window-list/extension.js:833
 msgid "Window List"
 msgstr "Lista de xanelas"

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:12
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.h:1
 msgid "When to group windows"
 msgstr "Cando agrupar xanelas"

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.h:2
 msgid ""
 "Decides when to group windows from the same application on the window list. "
 "Possible values are “never”, “auto” and “always”."
@@ -312,11 +290,11 @@ msgstr ""
 "valores posíbeis son «never» (nunca), «auto» (automático) e "
 "«always» (sempre)."

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.h:3
 msgid "Show the window list on all monitors"
 msgstr "Mostrar a lista de xanelas en todos os monitores"

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.h:4
 msgid ""
 "Whether to show the window list on all connected monitors or only on the "
 "primary one."
@@ -324,39 +302,45 @@ msgstr ""
 "Indica se mostrar a lista de xanelas en todos os monitores conectados ou só "
 "no primario."

-#: extensions/window-list/prefs.js:32
+#: ../extensions/window-list/prefs.js:32
 msgid "Window Grouping"
 msgstr "Agrupación de xanelas"

-#: extensions/window-list/prefs.js:50
+#: ../extensions/window-list/prefs.js:50
 msgid "Never group windows"
 msgstr "Non agrupar nunca as xanelas"

-#: extensions/window-list/prefs.js:51
+#: ../extensions/window-list/prefs.js:51
 msgid "Group windows when space is limited"
 msgstr "Agrupar as xanelas cando o espazo é limitado"

-#: extensions/window-list/prefs.js:52
+#: ../extensions/window-list/prefs.js:52
 msgid "Always group windows"
 msgstr "Agrupar sempre as xanelas"

-#: extensions/window-list/prefs.js:75
+#: ../extensions/window-list/prefs.js:75
 msgid "Show on all monitors"
 msgstr "Mostrar en todos os monitores"

-#: extensions/workspace-indicator/prefs.js:141
+#: ../extensions/workspace-indicator/prefs.js:141
 msgid "Workspace Names"
 msgstr "Nomes dos espazos de traballo"

-#: extensions/workspace-indicator/prefs.js:157
+#: ../extensions/workspace-indicator/prefs.js:157
 msgid "Name"
 msgstr "Nome"

-#: extensions/workspace-indicator/prefs.js:198
+#: ../extensions/workspace-indicator/prefs.js:198
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Espazos de traballo %d"

+#~ msgid "GNOME Classic"
+#~ msgstr "GNOME clasico"
+
+#~ msgid "This session logs you into GNOME Classic"
+#~ msgstr "Esta sesión iniciarao en GNOME clásico"
+
 #~ msgid "CPU"
 #~ msgstr "CPU"

--- a/po/hr.po
+++ b/po/hr.po
@@ -8,9 +8,8 @@ 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-07-20 23:40+0000\n"
-"PO-Revision-Date: 2017-07-25 20:09+0200\n"
-"Last-Translator: gogo <trebelnik2@gmail.com>\n"
+"POT-Creation-Date: 2017-04-11 00:22+0000\n"
+"PO-Revision-Date: 2017-04-11 15:24+0200\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +17,8 @@ msgstr ""
 "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 2.0.2\n"
+"Last-Translator: gogo <trebelnik2@gmail.com>\n"
+"X-Generator: Poedit 1.8.7.1\n"

 #: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
 msgid "GNOME Classic"
@@ -95,7 +95,7 @@ msgstr "Pregled aktivnosti"
 msgid "Favorites"
 msgstr "Omiljeni"

-#: extensions/apps-menu/extension.js:436
+#: extensions/apps-menu/extension.js:391
 msgid "Applications"
 msgstr "Aplikacije"

@@ -142,7 +142,7 @@ msgid "Removable devices"
 msgstr "Prijenosni uređaji"

 #: extensions/drive-menu/extension.js:149
-msgid "Open Files"
+msgid "Open File"
 msgstr "Otvori datoteku"

 #: extensions/example/extension.js:17
@@ -209,26 +209,21 @@ msgstr ""
 msgid "Places"
 msgstr "Lokacije"

-#: extensions/places-menu/placeDisplay.js:65
-#, javascript-format
-msgid "Failed to mount volume for “%s”"
-msgstr "Neuspješno montiranje uređaja “%s”"
-
-#: extensions/places-menu/placeDisplay.js:78
+#: extensions/places-menu/placeDisplay.js:59
 #, javascript-format
 msgid "Failed to launch “%s”"
 msgstr "Neuspješno pokretanje “%s”"

-#: extensions/places-menu/placeDisplay.js:137
-#: extensions/places-menu/placeDisplay.js:160
+#: extensions/places-menu/placeDisplay.js:101
+#: extensions/places-menu/placeDisplay.js:124
 msgid "Computer"
 msgstr "Računalo"

-#: extensions/places-menu/placeDisplay.js:303
+#: extensions/places-menu/placeDisplay.js:267
 msgid "Home"
 msgstr "Osobna mapa"

-#: extensions/places-menu/placeDisplay.js:347
+#: extensions/places-menu/placeDisplay.js:311
 msgid "Browse Network"
 msgstr "Pregledaj mrežu"

@@ -236,10 +231,6 @@ msgstr "Pregledaj mrežu"
 msgid "Cycle Screenshot Sizes"
 msgstr "Veličina slijeda snimke zaslona"

-#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
-msgid "Cycle Screenshot Sizes Backward"
-msgstr "Veličina obrnutog slijeda snimke zaslona"
-
 #: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
 msgstr "Naziv teme"
@@ -252,48 +243,48 @@ msgstr "Naziv teme, mora se učitati iz ~/.themes/name/gnome-shell"
 msgid "Close"
 msgstr "Zatvori"

-#: extensions/window-list/extension.js:129
+#: extensions/window-list/extension.js:120
 msgid "Unminimize"
 msgstr "Vrati"

-#: extensions/window-list/extension.js:130
+#: extensions/window-list/extension.js:121
 msgid "Minimize"
 msgstr "Smanji"

-#: extensions/window-list/extension.js:136
+#: extensions/window-list/extension.js:127
 msgid "Unmaximize"
 msgstr "Prikaži u prozoru"

-#: extensions/window-list/extension.js:137
+#: extensions/window-list/extension.js:128
 msgid "Maximize"
 msgstr "Uvećaj"

-#: extensions/window-list/extension.js:420
+#: extensions/window-list/extension.js:411
 msgid "Minimize all"
 msgstr "Smanji sve"

-#: extensions/window-list/extension.js:428
+#: extensions/window-list/extension.js:419
 msgid "Unminimize all"
 msgstr "Vrati sve"

-#: extensions/window-list/extension.js:436
+#: extensions/window-list/extension.js:427
 msgid "Maximize all"
 msgstr "Uvećaj sve"

-#: extensions/window-list/extension.js:445
+#: extensions/window-list/extension.js:436
 msgid "Unmaximize all"
 msgstr "Prikaži u prozoru sve"

-#: extensions/window-list/extension.js:454
+#: extensions/window-list/extension.js:445
 msgid "Close all"
 msgstr "Zatvori sve"

-#: extensions/window-list/extension.js:678
+#: extensions/window-list/extension.js:669
 #: extensions/workspace-indicator/extension.js:30
 msgid "Workspace Indicator"
 msgstr "Indikator radnog prostora"

-#: extensions/window-list/extension.js:842
+#: extensions/window-list/extension.js:833
 msgid "Window List"
 msgstr "Popis prozora"

--- a/po/hu.po
+++ b/po/hu.po
@@ -1,24 +1,24 @@
 # Hungarian translation of
-# Copyright (C) 2011, 2012, 2013, 2014, 2017 Free Software Foundation, Inc.
+# Copyright (C) 2011, 2012, 2013. Free Software Foundation, Inc.
 # This file is distributed under the same license as the gnome-shell-extensions package.
 #
 # Biró Balázs <arch.scar at gmail dot com>, 2011.
 # Gabor Kelemen <kelemeng at gnome dot hu>, 2011, 2012, 2013.
-# Balázs Úr <urbalazs at gmail dot com>, 2013, 2014, 2017.
+# Balázs Úr <urbalazs at gmail dot com>, 2013, 2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2017-07-31 22:32+0000\n"
-"PO-Revision-Date: 2017-08-03 09:14+0200\n"
-"Last-Translator: Meskó Balázs <meskobalazs@fedoraproject.org>\n"
+"POT-Creation-Date: 2017-02-16 01:20+0000\n"
+"PO-Revision-Date: 2017-02-22 17:12+0100\n"
+"Last-Translator: Meskó Balázs <meskobalazs@gmail.com>\n"
 "Language-Team: Hungarian <openscope at googlegroups dot com>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.2\n"
+"X-Generator: Poedit 1.8.11\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

 #: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
@@ -88,15 +88,15 @@ msgstr "Ablakok megjelenítése mint"
 msgid "Show only windows in the current workspace"
 msgstr "Csak az aktuális munkaterület ablakainak megjelenítése"

-#: extensions/apps-menu/extension.js:41
+#: extensions/apps-menu/extension.js:38
 msgid "Activities Overview"
 msgstr "Tevékenységek áttekintés"

-#: extensions/apps-menu/extension.js:141
+#: extensions/apps-menu/extension.js:109
 msgid "Favorites"
 msgstr "Kedvencek"

-#: extensions/apps-menu/extension.js:436
+#: extensions/apps-menu/extension.js:266
 msgid "Applications"
 msgstr "Alkalmazások"

@@ -143,8 +143,8 @@ msgid "Removable devices"
 msgstr "Cserélhető eszközök"

 #: extensions/drive-menu/extension.js:149
-msgid "Open Files"
-msgstr "Fájlok megnyitása"
+msgid "Open File"
+msgstr "Fájl megnyitása"

 #: extensions/example/extension.js:17
 msgid "Hello, world!"
@@ -211,26 +211,21 @@ msgstr ""
 msgid "Places"
 msgstr "Helyek"

-#: extensions/places-menu/placeDisplay.js:65
-#, javascript-format
-msgid "Failed to mount volume for “%s”"
-msgstr "Nem sikerült a kötet csatolása ennél: „%s”"
-
-#: extensions/places-menu/placeDisplay.js:78
+#: extensions/places-menu/placeDisplay.js:59
 #, javascript-format
 msgid "Failed to launch “%s”"
 msgstr "„%s” indítása meghiúsult"

-#: extensions/places-menu/placeDisplay.js:137
-#: extensions/places-menu/placeDisplay.js:160
+#: extensions/places-menu/placeDisplay.js:101
+#: extensions/places-menu/placeDisplay.js:124
 msgid "Computer"
 msgstr "Számítógép"

-#: extensions/places-menu/placeDisplay.js:303
+#: extensions/places-menu/placeDisplay.js:267
 msgid "Home"
 msgstr "Saját mappa"

-#: extensions/places-menu/placeDisplay.js:347
+#: extensions/places-menu/placeDisplay.js:311
 msgid "Browse Network"
 msgstr "Hálózat tallózása"

@@ -238,10 +233,6 @@ msgstr "Hálózat tallózása"
 msgid "Cycle Screenshot Sizes"
 msgstr "Képernyőképméretek végigléptetése"

-#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
-msgid "Cycle Screenshot Sizes Backward"
-msgstr "Képernyőképméretek végigléptetése visszafelé"
-
 #: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
 msgstr "Témanév"
@@ -254,48 +245,48 @@ msgstr "A ~/.themes/név/gnome-shell alól betöltendő téma neve"
 msgid "Close"
 msgstr "Bezárás"

-#: extensions/window-list/extension.js:129
+#: extensions/window-list/extension.js:120
 msgid "Unminimize"
 msgstr "Minimalizálás megszüntetése"

-#: extensions/window-list/extension.js:130
+#: extensions/window-list/extension.js:121
 msgid "Minimize"
 msgstr "Minimalizálás"

-#: extensions/window-list/extension.js:136
+#: extensions/window-list/extension.js:127
 msgid "Unmaximize"
 msgstr "Maximalizálás megszüntetése"

-#: extensions/window-list/extension.js:137
+#: extensions/window-list/extension.js:128
 msgid "Maximize"
 msgstr "Maximalizálás"

-#: extensions/window-list/extension.js:420
+#: extensions/window-list/extension.js:411
 msgid "Minimize all"
 msgstr "Minden minimalizálása"

-#: extensions/window-list/extension.js:428
+#: extensions/window-list/extension.js:419
 msgid "Unminimize all"
 msgstr "Minden minimalizálásának megszüntetése"

-#: extensions/window-list/extension.js:436
+#: extensions/window-list/extension.js:427
 msgid "Maximize all"
 msgstr "Minden maximalizálása"

-#: extensions/window-list/extension.js:445
+#: extensions/window-list/extension.js:436
 msgid "Unmaximize all"
 msgstr "Minden maximalizálásának megszüntetése"

-#: extensions/window-list/extension.js:454
+#: extensions/window-list/extension.js:445
 msgid "Close all"
 msgstr "Minden bezárása"

-#: extensions/window-list/extension.js:678
+#: extensions/window-list/extension.js:669
 #: extensions/workspace-indicator/extension.js:30
 msgid "Workspace Indicator"
 msgstr "Munkaterület indikátor"

-#: extensions/window-list/extension.js:842
+#: extensions/window-list/extension.js:833
 msgid "Window List"
 msgstr "Ablaklista"

@@ -356,3 +347,214 @@ msgstr "Név"
 #, javascript-format
 msgid "Workspace %d"
 msgstr "%d. munkaterület"
+
+#~ msgid "CPU"
+#~ msgstr "CPU"
+
+#~ msgid "Memory"
+#~ msgstr "Memória"
+
+#~ msgid "GNOME Shell Classic"
+#~ msgstr "Klasszikus GNOME Shell"
+
+#~ msgid "Window management and application launching"
+#~ msgstr "Ablakkezelés és alkalmazásindítás"
+
+#~ msgid "Normal"
+#~ msgstr "Normál"
+
+#~ msgid "Left"
+#~ msgstr "Balra"
+
+#~ msgid "Right"
+#~ msgstr "Jobbra"
+
+#~ msgid "Upside-down"
+#~ msgstr "Fejjel lefelé"
+
+#~ msgid "Display"
+#~ msgstr "Kijelző"
+
+#~ msgid "Display Settings"
+#~ msgstr "Kijelzőbeállítások"
+
+#~ msgid "Suspend"
+#~ msgstr "Felfüggesztés"
+
+#~ msgid "Hibernate"
+#~ msgstr "Hibernálás"
+
+#~ msgid "Power Off"
+#~ msgstr "Kikapcsolás"
+
+#~ msgid "Enable suspending"
+#~ msgstr "Felfüggesztés engedélyezése"
+
+#~ msgid "Control the visibility of the Suspend menu item"
+#~ msgstr "A Felfüggesztés menüelem láthatóságának módosítása"
+
+#~ msgid "Enable hibernating"
+#~ msgstr "Hibernálás engedélyezése"
+
+#~ msgid "Control the visibility of the Hibernate menu item"
+#~ msgstr "A Hibernálás menüelem láthatóságának módosítása"
+
+#~ msgid "Devices"
+#~ msgstr "Eszközök"
+
+#~ msgid "Bookmarks"
+#~ msgstr "Könyvjelzők"
+
+#~ msgid "Network"
+#~ msgstr "Hálózat"
+
+#~ msgid "File System"
+#~ msgstr "Fájlrendszer"
+
+#~ msgid "The application icon mode."
+#~ msgstr "Az alkalmazásikon módja."
+
+#~ msgid ""
+#~ "Configures how the windows are shown in the switcher. Valid possibilities "
+#~ "are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-"
+#~ "only' (shows only the application icon) or 'both'."
+#~ msgstr ""
+#~ "Az ablakok megjelenésének beállítása a váltóban. Lehetséges értékek: "
+#~ "„thumbnail-only” (az ablak bélyegképének megjelenítése), „app-icon-"
+#~ "only” (az alkalmazás ikonjának megjelenítése) vagy „both” (mindkettő)."
+
+#~ msgid "Drag here to add favorites"
+#~ msgstr "Húzza ide kedvenceit"
+
+#~ msgid "New Window"
+#~ msgstr "Új ablak"
+
+#~ msgid "Quit Application"
+#~ msgstr "Alkalmazás bezárása"
+
+#~ msgid "Remove from Favorites"
+#~ msgstr "Eltávolítás a Kedvencek közül"
+
+#~ msgid "Position of the dock"
+#~ msgstr "A dokk pozíciója"
+
+#~ msgid ""
+#~ "Sets the position of the dock in the screen. Allowed values are 'right' "
+#~ "or 'left'"
+#~ msgstr ""
+#~ "A dokk pozíciója a képernyőn. Lehetséges értékek: „right” (jobb) vagy "
+#~ "„left” (bal)"
+
+#~ msgid "Icon size"
+#~ msgstr "Ikonméret"
+
+#~ msgid "Sets icon size of the dock."
+#~ msgstr "Az ikonméret megadása a dokkon."
+
+#~ msgid "Enable/disable autohide"
+#~ msgstr "Automatikus rejtés engedélyezése vagy tiltása"
+
+#~ msgid "Autohide effect"
+#~ msgstr "Automatikus rejtés effektusa"
+
+#~ msgid ""
+#~ "Sets the effect of the hide dock. Allowed values are 'resize', 'rescale' "
+#~ "and 'move'"
+#~ msgstr ""
+#~ "A dokk elrejtésének effektusa. Lehetséges értékek: "
+#~ "„resize” (átméretezés), „rescale” (újraméretezés) és „move” (áthelyezés)"
+
+#~ msgid "Autohide duration"
+#~ msgstr "Automatikus rejtés hossza"
+
+#~ msgid "Sets the time duration of the autohide effect."
+#~ msgstr "Az automatikus rejtés effektus hosszának beállítása."
+
+#~ msgid "Monitor"
+#~ msgstr "Monitor"
+
+#~ msgid ""
+#~ "Sets monitor to display dock in. The default value (-1) is the primary "
+#~ "monitor."
+#~ msgstr ""
+#~ "A dokk megjelenítése ezen a monitoron. Az alapértelmezett érték (-1) az "
+#~ "elsődleges monitor."
+
+#~ msgid "%s is away."
+#~ msgstr "%s távol van."
+
+#~ msgid "%s is offline."
+#~ msgstr "%s kilépett."
+
+#~ msgid "%s is online."
+#~ msgstr "%s elérhető."
+
+#~ msgid "%s is busy."
+#~ msgstr "%s elfoglalt."
+
+#~ msgid ""
+#~ "Sets the Alt-Tab behaviour. Possible values are: all_thumbnails and "
+#~ "workspace_icons. See the configuration dialogs for details."
+#~ msgstr ""
+#~ "Az Alt-Tab viselkedésének megadása. Lehetséges értékek: all_thumbnails és "
+#~ "workspace_icons. Részletekért lásd a beállítóablakokat."
+
+#~ msgid "The alt tab behaviour."
+#~ msgstr "Az Alt-Tab viselkedése."
+
+#~ msgid ""
+#~ "This mode presents all applications from all workspaces in one selection "
+#~ "list. Instead of using the application icon of every window, it uses "
+#~ "small thumbnails resembling the window itself."
+#~ msgstr ""
+#~ "Ez a mód minden munkaterület alkalmazásait egy kijelölőlistában jeleníti "
+#~ "meg. Minden ablak alkalmazásikonjának használata helyett kis "
+#~ "bélyegképeket használ, amelyek magára az ablakra hasonlítanak."
+
+#~ msgid "Workspace & Icons"
+#~ msgstr "Munkaterület és ikonok"
+
+#~ msgid ""
+#~ "This mode let's you switch between the applications of your current "
+#~ "workspace and gives you additionally the option to switch to the last "
+#~ "used application of your previous workspace. This is always the last "
+#~ "symbol in the list and is segregated by a separator/vertical line if "
+#~ "available. \n"
+#~ "Every window is represented by its application icon."
+#~ msgstr ""
+#~ "Ez a mód lehetővé teszi a váltást a jelenlegi munkaterület alkalmazásai "
+#~ "között, és lehetővé teszi az előző munkaterület utoljára használt "
+#~ "alkalmazására váltást. Ez mindig a lista utolsó eleme, és egy elválasztó/"
+#~ "függőleges vonal választja el, ha elérhető.\n"
+#~ "Minden ablakot az alkalmazásikonja jelképez."
+
+#~ msgid "Move current selection to front before closing the popup"
+#~ msgstr "Aktuális kijelölés előtérbe hozása a felugró ablak bezárása előtt"
+
+#~ msgid ""
+#~ "The Alternate Tab can be used in different modes, that affect the way "
+#~ "windows are chosen and presented."
+#~ msgstr ""
+#~ "A váltás lap különböző módokon használható, amelyek befolyásolják az "
+#~ "ablakok kiválasztásának és megjelenítésének módját."
+
+#~ msgid "Configure display settings..."
+#~ msgstr "Kijelzőbeállítások…"
+
+#~ msgid "Available"
+#~ msgstr "Elérhető"
+
+#~ msgid "Busy"
+#~ msgstr "Elfoglalt"
+
+#~ msgid "My Account"
+#~ msgstr "Saját fiók"
+
+#~ msgid "Lock Screen"
+#~ msgstr "Képernyő zárolása"
+
+#~ msgid "Switch User"
+#~ msgstr "Felhasználóváltás"
+
+#~ msgid "Log Out..."
+#~ msgstr "Kijelentkezés…"
--- a/po/id.po
+++ b/po/id.po
@@ -7,10 +7,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2017-07-05 15:07+0000\n"
-"PO-Revision-Date: 2017-07-06 09:44+0700\n"
+"POT-Creation-Date: 2017-02-16 01:20+0000\n"
+"PO-Revision-Date: 2017-02-21 16:47+0700\n"
 "Last-Translator: Kukuh Syafaat <syafaatkukuh@gmail.com>\n"
 "Language-Team: Indonesian <gnome@i15n.org>\n"
 "Language: id\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Poedit-SourceCharset: UTF-8\n"
-"X-Generator: Poedit 2.0.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"
@@ -88,15 +88,15 @@ msgstr "Sajikan jendela sebagai"
 msgid "Show only windows in the current workspace"
 msgstr "Hanya tampilkan jendela dalam ruang kerja kini"

-#: extensions/apps-menu/extension.js:41
+#: extensions/apps-menu/extension.js:38
 msgid "Activities Overview"
 msgstr "Ringkasan Aktivitas"

-#: extensions/apps-menu/extension.js:141
+#: extensions/apps-menu/extension.js:109
 msgid "Favorites"
 msgstr "Favorit"

-#: extensions/apps-menu/extension.js:436
+#: extensions/apps-menu/extension.js:266
 msgid "Applications"
 msgstr "Aplikasi"

@@ -143,7 +143,7 @@ msgid "Removable devices"
 msgstr "Perangkat yang dapat dilepas"

 #: extensions/drive-menu/extension.js:149
-msgid "Open Files"
+msgid "Open File"
 msgstr "Buka Berkas"

 #: extensions/example/extension.js:17
@@ -212,26 +212,21 @@ msgstr ""
 msgid "Places"
 msgstr "Tempat"

-#: extensions/places-menu/placeDisplay.js:65
-#, javascript-format
-msgid "Failed to mount volume for “%s”"
-msgstr "Gagal mengaitkan volume untuk \"%s\""
-
-#: extensions/places-menu/placeDisplay.js:78
+#: extensions/places-menu/placeDisplay.js:59
 #, javascript-format
 msgid "Failed to launch “%s”"
 msgstr "Gagal meluncurkan \"%s\""

-#: extensions/places-menu/placeDisplay.js:137
-#: extensions/places-menu/placeDisplay.js:160
+#: extensions/places-menu/placeDisplay.js:101
+#: extensions/places-menu/placeDisplay.js:124
 msgid "Computer"
 msgstr "Komputer"

-#: extensions/places-menu/placeDisplay.js:303
+#: extensions/places-menu/placeDisplay.js:267
 msgid "Home"
 msgstr "Rumah"

-#: extensions/places-menu/placeDisplay.js:347
+#: extensions/places-menu/placeDisplay.js:311
 msgid "Browse Network"
 msgstr "Ramban Jaringan"

@@ -239,10 +234,6 @@ msgstr "Ramban Jaringan"
 msgid "Cycle Screenshot Sizes"
 msgstr "Berpindah Antar Ukuran Cuplikan Layar"

-#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
-msgid "Cycle Screenshot Sizes Backward"
-msgstr "Berpindah Antar Ukuran Cuplikan Layar Mundur"
-
 #: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
 msgstr "Nama tema"
@@ -255,48 +246,48 @@ msgstr "Nama tema, untuk dimuat dari ~/.themes/name/gnome-shell"
 msgid "Close"
 msgstr "Tutup"

-#: extensions/window-list/extension.js:129
+#: extensions/window-list/extension.js:120
 msgid "Unminimize"
 msgstr "Tak minimalkan"

-#: extensions/window-list/extension.js:130
+#: extensions/window-list/extension.js:121
 msgid "Minimize"
 msgstr "Minimalkan"

-#: extensions/window-list/extension.js:136
+#: extensions/window-list/extension.js:127
 msgid "Unmaximize"
 msgstr "Tak maksimalkan"

-#: extensions/window-list/extension.js:137
+#: extensions/window-list/extension.js:128
 msgid "Maximize"
 msgstr "Maksimalkan"

-#: extensions/window-list/extension.js:420
+#: extensions/window-list/extension.js:411
 msgid "Minimize all"
 msgstr "Minimalkan semua"

-#: extensions/window-list/extension.js:428
+#: extensions/window-list/extension.js:419
 msgid "Unminimize all"
 msgstr "Tak minimalkan semua"

-#: extensions/window-list/extension.js:436
+#: extensions/window-list/extension.js:427
 msgid "Maximize all"
 msgstr "Maksimalkan semua"

-#: extensions/window-list/extension.js:445
+#: extensions/window-list/extension.js:436
 msgid "Unmaximize all"
 msgstr "Tak maksimalkan semua"

-#: extensions/window-list/extension.js:454
+#: extensions/window-list/extension.js:445
 msgid "Close all"
 msgstr "Tutup semua"

-#: extensions/window-list/extension.js:678
+#: extensions/window-list/extension.js:669
 #: extensions/workspace-indicator/extension.js:30
 msgid "Workspace Indicator"
 msgstr "Indikator Ruang Kerja"

-#: extensions/window-list/extension.js:842
+#: extensions/window-list/extension.js:833
 msgid "Window List"
 msgstr "Daftar Jendela"

--- a/po/is.po
+++ b/po/is.po
@@ -1,16 +1,16 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Sveinn í Felli <sv1@fellsnet.is>, 2015, 2017.
+# Sveinn í Felli <sv1@fellsnet.is>, 2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2017-08-11 01:33+0000\n"
-"PO-Revision-Date: 2017-09-08 06:07+0000\n"
+"POT-Creation-Date: 2015-12-04 22:18+0000\n"
+"PO-Revision-Date: 2015-12-05 12:20+0000\n"
 "Last-Translator: Sveinn í Felli <sv1@fellsnet.is>\n"
-"Language-Team: Icelandic <translation-team-is@lists.sourceforge.net>\n"
+"Language-Team: Icelandic <translation-team-is@lists.sourceforge.org>\n"
 "Language: is\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,90 +18,88 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 1.5\n"

-#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
+#: ../data/gnome-classic.desktop.in.h:1
+#: ../data/gnome-classic.session.desktop.in.in.h:1
 msgid "GNOME Classic"
 msgstr "GNOME Klassík"

-#: data/gnome-classic.desktop.in:4
+#: ../data/gnome-classic.desktop.in.h:2
 msgid "This session logs you into GNOME Classic"
 msgstr "Þessi seta skráir þig inn í klassískt GNOME"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:7
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:1
 msgid "Attach modal dialog to the parent window"
 msgstr "Festa kvaðningarglugga við yfirglugga"

-#: 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
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:2
 msgid ""
 "This key overrides the key in org.gnome.mutter when running GNOME Shell."
 msgstr ""
 "Þetta hefur forgang fram yfir lykilinn í kjörstillingum org.gnome.mutter "
 "þegar GNOME Skelin er keyrð."

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:3
 msgid "Arrangement of buttons on the titlebar"
 msgstr "Staðsetning hnappa á tiltilrönd"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:17
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:4
 msgid ""
 "This key overrides the key in org.gnome.desktop.wm.preferences when running "
 "GNOME Shell."
 msgstr ""
-"Þetta hefur forgang fram yfir lykilinn í kjörstillingum org.gnome.desktop.wm."
-"þegar GNOME Skelin er keyrð."
+"Þetta hefur forgang fram yfir lykilinn í kjörstillingum "
+"org.gnome.desktop.wm.þegar GNOME Skelin er keyrð."

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:24
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:5
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr "Virkja flísalögn við jaðra þegar gluggum er sleppt á skjájaðra"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:32
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:6
 msgid "Workspaces only on primary monitor"
 msgstr "Vinnusvæði einungis á aðalskjá"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:40
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:7
 msgid "Delay focus changes in mouse mode until the pointer stops moving"
 msgstr ""
 "Fresta breytingum á virkni í músarham þar til bendillinn hefur stöðvast"

-#: extensions/alternate-tab/prefs.js:20
+#: ../extensions/alternate-tab/prefs.js:20
 msgid "Thumbnail only"
 msgstr "Einungis smámynd"

-#: extensions/alternate-tab/prefs.js:21
+#: ../extensions/alternate-tab/prefs.js:21
 msgid "Application icon only"
 msgstr "Einungis táknmynd forrits"

-#: extensions/alternate-tab/prefs.js:22
+#: ../extensions/alternate-tab/prefs.js:22
 msgid "Thumbnail and application icon"
 msgstr "Smámynd og táknmynd"

-#: extensions/alternate-tab/prefs.js:38
+#: ../extensions/alternate-tab/prefs.js:38
 msgid "Present windows as"
 msgstr "Birta glugga sem"

-#: extensions/alternate-tab/prefs.js:69
+#: ../extensions/alternate-tab/prefs.js:69
 msgid "Show only windows in the current workspace"
 msgstr "Birta eingöngu glugga á núverandi vinnusvæði"

-#: extensions/apps-menu/extension.js:41
+#: ../extensions/apps-menu/extension.js:39
 msgid "Activities Overview"
 msgstr "Virkniyfirlit"

-#: extensions/apps-menu/extension.js:141
+#: ../extensions/apps-menu/extension.js:110
 msgid "Favorites"
 msgstr "Eftirlæti"

-#: extensions/apps-menu/extension.js:436
+#: ../extensions/apps-menu/extension.js:279
 msgid "Applications"
 msgstr "Forrit"

-#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
+#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:1
 msgid "Application and workspace list"
 msgstr "Forrit og vinnusvæðalisti"

-#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:7
+#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
 msgid ""
 "A list of strings, each containing an application id (desktop file name), "
 "followed by a colon and the workspace number"
@@ -109,52 +107,49 @@ msgstr ""
 "Listi yfir textastrengi, þar sem hver þeirra inniheldur forritsauðkenni "
 "(heiti skjáborðsskrár) að viðbættum tvípunkti og svo númeri vinnusvæðis"

-#: extensions/auto-move-windows/prefs.js:60
+#: ../extensions/auto-move-windows/prefs.js:60
 msgid "Application"
 msgstr "Forrit"

-#: extensions/auto-move-windows/prefs.js:69
-#: extensions/auto-move-windows/prefs.js:127
+#: ../extensions/auto-move-windows/prefs.js:69
+#: ../extensions/auto-move-windows/prefs.js:127
 msgid "Workspace"
 msgstr "Vinnusvæði"

-#: extensions/auto-move-windows/prefs.js:85
+#: ../extensions/auto-move-windows/prefs.js:85
 msgid "Add Rule"
 msgstr "Bæta við reglu"

-#: extensions/auto-move-windows/prefs.js:106
+#: ../extensions/auto-move-windows/prefs.js:106
 msgid "Create new matching rule"
 msgstr "Búa til nýja samsvörunarreglu"

-#: extensions/auto-move-windows/prefs.js:111
+#: ../extensions/auto-move-windows/prefs.js:111
 msgid "Add"
 msgstr "Bæta við"

-#. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:107
+#: ../extensions/drive-menu/extension.js:106
 #, javascript-format
-#| msgid "Ejecting drive '%s' failed:"
-msgid "Ejecting drive “%s” failed:"
+msgid "Ejecting drive '%s' failed:"
 msgstr "Útspýting drifsins '%s' mistókst:"

-#: extensions/drive-menu/extension.js:125
+#: ../extensions/drive-menu/extension.js:124
 msgid "Removable devices"
 msgstr "Útskiptanleg tæki"

-#: extensions/drive-menu/extension.js:150
-#| msgid "Open File"
-msgid "Open Files"
-msgstr "Opna skrár"
+#: ../extensions/drive-menu/extension.js:149
+msgid "Open File"
+msgstr "Opna skrá"

-#: extensions/example/extension.js:17
+#: ../extensions/example/extension.js:17
 msgid "Hello, world!"
 msgstr "Hæ heimur!"

-#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:5
+#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:1
 msgid "Alternative greeting text."
 msgstr "Varatexti ávarps."

-#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:6
+#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:2
 msgid ""
 "If not empty, it contains the text that will be shown when clicking on the "
 "panel."
@@ -162,201 +157,177 @@ msgstr ""
 "Ef þetta er ekki autt, inniheldur það textann sem birtist þegar smellt er á "
 "spjaldið."

-#: extensions/example/prefs.js:30
+#: ../extensions/example/prefs.js:30
 msgid "Message"
 msgstr "Skilaboð"

 #. 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 ""
-"Example-viðbótin hefur að markmiði að sýna hvernig byggja eigi vel gerðar "
-"viðbætur fyrir GNOME-Shell hefur því sem slík ekki mikið aðra virkni.\n"
-"Samt sem áður má nota hana til að sérsníða skilaboð í kvaðningu."

-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:1
 msgid "Use more screen for windows"
 msgstr "Nota meira af skjánum fyrir glugga"

-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:2
 msgid ""
 "Try to use more screen for placing window thumbnails by adapting to screen "
 "aspect ratio, and consolidating them further to reduce the bounding box. "
 "This setting applies only with the natural placement strategy."
 msgstr ""
-"Reyndu að nota meira af skjánum undir gluggatákn með aðlögun að "
-"stærðarhlutföllum skjásins og að þjappa þeim enn frekar til að minnka umgjörð "
-"þeirra. "
-"Þessi stilling gildir einungis með stefnu um eðlilegar staðsetningar."

-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:3
 msgid "Place window captions on top"
 msgstr "Setja fyrirsagnir glugga efst"

-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:12
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:4
 msgid ""
 "If true, place window captions on top the respective thumbnail, overriding "
 "shell default of placing it at the bottom. Changing this setting requires "
 "restarting the shell to have any effect."
 msgstr ""
-"Ef þetta er satt, eru fyrirsagnir glugga settar efst á samsvarandi smámynd, "
-"öfugt við það sem sjálfgefið er í skelinni sem setur þær neðst. Breytingar á "
-"þessum stillingum krefjast þess að skelin sé endurræst svo að þær taki gildi."

-#: extensions/places-menu/extension.js:78
-#: extensions/places-menu/extension.js:81
+#: ../extensions/places-menu/extension.js:78
+#: ../extensions/places-menu/extension.js:81
 msgid "Places"
 msgstr "Staðir"

-#: extensions/places-menu/placeDisplay.js:65
+#: ../extensions/places-menu/placeDisplay.js:57
 #, javascript-format
-msgid "Failed to mount volume for “%s”"
-msgstr "Gat ekki tengt gagnageymslu fyrir “%s”"
-
-#: extensions/places-menu/placeDisplay.js:78
-#, javascript-format
-#| msgid "Failed to launch \"%s\""
-msgid "Failed to launch “%s”"
+msgid "Failed to launch \"%s\""
 msgstr "Mistókst að ræsa \"%s\""

-#: extensions/places-menu/placeDisplay.js:137
-#: extensions/places-menu/placeDisplay.js:160
+#: ../extensions/places-menu/placeDisplay.js:99
+#: ../extensions/places-menu/placeDisplay.js:122
 msgid "Computer"
 msgstr "Tölva"

-#: extensions/places-menu/placeDisplay.js:303
+#: ../extensions/places-menu/placeDisplay.js:200
 msgid "Home"
 msgstr "Heim"

-#: extensions/places-menu/placeDisplay.js:347
+#: ../extensions/places-menu/placeDisplay.js:287
 msgid "Browse Network"
 msgstr "Flakka um net"

-#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
+#: ../extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml.in.h:1
 msgid "Cycle Screenshot Sizes"
 msgstr "Fletta í gegnum skjámyndastærðir"

-#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
-#| msgid "Cycle Screenshot Sizes"
-msgid "Cycle Screenshot Sizes Backward"
-msgstr "Fletta afturábak í gegnum skjámyndastærðir"
-
-#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
+#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:1
 msgid "Theme name"
 msgstr "Heiti þema"

-#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:6
+#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:2
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "Heiti á þema, hlaðið inn frá ~/.themes/name/gnome-shell"

-#: extensions/window-list/extension.js:110
+#: ../extensions/window-list/extension.js:109
 msgid "Close"
 msgstr "Loka"

-#: extensions/window-list/extension.js:129
+#: ../extensions/window-list/extension.js:119
 msgid "Unminimize"
 msgstr "Endurheimta"

-#: extensions/window-list/extension.js:130
+#: ../extensions/window-list/extension.js:120
 msgid "Minimize"
 msgstr "Lágmarka"

-#: extensions/window-list/extension.js:136
+#: ../extensions/window-list/extension.js:126
 msgid "Unmaximize"
 msgstr "Minnka glugga"

-#: extensions/window-list/extension.js:137
+#: ../extensions/window-list/extension.js:127
 msgid "Maximize"
 msgstr "Hámarka"

-#: extensions/window-list/extension.js:420
+#: ../extensions/window-list/extension.js:399
 msgid "Minimize all"
 msgstr "Lágmarka allt"

-#: extensions/window-list/extension.js:428
+#: ../extensions/window-list/extension.js:407
 msgid "Unminimize all"
 msgstr "Endurheimta allt"

-#: extensions/window-list/extension.js:436
+#: ../extensions/window-list/extension.js:415
 msgid "Maximize all"
 msgstr "Hámarka allt"

-#: extensions/window-list/extension.js:445
+#: ../extensions/window-list/extension.js:424
 msgid "Unmaximize all"
 msgstr "Minnka allt"

-#: extensions/window-list/extension.js:454
+#: ../extensions/window-list/extension.js:433
 msgid "Close all"
 msgstr "Loka öllu"

-#: extensions/window-list/extension.js:678
-#: extensions/workspace-indicator/extension.js:30
+#: ../extensions/window-list/extension.js:650
+#: ../extensions/workspace-indicator/extension.js:30
 msgid "Workspace Indicator"
 msgstr "Vinnusvæðavísir"

-#: extensions/window-list/extension.js:842
+#: ../extensions/window-list/extension.js:809
 msgid "Window List"
 msgstr "Gluggalisti"

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:12
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:1
 msgid "When to group windows"
 msgstr "Hvenær á að hópa glugga"

-#: 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\"."
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:2
 msgid ""
 "Decides when to group windows from the same application on the window list. "
-"Possible values are “never”, “auto” and “always”."
+"Possible values are \"never\", \"auto\" and \"always\"."
 msgstr ""
-"Tilgreinir hvenær safna eigi saman gluggum sama forrits í gluggalistanum”. "
+"Tilgreinir hvenær safna eigi saman gluggum sama forrits í gluggalistanum. "
 "Möguleg gildi eru „aldrei‟, „sjálfvirkt‟ og „alltaf‟."

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:3
 msgid "Show the window list on all monitors"
 msgstr "Sýna gluggalistann á öllum skjám"

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:4
 msgid ""
 "Whether to show the window list on all connected monitors or only on the "
 "primary one."
 msgstr ""
 "Hvort birta eigi gluggalistann á öllum tengdum skjám eða einungis á aðalskjá."

-#: extensions/window-list/prefs.js:32
+#: ../extensions/window-list/prefs.js:32
 msgid "Window Grouping"
 msgstr "Hópun glugga"

-#: extensions/window-list/prefs.js:50
+#: ../extensions/window-list/prefs.js:50
 msgid "Never group windows"
 msgstr "Aldrei hópa glugga"

-#: extensions/window-list/prefs.js:51
+#: ../extensions/window-list/prefs.js:51
 msgid "Group windows when space is limited"
 msgstr "Hópa glugga þegar pláss er takmarkað"

-#: extensions/window-list/prefs.js:52
+#: ../extensions/window-list/prefs.js:52
 msgid "Always group windows"
 msgstr "Alltaf hópa glugga"

-#: extensions/window-list/prefs.js:75
+#: ../extensions/window-list/prefs.js:75
 msgid "Show on all monitors"
 msgstr "Birta á öllum skjám"

-#: extensions/workspace-indicator/prefs.js:141
+#: ../extensions/workspace-indicator/prefs.js:141
 msgid "Workspace Names"
 msgstr "Vinnusvæðaheiti"

-#: extensions/workspace-indicator/prefs.js:157
+#: ../extensions/workspace-indicator/prefs.js:157
 msgid "Name"
 msgstr "Heiti"

-#: extensions/workspace-indicator/prefs.js:198
+#: ../extensions/workspace-indicator/prefs.js:198
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Vinnusvæði %d"
--- a/Show More
+++ b/Show More