From f840fc05ba1178838c1c163f1ed3908a927ba447 Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me@raveit.de>
Date: Wed, 26 Aug 2015 13:01:22 +0200
Subject: Help: fix merge conflicts

---
 help/pa/pa.po       | 2 +-
 help/pt_BR/pt_BR.po | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'help')

diff --git a/help/pa/pa.po b/help/pa/pa.po
index 8be6d960..37f3251d 100644
--- a/help/pa/pa.po
+++ b/help/pa/pa.po
@@ -96,7 +96,7 @@ msgid ""
 "To launch the <application>MATE Control Center</application>, type "
 "<command>mate-control-center</command> in a terminal window."
 msgstr ""
-"<application>ਗਨੋਮ ਕੰਟਰੋਲ ਕੇਂਦਰ ਸ਼ੁਰੂ ਕਰਨ ਲਈ, ਇੱਕ ਟਰਮੀਨਲ ਝਰੋਖੇ 'ਚ <command>mate-control-"
+"<application>ਗਨੋਮ ਕੰਟਰੋਲ ਕੇਂਦਰ ਸ਼ੁਰੂ ਕਰਨ ਲਈ</application>, ਇੱਕ ਟਰਮੀਨਲ ਝਰੋਖੇ 'ਚ <command>mate-control-"
 "center</command> ਲਿਖੋ।"
 
 #: C/control-center.xml:73(para)
diff --git a/help/pt_BR/pt_BR.po b/help/pt_BR/pt_BR.po
index 050ad7a1..1c2f07b1 100644
--- a/help/pt_BR/pt_BR.po
+++ b/help/pt_BR/pt_BR.po
@@ -110,7 +110,7 @@ msgid ""
 "To launch the <application>MATE Control Center</application>, type "
 "<command>mate-control-center</command> in a terminal window."
 msgstr ""
-"Para abrir o <application> Centro de Controle MATE<a/plication>, digite "
+"Para abrir o <application> Centro de Controle MATE</application>, digite "
 "<command>mate-control-center</command> em um terminal."
 
 #: ../C/control-center.xml:73(para)
@@ -131,7 +131,7 @@ msgid ""
 "preference tools installed on your system in a window. Select a preference "
 "tool to see its description in the status bar."
 msgstr ""
-"O <application> Centro de Controle MATE</apllication> mostra ícones para "
+"O <application> Centro de Controle MATE</application> mostra ícones para "
 "todas as ferramentas preferenciais instaladas no seu sistema em uma janela. "
 "Selecione uma ferramenta de preferência para ver sua descrição na barra de "
 "status."
-- 
cgit v1.2.1