From 1500f2202a8e0b3340c31c29a84bda7cffcbe234 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 3 Aug 2018 05:36:42 +0200
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 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/linux/applications/org.kde.falkon.desktop b/linux/applications/org.kde.falkon.desktop
index feed6f2da..2b73cb39d 100644
--- a/linux/applications/org.kde.falkon.desktop
+++ b/linux/applications/org.kde.falkon.desktop
@@ -46,6 +46,7 @@ Comment[nl]=Een snelle en veilige webbrowser
 Comment[nn]=Ein kjapp og sikker nettlesar
 Comment[pl]=Szybka i bezpieczna przeglądarka sieciowa
 Comment[pt]=Um navegador Web rápido e seguro
+Comment[pt_BR]=Um navegar Web rápido e seguro
 Comment[sv]=En snabb och säker webbläsare
 Comment[uk]=Проста і безпечна програма для перегляду інтернету
 Comment[x-test]=xxA fast and secure web browserxx
@@ -156,6 +157,7 @@ Name[nl]=Privébrowsing starten
 Name[nn]=Start privat nettlesing
 Name[pl]=Rozpocznij prywatne przeglądanie
 Name[pt]=Iniciar a navegação privada
+Name[pt_BR]=Iniciar navegação privada
 Name[sv]=Starta privat webbläsning
 Name[uk]=Конфіденційний перегляд
 Name[x-test]=xxStart private browsingxx