* Merge from Debian unstable, pulling in new translations and fixes.

* Add linux-headers to /etc/kernel/postinst.d/apt-auto-removal guard.
* Catalan (Jordi Mallach)
* Drop a confusing non-breaking space. Closes: #691024
* Thai (Theppitak Karoonboonyanan). Closes: #691613
* Vietnamese (Trần Ngọc Quân). Closes: #693773
* Fix Plural forms in German, French, Japanese and Portuguese
  translations. Thanks to Jakub Wilk for reporting these errors.
* apt-pkg/packagemanager.cc:
  - do not do lock-step configuration for a M-A:same package if it isn't
    unpacked yet in SmartConfigure and do not unpack a M-A:same package
    again in SmartUnPack if we have already configured it (LP: #1062503)
* apt-pkg/depcache.cc:
  - don't call MarkInstall with the FromUser flag set for packages
    which are dependencies of APT::Never-MarkAuto-Sections matchers
  - no mode changes should obviously be ok for pkgDepCache::IsModeChangeOk
* cmdline/apt-get.cc:
  - do not call Mark{Install,Delete} from the autoremove code with
    the FromUser bit set to avoid modifying the auto-installed bit
* apt-pkg/algorithms.cc:
  - ensure pkgProblemResolver calls MarkDelete without FromUser set
    so that it can't overrule holds and the protection flag

* change permissions of /var/log/apt/term.log to 0640 (LP: #975199)
* apt-pkg/algorithms.cc:
  - fix package-pointer array memory leak in ResolveByKeepInternal()
* Portuguese (Américo Monteiro) (Closes: #686975)
* handle packages without a mandatory architecture (debian-policy §5.3)
  by introducing a pseudo-architecture 'none' so that the small group of
  users with these packages can get right of them without introducing too
  much hassle for other users (Closes: #686346)
* merged the latest debian-sid fixes
   Correct fi translation for hash sum mismatches (lp:420403)

1 files changed, 38 insertions, 7 deletions

diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 665ed73f9..fe3edc1aa 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-08-30 12:50+0300\n"
+"POT-Creation-Date: 2012-10-15 09:49+0300\n"
 "PO-Revision-Date: 2004-09-20 17:02+0000\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@ -1618,8 +1618,8 @@ msgid ""
 "Update the local keyring with the archive keyring and remove from the local "
 "keyring the archive keys which are no longer valid.  The archive keyring is "
 "shipped in the <literal>archive-keyring</literal> package of your "
-"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
-"Ubuntu."
+"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
+"Debian."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1669,23 +1669,23 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-key.8.xml:183
-msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:184
-msgid "Keyring of Ubuntu archive trusted keys."
+msgid "Keyring of Debian archive trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-key.8.xml:187
 msgid ""
-"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
+"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:188
-msgid "Keyring of Ubuntu archive removed trusted keys."
+msgid "Keyring of Debian archive removed trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -7329,6 +7329,37 @@ msgstr ""
 msgid "Which will use the already fetched archives on the disc."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml:130
+msgid ""
+"Update the local keyring with the archive keyring and remove from the local "
+"keyring the archive keys which are no longer valid.  The archive keyring is "
+"shipped in the <literal>archive-keyring</literal> package of your "
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:183
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml:184
+msgid "Keyring of Ubuntu archive trusted keys."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:187
+msgid ""
+"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml:188
+msgid "Keyring of Ubuntu archive removed trusted keys."
+msgstr ""
+
 #, fuzzy
 #~ msgid ""
 #~ "Package: *\n"