From 4f8b1f57e7c7497abfebe313f2f021de46874ac6 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 27 Nov 2017 05:03:51 +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 1352b6bfc..15460038d 100644
--- a/linux/applications/org.kde.Falkon.desktop
+++ b/linux/applications/org.kde.Falkon.desktop
@@ -6,6 +6,7 @@ Name[ca]=Falkon
 Name[ca@valencia]=Falkon
 Name[cs]=Falkon
 Name[de]=Falkon
+Name[en_GB]=Falkon
 Name[es]=Falkon
 Name[nl]=Falkon
 Name[pt]=Falkon
@@ -23,6 +24,7 @@ Comment[ca]=Un navegador web ràpid i segur
 Comment[ca@valencia]=Un navegador web ràpid i segur
 Comment[cs]=Rychlý a bezpečný webový prohlížeč
 Comment[de]=Ein schneller und sicherer Webbrowser
+Comment[en_GB]=A fast and secure web browser
 Comment[es]=Un navegador web rápido y seguro
 Comment[nl]=Een snelle en veilige webbrowser
 Comment[pt]=Um navegador Web rápido e seguro
@@ -37,6 +39,7 @@ GenericName[ca]=Navegador web
 GenericName[ca@valencia]=Navegador web
 GenericName[cs]=Webový prohlížeč
 GenericName[de]=Webbrowser
+GenericName[en_GB]=Web Browser
 GenericName[es]=Navegador web
 GenericName[fr]=Navigateur Web
 GenericName[nl]=Webbrowser
@@ -59,6 +62,7 @@ Name[ca]=Obre una pestanya nova
 Name[ca@valencia]=Obri una pestanya nova
 Name[cs]=Otevřít novou kartu
 Name[de]=Neues Unterfenster öffnen
+Name[en_GB]=Open new tab
 Name[es]=Abrir nueva pestaña
 Name[nl]=Nieuw tabblad openen
 Name[pt]=Abrir uma nova página
@@ -76,6 +80,7 @@ Name[ca]=Obre una finestra nova
 Name[ca@valencia]=Obri una finestra nova
 Name[cs]=Otevřít nové okno
 Name[de]=Neues Fenster öffnen
+Name[en_GB]=Open new window
 Name[es]=Abrir nueva ventana
 Name[nl]=Nieuw venster openen
 Name[pt]=Abrir uma nova janela
@@ -92,6 +97,7 @@ Name[ca]=Inicia la navegació privada
 Name[ca@valencia]=Inicia la navegació privada
 Name[cs]=Začít soukromé prohlížení
 Name[de]=Im privaten Browsermodus starten
+Name[en_GB]=Start private browsing
 Name[es]=Iniciar navegación privada
 Name[nl]=Privébrowsing starten
 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 8147dfb97..3c4454703 100644
--- a/src/lib/data/breeze-fallback/index.theme
+++ b/src/lib/data/breeze-fallback/index.theme
@@ -6,6 +6,7 @@ Name[ca]=Brisa
 Name[ca@valencia]=Brisa
 Name[cs]=Breeze
 Name[de]=Breeze
+Name[en_GB]=Breeze
 Name[es]=Brisa
 Name[fr]=Brise
 Name[nl]=Breeze
@@ -22,6 +23,7 @@ Comment[ca]=L'equip Brisa
 Comment[ca@valencia]=L'equip Brisa
 Comment[cs]=Team Breeze
 Comment[de]=Breeze-Team
+Comment[en_GB]=Breeze Team
 Comment[es]=Equipo de Brisa
 Comment[nl]=Breeze-team
 Comment[pt]=Equipa do Brisa