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 01:49:10 +00:00
parent 889beb8a53
commit fc1efc3ea9
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/remotekeyboard/kdeconnect_remotekeyboard.json
View file

@ -51,7 +51,7 @@
"Description[ar]": "استعمل لوحة مفاتيحك لإرسال أحداث مفاتيح إلى جهازك المقترن",
"Description[ast]": "Usa'l tecláu pa unviar eventos de tecles al preséu empareyáu",
"Description[az]": "Klaviaturadan istifadə edərək düymə-əməllərini qoşulmuş cihaza göndərmək",
"Description[ca@valencia]": "Utilitzeu el vostre teclat per a enviar successos de tecla al dispositiu aparellat",
"Description[ca@valencia]": "Utilitzeu el vostre teclat per a enviar esdeveniments de tecla al dispositiu aparellat",
"Description[ca]": "Empreu el vostre teclat per a enviar esdeveniments de tecla al dispositiu aparellat",
"Description[cs]": "Používejte svoji klávesnici pro odesílání událostí kláves na spárované zařízení",
"Description[da]": "Brug dit tastatur til at sende tastehændelser til din parrede enhed",

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

@ -50,7 +50,7 @@
"Description": "Inhibit the screensaver when the device is connected",
"Description[ar]": "امنع حافظة الشّاشة إن كان الجهاز متّصلًا",
"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[cs]": "Potlačit spořič pokud je zařízení připojeno",
"Description[da]": "Tilbagehold pauseskærmen når enheden er tilsluttet",
@ -96,7 +96,7 @@
"Name": "Inhibit screensaver",
"Name[ar]": "امنع حافظة الشّاشة",
"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[cs]": "Potlačit spořič obrazovky",
"Name[da]": "Tilbagehold pauseskærm",