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-18 01:52:33 +00:00
parent 4ee2d03cb2
commit 758d91aafa
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

@ -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",