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-02 06:03:00 +02:00
parent 147fb6f35f
commit 9ec0d04f4d
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

@ -50,6 +50,7 @@
"Description[nl]": "Meldingen tonen van inkomende oproepen", "Description[nl]": "Meldingen tonen van inkomende oproepen",
"Description[nn]": "Vis varsling ved oppringing", "Description[nn]": "Vis varsling ved oppringing",
"Description[pt]": "Mostrar notificações para as chamadas recebidas", "Description[pt]": "Mostrar notificações para as chamadas recebidas",
"Description[pt_BR]": "Mostra notificações para chamadas recebidas",
"Description[sv]": "Visa underrättelser om inkommande samtal", "Description[sv]": "Visa underrättelser om inkommande samtal",
"Description[uk]": "Показ сповіщень щодо вхідних дзвінків", "Description[uk]": "Показ сповіщень щодо вхідних дзвінків",
"Description[x-test]": "xxShow notifications for incoming callsxx", "Description[x-test]": "xxShow notifications for incoming callsxx",