New upstream version 47~beta

Update NEWS.

.gitlab-ci.yml

@@ -16,7 +16,7 @@ stages:
   - deploy
 
 default:
-  image: registry.gitlab.gnome.org/gnome/gnome-shell/fedora/40:2024-02-23.0
+  image: registry.gitlab.gnome.org/gnome/gnome-shell/fedora/40:2024-07-11.0
   # Cancel jobs if newer commits are pushed to the branch
   interruptible: true
   # Auto-retry jobs in case of infra failures

NEWS

@@ -1,3 +1,15 @@
+47.beta
+=======
+* window-list: Modernize styling [Jakub; !330]
+* Include "status-icons" extension [Florian; !194]
+* Misc. bug fixes and cleanups [Florian; !328, !331, !327]
+
+Contributors:
+  Florian Müllner, Jakub Steiner
+
+Translators:
+  Sabri Ünal [tr], Chao-Hsiung Liao [zh_TW]
+
 47.alpha
 ========
 * Improve workspace previews in window-list and workspace-indicator

extensions/status-icons/extension.js

@@ -0,0 +1,91 @@
+// SPDX-FileCopyrightText: 2018 Adel Gadllah <adel.gadllah@gmail.com>
+// SPDX-FileCopyrightText: 2018 Florian Müllner <fmuellner@gnome.org>
+//
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+import Clutter from 'gi://Clutter';
+import Shell from 'gi://Shell';
+import St from 'gi://St';
+
+import * as Main from 'resource:///org/gnome/shell/ui/main.js';
+import {Button as PanelButton} from 'resource:///org/gnome/shell/ui/panelMenu.js';
+
+const PANEL_ICON_SIZE = 16;
+
+const STANDARD_TRAY_ICON_IMPLEMENTATIONS = [
+    'bluetooth-applet',
+    'gnome-sound-applet',
+    'nm-applet',
+    'gnome-power-manager',
+    'keyboard',
+    'a11y-keyboard',
+    'kbd-scrolllock',
+    'kbd-numlock',
+    'kbd-capslock',
+    'ibus-ui-gtk',
+];
+
+export default class SysTray {
+    constructor() {
+        this._icons = new Map();
+        this._tray = null;
+    }
+
+    _onTrayIconAdded(o, icon) {
+        let wmClass = icon.wm_class ? icon.wm_class.toLowerCase() : '';
+        if (STANDARD_TRAY_ICON_IMPLEMENTATIONS.includes(wmClass))
+            return;
+
+        let button = new PanelButton(0.5, null, true);
+
+        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
+        let iconSize = PANEL_ICON_SIZE * scaleFactor;
+
+        icon.set({
+            width: iconSize,
+            height: iconSize,
+            x_align: Clutter.ActorAlign.CENTER,
+            y_align: Clutter.ActorAlign.CENTER,
+        });
+
+        let iconBin = new St.Widget({
+            layout_manager: new Clutter.BinLayout(),
+            style_class: 'system-status-icon',
+        });
+        iconBin.add_child(icon);
+        button.add_child(iconBin);
+
+        this._icons.set(icon, button);
+
+        button.connect('button-release-event',
+            (actor, event) => icon.click(event));
+        button.connect('key-press-event',
+            (actor, event) => icon.click(event));
+
+        const role = `${icon}`;
+        Main.panel.addToStatusArea(role, button);
+    }
+
+    _onTrayIconRemoved(o, icon) {
+        const button = this._icons.get(icon);
+        button?.destroy();
+        this._icons.delete(icon);
+    }
+
+    enable() {
+        this._tray = new Shell.TrayManager();
+        this._tray.connect('tray-icon-added',
+            this._onTrayIconAdded.bind(this));
+        this._tray.connect('tray-icon-removed',
+            this._onTrayIconRemoved.bind(this));
+        this._tray.manage_screen(Main.panel);
+    }
+
+    disable() {
+        this._icons.forEach(button => button.destroy());
+        this._icons.clear();
+
+        this._tray.unmanage_screen();
+        this._tray = null;
+    }
+}

extensions/status-icons/meson.build

@@ -0,0 +1,9 @@
+# SPDX-FileCopyrightText: 2018 Florian Müllner <fmuellner@gnome.org>
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+extension_data += configure_file(
+  input: metadata_name + '.in',
+  output: metadata_name,
+  configuration: metadata_conf
+)

extensions/status-icons/metadata.json.in

@@ -0,0 +1,10 @@
+{
+"extension-id": "@extension_id@",
+"uuid": "@uuid@",
+"settings-schema": "@gschemaname@",
+"gettext-domain": "@gettext_domain@",
+"name": "Status Icons",
+"description": "Show status icons in the top bar",
+"shell-version": [ "@shell_current@" ],
+"url": "@url@"
+}

extensions/window-list/extension.js

@@ -358,9 +358,9 @@ class BaseButton extends DashItemContainer {
 
     _updateStyle() {
         if (this._isFocused())
-            this.add_style_class_name('focused');
+            this._button.add_style_class_name('focused');
         else
-            this.remove_style_class_name('focused');
+            this._button.remove_style_class_name('focused');
     }
 
     _windowEnteredOrLeftMonitor(_metaDisplay, _monitorIndex, _metaWindow) {

extensions/window-list/stylesheet-dark.css

@@ -34,8 +34,8 @@
 }
 
 .window-button > StWidget {
-  color: #bbb;
+  color: #fff;
-  background-color: #1d1d1d;
+  background-color: transparent;
   border-radius: 4px;
   padding: 3px 6px 1px;
   transition: 100ms ease;
@@ -47,25 +47,25 @@
 }
 
 .window-button:hover > StWidget {
-  color: #fff;
   background-color: #303030;
 }
 
 .window-button:active > StWidget,
 .window-button:focus > StWidget {
-  color: #fff;
+  background-color: st-lighten(#303030, 5%);
-  background-color: #3f3f3f;
 }
 
 .window-button.focused > StWidget {
-  color: #fff;
+  background-color: #5b5b5b;
-  background-color: #3f3f3f;
 }
 
-.window-button.focused:active > StWidget {
+  .window-button.focused:hover > StWidget {
-  color: #fff;
+    background-color: st-lighten(#5b5b5b, 5%);
-  background-color: #3f3f3f;
+  }
-}
+
+  .window-button.focused:active > StWidget {
+    background-color: st-lighten(#5b5b5b, 10%);
+  }
 
 .window-button.minimized > StWidget {
   color: #666;

extensions/window-list/stylesheet-light.css

@@ -15,13 +15,10 @@
   }
 
   .bottom-panel .window-button > 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 {
@@ -29,25 +26,43 @@
     max-width: 18.75em;
   }
 
-  .bottom-panel .window-button:hover > StWidget {
+ .window-button > StWidget {
-    background-color: #f9f9f9;
+  color: #000;
+  background-color: transparent;
+}
+
+.window-button > StWidget {
+  -st-natural-width: 18.75em;
+  max-width: 18.75em;
+}
+
+.window-button:hover > StWidget {
+  background-color: st-darken(#eee,5%);
+}
+
+.window-button:active > StWidget,
+.window-button:focus > StWidget {
+  background-color: st-darken(#eee, 10%);
+}
+
+.window-button.focused > StWidget {
+  background-color: st-darken(#eee,15%);
+}
+
+  .window-button.focused:hover > StWidget {
+    background-color: st-darken(#eee, 20%);
   }
 
-  .bottom-panel .window-button:active > StWidget,
+  .window-button.focused:active > StWidget {
-  .bottom-panel .window-button:focus > StWidget {
+    background-color: st-darken(#eee, 25%);
-    box-shadow: inset 0 1px 3px rgba(0,0,0,0.1);
   }
 
-  .bottom-panel .window-button.focused > StWidget {
+.window-button.minimized > StWidget {
-    background-color: #ccc;
+  color: #aaa;
-    box-shadow: inset 0 1px 3px rgba(0,0,0,0.1);
+  background-color: #f9f9f9;
-  }
+}
 
-  .bottom-panel .window-button.focused:hover > StWidget {
+.window-button.minimized:active > StWidget {
-    background-color: #e9e9e9;
+  color: #aaa;
-  }
+  background-color: #f9f9f9;
-
+}
-  .bottom-panel .window-button.minimized > StWidget {
-    color: #888;
-    box-shadow: none;
-  }

extensions/workspace-indicator/stylesheet-dark.css

@@ -18,7 +18,6 @@
 }
 
 .workspace-indicator .workspaces-box {
-  padding: 5px;
   spacing: 3px;
 }
 
@@ -27,13 +26,27 @@
   spacing: 6px;
 }
 
+.workspace-indicator .workspace-box {
+  padding-top: 5px;
+  padding-bottom: 5px;
+}
+
+.workspace-indicator StButton:first-child:ltr > .workspace-box,
+.workspace-indicator StButton:last-child:rtl > .workspace-box {
+  padding-left: 5px;
+}
+.workspace-indicator StButton:last-child:ltr > .workspace-box,
+.workspace-indicator StButton:first-child:rtl > .workspace-box {
+  padding-right: 5px;
+}
+
 .workspace-indicator-menu .workspace-box {
   spacing: 6px;
 }
 
 .workspace-indicator-menu .workspace,
 .workspace-indicator .workspace {
-  border: 2px solid transparent;
+  border: 1px solid transparent;
   border-radius: 4px;
   background-color: #3f3f3f;
 }
@@ -49,7 +62,7 @@
 
 .workspace-indicator-menu .workspace.active,
 .workspace-indicator .workspace.active {
-  border-color: #9f9f9f;
+  border-color: #fff;
 }
 
 .workspace-indicator-window-preview {

meson.build

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 project('gnome-shell-extensions',
-  version: '47.alpha',
+  version: '47.beta',
   meson_version: '>= 0.58.0',
   license: 'GPL2+'
 )
@@ -42,6 +42,7 @@ default_extensions += [
   'drive-menu',
   'light-style',
   'screenshot-window-sizer',
+  'status-icons',
   'system-monitor',
   'windowsNavigator',
   'workspace-indicator'

po/tr.po

@@ -14,9 +14,9 @@ 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: 2024-02-13 13:35+0000\n"
+"POT-Creation-Date: 2024-04-29 15:27+0000\n"
-"PO-Revision-Date: 2024-02-12 18:45+0300\n"
+"PO-Revision-Date: 2024-05-06 05:17+0300\n"
-"Last-Translator: Sabri Ünal <libreajans@gmail.com>\n"
+"Last-Translator: Sabri Ünal <yakushabb@gmail.com>\n"
 "Language-Team: Turkish <takim@gnome.org.tr>\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
@@ -46,7 +46,7 @@ msgstr "Xorg üstünde GNOME Klasik"
 msgid "Favorites"
 msgstr "Gözdeler"
 
-#: extensions/apps-menu/extension.js:397
+#: extensions/apps-menu/extension.js:400
 msgid "Apps"
 msgstr "Uygulamalar"
 
@@ -163,43 +163,43 @@ msgstr "Bellek istatistikleri"
 msgid "Swap stats"
 msgstr "Takas istatistikleri"
 
-#: extensions/system-monitor/extension.js:327
+#: extensions/system-monitor/extension.js:336
 msgid "Upload stats"
 msgstr "Yükleme istatistikleri"
 
-#: extensions/system-monitor/extension.js:341
+#: extensions/system-monitor/extension.js:350
 msgid "Download stats"
 msgstr "İndirme istatistikleri"
 
-#: extensions/system-monitor/extension.js:355
+#: extensions/system-monitor/extension.js:364
 msgid "System stats"
 msgstr "Sistem istatistikleri"
 
-#: extensions/system-monitor/extension.js:403
+#: extensions/system-monitor/extension.js:412
 msgid "Show"
 msgstr "Göster"
 
-#: extensions/system-monitor/extension.js:405
+#: extensions/system-monitor/extension.js:414
 msgid "CPU"
 msgstr "İşlemci"
 
-#: extensions/system-monitor/extension.js:407
+#: extensions/system-monitor/extension.js:416
 msgid "Memory"
 msgstr "Bellek"
 
-#: extensions/system-monitor/extension.js:409
+#: extensions/system-monitor/extension.js:418
 msgid "Swap"
 msgstr "Takas"
 
-#: extensions/system-monitor/extension.js:411
+#: extensions/system-monitor/extension.js:420
 msgid "Upload"
 msgstr "Yükle"
 
-#: extensions/system-monitor/extension.js:413
+#: extensions/system-monitor/extension.js:422
 msgid "Download"
 msgstr "İndir"
 
-#: extensions/system-monitor/extension.js:418
+#: extensions/system-monitor/extension.js:427
 msgid "Open System Monitor"
 msgstr "Sistem Gözlemcisini Aç"
 
@@ -231,47 +231,47 @@ msgstr "Tema adı"
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "~/.themes/name/gnome-shell konumundan edinilen tema adı"
 
-#: extensions/window-list/extension.js:71
+#: extensions/window-list/extension.js:72
 msgid "Close"
 msgstr "Kapat"
 
-#: extensions/window-list/extension.js:98
+#: extensions/window-list/extension.js:99
 msgid "Unminimize"
 msgstr "Önceki duruma getir"
 
-#: extensions/window-list/extension.js:98
+#: extensions/window-list/extension.js:99
 msgid "Minimize"
 msgstr "Simge durumuna küçült"
 
-#: extensions/window-list/extension.js:105
+#: extensions/window-list/extension.js:106
 msgid "Unmaximize"
 msgstr "Önceki duruma getir"
 
-#: extensions/window-list/extension.js:105
+#: extensions/window-list/extension.js:106
 msgid "Maximize"
 msgstr "En büyük duruma getir"
 
-#: extensions/window-list/extension.js:470
+#: extensions/window-list/extension.js:471
 msgid "Minimize all"
 msgstr "Tümünü simge durumuna küçült"
 
-#: extensions/window-list/extension.js:476
+#: extensions/window-list/extension.js:477
 msgid "Unminimize all"
 msgstr "Tümünü önceki duruma getir"
 
-#: extensions/window-list/extension.js:482
+#: extensions/window-list/extension.js:483
 msgid "Maximize all"
 msgstr "Tümünü en büyük duruma getir"
 
-#: extensions/window-list/extension.js:490
+#: extensions/window-list/extension.js:491
 msgid "Unmaximize all"
 msgstr "Tümünü önceki duruma getir"
 
-#: extensions/window-list/extension.js:498
+#: extensions/window-list/extension.js:499
 msgid "Close all"
 msgstr "Tümünü kapat"
 
-#: extensions/window-list/extension.js:772
+#: extensions/window-list/extension.js:778
 msgid "Window List"
 msgstr "Pencere Listesi"
 
@@ -311,6 +311,10 @@ msgstr ""
 "Pencere listesinin tüm bağlı monitörlerde mi yoksa yalnızca birincil "
 "monitörde mi gösterileceğini belirtir."
 
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:41
+msgid "Show workspace previews in window list"
+msgstr "Pencere listesinde çalışma alanı ön izlemelerini göster"
+
 #: extensions/window-list/prefs.js:35
 msgid "Window Grouping"
 msgstr "Pencere Kümeleme"
@@ -331,20 +335,31 @@ msgstr "Pencereleri her zaman kümele"
 msgid "Show on all monitors"
 msgstr "Tüm monitörlerde göster"
 
-#: extensions/window-list/workspaceIndicator.js:253
+#: extensions/window-list/prefs.js:92
-#: extensions/workspace-indicator/extension.js:259
+msgid "Show workspace previews"
-msgid "Workspace Indicator"
+msgstr "Çalışma alanı ön izlemelerini göster"
-msgstr "Çalışma Alanı Belirteci"
 
-#: extensions/workspace-indicator/prefs.js:69
+#: extensions/workspace-indicator/prefs.js:30
+msgid "Show Previews In Top Bar"
+msgstr "Ön İzlemeleri Üst Çubukta Göster"
+
+#: extensions/workspace-indicator/prefs.js:88
 #, javascript-format
 msgid "Workspace %d"
 msgstr "Çalışma Alanı %d"
 
-#: extensions/workspace-indicator/prefs.js:136
+#: extensions/workspace-indicator/prefs.js:155
 msgid "Workspace Names"
 msgstr "Çalışma Alanı Adları"
 
-#: extensions/workspace-indicator/prefs.js:262
+#: extensions/workspace-indicator/prefs.js:281
 msgid "Add Workspace"
 msgstr "Çalışma Alanı Ekle"
+
+#: extensions/workspace-indicator/schemas/org.gnome.shell.extensions.workspace-indicator.gschema.xml:12
+msgid "Show workspace previews in top bar"
+msgstr "Çalışma alanı ön izlemelerini üst çubukta göster"
+
+#: extensions/workspace-indicator/workspaceIndicator.js:430
+msgid "Workspace Indicator"
+msgstr "Çalışma Alanı Belirteci"

po/zh_TW.po

@@ -9,16 +9,17 @@ 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: 2022-05-06 11:44+0000\n"
+"POT-Creation-Date: 2024-04-29 14:28+0000\n"
-"PO-Revision-Date: 2022-05-12 00:01+0800\n"
+"PO-Revision-Date: 2024-07-24 10:25+0000\n"
-"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
+"Last-Translator: Chao-Hsiung Liao <pesder@mail.edu.tw>\n"
-"Language-Team: Chinese <zh-l10n@linux.org.tw>\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 3.0.1\n"
+"X-Generator: Weblate 5.6.2\n"
 
 #: data/gnome-classic.desktop.in:3
 msgid "GNOME Classic"
@@ -37,19 +38,19 @@ msgstr "GNOME Classic 採行 Wayland"
 msgid "GNOME Classic on Xorg"
 msgstr "GNOME Classic 採行 Xorg"
 
-#: extensions/apps-menu/extension.js:118
+#: extensions/apps-menu/extension.js:126
 msgid "Favorites"
 msgstr "喜愛"
 
-#: extensions/apps-menu/extension.js:379
+#: extensions/apps-menu/extension.js:397
-msgid "Applications"
+msgid "Apps"
-msgstr "應用程式"
+msgstr "程式"
 
-#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
+#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:12
 msgid "Application and workspace list"
 msgstr "應用程式與工作區列表"
 
-#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:7
+#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:13
 msgid ""
 "A list of strings, each containing an application id (desktop file name), "
 "followed by a colon and the workspace number"
@@ -57,34 +58,34 @@ msgstr ""
 "字串的列表，每個都包含一個應用程式 id (桌面檔名稱)，後面接著半形分號 \";\" 與"
 "工作區號碼"
 
-#: extensions/auto-move-windows/prefs.js:152
+#: extensions/auto-move-windows/prefs.js:159
 msgid "Workspace Rules"
 msgstr "工作區規則"
 
-#: extensions/auto-move-windows/prefs.js:306
+#: extensions/auto-move-windows/prefs.js:314
 msgid "Add Rule"
 msgstr "加入規則"
 
 #. TRANSLATORS: %s is the filesystem name
-#: extensions/drive-menu/extension.js:126
+#: extensions/drive-menu/extension.js:123
-#: extensions/places-menu/placeDisplay.js:210
+#: extensions/places-menu/placeDisplay.js:218
 #, javascript-format
 msgid "Ejecting drive “%s” failed:"
 msgstr "裝置「%s」退出失敗："
 
-#: extensions/drive-menu/extension.js:145
+#: extensions/drive-menu/extension.js:142
 msgid "Removable devices"
 msgstr "可移除式裝置"
 
-#: extensions/drive-menu/extension.js:167
+#: extensions/drive-menu/extension.js:164
 msgid "Open Files"
 msgstr "開啟檔案"
 
-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
 msgid "Use more screen for windows"
 msgstr "視窗使用更多螢幕空間"
 
-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:12
 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. "
@@ -93,11 +94,11 @@ msgstr ""
 "藉由適應螢幕長寬比來試著使用更多螢幕空間放置視窗縮圖，進一步聯合它們來減少邊"
 "界盒。這個設定僅適用於自然放置策略。"
 
-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:17
 msgid "Place window captions on top"
 msgstr "在頂端放置視窗說明標題"
 
-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:12
+#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:18
 msgid ""
 "If true, place window captions on top the respective thumbnail, overriding "
 "shell default of placing it at the bottom. Changing this setting requires "
@@ -106,47 +107,119 @@ msgstr ""
 "如果為真，在對映的縮圖頂端放置視窗說明標題，凌駕 Shell 將它放置在底部的預設"
 "值。變更這個設定值需要重新啟動 Shell 來套用效果。"
 
+#: extensions/places-menu/extension.js:91
 #: extensions/places-menu/extension.js:94
-#: extensions/places-menu/extension.js:97
 msgid "Places"
 msgstr "位置"
 
-#: extensions/places-menu/placeDisplay.js:49
+#: extensions/places-menu/placeDisplay.js:60
 #, javascript-format
 msgid "Failed to launch “%s”"
 msgstr "無法啟動「%s」"
 
-#: extensions/places-menu/placeDisplay.js:64
+#: extensions/places-menu/placeDisplay.js:75
 #, javascript-format
 msgid "Failed to mount volume for “%s”"
 msgstr "無法掛載儲存區「%s」"
 
-#: extensions/places-menu/placeDisplay.js:125
+#: extensions/places-menu/placeDisplay.js:135
-#: extensions/places-menu/placeDisplay.js:148
+#: extensions/places-menu/placeDisplay.js:158
 msgid "Computer"
 msgstr "電腦"
 
-#: extensions/places-menu/placeDisplay.js:336
+#: extensions/places-menu/placeDisplay.js:333
 msgid "Home"
 msgstr "家目錄"
 
-#: extensions/places-menu/placeDisplay.js:381
+#: extensions/places-menu/placeDisplay.js:378
 msgid "Browse Network"
 msgstr "瀏覽網路"
 
-#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:14
 msgid "Cycle Screenshot Sizes"
 msgstr "循環螢幕擷圖大小"
 
-#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:18
 msgid "Cycle Screenshot Sizes Backward"
 msgstr "往回循環螢幕擷圖大小"
 
-#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
+#: extensions/system-monitor/extension.js:135
+msgid "CPU stats"
+msgstr "CPU 狀態"
+
+#: extensions/system-monitor/extension.js:159
+msgid "Memory stats"
+msgstr "記憶體狀態"
+
+#: extensions/system-monitor/extension.js:177
+msgid "Swap stats"
+msgstr "置換區狀態"
+
+#: extensions/system-monitor/extension.js:336
+msgid "Upload stats"
+msgstr "上傳狀態"
+
+#: extensions/system-monitor/extension.js:350
+msgid "Download stats"
+msgstr "下載狀態"
+
+#: extensions/system-monitor/extension.js:364
+msgid "System stats"
+msgstr "系統狀態"
+
+#: extensions/system-monitor/extension.js:412
+msgid "Show"
+msgstr "顯示"
+
+#: extensions/system-monitor/extension.js:414
+msgid "CPU"
+msgstr "CPU"
+
+#: extensions/system-monitor/extension.js:416
+msgid "Memory"
+msgstr "記憶體"
+
+#: extensions/system-monitor/extension.js:418
+msgid "Swap"
+msgstr "置換區"
+
+#: extensions/system-monitor/extension.js:420
+msgid "Upload"
+msgstr "上傳"
+
+#: extensions/system-monitor/extension.js:422
+msgid "Download"
+msgstr "下載"
+
+#: extensions/system-monitor/extension.js:427
+msgid "Open System Monitor"
+msgstr "開啟系統監視器"
+
+#: extensions/system-monitor/schemas/org.gnome.shell.extensions.system-monitor.gschema.xml:12
+msgid "Show CPU usage"
+msgstr "顯示 CPU 使用率"
+
+#: extensions/system-monitor/schemas/org.gnome.shell.extensions.system-monitor.gschema.xml:16
+msgid "Show memory usage"
+msgstr "顯示記憶體使用率"
+
+#: extensions/system-monitor/schemas/org.gnome.shell.extensions.system-monitor.gschema.xml:20
+msgid "Show swap usage"
+msgstr "顯示置換區使用率"
+
+#: extensions/system-monitor/schemas/org.gnome.shell.extensions.system-monitor.gschema.xml:24
+msgid "Show upload"
+msgstr "顯示上傳"
+
+#: extensions/system-monitor/schemas/org.gnome.shell.extensions.system-monitor.gschema.xml:28
+msgid "Show download"
+msgstr "顯示下載"
+
+#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:11
 msgid "Theme name"
 msgstr "主題名稱"
 
-#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:6
+#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:12
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "主題的名稱，要從 ~/.themes/name/gnome-shell 載入"
 
@@ -154,71 +227,71 @@ msgstr "主題的名稱，要從 ~/.themes/name/gnome-shell 載入"
 msgid "Close"
 msgstr "關閉"
 
-#: extensions/window-list/extension.js:92
+#: extensions/window-list/extension.js:99
 msgid "Unminimize"
 msgstr "取消最小化"
 
-#: extensions/window-list/extension.js:92
+#: extensions/window-list/extension.js:99
 msgid "Minimize"
 msgstr "最小化"
 
-#: extensions/window-list/extension.js:99
+#: extensions/window-list/extension.js:106
 msgid "Unmaximize"
 msgstr "取消最大化"
 
-#: extensions/window-list/extension.js:99
+#: extensions/window-list/extension.js:106
 msgid "Maximize"
 msgstr "最大化"
 
-#: extensions/window-list/extension.js:441
+#: extensions/window-list/extension.js:471
 msgid "Minimize all"
 msgstr "全部最小化"
 
-#: extensions/window-list/extension.js:447
+#: extensions/window-list/extension.js:477
 msgid "Unminimize all"
 msgstr "全部取消最小化"
 
-#: extensions/window-list/extension.js:453
+#: extensions/window-list/extension.js:483
 msgid "Maximize all"
 msgstr "全部最大化"
 
-#: extensions/window-list/extension.js:461
+#: extensions/window-list/extension.js:491
 msgid "Unmaximize all"
 msgstr "全部取消最大化"
 
-#: extensions/window-list/extension.js:469
+#: extensions/window-list/extension.js:499
 msgid "Close all"
 msgstr "全部關閉"
 
-#: extensions/window-list/extension.js:753
+#: extensions/window-list/extension.js:773
 msgid "Window List"
 msgstr "視窗列表"
 
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:12
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:18
 msgid "When to group windows"
 msgstr "何時群組視窗"
 
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:19
 msgid ""
 "Decides when to group windows from the same application on the window list. "
 "Possible values are “never”, “auto” and “always”."
 msgstr ""
 "決定在視窗列表中何時群組視窗。可能的數值有「never」、「auto」、「always」。"
 
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:26
 #: extensions/window-list/prefs.js:79
 msgid "Show windows from all workspaces"
 msgstr "顯示所有工作區的視窗"
 
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:27
 msgid "Whether to show windows from all workspaces or only the current one."
 msgstr "是否顯示所有工作區，還是僅顯示目前工作區的視窗。"
 
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:27
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:33
 msgid "Show the window list on all monitors"
 msgstr "在所有螢幕顯示視窗列表"
 
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:28
+#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:34
 msgid ""
 "Whether to show the window list on all connected monitors or only on the "
 "primary one."
@@ -244,24 +317,27 @@ msgstr "永遠群組視窗"
 msgid "Show on all monitors"
 msgstr "顯示於所有螢幕"
 
-#: extensions/window-list/workspaceIndicator.js:261
+#: extensions/window-list/workspaceIndicator.js:255
-#: extensions/workspace-indicator/extension.js:266
+#: extensions/workspace-indicator/extension.js:261
 msgid "Workspace Indicator"
 msgstr "工作區指示器"
 
-#: extensions/workspace-indicator/prefs.js:62
+#: extensions/workspace-indicator/prefs.js:69
 #, javascript-format
 msgid "Workspace %d"
 msgstr "工作區 %d"
 
-#: extensions/workspace-indicator/prefs.js:129
+#: extensions/workspace-indicator/prefs.js:136
 msgid "Workspace Names"
 msgstr "工作區名稱"
 
-#: extensions/workspace-indicator/prefs.js:255
+#: extensions/workspace-indicator/prefs.js:262
 msgid "Add Workspace"
 msgstr "新增工作區"
 
+#~ msgid "Applications"
+#~ msgstr "應用程式"
+
 #~ msgid "Application"
 #~ msgstr "應用程式"
 
@@ -342,12 +418,6 @@ msgstr "新增工作區"
 #~ "功能。\n"
 #~ "不過，它可以讓您自訂歡迎訊息。"
 
-#~ msgid "CPU"
-#~ msgstr "CPU"
-
-#~ msgid "Memory"
-#~ msgstr "記憶體"
-
 #~ msgid "GNOME Shell Classic"
 #~ msgstr "GNOME Shell Classic"