From bdf18453423ff7f1bbd4b58eb32611697f117ae9 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 12 Feb 2018 07:04:02 +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"
---
 effects/flipswitch/flipswitch_config.desktop | 2 +-
 effects/invert/invert_config.desktop         | 2 +-
 effects/logout/package/metadata.desktop      | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/effects/flipswitch/flipswitch_config.desktop b/effects/flipswitch/flipswitch_config.desktop
index f29bda35c2..8d26170e9b 100644
--- a/effects/flipswitch/flipswitch_config.desktop
+++ b/effects/flipswitch/flipswitch_config.desktop
@@ -32,7 +32,7 @@ Name[hne]=फ्लिप स्विच
 Name[hr]=Naslagani prozori – promjena
 Name[hu]=Billenős váltódoboz
 Name[ia]=Commutator de  colpetto (Flip)
-Name[id]=Melipat
+Name[id]=Alih Lipatan
 Name[is]=Flettirofi
 Name[it]=Scambiafinestre a pila
 Name[ja]=フリップスイッチ
diff --git a/effects/invert/invert_config.desktop b/effects/invert/invert_config.desktop
index 264811f1c5..f8401ad848 100644
--- a/effects/invert/invert_config.desktop
+++ b/effects/invert/invert_config.desktop
@@ -37,7 +37,7 @@ Name[hne]=उलटव
 Name[hr]=Izokretanje
 Name[hu]=Invertálás
 Name[ia]=Inverte
-Name[id]=Balik
+Name[id]=Kebalikan
 Name[is]=Umhverfa
 Name[it]=Inverti
 Name[ja]=色調反転
diff --git a/effects/logout/package/metadata.desktop b/effects/logout/package/metadata.desktop
index c4141f00b3..43fea23ff5 100644
--- a/effects/logout/package/metadata.desktop
+++ b/effects/logout/package/metadata.desktop
@@ -15,6 +15,7 @@ Name[gl]=saír
 Name[he]=התנתקות
 Name[hu]=Kijelentkezés
 Name[ia]=Clausura de session
+Name[id]=logout
 Name[it]=uscita
 Name[ko]=로그아웃
 Name[nl]=afmelden