Commit 0e714dee 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 98d59e69
......@@ -160,7 +160,7 @@ Icon=partitionmanager
Categories=System;Filesystem;KDE;Qt;
X-KDE-StartupNotify=true
Keywords=partition;disk;
Keywords[ast]=partición;discu;
Keywords[ast]=partición;particionar;discu;
Keywords[ca]=partició;disc;
Keywords[ca@valencia]=partició;disc;
Keywords[cs]=oddíl;disk;
......
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