Finalise changelog

New upstream release
Update upstream source from tag 'upstream/3.32.0'
2019-03-12 16:34:19 +00:00 · 2019-03-12 16:33:31 +00:00 · 2019-03-12 16:33:31 +00:00 · 2019-03-12 16:33:30 +00:00 · 2019-03-12 16:33:01 +00:00 · 2019-03-06 15:45:15 +00:00
135 changed files with 14241 additions and 12350 deletions
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -0,0 +1,6 @@
+{
+    "extends": [
+        "./lint/eslintrc-gjs.json",
+        "./lint/eslintrc-shell.json"
+    ]
+}
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -1,3 +0,0 @@
-extends:
- - ./lint/eslintrc-gjs.yml
- - ./lint/eslintrc-shell.yml
--- a/.gitignore
+++ b/.gitignore
@@ -1,29 +0,0 @@
-ABOUT-NLS
-Makefile
-Makefile.in
-Makefile.in.in
-aclocal.m4
-autom4te.cache/
-config/
-configure
-config.log
-config.status
-data/*.json
-m4/
-po/*.header
-po/*.sed
-po/*.sin
-po/Makevars.template
-po/POTFILES
-po/Rules-quot
-po/gnome-shell-extensions.pot
-po/stamp-it
-staging/
-zip-files/
-
-*~
-*.gmo
-metadata.json
-*.desktop
-*.gschema.valid
-*.session
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,177 +0,0 @@
-include:
-  - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/bbe5232986c9b98eb1efe62484e07216f7d1a4df/templates/fedora.yml'
-  - remote: "https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/6f86b8bcb0cd5168c32779c4fea9a893c4a0c046/templates/ci-fairy.yml"
-
-image: registry.gitlab.gnome.org/gnome/gnome-shell/fedora/34:2021-08-12.0
-
-stages:
-  - pre_review
-  - prepare
-  - review
-  - build
-  - deploy
-
-default:
-  # Cancel jobs if newer commits are pushed to the branch
-  interruptible: true
-  # Auto-retry jobs in case of infra failures
-  retry:
-    max: 1
-    when:
-      - 'runner_system_failure'
-      - 'stuck_or_timeout_failure'
-      - 'scheduler_failure'
-      - 'api_failure'
-
-variables:
-  FDO_UPSTREAM_REPO: GNOME/gnome-shell-extensions
-  LINT_LOG: "eslint-report.xml"
-  JS_LOG: "js-report.txt"
-
-workflow:
-  rules:
-    - if: '$CI_MERGE_REQUEST_IID'
-    - if: '$CI_COMMIT_TAG'
-    - if: '$CI_COMMIT_BRANCH'
-
-.pipeline_guard: &pipeline_guard
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-    - if: '$CI_COMMIT_TAG'
-    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
-    - if: '$CI_COMMIT_BRANCH =~ /^gnome-[0-9-]+$/'
-    - when: 'manual'
-
-.gnome-shell-extensions.fedora:34:
-  variables:
-    FDO_DISTRIBUTION_VERSION: 34
-    FDO_DISTRIBUTION_TAG: '2021-08-31.0'
-    FDO_DISTRIBUTION_PACKAGES: >
-      meson git gettext sassc
-
-.prereview_req: &prereview_req
-  needs:
-    - check_commit_log
-    - check-merge-request
-
-check_commit_log:
-  extends:
-    - .fdo.ci-fairy
-  stage: pre_review
-  script:
-    - if [[ x"$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" != "x" ]] ;
-      then
-        ci-fairy check-commits --junit-xml=commit-message-junit-report.xml ;
-      else
-        echo "Not a merge request" ;
-      fi
-  <<: *pipeline_guard
-  artifacts:
-    expire_in: 1 week
-    paths:
-      - commit-message-junit-report.xml
-    reports:
-      junit: commit-message-junit-report.xml
-
-check-merge-request:
-  extends:
-    - .fdo.ci-fairy
-  stage: pre_review
-  script:
-    - if [[ x"$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" != "x" ]] ;
-      then
-        ci-fairy check-merge-request --require-allow-collaboration --junit-xml=check-merge-request-report.xml ;
-      else
-        echo "Not a merge request" ;
-      fi
-  <<: *pipeline_guard
-  artifacts:
-    expire_in: 1 week
-    paths:
-      - check-merge-request-report.xml
-    reports:
-      junit: check-merge-request-report.xml
-
-build-fedora-container:
-  extends:
-    - .fdo.container-build@fedora@x86_64
-    - .gnome-shell-extensions.fedora:34
-  stage: prepare
-  <<: *prereview_req
-
-js_check:
-  stage: review
-  <<: *prereview_req
-  script:
-    - find extensions -name '*.js' -exec js78 -c '{}' ';' 2>&1 | tee $JS_LOG
-    - (! grep -q . $JS_LOG)
-  artifacts:
-    paths:
-      - ${JS_LOG}
-    when: on_failure
-
-eslint:
-  stage: review
-  <<: *prereview_req
-  script:
-    - eslint -o $LINT_LOG -f junit --resolve-plugins-relative-to $(npm root -g) extensions
-  artifacts:
-    paths:
-      - ${LINT_LOG}
-    reports:
-      junit: ${LINT_LOG}
-
-build-bundles:
-  stage: build
-  <<: *prereview_req
-  script:
-    - ./export-zips.sh
-  artifacts:
-    name: 'Extension bundles'
-    expose_as: 'Get Extension bundles here'
-    paths:
-      - zip-files/
-
-fedora-build:
-  extends:
-    - .fdo.distribution-image@fedora
-    - .gnome-shell-extensions.fedora:34
-  stage: build
-  needs:
-    - build-fedora-container
-  before_script:
-    - git submodule update --init
-  script:
-    - meson setup build --werror -Dextension_set=all -Dclassic_mode=true
-    - meson compile -C build
-    - meson test -C build
-    - meson install -C build
-  artifacts:
-    paths:
-      - build
-
-fedora-dist:
-  extends:
-    - .fdo.distribution-image@fedora
-    - .gnome-shell-extensions.fedora:34
-  stage: deploy
-  needs:
-    - fedora-build
-  before_script:
-    - git submodule update --init
-  script:
-    - meson dist -C build
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      changes:
-        - "**/meson.build"
-        - meson/*
-
-fedora-dist-tarball:
-  extends: fedora-dist
-  artifacts:
-    expose_as: 'Get tarball here'
-    paths:
-      - build/meson-dist/$CI_PROJECT_NAME-$CI_COMMIT_TAG.tar.xz
-  rules:
-    - if: '$CI_COMMIT_TAG'
--- a/.gitlab-ci/commit-rules.yml
+++ b/.gitlab-ci/commit-rules.yml
@@ -1,13 +0,0 @@
-patterns:
-  deny:
-    - regex: '^$CI_MERGE_REQUEST_PROJECT_URL/(-/)?merge_requests/$CI_MERGE_REQUEST_IID$'
-      message: Commit message must not contain a link to its own merge request
-    - regex: '^extensions/'
-      message: Commit message subject should not be prefixed with 'extensions/', use the extension name instead
-      where: subject
-    - regex: '^[^:]+: [a-z]'
-      message: "Commit message subject should be properly Capitalized. E.g.  'window: Marginalize extradicity'"
-      where: subject
-    - regex: '^\S*\.js:'
-      message: Commit message subject prefix should not include .js
-      where: subject
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "data/gnome-shell-sass"]
-	path = data/gnome-shell-sass
-	url = https://gitlab.gnome.org/GNOME/gnome-shell-sass.git
--- a/HACKING.md
+++ b/HACKING.md
@@ -28,4 +28,4 @@ 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/HEAD/doc/Style_Guide.md
+[coding-style]: https://gitlab.gnome.org/GNOME/gjs/blob/master/doc/Style_Guide.md
--- a/370
+++ b/370
@@ -1,373 +1,3 @@
-42.beta
-=======
-* workspace-indicator: Fix cancelling editing with Esc [Florian; !208]
-* window-list: Update window tracking to avoid missing icons [Florian; !207]
-* Use libadwaita for preferences [Florian; !209, !213]
-* Adapt to Clutter grab API changes [Florian; !212]
-* Misc. bug fixes and cleanups [Jan, Florian; !210, !214]
-
-Contributors:
-  Jan Beich, Florian Müllner, Naala Nanba
-
-Translators:
-  Boyuan Yang [zh_CN], Matej Urbančič [sl], Naala Nanba [ab],
-  Alexander Shopov [bg], Emin Tufan Çetin [tr]
-
-42.alpha
-========
-* native-window-placement: Fix distorted layout in app grid [Sebastian; !189]
-* window-list: Fix on-screen keyboard [Florian; !199]
-* Misc. bug fixes and cleanups [Neal; Just; !195, !197]
-
-Contributors:
-  Piotr Drąg, Neal Gompa, Sebastian Keller, Florian Müllner, Just Perfection
-
-Translators:
-  Goran Vidović [hr], Sveinn í Felli [is], Yuri Chornoivan [uk],
-  Fabio Tomat [fur], Quentin PAGÈS [oc], Hugo Carvalho [pt],
-  Yaron Shahrabani [he], Jordi Mas i Hernandez [ca], MohammadSaleh Kamyab [fa],
-  Fran Dieguez [gl], Daniel Mustieles [es], Aleksandr Melman [ru],
-  Aurimas Černius [lt], Asier Sarasua Garmendia [eu], Kukuh Syafaat [id],
-  Rafael Fontenelle [pt_BR]
-
-41.0
-====
-* Bump version
-
-41.rc.1
-=======
-* Fix pre-generating stylesheets in tarball [Florian; !190]
-
-Contributors:
-  Florian Müllner
-
-41.rc
-=====
-* window-list: Adapt to overview-on-startup [Florian; !185]
-* apps-menu: Use a custom 'toggle-menu' shortcut [Florian; !173]
-* Misc. bug fixes and cleanups [Florian; !186]
-
-Contributors:
-  Florian Müllner
-
-41.beta
-=======
-* window-list: Extend reactive area of minimap to screen edges [Adam; !171]
-* drive-menu: Improve detection of network mounts [Florian; !27, !176]
-* Use distinct gettext domain for e.g.o uploads [Florian; #335]
-* Misc. bug fixes and cleanups [Florian; !172, !174, !177, !167, !178, !180,
-  !181, !182, !183]
-
-Contributors:
-  Marco Trevisan (Treviño), Adam Goode, Florian Müllner
-
-Translators:
-  Hugo Carvalho [pt], Juliano de Souza Camargo [pt], Alexander Shopov [bg]
-
-40.1
-====
-* Disable welcome dialog in classic session [Florian; !169]
-* windowsNavigator: Adjust to a late gnome-shell change [Florian; !170]
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  Ngọc Quân Trần [vi], Anders Jonsson [sv], Carmen Bianca BAKKER [eo],
-  Pawan Chitrakar [ne], Quentin PAGÈS [oc]
-
-40.0
-====
-
-Translators:
-  Jiri Grönroos [fi]
-
-40.rc
-=====
-* native-window-placement: Adjust to gnome-shell changes [Florian; !164]
-* windows-navigator: Adjust to gnome-shell changes [Florian; !163]
-* window-list, workspace-indicator: Only show previews for up to six workspaces
-  [Florian; !165]
-* window-list, workspace-indicator: Improve workspace preview appearance
-  [Florian; !166]
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  Fran Dieguez [gl]
-
-40.beta
-=======
-* Add tooltips to workspace thumbnails [Florian; !155]
-* Drop arrows from top bar menus [Florian; !156]
-* drive-menu: Mark mounts that can be unmounted as removable [Michael; !152]
-* Remove horizontal-workspaces extension [Florian; !158]
-* Adjust to shell overview changes [Florian; !159, !160]
-* Fix crashes [Daniel; !157]
-* Misc. bug fixes and cleanups [Florian; !154, !161]
-
-Contributors:
-  Michael Lawton, Florian Müllner, Daniel van Vugt
-
-Translators:
-  Аляксей [be], A S Alam [pa]
-
-40.alpha.1
-==========
-* Don't depend on sassc when building from tarball [Florian; !150]
-* Port extensions preferences to GTK4 [Florian; !148]
-* Misc. bug fixes and cleanups [Florian, Jonas; !149, !151, !153]
-
-Contributors:
-  Jonas Dreßler, Florian Müllner
-
-40.alpha
-========
-* window-list: Honor changes in skip-taskbar property [Sergio; !130]
-* window-list, workspace-indicator: Adjust to 3.38 changes [Florian; !133]
-* window-list, workspace-indicator: Improve previews in workspace thumbs
-  [Florian; #260, !142]
-* auto-move: Improve behavior on multi-monitor setups [Florian; !135]
-* windowNavigator: Adjust to 3.38 changes [Thun; #259]
-* Misc. bug fixes and cleanups [Florian, Jonas Å, Jordan, Ray; !131, !136,
-  !137, !140, !141, !144, !146, !145]
-
-Contributors:
-  Sergio Costas, Florian Müllner, Jordan Petridis, Thun Pin, Ray Strode,
-  Jonas Ådahl
-
-Translators:
-  Fabio Tomat [fur], Jordi Mas [ca]
-
-3.38.1
-======
-
-Contributors:
-  Yacine Bouklif, Florian Müllner
-
-Translators:
-  Yacine Bouklif [kab], Cheng-Chia Tseng [zh_TW], Stas Solovey [ru],
-  Yosef Or Boczko [he]
-
-3.38.0
-======
-
-Translators:
-  Balázs Meskó [hu], Alan Mortensen [da], Juliano Camargo [pt], Tim Sabsch [de],
-  Milo Casagrande [it], Rūdolfs Mazurs [lv]
-
-3.37.92
-=======
-
-Translators:
-  Nathan Follens [nl], Zander Brown [en_GB], Aurimas Černius [lt],
-  Marek Černocký [cs], Changwoo Ryu [ko], Dušan Kazik [sk]
-
-3.37.91
-=======
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  Fran Dieguez [gl], Akarshan Biswas [bn_IN], Kukuh Syafaat [id],
-  Piotr Drąg [pl], Rafael Fontenelle [pt_BR], Jiri Grönroos [fi],
-  Марко Костић [sr], Goran Vidović [hr]
-
-3.37.90
-=======
-* Misc. bug fixes and cleanups [Florian, Piotr; !126, !128]
-
-Contributors:
-  Piotr Drąg, Florian Müllner
-
-Translators:
-  Fabio Tomat [fur], Efstathios Iosifidis [el], Anders Jonsson [sv],
-  Asier Sarasua Garmendia [eu], Alexandre Franke [fr]
-
-3.37.3
-======
-* window-list, native-window-placement: Adjust to shell changes [Florian; !124]
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  Jordi Mas [ca], sicklylife [ja], Boyuan Yang [zh_CN],
-  Baurzhan Muftakhidinov [kk]
-
-3.37.2
-======
-* window-list, auto-move: Modernize preference dialogs [Florian; !121]
-* Adjust to gnome-shell changes [Florian; !122]
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  Cheng-Chia Tseng [zh_TW], Yuri Chornoivan [uk], Daniel Mustieles [es],
-  Emin Tufan Çetin [tr], Danial Behzadi [fa], Daniel Șerbănescu [ro],
-  Matej Urbančič [sl]
-
-3.37.1
-======
-* drive-menu: Emphasize eject buttons [Florian; #223]
-* user-theme: Add preference dialog [Florian; !117]
-* window-list: Fix inconsistent state in preference dialog [Milan; !119]
-* workspace-indicator: Overhaul preference dialog [Florian; !120]
-* user-theme: Support session mode styles [Florian; !118]
-* Misc. bug fixes and cleanups [Florian, Xiaoguang; !113, !106, !114, !116]
-
-Contributors:
-  Milan Crha, Florian Müllner, Xiaoguang Wang
-
-Translators:
-  Daniel Korostil [uk], Yosef Or Boczko [he], Kristjan SCHMIDT [eo],
-  Dz Chen [zh_CN], Danial Behzadi [fa], Yuri Chornoivan [uk],
-  Anders Jonsson [sv], Daniel Mustieles [es]
-
-3.36.0
-======
-
-Contributors:
-  Florian Müllner
-
-3.35.91
-=======
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  Zander Brown [en_GB]
-
-3.35.90
-=======
-* Adjust to gnome-shell changes [Florian; !100, !101, !102]
-* Force single-line window titles in window list [Florian; #202]
-* Misc. bug fixes and cleanup [Florian; !104, !105]
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  sicklylife [ja], Umarzuki Bin Mochlis Moktar [ms]
-
-3.35.3
-======
-
-Translators:
-  Fran Dieguez [gl]
-
-3.35.2
-======
-* Adjust to gnome-shell changes [Marco, Florian; !89, !95, !96]
-* window-list, workspace-indicator: Exclude DESKTOP windows from previews
-  [Florian; !93]
-* screenshot-window-sizer: Fix cycling through all valid sizes [Willy; !97]
-
-Contributors:
-  Marco Trevisan (Treviño), Florian Müllner, Willy Stadnick
-
-3.34.1
-======
-* Adjust to gnome-settings-daemon plugin removals [Xiaoguang; !94]
-
-Contributors:
-  Florian Müllner, Xiaoguang Wang
-
-Translators:
-  Nathan Follens [nl], Dušan Kazik [sk], Ask Hjorth Larsen [da],
-  Yi-Jyun Pan [zh_TW]
-
-3.34.0
-======
-
-Translators:
-  Rafael Fontenelle [pt_BR], Efstathios Iosifidis [el], Milo Casagrande [it],
-  Sabri Ünal [tr]
-
-3.33.92
-=======
-
-Translators:
-  Марко Костић [sr], Tim Sabsch [de], Rūdolfs Mazurs [lv], Matej Urbančič [sl],
-  Balázs Úr [hu], Claude Paroz [fr], Fran Dieguez [gl], Changwoo Ryu [ko],
-  Ryuta Fujii [ja], Fabio Tomat [fur], Goran Vidović [hr]
-
-3.33.91
-=======
-* Misc. bug fixes and cleanups [Florian; !88, !90, !91, !92]
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  Asier Sarasua Garmendia [eu], Anders Jonsson [sv], Marek Černocký [cs],
-  Kukuh Syafaat [id], Jiri Grönroos [fi], Florentina Mușat [ro],
-  Aurimas Černius [lt], Daniel Mustieles [es], Piotr Drąg [pl], Jordi Mas [ca],
-  Danial Behzadi [fa]
-3.33.90
-=======
-* window-list: Support showing windows from all workspaces [Florian; #154]
-* Misc. bug fixes and cleanups [Florian; !86, !87]
-
-Contributors:
-  Florian Müllner
-
-Translators:
-  Jor Teron [mjw]
-
-3.33.4
-======
-* Make GNOME Classic more classic:
-  - Disable GNOME 3 overview [Florian; !69]
-  - Add window picker button to window list [Florian; !73, !80]
-  - Style improvements and fixes [Jakub; #169, !82]
-  - Support horizontal workspace layout in window list [Florian; !70]
-  - Add draggable previews to window list workspace switcher [Florian; !74]
-  - Arrange workspaces horizontally [Florian; !72]
-* workspace-indicator: Support horizontal workspace layout [Florian; !71]
-* workspace-indicator: Add draggable previews [Florian; !77]
-* Misc. bug fixes and cleanups [Florian; !75, !76, !79, !78, #168, !84]
-
-Contributors:
-  Florian Müllner, Jakub Steiner, Jor Teron
-
-Translators:
-  Jor Teron [mjw]
-
-3.33.3
-======
-* Misc. bug fixes [Florian, Marco; !67, !68]
-
-Contributors:
-  Florian Müllner, Marco Trevisan (Treviño)
-
-3.33.2
-======
-* Misc. bug fixes and cleanups [Florian; !66]
-
-Contributors:
-  Florian Müllner
-
-3.33.1
-======
-* Misc. bug fixes [Florian; !64]
-
-Contributors:
-  Florian Müllner
-
-3.32.1
-======
-* Fix windowsNavigator extension after ES6 port [Florian; #143]
-* screenshot-window-sizer: Add phone screenshot sizes [Adrien; !65]
-* Misc. bug fixes and cleanups [Fabian; !62]
-
-Contributors:
-  Florian Müllner, Adrien Plazas, Fabian P. Schmidt
-
 3.32.0
 ======

--- a/README.md
+++ b/README.md
@@ -15,12 +15,6 @@ Bugs should be reported to the GNOME [bug tracking system][bug-tracker].

 ## Extensions

- * alternate-tab (**OBSOLETE**)
- 
-     Lets you use classic Alt+Tab (window-based instead of app-based) in GNOME Shell.
-     This extension is obsolete since GNOME 3.30, see [this blogpost][alternatetab-post]
-     for further details.
-
 * apps-menu

     Lets you reach an application using gnome 2.x style menu on the panel.
@@ -69,19 +63,6 @@ GSettings key.

     Adds a simple workspace switcher to the top bar.

-## Default branch
-
-The default development branch is `main`. If you still have a local
-checkout under the old name, use:
-```sh
-git checkout master
-git branch -m master main
-git fetch
-git branch --unset-upstream
-git branch -u origin/master
-git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/main
-```
-
 ## License

 GNOME Shell Extensions are distributed under the terms of the GNU General
@@ -93,4 +74,3 @@ file for details.
 [shell-page]: https://wiki.gnome.org/Projects/GnomeShell
 [bug-tracker]: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/issues
 [license]: COPYING
-[alternatetab-post]: https://blogs.gnome.org/fmuellner/2018/10/11/the-future-of-alternatetab-and-why-you-need-not-worry/
--- a/data/classic.json.in
+++ b/data/classic.json.in
@@ -1,10 +1,8 @@
 {
    "parentMode": "user",
    "stylesheetName": "gnome-classic.css",
-    "hasOverview": false,
-    "showWelcomeDialog": false,
    "enabledExtensions": [@CLASSIC_EXTENSIONS@],
-    "panel": { "left": ["appMenu"],
+    "panel": { "left": ["activities", "appMenu"],
               "center": [],
               "right": ["a11y", "keyboard", "dateMenu", "aggregateMenu"]
             }
--- a/data/gnome-classic-wayland.desktop.in
+++ b/data/gnome-classic-wayland.desktop.in
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=GNOME Classic on Wayland
-Comment=This session logs you into GNOME Classic
-Exec=env GNOME_SHELL_SESSION_MODE=classic gnome-session
-TryExec=gnome-session
-Type=Application
-DesktopNames=GNOME-Classic;GNOME;
-X-GDM-SessionRegisters=true
--- a/data/gnome-classic-xorg.desktop.in
+++ b/data/gnome-classic-xorg.desktop.in
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=GNOME Classic on Xorg
-Comment=This session logs you into GNOME Classic
-Exec=env GNOME_SHELL_SESSION_MODE=classic gnome-session
-TryExec=gnome-session
-Type=Application
-DesktopNames=GNOME-Classic;GNOME;
-X-GDM-SessionRegisters=true
--- a/data/gnome-classic.desktop.in
+++ b/data/gnome-classic.desktop.in
@@ -1,8 +1,7 @@
 [Desktop Entry]
 Name=GNOME Classic
 Comment=This session logs you into GNOME Classic
-Exec=env GNOME_SHELL_SESSION_MODE=classic gnome-session
+Exec=env GNOME_SHELL_SESSION_MODE=classic gnome-session --session gnome-classic
 TryExec=gnome-session
 Type=Application
 DesktopNames=GNOME-Classic;GNOME;
-X-GDM-SessionRegisters=true
--- a/data/gnome-classic.scss
+++ b/data/gnome-classic.scss
@@ -4,7 +4,6 @@ $variant: 'light';
@import "gnome-shell-sass/_colors"; //use gtk colors
@import "gnome-shell-sass/_drawing";
@import "gnome-shell-sass/_common";
-@import "gnome-shell-sass/_widgets";

 /* Overrides */

@@ -33,32 +32,18 @@ $variant: 'light';
    font-weight: normal;
    color: $fg_color;
    text-shadow: none;
-    transition-duration: 0ms;
-    border: 0;
-    border-radius: 0px;
-
-    &.clock-display {
-      .clock {
-        transition-duration: 0ms;
-        border: 0;
-        border-radius: 0px;
-      }
-    }
-
-    &:hover {
-      color: lighten($fg_color,10%);
-      text-shadow: none;
-      & .system-status-icon { icon-shadow: none; }
-    }
    &:active, &:overview, &:focus, &:checked {
      // Trick due to St limitations. It needs a background to draw
      // a box-shadow
-      background-color: $selected_bg_color;
-      color: $selected_fg_color;
+      background-color: $selected_bg_color !important;
+      color: $selected_fg_color !important;
      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 {
@@ -75,17 +60,18 @@ $variant: 'light';
  &.lock-screen,
  &.unlock-screen, 
  &.login-screen { 
-    background-color: transparentize($bg_color, 0.5);
-    background-gradient-start: transparentize($bg_color, 0.5);
-    background-gradient-end: transparentize($bg_color, 0.5);
+    background-color: transparentize($_bubble_bg_color, 0.5);
+    background-gradient-start: transparentize($_bubble_bg_color, 0.5);
+    background-gradient-end: transparentize($_bubble_bg_color, 0.5);
    border-bottom: none;
    .panel-button { color: $osd_fg_color; }
  }
+  .popup-menu-arrow { width: 0; height: 0;  } // shell's display: none;
 }

 #appMenu { 
+  padding: 0 8px 0 8px; 
  spinner-image: url("classic-process-working.svg"); 
-  .panel-status-menu-box { padding: 0; }
 }
 .tile-preview-left.on-primary,
 .tile-preview-right.on-primary,
@@ -105,3 +91,15 @@ $variant: 'light';
  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
@@ -0,0 +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;
--- a/data/gnome-shell-sass
+++ b/data/gnome-shell-sass
--- a/data/gnome-shell-sass/COPYING
+++ b/data/gnome-shell-sass/COPYING
@@ -0,0 +1,339 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc. <http://fsf.org>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
--- a/data/gnome-shell-sass/NEWS
+++ b/data/gnome-shell-sass/NEWS
--- a/data/gnome-shell-sass/README.md
+++ b/data/gnome-shell-sass/README.md
@@ -0,0 +1,16 @@
+# GNOME Shell Sass
+GNOME Shell Sass is a project intended to allow the sharing of the
+theme sources in sass between gnome-shell and other projects like
+gnome-shell-extensions.
+
+Any changes should be done in the [GNOME Shell subtree][shell-subtree]
+and not the stand-alone [gnome-shell-sass repository][sass-repo]. They
+will then be synchronized periodically before releases.
+
+## License
+GNOME Shell Sass is distributed under the terms of the GNU General Public
+License, version 2 or later. See the [COPYING][license] file for details.
+
+[shell-subtree]: https://gitlab.gnome.org/GNOME/gnome-shell/tree/master/data/theme/gnome-shell-sass
+[sass-repo]: https://gitlab.gnome.org/GNOME/gnome-shell-sass
+[license]: COPYING
--- a/data/gnome-shell-sass/_colors.scss
+++ b/data/gnome-shell-sass/_colors.scss
@@ -0,0 +1,41 @@
+// When color definition differs for dark and light variant,
+// it gets @if ed depending on $variant
+
+
+$base_color: if($variant == 'light', #ffffff, lighten(desaturate(#241f31, 20%), 2%));
+$bg_color: if($variant == 'light', #f6f5f4, desaturate(#3d3846, 10%));
+$fg_color: if($variant == 'light', #2e3436, #eeeeec);
+
+$selected_fg_color: #ffffff;
+$selected_bg_color: if($variant == 'light', #3584e4, darken(#3584e4, 20%));
+$selected_borders_color: if($variant== 'light', darken($selected_bg_color, 15%), darken($selected_bg_color, 30%));
+$borders_color: if($variant == 'light', darken($bg_color, 18%), darken($bg_color, 10%));
+$borders_edge: if($variant == 'light', transparentize(white, 0.2), transparentize($fg_color, 0.93));
+$link_color: if($variant == 'light', darken($selected_bg_color, 10%), lighten($selected_bg_color, 20%));
+$link_visited_color: if($variant == 'light', darken($selected_bg_color, 20%), lighten($selected_bg_color, 10%));
+$top_hilight: $borders_edge;
+
+$warning_color: #f57900;
+$error_color: #cc0000;
+$success_color: if($variant == 'light', #33d17a, darken(#33d17a, 10%));
+$destructive_color: if($variant == 'light', #e01b24, darken(#e01b24, 10%));
+
+$osd_fg_color: #eeeeec;
+$osd_bg_color: #2e3436;
+$osd_borders_color: transparentize(black, 0.3);
+$osd_outer_borders_color: transparentize(white, 0.9);
+
+$tooltip_borders_color: $osd_outer_borders_color;
+
+//insensitive state derived colors
+$insensitive_fg_color: mix($fg_color, $bg_color, 50%);
+$insensitive_bg_color: mix($bg_color, $base_color, 60%);
+$insensitive_borders_color: $borders_color;
+
+//colors for the backdrop state, derived from the main colors.
+$backdrop_base_color: if($variant =='light', darken($base_color,1%), lighten($base_color,1%));
+$backdrop_bg_color: $bg_color;
+$backdrop_fg_color: mix($fg_color, $backdrop_bg_color, 80%);
+$backdrop_insensitive_color: if($variant =='light', darken($backdrop_bg_color,15%), lighten($backdrop_bg_color,15%));
+$backdrop_borders_color: mix($borders_color, $bg_color, 90%);
+$backdrop_dark_fill: mix($backdrop_borders_color,$backdrop_bg_color, 35%);
--- a/data/gnome-shell-sass/_common.scss
+++ b/data/gnome-shell-sass/_common.scss
--- a/data/gnome-shell-sass/_drawing.scss
+++ b/data/gnome-shell-sass/_drawing.scss
@@ -0,0 +1,221 @@
+// Drawing mixins
+
+// generic drawing of more complex things
+
+@function _widget_edge($c:$borders_edge) {
+// outer highlight "used" on most widgets
+  @return 0 1px $c;
+}
+
+// provide font size in rem, with px fallback
+@mixin fontsize($size: 24, $base: 16) {
+  font-size: round($size) + pt;
+  //font-size: ($size / $base) * 1rem;
+}
+
+@mixin _shadows($shadow1, $shadow2:none, $shadow3:none, $shadow4:none) {
+//
+// Helper function to stack up to 4 box-shadows;
+//
+  @if $shadow4!=none { box-shadow: $shadow1, $shadow2, $shadow3, $shadow4; }
+  @else if $shadow3!=none { box-shadow: $shadow1, $shadow2, $shadow3; }
+  @else if $shadow2!=none { box-shadow: $shadow1, $shadow2; }
+  @else { box-shadow: $shadow1; }
+}
+
+// entries
+
+@mixin entry($t, $fc:$selected_bg_color, $edge: $borders_edge) {
+//
+// Entries drawing function
+//
+// $t: entry type
+// $fc: focus color
+// $edge: set to none to not draw the bottom edge or specify a color to not
+//        use the default one
+//
+// possible $t values:
+// normal, focus, insensitive
+//
+  $_inner_shadows: inset 0 2px 4px transparentize(black, 0.6);
+
+  @if $t==normal {
+    background-color: $base_color;
+    border-color: $borders_color;
+    @include _shadows($_inner_shadows);
+
+  }
+  @if $t==focus {
+    @include _shadows($_inner_shadows);
+    border-color: if($fc==$selected_bg_color,
+                     $selected_borders_color,
+                     darken($fc,35%));
+  }
+  @if $t==hover { }
+  @if $t==insensitive {
+    color: $insensitive_fg_color;
+    border-color: $insensitive_bg_color;
+    box-shadow: none;
+  }
+}
+
+// buttons
+
+@function _border_color ($c) { @return darken($c,25%); } // colored buttons want
+                                                         // the border form the
+                                                         // base color
+
+@function _text_shadow_color ($tc:$fg_color, $bg:$bg_color) {
+//
+// calculate the color of text shadows
+//
+// $tc is the text color
+// $bg is the background color
+//
+  $_lbg: lightness($bg)/100%;
+  @if lightness($tc)<50% { @return transparentize(white,1-$_lbg/($_lbg*1.3)); }
+  @else { @return transparentize(black,$_lbg*0.8); }
+}
+
+@function _button_hilight_color($c) {
+//
+// calculate the right top hilight color for buttons
+//
+// $c: base color;
+//
+  @if lightness($c)>90% { @return white; }
+  @else if lightness($c)>80% { @return transparentize(white, 0.3); }
+  @else if lightness($c)>50% { @return transparentize(white, 0.5); }
+  @else if lightness($c)>40% { @return transparentize(white, 0.7); }
+  @else { @return transparentize(white, 0.9); }
+}
+
+@mixin _button_text_shadow ($tc:$fg_color, $bg:$bg_color) {
+//
+// helper function for the text emboss effect
+//
+// $tc is the optional text color, not the shadow color
+//
+// TODO: this functions needs a way to deal with special cases
+//
+
+  $_shadow: _text_shadow_color($tc, $bg);
+
+  @if lightness($tc)<50% {
+    text-shadow: 0 1px $_shadow;
+    icon-shadow: 0 1px $_shadow;
+  }
+  @else {
+    text-shadow: 0 -1px $_shadow;
+    icon-shadow: 0 -1px $_shadow;
+  }
+}
+
+@mixin button($t, $c:$osd_bg_color, $tc:$fg_color, $edge: $borders_edge) {
+//
+// Button drawing function
+//
+// $t:    button type,
+// $c:    base button color for colored* types
+// $tc:   optional text color for colored* types
+// $edge: set to none to not draw the bottom edge or specify a color to not
+//        use the default one
+//
+// possible $t values:
+// normal, hover, active, insensitive, insensitive-active,
+// backdrop, backdrop-active, backdrop-insensitive, backdrop-insensitive-active,
+// osd, osd-hover, osd-active, osd-insensitive, osd-backdrop, undecorated
+//
+
+  $_hilight_color: _button_hilight_color($c);
+  $_button_edge: if($edge == none, none, _widget_edge($edge));
+  $_blank_edge: if($edge == none, none, _widget_edge(transparentize($edge,1)));
+
+
+  @if $t==normal {
+  //
+  // normal button
+  //
+    $_bg: if($c!=$osd_bg_color, transparentize($c, 0.5),
+                            $osd_bg_color);
+
+    color: $osd_fg_color;
+    background-color: $_bg;
+    border-color: $osd_borders_color;
+    box-shadow: inset 0 1px lighten($osd_bg_color,10%);
+    text-shadow: 0 1px black;
+    icon-shadow: 0 1px black;
+  }
+  @if $t==focus {
+  //
+  // focused button
+  //
+    $_bg: if($c!=$osd_bg_color, transparentize($c, 0.3),
+                          lighten($osd_bg_color,3%));
+
+    color: $osd_fg_color;
+    text-shadow: 0 1px black;
+    icon-shadow: 0 1px black;
+    box-shadow: inset 0px 0px 0px 1px $selected_bg_color;
+  }
+
+  @else if $t==hover {
+  //
+  // active osd button
+  //
+    $_bg: if($c!=$osd_bg_color, transparentize($c, 0.3),
+                            lighten($osd_bg_color,3%));
+
+    color: white;
+    border-color: $osd_borders_color;
+    background-color: $_bg;
+    box-shadow: inset 0 1px lighten($osd_bg_color,20%);
+    text-shadow: 0 1px black;
+    icon-shadow: 0 1px black;
+
+  }
+  @else if $t==active {
+  //
+  // active osd button
+  //
+    $_bg: if($c!=$bg_color, $c, $osd_borders_color);
+
+    color: white;
+    border-color: $osd_borders_color;
+    background-color: $selected_bg_color;
+    // This should be none, but it's creating some issues with borders, so to
+    // workaround it for now, use inset wich goes through a different code path.
+    // see https://bugzilla.gnome.org/show_bug.cgi?id=752934
+    box-shadow: inset 0 0 black;
+    text-shadow: none;
+    icon-shadow: none;
+  }
+  @else if $t==insensitive {
+  //
+  // insensitive osd button
+  //
+    $_bg: transparentize(mix($insensitive_fg_color,$osd_bg_color,20%),0.3);
+
+    color: $insensitive_fg_color;
+    border-color: $osd_borders_color;
+    background-color: $_bg;
+    box-shadow: none;
+    text-shadow: none;
+    icon-shadow: none;
+  }
+  @else if $t==undecorated {
+  //
+  // reset
+  //
+    border-color: transparent;
+    background-color: transparent;
+    background-image: none;
+
+    @include _shadows(inset 0 1px transparentize(white,1),
+                      $_blank_edge);
+
+    text-shadow: none;
+    icon-shadow: none;
+  }
+}
+
--- a/data/gnome-shell-sass/_high-contrast-colors.scss
+++ b/data/gnome-shell-sass/_high-contrast-colors.scss
@@ -0,0 +1,41 @@
+// When color definition differs for dark and light variant,
+// it gets @if ed depending on $variant
+
+
+$base_color: #222;
+$bg_color: #000;
+$fg_color: #fff;
+
+$selected_fg_color: #ffffff;
+$selected_bg_color: darken(#4a90d9,20%);
+$selected_borders_color: darken($selected_bg_color, 20%);
+$borders_color: darken($bg_color,12%);
+$borders_edge: transparentize($fg_color, 0.9);
+$link_color: lighten($selected_bg_color,20%);
+$link_visited_color: lighten($selected_bg_color,10%);
+$top_hilight: $borders_edge;
+
+$warning_color: #f57900;
+$error_color: #cc0000;
+$success_color: darken(#73d216,10%);
+$destructive_color: darken(#ef2929,10%);
+
+$osd_fg_color: #eeeeec;
+$osd_bg_color: #2e3436;
+$osd_borders_color: transparentize(black, 0.3);
+$osd_outer_borders_color: transparentize(white, 0.9);
+
+$tooltip_borders_color: $osd_outer_borders_color;
+
+//insensitive state derived colors
+$insensitive_fg_color: mix($fg_color, $bg_color, 50%);
+$insensitive_bg_color: mix($bg_color, $base_color, 60%);
+$insensitive_borders_color: $borders_color;
+
+//colors for the backdrop state, derived from the main colors.
+$backdrop_base_color: lighten($base_color,1%);
+$backdrop_bg_color: $bg_color;
+$backdrop_fg_color: mix($fg_color, $backdrop_bg_color, 80%);
+$backdrop_insensitive_color: lighten($backdrop_bg_color,15%);
+$backdrop_borders_color: mix($borders_color, $bg_color, 90%);
+$backdrop_dark_fill: mix($backdrop_borders_color,$backdrop_bg_color, 35%);
--- a/data/gnome-shell-sass/gnome-shell-sass.doap
+++ b/data/gnome-shell-sass/gnome-shell-sass.doap
@@ -0,0 +1,37 @@
+<Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+         xmlns:foaf="http://xmlns.com/foaf/0.1/"
+         xmlns:gnome="http://api.gnome.org/doap-extensions#"
+         xmlns="http://usefulinc.com/ns/doap#">
+
+  <name xml:lang="en">GNOME Shell Sass</name>
+  <shortdesc xml:lang="en">Sass sources of GNOME Shell</shortdesc>
+  <description>GNOME Shell Sass is a project intended to allow the sharing of the
+ sass theme sources between gnome-shell and other projects like gnome-shell-extensions.</description>
+
+  <category rdf:resource="http://api.gnome.org/doap-extensions#core" />
+  <programming-language>sass</programming-language>
+  <programming-language>css</programming-language>
+
+  <maintainer>
+    <foaf:Person>
+      <foaf:name>Carlos Soriano</foaf:name>
+      <foaf:mbox rdf:resource="mailto:csoriano@gnome.org" />
+      <gnome:userid>csoriano</gnome:userid>
+    </foaf:Person>
+  </maintainer>
+  <maintainer>
+    <foaf:Person>
+      <foaf:name>Florian Müllner</foaf:name>
+      <foaf:mbox rdf:resource="mailto:fmuellner@gnome.org" />
+      <gnome:userid>fmuellner</gnome:userid>
+    </foaf:Person>
+  </maintainer>
+  <maintainer>
+    <foaf:Person>
+      <foaf:name>Jakub Steiner</foaf:name>
+      <foaf:mbox rdf:resource="mailto:jimmac@gmail.com" />
+      <gnome:userid>jimmac</gnome:userid>
+    </foaf:Person>
+  </maintainer>
+</Project>
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,33 +1,17 @@
-session_desktop_base = 'gnome-classic'
-
-session_desktops = [
-  session_desktop_base,
-  session_desktop_base + '-xorg',
-  session_desktop_base + '-wayland',
+sessions = [
+  ['gnome-classic.session.desktop.in', sessiondir],
+  ['gnome-classic.desktop.in', xsessiondir]
 ]
-
-foreach name: session_desktops
-    session_desktop = name + '.desktop'
-    if name.endswith('-xorg')
-        session_instdir = xsessiondir
-    elif name.endswith('-wayland')
-        session_instdir = wlsessiondir
-    else
-        # FIXME: The same target can not be copied into two directories.
-        #        There is a workaround in meson/session-post-install.py until proper
-        #        solution arises:
-        #        https://github.com/mesonbuild/meson/issues/2416
-        session_instdir = xsessiondir
-        #session_instdir = [ xesssiondir, wlsessiondir ]
-    endif
-    i18n.merge_file(
-      input:  session_desktop + '.in',
-      output: session_desktop,
-      po_dir: '../po',
-      install: true,
-      install_dir: session_instdir,
-      type: 'desktop'
-    )
+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 = []
@@ -50,42 +34,7 @@ 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',
-  'gnome-shell-sass/_widgets.scss',
-  'gnome-shell-sass/widgets/_a11y.scss',
-  'gnome-shell-sass/widgets/_app-grid.scss',
-  'gnome-shell-sass/widgets/_base.scss',
-  'gnome-shell-sass/widgets/_buttons.scss',
-  'gnome-shell-sass/widgets/_calendar.scss',
-  'gnome-shell-sass/widgets/_check-box.scss',
-  'gnome-shell-sass/widgets/_corner-ripple.scss',
-  'gnome-shell-sass/widgets/_dash.scss',
-  'gnome-shell-sass/widgets/_dialogs.scss',
-  'gnome-shell-sass/widgets/_entries.scss',
-  'gnome-shell-sass/widgets/_hotplug.scss',
-  'gnome-shell-sass/widgets/_ibus-popup.scss',
-  'gnome-shell-sass/widgets/_keyboard.scss',
-  'gnome-shell-sass/widgets/_login-dialog.scss',
-  'gnome-shell-sass/widgets/_looking-glass.scss',
-  'gnome-shell-sass/widgets/_message-list.scss',
-  'gnome-shell-sass/widgets/_misc.scss',
-  'gnome-shell-sass/widgets/_network-dialog.scss',
-  'gnome-shell-sass/widgets/_notifications.scss',
-  'gnome-shell-sass/widgets/_osd.scss',
-  'gnome-shell-sass/widgets/_overview.scss',
-  'gnome-shell-sass/widgets/_panel.scss',
-  'gnome-shell-sass/widgets/_popovers.scss',
-  'gnome-shell-sass/widgets/_screen-shield.scss',
-  'gnome-shell-sass/widgets/_scrollbars.scss',
-  'gnome-shell-sass/widgets/_search-entry.scss',
-  'gnome-shell-sass/widgets/_search-results.scss',
-  'gnome-shell-sass/widgets/_slider.scss',
-  'gnome-shell-sass/widgets/_switcher-popup.scss',
-  'gnome-shell-sass/widgets/_switches.scss',
-  'gnome-shell-sass/widgets/_tiled-previews.scss',
-  'gnome-shell-sass/widgets/_window-picker.scss',
-  'gnome-shell-sass/widgets/_workspace-switcher.scss',
-  'gnome-shell-sass/widgets/_workspace-thumbnails.scss'
+  'gnome-shell-sass/_high-contrast-colors.scss'
 )

 theme_data = [
@@ -98,20 +47,15 @@ theme_data = [
  'gnome-classic-high-contrast.css'
 ]

-stylesheet = 'gnome-classic.css'
-if fs.exists(stylesheet)
-  install_data(stylesheet, install_dir: themedir)
-else
-  sassc = find_program('sassc', required: true)
-  custom_target(stylesheet,
-    input: fs.replace_suffix(stylesheet, '.scss'),
-    output: stylesheet,
-    depend_files: theme_sources,
-    command: [sassc, '-a', '@INPUT@', '@OUTPUT@'],
-    install: true,
-    install_dir: themedir
-  )
-endif
+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)

--- a/debian/changelog
+++ b/debian/changelog
@@ -0,0 +1,592 @@
+gnome-shell-extensions (3.32.0-1) experimental; urgency=medium
+
+  * New upstream release
+
+ -- Iain Lane <laney@debian.org>  Tue, 12 Mar 2019 16:34:14 +0000
+
+gnome-shell-extensions (3.31.92-1) experimental; urgency=medium
+
+  * New upstream release
+
+ -- Iain Lane <laney@debian.org>  Wed, 06 Mar 2019 15:40:48 +0000
+
+gnome-shell-extensions (3.31.90-1) experimental; urgency=medium
+
+  * New upstream release
+    + Misc. bug fixes and cleanups
+    + Remove obsolete alternate-tab extension
+    + Adjust to gnome-shell changes
+  * debian/watch: Watch for unstable releases
+  * rules: alternate-tab is dropped; stop trying to enable it
+
+ -- Iain Lane <laney@debian.org>  Thu, 21 Feb 2019 10:33:12 +0000
+
+gnome-shell-extensions (3.30.1-1) unstable; urgency=medium
+
+  * Team upload
+  * New upstream release
+  * Bump Standards-Version to 4.2.1
+  * d/p/gnome-session-classic-wrapper-script.patch:
+    Re-word to avoid a Lintian warning
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 02 Nov 2018 09:26:47 +0000
+
+gnome-shell-extensions (3.30.0-1) unstable; urgency=medium
+
+  * New upstream release
+  * Release to unstable
+
+ -- Jeremy Bicha <jbicha@debian.org>  Wed, 05 Sep 2018 12:34:40 -0400
+
+gnome-shell-extensions (3.29.91-1) experimental; urgency=medium
+
+  * Team upload
+  * New upstream development release
+  * Bump Standards-Version to 4.2.0
+  * Sort dependency lists (wrap-and-sort -a)
+  * d/copyright: Remove unnecessary sentence fragment
+  * d/p/series: Remove commented-out line
+
+ -- Simon McVittie <smcv@debian.org>  Mon, 20 Aug 2018 20:27:57 +0100
+
+gnome-shell-extensions (3.29.90-1) experimental; urgency=medium
+
+  * Team upload
+  * New upstream development release
+
+ -- Simon McVittie <smcv@debian.org>  Thu, 02 Aug 2018 10:46:44 +0100
+
+gnome-shell-extensions (3.29.3+really3.29.3-1) experimental; urgency=medium
+
+  * Team upload
+  * d/watch: Watch for development versions
+  * Re-upload to experimental with a higher version than
+    3.29.3+really3.28.1-1, which reverted the incorrect upload of the
+    previous version to unstable
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 27 Jul 2018 23:56:10 +0100
+
+gnome-shell-extensions (3.29.3-1) unstable; urgency=medium
+
+  * Team upload
+
+  [ Arnaud Rebillout ]
+  * New upstream release
+
+  [ Simon McVittie ]
+  * Bump Standards-Version to 4.1.5
+  * Set Rules-Requires-Root to no
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 27 Jul 2018 09:37:34 +0100
+
+gnome-shell-extensions (3.28.1-1) unstable; urgency=medium
+
+  * New upstream release
+  * Bump Standards-Version to 4.1.4
+
+ -- Jeremy Bicha <jbicha@debian.org>  Mon, 14 May 2018 21:51:46 -0400
+
+gnome-shell-extensions (3.28.0-2) unstable; urgency=medium
+
+  * Fix typo in configure flag that resulted in missing
+    auto-move-windows, native-window-placement, & user-theme extensions
+
+ -- Jeremy Bicha <jbicha@debian.org>  Mon, 19 Mar 2018 18:20:53 -0400
+
+gnome-shell-extensions (3.28.0-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Jeremy Bicha <jbicha@debian.org>  Sun, 18 Mar 2018 20:17:17 -0400
+
+gnome-shell-extensions (3.27.92-2) unstable; urgency=medium
+
+  * Release to unstable
+
+ -- Jeremy Bicha <jbicha@debian.org>  Sat, 10 Mar 2018 19:37:45 -0500
+
+gnome-shell-extensions (3.27.92-1) experimental; urgency=medium
+
+  [ Jeremy Bicha ]
+  * New upstream release candidate
+  * Drop explicit dependency on mutter's gir. gnome-shell-extensions depends
+    on gnome-shell which depends on the gir. Dropping it will make transitions
+    easier.
+
+  [ Simon McVittie ]
+  * Recommend gnome-tweaks instead of transitional gnome-tweak-tool
+
+ -- Jeremy Bicha <jbicha@debian.org>  Mon, 05 Mar 2018 21:02:01 -0500
+
+gnome-shell-extensions (3.27.91-1) experimental; urgency=medium
+
+  * New upstream development release
+  * Build with meson
+  * Build-Depend on sassc
+  * Bump debhelper compat to 11
+  * Drop places-menu-Don-t-force-dispose-of-uninitialized-proxies.patch &
+    dont-require-nautilus-classic.patch: Applied in new release
+
+ -- Jeremy Bicha <jbicha@debian.org>  Fri, 23 Feb 2018 19:49:59 -0500
+
+gnome-shell-extensions (3.26.2-3) unstable; urgency=medium
+
+  * Team upload
+
+  [ Jeremy Bicha ]
+  * Update Vcs fields for migration to https://salsa.debian.org/
+
+  [ Simon McVittie ]
+  * d/patches: Re-export with gbp pq export
+  * d/p/places-menu-Don-t-force-dispose-of-uninitialized-proxies.patch:
+    Take patch from upstream to avoid frequent tracebacks from the Places
+    menu with gjs >= 1.50.2-3 (Closes: #888608)
+
+ -- Simon McVittie <smcv@debian.org>  Tue, 30 Jan 2018 09:15:54 +0000
+
+gnome-shell-extensions (3.26.2-2) unstable; urgency=medium
+
+  * Update Vcs fields for conversion to git
+  * Add debian/gbp.conf
+  * Bump Standards-Version to 4.1.2
+
+ -- Jeremy Bicha <jbicha@debian.org>  Fri, 15 Dec 2017 15:19:14 -0500
+
+gnome-shell-extensions (3.26.2-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 05 Nov 2017 20:17:03 +0100
+
+gnome-shell-extensions (3.26.1-2) unstable; urgency=medium
+
+  * Release to unstable
+  * Bump Standards-Version to 4.1.1
+
+ -- Jeremy Bicha <jbicha@debian.org>  Fri, 13 Oct 2017 16:49:30 -0400
+
+gnome-shell-extensions (3.26.1-1) experimental; urgency=medium
+
+  * Team upload
+  * New upstream stable release
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 06 Oct 2017 11:01:11 +0100
+
+gnome-shell-extensions (3.26.0-1) experimental; urgency=medium
+
+  * Team upload
+  * New upstream stable release
+
+ -- Simon McVittie <smcv@debian.org>  Wed, 13 Sep 2017 11:33:19 +0100
+
+gnome-shell-extensions (3.25.91-1) experimental; urgency=medium
+
+  * Team upload
+  * New upstream release, for GNOME Shell 3.25.91
+    - d/p/adapt-to-gsd324.patch: Drop, applied upstream
+    - Switch dependency to gir1.2-mutter-1
+
+ -- Simon McVittie <smcv@debian.org>  Tue, 05 Sep 2017 16:43:01 +0100
+
+gnome-shell-extensions (3.22.2-2) unstable; urgency=medium
+
+  * Add adapt-to-gsd324.patch (Closes: #869948):
+    - Adjust gnome-session file for gnome-settings-daemon 3.24
+  * debian/control.in:
+    - Bump Standards-Version to 4.0.0
+    - Explicitly depend on gnome-settings-daemon >= 3.24
+    - Drop version from gnome-tweak-tool recommends
+    - Depend on gnome-session-bin instead of gnome-session (LP: #1702832)
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Sun, 06 Aug 2017 17:38:06 -0400
+
+gnome-shell-extensions (3.22.2-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 10 Nov 2016 19:36:44 +0100
+
+gnome-shell-extensions (3.22.1-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 11 Oct 2016 17:58:31 +0200
+
+gnome-shell-extensions (3.22.0-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 20 Sep 2016 01:59:50 +0200
+
+gnome-shell-extensions (3.21.92-1) unstable; urgency=medium
+
+  * New upstream development release.
+  * Replace Build-Depends gnome-common with pkg-config and gettext.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 13 Sep 2016 22:13:19 +0200
+
+gnome-shell-extensions (3.21.91-1) unstable; urgency=medium
+
+  * New upstream beta release.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Tue, 30 Aug 2016 19:57:32 +0200
+
+gnome-shell-extensions (3.21.90-1) experimental; urgency=medium
+
+  [ Andreas Henriksson ]
+  * New upstream beta release.
+  * Update build-dependencies according to configure.ac changes:
+    - drop intltool, now gettext is used instead.
+
+  [ Jeremy Bicha ]
+  * Convert from cdbs to dh
+  * Add debian/docs to install NEWS and README
+  * Bump dh compat to 10
+  * Update Vcs fields
+  * Refresh patches
+
+ -- Andreas Henriksson <andreas@fatal.se>  Sun, 21 Aug 2016 05:36:17 +0200
+
+gnome-shell-extensions (3.21.4-1) experimental; urgency=medium
+
+  * New upstream development release.
+  * Stop hard-coding Victor Seva in the Uploaders field
+
+ -- Andreas Henriksson <andreas@fatal.se>  Fri, 12 Aug 2016 16:28:33 +0200
+
+gnome-shell-extensions (3.20.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.8.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 11 May 2016 15:21:35 +0200
+
+gnome-shell-extensions (3.20.0-2) unstable; urgency=medium
+
+  * Upload to unstable.
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 17 Apr 2016 00:25:25 +0200
+
+gnome-shell-extensions (3.20.0-1) experimental; urgency=medium
+
+  * New upstream release.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Fri, 25 Mar 2016 10:48:00 +0100
+
+gnome-shell-extensions (3.19.92-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Update dont-require-nautilus-classic.patch to apply.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Thu, 17 Mar 2016 12:51:13 +0100
+
+gnome-shell-extensions (3.18.4-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.7.
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 06 Mar 2016 22:38:57 +0100
+
+gnome-shell-extensions (3.18.3-2) unstable; urgency=medium
+
+  * Add Breaks/Replaces gnome-shell-common (<< 3.18) (Closes: #808906)
+    - Helps upgrades from Jessie by allowing overwriting
+      /usr/share/gnome-shell/theme/calendar-today.svg et.al.
+      which was previously shipped in gnome-shell-common.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Wed, 10 Feb 2016 01:24:42 +0100
+
+gnome-shell-extensions (3.18.3-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 14 Jan 2016 22:49:16 +0100
+
+gnome-shell-extensions (3.18.2-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 13 Nov 2015 00:04:09 +0100
+
+gnome-shell-extensions (3.18.1-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 16 Oct 2015 22:09:01 +0200
+
+gnome-shell-extensions (3.18.0-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Laurent Bigonville <bigon@debian.org>  Sun, 11 Oct 2015 16:29:18 +0200
+
+gnome-shell-extensions (3.17.92-1) experimental; urgency=medium
+
+  * New upstream release candidate.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Fri, 18 Sep 2015 17:28:06 +0200
+
+gnome-shell-extensions (3.16.2-1) unstable; urgency=medium
+
+  [ Emilio Pozuelo Monfort ]
+  * debian/gnome-shell-extensions.gsettings-override:
+    + Dropped, no longer needed as the enabled extension no longer exists.
+      Thanks Artur Rona for noticing. (Closes: #782747)
+
+  [ Michael Biebl ]
+  * New upstream release.
+  * Update Homepage.
+  * Bump debhelper compatibility level to 9.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 02 Jul 2015 19:13:32 +0200
+
+gnome-shell-extensions (3.16.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * debian/control.in,
+    debian/rules:
+    + The system monitor extension was removed. Drop the libgtop
+      build and runtime dependencies and stop enabling it.
+  * debian/patches/apps-center-labels.patch,
+    debian/patches/window-list-pointerInNotification.patch,
+    debian/patches/menu-arrows-icons.patch:
+    + Dropped, merged upstream.
+  * debian/patches/dont-require-nautilus-classic.patch:
+    + Updated for the new version.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Sun, 14 Jun 2015 15:23:59 +0200
+
+gnome-shell-extensions (3.14.2-1) unstable; urgency=medium
+
+  * New upstream bugfix release.
+  * menu-arrows-icons: new patch. Make arrows consistent with the rest
+    of the shell.
+  * apps-center-labels.patch: patch from upstream git. Center labels
+    vertically in the applications menu.
+  * window-list-pointerInNotification.patch: patch from upstream git.
+    Update window-list extension for an older shell API change.
+
+ -- Josselin Mouette <joss@debian.org>  Sun, 30 Nov 2014 16:06:59 +0100
+
+gnome-shell-extensions (3.14.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * debian/control.in: Bump Standards-Version to 3.9.6 (no further changes)
+  * Add missing dependencies against gir packages, including gir1.2-gmenu-3.0,
+    this should fix the apps-menu extension for some people (Closes: #765460).
+
+ -- Laurent Bigonville <bigon@debian.org>  Sun, 19 Oct 2014 21:17:58 +0200
+
+gnome-shell-extensions (3.14.0-2) unstable; urgency=medium
+
+  * Drop xrandr from EXTENSIONS_DISABLED, this extension was removed
+    upstream.
+  * Add new screenshot-window-sizer extension to EXTENSIONS_ENABLED.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 24 Sep 2014 01:15:32 +0200
+
+gnome-shell-extensions (3.14.0-1) unstable; urgency=medium
+
+  * debian/watch: only scan for stable releases.
+  * New upstream release.
+  * Upload to unstable.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Tue, 23 Sep 2014 15:46:30 +0200
+
+gnome-shell-extensions (3.13.91-1) experimental; urgency=medium
+
+  * New upstream development release.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Sat, 06 Sep 2014 11:16:39 -0700
+
+gnome-shell-extensions (3.12.2-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.5
+  * Upload to unstable.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Tue, 15 Jul 2014 00:06:09 +0200
+
+gnome-shell-extensions (3.12.0-1) experimental; urgency=low
+
+  [ Jean Schurger ]
+  * New upstream release (3.10.1)
+  * debian/rules: remove one of the 'windowsNavigator' extension listed twice
+    and the 'alternative-system-menu' extension (does not exists anymore)
+  * debian/copyright: Update 'Format:' line
+
+  [ Andreas Henriksson ]
+  * New upstream release (3.12.0)
+  * debian/local/gnome-session-classic,
+    debian/patches/gnome-session-classic-wrapper-script.patch:
+    - update script to include new GNOME_SHELL_SESSION_MODE env variable
+      and update patch to apply again.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Fri, 04 Apr 2014 21:43:18 +0200
+
+gnome-shell-extensions (3.8.4-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Sun, 13 Oct 2013 18:11:33 +0200
+
+gnome-shell-extensions (3.8.4-1) experimental; urgency=low
+
+  [ Jeremy Bicha ]
+  * New upstream release
+  * Dropped patches applied in new version:
+    - fix-hibernate.patch
+    - fix-applications-menu-resolution-change.patch
+    - look-in-data-home-for-themes.patch
+
+  [ Michael Biebl ]
+  * Add a wrapper script to start the GNOME Classic session as currently
+    Xsession doesn't allow to run gnome-session with custom arguments due to
+    #653327.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 11 Oct 2013 18:55:23 +0200
+
+gnome-shell-extensions (3.8.3.1-1) experimental; urgency=low
+
+  [ Jeremy Bicha ]
+  * New upstream release
+    - default-min-max and static-workspaces extensions have been dropped.
+      Use Classic Mode or tweak org.gnome.shell.overrides in dconf-editor
+  * debian/control.in:
+    - Depend on gnome-session 3.8, required for the new Classic mode.
+    - Update homepage
+  * debian/patches/dont-require-nautilus-classic.patch:
+    - Don't require nautilus-classic since it forces desktop icons
+  * debian/patches/fix-applications-menu-resolution-change.patch:
+    - Backport commit to not break applications menu when screen resolution
+      changes
+  * debian/patches/fix-hibernate.patch:
+    - Backport patch to fix checking whether hibernate is allowed
+  * debian/patches/look-in-data-home-for-themes.patch:
+    - Backport commit to also look in XDG_DATA_HOME (usually ~/.local/share/)
+      for user themes
+  * debian/rules:
+    - Run autoreconf
+
+ -- Andreas Henriksson <andreas@fatal.se>  Fri, 16 Aug 2013 20:25:30 +0200
+
+gnome-shell-extensions (3.8.2-1) experimental; urgency=low
+
+  * Team upload
+
+  [ Victor Seva ]
+  * Recommends gnome-tweak-tool
+
+  [ Jean Schurger ]
+  * New upstream release 3.7.92 (LP: #1017979, #1059152).
+  * Enabled new extensions.
+  * Dropped 'dock' and 'gajim'.
+  * Use ./configure instead of autoreconf.
+  * Bumped Standards-Version to 3.9.4.
+  * Updated Vcs-Svn.
+  * debian/control.in
+    - Added runtime dependency to 'gvfs' (>= 1.16.0).
+      The 'Places' extension rely on a 'gvfs' linked to 'udisks2'.
+
+  [ Simon McVittie ]
+  * New upstream release 3.8.2.
+  * Install the "classic mode"
+  * Enable windowNavigator extension (this means we have everything except
+    example and xrandr, the same as in the Ubuntu gnome3-team's PPA)
+
+ -- Simon McVittie <smcv@debian.org>  Thu, 23 May 2013 09:07:23 +0100
+
+gnome-shell-extensions (3.4.0-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 30 May 2012 13:22:54 +0200
+
+gnome-shell-extensions (3.4.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * Remove 01_status-menu_disable_accounts.patch: The alternative-status-menu
+    extension no longer recreates the complete user menu but reuses the one
+    from gnome-shell, so we can't easily get rid of the "Online Accounts" menu
+    entry. We will patch gnome-shell directly instead.
+  * Remove 02-Revert-all-remove-all-GSettings-usage.patch and
+    03-Revert-Remove-all-references-to-localedir-from-metad.patch, no longer
+    required.
+  * Bump Standards-Version to 3.9.3
+
+ -- Michael Biebl <biebl@debian.org>  Mon, 21 May 2012 00:24:56 +0200
+
+gnome-shell-extensions (3.2.3-1) unstable; urgency=low
+
+  [ Josselin Mouette ]
+  * gnome-shell-extensions.gsettings-override: enable the alternative
+    status menu by default. Closes: #648112.
+  * Use ${gnome:Version} to generate strict dependencies, it’s very
+    unlikely that extensions remain compatible after a major upgrade.
+
+  [ Michael Biebl ]
+  * Upload to unstable.
+
+  [ Josselin Mouette ]
+  * 01_status-menu_disable_accounts.patch: new patch. Drop the unusable
+    advertisement for Google. It is already available in the control
+    center anyway.
+
+  [ Michael Biebl ]
+  * New upstream release.
+  * Drop patches which have been merged upstream:
+    - debian/patches/upstream/*
+    - debian/patches/fix-*
+  * Refresh 01_status-menu_disable_accounts.patch.
+  * Add 02-Revert-all-remove-all-GSettings-usage.patch: Use GSettings since we
+    install the extensions system-wide.
+  * Use dh-autoreconf to generate the build system.
+  * Add 03-Revert-Remove-all-references-to-localedir-from-metad.patch: Use
+    locales from system-wide location.
+
+ -- Michael Biebl <biebl@debian.org>  Sat, 11 Feb 2012 23:28:53 +0100
+
+gnome-shell-extensions (3.2.0-1) experimental; urgency=low
+
+  [ Victor Seva ]
+  * Initial release (Closes: #627515)
+    Package based on the work by Bilal Akhtar <bilalakhtar@ubuntu.com>
+  * debian/copyright
+    - Added myself
+    - Fixed syntax-error-in-dep5-copyright syntax error
+  * debian/control.in
+    - Added myself as maintainer.
+    - Fix gnome-shell dependency.
+    - Fix gir1.2-gtop-2.0 dependency for systemMonitor ext.
+  * debian/rules
+    - Added uploaders.mk gnome-version.mk includes.
+    - Removed unused variables.
+  * debian/watch added.
+  * No more gnome-shell-extension-* packages.
+  * debian/patches/upstream
+    - patch_967aee7aad2accfb38d91ab56b6c5e91d86a2722.diff
+      popup menu fix
+    - patch_66242aa76a5d59fb4659551575c1fbb42e50b8fb.diff
+      dock fix.
+    - patch_4c5a36e4c0cbe38f2e26b6b3c8b02e88b4b939f7.diff
+      patch_2bba98d6214cffae2eb5cecb9d7c1f6b6d244052.diff
+      systemMonitor: Properly enable/disable
+  * debian/patches
+    - fix_dock_gnome-shell_version.diff
+    - fix_alternate-tab_661281.diff
+    - fix_alternate-tab_gnome-shell_version.diff
+  * debian/rules
+    - EXTENSIONS_ENABLED, EXTENSIONS_DISABLED variables
+    - disabled xrandr-indicator
+
+  [ Michael Biebl ]
+  * debian/watch: Track .xz tarballs.
+  * debian/control.in:
+    - Set pkg-gnome-maintainers@lists.alioth.debian.org as Maintainer and add
+      Victor Seva <linuxmaniac@torreviejawireless.org> to Uploaders.
+    - Wrap (Build-)Depends.
+    - Add Vcs-Svn and Vcs-Browser field.
+  * debian/rules:
+    - Include gnome-get-source.mk.
+
+ -- Michael Biebl <biebl@debian.org>  Sat, 12 Nov 2011 18:32:22 +0100
--- a/debian/compat
+++ b/debian/compat
@@ -0,0 +1 @@
+11
--- a/debian/control
+++ b/debian/control
@@ -0,0 +1,49 @@
+# This file is autogenerated. DO NOT EDIT!
+#
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+Source: gnome-shell-extensions
+Section: gnome
+Priority: optional
+Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Uploaders: Iain Lane <laney@debian.org>, Jeremy Bicha <jbicha@debian.org>
+Build-Depends: debhelper (>= 11.1.3),
+               gnome-pkg-tools,
+               meson (>= 0.44.0),
+               sassc
+Rules-Requires-Root: no
+Standards-Version: 4.2.1
+Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-shell-extensions
+Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell-extensions.git
+Homepage: https://wiki.gnome.org/Projects/GnomeShell/Extensions
+
+Package: gnome-shell-extensions
+Architecture: all
+Depends: gir1.2-atk-1.0,
+         gir1.2-clutter-1.0,
+         gir1.2-gdkpixbuf-2.0,
+         gir1.2-glib-2.0,
+         gir1.2-gmenu-3.0,
+         gir1.2-gtk-3.0,
+         gir1.2-pango-1.0,
+         gnome-session-bin (>= 3.8),
+         gnome-settings-daemon (>= 3.24),
+         gnome-shell (<< ${gnome:NextVersion}),
+         gnome-shell (>= ${gnome:Version}),
+         gvfs (>= 1.16.0),
+         ${misc:Depends}
+Recommends: gnome-tweaks
+Replaces: gnome-shell-common (<< 3.18)
+Breaks: gnome-shell-common (<< 3.18)
+Description: Extensions to extend functionality of GNOME Shell
+ The GNOME Shell redefines user interactions with the GNOME desktop. In
+ particular, it offers new paradigms for launching applications,
+ accessing documents, and organizing open windows in GNOME. Later, it
+ will introduce a new applets eco-system and offer new solutions for
+ other desktop features, such as notifications and contacts management.
+ The GNOME Shell is intended to replace functions handled by the GNOME
+ Panel and by the window manager in previous versions of GNOME. The GNOME
+ Shell has rich visual effects enabled by new graphical technologies.
+ .
+ GNOME Shell is extensible using extensions. This package contains
+ official GNOME Shell extensions.
--- a/debian/control.in
+++ b/debian/control.in
@@ -0,0 +1,45 @@
+Source: gnome-shell-extensions
+Section: gnome
+Priority: optional
+Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Uploaders: @GNOME_TEAM@
+Build-Depends: debhelper (>= 11.1.3),
+               gnome-pkg-tools,
+               meson (>= 0.44.0),
+               sassc
+Rules-Requires-Root: no
+Standards-Version: 4.2.1
+Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-shell-extensions
+Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell-extensions.git
+Homepage: https://wiki.gnome.org/Projects/GnomeShell/Extensions
+
+Package: gnome-shell-extensions
+Architecture: all
+Depends: gir1.2-atk-1.0,
+         gir1.2-clutter-1.0,
+         gir1.2-gdkpixbuf-2.0,
+         gir1.2-glib-2.0,
+         gir1.2-gmenu-3.0,
+         gir1.2-gtk-3.0,
+         gir1.2-pango-1.0,
+         gnome-session-bin (>= 3.8),
+         gnome-settings-daemon (>= 3.24),
+         gnome-shell (<< ${gnome:NextVersion}),
+         gnome-shell (>= ${gnome:Version}),
+         gvfs (>= 1.16.0),
+         ${misc:Depends}
+Recommends: gnome-tweaks
+Replaces: gnome-shell-common (<< 3.18)
+Breaks: gnome-shell-common (<< 3.18)
+Description: Extensions to extend functionality of GNOME Shell
+ The GNOME Shell redefines user interactions with the GNOME desktop. In
+ particular, it offers new paradigms for launching applications,
+ accessing documents, and organizing open windows in GNOME. Later, it
+ will introduce a new applets eco-system and offer new solutions for
+ other desktop features, such as notifications and contacts management.
+ The GNOME Shell is intended to replace functions handled by the GNOME
+ Panel and by the window manager in previous versions of GNOME. The GNOME
+ Shell has rich visual effects enabled by new graphical technologies.
+ .
+ GNOME Shell is extensible using extensions. This package contains
+ official GNOME Shell extensions.
--- a/debian/copyright
+++ b/debian/copyright
@@ -0,0 +1,28 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: gnome-shell-extensions
+Upstream-Contact: 2011 Giovanni Campagna <gcampagna@src.gnome.org>
+Source: https://download.gnome.org/sources/gnome-shell-extensions/
+
+Files: *
+Copyright: 2011 Giovanni Campagna <gcampagna@src.gnome.org>
+License: GPL-2+
+
+Files: debian/*
+Copyright:
+    2011 Victor Seva <linuxmaniac@torreviejawireless.org>
+    2011 Bilal Akhtar <bilalakhtar@ubuntu.com>
+License: GPL-2+
+
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
--- a/debian/docs
+++ b/debian/docs
@@ -0,0 +1,2 @@
+NEWS
+README.md
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -0,0 +1,14 @@
+[DEFAULT]
+pristine-tar = True
+debian-branch = debian/master
+upstream-branch = upstream/latest
+upstream-vcs-tag = %(version)s
+
+[buildpackage]
+sign-tags = True
+
+[import-orig]
+postimport = dch -v%(version)s New upstream release; git add debian/changelog; debcommit
+
+[pq]
+patch-numbers = False
--- a/debian/install
+++ b/debian/install
@@ -0,0 +1 @@
+debian/local/gnome-session-classic usr/bin
--- a/debian/local/gnome-session-classic
+++ b/debian/local/gnome-session-classic
@@ -0,0 +1,2 @@
+#! /bin/sh
+env GNOME_SHELL_SESSION_MODE=classic gnome-session --session gnome-classic "$@"
--- a/debian/patches/gnome-session-classic-wrapper-script.patch
+++ b/debian/patches/gnome-session-classic-wrapper-script.patch
@@ -0,0 +1,30 @@
+From: Michael Biebl <biebl@debian.org>
+Date: Tue, 30 Jan 2018 09:04:03 +0000
+Subject: Use a wrapper script to start GNOME classic session
+
+Xsession currently doesn't allow passing more then one argument, as it
+otherwise fails with
+Xsession: unable to launch "gnome-session --session classic" X session ---
+"gnome-session --session classic" not found; falling back to default session.
+
+This is due to [1]. Add a wrapper script to start the GNOME classic session
+as a workaround. Once [1] is fixed, this should be removed again.
+
+[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=653327.
+---
+ data/gnome-classic.desktop.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/gnome-classic.desktop.in b/data/gnome-classic.desktop.in
+index 055ce64..34827ee 100644
+--- a/data/gnome-classic.desktop.in
+++ b/data/gnome-classic.desktop.in
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Name=GNOME Classic
+ Comment=This session logs you into GNOME Classic
+-Exec=env GNOME_SHELL_SESSION_MODE=classic gnome-session --session gnome-classic
+Exec=gnome-session-classic
+ TryExec=gnome-session
+ Type=Application
+ DesktopNames=GNOME-Classic;GNOME;
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+gnome-session-classic-wrapper-script.patch
--- a/debian/rules
+++ b/debian/rules
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+EXTENSIONS_ENABLED='apps-menu, places-menu, \
+ launch-new-instance, window-list, \
+ drive-menu, screenshot-window-sizer, \
+ windowsNavigator, workspace-indicator, \
+ auto-move-windows, native-window-placement, user-theme'
+
+EXTENSIONS_DISABLED='example'
+
+%:
+	dh $@ --with gnome
+
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		-Denable_extensions=$(EXTENSIONS_ENABLED) \
+		-Dclassic_mode=true
--- a/debian/source/format
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--- a/debian/watch
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=4
+https://download.gnome.org/sources/@PACKAGE@/([\d\.]+)/ \
+	@PACKAGE@@ANY_VERSION@\.tar\.xz
--- a/export-zips.sh
+++ b/export-zips.sh
@@ -7,40 +7,30 @@ 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
-meson install -C $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

-  olddomain=gnome-shell-extensions
-  newdomain=gnome-shell-extension-$name
-  sed -i "/gettext-domain/ s:$olddomain:$newdomain:" $f/metadata.json
+  cp $srcdir/NEWS $srcdir/COPYING $f
+  cp -r $localedir $f

-  xgettext --from-code=UTF-8 --output-dir=$builddir --output=$name.pot $f/*.js
-
-  if [ -f $builddir/$name.pot ]; then
-    mkdir $f/po
-    for l in $(<$srcdir/po/LINGUAS); do
-      msgmerge --quiet --output-file=$f/po/$l.po \
-        $srcdir/po/$l.po $builddir/$name.pot
-    done
+  if [ -f $schema ]; then
+    mkdir $f/schemas
+    cp $schema $f/schemas;
+    glib-compile-schemas $f/schemas
  fi

-  cp $srcdir/NEWS $srcdir/COPYING $f
-  sources=(NEWS COPYING $(cd $f; ls *.js))
-
-  [ -f $schema ] || unset schema
-
-  gnome-extensions pack ${sources[@]/#/--extra-source=} \
-    ${schema:+--schema=$schema} --out-dir=$srcdir/zip-files $f
+  (cd $f && zip -rmq $srcdir/zip-files/$uuid.shell-extension.zip .)
 done

 rm -rf $builddir
--- a/extensions/apps-menu/extension.js
+++ b/extensions/apps-menu/extension.js
@@ -2,17 +2,18 @@
 /* exported init enable disable */

 const {
-    Atk, Clutter, Gio, GLib, GMenu, GObject, Gtk, Meta, Shell, St,
+    Atk, Clutter, Gio, GLib, GMenu, GObject, Gtk, Meta, Shell, St
 } = imports.gi;
-const Signals = imports.signals;
-
 const DND = imports.ui.dnd;
-const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
+const Signals = imports.signals;

-const _ = ExtensionUtils.gettext;
+const Gettext = imports.gettext.domain('gnome-shell-extensions');
+const _ = Gettext.gettext;
+
+const ExtensionUtils = imports.misc.extensionUtils;

 const appSys = Shell.AppSystem.get_default();

@@ -24,37 +25,50 @@ const NAVIGATION_REGION_OVERSHOOT = 50;
 Gio._promisify(Gio._LocalFilePrototype, 'query_info_async', 'query_info_finish');
 Gio._promisify(Gio._LocalFilePrototype, 'set_attributes_async', 'set_attributes_finish');

-var ApplicationMenuItem = GObject.registerClass(
+class ActivitiesMenuItem extends PopupMenu.PopupBaseMenuItem {
+    constructor(button) {
+        super();
+        this._button = button;
+        this.actor.add_child(new St.Label({ text: _('Activities Overview') }));
+    }
+
+    activate(event) {
+        this._button.menu.toggle();
+        Main.overview.toggle();
+        super.activate(event);
+    }
+}
+
 class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
-    _init(button, app) {
-        super._init();
+    constructor(button, app) {
+        super();
        this._app = app;
        this._button = button;

        this._iconBin = new St.Bin();
-        this.add_child(this._iconBin);
+        this.actor.add_child(this._iconBin);

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

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

-        this._delegate = this;
-        let draggable = DND.makeDraggable(this);
+        this.actor._delegate = this;
+        let draggable = DND.makeDraggable(this.actor);

        let maybeStartDrag = draggable._maybeStartDrag;
-        draggable._maybeStartDrag = event => {
+        draggable._maybeStartDrag = (event) => {
            if (this._dragEnabled)
                return maybeStartDrag.call(draggable, event);
            return false;
@@ -66,8 +80,6 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
        this._button.selectCategory(null);
        this._button.menu.toggle();
        super.activate(event);
-
-        Main.overview.hide();
    }

    setActive(active, params) {
@@ -76,8 +88,8 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
        super.setActive(active, params);
    }

-    setDragEnabled(enabled) {
-        this._dragEnabled = enabled;
+    setDragEnabled(enable) {
+        this._dragEnabled = enable;
    }

    getDragActor() {
@@ -89,16 +101,13 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
    }

    _updateIcon() {
-        let icon = this.getDragActor();
-        icon.style_class = 'icon-dropshadow';
-        this._iconBin.set_child(icon);
+        this._iconBin.set_child(this.getDragActor());
    }
-});
+}

-var CategoryMenuItem = GObject.registerClass(
 class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
-    _init(button, category) {
-        super._init();
+    constructor(button, category) {
+        super();
        this._category = category;
        this._button = button;

@@ -111,9 +120,8 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
        else
            name = _('Favorites');

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

    activate(event) {
@@ -123,9 +131,9 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
    }

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

-        if (this._oldX === -1) {
+        if (this._oldX == -1) {
            this._oldX = x;
            this._oldY = y;
            return true;
@@ -138,11 +146,11 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
        this._oldY = y;

        // If it lies outside the x-coordinates then it is definitely outside.
-        if (posX > x || posX + this.width < x)
+        if (posX > x || posX + this.actor.width < x)
            return false;

        // If it lies inside the menu item then it is definitely inside.
-        if (posY <= y && posY + this.height >= y)
+        if (posY <= y && posY + this.actor.height >= y)
            return true;

        // We want the keep-up triangle only if the movement is more
@@ -163,42 +171,37 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
        // only check for triangle ABC.
        if (posY > y) {
            let offset = posY - y;
-            y = posY + this.height + offset;
+            y = posY + this.actor.height + offset;
        }

        // Ensure that A is (0, 0).
        x -= posX;
-        y -= posY + this.height;
+        y -= posY + this.actor.height;

        // Check which side of line AB the point P lies on by taking the
        // cross-product of AB and AP. See:
        // http://stackoverflow.com/questions/3461453/determine-which-side-of-a-line-a-point-lies
-        if (this.width * y - NAVIGATION_REGION_OVERSHOOT * x <= 0)
+        if (((this.actor.width * y) - (NAVIGATION_REGION_OVERSHOOT * x)) <= 0)
            return true;

        return false;
    }

    _onMotionEvent(actor, event) {
-        if (!this._grab) {
+        if (!Clutter.get_pointer_grab()) {
            this._oldX = -1;
            this._oldY = -1;
-            const grab = global.stage.grab(this);
-            if (grab.get_seat_state() !== Clutter.GrabState.NONE)
-                this._grab = grab;
-            else
-                grab.dismiss();
+            Clutter.grab_pointer(this.actor);
        }
-        this.hover = true;
+        this.actor.hover = true;

        if (this._isNavigatingSubmenu(event.get_coords()))
            return true;

        this._oldX = -1;
        this._oldY = -1;
-        this.hover = false;
-        this._grab?.dismiss();
-        delete this._grab;
+        this.actor.hover = false;
+        Clutter.ungrab_pointer();

        let source = event.get_source();
        if (source instanceof St.Widget)
@@ -207,14 +210,14 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
        return false;
    }

-    _onActiveChanged() {
-        if (!this.active)
-            return;
-
-        this._button.selectCategory(this._category);
-        this._button.scrollToCatButton(this);
+    setActive(active, params) {
+        if (active) {
+            this._button.selectCategory(this._category);
+            this._button.scrollToCatButton(this);
+        }
+        super.setActive(active, params);
    }
-});
+}

 class ApplicationsMenu extends PopupMenu.PopupMenu {
    constructor(sourceActor, arrowAlignment, arrowSide, button) {
@@ -226,9 +229,28 @@ class ApplicationsMenu extends PopupMenu.PopupMenu {
        return false;
    }

+    open(animate) {
+        this._button.hotCorner.setBarrierSize(0);
+        if (this._button.hotCorner.actor) // fallback corner
+            this._button.hotCorner.actor.hide();
+        super.open(animate);
+    }
+
+    close(animate) {
+        let size = Main.layoutManager.panelBox.height;
+        this._button.hotCorner.setBarrierSize(size);
+        if (this._button.hotCorner.actor) // fallback corner
+            this._button.hotCorner.actor.show();
+        super.close(animate);
+    }
+
    toggle() {
-        if (this.isOpen)
+        if (this.isOpen) {
            this._button.selectCategory(null);
+        } else {
+            if (Main.overview.visible)
+                Main.overview.hide();
+        }
        super.toggle();
    }
 }
@@ -240,7 +262,7 @@ class DesktopTarget {

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

        global.get_window_actors().forEach(a => {
            this._onWindowAdded(a.get_parent(), a);
@@ -248,14 +270,14 @@ class DesktopTarget {
    }

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

    _onWindowAdded(group, actor) {
        if (!(actor instanceof Meta.WindowActor))
            return;

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

@@ -300,8 +322,8 @@ class DesktopTarget {

            // Hack: force nautilus to reload file info
            info = new Gio.FileInfo();
-            info.set_attribute_uint64(
-                Gio.FILE_ATTRIBUTE_TIME_ACCESS, GLib.get_real_time());
+            info.set_attribute_uint64(Gio.FILE_ATTRIBUTE_TIME_ACCESS,
+                                      GLib.get_real_time());
            try {
                await file.set_attributes_async(info, queryFlags, ioPriority, null);
            } catch (e) {
@@ -366,28 +388,31 @@ class ApplicationsButton extends PanelMenu.Button {
        // role ATK_ROLE_MENU like other elements of the panel.
        this.accessible_role = Atk.Role.LABEL;

+        let hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
+
        this._label = new St.Label({
            text: _('Applications'),
            y_expand: true,
-            y_align: Clutter.ActorAlign.CENTER,
+            y_align: Clutter.ActorAlign.CENTER
        });
+        hbox.add_child(this._label);
+        hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));

-        this.add_actor(this._label);
+        this.add_actor(hbox);
        this.name = 'panelApplications';
        this.label_actor = this._label;

+        this.connect('captured-event', this._onCapturedEvent.bind(this));
+
        this._showingId = Main.overview.connect('showing', () => {
-            this.add_accessible_state(Atk.StateType.CHECKED);
+            this.add_accessible_state (Atk.StateType.CHECKED);
        });
        this._hidingId = Main.overview.connect('hiding', () => {
-            this.remove_accessible_state(Atk.StateType.CHECKED);
+            this.remove_accessible_state (Atk.StateType.CHECKED);
        });
-        Main.wm.addKeybinding(
-            'apps-menu-toggle-menu',
-            ExtensionUtils.getSettings(),
-            Meta.KeyBindingFlags.IGNORE_AUTOREPEAT,
-            Shell.ActionMode.NORMAL | Shell.ActionMode.OVERVIEW,
-            () => this.menu.toggle());
+        Main.layoutManager.connect('startup-complete',
+                                   this._setKeybinding.bind(this));
+        this._setKeybinding();

        this._desktopTarget = new DesktopTarget();
        this._desktopTarget.connect('app-dropped', () => {
@@ -401,14 +426,14 @@ 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._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._onTreeChanged.bind(this));
    }

    _onTreeChanged() {
@@ -420,34 +445,49 @@ class ApplicationsButton extends PanelMenu.Button {
        }
    }

+    get hotCorner() {
+        return Main.layoutManager.hotCorners[Main.layoutManager.primaryIndex];
+    }
+
    _createVertSeparator() {
        let separator = new St.DrawingArea({
            style_class: 'calendar-vertical-separator',
-            pseudo_class: 'highlighted',
+            pseudo_class: 'highlighted'
        });
        separator.connect('repaint', this._onVertSepRepaint.bind(this));
        return separator;
    }

    _onDestroy() {
-        super._onDestroy();
-
        Main.overview.disconnect(this._showingId);
        Main.overview.disconnect(this._hidingId);
        appSys.disconnect(this._installedChangedId);
        this._tree.disconnect(this._treeChangedId);
        this._tree = null;

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

        this._desktopTarget.destroy();
    }

+    _onCapturedEvent(actor, event) {
+        if (event.type() == Clutter.EventType.BUTTON_PRESS) {
+            if (!Main.overview.shouldToggleByCornerOrButton())
+                return true;
+        }
+        return false;
+    }
+
    _onMenuKeyPress(actor, event) {
        let symbol = event.get_key_symbol();
-        if (symbol === Clutter.KEY_Left || symbol === Clutter.KEY_Right) {
-            let direction = symbol === Clutter.KEY_Left
-                ? Gtk.DirectionType.LEFT : Gtk.DirectionType.RIGHT;
+        if (symbol == Clutter.KEY_Left || symbol == Clutter.KEY_Right) {
+            let direction = symbol == Clutter.KEY_Left ?
+                Gtk.DirectionType.LEFT : Gtk.DirectionType.RIGHT;
            if (this.menu.actor.navigate_focus(global.stage.key_focus, direction, false))
                return true;
        }
@@ -480,6 +520,13 @@ class ApplicationsButton extends PanelMenu.Button {
        super._onOpenStateChanged(menu, open);
    }

+    _setKeybinding() {
+        Main.wm.setCustomKeybindingHandler('panel-main-menu',
+                                           Shell.ActionMode.NORMAL |
+                                           Shell.ActionMode.OVERVIEW,
+                                           () => this.menu.toggle());
+    }
+
    _redisplay() {
        this.applicationsBox.destroy_all_children();
        this.categoriesBox.destroy_all_children();
@@ -489,8 +536,8 @@ class ApplicationsButton extends PanelMenu.Button {
    _loadCategory(categoryId, dir) {
        let iter = dir.iter();
        let nextType;
-        while ((nextType = iter.next()) !== GMenu.TreeItemType.INVALID) {
-            if (nextType === GMenu.TreeItemType.ENTRY) {
+        while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
+            if (nextType == GMenu.TreeItemType.ENTRY) {
                let entry = iter.get_entry();
                let id;
                try {
@@ -503,9 +550,9 @@ 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) {
+            } else if (nextType == GMenu.TreeItemType.SEPARATOR) {
                this.applicationsByCategory[categoryId].push('separator');
-            } else if (nextType === GMenu.TreeItemType.DIRECTORY) {
+            } else if (nextType == GMenu.TreeItemType.DIRECTORY) {
                let subdir = iter.get_directory();
                if (!subdir.get_is_nodisplay())
                    this._loadCategory(categoryId, subdir);
@@ -518,13 +565,13 @@ class ApplicationsButton extends PanelMenu.Button {
        let appsScrollBoxAlloc = this.applicationsScrollBox.get_allocation_box();
        let currentScrollValue = appsScrollBoxAdj.get_value();
        let boxHeight = appsScrollBoxAlloc.y2 - appsScrollBoxAlloc.y1;
-        let buttonAlloc = button.get_allocation_box();
+        let buttonAlloc = button.actor.get_allocation_box();
        let newScrollValue = currentScrollValue;
        if (currentScrollValue > buttonAlloc.y1 - 10)
            newScrollValue = buttonAlloc.y1 - 10;
        if (boxHeight + currentScrollValue < buttonAlloc.y2 + 10)
            newScrollValue = buttonAlloc.y2 - boxHeight + 10;
-        if (newScrollValue !== currentScrollValue)
+        if (newScrollValue != currentScrollValue)
            appsScrollBoxAdj.set_value(newScrollValue);
    }

@@ -533,13 +580,13 @@ class ApplicationsButton extends PanelMenu.Button {
        let catsScrollBoxAlloc = this.categoriesScrollBox.get_allocation_box();
        let currentScrollValue = catsScrollBoxAdj.get_value();
        let boxHeight = catsScrollBoxAlloc.y2 - catsScrollBoxAlloc.y1;
-        let buttonAlloc = button.get_allocation_box();
+        let buttonAlloc = button.actor.get_allocation_box();
        let newScrollValue = currentScrollValue;
        if (currentScrollValue > buttonAlloc.y1 - 10)
            newScrollValue = buttonAlloc.y1 - 10;
        if (boxHeight + currentScrollValue < buttonAlloc.y2 + 10)
            newScrollValue = buttonAlloc.y2 - boxHeight + 10;
-        if (newScrollValue !== currentScrollValue)
+        if (newScrollValue != currentScrollValue)
            catsScrollBoxAdj.set_value(newScrollValue);
    }

@@ -549,8 +596,10 @@ class ApplicationsButton extends PanelMenu.Button {
        this.mainBox = new St.BoxLayout({ vertical: false });
        this.leftBox = new St.BoxLayout({ vertical: true });
        this.applicationsScrollBox = new St.ScrollView({
-            style_class: 'apps-menu vfade',
-            x_expand: true,
+            x_fill: true,
+            y_fill: false,
+            y_align: St.Align.START,
+            style_class: 'apps-menu vfade'
        });
        this.applicationsScrollBox.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
        let vscroll = this.applicationsScrollBox.get_vscroll_bar();
@@ -561,13 +610,29 @@ class ApplicationsButton extends PanelMenu.Button {
            this.menu.passEvents = false;
        });
        this.categoriesScrollBox = new St.ScrollView({
-            style_class: 'vfade',
+            x_fill: true,
+            y_fill: false,
+            y_align: St.Align.START,
+            style_class: 'vfade'
        });
        this.categoriesScrollBox.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
        vscroll = this.categoriesScrollBox.get_vscroll_bar();
-        vscroll.connect('scroll-start', () => (this.menu.passEvents = true));
-        vscroll.connect('scroll-stop', () => (this.menu.passEvents = false));
-        this.leftBox.add_child(this.categoriesScrollBox);
+        vscroll.connect('scroll-start', () => this.menu.passEvents = true);
+        vscroll.connect('scroll-stop', () => this.menu.passEvents = false);
+        this.leftBox.add(this.categoriesScrollBox, {
+            expand: true,
+            x_fill: true,
+            y_fill: true,
+            y_align: St.Align.START
+        });
+
+        let activities = new ActivitiesMenuItem(this);
+        this.leftBox.add(activities.actor, {
+            expand: false,
+            x_fill: true,
+            y_fill: false,
+            y_align: St.Align.START
+        });

        this.applicationsBox = new St.BoxLayout({ vertical: true });
        this.applicationsScrollBox.add_actor(this.applicationsBox);
@@ -575,8 +640,16 @@ class ApplicationsButton extends PanelMenu.Button {
        this.categoriesScrollBox.add_actor(this.categoriesBox);

        this.mainBox.add(this.leftBox);
-        this.mainBox.add_child(this._createVertSeparator());
-        this.mainBox.add_child(this.applicationsScrollBox);
+        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);
    }

@@ -585,16 +658,16 @@ class ApplicationsButton extends PanelMenu.Button {
        this.mainBox.style = 'width: 35em;';
        this.mainBox.hide();

-        // Load categories
+        //Load categories
        this.applicationsByCategory = {};
        this._tree.load_sync();
        let root = this._tree.get_root_directory();
        let categoryMenuItem = new CategoryMenuItem(this, null);
-        this.categoriesBox.add_actor(categoryMenuItem);
+        this.categoriesBox.add_actor(categoryMenuItem.actor);
        let iter = root.iter();
        let nextType;
-        while ((nextType = iter.next()) !== GMenu.TreeItemType.INVALID) {
-            if (nextType !== GMenu.TreeItemType.DIRECTORY)
+        while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
+            if (nextType != GMenu.TreeItemType.DIRECTORY)
                continue;

            let dir = iter.get_directory();
@@ -605,12 +678,12 @@ class ApplicationsButton extends PanelMenu.Button {
            this.applicationsByCategory[categoryId] = [];
            this._loadCategory(categoryId, dir);
            if (this.applicationsByCategory[categoryId].length > 0) {
-                categoryMenuItem = new CategoryMenuItem(this, dir);
-                this.categoriesBox.add_actor(categoryMenuItem);
+                let categoryMenuItem = new CategoryMenuItem(this, dir);
+                this.categoriesBox.add_actor(categoryMenuItem.actor);
            }
        }

-        // Load applications
+        //Load applications
        this._displayButtons(this._listApplications(null));

        let themeContext = St.ThemeContext.get_for_stage(global.stage);
@@ -647,8 +720,8 @@ class ApplicationsButton extends PanelMenu.Button {
                item.setDragEnabled(this._desktopTarget.hasDesktop);
                this._applicationsButtons.set(app, item);
            }
-            if (!item.get_parent())
-                this.applicationsBox.add_actor(item);
+            if (!item.actor.get_parent())
+                this.applicationsBox.add_actor(item.actor);
        }
    }

@@ -658,9 +731,13 @@ class ApplicationsButton extends PanelMenu.Button {
        if (categoryMenuId) {
            applist = this.applicationsByCategory[categoryMenuId];
        } else {
-            applist = global.settings.get_strv('favorite-apps')
-               .map(id => appSys.lookup_app(id))
-               .filter(app => app);
+            applist = new Array();
+            let favorites = global.settings.get_strv('favorite-apps');
+            for (let i = 0; i < favorites.length; i++) {
+                let app = appSys.lookup_app(favorites[i]);
+                if (app)
+                    applist.push(app);
+            }
        }

        return applist;
@@ -668,21 +745,21 @@ class ApplicationsButton extends PanelMenu.Button {
 });

 let appsMenuButton;
+let activitiesButton;

-/** */
 function enable() {
+    activitiesButton = Main.panel.statusArea['activities'];
+    activitiesButton.container.hide();
    appsMenuButton = new ApplicationsButton();
-    let index = Main.sessionMode.panel.left.indexOf('activities') + 1;
-    Main.panel.addToStatusArea('apps-menu', appsMenuButton, index, 'left');
+    Main.panel.addToStatusArea('apps-menu', appsMenuButton, 1, 'left');
 }

-/** */
 function disable() {
    Main.panel.menuManager.removeMenu(appsMenuButton.menu);
    appsMenuButton.destroy();
+    activitiesButton.container.show();
 }

-/** */
 function init() {
    ExtensionUtils.initTranslations();
 }
--- a/extensions/apps-menu/meson.build
+++ b/extensions/apps-menu/meson.build
@@ -3,4 +3,3 @@ extension_data += configure_file(
  output: metadata_name,
  configuration: metadata_conf
 )
-extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')
--- a/extensions/apps-menu/metadata.json.in
+++ b/extensions/apps-menu/metadata.json.in
@@ -1,7 +1,6 @@
 {
 "extension-id": "@extension_id@",
 "uuid": "@uuid@",
-"settings-schema": "@gschemaname@",
 "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.",
--- a/extensions/apps-menu/org.gnome.shell.extensions.apps-menu.gschema.xml
+++ b/extensions/apps-menu/org.gnome.shell.extensions.apps-menu.gschema.xml
@@ -1,12 +0,0 @@
-<schemalist gettext-domain="gnome-shell-extensions">
-  <schema id="org.gnome.shell.extensions.apps-menu"
-          path="/org/gnome/shell/extensions/apps-menu/">
-    <key name="apps-menu-toggle-menu" type="as">
-      <default>["&lt;Alt&gt;F1"]</default>
-      <summary>Keybinding to open the applications menu</summary>
-      <description>
-        Keybinding to open the applications menu.
-      </description>
-    </key>
-  </schema>
-</schemalist>
--- a/extensions/auto-move-windows/extension.js
+++ b/extensions/auto-move-windows/extension.js
@@ -2,10 +2,11 @@
 // Start apps on custom workspaces
 /* exported init enable disable */

-const { Shell } = imports.gi;
+const Shell = imports.gi.Shell;
+
+const Main = imports.ui.main;

 const ExtensionUtils = imports.misc.extensionUtils;
-const Main = imports.ui.main;

 class WindowMover {
    constructor() {
@@ -16,7 +17,7 @@ class WindowMover {

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

        this._settings.connect('changed', this._updateAppConfigs.bind(this));
        this._updateAppConfigs();
@@ -35,22 +36,23 @@ class WindowMover {

    _updateAppData() {
        let ids = [...this._appConfigs.keys()];
-        let removedApps = [...this._appData.keys()]
-            .filter(a => !ids.includes(a.id));
+        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 && !this._appData.has(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)),
+                                              this._appWindowsChanged.bind(this)),
                moveWindowsId: 0,
-                windows: app.get_windows(),
+                windows: app.get_windows()
            };
            this._appData.set(app, data);
        });
@@ -72,7 +74,7 @@ class WindowMover {
    }

    _moveWindow(window, workspaceNum) {
-        if (window.skip_taskbar || window.is_on_all_workspaces())
+        if (window.skip_taskbar)
            return;

        // ensure we have the required number of workspaces
@@ -93,9 +95,9 @@ class WindowMover {
        // 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 => {
-            return !windows.includes(w) && w.get_compositor_private() !== null;
-        }));
+        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 => {
@@ -108,35 +110,28 @@ class WindowMover {
 let prevCheckWorkspaces;
 let winMover;

-/** */
 function init() {
    ExtensionUtils.initTranslations();
 }

-/**
- * @returns {bool} - false (used as MetaLater handler)
- */
 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().some(
-                w => !w.is_on_all_workspaces());
-        } else if (!this._workspaces[i]._keepAliveId) {
+        if (!foundNonEmpty)
+            foundNonEmpty = this._workspaces[i].list_windows().length > 0;
+        else if (!this._workspaces[i]._keepAliveId)
            keepAliveWorkspaces.push(this._workspaces[i]);
-        }
    }

    // make sure the original method only removes empty workspaces at the end
-    keepAliveWorkspaces.forEach(ws => (ws._keepAliveId = 1));
+    keepAliveWorkspaces.forEach(ws => ws._keepAliveId = 1);
    prevCheckWorkspaces.call(this);
    keepAliveWorkspaces.forEach(ws => delete ws._keepAliveId);

    return false;
 }

-/** */
 function enable() {
    prevCheckWorkspaces = Main.wm._workspaceTracker._checkWorkspaces;
    Main.wm._workspaceTracker._checkWorkspaces = myCheckWorkspaces;
@@ -144,7 +139,6 @@ function enable() {
    winMover = new WindowMover();
 }

-/** */
 function disable() {
    Main.wm._workspaceTracker._checkWorkspaces = prevCheckWorkspaces;
    winMover.destroy();
--- a/extensions/auto-move-windows/prefs.js
+++ b/extensions/auto-move-windows/prefs.js
@@ -2,286 +2,282 @@
 // Start apps on custom workspaces
 /* exported init buildPrefsWidget */

-const { Adw, Gio, GLib, GObject, Gtk } = imports.gi;
+const { Gio, GObject, Gtk } = imports.gi;
+
+const Gettext = imports.gettext.domain('gnome-shell-extensions');
+const _ = Gettext.gettext;
+const N_ = e => e;

 const ExtensionUtils = imports.misc.extensionUtils;

-const _ = ExtensionUtils.gettext;
-
 const SETTINGS_KEY = 'application-list';

 const WORKSPACE_MAX = 36; // compiled in limit of mutter

-const AutoMoveSettingsWidget = GObject.registerClass(
-class AutoMoveSettingsWidget extends Adw.PreferencesGroup {
-    _init() {
-        super._init({
-            title: _('Workspace Rules'),
-        });
+const Columns = {
+    APPINFO: 0,
+    DISPLAY_NAME: 1,
+    ICON: 2,
+    WORKSPACE: 3,
+    ADJUSTMENT: 4
+};

-        this._list = new Gtk.ListBox({
-            selection_mode: Gtk.SelectionMode.NONE,
-            css_classes: ['boxed-list'],
-        });
-        this.add(this._list);
-
-        this._list.append(new NewRuleRow());
-
-        this._actionGroup = new Gio.SimpleActionGroup();
-        this._list.insert_action_group('rules', this._actionGroup);
-
-        let action;
-        action = new Gio.SimpleAction({ name: 'add' });
-        action.connect('activate', this._onAddActivated.bind(this));
-        this._actionGroup.add_action(action);
-
-        action = new Gio.SimpleAction({
-            name: 'remove',
-            parameter_type: new GLib.VariantType('s'),
-        });
-        action.connect('activate', this._onRemoveActivated.bind(this));
-        this._actionGroup.add_action(action);
-
-        action = new Gio.SimpleAction({ name: 'update' });
-        action.connect('activate', () => {
-            this._settings.set_strv(SETTINGS_KEY,
-                this._getRuleRows().map(row => `${row.id}:${row.value}`));
-        });
-        this._actionGroup.add_action(action);
-        this._updateAction = action;
+const Widget = GObject.registerClass({
+    GTypeName: 'AutoMoveWindowsPrefsWidget',
+}, class Widget extends Gtk.Grid {
+    _init(params) {
+        super._init(params);
+        this.set_orientation(Gtk.Orientation.VERTICAL);

        this._settings = ExtensionUtils.getSettings();
-        this._changedId = this._settings.connect('changed',
-            this._sync.bind(this));
-        this._sync();
+        this._settings.connect('changed', this._refresh.bind(this));
+        this._changedPermitted = false;

-        this.connect('destroy', () => this._settings.run_dispose());
+        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 });
+        scrolled.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
+        this.add(scrolled);
+
+
+        this._treeView = new Gtk.TreeView({
+            model: this._store,
+            hexpand: true,
+            vexpand: true
+        });
+        this._treeView.get_selection().set_mode(Gtk.SelectionMode.SINGLE);
+
+        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'),
+            sort_column_id: Columns.WORKSPACE
+        });
+        let workspaceRenderer = new Gtk.CellRendererSpin({ editable: true });
+        workspaceRenderer.connect('edited', this._workspaceEdited.bind(this));
+        workspaceColumn.pack_start(workspaceRenderer, true);
+        workspaceColumn.add_attribute(workspaceRenderer, 'adjustment', Columns.ADJUSTMENT);
+        workspaceColumn.add_attribute(workspaceRenderer, 'text', Columns.WORKSPACE);
+        this._treeView.append_column(workspaceColumn);
+
+        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 newButton = new Gtk.ToolButton({
+            icon_name: 'bookmark-new-symbolic',
+            label: _('Add Rule'),
+            is_important: true
+        });
+        newButton.connect('clicked', this._createNew.bind(this));
+        toolbar.add(newButton);
+
+        let delButton = new Gtk.ToolButton({ icon_name: 'edit-delete-symbolic' });
+        delButton.connect('clicked', this._deleteSelected.bind(this));
+        toolbar.add(delButton);
+
+        let selection = this._treeView.get_selection();
+        selection.connect('changed', () => {
+            delButton.sensitive = selection.count_selected_rows() > 0;
+        });
+        delButton.sensitive = selection.count_selected_rows() > 0;
+
+        this._changedPermitted = true;
+        this._refresh();
    }

-    _onAddActivated() {
-        const dialog = new NewRuleDialog(this.get_root());
-        dialog.connect('response', (dlg, id) => {
-            const appInfo = id === Gtk.ResponseType.OK
-                ? dialog.get_widget().get_app_info() : null;
-            if (appInfo) {
-                this._settings.set_strv(SETTINGS_KEY, [
-                    ...this._settings.get_strv(SETTINGS_KEY),
-                    `${appInfo.get_id()}:1`,
-                ]);
+    _createNew() {
+        let dialog = new Gtk.Dialog({
+            title: _('Create new matching rule'),
+            transient_for: this.get_toplevel(),
+            use_header_bar: true,
+            modal: true
+        });
+        dialog.add_button(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL);
+        let addButton = dialog.add_button(_('Add'), Gtk.ResponseType.OK);
+        dialog.set_default_response(Gtk.ResponseType.OK);
+
+        let grid = new Gtk.Grid({
+            column_spacing: 10,
+            row_spacing: 15,
+            margin: 10
+        });
+        dialog._appChooser = new Gtk.AppChooserWidget({ show_all: true });
+        dialog._appChooser.connect('application-selected', (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'),
+            halign: Gtk.Align.END
+        }), 0, 1, 1, 1);
+        let adjustment = new Gtk.Adjustment({
+            lower: 1,
+            upper: WORKSPACE_MAX,
+            step_increment: 1
+        });
+        dialog._spin = new Gtk.SpinButton({
+            adjustment: adjustment,
+            snap_to_ticks: true
+        });
+        dialog._spin.set_value(1);
+        grid.attach(dialog._spin, 1, 1, 1, 1);
+        dialog.get_content_area().add(grid);
+
+        dialog.connect('response', (dialog, id) => {
+            if (id != Gtk.ResponseType.OK) {
+                dialog.destroy();
+                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;
+
+            this._changedPermitted = false;
+            this._appendItem(appInfo.get_id(), index);
+            this._changedPermitted = true;
+
+            this._appendRow(appInfo, index);
+
            dialog.destroy();
        });
-        dialog.show();
+        dialog.show_all();
    }

-    _onRemoveActivated(action, param) {
-        const removed = param.deepUnpack();
-        this._settings.set_strv(SETTINGS_KEY,
-            this._settings.get_strv(SETTINGS_KEY).filter(entry => {
-                const [id] = entry.split(':');
-                return id !== removed;
-            }));
+    _deleteSelected() {
+        let [any, model_, iter] = this._treeView.get_selection().get_selected();
+
+        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);
+        }
    }

-    _getRuleRows() {
-        return [...this._list].filter(row => !!row.id);
+    _workspaceEdited(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);
+
+        this._changedPermitted = false;
+        this._changeItem(appInfo.get_id(), index);
+        this._store.set_value(iter, Columns.WORKSPACE, index);
+        this._changedPermitted = true;
    }

-    _sync() {
-        const oldRules = this._getRuleRows();
-        const newRules = this._settings.get_strv(SETTINGS_KEY).map(entry => {
-            const [id, value] = entry.split(':');
-            return { id, value };
+    _refresh() {
+        if (!this._changedPermitted)
+            // Ignore this notification, model is being modified outside
+            return;
+
+        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]);
+
+            this._appendRow(appInfo, parseInt(index));
+        }
+
+        if (validItems.length != currentItems.length) // some items were filtered out
+            this._settings.set_strv(SETTINGS_KEY, validItems);
+    }
+
+    _appendRow(appInfo, workspace) {
+        let iter = this._store.append();
+        let icon = appInfo.get_icon();
+        let displayName = appInfo.get_display_name();
+        let adj = new Gtk.Adjustment({
+            lower: 1,
+            upper: WORKSPACE_MAX,
+            step_increment: 1,
+            value: workspace
        });
+        let { APPINFO, ICON, DISPLAY_NAME, WORKSPACE, ADJUSTMENT } = Columns;
+        this._store.set(iter,
+                        [APPINFO, ICON, DISPLAY_NAME, WORKSPACE, ADJUSTMENT],
+                        [appInfo, icon, displayName, workspace, adj]);
+    }

-        this._settings.block_signal_handler(this._changedId);
-        this._updateAction.enabled = false;
+    _checkId(id) {
+        let items = this._settings.get_strv(SETTINGS_KEY);
+        return !items.some(i => i.startsWith(`${id}:`));
+    }

-        newRules.forEach(({ id, value }, index) => {
-            const row = oldRules.find(r => r.id === id);
-            const appInfo = row
-                ? null : Gio.DesktopAppInfo.new(id);
+    _appendItem(id, workspace) {
+        let currentItems = this._settings.get_strv(SETTINGS_KEY);
+        currentItems.push(`${id}:${workspace}`);
+        this._settings.set_strv(SETTINGS_KEY, currentItems);
+    }

-            if (row)
-                row.set({ value });
-            else if (appInfo)
-                this._list.insert(new RuleRow(appInfo, value), index);
-        });
+    _removeItem(id) {
+        let currentItems = this._settings.get_strv(SETTINGS_KEY);
+        let index = currentItems.map(el => el.split(':')[0]).indexOf(id);

-        const removed = oldRules.filter(
-            ({ id }) => !newRules.find(r => r.id === id));
-        removed.forEach(r => this._list.remove(r));
+        if (index < 0)
+            return;
+        currentItems.splice(index, 1);
+        this._settings.set_strv(SETTINGS_KEY, currentItems);
+    }

-        this._settings.unblock_signal_handler(this._changedId);
-        this._updateAction.enabled = true;
+    _changeItem(id, workspace) {
+        let currentItems = this._settings.get_strv(SETTINGS_KEY);
+        let index = currentItems.map(el => el.split(':')[0]).indexOf(id);
+
+        if (index < 0)
+            currentItems.push(`${id}:${workspace}`);
+        else
+            currentItems[index] = `${id}:${workspace}`;
+        this._settings.set_strv(SETTINGS_KEY, currentItems);
    }
 });

-const WorkspaceSelector = GObject.registerClass({
-    Properties: {
-        'number': GObject.ParamSpec.uint(
-            'number', 'number', 'number',
-            GObject.ParamFlags.READWRITE,
-            1, WORKSPACE_MAX, 1),
-    },
-}, class WorkspaceSelector extends Gtk.Widget {
-    static _classInit(klass) {
-        super._classInit(klass);

-        klass.set_layout_manager_type(Gtk.BoxLayout);
-
-        return klass;
-    }
-
-    _init() {
-        super._init();
-
-        this.layout_manager.spacing = 6;
-
-        const label = new Gtk.Label({
-            xalign: 1,
-            margin_end: 6,
-        });
-        this.bind_property('number',
-            label, 'label',
-            GObject.BindingFlags.SYNC_CREATE);
-        label.set_parent(this);
-
-        const buttonProps = {
-            css_classes: ['circular'],
-            valign: Gtk.Align.CENTER,
-        };
-
-        this._decButton = new Gtk.Button({
-            icon_name: 'list-remove-symbolic',
-            ...buttonProps,
-        });
-        this._decButton.set_parent(this);
-        this._decButton.connect('clicked', () => this.number--);
-
-        this._incButton = new Gtk.Button({
-            icon_name: 'list-add-symbolic',
-            ...buttonProps,
-        });
-        this._incButton.set_parent(this);
-        this._incButton.connect('clicked', () => this.number++);
-
-        this.connect('notify::number', () => this._syncButtons());
-        this._syncButtons();
-    }
-
-    _syncButtons() {
-        this._decButton.sensitive = this.number > 1;
-        this._incButton.sensitive = this.number < WORKSPACE_MAX;
-    }
-});
-
-const RuleRow = GObject.registerClass({
-    Properties: {
-        'id': GObject.ParamSpec.string(
-            'id', 'id', 'id',
-            GObject.ParamFlags.READABLE,
-            ''),
-        'value': GObject.ParamSpec.uint(
-            'value', 'value', 'value',
-            GObject.ParamFlags.READWRITE,
-            1, WORKSPACE_MAX, 1),
-    },
-}, class RuleRow extends Adw.ActionRow {
-    _init(appInfo, value) {
-        super._init({
-            activatable: false,
-            title: appInfo.get_display_name(),
-            value,
-        });
-        this._appInfo = appInfo;
-
-        const icon = new Gtk.Image({
-            css_classes: ['icon-dropshadow'],
-            gicon: appInfo.get_icon(),
-            pixel_size: 32,
-        });
-        this.add_prefix(icon);
-
-        const wsButton = new WorkspaceSelector();
-        this.bind_property('value',
-            wsButton, 'number',
-            GObject.BindingFlags.SYNC_CREATE | GObject.BindingFlags.BIDIRECTIONAL);
-        this.add_suffix(wsButton);
-
-        const button = new Gtk.Button({
-            action_name: 'rules.remove',
-            action_target: new GLib.Variant('s', this.id),
-            icon_name: 'edit-delete-symbolic',
-            has_frame: false,
-            valign: Gtk.Align.CENTER,
-        });
-        this.add_suffix(button);
-
-        this.connect('notify::value',
-            () => this.activate_action('rules.update', null));
-    }
-
-    get id() {
-        return this._appInfo.get_id();
-    }
-});
-
-const NewRuleRow = GObject.registerClass(
-class NewRuleRow extends Gtk.ListBoxRow {
-    _init() {
-        super._init({
-            action_name: 'rules.add',
-            child: new Gtk.Image({
-                icon_name: 'list-add-symbolic',
-                pixel_size: 16,
-                margin_top: 12,
-                margin_bottom: 12,
-                margin_start: 12,
-                margin_end: 12,
-            }),
-        });
-        this.update_property(
-            [Gtk.AccessibleProperty.LABEL], [_('Add Rule')]);
-    }
-});
-
-const NewRuleDialog = GObject.registerClass(
-class NewRuleDialog extends Gtk.AppChooserDialog {
-    _init(parent) {
-        super._init({
-            transient_for: parent,
-            modal: true,
-        });
-
-        this._settings = ExtensionUtils.getSettings();
-
-        this.get_widget().set({
-            show_all: true,
-            show_other: true, // hide more button
-        });
-
-        this.get_widget().connect('application-selected',
-            this._updateSensitivity.bind(this));
-        this._updateSensitivity();
-    }
-
-    _updateSensitivity() {
-        const rules = this._settings.get_strv(SETTINGS_KEY);
-        const appInfo = this.get_widget().get_app_info();
-        this.set_response_sensitive(Gtk.ResponseType.OK,
-            appInfo && !rules.some(i => i.startsWith(appInfo.get_id())));
-    }
-});
-
-/** */
 function init() {
    ExtensionUtils.initTranslations();
 }

-/**
- * @returns {Gtk.Widget} - the prefs widget
- */
 function buildPrefsWidget() {
-    return new AutoMoveSettingsWidget();
+    let widget = new Widget({ margin: 12 });
+    widget.show_all();
+
+    return widget;
 }
--- a/extensions/drive-menu/extension.js
+++ b/extensions/drive-menu/extension.js
@@ -1,54 +1,40 @@
 /* exported init enable disable */
 // Drive menu extension
-const { Clutter, Gio, GObject, Shell, St } = imports.gi;
+const { Gio, GObject, Shell, St } = imports.gi;
+
+const Gettext = imports.gettext.domain('gnome-shell-extensions');
+const _ = Gettext.gettext;

-const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 const ShellMountOperation = imports.ui.shellMountOperation;

-const _ = ExtensionUtils.gettext;
+const ExtensionUtils = imports.misc.extensionUtils;

-Gio._promisify(Gio.File.prototype, 'query_filesystem_info_async');
-
-var MountMenuItem = GObject.registerClass(
 class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
-    _init(mount) {
-        super._init({
-            style_class: 'drive-menu-item',
-        });
+    constructor(mount) {
+        super();

-        this.label = new St.Label({
-            text: mount.get_name(),
-            x_expand: true,
-            y_align: Clutter.ActorAlign.CENTER,
-        });
-        this.add_child(this.label);
-        this.label_actor = this.label;
+        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.connect('destroy', this._onDestroy.bind(this));
-
        let ejectIcon = new St.Icon({
            icon_name: 'media-eject-symbolic',
-            style_class: 'popup-menu-icon',
-        });
-        let ejectButton = new St.Button({
-            child: ejectIcon,
-            style_class: 'button',
+            style_class: 'popup-menu-icon'
        });
+        let ejectButton = new St.Button({ child: ejectIcon });
        ejectButton.connect('clicked', this._eject.bind(this));
-        this.add(ejectButton);
-
-        this.hide();
+        this.actor.add(ejectButton);

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

-    _onDestroy() {
+    destroy() {
        if (this._changedId) {
            this.mount.disconnect(this._changedId);
            this._changedId = 0;
@@ -57,7 +43,7 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
        super.destroy();
    }

-    async _isInteresting() {
+    _isInteresting() {
        if (!this.mount.can_eject() && !this.mount.can_unmount())
            return false;
        if (this.mount.is_shadowed())
@@ -65,41 +51,32 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {

        let volume = this.mount.get_volume();

-        if (volume)
-            return volume.get_identifier('class') !== 'network';
-
-        const root = this.mount.get_root();
-
-        try {
-            const attr = Gio.FILE_ATTRIBUTE_FILESYSTEM_REMOTE;
-            const info = await root.query_filesystem_info_async(attr, null);
-            return !info.get_attribute_boolean(attr);
-        } catch (e) {
-            log(`Failed to query filesystem: ${e.message}`);
+        if (volume == null) {
+            // probably a GDaemonMount, could be network or
+            // local, but we can't tell; assume it's local for now
+            return true;
        }

-        // Hack, fall back to looking at GType
-        return Gio._LocalFilePrototype.isPrototypeOf(root);
+        return volume.get_identifier('class') != 'network';
    }

-    async _syncVisibility() {
-        this.visible = await this._isInteresting();
+    _syncVisibility() {
+        this.actor.visible = this._isInteresting();
    }

    _eject() {
        let unmountArgs = [
            Gio.MountUnmountFlags.NONE,
-            new ShellMountOperation.ShellMountOperation(this.mount).mountOp,
-            null, // Gio.Cancellable
+            (new ShellMountOperation.ShellMountOperation(this.mount)).mountOp,
+            null // Gio.Cancellable
        ];

-        if (this.mount.can_eject()) {
+        if (this.mount.can_eject())
            this.mount.eject_with_operation(...unmountArgs,
-                this._ejectFinish.bind(this));
-        } else {
+                                            this._ejectFinish.bind(this));
+        else
            this.mount.unmount_with_operation(...unmountArgs,
-                this._unmountFinish.bind(this));
-        }
+                                              this._unmountFinish.bind(this));
    }

    _unmountFinish(mount, result) {
@@ -125,29 +102,34 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
    }

    activate(event) {
-        let uri = this.mount.get_root().get_uri();
        let context = global.create_app_launch_context(event.get_time(), -1);
-        Gio.AppInfo.launch_default_for_uri(uri, context);
+        Gio.AppInfo.launch_default_for_uri(this.mount.get_root().get_uri(),
+                                           context);

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

 let DriveMenu = GObject.registerClass(
 class DriveMenu extends PanelMenu.Button {
    _init() {
        super._init(0.0, _('Removable devices'));

+        let hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
        let icon = new St.Icon({
            icon_name: 'media-eject-symbolic',
-            style_class: 'system-status-icon',
+            style_class: 'system-status-icon'
        });

-        this.add_child(icon);
+        hbox.add_child(icon);
+        hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
+        this.add_child(hbox);

        this._monitor = Gio.VolumeMonitor.get();
-        this._addedId = this._monitor.connect('mount-added',
-            (monitor, mount) => this._addMount(mount));
+        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();
@@ -168,7 +150,7 @@ class DriveMenu extends PanelMenu.Button {
    }

    _updateMenuVisibility() {
-        if (this._mounts.filter(i => i.visible).length > 0)
+        if (this._mounts.filter(i => i.actor.visible).length > 0)
            this.show();
        else
            this.hide();
@@ -178,20 +160,18 @@ class DriveMenu extends PanelMenu.Button {
        let item = new MountMenuItem(mount);
        this._mounts.unshift(item);
        this.menu.addMenuItem(item, 0);
-
-        item.connect('notify::visible', () => this._updateMenuVisibility());
    }

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

    _onDestroy() {
@@ -206,20 +186,17 @@ class DriveMenu extends PanelMenu.Button {
    }
 });

-/** */
 function init() {
    ExtensionUtils.initTranslations();
 }

 let _indicator;

-/** */
 function enable() {
-    _indicator = new DriveMenu();
+    _indicator = new DriveMenu;
    Main.panel.addToStatusArea('drive-menu', _indicator);
 }

-/** */
 function disable() {
    _indicator.destroy();
 }
--- a/extensions/drive-menu/stylesheet.css
+++ b/extensions/drive-menu/stylesheet.css
@@ -1,7 +1 @@
-.drive-menu-item { spacing: 12px; }
-
-.drive-menu-item .button {
-  border-radius: 99px;
-  padding: 3px;
-  min-height: auto;
-}
+/* This extensions requires no custom styling */
--- a/extensions/launch-new-instance/extension.js
+++ b/extensions/launch-new-instance/extension.js
@@ -3,15 +3,13 @@ const AppDisplay = imports.ui.appDisplay;

 let _activateOriginal = null;

-/** */
 function enable() {
    _activateOriginal = AppDisplay.AppIcon.prototype.activate;
-    AppDisplay.AppIcon.prototype.activate = function () {
+    AppDisplay.AppIcon.prototype.activate = function() {
        _activateOriginal.call(this, 2);
    };
 }

-/** */
 function disable() {
    AppDisplay.AppIcon.prototype.activate = _activateOriginal;
 }
--- a/extensions/meson.build
+++ b/extensions/meson.build
@@ -3,7 +3,7 @@ js_sources = []

 metadata_name = 'metadata.json'

-foreach e : enabled_extensions
+foreach e : all_extensions
  uuid = e + uuid_suffix

  metadata_conf = configuration_data()
@@ -19,11 +19,27 @@ foreach e : enabled_extensions

  subdir(e)

-  install_data (extension_sources + extension_data,
-    install_dir: join_paths(extensiondir, uuid)
-  )
+  js_sources += extension_sources
+
+  if (enabled_extensions.contains(e))
+    install_data (extension_sources + extension_data,
+      install_dir: join_paths(extensiondir, uuid)
+    )
+  endif
 endforeach

 install_data (extension_schemas,
  install_dir: schemadir
 )
+
+foreach js_source : js_sources
+  if (js60.found())
+    path_array = '@0@'.format(js_source).split('/')
+    name = join_paths(path_array[-2], path_array[-1])
+
+    test('Checking syntax of ' + name, js60,
+      args: ['-s', '-c', js_source],
+      workdir: meson.current_source_dir()
+    )
+  endif
+endforeach
--- a/extensions/native-window-placement/extension.js
+++ b/extensions/native-window-placement/extension.js
@@ -1,11 +1,8 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
 /* exported enable disable */
-const { Clutter } = imports.gi;
+const Workspace = imports.ui.workspace;

 const ExtensionUtils = imports.misc.extensionUtils;
-const Main = imports.ui.main;
-const { WindowPreview } = imports.ui.windowPreview;
-const Workspace = imports.ui.workspace;

 // testing settings for natural window placement strategy:
 const WINDOW_PLACEMENT_NATURAL_ACCURACY = 20;                       // accuracy of window translate moves  (KDE-default: 20)
@@ -17,7 +14,9 @@ class Rect {
        [this.x, this.y, this.width, this.height] = [x, y, width, height];
    }

-    // used in _calculateWindowTransformationsNatural to replace Meta.Rectangle that is too slow.
+    /**
+     * used in _calculateWindowTransformationsNatural to replace Meta.Rectangle that is too slow.
+     */
    copy() {
        return new Rect(this.x, this.y, this.width, this.height);
    }
@@ -50,10 +49,10 @@ class Rect {
    }

    overlap(rect2) {
-        return !(this.x + this.width    <= rect2.x ||
-                 rect2.x + rect2.width  <= this.x ||
-                 this.y + this.height   <= rect2.y ||
-                 rect2.y + rect2.height <= this.y);
+        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() {
@@ -67,18 +66,16 @@ class Rect {
 }

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

-    computeLayout(windows, _params) {
-        return {
-            windows,
-        };
+    computeLayout(windows, layout) {
+        layout.windows = windows;
    }

-    /*
+    /**
     * 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:
@@ -104,8 +101,9 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
            // This is used when the window is on the edge of the screen to try to use as much screen real estate as possible.
            directions[i] = direction;
            direction++;
-            if (direction === 4)
+            if (direction == 4) {
                direction = 0;
+            }
        }

        let loopCounter = 0;
@@ -115,10 +113,10 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
            for (let i = 0; i < rects.length; i++) {
                for (let j = 0; j < rects.length; j++) {
                    let adjustments = [-1, -1, 1, 1]
-                        .map(v => (v *= WINDOW_PLACEMENT_NATURAL_GAPS));
+                        .map(v => v *= WINDOW_PLACEMENT_NATURAL_GAPS);
                    let iAdjusted = rects[i].adjusted(...adjustments);
                    let jAdjusted = rects[j].adjusted(...adjustments);
-                    if (i !== j && iAdjusted.overlap(jAdjusted)) {
+                    if (i != j && iAdjusted.overlap(jAdjusted)) {
                        loopCounter++;
                        overlap = true;

@@ -130,10 +128,10 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
                        let diff = [jCenter[0] - iCenter[0], jCenter[1] - iCenter[1]];

                        // Prevent dividing by zero and non-movement
-                        if (diff[0] === 0 && diff[1] === 0)
+                        if (diff[0] == 0 && diff[1] == 0)
                            diff[0] = 1;
                        // Try to keep screen/workspace aspect ratio
-                        if (bounds.height / bounds.width > areaRect.height / areaRect.width)
+                        if ( bounds.height / bounds.width > areaRect.height / areaRect.width )
                            diff[0] *= 2;
                        else
                            diff[1] *= 2;
@@ -162,33 +160,33 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
                            let xSection = Math.round((rects[i].x - bounds.x) / (bounds.width / 3));
                            let ySection = Math.round((rects[i].y - bounds.y) / (bounds.height / 3));

-                            iCenter = rects[i].center();
+                            let iCenter = rects[i].center();
                            diff[0] = 0;
                            diff[1] = 0;
-                            if (xSection !== 1 || ySection !== 1) { // Remove this if you want the center to pull as well
-                                if (xSection === 1)
-                                    xSection = directions[i] / 2 ? 2 : 0;
-                                if (ySection === 1)
-                                    ySection = directions[i] % 2 ? 2 : 0;
+                            if (xSection != 1 || ySection != 1) { // Remove this if you want the center to pull as well
+                                if (xSection == 1)
+                                    xSection = (directions[i] / 2 ? 2 : 0);
+                                if (ySection == 1)
+                                    ySection = (directions[i] % 2 ? 2 : 0);
                            }
-                            if (xSection === 0 && ySection === 0) {
+                            if (xSection == 0 && ySection == 0) {
                                diff[0] = bounds.x - iCenter[0];
                                diff[1] = bounds.y - iCenter[1];
                            }
-                            if (xSection === 2 && ySection === 0) {
+                            if (xSection == 2 && ySection == 0) {
                                diff[0] = bounds.x + bounds.width - iCenter[0];
                                diff[1] = bounds.y - iCenter[1];
                            }
-                            if (xSection === 2 && ySection === 2) {
+                            if (xSection == 2 && ySection == 2) {
                                diff[0] = bounds.x + bounds.width - iCenter[0];
                                diff[1] = bounds.y + bounds.height - iCenter[1];
                            }
-                            if (xSection === 0 && ySection === 2) {
+                            if (xSection == 0 && ySection == 2) {
                                diff[0] = bounds.x - iCenter[0];
                                diff[1] = bounds.y + bounds.height - iCenter[1];
                            }
-                            if (diff[0] !== 0 || diff[1] !== 0) {
-                                length = Math.sqrt(diff[0] * diff[0] + diff[1] * diff[1]);
+                            if (diff[0] != 0 || diff[1] != 0) {
+                                let length = Math.sqrt(diff[0] * diff[0] + diff[1] * diff[1]);
                                diff[0] *= WINDOW_PLACEMENT_NATURAL_ACCURACY / length / 2;   // /2 to make it less influencing than the normal center-move above
                                diff[1] *= WINDOW_PLACEMENT_NATURAL_ACCURACY / length / 2;
                                rects[i].translate(diff[0], diff[1]);
@@ -205,31 +203,28 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {

        // Work out scaling by getting the most top-left and most bottom-right window coords.
        let scale;
-        scale = Math.min(
-            areaRect.width / bounds.width,
-            areaRect.height / bounds.height,
-            1.0);
+        scale = Math.min(areaRect.width / bounds.width,
+                         areaRect.height / bounds.height,
+                         1.0);

        // Make bounding rect fill the screen size for later steps
-        bounds.x -= (areaRect.width - bounds.width * scale) / 2;
-        bounds.y -= (areaRect.height - bounds.height * scale) / 2;
+        bounds.x = bounds.x - (areaRect.width - bounds.width * scale) / 2;
+        bounds.y = bounds.y - (areaRect.height - bounds.height * scale) / 2;
        bounds.width = areaRect.width / scale;
        bounds.height = areaRect.height / scale;

        // Move all windows back onto the screen and set their scale
-        for (let i = 0; i < rects.length; i++)
+        for (let i = 0; i < rects.length; i++) {
            rects[i].translate(-bounds.x, -bounds.y);
-
+        }

        // rescale to workspace
        let slots = [];
        for (let i = 0; i < rects.length; i++) {
            rects[i].x = rects[i].x * scale + areaRect.x;
            rects[i].y = rects[i].y * scale + areaRect.y;
-            rects[i].width *= scale;
-            rects[i].height *= scale;

-            slots.push([rects[i].x, rects[i].y, rects[i].width, rects[i].height, clones[i]]);
+            slots.push([rects[i].x, rects[i].y, scale, clones[i]]);
        }

        return slots;
@@ -238,57 +233,37 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {

 let winInjections, workspaceInjections;

-/** */
 function resetState() {
    winInjections = { };
    workspaceInjections = { };
 }

-/** */
 function enable() {
    resetState();

    let settings = ExtensionUtils.getSettings();

-    workspaceInjections['_createBestLayout'] = Workspace.WorkspaceLayout.prototype._createBestLayout;
-    Workspace.WorkspaceLayout.prototype._createBestLayout = function (_area) {
-        this._layoutStrategy = new NaturalLayoutStrategy({
-            monitor: Main.layoutManager.monitors[this._monitorIndex],
-        }, settings);
-        return this._layoutStrategy.computeLayout(this._sortedWindows);
+    workspaceInjections['_getBestLayout'] = Workspace.Workspace.prototype._getBestLayout;
+    Workspace.Workspace.prototype._getBestLayout = function(windows) {
+        let strategy = new NaturalLayoutStrategy(settings);
+        let layout = { strategy };
+        strategy.computeLayout(windows, layout);
+
+        return layout;
    };

-    // position window titles on top of windows in overlay
-    winInjections['_init'] = WindowPreview.prototype._init;
-    WindowPreview.prototype._init = function (...args) {
-        winInjections['_init'].call(this, ...args);
+    /// 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;
+        }

-        if (!settings.get_boolean('window-captions-on-top'))
-            return;
-
-        const alignConstraint = this._title.get_constraints().find(
-            c => c.align_axis && c.align_axis === Clutter.AlignAxis.Y_AXIS);
-        alignConstraint.factor = 0;
-
-        const bindConstraint = this._title.get_constraints().find(
-            c => c.coordinate && c.coordinate === Clutter.BindCoordinate.Y);
-        bindConstraint.offset = 0;
-    };
-    winInjections['_adjustOverlayOffsets'] =
-        WindowPreview.prototype._adjustOverlayOffsets;
-    WindowPreview.prototype._adjustOverlayOffsets = function (...args) {
-        winInjections['_adjustOverlayOffsets'].call(this, ...args);
-
-        if (settings.get_boolean('window-captions-on-top'))
-            this._title.translation_y = -this._title.translation_y;
+        winInjections['relayout'].call(this, animate);
    };
 }

-/**
- * @param {Object} object - object that was modified
- * @param {Object} injection - the map of previous injections
- * @param {string} name - the @injection key that should be removed
- */
 function removeInjection(object, injection, name) {
    if (injection[name] === undefined)
        delete object[name];
@@ -296,14 +271,13 @@ function removeInjection(object, injection, name) {
        object[name] = injection[name];
 }

-/** */
 function disable() {
    var i;

    for (i in workspaceInjections)
-        removeInjection(Workspace.WorkspaceLayout.prototype, workspaceInjections, i);
+        removeInjection(Workspace.Workspace.prototype, workspaceInjections, i);
    for (i in winInjections)
-        removeInjection(WindowPreview.prototype, winInjections, i);
+        removeInjection(Workspace.WindowOverlay.prototype, winInjections, i);

    global.stage.queue_relayout();
    resetState();
--- a/extensions/native-window-placement/stylesheet.css
+++ b/extensions/native-window-placement/stylesheet.css
@@ -1 +1,9 @@
-/* This extensions requires no special styling */
+.window-caption {
+    -shell-caption-spacing: 13px;		/* current caption height is 26px => set it to half of it. TODO: better solution needed */
+}
+
+.window-picker {
+    -horizontal-spacing: 32px;
+    -vertical-spacing: 32px;
+    padding: 64px 32px;
+}
--- a/extensions/places-menu/extension.js
+++ b/extensions/places-menu/extension.js
@@ -3,55 +3,46 @@

 const { Clutter, GObject, St } = imports.gi;

-const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;

+const Gettext = imports.gettext.domain('gnome-shell-extensions');
+const _ = Gettext.gettext;
+const N_ = x => x;
+
+const ExtensionUtils = imports.misc.extensionUtils;
 const Me = ExtensionUtils.getCurrentExtension();
 const PlaceDisplay = Me.imports.placeDisplay;

-const _ = ExtensionUtils.gettext;
-const N_ = x => x;
-
 const PLACE_ICON_SIZE = 16;

-var PlaceMenuItem = GObject.registerClass(
 class PlaceMenuItem extends PopupMenu.PopupBaseMenuItem {
-    _init(info) {
-        super._init({
-            style_class: 'place-menu-item',
-        });
+    constructor(info) {
+        super();
        this._info = info;

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

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

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

        this._changedId = info.connect('changed',
-            this._propertiesChanged.bind(this));
+                                       this._propertiesChanged.bind(this));
    }

    destroy() {
@@ -73,13 +64,13 @@ class PlaceMenuItem extends PopupMenu.PopupBaseMenuItem {
        this._icon.gicon = info.icon;
        this._label.text = info.name;
    }
-});
+}

 const SECTIONS = [
    'special',
    'devices',
    'bookmarks',
-    'network',
+    'network'
 ];

 let PlacesMenu = GObject.registerClass(
@@ -87,12 +78,15 @@ class PlacesMenu extends PanelMenu.Button {
    _init() {
        super._init(0.0, _('Places'));

+        let hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
        let label = new St.Label({
            text: _('Places'),
            y_expand: true,
-            y_align: Clutter.ActorAlign.CENTER,
+            y_align: Clutter.ActorAlign.CENTER
        });
-        this.add_actor(label);
+        hbox.add_child(label);
+        hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
+        this.add_actor(hbox);

        this.placesManager = new PlaceDisplay.PlacesManager();

@@ -132,24 +126,21 @@ class PlacesMenu extends PanelMenu.Button {
    }
 });

-/** */
 function init() {
    ExtensionUtils.initTranslations();
 }

 let _indicator;

-/** */
 function enable() {
-    _indicator = new PlacesMenu();
+    _indicator = new PlacesMenu;

-    let pos = Main.sessionMode.panel.left.indexOf('appMenu');
+    let pos = 1;
    if ('apps-menu' in Main.panel.statusArea)
-        pos++;
+        pos = 2;
    Main.panel.addToStatusArea('places-menu', _indicator, pos, 'left');
 }

-/** */
 function disable() {
    _indicator.destroy();
 }
--- a/extensions/places-menu/placeDisplay.js
+++ b/extensions/places-menu/placeDisplay.js
@@ -3,16 +3,13 @@
 const { Gio, GLib, Shell } = imports.gi;
 const Signals = imports.signals;

-const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
 const ShellMountOperation = imports.ui.shellMountOperation;

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

-Gio._promisify(Gio.AppInfo, 'launch_default_for_uri_async');
-Gio._promisify(Gio.File.prototype, 'mount_enclosing_volume');
-
 const BACKGROUND_SCHEMA = 'org.gnome.desktop.background';

 const Hostname1Iface = '<node> \
@@ -23,8 +20,8 @@ const Hostname1Iface = '<node> \
 const Hostname1 = Gio.DBusProxy.makeProxyWrapper(Hostname1Iface);

 class PlaceInfo {
-    constructor(...params) {
-        this._init(...params);
+    constructor() {
+        this._init.apply(this, arguments);
    }

    _init(kind, file, name, icon) {
@@ -43,19 +40,19 @@ class PlaceInfo {

    async _ensureMountAndLaunch(context, tryMount) {
        try {
-            await Gio.AppInfo.launch_default_for_uri_async(this.file.get_uri(), context, null);
-        } catch (err) {
-            if (!err.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_MOUNTED)) {
-                Main.notifyError(_('Failed to launch “%s”').format(this.name), err.message);
+            await this._launchDefaultForUri(this.file.get_uri(), context, null);
+        } catch (e) {
+            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_MOUNTED)) {
+                Main.notifyError(_('Failed to launch “%s”').format(this.name), e.message);
                return;
            }

            let source = {
-                get_icon: () => this.icon,
+                get_icon: () => this.icon
            };
            let op = new ShellMountOperation.ShellMountOperation(source);
            try {
-                await this.file.mount_enclosing_volume(0, op.mountOp, null);
+                await this._mountEnclosingVolume(0, op.mountOp, null);

                if (tryMount)
                    this._ensureMountAndLaunch(context, false);
@@ -74,21 +71,18 @@ class PlaceInfo {
    }

    getIcon() {
-        this.file.query_info_async('standard::symbolic-icon',
-            Gio.FileQueryInfoFlags.NONE,
-            0,
-            null,
-            (file, result) => {
-                try {
-                    let info = file.query_info_finish(result);
-                    this.icon = info.get_symbolic_icon();
-                    this.emit('changed');
-                } catch (e) {
-                    if (e instanceof Gio.IOErrorEnum)
-                        return;
-                    throw e;
-                }
-            });
+        this.file.query_info_async('standard::symbolic-icon', 0, 0, null,
+                                   (file, result) => {
+                                       try {
+                                           let info = file.query_info_finish(result);
+                                           this.icon = info.get_symbolic_icon();
+                                           this.emit('changed');
+                                       } catch (e) {
+                                           if (e instanceof Gio.IOErrorEnum)
+                                               return;
+                                           throw e;
+                                       }
+                                   });

        // return a generic icon for this kind for now, until we have the
        // icon from the query info above
@@ -117,6 +111,32 @@ class PlaceInfo {
            throw e;
        }
    }
+
+    _launchDefaultForUri(uri, context, cancel) {
+        return new Promise((resolve, reject) => {
+            Gio.AppInfo.launch_default_for_uri_async(uri, context, cancel, (o, res) => {
+                try {
+                    Gio.AppInfo.launch_default_for_uri_finish(res);
+                    resolve();
+                } catch (e) {
+                    reject(e);
+                }
+            });
+        });
+    }
+
+    _mountEnclosingVolume(flags, mountOp, cancel) {
+        return new Promise((resolve, reject) => {
+            this.file.mount_enclosing_volume(flags, mountOp, cancel, (o, res) => {
+                try {
+                    this.file.mount_enclosing_volume_finish(res);
+                    resolve();
+                } catch (e) {
+                    reject(e);
+                }
+            });
+        });
+    }
 }
 Signals.addSignalMethods(PlaceInfo.prototype);

@@ -132,7 +152,7 @@ class RootInfo extends PlaceInfo {

            this._proxy = obj;
            this._proxy.connect('g-properties-changed',
-                this._propertiesChanged.bind(this));
+                                this._propertiesChanged.bind(this));
            this._propertiesChanged(obj);
        });
    }
@@ -171,23 +191,22 @@ class PlaceDeviceInfo extends PlaceInfo {
    }

    isRemovable() {
-        return this._mount.can_eject() || this._mount.can_unmount();
+        return this._mount.can_eject();
    }

    eject() {
        let unmountArgs = [
            Gio.MountUnmountFlags.NONE,
-            new ShellMountOperation.ShellMountOperation(this._mount).mountOp,
-            null, // Gio.Cancellable
+            (new ShellMountOperation.ShellMountOperation(this._mount)).mountOp,
+            null // Gio.Cancellable
        ];

-        if (this._mount.can_eject()) {
+        if (this._mount.can_eject())
            this._mount.eject_with_operation(...unmountArgs,
-                this._ejectFinish.bind(this));
-        } else {
+                                             this._ejectFinish.bind(this));
+        else
            this._mount.unmount_with_operation(...unmountArgs,
-                this._unmountFinish.bind(this));
-        }
+                                               this._unmountFinish.bind(this));
    }

    _ejectFinish(mount, result) {
@@ -256,8 +275,9 @@ 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));
+        this._showDesktopIconsChangedId =
+            this._settings.connect('changed::show-desktop-icons',
+                                   this._updateSpecials.bind(this));
        this._updateSpecials();

        /*
@@ -299,7 +319,7 @@ var PlacesManager = class {
            'mount-changed',
            'drive-connected',
            'drive-disconnected',
-            'drive-changed',
+            'drive-changed'
        ];

        this._volumeMonitorSignals = [];
@@ -330,10 +350,9 @@ var PlacesManager = class {

        let homePath = GLib.get_home_dir();

-        this._places.special.push(new PlaceInfo(
-            'special',
-            Gio.File.new_for_path(homePath),
-            _('Home')));
+        this._places.special.push(new PlaceInfo('special',
+                                                Gio.File.new_for_path(homePath),
+                                                _('Home')));

        let specials = [];
        let dirs = DEFAULT_DIRECTORIES.slice();
@@ -343,7 +362,7 @@ var PlacesManager = class {

        for (let i = 0; i < dirs.length; i++) {
            let specialPath = GLib.get_user_special_dir(dirs[i]);
-            if (!specialPath || specialPath === homePath)
+            if (specialPath == null || specialPath == homePath)
                continue;

            let file = Gio.File.new_for_path(specialPath), info;
@@ -375,11 +394,10 @@ var PlacesManager = class {

        /* Add standard places */
        this._places.devices.push(new RootInfo());
-        this._places.network.push(new PlaceInfo(
-            'network',
-            Gio.File.new_for_uri('network:///'),
-            _('Browse Network'),
-            'network-workgroup-symbolic'));
+        this._places.network.push(new PlaceInfo('network',
+                                                Gio.File.new_for_uri('network:///'),
+                                                _('Browse Network'),
+                                                'network-workgroup-symbolic'));

        /* first go through all connected drives */
        let drives = this._volumeMonitor.get_connected_drives();
@@ -392,7 +410,7 @@ var PlacesManager = class {
                    networkVolumes.push(volumes[j]);
                } else {
                    let mount = volumes[j].get_mount();
-                    if (mount)
+                    if (mount != null)
                        this._addMount('devices', mount);
                }
            }
@@ -401,7 +419,7 @@ var PlacesManager = class {
        /* add all volumes that is not associated with a drive */
        let volumes = this._volumeMonitor.get_volumes();
        for (let i = 0; i < volumes.length; i++) {
-            if (volumes[i].get_drive())
+            if (volumes[i].get_drive() != null)
                continue;

            let identifier = volumes[i].get_identifier('class');
@@ -409,7 +427,7 @@ var PlacesManager = class {
                networkVolumes.push(volumes[i]);
            } else {
                let mount = volumes[i].get_mount();
-                if (mount)
+                if (mount != null)
                    this._addMount('devices', mount);
            }
        }
@@ -440,9 +458,9 @@ var PlacesManager = class {
            this._addVolume('network', networkVolumes[i]);
        }

-        for (let i = 0; i < networkMounts.length; i++)
+        for (let i = 0; i < networkMounts.length; i++) {
            this._addMount('network', networkMounts[i]);
-
+        }

        this.emit('devices-updated');
        this.emit('network-updated');
@@ -463,6 +481,7 @@ var PlacesManager = class {
    }

    _reloadBookmarks() {
+
        this._bookmarks = [];

        let content = Shell.get_file_contents_utf8_sync(this._bookmarksFile.get_path());
@@ -472,7 +491,7 @@ var PlacesManager = class {
        for (let i = 0; i < lines.length; i++) {
            let line = lines[i];
            let components = line.split(' ');
-            let [bookmark] = components;
+            let bookmark = components[0];

            if (!bookmark)
                continue;
@@ -482,16 +501,16 @@ var PlacesManager = class {
                continue;

            let duplicate = false;
-            for (let j = 0; j < this._places.special.length; j++) {
-                if (file.equal(this._places.special[j].file)) {
+            for (let i = 0; i < this._places.special.length; i++) {
+                if (file.equal(this._places.special[i].file)) {
                    duplicate = true;
                    break;
                }
            }
            if (duplicate)
                continue;
-            for (let j = 0; j < bookmarks.length; j++) {
-                if (file.equal(bookmarks[j].file)) {
+            for (let i = 0; i < bookmarks.length; i++) {
+                if (file.equal(bookmarks[i].file)) {
                    duplicate = true;
                    break;
                }
--- a/extensions/places-menu/stylesheet.css
+++ b/extensions/places-menu/stylesheet.css
@@ -1,8 +1 @@
-.place-menu-item .button {
-  border-radius: 99px;
-  padding: 3px;
-  min-height: auto;
-}
-
-.place-menu-item .button:ltr { margin-left: 6px; }
-.place-menu-item .button:rtl { margin-right: 6px; }
+/* none used*/
--- a/extensions/screenshot-window-sizer/extension.js
+++ b/extensions/screenshot-window-sizer/extension.js
@@ -19,45 +19,42 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */

-const { Clutter, Meta, Shell, St } = imports.gi;
+const { Meta, Shell, St } = imports.gi;
+
+const Main = imports.ui.main;
+const Tweener = imports.ui.tweener;

 const ExtensionUtils = imports.misc.extensionUtils;
-const Main = imports.ui.main;

-const MESSAGE_FADE_TIME = 2000;
+const MESSAGE_FADE_TIME = 2;

 let text;

-/** */
 function hideMessage() {
    text.destroy();
    text = null;
 }

-/**
- * @param {string} message - the message to flash
- */
 function flashMessage(message) {
    if (!text) {
        text = new St.Label({ style_class: 'screenshot-sizer-message' });
        Main.uiGroup.add_actor(text);
    }

-    text.remove_all_transitions();
+    Tweener.removeTweens(text);
    text.text = message;

    text.opacity = 255;

    let monitor = Main.layoutManager.primaryMonitor;
-    text.set_position(
-        monitor.x + Math.floor(monitor.width / 2 - text.width / 2),
-        monitor.y + Math.floor(monitor.height / 2 - text.height / 2));
+    text.set_position(monitor.x + Math.floor(monitor.width / 2 - text.width / 2),
+                      monitor.y + Math.floor(monitor.height / 2 - text.height / 2));

-    text.ease({
+    Tweener.addTween(text, {
        opacity: 0,
-        duration: MESSAGE_FADE_TIME,
-        mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-        onComplete: hideMessage,
+        time: MESSAGE_FADE_TIME,
+        transition: 'easeOutQuad',
+        onComplete: hideMessage
    });
 }

@@ -66,24 +63,17 @@ let SIZES = [
    [800, 450],
    [1024, 576],
    [1200, 675],
-    [1600, 900],
-    [360, 654], // Phone portrait maximized
-    [720, 360], // Phone landscape fullscreen
+    [1600, 900]
 ];

-/**
- * @param {Meta.Display} display - the display
- * @param {Meta.Window=} window - for per-window bindings, the window
- * @param {Meta.KeyBinding} binding - the key binding
- */
 function cycleScreenshotSizes(display, window, binding) {
    // Probably this isn't useful with 5 sizes, but you can decrease instead
    // of increase by holding down shift.
    let modifiers = binding.get_modifiers();
-    let backwards = (modifiers & Meta.VirtualModifier.SHIFT_MASK) !== 0;
+    let backwards = (modifiers & Meta.VirtualModifier.SHIFT_MASK) != 0;

    // Unmaximize first
-    if (window.get_maximized() !== 0)
+    if (window.get_maximized() != 0)
        window.unmaximize(Meta.MaximizeFlags.BOTH);

    let workArea = window.get_work_area_current_monitor();
@@ -91,8 +81,7 @@ function cycleScreenshotSizes(display, 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))
-        .filter(([w, h]) => w <= workArea.width && h <= workArea.height);
+    let scaledSizes = SIZES.map(size => size.map(wh => wh * scaleFactor));

    // Find the nearest 16:9 size for the current window size
    let nearestIndex;
@@ -107,7 +96,7 @@ function cycleScreenshotSizes(display, window, binding) {

        // get the best initial window size
        let error = Math.abs(width - outerRect.width) + Math.abs(height - outerRect.height);
-        if (nearestIndex === undefined || error < nearestError) {
+        if (nearestIndex == null || error < nearestError) {
            nearestIndex = i;
            nearestError = error;
        }
@@ -115,7 +104,10 @@ function cycleScreenshotSizes(display, window, binding) {

    // get the next size up or down from ideal
    let newIndex = (nearestIndex + (backwards ? -1 : 1)) % scaledSizes.length;
-    let [newWidth, newHeight] = scaledSizes[newIndex];
+    let newWidth, newHeight;
+    [newWidth, newHeight] = scaledSizes[newIndex];
+    if (newWidth > workArea.width || newHeight > workArea.height)
+        [newWidth, newHeight] = scaledSizes[0];

    // Push the window onscreen if it would be resized offscreen
    let newX = outerRect.x;
@@ -129,36 +121,33 @@ function cycleScreenshotSizes(display, window, binding) {

    let newOuterRect = window.get_frame_rect();
    let message = '%d×%d'.format(
-        newOuterRect.width / scaleFactor,
-        newOuterRect.height / scaleFactor);
+        (newOuterRect.width / scaleFactor),
+        (newOuterRect.height / scaleFactor));

    // The new size might have been constrained by geometry hints (e.g. for
    // a terminal) - in that case, include the actual ratio to the message
    // we flash
-    let actualNumerator = 9 * newOuterRect.width / newOuterRect.height;
+    let actualNumerator = (newOuterRect.width / newOuterRect.height) * 9;
    if (Math.abs(actualNumerator - 16) > 0.01)
        message += ' (%.2f:9)'.format(actualNumerator);

    flashMessage(message);
 }

-/** */
 function enable() {
-    Main.wm.addKeybinding(
-        'cycle-screenshot-sizes',
-        ExtensionUtils.getSettings(),
-        Meta.KeyBindingFlags.PER_WINDOW,
-        Shell.ActionMode.NORMAL,
-        cycleScreenshotSizes);
-    Main.wm.addKeybinding(
-        'cycle-screenshot-sizes-backward',
-        ExtensionUtils.getSettings(),
-        Meta.KeyBindingFlags.PER_WINDOW | Meta.KeyBindingFlags.IS_REVERSED,
-        Shell.ActionMode.NORMAL,
-        cycleScreenshotSizes);
+    Main.wm.addKeybinding('cycle-screenshot-sizes',
+                          ExtensionUtils.getSettings(),
+                          Meta.KeyBindingFlags.PER_WINDOW,
+                          Shell.ActionMode.NORMAL,
+                          cycleScreenshotSizes);
+    Main.wm.addKeybinding('cycle-screenshot-sizes-backward',
+                          ExtensionUtils.getSettings(),
+                          Meta.KeyBindingFlags.PER_WINDOW |
+                          Meta.KeyBindingFlags.IS_REVERSED,
+                          Shell.ActionMode.NORMAL,
+                          cycleScreenshotSizes);
 }

-/** */
 function disable() {
    Main.wm.removeKeybinding('cycle-screenshot-sizes');
    Main.wm.removeKeybinding('cycle-screenshot-sizes-backward');
--- a/extensions/user-theme/extension.js
+++ b/extensions/user-theme/extension.js
@@ -2,26 +2,28 @@
 // Load shell theme from ~/.local/share/themes/name/gnome-shell
 /* exported init */

-const { Gio } = imports.gi;
-
-const ExtensionUtils = imports.misc.extensionUtils;
+const { Gio, GLib } = imports.gi;
 const Main = imports.ui.main;

-const Me = ExtensionUtils.getCurrentExtension();
-const Util = Me.imports.util;
-
 const SETTINGS_KEY = 'name';

+const ExtensionUtils = imports.misc.extensionUtils;
+
 class ThemeManager {
-    enable() {
+    constructor() {
        this._settings = ExtensionUtils.getSettings();
-        this._settings.connect(`changed::${SETTINGS_KEY}`, this._changeTheme.bind(this));
+    }
+
+    enable() {
+        this._changedId = this._settings.connect(`changed::${SETTINGS_KEY}`, this._changeTheme.bind(this));
        this._changeTheme();
    }

    disable() {
-        this._settings?.run_dispose();
-        this._settings = null;
+        if (this._changedId) {
+            this._settings.disconnect(this._changedId);
+            this._changedId = 0;
+        }

        Main.setThemeStylesheet(null);
        Main.loadTheme();
@@ -32,11 +34,13 @@ class ThemeManager {
        let themeName = this._settings.get_string(SETTINGS_KEY);

        if (themeName) {
-            const stylesheetPaths = Util.getThemeDirs()
-                .map(dir => `${dir}/${themeName}/gnome-shell/gnome-shell.css`);
-
-            stylesheetPaths.push(...Util.getModeThemeDirs()
-                .map(dir => `${dir}/${themeName}.css`));
+            let stylesheetPaths = [
+                [GLib.get_home_dir(), '.themes'],
+                [GLib.get_user_data_dir(), 'themes'],
+                ...GLib.get_system_data_dirs().map(dir => [dir, 'themes'])
+            ].map(themeDir => GLib.build_filenamev([
+                ...themeDir, themeName, 'gnome-shell', 'gnome-shell.css'
+            ]));

            stylesheet = stylesheetPaths.find(path => {
                let file = Gio.file_new_for_path(path);
@@ -53,9 +57,6 @@ class ThemeManager {
    }
 }

-/**
- * @returns {ThemeManager} - the extension state object
- */
 function init() {
    return new ThemeManager();
 }
--- a/extensions/user-theme/meson.build
+++ b/extensions/user-theme/meson.build
@@ -4,5 +4,4 @@ extension_data += configure_file(
  configuration: metadata_conf
 )

-extension_sources += files('prefs.js', 'util.js')
 extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')
--- a/extensions/user-theme/prefs.js
+++ b/extensions/user-theme/prefs.js
@@ -1,131 +0,0 @@
-// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
-/* exported init buildPrefsWidget */
-
-// we use async/await here to not block the mainloop, not to parallelize
-/* eslint-disable no-await-in-loop */
-
-const { Adw, Gio, GLib, GObject, Gtk } = imports.gi;
-
-const ExtensionUtils = imports.misc.extensionUtils;
-
-const Me = ExtensionUtils.getCurrentExtension();
-const Util = Me.imports.util;
-
-Gio._promisify(Gio.File.prototype, 'enumerate_children_async');
-Gio._promisify(Gio.File.prototype, 'query_info_async');
-Gio._promisify(Gio.FileEnumerator.prototype, 'next_files_async');
-
-const UserThemePrefsWidget = GObject.registerClass(
-class UserThemePrefsWidget extends Adw.PreferencesGroup {
-    _init() {
-        super._init({ title: 'Themes' });
-
-        this._actionGroup = new Gio.SimpleActionGroup();
-        this.insert_action_group('theme', this._actionGroup);
-
-        this._settings = ExtensionUtils.getSettings();
-        this._actionGroup.add_action(
-            this._settings.create_action('name'));
-
-        this.connect('destroy', () => this._settings.run_dispose());
-
-        this._rows = new Map();
-        this._addTheme(''); // default
-
-        this._collectThemes();
-    }
-
-    async _collectThemes() {
-        for (const dirName of Util.getThemeDirs()) {
-            const dir = Gio.File.new_for_path(dirName);
-            for (const name of await this._enumerateDir(dir)) {
-                if (this._rows.has(name))
-                    continue;
-
-                const file = dir.resolve_relative_path(
-                    `${name}/gnome-shell/gnome-shell.css`);
-                try {
-                    await file.query_info_async(
-                        Gio.FILE_ATTRIBUTE_STANDARD_NAME,
-                        Gio.FileQueryInfoFlags.NONE,
-                        GLib.PRIORITY_DEFAULT, null);
-                    this._addTheme(name);
-                } catch (e) {
-                    if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
-                        logError(e);
-                }
-            }
-        }
-
-        for (const dirName of Util.getModeThemeDirs()) {
-            const dir = Gio.File.new_for_path(dirName);
-            for (const filename of await this._enumerateDir(dir)) {
-                if (!filename.endsWith('.css'))
-                    continue;
-
-                const name = filename.slice(0, -4);
-                if (!this._rows.has(name))
-                    this._addTheme(name);
-            }
-        }
-    }
-
-    _addTheme(name) {
-        const row = new ThemeRow(name);
-        this._rows.set(name, row);
-
-        this.add(row);
-    }
-
-    async _enumerateDir(dir) {
-        const fileInfos = [];
-        let fileEnum;
-
-        try {
-            fileEnum = await dir.enumerate_children_async(
-                Gio.FILE_ATTRIBUTE_STANDARD_NAME,
-                Gio.FileQueryInfoFlags.NONE,
-                GLib.PRIORITY_DEFAULT, null);
-        } catch (e) {
-            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
-                logError(e);
-            return [];
-        }
-
-        let infos;
-        do {
-            infos = await fileEnum.next_files_async(100,
-                GLib.PRIORITY_DEFAULT, null);
-            fileInfos.push(...infos);
-        } while (infos.length > 0);
-
-        return fileInfos.map(info => info.get_name());
-    }
-});
-
-const ThemeRow = GObject.registerClass(
-class ThemeRow extends Adw.ActionRow {
-    _init(name) {
-        const check = new Gtk.CheckButton({
-            action_name: 'theme.name',
-            action_target: new GLib.Variant('s', name),
-        });
-
-        super._init({
-            title: name || 'Default',
-            activatable_widget: check,
-        });
-        this.add_prefix(check);
-    }
-});
-
-/** */
-function init() {
-}
-
-/**
- * @returns {Gtk.Widget} - the prefs widget
- */
-function buildPrefsWidget() {
-    return new UserThemePrefsWidget();
-}
--- a/extensions/user-theme/util.js
+++ b/extensions/user-theme/util.js
@@ -1,23 +0,0 @@
-/* exported getThemeDirs getModeThemeDirs */
-const { GLib } = imports.gi;
-
-const fn = (...args) => GLib.build_filenamev(args);
-
-/**
- * @returns {string[]} - an ordered list of theme directories
- */
-function getThemeDirs() {
-    return [
-        fn(GLib.get_home_dir(), '.themes'),
-        fn(GLib.get_user_data_dir(), 'themes'),
-        ...GLib.get_system_data_dirs().map(dir => fn(dir, 'themes')),
-    ];
-}
-
-/**
- * @returns {string[]} - an ordered list of mode theme directories
- */
-function getModeThemeDirs() {
-    return GLib.get_system_data_dirs()
-        .map(dir => fn(dir, 'gnome-shell', 'theme'));
-}
--- a/extensions/window-list/classic.css
+++ b/extensions/window-list/classic.css
@@ -4,39 +4,36 @@
    border-top-width: 1px;
    border-bottom-width: 0px;
    height: 2.25em ;
-    padding: 2px;
-  }
-
-  .bottom-panel .window-button > StWidget,
-  .bottom-panel .window-picker-toggle > StWidget {
-    color: #2e3436;
-    background-color: #eee;
-    border-radius: 3px;
-    padding: 3px 6px 1px;
-    box-shadow: none;
-    text-shadow: none;
-    border: 1px solid rgba(0,0,0,0.2);
  }

  .bottom-panel .window-button > StWidget {
+    background-gradient-drection: vertical;
+    background-color: #fff;
+    background-gradient-start: #fff;
+    background-gradient-end: #eee;
+    color: #000;
    -st-natural-width: 18.7em;
    max-width: 18.75em;
+    color: #2e3436;
+    background-color: #eee;
+    border-radius: 2px;
+    padding: 3px 6px 1px;
+    box-shadow: inset -1px -1px 1px rgba(0,0,0,0.5);
+    text-shadow: 0 0 transparent;
  }

-  .bottom-panel .window-button:hover > StWidget,
-  .bottom-panel .window-picker-toggle:hover > StWidget {
+  .bottom-panel .window-button:hover > StWidget {
    background-color: #f9f9f9;
  }

  .bottom-panel .window-button:active > StWidget,
  .bottom-panel .window-button:focus > StWidget {
-    box-shadow: inset 0 1px 3px rgba(0,0,0,0.1);
+    box-shadow: inset 1px 1px 2px rgba(0,0,0,0.5);
  }

-  .bottom-panel .window-button.focused > StWidget,
-  .bottom-panel .window-picker-toggle:checked > StWidget {
-    background-color: #ccc;
-    box-shadow: inset 0 1px 3px rgba(0,0,0,0.1);
+  .bottom-panel .window-button.focused > StWidget {
+    background-color: #ddd;
+    box-shadow: inset 1px 1px 1px rgba(0,0,0,0.5);
  }

  .bottom-panel .window-button.focused:hover > StWidget {
@@ -45,24 +42,5 @@

  .bottom-panel .window-button.minimized > StWidget {
    color: #888;
-    box-shadow: none;
+    box-shadow: inset -1px -1px 1px rgba(0,0,0,0.5);
  }
-
-/* workspace switcher */
-.window-list-workspace-indicator .workspace {
-  border: 2px solid #f6f5f4;
-  background-color: #ccc;
-}
-
-.window-list-workspace-indicator .workspace.active {
-  border-color: #888;
-}
-
-.window-list-window-preview {
-  background-color: #ededed;
-  border: 1px solid #ccc;
-}
-
-.window-list-window-preview.active {
-  background-color: #f6f5f4;
-}
--- a/extensions/window-list/extension.js
+++ b/extensions/window-list/extension.js
--- a/extensions/window-list/meson.build
+++ b/extensions/window-list/meson.build
@@ -4,7 +4,7 @@ extension_data += configure_file(
  configuration: metadata_conf
 )

-extension_sources += files('prefs.js', 'windowPicker.js', 'workspaceIndicator.js')
+extension_sources += files('prefs.js')
 extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')

 if classic_mode_enabled
--- a/extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml
+++ b/extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml
@@ -15,13 +15,6 @@
        window list. Possible values are “never”, “auto” and “always”.
      </description>
    </key>
-    <key name="display-all-workspaces" type="b">
-      <default>false</default>
-      <summary>Show windows from all workspaces</summary>
-      <description>
-        Whether to show windows from all workspaces or only the current one.
-      </description>
-    </key>
    <key name="show-on-all-monitors" type="b">
      <default>false</default>
      <summary>Show the window list on all monitors</summary>
--- a/extensions/window-list/prefs.js
+++ b/extensions/window-list/prefs.js
@@ -1,89 +1,88 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
 /* exported init buildPrefsWidget */

-const { Adw, Gio, GLib, GObject, Gtk } = imports.gi;
+const { Gio, GObject, Gtk } = imports.gi;
+
+const Gettext = imports.gettext.domain('gnome-shell-extensions');
+const _ = Gettext.gettext;

 const ExtensionUtils = imports.misc.extensionUtils;

-const _ = ExtensionUtils.gettext;

-/** */
 function init() {
    ExtensionUtils.initTranslations();
 }

 const WindowListPrefsWidget = GObject.registerClass(
-class WindowListPrefsWidget extends Adw.PreferencesPage {
-    _init() {
-        super._init();
+class WindowListPrefsWidget extends Gtk.Grid {
+    _init(params) {
+        super._init(params);

-        this._actionGroup = new Gio.SimpleActionGroup();
-        this.insert_action_group('window-list', this._actionGroup);
+        this.margin = 24;
+        this.row_spacing = 6;
+        this.orientation = Gtk.Orientation.VERTICAL;
+
+        let groupingLabel = '<b>%s</b>'.format(_('Window Grouping'));
+        this.add(new Gtk.Label({
+            label: groupingLabel, use_markup: true,
+            halign: Gtk.Align.START
+        }));
+
+        let align = new Gtk.Alignment({ left_padding: 12 });
+        this.add(align);
+
+        let grid = new Gtk.Grid({
+            orientation: Gtk.Orientation.VERTICAL,
+            row_spacing: 6,
+            column_spacing: 6
+        });
+        align.add(grid);

        this._settings = ExtensionUtils.getSettings();
-        this._actionGroup.add_action(
-            this._settings.create_action('grouping-mode'));
-        this._actionGroup.add_action(
-            this._settings.create_action('show-on-all-monitors'));
-        this._actionGroup.add_action(
-            this._settings.create_action('display-all-workspaces'));
+        let currentMode = this._settings.get_string('grouping-mode');
+        let range = this._settings.get_range('grouping-mode');
+        let modes = range.deep_unpack()[1].deep_unpack();

-        const groupingGroup = new Adw.PreferencesGroup({
-            title: _('Window Grouping'),
-        });
-        this.add(groupingGroup);
+        let modeLabels = {
+            'never': _('Never group windows'),
+            'auto': _('Group windows when space is limited'),
+            'always': _('Always group windows')
+        };

-        const modes = [
-            { mode: 'never', title: _('Never group windows') },
-            { mode: 'auto', title: _('Group windows when space is limited') },
-            { mode: 'always', title: _('Always group windows') },
-        ];
+        let radio = null;
+        for (let i = 0; i < modes.length; i++) {
+            let mode = modes[i];
+            let label = modeLabels[mode];
+            if (!label) {
+                log('Unhandled option "%s" for grouping-mode'.format(mode));
+                continue;
+            }

-        for (const { mode, title } of modes) {
-            const check = new Gtk.CheckButton({
-                action_name: 'window-list.grouping-mode',
-                action_target: new GLib.Variant('s', mode),
+            radio = new Gtk.RadioButton({
+                active: currentMode == mode,
+                label: label,
+                group: radio
            });
-            const row = new Adw.ActionRow({
-                activatable_widget: check,
-                title,
+            grid.add(radio);
+
+            radio.connect('toggled', button => {
+                if (button.active)
+                    this._settings.set_string('grouping-mode', mode);
            });
-            row.add_prefix(check);
-            groupingGroup.add(row);
        }

-        const miscGroup = new Adw.PreferencesGroup();
-        this.add(miscGroup);
-
-        let toggle = new Gtk.Switch({
-            action_name: 'window-list.show-on-all-monitors',
-            valign: Gtk.Align.CENTER,
+        let check = new Gtk.CheckButton({
+            label: _('Show on all monitors'),
+            margin_top: 6
        });
-        let row = new Adw.ActionRow({
-            title: _('Show on all monitors'),
-            activatable_widget: toggle,
-        });
-        row.add_suffix(toggle);
-        miscGroup.add(row);
-
-        toggle = new Gtk.Switch({
-            action_name: 'window-list.display-all-workspaces',
-            valign: Gtk.Align.CENTER,
-        });
-        this._settings.bind('display-all-workspaces',
-            toggle, 'active', Gio.SettingsBindFlags.DEFAULT);
-        row = new Adw.ActionRow({
-            title: _('Show windows from all workspaces'),
-            activatable_widget: toggle,
-        });
-        row.add_suffix(toggle);
-        miscGroup.add(row);
+        this._settings.bind('show-on-all-monitors', check, 'active', Gio.SettingsBindFlags.DEFAULT);
+        this.add(check);
    }
 });

-/**
- * @returns {Gtk.Widget} - the prefs widget
- */
 function buildPrefsWidget() {
-    return new WindowListPrefsWidget();
+    let widget = new WindowListPrefsWidget();
+    widget.show_all();
+
+    return widget;
 }
--- a/extensions/window-list/stylesheet.css
+++ b/extensions/window-list/stylesheet.css
@@ -1,3 +1,10 @@
+.bottom-panel {
+  /* .window-button-icon height +
+     .window-button vertical padding +
+     .window-button > StWidget vertical padding) */
+  height: 2.25em;
+}
+
 .window-list {
  spacing: 2px;
  font-size: 10pt;
@@ -19,31 +26,18 @@
  spacing: 4px;
 }

-.window-button > StWidget,
-.window-picker-toggle > StWidget {
+.window-button > StWidget {
+  -st-natural-width: 18.75em;
+  max-width: 18.75em;
  color: #bbb;
  background-color: black;
-  border-radius: 2px;
+  border-radius: 4px;
  padding: 3px 6px 1px;
  box-shadow: inset 1px 1px 4px rgba(255,255,255,0.5);
  text-shadow: 1px 1px 4px rgba(0,0,0,0.8);
 }

-.window-picker-toggle {
-  padding: 3px;
-}
-
-.window-picker-toggle > StWidet {
-  border: 1px solid rgba(255,255,255,0.3);
-}
-
-.window-button > StWidget {
-  -st-natural-width: 18.75em;
-  max-width: 18.75em;
-}
-
-.window-button:hover > StWidget,
-.window-picker-toggle:hover > StWidget {
+.window-button:hover > StWidget {
  color: white;
  background-color: #1f1f1f;
 }
@@ -53,14 +47,12 @@
  box-shadow: inset 2px 2px 4px rgba(255,255,255,0.5);
 }

-.window-button.focused > StWidget,
-.window-picker-toggle:checked > StWidget {
+.window-button.focused > StWidget {
  color: white;
  box-shadow: inset 1px 1px 4px rgba(255,255,255,0.7);
 }

-.window-button.focused:active > StWidget,
-.window-picker-toggle:checked:active > StWidget {
+.window-button.focused:active > StWidget {
  box-shadow: inset 2px 2px 4px rgba(255,255,255,0.7);
 }

@@ -78,36 +70,13 @@
  height: 24px;
 }

-.window-list-workspace-indicator .status-label-bin {
-  background-color: rgba(200, 200, 200, .3);
-  border: 1px solid #cccccc;
-  padding: 0 3px;
-  margin: 3px;
-}
-
-.window-list-workspace-indicator .workspaces-box {
-  spacing: 3px;
+.window-list-workspace-indicator {
  padding: 3px;
 }

-.window-list-workspace-indicator .workspace {
-  border: 2px solid #000;
-  width: 52px;
-  border-radius: 4px;
-  background-color: #595959;
-}
-
-.window-list-workspace-indicator .workspace.active {
-  border-color: #fff;
-}
-
-.window-list-window-preview {
-  background-color: #bebebe;
-  border: 1px solid #828282;
-}
-
-.window-list-window-preview.active {
-  background-color: #d4d4d4;
+.window-list-workspace-indicator > StWidget {
+  background-color: rgba(200, 200, 200, .3);
+  border: 1px solid #cccccc;
 }

 .notification {
--- a/extensions/window-list/windowPicker.js
+++ b/extensions/window-list/windowPicker.js
@@ -1,348 +0,0 @@
-/* exported WindowPicker, WindowPickerToggle */
-const { Clutter, GObject, Shell, St } = imports.gi;
-
-const Layout = imports.ui.layout;
-const Main = imports.ui.main;
-const { WorkspacesDisplay } = imports.ui.workspacesView;
-const Workspace = imports.ui.workspace;
-
-const { VIGNETTE_BRIGHTNESS } = imports.ui.lightbox;
-const {
-    SIDE_CONTROLS_ANIMATION_TIME,
-    OverviewAdjustment,
-    ControlsState,
-} = imports.ui.overviewControls;
-
-let MyWorkspacesDisplay = GObject.registerClass(
-class MyWorkspacesDisplay extends WorkspacesDisplay {
-    _init(controls, overviewAdjustment) {
-        let workspaceManager = global.workspace_manager;
-
-        this._overviewAdjustment = overviewAdjustment;
-        this._workspaceAdjustment = new St.Adjustment({
-            value: workspaceManager.get_active_workspace_index(),
-            lower: 0,
-            page_increment: 1,
-            page_size: 1,
-            step_increment: 0,
-            upper: workspaceManager.n_workspaces,
-        });
-
-        this._nWorkspacesChangedId =
-            workspaceManager.connect('notify::n-workspaces',
-                this._updateAdjustment.bind(this));
-
-        super._init(controls, this._workspaceAdjustment, this._overviewAdjustment);
-
-        this._workspaceAdjustment.actor = this;
-
-        this.add_constraint(
-            new Layout.MonitorConstraint({
-                primary: true,
-                work_area: true,
-            }));
-    }
-
-    prepareToEnterOverview(...args) {
-        if (!this._scrollEventId) {
-            this._scrollEventId = Main.windowPicker.connect('scroll-event',
-                this._onScrollEvent.bind(this));
-        }
-
-        super.prepareToEnterOverview(...args);
-    }
-
-    vfunc_hide(...args) {
-        if (this._scrollEventId > 0)
-            Main.windowPicker.disconnect(this._scrollEventId);
-        this._scrollEventId = 0;
-
-        super.vfunc_hide(...args);
-    }
-
-    _updateAdjustment() {
-        let workspaceManager = global.workspace_manager;
-        this._workspaceAdjustment.set({
-            upper: workspaceManager.n_workspaces,
-            value: workspaceManager.get_active_workspace_index(),
-        });
-    }
-
-    _onDestroy() {
-        if (this._nWorkspacesChangedId)
-            global.workspace_manager.disconnect(this._nWorkspacesChangedId);
-        this._nWorkspacesChangedId = 0;
-
-        super._onDestroy();
-    }
-});
-
-const MyWorkspace = GObject.registerClass(
-class MyWorkspace extends Workspace.Workspace {
-    _init(...args) {
-        super._init(...args);
-
-        this._adjChangedId =
-            this._overviewAdjustment.connect('notify::value', () => {
-                const { value: progress } = this._overviewAdjustment;
-                const brightness = 1 - (1 - VIGNETTE_BRIGHTNESS) * progress;
-                for (const bg of this._background?._backgroundGroup ?? []) {
-                    bg.content.set({
-                        vignette: true,
-                        brightness,
-                    });
-                }
-            });
-    }
-
-    _onDestroy() {
-        super._onDestroy();
-
-        if (this._adjChangedId)
-            this._overviewAdjustment.disconnect(this._adjChangedId);
-        this._adjChangedId = 0;
-    }
-});
-
-const MyWorkspaceBackground = GObject.registerClass(
-class MyWorkspaceBackground extends Workspace.WorkspaceBackground {
-    _updateBorderRadius() {
-    }
-
-    vfunc_allocate(box) {
-        this.set_allocation(box);
-
-        const themeNode = this.get_theme_node();
-        const contentBox = themeNode.get_content_box(box);
-
-        this._bin.allocate(contentBox);
-
-        const [contentWidth, contentHeight] = contentBox.get_size();
-        const monitor = Main.layoutManager.monitors[this._monitorIndex];
-        const xRatio = contentWidth / this._workarea.width;
-        const yRatio = contentHeight / this._workarea.height;
-
-        const right = area => area.x + area.width;
-        const bottom = area => area.y + area.height;
-
-        const offsets = {
-            left: xRatio * (this._workarea.x - monitor.x),
-            right: xRatio * (right(monitor) - right(this._workarea)),
-            top: yRatio * (this._workarea.y - monitor.y),
-            bottom: yRatio * (bottom(monitor) - bottom(this._workarea)),
-        };
-
-        contentBox.set_origin(-offsets.left, -offsets.top);
-        contentBox.set_size(
-            offsets.left + contentWidth + offsets.right,
-            offsets.top + contentHeight + offsets.bottom);
-        this._backgroundGroup.allocate(contentBox);
-    }
-});
-
-var WindowPicker = GObject.registerClass({
-    Signals: {
-        'open-state-changed': { param_types: [GObject.TYPE_BOOLEAN] },
-    },
-}, class extends Clutter.Actor {
-    _init() {
-        this._visible = false;
-        this._modal = false;
-
-        this._overlayKeyId = 0;
-        this._stageKeyPressId = 0;
-
-        super._init({ reactive: true });
-
-        this._adjustment = new OverviewAdjustment(this);
-
-        this.connect('destroy', this._onDestroy.bind(this));
-
-        global.bind_property('screen-width',
-            this, 'width',
-            GObject.BindingFlags.SYNC_CREATE);
-        global.bind_property('screen-height',
-            this, 'height',
-            GObject.BindingFlags.SYNC_CREATE);
-
-        this._workspacesDisplay = new MyWorkspacesDisplay(this, this._adjustment);
-        this.add_child(this._workspacesDisplay);
-
-        Main.uiGroup.insert_child_below(this, global.window_group);
-
-        if (!Main.sessionMode.hasOverview) {
-            this._injectBackgroundShade();
-
-            this._overlayKeyId = global.display.connect('overlay-key', () => {
-                if (!this._visible)
-                    this.open();
-                else
-                    this.close();
-            });
-        }
-    }
-
-    _injectBackgroundShade() {
-        this._origWorkspace = Workspace.Workspace;
-        this._origWorkspaceBackground = Workspace.WorkspaceBackground;
-
-        Workspace.Workspace = MyWorkspace;
-        Workspace.WorkspaceBackground = MyWorkspaceBackground;
-    }
-
-    get visible() {
-        return this._visible;
-    }
-
-    open() {
-        if (this._visible)
-            return;
-
-        this._visible = true;
-
-        if (!this._syncGrab())
-            return;
-
-        this._fakeOverviewVisible(true);
-        this._workspacesDisplay.prepareToEnterOverview();
-        Main.overview._animationInProgress = true;
-
-        this._adjustment.value = ControlsState.HIDDEN;
-        this._adjustment.ease(ControlsState.WINDOW_PICKER, {
-            duration: SIDE_CONTROLS_ANIMATION_TIME,
-            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-            onComplete: () => (Main.overview._animationInProgress = false),
-        });
-
-        this._stageKeyPressId = global.stage.connect('key-press-event',
-            (a, event) => {
-                let sym = event.get_key_symbol();
-                if (sym === Clutter.KEY_Escape) {
-                    this.close();
-                    return Clutter.EVENT_STOP;
-                }
-                return Clutter.EVENT_PROPAGATE;
-            });
-
-        this.emit('open-state-changed', this._visible);
-    }
-
-    close() {
-        if (!this._visible)
-            return;
-
-        this._visible = false;
-
-        if (!this._syncGrab())
-            return;
-
-        this._workspacesDisplay.prepareToLeaveOverview();
-
-        Main.overview._animationInProgress = true;
-        this._adjustment.ease(ControlsState.HIDDEN, {
-            duration: SIDE_CONTROLS_ANIMATION_TIME,
-            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-            onComplete: () => {
-                Main.overview._animationInProgress = false;
-                this._workspacesDisplay.hide();
-                this._fakeOverviewVisible(false);
-            },
-        });
-
-        global.stage.disconnect(this._stageKeyPressId);
-        this._stageKeyPressId = 0;
-
-        this.emit('open-state-changed', this._visible);
-    }
-
-    getWorkspacesBoxForState() {
-        return this.allocation;
-    }
-
-    _fakeOverviewVisible(visible) {
-        // Fake overview state for WorkspacesDisplay
-        Main.overview._visible = visible;
-
-        // Hide real windows
-        Main.layoutManager._inOverview = visible;
-        Main.layoutManager._updateVisibility();
-    }
-
-    _syncGrab() {
-        if (this._visible) {
-            if (this._modal)
-                return true;
-
-            const grab = Main.pushModal(global.stage, {
-                actionMode: Shell.ActionMode.OVERVIEW,
-            });
-            if (grab.get_seat_state() !== Clutter.GrabState.NONE) {
-                this._grab = grab;
-                this._modal = true;
-            } else {
-                Main.popModal(grab);
-                this.hide();
-                return false;
-            }
-        } else if (this._modal) {
-            Main.popModal(this._grab);
-            this._modal = false;
-            this._grab = null;
-        }
-        return true;
-    }
-
-    _onDestroy() {
-        if (this._origWorkspace)
-            Workspace.Workspace = this._origWorkspace;
-
-        if (this._origWorkspaceBackground)
-            Workspace.WorkspaceBackground = this._origWorkspaceBackground;
-
-        if (this._monitorsChangedId)
-            Main.layoutManager.disconnect(this._monitorsChangedId);
-        this._monitorsChangedId = 0;
-
-        if (this._overlayKeyId)
-            global.display.disconnect(this._overlayKeyId);
-        this._overlayKeyId = 0;
-
-        if (this._stageKeyPressId)
-            global.stage.disconnect(this._stageKeyPressId);
-        this._stageKeyPressId = 0;
-    }
-});
-
-var WindowPickerToggle = GObject.registerClass(
-class WindowPickerToggle extends St.Button {
-    _init() {
-        let iconBin = new St.Widget({
-            layout_manager: new Clutter.BinLayout(),
-        });
-        iconBin.add_child(new St.Icon({
-            icon_name: 'focus-windows-symbolic',
-            icon_size: 16,
-            x_expand: true,
-            y_expand: true,
-            x_align: Clutter.ActorAlign.CENTER,
-            y_align: Clutter.ActorAlign.CENTER,
-        }));
-        super._init({
-            style_class: 'window-picker-toggle',
-            child: iconBin,
-            visible: !Main.sessionMode.hasOverview,
-            toggle_mode: true,
-        });
-
-        this.connect('notify::checked', () => {
-            if (this.checked)
-                Main.windowPicker.open();
-            else
-                Main.windowPicker.close();
-        });
-
-        Main.windowPicker.connect('open-state-changed', () => {
-            this.checked = Main.windowPicker.visible;
-        });
-    }
-});
--- a/extensions/window-list/workspaceIndicator.js
+++ b/extensions/window-list/workspaceIndicator.js
@@ -1,439 +0,0 @@
-/* exported WorkspaceIndicator */
-const { Clutter, Gio, GObject, Meta, St } = imports.gi;
-
-const DND = imports.ui.dnd;
-const ExtensionUtils = imports.misc.extensionUtils;
-const Main = imports.ui.main;
-const PanelMenu = imports.ui.panelMenu;
-const PopupMenu = imports.ui.popupMenu;
-
-const _ = ExtensionUtils.gettext;
-
-const TOOLTIP_OFFSET = 6;
-const TOOLTIP_ANIMATION_TIME = 150;
-
-const MAX_THUMBNAILS = 6;
-
-let WindowPreview = GObject.registerClass(
-class WindowPreview extends St.Button {
-    _init(window) {
-        super._init({
-            style_class: 'window-list-window-preview',
-        });
-
-        this._delegate = this;
-        DND.makeDraggable(this, { restoreOnSuccess: true });
-
-        this._window = window;
-
-        this.connect('destroy', this._onDestroy.bind(this));
-
-        this._sizeChangedId = this._window.connect('size-changed',
-            () => this.queue_relayout());
-        this._positionChangedId = this._window.connect('position-changed',
-            () => {
-                this._updateVisible();
-                this.queue_relayout();
-            });
-        this._minimizedChangedId = this._window.connect('notify::minimized',
-            this._updateVisible.bind(this));
-
-        this._focusChangedId = global.display.connect('notify::focus-window',
-            this._onFocusChanged.bind(this));
-        this._onFocusChanged();
-    }
-
-    // needed for DND
-    get metaWindow() {
-        return this._window;
-    }
-
-    _onDestroy() {
-        this._window.disconnect(this._sizeChangedId);
-        this._window.disconnect(this._positionChangedId);
-        this._window.disconnect(this._minimizedChangedId);
-        global.display.disconnect(this._focusChangedId);
-    }
-
-    _onFocusChanged() {
-        if (global.display.focus_window === this._window)
-            this.add_style_class_name('active');
-        else
-            this.remove_style_class_name('active');
-    }
-
-    _updateVisible() {
-        const monitor = Main.layoutManager.findIndexForActor(this);
-        const workArea = Main.layoutManager.getWorkAreaForMonitor(monitor);
-        this.visible = this._window.get_frame_rect().overlap(workArea) &&
-            this._window.window_type !== Meta.WindowType.DESKTOP &&
-            this._window.showing_on_its_workspace();
-    }
-});
-
-let WorkspaceLayout = GObject.registerClass(
-class WorkspaceLayout extends Clutter.LayoutManager {
-    vfunc_get_preferred_width() {
-        return [0, 0];
-    }
-
-    vfunc_get_preferred_height() {
-        return [0, 0];
-    }
-
-    vfunc_allocate(container, box) {
-        const monitor = Main.layoutManager.findIndexForActor(container);
-        const workArea = Main.layoutManager.getWorkAreaForMonitor(monitor);
-        const hscale = box.get_width() / workArea.width;
-        const vscale = box.get_height() / workArea.height;
-
-        for (const child of container) {
-            const childBox = new Clutter.ActorBox();
-            const frameRect = child.metaWindow.get_frame_rect();
-            childBox.set_size(
-                Math.round(Math.min(frameRect.width, workArea.width) * hscale),
-                Math.round(Math.min(frameRect.height, workArea.height) * vscale));
-            childBox.set_origin(
-                Math.round((frameRect.x - workArea.x) * hscale),
-                Math.round((frameRect.y - workArea.y)  * vscale));
-            child.allocate(childBox);
-        }
-    }
-});
-
-let WorkspaceThumbnail = GObject.registerClass(
-class WorkspaceThumbnail extends St.Button {
-    _init(index) {
-        super._init({
-            style_class: 'workspace',
-            child: new Clutter.Actor({
-                layout_manager: new WorkspaceLayout(),
-                clip_to_allocation: true,
-            }),
-        });
-
-        this._tooltip = new St.Label({
-            style_class: 'dash-label',
-            visible: false,
-        });
-        Main.uiGroup.add_child(this._tooltip);
-
-        this.connect('destroy', this._onDestroy.bind(this));
-        this.connect('notify::hover', this._syncTooltip.bind(this));
-
-        this._index = index;
-        this._delegate = this; // needed for DND
-
-        this._windowPreviews = new Map();
-
-        let workspaceManager = global.workspace_manager;
-        this._workspace = workspaceManager.get_workspace_by_index(index);
-
-        this._windowAddedId = this._workspace.connect('window-added',
-            (ws, window) => {
-                this._addWindow(window);
-            });
-        this._windowRemovedId = this._workspace.connect('window-removed',
-            (ws, window) => {
-                this._removeWindow(window);
-            });
-        this._restackedId = global.display.connect('restacked',
-            this._onRestacked.bind(this));
-
-        this._workspace.list_windows().forEach(w => this._addWindow(w));
-        this._onRestacked();
-    }
-
-    acceptDrop(source) {
-        if (!source.metaWindow)
-            return false;
-
-        this._moveWindow(source.metaWindow);
-        return true;
-    }
-
-    handleDragOver(source) {
-        if (source.metaWindow)
-            return DND.DragMotionResult.MOVE_DROP;
-        else
-            return DND.DragMotionResult.CONTINUE;
-    }
-
-    _addWindow(window) {
-        if (this._windowPreviews.has(window))
-            return;
-
-        let preview = new WindowPreview(window);
-        preview.connect('clicked', (a, btn) => this.emit('clicked', btn));
-        this._windowPreviews.set(window, preview);
-        this.child.add_child(preview);
-    }
-
-    _removeWindow(window) {
-        let preview = this._windowPreviews.get(window);
-        if (!preview)
-            return;
-
-        this._windowPreviews.delete(window);
-        preview.destroy();
-    }
-
-    _onRestacked() {
-        let lastPreview = null;
-        let windows = global.get_window_actors().map(a => a.meta_window);
-        for (let i = 0; i < windows.length; i++) {
-            let preview = this._windowPreviews.get(windows[i]);
-            if (!preview)
-                continue;
-
-            this.child.set_child_above_sibling(preview, lastPreview);
-            lastPreview = preview;
-        }
-    }
-
-    _moveWindow(window) {
-        let monitorIndex = Main.layoutManager.findIndexForActor(this);
-        if (monitorIndex !== window.get_monitor())
-            window.move_to_monitor(monitorIndex);
-        window.change_workspace_by_index(this._index, false);
-    }
-
-    on_clicked() {
-        let ws = global.workspace_manager.get_workspace_by_index(this._index);
-        if (ws)
-            ws.activate(global.get_current_time());
-    }
-
-    _syncTooltip() {
-        if (this.hover) {
-            this._tooltip.set({
-                text: Meta.prefs_get_workspace_name(this._index),
-                visible: true,
-                opacity: 0,
-            });
-
-            const [stageX, stageY] = this.get_transformed_position();
-            const thumbWidth = this.allocation.get_width();
-            const tipWidth = this._tooltip.width;
-            const tipHeight = this._tooltip.height;
-            const xOffset = Math.floor((thumbWidth - tipWidth) / 2);
-            const monitor = Main.layoutManager.findMonitorForActor(this);
-            const x = Math.clamp(
-                stageX + xOffset,
-                monitor.x,
-                monitor.x + monitor.width - tipWidth);
-            const y = stageY - tipHeight - TOOLTIP_OFFSET;
-            this._tooltip.set_position(x, y);
-        }
-
-        this._tooltip.ease({
-            opacity: this.hover ? 255 : 0,
-            duration: TOOLTIP_ANIMATION_TIME,
-            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-            onComplete: () => (this._tooltip.visible = this.hover),
-        });
-    }
-
-    _onDestroy() {
-        this._tooltip.destroy();
-
-        this._workspace.disconnect(this._windowAddedId);
-        this._workspace.disconnect(this._windowRemovedId);
-        global.display.disconnect(this._restackedId);
-    }
-});
-
-var WorkspaceIndicator = GObject.registerClass(
-class WorkspaceIndicator extends PanelMenu.Button {
-    _init() {
-        super._init(0.0, _('Workspace Indicator'), true);
-        this.setMenu(new PopupMenu.PopupMenu(this, 0.0, St.Side.BOTTOM));
-        this.add_style_class_name('window-list-workspace-indicator');
-        this.remove_style_class_name('panel-button');
-        this.menu.actor.remove_style_class_name('panel-menu');
-
-        let container = new St.Widget({
-            layout_manager: new Clutter.BinLayout(),
-            x_expand: true,
-            y_expand: true,
-        });
-        this.add_actor(container);
-
-        let workspaceManager = global.workspace_manager;
-
-        this._currentWorkspace = workspaceManager.get_active_workspace_index();
-        this._statusLabel = new St.Label({ text: this._getStatusText() });
-
-        this._statusBin = new St.Bin({
-            style_class: 'status-label-bin',
-            x_expand: true,
-            y_expand: true,
-            child: this._statusLabel,
-        });
-        container.add_actor(this._statusBin);
-
-        this._thumbnailsBox = new St.BoxLayout({
-            style_class: 'workspaces-box',
-            y_expand: true,
-            reactive: true,
-        });
-        this._thumbnailsBox.connect('scroll-event',
-            this._onScrollEvent.bind(this));
-        container.add_actor(this._thumbnailsBox);
-
-        this._workspacesItems = [];
-
-        this._workspaceManagerSignals = [
-            workspaceManager.connect('notify::n-workspaces',
-                this._nWorkspacesChanged.bind(this)),
-            workspaceManager.connect_after('workspace-switched',
-                this._onWorkspaceSwitched.bind(this)),
-            workspaceManager.connect('notify::layout-rows',
-                this._updateThumbnailVisibility.bind(this)),
-        ];
-
-        this.connect('scroll-event', this._onScrollEvent.bind(this));
-        this._updateMenu();
-        this._updateThumbnails();
-        this._updateThumbnailVisibility();
-
-        this._settings = new Gio.Settings({ schema_id: 'org.gnome.desktop.wm.preferences' });
-        this._settingsChangedId = this._settings.connect(
-            'changed::workspace-names', this._updateMenuLabels.bind(this));
-    }
-
-    _onDestroy() {
-        for (let i = 0; i < this._workspaceManagerSignals.length; i++)
-            global.workspace_manager.disconnect(this._workspaceManagerSignals[i]);
-
-        if (this._settingsChangedId) {
-            this._settings.disconnect(this._settingsChangedId);
-            this._settingsChangedId = 0;
-        }
-
-        super._onDestroy();
-    }
-
-    _updateThumbnailVisibility() {
-        const { workspaceManager } = global;
-        const vertical = workspaceManager.layout_rows === -1;
-        const useMenu =
-            vertical || workspaceManager.n_workspaces > MAX_THUMBNAILS;
-        this.reactive = useMenu;
-
-        this._statusBin.visible = useMenu;
-        this._thumbnailsBox.visible = !useMenu;
-    }
-
-    _onWorkspaceSwitched() {
-        let workspaceManager = global.workspace_manager;
-        this._currentWorkspace = workspaceManager.get_active_workspace_index();
-
-        this._updateMenuOrnament();
-        this._updateActiveThumbnail();
-
-        this._statusLabel.set_text(this._getStatusText());
-    }
-
-    _nWorkspacesChanged() {
-        this._updateMenu();
-        this._updateThumbnails();
-        this._updateThumbnailVisibility();
-    }
-
-    _updateMenuOrnament() {
-        for (let i = 0; i < this._workspacesItems.length; i++) {
-            this._workspacesItems[i].setOrnament(i === this._currentWorkspace
-                ? PopupMenu.Ornament.DOT
-                : PopupMenu.Ornament.NONE);
-        }
-    }
-
-    _updateActiveThumbnail() {
-        let thumbs = this._thumbnailsBox.get_children();
-        for (let i = 0; i < thumbs.length; i++) {
-            if (i === this._currentWorkspace)
-                thumbs[i].add_style_class_name('active');
-            else
-                thumbs[i].remove_style_class_name('active');
-        }
-    }
-
-    _getStatusText() {
-        let workspaceManager = global.workspace_manager;
-        let current = workspaceManager.get_active_workspace_index();
-        let total = workspaceManager.n_workspaces;
-
-        return '%d / %d'.format(current + 1, total);
-    }
-
-    _updateMenuLabels() {
-        for (let i = 0; i < this._workspacesItems.length; i++) {
-            let item = this._workspacesItems[i];
-            let name = Meta.prefs_get_workspace_name(i);
-            item.label.text = name;
-        }
-    }
-
-    _updateMenu() {
-        let workspaceManager = global.workspace_manager;
-
-        this.menu.removeAll();
-        this._workspacesItems = [];
-        this._currentWorkspace = workspaceManager.get_active_workspace_index();
-
-        for (let i = 0; i < workspaceManager.n_workspaces; i++) {
-            let name = Meta.prefs_get_workspace_name(i);
-            let item = new PopupMenu.PopupMenuItem(name);
-            item.workspaceId = i;
-
-            item.connect('activate', () => {
-                this._activate(item.workspaceId);
-            });
-
-            if (i === this._currentWorkspace)
-                item.setOrnament(PopupMenu.Ornament.DOT);
-
-            this.menu.addMenuItem(item);
-            this._workspacesItems[i] = item;
-        }
-
-        this._statusLabel.set_text(this._getStatusText());
-    }
-
-    _updateThumbnails() {
-        let workspaceManager = global.workspace_manager;
-
-        this._thumbnailsBox.destroy_all_children();
-
-        for (let i = 0; i < workspaceManager.n_workspaces; i++) {
-            let thumb = new WorkspaceThumbnail(i);
-            this._thumbnailsBox.add_actor(thumb);
-        }
-        this._updateActiveThumbnail();
-    }
-
-    _activate(index) {
-        let workspaceManager = global.workspace_manager;
-
-        if (index >= 0 && index < workspaceManager.n_workspaces) {
-            let metaWorkspace = workspaceManager.get_workspace_by_index(index);
-            metaWorkspace.activate(global.get_current_time());
-        }
-    }
-
-    _onScrollEvent(actor, event) {
-        let direction = event.get_scroll_direction();
-        let diff = 0;
-        if (direction === Clutter.ScrollDirection.DOWN)
-            diff = 1;
-        else if (direction === Clutter.ScrollDirection.UP)
-            diff = -1;
-        else
-            return;
-
-        let newIndex = this._currentWorkspace + diff;
-        this._activate(newIndex);
-    }
-});
-
--- a/extensions/windowsNavigator/extension.js
+++ b/extensions/windowsNavigator/extension.js
@@ -1,178 +1,144 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* exported init */
-const { Clutter, Graphene, GObject, St } = imports.gi;
+/* exported enable disable */
+const { Clutter, St } = imports.gi;

 const Main = imports.ui.main;
-const OverviewControls = imports.ui.overviewControls;
 const Workspace = imports.ui.workspace;
 const WorkspacesView = imports.ui.workspacesView;

-const WINDOW_SLOT = 4;
+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;
+    };
+    return origin;
+}

-var MyWorkspace = GObject.registerClass(
-class MyWorkspace extends Workspace.Workspace {
-    _init(...args) {
-        super._init(...args);
+let winInjections, workspaceInjections, workViewInjections, createdActors, connectedSignals;

-        if (this.metaWorkspace && this.metaWorkspace.index() < 9) {
-            this._tip = new St.Label({
-                style_class: 'extension-windowsNavigator-window-tooltip',
-                visible: false,
-            });
-            this.add_actor(this._tip);
+function resetState() {
+    winInjections = {};
+    workspaceInjections = {};
+    workViewInjections = {};
+    createdActors = [];
+    connectedSignals = [];
+}

-            this.connect('notify::scale-x', () => {
-                this._tip.set_scale(1 / this.scale_x, 1 / this.scale_x);
-            });
-        } else {
-            this._tip = null;
-        }
-    }
+function enable() {
+    resetState();

-    vfunc_allocate(box) {
-        super.vfunc_allocate(box);
+    Workspace.WindowOverlay.prototype.showTooltip = function() {
+        this._text.raise_top();
+        this._text.show();
+        this._text.text = (this._windowClone.slotId + 1).toString();
+    };
+    winInjections['showTooltip'] = undefined;

-        if (this._tip)
-            this._tip.allocate_preferred_size(0, 0);
-    }
+    Workspace.WindowOverlay.prototype.hideTooltip = function() {
+        if (this._text && this._text.visible)
+            this._text.hide();
+    };
+    winInjections['hideTooltip'] = undefined;

-    showTooltip() {
-        if (!this._tip)
+    Workspace.Workspace.prototype.showTooltip = function() {
+        if (this._tip == null || this._actualGeometry == null)
            return;
        this._tip.text = (this.metaWorkspace.index() + 1).toString();
+
+        // Hand code this instead of using _getSpacingAndPadding
+        // because that fails on empty workspaces
+        let node = this.actor.get_theme_node();
+        let padding = {
+            left: node.get_padding(St.Side.LEFT),
+            top: node.get_padding(St.Side.TOP),
+            bottom: node.get_padding(St.Side.BOTTOM),
+            right: node.get_padding(St.Side.RIGHT),
+        };
+
+        let area = Workspace.padArea(this._actualGeometry, padding);
+        this._tip.x = area.x;
+        this._tip.y = area.y;
        this._tip.show();
-        this.set_child_below_sibling(this._tip, null);
-    }
+        this._tip.raise_top();
+    };
+    workspaceInjections['showTooltip'] = undefined;

-    hideTooltip() {
-        if (this._tip)
-            this._tip.hide();
-    }
+    Workspace.Workspace.prototype.hideTooltip = function() {
+        if (this._tip == null)
+            return;
+        if (!this._tip.get_parent())
+            return;
+        this._tip.hide();
+    };
+    workspaceInjections['hideTooltip'] = undefined;

-    getWindowWithTooltip(id) {
-        const { layoutManager } = this._container;
-        const slot = layoutManager._windowSlots[id - 1];
-        return slot ? slot[WINDOW_SLOT].metaWindow : null;
-    }
-
-    showWindowsTooltips() {
-        const { layoutManager } = this._container;
-        for (let i = 0; i < layoutManager._windowSlots.length; i++) {
-            if (layoutManager._windowSlots[i])
-                layoutManager._windowSlots[i][WINDOW_SLOT].showTooltip(`${i + 1}`);
+    Workspace.Workspace.prototype.getWindowWithTooltip = function(id) {
+        for (let i = 0; i < this._windows.length; i++) {
+            if ((this._windows[i].slotId + 1) == id)
+                return this._windows[i].metaWindow;
        }
-    }
+        return null;
+    };
+    workspaceInjections['getWindowWithTooltip'] = undefined;

-    hideWindowsTooltips() {
-        const { layoutManager } = this._container;
-        for (let i in layoutManager._windowSlots) {
-            if (layoutManager._windowSlots[i])
-                layoutManager._windowSlots[i][WINDOW_SLOT].hideTooltip();
+    Workspace.Workspace.prototype.showWindowsTooltips = function() {
+        for (let i in this._windowOverlays) {
+            if (this._windowOverlays[i] != null)
+                this._windowOverlays[i].showTooltip();
        }
-    }
+    };
+    workspaceInjections['showWindowsTooltips'] = undefined;

-    // overriding _addWindowClone to apply the tooltip patch on the cloned
-    // windowPreview
-    _addWindowClone(metaWindow) {
-        const clone = super._addWindowClone(metaWindow);
+    Workspace.Workspace.prototype.hideWindowsTooltips = function() {
+        for (let i in this._windowOverlays) {
+            if (this._windowOverlays[i] != null)
+                this._windowOverlays[i].hideTooltip();
+        }
+    };
+    workspaceInjections['hideWindowsTooltips'] = undefined;

-        // appling the tooltip patch
-        (function patchPreview() {
-            this._text = new St.Label({
-                style_class: 'extension-windowsNavigator-window-tooltip',
-                visible: false,
-            });
-
-            this._text.add_constraint(new Clutter.BindConstraint({
-                source: this.windowContainer,
-                coordinate: Clutter.BindCoordinate.POSITION,
-            }));
-            this._text.add_constraint(new Clutter.AlignConstraint({
-                source: this.windowContainer,
-                align_axis: Clutter.AlignAxis.X_AXIS,
-                pivot_point: new Graphene.Point({ x: 0.5, y: -1 }),
-                factor: this._closeButtonSide === St.Side.LEFT ? 1 : 0,
-            }));
-            this._text.add_constraint(new Clutter.AlignConstraint({
-                source: this.windowContainer,
-                align_axis: Clutter.AlignAxis.Y_AXIS,
-                pivot_point: new Graphene.Point({ x: -1, y: 0.5 }),
-                factor: 0,
-            }));
-
-            this.add_child(this._text);
-        }).call(clone);
-
-        clone.showTooltip = function (text) {
-            this._text.set({ text });
-            this._text.show();
-        };
-
-        clone.hideTooltip = function () {
-            if (this._text && this._text.visible)
-                this._text.hide();
-        };
-
-        return clone;
-    }
-});
-
-var MyWorkspacesView = GObject.registerClass(
-class MyWorkspacesView extends WorkspacesView.WorkspacesView {
-    _init(...args) {
-        super._init(...args);
-
-        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));
-    }
-
-    _onDestroy() {
-        super._onDestroy();
-
-        global.stage.disconnect(this._keyPressEventId);
-        global.stage.disconnect(this._keyReleaseEventId);
-    }
-
-    _hideTooltips() {
-        if (global.stage.get_key_focus() === global.stage)
+    WorkspacesView.WorkspacesView.prototype._hideTooltips = function() {
+        if (global.stage.get_key_focus() == global.stage)
            global.stage.set_key_focus(this._prevFocusActor);
        this._pickWindow = false;
        for (let i = 0; i < this._workspaces.length; i++)
            this._workspaces[i].hideWindowsTooltips();
-    }
+    };
+    workViewInjections['_hideTooltips'] = undefined;

-    _hideWorkspacesTooltips() {
+    WorkspacesView.WorkspacesView.prototype._hideWorkspacesTooltips = function() {
        global.stage.set_key_focus(this._prevFocusActor);
        this._pickWorkspace = false;
        for (let i = 0; i < this._workspaces.length; i++)
            this._workspaces[i].hideTooltip();
-    }
+    };
+    workViewInjections['_hideWorkspacesTooltips'] = undefined;

-    _onKeyRelease(s, o) {
+    WorkspacesView.WorkspacesView.prototype._onKeyRelease = function(s, o) {
        if (this._pickWindow &&
-            (o.get_key_symbol() === Clutter.KEY_Alt_L ||
-             o.get_key_symbol() === Clutter.KEY_Alt_R))
+            (o.get_key_symbol() == Clutter.KEY_Alt_L ||
+             o.get_key_symbol() == Clutter.KEY_Alt_R))
            this._hideTooltips();
        if (this._pickWorkspace &&
-            (o.get_key_symbol() === Clutter.KEY_Control_L ||
-             o.get_key_symbol() === Clutter.KEY_Control_R))
+            (o.get_key_symbol() == Clutter.KEY_Control_L ||
+             o.get_key_symbol() == Clutter.KEY_Control_R))
            this._hideWorkspacesTooltips();
-    }
+    };
+    workViewInjections['_onKeyRelease'] = undefined;

-    _onKeyPress(s, o) {
-        const { ControlsState } = OverviewControls;
-        if (this._overviewAdjustment.value !== ControlsState.WINDOW_PICKER)
+    WorkspacesView.WorkspacesView.prototype._onKeyPress = function(s, o) {
+        if (Main.overview.viewSelector._activePage != Main.overview.viewSelector._workspacesPage)
            return false;

        let workspaceManager = global.workspace_manager;

-        if ((o.get_key_symbol() === Clutter.KEY_Alt_L ||
-             o.get_key_symbol() === Clutter.KEY_Alt_R) &&
-            !this._pickWorkspace) {
+        if ((o.get_key_symbol() == Clutter.KEY_Alt_L ||
+             o.get_key_symbol() == Clutter.KEY_Alt_R)
+            && !this._pickWorkspace) {
            this._prevFocusActor = global.stage.get_key_focus();
            global.stage.set_key_focus(null);
            this._active = workspaceManager.get_active_workspace_index();
@@ -180,9 +146,9 @@ class MyWorkspacesView extends WorkspacesView.WorkspacesView {
            this._workspaces[workspaceManager.get_active_workspace_index()].showWindowsTooltips();
            return true;
        }
-        if ((o.get_key_symbol() === Clutter.KEY_Control_L ||
-             o.get_key_symbol() === Clutter.KEY_Control_R) &&
-            !this._pickWindow) {
+        if ((o.get_key_symbol() == Clutter.KEY_Control_L ||
+             o.get_key_symbol() == Clutter.KEY_Control_R)
+            && !this._pickWindow) {
            this._prevFocusActor = global.stage.get_key_focus();
            global.stage.set_key_focus(null);
            this._pickWorkspace = true;
@@ -191,17 +157,17 @@ class MyWorkspacesView extends WorkspacesView.WorkspacesView {
            return true;
        }

-        if (global.stage.get_key_focus() !== global.stage)
+        if (global.stage.get_key_focus() != global.stage)
            return false;

        // ignore shift presses, they're required to get numerals in azerty keyboards
        if ((this._pickWindow || this._pickWorkspace) &&
-            (o.get_key_symbol() === Clutter.KEY_Shift_L ||
-             o.get_key_symbol() === Clutter.KEY_Shift_R))
+            (o.get_key_symbol() == Clutter.KEY_Shift_L ||
+             o.get_key_symbol() == Clutter.KEY_Shift_R))
            return true;

        if (this._pickWindow) {
-            if (this._active !== workspaceManager.get_active_workspace_index()) {
+            if (this._active != workspaceManager.get_active_workspace_index()) {
                this._hideTooltips();
                return false;
            }
@@ -242,29 +208,81 @@ class MyWorkspacesView extends WorkspacesView.WorkspacesView {
            return true;
        }
        return false;
-    }
-});
+    };
+    workViewInjections['_onKeyPress'] = undefined;

-class Extension {
-    constructor() {
-        this._origWorkspace = Workspace.Workspace;
-        this._origWorkspacesView = WorkspacesView.WorkspacesView;
-    }
+    winInjections['_init'] = injectToFunction(Workspace.WindowOverlay.prototype, '_init', function(windowClone, parentActor) {
+        this._id = null;
+        createdActors.push(this._text = new St.Label({ style_class: 'extension-windowsNavigator-window-tooltip' }));
+        this._text.hide();
+        parentActor.add_actor(this._text);
+    });

-    enable() {
-        Workspace.Workspace = MyWorkspace;
-        WorkspacesView.WorkspacesView = MyWorkspacesView;
-    }
+    winInjections['relayout'] = injectToFunction(Workspace.WindowOverlay.prototype, 'relayout', function(_animate) {
+        let [cloneX, cloneY, cloneWidth_, cloneHeight_] = this._windowClone.slot;

-    disable() {
-        Workspace.Workspace = this._origWorkspace;
-        WorkspacesView.WorkspacesView = this._origWorkspacesView;
-    }
+        let textX = cloneX - 2;
+        let textY = cloneY - 2;
+        this._text.set_position(Math.floor(textX) + 5, Math.floor(textY) + 5);
+        this._text.raise_top();
+    });
+
+    workspaceInjections['_init'] = injectToFunction(Workspace.Workspace.prototype, '_init', function(metaWorkspace) {
+        if (metaWorkspace && metaWorkspace.index() < 9) {
+            createdActors.push(this._tip = new St.Label({
+                style_class: 'extension-windowsNavigator-window-tooltip',
+                visible: false
+            }));
+
+            this.actor.add_actor(this._tip);
+            let signalId = this.actor.connect('notify::scale-x', () => {
+                this._tip.set_scale(1 / this.actor.scale_x, 1 / this.actor.scale_x);
+            });
+            connectedSignals.push({ obj: this.actor, id: signalId });
+        } else
+            this._tip = null;
+    });
+
+    workViewInjections['_init'] = injectToFunction(WorkspacesView.WorkspacesView.prototype, '_init', function(_width, _height, _x, _y, _workspaces) {
+        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));
+        connectedSignals.push({ obj: global.stage, id: this._keyPressEventId });
+        connectedSignals.push({ obj: global.stage, id: this._keyReleaseEventId });
+    });
+
+    workViewInjections['_onDestroy'] = injectToFunction(WorkspacesView.WorkspacesView.prototype, '_onDestroy', function() {
+        global.stage.disconnect(this._keyPressEventId);
+        global.stage.disconnect(this._keyReleaseEventId);
+        connectedSignals = [];
+    });
 }

-/**
- * @returns {Extension} - the extension's state object
- */
-function init() {
-    return new Extension();
+function removeInjection(object, injection, name) {
+    if (injection[name] === undefined)
+        delete object[name];
+    else
+        object[name] = injection[name];
+}
+
+function disable() {
+    let i;
+
+    for (i in workspaceInjections)
+        removeInjection(Workspace.Workspace.prototype, workspaceInjections, i);
+    for (i in winInjections)
+        removeInjection(Workspace.WindowOverlay.prototype, winInjections, i);
+    for (i in workViewInjections)
+        removeInjection(WorkspacesView.WorkspacesView.prototype, workViewInjections, i);
+
+    for (i of connectedSignals)
+        i.obj.disconnect(i.id);
+
+    for (i of createdActors)
+        i.destroy();
+
+    resetState();
 }
--- a/extensions/workspace-indicator/extension.js
+++ b/extensions/workspace-indicator/extension.js
@@ -2,306 +2,56 @@
 /* exported init enable disable */

 const { Clutter, Gio, GObject, Meta, St } = imports.gi;
-
-const DND = imports.ui.dnd;
-const ExtensionUtils = imports.misc.extensionUtils;
-const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;

-const _ = ExtensionUtils.gettext;
+const Gettext = imports.gettext.domain('gnome-shell-extensions');
+const _ = Gettext.gettext;
+
+const Main = imports.ui.main;
+
+const ExtensionUtils = imports.misc.extensionUtils;

 const WORKSPACE_SCHEMA = 'org.gnome.desktop.wm.preferences';
 const WORKSPACE_KEY = 'workspace-names';

-const TOOLTIP_OFFSET = 6;
-const TOOLTIP_ANIMATION_TIME = 150;
-
-const MAX_THUMBNAILS = 6;
-
-let WindowPreview = GObject.registerClass(
-class WindowPreview extends St.Button {
-    _init(window) {
-        super._init({
-            style_class: 'workspace-indicator-window-preview',
-        });
-
-        this._delegate = this;
-        DND.makeDraggable(this, { restoreOnSuccess: true });
-
-        this._window = window;
-
-        this.connect('destroy', this._onDestroy.bind(this));
-
-        this._sizeChangedId = this._window.connect('size-changed',
-            () => this.queue_relayout());
-        this._positionChangedId = this._window.connect('position-changed',
-            () => {
-                this._updateVisible();
-                this.queue_relayout();
-            });
-        this._minimizedChangedId = this._window.connect('notify::minimized',
-            this._updateVisible.bind(this));
-
-        this._focusChangedId = global.display.connect('notify::focus-window',
-            this._onFocusChanged.bind(this));
-        this._onFocusChanged();
-    }
-
-    // needed for DND
-    get metaWindow() {
-        return this._window;
-    }
-
-    _onDestroy() {
-        this._window.disconnect(this._sizeChangedId);
-        this._window.disconnect(this._positionChangedId);
-        this._window.disconnect(this._minimizedChangedId);
-        global.display.disconnect(this._focusChangedId);
-    }
-
-    _onFocusChanged() {
-        if (global.display.focus_window === this._window)
-            this.add_style_class_name('active');
-        else
-            this.remove_style_class_name('active');
-    }
-
-    _updateVisible() {
-        const monitor = Main.layoutManager.findIndexForActor(this);
-        const workArea = Main.layoutManager.getWorkAreaForMonitor(monitor);
-        this.visible = this._window.get_frame_rect().overlap(workArea) &&
-            this._window.window_type !== Meta.WindowType.DESKTOP &&
-            this._window.showing_on_its_workspace();
-    }
-});
-
-let WorkspaceLayout = GObject.registerClass(
-class WorkspaceLayout extends Clutter.LayoutManager {
-    vfunc_get_preferred_width() {
-        return [0, 0];
-    }
-
-    vfunc_get_preferred_height() {
-        return [0, 0];
-    }
-
-    vfunc_allocate(container, box) {
-        const monitor = Main.layoutManager.findIndexForActor(container);
-        const workArea = Main.layoutManager.getWorkAreaForMonitor(monitor);
-        const hscale = box.get_width() / workArea.width;
-        const vscale = box.get_height() / workArea.height;
-
-        for (const child of container) {
-            const childBox = new Clutter.ActorBox();
-            const frameRect = child.metaWindow.get_frame_rect();
-            childBox.set_size(
-                Math.round(Math.min(frameRect.width, workArea.width) * hscale),
-                Math.round(Math.min(frameRect.height, workArea.height) * vscale));
-            childBox.set_origin(
-                Math.round((frameRect.x - workArea.x) * hscale),
-                Math.round((frameRect.y - workArea.y) * vscale));
-            child.allocate(childBox);
-        }
-    }
-});
-
-let WorkspaceThumbnail = GObject.registerClass(
-class WorkspaceThumbnail extends St.Button {
-    _init(index) {
-        super._init({
-            style_class: 'workspace',
-            child: new Clutter.Actor({
-                layout_manager: new WorkspaceLayout(),
-                clip_to_allocation: true,
-            }),
-        });
-
-        this._tooltip = new St.Label({
-            style_class: 'dash-label',
-            visible: false,
-        });
-        Main.uiGroup.add_child(this._tooltip);
-
-        this.connect('destroy', this._onDestroy.bind(this));
-        this.connect('notify::hover', this._syncTooltip.bind(this));
-
-        this._index = index;
-        this._delegate = this; // needed for DND
-
-        this._windowPreviews = new Map();
-
-        let workspaceManager = global.workspace_manager;
-        this._workspace = workspaceManager.get_workspace_by_index(index);
-
-        this._windowAddedId = this._workspace.connect('window-added',
-            (ws, window) => {
-                this._addWindow(window);
-            });
-        this._windowRemovedId = this._workspace.connect('window-removed',
-            (ws, window) => {
-                this._removeWindow(window);
-            });
-        this._restackedId = global.display.connect('restacked',
-            this._onRestacked.bind(this));
-
-        this._workspace.list_windows().forEach(w => this._addWindow(w));
-        this._onRestacked();
-    }
-
-    acceptDrop(source) {
-        if (!source.metaWindow)
-            return false;
-
-        this._moveWindow(source.metaWindow);
-        return true;
-    }
-
-    handleDragOver(source) {
-        if (source.metaWindow)
-            return DND.DragMotionResult.MOVE_DROP;
-        else
-            return DND.DragMotionResult.CONTINUE;
-    }
-
-    _addWindow(window) {
-        if (this._windowPreviews.has(window))
-            return;
-
-        let preview = new WindowPreview(window);
-        preview.connect('clicked', (a, btn) => this.emit('clicked', btn));
-        this._windowPreviews.set(window, preview);
-        this.child.add_child(preview);
-    }
-
-    _removeWindow(window) {
-        let preview = this._windowPreviews.get(window);
-        if (!preview)
-            return;
-
-        this._windowPreviews.delete(window);
-        preview.destroy();
-    }
-
-    _onRestacked() {
-        let lastPreview = null;
-        let windows = global.get_window_actors().map(a => a.meta_window);
-        for (let i = 0; i < windows.length; i++) {
-            let preview = this._windowPreviews.get(windows[i]);
-            if (!preview)
-                continue;
-
-            this.child.set_child_above_sibling(preview, lastPreview);
-            lastPreview = preview;
-        }
-    }
-
-    _moveWindow(window) {
-        let monitorIndex = Main.layoutManager.findIndexForActor(this);
-        if (monitorIndex !== window.get_monitor())
-            window.move_to_monitor(monitorIndex);
-        window.change_workspace_by_index(this._index, false);
-    }
-
-    on_clicked() {
-        let ws = global.workspace_manager.get_workspace_by_index(this._index);
-        if (ws)
-            ws.activate(global.get_current_time());
-    }
-
-    _syncTooltip() {
-        if (this.hover) {
-            this._tooltip.set({
-                text: Meta.prefs_get_workspace_name(this._index),
-                visible: true,
-                opacity: 0,
-            });
-
-            const [stageX, stageY] = this.get_transformed_position();
-            const thumbWidth = this.allocation.get_width();
-            const thumbHeight = this.allocation.get_height();
-            const tipWidth = this._tooltip.width;
-            const xOffset = Math.floor((thumbWidth - tipWidth) / 2);
-            const monitor = Main.layoutManager.findMonitorForActor(this);
-            const x = Math.clamp(
-                stageX + xOffset,
-                monitor.x,
-                monitor.x + monitor.width - tipWidth);
-            const y = stageY + thumbHeight + TOOLTIP_OFFSET;
-            this._tooltip.set_position(x, y);
-        }
-
-        this._tooltip.ease({
-            opacity: this.hover ? 255 : 0,
-            duration: TOOLTIP_ANIMATION_TIME,
-            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-            onComplete: () => (this._tooltip.visible = this.hover),
-        });
-    }
-
-    _onDestroy() {
-        this._tooltip.destroy();
-
-        this._workspace.disconnect(this._windowAddedId);
-        this._workspace.disconnect(this._windowRemovedId);
-        global.display.disconnect(this._restackedId);
-    }
-});
-
 let WorkspaceIndicator = GObject.registerClass(
 class WorkspaceIndicator extends PanelMenu.Button {
    _init() {
        super._init(0.0, _('Workspace Indicator'));

-        let container = new St.Widget({
-            layout_manager: new Clutter.BinLayout(),
-            x_expand: true,
-            y_expand: true,
-        });
-        this.add_actor(container);
-
        let workspaceManager = global.workspace_manager;

-        this._currentWorkspace = workspaceManager.get_active_workspace_index();
-        this._statusLabel = new St.Label({
-            style_class: 'panel-workspace-indicator',
+        this._currentWorkspace = workspaceManager.get_active_workspace().index();
+        this.statusLabel = new St.Label({
            y_align: Clutter.ActorAlign.CENTER,
-            text: this._labelText(),
+            text: this._labelText()
        });

-        container.add_actor(this._statusLabel);
+        this.add_actor(this.statusLabel);

-        this._thumbnailsBox = new St.BoxLayout({
-            style_class: 'panel-workspace-indicator-box',
-            y_expand: true,
-            reactive: true,
-        });
-
-        container.add_actor(this._thumbnailsBox);
-
-        this._workspacesItems = [];
+        this.workspacesItems = [];
        this._workspaceSection = new PopupMenu.PopupMenuSection();
        this.menu.addMenuItem(this._workspaceSection);

-        this._workspaceManagerSignals = [
-            workspaceManager.connect_after('notify::n-workspaces',
-                this._nWorkspacesChanged.bind(this)),
-            workspaceManager.connect_after('workspace-switched',
-                this._onWorkspaceSwitched.bind(this)),
-            workspaceManager.connect('notify::layout-rows',
-                this._updateThumbnailVisibility.bind(this)),
-        ];
+        this._workspaceManagerSignals = [];
+        this._workspaceManagerSignals.push(workspaceManager.connect_after('workspace-added',
+                                                                          this._createWorkspacesSection.bind(this)));
+        this._workspaceManagerSignals.push(workspaceManager.connect_after('workspace-removed',
+                                                                          this._createWorkspacesSection.bind(this)));
+        this._workspaceManagerSignals.push(workspaceManager.connect_after('workspace-switched',
+                                                                          this._updateIndicator.bind(this)));

        this.connect('scroll-event', this._onScrollEvent.bind(this));
-        this._thumbnailsBox.connect('scroll-event', this._onScrollEvent.bind(this));
        this._createWorkspacesSection();
-        this._updateThumbnails();
-        this._updateThumbnailVisibility();
+
+        //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._updateMenuLabels.bind(this));
+        this._settingsChangedId =
+            this._settings.connect(`changed::${WORKSPACE_KEY}`,
+                                   this._createWorkspacesSection.bind(this));
    }

    _onDestroy() {
@@ -313,114 +63,53 @@ class WorkspaceIndicator extends PanelMenu.Button {
            this._settingsChangedId = 0;
        }

-        Main.panel.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);
-
        super._onDestroy();
    }

-    _updateThumbnailVisibility() {
-        const { workspaceManager } = global;
-        const vertical = workspaceManager.layout_rows === -1;
-        const useMenu =
-            vertical || workspaceManager.n_workspaces > MAX_THUMBNAILS;
-        this.reactive = useMenu;
+    _updateIndicator() {
+        this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.NONE);
+        this._currentWorkspace = global.workspace_manager.get_active_workspace().index();
+        this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.DOT);

-        this._statusLabel.visible = useMenu;
-        this._thumbnailsBox.visible = !useMenu;
-
-        // Disable offscreen-redirect when showing the workspace switcher
-        // so that clip-to-allocation works
-        Main.panel.set_offscreen_redirect(useMenu
-            ? Clutter.OffscreenRedirect.ALWAYS
-            : Clutter.OffscreenRedirect.AUTOMATIC_FOR_OPACITY);
-    }
-
-    _onWorkspaceSwitched() {
-        this._currentWorkspace = global.workspace_manager.get_active_workspace_index();
-
-        this._updateMenuOrnament();
-        this._updateActiveThumbnail();
-
-        this._statusLabel.set_text(this._labelText());
-    }
-
-    _nWorkspacesChanged() {
-        this._createWorkspacesSection();
-        this._updateThumbnails();
-        this._updateThumbnailVisibility();
-    }
-
-    _updateMenuOrnament() {
-        for (let i = 0; i < this._workspacesItems.length; i++) {
-            this._workspacesItems[i].setOrnament(i === this._currentWorkspace
-                ? PopupMenu.Ornament.DOT
-                : PopupMenu.Ornament.NONE);
-        }
-    }
-
-    _updateActiveThumbnail() {
-        let thumbs = this._thumbnailsBox.get_children();
-        for (let i = 0; i < thumbs.length; i++) {
-            if (i === this._currentWorkspace)
-                thumbs[i].add_style_class_name('active');
-            else
-                thumbs[i].remove_style_class_name('active');
-        }
+        this.statusLabel.set_text(this._labelText());
    }

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

-    _updateMenuLabels() {
-        for (let i = 0; i < this._workspacesItems.length; i++)
-            this._workspacesItems[i].label.text = this._labelText(i);
-    }
-
    _createWorkspacesSection() {
        let workspaceManager = global.workspace_manager;

        this._workspaceSection.removeAll();
-        this._workspacesItems = [];
-        this._currentWorkspace = workspaceManager.get_active_workspace_index();
+        this.workspacesItems = [];
+        this._currentWorkspace = workspaceManager.get_active_workspace().index();

        let i = 0;
        for (; i < workspaceManager.n_workspaces; i++) {
-            this._workspacesItems[i] = new PopupMenu.PopupMenuItem(this._labelText(i));
-            this._workspaceSection.addMenuItem(this._workspacesItems[i]);
-            this._workspacesItems[i].workspaceId = i;
-            this._workspacesItems[i].label_actor = this._statusLabel;
-            this._workspacesItems[i].connect('activate', (actor, _event) => {
+            this.workspacesItems[i] = new PopupMenu.PopupMenuItem(this._labelText(i));
+            this._workspaceSection.addMenuItem(this.workspacesItems[i]);
+            this.workspacesItems[i].workspaceId = i;
+            this.workspacesItems[i].label_actor = this.statusLabel;
+            this.workspacesItems[i].connect('activate', (actor, _event) => {
                this._activate(actor.workspaceId);
            });

-            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());
-    }
-
-    _updateThumbnails() {
-        let workspaceManager = global.workspace_manager;
-
-        this._thumbnailsBox.destroy_all_children();
-
-        for (let i = 0; i < workspaceManager.n_workspaces; i++) {
-            let thumb = new WorkspaceThumbnail(i);
-            this._thumbnailsBox.add_actor(thumb);
-        }
-        this._updateActiveThumbnail();
+        this.statusLabel.set_text(this._labelText());
    }

    _activate(index) {
        let workspaceManager = global.workspace_manager;

-        if (index >= 0 && index < workspaceManager.n_workspaces) {
+        if (index >= 0 && index <  workspaceManager.n_workspaces) {
            let metaWorkspace = workspaceManager.get_workspace_by_index(index);
            metaWorkspace.activate(global.get_current_time());
        }
@@ -429,33 +118,30 @@ class WorkspaceIndicator extends PanelMenu.Button {
    _onScrollEvent(actor, event) {
        let direction = event.get_scroll_direction();
        let diff = 0;
-        if (direction === Clutter.ScrollDirection.DOWN)
+        if (direction == Clutter.ScrollDirection.DOWN) {
            diff = 1;
-        else if (direction === Clutter.ScrollDirection.UP)
+        } else if (direction == Clutter.ScrollDirection.UP) {
            diff = -1;
-        else
+        } else {
            return;
+        }

-
-        let newIndex = global.workspace_manager.get_active_workspace_index() + diff;
+        let newIndex = global.workspace_manager.get_active_workspace().index() + diff;
        this._activate(newIndex);
    }
 });

-/** */
 function init() {
    ExtensionUtils.initTranslations();
 }

 let _indicator;

-/** */
 function enable() {
-    _indicator = new WorkspaceIndicator();
+    _indicator = new WorkspaceIndicator;
    Main.panel.addToStatusArea('workspace-indicator', _indicator);
 }

-/** */
 function disable() {
    _indicator.destroy();
 }
--- a/extensions/workspace-indicator/prefs.js
+++ b/extensions/workspace-indicator/prefs.js
@@ -1,198 +1,212 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
 /* exported init buildPrefsWidget */

-const { Adw, Gio, GLib, GObject, Gtk, Pango } = imports.gi;
+const { Gio, GObject, Gtk } = imports.gi;
+
+const Gettext = imports.gettext.domain('gnome-shell-extensions');
+const _ = Gettext.gettext;
+const N_ = e => e;

 const ExtensionUtils = imports.misc.extensionUtils;

-const _ = ExtensionUtils.gettext;
-const N_ = e => e;
-
 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);
+        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._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));
+    }
+
+    _reloadFromSettings() {
+        if (this._preventChanges)
+            return;
+        this._preventChanges = true;
+
+        let newNames = this._settings.get_strv(WORKSPACE_KEY);
+
+        let i = 0;
+        let [ok, iter] = this.get_iter_first();
+        while (ok && i < newNames.length) {
+            this.set(iter, [this.Columns.LABEL], [newNames[i]]);
+
+            ok = this.iter_next(iter);
+            i++;
+        }
+
+        while (ok)
+            ok = this.remove(iter);
+
+        for ( ; i < newNames.length; i++) {
+            iter = this.append();
+            this.set(iter, [this.Columns.LABEL], [newNames[i]]);
+        }
+
+        this._preventChanges = false;
+    }
+
+    _onRowChanged(self, path, iter) {
+        if (this._preventChanges)
+            return;
+        this._preventChanges = true;
+
+        let index = path.get_indices()[0];
+        let names = this._settings.get_strv(WORKSPACE_KEY);
+
+        if (index >= names.length) {
+            // fill with blanks
+            for (let i = names.length; i <= index; i++)
+                names[i] = '';
+        }
+
+        names[index] = this.get_value(iter, this.Columns.LABEL);
+
+        this._settings.set_strv(WORKSPACE_KEY, names);
+
+        this._preventChanges = false;
+    }
+
+    _onRowInserted(self, path, iter) {
+        if (this._preventChanges)
+            return;
+        this._preventChanges = true;
+
+        let index = path.get_indices()[0];
+        let names = this._settings.get_strv(WORKSPACE_KEY);
+        let label = this.get_value(iter, this.Columns.LABEL) || '';
+        names.splice(index, 0, label);
+
+        this._settings.set_strv(WORKSPACE_KEY, names);
+
+        this._preventChanges = false;
+    }
+
+    _onRowDeleted(self, path) {
+        if (this._preventChanges)
+            return;
+        this._preventChanges = true;
+
+        let index = path.get_indices()[0];
+        let names = this._settings.get_strv(WORKSPACE_KEY);
+
+        if (index >= names.length)
+            return;
+
+        names.splice(index, 1);
+
+        // compact the array
+        for (let i = names.length - 1; i >= 0 && !names[i]; i++)
+            names.pop();
+
+        this._settings.set_strv(WORKSPACE_KEY, names);
+
+        this._preventChanges = false;
+    }
+});
+
 const WorkspaceSettingsWidget = GObject.registerClass(
-class WorkspaceSettingsWidget extends Adw.PreferencesGroup {
-    _init() {
-        super._init({
-            title: _('Workspace Names'),
-        });
+class WorkspaceSettingsWidget extends Gtk.Grid {
+    _init(params) {
+        super._init(params);
+        this.margin = 12;
+        this.orientation = Gtk.Orientation.VERTICAL;

-        this._list = new Gtk.ListBox({
-            selection_mode: Gtk.SelectionMode.NONE,
-            css_classes: ['boxed-list'],
-        });
-        this._list.connect('row-activated', (l, row) => row.edit());
-        this.add(this._list);
-
-        this._list.append(new NewWorkspaceRow());
-
-        this._actionGroup = new Gio.SimpleActionGroup();
-        this._list.insert_action_group('workspaces', this._actionGroup);
-
-        let action;
-        action = new Gio.SimpleAction({ name: 'add' });
-        action.connect('activate', () => {
-            const names = this._settings.get_strv(WORKSPACE_KEY);
-            this._settings.set_strv(WORKSPACE_KEY, [
-                ...names,
-                _('Workspace %d').format(names.length + 1),
-            ]);
-        });
-        this._actionGroup.add_action(action);
-
-        action = new Gio.SimpleAction({
-            name: 'remove',
-            parameter_type: new GLib.VariantType('s'),
-        });
-        action.connect('activate', (a, param) => {
-            const removed = param.deepUnpack();
-            this._settings.set_strv(WORKSPACE_KEY,
-                this._settings.get_strv(WORKSPACE_KEY)
-                    .filter(name => name !== removed));
-        });
-        this._actionGroup.add_action(action);
-
-        action = new Gio.SimpleAction({ name: 'update' });
-        action.connect('activate', () => {
-            const names = this._getWorkspaceRows().map(row => row.name);
-            this._settings.set_strv(WORKSPACE_KEY, names);
-        });
-        this._actionGroup.add_action(action);
-
-        this._settings = new Gio.Settings({
-            schema_id: WORKSPACE_SCHEMA,
-        });
-        this._settings.connect(`changed::${WORKSPACE_KEY}`,
-            this._sync.bind(this));
-        this._sync();
-    }
-
-    _getWorkspaceRows() {
-        return [...this._list].filter(row => row.name);
-    }
-
-    _sync() {
-        const rows = this._getWorkspaceRows();
-
-        const oldNames = rows.map(row => row.name);
-        const newNames = this._settings.get_strv(WORKSPACE_KEY);
-
-        const removed = oldNames.filter(n => !newNames.includes(n));
-        const added = newNames.filter(n => !oldNames.includes(n));
-
-        removed.forEach(n => this._list.remove(rows.find(r => r.name === n)));
-        added.forEach(n => {
-            this._list.insert(new WorkspaceRow(n), newNames.indexOf(n));
-        });
-    }
-});
-
-const WorkspaceRow = GObject.registerClass(
-class WorkspaceRow extends Adw.PreferencesRow {
-    _init(name) {
-        super._init({ name });
-
-        const box = new Gtk.Box({
-            spacing: 12,
-            margin_top: 6,
+        this.add(new Gtk.Label({
+            label: '<b>%s</b>'.format(_('Workspace Names')),
+            use_markup: true,
            margin_bottom: 6,
-            margin_start: 6,
-            margin_end: 6,
-        });
-
-        const label = new Gtk.Label({
            hexpand: true,
-            xalign: 0,
-            max_width_chars: 25,
-            ellipsize: Pango.EllipsizeMode.END,
-        });
-        this.bind_property('name', label, 'label',
-            GObject.BindingFlags.SYNC_CREATE);
-        box.append(label);
-
-        const button = new Gtk.Button({
-            action_name: 'workspaces.remove',
-            action_target: new GLib.Variant('s', name),
-            icon_name: 'edit-delete-symbolic',
-            has_frame: false,
-        });
-        box.append(button);
-
-        this._entry = new Gtk.Entry({
-            max_width_chars: 25,
-        });
-
-        const controller = new Gtk.ShortcutController();
-        controller.add_shortcut(new Gtk.Shortcut({
-            trigger: Gtk.ShortcutTrigger.parse_string('Escape'),
-            action: Gtk.CallbackAction.new(() => {
-                this._stopEdit();
-                return true;
-            }),
+            halign: Gtk.Align.START
        }));
-        this._entry.add_controller(controller);

-        this._stack = new Gtk.Stack();
-        this._stack.add_named(box, 'display');
-        this._stack.add_named(this._entry, 'edit');
-        this.child = this._stack;
+        let scrolled = new Gtk.ScrolledWindow({ shadow_type: Gtk.ShadowType.IN });
+        scrolled.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
+        this.add(scrolled);

-        this._entry.connect('activate', () => {
-            this.name = this._entry.text;
-            this._stopEdit();
-        });
-        this._entry.connect('notify::has-focus', () => {
-            if (this._entry.has_focus)
-                return;
-            this._stopEdit();
+        this._store = new WorkspaceNameModel();
+        this._treeView = new Gtk.TreeView({
+            model: this._store,
+            headers_visible: false,
+            reorderable: true,
+            hexpand: true,
+            vexpand: true
        });

-        this.connect('notify::name', () => {
-            button.action_target = new GLib.Variant('s', this.name);
-            this.activate_action('workspaces.update', null);
+        let column = new Gtk.TreeViewColumn({ title: _('Name') });
+        let renderer = new Gtk.CellRendererText({ editable: true });
+        renderer.connect('edited', this._cellEdited.bind(this));
+        column.pack_start(renderer, true);
+        column.add_attribute(renderer, 'text', this._store.Columns.LABEL);
+        this._treeView.append_column(column);
+
+        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);
+
+        let newButton = new Gtk.ToolButton({ icon_name: 'list-add-symbolic' });
+        newButton.connect('clicked', this._newClicked.bind(this));
+        toolbar.add(newButton);
+
+        let delButton = new Gtk.ToolButton({ icon_name: 'list-remove-symbolic' });
+        delButton.connect('clicked', this._delClicked.bind(this));
+        toolbar.add(delButton);
+
+        let selection = this._treeView.get_selection();
+        selection.connect('changed', () => {
+            delButton.sensitive = selection.count_selected_rows() > 0;
        });
+        delButton.sensitive = selection.count_selected_rows() > 0;
+
+        this.add(toolbar);
    }

-    edit() {
-        this._entry.text = this.name;
-        this._entry.grab_focus();
-        this._stack.visible_child_name = 'edit';
+    _cellEdited(renderer, path, newText) {
+        let [ok, iter] = this._store.get_iter_from_string(path);
+
+        if (ok)
+            this._store.set(iter, [this._store.Columns.LABEL], [newText]);
    }

-    _stopEdit() {
-        this.grab_focus();
-        this._stack.visible_child_name = 'display';
+    _newClicked() {
+        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() {
+        let [any, model_, iter] = this._treeView.get_selection().get_selected();
+
+        if (any)
+            this._store.remove(iter);
    }
 });

-const NewWorkspaceRow = GObject.registerClass(
-class NewWorkspaceRow extends Adw.PreferencesRow {
-    _init() {
-        super._init({
-            action_name: 'workspaces.add',
-            child: new Gtk.Image({
-                icon_name: 'list-add-symbolic',
-                pixel_size: 16,
-                margin_top: 12,
-                margin_bottom: 12,
-                margin_start: 12,
-                margin_end: 12,
-            }),
-        });
-        this.update_property(
-            [Gtk.AccessibleProperty.LABEL], [_('Add Workspace')]);
-    }
-});
-
-/** */
 function init() {
    ExtensionUtils.initTranslations();
 }

-/**
- * @returns {Gtk.Widget} - the prefs widget
- */
 function buildPrefsWidget() {
-    return new WorkspaceSettingsWidget();
+    let widget = new WorkspaceSettingsWidget();
+    widget.show_all();
+
+    return widget;
 }
--- a/extensions/workspace-indicator/stylesheet.css
+++ b/extensions/workspace-indicator/stylesheet.css
@@ -1,28 +1,5 @@
 .panel-workspace-indicator {
-  padding: 0 8px;
-}
-
-.panel-workspace-indicator-box {
-  padding: 4px 0;
-  spacing: 4px;
-}
-
-.panel-workspace-indicator-box .workspace {
-  width: 40px;
-  border: 2px solid #000;
-  border-radius: 2px;
-  background-color: #595959;
-}
-
-.panel-workspace-indicator-box .workspace.active {
-  border-color: #fff;
-}
-
-.workspace-indicator-window-preview {
-  background-color: #bebebe;
-  border: 1px solid #828282;
-}
-
-.workspace-indicator-window-preview.active {
-  background-color: #d4d4d4;
+	padding: 0 8px;
+	background-color: rgba(200, 200, 200, .5);
+	border: 1px solid #cccccc;
 }
--- a/gnome-shell-extensions.doap
+++ b/gnome-shell-extensions.doap
@@ -34,10 +34,4 @@ and will be picked automatically at next login.
      <gnome:userid>fmuellner</gnome:userid>
    </foaf:Person>
  </maintainer>
-  <maintainer>
-    <foaf:Person>
-      <foaf:name>Marge Bot</foaf:name>
-      <gnome:userid>marge-bot</gnome:userid>
-    </foaf:Person>
-  </maintainer>
 </Project>
--- a/lint/eslintrc-gjs.json
+++ b/lint/eslintrc-gjs.json
@@ -0,0 +1,130 @@
+{
+    "env": {
+        "es6": true
+    },
+    "extends": "eslint:recommended",
+    "rules": {
+        "array-bracket-newline": [
+            "error",
+            "consistent"
+        ],
+        "array-bracket-spacing": [
+            "error",
+            "never"
+        ],
+        "arrow-spacing": "error",
+        "brace-style": "error",
+        "comma-spacing": [
+            "error",
+            {
+                "before": false,
+                "after": true
+            }
+        ],
+        "indent": [
+            "error",
+            4,
+            {
+                "ignoredNodes": [
+                    "CallExpression[callee.object.name=GObject][callee.property.name=registerClass] > ClassExpression:first-child"
+                ],
+                "MemberExpression": "off"
+            }
+        ],
+        "key-spacing": [
+            "error",
+            {
+                "beforeColon": false,
+                "afterColon": true
+            }
+        ],
+        "keyword-spacing": [
+            "error",
+            {
+                "before": true,
+                "after": true
+            }
+        ],
+        "linebreak-style": [
+            "error",
+            "unix"
+        ],
+        "no-empty": [
+            "error",
+            {
+                "allowEmptyCatch": true
+            }
+        ],
+        "no-implicit-coercion": [
+            "error",
+            {
+                "allow": ["!!"]
+            }
+        ],
+        "no-restricted-properties": [
+            "error",
+            {
+                "object": "Lang",
+                "property": "bind",
+                "message": "Use arrow notation or Function.prototype.bind()"
+            },
+            {
+                "object": "Lang",
+                "property": "Class",
+                "message": "Use ES6 classes"
+            }
+        ],
+        "nonblock-statement-body-position": [
+            "error",
+            "below"
+        ],
+        "object-curly-newline": [
+            "error",
+            {
+                "consistent": true
+            }
+        ],
+        "object-curly-spacing": "error",
+        "prefer-template": "error",
+        "quotes": [
+            "error",
+            "single",
+            {
+                "avoidEscape": true
+            }
+        ],
+        "semi": [
+            "error",
+            "always"
+        ],
+        "semi-spacing": [
+            "error",
+            {
+                "before": false,
+                "after": true
+            }
+        ],
+        "space-before-blocks": "error",
+        "space-infix-ops": [
+            "error",
+            {
+                "int32Hint": false
+            }
+        ]
+    },
+    "globals": {
+        "ARGV": false,
+        "Debugger": false,
+        "GIRepositoryGType": false,
+        "imports": false,
+        "Intl": false,
+        "log": false,
+        "logError": false,
+        "print": false,
+        "printerr": false,
+        "window": false
+    },
+    "parserOptions": {
+        "ecmaVersion": 2017
+    }
+}
--- a/lint/eslintrc-gjs.yml
+++ b/lint/eslintrc-gjs.yml
@@ -1,263 +0,0 @@
---
-# SPDX-License-Identifier: MIT OR LGPL-2.0-or-later
-# SPDX-FileCopyrightText: 2018 Claudio André <claudioandre.br@gmail.com>
-env:
-  es6: true
-  es2020: true
-extends: 'eslint:recommended'
-plugins:
-  - jsdoc
-rules:
-  array-bracket-newline:
-    - error
-    - consistent
-  array-bracket-spacing:
-    - error
-    - never
-  array-callback-return: error
-  arrow-parens:
-    - error
-    - as-needed
-  arrow-spacing: error
-  block-scoped-var: error
-  block-spacing: error
-  brace-style: error
-  # Waiting for this to have matured a bit in eslint
-  # camelcase:
-  #   - error
-  #   - properties: never
-  #     allow: [^vfunc_, ^on_, _instance_init]
-  comma-dangle:
-    - error
-    - arrays: always-multiline
-      objects: always-multiline
-      functions: never
-  comma-spacing:
-    - error
-    - before: false
-      after: true
-  comma-style:
-    - error
-    - last
-  computed-property-spacing: error
-  curly:
-    - error
-    - multi-or-nest
-    - consistent
-  dot-location:
-    - error
-    - property
-  eol-last: error
-  eqeqeq: error
-  func-call-spacing: error
-  func-name-matching: error
-  func-style:
-    - error
-    - declaration
-    - allowArrowFunctions: true
-  indent:
-    - error
-    - 4
-    - ignoredNodes:
-      # Allow not indenting the body of GObject.registerClass, since in the
-      # future it's intended to be a decorator
-      - 'CallExpression[callee.object.name=GObject][callee.property.name=registerClass] > ClassExpression:first-child'
-      # Allow dedenting chained member expressions
-      MemberExpression: 'off'
-  jsdoc/check-alignment: error
-  jsdoc/check-param-names: error
-  jsdoc/check-tag-names: error
-  jsdoc/check-types: error
-  jsdoc/implements-on-classes: error
-  jsdoc/newline-after-description: error
-  jsdoc/require-jsdoc: error
-  jsdoc/require-param: error
-  jsdoc/require-param-description: error
-  jsdoc/require-param-name: error
-  jsdoc/require-param-type: error
-  key-spacing:
-    - error
-    - beforeColon: false
-      afterColon: true
-  keyword-spacing:
-    - error
-    - before: true
-      after: true
-  linebreak-style:
-    - error
-    - unix
-  lines-between-class-members: error
-  max-nested-callbacks: error
-  max-statements-per-line: error
-  new-parens: error
-  no-array-constructor: error
-  no-await-in-loop: error
-  no-caller: error
-  no-constant-condition:
-    - error
-    - checkLoops: false
-  no-div-regex: error
-  no-empty:
-    - error
-    - allowEmptyCatch: true
-  no-extra-bind: error
-  no-extra-parens:
-    - error
-    - all
-    - conditionalAssign: false
-      nestedBinaryExpressions: false
-      returnAssign: false
-  no-implicit-coercion:
-    - error
-    - allow:
-      - '!!'
-  no-invalid-this: error
-  no-iterator: error
-  no-label-var: error
-  no-lonely-if: error
-  no-loop-func: error
-  no-nested-ternary: error
-  no-new-object: error
-  no-new-wrappers: error
-  no-octal-escape: error
-  no-proto: error
-  no-prototype-builtins: 'off'
-  no-restricted-globals: [error, window]
-  no-restricted-properties:
-    - error
-    - object: imports
-      property: format
-      message: Use template strings
-    - object: pkg
-      property: initFormat
-      message: Use template strings
-    - object: Lang
-      property: copyProperties
-      message: Use Object.assign()
-    - object: Lang
-      property: bind
-      message: Use arrow notation or Function.prototype.bind()
-    - object: Lang
-      property: Class
-      message: Use ES6 classes
-  no-restricted-syntax:
-    - error
-    - selector: >-
-        MethodDefinition[key.name="_init"] >
-        FunctionExpression[params.length=1] >
-        BlockStatement[body.length=1]
-        CallExpression[arguments.length=1][callee.object.type="Super"][callee.property.name="_init"] >
-        Identifier:first-child
-      message: _init() that only calls super._init() is unnecessary
-    - selector: >-
-        MethodDefinition[key.name="_init"] >
-        FunctionExpression[params.length=0] >
-        BlockStatement[body.length=1]
-        CallExpression[arguments.length=0][callee.object.type="Super"][callee.property.name="_init"]
-      message: _init() that only calls super._init() is unnecessary
-    - selector: BinaryExpression[operator="instanceof"][right.name="Array"]
-      message: Use Array.isArray()
-  no-return-assign: error
-  no-return-await: error
-  no-self-compare: error
-  no-shadow: error
-  no-shadow-restricted-names: error
-  no-spaced-func: error
-  no-tabs: error
-  no-template-curly-in-string: error
-  no-throw-literal: error
-  no-trailing-spaces: error
-  no-undef-init: error
-  no-unneeded-ternary: error
-  no-unused-expressions: error
-  no-unused-vars:
-    - error
-    # Vars use a suffix _ instead of a prefix because of file-scope private vars
-    - varsIgnorePattern: (^unused|_$)
-      argsIgnorePattern: ^(unused|_)
-  no-useless-call: error
-  no-useless-computed-key: error
-  no-useless-concat: error
-  no-useless-constructor: error
-  no-useless-rename: error
-  no-useless-return: error
-  no-whitespace-before-property: error
-  no-with: error
-  nonblock-statement-body-position:
-    - error
-    - below
-  object-curly-newline:
-    - error
-    - consistent: true
-      multiline: true
-  object-curly-spacing: error
-  object-shorthand: error
-  operator-assignment: error
-  operator-linebreak: error
-  padded-blocks:
-    - error
-    - never
-  # These may be a bit controversial, we can try them out and enable them later
-  # prefer-const: error
-  # prefer-destructuring: error
-  prefer-numeric-literals: error
-  prefer-promise-reject-errors: error
-  prefer-rest-params: error
-  prefer-spread: error
-  prefer-template: error
-  quotes:
-    - error
-    - single
-    - avoidEscape: true
-  require-await: error
-  rest-spread-spacing: error
-  semi:
-    - error
-    - always
-  semi-spacing:
-    - error
-    - before: false
-      after: true
-  semi-style: error
-  space-before-blocks: error
-  space-before-function-paren:
-    - error
-    - named: never
-      # for `function ()` and `async () =>`, preserve space around keywords
-      anonymous: always
-      asyncArrow: always
-  space-in-parens: error
-  space-infix-ops:
-    - error
-    - int32Hint: false
-  space-unary-ops: error
-  spaced-comment: error
-  switch-colon-spacing: error
-  symbol-description: error
-  template-curly-spacing: error
-  template-tag-spacing: error
-  unicode-bom: error
-  wrap-iife:
-    - error
-    - inside
-  yield-star-spacing: error
-  yoda: error
-settings:
-  jsdoc:
-    mode: typescript
-globals:
-  ARGV: readonly
-  Debugger: readonly
-  GIRepositoryGType: readonly
-  globalThis: readonly
-  imports: readonly
-  Intl: readonly
-  log: readonly
-  logError: readonly
-  print: readonly
-  printerr: readonly
-  window: readonly
-  TextEncoder: readonly
-  TextDecoder: readonly
-parserOptions:
-  ecmaVersion: 2020
--- a/lint/eslintrc-legacy.json
+++ b/lint/eslintrc-legacy.json
@@ -0,0 +1,16 @@
+{
+    "rules": {
+        "indent": [
+            "error",
+            4,
+            {
+                "ignoredNodes": [
+                    "CallExpression > ArrowFunctionExpression",
+                    "CallExpression[callee.object.name=GObject][callee.property.name=registerClass] > ClassExpression:first-child"
+                ],
+                "CallExpression": { "arguments": "first" },
+                "MemberExpression": "off"
+            }
+        ]
+   }
+}
--- a/lint/eslintrc-shell.json
+++ b/lint/eslintrc-shell.json
@@ -0,0 +1,30 @@
+{
+    "rules": {
+        "camelcase": [
+            "error",
+            {
+                "properties": "never",
+                "allow": ["^vfunc_"]
+            }
+        ],
+        "no-unused-vars": [
+            "error",
+            {
+                "argsIgnorePattern": "^_",
+                "varsIgnorePattern": "_$"
+            }
+        ],
+        "object-curly-spacing": [
+            "error",
+            "always"
+        ],
+        "prefer-arrow-callback": "error"
+    },
+    "globals": {
+        "global": false,
+        "_": false,
+        "C_": false,
+        "N_": false,
+        "ngettext": false
+    }
+}
--- a/lint/eslintrc-shell.yml
+++ b/lint/eslintrc-shell.yml
@@ -1,11 +0,0 @@
-rules:
-  camelcase:
-    - error
-    - properties: never
-      allow: [^vfunc_, ^on_]
-  object-curly-spacing:
-    - error
-    - always
-  prefer-arrow-callback: error
-globals:
-  global: readonly
--- a/lint/generate-report.sh
+++ b/lint/generate-report.sh
@@ -0,0 +1,61 @@
+#!/bin/sh
+SEP=`printf '\t'`
+OUTPUT=/dev/stderr
+CWD=`pwd`
+SRCDIR=`dirname $0`
+
+run_lint() {
+  eslint -f unix "$@" .
+}
+
+parse_opts() {
+  tmp=`getopt -l output: o: "$@"`
+  [ $? -ne 0 ] && exit 1
+
+  eval set -- $tmp
+  while true
+  do
+    case $1 in
+      --output|-o)
+        OUTPUT=`realpath $2`; shift 2; continue ;;
+      --)
+        shift; break ;;
+    esac
+  done
+}
+
+# delete lines that don't start with '/',
+# replace the first space with tab, sort
+process_for_join() {
+  sed -E "/\//!d; s|(\S+)\s|\1$SEP|" | sort -k 1b,1
+}
+
+# re-replace tab with space
+process_post_join() {
+  sed -E "s|$SEP| |"
+}
+
+create_report() {
+  tmp1=`mktemp --tmpdir lint-XXXX`
+  run_lint | process_for_join > $tmp1
+
+  tmp2=`mktemp --tmpdir lint-XXXX`
+  run_lint -c lint/eslintrc-legacy.json | process_for_join > $tmp2
+
+  join -t"$SEP" -o '0,1.2' $tmp1 $tmp2 | process_post_join
+  rm $tmp1 $tmp2
+}
+
+
+parse_opts "$@"
+
+cd $SRCDIR/..
+
+create_report | tee $OUTPUT | grep -q .
+rv=$(( $? == 0 ))
+
+cd $CWD
+
+[ $rv -eq 0 -a -f $OUTPUT ] && rm $OUTPUT
+
+exit $rv
--- a/meson.build
+++ b/meson.build
@@ -1,12 +1,11 @@
 project('gnome-shell-extensions',
-  version: '42.beta',
-  meson_version: '>= 0.53.0',
+  version: '3.32.0',
+  meson_version: '>= 0.44.0',
  license: 'GPL2+'
 )

 gettext_domain = meson.project_name()

-fs = import('fs')
 gnome = import('gnome')
 i18n = import('i18n')

@@ -20,10 +19,15 @@ 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')
-wlsessiondir = join_paths(datadir, 'wayland-sessions')
+
+js60 = find_program('js60', required: false)

 ver_arr = meson.project_version().split('.')
-shell_version = ver_arr[0]
+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'

@@ -83,17 +87,9 @@ foreach e : enabled_extensions
 endforeach

 if classic_mode_enabled
+  sassc = find_program('sassc', required: true)
  subdir('data')
-  meson.add_install_script(
-    'meson/session-post-install.py',
-    join_paths(get_option('prefix'), datadir)
-  )
 endif

 subdir('extensions')
 subdir('po')
-
-meson.add_dist_script('meson/generate-stylesheets.py')
-meson.add_dist_script('meson/check-version.py',
-  meson.project_version(),
-  'NEWS')
--- a/meson/check-version.py
+++ b/meson/check-version.py
@@ -1,32 +0,0 @@
-#!/usr/bin/env python3
-
-import os, sys
-from pathlib import Path
-import argparse, subprocess
-
-def check_version(version, file, type='news'):
-    if type == 'news':
-        line = file.open().readline()
-        ok = line.startswith(version)
-        print("{}: {}".format(file, "OK" if ok else "FAILED"))
-        if not ok:
-            raise Exception("{} does not start with {}".format(file, version))
-    elif type == 'metainfo':
-        subprocess.run(['appstream-util', 'validate-version', file, version],
-                       check=True)
-    else:
-        raise Exception('Not implemented')
-
-parser = argparse.ArgumentParser(description='Check release version information.')
-parser.add_argument('--type', choices=['metainfo','news'], default='news')
-parser.add_argument('version', help='the version to check for')
-parser.add_argument('files', nargs='+', help='files to check')
-args = parser.parse_args()
-
-distroot = os.environ.get('MESON_DIST_ROOT', './')
-
-try:
-    for file in args.files:
-        check_version(args.version, Path(distroot, file), args.type)
-except:
-    sys.exit(1)
--- a/meson/generate-stylesheets.py
+++ b/meson/generate-stylesheets.py
@@ -1,13 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-from pathlib import PurePath
-import subprocess
-
-sourceroot = os.environ.get('MESON_SOURCE_ROOT')
-distroot = os.environ.get('MESON_DIST_ROOT')
-
-stylesheet_path = PurePath('data/gnome-classic.css')
-src = PurePath(sourceroot, stylesheet_path.with_suffix('.scss'))
-dst = PurePath(distroot, stylesheet_path)
-subprocess.run(['sassc', '-a', src, dst], check=True)
--- a/meson/session-post-install.py
+++ b/meson/session-post-install.py
@@ -1,20 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import shutil
-import sys
-
-if os.environ.get('DESTDIR'):
-  install_root = os.environ.get('DESTDIR') + os.path.abspath(sys.argv[1])
-else:
-  install_root = sys.argv[1]
-
-# FIXME: Meson is unable to copy a generated target file:
-#        https://groups.google.com/forum/#!topic/mesonbuild/3iIoYPrN4P0
-dst_dir = os.path.join(install_root, 'wayland-sessions')
-if not os.path.exists(dst_dir):
-  os.makedirs(dst_dir)
-
-src = os.path.join(install_root, 'xsessions', 'gnome-classic.desktop')
-dst = os.path.join(dst_dir, 'gnome-classic.desktop')
-shutil.copyfile(src, dst)
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,4 +1,3 @@
-ab
 af
 an
 ar
@@ -33,14 +32,12 @@ id
 is
 it
 ja
-kab
 kk
 km
 kn
 ko
 lt
 lv
-mjw
 ml
 mr
 ms
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,5 @@
 data/gnome-classic.desktop.in
-data/gnome-classic-wayland.desktop.in
-data/gnome-classic-xorg.desktop.in
+data/gnome-classic.session.desktop.in
 extensions/apps-menu/extension.js
 extensions/auto-move-windows/extension.js
 extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml
@@ -11,11 +10,11 @@ extensions/native-window-placement/org.gnome.shell.extensions.native-window-plac
 extensions/places-menu/extension.js
 extensions/places-menu/placeDisplay.js
 extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml
+extensions/user-theme/extension.js
 extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml
 extensions/window-list/extension.js
 extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml
 extensions/window-list/prefs.js
-extensions/window-list/workspaceIndicator.js
 extensions/windowsNavigator/extension.js
 extensions/workspace-indicator/extension.js
 extensions/workspace-indicator/prefs.js
--- a/po/ab.po
+++ b/po/ab.po
@@ -1,261 +0,0 @@
-# Abkhazian translation for gnome-shell-extensions.
-# Copyright (C) 2022 gnome-shell-extensions's COPYRIGHT HOLDER
-# This file is distributed under the same license as the gnome-shell-extensions package.
-# Нанба Наала <naala-nanba@rambler.ru>, 2022.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell-extensions main\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
-"issues\n"
-"POT-Creation-Date: 2022-02-12 02:08+0000\n"
-"PO-Revision-Date: 2022-02-12 02:08+0000\n"
-"Last-Translator: Нанба Наала <naala-nanba@rambler.ru>, 2022\n"
-"Language-Team: Abkhazian <ab@li.org>\n"
-"Language: ab\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: data/gnome-classic.desktop.in:3
-msgid "GNOME Classic"
-msgstr "Аклассикатә GNOME"
-
-#: data/gnome-classic.desktop.in:4 data/gnome-classic-wayland.desktop.in:4
-#: data/gnome-classic-xorg.desktop.in:4
-msgid "This session logs you into GNOME Classic"
-msgstr "Ари асеанс аклассикатә усуратә еишәа GNOME хархәагас иамоуп "
-
-#: data/gnome-classic-wayland.desktop.in:3
-msgid "GNOME Classic on Wayland"
-msgstr "Аклассикатә GNOME Wayland аҟны"
-
-#: data/gnome-classic-xorg.desktop.in:3
-msgid "GNOME Classic on Xorg"
-msgstr "Аклассикатә GNOME Xorg аҟны"
-
-#: extensions/apps-menu/extension.js:112
-msgid "Favorites"
-msgstr "Иалкаау"
-
-#: extensions/apps-menu/extension.js:370
-msgid "Applications"
-msgstr "Аԥшьқәа"
-
-#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
-msgid "Application and workspace list"
-msgstr "Аԥшьи аусуратә ҵакырақәа рыхьӡынҵеи"
-
-#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:7
-msgid ""
-"A list of strings, each containing an application id (desktop file name), "
-"followed by a colon and the workspace number"
-msgstr "Ацәаҳәақәа рыхьӡынҵа аиԥшрагәаҭага аԥшьы (desktop-фаил ахьӡ )"
-"змоу, зашьҭахь ҩ-кәаԥки аусуратә ҭыԥ аномери гылоу "
-
-#: extensions/auto-move-windows/prefs.js:19
-msgid "Workspace Rules"
-msgstr "Аусуратә ҵакыра аԥҟаррақәа"
-
-#: extensions/auto-move-windows/prefs.js:245
-msgid "Add Rule"
-msgstr "Аԥҟара ацҵара"
-
-#. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:123
-#: extensions/places-menu/placeDisplay.js:210
-#, javascript-format
-msgid "Ejecting drive “%s” failed:"
-msgstr "Адиск «%s» аҭыгара залымшахеит:"
-
-#: extensions/drive-menu/extension.js:139
-msgid "Removable devices"
-msgstr "Иаҿыҵуа аиҿартәырақәа"
-
-#: extensions/drive-menu/extension.js:161
-msgid "Open Files"
-msgstr "Афаил аартра"
-
-#: 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 "Шәхы иашәырхәа изыцҵоу аекран аҵакыра аминиатиура атыԥаркразы"
-"аекран аганқәа реизышәара ԥсахуа аҭыԥыркра шәыржәпала, анаҩс адаԥа ҳәаақәызҵо ашәагаа архәыҷразы"
-"ари ахышәара ахархәара аиуоит аминиатиура «natural» аҭыԥыркра алгоритм  ахархәараан"
-
-#: 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 "Иалхзар, ахқәа аминиатиура хыхьтәи ахәҭаҟны аҭыԥ ааныркылалоит"
-"(ишыҟоу еиԥш ахқәа ҵаҟатәи аҭыԥ ааныркылоит).Ари ахышәара аԥсахраан,"
-"уи аус аура иалагарцазы, иаҭахуп Shell аиҭарура."
-
-#: extensions/places-menu/extension.js:88
-#: extensions/places-menu/extension.js:91
-msgid "Places"
-msgstr "Аҭыԥқәа"
-
-#: extensions/places-menu/placeDisplay.js:49
-#, javascript-format
-msgid "Failed to launch “%s”"
-msgstr " «%s» аус арура залшом"
-
-#: extensions/places-menu/placeDisplay.js:64
-#, javascript-format
-msgid "Failed to mount volume for “%s”"
-msgstr "Иамоуӡит атом аибыҭара «%s» азы"
-
-#: extensions/places-menu/placeDisplay.js:125
-#: extensions/places-menu/placeDisplay.js:148
-msgid "Computer"
-msgstr "Акомпиутер"
-
-#: extensions/places-menu/placeDisplay.js:336
-msgid "Home"
-msgstr "Аҩнытәи аҭаӡ"
-
-#: extensions/places-menu/placeDisplay.js:381
-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:72
-msgid "Close"
-msgstr "Аркра"
-
-#: extensions/window-list/extension.js:92
-msgid "Unminimize"
-msgstr "Архынҳәра"
-
-#: extensions/window-list/extension.js:92
-msgid "Minimize"
-msgstr "Аиҟәырҳәра"
-
-#: extensions/window-list/extension.js:99
-msgid "Unmaximize"
-msgstr "Аиҭашьақәыргылара"
-
-#: extensions/window-list/extension.js:99
-msgid "Maximize"
-msgstr "Аиҵыхра"
-
-#: extensions/window-list/extension.js:434
-msgid "Minimize all"
-msgstr "Зегьы реиҟәырҳәра"
-
-#: extensions/window-list/extension.js:440
-msgid "Unminimize all"
-msgstr "Зегьы рырхынҳәра"
-
-#: extensions/window-list/extension.js:446
-msgid "Maximize all"
-msgstr "Зегьы реиҵыхра"
-
-#: extensions/window-list/extension.js:454
-msgid "Unmaximize all"
-msgstr "Зегьы реиҭашьақәыргылара"
-
-#: extensions/window-list/extension.js:462
-msgid "Close all"
-msgstr "Зегьы рыркра"
-
-#: extensions/window-list/extension.js:741
-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
-#: extensions/window-list/prefs.js:76
-msgid "Show windows from all workspaces"
-msgstr "Аҵакырақәа зегьы рҟынтә аԥенџьырқәа раарԥшра"
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
-msgid "Whether to show windows from all workspaces or only the current one."
-msgstr 
-"Аԥенџьырқәа рыхьӡынҵа аусуратә ҵакырақәа зегь рҟынтә акәу,мамзар уажәтәи аҟынтә акәу ишаарԥшлатәу"
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:27
-msgid "Show the window list on all monitors"
-msgstr "Аԥенџьырқәа рыхьӡынҵа амониторқәа зегьы рҟны рырбара"
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:28
-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:37
-msgid "Never group windows"
-msgstr "Ахаангьы аԥенџьырқәа реидмыргәыԥлара"
-
-#: extensions/window-list/prefs.js:38
-msgid "Group windows when space is limited"
-msgstr "Аҭыԥ маҷхазар, аԥенџьырқәа еидшәыргәыԥла"
-
-#: extensions/window-list/prefs.js:39
-msgid "Always group windows"
-msgstr "Еснагь аԥенџьырқәа реидыргәыԥлара"
-
-#: extensions/window-list/prefs.js:63
-msgid "Show on all monitors"
-msgstr "Амониторқәа зегьы рҟны рырбара"
-
-#: extensions/window-list/workspaceIndicator.js:249
-#: extensions/workspace-indicator/extension.js:254
-msgid "Workspace Indicator"
-msgstr "Аусуратә ҵакыра аиндикатор"
-
-#: extensions/workspace-indicator/prefs.js:18
-msgid "Workspace Names"
-msgstr "Аусуратә ҵакырақәа рыхьӡқәа"
-
-#: extensions/workspace-indicator/prefs.js:39
-#, javascript-format
-msgid "Workspace %d"
-msgstr "Аусуратә ҵакыра %d"
-
-#: extensions/workspace-indicator/prefs.js:184
-msgid "Add Workspace"
-msgstr "Аусуратә ҵакыра ацҵара"
--- a/po/be.po
+++ b/po/be.po
@@ -6,11 +6,11 @@
 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: 2021-01-20 23:03+0000\n"
-"PO-Revision-Date: 2021-01-24 15:33+0300\n"
-"Last-Translator: Launchpad translators\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"shell&keywords=I18N+L10N&component=extensions\n"
+"POT-Creation-Date: 2017-08-19 16:41+0000\n"
+"PO-Revision-Date: 2017-09-01 17:56+0300\n"
+"Last-Translator: Yuras Shumovich <shumovichy@gmail.com>\n"
 "Language-Team: Belarusian <i18n-bel-gnome@googlegroups.com>\n"
 "Language: be\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +18,9 @@ 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.4.2\n"
+"X-Generator: Poedit 1.8.11\n"

-#: data/gnome-classic.desktop.in:3
+#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
 msgid "GNOME Classic"
 msgstr "Класічны GNOME"

@@ -28,69 +28,171 @@ msgstr "Класічны GNOME"
 msgid "This session logs you into GNOME Classic"
 msgstr "Гэты сеанс выкарыстоўвае класічны GNOME"

-#: extensions/apps-menu/extension.js:113
-msgid "Favorites"
-msgstr "Абраныя"
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:7
+msgid "Attach modal dialog to the parent window"
+msgstr "Прымацаваць мадальны дыялог да бацькоўскага акна"

-#: extensions/apps-menu/extension.js:369
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:8
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:25
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:33
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:41
+msgid ""
+"This key overrides the key in org.gnome.mutter when running GNOME Shell."
+msgstr "Гэты ключ засланяе ключ у org.gnome.mutter калі запушчаны GNOME Shell."
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
+msgid "Arrangement of buttons on the titlebar"
+msgstr "Парадак кнопак у загалоўнай стужцы"
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:17
+msgid ""
+"This key overrides the key in org.gnome.desktop.wm.preferences when running "
+"GNOME Shell."
+msgstr ""
+"Гэты ключ засланяе ключ у org.gnome.desktop.wm.preferences калі запушчаны "
+"GNOME Shell."
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:24
+msgid "Enable edge tiling when dropping windows on screen edges"
+msgstr "Аўтаматычна змяняць памеры акна пры перамяшчэнні да края экрана"
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:32
+msgid "Workspaces only on primary monitor"
+msgstr "Працоўныя прасторы толькі на асноўным маніторы"
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:40
+msgid "Delay focus changes in mouse mode until the pointer stops moving"
+msgstr "Затрымліваць змяненні фокуса ў рэжыме мышы да спынення паказальніка"
+
+#: extensions/alternate-tab/prefs.js:20
+msgid "Thumbnail only"
+msgstr "Толькі мініяцюра"
+
+#: extensions/alternate-tab/prefs.js:21
+msgid "Application icon only"
+msgstr "Толькі значок праграмы"
+
+#: extensions/alternate-tab/prefs.js:22
+msgid "Thumbnail and application icon"
+msgstr "Мініяцюра і значок праграмы"
+
+#: extensions/alternate-tab/prefs.js:38
+msgid "Present windows as"
+msgstr "Адлюстроўваць вокны як"
+
+#: extensions/alternate-tab/prefs.js:69
+msgid "Show only windows in the current workspace"
+msgstr "Паказваць вокны толькі з бягучай працоўная прасторы"
+
+#: extensions/apps-menu/extension.js:41
+msgid "Activities Overview"
+msgstr "Агляд заняткаў"
+
+#: extensions/apps-menu/extension.js:141
+msgid "Favorites"
+msgstr "Упадабаныя"
+
+#: extensions/apps-menu/extension.js:436
 msgid "Applications"
 msgstr "Праграмы"

 #: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
 msgid "Application and workspace list"
-msgstr "Праграма і спіс працоўных прастор"
+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), затым двукроп'е і нумар працоўнай прасторы"
+"Спіс радкоў, кожны з якіх утрымлівае ідэнтыфікатар праграмы (імя *.desktop "
+"файла), затым двукроп'е і нумар працоўнай прасторы"

-#: extensions/auto-move-windows/prefs.js:35
-msgid "Workspace Rules"
-msgstr "Правілы для працоўнай прасторы"
+#: extensions/auto-move-windows/prefs.js:60
+msgid "Application"
+msgstr "Праграма"

-#: extensions/auto-move-windows/prefs.js:237
+#: 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:112
-#: extensions/places-menu/placeDisplay.js:233
+#: extensions/drive-menu/extension.js:107
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
-msgstr "Не ўдалося выняць дыск «%s»:"
+msgstr "Не ўдалося выняць прывод \"%s\":"

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

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

+#: extensions/example/extension.js:17
+msgid "Hello, world!"
+msgstr "Прывітанне, свет!"
+
+#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:5
+msgid "Alternative greeting text."
+msgstr "Альтэрнатыўны тэкст вітання."
+
+#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:6
+msgid ""
+"If not empty, it contains the text that will be shown when clicking on the "
+"panel."
+msgstr ""
+"Калі не пуста, ўтрымлівае тэкст, які будзе паказвацца пры націсканні на "
+"панэль."
+
+#: extensions/example/prefs.js:30
+msgid "Message"
+msgstr "Паведамленне"
+
+#. TRANSLATORS: Example is the name of the extension, should not be
+#. translated
+#: extensions/example/prefs.js:43
+msgid ""
+"Example aims to show how to build well behaved extensions for the Shell and "
+"as such it has little functionality on its own.\n"
+"Nevertheless it’s possible to customize the greeting message."
+msgstr ""
+"Example пакажа як ствараць пашырэнні для Shell. Сам па сабе ён мае мала "
+"функцыянальнасці.\n"
+"Тым не менш, можна змяніць тэкст прывітання."
+
 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
-#, fuzzy
 msgid "Use more screen for windows"
 msgstr "Выкарыстоўваць большую плошчу экрана для вокнаў"

 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
-#, fuzzy
 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 "Размяшчаць подпіс акна зверху"
+msgstr "Змяшчаць загалоўкі вокнаў зверху"

 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:12
 msgid ""
@@ -98,243 +200,156 @@ msgid ""
 "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:89
-#: extensions/places-menu/extension.js:93
+#: extensions/places-menu/extension.js:78
+#: extensions/places-menu/extension.js:81
 msgid "Places"
 msgstr "Месцы"

-#: extensions/places-menu/placeDisplay.js:46
-#, javascript-format
-msgid "Failed to launch “%s”"
-msgstr "Не ўдалося запусціць «%s»"
-
-#: extensions/places-menu/placeDisplay.js:61
+#: extensions/places-menu/placeDisplay.js:65
 #, javascript-format
 msgid "Failed to mount volume for “%s”"
-msgstr "Не ўдалося прымацаваць том для «%s»."
+msgstr "Не ўдалося прымацаваць том для \"%s\"."

-#: extensions/places-menu/placeDisplay.js:148
-#: extensions/places-menu/placeDisplay.js:171
+#: 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:359
+#: extensions/places-menu/placeDisplay.js:303
 msgid "Home"
-msgstr "Хатняя папка"
+msgstr "Дамашняя папка"

-#: extensions/places-menu/placeDisplay.js:404
+#: 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 "Паслядоўнасць змены памераў для здымка экрана"
+msgstr "Чаргаваць памеры экраннага здымка"

 #: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
 msgid "Cycle Screenshot Sizes Backward"
-msgstr "Адваротная паслядоўнасць змены памераў для здымка экрана"
+msgstr "Чаргаваць памеры экраннага здымка ў адваротным напрамку"

 #: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
-msgstr "Назва тэмы"
+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"
+msgstr ""
+"Імя матыву аздаблення, які будзе загружаны з ~/.themes/name/gnome-shell"

-#: extensions/window-list/extension.js:98
+#: extensions/window-list/extension.js:110
 msgid "Close"
 msgstr "Закрыць"

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

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

-#: extensions/window-list/extension.js:125
+#: extensions/window-list/extension.js:136
 msgid "Unmaximize"
-msgstr "Скасаваць разгортванне"
+msgstr "Скасаваць максімалізацыю"

-#: extensions/window-list/extension.js:125
+#: extensions/window-list/extension.js:137
 msgid "Maximize"
-msgstr "Разгарнуць"
+msgstr "Максімалізаваць"

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

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

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

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

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

-#: extensions/window-list/extension.js:737
+#: 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 "Умовы групавання вокнаў"
+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» (заўсёды)."
+"Вырашае калі групаваць вокны адной праграмы ў спісе вокнаў. Магчымыя "
+"значэнні: \"never\" (ніколі), \"auto\" (аўтаматычна), \"always\" (заўсёды)."

 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-#: extensions/window-list/prefs.js:100
-msgid "Show windows from all workspaces"
-msgstr "Паказваць вокны з усіх працоўных прастор"
+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 windows from all workspaces or only the current one."
-msgstr "Паказваць вокны з усіх працоўных прастор ці толькі з бягучай."
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:27
-msgid "Show the window list on all monitors"
-msgstr "Паказваць спіс вокнаў на ўсіх маніторах"
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:28
 msgid ""
 "Whether to show the window list on all connected monitors or only on the "
 "primary one."
 msgstr ""
-"Паказваць спіс вокнаў на ўсіх падлучаных маніторах ці толькі на асноўным."
+"Ці паказваць спіс вокнаў на ўсіх злучаных маніторах або толькі на галоўным."

-#: extensions/window-list/prefs.js:29
+#: extensions/window-list/prefs.js:32
 msgid "Window Grouping"
 msgstr "Групаванне вокнаў"

-#: extensions/window-list/prefs.js:58
+#: extensions/window-list/prefs.js:50
 msgid "Never group windows"
 msgstr "Ніколі не групаваць вокны"

-#: extensions/window-list/prefs.js:59
+#: extensions/window-list/prefs.js:51
 msgid "Group windows when space is limited"
 msgstr "Групаваць вокны калі не хапае месца"

-#: extensions/window-list/prefs.js:60
+#: extensions/window-list/prefs.js:52
 msgid "Always group windows"
 msgstr "Заўсёды групаваць вокны"

-#: extensions/window-list/prefs.js:94
+#: extensions/window-list/prefs.js:75
 msgid "Show on all monitors"
-msgstr "Паказваць на ўсіх маніторах"
+msgstr "Паказаць усе маніторы"

-#: extensions/window-list/workspaceIndicator.js:247
-#: extensions/workspace-indicator/extension.js:253
-msgid "Workspace Indicator"
-msgstr "Індыкатар працоўнай прасторы"
-
-#: extensions/workspace-indicator/prefs.js:34
+#: extensions/workspace-indicator/prefs.js:141
 msgid "Workspace Names"
-msgstr "Назвы працоўных прастор"
+msgstr "Назвы працоўных прастораў"

-#: extensions/workspace-indicator/prefs.js:67
+#: extensions/workspace-indicator/prefs.js:157
+msgid "Name"
+msgstr "Імя"
+
+#: extensions/workspace-indicator/prefs.js:198
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Працоўная прастора %d"
-
-#: extensions/workspace-indicator/prefs.js:208
-msgid "Add Workspace"
-msgstr "Дадаць працоўную прастору"
-
-#~ msgid "Attach modal dialog to the parent window"
-#~ msgstr "Прымацаваць мадальны дыялог да бацькоўскага акна"
-
-#~ msgid ""
-#~ "This key overrides the key in org.gnome.mutter when running GNOME Shell."
-#~ msgstr ""
-#~ "Гэты ключ засланяе ключ у org.gnome.mutter калі запушчаны GNOME Shell."
-
-#~ msgid "Arrangement of buttons on the titlebar"
-#~ msgstr "Парадак кнопак у загалоўнай стужцы"
-
-#~ msgid ""
-#~ "This key overrides the key in org.gnome.desktop.wm.preferences when "
-#~ "running GNOME Shell."
-#~ msgstr ""
-#~ "Гэты ключ засланяе ключ у org.gnome.desktop.wm.preferences калі запушчаны "
-#~ "GNOME Shell."
-
-#~ msgid "Enable edge tiling when dropping windows on screen edges"
-#~ msgstr "Аўтаматычна змяняць памеры акна пры перамяшчэнні да края экрана"
-
-#~ msgid "Workspaces only on primary monitor"
-#~ msgstr "Працоўныя прасторы толькі на асноўным маніторы"
-
-#~ msgid "Delay focus changes in mouse mode until the pointer stops moving"
-#~ msgstr "Затрымліваць змяненні фокуса ў рэжыме мышы да спынення паказальніка"
-
-#~ msgid "Thumbnail only"
-#~ msgstr "Толькі мініяцюра"
-
-#~ msgid "Application icon only"
-#~ msgstr "Толькі значок праграмы"
-
-#~ msgid "Thumbnail and application icon"
-#~ msgstr "Мініяцюра і значок праграмы"
-
-#~ msgid "Present windows as"
-#~ msgstr "Адлюстроўваць вокны як"
-
-#~ msgid "Activities Overview"
-#~ msgstr "Агляд заняткаў"
-
-#~ msgid "Application"
-#~ msgstr "Праграма"
-
-#~ msgid "Create new matching rule"
-#~ msgstr "Стварыць новае правіла адпаведнасці"
-
-#~ msgid "Add"
-#~ msgstr "Дадаць"
-
-#~ msgid "Hello, world!"
-#~ msgstr "Прывітанне, свет!"
-
-#~ msgid "Alternative greeting text."
-#~ msgstr "Альтэрнатыўны тэкст вітання."
-
-#~ msgid ""
-#~ "If not empty, it contains the text that will be shown when clicking on "
-#~ "the panel."
-#~ msgstr ""
-#~ "Калі не пуста, ўтрымлівае тэкст, які будзе паказвацца пры націсканні на "
-#~ "панэль."
-
-#~ msgid "Message"
-#~ msgstr "Паведамленне"
-
-#~ msgid ""
-#~ "Example aims to show how to build well behaved extensions for the Shell "
-#~ "and as such it has little functionality on its own.\n"
-#~ "Nevertheless it’s possible to customize the greeting message."
-#~ msgstr ""
-#~ "Example пакажа як ствараць пашырэнні для Shell. Сам па сабе ён мае мала "
-#~ "функцыянальнасці.\n"
-#~ "Тым не менш, можна змяніць тэкст прывітання."
-
-#~ msgid "Name"
-#~ msgstr "Імя"
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,272 +1,359 @@
-# Bulgarian translation for gnome-shell-extensions po-file.
-# Copyright (C) 2014, 2015, 2017 Free Software Foundation, Inc.
-# Copyright (C) 2021, 2022 Alexander Shopov <ash@kambanaria.org>.
-# 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, 2021, 2022.
-# Lyubomir Vasilev <lyubomirv@abv.bg>, 2017.
-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: 2022-02-12 20:25+0000\n"
-"PO-Revision-Date: 2022-02-13 11:40+0100\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:3
-msgid "GNOME Classic"
-msgstr "Класически GNOME"
-
-#: data/gnome-classic.desktop.in:4 data/gnome-classic-wayland.desktop.in:4
-#: data/gnome-classic-xorg.desktop.in:4
-msgid "This session logs you into GNOME Classic"
-msgstr "Работната среда изглежда като класическия GNOME (2.x)"
-
-#: data/gnome-classic-wayland.desktop.in:3
-msgid "GNOME Classic on Wayland"
-msgstr "Класически GNOME в Wayland"
-
-#: data/gnome-classic-xorg.desktop.in:3
-msgid "GNOME Classic on Xorg"
-msgstr "Класически GNOME в Xorg"
-
-#: extensions/apps-menu/extension.js:112
-msgid "Favorites"
-msgstr "Любими"
-
-#: extensions/apps-menu/extension.js:370
-msgid "Applications"
-msgstr "Програми"
-
-#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
-msgid "Application and workspace list"
-msgstr "Списък с програмите и работните плотове"
-
-#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:7
-msgid ""
-"A list of strings, each containing an application id (desktop file name), "
-"followed by a colon and the workspace number"
-msgstr ""
-"Списък от низове. Всеки съдържа идентификатор на програма (име на файл „."
-"desktop“), следван от знака „:“ и номер на работен плот"
-
-#: extensions/auto-move-windows/prefs.js:19
-msgid "Workspace Rules"
-msgstr "Правила за работните плотове"
-
-#: extensions/auto-move-windows/prefs.js:245
-msgid "Add Rule"
-msgstr "Добавяне на правило"
-
-#. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:123
-#: extensions/places-menu/placeDisplay.js:210
-#, javascript-format
-msgid "Ejecting drive “%s” failed:"
-msgstr "Неуспешно изваждане на устройство „%s“:"
-
-#: extensions/drive-menu/extension.js:139
-msgid "Removable devices"
-msgstr "Преносими медии"
-
-#: extensions/drive-menu/extension.js:161
-msgid "Open Files"
-msgstr "Отваряне на файлове"
-
-#: 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:88
-#: extensions/places-menu/extension.js:91
-msgid "Places"
-msgstr "Места"
-
-#: extensions/places-menu/placeDisplay.js:49
-#, javascript-format
-msgid "Failed to launch “%s”"
-msgstr "Неуспешно стартиране на „%s“"
-
-#: extensions/places-menu/placeDisplay.js:64
-#, javascript-format
-msgid "Failed to mount volume for “%s”"
-msgstr "Неуспешно монтиране на тома „%s“"
-
-#: extensions/places-menu/placeDisplay.js:125
-#: extensions/places-menu/placeDisplay.js:148
-msgid "Computer"
-msgstr "Компютър"
-
-#: extensions/places-menu/placeDisplay.js:336
-msgid "Home"
-msgstr "Домашна папка"
-
-#: extensions/places-menu/placeDisplay.js:381
-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:72
-msgid "Close"
-msgstr "Затваряне"
-
-#: extensions/window-list/extension.js:92
-msgid "Unminimize"
-msgstr "Деминимизиране"
-
-#: extensions/window-list/extension.js:92
-msgid "Minimize"
-msgstr "Минимизиране"
-
-#: extensions/window-list/extension.js:99
-msgid "Unmaximize"
-msgstr "Демаксимизиране"
-
-#: extensions/window-list/extension.js:99
-msgid "Maximize"
-msgstr "Максимизиране"
-
-#: extensions/window-list/extension.js:434
-msgid "Minimize all"
-msgstr "Минимизиране на всички"
-
-#: extensions/window-list/extension.js:440
-msgid "Unminimize all"
-msgstr "Деминимизиране на всички"
-
-#: extensions/window-list/extension.js:446
-msgid "Maximize all"
-msgstr "Максимизиране на всички"
-
-#: extensions/window-list/extension.js:454
-msgid "Unmaximize all"
-msgstr "Демаксимизиране на всички"
-
-#: extensions/window-list/extension.js:462
-msgid "Close all"
-msgstr "Затваряне на всички"
-
-#: extensions/window-list/extension.js:741
-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
-#: extensions/window-list/prefs.js:76
-msgid "Show windows from all workspaces"
-msgstr "Да се показват прозорците от всички работни плотове"
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
-msgid "Whether to show windows from all workspaces or only the current one."
-msgstr ""
-"Дали да се показват прозорците от всички работни плотове или само от текущия."
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:27
-msgid "Show the window list on all monitors"
-msgstr "Извеждане на списъка с прозорци на всички монитори"
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:28
-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:37
-msgid "Never group windows"
-msgstr "Никога да не се групират"
-
-#: extensions/window-list/prefs.js:38
-msgid "Group windows when space is limited"
-msgstr "Групиране при ограничено място"
-
-#: extensions/window-list/prefs.js:39
-msgid "Always group windows"
-msgstr "Винаги да се групират"
-
-#: extensions/window-list/prefs.js:63
-msgid "Show on all monitors"
-msgstr "На всички монитори"
-
-#: extensions/window-list/workspaceIndicator.js:249
-#: extensions/workspace-indicator/extension.js:254
-msgid "Workspace Indicator"
-msgstr "Индикатор на работните плотове"
-
-#: extensions/workspace-indicator/prefs.js:18
-msgid "Workspace Names"
-msgstr "Имена на работните плотове"
-
-#: extensions/workspace-indicator/prefs.js:39
-#, javascript-format
-msgid "Workspace %d"
-msgstr "Работен плот %d"
-
-#: extensions/workspace-indicator/prefs.js:184
-msgid "Add Workspace"
-msgstr "Добавяне на работен плот"
+# 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"
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -1,350 +1,360 @@
 # sray <sray@redhat.com>, 2013, 2014. #zanata.
-# Akarshan Biswas <akarshan.biswas@hotmail.com>, 2020.
-#
 msgid ""
 msgstr ""
-"Project-Id-Version: unnamed project\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
-"issues\n"
-"POT-Creation-Date: 2020-05-28 00:55+0000\n"
-"PO-Revision-Date: 2020-08-13 10:03+0530\n"
-"Last-Translator: Akarshan Biswas <akarshan.biswas@hotmail.com>\n"
-"Language-Team: Bengali (India) <anubad@lists.ankur.org.in>\n"
+"Project-Id-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: 2014-09-22 07:38+0000\n"
+"PO-Revision-Date: 2014-09-22 16:37+0000\n"
+"Last-Translator: \n"
+"Language-Team: American English <kde-i18n-doc@kde.org>\n"
 "Language: bn_IN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"X-DamnedLies-Scope: partial\n"
-"X-Generator: Gtranslator 3.36.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 "GNOME ক্লাসিক"

-#: data/gnome-classic.desktop.in:4
+#: ../data/gnome-classic.desktop.in.h:2
 msgid "This session logs you into GNOME Classic"
-msgstr "এই সেশন আপনাকে GNOME ক্লাসিকে লগ করায়"
+msgstr "এই সেশন অাপনাকে GNOME ক্লাসিকে লগ করায়"
+
+#: ../data/gnome-shell-classic.desktop.in.in.h:1
+msgid "GNOME Shell Classic"
+msgstr "GNOME সেল ক্লাসিক"
+
+# auto translated by TM merge from project: gnome-shell, version: 3.8.4, DocId: gnome-shell
+#: ../data/gnome-shell-classic.desktop.in.in.h:2
+msgid "Window management and application launching"
+msgstr "উইন্ডো পরিচালনা ও অ্যাপ্লিকেশন প্রারম্ভ"
+
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:1
+msgid "Attach modal dialog to the parent window"
+msgstr "প্রধান উইন্ডোতে মোডেল ডায়ালগ সংযুক্ত করুন"
+
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:2
+msgid ""
+"This key overrides the key in org.gnome.mutter when running GNOME Shell."
+msgstr ""
+"GNOME সেল চালানোর ক্ষেত্রে এই কী in org.gnome.mutter এর কী ওভাররাইড করে।"
+
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:3
+msgid "Arrangement of buttons on the titlebar"
+msgstr "শিরোনাম দন্ডে বোতামগুলির সজ্জা"
+
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:4
+#| msgid ""
+#| "This key overrides the key in org.gnome.mutter when running GNOME Shell."
+msgid ""
+"This key overrides the key in org.gnome.desktop.wm.preferences when running "
+"GNOME Shell."
+msgstr ""
+"GNOME সেল চালানোর সময়ে এই কী org.gnome.desktop.wm.preferences-এর কী ওভাররাইড "
+"করে।"
+
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:5
+msgid "Enable edge tiling when dropping windows on screen edges"
+msgstr "উইন্ডো স্ক্রীন কিনারায় রাখার সময়ে কিনারা টাইলিং সক্রিয় করুন"
+
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:6
+msgid "Workspaces only on primary monitor"
+msgstr "শুধুমাত্র প্রধান মনিটরে ওয়ার্কস্পেস"
+
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:7
+msgid "Delay focus changes in mouse mode until the pointer stops moving"
+msgstr ""
+"পয়েন্টার অবস্থান পরিবর্তন না থামানো পর্যন্ত মাউস মোডে ফোকাস পরিবর্তন বিলম্বিত "
+"করুন"
+
+#: ../extensions/alternate-tab/prefs.js:20
+msgid "Thumbnail only"
+msgstr "শুধুমাত্র থাম্বনেইল"
+
+#: ../extensions/alternate-tab/prefs.js:21
+msgid "Application icon only"
+msgstr "শুধুমাত্র অ্যাপ্লিকেশন অাইকন"
+
+#: ../extensions/alternate-tab/prefs.js:22
+msgid "Thumbnail and application icon"
+msgstr "থাম্বনেইল এবং অ্যাপ্লিকেশন অাইকন"
+
+#: ../extensions/alternate-tab/prefs.js:38
+msgid "Present windows as"
+msgstr "এই রূপে উইন্ডো উপস্থাপনা"
+
+#: ../extensions/alternate-tab/prefs.js:69
+msgid "Show only windows in the current workspace"
+msgstr "শুধুমাত্র উইন্ডো বর্তমান ওয়ার্কস্পেসে দেখান"
+
+#: ../extensions/apps-menu/extension.js:39
+msgid "Activities Overview"
+msgstr "ক্রিয়াকলাপের পূর্বরূপ"

 # auto translated by TM merge from project: system-config-printer, version: 1.1.16-23, DocId: system-config-printer
-#: extensions/apps-menu/extension.js:113
+#: ../extensions/apps-menu/extension.js:113
 msgid "Favorites"
 msgstr "বিশেষ"

 # auto translated by TM merge from project: gnome-menus, version: 3.8.0, DocId: gnome-menus-3.0
-#: extensions/apps-menu/extension.js:369
+#: ../extensions/apps-menu/extension.js:282
 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:35
-#| msgid "Workspace Names"
-msgid "Workspace Rules"
-msgstr "ওয়ার্কস্পেস নিয়মগুলি"
+# auto translated by TM merge from project: yelp, version: 3.8.1, DocId: yelp
+#: ../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 "ওয়ার্কস্পেস"

 # auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32
-#: extensions/auto-move-windows/prefs.js:243
+#: ../extensions/auto-move-windows/prefs.js:85
+#| msgid "Add rule"
 msgid "Add Rule"
 msgstr "নিয়ম যোগ করুন"

-#. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:112
-#: extensions/places-menu/placeDisplay.js:233
-#, javascript-format
-#| msgid "Ejecting drive '%s' failed:"
-msgid "Ejecting drive “%s” failed:"
-msgstr "'%s' ড্রাইভ ইজেক্ট করতে ব্যর্থ :"
+#: ../extensions/auto-move-windows/prefs.js:106
+msgid "Create new matching rule"
+msgstr "মেলানোর নতুন নিয়ম তৈরি করুন"

-#: extensions/drive-menu/extension.js:128
+# auto translated by TM merge from project: file-roller, version: 3.8.3, DocId: file-roller
+#: ../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:123
 msgid "Removable devices"
 msgstr "অপসারণযোগ্য ডিভাইসগুলি"

 # auto translated by TM merge from project: gnome-user-share, version: 3.8, DocId: gnome-user-share
-#: extensions/drive-menu/extension.js:155
-#| msgid "Open File"
-msgid "Open Files"
+#: ../extensions/drive-menu/extension.js:150
+msgid "Open File"
 msgstr "ফাইল খুলুন"

-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
-msgid "Use more screen for windows"
-msgstr "উইন্ডোর জন্য আরো স্ক্রীন ব্যবহার করুন"
+#: ../extensions/example/extension.js:17
+msgid "Hello, world!"
+msgstr "ওহে, বিশ্ব!"

-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
+#: ../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:"
+msgid "Message"
+msgstr "বার্তা"
+
+#: ../extensions/example/prefs.js:43
+msgid ""
+"Example aims to show how to build well behaved extensions for the Shell and "
+"as such it has little functionality on its own.\n"
+"Nevertheless it's possible to customize the greeting message."
+msgstr ""
+"সেলের জন্য সুস্থিত এক্সটেনশন কীভাবে গঠন করা সম্ভব তা উদাহরণের মাধ্যমে "
+"উপস্থাপিত করা "
+"হয়।\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: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 ""
-"যদি সত্য হয়, তলায় রাখার সেল ডিফল্ট ওভাররাইড করে সংশ্লিষ্ট থাম্বনেইলের শীর্ষে উইন্ডো "
-"ক্যাপশন রাখুন। এই সেটিং পরিবর্তন করলে তা প্রয়োগ করতে সেল বন্ধ করে চালু করতে হবে।"
+"যদি সত্য হয়, তলায় রাখার সেল ডিফল্ট ওভাররাইড করে সংশ্লিষ্ট থাম্বনেইলের শীর্ষে "
+"উইন্ডো "
+"ক্যাপশন রাখুন। এই সেটিং পরিবর্তন করলে তা প্রয়োগ করতে সেল বন্ধ করে চালু করতে "
+"হবে।"

 # auto translated by TM merge from project: file-roller, version: 3.8.3, DocId: file-roller
-#: extensions/places-menu/extension.js:89
-#: extensions/places-menu/extension.js:93
+#: ../extensions/places-menu/extension.js:78
+#: ../extensions/places-menu/extension.js:81
 msgid "Places"
 msgstr "অবস্থান"

-#: extensions/places-menu/placeDisplay.js:46
+#: ../extensions/places-menu/placeDisplay.js:57
 #, javascript-format
-#| msgid "Failed to launch \"%s\""
-msgid "Failed to launch “%s”"
-msgstr "\"%s\" লঞ্চ করতে ব্যর্থ "
-
-#: extensions/places-menu/placeDisplay.js:61
-#, javascript-format
-msgid "Failed to mount volume for “%s”"
-msgstr "\"%s\" এর জন্য ভলিউম মাউন্ট করতে ব্যর্থ"
+msgid "Failed to launch \"%s\""
+msgstr "\"%s\" লঞ্চ করা গেল না"

 # auto translated by TM merge from project: gvfs, version: 1.16.3, DocId: gvfs
-#: extensions/places-menu/placeDisplay.js:148
-#: extensions/places-menu/placeDisplay.js:171
+#: ../extensions/places-menu/placeDisplay.js:99
+#: ../extensions/places-menu/placeDisplay.js:122
 msgid "Computer"
 msgstr "কম্পিউটার"

 # auto translated by TM merge from project: rhsm-web, version: 0.0, DocId: management
-#: extensions/places-menu/placeDisplay.js:359
+#: ../extensions/places-menu/placeDisplay.js:200
 msgid "Home"
 msgstr "প্রথম পাতা"

-#: extensions/places-menu/placeDisplay.js:404
+#: ../extensions/places-menu/placeDisplay.js:287
 msgid "Browse Network"
 msgstr "নেটওয়ার্ক ব্রাউজ"

-#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
+# auto translated by TM merge from project: gnome-system-monitor, version: 3.8.2.1, DocId: gnome-system-monitor
+#: ../extensions/systemMonitor/extension.js:214
+msgid "CPU"
+msgstr "CPU"
+
+# auto translated by TM merge from project: RHEV Installation Guide, version: 3.1, DocId: topics/Planning_your_Data_Center
+#: ../extensions/systemMonitor/extension.js:267
+msgid "Memory"
+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: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:98
+#: ../extensions/window-list/extension.js:110
 msgid "Close"
 msgstr "বন্ধ করুন"

-#: extensions/window-list/extension.js:118
+#: ../extensions/window-list/extension.js:120
 msgid "Unminimize"
-msgstr "আন-মিনিমাইজ"
+msgstr "অান-মিনিমাইজ"

-#: extensions/window-list/extension.js:118
+#: ../extensions/window-list/extension.js:121
 msgid "Minimize"
 msgstr "ছোট করুন"

-#: extensions/window-list/extension.js:125
+#: ../extensions/window-list/extension.js:127
 msgid "Unmaximize"
-msgstr "আন-ম্যাক্সিমাইজ"
+msgstr "অান-ম্যাক্সিমাইজ"

-#: extensions/window-list/extension.js:125
+#: ../extensions/window-list/extension.js:128
 msgid "Maximize"
 msgstr "বড় করুন"

-#: extensions/window-list/extension.js:428
+#: ../extensions/window-list/extension.js:300
 msgid "Minimize all"
 msgstr "সকল ছোট করুন"

-#: extensions/window-list/extension.js:434
+#: ../extensions/window-list/extension.js:308
 msgid "Unminimize all"
-msgstr "সকল আন-মিনিমাইজ করুন"
+msgstr "সকল অান-মিনিমাইজ করুন"

-#: extensions/window-list/extension.js:440
+#: ../extensions/window-list/extension.js:316
 msgid "Maximize all"
 msgstr "সকল বড় করুন"

-#: extensions/window-list/extension.js:448
+#: ../extensions/window-list/extension.js:325
 msgid "Unmaximize all"
-msgstr "সকল আন-ম্যাক্সিমাইজ করুন"
+msgstr "সকল অান-ম্যাক্সিমাইজ করুন"

-#: extensions/window-list/extension.js:456
+#: ../extensions/window-list/extension.js:334
 msgid "Close all"
 msgstr "সকল বন্ধ করুন"

-#: extensions/window-list/extension.js:734
-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\"."
-msgid ""
-"Decides when to group windows from the same application on the window list. "
-"Possible values are “never”, “auto” and “always”."
-msgstr ""
-"উইন্ডো তালিকার একই অ্যাপ্লিকেশন থেকে কখন উইন্ডোজকে গ্রুপ করবেন তা সিদ্ধান্ত নেয়। "
-"সম্ভাব্য মানগুলি হ'ল \"কখনই\", \"স্বয়ং\" এবং \"সর্বদা\"।"
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-#: extensions/window-list/prefs.js:100
-#| msgid "Show only windows in the current workspace"
-msgid "Show windows from all workspaces"
-msgstr "সমস্ত ওয়ার্কস্পেসে থেকে উইন্ডো প্রদর্শন করুন"
-
-#: extensions/window-list/prefs.js:29
-msgid "Window Grouping"
-msgstr "উইন্ডো দলভুক্তকরণ"
-
-#: extensions/window-list/prefs.js:58
-msgid "Never group windows"
-msgstr "উইন্ডো কখনও দলভুক্ত করবেন না"
-
-#: extensions/window-list/prefs.js:59
-msgid "Group windows when space is limited"
-msgstr "স্থান কম থাকলে উইন্ডো দলভুক্ত করুন"
-
-#: extensions/window-list/prefs.js:60
-msgid "Always group windows"
-msgstr "উইন্ডো সর্বদা দলভুক্ত করুন"
-
-#: extensions/window-list/prefs.js:94
-msgid "Show on all monitors"
-msgstr "সমস্ত মনিটরের উপর দেখান"
-
-#: extensions/window-list/workspaceIndicator.js:207
-#: extensions/workspace-indicator/extension.js:213
+#: ../extensions/window-list/extension.js:644
+#: ../extensions/workspace-indicator/extension.js:30
 msgid "Workspace Indicator"
 msgstr "ওয়ার্কস্পেস সূচক"

-#: extensions/workspace-indicator/prefs.js:34
+#: ../extensions/window-list/extension.js:808
+#| msgid "Window Grouping"
+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 ""
+"উইন্ডো তালিকায় একই অ্যাপ্লিকেশন থেকে কখন উইন্ডো দলভুক্ত করা হবে তার সিদ্ধান্ত "
+"নেয়। "
+"সম্ভাব্য মানগুলি হল \"কখনও নয়\", \"স্বয়ংক্রিয়\" এবং \"সর্বদা\"।"
+
+#: ../extensions/window-list/prefs.js:30
+msgid "Window Grouping"
+msgstr "উইন্ডো দলভুক্তকরণ"
+
+#: ../extensions/window-list/prefs.js:49
+msgid "Never group windows"
+msgstr "উইন্ডো কখনও দলভুক্ত করবেন না"
+
+#: ../extensions/window-list/prefs.js:50
+msgid "Group windows when space is limited"
+msgstr "স্থান কম থাকলে উইন্ডো দলভুক্ত করুন"
+
+#: ../extensions/window-list/prefs.js:51
+msgid "Always group windows"
+msgstr "উইন্ডো সর্বদা দলভুক্ত করুন"
+
+#: ../extensions/workspace-indicator/prefs.js:141
+#| msgid "Workspace names:"
 msgid "Workspace Names"
 msgstr "ওয়ার্কস্পেস নামগুলি"

-#: extensions/workspace-indicator/prefs.js:67
+#: ../extensions/workspace-indicator/prefs.js:157
+msgid "Name"
+msgstr "নাম"
+
+#: ../extensions/workspace-indicator/prefs.js:198
 #, javascript-format
 msgid "Workspace %d"
 msgstr "ওয়ার্কস্পেস %d"

-#: extensions/workspace-indicator/prefs.js:218
-#| msgid "Workspace"
-msgid "Add Workspace"
-msgstr "ওয়ার্কস্পেস যোগ করুন"
-
-#~ msgid "GNOME Shell Classic"
-#~ msgstr "GNOME সেল ক্লাসিক"
-
-# auto translated by TM merge from project: gnome-shell, version: 3.8.4, DocId: gnome-shell
-#~ msgid "Window management and application launching"
-#~ msgstr "উইন্ডো পরিচালনা ও অ্যাপ্লিকেশন প্রারম্ভ"
-
-#~ msgid "Attach modal dialog to the parent window"
-#~ msgstr "প্রধান উইন্ডোতে মোডেল ডায়ালগ সংযুক্ত করুন"
-
-#~ msgid ""
-#~ "This key overrides the key in org.gnome.mutter when running GNOME Shell."
-#~ msgstr ""
-#~ "GNOME সেল চালানোর ক্ষেত্রে এই কী in org.gnome.mutter এর কী ওভাররাইড করে।"
-
-#~ msgid "Arrangement of buttons on the titlebar"
-#~ msgstr "শিরোনাম দন্ডে বোতামগুলির সজ্জা"
-
-#~| msgid ""
-#~| "This key overrides the key in org.gnome.mutter when running GNOME Shell."
-#~ msgid ""
-#~ "This key overrides the key in org.gnome.desktop.wm.preferences when "
-#~ "running GNOME Shell."
-#~ msgstr ""
-#~ "GNOME সেল চালানোর সময়ে এই কী org.gnome.desktop.wm.preferences-এর কী "
-#~ "ওভাররাইড করে।"
-
-#~ msgid "Enable edge tiling when dropping windows on screen edges"
-#~ msgstr "উইন্ডো স্ক্রীন কিনারায় রাখার সময়ে কিনারা টাইলিং সক্রিয় করুন"
-
-#~ msgid "Workspaces only on primary monitor"
-#~ msgstr "শুধুমাত্র প্রধান মনিটরে ওয়ার্কস্পেস"
-
-#~ msgid "Delay focus changes in mouse mode until the pointer stops moving"
-#~ msgstr ""
-#~ "পয়েন্টার অবস্থান পরিবর্তন না থামানো পর্যন্ত মাউস মোডে ফোকাস পরিবর্তন বিলম্বিত করুন"
-
-#~ msgid "Thumbnail only"
-#~ msgstr "শুধুমাত্র থাম্বনেইল"
-
-#~ msgid "Application icon only"
-#~ msgstr "শুধুমাত্র অ্যাপ্লিকেশন আইকন"
-
-#~ msgid "Thumbnail and application icon"
-#~ msgstr "থাম্বনেইল এবং অ্যাপ্লিকেশন আইকন"
-
-#~ msgid "Present windows as"
-#~ msgstr "এই রূপে উইন্ডো উপস্থাপনা"
-
-#~ msgid "Activities Overview"
-#~ msgstr "ক্রিয়াকলাপের পূর্বরূপ"
-
-# auto translated by TM merge from project: yelp, version: 3.8.1, DocId: yelp
-#~ msgid "Application"
-#~ msgstr "অ্যাপ্লিকেশন"
-
-#~ msgid "Create new matching rule"
-#~ msgstr "মেলানোর নতুন নিয়ম তৈরি করুন"
-
-# auto translated by TM merge from project: file-roller, version: 3.8.3, DocId: file-roller
-#~ msgid "Add"
-#~ msgstr "যোগ করুন"
-
-#~ msgid "Hello, world!"
-#~ msgstr "ওহে, বিশ্ব!"
-
-#~ msgid "Alternative greeting text."
-#~ msgstr "বিকল্প অভিবাদন পাঠ্য।"
-
-#~ msgid ""
-#~ "If not empty, it contains the text that will be shown when clicking on "
-#~ "the panel."
-#~ msgstr "খালি না থাকলে, তাতে পাঠ্য থাকবে যা প্যানেলে ক্লিক করা হলে দেখানো হবে।"
-
-#~| msgid "Message:"
-#~ msgid "Message"
-#~ msgstr "বার্তা"
-
-#~ msgid ""
-#~ "Example aims to show how to build well behaved extensions for the Shell "
-#~ "and as such it has little functionality on its own.\n"
-#~ "Nevertheless it's possible to customize the greeting message."
-#~ msgstr ""
-#~ "সেলের জন্য সুস্থিত এক্সটেনশন কীভাবে গঠন করা সম্ভব তা উদাহরণের মাধ্যমে উপস্থাপিত "
-#~ "করা হয়।\n"
-#~ "উপরন্তু অভিভাদন বার্তা নিজের পছন্দ মতোও করে নেওয়া যায়।"
-
-# auto translated by TM merge from project: gnome-system-monitor, version: 3.8.2.1, DocId: gnome-system-monitor
-#~ msgid "CPU"
-#~ msgstr "CPU"
-
-# auto translated by TM merge from project: RHEV Installation Guide, version: 3.1, DocId: topics/Planning_your_Data_Center
-#~ msgid "Memory"
-#~ msgstr "মেমরি"
-
-#~ msgid "Name"
-#~ msgstr "নাম"
-
 # auto translated by TM merge from project: gdm, version: 3.8.4, DocId: gdm
 #~ msgid "Suspend"
 #~ msgstr "স্থগিত করুন"
@@ -360,13 +370,13 @@ msgstr "ওয়ার্কস্পেস যোগ করুন"
 #~ msgstr "স্থগিত সক্রিয় করুন"

 #~ msgid "Control the visibility of the Suspend menu item"
-#~ msgstr "স্থগিত মেনু আইটেমের দৃশ্যমানতা নিয়ন্ত্রণ করুন"
+#~ msgstr "স্থগিত মেনু অাইটেমের দৃশ্যমানতা নিয়ন্ত্রণ করুন"

 #~ msgid "Enable hibernating"
 #~ msgstr "নিদ্রিত অবস্থা সক্রিয় করুন"

 #~ msgid "Control the visibility of the Hibernate menu item"
-#~ msgstr "নিদ্রিত অবস্থা মেনু আইটেমের দৃশ্যমানতা নিয়ন্ত্রণ করুন"
+#~ msgstr "নিদ্রিত অবস্থা মেনু অাইটেমের দৃশ্যমানতা নিয়ন্ত্রণ করুন"

 #~ msgid "Normal"
 #~ msgstr "স্বাভাবিক"
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,9 +7,9 @@
 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: 2021-11-06 14:08+0000\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-07-08 13:29+0100\n"
 "Last-Translator: Jordi Mas <jmas@softcatala.org>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
@@ -19,28 +19,84 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"

-#: data/gnome-classic.desktop.in:3
+#: 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 data/gnome-classic-wayland.desktop.in:4
-#: data/gnome-classic-xorg.desktop.in:4
+#: 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/gnome-classic-wayland.desktop.in:3
-msgid "GNOME Classic on Wayland"
-msgstr "GNOME clàssic amb Wayland"
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:7
+msgid "Attach modal dialog to the parent window"
+msgstr "Adjunta el diàleg modal a la finestra pare"

-#: data/gnome-classic-xorg.desktop.in:3
-msgid "GNOME Classic on Xorg"
-msgstr "GNOME clàssic amb Xorg"
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:8
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:25
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:33
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:41
+msgid ""
+"This key overrides the key in org.gnome.mutter when running GNOME Shell."
+msgstr ""
+"Si s'executa el GNOME Shell, aquesta clau sobreescriu la clau «org.gnome."
+"mutter»."

-#: extensions/apps-menu/extension.js:112
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
+msgid "Arrangement of buttons on the titlebar"
+msgstr "Disposició dels botons en la barra de títol"
+
+#: 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 ""
+"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
+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 "
+"vores de la pantalla"
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:32
+msgid "Workspaces only on primary monitor"
+msgstr "Els espais de treball només es mostren en el monitor principal"
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:40
+msgid "Delay focus changes in mouse mode until the pointer stops moving"
+msgstr ""
+"Retarda el canvi de focus, en mode ratolí, fins que el punter estigui quiet"
+
+#: extensions/alternate-tab/prefs.js:20
+msgid "Thumbnail only"
+msgstr "Només miniatures"
+
+#: extensions/alternate-tab/prefs.js:21
+msgid "Application icon only"
+msgstr "Només la icona de l'aplicació"
+
+#: extensions/alternate-tab/prefs.js:22
+msgid "Thumbnail and application icon"
+msgstr "Miniatura i icona de l'aplicació"
+
+#: extensions/alternate-tab/prefs.js:38
+msgid "Present windows as"
+msgstr "Mostra les finestres com a"
+
+#: 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
+msgid "Activities Overview"
+msgstr "Vista general d'activitats"
+
+#: extensions/apps-menu/extension.js:141
 msgid "Favorites"
 msgstr "Preferides"

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

@@ -57,29 +113,73 @@ 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:34
-msgid "Workspace Rules"
-msgstr "Regles dels espais de treball"
+#: extensions/auto-move-windows/prefs.js:60
+msgid "Application"
+msgstr "Aplicació"

-#: extensions/auto-move-windows/prefs.js:236
+#: 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
 msgid "Add Rule"
 msgstr "Afegeix una regla"

+#: 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
+msgid "Add"
+msgstr "Afegeix"
+
 #. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:133
-#: extensions/places-menu/placeDisplay.js:233
+#: extensions/drive-menu/extension.js:107
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "Ha fallat l'expulsió de la unitat «%s»:"

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

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

+#: extensions/example/extension.js:17
+msgid "Hello, world!"
+msgstr "Hola, món!"
+
+#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:5
+msgid "Alternative greeting text."
+msgstr "Text de rebuda alternatiu."
+
+#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:6
+msgid ""
+"If not empty, it contains the text that will be shown when clicking on the "
+"panel."
+msgstr ""
+"Si no és buit, conté el text que es mostrarà quan es faci clic en el quadre."
+
+#: extensions/example/prefs.js:30
+msgid "Message"
+msgstr "Missatge"
+
+#. 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 ""
+"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."
+
 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
 msgid "Use more screen for windows"
 msgstr "Utilitza més pantalla per les finestres"
@@ -90,10 +190,10 @@ msgid ""
 "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 a posicionar les miniatures "
-"de les finestres adaptant-les a la ràtio d'aspecte de la pantalla, "
-"consolidant-les més per a reduir la caixa que les envolta. Aquest paràmetre "
-"de configuració només s'aplica a l'estratègia de posicionament de finestres "
+"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. Aquest paràmetre de "
+"configuració només s'aplica a l'estratègia de posicionament de finestres "
 "natural."

 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
@@ -111,31 +211,31 @@ msgstr ""
 "posicionar-lo a baix. Cal reiniciar el Shell per tal que aquest canvi tingui "
 "efecte."

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

-#: extensions/places-menu/placeDisplay.js:46
-#, javascript-format
-msgid "Failed to launch “%s”"
-msgstr "No s'ha pogut iniciar «%s»"
-
-#: extensions/places-menu/placeDisplay.js:61
+#: 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:148
-#: extensions/places-menu/placeDisplay.js:171
+#: extensions/places-menu/placeDisplay.js:78
+#, javascript-format
+msgid "Failed to launch “%s”"
+msgstr "No s'ha pogut iniciar «%s»"
+
+#: extensions/places-menu/placeDisplay.js:137
+#: extensions/places-menu/placeDisplay.js:160
 msgid "Computer"
 msgstr "Ordinador"

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

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

@@ -155,47 +255,52 @@ msgstr "Nom del tema"
 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:72
+#: extensions/window-list/extension.js:110
 msgid "Close"
 msgstr "Tanca"

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

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

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

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

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

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

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

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

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

-#: extensions/window-list/extension.js:741
+#: extensions/window-list/extension.js:678
+#: extensions/workspace-indicator/extension.js:30
+msgid "Workspace Indicator"
+msgstr "Indicador de l'espai de treball"
+
+#: extensions/window-list/extension.js:842
 msgid "Window List"
 msgstr "Llista de finestres"

@@ -213,21 +318,10 @@ msgstr ""
 "«auto» (automàticament) i «always» (sempre)."

 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-#: extensions/window-list/prefs.js:86
-msgid "Show windows from all workspaces"
-msgstr "Mostra les finestres de tots els espais de treball"
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
-msgid "Whether to show windows from all workspaces or only the current one."
-msgstr ""
-"Si es mostren les finestres de tots els espais de treballs o només de "
-"l'actual."
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:27
 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:28
+#: 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."
@@ -235,40 +329,47 @@ msgstr ""
 "Si es mostra la llista de finestres en tots els monitors connectats o només "
 "al primari."

-#: extensions/window-list/prefs.js:39
+#: extensions/window-list/prefs.js:32
 msgid "Window Grouping"
 msgstr "Agrupació de finestres"

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

-#: extensions/window-list/prefs.js:64
+#: 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:65
+#: extensions/window-list/prefs.js:52
 msgid "Always group windows"
 msgstr "Agrupa les finestres sempre"

-#: extensions/window-list/prefs.js:81
+#: extensions/window-list/prefs.js:75
 msgid "Show on all monitors"
 msgstr "Mostra a tots els monitors"

-#: extensions/window-list/workspaceIndicator.js:249
-#: extensions/workspace-indicator/extension.js:254
-msgid "Workspace Indicator"
-msgstr "Indicador de l'espai de treball"
-
-#: extensions/workspace-indicator/prefs.js:33
+#: extensions/workspace-indicator/prefs.js:141
 msgid "Workspace Names"
 msgstr "Noms dels espais de treball"

-#: extensions/workspace-indicator/prefs.js:66
+#: extensions/workspace-indicator/prefs.js:157
+msgid "Name"
+msgstr "Nom"
+
+#: extensions/workspace-indicator/prefs.js:198
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Espai de treball %d"

-#: extensions/workspace-indicator/prefs.js:207
-msgid "Add Workspace"
-msgstr "Afegeix un espai de treball"
+#~ 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
@@ -2,15 +2,15 @@
 # Copyright (C) 2011 gnome-shell-extensions's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-shell-extensions package.
 # Petr Kovar <pknbe@volny.cz>, 2013.
-# Marek Černocký <marek@manet.cz>, 2011, 2012, 2013, 2014, 2015, 2017, 2019, 2020.
+# Marek Černocký <marek@manet.cz>, 2011, 2012, 2013, 2014, 2015, 2017.
 #
 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: 2020-05-28 00:55+0000\n"
-"PO-Revision-Date: 2020-08-28 22:18+0200\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"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
@@ -28,11 +28,71 @@ msgstr "GNOME klasik"
 msgid "This session logs you into GNOME Classic"
 msgstr "Toto sezení vás přihlásí do GNOME klasik"

-#: extensions/apps-menu/extension.js:113
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:7
+msgid "Attach modal dialog to the parent window"
+msgstr "Modální dialogová okna připojovat k rodičovskému oknu"
+
+#: 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 "Když běží GNOME Shell, tento klíč přepíše klíč v org.gnome.mutter"
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
+msgid "Arrangement of buttons on the titlebar"
+msgstr "Uspořádání tlačítek v záhlaví"
+
+#: 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 ""
+"Když běží GNOME Shell, tento klíč přepíše klíč v org.gnome.desktop.wm."
+"preferences"
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:24
+msgid "Enable edge tiling when dropping windows on screen edges"
+msgstr "Okna upuštěná u okraje obrazovky nechat řadit jako dlaždice"
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:32
+msgid "Workspaces only on primary monitor"
+msgstr "Pracovní plochy jen na hlavním monitoru"
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:40
+msgid "Delay focus changes in mouse mode until the pointer stops moving"
+msgstr "Neměnit zaměření v režimu s myší, dokud se nezastaví ukazatel"
+
+#: extensions/alternate-tab/prefs.js:20
+msgid "Thumbnail only"
+msgstr "Pouze náhled"
+
+#: extensions/alternate-tab/prefs.js:21
+msgid "Application icon only"
+msgstr "Pouze ikona aplikace"
+
+#: extensions/alternate-tab/prefs.js:22
+msgid "Thumbnail and application icon"
+msgstr "Náhled a ikona aplikace"
+
+#: extensions/alternate-tab/prefs.js:38
+msgid "Present windows as"
+msgstr "Představovat okna jako"
+
+#: extensions/alternate-tab/prefs.js:69
+msgid "Show only windows in the current workspace"
+msgstr "Zobrazovat pouze okna z aktuální pracovní plochy"
+
+#: extensions/apps-menu/extension.js:41
+msgid "Activities Overview"
+msgstr "Přehled činností"
+
+#: extensions/apps-menu/extension.js:141
 msgid "Favorites"
 msgstr "Oblíbené"

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

@@ -48,29 +108,71 @@ msgstr ""
 "Seznam řetězců, z nichž každý obsahuje ID aplikace (název souboru pracovní "
 "plochy), následovaný dvojtečkou a číslem pracovní plochy"

-#: extensions/auto-move-windows/prefs.js:35
-msgid "Workspace Rules"
-msgstr "Pravidla pracovních ploch"
+#: extensions/auto-move-windows/prefs.js:60
+msgid "Application"
+msgstr "Aplikace"

-#: extensions/auto-move-windows/prefs.js:243
+#: extensions/auto-move-windows/prefs.js:69
+#: extensions/auto-move-windows/prefs.js:127
+msgid "Workspace"
+msgstr "Pracovní plocha"
+
+#: extensions/auto-move-windows/prefs.js:85
 msgid "Add Rule"
 msgstr "Přidat pravidlo"

-#. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:112
-#: extensions/places-menu/placeDisplay.js:233
+#: extensions/auto-move-windows/prefs.js:106
+msgid "Create new matching rule"
+msgstr "Vytvoření nového srovnávacího pravidla"
+
+#: extensions/auto-move-windows/prefs.js:111
+msgid "Add"
+msgstr "Přidat"
+
+#: extensions/drive-menu/extension.js:106
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "Vysunutí disku „%s“ selhalo:"

-#: extensions/drive-menu/extension.js:128
+#: extensions/drive-menu/extension.js:124
 msgid "Removable devices"
 msgstr "Výměnná zařízení"

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

+#: extensions/example/extension.js:17
+msgid "Hello, world!"
+msgstr "Ahoj světe!"
+
+#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:5
+msgid "Alternative greeting text."
+msgstr "Alternativní uvítací text"
+
+#: 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 ""
+"Pokud není prázdné, obsahuje text, který se objeví po kliknutí na panel."
+
+#: extensions/example/prefs.js:30
+msgid "Message"
+msgstr "Zpráva"
+
+#. 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 ""
+"Rozšíření Example vám má jen ukázat, jak sestavit dobře fungující rozšíření "
+"pro Shell, a tak je jeho praktické využití pramalé.\n"
+"Přesto si můžete alespoň upravit uvítací zprávu."
+
 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
 msgid "Use more screen for windows"
 msgstr "Použít větší část obrazovky pro okna"
@@ -99,31 +201,31 @@ msgstr ""
 "přepíše výchozí chování shellu, který jej umisťuje dolů. Změna tohoto "
 "nastavení vyžaduje restart shellu, aby se projevila."

-#: extensions/places-menu/extension.js:89
-#: extensions/places-menu/extension.js:93
+#: extensions/places-menu/extension.js:78
+#: extensions/places-menu/extension.js:81
 msgid "Places"
 msgstr "Místa"

-#: extensions/places-menu/placeDisplay.js:46
-#, javascript-format
-msgid "Failed to launch “%s”"
-msgstr "Selhalo spuštění „%s“"
-
-#: extensions/places-menu/placeDisplay.js:61
+#: 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:148
-#: extensions/places-menu/placeDisplay.js:171
+#: extensions/places-menu/placeDisplay.js:78
+#, 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
 msgid "Computer"
 msgstr "Počítač"

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

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

@@ -143,47 +245,52 @@ msgstr "Název motivu"
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "Název motivu, který se má načíst z ~/.themes/name/gnome-shell"

-#: extensions/window-list/extension.js:98
+#: extensions/window-list/extension.js:110
 msgid "Close"
 msgstr "Zavřít"

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

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

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

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

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

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

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

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

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

-#: extensions/window-list/extension.js:734
+#: extensions/window-list/extension.js:678
+#: extensions/workspace-indicator/extension.js:30
+msgid "Workspace Indicator"
+msgstr "Ukazatel pracovní plochy"
+
+#: extensions/window-list/extension.js:842
 msgid "Window List"
 msgstr "Seznam oken"

@@ -200,19 +307,10 @@ msgstr ""
 "hodnoty jsou „never“ (nikdy), „auto“ (automaticky) a „always“ (vždy)."

 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-#: extensions/window-list/prefs.js:100
-msgid "Show windows from all workspaces"
-msgstr "Zobrazovat okna ze všech pracovních ploch"
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
-msgid "Whether to show windows from all workspaces or only the current one."
-msgstr "Zda zobrazovat okna ze všech pracovních ploch nebo jen z aktuální."
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:27
 msgid "Show the window list on all monitors"
 msgstr "Zobrazovat seznam oken na všech monitorech"

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:28
+#: 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."
@@ -220,40 +318,35 @@ msgstr ""
 "Zda zobrazovat seznam oken na všech připojených monitorech nebo jen na "
 "hlavním."

-#: extensions/window-list/prefs.js:29
+#: extensions/window-list/prefs.js:32
 msgid "Window Grouping"
 msgstr "Seskupování oken"

-#: extensions/window-list/prefs.js:58
+#: extensions/window-list/prefs.js:50
 msgid "Never group windows"
 msgstr "Nikdy neseskupovat okna"

-#: extensions/window-list/prefs.js:59
+#: extensions/window-list/prefs.js:51
 msgid "Group windows when space is limited"
 msgstr "Seskupovat okna při nedostatku místa"

-#: extensions/window-list/prefs.js:60
+#: extensions/window-list/prefs.js:52
 msgid "Always group windows"
 msgstr "Vždy seskupovat okna"

-#: extensions/window-list/prefs.js:94
+#: extensions/window-list/prefs.js:75
 msgid "Show on all monitors"
 msgstr "Zobrazovat na všech monitorech"

-#: extensions/window-list/workspaceIndicator.js:207
-#: extensions/workspace-indicator/extension.js:213
-msgid "Workspace Indicator"
-msgstr "Ukazatel pracovní plochy"
-
-#: extensions/workspace-indicator/prefs.js:34
+#: extensions/workspace-indicator/prefs.js:141
 msgid "Workspace Names"
 msgstr "Názvy pracovních ploch"

-#: extensions/workspace-indicator/prefs.js:67
+#: extensions/workspace-indicator/prefs.js:157
+msgid "Name"
+msgstr "Název"
+
+#: extensions/workspace-indicator/prefs.js:198
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Pracovní plocha %d"
-
-#: extensions/workspace-indicator/prefs.js:218
-msgid "Add Workspace"
-msgstr "Přidat pracovní plochu"
--- a/po/da.po
+++ b/po/da.po
@@ -9,18 +9,17 @@
 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: 2020-05-28 00:55+0000\n"
-"PO-Revision-Date: 2020-09-07 18:36+0200\n"
-"Last-Translator: Alan Mortensen <alanmortensen.am@gmail.com>\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"
+"Last-Translator: Kris Thomsen <mail@kristhomsen.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\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.3\n"

 #: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
 msgid "GNOME Classic"
@@ -30,11 +29,74 @@ msgstr "GNOME Classic"
 msgid "This session logs you into GNOME Classic"
 msgstr "Denne session logger dig ind i GNOME Classic"

-#: extensions/apps-menu/extension.js:113
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:7
+msgid "Attach modal dialog to the parent window"
+msgstr "Tillæg modal-dialog til det overordnede vindue"
+
+#: 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 ""
+"Denne nøgle tilsidesætter nøglen i org.gnome.mutter når GNOME Shell kører."
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
+msgid "Arrangement of buttons on the titlebar"
+msgstr "Placeringen af knapper i titellinjen"
+
+#: 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 ""
+"Denne nøgle tilsidesætter nøglen i org.gnome.desktop.wm.preferences når "
+"GNOME Shell kører."
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:24
+msgid "Enable edge tiling when dropping windows on screen edges"
+msgstr "Aktivér kant-fliselægning når vinduer slippes på skærmkanter"
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:32
+msgid "Workspaces only on primary monitor"
+msgstr "Kun arbejdsområder på primær skærm"
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:40
+msgid "Delay focus changes in mouse mode until the pointer stops moving"
+msgstr ""
+"Forsink fokusændringer i musetilstand indtil pegeren holder op med at bevæge "
+"sig"
+
+#: extensions/alternate-tab/prefs.js:20
+msgid "Thumbnail only"
+msgstr "Kun miniaturebillede"
+
+#: extensions/alternate-tab/prefs.js:21
+msgid "Application icon only"
+msgstr "Kun programikon"
+
+#: extensions/alternate-tab/prefs.js:22
+msgid "Thumbnail and application icon"
+msgstr "Miniaturebillede og programikon"
+
+#: extensions/alternate-tab/prefs.js:38
+msgid "Present windows as"
+msgstr "Præsentér vindue som"
+
+#: extensions/alternate-tab/prefs.js:69
+msgid "Show only windows in the current workspace"
+msgstr "Vis kun vinduer i det nuværende arbejdsområde"
+
+#: extensions/apps-menu/extension.js:41
+msgid "Activities Overview"
+msgstr "Aktivitetsoversigt"
+
+#: extensions/apps-menu/extension.js:141
 msgid "Favorites"
 msgstr "Favoritter"

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

@@ -50,29 +112,74 @@ msgstr ""
 "En liste over strenge, som hver indeholder et program-id "
 "(skrivebordsfilnavn), efterfulgt af et kolon og arbejdsområdets nummer"

-#: extensions/auto-move-windows/prefs.js:35
-msgid "Workspace Rules"
-msgstr "Regler for arbejdsområde"
+#: extensions/auto-move-windows/prefs.js:60
+msgid "Application"
+msgstr "Program"

-#: extensions/auto-move-windows/prefs.js:243
+#: extensions/auto-move-windows/prefs.js:69
+#: extensions/auto-move-windows/prefs.js:127
+msgid "Workspace"
+msgstr "Arbejdsområde"
+
+#: extensions/auto-move-windows/prefs.js:85
 msgid "Add Rule"
 msgstr "Tilføj regel"

+#: extensions/auto-move-windows/prefs.js:106
+msgid "Create new matching rule"
+msgstr "Opret ny regel for match"
+
+#: extensions/auto-move-windows/prefs.js:111
+msgid "Add"
+msgstr "Tilføj"
+
 #. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:112
-#: extensions/places-menu/placeDisplay.js:233
+#: extensions/drive-menu/extension.js:107
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "Udskubning af drevet “%s” mislykkedes:"

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

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

+#: extensions/example/extension.js:17
+msgid "Hello, world!"
+msgstr "Hej verden!"
+
+#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:5
+msgid "Alternative greeting text."
+msgstr "Alternativ velkomsttekst."
+
+#: 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 ""
+"Hvis den ikke er tom, så indeholder den teksten, der vil blive vist når der "
+"klikkes på panelet."
+
+#: extensions/example/prefs.js:30
+msgid "Message"
+msgstr "Besked"
+
+#. TRANSLATORS: Example is the name of the extension, should not be
+#. translated
+#: extensions/example/prefs.js:43
+msgid ""
+"Example aims to show how to build well behaved extensions for the Shell and "
+"as such it has little functionality on its own.\n"
+"Nevertheless it’s possible to customize the greeting message."
+msgstr ""
+"Example sigter efter at vise, hvordan man bygger udvidelser til skallen, som "
+"opfører sig ordentligt, og har som sådan meget lidt selvstændig "
+"funktionalitet.\n"
+"Alligevel er det muligt at tilpasse velkomstbeskeden."
+
 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
 msgid "Use more screen for windows"
 msgstr "Brug mere skærmplads til vinduer"
@@ -103,31 +210,31 @@ msgstr ""
 "Ændring af denne indstilling kræver at shell'en genstartes for at træde i "
 "kraft."

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

-#: extensions/places-menu/placeDisplay.js:46
-#, javascript-format
-msgid "Failed to launch “%s”"
-msgstr "Kunne ikke åbne “%s”"
-
-#: extensions/places-menu/placeDisplay.js:61
+#: 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:148
-#: extensions/places-menu/placeDisplay.js:171
+#: extensions/places-menu/placeDisplay.js:78
+#, javascript-format
+msgid "Failed to launch “%s”"
+msgstr "Kunne ikke åbne “%s”"
+
+#: extensions/places-menu/placeDisplay.js:137
+#: extensions/places-menu/placeDisplay.js:160
 msgid "Computer"
 msgstr "Computer"

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

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

@@ -147,47 +254,52 @@ msgstr "Temanavn"
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "Navnet på temaet, som indlæses fra ~/.themes/name/gnome-shell"

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

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

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

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

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

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

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

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

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

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

-#: extensions/window-list/extension.js:734
+#: extensions/window-list/extension.js:678
+#: extensions/workspace-indicator/extension.js:30
+msgid "Workspace Indicator"
+msgstr "Arbejdsområdeindikator"
+
+#: extensions/window-list/extension.js:842
 msgid "Window List"
 msgstr "Vinduesliste"

@@ -204,20 +316,10 @@ msgstr ""
 "Mulige værdier er “never” (aldrig), “auto” (automatisk) og “always” (altid)."

 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-#: extensions/window-list/prefs.js:100
-msgid "Show windows from all workspaces"
-msgstr "Vis vinduer fra alle arbejdsområder"
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
-msgid "Whether to show windows from all workspaces or only the current one."
-msgstr ""
-"Om der skal vises vinduer fra alle arbejdsområder eller kun det nuværende."
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:27
 msgid "Show the window list on all monitors"
 msgstr "Vis vindueslisten på alle skærme"

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:28
+#: 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."
@@ -225,122 +327,35 @@ msgstr ""
 "Om vindueslisten skal vise på alle tilsluttede skærme, eller kun på den "
 "primære."

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

-#: extensions/window-list/prefs.js:58
+#: extensions/window-list/prefs.js:50
 msgid "Never group windows"
 msgstr "Gruppér aldrig vinduer"

-#: extensions/window-list/prefs.js:59
+#: extensions/window-list/prefs.js:51
 msgid "Group windows when space is limited"
 msgstr "Gruppér vinduer når pladsen er begrænset"

-#: extensions/window-list/prefs.js:60
+#: extensions/window-list/prefs.js:52
 msgid "Always group windows"
 msgstr "Gruppér altid vinduer"

-#: extensions/window-list/prefs.js:94
+#: extensions/window-list/prefs.js:75
 msgid "Show on all monitors"
 msgstr "Vis på alle skærme"

-#: extensions/window-list/workspaceIndicator.js:207
-#: extensions/workspace-indicator/extension.js:213
-msgid "Workspace Indicator"
-msgstr "Arbejdsområdeindikator"
-
-#: extensions/workspace-indicator/prefs.js:34
+#: extensions/workspace-indicator/prefs.js:141
 msgid "Workspace Names"
 msgstr "Navne på arbejdsområder"

-#: extensions/workspace-indicator/prefs.js:67
+#: extensions/workspace-indicator/prefs.js:157
+msgid "Name"
+msgstr "Navn"
+
+#: extensions/workspace-indicator/prefs.js:198
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Arbejdsområde %d"
-
-#: extensions/workspace-indicator/prefs.js:218
-msgid "Add Workspace"
-msgstr "Tilføj arbejdsområde"
-
-#~ msgid "Application"
-#~ msgstr "Program"
-
-#~ msgid "Create new matching rule"
-#~ msgstr "Opret ny regel for match"
-
-#~ msgid "Add"
-#~ msgstr "Tilføj"
-
-#~ msgid "Name"
-#~ msgstr "Navn"
-
-#~ msgid "Attach modal dialog to the parent window"
-#~ msgstr "Tillæg modal-dialog til det overordnede vindue"
-
-#~ msgid ""
-#~ "This key overrides the key in org.gnome.mutter when running GNOME Shell."
-#~ msgstr ""
-#~ "Denne nøgle tilsidesætter nøglen i org.gnome.mutter når GNOME Shell kører."
-
-#~ msgid "Arrangement of buttons on the titlebar"
-#~ msgstr "Placeringen af knapper i titellinjen"
-
-#~ msgid ""
-#~ "This key overrides the key in org.gnome.desktop.wm.preferences when "
-#~ "running GNOME Shell."
-#~ msgstr ""
-#~ "Denne nøgle tilsidesætter nøglen i org.gnome.desktop.wm.preferences når "
-#~ "GNOME Shell kører."
-
-#~ msgid "Enable edge tiling when dropping windows on screen edges"
-#~ msgstr "Aktivér kant-fliselægning når vinduer slippes på skærmkanter"
-
-#~ msgid "Workspaces only on primary monitor"
-#~ msgstr "Kun arbejdsområder på primær skærm"
-
-#~ msgid "Delay focus changes in mouse mode until the pointer stops moving"
-#~ msgstr ""
-#~ "Forsink fokusændringer i musetilstand indtil pegeren holder op med at "
-#~ "bevæge sig"
-
-#~ msgid "Thumbnail only"
-#~ msgstr "Kun miniaturebillede"
-
-#~ msgid "Application icon only"
-#~ msgstr "Kun programikon"
-
-#~ msgid "Thumbnail and application icon"
-#~ msgstr "Miniaturebillede og programikon"
-
-#~ msgid "Present windows as"
-#~ msgstr "Præsentér vindue som"
-
-#~ msgid "Activities Overview"
-#~ msgstr "Aktivitetsoversigt"
-
-#~ msgid "Hello, world!"
-#~ msgstr "Hej verden!"
-
-#~ msgid "Alternative greeting text."
-#~ msgstr "Alternativ velkomsttekst."
-
-#~ msgid ""
-#~ "If not empty, it contains the text that will be shown when clicking on "
-#~ "the panel."
-#~ msgstr ""
-#~ "Hvis den ikke er tom, så indeholder den teksten, der vil blive vist når "
-#~ "der klikkes på panelet."
-
-#~ msgid "Message"
-#~ msgstr "Besked"
-
-#~ msgid ""
-#~ "Example aims to show how to build well behaved extensions for the Shell "
-#~ "and as such it has little functionality on its own.\n"
-#~ "Nevertheless it’s possible to customize the greeting message."
-#~ msgstr ""
-#~ "Example sigter efter at vise, hvordan man bygger udvidelser til skallen, "
-#~ "som opfører sig ordentligt, og har som sådan meget lidt selvstændig "
-#~ "funktionalitet.\n"
-#~ "Alligevel er det muligt at tilpasse velkomstbeskeden."
--- a/po/de.po
+++ b/po/de.po
@@ -6,23 +6,22 @@
 # Benjamin Steinwender <b@stbe.at>, 2013.
 # Wolfgang Stöggl <c72578@yahoo.de>, 2014.
 # Paul Seyfert <pseyfert@mathphys.fsk.uni-heidelberg.de>, 2017.
-# Tim Sabsch <tim@sabsch.com>, 2019-2020.
 #
 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: 2020-05-28 00:55+0000\n"
-"PO-Revision-Date: 2020-09-08 20:20+0200\n"
-"Last-Translator: Tim Sabsch <tim@sabsch.com>\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"
 "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.4.1\n"
+"X-Generator: Poedit 2.0.2\n"

 #: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
 msgid "GNOME Classic"
@@ -32,11 +31,77 @@ msgstr "GNOME Classic"
 msgid "This session logs you into GNOME Classic"
 msgstr "Diese Sitzung meldet Sie in GNOME Classic an"

-#: extensions/apps-menu/extension.js:113
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:7
+msgid "Attach modal dialog to the parent window"
+msgstr "Einen modalen Dialog an das übergeordnete Fenster anhängen"
+
+#: 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 ""
+"Dieser Schlüssel überschreibt den Schlüssel in »org.gnome.mutter«, wenn die "
+"GNOME-Shell ausgeführt wird."
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
+msgid "Arrangement of buttons on the titlebar"
+msgstr "Anordnung von Knöpfen auf der Titelleiste"
+
+#: 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 ""
+"Dieser Schlüssel überschreibt den Schlüssel in »org.gnome.desktop.wm."
+"preferences«, wenn die GNOME-Shell ausgeführt wird."
+
+# identisch zum Schüssel in »gnome-shell«
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:24
+msgid "Enable edge tiling when dropping windows on screen edges"
+msgstr ""
+"Größenanpassung aktivieren, wenn ein Fenster an die Bildschirmkante "
+"verschoben wird"
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:32
+msgid "Workspaces only on primary monitor"
+msgstr "Arbeitsflächen nur auf dem Primärmonitor"
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:40
+msgid "Delay focus changes in mouse mode until the pointer stops moving"
+msgstr ""
+"Fokuswechsel im Mausmodus verzögern, bis sich der Zeiger nicht mehr bewegt."
+
+#: extensions/alternate-tab/prefs.js:20
+msgid "Thumbnail only"
+msgstr "Nur Vorschaubild"
+
+#: extensions/alternate-tab/prefs.js:21
+msgid "Application icon only"
+msgstr "Nur Anwendungssymbol"
+
+#: extensions/alternate-tab/prefs.js:22
+msgid "Thumbnail and application icon"
+msgstr "Vorschaubild und Anwendungssymbol"
+
+#: extensions/alternate-tab/prefs.js:38
+msgid "Present windows as"
+msgstr "Fenster darstellen als"
+
+#: extensions/alternate-tab/prefs.js:69
+msgid "Show only windows in the current workspace"
+msgstr "Nur Fenster der aktuellen Arbeitsfläche anzeigen"
+
+#: extensions/apps-menu/extension.js:41
+msgid "Activities Overview"
+msgstr "Aktivitäten-Übersicht"
+
+#: extensions/apps-menu/extension.js:141
 msgid "Favorites"
 msgstr "Favoriten"

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

@@ -53,29 +118,72 @@ msgstr ""
 "Datei) enthält, gefolgt von einem Doppelpunkt und der Nummer der "
 "Arbeitsfläche"

-#: extensions/auto-move-windows/prefs.js:35
-msgid "Workspace Rules"
-msgstr "Arbeitsfläche-Regeln"
+#: extensions/auto-move-windows/prefs.js:60
+msgid "Application"
+msgstr "Anwendung"

-#: extensions/auto-move-windows/prefs.js:243
+#: extensions/auto-move-windows/prefs.js:69
+#: extensions/auto-move-windows/prefs.js:127
+msgid "Workspace"
+msgstr "Arbeitsfläche "
+
+#: extensions/auto-move-windows/prefs.js:85
 msgid "Add Rule"
 msgstr "Regel hinzufügen"

-#. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:112
-#: extensions/places-menu/placeDisplay.js:233
+#: extensions/auto-move-windows/prefs.js:106
+msgid "Create new matching rule"
+msgstr "Neue Übereinstimmungsregel erstellen"
+
+#: extensions/auto-move-windows/prefs.js:111
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: extensions/drive-menu/extension.js:106
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "Auswerfen von Laufwerk »%s« schlug fehl:"

-#: extensions/drive-menu/extension.js:128
+#: extensions/drive-menu/extension.js:124
 msgid "Removable devices"
 msgstr "Wechseldatenträger"

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

+#: extensions/example/extension.js:17
+msgid "Hello, world!"
+msgstr "Hallo Welt!"
+
+#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:5
+msgid "Alternative greeting text."
+msgstr "Alternativer Begrüßungstext."
+
+#: 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 ""
+"Falls nicht leer, ist dies der Text, der beim Anklicken des Panels angezeigt "
+"wird."
+
+#: extensions/example/prefs.js:30
+msgid "Message"
+msgstr "Nachricht"
+
+#. 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 ""
+"Das Beispiel soll zeigen, wie sich korrekt verhaltende Erweiterungen für die "
+"Shell erstellt werden. Es enthält grundlegende Funktionalität.\n"
+"Es ist möglich, die Begrüßungsnachricht zu ändern."
+
 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
 msgid "Use more screen for windows"
 msgstr "Mehr Bildschirmbereich für Fenster verwenden"
@@ -106,31 +214,31 @@ msgstr ""
 "Vorschaubild platziert und damit die Voreinstellung der Shell übergangen. "
 "Eine Änderungseinstellung tritt erst mit einem Neustart der Shell in Kraft."

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

-#: extensions/places-menu/placeDisplay.js:46
-#, javascript-format
-msgid "Failed to launch “%s”"
-msgstr "Starten von »%s« fehlgeschlagen"
-
-#: extensions/places-menu/placeDisplay.js:61
+#: 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:148
-#: extensions/places-menu/placeDisplay.js:171
+#: extensions/places-menu/placeDisplay.js:78
+#, javascript-format
+msgid "Failed to launch “%s”"
+msgstr "Starten von »%s« fehlgeschlagen"
+
+#: extensions/places-menu/placeDisplay.js:137
+#: extensions/places-menu/placeDisplay.js:160
 msgid "Computer"
 msgstr "Rechner"

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

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

@@ -152,47 +260,52 @@ msgstr ""
 "Der Name des Themas, welches aus ~/.themes/name/gnome-shell geladen werden "
 "soll"

-#: extensions/window-list/extension.js:98
+#: extensions/window-list/extension.js:110
 msgid "Close"
 msgstr "Schließen"

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

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

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

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

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

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

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

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

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

-#: extensions/window-list/extension.js:734
+#: extensions/window-list/extension.js:678
+#: extensions/workspace-indicator/extension.js:30
+msgid "Workspace Indicator"
+msgstr "Arbeitsflächenindikator"
+
+#: extensions/window-list/extension.js:842
 msgid "Window List"
 msgstr "Fensterliste"

@@ -210,21 +323,10 @@ msgstr ""
 "»always« (immer)."

 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-#: extensions/window-list/prefs.js:100
-msgid "Show windows from all workspaces"
-msgstr "Fenster von allen Arbeitsflächen anzeigen"
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
-msgid "Whether to show windows from all workspaces or only the current one."
-msgstr ""
-"Legt fest, ob Fenster von allen oder nur der aktuellen Arbeitsflächen "
-"angezeigt werden."
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:27
 msgid "Show the window list on all monitors"
 msgstr "Die Fensterliste auf allen Bildschirmen anzeigen"

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:28
+#: 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."
@@ -232,125 +334,35 @@ msgstr ""
 "Legt fest, ob die Fensterliste auf allen angeschlossenen Bildschirmen "
 "angezeigt wird oder nur auf dem Primären."

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

-#: extensions/window-list/prefs.js:58
+#: extensions/window-list/prefs.js:50
 msgid "Never group windows"
 msgstr "Fenster niemals gruppieren"

-#: extensions/window-list/prefs.js:59
+#: extensions/window-list/prefs.js:51
 msgid "Group windows when space is limited"
 msgstr "Fenster bei Platzmangel gruppieren"

-#: extensions/window-list/prefs.js:60
+#: extensions/window-list/prefs.js:52
 msgid "Always group windows"
 msgstr "Fenster immer gruppieren"

-#: extensions/window-list/prefs.js:94
+#: extensions/window-list/prefs.js:75
 msgid "Show on all monitors"
 msgstr "Auf allen Bildschirmen anzeigen"

-#: extensions/window-list/workspaceIndicator.js:207
-#: extensions/workspace-indicator/extension.js:213
-msgid "Workspace Indicator"
-msgstr "Arbeitsflächenindikator"
-
-#: extensions/workspace-indicator/prefs.js:34
+#: extensions/workspace-indicator/prefs.js:141
 msgid "Workspace Names"
 msgstr "Namen der Arbeitsflächen"

-#: extensions/workspace-indicator/prefs.js:67
+#: extensions/workspace-indicator/prefs.js:157
+msgid "Name"
+msgstr "Name"
+
+#: extensions/workspace-indicator/prefs.js:198
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Arbeitsfläche %d"
-
-#: extensions/workspace-indicator/prefs.js:218
-msgid "Add Workspace"
-msgstr "Arbeitsfläche hinzufügen"
-
-#~ msgid "Application"
-#~ msgstr "Anwendung"
-
-#~ msgid "Create new matching rule"
-#~ msgstr "Neue Übereinstimmungsregel erstellen"
-
-#~ msgid "Add"
-#~ msgstr "Hinzufügen"
-
-#~ msgid "Name"
-#~ msgstr "Name"
-
-#~ msgid "Attach modal dialog to the parent window"
-#~ msgstr "Einen modalen Dialog an das übergeordnete Fenster anhängen"
-
-#~ msgid ""
-#~ "This key overrides the key in org.gnome.mutter when running GNOME Shell."
-#~ msgstr ""
-#~ "Dieser Schlüssel überschreibt den Schlüssel in »org.gnome.mutter«, wenn "
-#~ "die GNOME-Shell ausgeführt wird."
-
-#~ msgid "Arrangement of buttons on the titlebar"
-#~ msgstr "Anordnung von Knöpfen auf der Titelleiste"
-
-#~ msgid ""
-#~ "This key overrides the key in org.gnome.desktop.wm.preferences when "
-#~ "running GNOME Shell."
-#~ msgstr ""
-#~ "Dieser Schlüssel überschreibt den Schlüssel in »org.gnome.desktop.wm."
-#~ "preferences«, wenn die GNOME-Shell ausgeführt wird."
-
-# identisch zum Schüssel in »gnome-shell«
-#~ msgid "Enable edge tiling when dropping windows on screen edges"
-#~ msgstr ""
-#~ "Größenanpassung aktivieren, wenn ein Fenster an die Bildschirmkante "
-#~ "verschoben wird"
-
-#~ msgid "Workspaces only on primary monitor"
-#~ msgstr "Arbeitsflächen nur auf dem Primärmonitor"
-
-#~ msgid "Delay focus changes in mouse mode until the pointer stops moving"
-#~ msgstr ""
-#~ "Fokuswechsel im Mausmodus verzögern, bis sich der Zeiger nicht mehr "
-#~ "bewegt."
-
-#~ msgid "Thumbnail only"
-#~ msgstr "Nur Vorschaubild"
-
-#~ msgid "Application icon only"
-#~ msgstr "Nur Anwendungssymbol"
-
-#~ msgid "Thumbnail and application icon"
-#~ msgstr "Vorschaubild und Anwendungssymbol"
-
-#~ msgid "Present windows as"
-#~ msgstr "Fenster darstellen als"
-
-#~ msgid "Activities Overview"
-#~ msgstr "Aktivitäten-Übersicht"
-
-#~ msgid "Hello, world!"
-#~ msgstr "Hallo Welt!"
-
-#~ msgid "Alternative greeting text."
-#~ msgstr "Alternativer Begrüßungstext."
-
-#~ msgid ""
-#~ "If not empty, it contains the text that will be shown when clicking on "
-#~ "the panel."
-#~ msgstr ""
-#~ "Falls nicht leer, ist dies der Text, der beim Anklicken des Panels "
-#~ "angezeigt wird."
-
-#~ msgid "Message"
-#~ msgstr "Nachricht"
-
-#~ 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 ""
-#~ "Das Beispiel soll zeigen, wie sich korrekt verhaltende Erweiterungen für "
-#~ "die Shell erstellt werden. Es enthält grundlegende Funktionalität.\n"
-#~ "Es ist möglich, die Begrüßungsnachricht zu ändern."
--- a/po/el.po
+++ b/po/el.po
@@ -5,23 +5,22 @@
 # Ιωάννης Ζαμπούκας <ioza1964@yahoo.gr>, 2011.
 # Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>, 2013, 2015.
 # Vangelis Skarmoutsos <skarmoutsosv@gmail.com>, 2013.
-# Efstathios Iosifidis <iosifidis@opensuse.org>, 2013-2019.
-#
+# Efstathios Iosifidis <iosifidis@opensuse.org>, 2013.
 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: 2020-05-28 00:55+0000\n"
-"PO-Revision-Date: 2020-07-14 00:40+0300\n"
-"Last-Translator: Efstathios Iosifidis <eiosifidis@gnome.org>\n"
-"Language-Team: Greek, Modern (1453-) <gnome-el-list@gnome.org>\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"
+"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.8.7.1\n"
+"X-Generator: Poedit 1.5.7\n"
 "X-Project-Style: gnome\n"

 #: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
@@ -32,11 +31,77 @@ msgstr "GNOME Classic"
 msgid "This session logs you into GNOME Classic"
 msgstr "Αυτή η συνεδρία σας συνδέει στο GNOME Classic"

-#: extensions/apps-menu/extension.js:113
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:7
+msgid "Attach modal dialog to the parent window"
+msgstr "Προσάρτηση αποκλειστικού διαλόγου στο γονικό παράθυρο"
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:8
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:25
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:33
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:41
+msgid ""
+"This key overrides the key in org.gnome.mutter when running GNOME Shell."
+msgstr ""
+"Αυτό το κλειδί επικαλύπτει το κλειδί στο org.gnome.mutter όταν εκτελείται το "
+"GNOME Shell."
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
+msgid "Arrangement of buttons on the titlebar"
+msgstr "Διάταξη κουμπιών της γραμμής τίτλου"
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:17
+msgid ""
+"This key overrides the key in org.gnome.desktop.wm.preferences when running "
+"GNOME Shell."
+msgstr ""
+"Αυτό το κλειδί επικαλύπτει το κλειδί στο org.gnome.mutter όταν εκτελείται το "
+"GNOME Shell."
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:24
+msgid "Enable edge tiling when dropping windows on screen edges"
+msgstr ""
+"Ενεργοποίηση προσκόλλησης στην άκρη, όταν αφήνονται παράθυρα στα άκρα της "
+"οθόνης"
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:32
+msgid "Workspaces only on primary monitor"
+msgstr "Χώροι εργασίας μόνο στην κύρια οθόνη"
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:40
+msgid "Delay focus changes in mouse mode until the pointer stops moving"
+msgstr ""
+"Καθυστέρηση εστίασης αλλαγών στην κατάσταση ποντικιού μέχρι να σταματήσει να "
+"κινείται ο δείκτης"
+
+#: extensions/alternate-tab/prefs.js:20
+msgid "Thumbnail only"
+msgstr "Μόνο μικρογραφία"
+
+#: extensions/alternate-tab/prefs.js:21
+msgid "Application icon only"
+msgstr "Μόνο εικονίδιο εφαρμογής"
+
+#: extensions/alternate-tab/prefs.js:22
+msgid "Thumbnail and application icon"
+msgstr "Μικρογραφία και εικονίδιο εφαρμογής"
+
+#: extensions/alternate-tab/prefs.js:38
+msgid "Present windows as"
+msgstr "Παρουσίαση παραθύρων ως"
+
+#: extensions/alternate-tab/prefs.js:69
+msgid "Show only windows in the current workspace"
+msgstr "Εμφάνιση μόνο των παραθύρων του τρέχοντος χώρου εργασίας"
+
+#: extensions/apps-menu/extension.js:41
+msgid "Activities Overview"
+msgstr "Επισκόπηση δραστηριοτήτων"
+
+#: extensions/apps-menu/extension.js:141
 msgid "Favorites"
 msgstr "Αγαπημένα"

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

@@ -53,29 +118,74 @@ msgstr ""
 "(όνομα αρχείου επιφάνειας εργασίας), ακολουθούμενη από άνω-κάτω τελεία και "
 "τον αριθμό του χώρου εργασίας"

-#: extensions/auto-move-windows/prefs.js:35
-msgid "Workspace Rules"
-msgstr "Κανόνες χώρων εργασίας"
+#: extensions/auto-move-windows/prefs.js:60
+msgid "Application"
+msgstr "Εφαρμογή"

-#: extensions/auto-move-windows/prefs.js:243
+#: 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:112
-#: extensions/places-menu/placeDisplay.js:233
-#, javascript-format
+#: extensions/drive-menu/extension.js:107
 msgid "Ejecting drive “%s” failed:"
 msgstr "Αποτυχία εξαγωγής του δίσκου «%s»:"

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

-#: extensions/drive-menu/extension.js:155
+#: extensions/drive-menu/extension.js:150
+#| msgid "Open File"
 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 ""
+"Το παράδειγμα στοχεύει να δείξει πώς δημιουργούμε επεκτάσεις που "
+"συμπεριφέρονται σωστά στο κέλυφος και ως τέτοιο έχει μικρή λειτουργικότητα "
+"από μόνο του.\n"
+"Παρ' όλα αυτά είναι δυνατό να προσαρμόσετε το μήνυμα χαιρετισμού."
+
 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
 msgid "Use more screen for windows"
 msgstr "Χρησιμοποιήστε περισσότερη οθόνη για τα παράθυρα"
@@ -106,31 +216,30 @@ msgstr ""
 "στο κάτω μέρος. Η αλλαγή αυτής της ρύθμισης απαιτεί επανεκκίνηση του "
 "κελύφους για να υπάρξει κάποιο αποτέλεσμα."

-#: extensions/places-menu/extension.js:89
-#: extensions/places-menu/extension.js:93
+#: extensions/places-menu/extension.js:78
+#: extensions/places-menu/extension.js:81
 msgid "Places"
 msgstr "Τοποθεσίες"

-#: extensions/places-menu/placeDisplay.js:46
-#, javascript-format
-msgid "Failed to launch “%s”"
-msgstr "Αποτυχία εκκίνησης «%s»"
-
-#: extensions/places-menu/placeDisplay.js:61
-#, javascript-format
+#: 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:148
-#: extensions/places-menu/placeDisplay.js:171
+#: extensions/places-menu/placeDisplay.js:78
+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:359
+#: extensions/places-menu/placeDisplay.js:303
 msgid "Home"
 msgstr "Προσωπικός φάκελος"

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

@@ -139,6 +248,7 @@ 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 "Μεγέθη κυκλικών στιγμιοτύπων προς τα πίσω"

@@ -151,47 +261,52 @@ msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr ""
 "Το όνομα του θέματος που θα φορτωθεί από το ~ /.themes/name/gnome-shell"

-#: extensions/window-list/extension.js:98
+#: extensions/window-list/extension.js:110
 msgid "Close"
 msgstr "Κλείσιμο"

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

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

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

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

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

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

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

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

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

-#: extensions/window-list/extension.js:734
+#: 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 "Λίστα παραθύρου"

@@ -209,20 +324,10 @@ msgstr ""
 "«always» (πάντα)."

 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-#: extensions/window-list/prefs.js:100
-msgid "Show windows from all workspaces"
-msgstr "Εμφάνιση των παραθύρων από όλους τους χώρους εργασίας"
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
-msgid "Whether to show windows from all workspaces or only the current one."
-msgstr ""
-"Αν θα εμφανίζονται παράθυρα όλων των χώρων εργασίας ή μόνο του τρέχοντα."
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:27
 msgid "Show the window list on all monitors"
 msgstr "Να εμφανίζεται ο κατάλογος παραθύρων σε όλες τις οθόνες"

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:28
+#: 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."
@@ -230,129 +335,38 @@ msgstr ""
 "Αν θα εμφανίζεται ο κατάλογος παραθύρων όλων των συνδεμένων οθονών ή μόνο "
 "της κύριας οθόνης."

-#: extensions/window-list/prefs.js:29
+#: extensions/window-list/prefs.js:32
 msgid "Window Grouping"
 msgstr "Ομαδοποίηση παραθύρου"

-#: extensions/window-list/prefs.js:58
+#: extensions/window-list/prefs.js:50
 msgid "Never group windows"
 msgstr "Να μη γίνεται ποτέ ομαδοποίηση παραθύρων"

-#: extensions/window-list/prefs.js:59
+#: extensions/window-list/prefs.js:51
 msgid "Group windows when space is limited"
 msgstr "Ομαδοποίηση παραθύρων όταν ο χώρος είναι περιορισμένος"

-#: extensions/window-list/prefs.js:60
+#: extensions/window-list/prefs.js:52
 msgid "Always group windows"
 msgstr "Να γίνεται πάντα ομαδοποίηση παραθύρων"

-#: extensions/window-list/prefs.js:94
+#: extensions/window-list/prefs.js:75
 msgid "Show on all monitors"
 msgstr "Να εμφανίζεται σε όλες τις οθόνες"

-#: extensions/window-list/workspaceIndicator.js:207
-#: extensions/workspace-indicator/extension.js:213
-msgid "Workspace Indicator"
-msgstr "Δείκτης χώρου εργασίας"
-
-#: extensions/workspace-indicator/prefs.js:34
+#: extensions/workspace-indicator/prefs.js:141
 msgid "Workspace Names"
 msgstr "Ονόματα χώρων εργασίας:"

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

-#: extensions/workspace-indicator/prefs.js:218
-msgid "Add Workspace"
-msgstr "Προσθήκη χώρου εργασίας"
-
-#~ msgid "Application"
-#~ msgstr "Εφαρμογή"
-
-#~ msgid "Create new matching rule"
-#~ msgstr "Δημιουργία νέου κανόνα αντιστοίχισης"
-
-#~ msgid "Add"
-#~ msgstr "Προσθήκη"
-
-#~ msgid "Name"
-#~ msgstr "Όνομα"
-
-#~ msgid "Attach modal dialog to the parent window"
-#~ msgstr "Προσάρτηση αποκλειστικού διαλόγου στο γονικό παράθυρο"
-
-#~ msgid ""
-#~ "This key overrides the key in org.gnome.mutter when running GNOME Shell."
-#~ msgstr ""
-#~ "Αυτό το κλειδί επικαλύπτει το κλειδί στο org.gnome.mutter όταν εκτελείται "
-#~ "το GNOME Shell."
-
-#~ msgid "Arrangement of buttons on the titlebar"
-#~ msgstr "Διάταξη κουμπιών της γραμμής τίτλου"
-
-#~ msgid ""
-#~ "This key overrides the key in org.gnome.desktop.wm.preferences when "
-#~ "running GNOME Shell."
-#~ msgstr ""
-#~ "Αυτό το κλειδί επικαλύπτει το κλειδί στο org.gnome.mutter όταν εκτελείται "
-#~ "το GNOME Shell."
-
-#~ msgid "Enable edge tiling when dropping windows on screen edges"
-#~ msgstr ""
-#~ "Ενεργοποίηση προσκόλλησης στην άκρη, όταν αφήνονται παράθυρα στα άκρα της "
-#~ "οθόνης"
-
-#~ msgid "Workspaces only on primary monitor"
-#~ msgstr "Χώροι εργασίας μόνο στην κύρια οθόνη"
-
-#~ msgid "Delay focus changes in mouse mode until the pointer stops moving"
-#~ msgstr ""
-#~ "Καθυστέρηση εστίασης αλλαγών στην κατάσταση ποντικιού μέχρι να σταματήσει "
-#~ "να κινείται ο δείκτης"
-
-#~ msgid "Thumbnail only"
-#~ msgstr "Μόνο μικρογραφία"
-
-#~ msgid "Application icon only"
-#~ msgstr "Μόνο εικονίδιο εφαρμογής"
-
-#~ msgid "Thumbnail and application icon"
-#~ msgstr "Μικρογραφία και εικονίδιο εφαρμογής"
-
-#~ msgid "Present windows as"
-#~ msgstr "Παρουσίαση παραθύρων ως"
-
-#~ msgid "Activities Overview"
-#~ msgstr "Επισκόπηση δραστηριοτήτων"
-
-#~ msgid "Hello, world!"
-#~ msgstr "Γεια σου, κόσμε!"
-
-#~ msgid "Alternative greeting text."
-#~ msgstr "Εναλλακτικό κείμενο χαιρετισμού."
-
-#~ msgid ""
-#~ "If not empty, it contains the text that will be shown when clicking on "
-#~ "the panel."
-#~ msgstr ""
-#~ "Αν δεν είναι κενό, περιέχει το κείμενο που θα εμφανιστεί όταν γίνεται "
-#~ "κλικ στον πίνακα εφαρμογών."
-
-#~ msgid "Message"
-#~ msgstr "Μήνυμα"
-
-#~ msgid ""
-#~ "Example aims to show how to build well behaved extensions for the Shell "
-#~ "and as such it has little functionality on its own.\n"
-#~ "Nevertheless it’s possible to customize the greeting message."
-#~ msgstr ""
-#~ "Το παράδειγμα στοχεύει να δείξει πώς δημιουργούμε επεκτάσεις που "
-#~ "συμπεριφέρονται σωστά στο κέλυφος και ως τέτοιο έχει μικρή "
-#~ "λειτουργικότητα από μόνο του.\n"
-#~ "Παρ' όλα αυτά είναι δυνατό να προσαρμόσετε το μήνυμα χαιρετισμού."
-
 #~ msgid "CPU"
 #~ msgstr "CPU"

--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -4,23 +4,21 @@
 # Bruce Cowan <bruce@bcowan.eu>, 2011, 2018.
 # Chris Leonard <cjlhomeaddress@gmail.com>, 2012.
 # Philip Withnall <philip@tecnocode.co.uk>, 2014.
-# Zander Brown <zbrown@gnome.org>, 2019-2020.
-#
 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: 2020-05-28 00:55+0000\n"
-"PO-Revision-Date: 2020-08-24 23:05+0100\n"
-"Last-Translator: Zander Brown <zbrown@gnome.org>\n"
-"Language-Team: English - United Kingdom <en_GB@li.org>\n"
+"POT-Creation-Date: 2018-02-20 23:07+0000\n"
+"PO-Revision-Date: 2018-03-10 18:03+0000\n"
+"Last-Translator: Bruce Cowan <bruce@bcowan.eu>\n"
+"Language-Team: Sugar Labs\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 3.36.0\n"
+"X-Generator: Poedit 2.0.6\n"
 "X-Project-Style: gnome\n"

 #: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
@@ -31,11 +29,72 @@ msgstr "GNOME Classic"
 msgid "This session logs you into GNOME Classic"
 msgstr "This session logs you into GNOME Classic"

-#: extensions/apps-menu/extension.js:113
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:7
+msgid "Attach modal dialog to the parent window"
+msgstr "Attach modal dialogue to the parent window"
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml: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 ""
+"This key overrides the key in org.gnome.mutter when running GNOME Shell."
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
+msgid "Arrangement of buttons on the titlebar"
+msgstr "Arrangement of buttons on the titlebar"
+
+#: 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 ""
+"This key overrides the key in org.gnome.desktop.wm.preferences when running "
+"GNOME Shell."
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:24
+msgid "Enable edge tiling when dropping windows on screen edges"
+msgstr "Enable edge tiling when dropping windows on screen edges"
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:32
+msgid "Workspaces only on primary monitor"
+msgstr "Workspaces only on primary monitor"
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:40
+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
+msgid "Thumbnail only"
+msgstr "Thumbnail only"
+
+#: extensions/alternate-tab/prefs.js:20
+msgid "Application icon only"
+msgstr "Application icon only"
+
+#: extensions/alternate-tab/prefs.js:21
+msgid "Thumbnail and application icon"
+msgstr "Thumbnail and application icon"
+
+#: extensions/alternate-tab/prefs.js:34
+msgid "Present windows as"
+msgstr "Present windows as"
+
+#: extensions/alternate-tab/prefs.js:65
+msgid "Show only windows in the current workspace"
+msgstr "Show only windows in the current workspace"
+
+#: extensions/apps-menu/extension.js:37
+msgid "Activities Overview"
+msgstr "Activities Overview"
+
+#: extensions/apps-menu/extension.js:130
 msgid "Favorites"
 msgstr "Favourites"

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

@@ -51,30 +110,80 @@ 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:35
-#| msgid "Workspace Names"
-msgid "Workspace Rules"
-msgstr "Workspace Rules"
+#: extensions/auto-move-windows/prefs.js:53
+msgid "Application"
+msgstr "Application"

-#: extensions/auto-move-windows/prefs.js:243
+#: extensions/auto-move-windows/prefs.js:62
+#: extensions/auto-move-windows/prefs.js:117
+msgid "Workspace"
+msgstr "Workspace"
+
+#: extensions/auto-move-windows/prefs.js:78
 msgid "Add Rule"
 msgstr "Add Rule"

+#: extensions/auto-move-windows/prefs.js:98
+msgid "Create new matching rule"
+msgstr "Create new matching rule"
+
+#: extensions/auto-move-windows/prefs.js:103
+msgid "Add"
+msgstr "Add"
+
 #. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:112
-#: extensions/places-menu/placeDisplay.js:233
+#: extensions/drive-menu/extension.js:103
+#: extensions/places-menu/placeDisplay.js:219
 #, javascript-format
+#| msgid "Ejecting drive '%s' failed:"
 msgid "Ejecting drive “%s” failed:"
 msgstr "Ejecting drive “%s” failed:"

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

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

+#: extensions/example/extension.js:17
+msgid "Hello, world!"
+msgstr "Hello, world!"
+
+#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:5
+msgid "Alternative greeting text."
+msgstr "Alternative greeting text."
+
+#: 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 ""
+"If not empty, it contains the text that will be shown when clicking on the "
+"panel."
+
+#: extensions/example/prefs.js:27
+msgid "Message"
+msgstr "Message"
+
+#. TRANSLATORS: Example is the name of the extension, should not be
+#. translated
+#: extensions/example/prefs.js:40
+#| msgid ""
+#| "Example aims to show how to build well behaved extensions for the Shell "
+#| "and as such it has little functionality on its own.\n"
+#| "Nevertheless it's possible to customize the greeting message."
+msgid ""
+"Example aims to show how to build well behaved extensions for the Shell and "
+"as such it has little functionality on its own.\n"
+"Nevertheless it’s possible to customize the greeting message."
+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."
+
 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
 msgid "Use more screen for windows"
 msgstr "Use more screen for windows"
@@ -103,31 +212,32 @@ msgstr ""
 "shell default of placing it at the bottom. Changing this setting requires "
 "restarting the shell to have any effect."

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

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

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

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

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

@@ -136,6 +246,7 @@ 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"

@@ -147,47 +258,52 @@ msgstr "Theme name"
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"

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

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

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

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

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

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

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

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

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

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

-#: extensions/window-list/extension.js:734
+#: extensions/window-list/extension.js:646
+#: extensions/workspace-indicator/extension.js:26
+msgid "Workspace Indicator"
+msgstr "Workspace Indicator"
+
+#: extensions/window-list/extension.js:811
 msgid "Window List"
 msgstr "Window List"

@@ -196,6 +312,9 @@ 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”."
@@ -204,19 +323,10 @@ msgstr ""
 "Possible values are “never”, “auto” and “always”."

 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-#: extensions/window-list/prefs.js:100
-msgid "Show windows from all workspaces"
-msgstr "Show windows from all workspaces"
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
-msgid "Whether to show windows from all workspaces or only the current one."
-msgstr "Whether to show windows from all workspaces or only the current one."
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:27
 msgid "Show the window list on all monitors"
 msgstr "Show the window list on all monitors"

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:28
+#: 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."
@@ -224,128 +334,39 @@ msgstr ""
 "Whether to show the window list on all connected monitors or only on the "
 "primary one."

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

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

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

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

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

-#: extensions/window-list/workspaceIndicator.js:207
-#: extensions/workspace-indicator/extension.js:213
-msgid "Workspace Indicator"
-msgstr "Workspace Indicator"
-
-#: extensions/workspace-indicator/prefs.js:34
+#: extensions/workspace-indicator/prefs.js:134
 msgid "Workspace Names"
 msgstr "Workspace Names"

-#: extensions/workspace-indicator/prefs.js:67
+#: extensions/workspace-indicator/prefs.js:150
+msgid "Name"
+msgstr "Name"
+
+#: extensions/workspace-indicator/prefs.js:190
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Workspace %d"

-#: extensions/workspace-indicator/prefs.js:218
-#| msgid "Workspace"
-msgid "Add Workspace"
-msgstr "Add Workspace"
-
-#~ msgid "Application"
-#~ msgstr "Application"
-
-#~ msgid "Create new matching rule"
-#~ msgstr "Create new matching rule"
-
-#~ msgid "Add"
-#~ msgstr "Add"
-
-#~ msgid "Name"
-#~ msgstr "Name"
-
-#~ msgid "Attach modal dialog to the parent window"
-#~ msgstr "Attach modal dialogue to the parent window"
-
-#~ msgid ""
-#~ "This key overrides the key in org.gnome.mutter when running GNOME Shell."
-#~ msgstr ""
-#~ "This key overrides the key in org.gnome.mutter when running GNOME Shell."
-
-#~ msgid "Arrangement of buttons on the titlebar"
-#~ msgstr "Arrangement of buttons on the titlebar"
-
-#~ msgid ""
-#~ "This key overrides the key in org.gnome.desktop.wm.preferences when "
-#~ "running GNOME Shell."
-#~ msgstr ""
-#~ "This key overrides the key in org.gnome.desktop.wm.preferences when "
-#~ "running GNOME Shell."
-
-#~ msgid "Enable edge tiling when dropping windows on screen edges"
-#~ msgstr "Enable edge tiling when dropping windows on screen edges"
-
-#~ msgid "Workspaces only on primary monitor"
-#~ 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"
-
-#~ msgid "Thumbnail only"
-#~ msgstr "Thumbnail only"
-
-#~ msgid "Application icon only"
-#~ msgstr "Application icon only"
-
-#~ msgid "Thumbnail and application icon"
-#~ msgstr "Thumbnail and application icon"
-
-#~ msgid "Present windows as"
-#~ msgstr "Present windows as"
-
-#~ msgid "Activities Overview"
-#~ msgstr "Activities Overview"
-
-#~ msgid "Hello, world!"
-#~ msgstr "Hello, world!"
-
-#~ msgid "Alternative greeting text."
-#~ msgstr "Alternative greeting text."
-
-#~ msgid ""
-#~ "If not empty, it contains the text that will be shown when clicking on "
-#~ "the panel."
-#~ msgstr ""
-#~ "If not empty, it contains the text that will be shown when clicking on "
-#~ "the panel."
-
-#~ msgid "Message"
-#~ msgstr "Message"
-
-#~| msgid ""
-#~| "Example aims to show how to build well behaved extensions for the Shell "
-#~| "and as such it has little functionality on its own.\n"
-#~| "Nevertheless it's possible to customize the greeting message."
-#~ msgid ""
-#~ "Example aims to show how to build well behaved extensions for the Shell "
-#~ "and as such it has little functionality on its own.\n"
-#~ "Nevertheless it’s possible to customize the greeting message."
-#~ msgstr ""
-#~ "Example 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."
-
 #~ msgid "GNOME Shell Classic"
 #~ msgstr "GNOME Shell Classic"

--- a/po/eo.po
+++ b/po/eo.po
@@ -4,38 +4,40 @@
 # Ryan LORTIE <desrt@desrt.ca>, 2013.
 # Daniel PUENTES <blatberk@openmailbox.org>, 2015.
 # Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>, 2011-2019.
-# Carmen Bianca BAKKER <carmen@carmenbianca.eu>, 2021.
-#
 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: 2021-03-27 20:14+0000\n"
-"PO-Revision-Date: 2021-03-29 17:24+0200\n"
-"Last-Translator: Carmen Bianca BAKKER <carmen@carmenbianca.eu>\n"
+"POT-Creation-Date: 2019-03-02 10:57+0000\n"
+"PO-Revision-Date: 2019-03-06 22:14+0200\n"
+"Last-Translator: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>\n"
 "Language-Team: Esperanto <gnome-eo-list@gnome.org>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"X-Generator: Gtranslator 3.38.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"

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

 #: data/gnome-classic.desktop.in:4
 msgid "This session logs you into GNOME Classic"
-msgstr "Ĉi tiu seanco ensalutas vin GNOME-klasiken"
+msgstr "Ĉi seanco ensalutas vin GNOME-klasiken"

-#: extensions/apps-menu/extension.js:113
+#: extensions/apps-menu/extension.js:29
+msgid "Activities Overview"
+msgstr "Aktivecoj-Superrigardon"
+
+#: extensions/apps-menu/extension.js:118
 msgid "Favorites"
 msgstr "Plej ŝatataj"

-#: extensions/apps-menu/extension.js:367
+#: extensions/apps-menu/extension.js:407
 msgid "Applications"
 msgstr "Aplikaĵoj"

@@ -51,26 +53,41 @@ msgstr ""
 "Listo de ĉenoj, ĉiu enhavas aplikaĵan identigilon ('desktop' dosiernomo), "
 "sevkita per dupunkto kaj la laborspaca numero"

-#: extensions/auto-move-windows/prefs.js:35
-msgid "Workspace Rules"
-msgstr "Laborspacaj reguloj"
+#: extensions/auto-move-windows/prefs.js:60
+msgid "Application"
+msgstr "Aplikaĵo"

-#: extensions/auto-move-windows/prefs.js:237
+#: extensions/auto-move-windows/prefs.js:71
+#: extensions/auto-move-windows/prefs.js:134
+msgid "Workspace"
+msgstr "Laborspaco"
+
+#: extensions/auto-move-windows/prefs.js:89
 msgid "Add Rule"
 msgstr "Aldoni regulon"

+#: extensions/auto-move-windows/prefs.js:111
+msgid "Create new matching rule"
+msgstr "Krei novan kongruantan regulon"
+
+#: extensions/auto-move-windows/prefs.js:117
+msgid "Add"
+msgstr "Aldoni"
+
 #. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:112
-#: extensions/places-menu/placeDisplay.js:233
+#: extensions/drive-menu/extension.js:100
+#: extensions/places-menu/placeDisplay.js:217
 #, javascript-format
+#| msgid "Ejecting drive '%s' failed:"
 msgid "Ejecting drive “%s” failed:"
 msgstr "Elĵeto de volumo “%s” malsukcesis:"

-#: extensions/drive-menu/extension.js:128
+#: extensions/drive-menu/extension.js:116
 msgid "Removable devices"
 msgstr "Demeteblaj aparatoj"

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

@@ -102,31 +119,32 @@ msgstr ""
 "estas meti ĝin malsupre). Si vi ŝanĝas ĉi agordon tiam vi devas restartigi "
 "la ŝelon."

-#: extensions/places-menu/extension.js:89
-#: extensions/places-menu/extension.js:92
+#: extensions/places-menu/extension.js:79
+#: extensions/places-menu/extension.js:83
 msgid "Places"
 msgstr "Lokoj"

-#: extensions/places-menu/placeDisplay.js:46
+#: extensions/places-menu/placeDisplay.js:59
 #, javascript-format
+msgid "Failed to mount volume for “%s”"
+msgstr ""
+
+#: extensions/places-menu/placeDisplay.js:72
+#, javascript-format
+#| msgid "Failed to launch \"%s\""
 msgid "Failed to launch “%s”"
 msgstr "Malsukcesis lanĉi “%s”"

-#: extensions/places-menu/placeDisplay.js:61
-#, javascript-format
-msgid "Failed to mount volume for “%s”"
-msgstr "Ne eblis munti datumportilon por “%s”"
-
-#: extensions/places-menu/placeDisplay.js:148
-#: extensions/places-menu/placeDisplay.js:171
+#: extensions/places-menu/placeDisplay.js:133
+#: extensions/places-menu/placeDisplay.js:156
 msgid "Computer"
 msgstr "Komputilo"

-#: extensions/places-menu/placeDisplay.js:359
+#: extensions/places-menu/placeDisplay.js:343
 msgid "Home"
 msgstr "Domo"

-#: extensions/places-menu/placeDisplay.js:404
+#: extensions/places-menu/placeDisplay.js:387
 msgid "Browse Network"
 msgstr "Foliumi reton"

@@ -135,8 +153,10 @@ msgid "Cycle Screenshot Sizes"
 msgstr "Cikle montri ekrankopiajn grandojn"

 #: 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 "Montri ekrankopiajn grandojn laŭ inversa sinsekvo"
+msgstr "Cikle montri ekrankopiajn grandojn"

 #: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
@@ -146,47 +166,52 @@ msgstr "Etosnomo"
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "La nomo de la etoso, malfermigi de ~/.themes/name/gnome-shell"

-#: extensions/window-list/extension.js:98
+#: extensions/window-list/extension.js:100
 msgid "Close"
-msgstr "Fermi"
+msgstr "Malfermi"

-#: extensions/window-list/extension.js:118
+#: extensions/window-list/extension.js:120
 msgid "Unminimize"
-msgstr "Malminimumigi"
+msgstr "Neplejetigi"

-#: extensions/window-list/extension.js:118
+#: extensions/window-list/extension.js:120
 msgid "Minimize"
-msgstr "Minimumigi"
+msgstr "Plejetigi"

-#: extensions/window-list/extension.js:125
+#: extensions/window-list/extension.js:127
 msgid "Unmaximize"
-msgstr "Malmaksimumigi"
+msgstr "Nemaksimumigi"

-#: extensions/window-list/extension.js:125
+#: extensions/window-list/extension.js:127
 msgid "Maximize"
 msgstr "Maksimumigi"

-#: extensions/window-list/extension.js:432
+#: extensions/window-list/extension.js:408
 msgid "Minimize all"
-msgstr "Minimumigi ĉiujn"
+msgstr "Plejetigi ĉiujn"

-#: extensions/window-list/extension.js:438
+#: extensions/window-list/extension.js:414
 msgid "Unminimize all"
-msgstr "Malminimumigi ĉiujn"
+msgstr "Neplejetigi ĉiujn"

-#: extensions/window-list/extension.js:444
+#: extensions/window-list/extension.js:420
 msgid "Maximize all"
 msgstr "Maksimumigi ĉiujn"

-#: extensions/window-list/extension.js:452
+#: extensions/window-list/extension.js:429
 msgid "Unmaximize all"
-msgstr "Malmaksimumigi ĉiujn"
+msgstr "Nemaksimumigi ĉiujn"

-#: extensions/window-list/extension.js:460
+#: extensions/window-list/extension.js:438
 msgid "Close all"
 msgstr "Fermi ĉiujn"

-#: extensions/window-list/extension.js:737
+#: extensions/window-list/extension.js:655
+#: extensions/workspace-indicator/extension.js:21
+msgid "Workspace Indicator"
+msgstr "Laborspaco Indikilo"
+
+#: extensions/window-list/extension.js:836
 msgid "Window List"
 msgstr "Fenestra listo"

@@ -195,86 +220,62 @@ msgid "When to group windows"
 msgstr "Kiam grupigi fenestrojn"

 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
+#, fuzzy
+#| msgid ""
+#| "Decides when to group windows from the same application on the window "
+#| "list. Possible values are \"never\", \"auto\" and \"always\"."
 msgid ""
 "Decides when to group windows from the same application on the window list. "
 "Possible values are “never”, “auto” and “always”."
 msgstr ""
 "Decidas kiam grupi fenestrojn de la sama aplikaĵo en la fenestra listo. "
-"Validaj valoroj estas “neniam”, “aŭtomate” kaj ĉiam”."
+"Validaj valoroj estas “never” (neniam), “auto” (aŭtomate) kaj “always” "
+"(ĉiam)."

 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-#: extensions/window-list/prefs.js:100
-msgid "Show windows from all workspaces"
-msgstr "Montri la fenestrojn de ĉiuj laborspacoj"
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
-msgid "Whether to show windows from all workspaces or only the current one."
-msgstr "Ĉu montri la fenestrojn de ĉiuj laborspacoj aŭ nur de la nuna."
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:27
 msgid "Show the window list on all monitors"
 msgstr "Montri la fenestroliston en ĉiuj ekranoj"

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:28
+#: 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 ""
 "Ĉu montri la fenestroliston en ĉiuj konektitaj ekranoj aŭ nur en la ĉefa."

-#: extensions/window-list/prefs.js:29
+#: extensions/window-list/prefs.js:25
 msgid "Window Grouping"
 msgstr "Fenestra grupigo"

-#: extensions/window-list/prefs.js:58
+#: extensions/window-list/prefs.js:47
 msgid "Never group windows"
 msgstr "Neniam grupigi fenestrojn"

-#: extensions/window-list/prefs.js:59
+#: extensions/window-list/prefs.js:48
 msgid "Group windows when space is limited"
 msgstr "Grupigi fenestrojn kiam spaco limitas"

-#: extensions/window-list/prefs.js:60
+#: extensions/window-list/prefs.js:49
 msgid "Always group windows"
 msgstr "Ĉiam grupigi fenestrojn"

-#: extensions/window-list/prefs.js:94
+#: extensions/window-list/prefs.js:75
 msgid "Show on all monitors"
 msgstr "Montri en ĉiuj ekranoj"

-#: extensions/window-list/workspaceIndicator.js:249
-#: extensions/workspace-indicator/extension.js:255
-msgid "Workspace Indicator"
-msgstr "Laborspaco Indikilo"
-
-#: extensions/workspace-indicator/prefs.js:34
+#: extensions/workspace-indicator/prefs.js:131
 msgid "Workspace Names"
 msgstr "Laborspacaj nomoj"

-#: extensions/workspace-indicator/prefs.js:67
+#: extensions/workspace-indicator/prefs.js:151
+msgid "Name"
+msgstr "Nomo"
+
+#: extensions/workspace-indicator/prefs.js:191
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Laborspaco %d"

-#: extensions/workspace-indicator/prefs.js:208
-msgid "Add Workspace"
-msgstr "Aldoni laborspacon"
-
-#~ msgid "Application"
-#~ msgstr "Aplikaĵo"
-
-#~ msgid "Create new matching rule"
-#~ msgstr "Krei novan kongruantan regulon"
-
-#~ msgid "Add"
-#~ msgstr "Aldoni"
-
-#~ msgid "Name"
-#~ msgstr "Nomo"
-
-#~ msgid "Activities Overview"
-#~ msgstr "Aktivecoj-Superrigardon"
-
 #~ msgid "Attach modal dialog to the parent window"
 #~ msgstr "Kunligi modalan dialogon al la patra fenestro"

@@ -318,6 +319,9 @@ msgstr "Aldoni laborspacon"
 #~ msgid "Present windows as"
 #~ msgstr "Prezenti fenestron kiel"

+#~ msgid "Show only windows in the current workspace"
+#~ msgstr "Montri nur fenestrojn en la aktuala laborspaco"
+
 #~ msgid "Hello, world!"
 #~ msgstr "Saluton, mondo!"

--- a/po/es.po
+++ b/po/es.po
@@ -4,48 +4,101 @@
 # Jorge González <jorgegonz@svn.gnome.org>, 2011.
 # Nicolás Satragno <nsatragno@gmail.com>, 2011.
 # 
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011-2021.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011-2015, 2017.
 #
 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: 2021-11-06 14:08+0000\n"
-"PO-Revision-Date: 2021-11-26 17:58+0100\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-24 15:40+0200\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
-"Language-Team: Spanish - Spain <gnome-es-list@gnome.org>\n"
-"Language: es_ES\n"
+"Language-Team: es <gnome-es-list@gnome.org>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 41.0\n"
+"X-Generator: Gtranslator 2.91.6\n"

-#: data/gnome-classic.desktop.in:3
+#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
 msgid "GNOME Classic"
 msgstr "GNOME clásico"

-#: data/gnome-classic.desktop.in:4 data/gnome-classic-wayland.desktop.in:4
-#: data/gnome-classic-xorg.desktop.in:4
+#: data/gnome-classic.desktop.in:4
 msgid "This session logs you into GNOME Classic"
 msgstr "Esta sesión inicia GNOME clásico"

-#: data/gnome-classic-wayland.desktop.in:3
-#| msgid "GNOME Classic"
-msgid "GNOME Classic on Wayland"
-msgstr "GNOME clásico en Wayland"
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:7
+msgid "Attach modal dialog to the parent window"
+msgstr "Acoplar un diálogo modal a la ventana padre"

-#: data/gnome-classic-xorg.desktop.in:3
-#| msgid "GNOME Classic"
-msgid "GNOME Classic on Xorg"
-msgstr "GNOME clásicoen Xorg"
+#: 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 ""
+"Esta clave sobrescribe la clave en org.gnome.mutter al ejecutar GNOME Shell."

-#: extensions/apps-menu/extension.js:112
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
+msgid "Arrangement of buttons on the titlebar"
+msgstr "Ordenación de los botones en la barra de título"
+
+#: 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 ""
+"Esta clave sobrescribe la clave en org.gnome.desktop.wm.preferences al "
+"ejecutar GNOME Shell."
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:24
+msgid "Enable edge tiling when dropping windows on screen edges"
+msgstr ""
+"Activar el mosaico en los bordes al arrastrar ventanas a los bordes de la "
+"ventana"
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:32
+msgid "Workspaces only on primary monitor"
+msgstr "Áreas de trabajo solo en la pantalla principal"
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:40
+msgid "Delay focus changes in mouse mode until the pointer stops moving"
+msgstr ""
+"Retrasar el cambio del foco del ratón hasta que el puntero deje de moverse"
+
+#: extensions/alternate-tab/prefs.js:20
+msgid "Thumbnail only"
+msgstr "Sólo miniaturas"
+
+#: extensions/alternate-tab/prefs.js:21
+msgid "Application icon only"
+msgstr "Sólo icono de la aplicación"
+
+#: extensions/alternate-tab/prefs.js:22
+msgid "Thumbnail and application icon"
+msgstr "Miniatura e icono de la aplicación"
+
+#: extensions/alternate-tab/prefs.js:38
+msgid "Present windows as"
+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
+msgid "Activities Overview"
+msgstr "Vista de actividades"
+
+#: extensions/apps-menu/extension.js:141
 msgid "Favorites"
 msgstr "Favoritos"

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

@@ -61,29 +114,73 @@ msgstr ""
 "Una lista de cadenas, conteniendo cada una un ID de aplicación (nombre de "
 "archivo de escritorio), seguido de dos puntos y el número del área de trabajo"

-#: extensions/auto-move-windows/prefs.js:34
-msgid "Workspace Rules"
-msgstr "Reglas de las áreas de trabajo"
+#: extensions/auto-move-windows/prefs.js:60
+msgid "Application"
+msgstr "Aplicación"

-#: extensions/auto-move-windows/prefs.js:236
+#: extensions/auto-move-windows/prefs.js:69
+#: extensions/auto-move-windows/prefs.js:127
+msgid "Workspace"
+msgstr "Área de trabajo"
+
+#: extensions/auto-move-windows/prefs.js:85
 msgid "Add Rule"
 msgstr "Añadir regla"

-#. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:133
-#: extensions/places-menu/placeDisplay.js:233
+#: extensions/auto-move-windows/prefs.js:106
+msgid "Create new matching rule"
+msgstr "Crear regla de coincidencia nueva"
+
+#: extensions/auto-move-windows/prefs.js:111
+msgid "Add"
+msgstr "Añadir"
+
+#: extensions/drive-menu/extension.js:106
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "Falló al expulsar el dispositivo «%s»:"

-#: extensions/drive-menu/extension.js:149
+#: extensions/drive-menu/extension.js:124
 msgid "Removable devices"
 msgstr "Dispositivos extraíbles"

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

+#: extensions/example/extension.js:17
+msgid "Hello, world!"
+msgstr "¡Hola, mundo!"
+
+#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:5
+msgid "Alternative greeting text."
+msgstr "Texto de bienvenida alternativo."
+
+#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:6
+msgid ""
+"If not empty, it contains the text that will be shown when clicking on the "
+"panel."
+msgstr ""
+"Si no está vacío, contiene el texto que se desplegará al pulsar sobre el "
+"panel."
+
+#: extensions/example/prefs.js:30
+msgid "Message"
+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."
+msgstr ""
+"«Example» tiene por objeto mostrar cómo construir extensiones de buen "
+"comportamiento para la Shell y por eso tiene poca funcionalidad por sí "
+"solo.\n"
+"Sin embargo, es posible personalizar el mensaje de bienvenida."
+
 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
 msgid "Use more screen for windows"
 msgstr "Usar más pantalla para las ventanas"
@@ -113,31 +210,31 @@ msgstr ""
 "los sitúa por debajo. Cambiar esta configuración requiere reiniciar la shell "
 "para que tenga efecto."

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

-#: extensions/places-menu/placeDisplay.js:46
-#, javascript-format
-msgid "Failed to launch “%s”"
-msgstr "Falló al lanzar «%s»"
-
-#: extensions/places-menu/placeDisplay.js:61
+#: 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:148
-#: extensions/places-menu/placeDisplay.js:171
+#: extensions/places-menu/placeDisplay.js:78
+#, javascript-format
+msgid "Failed to launch “%s”"
+msgstr "Falló al lanzar «%s»"
+
+#: extensions/places-menu/placeDisplay.js:137
+#: extensions/places-menu/placeDisplay.js:160
 msgid "Computer"
 msgstr "Equipo"

-#: extensions/places-menu/placeDisplay.js:359
+#: extensions/places-menu/placeDisplay.js:303
 msgid "Home"
 msgstr "Carpeta personal"

-#: extensions/places-menu/placeDisplay.js:404
+#: extensions/places-menu/placeDisplay.js:347
 msgid "Browse Network"
 msgstr "Examinar la red"

@@ -146,6 +243,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"

@@ -157,47 +255,52 @@ msgstr "Nombre del tema"
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "El nombre del tema, que se carga desde ~/.themes/nombre/gnome-shell"

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

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

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

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

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

-#: extensions/window-list/extension.js:434
+#: extensions/window-list/extension.js:420
 msgid "Minimize all"
 msgstr "Minimizar todo"

-#: extensions/window-list/extension.js:440
+#: extensions/window-list/extension.js:428
 msgid "Unminimize all"
 msgstr "Desminimizar todo"

-#: extensions/window-list/extension.js:446
+#: extensions/window-list/extension.js:436
 msgid "Maximize all"
 msgstr "Maximizar todo"

-#: extensions/window-list/extension.js:454
+#: extensions/window-list/extension.js:445
 msgid "Unmaximize all"
 msgstr "Desmaximizar todo"

-#: extensions/window-list/extension.js:462
+#: extensions/window-list/extension.js:454
 msgid "Close all"
 msgstr "Cerrar todo"

-#: extensions/window-list/extension.js:741
+#: extensions/window-list/extension.js:678
+#: extensions/workspace-indicator/extension.js:30
+msgid "Workspace Indicator"
+msgstr "Indicador de área de trabajo"
+
+#: extensions/window-list/extension.js:842
 msgid "Window List"
 msgstr "Lista de ventanas"

@@ -214,21 +317,10 @@ msgstr ""
 "ventanas. Los valores posibles son «never», «auto» y «always»."

 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-#: extensions/window-list/prefs.js:86
-msgid "Show windows from all workspaces"
-msgstr "Mostrar ventanas de todas las áreas de trabajo"
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
-msgid "Whether to show windows from all workspaces or only the current one."
-msgstr ""
-"Indica si se deben mostrar ventanas de todas las áreas de trabajo o sólo de "
-"la actual."
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:27
 msgid "Show the window list on all monitors"
 msgstr "Mostrar la lista de ventanas en todas las pantallas"

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:28
+#: 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."
@@ -236,131 +328,39 @@ msgstr ""
 "Indica si se debe mostrar la lista de ventanas en todas las pantallas "
 "conectadas o sólo en la primaria."

-#: extensions/window-list/prefs.js:39
+#: extensions/window-list/prefs.js:32
 msgid "Window Grouping"
 msgstr "Agrupación de ventanas"

-#: extensions/window-list/prefs.js:63
+#: extensions/window-list/prefs.js:50
 msgid "Never group windows"
 msgstr "Nunca agrupar las ventanas"

-#: extensions/window-list/prefs.js:64
+#: extensions/window-list/prefs.js:51
 msgid "Group windows when space is limited"
 msgstr "Agrupar las ventanas cuando el espacio esté limitado"

-#: extensions/window-list/prefs.js:65
+#: extensions/window-list/prefs.js:52
 msgid "Always group windows"
 msgstr "Siempre agrupar las ventanas"

-#: extensions/window-list/prefs.js:81
+#: extensions/window-list/prefs.js:75
 msgid "Show on all monitors"
 msgstr "Mostrar en todas las pantallas"

-#: extensions/window-list/workspaceIndicator.js:249
-#: extensions/workspace-indicator/extension.js:254
-msgid "Workspace Indicator"
-msgstr "Indicador de área de trabajo"
-
-#: extensions/workspace-indicator/prefs.js:33
+#: extensions/workspace-indicator/prefs.js:141
 msgid "Workspace Names"
 msgstr "Nombres de los áreas de trabajo"

-#: extensions/workspace-indicator/prefs.js:66
+#: extensions/workspace-indicator/prefs.js:157
+msgid "Name"
+msgstr "Nombre"
+
+#: extensions/workspace-indicator/prefs.js:198
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Área de trabajo %d"

-#: extensions/workspace-indicator/prefs.js:207
-msgid "Add Workspace"
-msgstr "Añadir área de trabajo"
-
-#~ msgid "Application"
-#~ msgstr "Aplicación"
-
-#~ msgid "Workspace"
-#~ msgstr "Área de trabajo"
-
-#~ msgid "Create new matching rule"
-#~ msgstr "Crear regla de coincidencia nueva"
-
-#~ msgid "Add"
-#~ msgstr "Añadir"
-
-#~ msgid "Name"
-#~ msgstr "Nombre"
-
-#~ msgid "Attach modal dialog to the parent window"
-#~ msgstr "Acoplar un diálogo modal a la ventana padre"
-
-#~ msgid ""
-#~ "This key overrides the key in org.gnome.mutter when running GNOME Shell."
-#~ msgstr ""
-#~ "Esta clave sobrescribe la clave en org.gnome.mutter al ejecutar GNOME "
-#~ "Shell."
-
-#~ msgid "Arrangement of buttons on the titlebar"
-#~ msgstr "Ordenación de los botones en la barra de título"
-
-#~ msgid ""
-#~ "This key overrides the key in org.gnome.desktop.wm.preferences when "
-#~ "running GNOME Shell."
-#~ msgstr ""
-#~ "Esta clave sobrescribe la clave en org.gnome.desktop.wm.preferences al "
-#~ "ejecutar GNOME Shell."
-
-#~ msgid "Enable edge tiling when dropping windows on screen edges"
-#~ msgstr ""
-#~ "Activar el mosaico en los bordes al arrastrar ventanas a los bordes de la "
-#~ "ventana"
-
-#~ msgid "Workspaces only on primary monitor"
-#~ msgstr "Áreas de trabajo solo en la pantalla principal"
-
-#~ msgid "Delay focus changes in mouse mode until the pointer stops moving"
-#~ msgstr ""
-#~ "Retrasar el cambio del foco del ratón hasta que el puntero deje de moverse"
-
-#~ msgid "Thumbnail only"
-#~ msgstr "Sólo miniaturas"
-
-#~ msgid "Application icon only"
-#~ msgstr "Sólo icono de la aplicación"
-
-#~ msgid "Thumbnail and application icon"
-#~ msgstr "Miniatura e icono de la aplicación"
-
-#~ msgid "Present windows as"
-#~ msgstr "Presentar ventanas como"
-
-#~ msgid "Activities Overview"
-#~ msgstr "Vista de actividades"
-
-#~ msgid "Hello, world!"
-#~ msgstr "¡Hola, mundo!"
-
-#~ msgid "Alternative greeting text."
-#~ msgstr "Texto de bienvenida alternativo."
-
-#~ msgid ""
-#~ "If not empty, it contains the text that will be shown when clicking on "
-#~ "the panel."
-#~ msgstr ""
-#~ "Si no está vacío, contiene el texto que se desplegará al pulsar sobre el "
-#~ "panel."
-
-#~ msgid "Message"
-#~ msgstr "Mensaje"
-
-#~ msgid ""
-#~ "Example aims to show how to build well behaved extensions for the Shell "
-#~ "and as such it has little functionality on its own.\n"
-#~ "Nevertheless it’s possible to customize the greeting message."
-#~ msgstr ""
-#~ "«Example» tiene por objeto mostrar cómo construir extensiones de buen "
-#~ "comportamiento para la Shell y por eso tiene poca funcionalidad por sí "
-#~ "solo.\n"
-#~ "Sin embargo, es posible personalizar el mensaje de bienvenida."
-
 #~ msgid "CPU"
 #~ msgstr "CPU"

--- a/po/eu.po
+++ b/po/eu.po
@@ -5,44 +5,101 @@
 # assar <asiersar@yahoo.com>, 2011.
 # Iñaki Larrañaga Murgoitio <dooteo@zundan.com>, 2011, 2013, 2015, 2017.
 # Edurne Labaka <elabaka@uzei.com>, 2015.
-# Asier Sarasua Garmendia  <asiersarasua@ni.eus>, 2019, 2020, 2021.
-#
 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: 2021-11-06 14:08+0000\n"
-"PO-Revision-Date: 2021-12-25 00:42+0200\n"
-"Last-Translator: Asier Sarasua Garmendia <asiersarasua@ni.eus>\n"
+msgstr ""
+"Project-Id-Version: gnome-shell-extensions master\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"shell&keywords=I18N+L10N&component=extensions\n"
+"POT-Creation-Date: 2017-08-11 01:33+0000\n"
+"PO-Revision-Date: 2017-08-27 15:49+0200\n"
+"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@zundan.com>\n"
 "Language-Team: Basque <librezale@librezale.eus>\n"
 "Language: eu\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: Lokalize 1.5\n"
 "X-Project-Style: gnome\n"

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

-#: data/gnome-classic.desktop.in:4 data/gnome-classic-wayland.desktop.in:4
-#: data/gnome-classic-xorg.desktop.in:4
+#: data/gnome-classic.desktop.in:4
 msgid "This session logs you into GNOME Classic"
 msgstr "Saio honek GNOME Klasikoa hasten du"

-#: data/gnome-classic-wayland.desktop.in:3
-msgid "GNOME Classic on Wayland"
-msgstr "GNOME klasikoa Wayland gainean"
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:7
+msgid "Attach modal dialog to the parent window"
+msgstr "Erantsi elkarrizketa-koadro modala leiho gurasoari"

-#: data/gnome-classic-xorg.desktop.in:3
-msgid "GNOME Classic on Xorg"
-msgstr "GNOME klasikoa Xorg gainean"
+#: 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 ""
+"Gako honek org.gnome.mutter-eko gakoa gainidazten du GNOME Shell exekutatzen "
+"ari denean."

-#: extensions/apps-menu/extension.js:112
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
+msgid "Arrangement of buttons on the titlebar"
+msgstr "Botoien antolamendua titulu-barran"
+
+#: 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 ""
+"Gako honekorg.gnome.desktop.wm.preferences-eko gakoa gainidazten du GNOME "
+"Shell exekutatzen ari denean."
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:24
+msgid "Enable edge tiling when dropping windows on screen edges"
+msgstr ""
+"Gaitu ertza lauza gisa ezartzea leihoak pantailaren ertzetara jaregitean"
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:32
+msgid "Workspaces only on primary monitor"
+msgstr "Laneko areak pantaila nagusian soilik"
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:40
+msgid "Delay focus changes in mouse mode until the pointer stops moving"
+msgstr ""
+"Fokuaren aldaketaren atzerapena saguaren moduan erakusleak mugitzeari utzi "
+"arte"
+
+#: extensions/alternate-tab/prefs.js:20
+msgid "Thumbnail only"
+msgstr "Koadro txikiak soilik"
+
+#: extensions/alternate-tab/prefs.js:21
+msgid "Application icon only"
+msgstr "Aplikazioen ikonoa soilik"
+
+#: extensions/alternate-tab/prefs.js:22
+msgid "Thumbnail and application icon"
+msgstr "Koadro txikien eta aplikazioen ikonoa"
+
+#: extensions/alternate-tab/prefs.js:38
+msgid "Present windows as"
+msgstr "Aurkeztu leihoa honela"
+
+#: extensions/alternate-tab/prefs.js:69
+msgid "Show only windows in the current workspace"
+msgstr "Erakutsi leihoak bakarrik uneko laneko arean"
+
+#: extensions/apps-menu/extension.js:41
+msgid "Activities Overview"
+msgstr "Jardueren ikuspegi orokorra"
+
+#: extensions/apps-menu/extension.js:141
 msgid "Favorites"
 msgstr "Gogokoak"

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

@@ -54,31 +111,76 @@ msgstr "Aplikazioen eta laneko areen zerrenda"
 msgid ""
 "A list of strings, each containing an application id (desktop file name), "
 "followed by a colon and the workspace number"
-msgstr "Kateen zerrenda bat, bakoitzak aplikazio-ID bat duena (mahaigainaren fitxategi-izena) eta jarraian bi puntu eta laneko arearen zenbakia dituena"
+msgstr ""
+"Kateen zerrenda bat, bakoitzak aplikazio-ID bat duena (mahaigainaren "
+"fitxategi-izena) eta jarraian bi puntu eta laneko arearen zenbakia dituena"

-#: extensions/auto-move-windows/prefs.js:34
-msgid "Workspace Rules"
-msgstr "Laneko areen arauak"
+#: extensions/auto-move-windows/prefs.js:60
+msgid "Application"
+msgstr "Aplikazioa"

-#: extensions/auto-move-windows/prefs.js:236
+#: extensions/auto-move-windows/prefs.js:69
+#: extensions/auto-move-windows/prefs.js:127
+msgid "Workspace"
+msgstr "Laneko area"
+
+#: extensions/auto-move-windows/prefs.js:85
 msgid "Add Rule"
 msgstr "Gehitu araua"

+#: extensions/auto-move-windows/prefs.js:106
+msgid "Create new matching rule"
+msgstr "Sortu bat datorren arau berria"
+
+#: extensions/auto-move-windows/prefs.js:111
+msgid "Add"
+msgstr "Gehitu"
+
 #. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:133
-#: extensions/places-menu/placeDisplay.js:233
+#: extensions/drive-menu/extension.js:107
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
-msgstr "Huts egin du “%s“ unitatea egoztean:"
+msgstr "Huts egin du “%s“ unitatea egoztean: "

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

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

+#: extensions/example/extension.js:17
+msgid "Hello, world!"
+msgstr "Kaixo mundua!"
+
+#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:5
+msgid "Alternative greeting text."
+msgstr "Ongi etorriaren bestelako testua."
+
+#: 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 "Ez badago hutsik, panelean klik egitean erakutsiko den testua dauka."
+
+#: extensions/example/prefs.js:30
+msgid "Message"
+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."
+msgstr ""
+"Shell-erako portaera egokia duten hedapenak nola eraikitzen den erakusteko "
+"helburua du adibideak,  ondorioz bere kasa funtzionalitate baxukoa da.\n"
+"Hala ere, ongi etorriko mezua pertsonalizatzeko aukera dago."
+
 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
 msgid "Use more screen for windows"
 msgstr "Erabili pantaila gehiago leihoentzako"
@@ -88,7 +190,11 @@ 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 "Saiatu pantaila gehiago erabiltzen leihoen koadro txikiak kokatzeko pantailaren aspektu-erlaziora egokituz, eta haiek taldekatu muga-koadroa txikiagotzeko. Ezarpen hau kokapen naturalaren estrategiarekin soilik aplikatzen da."
+msgstr ""
+"Saiatu pantaila gehiago erabiltzen leihoen koadro txikiak kokatzeko "
+"pantailaren aspektu-erlaziora egokituz, eta haiek taldekatu muga-koadroa "
+"txikiagotzeko. Ezarpen hau kokapen naturalaren estrategiarekin soilik "
+"aplikatzen da."

 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
 msgid "Place window captions on top"
@@ -99,33 +205,37 @@ msgid ""
 "If true, place window captions on top the respective thumbnail, overriding "
 "shell default of placing it at the bottom. Changing this setting requires "
 "restarting the shell to have any effect."
-msgstr "TRUE (egia) bada, leihoen epigrafeak dagokien koadro txikien gainean jarriko ditu, Shell-aren lehenespena (behean jartzearena) gainidatziz. Ezarpen hau aldatzeko eta aplikatzeko Shell berrabiarazi behar da."
+msgstr ""
+"TRUE (egia) bada, leihoen epigrafeak dagokien koadro txikien gainean jarriko "
+"ditu, Shell-aren lehenespena (behean jartzearena) gainidatziz. Ezarpen hau "
+"aldatzeko eta aplikatzeko Shell berrabiarazi behar da."

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

-#: extensions/places-menu/placeDisplay.js:46
-#, javascript-format
-msgid "Failed to launch “%s”"
-msgstr "Huts egin du '%s' abiaraztean"
-
-#: extensions/places-menu/placeDisplay.js:61
+#: 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:148
-#: extensions/places-menu/placeDisplay.js:171
+#: extensions/places-menu/placeDisplay.js:78
+#, javascript-format
+msgid "Failed to launch “%s”"
+msgstr "Huts egin du “%s“ abiaraztean"
+
+#: extensions/places-menu/placeDisplay.js:137
+#: extensions/places-menu/placeDisplay.js:160
 msgid "Computer"
 msgstr "Ordenagailua"

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

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

@@ -134,6 +244,7 @@ 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"

@@ -145,49 +256,54 @@ msgstr "Gaiaren izena"
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "Gaiaren izena, ~/.themes/izena/gnome-shell direktoriotik kargatzeko"

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

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

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

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

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

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

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

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

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

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

-#: extensions/window-list/extension.js:741
+#: extensions/window-list/extension.js:678
+#: extensions/workspace-indicator/extension.js:30
+msgid "Workspace Indicator"
+msgstr "Lan arearen adierazlea"
+
+#: extensions/window-list/extension.js:842
 msgid "Window List"
-msgstr "Leiho-zerrenda"
+msgstr "Leihoen zerrenda"

 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:12
 msgid "When to group windows"
@@ -197,148 +313,56 @@ msgstr "Noiz elkartu leihoak"
 msgid ""
 "Decides when to group windows from the same application on the window list. "
 "Possible values are “never”, “auto” and “always”."
-msgstr "Aplikazio bereko leihoak leihoen zerrendan noiz elkartuko diren erabakitzen du. Balio erabilgarriak: “never“ (inoiz ere ez), “auto“ (automatikoa) eta “always“ (beti)."
+msgstr ""
+"Aplikazio bereko leihoak leihoen zerrendan noiz elkartuko diren erabakitzen "
+"du. Balio erabilgarriak: “never“ (inoiz ere ez), “auto“ (automatikoa) eta "
+"“always“ (beti)."

 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-#: extensions/window-list/prefs.js:86
-msgid "Show windows from all workspaces"
-msgstr "Erakutsi laneko area guztietako leihoak"
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
-msgid "Whether to show windows from all workspaces or only the current one."
-msgstr "Laneko area guztietako leihoak edo uneko areakoak soilik erakutsiko diren."
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:27
 msgid "Show the window list on all monitors"
 msgstr "Erakutsi leihoen zerrenda pantaila guztietan"

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:28
+#: 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 "Leihoen zerrenda konektatutako pantaila guztietan edo soilik pantaila nagusian erakutsiko den."
+msgstr ""
+"Leihoen zerrenda konektatutako pantaila guztietan edo soilik pantaila "
+"nagusian erakutsiko den."

-#: extensions/window-list/prefs.js:39
+#: extensions/window-list/prefs.js:32
 msgid "Window Grouping"
-msgstr "Leiho-elkartzea"
+msgstr "Leihoak elkartzea"

-#: extensions/window-list/prefs.js:63
+#: extensions/window-list/prefs.js:50
 msgid "Never group windows"
 msgstr "Leihoak inoiz ez elkartu"

-#: extensions/window-list/prefs.js:64
+#: extensions/window-list/prefs.js:51
 msgid "Group windows when space is limited"
 msgstr "Elkartu leihoak lekua mugatuta dagoenean"

-#: extensions/window-list/prefs.js:65
+#: extensions/window-list/prefs.js:52
 msgid "Always group windows"
 msgstr "Elkartu beti leihoak"

-#: extensions/window-list/prefs.js:81
+#: extensions/window-list/prefs.js:75
 msgid "Show on all monitors"
 msgstr "Erakutsi pantaila guztietan"

-#: extensions/window-list/workspaceIndicator.js:249
-#: extensions/workspace-indicator/extension.js:254
-msgid "Workspace Indicator"
-msgstr "Lan arearen adierazlea"
-
-#: extensions/workspace-indicator/prefs.js:33
+#: extensions/workspace-indicator/prefs.js:141
 msgid "Workspace Names"
 msgstr "Laneko areen izenak"

-#: extensions/workspace-indicator/prefs.js:66
+#: extensions/workspace-indicator/prefs.js:157
+msgid "Name"
+msgstr "Izena"
+
+#: extensions/workspace-indicator/prefs.js:198
 #, javascript-format
 msgid "Workspace %d"
 msgstr "%d. laneko area"

-#: extensions/workspace-indicator/prefs.js:207
-msgid "Add Workspace"
-msgstr "Gehitu laneko area"
-
-#~ msgid "Application"
-#~ msgstr "Aplikazioa"
-
-#~ msgid "Create new matching rule"
-#~ msgstr "Sortu bat datorren arau berria"
-
-#~ msgid "Add"
-#~ msgstr "Gehitu"
-
-#~ msgid "Name"
-#~ msgstr "Izena"
-
-#~ msgid "Attach modal dialog to the parent window"
-#~ msgstr "Erantsi elkarrizketa-koadro modala leiho gurasoari"
-
-#~ msgid ""
-#~ "This key overrides the key in org.gnome.mutter when running GNOME Shell."
-#~ msgstr ""
-#~ "Gako honek org.gnome.mutter-eko gakoa gainidazten du GNOME Shell "
-#~ "exekutatzen ari denean."
-
-#~ msgid "Arrangement of buttons on the titlebar"
-#~ msgstr "Botoien antolamendua titulu-barran"
-
-#~ msgid ""
-#~ "This key overrides the key in org.gnome.desktop.wm.preferences when "
-#~ "running GNOME Shell."
-#~ msgstr ""
-#~ "Gako honekorg.gnome.desktop.wm.preferences-eko gakoa gainidazten du GNOME "
-#~ "Shell exekutatzen ari denean."
-
-#~ msgid "Enable edge tiling when dropping windows on screen edges"
-#~ msgstr ""
-#~ "Gaitu ertza lauza gisa ezartzea leihoak pantailaren ertzetara jaregitean"
-
-#~ msgid "Workspaces only on primary monitor"
-#~ msgstr "Laneko areak pantaila nagusian soilik"
-
-#~ msgid "Delay focus changes in mouse mode until the pointer stops moving"
-#~ msgstr ""
-#~ "Fokuaren aldaketaren atzerapena saguaren moduan erakusleak mugitzeari "
-#~ "utzi arte"
-
-#~ msgid "Thumbnail only"
-#~ msgstr "Koadro txikiak soilik"
-
-#~ msgid "Application icon only"
-#~ msgstr "Aplikazioen ikonoa soilik"
-
-#~ msgid "Thumbnail and application icon"
-#~ msgstr "Koadro txikien eta aplikazioen ikonoa"
-
-#~ msgid "Present windows as"
-#~ msgstr "Aurkeztu leihoa honela"
-
-#~ msgid "Activities Overview"
-#~ msgstr "Jardueren ikuspegi orokorra"
-
-#~ msgid "Hello, world!"
-#~ msgstr "Kaixo mundua!"
-
-#~ msgid "Alternative greeting text."
-#~ msgstr "Ongi etorriaren bestelako testua."
-
-#~ msgid ""
-#~ "If not empty, it contains the text that will be shown when clicking on "
-#~ "the panel."
-#~ msgstr ""
-#~ "Ez badago hutsik, panelean klik egitean erakutsiko den testua dauka."
-
-#~ msgid "Message"
-#~ msgstr "Mezua"
-
-#~ 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 ""
-#~ "Shell-erako portaera egokia duten hedapenak nola eraikitzen den "
-#~ "erakusteko helburua du adibideak,  ondorioz bere kasa funtzionalitate "
-#~ "baxukoa da.\n"
-#~ "Hala ere, ongi etorriko mezua pertsonalizatzeko aukera dago."
-
 #~ msgid "CPU"
 #~ msgstr "PUZ"

@@ -351,6 +375,7 @@ msgstr "Gehitu laneko area"
 #~ msgid "Window management and application launching"
 #~ msgstr "Leiho-kudeaketa eta aplikazioak abiaraztea"

+#, fuzzy
 #~ msgid "Online Accounts"
 #~ msgstr "Nire kontua"

--- a/po/fa.po
+++ b/po/fa.po
@@ -1,85 +1,179 @@
 # 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-2017.
-# Danial Behzadi <dani.behzi@ubuntu.com>, 2018-2020.
+# Arash Mousavi <mousavi.arash@gmail.com>, 2011, 2013, 2014, 2015, 2016, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions gnome-3-0\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
-"issues\n"
-"POT-Creation-Date: 2021-11-06 14:08+0000\n"
-"PO-Revision-Date: 2021-11-10 16:24+0330\n"
-"Last-Translator: MohammadSaleh Kamyab <mskf1383@protonmail.com>\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-20 08:40+0000\n"
+"PO-Revision-Date: 2017-09-22 22:09+0330\n"
+"Last-Translator: Arash Mousavi <mousavi.arash@gmail.com>\n"
 "Language-Team: Persian <>\n"
 "Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 2.4.2\n"
+"X-Generator: Poedit 2.0.3\n"
 "Plural-Forms: nplurals=1; plural=0;\n"

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

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

-#: data/gnome-classic-wayland.desktop.in:3
-msgid "GNOME Classic on Wayland"
-msgstr "گنوم کلاسیک روی وی‌لند"
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:7
+msgid "Attach modal dialog to the parent window"
+msgstr "اتصال محاوره modal به پنجره والد"

-#: data/gnome-classic-xorg.desktop.in:3
-msgid "GNOME Classic on Xorg"
-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 را در هنگام اجرای گنوم‌شل بازنویسی می‌کند."

-#: extensions/apps-menu/extension.js:112
+#: 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 را در هنگام اجرای گنوم‌شل "
+"بازنویسی می‌کند."
+
+#: 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 "برگزیده‌ها"
+msgstr "علاقه‌مندی‌ها"

-#: extensions/apps-menu/extension.js:366
+#: 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 "فهرست برنامه و فضای‌کاری"
+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 ""
-"فهرستی از رشته‌ها، هرکدام حاوی شناسه‌ی یک برنامه (نام پرونده رومیزی)، در ادامه‌ی یک "
-"ویرگول و شماره‌ی فضای کاری"
+"فهرستی از رشته‌ها، هرکدام حاوی شناسه‌ی یک برنامه (نام پرونده رومیزی)، در ادامه‌ی "
+"یک ویرگول و شماره‌ی فضای کاری"

-#: extensions/auto-move-windows/prefs.js:34
-msgid "Workspace Rules"
-msgstr "قواعد فضای کاری"
+#: extensions/auto-move-windows/prefs.js:60
+msgid "Application"
+msgstr "برنامه"

-#: extensions/auto-move-windows/prefs.js:236
+#: 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 "افزودن قاعده"
+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:133
-#: extensions/places-menu/placeDisplay.js:233
+#: extensions/drive-menu/extension.js:107
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "بیرون دادن دیسک‌گردان «%s» شکست خورد:"

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

-#: extensions/drive-menu/extension.js:171
+#: extensions/drive-menu/extension.js:150
 msgid "Open Files"
-msgstr "گشودن پرونده‌ها"
+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 ""
+"هدف مثال نمایش چگونگی ساخت افزونه‌های خوش‌رفتار برای پوسته است، پس خودش قابلیت‌های "
+"کمی دارد.\n"
+"با این وجود می‌توان پیام خوش‌آمد را تغییر داد."

 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
 msgid "Use more screen for windows"
@@ -101,38 +195,38 @@ 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."
+"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:88 extensions/places-menu/extension.js:91
+#: extensions/places-menu/extension.js:78 extensions/places-menu/extension.js:81
 msgid "Places"
 msgstr "مکان‌ها"

-#: extensions/places-menu/placeDisplay.js:46
+#: 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:61
-#, javascript-format
-msgid "Failed to mount volume for “%s”"
-msgstr "شکست در سوار کردن حجم برای «%s»"
-
-#: extensions/places-menu/placeDisplay.js:148
-#: extensions/places-menu/placeDisplay.js:171
+#: extensions/places-menu/placeDisplay.js:137
+#: extensions/places-menu/placeDisplay.js:160
 msgid "Computer"
 msgstr "رایانه"

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

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

@@ -152,47 +246,52 @@ msgstr "نام تم"
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "نام تم، جهت بارگیری از شاخه themes/name/gnome-shell./~"

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

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

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

-#: extensions/window-list/extension.js:99
+#: extensions/window-list/extension.js:136
 msgid "Unmaximize"
-msgstr "نابیشینه"
+msgstr "ناحداکثر کردن"

-#: extensions/window-list/extension.js:99
+#: extensions/window-list/extension.js:137
 msgid "Maximize"
-msgstr "بیشنه"
+msgstr "حداکثر کردن"

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

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

-#: extensions/window-list/extension.js:446
+#: extensions/window-list/extension.js:436
 msgid "Maximize all"
-msgstr "بیشینهٔ همه"
+msgstr "حداکثر کردن همه"
+
+#: extensions/window-list/extension.js:445
+msgid "Unmaximize all"
+msgstr "ناحداکثر کردن همه"

 #: extensions/window-list/extension.js:454
-msgid "Unmaximize all"
-msgstr "نابیشینهٔ همه"
-
-#: extensions/window-list/extension.js:462
 msgid "Close all"
 msgstr "بستن همه"

-#: extensions/window-list/extension.js:741
+#: 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 "فهرست پنجره"

@@ -209,146 +308,49 @@ msgstr ""
 "ممکن عبارتند از «never»، «auto» و «always»."

 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-#: extensions/window-list/prefs.js:86
-msgid "Show windows from all workspaces"
-msgstr "نمایش پنجره‌ها از تمام فضاهای کاری"
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
-msgid "Whether to show windows from all workspaces or only the current one."
-msgstr "این که پنجره‌ها از تمام فضاهای کاری نمایش داده شود یا فقط فضای کاری فعلی."
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:27
 msgid "Show the window list on all monitors"
 msgstr "نمایش فهرست پنجره‌ها در تمام نمایشگرها"

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:28
+#: 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."
+"Whether to show the window list on all connected monitors or only on the "
+"primary one."
 msgstr ""
-"اینکه آیا فهرست پنجره‌ها در تمام نمایشگرهای متصل نمایش داده شود یا فقط در نمایشگر "
-"اصلی."
+"اینکه آیا فهرست پنجره‌ها در تمام نمایشگرهای متصل نمایش داده شود یا فقط در "
+"نمایشگر اصلی."

-#: extensions/window-list/prefs.js:39
+#: extensions/window-list/prefs.js:32
 msgid "Window Grouping"
 msgstr "گروه‌سازی پنجره‌ها"

-#: extensions/window-list/prefs.js:63
+#: extensions/window-list/prefs.js:50
 msgid "Never group windows"
 msgstr "هیچ‌گاه پنجره‌ها گروه نشوند"

-#: extensions/window-list/prefs.js:64
+#: extensions/window-list/prefs.js:51
 msgid "Group windows when space is limited"
 msgstr "پنجره‌ها زمانی که فضا محدود است گروه شوند"

-#: extensions/window-list/prefs.js:65
+#: extensions/window-list/prefs.js:52
 msgid "Always group windows"
 msgstr "همیشه پنجره‌ها گروه شوند"

-#: extensions/window-list/prefs.js:81
+#: extensions/window-list/prefs.js:75
 msgid "Show on all monitors"
 msgstr "نمایش در تمام نمایشگرها"

-#: extensions/window-list/workspaceIndicator.js:249
-#: extensions/workspace-indicator/extension.js:254
-msgid "Workspace Indicator"
-msgstr "نشانگر فضای‌کاری"
-
-#: extensions/workspace-indicator/prefs.js:33
+#: extensions/workspace-indicator/prefs.js:141
 msgid "Workspace Names"
-msgstr "نام‌های فضای کاری"
+msgstr "نام فضاهای کاری"

-#: extensions/workspace-indicator/prefs.js:66
+#: extensions/workspace-indicator/prefs.js:157
+msgid "Name"
+msgstr "نام"
+
+#: extensions/workspace-indicator/prefs.js:198
 #, javascript-format
 msgid "Workspace %d"
-msgstr "فضای کاری %Id"
-
-#: extensions/workspace-indicator/prefs.js:207
-msgid "Add Workspace"
-msgstr "افزودن فضای‌کاری"
-
-#~ msgid "Application"
-#~ msgstr "برنامه"
-
-#~ msgid "Workspace"
-#~ msgstr "فضای‌کاری"
-
-#~ msgid "Create new matching rule"
-#~ msgstr "افزودن یک قاعده‌ی منطبق جدید"
-
-#~ msgid "Add"
-#~ msgstr "اضافه"
-
-#~ msgid "Name"
-#~ msgstr "نام"
-
-#~ msgid "Attach modal dialog to the parent window"
-#~ msgstr "اتصال محاوره modal به پنجره والد"
-
-#~ msgid "This key overrides the key in org.gnome.mutter when running GNOME Shell."
-#~ msgstr ""
-#~ "این کلید، کلید org.gnome.mutter را در هنگام اجرای گنوم‌شل بازنویسی می‌کند."
-
-#~ msgid "Arrangement of buttons on the titlebar"
-#~ msgstr "چینش دکمه‌ها در نوار عنوان"
-
-#~ msgid ""
-#~ "This key overrides the key in org.gnome.desktop.wm.preferences when running "
-#~ "GNOME Shell."
-#~ msgstr ""
-#~ "این کلید، کلید org.gnome.desktop.wm.preferences را در هنگام اجرای گنوم‌شل "
-#~ "بازنویسی می‌کند."
-
-#~ msgid "Enable edge tiling when dropping windows on screen edges"
-#~ msgstr ""
-#~ "فعال‌سازی چینش در گوشه‌ها هنگامی که پنجره‌ها در گوشه‌های صفحه‌نمایش می‌اندازید"
-
-#~ msgid "Workspaces only on primary monitor"
-#~ msgstr "فضا‌های کاری تنها در نمایشگر اصلی"
-
-#~ msgid "Delay focus changes in mouse mode until the pointer stops moving"
-#~ msgstr ""
-#~ "به تاخیر انداختن تغییر تمرکز در حالت موشی تا زمانی که نشانگر از حرکت باز ایستد"
-
-#~ msgid "Thumbnail only"
-#~ msgstr "تنها تصویر بندانگشتی"
-
-#~ msgid "Application icon only"
-#~ msgstr "تنها شمایل برنامه"
-
-#~ msgid "Thumbnail and application icon"
-#~ msgstr "تصویر بندانگشتی و شمایل برنامه"
-
-#~ msgid "Present windows as"
-#~ msgstr "نمایش پنجره به عنوان"
-
-#~ msgid "Activities Overview"
-#~ msgstr "نمای‌کلی فعالیت‌ها"
-
-#~ msgid "Hello, world!"
-#~ msgstr "سلام دنیا!"
-
-#~ msgid "Alternative greeting text."
-#~ msgstr "متن خوش‌آمدِ جایگزین."
-
-#~ msgid ""
-#~ "If not empty, it contains the text that will be shown when clicking on the "
-#~ "panel."
-#~ msgstr ""
-#~ "اگر خالی نباشد، حاوی متنی خواهد بود که که هنگام کلیک بر روی پنل نمایش داده "
-#~ "می‌شود است."
-
-#~ msgid "Message"
-#~ msgstr "پیام"
-
-#~ msgid ""
-#~ "Example aims to show how to build well behaved extensions for the Shell and "
-#~ "as such it has little functionality on its own.\n"
-#~ "Nevertheless it’s possible to customize the greeting message."
-#~ msgstr ""
-#~ "هدف مثال نمایش چگونگی ساخت افزونه‌های خوش‌رفتار برای پوسته است، پس خودش "
-#~ "قابلیت‌های کمی دارد.\n"
-#~ "با این وجود می‌توان پیام خوش‌آمد را تغییر داد."
+msgstr "فضای‌کاری %Id"

 #~ msgid "GNOME Shell Classic"
 #~ msgstr "گنوم‌شل کلاسیک"
@@ -379,8 +381,8 @@ msgstr "افزودن فضای‌کاری"
 #~ 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» می‌تواند در حالت‌های مختلفی استفاده شود، که در نحوه باز شدن و "
 #~ "انتخاب پنجره‌ها تاثیر می‌گذارد."
--- a/po/fi.po
+++ b/po/fi.po
@@ -10,22 +10,22 @@
 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: 2020-10-17 20:14+0000\n"
-"PO-Revision-Date: 2021-03-15 21:32+0200\n"
-"Last-Translator: JR-Fi <starman@starman.fi>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"shell&keywords=I18N+L10N&component=extensions\n"
+"POT-Creation-Date: 2017-08-11 01:33+0000\n"
+"PO-Revision-Date: 2017-08-29 12:32+0300\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos+l10n@iki.fi>\n"
 "Language-Team: suomi <lokalisointi-lista@googlegroups.com>\n"
 "Language: fi\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: Gtranslator 2.91.7\n"
 "X-Project-Style: gnome\n"
 "X-POT-Import-Date: 2012-03-05 15:06:12+0000\n"

-#: data/gnome-classic.desktop.in:3
+#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
 msgid "GNOME Classic"
 msgstr "Perinteinen Gnome"

@@ -33,11 +33,71 @@ msgstr "Perinteinen Gnome"
 msgid "This session logs you into GNOME Classic"
 msgstr "Tämä istunto kirjaa sinut perinteiseen Gnomeen"

-#: extensions/apps-menu/extension.js:113
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:7
+msgid "Attach modal dialog to the parent window"
+msgstr "Liitä modaali-ikkuna ylätason ikkunaan"
+
+#: 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 ""
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
+msgid "Arrangement of buttons on the titlebar"
+msgstr "Painikkeiden järjestys otsikkopalkissa"
+
+#: 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 ""
+
+#: 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 "Työtilat vain ensisijaisella näytöllä"
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:40
+msgid "Delay focus changes in mouse mode until the pointer stops moving"
+msgstr ""
+"Aseta viive kohdistusmuutoksille hiiritilassa, kunnes hiiren osoitin "
+"lopettaa liikkumisen"
+
+#: extensions/alternate-tab/prefs.js:20
+msgid "Thumbnail only"
+msgstr "Pelkkä pienoiskuva"
+
+#: extensions/alternate-tab/prefs.js:21
+msgid "Application icon only"
+msgstr "Pelkkä sovelluksen kuvake"
+
+#: extensions/alternate-tab/prefs.js:22
+msgid "Thumbnail and application icon"
+msgstr "Pienoiskuva ja sovelluksen kuvake"
+
+#: extensions/alternate-tab/prefs.js:38
+msgid "Present windows as"
+msgstr "Ikkunoiden esittäminen"
+
+#: extensions/alternate-tab/prefs.js:69
+msgid "Show only windows in the current workspace"
+msgstr "Näytä vain nykyisessä työtilassa olevat ikkunat"
+
+#: extensions/apps-menu/extension.js:41
+msgid "Activities Overview"
+msgstr "Yleisnäkymä"
+
+#: extensions/apps-menu/extension.js:141
 msgid "Favorites"
 msgstr "Suosikit"

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

@@ -50,32 +110,70 @@ msgid ""
 "A list of strings, each containing an application id (desktop file name), "
 "followed by a colon and the workspace number"
 msgstr ""
-"Lista merkkijonoja, jossa jokainen on ohjelman tunnus (työpöydän "
-"tiedostonimi), jota seuraa kaksoispiste ja työtilan numero"

-#: extensions/auto-move-windows/prefs.js:35
-msgid "Workspace Rules"
-msgstr "Työtilojen säännöt"
+#: extensions/auto-move-windows/prefs.js:60
+msgid "Application"
+msgstr "Sovellus"

-#: extensions/auto-move-windows/prefs.js:243
+#: extensions/auto-move-windows/prefs.js:69
+#: extensions/auto-move-windows/prefs.js:127
+msgid "Workspace"
+msgstr "Työtila"
+
+#: extensions/auto-move-windows/prefs.js:85
 msgid "Add Rule"
 msgstr "Lisää sääntö"

+#: extensions/auto-move-windows/prefs.js:106
+msgid "Create new matching rule"
+msgstr "Luo uusi vastaava sääntö"
+
+#: extensions/auto-move-windows/prefs.js:111
+msgid "Add"
+msgstr "Lisää"
+
 #. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:112
-#: extensions/places-menu/placeDisplay.js:233
+#: extensions/drive-menu/extension.js:107
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "Aseman “%s” irrottaminen epäonnistui:"

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

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

+#: extensions/example/extension.js:17
+msgid "Hello, world!"
+msgstr "Hei, maailma!"
+
+#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:5
+msgid "Alternative greeting text."
+msgstr "Vaihtoehtoinen tervehdysteksti."
+
+#: 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 "Jos ei tyhjä, sisältää paneelia napsauttaessa näytettävän tekstin."
+
+#: extensions/example/prefs.js:30
+msgid "Message"
+msgstr "Viesti"
+
+#. 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 ""
+
 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
 msgid "Use more screen for windows"
 msgstr "Käytä enemmän tilaa ikkunoille"
@@ -86,9 +184,6 @@ msgid ""
 "aspect ratio, and consolidating them further to reduce the bounding box. "
 "This setting applies only with the natural placement strategy."
 msgstr ""
-"Yritä käyttää enemmän näyttötilaa laittamalla ikkunoiden pikkukuvat "
-"huomioiden näyttösuhteen ja lähentämällä niitä vähentämällä rajaavaa "
-"laatikkoa. Tämä asetus toimii vain luonnollisen asettelutavan kanssa."

 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
 msgid "Place window captions on top"
@@ -104,42 +199,44 @@ msgstr ""
 "Tämä syrjäyttää oletusasetuksen, eli otsikkotekstin asettamisen pienoiskuvan "
 "alle. Tämän asetuksen muutos vaatii Gnomen uudelleenkäynnistyksen."

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

-#: extensions/places-menu/placeDisplay.js:46
+#: 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
 #, javascript-format
 msgid "Failed to launch “%s”"
 msgstr "Kohteen “%s” käynnistys epäonnistui"

-#: extensions/places-menu/placeDisplay.js:61
-#, javascript-format
-msgid "Failed to mount volume for “%s”"
-msgstr "Taltion “%s” liittäminen epäonnistui"
-
-#: extensions/places-menu/placeDisplay.js:148
-#: extensions/places-menu/placeDisplay.js:171
+#: extensions/places-menu/placeDisplay.js:137
+#: extensions/places-menu/placeDisplay.js:160
 msgid "Computer"
 msgstr "Tietokone"

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

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

-# Konteksti muutui hieman, kun tälle ilmaantui pari, jossa suunta on taaksepäin
 #: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
 msgid "Cycle Screenshot Sizes"
-msgstr "Vaihda kuvakaappausten kokojen välillä"
+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 "Vaihda kuvakaappausten kokojen välillä taaksepäin"
+msgstr "Vaihtele kuvakaappausten kokojen välillä"

 #: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
@@ -149,47 +246,52 @@ msgstr "Teeman nimi"
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "Teeman nimi, ladataan sijainnista ~/.themes/name/gnome-shell"

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

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

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

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

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

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

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

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

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

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

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

@@ -206,21 +308,10 @@ msgstr ""
 "Mahdolliset arvot ovat “never”, “auto” ja “always”."

 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-#: extensions/window-list/prefs.js:100
-msgid "Show windows from all workspaces"
-msgstr "Näytä ikkunat kaikista työtiloista"
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
-msgid "Whether to show windows from all workspaces or only the current one."
-msgstr ""
-"Näytetäänkö ikkunat kaikista työtiloista vai ainoastaan nykyisestä "
-"työtilasta."
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:27
 msgid "Show the window list on all monitors"
 msgstr "Näytä ikkunaluettelo kaikilla näytöillä"

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:28
+#: 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."
@@ -228,99 +319,39 @@ msgstr ""
 "Näytetäänkö ikkunaluettelo kaikilla liitetyillä näytöillä vai ainoastaan "
 "ensisijaisella näytöllä."

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

-#: extensions/window-list/prefs.js:58
+#: extensions/window-list/prefs.js:50
 msgid "Never group windows"
 msgstr "Älä ryhmitä ikkunoita koskaan"

-#: extensions/window-list/prefs.js:59
+#: extensions/window-list/prefs.js:51
 msgid "Group windows when space is limited"
 msgstr "Ryhmitä ikkunat tilan ollessa rajallinen"

-#: extensions/window-list/prefs.js:60
+#: extensions/window-list/prefs.js:52
 msgid "Always group windows"
 msgstr "Ryhmitä ikkunat aina"

-#: extensions/window-list/prefs.js:94
+#: extensions/window-list/prefs.js:75
 msgid "Show on all monitors"
 msgstr "Näytä kaikilla näytöillä"

-#: extensions/window-list/workspaceIndicator.js:207
-#: extensions/workspace-indicator/extension.js:213
-msgid "Workspace Indicator"
-msgstr "Työtilan ilmaisin"
-
-#: extensions/workspace-indicator/prefs.js:34
+#: extensions/workspace-indicator/prefs.js:141
 msgid "Workspace Names"
 msgstr "Työtilojen nimet"

-#: extensions/workspace-indicator/prefs.js:67
+#: extensions/workspace-indicator/prefs.js:157
+msgid "Name"
+msgstr "Nimi"
+
+#: extensions/workspace-indicator/prefs.js:198
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Työtila %d"

-#: extensions/workspace-indicator/prefs.js:218
-msgid "Add Workspace"
-msgstr "Lisää työtila"
-
-#~ msgid "Application"
-#~ msgstr "Sovellus"
-
-#~ msgid "Create new matching rule"
-#~ msgstr "Luo uusi vastaava sääntö"
-
-#~ msgid "Add"
-#~ msgstr "Lisää"
-
-#~ msgid "Name"
-#~ msgstr "Nimi"
-
-#~ msgid "Attach modal dialog to the parent window"
-#~ msgstr "Liitä modaali-ikkuna ylätason ikkunaan"
-
-#~ msgid "Arrangement of buttons on the titlebar"
-#~ msgstr "Painikkeiden järjestys otsikkopalkissa"
-
-#~ msgid "Workspaces only on primary monitor"
-#~ msgstr "Työtilat vain ensisijaisella näytöllä"
-
-#~ msgid "Delay focus changes in mouse mode until the pointer stops moving"
-#~ msgstr ""
-#~ "Aseta viive kohdistusmuutoksille hiiritilassa, kunnes hiiren osoitin "
-#~ "lopettaa liikkumisen"
-
-#~ msgid "Thumbnail only"
-#~ msgstr "Pelkkä pienoiskuva"
-
-#~ msgid "Application icon only"
-#~ msgstr "Pelkkä sovelluksen kuvake"
-
-#~ msgid "Thumbnail and application icon"
-#~ msgstr "Pienoiskuva ja sovelluksen kuvake"
-
-#~ msgid "Present windows as"
-#~ msgstr "Ikkunoiden esittäminen"
-
-#~ msgid "Activities Overview"
-#~ msgstr "Yleisnäkymä"
-
-#~ msgid "Hello, world!"
-#~ msgstr "Hei, maailma!"
-
-#~ msgid "Alternative greeting text."
-#~ msgstr "Vaihtoehtoinen tervehdysteksti."
-
-#~ msgid ""
-#~ "If not empty, it contains the text that will be shown when clicking on "
-#~ "the panel."
-#~ msgstr "Jos ei tyhjä, sisältää paneelia napsauttaessa näytettävän tekstin."
-
-#~ msgid "Message"
-#~ msgstr "Viesti"
-
 #~ msgid "CPU"
 #~ msgstr "Suoritin"

--- a/Show More
+++ b/Show More