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 d1549f2d8593e8ba88993b9bec8f8e327d14716b..d063af3a9e3fe1a28a46364eb199cfa2a86c2c5c 100644 (file)
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -59,6 +59,7 @@ Name[ast]=Iconos
 Name[ca]=Icones
 Name[ca@valencia]=Icones
 Name[cs]=Ikony
 Name[ca]=Icones
 Name[ca@valencia]=Icones
 Name[cs]=Ikony

+Name[da]=Ikoner

 Name[de]=Symbole
 Name[el]=Εικονίδια
 Name[en_GB]=Icons
 Name[de]=Symbole
 Name[el]=Εικονίδια
 Name[en_GB]=Icons