diff --git a/po/manjaro-hello.pot b/po/manjaro-hello.pot
index c20a107..647d215 100644
--- a/po/manjaro-hello.pot
+++ b/po/manjaro-hello.pot
@@ -1,12 +1,12 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Translation of Pamac.
+# Copyright (C) 2016-2017 Manjaro Developers <manjaro-dev@manjaro.org>
+# This file is distributed under the same license as the Manjaro-Hello package.
+# Hugo Posnic <huluti@manjaro.org>, 2016-2017.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Manjaro-Hello\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-12-27 10:09+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
@@ -14,8 +14,9 @@ msgstr ""
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #: ../ui/manjaro-hello.glade:7 ../ui/manjaro-hello.glade:523
 msgid "About"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b67a040..669f46e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -108,11 +108,7 @@ msgstr "INSTALAÇÃO"
 
 #: ../ui/manjaro-hello.glade:446
 msgid "Launch installer"
-<<<<<<< HEAD
 msgstr "Iniciar instalação"
-=======
-msgstr "Iniciar instalação do sistema"
->>>>>>> 0322a1f07f3521758e9f865235681dc6cf337f31
 
 #: ../ui/manjaro-hello.glade:495
 msgid "Home"