Merging upstream version 20230618.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

8 files changed, 260 insertions, 89 deletions

diff --git a/extensions/hibernate-status/Makefile b/extensions/hibernate-status/Makefile
index 3378024..80f5796 100644
--- a/extensions/hibernate-status/Makefile
+++ b/extensions/hibernate-status/Makefile
@@ -52,8 +52,7 @@ install-local: _build
 	cp -r ./_build/* $(INSTALLBASE)/$(INSTALLNAME)/
 ifeq ($(INSTALLTYPE),system)
 	# system-wide settings and locale files
-	# rm -r $(INSTALLBASE)/$(INSTALLNAME)/schemas
-	rm -f $(INSTALLBASE)/$(INSTALLNAME)/schemas/*gschema.xml
+	rm -r $(INSTALLBASE)/$(INSTALLNAME)/schemas
 	rm -r $(INSTALLBASE)/$(INSTALLNAME)/locale
 	mkdir -p $(SHARE_PREFIX)/glib-2.0/schemas $(SHARE_PREFIX)/locale
 	cp -r ./schemas/*gschema.* $(SHARE_PREFIX)/glib-2.0/schemas
diff --git a/extensions/hibernate-status/locale/bg/LC_MESSAGES/hibernate-status-button.po b/extensions/hibernate-status/locale/bg/LC_MESSAGES/hibernate-status-button.po
new file mode 100644
index 0000000..689fee9
--- /dev/null
+++ b/extensions/hibernate-status/locale/bg/LC_MESSAGES/hibernate-status-button.po
@@ -0,0 +1,75 @@
+# Bulgarian translation of hibernate-status-button
+# Copyright (C) 2023 Zetta1 Reid0
+# This file is distributed under the same license as the hibernate-status-button package.
+# Zetta1 Reid0, 2023.
+#
+
+msgid ""
+msgstr ""
+"Project-Id-Version: Hibernate Status Button\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 17.03.2023 12:41+0200\n"
+"PO-Revision-Date: 17.03.2023 12:41+0200\n"
+"Last-Translator: Zetta1 Reid0\n"
+"Language-Team: Bulgarian\n"
+"Language: bg\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n"
+"X-Generator: Poedit 3.0\n"
+"X-Poedit-Basepath: .\n"
+
+#: extension.js:189 confirmDialog.js:23 confirmDialog.js:32
+msgid "Hibernate"
+msgstr "Хиберниране"
+
+#: extension.js:192
+msgid "Hybrid Sleep"
+msgstr "Хибридно Приспиване"
+
+#: confirmDialog.js:24
+msgid "Do you really want to hibernate the system?"
+msgstr "Наистина ли искате да хибернирате системата?"
+
+#: confirmDialog.js:27 confirmDialog.js:44 confirmDialog.js:67
+msgid "Cancel"
+msgstr "Отказ"
+
+#: confirmDialog.js:40
+msgid "Hibernate button: Systemd Missing"
+msgstr "Бутон за Хибернация: Systemd Липсва."
+
+#: confirmDialog.js:41
+msgid "Systemd seems to be missing and is required."
+msgstr "Systemd изглежда че липсва, а е задължително."
+
+#: confirmDialog.js:49 confirmDialog.js:72
+msgid "Disable Extension"
+msgstr "Изключване на Разширението"
+
+#: confirmDialog.js:58
+msgid "Hibernate button: Hibernate failed"
+msgstr "Бутон за Хибернация: Хибернирането се провали."
+
+#: confirmDialog.js:59
+msgid ""
+"Looks like hibernation failed.\n"
+"On some linux distributions hibernation is disabled\n"
+"because not all hardware supports it well;\n"
+"please check your distribution documentation\n"
+"on how to enable it."
+msgstr ""
+"Изглежда че Хибернацията се провали.\n"
+"На някой Линукс дистрибуции хибернирането е изключено,\n"
+"защото не всеки хардуер го поддържа добре.\n"
+"Моля проверете документацията на вашата дистрибуция\n"
+"за това как да я включите"
+
+#: confirmDialog.js:64
+msgid "You are wrong, don't check this anymore!"
+msgstr "Вие сте в грешка, Не проверявайте това повече!"
+
+#: prefs.js:99
+msgid "This extension has no settings available"
+msgstr "Това разширение няма налични настройки."
diff --git a/extensions/hibernate-status/locale/hu/LC_MESSAGES/hibernate-status-button.po b/extensions/hibernate-status/locale/hu/LC_MESSAGES/hibernate-status-button.po
new file mode 100644
index 0000000..70da5aa
--- /dev/null
+++ b/extensions/hibernate-status/locale/hu/LC_MESSAGES/hibernate-status-button.po
@@ -0,0 +1,72 @@
+# Hungarian translation of hibernate-status-button
+# Copyright (C) 2023 ViBE
+# This file is distributed under the same license as the hibernate-status-button package.
+# ViBE <vibe@protonmail.com>, 2023.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Hibernate Status Button\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-04-11 18:31+0200\n"
+"PO-Revision-Date: 2023-02-25 00:00+0100\n"
+"Last-Translator: ViBE <vibe@protonmail.com>\n"
+"Language-Team: Hungarian <vibe@protonmail.com>\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"X-Generator: Gtranslator 41.0\n"
+
+#: confirmDialog.js:23 confirmDialog.js:32
+msgid "Hibernate"
+msgstr "Hibernálás"
+
+#: extension.js:192
+msgid "Hybrid Sleep"
+msgstr "Hibrid felfüggesztés"
+
+#: confirmDialog.js:24
+msgid "Do you really want to hibernate the system?"
+msgstr "Valóban hibernálni szeretné a rendszert?"
+
+#: confirmDialog.js:27 confirmDialog.js:44 confirmDialog.js:67
+msgid "Cancel"
+msgstr "Mégse"
+
+#: confirmDialog.js:40
+msgid "Hibernate button: Systemd Missing"
+msgstr "Hibernate button: systemd nem található"
+
+#: confirmDialog.js:41
+msgid "Systemd seems to be missing and is required."
+msgstr "Úgy tűnik, hogy a hibernáláshoz szükséges systemd nincs telepítve."
+
+#: confirmDialog.js:49 confirmDialog.js:72
+msgid "Disable Extension"
+msgstr "Kiterjesztés letiltása"
+
+#: confirmDialog.js:58
+msgid "Hibernate button: Hibernate failed"
+msgstr "Hibernate button: Hibernálás meghiúsult"
+
+#: confirmDialog.js:59
+msgid ""
+"Looks like hibernation failed.\n"
+"On some linux distributions hibernation is disabled\n"
+"because not all hardware supports it well;\n"
+"please check your distribution documentation\n"
+"on how to enable it."
+msgstr ""
+"Úgy tűnik, hogy a hibernálás sikertelen volt.\n"
+"Egyes Linux kiadások nem támogatják ezt a funkciót,\n"
+"mert nem minden eszköz támogatja a hibernálást;\n"
+"engedélyezéshez ellenőrizze a rendszer dokumentációját!"
+
+#: confirmDialog.js:64
+msgid "You are wrong, don't check this anymore!"
+msgstr "Ne ellenőrizd ezt többet!"
+
+#: prefs.js:99
+msgid "This extension has no settings available"
+msgstr "Ennek a kiterjesztésnek nincsenek beállításai"
diff --git a/extensions/hibernate-status/locale/nl/LC_MESSAGES/hibernate-status-button.po b/extensions/hibernate-status/locale/nl/LC_MESSAGES/hibernate-status-button.po
index 6853171..3146d8a 100644
--- a/extensions/hibernate-status/locale/nl/LC_MESSAGES/hibernate-status-button.po
+++ b/extensions/hibernate-status/locale/nl/LC_MESSAGES/hibernate-status-button.po
@@ -1,68 +1,72 @@
-# Nederlands translation of hibernate-status-button

-# Copyright (C) 2021 tebaranowski

-# This file is distributed under the same license as the hibernate-status-button package.

-# tebaranowski <tomasz.baranowski@int.pl>, 2021.

-#

-msgid ""

-msgstr ""

-"Project-Id-Version: Hibernate Status Button\n"

-"Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2021-04-11 18:31+0200\n"

-"PO-Revision-Date: 2021-09-13 17:56+0200\n"

-"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"

-"Language-Team: Dutch <vistausss@fastmail.com>\n"

-"Language: nl\n"

-"MIME-Version: 1.0\n"

-"Content-Type: text/plain; charset=UTF-8\n"

-"Content-Transfer-Encoding: 8bit\n"

-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n"

-"X-Generator: Poedit 3.0\n"

-

-#: confirmDialog.js:23 confirmDialog.js:32

-msgid "Hibernate"

-msgstr "Slaapstand"

-

-#: confirmDialog.js:24

-msgid "Do you really want to hibernate the system?"

-msgstr "Weet u zeker dat u het systeem in de slaapstand wilt zetten?"

-

-#: confirmDialog.js:27 confirmDialog.js:44 confirmDialog.js:67

-msgid "Cancel"

-msgstr "Annuleren"

-

-#: confirmDialog.js:40

-msgid "Hibernate button: Systemd Missing"

-msgstr "Slaapstandknop: Systemd ontbreekt"

-

-#: confirmDialog.js:41

-msgid "Systemd seems to be missing and is required."

-msgstr "Systemd is vereist, maar niet aangetroffen."

-

-#: confirmDialog.js:49 confirmDialog.js:72

-msgid "Disable Extension"

-msgstr "Uitbreiding uitschakelen"

-

-#: confirmDialog.js:58

-msgid "Hibernate button: Hibernate failed"

-msgstr "Slaapstandknop: slaapstand mislukt"

-

-#: confirmDialog.js:59

-msgid ""

-"Looks like hibernation failed.\n"

-"On some linux distributions hibernation is disabled\n"

-"because not all hardware supports it well;\n"

-"please check your distribution documentation\n"

-"on how to enable it."

-msgstr ""

-"Het lijkt er op dat de slaapstand niet kan worden ingeschakeld.\n"

-"Op sommige distributies is de slaapstand niet beschikbaar.\n"

-"Neem de documentatie van uw distributie door om te\n"

-"zien of u de slaapstand kunt activeren."

-

-#: confirmDialog.js:64

-msgid "You are wrong, don't check this anymore!"

-msgstr "Dit klopt niet - negeer deze controle!"

-

-#: prefs.js:99

-msgid "This extension has no settings available"

-msgstr "Deze uitbreiding bevat geen voorkeurenscherm"

+# Nederlands translation of hibernate-status-button
+# Copyright (C) 2021 tebaranowski
+# This file is distributed under the same license as the hibernate-status-button package.
+# tebaranowski <tomasz.baranowski@int.pl>, 2021.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Hibernate Status Button\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-04-11 18:31+0200\n"
+"PO-Revision-Date: 2021-09-13 17:56+0200\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <vistausss@fastmail.com>\n"
+"Language: nl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n"
+"X-Generator: Poedit 3.0\n"
+
+#: confirmDialog.js:23 confirmDialog.js:32
+msgid "Hibernate"
+msgstr "Slaapstand"
+
+#: extension.js:192
+msgid "Hybrid Sleep"
+msgstr "Hybride slaapstand"
+
+#: confirmDialog.js:24
+msgid "Do you really want to hibernate the system?"
+msgstr "Weet u zeker dat u het systeem in de slaapstand wilt zetten?"
+
+#: confirmDialog.js:27 confirmDialog.js:44 confirmDialog.js:67
+msgid "Cancel"
+msgstr "Annuleren"
+
+#: confirmDialog.js:40
+msgid "Hibernate button: Systemd Missing"
+msgstr "Slaapstandknop: Systemd ontbreekt"
+
+#: confirmDialog.js:41
+msgid "Systemd seems to be missing and is required."
+msgstr "Systemd is vereist, maar niet aangetroffen."
+
+#: confirmDialog.js:49 confirmDialog.js:72
+msgid "Disable Extension"
+msgstr "Uitbreiding uitschakelen"
+
+#: confirmDialog.js:58
+msgid "Hibernate button: Hibernate failed"
+msgstr "Slaapstandknop: slaapstand mislukt"
+
+#: confirmDialog.js:59
+msgid ""
+"Looks like hibernation failed.\n"
+"On some linux distributions hibernation is disabled\n"
+"because not all hardware supports it well;\n"
+"please check your distribution documentation\n"
+"on how to enable it."
+msgstr ""
+"Het lijkt er op dat de slaapstand niet kan worden ingeschakeld.\n"
+"Op sommige distributies is de slaapstand niet beschikbaar.\n"
+"Neem de documentatie van uw distributie door om te\n"
+"zien of u de slaapstand kunt activeren."
+
+#: confirmDialog.js:64
+msgid "You are wrong, don't check this anymore!"
+msgstr "Dit klopt niet - negeer deze controle!"
+
+#: prefs.js:99
+msgid "This extension has no settings available"
+msgstr "Deze uitbreiding bevat geen voorkeurenscherm"
diff --git a/extensions/hibernate-status/locale/ru/LC_MESSAGES/hibernate-status-button.po b/extensions/hibernate-status/locale/ru/LC_MESSAGES/hibernate-status-button.po
index c279315..c55e2c6 100644
--- a/extensions/hibernate-status/locale/ru/LC_MESSAGES/hibernate-status-button.po
+++ b/extensions/hibernate-status/locale/ru/LC_MESSAGES/hibernate-status-button.po
@@ -1,15 +1,17 @@
 # Russian translation of hibernate-status-button
 # Copyright (C) 2021 Serhii Riznychenko
+# Updated 2023 Dmitriy Sevastyuk
 # This file is distributed under the same license as the hibernate-status-button package.
 # Serhii Riznychenko, 2021.
+# Dmitriy Sevastyuk, 2023.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Hibernate Status Button\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-04-11 18:31+0200\n"
-"PO-Revision-Date: 2021-11-11 02:00+0200\n"
-"Last-Translator: Serhii Riznychenko\n"
+"PO-Revision-Date: 2023-04-01 07:00+0300\n"
+"Last-Translator: Dmitriy Sevastyuk\n"
 "Language-Team: Russian\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
@@ -21,7 +23,7 @@ msgstr ""
 
 #: extension.js:189 confirmDialog.js:23 confirmDialog.js:32
 msgid "Hibernate"
-msgstr "Спящий режим"
+msgstr "Режим гибернации"
 
 #: extension.js:192
 msgid "Hybrid Sleep"
@@ -29,7 +31,7 @@ msgstr "Гибридный сон"
 
 #: confirmDialog.js:24
 msgid "Do you really want to hibernate the system?"
-msgstr "Вы действительно хотите перевести систему в спящий режим?"
+msgstr "Вы действительно хотите перевести систему в режим гибернации?"
 
 #: confirmDialog.js:27 confirmDialog.js:44 confirmDialog.js:67
 msgid "Cancel"
@@ -41,7 +43,7 @@ msgstr "Не обнаружено systemd"
 
 #: confirmDialog.js:41
 msgid "Systemd seems to be missing and is required."
-msgstr "Кажется отсутствует systemd, необходимый для режима сна."
+msgstr "Кажется отсутствует systemd, но он необходим."
 
 #: confirmDialog.js:49 confirmDialog.js:72
 msgid "Disable Extension"
@@ -49,7 +51,7 @@ msgstr "Отключить расширение"
 
 #: confirmDialog.js:58
 msgid "Hibernate button: Hibernate failed"
-msgstr "Не удалось перевести систему в сон"
+msgstr "Не удалось перевести систему в режим гибернации"
 
 #: confirmDialog.js:59
 msgid ""
@@ -59,10 +61,10 @@ msgid ""
 "please check your distribution documentation\n"
 "on how to enable it."
 msgstr ""
-"Попытка перевести систему в сон завершилась неудачей.\n"
-"На некоторых дистрибутивах режим сна отключен\n"
-"так как не каждое оборудование имеет поддержку,\n"
-"пожалуйста обратитесь к документации своего дистрибутива\n"
+"Похоже, перевод системы в режим гибернации завершился неудачей.\n"
+"На некоторых дистрибутивах режим гибернации отключён,\n"
+"так как не всё оборудование должным образом его поддерживает;\n"
+"пожалуйста, обратитесь к документации своего дистрибутива\n"
 "чтобы узнать как его включить."
 
 #: confirmDialog.js:64
@@ -71,4 +73,4 @@ msgstr "Вы ошиблись, пожалуйста не трогайте это
 
 #: prefs.js:99
 msgid "This extension has no settings available"
-msgstr "Это расширение не содержит параметров"
+msgstr "Это расширение не имеет параметров"
diff --git a/extensions/hibernate-status/locale/zh_CN/LC_MESSAGES/hibernate-status-button.po b/extensions/hibernate-status/locale/zh_CN/LC_MESSAGES/hibernate-status-button.po
index be1a6b1..d6a6ebe 100644
--- a/extensions/hibernate-status/locale/zh_CN/LC_MESSAGES/hibernate-status-button.po
+++ b/extensions/hibernate-status/locale/zh_CN/LC_MESSAGES/hibernate-status-button.po
@@ -16,10 +16,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: confirmDialog.js:23 confirmDialog.js:32
+#: extension.js:189 confirmDialog.js:23 confirmDialog.js:32
 msgid "Hibernate"
 msgstr "休眠"
 
+#: extension.js:192
+msgid "Hybrid Sleep"
+msgstr "混合睡眠"
+
 #: confirmDialog.js:24
 msgid "Do you really want to hibernate the system?"
 msgstr "确定要休眠系统吗？"
@@ -57,3 +61,7 @@ msgstr "休眠好像失败了。由于不是所有硬件都对该功能支持良
 #: confirmDialog.js:64
 msgid "You are wrong, don't check this anymore!"
 msgstr "忽略本项检查"
+
+#: prefs.js:99
+msgid "This extension has no settings available"
+msgstr "这个扩展没有可用的设置"
\ No newline at end of file
diff --git a/extensions/hibernate-status/metadata.json b/extensions/hibernate-status/metadata.json
index 94098fe..0c05d48 100644
--- a/extensions/hibernate-status/metadata.json
+++ b/extensions/hibernate-status/metadata.json
@@ -4,7 +4,8 @@
   "url": "https://github.com/arelange/gnome-shell-extension-hibernate-status",
   "description": "Adds a Hibernate button in Status menu. Using Alt modifier, you can also select Hybrid Sleep instead.",
   "shell-version": [
-    "43"
+    "43",
+    "44"
   ],
   "gettext-domain": "hibernate-status-button"
 }
diff --git a/extensions/hibernate-status/prefs.js b/extensions/hibernate-status/prefs.js
index cdcd50e..83b5843 100644
--- a/extensions/hibernate-status/prefs.js
+++ b/extensions/hibernate-status/prefs.js
@@ -17,15 +17,25 @@ var Prefs = class Prefs {
         this.KEY_HIBERNATE_WORKS_CHECK = "hibernate-works-check";
         this._schemaName = "org.gnome.shell.extensions.hibernate-status-button";
 
-        let schemaDir = Me.dir.get_child('schemas').get_path();
+        // first try developer local schema
+        try {
+            let schemaDir = Me.dir.get_child('schemas').get_path();
 
-        let schemaSource = Gio.SettingsSchemaSource.new_from_directory(
-            schemaDir, Gio.SettingsSchemaSource.get_default(), false
-        );
-        let schema = schemaSource.lookup(this._schemaName, false);
+            let schemaSource = Gio.SettingsSchemaSource.new_from_directory(
+                schemaDir, Gio.SettingsSchemaSource.get_default(), false
+            );
+            let schema = schemaSource.lookup(this._schemaName, false);
+
+            this._setting = new Gio.Settings({
+                settings_schema: schema
+            });
+            return;
+        } catch (e) {
+            // now try system-wide one below
+        }
 
         this._setting = new Gio.Settings({
-            settings_schema: schema
+            schema_id: this._schemaName
         });
     }
     /**