From 1acade4133455b2f8fb5358c2c7b94f22c938285 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 4 Mar 2018 05:19:42 +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"
---
 src/lib/adblock/metadata.desktop         | 2 ++
 src/scripts/hellopython/metadata.desktop | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/lib/adblock/metadata.desktop b/src/lib/adblock/metadata.desktop
index fb06a11ed..8d75176f6 100644
--- a/src/lib/adblock/metadata.desktop
+++ b/src/lib/adblock/metadata.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=AdBlock
 Name[ca]=AdBlock
+Name[en_GB]=AdBlock
 Name[nl]=AdBlock
 Name[pt]=AdBlock
 Name[pt_BR]=AdBlock
@@ -9,6 +10,7 @@ Name[uk]=Блокування реклами
 Name[x-test]=xxAdBlockxx
 Comment=Blocks unwanted web content
 Comment[ca]=Bloqueja el contingut web no desitjat
+Comment[en_GB]=Blocks unwanted web content
 Comment[nl]=Blokkeert niet-gewilde webinhoud
 Comment[pt]=Bloqueia o conteúdo Web indesejado
 Comment[sv]=Blockerar oönskat webbinnehåll
diff --git a/src/scripts/hellopython/metadata.desktop b/src/scripts/hellopython/metadata.desktop
index a45b16264..4427fff4a 100644
--- a/src/scripts/hellopython/metadata.desktop
+++ b/src/scripts/hellopython/metadata.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Hello Python
 Name[ca]=Hola Python
+Name[en_GB]=Hello Python
 Name[nl]=Hallo Python
 Name[pt]=Olá em Python
 Name[sv]=Hej Python
@@ -8,6 +9,7 @@ Name[uk]=Привіт, Python
 Name[x-test]=xxHello Pythonxx
 Comment=Example Python extension
 Comment[ca]=Exemple d'una extensió en Python
+Comment[en_GB]=Example Python extension
 Comment[nl]=Voorbeeld Python-extensie
 Comment[pt]=Extensão de exemplo em Python
 Comment[sv]=Exempel på Python-utökning