diff options
| author | raveit65 <[email protected]> | 2015-08-26 13:01:22 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2015-08-29 12:01:19 +0200 |
| commit | f840fc05ba1178838c1c163f1ed3908a927ba447 (patch) | |
| tree | 8d9802d11c5870dc0a232cfbf99b7b4e15e3936c | |
| parent | 7cb9010fc3e01e23f0b4ae3d3415949201427094 (diff) | |
| download | mate-control-center-f840fc05ba1178838c1c163f1ed3908a927ba447.tar.bz2 mate-control-center-f840fc05ba1178838c1c163f1ed3908a927ba447.tar.xz | |
Help: fix merge conflicts
| -rw-r--r-- | help/pa/pa.po | 2 | ||||
| -rw-r--r-- | help/pt_BR/pt_BR.po | 4 |
2 files changed, 3 insertions, 3 deletions
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." |