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-01-31 12:41:30 +01:00
parent c2739f94f1
commit 29986ac5ac
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

@ -11,6 +11,7 @@
"Description": "Use your keyboard to send key-events to your paired device",
"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[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",
"Description[pl]": "Użyj swojej klawiatury do wysyłania naciśnięć klawiszy do swojego sparowanego urządzenia",
"Description[pt]": "Usar o seu teclado para enviar eventos de teclas para o seu dispositivo emparelhado",
@ -24,6 +25,7 @@
"Name": "Remote keyboard from the desktop",
"Name[ca@valencia]": "Teclat remot des de l'escriptori",
"Name[ca]": "Teclat remot des de l'escriptori",
"Name[it]": "Tastiera remota dal desktop",
"Name[nl]": "Toetsenbord op afstand vanaf het bureaublad",
"Name[pl]": "Zdalna klawiatura z pulpitu",
"Name[pt]": "Teclado remoto do ambiente de trabalho",