aboutsummaryrefslogtreecommitdiffstats
path: root/po/pt_BR.po
diff options
context:
space:
mode:
authorPapoteur <papoteur@mageia.org>2018-10-07 20:48:44 +0200
committerPapoteur <papoteur@mageia.org>2018-10-07 20:48:44 +0200
commit49ea6cdddd420743b030da77feb116dcaed134d1 (patch)
tree7e734b4d25513d9edbaf6aeb3fc187310cc85e67 /po/pt_BR.po
parentbd94b5004eda8841a76c7fc4e091643b463e78ef (diff)
downloadisodumper-49ea6cdddd420743b030da77feb116dcaed134d1.tar
isodumper-49ea6cdddd420743b030da77feb116dcaed134d1.tar.gz
isodumper-49ea6cdddd420743b030da77feb116dcaed134d1.tar.bz2
isodumper-49ea6cdddd420743b030da77feb116dcaed134d1.tar.xz
isodumper-49ea6cdddd420743b030da77feb116dcaed134d1.zip
Update po catalogs
Diffstat (limited to 'po/pt_BR.po')
-rw-r--r--po/pt_BR.po6
1 files changed, 0 insertions, 6 deletions
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b8eb027..a939ac5 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,15 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
"POT-Creation-Date: 2018-04-05 19:36+0200\n"
"PO-Revision-Date: 2018-03-21 16:33+0000\n"
"Last-Translator: Michael Martins <michaelfm21@gmail.com>\n"
-=======
-"POT-Creation-Date: 2018-03-18 13:53+0200\n"
-"PO-Revision-Date: 2018-04-23 19:55+0000\n"
-"Last-Translator: Yves Brungard\n"
->>>>>>> b2769c42af94f1549780e9467778f4755b31d592
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/MageiaLinux/"
"mageia/language/pt_BR/)\n"
"Language: pt_BR\n"