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 5f2d093457b385632f7ed3433372d11f2c634128..19c072a027ac9cf1da6060bae62816503d96fd40 100644 (file)
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -129,7 +129,7 @@ Name[gl]=Compacta
 Name[he]=קומפקטי
 Name[hu]=Kompakt
 Name[ia]=Compacte
-Name[id]=Sederhana
+Name[id]=Ringkas
 Name[it]=Compatta
 Name[ja]=コンパクト
 Name[ko]=축소됨