summaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
authorPablo Saratxaga <pablo@mandriva.com>2003-05-15 14:04:26 +0000
committerPablo Saratxaga <pablo@mandriva.com>2003-05-15 14:04:26 +0000
commit9119a631c11e9c4911fbecf9863b5624afcc1f11 (patch)
treeea3c84bbddabed866fa64b7cef0c874c247425a8 /po
parent0aeab6cd797ca4de76dfa22d1eb472d99088ba66 (diff)
downloadurpmi-9119a631c11e9c4911fbecf9863b5624afcc1f11.tar
urpmi-9119a631c11e9c4911fbecf9863b5624afcc1f11.tar.gz
urpmi-9119a631c11e9c4911fbecf9863b5624afcc1f11.tar.bz2
urpmi-9119a631c11e9c4911fbecf9863b5624afcc1f11.tar.xz
urpmi-9119a631c11e9c4911fbecf9863b5624afcc1f11.zip
updated pot file
Diffstat (limited to 'po')
-rw-r--r--po/af.po12
-rw-r--r--po/ar.po18
-rw-r--r--po/az.po12
-rw-r--r--po/bg.po12
-rw-r--r--po/bs.po12
-rw-r--r--po/ca.po18
-rw-r--r--po/cs.po18
-rw-r--r--po/cy.po18
-rw-r--r--po/da.po107
-rw-r--r--po/de.po18
-rw-r--r--po/el.po18
-rw-r--r--po/eo.po12
-rw-r--r--po/es.po18
-rw-r--r--po/et.po18
-rw-r--r--po/eu.po18
-rw-r--r--po/fi.po18
-rw-r--r--po/fr.po18
-rw-r--r--po/ga.po12
-rw-r--r--po/gl.po12
-rw-r--r--po/he.po18
-rw-r--r--po/hr.po12
-rw-r--r--po/hu.po18
-rw-r--r--po/id.po18
-rw-r--r--po/is.po12
-rw-r--r--po/it.po18
-rw-r--r--po/ja.po341
-rw-r--r--po/ka.po12
-rw-r--r--po/ko.po12
-rw-r--r--po/lt.po12
-rw-r--r--po/lv.po18
-rw-r--r--po/ms.po12
-rw-r--r--po/mt.po18
-rw-r--r--po/nl.po18
-rw-r--r--po/no.po18
-rw-r--r--po/pl.po18
-rw-r--r--po/pt.po18
-rw-r--r--po/pt_BR.po18
-rw-r--r--po/ro.po18
-rw-r--r--po/ru.po18
-rw-r--r--po/sk.po18
-rw-r--r--po/sl.po18
-rw-r--r--po/sr.po18
-rw-r--r--po/sr@Latn.po18
-rw-r--r--po/sv.po18
-rw-r--r--po/tg.po12
-rw-r--r--po/th.po18
-rw-r--r--po/tr.po18
-rw-r--r--po/uk.po18
-rw-r--r--po/uz.po18
-rw-r--r--po/vi.po18
-rw-r--r--po/wa.po18
-rw-r--r--po/zh_CN.po18
-rw-r--r--po/zh_TW.po18
53 files changed, 515 insertions, 767 deletions
diff --git a/po/af.po b/po/af.po
index 89e51057..068e462a 100644
--- a/po/af.po
+++ b/po/af.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: Fri May 19 2000 13:02:12+0200\n"
"Last-Translator: Schalk W. Cronj� <schalkc@ntaba.co.za>\n"
"Language-Team: Afrikaans <mandrake@af.org.za>\n"
@@ -175,16 +175,6 @@ msgid "unable to access rpm file [%s]"
msgstr ""
#: ../urpm.pm:1
-#, c-format
-msgid "%s conflicts with %s"
-msgstr ""
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr ""
-
-#: ../urpm.pm:1
#, fuzzy, c-format
msgid "unable to install package %s"
msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
diff --git a/po/ar.po b/po/ar.po
index 310ed4fb..c823fa51 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2001-12-20 23:13GMT+3\n"
"Last-Translator: Mohammed Gamal <f2c2001@yahoo.com>\n"
"Language-Team: Arabic\n"
@@ -182,16 +182,6 @@ msgstr "لم يمكن الوصول الى ملف rpm [%s]"
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "%s يتعارض مع %s"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "%s يُحتاج اليه من قبل %s"
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "تعذر تثبيث الحزمة %s"
@@ -1859,6 +1849,12 @@ msgstr "فشل scp في المستضيف %s"
msgid "host %s does not have a good version of urpmi"
msgstr "المستضيف %s لا يحتوي على اصدار جيد من urpmi"
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s يتعارض مع %s"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "%s يُحتاج اليه من قبل %s"
+
#~ msgid "ignoring option \"%s\" not used"
#~ msgstr "ignoring option \"%s\" not used"
diff --git a/po/az.po b/po/az.po
index 437dcec8..56983f3f 100644
--- a/po/az.po
+++ b/po/az.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2001-11-14 17:06GMT+0200\n"
"Last-Translator: Vasif İsmayıloğlu MD <azerb_linux@hotmail.com>\n"
"Language-Team: Azerbaijani Turkic <linuxaz@azerimail.net>\n"
@@ -188,16 +188,6 @@ msgid "unable to access rpm file [%s]"
msgstr "rpm faylı [%s] çatıla bilmir"
#: ../urpm.pm:1
-#, c-format
-msgid "%s conflicts with %s"
-msgstr ""
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr ""
-
-#: ../urpm.pm:1
#, fuzzy, c-format
msgid "unable to install package %s"
msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 2e0c2cb3..c98be934 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2000-01-30 17:59+0100\n"
"Last-Translator: Boyan Ivanov <boyan17@bulgaria.com>\n"
"Language-Team: Bulgarian\n"
@@ -205,16 +205,6 @@ msgid "unable to access rpm file [%s]"
msgstr ""
#: ../urpm.pm:1
-#, c-format
-msgid "%s conflicts with %s"
-msgstr ""
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr ""
-
-#: ../urpm.pm:1
#, fuzzy, c-format
msgid "unable to install package %s"
msgstr "���� superuser-� ��� ������� �� ��������� ������� ������"
diff --git a/po/bs.po b/po/bs.po
index 6f543682..b2d22545 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2001-09-19 13:34GMT\n"
"Last-Translator: Amila Akagi� <bono@lugbih.org>\n"
"Language-Team: Bosnian <lokal-subscribe@lugbih.org>\n"
@@ -178,16 +178,6 @@ msgid "unable to access rpm file [%s]"
msgstr "ne mogu kreirati medij \"%s\"\n"
#: ../urpm.pm:1
-#, c-format
-msgid "%s conflicts with %s"
-msgstr ""
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr ""
-
-#: ../urpm.pm:1
#, fuzzy, c-format
msgid "unable to install package %s"
msgstr "Jedino super korisnik (root) mo�e instalirati lokalne pakete"
diff --git a/po/ca.po b/po/ca.po
index 96a7f2e4..23edd421 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2002-09-05 20:23+0200\n"
"Last-Translator: Softcatal� <traddrake@softcatala.org>\n"
"Language-Team: Catalan <info@softcatala.org>\n"
@@ -195,16 +195,6 @@ msgstr "no s'ha pogut accedir al fitxer rpm [%s]"
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "%s conflicteix amb %s"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "%s �s necessitat per %s"
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "no s'ha pogut instal�lar el paquet %s"
@@ -1912,6 +1902,12 @@ msgstr "La instal�laci� ha fallat en el node %s"
msgid "host %s does not have a good version of urpmi"
msgstr "ordinador central %s no t� una bona versi� de urpmi"
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s conflicteix amb %s"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "%s �s necessitat per %s"
+
#~ msgid "Remove them all?"
#~ msgstr "Esborrar-los tots?"
diff --git a/po/cs.po b/po/cs.po
index 33eb3762..fdec0add 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi-cs\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2003-03-06 15:37GMT+0100\n"
"Last-Translator: Radek Vybíral <Radek.Vybiral@vsb.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
@@ -191,16 +191,6 @@ msgstr "nelze zpřístupnit rpm soubor [%s]"
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "%s je v konfliktu s %s"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "%s je vyžadováno %s"
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "nelze nainstalovat balíček %s"
@@ -1889,6 +1879,12 @@ msgstr "selhalo scp na počítači %s"
msgid "host %s does not have a good version of urpmi"
msgstr "počítač %s nemá správnou verzi programu urpmi"
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s je v konfliktu s %s"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "%s je vyžadováno %s"
+
#~ msgid "Remove them all?"
#~ msgstr "Odebrat všechny?"
diff --git a/po/cy.po b/po/cy.po
index c82ade97..da885a11 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2003-03-02 17:16-0000\n"
"Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
"Language-Team: Cymraeg/Welsh <rhoslyn.prys@meddal.org.uk>\n"
@@ -195,16 +195,6 @@ msgid "unable to access rpm file [%s]"
msgstr "Methu rhedeg porwr"
#: ../urpm.pm:1
-#, c-format
-msgid "%s conflicts with %s"
-msgstr "Mae %s yn gwrthdaro gyda %s"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "Mae angen %s ar %s"
-
-#: ../urpm.pm:1
#, fuzzy, c-format
msgid "unable to install package %s"
msgstr "Rhaid eich bod yn wraidd i osod pecyn."
@@ -1792,3 +1782,9 @@ msgstr "methodd y gosodiad"
#, fuzzy, c-format
msgid "host %s does not have a good version of urpmi"
msgstr "nid oes gan y gwesteiwr fersiwn dda o urpmi"
+
+#~ msgid "%s conflicts with %s"
+#~ msgstr "Mae %s yn gwrthdaro gyda %s"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "Mae angen %s ar %s"
diff --git a/po/da.po b/po/da.po
index 77a8c7ac..c7a991dc 100644
--- a/po/da.po
+++ b/po/da.po
@@ -11,7 +11,7 @@
msgid ""
msgstr ""
"Project-Id-Version: da\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2003-05-15 04:13+0200\n"
"Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
@@ -51,14 +51,16 @@ msgstr "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
msgid ""
"This is free software and may be redistributed under the terms of the GNU "
"GPL."
-msgstr "Dette er frit programmel og kan redistribueres under vilk�rene for GNU GPL."
+msgstr ""
+"Dette er frit programmel og kan redistribueres under vilk�rene for GNU GPL."
#: placeholder.h:21 placeholder.h:38
msgid "usage: urpmf [options] <file>"
msgstr "brug: urpmf [flag] [<fil>]"
#: placeholder.h:22
-msgid " --quiet - do not print tag name (default if no tag given on command"
+msgid ""
+" --quiet - do not print tag name (default if no tag given on command"
msgstr ""
" --quiet - skriv ikke m�rkenavn (standard hvis intet m�rke angivet "
"p� kommando"
@@ -72,7 +74,8 @@ msgid " --all - print all tags."
msgstr " --all - skriv alle m�rker."
#: placeholder.h:25
-msgid " --name - print tag name: rpm filename (assumed if no tag given on"
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on"
msgstr ""
" --name - skriv m�rkenavn: rpm filnavn (antaget hvis intet m�rke "
"givet p�"
@@ -114,12 +117,16 @@ msgid " --files - print tag files: all files (multiple lines)."
msgstr " --files - skriv m�rke-filer: alle filer (flere linjer)."
#: placeholder.h:35
-msgid " --conflicts - print tag conflicts: all conflicts (multiple lines)."
-msgstr " --conflicts - skriv m�rke-konflikter: alle konflikter (flere linjer)."
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines)."
+msgstr ""
+" --conflicts - skriv m�rke-konflikter: alle konflikter (flere linjer)."
#: placeholder.h:36
-msgid " --obsoletes - print tag obsoletes: all obsoletes (multiple lines)."
-msgstr " --obsoletes - skriv m�rke-for�ldede: alle for�ldede (flere linjer)."
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr ""
+" --obsoletes - skriv m�rke-for�ldede: alle for�ldede (flere linjer)."
#: placeholder.h:37
msgid " --prereqs - print tag prereqs: all prereqs (multiple lines)."
@@ -186,16 +193,6 @@ msgstr "kunne ikke n� rpm fil [%s]"
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "%s er i modstrid med %s"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "%s beh�ves af %s"
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "kunne ikke installere pakke %s"
@@ -221,8 +218,11 @@ msgstr "kan ikke oprette transaktion"
#: ../urpm.pm:1
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "oprettede transaktion for installering p� %s (fjern=%d, install�r=%d, opgrad�r=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"oprettede transaktion for installering p� %s (fjern=%d, install�r=%d, "
+"opgrad�r=%d)"
#: ../urpm.pm:1 ../urpmi:1
#, c-format
@@ -694,12 +694,14 @@ msgstr "kunne ikke bestemme medie for denne hdlist-fil [%s]"
#: ../urpm.pm:1
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "kunne ikke tage medie \"%s\" i beregning da ingen listefil [%s] eksisterer"
+msgstr ""
+"kunne ikke tage medie \"%s\" i beregning da ingen listefil [%s] eksisterer"
#: ../urpm.pm:1
#, c-format
msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr "Kunne ikke bruge navnet '%s' for navnl�st medium fordi det allerede er brugt"
+msgstr ""
+"Kunne ikke bruge navnet '%s' for navnl�st medium fordi det allerede er brugt"
#: ../urpm.pm:1
#, c-format
@@ -856,7 +858,8 @@ msgstr " --parallel - distribueret urpmi over maskiner med alias.\n"
#: ../urpme:1 ../urpmi:1
#, c-format
-msgid " --test - verify if the installation can be achieved correctly.\n"
+msgid ""
+" --test - verify if the installation can be achieved correctly.\n"
msgstr " --test - afpr�v om installationen kan udf�res korrekt.\n"
#: ../urpme:1 ../urpmi:1
@@ -912,13 +915,17 @@ msgstr " ! - negation, sand hvis udtryk er falsk.\n"
#: ../urpmf:1
#, c-format
-msgid " -o - binary OR operator, true if one expression is true.\n"
-msgstr " -o - bin�r ELLER-operator, sand hvis et udtryk er sandt.\n"
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+" -o - bin�r ELLER-operator, sand hvis et udtryk er sandt.\n"
#: ../urpmf:1
#, c-format
-msgid " -a - binary AND operator, true if both expression are true.\n"
-msgstr " -a - bin�r OG-operator, sand hvis begge udtryk er sande.\n"
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+" -a - bin�r OG-operator, sand hvis begge udtryk er sande.\n"
#: ../urpmf:1
#, c-format
@@ -1050,8 +1057,10 @@ msgstr " --synthesis - brug synthesis angivet i stedet for urpmi-db.\n"
#: ../urpmf:1 ../urpmi:1 ../urpmq:1
#, c-format
-msgid " --sortmedia - sort media according to substrings separated by comma.\n"
-msgstr " --sortmedia - sort�r medier if�lge delstrenge, adskilt med komma.\n"
+msgid ""
+" --sortmedia - sort media according to substrings separated by comma.\n"
+msgstr ""
+" --sortmedia - sort�r medier if�lge delstrenge, adskilt med komma.\n"
#: ../urpmf:1 ../urpmi:1 ../urpmq:1
#, c-format
@@ -1293,7 +1302,8 @@ msgstr "Forkert proxy-erkl�ring p� kommandolinje\n"
#: ../urpmi:1
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
-msgstr " navne eller rpm-filer givne p� kommandolinjen vil blive installeret.\n"
+msgstr ""
+" navne eller rpm-filer givne p� kommandolinjen vil blive installeret.\n"
#: ../urpmi:1
#, c-format
@@ -1424,8 +1434,10 @@ msgstr ""
#: ../urpmi:1 ../urpmq:1
#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - gennemf�r kald selv om nogen pakker ikke eksisterer.\n"
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - gennemf�r kald selv om nogen pakker ikke eksisterer.\n"
#: ../urpmi:1
#, c-format
@@ -1454,8 +1466,10 @@ msgstr " --fuzzy - gennemf�r s�gning efter fuzzy (samme som -y).\n"
#: ../urpmi:1 ../urpmq:1
#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - v�lg automatisk pakker for opgradering af systemet.\n"
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - v�lg automatisk pakker for opgradering af systemet.\n"
#: ../urpmi:1
#, c-format
@@ -1589,14 +1603,16 @@ msgstr ""
msgid ""
" --distrib - automatically create all media from an installation\n"
" medium.\n"
-msgstr " --distrib - opret automatisk alle media fra et installationsmedium.\n"
+msgstr ""
+" --distrib - opret automatisk alle media fra et installationsmedium.\n"
#: ../urpmi.addmedia:1
#, c-format
msgid ""
" --no-probe - do not try to find any synthesis or\n"
" hdlist file.\n"
-msgstr " --no-probe - fors�g ikke at finde og bruge syntese- eller hdlist-fil.\n"
+msgstr ""
+" --no-probe - fors�g ikke at finde og bruge syntese- eller hdlist-fil.\n"
#: ../urpmi.addmedia:1
#, c-format
@@ -1606,7 +1622,8 @@ msgstr " --probe-hdlists - fors�g at finde og bruge hdlist-fil.\n"
#: ../urpmi.addmedia:1
#, c-format
msgid " --probe-synthesis - try to find and use synthesis file.\n"
-msgstr " --probe-synthesis fors�g at finde og bruge syntese- eller hdlist-fil.\n"
+msgstr ""
+" --probe-synthesis fors�g at finde og bruge syntese- eller hdlist-fil.\n"
#: ../urpmi.addmedia:1
#, c-format
@@ -1682,8 +1699,10 @@ msgstr "ingenting at opdatere (brug urpmi.addmedia til at tilf�je et medie)\n"
#: ../urpmi.update:1
#, c-format
-msgid " -d - force complete computation of depslist.ordered file.\n"
-msgstr " -d - gennemf�r fuldst�ndig beregning af depslist.ordered-fil.\n"
+msgid ""
+" -d - force complete computation of depslist.ordered file.\n"
+msgstr ""
+" -d - gennemf�r fuldst�ndig beregning af depslist.ordered-fil.\n"
#: ../urpmi.update:1
#, c-format
@@ -1765,7 +1784,8 @@ msgstr " -d - udvid foresp�rgsel til pakkeafh�ngigheder.\n"
#: ../urpmq:1
#, c-format
-msgid " --sources - give all source packages before downloading (root only).\n"
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
msgstr " --sources - giv alle kildepakker f�r hentning (kun root).\n"
#: ../urpmq:1
@@ -1843,6 +1863,12 @@ msgstr "scp mislykkedes p� v�rt %s"
msgid "host %s does not have a good version of urpmi"
msgstr "v�rt %s har ikke en god version af urpmi"
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s er i modstrid med %s"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "%s beh�ves af %s"
+
#~ msgid "nothing to write in list file for \"%s\""
#~ msgstr "ingenting at skrive i listefil for \"%s\""
@@ -1957,4 +1983,3 @@ msgstr "v�rt %s har ikke en god version af urpmi"
#~ msgid "urpmq version %s"
#~ msgstr "urpmq version %s"
-
diff --git a/po/de.po b/po/de.po
index b804a831..f392b97a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2002-08-31 14:40+0200\n"
"Last-Translator: Stefan Siegel <siegel@linux-mandrake.com>\n"
"Language-Team: German <cooker-i18n@linux-mandrake.com>\n"
@@ -198,16 +198,6 @@ msgstr "Ich habe keinen Zugriff auf die RPM-Datei [%s]."
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "%s steht im Konflikt mit %s."
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "%s wird von %s benötigt."
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "Ich kann das Paket „%s“ nicht installeren."
@@ -1925,6 +1915,12 @@ msgid "host %s does not have a good version of urpmi"
msgstr ""
"Auf dem Knoten „%s“ ist nicht die richtige Version von urpmi installiert!"
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s steht im Konflikt mit %s."
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "%s wird von %s benötigt."
+
#~ msgid "Remove them all?"
#~ msgstr "Alle entfernen?"
diff --git a/po/el.po b/po/el.po
index fb9cced4..1dcdfc9f 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi-el\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2003-06-14 23:30+0300\n"
"Last-Translator: ����� �������� (Nick Niktaris) <niktarin@yahoo.com>\n"
"Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -200,16 +200,6 @@ msgstr "�������� ��������� ��� ������ rpm [%s]"
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "%s ����������� �� �� %s"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "%s ���������� ��� �� %s"
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "�������� ������������ ��� ������� %s"
@@ -1869,6 +1859,12 @@ msgstr "� ����������� �������"
msgid "host %s does not have a good version of urpmi"
msgstr ""
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s ����������� �� �� %s"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "%s ���������� ��� �� %s"
+
#~ msgid "nothing to write in list file for \"%s\""
#~ msgstr "������ ��� ������� ��� ������ ������ ��� �� \"%s\""
diff --git a/po/eo.po b/po/eo.po
index 21c61888..5dd811c3 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2001-09-14 07:50-0500\n"
"Last-Translator: D. Dale Gulledge <dsplat@rochester.rr.com>\n"
"Language-Team: Esperanto <eo@li.org>\n"
@@ -192,16 +192,6 @@ msgid "unable to access rpm file [%s]"
msgstr "ne povis atingi rpm-an dosieron [%s]"
#: ../urpm.pm:1
-#, c-format
-msgid "%s conflicts with %s"
-msgstr ""
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr ""
-
-#: ../urpm.pm:1
#, fuzzy, c-format
msgid "unable to install package %s"
msgstr "Nur superuzulo rajtas instali lokajn pakaĵojn"
diff --git a/po/es.po b/po/es.po
index d6183767..2fdb4367 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: es\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2003-03-06 10:01-0300\n"
"Last-Translator: Fabian Mandelbaum <fmandelbaum@hotmail.com>\n"
"Language-Team: Espa�ol <es@li.org>\n"
@@ -194,16 +194,6 @@ msgstr "no se puede acceder al archivo rpm [%s]"
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "%s est� en conflicto con %s"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "%s es necesario para %s"
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "no se puede instalar el paquete %s"
@@ -1909,6 +1899,12 @@ msgstr "scp fall� en el host %s"
msgid "host %s does not have a good version of urpmi"
msgstr "el host %s no tiene un versi�n buena de urpmi"
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s est� en conflicto con %s"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "%s es necesario para %s"
+
#~ msgid "ignoring option \"%s\" not used"
#~ msgstr "ignorando la opci�n \"%s\" no usada"
diff --git a/po/et.po b/po/et.po
index c1ca5952..be763ad3 100644
--- a/po/et.po
+++ b/po/et.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2003-05-13 15:23+0200\n"
"Last-Translator: Marek Laane <bald@online.ee>\n"
"Language-Team: Estonian <et@li.org>\n"
@@ -186,16 +186,6 @@ msgstr "ligipääs rpm-failile [%s] ebaõnnestus"
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "%s ja %s on konfliktis"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "%s on vajalik %s jaoks"
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "paketi %s paigaldamine ebaõnnestus"
@@ -1883,3 +1873,9 @@ msgstr "scp ebaõnnestus masinal %s"
#, c-format
msgid "host %s does not have a good version of urpmi"
msgstr "masinal %s ei ole korralikku urpmi versiooni"
+
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s ja %s on konfliktis"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "%s on vajalik %s jaoks"
diff --git a/po/eu.po b/po/eu.po
index bde9e9da..0e6a0d25 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2002-09-09 19:28+0200\n"
"Last-Translator: I�igo Salvador Azurmendi <xalba@euskalnet.net>\n"
"Language-Team: Euskara <linux-eu@chanae.alphanet.ch>\n"
@@ -194,16 +194,6 @@ msgstr "ezin da [%s] rpm fitxategia atzitu"
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "%s-k %s-rekin gatazka sortzen du"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "%s behar du %s-k"
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "ezin da %s paketea instalatu"
@@ -1935,6 +1925,12 @@ msgstr "Instalazioak %s nodoan huts egin du"
msgid "host %s does not have a good version of urpmi"
msgstr "%s ostalariak ez dauka urpmi bertsio zuzena"
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s-k %s-rekin gatazka sortzen du"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "%s behar du %s-k"
+
#~ msgid "Remove them all?"
#~ msgstr "Denak kendu?"
diff --git a/po/fi.po b/po/fi.po
index 12a47bd1..3270e829 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -11,7 +11,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi-fi - MDK Release 9.1\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2003-03-06 13:41+0200\n"
"Last-Translator: Thomas Backlund <tmb@iki.fi>\n"
"Language-Team: Finnish <cooker-i18n@linux-mandrake.com>\n"
@@ -202,16 +202,6 @@ msgstr "ei oikeuksia rpm-tiedostoon [%s]"
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "%s on ristiriidassa %s kanssa"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "%2$s vaatii %1$s"
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "en voi asentaa paketti %s"
@@ -1924,6 +1914,12 @@ msgstr "scp epäonnistui verkkoasemalla %s"
msgid "host %s does not have a good version of urpmi"
msgstr "verkkoasemalla %s ei ole oikea urpmi versio "
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s on ristiriidassa %s kanssa"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "%2$s vaatii %1$s"
+
#~ msgid "ignoring option \"%s\" not used"
#~ msgstr "ohitan optio, \"%s\" ei käytetty"
diff --git a/po/fr.po b/po/fr.po
index cff44053..cbd94b9e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,7 +12,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi-fr\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2003-03-01 15:43+0100\n"
"Last-Translator: Combelles Christophe <ccomb@club-internet.fr>\n"
"Language-Team: French <fr@li.org>\n"
@@ -207,16 +207,6 @@ msgstr "impossible d'acc�der au fichier rpm [%s]"
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "%s est en conflit avec %s"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "%s est n�cessaire � %s"
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "impossible d'installer le paquetage %s"
@@ -1955,3 +1945,9 @@ msgstr "La commande scp a �chou� sur l'h�te %s"
#, c-format
msgid "host %s does not have a good version of urpmi"
msgstr "l'h�te %s n'a pas une bonne version de urpmi"
+
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s est en conflit avec %s"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "%s est n�cessaire � %s"
diff --git a/po/ga.po b/po/ga.po
index ae301a49..82ffb86a 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 1.5\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2000-04-06 10:25+0100\n"
"Last-Translator: Proinnsias Breathnach <breatpro@dublin.ml.com>\n"
"Language-Team: Gaeilge <ga@li.org>\n"
@@ -175,16 +175,6 @@ msgstr ""
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr ""
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr ""
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr ""
diff --git a/po/gl.po b/po/gl.po
index aee0a0f9..77e434dd 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2000-05-09 23:50+0200\n"
"Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
"Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -175,16 +175,6 @@ msgid "unable to access rpm file [%s]"
msgstr ""
#: ../urpm.pm:1
-#, c-format
-msgid "%s conflicts with %s"
-msgstr ""
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr ""
-
-#: ../urpm.pm:1
#, fuzzy, c-format
msgid "unable to install package %s"
msgstr "S� se lle permite � superusuario instalar paquetes locais"
diff --git a/po/he.po b/po/he.po
index 056f687e..d3f30c19 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi-he\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2003-03-15 15:23+0000\n"
"Last-Translator: dovix <dovix2003@yahoo.com>\n"
"Language-Team: Hebrew <en@li.org>\n"
@@ -179,16 +179,6 @@ msgstr "הגישה לחבילה [%s] נכשלה"
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "%s מתנגש עם %s"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "%s נדרש ע\"י %s"
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "התקנת החבילה %s נכשלה"
@@ -1793,3 +1783,9 @@ msgstr "scp נפל במארח %s"
#, c-format
msgid "host %s does not have a good version of urpmi"
msgstr "למארח %s אין גרסה תקינה של urpmi"
+
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s מתנגש עם %s"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "%s נדרש ע\"י %s"
diff --git a/po/hr.po b/po/hr.po
index 1fe5a3be..fc9a5e99 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2002-03-08 13:56CET\n"
"Last-Translator: Vlatko Kosturjak <kost@iname.com>\n"
"Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -188,16 +188,6 @@ msgid "unable to access rpm file [%s]"
msgstr "ne mogu pristupiti rpm datoteci [%s]"
#: ../urpm.pm:1
-#, c-format
-msgid "%s conflicts with %s"
-msgstr ""
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr ""
-
-#: ../urpm.pm:1
#, fuzzy, c-format
msgid "unable to install package %s"
msgstr "Samo je administratoru dozvoljeno da instalira pakete"
diff --git a/po/hu.po b/po/hu.po
index 42fdca03..d483621a 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2003-03-05 23:36+0100\n"
"Last-Translator: Arpad Biro <biro_arpad@yahoo.com>\n"
"Language-Team: Hungarian\n"
@@ -189,16 +189,6 @@ msgstr "a csomagf�jl nem �rhet� el: \"%s\""
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "%s �tk�zik ezzel: %s"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "%s sz�ks�ges ehhez: %s"
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "a(z) \"%s\" csomag telep�t�se sikertelen"
@@ -1942,6 +1932,12 @@ msgstr "az scp nem siker�lt ezen a g�pen: %s"
msgid "host %s does not have a good version of urpmi"
msgstr "nem megfelel� urpmi-verzi� a k�vetkez� g�pen: %s"
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s �tk�zik ezzel: %s"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "%s sz�ks�ges ehhez: %s"
+
#~ msgid "Remove them all?"
#~ msgstr "El szeretn� mindet t�vol�tani?"
diff --git a/po/id.po b/po/id.po
index 8d191ded..39296c7a 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2003-03-20 15:35+0900\n"
"Last-Translator: Budi Rachmanto <rac@linux-mandrake.com>\n"
"Language-Team: Indonesian <rac@linux-mandrake.com>\n"
@@ -180,16 +180,6 @@ msgstr "gagal akses file rpm [%s]"
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "%s konflik dg %s"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "%s dibutuhkan oleh %s"
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "gagal menginstal paket %s"
@@ -1842,6 +1832,12 @@ msgstr "scp gagal di host %s"
msgid "host %s does not have a good version of urpmi"
msgstr "host %s tak punya urpmi dg versi yg tepat"
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s konflik dg %s"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "%s dibutuhkan oleh %s"
+
#~ msgid "Remove them all?"
#~ msgstr "Hapus semua?"
diff --git a/po/is.po b/po/is.po
index cb434c75..25c8d804 100644
--- a/po/is.po
+++ b/po/is.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2000-04-19 23:05-0400\n"
"Last-Translator: Thorarinn R. Einarsson <thori@mindspring.com>\n"
"Language-Team: is <kde-isl@mmedia.is>\n"
@@ -176,16 +176,6 @@ msgstr ""
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr ""
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr ""
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr ""
diff --git a/po/it.po b/po/it.po
index 5fe7cc17..4e5f2244 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi-it\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2003-03-06 15:31+0100\n"
"Last-Translator: Roberto Rosselli Del Turco <rosselli@ling.unipi.it>\n"
"Language-Team: italiano <tp@lists.linux.it>\n"
@@ -190,16 +190,6 @@ msgstr "non riesco ad accedere al file rpm [%s]"
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "%s � in conflitto con %s"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "%s � richiesto da %s"
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "impossibile installare il pacchetto %s"
@@ -1916,6 +1906,12 @@ msgstr "scp fallito sul nodo %s"
msgid "host %s does not have a good version of urpmi"
msgstr "l'host %s non dispone di una buona versione di urpmi"
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s � in conflitto con %s"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "%s � richiesto da %s"
+
#~ msgid "Remove them all?"
#~ msgstr "Li rimuovo tutti?"
diff --git a/po/ja.po b/po/ja.po
index f2839303..53b8b219 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -2,13 +2,14 @@
# Copyright (C) 1999 Free Software Foundation, Inc.
# Copyright (c) 1999 MandrakeSoft
# Taisuke Yamada <tai@imasy.or.jp>, 1999.
+# utuhiro <utuhiro@mx12.freecom.ne.jp>, 2003
#
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 1999-12-19 14:43+0100\n"
-"Last-Translator: Taisuke Yamada <tai@imasy.or.jp>\n"
+"Last-Translator: utuhiro <utuhiro@mx12.freecom.ne.jp>\n"
"Language-Team: Japanese\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=euc-jp\n"
@@ -39,18 +40,17 @@ msgstr "urpmf ������� %s"
#: placeholder.h:19
msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr ""
+msgstr "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
#: placeholder.h:20
msgid ""
"This is free software and may be redistributed under the terms of the GNU "
"GPL."
-msgstr ""
+msgstr "����ϥե꡼���եȥ������Ǥ��ꡢGNU GPL�ξ��Τ�ȤǺ����ۤǤ��ޤ���"
#: placeholder.h:21 placeholder.h:38
-#, fuzzy
msgid "usage: urpmf [options] <file>"
-msgstr "������ˡ: urpmf [�ե�����̾]"
+msgstr "�Ȥ�����: urpmf [options] <file>"
#: placeholder.h:22
msgid ""
@@ -122,75 +122,64 @@ msgstr ""
#: placeholder.h:39
msgid "try urpmf --help for more options"
-msgstr ""
+msgstr "���ץ����ξܺ٤ϡ�urpmf --help�פǤ���ǧ��������"
#: placeholder.h:40
msgid "no full media list was found"
-msgstr ""
+msgstr "�����ʥ�ǥ����ꥹ�ȤϤ���ޤ���"
#: ../_irpm:1
#, c-format
msgid "%s: command not found\n"
-msgstr "%s: ���ޥ�ɤ����Ĥ���ޤ���Ǥ���\n"
+msgstr "%s: ���ޥ�ɤ����Ĥ���ޤ���\n"
# ��
#: ../_irpm:1 ../urpme:1 ../urpmi:1
#, c-format
msgid " (Y/n) "
-msgstr " (�Ϥ�(Y)/������(n)) [�Ϥ�] "
+msgstr " (Y/n) "
#: ../_irpm:1 ../urpmi:1
#, c-format
msgid "Cancel"
-msgstr "����������ߤ����"
+msgstr "����󥻥�"
#: ../_irpm:1 ../urpmi:1
#, c-format
msgid "Ok"
-msgstr "�Ϥ���³�Ԥ����"
+msgstr "OK"
#: ../_irpm:1 ../urpme:1 ../urpmi:1
#, c-format
msgid "Is this OK?"
-msgstr "��������Ǥ��礦����"
+msgstr "��������Ǥ�����"
#: ../_irpm:1
#, c-format
msgid ""
"Automatic installation of packages...\n"
"You requested installation of package %s\n"
-msgstr "���ꤵ�줿�ѥå�������%s�ˤ򥤥󥹥ȡ��뤷�Ƥ��ޤ���\n"
+msgstr "���ꤵ�줿�ѥå�����(%s)�򥤥󥹥ȡ��뤷�Ƥ��ޤ�..\n"
#: ../_irpm:1 ../urpmi:1
#, c-format
msgid "installing %s\n"
-msgstr "%s �򥤥󥹥ȡ������\n"
+msgstr "%s �򥤥󥹥ȡ�����..\n"
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "unable to open rpmdb"
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr "rpmdb�򳫤��ޤ���"
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr ""
+msgid "unable to access rpm file [%s]"
+msgstr "RPM�ե�����[%s]�˥��������Ǥ��ޤ���"
#: ../urpm.pm:1
#, c-format
-msgid "%s is needed by %s"
-msgstr ""
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
msgid "unable to install package %s"
-msgstr ""
-"��������ѥå������Υ��󥹥ȡ���ϥ����ѡ��桼�����Ǥʤ��ƤϤǤ��ޤ���"
+msgstr "%s �򥤥󥹥ȡ���Ǥ��ޤ���"
#: ../urpm.pm:1
#, c-format
@@ -198,16 +187,14 @@ msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr ""
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "unable to remove package %s"
-msgstr ""
-"��������ѥå������Υ��󥹥ȡ���ϥ����ѡ��桼�����Ǥʤ��ƤϤǤ��ޤ���"
+msgstr "%s �����Ǥ��ޤ���"
#: ../urpm.pm:1
#, fuzzy, c-format
msgid "removing package %s"
-msgstr ""
-"��������ѥå������Υ��󥹥ȡ���ϥ����ѡ��桼�����Ǥʤ��ƤϤǤ��ޤ���"
+msgstr "%s �����Ǥ��ޤ���"
#: ../urpm.pm:1
#, fuzzy, c-format
@@ -223,74 +210,76 @@ msgstr ""
#: ../urpm.pm:1 ../urpmi:1
#, c-format
msgid "Preparing..."
-msgstr ""
+msgstr "������.."
#: ../urpm.pm:1 ../urpmi.addmedia:1
-#, fuzzy, c-format
+#, c-format
msgid "...retrieving failed: %s"
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr "�����˼���: %s"
#: ../urpm.pm:1 ../urpmi.addmedia:1
#, c-format
msgid "...retrieving done"
-msgstr ""
+msgstr "..������λ"
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr "��ǥ��� %s ����RPM�ե�����򸡺���.."
#: ../urpm.pm:1
#, c-format
msgid "malformed input: [%s]"
-msgstr ""
+msgstr "����������: [%s]"
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "unable to access medium \"%s\""
-msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr "��ǥ��� %s �˥��������Ǥ��ޤ���"
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "urpmi database locked"
-msgstr "�ѥå������ǡ����١����θ����˼��Ԥ��ޤ���\n"
+msgstr "urpmi�Υǡ����١��������å�����Ƥ��ޤ�"
#: ../urpm.pm:1
#, c-format
msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr ""
+msgstr "��ǥ��� %s �ϥ�ࡼ�Х֥����Ƚ�Ǥ��ޤ��������Գμ¤Ǥ�"
#: ../urpm.pm:1
#, c-format
msgid "medium \"%s\" is not selected"
-msgstr ""
+msgstr "��ǥ��� %s �����򤵤�Ƥ��ޤ���"
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr "RPM�ե�����[%s]���ǥ���[%s]�����ɤळ�Ȥ��Ǥ��ޤ���"
#: ../urpm.pm:1
#, c-format
msgid "package %s is not found."
-msgstr ""
+msgstr "�ѥå����� %s �ϸ��Ĥ���ޤ���"
#: ../urpm.pm:1
#, c-format
msgid "medium \"%s\" does not define any location for rpm files"
-msgstr ""
+msgstr "��ǥ��� %s �ˤ�RPM�ե�����ν�ߤ��������Ƥ��ޤ���"
#: ../urpm.pm:1
-#, c-format
+#, fuzzy, c-format
msgid ""
"medium \"%s\" uses an invalid list file:\n"
" mirror is problably not up-to-date, trying to use alternate method"
msgstr ""
+"��ǥ��� %s ��̵���ʥꥹ�ȥե������ޤ�Ǥ��ޤ�(�����餯��������Ƥ��ޤ���"
+"�̤���ˡ���Ƥ�������)��"
#: ../urpm.pm:1
#, c-format
msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr ""
+msgstr "%s �Ȥ���̾��RPM�ե������ʣ������ޤ�"
#: ../urpm.pm:1
#, fuzzy, c-format
@@ -298,34 +287,34 @@ msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
#: ../urpm.pm:1 ../urpme:1
-#, fuzzy, c-format
+#, c-format
msgid "The following packages contain %s: %s"
-msgstr "%s �ϼ��Υѥå���������ˤ���ޤ�: %s\n"
+msgstr "�ʲ��Υѥå������� %s ���ޤޤ�Ƥ��ޤ�: %s"
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "no package named %s"
-msgstr "%s �Ȥ����ѥå������Ϥ���ޤ���\n"
+msgstr "%s �Ȥ����ѥå������Ϥ���ޤ���"
#: ../urpm.pm:1
#, c-format
msgid "error registering local packages"
-msgstr ""
+msgstr "��������ѥå���������Ͽ��˥��顼��ȯ��"
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "unable to register rpm file"
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr "RPM�ե��������Ͽ�Ǥ��ޤ���"
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "retrieving rpm file [%s] ..."
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr "RPM�ե�����[%s]�򸡺���.."
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "invalid rpm file name [%s]"
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr "[%s]��̵����RPM�ե�����̾�Ǥ�"
#: ../urpm.pm:1
#, c-format
@@ -338,14 +327,14 @@ msgid "relocated %s entries in depslist"
msgstr ""
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "unmounting %s"
-msgstr "%s �򥤥󥹥ȡ������\n"
+msgstr "%s �򥢥�ޥ����"
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "mounting %s"
-msgstr "%s �򥤥󥹥ȡ������\n"
+msgstr "%s ��ޥ����"
#: ../urpm.pm:1
#, c-format
@@ -355,32 +344,32 @@ msgstr ""
#: ../urpm.pm:1
#, c-format
msgid "found %d headers in cache"
-msgstr ""
+msgstr "%d �Υإå��򥭥�å��夫�鸡��"
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr "��ǥ��� %s ��hdlist synthesis�ե���������"
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "examining hdlist file [%s]"
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr "hdlist�ե�����[%s]��Ĵ��"
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "examining synthesis file [%s]"
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr "synthesis�ե�����[%s]��Ĵ��"
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "building hdlist [%s]"
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr "hdlist[%s]�����"
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "reading headers from medium \"%s\""
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr "��ǥ��� %s �Υإå����ɤ߹���"
#: ../urpm.pm:1
#, c-format
@@ -388,9 +377,9 @@ msgid "performing second pass to compute dependencies\n"
msgstr ""
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "problem reading synthesis file of medium \"%s\""
-msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr "��ǥ��� %s ��synthesis�ե�������ɤ߹���������꤬ȯ��"
#: ../urpm.pm:1
#, fuzzy, c-format
@@ -398,19 +387,19 @@ msgid "nothing written in list file for \"%s\""
msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "writing list file for medium \"%s\""
-msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr "��ǥ��� %s �Υꥹ�ȥե���������"
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "unable to write list file of \"%s\""
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr "%s �Υꥹ�ȥե����������Ǥ��ޤ���"
#: ../urpm.pm:1
#, c-format
msgid "file [%s] already used in the same medium \"%s\""
-msgstr ""
+msgstr "�ե����� [%s] ��Ʊ����ǥ��� %s �Ǵ��˻Ȥ��Ƥ��ޤ�"
#: ../urpm.pm:1
#, fuzzy, c-format
@@ -418,9 +407,9 @@ msgid "unable to parse hdlist file of \"%s\""
msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "no hdlist file found for medium \"%s\""
-msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr "��ǥ��� %s �ˤ�hdlist�ե����뤬����ޤ���"
#: ../urpm.pm:1
#, c-format
@@ -435,7 +424,7 @@ msgstr ""
#: ../urpm.pm:1
#, fuzzy, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr "%s ��hdlist(�ޤ���synthesis)�򥳥ԡ���.."
#: ../urpm.pm:1
#, fuzzy, c-format
@@ -455,7 +444,7 @@ msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
#: ../urpm.pm:1
#, fuzzy, c-format
msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr "%s ��hdlist(�ޤ���synthesis)�򥳥ԡ���.."
#: ../urpm.pm:1
#, fuzzy, c-format
@@ -463,69 +452,69 @@ msgid "retrieving description file of \"%s\"..."
msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "no rpm files found from [%s]"
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr "%s �ˤ�RPM�ե����뤬����ޤ���"
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "unable to read rpm files from [%s]: %s"
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr "[%s] ����RPM�ե�������ɤ߹��ळ�Ȥ��Ǥ��ޤ���: %s"
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "reading rpm files from [%s]"
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr "[%s] ����RPM�ե�������ɤ߹���"
#: ../urpm.pm:1
#, c-format
msgid "...copying done"
-msgstr ""
+msgstr "..���ԡ���λ"
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "...copying failed"
-msgstr "���󥹥ȡ���˼��Ԥ��ޤ���"
+msgstr "..���ԡ�����"
#: ../urpm.pm:1
#, c-format
msgid "copying source list of \"%s\"..."
-msgstr ""
+msgstr "%s �Υǡ����١����򥳥ԡ���.."
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "copy of [%s] failed"
-msgstr "���󥹥ȡ���˼��Ԥ��ޤ���"
+msgstr "[%s]�Υ��ԡ��˼���"
#: ../urpm.pm:1
#, fuzzy, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr "%s ��hdlist(�ޤ���synthesis)�򥳥ԡ���.."
#: ../urpm.pm:1
#, c-format
msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr ""
+msgstr "%s ��hdlist(�ޤ���synthesis)�򥳥ԡ���.."
#: ../urpm.pm:1
#, c-format
msgid "copying description file of \"%s\"..."
-msgstr ""
+msgstr "%s �������ե�����򥳥ԡ���.."
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "removing medium \"%s\""
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr "��ǥ��� %s ����"
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "selecting multiple media: %s"
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr "ʣ���μ���Υ�ǥ���������: %s"
#: ../urpm.pm:1
#, c-format
msgid "\"%s\""
-msgstr ""
+msgstr "��%s��"
#: ../urpm.pm:1
#, fuzzy, c-format
@@ -533,16 +522,18 @@ msgid "trying to select nonexistent medium \"%s\""
msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid ""
"unable to access first installation medium (no Mandrake/base/hdlists file "
"found)"
-msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr ""
+"�ǽ�Υ��󥹥ȡ����ѥ�ǥ����˥��������Ǥ��ޤ���(Mandrake/base/hdlists ������"
+"�ޤ���)"
#: ../urpm.pm:1
#, c-format
msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr ""
+msgstr "hdlist�ե���������� %s ��̵���Ǥ�"
#: ../urpm.pm:1
#, fuzzy, c-format
@@ -550,29 +541,29 @@ msgid "retrieving hdlists file..."
msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "copying hdlists file..."
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr "hdlist�ե�����򥳥ԡ���.."
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "unable to access first installation medium"
-msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr "�ǽ�Υ��󥹥ȡ����ѥ�ǥ����˥��������Ǥ��ޤ���"
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "added medium %s"
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr "��ǥ��� %s ���ɲ�"
#: ../urpm.pm:1
#, c-format
msgid "medium \"%s\" already exists"
-msgstr ""
+msgstr "��ǥ��� %s �ϴ���¸�ߤ��Ƥ��ޤ�"
#: ../urpm.pm:1
#, fuzzy, c-format
msgid "skipping package %s"
-msgstr "%s �Ȥ����ѥå������Ϥ���ޤ���\n"
+msgstr "%s �Ȥ����ѥå������Ϥ���ޤ���"
#: ../urpm.pm:1
#, fuzzy, c-format
@@ -612,14 +603,14 @@ msgid "unable to parse \"%s\" in file [%s]"
msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "write config file [%s]"
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr "����ե�����[%s]�����"
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "unable to write config file [%s]"
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr "����ե�����[%s]������Ǥ��ޤ���"
#: ../urpm.pm:1
#, fuzzy, c-format
@@ -634,12 +625,12 @@ msgstr ""
#: ../urpm.pm:1
#, c-format
msgid "taking removable device as \"%s\""
-msgstr ""
+msgstr "��ࡼ�Х֥�ǥХ����� %s ��ǧ�����ޤ�"
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "too many mount points for removable medium \"%s\""
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr "��ࡼ�Х֥��ǥ��� %s �ˤϥޥ���ȥݥ���Ȥ�¿�����ޤ�"
#: ../urpm.pm:1
#, fuzzy, c-format
@@ -652,9 +643,9 @@ msgid "incoherent list file for \"%s\", medium ignored"
msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr "%s �Υꥹ�Ȥ����Ĥ���ޤ��󡣥�ǥ�����̵�뤷�ޤ�"
#: ../urpm.pm:1
#, fuzzy, c-format
@@ -667,14 +658,14 @@ msgid "trying to bypass existing medium \"%s\", avoiding"
msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr "%s �Υꥹ�Ȥ˥��������Ǥ��ޤ��󡣥�ǥ�����̵�뤷�ޤ�"
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr "%s ��hdlist�˥��������Ǥ��ޤ��󡣥�ǥ�����̵�뤷�ޤ�"
#: ../urpm.pm:1
#, fuzzy, c-format
@@ -702,16 +693,20 @@ msgstr ""
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
+"��ǥ��� %s �Ϥ��Ǥ˻Ȥ�줿�ꥹ�Ȥ�Ȥ����Ȥ��Ƥ��ޤ������Υ�ǥ�����̵�뤷"
+"�ޤ�"
#: ../urpm.pm:1
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
+"��ǥ��� %s �Ϥ��Ǥ˻Ȥ�줿hdlist��Ȥ����Ȥ��Ƥ��ޤ������Υ�ǥ�����̵�뤷"
+"�ޤ�"
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "syntax error in config file at line %s"
-msgstr "��%s�פ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr "����ե������%s�Ԥ�syntax error"
#: ../urpm.pm:1 ../urpmi:1
#, c-format
@@ -726,47 +721,47 @@ msgstr ""
#: ../urpm.pm:1
#, c-format
msgid "rsync failed: exited with %d or signal %d\n"
-msgstr ""
+msgstr "rsync�˼���: exited with %d or signal %d\n"
#: ../urpm.pm:1
#, c-format
msgid "ssh is missing\n"
-msgstr ""
+msgstr "ssh������ޤ���\n"
#: ../urpm.pm:1
#, c-format
msgid "rsync is missing\n"
-msgstr ""
+msgstr "rsync������ޤ���\n"
#: ../urpm.pm:1
#, c-format
msgid "curl failed: exited with %d or signal %d\n"
-msgstr ""
+msgstr "curl�˼���: exited with %d or signal %d\n"
#: ../urpm.pm:1
#, c-format
msgid "curl is missing\n"
-msgstr ""
+msgstr "curl������ޤ���\n"
#: ../urpm.pm:1
#, c-format
msgid "wget failed: exited with %d or signal %d\n"
-msgstr ""
+msgstr "wget�˼���: exited with %d or signal %d\n"
#: ../urpm.pm:1
#, c-format
msgid "wget is missing\n"
-msgstr ""
+msgstr "wget������ޤ���\n"
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "copy failed: %s"
-msgstr "���󥹥ȡ���˼��Ԥ��ޤ���"
+msgstr "���ԡ�����: %s"
#: ../urpm.pm:1
-#, fuzzy, c-format
+#, c-format
msgid "unable to handle protocol: %s"
-msgstr "���åץǡ��Ȥ��%s�פˤĤ��ƹԤʤ����Ȥ��Ǥ��ޤ���Ǥ���\n"
+msgstr "�ץ��ȥ�������Ǥ��ޤ���: %s"
#: ../urpm.pm:1
#, c-format
@@ -781,19 +776,19 @@ msgstr ""
#: ../urpm.pm:1
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
-msgstr ""
+msgstr "������webfetch %s\n"
#: ../urpme:1
#, c-format
msgid "Removing failed"
-msgstr ""
+msgstr "�������"
#: ../urpme:1
-#, fuzzy, c-format
+#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be removed (%d "
"MB)"
-msgstr "��¸�ط��Τ��ᡢ���Υѥå������⥤�󥹥ȡ��뤷�ޤ� (%d MB)"
+msgstr "��¸�ط�������������˰ʲ��Υѥå������Ϻ������ޤ�(%d MB)"
#: ../urpme:1
#, fuzzy, c-format
@@ -803,17 +798,17 @@ msgstr "���Υѥå������Τ����줫��ɬ�פǤ�:"
#: ../urpme:1
#, c-format
msgid "Nothing to remove"
-msgstr ""
+msgstr "��������ΤϤ���ޤ���"
#: ../urpme:1
#, c-format
msgid "removing package %s will break your system"
-msgstr ""
+msgstr "%s ��������ȥ����ƥब����ޤ�"
#: ../urpme:1
-#, fuzzy, c-format
+#, c-format
msgid "unknown package"
-msgstr "%s �Ȥ����ѥå������Ϥ���ޤ���\n"
+msgstr "�����ʥѥå�����"
#: ../urpme:1
#, fuzzy, c-format
@@ -824,7 +819,7 @@ msgstr "%s �Ȥ����ѥå������Ϥ���ޤ���\n"
#, fuzzy, c-format
msgid "urpme: unknown option \"-%s\", check usage with --help\n"
msgstr ""
-"̤�ΤΥ��ץ�����\"-$1\"�ˤǤ���\n"
+"̤�ΤΥ��ץ����(\"-$1\")�Ǥ���\n"
"������ˡ�� --help ���ץ����dz�ǧ���Ƥ���������\n"
#: ../urpme:1
@@ -1055,6 +1050,11 @@ msgid ""
"\n"
"usage:\n"
msgstr ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"����ϥե꡼���եȥ������Ǥ��ꡢGNU GPL�ξ��Τ�ȤǺ����ۤǤ��ޤ���\n"
+"\n"
+"�Ȥ�����:\n"
#: ../urpmi:1
#, c-format
@@ -1075,7 +1075,7 @@ msgstr "���󥹥ȡ���˼��Ԥ��ޤ���"
#, c-format
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr ""
-"���٥��󥹥ȡ�����ߤޤ�������--force �����Ǥ��� (�Ϥ�(y)/������(N)) [����"
+"���٥��󥹥ȡ�����ߤޤ�����(--force �����Ǥ�) (�Ϥ�(y)/������(N)) [����"
"��] "
#: ../urpmi:1
@@ -1126,7 +1126,7 @@ msgstr "����ä���ϥ꥿���󥭡��򲡤��Ʋ�������"
#: ../urpmi:1
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "��ǥ�����%s�ˤ� %s ���������Ʋ�������"
+msgstr "��ǥ���(%s)�� %s ���������Ʋ�������"
#: ../urpmi:1
#, fuzzy, c-format
@@ -1171,7 +1171,7 @@ msgid ""
"do you agree ?"
msgstr ""
"���åץ��졼�ɤΤ���ˤϤ����Ĥ��Υѥå�������������\n"
-"ɬ�פ�����ޤ��ʤ����̤�����Ǥ���\n"
+"ɬ�פ�����ޤ�(�����̤�����Ǥ�)\n"
#: ../urpmi:1
#, c-format
@@ -1252,7 +1252,7 @@ msgstr ""
#, fuzzy, c-format
msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
msgstr ""
-"̤�ΤΥ��ץ�����\"-$1\"�ˤǤ���\n"
+"̤�ΤΥ��ץ����(\"-$1\")�Ǥ���\n"
"������ˡ�� --help ���ץ����dz�ǧ���Ƥ���������\n"
#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
@@ -1428,6 +1428,11 @@ msgid ""
"\n"
"usage:\n"
msgstr ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"����ϥե꡼���եȥ������Ǥ��ꡢGNU GPL�ξ��Τ�ȤǺ����ۤǤ��ޤ���\n"
+"\n"
+"�Ȥ�����:\n"
#: ../urpmi.addmedia:1
#, c-format
@@ -1481,7 +1486,7 @@ msgstr ""
msgid ""
"\n"
"unknown options '%s'\n"
-msgstr "̤�ΤΥ��ץ�����%s�ˤ����ꤵ��Ƥ��ޤ�\n"
+msgstr "̤�ΤΥ��ץ����(%s)�����ꤵ��Ƥ��ޤ�\n"
#: ../urpmi.addmedia:1 ../urpmi.update:1
#, c-format
@@ -1659,13 +1664,13 @@ msgstr ""
#: ../urpmq:1
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: RPM�ե������%s�ˤ��ɤळ�Ȥ�����ޤ���Ǥ���\n"
+msgstr "urpmq: RPM�ե�����(%s)���ɤळ�Ȥ�����ޤ���Ǥ���\n"
#: ../urpmq:1
#, fuzzy, c-format
msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
msgstr ""
-"̤�ΤΥ��ץ�����\"-$1\"�ˤǤ���\n"
+"̤�ΤΥ��ץ����(\"-$1\")�Ǥ���\n"
"������ˡ�� --help ���ץ����dz�ǧ���Ƥ���������\n"
#: ../urpmq:1
@@ -1784,6 +1789,12 @@ msgstr "���󥹥ȡ���˼��Ԥ��ޤ���"
msgid "host %s does not have a good version of urpmi"
msgstr ""
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s �� %s �ȶ��礷�Ƥ��ޤ�"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "%s �� %s ��ɬ�פǤ�"
+
#~ msgid "urpmi is not installed"
#~ msgstr "urpmi �ϥ��󥹥ȡ��뤵��Ƥ��ޤ���"
diff --git a/po/ka.po b/po/ka.po
index 34f92337..50e0f9e3 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2003-01-29 23:47+0400\n"
"Last-Translator: Aiet Kolkhi <aiet@gmx.net>\n"
"Language-Team: Georgian\n"
@@ -177,16 +177,6 @@ msgid "unable to access rpm file [%s]"
msgstr ""
#: ../urpm.pm:1
-#, c-format
-msgid "%s conflicts with %s"
-msgstr ""
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr ""
-
-#: ../urpm.pm:1
#, fuzzy, c-format
msgid "unable to install package %s"
msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 404a8af5..c3de1f1c 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2001-09-22 03:14+0900\n"
"Last-Translator: Jaegeum Choe <baedaron@hananet.net>\n"
"Language-Team: Korean <baedaron@hananet.net>\n"
@@ -177,16 +177,6 @@ msgid "unable to access rpm file [%s]"
msgstr "RPM ���ϡ�%s���� ������ �� �����ϴ�."
#: ../urpm.pm:1
-#, c-format
-msgid "%s conflicts with %s"
-msgstr ""
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr ""
-
-#: ../urpm.pm:1
#, fuzzy, c-format
msgid "unable to install package %s"
msgstr "��Ʈ ����ڸ��� ���� ��Ű���� ��ġ�� �� �ֽ��ϴ�."
diff --git a/po/lt.po b/po/lt.po
index b4ccc9d8..78fdeb30 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2001-03-04 15:40+0200\n"
"Last-Translator: Mykolas Norvai�as <Myka@centras.lt>\n"
"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -178,16 +178,6 @@ msgid "unable to access rpm file [%s]"
msgstr ""
#: ../urpm.pm:1
-#, c-format
-msgid "%s conflicts with %s"
-msgstr ""
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr ""
-
-#: ../urpm.pm:1
#, fuzzy, c-format
msgid "unable to install package %s"
msgstr "Tik root vartotojas gali �diegti vietinius paketus"
diff --git a/po/lv.po b/po/lv.po
index 802a3761..dfebca07 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2002-09-27 17:43+0200\n"
"Last-Translator: Raivo Saars <spaiks@inbox.lv>\n"
"Language-Team: ll10nt <ll10nt@listes.murds.lv>\n"
@@ -183,16 +183,6 @@ msgstr "nav iesp�jams piek��t rpm failam [%s]"
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "%s konflik� ar %s"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "%s ir nepiecie�ams %s"
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "nevaru instal�t pakotni %s"
@@ -1821,6 +1811,12 @@ msgstr "Instal��ana neizdev�s mezgl� %s"
msgid "host %s does not have a good version of urpmi"
msgstr "hostam %s nav labas urpmi versijas"
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s konflik� ar %s"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "%s ir nepiecie�ams %s"
+
#~ msgid "Remove them all?"
#~ msgstr "No�emt t�s visas?"
diff --git a/po/ms.po b/po/ms.po
index 8488bad7..9ae90712 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2002-03-12 16:17+0800\n"
"Last-Translator: Yuzz <yuzz@emasonline.com>\n"
"Language-Team: Malaysia <yuzz@emasonline.com>\n"
@@ -182,16 +182,6 @@ msgid "unable to access rpm file [%s]"
msgstr "gagal akses fail rpm [%s]"
#: ../urpm.pm:1
-#, c-format
-msgid "%s conflicts with %s"
-msgstr ""
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr ""
-
-#: ../urpm.pm:1
#, fuzzy, c-format
msgid "unable to install package %s"
msgstr "Hanya superuser yang boleh menginstal pakej"
diff --git a/po/mt.po b/po/mt.po
index d448ac55..a2f23598 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi-mt\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2002-09-05 19:42CET\n"
"Last-Translator: Ramon Casha <ramon.casha@linux.org.mt>\n"
"Language-Team: Maltese <mt@li.org>\n"
@@ -184,16 +184,6 @@ msgstr "ma nistax naċċessa l-fajl rpm [%s]"
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "%s jikkonfliġġi ma' %s"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "%s huwa meħtieġ minn %s"
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "ma nistax ninstalla l-pakkett %s"
@@ -1857,6 +1847,12 @@ msgstr "Installazzjoni falliet fuq nod %s"
msgid "host %s does not have a good version of urpmi"
msgstr "kompjuter %s m'għandux verżjoni tajba ta' urpmi"
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s jikkonfliġġi ma' %s"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "%s huwa meħtieġ minn %s"
+
#~ msgid "Remove them all?"
#~ msgstr "Trid tneħħihom kollha?"
diff --git a/po/nl.po b/po/nl.po
index 84acd125..29788ba2 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2003-03-31 14:41+0100\n"
"Last-Translator: Reinout van Schouwen <reinout@cs.vu.nl>\n"
"Language-Team: Nederlands <vertaling@nl.linux.org>\n"
@@ -199,16 +199,6 @@ msgstr "kon rpm-bestand [%s] niet benaderen"
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "%s conflicteert met %s"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "%s is nodig voor %s"
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "kon volgend pakket niet installeren: %s"
@@ -1933,6 +1923,12 @@ msgstr "scp faalde op host %s"
msgid "host %s does not have a good version of urpmi"
msgstr "host %s heeft niet de goede versie van urpmi"
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s conflicteert met %s"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "%s is nodig voor %s"
+
#~ msgid "ignoring option \"%s\" not used"
#~ msgstr "negeert niet gebruikte optie \"%s\""
diff --git a/po/no.po b/po/no.po
index 8f2d1d01..d88b2cbf 100644
--- a/po/no.po
+++ b/po/no.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2003-03-05 22:30+0100\n"
"Last-Translator: Per �yvind Karlsen <peroyvind@sintrax.net>\n"
"Language-Team: Norsk Bokm�l <cooker-i18n@linux-mandrake.com>\n"
@@ -184,16 +184,6 @@ msgstr "kunne ikke n� rpm fil [%s]"
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "%s er i konflikt med %s"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "%s beh�ves av %s"
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "kunne ikke installere pakke %s"
@@ -1859,6 +1849,12 @@ msgstr "scp mislykket p� vert %s"
msgid "host %s does not have a good version of urpmi"
msgstr "vert %s har ingen god versjon av urpmi"
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s er i konflikt med %s"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "%s beh�ves av %s"
+
#~ msgid "ignoring option \"%s\" not used"
#~ msgstr "ignorerer valg \"%s\" ikke brukt"
diff --git a/po/pl.po b/po/pl.po
index f387bafd..e9125408 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2003-05-09 10:12+0100\n"
"Last-Translator: Arkadiusz Lipiec <alipiec@elka.pw.edu.pl>\n"
"Language-Team: Polish <pl@li.org>\n"
@@ -183,16 +183,6 @@ msgstr "nie mo�na uzyska� dost�pu do pliku rpm [%s]"
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "Pakiet %s koliduje z pakietem %s"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "Pakiet %s jest wymagany przez %s"
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "nie mo�na zainstalowa� pakietu %s"
@@ -1894,3 +1884,9 @@ msgstr "po��czenie scp z komputerem %s zako�czone niepowodzeniem"
#, c-format
msgid "host %s does not have a good version of urpmi"
msgstr "komputer %s nie posiada odpowiednie wersji urpmi"
+
+#~ msgid "%s conflicts with %s"
+#~ msgstr "Pakiet %s koliduje z pakietem %s"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "Pakiet %s jest wymagany przez %s"
diff --git a/po/pt.po b/po/pt.po
index ff4b60c4..a7ae0ec1 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -11,7 +11,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi-pt\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2003-03-14 08:46+0100\n"
"Last-Translator: Jos� JORGE <jose.jorge@oreka.com>\n"
"Language-Team: Portugu�s\n"
@@ -199,16 +199,6 @@ msgstr "imposs�vel aceder ao ficheiro rpm [%s]"
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "%s est� em conflito com %s"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "%s � necess�rio para %s"
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "imposs�vel instalar o pacote %s"
@@ -1924,6 +1914,12 @@ msgstr "scp falhou no servidor %s"
msgid "host %s does not have a good version of urpmi"
msgstr "o servidor %s n�o tem uma vers�o correcta de urpmi"
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s est� em conflito com %s"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "%s � necess�rio para %s"
+
#~ msgid "ignoring option \"%s\" not used"
#~ msgstr "iignorando a op��o \"%s\" n�o usada"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a77edfa6..d85b983a 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2002-12-14 03:10GMT\n"
"Last-Translator: Carlos Roberto Mafra <crmafra@mafra.eti.br>\n"
"Language-Team: Brazilian Portuguese <C@li.org>\n"
@@ -196,16 +196,6 @@ msgstr "Incapaz de acessar arquivo rpm [%s]"
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "%s conflita com %s"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "%s � requerido por %s"
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "N�o foi poss�vel instalar o pacote %s"
@@ -1900,6 +1890,12 @@ msgstr "scp falhou no host %s"
msgid "host %s does not have a good version of urpmi"
msgstr "servidor %s n�o tem uma vers�o compat�vel do urpmi"
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s conflita com %s"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "%s � requerido por %s"
+
#~ msgid "Remove them all?"
#~ msgstr "Remove todos?"
diff --git a/po/ro.po b/po/ro.po
index 01c33d5b..38d7050e 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2003-03-16 19:00+0200\n"
"Last-Translator: Ovidiu Constantin <ovidiu.constantin@gmx.net>\n"
"Language-Team: romanian <rtfs-project@lists.sourceforge.net>\n"
@@ -196,16 +196,6 @@ msgstr "nu pot accesa fi�ierul rpm [%s]"
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "%s e �n conflict cu %s"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "%s e cerut de %s"
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "nu pot instala pachetul %s"
@@ -1923,3 +1913,9 @@ msgstr "scp a e�uat la gazda %s"
#, c-format
msgid "host %s does not have a good version of urpmi"
msgstr "gazda %s nu are o versiune compatibil� a urpmi "
+
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s e �n conflict cu %s"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "%s e cerut de %s"
diff --git a/po/ru.po b/po/ru.po
index 6e19f099..1bd07040 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2003-03-06 15:56+0200\n"
"Last-Translator: Alice Lafox <alice@lafox.com.ua>\n"
"Language-Team: russian <cooker-i18n@linux-mandrake.com >\n"
@@ -198,16 +198,6 @@ msgstr "���������� �������� ������ � ����� rpm [%s]"
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "%s ����������� � %s"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "%s ����� ��� %s"
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "���������� ���������� ����� %s"
@@ -1925,3 +1915,9 @@ msgstr "scp ���������� �������� �� ����� %s"
#, c-format
msgid "host %s does not have a good version of urpmi"
msgstr "�� ����� %s ����������� ������� ������ urpi"
+
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s ����������� � %s"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "%s ����� ��� %s"
diff --git a/po/sk.po b/po/sk.po
index 2f4d64f4..7e6980e5 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2003-03-14 00:31--100\n"
"Last-Translator: Tibor Pittich <Tibor.Pittich@phuture.sk>\n"
"Language-Team: Slovak <i18n@mandrake.sk>\n"
@@ -186,16 +186,6 @@ msgstr "nemôžem pristúpiť k rpm súboru [%s]"
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "%s konfliktuje s %s"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "%s je potrebný pre %s"
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "nemôžem nainštalovať balíček %s"
@@ -1880,3 +1870,9 @@ msgstr "scp zlyhalo na hostiteľovy %s"
#, c-format
msgid "host %s does not have a good version of urpmi"
msgstr "hostiteľ %s nemá správnu verziu urpmi"
+
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s konfliktuje s %s"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "%s je potrebný pre %s"
diff --git a/po/sl.po b/po/sl.po
index 1b7b9c66..7613d859 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2003-03-10 13:46+0100\n"
"Last-Translator: Tadej Panjtar <panjtar@email.si>\n"
"Language-Team: Slovenian <lugos-slo@lugos.si>\n"
@@ -188,16 +188,6 @@ msgstr "nemogo�e je dostopati do rpm datoteke [%s]"
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "%s je v konfliktu z/s %s"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "%s potrebuje %s"
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "nemogo�e namestiti paket %s"
@@ -1882,3 +1872,9 @@ msgstr "scp spodletel na gostitelju %s"
#, c-format
msgid "host %s does not have a good version of urpmi"
msgstr "gostitelj %s nima dovolj nove razli�ice urpmi"
+
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s je v konfliktu z/s %s"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "%s potrebuje %s"
diff --git a/po/sr.po b/po/sr.po
index 527f6179..1a409971 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2003-02-21 21:41+0100\n"
"Last-Translator: Toma Jankovic <tomaja@net.yu>\n"
"Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -188,16 +188,6 @@ msgstr "�� ���� �� ��������� rpm �������� [%s]"
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "%s �� � ��������� �� %s"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "%s �� �������� �� %s"
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "�� ���� �� ���������� ����� %s"
@@ -1880,6 +1870,12 @@ msgstr "scp ���� ����� �� ����� %s"
msgid "host %s does not have a good version of urpmi"
msgstr "���� %s ���� �������� ������� urpmi"
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s �� � ��������� �� %s"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "%s �� �������� �� %s"
+
#~ msgid "Remove them all?"
#~ msgstr "�� �� ������� ���?"
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index ba45f384..7e6a97ec 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2003-02-21 21:41+0100\n"
"Last-Translator: Toma Jankovic_<tomaja@net.yu>\n"
"Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -188,16 +188,6 @@ msgstr "ne mogu da pristupim rpm datoteci [%s]"
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "%s je u konfliktu sa %s"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "%s je potrebno za %s"
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "ne mogu da instaliram paket %s"
@@ -1885,6 +1875,12 @@ msgstr "scp nije uspeo na hostu %s"
msgid "host %s does not have a good version of urpmi"
msgstr "host %s nema ispravnu verziju urpmi"
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s je u konfliktu sa %s"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "%s je potrebno za %s"
+
#~ msgid "Remove them all?"
#~ msgstr "Da ih uklonim sve?"
diff --git a/po/sv.po b/po/sv.po
index f8988192..7c40acc5 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -11,7 +11,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi-sv\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2003-03-08 09:54+0100\n"
"Last-Translator: Mattias Newzella <newzella@linux.nu>\n"
"Language-Team: svenska <sv@li.org>\n"
@@ -196,16 +196,6 @@ msgstr "kan inte l�sa rpm-fil [%s]"
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "%s �r i konflikt med %s"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "%s kr�vs av %s"
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "kan inte installera paket %s"
@@ -1877,3 +1867,9 @@ msgstr "scp misslyckades p� v�rddator %s"
#, c-format
msgid "host %s does not have a good version of urpmi"
msgstr "datorn %s har en d�lig version av urpmi"
+
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s �r i konflikt med %s"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "%s kr�vs av %s"
diff --git a/po/tg.po b/po/tg.po
index 17af1f1b..c2dc45e5 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2003-03-11 19:14+0500\n"
"Last-Translator: Dilshod Marupov <dma165@hotmail.com>\n"
"Language-Team: Tajik\n"
@@ -187,16 +187,6 @@ msgstr "дохилшавии файли rpm-и [%s] номумкин"
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr ""
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr ""
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "кор гузоштани қуттии %s номумкин"
diff --git a/po/th.po b/po/th.po
index 22a98a50..7823a2be 100644
--- a/po/th.po
+++ b/po/th.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2002-11-25 13:52-0500\n"
"Last-Translator: Wachara Chinsettawong <wachara@yahoo.com>\n"
"Language-Team: Thai <th@li.org>\n"
@@ -179,16 +179,6 @@ msgstr "�������ö��ҹ rpm file [%s]"
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "%s �Ѵ��駡Ѻ %s"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "%s ��������Ѻ %s"
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "�������ö�Դ�����ࡨ %s"
@@ -1816,6 +1806,12 @@ msgstr "��õԴ��駺� %s ��������"
msgid "host %s does not have a good version of urpmi"
msgstr "����ͧ %s ����� urpmi ���١��ͧ"
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s �Ѵ��駡Ѻ %s"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "%s ��������Ѻ %s"
+
#~ msgid "Remove them all?"
#~ msgstr "��ͧ���ź����������������?"
diff --git a/po/tr.po b/po/tr.po
index 3edcf4c9..57d73121 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -15,7 +15,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi-tr\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2003-03-21 14:38+0200\n"
"Last-Translator: Erçin EKER <erc.caldera@gmx.net>\n"
"Language-Team: Türkçe <tr@li.org>\n"
@@ -196,16 +196,6 @@ msgstr "rpm dosyasına [%s] erişilemiyor"
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "%s %s'le çelişiyor"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "%s %s tarafından isteniyor"
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "%s paketi yüklenemiyor"
@@ -1899,6 +1889,12 @@ msgstr "scp %s makinesinde hatalı"
msgid "host %s does not have a good version of urpmi"
msgstr "%s bilgisayarında urpmi'nin iyi bir sürümü yok"
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s %s'le çelişiyor"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "%s %s tarafından isteniyor"
+
#~ msgid "Remove them all?"
#~ msgstr "Hepsini kaldırayım mı ?"
diff --git a/po/uk.po b/po/uk.po
index 8f53d005..47c94b08 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi-uk\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2003-04-30 16:05+0300\n"
"Last-Translator: Taras Boychuk <btr1@torba.com>\n"
"Language-Team: ukrainian <uk@li.org>\n"
@@ -196,16 +196,6 @@ msgstr "����� ������� �� rpm-����� [%s]"
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "%s ����̦��դ � %s"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "%s ���Ҧ��� ��� %s"
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "��������� ���������� ������� %s"
@@ -1910,3 +1900,9 @@ msgstr "scp ���������� ������� �� ���Ԧ %s"
#, c-format
msgid "host %s does not have a good version of urpmi"
msgstr "�� ���Ԧ %s ����� �����ϧ ���Ӧ� urpmi"
+
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s ����̦��դ � %s"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "%s ���Ҧ��� ��� %s"
diff --git a/po/uz.po b/po/uz.po
index 7ae73b81..9e019592 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 4.0\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2003-03-03 20:04+0000\n"
"Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
"Language-Team: Uzbek <uz-li@yahoogroups.com>\n"
@@ -177,16 +177,6 @@ msgstr ""
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "%s bilan %s o'rtasida muammo"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "%s uchun %s kerak"
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr ""
@@ -1739,6 +1729,12 @@ msgstr ""
msgid "host %s does not have a good version of urpmi"
msgstr ""
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s bilan %s o'rtasida muammo"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "%s uchun %s kerak"
+
#, fuzzy
#~ msgid "usage: urpme [-a] [--auto] <packages...>\n"
#~ msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 269332e2..b0db00cf 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2003-03-15 11:16+0700\n"
"Last-Translator: Trinh Minh Thanh <tmthanh@yahoo.com>\n"
"Language-Team: Gnome-Vi <Gnomevi-list@lists.sourceforge.net>\n"
@@ -185,16 +185,6 @@ msgstr "không thể truy cập tập tin rpm [%s]"
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "%s xung đột với %s"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "%s được %s cần đến"
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "không thể cài đặt gói %s"
@@ -1883,6 +1873,12 @@ msgstr "scp lỗi trên host %s"
msgid "host %s does not have a good version of urpmi"
msgstr "host %s không có phiên bản tốt của urpmi"
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s xung đột với %s"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "%s được %s cần đến"
+
#~ msgid "ignoring option \"%s\" not used"
#~ msgstr "đang bỏ qua tùy chọn \"%s\" không được dùng"
diff --git a/po/wa.po b/po/wa.po
index a9194a89..3dcf517a 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2003-05-13 12:50+0200\n"
"Last-Translator: Lorint Hendschel <LorintHendschel@skynet.be>\n"
"Language-Team: Walon <linux-wa@chanae.alphanet.ch>\n"
@@ -185,16 +185,6 @@ msgstr "dji n'�sai aveur acc�s � fitch� rpm [%s]"
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "%s fwait des conflits avou %s"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "i gn a mez�jhe di %s po %s"
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "dji n'�sai astaler l'�pacaedje %s"
@@ -1931,3 +1921,9 @@ msgstr "Li comande scp a fwait berwete sol lodjoe %s"
#, c-format
msgid "host %s does not have a good version of urpmi"
msgstr "li lodjoe %s n'�a n�n ene bone mod�ye d'�urpmi"
+
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s fwait des conflits avou %s"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "i gn a mez�jhe di %s po %s"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9e7a5182..b2ab7596 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2003-03-08 12:13+0800\n"
"Last-Translator: Funda Wang <mandrake@en2china.com>\n"
"Language-Team: Mandrake Simplified Chinese <mandrake@en2china.com>\n"
@@ -182,16 +182,6 @@ msgstr "�޷����� rpm �ļ�[%s]"
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "%s �� %s ��ͻ"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "���� %s �� %s ����������Ҫ��"
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "�޷���װ������ %s"
@@ -1822,3 +1812,9 @@ msgstr "������ %s scp ʧ��"
#, c-format
msgid "host %s does not have a good version of urpmi"
msgstr "���� %s û�к��ʰ汾�� urpmi"
+
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s �� %s ��ͻ"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "���� %s �� %s ����������Ҫ��"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 64be0910..f76e8f8b 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -11,7 +11,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2003-05-13 12:27+0200\n"
+"POT-Creation-Date: 2003-05-15 14:10+0200\n"
"PO-Revision-Date: 2002-09-02 03:10+0800\n"
"Last-Translator: Kenduest Lee <kenduest@i18n.linux.org.tw>\n"
"Language-Team: Chinese Team <zh-l10n@linux.org.tw>\n"
@@ -185,16 +185,6 @@ msgstr "�L�k�s���M���� [%s]"
#: ../urpm.pm:1
#, c-format
-msgid "%s conflicts with %s"
-msgstr "%s �M��P %s �۽Ĭ�"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "%s is needed by %s"
-msgstr "%s �M��Q %s �һݭn"
-
-#: ../urpm.pm:1
-#, c-format
msgid "unable to install package %s"
msgstr "�L�k�w�ˤW�ӮM�� - %s"
@@ -1810,6 +1800,12 @@ msgstr "�w�˥��� - %s"
msgid "host %s does not have a good version of urpmi"
msgstr "%s �D���� urpmi ���������D�A�L�k���`�I�s�ϥ�"
+#~ msgid "%s conflicts with %s"
+#~ msgstr "%s �M��P %s �۽Ĭ�"
+
+#~ msgid "%s is needed by %s"
+#~ msgstr "%s �M��Q %s �һݭn"
+
#~ msgid "Remove them all?"
#~ msgstr "�����L�̥����H"