Commit cf354147 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 962a1064
......@@ -119,6 +119,7 @@ Comment[nn]=Juster lydstyrkar
Comment[pl]=Steruje głośnością dźwięku
Comment[pt]=Vigia os níveis de volume de som
Comment[pt_BR]=Controla os volumes do som
Comment[ru]=Управление громкостью звука
Comment[sl]=Nadzoruje glasnost zvoka
Comment[sv]=Kontrollera ljudvolymer
Comment[uk]=Керування гучністю звуків
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