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-26 09:25:33 +00:00
parent 776c7a81a6
commit 8dd4f04f97
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plugins/telephony/kdeconnect_telephony.json
View file

@ -9,6 +9,13 @@
} }
], ],
"Description": "Show notifications for calls and SMS", "Description": "Show notifications for calls and 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",
"Description[pt]": "Mostrar notificações para as chamadas e SMS",
"Description[sv]": "Visa underrättelser om samtal och SMS",
"Description[uk]": "Показ сповіщень щодо дзвінків і SMS",
"Description[x-test]": "xxShow notifications for calls and SMSxx",
"EnabledByDefault": true, "EnabledByDefault": true,
"Icon": "call-start", "Icon": "call-start",
"Id": "kdeconnect_telephony", "Id": "kdeconnect_telephony",