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-24 05:53:15 +02:00
parent 2c9b1d9366
commit 470fdfef81
4 changed files with 9 additions and 1 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,7 +1,9 @@
[Desktop Entry]
Name=KDE Connect Indicator
Name[ca]=Indicador del KDE Connect
Name[ca@valencia]=Indicador del KDE Connect
Name[cs]=Indikátor KDE Connect
Name[da]=KDE Connect-indikator
Name[es]=Indicador de KDE Connect
Name[fr]=Indicateur de KDE Connect
Name[it]=Indicatore di KDE Connect

2
plugins/remotecommands/kdeconnect_remotecommands.json
View file

@ -45,7 +45,7 @@
"Id": "kdeconnect_remotecommands",
"License": "GPL",
"Name": "Host remote commands",
"Name[ca@valencia]": "Ordes a la màquina remota",
"Name[ca@valencia]": "Allotja ordes remotes",
"Name[ca]": "Allotja ordres remotes",
"Name[cs]": "Přijímat vzdálené příkazy",
"Name[da]": "Vært for eksterne kommandoer",

4
plugins/remotekeyboard/kdeconnect_remotekeyboard.json
View file

@ -14,8 +14,10 @@
}
],
"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[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 teclado a su dispositivo vinculado",
"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",
@ -37,8 +39,10 @@
"Id": "kdeconnect_remotekeyboard",
"License": "GPL",
"Name": "Remote keyboard from the desktop",
"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[fr]": "Clavier distant depuis le bureau",
"Name[it]": "Tastiera remota dal desktop",

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

@ -1,7 +1,9 @@
[Desktop Entry]
Name=KDE Connect Phone URL Handler
Name[ca]=Gestor d'URL de telèfons del KDE Connect
Name[ca@valencia]=Gestor d'URL de telèfons del KDE Connect
Name[cs]=Nástroj pro práci s URL telefonu v KDE Connect
Name[da]=Telefon-URL-håndtering til KDE Connect
Name[es]=Administrador de URL de KDE Connect
Name[fr]=Gestionnaire d'URL téléphoniques de KDE Connect
Name[it]=Gestore URL del telefono di KDE Connect