diff options
author | bubulle@debian.org <> | 2006-08-21 10:55:15 -0500 |
---|---|---|
committer | bubulle@debian.org <> | 2006-08-21 10:55:15 -0500 |
commit | 3784e34677882fbea8538baa1c25b0d35abf429a (patch) | |
tree | 2c4d4f7c81d6126fdce3b1c4665c7f80efb0fb74 /po/pt_BR.po | |
parent | 8fa7672020f75a9ec7d3ffcfd8c8f3aad6f159b7 (diff) | |
parent | 02b7ddb1404fa3969bceb03a5f35107884027ba6 (diff) |
Merge with Michael and resolve conflicts
Diffstat (limited to 'po/pt_BR.po')
-rw-r--r-- | po/pt_BR.po | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/po/pt_BR.po b/po/pt_BR.po index 3a51c828b..6a53d25e2 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"POT-Creation-Date: 2006-05-27 13:46+0200\n" "PO-Revision-Date: 2006-02-11 17:57-0200\n" "Last-Translator: André Luís Lopes <andrelop@debian.org>\n" "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n" @@ -2294,15 +2294,15 @@ msgstr "opcional" msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 msgid "Building dependency tree" msgstr "Construindo Árvore de Dependências" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:62 msgid "Candidate versions" msgstr "Versões Candidatas" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:91 msgid "Dependency generation" msgstr "Geração de Dependência" |