From 42a0c5637a4f6c964f58d193eceadc7fa12b4bee Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 18 Feb 2019 08:18:21 +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"
---
 applets/batterymonitor/package/metadata.desktop             | 2 +-
 dataengines/activities/plasma-dataengine-activities.desktop | 2 +-
 freespacenotifier/freespacenotifier.notifyrc                | 2 +-
 klipper/klipperrc.desktop                                   | 4 ++--
 plasma-windowed/plasma-windowed.desktop                     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/applets/batterymonitor/package/metadata.desktop b/applets/batterymonitor/package/metadata.desktop
index ceca5c071..97943bdb7 100644
--- a/applets/batterymonitor/package/metadata.desktop
+++ b/applets/batterymonitor/package/metadata.desktop
@@ -16,7 +16,7 @@ Name[fr]=Batterie et luminosité
 Name[gl]=Batería e brillo
 Name[he]=סוללה ובהירות
 Name[hu]=Akkumulátor és fényerő
-Name[id]=Battery and Brightness
+Name[id]=Baterai dan Kecerahan
 Name[is]=Rafhlaða og skjábirta
 Name[it]=Batteria e luminosità
 Name[ja]=バッテリーと明るさ
diff --git a/dataengines/activities/plasma-dataengine-activities.desktop b/dataengines/activities/plasma-dataengine-activities.desktop
index 8e7e0106d..9d01624ae 100644
--- a/dataengines/activities/plasma-dataengine-activities.desktop
+++ b/dataengines/activities/plasma-dataengine-activities.desktop
@@ -79,7 +79,7 @@ Comment[he]=מידע אודות הפעילויות של Plasma
 Comment[hr]=Informacije o Plasminim aktivnostima
 Comment[hu]=Információk a Plasma aktivitásokról
 Comment[ia]=Information re activitates de Plasma
-Comment[id]=Informasi tentang Aktivitas Plasma
+Comment[id]=Informasi tentang Activities Plasma
 Comment[is]=Upplýsingar um Plasma virkni
 Comment[it]=Informazioni sulle attività di Plasma
 Comment[ja]=Plasma アクティビティの情報
diff --git a/freespacenotifier/freespacenotifier.notifyrc b/freespacenotifier/freespacenotifier.notifyrc
index df63b8b47..a70eee5cc 100644
--- a/freespacenotifier/freespacenotifier.notifyrc
+++ b/freespacenotifier/freespacenotifier.notifyrc
@@ -24,7 +24,7 @@ Comment[hi]=केडीई खाली स्थान सूचना डे
 Comment[hr]=KDE-ov servis za obavještavanje o slobodnom prostoru
 Comment[hu]=KDE szabad hely értesítő szolgáltatás
 Comment[ia]=Demone de notification de spatio libere de KDE
-Comment[id]=Jurik Notifikasi RUang Kosong KDE
+Comment[id]=Daemon Notifikasi RUang Kosong KDE
 Comment[is]=KDE tilkynningaþjónn fyrir laust pláss
 Comment[it]=Demone di notifica dello spazio libero di KDE
 Comment[ja]=KDE 空き領域デーモン
diff --git a/klipper/klipperrc.desktop b/klipper/klipperrc.desktop
index 1b34d6c79..3f92bea17 100644
--- a/klipper/klipperrc.desktop
+++ b/klipper/klipperrc.desktop
@@ -313,7 +313,7 @@ Description[hr]=Otvori pomoću &zadanog preglednika
 Description[hsb]=Ze &standardnym browserom wočinić
 Description[hu]=Megnyitás az &alapértelmezett böngészővel
 Description[ia]=Aperi con navigator pre&definite
-Description[id]=Buka &dengan Penelusur default
+Description[id]=Buka &dengan Penelusur baku
 Description[is]=Opna með sjálf&gefnum vefskoðara
 Description[it]=Apri con il browser pre&definito
 Description[ja]=デフォルトのブラウザで開く(&D)
@@ -1979,7 +1979,7 @@ Description[hr]=Otvori pomoću &zadanog preglednika
 Description[hsb]=Ze &standardnym browserom wočinić
 Description[hu]=Megnyitás az &alapértelmezett böngészővel
 Description[ia]=Aperi con navigator pre&definite
-Description[id]=Buka &dengan Penelusur default
+Description[id]=Buka &dengan Penelusur baku
 Description[is]=Opna með sjálf&gefnum vefskoðara
 Description[it]=Apri con il browser pre&definito
 Description[ja]=デフォルトのブラウザで開く(&D)
diff --git a/plasma-windowed/plasma-windowed.desktop b/plasma-windowed/plasma-windowed.desktop
index d40790615..57b000c46 100755
--- a/plasma-windowed/plasma-windowed.desktop
+++ b/plasma-windowed/plasma-windowed.desktop
@@ -56,7 +56,7 @@ Comment[et]=Plasmoidide käivitamine tavaliste rakendustena
 Comment[eu]=Exekutatu Plasmoideak aplikazio arrunt gisa
 Comment[fi]=Suorita plasmoideja sovelluksina
 Comment[fr]=Lancer les plasmoïdes comme de simples applications
-Comment[gl]=Execute trebellos de Plasma como se fosen aplicativos sinxelos.
+Comment[gl]=Execute plasmoides como se fosen aplicativos sinxelos
 Comment[hu]=Plazmoidok futtatása egyszerű alkalmazásként
 Comment[id]=Menjalankan Plasmoids sebagai aplikasi sederhana
 Comment[is]=Keyra Plasmíð sem einföld forrit