From 496ae16cf18b1a7580d953b095542031178428ca Mon Sep 17 00:00:00 2001 From: Xiaoguang Wang Date: Thu, 8 Mar 2018 09:13:40 +0800 Subject: [PATCH 1/5] apps-menu: Duplicate destroy actor https://gitlab.gnome.org/GNOME/gnome-shell-extensions/issues/59 --- extensions/apps-menu/extension.js | 1 - 1 file changed, 1 deletion(-) diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js index 5b382138..deb6cc3e 100644 --- a/extensions/apps-menu/extension.js +++ b/extensions/apps-menu/extension.js @@ -742,7 +742,6 @@ class ApplicationsButton extends PanelMenu.Button { } destroy() { - this.menu.actor.get_children().forEach(c => { c.destroy() }); super.destroy(); } }; From d3ea985e1428b0ab301c2c14d1e1637d9449e13f Mon Sep 17 00:00:00 2001 From: Dz Chen Date: Wed, 21 Mar 2018 19:21:17 +0800 Subject: [PATCH 2/5] Update zh_CN translation --- po/zh_CN.po | 138 ++++++++++++++++++++++++++++------------------------ 1 file changed, 75 insertions(+), 63 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 6031c702..adec118b 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5,21 +5,22 @@ # Aron Xu , 2011. # tuhaihe <1132321739qq@gmail.com>, 2012, 2013. # 甘露(Gan Lu) , 2013. +# Mingcong Bai , 2017. # msgid "" msgstr "" "Project-Id-Version: gnome-shell-extensions master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" -"shell&keywords=I18N+L10N&component=extensions\n" -"POT-Creation-Date: 2016-10-11 08:03+0000\n" -"PO-Revision-Date: 2016-10-18 17:53+0800\n" -"Last-Translator: YunQiang Su \n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/" +"issues\n" +"POT-Creation-Date: 2018-01-18 12:15+0000\n" +"PO-Revision-Date: 2017-08-18 21:26+0800\n" +"Last-Translator: Mingcong Bai \n" "Language-Team: Chinese (China) \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.9\n" +"X-Generator: Poedit 2.0.2\n" "Plural-Forms: nplurals=1; plural=0;\n" #: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3 @@ -65,35 +66,35 @@ msgstr "仅在主显示器上显示工作区" msgid "Delay focus changes in mouse mode until the pointer stops moving" msgstr "将鼠标模式下焦点的切换推迟到光标停止移动之后" -#: extensions/alternate-tab/prefs.js:20 +#: extensions/alternate-tab/prefs.js:19 msgid "Thumbnail only" msgstr "仅缩略图" -#: extensions/alternate-tab/prefs.js:21 +#: extensions/alternate-tab/prefs.js:20 msgid "Application icon only" msgstr "仅应用程序图标" -#: extensions/alternate-tab/prefs.js:22 +#: extensions/alternate-tab/prefs.js:21 msgid "Thumbnail and application icon" msgstr "缩略图和应用程序图标" -#: extensions/alternate-tab/prefs.js:38 +#: extensions/alternate-tab/prefs.js:34 msgid "Present windows as" msgstr "窗口展现为" -#: extensions/alternate-tab/prefs.js:69 +#: extensions/alternate-tab/prefs.js:65 msgid "Show only windows in the current workspace" msgstr "仅显示当前工作区中的窗口" -#: extensions/apps-menu/extension.js:38 +#: extensions/apps-menu/extension.js:37 msgid "Activities Overview" msgstr "活动概览" -#: extensions/apps-menu/extension.js:109 +#: extensions/apps-menu/extension.js:130 msgid "Favorites" msgstr "收藏" -#: extensions/apps-menu/extension.js:266 +#: extensions/apps-menu/extension.js:417 msgid "Applications" msgstr "应用程序" @@ -106,41 +107,43 @@ msgid "" "A list of strings, each containing an application id (desktop file name), " "followed by a colon and the workspace number" msgstr "" -"一系列字符串，每个字符串包含一个应用程序标识(桌面文件名称)、冒号加工作区号" +"一系列字符串，每个字符串包含一个应用程序标识（桌面文件名称）、冒号加工作区号" -#: extensions/auto-move-windows/prefs.js:60 +#: extensions/auto-move-windows/prefs.js:53 msgid "Application" msgstr "应用程序" -#: extensions/auto-move-windows/prefs.js:69 -#: extensions/auto-move-windows/prefs.js:127 +#: extensions/auto-move-windows/prefs.js:62 +#: extensions/auto-move-windows/prefs.js:117 msgid "Workspace" msgstr "工作区" -#: extensions/auto-move-windows/prefs.js:85 +#: extensions/auto-move-windows/prefs.js:78 msgid "Add Rule" msgstr "添加规则" -#: extensions/auto-move-windows/prefs.js:106 +#: extensions/auto-move-windows/prefs.js:98 msgid "Create new matching rule" msgstr "创建新的匹配规则" -#: extensions/auto-move-windows/prefs.js:111 +#: extensions/auto-move-windows/prefs.js:103 msgid "Add" msgstr "添加" -#: extensions/drive-menu/extension.js:106 +#. TRANSLATORS: %s is the filesystem name +#: extensions/drive-menu/extension.js:103 +#: extensions/places-menu/placeDisplay.js:219 #, javascript-format -msgid "Ejecting drive '%s' failed:" +msgid "Ejecting drive “%s” failed:" msgstr "弹出驱动器“%s”失败：" -#: extensions/drive-menu/extension.js:124 +#: extensions/drive-menu/extension.js:118 msgid "Removable devices" msgstr "可移动设备" -#: extensions/drive-menu/extension.js:149 -msgid "Open File" -msgstr "打开文件管理器" +#: extensions/drive-menu/extension.js:143 +msgid "Open Files" +msgstr "打开文件" #: extensions/example/extension.js:17 msgid "Hello, world!" @@ -156,17 +159,17 @@ msgid "" "panel." msgstr "如果不为空，所包含的文本会在点击面板时显示。" -#: extensions/example/prefs.js:30 +#: extensions/example/prefs.js:27 msgid "Message" msgstr "消息" #. TRANSLATORS: Example is the name of the extension, should not be #. translated -#: extensions/example/prefs.js:43 +#: extensions/example/prefs.js:40 msgid "" "Example aims to show how to build well behaved extensions for the Shell and " "as such it has little functionality on its own.\n" -"Nevertheless it's possible to customize the greeting message." +"Nevertheless it’s possible to customize the greeting message." msgstr "" "示例意在展示如何为 Shell 创建良好工作的扩展，本身功能有限。\n" "尽管如此，它还是具备定制祝福语的功能。" @@ -197,32 +200,41 @@ msgstr "" "如果设置为 true，则将窗口说明文字放置在对应窗口的缩略图上方，而不是默认的下" "方。修改此设置需要重启 GNOME Shell 以使设置生效。" -#: extensions/places-menu/extension.js:78 -#: extensions/places-menu/extension.js:81 +#: extensions/places-menu/extension.js:79 +#: extensions/places-menu/extension.js:82 msgid "Places" msgstr "位置" -#: extensions/places-menu/placeDisplay.js:59 +#: extensions/places-menu/placeDisplay.js:66 #, javascript-format -msgid "Failed to launch \"%s\"" +msgid "Failed to mount volume for “%s”" +msgstr "无法为“%s”挂载卷" + +#: extensions/places-menu/placeDisplay.js:79 +#, javascript-format +msgid "Failed to launch “%s”" msgstr "无法启动“%s”" -#: extensions/places-menu/placeDisplay.js:101 -#: extensions/places-menu/placeDisplay.js:124 +#: extensions/places-menu/placeDisplay.js:135 +#: extensions/places-menu/placeDisplay.js:158 msgid "Computer" msgstr "计算机" -#: extensions/places-menu/placeDisplay.js:267 +#: extensions/places-menu/placeDisplay.js:336 msgid "Home" msgstr "主文件夹" -#: extensions/places-menu/placeDisplay.js:311 +#: extensions/places-menu/placeDisplay.js:378 msgid "Browse Network" msgstr "浏览网络" #: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7 msgid "Cycle Screenshot Sizes" -msgstr "循环调整窗口截图大小" +msgstr "循环调整截图大小" + +#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11 +msgid "Cycle Screenshot Sizes Backward" +msgstr "反向循环调整截图大小" #: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5 msgid "Theme name" @@ -232,52 +244,52 @@ 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:110 +#: extensions/window-list/extension.js:106 msgid "Close" msgstr "关闭" -#: extensions/window-list/extension.js:120 +#: extensions/window-list/extension.js:125 msgid "Unminimize" msgstr "取消最小化" -#: extensions/window-list/extension.js:121 +#: extensions/window-list/extension.js:126 msgid "Minimize" msgstr "最小化" -#: extensions/window-list/extension.js:127 +#: extensions/window-list/extension.js:132 msgid "Unmaximize" msgstr "取消最大化" -#: extensions/window-list/extension.js:128 +#: extensions/window-list/extension.js:133 msgid "Maximize" msgstr "最大化" -#: extensions/window-list/extension.js:411 +#: extensions/window-list/extension.js:408 msgid "Minimize all" msgstr "全部最小化" -#: extensions/window-list/extension.js:419 +#: extensions/window-list/extension.js:414 msgid "Unminimize all" msgstr "全部取消最小化" -#: extensions/window-list/extension.js:427 +#: extensions/window-list/extension.js:420 msgid "Maximize all" msgstr "全部最大化" -#: extensions/window-list/extension.js:436 +#: extensions/window-list/extension.js:429 msgid "Unmaximize all" msgstr "全部取消最大化" -#: extensions/window-list/extension.js:445 +#: extensions/window-list/extension.js:438 msgid "Close all" msgstr "全部关闭" -#: extensions/window-list/extension.js:669 -#: extensions/workspace-indicator/extension.js:30 +#: extensions/window-list/extension.js:646 +#: extensions/workspace-indicator/extension.js:26 msgid "Workspace Indicator" msgstr "工作区指示器" -#: extensions/window-list/extension.js:828 +#: extensions/window-list/extension.js:811 msgid "Window List" msgstr "窗口列表" @@ -288,10 +300,10 @@ msgstr "何时分组窗口" #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13 msgid "" "Decides when to group windows from the same application on the window list. " -"Possible values are \"never\", \"auto\" and \"always\"." +"Possible values are “never”, “auto” and “always”." msgstr "" -"决定何时对窗口列表上的同一应用的窗口进行分组。可用值有“never”(从" -"不)、“auto”(自动)和“always”(总是)。" +"决定何时对窗口列表上的同一应用的窗口进行分组。可用值有“never”（从" +"不）、“auto”（自动）和“always”（总是）。" #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20 msgid "Show the window list on all monitors" @@ -303,35 +315,35 @@ msgid "" "primary one." msgstr "是否在所有连接的显示器上显示窗口列表或仅在主显示器上显示。" -#: extensions/window-list/prefs.js:32 +#: extensions/window-list/prefs.js:28 msgid "Window Grouping" msgstr "窗口分组" -#: extensions/window-list/prefs.js:50 +#: extensions/window-list/prefs.js:46 msgid "Never group windows" msgstr "从不将窗口分组" -#: extensions/window-list/prefs.js:51 +#: extensions/window-list/prefs.js:47 msgid "Group windows when space is limited" msgstr "当空间有限时将窗口分组" -#: extensions/window-list/prefs.js:52 +#: extensions/window-list/prefs.js:48 msgid "Always group windows" msgstr "总是对窗口分组" -#: extensions/window-list/prefs.js:75 +#: extensions/window-list/prefs.js:71 msgid "Show on all monitors" msgstr "在所有显示器上显示" -#: extensions/workspace-indicator/prefs.js:141 +#: extensions/workspace-indicator/prefs.js:134 msgid "Workspace Names" msgstr "工作区名称" -#: extensions/workspace-indicator/prefs.js:157 +#: extensions/workspace-indicator/prefs.js:150 msgid "Name" msgstr "名称" -#: extensions/workspace-indicator/prefs.js:198 +#: extensions/workspace-indicator/prefs.js:190 #, javascript-format msgid "Workspace %d" msgstr "工作区 %d" From 682d6a8fd116cfa7c295adeec6106913f87f0a43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Thu, 12 Apr 2018 10:39:51 +0200 Subject: [PATCH 3/5] window-list: Handle no overrides settings We can only know about override settings that are provided by the upstream GNOME or GNOME Classic sessions, but not any custom sessions created by admins, users or distributions. Handle that case by falling back to the original settings. https://gitlab.gnome.org/GNOME/gnome-shell-extensions/issues/62 --- extensions/window-list/extension.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js index 760ba152..37628fa7 100644 --- a/extensions/window-list/extension.js +++ b/extensions/window-list/extension.js @@ -888,7 +888,7 @@ class WindowList { } _getWorkspaceSettings() { - let settings = global.get_overrides_settings(); + let settings = global.get_overrides_settings() || this._mutterSettings; if (settings.list_keys().indexOf('workspaces-only-on-primary') > -1) return settings; return this._mutterSettings; From 3dc9f2e4ffd5c4212b4caf5607a7c3a805d78921 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Thu, 12 Apr 2018 11:03:56 +0200 Subject: [PATCH 4/5] cleanup: Use Array.includes() to check for element existence This is a relatively recent addition to the standard we can use where we don't care about the actual position of an element inside the array. (Array.includes() and Array.indexOf() do behave differently in edge cases, for example in the handling of NaN, but those don't matter to us) --- extensions/places-menu/placeDisplay.js | 4 ++-- extensions/window-list/extension.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/places-menu/placeDisplay.js b/extensions/places-menu/placeDisplay.js index 4fe6808f..3896b0c4 100644 --- a/extensions/places-menu/placeDisplay.js +++ b/extensions/places-menu/placeDisplay.js @@ -385,7 +385,7 @@ var PlacesManager = class { for(let j = 0; j < volumes.length; j++) { let identifier = volumes[j].get_identifier('class'); - if (identifier && identifier.indexOf('network') >= 0) { + if (identifier && identifier.includes('network')) { networkVolumes.push(volumes[j]); } else { let mount = volumes[j].get_mount(); @@ -402,7 +402,7 @@ var PlacesManager = class { continue; let identifier = volumes[i].get_identifier('class'); - if (identifier && identifier.indexOf('network') >= 0) { + if (identifier && identifier.includes('network')) { networkVolumes.push(volumes[i]); } else { let mount = volumes[i].get_mount(); diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js index 37628fa7..716a324a 100644 --- a/extensions/window-list/extension.js +++ b/extensions/window-list/extension.js @@ -882,14 +882,14 @@ class WindowList { } _getDynamicWorkspacesSettings() { - if (this._workspaceSettings.list_keys().indexOf('dynamic-workspaces') > -1) + if (this._workspaceSettings.list_keys().includes('dynamic-workspaces')) return this._workspaceSettings; return this._mutterSettings; } _getWorkspaceSettings() { let settings = global.get_overrides_settings() || this._mutterSettings; - if (settings.list_keys().indexOf('workspaces-only-on-primary') > -1) + if (settings.list_keys().includes('workspaces-only-on-primary')) return settings; return this._mutterSettings; } From 6746061898376ff39dd8034c22469d1ce4aadf9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Fri, 13 Apr 2018 20:30:56 +0200 Subject: [PATCH 5/5] Bump version to 3.28.1 Update NEWS. --- NEWS | 10 ++++++++++ meson.build | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 37f3444f..d8fcc2f5 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,13 @@ +3.28.1 +====== +* Misc. bug fixes [Xiaoguang, Florian; #59, #62] + +Contributors: + Florian Müllner, Xiaoguang Wang + +Translators: + Dz Chen [zh_CN] + 3.28.0 ====== diff --git a/meson.build b/meson.build index 22f1839a..40a82756 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('gnome-shell-extensions', - version: '3.28.0', + version: '3.28.1', meson_version: '>= 0.44.0', license: 'GPL2+' )