New upstream version 3.35.91

New upstream version 3.34.2
Bump version to 3.34.2
2020-02-24 14:48:45 +01:00 · 2019-12-30 00:41:31 +01:00 · 2019-12-11 22:56:08 +01:00 · 2019-12-09 11:59:58 +00:00 · 2019-11-27 20:56:55 +01:00 · 2019-11-21 22:47:01 +01:00
128 changed files with 7630 additions and 5107 deletions
--- 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,108 +0,0 @@
-include:
- - remote: "https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/6f86b8bcb0cd5168c32779c4fea9a893c4a0c046/templates/ci-fairy.yml"
-
-image: registry.gitlab.gnome.org/gnome/gnome-shell/fedora/33:2020-11-17.0
-
-stages:
- - pre_review
- - review
- - build
-
-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:
- 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'
-
-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
-
-js_check:
-  stage: review
-  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
-  script:
-    - eslint -o $LINT_LOG -f junit extensions
-  artifacts:
-    paths:
-      - ${LINT_LOG}
-    reports:
-      junit: ${LINT_LOG}
-
-build-bundles:
-  stage: build
-  needs: ["check_commit_log"]
-  script:
-    - ./export-zips.sh
-  artifacts:
-    name: 'Extension bundles'
-    expose_as: 'Get Extension bundles here'
-    paths:
-      - zip-files/
--- 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/136
+++ b/136
@@ -1,139 +1,3 @@
-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
 =======

--- 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
+Exec=env GNOME_SHELL_SESSION_MODE=classic gnome-session --session gnome-classic
 TryExec=gnome-session
 Type=Application
 DesktopNames=GNOME-Classic;GNOME;
--- a/data/gnome-classic.scss
+++ b/data/gnome-classic.scss
@@ -33,18 +33,6 @@ $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;
@@ -81,6 +69,7 @@ $variant: 'light';
    border-bottom: none;
    .panel-button { color: $osd_fg_color; }
  }
+  .popup-menu-arrow { width: 0; height: 0;  } // shell's display: none;
 }

 #appMenu { 
--- 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.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;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,43 @@
+// When color definition differs for dark and light variant,
+// it gets @if ed depending on $variant
+
+$base_color: if($variant == 'light', #fff, lighten(desaturate(#241f31, 20%), 2%));
+$bg_color: if($variant == 'light', #f6f5f4, darken(desaturate(#3d3846, 100%), 4%));
+$fg_color: if($variant == 'light', #2e3436, #eeeeec);
+
+$selected_fg_color: #fff;
+$selected_bg_color: if($variant == 'light', #3584e4, darken(#3584e4, 10%));
+$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, 8%));
+$borders_edge: if($variant == 'light', rgba(255,255,255,0.8), 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: #ff8080;
+$success_color: if($variant == 'light', #33d17a, darken(#33d17a, 10%));
+$destructive_color: if($variant == 'light', #e01b24, darken(#e01b24, 10%));
+
+$osd_fg_color: #eeeeec;
+$osd_text_color: white;
+$osd_bg_color: transparentize(darken(desaturate(#3d3846, 100%), 12%),0.04);
+$osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_color, 1), 10%), 0.5);
+$osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 50%);
+$osd_borders_color: transparentize(black, 0.3);
+$osd_outer_borders_color: transparentize(white, 0.84);
+
+$shadow_color: if($variant == 'light', rgba(0,0,0,0.1), rgba(0,0,0,0.2));
+
+//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: mix($borders_color, $base_color, 60%);
+
+//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
@@ -0,0 +1,177 @@
+//This is the RIGHT PLACE to edit the stylesheet
+
+//let's start by telling people not to edit the generated CSS:
+$cakeisalie: "This stylesheet is generated, DO NOT EDIT";
+/* #{$cakeisalie} */
+
+/* Copyright 2009, 2015 Red Hat, Inc.
+ *
+ * Portions adapted from Mx's data/style/default.css
+ *   Copyright 2009 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU Lesser General Public License,
+ * version 2.1, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/* Global Values */
+
+// padding, margin and spacing
+$base_padding: 6px;
+$base_margin: 4px;
+$base_spacing: 6px;
+
+// border radii
+$base_border_radius: 5px;
+
+$modal_radius:$base_border_radius * 2;
+
+// non-standard colors
+$bubble_borders_color: lighten($borders_color, if($variant=='light', 0%, 5%));
+// $bubble_borders_color: if($variant == 'light', rgba(255,255,255,0.1), rgba(0,0,0,0.3));
+
+// hover
+$hover_bg_color: if($variant=='light', darken($bg_color, 3%), lighten($bg_color, 5%));
+$hover_fg_color: if($variant=='light', darken($fg_color, 5%), lighten($fg_color, 5%));
+$hover_borders_color: lighten($borders_color,if($variant=='light', 5%, 3%));
+
+// active
+$active_bg_color: if($variant == 'light', darken($bg_color, 7%), darken($bg_color, 9%));
+$active_fg_color: darken($fg_color,if($variant=='light', 5%, 3%));
+$active_borders_color: darken($borders_color,if($variant=='light', 5%, 3%));
+
+// fonts
+$base_font_size: 11;
+$text_shadow_color: if($variant == 'light', rgba(255,255,255,0.3), rgba(0,0,0,0.2));
+
+// icons
+$base_icon_size: 1.09em;
+// $base_icon_size: 16px;
+
+// Stage
+stage {
+  @include fontsize($base_font_size);
+  color: $fg_color;
+}
+
+/* Common Stylings */
+
+// Text
+%status_text {
+  font-size: 2em;
+  font-weight: bold;
+  color: $osd_fg_color;
+}
+
+// osd panels
+%osd_panel {
+  color: $osd_fg_color;
+  background-color: $osd_bg_color;
+  border: 1px solid $osd_outer_borders_color;
+  border-radius: $base_border_radius * 2 + 4px;
+  padding: $base_padding * 2;
+}
+
+// Overview panels 
+// for the dash and workspace switcher
+%overview_panel {
+  color: $osd_fg_color;
+  background-color: transparentize($osd_bg_color, 0.2);
+  border: 1px solid $osd_outer_borders_color;
+}
+
+// icon tiles
+%icon_tile {
+  border-radius: $base_border_radius + 4px;
+  padding: $base_padding;
+  border: 2px solid transparent;
+  transition-duration: 100ms;
+  text-align: center;
+}
+
+// dialogs
+%bubble_panel {
+  color: $fg_color;
+  background-color: $bg_color;
+  border: 1px solid if($variant=='light', rgba(0,0,0, 0.6), $borders_color);
+}
+
+// button styling
+%button {
+  border-radius: $base_border_radius;
+  border-style: solid;
+  border-width: 1px;
+  min-height: 22px;
+  padding: $base_padding * 0.5 $base_padding * 4;
+
+  @include button(normal);
+  &:focus { @include button(focus);}
+  &:hover { @include button(hover);}
+  &:insensitive { @include button(insensitive);}
+  &:active { @include button(active);}
+}
+
+// buttons in dialogs
+%bubble_button {
+  @include button(normal, $shadow: none);
+  padding: $base_padding * 2;
+  border-style: solid;
+  border-width: 1px;
+  border-left-width: 0;
+  border-bottom-width: 0;
+
+  &:insensitive { @include button(insensitive, $shadow: none); }
+  &:hover { @include button(hover, $shadow: none); }
+  &:focus { @include button(focus, $shadow: none); }
+  &:active { @include button(active, $shadow: none); }
+
+  // radius is 2 pixel less to fit in bubble
+  &:first-child {
+    border-radius: 0 0 0 $modal_radius - 2px;
+  }
+
+  &:last-child {
+    border-right-width: 0;
+    border-radius: 0 0 $modal_radius - 2px 0;
+  }
+  
+  &:first-child:last-child {
+    border-radius: 0 0 $modal_radius - 2px $modal_radius - 2px;
+  }
+}
+
+
+// notification styling
+@mixin notification_bubble($flat: false) {
+  border-width: 1px;
+  border-style: solid;
+  border-radius: $base_border_radius + 2px;
+  margin: $base_margin;
+
+  @if $flat {
+    @include button(undecorated);
+  } @else {
+    @include button(normal);
+  }
+
+  &:focus {
+    @include button(focus);
+  }
+
+  &:hover {
+    @include button(hover);
+  }
+
+  &:active {
+    @include button(active);
+  }
+}
--- a/data/gnome-shell-sass/_drawing.scss
+++ b/data/gnome-shell-sass/_drawing.scss
@@ -0,0 +1,231 @@
+// Drawing mixins
+
+// generic drawing of more complex things
+
+@function draw_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 draw_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
+//
+
+  @if $t==normal {
+    background-color: $base_color;
+    border-color: $borders_color;
+
+  }
+  @if $t==focus {
+    border-color: if($fc==$selected_bg_color,
+              $selected_borders_color,
+              darken($fc,35%));
+    box-shadow: inset 0 0 0 1px $fc;
+  }
+  @if $t==hover { }
+  @if $t==insensitive {
+    color: $insensitive_fg_color;
+    border-color: $insensitive_bg_color;
+    box-shadow: none;
+  }
+}
+
+// buttons
+
+@function draw_border_color ($c) {
+  //
+  // colored buttons want the border form the base color
+  //
+  @return if($variant == 'light', darken($c, 18%), darken($c, 4%));
+}
+
+@function draw_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 rgba(255,255,255,$lbg/($lbg*1.3)); }
+  @else { @return rgba(0,0,0,1-$lbg*0.8); }
+}
+
+@function draw_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 rgba(255,255,255, 0.7); }
+  @else if lightness($c)>50% { @return rgba(255,255,255, 0.5); }
+  @else if lightness($c)>40% { @return rgba(255,255,255, 0.3); }
+  @else { @return rgba(255,255,255, 0.1); }
+}
+
+@mixin draw_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: draw_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:$bg_color, $tc:$fg_color, $edge: $borders_edge, $shadow: $shadow_color) {
+//
+// 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
+// $shadow: set to none to not draw the drop shadow 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: draw_button_hilight_color($c);
+  $button_edge: if($edge == none, none, draw_widget_edge($edge));
+  $blank_edge: if($edge == none, none, draw_widget_edge(transparentize($edge,1)));
+  $button_shadow: if($shadow == none, none, 0 1px 1px 0 $shadow);
+
+  // normal button
+  @if $t==normal {
+    color: $tc;
+    background-color: lighten($c, 3%);
+    border-color: draw_border_color($c);
+    @include draw_shadows($button_shadow);
+    // box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1);
+    text-shadow: 0 1px $text_shadow_color;
+    icon-shadow: 0 1px $text_shadow_color;
+  }
+
+  // focused button
+  @if $t==focus {
+    color: $tc;
+    text-shadow: 0 1px $text_shadow_color;
+    icon-shadow: 0 1px $text_shadow_color;
+    box-shadow: inset 0 0 0 2px transparentize($selected_bg_color, 0.7);
+    //border-color: $selected_bg_color;
+  }
+
+  // hover button
+  @else if $t==hover {
+    color: $tc;
+    background-color: lighten($c, if($variant == 'light', 8%, 5%));
+    border-color: if($variant == 'light', draw_border_color(lighten($c, 7%)), draw_border_color($c));
+    @include draw_shadows($button_shadow);
+    text-shadow: 0 1px $text_shadow_color;
+    icon-shadow: 0 1px $text_shadow_color;
+  }
+
+  // active button
+  @else if $t==active {
+    color: $tc;
+    background-color: darken($c,3%);
+    border-color: draw_border_color(if($variant == 'light', $c, darken($c,7%)));
+    text-shadow: none;
+    icon-shadow: none;
+    box-shadow: none;
+  }
+
+  // insensitive button
+  @else if $t==insensitive {
+    color: $insensitive_fg_color;
+    border-color: $insensitive_borders_color;
+    background-color: $insensitive_bg_color;
+    box-shadow: none;
+    text-shadow: none;
+    icon-shadow: none;
+  }
+
+  // reset
+  @else if $t==undecorated {
+    border-color: transparent;
+    background-color: transparent;
+    background-image: none;
+    @include draw_shadows(inset 0 1px rgba(255,255,255,0),$blank_edge);
+    text-shadow: none;
+    icon-shadow: none;
+  }
+}
+
+// overview icons
+@mixin overview-icon($color) {
+  .overview-icon {
+    @extend %icon_tile;
+    color: $color;
+  }
+
+  &:hover,
+  &:selected {
+    .overview-icon {
+      background-color: transparentize($color, .9);
+    }
+  }
+
+  &:focus {
+    .overview-icon {
+      background-color: transparentize($color, .7);
+      // border-color: $selected_bg_color;
+    }
+  }
+
+  &:drop {
+    .overview-icon {
+      background-color: transparentize($selected_bg_color, .15);
+    }
+  }
+
+  &:active,
+  &:checked {
+    .overview-icon {
+      background-color: transparentize(darken($osd_bg_color, 10%), .5);
+    }
+  }
+}
--- 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: rgba(0,0,0, 0.7);
+$osd_outer_borders_color: rgba(255,255,255, 0.1);
+
+$shadow_color: rgba(0,0,0, 0.1);
+
+//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/_widgets.scss
+++ b/data/gnome-shell-sass/_widgets.scss
@@ -0,0 +1,51 @@
+//
+// Shell widgets stylesheets are placed in separate .scss files
+// in 'widgets' and imported into the main stylesheet in this file.
+// To create or update a widget for the shell modify the list below.
+//
+
+/* WIDGETS */
+
+// Primary widgets
+@import 'widgets/base';
+@import 'widgets/entries';
+@import 'widgets/buttons';
+@import 'widgets/check-box';
+@import 'widgets/switches';
+@import 'widgets/slider';
+@import 'widgets/scrollbars';
+// Popovers
+@import 'widgets/popovers';
+@import 'widgets/calendar';
+@import 'widgets/message-list';
+@import 'widgets/ibus-popup';
+// Notifications
+@import 'widgets/notifications';
+@import 'widgets/hotplug';
+// Dialogs
+@import 'widgets/dialogs';
+@import 'widgets/network-dialog';
+// OSDs
+@import 'widgets/osd';
+@import 'widgets/switcher-popup';
+@import 'widgets/workspace-switcher';
+// Panel
+@import 'widgets/panel';
+@import 'widgets/corner-ripple';
+// Overview
+@import 'widgets/overview';
+@import 'widgets/window-picker';
+@import 'widgets/search-entry';
+@import 'widgets/search-results';
+@import 'widgets/app-grid';
+@import 'widgets/dash';
+@import 'widgets/workspace-thumbnails';
+// A11y / misc
+@import 'widgets/a11y';
+@import 'widgets/misc';
+@import 'widgets/tiled-previews';
+@import 'widgets/keyboard';
+@import 'widgets/looking-glass';
+// Lock / login screens
+@import 'widgets/login-dialog';
+@import 'widgets/screen-shield';
--- 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/gnome-shell-sass/widgets/_a11y.scss
+++ b/data/gnome-shell-sass/widgets/_a11y.scss
@@ -0,0 +1,24 @@
+// Pointer location
+.ripple-pointer-location {
+  width: $ripple_size;
+  height: $ripple_size;
+  border-radius: $ripple_size * 0.5; // radius equals the size of the box to give us the curve
+  background-color: lighten(transparentize($selected_bg_color, 0.7), 30%);
+  box-shadow: 0 0 2px 2px lighten($selected_bg_color, 20%);
+}
+
+// Pointer accessibility notifications
+.pie-timer {
+  width: 60px;
+  height: 60px;
+  -pie-border-width: 3px;
+  -pie-border-color: $selected_bg_color;
+  -pie-background-color: lighten(transparentize($selected_bg_color, 0.7), 40%);
+}
+
+// Screen zoom/Magnifier
+.magnifier-zoom-region {
+  border: 2px solid $selected_bg_color;
+
+  &.full-screen { border-width: 0; }
+}
--- a/data/gnome-shell-sass/widgets/_app-grid.scss
+++ b/data/gnome-shell-sass/widgets/_app-grid.scss
@@ -0,0 +1,186 @@
+/* App Grid */
+
+$app_icon_size: 96px;
+$app_icon_padding: 24px;
+
+// app icons
+.icon-grid {
+  -shell-grid-horizontal-item-size: $app_icon_size + $app_icon_padding * 2;
+  -shell-grid-vertical-item-size: $app_icon_size + $app_icon_padding * 2;
+  spacing: $base_spacing * 6;
+
+  .overview-icon {
+    icon-size: $app_icon_size;
+  }
+}
+
+//.app-display { spacing: 20px; }
+
+/* App Icons */
+
+$app_grid_fg_color: #fff;
+
+// Icon tiles in the app grid
+.app-well-app,
+%app-well-app {
+  @include overview-icon($app_grid_fg_color);
+
+  .overview-icon.overview-icon-with-label {
+    padding: 10px 8px 5px 8px;
+
+    > StBoxLayout {
+      spacing: $base_spacing;
+    }
+  }
+}
+
+/* App Folders */
+.app-folder {
+  .overview-icon {
+  }
+}
+
+// expanded folder
+.app-folder-dialog {
+  border-radius: $modal_radius * 1.5;
+  border: 1px solid $osd_outer_borders_color;
+  spacing: 12px;
+  background-color: transparentize(darken($osd_bg_color,10%), 0.05);
+
+  & .folder-name-container {
+    padding: 24px 36px 0;
+    spacing: 12px;
+
+    & .folder-name-label,
+    & .folder-name-entry {
+      font-size: 18pt;
+      font-weight: bold;
+    }
+
+    & .folder-name-entry { width: 300px }
+
+    /* FIXME: this is to keep the label in sync with the entry */
+    & .folder-name-label { padding: 5px 7px }
+
+    & .edit-folder-button {
+      @extend %button;
+
+      padding: 0;
+      width: 36px;
+      height: 36px;
+      border-radius: 18px;
+
+      & > StIcon { icon-size: 16px }
+    }
+  }
+
+  & StButton#vhandle,
+  & StButton#vhandle:hover,
+  & StButton#vhandle:active { background-color: transparent; }
+}
+.app-folder-dialog-container {
+  padding: 12px;
+  width: 800px;
+  height: 600px;
+}
+
+.app-folder-icon {
+  padding: $base_padding;
+  spacing-rows: $base_spacing;
+  spacing-columns: $base_spacing;
+}
+
+
+// Running app indicator (also shown in dash)
+.app-well-app-running-dot {
+  height: 5px;
+  width: 5px;
+  border-radius:5px;
+  background-color: $osd_fg_color;
+  margin-bottom: 1px;
+}
+
+// Rename popup for app folders
+.rename-folder-popup {
+  .rename-folder-popup-item {
+    spacing: $base_spacing;
+    &:ltr, &:rtl { padding: 0 $base_padding * 2; }
+  }
+}
+
+// right-click app menu
+.app-menu,
+.app-well-menu {
+  max-width: 27.25em;
+}
+
+// App Grid pagination indicators
+.page-indicator {
+  padding: 15px 20px;
+
+  .page-indicator-icon {
+    width: 10px;
+    height: 10px;
+    border-radius: 10px; // the same as height&width
+    background-color: white;
+  }
+}
+
+// Some hacks I don't even know
+.all-apps,
+.frequent-apps > StBoxLayout {
+  // horizontal padding to make sure scrollbars or dash don't overlap content
+  padding: 0px 88px 10px 88px;
+}
+
+// Label when no frequent apps
+.no-frequent-applications-label { @extend %status_text; }
+
+// shutdown and other actions in the grid
+.system-action-icon {
+  background-color: rgba(0,0,0,0.8);
+  color: #fff;
+  border-radius: 99px;
+  icon-size: $app_icon_size * 0.5;
+}
+
+/* Frequent | All toggle */
+
+// container
+.app-view-controls { 
+  padding-bottom: 32px;
+}
+
+// buttons
+.app-view-control {
+  padding: 4px 32px;
+  margin: 0 4px;
+
+  &, &:hover, &:checked {
+    @include button(undecorated);
+    color: darken($osd_fg_color, 25%);
+  }
+
+  &:hover {
+    color: $osd_fg_color;
+    box-shadow: inset 0 -2px darken($osd_fg_color, 25%);
+  }
+
+  &:active {
+    box-shadow: inset 0 -2px $osd_fg_color;
+  }
+
+  &:checked {
+    color: $osd_fg_color;
+    box-shadow: inset 0 -2px $selected_bg_color;
+  }
+
+  &:first-child {
+    border-right-width: 0;
+    border-radius: 0;
+  }
+
+  &:last-child {
+    border-radius: 0;
+  }
+}
--- a/data/gnome-shell-sass/widgets/_base.scss
+++ b/data/gnome-shell-sass/widgets/_base.scss
@@ -0,0 +1,18 @@
+// Links
+.shell-link {
+  color: $link_color;
+
+  &:hover {
+    color: lighten($link_color, 10%);
+  }
+}
+
+// Outline for low res icons
+.lowres-icon {
+  icon-shadow: 0 1px 2px rgba(black, 0.3);
+}
+
+// Dropshadow for large icons
+.icon-dropshadow {
+  icon-shadow: 0 1px 2px rgba(black, 0.4);
+}
--- a/data/gnome-shell-sass/widgets/_buttons.scss
+++ b/data/gnome-shell-sass/widgets/_buttons.scss
@@ -0,0 +1,5 @@
+/* Buttons */
+
+.button {
+  @extend %button; // that's it
+}
--- a/data/gnome-shell-sass/widgets/_calendar.scss
+++ b/data/gnome-shell-sass/widgets/_calendar.scss
@@ -0,0 +1,255 @@
+/* Date/Time Menu */
+
+.clock-display-box { spacing: $base_spacing; }
+
+// overall menu
+#calendarArea {
+  padding:0;
+}
+
+// Calendar menu side column
+.datemenu-calendar-column {
+  spacing: $base_spacing;
+  border: 0 solid $bubble_borders_color;
+  padding: 0 $base_padding * 2;
+
+  &:ltr {margin-right: $base_margin * 2; border-left-width: 1px; }
+  &:rtl {margin-left: $base_margin * 2; border-right-width: 1px; }
+
+  .datemenu-displays-section {
+  }
+
+  .datemenu-displays-box {
+    spacing: $base_spacing;
+  }
+}
+
+.events-section-title {
+  @include notification_bubble($flat: true);
+  color: desaturate(darken($fg_color,40%), 10%);
+  font-weight: bold;
+  padding: .4em;
+}
+
+/* today button (the date) */
+.datemenu-today-button {
+  @include notification_bubble($flat: true);
+  padding: $base_padding * 1.5;
+
+  // weekday label
+  .day-label {
+    @include fontsize($base_font_size+1);
+    font-weight: bold;
+  }
+
+  // date label
+  .date-label {
+    @include fontsize($base_font_size+7);
+    font-weight: 1000;
+  }
+}
+
+/* Calendar */
+.calendar {
+  @include notification_bubble;
+  padding: $base_padding;
+
+  // month
+  .calendar-month-label {
+    color: lighten($fg_color,5%);
+    font-weight: bold;
+    padding: 8px 0;
+    &:focus {}
+  }
+
+  // prev/next month icons
+  .calendar-change-month-back StIcon,
+  .calendar-change-month-forward StIcon {
+    icon-size: $base_icon_size;
+  }
+
+  .pager-button {
+    background-color: transparent;
+    height: 32px;
+    width: 32px;
+    border-radius: $base_border_radius;
+    &:hover, &:focus { background-color: lighten($hover_bg_color, 5%); }
+    &:active { background-color: $active_bg_color; }
+  }
+
+
+  $calendar_day_size: 32px;
+
+  .calendar-day-base {
+    @include fontsize($base_font_size - 3);
+    text-align: center;
+    width: $calendar_day_size;
+    height: $calendar_day_size;
+    padding: 0;
+    margin: 2px;
+    border-radius: $calendar_day_size * 0.5 + 2px;
+    border: 1px solid transparent; //avoid jumparound due to today
+    font-feature-settings: "tnum";
+    &:hover, &:focus { background-color: $hover_bg_color; }
+    &:active,&:selected {
+      color: lighten($fg_color,10%);
+      background-color: darken($bg_color,5%);
+    }
+
+    // day of week heading
+    &.calendar-day-heading {
+      color: lighten($fg_color,10%);
+      margin-top: 1em;
+      @include fontsize($base_font_size - 4);
+    }
+  }
+
+  .calendar-day { //border collapse hack - see calendar.js
+    border-width: 0;
+  }
+
+  .calendar-day-top {
+    border-top-width: 1px;
+  }
+
+  .calendar-day-left {
+    border-left-width: 1px;
+  }
+
+  .calendar-work-day {}
+
+  .calendar-nonwork-day {
+    color: $insensitive_fg_color;
+  }
+
+  // Today
+  .calendar-today {
+    font-weight: bold;
+    border: 1px solid transparent;
+    background-color: $selected_bg_color;
+    color: $selected_fg_color;
+
+    &:hover,&:focus {
+      background-color:lighten($selected_bg_color, 3%);
+      color: $selected_fg_color;
+    }
+
+    &:active,&:selected {
+      background-color: $selected_bg_color;
+      color: $selected_fg_color;
+
+      &:hover,&:focus {
+        background-color:lighten($selected_bg_color, 3%);
+        color: $selected_fg_color;
+      }
+    }
+  }
+
+  .calendar-day-with-events {
+    color: lighten($fg_color,10%);
+    font-weight: bold;
+    background-image: url("resource:///org/gnome/shell/theme/calendar-today.svg");
+  }
+
+  .calendar-other-month-day {
+    color: transparentize($fg_color ,0.5);
+  }
+
+  .calendar-week-number {
+    @include fontsize($base_font_size - 4);
+    font-weight: bold;
+    height: 1.8em;
+    width: 2.3em; 
+    border-radius: 2px;
+    padding: 0.5em 0 0;
+    margin: 6px;
+    background-color: darken($bg_color, 2%);
+    color: lighten($fg_color, 5%);
+  }
+}
+
+/* World clocks */
+.world-clocks-button {
+  @include notification_bubble;
+  padding: $base_padding * 2;
+
+  .world-clocks-grid {
+    spacing-rows: $base_spacing;
+    spacing-columns: $base_spacing * 2;
+  }
+
+  // title
+  .world-clocks-header {
+    color: desaturate(darken($fg_color,40%), 10%);
+    font-weight: bold;
+  }
+
+  // city label
+  .world-clocks-city {
+    color: $fg_color;
+    @include fontsize($base_font_size);
+    font-weight: normal;
+  }
+
+  // timezone time
+  .world-clocks-time {
+    font-weight: bold;
+    color: $fg_color;
+    font-feature-settings: "lnum";
+    @include fontsize($base_font_size);
+    text-align: right;
+  }
+
+  // timezone offset label
+  .world-clocks-timezone {
+    color: darken($fg_color,20%);
+    font-feature-settings: "tnum";
+    @include fontsize($base_font_size - 1);
+  }
+}
+
+/* Weather */
+.weather-button {
+  @include notification_bubble;
+  padding: $base_padding * 2;
+
+  .weather-box {
+    spacing: $base_spacing + $base_margin;
+  }
+
+  .weather-header-box {
+    spacing: $base_spacing;
+  }
+
+  .weather-header {
+    color: desaturate(darken($fg_color,40%), 10%);
+    font-weight: bold;
+
+    &.location {
+      font-weight: normal;
+      @include fontsize($base_font_size - 1);
+    }
+  }
+
+  .weather-grid {
+    spacing-rows: $base_spacing;
+    spacing-columns: $base_spacing * 2;
+  }
+
+  .weather-forecast-time {
+    color: darken($fg_color,30%);
+    font-feature-settings: "tnum";
+    @include fontsize($base_font_size - 2);
+    font-weight: normal;
+    padding-top: 0.2em;
+    padding-bottom: 0.4em;
+  }
+
+  .weather-forecast-icon {
+    icon-size: $base_icon_size * 2;
+  }
+
+  .weather-forecast-temp {
+    font-weight: bold;
+  }
+}
--- a/data/gnome-shell-sass/widgets/_check-box.scss
+++ b/data/gnome-shell-sass/widgets/_check-box.scss
@@ -0,0 +1,18 @@
+/* Check Boxes */
+
+// these are equal to the size of the SVG assets
+$check_height: 22px;
+$check_width: 24px;
+
+
+.check-box {
+  StBoxLayout { spacing: .8em; }
+  StBin {
+    width: $check_width;
+    height: $check_height;
+    background-image: url("resource:///org/gnome/shell/theme/checkbox-off.svg");
+  }
+  &:focus StBin { background-image: url("resource:///org/gnome/shell/theme/checkbox-off-focused.svg"); }
+  &:checked StBin { background-image: url("resource:///org/gnome/shell/theme/checkbox.svg"); }
+  &:focus:checked StBin { background-image: url("resource:///org/gnome/shell/theme/checkbox-focused.svg"); }
+}
--- a/data/gnome-shell-sass/widgets/_corner-ripple.scss
+++ b/data/gnome-shell-sass/widgets/_corner-ripple.scss
@@ -0,0 +1,15 @@
+/* Activities Ripple */
+
+$ripple_size: 50px;
+
+.ripple-box {
+  background-color: lighten(transparentize($selected_bg_color, 0.7), 40%);
+  box-shadow: 0 0 2px 2px lighten($selected_bg_color, 20%);
+  // plus + 2px for the border (box-shadow)
+  width: $ripple_size + 2px;
+  height: $ripple_size + 2px;
+  border-radius: 0 0 $ripple_size + 2px 0; // radius equals the size of the box to give us the curve
+
+  // just a simple change to the border radius position
+  &:rtl { border-radius: 0 0 0 $ripple_size + 2px; }
+}
--- a/data/gnome-shell-sass/widgets/_dash.scss
+++ b/data/gnome-shell-sass/widgets/_dash.scss
@@ -0,0 +1,61 @@
+/* Dash */
+
+$dash_placeholder_size: 32px;
+$dash_spacing: $base_padding + 4px;
+$dash_border_radius: $modal_radius * 1.5;
+
+#dash {
+  @extend %overview_panel;
+  @include fontsize($base_font_size - 2);
+  padding: ($dash_spacing / 2) 0;
+
+  border-radius: 0 $dash_border_radius $dash_border_radius 0; 
+  border-left-width: 0;
+  &:rtl {
+    border-radius: $dash_border_radius 0 0 $dash_border_radius;
+    border-right-width: 0;
+  }
+
+  .placeholder {
+    // background-image: url("resource:///org/gnome/shell/theme/dash-placeholder.svg");
+    background-image:none;
+    background-size: contain;
+    height: $dash_placeholder_size;
+  }
+
+  .empty-dash-drop-target {
+    width: $dash_placeholder_size;
+    height: $dash_placeholder_size;
+  }
+}
+
+// Dash Items
+.dash-item-container > StWidget {
+  padding: ($dash_spacing / 2) $dash_spacing;
+}
+
+// OSD Tooltip
+.dash-label {
+  background-color: transparentize($osd_bg_color,0.05);
+  border-radius: $base_border_radius + 2px;
+  border:none;
+  box-shadow:0 0 0 1px $osd_outer_borders_color;
+  color: $osd_fg_color;
+  padding: $base_padding $base_padding + 2px;
+  text-align: center;
+  -x-offset: $base_margin * 2; // distance from the dash edge
+}
+
+// Show apps button
+.show-apps {
+  @include overview-icon($osd_fg_color);
+
+  &:focus,
+  &:checked {
+    .overview-icon {
+      background-color: darken($osd_bg_color,10%);
+      color: $fg_color;
+    }
+  }
+}
+
--- a/data/gnome-shell-sass/widgets/_dialogs.scss
+++ b/data/gnome-shell-sass/widgets/_dialogs.scss
@@ -0,0 +1,168 @@
+/* Modal Dialogs */
+
+.headline {
+  @include fontsize($base_font_size + 1);
+}
+
+.modal-dialog {
+  border-radius: $modal_radius;
+  @extend %bubble_panel;
+
+  .modal-dialog-content-box {
+    margin: 32px 40px;
+    spacing: 32px;
+    max-width: 28em;
+  }
+
+  .modal-dialog-linked-button {
+    @extend %bubble_button;
+  }
+}
+
+/* End Session Dialog */
+.end-session-dialog {
+  width: 30em;
+
+  .end-session-dialog-battery-warning,
+  .dialog-list-title {
+    color: $warning_color;
+  }
+}
+
+/* Message Dialog */
+.message-dialog-content {
+  spacing: 18px;
+
+  .message-dialog-title {
+    text-align: center;
+    font-size: 18pt;
+    font-weight: 800;
+
+    &.leightweight {
+      font-size: 13pt;
+      font-weight: 800;
+    }
+  }
+  .message-dialog-description { text-align: center; }
+}
+
+/* Dialog List */
+.dialog-list {
+  spacing: 18px;
+
+  .dialog-list-title {
+    text-align: center;
+    font-weight: bold;
+  }
+
+  .dialog-list-scrollview { max-height: 200px; }
+  .dialog-list-box {
+    spacing: 1em;
+
+    .dialog-list-item {
+      spacing: 1em;
+
+      .dialog-list-item-title { font-weight: bold; }
+      .dialog-list-item-description {
+        color: darken($fg_color,5%);
+        @include fontsize($base_font_size - 1);
+      }
+    }
+  }
+}
+
+/* Run Dialog */
+.run-dialog {
+  .modal-dialog-content-box {
+    margin-top: 24px;
+    margin-bottom: 14px;
+  }
+  .run-dialog-entry { width: 20em; }
+  .run-dialog-description {
+    @include fontsize($base_font_size - 1);
+    text-align: center;
+    color: darken($fg_color, 20%);
+  }
+}
+
+/* Password or Authentication Dialog */
+
+.prompt-dialog {
+  width: 28em;
+
+  .modal-dialog-content-box {
+    margin-bottom: 24px;
+  }
+}
+
+.prompt-dialog-password-grid {
+  spacing-rows: 8px;
+  spacing-columns: 4px;
+
+  .prompt-dialog-password-entry {
+    width: auto;
+
+    // 4px (spacing) + 16px (spinner-width)
+    &:ltr { margin-left: 20px; }
+    &:rtl { margin-right: 20px; }
+  }
+}
+
+.prompt-dialog-password-layout {
+  spacing: 8px;
+}
+
+.prompt-dialog-password-entry {
+  width: 20em;
+}
+
+.prompt-dialog-error-label,
+.prompt-dialog-info-label,
+.prompt-dialog-null-label {
+  text-align: center;
+  @include fontsize($base_font_size - 1);
+}
+
+.prompt-dialog-error-label {
+  color: $warning_color;
+}
+
+
+/* Polkit Dialog */
+
+.polkit-dialog-user-layout {
+  text-align: center;
+  spacing: 8px;
+  margin-bottom: 6px;
+
+  .polkit-dialog-user-icon {
+    border-radius: 99px;
+    background-size: contain;
+  }
+  .polkit-dialog-user-root-label { color: $warning_color; }
+}
+
+/* Audio selection dialog */
+.audio-device-selection-dialog {
+  .modal-dialog-content-box { margin-bottom: 28px; }
+  .audio-selection-box { spacing: 20px; }
+}
+
+.audio-selection-device {
+  border: 1px solid $bubble_borders_color;
+  border-radius: 12px;
+  &:hover,&:focus { background-color: $hover_bg_color; }
+  &:active { 
+    background-color: $selected_bg_color;
+    color: $selected_fg_color;
+  }
+}
+
+.audio-selection-device-box {
+  padding: 20px;
+  spacing: 20px;
+}
+
+.audio-selection-device-icon {
+  icon-size: $base_icon_size * 4;
+}
--- a/data/gnome-shell-sass/widgets/_entries.scss
+++ b/data/gnome-shell-sass/widgets/_entries.scss
@@ -0,0 +1,27 @@
+/* Entries */
+
+StEntry {
+  border-radius: $base_border_radius;
+  padding: 8px;
+  border-width: 1px;
+  color: $fg_color;
+  @include entry(normal);
+  //&:hover { @include entry(hover);}
+  &:focus { @include entry(focus);}
+  &:insensitive { @include entry(insensitive);}
+  selection-background-color: $selected_bg_color;
+  selected-color: $selected_fg_color;
+  StIcon.capslock-warning {
+    icon-size: 16px;
+    warning-color: $warning_color;
+    padding: 0 4px;
+  }
+  StIcon.peek-password {
+    icon-size: $base_icon_size;
+    padding: 0 4px;
+  }
+  StLabel.hint-text {
+    margin-left: 2px;
+    color: transparentize($fg_color, 0.3);
+  }
+}
--- a/data/gnome-shell-sass/widgets/_hotplug.scss
+++ b/data/gnome-shell-sass/widgets/_hotplug.scss
@@ -0,0 +1,10 @@
+// hotplug
+
+.hotplug-notification-item {
+  @extend %bubble_button;
+}
+
+.hotplug-notification-item-icon {
+  icon-size: 24px;
+  padding: 0 4px;
+}
--- a/data/gnome-shell-sass/widgets/_ibus-popup.scss
+++ b/data/gnome-shell-sass/widgets/_ibus-popup.scss
@@ -0,0 +1,35 @@
+// IBus Candidate Popup
+
+.candidate-popup-boxpointer {
+  @extend .popup-menu-boxpointer;
+}
+
+.candidate-popup-content {
+  padding: 0.5em;
+  spacing: 0.3em;
+}
+
+.candidate-index {
+  padding: 0 0.5em 0 0;
+  color: darken($fg_color,10%);
+}
+
+.candidate-box {
+  padding: 0.3em 0.5em 0.3em 0.5em;
+  border-radius: $base_border_radius;
+  &:selected,&:hover { background-color: $selected_bg_color; color: $selected_fg_color; }
+}
+
+.candidate-page-button-box {
+  height: 2em;
+  .vertical & { padding-top: 0.5em; }
+  .horizontal & { padding-left: 0.5em; }
+}
+
+.candidate-page-button {
+  padding: 4px;
+}
+
+.candidate-page-button-previous { border-radius: $base_border_radius 0px 0px $base_border_radius; border-right-width: 0; }
+.candidate-page-button-next { border-radius: 0px $base_border_radius $base_border_radius 0px;  }
+.candidate-page-button-icon { icon-size: 1em; }
--- a/data/gnome-shell-sass/widgets/_keyboard.scss
+++ b/data/gnome-shell-sass/widgets/_keyboard.scss
@@ -0,0 +1,124 @@
+/* On-screen Keyboard */
+
+$key_size: 1.2em;
+$key_border_radius: $base_border_radius + 3px;
+$key_bg_color:  $bg_color;
+// $default_key_bg_color: darken($key_bg_color, 4%);
+$default_key_bg_color: if($variant=='light', darken($osd_bg_color, 11%), lighten($osd_bg_color, 2%));
+
+
+// draw keys using button function
+#keyboard {
+  background-color: transparentize(if($variant=='light', darken($bg_color, 5%), darken($bg_color, 8%)), 0.1);
+  box-shadow: inset 0 1px 0 0 $osd_outer_borders_color;
+
+  .page-indicator {
+    padding: $base_padding;
+
+    .page-indicator-icon {
+      width: 8px;
+      height: 8px;
+    }
+  }
+}
+
+// the container for individual keys
+.key-container {
+  padding: $base_margin;
+  spacing: $base_margin;
+}
+
+// the keys
+.keyboard-key {
+
+  @include button(normal, $c:$key_bg_color);
+
+  &:focus { @include button(focus);}
+  &:hover, &:checked { @include button(hover, $c: $key_bg_color);}
+  &:active { @include button(active, $c: $key_bg_color); }
+
+  @include fontsize($base_font_size + 5);
+  min-height: $key_size;
+  min-width: $key_size;
+  border-width: 1px;
+  border-style: solid;
+  border-radius: $key_border_radius;
+
+  &:grayed { //FIXMEy
+    background-color: darken($bg_color, 3%);
+    color: $osd_fg_color;
+    border-color: $osd_borders_color;
+  }
+
+  // non-character keys
+  &.default-key {
+
+    // size of the icon asset
+    background-size: 24px;
+
+    @include button(normal, $c:$default_key_bg_color);
+    &:hover, &:checked {@include button(hover, $c: $default_key_bg_color);}
+    &:active { @include button(active, $c: $default_key_bg_color);}
+  }
+
+  // enter key is suggested-action
+  &.enter-key {
+    background-image: url("resource:///org/gnome/shell/theme/key-enter.svg");
+
+    @include button(normal, $c:$selected_bg_color, $tc:$selected_fg_color);
+    &:hover, &:checked { @include button(hover, $c: lighten($selected_bg_color, 3%));}
+    &:active {@include button(active, $c: darken($selected_bg_color, 2%));}
+  }
+
+  // key assets
+  &.shift-key-lowercase {background-image: url("resource:///org/gnome/shell/theme/key-shift.svg");}
+  &.shift-key-uppercase {background-image: url("resource:///org/gnome/shell/theme/key-shift-uppercase.svg");}
+  &.shift-key-uppercase:latched {background-image: url("resource:///org/gnome/shell/theme/key-shift-latched-uppercase.svg");}
+  &.hide-key {background-image: url("resource:///org/gnome/shell/theme/key-hide.svg");}
+  &.layout-key {background-image: url("resource:///org/gnome/shell/theme/key-layout.svg");}
+}
+
+// long press on a key popup
+.keyboard-subkeys {
+  color: $osd_fg_color;
+  -arrow-border-radius: $modal_radius;
+  -arrow-background-color: $osd_bg_color;
+  -arrow-border-width: 1px;
+  -arrow-border-color: lighten($osd_bg_color, 9%);
+  -arrow-base: 20px;
+  -arrow-rise: 10px;
+  -boxpointer-gap: $base_spacing;
+
+  .keyboard-key {
+    @include button(normal, $c:$key_bg_color);
+
+    &:focus { @include button(focus);}
+    &:hover, &:checked { @include button(hover, $c: $key_bg_color);}
+    &:active { @include button(active, $c: $key_bg_color); }
+
+    border-radius:$base_border_radius;
+  }
+}
+
+// emoji
+.emoji-page {
+  .keyboard-key {
+    background-color: transparent;
+    border: none;
+    color: initial;
+  }
+}
+
+.emoji-panel {
+  .keyboard-key:latched {
+    border-color: lighten($selected_bg_color, 5%);
+    background-color: $selected_bg_color;
+  }
+}
+
+// suggestions
+.word-suggestions {
+  @include fontsize($base_font_size + 3);
+  spacing: 12px;
+  min-height: 20pt;
+}
--- a/data/gnome-shell-sass/widgets/_login-dialog.scss
+++ b/data/gnome-shell-sass/widgets/_login-dialog.scss
@@ -0,0 +1,171 @@
+/* Login Dialog */
+
+.login-dialog-banner-view {
+  padding-top: 24px;
+  max-width: 23em;
+}
+
+.login-dialog {
+  //reset
+  border: none;
+  background-color: transparent;
+
+  $_gdm_bg: lighten(#2e3436, 19%);
+
+  StEntry {
+    @if $variant=='dark' {
+      $_gdm_entry_bg: transparentize(lighten(desaturate(#241f31, 20%), 2%), 0.5);
+      background-color: $_gdm_entry_bg;
+      color: $osd_fg_color;
+    }
+  }
+
+  .modal-dialog-button-box { spacing: 3px; }
+  .modal-dialog-button {
+    padding: 4px 18px;
+    box-shadow: 0 1px 3px rgba(0,0,0,0.2);
+    background-color: $_gdm_bg;
+    border-color: $_gdm_bg;
+    color: $fg_color;
+
+    $_hover_c: lighten($_gdm_bg, 5%);
+    &:hover, &:focus {
+      background-color: $_hover_c;
+      border-color: $_hover_c;
+    }
+    &:active {
+      $_active_c: darken($_gdm_bg, 5%);
+      box-shadow: none;
+      background-color: $_active_c;
+      border-color: $_active_c;
+    }
+    &:insensitive {
+      @include button(insensitive);
+      border-color: darken($_gdm_bg, 5%);
+      background-color: darken($_gdm_bg, 5%);
+      color: transparentize($fg_color, 0.3);
+    }
+    &:default {
+      @include button(normal, $c:$selected_bg_color, $tc:$selected_fg_color);
+      border-color: $selected_bg_color;
+      &:hover, &:focus { 
+        @include button(hover,$c:$selected_bg_color, $tc:$selected_fg_color);
+        $_def_hover_c: lighten($selected_bg_color, 5%);
+        background-color: $_def_hover_c;
+        border-color: $_def_hover_c;
+      }
+      &:active {
+        @include button(active,$c:$selected_bg_color, $tc:$selected_fg_color);
+        $_def_active_c: darken($selected_bg_color, 5%);
+        background-color: $_def_active_c;
+        border-color: $_def_active_c;
+      }
+      &:insensitive {
+        @include button(insensitive);
+        border-color: darken($selected_bg_color, 10%);
+        background-color: darken($selected_bg_color, 10%);
+        color: transparentize($selected_fg_color, 0.3);
+      }
+    }
+  }
+
+  .cancel-button,
+  .switch-user-button,
+  .login-dialog-session-list-button {
+    padding: 0;
+    border-radius: 99px;
+    width: $base_icon_size * 2;
+    height: $base_icon_size * 2;
+    border-color: transparentize($bg_color,0.7);
+    background-color: transparentize($bg_color,0.7);
+
+    StIcon { icon-size: $base_icon_size; }
+  }
+
+  .caps-lock-warning-label,
+  .login-dialog-message-warning {
+    color: $osd_fg_color;
+  }
+}
+
+.login-dialog-logo-bin { padding: 24px 0px; }
+.login-dialog-banner { color: darken($osd_fg_color,10%); }
+.login-dialog-button-box { width: 23em; spacing: 5px; }
+.login-dialog-message { text-align: center; }
+.login-dialog-message-hint { padding-top: 0; padding-bottom: 20px; }
+.login-dialog-user-selection-box { padding: 100px 0px; }
+.login-dialog-not-listed-label {
+  padding-left: 2px;
+  .login-dialog-not-listed-button:focus &,
+  .login-dialog-not-listed-button:hover & {
+    color: $osd_fg_color;
+  }
+}
+
+.login-dialog-not-listed-label {
+  @include fontsize($base_font_size - 1);
+  font-weight: bold;
+  color: darken($osd_fg_color,30%);
+  padding-top: 1em;
+}
+
+.login-dialog-user-list-view { -st-vfade-offset: 1em; }
+.login-dialog-user-list {
+  spacing: 12px;
+  width: 23em;
+  &:expanded .login-dialog-user-list-item:selected { background-color: $selected_bg_color; color: $selected_fg_color; }
+  &:expanded .login-dialog-user-list-item:logged-in { border-right: 2px solid $selected_bg_color; }
+}
+
+.login-dialog-user-list-item {
+  border-radius: $base_border_radius + 4px;
+  padding: 6px;
+  color: darken($osd_fg_color,30%);
+  &:ltr .user-widget { padding-right: 1em; }
+  &:rtl .user-widget { padding-left: 1em; }
+  .login-dialog-timed-login-indicator {
+    height: 2px;
+    margin-top: 6px;
+    background-color: $osd_fg_color;
+  }
+  &:focus .login-dialog-timed-login-indicator { background-color: $selected_fg_color; }
+}
+
+.user-widget-label {
+  color: $osd_fg_color;
+}
+
+.user-widget.horizontal .user-widget-label {
+  @include fontsize($base_font_size + 2);
+  font-weight: bold;
+  text-align: left;
+  padding-left: 15px;
+
+  &:ltr { padding-left: 14px; }
+  &:rtl { padding-right: 14px; }
+}
+
+.user-widget.vertical .user-widget-label {
+  @include fontsize($base_font_size + 5);
+  text-align: center;
+  font-weight: normal;
+  padding-top: 16px;
+}
+
+.login-dialog-prompt-layout {
+  padding-top: 24px;
+  padding-bottom: 12px;
+  spacing: $base_spacing * 2;
+  width: 23em;
+}
+
+.login-dialog-prompt-entry {
+  width: 17.89em;
+  height: 1.5em;
+}
+
+.login-dialog-prompt-label {
+  color: darken($osd_fg_color, 20%);
+  @include fontsize($base_font_size + 1);
+  padding-top: 1em;
+}
--- a/data/gnome-shell-sass/widgets/_looking-glass.scss
+++ b/data/gnome-shell-sass/widgets/_looking-glass.scss
@@ -0,0 +1,97 @@
+/* Looking Glass */
+
+// Dialog
+#LookingGlassDialog {
+  background-color: $osd_bg_color;
+  spacing: $base_spacing;
+  padding: 4px;
+  border: 2px solid transparentize($osd_fg_color, 0.8);
+  border-top-width:0;
+  border-radius: 0 0 $base_border_radius $base_border_radius;
+
+  & > #Toolbar {
+    border: none;
+    border-radius: $base_border_radius;
+    background-color: darken($osd_bg_color, 10%);
+  }
+
+  .labels { spacing: $base_spacing; }
+  .notebook-tab {
+    -natural-hpadding: $base_padding * 2;
+    -minimum-hpadding: 6px;
+    font-weight: bold;
+    color: $fg_color;
+    transition-duration: 100ms;
+    padding-left: .3em;
+    padding-right: .3em;
+    &:hover {
+      color: white;
+      text-shadow: black 0px 2px 2px;
+    }
+    &:selected {
+      border-bottom-width: 2px;
+      border-color: lighten($selected_bg_color,5%);
+      color: white;
+      text-shadow: black 0px 2px 2px;
+    }
+  }
+  StBoxLayout#EvalBox { padding: 4px; spacing: $base_spacing; }
+  StBoxLayout#ResultsArea { spacing: $base_spacing; }
+}
+
+.lg-dialog {
+  StEntry {
+    selection-background-color: #bbbbbb;
+    selected-color: $osd_bg_color;
+  }
+  .shell-link {
+    color: #999999;
+    &:hover { color: #dddddd; }
+   }
+}
+
+.lg-completions-text {
+    font-size: .9em;
+    font-style: italic;
+}
+
+.lg-obj-inspector-title {
+    spacing: $base_spacing;
+}
+
+.lg-obj-inspector-button {
+    border: 1px solid gray;
+    padding: 4px;
+    border-radius: $base_border_radius;
+    &:hover { border: 1px solid #ffffff; }
+}
+
+// Extensions
+#lookingGlassExtensions { padding: 4px; }
+
+.lg-extensions-list {
+    padding: 4px;
+    spacing: 6px;
+}
+
+.lg-extension {
+    border: 1px solid $osd_borders_color;
+    border-radius: $base_border_radius;
+    padding: 4px;
+}
+
+.lg-extension-name {
+    font-weight: bold;
+}
+
+.lg-extension-meta {
+    spacing: 6px;
+}
+
+// Inspector
+#LookingGlassPropertyInspector {
+  background: $osd_bg_color;
+  border: 1px solid $osd_borders_color;
+  border-radius: $base_border_radius;
+  padding: 6px;
+}
--- a/data/gnome-shell-sass/widgets/_message-list.scss
+++ b/data/gnome-shell-sass/widgets/_message-list.scss
@@ -0,0 +1,134 @@
+/* Message List */
+// a.k.a. notifications in the menu
+
+// main list
+.message-list {
+  width: 31.5em;
+  padding: 0 $base_padding * 2;
+
+  .message-list-placeholder { spacing: 12px; }
+}
+
+.message-list-sections {
+  spacing: $base_spacing;
+  margin: 0 $base_margin * 4; // to account for scrollbar
+}
+
+.message-list-section,
+.message-list-section-list {
+  spacing: $base_spacing;
+}
+
+// do-not-disturb + clear button
+.message-list-controls {
+  margin: ($base_margin * 2) ($base_margin * 4) 0;
+  // NOTE: remove the padding if notification_bubble could remove margin for drop shadow
+  padding: $base_margin;
+  spacing: $base_spacing;
+}
+
+// message bubbles
+.message {
+  @include notification_bubble;
+
+  // icon container
+  .message-icon-bin {
+    padding: ($base_padding * 3) 0 ($base_padding * 3) ($base_padding * 2);
+
+    &:rtl {
+      padding: ($base_padding * 3) ($base_padding * 2) ($base_padding * 3) 0;
+    }
+
+    // icon size and color
+    > StIcon {
+      icon-size: $base_icon_size*2; // 32px
+      -st-icon-style: symbolic;
+    }
+
+    // fallback
+    > .fallback-app-icon {
+      width: $base_icon_size;
+      height: $base_icon_size;
+    }
+  }
+
+  // content
+  .message-content {
+    padding: $base_padding + $base_margin * 2;
+    spacing: 4px;
+  }
+
+  // title
+  .message-title {
+    font-weight: bold;
+  }
+
+  // secondary container in title box
+  .message-secondary-bin {
+    padding: 0 $base_margin * 2;
+
+    // notification time stamp
+    > .event-time {
+      color: transparentize($fg_color, 0.5);
+      @include fontsize($base_font_size - 2);
+      text-align: right;
+      /* HACK: the label should be baseline-aligned with a 1em label, fake this with some bottom padding */
+      padding-bottom: 0.13em;
+    }
+  }
+
+  // close button
+  .message-close-button {
+    color: lighten($fg_color, 15%);
+    &:hover { color: if($variant=='light', lighten($fg_color, 30%), darken($fg_color, 10%)); }
+    &:active { color: if($variant=='light', lighten($fg_color, 40%), darken($fg_color, 20%)); }
+  }
+
+  // body
+  .message-body {
+    color: darken($fg_color, 10%);
+  }
+}
+
+// URLs in messages
+.url-highlighter {
+  link-color: $link_color;
+}
+
+/* Media Controls */
+.message-media-control {
+  padding: $base_padding * 2 $base_padding * 4;
+  color: darken($fg_color, 15%);
+
+  // uses $hover_bg_color since the media controls are in a notification_bubble
+  &:hover {
+    background-color: lighten($hover_bg_color, 5%);
+    color: $fg_color;
+  }
+
+  &:active { 
+    background-color: darken($hover_bg_color, 2%);
+    color: $fg_color;
+  }
+
+  &:insensitive { color: darken($fg_color,40%); }
+  
+  // fix border-radius for last button
+  &:last-child:ltr { border-radius: 0 $base_border_radius+2 $base_border_radius+2 0; }
+  &:last-child:rtl { border-radius: $base_border_radius+2 0 0 $base_border_radius+2; }
+}
+
+// album-art
+.media-message-cover-icon {
+  icon-size: $base_icon_size*2 !important; // 48px
+  border-radius: $base_border_radius;
+
+  // when there is no artwork
+  &.fallback {
+    color: darken($fg_color, 17%);
+    background-color: $bg_color;
+    border: 1px solid transparent;
+    border-radius: $base_border_radius;
+    icon-size: $base_icon_size * 2 !important;
+  }
+}
--- a/data/gnome-shell-sass/widgets/_misc.scss
+++ b/data/gnome-shell-sass/widgets/_misc.scss
@@ -0,0 +1,45 @@
+// Rubberband for select-area screenshots
+.select-area-rubberband {
+  background-color: transparentize($selected_bg_color,0.7);
+  border: 1px solid $selected_bg_color;
+}
+
+// User icon
+.user-icon {
+  background-size: contain;
+  color: $osd_fg_color;
+  border-radius: 99px;
+  &:hover {
+    color: lighten($osd_fg_color,30%);
+  }
+
+  & StIcon {
+    background-color: transparentize($osd_fg_color,0.95);
+    padding: 18px 20px 22px 20px;
+    width: 88px; height: 88px;
+    border-radius: 99px;
+  }
+}
+
+.user-widget.vertical .user-icon {
+  icon-size: 128px;
+}
+
+.user-widget.horizontal .user-icon {
+  icon-size: 64px;
+}
+
+.lightbox { background-color: black; }
+.flashspot { background-color: white; }
+
+
+// Hidden
+.hidden { color: rgba(0,0,0,0);}
+
+// Caps-lock warning
+.caps-lock-warning-label {
+  text-align: center;
+  padding-bottom: 8px;
+  @include fontsize($base_font_size - 1);
+  color: $warning_color;
+}
--- a/data/gnome-shell-sass/widgets/_network-dialog.scss
+++ b/data/gnome-shell-sass/widgets/_network-dialog.scss
@@ -0,0 +1,56 @@
+/* Network Dialogs */
+.nm-dialog {
+  max-height: 34em;
+  min-height: 31em;
+  min-width: 32em;
+}
+
+.nm-dialog-content {
+  spacing: 20px;
+  padding: 24px;
+}
+
+.nm-dialog-airplane-box { spacing: 12px; }
+
+.nm-dialog-airplane-headline {
+  font-weight: bold;
+  text-align: center;
+}
+
+.nm-dialog-airplane-text { color: $fg_color; }
+
+// header
+.nm-dialog-header {
+  font-weight: bold;
+}
+.nm-dialog-header-icon {
+  icon-size: $base_icon_size * 2;
+}
+.nm-dialog-header-hbox { spacing: 10px; }
+
+// list of networks
+.nm-dialog-scroll-view {
+  border: 1px solid $borders_color;
+  padding:0;
+  background-color: darken($bg_color, 3%);
+}
+
+// list item
+.nm-dialog-item {
+  @include fontsize($base_font_size);
+  border-bottom: 1px solid $borders_color;
+  padding: $base_padding * 2;
+  spacing: 0px;
+  &:selected {
+    background-color: $selected_bg_color;
+    color: $selected_fg_color;
+  }
+}
+
+// icons in list
+.nm-dialog-icon { icon-size: $base_icon_size; }
+.nm-dialog-icons { spacing: $base_spacing * 2; }
+
+// no networks
+.no-networks-label { color: $insensitive_fg_color; }
+.no-networks-box { spacing: $base_padding; }
--- a/data/gnome-shell-sass/widgets/_notifications.scss
+++ b/data/gnome-shell-sass/widgets/_notifications.scss
@@ -0,0 +1,57 @@
+/* Notifications & Mesage Tray */
+
+$notification_banner_height: 64px;
+$notification_banner_width: 34em;
+
+// Banner notifications
+.notification-banner {
+  min-height: $notification_banner_height;
+  width: $notification_banner_width;
+
+  .notification-actions {
+    spacing: 0;
+  }
+
+  .notification-button {
+    @extend %bubble_button;
+  }
+}
+
+// counter
+.summary-source-counter {
+  font-size: $base_font_size - 1pt;
+  font-weight: bold;
+  height: 1.6em;
+  width: 1.6em;
+  -shell-counter-overlap-x: 3px;
+  -shell-counter-overlap-y: 3px;
+  background-color: $selected_bg_color;
+  color: $selected_fg_color;
+  border: 2px solid $fg_color;
+  box-shadow: 0 2px 2px rgba(0,0,0,0.5);
+  border-radius: 0.9em; // should be 0.8 but whatever; wish I could do 50%;
+}
+
+// chat bubbles
+.chat-body { spacing: 5px; }
+.chat-response { margin: 5px; }
+.chat-log-message { color: darken($fg_color,10%); }
+.chat-new-group { padding-top: 1em; }
+.chat-received {
+  padding-left: 4px;
+  &:rtl { padding-left: 0px; padding-right: 4px; }
+}
+
+.chat-sent {
+  padding-left: 18pt;
+  color: lighten($fg_color, 15%);
+  &:rtl { padding-left: 0; padding-right: 18pt; }
+}
+
+.chat-meta-message {
+  padding-left: 4px;
+  @include fontsize($base_font_size - 2);
+  font-weight: bold;
+  color: lighten($fg_color,18%);
+  &:rtl { padding-left: 0; padding-right: 4px; }
+}
--- a/data/gnome-shell-sass/widgets/_osd.scss
+++ b/data/gnome-shell-sass/widgets/_osd.scss
@@ -0,0 +1,45 @@
+/* OSD */
+
+$osd_levelbar_height:8px;
+
+.osd-window {
+  @extend %osd_panel;
+  text-align: center;
+  font-weight: bold;
+  spacing: $base_spacing * 2; // 12px
+  margin: $base_margin * 8; // 32px
+  min-width: 64px;
+  min-height: 64px;
+
+  StIcon {
+    icon-size:$base_icon_size * 6;
+  }
+
+  .osd-monitor-label { font-size: 3em; }
+  
+  .level {
+    height: $osd_levelbar_height;
+    -barlevel-height: $osd_levelbar_height;
+    -barlevel-background-color: transparentize($osd_fg_color, if($variant=='light', 0.7, 0.9));
+    -barlevel-active-background-color: $osd_fg_color;
+    -barlevel-overdrive-color: $destructive_color;
+    -barlevel-overdrive-separator-width: 3px;
+  }
+}
+
+/* Pad OSD */
+.pad-osd-window {
+  padding: 32px;
+  background-color: transparentize(#000, 0.2);
+
+  .pad-osd-title-box { spacing: 12px; }
+  .pad-osd-title-menu-box { spacing: 6px; }
+}
+
+.combo-box-label {
+  width: 15em;
+}
+
+.resize-popup {
+  @extend %osd_panel;
+}
--- a/data/gnome-shell-sass/widgets/_overview.scss
+++ b/data/gnome-shell-sass/widgets/_overview.scss
@@ -0,0 +1,10 @@
+/* OVERVIEW */
+
+#overview {
+  spacing: 24px;
+  background-color: transparent;
+}
+
+.overview-controls {
+  padding-bottom: 32px;
+}
--- a/data/gnome-shell-sass/widgets/_panel.scss
+++ b/data/gnome-shell-sass/widgets/_panel.scss
@@ -0,0 +1,104 @@
+/* Top Bar */
+// a.k.a. the panel
+
+$panel_corner_radius: $base_border_radius+1;
+$panel_bg_color: #000;
+$panel_fg_color: #ccc;
+$panel_height: 1.86em;
+
+
+#panel {
+  background-color: $panel_bg_color;
+  font-weight: bold;
+  height: $panel_height;
+  font-feature-settings: "tnum";
+
+  // transparent panel on lock & login screens
+  &.unlock-screen,
+  &.login-screen {
+    background-color: transparent;
+
+    .panel-corner {
+      -panel-corner-radius: 0;
+      -panel-corner-background-color: transparent;
+      -panel-corner-border-color: transparent;
+    }
+  }
+
+  // spacing between activities, app menu and such
+  #panelLeft, #panelCenter {
+    spacing: $base_spacing;
+  }
+
+  // the rounded outset corners
+  .panel-corner {
+    -panel-corner-radius: $panel_corner_radius;
+    -panel-corner-background-color: $panel_bg_color;
+    -panel-corner-border-width: 2px;
+    -panel-corner-border-color: transparent;
+
+    &:active, &:overview, &:focus {
+      -panel-corner-border-color: lighten($selected_bg_color,5%);
+    }
+  }
+
+  // panel menus
+  .panel-button {
+    font-weight: bold;
+    color: $panel_fg_color;
+    -natural-hpadding: $base_padding * 2;
+    -minimum-hpadding: $base_padding;
+
+    &:hover {
+      color: lighten($panel_fg_color, 20%);
+    }
+
+    &:active, &:overview, &:focus, &:checked {
+      // Trick due to St limitations. It needs a background to draw a box-shadow
+      background-color: rgba(0, 0, 0, 0.01);
+      box-shadow: inset 0 -2px 0 0 lighten($selected_bg_color,5%);
+      color: lighten($panel_fg_color, 20%);
+    }
+
+    // status area icons
+    .system-status-icon {
+      icon-size: $base_icon_size;
+      padding: $base_padding - 1px;
+    }
+
+    // app menu icon
+    .app-menu-icon {
+      margin-left: $base_margin;
+      margin-right: $base_margin;
+      -st-icon-style: symbolic;
+      // dimensions of the icon are hardcoded
+    }
+
+    // lock & login screen styles
+    .unlock-screen &,
+    .login-screen & {
+      color: lighten($fg_color, 10%);
+      &:focus, &:hover, &:active { color: lighten($fg_color, 10%); }
+    }
+  }
+
+  .panel-status-indicators-box,
+  .panel-status-menu-box {
+    spacing: 2px;
+  }
+
+  // spacing between power icon and (optional) percentage label
+  .power-status.panel-status-indicators-box {
+    spacing: 0;
+  }
+
+  // indicator for active
+  .screencast-indicator,
+  .remote-access-indicator { color: $warning_color; }
+}
+
+// App Menu
+#appMenu {
+  spacing: $base_spacing;
+  .label-shadow { color: transparent; }
+}
--- a/data/gnome-shell-sass/widgets/_popovers.scss
+++ b/data/gnome-shell-sass/widgets/_popovers.scss
@@ -0,0 +1,129 @@
+/* Popovers/Menus */
+
+$popover_arrow_height: 12px;
+
+//.the popover itself
+.popup-menu-boxpointer {
+  -arrow-border-radius: $base_border_radius+4;
+  -arrow-background-color: $bg_color;
+  -arrow-border-width: 1px;
+  -arrow-border-color: $borders_color;
+  -arrow-base: $popover_arrow_height * 2;
+  -arrow-rise: $popover_arrow_height;
+  -arrow-box-shadow: 0 1px 3px rgba(0,0,0,0.5); // dreaming bugzilla #689995
+}
+
+// container of the popover menu
+.popup-menu {
+  min-width: 15em;
+  color: $fg_color;
+
+  //.popup-status-menu-item { font-weight: normal;  color: pink; } //dunno what that is
+  &.panel-menu {
+    -boxpointer-gap: $base_margin; // distance from the panel
+    margin-bottom: 1.75em;
+  }
+}
+
+.popup-menu-content {
+  padding: $base_padding * 2 + $base_margin 0;
+}
+
+// menu items
+.popup-menu-item {
+  spacing: $base_padding;
+  padding: $base_padding;
+
+  &:ltr { padding-right:1.75em; padding-left: 0; }
+  &:rtl { padding-right: 0; padding-left:1.75em; }
+
+  &:checked {
+    background-color: lighten($bg_color, 2%);
+    box-shadow: none;
+  }
+
+  &.selected {
+    background-color: transparentize(white, if($variant=='light', 0.2, 0.9));
+    color: $fg_color;
+  }
+
+  &:active { 
+    background-color: $selected_bg_color;
+    color: $selected_fg_color;
+  }
+
+  &:insensitive { color: transparentize($fg_color,0.5);}
+}
+
+// all icons and other graphical elements
+.popup-inactive-menu-item {
+  color: $fg_color;
+
+  &:insensitive { color: transparentize($fg_color,0.5); }
+}
+
+// symbolic icons in popover
+.popup-menu-arrow,
+.popup-menu-icon { icon-size: $base_icon_size; }
+
+// popover submenus
+.popup-sub-menu {
+  background-color: darken($bg_color, 3%);
+  box-shadow: none;
+  border-top: 1px solid transparentize($borders_color, 0.2);
+  border-bottom: 1px solid transparentize($borders_color, 0.2);
+}
+
+// container for radio and check boxes
+.popup-menu-ornament {
+  text-align: right;
+  width: 1.2em;
+}
+
+// separator
+.popup-separator-menu-item {
+  padding: 0;
+
+  .popup-separator-menu-item-separator {
+    //-margin-horizontal: 24px;
+    height: 1px; //not really the whole box
+    margin: 6px 64px;
+    background-color: lighten($borders_color, 2%);
+    .popup-sub-menu & { //submenu separators
+      margin: 0 64px 0 32px;
+      @if $variant == 'dark' {
+        background-color: lighten($bg_color,10%);
+      }
+    }
+  }
+}
+
+// desktop background menu
+.background-menu {
+  -boxpointer-gap: $base_margin;
+  -arrow-rise: 0px; // hide the beak on the menu
+}
+
+// system status menu
+.aggregate-menu {
+  min-width: 21em;
+
+  // lock screen, shutdown, etc. buttons
+  .popup-menu-icon { 
+    padding:0;
+    margin: 0 $base_margin;
+    -st-icon-style: symbolic;
+  }
+
+  .popup-sub-menu .popup-menu-item > :first-child {
+    // account for icons in submenus with padding
+    &:ltr {
+      padding-left: $base_padding + $base_margin * 2; 
+      margin-left: $base_icon_size;
+    }
+    &:rtl {
+      padding-right: $base_padding + $base_margin * 2; ;
+      margin-right: $base_icon_size;
+    }
+  }
+}
--- a/data/gnome-shell-sass/widgets/_screen-shield.scss
+++ b/data/gnome-shell-sass/widgets/_screen-shield.scss
@@ -0,0 +1,78 @@
+/* Screen Shield */
+
+.unlock-dialog-clock {
+  color: white;
+  font-weight: 300;
+  text-align: center;
+  spacing: 24px;
+  padding-bottom: 2.5em;
+}
+
+.unlock-dialog-clock-time {
+  font-size: 64pt;
+  padding-top: 42px;
+  font-feature-settings: "tnum";
+}
+
+.unlock-dialog-clock-date {
+  font-size: 16pt;
+  font-weight: normal;
+}
+
+.unlock-dialog-clock-hint {
+  font-weight: normal;
+  padding-top: 48px;
+}
+
+.unlock-dialog-notifications-container {
+  margin: 12px 0;
+  spacing: 6px;
+  width: 23em;
+  background-color: transparent;
+  .summary-notification-stack-scrollview {
+    padding-top: 0;
+    padding-bottom: 0;
+  }
+
+  .notification,
+  .unlock-dialog-notification-source {
+    padding: 12px 6px;
+    border: none;
+    background-color: transparentize($osd_bg_color,0.7);
+    color: $osd_fg_color;
+    border-radius: $modal_radius;
+
+    &.critical { background-color: transparentize($osd_bg_color,0.1) }
+  }
+}
+
+.unlock-dialog-notification-label {
+  padding: 0px 0px 0px 12px;
+}
+
+.unlock-dialog-notification-count-text {
+  weight: bold;
+  padding: 0 6px;
+  color: $osd_bg_color;
+  background-color: transparentize($osd_fg_color, 0.7);
+  border-radius: 99px;
+  margin-right: 12px;
+
+}
+
+.screen-shield-background { //just the shadow, really
+  background: black;
+  box-shadow: 0px 2px 4px rgba(0,0,0,0.6);
+}
+
+#lockDialogGroup {
+  background-color: lighten(#2e3436, 8%);
+}
+
+#unlockDialogNotifications {
+  StButton#vhandle, StButton#hhandle {
+    background-color: transparentize($bg_color,0.7);
+    &:hover, &:focus { background-color: transparentize($bg_color,0.5); }
+    &:active { background-color: transparentize($selected_bg_color,0.5); }
+  }
+}
--- a/data/gnome-shell-sass/widgets/_scrollbars.scss
+++ b/data/gnome-shell-sass/widgets/_scrollbars.scss
@@ -0,0 +1,29 @@
+/* Scrollbars */
+
+StScrollView {
+  &.vfade { -st-vfade-offset: 68px; }
+  &.hfade { -st-hfade-offset: 68px; }
+}
+
+StScrollBar {
+  padding: 0;
+
+  StScrollView & {
+    min-width: 14px;
+    min-height: 14px;
+  }
+
+  StBin#trough {
+    border-radius: 0;
+    background-color: transparent;
+  }
+
+  StButton#vhandle, StButton#hhandle {
+    border-radius: 8px;
+    background-color: mix($fg_color, $bg_color, 60%);
+    //border: 3px solid transparent; //would be nice to margin or at least to transparent
+    margin: 3px;
+    &:hover { background-color: mix($fg_color, $bg_color, 80%); }
+    &:active { background-color: $selected_bg_color; }
+  }
+}
--- a/data/gnome-shell-sass/widgets/_search-entry.scss
+++ b/data/gnome-shell-sass/widgets/_search-entry.scss
@@ -0,0 +1,35 @@
+// Search entry
+
+$search_entry_width: 320px;
+$search_entry_height: 36px;
+
+%search_entry,
+.search-entry {
+  width: $search_entry_width;
+  padding: $base_padding+1 $base_padding+3;
+  border-radius: $search_entry_height * 0.5; // half the height
+  color: transparentize($fg_color,0.3);
+  background-color: $bg_color;
+  border-color: $borders_color;
+
+  &:hover {
+    background-color: $hover_bg_color;
+    border-color: $hover_borders_color;
+    color: $hover_fg_color;
+  }
+
+  &:focus {
+    padding: $base_padding $base_padding+2; // 1px less to account for wider border
+    border-width: 2px;
+    border-style: solid;
+    border-color: $selected_bg_color;
+    color: $fg_color;
+    box-shadow: inset 0 1px 2px 1px rgba(0,0,0,0.2);
+  }
+
+  .search-entry-icon { 
+    icon-size: $base_icon_size;
+    padding: 0 4px;
+    color: inherit;
+  }
+}
--- a/data/gnome-shell-sass/widgets/_search-results.scss
+++ b/data/gnome-shell-sass/widgets/_search-results.scss
@@ -0,0 +1,104 @@
+/* Search */
+
+// search overview container
+#searchResultsContent {
+  max-width: 1024px;
+  spacing: $base_margin * 2;
+}
+
+// search results sections "the boxes"
+.search-section {
+  // This should be equal to #searchResultsContent spacing
+  spacing: $base_margin * 2;
+
+  // separator
+  .search-section-separator { 
+    // height: 1px;
+    // background-color: $osd_outer_borders_color;
+    height: 0;
+    background-color: transparent;
+  }
+}
+
+// content
+.search-section-content {
+  background-color: transparentize(lighten($osd_bg_color, 5%), 0.2);
+  border-radius: $modal_radius+3;
+  border: 1px solid $osd_outer_borders_color;
+  box-shadow: 0 2px 4px 0 $shadow_color;
+  text-shadow: 0 1px if($variant == 'light', rgba(255,255,255,0.2), rgba(0,0,0,0.2));
+  color: $osd_fg_color;
+  padding: $base_padding * 3;
+  // This is the space between the provider icon and the results container
+  spacing: $base_margin * 2;
+}
+
+%search-section-content-item {
+  @extend %icon_tile;
+
+  &:focus,
+  &:hover,
+  &:selected {
+    background-color: transparentize($osd_fg_color, .9);
+    transition-duration: 200ms;
+  }
+
+  &:active,
+  &:checked {
+    background-color: transparentize(darken($osd_bg_color, 10%), .1);
+  }
+}
+
+// "no results" text
+.search-statustext {
+  @extend %status_text;
+}
+
+// Search results with icons
+.grid-search-result {
+  @extend %app-well-app;
+}
+
+// search result provider
+.search-provider-icon {
+  @extend %search-section-content-item;
+
+  // content
+  .list-search-provider-content {
+    spacing: $base_spacing * 2;
+
+    // provider labels
+    .list-search-provider-details {
+      width: 120px;
+      margin-top: 0;
+      color: darken($osd_fg_color, 8%);
+      // font-weight: bold;
+    }
+  }
+}
+
+// search results list
+.list-search-results {
+  spacing: $base_spacing;
+}
+
+// search result listitem
+.list-search-result {
+  @extend %search-section-content-item;
+
+  // content
+  .list-search-result-content {
+    spacing: $base_padding;
+  }
+
+  // list item title (with leading icon)
+  .list-search-result-title {
+    spacing: $base_spacing * 2;
+    // font-weight: bold;
+  }
+
+  // list item description
+  .list-search-result-description {
+    color: darken($osd_fg_color, 30%);
+  }
+}
--- a/data/gnome-shell-sass/widgets/_slider.scss
+++ b/data/gnome-shell-sass/widgets/_slider.scss
@@ -0,0 +1,27 @@
+/* Slider */
+
+$slider_size: 15px;
+
+.slider {
+  height: $slider_size;
+  // slider trough
+  -barlevel-height: 3px; // has to be an odd number
+  -barlevel-background-color: $borders_color; //background of the trough
+  -barlevel-border-width: 1px; 
+  -barlevel-border-color: $borders_color; // trough border color
+  // fill style
+  -barlevel-active-background-color: $selected_bg_color; //active trough fill
+  -barlevel-active-border-color: if($variant == 'light', darken($selected_bg_color, 4%), lighten($selected_bg_color, 2%)); //active trough border
+  // overfill style (red in this case)
+  -barlevel-overdrive-color: $destructive_color;
+  -barlevel-overdrive-border-color: if($variant == 'light', darken($destructive_color, 4%), lighten($destructive_color, 2%)); //trough border when red;
+  -barlevel-overdrive-separator-width:1px;
+  // slider hander
+  -slider-handle-radius: $slider_size * 0.5; // half the size of the size
+  -slider-handle-border-width: 1px;
+  -slider-handle-border-color: if($variant == 'light', $borders_color, $fg_color);
+
+  color: if($variant == 'light', lighten($bg_color, 10%), $fg_color);
+  &:hover { color: $hover_bg_color; }
+  &:active { color: $active_bg_color; }
+}
--- a/data/gnome-shell-sass/widgets/_switcher-popup.scss
+++ b/data/gnome-shell-sass/widgets/_switcher-popup.scss
@@ -0,0 +1,67 @@
+/* App Switcher */
+
+.switcher-popup {
+  padding: 8px;
+  spacing: $base_spacing * 4;
+}
+
+// switcher onscreen panel
+.switcher-list {
+  @extend %osd_panel;
+
+  .item-box {
+    padding: 8px;
+    border-radius: $base_border_radius + 1px;
+    border: 1px solid transparent;
+
+    &:outlined {
+      border: 1px solid darken($borders_color,5%);
+      background-color: transparentize($osd_fg_color, 0.9);
+      box-shadow: inset 0 2px 2px 0 rgba(0,0,0,0.4);
+    }
+
+    &:selected {
+      background-color: transparentize($osd_fg_color, 0.9);
+      color: $osd_fg_color;
+    }
+  }
+
+  // window thumbnails
+  .thumbnail-box {
+    padding: 2px;
+    spacing: $base_spacing;
+  }
+
+  .thumbnail {
+    width: 256px;
+  }
+
+  .separator {
+    width: 1px;
+    background: $borders_color;
+  }
+
+  .switcher-list-item-container {
+    spacing: $base_spacing * 2;
+  }
+}
+
+.switcher-arrow {
+  border-color: rgba(0,0,0,0);
+  color: transparentize($fg_color,0.2);
+  &:highlighted {
+    color: $fg_color;
+  }
+}
+
+// Input Source Switcher
+.input-source-switcher-symbol {
+  font-size: 34pt;
+  width: 96px;
+  height: 96px;
+}
+
+// Window cycler highlight
+.cycler-highlight {
+  border: 5px solid $selected_bg_color;
+}
--- a/data/gnome-shell-sass/widgets/_switches.scss
+++ b/data/gnome-shell-sass/widgets/_switches.scss
@@ -0,0 +1,16 @@
+/* Switches */
+
+// these are equal to the size of the SVG assets
+$switch_height: 22px;
+$switch_width: 46px;
+
+.toggle-switch {
+  color: $fg_color;
+  height: $switch_height;
+  width: $switch_width;
+  background-size: contain;
+  background-image: if($variant == 'light', url("resource:///org/gnome/shell/theme/toggle-off.svg"),url("resource:///org/gnome/shell/theme/toggle-off-dark.svg"));
+  &:checked { 
+    background-image: if($variant == 'light', url("resource:///org/gnome/shell/theme/toggle-on.svg"),url("resource:///org/gnome/shell/theme/toggle-on-dark.svg"));
+  }
+}
--- a/data/gnome-shell-sass/widgets/_tiled-previews.scss
+++ b/data/gnome-shell-sass/widgets/_tiled-previews.scss
@@ -0,0 +1,19 @@
+
+/* Tiled window previews */
+$tile_corner_radius: $base_border_radius + 1px;
+.tile-preview {
+  background-color: transparentize($selected_bg_color,0.5);
+  border: 1px solid $selected_bg_color;
+}
+
+.tile-preview-left.on-primary {
+  border-radius: $tile_corner_radius 0 0 0;
+}
+
+.tile-preview-right.on-primary {
+  border-radius: 0 $tile_corner_radius 0 0;
+}
+
+.tile-preview-left.tile-preview-right.on-primary {
+  border-radius: $tile_corner_radius $tile_corner_radius 0 0;
+}
--- a/data/gnome-shell-sass/widgets/_window-picker.scss
+++ b/data/gnome-shell-sass/widgets/_window-picker.scss
@@ -0,0 +1,66 @@
+/* Window Picker */
+
+$window_picker_spacing: $base_spacing * 2; // 16px
+$window_picker_padding: $base_padding * 2; // 16px
+
+$window_thumbnail_border_color:transparentize($selected_fg_color, 0.65);
+
+$window_close_button_size: 24px;
+$window_close_button_padding: 3px;
+
+
+// Window picker
+.window-picker {
+  // Space between window thumbnails
+  -horizontal-spacing: $window_picker_spacing;
+  -vertical-spacing: $window_picker_spacing;
+  // Padding for container around window thumbnails
+  padding: $window_picker_padding;
+
+  &.external-monitor { padding: $window_picker_padding; }
+}
+
+// Borders on window thumbnails
+.window-clone-border {
+  border-width: 6px;
+  border-style: solid;
+  border-color: $window_thumbnail_border_color;
+  border-radius: $base_border_radius + 2;
+  // For window decorations with round corners we can't match
+  // the exact shape when the window is scaled. So apply a shadow
+  // to fix that case
+  box-shadow: inset 0 0 0 1px transparentize($borders_color, 0.8);
+}
+
+// Window titles
+.window-caption {
+  color: $osd_fg_color;
+  background-color: $osd_bg_color;
+  border:1px solid $osd_outer_borders_color;
+  border-radius: $base_border_radius + 1;
+  padding: $base_padding $base_padding * 2;
+  font-weight: bold;
+  @include fontsize($base_font_size + 1);
+}
+
+// Close button
+.window-close {
+  background-color: $selected_bg_color;
+  color: $selected_fg_color;
+  border: none;
+  border-radius: $window_close_button_size * 0.5 + $window_close_button_padding * 2;
+  padding: $window_close_button_padding;
+  height: $window_close_button_size;
+  width: $window_close_button_size;
+  box-shadow: -1px 1px 5px 0px rgba(0,0,0,0.5);
+
+  -shell-close-overlap: $window_close_button_size * 0.5;
+
+  &:hover {
+    background-color: lighten($selected_bg_color, 5%);
+  }
+
+  &:active {
+    background-color: darken($selected_bg_color, 5%);
+  }
+}
--- a/data/gnome-shell-sass/widgets/_workspace-switcher.scss
+++ b/data/gnome-shell-sass/widgets/_workspace-switcher.scss
@@ -0,0 +1,36 @@
+/* Workspace Switcher */
+.workspace-switcher-group {
+  padding: $base_padding * 2;
+}
+
+.workspace-switcher-container {
+  @extend %osd_panel;
+}
+
+.workspace-switcher {
+  background: transparent;
+  border: none;
+  border-radius: 0;
+  padding: 0;
+  spacing: $base_spacing * 2;
+}
+
+.ws-switcher-box {
+  // background: transparent;
+  background: transparent;
+  height: 50px;
+  background-size: 32px;
+  border: 1px solid transparentize($osd_fg_color,0.9);
+  border-radius: $base_border_radius + 3px;
+}
+
+// active workspace in the switcher
+.ws-switcher-active-up,
+.ws-switcher-active-down,
+.ws-switcher-active-left,
+.ws-switcher-active-right {
+  background-color: $selected_bg_color;
+  border: 1px solid if($variant=='light', darken($selected_bg_color, 8%), lighten($selected_bg_color, 5%));
+  border-radius: $base_border_radius + 3px;
+  color: $selected_fg_color;
+}
--- a/data/gnome-shell-sass/widgets/_workspace-thumbnails.scss
+++ b/data/gnome-shell-sass/widgets/_workspace-thumbnails.scss
@@ -0,0 +1,32 @@
+/* Workspace pager */
+
+// thumbnails in overview
+.workspace-thumbnails {
+  @extend %overview_panel;
+  visible-width: 32px; //amount visible before hover
+  spacing: $base_spacing;
+  padding: $base_padding;
+
+  border-radius: $modal_radius 0 0 $modal_radius;
+  border-right-width: 0;
+
+  &:rtl {
+    border-radius: 0 $modal_radius $modal_radius 0;
+    border-left-width: 0;
+  }
+
+  // drag and drop indicator
+  .placeholder {
+    background-image: url("resource:///org/gnome/shell/theme/dash-placeholder.svg");
+    background-size: contain;
+    height: 24px;
+  }
+}
+
+// selected indicator
+.workspace-thumbnail-indicator {
+  border: 3px solid $selected_bg_color;
+  border-radius: 3px;
+  padding: 0px;
+  // background-color: transparentize($selected_bg_color, 0.9);
+}
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,12 +1,18 @@
-session_desktop = 'gnome-classic.desktop'
-i18n.merge_file('',
-  input:  session_desktop + '.in',
-  output: session_desktop,
-  po_dir: '../po',
-  install: true,
-  install_dir: xsessiondir,
-  type: 'desktop'
-)
+sessions = [
+  ['gnome-classic.session.desktop.in', sessiondir],
+  ['gnome-classic.desktop.in', xsessiondir]
+]
+foreach s : sessions
+  name_array = s[0].split('.')
+  i18n.merge_file('',
+    input:  s[0],
+    output: '.'.join([name_array[0], name_array[1]]),
+    po_dir: '../po',
+    install: true,
+    install_dir: s[1],
+    type: 'desktop'
+  )
+endforeach

 classic_uuids = []
 foreach e : classic_extensions
@@ -28,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 = [
@@ -76,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/export-zips.sh
+++ b/export-zips.sh
@@ -21,23 +21,16 @@ for f in $extensiondir/*; do
  uuid=$name@gnome-shell-extensions.gcampax.github.com
  schema=$schemadir/org.gnome.shell.extensions.$name.gschema.xml

-  xgettext --from-code=UTF-8 --output-dir=$builddir --output=$name.pot $f/*.js
+  cp $srcdir/NEWS $srcdir/COPYING $f
+  cp -r $localedir $f

-  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
@@ -363,13 +363,17 @@ 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,
        });
+        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;

--- a/extensions/auto-move-windows/extension.js
+++ b/extensions/auto-move-windows/extension.js
@@ -35,16 +35,17 @@ 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 && !this._appData.has(app)
+        );
        addedApps.forEach(app => {
            let data = {
                windowsChangedId: app.connect('windows-changed',
@@ -72,7 +73,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 +94,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 => {
@@ -116,12 +117,10 @@ 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
--- a/extensions/auto-move-windows/prefs.js
+++ b/extensions/auto-move-windows/prefs.js
@@ -2,10 +2,11 @@
 // Start apps on custom workspaces
 /* exported init buildPrefsWidget */

-const { 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;

@@ -13,263 +14,269 @@ const SETTINGS_KEY = 'application-list';

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

-const AutoMoveSettingsWidget = GObject.registerClass(
-class AutoMoveSettingsWidget extends Gtk.ScrolledWindow {
-    _init() {
-        super._init({
-            hscrollbar_policy: Gtk.PolicyType.NEVER,
-        });
+const Columns = {
+    APPINFO: 0,
+    DISPLAY_NAME: 1,
+    ICON: 2,
+    WORKSPACE: 3,
+    ADJUSTMENT: 4,
+};

-        const box = new Gtk.Box({
-            orientation: Gtk.Orientation.VERTICAL,
-            halign: Gtk.Align.CENTER,
-            spacing: 12,
-            margin_top: 36,
-            margin_bottom: 36,
-            margin_start: 36,
-            margin_end: 36,
-        });
-        this.set_child(box);
-
-        box.append(new Gtk.Label({
-            label: '<b>%s</b>'.format(_('Workspace Rules')),
-            use_markup: true,
-            halign: Gtk.Align.START,
-        }));
-
-        this._list = new Gtk.ListBox({
-            selection_mode: Gtk.SelectionMode.NONE,
-            valign: Gtk.Align.START,
-            show_separators: true,
-        });
-        box.append(this._list);
-
-        const context = this._list.get_style_context();
-        const cssProvider = new Gtk.CssProvider();
-        cssProvider.load_from_data(
-            'list { min-width: 30em; }');
-
-        context.add_provider(cssProvider,
-            Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
-        context.add_class('frame');
-
-        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(
+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,
+        ]);

-    _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`,
-                ]);
-            }
-            dialog.destroy();
-        });
-        dialog.show();
-    }
+        let scrolled = new Gtk.ScrolledWindow({ shadow_type: Gtk.ShadowType.IN });
+        scrolled.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
+        this.add(scrolled);

-    _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;
-            }));
-    }

-    _getRuleRows() {
-        return [...this._list].filter(row => !!row.id);
-    }
-
-    _sync() {
-        const oldRules = this._getRuleRows();
-        const newRules = this._settings.get_strv(SETTINGS_KEY).map(entry => {
-            const [id, value] = entry.split(':');
-            return { id, value };
-        });
-
-        this._settings.block_signal_handler(this._changedId);
-        this._updateAction.enabled = false;
-
-        newRules.forEach(({ id, value }, index) => {
-            const row = oldRules.find(r => r.id === id);
-            const appInfo = row
-                ? null : Gio.DesktopAppInfo.new(id);
-
-            if (row)
-                row.set({ value });
-            else if (appInfo)
-                this._list.insert(new RuleRow(appInfo, value), index);
-        });
-
-        const removed = oldRules.filter(
-            ({ id }) => !newRules.find(r => r.id === id));
-        removed.forEach(r => this._list.remove(r));
-
-        this._settings.unblock_signal_handler(this._changedId);
-        this._updateAction.enabled = true;
-    }
-});
-
-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 Gtk.ListBoxRow {
-    _init(appInfo, value) {
-        const box = new Gtk.Box({
-            spacing: 6,
-            margin_top: 6,
-            margin_bottom: 6,
-            margin_start: 6,
-            margin_end: 6,
-        });
-
-        super._init({
-            activatable: false,
-            value,
-            child: box,
-        });
-        this._appInfo = appInfo;
-
-        const icon = new Gtk.Image({
-            gicon: appInfo.get_icon(),
-            pixel_size: 32,
-        });
-        icon.get_style_context().add_class('icon-dropshadow');
-        box.append(icon);
-
-        const label = new Gtk.Label({
-            label: appInfo.get_display_name(),
-            halign: Gtk.Align.START,
+        this._treeView = new Gtk.TreeView({
+            model: this._store,
            hexpand: true,
-            max_width_chars: 20,
-            ellipsize: Pango.EllipsizeMode.END,
+            vexpand: true,
        });
-        box.append(label);
+        this._treeView.get_selection().set_mode(Gtk.SelectionMode.SINGLE);

-        const spinButton = new Gtk.SpinButton({
-            adjustment: new Gtk.Adjustment({
-                lower: 1,
-                upper: WORKSPACE_MAX,
-                step_increment: 1,
-            }),
-            snap_to_ticks: true,
-            margin_end: 6,
+        let appColumn = new Gtk.TreeViewColumn({
+            expand: true,
+            sort_column_id: Columns.DISPLAY_NAME,
+            title: _('Application'),
        });
-        this.bind_property('value',
-            spinButton, 'value',
-            GObject.BindingFlags.SYNC_CREATE | GObject.BindingFlags.BIDIRECTIONAL);
-        box.append(spinButton);
+        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);

-        const button = new Gtk.Button({
-            action_name: 'rules.remove',
-            action_target: new GLib.Variant('s', this.id),
-            icon_name: 'edit-delete-symbolic',
+        let workspaceColumn = new Gtk.TreeViewColumn({
+            title: _('Workspace'),
+            sort_column_id: Columns.WORKSPACE,
        });
-        box.append(button);
+        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);

-        this.connect('notify::value',
-            () => this.activate_action('rules.update', null));
+        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();
    }

-    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,
+    _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);

-        this._settings = ExtensionUtils.getSettings();
-
-        this.get_widget().set({
-            show_all: true,
-            show_other: true, // hide more button
+        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());

-        this.get_widget().connect('application-selected',
-            this._updateSensitivity.bind(this));
-        this._updateSensitivity();
+        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,
+            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', (dlg, id) => {
+            if (id !== Gtk.ResponseType.OK) {
+                dialog.destroy();
+                return;
+            }
+
+            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_all();
    }

-    _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())));
+    _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);
+        }
+    }
+
+    _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;
+    }
+
+    _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]);
+    }
+
+    _checkId(id) {
+        let items = this._settings.get_strv(SETTINGS_KEY);
+        return !items.some(i => i.startsWith(`${id}:`));
+    }
+
+    _appendItem(id, workspace) {
+        let currentItems = this._settings.get_strv(SETTINGS_KEY);
+        currentItems.push(`${id}:${workspace}`);
+        this._settings.set_strv(SETTINGS_KEY, currentItems);
+    }
+
+    _removeItem(id) {
+        let currentItems = this._settings.get_strv(SETTINGS_KEY);
+        let index = currentItems.map(el => el.split(':')[0]).indexOf(id);
+
+        if (index < 0)
+            return;
+        currentItems.splice(index, 1);
+        this._settings.set_strv(SETTINGS_KEY, currentItems);
+    }
+
+    _changeItem(id, workspace) {
+        let currentItems = this._settings.get_strv(SETTINGS_KEY);
+        let index = currentItems.map(el => el.split(':')[0]).indexOf(id);
+
+        if (index < 0)
+            currentItems.push(`${id}:${workspace}`);
+        else
+            currentItems[index] = `${id}:${workspace}`;
+        this._settings.set_strv(SETTINGS_KEY, currentItems);
    }
 });

+
 function init() {
    ExtensionUtils.initTranslations();
 }

 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,6 +1,6 @@
 /* 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;
@@ -14,15 +14,9 @@ const ShellMountOperation = imports.ui.shellMountOperation;
 var MountMenuItem = GObject.registerClass(
 class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
    _init(mount) {
-        super._init({
-            style_class: 'drive-menu-item',
-        });
+        super._init();

-        this.label = new St.Label({
-            text: mount.get_name(),
-            x_expand: true,
-            y_align: Clutter.ActorAlign.CENTER,
-        });
+        this.label = new St.Label({ text: mount.get_name() });
        this.add_child(this.label);
        this.label_actor = this.label;

@@ -34,10 +28,7 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
            icon_name: 'media-eject-symbolic',
            style_class: 'popup-menu-icon',
        });
-        let ejectButton = new St.Button({
-            child: ejectIcon,
-            style_class: 'button',
-        });
+        let ejectButton = new St.Button({ child: ejectIcon });
        ejectButton.connect('clicked', this._eject.bind(this));
        this.add(ejectButton);

@@ -127,12 +118,15 @@ 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',
        });

-        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) => {
--- 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/horizontal-workspaces/extension.js
+++ b/extensions/horizontal-workspaces/extension.js
@@ -0,0 +1,38 @@
+/* exported init */
+const { Meta } = imports.gi;
+
+const { ThumbnailsBox } = imports.ui.workspaceThumbnail;
+
+class Extension {
+    constructor() {
+        this._origUpdateSwitcherVisibility =
+            ThumbnailsBox.prototype._updateSwitcherVisibility;
+    }
+
+    enable() {
+        global.workspace_manager.override_workspace_layout(
+            Meta.DisplayCorner.TOPLEFT,
+            false,
+            1,
+            -1);
+
+        ThumbnailsBox.prototype._updateSwitcherVisibility = function () {
+            this.hide();
+        };
+    }
+
+    disable() {
+        global.workspace_manager.override_workspace_layout(
+            Meta.DisplayCorner.TOPLEFT,
+            false,
+            -1,
+            1);
+
+        ThumbnailsBox.prototype._updateSwitcherVisibility =
+            this._origUpdateSwitcherVisibility;
+    }
+}
+
+function init() {
+    return new Extension();
+}
--- a/extensions/horizontal-workspaces/meson.build
+++ b/extensions/horizontal-workspaces/meson.build
@@ -0,0 +1,5 @@
+extension_data += configure_file(
+  input: metadata_name + '.in',
+  output: metadata_name,
+  configuration: metadata_conf
+)
--- a/extensions/horizontal-workspaces/metadata.json.in
+++ b/extensions/horizontal-workspaces/metadata.json.in
@@ -0,0 +1,10 @@
+{
+"extension-id": "@extension_id@",
+"uuid": "@uuid@",
+"settings-schema": "@gschemaname@",
+"gettext-domain": "@gettext_domain@",
+"name": "Horizontal workspaces",
+"description": "Use a horizontal workspace layout",
+"shell-version": [ "@shell_current@" ],
+"url": "@url@"
+}
--- a/extensions/horizontal-workspaces/stylesheet.css
+++ b/extensions/horizontal-workspaces/stylesheet.css
@@ -0,0 +1 @@
+/* This extensions requires no special styling */
--- 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,9 +1,6 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
 /* exported enable disable */
-const { Clutter } = imports.gi;
-
 const ExtensionUtils = imports.misc.extensionUtils;
-const { WindowPreview } = imports.ui.windowPreview;
 const Workspace = imports.ui.workspace;

 // testing settings for natural window placement strategy:
@@ -103,6 +100,7 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
            direction++;
            if (direction === 4)
                direction = 0;
+
        }

        let loopCounter = 0;
@@ -223,10 +221,8 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
        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;
@@ -245,24 +241,24 @@ function enable() {

    let settings = ExtensionUtils.getSettings();

-    workspaceInjections['_createBestLayout'] = Workspace.WorkspaceLayout.prototype._createBestLayout;
-    Workspace.WorkspaceLayout.prototype._createBestLayout = function (area) {
+    workspaceInjections['_getBestLayout'] = Workspace.Workspace.prototype._getBestLayout;
+    Workspace.Workspace.prototype._getBestLayout = function (windows) {
        let strategy = new NaturalLayoutStrategy(settings);
-        let layout = { area, strategy };
-        strategy.computeLayout(this._sortedWindows, layout);
+        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 (metaWindow, workspace) {
-        winInjections['_init'].call(this, metaWindow, workspace);
+    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;
+        }

-        const constraint = this._title.get_constraints().find(
-            c => c.align_axis && c.align_axis === Clutter.AlignAxis.Y_AXIS);
-        constraint.factor = settings.get_boolean('window-captions-on-top')
-            ? 0 : 1;
+        winInjections['relayout'].call(this, animate);
    };
 }

@@ -277,9 +273,9 @@ 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/places-menu/extension.js
+++ b/extensions/places-menu/extension.js
@@ -20,9 +20,7 @@ const PLACE_ICON_SIZE = 16;
 var PlaceMenuItem = GObject.registerClass(
 class PlaceMenuItem extends PopupMenu.PopupBaseMenuItem {
    _init(info) {
-        super._init({
-            style_class: 'place-menu-item',
-        });
+        super._init();
        this._info = info;

        this._icon = new St.Icon({
@@ -31,11 +29,7 @@ class PlaceMenuItem extends PopupMenu.PopupBaseMenuItem {
        });
        this.add_child(this._icon);

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

        if (info.isRemovable()) {
@@ -43,10 +37,7 @@ class PlaceMenuItem extends PopupMenu.PopupBaseMenuItem {
                icon_name: 'media-eject-symbolic',
                style_class: 'popup-menu-icon',
            });
-            this._ejectButton = new St.Button({
-                child: this._ejectIcon,
-                style_class: 'button',
-            });
+            this._ejectButton = new St.Button({ child: this._ejectIcon });
            this._ejectButton.connect('clicked', info.eject.bind(info));
            this.add_child(this._ejectButton);
        }
@@ -88,12 +79,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,
        });
-        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();

--- a/extensions/places-menu/placeDisplay.js
+++ b/extensions/places-menu/placeDisplay.js
@@ -194,7 +194,7 @@ class PlaceDeviceInfo extends PlaceInfo {
    }

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

    eject() {
@@ -486,6 +486,7 @@ var PlacesManager = class {
    }

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

        let content = Shell.get_file_contents_utf8_sync(this._bookmarksFile.get_path());
--- 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/user-theme/extension.js
+++ b/extensions/user-theme/extension.js
@@ -2,14 +2,11 @@
 // Load shell theme from ~/.local/share/themes/name/gnome-shell
 /* exported init */

-const { Gio } = imports.gi;
+const { Gio, GLib } = imports.gi;

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

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

 class ThemeManager {
@@ -37,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);
--- 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,182 +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 { Gio, GLib, GObject, Gtk } = imports.gi;
-
-const ExtensionUtils = imports.misc.extensionUtils;
-
-const Me = ExtensionUtils.getCurrentExtension();
-const Util = Me.imports.util;
-
-Gio._promisify(Gio._LocalFilePrototype,
-    'enumerate_children_async', 'enumerate_children_finish');
-Gio._promisify(Gio._LocalFilePrototype,
-    'query_info_async', 'query_info_finish');
-Gio._promisify(Gio.FileEnumerator.prototype,
-    'next_files_async', 'next_files_finish');
-
-const UserThemePrefsWidget = GObject.registerClass(
-class UserThemePrefsWidget extends Gtk.ScrolledWindow {
-    _init() {
-        super._init({
-            hscrollbar_policy: Gtk.PolicyType.NEVER,
-        });
-
-        const box = new Gtk.Box();
-        this.set_child(box);
-
-        this._list = new Gtk.ListBox({
-            selection_mode: Gtk.SelectionMode.NONE,
-            show_separators: true,
-            halign: Gtk.Align.CENTER,
-            valign: Gtk.Align.START,
-            hexpand: true,
-            margin_start: 60,
-            margin_end: 60,
-            margin_top: 60,
-            margin_bottom: 60,
-        });
-        this._list.get_style_context().add_class('frame');
-        box.append(this._list);
-
-        this._actionGroup = new Gio.SimpleActionGroup();
-        this._list.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._settings);
-        this._rows.set(name, row);
-
-        this._list.append(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 Gtk.ListBoxRow {
-    _init(name, settings) {
-        this._name = name;
-        this._settings = settings;
-
-        const box = new Gtk.Box({
-            spacing: 12,
-            margin_start: 12,
-            margin_end: 12,
-            margin_top: 12,
-            margin_bottom: 12,
-        });
-        super._init({
-            action_name: 'theme.name',
-            action_target: new GLib.Variant('s', name),
-            child: box,
-        });
-
-        box.append(new Gtk.Label({
-            label: name || 'Default',
-            hexpand: true,
-            xalign: 0,
-            max_width_chars: 25,
-            width_chars: 25,
-        }));
-
-        this._checkmark = new Gtk.Image({
-            icon_name: 'emblem-ok-symbolic',
-            pixel_size: 16,
-        });
-        box.append(this._checkmark);
-
-        const id = this._settings.connect('changed::name',
-            this._syncCheckmark.bind(this));
-        this._syncCheckmark();
-
-        this.connect('destroy', () => {
-            this._settings.disconnect(id);
-            this._settings = null;
-        });
-    }
-
-    _syncCheckmark() {
-        const visible = this._name === this._settings.get_string('name');
-        this._checkmark.opacity = visible ? 1. : 0;
-    }
-});
-
-function init() {
-}
-
-function buildPrefsWidget() {
-    return new UserThemePrefsWidget();
-}
--- a/extensions/user-theme/util.js
+++ b/extensions/user-theme/util.js
@@ -1,17 +0,0 @@
-/* exported getThemeDirs getModeThemeDirs */
-const { GLib } = imports.gi;
-
-const fn = (...args) => GLib.build_filenamev(args);
-
-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')),
-    ];
-}
-
-function getModeThemeDirs() {
-    return GLib.get_system_data_dirs()
-        .map(dir => fn(dir, 'gnome-shell', 'theme'));
-}
--- a/extensions/window-list/extension.js
+++ b/extensions/window-list/extension.js
@@ -220,12 +220,13 @@ const BaseButton = GObject.registerClass({

        super._init({
            style_class: 'window-button',
+            x_fill: true,
+            y_fill: true,
            can_focus: true,
-            x_expand: true,
            button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
        });

-        this.connect('notify::allocation',
+        this.connect('allocation-changed',
            this._updateIconGeometry.bind(this));
        this.connect('clicked', this._onClicked.bind(this));
        this.connect('destroy', this._onDestroy.bind(this));
@@ -352,9 +353,6 @@ class WindowButton extends BaseButton {
        super._init(perMonitor, monitorIndex);

        this.metaWindow = metaWindow;
-        this._skipTaskbarId = metaWindow.connect('notify::skip-taskbar', () => {
-            this._updateVisibility();
-        });
        this._updateVisibility();

        this._windowTitle = new WindowTitle(this.metaWindow);
@@ -415,7 +413,6 @@ class WindowButton extends BaseButton {

    _onDestroy() {
        super._onDestroy();
-        this.metaWindow.disconnect(this._skipTaskbarId);
        this.metaWindow.disconnect(this._workspaceChangedId);
        global.display.disconnect(this._notifyFocusId);
        this._contextMenu.destroy();
@@ -494,6 +491,8 @@ class AppButton extends BaseButton {

        this._singleWindowTitle = new St.Bin({
            x_expand: true,
+            y_fill: true,
+            x_align: St.Align.START,
        });
        stack.add_actor(this._singleWindowTitle);

@@ -612,6 +611,7 @@ class AppButton extends BaseButton {
            this._contextMenuManager.addMenu(this._appContextMenu);
            this.label_actor = this._multiWindowTitle.label_actor;
        }
+
    }

    _onClicked(actor, button) {
@@ -744,20 +744,21 @@ class WindowList extends St.Widget {
        this._appStateChangedId = this._appSystem.connect(
            'app-state-changed', this._onAppStateChanged.bind(this));

-        // Hack: OSK gesture is tied to visibility, piggy-back on that
-        this._keyboardVisiblechangedId =
-            Main.keyboard._bottomDragAction.connect('notify::enabled',
-                action => {
-                    const visible = !action.enabled;
-                    if (visible) {
-                        Main.uiGroup.set_child_above_sibling(
-                            this, Main.layoutManager.keyboardBox);
-                    } else {
-                        Main.uiGroup.set_child_above_sibling(
-                            this, Main.layoutManager.panelBox);
-                    }
-                    this._updateKeyboardAnchor();
-                });
+        this._keyboardVisiblechangedId = Main.layoutManager.connect(
+            'keyboard-visible-changed',
+            (o, state) => {
+                Main.layoutManager.keyboardBox.visible = state;
+                let { keyboardBox } = Main.layoutManager;
+                keyboardBox.visible = state;
+                if (state) {
+                    Main.uiGroup.set_child_above_sibling(
+                        this, keyboardBox);
+                } else {
+                    Main.uiGroup.set_child_above_sibling(
+                        this, Main.layoutManager.panelBox);
+                }
+                this._updateKeyboardAnchor();
+            });

        let workspaceManager = global.workspace_manager;

@@ -785,9 +786,9 @@ class WindowList extends St.Widget {
            });

        this._dragBeginId = Main.xdndHandler.connect('drag-begin',
-            this._monitorDrag.bind(this));
+            this._onDragBegin.bind(this));
        this._dragEndId = Main.xdndHandler.connect('drag-end',
-            this._stopMonitoringDrag.bind(this));
+            this._onDragEnd.bind(this));
        this._dragMonitor = {
            dragMotion: this._onDragMotion.bind(this),
        };
@@ -939,7 +940,10 @@ class WindowList extends St.Widget {
        let button = new AppButton(app, this._perMonitor, this._monitor.index);
        this._settings.bind('display-all-workspaces',
            button, 'ignore-workspace', Gio.SettingsBindFlags.GET);
-        this._windowList.add_child(button);
+        this._windowList.layout_manager.pack(button,
+            true, true, true,
+            Clutter.BoxAlignment.START,
+            Clutter.BoxAlignment.START);
    }

    _removeApp(app) {
@@ -950,6 +954,9 @@ class WindowList extends St.Widget {
    }

    _onWindowAdded(ws, win) {
+        if (win.skip_taskbar)
+            return;
+
        if (!this._grouped)
            this._checkGrouping();

@@ -963,7 +970,10 @@ class WindowList extends St.Widget {
        let button = new WindowButton(win, this._perMonitor, this._monitor.index);
        this._settings.bind('display-all-workspaces',
            button, 'ignore-workspace', Gio.SettingsBindFlags.GET);
-        this._windowList.add_child(button);
+        this._windowList.layout_manager.pack(button,
+            true, true, true,
+            Clutter.BoxAlignment.START,
+            Clutter.BoxAlignment.START);
    }

    _onWindowRemoved(ws, win) {
@@ -1015,11 +1025,11 @@ class WindowList extends St.Widget {
        }
    }

-    _monitorDrag() {
+    _onDragBegin() {
        DND.addDragMonitor(this._dragMonitor);
    }

-    _stopMonitoringDrag() {
+    _onDragEnd() {
        DND.removeDragMonitor(this._dragMonitor);
        this._removeActivateTimeout();
    }
@@ -1075,9 +1085,11 @@ class WindowList extends St.Widget {
        this._appSystem.disconnect(this._appStateChangedId);
        this._appStateChangedId = 0;

-        Main.keyboard._bottomDragAction.disconnect(this._keyboardVisiblechangedId);
+        Main.layoutManager.disconnect(this._keyboardVisiblechangedId);
        this._keyboardVisiblechangedId = 0;

+        Main.layoutManager.hideKeyboard();
+
        this._disconnectWorkspaceSignals();
        global.workspace_manager.disconnect(this._nWorkspacesChangedId);
        this._nWorkspacesChangedId = 0;
@@ -1091,7 +1103,6 @@ class WindowList extends St.Widget {

        global.display.disconnect(this._fullscreenChangedId);

-        this._stopMonitoringDrag();
        Main.xdndHandler.disconnect(this._dragBeginId);
        Main.xdndHandler.disconnect(this._dragEndId);

--- a/extensions/window-list/prefs.js
+++ b/extensions/window-list/prefs.js
@@ -14,40 +14,29 @@ function init() {
 }

 const WindowListPrefsWidget = GObject.registerClass(
-class WindowListPrefsWidget extends Gtk.Box {
-    _init() {
-        super._init({
-            orientation: Gtk.Orientation.VERTICAL,
-            spacing: 6,
-            margin_top: 36,
-            margin_bottom: 36,
-            margin_start: 36,
-            margin_end: 36,
-            halign: Gtk.Align.CENTER,
-        });
+class WindowListPrefsWidget extends Gtk.Grid {
+    _init(params) {
+        super._init(params);
+
+        this.margin = 24;
+        this.row_spacing = 6;
+        this.orientation = Gtk.Orientation.VERTICAL;

        let groupingLabel = '<b>%s</b>'.format(_('Window Grouping'));
-        this.append(new Gtk.Label({
+        this.add(new Gtk.Label({
            label: groupingLabel, use_markup: true,
            halign: Gtk.Align.START,
        }));

-        const box = new Gtk.Box({
+        let align = new Gtk.Alignment({ left_padding: 12 });
+        this.add(align);
+
+        let grid = new Gtk.Grid({
            orientation: Gtk.Orientation.VERTICAL,
-            spacing: 12,
-            margin_bottom: 12,
+            row_spacing: 6,
+            column_spacing: 6,
        });
-        this.append(box);
-
-        const context = box.get_style_context();
-        const cssProvider = new Gtk.CssProvider();
-        cssProvider.load_from_data(
-            'box { padding: 12px; }');
-
-        context.add_provider(cssProvider,
-            Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
-        context.add_class('frame');
-        context.add_class('view');
+        align.add(grid);

        this._settings = ExtensionUtils.getSettings();
        let currentMode = this._settings.get_string('grouping-mode');
@@ -61,7 +50,6 @@ class WindowListPrefsWidget extends Gtk.Box {
        };

        let radio = null;
-        let currentRadio = null;
        for (let i = 0; i < modes.length; i++) {
            let mode = modes[i];
            let label = modeLabels[mode];
@@ -70,16 +58,12 @@ class WindowListPrefsWidget extends Gtk.Box {
                continue;
            }

-            radio = new Gtk.CheckButton({
-                active: !i,
+            radio = new Gtk.RadioButton({
+                active: currentMode === mode,
                label,
                group: radio,
-                margin_end: 12,
            });
-            box.append(radio);
-
-            if (currentMode === mode)
-                currentRadio = radio;
+            grid.add(radio);

            radio.connect('toggled', button => {
                if (button.active)
@@ -87,23 +71,25 @@ class WindowListPrefsWidget extends Gtk.Box {
            });
        }

-        if (currentRadio)
-            currentRadio.active = true;
-
        let check = new Gtk.CheckButton({
            label: _('Show on all monitors'),
+            margin_top: 6,
        });
        this._settings.bind('show-on-all-monitors', check, 'active', Gio.SettingsBindFlags.DEFAULT);
-        this.append(check);
+        this.add(check);

        check = new Gtk.CheckButton({
            label: _('Show windows from all workspaces'),
+            margin_top: 6,
        });
        this._settings.bind('display-all-workspaces', check, 'active', Gio.SettingsBindFlags.DEFAULT);
-        this.append(check);
+        this.add(check);
    }
 });

 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;
--- a/extensions/window-list/windowPicker.js
+++ b/extensions/window-list/windowPicker.js
@@ -1,24 +1,16 @@
 /* exported WindowPicker, WindowPickerToggle */
-const { Clutter, GObject, Shell, St } = imports.gi;
+const { Clutter, GLib, GObject, Meta, Shell, St } = imports.gi;

 const Layout = imports.ui.layout;
 const Main = imports.ui.main;
+const Overview = imports.ui.overview;
 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) {
+    _init() {
        let workspaceManager = global.workspace_manager;

-        this._overviewAdjustment = overviewAdjustment;
        this._workspaceAdjustment = new St.Adjustment({
            value: workspaceManager.get_active_workspace_index(),
            lower: 0,
@@ -32,32 +24,40 @@ class MyWorkspacesDisplay extends WorkspacesDisplay {
            workspaceManager.connect('notify::n-workspaces',
                this._updateAdjustment.bind(this));

-        super._init(controls, this._workspaceAdjustment, this._overviewAdjustment);
-
-        this._workspaceAdjustment.actor = this;
+        super._init(this._workspaceAdjustment);

        this.add_constraint(
            new Layout.MonitorConstraint({
                primary: true,
                work_area: true,
            }));
+
+        this._workareasChangedId = global.display.connect('workareas-changed',
+            this._onWorkAreasChanged.bind(this));
+        this._onWorkAreasChanged();
    }

-    prepareToEnterOverview(...args) {
+    show(...args) {
        if (!this._scrollEventId) {
            this._scrollEventId = Main.windowPicker.connect('scroll-event',
                this._onScrollEvent.bind(this));
        }

-        super.prepareToEnterOverview(...args);
+        super.show(...args);
    }

-    vfunc_hide(...args) {
+    hide(...args) {
        if (this._scrollEventId > 0)
            Main.windowPicker.disconnect(this._scrollEventId);
        this._scrollEventId = 0;

-        super.vfunc_hide(...args);
+        super.hide(...args);
+    }
+
+    _onWorkAreasChanged() {
+        let { primaryIndex } = Main.layoutManager;
+        let workarea = Main.layoutManager.getWorkAreaForMonitor(primaryIndex);
+        this.setWorkspacesFullGeometry(workarea);
    }

    _updateAdjustment() {
@@ -68,78 +68,28 @@ class MyWorkspacesDisplay extends WorkspacesDisplay {
        });
    }

+    _updateWorkspacesViews() {
+        super._updateWorkspacesViews();
+
+        this._workspacesViews.forEach(v => {
+            Main.layoutManager.overviewGroup.remove_actor(v);
+            Main.windowPicker.add_actor(v);
+        });
+    }
+
    _onDestroy() {
+        if (this._workareasChangedId)
+            global.display.disconnect(this._workareasChangedId);
+        this._workareasChangedId = 0;
+
        if (this._nWorkspacesChangedId)
-            global.workspace_manager.disconnect(this._nWorkspacesChangedId);
-        this._nWorkspacesChangedId = 0;
+            global.workspace_manager.disconnect(this._nWorkspacesNotifyId);
+        this._nWorkspacesNotifyId = 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] },
@@ -152,9 +102,7 @@ var WindowPicker = GObject.registerClass({
        this._overlayKeyId = 0;
        this._stageKeyPressId = 0;

-        super._init({ reactive: true });
-
-        this._adjustment = new OverviewAdjustment(this);
+        super._init();

        this.connect('destroy', this._onDestroy.bind(this));

@@ -165,14 +113,31 @@ var WindowPicker = GObject.registerClass({
            this, 'height',
            GObject.BindingFlags.SYNC_CREATE);

-        this._workspacesDisplay = new MyWorkspacesDisplay(this, this._adjustment);
+        this._backgroundGroup = new Meta.BackgroundGroup({ reactive: true });
+        this.add_child(this._backgroundGroup);
+
+        this._backgroundGroup.connect('scroll-event', (a, ev) => {
+            this.emit('scroll-event', ev);
+        });
+
+        // Trick WorkspacesDisplay constructor into adding actions here
+        let addActionOrig = Main.overview.addAction;
+        Main.overview.addAction = a => this._backgroundGroup.add_action(a);
+
+        this._workspacesDisplay = new MyWorkspacesDisplay();
        this.add_child(this._workspacesDisplay);

+        Main.overview.addAction = addActionOrig;
+
+        this._bgManagers = [];
+
+        this._monitorsChangedId = Main.layoutManager.connect('monitors-changed',
+            this._updateBackgrounds.bind(this));
+        this._updateBackgrounds();
+
        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();
@@ -182,14 +147,6 @@ var WindowPicker = GObject.registerClass({
        }
    }

-    _injectBackgroundShade() {
-        this._origWorkspace = Workspace.Workspace;
-        this._origWorkspaceBackground = Workspace.WorkspaceBackground;
-
-        Workspace.Workspace = MyWorkspace;
-        Workspace.WorkspaceBackground = MyWorkspaceBackground;
-    }
-
    get visible() {
        return this._visible;
    }
@@ -204,15 +161,9 @@ var WindowPicker = GObject.registerClass({
            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._shadeBackgrounds();
+        this._fakeOverviewAnimation();
+        this._workspacesDisplay.show(false);

        this._stageKeyPressId = global.stage.connect('key-press-event',
            (a, event) => {
@@ -236,17 +187,11 @@ var WindowPicker = GObject.registerClass({
        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);
-            },
+        this._workspacesDisplay.animateFromOverview(false);
+        this._unshadeBackgrounds();
+        this._fakeOverviewAnimation(() => {
+            this._workspacesDisplay.hide();
+            this._fakeOverviewVisible(false);
        });

        global.stage.disconnect(this._stageKeyPressId);
@@ -255,8 +200,16 @@ var WindowPicker = GObject.registerClass({
        this.emit('open-state-changed', this._visible);
    }

-    getWorkspacesBoxForState() {
-        return this.allocation;
+    _fakeOverviewAnimation(onComplete) {
+        Main.overview._animationInProgress = true;
+        GLib.timeout_add(
+            GLib.PRIORITY_DEFAULT,
+            Overview.ANIMATION_TIME,
+            () => {
+                Main.overview._animationInProgress = false;
+                if (onComplete)
+                    onComplete();
+            });
    }

    _fakeOverviewVisible(visible) {
@@ -289,12 +242,6 @@ var WindowPicker = GObject.registerClass({
    }

    _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;
@@ -307,6 +254,18 @@ var WindowPicker = GObject.registerClass({
            global.stage.disconnect(this._stageKeyPressId);
        this._stageKeyPressId = 0;
    }
+
+    _updateBackgrounds() {
+        Main.overview._updateBackgrounds.call(this);
+    }
+
+    _shadeBackgrounds() {
+        Main.overview._shadeBackgrounds.call(this);
+    }
+
+    _unshadeBackgrounds() {
+        Main.overview._unshadeBackgrounds.call(this);
+    }
 });

 var WindowPickerToggle = GObject.registerClass(
@@ -327,6 +286,8 @@ class WindowPickerToggle extends St.Button {
            style_class: 'window-picker-toggle',
            child: iconBin,
            visible: !Main.sessionMode.hasOverview,
+            x_fill: true,
+            y_fill: true,
            toggle_mode: true,
        });

--- a/extensions/window-list/workspaceIndicator.js
+++ b/extensions/window-list/workspaceIndicator.js
@@ -9,9 +9,6 @@ const PopupMenu = imports.ui.popupMenu;
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;

-const TOOLTIP_OFFSET = 6;
-const TOOLTIP_ANIMATION_TIME = 150;
-
 let WindowPreview = GObject.registerClass(
 class WindowPreview extends St.Button {
    _init(window) {
@@ -27,14 +24,27 @@ class WindowPreview extends St.Button {
        this.connect('destroy', this._onDestroy.bind(this));

        this._sizeChangedId = this._window.connect('size-changed',
-            () => this.queue_relayout());
+            this._relayout.bind(this));
        this._positionChangedId = this._window.connect('position-changed',
-            () => {
-                this._updateVisible();
-                this.queue_relayout();
-            });
+            this._relayout.bind(this));
        this._minimizedChangedId = this._window.connect('notify::minimized',
-            this._updateVisible.bind(this));
+            this._relayout.bind(this));
+        this._monitorEnteredId = global.display.connect('window-entered-monitor',
+            this._relayout.bind(this));
+        this._monitorLeftId = global.display.connect('window-left-monitor',
+            this._relayout.bind(this));
+
+        // Do initial layout when we get a parent
+        let id = this.connect('parent-set', () => {
+            this.disconnect(id);
+            if (!this.get_parent())
+                return;
+            this._laterId = Meta.later_add(Meta.LaterType.BEFORE_REDRAW, () => {
+                this._laterId = 0;
+                this._relayout();
+                return false;
+            });
+        });

        this._focusChangedId = global.display.connect('notify::focus-window',
            this._onFocusChanged.bind(this));
@@ -42,15 +52,19 @@ class WindowPreview extends St.Button {
    }

    // needed for DND
-    get metaWindow() {
-        return this._window;
+    get realWindow() {
+        return this._window.get_compositor_private();
    }

    _onDestroy() {
        this._window.disconnect(this._sizeChangedId);
        this._window.disconnect(this._positionChangedId);
        this._window.disconnect(this._minimizedChangedId);
+        global.display.disconnect(this._monitorEnteredId);
+        global.display.disconnect(this._monitorLeftId);
        global.display.disconnect(this._focusChangedId);
+        if (this._laterId)
+            Meta.later_remove(this._laterId);
    }

    _onFocusChanged() {
@@ -60,42 +74,26 @@ class WindowPreview extends St.Button {
            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) &&
+    _relayout() {
+        let monitor = Main.layoutManager.findIndexForActor(this);
+        this.visible = monitor === this._window.get_monitor() &&
            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];
-    }
+        if (!this.visible)
+            return;

-    vfunc_get_preferred_height() {
-        return [0, 0];
-    }
+        let workArea = Main.layoutManager.getWorkAreaForMonitor(monitor);
+        let hscale = this.get_parent().allocation.get_width() / workArea.width;
+        let vscale = this.get_parent().allocation.get_height() / workArea.height;

-    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 frameRect = this._window.get_frame_rect();
+        this.set_size(
+            Math.round(Math.min(frameRect.width, workArea.width) * hscale),
+            Math.round(Math.min(frameRect.height, workArea.height) * vscale));
+        this.set_position(
+            Math.round(frameRect.x * hscale),
+            Math.round(frameRect.y * vscale));
    }
 });

@@ -105,19 +103,14 @@ class WorkspaceThumbnail extends St.Button {
        super._init({
            style_class: 'workspace',
            child: new Clutter.Actor({
-                layout_manager: new WorkspaceLayout(),
+                layout_manager: new Clutter.BinLayout(),
                clip_to_allocation: true,
            }),
+            x_fill: true,
+            y_fill: 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
@@ -143,15 +136,16 @@ class WorkspaceThumbnail extends St.Button {
    }

    acceptDrop(source) {
-        if (!source.metaWindow)
+        if (!source.realWindow)
            return false;

-        this._moveWindow(source.metaWindow);
+        let window = source.realWindow.get_meta_window();
+        this._moveWindow(window);
        return true;
    }

    handleDragOver(source) {
-        if (source.metaWindow)
+        if (source.realWindow)
            return DND.DragMotionResult.MOVE_DROP;
        else
            return DND.DragMotionResult.CONTINUE;
@@ -202,39 +196,7 @@ class WorkspaceThumbnail extends St.Button {
            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);
@@ -428,5 +390,10 @@ class WorkspaceIndicator extends PanelMenu.Button {
        let newIndex = this._currentWorkspace + diff;
        this._activate(newIndex);
    }
+
+    _allocate(actor, box, flags) {
+        if (actor.get_n_children() > 0)
+            actor.get_first_child().allocate(box, flags);
+    }
 });

--- a/extensions/windowsNavigator/extension.js
+++ b/extensions/windowsNavigator/extension.js
@@ -1,12 +1,45 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 /* exported init */
-const { Clutter, Graphene, GObject, St } = imports.gi;
+const { Clutter, GObject, St } = imports.gi;

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

-const WINDOW_SLOT = 4;
+class MyWindowOverlay extends Workspace.WindowOverlay {
+    constructor(windowClone, parentActor) {
+        super(windowClone, parentActor);
+
+        this._id = null;
+        this._text = new St.Label({
+            style_class: 'extension-windowsNavigator-window-tooltip',
+            visible: false,
+        });
+        parentActor.add_actor(this._text);
+    }
+
+    showTooltip() {
+        this._parentActor.set_child_below_sibling(this._text, null);
+        this._text.show();
+        this._text.text = (this._windowClone.slotId + 1).toString();
+    }
+
+    hideTooltip() {
+        if (this._text && this._text.visible)
+            this._text.hide();
+    }
+
+    relayout(animate) {
+        super.relayout(animate);
+
+        let [cloneX, cloneY, cloneWidth_, cloneHeight_] = this._windowClone.slot;
+
+        let textX = cloneX - 2;
+        let textY = cloneY - 2;
+        this._text.set_position(Math.floor(textX) + 5, Math.floor(textY) + 5);
+        this._parentActor.set_child_below_sibling(this._text, null);
+    }
+}

 var MyWorkspace = GObject.registerClass(
 class MyWorkspace extends Workspace.Workspace {
@@ -28,89 +61,57 @@ class MyWorkspace extends Workspace.Workspace {
        }
    }

-    vfunc_allocate(box) {
-        super.vfunc_allocate(box);
-
-        if (this._tip)
-            this._tip.allocate_preferred_size(0, 0);
-    }
-
    showTooltip() {
-        if (!this._tip)
+        if (!this._tip || !this._actualGeometry)
            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.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);
    }

    hideTooltip() {
-        if (this._tip)
-            this._tip.hide();
+        if (!this._tip)
+            return;
+        if (!this._tip.get_parent())
+            return;
+        this._tip.hide();
    }

    getWindowWithTooltip(id) {
-        const slot = this.layout_manager._windowSlots[id - 1];
-        return slot ? slot[WINDOW_SLOT].metaWindow : null;
+        for (let i = 0; i < this._windows.length; i++) {
+            if (this._windows[i].slotId + 1 === id)
+                return this._windows[i].metaWindow;
+        }
+        return null;
    }

    showWindowsTooltips() {
-        for (let i = 0; i < this.layout_manager._windowSlots.length; i++) {
-            if (this.layout_manager._windowSlots[i])
-                this.layout_manager._windowSlots[i][WINDOW_SLOT].showTooltip(`${i + 1}`);
+        for (let i in this._windowOverlays) {
+            if (this._windowOverlays[i])
+                this._windowOverlays[i].showTooltip();
        }
    }

    hideWindowsTooltips() {
-        for (let i in this.layout_manager._windowSlots) {
-            if (this.layout_manager._windowSlots[i])
-                this.layout_manager._windowSlots[i][WINDOW_SLOT].hideTooltip();
+        for (let i in this._windowOverlays) {
+            if (this._windowOverlays[i])
+                this._windowOverlays[i].hideTooltip();
        }
    }
-
-    // overriding _addWindowClone to apply the tooltip patch on the cloned
-    // windowPreview
-    _addWindowClone(metaWindow) {
-        const clone = super._addWindowClone(metaWindow);
-
-        // 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._borderCenter,
-                coordinate: Clutter.BindCoordinate.POSITION,
-            }));
-            this._text.add_constraint(new Clutter.AlignConstraint({
-                source: this._borderCenter,
-                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._borderCenter,
-                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(
@@ -243,16 +244,19 @@ class MyWorkspacesView extends WorkspacesView.WorkspacesView {

 class Extension {
    constructor() {
+        this._origWindowOverlay = Workspace.WindowOverlay;
        this._origWorkspace = Workspace.Workspace;
        this._origWorkspacesView = WorkspacesView.WorkspacesView;
    }

    enable() {
+        Workspace.WindowOverlay = MyWindowOverlay;
        Workspace.Workspace = MyWorkspace;
        WorkspacesView.WorkspacesView = MyWorkspacesView;
    }

    disable() {
+        Workspace.WindowOverlay = this._origWindowOverlay;
        Workspace.Workspace = this._origWorkspace;
        WorkspacesView.WorkspacesView = this._origWorkspacesView;
    }
--- a/extensions/workspace-indicator/extension.js
+++ b/extensions/workspace-indicator/extension.js
@@ -15,9 +15,6 @@ const _ = Gettext.gettext;
 const WORKSPACE_SCHEMA = 'org.gnome.desktop.wm.preferences';
 const WORKSPACE_KEY = 'workspace-names';

-const TOOLTIP_OFFSET = 6;
-const TOOLTIP_ANIMATION_TIME = 150;
-
 let WindowPreview = GObject.registerClass(
 class WindowPreview extends St.Button {
    _init(window) {
@@ -33,14 +30,27 @@ class WindowPreview extends St.Button {
        this.connect('destroy', this._onDestroy.bind(this));

        this._sizeChangedId = this._window.connect('size-changed',
-            () => this.queue_relayout());
+            this._relayout.bind(this));
        this._positionChangedId = this._window.connect('position-changed',
-            () => {
-                this._updateVisible();
-                this.queue_relayout();
-            });
+            this._relayout.bind(this));
        this._minimizedChangedId = this._window.connect('notify::minimized',
-            this._updateVisible.bind(this));
+            this._relayout.bind(this));
+        this._monitorEnteredId = global.display.connect('window-entered-monitor',
+            this._relayout.bind(this));
+        this._monitorLeftId = global.display.connect('window-left-monitor',
+            this._relayout.bind(this));
+
+        // Do initial layout when we get a parent
+        let id = this.connect('parent-set', () => {
+            this.disconnect(id);
+            if (!this.get_parent())
+                return;
+            this._laterId = Meta.later_add(Meta.LaterType.BEFORE_REDRAW, () => {
+                this._laterId = 0;
+                this._relayout();
+                return false;
+            });
+        });

        this._focusChangedId = global.display.connect('notify::focus-window',
            this._onFocusChanged.bind(this));
@@ -48,15 +58,19 @@ class WindowPreview extends St.Button {
    }

    // needed for DND
-    get metaWindow() {
-        return this._window;
+    get realWindow() {
+        return this._window.get_compositor_private();
    }

    _onDestroy() {
        this._window.disconnect(this._sizeChangedId);
        this._window.disconnect(this._positionChangedId);
        this._window.disconnect(this._minimizedChangedId);
+        global.display.disconnect(this._monitorEnteredId);
+        global.display.disconnect(this._monitorLeftId);
        global.display.disconnect(this._focusChangedId);
+        if (this._laterId)
+            Meta.later_remove(this._laterId);
    }

    _onFocusChanged() {
@@ -66,42 +80,26 @@ class WindowPreview extends St.Button {
            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) &&
+    _relayout() {
+        let monitor = Main.layoutManager.findIndexForActor(this);
+        this.visible = monitor === this._window.get_monitor() &&
            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];
-    }
+        if (!this.visible)
+            return;

-    vfunc_get_preferred_height() {
-        return [0, 0];
-    }
+        let workArea = Main.layoutManager.getWorkAreaForMonitor(monitor);
+        let hscale = this.get_parent().allocation.get_width() / workArea.width;
+        let vscale = this.get_parent().allocation.get_height() / workArea.height;

-    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 frameRect = this._window.get_frame_rect();
+        this.set_size(
+            Math.round(Math.min(frameRect.width, workArea.width) * hscale),
+            Math.round(Math.min(frameRect.height, workArea.height) * vscale));
+        this.set_position(
+            Math.round(frameRect.x * hscale),
+            Math.round(frameRect.y * vscale));
    }
 });

@@ -111,19 +109,14 @@ class WorkspaceThumbnail extends St.Button {
        super._init({
            style_class: 'workspace',
            child: new Clutter.Actor({
-                layout_manager: new WorkspaceLayout(),
+                layout_manager: new Clutter.BinLayout(),
                clip_to_allocation: true,
            }),
+            x_fill: true,
+            y_fill: 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
@@ -149,15 +142,16 @@ class WorkspaceThumbnail extends St.Button {
    }

    acceptDrop(source) {
-        if (!source.metaWindow)
+        if (!source.realWindow)
            return false;

-        this._moveWindow(source.metaWindow);
+        let window = source.realWindow.get_meta_window();
+        this._moveWindow(window);
        return true;
    }

    handleDragOver(source) {
-        if (source.metaWindow)
+        if (source.realWindow)
            return DND.DragMotionResult.MOVE_DROP;
        else
            return DND.DragMotionResult.CONTINUE;
@@ -208,39 +202,7 @@ class WorkspaceThumbnail extends St.Button {
            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);
--- a/extensions/workspace-indicator/prefs.js
+++ b/extensions/workspace-indicator/prefs.js
@@ -1,7 +1,7 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
 /* exported init buildPrefsWidget */

-const { Gio, GLib, GObject, Gtk, Pango } = imports.gi;
+const { Gio, GObject, Gtk } = imports.gi;

 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
@@ -12,200 +12,189 @@ const ExtensionUtils = imports.misc.extensionUtils;
 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._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 Gtk.ScrolledWindow {
-    _init() {
-        super._init({
-            hscrollbar_policy: Gtk.PolicyType.NEVER,
-        });
+class WorkspaceSettingsWidget extends Gtk.Grid {
+    _init(params) {
+        super._init(params);
+        this.margin = 12;
+        this.orientation = Gtk.Orientation.VERTICAL;

-        const box = new Gtk.Box({
-            orientation: Gtk.Orientation.VERTICAL,
-            halign: Gtk.Align.CENTER,
-            spacing: 12,
-            margin_top: 36,
-            margin_bottom: 36,
-            margin_start: 36,
-            margin_end: 36,
-        });
-        this.set_child(box);
-
-        box.append(new Gtk.Label({
+        this.add(new Gtk.Label({
            label: '<b>%s</b>'.format(_('Workspace Names')),
            use_markup: true,
+            margin_bottom: 6,
+            hexpand: true,
            halign: Gtk.Align.START,
        }));

-        this._list = new Gtk.ListBox({
-            selection_mode: Gtk.SelectionMode.NONE,
-            valign: Gtk.Align.START,
-            show_separators: true,
-        });
-        this._list.connect('row-activated', (l, row) => row.edit());
-        box.append(this._list);
+        let scrolled = new Gtk.ScrolledWindow({ shadow_type: Gtk.ShadowType.IN });
+        scrolled.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
+        this.add(scrolled);

-        const context = this._list.get_style_context();
-        const cssProvider = new Gtk.CssProvider();
-        cssProvider.load_from_data(
-            'list { min-width: 25em; }');
-
-        context.add_provider(cssProvider,
-            Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
-        context.add_class('frame');
-
-        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 Gtk.ListBoxRow {
-    _init(name) {
-        super._init({ name });
-
-        const controller = new Gtk.ShortcutController();
-        controller.add_shortcut(new Gtk.Shortcut({
-            trigger: Gtk.ShortcutTrigger.parse_string('Escape'),
-            action: Gtk.CallbackAction.new(this._stopEdit.bind(this)),
-        }));
-        this.add_controller(controller);
-
-        const box = new Gtk.Box({
-            spacing: 12,
-            margin_top: 6,
-            margin_bottom: 6,
-            margin_start: 6,
-            margin_end: 6,
-        });
-
-        const label = new Gtk.Label({
+        this._store = new WorkspaceNameModel();
+        this._treeView = new Gtk.TreeView({
+            model: this._store,
+            headers_visible: false,
+            reorderable: true,
            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',
-        });
-        box.append(button);
-
-        this._entry = new Gtk.Entry({
-            max_width_chars: 25,
+            vexpand: true,
        });

-        this._stack = new Gtk.Stack();
-        this._stack.add_named(box, 'display');
-        this._stack.add_named(this._entry, 'edit');
-        this.child = this._stack;
+        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);

-        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();
-        });
+        scrolled.add(this._treeView);

-        this.connect('notify::name', () => {
-            button.action_target = new GLib.Variant('s', this.name);
-            this.activate_action('workspaces.update', null);
+        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];

-const NewWorkspaceRow = GObject.registerClass(
-class NewWorkspaceRow extends Gtk.ListBoxRow {
-    _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')]);
+        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);
    }
 });

@@ -214,5 +203,8 @@ function init() {
 }

 function buildPrefsWidget() {
-    return new WorkspaceSettingsWidget();
+    let widget = new WorkspaceSettingsWidget();
+    widget.show_all();
+
+    return widget;
 }
--- 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.yml
+++ b/lint/eslintrc-gjs.yml
@@ -1,5 +1,4 @@
 ---
-# SPDX-License-Identifier: MIT OR LGPL-2.0-or-later
 env:
  es6: true
 extends: 'eslint:recommended'
@@ -25,9 +24,7 @@ rules:
  #     allow: [^vfunc_, ^on_, _instance_init]
  comma-dangle:
    - error
-    - arrays: always-multiline
-      objects: always-multiline
-      functions: never
+    - always-multiline
  comma-spacing:
    - error
    - before: false
@@ -90,7 +87,6 @@ rules:
    - error
    - all
    - conditionalAssign: false
-      nestedBinaryExpressions: false
      returnAssign: false
  no-implicit-coercion:
    - error
@@ -109,15 +105,15 @@ rules:
  no-prototype-builtins: 'off'
  no-restricted-properties:
    - error
-    - 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
+    - object: imports
+      property: mainloop
+      message: Use GLib main loops and timeouts
  no-restricted-syntax:
    - error
    - selector: >-
@@ -133,8 +129,6 @@ rules:
        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
@@ -171,9 +165,6 @@ rules:
  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
@@ -226,12 +217,12 @@ globals:
  ARGV: readonly
  Debugger: readonly
  GIRepositoryGType: readonly
-  globalThis: readonly
  imports: readonly
  Intl: readonly
  log: readonly
  logError: readonly
  print: readonly
  printerr: readonly
+  window: readonly
 parserOptions:
-  ecmaVersion: 2020
+  ecmaVersion: 2017
--- a/meson.build
+++ b/meson.build
@@ -1,12 +1,11 @@
 project('gnome-shell-extensions',
-  version: '40.beta',
+  version: '3.35.91',
  meson_version: '>= 0.44.0',
  license: 'GPL2+'
 )

 gettext_domain = meson.project_name()

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

@@ -21,10 +20,12 @@ schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
 sessiondir = join_paths(datadir, 'gnome-session', 'sessions')
 xsessiondir = join_paths(datadir, 'xsessions')

+js60 = find_program('js60', required: false)
+
 ver_arr = meson.project_version().split('.')
-if ver_arr[1].version_compare('>=0')
-  shell_version = ver_arr[0]
-else # pre-release (alpha, beta, rc)
+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

@@ -32,6 +33,7 @@ uuid_suffix = '@gnome-shell-extensions.gcampax.github.com'

 classic_extensions = [
  'apps-menu',
+  'horizontal-workspaces',
  'places-menu',
  'launch-new-instance',
  'window-list'
@@ -86,10 +88,9 @@ foreach e : enabled_extensions
 endforeach

 if classic_mode_enabled
+  sassc = find_program('sassc', required: true)
  subdir('data')
 endif

 subdir('extensions')
 subdir('po')
-
-meson.add_dist_script('meson/generate-stylesheets.py')
--- 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.call(['sassc', '-a', src, dst])
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -32,7 +32,6 @@ id
 is
 it
 ja
-kab
 kk
 km
 kn
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,5 @@
 data/gnome-classic.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
@@ -9,6 +10,7 @@ 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
--- 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/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
@@ -9,7 +9,7 @@ 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"
+"POT-Creation-Date: 2019-08-09 22:24+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"
@@ -31,7 +31,7 @@ msgstr "Aquesta sessió us permet utilitzar el GNOME clàssic"
 msgid "Favorites"
 msgstr "Preferides"

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

@@ -48,26 +48,39 @@ 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:35
-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:243
+#: extensions/auto-move-windows/prefs.js:71
+#: extensions/auto-move-windows/prefs.js:134
+msgid "Workspace"
+msgstr "Espai de treball"
+
+#: extensions/auto-move-windows/prefs.js:89
 msgid "Add Rule"
 msgstr "Afegeix una regla"

+#: extensions/auto-move-windows/prefs.js:111
+msgid "Create new matching rule"
+msgstr "Crea una regla de coincidència nova"
+
+#: extensions/auto-move-windows/prefs.js:117
+msgid "Add"
+msgstr "Afegeix"
+
 #. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:112
-#: extensions/places-menu/placeDisplay.js:233
+#: extensions/drive-menu/extension.js:102
+#: extensions/places-menu/placeDisplay.js:232
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "Ha fallat l'expulsió de la unitat «%s»:"

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

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

@@ -81,9 +94,9 @@ 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 "
+"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 a reduir la caixa que les envolta. Aquest paràmetre de "
+"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."

@@ -102,8 +115,8 @@ msgstr ""
 "posicionar-lo a baix. Cal reiniciar el Shell per tal que aquest canvi tingui "
 "efecte."

-#: extensions/places-menu/extension.js:89
-#: extensions/places-menu/extension.js:93
+#: extensions/places-menu/extension.js:80
+#: extensions/places-menu/extension.js:84
 msgid "Places"
 msgstr "Llocs"

@@ -122,11 +135,11 @@ msgstr "No s'ha pogut muntar el volum «%s»"
 msgid "Computer"
 msgstr "Ordinador"

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

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

@@ -146,47 +159,47 @@ 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:98
+#: extensions/window-list/extension.js:99
 msgid "Close"
 msgstr "Tanca"

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

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

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

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

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

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

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

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

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

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

@@ -204,15 +217,13 @@ msgstr ""
 "«auto» (automàticament) i «always» (sempre)."

 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-#: extensions/window-list/prefs.js:100
+#: extensions/window-list/prefs.js:82
 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."
+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"
@@ -226,41 +237,41 @@ msgstr ""
 "Si es mostra la llista de finestres en tots els monitors connectats o només "
 "al primari."

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

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

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

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

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

-#: extensions/window-list/workspaceIndicator.js:207
-#: extensions/workspace-indicator/extension.js:213
+#: extensions/window-list/workspaceIndicator.js:211
+#: extensions/workspace-indicator/extension.js:216
 msgid "Workspace Indicator"
 msgstr "Indicador de l'espai de treball"

-#: extensions/workspace-indicator/prefs.js:34
+#: extensions/workspace-indicator/prefs.js:131
 msgid "Workspace Names"
 msgstr "Noms dels espais de treball"

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

-#: extensions/workspace-indicator/prefs.js:218
-msgid "Add Workspace"
-msgstr "Afegeix un espai de treball"
-
--- 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, 2019.
 #
 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"
+"POT-Creation-Date: 2019-08-09 22:24+0000\n"
+"PO-Revision-Date: 2019-08-16 10:16+0200\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
@@ -32,7 +32,7 @@ msgstr "Toto sezení vás přihlásí do GNOME klasik"
 msgid "Favorites"
 msgstr "Oblíbené"

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

@@ -48,26 +48,39 @@ 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:71
+#: extensions/auto-move-windows/prefs.js:134
+msgid "Workspace"
+msgstr "Pracovní plocha"
+
+#: extensions/auto-move-windows/prefs.js:89
 msgid "Add Rule"
 msgstr "Přidat pravidlo"

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

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

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

@@ -99,8 +112,8 @@ 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:80
+#: extensions/places-menu/extension.js:84
 msgid "Places"
 msgstr "Místa"

@@ -119,11 +132,11 @@ msgstr "Selhalo připojení svazku pro „%s“"
 msgid "Computer"
 msgstr "Počítač"

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

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

@@ -143,47 +156,47 @@ 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:99
 msgid "Close"
 msgstr "Zavřít"

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

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

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

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

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

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

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

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

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

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

@@ -200,7 +213,7 @@ 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
+#: extensions/window-list/prefs.js:82
 msgid "Show windows from all workspaces"
 msgstr "Zobrazovat okna ze všech pracovních ploch"

@@ -220,40 +233,40 @@ 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:25
 msgid "Window Grouping"
 msgstr "Seskupování oken"

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

-#: extensions/window-list/prefs.js:59
+#: extensions/window-list/prefs.js:48
 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:49
 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
+#: extensions/window-list/workspaceIndicator.js:211
+#: extensions/workspace-indicator/extension.js:216
 msgid "Workspace Indicator"
 msgstr "Ukazatel pracovní plochy"

-#: extensions/workspace-indicator/prefs.js:34
+#: extensions/workspace-indicator/prefs.js:131
 msgid "Workspace Names"
 msgstr "Názvy pracovních ploch"

-#: extensions/workspace-indicator/prefs.js:67
+#: extensions/workspace-indicator/prefs.js:151
+msgid "Name"
+msgstr "Název"
+
+#: extensions/workspace-indicator/prefs.js:191
 #, 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
@@ -11,16 +11,15 @@ 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"
+"POT-Creation-Date: 2019-08-09 22:24+0000\n"
+"PO-Revision-Date: 2019-09-09 00:53+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"
@@ -34,7 +33,7 @@ msgstr "Denne session logger dig ind i GNOME Classic"
 msgid "Favorites"
 msgstr "Favoritter"

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

@@ -50,26 +49,39 @@ 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:71
+#: extensions/auto-move-windows/prefs.js:134
+msgid "Workspace"
+msgstr "Arbejdsområde"
+
+#: extensions/auto-move-windows/prefs.js:89
 msgid "Add Rule"
 msgstr "Tilføj regel"

+#: extensions/auto-move-windows/prefs.js:111
+msgid "Create new matching rule"
+msgstr "Opret ny regel for match"
+
+#: extensions/auto-move-windows/prefs.js:117
+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:102
+#: extensions/places-menu/placeDisplay.js:232
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "Udskubning af drevet “%s” mislykkedes:"

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

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

@@ -103,8 +115,8 @@ 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:80
+#: extensions/places-menu/extension.js:84
 msgid "Places"
 msgstr "Steder"

@@ -123,11 +135,11 @@ msgstr "Kunne ikke montere diskenhed for “%s”"
 msgid "Computer"
 msgstr "Computer"

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

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

@@ -147,47 +159,47 @@ 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:99
 msgid "Close"
 msgstr "Luk"

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

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

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

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

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

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

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

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

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

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

@@ -204,14 +216,13 @@ 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
+#: extensions/window-list/prefs.js:82
 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."
+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"
@@ -225,56 +236,44 @@ 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:25
 msgid "Window Grouping"
 msgstr "Vinduesgruppering"

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

-#: extensions/window-list/prefs.js:59
+#: extensions/window-list/prefs.js:48
 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:49
 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
+#: extensions/window-list/workspaceIndicator.js:211
+#: extensions/workspace-indicator/extension.js:216
 msgid "Workspace Indicator"
 msgstr "Arbejdsområdeindikator"

-#: extensions/workspace-indicator/prefs.js:34
+#: extensions/workspace-indicator/prefs.js:131
 msgid "Workspace Names"
 msgstr "Navne på arbejdsområder"

-#: extensions/workspace-indicator/prefs.js:67
+#: extensions/workspace-indicator/prefs.js:151
+msgid "Name"
+msgstr "Navn"
+
+#: extensions/workspace-indicator/prefs.js:191
 #, 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"

--- a/po/de.po
+++ b/po/de.po
@@ -6,15 +6,15 @@
 # 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.
+# Tim Sabsch <tim@sabsch.com>, 2019.
 #
 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"
+"POT-Creation-Date: 2019-08-09 22:24+0000\n"
+"PO-Revision-Date: 2019-08-23 21:27+0200\n"
 "Last-Translator: Tim Sabsch <tim@sabsch.com>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "Language: de\n"
@@ -22,7 +22,7 @@ msgstr ""
 "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.2.1\n"

 #: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
 msgid "GNOME Classic"
@@ -36,7 +36,7 @@ msgstr "Diese Sitzung meldet Sie in GNOME Classic an"
 msgid "Favorites"
 msgstr "Favoriten"

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

@@ -53,26 +53,39 @@ 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:71
+#: extensions/auto-move-windows/prefs.js:134
+msgid "Workspace"
+msgstr "Arbeitsfläche"
+
+#: extensions/auto-move-windows/prefs.js:89
 msgid "Add Rule"
 msgstr "Regel hinzufügen"

+#: extensions/auto-move-windows/prefs.js:111
+msgid "Create new matching rule"
+msgstr "Neue Übereinstimmungsregel erstellen"
+
+#: extensions/auto-move-windows/prefs.js:117
+msgid "Add"
+msgstr "Hinzufügen"
+
 #. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:112
-#: extensions/places-menu/placeDisplay.js:233
+#: extensions/drive-menu/extension.js:102
+#: extensions/places-menu/placeDisplay.js:232
 #, 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:118
 msgid "Removable devices"
 msgstr "Wechseldatenträger"

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

@@ -106,8 +119,8 @@ 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:80
+#: extensions/places-menu/extension.js:84
 msgid "Places"
 msgstr "Orte"

@@ -126,11 +139,11 @@ msgstr "Datenträger für »%s« konnte nicht eingebunden werden"
 msgid "Computer"
 msgstr "Rechner"

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

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

@@ -152,47 +165,47 @@ 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:99
 msgid "Close"
 msgstr "Schließen"

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

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

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

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

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

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

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

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

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

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

@@ -210,7 +223,7 @@ msgstr ""
 "»always« (immer)."

 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-#: extensions/window-list/prefs.js:100
+#: extensions/window-list/prefs.js:82
 msgid "Show windows from all workspaces"
 msgstr "Fenster von allen Arbeitsflächen anzeigen"

@@ -232,56 +245,44 @@ 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:25
 msgid "Window Grouping"
 msgstr "Fenstergruppierung"

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

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

-#: extensions/window-list/prefs.js:60
+#: extensions/window-list/prefs.js:49
 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
+#: extensions/window-list/workspaceIndicator.js:211
+#: extensions/workspace-indicator/extension.js:216
 msgid "Workspace Indicator"
 msgstr "Arbeitsflächenindikator"

-#: extensions/workspace-indicator/prefs.js:34
+#: extensions/workspace-indicator/prefs.js:131
 msgid "Workspace Names"
 msgstr "Namen der Arbeitsflächen"

-#: extensions/workspace-indicator/prefs.js:67
+#: extensions/workspace-indicator/prefs.js:151
+msgid "Name"
+msgstr "Name"
+
+#: extensions/workspace-indicator/prefs.js:191
 #, 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"

--- a/po/el.po
+++ b/po/el.po
@@ -12,16 +12,16 @@ 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"
+"POT-Creation-Date: 2019-08-09 22:24+0000\n"
+"PO-Revision-Date: 2019-09-05 19:27+0300\n"
+"Last-Translator: Efstathios Iosifidis <iosifidis@opensuse.org>\n"
 "Language-Team: Greek, Modern (1453-) <gnome-el-list@gnome.org>\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"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"X-Generator: Gtranslator 3.32.1\n"
 "X-Project-Style: gnome\n"

 #: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
@@ -36,7 +36,7 @@ msgstr "Αυτή η συνεδρία σας συνδέει στο GNOME Classic"
 msgid "Favorites"
 msgstr "Αγαπημένα"

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

@@ -53,26 +53,39 @@ 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:71
+#: extensions/auto-move-windows/prefs.js:134
+msgid "Workspace"
+msgstr "Χώρος εργασίας"
+
+#: extensions/auto-move-windows/prefs.js:89
 msgid "Add Rule"
 msgstr "Προσθήκη κανόνα"

+#: extensions/auto-move-windows/prefs.js:111
+msgid "Create new matching rule"
+msgstr "Δημιουργία νέου κανόνα αντιστοίχισης"
+
+#: extensions/auto-move-windows/prefs.js:117
+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:102
+#: extensions/places-menu/placeDisplay.js:232
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "Αποτυχία εξαγωγής του δίσκου «%s»:"

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

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

@@ -106,8 +119,8 @@ msgstr ""
 "στο κάτω μέρος. Η αλλαγή αυτής της ρύθμισης απαιτεί επανεκκίνηση του "
 "κελύφους για να υπάρξει κάποιο αποτέλεσμα."

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

@@ -126,11 +139,11 @@ msgstr "Αποτυχία προσάρτησης τόμου για «%s»"
 msgid "Computer"
 msgstr "Υπολογιστής"

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

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

@@ -151,47 +164,47 @@ 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:99
 msgid "Close"
 msgstr "Κλείσιμο"

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

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

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

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

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

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

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

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

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

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

@@ -209,11 +222,15 @@ msgstr ""
 "«always» (πάντα)."

 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-#: extensions/window-list/prefs.js:100
+#: extensions/window-list/prefs.js:82
+#| msgid "Show only windows in the current workspace"
 msgid "Show windows from all workspaces"
 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."
 msgid "Whether to show windows from all workspaces or only the current one."
 msgstr ""
 "Αν θα εμφανίζονται παράθυρα όλων των χώρων εργασίας ή μόνο του τρέχοντα."
@@ -230,56 +247,44 @@ msgstr ""
 "Αν θα εμφανίζεται ο κατάλογος παραθύρων όλων των συνδεμένων οθονών ή μόνο "
 "της κύριας οθόνης."

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

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

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

-#: extensions/window-list/prefs.js:60
+#: extensions/window-list/prefs.js:49
 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
+#: extensions/window-list/workspaceIndicator.js:211
+#: extensions/workspace-indicator/extension.js:216
 msgid "Workspace Indicator"
 msgstr "Δείκτης χώρου εργασίας"

-#: extensions/workspace-indicator/prefs.js:34
+#: extensions/workspace-indicator/prefs.js:131
 msgid "Workspace Names"
 msgstr "Ονόματα χώρων εργασίας:"

-#: extensions/workspace-indicator/prefs.js:67
+#: extensions/workspace-indicator/prefs.js:151
+msgid "Name"
+msgstr "Όνομα"
+
+#: extensions/workspace-indicator/prefs.js:191
 #, javascript-format
 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 "Προσάρτηση αποκλειστικού διαλόγου στο γονικό παράθυρο"

--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -4,15 +4,15 @@
 # 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.
+# Zander Brown <zbrown@gnome.org>, 2019.
 #
 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"
+"POT-Creation-Date: 2019-08-09 22:24+0000\n"
+"PO-Revision-Date: 2019-08-25 16:49+0100\n"
 "Last-Translator: Zander Brown <zbrown@gnome.org>\n"
 "Language-Team: English - United Kingdom <en_GB@li.org>\n"
 "Language: en_GB\n"
@@ -20,7 +20,7 @@ msgstr ""
 "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: Gtranslator 3.32.1\n"
 "X-Project-Style: gnome\n"

 #: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
@@ -35,7 +35,7 @@ msgstr "This session logs you into GNOME Classic"
 msgid "Favorites"
 msgstr "Favourites"

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

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

-#: extensions/auto-move-windows/prefs.js:35
-#| msgid "Workspace Names"
-msgid "Workspace Rules"
-msgstr "Workspace Rules"
+#: extensions/auto-move-windows/prefs.js:60
+msgid "Application"
+msgstr "Application"

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

+#: extensions/auto-move-windows/prefs.js:111
+msgid "Create new matching rule"
+msgstr "Create new matching rule"
+
+#: extensions/auto-move-windows/prefs.js:117
+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:102
+#: extensions/places-menu/placeDisplay.js:232
 #, javascript-format
 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:145
 msgid "Open Files"
 msgstr "Open Files"

@@ -103,8 +115,8 @@ 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:80
+#: extensions/places-menu/extension.js:84
 msgid "Places"
 msgstr "Places"

@@ -123,11 +135,11 @@ msgstr "Failed to mount volume for “%s”"
 msgid "Computer"
 msgstr "Computer"

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

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

@@ -147,47 +159,47 @@ 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:99
 msgid "Close"
 msgstr "Close"

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

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

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

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

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

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

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

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

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

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

@@ -204,11 +216,15 @@ 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
+#: extensions/window-list/prefs.js:82
+#| msgid "Show only windows in the current workspace"
 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 the window list on all connected monitors or only on the "
+#| "primary one."
 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."

@@ -224,57 +240,44 @@ 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:25
 msgid "Window Grouping"
 msgstr "Window Grouping"

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

-#: extensions/window-list/prefs.js:59
+#: extensions/window-list/prefs.js:48
 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:49
 msgid "Always group windows"
 msgstr "Always group windows"

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

-#: extensions/window-list/workspaceIndicator.js:207
-#: extensions/workspace-indicator/extension.js:213
+#: extensions/window-list/workspaceIndicator.js:211
+#: extensions/workspace-indicator/extension.js:216
 msgid "Workspace Indicator"
 msgstr "Workspace Indicator"

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

-#: extensions/workspace-indicator/prefs.js:67
+#: extensions/workspace-indicator/prefs.js:151
+msgid "Name"
+msgstr "Name"
+
+#: extensions/workspace-indicator/prefs.js:191
 #, 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"

--- a/po/eo.po
+++ b/po/eo.po
@@ -9,8 +9,8 @@ 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-03-31 07:16+0000\n"
-"PO-Revision-Date: 2020-04-18 10:59+0200\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"
@@ -18,7 +18,7 @@ msgstr ""
 "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"
+"X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"

 #: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
@@ -29,11 +29,15 @@ msgstr "GNOME-klasika"
 msgid "This session logs you into GNOME Classic"
 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:369
+#: extensions/apps-menu/extension.js:407
 msgid "Applications"
 msgstr "Aplikaĵoj"

@@ -49,39 +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:59
+#: extensions/auto-move-windows/prefs.js:60
 msgid "Application"
 msgstr "Aplikaĵo"

-#: extensions/auto-move-windows/prefs.js:70
-#: extensions/auto-move-windows/prefs.js:133
+#: extensions/auto-move-windows/prefs.js:71
+#: extensions/auto-move-windows/prefs.js:134
 msgid "Workspace"
 msgstr "Laborspaco"

-#: extensions/auto-move-windows/prefs.js:88
+#: extensions/auto-move-windows/prefs.js:89
 msgid "Add Rule"
 msgstr "Aldoni regulon"

-#: extensions/auto-move-windows/prefs.js:110
+#: extensions/auto-move-windows/prefs.js:111
 msgid "Create new matching rule"
 msgstr "Krei novan kongruantan regulon"

-#: extensions/auto-move-windows/prefs.js:116
+#: extensions/auto-move-windows/prefs.js:117
 msgid "Add"
 msgstr "Aldoni"

 #. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:103
-#: 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:119
+#: extensions/drive-menu/extension.js:116
 msgid "Removable devices"
 msgstr "Demeteblaj aparatoj"

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

@@ -113,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:80
-#: extensions/places-menu/extension.js:84
+#: 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"

@@ -146,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"
@@ -157,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 "Neplejetigi"

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

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

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

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

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

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

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

-#: extensions/window-list/extension.js:457
+#: 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"

@@ -206,27 +220,23 @@ 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:82
-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."
@@ -253,27 +263,19 @@ msgstr "Ĉiam grupigi fenestrojn"
 msgid "Show on all monitors"
 msgstr "Montri en ĉiuj ekranoj"

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

-#: extensions/workspace-indicator/prefs.js:149
+#: extensions/workspace-indicator/prefs.js:151
 msgid "Name"
 msgstr "Nomo"

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

-#~ msgid "Activities Overview"
-#~ msgstr "Aktivecoj-Superrigardon"
-
 #~ msgid "Attach modal dialog to the parent window"
 #~ msgstr "Kunligi modalan dialogon al la patra fenestro"

@@ -317,6 +319,9 @@ msgstr "Laborspaco %d"
 #~ 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,15 +4,15 @@
 # Jorge González <jorgegonz@svn.gnome.org>, 2011.
 # Nicolás Satragno <nsatragno@gmail.com>, 2011.
 # 
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011-2020.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011-2019.
 #
 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-03 17:53+0000\n"
-"PO-Revision-Date: 2020-05-04 14:06+0200\n"
+"POT-Creation-Date: 2019-08-09 22:24+0000\n"
+"PO-Revision-Date: 2019-08-20 12:08+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"
@@ -20,7 +20,7 @@ msgstr ""
 "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: Gtranslator 3.32.1\n"

 #: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
 msgid "GNOME Classic"
@@ -34,7 +34,7 @@ msgstr "Esta sesión inicia GNOME clásico"
 msgid "Favorites"
 msgstr "Favoritos"

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

@@ -50,27 +50,39 @@ 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:35
-#| msgid "Workspace Names"
-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:243
+#: extensions/auto-move-windows/prefs.js:71
+#: extensions/auto-move-windows/prefs.js:134
+msgid "Workspace"
+msgstr "Área de trabajo"
+
+#: extensions/auto-move-windows/prefs.js:89
 msgid "Add Rule"
 msgstr "Añadir regla"

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

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

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

@@ -103,8 +115,8 @@ msgstr ""
 "los sitúa por debajo. Cambiar esta configuración requiere reiniciar la shell "
 "para que tenga efecto."

-#: extensions/places-menu/extension.js:89
-#: extensions/places-menu/extension.js:93
+#: extensions/places-menu/extension.js:80
+#: extensions/places-menu/extension.js:84
 msgid "Places"
 msgstr "Lugares"

@@ -123,11 +135,11 @@ msgstr "Falló al montar el volumen para «%s»"
 msgid "Computer"
 msgstr "Equipo"

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

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

@@ -147,47 +159,47 @@ 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:98
+#: extensions/window-list/extension.js:99
 msgid "Close"
 msgstr "Cerrar"

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

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

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

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

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

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

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

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

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

-#: extensions/window-list/extension.js:737
+#: extensions/window-list/extension.js:741
 msgid "Window List"
 msgstr "Lista de ventanas"

@@ -204,11 +216,15 @@ 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:100
+#: extensions/window-list/prefs.js:82
+#| msgid "Show only windows in the current workspace"
 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 the window list on all connected monitors or only on the "
+#| "primary one."
 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 "
@@ -226,59 +242,44 @@ 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:29
+#: extensions/window-list/prefs.js:25
 msgid "Window Grouping"
 msgstr "Agrupación de ventanas"

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

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

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

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

-#: extensions/window-list/workspaceIndicator.js:209
-#: extensions/workspace-indicator/extension.js:215
+#: extensions/window-list/workspaceIndicator.js:211
+#: extensions/workspace-indicator/extension.js:216
 msgid "Workspace Indicator"
 msgstr "Indicador de área de trabajo"

-#: extensions/workspace-indicator/prefs.js:34
+#: extensions/workspace-indicator/prefs.js:131
 msgid "Workspace Names"
 msgstr "Nombres de los áreas de trabajo"

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

-#: extensions/workspace-indicator/prefs.js:218
-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"

--- a/po/eu.po
+++ b/po/eu.po
@@ -5,14 +5,14 @@
 # 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.
+# Asier Sarasua Garmendia  <asier.sarasua@gmail.com>, 2019.
 #
 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-08-10 00:42+0200\n"
-"Last-Translator: Asier Sarasua Garmendia <asiersarasua@ni.eus>\n"
+"POT-Creation-Date: 2019-08-11 13:48+0000\n"
+"PO-Revision-Date: 2019-08-12 00:42+0200\n"
+"Last-Translator: Asier Sarasua Garmendia <asier.sarasua@gmail.com>\n"
 "Language-Team: Basque <librezale@librezale.eus>\n"
 "Language: eu\n"
 "MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@ msgstr "Saio honek GNOME Klasikoa hasten du"
 msgid "Favorites"
 msgstr "Gogokoak"

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

@@ -48,26 +48,39 @@ msgid ""
 "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"

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

-#: extensions/auto-move-windows/prefs.js:243
+#: extensions/auto-move-windows/prefs.js:71
+#: extensions/auto-move-windows/prefs.js:134
+msgid "Workspace"
+msgstr "Laneko area"
+
+#: extensions/auto-move-windows/prefs.js:89
 msgid "Add Rule"
 msgstr "Gehitu araua"

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

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

-#: extensions/drive-menu/extension.js:155
+#: extensions/drive-menu/extension.js:145
 msgid "Open Files"
 msgstr "Ireki fitxategiak"

@@ -93,8 +106,8 @@ msgid ""
 "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."

-#: extensions/places-menu/extension.js:89
-#: extensions/places-menu/extension.js:93
+#: extensions/places-menu/extension.js:80
+#: extensions/places-menu/extension.js:84
 msgid "Places"
 msgstr "Lekuak"

@@ -113,11 +126,11 @@ msgstr "Huts egin du “%s“(r)en bolumena muntatzean"
 msgid "Computer"
 msgstr "Ordenagailua"

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

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

@@ -157,27 +170,27 @@ msgstr "Desmaximizatu"
 msgid "Maximize"
 msgstr "Maximizatu"

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

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

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

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

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

-#: extensions/window-list/extension.js:734
+#: extensions/window-list/extension.js:740
 msgid "Window List"
 msgstr "Leiho-zerrenda"

@@ -192,7 +205,7 @@ msgid ""
 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:100
+#: extensions/window-list/prefs.js:82
 msgid "Show windows from all workspaces"
 msgstr "Erakutsi laneko area guztietako leihoak"

@@ -210,56 +223,44 @@ msgid ""
 "primary one."
 msgstr "Leihoen zerrenda konektatutako pantaila guztietan edo soilik pantaila nagusian erakutsiko den."

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

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

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

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

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

-#: extensions/window-list/workspaceIndicator.js:207
-#: extensions/workspace-indicator/extension.js:213
+#: extensions/window-list/workspaceIndicator.js:211
+#: extensions/workspace-indicator/extension.js:216
 msgid "Workspace Indicator"
 msgstr "Lan arearen adierazlea"

-#: extensions/workspace-indicator/prefs.js:34
+#: extensions/workspace-indicator/prefs.js:131
 msgid "Workspace Names"
 msgstr "Laneko areen izenak"

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

-#: extensions/workspace-indicator/prefs.js:218
-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"

--- a/po/fa.po
+++ b/po/fa.po
@@ -1,16 +1,15 @@
 # Persian translation for gnome-shell-extensions.
 # Copyright (C) 2011 Iranian Free Software Users Group (IFSUG.org) translation team.
 # This file is distributed under the same license as the gnome-shell-extensions package.
-# Arash Mousavi <mousavi.arash@gmail.com>, 2011-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: 2020-05-03 17:53+0000\n"
-"PO-Revision-Date: 2020-05-12 14:25+0000\n"
+"POT-Creation-Date: 2019-08-09 22:24+0000\n"
+"PO-Revision-Date: 2019-08-14 11:48+0430\n"
 "Last-Translator: Danial Behzadi <dani.behzi@ubuntu.com>\n"
 "Language-Team: Persian <>\n"
 "Language: fa\n"
@@ -18,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 2.3\n"
+"X-Generator: Poedit 2.2.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"

 #: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
@@ -31,9 +30,9 @@ msgstr "این نشست شما را به گنوم کلاسیک وارد می‌

 #: extensions/apps-menu/extension.js:113
 msgid "Favorites"
-msgstr "برگزیده‌ها"
+msgstr "علاقه‌مندی‌ها"

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

@@ -49,26 +48,39 @@ 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:71
+#: extensions/auto-move-windows/prefs.js:134
+msgid "Workspace"
+msgstr "فضای‌کاری"
+
+#: extensions/auto-move-windows/prefs.js:89
 msgid "Add Rule"
 msgstr "افزودن قاعده"

+#: extensions/auto-move-windows/prefs.js:111
+msgid "Create new matching rule"
+msgstr "افزودن یک قاعده‌ی منطبق جدید"
+
+#: extensions/auto-move-windows/prefs.js:117
+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:102
+#: extensions/places-menu/placeDisplay.js:232
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "بیرون دادن دیسک‌گردان «%s» شکست خورد:"

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

-#: extensions/drive-menu/extension.js:155
+#: extensions/drive-menu/extension.js:145
 msgid "Open Files"
 msgstr "گشودن پرونده‌ها"

@@ -100,7 +112,7 @@ msgstr ""
 "شل در پایین را تغییر می‌دهد. تغییر این گزینه، نیاز به راه‌اندازی مجدد شل دارد تا "
 "تاثیر بگذارد."

-#: extensions/places-menu/extension.js:89 extensions/places-menu/extension.js:93
+#: extensions/places-menu/extension.js:80 extensions/places-menu/extension.js:84
 msgid "Places"
 msgstr "مکان‌ها"

@@ -119,11 +131,11 @@ msgstr "شکست در سوار کردن حجم برای «%s»"
 msgid "Computer"
 msgstr "رایانه"

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

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

@@ -143,47 +155,47 @@ 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:98
+#: extensions/window-list/extension.js:99
 msgid "Close"
 msgstr "خروج"

-#: extensions/window-list/extension.js:118
+#: extensions/window-list/extension.js:119
 msgid "Unminimize"
 msgstr "ناکمینه"

-#: extensions/window-list/extension.js:118
+#: extensions/window-list/extension.js:119
 msgid "Minimize"
 msgstr "کمینه"

-#: extensions/window-list/extension.js:125
+#: extensions/window-list/extension.js:126
 msgid "Unmaximize"
 msgstr "نابیشینه"

-#: extensions/window-list/extension.js:125
+#: extensions/window-list/extension.js:126
 msgid "Maximize"
 msgstr "بیشنه"

-#: extensions/window-list/extension.js:429
+#: extensions/window-list/extension.js:431
 msgid "Minimize all"
 msgstr "کمینهٔ همه"

-#: extensions/window-list/extension.js:435
+#: extensions/window-list/extension.js:437
 msgid "Unminimize all"
 msgstr "ناکمینهٔ همه"

-#: extensions/window-list/extension.js:441
+#: extensions/window-list/extension.js:443
 msgid "Maximize all"
 msgstr "بیشینهٔ همه"

-#: extensions/window-list/extension.js:449
+#: extensions/window-list/extension.js:451
 msgid "Unmaximize all"
 msgstr "نابیشینهٔ همه"

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

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

@@ -200,7 +212,7 @@ msgstr ""
 "ممکن عبارتند از «never»، «auto» و «always»."

 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-#: extensions/window-list/prefs.js:100
+#: extensions/window-list/prefs.js:82
 msgid "Show windows from all workspaces"
 msgstr "نمایش پنجره‌ها از تمام فضاهای کاری"

@@ -220,59 +232,44 @@ msgstr ""
 "اینکه آیا فهرست پنجره‌ها در تمام نمایشگرهای متصل نمایش داده شود یا فقط در نمایشگر "
 "اصلی."

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

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

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

-#: extensions/window-list/prefs.js:60
+#: extensions/window-list/prefs.js:49
 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:209
-#: extensions/workspace-indicator/extension.js:215
+#: extensions/window-list/workspaceIndicator.js:211
+#: extensions/workspace-indicator/extension.js:216
 msgid "Workspace Indicator"
 msgstr "نشانگر فضای‌کاری"

-#: extensions/workspace-indicator/prefs.js:34
+#: extensions/workspace-indicator/prefs.js:131
 msgid "Workspace Names"
 msgstr "نام‌های فضای کاری"

-#: extensions/workspace-indicator/prefs.js:67
+#: extensions/workspace-indicator/prefs.js:151
+msgid "Name"
+msgstr "نام"
+
+#: extensions/workspace-indicator/prefs.js:191
 #, javascript-format
 msgid "Workspace %d"
 msgstr "فضای کاری %Id"

-#: extensions/workspace-indicator/prefs.js:218
-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 به پنجره والد"

--- a/po/fi.po
+++ b/po/fi.po
@@ -12,8 +12,8 @@ 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-16 18:17+0300\n"
+"POT-Creation-Date: 2019-08-09 22:24+0000\n"
+"PO-Revision-Date: 2019-08-17 16:00+0300\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos+l10n@iki.fi>\n"
 "Language-Team: suomi <lokalisointi-lista@googlegroups.com>\n"
 "Language: fi\n"
@@ -21,7 +21,7 @@ msgstr ""
 "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.6\n"
 "X-Project-Style: gnome\n"
 "X-POT-Import-Date: 2012-03-05 15:06:12+0000\n"

@@ -37,7 +37,7 @@ msgstr "Tämä istunto kirjaa sinut perinteiseen Gnomeen"
 msgid "Favorites"
 msgstr "Suosikit"

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

@@ -51,26 +51,39 @@ msgid ""
 "followed by a colon and the workspace number"
 msgstr ""

-#: 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:71
+#: extensions/auto-move-windows/prefs.js:134
+msgid "Workspace"
+msgstr "Työtila"
+
+#: extensions/auto-move-windows/prefs.js:89
 msgid "Add Rule"
 msgstr "Lisää sääntö"

+#: extensions/auto-move-windows/prefs.js:111
+msgid "Create new matching rule"
+msgstr "Luo uusi vastaava sääntö"
+
+#: extensions/auto-move-windows/prefs.js:117
+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:102
+#: extensions/places-menu/placeDisplay.js:232
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "Aseman “%s” irrottaminen epäonnistui:"

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

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

@@ -99,8 +112,8 @@ 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:80
+#: extensions/places-menu/extension.js:84
 msgid "Places"
 msgstr "Sijainnit"

@@ -119,11 +132,11 @@ msgstr "Taltion “%s” liittäminen epäonnistui"
 msgid "Computer"
 msgstr "Tietokone"

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

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

@@ -145,47 +158,47 @@ 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:99
 msgid "Close"
 msgstr "Sulje"

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

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

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

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

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

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

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

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

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

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

@@ -202,7 +215,7 @@ 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
+#: extensions/window-list/prefs.js:82
 msgid "Show windows from all workspaces"
 msgstr "Näytä ikkunat kaikista työtiloista"

@@ -224,56 +237,44 @@ 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:25
 msgid "Window Grouping"
 msgstr "Ikkunoiden ryhmitys"

-#: extensions/window-list/prefs.js:58
+#: extensions/window-list/prefs.js:47
 msgid "Never group windows"
 msgstr "Älä ryhmitä ikkunoita koskaan"

-#: extensions/window-list/prefs.js:59
+#: extensions/window-list/prefs.js:48
 msgid "Group windows when space is limited"
 msgstr "Ryhmitä ikkunat tilan ollessa rajallinen"

-#: extensions/window-list/prefs.js:60
+#: extensions/window-list/prefs.js:49
 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
+#: extensions/window-list/workspaceIndicator.js:211
+#: extensions/workspace-indicator/extension.js:216
 msgid "Workspace Indicator"
 msgstr "Työtilan ilmaisin"

-#: extensions/workspace-indicator/prefs.js:34
+#: extensions/workspace-indicator/prefs.js:131
 msgid "Workspace Names"
 msgstr "Työtilojen nimet"

-#: extensions/workspace-indicator/prefs.js:67
+#: extensions/workspace-indicator/prefs.js:151
+msgid "Name"
+msgstr "Nimi"
+
+#: extensions/workspace-indicator/prefs.js:191
 #, 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"

--- a/po/fr.po
+++ b/po/fr.po
@@ -10,8 +10,8 @@ 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-08-10 12:50+0200\n"
+"POT-Creation-Date: 2019-08-09 22:24+0000\n"
+"PO-Revision-Date: 2019-08-25 10:43+0200\n"
 "Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "Language: fr\n"
@@ -32,7 +32,7 @@ msgstr "Cette session vous connecte à GNOME Classique"
 msgid "Favorites"
 msgstr "Favoris"

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

@@ -49,26 +49,39 @@ msgstr ""
 "d’application (nom de fichier desktop), suivi par un deux-points et le "
 "numéro de l’espace de travail"

-#: extensions/auto-move-windows/prefs.js:35
-msgid "Workspace Rules"
-msgstr "Règles des espaces de travail"
+#: extensions/auto-move-windows/prefs.js:60
+msgid "Application"
+msgstr "Application"

-#: extensions/auto-move-windows/prefs.js:243
+#: extensions/auto-move-windows/prefs.js:71
+#: extensions/auto-move-windows/prefs.js:134
+msgid "Workspace"
+msgstr "Espace de travail"
+
+#: extensions/auto-move-windows/prefs.js:89
 msgid "Add Rule"
 msgstr "Ajouter une règle"

+#: extensions/auto-move-windows/prefs.js:111
+msgid "Create new matching rule"
+msgstr "Créer une nouvelle règle de concordance"
+
+#: extensions/auto-move-windows/prefs.js:117
+msgid "Add"
+msgstr "Ajouter"
+
 #. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:112
-#: extensions/places-menu/placeDisplay.js:233
+#: extensions/drive-menu/extension.js:102
+#: extensions/places-menu/placeDisplay.js:232
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "L’éjection du disque « %s » a échoué :"

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

-#: extensions/drive-menu/extension.js:155
+#: extensions/drive-menu/extension.js:145
 msgid "Open Files"
 msgstr "Ouvrir Fichiers"

@@ -102,8 +115,8 @@ msgstr ""
 "dessous. Pour que ce paramètre soit pris en compte, il faut redémarrer le "
 "Shell."

-#: extensions/places-menu/extension.js:89
-#: extensions/places-menu/extension.js:93
+#: extensions/places-menu/extension.js:80
+#: extensions/places-menu/extension.js:84
 msgid "Places"
 msgstr "Emplacements"

@@ -122,11 +135,11 @@ msgstr "Impossible de monter le volume « %s »"
 msgid "Computer"
 msgstr "Ordinateur"

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

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

@@ -146,47 +159,47 @@ msgstr "Nom du thème"
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "Le nom du thème, à charger à partir de ~/.themes/name/gnome-shell"

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

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

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

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

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

-#: extensions/window-list/extension.js:428
+#: extensions/window-list/extension.js:431
 msgid "Minimize all"
 msgstr "Tout réduire"

-#: extensions/window-list/extension.js:434
+#: extensions/window-list/extension.js:437
 msgid "Unminimize all"
 msgstr "Tout restaurer"

-#: extensions/window-list/extension.js:440
+#: extensions/window-list/extension.js:443
 msgid "Maximize all"
 msgstr "Tout maximiser"

-#: extensions/window-list/extension.js:448
+#: extensions/window-list/extension.js:451
 msgid "Unmaximize all"
 msgstr "Tout restaurer"

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

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

@@ -204,7 +217,7 @@ msgstr ""
 "« always » (toujours)."

 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-#: extensions/window-list/prefs.js:100
+#: extensions/window-list/prefs.js:82
 msgid "Show windows from all workspaces"
 msgstr "Afficher les fenêtres de tous les espaces de travail"

@@ -226,43 +239,40 @@ msgstr ""
 "Indique s’il faut afficher la liste des fenêtres sur tous les écrans "
 "connectés ou seulement l’écran principal."

-#: extensions/window-list/prefs.js:29
+#: extensions/window-list/prefs.js:25
 msgid "Window Grouping"
 msgstr "Regroupement de fenêtres"

-#: extensions/window-list/prefs.js:58
+#: extensions/window-list/prefs.js:47
 msgid "Never group windows"
 msgstr "Ne jamais regrouper les fenêtres"

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

-#: extensions/window-list/prefs.js:60
+#: extensions/window-list/prefs.js:49
 msgid "Always group windows"
 msgstr "Toujours regrouper les fenêtres"

-#: extensions/window-list/prefs.js:94
+#: extensions/window-list/prefs.js:75
 msgid "Show on all monitors"
 msgstr "Afficher sur tous les écrans"

-#: extensions/window-list/workspaceIndicator.js:207
-#: extensions/workspace-indicator/extension.js:213
+#: extensions/window-list/workspaceIndicator.js:211
+#: extensions/workspace-indicator/extension.js:216
 msgid "Workspace Indicator"
 msgstr "Indicateur d’espace de travail"

-#: extensions/workspace-indicator/prefs.js:34
+#: extensions/workspace-indicator/prefs.js:131
 msgid "Workspace Names"
 msgstr "Noms des espaces de travail"

-#: extensions/workspace-indicator/prefs.js:67
+#: extensions/workspace-indicator/prefs.js:151
+msgid "Name"
+msgstr "Nom"
+
+#: extensions/workspace-indicator/prefs.js:191
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Espace de travail %d"
-
-#: extensions/workspace-indicator/prefs.js:218
-msgid "Add Workspace"
-msgstr "Ajouter un espace de travail"
-
-#~ msgid "Create new matching rule"
-#~ msgstr "Créer une nouvelle règle de concordance"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Marco Trevisan (Treviño)	c7a08aaf74	New upstream version 3.35.91	2020-02-24 14:48:45 +01:00
Laurent Bigonville	8c1d6d88cf	New upstream version 3.34.2	2019-12-30 00:41:31 +01:00
Florian Müllner	33b16681c6	Bump version to 3.34.2 Update NEWS.	2019-12-11 22:56:08 +01:00
Umarzuki Bin Mochlis Moktar	3c51716268	Update Malay translation	2019-12-09 11:59:58 +00:00
Willy Stadnick	e5421b6cc6	screenshot-window-sizer: Fix cycling through all valid sizes When cycling through window sizes, we should skip any sizes that are bigger than the available area. We do that, but the current code assumes that the possible sizes are sorted, which is no longer the case since the addition of "phone" sizes in commit `5b43d4733c`. As a result, we may now skip sizes that would fit perfectly fine. Address this by filtering out invalid sizes beforehand instead of assuming a certain order (wich no longer work due to the addition of a portrait format). https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/97	2019-11-27 20:56:55 +01:00
Florian Müllner	f1e7ae1010	workspace-indicator: Exclude DESKTOP windows from window previews While nautilus removed its desktop support a while ago in favor of an extension, it's still possible that some external X11 desktop icon app is used. As DESKTOP windows cannot be moved between workspaces or stacked, and aren't perceived as regular windows, it doesn't make sense to show them as previews in the workspace switcher. https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/93	2019-11-21 22:47:01 +01:00
Florian Müllner	10fe907c83	window-list: Exclude DESKTOP windows from window previews While nautilus removed its desktop support a while ago in favor of an extension, it's still possible that some external X11 desktop icon app is used. As DESKTOP windows cannot be moved between workspaces or stacked, and aren't perceived as regular windows, it doesn't make sense to show them as previews in the workspace switcher. https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/93	2019-11-21 22:47:01 +01:00
Stas Solovey	ae9809caba	Update Russian translation	2019-11-13 18:42:24 +00:00
Jeremy Bicha	c95d197c5c	New upstream version 3.34.1	2019-10-08 22:45:42 -04:00
Iain Lane	ae8749b7e1	New upstream version 3.34.0	2019-09-10 10:53:04 +01:00
Iain Lane	84a548c0b9	New upstream version 3.33.92	2019-09-05 18:21:22 +01:00
Marco Trevisan (Treviño)	f047cb0baf	New upstream version 3.33.90	2019-08-13 04:25:54 +02:00
Iain Lane	28494941e1	New upstream version 3.32.0	2019-03-12 16:33:30 +00:00
Iain Lane	b70059ac4d	New upstream version 3.31.92	2019-03-06 15:39:47 +00:00
Iain Lane	eb567c1120	New upstream version 3.31.90	2019-02-21 10:08:46 +00:00
Simon McVittie	b1eb9b9080	New upstream version 3.30.1	2018-11-02 09:22:09 +00:00
Jeremy Bicha	a0b6535210	New upstream version 3.30.0	2018-09-05 12:32:25 -04:00
Simon McVittie	9a9b3afa31	New upstream version 3.29.91	2018-08-20 19:55:42 +01:00
Simon McVittie	59bc054ef6	New upstream version 3.29.90	2018-08-02 10:32:10 +01:00
Simon McVittie	57e9dfe722	Merge remote-tracking branch 'origin/upstream/latest' into upstream/latest	2018-07-27 09:14:56 +01:00
Simon McVittie	f17a519c38	New upstream version 3.29.3	2018-07-27 08:43:26 +01:00
Jeremy Bicha	8223ca9739	New upstream version 3.28.1	2018-05-14 21:50:46 -04:00
Jeremy Bicha	fe20c27b60	New upstream version 3.28.0	2018-03-15 21:28:20 -04:00
Jeremy Bicha	5ba59d1096	New upstream version 3.27.92	2018-03-05 20:55:43 -05:00
Jeremy Bicha	0ad1e9bbc1	New upstream version 3.27.91	2018-02-23 19:30:14 -05:00
Jeremy Bicha	5ea14f063f	New upstream version 3.26.2	2017-12-15 15:11:42 -05:00
Jeremy Bicha	3cc3d03f0b	Initial upstream branch	2017-12-15 15:11:26 -05:00
Florian Müllner	057e5bb0c1	Bump version to 3.26.2 Update NEWS.	2017-11-02 19:51:10 +01:00
Florian Müllner	07fc66765d	auto-move: Remove unused imports	2017-10-27 14:45:09 +02:00
Xavi Ivars	daa7b9b6ab	[l10n] Updated Catalan (Valencian) translation	2017-10-05 14:02:06 +02:00
				`@@ -0,0 +1 @@`
				`/* This extensions requires no special styling */`