Commit f4412cf5 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 df8c67ba
......@@ -115,6 +115,7 @@ Comment[ca@valencia]=Controla els volums del so
Comment[en_GB]=Control sound volumes
Comment[es]=Control del volumen de los sonidos
Comment[fr]=Volumes de contrôles de sons
Comment[ia]=Controla volumines de sono
Comment[it]=Controlla i volumi sonori
Comment[nl]=Volume van geluid besturen
Comment[nn]=Juster lydstyrkar
......
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