From 33581c60c7f7df69ffcad5bda77e9b54e08ed14b Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 22 Feb 2019 05:30:16 +0100
Subject: [PATCH] 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"
---
 src/settings/kcm/kcmdolphingeneral.desktop    | 2 +-
 src/settings/kcm/kcmdolphinnavigation.desktop | 2 +-
 src/settings/kcm/kcmdolphinservices.desktop   | 2 +-
 src/settings/kcm/kcmdolphinviewmodes.desktop  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop
index c0faa31a2..64c00713b 100644
--- a/src/settings/kcm/kcmdolphingeneral.desktop
+++ b/src/settings/kcm/kcmdolphingeneral.desktop
@@ -159,7 +159,7 @@ Comment[fr]=Configuration des paramètres généraux du gestionnaire de fichiers
 Comment[gl]=Configurar opcións xerais de xestores de ficheiros.
 Comment[hu]=A fájlkezelő általános beállításainak módosítása
 Comment[ia]=Configura preferentias del gerente general de file
-Comment[id]=Konfigurasi setelan pengelola file umum
+Comment[id]=Konfigurasikan setelan pengelola file umum
 Comment[it]=Configura le impostazioni generali del gestore dei file
 Comment[ja]=ファイルマネージャの全般的な設定を行います
 Comment[ko]=일반 파일 관리자 설정
diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop
index 35f0fc723..ecc2e46d9 100644
--- a/src/settings/kcm/kcmdolphinnavigation.desktop
+++ b/src/settings/kcm/kcmdolphinnavigation.desktop
@@ -159,7 +159,7 @@ Comment[fr]=Configuration la navigation avec le gestionnaire de fichiers
 Comment[gl]=Configurar a navegación do xestor de ficheiros.
 Comment[hu]=A fájlkezelő navigálásának beállítása
 Comment[ia]=Configura navigation del gerente de file
-Comment[id]=Konfigurasi navigasi pengelola file
+Comment[id]=Konfigurasikan navigasi pengelola file
 Comment[it]=Configura la navigazione col gestore dei file
 Comment[ja]=ファイルマネージャでのナビゲーションを設定します
 Comment[ko]=파일 관리자 탐색 설정
diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop
index 024c44a5d..409a3aa21 100644
--- a/src/settings/kcm/kcmdolphinservices.desktop
+++ b/src/settings/kcm/kcmdolphinservices.desktop
@@ -114,7 +114,7 @@ Comment[fr]=Configuration des services du gestionnaire de fichiers
 Comment[gl]=Configurar servizos de xestores de ficheiros.
 Comment[hu]=A fájlkezelő szolgáltatásainak beállítása
 Comment[ia]=Configura servicios del gerente de file
-Comment[id]=Konfigurasi layanan pengelola file
+Comment[id]=Konfigurasikan layanan pengelola file
 Comment[it]=Configura i servizi del gestore dei file
 Comment[ja]=ファイルマネージャのサービスを設定します
 Comment[ko]=파일 관리자 서비스 설정
diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
index 14f3e530e..9c29e403a 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.desktop
+++ b/src/settings/kcm/kcmdolphinviewmodes.desktop
@@ -158,7 +158,7 @@ Comment[fr]=Configuration les modes d'affichage du gestionnaire de fichiers
 Comment[gl]=Configurar os modos de vista do xestor de ficheiros.
 Comment[hu]=A fájlkezelő nézetmódjainak beállítása
 Comment[ia]=Configura le modos de vista del gerente de file
-Comment[id]=Konfigurasi mode tampilan pengelola file
+Comment[id]=Konfigurasikan mode tampilan pengelola file
 Comment[it]=Configura le viste del gestore dei file
 Comment[ja]=ファイルマネージャの表示モードを設定します
 Comment[ko]=파일 관리자 보기 모드 설정
-- 
2.47.3