Merge remote-tracking branch 'origin/debian/sid' into ubuntu/master1.0.1ubuntu1

Conflicts:
	debian/changelog

10 files changed, 20 insertions, 20 deletions

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 24c9f6786..37d2cf8c8 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -225,7 +225,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "1.0">
+<!ENTITY apt-product-version "1.0.1">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY oldstable-codename "squeeze">
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 524b1afdb..8eebad5e8 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt-doc 0.9.16.1\n"
+"Project-Id-Version: apt-doc 1.0.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-04-01 15:51+0200\n"
+"POT-Creation-Date: 2014-04-10 10:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -636,7 +636,7 @@ msgstr ""
 #: apt.8.xml:145
 msgid ""
 "The <command>apt</command> command is meant to be pleasant for end users and "
-"does not need to be backward compatilbe like &apt-get;. Therefore some "
+"does not need to be backward compatible like &apt-get;. Therefore some "
 "options are different:"
 msgstr ""
 
diff --git a/doc/po/de.po b/doc/po/de.po
index 46d6d6294..953eeed37 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 0.9.16\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-04-01 14:24+0200\n"
+"POT-Creation-Date: 2014-04-10 09:49+0200\n"
 "PO-Revision-Date: 2014-04-01 14:00+0200\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -790,7 +790,7 @@ msgstr ""
 #: apt.8.xml:145
 msgid ""
 "The <command>apt</command> command is meant to be pleasant for end users and "
-"does not need to be backward compatilbe like &apt-get;. Therefore some "
+"does not need to be backward compatible like &apt-get;. Therefore some "
 "options are different:"
 msgstr ""
 
diff --git a/doc/po/es.po b/doc/po/es.po
index 47080350a..219e56710 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.7.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-04-01 14:24+0200\n"
+"POT-Creation-Date: 2014-04-10 09:49+0200\n"
 "PO-Revision-Date: 2014-04-01 14:00+0200\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -874,7 +874,7 @@ msgstr ""
 #: apt.8.xml:145
 msgid ""
 "The <command>apt</command> command is meant to be pleasant for end users and "
-"does not need to be backward compatilbe like &apt-get;. Therefore some "
+"does not need to be backward compatible like &apt-get;. Therefore some "
 "options are different:"
 msgstr ""
 
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 279905402..cabedea51 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-04-01 14:24+0200\n"
+"POT-Creation-Date: 2014-04-10 09:49+0200\n"
 "PO-Revision-Date: 2014-04-01 14:00+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -785,7 +785,7 @@ msgstr ""
 #: apt.8.xml:145
 msgid ""
 "The <command>apt</command> command is meant to be pleasant for end users and "
-"does not need to be backward compatilbe like &apt-get;. Therefore some "
+"does not need to be backward compatible like &apt-get;. Therefore some "
 "options are different:"
 msgstr ""
 
diff --git a/doc/po/it.po b/doc/po/it.po
index cdb78fdb4..afef7d860 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-04-01 14:24+0200\n"
+"POT-Creation-Date: 2014-04-10 09:49+0200\n"
 "PO-Revision-Date: 2014-04-01 14:00+0200\n"
 "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -837,7 +837,7 @@ msgstr ""
 #: apt.8.xml:145
 msgid ""
 "The <command>apt</command> command is meant to be pleasant for end users and "
-"does not need to be backward compatilbe like &apt-get;. Therefore some "
+"does not need to be backward compatible like &apt-get;. Therefore some "
 "options are different:"
 msgstr ""
 
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 9c7aa3def..36564102f 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.25.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-04-01 14:24+0200\n"
+"POT-Creation-Date: 2014-04-10 09:49+0200\n"
 "PO-Revision-Date: 2014-04-01 14:00+0200\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -830,7 +830,7 @@ msgstr ""
 #: apt.8.xml:145
 msgid ""
 "The <command>apt</command> command is meant to be pleasant for end users and "
-"does not need to be backward compatilbe like &apt-get;. Therefore some "
+"does not need to be backward compatible like &apt-get;. Therefore some "
 "options are different:"
 msgstr ""
 
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 22cd47baa..d70676ff7 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.7.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-04-01 14:24+0200\n"
+"POT-Creation-Date: 2014-04-10 09:49+0200\n"
 "PO-Revision-Date: 2014-04-01 13:59+0200\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
@@ -833,7 +833,7 @@ msgstr ""
 #: apt.8.xml:145
 msgid ""
 "The <command>apt</command> command is meant to be pleasant for end users and "
-"does not need to be backward compatilbe like &apt-get;. Therefore some "
+"does not need to be backward compatible like &apt-get;. Therefore some "
 "options are different:"
 msgstr ""
 
diff --git a/doc/po/pt.po b/doc/po/pt.po
index b10890eca..d0433d498 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.7.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-04-01 14:24+0200\n"
+"POT-Creation-Date: 2014-04-10 09:49+0200\n"
 "PO-Revision-Date: 2014-04-01 13:59+0200\n"
 "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
 "Language-Team: Portuguese <l10n@debianpt.org>\n"
@@ -834,7 +834,7 @@ msgstr ""
 #: apt.8.xml:145
 msgid ""
 "The <command>apt</command> command is meant to be pleasant for end users and "
-"does not need to be backward compatilbe like &apt-get;. Therefore some "
+"does not need to be backward compatible like &apt-get;. Therefore some "
 "options are different:"
 msgstr ""
 
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index ef5c757b1..15d0bf27d 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: 2014-04-01 14:24+0200\n"
+"POT-Creation-Date: 2014-04-10 09:49+0200\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"
@@ -632,7 +632,7 @@ msgstr ""
 #: apt.8.xml:145
 msgid ""
 "The <command>apt</command> command is meant to be pleasant for end users and "
-"does not need to be backward compatilbe like &apt-get;. Therefore some "
+"does not need to be backward compatible like &apt-get;. Therefore some "
 "options are different:"
 msgstr ""