From d690119e4d46848fd7f01a13c2259b6d4557467c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 16 Jun 2023 01:39:48 +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 6c749f747..dcb6caaf4 100644 --- a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json +++ b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json @@ -90,7 +90,7 @@ "Description[sr@latin]": "Onemogućava čuvara ekrana kada je uređaj povezan", "Description[sr]": "Онемогућава чувара екрана када је уређај повезан", "Description[sv]": "Stoppa skärmsläckaren när apparaten ansluts", - "Description[tr]": "Aygıt bağlandığında ekran koruyucuyu durdur", + "Description[tr]": "Aygıt bağlandığında ekran koruyucuyu engelle", "Description[uk]": "Забороняє зберігач екрана, якщо з’єднано пристрій", "Description[x-test]": "xxInhibit the screensaver when the device is connectedxx", "Description[zh_CN]": "连接设备时禁止屏保", @@ -139,7 +139,7 @@ "Name[sr@latin]": "Onemogući čuvara ekrana", "Name[sr]": "Онемогући чувара екрана", "Name[sv]": "Stoppa skärmsläckare", - "Name[tr]": "Ekran koruyucuyu durdur", + "Name[tr]": "Ekran koruyucuyu engelle", "Name[uk]": "Заборона зберігача екрана", "Name[x-test]": "xxInhibit screensaverxx", "Name[zh_CN]": "禁止屏保",