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 2017-03-14 21:36:14 +01:00
parent 12d322a0f9
commit 17a6d1eaac
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/pausemusic/kdeconnect_pausemusic.json
View file

@ -13,7 +13,7 @@
"Description[ca]": "Pausa la música/vídeos durant una trucada telefònica",
"Description[cs]": "Pozastavit hudbu/video během telefonátu",
"Description[da]": "Sæt musik/video på pause under telefonsamtaler",
"Description[de]": "Hält Musik oder Videos währen eines Anrufs an",
"Description[de]": "Hält Musik oder Videos während eines Anrufs an",
"Description[es]": "Pausar música/video durante las llamadas telefónicas",
"Description[et]": "Muusika või video peatamine telefonikõne ajal",
"Description[fi]": "Keskeytä musiikki ja videot puhelun aikana",