diff options
| author | Papoteur <papoteur@mageia.org> | 2018-10-07 20:40:06 +0200 |
|---|---|---|
| committer | Papoteur <papoteur@mageia.org> | 2018-10-07 20:40:06 +0200 |
| commit | bd94b5004eda8841a76c7fc4e091643b463e78ef (patch) | |
| tree | a07357616fffd0711a44825413478923e1b37c9f /po/pt_BR.po | |
| parent | 7a7d96308ef49294f9768794da7b56192a2796e0 (diff) | |
| parent | b2769c42af94f1549780e9467778f4755b31d592 (diff) | |
| download | isodumper-bd94b5004eda8841a76c7fc4e091643b463e78ef.tar isodumper-bd94b5004eda8841a76c7fc4e091643b463e78ef.tar.gz isodumper-bd94b5004eda8841a76c7fc4e091643b463e78ef.tar.bz2 isodumper-bd94b5004eda8841a76c7fc4e091643b463e78ef.tar.xz isodumper-bd94b5004eda8841a76c7fc4e091643b463e78ef.zip | |
Merge branch 'master' of git://git.mageia.org/software/isodumper
Diffstat (limited to 'po/pt_BR.po')
| -rw-r--r-- | po/pt_BR.po | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/po/pt_BR.po b/po/pt_BR.po index a939ac5..b8eb027 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -13,9 +13,15 @@ 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" |