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-07-19 09:50:22 +02:00
parent dbe288664c
commit 631880083d
3 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
indicator/org.kde.kdeconnect.nonplasma.desktop
View file

@ -1,6 +1,8 @@
[Desktop Entry] [Desktop Entry]
Name=KDE Connect Indicator Name=KDE Connect Indicator
Name[ca]=Indicador del KDE Connect Name[ca]=Indicador del KDE Connect
Name[cs]=Indikátor KDE Connect
Name[es]=Indicador de KDE Connect
Name[fr]=Indicateur de KDE Connect Name[fr]=Indicateur de KDE Connect
Name[it]=Indicatore di KDE Connect Name[it]=Indicatore di KDE Connect
Name[nl]=KDE-Connect-indicator Name[nl]=KDE-Connect-indicator

4
plugins/remotekeyboard/kdeconnect_remotekeyboard.json
View file

@ -15,6 +15,8 @@
], ],
"Description": "Use your keyboard to send key-events to your paired device", "Description": "Use your keyboard to send key-events to your paired device",
"Description[ca]": "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[es]": "Use su teclado para enviar eventos de teclado a su dispositivo vinculado",
"Description[fr]": "Utiliser votre clavier pour envoyer des évènements de touche au périphérique associé", "Description[fr]": "Utiliser votre clavier pour envoyer des évènements de touche au périphérique associé",
"Description[it]": "Utilizza la tua tastiera per inviare eventi di pressione dei tasti al dispositivo associato", "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[nl]": "Uw toetsenbord gebruiken om toetsgebeurtenissen naar uw gepaarde apparaat te verzenden",
@ -35,6 +37,8 @@
"License": "GPL", "License": "GPL",
"Name": "Remote keyboard from the desktop", "Name": "Remote keyboard from the desktop",
"Name[ca]": "Teclat remot des de l'escriptori", "Name[ca]": "Teclat remot des de l'escriptori",
"Name[cs]": "Vzdálená klávesnice pro plochu",
"Name[es]": "Teclado remoto desde el equipo de escritorio",
"Name[fr]": "Clavier distant depuis le bureau", "Name[fr]": "Clavier distant depuis le bureau",
"Name[it]": "Tastiera remota dal desktop", "Name[it]": "Tastiera remota dal desktop",
"Name[nl]": "Toetsenbord op afstand vanaf het bureaublad", "Name[nl]": "Toetsenbord op afstand vanaf het bureaublad",

2
urlhandler/org.kde.kdeconnect.telhandler.desktop
View file

@ -1,6 +1,8 @@
[Desktop Entry] [Desktop Entry]
Name=KDE Connect Phone URL Handler Name=KDE Connect Phone URL Handler
Name[ca]=Gestor d'URL de telèfons del KDE Connect Name[ca]=Gestor d'URL de telèfons del KDE Connect
Name[cs]=Nástroj pro práci s URL telefonu v KDE Connect
Name[es]=Administrador de URL de KDE Connect
Name[fr]=Gestionnaire d'URL téléphoniques de KDE Connect Name[fr]=Gestionnaire d'URL téléphoniques de KDE Connect
Name[it]=Gestore URL del telefono di KDE Connect Name[it]=Gestore URL del telefono di KDE Connect
Name[nl]=KDE-Connect behandelaar van telefoon-URL Name[nl]=KDE-Connect behandelaar van telefoon-URL