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 2017-03-05 06:58:38 +01:00
parent dfa780c8d8
commit df3d092def
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/remotekeyboard/kdeconnect_remotekeyboard.json
View file

@ -12,6 +12,7 @@
"Description[ca@valencia]": "Useu el vostre teclat per enviar esdeveniments de tecla al dispositiu enllaçat",
"Description[ca]": "Useu el vostre teclat per enviar esdeveniments de tecla al dispositiu enllaçat",
"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",
"Description[es]": "Use su teclado para enviar eventos de tecla a su dispositivo vinculado",
"Description[it]": "Utilizza la tua tastiera per inviare eventi di pressione dei tasti al dispositivo associato",
"Description[nl]": "Uw toetsenbord gebruiken om toetsgebeurtenissen naar uw gepaarde apparaat te verzenden",
@ -29,6 +30,7 @@
"Name[ca@valencia]": "Teclat remot des de l'escriptori",
"Name[ca]": "Teclat remot des de l'escriptori",
"Name[cs]": "Vzdálená klávesnice pro plochu",
"Name[da]": "Eksternt tastatur fra desktoppen",
"Name[es]": "Teclado remoto desde el equipo de escritorio",
"Name[it]": "Tastiera remota dal desktop",
"Name[nl]": "Toetsenbord op afstand vanaf het bureaublad",