[FIX] Conflicts

11 years ago · 4e1ccc96ff
2 changed files with 5 additions and 5 deletions
--- a/mgmtsystem_kpi/i18n/fr.po
+++ b/mgmtsystem_kpi/i18n/fr.po
@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-06 05:49+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-09-15 06:07+0000\n"
+"X-Generator: Launchpad (build 16761)\n"

 #. module: mgmtsystem_kpi
 #: view:mgmtsystem.kpi:0
--- a/mgmtsystem_kpi/i18n/pt_BR.po
+++ b/mgmtsystem_kpi/i18n/pt_BR.po
@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-04-03 18:36+0000\n"
 "PO-Revision-Date: 2013-07-18 15:14+0000\n"
-"Last-Translator: Claudio de Araujo Santos <Unknown>\n"
+"Last-Translator: Claudio de Araujo Santos <claudioaraujosantos@gmail.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-19 06:34+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-09-15 06:07+0000\n"
+"X-Generator: Launchpad (build 16761)\n"

 #. module: mgmtsystem_kpi
 #: view:mgmtsystem.kpi:0