From e8978fe2b4cac267002fda68ded9fddd723cb323 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 31 Jul 2019 08:56:57 +0200
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"
---
 plugins/Manpages/man7.desktop             | 2 +-
 plugins/browsercontrolmodules.desktop     | 2 +-
 plugins/filemanagercontrolmodules.desktop | 2 +-
 plugins/konquerorcontrolmodules.desktop   | 2 +-
 plugins/othercontrolmodules.desktop       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/Manpages/man7.desktop b/plugins/Manpages/man7.desktop
index 9839431b..235f3d69 100644
--- a/plugins/Manpages/man7.desktop
+++ b/plugins/Manpages/man7.desktop
@@ -37,7 +37,7 @@ Name[hr]=(7) Razno
 Name[hsb]=(7) Wšelake
 Name[hu]=(7) Egyéb
 Name[ia]=(7) Miscellanea
-Name[id]=(7) Lain-lain
+Name[id]=(7) Beraneka
 Name[is]=(7) Ýmislegt
 Name[it]=(7) Varie
 Name[ja]=(7) その他
diff --git a/plugins/browsercontrolmodules.desktop b/plugins/browsercontrolmodules.desktop
index 68218e6f..c8b8d078 100644
--- a/plugins/browsercontrolmodules.desktop
+++ b/plugins/browsercontrolmodules.desktop
@@ -20,7 +20,7 @@ Name[he]=מודולי הגדרות דפדפן
 Name[hi]=ब्राउज़र विन्यास घटक
 Name[hu]=Böngésző beállítási modulok
 Name[ia]=Modulos pro navigar inter preferentias
-Name[id]=Modul Setelan Penelusur
+Name[id]=Modul Pengaturan Penelusur
 Name[is]=Stillingaeiningar vafra
 Name[it]=Moduli delle impostazioni del browser
 Name[ko]=브라우저 설정 모듈
diff --git a/plugins/filemanagercontrolmodules.desktop b/plugins/filemanagercontrolmodules.desktop
index 34803326..c6335eb7 100644
--- a/plugins/filemanagercontrolmodules.desktop
+++ b/plugins/filemanagercontrolmodules.desktop
@@ -20,7 +20,7 @@ Name[he]=מודולי הגדרות מנהל הקבצים
 Name[hi]=फ़ाइलप्रबंध विन्यास घटक
 Name[hu]=Fájlkezelő beállítási modulok
 Name[ia]=Modulos de Preferentias de gerente de file
-Name[id]=Modul Setelan Pengelola File
+Name[id]=Modul Pengaturan Pengelola File
 Name[is]=Stillingaeiningar skráastjóra
 Name[it]=Moduli delle impostazioni del gestore dei file
 Name[ko]=파일 관리자 설정 모듈
diff --git a/plugins/konquerorcontrolmodules.desktop b/plugins/konquerorcontrolmodules.desktop
index 600b5919..275d2d02 100644
--- a/plugins/konquerorcontrolmodules.desktop
+++ b/plugins/konquerorcontrolmodules.desktop
@@ -20,7 +20,7 @@ Name[he]=מודלי הגדרות Konqueror
 Name[hi]=कॉन्करर विन्यास घटक
 Name[hu]=Konqueror beállítási modulok
 Name[ia]=Modulos de preferentias de Konqueror
-Name[id]=Modul Setelan Konqueror
+Name[id]=Modul Pengaturan Konqueror
 Name[is]=Stillingaeiningar Konqueror
 Name[it]=Moduli delle impostazioni di Konqueror
 Name[ja]=Konqueror 設定モジュール
diff --git a/plugins/othercontrolmodules.desktop b/plugins/othercontrolmodules.desktop
index 17d19f6b..2fda8236 100644
--- a/plugins/othercontrolmodules.desktop
+++ b/plugins/othercontrolmodules.desktop
@@ -20,7 +20,7 @@ Name[he]=מודלי הגדרות אחרים
 Name[hi]=अन्य विन्यास घटक
 Name[hu]=Egyéb beállítási modulok
 Name[ia]=altere modulos de preferentias
-Name[id]=Modul Setelan Lainnya
+Name[id]=Modul Pengaturan Lainnya
 Name[is]=Aðrar stillingaeiningar
 Name[it]=Altri moduli di impostazioni
 Name[ko]=기타 설정 모듈