summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <egon@bottom>2006-09-30 16:18:09 +0200
committerMichael Vogt <egon@bottom>2006-09-30 16:18:09 +0200
commitdd2fdae926c586c6e19ec7d66cc0cb18932d7036 (patch)
tree74b5adfb68810f491c5ec53d029292bd9882b569
parentb3b73d89b698cba8e91b0e6c0807afecc6191a98 (diff)
parent47e6f3ac05262f452eddbb59657cfc2465b5c62e (diff)
* merged from mainline
-rw-r--r--apt-pkg/deb/dpkgpm.cc22
-rw-r--r--buildlib/apti18n.h.in2
-rw-r--r--debian/changelog18
-rwxr-xr-xdebian/rules2
-rw-r--r--doc/examples/configure-index1
-rw-r--r--methods/gzip.cc7
-rw-r--r--po/ChangeLog12
-rw-r--r--po/eu.po151
-rw-r--r--po/fi.po211
-rw-r--r--po/vi.po246
10 files changed, 334 insertions, 338 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index bf0434ccc..2b167dbf6 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -355,28 +355,28 @@ bool pkgDPkgPM::Go(int OutStatusFd)
static const struct DpkgState DpkgStatesOpMap[][5] = {
// Install operation
{
- {"half-installed", _("Preparing %s")},
- {"unpacked", _("Unpacking %s") },
+ {"half-installed", N_("Preparing %s")},
+ {"unpacked", N_("Unpacking %s") },
{NULL, NULL}
},
// Configure operation
{
- {"unpacked",_("Preparing to configure %s") },
- {"half-configured", _("Configuring %s") },
- { "installed", _("Installed %s")},
+ {"unpacked",N_("Preparing to configure %s") },
+ {"half-configured", N_("Configuring %s") },
+ { "installed", N_("Installed %s")},
{NULL, NULL}
},
// Remove operation
{
- {"half-configured", _("Preparing for removal of %s")},
- {"half-installed", _("Removing %s")},
- {"config-files", _("Removed %s")},
+ {"half-configured", N_("Preparing for removal of %s")},
+ {"half-installed", N_("Removing %s")},
+ {"config-files", N_("Removed %s")},
{NULL, NULL}
},
// Purge operation
{
- {"config-files", _("Preparing to completely remove %s")},
- {"not-installed", _("Completely removed %s")},
+ {"config-files", N_("Preparing to completely remove %s")},
+ {"not-installed", N_("Completely removed %s")},
{NULL, NULL}
},
};
@@ -670,7 +670,7 @@ bool pkgDPkgPM::Go(int OutStatusFd)
{
// only read the translation if there is actually a next
// action
- const char *translation = states[PackageOpsDone[pkg]].str;
+ const char *translation = _(states[PackageOpsDone[pkg]].str);
char s[200];
snprintf(s, sizeof(s), translation, pkg);
diff --git a/buildlib/apti18n.h.in b/buildlib/apti18n.h.in
index 812457643..a5b91b1ee 100644
--- a/buildlib/apti18n.h.in
+++ b/buildlib/apti18n.h.in
@@ -14,8 +14,10 @@
# else
# define _(x) gettext(x)
# endif
+# define N_(x) x
#else
// apt will not use any gettext
# define setlocale(a, b)
# define _(x) x
+# define N_(x) x
#endif
diff --git a/debian/changelog b/debian/changelog
index 6c0507e1d..88eb14871 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+apt (0.6.46.1) unstable; urgency=low
+
+ * methods/gzip.cc:
+ - deal with empty files
+ * Applied patch from Daniel Schepler to make apt bin-NMU able.
+ (closes: bug#359634)
+ * rebuild against current g++ because of:
+ http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29289
+ (closes: #390189)
+ * fix broken i18n in the dpkg progress reporting, thanks to
+ Frans Pop and Steinar Gunderson. (closes: #389261)
+ * Merged from Christian Perrier bzr branch:
+ * fi.po: Updated to 514t. Closes: #390149
+ * eu.po: Updated to 514t. Closes: #389725
+ * vi.po: Updated to 514t. Closes: #388555
+
+ --
+
apt (0.6.46) unstable; urgency=low
* debian/control:
diff --git a/debian/rules b/debian/rules
index a8bf88762..02ee734bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,7 @@ build:
PKG=apt
DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS)
-APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p')
+APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p' -e 's/\+.*$$//')
APT_CONFVER=$(shell sed -n -e 's/^AC_DEFINE_UNQUOTED(VERSION,"\(.*\)")/\1/p' configure.in)
APT_CVSTAG=$(shell echo "$(APT_DEBVER)" | sed -e 's/^/v/' -e 's/\./_/g')
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 883a94434..ac2f2997d 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -253,6 +253,7 @@ Debug
pkgDPkgPM "false";
pkgDPkgProgressReporting "false";
pkgOrderList "false";
+ BuildDeps "false";
pkgInitialize "false"; // This one will dump the configuration space
NoLocking "false";
diff --git a/methods/gzip.cc b/methods/gzip.cc
index 55ff33270..a8e816bf3 100644
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -52,6 +52,13 @@ bool GzipMethod::Fetch(FetchItem *Itm)
// Open the source and destination files
FileFd From(Path,FileFd::ReadOnly);
+ // if the file is empty, just rename it and return
+ if(From.Size() == 0)
+ {
+ Rename(Path, Itm->DestFile);
+ return true;
+ }
+
int GzOut[2];
if (pipe(GzOut) < 0)
return _error->Errno("pipe",_("Couldn't open pipe for %s"),Prog);
diff --git a/po/ChangeLog b/po/ChangeLog
index 65470b84d..4377ad29f 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,15 @@
+2006-09-29 Tapio Lehtonen <tale@debian.org>
+
+ * fi.po: Updated to 514t. Closes: #390149
+
+2006-09-27 Piarres Beobide <pi@beobide.net>
+
+ * eu.po: Updated to 514t. Closes: #389725
+
+2006-09-21 Clytie Siddall <clytie@riverland.net.au>
+
+ * vi.po: Updated to 514t. Closes: #388555
+
2006-09-20 Sorin Batariuc <sorin@bonbon.net>
* ro.po: Updated to 514t. Closes: #388402
diff --git a/po/eu.po b/po/eu.po
index 3bcddd1b4..73fb9b556 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_eu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-09 16:17+0200\n"
-"PO-Revision-Date: 2006-06-17 00:10+0200\n"
+"POT-Creation-Date: 2006-09-12 11:18+0200\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.2\n"
+"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"\n"
@@ -153,7 +153,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2380 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s (%s %s) konpilatua: %s %s\n"
@@ -233,8 +233,7 @@ msgstr ""
#: cmdline/apt-cdrom.cc:78
msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-"Mesedez idatzi izen bat diska honentzat, 'Debian 2.1r1 1 Diska' antzerakoan"
+msgstr "Mesedez idatzi izen bat diska honentzat, 'Debian 2.1r1 1 Diska' antzerakoan"
#: cmdline/apt-cdrom.cc:93
msgid "Please insert a Disc in the drive and press enter"
@@ -441,6 +440,8 @@ msgid ""
"DB format is invalid. If you upgraded from a older version of apt, please "
"remove and re-create the database."
msgstr ""
+"DB formatu baliogabe da. Apt bertsio zaharrago batetik eguneratu baduzu, "
+"mesedez datubasea ezabatu eta birsortu."
#: ftparchive/cachedb.cc:81
#, c-format
@@ -537,14 +538,14 @@ msgid " %s maintainer is %s not %s\n"
msgstr " %s mantentzailea %s da, eta ez %s\n"
#: ftparchive/writer.cc:623
-#, fuzzy, c-format
+#, c-format
msgid " %s has no source override entry\n"
-msgstr " %s: ez du override sarrerarik\n"
+msgstr " %s: ez du jatorri gainidazketa sarrerarik\n"
#: ftparchive/writer.cc:627
-#, fuzzy, c-format
+#, c-format
msgid " %s has no binary override entry either\n"
-msgstr " %s: ez du override sarrerarik\n"
+msgstr " %s: ez du bitar gainidazketa sarrerarik\n"
#: ftparchive/contents.cc:317
#, c-format
@@ -806,11 +807,11 @@ msgstr "Paketeak ezabatu beharra dute bain Ezabatzea ezgaiturik dago."
msgid "Internal error, Ordering didn't finish"
msgstr "Barne errorea, ez da ordenatzeaz amaitu"
-#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
msgid "Unable to lock the download directory"
msgstr "Ezin da deskarga-direktorioa blokeatu"
-#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2128
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Ezin izan da iturburu-zerrenda irakurri."
@@ -841,7 +842,7 @@ msgstr "Deskonprimitu ondoren, %sB gehiago erabiliko dira diskoan.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Deskonprimitu ondoren, %sB libratuko dira diskoan.\n"
-#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1982
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Ezin da %s(e)n duzun leku librea atzeman."
@@ -878,7 +879,7 @@ msgstr "Abortatu."
msgid "Do you want to continue [Y/n]? "
msgstr "Aurrera jarraitu nahi al duzu [B/e]? "
-#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ezin da lortu %s %s\n"
@@ -887,7 +888,7 @@ msgstr "Ezin da lortu %s %s\n"
msgid "Some files failed to download"
msgstr "Fitxategi batzuk ezin izan dira deskargatu"
-#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2034
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
msgid "Download complete and in download only mode"
msgstr "Deskarga amaituta eta deskarga soileko moduan"
@@ -1059,117 +1060,114 @@ msgstr "Hautsitako paketeak"
msgid "The following extra packages will be installed:"
msgstr "Ondorengo pakete gehigarriak instalatuko dira:"
-#: cmdline/apt-get.cc:1685
+#: cmdline/apt-get.cc:1692
msgid "Suggested packages:"
msgstr "Iradokitako paketeak:"
-#: cmdline/apt-get.cc:1686
+#: cmdline/apt-get.cc:1693
msgid "Recommended packages:"
msgstr "Gomendatutako paketeak:"
-#: cmdline/apt-get.cc:1706
+#: cmdline/apt-get.cc:1713
msgid "Calculating upgrade... "
msgstr "Berriketak kalkulatzen... "
-#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Huts egin du"
-#: cmdline/apt-get.cc:1714
+#: cmdline/apt-get.cc:1721
msgid "Done"
msgstr "Eginda"
-#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
msgid "Internal error, problem resolver broke stuff"
msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du"
-#: cmdline/apt-get.cc:1887
+#: cmdline/apt-get.cc:1894
msgid "Must specify at least one package to fetch source for"
msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko"
-#: cmdline/apt-get.cc:1917 cmdline/apt-get.cc:2146
+#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ezin da iturburu-paketerik aurkitu %s(r)entzat"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1968
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n"
-#: cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1992
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Ez daukazu nahikoa leku libre %s(e)n."
-#: cmdline/apt-get.cc:1990
+#: cmdline/apt-get.cc:1997
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Iturburu-artxiboetako %sB/%sB eskuratu behar dira.\n"
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:2000
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Iturburu-artxiboetako %sB eskuratu behar dira.\n"
-#: cmdline/apt-get.cc:1999
+#: cmdline/apt-get.cc:2006
#, c-format
msgid "Fetch source %s\n"
msgstr "Eskuratu %s iturubura\n"
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2037
msgid "Failed to fetch some archives."
msgstr "Huts egin du zenbat artxibo lortzean."
-#: cmdline/apt-get.cc:2058
+#: cmdline/apt-get.cc:2065
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr ""
-"%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n"
+msgstr "%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n"
-#: cmdline/apt-get.cc:2070
+#: cmdline/apt-get.cc:2077
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n"
-#: cmdline/apt-get.cc:2071
+#: cmdline/apt-get.cc:2078
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Egiaztattu 'dpkg-dev' paketea instalaturik dagoen.\n"
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2095
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Eraikitzeko '%s' komandoak huts egin du.\n"
-#: cmdline/apt-get.cc:2107
+#: cmdline/apt-get.cc:2114
msgid "Child process failed"
msgstr "Prozesu umeak huts egin du"
-#: cmdline/apt-get.cc:2123
+#: cmdline/apt-get.cc:2130
msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-"Gutxienez pakete bat zehaztu behar duzu eraikitze-mendekotasunak egiaztatzeko"
+msgstr "Gutxienez pakete bat zehaztu behar duzu eraikitze-mendekotasunak egiaztatzeko"
-#: cmdline/apt-get.cc:2151
+#: cmdline/apt-get.cc:2158
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ezin izan da %s(r)en eraikitze-mendekotasunen informazioa eskuratu"
-#: cmdline/apt-get.cc:2171
+#: cmdline/apt-get.cc:2178
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s: ez du eraikitze-mendekotasunik.\n"
-#: cmdline/apt-get.cc:2223
+#: cmdline/apt-get.cc:2230
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
-msgstr ""
-"%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
+msgstr "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2282
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1178,32 +1176,32 @@ msgstr ""
"%2$s(r)en %1$s mendekotasuna ezin da bete, ez baitago bertsio-eskakizunak "
"betetzen dituen %3$s paketearen bertsio erabilgarririk"
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2317
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: instalatutako %3$s "
"paketea berriegia da"
-#: cmdline/apt-get.cc:2335
+#: cmdline/apt-get.cc:2342
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: %3$s"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s(r)en eraikitze-mendekotasunak ezin izan dira bete."
-#: cmdline/apt-get.cc:2353
+#: cmdline/apt-get.cc:2360
msgid "Failed to process build dependencies"
msgstr "Huts egin du eraikitze-mendekotasunak prozesatzean"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2392
msgid "Supported modules:"
msgstr "Onartutako Moduluak:"
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2433
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1370,8 +1368,7 @@ msgid "or errors caused by missing dependencies. This is OK, only the errors"
msgstr "edo falta diren mendekotasunen erroreak. Hori ondo dago; mezu honen"
#: dselect/install:103
-msgid ""
-"above this message are important. Please fix them and run [I]nstall again"
+msgid "above this message are important. Please fix them and run [I]nstall again"
msgstr ""
"aurreko erroreak dira garrantzitsuak. Konpondu eta exekutatu [I]nstall "
"berriro"
@@ -1627,8 +1624,7 @@ msgstr "Ez da baliozko DEB artxiboa; '%s' kidea falta da"
#: apt-inst/deb/debfile.cc:52
#, c-format
msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
-msgstr ""
-"Hau ez da balioz DEB fitxategi bat, ez du ez '%s' ez '%s' atalik falta du"
+msgstr "Hau ez da balioz DEB fitxategi bat, ez du ez '%s' ez '%s' atalik falta du"
#: apt-inst/deb/debfile.cc:112
#, c-format
@@ -1667,8 +1663,7 @@ msgstr "CD okerra"
#: methods/cdrom.cc:164
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
-msgstr ""
-"Ezin izan da %s(e)ko CD-ROMa desmuntatu; beharbada erabiltzen ariko da."
+msgstr "Ezin izan da %s(e)ko CD-ROMa desmuntatu; beharbada erabiltzen ariko da."
#: methods/cdrom.cc:169
msgid "Disk not found."
@@ -1678,12 +1673,12 @@ msgstr "Ez da diska aurkitu"
msgid "File not found"
msgstr "Ez da fitxategia aurkitu"
-#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
-#: methods/gzip.cc:142
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:134
+#: methods/gzip.cc:143
msgid "Failed to stat"
msgstr "Huts egin du atzitzean"
-#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:140
msgid "Failed to set modification time"
msgstr "Huts egin du aldaketa-ordua ezartzean"
@@ -1769,8 +1764,7 @@ msgstr "Ezin izan da socket-a sortu"
#: methods/ftp.cc:698
msgid "Could not connect data socket, connection timed out"
-msgstr ""
-"Ezin izan da datu-socketa konektatu; konexioak denbora-muga gainditu du"
+msgstr "Ezin izan da datu-socketa konektatu; konexioak denbora-muga gainditu du"
#: methods/ftp.cc:704
msgid "Could not connect passive socket."
@@ -1864,8 +1858,7 @@ msgstr "Ezin izan da konexioa hasi -> %s:%s (%s)."
#: methods/connect.cc:93
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr ""
-"Ezin izan da konektatu -> %s:%s (%s). Konexioak denbora-muga gainditu du"
+msgstr "Ezin izan da konektatu -> %s:%s (%s). Konexioak denbora-muga gainditu du"
#: methods/connect.cc:108
#, c-format
@@ -1909,8 +1902,7 @@ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "E: Acquire::gpgv::Options arguimentu zerrenda luzeegia. Uzten."
#: methods/gpgv.cc:204
-msgid ""
-"Internal error: Good signature, but could not determine key fingerprint?!"
+msgid "Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "Barne errorea: Sinadura zuzena, baina ezin da egiaztapen marka zehaztu"
#: methods/gpgv.cc:209
@@ -1920,8 +1912,7 @@ msgstr "Beintza sinadura baliogabe bat aurkitu da."
#: methods/gpgv.cc:213
#, c-format
msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
-msgstr ""
-"Ezin da %s abiarazi sinadura egiaztatzeko (gnupg instalaturik al dago?)"
+msgstr "Ezin da %s abiarazi sinadura egiaztatzeko (gnupg instalaturik al dago?)"
#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
@@ -2125,8 +2116,7 @@ msgstr "%s aukerak argumentu bat behar du."
#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr ""
-"%s aukera: konfigurazio-elementuaren zehaztapenak =<val> eduki behar du."
+msgstr "%s aukera: konfigurazio-elementuaren zehaztapenak =<val> eduki behar du."
#: apt-pkg/contrib/cmndline.cc:237
#, c-format
@@ -2177,8 +2167,7 @@ msgstr "Ezin izan da %s blokeo-fitxategia ireki"
#: apt-pkg/contrib/fileutl.cc:105
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
-msgstr ""
-"Ez da blokeorik erabiltzen ari nfs %s muntatutako blokeo-fitxategiarentzat"
+msgstr "Ez da blokeorik erabiltzen ari nfs %s muntatutako blokeo-fitxategiarentzat"
#: apt-pkg/contrib/fileutl.cc:109
#, c-format
@@ -2392,10 +2381,8 @@ msgstr "'%s' motako indize-fitxategirik ez da onartzen"
#: apt-pkg/algorithms.cc:241
#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"%s paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu."
+msgid "The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr "%s paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu."
#: apt-pkg/algorithms.cc:1059
msgid ""
@@ -2597,8 +2584,7 @@ msgstr ""
#: apt-pkg/acquire-item.cc:848
#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
+msgid "The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Paketearen indize-fitxategiak hondatuta daude. 'Filename:' eremurik ez %s "
"paketearentzat."
@@ -2704,8 +2690,7 @@ msgstr "%i erregistro eta %i okerreko fitxategi grabaturik.\n"
#: apt-pkg/indexcopy.cc:269
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
-"%i erregistro, %i galdutako fitxategi eta %i okerreko fitxategi grabaturik.\n"
+msgstr "%i erregistro, %i galdutako fitxategi eta %i okerreko fitxategi grabaturik.\n"
#: apt-pkg/deb/dpkgpm.cc:358
#, c-format
@@ -2761,9 +2746,3 @@ msgstr "%s guztiz ezabatu da"
msgid "Connection closed prematurely"
msgstr "Konexioa behar baino lehenago itxi da"
-#~ msgid "File date has changed %s"
-#~ msgstr "Fitxategi-data aldatu egin da: %s"
-
-#, fuzzy
-#~ msgid "Could not patch file"
-#~ msgstr "%s fitxategia ezin izan da ireki"
diff --git a/po/fi.po b/po/fi.po
index e39c385fb..81428c8c9 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,15 +1,15 @@
# translation of fi.po to Finnish
# Finnish translation of apt.
# This file is put in the public domain.
-# Tapio Lehtonen <tale@debian.org>, 2004.
-#
-#
+# Tapio Lehtonen <tale@debian.org>, 2004-2006.
+#
+#
msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-27 13:46+0200\n"
-"PO-Revision-Date: 2006-08-14 13:27+0300\n"
+"POT-Creation-Date: 2006-09-12 11:18+0200\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"
"MIME-Version: 1.0\n"
@@ -150,7 +150,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s laitealustalle %s %s käännöksen päiväys %s %s\n"
@@ -426,115 +426,126 @@ msgstr "Mitkään valinnat eivät täsmänneet"
msgid "Some files are missing in the package file group `%s'"
msgstr "Pakettitiedostojen ryhmästä \"%s\" puuttuu joitain tiedostoja"
-#: ftparchive/cachedb.cc:45
+#: ftparchive/cachedb.cc:47
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "Tietokanta on turmeltunut, tiedosto nimetty %s.old"
-#: ftparchive/cachedb.cc:63
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "Tietokanta on vanha, yritetään päivittää %s"
-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr "Tietokannan muoto ei kelpaa. Jos tehtiin päivitys vanhasta apt:n versiosta, on tietokanta poistettava ja luotava uudelleen."
+
+#: ftparchive/cachedb.cc:81
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Tietokantatiedostoa %s ei saatu avattua: %s"
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
#, c-format
-msgid "File date has changed %s"
-msgstr "Tiedoston uusi päiväys %s"
+msgid "Failed to stat %s"
+msgstr "Tiedostolle %s ei toimi stat"
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Arkistolla ei ole ohjaustietuetta"
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Kohdistinta ei saada"
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Kansiota %s ei voi lukea\n"
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Tdstolle %s ei toimi stat\n"
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
msgid "E: Errors apply to file "
msgstr "E: Tiedostossa virheitä "
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
#, c-format
msgid "Failed to resolve %s"
msgstr "Osoitteen %s selvitys ei onnistunut"
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
msgstr "Puun läpikäynti ei onnistunut"
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
#, c-format
msgid "Failed to open %s"
msgstr "Tiedoston %s avaaminen ei onnistunut"
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to readlink %s"
msgstr "readlink %s ei onnistunut"
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
#, c-format
msgid "Failed to unlink %s"
msgstr "unlink %s ei onnistunut"
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Linkin %s -> %s luonti ei onnistunut"
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLinkin yläraja %st saavutettu.\n"
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Tiedostolle %s ei toimi stat"
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
msgid "Archive had no package field"
msgstr "Arkistossa ei ollut pakettikenttää"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
#, c-format
msgid " %s has no override entry\n"
-msgstr " %s: ei poikkeustietuetta\n"
+msgstr " %s:llä ei ole poikkeustietuetta\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s ylläpitäjä on %s eikä %s\n"
+#: ftparchive/writer.cc:623
+#, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s:llä ei ole poikkeustietuetta\n"
+
+#: ftparchive/writer.cc:627
+#, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s:llä ei ole binääristäkään poikkeustietuetta\n"
+
#: ftparchive/contents.cc:317
#, c-format
msgid "Internal error, could not locate member %s"
@@ -795,11 +806,11 @@ msgstr "Paketteja pitäisi poistaa mutta Remove ei ole käytössä."
msgid "Internal error, Ordering didn't finish"
msgstr "Tapahtui sisäinen virhe, järjestäminen keskeytyi"
-#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
msgid "Unable to lock the download directory"
msgstr "Noutokansiota ei saatu lukittua"
-#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Lähteiden luetteloa ei pystynyt lukemaan."
@@ -829,7 +840,7 @@ msgstr "Purkamisen jälkeen käytetään %st lisää levytilaa.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Purkamisen jälkeen vapautuu %st levytilaa.\n"
-#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kansion %s vapaan tilan määrä ei selvinnyt"
@@ -867,7 +878,7 @@ msgstr "Keskeytä."
msgid "Do you want to continue [Y/n]? "
msgstr "Haluatko jatkaa [K/e]? "
-#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Tiedoston %s nouto ei onnistunut %s\n"
@@ -876,7 +887,7 @@ msgstr "Tiedoston %s nouto ei onnistunut %s\n"
msgid "Some files failed to download"
msgstr "Joidenkin tiedostojen nouto ei onnistunut"
-#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
msgid "Download complete and in download only mode"
msgstr "Nouto on valmis ja määrätty vain nouto"
@@ -1048,108 +1059,108 @@ msgstr "Rikkinäiset paketit"
msgid "The following extra packages will be installed:"
msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:"
-#: cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1692
msgid "Suggested packages:"
msgstr "Ehdotetut paketit:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1693
msgid "Recommended packages:"
msgstr "Suositellut paketit:"
-#: cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1713
msgid "Calculating upgrade... "
msgstr "Käsitellään päivitystä ... "
-#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Ei onnistunut"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1721
msgid "Done"
msgstr "Valmis"
-#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
+#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
msgid "Internal error, problem resolver broke stuff"
msgstr "Sisäinen virhe, resolver rikkoi jotain"
-#: cmdline/apt-get.cc:1876
+#: cmdline/apt-get.cc:1894
msgid "Must specify at least one package to fetch source for"
msgstr "On annettava ainakin yksi paketti jonka lähdekoodi noudetaan"
-#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
+#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Paketin %s lähdekoodipakettia ei löytynyt"
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1968
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n"
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1992
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa"
-#: cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:1997
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n"
-#: cmdline/apt-get.cc:1982
+#: cmdline/apt-get.cc:2000
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "On noudettava %st lähdekoodiarkistoja.\n"
-#: cmdline/apt-get.cc:1988
+#: cmdline/apt-get.cc:2006
#, c-format
msgid "Fetch source %s\n"
msgstr "Nouda lähdekoodi %s\n"
-#: cmdline/apt-get.cc:2019
+#: cmdline/apt-get.cc:2037
msgid "Failed to fetch some archives."
msgstr "Joidenkin arkistojen noutaminen ei onnistunut."
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2065
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Ohitetaan purku jo puretun lähdekoodin %s kohdalla\n"
-#: cmdline/apt-get.cc:2059
+#: cmdline/apt-get.cc:2077
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Purkukomento \"%s\" ei onnistunut.\n"
-#: cmdline/apt-get.cc:2060
+#: cmdline/apt-get.cc:2078
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
-#: cmdline/apt-get.cc:2077
+#: cmdline/apt-get.cc:2095
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Paketointikomento \"%s\" ei onnistunut.\n"
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2114
msgid "Child process failed"
msgstr "Lapsiprosessi kaatui"
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2130
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan"
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2158
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Paketille %s ei ole saatavilla riippuvuustietoja"
-#: cmdline/apt-get.cc:2160
+#: cmdline/apt-get.cc:2178
#, c-format
msgid "%s has no build depends.\n"
msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n"
-#: cmdline/apt-get.cc:2212
+#: cmdline/apt-get.cc:2230
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1157,7 +1168,7 @@ msgid ""
msgstr ""
"riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
-#: cmdline/apt-get.cc:2264
+#: cmdline/apt-get.cc:2282
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1166,32 +1177,32 @@ msgstr ""
"%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio "
"ei vastaa versioriippuvuuksia"
-#: cmdline/apt-get.cc:2299
+#: cmdline/apt-get.cc:2317
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Riippuvutta %s paketille %s ei voi tyydyttää: Asennettu paketti %s on liian "
"uusi"
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2342
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s"
-#: cmdline/apt-get.cc:2338
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää."
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2360
msgid "Failed to process build dependencies"
msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2392
msgid "Supported modules:"
msgstr "Tuetut moduulit:"
-#: cmdline/apt-get.cc:2415
+#: cmdline/apt-get.cc:2433
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1372,19 +1383,19 @@ msgstr "Yhdistetään saatavuustiedot"
msgid "Failed to create pipes"
msgstr "Putkien luonti ei onnistunut"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
msgstr "exec gzip ei onnistunut"
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
msgid "Corrupted archive"
msgstr "Arkisto on turmeltunut"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
msgstr "Tar-ohjelman laskema tarkistussumma ei täsmää, arkisto on turmeltunut"
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Tuntematon TAR-otsikon tyyppi %u, tiedosto %s"
@@ -1664,12 +1675,12 @@ msgstr "Levyä ei löydy"
msgid "File not found"
msgstr "Tiedostoa ei löydy"
-#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
-#: methods/gzip.cc:142
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:134
+#: methods/gzip.cc:143
msgid "Failed to stat"
msgstr "Komento stat ei toiminut"
-#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:140
msgid "Failed to set modification time"
msgstr "Tiedoston muutospäivämäärää ei saatu vaihdettua"
@@ -1881,41 +1892,41 @@ msgstr "Jotain kenkkua tapahtui selvitettäessä \"%s: %s\" (%i)"
msgid "Unable to connect to %s %s:"
msgstr "Ei ole mahdollista muodostaa yhteyttä %s %s:"
-#: methods/gpgv.cc:64
+#: methods/gpgv.cc:65
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr "Avainrengasta \"%s\" ei saatavilla"
-#: methods/gpgv.cc:99
+#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
"E: Parametrien luettelo Acquire::gpgv::Options liian pitkä. Lopetetaan."
-#: methods/gpgv.cc:198
+#: methods/gpgv.cc:204
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Sisäinen virhe: Allekirjoitus kelpaa, mutta avaimen sormenjälki tuntematon?!"
-#: methods/gpgv.cc:203
+#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
msgstr "LÖytyi ainakin yksi kelvoton allekirjoitus."
-#: methods/gpgv.cc:207
+#: methods/gpgv.cc:213
#, c-format
msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
msgstr ""
"Ei käynnistynyt \"%s\" allekirjoitusta tarkistamaan (onko gnupg asennettu?)"
-#: methods/gpgv.cc:212
+#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
msgstr "Tapahtui tuntematon virhe suoritettaessa gpgv"
-#: methods/gpgv.cc:243
+#: methods/gpgv.cc:249
msgid "The following signatures were invalid:\n"
msgstr "Seuraavat allekirjoitukset eivät olleet kelvollisia:\n"
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2293,12 +2304,12 @@ msgstr "Mahdolliset versiot"
msgid "Dependency generation"
msgstr "Luodaan riippuvuudet"
-#: apt-pkg/tagfile.cc:72
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:186
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Pakettitiedostoa %s (2) ei voi jäsentää"
@@ -2744,26 +2755,12 @@ msgstr "%s poistettiin kokonaan"
msgid "Connection closed prematurely"
msgstr "Yhteys katkesi ennenaikaisesti"
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-
-#: ftparchive/writer.cc:623
-#, fuzzy, c-format
-msgid " %s has no source override entry\n"
-msgstr " %s: ei poikkeustietuetta\n"
+#~ msgid "File date has changed %s"
+#~ msgstr "Tiedoston uusi päiväys %s"
-#: ftparchive/writer.cc:627
-#, fuzzy, c-format
-msgid " %s has no binary override entry either\n"
-msgstr " %s: ei poikkeustietuetta\n"
-
-#: methods/rred.cc:219
#, fuzzy
-msgid "Could not patch file"
-msgstr "Tiedostoa %s ei voitu avata"
+#~ msgid "Could not patch file"
+#~ msgstr "Tiedostoa %s ei voitu avata"
#~ msgid "Reading file list"
#~ msgstr "Luetaan tiedostoluetteloa"
diff --git a/po/vi.po b/po/vi.po
index 4e961f4f7..aa288351e 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-27 13:46+0200\n"
-"PO-Revision-Date: 2006-05-19 22:19+0930\n"
+"POT-Creation-Date: 2006-09-12 11:18+0200\n"
+"PO-Revision-Date: 2006-09-21 17:16+0930\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
-"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-"X-Generator: LocFactoryEditor 1.5.5b43u\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: LocFactoryEditor 1.6fc1\n"
#: cmdline/apt-cache.cc:135
#, c-format
@@ -30,11 +30,11 @@ msgstr "Không thể định vị gói %s"
#: cmdline/apt-cache.cc:232
msgid "Total package names : "
-msgstr "Tổng tên gói: "
+msgstr "Tổng số tên gói: "
#: cmdline/apt-cache.cc:272
msgid " Normal packages: "
-msgstr " Gói bình thường: "
+msgstr " Gói chuẩn: "
#: cmdline/apt-cache.cc:273
msgid " Pure virtual packages: "
@@ -46,43 +46,43 @@ msgstr " Gói ảo đơn: "
#: cmdline/apt-cache.cc:275
msgid " Mixed virtual packages: "
-msgstr " Gói ảo đã pha trộn: "
+msgstr " Gói ảo hỗn hợp:"
#: cmdline/apt-cache.cc:276
msgid " Missing: "
-msgstr " Thiếu: "
+msgstr " Thiếu : "
#: cmdline/apt-cache.cc:278
msgid "Total distinct versions: "
-msgstr "Tổng phiên bản riêng: "
+msgstr "Tổng số phiên bản riêng: "
#: cmdline/apt-cache.cc:280
msgid "Total dependencies: "
-msgstr "Tổng cách phụ thuộc: "
+msgstr "Tổng số phụ thuộc: "
#: cmdline/apt-cache.cc:283
msgid "Total ver/file relations: "
-msgstr "Tổng cách liên quan phiên bản và tập tin: "
+msgstr "Tổng số liên quan phiên bản và tập tin: "
#: cmdline/apt-cache.cc:285
msgid "Total Provides mappings: "
-msgstr "Tổng cách ảnh xạ Miễn là: "
+msgstr "Tổng số ảnh xạ Miễn là: "
#: cmdline/apt-cache.cc:297
msgid "Total globbed strings: "
-msgstr "Tổng chuỗi mở rộng mẫu tìm kiếm: "
+msgstr "Tổng số chuỗi mở rộng mẫu tìm kiếm: "
#: cmdline/apt-cache.cc:311
msgid "Total dependency version space: "
-msgstr "Tổng chỗ cho cách phụ thuộc vào phiên bản: "
+msgstr "Tổng chỗ phiên bản phụ thuộc:"
#: cmdline/apt-cache.cc:316
msgid "Total slack space: "
-msgstr "Tổng chỗ chưa dùng: "
+msgstr "Tổng chỗ nghỉ:"
#: cmdline/apt-cache.cc:324
msgid "Total space accounted for: "
-msgstr "Tổng chỗ sẽ dùng: "
+msgstr "Tổng chỗ đã tính: "
#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
#, c-format
@@ -152,7 +152,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s cho %s %s được biên dịch vào %s %s\n"
@@ -455,115 +455,128 @@ msgstr "Không có điều đã chọn khớp được"
msgid "Some files are missing in the package file group `%s'"
msgstr "Thiếu một số tập tin trong nhóm tập tin gói « %s »."
-#: ftparchive/cachedb.cc:45
+#: ftparchive/cachedb.cc:47
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "Cơ sở dữ liệu bị hỏng nên đã đổi tên tâp tin thành %s.old (old: cũ)."
-#: ftparchive/cachedb.cc:63
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "Cơ sở dữ liệu cũ nên đang cố nâng cấp lên %s"
-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Dạng thức co sở dữ liệu không hợp lệ. Nếu bạn đã nâng cấp từ một phiên bản "
+"apt cũ, hãy gỡ bỏ rồi tạo lại co sở dữ liệu này."
+
+#: ftparchive/cachedb.cc:81
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Không thể mở tập tin cơ sở dữ liệu %s: %s."
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
#, c-format
-msgid "File date has changed %s"
-msgstr "Ngày tập tin đã đổi %s"
+msgid "Failed to stat %s"
+msgstr "Việc lấy thông tin toàn bộ cho %s bị lỗi"
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Kho không có mục ghi điều khiển"
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Không thể lấy con chạy"
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Không thể đọc thư mục %s\n"
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Không thể lấy thông tin toàn bộ cho %s\n"
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
msgid "E: Errors apply to file "
msgstr "E: có lỗi áp dụng vào tập tin "
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
#, c-format
msgid "Failed to resolve %s"
msgstr "Việc quyết định %s bị lỗi"
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
msgstr "Việc di chuyển qua cây bị lỗi"
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
#, c-format
msgid "Failed to open %s"
msgstr "Việc mở %s bị lỗi"
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Bỏ liên kết %s [%s]\n"
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to readlink %s"
msgstr "Việc tạo liên kết lại %s bị lỗi"
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
#, c-format
msgid "Failed to unlink %s"
msgstr "Việc bỏ liên kết %s bị lỗi"
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Việc liên kết %s đến %s bị lỗi"
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Hết hạn bỏ liên kết của %sB.\n"
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Việc lấy thông tin toàn bộ cho %s bị lỗi"
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
msgid "Archive had no package field"
msgstr "Kho không có trường gói"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
#, c-format
msgid " %s has no override entry\n"
msgstr " %s không có mục ghi đè\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " người bảo quản %s là %s không phải %s\n"
+#: ftparchive/writer.cc:623
+#, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s không có mục ghi đè nguồn\n"
+
+#: ftparchive/writer.cc:627
+#, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s cũng không có mục ghi đè nhị phân\n"
+
#: ftparchive/contents.cc:317
#, c-format
msgid "Internal error, could not locate member %s"
@@ -826,11 +839,11 @@ msgstr "Cần phải gỡ bỏ một số gói, nhưng mà khả năng Gỡ bỏ
msgid "Internal error, Ordering didn't finish"
msgstr "Gặp lỗi nội bộ: tiến trình Sắp xếp chưa xong"
-#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
msgid "Unable to lock the download directory"
msgstr "Không thể khóa thư mục tải về"
-#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Không thể đọc danh sách nguồn."
@@ -860,7 +873,7 @@ msgstr "Sau khi đã giải nén, sẻ chiếm %sB sức chứa đĩa thêm.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Sau khi đã giải nén, sẽ giải phóng %sB sức chữa đĩa thêm.\n"
-#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Không thể quyết định chỗ rảnh trong %s"
@@ -898,7 +911,7 @@ msgstr "Hủy bỏ."
msgid "Do you want to continue [Y/n]? "
msgstr "Bạn có muốn tiếp tục không? [Y/n] [C/k] "
-#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Việc gói %s bị lỗi %s\n"
@@ -907,7 +920,7 @@ msgstr "Việc gói %s bị lỗi %s\n"
msgid "Some files failed to download"
msgstr "Một số tập tin không tải về được"
-#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
msgid "Download complete and in download only mode"
msgstr "Mới tải về xong và trong chế độ chỉ tải về"
@@ -1082,115 +1095,115 @@ msgstr "Gói bị ngắt"
msgid "The following extra packages will be installed:"
msgstr "Những gói thêm theo đây sẽ được cài đặt:"
-#: cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1692
msgid "Suggested packages:"
msgstr "Gói được đệ nghị:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1693
msgid "Recommended packages:"
msgstr "Gói được khuyên:"
-#: cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1713
msgid "Calculating upgrade... "
msgstr "Đang tính nâng cấp... "
-#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Bị lỗi"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1721
msgid "Done"
msgstr "Xong"
-#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
+#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
msgid "Internal error, problem resolver broke stuff"
msgstr "Lỗi nội bộ: bộ tháo gỡ vấn đề đã ngắt gì"
-#: cmdline/apt-get.cc:1876
+#: cmdline/apt-get.cc:1894
msgid "Must specify at least one package to fetch source for"
msgstr "Phải ghi rõ ít nhất một gói cần lấy nguồn cho nó"
-#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
+#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Không tìm thấy gói nguồn cho %s"
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1968
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Đang bỏ qua tập tin đã được tải về « %s »\n"
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1992
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Không đủ sức chứa còn rảnh trong %s"
-#: cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:1997
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Cần phải lấy %sB/%sB kho nguồn.\n"
-#: cmdline/apt-get.cc:1982
+#: cmdline/apt-get.cc:2000
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Cần phải lấy %sB kho nguồn.\n"
-#: cmdline/apt-get.cc:1988
+#: cmdline/apt-get.cc:2006
#, c-format
msgid "Fetch source %s\n"
msgstr "Lấy nguồn %s\n"
-#: cmdline/apt-get.cc:2019
+#: cmdline/apt-get.cc:2037
msgid "Failed to fetch some archives."
msgstr "Việc lấy một số kho bị lỗi."
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2065
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Đang bỏ qua giải nén nguồn đã giải nén trong %s\n"
-#: cmdline/apt-get.cc:2059
+#: cmdline/apt-get.cc:2077
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Lệnh giải nén « %s » bị lỗi.\n"
-#: cmdline/apt-get.cc:2060
+#: cmdline/apt-get.cc:2078
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Hãy kiểm tra xem gói « dpkg-dev » có được cài đặt chưa.\n"
-#: cmdline/apt-get.cc:2077
+#: cmdline/apt-get.cc:2095
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Lệnh xây dụng « %s » bị lỗi.\n"
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2114
msgid "Child process failed"
msgstr "Tiến trình con bị lỗi"
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2130
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Phải ghi rõ ít nhất một gói cần kiểm tra cách phụ thuộc khi xây dụng cho nó"
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2158
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Không thể lấy thông tin về cách phụ thuộc khi xây dụng cho %s"
-#: cmdline/apt-get.cc:2160
+#: cmdline/apt-get.cc:2178
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s không phụ thuộc vào gì khi xây dụng.\n"
-#: cmdline/apt-get.cc:2212
+#: cmdline/apt-get.cc:2230
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "cách phụ thuộc %s cho %s không thể được thỏa vì không tìm thấy gọi %s"
-#: cmdline/apt-get.cc:2264
+#: cmdline/apt-get.cc:2282
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1199,31 +1212,31 @@ msgstr ""
"cách phụ thuộc %s cho %s không thể được thỏa vì không có phiên bản sẵn sàng "
"của gói %s có thể thỏa điều kiện phiên bản."
-#: cmdline/apt-get.cc:2299
+#: cmdline/apt-get.cc:2317
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi vì gói đã cài đặt %s quá mới"
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2342
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi: %s."
-#: cmdline/apt-get.cc:2338
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Không thể thỏa cách phụ thuộc khi xây dụng cho %s."
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2360
msgid "Failed to process build dependencies"
msgstr "Việc xử lý cách phụ thuộc khi xây dụng bị lỗi"
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2392
msgid "Supported modules:"
msgstr "Mô-đun đã hỗ trợ :"
-#: cmdline/apt-get.cc:2415
+#: cmdline/apt-get.cc:2433
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1414,19 +1427,19 @@ msgstr "Đang hợp nhất các thông tin sẵn sàng..."
msgid "Failed to create pipes"
msgstr "Việc tạo những ống bị lỗi"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
msgstr "Việc thực hiện gzip bị lỗi "
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
msgid "Corrupted archive"
msgstr "Kho bị hỏng."
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
msgstr "Tiến trình tar (kiểm tổng tar) thât bại: kho bị hỏng."
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Không biết kiểu phần đầu tar %u, bộ phạn %s"
@@ -1709,12 +1722,12 @@ msgstr "Không tìm thấy đĩa"
msgid "File not found"
msgstr "Không tìm thấy tập tin"
-#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
-#: methods/gzip.cc:142
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:134
+#: methods/gzip.cc:143
msgid "Failed to stat"
msgstr "Việc lấy các thông tin bị lỗi"
-#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:140
msgid "Failed to set modification time"
msgstr "Việc lập giờ sửa đổi bị lỗi"
@@ -1926,39 +1939,39 @@ msgstr "Gặp lỗi nghiệm trọng khi tháo gỡ « %s:%s » (%i)"
msgid "Unable to connect to %s %s:"
msgstr "Không thể kết nối đến %s %s:"
-#: methods/gpgv.cc:64
+#: methods/gpgv.cc:65
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr "Không thể truy cập vòng khoá « %s »"
-#: methods/gpgv.cc:99
+#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "E: Danh sách lệnh từ « Acquire::gpgv::Options » quá dài nên thoát."
-#: methods/gpgv.cc:198
+#: methods/gpgv.cc:204
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "Lỗi nội bộ: chữ ký đúng, nhưng không thể quyết định vân tay khóa ?!"
-#: methods/gpgv.cc:203
+#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
msgstr "Gặp ít nhất một chữ ký không hợp lệ."
-#: methods/gpgv.cc:207
+#: methods/gpgv.cc:213
#, c-format
msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
msgstr ""
"Không thể thực hiện « %s » để kiểm chứng chữ ký (gnupg có được cài đặt chưa?)"
-#: methods/gpgv.cc:212
+#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
msgstr "Gặp lỗi lạ khi thực hiện gpgv"
-#: methods/gpgv.cc:243
+#: methods/gpgv.cc:249
msgid "The following signatures were invalid:\n"
msgstr "Những chữ ký theo đây là không hợp lệ:\n"
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2339,12 +2352,12 @@ msgstr "Phiên bản ứng cử"
msgid "Dependency generation"
msgstr "Tạo ra cách phụ thuộc"
-#: apt-pkg/tagfile.cc:72
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Không thể phân tách tập tin gói %s (1)"
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:186
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Không thể phân tách tập tin gói %s (2)"
@@ -2796,36 +2809,3 @@ msgstr "Mới gỡ bỏ hoàn toàn %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Kết nối bị đóng quá sớm."
-
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-
-#: ftparchive/writer.cc:623
-#, fuzzy, c-format
-msgid " %s has no source override entry\n"
-msgstr " %s không có mục ghi đè\n"
-
-#: ftparchive/writer.cc:627
-#, fuzzy, c-format
-msgid " %s has no binary override entry either\n"
-msgstr " %s không có mục ghi đè\n"
-
-#: methods/rred.cc:219
-#, fuzzy
-msgid "Could not patch file"
-msgstr "Không thể mở tập tin %s"
-
-#~ msgid "Reading file list"
-#~ msgstr "Đang đọc danh sách tâp tin..."
-
-#~ msgid "Could not execute "
-#~ msgstr "Không thể thực hiện "
-
-#~ msgid "Preparing for remove with config %s"
-#~ msgstr "Đang chuẩn bị gỡ bỏ với cấu hình %s..."
-
-#~ msgid "Removed with config %s"
-#~ msgstr "Mới gỡ bỏ với cấu hình %s"