Bump version to 48.2

Update NEWS.

NEWS

@@ -1,3 +1,25 @@
+48.2
+====
+* windowsNavigator: Fix handling keyboard shortcuts [Daniel; !395]
+* build: Allow disabling the X11 session [Neal; !396, !400]
+
+Contributors:
+  Daniel Buch Hansen, Neal Gompa
+
+48.1
+====
+
+Translators:
+  Hugo Carvalho [pt], Danial Behzadi [fa]
+
+48.0
+====
+* apps-menu: Fix scrolling items into view on keynav [Victor; !391]
+* Misc. bug fixes and cleanups [Florian, Stuart; !390, !392]
+
+Contributors:
+  Stuart Hayhurst, Victor Kareh, Florian Müllner
+
 48.rc
 =====
 * Misc. bug fixes and cleanups [Florian; !385, !388]

data/meson.build

@@ -2,14 +2,19 @@
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
 
+have_x11 = get_option('x11')
+
 session_desktop_base = 'gnome-classic'
 
 session_desktops = [
   session_desktop_base,
-  session_desktop_base + '-xorg',
   session_desktop_base + '-wayland',
 ]
 
+if have_x11
+  session_desktops += [session_desktop_base + '-xorg']
+endif
+
 foreach name : session_desktops
   session_desktop = name + '.desktop'
   if name.endswith('-xorg')
@@ -21,7 +26,7 @@ foreach name : session_desktops
     #        There is a workaround in meson/session-post-install.py until proper
     #        solution arises:
     #        https://github.com/mesonbuild/meson/issues/2416
-    session_instdir = xsessiondir
+    session_instdir = wlsessiondir
   #session_instdir = [ xesssiondir, wlsessiondir ]
   endif
   i18n.merge_file(

extensions/apps-menu/extension.js

@@ -44,8 +44,9 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
         this._app = app;
         this._button = button;
 
-        this._iconBin = new St.Bin();
-        this.add_child(this._iconBin);
+        this._icon = this.getDragActor();
+        this._icon.style_class = 'icon-dropshadow';
+        this.add_child(this._icon);
 
         let appLabel = new St.Label({
             text: app.get_name(),
@@ -55,11 +56,6 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
         this.add_child(appLabel);
         this.label_actor = appLabel;
 
-        let textureCache = St.TextureCache.get_default();
-        textureCache.connectObject('icon-theme-changed',
-            () => this._updateIcon(), this);
-        this._updateIcon();
-
         this._delegate = this;
         let draggable = DND.makeDraggable(this);
 
@@ -69,6 +65,8 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
                 return maybeStartDrag.call(draggable, event);
             return false;
         };
+
+        this.connect('notify::active', this._onActiveChanged.bind(this));
     }
 
     activate(event) {
@@ -80,10 +78,11 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
         Main.overview.hide();
     }
 
-    setActive(active, params) {
-        if (active)
-            this._button.scrollToButton(this);
-        super.setActive(active, params);
+    _onActiveChanged() {
+        if (!this.active)
+            return;
+
+        this._button.scrollToButton(this);
     }
 
     setDragEnabled(enabled) {
@@ -95,13 +94,7 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
     }
 
     getDragActorSource() {
-        return this._iconBin;
-    }
-
-    _updateIcon() {
-        let icon = this.getDragActor();
-        icon.style_class = 'icon-dropshadow';
-        this._iconBin.set_child(icon);
+        return this._icon;
     }
 }
 

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

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

extensions/windowsNavigator/extension.js

@@ -173,7 +173,7 @@ export default class Extension {
         this._injectionManager.overrideMethod(viewProto, '_hideTooltips', () => {
             /* eslint-disable no-invalid-this */
             return function () {
-                if (global.stage.get_key_focus() === global.stage)
+                if (global.stage.get_key_focus() === null)
                     global.stage.set_key_focus(this._prevFocusActor);
                 this._pickWindow = false;
                 for (let i = 0; i < this._workspaces.length; i++)
@@ -235,7 +235,7 @@ export default class Extension {
                     return true;
                 }
 
-                if (global.stage.get_key_focus() !== global.stage)
+                if (global.stage.get_key_focus() !== null)
                     return false;
 
                 // ignore shift presses, they're required to get numerals in azerty keyboards

extensions/windowsNavigator/metadata.json.in

@@ -5,7 +5,7 @@
     "settings-schema": "@gschemaname@",
     "gettext-domain": "@gettext_domain@",
     "original-author": "zaspire@rambler.ru",
-    "name": "windowNavigator",
+    "name": "Window Navigator",
     "description": "Allow keyboard selection of windows and workspaces in overlay mode. <Ctrl>number selects a workspace, and <Alt>number selects a window.",
     "url": "@url@"
 }

meson.build

@@ -4,7 +4,7 @@
 
 project(
   'gnome-shell-extensions',
-  version: '48.rc',
+  version: '48.2',
   meson_version: '>= 1.1.0',
   license: 'GPL-2.0-or-later',
 )
@@ -31,6 +31,8 @@ shell_version = ver_arr[0]
 
 uuid_suffix = '@gnome-shell-extensions.gcampax.github.com'
 
+have_x11 = get_option('x11')
+
 classic_extensions = [
   'apps-menu',
   'places-menu',
@@ -86,10 +88,12 @@ endforeach
 
 if classic_mode_enabled
   subdir('data')
-  meson.add_install_script(
-    'meson/session-post-install.py',
-    join_paths(get_option('prefix'), datadir),
-  )
+  if have_x11
+    meson.add_install_script(
+      'meson/session-post-install.py',
+      join_paths(get_option('prefix'), datadir),
+    )
+  endif
 endif
 
 subdir('extensions')

meson.options

@@ -20,3 +20,9 @@ option('classic_mode',
   value: false,
   description: 'Enable installing data files for classic mode.'
 )
+
+option('x11',
+  type: 'boolean',
+  value: true,
+  description: 'Enable X11 session support.'
+)

meson/session-post-install.py

@@ -15,10 +15,10 @@ else:
 
 # FIXME: Meson is unable to copy a generated target file:
 #        https://groups.google.com/forum/#!topic/mesonbuild/3iIoYPrN4P0
-dst_dir = os.path.join(install_root, 'wayland-sessions')
+dst_dir = os.path.join(install_root, 'xsessions')
 if not os.path.exists(dst_dir):
   os.makedirs(dst_dir)
 
-src = os.path.join(install_root, 'xsessions', 'gnome-classic.desktop')
+src = os.path.join(install_root, 'wayland-sessions', 'gnome-classic.desktop')
 dst = os.path.join(dst_dir, 'gnome-classic.desktop')
 shutil.copyfile(src, dst)

po/fa.po

@@ -2,15 +2,15 @@
 # Copyright (C) 2011 Iranian Free Software Users Group (IFSUG.org) translation team.
 # This file is distributed under the same license as the gnome-shell-extensions package.
 # Arash Mousavi <mousavi.arash@gmail.com>, 2011-2017.
-# Danial Behzadi <dani.behzi@ubuntu.com>, 2018-2024.
+# Danial Behzadi <dani.behzi@ubuntu.com>, 2018-2025.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions gnome-3-0\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
 "issues\n"
-"POT-Creation-Date: 2024-08-25 13:34+0000\n"
-"PO-Revision-Date: 2024-08-26 12:19+0330\n"
+"POT-Creation-Date: 2025-03-14 00:48+0000\n"
+"PO-Revision-Date: 2025-04-01 07:14+0330\n"
 "Last-Translator: Danial Behzadi <dani.behzi@ubuntu.com>\n"
 "Language-Team: Persian <>\n"
 "Language: fa\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 3.4.4\n"
+"X-Generator: Poedit 3.5\n"
 "X-DamnedLies-Scope: partial\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
@@ -39,11 +39,11 @@ msgstr "گنوم کلاسیک روی وی‌لند"
 msgid "GNOME Classic on Xorg"
 msgstr "گنوم کلاسیک روی زورگ"
 
-#: extensions/apps-menu/extension.js:126
+#: extensions/apps-menu/extension.js:118
 msgid "Favorites"
 msgstr "برگزیده‌ها"
 
-#: extensions/apps-menu/extension.js:400
+#: extensions/apps-menu/extension.js:392
 msgid "Apps"
 msgstr "کاره‌ها"
 
@@ -59,17 +59,17 @@ msgstr ""
 "فهرستی از رشته‌ها، هرکدام حاوی شناسه‌ی یک برنامه (نام پرونده رومیزی)، در ادامه‌ی یک "
 "ویرگول و شماره‌ی فضای کاری"
 
-#: extensions/auto-move-windows/prefs.js:159
+#: extensions/auto-move-windows/prefs.js:156
 msgid "Workspace Rules"
 msgstr "قواعد فضای کاری"
 
-#: extensions/auto-move-windows/prefs.js:314
+#: extensions/auto-move-windows/prefs.js:311
 msgid "Add Rule"
 msgstr "افزودن قاعده"
 
 #. TRANSLATORS: %s is the filesystem name
 #: extensions/drive-menu/extension.js:123
-#: extensions/places-menu/placeDisplay.js:218
+#: extensions/places-menu/placeDisplay.js:186
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "بیرون دادن دیسک‌گردان «%s» شکست خورد:"
@@ -110,32 +110,39 @@ msgstr ""
 "شل در پایین را تغییر می‌دهد. تغییر این گزینه، نیاز به راه‌اندازی مجدد شل دارد تا "
 "تاثیر بگذارد."
 
-#: extensions/places-menu/extension.js:91 extensions/places-menu/extension.js:94
+#: extensions/places-menu/extension.js:75 extensions/places-menu/extension.js:78
 msgid "Places"
 msgstr "مکان‌ها"
 
-#: extensions/places-menu/placeDisplay.js:60
+#: extensions/places-menu/placeDisplay.js:52
 #, javascript-format
 msgid "Failed to launch “%s”"
 msgstr "شکست در اجرای «%s»"
 
-#: extensions/places-menu/placeDisplay.js:75
+#: extensions/places-menu/placeDisplay.js:67
 #, javascript-format
 msgid "Failed to mount volume for “%s”"
 msgstr "شکست در سوار کردن حجم برای «%s»"
 
-#: extensions/places-menu/placeDisplay.js:135
-#: extensions/places-menu/placeDisplay.js:158
-msgid "Computer"
-msgstr "رایانه"
-
-#: extensions/places-menu/placeDisplay.js:333
+#: extensions/places-menu/placeDisplay.js:315
 msgid "Home"
 msgstr "خانه"
 
-#: extensions/places-menu/placeDisplay.js:378
-msgid "Browse Network"
-msgstr "مرور شبکه"
+#: extensions/places-menu/placeDisplay.js:321
+msgid "Recent"
+msgstr "اخیر"
+
+#: extensions/places-menu/placeDisplay.js:327
+msgid "Starred"
+msgstr "ستاره دار"
+
+#: extensions/places-menu/placeDisplay.js:347
+msgid "Network"
+msgstr "شبکه"
+
+#: extensions/places-menu/placeDisplay.js:354
+msgid "Trash"
+msgstr "زباله‌دان"
 
 #: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:14
 msgid "Cycle Screenshot Sizes"
@@ -225,47 +232,47 @@ msgstr "نام تم"
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "نام تم، جهت بارگیری از شاخه themes/name/gnome-shell./~"
 
-#: extensions/window-list/extension.js:70
+#: extensions/window-list/extension.js:95
 msgid "Close"
 msgstr "خروج"
 
-#: extensions/window-list/extension.js:97
+#: extensions/window-list/extension.js:122
 msgid "Unminimize"
 msgstr "ناکمینه"
 
-#: extensions/window-list/extension.js:97
+#: extensions/window-list/extension.js:122
 msgid "Minimize"
 msgstr "کمینه"
 
-#: extensions/window-list/extension.js:104
+#: extensions/window-list/extension.js:129
 msgid "Unmaximize"
 msgstr "نابیشینه"
 
-#: extensions/window-list/extension.js:104
+#: extensions/window-list/extension.js:129
 msgid "Maximize"
 msgstr "بیشنه"
 
-#: extensions/window-list/extension.js:489
+#: extensions/window-list/extension.js:721
 msgid "Minimize all"
 msgstr "کمینهٔ همه"
 
-#: extensions/window-list/extension.js:495
+#: extensions/window-list/extension.js:727
 msgid "Unminimize all"
 msgstr "ناکمینهٔ همه"
 
-#: extensions/window-list/extension.js:501
+#: extensions/window-list/extension.js:733
 msgid "Maximize all"
 msgstr "بیشینهٔ همه"
 
-#: extensions/window-list/extension.js:509
+#: extensions/window-list/extension.js:741
 msgid "Unmaximize all"
 msgstr "نابیشینهٔ همه"
 
-#: extensions/window-list/extension.js:517
+#: extensions/window-list/extension.js:749
 msgid "Close all"
 msgstr "بستن همه"
 
-#: extensions/window-list/extension.js:789
+#: extensions/window-list/extension.js:992 extensions/window-list/prefs.js:23
 msgid "Window List"
 msgstr "فهرست پنجره"
 
@@ -282,7 +289,7 @@ msgstr ""
 "ممکن عبارتند از «never»، «auto» و «always»."
 
 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:26
-#: extensions/window-list/prefs.js:79
+#: extensions/window-list/prefs.js:74
 msgid "Show windows from all workspaces"
 msgstr "نمایش پنجره‌ها از تمام فضاهای کاری"
 
@@ -306,47 +313,26 @@ msgstr ""
 msgid "Show workspace previews in window list"
 msgstr "پیش‌نمایش فضاهای کاری در سیاههٔ پنجره‌ها"
 
-#: extensions/window-list/prefs.js:35
+#: extensions/window-list/prefs.js:41
 msgid "Window Grouping"
 msgstr "گروه‌سازی پنجره‌ها"
 
-#: extensions/window-list/prefs.js:40
+#: extensions/window-list/prefs.js:46
 msgid "Never group windows"
 msgstr "هیچ‌گاه پنجره‌ها گروه نشوند"
 
-#: extensions/window-list/prefs.js:41
+#: extensions/window-list/prefs.js:47
 msgid "Group windows when space is limited"
 msgstr "پنجره‌ها زمانی که فضا محدود است گروه شوند"
 
-#: extensions/window-list/prefs.js:42
+#: extensions/window-list/prefs.js:48
 msgid "Always group windows"
 msgstr "همیشه پنجره‌ها گروه شوند"
 
-#: extensions/window-list/prefs.js:66
+#: extensions/window-list/prefs.js:68
 msgid "Show on all monitors"
 msgstr "نمایش در تمام نمایشگرها"
 
-#: extensions/window-list/prefs.js:92
-msgid "Show workspace previews"
-msgstr "پیش‌نمایش فضاهای کاری"
-
-#: extensions/workspace-indicator/prefs.js:30
-msgid "Show Previews In Top Bar"
-msgstr "پیش‌نمایش در نوار بالایی"
-
-#: extensions/workspace-indicator/prefs.js:88
-#, javascript-format
-msgid "Workspace %d"
-msgstr "فضای کاری %Id"
-
-#: extensions/workspace-indicator/prefs.js:155
-msgid "Workspace Names"
-msgstr "نام‌های فضای کاری"
-
-#: extensions/workspace-indicator/prefs.js:281
-msgid "Add Workspace"
-msgstr "افزودن فضای‌کاری"
-
 #: extensions/workspace-indicator/schemas/org.gnome.shell.extensions.workspace-indicator.gschema.xml:12
 msgid "Show workspace previews in top bar"
 msgstr "پیش‌نمایش فضاهای کاری در نوار بالایی"
@@ -355,15 +341,43 @@ msgstr "پیش‌نمایش فضاهای کاری در نوار بالایی"
 msgid "Workspace Indicator"
 msgstr "نشانگر فضای‌کاری"
 
+#: extensions/workspace-indicator/workspacePrefs.js:28
+msgid "Show Previews"
+msgstr "نمایش پیش‌نمایش‌ها"
+
+#: extensions/workspace-indicator/workspacePrefs.js:86
+#, javascript-format
+msgid "Workspace %d"
+msgstr "فضای کاری %Id"
+
+#: extensions/workspace-indicator/workspacePrefs.js:153
+msgid "Workspace Names"
+msgstr "نام‌های فضای کاری"
+
+#: extensions/workspace-indicator/workspacePrefs.js:170
+msgid "Add Workspace"
+msgstr "افزودن فضای‌کاری"
+
+#: extensions/workspace-indicator/workspacePrefs.js:195
+msgid "Remove"
+msgstr "برداشتن"
+
+#: extensions/workspace-indicator/workspacePrefs.js:225
+msgid "Workspaces"
+msgstr "فضاهای کاری"
+
+#~ msgid "Computer"
+#~ msgstr "رایانه"
+
+#~ msgid "Show workspace previews"
+#~ msgstr "پیش‌نمایش فضاهای کاری"
+
 #~ msgid "Applications"
 #~ msgstr "برنامه‌ها"
 
 #~ msgid "Application"
 #~ msgstr "برنامه"
 
-#~ msgid "Workspace"
-#~ msgstr "فضای‌کاری"
-
 #~ msgid "Create new matching rule"
 #~ msgstr "افزودن یک قاعده‌ی منطبق جدید"
 

po/pt.po

@@ -1,5 +1,5 @@
 # gnome-shell-extensions' Portuguese translation.
-# Copyright © 2011 - 2024 gnome-shell-extensions
+# Copyright © 2011 - 2025 gnome-shell-extensions
 # This file is distributed under the same license as the gnome-shell-extensions package.
 # Duarte Loreto <happyguy_pt@hotmail.com>, 2011, 2014.
 # Fernando Carvalho <phaetonkde@gmail.com>, 2013.
@@ -7,7 +7,7 @@
 # Pedro Albuquerque <palbuquerque73@gmail.com>, 2014.
 # Bruno Ramalhete <bram.512@gmail.com>, 2015.
 # José Vieira <jvieira33@sapo.pt>, 2020-2021.
-# Hugo Carvalho <hugokarvalho@hotmail.com>, 2021, 2022, 2023, 2024.
+# Hugo Carvalho <hugokarvalho@hotmail.com>, 2021, 2022, 2023, 2024, 2025.
 # Juliano de Souza Camargo <julianosc@protonmail.com>, 2021.
 # João Carvalhinho <joao.carvalhinho@gmail.com>, 2024.
 #
@@ -16,8 +16,8 @@ msgstr ""
 "Project-Id-Version: 3.14\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
 "issues\n"
-"POT-Creation-Date: 2024-05-04 23:22+0000\n"
-"PO-Revision-Date: 2024-08-30 10:26+0100\n"
+"POT-Creation-Date: 2025-03-14 00:48+0000\n"
+"PO-Revision-Date: 2025-03-29 14:52+0000\n"
 "Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
 "Language-Team: Portuguese (https://l10n.gnome.org/teams/pt/)\n"
 "Language: pt\n"
@@ -25,7 +25,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.4.4\n"
+"X-Generator: Poedit 3.0.1\n"
 "X-Project-Style: gnome\n"
 "X-DL-Team: pt\n"
 "X-DL-Module: gnome-shell-extensions\n"
@@ -50,11 +50,11 @@ msgstr "GNOME clássico em Wayland"
 msgid "GNOME Classic on Xorg"
 msgstr "GNOME clássico em Xorg"
 
-#: extensions/apps-menu/extension.js:126
+#: extensions/apps-menu/extension.js:118
 msgid "Favorites"
 msgstr "Favoritos"
 
-#: extensions/apps-menu/extension.js:400
+#: extensions/apps-menu/extension.js:392
 msgid "Apps"
 msgstr "Aplicações"
 
@@ -70,20 +70,20 @@ msgstr ""
 "Uma lista de cadeias, cada uma contendo uma id de aplicação (nome do "
 "ficheiro desktop), seguido de dois pontos e o número da área de trabalho"
 
-#: extensions/auto-move-windows/prefs.js:159
+#: extensions/auto-move-windows/prefs.js:156
 msgid "Workspace Rules"
 msgstr "Regras das áreas de trabalho"
 
-#: extensions/auto-move-windows/prefs.js:314
+#: extensions/auto-move-windows/prefs.js:311
 msgid "Add Rule"
 msgstr "Adicionar regra"
 
 #. TRANSLATORS: %s is the filesystem name
 #: extensions/drive-menu/extension.js:123
-#: extensions/places-menu/placeDisplay.js:218
+#: extensions/places-menu/placeDisplay.js:186
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
-msgstr "Falha ao ejetar a unidade '%s':"
+msgstr "Falha ao ejetar a unidade “%s”:"
 
 #: extensions/drive-menu/extension.js:142
 msgid "Removable devices"
@@ -118,37 +118,44 @@ msgid ""
 "shell default of placing it at the bottom. Changing this setting requires "
 "restarting the shell to have any effect."
 msgstr ""
-"Se verdadeiro, coloca títulos de janelas em cima das respectivas miniaturas, "
+"Se verdadeiro, coloca títulos de janelas em cima das respetivas miniaturas, "
 "substituindo a predefinição, que as coloca no fundo. Alterar esta "
 "configuração requer reinicializar a interface para ter efeito."
 
-#: extensions/places-menu/extension.js:91
-#: extensions/places-menu/extension.js:94
+#: extensions/places-menu/extension.js:75
+#: extensions/places-menu/extension.js:78
 msgid "Places"
 msgstr "Locais"
 
-#: extensions/places-menu/placeDisplay.js:60
+#: extensions/places-menu/placeDisplay.js:52
 #, javascript-format
 msgid "Failed to launch “%s”"
 msgstr "Falha ao iniciar \"%s\""
 
-#: extensions/places-menu/placeDisplay.js:75
+#: extensions/places-menu/placeDisplay.js:67
 #, javascript-format
 msgid "Failed to mount volume for “%s”"
 msgstr "Falha ao montar unidade para “%s”"
 
-#: extensions/places-menu/placeDisplay.js:135
-#: extensions/places-menu/placeDisplay.js:158
-msgid "Computer"
-msgstr "Computador"
-
-#: extensions/places-menu/placeDisplay.js:333
+#: extensions/places-menu/placeDisplay.js:315
 msgid "Home"
 msgstr "Pasta pessoal"
 
-#: extensions/places-menu/placeDisplay.js:378
-msgid "Browse Network"
-msgstr "Explorar a rede"
+#: extensions/places-menu/placeDisplay.js:321
+msgid "Recent"
+msgstr "Recentes"
+
+#: extensions/places-menu/placeDisplay.js:327
+msgid "Starred"
+msgstr "Favoritos"
+
+#: extensions/places-menu/placeDisplay.js:347
+msgid "Network"
+msgstr "Rede"
+
+#: extensions/places-menu/placeDisplay.js:354
+msgid "Trash"
+msgstr "Lixo"
 
 #: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:14
 msgid "Cycle Screenshot Sizes"
@@ -238,47 +245,47 @@ msgstr "Nome do tema"
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "O nome do tema, a ser carregado de ~/.themes/name/gnome-shell"
 
-#: extensions/window-list/extension.js:72
+#: extensions/window-list/extension.js:95
 msgid "Close"
 msgstr "Fechar"
 
-#: extensions/window-list/extension.js:99
+#: extensions/window-list/extension.js:122
 msgid "Unminimize"
 msgstr "Repor"
 
-#: extensions/window-list/extension.js:99
+#: extensions/window-list/extension.js:122
 msgid "Minimize"
 msgstr "Minimizar"
 
-#: extensions/window-list/extension.js:106
+#: extensions/window-list/extension.js:129
 msgid "Unmaximize"
 msgstr "Diminuir"
 
-#: extensions/window-list/extension.js:106
+#: extensions/window-list/extension.js:129
 msgid "Maximize"
 msgstr "Maximizar"
 
-#: extensions/window-list/extension.js:471
+#: extensions/window-list/extension.js:721
 msgid "Minimize all"
 msgstr "Minimizar tudo"
 
-#: extensions/window-list/extension.js:477
+#: extensions/window-list/extension.js:727
 msgid "Unminimize all"
 msgstr "Repor tudo"
 
-#: extensions/window-list/extension.js:483
+#: extensions/window-list/extension.js:733
 msgid "Maximize all"
 msgstr "Maximizar tudo"
 
-#: extensions/window-list/extension.js:491
+#: extensions/window-list/extension.js:741
 msgid "Unmaximize all"
 msgstr "Diminuir tudo"
 
-#: extensions/window-list/extension.js:499
+#: extensions/window-list/extension.js:749
 msgid "Close all"
 msgstr "Fechar tudo"
 
-#: extensions/window-list/extension.js:778
+#: extensions/window-list/extension.js:992 extensions/window-list/prefs.js:23
 msgid "Window List"
 msgstr "Lista de janelas"
 
@@ -295,7 +302,7 @@ msgstr ""
 "valores válidos são \"nunca\", \"auto\" e \"sempre\"."
 
 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:26
-#: extensions/window-list/prefs.js:79
+#: extensions/window-list/prefs.js:74
 msgid "Show windows from all workspaces"
 msgstr "Mostrar janelas de todas as áreas de trabalho"
 
@@ -320,47 +327,26 @@ msgstr ""
 msgid "Show workspace previews in window list"
 msgstr "Mostrar pré-visualizações de áreas de trabalho na lista de janelas"
 
-#: extensions/window-list/prefs.js:35
+#: extensions/window-list/prefs.js:41
 msgid "Window Grouping"
 msgstr "Agrupar janelas"
 
-#: extensions/window-list/prefs.js:40
+#: extensions/window-list/prefs.js:46
 msgid "Never group windows"
 msgstr "Nunca agrupar janelas"
 
-#: extensions/window-list/prefs.js:41
+#: extensions/window-list/prefs.js:47
 msgid "Group windows when space is limited"
 msgstr "Agrupar janelas quando o espaço é limitado"
 
-#: extensions/window-list/prefs.js:42
+#: extensions/window-list/prefs.js:48
 msgid "Always group windows"
 msgstr "Agrupar sempre as janelas"
 
-#: extensions/window-list/prefs.js:66
+#: extensions/window-list/prefs.js:68
 msgid "Show on all monitors"
 msgstr "Mostrar em todos os monitores"
 
-#: extensions/window-list/prefs.js:92
-msgid "Show workspace previews"
-msgstr "Mostrar pré-visualizações de áreas de trabalho"
-
-#: extensions/workspace-indicator/prefs.js:30
-msgid "Show Previews In Top Bar"
-msgstr "Mostrar pré-visualizações na barra superior"
-
-#: extensions/workspace-indicator/prefs.js:88
-#, javascript-format
-msgid "Workspace %d"
-msgstr "Área de trabalho %d"
-
-#: extensions/workspace-indicator/prefs.js:155
-msgid "Workspace Names"
-msgstr "Nomes das áreas de trabalho"
-
-#: extensions/workspace-indicator/prefs.js:281
-msgid "Add Workspace"
-msgstr "Adicionar área de trabalho"
-
 #: extensions/workspace-indicator/schemas/org.gnome.shell.extensions.workspace-indicator.gschema.xml:12
 msgid "Show workspace previews in top bar"
 msgstr "Mostrar pré-visualizações de áreas de trabalho na barra superior"
@@ -369,6 +355,37 @@ msgstr "Mostrar pré-visualizações de áreas de trabalho na barra superior"
 msgid "Workspace Indicator"
 msgstr "Indicador de área de trabalho"
 
+#: extensions/workspace-indicator/workspacePrefs.js:28
+msgid "Show Previews"
+msgstr "Mostrar pré-visualizações"
+
+#: extensions/workspace-indicator/workspacePrefs.js:86
+#, javascript-format
+msgid "Workspace %d"
+msgstr "Área de trabalho %d"
+
+#: extensions/workspace-indicator/workspacePrefs.js:153
+msgid "Workspace Names"
+msgstr "Nomes das áreas de trabalho"
+
+#: extensions/workspace-indicator/workspacePrefs.js:170
+msgid "Add Workspace"
+msgstr "Adicionar área de trabalho"
+
+#: extensions/workspace-indicator/workspacePrefs.js:195
+msgid "Remove"
+msgstr "Remover"
+
+#: extensions/workspace-indicator/workspacePrefs.js:225
+msgid "Workspaces"
+msgstr "Áreas de trabalho"
+
+#~ msgid "Computer"
+#~ msgstr "Computador"
+
+#~ msgid "Show workspace previews"
+#~ msgstr "Mostrar pré-visualizações de áreas de trabalho"
+
 #~ msgid "Applications"
 #~ msgstr "Aplicações"