From 4a38e22a5fd2ceddd6030b0ba13eda28737468d0 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 14 Jul 2007 15:50:17 -0300 Subject: Revert po/apt-all.pot changes to make merging from Christian's branch easier. --- po/apt-all.pot | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/po/apt-all.pot b/po/apt-all.pot index d1d6c7622..cccd4b75a 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-07-11 23:19+0100\n" +"POT-Creation-Date: 2007-06-12 22:26+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \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:748 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 #: 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:434 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "" -#: apt-pkg/contrib/configuration.cc:492 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:510 +#: apt-pkg/contrib/configuration.cc:509 #, c-format -msgid "Line %d too long (max %u)" +msgid "Line %d too long (max %d)" msgstr "" -#: apt-pkg/contrib/configuration.cc:606 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "" -#: apt-pkg/contrib/configuration.cc:625 +#: apt-pkg/contrib/configuration.cc:624 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "" -#: apt-pkg/contrib/configuration.cc:642 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "" -#: apt-pkg/contrib/configuration.cc:682 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -#: apt-pkg/contrib/configuration.cc:689 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "" -#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 +#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "" -#: apt-pkg/contrib/configuration.cc:702 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" -#: apt-pkg/contrib/configuration.cc:736 +#: apt-pkg/contrib/configuration.cc:735 #, 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:32 +#: apt-pkg/pkgrecords.cc:34 #, 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 occurred while processing %s (NewFileDesc1)" +msgid "Error occured while processing %s (NewFileDesc1)" msgstr "" #: apt-pkg/pkgcachegen.cc:178 @@ -2385,7 +2385,7 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:245 #, c-format -msgid "Error occurred while processing %s (NewFileDesc2)" +msgid "Error occured while processing %s (NewFileDesc2)" msgstr "" #: apt-pkg/pkgcachegen.cc:251 @@ -2622,10 +2622,10 @@ msgstr "" msgid "Completely removed %s" msgstr "" -#: methods/rsh.cc:330 -msgid "Connection closed prematurely" -msgstr "" - #: methods/rred.cc:219 msgid "Could not patch file" msgstr "" + +#: methods/rsh.cc:330 +msgid "Connection closed prematurely" +msgstr "" -- cgit v1.2.3 From 2dfc3bb89a0696f0e9891b25869f82225cb58289 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 16 Jul 2007 23:03:16 -0300 Subject: Remove a useless entry from changelog --- debian/changelog | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4995e4389..a497bea96 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,7 +28,6 @@ apt (0.7.4) UNRELEASED; urgency=low * Unfuzzy formerly complete translations * French translation update * Re-generate PO(T) files - * Sync with Michael * Spanish translation update -- Otavio Salvador Sat, 14 Jul 2007 15:52:15 -0300 -- cgit v1.2.3