Commit 61dc3141 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 9dc0fba8
......@@ -119,6 +119,7 @@ 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[ko]=소리 음량 제어
Comment[nl]=Volume van geluid besturen
Comment[nn]=Juster lydstyrkar
Comment[pl]=Steruje głośnością dźwięku
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