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 2022-06-14 02:58:18 +00:00
parent 156af9f726
commit 6a7a617101
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

@ -50,7 +50,7 @@
"Description": "Inhibit the screensaver when the device is connected", "Description": "Inhibit the screensaver when the device is connected",
"Description[ar]": "امنع حافظة الشّاشة إن كان الجهاز متّصلًا", "Description[ar]": "امنع حافظة الشّاشة إن كان الجهاز متّصلًا",
"Description[az]": "Cihaz qoşularkən Ekran Qoruyucusunu qadağan etmək", "Description[az]": "Cihaz qoşularkən Ekran Qoruyucusunu qadağan etmək",
"Description[ca@valencia]": "Inhibeix el salvapantalla quan el dispositiu està connectat", "Description[ca@valencia]": "Inhibix el salvapantalla quan el dispositiu està connectat",
"Description[ca]": "Inhibeix l'estalvi de pantalla quan el dispositiu està connectat", "Description[ca]": "Inhibeix l'estalvi de pantalla quan el dispositiu està connectat",
"Description[cs]": "Potlačit spořič pokud je zařízení připojeno", "Description[cs]": "Potlačit spořič pokud je zařízení připojeno",
"Description[da]": "Tilbagehold pauseskærmen når enheden er tilsluttet", "Description[da]": "Tilbagehold pauseskærmen når enheden er tilsluttet",
@ -96,7 +96,7 @@
"Name": "Inhibit screensaver", "Name": "Inhibit screensaver",
"Name[ar]": "امنع حافظة الشّاشة", "Name[ar]": "امنع حافظة الشّاشة",
"Name[az]": "Ekran qoruyucusunu qadağan etmək", "Name[az]": "Ekran qoruyucusunu qadağan etmək",
"Name[ca@valencia]": "Inhibeix el salvapantalla", "Name[ca@valencia]": "Inhibix el salvapantalla",
"Name[ca]": "Inhibeix l'estalvi de pantalla", "Name[ca]": "Inhibeix l'estalvi de pantalla",
"Name[cs]": "Potlačit spořič obrazovky", "Name[cs]": "Potlačit spořič obrazovky",
"Name[da]": "Tilbagehold pauseskærm", "Name[da]": "Tilbagehold pauseskærm",