From ea82830a9fdf42a067a50492e56dfda1d721fb17 Mon Sep 17 00:00:00 2001 From: Marco Ciampa Date: Wed, 6 Jul 2022 12:51:16 +0000 Subject: [PATCH 01/10] Update it.po, corrected the file-manager name File. --- po/it.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/it.po b/po/it.po index c3698a7b..ef0c5eab 100644 --- a/po/it.po +++ b/po/it.po @@ -80,7 +80,7 @@ msgstr "Dispositivi rimovibili" #: extensions/drive-menu/extension.js:171 msgid "Open Files" -msgstr "Apri file" +msgstr "Apri File" #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5 msgid "Use more screen for windows" From f637e81c8c19208d52bd8964a89082d335e972b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Sun, 10 Jul 2022 03:08:16 +0200 Subject: [PATCH 02/10] native-window-placement: Minor style fix JSDoc prefer "object" over "Object", so update the doc comment accordingly. --- extensions/native-window-placement/extension.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/native-window-placement/extension.js b/extensions/native-window-placement/extension.js index 7a4b4cf0..78d4c7ba 100644 --- a/extensions/native-window-placement/extension.js +++ b/extensions/native-window-placement/extension.js @@ -285,8 +285,8 @@ function enable() { } /** - * @param {Object} object - object that was modified - * @param {Object} injection - the map of previous injections + * @param {object} object - object that was modified + * @param {object} injection - the map of previous injections * @param {string} name - the @injection key that should be removed */ function removeInjection(object, injection, name) { From 0234cd74f78f86f64544a90abf183e5455fc3598 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Sun, 10 Jul 2022 14:23:57 +0200 Subject: [PATCH 03/10] Update sass submodule --- data/gnome-shell-sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/gnome-shell-sass b/data/gnome-shell-sass index 3b4f08fe..4697a3f0 160000 --- a/data/gnome-shell-sass +++ b/data/gnome-shell-sass @@ -1 +1 @@ -Subproject commit 3b4f08fe98d2943ea065d5e131f8e38f3203ccbf +Subproject commit 4697a3f0c66e4bfa0b4ca8dce95bf477456ddd8e From 14c60eb9549784d1eaf3e2e0b5dac9894e39a5c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Sun, 10 Jul 2022 14:33:17 +0200 Subject: [PATCH 04/10] Bump version to 43.alpha Update NEWS. --- NEWS | 9 +++++++++ meson.build | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 5457d17a..58d7dc86 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,12 @@ +43.alpha +======== + +Contributors: + Florian Müllner + +Translators: + Marco Ciampa [it] + 42.3 ==== * screenshot-window-sizer: Fix reported sizes on wayland [Florian; !232] diff --git a/meson.build b/meson.build index 25af71e0..44ed0bc9 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('gnome-shell-extensions', - version: '42.3', + version: '43.alpha', meson_version: '>= 0.53.0', license: 'GPL2+' ) From faaa66eb3f861cded6ea9f5c1f34692543833c9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Mon, 11 Jul 2022 00:06:21 +0200 Subject: [PATCH 05/10] ci: Don't define image globally This has been deprecated in favor of defining the default image in the default section. Part-of: --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9a9ba426..14da0c22 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,8 +2,6 @@ include: - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/bbe5232986c9b98eb1efe62484e07216f7d1a4df/templates/fedora.yml' - remote: "https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/6f86b8bcb0cd5168c32779c4fea9a893c4a0c046/templates/ci-fairy.yml" -image: registry.gitlab.gnome.org/gnome/gnome-shell/fedora/35:2022-02-18.0 - stages: - pre_review - prepare @@ -12,6 +10,7 @@ stages: - deploy default: + image: registry.gitlab.gnome.org/gnome/gnome-shell/fedora/35:2022-02-18.0 # Cancel jobs if newer commits are pushed to the branch interruptible: true # Auto-retry jobs in case of infra failures From bb5869f8dfc53cff148e2cf06d57e442cdcd9413 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Sun, 10 Jul 2022 23:04:08 +0200 Subject: [PATCH 06/10] ci: Instruct gitlab to checkout submodules ... instead of doing it in the script. This will become important when we switch to a CI image with an updated meson version that no longer checks out submodules as part of the dist command. Part-of: --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 14da0c22..a53e93fe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -132,8 +132,8 @@ fedora-build: stage: build needs: - build-fedora-container - before_script: - - git submodule update --init + variables: + GIT_SUBMODULE_STRATEGY: normal script: - meson setup build --werror -Dextension_set=all -Dclassic_mode=true - meson compile -C build @@ -150,8 +150,8 @@ fedora-dist: stage: deploy needs: - fedora-build - before_script: - - git submodule update --init + variables: + GIT_SUBMODULE_STRATEGY: normal script: - meson dist -C build rules: From 3c515d42f2c31d8e86b5fb59f9a5d6b9f648bed3 Mon Sep 17 00:00:00 2001 From: Nart Tlisha Date: Tue, 26 Jul 2022 10:45:41 +0000 Subject: [PATCH 07/10] Update Abkhazian translation --- po/ab.po | 99 ++++++++++++++++++++++++++++++-------------------------- 1 file changed, 53 insertions(+), 46 deletions(-) diff --git a/po/ab.po b/po/ab.po index 2c443e5d..e065d4e3 100644 --- a/po/ab.po +++ b/po/ab.po @@ -6,9 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: gnome-shell-extensions main\n" -"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/" -"issues\n" -"POT-Creation-Date: 2022-02-12 02:08+0000\n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/issues\n" +"POT-Creation-Date: 2022-07-10 12:54+0000\n" "PO-Revision-Date: 2022-02-12 02:08+0000\n" "Last-Translator: Нанба Наала , 2022\n" "Language-Team: Abkhazian \n" @@ -34,11 +33,11 @@ msgstr "Аклассикатә GNOME Wayland аҟны" msgid "GNOME Classic on Xorg" msgstr "Аклассикатә GNOME Xorg аҟны" -#: extensions/apps-menu/extension.js:112 +#: extensions/apps-menu/extension.js:118 msgid "Favorites" msgstr "Иалкаау" -#: extensions/apps-menu/extension.js:370 +#: extensions/apps-menu/extension.js:379 msgid "Applications" msgstr "Аԥшьқәа" @@ -50,29 +49,30 @@ msgstr "Аԥшьи аусуратә ҵакырақәа рыхьӡынҵеи" msgid "" "A list of strings, each containing an application id (desktop file name), " "followed by a colon and the workspace number" -msgstr "Ацәаҳәақәа рыхьӡынҵа аиԥшрагәаҭага аԥшьы (desktop-фаил ахьӡ )" -"змоу, зашьҭахь ҩ-кәаԥки аусуратә ҭыԥ аномери гылоу " +msgstr "" +"Ацәаҳәақәа рыхьӡынҵа аиԥшрагәаҭага аԥшьы (desktop-фаил ахьӡ )змоу, зашьҭахь " +"ҩ-кәаԥки аусуратә ҭыԥ аномери гылоу " -#: extensions/auto-move-windows/prefs.js:19 +#: extensions/auto-move-windows/prefs.js:152 msgid "Workspace Rules" msgstr "Аусуратә ҵакыра аԥҟаррақәа" -#: extensions/auto-move-windows/prefs.js:245 +#: extensions/auto-move-windows/prefs.js:306 msgid "Add Rule" msgstr "Аԥҟара ацҵара" #. TRANSLATORS: %s is the filesystem name -#: extensions/drive-menu/extension.js:123 +#: extensions/drive-menu/extension.js:126 #: extensions/places-menu/placeDisplay.js:210 #, javascript-format msgid "Ejecting drive “%s” failed:" msgstr "Адиск «%s» аҭыгара залымшахеит:" -#: extensions/drive-menu/extension.js:139 +#: extensions/drive-menu/extension.js:145 msgid "Removable devices" msgstr "Иаҿыҵуа аиҿартәырақәа" -#: extensions/drive-menu/extension.js:161 +#: extensions/drive-menu/extension.js:167 msgid "Open Files" msgstr "Афаил аартра" @@ -85,9 +85,11 @@ msgid "" "Try to use more screen for placing window thumbnails by adapting to screen " "aspect ratio, and consolidating them further to reduce the bounding box. " "This setting applies only with the natural placement strategy." -msgstr "Шәхы иашәырхәа изыцҵоу аекран аҵакыра аминиатиура атыԥаркразы" -"аекран аганқәа реизышәара ԥсахуа аҭыԥыркра шәыржәпала, анаҩс адаԥа ҳәаақәызҵо ашәагаа архәыҷразы" -"ари ахышәара ахархәара аиуоит аминиатиура «natural» аҭыԥыркра алгоритм ахархәараан" +msgstr "" +"Шәхы иашәырхәа изыцҵоу аекран аҵакыра аминиатиура атыԥаркразыаекран аганқәа " +"реизышәара ԥсахуа аҭыԥыркра шәыржәпала, анаҩс адаԥа ҳәаақәызҵо ашәагаа " +"архәыҷразыари ахышәара ахархәара аиуоит аминиатиура «natural» аҭыԥыркра " +"алгоритм ахархәараан" #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11 msgid "Place window captions on top" @@ -98,12 +100,13 @@ msgid "" "If true, place window captions on top the respective thumbnail, overriding " "shell default of placing it at the bottom. Changing this setting requires " "restarting the shell to have any effect." -msgstr "Иалхзар, ахқәа аминиатиура хыхьтәи ахәҭаҟны аҭыԥ ааныркылалоит" -"(ишыҟоу еиԥш ахқәа ҵаҟатәи аҭыԥ ааныркылоит).Ари ахышәара аԥсахраан," -"уи аус аура иалагарцазы, иаҭахуп Shell аиҭарура." +msgstr "" +"Иалхзар, ахқәа аминиатиура хыхьтәи ахәҭаҟны аҭыԥ ааныркылалоит(ишыҟоу еиԥш " +"ахқәа ҵаҟатәи аҭыԥ ааныркылоит).Ари ахышәара аԥсахраан,уи аус аура " +"иалагарцазы, иаҭахуп Shell аиҭарура." -#: extensions/places-menu/extension.js:88 -#: extensions/places-menu/extension.js:91 +#: extensions/places-menu/extension.js:94 +#: extensions/places-menu/extension.js:97 msgid "Places" msgstr "Аҭыԥқәа" @@ -166,27 +169,27 @@ msgstr "Аиҭашьақәыргылара" msgid "Maximize" msgstr "Аиҵыхра" -#: extensions/window-list/extension.js:434 +#: extensions/window-list/extension.js:483 msgid "Minimize all" msgstr "Зегьы реиҟәырҳәра" -#: extensions/window-list/extension.js:440 +#: extensions/window-list/extension.js:489 msgid "Unminimize all" msgstr "Зегьы рырхынҳәра" -#: extensions/window-list/extension.js:446 +#: extensions/window-list/extension.js:495 msgid "Maximize all" msgstr "Зегьы реиҵыхра" -#: extensions/window-list/extension.js:454 +#: extensions/window-list/extension.js:503 msgid "Unmaximize all" msgstr "Зегьы реиҭашьақәыргылара" -#: extensions/window-list/extension.js:462 +#: extensions/window-list/extension.js:511 msgid "Close all" msgstr "Зегьы рыркра" -#: extensions/window-list/extension.js:741 +#: extensions/window-list/extension.js:795 msgid "Window List" msgstr "Аԥенџьырқәа рыхьӡынҵа" @@ -198,18 +201,21 @@ msgstr "Аԥенџьырқәа аидыргәыԥлара анаҭаху" 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» — есқьынгьы" +msgstr "" +"Иҳәаақәнаҵоит, ианаҭаху ԥшьык иаҵанакуа аԥенџьырқәа реидыргәыԥлара, " +"аԥенџьырқәа рыхьӡынҵаҟны Иҟалар зылшо аҵакқәа : «never» — ахаан; «auto» — " +"автоматла; «always» — есқьынгьы" #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20 -#: extensions/window-list/prefs.js:76 +#: 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 msgid "Whether to show windows from all workspaces or only the current one." -msgstr -"Аԥенџьырқәа рыхьӡынҵа аусуратә ҵакырақәа зегь рҟынтә акәу,мамзар уажәтәи аҟынтә акәу ишаарԥшлатәу" +msgstr "" +"Аԥенџьырқәа рыхьӡынҵа аусуратә ҵакырақәа зегь рҟынтә акәу,мамзар уажәтәи " +"аҟынтә акәу ишаарԥшлатәу" #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:27 msgid "Show the window list on all monitors" @@ -219,43 +225,44 @@ msgstr "Аԥенџьырқәа рыхьӡынҵа амониторқәа зег msgid "" "Whether to show the window list on all connected monitors or only on the " "primary one." -msgstr -"Аԥенџьырқәа рыхьӡынҵа иаҿаку амониторқәа зегьы рыҟноума иахьаарԥшлатәу , мамзар ихадоу аҟны акәу." +msgstr "" +"Аԥенџьырқәа рыхьӡынҵа иаҿаку амониторқәа зегьы рыҟноума иахьаарԥшлатәу , " +"мамзар ихадоу аҟны акәу." -#: extensions/window-list/prefs.js:32 +#: extensions/window-list/prefs.js:35 msgid "Window Grouping" msgstr "Аԥенџьырқәа реидыргәыԥлара" -#: extensions/window-list/prefs.js:37 +#: extensions/window-list/prefs.js:40 msgid "Never group windows" msgstr "Ахаангьы аԥенџьырқәа реидмыргәыԥлара" -#: extensions/window-list/prefs.js:38 +#: extensions/window-list/prefs.js:41 msgid "Group windows when space is limited" msgstr "Аҭыԥ маҷхазар, аԥенџьырқәа еидшәыргәыԥла" -#: extensions/window-list/prefs.js:39 +#: extensions/window-list/prefs.js:42 msgid "Always group windows" msgstr "Еснагь аԥенџьырқәа реидыргәыԥлара" -#: extensions/window-list/prefs.js:63 +#: extensions/window-list/prefs.js:66 msgid "Show on all monitors" msgstr "Амониторқәа зегьы рҟны рырбара" -#: extensions/window-list/workspaceIndicator.js:249 -#: extensions/workspace-indicator/extension.js:254 +#: extensions/window-list/workspaceIndicator.js:261 +#: extensions/workspace-indicator/extension.js:266 msgid "Workspace Indicator" msgstr "Аусуратә ҵакыра аиндикатор" -#: extensions/workspace-indicator/prefs.js:18 -msgid "Workspace Names" -msgstr "Аусуратә ҵакырақәа рыхьӡқәа" - -#: extensions/workspace-indicator/prefs.js:39 +#: extensions/workspace-indicator/prefs.js:62 #, javascript-format msgid "Workspace %d" msgstr "Аусуратә ҵакыра %d" -#: extensions/workspace-indicator/prefs.js:184 +#: extensions/workspace-indicator/prefs.js:129 +msgid "Workspace Names" +msgstr "Аусуратә ҵакырақәа рыхьӡқәа" + +#: extensions/workspace-indicator/prefs.js:255 msgid "Add Workspace" msgstr "Аусуратә ҵакыра ацҵара" From c94678e2be29a355e35b19208b811abe56cb8fdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 10 Aug 2022 16:21:13 +0200 Subject: [PATCH 08/10] classic: Adjust to quick settings The aggregate menu has been replaced with quick settings. Adjust the session mode definition accordingly. Part-of: --- data/classic.json.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/classic.json.in b/data/classic.json.in index 6d2d3bd5..41976b69 100644 --- a/data/classic.json.in +++ b/data/classic.json.in @@ -6,6 +6,6 @@ "enabledExtensions": [@CLASSIC_EXTENSIONS@], "panel": { "left": ["appMenu"], "center": [], - "right": ["a11y", "keyboard", "dateMenu", "aggregateMenu"] + "right": ["a11y", "keyboard", "dateMenu", "quickSettings"] } } From 4f78bb96a75abdc16d23966fa541be375cce98c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 10 Aug 2022 19:55:18 +0200 Subject: [PATCH 09/10] Update sass submodule --- data/gnome-shell-sass | 2 +- data/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/gnome-shell-sass b/data/gnome-shell-sass index 4697a3f0..0f09f2ab 160000 --- a/data/gnome-shell-sass +++ b/data/gnome-shell-sass @@ -1 +1 @@ -Subproject commit 4697a3f0c66e4bfa0b4ca8dce95bf477456ddd8e +Subproject commit 0f09f2abc798e2878d95199d44a1d4464733a156 diff --git a/data/meson.build b/data/meson.build index 78d27824..9f4ed91b 100644 --- a/data/meson.build +++ b/data/meson.build @@ -69,12 +69,12 @@ theme_sources = files( 'gnome-shell-sass/widgets/_looking-glass.scss', 'gnome-shell-sass/widgets/_message-list.scss', 'gnome-shell-sass/widgets/_misc.scss', - 'gnome-shell-sass/widgets/_network-dialog.scss', 'gnome-shell-sass/widgets/_notifications.scss', 'gnome-shell-sass/widgets/_osd.scss', 'gnome-shell-sass/widgets/_overview.scss', 'gnome-shell-sass/widgets/_panel.scss', 'gnome-shell-sass/widgets/_popovers.scss', + 'gnome-shell-sass/widgets/_quick-settings.scss', 'gnome-shell-sass/widgets/_screen-shield.scss', 'gnome-shell-sass/widgets/_scrollbars.scss', 'gnome-shell-sass/widgets/_search-entry.scss', From d62b58b1d93cd316a08dc03f4165ed3049c26829 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 10 Aug 2022 19:56:17 +0200 Subject: [PATCH 10/10] Bump version to 43.beta Update NEWS. --- NEWS | 10 ++++++++++ meson.build | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 58d7dc86..1f9ca3c7 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,13 @@ +43.beta +======= +* Misc. bug fixes and cleanups [Florian; !237, !238] + +Contributors: + Florian Müllner + +Translators: + Nart Tlisha [ab] + 43.alpha ======== diff --git a/meson.build b/meson.build index 44ed0bc9..3c93e8bb 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('gnome-shell-extensions', - version: '43.alpha', + version: '43.beta', meson_version: '>= 0.53.0', license: 'GPL2+' )