diff -Nru gnome-session-44.0/data/gnome-portals.conf gnome-session-45.0/data/gnome-portals.conf --- gnome-session-44.0/data/gnome-portals.conf 1970-01-01 00:00:00.000000000 +0000 +++ gnome-session-45.0/data/gnome-portals.conf 2023-09-17 11:53:31.000000000 +0000 @@ -0,0 +1,4 @@ +[preferred] +default=gnome;gtk; +org.freedesktop.impl.portal.Access=gnome-shell;gtk; +org.freedesktop.impl.portal.Secret=gnome-keyring; diff -Nru gnome-session-44.0/data/meson.build gnome-session-45.0/data/meson.build --- gnome-session-44.0/data/meson.build 2023-03-20 15:48:49.000000000 +0000 +++ gnome-session-45.0/data/meson.build 2023-09-17 11:53:31.000000000 +0000 @@ -195,3 +195,8 @@ data, install_dir: session_pkgdatadir ) + +install_data( + 'gnome-portals.conf', + install_dir: session_datadir / 'xdg-desktop-portal', +) diff -Nru gnome-session-44.0/debian/changelog gnome-session-45.0/debian/changelog --- gnome-session-44.0/debian/changelog 2023-09-07 14:35:01.000000000 +0000 +++ gnome-session-45.0/debian/changelog 2023-09-18 21:57:50.000000000 +0000 @@ -1,3 +1,63 @@ +gnome-session (45.0-1ubuntu1) mantic; urgency=medium + + * Merge with Debian. Remaining changes: + - debian/control.in: + + Recommend session-migration + + Move xwayland dependency to gnome-session and make gnome-session + Arch: any + + Split gnome-startup-applications to a separate binary package so + that it can be uninstalled without breaking the system + + Add unity-session + - debian/rules: Ensure pot file is generated to translate session files + - Split ubuntu-session out of gnome-session. + - debian/data: Add old-style systemd user session used by Unity + - debian/gnome-session-bin.postinst, debian/gnome-session-bin.prerm: + Moved registering gnome-session binary as a session manager to + gnome-session-bin package + - don't install gnome-mimeapps.list (installed by desktop-file-utils in + Ubuntu): + debian/gnome-session-common.dirs, gnome-session-common.install, + gnome-session-common.maintscript, gnome-session-common.postinst + - debian/patches/ubuntu/support_autostart_delay.patch: + + Bugzilla patch to support adding a delay to autostart apps, using + a "X-GNOME-Autostart-Delay" key in the desktop file + - debian/patches/ubuntu/ubuntu_sessions.patch: + + Add ubuntu sessions + - debian/patches/ubuntu/remove_session_saving_from_gui.patch: + + Add GNOME_SESSION_SAVE environment variable for people wanting to + use the save session still, knowing that it can break your system + if used unwisely + - debian/patches/ubuntu/add_sessionmigration.patch: + + launch session-migration if present at the start of the session. + This sync tool runns different session migration scripts that can be + provided in various desktop packages. + - debian/patches/ubuntu/dbus_request_shutdown.patch: + + Add "RequestShutdown" and "RequestReboot" DBus methods to allow + other applications to shutdown or reboot the machine via the session + manager. + - debian/patches/ubuntu/ignore_gsettings_region.patch: + + Ignore the "region" gsettings value - users' setting of LC_* + variables saved in ~/.pam_environment. + - debian/patches/revert_remove_gnome_session_properties.patch: + + Don't merge translations into gnome-session-properties.desktop + - debian/ubuntu-settings-migrate-to-defaults.18.10.1.py: + + Migrate users using old default ubuntu-settings to current ones + - debian/xdg_dirs_desktop_session.sh: Install a new script into + /etc/profile.d to prepend a $DESKTOP_SESSION related directory to + $XDG_{CONFIG,DATA}_DIRS. + * Update ubuntu-sessions.patch to use semicolons for DesktopNames + as recommended at bug 2036098 + + -- Jeremy Bícha Mon, 18 Sep 2023 17:57:50 -0400 + +gnome-session (45.0-1) unstable; urgency=medium + + * Team upload + * New upstream release + * Drop patches that were included in the new upstream release + + -- Simon McVittie Mon, 18 Sep 2023 11:14:11 +0100 + gnome-session (44.0-4ubuntu1) mantic; urgency=medium * Merge with Debian to fix Dark Theme regression (LP: #2034602). diff -Nru gnome-session-44.0/debian/patches/data-Add-gnome-portals.conf.patch gnome-session-45.0/debian/patches/data-Add-gnome-portals.conf.patch --- gnome-session-44.0/debian/patches/data-Add-gnome-portals.conf.patch 2023-09-07 14:35:01.000000000 +0000 +++ gnome-session-45.0/debian/patches/data-Add-gnome-portals.conf.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ -From: Georges Basile Stavracas Neto -Date: Tue, 22 Aug 2023 18:20:36 -0300 -Subject: data: Add gnome-portals.conf - -Now that xdg-desktop-portal handles portal implementations using -a well-defined config file, let's ship the GNOME blend of portals -in gnome-portals.conf. Install it under datadir/xdg-desktop-portal, -which usually would resolve to /usr/share/xdg-desktop-portal. - -Bug: https://gitlab.gnome.org/GNOME/gnome-session/-/issues/114 -Forwarded: https://gitlab.gnome.org/GNOME/gnome-session/-/merge_requests/95 ---- - data/gnome-portals.conf | 4 ++++ - data/meson.build | 5 +++++ - 2 files changed, 9 insertions(+) - create mode 100644 data/gnome-portals.conf - -diff --git a/data/gnome-portals.conf b/data/gnome-portals.conf -new file mode 100644 -index 0000000..198e644 ---- /dev/null -+++ b/data/gnome-portals.conf -@@ -0,0 +1,4 @@ -+[preferred] -+default=gnome;gtk; -+org.freedesktop.impl.portal.Access=gnome-shell;gtk; -+org.freedesktop.impl.portal.Secret=gnome-keyring; -diff --git a/data/meson.build b/data/meson.build -index f6d264f..f37924b 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -195,3 +195,8 @@ install_data( - data, - install_dir: session_pkgdatadir - ) -+ -+install_data( -+ 'gnome-portals.conf', -+ install_dir: session_datadir / 'xdg-desktop-portal', -+) diff -Nru gnome-session-44.0/debian/patches/debian/Revert-main-Remove-GNOME_DESKTOP_SESSION_ID-envvar.patch gnome-session-45.0/debian/patches/debian/Revert-main-Remove-GNOME_DESKTOP_SESSION_ID-envvar.patch --- gnome-session-44.0/debian/patches/debian/Revert-main-Remove-GNOME_DESKTOP_SESSION_ID-envvar.patch 2023-09-07 14:35:01.000000000 +0000 +++ gnome-session-45.0/debian/patches/debian/Revert-main-Remove-GNOME_DESKTOP_SESSION_ID-envvar.patch 2023-09-18 21:57:50.000000000 +0000 @@ -15,10 +15,10 @@ 1 file changed, 5 insertions(+) diff --git a/gnome-session/main.c b/gnome-session/main.c -index 3ae8522..84ec415 100644 +index db8fd97..3e94c62 100644 --- a/gnome-session/main.c +++ b/gnome-session/main.c -@@ -611,6 +611,11 @@ main (int argc, char **argv) +@@ -622,6 +622,11 @@ main (int argc, char **argv) g_free (ibus_path); } diff -Nru gnome-session-44.0/debian/patches/gnome-session-Bind-more-LC_-variables-to-REGION.patch gnome-session-45.0/debian/patches/gnome-session-Bind-more-LC_-variables-to-REGION.patch --- gnome-session-44.0/debian/patches/gnome-session-Bind-more-LC_-variables-to-REGION.patch 2023-09-07 14:35:01.000000000 +0000 +++ gnome-session-45.0/debian/patches/gnome-session-Bind-more-LC_-variables-to-REGION.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ -From: Benjamin Berg -Date: Fri, 16 Apr 2021 12:34:16 +0200 -Subject: gnome-session: Bind more LC_* variables to REGION - -This adds both LC_ADDRESS and LC_TELEPHONE to the list of variables that -are set from the configured user region. - -Also change the list to be in the same order as printed by the "locale" -command and add comments for entries that we are not setting. - -Origin: commit 6e76dc3761caac4b1b211c33538d86457aaa5687 ---- - gnome-session/gnome-session.in | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/gnome-session/gnome-session.in b/gnome-session/gnome-session.in -index ddd1a59..b43ebaa 100755 ---- a/gnome-session/gnome-session.in -+++ b/gnome-session/gnome-session.in -@@ -21,11 +21,18 @@ if [ -n "$REGION" ]; then - unset LC_TIME LC_NUMERIC LC_MONETARY LC_MEASUREMENT LC_PAPER - - if [ "$LANG" != "$REGION" ] ; then -- export LC_TIME=$REGION -+ # LC_CTYPE - export LC_NUMERIC=$REGION -+ export LC_TIME=$REGION -+ # LC_COLLATE - export LC_MONETARY=$REGION -- export LC_MEASUREMENT=$REGION -+ # LC_MESSAGES - export LC_PAPER=$REGION -+ # LC_NAME -+ export LC_ADDRESS=$REGION -+ export LC_TELEPHONE=$REGION -+ export LC_MEASUREMENT=$REGION -+ # LC_IDENTIFICATION - fi - fi - diff -Nru gnome-session-44.0/debian/patches/gsm-system-make-return_false-actually-return-FALSE.patch gnome-session-45.0/debian/patches/gsm-system-make-return_false-actually-return-FALSE.patch --- gnome-session-44.0/debian/patches/gsm-system-make-return_false-actually-return-FALSE.patch 2023-09-07 14:35:01.000000000 +0000 +++ gnome-session-45.0/debian/patches/gsm-system-make-return_false-actually-return-FALSE.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -From: =?utf-8?q?Pablo_Correa_G=C3=B3mez?= -Date: Thu, 20 Apr 2023 23:45:55 +0200 -Subject: gsm-system: make return_false actually return FALSE - -Origin: commit 9222174a315083c57f542685bc0a03ad9b501934 ---- - gnome-session/gsm-system.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gnome-session/gsm-system.c b/gnome-session/gsm-system.c -index 39b59f9..6d23a49 100644 ---- a/gnome-session/gsm-system.c -+++ b/gnome-session/gsm-system.c -@@ -77,7 +77,7 @@ typedef GObjectClass GsmSystemNullClass; - - static void do_nothing (void) { } - static gboolean return_true (void) { return TRUE; } --static gboolean return_false (void) { return TRUE; } -+static gboolean return_false (void) { return FALSE; } - - static void - gsm_system_null_init_iface (GsmSystemInterface *iface) diff -Nru gnome-session-44.0/debian/patches/revert_remove_gnome_session_properties.patch gnome-session-45.0/debian/patches/revert_remove_gnome_session_properties.patch --- gnome-session-44.0/debian/patches/revert_remove_gnome_session_properties.patch 2023-09-07 14:35:01.000000000 +0000 +++ gnome-session-45.0/debian/patches/revert_remove_gnome_session_properties.patch 2023-09-18 21:57:50.000000000 +0000 @@ -6221,7 +6221,7 @@ install_data( diff --git a/meson.build b/meson.build -index 5121dc6..eac19a8 100644 +index ccfbffa..04d2af7 100644 --- a/meson.build +++ b/meson.build @@ -190,6 +190,7 @@ top_inc = include_directories('.') diff -Nru gnome-session-44.0/debian/patches/series gnome-session-45.0/debian/patches/series --- gnome-session-44.0/debian/patches/series 2023-09-07 14:35:01.000000000 +0000 +++ gnome-session-45.0/debian/patches/series 2023-09-18 21:57:50.000000000 +0000 @@ -1,7 +1,4 @@ -data-Add-gnome-portals.conf.patch debian/Revert-main-Remove-GNOME_DESKTOP_SESSION_ID-envvar.patch -gsm-system-make-return_false-actually-return-FALSE.patch -gnome-session-Bind-more-LC_-variables-to-REGION.patch ubuntu/support_autostart_delay.patch ubuntu/ubuntu-sessions.patch ubuntu/remove_session_saving_from_gui.patch diff -Nru gnome-session-44.0/debian/patches/ubuntu/dbus_request_shutdown.patch gnome-session-45.0/debian/patches/ubuntu/dbus_request_shutdown.patch --- gnome-session-44.0/debian/patches/ubuntu/dbus_request_shutdown.patch 2023-09-07 14:35:01.000000000 +0000 +++ gnome-session-45.0/debian/patches/ubuntu/dbus_request_shutdown.patch 2023-09-18 21:57:50.000000000 +0000 @@ -11,7 +11,7 @@ 3 files changed, 66 insertions(+) diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c -index 83d22cc..5385fbe 100644 +index d958c57..7f41b1c 100644 --- a/gnome-session/gsm-manager.c +++ b/gnome-session/gsm-manager.c @@ -2664,6 +2664,51 @@ request_logout (GsmManager *manager, diff -Nru gnome-session-44.0/debian/patches/ubuntu/support_autostart_delay.patch gnome-session-45.0/debian/patches/ubuntu/support_autostart_delay.patch --- gnome-session-44.0/debian/patches/ubuntu/support_autostart_delay.patch 2023-09-07 14:35:01.000000000 +0000 +++ gnome-session-45.0/debian/patches/ubuntu/support_autostart_delay.patch 2023-09-18 21:57:50.000000000 +0000 @@ -156,7 +156,7 @@ G_END_DECLS diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c -index 05e0d8d..83d22cc 100644 +index a19b7f5..d958c57 100644 --- a/gnome-session/gsm-manager.c +++ b/gnome-session/gsm-manager.c @@ -415,7 +415,8 @@ app_condition_changed (GsmApp *app, diff -Nru gnome-session-44.0/debian/patches/ubuntu/ubuntu-sessions.patch gnome-session-45.0/debian/patches/ubuntu/ubuntu-sessions.patch --- gnome-session-44.0/debian/patches/ubuntu/ubuntu-sessions.patch 2023-09-07 14:35:01.000000000 +0000 +++ gnome-session-45.0/debian/patches/ubuntu/ubuntu-sessions.patch 2023-09-18 21:57:50.000000000 +0000 @@ -161,7 +161,7 @@ foreach session: sessions diff --git a/data/ubuntu-wayland.desktop.in.in b/data/ubuntu-wayland.desktop.in.in new file mode 100644 -index 0000000..958d171 +index 0000000..4bfcde3 --- /dev/null +++ b/data/ubuntu-wayland.desktop.in.in @@ -0,0 +1,8 @@ @@ -171,11 +171,11 @@ +Exec=env GNOME_SHELL_SESSION_MODE=ubuntu @bindir@/gnome-session --session=ubuntu +TryExec=@bindir@/gnome-shell +Type=Application -+DesktopNames=ubuntu:GNOME ++DesktopNames=ubuntu;GNOME; +X-GDM-SessionRegisters=true diff --git a/data/ubuntu-xorg.desktop.in.in b/data/ubuntu-xorg.desktop.in.in new file mode 100644 -index 0000000..071ebad +index 0000000..7338097 --- /dev/null +++ b/data/ubuntu-xorg.desktop.in.in @@ -0,0 +1,8 @@ @@ -185,11 +185,11 @@ +Exec=env GNOME_SHELL_SESSION_MODE=ubuntu @bindir@/gnome-session --session=ubuntu +TryExec=@bindir@/gnome-shell +Type=Application -+DesktopNames=ubuntu:GNOME ++DesktopNames=ubuntu;GNOME; +X-GDM-SessionRegisters=true diff --git a/data/ubuntu.desktop.in.in b/data/ubuntu.desktop.in.in new file mode 100644 -index 0000000..bc6a697 +index 0000000..dd6398f --- /dev/null +++ b/data/ubuntu.desktop.in.in @@ -0,0 +1,8 @@ @@ -199,7 +199,7 @@ +Exec=env GNOME_SHELL_SESSION_MODE=ubuntu @bindir@/gnome-session --session=ubuntu +TryExec=@bindir@/gnome-shell +Type=Application -+DesktopNames=ubuntu:GNOME ++DesktopNames=ubuntu;GNOME +X-GDM-SessionRegisters=true diff --git a/data/ubuntu.session.conf.in b/data/ubuntu.session.conf.in new file mode 100644 @@ -224,7 +224,7 @@ +RequiredComponents=@required_components@; diff --git a/data/unity.desktop.in.in b/data/unity.desktop.in.in new file mode 100644 -index 0000000..2a489dc +index 0000000..1e05ef2 --- /dev/null +++ b/data/unity.desktop.in.in @@ -0,0 +1,7 @@ @@ -234,17 +234,17 @@ +Exec=/usr/libexec/run-systemd-session unity-session.target +TryExec=@bindir@/unity +Type=Application -+DesktopNames=Unity:Unity7:ubuntu ++DesktopNames=Unity;Unity7;ubuntu; diff --git a/data/unity.session.desktop.in.in b/data/unity.session.desktop.in.in new file mode 100644 -index 0000000..615b492 +index 0000000..45076ed --- /dev/null +++ b/data/unity.session.desktop.in.in @@ -0,0 +1,4 @@ +[GNOME Session] +Name=Unity +RequiredComponents=unity-settings-daemon; -+DesktopName=Unity:Unity7:ubuntu ++DesktopName=Unity;Unity7;ubuntu; diff --git a/data/wayland-sessions/meson.build b/data/wayland-sessions/meson.build new file mode 100644 index 0000000..8b13789 diff -Nru gnome-session-44.0/gnome-session/gnome-session.in gnome-session-45.0/gnome-session/gnome-session.in --- gnome-session-44.0/gnome-session/gnome-session.in 2023-03-20 15:48:49.000000000 +0000 +++ gnome-session-45.0/gnome-session/gnome-session.in 2023-09-17 11:53:31.000000000 +0000 @@ -21,11 +21,18 @@ unset LC_TIME LC_NUMERIC LC_MONETARY LC_MEASUREMENT LC_PAPER if [ "$LANG" != "$REGION" ] ; then - export LC_TIME=$REGION + # LC_CTYPE export LC_NUMERIC=$REGION + export LC_TIME=$REGION + # LC_COLLATE export LC_MONETARY=$REGION - export LC_MEASUREMENT=$REGION + # LC_MESSAGES export LC_PAPER=$REGION + # LC_NAME + export LC_ADDRESS=$REGION + export LC_TELEPHONE=$REGION + export LC_MEASUREMENT=$REGION + # LC_IDENTIFICATION fi fi diff -Nru gnome-session-44.0/gnome-session/gsm-manager.c gnome-session-45.0/gnome-session/gsm-manager.c --- gnome-session-44.0/gnome-session/gsm-manager.c 2023-03-20 15:48:49.000000000 +0000 +++ gnome-session-45.0/gnome-session/gsm-manager.c 2023-09-17 11:53:31.000000000 +0000 @@ -3154,7 +3154,7 @@ "Reason not specified"); g_debug ("GsmManager: Unable to inhibit: %s", new_error->message); g_dbus_method_invocation_take_error (invocation, new_error); - return FALSE; + return TRUE; } if (flags == 0) { @@ -3165,7 +3165,7 @@ "Invalid inhibit flags"); g_debug ("GsmManager: Unable to inhibit: %s", new_error->message); g_dbus_method_invocation_take_error (invocation, new_error); - return FALSE; + return TRUE; } cookie = _generate_unique_cookie (manager); diff -Nru gnome-session-44.0/gnome-session/gsm-system.c gnome-session-45.0/gnome-session/gsm-system.c --- gnome-session-44.0/gnome-session/gsm-system.c 2023-03-20 15:48:49.000000000 +0000 +++ gnome-session-45.0/gnome-session/gsm-system.c 2023-09-17 11:53:31.000000000 +0000 @@ -77,7 +77,7 @@ static void do_nothing (void) { } static gboolean return_true (void) { return TRUE; } -static gboolean return_false (void) { return TRUE; } +static gboolean return_false (void) { return FALSE; } static void gsm_system_null_init_iface (GsmSystemInterface *iface) diff -Nru gnome-session-44.0/gnome-session/gsm-util.c gnome-session-45.0/gnome-session/gsm-util.c --- gnome-session-44.0/gnome-session/gsm-util.c 2023-03-20 15:48:49.000000000 +0000 +++ gnome-session-45.0/gnome-session/gsm-util.c 2023-09-17 11:53:31.000000000 +0000 @@ -754,6 +754,76 @@ } gboolean +gsm_util_systemd_unit_is_active (const char *unit, + GError **error) +{ + g_autoptr(GDBusProxy) proxy = NULL; + g_autoptr(GVariant) result = NULL; + g_autofree gchar *object_path = NULL; + g_autofree gchar *active_state = NULL; + g_autoptr(GDBusProxy) unit_proxy = NULL; + + proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, + G_DBUS_PROXY_FLAGS_NONE, + NULL, + "org.freedesktop.systemd1", + "/org/freedesktop/systemd1", + "org.freedesktop.systemd1.Manager", + NULL, + error); + + if (proxy == NULL) { + return FALSE; + } + + result = g_dbus_proxy_call_sync (proxy, + "GetUnit", + g_variant_new ("(s)", unit), + G_DBUS_CALL_FLAGS_NONE, + -1, + NULL, + error); + + if (result == NULL) { + if (error && *error) { + g_autofree char *remote_error = g_dbus_error_get_remote_error (*error); + + if (g_strcmp0 (remote_error, "org.freedesktop.systemd1.NoSuchUnit") == 0) { + g_clear_error (error); + } + } + return FALSE; + } + + g_variant_get (result, "(o)", &object_path); + g_clear_pointer (&result, g_variant_unref); + + unit_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, + G_DBUS_PROXY_FLAGS_NONE, + NULL, + "org.freedesktop.systemd1", + object_path, + "org.freedesktop.systemd1.Unit", + NULL, + error); + + if (unit_proxy == NULL) { + return FALSE; + } + + result = g_dbus_proxy_get_cached_property (unit_proxy, "ActiveState"); + + if (result == NULL) { + g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_PROPERTY, "Error getting ActiveState property"); + return FALSE; + } + + g_variant_get (result, "s", &active_state); + + return g_str_equal (active_state, "active"); +} + +gboolean gsm_util_start_systemd_unit (const char *unit, const char *mode, GError **error) diff -Nru gnome-session-44.0/gnome-session/gsm-util.h gnome-session-45.0/gnome-session/gsm-util.h --- gnome-session-44.0/gnome-session/gsm-util.h 2023-03-20 15:48:49.000000000 +0000 +++ gnome-session-45.0/gnome-session/gsm-util.h 2023-09-17 11:53:31.000000000 +0000 @@ -55,6 +55,8 @@ gboolean gsm_util_export_activation_environment (GError **error); #ifdef HAVE_SYSTEMD gboolean gsm_util_export_user_environment (GError **error); +gboolean gsm_util_systemd_unit_is_active (const char *unit, + GError **error); gboolean gsm_util_start_systemd_unit (const char *unit, const char *mode, GError **error); diff -Nru gnome-session-44.0/gnome-session/main.c gnome-session-45.0/gnome-session/main.c --- gnome-session-44.0/gnome-session/main.c 2023-03-20 15:48:49.000000000 +0000 +++ gnome-session-45.0/gnome-session/main.c 2023-09-17 11:53:31.000000000 +0000 @@ -554,8 +554,8 @@ #ifdef ENABLE_SYSTEMD_SESSION if (use_systemd && !systemd_service) { - g_autofree gchar *gnome_session_target; - const gchar *session_type; + const gchar *session_type = NULL; + g_autofree gchar *gnome_session_target = NULL; session_type = g_getenv ("XDG_SESSION_TYPE"); @@ -565,29 +565,40 @@ session_name = _gsm_manager_get_default_session (NULL); } - /* Reset all failed units; we are going to start a lof ot things and - * really do not want to run into errors because units have failed - * in a previous session - */ - gsm_util_systemd_reset_failed (&error); - if (error && !g_getenv ("RUNNING_UNDER_GDM")) - g_warning ("Failed to reset failed state of units: %s", error->message); - g_clear_error (&error); - /* We don't escape the name (i.e. we leave any '-' intact). */ gnome_session_target = g_strdup_printf ("gnome-session-%s@%s.target", session_type, session_name); - if (gsm_util_start_systemd_unit (gnome_session_target, "fail", &error)) { - /* We started the unit, open fifo and sleep forever. */ - systemd_leader_run (); - exit(0); - } - /* We could not start the unit, fall back. */ - if (g_getenv ("RUNNING_UNDER_GDM")) - g_message ("Falling back to non-systemd startup procedure. This is expected to happen for GDM sessions."); - else - g_warning ("Falling back to non-systemd startup procedure due to error: %s", error->message); - g_clear_error (&error); + if (!gsm_util_systemd_unit_is_active (gnome_session_target, &error)) { + if (error != NULL) { + g_warning ("Could not check if unit %s is active: %s", + gnome_session_target, error->message); + g_clear_error (&error); + } + /* Reset all failed units; we are going to start a lof ot things and + * really do not want to run into errors because units have failed + * in a previous session + */ + gsm_util_systemd_reset_failed (&error); + if (error && !g_getenv ("RUNNING_UNDER_GDM")) + g_warning ("Failed to reset failed state of units: %s", error->message); + g_clear_error (&error); + + if (gsm_util_start_systemd_unit (gnome_session_target, "fail", &error)) { + /* We started the unit, open fifo and sleep forever. */ + systemd_leader_run (); + exit (0); + } + + /* We could not start the unit, fall back. */ + if (g_getenv ("RUNNING_UNDER_GDM")) + g_message ("Falling back to non-systemd startup procedure. This is expected to happen for GDM sessions."); + else + g_warning ("Falling back to non-systemd startup procedure due to error: %s", error->message); + g_clear_error (&error); + } else { + g_warning ("Session manager already running!"); + exit (1); + } } #endif /* ENABLE_SYSTEMD_SESSION */ diff -Nru gnome-session-44.0/gnome-session.doap gnome-session-45.0/gnome-session.doap --- gnome-session-44.0/gnome-session.doap 2023-03-20 15:48:49.000000000 +0000 +++ gnome-session-45.0/gnome-session.doap 2023-09-17 11:53:31.000000000 +0000 @@ -13,9 +13,9 @@ GNOME Session also provides the definition of what a standard GNOME session consists of. - - - + + + C @@ -31,7 +31,7 @@ William Jon McCann - mccann + diff -Nru gnome-session-44.0/meson.build gnome-session-45.0/meson.build --- gnome-session-44.0/meson.build 2023-03-20 15:48:49.000000000 +0000 +++ gnome-session-45.0/meson.build 2023-09-17 11:53:31.000000000 +0000 @@ -1,6 +1,6 @@ project( 'gnome-session', 'c', - version: '44.0', + version: '45.0', license: 'GPL2+', default_options: 'buildtype=debugoptimized', meson_version: '>= 0.53.0' diff -Nru gnome-session-44.0/NEWS gnome-session-45.0/NEWS --- gnome-session-44.0/NEWS 2023-03-20 15:48:49.000000000 +0000 +++ gnome-session-45.0/NEWS 2023-09-17 11:53:31.000000000 +0000 @@ -1,4 +1,12 @@ ============ +Version 45.0 +============ + + Two crashers fixes + Fix inverted boolean in the "null" system backend + Translation updates + +============ Version 44.0 ============ diff -Nru gnome-session-44.0/po/bg.po gnome-session-45.0/po/bg.po --- gnome-session-44.0/po/bg.po 2023-03-20 15:48:49.000000000 +0000 +++ gnome-session-45.0/po/bg.po 2023-09-17 11:53:31.000000000 +0000 @@ -237,7 +237,7 @@ #: gnome-session/main.c:406 msgid "Version of this application" -msgstr "Версията на тази програма" +msgstr "Версията на програмата" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong #: gnome-session/main.c:408 diff -Nru gnome-session-44.0/po/el.po gnome-session-45.0/po/el.po --- gnome-session-44.0/po/el.po 2023-03-20 15:48:49.000000000 +0000 +++ gnome-session-45.0/po/el.po 2023-09-17 11:53:31.000000000 +0000 @@ -36,8 +36,8 @@ msgstr "" "Project-Id-Version: el\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-session/issues\n" -"POT-Creation-Date: 2020-07-31 14:02+0000\n" -"PO-Revision-Date: 2020-09-30 23:04+0300\n" +"POT-Creation-Date: 2023-05-05 13:09+0000\n" +"PO-Revision-Date: 2023-08-01 23:42+0300\n" "Last-Translator: Efstathios Iosifidis \n" "Language-Team: Greek, Modern (1453-) \n" "Language: el\n" @@ -45,7 +45,7 @@ "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.3\n" +"X-Generator: Poedit 3.3.2\n" "X-Project-Style: gnome\n" #: data/gnome-custom-session.desktop.in.in:3 @@ -57,7 +57,6 @@ msgstr "Αυτή η καταχώριση επιτρέπει την επιλογή μιας αποθηκευμένης συνεδρίας" #: data/gnome.desktop.in.in:3 data/gnome.session.desktop.in.in:3 -#: data/gnome-wayland.desktop.in.in:3 msgid "GNOME" msgstr "GNOME" @@ -70,6 +69,10 @@ msgid "GNOME dummy" msgstr "Εικονικό GNOME" +#: data/gnome-wayland.desktop.in.in:3 +msgid "GNOME on Wayland" +msgstr "GNOME σε Wayland" + #: data/gnome-xorg.desktop.in.in:3 msgid "GNOME on Xorg" msgstr "GNOME σε Xorg" @@ -174,7 +177,7 @@ msgid "_Log Out" msgstr "Απο_σύνδεση" -#: gnome-session/gsm-fail-whale-dialog.c:412 gnome-session/main.c:404 +#: gnome-session/gsm-fail-whale-dialog.c:412 gnome-session/main.c:412 msgid "Enable debugging code" msgstr "Ενεργοποίηση κώδικα αποφαλμάτωσης" @@ -186,11 +189,11 @@ msgid "Show extension warning" msgstr "Προβολή προειδοποίησης επέκτασης" -#: gnome-session/gsm-manager.c:1289 gnome-session/gsm-manager.c:1999 +#: gnome-session/gsm-manager.c:1317 gnome-session/gsm-manager.c:2068 msgid "Not responding" msgstr "Δεν ανταποκρίνεται" -#: gnome-session/gsm-util.c:415 +#: gnome-session/gsm-util.c:431 msgid "_Log out" msgstr "_Αποσύνδεση" @@ -206,66 +209,66 @@ msgid "This program is blocking logout." msgstr "Αυτό το πρόγραμμα εμποδίζει την αποσύνδεση." -#: gnome-session/gsm-xsmp-server.c:338 +#: gnome-session/gsm-xsmp-server.c:340 msgid "" "Refusing new client connection because the session is currently being shut " "down\n" msgstr "" "Άρνηση σύνδεσης νέου πελάτη επειδή το σύστημα τερματίζεται αυτή τη στιγμή\n" -#: gnome-session/gsm-xsmp-server.c:605 +#: gnome-session/gsm-xsmp-server.c:607 #, c-format msgid "Could not create ICE listening socket: %s" msgstr "Αδυναμία δημιουργίας υποδοχής ακρόασης ICE: %s" -#: gnome-session/main.c:398 +#: gnome-session/main.c:406 msgid "Running as systemd service" msgstr "Εκτελείται ως υπηρεσία systemd" -#: gnome-session/main.c:399 +#: gnome-session/main.c:407 msgid "Use systemd session management" msgstr "Χρήση διαχείριση συνεδρίας systemd" -#: gnome-session/main.c:401 +#: gnome-session/main.c:409 msgid "Use builtin session management (rather than the systemd based one)" msgstr "" "Χρήση της ενσωματωμένης διαχείρισης συνεδρίας (και όχι την βασισμένη στο " "systemd)" -#: gnome-session/main.c:402 +#: gnome-session/main.c:410 msgid "Override standard autostart directories" msgstr "Παράκαμψη τυπικών καταλόγων αυτόματης εκκίνησης" -#: gnome-session/main.c:402 +#: gnome-session/main.c:410 msgid "AUTOSTART_DIR" msgstr "AUTOSTART_DIR" -#: gnome-session/main.c:403 +#: gnome-session/main.c:411 msgid "Session to use" msgstr "Συνεδρία για χρήση" -#: gnome-session/main.c:403 +#: gnome-session/main.c:411 msgid "SESSION_NAME" msgstr "SESSION_NAME" -#: gnome-session/main.c:405 +#: gnome-session/main.c:413 msgid "Do not load user-specified applications" msgstr "Να μην φορτώνονται εφαρμογές καθορισμένες από τον χρήστη" -#: gnome-session/main.c:406 +#: gnome-session/main.c:414 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:408 +#: gnome-session/main.c:416 msgid "Show the fail whale dialog for testing" msgstr "Εμφάνιση του διαλόγου fail whale για δοκιμή" -#: gnome-session/main.c:409 +#: gnome-session/main.c:417 msgid "Disable hardware acceleration check" msgstr "Απενεργοποίηση ελέγχου επιτάχυνσης υλικού" -#: gnome-session/main.c:441 +#: gnome-session/main.c:449 msgid " — the GNOME session manager" msgstr " — ο διαχειριστής συνεδρίας του GNOME" @@ -665,11 +668,11 @@ #~ msgid "" #~ "List of components that are required as part of the session. (Each " -#~ "element names a key under \"/desktop/gnome/session/required_components" -#~ "\"). The Startup Applications preferences tool will not normally allow " -#~ "users to remove a required component from the session, and the session " -#~ "manager will automatically add the required components back to the " -#~ "session at login time if they do get removed." +#~ "element names a key under \"/desktop/gnome/session/" +#~ "required_components\"). The Startup Applications preferences tool will " +#~ "not normally allow users to remove a required component from the session, " +#~ "and the session manager will automatically add the required components " +#~ "back to the session at login time if they do get removed." #~ msgstr "" #~ "Μια λίστα με στοιχεία που είναι απαραίτητα μέρη της συνεδρίας. (Κάθε " #~ "στοιχείο ονομάζει ένα κλειδί στο \"/desktop/gnome/session/" diff -Nru gnome-session-44.0/po/en_GB.po gnome-session-45.0/po/en_GB.po --- gnome-session-44.0/po/en_GB.po 2023-03-20 15:48:49.000000000 +0000 +++ gnome-session-45.0/po/en_GB.po 2023-09-17 11:53:31.000000000 +0000 @@ -2,23 +2,23 @@ # Copyright (C) 1999-2000 Free Software Foundation, Inc. # Robert Brady , 1999-2000. # Philip Withnall , 2009, 2010. -# Bruce Cowan , 2011-2019. +# Bruce Cowan , 2011-2023. # Zander Brown , 2020. # msgid "" msgstr "" "Project-Id-Version: gnome-session 2.24\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-session/issues\n" -"POT-Creation-Date: 2020-07-31 14:02+0000\n" -"PO-Revision-Date: 2020-08-20 02:23+0100\n" -"Last-Translator: Zander Brown \n" +"POT-Creation-Date: 2023-05-05 13:09+0000\n" +"PO-Revision-Date: 2023-09-06 12:15+0100\n" +"Last-Translator: Bruce Cowan \n" "Language-Team: English - United Kingdom \n" "Language: en_GB\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.36.0\n" +"X-Generator: Poedit 3.3.1\n" "X-Project-Style: gnome\n" #: data/gnome-custom-session.desktop.in.in:3 @@ -30,7 +30,6 @@ msgstr "This entry lets you select a saved session" #: data/gnome.desktop.in.in:3 data/gnome.session.desktop.in.in:3 -#: data/gnome-wayland.desktop.in.in:3 msgid "GNOME" msgstr "GNOME" @@ -43,6 +42,11 @@ msgid "GNOME dummy" msgstr "GNOME dummy" +#: data/gnome-wayland.desktop.in.in:3 +#| msgid "GNOME on Xorg" +msgid "GNOME on Wayland" +msgstr "GNOME on Wayland" + #: data/gnome-xorg.desktop.in.in:3 msgid "GNOME on Xorg" msgstr "GNOME on Xorg" @@ -144,7 +148,7 @@ msgid "_Log Out" msgstr "_Log Out" -#: gnome-session/gsm-fail-whale-dialog.c:412 gnome-session/main.c:404 +#: gnome-session/gsm-fail-whale-dialog.c:412 gnome-session/main.c:412 msgid "Enable debugging code" msgstr "Enable debugging code" @@ -156,11 +160,11 @@ msgid "Show extension warning" msgstr "Show extension warning" -#: gnome-session/gsm-manager.c:1289 gnome-session/gsm-manager.c:1999 +#: gnome-session/gsm-manager.c:1317 gnome-session/gsm-manager.c:2068 msgid "Not responding" msgstr "Not responding" -#: gnome-session/gsm-util.c:415 +#: gnome-session/gsm-util.c:431 msgid "_Log out" msgstr "_Log out" @@ -176,7 +180,7 @@ msgid "This program is blocking logout." msgstr "This program is blocking logout." -#: gnome-session/gsm-xsmp-server.c:338 +#: gnome-session/gsm-xsmp-server.c:340 msgid "" "Refusing new client connection because the session is currently being shut " "down\n" @@ -184,57 +188,57 @@ "Refusing new client connection because the session is currently being shut " "down\n" -#: gnome-session/gsm-xsmp-server.c:605 +#: gnome-session/gsm-xsmp-server.c:607 #, c-format msgid "Could not create ICE listening socket: %s" msgstr "Could not create ICE listening socket: %s" -#: gnome-session/main.c:398 +#: gnome-session/main.c:406 msgid "Running as systemd service" msgstr "Running as systemd service" -#: gnome-session/main.c:399 +#: gnome-session/main.c:407 msgid "Use systemd session management" msgstr "Use systemd session management" -#: gnome-session/main.c:401 +#: gnome-session/main.c:409 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:402 +#: gnome-session/main.c:410 msgid "Override standard autostart directories" msgstr "Override standard autostart directories" -#: gnome-session/main.c:402 +#: gnome-session/main.c:410 msgid "AUTOSTART_DIR" msgstr "AUTOSTART_DIR" -#: gnome-session/main.c:403 +#: gnome-session/main.c:411 msgid "Session to use" msgstr "Session to use" -#: gnome-session/main.c:403 +#: gnome-session/main.c:411 msgid "SESSION_NAME" msgstr "SESSION_NAME" -#: gnome-session/main.c:405 +#: gnome-session/main.c:413 msgid "Do not load user-specified applications" msgstr "Do not load user-specified applications" -#: gnome-session/main.c:406 +#: gnome-session/main.c:414 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:408 +#: gnome-session/main.c:416 msgid "Show the fail whale dialog for testing" msgstr "Show the fail whale dialogue for testing" -#: gnome-session/main.c:409 +#: gnome-session/main.c:417 msgid "Disable hardware acceleration check" msgstr "Disable hardware acceleration check" -#: gnome-session/main.c:441 +#: gnome-session/main.c:449 msgid " — the GNOME session manager" msgstr " — the GNOME session manager" @@ -270,21 +274,6 @@ #: 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" @@ -647,18 +636,18 @@ #~ msgid "" #~ "List of components that are required as part of the session. (Each " -#~ "element names a key under \"/desktop/gnome/session/required_components" -#~ "\"). The Startup Applications preferences tool will not normally allow " -#~ "users to remove a required component from the session, and the session " -#~ "manager will automatically add the required components back to the " -#~ "session at login time if they do get removed." +#~ "element names a key under \"/desktop/gnome/session/" +#~ "required_components\"). The Startup Applications preferences tool will " +#~ "not normally allow users to remove a required component from the session, " +#~ "and the session manager will automatically add the required components " +#~ "back to the session at login time if they do get removed." #~ msgstr "" #~ "List of components that are required as part of the session. (Each " -#~ "element names a key under \"/desktop/gnome/session/required_components" -#~ "\"). The Startup Applications preferences tool will not normally allow " -#~ "users to remove a required component from the session, and the session " -#~ "manager will automatically add the required components back to the " -#~ "session at login time if they do get removed." +#~ "element names a key under \"/desktop/gnome/session/" +#~ "required_components\"). The Startup Applications preferences tool will " +#~ "not normally allow users to remove a required component from the session, " +#~ "and the session manager will automatically add the required components " +#~ "back to the session at login time if they do get removed." #~ msgid "Panel" #~ msgstr "Panel" diff -Nru gnome-session-44.0/po/pa.po gnome-session-45.0/po/pa.po --- gnome-session-44.0/po/pa.po 2023-03-20 15:48:49.000000000 +0000 +++ gnome-session-45.0/po/pa.po 2023-09-17 11:53:31.000000000 +0000 @@ -4,20 +4,20 @@ # # Amanpreet Singh Alam , 2004. # Amanpreet Singh Alam , 2005, 2007, 2008. -# A S Alam , 2009, 2010, 2011, 2012, 2013, 2015, 2018, 2020, 2021. +# A S Alam , 2009, 2010, 2011, 2012, 2013, 2015, 2018, 2020, 2021, 2023. msgid "" msgstr "" "Project-Id-Version: gnome-session.HEAD\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-session/issues\n" -"POT-Creation-Date: 2020-07-31 14:02+0000\n" -"PO-Revision-Date: 2021-01-31 08:45-0800\n" +"POT-Creation-Date: 2023-05-05 13:09+0000\n" +"PO-Revision-Date: 2023-08-30 19:03-0700\n" "Last-Translator: A S Alam \n" "Language-Team: Punjabi \n" "Language: pa\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 20.08.1\n" +"X-Generator: Lokalize 23.04.3\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: data/gnome-custom-session.desktop.in.in:3 @@ -29,7 +29,6 @@ msgstr "ਇਹ ਐਂਟਰੀ ਤੁਹਾਨੂੰ ਸੰਭਾਲਿਆ ਸ਼ੈਸ਼ਨ ਚੁਣਨ ਦਿੰਦੀ ਹੈ" #: data/gnome.desktop.in.in:3 data/gnome.session.desktop.in.in:3 -#: data/gnome-wayland.desktop.in.in:3 msgid "GNOME" msgstr "ਗਨੋਮ" @@ -42,6 +41,11 @@ msgid "GNOME dummy" msgstr "ਗਨੋਮ ਡੰਮੀ" +#: data/gnome-wayland.desktop.in.in:3 +#| msgid "GNOME on Xorg" +msgid "GNOME on Wayland" +msgstr "ਵੇਅਲੈਂਡ ਉੱਤੇ ਗਨੋਮ" + #: data/gnome-xorg.desktop.in.in:3 msgid "GNOME on Xorg" msgstr "Xorg ਉੱਤੇ ਗਨੋਮ" @@ -151,7 +155,7 @@ msgid "_Log Out" msgstr "ਲਾਗ-ਆਉਟ(_L)" -#: gnome-session/gsm-fail-whale-dialog.c:412 gnome-session/main.c:404 +#: gnome-session/gsm-fail-whale-dialog.c:412 gnome-session/main.c:412 msgid "Enable debugging code" msgstr "ਡੀਬੱਗ ਕੋਡ ਯੋਗ" @@ -163,12 +167,12 @@ msgid "Show extension warning" msgstr "ਇਕਸਟੈਨਸ਼ਨ ਚੇਤਾਵਨੀ ਵੇਖਾਓ" -#: gnome-session/gsm-manager.c:1289 gnome-session/gsm-manager.c:1999 +#: gnome-session/gsm-manager.c:1317 gnome-session/gsm-manager.c:2068 msgid "Not responding" msgstr "ਕੋਈ ਜਵਾਬ ਨਹੀਂ" # gnome-session/logout.c:274 -#: gnome-session/gsm-util.c:415 +#: gnome-session/gsm-util.c:431 msgid "_Log out" msgstr "ਲਾਗ-ਆਉਟ(_L)" @@ -184,66 +188,66 @@ msgid "This program is blocking logout." msgstr "ਇਹ ਪਰੋਗਰਾਮ ਲਾਗ-ਆਉਟ ਨੂੰ ਰੋਕ ਰਿਹਾ ਹੈ।" -#: gnome-session/gsm-xsmp-server.c:338 +#: gnome-session/gsm-xsmp-server.c:340 msgid "" "Refusing new client connection because the session is currently being shut " "down\n" msgstr "" "ਨਵਾਂ ਕਲਾਇਟ ਕੁਨੈਕਸ਼ਨ ਤੋਂ ਇਨਕਾਰ ਕੀਤਾ ਗਿਆ ਹੈ, ਕਿਉਂਕਿ ਸ਼ੈਸ਼ਨ ਬੰਦ ਹੋ ਰਿਹਾ ਹੈ\n" -#: gnome-session/gsm-xsmp-server.c:605 +#: gnome-session/gsm-xsmp-server.c:607 #, c-format msgid "Could not create ICE listening socket: %s" msgstr "ICE ਲਿਸਨਿੰਗ ਸਾਕਟ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕੀ: %s" -#: gnome-session/main.c:398 +#: gnome-session/main.c:406 msgid "Running as systemd service" msgstr "systemd ਸੇਵਾ ਵਜੋਂ ਚੱਲ ਰਿਹਾ ਹੈ" # gnome-session/main.c:66 -#: gnome-session/main.c:399 +#: gnome-session/main.c:407 msgid "Use systemd session management" msgstr "systemd ਸ਼ੈਸ਼ਨ ਇੰਤਜ਼ਾਮ ਵਰਤੋਂ" -#: gnome-session/main.c:401 +#: gnome-session/main.c:409 msgid "Use builtin session management (rather than the systemd based one)" msgstr "ਇਹ ਬਿਲਟ-ਇਨ ਸ਼ੈਸ਼ਨ ਇੰਤਜ਼ਾਮ (systemd ਦੇ ਅਧਾਰਿਤ ਬਿਨਾਂ)" -#: gnome-session/main.c:402 +#: gnome-session/main.c:410 msgid "Override standard autostart directories" msgstr "ਸਟੈਂਡਰਡ ਆਟੋ-ਸਟਾਰਟ ਡਾਇਰੈਕਟਰੀਆਂ ਅਣਡਿੱਠੀਆਂ" -#: gnome-session/main.c:402 +#: gnome-session/main.c:410 msgid "AUTOSTART_DIR" msgstr "AUTOSTART_DIR" # gnome-session/session-properties.c:272 -#: gnome-session/main.c:403 +#: gnome-session/main.c:411 msgid "Session to use" msgstr "ਵਰਤਣ ਲਈ ਸ਼ੈਸ਼ਨ" -#: gnome-session/main.c:403 +#: gnome-session/main.c:411 msgid "SESSION_NAME" msgstr "SESSION_NAME" -#: gnome-session/main.c:405 +#: gnome-session/main.c:413 msgid "Do not load user-specified applications" msgstr "ਖਾਸ ਵਰਤੋਂਕਾਰ ਐਪਲੀਕੇਸ਼ਨਾਂ ਨੂੰ ਲੋਡ ਨਾ ਕਰੋ" -#: gnome-session/main.c:406 +#: gnome-session/main.c:414 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:408 +#: gnome-session/main.c:416 msgid "Show the fail whale dialog for testing" msgstr "ਟੈਸਟ ਕਰਨ ਲਈ ਵੇਲ੍ਹ ਡਾਈਲਾਗ ਵੇਖਾਓ" -#: gnome-session/main.c:409 +#: gnome-session/main.c:417 msgid "Disable hardware acceleration check" msgstr "ਹਾਰਡਵੇਅਰ ਐਕਸਰਲੇਸ਼ਨ ਚੈਕ ਅਸਮਰੱਥ ਕਰੋ" -#: gnome-session/main.c:441 +#: gnome-session/main.c:449 msgid " — the GNOME session manager" msgstr " — ਗਨੋਮ ਸ਼ੈਸ਼ਨ ਮੈਨੇਜਰ" @@ -280,21 +284,6 @@ #: 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" @@ -680,11 +669,11 @@ #~ msgid "" #~ "List of components that are required as part of the session. (Each " -#~ "element names a key under \"/desktop/gnome/session/required_components" -#~ "\"). The Startup Applications preferences tool will not normally allow " -#~ "users to remove a required component from the session, and the session " -#~ "manager will automatically add the required components back to the " -#~ "session at login time if they do get removed." +#~ "element names a key under \"/desktop/gnome/session/" +#~ "required_components\"). The Startup Applications preferences tool will " +#~ "not normally allow users to remove a required component from the session, " +#~ "and the session manager will automatically add the required components " +#~ "back to the session at login time if they do get removed." #~ msgstr "" #~ "ਭਾਗਾਂ ਦੀ ਲਿਸਟ, ਜੋ ਕਿ ਗਨੋਮ ਦੇ ਭਾਗ ਵਜੋਂ ਲੋੜੀਦੇ ਹਨ। (ਹਰ ਭਾਗ ਨੂੰ \"/desktop/gnome/" #~ "session/required_components\" ਵਿੱਚ ਰੱਖਿਆ ਹੈ)। ਸ਼ੁਰੂਆਤ ਐਪਲੀਕੇਸ਼ਨ ਪਸੰਦ ਟੂਲ ਯੂਜ਼ਰ ਨੂੰ ਆਮ " @@ -825,8 +814,8 @@ #~ "values are \"logout\" for logging out, \"shutdown\" for halting the " #~ "system and \"restart\" for restarting the system." #~ msgstr "" -#~ "ਇਹ ਚੋਣ ਹੈ, ਜੋ ਕਿ ਲਾਗ-ਆਉਣ ਡਾਈਲਾਗ ਵਿੱਚ ਵੇਖਾਈ ਜਾਵੇਗੀ, ਠੀਕ ਮੁੱਲ ਲਾਗ-ਆਉਣ ਲਈ \"ਲਾਗ-ਆਉਟ" -#~ "\", ਸਿਸਟਮ ਨੂੰ ਬੰਦ ਕਰਨ ਲਈ \"ਬੰਦ ਕਰੋ\", ਅਤੇ ਮੁੜ-ਚਲਾਉਣ ਲਈ \"ਮੁੜ-ਚਲਾਓ\" ਹਨ।" +#~ "ਇਹ ਚੋਣ ਹੈ, ਜੋ ਕਿ ਲਾਗ-ਆਉਣ ਡਾਈਲਾਗ ਵਿੱਚ ਵੇਖਾਈ ਜਾਵੇਗੀ, ਠੀਕ ਮੁੱਲ ਲਾਗ-ਆਉਣ ਲਈ \"ਲਾਗ-" +#~ "ਆਉਟ\", ਸਿਸਟਮ ਨੂੰ ਬੰਦ ਕਰਨ ਲਈ \"ਬੰਦ ਕਰੋ\", ਅਤੇ ਮੁੜ-ਚਲਾਉਣ ਲਈ \"ਮੁੜ-ਚਲਾਓ\" ਹਨ।" #~ msgid "Configure your sessions" #~ msgstr "ਆਪਣੇ ਸ਼ੈਸ਼ਨ ਦੀ ਸੰਰਚਨਾ ਕਰੋ" diff -Nru gnome-session-44.0/po/tr.po gnome-session-45.0/po/tr.po --- gnome-session-44.0/po/tr.po 2023-03-20 15:48:49.000000000 +0000 +++ gnome-session-45.0/po/tr.po 2023-09-17 11:53:31.000000000 +0000 @@ -1,6 +1,6 @@ # Turkish translation of gnome-session. # Copyright (C) 2001-2003, 2004, 2008, 2011 Free Software Foundation, Inc. -# Copyright (C) 2012-2022 gnome-session's COPYRIGHT HOLDER +# Copyright (C) 2012-2023 gnome-session's COPYRIGHT HOLDER # This file is distributed under the same license as the gnome-session package. # # Sinan İmamoğlu , 2002-2003. @@ -22,16 +22,16 @@ msgstr "" "Project-Id-Version: gnome-session\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-session/issues\n" -"POT-Creation-Date: 2022-07-31 09:17+0000\n" -"PO-Revision-Date: 2021-12-17 17:56+0300\n" -"Last-Translator: Emin Tufan Çetin \n" -"Language-Team: Turkish \n" +"POT-Creation-Date: 2023-05-20 06:52+0000\n" +"PO-Revision-Date: 2023-05-12 14:03+0300\n" +"Last-Translator: Sabri Ünal \n" +"Language-Team: Turkish \n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0\n" -"X-Generator: Gtranslator 41.0\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Poedit 3.2.2\n" #: data/gnome-custom-session.desktop.in.in:3 msgid "Custom" @@ -158,7 +158,7 @@ msgid "_Log Out" msgstr "_Çıkış" -#: gnome-session/gsm-fail-whale-dialog.c:412 gnome-session/main.c:408 +#: gnome-session/gsm-fail-whale-dialog.c:412 gnome-session/main.c:412 msgid "Enable debugging code" msgstr "Kod hatası ayıklamayı etkinleştir" @@ -170,7 +170,7 @@ msgid "Show extension warning" msgstr "Eklenti uyarısını göster" -#: gnome-session/gsm-manager.c:1317 gnome-session/gsm-manager.c:2058 +#: gnome-session/gsm-manager.c:1317 gnome-session/gsm-manager.c:2068 msgid "Not responding" msgstr "Yanıtlamıyor" @@ -201,52 +201,52 @@ msgid "Could not create ICE listening socket: %s" msgstr "ICE dinleme soketi oluşturulamadı: %s" -#: gnome-session/main.c:402 +#: gnome-session/main.c:406 msgid "Running as systemd service" -msgstr "systemd servisi olarak çalışıyor" +msgstr "systemd hizmeti olarak çalışıyor" -#: gnome-session/main.c:403 +#: gnome-session/main.c:407 msgid "Use systemd session management" msgstr "systemd oturum yönetimini kullan" -#: gnome-session/main.c:405 +#: gnome-session/main.c:409 msgid "Use builtin session management (rather than the systemd based one)" msgstr "Yerleşik oturum yönetimini kullan (systemd temelli yerine)" -#: gnome-session/main.c:406 +#: gnome-session/main.c:410 msgid "Override standard autostart directories" msgstr "Standart kendiliğinden başlat dizinlerinin yerine geç" -#: gnome-session/main.c:406 +#: gnome-session/main.c:410 msgid "AUTOSTART_DIR" msgstr "KENDILIGINDANBASLAT_DIZINI" -#: gnome-session/main.c:407 +#: gnome-session/main.c:411 msgid "Session to use" msgstr "Kullanılacak oturum" -#: gnome-session/main.c:407 +#: gnome-session/main.c:411 msgid "SESSION_NAME" msgstr "OTURUM_ADI" -#: gnome-session/main.c:409 +#: gnome-session/main.c:413 msgid "Do not load user-specified applications" msgstr "Kullanıcıya özel programları yükleme" -#: gnome-session/main.c:410 +#: gnome-session/main.c:414 msgid "Version of this application" msgstr "Bu uygulamanın sürümü" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: gnome-session/main.c:412 +#: gnome-session/main.c:416 msgid "Show the fail whale dialog for testing" msgstr "Sınama için büyük hata iletişim penceresini göster" -#: gnome-session/main.c:413 +#: gnome-session/main.c:417 msgid "Disable hardware acceleration check" msgstr "Donanım hızlandırma denetimini devre dışı bırak" -#: gnome-session/main.c:445 +#: gnome-session/main.c:449 msgid " — the GNOME session manager" msgstr " — GNOME oturum yöneticisi" @@ -272,7 +272,7 @@ #: tools/gnome-session-ctl.c:249 msgid "" "Run from ExecStopPost to start gnome-session-failed.target on service failure" -msgstr "Servis hatasında gnome-session-failed.target’ı ExecStopPost’tan başlat" +msgstr "Hizmet hatasında gnome-session-failed.target’ı ExecStopPost’tan başlat" #: tools/gnome-session-ctl.c:279 msgid "Program needs exactly one parameter"