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-09-27 10:24:42 +00:00
parent 8dd4f04f97
commit 83eaf6a932
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/telephony/kdeconnect_telephony.json
View file

@ -9,6 +9,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[de]": "Benachrichtigungen für Anrufe und SMS anzeigen",
"Description[nl]": "Meldingen tonen van oproepen en SMSjes",