From 20bc412317e65f74b5962805db8fdf3ca2707a0e Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 23 Jan 2018 05:11:58 +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"
---
 linux/applications/org.kde.Falkon.desktop | 6 ++++++
 src/lib/data/breeze-fallback/index.theme  | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/linux/applications/org.kde.Falkon.desktop b/linux/applications/org.kde.Falkon.desktop
index c50e5ba84..089a06349 100644
--- a/linux/applications/org.kde.Falkon.desktop
+++ b/linux/applications/org.kde.Falkon.desktop
@@ -10,6 +10,7 @@ Name[en_GB]=Falkon
 Name[es]=Falkon
 Name[fi]=Falkon
 Name[fr]=Falkon
+Name[id]=Falkon
 Name[nl]=Falkon
 Name[pl]=Falkon
 Name[pt]=Falkon
@@ -32,6 +33,7 @@ Comment[en_GB]=A fast and secure web browser
 Comment[es]=Un navegador web rápido y seguro
 Comment[fi]=Nopea ja turvallinen verkkoselain
 Comment[fr]=Un navigateur Web rapide et sécurisé
+Comment[id]=Sebuah penelusur web yang cepat dan aman
 Comment[nl]=Een snelle en veilige webbrowser
 Comment[pl]=Szybka i bezpieczna przeglądarka sieciowa
 Comment[pt]=Um navegador Web rápido e seguro
@@ -50,6 +52,7 @@ GenericName[en_GB]=Web Browser
 GenericName[es]=Navegador web
 GenericName[fi]=Verkkoselain
 GenericName[fr]=Navigateur Web
+GenericName[id]=Penelusur Web
 GenericName[nl]=Webbrowser
 GenericName[pl]=Przeglądarka sieciowa
 GenericName[pt]=Navegador Web
@@ -76,6 +79,7 @@ Name[en_GB]=Open new tab
 Name[es]=Abrir nueva pestaña
 Name[fi]=Avaa uusi välilehti
 Name[fr]=Ouvrir un nouvel onglet
+Name[id]=Buka tab baru
 Name[nl]=Nieuw tabblad openen
 Name[pl]=Otwórz nową kartę
 Name[pt]=Abrir uma nova página
@@ -98,6 +102,7 @@ Name[en_GB]=Open new window
 Name[es]=Abrir nueva ventana
 Name[fi]=Avaa uusi ikkuna
 Name[fr]=Ouvrir une nouvelle fenêtre
+Name[id]=Buka jendela baru
 Name[nl]=Nieuw venster openen
 Name[pl]=Otwórz nowe okno
 Name[pt]=Abrir uma nova janela
@@ -119,6 +124,7 @@ Name[en_GB]=Start private browsing
 Name[es]=Iniciar navegación privada
 Name[fi]=Aloita yksityisselaus
 Name[fr]=Démarrer la navigation privée
+Name[id]=Mulai penelusuran privasi
 Name[nl]=Privébrowsing starten
 Name[pl]=Rozpocznij prywatne przeglądanie
 Name[pt]=Iniciar a navegação privada
diff --git a/src/lib/data/breeze-fallback/index.theme b/src/lib/data/breeze-fallback/index.theme
index d82b6c112..20116da0d 100644
--- a/src/lib/data/breeze-fallback/index.theme
+++ b/src/lib/data/breeze-fallback/index.theme
@@ -10,6 +10,7 @@ Name[en_GB]=Breeze
 Name[es]=Brisa
 Name[fi]=Breeze
 Name[fr]=Breeze
+Name[id]=Breeze
 Name[nl]=Breeze
 Name[pl]=Bryza
 Name[pt]=Brisa
@@ -29,6 +30,7 @@ Comment[en_GB]=Breeze Team
 Comment[es]=Equipo de Brisa
 Comment[fi]=Breeze-työryhmä
 Comment[fr]=L'équipe de Breeze
+Comment[id]=Tim Breeze
 Comment[nl]=Breeze-team
 Comment[pl]=Zespół Bryzy
 Comment[pt]=Equipa do Brisa