From 3ba386de42f9545f855025957f8bbb23c090c19e Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 27 Feb 2018 05:18:36 +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 ++
 1 file changed, 2 insertions(+)

diff --git a/src/lib/adblock/metadata.desktop b/src/lib/adblock/metadata.desktop
index 1509a8969..6c63b0e02 100644
--- a/src/lib/adblock/metadata.desktop
+++ b/src/lib/adblock/metadata.desktop
@@ -1,9 +1,11 @@
 [Desktop Entry]
 Name=AdBlock
+Name[pt]=AdBlock
 Name[sv]=Reklamblockering
 Name[uk]=Блокування реклами
 Name[x-test]=xxAdBlockxx
 Comment=Blocks unwanted web content
+Comment[pt]=Bloqueia o conteúdo Web indesejado
 Comment[sv]=Blockerar oönskat webbinnehåll
 Comment[uk]=Блокує небажані інтернет-дані
 Comment[x-test]=xxBlocks unwanted web contentxx