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"

diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop
index 8941e84654c5802d2c6a7e3c057c7e0beb56972a..e875a53a2dac9152fd61354521ced76b4a22a8f2 100644 (file)
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -54,6 +54,7 @@ Actions=icons;details;compact;
 
 [Desktop Action icons]
 Name=Icons
 
 [Desktop Action icons]
 Name=Icons

+Name[ast]=Iconos

 Name[ca]=Icones
 Name[ca@valencia]=Icones
 Name[cs]=Ikony
 Name[ca]=Icones
 Name[ca@valencia]=Icones
 Name[cs]=Ikony