Commit 203e5b24 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 2f928fbf
......@@ -10,6 +10,7 @@ Name[nn]=Breeze
Name[pl]=Bryza
Name[pt]=Brisa
Name[sk]=Vánok
Name[sl]=Sapica
Name[sv]=Breeze
Name[uk]=Breeze
Name[x-test]=xxBreezexx
......
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