Commit 3a5ed6ad authored by Simon McVittie's avatar Simon McVittie
Browse files

Update from upstream git commit GNOME_SETTINGS_DAEMON_3_38_1-6-gaffebf89

* d/patches: Update from upstream git commit
  GNOME_SETTINGS_DAEMON_3_38_1-6-gaffebf89
  - Fix a crash if a filesystem does not provide atime
  - If system-wide power management idle action is set to log out,
    ignore it in the gdm greeter (for which logging out makes no sense)
  - Silence unnecessary warnings if usbguard is not installed
  - Translation updates
parent 2244bd3a
gnome-settings-daemon (3.38.1-2) UNRELEASED; urgency=medium
* d/patches: Update from upstream git commit
GNOME_SETTINGS_DAEMON_3_38_1-6-gaffebf89
- Fix a crash if a filesystem does not provide atime
- If system-wide power management idle action is set to log out,
ignore it in the gdm greeter (for which logging out makes no sense)
- Silence unnecessary warnings if usbguard is not installed
- Translation updates
-- Simon McVittie <smcv@debian.org> Sun, 22 Nov 2020 16:43:34 +0000
gnome-settings-daemon (3.38.1-1) unstable; urgency=medium
* Team upload
......
From: Jing Wang <99jingw@gmail.com>
Date: Sat, 10 Oct 2020 16:06:33 -0400
Subject: Fix crashing when atime is not present
Recent changes to gio omit the atime instead of setting it to an out of range value.
Fixes #556, but note this doesn't fix the fact that gio omitted atime on a system where atime should have been available.
Origin: upstream, 3.39.0, commit:647c0af7779757b18708a07b7cfc95e6b1bc79f0
---
plugins/housekeeping/gsd-housekeeping-manager.c | 37 +++++++++++++++----------
1 file changed, 23 insertions(+), 14 deletions(-)
diff --git a/plugins/housekeeping/gsd-housekeeping-manager.c b/plugins/housekeeping/gsd-housekeeping-manager.c
index 40d016a..8ad985c 100644
--- a/plugins/housekeeping/gsd-housekeeping-manager.c
+++ b/plugins/housekeeping/gsd-housekeeping-manager.c
@@ -78,7 +78,7 @@ typedef struct {
typedef struct {
- gint64 atime;
+ gint64 time;
char *path;
glong size;
} ThumbData;
@@ -100,11 +100,13 @@ read_dir_for_purge (const char *path, GList *files)
{
GFile *read_path;
GFileEnumerator *enum_dir;
+ int cannot_get_time = 0;
read_path = g_file_new_for_path (path);
enum_dir = g_file_enumerate_children (read_path,
G_FILE_ATTRIBUTE_STANDARD_NAME ","
G_FILE_ATTRIBUTE_TIME_ACCESS ","
+ G_FILE_ATTRIBUTE_TIME_MODIFIED ","
G_FILE_ATTRIBUTE_STANDARD_SIZE,
G_FILE_QUERY_INFO_NONE,
NULL,
@@ -120,28 +122,31 @@ read_dir_for_purge (const char *path, GList *files)
ThumbData *td;
GFile *entry;
char *entry_path;
- gint64 atime;
+ gint64 time;
entry = g_file_get_child (read_path, name);
entry_path = g_file_get_path (entry);
g_object_unref (entry);
- // Note that using atime here is no worse than using mtime.
+ // If atime is available, it should be no worse than mtime.
// - Even if the file system is mounted with noatime, the atime and
// mtime will be set to the same value on file creation.
// - Since the thumbnailer never edits thumbnails, and instead swaps
// in newly created temp files, atime will always be >= mtime.
- // - atime should never be absent, which would cause
- // g_file_info_get_attribute_int64 to return 0. The presence of
- // atime is determined by the filters we pass to
- // g_file_enumerate_children, not the file system atime settings.
- g_assert (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_TIME_ACCESS));
- atime = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_ACCESS);
+ if (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_TIME_ACCESS)) {
+ time = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_ACCESS);
+ } else if (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_TIME_MODIFIED)) {
+ time = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED);
+ } else {
+ // Unlikely to get here, but be defensive
+ cannot_get_time += 1;
+ time = G_MAXINT64;
+ }
td = g_new0 (ThumbData, 1);
td->path = entry_path;
- td->atime = atime;
+ td->time = time;
td->size = g_file_info_get_size (info);
files = g_list_prepend (files, td);
@@ -149,6 +154,10 @@ read_dir_for_purge (const char *path, GList *files)
g_object_unref (info);
}
g_object_unref (enum_dir);
+
+ if (cannot_get_time > 0) {
+ g_warning ("Could not read atime or mtime on %d files in %s", cannot_get_time, path);
+ }
}
g_object_unref (read_path);
@@ -158,7 +167,7 @@ read_dir_for_purge (const char *path, GList *files)
static void
purge_old_thumbnails (ThumbData *info, PurgeData *purge_data)
{
- if ((purge_data->now - info->atime) > purge_data->max_age) {
+ if ((purge_data->now - info->time) > purge_data->max_age) {
g_unlink (info->path);
info->size = 0;
} else {
@@ -167,9 +176,9 @@ purge_old_thumbnails (ThumbData *info, PurgeData *purge_data)
}
static int
-sort_file_atime (ThumbData *file1, ThumbData *file2)
+sort_file_time (ThumbData *file1, ThumbData *file2)
{
- return file1->atime - file2->atime;
+ return file1->time - file2->time;
}
static char **
@@ -260,7 +269,7 @@ purge_thumbnail_cache (GsdHousekeepingManager *manager)
if ((purge_data.total_size > purge_data.max_size) && (purge_data.max_size >= 0)) {
GList *scan;
- files = g_list_sort (files, (GCompareFunc) sort_file_atime);
+ files = g_list_sort (files, (GCompareFunc) sort_file_time);
for (scan = files; scan && (purge_data.total_size > purge_data.max_size); scan = scan->next) {
ThumbData *info = scan->data;
g_unlink (info->path);
From: Fabio Tomat <f.t.public@gmail.com>
Date: Sun, 18 Oct 2020 14:42:12 +0000
Subject: Update Friulian translation
Origin: upstream, 3.39.0, commit:e48ac6f519c8353b90d9733e15645dfe5612e656
---
po/fur.po | 112 +++++++++++++++++++++++++-------------------------------------
1 file changed, 45 insertions(+), 67 deletions(-)
diff --git a/po/fur.po b/po/fur.po
index aaa975c..faed386 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: gnome-settings-daemon master\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-settings-daemon/"
"issues\n"
-"POT-Creation-Date: 2020-09-03 20:47+0000\n"
-"PO-Revision-Date: 2020-10-08 19:26+0200\n"
+"POT-Creation-Date: 2020-10-08 17:28+0000\n"
+"PO-Revision-Date: 2020-10-18 16:41+0200\n"
"Last-Translator: Fabio Tomat <f.t.public@gmail.com>\n"
"Language-Team: Friulian <fur@li.org>\n"
"Language: fur\n"
@@ -366,7 +366,7 @@ msgstr "Etichete boton pal visôr OLED."
#: data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in:89
msgid "Label will be rendered to OLED display belonging to the button"
-msgstr "La etichete che e vegnarà mostrade sul schermi OLED dal boton"
+msgstr "La etichete che e vignarà mostrade sul schermi OLED dal boton"
#: data/org.gnome.settings-daemon.plugins.color.gschema.xml.in:6
msgid "The duration a display profile is valid"
@@ -1666,30 +1666,30 @@ msgstr ""
msgid "This computer has only %s disk space remaining."
msgstr "Su chest computer a restin nome %s di spazi disc."
-#: plugins/media-keys/gsd-media-keys-manager.c:2468
+#: plugins/media-keys/gsd-media-keys-manager.c:2476
msgid "Bluetooth disabled"
msgstr "Bluetooth disabilitât"
-#: plugins/media-keys/gsd-media-keys-manager.c:2471
+#: plugins/media-keys/gsd-media-keys-manager.c:2479
msgid "Bluetooth enabled"
msgstr "Bluetooth abilitât"
-#: plugins/media-keys/gsd-media-keys-manager.c:2475
+#: plugins/media-keys/gsd-media-keys-manager.c:2483
msgid "Airplane mode enabled"
msgstr "Modalitât avion abilitade"
-#: plugins/media-keys/gsd-media-keys-manager.c:2478
+#: plugins/media-keys/gsd-media-keys-manager.c:2486
msgid "Airplane mode disabled"
msgstr "Modalitât avion disabilitade"
-#: plugins/media-keys/gsd-media-keys-manager.c:2507
+#: plugins/media-keys/gsd-media-keys-manager.c:2515
msgid "Hardware Airplane Mode"
msgstr "Modalitât avion vie hardware abilitade"
#. Translators: this is a filename used for screencast
#. * recording, where "%d" and "%t" date and time, e.g.
#. * "Screencast from 07-17-2013 10:00:46 PM.webm"
-#: plugins/media-keys/gsd-media-keys-manager.c:2570
+#: plugins/media-keys/gsd-media-keys-manager.c:2578
#, no-c-format
msgid "Screencast from %d %t.webm"
msgstr "Cature dal scritori di %d %t.webm"
@@ -1934,7 +1934,7 @@ msgstr "Cjarie batarie dal portatil cuasi esauride"
#, c-format
msgid "Computer will hibernate very soon unless it is plugged in."
msgstr ""
-"Se nol ven tacât subite ae prese di alimentazion, il computer al vegnarà "
+"Se nol ven tacât subite ae prese di alimentazion, il computer al vignarà "
"metût in ibernazion."
#. TRANSLATORS: give the user a ultimatum
@@ -1942,7 +1942,7 @@ msgstr ""
#, c-format
msgid "Computer will shutdown very soon unless it is plugged in."
msgstr ""
-"Se nol ven tacât subite ae prese di alimentazion, il computer al vegnarà "
+"Se nol ven tacât subite ae prese di alimentazion, il computer al vignarà "
"studât."
#. TRANSLATORS: the UPS is very low
@@ -2147,7 +2147,7 @@ msgstr "Tiermin session automatic"
#: plugins/power/gsd-power-manager.c:2127
msgid "You will soon log out because of inactivity."
-msgstr "Chi di pôc la session e vegnarà terminade par vie de inativitât."
+msgstr "Chi di pôc la session e vignarà terminade par vie de inativitât."
#: plugins/power/gsd-power-manager.c:2132
msgid "Automatic suspend"
@@ -2156,7 +2156,7 @@ msgstr "Sospension automatiche"
#: plugins/power/gsd-power-manager.c:2132
#: plugins/power/gsd-power-manager.c:2137
msgid "Computer will suspend very soon because of inactivity."
-msgstr "Chi di pôc il computer al vegnarà sospindût par vie de inativitât."
+msgstr "Chi di pôc il computer al vignarà sospindût par vie de inativitât."
#: plugins/power/gsd-power-manager.c:2137
msgid "Automatic hibernation"
@@ -2448,23 +2448,18 @@ msgstr ""
"suspiet."
#: plugins/usb-protection/gsd-usb-protection-manager.c:589
-#, fuzzy
-#| msgid "New keyboard detected"
msgid "New device detected"
-msgstr "Gnove tastiere rilevade"
+msgstr "Gnûf dispositîf rilevât"
#: plugins/usb-protection/gsd-usb-protection-manager.c:590
-#, fuzzy
-#| msgid ""
-#| "Either your keyboard has been reconnected or a new one has been plugged "
-#| "in. If you did not do it, check your system for any suspicious device."
msgid ""
"Either one of your existing devices has been reconnected or a new one has "
"been plugged in. If you did not do it, check your system for any suspicious "
"device."
msgstr ""
-"O si à tornât a coneti la tastiere opûr e je stade tacade une gnove. Se nol "
-"è stât fat, controle che il sisteme nol vedi nissun dispositîf suspiet."
+"O si à tornât a coneti un dai tiei dispositîfs esistents opûr al è stât "
+"tacât un gnûf. Se nol è stât fat, controle che il sisteme nol vedi nissun "
+"dispositîf suspiet."
#: plugins/usb-protection/gsd-usb-protection-manager.c:596
msgid "Reconnect USB device"
@@ -2525,88 +2520,79 @@ msgstr ""
#: plugins/wwan/cc-wwan-errors-private.h:40
msgid "Phone failure"
-msgstr ""
+msgstr "Erôr dal telefon"
#: plugins/wwan/cc-wwan-errors-private.h:41
-#, fuzzy
-#| msgid "Not connected?"
msgid "No connection to phone"
-msgstr "No conetude?"
+msgstr "Nissune conession al telefon"
#: plugins/wwan/cc-wwan-errors-private.h:43
msgid "Operation not allowed"
-msgstr ""
+msgstr "Operazion no permetude"
#: plugins/wwan/cc-wwan-errors-private.h:44
msgid "Operation not supported"
-msgstr ""
+msgstr "Operazion no supuartade"
#: plugins/wwan/cc-wwan-errors-private.h:48
msgid "SIM not inserted"
-msgstr ""
+msgstr "Schede SIM no inseride"
#: plugins/wwan/cc-wwan-errors-private.h:49
msgid "SIM PIN required"
-msgstr ""
+msgstr "Necessari codiç PIN de SIM"
#: plugins/wwan/cc-wwan-errors-private.h:50
msgid "SIM PUK required"
-msgstr ""
+msgstr "Necessari codiç PUK de SIM"
#: plugins/wwan/cc-wwan-errors-private.h:51
msgid "SIM failure"
-msgstr ""
+msgstr "Erôr de schede SIM"
#: plugins/wwan/cc-wwan-errors-private.h:52
msgid "SIM busy"
-msgstr ""
+msgstr "Schede SIM ocupade"
#: plugins/wwan/cc-wwan-errors-private.h:53
msgid "SIM wrong"
-msgstr ""
+msgstr "Schede SIM sbaliade"
#: plugins/wwan/cc-wwan-errors-private.h:54
msgid "Incorrect password"
-msgstr ""
+msgstr "Password sbaliade"
#: plugins/wwan/cc-wwan-errors-private.h:55
msgid "SIM PIN2 required"
-msgstr ""
+msgstr "Necessari codiç PIN2 de SIM"
#: plugins/wwan/cc-wwan-errors-private.h:56
msgid "SIM PUK2 required"
-msgstr ""
+msgstr "Necessari codiç PUK2 de SIM"
#: plugins/wwan/cc-wwan-errors-private.h:72
-#, fuzzy
-#| msgid "Unknown time"
msgid "Unknown error"
-msgstr "Timp no cognossût"
+msgstr "Erôr no cognossût"
#: plugins/wwan/cc-wwan-errors-private.h:91
-#, fuzzy
-#| msgctxt "print job state"
-#| msgid "Printing canceled"
msgid "Action Cancelled"
-msgstr "Stampe anulade"
+msgstr "Azion anulade"
#: plugins/wwan/cc-wwan-errors-private.h:94
msgid "Access denied"
-msgstr ""
+msgstr "Acès dineât"
#: plugins/wwan/cc-wwan-errors-private.h:103
-#, fuzzy
-#| msgid "Unknown time"
msgid "Unknown Error"
-msgstr "Timp no cognossût"
+msgstr "Erôr no cognossût"
#: plugins/wwan/gsd-wwan-manager.c:117
msgid "New PIN for SIM"
-msgstr ""
+msgstr "Gnûf codiç PIN pe SIM"
#: plugins/wwan/gsd-wwan-manager.c:118
msgid "Set"
-msgstr ""
+msgstr "Stabilìs"
#: plugins/wwan/gsd-wwan-manager.c:120
msgid "Unlock SIM card"
@@ -2621,16 +2607,13 @@ msgid "Cancel"
msgstr "Anule"
#: plugins/wwan/gsd-wwan-manager.c:129
-#, fuzzy, c-format
-#| msgid "Please provide the PIN for SIM card %s"
+#, c-format
msgid "Please provide a new PIN for SIM card %s"
-msgstr "Par plasê furnìs il PIN pe schede SIM %s"
+msgstr "Par plasê furnìs un gnûf codiç PIN pe schede SIM %s"
#: plugins/wwan/gsd-wwan-manager.c:131
-#, fuzzy
-#| msgid "Enter PIN to unlock your SIM card"
msgid "Enter a New PIN to unlock your SIM card"
-msgstr "Inserìs il PIN par sblocâ la tô schede SIM"
+msgstr "Inserìs un gnûf codiç PIN par sblocâ la tô schede SIM"
#: plugins/wwan/gsd-wwan-manager.c:133
#, c-format
@@ -2642,26 +2625,21 @@ msgid "Enter PIN to unlock your SIM card"
msgstr "Inserìs il PIN par sblocâ la tô schede SIM"
#: plugins/wwan/gsd-wwan-manager.c:138
-#, fuzzy, c-format
-#| msgid "Please provide the PIN for SIM card %s"
+#, c-format
msgid "Please provide the PUK for SIM card %s"
-msgstr "Par plasê furnìs il PIN pe schede SIM %s"
+msgstr "Par plasê furnìs il codiç PUK pe schede SIM %s"
#: plugins/wwan/gsd-wwan-manager.c:140
-#, fuzzy
-#| msgid "Enter PIN to unlock your SIM card"
msgid "Enter PUK to unlock your SIM card"
-msgstr "Inserìs il PIN par sblocâ la tô schede SIM"
+msgstr "Inserìs il codiç PUK par sblocâ la tô schede SIM"
#. msg is already localised
#: plugins/wwan/gsd-wwan-manager.c:156
-#, fuzzy, c-format
-#| msgid "%2$s You have %1$u try left"
-#| msgid_plural "%2$s You have %1$u tries left"
+#, c-format
msgid "%2$s. You have %1$u try left"
msgid_plural "%2$s. You have %1$u tries left"
-msgstr[0] "%2$s Tu âs ancjemò %1$u tentatîf"
-msgstr[1] "%2$s Tu âs ancjemò %1$u tentatîfs"
+msgstr[0] "%2$s. Tu âs ancjemò %1$u tentatîf"
+msgstr[1] "%2$s. Tu âs ancjemò %1$u tentatîfs"
#: plugins/wwan/gsd-wwan-manager.c:160
#, c-format
From: Tim Sabsch <tim@sabsch.com>
Date: Sun, 1 Nov 2020 13:57:32 +0000
Subject: Update German translation
Origin: upstream, 3.39.0, commit:23763dfec62ff80fb7f04f39c107b1ab45296705
---
po/de.po | 53 ++++++++++++++++++++++++-----------------------------
1 file changed, 24 insertions(+), 29 deletions(-)
diff --git a/po/de.po b/po/de.po
index b2fdc3b..5a5e6a3 100644
--- a/po/de.po
+++ b/po/de.po
@@ -30,9 +30,9 @@
msgid ""
msgstr ""
"Project-Id-Version: gnome-settings-daemon master\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-settings-daemon/iss"
-"ues\n"
-"POT-Creation-Date: 2020-09-03 20:47+0000\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-settings-daemon/"
+"issues\n"
+"POT-Creation-Date: 2020-10-28 13:36+0000\n"
"PO-Revision-Date: 2020-09-05 22:06+0200\n"
"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
"Language-Team: Deutsch <gnome-de@gnome.org>\n"
@@ -1450,7 +1450,7 @@ msgid ""
"before it goes to sleep. A value of 0 means never."
msgstr ""
"Zeit in Sekunden, die der Rechner bei Netzanschluss inaktiv sein muss, bevor "
-"er in den Energiesparmodus versetzt wird. Ein Wert von O bedeutet nie."
+"er in den Energiesparmodus versetzt wird. Ein Wert von 0 bedeutet nie."
#: data/org.gnome.settings-daemon.plugins.power.gschema.xml.in:21
#: data/org.gnome.settings-daemon.plugins.power.gschema.xml.in:31
@@ -1475,7 +1475,7 @@ msgid ""
"inactive before it goes to sleep. A value of 0 means never."
msgstr ""
"Zeit in Sekunden, die der Rechner im Akkubetrieb inaktiv sein muss, bevor er "
-"in den Energiesparmodus versetzt wird. Ein Wert von O bedeutet nie."
+"in den Energiesparmodus versetzt wird. Ein Wert von 0 bedeutet nie."
#: data/org.gnome.settings-daemon.plugins.power.gschema.xml.in:36
msgid "Enable the ALS sensor"
@@ -1725,30 +1725,30 @@ msgstr ""
msgid "This computer has only %s disk space remaining."
msgstr "Auf diesem Rechner ist nur noch %s Speicherplatz verfügbar."
-#: plugins/media-keys/gsd-media-keys-manager.c:2468
+#: plugins/media-keys/gsd-media-keys-manager.c:2476
msgid "Bluetooth disabled"
msgstr "Bluetooth ist deaktiviert"
-#: plugins/media-keys/gsd-media-keys-manager.c:2471
+#: plugins/media-keys/gsd-media-keys-manager.c:2479
msgid "Bluetooth enabled"
msgstr "Bluetooth ist aktiviert"
-#: plugins/media-keys/gsd-media-keys-manager.c:2475
+#: plugins/media-keys/gsd-media-keys-manager.c:2483
msgid "Airplane mode enabled"
msgstr "Flugzeugmodus ist aktiviert"
-#: plugins/media-keys/gsd-media-keys-manager.c:2478
+#: plugins/media-keys/gsd-media-keys-manager.c:2486
msgid "Airplane mode disabled"
msgstr "Flugzeugmodus ist deaktiviert"
-#: plugins/media-keys/gsd-media-keys-manager.c:2507
+#: plugins/media-keys/gsd-media-keys-manager.c:2515
msgid "Hardware Airplane Mode"
msgstr "Hardware-Flugzeugmodus"
#. Translators: this is a filename used for screencast
#. * recording, where "%d" and "%t" date and time, e.g.
#. * "Screencast from 07-17-2013 10:00:46 PM.webm"
-#: plugins/media-keys/gsd-media-keys-manager.c:2570
+#: plugins/media-keys/gsd-media-keys-manager.c:2578
#, no-c-format
msgid "Screencast from %d %t.webm"
msgstr "Bildschirmvideo von %d %t.webm"
@@ -2178,46 +2178,46 @@ msgstr ""
"Rechner wird deshalb nun heruntergefahren."
#. TRANSLATORS: this is the sound description
-#: plugins/power/gsd-power-manager.c:1333
+#: plugins/power/gsd-power-manager.c:1338
msgid "Lid has been opened"
msgstr "Klappe wurde geöffnet"
#. TRANSLATORS: this is the sound description
-#: plugins/power/gsd-power-manager.c:1367
+#: plugins/power/gsd-power-manager.c:1372
msgid "Lid has been closed"
msgstr "Klappe wurde geschlossen"
#. TRANSLATORS: this is the sound description
-#: plugins/power/gsd-power-manager.c:1934
+#: plugins/power/gsd-power-manager.c:1946
msgid "On battery power"
msgstr "Batteriebetrieb"
#. TRANSLATORS: this is the sound description
-#: plugins/power/gsd-power-manager.c:1939
+#: plugins/power/gsd-power-manager.c:1951
msgid "On AC power"
msgstr "Netzbetrieb"
-#: plugins/power/gsd-power-manager.c:2127
+#: plugins/power/gsd-power-manager.c:2139
msgid "Automatic logout"
msgstr "Automatisch abmelden"
-#: plugins/power/gsd-power-manager.c:2127
+#: plugins/power/gsd-power-manager.c:2139
msgid "You will soon log out because of inactivity."
msgstr "Aufgrund von Inaktivität werden Sie bald abgemeldet."
# oder Automatischer Bereitschaftsmodus
-#: plugins/power/gsd-power-manager.c:2132
+#: plugins/power/gsd-power-manager.c:2144
msgid "Automatic suspend"
msgstr "Automatisch in den Bereitschaftsmodus wechseln"
-#: plugins/power/gsd-power-manager.c:2132
-#: plugins/power/gsd-power-manager.c:2137
+#: plugins/power/gsd-power-manager.c:2144
+#: plugins/power/gsd-power-manager.c:2149
msgid "Computer will suspend very soon because of inactivity."
msgstr ""
"Aufgrund von Inaktivität wird der Rechner bald in Bereitschaft versetzt."
# oder Automatischer Ruhezustand
-#: plugins/power/gsd-power-manager.c:2137
+#: plugins/power/gsd-power-manager.c:2149
msgid "Automatic hibernation"
msgstr "Automatisch in den Ruhezustand wechseln"
@@ -2509,23 +2509,18 @@ msgstr ""
"Geräte prüfen."
#: plugins/usb-protection/gsd-usb-protection-manager.c:589
-#| msgid "New keyboard detected"
msgid "New device detected"
msgstr "Neues Gerät erkannt"
#: plugins/usb-protection/gsd-usb-protection-manager.c:590
-#| msgid ""
-#| "Either your keyboard has been reconnected or a new one has been plugged "
-#| "in. If you did not do it, check your system for any suspicious device."
msgid ""
"Either one of your existing devices has been reconnected or a new one has "
"been plugged in. If you did not do it, check your system for any suspicious "
"device."
msgstr ""
-"Entweder wurde eines Ihrer vorhandenen Geräte neu verbunden oder ein neues"
-" Gerät wurde "
-"angeschlossen. Falls Sie nichts dergleichen getan haben, sollten Sie Ihr "
-"System auf verdächtige Geräte prüfen."
+"Entweder wurde eines Ihrer vorhandenen Geräte neu verbunden oder ein neues "
+"Gerät wurde angeschlossen. Falls Sie nichts dergleichen getan haben, sollten "
+"Sie Ihr System auf verdächtige Geräte prüfen."
#: plugins/usb-protection/gsd-usb-protection-manager.c:596
msgid "Reconnect USB device"
From: Benjamin Berg <bberg@redhat.com>
Date: Thu, 15 Oct 2020 15:18:35 +0200
Subject: power: Avoid automatic logout in GDM/greeter
In GDM sessions (greeter, initial-setup), it does not make sense to
automatically logout. This can happen if the system wide default is
changed to default to the "logout" action.
Note that we already use the RUNNING_UNDER_GDM environment variable in
the keyboard plugin currently. So doing this is likely sane, even if we
probably want a more elegant strategy to detect whether we are in a
"login" session.
Origin: upstream, 3.39.0, commit:10aa1714b05b9834bae7b31e49742baf707b35cb
---
plugins/power/gsd-power-manager.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
index 0e65bd2..cecd53f 100644
--- a/plugins/power/gsd-power-manager.c
+++ b/plugins/power/gsd-power-manager.c
@@ -985,6 +985,9 @@ static void