tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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"
This commit is contained in:
l10n daemon script 2023-06-16 01:39:48 +00:00
parent 9f3ae5b1ce
commit d690119e4d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
View file

@ -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]": "禁止屏保",