* merged with apt--mvo--0

Patches applied:

 * bubulle@debian.org--2005/apt--main--0--patch-149
   Merge with Michael archive (Debian version)

 * bubulle@debian.org--2005/apt--main--0--patch-150
   Fix typo in apt-get.cc and update PO files

 * bubulle@debian.org--2005/apt--main--0--patch-151
   Update French translation (and document the update-po I ran previously)

 * bubulle@debian.org--2005/apt--main--0--patch-152
   Updated Slovak translation

 * bubulle@debian.org--2005/apt--main--0--patch-153
   Close the right bug for Slovak translation

 * bubulle@debian.org--2005/apt--main--0--patch-154
   French manpages translation update

 * bubulle@debian.org--2005/apt--main--0--patch-155
   Swedish translation update

 * bubulle@debian.org--2005/apt--main--0--patch-156
   Better makefile for more up-to-date PO and POT

 * bubulle@debian.org--2005/apt--main--0--patch-157
   Run make uupdate-po

 * bubulle@debian.org--2005/apt--main--0--patch-158
   Fix spaces errors in some translations

 * bubulle@debian.org--2005/apt--main--0--patch-159
   Patch to allow "make apt-all.pot" work in the baz archive

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-116
   * changelog updates

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-117
   * merged with bubulle

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-118
   * merged from bubulle

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-119
   * fix http data corruption (#280844)

 * mvo@debian.org--2005/apt--debian-experimental--0--patch-12
   * added http data corruption fix patch (#280844)

 * philippe.batailler@free.fr--2005/apt--main--0--patch-6
   Change apt.ent.fr

 * philippe.batailler@free.fr--2005/apt--main--0--patch-7
   Update manpages

diff --git a/buildlib/podomain.mak b/buildlib/podomain.mak
index e1ae0c805bcc2d4ce13a1e066b694e5d4ba97dc2..511a5cae278a352394d7a3fd184b5caeeee6f837 100644 (file)
--- a/buildlib/podomain.mak
+++ b/buildlib/podomain.mak
@@ -14,7 +14,7 @@ MKDIRS += $(PO_DOMAINS)/$(MY_DOMAIN)
 $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: SRC := $(addprefix $(SUBDIR)/,$(SOURCE))
 $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: makefile
        (echo $(SRC) | xargs -n1 echo) > $@
-binary program: $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list
+binary program clean: $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list
 
 veryclean: veryclean/$(LOCAL)
 veryclean/po/$(LOCAL): LIST := $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 5ff6d2f8f3a5c6a0804dbdffdcf8949abda2bfa2..abeb57c6f081f4aff4eaffaf7cd13a0d822ab2ae 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1956,7 +1956,7 @@ bool DoSource(CommandLine &CmdL)
            Fd.Close();
            if((string)sum.Result() == I->MD5Hash) 
            {
-              ioprintf(c1out,_("Skiping already downloaded file '%s'\n"),
+              ioprintf(c1out,_("Skipping already downloaded file '%s'\n"),
                        flNotDir(I->Path).c_str());
               continue;
            }

diff --git a/configure.in b/configure.in
index b975031e57ec2a6a3bb01d7f21ef8958f9d6cd44..0d80e5ed9a31eeaaef13a884ee96a26de5172ddb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.6.43.1")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.43.2")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

diff --git a/debian/changelog b/debian/changelog
index 694d91b680363e64149e1568978f898b03287cb4..020fe9813e75f91ede019acec48b54f70ffe0ffc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+apt (0.6.43.2) unstable; urgency=low
+
+  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-159:
+    - en_GB.po, de.po: fix spaces errors in "Ign " translations
+      Closes: #347258
+    - makefile: make update-po a pre-requisite of clean target so
+               that POT and PO files are always up-to-date
+    - sv.po: Completed to 511t. Closes: #346450
+    - sk.po: Completed to 511t. Closes: #346369
+    - fr.po: Completed to 511t
+    - *.po: Updated from sources (511 strings)
+  * add patch to fix http download corruption problem (thanks to
+    Petr Vandrovec, closes: #280844, #290694)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 10 Jan 2006 17:09:31 +0100
+
 apt (0.6.43.1) unstable; urgency=low
 
   * Merge bubulle@debian.org--2005/apt--main--0 up to patch-148:

diff --git a/doc/fr/apt-get.fr.8.xml b/doc/fr/apt-get.fr.8.xml
index 8832dd22eb5bb1f9dffdb595f800cea8c7caae69..cfaa76c7d57c4a46584ebdfaeeb75fc050ad819d 100644 (file)
--- a/doc/fr/apt-get.fr.8.xml
+++ b/doc/fr/apt-get.fr.8.xml
@@ -571,6 +571,11 @@ le guide APT.
 </para>
  </refsect1>
 
+ <refsect1><title>Diagnostic</title>
+   <para><command>apt-get</command> renvoie zéro après une opération normale, le décimal 100
+en cas d'erreur.</para>
+ </refsect1>
+
  &manbugs;
 &deux-traducteurs;
 </refentry>

diff --git a/doc/fr/apt-key.fr.8.xml b/doc/fr/apt-key.fr.8.xml
index 29ba237e2de092883db8789103ba79a9a1811771..73a61ea41067ac30925aa1f132aae83802b6a70a 100644 (file)
--- a/doc/fr/apt-key.fr.8.xml
+++ b/doc/fr/apt-key.fr.8.xml
@@ -18,7 +18,7 @@
  <!-- Man page title -->
  <refnamediv>
     <refname>apt-key</refname>
-    <refpurpose>APT key management utility</refpurpose>
+    <refpurpose>Utilitaire de gestion des clés</refpurpose>
  </refnamediv>
 
  <!-- Arguments -->
@@ -103,7 +103,7 @@ Debian et supprimer les cl
 
      <varlistentry><term><filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>
 </term>
-    <listitem><para>>Trousseau des clés fiables supprimées de l'archive Debian.</para></listitem>
+    <listitem><para>Trousseau des clés fiables supprimées de l'archive Debian.</para></listitem>
      </varlistentry>
 
    </variablelist>

diff --git a/doc/fr/apt.ent.fr b/doc/fr/apt.ent.fr
index 81130d9ef03e9953e36b969035f5b98efcf37a27..94398bb44cd2f82758b5bb7030240af4f40d19c7 100644 (file)
--- a/doc/fr/apt.ent.fr
+++ b/doc/fr/apt.ent.fr
@@ -188,8 +188,8 @@
 <!ENTITY manbugs "
  <refsect1><title>Bogues</title>
    <para>
-Voyez la <ulink url='http://bugs.debian.org/src:apt'> page concernant les bogues de APT</ulink>.  
-   Si vous voulez rapporter un bogue, consultez le texte 
+Voyez la <ulink url='http://bugs.debian.org/src:apt'> page concernant les bogues d'APT</ulink>.  
+   Si vous voulez signaler un bogue, consultez le texte 
    <filename>/usr/share/doc/debian/bug-reporting.txt</filename> ou utilisez la 
 commande &reportbug;.</para>
  </refsect1>

diff --git a/methods/http.cc b/methods/http.cc
index dc3f0b7639f7d5f34530b65a1adea7bb5b0eddcc..341de94e37ab046c3e2a1360bdd16f0f96a5c7dc 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -241,28 +241,23 @@ bool CircleBuf::WriteTillEl(string &Data,bool Single)
       if (Buf[I%Size] != '\n')
         continue;
       ++I;
-      if (I < InP  && Buf[I%Size] == '\r')
-         ++I;
       
       if (Single == false)
       {
-        if (Buf[I%Size] != '\n')
-           continue;
-         ++I;
          if (I < InP  && Buf[I%Size] == '\r')
             ++I;
+         if (I >= InP || Buf[I%Size] != '\n')
+            continue;
+         ++I;
       }
       
-      if (I > InP)
-        I = InP;
-      
       Data = "";
       while (OutP < I)
       {
         unsigned long Sz = LeftWrite();
         if (Sz == 0)
            return false;
-        if (I - OutP < LeftWrite())
+        if (I - OutP < Sz)
            Sz = I - OutP;
         Data += string((char *)(Buf + (OutP%Size)),Sz);
         OutP += Sz;

diff --git a/po/ChangeLog b/po/ChangeLog
index 80751e0f07c7a51eebb23c1537284036760d6ba9..068f614d3d0fd776f06a70408ef8cd82b9d65b5b 100644 (file)
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,26 @@
+2006-01-09 Jonas Koelker  <jonaskoelker@users.sourceforge.net>
+
+       * en_GB.po, de.po: fix spaces errors in "Ign " translations
+                          Closes: #347258
+
+2006-01-09  Thomas Huriaux  <thomas.huriaux@gmail.com>
+
+       * makefile: make update-po a pre-requisite of clean target so
+                   that POT and PO files are always up-to-date
+
+2006-01-08  Daniel Nylander  <yeager@lidkoping.net>
+
+       * sv.po: Completed to 511t. Closes: #346450
+
+2006-01-06  Peter Mann  <Peter.Mann@tuke.sk>
+
+       * sk.po: Completed to 511t. Closes: #346369
+
+2006-01-06  Christian Perrier  <bubulle@debian.org>
+
+       * *.po: Updated from sources (511 strings)
+       * fr.po: Completed to 511t
+
 2006-01-01  Samuele Giovanni Tonon  <samu@mclink.it>
 
        * it.po: Completed to 510t

diff --git a/po/de.po b/po/de.po
index a3a62a50a8573b6fa104f7b065388f07a75a6c8c..f0e9530e0ee6f25cec846ab637c66faa19f414a7 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -1310,7 +1310,7 @@ msgstr "Hole:"
 
 #: cmdline/acqprogress.cc:110
 msgid "Ign "
-msgstr "Ign  "
+msgstr "Ign "
 
 #: cmdline/acqprogress.cc:114
 msgid "Err "

diff --git a/po/en_GB.po b/po/en_GB.po
index a48d3cc83ec0e588c0fd5a10508bfce3f5c95023..c681c89f47f218dbde710d49c98093e42c6599e8 100644 (file)
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1275,7 +1275,7 @@ msgstr "Get: "
 
 #: cmdline/acqprogress.cc:110
 msgid "Ign "
-msgstr "Ign"
+msgstr "Ign "
 
 #: cmdline/acqprogress.cc:114
 msgid "Err "

diff --git a/po/fr.po b/po/fr.po
index cac24bd5ccb0d07e6686cd5e2eec57d0b63ddf47..8159dcbcace5b837ea802dde3307ef4862b02852 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,14 +2,14 @@
 # Advanced Package Transfer - APT message translation catalog
 # French messages
 # Pierre Machard <pmachard@tuxfamily.org>, 2002,2003,2004.
-# Christian Perrier <bubulle@debian.org>, 2004-2005.
+# Christian Perrier <bubulle@debian.org>, 2004-2005, 2006.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-01-04 18:51+0100\n"
-"PO-Revision-Date: 2005-11-30 08:56+0100\n"
+"PO-Revision-Date: 2006-01-06 08:54+0100\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -1106,9 +1106,9 @@ msgid "Unable to find a source package for %s"
 msgstr "Impossible de trouver une source de paquet pour %s"
 
 #: cmdline/apt-get.cc:1959
-#, fuzzy, c-format
+#, c-format
 msgid "Skiping already downloaded file '%s'\n"
-msgstr "Saut du décompactage des paquets sources déjà décompactés dans %s\n"
+msgstr "Saut du téléchargement du fichier « %s », déjà téléchargé\n"
 
 #: cmdline/apt-get.cc:1983
 #, c-format

diff --git a/po/makefile b/po/makefile
index 64573ceaea2efd3e644f43a66edb105401342b80..45e5b1e5abfdd21d63a6c6d2a44b44376f5a4476 100644 (file)
--- a/po/makefile
+++ b/po/makefile
@@ -62,7 +62,7 @@ $(MOFILES) : $(PO_DOMAINS)/%.mo : $(PO_DOMAINS)/%.po
 stats:
        for i in *.pot *.po; do echo -n "$$i: "; msgfmt --statistics $$i; done
 
-binary: $(POTFILES) $(PACKAGE)-all.pot $(MOFILES) update-po
+binary: $(POTFILES) $(PACKAGE)-all.pot $(MOFILES)
 
 .PHONY: update-po
 update-po: $(PACKAGE)-all.pot
@@ -74,7 +74,7 @@ update-po: $(PACKAGE)-all.pot
        done
 
 clean: clean/local
-clean/local:
+clean/local: update-po
        rm -f $(MOFILES) $(LANG_POFILES) $(PO)/*.d
 
 # Include the dependencies that are available

diff --git a/po/sk.po b/po/sk.po
index 86fce2bfd7ee790dc48d66a679f52b3b11c963f2..3b2fc47cff468582b9340cd390570e8b986f0180 100644 (file)
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-01-04 18:51+0100\n"
-"PO-Revision-Date: 2005-07-01 09:34+0200\n"
+"PO-Revision-Date: 2006-01-07 13:39+0100\n"
 "Last-Translator: Peter Mann <Peter.Mann@tuke.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
@@ -229,19 +229,15 @@ msgstr ""
 
 #: cmdline/apt-cdrom.cc:78
 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
+msgstr "Zadajte názov tohto disku, napríklad 'Debian 2.1r1 Disk 1'"
 
 #: cmdline/apt-cdrom.cc:93
-#, fuzzy
 msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-"Výmena média: Vložte disk nazvaný\n"
-" '%s'\n"
-"do mechaniky '%s' a stlačte Enter\n"
+msgstr "Vložte disk do mechaniky a stlačte Enter"
 
 #: cmdline/apt-cdrom.cc:117
 msgid "Repeat this process for the rest of the CDs in your set."
-msgstr ""
+msgstr "Zopakujte tento proces pre všetky CD v sade diskov."
 
 #: cmdline/apt-config.cc:41
 msgid "Arguments not in pairs"
@@ -703,7 +699,6 @@ msgid "%s (due to %s) "
 msgstr "%s (kvôli %s) "
 
 #: cmdline/apt-get.cc:546
-#, fuzzy
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -770,7 +765,7 @@ msgstr "UPOZORNENIE: Pri nasledovných balíkoch sa nedá overiť vierohodnosť!
 
 #: cmdline/apt-get.cc:693
 msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "Upozornenie o vierohodnosti bolo potlačené.\n"
 
 #: cmdline/apt-get.cc:700
 msgid "Install these packages without verification [y/N]? "
@@ -778,7 +773,7 @@ msgstr "Nainštalovať tieto nekontrolované balíky [y/N]? "
 
 #: cmdline/apt-get.cc:702
 msgid "Some packages could not be authenticated"
-msgstr "Nedala sa zistiť vierohodnoť niektorých balíkov"
+msgstr "Nedala sa zistiť vierohodnosť niektorých balíkov"
 
 #: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
 msgid "There are problems and -y was used without --force-yes"
@@ -786,16 +781,15 @@ msgstr "Nastali problémy a -y bolo použité bez --force-yes"
 
 #: cmdline/apt-get.cc:755
 msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
+msgstr "Vnútorná chyba, InstallPackages bolo volané s poškodenými balíkmi!"
 
 #: cmdline/apt-get.cc:764
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Je potrebné odstránenie balíka, ale funkcia Odstrániť je vypnutá."
 
 #: cmdline/apt-get.cc:775
-#, fuzzy
 msgid "Internal error, Ordering didn't finish"
-msgstr "Vnútorná chyba pri pridávaní diverzie"
+msgstr "Vnútorná chyba, Triedenie sa neukončilo"
 
 #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842
 msgid "Unable to lock the download directory"
@@ -809,6 +803,8 @@ msgstr "Nedá sa načítať zoznam zdrojov."
 #: cmdline/apt-get.cc:816
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
+"Nezvyčajná udalosť... Veľkosti nesúhlasia, pošlite e-mail na apt@packages."
+"debian.org"
 
 #: cmdline/apt-get.cc:821
 #, c-format
@@ -831,9 +827,9 @@ msgid "After unpacking %sB disk space will be freed.\n"
 msgstr "Po rozbalení sa na disku uvoľní %sB.\n"
 
 #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't determine free space in %s"
-msgstr "Na %s nemáte dostatok voľného miesta"
+msgstr "Na %s sa nedá zistiť veľkosť voľného miesta"
 
 #: cmdline/apt-get.cc:849
 #, c-format
@@ -849,13 +845,13 @@ msgid "Yes, do as I say!"
 msgstr "Áno, urob to, čo vravím!"
 
 #: cmdline/apt-get.cc:868
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
 "To continue type in the phrase '%s'\n"
 " ?] "
 msgstr ""
-"Možno sa chystáte vykonať niečo škodlivé\n"
+"Možno sa chystáte vykonať niečo škodlivé.\n"
 "Pre pokračovanie opíšte frázu '%s'\n"
 " ?]"
 
@@ -1069,9 +1065,8 @@ msgid "Done"
 msgstr "Hotovo"
 
 #: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
-#, fuzzy
 msgid "Internal error, problem resolver broke stuff"
-msgstr "Vnútorná chyba, AllUpgrade pokazil veci"
+msgstr "Vnútorná chyba, problem resolver pokazil veci"
 
 #: cmdline/apt-get.cc:1885
 msgid "Must specify at least one package to fetch source for"
@@ -1083,9 +1078,9 @@ msgid "Unable to find a source package for %s"
 msgstr "Nedá sa nájsť zdrojový balík pre %s"
 
 #: cmdline/apt-get.cc:1959
-#, fuzzy, c-format
+#, c-format
 msgid "Skiping already downloaded file '%s'\n"
-msgstr "Preskakuje sa rozbalenie už rozbaleného zdroja v %s\n"
+msgstr "Preskakuje sa už stiahnutý súbor '%s'\n"
 
 #: cmdline/apt-get.cc:1983
 #, c-format
@@ -1124,7 +1119,7 @@ msgstr "Príkaz pre rozbalenie '%s' zlyhal.\n"
 #: cmdline/apt-get.cc:2069
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "Skontrolujte, či je nainštalovaný balík 'dpkg-dev'.\n"
 
 #: cmdline/apt-get.cc:2086
 #, c-format
@@ -1440,9 +1435,9 @@ msgid "Duplicate conf file %s/%s"
 msgstr "Duplicitný konfiguračný súbor %s/%s"
 
 #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to write file %s"
-msgstr "Zápis do súboru %s zlyhal"
+msgstr "Zápis súboru %s zlyhal"
 
 #: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
 #, c-format
@@ -1588,7 +1583,6 @@ msgid "Internal error adding a diversion"
 msgstr "Vnútorná chyba pri pridávaní diverzie"
 
 #: apt-inst/deb/dpkgdb.cc:383
-#, fuzzy
 msgid "The pkg cache must be initialized first"
 msgstr "Vyrovnávacia pamäť balíkov sa musí najprv inicializovať"
 
@@ -1661,13 +1655,12 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "Nedá sa odpojiť CD-ROM v %s - možno sa ešte používa."
 
 #: methods/cdrom.cc:169
-#, fuzzy
 msgid "Disk not found."
-msgstr "Súbor nebol nájdený"
+msgstr "Disk sa nenašiel."
 
 #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
 msgid "File not found"
-msgstr "Súbor nebol nájdený"
+msgstr "Súbor sa nenašiel"
 
 #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
 #: methods/gzip.cc:142
@@ -1889,40 +1882,42 @@ msgstr "Nedá sa pripojiť k %s %s:"
 #: methods/gpgv.cc:92
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
+"CHYBA: zoznam argumentov z Acquire::gpgv::Options je príliš dlhý. Ukončuje "
+"sa."
 
 #: methods/gpgv.cc:191
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr ""
+msgstr "Vnútorná chyba: Správna signatúra, ale sa nedá zistiť odtlačok kľúča?!"
 
 #: methods/gpgv.cc:196
 msgid "At least one invalid signature was encountered."
-msgstr ""
+msgstr "Bola zistená aspoň jedna nesprávna signatúra."
 
 #. FIXME String concatenation considered harmful.
 #: methods/gpgv.cc:201
-#, fuzzy
 msgid "Could not execute "
-msgstr "Zámok %s sa nedá získať"
+msgstr "Nedá sa spustiť "
 
 #: methods/gpgv.cc:202
 msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+msgstr " na kontrolu signatúry (je nainštalované gnupg?)"
 
 #: methods/gpgv.cc:206
 msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Neznáma chyba pri spustení gpgv"
 
 #: methods/gpgv.cc:237
-#, fuzzy
 msgid "The following signatures were invalid:\n"
-msgstr "Nainštalujú sa nasledovné extra balíky:"
+msgstr "Nasledovné signatúry sú neplatné:\n"
 
 #: methods/gpgv.cc:244
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
+"Nasledovné signatúry sa nedajú overiť, pretože nie je dostupný verejný "
+"kľúč:\n"
 
 #: methods/gzip.cc:57
 #, c-format
@@ -2346,7 +2341,7 @@ msgid "Malformed line %u in source list %s (type)"
 msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)"
 
 #: apt-pkg/sourcelist.cc:244
-#, fuzzy, c-format
+#, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Typ '%s' je neznámy na riadku %u v zozname zdrojov %s"
 
@@ -2387,7 +2382,7 @@ msgstr ""
 
 #: apt-pkg/algorithms.cc:1061
 msgid "Unable to correct problems, you have held broken packages."
-msgstr "Problémy sa nedajú opraviť, niektoré balíky držíte v narušenom stave."
+msgstr "Problémy sa nedajú opraviť, niektoré balíky držíte v poškodenom stave."
 
 #: apt-pkg/acquire.cc:62
 #, c-format
@@ -2402,7 +2397,7 @@ msgstr "Archívny adresár %spartial chýba."
 #: apt-pkg/acquire.cc:821
 #, c-format
 msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+msgstr "Sťahuje sa %li.súbor z %li (zostáva %s)"
 
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
@@ -2415,12 +2410,9 @@ msgid "Method %s did not start correctly"
 msgstr "Spôsob %s nebol správne spustený"
 
 #: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Výmena média: Vložte disk nazvaný\n"
-" '%s'\n"
-"do mechaniky '%s' a stlačte Enter\n"
+msgstr "Vložte disk nazvaný '%s' do mechaniky '%s' a stlačte Enter."
 
 #: apt-pkg/init.cc:120
 #, c-format
@@ -2466,39 +2458,39 @@ msgid "Cache has an incompatible versioning system"
 msgstr "Vyrovnávacia pamäť má nezlučiteľný systém na správu verzií"
 
 #: apt-pkg/pkgcachegen.cc:117
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Chyba pri spracovaní %s (NewPackage)"
+msgstr "Chyba pri spracovávaní %s (NewPackage)"
 
 #: apt-pkg/pkgcachegen.cc:129
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Chyba pri spracovaní %s (UsePackage1)"
+msgstr "Chyba pri spracovávaní %s (UsePackage1)"
 
 #: apt-pkg/pkgcachegen.cc:150
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Chyba pri spracovaní %s (UsePackage2)"
+msgstr "Chyba pri spracovávaní %s (UsePackage2)"
 
 #: apt-pkg/pkgcachegen.cc:154
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Chyba pri spracovaní %s (NewFileVer1)"
+msgstr "Chyba pri spracovávaní %s (NewFileVer1)"
 
 #: apt-pkg/pkgcachegen.cc:184
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (NewVersion1)"
-msgstr "Chyba pri spracovaní %s (NewVersion1)"
+msgstr "Chyba pri spracovávaní %s (NewVersion1)"
 
 #: apt-pkg/pkgcachegen.cc:188
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Chyba pri spracovaní %s (UsePackage3)"
+msgstr "Chyba pri spracovávaní %s (UsePackage3)"
 
 #: apt-pkg/pkgcachegen.cc:192
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Chyba pri spracovaní %s (NewVersion2)"
+msgstr "Chyba pri spracovávaní %s (NewVersion2)"
 
 #: apt-pkg/pkgcachegen.cc:207
 msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2515,14 +2507,14 @@ msgstr ""
 "Fíha, prekročili ste počet závislostí, ktoré toto APT zvládne spracovať."
 
 #: apt-pkg/pkgcachegen.cc:241
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Chyba pri spracovaní %s (FindPkg)"
+msgstr "Chyba pri spracovávaní %s (FindPkg)"
 
 #: apt-pkg/pkgcachegen.cc:254
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Chyba pri spracovaní %s (CollectFileProvides)"
+msgstr "Chyba pri spracovávaní %s (CollectFileProvides)"
 
 #: apt-pkg/pkgcachegen.cc:260
 #, c-format
@@ -2680,54 +2672,54 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "Zapísaných %i záznamov s %i chýbajúcimi a %i chybnými súbormi\n"
 
 #: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing %s"
-msgstr "Otvára sa %s"
+msgstr "Pripravuje sa %s"
 
 #: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
 msgid "Unpacking %s"
-msgstr "Otvára sa %s"
+msgstr "Rozbaľuje sa %s"
 
 #: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing to configure %s"
-msgstr "Otvára sa konfiguračný súbor %s"
+msgstr "Pripravuje sa nastavenie %s"
 
 #: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
 msgid "Configuring %s"
-msgstr "Pripája sa k %s"
+msgstr "Nastavuje sa %s"
 
 #: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
 msgid "Installed %s"
-msgstr "  Nainštalovaná verzia: "
+msgstr "Nainštalovaný balík %s"
 
 #: apt-pkg/deb/dpkgpm.cc:371
 #, c-format
 msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "Pripravuje sa odstránenie %s"
 
 #: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
 msgid "Removing %s"
-msgstr "Otvára sa %s"
+msgstr "Odstraňuje sa %s"
 
 #: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
 msgid "Removed %s"
-msgstr "Odporúča"
+msgstr "Odstránený balík %s"
 
 #: apt-pkg/deb/dpkgpm.cc:378
 #, c-format
 msgid "Preparing for remove with config %s"
-msgstr ""
+msgstr "Pripravuje sa odstránenie balíka %s aj s konfiguráciou"
 
 #: apt-pkg/deb/dpkgpm.cc:379
 #, c-format
 msgid "Removed with config %s"
-msgstr ""
+msgstr "Odstránený balík %s aj s konfiguráciou"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"

diff --git a/po/sv.po b/po/sv.po
index 2180b1b1a68fb275bf90a5956d42899e3964170d..ee87218aa4b8540d7b5b0de21d37802412db6a5e 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,13 +1,14 @@
 # Advanced Package Tool - APT message translation catalog
 # Swedish messages
 # Peter Karlsson <peterk@debian.org>, 2002-2005.
+# Daniel Nylander <po@danielnylander.se>, 2005.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-01-04 18:51+0100\n"
-"PO-Revision-Date: 2005-12-19 19:01+0100\n"
+"PO-Revision-Date: 2006-01-08 03:25+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -1088,9 +1089,9 @@ msgid "Unable to find a source package for %s"
 msgstr "Kunde inte hitta något källkodspaket för %s"
 
 #: cmdline/apt-get.cc:1959
-#, fuzzy, c-format
+#, c-format
 msgid "Skiping already downloaded file '%s'\n"
-msgstr "Packar inte upp redan redan uppackad källkod i %s\n"
+msgstr "Hoppar över redan nedladdad fil \"%s\"\n"
 
 #: cmdline/apt-get.cc:1983
 #, c-format