diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 14:41:01 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 14:41:01 +0000 |
| commit | 1a2738532d1c95e1d48701628cd81ca96c267761 (patch) | |
| tree | a67781318e259d176e6d6d056501bc6a372a8453 /debian/patches | |
| parent | Adding upstream version 3.38.0. (diff) | |
| download | gnome-session-1a2738532d1c95e1d48701628cd81ca96c267761.tar.xz gnome-session-1a2738532d1c95e1d48701628cd81ca96c267761.zip | |
Adding debian version 3.38.0-4.debian/3.38.0-4debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches')
19 files changed, 1962 insertions, 0 deletions
diff --git a/debian/patches/Stop-dbus-daemon-instead-of-restarting-it.patch b/debian/patches/Stop-dbus-daemon-instead-of-restarting-it.patch new file mode 100644 index 0000000..0ebadd5 --- /dev/null +++ b/debian/patches/Stop-dbus-daemon-instead-of-restarting-it.patch @@ -0,0 +1,54 @@ +From: Simon McVittie <smcv@collabora.com> +Date: Thu, 3 Dec 2020 12:39:20 +0000 +Subject: Stop dbus-daemon instead of restarting it + +On systems where dbus-daemon is a systemd user service, it is always +socket-activatable, so it will be restarted on-demand by dbus.socket. +On systems where it is not, neither StopUnit nor TryRestartUnit will +do anything. Either way, there doesn't seem much point in immediately +restarting it. + +If the job contradicts jobs that are already queued, fail with a warning +instead of replacing those jobs. + +Related to #74. + +Signed-off-by: Simon McVittie <smcv@collabora.com> +Origin: upstream, 40, commit:d82db7c123d8b346834bd7680073d5ae1882868d +--- + gnome-session/gsm-manager.c | 4 ++-- + tools/gnome-session-ctl.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c +index 6839a02..a15d217 100644 +--- a/gnome-session/gsm-manager.c ++++ b/gnome-session/gsm-manager.c +@@ -977,8 +977,8 @@ maybe_restart_user_bus (GsmManager *manager) + "org.freedesktop.systemd1", + "/org/freedesktop/systemd1", + "org.freedesktop.systemd1.Manager", +- "TryRestartUnit", +- g_variant_new ("(ss)", "dbus.service", "replace"), ++ "StopUnit", ++ g_variant_new ("(ss)", "dbus.service", "fail"), + NULL, + G_DBUS_CALL_FLAGS_NONE, + -1, +diff --git a/tools/gnome-session-ctl.c b/tools/gnome-session-ctl.c +index 8d94f84..eb9d6b5 100644 +--- a/tools/gnome-session-ctl.c ++++ b/tools/gnome-session-ctl.c +@@ -127,10 +127,10 @@ do_restart_dbus (void) + SYSTEMD_DBUS, + SYSTEMD_PATH_DBUS, + SYSTEMD_INTERFACE_DBUS, +- "TryRestartUnit", ++ "StopUnit", + g_variant_new ("(ss)", + "dbus.service", +- "replace"), ++ "fail"), + NULL, + G_DBUS_CALL_FLAGS_NO_AUTO_START, + -1, NULL, &error); diff --git a/debian/patches/Update-Bengali-India-translation.patch b/debian/patches/Update-Bengali-India-translation.patch new file mode 100644 index 0000000..9ca875e --- /dev/null +++ b/debian/patches/Update-Bengali-India-translation.patch @@ -0,0 +1,96 @@ +From: Akarshan Biswas <akarshan.biswas@hotmail.com> +Date: Sun, 11 Oct 2020 07:20:04 +0000 +Subject: Update Bengali (India) translation + +Origin: upstream, 40, commit:449d42b9228927c9dd0fb6e6c40684dc705e9d9a +--- + po/bn_IN.po | 24 +++++++++++++++--------- + 1 file changed, 15 insertions(+), 9 deletions(-) + +diff --git a/po/bn_IN.po b/po/bn_IN.po +index 2053983..6bd3ddb 100644 +--- a/po/bn_IN.po ++++ b/po/bn_IN.po +@@ -13,17 +13,17 @@ msgid "" + msgstr "" + "Project-Id-Version: bn_IN\n" + "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-session/issues\n" +-"POT-Creation-Date: 2020-08-13 04:38+0000\n" +-"PO-Revision-Date: 2020-07-28 19:36+0530\n" ++"POT-Creation-Date: 2020-08-16 08:36+0000\n" ++"PO-Revision-Date: 2020-10-11 12:49+0530\n" + "Last-Translator: Akarshan Biswas <akarshan.biswas@hotmail.com>\n" +-"Language-Team: Bengali (India) <anubad@lists.ankur.org.in>\n" ++"Language-Team: Bengali <anubad@lists.ankur.org.in>\n" + "Language: bn_IN\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-DamnedLies-Scope: partial\n" +-"X-Generator: Gtranslator 3.36.0\n" ++"X-Generator: Gtranslator 3.38.0\n" + + # auto translated by TM merge from project: system-config-printer, version: 1.1.16-23, DocId: system-config-printer + #: data/gnome-custom-session.desktop.in.in:3 +@@ -58,27 +58,30 @@ msgstr "সেশন সংরক্ষণ করুন" + + #: data/org.gnome.SessionManager.gschema.xml.in:6 + msgid "If enabled, gnome-session will save the session automatically." +-msgstr "" ++msgstr "সক্ষম করা থাকলে, জিনোম-সেশনটি স্বয়ংক্রিয়ভাবে সেশনটি সংরক্ষণ করবে।" + + #: data/org.gnome.SessionManager.gschema.xml.in:10 +-#, fuzzy + #| msgid "Save sessions" + msgid "Save this session" +-msgstr "সেশন সংরক্ষণ করুন" ++msgstr "এই সেশন সংরক্ষণ করুন" + + #: data/org.gnome.SessionManager.gschema.xml.in:11 + msgid "" + "When enabled, gnome-session will automatically save the next session at log " + "out even if auto saving is disabled." + msgstr "" ++"সক্ষম করা থাকলে, স্বয়ংক্রিয় সংরক্ষণ অক্ষম থাকলেও জিনোম-সেশন লগ আউটে পরবর্তী সেশনটি " ++"স্বয়ংক্রিয়ভাবে সংরক্ষণ করবে।" + + #: data/org.gnome.SessionManager.gschema.xml.in:15 + msgid "Logout prompt" +-msgstr "" ++msgstr "লগআউট প্রম্পট" + + #: data/org.gnome.SessionManager.gschema.xml.in:16 + msgid "If enabled, gnome-session will prompt the user before ending a session." + msgstr "" ++"যদি সক্ষম করা থাকে, জিনোম-সেশনটি অধিবেশন শেষ করার আগে ব্যবহারকারীকে অনুরোধ " ++"জানাবে।" + + #: data/org.gnome.SessionManager.gschema.xml.in:20 + msgid "Show the fallback warning" +@@ -89,6 +92,8 @@ msgid "" + "If enabled, gnome-session will display a warning dialog after login if the " + "session was automatically fallen back." + msgstr "" ++"যদি সক্ষম করা থাকে, সেশনটি স্বয়ংক্রিয়ভাবে পিছনে পড়ে গেলে জিনোম-সেশন লগইন করার " ++"পরে একটি সতর্কতা ডায়ালগ প্রদর্শন করবে।" + + # auto translated by TM merge from project: gdm, version: 3.8.4, DocId: gdm + #: data/session-selector.ui:15 +@@ -154,7 +159,7 @@ msgstr "কোড ডিবাগ ব্যবস্থা সক্রিয় + + #: gnome-session/gsm-fail-whale-dialog.c:413 + msgid "Allow logout" +-msgstr "লগ অাউটের অনুমতি দিন" ++msgstr "লগ আউটের অনুমতি দিন" + + #: gnome-session/gsm-fail-whale-dialog.c:414 + msgid "Show extension warning" +@@ -266,6 +271,7 @@ msgstr "dbus.service চালু থাকলে পুনরায় চা + msgid "" + "Run from ExecStopPost to start gnome-session-failed.target on service failure" + msgstr "" ++"পরিষেবা ব্যর্থতায় gnome-session-failed.target শুরু করতে ExecStopPost থেকে চালান" + + #: tools/gnome-session-ctl.c:279 + msgid "Program needs exactly one parameter" diff --git a/debian/patches/Update-Chinese-Taiwan-translation.patch b/debian/patches/Update-Chinese-Taiwan-translation.patch new file mode 100644 index 0000000..3818d17 --- /dev/null +++ b/debian/patches/Update-Chinese-Taiwan-translation.patch @@ -0,0 +1,183 @@ +From: Cheng-Chia Tseng <pswo10680@gmail.com> +Date: Mon, 12 Oct 2020 13:03:10 +0000 +Subject: Update Chinese (Taiwan) translation + +Origin: upstream, 40, commit:5c5b48c4879ef076ea2dd0b73a12316c61066bfa +--- + po/zh_TW.po | 62 ++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 35 insertions(+), 27 deletions(-) + +diff --git a/po/zh_TW.po b/po/zh_TW.po +index 07aa77f..e796394 100644 +--- a/po/zh_TW.po ++++ b/po/zh_TW.po +@@ -16,8 +16,8 @@ msgid "" + msgstr "" + "Project-Id-Version: gnome-session 3.1.92\n" + "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-session/issues\n" +-"POT-Creation-Date: 2020-03-30 17:28+0000\n" +-"PO-Revision-Date: 2020-04-01 00:02+0800\n" ++"POT-Creation-Date: 2020-08-16 08:36+0000\n" ++"PO-Revision-Date: 2020-10-12 21:01+0800\n" + "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n" + "Language-Team: Chinese <zh-l10n@linux.org.tw>\n" + "Language: zh_TW\n" +@@ -25,7 +25,7 @@ msgstr "" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=1; plural=0;\n" +-"X-Generator: Poedit 2.3\n" ++"X-Generator: Poedit 2.4.1\n" + + #: data/gnome-custom-session.desktop.in.in:3 + msgid "Custom" +@@ -83,14 +83,15 @@ msgstr "如啟用本選項，gnome-session 會在作業階段終止前先提示 + + #: data/org.gnome.SessionManager.gschema.xml.in:20 + msgid "Show the fallback warning" +-msgstr "顯示回滾警告" ++msgstr "顯示後備警告" + + #: data/org.gnome.SessionManager.gschema.xml.in:21 + msgid "" + "If enabled, gnome-session will display a warning dialog after login if the " + "session was automatically fallen back." + msgstr "" +-"若啟用此選項，gnome-session 將會在工作階段自動回滾時，登入後顯示警告對話框。" ++"若啟用此選項，gnome-session 將會在工作階段自動退入後備時，於登入後顯示警告對" ++"話框。" + + #: data/session-selector.ui:15 + msgid "Custom Session" +@@ -116,23 +117,23 @@ msgstr "重新命名工作階段(_M)" + msgid "_Continue" + msgstr "繼續(_C)" + +-#: gnome-session/gsm-fail-whale-dialog.c:313 ++#: gnome-session/gsm-fail-whale-dialog.c:318 + msgid "Oh no! Something has gone wrong." + msgstr "糟糕！有些地方出問題了。" + +-#: gnome-session/gsm-fail-whale-dialog.c:320 ++#: gnome-session/gsm-fail-whale-dialog.c:325 + msgid "" + "A problem has occurred and the system can’t recover. Please contact a system " + "administrator" + msgstr "發生問題且系統無法恢復。請連絡系統管理者" + +-#: gnome-session/gsm-fail-whale-dialog.c:322 ++#: gnome-session/gsm-fail-whale-dialog.c:327 + msgid "" + "A problem has occurred and the system can’t recover. All extensions have " + "been disabled as a precaution." + msgstr "發生問題且系統無法恢復。為了預防已先停用所有的擴充功能。" + +-#: gnome-session/gsm-fail-whale-dialog.c:324 ++#: gnome-session/gsm-fail-whale-dialog.c:329 + msgid "" + "A problem has occurred and the system can’t recover.\n" + "Please log out and try again." +@@ -140,19 +141,19 @@ msgstr "" + "發生問題且系統無法恢復。\n" + "請登出後再試一次。" + +-#: gnome-session/gsm-fail-whale-dialog.c:339 ++#: gnome-session/gsm-fail-whale-dialog.c:344 + msgid "_Log Out" + msgstr "登出(_L)" + +-#: gnome-session/gsm-fail-whale-dialog.c:361 gnome-session/main.c:404 ++#: gnome-session/gsm-fail-whale-dialog.c:412 gnome-session/main.c:404 + msgid "Enable debugging code" + msgstr "啟用除錯碼" + +-#: gnome-session/gsm-fail-whale-dialog.c:362 ++#: gnome-session/gsm-fail-whale-dialog.c:413 + msgid "Allow logout" + msgstr "允許登出" + +-#: gnome-session/gsm-fail-whale-dialog.c:363 ++#: gnome-session/gsm-fail-whale-dialog.c:414 + msgid "Show extension warning" + msgstr "顯示擴充功能警告" + +@@ -236,26 +237,31 @@ msgstr "停用硬體加速檢查" + msgid " — the GNOME session manager" + msgstr " — GNOME 工作階段管理員" + +-#: tools/gnome-session-ctl.c:244 ++#: tools/gnome-session-ctl.c:245 + msgid "Start gnome-session-shutdown.target" + msgstr "啟動 gnome-session-shutdown.target" + +-#: tools/gnome-session-ctl.c:245 ++#: tools/gnome-session-ctl.c:246 + msgid "" + "Start gnome-session-shutdown.target when receiving EOF or a single byte on " + "stdin" + msgstr "" + "當在標準輸入接收到 EOF 或一個位元組時啟動 gnome-session-shutdown.target" + +-#: tools/gnome-session-ctl.c:246 ++#: tools/gnome-session-ctl.c:247 + msgid "Signal initialization done to gnome-session" +-msgstr "gnome-session 訊號初始化完成" ++msgstr "訊號初始化完成給 gnome-session" + +-#: tools/gnome-session-ctl.c:247 ++#: tools/gnome-session-ctl.c:248 + msgid "Restart dbus.service if it is running" +-msgstr "在其執行時重新啟動 dbus.service" ++msgstr "如果 dbus.service 正在執行則重新啟動" ++ ++#: tools/gnome-session-ctl.c:249 ++msgid "" ++"Run from ExecStopPost to start gnome-session-failed.target on service failure" ++msgstr "在服務失敗後從 ExecStopPost 執行以啟動 gnome-session-failed.target" + +-#: tools/gnome-session-ctl.c:275 ++#: tools/gnome-session-ctl.c:279 + msgid "Program needs exactly one parameter" + msgstr "程式明確指出需要一個參數" + +@@ -274,31 +280,33 @@ msgid "" + " --inhibit ARG Things to inhibit, colon-separated list of:\n" + " logout, switch-user, suspend, idle, automount\n" + " --inhibit-only Do not launch COMMAND and wait forever instead\n" ++" -l, --list List the existing inhibitions, and exit\n" + "\n" + "If no --inhibit option is specified, idle is assumed.\n" + msgstr "" + "%s [OPTION…] COMMAND\n" + "\n" +-"抑制某些工作階段功能的同時執行 COMMAND 。\n" ++"抑制工作階段的某些功能的同時執行 COMMAND 。\n" + "\n" + " -h, --help 顯示這個求助文件\n" + " --version 顯示程式版本\n" + " --app-id ID 抑制時要使用的\n" +-" 應用程式 id (選擇性)\n" +-" --reason REASON 抑制的原因 (選擇性)\n" +-" --inhibit ARG 要抑制的東西，以冒號分隔的清單：\n" ++" 應用程式 id (選填)\n" ++" --reason REASON 抑制的原因 (選填)\n" ++" --inhibit ARG 要抑制的項目，以冒號分隔的清單：\n" + " logout, switch-user, suspend, idle, automount\n" + " --inhibit-only 不要執行 COMMAND 而以等待來取代\n" ++" -l, --list 列出既有的抑制並離開\n" + "\n" + "如果沒有指定 --inhibit 選項，會假定為 idle。\n" + +-#: tools/gnome-session-inhibit.c:146 ++#: tools/gnome-session-inhibit.c:288 + #, c-format + msgid "Failed to execute %s\n" + msgstr "無法執行 %s\n" + +-#: tools/gnome-session-inhibit.c:206 tools/gnome-session-inhibit.c:216 +-#: tools/gnome-session-inhibit.c:226 ++#: tools/gnome-session-inhibit.c:352 tools/gnome-session-inhibit.c:362 ++#: tools/gnome-session-inhibit.c:372 + #, c-format + msgid "%s requires an argument\n" + msgstr "%s 需要引數\n" diff --git a/debian/patches/Update-Dutch-translation.patch b/debian/patches/Update-Dutch-translation.patch new file mode 100644 index 0000000..047298d --- /dev/null +++ b/debian/patches/Update-Dutch-translation.patch @@ -0,0 +1,247 @@ +From: Nathan Follens <nfollens@gnome.org> +Date: Mon, 14 Sep 2020 05:54:21 +0000 +Subject: Update Dutch translation + +Origin: upstream, 40, commit:cc932bdbaa91f3f7e3fb6f7d9d9ab421f9d1a337 +--- + po/nl.po | 82 ++++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 46 insertions(+), 36 deletions(-) + +diff --git a/po/nl.po b/po/nl.po +index 92f3a5c..5c5627c 100644 +--- a/po/nl.po ++++ b/po/nl.po +@@ -18,14 +18,14 @@ + # Reinout van Schouwen <reinouts@gnome.org>, 2003, 2013. (na 10 jaar!). + # Tino Meinen <a.t.meinen@chello.nl> 2005, 2006, 2008. + # Wouter Bolsterlee <wbolster@gnome.org>, 2007–2013. +-# Nathan Follens <nthn@unseen.is>, 2015-2017, 2019. ++# Nathan Follens <nthn@unseen.is>, 2015-2017, 2019-2020. + # Hannie Dumoleyn <hannie@ubuntu-nl.org>, 2015, 2018. + msgid "" + msgstr "" + "Project-Id-Version: gnome-session\n" + "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-session/issues\n" +-"POT-Creation-Date: 2019-09-18 13:36+0000\n" +-"PO-Revision-Date: 2019-09-25 13:13+0200\n" ++"POT-Creation-Date: 2020-07-31 14:02+0000\n" ++"PO-Revision-Date: 2020-08-25 17:26+0200\n" + "Last-Translator: Nathan Follens <nthn@unseen.is>\n" + "Language-Team: Dutch <gnome-nl-list@gnome.org>\n" + "Language: nl\n" +@@ -33,7 +33,7 @@ msgstr "" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=2; plural=(n != 1);\n" +-"X-Generator: Poedit 2.2.3\n" ++"X-Generator: Poedit 2.4.1\n" + + #: data/gnome-custom-session.desktop.in.in:3 + msgid "Custom" +@@ -127,11 +127,11 @@ msgstr "Sessie _hernoemen" + msgid "_Continue" + msgstr "_Doorgaan" + +-#: gnome-session/gsm-fail-whale-dialog.c:313 ++#: gnome-session/gsm-fail-whale-dialog.c:318 + msgid "Oh no! Something has gone wrong." + msgstr "Oeps! Er is iets misgegaan." + +-#: gnome-session/gsm-fail-whale-dialog.c:320 ++#: gnome-session/gsm-fail-whale-dialog.c:325 + msgid "" + "A problem has occurred and the system can’t recover. Please contact a system " + "administrator" +@@ -139,7 +139,7 @@ msgstr "" + "Er is een probleem opgetreden dat niet door het systeem kan worden hersteld. " + "Neem contact op met een systeembeheerder" + +-#: gnome-session/gsm-fail-whale-dialog.c:322 ++#: gnome-session/gsm-fail-whale-dialog.c:327 + msgid "" + "A problem has occurred and the system can’t recover. All extensions have " + "been disabled as a precaution." +@@ -147,7 +147,7 @@ msgstr "" + "Er is een probleem opgetreden dat niet door het systeem kan worden hersteld. " + "Alle uitbreidingen zijn uit voorzorg uitgeschakeld." + +-#: gnome-session/gsm-fail-whale-dialog.c:324 ++#: gnome-session/gsm-fail-whale-dialog.c:329 + msgid "" + "A problem has occurred and the system can’t recover.\n" + "Please log out and try again." +@@ -156,27 +156,27 @@ msgstr "" + "hersteld.\n" + "Probeer af te melden en opnieuw aan te melden." + +-#: gnome-session/gsm-fail-whale-dialog.c:339 ++#: gnome-session/gsm-fail-whale-dialog.c:344 + msgid "_Log Out" + msgstr "_Afmelden" + +-#: gnome-session/gsm-fail-whale-dialog.c:361 gnome-session/main.c:396 ++#: gnome-session/gsm-fail-whale-dialog.c:412 gnome-session/main.c:404 + msgid "Enable debugging code" + msgstr "Debugging-code inschakelen" + +-#: gnome-session/gsm-fail-whale-dialog.c:362 ++#: gnome-session/gsm-fail-whale-dialog.c:413 + msgid "Allow logout" + msgstr "Afmelden toestaan" + +-#: gnome-session/gsm-fail-whale-dialog.c:363 ++#: gnome-session/gsm-fail-whale-dialog.c:414 + msgid "Show extension warning" + msgstr "Waarschuwingen van uitbreidingen tonen" + +-#: gnome-session/gsm-manager.c:1289 gnome-session/gsm-manager.c:1994 ++#: gnome-session/gsm-manager.c:1289 gnome-session/gsm-manager.c:1999 + msgid "Not responding" + msgstr "Reageert niet" + +-#: gnome-session/gsm-util.c:389 ++#: gnome-session/gsm-util.c:415 + msgid "_Log out" + msgstr "_Afmelden" + +@@ -207,61 +207,61 @@ msgstr "" + msgid "Could not create ICE listening socket: %s" + msgstr "Kon geen luister-socket voor ICE aanmaken: %s" + +-#: gnome-session/main.c:390 ++#: gnome-session/main.c:398 + msgid "Running as systemd service" + msgstr "Draait als systemd-dienst" + +-#: gnome-session/main.c:391 ++#: gnome-session/main.c:399 + msgid "Use systemd session management" + msgstr "Systemd-sessiebeheer gebruiken" + +-#: gnome-session/main.c:393 ++#: gnome-session/main.c:401 + msgid "Use builtin session management (rather than the systemd based one)" + msgstr "" + "Ingebouwd sessiebeheer gebruiken (in plaats van dat gebaseerd op systemd)" + +-#: gnome-session/main.c:394 ++#: gnome-session/main.c:402 + msgid "Override standard autostart directories" + msgstr "Map voor automatisch te starten toepassingen" + +-#: gnome-session/main.c:394 ++#: gnome-session/main.c:402 + msgid "AUTOSTART_DIR" + msgstr "AUTOSTART_MAP" + +-#: gnome-session/main.c:395 ++#: gnome-session/main.c:403 + msgid "Session to use" + msgstr "Te gebruiken sessie" + +-#: gnome-session/main.c:395 ++#: gnome-session/main.c:403 + msgid "SESSION_NAME" + msgstr "NAAM_VAN_SESSIE" + +-#: gnome-session/main.c:397 ++#: gnome-session/main.c:405 + msgid "Do not load user-specified applications" + msgstr "Toepassingen die door de gebruiker opgegeven zijn niet laden" + +-#: gnome-session/main.c:398 ++#: gnome-session/main.c:406 + msgid "Version of this application" + msgstr "Versie van deze toepassing" + + #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong +-#: gnome-session/main.c:400 ++#: gnome-session/main.c:408 + msgid "Show the fail whale dialog for testing" + msgstr "Het misvis-venster tonen voor testen" + +-#: gnome-session/main.c:401 ++#: gnome-session/main.c:409 + msgid "Disable hardware acceleration check" + msgstr "Hardwareversnellingscontrole uitschakelen" + +-#: gnome-session/main.c:433 ++#: gnome-session/main.c:441 + msgid " — the GNOME session manager" + msgstr " — het Gnome-sessiebeheer" + +-#: tools/gnome-session-ctl.c:244 ++#: tools/gnome-session-ctl.c:245 + msgid "Start gnome-session-shutdown.target" + msgstr "Start gnome-session-shutdown.target" + +-#: tools/gnome-session-ctl.c:245 ++#: tools/gnome-session-ctl.c:246 + msgid "" + "Start gnome-session-shutdown.target when receiving EOF or a single byte on " + "stdin" +@@ -269,15 +269,22 @@ msgstr "" + "Start gnome-session-shutdown.target wanneer EOF of een enkele byte ontvangen " + "wordt op stdin" + +-#: tools/gnome-session-ctl.c:246 ++#: tools/gnome-session-ctl.c:247 + msgid "Signal initialization done to gnome-session" + msgstr "Voltooiing van initialisering doorgeven aan gnome-session" + +-#: tools/gnome-session-ctl.c:247 ++#: tools/gnome-session-ctl.c:248 + msgid "Restart dbus.service if it is running" +-msgstr "Herstart dbus.dienst indien het draait" ++msgstr "Herstart dbus.service indien het draait" + +-#: tools/gnome-session-ctl.c:275 ++#: tools/gnome-session-ctl.c:249 ++msgid "" ++"Run from ExecStopPost to start gnome-session-failed.target on service failure" ++msgstr "" ++"Uitvoeren van ExecStopPost om gnome-session-failed.target te starten bij " ++"dienstfout" ++ ++#: tools/gnome-session-ctl.c:279 + msgid "Program needs exactly one parameter" + msgstr "Programma vereist precies één parameter" + +@@ -296,13 +303,15 @@ msgid "" + " --inhibit ARG Things to inhibit, colon-separated list of:\n" + " logout, switch-user, suspend, idle, automount\n" + " --inhibit-only Do not launch COMMAND and wait forever instead\n" ++" -l, --list List the existing inhibitions, and exit\n" + "\n" + "If no --inhibit option is specified, idle is assumed.\n" + msgstr "" + "%s [OPTIE…] OPDRACHT\n" + "\n" + "Functionaliteit van de sessie uitschakelen tijdens het uitvoeren\n" +-"van de opgegeven opdracht.\n" ++"van de opgegeven OPDRACHT.\n" ++"\n" + " -h, --help Deze uitleg tonen\n" + " --version Programmaversie tonen\n" + " --app-id ID Te gebruiken toepassings-id (optioneel)\n" +@@ -312,16 +321,17 @@ msgstr "" + " punten gescheiden opsomming van:\n" + " logout, switch-user, suspend, idle, automount\n" + " --inhibit-only OPDRACHT niet uitvoeren, maar alleen wachten\n" ++" -l, --list Lijst de bestaande inhibities op, en sluit af\n" + "\n" + "Als ‘--inhibit’ niet opgegeven wordt, wordt alleen ‘idle’ gebruikt.\n" + +-#: tools/gnome-session-inhibit.c:146 ++#: tools/gnome-session-inhibit.c:288 + #, c-format + msgid "Failed to execute %s\n" + msgstr "Fout bij uitvoeren van %s\n" + +-#: tools/gnome-session-inhibit.c:206 tools/gnome-session-inhibit.c:216 +-#: tools/gnome-session-inhibit.c:226 ++#: tools/gnome-session-inhibit.c:352 tools/gnome-session-inhibit.c:362 ++#: tools/gnome-session-inhibit.c:372 + #, c-format + msgid "%s requires an argument\n" + msgstr "%s heeft een argumentwaarde nodig\n" diff --git a/debian/patches/Update-Greek-translation.patch b/debian/patches/Update-Greek-translation.patch new file mode 100644 index 0000000..e10a7a4 --- /dev/null +++ b/debian/patches/Update-Greek-translation.patch @@ -0,0 +1,234 @@ +From: Efstathios Iosifidis <eiosifidis@gnome.org> +Date: Wed, 30 Sep 2020 20:05:55 +0000 +Subject: Update Greek translation + +Origin: upstream, 40, commit:5c9dc6c04f707f0ad1ca77c6e45e1347478c44ce +--- + po/el.po | 80 +++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 44 insertions(+), 36 deletions(-) + +diff --git a/po/el.po b/po/el.po +index f59a587..0227e9f 100644 +--- a/po/el.po ++++ b/po/el.po +@@ -36,16 +36,16 @@ msgid "" + msgstr "" + "Project-Id-Version: el\n" + "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-session/issues\n" +-"POT-Creation-Date: 2019-08-06 16:59+0000\n" +-"PO-Revision-Date: 2019-09-05 19:24+0300\n" +-"Last-Translator: Efstathios Iosifidis <iosifidis@opensuse.org>\n" ++"POT-Creation-Date: 2020-07-31 14:02+0000\n" ++"PO-Revision-Date: 2020-09-30 23:04+0300\n" ++"Last-Translator: Efstathios Iosifidis <eiosifidis@gnome.org>\n" + "Language-Team: Greek, Modern (1453-) <gnome-el-list@gnome.org>\n" + "Language: el\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 3.32.1\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++"X-Generator: Poedit 2.3\n" + "X-Project-Style: gnome\n" + + #: data/gnome-custom-session.desktop.in.in:3 +@@ -142,11 +142,11 @@ msgstr "Με_τονομασία συνεδρίας" + msgid "_Continue" + msgstr "_Συνέχεια" + +-#: gnome-session/gsm-fail-whale-dialog.c:313 ++#: gnome-session/gsm-fail-whale-dialog.c:318 + msgid "Oh no! Something has gone wrong." + msgstr "Ωχ όχι! Κάτι πήγε στραβά." + +-#: gnome-session/gsm-fail-whale-dialog.c:320 ++#: gnome-session/gsm-fail-whale-dialog.c:325 + msgid "" + "A problem has occurred and the system can’t recover. Please contact a system " + "administrator" +@@ -154,7 +154,7 @@ msgstr "" + "Προέκυψε ένα πρόβλημα και το σύστημα δε μπορεί να ανακάμψει. Παρακαλούμε " + "επικοινωνήστε με τον διαχειριστή του συστήματος" + +-#: gnome-session/gsm-fail-whale-dialog.c:322 ++#: gnome-session/gsm-fail-whale-dialog.c:327 + msgid "" + "A problem has occurred and the system can’t recover. All extensions have " + "been disabled as a precaution." +@@ -162,7 +162,7 @@ msgstr "" + "Προέκυψε ένα πρόβλημα και το σύστημα δε μπορεί να ανακάμψει. Έχουν " + "απενεργοποιηθεί όλες οι επεκτάσεις για λόγους προφύλαξης." + +-#: gnome-session/gsm-fail-whale-dialog.c:324 ++#: gnome-session/gsm-fail-whale-dialog.c:329 + msgid "" + "A problem has occurred and the system can’t recover.\n" + "Please log out and try again." +@@ -170,27 +170,27 @@ msgstr "" + "Προέκυψε ένα πρόβλημα και το σύστημα δε μπορεί να ανακάμψει.\n" + "Παρακαλούμε αποσυνδεθείτε και δοκιμάστε ξανά." + +-#: gnome-session/gsm-fail-whale-dialog.c:339 ++#: gnome-session/gsm-fail-whale-dialog.c:344 + msgid "_Log Out" + msgstr "Απο_σύνδεση" + +-#: gnome-session/gsm-fail-whale-dialog.c:361 gnome-session/main.c:396 ++#: gnome-session/gsm-fail-whale-dialog.c:412 gnome-session/main.c:404 + msgid "Enable debugging code" + msgstr "Ενεργοποίηση κώδικα αποφαλμάτωσης" + +-#: gnome-session/gsm-fail-whale-dialog.c:362 ++#: gnome-session/gsm-fail-whale-dialog.c:413 + msgid "Allow logout" + msgstr "Να επιτρέπεται αποσύνδεση" + +-#: gnome-session/gsm-fail-whale-dialog.c:363 ++#: gnome-session/gsm-fail-whale-dialog.c:414 + msgid "Show extension warning" + msgstr "Προβολή προειδοποίησης επέκτασης" + +-#: gnome-session/gsm-manager.c:1289 gnome-session/gsm-manager.c:1967 ++#: gnome-session/gsm-manager.c:1289 gnome-session/gsm-manager.c:1999 + msgid "Not responding" + msgstr "Δεν ανταποκρίνεται" + +-#: gnome-session/gsm-util.c:382 ++#: gnome-session/gsm-util.c:415 + msgid "_Log out" + msgstr "_Αποσύνδεση" + +@@ -218,63 +218,62 @@ msgstr "" + msgid "Could not create ICE listening socket: %s" + msgstr "Αδυναμία δημιουργίας υποδοχής ακρόασης ICE: %s" + +-#: gnome-session/main.c:390 ++#: gnome-session/main.c:398 + msgid "Running as systemd service" + msgstr "Εκτελείται ως υπηρεσία systemd" + +-#: gnome-session/main.c:391 +-#| msgid "Specify session management ID" ++#: gnome-session/main.c:399 + msgid "Use systemd session management" + msgstr "Χρήση διαχείριση συνεδρίας systemd" + +-#: gnome-session/main.c:393 ++#: gnome-session/main.c:401 + msgid "Use builtin session management (rather than the systemd based one)" + msgstr "" + "Χρήση της ενσωματωμένης διαχείρισης συνεδρίας (και όχι την βασισμένη στο " + "systemd)" + +-#: gnome-session/main.c:394 ++#: gnome-session/main.c:402 + msgid "Override standard autostart directories" + msgstr "Παράκαμψη τυπικών καταλόγων αυτόματης εκκίνησης" + +-#: gnome-session/main.c:394 ++#: gnome-session/main.c:402 + msgid "AUTOSTART_DIR" + msgstr "AUTOSTART_DIR" + +-#: gnome-session/main.c:395 ++#: gnome-session/main.c:403 + msgid "Session to use" + msgstr "Συνεδρία για χρήση" + +-#: gnome-session/main.c:395 ++#: gnome-session/main.c:403 + msgid "SESSION_NAME" + msgstr "SESSION_NAME" + +-#: gnome-session/main.c:397 ++#: gnome-session/main.c:405 + msgid "Do not load user-specified applications" + msgstr "Να μην φορτώνονται εφαρμογές καθορισμένες από τον χρήστη" + +-#: gnome-session/main.c:398 ++#: gnome-session/main.c:406 + msgid "Version of this application" + msgstr "Η έκδοση αυτής της εφαρμογής" + + #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong +-#: gnome-session/main.c:400 ++#: gnome-session/main.c:408 + msgid "Show the fail whale dialog for testing" + msgstr "Εμφάνιση του διαλόγου fail whale για δοκιμή" + +-#: gnome-session/main.c:401 ++#: gnome-session/main.c:409 + msgid "Disable hardware acceleration check" + msgstr "Απενεργοποίηση ελέγχου επιτάχυνσης υλικού" + +-#: gnome-session/main.c:433 ++#: gnome-session/main.c:441 + msgid " — the GNOME session manager" + msgstr " — ο διαχειριστής συνεδρίας του GNOME" + +-#: tools/gnome-session-ctl.c:244 ++#: tools/gnome-session-ctl.c:245 + msgid "Start gnome-session-shutdown.target" + msgstr "Εκκίνηση του gnome-session-shutdown.target" + +-#: tools/gnome-session-ctl.c:245 ++#: tools/gnome-session-ctl.c:246 + msgid "" + "Start gnome-session-shutdown.target when receiving EOF or a single byte on " + "stdin" +@@ -282,15 +281,22 @@ msgstr "" + "Εκκίνηση του gnome-session-shutdown.target όταν λαμβάνετε EOF ή ένα μόνο " + "byte στο stdin" + +-#: tools/gnome-session-ctl.c:246 ++#: tools/gnome-session-ctl.c:247 + msgid "Signal initialization done to gnome-session" + msgstr "Η αρχικοποίηση του σήματος έγινε στο gnome-session" + +-#: tools/gnome-session-ctl.c:247 ++#: tools/gnome-session-ctl.c:248 + msgid "Restart dbus.service if it is running" + msgstr "Επανεκκίνηση της υπηρεσίας dbus εάν εκτελείται" + +-#: tools/gnome-session-ctl.c:275 ++#: tools/gnome-session-ctl.c:249 ++msgid "" ++"Run from ExecStopPost to start gnome-session-failed.target on service failure" ++msgstr "" ++"Εκτέλεση από το ExecStopPost για εκκίνηση του gnome-session-failed.target σε " ++"περίπτωση αποτυχίας υπηρεσίας" ++ ++#: tools/gnome-session-ctl.c:279 + msgid "Program needs exactly one parameter" + msgstr "Το πρόγραμμα χρειάζεται ακριβώς μία παράμετρο" + +@@ -309,6 +315,7 @@ msgid "" + " --inhibit ARG Things to inhibit, colon-separated list of:\n" + " logout, switch-user, suspend, idle, automount\n" + " --inhibit-only Do not launch COMMAND and wait forever instead\n" ++" -l, --list List the existing inhibitions, and exit\n" + "\n" + "If no --inhibit option is specified, idle is assumed.\n" + msgstr "" +@@ -326,16 +333,17 @@ msgstr "" + " : αποσύνδεση, εναλλαγή χρήστη, αναστολή, αδράνεια, " + "αυτόματη προσάρτηση\n" + " --inhibit-only Να μην ξεκινά η COMMAND και να περιμένετε για πάντα\n" ++" -l, --list Εμφάνιση των υπαρχόντων παρεμποδίσεων, και έξοδος\n" + "\n" + "Εάν δεν έχει οριστεί καμιά επιλογή --inhibit, υποτίθεται αδράνεια.\n" + +-#: tools/gnome-session-inhibit.c:146 ++#: tools/gnome-session-inhibit.c:288 + #, c-format + msgid "Failed to execute %s\n" + msgstr "Αποτυχία εκτέλεσης του %s\n" + +-#: tools/gnome-session-inhibit.c:206 tools/gnome-session-inhibit.c:216 +-#: tools/gnome-session-inhibit.c:226 ++#: tools/gnome-session-inhibit.c:352 tools/gnome-session-inhibit.c:362 ++#: tools/gnome-session-inhibit.c:372 + #, c-format + msgid "%s requires an argument\n" + msgstr "Το %s απαιτεί ένα όρισμα\n" diff --git a/debian/patches/Update-Hebrew-translation.patch b/debian/patches/Update-Hebrew-translation.patch new file mode 100644 index 0000000..70881d2 --- /dev/null +++ b/debian/patches/Update-Hebrew-translation.patch @@ -0,0 +1,304 @@ +From: Yosef Or Boczko <yoseforb@gnome.org> +Date: Mon, 28 Sep 2020 17:22:03 +0000 +Subject: Update Hebrew translation + +Origin: upstream, 40, commit:3bb7554b0f5f980c2434755546b42f051a6a3934 +--- + po/he.po | 96 +++++++++++++++++++++++++++------------------------------------- + 1 file changed, 41 insertions(+), 55 deletions(-) + +diff --git a/po/he.po b/po/he.po +index 740582b..77eba91 100644 +--- a/po/he.po ++++ b/po/he.po +@@ -10,8 +10,8 @@ msgid "" + msgstr "" + "Project-Id-Version: gnome-session.HEAD.he\n" + "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-session/issues\n" +-"POT-Creation-Date: 2019-09-18 13:36+0000\n" +-"PO-Revision-Date: 2020-03-30 20:25+0300\n" ++"POT-Creation-Date: 2020-08-16 08:36+0000\n" ++"PO-Revision-Date: 2020-09-28 20:21+0300\n" + "Last-Translator: Yosef Or Boczko <yoseforb@gmail.com>\n" + "Language-Team: Hebrew <yoseforb@gmail.com>\n" + "Language: he\n" +@@ -48,7 +48,6 @@ msgid "GNOME on Xorg" + msgstr "GNOME על גבי Xorg" + + #: data/org.gnome.SessionManager.gschema.xml.in:5 +-#| msgid "Saving session details." + msgid "Save sessions" + msgstr "Save sessions" + +@@ -57,12 +56,10 @@ msgid "If enabled, gnome-session will save the session automatically." + msgstr "If enabled, gnome-session will save the session automatically." + + #: data/org.gnome.SessionManager.gschema.xml.in:10 +-#| msgid "Save the current session" + msgid "Save this session" + msgstr "Save this session" + + #: data/org.gnome.SessionManager.gschema.xml.in:11 +-#| msgid "If enabled, gnome-session will save the session automatically." + msgid "" + "When enabled, gnome-session will automatically save the next session at log " + "out even if auto saving is disabled." +@@ -80,12 +77,10 @@ msgstr "" + "If enabled, gnome-session will prompt the user before ending a session." + + #: data/org.gnome.SessionManager.gschema.xml.in:20 +-#| msgid "Show extension warning" + msgid "Show the fallback warning" + msgstr "Show the fallback warning" + + #: data/org.gnome.SessionManager.gschema.xml.in:21 +-#| msgid "If enabled, gnome-session will save the session automatically." + msgid "" + "If enabled, gnome-session will display a warning dialog after login if the " + "session was automatically fallen back." +@@ -117,34 +112,25 @@ msgstr "_שינוי שם ההפעלה" + msgid "_Continue" + msgstr "להמ_שיך" + +-#: gnome-session/gsm-fail-whale-dialog.c:313 ++#: gnome-session/gsm-fail-whale-dialog.c:318 + msgid "Oh no! Something has gone wrong." + msgstr "אבוי! משהו השתבש." + +-#: gnome-session/gsm-fail-whale-dialog.c:320 +-#| msgid "" +-#| "A problem has occurred and the system can't recover. Please contact a " +-#| "system administrator" ++#: gnome-session/gsm-fail-whale-dialog.c:325 + msgid "" + "A problem has occurred and the system can’t recover. Please contact a system " + "administrator" + msgstr "" + "אירעה שגיאה והמערכת אינה יכולה להשתקם ממנה. נא ליצור קשר עם מנהל המערכת." + +-#: gnome-session/gsm-fail-whale-dialog.c:322 +-#| msgid "" +-#| "A problem has occurred and the system can't recover. All extensions have " +-#| "been disabled as a precaution." ++#: gnome-session/gsm-fail-whale-dialog.c:327 + msgid "" + "A problem has occurred and the system can’t recover. All extensions have " + "been disabled as a precaution." + msgstr "" + "אירעה שגיאה והמערכת אינה יכולה להשתקם ממנה. ליתר ביטחון הושבתו כל ההרחבות." + +-#: gnome-session/gsm-fail-whale-dialog.c:324 +-#| msgid "" +-#| "A problem has occurred and the system can't recover.\n" +-#| "Please log out and try again." ++#: gnome-session/gsm-fail-whale-dialog.c:329 + msgid "" + "A problem has occurred and the system can’t recover.\n" + "Please log out and try again." +@@ -152,27 +138,27 @@ msgstr "" + "אירעה שגיאה והמערכת אינה יכולה להשתקם ממנה.\n" + "נא לצאת ולנסות שוב." + +-#: gnome-session/gsm-fail-whale-dialog.c:339 ++#: gnome-session/gsm-fail-whale-dialog.c:344 + msgid "_Log Out" + msgstr "_ניתוק" + +-#: gnome-session/gsm-fail-whale-dialog.c:361 gnome-session/main.c:396 ++#: gnome-session/gsm-fail-whale-dialog.c:412 gnome-session/main.c:404 + msgid "Enable debugging code" + msgstr "Enable debugging code" + +-#: gnome-session/gsm-fail-whale-dialog.c:362 ++#: gnome-session/gsm-fail-whale-dialog.c:413 + msgid "Allow logout" + msgstr "לאפשר יציאה" + +-#: gnome-session/gsm-fail-whale-dialog.c:363 ++#: gnome-session/gsm-fail-whale-dialog.c:414 + msgid "Show extension warning" + msgstr "הצגת אזהרת הרחבות" + +-#: gnome-session/gsm-manager.c:1289 gnome-session/gsm-manager.c:1994 ++#: gnome-session/gsm-manager.c:1289 gnome-session/gsm-manager.c:1999 + msgid "Not responding" + msgstr "אין תגובה" + +-#: gnome-session/gsm-util.c:389 ++#: gnome-session/gsm-util.c:415 + msgid "_Log out" + msgstr "י_ציאה" + +@@ -199,62 +185,60 @@ msgstr "מסרב לחיבור לקוח חדש מכיון שההפעלה נמצא + msgid "Could not create ICE listening socket: %s" + msgstr "לא ניתן ליצור שקע ICE: %s" + +-#: gnome-session/main.c:390 ++#: gnome-session/main.c:398 + msgid "Running as systemd service" + msgstr "Running as systemd service" + +-#: gnome-session/main.c:391 +-#| msgid "Specify session management ID" ++#: gnome-session/main.c:399 + msgid "Use systemd session management" + msgstr "Use systemd session management" + +-#: gnome-session/main.c:393 ++#: gnome-session/main.c:401 + msgid "Use builtin session management (rather than the systemd based one)" + msgstr "Use builtin session management (rather than the systemd based one)" + +-#: gnome-session/main.c:394 ++#: gnome-session/main.c:402 + msgid "Override standard autostart directories" + msgstr "Override standard autostart directories" + +-#: gnome-session/main.c:394 ++#: gnome-session/main.c:402 + msgid "AUTOSTART_DIR" + msgstr "AUTOSTART_DIR" + +-#: gnome-session/main.c:395 ++#: gnome-session/main.c:403 + msgid "Session to use" + msgstr "Session to use" + +-#: gnome-session/main.c:395 ++#: gnome-session/main.c:403 + msgid "SESSION_NAME" + msgstr "SESSION_NAME" + +-#: gnome-session/main.c:397 ++#: gnome-session/main.c:405 + msgid "Do not load user-specified applications" + msgstr "Do not load user-specified applications" + +-#: gnome-session/main.c:398 ++#: gnome-session/main.c:406 + msgid "Version of this application" + msgstr "Version of this application" + + #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong +-#: gnome-session/main.c:400 ++#: gnome-session/main.c:408 + msgid "Show the fail whale dialog for testing" + msgstr "Show the fail whale dialog for testing" + +-#: gnome-session/main.c:401 ++#: gnome-session/main.c:409 + msgid "Disable hardware acceleration check" + msgstr "Disable hardware acceleration check" + +-#: gnome-session/main.c:433 +-#| msgid " - the GNOME session manager" ++#: gnome-session/main.c:441 + msgid " — the GNOME session manager" + msgstr " — the GNOME session manager" + +-#: tools/gnome-session-ctl.c:244 ++#: tools/gnome-session-ctl.c:245 + msgid "Start gnome-session-shutdown.target" + msgstr "Start gnome-session-shutdown.target" + +-#: tools/gnome-session-ctl.c:245 ++#: tools/gnome-session-ctl.c:246 + msgid "" + "Start gnome-session-shutdown.target when receiving EOF or a single byte on " + "stdin" +@@ -262,22 +246,28 @@ msgstr "" + "Start gnome-session-shutdown.target when receiving EOF or a single byte on " + "stdin" + +-#: tools/gnome-session-ctl.c:246 ++#: tools/gnome-session-ctl.c:247 + msgid "Signal initialization done to gnome-session" + msgstr "Signal initialization done to gnome-session" + +-#: tools/gnome-session-ctl.c:247 ++#: tools/gnome-session-ctl.c:248 + msgid "Restart dbus.service if it is running" + msgstr "Restart dbus.service if it is running" + +-#: tools/gnome-session-ctl.c:275 ++#: tools/gnome-session-ctl.c:249 ++msgid "" ++"Run from ExecStopPost to start gnome-session-failed.target on service failure" ++msgstr "" ++"Run from ExecStopPost to start gnome-session-failed.target on service failure" ++ ++#: tools/gnome-session-ctl.c:279 + msgid "Program needs exactly one parameter" + msgstr "Program needs exactly one parameter" + + #: tools/gnome-session-inhibit.c:108 + #, c-format + #| msgid "" +-#| "%s [OPTION...] COMMAND\n" ++#| "%s [OPTION…] COMMAND\n" + #| "\n" + #| "Execute COMMAND while inhibiting some session functionality.\n" + #| "\n" +@@ -304,6 +294,7 @@ msgid "" + " --inhibit ARG Things to inhibit, colon-separated list of:\n" + " logout, switch-user, suspend, idle, automount\n" + " --inhibit-only Do not launch COMMAND and wait forever instead\n" ++" -l, --list List the existing inhibitions, and exit\n" + "\n" + "If no --inhibit option is specified, idle is assumed.\n" + msgstr "" +@@ -319,16 +310,17 @@ msgstr "" + " --inhibit ARG Things to inhibit, colon-separated list of:\n" + " logout, switch-user, suspend, idle, automount\n" + " --inhibit-only Do not launch COMMAND and wait forever instead\n" ++" -l, --list List the existing inhibitions, and exit\n" + "\n" + "If no --inhibit option is specified, idle is assumed.\n" + +-#: tools/gnome-session-inhibit.c:146 ++#: tools/gnome-session-inhibit.c:288 + #, c-format + msgid "Failed to execute %s\n" + msgstr "Failed to execute %s\n" + +-#: tools/gnome-session-inhibit.c:206 tools/gnome-session-inhibit.c:216 +-#: tools/gnome-session-inhibit.c:226 ++#: tools/gnome-session-inhibit.c:352 tools/gnome-session-inhibit.c:362 ++#: tools/gnome-session-inhibit.c:372 + #, c-format + msgid "%s requires an argument\n" + msgstr "%s requires an argument\n" +@@ -350,7 +342,6 @@ msgid "Ignoring any existing inhibitors" + msgstr "תוך התעלמות ממעקבים קיימים" + + #: tools/gnome-session-quit.c:54 +-#| msgid "Don't prompt for user confirmation" + msgid "Don’t prompt for user confirmation" + msgstr "אין לבקש אישור מהמשתמש" + +@@ -368,25 +359,20 @@ msgid "Session %d" + msgstr "הפעלה %d" + + #: tools/gnome-session-selector.c:107 +-#| msgid "" +-#| "Session names are not allowed to start with ‘.’ or contain ‘/’ characters" + msgid "" + "Session names are not allowed to start with “.” or contain “/” characters" + msgstr "אסור ששמות ההפעלות יתחילו בתו „.” או יכילו את התו „/”" + + #: tools/gnome-session-selector.c:111 +-#| msgid "Session names are not allowed to start with ‘.’" + msgid "Session names are not allowed to start with “.”" + msgstr "אסור ששמות ההפעלות יתחילו בתו „.”" + + #: tools/gnome-session-selector.c:115 +-#| msgid "Session names are not allowed to contain ‘/’ characters" + msgid "Session names are not allowed to contain “/” characters" + msgstr "אסור ששמות ההפעלות יכילו את התו „/”" + + #: tools/gnome-session-selector.c:123 + #, c-format +-#| msgid "A session named ‘%s’ already exists" + msgid "A session named “%s” already exists" + msgstr "כבר קיימת הפעלה בשם „%s”" + diff --git a/debian/patches/Update-Latvian-translation.patch b/debian/patches/Update-Latvian-translation.patch new file mode 100644 index 0000000..ee80b20 --- /dev/null +++ b/debian/patches/Update-Latvian-translation.patch @@ -0,0 +1,255 @@ +From: =?utf-8?q?R=C5=ABdolfs_Mazurs?= <rudolfs.mazurs@gmail.com> +Date: Sat, 12 Sep 2020 09:03:36 +0000 +Subject: Update Latvian translation + +Origin: upstream, 40, commit:6e66b8ba9e2393925850107397f9750d9ceccb33 +--- + po/lv.po | 93 ++++++++++++++++++++++++++++++++++++++++------------------------ + 1 file changed, 58 insertions(+), 35 deletions(-) + +diff --git a/po/lv.po b/po/lv.po +index 306b79c..da86711 100644 +--- a/po/lv.po ++++ b/po/lv.po +@@ -8,13 +8,13 @@ + # Raivis Dejus <orvils@gmail.com>, 2006, 2009. + # Rudolfs <rudolfs.mazurs@gmail.com>, 2011. + # Rūdofls Mazurs <rudolfs.mazurs@gmail.com>, 2011, 2012. +-# Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>, 2010, 2011, 2013, 2015, 2016, 2017, 2018, 2019. ++# Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>, 2010, 2011, 2013, 2015, 2016, 2017, 2018, 2019, 2020. + msgid "" + msgstr "" + "Project-Id-Version: lv\n" + "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-session/issues\n" +-"POT-Creation-Date: 2019-08-06 16:59+0000\n" +-"PO-Revision-Date: 2019-08-24 18:13+0200\n" ++"POT-Creation-Date: 2020-07-31 14:02+0000\n" ++"PO-Revision-Date: 2020-09-12 12:02+0300\n" + "Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n" + "Language-Team: Latvian <lata-l10n@googlegroups.com>\n" + "Language: lv\n" +@@ -23,7 +23,7 @@ msgstr "" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 :" + " 2);\n" +-"X-Generator: Lokalize 2.0\n" ++"X-Generator: Lokalize 19.12.3\n" + "X-Launchpad-Export-Date: 2009-02-19 16:24+0000\n" + + #: data/gnome-custom-session.desktop.in.in:3 +@@ -116,11 +116,11 @@ msgstr "_Pārsaukt sesiju" + msgid "_Continue" + msgstr "_Turpināt" + +-#: gnome-session/gsm-fail-whale-dialog.c:313 ++#: gnome-session/gsm-fail-whale-dialog.c:318 + msgid "Oh no! Something has gone wrong." + msgstr "Ak nē! Kaut kas nogāja greizi." + +-#: gnome-session/gsm-fail-whale-dialog.c:320 ++#: gnome-session/gsm-fail-whale-dialog.c:325 + msgid "" + "A problem has occurred and the system can’t recover. Please contact a system " + "administrator" +@@ -128,7 +128,7 @@ msgstr "" + "Gadījās problēma, un sistēma no tās nevar atgūties. Lūdzu, sazinieties ar " + "sistēmas administratoru." + +-#: gnome-session/gsm-fail-whale-dialog.c:322 ++#: gnome-session/gsm-fail-whale-dialog.c:327 + msgid "" + "A problem has occurred and the system can’t recover. All extensions have " + "been disabled as a precaution." +@@ -136,7 +136,7 @@ msgstr "" + "Gadījās problēma, un sistēma no tās nevar atgūties. Kā piesardzības " + "pasākums, visi paplašinājumi ir deaktivēti." + +-#: gnome-session/gsm-fail-whale-dialog.c:324 ++#: gnome-session/gsm-fail-whale-dialog.c:329 + msgid "" + "A problem has occurred and the system can’t recover.\n" + "Please log out and try again." +@@ -144,27 +144,27 @@ msgstr "" + "Gadījās problēma, un sistēma no tās nevar atgūties.\n" + "Lūdzu, izrakstieties un mēģiniet vēlreiz." + +-#: gnome-session/gsm-fail-whale-dialog.c:339 ++#: gnome-session/gsm-fail-whale-dialog.c:344 + msgid "_Log Out" + msgstr "_Izrakstīties" + +-#: gnome-session/gsm-fail-whale-dialog.c:361 gnome-session/main.c:396 ++#: gnome-session/gsm-fail-whale-dialog.c:412 gnome-session/main.c:404 + msgid "Enable debugging code" + msgstr "Aktivēt atkļūdošanas kodu" + +-#: gnome-session/gsm-fail-whale-dialog.c:362 ++#: gnome-session/gsm-fail-whale-dialog.c:413 + msgid "Allow logout" + msgstr "Atļaut izrakstīšanos" + +-#: gnome-session/gsm-fail-whale-dialog.c:363 ++#: gnome-session/gsm-fail-whale-dialog.c:414 + msgid "Show extension warning" + msgstr "Rādīt paplašinājumu brīdinājumus" + +-#: gnome-session/gsm-manager.c:1289 gnome-session/gsm-manager.c:1967 ++#: gnome-session/gsm-manager.c:1289 gnome-session/gsm-manager.c:1999 + msgid "Not responding" + msgstr "Neatbild" + +-#: gnome-session/gsm-util.c:382 ++#: gnome-session/gsm-util.c:415 + msgid "_Log out" + msgstr "_Izrakstīties" + +@@ -191,81 +191,102 @@ msgstr "Atsaka jauniem klientu savienojumiem, jo sesija tiek izslēgta\n" + msgid "Could not create ICE listening socket: %s" + msgstr "Nevar izveidot ICE klausīšanās ligzdu — %s" + +-#: gnome-session/main.c:390 ++#: gnome-session/main.c:398 + msgid "Running as systemd service" + msgstr "Darbina kā systemd pakalpojumu" + +-#: gnome-session/main.c:391 +-#| msgid " — the GNOME session manager" ++#: gnome-session/main.c:399 + msgid "Use systemd session management" + msgstr "Izmantot systemd sesiju pārvaldību" + +-#: gnome-session/main.c:393 ++#: gnome-session/main.c:401 + msgid "Use builtin session management (rather than the systemd based one)" + msgstr "Izmantot iebūvēto sesiju pārvaldību (nevis systemd pārbaldību)" + +-#: gnome-session/main.c:394 ++#: gnome-session/main.c:402 + msgid "Override standard autostart directories" + msgstr "Aizstāt standarta automātiskā starta direktorijas" + +-#: gnome-session/main.c:394 ++#: gnome-session/main.c:402 + msgid "AUTOSTART_DIR" + msgstr "AUTOSTARTA_DIR" + +-#: gnome-session/main.c:395 ++#: gnome-session/main.c:403 + msgid "Session to use" + msgstr "Sesija, ko izmantot" + +-#: gnome-session/main.c:395 ++#: gnome-session/main.c:403 + msgid "SESSION_NAME" + msgstr "SESIJAS_NOSAUKUMS" + +-#: gnome-session/main.c:397 ++#: gnome-session/main.c:405 + msgid "Do not load user-specified applications" + msgstr "Neielādēt lietotāja norādītās lietotnes" + +-#: gnome-session/main.c:398 ++#: gnome-session/main.c:406 + msgid "Version of this application" + msgstr "Lietotnes versija" + + #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong +-#: gnome-session/main.c:400 ++#: gnome-session/main.c:408 + msgid "Show the fail whale dialog for testing" + msgstr "Rādīt neveiksmju vali testēšanai" + +-#: gnome-session/main.c:401 ++#: gnome-session/main.c:409 + msgid "Disable hardware acceleration check" + msgstr "Izslēgt aparatūras paātrinājuma pārbaudi" + +-#: gnome-session/main.c:433 ++#: gnome-session/main.c:441 + msgid " — the GNOME session manager" + msgstr " — GNOME sesiju pārvaldnieks" + +-#: tools/gnome-session-ctl.c:244 ++#: tools/gnome-session-ctl.c:245 + msgid "Start gnome-session-shutdown.target" + msgstr "Palaist gnome-session-shutdown.target" + +-#: tools/gnome-session-ctl.c:245 ++#: tools/gnome-session-ctl.c:246 + msgid "" + "Start gnome-session-shutdown.target when receiving EOF or a single byte on " + "stdin" + msgstr "" + "Palaist gnome-session-shutdown.target, kad saņem EOF vai vienu baitu no stdin" + +-#: tools/gnome-session-ctl.c:246 ++#: tools/gnome-session-ctl.c:247 + msgid "Signal initialization done to gnome-session" + msgstr "Signāla inicializācija tika veikta gnome-session" + +-#: tools/gnome-session-ctl.c:247 ++#: tools/gnome-session-ctl.c:248 + msgid "Restart dbus.service if it is running" + msgstr "Pārstartēt dbus.service, ja tas ir palaists" + +-#: tools/gnome-session-ctl.c:275 ++#: tools/gnome-session-ctl.c:249 ++msgid "" ++"Run from ExecStopPost to start gnome-session-failed.target on service failure" ++msgstr "" ++"Palaidiet no ExecStopPost, lai startētu gnome-session-failed.target, kad ir" ++" servisa kļūme" ++ ++#: tools/gnome-session-ctl.c:279 + msgid "Program needs exactly one parameter" + msgstr "Programmai vajag tieši vienu parametru" + + #: tools/gnome-session-inhibit.c:108 + #, c-format ++#| msgid "" ++#| "%s [OPTION…] COMMAND\n" ++#| "\n" ++#| "Execute COMMAND while inhibiting some session functionality.\n" ++#| "\n" ++#| " -h, --help Show this help\n" ++#| " --version Show program version\n" ++#| " --app-id ID The application id to use\n" ++#| " when inhibiting (optional)\n" ++#| " --reason REASON The reason for inhibiting (optional)\n" ++#| " --inhibit ARG Things to inhibit, colon-separated list of:\n" ++#| " logout, switch-user, suspend, idle, automount\n" ++#| " --inhibit-only Do not launch COMMAND and wait forever instead\n" ++#| "\n" ++#| "If no --inhibit option is specified, idle is assumed.\n" + msgid "" + "%s [OPTION…] COMMAND\n" + "\n" +@@ -279,6 +300,7 @@ msgid "" + " --inhibit ARG Things to inhibit, colon-separated list of:\n" + " logout, switch-user, suspend, idle, automount\n" + " --inhibit-only Do not launch COMMAND and wait forever instead\n" ++" -l, --list List the existing inhibitions, and exit\n" + "\n" + "If no --inhibit option is specified, idle is assumed.\n" + msgstr "" +@@ -294,16 +316,17 @@ msgstr "" + " --inhibit PARAM Lietas, ko aizturēt, ar kolu atdalīts saraksts:\n" + " logout, switch-user, suspend, idle, automount\n" + " --inhibit-only Nepalaist KOMANDU un tā vietā gaidīt bezgalīgi\n" ++" -l, --list Uzskaitīt esošās aiztures un iziet\n" + "\n" + "Ja nav norādīta opcija --inhibit, tiek pieņemts idle.\n" + +-#: tools/gnome-session-inhibit.c:146 ++#: tools/gnome-session-inhibit.c:288 + #, c-format + msgid "Failed to execute %s\n" + msgstr "Neizdevās izpildīt %s\n" + +-#: tools/gnome-session-inhibit.c:206 tools/gnome-session-inhibit.c:216 +-#: tools/gnome-session-inhibit.c:226 ++#: tools/gnome-session-inhibit.c:352 tools/gnome-session-inhibit.c:362 ++#: tools/gnome-session-inhibit.c:372 + #, c-format + msgid "%s requires an argument\n" + msgstr "%s pieprasa parametru\n" diff --git a/debian/patches/Update-Norwegian-Bokm-l-translation.patch b/debian/patches/Update-Norwegian-Bokm-l-translation.patch new file mode 100644 index 0000000..c826d03 --- /dev/null +++ b/debian/patches/Update-Norwegian-Bokm-l-translation.patch @@ -0,0 +1,170 @@ +From: Kjartan Maraas <kmaraas@gnome.org> +Date: Mon, 30 Nov 2020 13:09:53 +0000 +Subject: =?utf-8?q?Update_Norwegian_Bokm=C3=A5l_translation?= + +Origin: upstream, 40, commit:7f99c82dcb44040a9a70bb7b1197a5ce16e365df +--- + po/nb.po | 55 ++++++++++++++++++++++++++++++++----------------------- + 1 file changed, 32 insertions(+), 23 deletions(-) + +diff --git a/po/nb.po b/po/nb.po +index 04ffb2e..dd467b0 100644 +--- a/po/nb.po ++++ b/po/nb.po +@@ -5,10 +5,10 @@ + # + msgid "" + msgstr "" +-"Project-Id-Version: gnome-session 3.36.x\n" ++"Project-Id-Version: gnome-session 3.38.x\n" + "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-session/issues\n" +-"POT-Creation-Date: 2019-12-16 13:18+0000\n" +-"PO-Revision-Date: 2020-03-09 16:28+0100\n" ++"POT-Creation-Date: 2020-08-16 08:36+0000\n" ++"PO-Revision-Date: 2020-11-30 14:09+0100\n" + "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n" + "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n" + "Language: nb\n" +@@ -49,7 +49,7 @@ msgstr "Lagre økter" + + #: data/org.gnome.SessionManager.gschema.xml.in:6 + msgid "If enabled, gnome-session will save the session automatically." +-msgstr "" ++msgstr "Hvis aktivert vil gnome-session lagre økten automatisk." + + #: data/org.gnome.SessionManager.gschema.xml.in:10 + msgid "Save this session" +@@ -103,11 +103,11 @@ msgstr "E_ndre navn på økt" + msgid "_Continue" + msgstr "_Fortsett" + +-#: gnome-session/gsm-fail-whale-dialog.c:313 ++#: gnome-session/gsm-fail-whale-dialog.c:318 + msgid "Oh no! Something has gone wrong." + msgstr "Å nei! Noe har gått galt." + +-#: gnome-session/gsm-fail-whale-dialog.c:320 ++#: gnome-session/gsm-fail-whale-dialog.c:325 + msgid "" + "A problem has occurred and the system can’t recover. Please contact a system " + "administrator" +@@ -115,7 +115,7 @@ msgstr "" + "Et problem har oppstått og systemet kan ikke gjenopprettes. Vennligst " + "kontakt en systemadmininstrator" + +-#: gnome-session/gsm-fail-whale-dialog.c:322 ++#: gnome-session/gsm-fail-whale-dialog.c:327 + msgid "" + "A problem has occurred and the system can’t recover. All extensions have " + "been disabled as a precaution." +@@ -123,7 +123,7 @@ msgstr "" + "Et problem har oppstått og systemet kan ikke gjenopprettes. Alle utvidelser " + "er slått av som følge av dette." + +-#: gnome-session/gsm-fail-whale-dialog.c:324 ++#: gnome-session/gsm-fail-whale-dialog.c:329 + msgid "" + "A problem has occurred and the system can’t recover.\n" + "Please log out and try again." +@@ -131,19 +131,19 @@ msgstr "" + "Et problem har oppstått og systemet kan ikke gjenopprettes.\n" + "Vennligst logg ut og prøv igjen." + +-#: gnome-session/gsm-fail-whale-dialog.c:339 ++#: gnome-session/gsm-fail-whale-dialog.c:344 + msgid "_Log Out" + msgstr "_Logg ut" + +-#: gnome-session/gsm-fail-whale-dialog.c:361 gnome-session/main.c:404 ++#: gnome-session/gsm-fail-whale-dialog.c:412 gnome-session/main.c:404 + msgid "Enable debugging code" + msgstr "Aktiver feilsøkingskode" + +-#: gnome-session/gsm-fail-whale-dialog.c:362 ++#: gnome-session/gsm-fail-whale-dialog.c:413 + msgid "Allow logout" + msgstr "Tillat utlogging" + +-#: gnome-session/gsm-fail-whale-dialog.c:363 ++#: gnome-session/gsm-fail-whale-dialog.c:414 + msgid "Show extension warning" + msgstr "Vis advarsel om utvidelser" + +@@ -151,7 +151,7 @@ msgstr "Vis advarsel om utvidelser" + msgid "Not responding" + msgstr "Svarer ikke" + +-#: gnome-session/gsm-util.c:414 ++#: gnome-session/gsm-util.c:415 + msgid "_Log out" + msgstr "_Logg ut" + +@@ -227,25 +227,32 @@ msgstr "Slå av sjekk for maskinvareaksellerasjon" + msgid " — the GNOME session manager" + msgstr "– GNOME økthåndterer" + +-#: tools/gnome-session-ctl.c:244 ++#: tools/gnome-session-ctl.c:245 + msgid "Start gnome-session-shutdown.target" + msgstr "Start gnome-session-shutdown.target" + +-#: tools/gnome-session-ctl.c:245 ++#: tools/gnome-session-ctl.c:246 + msgid "" + "Start gnome-session-shutdown.target when receiving EOF or a single byte on " + "stdin" +-msgstr "Start gnome-session-shutdown.target når EOF eller en enkelt byte mottas på stdin" ++msgstr "" ++"Start gnome-session-shutdown.target når EOF eller en enkelt byte mottas på " ++"stdin" + +-#: tools/gnome-session-ctl.c:246 ++#: tools/gnome-session-ctl.c:247 + msgid "Signal initialization done to gnome-session" + msgstr "Signaliser initiering ferdig til gnome-session" + +-#: tools/gnome-session-ctl.c:247 ++#: tools/gnome-session-ctl.c:248 + msgid "Restart dbus.service if it is running" + msgstr "Start dbus.service på nytt hvis den kjører" + +-#: tools/gnome-session-ctl.c:275 ++#: tools/gnome-session-ctl.c:249 ++msgid "" ++"Run from ExecStopPost to start gnome-session-failed.target on service failure" ++msgstr "Kjør fra ExecStopPost for å starte gnome-session-failed.target ved feil på tjenesten" ++ ++#: tools/gnome-session-ctl.c:279 + msgid "Program needs exactly one parameter" + msgstr "Programmet trenger kun eksakt en parameter" + +@@ -264,6 +271,7 @@ msgid "" + " --inhibit ARG Things to inhibit, colon-separated list of:\n" + " logout, switch-user, suspend, idle, automount\n" + " --inhibit-only Do not launch COMMAND and wait forever instead\n" ++" -l, --list List the existing inhibitions, and exit\n" + "\n" + "If no --inhibit option is specified, idle is assumed.\n" + msgstr "" +@@ -279,16 +287,17 @@ msgstr "" + " --inhibit ARG Ting som skal hindres. Kolonseparert liste med:\n" + " logout, switch-user, suspend, idle og automount\n" + " --inhibit-only Ikke start KOMMANDO og vent for alltid i stedet\n" +-"\n" ++" -l, --list Vis eksisterende hindringer og avslutt\n" ++" \n" + "Hvis ingen flagg gis til --inhibit vil idle brukes.\n" + +-#: tools/gnome-session-inhibit.c:146 ++#: tools/gnome-session-inhibit.c:288 + #, c-format + msgid "Failed to execute %s\n" + msgstr "Klarte ikke å kjøre %s\n" + +-#: tools/gnome-session-inhibit.c:206 tools/gnome-session-inhibit.c:216 +-#: tools/gnome-session-inhibit.c:226 ++#: tools/gnome-session-inhibit.c:352 tools/gnome-session-inhibit.c:362 ++#: tools/gnome-session-inhibit.c:372 + #, c-format + msgid "%s requires an argument\n" + msgstr "%s krever et argument\n" diff --git a/debian/patches/data-Fix-indirect-conflict-with-exit.target-via-app.slice.patch b/debian/patches/data-Fix-indirect-conflict-with-exit.target-via-app.slice.patch new file mode 100644 index 0000000..385a7da --- /dev/null +++ b/debian/patches/data-Fix-indirect-conflict-with-exit.target-via-app.slice.patch @@ -0,0 +1,54 @@ +From: Benjamin Berg <bberg@redhat.com> +Date: Thu, 3 Dec 2020 13:45:36 +0100 +Subject: data: Fix indirect conflict with exit.target via app.slice + +systemd v247 now puts services into app.slice by default. But app.slice +will have a conflict with exit.target, which in turn means that we still +get a conflict with exit.target indirectly. + +Fix it by adding the appropriate Slice=-.slice into +gnome-session-restart-dbus.service. Also update the note in +gnome-session-shutdown.service to point out the requirements. + +Bug: https://gitlab.gnome.org/GNOME/gnome-session/-/issues/74 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=975400 +Origin: upstream, 40, commit:9de6e40f12e8878f524f8d429d85724c156a0517 +--- + data/gnome-session-restart-dbus.service.in | 5 +++-- + data/gnome-session-shutdown.target | 5 +++-- + 2 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/data/gnome-session-restart-dbus.service.in b/data/gnome-session-restart-dbus.service.in +index e90f6bc..6389c32 100644 +--- a/data/gnome-session-restart-dbus.service.in ++++ b/data/gnome-session-restart-dbus.service.in +@@ -1,10 +1,11 @@ + [Unit] + Description=Restart DBus after GNOME Session shutdown + +-# Allow exit.target to start even if this unit is started with replace-irreversibly +-# Also put it into a slice that doesn't have such implicit dependencies ++# Allow exit.target to start even if this unit is started with replace-irreversibly. ++# For this to work, we also need to be in the root slice. + DefaultDependencies=no + + [Service] + Type=notify + ExecStart=@libexecdir@/gnome-session-ctl --restart-dbus ++Slice=-.slice +diff --git a/data/gnome-session-shutdown.target b/data/gnome-session-shutdown.target +index 607dc6e..2c3d196 100644 +--- a/data/gnome-session-shutdown.target ++++ b/data/gnome-session-shutdown.target +@@ -1,8 +1,9 @@ + [Unit] + Description=Shutdown running GNOME Session + +-# Allow exit.target to start even if this unit is started with replace-irreversibly +-# The same is needed for all (weak) dependencies ++# Allow exit.target to start even if this unit is started with replace-irreversibly. ++# All (weak) dependencies need to do the same. Services also need to ensure they ++# are in the root slice by setting Slice=-.slice. + DefaultDependencies=no + + Conflicts=graphical-session.target graphical-session-pre.target diff --git a/debian/patches/debian/Make-sure-to-pass-systemd-when-we-re-managing-the-user-se.patch b/debian/patches/debian/Make-sure-to-pass-systemd-when-we-re-managing-the-user-se.patch new file mode 100644 index 0000000..1735de5 --- /dev/null +++ b/debian/patches/debian/Make-sure-to-pass-systemd-when-we-re-managing-the-user-se.patch @@ -0,0 +1,29 @@ +From: Iain Lane <laney@debian.org> +Date: Thu, 3 Oct 2019 14:25:04 +0200 +Subject: Make sure to pass --systemd when we're managing the user session + with systemd + +This is a fixup for the "System X11 Default" session; at the minute real +sessions are expected to pass --systemd or --builtin as appopriate or be +happy with the default. + +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=941640 +Forwarded: not-needed +--- + gnome-session/gnome-session.in | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/gnome-session/gnome-session.in b/gnome-session/gnome-session.in +index ddd1a59..7a73610 100755 +--- a/gnome-session/gnome-session.in ++++ b/gnome-session/gnome-session.in +@@ -29,4 +29,8 @@ if [ -n "$REGION" ]; then + fi + fi + +-exec @libexecdir@/gnome-session-binary "$@" ++if [ -d "${XDG_RUNTIME_DIR}/systemd" ]; then ++ exec @libexecdir@/gnome-session-binary --systemd "$@" ++else ++ exec @libexecdir@/gnome-session-binary --builtin "$@" ++fi diff --git a/debian/patches/debian/Revert-main-Remove-GNOME_DESKTOP_SESSION_ID-envvar.patch b/debian/patches/debian/Revert-main-Remove-GNOME_DESKTOP_SESSION_ID-envvar.patch new file mode 100644 index 0000000..473662a --- /dev/null +++ b/debian/patches/debian/Revert-main-Remove-GNOME_DESKTOP_SESSION_ID-envvar.patch @@ -0,0 +1,32 @@ +From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <mail@3v1n0.net> +Date: Wed, 15 Aug 2018 17:13:57 +0200 +Subject: Revert "main: Remove GNOME_DESKTOP_SESSION_ID envvar" + +This reverts commit 00e0e6226371d53f651cc881e74c0543192c94a8. + +Keep this for compatibility reasons, many apps still depends on this + +This is Debian-specific - upstream have chosen to remove this compatibility but +we'll keep it. + +Forwarded: not-needed +--- + gnome-session/main.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/gnome-session/main.c b/gnome-session/main.c +index 443bc04..d30884b 100644 +--- a/gnome-session/main.c ++++ b/gnome-session/main.c +@@ -602,6 +602,11 @@ main (int argc, char **argv) + g_free (ibus_path); + } + ++ /* Some third-party programs rely on GNOME_DESKTOP_SESSION_ID to ++ * detect if GNOME is running. We keep this for compatibility reasons. ++ */ ++ gsm_util_setenv ("GNOME_DESKTOP_SESSION_ID", "this-is-deprecated"); ++ + /* We want to use the GNOME menus which has the designed categories. + */ + gsm_util_setenv ("XDG_MENU_PREFIX", "gnome-"); diff --git a/debian/patches/main-Use-already-defined-error-from-main-function.patch b/debian/patches/main-Use-already-defined-error-from-main-function.patch new file mode 100644 index 0000000..a22cc4e --- /dev/null +++ b/debian/patches/main-Use-already-defined-error-from-main-function.patch @@ -0,0 +1,29 @@ +From: Benjamin Berg <bberg@redhat.com> +Date: Mon, 19 Oct 2020 12:06:55 +0200 +Subject: main: Use already defined error from main function. + +Origin: upstream, 40, commit:33bc7b8bb5a4d2dbeaa8d3298b66bc8c75fc8adb +--- + gnome-session/main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gnome-session/main.c b/gnome-session/main.c +index 84edfbe..53f174e 100644 +--- a/gnome-session/main.c ++++ b/gnome-session/main.c +@@ -539,7 +539,6 @@ main (int argc, char **argv) + + #ifdef ENABLE_SYSTEMD_SESSION + if (use_systemd && !systemd_service) { +- g_autoptr(GError) error = NULL; + g_autofree gchar *gnome_session_target; + const gchar *session_type; + +@@ -571,6 +570,7 @@ main (int argc, char **argv) + + /* We could not start the unit, fall back. */ + g_warning ("Falling back to non-systemd startup procedure due to error: %s", error->message); ++ g_clear_error (&error); + } + #endif /* ENABLE_SYSTEMD_SESSION */ + diff --git a/debian/patches/main-Warn-about-failures-to-update-the-environment.patch b/debian/patches/main-Warn-about-failures-to-update-the-environment.patch new file mode 100644 index 0000000..c035b05 --- /dev/null +++ b/debian/patches/main-Warn-about-failures-to-update-the-environment.patch @@ -0,0 +1,37 @@ +From: Benjamin Berg <bberg@redhat.com> +Date: Mon, 19 Oct 2020 12:20:44 +0200 +Subject: main: Warn about failures to update the environment + +Bug: https://gitlab.gnome.org/GNOME/gnome-session/-/issues/71 +Origin: upstream, 40, commit:b6d98eb76b1d56da2d7202944a748723b58ece4a +--- + gnome-session/main.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/gnome-session/main.c b/gnome-session/main.c +index 53f174e..443bc04 100644 +--- a/gnome-session/main.c ++++ b/gnome-session/main.c +@@ -529,12 +529,20 @@ main (int argc, char **argv) + } + } + +- gsm_util_export_activation_environment (NULL); ++ gsm_util_export_activation_environment (&error); ++ if (error) { ++ g_warning ("Failed to upload environment to DBus: %s", error->message); ++ g_clear_error (&error); ++ } + + session_name = opt_session_name; + + #ifdef HAVE_SYSTEMD +- gsm_util_export_user_environment (NULL); ++ gsm_util_export_user_environment (&error); ++ if (error) { ++ g_warning ("Failed to upload environment to systemd: %s", error->message); ++ g_clear_error (&error); ++ } + #endif + + #ifdef ENABLE_SYSTEMD_SESSION diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..fc1f98c --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,18 @@ +Update-Latvian-translation.patch +Update-Dutch-translation.patch +Update-Hebrew-translation.patch +Update-Greek-translation.patch +Update-Bengali-India-translation.patch +Update-Chinese-Taiwan-translation.patch +Update-Norwegian-Bokm-l-translation.patch +data-Fix-indirect-conflict-with-exit.target-via-app.slice.patch +Stop-dbus-daemon-instead-of-restarting-it.patch +util-Only-accept-common-space-characters.patch +util-Log-variables-excluded-from-environment-upload.patch +main-Use-already-defined-error-from-main-function.patch +main-Warn-about-failures-to-update-the-environment.patch +util-Never-try-to-autostart-systemd.patch +util-Disable-capturing-of-subpatterns.patch +util-Remove-undesired-variables-from-activation-environme.patch +debian/Revert-main-Remove-GNOME_DESKTOP_SESSION_ID-envvar.patch +debian/Make-sure-to-pass-systemd-when-we-re-managing-the-user-se.patch diff --git a/debian/patches/util-Disable-capturing-of-subpatterns.patch b/debian/patches/util-Disable-capturing-of-subpatterns.patch new file mode 100644 index 0000000..8250eb8 --- /dev/null +++ b/debian/patches/util-Disable-capturing-of-subpatterns.patch @@ -0,0 +1,40 @@ +From: Benjamin Berg <bberg@redhat.com> +Date: Sun, 10 Jan 2021 19:26:07 +0100 +Subject: util: Disable capturing of subpatterns + +It seems that the pattern we use will create a subpattern match for +every character of the value. This appears to then result in a stack +overflow when matching very long values. + +It might be an idea to limit the overall length of an environment +variable that is uploaded. But, this should fix the issue of crashes. + +Bug: https://gitlab.gnome.org/GNOME/gnome-session/-/issues/42 +Origin: https://gitlab.gnome.org/GNOME/gnome-session/-/commit/3b57d117f78 +Applied-Upstream: 40 +--- + gnome-session/gsm-util.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gnome-session/gsm-util.c b/gnome-session/gsm-util.c +index 070fa75..cdf6761 100644 +--- a/gnome-session/gsm-util.c ++++ b/gnome-session/gsm-util.c +@@ -550,7 +550,7 @@ gsm_util_export_activation_environment (GError **error) + return FALSE; + } + +- value_regex = g_regex_new ("^([ \t\n]|[^[:cntrl:]])*$", G_REGEX_OPTIMIZE, 0, error); ++ value_regex = g_regex_new ("^(?:[ \t\n]|[^[:cntrl:]])*$", G_REGEX_OPTIMIZE, 0, error); + + if (value_regex == NULL) { + return FALSE; +@@ -630,7 +630,7 @@ gsm_util_export_user_environment (GError **error) + return FALSE; + } + +- regex = g_regex_new ("^[a-zA-Z_][a-zA-Z0-9_]*=([ \t\n]|[^[:cntrl:]])*$", G_REGEX_OPTIMIZE, 0, error); ++ regex = g_regex_new ("^[a-zA-Z_][a-zA-Z0-9_]*=(?:[ \t\n]|[^[:cntrl:]])*$", G_REGEX_OPTIMIZE, 0, error); + + if (regex == NULL) { + return FALSE; diff --git a/debian/patches/util-Log-variables-excluded-from-environment-upload.patch b/debian/patches/util-Log-variables-excluded-from-environment-upload.patch new file mode 100644 index 0000000..dc3a323 --- /dev/null +++ b/debian/patches/util-Log-variables-excluded-from-environment-upload.patch @@ -0,0 +1,55 @@ +From: Benjamin Berg <bberg@redhat.com> +Date: Mon, 19 Oct 2020 16:34:33 +0200 +Subject: util: Log variables excluded from environment upload + +See: #71 + +Origin: upstream, 40, commit:a24600d75e2da1e379411d1c5fdf8759b00b6320 +--- + gnome-session/gsm-util.c | 22 ++++++++++------------ + 1 file changed, 10 insertions(+), 12 deletions(-) + +diff --git a/gnome-session/gsm-util.c b/gnome-session/gsm-util.c +index 9d05fd7..bcad0eb 100644 +--- a/gnome-session/gsm-util.c ++++ b/gnome-session/gsm-util.c +@@ -568,17 +568,14 @@ gsm_util_export_activation_environment (GError **error) + if (g_strv_contains (variable_blacklist, entry_name)) + continue; + +- if (!g_utf8_validate (entry_name, -1, NULL)) +- continue; +- +- if (!g_regex_match (name_regex, entry_name, 0, NULL)) +- continue; +- +- if (!g_utf8_validate (entry_value, -1, NULL)) +- continue; ++ if (!g_utf8_validate (entry_name, -1, NULL) || ++ !g_regex_match (name_regex, entry_name, 0, NULL) || ++ !g_utf8_validate (entry_value, -1, NULL) || ++ !g_regex_match (value_regex, entry_value, 0, NULL)) { + +- if (!g_regex_match (value_regex, entry_value, 0, NULL)) ++ g_message ("Environment variable is unsafe to export to dbus: %s", entry_name); + continue; ++ } + + child_environment = g_environ_setenv (child_environment, + entry_name, entry_value, +@@ -655,11 +652,12 @@ gsm_util_export_user_environment (GError **error) + for (i = 0; entries[i] != NULL; i++) { + const char *entry = entries[i]; + +- if (!g_utf8_validate (entry, -1, NULL)) +- continue; ++ if (!g_utf8_validate (entry, -1, NULL) || ++ !g_regex_match (regex, entry, 0, NULL)) { + +- if (!g_regex_match (regex, entry, 0, NULL)) ++ g_message ("Environment entry is unsafe to upload into user environment: %s", entry); + continue; ++ } + + g_variant_builder_add (&builder, "s", entry); + } diff --git a/debian/patches/util-Never-try-to-autostart-systemd.patch b/debian/patches/util-Never-try-to-autostart-systemd.patch new file mode 100644 index 0000000..abcf973 --- /dev/null +++ b/debian/patches/util-Never-try-to-autostart-systemd.patch @@ -0,0 +1,52 @@ +From: Benjamin Berg <bberg@redhat.com> +Date: Thu, 24 Sep 2020 22:35:18 +0200 +Subject: util: Never try to autostart systemd + +systemd cannot be auto-started. Doing this avoids warnings during login +of the gdm user where we (intentionally) cannot use systemd. + +Origin: upstream, 40, commit:87d92fece1bbc67146631330649cee2353bd6761 +--- + gnome-session/gsm-util.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/gnome-session/gsm-util.c b/gnome-session/gsm-util.c +index bcad0eb..070fa75 100644 +--- a/gnome-session/gsm-util.c ++++ b/gnome-session/gsm-util.c +@@ -673,7 +673,7 @@ gsm_util_export_user_environment (GError **error) + "UnsetAndSetEnvironment", + g_variant_builder_end (&builder), + NULL, +- G_DBUS_CALL_FLAGS_NONE, ++ G_DBUS_CALL_FLAGS_NO_AUTO_START, + -1, NULL, &bus_error); + + if (bus_error != NULL) { +@@ -720,7 +720,7 @@ gsm_util_update_user_environment (const char *variable, + g_variant_new ("(@as)", + g_variant_builder_end (&builder)), + NULL, +- G_DBUS_CALL_FLAGS_NONE, ++ G_DBUS_CALL_FLAGS_NO_AUTO_START, + -1, NULL, &bus_error); + + if (bus_error != NULL) { +@@ -757,7 +757,7 @@ gsm_util_start_systemd_unit (const char *unit, + g_variant_new ("(ss)", + unit, mode), + NULL, +- G_DBUS_CALL_FLAGS_NONE, ++ G_DBUS_CALL_FLAGS_NO_AUTO_START, + -1, NULL, &bus_error); + + if (bus_error != NULL) { +@@ -787,7 +787,7 @@ gsm_util_systemd_reset_failed (GError **error) + "ResetFailed", + NULL, + NULL, +- G_DBUS_CALL_FLAGS_NONE, ++ G_DBUS_CALL_FLAGS_NO_AUTO_START, + -1, NULL, &bus_error); + + if (bus_error != NULL) { diff --git a/debian/patches/util-Only-accept-common-space-characters.patch b/debian/patches/util-Only-accept-common-space-characters.patch new file mode 100644 index 0000000..34e7c83 --- /dev/null +++ b/debian/patches/util-Only-accept-common-space-characters.patch @@ -0,0 +1,38 @@ +From: Benjamin Berg <bberg@redhat.com> +Date: Mon, 19 Oct 2020 16:27:59 +0200 +Subject: util: Only accept common space characters + +Specifically, systemd only permits " \t\n" and we should stick to the +same set of permitted space characters. + +See also + https://github.com/systemd/systemd/issues/17378 + +Bug: https://gitlab.gnome.org/GNOME/gnome-session/-/issues/70 +Origin: upstream, 40, commit:fe22c4ee12922d790478bfe8b5b2e7c1313ca2f0 +--- + gnome-session/gsm-util.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gnome-session/gsm-util.c b/gnome-session/gsm-util.c +index 18a9470..9d05fd7 100644 +--- a/gnome-session/gsm-util.c ++++ b/gnome-session/gsm-util.c +@@ -550,7 +550,7 @@ gsm_util_export_activation_environment (GError **error) + return FALSE; + } + +- value_regex = g_regex_new ("^([[:blank:]]|[^[:cntrl:]])*$", G_REGEX_OPTIMIZE, 0, error); ++ value_regex = g_regex_new ("^([ \t\n]|[^[:cntrl:]])*$", G_REGEX_OPTIMIZE, 0, error); + + if (value_regex == NULL) { + return FALSE; +@@ -633,7 +633,7 @@ gsm_util_export_user_environment (GError **error) + return FALSE; + } + +- regex = g_regex_new ("^[a-zA-Z_][a-zA-Z0-9_]*=([[:blank:]]|[^[:cntrl:]])*$", G_REGEX_OPTIMIZE, 0, error); ++ regex = g_regex_new ("^[a-zA-Z_][a-zA-Z0-9_]*=([ \t\n]|[^[:cntrl:]])*$", G_REGEX_OPTIMIZE, 0, error); + + if (regex == NULL) { + return FALSE; diff --git a/debian/patches/util-Remove-undesired-variables-from-activation-environme.patch b/debian/patches/util-Remove-undesired-variables-from-activation-environme.patch new file mode 100644 index 0000000..65255fd --- /dev/null +++ b/debian/patches/util-Remove-undesired-variables-from-activation-environme.patch @@ -0,0 +1,35 @@ +From: Simon McVittie <smcv@debian.org> +Date: Mon, 29 Mar 2021 12:49:35 +0100 +Subject: util: Remove undesired variables from activation environment + +Commit 646b9bc0 (included in 3.33.92) prevented one run of gnome-session +from uploading environment variables into `systemd --user` that should not +leak into a different login session, such as XDG_SESSION_ID. However, +non-GNOME session managers (and in particular the forks of gnome-session +found in Cinnamon and MATE) might still upload those environment variables. + +The other session managers should be fixed, similar to 646b9bc0, but we +can mitigate this for GNOME sessions by actively unsetting the undesired +variables, instead of just not setting them. + +Signed-off-by: Simon McVittie <smcv@collabora.com> +Bug: https://gitlab.gnome.org/GNOME/gnome-session/-/issues/86 +Bug-Debian: https://bugs.debian.org/973474 +Forwarded: https://gitlab.gnome.org/GNOME/gnome-session/-/merge_requests/63 +--- + gnome-session/gsm-util.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gnome-session/gsm-util.c b/gnome-session/gsm-util.c +index cdf6761..7dc4f26 100644 +--- a/gnome-session/gsm-util.c ++++ b/gnome-session/gsm-util.c +@@ -646,6 +646,8 @@ gsm_util_export_user_environment (GError **error) + g_variant_builder_open (&builder, G_VARIANT_TYPE ("as")); + for (i = 0; variable_unsetlist[i] != NULL; i++) + g_variant_builder_add (&builder, "s", variable_unsetlist[i]); ++ for (i = 0; variable_blacklist[i] != NULL; i++) ++ g_variant_builder_add (&builder, "s", variable_blacklist[i]); + g_variant_builder_close (&builder); + + g_variant_builder_open (&builder, G_VARIANT_TYPE ("as")); |