Sync with Michael branch

1 files changed, 21 insertions, 21 deletions

diff --git a/po/apt-all.pot b/po/apt-all.pot
index cccd4b75a..d1d6c7622 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 22:26+0200\n"
+"POT-Creation-Date: 2007-07-11 23:19+0100\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"
@@ -1371,7 +1371,7 @@ msgstr ""
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
 #: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
 #, c-format
@@ -1883,57 +1883,57 @@ msgstr ""
 msgid "Selection %s not found"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
 #, c-format
 msgid "Opening configuration file %s"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:509
+#: apt-pkg/contrib/configuration.cc:510
 #, c-format
-msgid "Line %d too long (max %d)"
+msgid "Line %d too long (max %u)"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
@@ -2242,7 +2242,7 @@ msgid ""
 "you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
 
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr ""
@@ -2355,7 +2355,7 @@ msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:153
 #, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
+msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:178
@@ -2385,7 +2385,7 @@ msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:245
 #, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:251
@@ -2622,10 +2622,10 @@ msgstr ""
 msgid "Completely removed %s"
 msgstr ""
 
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr ""
-
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr ""
+
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr ""