New upstream version 3.33.90

Update NEWS.

.eslintrc.json

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

.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

.gitlab-ci.yml

@@ -1,13 +0,0 @@
-image: fedora:latest
-
-stages:
- - build
-
-before_script:
-  - dnf install -y meson gettext mozjs52-devel
-
-build-shell-extensions:
-  stage: build
-  script:
-    - meson _build .
-    - ninja -C _build test install

.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

NEWS

@@ -1,3 +1,101 @@
+3.33.90
+=======
+* window-list: Support showing windows from all workspaces [Florian; #154]
+* Misc. bug fixes and cleanups [Florian; !86, !87]
+
+Contributors:
+  Florian Müllner
+
+Translators:
+  Jor Teron [mjw]
+
+3.33.4
+======
+* Make GNOME Classic more classic:
+  - Disable GNOME 3 overview [Florian; !69]
+  - Add window picker button to window list [Florian; !73, !80]
+  - Style improvements and fixes [Jakub; #169, !82]
+  - Support horizontal workspace layout in window list [Florian; !70]
+  - Add draggable previews to window list workspace switcher [Florian; !74]
+  - Arrange workspaces horizontally [Florian; !72]
+* workspace-indicator: Support horizontal workspace layout [Florian; !71]
+* workspace-indicator: Add draggable previews [Florian; !77]
+* Misc. bug fixes and cleanups [Florian; !75, !76, !79, !78, #168, !84]
+
+Contributors:
+  Florian Müllner, Jakub Steiner, Jor Teron
+
+Translators:
+  Jor Teron [mjw]
+
+3.33.3
+======
+* Misc. bug fixes [Florian, Marco; !67, !68]
+
+Contributors:
+  Florian Müllner, Marco Trevisan (Treviño)
+
+3.33.2
+======
+* Misc. bug fixes and cleanups [Florian; !66]
+
+Contributors:
+  Florian Müllner
+
+3.33.1
+======
+* Misc. bug fixes [Florian; !64]
+
+Contributors:
+  Florian Müllner
+
+3.32.1
+======
+* Fix windowsNavigator extension after ES6 port [Florian; #143]
+* screenshot-window-sizer: Add phone screenshot sizes [Adrien; !65]
+* Misc. bug fixes and cleanups [Fabian; !62]
+
+Contributors:
+  Florian Müllner, Adrien Plazas, Fabian P. Schmidt
+
+3.32.0
+======
+
+Contributors:
+  Florian Müllner
+
+Translations:
+  Victor Ibragimov [tg], Kristjan SCHMIDT [eo], Mart Raudsepp [et]
+
+3.31.92
+=======
+* Misc. bug fixes and cleanups [Florian; !57, !58, !59, !60]
+
+Contributors:
+  Florian Müllner
+
+3.31.91
+=======
+* apps-menu: Remove outdated legacy-tray handling [Florian; !53]
+* user-theme: Allow using XDG user data dir [Tomasz; !55]
+* Misc. bug fixes and cleanups [Florian; !52, !54, !56]
+
+Contributors:
+  Tomasz Gąsior, Florian Müllner
+
+Translators:
+  Matej Urbančič [sl], Gun Chleoc [gd]
+
+3.31.90
+=======
+* Misc. bug fixes and cleanups [Florian; !49, !50, !51]
+
+Contributors:
+  Florian Müllner
+
+Translators:
+  Ryuta Fujii [ja], Charles Monzat [fr], Pieter Schalk Schoeman [af]
+
 3.31.2
 ======
 * Remove obsolete alternate-tab extension [Florian; #786496]

README.md

@@ -15,6 +15,12 @@ Bugs should be reported to the GNOME [bug tracking system][bug-tracker].
 
 ## Extensions
 
+ * alternate-tab (**OBSOLETE**)
+ 
+     Lets you use classic Alt+Tab (window-based instead of app-based) in GNOME Shell.
+     This extension is obsolete since GNOME 3.30, see [this blogpost][alternatetab-post]
+     for further details.
+
  * apps-menu
 
      Lets you reach an application using gnome 2.x style menu on the panel.
@@ -74,3 +80,4 @@ file for details.
 [shell-page]: https://wiki.gnome.org/Projects/GnomeShell
 [bug-tracker]: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/issues
 [license]: COPYING
+[alternatetab-post]: https://blogs.gnome.org/fmuellner/2018/10/11/the-future-of-alternatetab-and-why-you-need-not-worry/

data/classic.json.in

@@ -1,8 +1,9 @@
 {
     "parentMode": "user",
     "stylesheetName": "gnome-classic.css",
+    "hasOverview": false,
     "enabledExtensions": [@CLASSIC_EXTENSIONS@],
-    "panel": { "left": ["activities", "appMenu"],
+    "panel": { "left": ["appMenu"],
                "center": [],
                "right": ["a11y", "keyboard", "dateMenu", "aggregateMenu"]
              }

data/gnome-classic.scss

@@ -32,18 +32,20 @@ $variant: 'light';
     font-weight: normal;
     color: $fg_color;
     text-shadow: none;
-    &:active, &:overview, &:focus, &:checked {
-      // Trick due to St limitations. It needs a background to draw
-      // a box-shadow
-      background-color: $selected_bg_color !important;
-      color: $selected_fg_color !important;
-      box-shadow: none;
-      & > .system-status-icon { icon-shadow: none; }
-    }
     &:hover {
+      color: lighten($fg_color,10%);
       text-shadow: none;
       & .system-status-icon { icon-shadow: none; }
     }
+    &:active, &:overview, &:focus, &:checked {
+      // Trick due to St limitations. It needs a background to draw
+      // a box-shadow
+      background-color: $selected_bg_color;
+      color: $selected_fg_color;
+      box-shadow: none;
+      & > .system-status-icon { icon-shadow: none; }
+    }
+
     .app-menu-icon { width: 0; height: 0; margin: 0; } // shell's display:none; :D
 
     .system-status-icon {
@@ -60,9 +62,9 @@ $variant: 'light';
   &.lock-screen,
   &.unlock-screen, 
   &.login-screen { 
-    background-color: transparentize($_bubble_bg_color, 0.5);
-    background-gradient-start: transparentize($_bubble_bg_color, 0.5);
-    background-gradient-end: transparentize($_bubble_bg_color, 0.5);
+    background-color: transparentize($bg_color, 0.5);
+    background-gradient-start: transparentize($bg_color, 0.5);
+    background-gradient-end: transparentize($bg_color, 0.5);
     border-bottom: none;
     .panel-button { color: $osd_fg_color; }
   }
@@ -91,15 +93,3 @@ $variant: 'light';
   background-image: url("calendar-today.svg");
 }
 
-.message-list-clear-button.button {
-  color: $fg_color
-}
-
-.notification-banner {
-  background-color: $bg_color !important;
-  color: $fg_color;
-  .notification-button {
-    background-color: darken($bg_color,5%);
-    &:hover, &focus { background-color: darken($bg_color,2%); }
-  }
-}

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.

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

data/gnome-shell-sass/_colors.scss

@@ -0,0 +1,45 @@
+// When color definition differs for dark and light variant,
+// it gets @if ed depending on $variant
+
+
+$base_color: if($variant == 'light', #ffffff, lighten(desaturate(#241f31, 20%), 2%));
+$bg_color: if($variant == 'light', #f6f5f4, darken(desaturate(#3d3846, 100%), 4%));
+$fg_color: if($variant == 'light', #2e3436, #eeeeec);
+
+$selected_fg_color: #ffffff;
+$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, 10%));
+$borders_edge: if($variant == 'light', transparentize(white, 0.2), transparentize($fg_color, 0.93));
+$link_color: if($variant == 'light', darken($selected_bg_color, 10%), lighten($selected_bg_color, 20%));
+$link_visited_color: if($variant == 'light', darken($selected_bg_color, 20%), lighten($selected_bg_color, 10%));
+$top_hilight: $borders_edge;
+
+$warning_color: #f57900;
+$error_color: #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);
+
+$tooltip_borders_color: $osd_outer_borders_color;
+$shadow_color: transparentize(black, 0.9);
+
+//insensitive state derived colors
+$insensitive_fg_color: mix($fg_color, $bg_color, 50%);
+$insensitive_bg_color: mix($bg_color, $base_color, 60%);
+$insensitive_borders_color: $borders_color;
+
+//colors for the backdrop state, derived from the main colors.
+$backdrop_base_color: if($variant =='light', darken($base_color,1%), lighten($base_color,1%));
+$backdrop_bg_color: $bg_color;
+$backdrop_fg_color: mix($fg_color, $backdrop_bg_color, 80%);
+$backdrop_insensitive_color: if($variant =='light', darken($backdrop_bg_color,15%), lighten($backdrop_bg_color,15%));
+$backdrop_borders_color: mix($borders_color, $bg_color, 90%);
+$backdrop_dark_fill: mix($backdrop_borders_color,$backdrop_bg_color, 35%);

data/gnome-shell-sass/_drawing.scss

@@ -0,0 +1,202 @@
+// Drawing mixins
+
+// generic drawing of more complex things
+
+@function _widget_edge($c:$borders_edge) {
+// outer highlight "used" on most widgets
+  @return 0 1px $c;
+}
+
+// provide font size in rem, with px fallback
+@mixin fontsize($size: 24, $base: 16) {
+  font-size: round($size) + pt;
+  //font-size: ($size / $base) * 1rem;
+}
+
+@mixin _shadows($shadow1, $shadow2:none, $shadow3:none, $shadow4:none) {
+//
+// Helper function to stack up to 4 box-shadows;
+//
+  @if $shadow4!=none { box-shadow: $shadow1, $shadow2, $shadow3, $shadow4; }
+  @else if $shadow3!=none { box-shadow: $shadow1, $shadow2, $shadow3; }
+  @else if $shadow2!=none { box-shadow: $shadow1, $shadow2; }
+  @else { box-shadow: $shadow1; }
+}
+
+// entries
+
+@mixin entry($t, $fc:$selected_bg_color, $edge: $borders_edge) {
+//
+// Entries drawing function
+//
+// $t: entry type
+// $fc: focus color
+// $edge: set to none to not draw the bottom edge or specify a color to not
+//        use the default one
+//
+// possible $t values:
+// normal, focus, insensitive
+//
+
+  @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%));
+  }
+  @if $t==hover { }
+  @if $t==insensitive {
+    color: $insensitive_fg_color;
+    border-color: $insensitive_bg_color;
+    box-shadow: none;
+  }
+}
+
+// buttons
+
+@function _border_color ($c) { @return darken($c,25%); } // colored buttons want
+                                                         // the border form the
+                                                         // base color
+
+@function _text_shadow_color ($tc:$fg_color, $bg:$bg_color) {
+//
+// calculate the color of text shadows
+//
+// $tc is the text color
+// $bg is the background color
+//
+  $_lbg: lightness($bg)/100%;
+  @if lightness($tc)<50% { @return transparentize(white,1-$_lbg/($_lbg*1.3)); }
+  @else { @return transparentize(black,$_lbg*0.8); }
+}
+
+@function _button_hilight_color($c) {
+//
+// calculate the right top hilight color for buttons
+//
+// $c: base color;
+//
+  @if lightness($c)>90% { @return white; }
+  @else if lightness($c)>80% { @return transparentize(white, 0.3); }
+  @else if lightness($c)>50% { @return transparentize(white, 0.5); }
+  @else if lightness($c)>40% { @return transparentize(white, 0.7); }
+  @else { @return transparentize(white, 0.9); }
+}
+
+@mixin _button_text_shadow ($tc:$fg_color, $bg:$bg_color) {
+//
+// helper function for the text emboss effect
+//
+// $tc is the optional text color, not the shadow color
+//
+// TODO: this functions needs a way to deal with special cases
+//
+
+  $_shadow: _text_shadow_color($tc, $bg);
+
+  @if lightness($tc)<50% {
+    text-shadow: 0 1px $_shadow;
+    icon-shadow: 0 1px $_shadow;
+  }
+  @else {
+    text-shadow: 0 -1px $_shadow;
+    icon-shadow: 0 -1px $_shadow;
+  }
+}
+
+@mixin button($t, $c:$bg_color, $tc:$fg_color, $edge: $borders_edge) {
+//
+// Button drawing function
+//
+// $t:    button type,
+// $c:    base button color for colored* types
+// $tc:   optional text color for colored* types
+// $edge: set to none to not draw the bottom edge or specify a color to not
+//        use the default one
+//
+// possible $t values:
+// normal, hover, active, insensitive, insensitive-active,
+// backdrop, backdrop-active, backdrop-insensitive, backdrop-insensitive-active,
+// osd, osd-hover, osd-active, osd-insensitive, osd-backdrop, undecorated
+//
+
+  $_hilight_color: _button_hilight_color($c);
+  $_button_edge: if($edge == none, none, _widget_edge($edge));
+  $_blank_edge: if($edge == none, none, _widget_edge(transparentize($edge,1)));
+  $_button_shadow: 0 1px 2px transparentize($shadow_color, 0.03);
+
+  @if $t==normal {
+  //
+  // normal button
+  //
+
+    color: $tc;
+    background-color: $c;
+    border-color: $borders_color;
+    box-shadow: $_button_shadow;
+    text-shadow: 0 1px black;
+    icon-shadow: 0 1px black;
+  }
+  @if $t==focus {
+  //
+  // focused button
+  //  
+    color: $tc;
+    text-shadow: 0 1px black;
+    icon-shadow: 0 1px black;
+    box-shadow: inset 0px 0px 0px 2px $selected_bg_color;
+    //border-color: $selected_bg_color;
+  }
+
+  @else if $t==hover {
+  //
+  // active osd button
+  //
+    color: $tc;
+    border-color: $borders_color;
+    background-color: $c;
+    box-shadow: $_button_shadow;
+    text-shadow: 0 1px black;
+    icon-shadow: 0 1px black;
+
+  }
+  @else if $t==active {
+  //
+  // active osd button
+  //
+    color: $tc;
+    border-color: $borders_color;
+    background-color: $c;
+    text-shadow: none;
+    icon-shadow: none;
+    box-shadow: none;
+  }
+  @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;
+  }
+  @else if $t==undecorated {
+  //
+  // reset
+  //
+    border-color: transparent;
+    background-color: transparent;
+    background-image: none;
+
+    @include _shadows(inset 0 1px transparentize(white,1),
+                      $_blank_edge);
+
+    text-shadow: none;
+    icon-shadow: none;
+  }
+}
+

data/gnome-shell-sass/_high-contrast-colors.scss

@@ -0,0 +1,42 @@
+// When color definition differs for dark and light variant,
+// it gets @if ed depending on $variant
+
+
+$base_color: #222;
+$bg_color: #000;
+$fg_color: #fff;
+
+$selected_fg_color: #ffffff;
+$selected_bg_color: darken(#4a90d9,20%);
+$selected_borders_color: darken($selected_bg_color, 20%);
+$borders_color: darken($bg_color,12%);
+$borders_edge: transparentize($fg_color, 0.9);
+$link_color: lighten($selected_bg_color,20%);
+$link_visited_color: lighten($selected_bg_color,10%);
+$top_hilight: $borders_edge;
+
+$warning_color: #f57900;
+$error_color: #cc0000;
+$success_color: darken(#73d216,10%);
+$destructive_color: darken(#ef2929,10%);
+
+$osd_fg_color: #eeeeec;
+$osd_bg_color: #2e3436;
+$osd_borders_color: transparentize(black, 0.3);
+$osd_outer_borders_color: transparentize(white, 0.9);
+
+$tooltip_borders_color: $osd_outer_borders_color;
+$shadow_color: transparentize(black, 0.9);
+
+//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%);

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>

extensions/apps-menu/extension.js

@@ -1,29 +1,20 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* exported init enable disable */
+
+const {
+    Atk, Clutter, Gio, GLib, GMenu, GObject, Gtk, Meta, Shell, St
+} = imports.gi;
+const Signals = imports.signals;
 
-const Atk = imports.gi.Atk;
 const DND = imports.ui.dnd;
-const GMenu = imports.gi.GMenu;
-const GObject = imports.gi.GObject;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
-const Clutter = imports.gi.Clutter;
+const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
-const Meta = imports.gi.Meta;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
-const Gtk = imports.gi.Gtk;
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
-const Signals = imports.signals;
-const Pango = imports.gi.Pango;
 
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
 
-const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
-const Convenience = Me.imports.convenience;
-
 const appSys = Shell.AppSystem.get_default();
 
 const APPLICATION_ICON_SIZE = 32;
@@ -31,44 +22,37 @@ const HORIZ_FACTOR = 5;
 const MENU_HEIGHT_OFFSET = 132;
 const NAVIGATION_REGION_OVERSHOOT = 50;
 
-class ActivitiesMenuItem extends PopupMenu.PopupBaseMenuItem {
-    constructor(button) {
-        super();
-        this._button = button;
-        this.actor.add_child(new St.Label({ text: _("Activities Overview") }));
-    }
-
-    activate(event) {
-        this._button.menu.toggle();
-        Main.overview.toggle();
-        super.activate(event);
-    }
-};
+Gio._promisify(Gio._LocalFilePrototype, 'query_info_async', 'query_info_finish');
+Gio._promisify(Gio._LocalFilePrototype, 'set_attributes_async', 'set_attributes_finish');
 
+var ApplicationMenuItem = GObject.registerClass(
 class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
-    constructor(button, app) {
-        super();
+    _init(button, app) {
+        super._init();
         this._app = app;
         this._button = button;
 
         this._iconBin = new St.Bin();
-        this.actor.add_child(this._iconBin);
+        this.add_child(this._iconBin);
 
-        let appLabel = new St.Label({ text: app.get_name(), y_expand: true,
-                                      y_align: Clutter.ActorAlign.CENTER });
-        this.actor.add_child(appLabel);
-        this.actor.label_actor = appLabel;
+        let appLabel = new St.Label({
+            text: app.get_name(),
+            y_expand: true,
+            y_align: Clutter.ActorAlign.CENTER
+        });
+        this.add_child(appLabel);
+        this.label_actor = appLabel;
 
         let textureCache = St.TextureCache.get_default();
         let iconThemeChangedId = textureCache.connect('icon-theme-changed',
-                                                      this._updateIcon.bind(this));
-        this.actor.connect('destroy', () => {
+            this._updateIcon.bind(this));
+        this.connect('destroy', () => {
             textureCache.disconnect(iconThemeChangedId);
         });
         this._updateIcon();
 
-        this.actor._delegate = this;
-        let draggable = DND.makeDraggable(this.actor);
+        this._delegate = this;
+        let draggable = DND.makeDraggable(this);
 
         let maybeStartDrag = draggable._maybeStartDrag;
         draggable._maybeStartDrag = (event) => {
@@ -76,20 +60,15 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
                 return maybeStartDrag.call(draggable, event);
             return false;
         };
-
-        draggable.connect('drag-begin', () => {
-            Shell.util_set_hidden_from_pick(Main.legacyTray.actor, true);
-        });
-        draggable.connect('drag-end', () => {
-            Shell.util_set_hidden_from_pick(Main.legacyTray.actor, false);
-        });
     }
 
     activate(event) {
         this._app.open_new_window(-1);
-        this._button.selectCategory(null, null);
+        this._button.selectCategory(null);
         this._button.menu.toggle();
         super.activate(event);
+
+        Main.overview.hide();
     }
 
     setActive(active, params) {
@@ -111,13 +90,16 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
     }
 
     _updateIcon() {
-        this._iconBin.set_child(this.getDragActor());
+        let icon = this.getDragActor();
+        icon.style_class = 'icon-dropshadow';
+        this._iconBin.set_child(icon);
     }
-};
+});
 
+var CategoryMenuItem = GObject.registerClass(
 class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
-    constructor(button, category) {
-        super();
+    _init(button, category) {
+        super._init();
         this._category = category;
         this._button = button;
 
@@ -128,20 +110,21 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
         if (this._category)
             name = this._category.get_name();
         else
-            name = _("Favorites");
+            name = _('Favorites');
 
-        this.actor.add_child(new St.Label({ text: name }));
-        this.actor.connect('motion-event', this._onMotionEvent.bind(this));
+        this.add_child(new St.Label({ text: name }));
+        this.connect('motion-event', this._onMotionEvent.bind(this));
+        this.connect('notify::active', this._onActiveChanged.bind(this));
     }
 
     activate(event) {
-        this._button.selectCategory(this._category, this);
+        this._button.selectCategory(this._category);
         this._button.scrollToCatButton(this);
         super.activate(event);
     }
 
     _isNavigatingSubmenu([x, y]) {
-        let [posX, posY] = this.actor.get_transformed_position();
+        let [posX, posY] = this.get_transformed_position();
 
         if (this._oldX == -1) {
             this._oldX = x;
@@ -156,11 +139,11 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
         this._oldY = y;
 
         // If it lies outside the x-coordinates then it is definitely outside.
-        if (posX > x || posX + this.actor.width < x)
+        if (posX > x || posX + this.width < x)
             return false;
 
         // If it lies inside the menu item then it is definitely inside.
-        if (posY <= y && posY + this.actor.height >= y)
+        if (posY <= y && posY + this.height >= y)
             return true;
 
         // We want the keep-up triangle only if the movement is more
@@ -181,18 +164,18 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
         // only check for triangle ABC.
         if (posY > y) {
             let offset = posY - y;
-            y = posY + this.actor.height + offset;
+            y = posY + this.height + offset;
         }
 
         // Ensure that A is (0, 0).
         x -= posX;
-        y -= posY + this.actor.height;
+        y -= posY + this.height;
 
         // Check which side of line AB the point P lies on by taking the
         // cross-product of AB and AP. See:
         // http://stackoverflow.com/questions/3461453/determine-which-side-of-a-line-a-point-lies
-        if (((this.actor.width * y) - (NAVIGATION_REGION_OVERSHOOT * x)) <= 0)
-             return true;
+        if (((this.width * y) - (NAVIGATION_REGION_OVERSHOOT * x)) <= 0)
+            return true;
 
         return false;
     }
@@ -201,16 +184,16 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
         if (!Clutter.get_pointer_grab()) {
             this._oldX = -1;
             this._oldY = -1;
-            Clutter.grab_pointer(this.actor);
+            Clutter.grab_pointer(this);
         }
-        this.actor.hover = true;
+        this.hover = true;
 
         if (this._isNavigatingSubmenu(event.get_coords()))
             return true;
 
         this._oldX = -1;
         this._oldY = -1;
-        this.actor.hover = false;
+        this.hover = false;
         Clutter.ungrab_pointer();
 
         let source = event.get_source();
@@ -220,14 +203,14 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
         return false;
     }
 
-    setActive(active, params) {
-        if (active) {
-            this._button.selectCategory(this._category, this);
-            this._button.scrollToCatButton(this);
-        }
-        super.setActive(active, params);
+    _onActiveChanged() {
+        if (!this.active)
+            return;
+
+        this._button.selectCategory(this._category);
+        this._button.scrollToCatButton(this);
     }
-};
+});
 
 class ApplicationsMenu extends PopupMenu.PopupMenu {
     constructor(sourceActor, arrowAlignment, arrowSide, button) {
@@ -239,31 +222,12 @@ class ApplicationsMenu extends PopupMenu.PopupMenu {
         return false;
     }
 
-    open(animate) {
-        this._button.hotCorner.setBarrierSize(0);
-        if (this._button.hotCorner.actor) // fallback corner
-            this._button.hotCorner.actor.hide();
-        super.open(animate);
-    }
-
-    close(animate) {
-        let size = Main.layoutManager.panelBox.height;
-        this._button.hotCorner.setBarrierSize(size);
-        if (this._button.hotCorner.actor) // fallback corner
-            this._button.hotCorner.actor.show();
-        super.close(animate);
-    }
-
     toggle() {
-        if (this.isOpen) {
-            this._button.selectCategory(null, null);
-        } else {
-            if (Main.overview.visible)
-                Main.overview.hide();
-        }
+        if (this.isOpen)
+            this._button.selectCategory(null);
         super.toggle();
     }
-};
+}
 
 class DesktopTarget {
     constructor() {
@@ -272,7 +236,7 @@ class DesktopTarget {
 
         this._windowAddedId =
             global.window_group.connect('actor-added',
-                                        this._onWindowAdded.bind(this));
+                this._onWindowAdded.bind(this));
 
         global.get_window_actors().forEach(a => {
             this._onWindowAdded(a.get_parent(), a);
@@ -316,48 +280,32 @@ class DesktopTarget {
         return source._app.app_info;
     }
 
-    _touchFile(file) {
-        let queryFlags = Gio.FileQueryInfoFlags.NONE;
-        let ioPriority = GLib.PRIORITY_DEFAULT;
-
-        let info = new Gio.FileInfo();
-        info.set_attribute_uint64(Gio.FILE_ATTRIBUTE_TIME_ACCESS,
-                                  GLib.get_real_time());
-        file.set_attributes_async (info, queryFlags, ioPriority, null,
-            (o, res) => {
-                try {
-                    o.set_attributes_finish(res);
-                } catch(e) {
-                    log('Failed to update access time: ' + e.message);
-                }
-            });
-    }
-
-    _markTrusted(file) {
+    async _markTrusted(file) {
         let modeAttr = Gio.FILE_ATTRIBUTE_UNIX_MODE;
         let trustedAttr = 'metadata::trusted';
         let queryFlags = Gio.FileQueryInfoFlags.NONE;
         let ioPriority = GLib.PRIORITY_DEFAULT;
 
-        file.query_info_async(modeAttr, queryFlags, ioPriority, null,
-            (o, res) => {
-                try {
-                    let info = o.query_info_finish(res);
-                    let mode = info.get_attribute_uint32(modeAttr) | 0o100;
+        try {
+            let info = await file.query_info_async(modeAttr, queryFlags, ioPriority, null);
 
-                    info.set_attribute_uint32(modeAttr, mode);
-                    info.set_attribute_string(trustedAttr, 'yes');
-                    file.set_attributes_async (info, queryFlags, ioPriority, null,
-                        (o, res) => {
-                            o.set_attributes_finish(res);
+            let mode = info.get_attribute_uint32(modeAttr) | 0o100;
+            info.set_attribute_uint32(modeAttr, mode);
+            info.set_attribute_string(trustedAttr, 'yes');
+            await file.set_attributes_async(info, queryFlags, ioPriority, null);
 
-                            // Hack: force nautilus to reload file info
-                            this._touchFile(file);
-                        });
-                } catch(e) {
-                    log('Failed to mark file as trusted: ' + e.message);
-                }
-            });
+            // Hack: force nautilus to reload file info
+            info = new Gio.FileInfo();
+            info.set_attribute_uint64(
+                Gio.FILE_ATTRIBUTE_TIME_ACCESS, GLib.get_real_time());
+            try {
+                await file.set_attributes_async(info, queryFlags, ioPriority, null);
+            } catch (e) {
+                log(`Failed to update access time: ${e.message}`);
+            }
+        } catch (e) {
+            log(`Failed to mark file as trusted: ${e.message}`);
+        }
     }
 
     destroy() {
@@ -368,7 +316,7 @@ class DesktopTarget {
         this._setDesktop(null);
     }
 
-    handleDragOver(source, actor, x, y, time) {
+    handleDragOver(source, _actor, _x, _y, _time) {
         let appInfo = this._getSourceAppInfo(source);
         if (!appInfo)
             return DND.DragMotionResult.CONTINUE;
@@ -376,7 +324,7 @@ class DesktopTarget {
         return DND.DragMotionResult.COPY_DROP;
     }
 
-    acceptDrop(source, actor, x, y, time) {
+    acceptDrop(source, _actor, _x, _y, _time) {
         let appInfo = this._getSourceAppInfo(source);
         if (!appInfo)
             return false;
@@ -392,13 +340,13 @@ class DesktopTarget {
             // copy_async() isn't introspectable :-(
             src.copy(dst, Gio.FileCopyFlags.OVERWRITE, null, null);
             this._markTrusted(dst);
-        } catch(e) {
-            log('Failed to copy to desktop: ' + e.message);
+        } catch (e) {
+            log(`Failed to copy to desktop: ${e.message}`);
         }
 
         return true;
     }
-};
+}
 Signals.addSignalMethods(DesktopTarget.prototype);
 
 let ApplicationsButton = GObject.registerClass(
@@ -416,9 +364,11 @@ class ApplicationsButton extends PanelMenu.Button {
 
         let hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
 
-        this._label = new St.Label({ text: _("Applications"),
-                                     y_expand: true,
-                                     y_align: Clutter.ActorAlign.CENTER });
+        this._label = new St.Label({
+            text: _('Applications'),
+            y_expand: true,
+            y_align: Clutter.ActorAlign.CENTER
+        });
         hbox.add_child(this._label);
         hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
 
@@ -426,8 +376,6 @@ class ApplicationsButton extends PanelMenu.Button {
         this.name = 'panelApplications';
         this.label_actor = this._label;
 
-        this.connect('captured-event', this._onCapturedEvent.bind(this));
-
         this._showingId = Main.overview.connect('showing', () => {
             this.add_accessible_state (Atk.StateType.CHECKED);
         });
@@ -435,7 +383,7 @@ class ApplicationsButton extends PanelMenu.Button {
             this.remove_accessible_state (Atk.StateType.CHECKED);
         });
         Main.layoutManager.connect('startup-complete',
-                                   this._setKeybinding.bind(this));
+            this._setKeybinding.bind(this));
         this._setKeybinding();
 
         this._desktopTarget = new DesktopTarget();
@@ -450,14 +398,14 @@ class ApplicationsButton extends PanelMenu.Button {
 
         this._tree = new GMenu.Tree({ menu_basename: 'applications.menu' });
         this._treeChangedId = this._tree.connect('changed',
-                                                 this._onTreeChanged.bind(this));
+            this._onTreeChanged.bind(this));
 
         this._applicationsButtons = new Map();
         this.reloadFlag = false;
         this._createLayout();
         this._display();
         this._installedChangedId = appSys.connect('installed-changed',
-                                                  this._onTreeChanged.bind(this));
+            this._onTreeChanged.bind(this));
     }
 
     _onTreeChanged() {
@@ -469,18 +417,18 @@ class ApplicationsButton extends PanelMenu.Button {
         }
     }
 
-    get hotCorner() {
-        return Main.layoutManager.hotCorners[Main.layoutManager.primaryIndex];
-    }
-
     _createVertSeparator() {
-        let separator = new St.DrawingArea({ style_class: 'calendar-vertical-separator',
-                                             pseudo_class: 'highlighted' });
+        let separator = new St.DrawingArea({
+            style_class: 'calendar-vertical-separator',
+            pseudo_class: 'highlighted'
+        });
         separator.connect('repaint', this._onVertSepRepaint.bind(this));
         return separator;
     }
 
     _onDestroy() {
+        super._onDestroy();
+
         Main.overview.disconnect(this._showingId);
         Main.overview.disconnect(this._hidingId);
         appSys.disconnect(this._installedChangedId);
@@ -488,28 +436,19 @@ class ApplicationsButton extends PanelMenu.Button {
         this._tree = null;
 
         Main.wm.setCustomKeybindingHandler('panel-main-menu',
-                                           Shell.ActionMode.NORMAL |
-                                           Shell.ActionMode.OVERVIEW,
-                                           Main.sessionMode.hasOverview ?
-                                           Main.overview.toggle.bind(Main.overview) :
-                                           null);
+            Shell.ActionMode.NORMAL | Shell.ActionMode.OVERVIEW,
+            Main.sessionMode.hasOverview
+                ? Main.overview.toggle.bind(Main.overview)
+                : null);
 
         this._desktopTarget.destroy();
     }
 
-    _onCapturedEvent(actor, event) {
-        if (event.type() == Clutter.EventType.BUTTON_PRESS) {
-            if (!Main.overview.shouldToggleByCornerOrButton())
-                return true;
-        }
-        return false;
-    }
-
     _onMenuKeyPress(actor, event) {
         let symbol = event.get_key_symbol();
         if (symbol == Clutter.KEY_Left || symbol == Clutter.KEY_Right) {
-            let direction = symbol == Clutter.KEY_Left ? Gtk.DirectionType.LEFT
-                                                       : Gtk.DirectionType.RIGHT;
+            let direction = symbol == Clutter.KEY_Left ?
+                Gtk.DirectionType.LEFT : Gtk.DirectionType.RIGHT;
             if (this.menu.actor.navigate_focus(global.stage.key_focus, direction, false))
                 return true;
         }
@@ -522,7 +461,7 @@ class ApplicationsButton extends PanelMenu.Button {
         let [width, height] = area.get_surface_size();
         let stippleColor = themeNode.get_color('-stipple-color');
         let stippleWidth = themeNode.get_length('-stipple-width');
-        let x = Math.floor(width/2) + 0.5;
+        let x = Math.floor(width / 2) + 0.5;
         cr.moveTo(x, 0);
         cr.lineTo(x, height);
         Clutter.cairo_set_source_color(cr, stippleColor);
@@ -532,21 +471,20 @@ class ApplicationsButton extends PanelMenu.Button {
     }
 
     _onOpenStateChanged(menu, open) {
-       if (open) {
-           if (this.reloadFlag) {
-               this._redisplay();
-               this.reloadFlag = false;
-           }
-           this.mainBox.show();
-       }
-       super._onOpenStateChanged(menu, open);
+        if (open) {
+            if (this.reloadFlag) {
+                this._redisplay();
+                this.reloadFlag = false;
+            }
+            this.mainBox.show();
+        }
+        super._onOpenStateChanged(menu, open);
     }
 
     _setKeybinding() {
         Main.wm.setCustomKeybindingHandler('panel-main-menu',
-                                           Shell.ActionMode.NORMAL |
-                                           Shell.ActionMode.OVERVIEW,
-                                           () => { this.menu.toggle(); });
+            Shell.ActionMode.NORMAL | Shell.ActionMode.OVERVIEW,
+            () => this.menu.toggle());
     }
 
     _redisplay() {
@@ -564,7 +502,7 @@ class ApplicationsButton extends PanelMenu.Button {
                 let id;
                 try {
                     id = entry.get_desktop_file_id(); // catch non-UTF8 filenames
-                } catch(e) {
+                } catch (e) {
                     continue;
                 }
                 let app = appSys.lookup_app(id);
@@ -587,7 +525,7 @@ class ApplicationsButton extends PanelMenu.Button {
         let appsScrollBoxAlloc = this.applicationsScrollBox.get_allocation_box();
         let currentScrollValue = appsScrollBoxAdj.get_value();
         let boxHeight = appsScrollBoxAlloc.y2 - appsScrollBoxAlloc.y1;
-        let buttonAlloc = button.actor.get_allocation_box();
+        let buttonAlloc = button.get_allocation_box();
         let newScrollValue = currentScrollValue;
         if (currentScrollValue > buttonAlloc.y1 - 10)
             newScrollValue = buttonAlloc.y1 - 10;
@@ -602,7 +540,7 @@ class ApplicationsButton extends PanelMenu.Button {
         let catsScrollBoxAlloc = this.categoriesScrollBox.get_allocation_box();
         let currentScrollValue = catsScrollBoxAdj.get_value();
         let boxHeight = catsScrollBoxAlloc.y2 - catsScrollBoxAlloc.y1;
-        let buttonAlloc = button.actor.get_allocation_box();
+        let buttonAlloc = button.get_allocation_box();
         let newScrollValue = currentScrollValue;
         if (currentScrollValue > buttonAlloc.y1 - 10)
             newScrollValue = buttonAlloc.y1 - 10;
@@ -617,9 +555,12 @@ class ApplicationsButton extends PanelMenu.Button {
         this.menu.addMenuItem(section);
         this.mainBox = new St.BoxLayout({ vertical: false });
         this.leftBox = new St.BoxLayout({ vertical: true });
-        this.applicationsScrollBox = new St.ScrollView({ x_fill: true, y_fill: false,
-                                                         y_align: St.Align.START,
-                                                         style_class: 'apps-menu vfade' });
+        this.applicationsScrollBox = new St.ScrollView({
+            x_fill: true,
+            y_fill: false,
+            y_align: St.Align.START,
+            style_class: 'apps-menu vfade'
+        });
         this.applicationsScrollBox.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
         let vscroll = this.applicationsScrollBox.get_vscroll_bar();
         vscroll.connect('scroll-start', () => {
@@ -628,21 +569,22 @@ class ApplicationsButton extends PanelMenu.Button {
         vscroll.connect('scroll-stop', () => {
             this.menu.passEvents = false;
         });
-        this.categoriesScrollBox = new St.ScrollView({ x_fill: true, y_fill: false,
-                                                       y_align: St.Align.START,
-                                                       style_class: 'vfade' });
+        this.categoriesScrollBox = new St.ScrollView({
+            x_fill: true,
+            y_fill: false,
+            y_align: St.Align.START,
+            style_class: 'vfade'
+        });
         this.categoriesScrollBox.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
         vscroll = this.categoriesScrollBox.get_vscroll_bar();
-        vscroll.connect('scroll-start', () => { this.menu.passEvents = true; });
-        vscroll.connect('scroll-stop', () => { this.menu.passEvents = false; });
-        this.leftBox.add(this.categoriesScrollBox, { expand: true,
-                                                     x_fill: true, y_fill: true,
-                                                     y_align: St.Align.START });
-
-        let activities = new ActivitiesMenuItem(this);
-        this.leftBox.add(activities.actor, { expand: false,
-                                             x_fill: true, y_fill: false,
-                                             y_align: St.Align.START });
+        vscroll.connect('scroll-start', () => this.menu.passEvents = true);
+        vscroll.connect('scroll-stop', () => this.menu.passEvents = false);
+        this.leftBox.add(this.categoriesScrollBox, {
+            expand: true,
+            x_fill: true,
+            y_fill: true,
+            y_align: St.Align.START
+        });
 
         this.applicationsBox = new St.BoxLayout({ vertical: true });
         this.applicationsScrollBox.add_actor(this.applicationsBox);
@@ -650,14 +592,22 @@ class ApplicationsButton extends PanelMenu.Button {
         this.categoriesScrollBox.add_actor(this.categoriesBox);
 
         this.mainBox.add(this.leftBox);
-        this.mainBox.add(this._createVertSeparator(), { expand: false, x_fill: false, y_fill: true});
-        this.mainBox.add(this.applicationsScrollBox, { expand: true, x_fill: true, y_fill: true });
+        this.mainBox.add(this._createVertSeparator(), {
+            expand: false,
+            x_fill: false,
+            y_fill: true
+        });
+        this.mainBox.add(this.applicationsScrollBox, {
+            expand: true,
+            x_fill: true,
+            y_fill: true
+        });
         section.actor.add_actor(this.mainBox);
     }
 
     _display() {
         this._applicationsButtons.clear();
-        this.mainBox.style=('width: 35em;');
+        this.mainBox.style = 'width: 35em;';
         this.mainBox.hide();
 
         //Load categories
@@ -665,21 +615,23 @@ class ApplicationsButton extends PanelMenu.Button {
         this._tree.load_sync();
         let root = this._tree.get_root_directory();
         let categoryMenuItem = new CategoryMenuItem(this, null);
-        this.categoriesBox.add_actor(categoryMenuItem.actor);
+        this.categoriesBox.add_actor(categoryMenuItem);
         let iter = root.iter();
         let nextType;
         while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
-            if (nextType == GMenu.TreeItemType.DIRECTORY) {
-                let dir = iter.get_directory();
-                if (!dir.get_is_nodisplay()) {
-                    let categoryId = dir.get_menu_id();
-                    this.applicationsByCategory[categoryId] = [];
-                    this._loadCategory(categoryId, dir);
-                    if (this.applicationsByCategory[categoryId].length > 0) {
-                        let categoryMenuItem = new CategoryMenuItem(this, dir);
-                        this.categoriesBox.add_actor(categoryMenuItem.actor);
-                    }
-                }
+            if (nextType != GMenu.TreeItemType.DIRECTORY)
+                continue;
+
+            let dir = iter.get_directory();
+            if (dir.get_is_nodisplay())
+                continue;
+
+            let categoryId = dir.get_menu_id();
+            this.applicationsByCategory[categoryId] = [];
+            this._loadCategory(categoryId, dir);
+            if (this.applicationsByCategory[categoryId].length > 0) {
+                let categoryMenuItem = new CategoryMenuItem(this, dir);
+                this.categoriesBox.add_actor(categoryMenuItem);
             }
         }
 
@@ -689,11 +641,11 @@ class ApplicationsButton extends PanelMenu.Button {
         let themeContext = St.ThemeContext.get_for_stage(global.stage);
         let scaleFactor = themeContext.scale_factor;
         let categoriesHeight = this.categoriesBox.height / scaleFactor;
-        let height = Math.round(categoriesHeight) + MENU_HEIGHT_OFFSET + 'px';
-        this.mainBox.style+=('height: ' + height);
+        let height = Math.round(categoriesHeight) + MENU_HEIGHT_OFFSET;
+        this.mainBox.style += `height: ${height}px`;
     }
 
-    selectCategory(dir, categoryMenuItem) {
+    selectCategory(dir) {
         this.applicationsBox.get_children().forEach(c => {
             if (c._delegate instanceof PopupMenu.PopupSeparatorMenuItem)
                 c._delegate.destroy();
@@ -708,30 +660,28 @@ class ApplicationsButton extends PanelMenu.Button {
     }
 
     _displayButtons(apps) {
-         if (apps) {
-            for (let i = 0; i < apps.length; i++) {
-               let app = apps[i];
-               let item;
-               if (app instanceof Shell.App)
-                   item = this._applicationsButtons.get(app);
-               else
-                   item = new PopupMenu.PopupSeparatorMenuItem();
-               if (!item) {
-                  item = new ApplicationMenuItem(this, app);
-                  item.setDragEnabled(this._desktopTarget.hasDesktop);
-                  this._applicationsButtons.set(app, item);
-               }
-               if (!item.actor.get_parent())
-                  this.applicationsBox.add_actor(item.actor);
+        for (let i = 0; i < apps.length; i++) {
+            let app = apps[i];
+            let item;
+            if (app instanceof Shell.App)
+                item = this._applicationsButtons.get(app);
+            else
+                item = new PopupMenu.PopupSeparatorMenuItem();
+            if (!item) {
+                item = new ApplicationMenuItem(this, app);
+                item.setDragEnabled(this._desktopTarget.hasDesktop);
+                this._applicationsButtons.set(app, item);
             }
-         }
+            if (!item.get_parent())
+                this.applicationsBox.add_actor(item);
+        }
     }
 
-    _listApplications(category_menu_id) {
+    _listApplications(categoryMenuId) {
         let applist;
 
-        if (category_menu_id) {
-            applist = this.applicationsByCategory[category_menu_id];
+        if (categoryMenuId) {
+            applist = this.applicationsByCategory[categoryMenuId];
         } else {
             applist = new Array();
             let favorites = global.settings.get_strv('favorite-apps');
@@ -747,21 +697,18 @@ class ApplicationsButton extends PanelMenu.Button {
 });
 
 let appsMenuButton;
-let activitiesButton;
 
 function enable() {
-    activitiesButton = Main.panel.statusArea['activities'];
-    activitiesButton.container.hide();
     appsMenuButton = new ApplicationsButton();
-    Main.panel.addToStatusArea('apps-menu', appsMenuButton, 1, 'left');
+    let index = Main.sessionMode.panel.left.indexOf('activities') + 1;
+    Main.panel.addToStatusArea('apps-menu', appsMenuButton, index, 'left');
 }
 
 function disable() {
     Main.panel.menuManager.removeMenu(appsMenuButton.menu);
     appsMenuButton.destroy();
-    activitiesButton.container.show();
 }
 
-function init(metadata) {
-    Convenience.initTranslations();
+function init() {
+    ExtensionUtils.initTranslations();
 }

extensions/auto-move-windows/extension.js

@@ -1,24 +1,22 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
 // Start apps on custom workspaces
+/* exported init enable disable */
 
 const Shell = imports.gi.Shell;
 
-const Main = imports.ui.main;
-
 const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
-const Convenience = Me.imports.convenience;
+const Main = imports.ui.main;
 
 class WindowMover {
     constructor() {
-        this._settings = Convenience.getSettings();
+        this._settings = ExtensionUtils.getSettings();
         this._appSystem = Shell.AppSystem.get_default();
         this._appConfigs = new Map();
         this._appData = new Map();
 
         this._appsChangedId =
             this._appSystem.connect('installed-changed',
-                                    this._updateAppData.bind(this));
+                this._updateAppData.bind(this));
 
         this._settings.connect('changed', this._updateAppConfigs.bind(this));
         this._updateAppConfigs();
@@ -51,10 +49,10 @@ class WindowMover {
         addedApps.forEach(app => {
             let data = {
                 windowsChangedId: app.connect('windows-changed',
-                                              this._appWindowsChanged.bind(this)),
+                    this._appWindowsChanged.bind(this)),
                 moveWindowsId: 0,
                 windows: app.get_windows()
-            }
+            };
             this._appData.set(app, data);
         });
     }
@@ -106,13 +104,13 @@ class WindowMover {
         });
         data.windows = windows;
     }
-};
+}
 
 let prevCheckWorkspaces;
 let winMover;
 
 function init() {
-    Convenience.initTranslations();
+    ExtensionUtils.initTranslations();
 }
 
 function myCheckWorkspaces() {
@@ -126,9 +124,9 @@ function myCheckWorkspaces() {
     }
 
     // make sure the original method only removes empty workspaces at the end
-    keepAliveWorkspaces.forEach(ws => { ws._keepAliveId = 1; });
+    keepAliveWorkspaces.forEach(ws => ws._keepAliveId = 1);
     prevCheckWorkspaces.call(this);
-    keepAliveWorkspaces.forEach(ws => { delete ws._keepAliveId; });
+    keepAliveWorkspaces.forEach(ws => delete ws._keepAliveId);
 
     return false;
 }

extensions/auto-move-windows/prefs.js

@@ -1,17 +1,14 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
 // Start apps on custom workspaces
+/* exported init buildPrefsWidget */
 
-const Gio = imports.gi.Gio;
-const GObject = imports.gi.GObject;
-const Gtk = imports.gi.Gtk;
+const { Gio, GObject, Gtk } = imports.gi;
 
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
 const N_ = e => e;
 
 const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
-const Convenience = Me.imports.convenience;
 
 const SETTINGS_KEY = 'application-list';
 
@@ -32,40 +29,53 @@ const Widget = GObject.registerClass({
         super._init(params);
         this.set_orientation(Gtk.Orientation.VERTICAL);
 
-        this._settings = Convenience.getSettings();
+        this._settings = ExtensionUtils.getSettings();
         this._settings.connect('changed', this._refresh.bind(this));
         this._changedPermitted = false;
 
         this._store = new Gtk.ListStore();
-        this._store.set_column_types([Gio.AppInfo, GObject.TYPE_STRING, Gio.Icon, GObject.TYPE_INT,
-                                      Gtk.Adjustment]);
+        this._store.set_column_types([
+            Gio.AppInfo,
+            GObject.TYPE_STRING,
+            Gio.Icon,
+            GObject.TYPE_INT,
+            Gtk.Adjustment
+        ]);
 
-        let scrolled = new Gtk.ScrolledWindow({ shadow_type: Gtk.ShadowType.IN});
+        let scrolled = new Gtk.ScrolledWindow({ shadow_type: Gtk.ShadowType.IN });
         scrolled.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
         this.add(scrolled);
 
 
-        this._treeView = new Gtk.TreeView({ model: this._store,
-                                            hexpand: true, vexpand: true });
+        this._treeView = new Gtk.TreeView({
+            model: this._store,
+            hexpand: true,
+            vexpand: true
+        });
         this._treeView.get_selection().set_mode(Gtk.SelectionMode.SINGLE);
 
-        let appColumn = new Gtk.TreeViewColumn({ expand: true, sort_column_id: Columns.DISPLAY_NAME,
-                                                 title: _("Application") });
+        let appColumn = new Gtk.TreeViewColumn({
+            expand: true,
+            sort_column_id: Columns.DISPLAY_NAME,
+            title: _('Application')
+        });
         let iconRenderer = new Gtk.CellRendererPixbuf;
         appColumn.pack_start(iconRenderer, false);
-        appColumn.add_attribute(iconRenderer, "gicon", Columns.ICON);
+        appColumn.add_attribute(iconRenderer, 'gicon', Columns.ICON);
         let nameRenderer = new Gtk.CellRendererText;
         appColumn.pack_start(nameRenderer, true);
-        appColumn.add_attribute(nameRenderer, "text", Columns.DISPLAY_NAME);
+        appColumn.add_attribute(nameRenderer, 'text', Columns.DISPLAY_NAME);
         this._treeView.append_column(appColumn);
 
-        let workspaceColumn = new Gtk.TreeViewColumn({ title: _("Workspace"),
-                                                       sort_column_id: Columns.WORKSPACE });
+        let workspaceColumn = new Gtk.TreeViewColumn({
+            title: _('Workspace'),
+            sort_column_id: Columns.WORKSPACE
+        });
         let workspaceRenderer = new Gtk.CellRendererSpin({ editable: true });
         workspaceRenderer.connect('edited', this._workspaceEdited.bind(this));
         workspaceColumn.pack_start(workspaceRenderer, true);
-        workspaceColumn.add_attribute(workspaceRenderer, "adjustment", Columns.ADJUSTMENT);
-        workspaceColumn.add_attribute(workspaceRenderer, "text", Columns.WORKSPACE);
+        workspaceColumn.add_attribute(workspaceRenderer, 'adjustment', Columns.ADJUSTMENT);
+        workspaceColumn.add_attribute(workspaceRenderer, 'text', Columns.WORKSPACE);
         this._treeView.append_column(workspaceColumn);
 
         scrolled.add(this._treeView);
@@ -74,13 +84,15 @@ const Widget = GObject.registerClass({
         toolbar.get_style_context().add_class(Gtk.STYLE_CLASS_INLINE_TOOLBAR);
         this.add(toolbar);
 
-        let newButton = new Gtk.ToolButton({ icon_name: 'bookmark-new-symbolic',
-                                             label: _("Add Rule"),
-                                             is_important: true });
+        let newButton = new Gtk.ToolButton({
+            icon_name: 'bookmark-new-symbolic',
+            label: _('Add Rule'),
+            is_important: true
+        });
         newButton.connect('clicked', this._createNew.bind(this));
         toolbar.add(newButton);
 
-        let delButton = new Gtk.ToolButton({ icon_name: 'edit-delete-symbolic'  });
+        let delButton = new Gtk.ToolButton({ icon_name: 'edit-delete-symbolic' });
         delButton.connect('clicked', this._deleteSelected.bind(this));
         toolbar.add(delButton);
 
@@ -95,17 +107,21 @@ const Widget = GObject.registerClass({
     }
 
     _createNew() {
-        let dialog = new Gtk.Dialog({ title: _("Create new matching rule"),
-                                      transient_for: this.get_toplevel(),
-                                      use_header_bar: true,
-                                      modal: true });
+        let dialog = new Gtk.Dialog({
+            title: _('Create new matching rule'),
+            transient_for: this.get_toplevel(),
+            use_header_bar: true,
+            modal: true
+        });
         dialog.add_button(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL);
-        let addButton = dialog.add_button(_("Add"), Gtk.ResponseType.OK);
+        let addButton = dialog.add_button(_('Add'), Gtk.ResponseType.OK);
         dialog.set_default_response(Gtk.ResponseType.OK);
 
-        let grid = new Gtk.Grid({ column_spacing: 10,
-                                  row_spacing: 15,
-                                  margin: 10 });
+        let grid = new Gtk.Grid({
+            column_spacing: 10,
+            row_spacing: 15,
+            margin: 10
+        });
         dialog._appChooser = new Gtk.AppChooserWidget({ show_all: true });
         dialog._appChooser.connect('application-selected', (w, appInfo) => {
             addButton.sensitive = appInfo && this._checkId(appInfo.get_id());
@@ -114,14 +130,19 @@ const Widget = GObject.registerClass({
         addButton.sensitive = appInfo && this._checkId(appInfo.get_id());
 
         grid.attach(dialog._appChooser, 0, 0, 2, 1);
-        grid.attach(new Gtk.Label({ label: _("Workspace"),
-                                    halign: Gtk.Align.END }), 0, 1, 1, 1);
-        let adjustment = new Gtk.Adjustment({ lower: 1,
-                                              upper: WORKSPACE_MAX,
-                                              step_increment: 1
-                                            });
-        dialog._spin = new Gtk.SpinButton({ adjustment: adjustment,
-                                            snap_to_ticks: true });
+        grid.attach(new Gtk.Label({
+            label: _('Workspace'),
+            halign: Gtk.Align.END
+        }), 0, 1, 1, 1);
+        let adjustment = new Gtk.Adjustment({
+            lower: 1,
+            upper: WORKSPACE_MAX,
+            step_increment: 1
+        });
+        dialog._spin = new Gtk.SpinButton({
+            adjustment: adjustment,
+            snap_to_ticks: true
+        });
         dialog._spin.set_value(1);
         grid.attach(dialog._spin, 1, 1, 1, 1);
         dialog.get_content_area().add(grid);
@@ -143,14 +164,7 @@ const Widget = GObject.registerClass({
             this._appendItem(appInfo.get_id(), index);
             this._changedPermitted = true;
 
-            let iter = this._store.append();
-            let adj = new Gtk.Adjustment({ lower: 1,
-                                           upper: WORKSPACE_MAX,
-                                           step_increment: 1,
-                                           value: index });
-            this._store.set(iter,
-                            [Columns.APPINFO, Columns.ICON, Columns.DISPLAY_NAME, Columns.WORKSPACE, Columns.ADJUSTMENT],
-                            [appInfo, appInfo.get_icon(), appInfo.get_display_name(), index, adj]);
+            this._appendRow(appInfo, index);
 
             dialog.destroy();
         });
@@ -158,7 +172,7 @@ const Widget = GObject.registerClass({
     }
 
     _deleteSelected() {
-        let [any, model, iter] = this._treeView.get_selection().get_selected();
+        let [any, model_, iter] = this._treeView.get_selection().get_selected();
 
         if (any) {
             let appInfo = this._store.get_value(iter, Columns.APPINFO);
@@ -175,7 +189,7 @@ const Widget = GObject.registerClass({
         if (isNaN(index) || index < 0)
             index = 1;
         let path = Gtk.TreePath.new_from_string(pathString);
-        let [model, iter] = this._store.get_iter(path);
+        let [model_, iter] = this._store.get_iter(path);
         let appInfo = this._store.get_value(iter, Columns.APPINFO);
 
         this._changedPermitted = false;
@@ -192,7 +206,7 @@ const Widget = GObject.registerClass({
         this._store.clear();
 
         let currentItems = this._settings.get_strv(SETTINGS_KEY);
-        let validItems = [ ];
+        let validItems = [];
         for (let i = 0; i < currentItems.length; i++) {
             let [id, index] = currentItems[i].split(':');
             let appInfo = Gio.DesktopAppInfo.new(id);
@@ -200,28 +214,37 @@ const Widget = GObject.registerClass({
                 continue;
             validItems.push(currentItems[i]);
 
-            let iter = this._store.append();
-            let adj = new Gtk.Adjustment({ lower: 1,
-                                           upper: WORKSPACE_MAX,
-                                           step_increment: 1,
-                                           value: index });
-            this._store.set(iter,
-                            [Columns.APPINFO, Columns.ICON, Columns.DISPLAY_NAME, Columns.WORKSPACE, Columns.ADJUSTMENT],
-                            [appInfo, appInfo.get_icon(), appInfo.get_display_name(), parseInt(index), adj]);
+            this._appendRow(appInfo, parseInt(index));
         }
 
         if (validItems.length != currentItems.length) // some items were filtered out
             this._settings.set_strv(SETTINGS_KEY, validItems);
     }
 
+    _appendRow(appInfo, workspace) {
+        let iter = this._store.append();
+        let icon = appInfo.get_icon();
+        let displayName = appInfo.get_display_name();
+        let adj = new Gtk.Adjustment({
+            lower: 1,
+            upper: WORKSPACE_MAX,
+            step_increment: 1,
+            value: workspace
+        });
+        let { APPINFO, ICON, DISPLAY_NAME, WORKSPACE, ADJUSTMENT } = Columns;
+        this._store.set(iter,
+            [APPINFO, ICON, DISPLAY_NAME, WORKSPACE, ADJUSTMENT],
+            [appInfo, icon, displayName, workspace, adj]);
+    }
+
     _checkId(id) {
         let items = this._settings.get_strv(SETTINGS_KEY);
-        return !items.some(i => i.startsWith(id + ':'));
+        return !items.some(i => i.startsWith(`${id}:`));
     }
 
     _appendItem(id, workspace) {
         let currentItems = this._settings.get_strv(SETTINGS_KEY);
-        currentItems.push(id + ':' + workspace);
+        currentItems.push(`${id}:${workspace}`);
         this._settings.set_strv(SETTINGS_KEY, currentItems);
     }
 
@@ -240,16 +263,16 @@ const Widget = GObject.registerClass({
         let index = currentItems.map(el => el.split(':')[0]).indexOf(id);
 
         if (index < 0)
-            currentItems.push(id + ':' + workspace);
+            currentItems.push(`${id}:${workspace}`);
         else
-            currentItems[index] = id + ':' + workspace;
+            currentItems[index] = `${id}:${workspace}`;
         this._settings.set_strv(SETTINGS_KEY, currentItems);
     }
 });
 
 
 function init() {
-    Convenience.initTranslations();
+    ExtensionUtils.initTranslations();
 }
 
 function buildPrefsWidget() {

extensions/drive-menu/extension.js

@@ -1,44 +1,42 @@
+/* exported init enable disable */
 // Drive menu extension
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GObject = imports.gi.GObject;
-const St = imports.gi.St;
-const Shell = imports.gi.Shell;
+const { Gio, GObject, Shell, St } = imports.gi;
 
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
 
+const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
-const Panel = imports.ui.panel;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 const ShellMountOperation = imports.ui.shellMountOperation;
 
-const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
-const Convenience = Me.imports.convenience;
-
+var MountMenuItem = GObject.registerClass(
 class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
-    constructor(mount) {
-        super();
+    _init(mount) {
+        super._init();
 
         this.label = new St.Label({ text: mount.get_name() });
-        this.actor.add(this.label, { expand: true });
-        this.actor.label_actor = this.label;
+        this.add(this.label, { expand: true });
+        this.label_actor = this.label;
 
         this.mount = mount;
 
-        let ejectIcon = new St.Icon({ icon_name: 'media-eject-symbolic',
-                                      style_class: 'popup-menu-icon ' });
+        this.connect('destroy', this._onDestroy.bind(this));
+
+        let ejectIcon = new St.Icon({
+            icon_name: 'media-eject-symbolic',
+            style_class: 'popup-menu-icon'
+        });
         let ejectButton = new St.Button({ child: ejectIcon });
         ejectButton.connect('clicked', this._eject.bind(this));
-        this.actor.add(ejectButton);
+        this.add(ejectButton);
 
         this._changedId = mount.connect('changed', this._syncVisibility.bind(this));
         this._syncVisibility();
     }
 
-    destroy() {
+    _onDestroy() {
         if (this._changedId) {
             this.mount.disconnect(this._changedId);
             this._changedId = 0;
@@ -65,28 +63,28 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
     }
 
     _syncVisibility() {
-        this.actor.visible = this._isInteresting();
+        this.visible = this._isInteresting();
     }
 
     _eject() {
-        let mountOp = new ShellMountOperation.ShellMountOperation(this.mount);
+        let unmountArgs = [
+            Gio.MountUnmountFlags.NONE,
+            (new ShellMountOperation.ShellMountOperation(this.mount)).mountOp,
+            null // Gio.Cancellable
+        ];
 
         if (this.mount.can_eject())
-            this.mount.eject_with_operation(Gio.MountUnmountFlags.NONE,
-                                            mountOp.mountOp,
-                                            null, // Gio.Cancellable
-                                            this._ejectFinish.bind(this));
+            this.mount.eject_with_operation(...unmountArgs,
+                this._ejectFinish.bind(this));
         else
-            this.mount.unmount_with_operation(Gio.MountUnmountFlags.NONE,
-                                              mountOp.mountOp,
-                                              null, // Gio.Cancellable
-                                              this._unmountFinish.bind(this));
+            this.mount.unmount_with_operation(...unmountArgs,
+                this._unmountFinish.bind(this));
     }
 
     _unmountFinish(mount, result) {
         try {
             mount.unmount_with_operation_finish(result);
-        } catch(e) {
+        } catch (e) {
             this._reportFailure(e);
         }
     }
@@ -94,34 +92,36 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
     _ejectFinish(mount, result) {
         try {
             mount.eject_with_operation_finish(result);
-        } catch(e) {
+        } catch (e) {
             this._reportFailure(e);
         }
     }
 
     _reportFailure(exception) {
         // TRANSLATORS: %s is the filesystem name
-        let msg = _("Ejecting drive “%s” failed:").format(this.mount.get_name());
+        let msg = _('Ejecting drive “%s” failed:').format(this.mount.get_name());
         Main.notifyError(msg, exception.message);
     }
 
     activate(event) {
+        let uri = this.mount.get_root().get_uri();
         let context = global.create_app_launch_context(event.get_time(), -1);
-        Gio.AppInfo.launch_default_for_uri(this.mount.get_root().get_uri(),
-                                           context);
+        Gio.AppInfo.launch_default_for_uri(uri, context);
 
         super.activate(event);
     }
-};
+});
 
 let DriveMenu = GObject.registerClass(
 class DriveMenu extends PanelMenu.Button {
     _init() {
-        super._init(0.0, _("Removable devices"));
+        super._init(0.0, _('Removable devices'));
 
         let hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
-        let icon = new St.Icon({ icon_name: 'media-eject-symbolic',
-                                 style_class: 'system-status-icon' });
+        let icon = new St.Icon({
+            icon_name: 'media-eject-symbolic',
+            style_class: 'system-status-icon'
+        });
 
         hbox.add_child(icon);
         hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
@@ -137,12 +137,12 @@ class DriveMenu extends PanelMenu.Button {
             this._updateMenuVisibility();
         });
 
-        this._mounts = [ ];
+        this._mounts = [];
 
         this._monitor.get_mounts().forEach(this._addMount.bind(this));
 
         this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-        this.menu.addAction(_("Open Files"), event => {
+        this.menu.addAction(_('Open Files'), event => {
             let appSystem = Shell.AppSystem.get_default();
             let app = appSystem.lookup_app('org.gnome.Nautilus.desktop');
             app.activate_full(-1, event.get_time());
@@ -152,7 +152,7 @@ class DriveMenu extends PanelMenu.Button {
     }
 
     _updateMenuVisibility() {
-        if (this._mounts.filter(i => i.actor.visible).length > 0)
+        if (this._mounts.filter(i => i.visible).length > 0)
             this.show();
         else
             this.hide();
@@ -189,7 +189,7 @@ class DriveMenu extends PanelMenu.Button {
 });
 
 function init() {
-    Convenience.initTranslations();
+    ExtensionUtils.initTranslations();
 }
 
 let _indicator;

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

extensions/horizontal-workspaces/meson.build

@@ -3,5 +3,3 @@ extension_data += configure_file(
   output: metadata_name,
   configuration: metadata_conf
 )
-
-extension_sources += files('prefs.js')

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@"
+}

extensions/horizontal-workspaces/stylesheet.css

@@ -0,0 +1 @@
+/* This extensions requires no special styling */

extensions/launch-new-instance/extension.js

@@ -1,17 +1,15 @@
+/* exported enable disable */
 const AppDisplay = imports.ui.appDisplay;
 
 let _activateOriginal = null;
 
-function init() {
-}
-
 function enable() {
-  _activateOriginal = AppDisplay.AppIcon.prototype.activate;
-  AppDisplay.AppIcon.prototype.activate = function() {
-      _activateOriginal.call(this, 2);
-  };
+    _activateOriginal = AppDisplay.AppIcon.prototype.activate;
+    AppDisplay.AppIcon.prototype.activate = function() {
+        _activateOriginal.call(this, 2);
+    };
 }
 
 function disable() {
-  AppDisplay.AppIcon.prototype.activate = _activateOriginal;
+    AppDisplay.AppIcon.prototype.activate = _activateOriginal;
 }

extensions/meson.build

@@ -1,5 +1,5 @@
 extension_schemas = []
-js_sources = extensionlib
+js_sources = []
 
 metadata_name = 'metadata.json'
 
@@ -22,7 +22,7 @@ foreach e : all_extensions
   js_sources += extension_sources
 
   if (enabled_extensions.contains(e))
-    install_data (extension_sources + extension_data + extensionlib,
+    install_data (extension_sources + extension_data,
       install_dir: join_paths(extensiondir, uuid)
     )
   endif
@@ -33,11 +33,11 @@ install_data (extension_schemas,
 )
 
 foreach js_source : js_sources
-  if (js52.found())
+  if (js60.found())
     path_array = '@0@'.format(js_source).split('/')
     name = join_paths(path_array[-2], path_array[-1])
 
-    test('Checking syntax of ' + name, js52,
+    test('Checking syntax of ' + name, js60,
       args: ['-s', '-c', js_source],
       workdir: meson.current_source_dir()
     )

extensions/native-window-placement/extension.js

@@ -1,13 +1,9 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+/* exported enable disable */
+const ExtensionUtils = imports.misc.extensionUtils;
 const Workspace = imports.ui.workspace;
 
-const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
-const Convenience = Me.imports.convenience;
-
 // testing settings for natural window placement strategy:
-const WINDOW_PLACEMENT_NATURAL_FILLGAPS = true;                     // enlarge windows at the end to fill gaps         // not implemented yet
-const WINDOW_PLACEMENT_NATURAL_GRID_FALLBACK = true;                // fallback to grid mode if all windows have the same size and positions.     // not implemented yet
 const WINDOW_PLACEMENT_NATURAL_ACCURACY = 20;                       // accuracy of window translate moves  (KDE-default: 20)
 const WINDOW_PLACEMENT_NATURAL_GAPS = 5;                            // half of the minimum gap between windows
 const WINDOW_PLACEMENT_NATURAL_MAX_TRANSLATIONS = 5000;             // safety limit for preventing endless loop if something is wrong in the algorithm
@@ -26,20 +22,18 @@ class Rect {
 
     union(rect2) {
         let dest = this.copy();
-        if (rect2.x < dest.x)
-          {
+        if (rect2.x < dest.x) {
             dest.width += dest.x - rect2.x;
             dest.x = rect2.x;
-          }
-        if (rect2.y < dest.y)
-          {
+        }
+        if (rect2.y < dest.y) {
             dest.height += dest.y - rect2.y;
             dest.y = rect2.y;
-          }
+        }
         if (rect2.x + rect2.width > dest.x + dest.width)
-          dest.width = rect2.x + rect2.width - dest.x;
+            dest.width = rect2.x + rect2.width - dest.x;
         if (rect2.y + rect2.height > dest.y + dest.height)
-          dest.height = rect2.y + rect2.height - dest.y;
+            dest.height = rect2.y + rect2.height - dest.y;
 
         return dest;
     }
@@ -68,7 +62,7 @@ class Rect {
         this.x += dx;
         this.y += dy;
     }
-};
+}
 
 class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
     constructor(settings) {
@@ -90,8 +84,8 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
         // As we are using pseudo-random movement (See "slot") we need to make sure the list
         // is always sorted the same way no matter which window is currently active.
 
-        let area_rect = new Rect(area.x, area.y, area.width, area.height);
-        let bounds = area_rect.copy();
+        let areaRect = new Rect(area.x, area.y, area.width, area.height);
+        let bounds = areaRect.copy();
         let clones = layout.windows;
 
         let direction = 0;
@@ -111,31 +105,32 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
             }
         }
 
-        let loop_counter = 0;
+        let loopCounter = 0;
         let overlap;
         do {
             overlap = false;
             for (let i = 0; i < rects.length; i++) {
                 for (let j = 0; j < rects.length; j++) {
-                    if (i != j && rects[i].adjusted(-WINDOW_PLACEMENT_NATURAL_GAPS, -WINDOW_PLACEMENT_NATURAL_GAPS,
-                                                    WINDOW_PLACEMENT_NATURAL_GAPS, WINDOW_PLACEMENT_NATURAL_GAPS).overlap(
-                                                     rects[j].adjusted(-WINDOW_PLACEMENT_NATURAL_GAPS, -WINDOW_PLACEMENT_NATURAL_GAPS,
-                                                                       WINDOW_PLACEMENT_NATURAL_GAPS, WINDOW_PLACEMENT_NATURAL_GAPS))) {
-                        loop_counter++;
+                    let adjustments = [-1, -1, 1, 1]
+                        .map(v => v *= WINDOW_PLACEMENT_NATURAL_GAPS);
+                    let iAdjusted = rects[i].adjusted(...adjustments);
+                    let jAdjusted = rects[j].adjusted(...adjustments);
+                    if (i != j && iAdjusted.overlap(jAdjusted)) {
+                        loopCounter++;
                         overlap = true;
 
                         // TODO: something like a Point2D would be nicer here:
 
                         // Determine pushing direction
-                        let i_center = rects[i].center();
-                        let j_center = rects[j].center();
-                        let diff = [j_center[0] - i_center[0], j_center[1] - i_center[1]];
+                        let iCenter = rects[i].center();
+                        let jCenter = rects[j].center();
+                        let diff = [jCenter[0] - iCenter[0], jCenter[1] - iCenter[1]];
 
                         // Prevent dividing by zero and non-movement
                         if (diff[0] == 0 && diff[1] == 0)
                             diff[0] = 1;
                         // Try to keep screen/workspace aspect ratio
-                        if ( bounds.height / bounds.width > area_rect.height / area_rect.width )
+                        if ( bounds.height / bounds.width > areaRect.height / areaRect.width )
                             diff[0] *= 2;
                         else
                             diff[1] *= 2;
@@ -164,7 +159,7 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
                             let xSection = Math.round((rects[i].x - bounds.x) / (bounds.width / 3));
                             let ySection = Math.round((rects[i].y - bounds.y) / (bounds.height / 3));
 
-                            let i_center = rects[i].center();
+                            let iCenter = rects[i].center();
                             diff[0] = 0;
                             diff[1] = 0;
                             if (xSection != 1 || ySection != 1) { // Remove this if you want the center to pull as well
@@ -174,23 +169,23 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
                                     ySection = (directions[i] % 2 ? 2 : 0);
                             }
                             if (xSection == 0 && ySection == 0) {
-                                diff[0] = bounds.x - i_center[0];
-                                diff[1] = bounds.y - i_center[1];
+                                diff[0] = bounds.x - iCenter[0];
+                                diff[1] = bounds.y - iCenter[1];
                             }
                             if (xSection == 2 && ySection == 0) {
-                                diff[0] = bounds.x + bounds.width - i_center[0];
-                                diff[1] = bounds.y - i_center[1];
+                                diff[0] = bounds.x + bounds.width - iCenter[0];
+                                diff[1] = bounds.y - iCenter[1];
                             }
                             if (xSection == 2 && ySection == 2) {
-                                diff[0] = bounds.x + bounds.width - i_center[0];
-                                diff[1] = bounds.y + bounds.height - i_center[1];
+                                diff[0] = bounds.x + bounds.width - iCenter[0];
+                                diff[1] = bounds.y + bounds.height - iCenter[1];
                             }
                             if (xSection == 0 && ySection == 2) {
-                                diff[0] = bounds.x - i_center[0];
-                                diff[1] = bounds.y + bounds.height - i_center[1];
+                                diff[0] = bounds.x - iCenter[0];
+                                diff[1] = bounds.y + bounds.height - iCenter[1];
                             }
                             if (diff[0] != 0 || diff[1] != 0) {
-                                let length = Math.sqrt(diff[0]*diff[0] + diff[1]*diff[1]);
+                                let length = Math.sqrt(diff[0] * diff[0] + diff[1] * diff[1]);
                                 diff[0] *= WINDOW_PLACEMENT_NATURAL_ACCURACY / length / 2;   // /2 to make it less influencing than the normal center-move above
                                 diff[1] *= WINDOW_PLACEMENT_NATURAL_ACCURACY / length / 2;
                                 rects[i].translate(diff[0], diff[1]);
@@ -203,44 +198,38 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
                     }
                 }
             }
-        } while (overlap && loop_counter < WINDOW_PLACEMENT_NATURAL_MAX_TRANSLATIONS);
+        } while (overlap && loopCounter < WINDOW_PLACEMENT_NATURAL_MAX_TRANSLATIONS);
 
         // Work out scaling by getting the most top-left and most bottom-right window coords.
         let scale;
-        scale = Math.min(area_rect.width / bounds.width,
-                         area_rect.height / bounds.height,
-                         1.0);
+        scale = Math.min(
+            areaRect.width / bounds.width,
+            areaRect.height / bounds.height,
+            1.0);
 
         // Make bounding rect fill the screen size for later steps
-        bounds.x = bounds.x - (area_rect.width - bounds.width * scale) / 2;
-        bounds.y = bounds.y - (area_rect.height - bounds.height * scale) / 2;
-        bounds.width = area_rect.width / scale;
-        bounds.height = area_rect.height / scale;
+        bounds.x = bounds.x - (areaRect.width - bounds.width * scale) / 2;
+        bounds.y = bounds.y - (areaRect.height - bounds.height * scale) / 2;
+        bounds.width = areaRect.width / scale;
+        bounds.height = areaRect.height / scale;
 
         // Move all windows back onto the screen and set their scale
         for (let i = 0; i < rects.length; i++) {
             rects[i].translate(-bounds.x, -bounds.y);
         }
 
-        // TODO: Implement the KDE part "Try to fill the gaps by enlarging windows if they have the space" here. (If this is wanted)
-
         // rescale to workspace
-        let scales = [];
-
-        let buttonOuterHeight, captionHeight;
-        let buttonOuterWidth = 0;
-
         let slots = [];
         for (let i = 0; i < rects.length; i++) {
-            rects[i].x = rects[i].x * scale + area_rect.x;
-            rects[i].y = rects[i].y * scale + area_rect.y;
+            rects[i].x = rects[i].x * scale + areaRect.x;
+            rects[i].y = rects[i].y * scale + areaRect.y;
 
             slots.push([rects[i].x, rects[i].y, scale, clones[i]]);
         }
 
         return slots;
     }
-};
+}
 
 let winInjections, workspaceInjections;
 
@@ -252,7 +241,7 @@ function resetState() {
 function enable() {
     resetState();
 
-    let settings = Convenience.getSettings();
+    let settings = ExtensionUtils.getSettings();
 
     workspaceInjections['_getBestLayout'] = Workspace.Workspace.prototype._getBestLayout;
     Workspace.Workspace.prototype._getBestLayout = function(windows) {
@@ -261,7 +250,7 @@ function enable() {
         strategy.computeLayout(windows, layout);
 
         return layout;
-    }
+    };
 
     /// position window titles on top of windows in overlay ////
     winInjections['relayout'] = Workspace.WindowOverlay.prototype.relayout;
@@ -293,7 +282,3 @@ function disable() {
     global.stage.queue_relayout();
     resetState();
 }
-
-function init() {
-    /* do nothing */
-}

extensions/places-menu/extension.js

@@ -1,50 +1,49 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* exported init enable disable */
 
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
+const { Clutter, GObject, St } = imports.gi;
 
+const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
-const Panel = imports.ui.panel;
 
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
 const N_ = x => x;
 
-const ExtensionUtils = imports.misc.extensionUtils;
 const Me = ExtensionUtils.getCurrentExtension();
-const Convenience = Me.imports.convenience;
 const PlaceDisplay = Me.imports.placeDisplay;
 
 const PLACE_ICON_SIZE = 16;
 
+var PlaceMenuItem = GObject.registerClass(
 class PlaceMenuItem extends PopupMenu.PopupBaseMenuItem {
-    constructor(info) {
-        super();
+    _init(info) {
+        super._init();
         this._info = info;
 
-        this._icon = new St.Icon({ gicon: info.icon,
-                                   icon_size: PLACE_ICON_SIZE });
-        this.actor.add_child(this._icon);
+        this._icon = new St.Icon({
+            gicon: info.icon,
+            icon_size: PLACE_ICON_SIZE
+        });
+        this.add_child(this._icon);
 
         this._label = new St.Label({ text: info.name, x_expand: true });
-        this.actor.add_child(this._label);
+        this.add_child(this._label);
 
         if (info.isRemovable()) {
-            this._ejectIcon = new St.Icon({ icon_name: 'media-eject-symbolic',
-                                            style_class: 'popup-menu-icon ' });
+            this._ejectIcon = new St.Icon({
+                icon_name: 'media-eject-symbolic',
+                style_class: 'popup-menu-icon'
+            });
             this._ejectButton = new St.Button({ child: this._ejectIcon });
             this._ejectButton.connect('clicked', info.eject.bind(info));
-            this.actor.add_child(this._ejectButton);
+            this.add_child(this._ejectButton);
         }
 
         this._changedId = info.connect('changed',
-                                       this._propertiesChanged.bind(this));
+            this._propertiesChanged.bind(this));
     }
 
     destroy() {
@@ -66,24 +65,26 @@ class PlaceMenuItem extends PopupMenu.PopupBaseMenuItem {
         this._icon.gicon = info.icon;
         this._label.text = info.name;
     }
-};
+});
 
 const SECTIONS = [
     'special',
     'devices',
     'bookmarks',
     'network'
-]
+];
 
 let PlacesMenu = GObject.registerClass(
 class PlacesMenu extends PanelMenu.Button {
     _init() {
-        super._init(0.0, _("Places"));
+        super._init(0.0, _('Places'));
 
         let hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
-        let label = new St.Label({ text: _("Places"),
-                                   y_expand: true,
-                                   y_align: Clutter.ActorAlign.CENTER });
+        let label = new St.Label({
+            text: _('Places'),
+            y_expand: true,
+            y_align: Clutter.ActorAlign.CENTER
+        });
         hbox.add_child(label);
         hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
         this.add_actor(hbox);
@@ -92,10 +93,10 @@ class PlacesMenu extends PanelMenu.Button {
 
         this._sections = { };
 
-        for (let i=0; i < SECTIONS.length; i++) {
+        for (let i = 0; i < SECTIONS.length; i++) {
             let id = SECTIONS[i];
             this._sections[id] = new PopupMenu.PopupMenuSection();
-            this.placesManager.connect(id + '-updated', () => {
+            this.placesManager.connect(`${id}-updated`, () => {
                 this._redisplay(id);
             });
 
@@ -127,7 +128,7 @@ class PlacesMenu extends PanelMenu.Button {
 });
 
 function init() {
-    Convenience.initTranslations();
+    ExtensionUtils.initTranslations();
 }
 
 let _indicator;
@@ -135,9 +136,9 @@ let _indicator;
 function enable() {
     _indicator = new PlacesMenu;
 
-    let pos = 1;
+    let pos = Main.sessionMode.panel.left.indexOf('appMenu');
     if ('apps-menu' in Main.panel.statusArea)
-        pos = 2;
+        pos++;
     Main.panel.addToStatusArea('places-menu', _indicator, pos, 'left');
 }
 

extensions/places-menu/placeDisplay.js

@@ -1,18 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
-const Shell = imports.gi.Shell;
-const Mainloop = imports.mainloop;
+const { Gio, GLib, Shell } = imports.gi;
 const Signals = imports.signals;
-const St = imports.gi.St;
 
-const DND = imports.ui.dnd;
 const Main = imports.ui.main;
-const Params = imports.misc.params;
-const Search = imports.ui.search;
 const ShellMountOperation = imports.ui.shellMountOperation;
-const Util = imports.misc.util;
 
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
@@ -46,65 +38,54 @@ class PlaceInfo {
         return false;
     }
 
-    _createLaunchCallback(launchContext, tryMount) {
-        return (_ignored, result) => {
-            try {
-                Gio.AppInfo.launch_default_for_uri_finish(result);
-            } catch(e) {
-                if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_MOUNTED)) {
-                    let source = {
-                        get_icon: () => { return this.icon; }
-                    };
-                    let op = new ShellMountOperation.ShellMountOperation(source);
-                    this.file.mount_enclosing_volume(0, op.mountOp, null, (file, result) => {
-                        try {
-                            op.close();
-                            file.mount_enclosing_volume_finish(result);
-                        } catch(e) {
-                            if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
-                                // e.g. user canceled the password dialog
-                                return;
-                            Main.notifyError(_("Failed to mount volume for “%s”").format(this.name), e.message);
-                            return;
-                        }
+    async _ensureMountAndLaunch(context, tryMount) {
+        try {
+            await this._launchDefaultForUri(this.file.get_uri(), context, null);
+        } catch (e) {
+            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_MOUNTED)) {
+                Main.notifyError(_('Failed to launch “%s”').format(this.name), e.message);
+                return;
+            }
 
-                        if (tryMount) {
-                            let callback = this._createLaunchCallback(launchContext, false);
-                            Gio.AppInfo.launch_default_for_uri_async(file.get_uri(),
-                                                                     launchContext,
-                                                                     null,
-                                                                     callback);
-                        }
-                    });
-                } else {
-                    Main.notifyError(_("Failed to launch “%s”").format(this.name), e.message);
-                }
+            let source = {
+                get_icon: () => this.icon
+            };
+            let op = new ShellMountOperation.ShellMountOperation(source);
+            try {
+                await this._mountEnclosingVolume(0, op.mountOp, null);
+
+                if (tryMount)
+                    this._ensureMountAndLaunch(context, false);
+            } catch (e) {
+                if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
+                    Main.notifyError(_('Failed to mount volume for “%s”').format(this.name), e.message);
+            } finally {
+                op.close();
             }
         }
     }
 
     launch(timestamp) {
         let launchContext = global.create_app_launch_context(timestamp, -1);
-        let callback = this._createLaunchCallback(launchContext, true);
-        Gio.AppInfo.launch_default_for_uri_async(this.file.get_uri(),
-                                                 launchContext,
-                                                 null,
-                                                 callback);
+        this._ensureMountAndLaunch(launchContext, true);
     }
 
     getIcon() {
-        this.file.query_info_async('standard::symbolic-icon', 0, 0, null,
-                                   (file, result) => {
-                                       try {
-                                           let info = file.query_info_finish(result);
-                                           this.icon = info.get_symbolic_icon();
-                                           this.emit('changed');
-                                       } catch(e) {
-                                           if (e instanceof Gio.IOErrorEnum)
-                                               return;
-                                           throw e;
-                                       }
-                                   });
+        this.file.query_info_async('standard::symbolic-icon',
+            Gio.FileQueryInfoFlags.NONE,
+            0,
+            null,
+            (file, result) => {
+                try {
+                    let info = file.query_info_finish(result);
+                    this.icon = info.get_symbolic_icon();
+                    this.emit('changed');
+                } catch (e) {
+                    if (e instanceof Gio.IOErrorEnum)
+                        return;
+                    throw e;
+                }
+            });
 
         // return a generic icon for this kind for now, until we have the
         // icon from the query info above
@@ -127,18 +108,44 @@ class PlaceInfo {
         try {
             let info = this.file.query_info('standard::display-name', 0, null);
             return info.get_display_name();
-        } catch(e) {
+        } catch (e) {
             if (e instanceof Gio.IOErrorEnum)
                 return this.file.get_basename();
             throw e;
         }
     }
-};
+
+    _launchDefaultForUri(uri, context, cancel) {
+        return new Promise((resolve, reject) => {
+            Gio.AppInfo.launch_default_for_uri_async(uri, context, cancel, (o, res) => {
+                try {
+                    Gio.AppInfo.launch_default_for_uri_finish(res);
+                    resolve();
+                } catch (e) {
+                    reject(e);
+                }
+            });
+        });
+    }
+
+    _mountEnclosingVolume(flags, mountOp, cancel) {
+        return new Promise((resolve, reject) => {
+            this.file.mount_enclosing_volume(flags, mountOp, cancel, (o, res) => {
+                try {
+                    this.file.mount_enclosing_volume_finish(res);
+                    resolve();
+                } catch (e) {
+                    reject(e);
+                }
+            });
+        });
+    }
+}
 Signals.addSignalMethods(PlaceInfo.prototype);
 
 class RootInfo extends PlaceInfo {
     _init() {
-        super._init('devices', Gio.File.new_for_path('/'), _("Computer"));
+        super._init('devices', Gio.File.new_for_path('/'), _('Computer'));
 
         let busName = 'org.freedesktop.hostname1';
         let objPath = '/org/freedesktop/hostname1';
@@ -148,7 +155,7 @@ class RootInfo extends PlaceInfo {
 
             this._proxy = obj;
             this._proxy.connect('g-properties-changed',
-                                this._propertiesChanged.bind(this));
+                this._propertiesChanged.bind(this));
             this._propertiesChanged(obj);
         });
     }
@@ -161,7 +168,7 @@ class RootInfo extends PlaceInfo {
         // GDBusProxy will emit a g-properties-changed when hostname1 goes down
         // ignore it
         if (proxy.g_name_owner) {
-            this.name = proxy.PrettyHostname || _("Computer");
+            this.name = proxy.PrettyHostname || _('Computer');
             this.emit('changed');
         }
     }
@@ -173,7 +180,7 @@ class RootInfo extends PlaceInfo {
         }
         super.destroy();
     }
-};
+}
 
 
 class PlaceDeviceInfo extends PlaceInfo {
@@ -191,24 +198,24 @@ class PlaceDeviceInfo extends PlaceInfo {
     }
 
     eject() {
-        let mountOp = new ShellMountOperation.ShellMountOperation(this._mount);
+        let unmountArgs = [
+            Gio.MountUnmountFlags.NONE,
+            (new ShellMountOperation.ShellMountOperation(this._mount)).mountOp,
+            null // Gio.Cancellable
+        ];
 
         if (this._mount.can_eject())
-            this._mount.eject_with_operation(Gio.MountUnmountFlags.NONE,
-                                             mountOp.mountOp,
-                                             null, // Gio.Cancellable
-                                             this._ejectFinish.bind(this));
+            this._mount.eject_with_operation(...unmountArgs,
+                this._ejectFinish.bind(this));
         else
-            this._mount.unmount_with_operation(Gio.MountUnmountFlags.NONE,
-                                               mountOp.mountOp,
-                                               null, // Gio.Cancellable
-                                               this._unmountFinish.bind(this));
+            this._mount.unmount_with_operation(...unmountArgs,
+                this._unmountFinish.bind(this));
     }
 
     _ejectFinish(mount, result) {
         try {
             mount.eject_with_operation_finish(result);
-        } catch(e) {
+        } catch (e) {
             this._reportFailure(e);
         }
     }
@@ -216,16 +223,16 @@ class PlaceDeviceInfo extends PlaceInfo {
     _unmountFinish(mount, result) {
         try {
             mount.unmount_with_operation_finish(result);
-        } catch(e) {
+        } catch (e) {
             this._reportFailure(e);
         }
     }
 
     _reportFailure(exception) {
-        let msg = _("Ejecting drive “%s” failed:").format(this._mount.get_name());
+        let msg = _('Ejecting drive “%s” failed:').format(this._mount.get_name());
         Main.notifyError(msg, exception.message);
     }
-};
+}
 
 class PlaceVolumeInfo extends PlaceInfo {
     _init(kind, volume) {
@@ -251,7 +258,7 @@ class PlaceVolumeInfo extends PlaceInfo {
     getIcon() {
         return this._volume.get_symbolic_icon();
     }
-};
+}
 
 const DEFAULT_DIRECTORIES = [
     GLib.UserDirectory.DIRECTORY_DOCUMENTS,
@@ -271,9 +278,8 @@ var PlacesManager = class {
         };
 
         this._settings = new Gio.Settings({ schema_id: BACKGROUND_SCHEMA });
-        this._showDesktopIconsChangedId =
-            this._settings.connect('changed::show-desktop-icons',
-                                   this._updateSpecials.bind(this));
+        this._showDesktopIconsChangedId = this._settings.connect(
+            'changed::show-desktop-icons', this._updateSpecials.bind(this));
         this._updateSpecials();
 
         /*
@@ -283,7 +289,7 @@ var PlacesManager = class {
         this._connectVolumeMonitorSignals();
         this._updateMounts();
 
-        this._bookmarksFile = this._findBookmarksFile()
+        this._bookmarksFile = this._findBookmarksFile();
         this._bookmarkTimeoutId = 0;
         this._monitor = null;
 
@@ -293,11 +299,12 @@ var PlacesManager = class {
                 if (this._bookmarkTimeoutId > 0)
                     return;
                 /* Defensive event compression */
-                this._bookmarkTimeoutId = Mainloop.timeout_add(100, () => {
-                    this._bookmarkTimeoutId = 0;
-                    this._reloadBookmarks();
-                    return false;
-                });
+                this._bookmarkTimeoutId = GLib.timeout_add(
+                    GLib.PRIORITY_DEFAULT, 100, () => {
+                        this._bookmarkTimeoutId = 0;
+                        this._reloadBookmarks();
+                        return false;
+                    });
             });
 
             this._reloadBookmarks();
@@ -305,9 +312,17 @@ var PlacesManager = class {
     }
 
     _connectVolumeMonitorSignals() {
-        const signals = ['volume-added', 'volume-removed', 'volume-changed',
-                         'mount-added', 'mount-removed', 'mount-changed',
-                         'drive-connected', 'drive-disconnected', 'drive-changed'];
+        const signals = [
+            'volume-added',
+            'volume-removed',
+            'volume-changed',
+            'mount-added',
+            'mount-removed',
+            'mount-changed',
+            'drive-connected',
+            'drive-disconnected',
+            'drive-changed'
+        ];
 
         this._volumeMonitorSignals = [];
         let func = this._updateMounts.bind(this);
@@ -328,18 +343,19 @@ var PlacesManager = class {
         if (this._monitor)
             this._monitor.cancel();
         if (this._bookmarkTimeoutId)
-            Mainloop.source_remove(this._bookmarkTimeoutId);
+            GLib.source_remove(this._bookmarkTimeoutId);
     }
 
     _updateSpecials() {
-        this._places.special.forEach(p => { p.destroy(); });
+        this._places.special.forEach(p => p.destroy());
         this._places.special = [];
 
         let homePath = GLib.get_home_dir();
 
-        this._places.special.push(new PlaceInfo('special',
-                                                Gio.File.new_for_path(homePath),
-                                                _("Home")));
+        this._places.special.push(new PlaceInfo(
+            'special',
+            Gio.File.new_for_path(homePath),
+            _('Home')));
 
         let specials = [];
         let dirs = DEFAULT_DIRECTORIES.slice();
@@ -355,7 +371,7 @@ var PlacesManager = class {
             let file = Gio.File.new_for_path(specialPath), info;
             try {
                 info = new PlaceInfo('special', file);
-            } catch(e) {
+            } catch (e) {
                 if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
                     continue;
                 throw e;
@@ -374,30 +390,31 @@ var PlacesManager = class {
         let networkMounts = [];
         let networkVolumes = [];
 
-        this._places.devices.forEach(p => { p.destroy(); });
+        this._places.devices.forEach(p => p.destroy());
         this._places.devices = [];
-        this._places.network.forEach(p => { p.destroy(); });
+        this._places.network.forEach(p => p.destroy());
         this._places.network = [];
 
         /* Add standard places */
         this._places.devices.push(new RootInfo());
-        this._places.network.push(new PlaceInfo('network',
-                                                Gio.File.new_for_uri('network:///'),
-                                                _("Browse Network"),
-                                                'network-workgroup-symbolic'));
+        this._places.network.push(new PlaceInfo(
+            'network',
+            Gio.File.new_for_uri('network:///'),
+            _('Browse Network'),
+            'network-workgroup-symbolic'));
 
         /* first go through all connected drives */
         let drives = this._volumeMonitor.get_connected_drives();
         for (let i = 0; i < drives.length; i++) {
             let volumes = drives[i].get_volumes();
 
-            for(let j = 0; j < volumes.length; j++) {
+            for (let j = 0; j < volumes.length; j++) {
                 let identifier = volumes[j].get_identifier('class');
                 if (identifier && identifier.includes('network')) {
                     networkVolumes.push(volumes[j]);
                 } else {
                     let mount = volumes[j].get_mount();
-                    if(mount != null)
+                    if (mount != null)
                         this._addMount('devices', mount);
                 }
             }
@@ -405,8 +422,8 @@ var PlacesManager = class {
 
         /* add all volumes that is not associated with a drive */
         let volumes = this._volumeMonitor.get_volumes();
-        for(let i = 0; i < volumes.length; i++) {
-            if(volumes[i].get_drive() != null)
+        for (let i = 0; i < volumes.length; i++) {
+            if (volumes[i].get_drive() != null)
                 continue;
 
             let identifier = volumes[i].get_identifier('class');
@@ -414,18 +431,18 @@ var PlacesManager = class {
                 networkVolumes.push(volumes[i]);
             } else {
                 let mount = volumes[i].get_mount();
-                if(mount != null)
+                if (mount != null)
                     this._addMount('devices', mount);
             }
         }
 
         /* add mounts that have no volume (/etc/mtab mounts, ftp, sftp,...) */
         let mounts = this._volumeMonitor.get_mounts();
-        for(let i = 0; i < mounts.length; i++) {
-            if(mounts[i].is_shadowed())
+        for (let i = 0; i < mounts.length; i++) {
+            if (mounts[i].is_shadowed())
                 continue;
 
-            if(mounts[i].get_volume())
+            if (mounts[i].get_volume())
                 continue;
 
             let root = mounts[i].get_default_location();
@@ -522,7 +539,7 @@ var PlacesManager = class {
 
         try {
             devItem = new PlaceDeviceInfo(kind, mount);
-        } catch(e) {
+        } catch (e) {
             if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
                 return;
             throw e;
@@ -536,7 +553,7 @@ var PlacesManager = class {
 
         try {
             volItem = new PlaceVolumeInfo(kind, volume);
-        } catch(e) {
+        } catch (e) {
             if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
                 return;
             throw e;

extensions/screenshot-window-sizer/extension.js

@@ -1,3 +1,4 @@
+/* exported enable disable */
 /* Screenshot Window Sizer for Gnome Shell
  *
  * Copyright (c) 2013 Owen Taylor <otaylor@redhat.com>
@@ -18,21 +19,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-const Gio = imports.gi.Gio;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
+const { Meta, Shell, St } = imports.gi;
 
+const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
 
-const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
-const Convenience = Me.imports.convenience;
+const MESSAGE_FADE_TIME = 2000;
 
-const MESSAGE_FADE_TIME = 2;
-
-let text, button;
+let text;
 
 function hideMessage() {
     text.destroy();
@@ -45,20 +40,22 @@ function flashMessage(message) {
         Main.uiGroup.add_actor(text);
     }
 
-    Tweener.removeTweens(text);
+    text.remove_all_transitions();
     text.text = message;
 
     text.opacity = 255;
 
     let monitor = Main.layoutManager.primaryMonitor;
-    text.set_position(monitor.x + Math.floor(monitor.width / 2 - text.width / 2),
-                      monitor.y + Math.floor(monitor.height / 2 - text.height / 2));
+    text.set_position(
+        monitor.x + Math.floor(monitor.width / 2 - text.width / 2),
+        monitor.y + Math.floor(monitor.height / 2 - text.height / 2));
 
-    Tweener.addTween(text,
-                     { opacity: 0,
-                       time: MESSAGE_FADE_TIME,
-                       transition: 'easeOutQuad',
-                       onComplete: hideMessage });
+    text.ease({
+        opacity: 0,
+        duration: MESSAGE_FADE_TIME,
+        mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+        onComplete: hideMessage,
+    });
 }
 
 let SIZES = [
@@ -66,7 +63,9 @@ let SIZES = [
     [800, 450],
     [1024, 576],
     [1200, 675],
-    [1600, 900]
+    [1600, 900],
+    [360, 654], // Phone portrait maximized
+    [720, 360] // Phone landscape fullscreen
 ];
 
 function cycleScreenshotSizes(display, window, binding) {
@@ -76,8 +75,8 @@ function cycleScreenshotSizes(display, window, binding) {
     let backwards = (modifiers & Meta.VirtualModifier.SHIFT_MASK) != 0;
 
     // Unmaximize first
-    if (window.maximized_horizontally || window.maximizedVertically)
-        window.unmaximize(Meta.MaximizeFlags.HORIZONTAL | Meta.MaximizeFlags.VERTICAL);
+    if (window.get_maximized() != 0)
+        window.unmaximize(Meta.MaximizeFlags.BOTH);
 
     let workArea = window.get_work_area_current_monitor();
     let outerRect = window.get_frame_rect();
@@ -124,8 +123,8 @@ function cycleScreenshotSizes(display, window, binding) {
 
     let newOuterRect = window.get_frame_rect();
     let message = '%d×%d'.format(
-            (newOuterRect.width / scaleFactor),
-            (newOuterRect.height / scaleFactor));
+        (newOuterRect.width / scaleFactor),
+        (newOuterRect.height / scaleFactor));
 
     // The new size might have been constrained by geometry hints (e.g. for
     // a terminal) - in that case, include the actual ratio to the message
@@ -137,21 +136,19 @@ function cycleScreenshotSizes(display, window, binding) {
     flashMessage(message);
 }
 
-function init() {
-}
-
 function enable() {
-    Main.wm.addKeybinding('cycle-screenshot-sizes',
-                          Convenience.getSettings(),
-                          Meta.KeyBindingFlags.PER_WINDOW,
-                          Shell.ActionMode.NORMAL,
-                          cycleScreenshotSizes);
-    Main.wm.addKeybinding('cycle-screenshot-sizes-backward',
-                          Convenience.getSettings(),
-                          Meta.KeyBindingFlags.PER_WINDOW |
-                          Meta.KeyBindingFlags.IS_REVERSED,
-                          Shell.ActionMode.NORMAL,
-                          cycleScreenshotSizes);
+    Main.wm.addKeybinding(
+        'cycle-screenshot-sizes',
+        ExtensionUtils.getSettings(),
+        Meta.KeyBindingFlags.PER_WINDOW,
+        Shell.ActionMode.NORMAL,
+        cycleScreenshotSizes);
+    Main.wm.addKeybinding(
+        'cycle-screenshot-sizes-backward',
+        ExtensionUtils.getSettings(),
+        Meta.KeyBindingFlags.PER_WINDOW | Meta.KeyBindingFlags.IS_REVERSED,
+        Shell.ActionMode.NORMAL,
+        cycleScreenshotSizes);
 }
 
 function disable() {

extensions/user-theme/extension.js

@@ -1,23 +1,21 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
-// Load shell theme from ~/.themes/name/gnome-shell
+// Load shell theme from ~/.local/share/themes/name/gnome-shell
+/* exported init */
 
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
+const { Gio, GLib } = imports.gi;
+
+const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
 
 const SETTINGS_KEY = 'name';
 
-const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
-const Convenience = Me.imports.convenience;
-
 class ThemeManager {
     constructor() {
-        this._settings = Convenience.getSettings();
+        this._settings = ExtensionUtils.getSettings();
     }
 
     enable() {
-        this._changedId = this._settings.connect('changed::'+SETTINGS_KEY, this._changeTheme.bind(this));
+        this._changedId = this._settings.connect(`changed::${SETTINGS_KEY}`, this._changeTheme.bind(this));
         this._changeTheme();
     }
 
@@ -32,36 +30,32 @@ class ThemeManager {
     }
 
     _changeTheme() {
-        let _stylesheet = null;
-        let _themeName = this._settings.get_string(SETTINGS_KEY);
+        let stylesheet = null;
+        let themeName = this._settings.get_string(SETTINGS_KEY);
 
-        if (_themeName) {
-            let _userCssStylesheet = GLib.get_home_dir() + '/.themes/' + _themeName + '/gnome-shell/gnome-shell.css';
-            let file = Gio.file_new_for_path(_userCssStylesheet);
-            if (file.query_exists(null))
-                _stylesheet = _userCssStylesheet;
-            else {
-                let sysdirs = GLib.get_system_data_dirs();
-                sysdirs.unshift(GLib.get_user_data_dir());
-                for (let i = 0; i < sysdirs.length; i++) {
-                    _userCssStylesheet = sysdirs[i] + '/themes/' + _themeName + '/gnome-shell/gnome-shell.css';
-                    let file = Gio.file_new_for_path(_userCssStylesheet);
-                    if (file.query_exists(null)) {
-                        _stylesheet = _userCssStylesheet;
-                        break;
-                    }
-                }
-            }
+        if (themeName) {
+            let stylesheetPaths = [
+                [GLib.get_home_dir(), '.themes'],
+                [GLib.get_user_data_dir(), 'themes'],
+                ...GLib.get_system_data_dirs().map(dir => [dir, 'themes'])
+            ].map(themeDir => GLib.build_filenamev([
+                ...themeDir, themeName, 'gnome-shell', 'gnome-shell.css'
+            ]));
+
+            stylesheet = stylesheetPaths.find(path => {
+                let file = Gio.file_new_for_path(path);
+                return file.query_exists(null);
+            });
         }
 
-        if (_stylesheet)
-            global.log('loading user theme: ' + _stylesheet);
+        if (stylesheet)
+            global.log(`loading user theme: ${stylesheet}`);
         else
             global.log('loading default theme (Adwaita)');
-        Main.setThemeStylesheet(_stylesheet);
+        Main.setThemeStylesheet(stylesheet);
         Main.loadTheme();
     }
-};
+}
 
 function init() {
     return new ThemeManager();

extensions/window-list/classic.css

@@ -4,36 +4,39 @@
     border-top-width: 1px;
     border-bottom-width: 0px;
     height: 2.25em ;
+    padding: 2px;
+  }
+
+  .bottom-panel .window-button > StWidget,
+  .bottom-panel .window-picker-toggle > StWidget {
+    color: #2e3436;
+    background-color: #eee;
+    border-radius: 3px;
+    padding: 3px 6px 1px;
+    box-shadow: none;
+    text-shadow: none;
+    border: 1px solid rgba(0,0,0,0.2);
   }
 
   .bottom-panel .window-button > StWidget {
-    background-gradient-drection: vertical;
-    background-color: #fff;
-    background-gradient-start: #fff;
-    background-gradient-end: #eee;
-    color: #000;
     -st-natural-width: 18.7em;
     max-width: 18.75em;
-    color: #2e3436;
-    background-color: #eee;
-    border-radius: 2px;
-    padding: 3px 6px 1px;
-    box-shadow: inset -1px -1px 1px rgba(0,0,0,0.5);
-    text-shadow: 0 0 transparent;
   }
 
-  .bottom-panel .window-button:hover > StWidget {
+  .bottom-panel .window-button:hover > StWidget,
+  .bottom-panel .window-picker-toggle:hover > StWidget {
     background-color: #f9f9f9;
   }
 
   .bottom-panel .window-button:active > StWidget,
   .bottom-panel .window-button:focus > StWidget {
-    box-shadow: inset 1px 1px 2px rgba(0,0,0,0.5);
+    box-shadow: inset 0 1px 3px rgba(0,0,0,0.1);
   }
 
-  .bottom-panel .window-button.focused > StWidget {
-    background-color: #ddd;
-    box-shadow: inset 1px 1px 1px rgba(0,0,0,0.5);
+  .bottom-panel .window-button.focused > StWidget,
+  .bottom-panel .window-picker-toggle:checked > StWidget {
+    background-color: #ccc;
+    box-shadow: inset 0 1px 3px rgba(0,0,0,0.1);
   }
 
   .bottom-panel .window-button.focused:hover > StWidget {
@@ -42,5 +45,24 @@
 
   .bottom-panel .window-button.minimized > StWidget {
     color: #888;
-    box-shadow: inset -1px -1px 1px rgba(0,0,0,0.5);
+    box-shadow: none;
   }
+
+/* workspace switcher */
+.window-list-workspace-indicator .workspace {
+  background-color: #ddd;
+}
+
+.window-list-workspace-indicator .workspace.active {
+  background-color: #ccc;
+}
+
+.window-list-window-preview {
+  background-color: #ededed;
+  border: 1px solid #ccc;
+}
+
+.window-list-window-preview.active {
+  background-color: #f6f5f4;
+  border: 2px solid #888;
+}

extensions/window-list/meson.build

@@ -4,7 +4,7 @@ extension_data += configure_file(
   configuration: metadata_conf
 )
 
-extension_sources += files('prefs.js')
+extension_sources += files('prefs.js', 'windowPicker.js', 'workspaceIndicator.js')
 extension_schemas += files(metadata_conf.get('gschemaname') + '.gschema.xml')
 
 if classic_mode_enabled

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

@@ -15,6 +15,13 @@
         window list. Possible values are “never”, “auto” and “always”.
       </description>
     </key>
+    <key name="display-all-workspaces" type="b">
+      <default>false</default>
+      <summary>Show windows from all workspaces</summary>
+      <description>
+        Whether to show windows from all workspaces or only the current one.
+      </description>
+    </key>
     <key name="show-on-all-monitors" type="b">
       <default>false</default>
       <summary>Show the window list on all monitors</summary>

extensions/window-list/prefs.js

@@ -1,19 +1,16 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+/* exported init buildPrefsWidget */
 
-const Gio = imports.gi.Gio;
-const GObject = imports.gi.GObject;
-const Gtk = imports.gi.Gtk;
+const { Gio, GObject, Gtk } = imports.gi;
 
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
 
 const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
-const Convenience = Me.imports.convenience;
 
 
 function init() {
-    Convenience.initTranslations();
+    ExtensionUtils.initTranslations();
 }
 
 const WindowListPrefsWidget = GObject.registerClass(
@@ -25,27 +22,31 @@ class WindowListPrefsWidget extends Gtk.Grid {
         this.row_spacing = 6;
         this.orientation = Gtk.Orientation.VERTICAL;
 
-        let groupingLabel = '<b>' + _("Window Grouping") + '</b>';
-        this.add(new Gtk.Label({ label: groupingLabel, use_markup: true,
-                                 halign: Gtk.Align.START }));
+        let groupingLabel = '<b>%s</b>'.format(_('Window Grouping'));
+        this.add(new Gtk.Label({
+            label: groupingLabel, use_markup: true,
+            halign: Gtk.Align.START
+        }));
 
         let align = new Gtk.Alignment({ left_padding: 12 });
         this.add(align);
 
-        let grid = new Gtk.Grid({ orientation: Gtk.Orientation.VERTICAL,
-                                  row_spacing: 6,
-                                  column_spacing: 6 });
+        let grid = new Gtk.Grid({
+            orientation: Gtk.Orientation.VERTICAL,
+            row_spacing: 6,
+            column_spacing: 6
+        });
         align.add(grid);
 
-        this._settings = Convenience.getSettings();
+        this._settings = ExtensionUtils.getSettings();
         let currentMode = this._settings.get_string('grouping-mode');
         let range = this._settings.get_range('grouping-mode');
         let modes = range.deep_unpack()[1].deep_unpack();
 
         let modeLabels = {
-            'never': _("Never group windows"),
-            'auto': _("Group windows when space is limited"),
-            'always': _("Always group windows")
+            'never': _('Never group windows'),
+            'auto': _('Group windows when space is limited'),
+            'always': _('Always group windows')
         };
 
         let radio = null;
@@ -53,13 +54,15 @@ class WindowListPrefsWidget extends Gtk.Grid {
             let mode = modes[i];
             let label = modeLabels[mode];
             if (!label) {
-               log('Unhandled option "%s" for grouping-mode'.format(mode));
-               continue;
+                log('Unhandled option "%s" for grouping-mode'.format(mode));
+                continue;
             }
 
-            radio = new Gtk.RadioButton({ active: currentMode == mode,
-                                          label: label,
-                                          group: radio });
+            radio = new Gtk.RadioButton({
+                active: currentMode == mode,
+                label: label,
+                group: radio
+            });
             grid.add(radio);
 
             radio.connect('toggled', button => {
@@ -68,10 +71,19 @@ class WindowListPrefsWidget extends Gtk.Grid {
             });
         }
 
-        let check = new Gtk.CheckButton({ label: _("Show on all monitors"),
-                                          margin_top: 6 });
+        let check = new Gtk.CheckButton({
+            label: _('Show on all monitors'),
+            margin_top: 6
+        });
         this._settings.bind('show-on-all-monitors', check, 'active', Gio.SettingsBindFlags.DEFAULT);
         this.add(check);
+
+        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.add(check);
     }
 });
 

extensions/window-list/stylesheet.css

@@ -26,9 +26,8 @@
   spacing: 4px;
 }
 
-.window-button > StWidget {
-  -st-natural-width: 18.75em;
-  max-width: 18.75em;
+.window-button > StWidget,
+.window-picker-toggle > StWidget {
   color: #bbb;
   background-color: black;
   border-radius: 4px;
@@ -37,7 +36,21 @@
   text-shadow: 1px 1px 4px rgba(0,0,0,0.8);
 }
 
-.window-button:hover > StWidget {
+.window-picker-toggle {
+  padding: 3px;
+}
+
+.window-picker-toggle > StWidet {
+  border: 1px solid rgba(255,255,255,0.3);
+}
+
+.window-button > StWidget {
+  -st-natural-width: 18.75em;
+  max-width: 18.75em;
+}
+
+.window-button:hover > StWidget,
+.window-picker-toggle:hover > StWidget {
   color: white;
   background-color: #1f1f1f;
 }
@@ -47,12 +60,14 @@
   box-shadow: inset 2px 2px 4px rgba(255,255,255,0.5);
 }
 
-.window-button.focused > StWidget {
+.window-button.focused > StWidget,
+.window-picker-toggle:checked > StWidget {
   color: white;
   box-shadow: inset 1px 1px 4px rgba(255,255,255,0.7);
 }
 
-.window-button.focused:active > StWidget {
+.window-button.focused:active > StWidget,
+.window-picker-toggle:checked:active > StWidget {
   box-shadow: inset 2px 2px 4px rgba(255,255,255,0.7);
 }
 
@@ -70,13 +85,50 @@
   height: 24px;
 }
 
-.window-list-workspace-indicator {
+.window-list-workspace-indicator .status-label-bin {
+  background-color: rgba(200, 200, 200, .3);
+  border: 1px solid #cccccc;
+  padding: 0 3px;
+  margin: 3px 0;
+}
+
+.window-list-workspace-indicator .workspaces-box {
+  spacing: 3px;
   padding: 3px;
 }
 
-.window-list-workspace-indicator > StWidget {
-  background-color: rgba(200, 200, 200, .3);
+.window-list-workspace-indicator .workspace {
   border: 1px solid #cccccc;
+  width: 52px;
+}
+
+.window-list-workspace-indicator .workspace:first-child:last-child:ltr,
+.window-list-workspace-indicator .workspace:first-child:last-child:rtl {
+  border-radius: 4px;
+}
+
+.window-list-workspace-indicator .workspace:first-child:ltr,
+.window-list-workspace-indicator .workspace:last-child:rtl {
+  border-radius: 4px 0 0 4px;
+}
+
+.window-list-workspace-indicator .workspace:first-child:rtl,
+.window-list-workspace-indicator .workspace:last-child:ltr {
+  border-radius: 0 4px 4px 0;
+}
+
+.window-list-workspace-indicator .workspace.active {
+  background-color: rgba(200, 200, 200, .3);
+}
+
+.window-list-window-preview {
+  background-color: #252525;
+  border: 1px solid #ccc;
+}
+
+.window-list-window-preview.active {
+  background-color: #353535;
+  border: 2px solid #ccc;
 }
 
 .notification {

extensions/window-list/windowPicker.js

@@ -0,0 +1,277 @@
+/* exported WindowPicker, WindowPickerToggle */
+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;
+
+let MyWorkspacesDisplay = class extends WorkspacesDisplay {
+    constructor() {
+        super();
+
+        this.actor.add_constraint(
+            new Layout.MonitorConstraint({
+                primary: true,
+                work_area: true
+            }));
+
+        this.actor.connect('destroy', this._onDestroy.bind(this));
+
+        this._workareasChangedId = global.display.connect('workareas-changed',
+            this._onWorkAreasChanged.bind(this));
+        this._onWorkAreasChanged();
+    }
+
+    show(...args) {
+        if (this._scrollEventId == 0)
+            this._scrollEventId = Main.windowPicker.connect('scroll-event',
+                this._onScrollEvent.bind(this));
+
+        super.show(...args);
+    }
+
+    hide(...args) {
+        if (this._scrollEventId > 0)
+            Main.windowPicker.disconnect(this._scrollEventId);
+        this._scrollEventId = 0;
+
+        super.hide(...args);
+    }
+
+    _onWorkAreasChanged() {
+        let { primaryIndex } = Main.layoutManager;
+        let workarea = Main.layoutManager.getWorkAreaForMonitor(primaryIndex);
+        this.setWorkspacesFullGeometry(workarea);
+    }
+
+    _updateWorkspacesViews() {
+        super._updateWorkspacesViews();
+
+        this._workspacesViews.forEach(v => {
+            Main.layoutManager.overviewGroup.remove_actor(v.actor);
+            Main.windowPicker.add_actor(v.actor);
+        });
+    }
+
+    _onDestroy() {
+        if (this._workareasChangedId)
+            global.display.disconnect(this._workareasChangedId);
+        this._workareasChangedId = 0;
+    }
+};
+
+var WindowPicker = GObject.registerClass({
+    GTypeName: 'WindowListWindowPicker',
+    Signals: {
+        'open-state-changed': { param_types: [GObject.TYPE_BOOLEAN] }
+    }
+}, class extends Clutter.Actor {
+    _init() {
+        this._visible = false;
+        this._modal = false;
+
+        this._overlayKeyId = 0;
+        this._stageKeyPressId = 0;
+
+        super._init();
+
+        this.connect('destroy', this._onDestroy.bind(this));
+
+        global.bind_property('screen-width',
+            this, 'width',
+            GObject.BindingFlags.SYNC_CREATE);
+        global.bind_property('screen-height',
+            this, 'height',
+            GObject.BindingFlags.SYNC_CREATE);
+
+        this._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.actor);
+
+        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._overlayKeyId = global.display.connect('overlay-key', () => {
+                if (!this._visible)
+                    this.open();
+                else
+                    this.close();
+            });
+        }
+    }
+
+    get visible() {
+        return this._visible;
+    }
+
+    open() {
+        if (this._visible)
+            return;
+
+        this._visible = true;
+
+        if (!this._syncGrab())
+            return;
+
+        this._fakeOverviewVisible(true);
+        this._shadeBackgrounds();
+        this._fakeOverviewAnimation();
+        this._workspacesDisplay.show(false);
+
+        this._stageKeyPressId = global.stage.connect('key-press-event',
+            (a, event) => {
+                let sym = event.get_key_symbol();
+                if (sym == Clutter.KEY_Escape) {
+                    this.close();
+                    return Clutter.EVENT_STOP;
+                }
+                return Clutter.EVENT_PROPAGATE;
+            });
+
+        this.emit('open-state-changed', this._visible);
+    }
+
+    close() {
+        if (!this._visible)
+            return;
+
+        this._visible = false;
+
+        if (!this._syncGrab())
+            return;
+
+        this._workspacesDisplay.animateFromOverview(false);
+        this._unshadeBackgrounds();
+        this._fakeOverviewAnimation(() => {
+            this._workspacesDisplay.hide();
+            this._fakeOverviewVisible(false);
+        });
+
+        global.stage.disconnect(this._stageKeyPressId);
+        this._stageKeyPressId = 0;
+
+        this.emit('open-state-changed', this._visible);
+    }
+
+    _fakeOverviewAnimation(onComplete) {
+        Main.overview.animationInProgress = true;
+        GLib.timeout_add(
+            GLib.PRIORITY_DEFAULT,
+            Overview.ANIMATION_TIME,
+            () => {
+                Main.overview.animationInProgress = false;
+                if (onComplete)
+                    onComplete();
+            });
+    }
+
+    _fakeOverviewVisible(visible) {
+        // Fake overview state for WorkspacesDisplay
+        Main.overview.visible = visible;
+
+        // Hide real windows
+        Main.layoutManager._inOverview = visible;
+        Main.layoutManager._updateVisibility();
+    }
+
+    _syncGrab() {
+        if (this._visible) {
+            if (this._modal)
+                return true;
+
+            this._modal = Main.pushModal(this, {
+                actionMode: Shell.ActionMode.OVERVIEW
+            });
+
+            if (!this._modal) {
+                this.hide();
+                return false;
+            }
+        } else if (this._modal) {
+            Main.popModal(this);
+            this._modal = false;
+        }
+        return true;
+    }
+
+    _onDestroy() {
+        if (this._monitorsChangedId)
+            Main.layoutManager.disconnect(this._monitorsChangedId);
+        this._monitorsChangedId = 0;
+
+        if (this._overlayKeyId)
+            global.display.disconnect(this._overlayKeyId);
+        this._overlayKeyId = 0;
+
+        if (this._stageKeyPressId)
+            global.stage.disconnect(this._stageKeyPressId);
+        this._stageKeyPressId = 0;
+    }
+
+    _updateBackgrounds() {
+        Main.overview._updateBackgrounds.call(this);
+    }
+
+    _shadeBackgrounds() {
+        Main.overview._shadeBackgrounds.call(this);
+    }
+
+    _unshadeBackgrounds() {
+        Main.overview._unshadeBackgrounds.call(this);
+    }
+});
+
+var WindowPickerToggle = GObject.registerClass(
+class WindowPickerToggle extends St.Button {
+    _init() {
+        let iconBin = new St.Widget({
+            layout_manager: new Clutter.BinLayout()
+        });
+        iconBin.add_child(new St.Icon({
+            icon_name: 'focus-windows-symbolic',
+            icon_size: 16,
+            x_expand: true,
+            y_expand: true,
+            x_align: Clutter.ActorAlign.CENTER,
+            y_align: Clutter.ActorAlign.CENTER
+        }));
+        super._init({
+            style_class: 'window-picker-toggle',
+            child: iconBin,
+            visible: !Main.sessionMode.hasOverview,
+            x_fill: true,
+            y_fill: true,
+            toggle_mode: true
+        });
+
+        this.connect('notify::checked', () => {
+            if (this.checked)
+                Main.windowPicker.open();
+            else
+                Main.windowPicker.close();
+        });
+
+        Main.windowPicker.connect('open-state-changed', () => {
+            this.checked = Main.windowPicker.visible;
+        });
+    }
+});

extensions/window-list/workspaceIndicator.js

@@ -0,0 +1,402 @@
+/* exported WorkspaceIndicator */
+const { Clutter, Gio, GObject, Meta, St } = imports.gi;
+
+const DND = imports.ui.dnd;
+const Main = imports.ui.main;
+const PanelMenu = imports.ui.panelMenu;
+const PopupMenu = imports.ui.popupMenu;
+
+const Gettext = imports.gettext.domain('gnome-shell-extensions');
+const _ = Gettext.gettext;
+
+let WindowPreview = GObject.registerClass({
+    GTypeName: 'WindowListWindowPreview'
+}, class WindowPreview extends St.Button {
+    _init(window) {
+        super._init({
+            style_class: 'window-list-window-preview'
+        });
+
+        this._delegate = this;
+        DND.makeDraggable(this, { restoreOnSuccess: true });
+
+        this._window = window;
+
+        this.connect('destroy', this._onDestroy.bind(this));
+
+        this._sizeChangedId = this._window.connect('size-changed',
+            this._relayout.bind(this));
+        this._positionChangedId = this._window.connect('position-changed',
+            this._relayout.bind(this));
+        this._minimizedChangedId = this._window.connect('notify::minimized',
+            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));
+        this._onFocusChanged();
+    }
+
+    // needed for DND
+    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() {
+        if (global.display.focus_window == this._window)
+            this.add_style_class_name('active');
+        else
+            this.remove_style_class_name('active');
+    }
+
+    _relayout() {
+        let monitor = Main.layoutManager.findIndexForActor(this);
+        this.visible = monitor == this._window.get_monitor() &&
+            this._window.showing_on_its_workspace();
+
+        if (!this.visible)
+            return;
+
+        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;
+
+        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));
+    }
+});
+
+let WorkspaceThumbnail = GObject.registerClass({
+    GTypeName: 'WindowListWorkspaceThumbnail'
+}, class WorkspaceThumbnail extends St.Button {
+    _init(index) {
+        super._init({
+            style_class: 'workspace',
+            child: new Clutter.Actor({
+                layout_manager: new Clutter.BinLayout(),
+                clip_to_allocation: true
+            }),
+            x_fill: true,
+            y_fill: true
+        });
+
+        this.connect('destroy', this._onDestroy.bind(this));
+
+        this._index = index;
+        this._delegate = this; // needed for DND
+
+        this._windowPreviews = new Map();
+
+        let workspaceManager = global.workspace_manager;
+        this._workspace = workspaceManager.get_workspace_by_index(index);
+
+        this._windowAddedId = this._workspace.connect('window-added',
+            (ws, window) => {
+                this._addWindow(window);
+            });
+        this._windowRemovedId = this._workspace.connect('window-removed',
+            (ws, window) => {
+                this._removeWindow(window);
+            });
+        this._restackedId = global.display.connect('restacked',
+            this._onRestacked.bind(this));
+
+        this._workspace.list_windows().forEach(w => this._addWindow(w));
+        this._onRestacked();
+    }
+
+    acceptDrop(source) {
+        if (!source.realWindow)
+            return false;
+
+        let window = source.realWindow.get_meta_window();
+        this._moveWindow(window);
+        return true;
+    }
+
+    handleDragOver(source) {
+        if (source.realWindow)
+            return DND.DragMotionResult.MOVE_DROP;
+        else
+            return DND.DragMotionResult.CONTINUE;
+    }
+
+    _addWindow(window) {
+        if (this._windowPreviews.has(window))
+            return;
+
+        let preview = new WindowPreview(window);
+        preview.connect('clicked', (a, btn) => this.emit('clicked', btn));
+        this._windowPreviews.set(window, preview);
+        this.child.add_child(preview);
+    }
+
+    _removeWindow(window) {
+        let preview = this._windowPreviews.get(window);
+        if (!preview)
+            return;
+
+        this._windowPreviews.delete(window);
+        preview.destroy();
+    }
+
+    _onRestacked() {
+        let lastPreview = null;
+        let windows = global.get_window_actors().map(a => a.meta_window);
+        for (let i = 0; i < windows.length; i++) {
+            let preview = this._windowPreviews.get(windows[i]);
+            if (!preview)
+                continue;
+
+            this.child.set_child_above_sibling(preview, lastPreview);
+            lastPreview = preview;
+        }
+    }
+
+    _moveWindow(window) {
+        let monitorIndex = Main.layoutManager.findIndexForActor(this);
+        if (monitorIndex != window.get_monitor())
+            window.move_to_monitor(monitorIndex);
+        window.change_workspace_by_index(this._index, false);
+    }
+
+    on_clicked() {
+        let ws = global.workspace_manager.get_workspace_by_index(this._index);
+        if (ws)
+            ws.activate(global.get_current_time());
+    }
+
+    _onDestroy() {
+        this._workspace.disconnect(this._windowAddedId);
+        this._workspace.disconnect(this._windowRemovedId);
+        global.display.disconnect(this._restackedId);
+    }
+});
+
+var WorkspaceIndicator = GObject.registerClass({
+    GTypeName: 'WindowListWorkspaceIndicator'
+}, class WorkspaceIndicator extends PanelMenu.Button {
+    _init() {
+        super._init(0.0, _('Workspace Indicator'), true);
+        this.setMenu(new PopupMenu.PopupMenu(this, 0.0, St.Side.BOTTOM));
+        this.add_style_class_name('window-list-workspace-indicator');
+        this.menu.actor.remove_style_class_name('panel-menu');
+
+        let container = new St.Widget({
+            layout_manager: new Clutter.BinLayout(),
+            x_expand: true,
+            y_expand: true
+        });
+        this.add_actor(container);
+
+        let workspaceManager = global.workspace_manager;
+
+        this._currentWorkspace = workspaceManager.get_active_workspace_index();
+        this._statusLabel = new St.Label({ text: this._getStatusText() });
+
+        this._statusBin = new St.Bin({
+            style_class: 'status-label-bin',
+            x_expand: true,
+            y_expand: true,
+            child: this._statusLabel
+        });
+        container.add_actor(this._statusBin);
+
+        this._thumbnailsBox = new St.BoxLayout({
+            style_class: 'workspaces-box',
+            y_expand: true,
+            reactive: true
+        });
+        this._thumbnailsBox.connect('scroll-event',
+            this._onScrollEvent.bind(this));
+        container.add_actor(this._thumbnailsBox);
+
+        this._workspacesItems = [];
+
+        this._workspaceManagerSignals = [
+            workspaceManager.connect('notify::n-workspaces',
+                this._nWorkspacesChanged.bind(this)),
+            workspaceManager.connect_after('workspace-switched',
+                this._onWorkspaceSwitched.bind(this)),
+            workspaceManager.connect('notify::layout-rows',
+                this._onWorkspaceOrientationChanged.bind(this))
+        ];
+
+        this.connect('scroll-event', this._onScrollEvent.bind(this));
+        this._updateMenu();
+        this._updateThumbnails();
+        this._onWorkspaceOrientationChanged();
+
+        this._settings = new Gio.Settings({ schema_id: 'org.gnome.desktop.wm.preferences' });
+        this._settingsChangedId = this._settings.connect(
+            'changed::workspace-names', this._updateMenuLabels.bind(this));
+    }
+
+    _onDestroy() {
+        for (let i = 0; i < this._workspaceManagerSignals.length; i++)
+            global.workspace_manager.disconnect(this._workspaceManagerSignals[i]);
+
+        if (this._settingsChangedId) {
+            this._settings.disconnect(this._settingsChangedId);
+            this._settingsChangedId = 0;
+        }
+
+        super._onDestroy();
+    }
+
+    _onWorkspaceOrientationChanged() {
+        let vertical = global.workspace_manager.layout_rows == -1;
+        this.reactive = vertical;
+
+        this._statusBin.visible = vertical;
+        this._thumbnailsBox.visible = !vertical;
+    }
+
+    _onWorkspaceSwitched() {
+        let workspaceManager = global.workspace_manager;
+        this._currentWorkspace = workspaceManager.get_active_workspace_index();
+
+        this._updateMenuOrnament();
+        this._updateActiveThumbnail();
+
+        this._statusLabel.set_text(this._getStatusText());
+    }
+
+    _nWorkspacesChanged() {
+        this._updateMenu();
+        this._updateThumbnails();
+    }
+
+    _updateMenuOrnament() {
+        for (let i = 0; i < this._workspacesItems.length; i++) {
+            this._workspacesItems[i].setOrnament(i == this._currentWorkspace
+                ? PopupMenu.Ornament.DOT
+                : PopupMenu.Ornament.NONE);
+        }
+    }
+
+    _updateActiveThumbnail() {
+        let thumbs = this._thumbnailsBox.get_children();
+        for (let i = 0; i < thumbs.length; i++) {
+            if (i == this._currentWorkspace)
+                thumbs[i].add_style_class_name('active');
+            else
+                thumbs[i].remove_style_class_name('active');
+        }
+    }
+
+    _getStatusText() {
+        let workspaceManager = global.workspace_manager;
+        let current = workspaceManager.get_active_workspace_index();
+        let total = workspaceManager.n_workspaces;
+
+        return '%d / %d'.format(current + 1, total);
+    }
+
+    _updateMenuLabels() {
+        for (let i = 0; i < this._workspacesItems.length; i++) {
+            let item = this._workspacesItems[i];
+            let name = Meta.prefs_get_workspace_name(i);
+            item.label.text = name;
+        }
+    }
+
+    _updateMenu() {
+        let workspaceManager = global.workspace_manager;
+
+        this.menu.removeAll();
+        this._workspacesItems = [];
+        this._currentWorkspace = workspaceManager.get_active_workspace_index();
+
+        for (let i = 0; i < workspaceManager.n_workspaces; i++) {
+            let name = Meta.prefs_get_workspace_name(i);
+            let item = new PopupMenu.PopupMenuItem(name);
+            item.workspaceId = i;
+
+            item.connect('activate', (item, _event) => {
+                this._activate(item.workspaceId);
+            });
+
+            if (i == this._currentWorkspace)
+                item.setOrnament(PopupMenu.Ornament.DOT);
+
+            this.menu.addMenuItem(item);
+            this._workspacesItems[i] = item;
+        }
+
+        this._statusLabel.set_text(this._getStatusText());
+    }
+
+    _updateThumbnails() {
+        let workspaceManager = global.workspace_manager;
+
+        this._thumbnailsBox.destroy_all_children();
+
+        for (let i = 0; i < workspaceManager.n_workspaces; i++) {
+            let thumb = new WorkspaceThumbnail(i);
+            this._thumbnailsBox.add_actor(thumb);
+        }
+        this._updateActiveThumbnail();
+    }
+
+    _activate(index) {
+        let workspaceManager = global.workspace_manager;
+
+        if (index >= 0 && index < workspaceManager.n_workspaces) {
+            let metaWorkspace = workspaceManager.get_workspace_by_index(index);
+            metaWorkspace.activate(global.get_current_time());
+        }
+    }
+
+    _onScrollEvent(actor, event) {
+        let direction = event.get_scroll_direction();
+        let diff = 0;
+        if (direction == Clutter.ScrollDirection.DOWN) {
+            diff = 1;
+        } else if (direction == Clutter.ScrollDirection.UP) {
+            diff = -1;
+        } else {
+            return;
+        }
+
+        let newIndex = this._currentWorkspace + diff;
+        this._activate(newIndex);
+    }
+
+    _allocate(actor, box, flags) {
+        if (actor.get_n_children() > 0)
+            actor.get_first_child().allocate(box, flags);
+    }
+});
+

extensions/windowsNavigator/extension.js

@@ -1,51 +1,65 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-const Clutter = imports.gi.Clutter;
-const Mainloop = imports.mainloop;
-const St = imports.gi.St;
+/* exported init */
+const { Clutter, St } = imports.gi;
 
 const Main = imports.ui.main;
 const Workspace = imports.ui.workspace;
 const WorkspacesView = imports.ui.workspacesView;
 
-function injectToFunction(parent, name, func) {
-    let origin = parent[name];
-    parent[name] = function() {
-        let ret;
-        ret = origin.apply(this, arguments);
-        if (ret === undefined)
-            ret = func.apply(this, arguments);
-        return ret;
+var MyWindowOverlay = class 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);
     }
-    return origin;
-}
 
-let winInjections, workspaceInjections, workViewInjections, createdActors, connectedSignals;
-
-function resetState() {
-    winInjections = { };
-    workspaceInjections = { };
-    workViewInjections = { };
-    createdActors = [ ];
-    connectedSignals = [ ];
-}
-
-function enable() {
-    resetState();
-
-    Workspace.WindowOverlay.prototype.showTooltip = function() {
+    showTooltip() {
         this._text.raise_top();
         this._text.show();
         this._text.text = (this._windowClone.slotId + 1).toString();
     }
-    winInjections['showTooltip'] = undefined;
 
-    Workspace.WindowOverlay.prototype.hideTooltip = function() {
+    hideTooltip() {
         if (this._text && this._text.visible)
             this._text.hide();
     }
-    winInjections['hideTooltip'] = undefined;
 
-    Workspace.Workspace.prototype.showTooltip = function() {
+    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._text.raise_top();
+    }
+};
+
+var MyWorkspace = class extends Workspace.Workspace {
+    constructor(metaWorkspace, monitorIndex) {
+        super(metaWorkspace, monitorIndex);
+
+        if (metaWorkspace && metaWorkspace.index() < 9) {
+            this._tip = new St.Label({
+                style_class: 'extension-windowsNavigator-window-tooltip',
+                visible: false
+            });
+            this.actor.add_actor(this._tip);
+
+            this.actor.connect('notify::scale-x', () => {
+                this._tip.set_scale(1 / this.actor.scale_x, 1 / this.actor.scale_x);
+            });
+        } else
+            this._tip = null;
+    }
+
+    showTooltip() {
         if (this._tip == null || this._actualGeometry == null)
             return;
         this._tip.text = (this.metaWorkspace.index() + 1).toString();
@@ -66,60 +80,73 @@ function enable() {
         this._tip.show();
         this._tip.raise_top();
     }
-    workspaceInjections['showTooltip'] = undefined;
 
-    Workspace.Workspace.prototype.hideTooltip = function() {
+    hideTooltip() {
         if (this._tip == null)
             return;
         if (!this._tip.get_parent())
             return;
         this._tip.hide();
     }
-    workspaceInjections['hideTooltip'] = undefined;
 
-    Workspace.Workspace.prototype.getWindowWithTooltip = function(id) {
+    getWindowWithTooltip(id) {
         for (let i = 0; i < this._windows.length; i++) {
             if ((this._windows[i].slotId + 1) == id)
                 return this._windows[i].metaWindow;
         }
         return null;
     }
-    workspaceInjections['getWindowWithTooltip'] = undefined;
 
-    Workspace.Workspace.prototype.showWindowsTooltips = function() {
+    showWindowsTooltips() {
         for (let i in this._windowOverlays) {
             if (this._windowOverlays[i] != null)
                 this._windowOverlays[i].showTooltip();
         }
     }
-    workspaceInjections['showWindowsTooltips'] = undefined;
 
-    Workspace.Workspace.prototype.hideWindowsTooltips = function() {
+    hideWindowsTooltips() {
         for (let i in this._windowOverlays) {
             if (this._windowOverlays[i] != null)
                 this._windowOverlays[i].hideTooltip();
         }
     }
-    workspaceInjections['hideWindowsTooltips'] = undefined;
+};
 
-    WorkspacesView.WorkspacesView.prototype._hideTooltips = function() {
+var MyWorkspacesView = class extends WorkspacesView.WorkspacesView {
+    constructor(width, height, x, y, workspaces) {
+        super(width, height, x, y, workspaces);
+
+        this._pickWorkspace = false;
+        this._pickWindow = false;
+        this._keyPressEventId =
+            global.stage.connect('key-press-event', this._onKeyPress.bind(this));
+        this._keyReleaseEventId =
+            global.stage.connect('key-release-event', this._onKeyRelease.bind(this));
+    }
+
+    _onDestroy() {
+        super._onDestroy();
+
+        global.stage.disconnect(this._keyPressEventId);
+        global.stage.disconnect(this._keyReleaseEventId);
+    }
+
+    _hideTooltips() {
         if (global.stage.get_key_focus() == global.stage)
             global.stage.set_key_focus(this._prevFocusActor);
         this._pickWindow = false;
         for (let i = 0; i < this._workspaces.length; i++)
             this._workspaces[i].hideWindowsTooltips();
     }
-    workViewInjections['_hideTooltips'] = undefined;
 
-    WorkspacesView.WorkspacesView.prototype._hideWorkspacesTooltips = function() {
+    _hideWorkspacesTooltips() {
         global.stage.set_key_focus(this._prevFocusActor);
         this._pickWorkspace = false;
         for (let i = 0; i < this._workspaces.length; i++)
             this._workspaces[i].hideTooltip();
     }
-    workViewInjections['_hideWorkspacesTooltips'] = undefined;
 
-    WorkspacesView.WorkspacesView.prototype._onKeyRelease = function(s, o) {
+    _onKeyRelease(s, o) {
         if (this._pickWindow &&
             (o.get_key_symbol() == Clutter.KEY_Alt_L ||
              o.get_key_symbol() == Clutter.KEY_Alt_R))
@@ -129,10 +156,10 @@ function enable() {
              o.get_key_symbol() == Clutter.KEY_Control_R))
             this._hideWorkspacesTooltips();
     }
-    workViewInjections['_onKeyRelease'] = undefined;
 
-    WorkspacesView.WorkspacesView.prototype._onKeyPress = function(s, o) {
-        if(Main.overview.viewSelector._activePage != Main.overview.viewSelector._workspacesPage)
+    _onKeyPress(s, o) {
+        let viewSelector = Main.overview.viewSelector;
+        if (viewSelector._activePage != viewSelector._workspacesPage)
             return false;
 
         let workspaceManager = global.workspace_manager;
@@ -210,82 +237,28 @@ function enable() {
         }
         return false;
     }
-    workViewInjections['_onKeyPress'] = undefined;
+};
 
-    winInjections['_init'] = injectToFunction(Workspace.WindowOverlay.prototype, '_init', function(windowClone, parentActor) {
-        this._id = null;
-        createdActors.push(this._text = new St.Label({ style_class: 'extension-windowsNavigator-window-tooltip' }));
-        this._text.hide();
-        parentActor.add_actor(this._text);
-    });
+class Extension {
+    constructor() {
+        this._origWindowOverlay = Workspace.WindowOverlay;
+        this._origWorkspace = Workspace.Workspace;
+        this._origWorkspacesView = WorkspacesView.WorkspacesView;
+    }
 
-    winInjections['relayout'] = injectToFunction(Workspace.WindowOverlay.prototype, 'relayout', function(animate) {
-        let [cloneX, cloneY, cloneWidth, cloneHeight] = this._windowClone.slot;
+    enable() {
+        Workspace.WindowOverlay = MyWindowOverlay;
+        Workspace.Workspace = MyWorkspace;
+        WorkspacesView.WorkspacesView = MyWorkspacesView;
+    }
 
-        let textX = cloneX - 2;
-        let textY = cloneY - 2;
-        this._text.set_position(Math.floor(textX) + 5, Math.floor(textY) + 5);
-        this._text.raise_top();
-    });
-
-    workspaceInjections['_init'] = injectToFunction(Workspace.Workspace.prototype, '_init', function(metaWorkspace) {
-        if (metaWorkspace && metaWorkspace.index() < 9) {
-            createdActors.push(this._tip = new St.Label({ style_class: 'extension-windowsNavigator-window-tooltip',
-                                                          visible: false }));
-
-            this.actor.add_actor(this._tip);
-            let signalId = this.actor.connect('notify::scale-x', () => {
-                this._tip.set_scale(1 / this.actor.scale_x, 1 / this.actor.scale_x);
-            });
-            connectedSignals.push({ obj: this.actor, id: signalId });
-        } else
-            this._tip = null;
-    });
-
-    workViewInjections['_init'] = injectToFunction(WorkspacesView.WorkspacesView.prototype, '_init', function(width, height, x, y, workspaces) {
-        this._pickWorkspace = false;
-        this._pickWindow = false;
-        this._keyPressEventId =
-            global.stage.connect('key-press-event', this._onKeyPress.bind(this));
-        this._keyReleaseEventId =
-            global.stage.connect('key-release-event', this._onKeyRelease.bind(this));
-        connectedSignals.push({ obj: global.stage, id: this._keyPressEventId });
-        connectedSignals.push({ obj: global.stage, id: this._keyReleaseEventId });
-    });
-
-    workViewInjections['_onDestroy'] = injectToFunction(WorkspacesView.WorkspacesView.prototype, '_onDestroy', function() {
-        global.stage.disconnect(this._keyPressEventId);
-        global.stage.disconnect(this._keyReleaseEventId);
-        connectedSignals = [ ];
-    });
-}
-
-function removeInjection(object, injection, name) {
-    if (injection[name] === undefined)
-        delete object[name];
-    else
-        object[name] = injection[name];
-}
-
-function disable() {
-    let i;
-
-    for (i in workspaceInjections)
-        removeInjection(Workspace.Workspace.prototype, workspaceInjections, i);
-    for (i in winInjections)
-        removeInjection(Workspace.WindowOverlay.prototype, winInjections, i);
-    for (i in workViewInjections)
-        removeInjection(WorkspacesView.WorkspacesView.prototype, workViewInjections, i);
-
-    for (i of connectedSignals)
-        i.obj.disconnect(i.id);
-
-    for (i of createdActors)
-        i.destroy();
-
-    resetState();
+    disable() {
+        Workspace.WindowOverlay = this._origWindowOverlay;
+        Workspace.Workspace = this._origWorkspace;
+        WorkspacesView.WorkspacesView = this._origWorkspacesView;
+    }
 }
 
 function init() {
-    /* do nothing */
+    return new Extension();
 }

extensions/workspace-indicator/extension.js

@@ -1,62 +1,269 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+/* exported init enable disable */
 
-const Gio = imports.gi.Gio;
-const GObject = imports.gi.GObject;
-const Meta = imports.gi.Meta;
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
-const Mainloop = imports.mainloop;
+const { Clutter, Gio, GObject, Meta, St } = imports.gi;
+
+const DND = imports.ui.dnd;
+const ExtensionUtils = imports.misc.extensionUtils;
+const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
-const Panel = imports.ui.panel;
 
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
 
-const Main = imports.ui.main;
-
-const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
-const Convenience = Me.imports.convenience;
-
 const WORKSPACE_SCHEMA = 'org.gnome.desktop.wm.preferences';
 const WORKSPACE_KEY = 'workspace-names';
 
+let WindowPreview = GObject.registerClass({
+    GTypeName: 'WorkspaceIndicatorWindowPreview'
+}, class WindowPreview extends St.Button {
+    _init(window) {
+        super._init({
+            style_class: 'workspace-indicator-window-preview'
+        });
+
+        this._delegate = this;
+        DND.makeDraggable(this, { restoreOnSuccess: true });
+
+        this._window = window;
+
+        this.connect('destroy', this._onDestroy.bind(this));
+
+        this._sizeChangedId = this._window.connect('size-changed',
+            this._relayout.bind(this));
+        this._positionChangedId = this._window.connect('position-changed',
+            this._relayout.bind(this));
+        this._minimizedChangedId = this._window.connect('notify::minimized',
+            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));
+        this._onFocusChanged();
+    }
+
+    // needed for DND
+    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() {
+        if (global.display.focus_window == this._window)
+            this.add_style_class_name('active');
+        else
+            this.remove_style_class_name('active');
+    }
+
+    _relayout() {
+        let monitor = Main.layoutManager.findIndexForActor(this);
+        this.visible = monitor == this._window.get_monitor() &&
+            this._window.showing_on_its_workspace();
+
+        if (!this.visible)
+            return;
+
+        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;
+
+        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));
+    }
+});
+
+let WorkspaceThumbnail = GObject.registerClass({
+    GTypeName: 'WorkspaceIndicatorWorkspaceThumbnail'
+}, class WorkspaceThumbnail extends St.Button {
+    _init(index) {
+        super._init({
+            style_class: 'workspace',
+            child: new Clutter.Actor({
+                layout_manager: new Clutter.BinLayout(),
+                clip_to_allocation: true
+            }),
+            x_fill: true,
+            y_fill: true
+        });
+
+        this.connect('destroy', this._onDestroy.bind(this));
+
+        this._index = index;
+        this._delegate = this; // needed for DND
+
+        this._windowPreviews = new Map();
+
+        let workspaceManager = global.workspace_manager;
+        this._workspace = workspaceManager.get_workspace_by_index(index);
+
+        this._windowAddedId = this._workspace.connect('window-added',
+            (ws, window) => {
+                this._addWindow(window);
+            });
+        this._windowRemovedId = this._workspace.connect('window-removed',
+            (ws, window) => {
+                this._removeWindow(window);
+            });
+        this._restackedId = global.display.connect('restacked',
+            this._onRestacked.bind(this));
+
+        this._workspace.list_windows().forEach(w => this._addWindow(w));
+        this._onRestacked();
+    }
+
+    acceptDrop(source) {
+        if (!source.realWindow)
+            return false;
+
+        let window = source.realWindow.get_meta_window();
+        this._moveWindow(window);
+        return true;
+    }
+
+    handleDragOver(source) {
+        if (source.realWindow)
+            return DND.DragMotionResult.MOVE_DROP;
+        else
+            return DND.DragMotionResult.CONTINUE;
+    }
+
+    _addWindow(window) {
+        if (this._windowPreviews.has(window))
+            return;
+
+        let preview = new WindowPreview(window);
+        preview.connect('clicked', (a, btn) => this.emit('clicked', btn));
+        this._windowPreviews.set(window, preview);
+        this.child.add_child(preview);
+    }
+
+    _removeWindow(window) {
+        let preview = this._windowPreviews.get(window);
+        if (!preview)
+            return;
+
+        this._windowPreviews.delete(window);
+        preview.destroy();
+    }
+
+    _onRestacked() {
+        let lastPreview = null;
+        let windows = global.get_window_actors().map(a => a.meta_window);
+        for (let i = 0; i < windows.length; i++) {
+            let preview = this._windowPreviews.get(windows[i]);
+            if (!preview)
+                continue;
+
+            this.child.set_child_above_sibling(preview, lastPreview);
+            lastPreview = preview;
+        }
+    }
+
+    _moveWindow(window) {
+        let monitorIndex = Main.layoutManager.findIndexForActor(this);
+        if (monitorIndex != window.get_monitor())
+            window.move_to_monitor(monitorIndex);
+        window.change_workspace_by_index(this._index, false);
+    }
+
+    on_clicked() {
+        let ws = global.workspace_manager.get_workspace_by_index(this._index);
+        if (ws)
+            ws.activate(global.get_current_time());
+    }
+
+    _onDestroy() {
+        this._workspace.disconnect(this._windowAddedId);
+        this._workspace.disconnect(this._windowRemovedId);
+        global.display.disconnect(this._restackedId);
+    }
+});
+
 let WorkspaceIndicator = GObject.registerClass(
 class WorkspaceIndicator extends PanelMenu.Button {
     _init() {
-        super._init(0.0, _("Workspace Indicator"));
+        super._init(0.0, _('Workspace Indicator'));
+
+        let container = new St.Widget({
+            layout_manager: new Clutter.BinLayout(),
+            x_expand: true,
+            y_expand: true
+        });
+        this.add_actor(container);
 
         let workspaceManager = global.workspace_manager;
 
-        this._currentWorkspace = workspaceManager.get_active_workspace().index();
-        this.statusLabel = new St.Label({ y_align: Clutter.ActorAlign.CENTER,
-                                          text: this._labelText() });
+        this._currentWorkspace = workspaceManager.get_active_workspace_index();
+        this._statusLabel = new St.Label({
+            style_class: 'panel-workspace-indicator',
+            y_align: Clutter.ActorAlign.CENTER,
+            text: this._labelText()
+        });
 
-        this.add_actor(this.statusLabel);
+        container.add_actor(this._statusLabel);
 
-        this.workspacesItems = [];
+        this._thumbnailsBox = new St.BoxLayout({
+            style_class: 'panel-workspace-indicator-box',
+            y_expand: true,
+            reactive: true
+        });
+
+        container.add_actor(this._thumbnailsBox);
+
+        this._workspacesItems = [];
         this._workspaceSection = new PopupMenu.PopupMenuSection();
         this.menu.addMenuItem(this._workspaceSection);
 
-        this._workspaceManagerSignals = [];
-        this._workspaceManagerSignals.push(workspaceManager.connect_after('workspace-added',
-                                                                          this._createWorkspacesSection.bind(this)));
-        this._workspaceManagerSignals.push(workspaceManager.connect_after('workspace-removed',
-                                                                          this._createWorkspacesSection.bind(this)));
-        this._workspaceManagerSignals.push(workspaceManager.connect_after('workspace-switched',
-                                                                          this._updateIndicator.bind(this)));
+        this._workspaceManagerSignals = [
+            workspaceManager.connect_after('notify::n-workspaces',
+                this._nWorkspacesChanged.bind(this)),
+            workspaceManager.connect_after('workspace-switched',
+                this._onWorkspaceSwitched.bind(this)),
+            workspaceManager.connect('notify::layout-rows',
+                this._onWorkspaceOrientationChanged.bind(this))
+        ];
 
         this.connect('scroll-event', this._onScrollEvent.bind(this));
+        this._thumbnailsBox.connect('scroll-event', this._onScrollEvent.bind(this));
         this._createWorkspacesSection();
-
-        //styling
-        this.statusLabel.add_style_class_name('panel-workspace-indicator');
+        this._updateThumbnails();
+        this._onWorkspaceOrientationChanged();
 
         this._settings = new Gio.Settings({ schema_id: WORKSPACE_SCHEMA });
-        this._settingsChangedId =
-            this._settings.connect('changed::' + WORKSPACE_KEY,
-                                   this._createWorkspacesSection.bind(this));
+        this._settingsChangedId = this._settings.connect(
+            `changed::${WORKSPACE_KEY}`,
+            this._updateMenuLabels.bind(this));
     }
 
     _onDestroy() {
@@ -68,54 +275,110 @@ class WorkspaceIndicator extends PanelMenu.Button {
             this._settingsChangedId = 0;
         }
 
+        Main.panel.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);
+
         super._onDestroy();
     }
 
-    _updateIndicator() {
-        this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.NONE);
-        this._currentWorkspace = global.workspace_manager.get_active_workspace().index();
-        this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.DOT);
+    _onWorkspaceOrientationChanged() {
+        let vertical = global.workspace_manager.layout_rows == -1;
+        this.reactive = vertical;
 
-        this.statusLabel.set_text(this._labelText());
+        this._statusLabel.visible = vertical;
+        this._thumbnailsBox.visible = !vertical;
+
+        // Disable offscreen-redirect when showing the workspace switcher
+        // so that clip-to-allocation works
+        Main.panel.set_offscreen_redirect(vertical
+            ? Clutter.OffscreenRedirect.ALWAYS
+            : Clutter.OffscreenRedirect.AUTOMATIC_FOR_OPACITY);
+    }
+
+    _onWorkspaceSwitched() {
+        this._currentWorkspace = global.workspace_manager.get_active_workspace_index();
+
+        this._updateMenuOrnament();
+        this._updateActiveThumbnail();
+
+        this._statusLabel.set_text(this._labelText());
+    }
+
+    _nWorkspacesChanged() {
+        this._createWorkspacesSection();
+        this._updateThumbnails();
+    }
+
+    _updateMenuOrnament() {
+        for (let i = 0; i < this._workspacesItems.length; i++) {
+            this._workspacesItems[i].setOrnament(i == this._currentWorkspace
+                ? PopupMenu.Ornament.DOT
+                : PopupMenu.Ornament.NONE);
+        }
+    }
+
+    _updateActiveThumbnail() {
+        let thumbs = this._thumbnailsBox.get_children();
+        for (let i = 0; i < thumbs.length; i++) {
+            if (i == this._currentWorkspace)
+                thumbs[i].add_style_class_name('active');
+            else
+                thumbs[i].remove_style_class_name('active');
+        }
     }
 
     _labelText(workspaceIndex) {
-        if(workspaceIndex == undefined) {
+        if (workspaceIndex == undefined) {
             workspaceIndex = this._currentWorkspace;
             return (workspaceIndex + 1).toString();
         }
         return Meta.prefs_get_workspace_name(workspaceIndex);
     }
 
+    _updateMenuLabels() {
+        for (let i = 0; i < this._workspacesItems.length; i++)
+            this._workspacesItems[i].label.text = this._labelText(i);
+    }
+
     _createWorkspacesSection() {
         let workspaceManager = global.workspace_manager;
 
         this._workspaceSection.removeAll();
-        this.workspacesItems = [];
-        this._currentWorkspace = workspaceManager.get_active_workspace().index();
+        this._workspacesItems = [];
+        this._currentWorkspace = workspaceManager.get_active_workspace_index();
 
         let i = 0;
-        for(; i < workspaceManager.n_workspaces; i++) {
-            this.workspacesItems[i] = new PopupMenu.PopupMenuItem(this._labelText(i));
-            this._workspaceSection.addMenuItem(this.workspacesItems[i]);
-            this.workspacesItems[i].workspaceId = i;
-            this.workspacesItems[i].label_actor = this.statusLabel;
-            let self = this;
-            this.workspacesItems[i].connect('activate', (actor, event) => {
+        for (; i < workspaceManager.n_workspaces; i++) {
+            this._workspacesItems[i] = new PopupMenu.PopupMenuItem(this._labelText(i));
+            this._workspaceSection.addMenuItem(this._workspacesItems[i]);
+            this._workspacesItems[i].workspaceId = i;
+            this._workspacesItems[i].label_actor = this._statusLabel;
+            this._workspacesItems[i].connect('activate', (actor, _event) => {
                 this._activate(actor.workspaceId);
             });
 
             if (i == this._currentWorkspace)
-                this.workspacesItems[i].setOrnament(PopupMenu.Ornament.DOT);
+                this._workspacesItems[i].setOrnament(PopupMenu.Ornament.DOT);
         }
 
-        this.statusLabel.set_text(this._labelText());
+        this._statusLabel.set_text(this._labelText());
+    }
+
+    _updateThumbnails() {
+        let workspaceManager = global.workspace_manager;
+
+        this._thumbnailsBox.destroy_all_children();
+
+        for (let i = 0; i < workspaceManager.n_workspaces; i++) {
+            let thumb = new WorkspaceThumbnail(i);
+            this._thumbnailsBox.add_actor(thumb);
+        }
+        this._updateActiveThumbnail();
     }
 
     _activate(index) {
         let workspaceManager = global.workspace_manager;
 
-        if(index >= 0 && index <  workspaceManager.n_workspaces) {
+        if (index >= 0 && index < workspaceManager.n_workspaces) {
             let metaWorkspace = workspaceManager.get_workspace_by_index(index);
             metaWorkspace.activate(global.get_current_time());
         }
@@ -132,13 +395,13 @@ class WorkspaceIndicator extends PanelMenu.Button {
             return;
         }
 
-        let newIndex = global.workspace_manager.get_active_workspace().index() + diff;
+        let newIndex = global.workspace_manager.get_active_workspace_index() + diff;
         this._activate(newIndex);
     }
 });
 
-function init(meta) {
-    Convenience.initTranslations();
+function init() {
+    ExtensionUtils.initTranslations();
 }
 
 let _indicator;

extensions/workspace-indicator/prefs.js

@@ -1,17 +1,13 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+/* exported init buildPrefsWidget */
 
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
-const Gtk = imports.gi.Gtk;
+const { Gio, GObject, Gtk } = imports.gi;
 
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
 const N_ = e => e;
 
 const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
-const Convenience = Me.imports.convenience;
 
 const WORKSPACE_SCHEMA = 'org.gnome.desktop.wm.preferences';
 const WORKSPACE_KEY = 'workspace-names';
@@ -115,7 +111,7 @@ class WorkspaceNameModel extends Gtk.ListStore {
         names.splice(index, 1);
 
         // compact the array
-        for (let i = names.length -1; i >= 0 && !names[i]; i++)
+        for (let i = names.length - 1; i >= 0 && !names[i]; i++)
             names.pop();
 
         this._settings.set_strv(WORKSPACE_KEY, names);
@@ -131,23 +127,28 @@ class WorkspaceSettingsWidget extends Gtk.Grid {
         this.margin = 12;
         this.orientation = Gtk.Orientation.VERTICAL;
 
-        this.add(new Gtk.Label({ label: '<b>' + _("Workspace Names") + '</b>',
-                                 use_markup: true, margin_bottom: 6,
-                                 hexpand: true, halign: Gtk.Align.START }));
+        this.add(new Gtk.Label({
+            label: '<b>%s</b>'.format(_('Workspace Names')),
+            use_markup: true,
+            margin_bottom: 6,
+            hexpand: true,
+            halign: Gtk.Align.START
+        }));
 
         let scrolled = new Gtk.ScrolledWindow({ shadow_type: Gtk.ShadowType.IN });
         scrolled.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
         this.add(scrolled);
 
         this._store = new WorkspaceNameModel();
-        this._treeView = new Gtk.TreeView({ model: this._store,
-                                            headers_visible: false,
-                                            reorderable: true,
-                                            hexpand: true,
-                                            vexpand: true
-                                          });
+        this._treeView = new Gtk.TreeView({
+            model: this._store,
+            headers_visible: false,
+            reorderable: true,
+            hexpand: true,
+            vexpand: true
+        });
 
-        let column = new Gtk.TreeViewColumn({ title: _("Name") });
+        let column = new Gtk.TreeViewColumn({ title: _('Name') });
         let renderer = new Gtk.CellRendererText({ editable: true });
         renderer.connect('edited', this._cellEdited.bind(this));
         column.pack_start(renderer, true);
@@ -176,23 +177,23 @@ class WorkspaceSettingsWidget extends Gtk.Grid {
         this.add(toolbar);
     }
 
-    _cellEdited(renderer, path, new_text) {
+    _cellEdited(renderer, path, newText) {
         let [ok, iter] = this._store.get_iter_from_string(path);
 
         if (ok)
-            this._store.set(iter, [this._store.Columns.LABEL], [new_text]);
+            this._store.set(iter, [this._store.Columns.LABEL], [newText]);
     }
 
     _newClicked() {
         let iter = this._store.append();
         let index = this._store.get_path(iter).get_indices()[0];
 
-        let label = _("Workspace %d").format(index + 1);
+        let label = _('Workspace %d').format(index + 1);
         this._store.set(iter, [this._store.Columns.LABEL], [label]);
     }
 
     _delClicked() {
-        let [any, model, iter] = this._treeView.get_selection().get_selected();
+        let [any, model_, iter] = this._treeView.get_selection().get_selected();
 
         if (any)
             this._store.remove(iter);
@@ -200,7 +201,7 @@ class WorkspaceSettingsWidget extends Gtk.Grid {
 });
 
 function init() {
-    Convenience.initTranslations();
+    ExtensionUtils.initTranslations();
 }
 
 function buildPrefsWidget() {

extensions/workspace-indicator/stylesheet.css

@@ -1,5 +1,40 @@
 .panel-workspace-indicator {
 	padding: 0 8px;
-	background-color: rgba(200, 200, 200, .5);
+}
+
+.panel-workspace-indicator-box {
+	padding: 2px 0;
+}
+
+.panel-workspace-indicator-box .workspace {
+	width: 40px;
+}
+
+.panel-workspace-indicator,
+.panel-workspace-indicator-box .workspace {
 	border: 1px solid #cccccc;
 }
+
+.panel-workspace-indicator,
+.panel-workspace-indicator-box .workspace.active {
+	background-color: rgba(200, 200, 200, .5);
+}
+
+.panel-workspace-indicator-box .workspace {
+    background-color: rgba(200, 200, 200, .3);
+    border-left-width: 0;
+}
+
+.panel-workspace-indicator-box .workspace:first-child {
+    border-left-width: 1px;
+}
+
+.workspace-indicator-window-preview {
+    background-color: #252525;
+    border: 1px solid #ccc;
+}
+
+.workspace-indicator-window-preview.active {
+    background-color: #353535;
+    border: 2px solid #ccc;
+}

lib/convenience.js

@@ -1,93 +0,0 @@
-/* -*- mode: js; js-basic-offset: 4; indent-tabs-mode: nil -*- */
-/*
-  Copyright (c) 2011-2012, Giovanni Campagna <scampa.giovanni@gmail.com>
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of the GNOME nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-const Gettext = imports.gettext;
-const Gio = imports.gi.Gio;
-
-const Config = imports.misc.config;
-const ExtensionUtils = imports.misc.extensionUtils;
-
-/**
- * initTranslations:
- * @domain: (optional): the gettext domain to use
- *
- * Initialize Gettext to load translations from extensionsdir/locale.
- * If @domain is not provided, it will be taken from metadata['gettext-domain']
- */
-function initTranslations(domain) {
-    let extension = ExtensionUtils.getCurrentExtension();
-
-    domain = domain || extension.metadata['gettext-domain'];
-
-    // check if this extension was built with "make zip-file", and thus
-    // has the locale files in a subfolder
-    // otherwise assume that extension has been installed in the
-    // same prefix as gnome-shell
-    let localeDir = extension.dir.get_child('locale');
-    if (localeDir.query_exists(null))
-        Gettext.bindtextdomain(domain, localeDir.get_path());
-    else
-        Gettext.bindtextdomain(domain, Config.LOCALEDIR);
-}
-
-/**
- * getSettings:
- * @schema: (optional): the GSettings schema id
- *
- * Builds and return a GSettings schema for @schema, using schema files
- * in extensionsdir/schemas. If @schema is not provided, it is taken from
- * metadata['settings-schema'].
- */
-function getSettings(schema) {
-    let extension = ExtensionUtils.getCurrentExtension();
-
-    schema = schema || extension.metadata['settings-schema'];
-
-    const GioSSS = Gio.SettingsSchemaSource;
-
-    // check if this extension was built with "make zip-file", and thus
-    // has the schema files in a subfolder
-    // otherwise assume that extension has been installed in the
-    // same prefix as gnome-shell (and therefore schemas are available
-    // in the standard folders)
-    let schemaDir = extension.dir.get_child('schemas');
-    let schemaSource;
-    if (schemaDir.query_exists(null))
-        schemaSource = GioSSS.new_from_directory(schemaDir.get_path(),
-                                                 GioSSS.get_default(),
-                                                 false);
-    else
-        schemaSource = GioSSS.get_default();
-
-    let schemaObj = schemaSource.lookup(schema, true);
-    if (!schemaObj)
-        throw new Error('Schema ' + schema + ' could not be found for extension '
-                        + extension.metadata.uuid + '. Please check your installation.');
-
-    return new Gio.Settings({ settings_schema: schemaObj });
-}
-								  

lint/eslintrc-gjs.json

@@ -0,0 +1,130 @@
+{
+    "env": {
+        "es6": true
+    },
+    "extends": "eslint:recommended",
+    "rules": {
+        "array-bracket-newline": [
+            "error",
+            "consistent"
+        ],
+        "array-bracket-spacing": [
+            "error",
+            "never"
+        ],
+        "arrow-spacing": "error",
+        "brace-style": "error",
+        "comma-spacing": [
+            "error",
+            {
+                "before": false,
+                "after": true
+            }
+        ],
+        "indent": [
+            "error",
+            4,
+            {
+                "ignoredNodes": [
+                    "CallExpression[callee.object.name=GObject][callee.property.name=registerClass] > ClassExpression:first-child"
+                ],
+                "MemberExpression": "off"
+            }
+        ],
+        "key-spacing": [
+            "error",
+            {
+                "beforeColon": false,
+                "afterColon": true
+            }
+        ],
+        "keyword-spacing": [
+            "error",
+            {
+                "before": true,
+                "after": true
+            }
+        ],
+        "linebreak-style": [
+            "error",
+            "unix"
+        ],
+        "no-empty": [
+            "error",
+            {
+                "allowEmptyCatch": true
+            }
+        ],
+        "no-implicit-coercion": [
+            "error",
+            {
+                "allow": ["!!"]
+            }
+        ],
+        "no-restricted-properties": [
+            "error",
+            {
+                "object": "Lang",
+                "property": "bind",
+                "message": "Use arrow notation or Function.prototype.bind()"
+            },
+            {
+                "object": "Lang",
+                "property": "Class",
+                "message": "Use ES6 classes"
+            }
+        ],
+        "nonblock-statement-body-position": [
+            "error",
+            "below"
+        ],
+        "object-curly-newline": [
+            "error",
+            {
+                "consistent": true
+            }
+        ],
+        "object-curly-spacing": "error",
+        "prefer-template": "error",
+        "quotes": [
+            "error",
+            "single",
+            {
+                "avoidEscape": true
+            }
+        ],
+        "semi": [
+            "error",
+            "always"
+        ],
+        "semi-spacing": [
+            "error",
+            {
+                "before": false,
+                "after": true
+            }
+        ],
+        "space-before-blocks": "error",
+        "space-infix-ops": [
+            "error",
+            {
+                "int32Hint": false
+            }
+        ]
+    },
+    "globals": {
+        "ARGV": false,
+        "Debugger": false,
+        "GIRepositoryGType": false,
+        "imports": false,
+        "Intl": false,
+        "log": false,
+        "logError": false,
+        "print": false,
+        "printerr": false,
+        "window": false
+    },
+    "parserOptions": {
+        "ecmaVersion": 2017
+    }
+}

lint/eslintrc-shell.json

@@ -0,0 +1,26 @@
+{
+    "rules": {
+        "camelcase": [
+            "error",
+            {
+                "properties": "never",
+                "allow": ["^vfunc_", "^on_"]
+            }
+        ],
+        "no-unused-vars": [
+            "error",
+            {
+                "argsIgnorePattern": "^_",
+                "varsIgnorePattern": "_$"
+            }
+        ],
+        "object-curly-spacing": [
+            "error",
+            "always"
+        ],
+        "prefer-arrow-callback": "error"
+    },
+    "globals": {
+        "global": false
+    }
+}

meson.build

@@ -1,5 +1,5 @@
 project('gnome-shell-extensions',
-  version: '3.31.2',
+  version: '3.33.90',
   meson_version: '>= 0.44.0',
   license: 'GPL2+'
 )
@@ -20,9 +20,7 @@ schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
 sessiondir = join_paths(datadir, 'gnome-session', 'sessions')
 xsessiondir = join_paths(datadir, 'xsessions')
 
-extensionlib = files('lib/convenience.js')
-
-js52 = find_program('js52', required: false)
+js60 = find_program('js60', required: false)
 
 ver_arr = meson.project_version().split('.')
 if ver_arr[1].to_int().is_even()
@@ -35,6 +33,7 @@ uuid_suffix = '@gnome-shell-extensions.gcampax.github.com'
 
 classic_extensions = [
   'apps-menu',
+  'horizontal-workspaces',
   'places-menu',
   'launch-new-instance',
   'window-list'

po/LINGUAS

@@ -38,6 +38,7 @@ kn
 ko
 lt
 lv
+mjw
 ml
 mr
 ms

po/POTFILES.in

@@ -15,6 +15,7 @@ extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml
 extensions/window-list/extension.js
 extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml
 extensions/window-list/prefs.js
+extensions/window-list/workspaceIndicator.js
 extensions/windowsNavigator/extension.js
 extensions/workspace-indicator/extension.js
 extensions/workspace-indicator/prefs.js

po/af.po

@@ -1,311 +1,370 @@
 # Afrikaans translation for gnome-shell-extensions.
 # This file is distributed under the same license as the gnome-shell-extensions package.
 # F Wolff <friedel@translate.org.za>, 2013.
+# Pieter Schoeman <pieter@sonbesie.co.za>, 2017.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2013-09-26 20:32+0000\n"
-"PO-Revision-Date: 2013-09-27 16:17+0200\n"
-"Last-Translator: F Wolff <friedel@translate.org.za>\n"
-"Language-Team: translate-discuss-af@lists.sourceforge.net\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
+"issues\n"
+"POT-Creation-Date: 2018-09-06 10:29+0000\n"
+"PO-Revision-Date: 2018-02-06 17:47+0200\n"
+"Last-Translator: Pieter Schalk Schoeman <pieter@sonbesie.co.za>\n"
+"Language-Team: Afrikaans <pieter@sonbesie.co.za>\n"
 "Language: af\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.7.1\n"
+"X-Generator: Poedit 2.0.3\n"
 "X-Project-Style: gnome\n"
 
-#: ../data/gnome-classic.desktop.in.h:1
-#: ../data/gnome-classic.session.desktop.in.in.h:1
+#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
 msgid "GNOME Classic"
 msgstr "GNOME Klassiek"
 
-#: ../data/gnome-classic.desktop.in.h:2
+#: data/gnome-classic.desktop.in:4
 msgid "This session logs you into GNOME Classic"
 msgstr "Hierdie sessie laat mens aanmeld by GNOME Klassiek"
 
-#: ../data/gnome-shell-classic.desktop.in.in.h:1
-msgid "GNOME Shell Classic"
-msgstr "GNOME Shell Klassiek"
-
-#: ../data/gnome-shell-classic.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "Vensterbestuur en toepassinglansering"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:1
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:7
 msgid "Attach modal dialog to the parent window"
-msgstr ""
+msgstr "Heg modale dialoogvenster vas aan die ouervenster"
 
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:2
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:8
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:25
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:33
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:41
 msgid ""
 "This key overrides the key in org.gnome.mutter when running GNOME Shell."
 msgstr ""
+"Hierdie sleutel oorskryf die sleutel in org.gnome.mutter wanneer GNOME Shell "
+"uitgevoer word."
 
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:3
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
+msgid "Arrangement of buttons on the titlebar"
+msgstr "Knoppie rangskikking op die titelbalk"
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:17
+msgid ""
+"This key overrides the key in org.gnome.desktop.wm.preferences when running "
+"GNOME Shell."
+msgstr ""
+"Die sleutel oorheers die sleutel in org.gnome.desktop.wm.preferences wanneer "
+"GNOME uitgevoer word."
+
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:24
 msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr ""
+msgstr "Aktiveer rand-tilering wanneer vensters op skermrand laat val word"
 
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:4
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:32
 msgid "Workspaces only on primary monitor"
-msgstr "Werkruimtes slegs op primêre monitor"
+msgstr "Werkspasies slegs op primêre monitor"
 
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:5
+#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:40
 msgid "Delay focus changes in mouse mode until the pointer stops moving"
-msgstr ""
+msgstr "Vertraag fokusverandering in muismodus totdat die wyser ophou beweeg"
 
-#: ../extensions/alternate-tab/prefs.js:20
+#: extensions/alternate-tab/prefs.js:19
 msgid "Thumbnail only"
-msgstr ""
+msgstr "Slegs duimnael"
 
-#: ../extensions/alternate-tab/prefs.js:21
+#: extensions/alternate-tab/prefs.js:20
 msgid "Application icon only"
 msgstr "Slegs toepassingsikoon"
 
-#: ../extensions/alternate-tab/prefs.js:22
+#: extensions/alternate-tab/prefs.js:21
 msgid "Thumbnail and application icon"
 msgstr "Duimnael en toepassingsikoon"
 
-#: ../extensions/alternate-tab/prefs.js:37
+#: extensions/alternate-tab/prefs.js:34
 msgid "Present windows as"
 msgstr "Wys vensters as"
 
-#: ../extensions/alternate-tab/prefs.js:62
+#: extensions/alternate-tab/prefs.js:65
 msgid "Show only windows in the current workspace"
 msgstr "Wys slegs vensters van die huidige werkruimte"
 
-#: ../extensions/apps-menu/extension.js:39
+#: extensions/apps-menu/extension.js:37
 msgid "Activities Overview"
 msgstr "Aktiwiteite-oorsig"
 
-#: ../extensions/apps-menu/extension.js:113
+#: extensions/apps-menu/extension.js:130
 msgid "Favorites"
 msgstr "Gunstelinge"
 
-#: ../extensions/apps-menu/extension.js:282
+#: extensions/apps-menu/extension.js:417
 msgid "Applications"
 msgstr "Toepassings"
 
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:1
+#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
 msgid "Application and workspace list"
-msgstr "Toepassing- en werkruimtelys"
+msgstr "Toepassing- en werkspasielys"
 
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
+#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:7
 msgid ""
 "A list of strings, each containing an application id (desktop file name), "
 "followed by a colon and the workspace number"
 msgstr ""
+"'n Lys stringe wat elkeen 'n toepassing id (werkskerm en lêernaam) sowel as "
+"komma gevolg deur 'n werkspasie nommer bevat"
 
-#: ../extensions/auto-move-windows/prefs.js:55
+#: extensions/auto-move-windows/prefs.js:53
 msgid "Application"
 msgstr "Toepassing"
 
-#: ../extensions/auto-move-windows/prefs.js:64
-#: ../extensions/auto-move-windows/prefs.js:106
+#: extensions/auto-move-windows/prefs.js:62
+#: extensions/auto-move-windows/prefs.js:117
 msgid "Workspace"
-msgstr "Werkruimte"
+msgstr "Werkspasie"
 
-#: ../extensions/auto-move-windows/prefs.js:80
-msgid "Add rule"
+#: extensions/auto-move-windows/prefs.js:78
+msgid "Add Rule"
 msgstr "Voeg reël by"
 
-#: ../extensions/auto-move-windows/prefs.js:94
+#: extensions/auto-move-windows/prefs.js:98
 msgid "Create new matching rule"
-msgstr ""
+msgstr "Skep 'n nuwe ooreenstemmende reël"
 
-#: ../extensions/auto-move-windows/prefs.js:98
+#: extensions/auto-move-windows/prefs.js:103
 msgid "Add"
 msgstr "Voeg by"
 
-#: ../extensions/drive-menu/extension.js:73
-#, c-format
-msgid "Ejecting drive '%s' failed:"
-msgstr "Kon nie skyf '%s' uitskiet nie:"
+#. TRANSLATORS: %s is the filesystem name
+#: extensions/drive-menu/extension.js:103
+#: extensions/places-menu/placeDisplay.js:219
+#, javascript-format
+msgid "Ejecting drive “%s” failed:"
+msgstr "Kon nie skyf \"%s\" uitskiet nie:"
 
-#: ../extensions/drive-menu/extension.js:90
+#: extensions/drive-menu/extension.js:118
 msgid "Removable devices"
 msgstr "Verwyderbare toestelle"
 
-#: ../extensions/drive-menu/extension.js:117
-msgid "Open File"
+#: extensions/drive-menu/extension.js:143
+msgid "Open Files"
 msgstr "Open lêer"
 
-#: ../extensions/example/extension.js:17
+#: extensions/example/extension.js:17
 msgid "Hello, world!"
 msgstr "Hallo, wêreld!"
 
-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:1
+#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:5
 msgid "Alternative greeting text."
-msgstr ""
+msgstr "Alternatiewe groetboodskap."
 
-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:2
+#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:6
 msgid ""
 "If not empty, it contains the text that will be shown when clicking on the "
 "panel."
 msgstr ""
+"Indien dit nie leeg is nie bevat dit die teks wat op die paneel gewys word "
+"as daarop geklik word."
+
+#: extensions/example/prefs.js:27
+msgid "Message"
+msgstr "Boodskap"
 
 #. TRANSLATORS: Example is the name of the extension, should not be
 #. translated
-#: ../extensions/example/prefs.js:30
+#: extensions/example/prefs.js:40
 msgid ""
 "Example aims to show how to build well behaved extensions for the Shell and "
 "as such it has little functionality on its own.\n"
-"Nevertheless it's possible to customize the greeting message."
+"Nevertheless it’s possible to customize the greeting message."
 msgstr ""
+"Example het ten doel om te wys hoe om goeie uitbreidings vir die Shell te "
+"skep en het dus min funksionaliteit.\n"
+"Tog is dit moontlik om die groeteboodskap aan te pas."
 
-#: ../extensions/example/prefs.js:36
-msgid "Message:"
-msgstr "Boodskap:"
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:1
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
 msgid "Use more screen for windows"
-msgstr ""
+msgstr "Gebruik meer skermspasie vir vensters"
 
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:2
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
 msgid ""
 "Try to use more screen for placing window thumbnails by adapting to screen "
 "aspect ratio, and consolidating them further to reduce the bounding box. "
 "This setting applies only with the natural placement strategy."
 msgstr ""
+"Probeer om meer skermspasie te gebruik vir die plasing van vensterduimnaels "
+"deur aan te pas by die skerm-aspekverhouding. Hierdie instelling is slegs "
+"van toepassing op die normale plasingstrategie."
 
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:3
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
 msgid "Place window captions on top"
-msgstr ""
+msgstr "Plaas venster opskrifte bo"
 
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:4
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:12
 msgid ""
 "If true, place window captions on top the respective thumbnail, overriding "
 "shell default of placing it at the bottom. Changing this setting requires "
 "restarting the shell to have any effect."
 msgstr ""
+"As waar, plaas venster opskrifte bo hul onderskeie duimnaels, anders as die "
+"shell standaard waar hulle onder sou verskyn. As u hierdie instelling "
+"verander, moet die shell weer begin word om enige effek te toon."
 
-#: ../extensions/places-menu/extension.js:78
-#: ../extensions/places-menu/extension.js:81
+#: extensions/places-menu/extension.js:79
+#: extensions/places-menu/extension.js:82
 msgid "Places"
 msgstr "Plekke"
 
-#: ../extensions/places-menu/placeDisplay.js:56
-#, c-format
-msgid "Failed to launch \"%s\""
+#: extensions/places-menu/placeDisplay.js:66
+#, javascript-format
+msgid "Failed to mount volume for “%s”"
+msgstr "Kon nie die \"%s\" volume heg nie"
+
+#: extensions/places-menu/placeDisplay.js:79
+#, javascript-format
+msgid "Failed to launch “%s”"
 msgstr "Kon nie \"%s\" lanseer nie"
 
-#: ../extensions/places-menu/placeDisplay.js:98
-#: ../extensions/places-menu/placeDisplay.js:121
+#: extensions/places-menu/placeDisplay.js:135
+#: extensions/places-menu/placeDisplay.js:158
 msgid "Computer"
 msgstr "Rekenaar"
 
-#: ../extensions/places-menu/placeDisplay.js:199
+#: extensions/places-menu/placeDisplay.js:336
 msgid "Home"
 msgstr "Tuis"
 
-#: ../extensions/places-menu/placeDisplay.js:286
+#: extensions/places-menu/placeDisplay.js:378
 msgid "Browse Network"
 msgstr "Blaai deur netwerk"
 
-#: ../extensions/systemMonitor/extension.js:214
-msgid "CPU"
-msgstr "SVE"
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
+msgid "Cycle Screenshot Sizes"
+msgstr "Rol deur skermkiekies"
 
-#: ../extensions/systemMonitor/extension.js:267
-msgid "Memory"
-msgstr "Geheue"
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
+msgid "Cycle Screenshot Sizes Backward"
+msgstr "Rol agteruit deur skermkiekies"
 
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:1
+#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
 msgstr "Temanaam"
 
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:2
+#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:6
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr ""
+"Die naam van die tema wat van ~/.themes/name/gnome-shell gelaai moet word"
 
-#: ../extensions/window-list/extension.js:92
+#: extensions/window-list/extension.js:106
 msgid "Close"
 msgstr "Sluit"
 
-#: ../extensions/window-list/extension.js:102
+#: extensions/window-list/extension.js:125
 msgid "Unminimize"
-msgstr ""
+msgstr "Onminimeer"
 
-#: ../extensions/window-list/extension.js:103
+#: extensions/window-list/extension.js:126
 msgid "Minimize"
 msgstr "Minimeer"
 
-#: ../extensions/window-list/extension.js:109
+#: extensions/window-list/extension.js:132
 msgid "Unmaximize"
-msgstr ""
+msgstr "Onmaksimeer"
 
-#: ../extensions/window-list/extension.js:110
+#: extensions/window-list/extension.js:133
 msgid "Maximize"
 msgstr "Maksimeer"
 
-#: ../extensions/window-list/extension.js:270
+#: extensions/window-list/extension.js:408
 msgid "Minimize all"
 msgstr "Minimeer almal"
 
-#: ../extensions/window-list/extension.js:278
+#: extensions/window-list/extension.js:414
 msgid "Unminimize all"
-msgstr ""
+msgstr "Onminimeer almal"
 
-#: ../extensions/window-list/extension.js:286
+#: extensions/window-list/extension.js:420
 msgid "Maximize all"
 msgstr "Maksimeer almal"
 
-#: ../extensions/window-list/extension.js:295
+#: extensions/window-list/extension.js:429
 msgid "Unmaximize all"
-msgstr ""
+msgstr "Ommaksimeer almal"
 
-#: ../extensions/window-list/extension.js:304
+#: extensions/window-list/extension.js:438
 msgid "Close all"
 msgstr "Sluit almal"
 
-#: ../extensions/window-list/extension.js:591
-#: ../extensions/workspace-indicator/extension.js:30
+#: extensions/window-list/extension.js:646
+#: extensions/workspace-indicator/extension.js:26
 msgid "Workspace Indicator"
-msgstr ""
+msgstr "Werkspasie aanwyser"
 
-#: ../extensions/window-list/extension.js:743
+#: extensions/window-list/extension.js:811
 msgid "Window List"
 msgstr "Vensterlys"
 
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:1
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:12
 msgid "When to group windows"
 msgstr "Wanneer om vensters te groepeer"
 
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:2
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
 msgid ""
 "Decides when to group windows from the same application on the window list. "
-"Possible values are \"never\", \"auto\" and \"always\"."
+"Possible values are “never”, “auto” and “always”."
 msgstr ""
 "Besluit wanneer om vensters van dieselfde toepassing in die vensterlys te "
-"groepeer. Moontlike waardes is \"never\", \"auto\" en \"always\"."
+"groepeer. Moontlike waardes is \"nooit\", \"outomaties\" en \"altyd\"."
 
-#: ../extensions/window-list/prefs.js:30
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
+msgid "Show the window list on all monitors"
+msgstr "Wys vensterlys op alle skerms"
+
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
+msgid ""
+"Whether to show the window list on all connected monitors or only on the "
+"primary one."
+msgstr ""
+"Of die vensterlys op alle gekonnekteerde monitors vertoon moet word of slegs "
+"die primêre een."
+
+#: extensions/window-list/prefs.js:28
 msgid "Window Grouping"
 msgstr "Venstergroepering"
 
-#: ../extensions/window-list/prefs.js:49
+#: extensions/window-list/prefs.js:46
 msgid "Never group windows"
 msgstr "Moet nooit vensters groepeer nie"
 
-#: ../extensions/window-list/prefs.js:50
+#: extensions/window-list/prefs.js:47
 msgid "Group windows when space is limited"
 msgstr "Groepeer vensters wanneer ruimte beperk is"
 
-#: ../extensions/window-list/prefs.js:51
+#: extensions/window-list/prefs.js:48
 msgid "Always group windows"
 msgstr "Groepeer vensters altyd"
 
-#: ../extensions/workspace-indicator/prefs.js:141
-msgid "Workspace names:"
-msgstr "Werkruimtename:"
+#: extensions/window-list/prefs.js:71
+msgid "Show on all monitors"
+msgstr "Wys op alle skerms"
 
-#: ../extensions/workspace-indicator/prefs.js:152
+#: extensions/workspace-indicator/prefs.js:134
+msgid "Workspace Names"
+msgstr "Werkspasiename"
+
+#: extensions/workspace-indicator/prefs.js:150
 msgid "Name"
 msgstr "Naam"
 
-#: ../extensions/workspace-indicator/prefs.js:186
-#, c-format
+#: extensions/workspace-indicator/prefs.js:190
+#, javascript-format
 msgid "Workspace %d"
-msgstr "Werkruimte %d"
+msgstr "Werkspasie %d"
+
+#~ msgid "GNOME Shell Classic"
+#~ msgstr "GNOME Shell Klassiek"
+
+#~ msgid "Window management and application launching"
+#~ msgstr "Vensterbestuur en toepassinglansering"
+
+#~ msgid "CPU"
+#~ msgstr "SVE"
+
+#~ msgid "Memory"
+#~ msgstr "Geheue"

po/eo.po

@@ -3,107 +3,49 @@
 # This file is distributed under the same license as the gnome-shell-extensions package.
 # Ryan LORTIE <desrt@desrt.ca>, 2013.
 # Daniel PUENTES <blatberk@openmailbox.org>, 2015.
-# Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>, 2011, 2015.
-#
+# Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>, 2011-2019.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2015-01-31 08:37+0000\n"
-"PO-Revision-Date: 2015-02-01 16:13+0100\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
+"issues\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-l10n-eo@lists.launchpad.net>\n"
+"Language-Team: Esperanto <gnome-eo-list@gnome.org>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Virtaal 0.7.1\n"
+"X-Project-Style: gnome\n"
 
-#: ../data/gnome-classic.desktop.in.h:1
-#: ../data/gnome-classic.session.desktop.in.in.h:1
+#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
 msgid "GNOME Classic"
 msgstr "GNOME-klasika"
 
-#: ../data/gnome-classic.desktop.in.h:2
+#: data/gnome-classic.desktop.in:4
 msgid "This session logs you into GNOME Classic"
 msgstr "Ĉi seanco ensalutas vin GNOME-klasiken"
 
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:1
-msgid "Attach modal dialog to the parent window"
-msgstr "Kunligi modalan dialogon al la patra fenestro"
-
-#: ../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 ""
-"Ĉi ŝlosilo atutas la ŝlosilon en org.gnome.mutter kiam rulanta GNOME-ŝelon."
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:3
-msgid "Arrangement of buttons on the titlebar"
-msgstr "Aranĝo de butonoj en la titolbreto"
-
-#: ../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 ""
-"Ĉi tiu ŝlosilo anstataŭas la ŝlosilon en org.gnome.desktop.wm.preferences "
-"kiam GNOME-ŝelo rulas."
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:5
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr ""
-"Aktivigi kahelan aranĝon kiam demetante fenestrojn sur ekranaj borderoj"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:6
-msgid "Workspaces only on primary monitor"
-msgstr "Laborspacoj nur sur la ĉefa ekrano"
-
-#: ../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 "En musa reĝimo, prokrasti ŝanĝi fokuson ĝis la musmontrilo haltas"
-
-#: ../extensions/alternate-tab/prefs.js:20
-msgid "Thumbnail only"
-msgstr "Miniaturo nur"
-
-#: ../extensions/alternate-tab/prefs.js:21
-msgid "Application icon only"
-msgstr "Aplikaĵa piktogramo nur"
-
-#: ../extensions/alternate-tab/prefs.js:22
-msgid "Thumbnail and application icon"
-msgstr "Miniaturo kaj aplikaĵo piktogramo"
-
-#: ../extensions/alternate-tab/prefs.js:38
-msgid "Present windows as"
-msgstr "Prezenti fenestron kiel"
-
-#: ../extensions/alternate-tab/prefs.js:69
-msgid "Show only windows in the current workspace"
-msgstr "Montri nur fenestrojn en la aktuala laborspaco"
-
-#: ../extensions/apps-menu/extension.js:39
+#: extensions/apps-menu/extension.js:29
 msgid "Activities Overview"
 msgstr "Aktivecoj-Superrigardon"
 
-#: ../extensions/apps-menu/extension.js:114
+#: extensions/apps-menu/extension.js:118
 msgid "Favorites"
 msgstr "Plej ŝatataj"
 
-#: ../extensions/apps-menu/extension.js:283
+#: extensions/apps-menu/extension.js:407
 msgid "Applications"
 msgstr "Aplikaĵoj"
 
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:1
+#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
 msgid "Application and workspace list"
 msgstr "Aplikaĵa kaj laborspaca listo"
 
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
+#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:7
 msgid ""
 "A list of strings, each containing an application id (desktop file name), "
 "followed by a colon and the workspace number"
@@ -111,76 +53,49 @@ msgstr ""
 "Listo de ĉenoj, ĉiu enhavas aplikaĵan identigilon ('desktop' dosiernomo), "
 "sevkita per dupunkto kaj la laborspaca numero"
 
-#: ../extensions/auto-move-windows/prefs.js:60
+#: extensions/auto-move-windows/prefs.js:60
 msgid "Application"
 msgstr "Aplikaĵo"
 
-#: ../extensions/auto-move-windows/prefs.js:69
-#: ../extensions/auto-move-windows/prefs.js:127
+#: extensions/auto-move-windows/prefs.js:71
+#: extensions/auto-move-windows/prefs.js:134
 msgid "Workspace"
 msgstr "Laborspaco"
 
-#: ../extensions/auto-move-windows/prefs.js:85
-#| msgid "Add rule"
+#: extensions/auto-move-windows/prefs.js:89
 msgid "Add Rule"
 msgstr "Aldoni regulon"
 
-#: ../extensions/auto-move-windows/prefs.js:106
+#: extensions/auto-move-windows/prefs.js:111
 msgid "Create new matching rule"
 msgstr "Krei novan kongruantan regulon"
 
-#: ../extensions/auto-move-windows/prefs.js:111
+#: extensions/auto-move-windows/prefs.js:117
 msgid "Add"
 msgstr "Aldoni"
 
-#: ../extensions/drive-menu/extension.js:106
-msgid "Ejecting drive '%s' failed:"
-msgstr "Elĵeto de volumo '%s' malsukcesis:"
+#. TRANSLATORS: %s is the filesystem name
+#: 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:124
+#: extensions/drive-menu/extension.js:116
 msgid "Removable devices"
 msgstr "Demeteblaj aparatoj"
 
-#: ../extensions/drive-menu/extension.js:151
-msgid "Open File"
-msgstr "Malfermi dosieron"
+#: extensions/drive-menu/extension.js:143
+#| msgid "Open File"
+msgid "Open Files"
+msgstr "Malfermi dosierojn"
 
-#: ../extensions/example/extension.js:17
-msgid "Hello, world!"
-msgstr "Saluton, mondo!"
-
-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:1
-msgid "Alternative greeting text."
-msgstr "Alterna saluta teksto."
-
-#: ../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 ""
-"Se ne malplena, enhavas la tekston kiu estos montrita kiam alklakante sur la "
-"panelo."
-
-#: ../extensions/example/prefs.js:30
-#| msgid "Message:"
-msgid "Message"
-msgstr "Mesaĝo"
-
-#: ../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 ""
-"Ekzemplo klopodas montri kial krei bone-kondutantan etendojn por la ŝelo kaj "
-"sekve ne havas multan funkcion.\n"
-"Tamen, eblas agordi la salutan mesagon."
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:1
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
 msgid "Use more screen for windows"
 msgstr "Uzi pli da ekrano por fenetroj"
 
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:2
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
 msgid ""
 "Try to use more screen for placing window thumbnails by adapting to screen "
 "aspect ratio, and consolidating them further to reduce the bounding box. "
@@ -190,11 +105,11 @@ msgstr ""
 "aspekta rilatumo, kaj kunfandi ilin plu por redukti la limigan keston. Ĉi "
 "agordo uzitas nur kun la natura lokada strategio."
 
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:3
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
 msgid "Place window captions on top"
 msgstr "Meti fenestrajn apudskribojn supre"
 
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:4
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:12
 msgid ""
 "If true, place window captions on top the respective thumbnail, overriding "
 "shell default of placing it at the bottom. Changing this setting requires "
@@ -204,154 +119,241 @@ msgstr ""
 "estas meti ĝin malsupre). Si vi ŝanĝas ĉi agordon tiam vi devas restartigi "
 "la ŝelon."
 
-#: ../extensions/places-menu/extension.js:78
-#: ../extensions/places-menu/extension.js:81
+#: extensions/places-menu/extension.js:79
+#: extensions/places-menu/extension.js:83
 msgid "Places"
 msgstr "Lokoj"
 
-#: ../extensions/places-menu/placeDisplay.js:57
-msgid "Failed to launch \"%s\""
-msgstr "Malsukceis lanĉi \"%s\""
+#: extensions/places-menu/placeDisplay.js:59
+#, javascript-format
+msgid "Failed to mount volume for “%s”"
+msgstr ""
 
-#: ../extensions/places-menu/placeDisplay.js:99
-#: ../extensions/places-menu/placeDisplay.js:122
+#: extensions/places-menu/placeDisplay.js:72
+#, javascript-format
+#| msgid "Failed to launch \"%s\""
+msgid "Failed to launch “%s”"
+msgstr "Malsukcesis lanĉi “%s”"
+
+#: extensions/places-menu/placeDisplay.js:133
+#: extensions/places-menu/placeDisplay.js:156
 msgid "Computer"
 msgstr "Komputilo"
 
-#: ../extensions/places-menu/placeDisplay.js:200
+#: extensions/places-menu/placeDisplay.js:343
 msgid "Home"
 msgstr "Domo"
 
-#: ../extensions/places-menu/placeDisplay.js:287
+#: extensions/places-menu/placeDisplay.js:387
 msgid "Browse Network"
 msgstr "Foliumi reton"
 
-#: ../extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml.in.h:1
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
 msgid "Cycle Screenshot Sizes"
 msgstr "Cikle montri ekrankopiajn grandojn"
 
-#: ../extensions/systemMonitor/extension.js:214
-msgid "CPU"
-msgstr "Ĉefprocesoro"
+#: 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 "Cikle montri ekrankopiajn grandojn"
 
-#: ../extensions/systemMonitor/extension.js:267
-msgid "Memory"
-msgstr "Memoro"
-
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:1
+#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
 msgstr "Etosnomo"
 
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:2
+#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:6
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "La nomo de la etoso, malfermigi de ~/.themes/name/gnome-shell"
 
-#: ../extensions/window-list/extension.js:110
+#: extensions/window-list/extension.js:100
 msgid "Close"
 msgstr "Malfermi"
 
-#: ../extensions/window-list/extension.js:120
+#: extensions/window-list/extension.js:120
 msgid "Unminimize"
 msgstr "Neplejetigi"
 
-#: ../extensions/window-list/extension.js:121
+#: extensions/window-list/extension.js:120
 msgid "Minimize"
 msgstr "Plejetigi"
 
-#: ../extensions/window-list/extension.js:127
+#: extensions/window-list/extension.js:127
 msgid "Unmaximize"
 msgstr "Nemaksimumigi"
 
-#: ../extensions/window-list/extension.js:128
+#: extensions/window-list/extension.js:127
 msgid "Maximize"
 msgstr "Maksimumigi"
 
-#: ../extensions/window-list/extension.js:390
+#: extensions/window-list/extension.js:408
 msgid "Minimize all"
 msgstr "Plejetigi ĉiujn"
 
-#: ../extensions/window-list/extension.js:398
+#: extensions/window-list/extension.js:414
 msgid "Unminimize all"
 msgstr "Neplejetigi ĉiujn"
 
-#: ../extensions/window-list/extension.js:406
+#: extensions/window-list/extension.js:420
 msgid "Maximize all"
 msgstr "Maksimumigi ĉiujn"
 
-#: ../extensions/window-list/extension.js:415
+#: extensions/window-list/extension.js:429
 msgid "Unmaximize all"
 msgstr "Nemaksimumigi ĉiujn"
 
-#: ../extensions/window-list/extension.js:424
+#: extensions/window-list/extension.js:438
 msgid "Close all"
 msgstr "Fermi ĉiujn"
 
-#: ../extensions/window-list/extension.js:706
-#: ../extensions/workspace-indicator/extension.js:30
+#: extensions/window-list/extension.js:655
+#: extensions/workspace-indicator/extension.js:21
 msgid "Workspace Indicator"
 msgstr "Laborspaco Indikilo"
 
-#: ../extensions/window-list/extension.js:870
+#: extensions/window-list/extension.js:836
 msgid "Window List"
 msgstr "Fenestra listo"
 
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:1
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:12
 msgid "When to group windows"
 msgstr "Kiam grupigi fenestrojn"
 
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:2
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
+#, 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\"."
+"Possible values are “never”, “auto” and “always”."
 msgstr ""
 "Decidas kiam grupi fenestrojn de la sama aplikaĵo en la fenestra listo. "
-"Validaj valoroj estas \"never\" (neniam), \"auto\" (aŭtomate) kaj \"always"
-"\" (ĉiam)."
+"Validaj valoroj estas “never” (neniam), “auto” (aŭtomate) kaj “always” "
+"(ĉiam)."
 
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:3
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
 msgid "Show the window list on all monitors"
 msgstr "Montri la fenestroliston en ĉiuj ekranoj"
 
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:4
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
 msgid ""
 "Whether to show the window list on all connected monitors or only on the "
 "primary one."
 msgstr ""
 "Ĉu montri la fenestroliston en ĉiuj konektitaj ekranoj aŭ nur en la ĉefa."
 
-#: ../extensions/window-list/prefs.js:32
+#: extensions/window-list/prefs.js:25
 msgid "Window Grouping"
 msgstr "Fenestra grupigo"
 
-#: ../extensions/window-list/prefs.js:50
+#: extensions/window-list/prefs.js:47
 msgid "Never group windows"
 msgstr "Neniam grupigi fenestrojn"
 
-#: ../extensions/window-list/prefs.js:51
+#: extensions/window-list/prefs.js:48
 msgid "Group windows when space is limited"
 msgstr "Grupigi fenestrojn kiam spaco limitas"
 
-#: ../extensions/window-list/prefs.js:52
+#: extensions/window-list/prefs.js:49
 msgid "Always group windows"
 msgstr "Ĉiam grupigi fenestrojn"
 
-#: ../extensions/window-list/prefs.js:75
+#: extensions/window-list/prefs.js:75
 msgid "Show on all monitors"
 msgstr "Montri en ĉiuj ekranoj"
 
-#: ../extensions/workspace-indicator/prefs.js:141
-#| msgid "Workspace names:"
+#: extensions/workspace-indicator/prefs.js:131
 msgid "Workspace Names"
 msgstr "Laborspacaj nomoj"
 
-#: ../extensions/workspace-indicator/prefs.js:157
+#: extensions/workspace-indicator/prefs.js:151
 msgid "Name"
 msgstr "Nomo"
 
-#: ../extensions/workspace-indicator/prefs.js:198
+#: extensions/workspace-indicator/prefs.js:191
+#, javascript-format
 msgid "Workspace %d"
 msgstr "Laborspaco %d"
 
+#~ msgid "Attach modal dialog to the parent window"
+#~ msgstr "Kunligi modalan dialogon al la patra fenestro"
+
+#~ msgid ""
+#~ "This key overrides the key in org.gnome.mutter when running GNOME Shell."
+#~ msgstr ""
+#~ "Ĉi ŝlosilo atutas la ŝlosilon en org.gnome.mutter kiam rulanta GNOME-"
+#~ "ŝelon."
+
+#~ msgid "Arrangement of buttons on the titlebar"
+#~ msgstr "Aranĝo de butonoj en la titolbreto"
+
+#~| 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 ""
+#~ "Ĉi tiu ŝlosilo anstataŭas la ŝlosilon en org.gnome.desktop.wm.preferences "
+#~ "kiam GNOME-ŝelo rulas."
+
+#~ msgid "Enable edge tiling when dropping windows on screen edges"
+#~ msgstr ""
+#~ "Aktivigi kahelan aranĝon kiam demetante fenestrojn sur ekranaj borderoj"
+
+#~ msgid "Workspaces only on primary monitor"
+#~ msgstr "Laborspacoj nur sur la ĉefa ekrano"
+
+#~ msgid "Delay focus changes in mouse mode until the pointer stops moving"
+#~ msgstr "En musa reĝimo, prokrasti ŝanĝi fokuson ĝis la musmontrilo haltas"
+
+#~ msgid "Thumbnail only"
+#~ msgstr "Miniaturo nur"
+
+#~ msgid "Application icon only"
+#~ msgstr "Aplikaĵa piktogramo nur"
+
+#~ msgid "Thumbnail and application icon"
+#~ msgstr "Miniaturo kaj aplikaĵo piktogramo"
+
+#~ 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!"
+
+#~ msgid "Alternative greeting text."
+#~ msgstr "Alterna saluta teksto."
+
+#~ msgid ""
+#~ "If not empty, it contains the text that will be shown when clicking on "
+#~ "the panel."
+#~ msgstr ""
+#~ "Se ne malplena, enhavas la tekston kiu estos montrita kiam alklakante sur "
+#~ "la panelo."
+
+#~| msgid "Message:"
+#~ msgid "Message"
+#~ msgstr "Mesaĝo"
+
+#~ 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 ""
+#~ "Ekzemplo klopodas montri kial krei bone-kondutantan etendojn por la ŝelo "
+#~ "kaj sekve ne havas multan funkcion.\n"
+#~ "Tamen, eblas agordi la salutan mesagon."
+
+#~ msgid "CPU"
+#~ msgstr "Ĉefprocesoro"
+
+#~ msgid "Memory"
+#~ msgstr "Memoro"
+
 #~ msgid "GNOME Shell Classic"
 #~ msgstr "GNOME-ŝelo-klasika"
 

po/et.po

@@ -6,85 +6,44 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2014-08-06 07:34+0000\n"
-"PO-Revision-Date: 2014-08-06 21:43+0300\n"
-"Last-Translator: Mattias Põldaru <mahfiaz@gmail.com>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
+"issues\n"
+"POT-Creation-Date: 2019-03-02 10:57+0000\n"
+"PO-Revision-Date: 2019-03-10 19:24+0200\n"
+"Last-Translator: Mart Raudsepp <leio@gentoo.org>\n"
 "Language-Team: Estonian <gnome-et-list@gnome.org>\n"
 "Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 2.2\n"
 
+#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
 msgid "GNOME Classic"
 msgstr "Klassikaline GNOME"
 
+#: data/gnome-classic.desktop.in:4
 msgid "This session logs you into GNOME Classic"
 msgstr "See on klassikalise GNOME seanss"
 
-msgid "GNOME Shell Classic"
-msgstr "GNOME klassikaline kest"
-
-msgid "Window management and application launching"
-msgstr "Akende haldus ja rakenduste käivitamine"
-
-msgid "Attach modal dialog to the parent window"
-msgstr "Modaalsed dialoogid on vanemakna küljes"
-
-msgid ""
-"This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgstr ""
-"See võti on tähtsam võtmest org.gnome.mutter GNOME Shelli käivitamisel."
-
-msgid "Arrangement of buttons on the titlebar"
-msgstr "Nuppude järjestus tiitliribal"
-
-msgid ""
-"This key overrides the key in org.gnome.desktop.wm.preferences when running "
-"GNOME Shell."
-msgstr ""
-"See võti on tähtsam võtmest org.gnome.desktop.wm.preferences GNOME Shelli "
-"käivitamisel."
-
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr "Akna automaatpaigutus on lubatud, kui aken lohistatakse ekraani serva"
-
-msgid "Workspaces only on primary monitor"
-msgstr "Tööalad on ainult peamisel ekraanil"
-
-msgid "Delay focus changes in mouse mode until the pointer stops moving"
-msgstr "Hiire all asuv aken saab fookuse alles hiire peatumisel"
-
-msgid "Thumbnail only"
-msgstr "Ainult pisipilt"
-
-msgid "Application icon only"
-msgstr "Ainult rakenduse ikoon"
-
-msgid "Thumbnail and application icon"
-msgstr "Pisipilt ja rakenduse ikoon"
-
-msgid "Present windows as"
-msgstr "Aknaid esitletakse kui"
-
-msgid "Show only windows in the current workspace"
-msgstr "Näidatakse ainult käesoleva tööala aknaid"
-
+#: extensions/apps-menu/extension.js:29
 msgid "Activities Overview"
 msgstr "Tegevuste ülevaade"
 
+#: extensions/apps-menu/extension.js:118
 msgid "Favorites"
 msgstr "Lemmikud"
 
+#: extensions/apps-menu/extension.js:407
 msgid "Applications"
 msgstr "Rakendused"
 
+#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
 msgid "Application and workspace list"
 msgstr "Rakenduste ja tööalade loend"
 
+#: 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"
@@ -92,57 +51,47 @@ msgstr ""
 "Rakenduste loend, sõnedest, mis sisaldavad rakenduse id-d (desktop faili "
 "nimi), koolonit ja tööala numbrit."
 
+#: extensions/auto-move-windows/prefs.js:60
 msgid "Application"
 msgstr "Rakendus"
 
+#: extensions/auto-move-windows/prefs.js:71
+#: extensions/auto-move-windows/prefs.js:134
 msgid "Workspace"
 msgstr "Tööala"
 
+#: extensions/auto-move-windows/prefs.js:89
 msgid "Add Rule"
 msgstr "Lisa reegel"
 
+#: extensions/auto-move-windows/prefs.js:111
 msgid "Create new matching rule"
 msgstr "Uue reegli loomine"
 
+#: extensions/auto-move-windows/prefs.js:117
 msgid "Add"
 msgstr "Lisa"
 
+#. TRANSLATORS: %s is the filesystem name
+#: extensions/drive-menu/extension.js:100
+#: extensions/places-menu/placeDisplay.js:217
 #, javascript-format
-msgid "Ejecting drive '%s' failed:"
-msgstr "Seadme '%s' väljastamine nurjus:"
+msgid "Ejecting drive “%s” failed:"
+msgstr "Seadme „%s“ väljastamine nurjus:"
 
+#: extensions/drive-menu/extension.js:116
 msgid "Removable devices"
 msgstr "Eemaldatavad seadmed"
 
-msgid "Open File"
-msgstr "Faili avamine"
-
-msgid "Hello, world!"
-msgstr "Tere, maailm!"
-
-msgid "Alternative greeting text."
-msgstr "Alternatiivne tervitustekst."
-
-msgid ""
-"If not empty, it contains the text that will be shown when clicking on the "
-"panel."
-msgstr "Kui see pole tühi, näidatakse seda teksti paneelile klõpsates."
-
-msgid "Message"
-msgstr "Sõnum"
-
-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äide hästi käituva Shelli laienduse koostamise kohta, see ise väga kasulik "
-"ei ole.\n"
-"See võimaldab muuta kõigest tervitusteksti."
+#: extensions/drive-menu/extension.js:143
+msgid "Open Files"
+msgstr "Failide avamine"
 
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
 msgid "Use more screen for windows"
 msgstr "Rohkem pinda akende jaoks"
 
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
 msgid ""
 "Try to use more screen for placing window thumbnails by adapting to screen "
 "aspect ratio, and consolidating them further to reduce the bounding box. "
@@ -152,9 +101,11 @@ msgstr ""
 "ja paigutatakse aknad üksteisele lähemale. See säte kehtib ainult koos "
 "akende loomuliku paigutusega."
 
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
 msgid "Place window captions on top"
 msgstr "Akende pealkirjad on üleval"
 
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:12
 msgid ""
 "If true, place window captions on top the respective thumbnail, overriding "
 "shell default of placing it at the bottom. Changing this setting requires "
@@ -164,99 +115,229 @@ msgstr ""
 "Shelli vaikimisi viisi, alla asetamist. Selle sätte muutmine mõjub alles "
 "pärast Shelli taaskäivitust."
 
+#: extensions/places-menu/extension.js:79
+#: extensions/places-menu/extension.js:83
 msgid "Places"
 msgstr "Asukohad"
 
+#: extensions/places-menu/placeDisplay.js:59
 #, javascript-format
-msgid "Failed to launch \"%s\""
-msgstr "\"%s\" käivitamine nurjus"
+msgid "Failed to mount volume for “%s”"
+msgstr ""
 
+#: extensions/places-menu/placeDisplay.js:72
+#, javascript-format
+msgid "Failed to launch “%s”"
+msgstr "„%s“ käivitamine nurjus"
+
+#: extensions/places-menu/placeDisplay.js:133
+#: extensions/places-menu/placeDisplay.js:156
 msgid "Computer"
 msgstr "Arvuti"
 
+#: extensions/places-menu/placeDisplay.js:343
 msgid "Home"
 msgstr "Kodu"
 
+#: extensions/places-menu/placeDisplay.js:387
 msgid "Browse Network"
 msgstr "Võrgu sirvimine"
 
-msgid "CPU"
-msgstr "Protsessor"
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
+msgid "Cycle Screenshot Sizes"
+msgstr ""
 
-msgid "Memory"
-msgstr "Mälu"
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
+msgid "Cycle Screenshot Sizes Backward"
+msgstr ""
 
+#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
 msgstr "Kujunduse nimi"
 
+#: 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 "Kujunduse nimi, mis laaditakse asukohast ~/.themes/name/gnome-shell"
 
+#: extensions/window-list/extension.js:100
 msgid "Close"
 msgstr "Sulge"
 
+#: extensions/window-list/extension.js:120
 msgid "Unminimize"
 msgstr "Taasta"
 
+#: extensions/window-list/extension.js:120
 msgid "Minimize"
 msgstr "Minimeeri"
 
+#: extensions/window-list/extension.js:127
 msgid "Unmaximize"
 msgstr "Taasta suurus"
 
+#: extensions/window-list/extension.js:127
 msgid "Maximize"
 msgstr "Maksimeeri"
 
+#: extensions/window-list/extension.js:408
 msgid "Minimize all"
 msgstr "Minimeeri kõik"
 
+#: extensions/window-list/extension.js:414
 msgid "Unminimize all"
 msgstr "Taasta kõik"
 
+#: extensions/window-list/extension.js:420
 msgid "Maximize all"
 msgstr "Maksimeeri kõik"
 
+#: extensions/window-list/extension.js:429
 msgid "Unmaximize all"
 msgstr "Taasta kõigi suurus"
 
+#: extensions/window-list/extension.js:438
 msgid "Close all"
 msgstr "Sulge kõik"
 
+#: extensions/window-list/extension.js:655
+#: extensions/workspace-indicator/extension.js:21
 msgid "Workspace Indicator"
 msgstr "Tööala näitaja"
 
+#: extensions/window-list/extension.js:836
 msgid "Window List"
 msgstr "Akende loend"
 
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:12
 msgid "When to group windows"
 msgstr "Millal aknaid grupeeritakse"
 
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
 msgid ""
 "Decides when to group windows from the same application on the window list. "
-"Possible values are \"never\", \"auto\" and \"always\"."
+"Possible values are “never”, “auto” and “always”."
 msgstr ""
 "Määrab, millal akende loendis sama rakenduse aknaid grupeeritakse. "
-"Võimalikud väärtused on \"never\" (mitte kunagi), \"auto\" (automaatselt) ja "
-"\"always\" (alati)."
+"Võimalikud väärtused on „never“ (mitte kunagi), „auto“ (automaatselt) ja "
+"„always“ (alati)."
 
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
+msgid "Show the window list on all monitors"
+msgstr ""
+
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
+msgid ""
+"Whether to show the window list on all connected monitors or only on the "
+"primary one."
+msgstr ""
+
+#: extensions/window-list/prefs.js:25
 msgid "Window Grouping"
 msgstr "Akende grupeerimine"
 
+#: extensions/window-list/prefs.js:47
 msgid "Never group windows"
 msgstr "Aknaid ei grupeerita kunagi"
 
+#: extensions/window-list/prefs.js:48
 msgid "Group windows when space is limited"
 msgstr "Aknaid grupeeritakse, kui ruumi on vähe"
 
+#: extensions/window-list/prefs.js:49
 msgid "Always group windows"
 msgstr "Aknaid grupeeritakse alati"
 
+#: extensions/window-list/prefs.js:75
+msgid "Show on all monitors"
+msgstr ""
+
+#: extensions/workspace-indicator/prefs.js:131
 msgid "Workspace Names"
 msgstr "Tööalade nimed"
 
+#: extensions/workspace-indicator/prefs.js:151
 msgid "Name"
 msgstr "Nimi"
 
+#: extensions/workspace-indicator/prefs.js:191
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Tööala %d"
+
+#~ msgid "GNOME Shell Classic"
+#~ msgstr "GNOME klassikaline kest"
+
+#~ msgid "Window management and application launching"
+#~ msgstr "Akende haldus ja rakenduste käivitamine"
+
+#~ msgid "Attach modal dialog to the parent window"
+#~ msgstr "Modaalsed dialoogid on vanemakna küljes"
+
+#~ msgid ""
+#~ "This key overrides the key in org.gnome.mutter when running GNOME Shell."
+#~ msgstr ""
+#~ "See võti on tähtsam võtmest org.gnome.mutter GNOME Shelli käivitamisel."
+
+#~ msgid "Arrangement of buttons on the titlebar"
+#~ msgstr "Nuppude järjestus tiitliribal"
+
+#~ msgid ""
+#~ "This key overrides the key in org.gnome.desktop.wm.preferences when "
+#~ "running GNOME Shell."
+#~ msgstr ""
+#~ "See võti on tähtsam võtmest org.gnome.desktop.wm.preferences GNOME Shelli "
+#~ "käivitamisel."
+
+#~ msgid "Enable edge tiling when dropping windows on screen edges"
+#~ msgstr ""
+#~ "Akna automaatpaigutus on lubatud, kui aken lohistatakse ekraani serva"
+
+#~ msgid "Workspaces only on primary monitor"
+#~ msgstr "Tööalad on ainult peamisel ekraanil"
+
+#~ msgid "Delay focus changes in mouse mode until the pointer stops moving"
+#~ msgstr "Hiire all asuv aken saab fookuse alles hiire peatumisel"
+
+#~ msgid "Thumbnail only"
+#~ msgstr "Ainult pisipilt"
+
+#~ msgid "Application icon only"
+#~ msgstr "Ainult rakenduse ikoon"
+
+#~ msgid "Thumbnail and application icon"
+#~ msgstr "Pisipilt ja rakenduse ikoon"
+
+#~ msgid "Present windows as"
+#~ msgstr "Aknaid esitletakse kui"
+
+#~ msgid "Show only windows in the current workspace"
+#~ msgstr "Näidatakse ainult käesoleva tööala aknaid"
+
+#~ msgid "Hello, world!"
+#~ msgstr "Tere, maailm!"
+
+#~ msgid "Alternative greeting text."
+#~ msgstr "Alternatiivne tervitustekst."
+
+#~ msgid ""
+#~ "If not empty, it contains the text that will be shown when clicking on "
+#~ "the panel."
+#~ msgstr "Kui see pole tühi, näidatakse seda teksti paneelile klõpsates."
+
+#~ msgid "Message"
+#~ msgstr "Sõnum"
+
+#~ 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äide hästi käituva Shelli laienduse koostamise kohta, see ise väga "
+#~ "kasulik ei ole.\n"
+#~ "See võimaldab muuta kõigest tervitusteksti."
+
+#~ msgid "CPU"
+#~ msgstr "Protsessor"
+
+#~ msgid "Memory"
+#~ msgstr "Mälu"

po/fr.po

@@ -3,21 +3,23 @@
 # This file is distributed under the same license as the gnome-shell-extensions package.
 # Claude Paroz <claude@2xlibre.net>, 2011.
 # Alain Lojewski <allomervan@gmail.com>, 2012-2013.
+# Charles Monzat <charles.monzat@numericable.fr>, 2018.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2017-08-11 01:33+0000\n"
-"PO-Revision-Date: 2017-08-19 18:40+0200\n"
-"Last-Translator: Alain Lojewski <allomervan@gmail.com>\n"
-"Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
+"issues\n"
+"POT-Creation-Date: 2018-11-13 00:23+0000\n"
+"PO-Revision-Date: 2018-11-14 17:56+0100\n"
+"Last-Translator: Charles Monzat <charles.monzat@numericable.fr>\n"
+"Language-Team: français <gnomefr@traduc.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Gtranslator 3.30.0\n"
 
 #: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
 msgid "GNOME Classic"
@@ -25,79 +27,37 @@ msgstr "GNOME Classique"
 
 #: data/gnome-classic.desktop.in:4
 msgid "This session logs you into GNOME Classic"
-msgstr "Cette session vous connnecte à GNOME Classique"
+msgstr "Cette session vous connecte à GNOME Classique"
 
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:7
-msgid "Attach modal dialog to the parent window"
-msgstr "Attacher les boîtes de dialogue modales à leur fenêtre parente"
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:8
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:25
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:33
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:41
-msgid ""
-"This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgstr ""
-"Cette clé remplace la clé dans org.gnome.mutter lorsque GNOME Shell est en "
-"cours d’exécution."
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
-msgid "Arrangement of buttons on the titlebar"
-msgstr "Ordre des boutons dans la barre de titre"
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:17
-msgid ""
-"This key overrides the key in org.gnome.desktop.wm.preferences when running "
-"GNOME Shell."
-msgstr ""
-"Cette clé remplace la clé dans org.gnome.desktop.wm.preferences lorsque "
-"GNOME Shell est en cours d’exécution."
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:24
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr ""
-"Activer la disposition verticale lorsque les fenêtres sont déposées aux "
-"bords de l’écran"
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:32
-msgid "Workspaces only on primary monitor"
-msgstr "Espaces de travail uniquement sur l’écran principal"
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:40
-msgid "Delay focus changes in mouse mode until the pointer stops moving"
-msgstr ""
-"Retarder les changements de focus en mode souris jusqu’à ce que le pointeur "
-"arrête de bouger"
-
-#: extensions/alternate-tab/prefs.js:20
+#: extensions/alternate-tab/prefs.js:19
 msgid "Thumbnail only"
 msgstr "Vignette seulement"
 
-#: extensions/alternate-tab/prefs.js:21
+#: extensions/alternate-tab/prefs.js:20
 msgid "Application icon only"
 msgstr "Icône d’application seulement"
 
-#: extensions/alternate-tab/prefs.js:22
+#: extensions/alternate-tab/prefs.js:21
 msgid "Thumbnail and application icon"
 msgstr "Vignette et icône d’application"
 
-#: extensions/alternate-tab/prefs.js:38
+#: extensions/alternate-tab/prefs.js:34
 msgid "Present windows as"
 msgstr "Présenter la fenêtre comme"
 
-#: extensions/alternate-tab/prefs.js:69
+#: extensions/alternate-tab/prefs.js:65
 msgid "Show only windows in the current workspace"
 msgstr "N’afficher les fenêtres que sur l’espace de travail actuel"
 
-#: extensions/apps-menu/extension.js:41
+#: extensions/apps-menu/extension.js:37
 msgid "Activities Overview"
 msgstr "Vue d’ensemble des activités"
 
-#: extensions/apps-menu/extension.js:141
+#: extensions/apps-menu/extension.js:130
 msgid "Favorites"
 msgstr "Favoris"
 
-#: extensions/apps-menu/extension.js:436
+#: extensions/apps-menu/extension.js:417
 msgid "Applications"
 msgstr "Applications"
 
@@ -110,42 +70,43 @@ msgid ""
 "A list of strings, each containing an application id (desktop file name), "
 "followed by a colon and the workspace number"
 msgstr ""
-"Une liste de chaînes de caratères, contenant chacune un identifiant "
+"Une liste de chaînes de caractères, contenant chacune un identifiant "
 "d’application (nom de fichier desktop), suivi par un deux-points et le "
 "numéro de l’espace de travail"
 
-#: extensions/auto-move-windows/prefs.js:60
+#: extensions/auto-move-windows/prefs.js:53
 msgid "Application"
 msgstr "Application"
 
-#: extensions/auto-move-windows/prefs.js:69
-#: extensions/auto-move-windows/prefs.js:127
+#: extensions/auto-move-windows/prefs.js:62
+#: extensions/auto-move-windows/prefs.js:117
 msgid "Workspace"
 msgstr "Espace de travail"
 
-#: extensions/auto-move-windows/prefs.js:85
+#: extensions/auto-move-windows/prefs.js:78
 msgid "Add Rule"
 msgstr "Ajouter une règle"
 
-#: extensions/auto-move-windows/prefs.js:106
+#: extensions/auto-move-windows/prefs.js:98
 msgid "Create new matching rule"
 msgstr "Créer une nouvelle règle de concordance"
 
-#: extensions/auto-move-windows/prefs.js:111
+#: extensions/auto-move-windows/prefs.js:103
 msgid "Add"
 msgstr "Ajouter"
 
 #. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:107
+#: extensions/drive-menu/extension.js:103
+#: extensions/places-menu/placeDisplay.js:225
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "L’éjection du disque « %s » a échoué :"
 
-#: extensions/drive-menu/extension.js:125
+#: extensions/drive-menu/extension.js:118
 msgid "Removable devices"
 msgstr "Périphériques amovibles"
 
-#: extensions/drive-menu/extension.js:150
+#: extensions/drive-menu/extension.js:143
 msgid "Open Files"
 msgstr "Ouvrir Fichiers"
 
@@ -165,13 +126,13 @@ msgstr ""
 "S’il n’est pas vide, il contient le texte qui s’affiche lorsque vous cliquez "
 "sur le tableau de bord."
 
-#: extensions/example/prefs.js:30
+#: extensions/example/prefs.js:27
 msgid "Message"
 msgstr "Message"
 
 #. TRANSLATORS: Example is the name of the extension, should not be
 #. translated
-#: extensions/example/prefs.js:43
+#: extensions/example/prefs.js:40
 msgid ""
 "Example aims to show how to build well behaved extensions for the Shell and "
 "as such it has little functionality on its own.\n"
@@ -211,31 +172,31 @@ msgstr ""
 "dessous. Pour que ce paramètre soit pris en compte, il faut redémarrer le "
 "Shell."
 
-#: extensions/places-menu/extension.js:78
-#: extensions/places-menu/extension.js:81
+#: extensions/places-menu/extension.js:79
+#: extensions/places-menu/extension.js:82
 msgid "Places"
 msgstr "Emplacements"
 
-#: extensions/places-menu/placeDisplay.js:65
+#: extensions/places-menu/placeDisplay.js:67
 #, javascript-format
 msgid "Failed to mount volume for “%s”"
 msgstr "Impossible de monter le volume « %s »"
 
-#: extensions/places-menu/placeDisplay.js:78
+#: extensions/places-menu/placeDisplay.js:80
 #, javascript-format
 msgid "Failed to launch “%s”"
 msgstr "Impossible de lancer « %s »"
 
-#: extensions/places-menu/placeDisplay.js:137
-#: extensions/places-menu/placeDisplay.js:160
+#: extensions/places-menu/placeDisplay.js:141
+#: extensions/places-menu/placeDisplay.js:164
 msgid "Computer"
 msgstr "Ordinateur"
 
-#: extensions/places-menu/placeDisplay.js:303
+#: extensions/places-menu/placeDisplay.js:342
 msgid "Home"
 msgstr "Dossier personnel"
 
-#: extensions/places-menu/placeDisplay.js:347
+#: extensions/places-menu/placeDisplay.js:386
 msgid "Browse Network"
 msgstr "Parcourir le réseau"
 
@@ -245,7 +206,7 @@ msgstr "Passer à la taille de capture suivante"
 
 #: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
 msgid "Cycle Screenshot Sizes Backward"
-msgstr "Passer à la taille de capture précédante"
+msgstr "Passer à la taille de capture précédente"
 
 #: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
@@ -255,52 +216,52 @@ msgstr "Nom du thème"
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "Le nom du thème, à charger à partir de ~/.themes/name/gnome-shell"
 
-#: extensions/window-list/extension.js:110
+#: extensions/window-list/extension.js:106
 msgid "Close"
 msgstr "Fermer"
 
-#: extensions/window-list/extension.js:129
+#: extensions/window-list/extension.js:125
 msgid "Unminimize"
 msgstr "Restaurer"
 
-#: extensions/window-list/extension.js:130
+#: extensions/window-list/extension.js:126
 msgid "Minimize"
 msgstr "Réduire"
 
-#: extensions/window-list/extension.js:136
+#: extensions/window-list/extension.js:132
 msgid "Unmaximize"
 msgstr "Restaurer"
 
-#: extensions/window-list/extension.js:137
+#: extensions/window-list/extension.js:133
 msgid "Maximize"
 msgstr "Maximiser"
 
-#: extensions/window-list/extension.js:420
+#: extensions/window-list/extension.js:408
 msgid "Minimize all"
-msgstr "Réduire tout"
+msgstr "Tout réduire"
 
-#: extensions/window-list/extension.js:428
+#: extensions/window-list/extension.js:414
 msgid "Unminimize all"
-msgstr "Restaurer tout"
+msgstr "Tout restaurer"
 
-#: extensions/window-list/extension.js:436
+#: extensions/window-list/extension.js:420
 msgid "Maximize all"
-msgstr "Maximiser tout"
+msgstr "Tout maximiser"
 
-#: extensions/window-list/extension.js:445
+#: extensions/window-list/extension.js:429
 msgid "Unmaximize all"
-msgstr "Restaurer tout"
+msgstr "Tout restaurer"
 
-#: extensions/window-list/extension.js:454
+#: extensions/window-list/extension.js:438
 msgid "Close all"
-msgstr "Fermer tout"
+msgstr "Tout fermer"
 
-#: extensions/window-list/extension.js:678
-#: extensions/workspace-indicator/extension.js:30
+#: extensions/window-list/extension.js:646
+#: extensions/workspace-indicator/extension.js:26
 msgid "Workspace Indicator"
 msgstr "Indicateur d’espace de travail"
 
-#: extensions/window-list/extension.js:842
+#: extensions/window-list/extension.js:816
 msgid "Window List"
 msgstr "Liste de fenêtres"
 
@@ -329,39 +290,71 @@ msgstr ""
 "Indique s’il faut afficher la liste des fenêtres sur tous les écrans "
 "connectés ou seulement l’écran principal."
 
-#: extensions/window-list/prefs.js:32
+#: extensions/window-list/prefs.js:28
 msgid "Window Grouping"
 msgstr "Regroupement de fenêtres"
 
-#: extensions/window-list/prefs.js:50
+#: extensions/window-list/prefs.js:46
 msgid "Never group windows"
 msgstr "Ne jamais regrouper les fenêtres"
 
-#: extensions/window-list/prefs.js:51
+#: extensions/window-list/prefs.js:47
 msgid "Group windows when space is limited"
 msgstr "Regrouper les fenêtres quand l’espace est limité"
 
-#: extensions/window-list/prefs.js:52
+#: extensions/window-list/prefs.js:48
 msgid "Always group windows"
 msgstr "Toujours regrouper les fenêtres"
 
-#: extensions/window-list/prefs.js:75
+#: extensions/window-list/prefs.js:71
 msgid "Show on all monitors"
 msgstr "Afficher sur tous les écrans"
 
-#: extensions/workspace-indicator/prefs.js:141
+#: extensions/workspace-indicator/prefs.js:134
 msgid "Workspace Names"
 msgstr "Noms des espaces de travail"
 
-#: extensions/workspace-indicator/prefs.js:157
+#: extensions/workspace-indicator/prefs.js:150
 msgid "Name"
 msgstr "Nom"
 
-#: extensions/workspace-indicator/prefs.js:198
+#: extensions/workspace-indicator/prefs.js:190
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Espace de travail %d"
 
+#~ msgid "Attach modal dialog to the parent window"
+#~ msgstr "Attacher les boîtes de dialogue modales à leur fenêtre parente"
+
+#~ msgid ""
+#~ "This key overrides the key in org.gnome.mutter when running GNOME Shell."
+#~ msgstr ""
+#~ "Cette clé remplace la clé dans org.gnome.mutter lorsque GNOME Shell est "
+#~ "en cours d’exécution."
+
+#~ msgid "Arrangement of buttons on the titlebar"
+#~ msgstr "Ordre des boutons dans la barre de titre"
+
+#~ msgid ""
+#~ "This key overrides the key in org.gnome.desktop.wm.preferences when "
+#~ "running GNOME Shell."
+#~ msgstr ""
+#~ "Cette clé remplace la clé dans org.gnome.desktop.wm.preferences lorsque "
+#~ "GNOME Shell est en cours d’exécution."
+
+#~ msgid "Enable edge tiling when dropping windows on screen edges"
+#~ msgstr ""
+#~ "Activer la disposition verticale lorsque les fenêtres sont déposées aux "
+#~ "bords de l’écran"
+
+#~ msgid "Workspaces only on primary monitor"
+#~ msgstr "Espaces de travail uniquement sur l’écran principal"
+
+#~ msgid "Delay focus changes in mouse mode until the pointer stops moving"
+#~ msgstr ""
+#~ "Retarder les changements de focus en mode souris jusqu’à ce que le "
+#~ "pointeur arrête de bouger"
+
 #~ msgid "CPU"
 #~ msgstr "CPU"
 

po/gd.po

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

po/ja.po

@@ -10,8 +10,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2015-03-24 13:21+0000\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
+"issues\n"
+"POT-Creation-Date: 2018-11-13 00:26+0000\n"
 "PO-Revision-Date: 2015-03-24 23:41+0900\n"
 "Last-Translator: Hajime Taira <htaira@redhat.com>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
@@ -21,290 +22,322 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/gnome-classic.desktop.in.h:1
-#: ../data/gnome-classic.session.desktop.in.in.h:1
+#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
 msgid "GNOME Classic"
 msgstr "GNOME クラシック"
 
-#: ../data/gnome-classic.desktop.in.h:2
+#: data/gnome-classic.desktop.in:4
 msgid "This session logs you into GNOME Classic"
 msgstr "GNOME クラシックモードでログインします"
 
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:1
-msgid "Attach modal dialog to the parent window"
-msgstr "モーダルダイアログを親ウィンドウに結び付ける"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:2
-msgid "This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgstr "GNOME Shell 使用時は、このキーが、org.gnome.mutter の同じキーよりも優先します。"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:3
-msgid "Arrangement of buttons on the titlebar"
-msgstr "タイトルバー上のボタンの配置"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:4
-msgid "This key overrides the key in org.gnome.desktop.wm.preferences when running GNOME Shell."
-msgstr "GNOME Shell 使用時は、このキーが、org.gnome.desktop.wm.preferences の同じキーよりも優先します。"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:5
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr "ウィンドウを画面の端に移動させたときにタイル状に配置する"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:6
-msgid "Workspaces only on primary monitor"
-msgstr "プライマリモニターのみワークスペースを切り替える"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:7
-msgid "Delay focus changes in mouse mode until the pointer stops moving"
-msgstr "ポインターの動作が止まるまでマウスモードでのフォーカスの変更を遅らせる"
-
-#: ../extensions/alternate-tab/prefs.js:20
-msgid "Thumbnail only"
-msgstr "サムネイルのみ"
-
-#: ../extensions/alternate-tab/prefs.js:21
-msgid "Application icon only"
-msgstr "アプリケーションアイコンのみ"
-
-#: ../extensions/alternate-tab/prefs.js:22
-msgid "Thumbnail and application icon"
-msgstr "サムネイルとアプリケーションアイコン"
-
-#: ../extensions/alternate-tab/prefs.js:38
-msgid "Present windows as"
-msgstr "ウィンドウの表示方法"
-
-#: ../extensions/alternate-tab/prefs.js:69
-msgid "Show only windows in the current workspace"
-msgstr "現在のワークスペースのウィンドウのみ表示する"
-
-#: ../extensions/apps-menu/extension.js:39
+#: extensions/apps-menu/extension.js:38
 msgid "Activities Overview"
 msgstr "アクティビティ"
 
-#: ../extensions/apps-menu/extension.js:110
+#: extensions/apps-menu/extension.js:131
 msgid "Favorites"
 msgstr "お気に入り"
 
-#: ../extensions/apps-menu/extension.js:279
+#: extensions/apps-menu/extension.js:419
 msgid "Applications"
 msgstr "アプリケーション"
 
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:1
+#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
 msgid "Application and workspace list"
 msgstr "アプリケーションとワークスペースのリスト"
 
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
-msgid "A list of strings, each containing an application id (desktop file name), followed by a colon and the workspace number"
-msgstr "アプリケーションの識別子 (.desktop ファイル名) とコロンの後にワークスペース番号を付与した文字列を要素とするリストです"
+#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:7
+msgid ""
+"A list of strings, each containing an application id (desktop file name), "
+"followed by a colon and the workspace number"
+msgstr ""
+"アプリケーションの識別子 (.desktop ファイル名) とコロンの後にワークスペース番"
+"号を付与した文字列を要素とするリストです"
 
-#: ../extensions/auto-move-windows/prefs.js:60
+#: extensions/auto-move-windows/prefs.js:53
 msgid "Application"
 msgstr "アプリケーション"
 
-#: ../extensions/auto-move-windows/prefs.js:69
-#: ../extensions/auto-move-windows/prefs.js:127
+#: extensions/auto-move-windows/prefs.js:62
+#: extensions/auto-move-windows/prefs.js:117
 msgid "Workspace"
 msgstr "ワークスペース"
 
-#: ../extensions/auto-move-windows/prefs.js:85
+#: extensions/auto-move-windows/prefs.js:78
 msgid "Add Rule"
 msgstr "ルールを追加"
 
-#: ../extensions/auto-move-windows/prefs.js:106
+#: extensions/auto-move-windows/prefs.js:98
 msgid "Create new matching rule"
 msgstr "新規ルールの作成"
 
-#: ../extensions/auto-move-windows/prefs.js:111
+#: extensions/auto-move-windows/prefs.js:103
 msgid "Add"
 msgstr "追加"
 
-#: ../extensions/drive-menu/extension.js:106
+#. TRANSLATORS: %s is the filesystem name
+#: extensions/drive-menu/extension.js:104
+#: extensions/places-menu/placeDisplay.js:225
 #, javascript-format
-msgid "Ejecting drive '%s' failed:"
-msgstr "ドライブ '%s' の取り出しに失敗しました:"
+msgid "Ejecting drive “%s” failed:"
+msgstr "ドライブ“%s”の取り出しに失敗しました:"
 
-#: ../extensions/drive-menu/extension.js:124
+#: extensions/drive-menu/extension.js:120
 msgid "Removable devices"
 msgstr "リムーバブルデバイス"
 
-#: ../extensions/drive-menu/extension.js:149
-msgid "Open File"
+#: extensions/drive-menu/extension.js:145
+msgid "Open Files"
 msgstr "ファイルを開く"
 
-#: ../extensions/example/extension.js:17
-msgid "Hello, world!"
-msgstr "Hello, world!"
-
-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:1
-msgid "Alternative greeting text."
-msgstr "代わりの挨拶テキストです。"
-
-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:2
-msgid "If not empty, it contains the text that will be shown when clicking on the panel."
-msgstr "空でない場合、指定したテキストが、パネルをクリックした時に表示されます。"
-
-#: ../extensions/example/prefs.js:30
-msgid "Message"
-msgstr "メッセージ"
-
-#: ../extensions/example/prefs.js:43
-msgid ""
-"Example aims to show how to build well behaved extensions for the Shell and as such it has little functionality on its own.\n"
-"Nevertheless it's possible to customize the greeting message."
-msgstr ""
-"Example は、うまく動作する GNOME Shell 拡張機能の構築方法を示すことを目的としています。それ自体の機能はほんとどありません。\n"
-"それでも、挨拶メッセージをカスタマイズすることはできます。"
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:1
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
 msgid "Use more screen for windows"
 msgstr "ウィンドウにたくさんの画面を使うかどうか"
 
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:2
-msgid "Try to use more screen for placing window thumbnails by adapting to screen aspect ratio, and consolidating them further to reduce the bounding box. This setting applies only with the natural placement strategy."
-msgstr "ウィンドウのサムネイルを複数配置する際に、画面のアスペクト比に合わせて、境界部分を減らすことにより、ウィンドウを統合することで、さらにたくさんの画面を使用できるようにするかどうかです。この設定は 'natural' の配置アルゴリズムを採用している場合にのみ適用されます。"
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
+msgid ""
+"Try to use more screen for placing window thumbnails by adapting to screen "
+"aspect ratio, and consolidating them further to reduce the bounding box. "
+"This setting applies only with the natural placement strategy."
+msgstr ""
+"ウィンドウのサムネイルを複数配置する際に、画面のアスペクト比に合わせて、境界"
+"部分を減らすことにより、ウィンドウを統合することで、さらにたくさんの画面を使"
+"用できるようにするかどうかです。この設定は 'natural' の配置アルゴリズムを採用"
+"している場合にのみ適用されます。"
 
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:3
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
 msgid "Place window captions on top"
 msgstr "ウィンドウのタイトルバーを上端に表示するかどうか"
 
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:4
-msgid "If true, place window captions on top the respective thumbnail, overriding shell default of placing it at the bottom. Changing this setting requires restarting the shell to have any effect."
-msgstr "TRUE にすると、ウィンドウのサムネイルの上端にそのウィンドウのタイトルバーを表示します (これは、サムネイルの下端にタイトルバーを表示する GNOME シェルのデフォルト値よりも優先されます)。この設定を適用する際は GNOME シェルを再起動してください。"
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:12
+msgid ""
+"If true, place window captions on top the respective thumbnail, overriding "
+"shell default of placing it at the bottom. Changing this setting requires "
+"restarting the shell to have any effect."
+msgstr ""
+"TRUE にすると、ウィンドウのサムネイルの上端にそのウィンドウのタイトルバーを表"
+"示します (これは、サムネイルの下端にタイトルバーを表示する GNOME シェルのデ"
+"フォルト値よりも優先されます)。この設定を適用する際は GNOME シェルを再起動し"
+"てください。"
 
-#: ../extensions/places-menu/extension.js:78
-#: ../extensions/places-menu/extension.js:81
+#: extensions/places-menu/extension.js:81
+#: extensions/places-menu/extension.js:84
 msgid "Places"
 msgstr "場所"
 
-#: ../extensions/places-menu/placeDisplay.js:57
+#: extensions/places-menu/placeDisplay.js:67
 #, javascript-format
-msgid "Failed to launch \"%s\""
-msgstr "\"%s\" の起動に失敗"
+msgid "Failed to mount volume for “%s”"
+msgstr ""
 
-#: ../extensions/places-menu/placeDisplay.js:99
-#: ../extensions/places-menu/placeDisplay.js:122
+#: extensions/places-menu/placeDisplay.js:80
+#, javascript-format
+msgid "Failed to launch “%s”"
+msgstr "“%s”の起動に失敗"
+
+#: extensions/places-menu/placeDisplay.js:141
+#: extensions/places-menu/placeDisplay.js:164
 msgid "Computer"
 msgstr "コンピューター"
 
-#: ../extensions/places-menu/placeDisplay.js:200
+#: extensions/places-menu/placeDisplay.js:342
 msgid "Home"
 msgstr "ホーム"
 
-#: ../extensions/places-menu/placeDisplay.js:287
+#: extensions/places-menu/placeDisplay.js:386
 msgid "Browse Network"
 msgstr "ネットワークを表示"
 
-#: ../extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml.in.h:1
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
 msgid "Cycle Screenshot Sizes"
 msgstr "スクリーンショットのサイズを変更する"
 
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:1
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
+msgid "Cycle Screenshot Sizes Backward"
+msgstr ""
+
+#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
 msgstr "テーマの名前"
 
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:2
+#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:6
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "テーマの名前です (~/.themes/name/gnome-shell 配下に格納します)"
 
-#: ../extensions/window-list/extension.js:109
+#: extensions/window-list/extension.js:107
 msgid "Close"
 msgstr "閉じる"
 
-#: ../extensions/window-list/extension.js:119
+#: extensions/window-list/extension.js:126
 msgid "Unminimize"
 msgstr "最小化解除"
 
-#: ../extensions/window-list/extension.js:120
+#: extensions/window-list/extension.js:127
 msgid "Minimize"
 msgstr "最小化"
 
-#: ../extensions/window-list/extension.js:126
+#: extensions/window-list/extension.js:133
 msgid "Unmaximize"
 msgstr "最大化解除"
 
-#: ../extensions/window-list/extension.js:127
+#: extensions/window-list/extension.js:134
 msgid "Maximize"
 msgstr "最大化"
 
-#: ../extensions/window-list/extension.js:399
+#: extensions/window-list/extension.js:409
 msgid "Minimize all"
 msgstr "全て最小化"
 
-#: ../extensions/window-list/extension.js:407
+#: extensions/window-list/extension.js:415
 msgid "Unminimize all"
 msgstr "全て最小化解除"
 
-#: ../extensions/window-list/extension.js:415
+#: extensions/window-list/extension.js:421
 msgid "Maximize all"
 msgstr "全て最大化"
 
-#: ../extensions/window-list/extension.js:424
+#: extensions/window-list/extension.js:430
 msgid "Unmaximize all"
 msgstr "全て最大化解除"
 
-#: ../extensions/window-list/extension.js:433
+#: extensions/window-list/extension.js:439
 msgid "Close all"
 msgstr "全て閉じる"
 
-#: ../extensions/window-list/extension.js:650
-#: ../extensions/workspace-indicator/extension.js:30
+#: extensions/window-list/extension.js:648
+#: extensions/workspace-indicator/extension.js:28
 msgid "Workspace Indicator"
 msgstr "ワークスペースインジケーター"
 
-#: ../extensions/window-list/extension.js:809
+#: extensions/window-list/extension.js:818
 msgid "Window List"
 msgstr "ウィンドウのリスト"
 
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:1
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:12
 msgid "When to group windows"
 msgstr "ウインドウをグループ化する条件"
 
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:2
-msgid "Decides when to group windows from the same application on the window list. Possible values are \"never\", \"auto\" and \"always\"."
-msgstr "ウィンドウ一覧にある同じアプリケーションをグループ化する条件を指定します。指定可能な値は、\"never\", \"auto\", \"always\" です。"
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
+msgid ""
+"Decides when to group windows from the same application on the window list. "
+"Possible values are “never”, “auto” and “always”."
+msgstr ""
+"ウィンドウ一覧にある同じアプリケーションをグループ化する条件を指定します。指"
+"定可能な値は、“never”, “auto”, “always”です。"
 
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:3
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
 msgid "Show the window list on all monitors"
 msgstr "すべてのモニターにウィンドウリストを表示する"
 
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:4
-msgid "Whether to show the window list on all connected monitors or only on the primary one."
-msgstr "ウィンドウリストをすべての接続モニターに表示するかプライマリーモニターにのみ表示するかの設定です。"
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
+msgid ""
+"Whether to show the window list on all connected monitors or only on the "
+"primary one."
+msgstr ""
+"ウィンドウリストをすべての接続モニターに表示するかプライマリーモニターにのみ"
+"表示するかの設定です。"
 
-#: ../extensions/window-list/prefs.js:32
+#: extensions/window-list/prefs.js:28
 msgid "Window Grouping"
 msgstr "ウィンドウのグループ化"
 
-#: ../extensions/window-list/prefs.js:50
+#: extensions/window-list/prefs.js:46
 msgid "Never group windows"
 msgstr "ウィンドウをグループ化しない"
 
-#: ../extensions/window-list/prefs.js:51
+#: extensions/window-list/prefs.js:47
 msgid "Group windows when space is limited"
 msgstr "ウィンドウ一覧の幅が制限される時にグループ化する"
 
-#: ../extensions/window-list/prefs.js:52
+#: extensions/window-list/prefs.js:48
 msgid "Always group windows"
 msgstr "ウィンドウをグループ化する"
 
-#: ../extensions/window-list/prefs.js:75
+#: extensions/window-list/prefs.js:71
 msgid "Show on all monitors"
 msgstr "すべてのモニターに表示する"
 
-#: ../extensions/workspace-indicator/prefs.js:141
+#: extensions/workspace-indicator/prefs.js:134
 msgid "Workspace Names"
 msgstr "ワークスペース名"
 
-#: ../extensions/workspace-indicator/prefs.js:157
+#: extensions/workspace-indicator/prefs.js:150
 msgid "Name"
 msgstr "名前"
 
-#: ../extensions/workspace-indicator/prefs.js:198
+#: extensions/workspace-indicator/prefs.js:190
 #, javascript-format
 msgid "Workspace %d"
 msgstr "ワークスペース %d"
 
+#~ msgid "Attach modal dialog to the parent window"
+#~ msgstr "モーダルダイアログを親ウィンドウに結び付ける"
+
+#~ msgid ""
+#~ "This key overrides the key in org.gnome.mutter when running GNOME Shell."
+#~ msgstr ""
+#~ "GNOME Shell 使用時は、このキーが、org.gnome.mutter の同じキーよりも優先し"
+#~ "ます。"
+
+#~ msgid "Arrangement of buttons on the titlebar"
+#~ msgstr "タイトルバー上のボタンの配置"
+
+#~ msgid ""
+#~ "This key overrides the key in org.gnome.desktop.wm.preferences when "
+#~ "running GNOME Shell."
+#~ msgstr ""
+#~ "GNOME Shell 使用時は、このキーが、org.gnome.desktop.wm.preferences の同じ"
+#~ "キーよりも優先します。"
+
+#~ msgid "Enable edge tiling when dropping windows on screen edges"
+#~ msgstr "ウィンドウを画面の端に移動させたときにタイル状に配置する"
+
+#~ msgid "Workspaces only on primary monitor"
+#~ msgstr "プライマリモニターのみワークスペースを切り替える"
+
+#~ msgid "Delay focus changes in mouse mode until the pointer stops moving"
+#~ msgstr ""
+#~ "ポインターの動作が止まるまでマウスモードでのフォーカスの変更を遅らせる"
+
+#~ msgid "Thumbnail only"
+#~ msgstr "サムネイルのみ"
+
+#~ msgid "Application icon only"
+#~ msgstr "アプリケーションアイコンのみ"
+
+#~ msgid "Thumbnail and application icon"
+#~ msgstr "サムネイルとアプリケーションアイコン"
+
+#~ msgid "Present windows as"
+#~ msgstr "ウィンドウの表示方法"
+
+#~ msgid "Show only windows in the current workspace"
+#~ msgstr "現在のワークスペースのウィンドウのみ表示する"
+
+#~ msgid "Hello, world!"
+#~ msgstr "Hello, world!"
+
+#~ msgid "Alternative greeting text."
+#~ msgstr "代わりの挨拶テキストです。"
+
+#~ msgid ""
+#~ "If not empty, it contains the text that will be shown when clicking on "
+#~ "the panel."
+#~ msgstr ""
+#~ "空でない場合、指定したテキストが、パネルをクリックした時に表示されます。"
+
+#~ msgid "Message"
+#~ msgstr "メッセージ"
+
+#~ msgid ""
+#~ "Example aims to show how to build well behaved extensions for the Shell "
+#~ "and as such it has little functionality on its own.\n"
+#~ "Nevertheless it's possible to customize the greeting message."
+#~ msgstr ""
+#~ "Example は、うまく動作する GNOME Shell 拡張機能の構築方法を示すことを目的"
+#~ "としています。それ自体の機能はほんとどありません。\n"
+#~ "それでも、挨拶メッセージをカスタマイズすることはできます。"
+
 #~ msgid "GNOME Shell Classic"
 #~ msgstr "GNOME Shell クラシック"
 
@@ -390,11 +423,18 @@ msgstr "ワークスペース %d"
 #~ msgstr "ドックに表示するアイコンの大きさを指定します。"
 
 #, fuzzy
-#~ msgid "Sets the effect of the hide dock. Allowed values are 'resize' or 'rescale'"
-#~ msgstr "ドックをデスクトップに表示する位置を指定します。指定可能な値: 'right'、'left'"
+#~ msgid ""
+#~ "Sets the effect of the hide dock. Allowed values are 'resize' or 'rescale'"
+#~ msgstr ""
+#~ "ドックをデスクトップに表示する位置を指定します。指定可能な値: "
+#~ "'right'、'left'"
 
-#~ msgid "Sets the position of the dock in the screen. Allowed values are 'right' or 'left'"
-#~ msgstr "ドックをデスクトップに表示する位置を指定します。指定可能な値: 'right'、'left'"
+#~ msgid ""
+#~ "Sets the position of the dock in the screen. Allowed values are 'right' "
+#~ "or 'left'"
+#~ msgstr ""
+#~ "ドックをデスクトップに表示する位置を指定します。指定可能な値: "
+#~ "'right'、'left'"
 
 #~ msgid "%s is away."
 #~ msgstr "%s さんは離席中です。"
@@ -408,8 +448,15 @@ msgstr "ワークスペース %d"
 #~ msgid "%s is busy."
 #~ msgstr "%s さんは取り込み中です。"
 
-#~ msgid "The algorithm used to layout thumbnails in the overview. 'grid' to use the default grid based algorithm, 'natural' to use another one that reflects more the position and size of the actual window"
-#~ msgstr "オーバービュー・モードでウィンドウのサムネイルを配置する際のアルゴリズムです。指定可能な値: 'grid' (原則的に格子状に配置していくアルゴリズム)、'natural' (ウィンドウの実際の位置や大きさを考慮して配置していくアルゴリズム)"
+#~ msgid ""
+#~ "The algorithm used to layout thumbnails in the overview. 'grid' to use "
+#~ "the default grid based algorithm, 'natural' to use another one that "
+#~ "reflects more the position and size of the actual window"
+#~ msgstr ""
+#~ "オーバービュー・モードでウィンドウのサムネイルを配置する際のアルゴリズムで"
+#~ "す。指定可能な値: 'grid' (原則的に格子状に配置していくアルゴリズ"
+#~ "ム)、'natural' (ウィンドウの実際の位置や大きさを考慮して配置していくアルゴ"
+#~ "リズム)"
 
 #~ msgid "Window placement strategy"
 #~ msgstr "ウィンドウを配置するアルゴリズム"

po/mjw.po

@@ -0,0 +1,249 @@
+# Karbi (India) translation for gnome-shell-extensions.
+# Copyright (C) 2019 gnome-shell-extensions's Free Software Foundation, Inc.
+# This file is distributed under the same license as the gnome-shell-extensions package.
+# Jor Teron <jor.teron@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: 2019-07-02 19:23+0000\n"
+"PO-Revision-Date: 2019-07-25 00:00+0530\n"
+"Last-Translator: Jor Teron <jor.teron@gmail.com>\n"
+"Language-Team: Karbi <karbi.translation@gmail.com>\n"
+"Language: mjw\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: gedit 3.28.1\n"
+
+#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
+msgid "GNOME Classic"
+msgstr "GNOME Classic"
+
+#: data/gnome-classic.desktop.in:4
+msgid "This session logs you into GNOME Classic"
+msgstr ""
+
+#: extensions/apps-menu/extension.js:111
+msgid "Favorites"
+msgstr ""
+
+#: extensions/apps-menu/extension.js:366
+msgid "Applications"
+msgstr ""
+
+#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
+msgid "Application and workspace list"
+msgstr ""
+
+#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:7
+msgid ""
+"A list of strings, each containing an application id (desktop file name), "
+"followed by a colon and the workspace number"
+msgstr ""
+
+#: extensions/auto-move-windows/prefs.js:60
+msgid "Application"
+msgstr ""
+
+#: 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 "Kethap"
+
+#. TRANSLATORS: %s is the filesystem name
+#: extensions/drive-menu/extension.js:102
+#: extensions/places-menu/placeDisplay.js:232
+#, javascript-format
+msgid "Ejecting drive “%s” failed:"
+msgstr "Drive “%s” patet un-eh:"
+
+#: extensions/drive-menu/extension.js:118
+msgid "Removable devices"
+msgstr ""
+
+#: extensions/drive-menu/extension.js:145
+msgid "Open Files"
+msgstr "Files kangpu"
+
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
+msgid "Use more screen for windows"
+msgstr ""
+
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
+msgid ""
+"Try to use more screen for placing window thumbnails by adapting to screen "
+"aspect ratio, and consolidating them further to reduce the bounding box. "
+"This setting applies only with the natural placement strategy."
+msgstr ""
+
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
+msgid "Place window captions on top"
+msgstr ""
+
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:12
+msgid ""
+"If true, place window captions on top the respective thumbnail, overriding "
+"shell default of placing it at the bottom. Changing this setting requires "
+"restarting the shell to have any effect."
+msgstr ""
+
+#: extensions/places-menu/extension.js:80
+#: extensions/places-menu/extension.js:84
+msgid "Places"
+msgstr ""
+
+#: extensions/places-menu/placeDisplay.js:46
+#, javascript-format
+msgid "Failed to launch “%s”"
+msgstr "“%s” Ingpu un-eh"
+
+#: extensions/places-menu/placeDisplay.js:61
+#, javascript-format
+msgid "Failed to mount volume for “%s”"
+msgstr ""
+
+#: extensions/places-menu/placeDisplay.js:148
+#: extensions/places-menu/placeDisplay.js:171
+msgid "Computer"
+msgstr "Computer"
+
+#: extensions/places-menu/placeDisplay.js:358
+msgid "Home"
+msgstr "Home"
+
+#: extensions/places-menu/placeDisplay.js:403
+msgid "Browse Network"
+msgstr "Network kelang"
+
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
+msgid "Cycle Screenshot Sizes"
+msgstr ""
+
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
+msgid "Cycle Screenshot Sizes Backward"
+msgstr ""
+
+#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
+msgid "Theme name"
+msgstr "Theme amen"
+
+#: 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 "Theme amem, kewan ji pen ~/.themes/name/gnome-shell"
+
+#: extensions/window-list/extension.js:99
+msgid "Close"
+msgstr "Kanghap"
+
+#: extensions/window-list/extension.js:119
+msgid "Unminimize"
+msgstr "Pabi-thuthe"
+
+#: extensions/window-list/extension.js:119
+msgid "Minimize"
+msgstr "Pabi"
+
+#: extensions/window-list/extension.js:126
+msgid "Unmaximize"
+msgstr "Pathe-thuthe"
+
+#: extensions/window-list/extension.js:126
+msgid "Maximize"
+msgstr "Pathe"
+
+#: extensions/window-list/extension.js:399
+msgid "Minimize all"
+msgstr "Kado-kawe pabi"
+
+#: extensions/window-list/extension.js:405
+msgid "Unminimize all"
+msgstr "Kado-kawe pabi-thuthe"
+
+#: extensions/window-list/extension.js:411
+msgid "Maximize all"
+msgstr "Kathe-kawe pathe"
+
+#: extensions/window-list/extension.js:419
+msgid "Unmaximize all"
+msgstr "Kado-kawe pathe-thuthe"
+
+#: extensions/window-list/extension.js:427
+msgid "Close all"
+msgstr "Kado-kawe kanghap"
+
+#: extensions/window-list/extension.js:642
+#: extensions/workspace-indicator/extension.js:20
+msgid "Workspace Indicator"
+msgstr ""
+
+#: extensions/window-list/extension.js:829
+msgid "Window List"
+msgstr ""
+
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:12
+msgid "When to group windows"
+msgstr "Mentu hutsi windows muluk nangji"
+
+#: 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 ""
+
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
+msgid "Show the window list on all monitors"
+msgstr ""
+
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
+msgid ""
+"Whether to show the window list on all connected monitors or only on the "
+"primary one."
+msgstr ""
+
+#: extensions/window-list/prefs.js:25
+msgid "Window Grouping"
+msgstr "Windows muluk"
+
+#: extensions/window-list/prefs.js:47
+msgid "Never group windows"
+msgstr "Windows muluk ri"
+
+#: extensions/window-list/prefs.js:48
+msgid "Group windows when space is limited"
+msgstr "Adim bihek te windows muluk noi"
+
+#: extensions/window-list/prefs.js:49
+msgid "Always group windows"
+msgstr "Windows muluk vek nangji"
+
+#: extensions/window-list/prefs.js:75
+msgid "Show on all monitors"
+msgstr ""
+
+#: extensions/workspace-indicator/prefs.js:131
+msgid "Workspace Names"
+msgstr "Workspace amen hai"
+
+#: extensions/workspace-indicator/prefs.js:151
+msgid "Name"
+msgstr "Men"
+
+#: extensions/workspace-indicator/prefs.js:191
+#, javascript-format
+msgid "Workspace %d"
+msgstr "Workspace amen %d"

po/sl.po

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

po/tg.po

@@ -1,356 +1,303 @@
 # Tajik translation for gnome-shell-extensions.
 # Copyright (C) 2013 gnome-shell-extensions's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-shell-extensions package.
-# Victor Ibragimov <victor.ibragimov@gmail.com>, 2013, 2014, 2015
+# Victor Ibragimov <victor.ibragimov@gmail.com>, 2013, 2014, 2015, 2019
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2015-03-09 20:46+0000\n"
-"PO-Revision-Date: 2015-03-10 11:25+0500\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/issues\n"
+"POT-Creation-Date: 2019-03-02 10:57+0000\n"
+"PO-Revision-Date: 2019-03-06 19:50+0500\n"
 "Last-Translator: Victor Ibragimov <victor.ibragimov@gmail.com>\n"
 "Language-Team: Tajik <tg@li.org>\n"
 "Language: tg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.5\n"
+"X-Generator: Poedit 2.2.1\n"
 
-#: ../data/gnome-classic.desktop.in.h:1
-#: ../data/gnome-classic.session.desktop.in.in.h:1
+#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
 msgid "GNOME Classic"
 msgstr "GNOME-и классикӣ"
 
-#: ../data/gnome-classic.desktop.in.h:2
+#: data/gnome-classic.desktop.in:4
 msgid "This session logs you into GNOME Classic"
 msgstr "Ин ҷаласа шуморо ба GNOME-и классикӣ ворид мекунад"
 
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:1
-msgid "Attach modal dialog to the parent window"
-msgstr "Замима кардани равзанаи гуфтугӯи модалӣ ба равзанаи асосӣ"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:2
-msgid ""
-"This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgstr ""
-"Ҳангоми иҷрокунии GNOME Shell ин калид калидеро дар org.gnome.mutter "
-"ҷойгузин мекунад."
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:3
-msgid "Arrangement of buttons on the titlebar"
-msgstr "Мураттабсозии тугмаҳо дар навори унвон"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:4
-#| msgid ""
-#| "This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgid ""
-"This key overrides the key in org.gnome.desktop.wm.preferences when running "
-"GNOME Shell."
-msgstr ""
-"Ин тугма тугмаро дар хусусиятҳои org.gnome.desktop.wm.preferences ҳангоми "
-"иҷрокунии восити GNOME лағв мекунад."
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:5
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr ""
-"Фаъол кардани лавҳаҳои канорӣ ҳангоми интиқолдиҳии равзанаҳо ба канорҳои "
-"экран"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:6
-msgid "Workspaces only on primary monitor"
-msgstr "Фазоҳои корӣ танҳо дар монитори асосӣ"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:7
-msgid "Delay focus changes in mouse mode until the pointer stops moving"
-msgstr ""
-"Ҳангоми истифодаи муш таъхири фокус тағйир меёбад, то он вақте ки курсор "
-"намеистад"
-
-#: ../extensions/alternate-tab/prefs.js:20
-msgid "Thumbnail only"
-msgstr "Танҳо тасвирҳои пешнамоишӣ"
-
-#: ../extensions/alternate-tab/prefs.js:21
-msgid "Application icon only"
-msgstr "Танҳо нишонаи барнома"
-
-#: ../extensions/alternate-tab/prefs.js:22
-msgid "Thumbnail and application icon"
-msgstr "Тасвирҳои пешнамоишӣ ва нишонаҳои барномаҳо"
-
-#: ../extensions/alternate-tab/prefs.js:38
-msgid "Present windows as"
-msgstr "Намоиш додани равзанаҳо ҳамчун"
-
-#: ../extensions/alternate-tab/prefs.js:69
-msgid "Show only windows in the current workspace"
-msgstr "Намоиш додани равзанаҳо танҳо дар фазои кории ҷорӣ"
-
-#: ../extensions/apps-menu/extension.js:39
+#: extensions/apps-menu/extension.js:29
 msgid "Activities Overview"
 msgstr "Хулосаи фаъолият"
 
-#: ../extensions/apps-menu/extension.js:110
+#: extensions/apps-menu/extension.js:118
 msgid "Favorites"
 msgstr "Баргузидаҳо"
 
-#: ../extensions/apps-menu/extension.js:279
+#: extensions/apps-menu/extension.js:407
 msgid "Applications"
 msgstr "Барномаҳо"
 
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:1
+#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
 msgid "Application and workspace list"
 msgstr "Рӯйхати барномаҳо ва фазоҳои корӣ"
 
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
-msgid ""
-"A list of strings, each containing an application id (desktop file name), "
-"followed by a colon and the workspace number"
-msgstr ""
-"Рӯйхати сатрҳое, ки рақами мушаххаси барномаҳоро дар бар мегиранд (номҳои "
-"файлҳои мизи корӣ) ва бо ду нуқта ва рақами фазо ҷудо мешаванд"
+#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:7
+msgid "A list of strings, each containing an application id (desktop file name), followed by a colon and the workspace number"
+msgstr "Рӯйхати сатрҳое, ки рақами мушаххаси барномаҳоро дар бар мегиранд (номҳои файлҳои мизи корӣ) ва бо ду нуқта ва рақами фазо ҷудо мешаванд"
 
-#: ../extensions/auto-move-windows/prefs.js:60
+#: extensions/auto-move-windows/prefs.js:60
 msgid "Application"
 msgstr "Барнома"
 
-#: ../extensions/auto-move-windows/prefs.js:69
-#: ../extensions/auto-move-windows/prefs.js:127
+#: extensions/auto-move-windows/prefs.js:71 extensions/auto-move-windows/prefs.js:134
 msgid "Workspace"
 msgstr "Фазои корӣ"
 
-#: ../extensions/auto-move-windows/prefs.js:85
-#| msgid "Add rule"
+#: extensions/auto-move-windows/prefs.js:89
 msgid "Add Rule"
 msgstr "Илова кардани қоида"
 
-#: ../extensions/auto-move-windows/prefs.js:106
+#: extensions/auto-move-windows/prefs.js:111
 msgid "Create new matching rule"
 msgstr "Эҷод кардани қоидаи мувофиқати нав"
 
-#: ../extensions/auto-move-windows/prefs.js:111
+#: extensions/auto-move-windows/prefs.js:117
 msgid "Add"
 msgstr "Илова кардан"
 
-#: ../extensions/drive-menu/extension.js:106
+#. TRANSLATORS: %s is the filesystem name
+#: extensions/drive-menu/extension.js:100 extensions/places-menu/placeDisplay.js:217
 #, javascript-format
-msgid "Ejecting drive '%s' failed:"
+#| msgid "Ejecting drive '%s' failed:"
+msgid "Ejecting drive “%s” failed:"
 msgstr "Баровардани диски '%s' қатъ шудааст:"
 
-#: ../extensions/drive-menu/extension.js:124
+#: extensions/drive-menu/extension.js:116
 msgid "Removable devices"
 msgstr "Дастгоҳҳои ҷудошаванда"
 
-#: ../extensions/drive-menu/extension.js:151
-msgid "Open File"
+#: extensions/drive-menu/extension.js:143
+#| msgid "Open File"
+msgid "Open Files"
 msgstr "Кушодани файл"
 
-#: ../extensions/example/extension.js:17
-msgid "Hello, world!"
-msgstr "Салом, ҷаҳон!"
-
-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.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
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
 msgid "Use more screen for windows"
 msgstr "Истифодаи экрани бештар барои равзанаҳо"
 
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:2
-msgid ""
-"Try to use more screen for placing window thumbnails by adapting to screen "
-"aspect ratio, and consolidating them further to reduce the bounding box. "
-"This setting applies only with the natural placement strategy."
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
+msgid "Try to use more screen for placing window thumbnails by adapting to screen aspect ratio, and consolidating them further to reduce the bounding box. This setting applies only with the natural placement strategy."
 msgstr ""
-"Кӯшиш кунед, ки экрани бештарро бо мувофиқсозии таносуби экран ва "
-"маҳдудкунии сарҳадҳои қуттиҳо барои ҷойгиркунии тасвирҳои пешнамоишии "
-"равзана истифода баред. Ин танзимот танҳо барои стратегияи ҷойгиркунии асил "
-"мувофиқ мебошад."
+"Кӯшиш кунед, ки экрани бештарро бо мувофиқсозии таносуби экран ва маҳдудкунии сарҳадҳои қуттиҳо барои ҷойгиркунии тасвирҳои пешнамоишии равзана истифода баред. Ин танзимот танҳо барои стратегияи ҷойгиркунии асил мувофиқ мебошад."
 
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:3
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
 msgid "Place window captions on top"
 msgstr "Ҷойгир кардани зернависҳои равзана ба боло"
 
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:4
-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."
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:12
+msgid "If true, place window captions on top the respective thumbnail, overriding shell default of placing it at the bottom. Changing this setting requires restarting the shell to have any effect."
 msgstr ""
-"Агар қимати \"true\" бошад, зернависҳои равзанаро ба болои тасвири "
-"пешнамоишии мувофиқ, бо ҷойгузинкунии навбати восити пешфарз ба поён, ҷойгир "
-"мекунад. Барои татбиқ кардани таъсири ин танзимот шумо бояд воситро бозоғозӣ "
-"кунед."
+"Агар қимати \"true\" бошад, зернависҳои равзанаро ба болои тасвири пешнамоишии мувофиқ, бо ҷойгузинкунии навбати восити пешфарз ба поён, ҷойгир мекунад. Барои татбиқ кардани таъсири ин танзимот шумо бояд воситро бозоғозӣ кунед."
 
-#: ../extensions/places-menu/extension.js:78
-#: ../extensions/places-menu/extension.js:81
+#: extensions/places-menu/extension.js:79 extensions/places-menu/extension.js:83
 msgid "Places"
 msgstr "Ҷойҳо"
 
-#: ../extensions/places-menu/placeDisplay.js:57
+#: extensions/places-menu/placeDisplay.js:59
 #, javascript-format
-msgid "Failed to launch \"%s\""
-msgstr "Оғоз бахшидани \"%s\" қатъ шудааст"
+msgid "Failed to mount volume for “%s”"
+msgstr "Васлкунии ҳаҷми диск барои “%s” иҷро нашуд"
 
-#: ../extensions/places-menu/placeDisplay.js:99
-#: ../extensions/places-menu/placeDisplay.js:122
+#: extensions/places-menu/placeDisplay.js:72
+#, javascript-format
+#| msgid "Failed to launch \"%s\""
+msgid "Failed to launch “%s”"
+msgstr "Оғози “%s” қатъ шуд"
+
+#: extensions/places-menu/placeDisplay.js:133 extensions/places-menu/placeDisplay.js:156
 msgid "Computer"
 msgstr "Компютер"
 
-#: ../extensions/places-menu/placeDisplay.js:200
+#: extensions/places-menu/placeDisplay.js:343
 msgid "Home"
 msgstr "Асосӣ"
 
-#: ../extensions/places-menu/placeDisplay.js:287
+#: extensions/places-menu/placeDisplay.js:387
 msgid "Browse Network"
 msgstr "Тамошо кардани шабака"
 
-#: ../extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml.in.h:1
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
 msgid "Cycle Screenshot Sizes"
 msgstr "Андозаҳои скриншоти ҳалқа"
 
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:1
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
+#| msgid "Cycle Screenshot Sizes"
+msgid "Cycle Screenshot Sizes Backward"
+msgstr "Андозаҳои скриншоти ҳалқа"
+
+#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
 msgstr "Номи мавзӯъ"
 
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:2
+#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:6
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "Номи мавзӯъ аз ~/.themes/name/gnome-shell боргирӣ мешавад"
 
-#: ../extensions/window-list/extension.js:109
+#: extensions/window-list/extension.js:100
 msgid "Close"
 msgstr "Пӯшидан"
 
-#: ../extensions/window-list/extension.js:119
+#: extensions/window-list/extension.js:120
 msgid "Unminimize"
 msgstr "Бекор кардани ҳадди ақал"
 
-#: ../extensions/window-list/extension.js:120
+#: extensions/window-list/extension.js:120
 msgid "Minimize"
 msgstr "Ҳадди ақал сохтан"
 
-#: ../extensions/window-list/extension.js:126
+#: extensions/window-list/extension.js:127
 msgid "Unmaximize"
 msgstr "Бекор кардани ҳадди аксар"
 
-#: ../extensions/window-list/extension.js:127
+#: extensions/window-list/extension.js:127
 msgid "Maximize"
 msgstr "Ҳадди аксар сохтан"
 
-#: ../extensions/window-list/extension.js:399
+#: extensions/window-list/extension.js:408
 msgid "Minimize all"
 msgstr "Ҳамаро бо ҳадди ақал сохтан"
 
-#: ../extensions/window-list/extension.js:407
+#: extensions/window-list/extension.js:414
 msgid "Unminimize all"
 msgstr "Бекор кардани ҳадди ақал барои ҳама"
 
-#: ../extensions/window-list/extension.js:415
+#: extensions/window-list/extension.js:420
 msgid "Maximize all"
 msgstr "Ҳамаро бо ҳадди аксар сохтан"
 
-#: ../extensions/window-list/extension.js:424
+#: extensions/window-list/extension.js:429
 msgid "Unmaximize all"
 msgstr "Бекор кардани ҳадди аксар барои ҳама"
 
-#: ../extensions/window-list/extension.js:433
+#: extensions/window-list/extension.js:438
 msgid "Close all"
 msgstr "Ҳамаро пӯшонидан"
 
-#: ../extensions/window-list/extension.js:650
-#: ../extensions/workspace-indicator/extension.js:30
+#: extensions/window-list/extension.js:655 extensions/workspace-indicator/extension.js:21
 msgid "Workspace Indicator"
 msgstr "Нишондиҳандаи фазои кор"
 
-#: ../extensions/window-list/extension.js:807
+#: extensions/window-list/extension.js:836
 msgid "Window List"
 msgstr "Рӯйхати равзанаҳо"
 
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:1
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:12
 msgid "When to group windows"
 msgstr "Шартҳои гурӯҳбандии равзанаҳо"
 
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:2
-msgid ""
-"Decides when to group windows from the same application on the window list. "
-"Possible values are \"never\", \"auto\" and \"always\"."
-msgstr ""
-"Қарор медиҳад, ки дар кадом ҳолат равзанаҳо аз худи барномаҳо дар рӯйхати "
-"равзанаҳо гурӯҳбандӣ мешаванд. Қиматҳои имконпазир: \"ҳеҷ гоҳ\", \"ба таври "
-"худкор\" ва \"ҳамеша\"."
+#: 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.in.h:3
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
 msgid "Show the window list on all monitors"
 msgstr "Намоиш додани рӯйхати равзанаҳо дар ҳамаи мониторҳо"
 
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:4
-msgid ""
-"Whether to show the window list on all connected monitors or only on the "
-"primary one."
-msgstr ""
-"Намоиш додани рӯйхати равзанаҳо дар ҳамаи мониторҳои пайвастшуда ё намоиш "
-"додани танҳо дар монитори асосӣ."
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
+msgid "Whether to show the window list on all connected monitors or only on the primary one."
+msgstr "Намоиш додани рӯйхати равзанаҳо дар ҳамаи мониторҳои пайвастшуда ё намоиш додани танҳо дар монитори асосӣ."
 
-#: ../extensions/window-list/prefs.js:32
+#: extensions/window-list/prefs.js:25
 msgid "Window Grouping"
 msgstr "Гурӯҳбандии равзанаҳо"
 
-#: ../extensions/window-list/prefs.js:50
+#: extensions/window-list/prefs.js:47
 msgid "Never group windows"
 msgstr "Ҳеҷ гоҳ равзанаҳоро гурӯҳбандӣ накардан"
 
-#: ../extensions/window-list/prefs.js:51
+#: extensions/window-list/prefs.js:48
 msgid "Group windows when space is limited"
 msgstr "Гурӯҳбандии равзанаҳо барои фазои маҳдудшуда"
 
-#: ../extensions/window-list/prefs.js:52
+#: extensions/window-list/prefs.js:49
 msgid "Always group windows"
 msgstr "Ҳамеша равзанаҳоро гурӯҳбандӣ кардан"
 
-#: ../extensions/window-list/prefs.js:75
+#: extensions/window-list/prefs.js:75
 msgid "Show on all monitors"
 msgstr "Намоиш додан дар ҳамаи мониторҳо"
 
-#: ../extensions/workspace-indicator/prefs.js:141
-#| msgid "Workspace names:"
+#: extensions/workspace-indicator/prefs.js:131
 msgid "Workspace Names"
 msgstr "Номҳои фазоҳои корӣ"
 
-#: ../extensions/workspace-indicator/prefs.js:157
+#: extensions/workspace-indicator/prefs.js:151
 msgid "Name"
 msgstr "Ном"
 
-#: ../extensions/workspace-indicator/prefs.js:198
+#: extensions/workspace-indicator/prefs.js:191
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Фазои кории %d"
 
+#~ msgid "Attach modal dialog to the parent window"
+#~ msgstr "Замима кардани равзанаи гуфтугӯи модалӣ ба равзанаи асосӣ"
+
+#~ msgid "This key overrides the key in org.gnome.mutter when running GNOME Shell."
+#~ msgstr "Ҳангоми иҷрокунии GNOME Shell ин калид калидеро дар org.gnome.mutter ҷойгузин мекунад."
+
+#~ msgid "Arrangement of buttons on the titlebar"
+#~ msgstr "Мураттабсозии тугмаҳо дар навори унвон"
+
+#~| msgid "This key overrides the key in org.gnome.mutter when running GNOME Shell."
+#~ msgid "This key overrides the key in org.gnome.desktop.wm.preferences when running GNOME Shell."
+#~ msgstr "Ин тугма тугмаро дар хусусиятҳои org.gnome.desktop.wm.preferences ҳангоми иҷрокунии восити GNOME лағв мекунад."
+
+#~ msgid "Enable edge tiling when dropping windows on screen edges"
+#~ msgstr "Фаъол кардани лавҳаҳои канорӣ ҳангоми интиқолдиҳии равзанаҳо ба канорҳои экран"
+
+#~ msgid "Workspaces only on primary monitor"
+#~ msgstr "Фазоҳои корӣ танҳо дар монитори асосӣ"
+
+#~ msgid "Delay focus changes in mouse mode until the pointer stops moving"
+#~ msgstr "Ҳангоми истифодаи муш таъхири фокус тағйир меёбад, то он вақте ки курсор намеистад"
+
+#~ msgid "Thumbnail only"
+#~ msgstr "Танҳо тасвирҳои пешнамоишӣ"
+
+#~ msgid "Application icon only"
+#~ msgstr "Танҳо нишонаи барнома"
+
+#~ msgid "Thumbnail and application icon"
+#~ msgstr "Тасвирҳои пешнамоишӣ ва нишонаҳои барномаҳо"
+
+#~ msgid "Present windows as"
+#~ msgstr "Намоиш додани равзанаҳо ҳамчун"
+
+#~ msgid "Show only windows in the current workspace"
+#~ msgstr "Намоиш додани равзанаҳо танҳо дар фазои кории ҷорӣ"
+
+#~ msgid "Hello, world!"
+#~ msgstr "Салом, ҷаҳон!"
+
+#~ 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"
+#~ "Бо вуҷуди ин, фармоишдиҳии паёми табрик имконпазир аст."
+
 #~ msgid "GNOME Shell Classic"
 #~ msgstr "Восити GNOME-и классикӣ"