Bump version to 47.6

Update NEWS.

.gitlab-ci.yml

@@ -3,10 +3,13 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 include:
-  - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/bbe5232986c9b98eb1efe62484e07216f7d1a4df/templates/fedora.yml'
-  - remote: "https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/bc70242ffb8402243e934659ecc1a2d1c89eca2b/templates/ci-fairy.yml"
-  - project: 'Infrastructure/openshift-images/gnome-release-service'
-    file: '/ci-templates/release-module.yml'
+  - remote: 'https://gitlab.gnome.org/Infrastructure/freedesktop-ci-templates/-/raw/master/templates/fedora.yml'
+  - remote: "https://gitlab.gnome.org/Infrastructure/freedesktop-ci-templates/-/raw/master/templates/ci-fairy.yml"
+  - component: gitlab.gnome.org/GNOME/citemplates/release-service@master
+    inputs:
+      job-stage: deploy
+      dist-job-name: fedora-dist-tarball
+      tarball-artifact-path: "$TARBALL_ARTIFACT_PATH"
 
 stages:
   - pre_review
@@ -16,7 +19,7 @@ stages:
   - deploy
 
 default:
-  image: registry.gitlab.gnome.org/gnome/gnome-shell/fedora/40:2024-07-11.0
+  image: registry.gitlab.gnome.org/gnome/gnome-shell/fedora/41:2024-10-18.0
   # Cancel jobs if newer commits are pushed to the branch
   interruptible: true
   # Auto-retry jobs in case of infra failures
@@ -30,7 +33,8 @@ default:
 
 variables:
   FDO_UPSTREAM_REPO: GNOME/gnome-shell-extensions
-  LINT_LOG: "eslint-report.xml"
+  MESON_BUILD_DIR: build
+  TARBALL_ARTIFACT_PATH: "${MESON_BUILD_DIR}/meson-dist/${CI_PROJECT_NAME}-${CI_COMMIT_TAG}.tar.xz"
 
 workflow:
   rules:
@@ -108,14 +112,16 @@ js_check:
 eslint:
   stage: review
   <<: *prereview_req
+  variables:
+    LINT_LOG: "eslint-report.xml"
   script:
     - export NODE_PATH=$(npm root -g)
-    - ./.gitlab-ci/run-eslint --output-file ${LINT_LOG} --format junit --stdout
+    - ./.gitlab-ci/run-eslint --output-file "$LINT_LOG" --format junit --stdout
   artifacts:
     paths:
-      - ${LINT_LOG}
+      - "$LINT_LOG"
     reports:
-      junit: ${LINT_LOG}
+      junit: "$LINT_LOG"
 
 potfile_js_check:
   stage: review
@@ -141,28 +147,13 @@ fedora-build:
   stage: build
   <<: *prereview_req
   script:
-    - meson setup build --werror -Dextension_set=all -Dclassic_mode=true
-    - meson compile -C build
-    - meson test -C build
-    - meson install -C build
+    - meson setup "$MESON_BUILD_DIR" --werror -Dextension_set=all -Dclassic_mode=true
+    - meson compile -C "$MESON_BUILD_DIR"
+    - meson test -C "$MESON_BUILD_DIR"
+    - meson install -C "$MESON_BUILD_DIR"
   artifacts:
     paths:
-      - build
-
-fedora-distinfo:
-  stage: deploy
-  needs:
-    - fedora-build
-  script:
-    - .gitlab-ci/export-artifact-path build > dist.env
-  artifacts:
-    reports:
-      dotenv: dist.env
-    paths:
-      - build
-      - dist.env
-  rules:
-    - if: '$CI_COMMIT_TAG'
+      - "$MESON_BUILD_DIR"
 
 fedora-dist:
   stage: deploy
@@ -171,7 +162,7 @@ fedora-dist:
   variables:
     GIT_SUBMODULE_STRATEGY: normal
   script:
-    - meson dist -C build
+    - meson dist -C "$MESON_BUILD_DIR"
   rules:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
       changes:
@@ -180,21 +171,11 @@ fedora-dist:
 
 fedora-dist-tarball:
   extends: fedora-dist
-  needs:
-    - fedora-distinfo
   artifacts:
     expose_as: 'Get tarball here'
+    name: "${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
+    when: always
     paths:
-      - $TARBALL_ARTIFACT_PATH
-    reports:
-      dotenv: dist.env
-  rules:
-    - if: '$CI_COMMIT_TAG'
-
-release-module:
-  stage: deploy
-  needs:
-    - fedora-dist-tarball
-  extends: .release-module
+      - "$TARBALL_ARTIFACT_PATH"
   rules:
     - if: '$CI_COMMIT_TAG'

.gitlab-ci/export-artifact-path

@@ -1,21 +0,0 @@
-#!/usr/bin/gjs -m
-// SPDX-FileCopyrightText: 2024 Florian Müllner <fmuellner@gnome.org>
-//
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import Gio from 'gi://Gio';
-import {programArgs, programInvocationName, exit} from 'system';
-
-const [buildDir] = programArgs;
-if (!buildDir) {
-    printerr(`usage: ${programInvocationName} <build-dir>`);
-    exit(1);
-}
-
-const subprocess = Gio.Subprocess.new(
-    ['meson', 'introspect', '--projectinfo', buildDir],
-    Gio.SubprocessFlags.STDOUT_PIPE);
-const [, out] = subprocess.communicate_utf8(null, null);
-
-const {descriptive_name, version} = JSON.parse(out);
-print(`TARBALL_ARTIFACT_PATH=${buildDir}/meson-dist/${descriptive_name}-${version}.tar.xz`);

NEWS

@@ -1,3 +1,39 @@
+47.6
+====
+* Misc. bug fixes and cleanups [Florian; !409, !411, !405, !413]
+
+Contributors:
+  Florian Müllner
+
+47.5
+====
+* Allow disabling the X11 session [Neal; !396, !400]
+
+Contributors:
+  Neal Gompa
+
+47.4
+====
+* window-list: Fix regression in chrome tracking [Florian; !379]
+* Misc. bug fixes and cleanups [Florian; !376]
+
+Contributors:
+  Florian Müllner
+
+47.3
+====
+* places-menu: Fix opening drives with mount operations [Florian; !361]
+* window-list: Fix hiding when entering overview with gestures [Florian; !364]
+* workspace-indicator: Only show previews of regular windows [Florian; !363]
+* Misc. bug fixes and cleanups [Florian, Bartłomiej; !362, !365, !367,
+  !368, !370]
+
+Contributors:
+  Florian Müllner, Bartłomiej Piotrowski
+
+Translators:
+  Yi-Jyun Pan [zh_TW]
+
 47.2
 ====
 * places-menu: Fix a11y labelling [Florian; #542]

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(

debian/control

@@ -1,309 +0,0 @@
-Source: gnome-shell-extensions
-Section: gnome
-Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: Iain Lane <laney@debian.org>, Jeremy Bícha <jbicha@ubuntu.com>, Laurent Bigonville <bigon@debian.org>, Marco Trevisan (Treviño) <marco@ubuntu.com>
-Build-Depends: debhelper-compat (= 13),
-               dh-sequence-gnome,
-               libglib2.0-bin,
-               meson (>= 1.1.0),
-               sassc
-Rules-Requires-Root: no
-Standards-Version: 4.7.0
-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-shell-extensions
-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell-extensions.git
-Homepage: https://wiki.gnome.org/Projects/GnomeShell/Extensions
-
-Package: gnome-shell-extensions
-Section: oldlibs
-Architecture: all
-Depends: gnome-shell-extension-apps-menu,
-         gnome-shell-extension-auto-move-windows,
-         gnome-shell-extension-drive-menu,
-         gnome-shell-extension-launch-new-instance,
-         gnome-shell-extension-light-style,
-         gnome-shell-extension-native-window-placement,
-         gnome-shell-extension-places-menu,
-         gnome-shell-extensions-common,
-         gnome-shell-extension-screenshot-window-sizer,
-         gnome-shell-extension-system-monitor,
-         gnome-shell-extension-user-theme,
-         gnome-shell-extension-window-list,
-         gnome-shell-extension-windows-navigator,
-         gnome-shell-extension-workspace-indicator,
-         ${misc:Depends}
-Recommends: gnome-classic
-Description: Extensions to extend functionality of GNOME Shell
- GNOME Shell is extensible using extensions. This package contains
- all the official GNOME Shell extensions.
- .
- This is an empty transitional package and will likely be removed
- in the future.
-
-Package: gnome-classic
-Architecture: all
-Depends: fonts-cantarell,
-         gnome-session,
-         gnome-session-bin (>= 46),
-         gnome-session-common (>= 46),
-         gnome-shell-extension-apps-menu,
-         gnome-shell-extension-places-menu,
-         gnome-shell-extension-launch-new-instance,
-         gnome-shell-extension-window-list,
-         xdg-desktop-portal-gnome,
-         ${misc:Depends}
-Recommends: gnome-classic-xsession
-Provides: x-session-manager
-Breaks: gnome-shell-extensions (<< 47)
-Replaces: gnome-shell-extensions (<< 47)
-Description: Classic version of the GNOME desktop
- This package contains the required components for the GNOME Classic
- session, based on the GNOME Shell. It can be started from a display
- manager such as GDM, and requires 3D acceleration to work properly.
- .
- The GNOME Shell provides core interface functions like switching
- windows, launching applications or see your notifications. It takes
- advantage of the capabilities of modern graphics hardware and
- introduces innovative user interface concepts to provide a
- delightful and easy to use experience. GNOME Shell is the defining
- technology of the GNOME user experience.
- .
- GNOME Classic provides an alternative version of GNOME Shell that uses
- more traditional design elements.
-
-Package: gnome-classic-xsession
-Architecture: all
-Depends: gnome-classic,
-         ${misc:Depends}
-Provides: x-session-manager
-Breaks: gnome-shell-extensions (<< 47)
-Replaces: gnome-shell-extensions (<< 47)
-Description: Classic version of the GNOME desktop using Xorg
- This package contains the required components for the GNOME Classic on Xorg
- session, based on the GNOME Shell. It can be started from a display
- manager such as GDM, and requires 3D acceleration to work properly.
- .
- The GNOME Shell provides core interface functions like switching
- windows, launching applications or see your notifications. It takes
- advantage of the capabilities of modern graphics hardware and
- introduces innovative user interface concepts to provide a
- delightful and easy to use experience. GNOME Shell is the defining
- technology of the GNOME user experience.
- .
- GNOME Classic provides an alternative version of GNOME Shell that uses
- more traditional design elements.
-
-Package: gnome-shell-extensions-common
-Architecture: all
-Depends: ${misc:Depends}
-Breaks: gnome-shell-extensions (<< 47)
-Replaces: gnome-shell-extensions (<< 47)
-Description: common files for official GNOME Shell extensions
- GNOME Shell is extensible using extensions. This package contains
- common data files such as translations for the official GNOME Shell
- extensions.
-
-Package: gnome-shell-extension-apps-menu
-Architecture: all
-Depends: gir1.2-gmenu-3.0,
-         gnome-shell (<< ${gnome:NextVersion}),
-         gnome-shell (>= ${gnome:Version}),
-         gnome-shell-extensions-common (= ${source:Version}),
-         ${misc:Depends}
-Recommends: gnome-shell-extension-prefs | gnome-shell-extension-manager
-Breaks: gnome-shell-extensions (<< 47)
-Replaces: gnome-shell-extensions (<< 47)
-Description: Category based app menu for GNOME Shell
- GNOME Shell is extensible using extensions. This package contains an
- official GNOME Shell extension to add a category based Apps menu
- similar to what is found in classic desktops.
- .
- This package is part of the GNOME Classic default set of extensions.
-
-Package: gnome-shell-extension-auto-move-windows
-Architecture: all
-Depends: gnome-shell (<< ${gnome:NextVersion}),
-         gnome-shell (>= ${gnome:Version}),
-         gnome-shell-extensions-common (= ${source:Version}),
-         ${misc:Depends}
-Recommends: gnome-shell-extension-prefs | gnome-shell-extension-manager
-Breaks: gnome-shell-extensions (<< 47)
-Replaces: gnome-shell-extensions (<< 47)
-Description: GNOME Shell extension to move apps to specific workspaces
- GNOME Shell is extensible using extensions. This package contains an
- official GNOME Shell extension to move apps to specific workspaces when
- they create windows.
-
-Package: gnome-shell-extension-drive-menu
-Architecture: all
-Depends: gnome-shell (<< ${gnome:NextVersion}),
-         gnome-shell (>= ${gnome:Version}),
-         gnome-shell-extensions-common (= ${source:Version}),
-         ${misc:Depends}
-Recommends: gnome-shell-extension-prefs | gnome-shell-extension-manager
-Breaks: gnome-shell-extensions (<< 47)
-Replaces: gnome-shell-extensions (<< 47)
-Description: Removable drive status menu for GNOME Shell
- GNOME Shell is extensible using extensions. This package contains an
- official GNOME Shell extension to add a status menu for accessing and
- unmounting removable devices.
-
-Package: gnome-shell-extension-launch-new-instance
-Architecture: all
-Depends: gnome-shell (<< ${gnome:NextVersion}),
-         gnome-shell (>= ${gnome:Version}),
-         gnome-shell-extensions-common (= ${source:Version}),
-         ${misc:Depends}
-Recommends: gnome-shell-extension-prefs | gnome-shell-extension-manager
-Breaks: gnome-shell-extensions (<< 47)
-Replaces: gnome-shell-extensions (<< 47)
-Description: GNOME Shell extension to launch new instances of apps
- GNOME Shell is extensible using extensions. This package contains an
- official GNOME Shell extension to always launch a new instance of an
- app when clicking in the Dash or the application view.
- .
- This package is part of the GNOME Classic default set of extensions.
-
-Package: gnome-shell-extension-light-style
-Architecture: all
-Depends: gnome-shell (<< ${gnome:NextVersion}),
-         gnome-shell (>= ${gnome:Version}),
-         gnome-shell-extensions-common (= ${source:Version}),
-         ${misc:Depends}
-Recommends: gnome-shell-extension-prefs | gnome-shell-extension-manager
-Breaks: gnome-shell-extensions (<< 47)
-Replaces: gnome-shell-extensions (<< 47)
-Description: GNOME Shell extension to switch the Shell to light style
- GNOME Shell is extensible using extensions. This package contains an
- official GNOME Shell extension to switch GNOME Shell to use a light
- style instead of the default.
-
-Package: gnome-shell-extension-native-window-placement
-Architecture: all
-Depends: gnome-shell (<< ${gnome:NextVersion}),
-         gnome-shell (>= ${gnome:Version}),
-         gnome-shell-extensions-common (= ${source:Version}),
-         ${misc:Depends}
-Recommends: gnome-shell-extension-prefs | gnome-shell-extension-manager
-Breaks: gnome-shell-extensions (<< 47)
-Replaces: gnome-shell-extensions (<< 47)
-Description: GNOME Shell extension to arrange windows in a more compact way
- GNOME Shell is extensible using extensions. This package contains an
- official GNOME Shell extension to arrange windows in the GNOME Shell
- overview in a more compact way.
-
-Package: gnome-shell-extension-places-menu
-Architecture: all
-Depends: gnome-shell (<< ${gnome:NextVersion}),
-         gnome-shell (>= ${gnome:Version}),
-         gnome-shell-extensions-common (= ${source:Version}),
-         ${misc:Depends}
-Recommends: gnome-shell-extension-prefs | gnome-shell-extension-manager
-Breaks: gnome-shell-extensions (<< 47)
-Replaces: gnome-shell-extensions (<< 47)
-Description: Places menu for GNOME Shell
- GNOME Shell is extensible using extensions. This package contains an
- official GNOME Shell extension to add a menu for quickly navigating to
- places in the system, similar to the menu in GNOME 2.
- .
- This package is part of the GNOME Classic default set of extensions.
-
-Package: gnome-shell-extension-screenshot-window-sizer
-Architecture: all
-Depends: gnome-shell (<< ${gnome:NextVersion}),
-         gnome-shell (>= ${gnome:Version}),
-         gnome-shell-extensions-common (= ${source:Version}),
-         ${misc:Depends}
-Recommends: gnome-shell-extension-prefs | gnome-shell-extension-manager
-Breaks: gnome-shell-extensions (<< 47)
-Replaces: gnome-shell-extensions (<< 47)
-Description: GNOME Shell extension to resize windows for GNOME Software screenshots
- GNOME Shell is extensible using extensions. This package contains an
- official GNOME Shell extension to resize windows to the recommended
- size for creating screenshots for use in the GNOME Software app.
-
-Package: gnome-shell-extension-status-icons
-Architecture: all
-Depends: gnome-shell (<< ${gnome:NextVersion}),
-         gnome-shell (>= ${gnome:Version}),
-         gnome-shell-extensions-common (= ${source:Version}),
-         ${misc:Depends}
-Recommends: gnome-shell-extension-prefs | gnome-shell-extension-manager
-Description: GNOME Shell extension to show some status icons in the top bar
- GNOME Shell is extensible using extensions. This package contains an
- official GNOME Shell extension to show some status icons in the top bar.
-
-Package: gnome-shell-extension-system-monitor
-Architecture: all
-Depends: gir1.2-gtop-2.0,
-         gnome-shell (<< ${gnome:NextVersion}),
-         gnome-shell (>= ${gnome:Version}),
-         gnome-shell-extensions-common (= ${source:Version}),
-         ${misc:Depends}
-Recommends: gnome-shell-extension-prefs | gnome-shell-extension-manager
-Breaks: gnome-shell-extensions (<< 47)
-Replaces: gnome-shell-extensions (<< 47)
-Description: Display system information in GNOME Shell status bar
- GNOME Shell is extensible using extensions. This package contains an
- official GNOME Shell extension to display system information such as
- memory usage, cpu usage, network rates and more in the top bar.
-
-Package: gnome-shell-extension-user-theme
-Architecture: all
-Depends: gnome-shell (<< ${gnome:NextVersion}),
-         gnome-shell (>= ${gnome:Version}),
-         gnome-shell-extensions-common (= ${source:Version}),
-         ${misc:Depends}
-Recommends: gnome-shell-extension-prefs | gnome-shell-extension-manager
-Breaks: gnome-shell-extensions (<< 47)
-Replaces: gnome-shell-extensions (<< 47)
-Description: GNOME Shell extension to load alternative GNOME Shell themes
- GNOME Shell is extensible using extensions. This package contains an
- official GNOME Shell extension to allow switching to alternative
- GNOME Shell themes.
-
-Package: gnome-shell-extension-window-list
-Architecture: all
-Depends: gnome-shell (<< ${gnome:NextVersion}),
-         gnome-shell (>= ${gnome:Version}),
-         gnome-shell-extensions-common (= ${source:Version}),
-         ${misc:Depends}
-Recommends: gnome-shell-extension-prefs | gnome-shell-extension-manager
-Breaks: gnome-shell-extensions (<< 47)
-Replaces: gnome-shell-extensions (<< 47)
-Description: GNOME Shell extension to display a window list
- GNOME Shell is extensible using extensions. This package contains an
- official GNOME Shell extension to display a window list at the bottom
- of the screen.
- .
- This package is part of the GNOME Classic default set of extensions.
-
-Package: gnome-shell-extension-windows-navigator
-Architecture: all
-Depends: gnome-shell (<< ${gnome:NextVersion}),
-         gnome-shell (>= ${gnome:Version}),
-         gnome-shell-extensions-common (= ${source:Version}),
-         ${misc:Depends}
-Recommends: gnome-shell-extension-prefs | gnome-shell-extension-manager
-Breaks: gnome-shell-extensions (<< 47)
-Replaces: gnome-shell-extensions (<< 47)
-Description: GNOME Shell extension to allow keyboard selection in overlay mode
- GNOME Shell is extensible using extensions. This package contains an
- official GNOME Shell extension to allow keyboard selections of windows
- and workspaces in overlay mode. Ctrl+number selects a workspace and
- Alt+number selects a window.
-
-Package: gnome-shell-extension-workspace-indicator
-Architecture: all
-Depends: gnome-shell (<< ${gnome:NextVersion}),
-         gnome-shell (>= ${gnome:Version}),
-         gnome-shell-extensions-common (= ${source:Version}),
-         ${misc:Depends}
-Recommends: gnome-shell-extension-prefs | gnome-shell-extension-manager
-Breaks: gnome-shell-extensions (<< 47)
-Replaces: gnome-shell-extensions (<< 47)
-Description: Workspace indicator for GNOME Shell
- GNOME Shell is extensible using extensions. This package contains an
- official GNOME Shell extension to add an indicator to the panel to
- show what workspace you are using and allow you to switch to a different
- workspace.

debian/copyright

@@ -1,169 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Source: https://download.gnome.org/sources/gnome-shell-extensions/
-
-Files: *
-Copyright: 2011-2013 Giovanni Campagna
-           2013-2024 Florian Müllner
-           2011 Iranian Free Software Users Group (IFSUG.org) translation team
-           2021-2022 Alexander Shopov
-           2011-2023 Red Hat, Inc
-           2013 Rosetta Contributors and Canonical Ltd
-           Free Software Foundation, Inc
-           Rūdofls Mazurs
-           Ville-Pekka Vainio
-License: GPL-2+
-
-Files: debian/*
-Copyright: 2011 Victor Seva <linuxmaniac@torreviejawireless.org>
-           2011 Bilal Akhtar <bilalakhtar@ubuntu.com>
-License: GPL-2+
-
-Files: extensions/apps-menu/extension.js
-Copyright: 2011 Giovanni Campagna
-           2011 Vamsi Krishna Brahmajosyula
-           2013 Debarshi Ray
-           2013 Florian Müllner
-License: GPL-2+
-
-Files: extensions/auto-move-windows/extension.js
-Copyright: 2011 Alessandro Crismani
-           2011 Giovanni Campagna
-           2014 Florian Müllner
-License: GPL-2+
-
-Files: extensions/launch-new-instance/extension.js
-Copyright: 2013 Florian Müllner
-           2013 Gabriel Rossetti
-License: GPL-2+
-
-Files: extensions/native-window-placement/extension.js
-Copyright: 2011 Giovanni Campagna
-           2011 Stefano Facchini
-           2011 Wepmaschda
-           2015 Florian Müllner 
-License: GPL-2+
-
-Files: extensions/places-menu/extension.js
-Copyright: 2011 Giovanni Campagna
-           2011 Vamsi Krishna Brahmajosyula
-           2013 Florian Müllner
-           2016 Rémy Lefevre
-License: GPL-2+
-
-Files: extensions/places-menu/placeDisplay.js
-Copyright: 2012 Giovanni Campagna
-           2013 Debarshi Ray
-           2015 Florian Müllner
-           2016 Rémy Lefevre
-           2017 Christian Kellner
-License: GPL-2+
-
-Files: extensions/screenshot-window-sizer/extension.js
-Copyright: 2013 Owen Taylor
-           2013 Richard Hughes
-           2014 Florian Müllner
-           2016 Will Thompson
-           2017 Florian Müllner
-           2019 Adrien Plazas
-           2019 Willy Stadnick
-License: GPL-2+
-
-Files: extensions/status-icons/extension.js
-Copyright: 2018 Adel Gadllah
-           2018 Florian Müllner
-License: GPL-2+
-
-Files: extensions/system-monitor/icons/*
-Copyright: GNOME Design Team Icon Development Kit
-License: CC0-1.0
-
-Files: extensions/user-theme/extension.js
-Copyright: 2011 Elad Alfassa
-           2011 Giovanni Campagna
-           2011 John Stowers
-           2014 Florian Müllner
-License: GPL-2+
-
-Files: extensions/window-list/prefs.js
-Copyright: 2013 Florian Müllner
-           2014 Sylvain Pasche
-License: GPL-2+
-
-Files: extensions/window-list/stylesheet-light.css
-       extensions/workspace-indicator/stylesheet-light.css
-Copyright: 2011-2013 Giovanni Campagna
-           2013-2024 Florian Müllner
-License: GPL-2+
-
-Files: extensions/windowsNavigator/extension.js
-Copyright: 2011 Giovanni Campagna
-           2011, Maxim Ermilov
-           2017, Florian Müllner
-           2019, Marco Trevisan (Treviño)
-           2020, Thun Pin
-License: GPL-2+
-
-Files: extensions/windowsNavigator/stylesheet.css
-Copyright: 2011 Maxim Ermilov
-License: GPL-2+
-
-Files: extensions/workspace-indicator/stylesheet-dark.css
-Copyright: 2011 Erick Pérez Castellanos
-           2019 Florian Müllner
-License: GPL-2+
-
-Files: lint/eslintrc-gjs.yml
-Copyright: 2018 Claudio André
-License: Expat
-
-Files: lint/eslintrc-shell.yml
-Copyright: 2019 Florian Müllner
-License: Expat
-
-Files: meson/session-post-install.py
-Copyright: 2021, Neal Gompa
-License: GPL-2+
-
-License: CC0-1.0
- To the extent possible under law, the author(s) have dedicated all copyright
- and related and neighboring rights to this software to the public domain
- worldwide. This software is distributed without any warranty.
- .
- You should have received a copy of the CC0 Public Domain Dedication along with
- this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
- .
- On Debian systems, the complete text of the CC0 1.0 Universal license can be
- found in "/usr/share/common-licenses/CC0-1.0".
-
-License: Expat
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
-
-License: GPL-2+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".

debian/docs

@@ -1,2 +0,0 @@
-NEWS
-README.md

debian/gbp.conf

@@ -1,17 +0,0 @@
-[DEFAULT]
-pristine-tar = True
-debian-branch = debian/latest
-upstream-branch = upstream/latest
-
-[buildpackage]
-sign-tags = True
-
-[dch]
-multimaint-merge = True
-
-[import-orig]
-postimport = dch -v%(version)s New upstream release; git add debian/changelog; debcommit
-upstream-vcs-tag = %(version%~%.)s
-
-[pq]
-patch-numbers = False

debian/gnome-classic-xsession.install

@@ -1 +0,0 @@
-usr/share/xsessions

debian/gnome-classic.install

@@ -1,4 +0,0 @@
-debian/local/gnome-session-classic usr/bin
-usr/share/glib-2.0/schemas/00_org.gnome.shell.extensions.classic.gschema.override
-usr/share/gnome-shell/modes/classic.json
-usr/share/wayland-sessions

debian/gnome-shell-extension-apps-menu.install

@@ -1,2 +0,0 @@
-usr/share/glib-2.0/schemas/org.gnome.shell.extensions.apps-menu.gschema.xml
-usr/share/gnome-shell/extensions/apps-menu@gnome-shell-extensions.gcampax.github.com

debian/gnome-shell-extension-auto-move-windows.install

@@ -1,2 +0,0 @@
-usr/share/glib-2.0/schemas/org.gnome.shell.extensions.auto-move-windows.gschema.xml
-usr/share/gnome-shell/extensions/auto-move-windows@gnome-shell-extensions.gcampax.github.com

debian/gnome-shell-extension-drive-menu.install

@@ -1 +0,0 @@
-usr/share/gnome-shell/extensions/drive-menu@gnome-shell-extensions.gcampax.github.com

debian/gnome-shell-extension-launch-new-instance.install

@@ -1 +0,0 @@
-usr/share/gnome-shell/extensions/launch-new-instance@gnome-shell-extensions.gcampax.github.com

debian/gnome-shell-extension-light-style.install

@@ -1 +0,0 @@
-usr/share/gnome-shell/extensions/light-style@gnome-shell-extensions.gcampax.github.com

debian/gnome-shell-extension-native-window-placement.install

@@ -1,2 +0,0 @@
-usr/share/glib-2.0/schemas/org.gnome.shell.extensions.native-window-placement.gschema.xml
-usr/share/gnome-shell/extensions/native-window-placement@gnome-shell-extensions.gcampax.github.com

debian/gnome-shell-extension-places-menu.install

@@ -1 +0,0 @@
-usr/share/gnome-shell/extensions/places-menu@gnome-shell-extensions.gcampax.github.com

debian/gnome-shell-extension-screenshot-window-sizer.install

@@ -1,2 +0,0 @@
-usr/share/glib-2.0/schemas/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml
-usr/share/gnome-shell/extensions/screenshot-window-sizer@gnome-shell-extensions.gcampax.github.com

debian/gnome-shell-extension-status-icons.install

@@ -1 +0,0 @@
-usr/share/gnome-shell/extensions/status-icons@gnome-shell-extensions.gcampax.github.com

debian/gnome-shell-extension-system-monitor.install

@@ -1,2 +0,0 @@
-usr/share/glib-2.0/schemas/org.gnome.shell.extensions.system-monitor.gschema.xml
-usr/share/gnome-shell/extensions/system-monitor@gnome-shell-extensions.gcampax.github.com

debian/gnome-shell-extension-user-theme.install

@@ -1,2 +0,0 @@
-usr/share/glib-2.0/schemas/org.gnome.shell.extensions.user-theme.gschema.xml
-usr/share/gnome-shell/extensions/user-theme@gnome-shell-extensions.gcampax.github.com

debian/gnome-shell-extension-window-list.install

@@ -1,2 +0,0 @@
-usr/share/glib-2.0/schemas/org.gnome.shell.extensions.window-list.gschema.xml
-usr/share/gnome-shell/extensions/window-list@gnome-shell-extensions.gcampax.github.com

debian/gnome-shell-extension-windows-navigator.install

@@ -1 +0,0 @@
-usr/share/gnome-shell/extensions/windowsNavigator@gnome-shell-extensions.gcampax.github.com

debian/gnome-shell-extension-workspace-indicator.install

@@ -1,2 +0,0 @@
-usr/share/glib-2.0/schemas/org.gnome.shell.extensions.workspace-indicator.gschema.xml
-usr/share/gnome-shell/extensions/workspace-indicator@gnome-shell-extensions.gcampax.github.com

debian/gnome-shell-extensions-common.install

@@ -1 +0,0 @@
-usr/share/locale

debian/local/gnome-session-classic

@@ -1,2 +0,0 @@
-#! /bin/sh
-env GNOME_SHELL_SESSION_MODE=classic gnome-session "$@"

debian/rules

@@ -1,11 +0,0 @@
-#!/usr/bin/make -f
-
-%:
-	dh $@
-
-override_dh_auto_configure:
-	dh_auto_configure -- \
-		-Dextension_set=all \
-		-Dclassic_mode=true
-
-override_dh_gnome_clean:

debian/source/format

@@ -1 +0,0 @@
-3.0 (quilt)

debian/upstream/metadata

@@ -1,5 +0,0 @@
----
-Bug-Database: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/issues
-Bug-Submit: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/issues/new
-Repository: https://gitlab.gnome.org/GNOME/gnome-shell-extensions.git
-Repository-Browse: https://gitlab.gnome.org/GNOME/gnome-shell-extensions

debian/watch

@@ -1,4 +0,0 @@
-version=4
-opts="searchmode=plain, uversionmangle=s/\.(alpha|beta|rc)/~$1/, downloadurlmangle=s|cache.json||" \
-https://download.gnome.org/sources/@PACKAGE@/cache.json \
-	[\d.]+/@PACKAGE@-([\d.]+\.?(?:beta|rc)?[\d.]*)@ARCHIVE_EXT@

extensions/apps-menu/extension.js

@@ -495,7 +495,7 @@ class ApplicationsButton extends PanelMenu.Button {
                 let id;
                 try {
                     id = entry.get_desktop_file_id(); // catch non-UTF8 filenames
-                } catch (e) {
+                } catch {
                     continue;
                 }
                 let app = appSys.lookup_app(id);

extensions/places-menu/placeDisplay.js

@@ -6,7 +6,6 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 import Gio from 'gi://Gio';
 import GLib from 'gi://GLib';
 import Shell from 'gi://Shell';
@@ -61,15 +60,15 @@ class PlaceInfo extends EventEmitter {
                 return;
             }
 
-            let source = {
-                get_icon: () => this.icon,
+            const source = {
+                get_drive: () => null,
             };
             let op = new ShellMountOperation.ShellMountOperation(source);
             try {
                 await this.file.mount_enclosing_volume(0, op.mountOp, null);
 
                 if (tryMount)
-                    this._ensureMountAndLaunch(context, false);
+                    this._ensureMountAndLaunch(context, false).catch(logError);
             } catch (e) {
                 if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
                     Main.notifyError(_('Failed to mount volume for “%s”').format(this.name), e.message);
@@ -81,7 +80,7 @@ class PlaceInfo extends EventEmitter {
 
     launch(timestamp) {
         let launchContext = global.create_app_launch_context(timestamp, -1);
-        this._ensureMountAndLaunch(launchContext, true);
+        this._ensureMountAndLaunch(launchContext, true).catch(logError);
     }
 
     getIcon() {

extensions/window-list/extension.js

@@ -77,7 +77,7 @@ class WindowContextMenu extends PopupMenu.PopupMenu {
             'notify::minimized', this._updateMinimizeItem.bind(this),
             'notify::maximized-horizontally', this._updateMaximizeItem.bind(this),
             'notify::maximized-vertically', this._updateMaximizeItem.bind(this),
-            this);
+            this.actor);
 
         this._updateMinimizeItem();
         this._updateMaximizeItem();
@@ -226,12 +226,10 @@ class BaseButton extends DashItemContainer {
         return this._button.has_style_class_name('focused');
     }
 
-    // eslint-disable-next-line camelcase
     get ignore_workspace() {
         return this._ignoreWorkspace;
     }
 
-    // eslint-disable-next-line camelcase
     set ignore_workspace(ignore) {
         if (this._ignoreWorkspace === ignore)
             return;
@@ -772,10 +770,20 @@ class WindowList extends St.Widget {
             () => this._onWorkspaceMenuSet(), this);
         this._onWorkspaceMenuSet();
 
-        Main.layoutManager.addChrome(this, {
+        const inOverview = Main.overview.visible ||
+            (Main.layoutManager._startingUp && Main.sessionMode.hasOverview);
+
+        const overviewChromeOptions = {
             affectsStruts: true,
+        };
+        const chromeOptions = {
+            ...overviewChromeOptions,
             trackFullscreen: true,
-        });
+        };
+        Main.layoutManager.addChrome(this, inOverview
+            ? overviewChromeOptions
+            : chromeOptions);
+
         Main.uiGroup.set_child_above_sibling(this, Main.layoutManager.panelBox);
         Main.ctrlAltTabManager.addGroup(this, _('Window List'), 'start-here-symbolic');
 
@@ -812,18 +820,17 @@ class WindowList extends St.Widget {
 
         Main.overview.connectObject(
             'showing', () => {
+                this._retrackChrome(overviewChromeOptions);
                 this.hide();
                 this._updateKeyboardAnchor();
             },
             'hidden', () => {
+                this._retrackChrome(chromeOptions);
                 this.visible = !this._monitor.inFullscreen;
                 this._updateKeyboardAnchor();
             }, this);
 
         global.display.connectObject('in-fullscreen-changed', () => {
-            // Work-around for initial change from unknown to !fullscreen
-            if (Main.overview.visible)
-                this.hide();
             this._updateKeyboardAnchor();
         }, this);
 
@@ -878,6 +885,11 @@ class WindowList extends St.Widget {
             this._monitor.y + this._monitor.height - this.height);
     }
 
+    _retrackChrome(options) {
+        Main.layoutManager.untrackChrome(this);
+        Main.layoutManager.trackChrome(this, options);
+    }
+
     _updateWorkspaceIndicatorVisibility() {
         let workspaceManager = global.workspace_manager;
         let hasWorkspaces = this._mutterSettings.get_boolean('dynamic-workspaces') ||

extensions/workspace-indicator/workspaceIndicator.js

@@ -43,7 +43,7 @@ class WindowPreview extends St.Button {
             'size-changed', () => this._checkRelayout(),
             'position-changed', () => this._checkRelayout(),
             'notify::minimized', this._updateVisible.bind(this),
-            'notify::window-type', this._updateVisible.bind(this),
+            'notify::skip-taskbar', this._updateVisible.bind(this),
             this);
         this._updateVisible();
 
@@ -72,7 +72,7 @@ class WindowPreview extends St.Button {
     }
 
     _updateVisible() {
-        this.visible = this._window.window_type !== Meta.WindowType.DESKTOP &&
+        this.visible = !this._window.skip_taskbar &&
             this._window.showing_on_its_workspace();
     }
 }
@@ -459,8 +459,6 @@ export class WorkspaceIndicator extends PanelMenu.Button {
         this._thumbnails = new WorkspacePreviews();
         container.add_child(this._thumbnails);
 
-        this._workspacesItems = [];
-
         workspaceManager.connectObject(
             'workspace-switched', this._onWorkspaceSwitched.bind(this), GObject.ConnectFlags.AFTER,
             this);

lint/eslintrc-gjs.yml

@@ -30,6 +30,7 @@ rules:
     - error
     - arrays: always-multiline
       objects: always-multiline
+      imports: always-multiline
       functions: never
   comma-spacing:
     - error

meson.build

@@ -4,7 +4,7 @@
 
 project(
   'gnome-shell-extensions',
-  version: '47.2',
+  version: '47.6',
   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/zh_TW.po

@@ -9,9 +9,9 @@ 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-04-29 14:28+0000\n"
-"PO-Revision-Date: 2024-07-24 10:25+0000\n"
-"Last-Translator: Chao-Hsiung Liao <pesder@mail.edu.tw>\n"
+"POT-Creation-Date: 2024-11-25 15:07+0000\n"
+"PO-Revision-Date: 2025-01-12 23:57+0800\n"
+"Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <http://darkbear.mercusysddns.com/"
 "projects/gnome-45/gnome-shell-extensions-po-ui-gnome-46-zh_tw/zh_Hant/>\n"
 "Language: zh_TW\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.6.2\n"
+"X-Generator: Poedit 3.5\n"
 
 #: data/gnome-classic.desktop.in:3
 msgid "GNOME Classic"
@@ -38,11 +38,11 @@ msgstr "GNOME Classic 採行 Wayland"
 msgid "GNOME Classic on Xorg"
 msgstr "GNOME Classic 採行 Xorg"
 
-#: extensions/apps-menu/extension.js:126
+#: extensions/apps-menu/extension.js:125
 msgid "Favorites"
 msgstr "喜愛"
 
-#: extensions/apps-menu/extension.js:397
+#: extensions/apps-menu/extension.js:399
 msgid "Apps"
 msgstr "程式"
 
@@ -58,11 +58,11 @@ msgstr ""
 "字串的列表，每個都包含一個應用程式 id (桌面檔名稱)，後面接著半形分號 \";\" 與"
 "工作區號碼"
 
-#: 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 "加入規則"
 
@@ -107,8 +107,8 @@ msgstr ""
 "如果為真，在對映的縮圖頂端放置視窗說明標題，凌駕 Shell 將它放置在底部的預設"
 "值。變更這個設定值需要重新啟動 Shell 來套用效果。"
 
-#: 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 "位置"
 
@@ -223,47 +223,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:72
+#: extensions/window-list/extension.js:70
 msgid "Close"
 msgstr "關閉"
 
-#: extensions/window-list/extension.js:99
+#: extensions/window-list/extension.js:97
 msgid "Unminimize"
 msgstr "取消最小化"
 
-#: extensions/window-list/extension.js:99
+#: extensions/window-list/extension.js:97
 msgid "Minimize"
 msgstr "最小化"
 
-#: extensions/window-list/extension.js:106
+#: extensions/window-list/extension.js:104
 msgid "Unmaximize"
 msgstr "取消最大化"
 
-#: extensions/window-list/extension.js:106
+#: extensions/window-list/extension.js:104
 msgid "Maximize"
 msgstr "最大化"
 
-#: extensions/window-list/extension.js:471
+#: extensions/window-list/extension.js:485
 msgid "Minimize all"
 msgstr "全部最小化"
 
-#: extensions/window-list/extension.js:477
+#: extensions/window-list/extension.js:491
 msgid "Unminimize all"
 msgstr "全部取消最小化"
 
-#: extensions/window-list/extension.js:483
+#: extensions/window-list/extension.js:497
 msgid "Maximize all"
 msgstr "全部最大化"
 
-#: extensions/window-list/extension.js:491
+#: extensions/window-list/extension.js:505
 msgid "Unmaximize all"
 msgstr "全部取消最大化"
 
-#: extensions/window-list/extension.js:499
+#: extensions/window-list/extension.js:513
 msgid "Close all"
 msgstr "全部關閉"
 
-#: extensions/window-list/extension.js:773
+#: extensions/window-list/extension.js:780
 msgid "Window List"
 msgstr "視窗列表"
 
@@ -279,7 +279,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:69
 msgid "Show windows from all workspaces"
 msgstr "顯示所有工作區的視窗"
 
@@ -297,44 +297,59 @@ msgid ""
 "primary one."
 msgstr "是否在所有連接的螢幕顯示視窗列表或是只出現在主要螢幕上。"
 
-#: extensions/window-list/prefs.js:35
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:41
+msgid "Show workspace previews in window list"
+msgstr "在視窗清單顯示工作區預覽"
+
+#: extensions/window-list/prefs.js:36
 msgid "Window Grouping"
 msgstr "視窗群組"
 
-#: extensions/window-list/prefs.js:40
+#: extensions/window-list/prefs.js:41
 msgid "Never group windows"
 msgstr "永不群組視窗"
 
-#: extensions/window-list/prefs.js:41
+#: extensions/window-list/prefs.js:42
 msgid "Group windows when space is limited"
 msgstr "當空間受限時群組視窗"
 
-#: extensions/window-list/prefs.js:42
+#: extensions/window-list/prefs.js:43
 msgid "Always group windows"
 msgstr "永遠群組視窗"
 
-#: extensions/window-list/prefs.js:66
+#: extensions/window-list/prefs.js:63
 msgid "Show on all monitors"
 msgstr "顯示於所有螢幕"
 
-#: extensions/window-list/workspaceIndicator.js:255
-#: extensions/workspace-indicator/extension.js:261
-msgid "Workspace Indicator"
-msgstr "工作區指示器"
+#: extensions/window-list/prefs.js:75
+msgid "Show workspace previews"
+msgstr "顯示工作區預覽"
 
-#: extensions/workspace-indicator/prefs.js:69
+#: extensions/workspace-indicator/prefs.js:29
+msgid "Show Previews In Top Bar"
+msgstr "在頂端列顯示預覽"
+
+#: extensions/workspace-indicator/prefs.js:87
 #, javascript-format
 msgid "Workspace %d"
 msgstr "工作區 %d"
 
-#: extensions/workspace-indicator/prefs.js:136
+#: extensions/workspace-indicator/prefs.js:154
 msgid "Workspace Names"
 msgstr "工作區名稱"
 
-#: extensions/workspace-indicator/prefs.js:262
+#: extensions/workspace-indicator/prefs.js:280
 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 "在頂端列顯示工作區預覽"
+
+#: extensions/workspace-indicator/workspaceIndicator.js:430
+msgid "Workspace Indicator"
+msgstr "工作區指示器"
+
 #~ msgid "Applications"
 #~ msgstr "應用程式"
 
@@ -468,8 +483,8 @@ msgstr "新增工作區"
 
 #~ msgid ""
 #~ "Configures how the windows are shown in the switcher. Valid possibilities "
-#~ "are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-"
-#~ "only' (shows only the application icon) or 'both'."
+#~ "are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-only' "
+#~ "(shows only the application icon) or 'both'."
 #~ msgstr ""
 #~ "設定視窗在切換器中顯示的方式。有效的選項為「thumbnail-only」(顯示視窗的縮"
 #~ "圖)、「app-icon-only」(僅顯示應用程式圖示)，或「both」(兩者)"