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 2018-09-18 05:45:43 +02:00
parent 23d931cb10
commit d7284963de
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/sms/kdeconnect_sms.json
View file

@ -11,6 +11,7 @@
"Description[ca@valencia]": "Envia i rep SMS",
"Description[ca]": "Envia i rep SMS",
"Description[cs]": "Posílat a přijímat SMS",
"Description[fr]": "Envoyer et recevoir des SMS",
"Description[nl]": "SMS verzenden en ontvangen",
"Description[pt]": "Enviar e receber SMS's",
"Description[pt_BR]": "Envia e recebe SMS",