Commit 4c09e5fc 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 7969eaa5
......@@ -7,7 +7,7 @@ Name[es]=Conversor de perfiles
Name[fr]=Convertisseur de profil
Name[gl]=Conversor de perfís
Name[gl]=Convertedor de perfís
Name[mr]=रूपरेषा परिवर्तक
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