diff options
| author | Miguel Figueiredo <elmig@debianpt.org> | 2021-06-27 20:02:40 +0100 |
|---|---|---|
| committer | Miguel Figueiredo <elmig@debianpt.org> | 2021-06-27 20:02:40 +0100 |
| commit | e69dcad5b892c1efed00e1c1c6ce13e73d7c8903 (patch) | |
| tree | 1d2ec041031080651af5c8d9a48a1037fd7c13af /po/pt | |
| parent | c7633feb2412b68b5e3a08f1cc1d639669882c6a (diff) | |
| download | installation-guide-e69dcad5b892c1efed00e1c1c6ce13e73d7c8903.zip | |
Fix Portuguese translation
Diffstat (limited to 'po/pt')
| -rw-r--r-- | po/pt/bookinfo.po | 11 | ||||
| -rw-r--r-- | po/pt/preface.po | 11 |
2 files changed, 2 insertions, 20 deletions
diff --git a/po/pt/bookinfo.po b/po/pt/bookinfo.po index d582d89e8..e6ee955c5 100644 --- a/po/pt/bookinfo.po +++ b/po/pt/bookinfo.po @@ -8,11 +8,7 @@ msgstr "" "Project-Id-Version: bookinfo\n" "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n" "POT-Creation-Date: 2020-01-10 23:02+0000\n" -<<<<<<< HEAD -"PO-Revision-Date: 2021-06-07 19:49+0100\n" -======= -"PO-Revision-Date: 2021-06-17 23:48+0100\n" ->>>>>>> ed9bb8e99ec4a7b0692cc8d0dcd55b5daff5ff16 +"PO-Revision-Date: 2021-06-27 20:01+0100\n" "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" "Language: pt\n" @@ -38,13 +34,8 @@ msgid "" msgstr "" "Este documento contém as instruções de instalação para o sistema &debian-" "gnu; &release;, (nome de código <quote>&releasename;</quote>), para a " -<<<<<<< HEAD -"arquitectura &arch-title; (<quote>&architecture;</quote>). Também contém " -"indicações para mais informação e formas de tirar o máximo do seu novo " -======= "arquitetura &arch-title; (<quote>&architecture;</quote>). Também contém " "indicações para mais informações e formas de tirar o máximo do seu novo " ->>>>>>> ed9bb8e99ec4a7b0692cc8d0dcd55b5daff5ff16 "sistema &debian;." #. Tag: para diff --git a/po/pt/preface.po b/po/pt/preface.po index 22072c4e8..f335e09ab 100644 --- a/po/pt/preface.po +++ b/po/pt/preface.po @@ -1,21 +1,12 @@ # Portuguese translation of the Debian Installer Manual -<<<<<<< HEAD # Miguel Figueiredo <elmig@debianpt.org>, 2005-2021. -======= # -# Miguel Figueiredo <elmig@debianpt.org>, 2005-2021. -# ->>>>>>> ed9bb8e99ec4a7b0692cc8d0dcd55b5daff5ff16 msgid "" msgstr "" "Project-Id-Version: preface.xml 24750\n" "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n" "POT-Creation-Date: 2016-12-29 08:03+0000\n" -<<<<<<< HEAD -"PO-Revision-Date: 2021-06-07 19:49+0100\n" -======= -"PO-Revision-Date: 2021-06-17 23:48+0100\n" ->>>>>>> ed9bb8e99ec4a7b0692cc8d0dcd55b5daff5ff16 +"PO-Revision-Date: 2021-06-27 20:01+0100\n" "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" "Language: pt\n" |