From e88f022bb7abb2fdd331361497733603497d02a2 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 2 Mar 2018 05:23: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 | 4 ++++
 src/lib/adblock/metadata.desktop          | 3 +++
 src/lib/data/breeze-fallback/index.theme  | 1 +
 src/scripts/hellopython/metadata.desktop  | 2 ++
 4 files changed, 10 insertions(+)

diff --git a/linux/applications/org.kde.falkon.desktop b/linux/applications/org.kde.falkon.desktop
index 40db9a66a..bf9153a77 100644
--- a/linux/applications/org.kde.falkon.desktop
+++ b/linux/applications/org.kde.falkon.desktop
@@ -15,6 +15,7 @@ Name[it]=Falkon
 Name[nl]=Falkon
 Name[pl]=Falkon
 Name[pt]=Falkon
+Name[pt_BR]=Falkon
 Name[sk]=Falkon
 Name[sv]=Falkon
 Name[uk]=Falkon
@@ -59,6 +60,7 @@ GenericName[it]=Browser web
 GenericName[nl]=Webbrowser
 GenericName[pl]=Przeglądarka sieciowa
 GenericName[pt]=Navegador Web
+GenericName[pt_BR]=Navegador Web
 GenericName[sk]=Webový prehliadač
 GenericName[sv]=Webbläsare
 GenericName[uk]=Переглядач інтернету
@@ -87,6 +89,7 @@ Name[it]=Apri una nuova scheda
 Name[nl]=Nieuw tabblad openen
 Name[pl]=Otwórz nową kartę
 Name[pt]=Abrir uma nova página
+Name[pt_BR]=Abrir uma nova aba
 Name[sk]=Otvoriť novú záložku
 Name[sv]=Öppna ny flik
 Name[uk]=Відкрити нову вкладку
@@ -111,6 +114,7 @@ Name[it]=Apre una nuova finestra
 Name[nl]=Nieuw venster openen
 Name[pl]=Otwórz nowe okno
 Name[pt]=Abrir uma nova janela
+Name[pt_BR]=Abrir nova janela
 Name[sv]=Öppna nytt fönster
 Name[uk]=Відкрити нове вікно
 Name[x-test]=xxOpen new windowxx
diff --git a/src/lib/adblock/metadata.desktop b/src/lib/adblock/metadata.desktop
index 6c63b0e02..121eff3c9 100644
--- a/src/lib/adblock/metadata.desktop
+++ b/src/lib/adblock/metadata.desktop
@@ -1,10 +1,13 @@
 [Desktop Entry]
 Name=AdBlock
+Name[ca]=AdBlock
 Name[pt]=AdBlock
+Name[pt_BR]=AdBlock
 Name[sv]=Reklamblockering
 Name[uk]=Блокування реклами
 Name[x-test]=xxAdBlockxx
 Comment=Blocks unwanted web content
+Comment[ca]=Bloqueja el contingut web no desitjat
 Comment[pt]=Bloqueia o conteúdo Web indesejado
 Comment[sv]=Blockerar oönskat webbinnehåll
 Comment[uk]=Блокує небажані інтернет-дані
diff --git a/src/lib/data/breeze-fallback/index.theme b/src/lib/data/breeze-fallback/index.theme
index fac6e4596..040a10697 100644
--- a/src/lib/data/breeze-fallback/index.theme
+++ b/src/lib/data/breeze-fallback/index.theme
@@ -15,6 +15,7 @@ Name[it]=Brezza
 Name[nl]=Breeze
 Name[pl]=Bryza
 Name[pt]=Brisa
+Name[pt_BR]=Breeze
 Name[sk]=Vánok
 Name[sv]=Breeze
 Name[uk]=Breeze
diff --git a/src/scripts/hellopython/metadata.desktop b/src/scripts/hellopython/metadata.desktop
index eb0b942a7..b9e0df362 100644
--- a/src/scripts/hellopython/metadata.desktop
+++ b/src/scripts/hellopython/metadata.desktop
@@ -1,10 +1,12 @@
 [Desktop Entry]
 Name=Hello Python
+Name[ca]=Hola Python
 Name[pt]=Olá em Python
 Name[sv]=Hej Python
 Name[uk]=Привіт, Python
 Name[x-test]=xxHello Pythonxx
 Comment=Example Python extension
+Comment[ca]=Exemple d'una extensió en Python
 Comment[pt]=Extensão de exemplo em Python
 Comment[sv]=Exempel på Python-utökning
 Comment[uk]=Приклад розширення мовою Python