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 2016-10-15 09:58:56 +00:00
parent 258a844588
commit 1ace12ce57
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/remotecommands/kdeconnect_remotecommands.json
View file

@ -35,6 +35,7 @@
"Name": "Host remote commands",
"Name[ca@valencia]": "Allotja ordes remotes",
"Name[ca]": "Allotja ordres remotes",
"Name[da]": "Vært for eksterne kommandoer",
"Name[es]": "Órdenes en servidor remoto",
"Name[it]": "Comandi remoti host",
"Name[nl]": "Host voor commando's op afstand",

1
plugins/telephony/kdeconnect_telephony.json
View file

@ -11,6 +11,7 @@
"Description": "Show notifications for calls and SMS",
"Description[ca@valencia]": "Mostra les notificacions de les trucades i els SMS",
"Description[ca]": "Mostra les notificacions de les trucades i els SMS",
"Description[da]": "Vis bekendtgørelser for opkald og sms",
"Description[de]": "Benachrichtigungen für Anrufe und SMS anzeigen",
"Description[es]": "Mostrar notificaciones de llamadas y SMS",
"Description[it]": "Mostra notifiche per le chiamate e per gli SMS",