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/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
index 996e8410981156ab3db060e8c9ed08d598191c37..76e561d9d973ad18912b4ecb0d0d91efe5e76732 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.desktop
+++ b/src/settings/kcm/kcmdolphinviewmodes.desktop
@@ -61,7 +61,7 @@ Comment[fi]=Tällä palvelulla voi muokata Dolphinin katselutilojen asetuksia.
 Comment[fr]=Ce service permet de configurer les modes d'affichage de Dolphin.
 Comment[gl]=Este servizo permite configurar os modos de vista de Dolphin.
 Comment[hu]=Ez a szolgáltatás lehetővé teszi a Dolphin nézetmódjainak beállítását.
-Comment[ia]=Iste servicio permitte configuration de le modos de vista de Dolphin
+Comment[ia]=Iste servicio permitte configuration del modos de vista de Dolphin
 Comment[id]=Layanan ini memungkinkan konfigurasi mode tampilan Dolphin.
 Comment[it]=Questo servizio permette di configurare le viste di Dolphin.
 Comment[ja]=Dolphin の表示モードを設定します