Commit 2e7102a7 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 8baf8ca4
......@@ -110,6 +110,13 @@ Name[x-test]=xxKMixxx
Comment=Control sound volumes
Comment[ca]=Controla els volums del so
Comment[ca@valencia]=Controla els volums del so
Comment[nl]=Volume van geluid besturen
Comment[pt_BR]=Controla os volumes do som
Comment[sv]=Kontrollera ljudvolymer
Comment[uk]=Керування гучністю звуків
Comment[x-test]=xxControl sound volumesxx
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