Commit ead4ca36 authored by Script Kiddy's avatar Script Kiddy
Browse files

SVN_SILENT made messages (.desktop file) - always resolve ours

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"
parent 86b2b902
......@@ -15,6 +15,7 @@ Name[eu]=KMix daimona
Name[fi]=KMix-palvelu
Name[fr]=Démon KMix
Name[gl]=Servizo de KMix
Name[hu]=KMixD démon
Name[ia]=Demone KMixD
Name[id]=KMix Daemon
Name[it]=Demone di KMix
......@@ -47,6 +48,7 @@ Comment[eu]=Soinu gailuak gainbegiratzen ditu
Comment[fi]=Valvoo äänilaitteita
Comment[fr]=Suivi des périphériques son
Comment[gl]=Monitoriza os dispositivos de son
Comment[hu]=Hangeszközök monitorozása
Comment[ia]=Supervisiona dispositivos de sono
Comment[id]=Pemantau perangkat suara
Comment[it]=Controlla i dispositivi sonori
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment