Commit 551b53ea 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 6ab0d56b
......@@ -172,6 +172,7 @@ Keywords[de]=partition;disk;festplatte
Keywords[el]=κατάτμηση;δίσκος;
Keywords[en_GB]=partition;disk;
Keywords[es]=partición;disco;
Keywords[et]=partitsioon;ketas;
Keywords[eu]=partizioa;diskoa;
Keywords[fi]=osio;levy;
Keywords[fr]=partition;disque;
......
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