Commit a49d2542 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 bd21f7b9
......@@ -52,6 +52,7 @@ Name[ko]=VokoscreenNG
Name[lt]=VokoscreenNG
Name[nl]=VokoscreenNG
Name[nn]=VokoscreenNG
Name[pl]=VokoscreenNG
Name[pt]=VokoscreenNG
Name[pt_BR]=VokoscreenNG
Name[ro]=VokoscreenNG
......
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