Commit 962a1064 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 5c97e3d7
......@@ -113,6 +113,7 @@ Comment=Control sound volumes
Comment[ca]=Controla els volums del so
Comment[ca@valencia]=Controla els volums del so
Comment[en_GB]=Control sound volumes
Comment[es]=Control del volumen de los sonidos
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