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/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop
index d3f19539a45fda03c941b30b09a650b6581378f5..c8eb36c720d3255c222ceca2ef9c341917ef97e7 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.desktop
+++ b/src/settings/kcm/kcmdolphingeneral.desktop
@@ -22,7 +22,7 @@ Name[ja]=Dolphin 全般
 Name[ko]=Dolphin 일반
 Name[lt]=Dolphin bendrosios
 Name[lv]=Dolphin vispārējs
-Name[ml]=à´ªàµ\86ാതàµ\81 à´¸à´\9càµ\8dà´\9càµ\80à´\95à´°à´£à´\99àµ\8dà´\99à´³àµ\8dâ\80\8d
+Name[ml]=à´¡àµ\8bൾഫിൻ à´\9cനറൽ
 Name[nb]=Dolphin generelt
 Name[nl]=Dolphin algemeen
 Name[nn]=Generelt for Dolphin

diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
index 76e561d9d973ad18912b4ecb0d0d91efe5e76732..486e63ca582e10fcd63e031ce63ea22a5fee754e 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.desktop
+++ b/src/settings/kcm/kcmdolphinviewmodes.desktop
@@ -124,7 +124,7 @@ Name[ja]=表示モード
 Name[ko]=보기 모드
 Name[lt]=Rodinio veiksenos
 Name[lv]=Skata režīmi
-Name[ml]=à´\85വതരണ ദശകള്‍
+Name[ml]=à´\85വതരണ à´°àµ\80തികള്‍
 Name[nb]=Visningsmåter
 Name[nl]=Weergavemodi
 Name[nn]=Visingsmodusar

diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
index a04f1cc6075b26978dce0a6169f7b2fe70bcb4de..c3d4d1837a1bc76ca44e698cf970e9d3ac792b8e 100644 (file)
--- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
+++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
@@ -25,7 +25,7 @@ Comment[ja]=ファイルビューのためのバージョン管理プラグイ
 Comment[ko]=파일 보기용 버전 제어 플러그인
 Comment[lt]=Failo rodinių versijų tvarkymo papildinys
 Comment[lv]=Versiju kontroles spraudnis priekš datņu skata
-Comment[ml]=ഫയലàµ\8dâ\80\8d à´\85വതരണദിശà´\95ൾà´\95àµ\8dà´\95àµ\81à´³àµ\8dà´³ പതിപàµ\8dà´ªàµ\8d നിയനàµ\8dà´¤àµ\8dà´°à´£ à´¸à´\82à´¯àµ\8bà´\9cà´\95à´\82
+Comment[ml]=ഫയൽ à´\95ാഴàµ\8dâ\80\8cà´\9aà´\95ൾà´\95àµ\8dà´\95ായàµ\81à´³àµ\8dà´³ പതിപàµ\8dà´ªàµ\8d നിയനàµ\8dà´¤àµ\8dà´°à´£ à´ªàµ\8dà´²à´\97ിൻ
 Comment[nb]=Versjonskontrollmodul for filvisninger
 Comment[nl]=Plugin voor versiecontrole op bestandoverzichten
 Comment[nn]=Versjonskontroll-tillegg for filvisingar