* apt-pkg/packagemanager.{cc,h}:

  - propergate the Immediate flag to make hitting the
    "E: Internal Error, Could not perform immediate configuration (2)"
    harder
* debian/control:
  - build against libdb-dev (instead of libdb4.4-dev)
* merged the apt--DoListUpdate branch, this provides a common interface
  for "apt-get update" like operations for the frontends and also provides
  hooks to run stuff in APT::Update::{Pre,Post}-Invoke

diff --git a/COPYING b/COPYING
index 9e277e57d0ff5389239356d76abb4b131cd1923a..3baf9ac5a5ef187edcdcc3c93ee319468c3f1332 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,6 @@
 Apt is copyright 1997, 1998, 1999 Jason Gunthorpe and others.
 
-Apt is licened under the terms of the GNU General Public License (GPL),
+Apt is licensed under the terms of the GNU General Public License (GPL),
 version 2.0 or later, as published by the Free Software Foundation.  See
 the file COPYING.GPL [included], /usr/share/common-licenses/GPL, or
 <http://www.gnu.org/copyleft/gpl.txt> for the terms of the latest version

diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 0cbdc178fa77eb8463e76181a361710b5489b3b2..370687f2485a632ecb6073d58a74bc7b340833d1 100644 (file)
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -675,8 +675,8 @@ bool pkgCdrom::Add(pkgCdromStatus *log)
    DropRepeats(TransList,"");
    if(log) {
       msg.str("");
-      ioprintf(msg, _("Found %u package indexes, %u source indexes, "
-                     "%u translation indexes and %u signatures\n"), 
+      ioprintf(msg, _("Found %zu package indexes, %zu source indexes, "
+                     "%zu translation indexes and %zu signatures\n"), 
               List.size(), SourceList.size(), TransList.size(),
               SigList.size());
       log->Update(msg.str(), STEP_SCAN);

diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index e8301d918a6c192df14800bc7f6c8acddb40de7b..da57c2054cdfbbd389b8aed86a8a0e89461060cd 100644 (file)
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -512,7 +512,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 %u)"), CurLine, sizeof(Buffer));
+         return _error->Error(_("Line %d too long (max %lu)"), CurLine, sizeof(Buffer));
 
       _strtabexpand(Buffer,sizeof(Buffer));
       _strstrip(Buffer);

diff --git a/debian/changelog b/debian/changelog
index 9f78d591680d70e81b8393555fbaab4a6023d6c3..0dec173466ec23ca71e96399eb11170d1c80cda2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,12 +23,18 @@ apt (0.7.10) UNRELEASED; urgency=low
     closes: #438136.
   * Fix cron.daily job to not call fail if apt isn't installed, closes:
     #443286.
+  * Fix compilation warnings in apt-pkg/cdrom.cc and
+    apt-pkg/contrib/configuration.cc.
+  * Fix typo in debian/copyright file ("licened" instead of "licensed"),
+    closes: #458966.
 
   [ Program translations ]
     - Basque updated. Closes: #453088
-    - Vietnamese updated. Closes: #453774
+    - Vietnamese updated. Closes: #453774, #459013
     - Japanese updated. Closes: #456909
+    - Simplified Chinese updated. Closes: #458039
     - French updated.
+    - Norwegian Bokmål updated. Closes: #457917
 
   [ Michael Vogt ]
   * debian/rules
@@ -65,10 +71,10 @@ apt (0.7.10) UNRELEASED; urgency=low
       relative to the directory stored in RootDir, closes: #456457.
 
   [ Christian Perrier ]
-  * Fix wording for "After unpacking...". Thans to Michael Gilbert
+  * Fix wording for "After unpacking...". Thanks to Michael Gilbert
     for the patch. Closes: #260825
 
- -- Christian Perrier <bubulle@debian.org>  Mon, 17 Dec 2007 10:10:17 +0530
+ -- Otavio Salvador <otavio@debian.org>  Thu, 27 Dec 2007 15:04:23 -0200
 
 apt (0.7.9) unstable; urgency=low
 

diff --git a/po/ChangeLog b/po/ChangeLog
index 317cf5304e6fab167a279482af2a2d7a317ca6bc..48b1a559f8bd10fe16b5c2a15e057ac88289212c 100644 (file)
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,15 @@
+2008-01-04  Clytie Siddall  <clytie@riverland.net.au>
+
+       * vi.po: updated to 536t. Closes: #459013
+
+2008-01-02  Hans Fredrik Nordhaug  <hans@nordhaug.priv.no>
+
+       * nb.po: Updated to 536t. Closes: #457917
+
+2007-12-29  Deng Xiyue  <manphiz-guest@users.alioth.debian.org>
+
+       * zh_CN.po: Updated to 536t. Closes: #458039
+
 2007-12-18  Kenshi Muto  <kmuto@debian.org>
 
        * ja.po: Updated to 536t. Closes: #456909

diff --git a/po/ar.po b/po/ar.po
index 35aef663d778e9d22f7933b3c6f5e4547c20f491..bc8ce9cbab2fffbbac827aaca9a625e151435f76 100644 (file)
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\n"
 "PO-Revision-Date: 2006-10-20 21:28+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"

diff --git a/po/bg.po b/po/bg.po
index 560e2688b1078365dad0090aea24400dffd3400c..240c7a261d5aee0d460c235e357c21b94df18474 100644 (file)
--- 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-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\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"

diff --git a/po/bs.po b/po/bs.po
index a6a72e91a2597132dae284e8ce0e0354c31fb3f8..0b4454634e55a80304b70f8836007e392aa069ed 100644 (file)
--- 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-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\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"

diff --git a/po/ca.po b/po/ca.po
index aca2f91c16f3c50d26fcb06dcf4fc90ed2d4b01a..a890c75583d4dd57d2a8e10c3a02124abf57016a 100644 (file)
--- 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-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\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"

diff --git a/po/cs.po b/po/cs.po
index 0b38d8935fcfccc2a2051415a0d2d8b75db36121..55aa98ce5599ed9029b783a407ebd01453aa5169 100644 (file)
--- 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-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\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"

diff --git a/po/cy.po b/po/cy.po
index 078d897259624964696ad0dec161ab8c9f4454e7..b588cd27c13432d1bac21320c2783c23449f6abe 100644 (file)
--- 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-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\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"

diff --git a/po/da.po b/po/da.po
index f43d54ae3cfb186c1237178e714c41904fe85705..6b22fb1e00ad2db036b842a2388620c60b7192b2 100644 (file)
--- 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-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\n"
 "PO-Revision-Date: 2007-09-06 21:40+0200\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
 "Language-Team: Danish\n"

diff --git a/po/de.po b/po/de.po
index 3aba19cdd4fe39989532e370647669525c859a90..0538d3de07a90ddf270053711a1c2594817da91c 100644 (file)
--- 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-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\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"

diff --git a/po/dz.po b/po/dz.po
index 13112e4aba6faeda0c9f9ed77136c50ec29f6856..910c20814d331f4635a66692d15e83499c389842 100644 (file)
--- a/po/dz.po
+++ b/po/dz.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po.pot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\n"
 "PO-Revision-Date: 2006-09-19 09:49+0530\n"
 "Last-Translator: Kinley Tshering <gasepkuenden2k3@hotmail.com>\n"
 "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"

diff --git a/po/el.po b/po/el.po
index b6b6f8c7c433584d4e40ff4f737d7d87d320d749..9c8254bacd28f5ad87307d47c0c2c48430893974 100644 (file)
--- 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-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\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"

diff --git a/po/en_GB.po b/po/en_GB.po
index 483a0f827d2d36dfee7156c63c5623c4852ce2c7..caf74d9ad6c822d2ae8bf01e1c4ad1e4e8dbacb5 100644 (file)
--- 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-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\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"

diff --git a/po/es.po b/po/es.po
index cf44d35d9245043fb9ea66d221634c5096156fc7..217737c997087a1fcd060cdd142f6490ea35caba 100644 (file)
--- 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-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\n"
 "PO-Revision-Date: 2007-06-21 13:06+0200\n"
 "Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"

diff --git a/po/eu.po b/po/eu.po
index dccb9c7843a415aca081ccfb2c70cf231f890023..fc7041b8f93fe9912f0392ee81a91c2253b85b72 100644 (file)
--- 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-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\n"
 "PO-Revision-Date: 2007-11-27 10:10+0000\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Euskara <Librezale@librezale.org>\n"

diff --git a/po/fi.po b/po/fi.po
index b674adc49e4caadbde9ec6a7a18abdf9dc7c0325..658b88037f4cc1e57f0c750b9a8b91b5eb5f03f6 100644 (file)
--- 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-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\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"

diff --git a/po/fr.po b/po/fr.po
index b8dc306e779dd8a2a32c2485a017c9e335ce45c3..d7543a4b53ac34a46f5ffe2a5594d1faa8e69c34 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\n"
 "PO-Revision-Date: 2007-12-17 10:42+0530\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -243,11 +243,13 @@ msgstr ""
 
 #: cmdline/apt-cdrom.cc:78
 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr "Veuillez indiquer le nom de ce disque, par exemple « Debian 2.1r1 Disk 1 »"
+msgstr ""
+"Veuillez indiquer le nom de ce disque, par exemple « Debian 2.1r1 Disk 1 »"
 
 #: cmdline/apt-cdrom.cc:93
 msgid "Please insert a Disc in the drive and press enter"
-msgstr "Veuillez insérer un disque dans le lecteur et appuyez sur la touche Entrée"
+msgstr ""
+"Veuillez insérer un disque dans le lecteur et appuyez sur la touche Entrée"
 
 #: cmdline/apt-cdrom.cc:117
 msgid "Repeat this process for the rest of the CDs in your set."
@@ -323,7 +325,8 @@ msgstr "Impossible d'écrire sur %s"
 
 #: cmdline/apt-extracttemplates.cc:310
 msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?"
+msgstr ""
+"Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?"
 
 #: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338
 msgid "Package extension list is too long"
@@ -438,7 +441,8 @@ msgstr "Aucune sélection ne correspond"
 #: ftparchive/apt-ftparchive.cc:832
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
-msgstr "Quelques fichiers sont manquants dans le groupe de fichiers de paquets « %s »"
+msgstr ""
+"Quelques fichiers sont manquants dans le groupe de fichiers de paquets « %s »"
 
 #: ftparchive/cachedb.cc:43
 #, c-format
@@ -817,7 +821,8 @@ msgstr "Erreur interne, « InstallPackages » appelé avec des paquets cassés
 
 #: cmdline/apt-get.cc:782
 msgid "Packages need to be removed but remove is disabled."
-msgstr "Les paquets doivent être enlevés mais la désinstallation est désactivée."
+msgstr ""
+"Les paquets doivent être enlevés mais la désinstallation est désactivée."
 
 #: cmdline/apt-get.cc:793
 msgid "Internal error, Ordering didn't finish"
@@ -851,7 +856,8 @@ msgstr "Il est nécessaire de prendre %so dans les archives.\n"
 #: cmdline/apt-get.cc:847
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "Après cette opération, %so d'espace disque supplémentaires seront utilisés.\n"
+msgstr ""
+"Après cette opération, %so d'espace disque supplémentaires seront utilisés.\n"
 
 #: cmdline/apt-get.cc:850
 #, c-format
@@ -922,7 +928,8 @@ msgstr ""
 
 #: cmdline/apt-get.cc:1013
 msgid "--fix-missing and media swapping is not currently supported"
-msgstr "l'option --fix-missing et l'échange de support ne sont pas encore reconnus."
+msgstr ""
+"l'option --fix-missing et l'échange de support ne sont pas encore reconnus."
 
 #: cmdline/apt-get.cc:1018
 msgid "Unable to correct missing packages."
@@ -984,7 +991,8 @@ msgstr "Aucun paquet ne correspond au paquet %s"
 #: cmdline/apt-get.cc:1156
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n"
+msgstr ""
+"La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n"
 
 #: cmdline/apt-get.cc:1164
 #, c-format
@@ -1055,7 +1063,8 @@ msgstr "L'information suivante devrait vous aider à résoudre la situation : "
 
 #: cmdline/apt-get.cc:1487
 msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Erreur interne, l'outil de suppression automatique a cassé quelque chose."
+msgstr ""
+"Erreur interne, l'outil de suppression automatique a cassé quelque chose."
 
 #: cmdline/apt-get.cc:1506
 msgid "Internal error, AllUpgrade broke stuff"
@@ -1259,7 +1268,8 @@ msgstr "Impossible de satisfaire les dépendances %s pour %s : %s"
 #: cmdline/apt-get.cc:2570
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Les dépendances de compilation pour %s ne peuvent pas être satisfaites."
+msgstr ""
+"Les dépendances de compilation pour %s ne peuvent pas être satisfaites."
 
 #: cmdline/apt-get.cc:2574
 msgid "Failed to process build dependencies"
@@ -1445,7 +1455,8 @@ msgstr ""
 "seules les erreurs"
 
 #: 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 ""
 "précédant ce message sont importantes. Veuillez les corriger et\n"
 "démarrer l'[I]nstallation une nouvelle fois."
@@ -1703,7 +1714,9 @@ msgstr "Ce n'est pas une archive DEB valide,  partie « %s » manquante"
 #: apt-inst/deb/debfile.cc:50
 #, c-format
 msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
-msgstr "Ce n'est pas une archive DEB valide, elle n'a pas de membre « %s », « %s » ou « %s »"
+msgstr ""
+"Ce n'est pas une archive DEB valide, elle n'a pas de membre « %s », « %s » ou "
+"« %s »"
 
 #: apt-inst/deb/debfile.cc:110
 #, c-format
@@ -1806,7 +1819,8 @@ msgstr ""
 #: methods/ftp.cc:265
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
-msgstr "La commande « %s » du script de connexion a échoué, le serveur a répondu : %s"
+msgstr ""
+"La commande « %s » du script de connexion a échoué, le serveur a répondu : %s"
 
 #: methods/ftp.cc:291
 #, c-format
@@ -1843,7 +1857,8 @@ msgstr "Impossible de créer un connecteur"
 
 #: methods/ftp.cc:698
 msgid "Could not connect data socket, connection timed out"
-msgstr "Impossible de se connecter sur le port de données, délai de connexion dépassé"
+msgstr ""
+"Impossible de se connecter sur le port de données, délai de connexion dépassé"
 
 #: methods/ftp.cc:704
 msgid "Could not connect passive socket."
@@ -1980,10 +1995,12 @@ msgstr "Impossible d'accéder au porte-clés : « %s »"
 
 #: methods/gpgv.cc:101
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr "E: liste de paramètres trop longue pour Acquire::gpgv::Options. Abandon."
+msgstr ""
+"E: liste de paramètres trop longue pour Acquire::gpgv::Options. Abandon."
 
 #: methods/gpgv.cc:205
-msgid "Internal error: Good signature, but could not determine key fingerprint?!"
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Erreur interne : signature correcte, mais il est impossible de déterminer "
 "l'empreinte de la clé."
@@ -2433,12 +2450,14 @@ msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)"
 #: apt-pkg/sourcelist.cc:101
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Ligne %lu mal formée dans la liste des sources %s (distribution absolue)"
+msgstr ""
+"Ligne %lu mal formée dans la liste des sources %s (distribution absolue)"
 
 #: apt-pkg/sourcelist.cc:108
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de distribution)"
+msgstr ""
+"Ligne %lu mal formée dans la liste des sources %s (analyse de distribution)"
 
 #: apt-pkg/sourcelist.cc:199
 #, c-format
@@ -2463,7 +2482,8 @@ msgstr "Le type « %s » est inconnu sur la ligne %u dans la liste des sources
 #: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
 #, c-format
 msgid "Malformed line %u in source list %s (vendor id)"
-msgstr "Ligne %u mal formée dans la liste des sources %s (identifiant du fournisseur)"
+msgstr ""
+"Ligne %u mal formée dans la liste des sources %s (identifiant du fournisseur)"
 
 #: apt-pkg/packagemanager.cc:399
 #, c-format
@@ -2484,7 +2504,8 @@ msgstr "Le type de fichier d'index « %s » n'est pas accepté"
 
 #: apt-pkg/algorithms.cc:247
 #, c-format
-msgid "The package %s needs to be reinstalled, but I can't find an archive for it."
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 "Le paquet %s doit être réinstallé, mais je ne parviens pas à trouver son "
 "archive."
@@ -2518,12 +2539,12 @@ msgstr "Le répertoire d'archive %spartial n'existe pas."
 #: apt-pkg/acquire.cc:827
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Téléchargement du fichier %li de %li (%s restant)"
+msgstr "Téléchargement du fichier %li sur %li (%s restant)"
 
 #: apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li"
-msgstr "Téléchargement du fichier %li de %li"
+msgstr "Téléchargement du fichier %li sur %li"
 
 #: apt-pkg/acquire-worker.cc:110
 #, c-format
@@ -2558,7 +2579,8 @@ msgstr "Impossible de localiser %s."
 
 #: apt-pkg/srcrecords.cc:44
 msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Vous devez insérer quelques adresses « sources » dans votre sources.list"
+msgstr ""
+"Vous devez insérer quelques adresses « sources » dans votre sources.list"
 
 #: apt-pkg/cachefile.cc:69
 msgid "The package lists or status file could not be parsed or opened."
@@ -2686,7 +2708,8 @@ msgstr "Assemblage des fichiers listés dans les champs Provides"
 
 #: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897
 msgid "IO Error saving source cache"
-msgstr "Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources"
+msgstr ""
+"Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources"
 
 #: apt-pkg/acquire-item.cc:127
 #, c-format
@@ -2703,7 +2726,8 @@ msgstr "Somme de contrôle de hachage incohérente"
 
 #: apt-pkg/acquire-item.cc:1100
 msgid "There is no public key available for the following key IDs:\n"
-msgstr "Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n"
+msgstr ""
+"Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n"
 
 #: apt-pkg/acquire-item.cc:1213
 #, c-format
@@ -2726,7 +2750,8 @@ msgstr ""
 
 #: apt-pkg/acquire-item.cc:1313
 #, 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 ""
 "Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » "
 "pour le paquet %s."
@@ -2919,4 +2944,3 @@ msgstr "Impossible de corriger le fichier"
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Connexion fermée prématurément"
-

diff --git a/po/gl.po b/po/gl.po
index d8f9c845ed3be09f5c1015d7a7a11d6f9d308b4f..f67fd94eebc505fe637a74347b2bfa06e88a51f7 100644 (file)
--- 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-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\n"
 "PO-Revision-Date: 2007-10-29 14:02+0000\n"
 "Last-Translator: Jacobo Tarrío <jtarrio@debian.org>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"

diff --git a/po/he.po b/po/he.po
index ea1dd0542f6bd41020b78c824e5fc7dbd966db39..b47b44254cd708288c0f0ed0694934a7df968544 100644 (file)
--- 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-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\n"
 "PO-Revision-Date: 2004-06-10 19:58+0300\n"
 "Last-Translator: Lior Kaplan <webmaster@guides.co.il>\n"
 "Language-Team: Hebrew\n"

diff --git a/po/hu.po b/po/hu.po
index 930b04f4c01c1df793345faa4974850f637853b8..c2701a7a79aff7dc0bd085e4419e74f665df6553 100644 (file)
--- 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-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\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"

diff --git a/po/it.po b/po/it.po
index e3ce6d5442291a0ef08365839d3f5e7cfdd4235c..d61c3c99573264c682c358e0a9d31766588a0648 100644 (file)
--- 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-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\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"

diff --git a/po/ja.po b/po/ja.po
index f82d4b9e32d96feb54f696369c263a996b3525ef..35ea6804ca4d58f51b79d2ec1f5d231afd32632a 100644 (file)
--- 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-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\n"
 "PO-Revision-Date: 2007-12-18 21:13+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"

diff --git a/po/km.po b/po/km.po
index 611f24263b9c7701267adee816730ea4cbc2f9ac..4c66489b4b609180cc72c49b61933a8d79176eec 100644 (file)
--- a/po/km.po
+++ b/po/km.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_km\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\n"
 "PO-Revision-Date: 2006-10-10 09:48+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <support@khmeros.info>\n"

diff --git a/po/ko.po b/po/ko.po
index ffbd11b50689bd87a410b2def3d02285691ab822..65f9241b43d61dcc3c51492cb26e1ad546737c9d 100644 (file)
--- 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-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\n"
 "PO-Revision-Date: 2007-10-29 13:10-0400\n"
 "Last-Translator: Sunjae Park <darehanl@gmail.com>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"

diff --git a/po/ku.po b/po/ku.po
index 06b08b99398b09dcce7511ee29240f4771823b03..80ef94c6e548d40628a08fad882fdd4ad0fce938 100644 (file)
--- a/po/ku.po
+++ b/po/ku.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\n"
 "PO-Revision-Date: 2006-09-16 17:51+0100\n"
 "Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n"
 "Language-Team: Kurdish <ku@li.org>\n"

diff --git a/po/mr.po b/po/mr.po
index 947fd3d73b2e769ca82e64658246a86e1aec441a..4aaefd54b499b0b99c69c11c471cd0fb276d3707 100644 (file)
--- a/po/mr.po
+++ b/po/mr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\n"
 "PO-Revision-Date: 2006-08-09 16:17+0200\n"
 "Last-Translator: Priti Patil <prithisd@gmail.com>\n"
 "Language-Team:  Marathi, janabhaaratii, C-DAC, Mumbai, India "

diff --git a/po/nb.po b/po/nb.po
index 8eca5fd7f80b45c4d827152c4914ea51cf729032..54fcd3bdd214785117005c958cf08728d8645028 100644 (file)
--- a/po/nb.po
+++ b/po/nb.po
@@ -9,14 +9,14 @@
 # Klaus Ade Johnstad <klaus@skolelinux.no>, 2004.
 # Axel Bojer <axelb@skolelinux.no>, 2004.
 # Bjorn Steensrud <bjornst@powertech.no>, 2004.
-# Hans Fredrik Nordhaug <hans@nordhaug.priv.no>, 2005-2006.
+# Hans Fredrik Nordhaug <hans@nordhaug.priv.no>, 2005-2007.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-12-17 05:49+0100\n"
-"PO-Revision-Date: 2006-10-16 00:35+0100\n"
+"PO-Revision-Date: 2008-01-02 14:40+0100\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.ui.no>\n"
 "MIME-Version: 1.0\n"
@@ -65,9 +65,8 @@ msgid "Total distinct versions: "
 msgstr "Antall unike versjoner: "
 
 #: cmdline/apt-cache.cc:295
-#, fuzzy
 msgid "Total Distinct Descriptions: "
-msgstr "Antall unike versjoner: "
+msgstr "Antall unike beskrivelser: "
 
 #: cmdline/apt-cache.cc:297
 msgid "Total dependencies: "
@@ -78,9 +77,8 @@ msgid "Total ver/file relations: "
 msgstr "Antall forhold versjon/fil: "
 
 #: cmdline/apt-cache.cc:302
-#, fuzzy
 msgid "Total Desc/File relations: "
-msgstr "Antall forhold versjon/fil: "
+msgstr "Antall forhold beskrivelse/fil: "
 
 #: cmdline/apt-cache.cc:304
 msgid "Total Provides mappings: "
@@ -169,9 +167,9 @@ msgstr "       %4i %s\n"
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 #: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144
-#, fuzzy, c-format
+#, c-format
 msgid "%s %s for %s compiled on %s %s\n"
-msgstr "%s %s for %s %s kompilert på %s %s\n"
+msgstr "%s %s for %s kompilert på %s %s\n"
 
 #: cmdline/apt-cache.cc:1721
 msgid ""
@@ -853,14 +851,14 @@ msgid "Need to get %sB of archives.\n"
 msgstr "Må hente %sB med arkiver.\n"
 
 #: cmdline/apt-get.cc:847
-#, fuzzy, c-format
+#, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "Etter utpakking vil %sB ekstra diskplass bli brukt.\n"
+msgstr "Etter denne operasjonen vil %sB ekstra diskplass bli brukt.\n"
 
 #: cmdline/apt-get.cc:850
-#, fuzzy, c-format
+#, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "Etter utpakking vil %sB diskplass bli ledig.\n"
+msgstr "Etter denne operasjonen vil %sB diskplass bli ledig.\n"
 
 #: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196
 #, c-format
@@ -1025,42 +1023,42 @@ msgstr ""
 
 #: cmdline/apt-get.cc:1441
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
+msgstr "Vi skal ikke slette ting, kan ikke starte auto-fjerner (AutoRemover)"
 
 #: cmdline/apt-get.cc:1473
-#, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
-msgstr "Følgende NYE pakker vil bli installert:"
+msgstr "Følgende pakker ble automatisk installert og er ikke lenger påkrevet:"
 
 #: cmdline/apt-get.cc:1475
 msgid "Use 'apt-get autoremove' to remove them."
-msgstr ""
+msgstr "Bruk «apt-get autoremove» for å fjerne dem."
 
 #: cmdline/apt-get.cc:1480
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgstr ""
+"Hmm, det ser ut som auto-fjerneren (AutoRemover) ødela noe, og det skal\n"
+"virkelig ikke skje. Send inn en feilmelding til apt-utviklerne."
 
 #: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763
 msgid "The following information may help to resolve the situation:"
 msgstr "Følgende informasjon kan være til hjelp med å løse problemet:"
 
 #: cmdline/apt-get.cc:1487
-#, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Intern feil, problemløser ødela noe"
+msgstr "Intern feil, autofjerneren (AutoRemover) ødela noe"
 
 #: cmdline/apt-get.cc:1506
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Intern feil - «AllUpgrade» ødela noe"
 
 #: cmdline/apt-get.cc:1553
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't find task %s"
-msgstr "Klarte ikke å finne pakken %s"
+msgstr "Klarte ikke å finne oppgave %s"
 
 #: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704
 #, c-format
@@ -1073,9 +1071,9 @@ msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Merk, velger %s istedenfor det regulære uttrykket «%s»\n"
 
 #: cmdline/apt-get.cc:1722
-#, fuzzy, c-format
+#, c-format
 msgid "%s set to manually installed.\n"
-msgstr "men %s skal installeres"
+msgstr "%s satt til manuell installasjon.\n"
 
 #: cmdline/apt-get.cc:1735
 msgid "You might want to run `apt-get -f install' to correct these:"
@@ -1261,7 +1259,6 @@ msgid "Supported modules:"
 msgstr "Støttede moduler:"
 
 #: cmdline/apt-get.cc:2647
-#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1317,6 +1314,8 @@ msgstr ""
 "   upgrade - Utfør en oppgradering\n"
 "   install - Installér nye pakker (Bruk pakkenavn - ikke filnavn (foo.deb))\n"
 "   remove - Fjern pakker\n"
+"   autoremove - Fjern alle automatisk ubrukte pakker\n"
+"   purge - Fjern og rydd opp etter pakker\n"
 "   source - Last ned kildekode fra arkivene\n"
 "   build-dep - Sett opp bygge-forutsetninger for kildekodepakker\n"
 "   dist-upgrade - Oppgradér utgave, les apt-get(8)\n"
@@ -1687,10 +1686,11 @@ msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "Dette er ikke et gyldig DEB-arkiv, mangler «%s»-medlemmet"
 
 #: apt-inst/deb/debfile.cc:50
-#, fuzzy, c-format
+#, c-format
 msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
 msgstr ""
-"Dette er ikke et gyldig DEB-arkiv, det har ikke noe «%s»- eller «%s»-medlem"
+"Dette er ikke et gyldig DEB-arkiv, det har ikke noe «%s»-, «%s»- eller «%s»-"
+"medlem"
 
 #: apt-inst/deb/debfile.cc:110
 #, c-format
@@ -2106,9 +2106,9 @@ msgid "Opening configuration file %s"
 msgstr "Åpner oppsettsfila %s"
 
 #: apt-pkg/contrib/configuration.cc:515
-#, fuzzy, c-format
+#, c-format
 msgid "Line %d too long (max %u)"
-msgstr "Linje %d er for lang (maks %d)"
+msgstr "Linje %d er for lang (maks %u)"
 
 #: apt-pkg/contrib/configuration.cc:611
 #, c-format
@@ -2338,7 +2338,7 @@ msgstr "Nuller"
 
 #: apt-pkg/pkgcache.cc:226
 msgid "Breaks"
-msgstr ""
+msgstr "Ødelegger"
 
 #: apt-pkg/pkgcache.cc:237
 msgid "important"
@@ -2373,19 +2373,18 @@ msgid "Dependency generation"
 msgstr "Oppretter avhengighetsforhold"
 
 #: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
-#, fuzzy
 msgid "Reading state information"
-msgstr "Fletter tilgjengelig informasjon"
+msgstr "Leser tilstandsinformasjon"
 
 #: apt-pkg/depcache.cc:219
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to open StateFile %s"
-msgstr "Klarte ikke å åpne %s"
+msgstr "Klarte ikke å åpne StateFile %s"
 
 #: apt-pkg/depcache.cc:225
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to write temporary StateFile %s"
-msgstr "Klarte ikke å skrive fila %s"
+msgstr "Klarte ikke å skrive midlertidig StateFile %s"
 
 #: apt-pkg/tagfile.cc:102
 #, c-format
@@ -2575,9 +2574,9 @@ msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "Feil oppsto under behandling av %s (UsePackage1)"
 
 #: apt-pkg/pkgcachegen.cc:153
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "Feil oppsto under behandling av %s (NewFileVer1)"
+msgstr "Feil oppsto under behandling av %s (NewFileDesc1)"
 
 #: apt-pkg/pkgcachegen.cc:178
 #, c-format
@@ -2605,9 +2604,9 @@ msgid "Error occurred while processing %s (NewVersion2)"
 msgstr "Feil oppsto under behandling av %s (NewVersion2)"
 
 #: apt-pkg/pkgcachegen.cc:245
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "Feil oppsto under behandling av %s (NewFileVer1)"
+msgstr "Feil oppsto under behandling av %s (NewFileDesc2)"
 
 #: apt-pkg/pkgcachegen.cc:251
 msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2618,9 +2617,8 @@ msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Jøss, du har overgått antallet versjoner denne APT klarer."
 
 #: apt-pkg/pkgcachegen.cc:257
-#, fuzzy
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Jøss, du har overgått antallet versjoner denne APT klarer."
+msgstr "Jøss, du har overgått antallet beskrivelser denne APT klarer."
 
 #: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
@@ -2664,9 +2662,8 @@ msgid "MD5Sum mismatch"
 msgstr "Feil MD5sum"
 
 #: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408
-#, fuzzy
 msgid "Hash Sum mismatch"
-msgstr "Feil MD5sum"
+msgstr "Hashsummen stemmer ikke"
 
 #: apt-pkg/acquire-item.cc:1100
 msgid "There is no public key available for the following key IDs:\n"
@@ -2725,9 +2722,8 @@ msgid "Stored label: %s\n"
 msgstr "Lagret merkelapp: %s \n"
 
 #: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841
-#, fuzzy
 msgid "Unmounting CD-ROM...\n"
-msgstr "Avmonterer CD-ROM..."
+msgstr "Avmonterer CD-ROM ...\n"
 
 #: apt-pkg/cdrom.cc:590
 #, c-format
@@ -2752,16 +2748,18 @@ msgid "Scanning disc for index files..\n"
 msgstr "Leter gjennom CD for indeksfiler..\n"
 
 #: apt-pkg/cdrom.cc:678
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Found %u package indexes, %u source indexes, %u translation indexes and %u "
 "signatures\n"
-msgstr "Fant %i pakkeindekser, %i kildeindekser og %i signaturer\n"
+msgstr ""
+"Fant %u pakkeindekser, %u kildeindekser, %u oversettelsesindekser og %u "
+"signaturer\n"
 
 #: apt-pkg/cdrom.cc:715
-#, fuzzy, c-format
+#, c-format
 msgid "Found label '%s'\n"
-msgstr "Lagret merkelapp: %s \n"
+msgstr "Fant merkelapp «%s»\n"
 
 #: apt-pkg/cdrom.cc:744
 msgid "That is not a valid name, try again.\n"
@@ -2809,9 +2807,9 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "Skrev %i poster med %i manglende filer og %i feile filer.\n"
 
 #: apt-pkg/deb/dpkgpm.cc:513
-#, fuzzy, c-format
+#, c-format
 msgid "Directory '%s' missing"
-msgstr "Listemappa %spartial mangler."
+msgstr "Mappa «%s» mangler"
 
 #: apt-pkg/deb/dpkgpm.cc:596
 #, c-format
@@ -2826,17 +2824,17 @@ msgstr "Pakker ut %s"
 #: apt-pkg/deb/dpkgpm.cc:602
 #, c-format
 msgid "Preparing to configure %s"
-msgstr "Forbereder konfigurering %s"
+msgstr "Forbereder oppsett av %s"
 
 #: apt-pkg/deb/dpkgpm.cc:603
 #, c-format
 msgid "Configuring %s"
-msgstr "Konfigurer %s"
+msgstr "Setter opp %s"
 
 #: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606
-#, fuzzy, c-format
+#, c-format
 msgid "Processing triggers for %s"
-msgstr "Feil ved lesing av katalogen %s"
+msgstr "Behandler utløsere for %s"
 
 #: apt-pkg/deb/dpkgpm.cc:608
 #, c-format
@@ -2871,7 +2869,7 @@ msgstr "Fjernet %s fullstendig"
 
 #: apt-pkg/deb/dpkgpm.cc:775
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
-msgstr ""
+msgstr "Klarte ikke skrive logg, openpty() feilet (/dev/pts ikke montert?)\n"
 
 #: methods/rred.cc:219
 msgid "Could not patch file"

diff --git a/po/ne.po b/po/ne.po
index 1b864cf74402a937240d8c38f33f20c9611c9964..bacfabb3f7db8a9ffb025d01b223205d596069a6 100644 (file)
--- a/po/ne.po
+++ b/po/ne.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\n"
 "PO-Revision-Date: 2006-06-12 14:35+0545\n"
 "Last-Translator: Shiva Pokharel <pokharelshiva@hotmail.com>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"

diff --git a/po/nl.po b/po/nl.po
index ca337d926ec2de6888509b68996330a6f0a63700..41717ef7b24cd9387b253f64aa13de05c59993fd 100644 (file)
--- 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-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\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"

diff --git a/po/nn.po b/po/nn.po
index a01e9517fbc71143c5b93ceed4cd0e30d816f355..96f62518a4b7c803b0f0b3f45ddc7e1e43d04bc4 100644 (file)
--- 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-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\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"

diff --git a/po/pl.po b/po/pl.po
index e1ab8fd94560ed2aaa53345842698d5c618fb57d..6cfee4d38cb4c8be768ebdbbca670054f3b8d5f9 100644 (file)
--- 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-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\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"

diff --git a/po/pt.po b/po/pt.po
index 46b004e994b0d256104e1df9c6e82943aac7a0a8..9597bd50f11184db5b0032017c33fc11abe5c795 100644 (file)
--- 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-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\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"

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 79534e42cf98be639f816dfb13378bc4c5e61db7..ead4e7fd2966e19f4506e24ef7442b4a5ea18c87 100644 (file)
--- 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-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\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"

diff --git a/po/ro.po b/po/ro.po
index a4aac33779aec2a5bc4f06ed64eabbe7a7c94e04..abcfcea8ef79a7717c40295993e23547437a916c 100644 (file)
--- 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-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\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"

diff --git a/po/ru.po b/po/ru.po
index 6206a1b39a9d0d637c122ad8993ead3d3b40aff1..0c5e98a703d72905fb6a12a3cabe11e538047428 100644 (file)
--- 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-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\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"

diff --git a/po/sk.po b/po/sk.po
index 0255cd4818b767f1cba527f6cefc212a59af42ea..ffcc564938622aed18586cbc41e3b4871eedc041 100644 (file)
--- 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-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\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"

diff --git a/po/sl.po b/po/sl.po
index 3cb31ee5429003f97959c8ceb58c96759273a917..e2a6ef5159b87902d22dec171073f2f634409238 100644 (file)
--- 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-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\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"

diff --git a/po/sv.po b/po/sv.po
index bebc77313ebe227fa780c03b32e9f9105898eab7..d7611d766d812e23dc136fd0f9e7efca14e06ac1 100644 (file)
--- 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-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\n"
 "PO-Revision-Date: 2007-10-30 10:31+0100\n"
 "Last-Translator: Peter Karlsson <peterk@debian.org>\n"
 "Language-Team: Swedish <debian-l10n-swedish@debian.org>\n"

diff --git a/po/th.po b/po/th.po
index aed0a9b98caf0c4940d1f30a2a05d8124f298c5d..11738904bc969c8c8c098051f920e92f6455bb23 100644 (file)
--- a/po/th.po
+++ b/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\n"
 "PO-Revision-Date: 2007-09-17 16:07+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"

diff --git a/po/tl.po b/po/tl.po
index e575bc35f020575a37af642ecb009b124c178fc1..a98d8d2037e718f9008838bf53381a87f06a461a 100644 (file)
--- 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-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\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"

diff --git a/po/uk.po b/po/uk.po
index 32dd1a982196cb67cc06fd7cc62d13731533849a..c27344dccab77d47fbc1c8e240ba35d1e1e43d69 100644 (file)
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-all\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\n"
 "PO-Revision-Date: 2006-07-29 15:57+0300\n"
 "Last-Translator: Artem Bondarenko <artem.brz@gmail.com>\n"
 "Language-Team: Українська <uk@li.org>\n"

diff --git a/po/vi.po b/po/vi.po
index 9854ece9f4a457485e09bf11d8b4336ab5d7c9e8..9a0c982255f383d087d837b651e4c3d6fd7ed090 100644 (file)
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,13 +1,13 @@
 # Vietnamese Translation for Apt.
 # This file is put in the public domain.
-# Clytie Siddall <clytie@riverland.net.au>, 2005, 2006, 2007.
+# Clytie Siddall <clytie@riverland.net.au>, 2005, 2006, 2007, 2008.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-17 05:49+0100\n"
-"PO-Revision-Date: 2007-12-01 15:37+1030\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\n"
+"PO-Revision-Date: 2008-01-04 17:17+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -161,9 +161,9 @@ msgstr "       %4i %s\n"
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 #: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144
-#, fuzzy, c-format
+#, c-format
 msgid "%s %s for %s compiled on %s %s\n"
-msgstr "%s %s cho %s được biên dịch vào %s %s\n"
+msgstr "%s %s cho %s được biên dịch trên %s %s\n"
 
 #: cmdline/apt-cache.cc:1721
 msgid ""
@@ -872,14 +872,14 @@ msgid "Need to get %sB of archives.\n"
 msgstr "Cần phải lấy %sB kho.\n"
 
 #: cmdline/apt-get.cc:847
-#, fuzzy, c-format
+#, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "Sau khi đã giải nén, sẻ chiếm %sB sức chứa đĩa thêm.\n"
+msgstr "Sau thao tác này, %sB sức chứa đĩa thêm sẽ được chiếm.\n"
 
 #: cmdline/apt-get.cc:850
-#, fuzzy, c-format
+#, c-format
 msgid "After this operation, %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"
+msgstr "Sau thao tác này, %sB sức chứa đĩa thêm sẽ được giải phóng.\n"
 
 #: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196
 #, c-format
@@ -1094,9 +1094,9 @@ msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Ghi chú : đang chọn %s cho biểu thức chính quy « %s »\n"
 
 #: cmdline/apt-get.cc:1722
-#, fuzzy, c-format
+#, c-format
 msgid "%s set to manually installed.\n"
-msgstr "%s được đặt thành « được cài đặt thủ công ».\n"
+msgstr "%s được đặt thành « được cài đặt bằng tay ».\n"
 
 #: cmdline/apt-get.cc:1735
 msgid "You might want to run `apt-get -f install' to correct these:"
@@ -1282,7 +1282,6 @@ msgid "Supported modules:"
 msgstr "Mô-đun đã hỗ trợ :"
 
 #: cmdline/apt-get.cc:2647
-#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1370,7 +1369,7 @@ msgstr ""
 "  -o=? \tLập tùy chọn nhiệm ý, v.d. -o dir::cache=/tmp\n"
 "Để tim thông tin và tùy chọn thêm thì hãy xem trang hướng dẫn apt-get(8), "
 "sources.list(5) và apt.conf(5).\n"
-"                       Trình APT này có năng lực của bò siêu.\n"
+"                       Trình APT này có năng lực của siêu bò.\n"
 
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
@@ -1720,7 +1719,7 @@ msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "Đây không phải là môt kho DEB hợp lệ vì còn thiếu bộ phạn « %s »"
 
 #: apt-inst/deb/debfile.cc:50
-#, fuzzy, c-format
+#, c-format
 msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
 msgstr ""
 "Đây không phải là môt kho DEB hợp lệ vì không có bộ phạn « %s », « %s » hay « %"
@@ -1784,7 +1783,7 @@ msgstr "Việc lập giờ sửa đổi bị lỗi"
 
 #: methods/file.cc:44
 msgid "Invalid URI, local URIS must not start with //"
-msgstr "Địa chỉ Mạng (URI) không hợp lệ: URI không thể bắt đầu với « // »"
+msgstr "Địa chỉ URI không hợp lệ: URI không thể bắt đầu với « // »"
 
 #. Login must be before getpeername otherwise dante won't work.
 #: methods/ftp.cc:162
@@ -2434,7 +2433,7 @@ msgstr "Không thể phân tách tập tin gói %s (2)"
 #: apt-pkg/sourcelist.cc:90
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Gặp dòng dạng sai %lu trong danh sách nguồn %s (địa chỉ Mạng)"
+msgstr "Gặp dòng dạng sai %lu trong danh sách nguồn %s (địa chỉ URI)"
 
 #: apt-pkg/sourcelist.cc:92
 #, c-format
@@ -2445,7 +2444,7 @@ msgstr "Gặp dòng dạng sai %lu trong danh sách nguồn %s (bản phân ph
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr ""
-"Gặp dòng dạng sai %lu trong danh sách nguồn %s (phân tách địa chỉ Mạng)."
+"Gặp dòng dạng sai %lu trong danh sách nguồn %s (phân tách địa chỉ URI)."
 
 #: apt-pkg/sourcelist.cc:101
 #, c-format
@@ -2573,12 +2572,11 @@ msgstr "Không thể lấy các thông tin về %s."
 #: apt-pkg/srcrecords.cc:44
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
-"Bạn phải để một số địa chỉ Mạng « nguồn » vào « sources.list » (danh sách "
-"nguồn)"
+"Bạn phải để một số địa chỉ URI « nguồn » vào « sources.list » (danh sách nguồn)"
 
 #: apt-pkg/cachefile.cc:69
 msgid "The package lists or status file could not be parsed or opened."
-msgstr "Không thá»\83 phân tách hay mở danh sách gói hay tâp tin trạng thái."
+msgstr "Không thá»\83 phân tích hay mở danh sách gói hay tâp tin trạng thái."
 
 #: apt-pkg/cachefile.cc:73
 msgid "You may want to run apt-get update to correct these problems"
@@ -2924,28 +2922,23 @@ msgstr "Không thể vá lỗi trong tập tin %s"
 msgid "Connection closed prematurely"
 msgstr "Kết nối bị đóng quá sớm."
 
-#, fuzzy
 #~ msgid "Line %d too long (max %d)"
-#~ msgstr "Dòng %d quá dài (tối đa %u)"
+#~ msgstr "Dòng %d quá dài (tối đa %d)"
 
-#, fuzzy
 #~ msgid "Error occured while processing %s (NewFileDesc1)"
-#~ msgstr "Gặp lỗi khi xử lý %s (NewFileDesc1 - tập tin mô tả mới 1)"
+#~ msgstr "Gặp lỗi khi xử lý %s (NewFileDesc1 - mô tả tập tin mới 1)"
 
-#, fuzzy
 #~ msgid "Error occured while processing %s (NewFileDesc2)"
-#~ msgstr "Gặp lỗi khi xử lý %s (NewFileDesc2 - tập tin mô tả mới 2)"
+#~ msgstr "Gặp lỗi khi xử lý %s (NewFileDesc2 - mô tả tập tin mới 2)"
 
-#, fuzzy
 #~ msgid "Stored label: %s \n"
-#~ msgstr "Nhãn đã lưu : %s\n"
+#~ msgstr "Nhãn đã lưu lại : %s\n"
 
-#, fuzzy
 #~ msgid ""
 #~ "Found %i package indexes, %i source indexes, %i translation indexes and %"
 #~ "i signatures\n"
 #~ msgstr ""
-#~ "Tìm thấy %u chỉ mục gói, %u chỉ mục nguồn, %u chỉ mục dịch và %u chữ ký\n"
+#~ "Tìm thấy %i chỉ mục gói, %i chỉ mục nguồn, %i chỉ mục dịch và %i chữ ký\n"
 
 #~ msgid "openpty failed\n"
 #~ msgstr "openpty bị lỗi\n"

diff --git a/po/zh_CN.po b/po/zh_CN.po
index fe1f6bc049da1193a268cf9b4ab841ebb39e97b8..ef881fcc174db4ca6dc4a8d72e7966239808d702 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,5 +1,6 @@
 # Chinese/Simplified translation of apt.
 # This file is put in the public domain.
+# Deng Xiyue <manphiz-guest@users.alioth.debian.org>, 2007
 # Tchaikov <tchaikov@sjtu.org>, 2005,2007.
 # Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004,2006
 #
@@ -7,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.23\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-17 05:49+0100\n"
-"PO-Revision-Date: 2007-03-29 17:14+0800\n"
-"Last-Translator: Kov Chai <tchaikov@sjtu.org>\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\n"
+"PO-Revision-Date: 2007-12-29 10:55+0800\n"
+"Last-Translator: Deng Xiyue <manphiz-guest@users.alioth.debian.org>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -56,9 +57,8 @@ msgid "Total distinct versions: "
 msgstr "按版本共计："
 
 #: cmdline/apt-cache.cc:295
-#, fuzzy
 msgid "Total Distinct Descriptions: "
-msgstr "按版本共计："
+msgstr "按说明共计："
 
 #: cmdline/apt-cache.cc:297
 msgid "Total dependencies: "
@@ -69,9 +69,8 @@ msgid "Total ver/file relations: "
 msgstr "按版本/文件关系共计："
 
 #: cmdline/apt-cache.cc:302
-#, fuzzy
 msgid "Total Desc/File relations: "
-msgstr "按版本/文件关系共计："
+msgstr "按说明/文件关系共计："
 
 #: cmdline/apt-cache.cc:304
 msgid "Total Provides mappings: "
@@ -159,9 +158,9 @@ msgstr "       %4i %s\n"
 #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 #: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144
-#, fuzzy, c-format
+#, c-format
 msgid "%s %s for %s compiled on %s %s\n"
-msgstr "%s %s for %s %s ，编译于 %s %s\n"
+msgstr "%s %s for %s 编译于 %s %s\n"
 
 #: cmdline/apt-cache.cc:1721
 msgid ""
@@ -725,7 +724,7 @@ msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
-"【警告】：下列的重要软件包将被卸载 \n"
+"【警告】：下列的基础软件包将被卸载。\n"
 "请勿尝试，除非您确实知道您在做什么！"
 
 #: cmdline/apt-get.cc:581
@@ -837,12 +836,12 @@ msgid "Need to get %sB of archives.\n"
 msgstr "需要下载 %sB 的软件包。\n"
 
 #: cmdline/apt-get.cc:847
-#, fuzzy, c-format
+#, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
 
 #: cmdline/apt-get.cc:850
-#, fuzzy, c-format
+#, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "解压缩后将会空出 %sB 的空间。\n"
 
@@ -919,7 +918,7 @@ msgstr "放弃安装。"
 #: cmdline/apt-get.cc:1053
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
-msgstr "注意，我选了 %s 而非 %s\n"
+msgstr "注意，选取 %s 而非 %s\n"
 
 #: cmdline/apt-get.cc:1063
 #, c-format
@@ -1006,42 +1005,40 @@ msgstr ""
 
 #: cmdline/apt-get.cc:1441
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
+msgstr "我们不应该进行删除，无法启动自动删除器"
 
 #: cmdline/apt-get.cc:1473
-#, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
-msgstr "下列【新】软件包将被安装："
+msgstr "下列软件包是自动安装的并且现在不再被使用了："
 
 #: cmdline/apt-get.cc:1475
 msgid "Use 'apt-get autoremove' to remove them."
-msgstr ""
+msgstr "使用'apt-get autoremove'来删除它们"
 
 #: cmdline/apt-get.cc:1480
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
-msgstr ""
+msgstr "似乎自动删除器毁掉了一些软件，这不应该发生。请向 apt 提交错误报告。"
 
 #: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763
 msgid "The following information may help to resolve the situation:"
 msgstr "下列的信息可能会对解决问题有所帮助："
 
 #: cmdline/apt-get.cc:1487
-#, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
-msgstr "内部错误，problem resolver 坏事了"
+msgstr "内部错误，自动删除器坏事了"
 
 #: cmdline/apt-get.cc:1506
 msgid "Internal error, AllUpgrade broke stuff"
-msgstr "内部错误，AllUpgrade 坏事了"
+msgstr "内部错误，全部升级坏事了"
 
 #: cmdline/apt-get.cc:1553
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't find task %s"
-msgstr "无法找到软件包 %s"
+msgstr "无法找到任务 %s"
 
 #: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704
 #, c-format
@@ -1054,9 +1051,9 @@ msgid "Note, selecting %s for regex '%s'\n"
 msgstr "注意，根据正则表达式“%2$s”选中了 %1$s\n"
 
 #: cmdline/apt-get.cc:1722
-#, fuzzy, c-format
+#, c-format
 msgid "%s set to manually installed.\n"
-msgstr "但是 %s 正要被安装"
+msgstr "%s 被设置为手动安装。\n"
 
 #: cmdline/apt-get.cc:1735
 msgid "You might want to run `apt-get -f install' to correct these:"
@@ -1120,7 +1117,7 @@ msgstr "完成"
 
 #: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996
 msgid "Internal error, problem resolver broke stuff"
-msgstr "内部错误，problem resolver 坏事了"
+msgstr "内部错误，问题解决器坏事了"
 
 #: cmdline/apt-get.cc:2096
 msgid "Must specify at least one package to fetch source for"
@@ -1238,7 +1235,6 @@ msgid "Supported modules:"
 msgstr "被支持模块："
 
 #: cmdline/apt-get.cc:2647
-#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1282,17 +1278,19 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 "用法： apt-get [选项] 命令\n"
-"       apt-get [选项] install|remove 包甲 [包乙 ...]\n"
-"       apt-get [选项] source 包甲 [包乙 ...]\n"
+"       apt-get [选项] install|remove 软件包1 [软件包2 ...]\n"
+"       apt-get [选项] source 软件包1 [软件包2 ...]\n"
 "\n"
 "apt-get 提供了一个用于下载和安装软件包的简易命令行界面。\n"
 "最常用命令是 update 和 install。\n"
 "\n"
 "命令：\n"
-"   update - 下载更新软件包列表信息\n"
+"   update - 取回更新的软件包列表信息\n"
 "   upgrade - 进行一次升级\n"
 "   install - 安装新的软件包(注：包名是 libc6 而非 libc6.deb)\n"
 "   remove - 卸载软件包\n"
+"   autoremove - 卸载所有自动安装且不再使用的软件包\n"
+"   purge - 卸载并清除软件包的配置\n"
 "   source - 下载源码包文件\n"
 "   build-dep - 为源码包配置所需的构建依赖关系\n"
 "   dist-upgrade - 发布版升级，见 apt-get(8)\n"
@@ -1300,6 +1298,7 @@ msgstr ""
 "   clean - 删除所有已下载的包文件\n"
 "   autoclean - 删除老版本的已下载的包文件\n"
 "   check - 核对以确认系统的依赖关系的完整性\n"
+"\n"
 "选项：\n"
 "  -h  本帮助文档。\n"
 "  -q  让输出可作为日志 - 不显示进度\n"
@@ -1657,9 +1656,9 @@ msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”"
 
 #: apt-inst/deb/debfile.cc:50
-#, fuzzy, c-format
+#, c-format
 msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
-msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”或者“%s”"
+msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”，“%s”或者“%s”"
 
 #: apt-inst/deb/debfile.cc:110
 #, c-format
@@ -2069,9 +2068,9 @@ msgid "Opening configuration file %s"
 msgstr "正在打开配置文件 %s"
 
 #: apt-pkg/contrib/configuration.cc:515
-#, fuzzy, c-format
+#, c-format
 msgid "Line %d too long (max %u)"
-msgstr "软件包来源档的第 %d 行超长了(长度限制为 %d)。"
+msgstr "第 %d 行超长了(长度限制为 %u)。"
 
 #: apt-pkg/contrib/configuration.cc:611
 #, c-format
@@ -2301,7 +2300,7 @@ msgstr "废弃"
 
 #: apt-pkg/pkgcache.cc:226
 msgid "Breaks"
-msgstr ""
+msgstr "破坏"
 
 #: apt-pkg/pkgcache.cc:237
 msgid "important"
@@ -2336,19 +2335,18 @@ msgid "Dependency generation"
 msgstr "生成依赖关系"
 
 #: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
-#, fuzzy
 msgid "Reading state information"
-msgstr "正在合并现有信息"
+msgstr "正在读取状态信息"
 
 #: apt-pkg/depcache.cc:219
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to open StateFile %s"
-msgstr "无法打开 %s"
+msgstr "无法打开状态文件 %s"
 
 #: apt-pkg/depcache.cc:225
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to write temporary StateFile %s"
-msgstr "无法写入文件 %s"
+msgstr "无法写入临时状态文件 %s"
 
 #: apt-pkg/tagfile.cc:102
 #, c-format
@@ -2537,9 +2535,9 @@ msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "处理 %s (UsePackage1)时出错"
 
 #: apt-pkg/pkgcachegen.cc:153
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "处理 %s (NewFileVer1)时出错"
+msgstr "处理 %s (NewFileDesc1)时出错"
 
 #: apt-pkg/pkgcachegen.cc:178
 #, c-format
@@ -2567,9 +2565,9 @@ msgid "Error occurred while processing %s (NewVersion2)"
 msgstr "处理 %s (NewVersion2)时出错"
 
 #: apt-pkg/pkgcachegen.cc:245
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "处理 %s (NewFileVer1)时出错"
+msgstr "处理 %s (NewFileDesc2)时出错"
 
 #: apt-pkg/pkgcachegen.cc:251
 msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2580,9 +2578,8 @@ msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "糟了，软件包版本的数量了超出本程序的处理能力。"
 
 #: apt-pkg/pkgcachegen.cc:257
-#, fuzzy
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "糟了，软件包版本的数量了超出本程序的处理能力。"
+msgstr "糟了，软件包说明的数量了超出本程序的处理能力。"
 
 #: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
@@ -2626,9 +2623,8 @@ msgid "MD5Sum mismatch"
 msgstr "MD5 校验和不符"
 
 #: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408
-#, fuzzy
 msgid "Hash Sum mismatch"
-msgstr "MD5 校验和不符"
+msgstr "Hash 校验和不符"
 
 #: apt-pkg/acquire-item.cc:1100
 msgid "There is no public key available for the following key IDs:\n"
@@ -2682,12 +2678,11 @@ msgstr "正在鉴别.. "
 #: apt-pkg/cdrom.cc:563
 #, c-format
 msgid "Stored label: %s\n"
-msgstr "å­\98æ¡£æ \87ç­¾ï¼\9a%s \n"
+msgstr "å·²å­\98æ¡£ç\9a\84æ \87ç­¾ï¼\9a%s\n"
 
 #: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841
-#, fuzzy
 msgid "Unmounting CD-ROM...\n"
-msgstr "正在卸载 CD-ROM 文件系统……"
+msgstr "正在卸载 CD-ROM...\n"
 
 #: apt-pkg/cdrom.cc:590
 #, c-format
@@ -2712,16 +2707,17 @@ msgid "Scanning disc for index files..\n"
 msgstr "正在光盘中查找索引文件..\n"
 
 #: apt-pkg/cdrom.cc:678
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Found %u package indexes, %u source indexes, %u translation indexes and %u "
 "signatures\n"
-msgstr "找到了 %i 个软件包索引、%i 个源代码包索引，和 %i 个数字签名\n"
+msgstr ""
+"找到了 %u 个软件包索引、%u 个源代码包索引、%u 个翻译索引和 %u 个数字签名\n"
 
 #: apt-pkg/cdrom.cc:715
-#, fuzzy, c-format
+#, c-format
 msgid "Found label '%s'\n"
-msgstr "存档标签：%s \n"
+msgstr "找到标签 '%s'\n"
 
 #: apt-pkg/cdrom.cc:744
 msgid "That is not a valid name, try again.\n"
@@ -2769,9 +2765,9 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不吻合\n"
 
 #: apt-pkg/deb/dpkgpm.cc:513
-#, fuzzy, c-format
+#, c-format
 msgid "Directory '%s' missing"
-msgstr "软件包列表的目录 %spartial 不见了。"
+msgstr "目录 %s 不见了"
 
 #: apt-pkg/deb/dpkgpm.cc:596
 #, c-format
@@ -2794,9 +2790,9 @@ msgid "Configuring %s"
 msgstr "正在配置 %s"
 
 #: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606
-#, fuzzy, c-format
+#, c-format
 msgid "Processing triggers for %s"
-msgstr "å¤\84ç\90\86ç\9b®å½\95 %s æ\97¶å\87ºé\94\99"
+msgstr "å\90¯å\8a¨å¯¹ %s ç\9a\84å¤\84ç\90\86"
 
 #: apt-pkg/deb/dpkgpm.cc:608
 #, c-format
@@ -2831,7 +2827,7 @@ msgstr "完全删除了 %s"
 
 #: apt-pkg/deb/dpkgpm.cc:775
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
-msgstr ""
+msgstr "无法写入日志。 openpty() 失败 (/dev/pts 没有 mount 上？)\n"
 
 #: methods/rred.cc:219
 msgid "Could not patch file"
@@ -2841,31 +2837,35 @@ msgstr "无法打开补丁文件"
 msgid "Connection closed prematurely"
 msgstr "连接被永久关闭"
 
-#, fuzzy
+#~ msgid "After unpacking %sB of additional disk space will be used.\n"
+#~ msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
+
+#~ msgid "After unpacking %sB disk space will be freed.\n"
+#~ msgstr "解压缩后将会空出 %sB 的空间。\n"
+
+#~ msgid "%s set to manual installed.\n"
+#~ msgstr "%s 已设置为手动安装。\n"
+
 #~ msgid "Line %d too long (max %d)"
-#~ msgstr "软件包来源档的第 %d 行超长了(长度限制为 %d)。"
+#~ msgstr "第 %d 行超长了(长度限制为 %d)"
 
-#, fuzzy
 #~ msgid "Error occured while processing %s (NewFileDesc1)"
-#~ msgstr "处理 %s (NewFileVer1)时出错"
+#~ msgstr "处理 %s (NewFileDesc1)时出错"
 
-#, fuzzy
 #~ msgid "Error occured while processing %s (NewFileDesc2)"
-#~ msgstr "处理 %s (NewFileVer1)时出错"
+#~ msgstr "处理 %s (NewFileDesc2)时出错"
 
-#, fuzzy
 #~ msgid "Stored label: %s \n"
 #~ msgstr "存档标签：%s \n"
 
-#, fuzzy
 #~ msgid ""
 #~ "Found %i package indexes, %i source indexes, %i translation indexes and %"
 #~ "i signatures\n"
-#~ msgstr "找到了 %i 个软件包索引、%i 个源代码包索引，和 %i 个数字签名\n"
+#~ msgstr ""
+#~ "找到了 %i 个软件包索引、%i 个源代码包索引，%i 个翻译索引和 %i 个数字签名\n"
 
-#, fuzzy
 #~ msgid "openpty failed\n"
-#~ msgstr "select 调用出错"
+#~ msgstr "openpty 失败\n"
 
 #~ msgid "File date has changed %s"
 #~ msgstr "文件 %s 的时间已被改动"

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 1f16960cd099a02dc38740792b06b8dfc17c75de..46fdc2ab325f1c1d9601bd00afd2fbd966edc1bd 100644 (file)
--- 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-12-17 05:49+0100\n"
+"POT-Creation-Date: 2007-12-17 10:36+0530\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"