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 2019-04-08 05:48:13 +02:00
parent 9ec0d04f4d
commit 7df58d0d04
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

@ -44,6 +44,7 @@
"Description[ca@valencia]": "Mostra les notificacions de les trucades entrants", "Description[ca@valencia]": "Mostra les notificacions de les trucades entrants",
"Description[ca]": "Mostra les notificacions de les trucades entrants", "Description[ca]": "Mostra les notificacions de les trucades entrants",
"Description[en_GB]": "Show notifications for incoming calls", "Description[en_GB]": "Show notifications for incoming calls",
"Description[es]": "Mostrar notificaciones para llamadas entrantes",
"Description[fr]": "Affiche des notifications pour les appels entrants", "Description[fr]": "Affiche des notifications pour les appels entrants",
"Description[gl]": "Mostrar notificacións de chamadas entrantes", "Description[gl]": "Mostrar notificacións de chamadas entrantes",
"Description[it]": "Mostra le notifiche per le chiamate in ingresso", "Description[it]": "Mostra le notifiche per le chiamate in ingresso",