summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2007-07-12 16:53:43 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2007-07-12 16:53:43 +0100
commita975773b97214620c750cb2465e01f811a33831d (patch)
tree4835baa63349c60f29c3073b59849f51902adb16
parent50ccb2f437daabf5d4c7eb5322a5ed11374cd048 (diff)
parentf03dd1e032139356f1e5b7f19fb76482ae05e311 (diff)
* cmdline/apt-get.cc:
- fix in the task-install code regexp (thanks to Adam Conrad and Colin Watson). This should bring the livecd build back into shape * Fix compilation warnings: - apt-pkg/contrib/configuration.cc: wrong argument type; - apt-pkg/deb/dpkgpm.cc: wrong signess; - apt-pkg-acquire-item.cc: wrong signess and orderned initializers; - methods/https.cc: - type conversion; - unused variable; - changed SetupProxy() method to void;
-rw-r--r--apt-pkg/acquire-item.cc6
-rw-r--r--apt-pkg/contrib/configuration.cc2
-rw-r--r--apt-pkg/deb/dpkgpm.cc2
-rw-r--r--cmdline/apt-get.cc5
-rw-r--r--configure.in2
-rw-r--r--debian/changelog19
-rw-r--r--methods/http.cc2
-rw-r--r--methods/http.h2
-rw-r--r--methods/https.cc7
-rw-r--r--methods/https.h4
-rw-r--r--po/apt-all.pot4
-rw-r--r--po/bg.po4
-rw-r--r--po/bs.po4
-rw-r--r--po/ca.po4
-rw-r--r--po/cs.po4
-rw-r--r--po/cy.po4
-rw-r--r--po/da.po4
-rw-r--r--po/de.po4
-rw-r--r--po/el.po4
-rw-r--r--po/en_GB.po4
-rw-r--r--po/es.po4
-rw-r--r--po/eu.po4
-rw-r--r--po/fi.po4
-rw-r--r--po/fr.po4
-rw-r--r--po/gl.po4
-rw-r--r--po/he.po4
-rw-r--r--po/hu.po4
-rw-r--r--po/it.po4
-rw-r--r--po/ja.po4
-rw-r--r--po/ko.po4
-rw-r--r--po/nb.po4
-rw-r--r--po/nl.po4
-rw-r--r--po/nn.po4
-rw-r--r--po/pl.po4
-rw-r--r--po/pt.po4
-rw-r--r--po/pt_BR.po4
-rw-r--r--po/ro.po4
-rw-r--r--po/ru.po4
-rw-r--r--po/sk.po4
-rw-r--r--po/sl.po4
-rw-r--r--po/sv.po4
-rw-r--r--po/tl.po4
-rw-r--r--po/vi.po4
-rw-r--r--po/zh_CN.po4
-rw-r--r--po/zh_TW.po4
45 files changed, 100 insertions, 91 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index b7b16b9a2..3b683df63 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -321,7 +321,7 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile)
if(found)
{
// queue the diffs
- int last_space = Description.rfind(" ");
+ unsigned int last_space = Description.rfind(" ");
if(last_space != string::npos)
Description.erase(last_space, Description.size()-last_space);
new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc,
@@ -934,8 +934,8 @@ pkgAcqMetaIndex::pkgAcqMetaIndex(pkgAcquire *Owner,
string SigFile,
const vector<struct IndexTarget*>* IndexTargets,
indexRecords* MetaIndexParser) :
- Item(Owner), RealURI(URI), SigFile(SigFile), AuthPass(false),
- MetaIndexParser(MetaIndexParser), IndexTargets(IndexTargets), IMSHit(false)
+ Item(Owner), RealURI(URI), SigFile(SigFile), IndexTargets(IndexTargets),
+ MetaIndexParser(MetaIndexParser), AuthPass(false), IMSHit(false)
{
DestFile = _config->FindDir("Dir::State::lists") + "partial/";
DestFile += URItoFileName(URI);
diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index 7914bd07b..3109fd7a5 100644
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -507,7 +507,7 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional,
CurLine++;
// This should be made to work instead, but this is better than looping
if (F.fail() && !F.eof())
- return _error->Error(_("Line %d too long (max %lu)"), CurLine, sizeof(Buffer));
+ return _error->Error(_("Line %d too long (max %u)"), CurLine, sizeof(Buffer));
_strtabexpand(Buffer,sizeof(Buffer));
_strstrip(Buffer);
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 4b4bba696..3c367e421 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -387,7 +387,7 @@ bool pkgDPkgPM::Go(int OutStatusFd)
// the dpkg states that are already done; the string is the package
// the int is the state that is already done (e.g. a package that is
// going to be install is already in state "half-installed")
- map<string,int> PackageOpsDone;
+ map<string,unsigned int> PackageOpsDone;
// init the PackageOps map, go over the list of packages that
// that will be [installed|configured|removed|purged] and add
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 2e5779070..82257a06e 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1519,8 +1519,9 @@ bool TryInstallTask(pkgDepCache &Cache, pkgProblemResolver &Fix,
// build regexp for the task
char S[300];
- snprintf(S, sizeof(S), "^Task:.*[^a-z]%s([^a-z]|\n|$)", taskname);
- regcomp(&Pattern,S, REG_EXTENDED | REG_NOSUB | REG_NEWLINE);
+ snprintf(S, sizeof(S), "^Task:.*[, ]%s([, ]|$)", taskname);
+ if(regcomp(&Pattern,S, REG_EXTENDED | REG_NOSUB | REG_NEWLINE) != 0)
+ return _error->Error("Failed to compile task regexp");
bool found = false;
bool res = true;
diff --git a/configure.in b/configure.in
index b5a4a6c29..e800913b6 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.7.2ubuntu7")
+AC_DEFINE_UNQUOTED(VERSION,"0.7.2ubuntu8")
PACKAGE="apt"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_SUBST(PACKAGE)
diff --git a/debian/changelog b/debian/changelog
index 359d7c291..d7e3b73af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,20 @@
-apt (0.7.2ubuntu8) UNRELEASED; urgency=low
+apt (0.7.2ubuntu8) gutsy; urgency=low
- [Otavio Salvador]
- * Fix a typo on 0.7.3 changelog entry about g++ (7.3 to 4.3)
-
[Michael Vogt]
* cmdline/apt-get.cc:
- - fix in the task-install code
+ - fix in the task-install code regexp (thanks to Adam Conrad and
+ Colin Watson). This should bring the livecd build back into
+ shape
+
+ [Otavio Salvador]
+ * Fix compilation warnings:
+ - apt-pkg/contrib/configuration.cc: wrong argument type;
+ - apt-pkg/deb/dpkgpm.cc: wrong signess;
+ - apt-pkg-acquire-item.cc: wrong signess and orderned initializers;
+ - methods/https.cc:
+ - type conversion;
+ - unused variable;
+ - changed SetupProxy() method to void;
-- Michael Vogt <michael.vogt@ubuntu.com> Wed, 11 Jul 2007 23:20:15 +0100
diff --git a/methods/http.cc b/methods/http.cc
index ecfb80bd2..7001b217a 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -3,7 +3,7 @@
// $Id: http.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $
/* ######################################################################
- HTTP Aquire Method - This is the HTTP aquire method for APT.
+ HTTP Acquire Method - This is the HTTP aquire method for APT.
It uses HTTP/1.1 and many of the fancy options there-in, such as
pipelining, range, if-range and so on.
diff --git a/methods/http.h b/methods/http.h
index a47cd961c..dec5cd80f 100644
--- a/methods/http.h
+++ b/methods/http.h
@@ -3,7 +3,7 @@
// $Id: http.h,v 1.12 2002/04/18 05:09:38 jgg Exp $
/* ######################################################################
- HTTP Aquire Method - This is the HTTP aquire method for APT.
+ HTTP Acquire Method - This is the HTTP aquire method for APT.
##################################################################### */
/*}}}*/
diff --git a/methods/https.cc b/methods/https.cc
index b758e4ab3..d48ac97fb 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -3,7 +3,7 @@
// $Id: http.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $
/* ######################################################################
- HTTPS Aquire Method - This is the HTTPS aquire method for APT.
+ HTTPS Acquire Method - This is the HTTPS aquire method for APT.
It uses libcurl
@@ -50,13 +50,13 @@ HttpsMethod::progress_callback(void *clientp, double dltotal, double dlnow,
{
HttpsMethod *me = (HttpsMethod *)clientp;
if(dltotal > 0 && me->Res.Size == 0) {
- me->Res.Size = dltotal;
+ me->Res.Size = (unsigned long)dltotal;
me->URIStart(me->Res);
}
return 0;
}
-bool HttpsMethod::SetupProxy()
+void HttpsMethod::SetupProxy()
{
URI ServerName = Queue->Uri;
@@ -84,7 +84,6 @@ bool HttpsMethod::SetupProxy()
}
// Determine what host and port to use based on the proxy settings
- int Port = 0;
string Host;
if (Proxy.empty() == true || Proxy.Host.empty() == true)
{
diff --git a/methods/https.h b/methods/https.h
index 6620a10fc..2c33d95ee 100644
--- a/methods/https.h
+++ b/methods/https.h
@@ -3,7 +3,7 @@
// $Id: http.h,v 1.12 2002/04/18 05:09:38 jgg Exp $
/* ######################################################################
- HTTP Aquire Method - This is the HTTP aquire method for APT.
+ HTTP Acquire Method - This is the HTTP aquire method for APT.
##################################################################### */
/*}}}*/
@@ -29,7 +29,7 @@ class HttpsMethod : public pkgAcqMethod
static size_t write_data(void *buffer, size_t size, size_t nmemb, void *userp);
static int progress_callback(void *clientp, double dltotal, double dlnow,
double ultotal, double ulnow);
- bool SetupProxy();
+ void SetupProxy();
CURL *curl;
FetchResult Res;
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 436cf7999..76f85a538 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-09 17:17+0100\n"
+"POT-Creation-Date: 2007-07-12 16:50+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"
@@ -1910,7 +1910,7 @@ msgstr ""
#: apt-pkg/contrib/configuration.cc:510
#, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr ""
#: apt-pkg/contrib/configuration.cc:606
diff --git a/po/bg.po b/po/bg.po
index dcc5a052e..e39057bf7 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 17:17+0100\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-10-12 20:14+0300\n"
"Last-Translator: Yavor Doganov <yavor@doganov.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -2131,7 +2131,7 @@ msgstr "Отваряне на конфигурационен файл %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Ред %d е твърде дълъг (максимум %d)"
#: apt-pkg/contrib/configuration.cc:606
diff --git a/po/bs.po b/po/bs.po
index 56670c498..cb8c0c446 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 17:17+0100\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2004-05-06 15:25+0100\n"
"Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
"Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -1932,7 +1932,7 @@ msgstr ""
#: apt-pkg/contrib/configuration.cc:510
#, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr ""
#: apt-pkg/contrib/configuration.cc:606
diff --git a/po/ca.po b/po/ca.po
index 9f34b85d3..e74602a17 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 17:17+0100\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-02-05 22:00+0100\n"
"Last-Translator: Jordi Mallach <jordi@debian.org>\n"
"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -2129,7 +2129,7 @@ msgstr "S'està obrint el fitxer de configuració %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Línia %d massa llarga (màx %d)"
#: apt-pkg/contrib/configuration.cc:606
diff --git a/po/cs.po b/po/cs.po
index 185f40987..37e96a889 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 17:17+0100\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-10-04 18:53+0200\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -2097,7 +2097,7 @@ msgstr "Otevírám konfigurační soubor %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Řádek %d je příliš dlouhý (max %d)"
#: apt-pkg/contrib/configuration.cc:606
diff --git a/po/cy.po b/po/cy.po
index f0485cca9..d42c8ea45 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: APT\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 17:17+0100\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2005-06-06 13:46+0100\n"
"Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
"Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
@@ -2181,7 +2181,7 @@ msgstr "Yn agor y ffeil cyfluniad %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Linell %d yn rhy hir (uchaf %d)"
#: apt-pkg/contrib/configuration.cc:606
diff --git a/po/da.po b/po/da.po
index 19083b66a..f348b3f51 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-da\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 17:17+0100\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2007-02-03 15:50+0100\n"
"Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
"Language-Team: Danish\n"
@@ -2114,7 +2114,7 @@ msgstr "�bner konfigurationsfilen %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Linjen %d er for lang (m� h�jst v�re %d)"
#: apt-pkg/contrib/configuration.cc:606
diff --git a/po/de.po b/po/de.po
index 8870f62ff..549eb7685 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6.46.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 17:17+0100\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-10-24 11:45+0200\n"
"Last-Translator: Michael Piefel <piefel@debian.org>\n"
"Language-Team: <de@li.org>\n"
@@ -2149,7 +2149,7 @@ msgstr "Öffne Konfigurationsdatei %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Zeile %d zu lang (maximal %d)"
#: apt-pkg/contrib/configuration.cc:606
diff --git a/po/el.po b/po/el.po
index 2cbbcf291..3d45aa390 100644
--- a/po/el.po
+++ b/po/el.po
@@ -18,7 +18,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_el_new\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 17:17+0100\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-01-18 15:16+0200\n"
"Last-Translator: Konstantinos Margaritis <markos@debian.org>\n"
"Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -2143,7 +2143,7 @@ msgstr "Άνοιγμα του αρχείου ρυθμίσεων %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Η γραμμή %d έχει υπερβολικό μήκος (μέγιστο %d)"
#: apt-pkg/contrib/configuration.cc:606
diff --git a/po/en_GB.po b/po/en_GB.po
index bc9bf3a50..3cdaaa82c 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6.46.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 17:17+0100\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-10-12 11:07+0100\n"
"Last-Translator: Neil Williams <linux@codehelp.co.uk>\n"
"Language-Team: en_GB <en_gb@li.org>\n"
@@ -2100,7 +2100,7 @@ msgstr "Opening configuration file %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Line %d too long (max %d)"
#: apt-pkg/contrib/configuration.cc:606
diff --git a/po/es.po b/po/es.po
index 0ee2b5faf..eddc7e285 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6.42.3exp1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 17:17+0100\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-10-08 00:23+0200\n"
"Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -2136,7 +2136,7 @@ msgstr "Abriendo fichero de configuraci�n %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "L�nea %d demasiado larga (m�x %d)"
#: apt-pkg/contrib/configuration.cc:606
diff --git a/po/eu.po b/po/eu.po
index 05b8dc43d..4bbb76b5d 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_eu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 17:17+0100\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-09-27 13:59+0200\n"
"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
"Language-Team: librezale <librezale@librezale.org>\n"
@@ -2114,7 +2114,7 @@ msgstr "%s konfigurazio-fitxategia irekitzen"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "%d lerroa luzeegia da (gehienez %d)"
#: apt-pkg/contrib/configuration.cc:606
diff --git a/po/fi.po b/po/fi.po
index 9cfd02c39..636f632ed 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 17:17+0100\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-09-29 16:06+0300\n"
"Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -2109,7 +2109,7 @@ msgstr "Avataan asetustiedosto %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Rivi %d on liian pitkä (enintään %d)"
#: apt-pkg/contrib/configuration.cc:606
diff --git a/po/fr.po b/po/fr.po
index 5de349f64..3dc764a50 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 17:17+0100\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2007-05-08 11:30+0200\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -2155,7 +2155,7 @@ msgstr "Ouverture du fichier de configuration %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "La ligne %d est trop longue (maxi %d)"
#: apt-pkg/contrib/configuration.cc:606
diff --git a/po/gl.po b/po/gl.po
index a989b47ef..a7ff71dea 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 17:17+0100\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2007-02-28 13:14+0100\n"
"Last-Translator: Jacobo Tarrío <jtarrio@debian.org>\n"
"Language-Team: Galician <proxecto@trasno.net>\n"
@@ -2124,7 +2124,7 @@ msgstr "A abrir o ficheiro de configuración %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Liña %d longa de máis (máximo %d)"
#: apt-pkg/contrib/configuration.cc:606
diff --git a/po/he.po b/po/he.po
index f4a800ab5..b192dd008 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.25\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 17:17+0100\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2004-06-10 19:58+0300\n"
"Last-Translator: Lior Kaplan <webmaster@guides.co.il>\n"
"Language-Team: Hebrew\n"
@@ -1920,7 +1920,7 @@ msgstr ""
#: apt-pkg/contrib/configuration.cc:510
#, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr ""
#: apt-pkg/contrib/configuration.cc:606
diff --git a/po/hu.po b/po/hu.po
index c1c58e2fa..87983ce7f 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: hu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 17:17+0100\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-10-21 11:04+0100\n"
"Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
"Language-Team: Hungarian <debian-l10n-hungarian>\n"
@@ -2105,7 +2105,7 @@ msgstr "%s konfigurációs fájl megnyitása"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "A(z) %d. sor túl hosszú (maximum %d)"
#: apt-pkg/contrib/configuration.cc:606
diff --git a/po/it.po b/po/it.po
index 1d47847ab..0b94d55bf 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 17:17+0100\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-10-12 09:27+0200\n"
"Last-Translator: Samuele Giovanni Tonon <samu@debian.org>\n"
"Language-Team: Italian <it@li.org>\n"
@@ -2133,7 +2133,7 @@ msgstr "Apertura del file di configurazione %s in corso"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Linea %d troppo lunga (max %d)"
#: apt-pkg/contrib/configuration.cc:606
diff --git a/po/ja.po b/po/ja.po
index 8728f996b..f8f9d6ce1 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 17:17+0100\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-09-08 19:57+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -2119,7 +2119,7 @@ msgstr "設定ファイル %s をオープンできませんでした"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "%d 行目が長すぎます (最大 %d)"
#: apt-pkg/contrib/configuration.cc:606
diff --git a/po/ko.po b/po/ko.po
index 16d87bef9..f8f077717 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 17:17+0100\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-10-12 21:22-0400\n"
"Last-Translator: Sunjae Park <darehanl@gmail.com>\n"
"Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -2104,7 +2104,7 @@ msgstr "설정 파일 %s 파일을 여는 중입니다"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "%d번 줄이 너무 깁니다 (최대 %d)"
#: apt-pkg/contrib/configuration.cc:606
diff --git a/po/nb.po b/po/nb.po
index 12b7a3500..78e78e430 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 17:17+0100\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-10-16 00:35+0100\n"
"Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
"Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.ui.no>\n"
@@ -2123,7 +2123,7 @@ msgstr "�pner oppsettsfila %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Linje %d er for lang (maks %d)"
#: apt-pkg/contrib/configuration.cc:606
diff --git a/po/nl.po b/po/nl.po
index 96c360d1f..4356b3c3b 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 17:17+0100\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-10-17 22:35+0100\n"
"Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -2144,7 +2144,7 @@ msgstr "Configuratiebestand %s wordt geopend"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Regel %d is te lang (maxl %d)"
#: apt-pkg/contrib/configuration.cc:606
diff --git a/po/nn.po b/po/nn.po
index 9c3aa53cb..6d69e25f7 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_nn\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 17:17+0100\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2005-02-14 23:30+0100\n"
"Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n"
"Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -2113,7 +2113,7 @@ msgstr "Opnar oppsettsfila %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Linja %d er for lang (maks %d)"
#: apt-pkg/contrib/configuration.cc:606
diff --git a/po/pl.po b/po/pl.po
index 04842ab64..6ec253af4 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 17:17+0100\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-01-23 15:32+0100\n"
"Last-Translator: Bartosz Fenski <fenio@debian.org>\n"
"Language-Team: Polish <pddp@debian.linux.org.pl>\n"
@@ -2115,7 +2115,7 @@ msgstr "Otwieranie pliku konfiguracyjnego %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Linia %d jest zbyt d�uga (max %d)"
#: apt-pkg/contrib/configuration.cc:606
diff --git a/po/pt.po b/po/pt.po
index 567fdfe60..fa01380d2 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 17:17+0100\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2007-05-09 22:14+0100\n"
"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -2123,7 +2123,7 @@ msgstr "Abrindo ficheiro de configuração %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Linha %d é demasiado longa (max %d)"
#: apt-pkg/contrib/configuration.cc:606
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d631ce495..7d0bbf657 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: 2007-07-09 17:17+0100\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-08-21 00:40-0300\n"
"Last-Translator: Felipe Augusto van de Wiel (faw) <faw@cathedrallabs.org>\n"
"Language-Team: l10n portuguese <debian-l10n-portuguese@lists.debian.org>\n"
@@ -2122,7 +2122,7 @@ msgstr "Abrindo arquivo de configuração %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Linha %d muito longa (máx. %d)"
#: apt-pkg/contrib/configuration.cc:606
diff --git a/po/ro.po b/po/ro.po
index 439dc11c7..037508c8c 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_ro\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 17:17+0100\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-09-19 01:35+0300\n"
"Last-Translator: Sorin Batariuc <sorin@bonbon.net>\n"
"Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -2130,7 +2130,7 @@ msgstr "Deschidere fişier de configurare %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Linie %d prea lungă (max %d)"
#: apt-pkg/contrib/configuration.cc:606
diff --git a/po/ru.po b/po/ru.po
index 76faa0e46..b4d358189 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.6.46.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 17:17+0100\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2007-01-03 23:33+0300\n"
"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -2147,7 +2147,7 @@ msgstr "Открытие файла конфигурации %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Строка %d слишком длинна (максимум %d)."
#: apt-pkg/contrib/configuration.cc:606
diff --git a/po/sk.po b/po/sk.po
index cf67780c4..b34c405da 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 17:17+0100\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-09-10 18:50+0200\n"
"Last-Translator: Peter Mann <Peter.Mann@tuke.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -2102,7 +2102,7 @@ msgstr "Otvára sa konfiguračný súbor %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Riadok %d je príliš dlhý (nanajvýš %d)"
#: apt-pkg/contrib/configuration.cc:606
diff --git a/po/sl.po b/po/sl.po
index 637db98c8..d6564f882 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 17:17+0100\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2005-02-16 22:18+0100\n"
"Last-Translator: Jure Cuhalev <gandalf@owca.info>\n"
"Language-Team: Slovenian <sl@li.org>\n"
@@ -2103,7 +2103,7 @@ msgstr "Odpiranje nastavitvene datoteke %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Vrstica %d je predolga (najve� %d)"
#: apt-pkg/contrib/configuration.cc:606
diff --git a/po/sv.po b/po/sv.po
index 3f7e149e3..1b8a0069b 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 17:17+0100\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-08-18 15:45+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -2128,7 +2128,7 @@ msgstr "�ppnar konfigurationsfil %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Rad %d f�r l�ng (max %d)"
#: apt-pkg/contrib/configuration.cc:606
diff --git a/po/tl.po b/po/tl.po
index 26a060707..909957450 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 17:17+0100\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2007-03-29 21:36+0800\n"
"Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
"Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -2130,7 +2130,7 @@ msgstr "Binubuksan ang talaksang pagsasaayos %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Labis ang haba ng linyang %d (max %d)"
#: apt-pkg/contrib/configuration.cc:606
diff --git a/po/vi.po b/po/vi.po
index 052951b98..19fc1f997 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 17:17+0100\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2007-06-01 15:00+0930\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -2155,7 +2155,7 @@ msgstr "Đang mở tập tin cấu hình %s..."
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Dòng %d quá dài (tối đa %d)"
#: apt-pkg/contrib/configuration.cc:606
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 51f68874b..1ed92a494 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.23\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 17:17+0100\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2007-03-29 17:14+0800\n"
"Last-Translator: Kov Chai <tchaikov@sjtu.org>\n"
"Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
@@ -2085,7 +2085,7 @@ msgstr "正在打开配置文件 %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "软件包来源档的第 %d 行超长了(长度限制为 %d)。"
#: apt-pkg/contrib/configuration.cc:606
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 35f14483e..7d950c562 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.5.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 17:17+0100\n"
+"POT-Creation-Date: 2007-07-12 16:50+0100\n"
"PO-Revision-Date: 2006-10-21 16:58+0800\n"
"Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
"Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n"
@@ -2086,7 +2086,7 @@ msgstr "開啟組態檔 %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "第 %d 行太長(最長 %d)"
#: apt-pkg/contrib/configuration.cc:606