summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2006-01-10 15:51:33 +0000
committerMichael Vogt <michael.vogt@ubuntu.com>2006-01-10 15:51:33 +0000
commit610a00396d7bb5c9412cdecdc645be2f54a7188b (patch)
tree66ff0b689f9f402de09ed0be0334b6d928ca095c
parent30354d7eafc5f57a477ae0fd19faa21cb0c149eb (diff)
parent6f0bde75a27674763fb0542e9acd35bac18c1710 (diff)
* merged from bubulle
Patches applied: * 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 * 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
-rw-r--r--buildlib/podomain.mak2
-rw-r--r--debian/changelog14
-rw-r--r--doc/fr/apt-get.fr.8.xml5
-rw-r--r--doc/fr/apt-key.fr.8.xml4
-rw-r--r--doc/fr/apt.ent.fr4
-rw-r--r--po/ChangeLog18
-rw-r--r--po/de.po2
-rw-r--r--po/en_GB.po2
-rw-r--r--po/fr.po76
-rw-r--r--po/makefile4
-rw-r--r--po/sk.po152
-rw-r--r--po/sv.po7
12 files changed, 172 insertions, 118 deletions
diff --git a/buildlib/podomain.mak b/buildlib/podomain.mak
index e1ae0c805..511a5cae2 100644
--- 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/debian/changelog b/debian/changelog
index 694d91b68..5e14a92f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+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)
+
+ --
+
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 8832dd22e..cfaa76c7d 100644
--- 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 29ba237e2..73a61ea41 100644
--- 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�s qui sont p�rim�es.
<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 81130d9ef..94398bb44 100644
--- 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/po/ChangeLog b/po/ChangeLog
index c7eed64a1..068f614d3 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,21 @@
+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)
diff --git a/po/de.po b/po/de.po
index a3a62a50a..f0e9530e0 100644
--- 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 a48d3cc83..c681c89f4 100644
--- 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 6d88caebc..8159dcbca 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -235,11 +235,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."
@@ -315,7 +317,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:167 ftparchive/apt-ftparchive.cc:341
msgid "Package extension list is too long"
@@ -431,7 +434,8 @@ msgstr "Aucune s�lection ne correspond"
#: ftparchive/apt-ftparchive.cc:835
#, 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:45
#, c-format
@@ -797,7 +801,8 @@ msgstr "Erreur interne, ��InstallPackages�� appel� avec des paquets cass�s."
#: cmdline/apt-get.cc:764
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:775
msgid "Internal error, Ordering didn't finish"
@@ -831,7 +836,8 @@ msgstr "Il est n�cessaire de prendre %so dans les archives.\n"
#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
-msgstr "Apr�s d�paquetage, %so d'espace disque suppl�mentaires seront utilis�s.\n"
+msgstr ""
+"Apr�s d�paquetage, %so d'espace disque suppl�mentaires seront utilis�s.\n"
#: cmdline/apt-get.cc:832
#, c-format
@@ -902,7 +908,8 @@ msgstr ""
#: cmdline/apt-get.cc:990
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:995
msgid "Unable to correct missing packages."
@@ -964,7 +971,8 @@ msgstr "Aucun paquet ne correspond au paquet %s"
#: cmdline/apt-get.cc:1133
#, 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:1141
#, c-format
@@ -1018,7 +1026,8 @@ msgstr "Note, s�lectionne %s pour l'expression rationnelle ��%s��\n"
#: cmdline/apt-get.cc:1555
msgid "You might want to run `apt-get -f install' to correct these:"
-msgstr "Vous pouvez lancer ��apt-get -f install�� pour corriger ces probl�mes�:"
+msgstr ""
+"Vous pouvez lancer ��apt-get -f install�� pour corriger ces probl�mes�:"
#: cmdline/apt-get.cc:1558
msgid ""
@@ -1198,7 +1207,8 @@ msgstr "Impossible de satisfaire les d�pendances %s pour %s�: %s"
#: cmdline/apt-get.cc:2347
#, 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:2351
msgid "Failed to process build dependencies"
@@ -1381,7 +1391,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."
@@ -1643,7 +1654,8 @@ msgstr "Ce n'est pas une archive DEB valide, partie ��%s�� manquante"
#: apt-inst/deb/debfile.cc:52
#, c-format
msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
-msgstr "Ce n'est pas une archive DEB valide, elle n'a pas de membre ��%s�� ou ��%s��"
+msgstr ""
+"Ce n'est pas une archive DEB valide, elle n'a pas de membre ��%s�� ou ��%s��"
#: apt-inst/deb/debfile.cc:112
#, c-format
@@ -1746,7 +1758,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
@@ -1783,7 +1796,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."
@@ -1915,10 +1929,12 @@ msgstr "Impossible de se connecter � %s %s�:"
#: methods/gpgv.cc:92
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:191
-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�."
@@ -2352,12 +2368,14 @@ msgstr "Ligne %lu mal form�e dans la liste des sources %s (analyse de l'URI)"
#: apt-pkg/sourcelist.cc:105
#, 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:112
#, 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:203
#, c-format
@@ -2377,12 +2395,14 @@ msgstr "Ligne %u mal form�e dans la liste des sources %s (type)"
#: apt-pkg/sourcelist.cc:244
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Le type ��%s�� est inconnu sur la ligne %u dans la liste des sources %s"
+msgstr ""
+"Le type ��%s�� est inconnu sur la ligne %u dans la liste des sources %s"
#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, 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:402
#, c-format
@@ -2403,7 +2423,8 @@ msgstr "Le type de fichier d'index ��%s�� n'est pas accept�"
#: apt-pkg/algorithms.cc:241
#, 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."
@@ -2470,7 +2491,8 @@ msgstr "Impossible de localiser %s."
#: apt-pkg/srcrecords.cc:48
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:73
msgid "The package lists or status file could not be parsed or opened."
@@ -2544,7 +2566,8 @@ msgstr ""
#: apt-pkg/pkgcachegen.cc:210
msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Vous avez d�pass� le nombre de versions que cet APT est capable de traiter."
+msgstr ""
+"Vous avez d�pass� le nombre de versions que cet APT est capable de traiter."
#: apt-pkg/pkgcachegen.cc:213
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
@@ -2580,7 +2603,8 @@ msgstr "Assemblage des fichiers list�s dans les champs Provides"
#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
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:126
#, c-format
@@ -2612,7 +2636,8 @@ msgstr ""
#: apt-pkg/acquire-item.cc:814
#, 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."
@@ -2775,4 +2800,3 @@ msgstr "%s purg�"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Connexion ferm�e pr�matur�ment"
-
diff --git a/po/makefile b/po/makefile
index 64573ceae..45e5b1e5a 100644
--- 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 86fce2bfd..3b2fc47cf 100644
--- 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 2180b1b1a..ee87218aa 100644
--- 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