From 758d91aafa908a96f28be73dfb828ae8cb8d6134 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 18 Jun 2023 01:52:33 +0000 Subject: [PATCH] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- .../screensaver-inhibit/kdeconnect_screensaver_inhibit.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json index dcb6caaf4..78afa658e 100644 --- a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json +++ b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json @@ -66,7 +66,7 @@ "Description[eu]": "Gelditu pantaila-babeslea gailua konektatuta dagoenean", "Description[fi]": "Estä näytönsäästäjän käynnistyminen, kun laite on yhteydessä", "Description[fr]": "Inhiber l'économiseur d'écran quand le périphérique est connecté", - "Description[gl]": "Desactivar o salvapantallas mentres o dispositivo estea conectado", + "Description[gl]": "Inhibir o salvapantallas mentres o dispositivo estea conectado.", "Description[hu]": "A képernyővédő kikapcsolása, ha az eszköz csatlakoztatva van", "Description[ia]": "Inhibi le salvator de schermo quando le dispositivo es connectite", "Description[id]": "Hambat screensaver ketika peranti telah terhubung", @@ -115,7 +115,7 @@ "Name[eu]": "Gelditu pantaila-babeslea", "Name[fi]": "Estä näytönsäästäjän käynnistyminen", "Name[fr]": "Inhiber l'économiseur d'écran", - "Name[gl]": "Desactivar o salvapantallas", + "Name[gl]": "Inhibir o salvapantallas", "Name[hu]": "Képernyővédő letiltása", "Name[ia]": "Inhibi salvator de schermo", "Name[id]": "Hambat screensaver",