Commit ba4f1847 authored by Script Kiddy's avatar Script Kiddy

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 a661ac27
......@@ -59,7 +59,7 @@ Comment[nl]=Breeze-team
Comment[nn]=Breeze-laget
Comment[pl]=Zespół Bryzy
Comment[pt]=Equipa do Brisa
Comment[pt_BR]=Equipe Breeze
Comment[pt_BR]=Equipe do Breeze
Comment[ru]=Команда Breeze
Comment[sk]=Breeze Team
Comment[sl]=Team Sapice
......
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