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/dolphinpartactions.desktop b/src/dolphinpartactions.desktop
index 9a547f0cadb1772c396ff72aae2e033c5fbc660b..24ee78f7edaf2108c02e33ac51b4694c799f1d14 100644 (file)
--- a/src/dolphinpartactions.desktop
+++ b/src/dolphinpartactions.desktop
@@ -97,7 +97,7 @@ Name[ie]=Compact
 Name[is]=Þétt
 Name[it]=Compatta
 Name[ja]=コンパクト
 Name[is]=Þétt
 Name[it]=Compatta
 Name[ja]=コンパクト

-Name[ka]=á\83\93á\83\90á\83\9eá\83\90á\83¢á\83\90á\83 á\83\90á\83\95á\83\94á\83\91á\83\90
+Name[ka]=á\83\99á\83\9dá\83\9bá\83\9eá\83\90á\83¥á\83¢á\83£á\83 á\83\98

 Name[ko]=축소됨
 Name[lt]=Kompaktiškas
 Name[lv]=Kompakts
 Name[ko]=축소됨
 Name[lt]=Kompaktiškas
 Name[lv]=Kompakts