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"

src/org.kde.partitionmanager.desktop

@@ -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;