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 816575aefe1c61d09d74dc0dad176153aee9faf0..1f6af812ec3ed1306a6dfab972faa272fa547954 100644 (file)
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -104,6 +104,7 @@ Exec=dolphin
 [Desktop Action compact]
 Name=Compact
 Name[ar]=متراصّ
 [Desktop Action compact]
 Name=Compact
 Name[ar]=متراصّ

+Name[ast]=Compautu

 Name[ca]=Compacta
 Name[ca@valencia]=Compacta
 Name[cs]=Kompaktní
 Name[ca]=Compacta
 Name[ca@valencia]=Compacta
 Name[cs]=Kompaktní