summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--po/af.po186
-rw-r--r--po/ar.po209
-rw-r--r--po/az.po204
-rw-r--r--po/bg.po222
-rw-r--r--po/bn.po211
-rw-r--r--po/br.po184
-rw-r--r--po/bs.po207
-rw-r--r--po/ca.po210
-rw-r--r--po/cs.po200
-rw-r--r--po/cy.po200
-rw-r--r--po/da.po311
-rw-r--r--po/de.po202
-rw-r--r--po/el.po213
-rw-r--r--po/eo.po200
-rw-r--r--po/es.po206
-rw-r--r--po/et.po207
-rw-r--r--po/eu.po331
-rw-r--r--po/fa.po211
-rw-r--r--po/fi.po203
-rw-r--r--po/fr.po204
-rw-r--r--po/fur.po209
-rw-r--r--po/ga.po180
-rw-r--r--po/gl.po206
-rw-r--r--po/he.po271
-rw-r--r--po/hi.po211
-rw-r--r--po/hr.po207
-rw-r--r--po/hu.po1034
-rw-r--r--po/id.po205
-rw-r--r--po/is.po203
-rw-r--r--po/it.po204
-rw-r--r--po/ja.po204
-rw-r--r--po/ka.po184
-rw-r--r--po/ko.po211
-rw-r--r--po/ky.po219
-rw-r--r--po/lt.po208
-rw-r--r--po/lv.po195
-rw-r--r--po/mk.po213
-rw-r--r--po/mn.po198
-rw-r--r--po/ms.po732
-rw-r--r--po/mt.po206
-rw-r--r--po/nb.po200
-rw-r--r--po/nl.po206
-rw-r--r--po/nn.po306
-rw-r--r--po/pa_IN.po209
-rw-r--r--po/pl.po372
-rw-r--r--po/pt.po348
-rw-r--r--po/pt_BR.po211
-rw-r--r--po/ro.po208
-rw-r--r--po/ru.po931
-rw-r--r--po/sc.po209
-rw-r--r--po/sk.po211
-rw-r--r--po/sl.po358
-rw-r--r--po/sq.po209
-rw-r--r--po/sr.po208
-rw-r--r--po/sr@Latn.po208
-rw-r--r--po/sv.po353
-rw-r--r--po/tg.po208
-rw-r--r--po/th.po194
-rw-r--r--po/tl.po213
-rw-r--r--po/tr.po212
-rw-r--r--po/uk.po204
-rw-r--r--po/urpmi.pot154
-rw-r--r--po/uz.po167
-rw-r--r--po/uz@cyrillic.po167
-rw-r--r--po/vi.po213
-rw-r--r--po/wa.po203
-rw-r--r--po/zh_CN.po200
-rw-r--r--po/zh_TW.po204
68 files changed, 8716 insertions, 8191 deletions
diff --git a/po/af.po b/po/af.po
index bd315c33..e38a9413 100644
--- a/po/af.po
+++ b/po/af.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\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"
@@ -87,12 +87,7 @@ msgstr "Kanselleer"
msgid "Choose location to save file"
msgstr "Kies 'n lêer"
-#: ../gurpmi.pm:80
-#, fuzzy, c-format
-msgid "Unknown option %s"
-msgstr "Onbekende konneksie tipe"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Geen opdrag gespesifiseer nie"
@@ -206,12 +201,12 @@ msgstr "Herlaaistelsel word voorberei..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Installeer tans pakket %s (%s/%s)...."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Plaas asseblief die media bekend as \"%s\" in aandrywer [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, fuzzy, c-format
msgid "Downloading package `%s'..."
msgstr "Laai tans pakket '%s' (%s/%s) af ..."
@@ -403,6 +398,16 @@ msgstr ""
msgid "Copying failed"
msgstr "Aanteken gevaal"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "Rekening bestaan reeds\n"
+
+#: ../urpm/cdrom.pm:206
+#, fuzzy, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "Ondersoek die afgeleë medialêer '%s'..."
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -709,7 +714,12 @@ msgstr "Moet ons 'n installasie sonder afhanklikheidstoetsing probeer? (j/N) "
msgid "Try harder to install (--force)? (y/N) "
msgstr "Moet ons die installasie afdwing (--force) ? (j/N) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -723,11 +733,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "installasie instruksies"
msgstr[1] "installasie instruksies"
-#: ../urpm/main_loop.pm:281
-#, fuzzy, c-format
-msgid "Installation is possible"
-msgstr "Installasie probleem"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -753,6 +758,11 @@ msgstr "Alles is alreeds installeer"
msgid "Packages %s can not be installed"
msgstr "Alles is alreeds installeer"
+#: ../urpm/main_loop.pm:307
+#, fuzzy, c-format
+msgid "Installation is possible"
+msgstr "Installasie probleem"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -785,29 +795,9 @@ msgstr ""
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
+msgid "failed to migrate removable device, ignoring media"
msgstr ""
-#: ../urpm/media.pm:410
-#, fuzzy, c-format
-msgid "taking removable device as \"%s\""
-msgstr "Verwyderbare media"
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr ""
-
-#: ../urpm/media.pm:416
-#, fuzzy, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "Verwyderbare media"
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "Probleme met skep van media."
-
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, fuzzy, c-format
msgid "wrote config file [%s]"
@@ -865,12 +855,7 @@ msgstr "%s from media %s"
msgid "adding medium \"%s\""
msgstr "Redigeer media \"%s\":"
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "Probleme met skep van media."
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -985,15 +970,7 @@ msgstr "Kan nie lêer: %s skep nie"
msgid "comparing %s and %s"
msgstr "%s word installeer\n"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "Kopieer die lêer vir media '%s'..."
@@ -1160,36 +1137,21 @@ msgstr ""
msgid "unable to use parallel option \"%s\""
msgstr " op pallelle poort #%s"
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "Probleme met skep van media."
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, fuzzy, c-format
msgid "mounting %s"
msgstr "Verwyder %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, fuzzy, c-format
msgid "unmounting %s"
msgstr "fout met onthegting van %s: %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "Rekening bestaan reeds\n"
-
-#: ../urpm/removable.pm:143
-#, fuzzy, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "Ondersoek die afgeleë medialêer '%s'..."
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr ""
-
-#: ../urpm/removable.pm:163
-#, fuzzy, c-format
-msgid "unable to access medium \"%s\""
-msgstr "Probleme met skep van media."
-
#: ../urpm/search.pm:29 ../urpmf:29
#, fuzzy, c-format
msgid ""
@@ -2238,19 +2200,19 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:621
-#, fuzzy, c-format
-msgid "Press Enter when ready..."
-msgstr "Druk ENTER wanneer u reg is..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Kanselleer"
@@ -2271,7 +2233,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2372,12 +2334,7 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, fuzzy, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -v - woordryke modus.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, fuzzy, c-format
msgid " -q - quiet mode.\n"
msgstr " -v - woordryke modus.\n"
@@ -2784,20 +2741,30 @@ msgstr " --help - druk hierdie help boodskap.\n"
#: ../urpmq:81
#, fuzzy, c-format
-msgid " --provides - print provides.\n"
+msgid " --conflicts - print conflicts.\n"
msgstr " -v - woordryke modus.\n"
#: ../urpmq:82
#, fuzzy, c-format
+msgid " --provides - print provides.\n"
+msgstr " -v - woordryke modus.\n"
+
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " -v - woordryke modus.\n"
+
+#: ../urpmq:84
+#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --help - druk hierdie help boodskap.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr ""
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -2885,7 +2852,12 @@ msgstr ""
msgid "--list-nodes can only be used with --parallel"
msgstr ""
-#: ../urpmq:360
+#: ../urpmq:206
+#, c-format
+msgid "use -l to list files"
+msgstr ""
+
+#: ../urpmq:363
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -2913,6 +2885,34 @@ msgid "No changelog found\n"
msgstr "Geen beeld gevind nie"
#, fuzzy
+#~ msgid "Unknown option %s"
+#~ msgstr "Onbekende konneksie tipe"
+
+#, fuzzy
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "Verwyderbare media"
+
+#, fuzzy
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "Verwyderbare media"
+
+#, fuzzy
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "Probleme met skep van media."
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "Probleme met skep van media."
+
+#, fuzzy
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Druk ENTER wanneer u reg is..."
+
+#, fuzzy
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -v - woordryke modus.\n"
+
+#, fuzzy
#~ msgid "unable to parse synthesis file of \"%s\""
#~ msgstr "Kan nie lêer %s oopmaak nie\n"
diff --git a/po/ar.po b/po/ar.po
index 4104c15d..d4e1ba46 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ar\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2005-09-05 17:40+0300\n"
"Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
"Language-Team: Arabic <support@arabeyes.org>\n"
@@ -108,14 +108,7 @@ msgstr "ال_غاء"
msgid "Choose location to save file"
msgstr "اختر مكان حفظ الملف"
-#: ../gurpmi.pm:80
-#, fuzzy, c-format
-msgid "Unknown option %s"
-msgstr ""
-"\n"
-"خيارات غير معروفة '%s'\n"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, fuzzy, c-format
msgid "No packages specified"
msgstr "لا توجد حزمة بالإسم %s"
@@ -228,12 +221,12 @@ msgstr "جاري التحضير..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "جاري تثبيت الحزمة `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "يرجى ادخال الوسيط \"%s\" في الجهاز [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "جاري تنزيل الحزمة `%s'..."
@@ -425,6 +418,16 @@ msgstr ""
msgid "Copying failed"
msgstr "فشل النّسخ"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "الوسيط \"%s\" غير مختار"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "لم يمكن قراءة ملف rpm [%s] من الوسيط \"%s\""
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -731,7 +734,12 @@ msgstr "محاولة التثبيت دون التأكد من الاعتمادا
msgid "Try harder to install (--force)? (y/N) "
msgstr "حاول التثبيت بشكل أقوى (--force)؟ (y[نعم]/N[لا])."
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -747,11 +755,6 @@ msgstr[1] "فشل معاملات تثبيت %d"
msgstr[2] "فشل معاملات تثبيت %d"
msgstr[3] "فشل معاملات تثبيت %d"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "التثبيت ممكن"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -777,6 +780,11 @@ msgstr "كل شئ مثبت مسبقا"
msgid "Packages %s can not be installed"
msgstr "كل شئ مثبت مسبقا"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "التثبيت ممكن"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -809,28 +817,8 @@ msgstr "جاري محاولة تخطّي الوسيط الموجود \"%s\"، ج
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "نقاط تجهيز كثيرة جدا للوسيط القابل للإزالة \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "جاري أخذ الأجهزة القابلة للإزالة كـ\"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "الوسيط \"%s\" هو صورة ISO، سيتم تثبيتها خلال العمل"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "جاري استخدام الجهاز الآخر القابل للإزالة [%s] لـ\"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "لم يمكن استرجاع اسم المسار للوسيط القابل للإزالة \"%s\""
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -891,12 +879,7 @@ msgstr "جاري قراءة الترويسة من الوسيط \"%s\""
msgid "adding medium \"%s\""
msgstr "جاري ازالة الوسيط \"%s\""
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "لم يمكن الوصول الى أول وسيط تخزين"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -1011,17 +994,7 @@ msgstr "جاري اختبار ملف hdlist [%s]"
msgid "comparing %s and %s"
msgstr "جاري تثبيت %s من %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"لم يمكن الوصول للوسيط \"%s\"،\n"
-"قد يحدث هذا إن قيام بتجهيز الدليل يدويّاً عند إنشاء الوسيط."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "لم يمكن ايجاد ملف hdlist للوسيط \"%s\""
@@ -1188,36 +1161,21 @@ msgstr "تم ايجاد المتعامل المتوازي للعقد: %s"
msgid "unable to use parallel option \"%s\""
msgstr "تعذر استخدام الخيار المتوازي \"%s\""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "لم يمكن الوصول الى الوسيط \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "جاري تجهيز %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "جاري ازالة تجهيز %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "الوسيط \"%s\" غير مختار"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "لم يمكن قراءة ملف rpm [%s] من الوسيط \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "تم تحديد الوسيط المفكّك \"%s\" على أنه قابل للإزالة إلا أنه ليس كذلك"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "لم يمكن الوصول الى الوسيط \"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, fuzzy, c-format
msgid ""
@@ -2287,7 +2245,12 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2296,12 +2259,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "اضغط Enter عند الاستعداد..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "إلغاء"
@@ -2322,7 +2280,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2440,12 +2398,7 @@ msgstr " --nopubkey - عدم استيراد pubkey للوسط المضاف\
msgid " --raw - add the media in config, but don't update it.\n"
msgstr " --raw - إضافة الوسط في التهيئة، ولكن دون تحديثه.\n"
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - نظّف دليل ذاكرة الترويسات المخبّئة.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - وضع هادئ.\n"
@@ -2867,20 +2820,30 @@ msgstr " --changelog - اطبع سجلّ التغيير.\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - اطبع الصّفة يعارض : كل التعارضات.\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - اطبع الصّفة يُوفّر : كل ما يُوفّره.\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - اطبع الصّفة يتطلّب : كل ما يتطلّب.\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - اطبع الصّفة sourcerpm: الحزمة المصدريّة.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - عرض التلخيص.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -2971,7 +2934,12 @@ msgstr " الأسماء أو ملفات rpm المعطاة على سطر الأ
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes يمكن استخدامه فقط مع --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "غير قادر على كتابة ملف القوائم لـ \"%s\""
+
+#: ../urpmq:363
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3006,6 +2974,48 @@ msgstr ""
msgid "No changelog found\n"
msgstr "لم يُعثر على سجلّ تغييرات\n"
+#, fuzzy
+#~ msgid "Unknown option %s"
+#~ msgstr ""
+#~ "\n"
+#~ "خيارات غير معروفة '%s'\n"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "نقاط تجهيز كثيرة جدا للوسيط القابل للإزالة \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "جاري أخذ الأجهزة القابلة للإزالة كـ\"%s\""
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "الوسيط \"%s\" هو صورة ISO، سيتم تثبيتها خلال العمل"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "جاري استخدام الجهاز الآخر القابل للإزالة [%s] لـ\"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "لم يمكن استرجاع اسم المسار للوسيط القابل للإزالة \"%s\""
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "لم يمكن الوصول الى أول وسيط تخزين"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "لم يمكن الوصول للوسيط \"%s\"،\n"
+#~ "قد يحدث هذا إن قيام بتجهيز الدليل يدويّاً عند إنشاء الوسيط."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "تم تحديد الوسيط المفكّك \"%s\" على أنه قابل للإزالة إلا أنه ليس كذلك"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "اضغط Enter عند الاستعداد..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - نظّف دليل ذاكرة الترويسات المخبّئة.\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "الوسيط الوهمي يجب أن يكون محلياً"
@@ -3255,9 +3265,6 @@ msgstr "لم يُعثر على سجلّ تغييرات\n"
#~ msgid "file [%s] already used in the same medium \"%s\""
#~ msgstr "الملف [%s] مستخدم مسبقا في الوسيط نفسه \"%s\""
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "غير قادر على كتابة ملف القوائم لـ \"%s\""
-
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "لا شئ تمت كتايته في ملف القوائم لـ \"%s\""
diff --git a/po/az.po b/po/az.po
index 6c302cbc..260bfb08 100644
--- a/po/az.po
+++ b/po/az.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-az\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2004-09-12 20:33+0300\n"
"Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
"Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -110,14 +110,7 @@ msgstr "_Ləğv Et"
msgid "Choose location to save file"
msgstr "Qeyd ediləcək ünvanı seçin"
-#: ../gurpmi.pm:80
-#, fuzzy, c-format
-msgid "Unknown option %s"
-msgstr ""
-"\n"
-"naməlum seçənəklər '%s'\n"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Əmr tə'yin edilməyib"
@@ -227,12 +220,12 @@ msgstr "Hazırlanır..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "`%s' paketi qurulur (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Lütfən \"%s\" medyasını [%s] avadanlığına yerləşdirin"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "`%s' paketi endirilir..."
@@ -422,6 +415,16 @@ msgstr ""
msgid "Copying failed"
msgstr "Köçütrmə bacarılmadı"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "\"%s\" medyası seçili deyil"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "\"%s\" medyasından [%s] rpm faylı oxuna bilmir"
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -728,7 +731,12 @@ msgstr "Paket asılılıqlarına fikir vermədən qurmağı sınayım? (b/X) "
msgid "Try harder to install (--force)? (y/N) "
msgstr "Quruluşu zorlayaraq sınayım (--force)? (b/X)"
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -741,11 +749,6 @@ msgid "%d installation transaction failed"
msgid_plural "%d installation transactions failed"
msgstr[0] "%d qurulum daşınmaları bacarılmadı"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Qurulum mümkündür"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -771,6 +774,11 @@ msgstr "hər şey onsuzda quruludur"
msgid "Packages %s can not be installed"
msgstr "hər şey onsuzda quruludur"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Qurulum mümkündür"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -803,29 +811,9 @@ msgstr "mövcud medya \"%s\" yan keçilməyə çalışıldı, imtina edirəm"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "\"%s\" çıxardıla bilən mediyası üçün həddindən çox bağlama nöqtəsi"
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "çıxardıla bilən avadanlıq \"%s\" olaraq alınır"
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+msgid "failed to migrate removable device, ignoring media"
msgstr ""
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "\"%1$s\" üçün fərqli çıxardıla bilən avadanlıq [%2$s] işlət"
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "\"%s\" çıxardıla bilən mediyumu üçün cığır adı alına bilmədi"
-
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
msgid "wrote config file [%s]"
@@ -885,12 +873,7 @@ msgstr "\"%s\" medyasından üst mə'lumatlar oxunur"
msgid "adding medium \"%s\""
msgstr "\"%s\" medyumu çıxardılır"
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "Birinci qurulum medyumuna yetişilə bilmir"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -1006,17 +989,7 @@ msgstr "[%s] hdlist faylı yoxlanır"
msgid "comparing %s and %s"
msgstr "%s qurulur"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"\"%s\" mediyumuna yetişilə bilmədi,\n"
-"bu, mediyum yaradarkən cərgəni əl ilə bağlayanda baş göstərə bilər."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "\"%s\" medyası hdlist faylı tapılmadı"
@@ -1183,36 +1156,21 @@ msgstr "düyümlər üçün paralel tutucu tapıldı: %s"
msgid "unable to use parallel option \"%s\""
msgstr " \"%s\" paralel seçənəyi işlədilə bilmədi"
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "\"%s\" medyasına çatıla bilmir"
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "%s bağlanır"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "%s ayrılır"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "\"%s\" medyası seçili deyil"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "\"%s\" medyasından [%s] rpm faylı oxuna bilmir"
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "\"%s\" inkeherent medyası söküləbilən deyə bildirilib, amma deyil"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "\"%s\" medyasına çatıla bilmir"
-
#: ../urpm/search.pm:29 ../urpmf:29
#, fuzzy, c-format
msgid ""
@@ -2279,18 +2237,18 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Hazır olanda Enter düyməsinə basın..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Ləğv et"
@@ -2311,7 +2269,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2429,12 +2387,7 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - başlıq ara yaddaşı cərgəsini təmizlə.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - səssiz mod.\n"
@@ -2856,20 +2809,30 @@ msgstr " --changelog - dəyişmə qeydi faylını göstər.\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - taq toqquşmalarını göstər: bütün toqquşmalar.\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - taq gətirənini göstər: bütün gətirənlər.\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - taq lazımlılarını göstər: bütün lazımlılar.\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - taq sourcerpm'ini göstər: source rpm.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - taq icmalını göstər: icmal.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -2961,7 +2924,12 @@ msgstr " əmr sətirində verilən adlar ya da rpm faylları sorğulanacaq.\n"
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes ancaq --parallel ilə bərabər istifadə edilə bilər"
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "\"%s\" fayl siyahısı yazıla bilmi"
+
+#: ../urpmq:363
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -2989,6 +2957,45 @@ msgid "No changelog found\n"
msgstr "Rəsm tapıla bilmədi"
#, fuzzy
+#~ msgid "Unknown option %s"
+#~ msgstr ""
+#~ "\n"
+#~ "naməlum seçənəklər '%s'\n"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "\"%s\" çıxardıla bilən mediyası üçün həddindən çox bağlama nöqtəsi"
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "çıxardıla bilən avadanlıq \"%s\" olaraq alınır"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "\"%1$s\" üçün fərqli çıxardıla bilən avadanlıq [%2$s] işlət"
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "\"%s\" çıxardıla bilən mediyumu üçün cığır adı alına bilmədi"
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "Birinci qurulum medyumuna yetişilə bilmir"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "\"%s\" mediyumuna yetişilə bilmədi,\n"
+#~ "bu, mediyum yaradarkən cərgəni əl ilə bağlayanda baş göstərə bilər."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "\"%s\" inkeherent medyası söküləbilən deyə bildirilib, amma deyil"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Hazır olanda Enter düyməsinə basın..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - başlıq ara yaddaşı cərgəsini təmizlə.\n"
+
+#, fuzzy
#~ msgid "virtual medium needs to be local"
#~ msgstr "\"%s\" vertual medyumu yerli deyil, medyum rədd edildi"
@@ -3221,9 +3228,6 @@ msgstr "Rəsm tapıla bilmədi"
#~ msgid "file [%s] already used in the same medium \"%s\""
#~ msgstr "[%s] faylı onsuzda eyni \"%s\" mediyumda işlədilib"
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "\"%s\" fayl siyahısı yazıla bilmi"
-
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "\"%s\" üçün siyahı faylında bir şey yazılmır"
diff --git a/po/bg.po b/po/bg.po
index a1c28d9e..f180abc9 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-bg\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2003-08-18 15:59+0300\n"
"Last-Translator: Boyan Ivanov <boyan17@bulgaria.com>\n"
"Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -107,12 +107,7 @@ msgstr " Отказ"
msgid "Choose location to save file"
msgstr "Изберете място за запис на файл"
-#: ../gurpmi.pm:80
-#, fuzzy, c-format
-msgid "Unknown option %s"
-msgstr "Неизвестен хост %1"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Не е въведена команда"
@@ -228,12 +223,12 @@ msgstr "Подготовка..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Инсталиране на пакет `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Моля, поставете източник с име \"%s\" в устройство [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Сваляне на пакет `%s'..."
@@ -426,6 +421,16 @@ msgstr ""
msgid "Copying failed"
msgstr "Неуспешно влизане"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "източникът \"%s\" не е избран"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "невъзможно четене на rpm файл [%s] от източник \"%s\""
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -734,7 +739,12 @@ msgstr "Опит за инсталиране без проверка на зав
msgid "Try harder to install (--force)? (y/N) "
msgstr "Опит за инсталиране даже по-силно (--force)? (д/Н) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -748,11 +758,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "%d инсталационните транзакции не можаха да се осъществят"
msgstr[1] "%d инсталационните транзакции не можаха да се осъществят"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Инсталацията е възможна"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -778,6 +783,11 @@ msgstr "Пакета(тите) вече са инсталирани"
msgid "Packages %s can not be installed"
msgstr "Пакета(тите) вече са инсталирани"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Инсталацията е възможна"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -811,34 +821,10 @@ msgstr "невъзможен достъп до hdlist файла за \"%s\", и
msgid "trying to override existing medium \"%s\", skipping"
msgstr "опит за игнориране на съществуващ източник \"%s\", избягване"
-# Another meaning of the word is in the sense "The iron is good medium for the eletricity"
-# in this case must be "проводник"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "твърде много точки на монтиране за сменяем източник \"%s\""
-
-#: ../urpm/media.pm:410
-#, fuzzy, c-format
-msgid "taking removable device as \"%s\""
-msgstr "Преместваемо устройство е \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "Източника \"%s\" е ISO образ, ще бъде монтиран автоматично"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "използване на различно сменяемо устройство [%s] за \"%s\""
-
-# Another meaning of the word is in the sense "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "невъзможно възстановяване на пътя до сменяем източник \"%s\""
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -899,12 +885,7 @@ msgstr "четене на headers от източник \"%s\""
msgid "adding medium \"%s\""
msgstr "премахване на източник \"%s\":"
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "невъзможен достъп до източника за първоначална инсталация"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -1025,18 +1006,7 @@ msgstr "проверка на hdlists файла [%s]"
msgid "comparing %s and %s"
msgstr "инсталиране %s\n"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"няма достъп до източник \"%s\",\n"
-"това може да стане ако ръчно сте монтирали директорията когато есъздаден "
-"източника."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "не е намерен hdlist файл за източник \"%s\""
@@ -1203,37 +1173,21 @@ msgstr "намерен паралелен handler за възли: %s"
msgid "unable to use parallel option \"%s\""
msgstr "невъзможно е да се ползва паралелен режим \"%s\""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "невъзможен достъп до източник \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "монтиране на %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "демонтиране на %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "източникът \"%s\" не е избран"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "невъзможно четене на rpm файл [%s] от източник \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr ""
-"некоректен източник \"%s\" е маркиран като сменяем, но в действителност не е"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "невъзможен достъп до източник \"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, fuzzy, c-format
msgid ""
@@ -2297,19 +2251,19 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Натиснете Enter,когато сте готови..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Отказ"
@@ -2330,7 +2284,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2438,12 +2392,7 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - почистване на хедър кеш директорията.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, fuzzy, c-format
msgid " -q - quiet mode.\n"
msgstr " -v - показва всички съобщения\n"
@@ -2869,20 +2818,32 @@ msgstr " --changelog - отпечатва списък с промените
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr ""
+" --conflicts - отпечатва конфликтите на тага: всички конфликти "
+"(множество редове)."
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr " --url - отпечатва url тага: url.\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --url - отпечатва url тага: url.\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --summary - отпечатва резюме за тага: summary.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - отпечатва резюме за тага: summary.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -2971,7 +2932,12 @@ msgstr "имена или rpm файлове от командния ред се
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes може да се използва само с --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "невъзможен запис на лист файл за \"%s\""
+
+#: ../urpmq:363
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -2998,6 +2964,55 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Не е намерен changelog\n"
+#, fuzzy
+#~ msgid "Unknown option %s"
+#~ msgstr "Неизвестен хост %1"
+
+# Another meaning of the word is in the sense "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "твърде много точки на монтиране за сменяем източник \"%s\""
+
+#, fuzzy
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "Преместваемо устройство е \"%s\""
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "Източника \"%s\" е ISO образ, ще бъде монтиран автоматично"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "използване на различно сменяемо устройство [%s] за \"%s\""
+
+# Another meaning of the word is in the sense "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#, fuzzy
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "невъзможно възстановяване на пътя до сменяем източник \"%s\""
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "невъзможен достъп до източника за първоначална инсталация"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "няма достъп до източник \"%s\",\n"
+#~ "това може да стане ако ръчно сте монтирали директорията когато есъздаден "
+#~ "източника."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr ""
+#~ "некоректен източник \"%s\" е маркиран като сменяем, но в действителност "
+#~ "не е"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Натиснете Enter,когато сте готови..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - почистване на хедър кеш директорията.\n"
+
# Another meaning of the word is in the sense "The iron is good medium for the eletricity"
# in this case must be "проводник"
# "list" is translated in the meaning of "list file"
@@ -3261,9 +3276,6 @@ msgstr "Не е намерен changelog\n"
#~ msgid "file [%s] already used in the same medium \"%s\""
#~ msgstr "файла [%s] вече е използван от същият източник \"%s\""
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "невъзможен запис на лист файл за \"%s\""
-
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "нищо не е записано в лист файла за \"%s\""
diff --git a/po/bn.po b/po/bn.po
index 3f30b563..12d99737 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -25,7 +25,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2005-02-13 13:39+0600\n"
"Last-Translator: Jamil Ahmed <jamil@bengalinux.org>\n"
"Language-Team: Bangla <mdk-translation@bengalinux.org>\n"
@@ -120,14 +120,7 @@ msgstr "বাতিল (_ত)"
msgid "Choose location to save file"
msgstr "ফাইল সংরক্ষণ করার অবস্থান বেছে নিন"
-#: ../gurpmi.pm:80
-#, fuzzy, c-format
-msgid "Unknown option %s"
-msgstr ""
-"\n"
-"অপরিচিত অপশনসমূহ '%s'\n"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, fuzzy, c-format
msgid "No packages specified"
msgstr "কোন নির্দেশ পাওয়া যায় নি"
@@ -241,12 +234,12 @@ msgstr "প্রস্তুত করা হচ্ছে..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "`%s' প্যাকেজ ইনস্টল করা হচ্ছে (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "অনুগ্রহ করে \"%s\" নামের মাধ্যম [%s] নামের ডিভাইসে প্রবেশ করান"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "`%s' প্যাকেজ ডাউনলোড করা হচ্ছে..."
@@ -438,6 +431,16 @@ msgstr ""
msgid "Copying failed"
msgstr "কপি করতে ব্যর্থ"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "মাধ্যম \"%s\" নির্বাচিত হয়নি"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "\"%s\" মাধ্যমের জন্য [%s] rpm ফাইল পড়া যায়নি"
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -745,7 +748,12 @@ msgstr "ডিপেন্ডেন্সিসমুহ পরীক্ষা
msgid "Try harder to install (--force)? (y/N) "
msgstr "আরও জোরালোভাবে ইনস্টলের চেষ্টার করবো (--force)? (y/N)"
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -759,11 +767,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "%d ইনস্টলেশনের লেনদেন ব্যর্থ হয়েছে"
msgstr[1] "%d ইনস্টলেশনের লেনদেন ব্যর্থ হয়েছে"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "ইনস্টলেশন সম্ভব"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -789,6 +792,11 @@ msgstr "সবকিছু আগে থেকেই ইনস্টল কর
msgid "Packages %s can not be installed"
msgstr "সবকিছু আগে থেকেই ইনস্টল করা আছে"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "ইনস্টলেশন সম্ভব"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -822,28 +830,8 @@ msgstr "বিদ্যমান মাধ্যম \"%s\" এড়াবার
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "স্থানান্তরযোগ্য মাধ্যম \"%s\"-এর জন্য প্রচুর মাউন্ট পয়েন্ট"
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "স্থানান্তরযোগ্য ডিভাইসকে \"%s\" হিসেবে নেয়া হলো"
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "\"%s\" মাধ্যম একটি ISO ইমেজ, এটি চালানোর সময় মাউন্ট করা হবে"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "অন্যান্য স্থানান্তরযোগ্য ডিভাইস [%s]-কে \"%s\"-এর জন্য ব্যবহার করা হচ্ছে"
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "স্থানান্তরযোগ্য মাধ্যম \"%s\"-এর পাথনেম উদ্ধার করা সম্ভব হয়নি"
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -904,12 +892,7 @@ msgstr "\"%s\" মাধ্যম থেকে হেডার পড়া হচ
msgid "adding medium \"%s\""
msgstr "\"%s\" মাধ্যম সরানো হচ্ছে"
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "প্রথম ইনস্টলেশন মাধ্যম ব্যবহার করা যাচ্ছেনা"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -1025,17 +1008,7 @@ msgstr "hdlist ফাইল [%s] পরীক্ষা করা হচ্ছে
msgid "comparing %s and %s"
msgstr "%s ইনস্টল করা হচ্ছে %s থেকে"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"\"%s\" মাধ্যম ব্যবহার করা যায়নি,\n"
-"মাধ্যম তৈরীর সময় আপনি নিজ হাতে ডিরেক্টরী তৈরী করার কারনে এরকম হতে পারে।"
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "\"%s\" মাধ্যমের জন্য কোন hdlist ফাইল পাওয়া যায়নি"
@@ -1202,37 +1175,21 @@ msgstr "সমান্তরাল পরিচলাক পাওয়া গি
msgid "unable to use parallel option \"%s\""
msgstr "সমান্তরাল অপশন \"%s\" ব্যবহারে অক্ষম"
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "\"%s\" মাধ্যম ব্যবহার করা যায়নি"
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "%s মাউন্ট করা হচ্ছে"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "%s আনমাউন্ট করা হচ্ছে"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "মাধ্যম \"%s\" নির্বাচিত হয়নি"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "\"%s\" মাধ্যমের জন্য [%s] rpm ফাইল পড়া যায়নি"
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr ""
-"\"%s\" incoherent মাধ্যম স্থানান্তরযোগ্য হিসেবে চিহ্নিত হয়েছে কিন্তু আসলে তা নয়"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "\"%s\" মাধ্যম ব্যবহার করা যায়নি"
-
#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
@@ -2307,19 +2264,19 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "প্রস্তুত হলে Enter চাপুন..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "বাতিল"
@@ -2340,7 +2297,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2458,12 +2415,7 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - হেডার ক্যাশ ডিরেক্টরি পরিষ্কার করো।\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - নির্বিকার ভাবে।\n"
@@ -2884,20 +2836,30 @@ msgstr " --changelog - প্রিন্টের changelog.\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - all conflicts: conflicts ট্যাগ ছাপাও।\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - all provides: provides ট্যাগ ছাপাও।\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - all requires: requires ট্যাগ ছাপাও।\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - source rpm: sourcerpm ট্যাগ ছাপাও।\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --epoch - summary: summary ট্যাগ ছাপাও।\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -2987,7 +2949,12 @@ msgstr " কমান্ডলাইনে প্রদত্ত নাম ব
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes শুধুমাত্র --parallel এর সাথে ব্যবহৃত হতে পারে"
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "\"%s\"-এর তালিকা ফাইল লেখা যায়নি"
+
+#: ../urpmq:363
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3022,6 +2989,49 @@ msgstr ""
msgid "No changelog found\n"
msgstr "changelog পাওয়া যায়নি\n"
+#, fuzzy
+#~ msgid "Unknown option %s"
+#~ msgstr ""
+#~ "\n"
+#~ "অপরিচিত অপশনসমূহ '%s'\n"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "স্থানান্তরযোগ্য মাধ্যম \"%s\"-এর জন্য প্রচুর মাউন্ট পয়েন্ট"
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "স্থানান্তরযোগ্য ডিভাইসকে \"%s\" হিসেবে নেয়া হলো"
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "\"%s\" মাধ্যম একটি ISO ইমেজ, এটি চালানোর সময় মাউন্ট করা হবে"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "অন্যান্য স্থানান্তরযোগ্য ডিভাইস [%s]-কে \"%s\"-এর জন্য ব্যবহার করা হচ্ছে"
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "স্থানান্তরযোগ্য মাধ্যম \"%s\"-এর পাথনেম উদ্ধার করা সম্ভব হয়নি"
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "প্রথম ইনস্টলেশন মাধ্যম ব্যবহার করা যাচ্ছেনা"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "\"%s\" মাধ্যম ব্যবহার করা যায়নি,\n"
+#~ "মাধ্যম তৈরীর সময় আপনি নিজ হাতে ডিরেক্টরী তৈরী করার কারনে এরকম হতে পারে।"
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr ""
+#~ "\"%s\" incoherent মাধ্যম স্থানান্তরযোগ্য হিসেবে চিহ্নিত হয়েছে কিন্তু আসলে তা নয়"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "প্রস্তুত হলে Enter চাপুন..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - হেডার ক্যাশ ডিরেক্টরি পরিষ্কার করো।\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "ভার্চুয়াল মাধ্যম স্থানীয় হতে হবে"
@@ -3275,9 +3285,6 @@ msgstr "changelog পাওয়া যায়নি\n"
#~ msgid "file [%s] already used in the same medium \"%s\""
#~ msgstr "ফাইল [%s] আগে থেকেই একই মাধ্যম \"%s\" এর ব্যবহারে রয়েছে"
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "\"%s\"-এর তালিকা ফাইল লেখা যায়নি"
-
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "\"%s\"-এর তালিকা ফাইলে কিছুই লেখা হয়নি"
diff --git a/po/br.po b/po/br.po
index 67bb2be7..8301ce72 100644
--- a/po/br.po
+++ b/po/br.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2008-02-25 11:28+0100\n"
"Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n"
"Language-Team: Breton <LL@li.org>\n"
@@ -93,12 +93,7 @@ msgstr "_Nullañ"
msgid "Choose location to save file"
msgstr "Dibabit lec'hiadur da enrollañ ar restr"
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "Dianav eo an dibarzh %s"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "N'eus pakad dibabet ebet"
@@ -210,12 +205,12 @@ msgstr "O prientiñ ..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "O staliañ ar pakad `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Enlakait ar medium a vez graet « %s » anezhañ war trobarzhell [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "O tigas ar pakad « %s » ..."
@@ -402,6 +397,16 @@ msgstr ""
msgid "Copying failed"
msgstr "Fazi en ur eilañ"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, c-format
+msgid "medium \"%s\" is not available"
+msgstr "n'eo ket dibret ar medium « %s »"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "n'hellan ket lenn ar restr rpm [%s] eus ar medium « %s »"
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -708,7 +713,12 @@ msgstr "Klask staliañ hep sell ouzh an ezhommoù ? (y/N)"
msgid "Try harder to install (--force)? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -723,11 +733,6 @@ msgid "%d installation transaction failed"
msgid_plural "%d installation transactions failed"
msgstr[0] "%d gourc'hemenn staliañ zo bet sac'het"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Possubl eo an staliadur"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -753,6 +758,11 @@ msgstr "N'hell ket bet staliet ar pakad %s"
msgid "Packages %s can not be installed"
msgstr "N'hell ket bet staliet ar pakadoù %s"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Possubl eo an staliadur"
+
#: ../urpm/md5sum.pm:20
#, c-format
msgid "examining %s file"
@@ -785,29 +795,9 @@ msgstr ""
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "bez eus re poentoù marc'hañ evit ar medium lem/laka « %s »"
-
-#: ../urpm/media.pm:410
-#, fuzzy, c-format
-msgid "taking removable device as \"%s\""
-msgstr "Trobarzhell lem-laka"
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+msgid "failed to migrate removable device, ignoring media"
msgstr ""
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "oc'h implij un trobarzhell lem-laka all [%s] evit « %s »"
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "bez eus re poentoù marc'hañ evit ar medium lem/laka « %s »"
-
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
msgid "wrote config file [%s]"
@@ -865,12 +855,7 @@ msgstr "oc'h ouzhpennañ ar vedium « %s » a-raok ar vedium « %s »"
msgid "adding medium \"%s\""
msgstr "oc'h ouzhpennañ ar vedium « %s »"
-#: ../urpm/media.pm:750
-#, c-format
-msgid "unable to mount the distribution medium"
-msgstr ""
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -985,15 +970,7 @@ msgstr "sac'het eo bet genhdlist2 gant %s"
msgid "comparing %s and %s"
msgstr "o naetaat %s ha %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "siek eo restr hdlist %s evit ar vedium « %s »"
@@ -1160,36 +1137,21 @@ msgstr ""
msgid "unable to use parallel option \"%s\""
msgstr "n'hell ket bet bremañaet ar medium « %s »\n"
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "n'eo ket possubl da voned ar vedia « %s »"
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "o marc'hañ %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "o divarc'hañ %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not available"
-msgstr "n'eo ket dibret ar medium « %s »"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "n'hellan ket lenn ar restr rpm [%s] eus ar medium « %s »"
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr ""
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "n'eo ket possubl da voned ar vedia « %s »"
-
#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
@@ -2216,18 +2178,18 @@ msgstr "%s egor pladenn ouzphenn a vo bet implijet."
msgid "%s of disk space will be freed."
msgstr "%s egor pladenn a vo bet dieubet."
-#: ../urpmi:603
+#: ../urpmi:604
+#, fuzzy, c-format
+msgid "%s of packages will be retrieved."
+msgstr "%s egor pladenn a vo bet dieubet."
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "War-nes bezañ staliañ eo %d pakad. Mont war-raok ?"
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Gwaskit « Mont » pa oc'h prest ..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Nullañ"
@@ -2248,7 +2210,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2349,12 +2311,7 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr ""
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr ""
@@ -2433,7 +2390,8 @@ msgid ""
msgstr ""
"urpmi.recover stumm %s\n"
"Copyright (C) 1999-2006 Mandriva.\n"
-"Ur meziant frank eo an hini-mañ ha moien zo da zal'ch anezhañ hervez GNU GPL.\n"
+"Ur meziant frank eo an hini-mañ ha moien zo da zal'ch anezhañ hervez GNU "
+"GPL.\n"
"\n"
"arveriadur :\n"
@@ -2765,20 +2723,30 @@ msgstr ""
#: ../urpmq:81
#, fuzzy, c-format
-msgid " --provides - print provides.\n"
+msgid " --conflicts - print conflicts.\n"
msgstr " --buildtime - amzer ar sevel\n"
#: ../urpmq:82
#, fuzzy, c-format
+msgid " --provides - print provides.\n"
+msgstr " --buildtime - amzer ar sevel\n"
+
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --buildtime - amzer ar sevel\n"
+
+#: ../urpmq:84
+#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - anv ar rpm tizh\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - diskouez an diverrañ.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -2866,7 +2834,12 @@ msgstr ""
msgid "--list-nodes can only be used with --parallel"
msgstr ""
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "n'hell ket skrivañ restr hdlist « %s »"
+
+#: ../urpmq:363
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -2893,6 +2866,26 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Changelog kavet ebet\n"
+#~ msgid "Unknown option %s"
+#~ msgstr "Dianav eo an dibarzh %s"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "bez eus re poentoù marc'hañ evit ar medium lem/laka « %s »"
+
+#, fuzzy
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "Trobarzhell lem-laka"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "oc'h implij un trobarzhell lem-laka all [%s] evit « %s »"
+
+#, fuzzy
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "bez eus re poentoù marc'hañ evit ar medium lem/laka « %s »"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Gwaskit « Mont » pa oc'h prest ..."
+
#~ msgid "Error generating names file: dependency %d not found"
#~ msgstr "Fazi en ur sevel anvioù restr : n'hell ket bet kavet an ezhomm %d"
@@ -3026,9 +3019,6 @@ msgstr "Changelog kavet ebet\n"
#~ msgid "file [%s] already used in the same medium \"%s\""
#~ msgstr "bez eo implijet c'hoazh ar restr [%s] er memes medium « %s »"
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "n'hell ket skrivañ restr hdlist « %s »"
-
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "bez eus netra skriver e restr roll evit « %s »"
diff --git a/po/bs.po b/po/bs.po
index 9abd6b37..ad568781 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: bs\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2006-09-13 21:02+0200\n"
"Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
"Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -108,12 +108,7 @@ msgstr "_Odustani"
msgid "Choose location to save file"
msgstr "Izaberi lokaciju za snimanje"
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "Nepoznata opcija '%s'"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "Nije naveden paket"
@@ -225,12 +220,12 @@ msgstr "Pripremam..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Instaliram paket `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Molim ubacite medij sa imenom \"%s\" u uređaj [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Downloadujem paket `%s'..."
@@ -422,6 +417,16 @@ msgstr "Previše argumenata\n"
msgid "Copying failed"
msgstr "Kopiranje nije uspjelo"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "medij \"%s\" nije izabran"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "ne mogu pročitati rpm datoteku [%s] sa medija \"%s\""
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -730,7 +735,12 @@ msgstr "Da pokušam instalaciju bez provjere ovisnosti? (d/N) "
msgid "Try harder to install (--force)? (y/N) "
msgstr "Pokušaj instalaciju još jače (--force opcija)? (d/N) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -745,11 +755,6 @@ msgstr[0] "%d instalacionih transakcija nije uspjelo"
msgstr[1] "%d instalacionih transakcija nije uspjelo"
msgstr[2] "%d instalacionih transakcija nije uspjelo"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Instalacija nije moguća"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -775,6 +780,11 @@ msgstr "sve je već instalirano"
msgid "Packages %s can not be installed"
msgstr "sve je već instalirano"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Instalacija nije moguća"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -807,28 +817,8 @@ msgstr "pokušavam prepisati postojeći medij \"%s\", preskačem"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "previše tačaka montiranja za izmjenjivi medij \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "uzimam izmjenjivi uređaj kao \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "Medij \"%s\" je ISO imidž, biće automatski montiran"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "koristeći različit izmjenjivi uređaj [%s] za \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ne mogu dobaviti put direktorija za uklonjivi medij \"%s\""
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -889,12 +879,7 @@ msgstr "dobavljam zaglavlja sa medija \"%s\""
msgid "adding medium \"%s\""
msgstr "uklanjam medij \"%s\""
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "ne mogu pristupiti prvom instalacionom mediju"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, fuzzy, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "izgleda da ovaj URL ne sadrži distrib"
@@ -1011,18 +996,7 @@ msgstr "ispitujem hdlist datoteku [%s]"
msgid "comparing %s and %s"
msgstr "Instaliram %s na %s..."
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"ne mogu pristupiti mediju \"%s\",\n"
-"ovo se moglo desiti ako ste ručno montirali direktorij prilikom pravljenja "
-"medija."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "nije pronađena hdlist datoteka za medij \"%s\""
@@ -1189,36 +1163,21 @@ msgstr "pronašao paralelni držač za čvorove: %s"
msgid "unable to use parallel option \"%s\""
msgstr "ne mogu koristiti paralelnu opciju \"%s\""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "ne mogu pristupiti mediju \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "montiram %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "demontiram %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "medij \"%s\" nije izabran"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "ne mogu pročitati rpm datoteku [%s] sa medija \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "nekoherentan medij \"%s\" je označen kao izmjenljiv, mada nije ustvari"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "ne mogu pristupiti mediju \"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
@@ -2304,7 +2263,12 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, fuzzy, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2312,12 +2276,7 @@ msgstr[0] "Da nastavim sa instalacijom %d paketa? (%d MB)"
msgstr[1] "Da nastavim sa instalacijom %d paketa? (%d MB)"
msgstr[2] "Da nastavim sa instalacijom %d paketa? (%d MB)"
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Pritisnite Enter kada budete spremni..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Odustani"
@@ -2338,7 +2297,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2456,12 +2415,7 @@ msgstr " --nopubkey - nemoj uvoziti pubkey dodanog medija\n"
msgid " --raw - add the media in config, but don't update it.\n"
msgstr " --raw - dodaj medij u konfiguraciju, ali bez ažuriranja.\n"
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - očisti direktorij sa spremnikom zaglavlja.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - tihi mod.\n"
@@ -2891,20 +2845,30 @@ msgstr " --changelog - ispiši dnevnik izmjena.\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - tagovi za konflikte\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - tag 'pruža'\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - tag 'zahtijeva'\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - naziv izvornog rpm-a\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - ispiši sažetak.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -2998,7 +2962,12 @@ msgstr " imena ili rpm datoteke dati na komandnoj liniji će biti ispitani.\n"
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes se može koristiti samo sa --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "ne mogu zapisati list datoteku za \"%s\""
+
+#: ../urpmq:363
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3033,6 +3002,47 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Nije pronađen changelog\n"
+#~ msgid "Unknown option %s"
+#~ msgstr "Nepoznata opcija '%s'"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "previše tačaka montiranja za izmjenjivi medij \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "uzimam izmjenjivi uređaj kao \"%s\""
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "Medij \"%s\" je ISO imidž, biće automatski montiran"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "koristeći različit izmjenjivi uređaj [%s] za \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "ne mogu dobaviti put direktorija za uklonjivi medij \"%s\""
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "ne mogu pristupiti prvom instalacionom mediju"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "ne mogu pristupiti mediju \"%s\",\n"
+#~ "ovo se moglo desiti ako ste ručno montirali direktorij prilikom "
+#~ "pravljenja medija."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr ""
+#~ "nekoherentan medij \"%s\" je označen kao izmjenljiv, mada nije ustvari"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Pritisnite Enter kada budete spremni..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - očisti direktorij sa spremnikom zaglavlja.\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "virtuelni medij mora biti lokalan"
@@ -3338,9 +3348,6 @@ msgstr "Nije pronađen changelog\n"
#~ msgid "file [%s] already used in the same medium \"%s\""
#~ msgstr "datoteka [%s] se već koristi na istom mediju \"%s\""
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "ne mogu zapisati list datoteku za \"%s\""
-
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "ništa nije zapisano u list datoteku za \"%s\""
diff --git a/po/ca.po b/po/ca.po
index 75e2119f..56d57807 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ca\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2005-09-19 23:29+0200\n"
"Last-Translator: Albert Astals Cid <astals11@terra.es>\n"
"Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -108,12 +108,7 @@ msgstr "_Cancel·la"
msgid "Choose location to save file"
msgstr "Escolliu la ubicació un desar el fitxer"
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "Opcions desconegudes %s"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "No s'ha especificat cap paquet"
@@ -224,12 +219,12 @@ msgstr "S'està preparant..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "S'està instal·lant el paquet `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Si us plau, inseriu la font anomenada \"%s\" al dispositiu [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "S'està descarregant el paquet `%s'..."
@@ -422,6 +417,16 @@ msgstr ""
msgid "Copying failed"
msgstr "La còpia ha fallat"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "la font \"%s\" no ha estat seleccionada"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "no s'ha pogut llegir el fitxer rpm [%s] des de la font \"%s\""
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -734,7 +739,12 @@ msgstr ""
msgid "Try harder to install (--force)? (y/N) "
msgstr "Voleu intentar la insta·lació encara amb més força (--force)? (s/N) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -748,11 +758,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "ha fallat %d transacció d'instal·lació"
msgstr[1] "han fallat %d transaccions d'instal·lació"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "La instal·lació és possible"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -778,6 +783,11 @@ msgstr "Ja està tot instal·lat"
msgid "Packages %s can not be installed"
msgstr "Ja està tot instal·lat"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "La instal·lació és possible"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -810,28 +820,8 @@ msgstr "provant de passar per alt la font existent \"%s\", evitant"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "massa punts de muntatge per la font extraïble \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "agafant dispositiu extraïble com a \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "La font \"%s\" és una imatge ISO, es muntarà al vol"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "utilitzant un dispositiu extraïble diferent [%s] per \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "no s'ha pogut determinar el camí i el nom de la font extraïble \"%s\""
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -892,12 +882,7 @@ msgstr "s'estan llegint les capçaleres de la font \"%s\""
msgid "adding medium \"%s\""
msgstr "s'està esborrant la font \"%s\""
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "no s'ha pogut accedir a la primera font d'instal·lació"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -1014,17 +999,7 @@ msgstr "s'està examinant el fitxer hdlist [%s]"
msgid "comparing %s and %s"
msgstr "s'està instal·lant %s des de %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"no s'ha pogut accedir a la font \"%s\",\n"
-"pot passar si havies muntat manualment el directori al crear la font."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "no s'ha trobat el fitxer hdlist per a la font \"%s\""
@@ -1191,37 +1166,21 @@ msgstr "s'ha trobat un manegador paral·lel per als nodes: %s"
msgid "unable to use parallel option \"%s\""
msgstr "no s'ha pogut usar l'opció de paral·lel \"%s\""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "no s'ha pogut accedir a al font \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "s'està muntant %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "s'està desmuntant %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "la font \"%s\" no ha estat seleccionada"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "no s'ha pogut llegir el fitxer rpm [%s] des de la font \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr ""
-"font incoherent \"%s\", marcada com a extraïble però no és així realment"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "no s'ha pogut accedir a al font \"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
@@ -2322,19 +2281,19 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, fuzzy, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "No s'han pogut instal·lar els paquets (%s)!"
msgstr[1] "No s'han pogut instal·lar els paquets (%s)!"
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Premeu Intro quan estigui fet..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Cancel·la"
@@ -2355,7 +2314,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2469,12 +2428,7 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - buida el directori de memòria cau de capçaleres.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - mode silenciós.\n"
@@ -2902,21 +2856,33 @@ msgstr " --changelog - mostra els canvis.\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr ""
+" --conflicts - mostra l'etiqueta conflicts: tots els conflictes.\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr ""
" --provides - mostra l'etiqueta provides: tots allò que proporciona.\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr ""
+" --requires - mostra l'etiqueta requires: tots allò que necessita.\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - mostra l'etiqueta sourcerpm: rpm de codi font.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - imprimeix el resum.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -3012,7 +2978,12 @@ msgstr ""
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes només es pot usar amb --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "no es pot escriure el fitxer list de \"%s\""
+
+#: ../urpmq:363
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3039,6 +3010,48 @@ msgstr ""
msgid "No changelog found\n"
msgstr "No s'ha trobat la llista de canvis\n"
+#~ msgid "Unknown option %s"
+#~ msgstr "Opcions desconegudes %s"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "massa punts de muntatge per la font extraïble \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "agafant dispositiu extraïble com a \"%s\""
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "La font \"%s\" és una imatge ISO, es muntarà al vol"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "utilitzant un dispositiu extraïble diferent [%s] per \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr ""
+#~ "no s'ha pogut determinar el camí i el nom de la font extraïble \"%s\""
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "no s'ha pogut accedir a la primera font d'instal·lació"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "no s'ha pogut accedir a la font \"%s\",\n"
+#~ "pot passar si havies muntat manualment el directori al crear la font."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr ""
+#~ "font incoherent \"%s\", marcada com a extraïble però no és així realment"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Premeu Intro quan estigui fet..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr ""
+#~ " -c - buida el directori de memòria cau de capçaleres.\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "La font virtual ha de ser local"
@@ -3254,9 +3267,6 @@ msgstr "No s'ha trobat la llista de canvis\n"
#~ msgid "file [%s] already used in the same medium \"%s\""
#~ msgstr "el fitxer [%s] ja s'està utilitzant en la mateixa font \"%s\""
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "no es pot escriure el fitxer list de \"%s\""
-
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "no s'ha escrit res al fitxer list per a \"%s\""
diff --git a/po/cs.po b/po/cs.po
index 2008f907..12a870e1 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: cs\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2008-02-20 23:34+0100\n"
"Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
@@ -111,12 +111,7 @@ msgstr "_Přerušit"
msgid "Choose location to save file"
msgstr "Vyberte, kam chcete uložit soubor"
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "Neznámá volba %s"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "Nebyly zadány žádné balíčky"
@@ -228,12 +223,12 @@ msgstr "Připravuji..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Instaluji balíček `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Prosím vložte médium nazvané \"%s\" do zařízení [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Stahuje se balíček `%s'..."
@@ -425,6 +420,16 @@ msgstr "Příliš mnoho parametrů\n"
msgid "Copying failed"
msgstr "Kopírování selhalo"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, c-format
+msgid "medium \"%s\" is not available"
+msgstr "zdroj \"%s\" není k dispozici"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "nelze načíst soubor RPM [%s] pro zdroj \"%s\""
+
#: ../urpm/cfg.pm:81
#, c-format
msgid "syntax error in config file at line %s"
@@ -735,7 +740,12 @@ msgstr "Mám zkusit instalaci bez kontroly závislostí? (a/N) "
msgid "Try harder to install (--force)? (y/N) "
msgstr "Mám zkusit instalaci ještě razantněji (--force)? (a/N) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -750,11 +760,6 @@ msgstr[0] "Selhala %d instalační transakce"
msgstr[1] "Selhaly %d instalační transakce"
msgstr[2] "Selhalo %d instalačních transakcí"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Instalace je možná"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -780,6 +785,11 @@ msgstr "Balíček %s nelze nainstalovat"
msgid "Packages %s can not be installed"
msgstr "Balíčky %s nelze nainstalovat"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Instalace je možná"
+
#: ../urpm/md5sum.pm:20
#, c-format
msgid "examining %s file"
@@ -813,28 +823,8 @@ msgstr "pokouším se obejít existující zdroj \"%s\", přeskakuji"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "výměnné médium \"%s\" má příliš mnoho přípojných bodů"
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "pokládám vyjímatelné médium za \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "Zdroj \"%s\" je obraz ISO, bude připojen dle potřeby"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "použiji jiné vyjímatelné zařízení [%s] pro \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "nelze načíst cestu pro výměnné médium \"%s\""
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -895,12 +885,7 @@ msgstr "přidávám zdroj \"%s\" před vzdálený zdroj \"%s\""
msgid "adding medium \"%s\""
msgstr "přidávám zdroj \"%s\""
-#: ../urpm/media.pm:750
-#, c-format
-msgid "unable to mount the distribution medium"
-msgstr "nelze připojit distribuční zdroj"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "toto umístění zdá se neobsahuje žádnou distribuci"
@@ -1015,17 +1000,7 @@ msgstr "genhdlist2 selhal na %s"
msgid "comparing %s and %s"
msgstr "porovnávám %s a %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"nelze přistupovat ke zdroji \"%s\",\n"
-"což se může stát, pokud jste ručně připojili adresář při vytváření zdroje."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "neplatný soubor hdlist %s pro zdroj \"%s\""
@@ -1192,36 +1167,21 @@ msgstr "nalezeno paralelní zpracování pro uzly: %s"
msgid "unable to use parallel option \"%s\""
msgstr "nelze použít paralelní volbu \"%s\""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "nelze přistoupit na zdroj \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "připojuji %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "odpojuji %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not available"
-msgstr "zdroj \"%s\" není k dispozici"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "nelze načíst soubor RPM [%s] pro zdroj \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "nesouvislé médium \"%s\" je označeno jako vyjímatelné, ale není"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "nelze přistoupit na zdroj \"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
@@ -2334,7 +2294,12 @@ msgstr "Bude použito %s dodatečného diskového prostoru."
msgid "%s of disk space will be freed."
msgstr "Bude uvolněno %s diskového prostoru."
-#: ../urpmi:603
+#: ../urpmi:604
+#, fuzzy, c-format
+msgid "%s of packages will be retrieved."
+msgstr "Bude uvolněno %s diskového prostoru."
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2342,12 +2307,7 @@ msgstr[0] "Pokračovat v instalaci %d balíčku?"
msgstr[1] "Pokračovat v instalaci %d balíčků?"
msgstr[2] "Pokračovat v instalaci %d balíčků?"
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Stiskněte klávesu Enter až budete připraveni..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Zrušit"
@@ -2368,7 +2328,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2489,12 +2449,7 @@ msgstr " --nopubkey - neimportovat veřejné klíče z přidaných zdrojů\
msgid " --raw - add the media in config, but don't update it.\n"
msgstr " --raw - přidat zdroje do nastavení, ale neaktualizovat.\n"
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - smaže dočasný adresář.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - režim bez výpisů.\n"
@@ -2923,21 +2878,31 @@ msgid " --changelog - print changelog.\n"
msgstr " --changelog - vypíše změnový záznam.\n"
#: ../urpmq:81
+#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - tag s konflikty\n"
+
+#: ../urpmq:82
#, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - vypíše, co se poskytuje.\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - co se požaduje\n"
+
+#: ../urpmq:84
#, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - vypíše název zdrojového balíčku rpm.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - vypíše shrnutí.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -3035,7 +3000,12 @@ msgstr ""
msgid "--list-nodes can only be used with --parallel"
msgstr "volbu --list-nodes lze použít pouze s volbou --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, c-format
+msgid "use -l to list files"
+msgstr ""
+
+#: ../urpmq:363
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3068,3 +3038,41 @@ msgstr ""
#, c-format
msgid "No changelog found\n"
msgstr "Nebyl nalezen záznam změn\n"
+
+#~ msgid "Unknown option %s"
+#~ msgstr "Neznámá volba %s"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "výměnné médium \"%s\" má příliš mnoho přípojných bodů"
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "pokládám vyjímatelné médium za \"%s\""
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "Zdroj \"%s\" je obraz ISO, bude připojen dle potřeby"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "použiji jiné vyjímatelné zařízení [%s] pro \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "nelze načíst cestu pro výměnné médium \"%s\""
+
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "nelze připojit distribuční zdroj"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "nelze přistupovat ke zdroji \"%s\",\n"
+#~ "což se může stát, pokud jste ručně připojili adresář při vytváření zdroje."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "nesouvislé médium \"%s\" je označeno jako vyjímatelné, ale není"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Stiskněte klávesu Enter až budete připraveni..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - smaže dočasný adresář.\n"
diff --git a/po/cy.po b/po/cy.po
index 759e3cf4..dc6674a9 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mandriva Linux\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2008-02-14 21:11-0000\n"
"Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
"Language-Team: Cymraeg\n"
@@ -106,12 +106,7 @@ msgstr "_Dileu"
msgid "Choose location to save file"
msgstr "Dewiswch leoliad i gadw'r ffeil"
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "Dewis anhysbys %s"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "Heb enwi pecyn"
@@ -222,12 +217,12 @@ msgstr "Paratoi..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Gosod pecyn `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Llwytho pecynnau i lawr ' %s'..."
@@ -421,6 +416,16 @@ msgstr "Gormod o ymresymiadau\n"
msgid "Copying failed"
msgstr "Methodd y copïo"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, c-format
+msgid "medium \"%s\" is not available"
+msgstr "nid yw cyfrwng \"%s\" ar gael"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "methu darllen ffeil rpm (%s) o gyfrwng \"%s\""
+
#: ../urpm/cfg.pm:81
#, c-format
msgid "syntax error in config file at line %s"
@@ -730,7 +735,12 @@ msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)"
msgid "Try harder to install (--force)? (y/N) "
msgstr "Mwy o orfodaeth gyda'r gosod? (--force)? (y/N)"
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -744,11 +754,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "methodd trosglwyddiad gosod %d"
msgstr[1] "methodd trosglwyddiad gosod %d"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Gosod yn bosibl"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -774,6 +779,11 @@ msgstr "Methu gosod pecyn %s"
msgid "Packages %s can not be installed"
msgstr "Methu gosod pecynnau %s"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Gosod yn bosibl"
+
#: ../urpm/md5sum.pm:20
#, c-format
msgid "examining %s file"
@@ -806,29 +816,8 @@ msgstr "ceisio osgoi'r cyfrwng presennol \"%s\", hepgor"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "gormod o bwyntiau gosod ar gyfer cyfrwng symudol \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "cymryd dyfais symudol fel \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+msgid "failed to migrate removable device, ignoring media"
msgstr ""
-"Delwedd ISO yw cyfrwng \"%s\" , a fydd yn cael ei osod wrth ei ddefnyddio."
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "defnyddio dyfais symudol gwahanol (%s) ar gyfer \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "methu adfer enw llwybr ar gyfer cyfrwng symudadwy \"%s\""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -889,12 +878,7 @@ msgstr "ychwanegu cyfrwng \"%s\", cyn cyfrwng pell \"%s\""
msgid "adding medium \"%s\""
msgstr "ychwanegu cyfrwng \"%s\""
-#: ../urpm/media.pm:750
-#, c-format
-msgid "unable to mount the distribution medium"
-msgstr "methu mowntio cyfrwng y dosbarthiad"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "nid yw'r lleoliad i weld yn cynnwys unrhyw ddosbarthiad"
@@ -1010,17 +994,7 @@ msgstr "methodd genhdlist2 ar %s"
msgid "comparing %s and %s"
msgstr "cymharu %s ac %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"maethu cael mynediad i gyfrwng \"%s\",\n"
-"gall hyn ddigwydd os ydych wedi gosod y cyfeiriadur wrth greu'r cyfrwng."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ffeil hdlist annilys %s ar gyfer cyfrwng \"%s\""
@@ -1191,36 +1165,21 @@ msgstr "canfod trinydd paralel ar gyfer nodau: %s"
msgid "unable to use parallel option \"%s\""
msgstr "methu defnyddio dewis paralel \"%s\""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "methu cael mynediad at gyfrwng. \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "gosod %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "dadosod %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not available"
-msgstr "nid yw cyfrwng \"%s\" ar gael"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "methu darllen ffeil rpm (%s) o gyfrwng \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "cyfrwng annealladwy \"%s\" wedi ei nodi'n symudadwy ond nid yw"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "methu cael mynediad at gyfrwng. \"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
@@ -2321,19 +2280,19 @@ msgstr "Bydd %s o le ychwanegol ar ddisg yn cael ei ddefnyddio."
msgid "%s of disk space will be freed."
msgstr "Bydd %s o le ar ddisg ar gael."
-#: ../urpmi:603
+#: ../urpmi:604
+#, fuzzy, c-format
+msgid "%s of packages will be retrieved."
+msgstr "Bydd %s o le ar ddisg ar gael."
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Parhau gyda gosod %d pecyn?"
msgstr[1] "Parhau gyda gosod %d pecyn?"
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Pwyso Enter pan yn barod..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Dileu"
@@ -2354,7 +2313,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2477,12 +2436,7 @@ msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
" --raw - ychwanegu cyfrwng yn config, ond nid yn ei ddiweddaru.\n"
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - glanhau penawdau yng nghyfeiriadur y storfa.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - modd distaw.\n"
@@ -2913,21 +2867,31 @@ msgid " --changelog - print changelog.\n"
msgstr " --changelog - cofnod argraffu.\n"
#: ../urpmq:81
+#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - tagiau gwrthdaro\n"
+
+#: ../urpmq:82
#, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - argraffu darparu\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - tagiau angenrhaid\n"
+
+#: ../urpmq:84
#, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - argraffu rpm ffynhonnell\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - crynodeb argraffu.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -3031,7 +2995,12 @@ msgstr ""
msgid "--list-nodes can only be used with --parallel"
msgstr "dim ond gyda --paralel mae modd defnyddio --list-nodes"
-#: ../urpmq:360
+#: ../urpmq:206
+#, c-format
+msgid "use -l to list files"
+msgstr ""
+
+#: ../urpmq:363
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3066,6 +3035,45 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Heb ganfod changelog\n"
+#~ msgid "Unknown option %s"
+#~ msgstr "Dewis anhysbys %s"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "gormod o bwyntiau gosod ar gyfer cyfrwng symudol \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "cymryd dyfais symudol fel \"%s\""
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr ""
+#~ "Delwedd ISO yw cyfrwng \"%s\" , a fydd yn cael ei osod wrth ei ddefnyddio."
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "defnyddio dyfais symudol gwahanol (%s) ar gyfer \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "methu adfer enw llwybr ar gyfer cyfrwng symudadwy \"%s\""
+
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "methu mowntio cyfrwng y dosbarthiad"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "maethu cael mynediad i gyfrwng \"%s\",\n"
+#~ "gall hyn ddigwydd os ydych wedi gosod y cyfeiriadur wrth greu'r cyfrwng."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "cyfrwng annealladwy \"%s\" wedi ei nodi'n symudadwy ond nid yw"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Pwyso Enter pan yn barod..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - glanhau penawdau yng nghyfeiriadur y storfa.\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "rhaid i'r rhith gyfrwng fod yn lleol"
diff --git a/po/da.po b/po/da.po
index e19d4a24..5b43ad93 100644
--- a/po/da.po
+++ b/po/da.po
@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: da\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2008-02-26 16:02+0100\n"
"Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
"Language-Team: dansk <dansk@dansk-gruppen.dk>\n"
@@ -116,12 +116,7 @@ msgstr "_Annullér"
msgid "Choose location to save file"
msgstr "Vælg sted at gemme filen"
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "ukendt valg '%s"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "Ingen pakker angivet"
@@ -195,13 +190,17 @@ msgstr ""
#: ../gurpmi2:215 ../urpmi:592
#, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
-msgstr "For at tilfredsstille afhængigheder vil den følgende pakke blive installeret "
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
+msgstr ""
+"For at tilfredsstille afhængigheder vil den følgende pakke blive installeret "
#: ../gurpmi2:216 ../urpmi:593
#, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
-msgstr "For at tilfredsstille afhængigheder vil de følgende pakker blive installeret"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr ""
+"For at tilfredsstille afhængigheder vil de følgende pakker blive installeret"
#: ../gurpmi2:218
#, c-format
@@ -230,12 +229,12 @@ msgstr "Forbereder..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Installerer pakke `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Vær venlig at indsætte mediet med navnet %s i enhed [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Henter pakke %s..."
@@ -427,6 +426,16 @@ msgstr "For mange argumenter\n"
msgid "Copying failed"
msgstr "Kopiering mislykkedes"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, c-format
+msgid "medium \"%s\" is not available"
+msgstr "medie \"%s\" er ikke tilgængeligt"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "kunne ikke læse rpm-fil [%s] fra medie \"%s\""
+
#: ../urpm/cfg.pm:81
#, c-format
msgid "syntax error in config file at line %s"
@@ -596,7 +605,8 @@ msgstr "[genpakning]"
#: ../urpm/install.pm:154
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%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)"
@@ -736,7 +746,12 @@ msgstr "Prøv installation uden at tjekke afhængigheder? (j/N) "
msgid "Try harder to install (--force)? (y/N) "
msgstr "Prøv endnu hårdere at installere (--force)? (j/N) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -752,11 +767,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "%d installationstransaktion mislykkedes"
msgstr[1] "%d installationstrasaktioner mislykkedes"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Installation er mulig"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -782,6 +792,11 @@ msgstr "Pakke %s kan ikke installeres"
msgid "Packages %s can not be installed"
msgstr "Pakkerne %s kan ikke installeres"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Installation er mulig"
+
#: ../urpm/md5sum.pm:20
#, c-format
msgid "examining %s file"
@@ -814,28 +829,8 @@ msgstr "prøver at forbigå eksisterende medie \"%s\", springer over"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "For mange monteringspunkter for udskifteligt medium \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "tager udskifteligt medium som \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "Medie \"%s\" er et ISO-aftryk, vil blive monteret omgående"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "bruger en anden udskiftelig enhed [%s] for \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "kan ikke finde stinavn for udskifteligt medie \"%s\""
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -896,12 +891,7 @@ msgstr "Tilføjer medie '%s' før det eksterne medie '%s'."
msgid "adding medium \"%s\""
msgstr "tilføjer medie \"%s\""
-#: ../urpm/media.pm:750
-#, c-format
-msgid "unable to mount the distribution medium"
-msgstr "kan ikke montere distributionsmedie"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "denne adresse ser ikke ud til at indeholde nogen distribution"
@@ -1016,17 +1006,7 @@ msgstr "genhdlist2 mislykkedes på %s"
msgid "comparing %s and %s"
msgstr "sammenligner %s og %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"Kan ikke tilgå medie '%s',\n"
-"dette kan ske hvis du manuelt monterede kataloget ved oprettelsen af mediet."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ugyldig hdlist-fil %s for medie \"%s\""
@@ -1193,36 +1173,21 @@ msgstr "fandt parallelbehandling for knuder: %s"
msgid "unable to use parallel option \"%s\""
msgstr "kan ikke bruge parallel mulighed \"%s\""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "kunne ikke nå medie \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "monterer %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "afmonterer %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not available"
-msgstr "medie \"%s\" er ikke tilgængeligt"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "kunne ikke læse rpm-fil [%s] fra medie \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "inkonsistent medie \"%s\" mærket udskifteligt, men er det ikke"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "kunne ikke nå medie \"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
@@ -1263,7 +1228,8 @@ msgstr " --excludemedia - brug ikke de opgivne medier, adskilt med komma.\n"
#: ../urpm/search.pm:39 ../urpmf:39
#, c-format
-msgid " --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
" --literal, -l - kontrollér ikke søgestrenge, brug argumenter som "
"bogstavelige strenge.\n"
@@ -1273,7 +1239,8 @@ msgstr ""
#: ../urpmi.update:46 ../urpmq:69
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
-msgstr " --urpmi-root - Brug anden rod for urpmi-database og rpm-installering.\n"
+msgstr ""
+" --urpmi-root - Brug anden rod for urpmi-database og rpm-installering.\n"
#: ../urpm/search.pm:41 ../urpmf:41 ../urpmi:75 ../urpmq:47
#, c-format
@@ -1282,8 +1249,10 @@ msgstr " --media - brug kun de opgivne medier, adskilt med komma.\n"
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, 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"
#: ../urpm/search.pm:43 ../urpmf:43
#, c-format
@@ -1542,7 +1511,8 @@ msgstr ""
#: ../urpm/select.pm:23
#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
"Installationsprogrammet urpmi blev startet igen, og listen over prioriterede "
"pakker blev ændret: %s mod %s"
@@ -1650,8 +1620,10 @@ msgstr " --test - afprøv om fjernelsen kan udføres korrekt.\n"
#: ../urpme:48 ../urpmi:104 ../urpmq:65
#, 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"
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
@@ -1725,9 +1697,12 @@ msgstr "Tjekker for at fjerne de følgende pakker"
#: ../urpme:124
#, c-format
msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural "To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "For at tilfredsstille afhængigheder vil den følgende pakke blive fjernet"
-msgstr[1] "For at tilfredsstille afhængigheder vil de følgende %d pakker blive fjernet"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"For at tilfredsstille afhængigheder vil den følgende pakke blive fjernet"
+msgstr[1] ""
+"For at tilfredsstille afhængigheder vil de følgende %d pakker blive fjernet"
#: ../urpme:128
#, c-format
@@ -1764,7 +1739,8 @@ msgstr ""
#: ../urpmi:78
#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
" --searchmedia - brug kun det opgivne medie for at søge efter de ønskede "
"pakker.\n"
@@ -1780,8 +1756,10 @@ msgstr ""
#: ../urpmi:82 ../urpmq:52
#, 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:83
#, c-format
@@ -1874,7 +1852,8 @@ msgstr " --justdb - opdatér kun rpm-databasen, og ikke filsystemet.\n"
#: ../urpmi:103
#, c-format
-msgid " --replacepkgs - force installing packages which are already installed.\n"
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
msgstr ""
" --replacepkgs - gennemtving installering af pakker som allerede er "
"installerede.\n"
@@ -2017,7 +1996,8 @@ msgstr " --excludedocs - udelader docs-filer.\n"
#: ../urpmi:137
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
-msgstr " --ignoresize - kontrollér ikke for ledig diskplads før installation.\n"
+msgstr ""
+" --ignoresize - kontrollér ikke for ledig diskplads før installation.\n"
#: ../urpmi:138
#, c-format
@@ -2088,7 +2068,8 @@ msgstr " --debug - meget udførlig tilstand.\n"
#: ../urpmi:153
#, 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:181
#, c-format
@@ -2111,7 +2092,8 @@ msgstr "Du kan ikke installere binære rpm-filer ved brug af --install-src"
#: ../urpmi:221
#, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr "brug --buildrequires eller --install-src, forvalgt er --buildrequires"
#: ../urpmi:241
@@ -2310,19 +2292,19 @@ msgstr "%s mere diskplads vil blive brugt."
msgid "%s of disk space will be freed."
msgstr "%s diskplads vil blive frigjort."
-#: ../urpmi:603
+#: ../urpmi:604
+#, fuzzy, c-format
+msgid "%s of packages will be retrieved."
+msgstr "%s diskplads vil blive frigjort."
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Fortsæt installationen med de %d pakke?"
msgstr[1] "Fortsæt installationen med de %d pakker?"
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Tryk på retur, når den er klar..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Annullér"
@@ -2335,7 +2317,7 @@ msgstr "genstarter urpmi"
#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
-#, c-format
+#, fuzzy, c-format
msgid ""
"usage: urpmi.addmedia [options] <name> <url>\n"
"where <url> is one of\n"
@@ -2343,7 +2325,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2368,7 +2350,8 @@ msgstr ""
"brug: urpmi.addmedia [options] --mirrorlist <url> <navn> <relativ sti>\n"
"\n"
"eksempler:\n"
-"\n urpmi.addmedia --distrib --mirrorlist '$MIRRORLIST'\n"
+"\n"
+" urpmi.addmedia --distrib --mirrorlist '$MIRRORLIST'\n"
" urpmi.addmedia --mirrorlist '$MIRRORLIST' backports media/main/backports\n"
"\n"
"\n"
@@ -2387,7 +2370,8 @@ msgstr " --curl - brug 'curl' til at hente retrieve eksterne filer.\n"
#: ../urpmi.addmedia:57 ../urpmi.update:35 ../urpmq:74
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
-msgstr " --prozilla - brug 'prozilla' til at hente retrieve eksterne filer.\n"
+msgstr ""
+" --prozilla - brug 'prozilla' til at hente retrieve eksterne filer.\n"
#: ../urpmi.addmedia:63
#, c-format
@@ -2401,9 +2385,10 @@ msgid ""
" one of: never, on-demand, update-only, always. cf urpmi."
"cfg(5)\n"
msgstr ""
-" --xml-info - brug den specifikke strategi for hentning af xml-info filer\n"
-" én af: never, on-demand, update-only, always. cf urpmi."
-"cfg(5)\n"
+" --xml-info - brug den specifikke strategi for hentning af xml-info "
+"filer\n"
+" én af: never, on-demand, update-only, always. cf urpmi.cfg"
+"(5)\n"
#: ../urpmi.addmedia:66
#, c-format
@@ -2425,12 +2410,14 @@ msgstr " --no-probe - forsøg ikke at finde nogen syntese-fil.\n"
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:72
#, c-format
msgid " --interactive - with --distrib, ask confirmation for each media\n"
-msgstr " --interactive - med --distrib, spøger om bekræftelse for hvert medie\n"
+msgstr ""
+" --interactive - med --distrib, spøger om bekræftelse for hvert medie\n"
#: ../urpmi.addmedia:73
#, c-format
@@ -2466,12 +2453,7 @@ msgstr " --nopubkey - importér ikke pubkey fra tilføjet medie\n"
msgid " --raw - add the media in config, but don't update it.\n"
msgstr " --raw - tilføj mediet i config, men opdatér det ikke.\n"
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - rydder katalog med cache for headere.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - stille udgave.\n"
@@ -2564,12 +2546,15 @@ msgstr " --checkpoint - sæt genpakkestart nu\n"
#: ../urpmi.recover:35
#, c-format
msgid " --noclean - don't clean repackage directory on checkpoint\n"
-msgstr " --noclean - rens ikke ud i genpakningskatalog ved kontrolpunkt\n"
+msgstr ""
+" --noclean - rens ikke ud i genpakningskatalog ved kontrolpunkt\n"
#: ../urpmi.recover:37
#, c-format
-msgid " --list - list transactions since provided date/duration argument\n"
-msgstr " --list - list transaktioner siden opgivet dato/varighed-argument\n"
+msgid ""
+" --list - list transactions since provided date/duration argument\n"
+msgstr ""
+" --list - list transaktioner siden opgivet dato/varighed-argument\n"
#: ../urpmi.recover:38
#, c-format
@@ -2855,7 +2840,8 @@ msgstr " --list-aliases - list tilgængelige parallelle aliaser.\n"
#: ../urpmq:62
#, c-format
-msgid " --dump-config - dump the config in form of urpmi.addmedia argument.\n"
+msgid ""
+" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
" --dump-config - udskriv konfigurationen i form af urpmi.addmedia "
"argumenter.\n"
@@ -2867,7 +2853,8 @@ msgstr " --src - næste pakke er en kildepakke (samme som -s).\n"
#: ../urpmq:64
#, 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:66
@@ -2892,21 +2879,31 @@ msgid " --changelog - print changelog.\n"
msgstr " --changelog - udskriv ændringslog.\n"
#: ../urpmq:81
+#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - konfliktmærker\n"
+
+#: ../urpmq:82
#, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - vis hvilke filer pakker leverer.\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - afhængighedsetiketter\n"
+
+#: ../urpmq:84
#, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - vis kilde-rpm\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - skriv resumé.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -3002,7 +2999,12 @@ msgstr " navne eller rpm-filer givne på kommandolinjen bliver forespurgt.\n"
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes kan kun bruges med --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, c-format
+msgid "use -l to list files"
+msgstr ""
+
+#: ../urpmq:363
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr "Ingen 'xml-info for medie '%s', kun delvist resultat for pakken '%s'"
@@ -3014,12 +3016,15 @@ msgstr "Ingen xml-info for medie'%s', kun delvist resultat for pakkerne '%s'"
#: ../urpmq:364
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
-msgstr "Ingen 'xml-info for medie '%s', kan ikke vise noget resultat for pakken %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
+msgstr ""
+"Ingen 'xml-info for medie '%s', kan ikke vise noget resultat for pakken %s"
#: ../urpmq:365
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr "Ingen xml-info for medie '%s', kan ikke vise resultat for pakkerne %s"
#: ../urpmq:429
@@ -3027,3 +3032,41 @@ msgstr "Ingen xml-info for medie '%s', kan ikke vise resultat for pakkerne %s"
msgid "No changelog found\n"
msgstr "Ingen ændringslog fundet\n"
+#~ msgid "Unknown option %s"
+#~ msgstr "ukendt valg '%s"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "For mange monteringspunkter for udskifteligt medium \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "tager udskifteligt medium som \"%s\""
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "Medie \"%s\" er et ISO-aftryk, vil blive monteret omgående"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "bruger en anden udskiftelig enhed [%s] for \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "kan ikke finde stinavn for udskifteligt medie \"%s\""
+
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "kan ikke montere distributionsmedie"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "Kan ikke tilgå medie '%s',\n"
+#~ "dette kan ske hvis du manuelt monterede kataloget ved oprettelsen af "
+#~ "mediet."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "inkonsistent medie \"%s\" mærket udskifteligt, men er det ikke"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Tryk på retur, når den er klar..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - rydder katalog med cache for headere.\n"
diff --git a/po/de.po b/po/de.po
index f2bd88e7..c2c02e17 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2007-03-18 20:59+0100\n"
"Last-Translator: Nicolas Bauer <rastafarii@mandrivauser.de>\n"
"Language-Team: deutsch\n"
@@ -106,12 +106,7 @@ msgstr "_Abbrechen"
msgid "Choose location to save file"
msgstr "Wähle Speicherort aus"
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "Unbekannte Option %s"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "Keine Pakete angegeben"
@@ -224,12 +219,12 @@ msgstr "Vorbereiten ..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Installieren des Pakets `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Bitte legen Sie das Medium mit Namen \"%s\" in das Gerät [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Holen des Pakets `%s' ..."
@@ -421,6 +416,16 @@ msgstr "zu viele Argumente\n"
msgid "Copying failed"
msgstr "Kopieren fehlgeschlagen"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, c-format
+msgid "medium \"%s\" is not available"
+msgstr "Das Medium \"%s\" ist nicht verfügbar"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "Ich kann das RPM-Paket [%s] von Medium \"%s\" nicht lesen"
+
#: ../urpm/cfg.pm:81
#, c-format
msgid "syntax error in config file at line %s"
@@ -731,7 +736,12 @@ msgstr "Soll ich eine Installation ohne Abhängigkeitstest versuchen? (j/N) "
msgid "Try harder to install (--force)? (y/N) "
msgstr "Soll ich eine Installation erzwingen (--force)? (j/N) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -745,11 +755,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "%d Installation schlug Fehl"
msgstr[1] "%d Installation schlugen Fehl"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Die Installation ist möglich"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -775,6 +780,11 @@ msgstr "Paket %s kann nicht installiert werden"
msgid "Packages %s can not be installed"
msgstr "Pakete %s können nicht installiert werden"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Die Installation ist möglich"
+
#: ../urpm/md5sum.pm:20
#, c-format
msgid "examining %s file"
@@ -811,28 +821,8 @@ msgstr "versuche existierendes Medium \"%s\" zu überschreiben, überspringe"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "Es existieren zu viele Einhängpunkte für das Wechselmedium \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "Verwende Wechselmedium als \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "Medium \"%s\" ist ein ISO Abbild, es wird umgehend eingehängt"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "Verwendung verschiedener Wechselmedien [%s] für \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "Ich kann den Pfadnamen für das Wechselmedium \"%s\" nicht finden"
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -893,12 +883,7 @@ msgstr "Hinzufügen des Mediums \"%s\" vor dem Remotemodium \"%s\""
msgid "adding medium \"%s\""
msgstr "hinzufügen des Mediums \"%s\""
-#: ../urpm/media.pm:750
-#, c-format
-msgid "unable to mount the distribution medium"
-msgstr "Es ist nicht möglich das Distributions Medium zu mounten"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "Diese Ort enthält keine Distribution"
@@ -1015,18 +1000,7 @@ msgstr "Prüfen der HD-Liste [%s]"
msgid "comparing %s and %s"
msgstr "säubere %s und %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"Zugang zum Medium \"%s\" nicht möglich,\n"
-"das kann beim manuellen Mounten des Verzeichnisses des erstellten Mediums "
-"passieren."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "Fehlerhafte hdlist Datei %s für das Medium \"%s\""
@@ -1193,36 +1167,21 @@ msgstr "Parallel-Handler für folgende Knoten gefunden: %s"
msgid "unable to use parallel option \"%s\""
msgstr "Ich kann die parallel Option \"%s\" nicht nutzen"
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "Ich kann auf das Medium \"%s\" nicht zugreifen"
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "Einhängen von %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "Aushängen von %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not available"
-msgstr "Das Medium \"%s\" ist nicht verfügbar"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "Ich kann das RPM-Paket [%s] von Medium \"%s\" nicht lesen"
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "\"%s\" wurde als Wechselmedium angegeben, ist es aber nicht"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "Ich kann auf das Medium \"%s\" nicht zugreifen"
-
#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
@@ -2362,19 +2321,19 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Fortfahren mit der Installation von einem Pakete?"
msgstr[1] "Fortfahren mit der Installation der %d Pakete?"
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Betätigen Sie die Eingabetaste, sobald Sie soweit sind..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Abbruch"
@@ -2395,7 +2354,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2520,12 +2479,7 @@ msgstr ""
" --raw - Medien zur Konfiguration hinzufügen ohne sie zu "
"aktualisieren.\n"
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - Löschen des Header-Verzeichnisses.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - stiller Modus.\n"
@@ -2977,20 +2931,30 @@ msgstr " --changelog - Gebe Changelog aus.\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - Steht in Konflikt mit.\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - Stellt zur Verfügung\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - Benötigt\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - Quell RPM Name.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - Zusammenfassung ausgeben.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -3091,7 +3055,12 @@ msgstr ""
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes kann nur mit --parallel benutzt werden"
-#: ../urpmq:360
+#: ../urpmq:206
+#, c-format
+msgid "use -l to list files"
+msgstr ""
+
+#: ../urpmq:363
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3124,6 +3093,45 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Kein Changelog gefunden\n"
+#~ msgid "Unknown option %s"
+#~ msgstr "Unbekannte Option %s"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "Es existieren zu viele Einhängpunkte für das Wechselmedium \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "Verwende Wechselmedium als \"%s\""
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "Medium \"%s\" ist ein ISO Abbild, es wird umgehend eingehängt"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "Verwendung verschiedener Wechselmedien [%s] für \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "Ich kann den Pfadnamen für das Wechselmedium \"%s\" nicht finden"
+
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "Es ist nicht möglich das Distributions Medium zu mounten"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "Zugang zum Medium \"%s\" nicht möglich,\n"
+#~ "das kann beim manuellen Mounten des Verzeichnisses des erstellten Mediums "
+#~ "passieren."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "\"%s\" wurde als Wechselmedium angegeben, ist es aber nicht"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Betätigen Sie die Eingabetaste, sobald Sie soweit sind..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - Löschen des Header-Verzeichnisses.\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "virtuelles Medium muss lokal sein"
diff --git a/po/el.po b/po/el.po
index 825d7a8b..8d7b5b7c 100644
--- a/po/el.po
+++ b/po/el.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-el\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2006-03-04 12:15+0200\n"
"Last-Translator: Theophanis Mastakas <mastakas@otenet.gr>\n"
"Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -113,12 +113,7 @@ msgstr "_Ακύρωση"
msgid "Choose location to save file"
msgstr "Επιλογή τοποθεσίας για αποθήκευση αρχείου"
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "Άγνωστη επιλογή %s"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "Δεν ορίστηκαν πακέτα"
@@ -233,12 +228,12 @@ msgstr "Προετοιμασία..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Εγκατάσταση πακέτου `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Παρακαλώ βάλτε το μέσο με όνομα \"%s\" στη συσκευή [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Λήψη πακέτου `%s'..."
@@ -431,6 +426,16 @@ msgstr ""
msgid "Copying failed"
msgstr "Η αντιγραφή απέτυχε"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "δεν έχει επιλεγεί το μέσο \"%s\""
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "αδυναμία ανάγνωσης του αρχείου rpm [%s] από το μέσο \"%s\""
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -739,7 +744,12 @@ msgstr "Προσπάθεια για εγκατάσταση χωρίς τον έ
msgid "Try harder to install (--force)? (y/N) "
msgstr "Προσπάθεια για πιο δυνατή εγκατάσταση (--force); (y/N) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -753,11 +763,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "%d αποτυχία διεργασιών εγκατάστασης"
msgstr[1] "%d αποτυχία διεργασιών εγκατάστασης"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Η εγκατάσταση είναι δυνατή"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -783,6 +788,11 @@ msgstr "Το πακέτο είναι ήδη εγκατεστημένα"
msgid "Packages %s can not be installed"
msgstr "Τα πακέτα είναι ήδη εγκατεστημένα"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Η εγκατάσταση είναι δυνατή"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -817,29 +827,8 @@ msgstr "προσπάθεια παράκαμψης του υπάρχοντος μ
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "πολλαπλά σημεία σύνδεσης για το αφαιρούμενο μέσο \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "λήψη της αφαιρούμενης συσκευής ως \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "Το μέσο \"%s\" είναι ένα αρχείο ISO, θα προσαρτηθεί on-the-fly"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "χρήση διαφορετικής αφαιρούμενης συσκευής [%s] για το \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+msgid "failed to migrate removable device, ignoring media"
msgstr ""
-"αδυναμία ανάκτησης της διαδρομής (pathname) για το αφαιρούμενο μέσο \"%s\""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -901,12 +890,7 @@ msgstr "ανάγνωση επικεφαλίδων από το μέσο \"%s\""
msgid "adding medium \"%s\""
msgstr "αφαίρεση μέσου \"%s\""
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "αδυναμία πρόσβασης στο πρώτο μέσο εγκατάστασης"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -1022,18 +1006,7 @@ msgstr "εξέταση αρχείου hdlist [%s]"
msgid "comparing %s and %s"
msgstr "Εγκατάσταση %s σε %s..."
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"αδυναμία πρόσβασης μέσου \"%s\",\n"
-"αυτό μπορεί να συμβαίνει εάν έχετε προσαρτήσει μόνοι σας τον κατάλογο όταν "
-"δημιουργήθηκε το μέσο."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "δεν βρέθηκε αρχείο hdlist για το μέσο \"%s\""
@@ -1200,38 +1173,21 @@ msgstr "βρέθηκε παράλληλος χειριστής για του κ
msgid "unable to use parallel option \"%s\""
msgstr "αδυναμία χρήσης της επιλογής parallel \"%s\""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "αδυναμία πρόσβασης στο μέσο \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "προσαρτώ το %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "αποπροσαρτώ το %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "δεν έχει επιλεγεί το μέσο \"%s\""
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "αδυναμία ανάγνωσης του αρχείου rpm [%s] από το μέσο \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr ""
-"το αντιφατικό μέσο \"%s\" έχει αναφερθεί ως αφαιρούμενο αλλά δεν είναι "
-"πραγματικά"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "αδυναμία πρόσβασης στο μέσο \"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
@@ -2340,19 +2296,19 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Πατήστε enter όταν τελειώσετε..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Ακύρωση"
@@ -2373,7 +2329,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2491,12 +2447,7 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, fuzzy, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -v - αναλυτική λειτουργία.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - σιωπηλή λειτουργία.\n"
@@ -2921,21 +2872,33 @@ msgstr " --all - τύπωσε όλα τις ετικέτες.\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - ετικέτες συγκρούσεων\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr ""
" --provides - τύπωσε την ετικέτα με τις παροχές: όλες οι παροχές.\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr ""
+" --requires - τύπωσε την ετικέτα με τις εξαρτήσεις: όλες οι "
+"εξαρτήσεις.\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - όνομα πηγαίου rpm\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - τύπωσε την ετικέτα περίληψης: περίληψη.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -3029,7 +2992,12 @@ msgstr ""
msgid "--list-nodes can only be used with --parallel"
msgstr " --all - τύπωσε όλα τα tags."
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "αδυναμία εγγραφής αρχείου λίστας του \"%s\""
+
+#: ../urpmq:363
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3064,6 +3032,50 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
+#~ msgid "Unknown option %s"
+#~ msgstr "Άγνωστη επιλογή %s"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "πολλαπλά σημεία σύνδεσης για το αφαιρούμενο μέσο \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "λήψη της αφαιρούμενης συσκευής ως \"%s\""
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "Το μέσο \"%s\" είναι ένα αρχείο ISO, θα προσαρτηθεί on-the-fly"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "χρήση διαφορετικής αφαιρούμενης συσκευής [%s] για το \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr ""
+#~ "αδυναμία ανάκτησης της διαδρομής (pathname) για το αφαιρούμενο μέσο \"%s\""
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "αδυναμία πρόσβασης στο πρώτο μέσο εγκατάστασης"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "αδυναμία πρόσβασης μέσου \"%s\",\n"
+#~ "αυτό μπορεί να συμβαίνει εάν έχετε προσαρτήσει μόνοι σας τον κατάλογο "
+#~ "όταν δημιουργήθηκε το μέσο."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr ""
+#~ "το αντιφατικό μέσο \"%s\" έχει αναφερθεί ως αφαιρούμενο αλλά δεν είναι "
+#~ "πραγματικά"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Πατήστε enter όταν τελειώσετε..."
+
+#, fuzzy
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -v - αναλυτική λειτουργία.\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "το εικονικό μέσο χρειάζεται να είναι τοπικό"
@@ -3303,9 +3315,6 @@ msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
#~ msgid "file [%s] already used in the same medium \"%s\""
#~ msgstr "το αρχείο [%s] χρησιμοποιείται από το ίδιο μέσο \"%s\""
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "αδυναμία εγγραφής αρχείου λίστας του \"%s\""
-
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "τίποτα δεν γράφτηκε στο αρχείο λίστας για το \"%s\""
diff --git a/po/eo.po b/po/eo.po
index a188fa6e..262c3a90 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-eo\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2005-01-13 10:05+0100\n"
"Last-Translator: Grégoire COLBERT <gcolbert2004@noos.fr>\n"
"Language-Team: Esperanto <mandrak-eo@yahoogroups.com>\n"
@@ -109,12 +109,7 @@ msgstr "_Nuligu"
msgid "Choose location to save file"
msgstr "Elektu dosieraron por konservi tiun dosieron"
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "Nekonataj opcio %s"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "Neniu pakaĵo indikita"
@@ -229,12 +224,12 @@ msgstr "Mi preparas..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Mi instalas pakaĵon '%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Bonvole enŝovu la medion nomata \"%s\" en aparaton [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Mi elŝutas pakaĵon '%s'..."
@@ -426,6 +421,16 @@ msgstr ""
msgid "Copying failed"
msgstr "Kopiado malsukcesis"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "medio \"%s\" ne estas elektata"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "ne povis legi rpm-an dosieron [%s] de medio \"%s\""
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -733,7 +738,12 @@ msgstr "Provu instaladon sen kontroli dependaĵojn? (j/N) "
msgid "Try harder to install (--force)? (y/N) "
msgstr "Provu instaladon eĉ pli forte (--force)? (j/N) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -747,11 +757,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "%d instal-transakcio malsukcesis"
msgstr[1] "%d instal-transakcioj malsukcesis"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Instalado eblas"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -777,6 +782,11 @@ msgstr "La pakaĵo estas jam instalita"
msgid "Packages %s can not be installed"
msgstr "La pakaĵoj estas jam instalitaj"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Instalado eblas"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -809,29 +819,9 @@ msgstr "provas ĉirkaŭiri ekzistantan medion \"%s:, evitas"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "tro da surmetingoj por movebla datenportilo \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "prenante moveblan aparaton kiel \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+msgid "failed to migrate removable device, ignoring media"
msgstr ""
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "uzante alian moveblan aparaton [%s] por \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ne povis ektrakti padonomon por movebla datenportilo \"%s\""
-
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
msgid "wrote config file [%s]"
@@ -891,12 +881,7 @@ msgstr "mi legas la ĉapojn de la datenportilo \"%s\""
msgid "adding medium \"%s\""
msgstr "foriganta datenportilon \"%s\""
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "ne povis aliri la unuan instal-datenportilon"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -1012,17 +997,7 @@ msgstr "kontrolanta hdlist-dosieron [%s]"
msgid "comparing %s and %s"
msgstr "instalas %s el %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"ne povas aliri datenportilon \"%s\",\n"
-"tio povas okazi se vi mane surmetis la dosierujon kreante la datenportilon."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "neniu \"hdlist\" dosiero trovita por medio \"%s\""
@@ -1189,36 +1164,21 @@ msgstr "trovis paralelan traktilon por nodoj: %s"
msgid "unable to use parallel option \"%s\""
msgstr "ne povis uzi paralelan opcion \"%s\""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "ne povis atingi medion \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "muntas %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "malmuntas %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "medio \"%s\" ne estas elektata"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "ne povis legi rpm-an dosieron [%s] de medio \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "malkohera medio \"%s\" indikita forigebla sed ne vere"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "ne povis atingi medion \"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, fuzzy, c-format
msgid ""
@@ -2303,19 +2263,19 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Premu la enigklavon kiam vi pretas..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Nuligu"
@@ -2336,7 +2296,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2452,12 +2412,7 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - purigu la dosieron de kap-kaŝejo.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - silenta modo.\n"
@@ -2878,20 +2833,30 @@ msgstr " --changelog - printu la ĵurnalon de la ŝanĝoj.\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - printu etikedajn konfliktojn: ĉiuj konfliktoj.\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - presu etikedan provizon: ĉiuj provizoj.\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - printu etikedan postulojn: ĉiujn postulojn.\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - printu etikedon sourcerpm: source rpm.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --group - printu etikedan resumon: summary.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -2984,7 +2949,12 @@ msgstr ""
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes uzeblas nur kun --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "ne povis skribi listdosieron de \"%s\""
+
+#: ../urpmq:363
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3019,6 +2989,43 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Neniu \"changelog\" trovita\n"
+#~ msgid "Unknown option %s"
+#~ msgstr "Nekonataj opcio %s"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "tro da surmetingoj por movebla datenportilo \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "prenante moveblan aparaton kiel \"%s\""
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "uzante alian moveblan aparaton [%s] por \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "ne povis ektrakti padonomon por movebla datenportilo \"%s\""
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "ne povis aliri la unuan instal-datenportilon"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "ne povas aliri datenportilon \"%s\",\n"
+#~ "tio povas okazi se vi mane surmetis la dosierujon kreante la "
+#~ "datenportilon."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "malkohera medio \"%s\" indikita forigebla sed ne vere"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Premu la enigklavon kiam vi pretas..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - purigu la dosieron de kap-kaŝejo.\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "virtuala datenportilo devas esti loka"
@@ -3254,9 +3261,6 @@ msgstr "Neniu \"changelog\" trovita\n"
#~ msgid "file [%s] already used in the same medium \"%s\""
#~ msgstr "dosiero [%s] jam uzata en la sama datenportilo \"%s\""
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "ne povis skribi listdosieron de \"%s\""
-
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "skribis nenion en listdosiero por \"%s\""
diff --git a/po/es.po b/po/es.po
index 4309cf6b..0b2709ee 100644
--- a/po/es.po
+++ b/po/es.po
@@ -18,7 +18,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-es\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2005-04-29 13:26+0200\n"
"Last-Translator: José Manuel Pérez <jmprodu@hotmail.com>\n"
"Language-Team: Español <es@li.org>\n"
@@ -116,12 +116,7 @@ msgstr "_Cancelar"
msgid "Choose location to save file"
msgstr "Elija ubicación para guardar archivo"
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "Opción desconocida «%s»"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "Ningún paquete especificado"
@@ -233,12 +228,12 @@ msgstr "Preparando..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Instalando paquete `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Por favor, inserte el soporte denominado «%s» en el dispositivo [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Descargando paquete `%s'..."
@@ -430,6 +425,16 @@ msgstr "Demasiados argumentos\n"
msgid "Copying failed"
msgstr "Falló la copia"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "el soporte «%s» no está seleccionado"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "no se puede leer el archivo rpm [%s] del soporte «%s»"
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -738,7 +743,12 @@ msgstr "¿Intentar de instalar sin verificar las dependencias? (s/N) "
msgid "Try harder to install (--force)? (y/N) "
msgstr "¿Intentar con más fuerza la instalación (--force)? (s/N) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -752,11 +762,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "falló una transacción de instalación"
msgstr[1] "fallaron %d transacciones de instalación"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Es posible la instalación"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -782,6 +787,11 @@ msgstr "El paquete %s no se puede instalar"
msgid "Packages %s can not be installed"
msgstr "Los paquetes %s no se pueden instalar"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Es posible la instalación"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -814,28 +824,8 @@ msgstr "intentando pasar al soporte existente «%s», evitando"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "demasiados puntos de montaje para soportes extraíbles «%s»"
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "tomar dispositivo extraíble como «%s»"
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "El soporte «%s» es una imagen ISO, será montada al vuelo"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "usar dispositivo extraíble diferente [%s] para «%s»"
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "no se puede recuperar el nombre de ruta para el soporte extraíble «%s»"
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -896,12 +886,7 @@ msgstr "leyendo encabezados del soporte «%s»"
msgid "adding medium \"%s\""
msgstr "quitando el soporte «%s»"
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "no se puede acceder al primer soporte de la instalación"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -1018,17 +1003,7 @@ msgstr "examinando el archivo hdlist [%s]"
msgid "comparing %s and %s"
msgstr "instalando %s desde %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"no se puede acceder soporte \"%s\",\n"
-"esto puede ocurrir si montó manualmente el directorio cuando creó el soporte."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "no se encuentra el archivo hdlist para el soporte «%s»"
@@ -1195,36 +1170,21 @@ msgstr "se encontró manejador paralelo para los nodos: %s"
msgid "unable to use parallel option \"%s\""
msgstr "no se puede utilizar la opción paralelo «%s»"
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "no se puede acceder al soporte «%s»"
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "montando %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "desmontando %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "el soporte «%s» no está seleccionado"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "no se puede leer el archivo rpm [%s] del soporte «%s»"
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "soporte no coherente «%s» marcado como borrable, pero no borrado"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "no se puede acceder al soporte «%s»"
-
#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
@@ -2335,19 +2295,19 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "¿Efectuar la instalación del paquete?"
msgstr[1] "¿Efectuar la instalación de los %d paquetes?"
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Presione «Intro» cuando esté listo..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Cancelar"
@@ -2368,7 +2328,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2485,12 +2445,7 @@ msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
" --raw - añadir el soporte en config, pero no actualizarlo.\n"
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - limpia dir. encabezados de cache.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - modo silencioso.\n"
@@ -2918,20 +2873,30 @@ msgstr " --changelog - imprimir el registro de cambios.\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - imprime etiq. conflicts: todos los conflictos.\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - imprime etiq. provides: todo que proporciona.\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - imprime etiq. requires: todo que precisa.\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - imprime etiq. sourcerpm: rpm fuente.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - imprimir el descriptivo corto (summary).\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -3029,7 +2994,12 @@ msgstr ""
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes sólo se puede utilizar con --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "no se puede escribir el archivo de lista de «%s»"
+
+#: ../urpmq:363
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3064,6 +3034,47 @@ msgstr ""
msgid "No changelog found\n"
msgstr "No se encontró changelog\n"
+#~ msgid "Unknown option %s"
+#~ msgstr "Opción desconocida «%s»"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "demasiados puntos de montaje para soportes extraíbles «%s»"
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "tomar dispositivo extraíble como «%s»"
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "El soporte «%s» es una imagen ISO, será montada al vuelo"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "usar dispositivo extraíble diferente [%s] para «%s»"
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr ""
+#~ "no se puede recuperar el nombre de ruta para el soporte extraíble «%s»"
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "no se puede acceder al primer soporte de la instalación"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "no se puede acceder soporte \"%s\",\n"
+#~ "esto puede ocurrir si montó manualmente el directorio cuando creó el "
+#~ "soporte."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "soporte no coherente «%s» marcado como borrable, pero no borrado"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Presione «Intro» cuando esté listo..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - limpia dir. encabezados de cache.\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "el soporte virtual debe ser local"
@@ -3300,9 +3311,6 @@ msgstr "No se encontró changelog\n"
#~ msgid "file [%s] already used in the same medium \"%s\""
#~ msgstr "archivo [%s] ya utilizado en el mismo soporte «%s»"
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "no se puede escribir el archivo de lista de «%s»"
-
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "nada escrito en el archivo de lista para «%s»"
diff --git a/po/et.po b/po/et.po
index 10f71dfb..4d5da43a 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2008-03-01 17:11+0300\n"
"Last-Translator: Marek Laane <bald@starman.ee>\n"
"Language-Team: Estonian <et@li.org>\n"
@@ -103,12 +103,7 @@ msgstr "_Loobu"
msgid "Choose location to save file"
msgstr "Valige faili salvestamise koht"
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "Tundmatu võti %s"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "Pakette pole valitud"
@@ -219,12 +214,12 @@ msgstr "Valmistumine..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Paketi '%s' paigaldamine (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Palun asetage andmekandja nimega \"%s\" seadmesse [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Paketi '%s' allalaadimine..."
@@ -418,6 +413,16 @@ msgstr "Liiga palju argumente\n"
msgid "Copying failed"
msgstr "Kopeerimine ebaõnnestus"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, c-format
+msgid "medium \"%s\" is not available"
+msgstr "andmekandja \"%s\" ei ole kättesaadav"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "RPM-faili [%s] lugemine andmekandjalt \"%s\" ebaõnnestus"
+
#: ../urpm/cfg.pm:81
#, c-format
msgid "syntax error in config file at line %s"
@@ -727,7 +732,12 @@ msgstr "Kas proovida paigaldust ilma sõltuvusi kontrollimata? (j/E)"
msgid "Try harder to install (--force)? (y/N) "
msgstr "Kas proovida paigaldust veel jõulisemalt (--force)? (j/E) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -743,11 +753,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "%d paigaldamistehing ebaõnnestus"
msgstr[1] "%d paigaldamistehingut ebaõnnestus"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Paigaldamine on võimalik"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -773,6 +778,11 @@ msgstr "Paketti %s ei saa paigaldada"
msgid "Packages %s can not be installed"
msgstr "Pakette %s ei saa paigaldada"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Paigaldamine on võimalik"
+
#: ../urpm/md5sum.pm:20
#, c-format
msgid "examining %s file"
@@ -805,30 +815,8 @@ msgstr "püütakse vältida olemasolevat andmekandjat \"%s\""
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "eemaldataval andmekandjal \"%s\" on liiga palju haakepunkte"
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "eemaldatavat andmekandjat käsitletakse kui \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+msgid "failed to migrate removable device, ignoring media"
msgstr ""
-"Andmekandja \"%s\" on ISO-tõmmis, mis haagitakse vastavalt vajadusele "
-"automaatselt"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "kasutatakse teist eemaldatavat seadet [%s] \"%s\" jaoks"
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "eemaldatava andmekandja \"%s\" asukoha hankimine ebaõnnestus"
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -889,12 +877,7 @@ msgstr "andmekandja \"%s\" lisamine enne võrguandmekandjat \"%s\""
msgid "adding medium \"%s\""
msgstr "andmekandja \"%s\" lisamine"
-#: ../urpm/media.pm:750
-#, c-format
-msgid "unable to mount the distribution medium"
-msgstr "distributsiooniandmekandja ühendamine nurjus"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "see asukoht ei paista sisaldavat ühtegi distributsiooni"
@@ -1010,17 +993,7 @@ msgstr "genhdlist2 ebaõnnestus %s puhul"
msgid "comparing %s and %s"
msgstr "%s ja %s võrdlemine"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"andmekandjat \"%s\" ei õnnestunud leida,\n"
-"mis võib juhtuda siis, kui andmekandjat luues ühendati kataloog käsitsi."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "vigane hdlist-fail %s andmekandjale \"%s\""
@@ -1187,36 +1160,21 @@ msgstr "leiti paralleelkäitleja sõlmedele: %s"
msgid "unable to use parallel option \"%s\""
msgstr "paralleelvõtme \"%s\" kasutamine ebaõnnestus"
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "ligipääs andmekandjale \"%s\" ebaõnnestus"
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "%s haakimine"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "%s lahutamine"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not available"
-msgstr "andmekandja \"%s\" ei ole kättesaadav"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "RPM-faili [%s] lugemine andmekandjalt \"%s\" ebaõnnestus"
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "andmekandja \"%s\" on kirjas eemaldatavana, aga ei ole seda mitte"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "ligipääs andmekandjale \"%s\" ebaõnnestus"
-
#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
@@ -2331,19 +2289,19 @@ msgstr "Kasutusele võetakse veel %s kettaruumi."
msgid "%s of disk space will be freed."
msgstr "Vabaneb %s kettaruumi."
-#: ../urpmi:603
+#: ../urpmi:604
+#, fuzzy, c-format
+msgid "%s of packages will be retrieved."
+msgstr "Vabaneb %s kettaruumi."
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Kas paigaldada 1 pakett?"
msgstr[1] "Kas paigaldada %d paketti?"
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Vajutage Enter, kui see on tehtud..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Loobu"
@@ -2356,7 +2314,7 @@ msgstr "urpmi taaskäivitamine"
#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
-#, c-format
+#, fuzzy, c-format
msgid ""
"usage: urpmi.addmedia [options] <name> <url>\n"
"where <url> is one of\n"
@@ -2364,7 +2322,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2386,7 +2344,8 @@ msgstr ""
" removable://<asukoht>\n"
"\n"
"kasutamine: urpmi.addmedia [võtmed] --distrib --mirrorlist <url>\n"
-"kasutamine: urpmi.addmedia [võtmed] --mirrorlist <url> <nimi> <suhteline asukoht>\n"
+"kasutamine: urpmi.addmedia [võtmed] --mirrorlist <url> <nimi> <suhteline "
+"asukoht>\n"
"\n"
"näited:\n"
"\n"
@@ -2496,12 +2455,7 @@ msgstr ""
" --raw - andmekandja lisatakse seadistustefaili, aga seda ei "
"uuendata.\n"
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - puhastab päistepuhvri kataloogi.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - vaikne režiim.\n"
@@ -2938,21 +2892,31 @@ msgid " --changelog - print changelog.\n"
msgstr " --changelog - näitab muutuste logi.\n"
#: ../urpmq:81
+#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - konfliktide sildid\n"
+
+#: ../urpmq:82
#, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - näitab pakutavaid.\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - nõutavate sildid\n"
+
+#: ../urpmq:84
#, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - näitab lähtekoodi RPM-i nime.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - näitab kokkuvõtet.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -3051,7 +3015,12 @@ msgstr " päringu esitamine käsureal antud nimede või RPM-failide kohta.\n"
msgid "--list-nodes can only be used with --parallel"
msgstr "võtit --list-nodes saab kasutada ainult koos võtmega --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, c-format
+msgid "use -l to list files"
+msgstr ""
+
+#: ../urpmq:363
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3082,6 +3051,46 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Muutuste logi ei leitud\n"
+#~ msgid "Unknown option %s"
+#~ msgstr "Tundmatu võti %s"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "eemaldataval andmekandjal \"%s\" on liiga palju haakepunkte"
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "eemaldatavat andmekandjat käsitletakse kui \"%s\""
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr ""
+#~ "Andmekandja \"%s\" on ISO-tõmmis, mis haagitakse vastavalt vajadusele "
+#~ "automaatselt"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "kasutatakse teist eemaldatavat seadet [%s] \"%s\" jaoks"
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "eemaldatava andmekandja \"%s\" asukoha hankimine ebaõnnestus"
+
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "distributsiooniandmekandja ühendamine nurjus"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "andmekandjat \"%s\" ei õnnestunud leida,\n"
+#~ "mis võib juhtuda siis, kui andmekandjat luues ühendati kataloog käsitsi."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "andmekandja \"%s\" on kirjas eemaldatavana, aga ei ole seda mitte"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Vajutage Enter, kui see on tehtud..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - puhastab päistepuhvri kataloogi.\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "virtuaalne andmekandja peab olema kohalik"
diff --git a/po/eu.po b/po/eu.po
index 30a87396..4f802349 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2008-02-26 15:04+0100\n"
"Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
"Language-Team: Euskara <eu@li.org>\n"
@@ -105,12 +105,7 @@ msgstr "_Utzi"
msgid "Choose location to save file"
msgstr "Aukeratu fitxategiko gordetzeko kokalekua"
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "Aukera ezezaguna %s"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "Ez da paketerik zehaztu"
@@ -184,12 +179,14 @@ msgstr ""
#: ../gurpmi2:215 ../urpmi:592
#, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
msgstr "Mendekotasunak asetzeko, ondorengo paketea instalatuko da:"
#: ../gurpmi2:216 ../urpmi:593
#, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Mendekotasunak asetzeko, ondoko paketeak instalatuko dira:"
#: ../gurpmi2:218
@@ -219,12 +216,12 @@ msgstr "Prestatzen..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "`%s' paketea instalatzen (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Sartu \"%s\" izena duen euskarria [%s] gailuan"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "`%s' paketea deskargatzen..."
@@ -418,6 +415,16 @@ msgstr "Argumentu gehiegi\n"
msgid "Copying failed"
msgstr "Ezin izan da kopiatu"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, c-format
+msgid "medium \"%s\" is not available"
+msgstr "\"%s\" euskarria ez dago eskuragarri"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "ezin izan dugu [%s] rpm fitxategia \"%s\" euskarrian irakurri"
+
#: ../urpm/cfg.pm:81
#, c-format
msgid "syntax error in config file at line %s"
@@ -587,7 +594,8 @@ msgstr "[birpaketatzen]"
#: ../urpm/install.pm:154
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
"transakzioa sortu da %s(e)n instalatzeko (kendu=%d, instalatu=%d,eguneratu=%"
"d)"
@@ -727,7 +735,12 @@ msgstr "Mendekotasunak egiaztatu gabe saiatu nahi duzu instalatzen? (b/E) "
msgid "Try harder to install (--force)? (y/N) "
msgstr "Indar handiagoz instalatzen saiatu (--force)? (b/E) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -743,11 +756,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "instalaketa eragiketa %d-ek huts egin du"
msgstr[1] "%d instalaketa eragiketek huts egin dute"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Instalazioa posible da"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -773,6 +781,11 @@ msgstr "%s paketea ezin da instalatu"
msgid "Packages %s can not be installed"
msgstr "%s paketeak ezin dira instalatu"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Instalazioa posible da"
+
#: ../urpm/md5sum.pm:20
#, c-format
msgid "examining %s file"
@@ -786,7 +799,8 @@ msgstr "oharra: %s-rentzako md5sum ezin da eskuratu MD5SUM fitxategian"
#: ../urpm/media.pm:187
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "\"%s\" euskarri birtualak url garbia eduki beharko luke, ez ikusi egingo zaio"
+msgstr ""
+"\"%s\" euskarri birtualak url garbia eduki beharko luke, ez ikusi egingo zaio"
#: ../urpm/media.pm:189
#, c-format
@@ -798,37 +812,19 @@ msgstr ""
#: ../urpm/media.pm:196
#, c-format
msgid "unable to access synthesis file of \"%s\", medium ignored"
-msgstr "ezin da \"%s\"(r)en synthesis fitxategia atzitu, euskarriari jaramonik ez"
+msgstr ""
+"ezin da \"%s\"(r)en synthesis fitxategia atzitu, euskarriari jaramonik ez"
#: ../urpm/media.pm:223
#, c-format
msgid "trying to override existing medium \"%s\", skipping"
-msgstr "existitzen den \"%s\" euskarriari jaramonik ez egiteko ahalegina, ekiditen"
+msgstr ""
+"existitzen den \"%s\" euskarriari jaramonik ez egiteko ahalegina, ekiditen"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "muntatze-puntu gehiegi \"%s\" euskarri aldagarriarentzat"
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "gailu aldagarria \"%s\" gisa hartzen"
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "\"%s\" euskarria ISO irudi bat da, behar denean muntatuko da"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "\"%s\"(e)rako gailu aldagarriak [%s] erabiltzen"
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ezin da \"%s\" euskarri aldagarriaren bide-izena berreskuratu"
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -889,12 +885,7 @@ msgstr "\"%s\" euskarria \"%s\" urruneko euskarriaren aurretik eransten"
msgid "adding medium \"%s\""
msgstr "\"%s\" euskarria eransten"
-#: ../urpm/media.pm:750
-#, c-format
-msgid "unable to mount the distribution medium"
-msgstr "ezin da banaketa euskarria muntatu"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "kokapen honek ez dirudi banaketarik daukanik"
@@ -1009,17 +1000,7 @@ msgstr "genhdlist2-k huts egin du %s-rekin"
msgid "comparing %s and %s"
msgstr "%s eta %s parekatzen"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"ezin da \"%s\" euskarria atzitu,\n"
-"agian euskarria sortzean direktorioa eskuz muntatu zenuelako izan daiteke."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "%s hdlist fitxategi baliogabea \"%s\" euskarriarentzat"
@@ -1186,36 +1167,21 @@ msgstr "nodoentzako maneiatzaile paraleloa aurkitu da: %s"
msgid "unable to use parallel option \"%s\""
msgstr "ezin da \"%s\" aukera paraleloa erabili"
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "ezin izan dugu \"%s\" euskarria atzitu"
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "%s muntatzen"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "%s desmuntatzen"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not available"
-msgstr "\"%s\" euskarria ez dago eskuragarri"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "ezin izan dugu [%s] rpm fitxategia \"%s\" euskarrian irakurri"
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "\"%s\" euskarri inkoherentea aldagarri gisa markatuta dago, baina ez da"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "ezin izan dugu \"%s\" euskarria atzitu"
-
#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
@@ -1255,11 +1221,13 @@ msgstr ""
#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:76 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
-msgstr " --excludemedia - ez erabili adierazitako euskarria, komaz bereizita.\n"
+msgstr ""
+" --excludemedia - ez erabili adierazitako euskarria, komaz bereizita.\n"
#: ../urpm/search.pm:39 ../urpmf:39
#, c-format
-msgid " --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
" --literal, -l - ez parekatu patroi gisa, erabili argumentua hitzez hitz "
"testu ilara gisa.\n"
@@ -1269,7 +1237,8 @@ msgstr ""
#: ../urpmi.update:46 ../urpmq:69
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
-msgstr " --urpmi-root - erabili beste erro bat urpmi db eta rpm instalatzeko.\n"
+msgstr ""
+" --urpmi-root - erabili beste erro bat urpmi db eta rpm instalatzeko.\n"
#: ../urpm/search.pm:41 ../urpmf:41 ../urpmi:75 ../urpmq:47
#, c-format
@@ -1280,7 +1249,8 @@ msgstr ""
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
-msgid " --sortmedia - sort media according to substrings separated by comma.\n"
+msgid ""
+" --sortmedia - sort media according to substrings separated by comma.\n"
msgstr ""
" --sortmedia - euskarriak komaz bereizitako azpikateen arabera "
"ordenatzen ditu.\n"
@@ -1293,7 +1263,8 @@ msgstr " --use-distrib - erabili emandako bidea euskarria atzitzeko\n"
#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:80 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
-msgstr " --synthesis - emandako laburpena erabiltzen du urpmi db-ren ordez.\n"
+msgstr ""
+" --synthesis - emandako laburpena erabiltzen du urpmi db-ren ordez.\n"
#: ../urpm/search.pm:45 ../urpmf:45
#, c-format
@@ -1318,7 +1289,8 @@ msgstr " -i - ereduetan ez bereiztu hizki larri eta xeheak.\n"
#: ../urpm/search.pm:49 ../urpmf:49
#, c-format
msgid " -I - honor case distinctions in patterns (default).\n"
-msgstr " -I - ereduetan hizki larri eta xeheak bereiztu (lehenetsia).\n"
+msgstr ""
+" -I - ereduetan hizki larri eta xeheak bereiztu (lehenetsia).\n"
#: ../urpm/search.pm:50 ../urpmf:50
#, c-format
@@ -1538,7 +1510,8 @@ msgstr ""
#: ../urpm/select.pm:23
#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
"urpmi berrabiatu egin da, eta lehentasuna duten paketeen zerrenda aldatu "
"egin da: %s vs %s"
@@ -1647,8 +1620,10 @@ msgstr " --test - ezabaketa egokiro egin daitekeen egiaztatzen du.\n"
#: ../urpme:48 ../urpmi:104 ../urpmq:65
#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - deitzea behartzen du, nahiz eta pakete batzuk ez egon.\n"
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - deitzea behartzen du, nahiz eta pakete batzuk ez egon.\n"
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
@@ -1725,7 +1700,8 @@ msgstr "Ondoko paketeak kentzeko egiaztatzen"
#: ../urpme:124
#, c-format
msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural "To satisfy dependencies, the following %d packages will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
msgstr[0] "Mendekotasunak asetzeko, ondoko paketea ezabatuko da"
msgstr[1] "Mendekotasunak asetzeko, ondoko %d paketeak ezabatuko dira"
@@ -1765,7 +1741,8 @@ msgstr ""
#: ../urpmi:78
#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
" --searchmedia - soilik adierazitako euskarria erabiltzen du eskatutako "
"paketeak bilatzeko.\n"
@@ -1781,7 +1758,8 @@ msgstr ""
#: ../urpmi:82 ../urpmq:52
#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
msgstr ""
" --auto-select - automatikoki sistemaren bertsioa berritzeko paketeak "
"hautatzen ditu\n"
@@ -1859,7 +1837,8 @@ msgstr " --buildrequires - instalatu paketeen «buildrequires»\n"
#: ../urpmi:99
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
-msgstr " --install-src - iturburu-paketea bakarrik instalatzen du (binarioak ez).\n"
+msgstr ""
+" --install-src - iturburu-paketea bakarrik instalatzen du (binarioak ez).\n"
#: ../urpmi:100
#, c-format
@@ -1878,7 +1857,8 @@ msgstr " --justdb - eguneratu soilik rpm db, ez fitxategi-sistema.\n"
#: ../urpmi:103
#, c-format
-msgid " --replacepkgs - force installing packages which are already installed.\n"
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
msgstr ""
" --replacepkgs - behartu dagoeneko instalatuta dauden paketeen "
"instalaketa.\n"
@@ -2009,7 +1989,8 @@ msgstr ""
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
-msgstr " --test - instalazioa zuzen gauzatu daitekeen egiaztatzen du.\n"
+msgstr ""
+" --test - instalazioa zuzen gauzatu daitekeen egiaztatzen du.\n"
#: ../urpmi:135
#, c-format
@@ -2024,7 +2005,8 @@ msgstr " --excludedocs - docs fitxategiak kanpoan uzten ditu.\n"
#: ../urpmi:137
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
-msgstr " --ignoresize - ez egiaztatu diskoan dagoen lekua instalazio aurretik.\n"
+msgstr ""
+" --ignoresize - ez egiaztatu diskoan dagoen lekua instalazio aurretik.\n"
#: ../urpmi:138
#, c-format
@@ -2063,7 +2045,8 @@ msgstr " --nolock - ez giltzatu rpm db.\n"
#: ../urpmi:146
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
-msgstr " --strict-arch - berritu soilik arkitektura berdina duten paketeak.\n"
+msgstr ""
+" --strict-arch - berritu soilik arkitektura berdina duten paketeak.\n"
#: ../urpmi:147 ../urpmq:92
#, c-format
@@ -2073,7 +2056,8 @@ msgstr " -a - komando-lerroko bat-etortze guztiak hautatzen ditu.\n"
#: ../urpmi:148
#, c-format
msgid " -p - allow search in provides to find package.\n"
-msgstr " -p - paketeak aurkitzeko bilaketa 'provides'en egitea baimentzen du.\n"
+msgstr ""
+" -p - paketeak aurkitzeko bilaketa 'provides'en egitea baimentzen du.\n"
#: ../urpmi:149
#, c-format
@@ -2093,7 +2077,8 @@ msgstr " --debug - oso modu berritsua.\n"
#: ../urpmi:153
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
-msgstr " komando-lerroan idatzitako izenak edo rpm fitxategiak instalatuko dira.\n"
+msgstr ""
+" komando-lerroan idatzitako izenak edo rpm fitxategiak instalatuko dira.\n"
#: ../urpmi:181
#, c-format
@@ -2117,8 +2102,10 @@ msgstr "Ezin dituzu rpm fitxategi bitarrak instalatu --install-src erabilita"
#: ../urpmi:221
#, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
-msgstr "mesedez erabili --buildrequires edo --install-src, lehenetsia --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgstr ""
+"mesedez erabili --buildrequires edo --install-src, lehenetsia --buildrequires"
#: ../urpmi:241
#, c-format
@@ -2314,19 +2301,19 @@ msgstr "diskoan %s leku gehiago erabiliko da."
msgid "%s of disk space will be freed."
msgstr "diskoan %s lekua askatuko da."
-#: ../urpmi:603
+#: ../urpmi:604
+#, fuzzy, c-format
+msgid "%s of packages will be retrieved."
+msgstr "diskoan %s lekua askatuko da."
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Pakete baten instalaketarekin arrera jarraitu nahi duzu?"
msgstr[1] "%d paketeen instalaketarekin jarraitu nahi duzu?"
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Prest zaudenean sakatu Sartu..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Utzi"
@@ -2339,7 +2326,7 @@ msgstr "urpmi berrabiarazten"
#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
-#, c-format
+#, fuzzy, c-format
msgid ""
"usage: urpmi.addmedia [options] <name> <url>\n"
"where <url> is one of\n"
@@ -2347,7 +2334,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2369,7 +2356,8 @@ msgstr ""
" removable://<bidea>\n"
"\n"
"erabilera: urpmi.addmedia [aukerak] --distrib --mirrorlist <url>\n"
-"erabilera: urpmi.addmedia [aukerak] --mirrorlist <url> <izena> <bide erlatiboa>\n"
+"erabilera: urpmi.addmedia [aukerak] --mirrorlist <url> <izena> <bide "
+"erlatiboa>\n"
"\n"
"adibideak:\n"
"\n"
@@ -2382,7 +2370,8 @@ msgstr ""
#: ../urpmi.addmedia:55 ../urpmi.update:33 ../urpmq:72
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
-msgstr " --wget - wget erabiltzen du urruneko fitxategiak eskuratzeko.\n"
+msgstr ""
+" --wget - wget erabiltzen du urruneko fitxategiak eskuratzeko.\n"
#: ../urpmi.addmedia:56 ../urpmi.update:34 ../urpmq:73
#, c-format
@@ -2392,7 +2381,8 @@ msgstr " --curl - curl erabiltzen du urruneko fitxategiak eskuratzeko.\n"
#: ../urpmi.addmedia:57 ../urpmi.update:35 ../urpmq:74
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
-msgstr " --prozilla - prozilla erabiltzen du urruneko fitxategiak eskuratzeko.\n"
+msgstr ""
+" --prozilla - prozilla erabiltzen du urruneko fitxategiak eskuratzeko.\n"
#: ../urpmi.addmedia:63
#, c-format
@@ -2477,12 +2467,7 @@ msgstr " --nopubkey - ez inportatu erantsitako euskarrien gako-publikoa\n"
msgid " --raw - add the media in config, but don't update it.\n"
msgstr " --raw - erantsi euskarria konfig-en, baino ez eguneratu.\n"
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - garbitu goiburuen cache direktorioa.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - modu lasaia.\n"
@@ -2525,7 +2510,8 @@ msgstr "Ezin da konfig fitxategia sortu [%s]"
#: ../urpmi.addmedia:134
#, c-format
msgid "no need to give <relative path of synthesis> with --distrib"
-msgstr "ez dago <synthesis-en bide erlatiboa> eman beharrik --distrib aukerarekin"
+msgstr ""
+"ez dago <synthesis-en bide erlatiboa> eman beharrik --distrib aukerarekin"
#: ../urpmi.addmedia:142
#, c-format
@@ -2582,7 +2568,8 @@ msgstr ""
#: ../urpmi.recover:37
#, c-format
-msgid " --list - list transactions since provided date/duration argument\n"
+msgid ""
+" --list - list transactions since provided date/duration argument\n"
msgstr ""
" --list - zerrendatu ematen den data/iraupen argumentutik egin "
"diren eragiketak\n"
@@ -2763,7 +2750,8 @@ msgstr " --no-ignore - ez eguneratu, markatu euskarria gaitu gisa.\n"
#: ../urpmi.update:47
#, c-format
msgid " --probe-rpms - do not use synthesis, use rpm files directly\n"
-msgstr " --probe-rpms - ez erabili synthesis, zuzenean rpm fitxategiak erabili\n"
+msgstr ""
+" --probe-rpms - ez erabili synthesis, zuzenean rpm fitxategiak erabili\n"
#: ../urpmi.update:48
#, c-format
@@ -2788,7 +2776,8 @@ msgstr "Supererabiltzaileak soilik dauka euskarriak eguneratzeko baimena"
#: ../urpmi.update:76
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "ez dago eguneratzeko ezer (erabili urpmi.addmedia euskarria gehitzeko)\n"
+msgstr ""
+"ez dago eguneratzeko ezer (erabili urpmi.addmedia euskarria gehitzeko)\n"
#: ../urpmi.update:94
#, c-format
@@ -2876,17 +2865,21 @@ msgstr " --list-aliases - alias paralelo erabilgarrien zerrenda.\n"
#: ../urpmq:62
#, c-format
-msgid " --dump-config - dump the config in form of urpmi.addmedia argument.\n"
-msgstr " --dump-config - config urpmi.addmedia argumentu gisa iraultzen du.\n"
+msgid ""
+" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+" --dump-config - config urpmi.addmedia argumentu gisa iraultzen du.\n"
#: ../urpmq:63
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
-msgstr " --src - hurrengo paketea iturburu-pakete bat da (-s bezala).\n"
+msgstr ""
+" --src - hurrengo paketea iturburu-pakete bat da (-s bezala).\n"
#: ../urpmq:64
#, 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 - iturburu-pakete guztiak deskargatu aurretik ematen ditu \n"
" (root-ek bakarrik).\n"
@@ -2913,21 +2906,31 @@ msgid " --changelog - print changelog.\n"
msgstr " --changelog - changelog inprimatzen du.\n"
#: ../urpmq:81
+#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - \"gatazka\" etiketak\n"
+
+#: ../urpmq:82
#, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - inprimatu 'provides' eremua.\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - \"beharrezko\" etiketak\n"
+
+#: ../urpmq:84
#, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - sourcerpm erakutsi.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - laburpena inprimatu.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -2997,14 +3000,16 @@ msgstr ""
#: ../urpmq:100
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
-msgstr " -s - hurrengo paketea iturburu-pakete bat da (--src bezala).\n"
+msgstr ""
+" -s - hurrengo paketea iturburu-pakete bat da (--src bezala).\n"
#: ../urpmq:101
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
-msgstr "-u - paketea kentzen du bertsio berriagoa instalatuta badago.\n"
+msgstr ""
+"-u - paketea kentzen du bertsio berriagoa instalatuta badago.\n"
#: ../urpmq:102
#, c-format
@@ -3021,14 +3026,20 @@ msgstr ""
#: ../urpmq:104
#, c-format
msgid " names or rpm files given on command line are queried.\n"
-msgstr " komando-lerroan idatzitako izenak edo rpm fitxategiak kontsultatu dira.\n"
+msgstr ""
+" komando-lerroan idatzitako izenak edo rpm fitxategiak kontsultatu dira.\n"
#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--nodo-zerrendak honekin bakarrik erabil daitezke: --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, c-format
+msgid "use -l to list files"
+msgstr ""
+
+#: ../urpmq:363
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3044,14 +3055,16 @@ msgstr ""
#: ../urpmq:364
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
"ez dago \"%s\" euskarriarentzako xml info, ezin da %s paketearentzako "
"inolako emaitzarik itzuli"
#: ../urpmq:365
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
"ez dago \"%s\" euskarriarentzako xml info, ezin da %s paketeentzako inolako "
"emaitzarik itzuli"
@@ -3061,3 +3074,41 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Ez da changelog aurkitu\n"
+#~ msgid "Unknown option %s"
+#~ msgstr "Aukera ezezaguna %s"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "muntatze-puntu gehiegi \"%s\" euskarri aldagarriarentzat"
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "gailu aldagarria \"%s\" gisa hartzen"
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "\"%s\" euskarria ISO irudi bat da, behar denean muntatuko da"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "\"%s\"(e)rako gailu aldagarriak [%s] erabiltzen"
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "ezin da \"%s\" euskarri aldagarriaren bide-izena berreskuratu"
+
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "ezin da banaketa euskarria muntatu"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "ezin da \"%s\" euskarria atzitu,\n"
+#~ "agian euskarria sortzean direktorioa eskuz muntatu zenuelako izan daiteke."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr ""
+#~ "\"%s\" euskarri inkoherentea aldagarri gisa markatuta dago, baina ez da"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Prest zaudenean sakatu Sartu..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - garbitu goiburuen cache direktorioa.\n"
diff --git a/po/fa.po b/po/fa.po
index 219cfb6d..d14762c8 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-fa\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2005-02-06 08:42-0500\n"
"Last-Translator: \n"
"Language-Team: <en@li.org>\n"
@@ -106,14 +106,7 @@ msgstr "_لغو"
msgid "Choose location to save file"
msgstr "مکان ذخیره‌ی پرونده را انتخاب کنید"
-#: ../gurpmi.pm:80
-#, fuzzy, c-format
-msgid "Unknown option %s"
-msgstr ""
-"\n"
-"گزینه‌های ناشناخته '%s'\n"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, fuzzy, c-format
msgid "No packages specified"
msgstr "هیچ بسته‌ای با نام %s"
@@ -223,12 +216,12 @@ msgstr "در حال آماده کردن..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "نصب بسته `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "لطفاً رسانه‌ی بنام \"%s\" بر دستگاه [%s] را داخل نمایید"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "بارگیری بسته `%s'..."
@@ -420,6 +413,16 @@ msgstr ""
msgid "Copying failed"
msgstr "کپی کردن شکست خورد"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "رسانه \"%s\" انتخاب نشده است"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "نمی‌توان پرونده rpm [%s] را از رسانه \"%s\" خواند"
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -726,7 +729,12 @@ msgstr "تلاش برای نصب بدون بررسی وابستگی‌ها؟ (y/
msgid "Try harder to install (--force)? (y/N) "
msgstr "تلاش برای نصب حتی قویتر (--force)؟ (y/N) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -739,11 +747,6 @@ msgid "%d installation transaction failed"
msgid_plural "%d installation transactions failed"
msgstr[0] "%d معامله‌های نصب شکست خورد"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "نصب ممکن می‌باشد"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -769,6 +772,11 @@ msgstr "همه چیز قبلاً نصب شده است"
msgid "Packages %s can not be installed"
msgstr "همه چیز قبلاً نصب شده است"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "نصب ممکن می‌باشد"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -803,28 +811,8 @@ msgstr "تلاش برای گذشتن از کنار رسانه‌ی موجود \"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "نقاط سوارسازی بیش از اندازه برای رسانه قابل انتقال \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "پذیرش دستگاه‌های قابل انتقال مانند \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "رسانه \"%s\" یک تصویر ISO است، در حال اجرا سوار خواهد گردید"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "استفاده از دستگاه قابل انتقال متفاوت [%s] برای \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "نمی‌توان نام مسیر را برای رسانه قابل انتقال \"%s\" دریافت کرد"
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -885,12 +873,7 @@ msgstr "خواندن سرآیندها از رسانه \"%s\""
msgid "adding medium \"%s\""
msgstr "برداشتن رسانه‌ی \"%s\""
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "نمی‌توان به اولین رسانه‌ی نصب دسترسی پیدا کرد"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -1005,18 +988,7 @@ msgstr "آزمایش پرونده hdlist [%s]"
msgid "comparing %s and %s"
msgstr "نصب %s از %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"نمی‌توان به رسانه \"%s\" دسترسی پیدا کرد،\n"
-"این می‌تواند در صورتی که شما شاخه را هنگام ایجاد رسانه دستی سوار کرده باشید "
-"اتفاق بیافتد."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "هیچ پرونده‌ی hdlist برای رسانه \"%s\" یافت شد"
@@ -1183,36 +1155,21 @@ msgstr "یافت دستگیره موازی برای گره‌ها: %s"
msgid "unable to use parallel option \"%s\""
msgstr "نمی‌توان از گزینه موازی \"%s\" استفاده کرد"
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "نمی‌توان به رسانه \"%s\" دسترسی پیدا کرد"
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "سوار کردن %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "پیاده کردن %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "رسانه \"%s\" انتخاب نشده است"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "نمی‌توان پرونده rpm [%s] را از رسانه \"%s\" خواند"
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "رسانه بی‌ارتباط \"%s\" قابل انتقال نشان داده شده ولی نه واقعاً"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "نمی‌توان به رسانه \"%s\" دسترسی پیدا کرد"
-
#: ../urpm/search.pm:29 ../urpmf:29
#, fuzzy, c-format
msgid ""
@@ -2286,18 +2243,18 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "وقتی آماده‌اید ورود را فشار دهید..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "لغو"
@@ -2318,7 +2275,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2439,12 +2396,7 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - سرآیندهای شاخه حافظه پنهان را پاک می‌کند.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - حالت ساکت.\n"
@@ -2868,20 +2820,30 @@ msgstr " --changelog - چاپ ثبت تغییرات.\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - چاپ برچسب اختلاف‌ها: همه اختلاف‌ها.\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - برچسب چاپ عرضه می‌دارد: عرضه‌ی همه.\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - چاپ برچسب لازمه: همه لازم.\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - چاپ برچسب sourcerpm: منبع rpm.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - برچسب خلاصه‌ی چاپ: خلاصه.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -2972,7 +2934,12 @@ msgstr "نام‌ها یا پرونده‌های داده شده بر خط فر
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes فقط می‌توانند با --parallel استفاده شود"
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "نمی توان پرونده لیست \"%s\" را نوشت"
+
+#: ../urpmq:363
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3007,6 +2974,49 @@ msgstr ""
msgid "No changelog found\n"
msgstr "هیچ ثبت تغییری یافت نشد\n"
+#, fuzzy
+#~ msgid "Unknown option %s"
+#~ msgstr ""
+#~ "\n"
+#~ "گزینه‌های ناشناخته '%s'\n"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "نقاط سوارسازی بیش از اندازه برای رسانه قابل انتقال \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "پذیرش دستگاه‌های قابل انتقال مانند \"%s\""
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "رسانه \"%s\" یک تصویر ISO است، در حال اجرا سوار خواهد گردید"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "استفاده از دستگاه قابل انتقال متفاوت [%s] برای \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "نمی‌توان نام مسیر را برای رسانه قابل انتقال \"%s\" دریافت کرد"
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "نمی‌توان به اولین رسانه‌ی نصب دسترسی پیدا کرد"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "نمی‌توان به رسانه \"%s\" دسترسی پیدا کرد،\n"
+#~ "این می‌تواند در صورتی که شما شاخه را هنگام ایجاد رسانه دستی سوار کرده "
+#~ "باشید اتفاق بیافتد."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "رسانه بی‌ارتباط \"%s\" قابل انتقال نشان داده شده ولی نه واقعاً"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "وقتی آماده‌اید ورود را فشار دهید..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - سرآیندهای شاخه حافظه پنهان را پاک می‌کند.\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "رسانه مجازی باید محلی باشد"
@@ -3242,9 +3252,6 @@ msgstr "هیچ ثبت تغییری یافت نشد\n"
#~ msgid "file [%s] already used in the same medium \"%s\""
#~ msgstr "پرونده [%s] قبلاً در همان رسانه \"%s\" استفاده شده است"
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "نمی توان پرونده لیست \"%s\" را نوشت"
-
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "هیچ چیزی در پرونده‌ی لیست برای \"%s\" نوشته نشده است"
diff --git a/po/fi.po b/po/fi.po
index 8264fdb4..4779b589 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2007-10-27 04:38+0300\n"
"Last-Translator: Anssi Hannula <anssi@mandriva.org>\n"
"Language-Team: Finnish <fi@li.org>\n"
@@ -110,12 +110,7 @@ msgstr "_Peruuta"
msgid "Choose location to save file"
msgstr "Valitse hakemisto johon tiedosto tallennetaan"
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "Tuntematon valitsin %s"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "Paketteja ei annettu"
@@ -226,12 +221,12 @@ msgstr "Valmistellaan..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Asennetaan pakettia `%s' (%s / %s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Aseta media nimeltään \"%s\" laitteeseen [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Ladataan pakettia `%s'..."
@@ -423,6 +418,16 @@ msgstr "Liian monta argumenttia\n"
msgid "Copying failed"
msgstr "Kopiointi epäonnistui"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, c-format
+msgid "medium \"%s\" is not available"
+msgstr "media \"%s\" ei ole saatavilla"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "rpm-tiedostoa [%s] ei voitu lukea medialta \"%s\""
+
#: ../urpm/cfg.pm:81
#, c-format
msgid "syntax error in config file at line %s"
@@ -729,7 +734,12 @@ msgstr "Yritetäänkö asentaa ilman riippuvuuksia? (k/E) "
msgid "Try harder to install (--force)? (y/N) "
msgstr "Yritetäänkö asentaa pakolla (--force)? (k/E) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -743,11 +753,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "%d asennustoiminto epäonnistui"
msgstr[1] "%d asennustoimintoa epäonnistui"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Asennus on mahdollinen"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -773,6 +778,11 @@ msgstr "Pakettia %s ei voida asentaa"
msgid "Packages %s can not be installed"
msgstr "Paketteja %s ei voida asentaa"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Asennus on mahdollinen"
+
#: ../urpm/md5sum.pm:20
#, c-format
msgid "examining %s file"
@@ -806,28 +816,8 @@ msgstr "yritetään syrjäyttää olemassa olevaa media \"%s\", ohitetaan"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "liian monta liitospistettä siirrettävälle medialle \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "käytetään siirrettävää laitetta kohteena \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "Media \"%s\" on ISO kuvatiedosto, liitetään automaattisesti"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "käytetään toista siirrettävää laitetta [%s] kohteelle \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "siirrettävän median \"%s\" polkua ei voitu noutaa"
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -888,12 +878,7 @@ msgstr "lisätään media \"%s\" etämedian \"%s\" eteen"
msgid "adding medium \"%s\""
msgstr "lisätään media \"%s\""
-#: ../urpm/media.pm:750
-#, c-format
-msgid "unable to mount the distribution medium"
-msgstr "jakelun mediaa ei voida liittää"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "tämä sijainti ei vaikuta sisältävän jakelua"
@@ -1008,17 +993,7 @@ msgstr "tutkitaan hdlist-tiedostoa [%s]"
msgid "comparing %s and %s"
msgstr "tyhjennetään %s ja %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"mediaa \"%s\" ei voitu käyttää,\n"
-"tämä voi johtua siitä että liitit hakemiston manuaalisesti kun loit median."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "virheellinen hdlist-tiedosto %s medialle \"%s\""
@@ -1185,37 +1160,21 @@ msgstr "rinnakkaiskäsittelijä löydetty noodeille: %s"
msgid "unable to use parallel option \"%s\""
msgstr "rinnakkaisvalitsinta \"%s\" ei voitu käyttää"
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "mediaa \"%s\" ei voitu käyttää"
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "liitetään %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "irrotetaan %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not available"
-msgstr "media \"%s\" ei ole saatavilla"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "rpm-tiedostoa [%s] ei voitu lukea medialta \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr ""
-"hajanainen media \"%s\" merkitty siirrettäväksi, vaikkei oikeastaan ole"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "mediaa \"%s\" ei voitu käyttää"
-
#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
@@ -2319,19 +2278,19 @@ msgstr "Pakettien asentaminen vie %s lisää levytilaa."
msgid "%s of disk space will be freed."
msgstr "%s levytilaa vapautuu."
-#: ../urpmi:603
+#: ../urpmi:604
+#, fuzzy, c-format
+msgid "%s of packages will be retrieved."
+msgstr "%s levytilaa vapautuu."
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Asennetaanko tämä paketti?"
msgstr[1] "Asennetaanko nämä %d pakettia?"
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Paina Enter kun olet valmis..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Peruuta"
@@ -2352,7 +2311,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2470,12 +2429,7 @@ msgstr " --nopubkey - älä tuo pubkey-tiedostoa lisätystä mediasta\n"
msgid " --raw - add the media in config, but don't update it.\n"
msgstr " --raw - lisää mediaa asetuksissa, mutta älä päivitä sitä.\n"
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - puhdista otsikkotietojen välimuistihakemisto\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - hiljainen tyyli\n"
@@ -2910,20 +2864,30 @@ msgstr " --changelog - tulosta muutosloki\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - konfliktimerkinnät\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - tarjoamismerkinnät\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - riippuvuusmerkinnät\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - lähde-rpm-tiedoston nimi\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - tulosta yhteenveto.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -3019,7 +2983,12 @@ msgstr " komentorivillä syötetyt nimet tai rpm-tiedostot etsitään.\n"
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes voi ainoastaan käyttää --parallel kanssa"
-#: ../urpmq:360
+#: ../urpmq:206
+#, c-format
+msgid "use -l to list files"
+msgstr ""
+
+#: ../urpmq:363
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3052,6 +3021,46 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Muutoslokia ei löytynyt\n"
+#~ msgid "Unknown option %s"
+#~ msgstr "Tuntematon valitsin %s"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "liian monta liitospistettä siirrettävälle medialle \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "käytetään siirrettävää laitetta kohteena \"%s\""
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "Media \"%s\" on ISO kuvatiedosto, liitetään automaattisesti"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "käytetään toista siirrettävää laitetta [%s] kohteelle \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "siirrettävän median \"%s\" polkua ei voitu noutaa"
+
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "jakelun mediaa ei voida liittää"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "mediaa \"%s\" ei voitu käyttää,\n"
+#~ "tämä voi johtua siitä että liitit hakemiston manuaalisesti kun loit "
+#~ "median."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr ""
+#~ "hajanainen media \"%s\" merkitty siirrettäväksi, vaikkei oikeastaan ole"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Paina Enter kun olet valmis..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - puhdista otsikkotietojen välimuistihakemisto\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "virtuaalisen median on oltava paikallinen"
diff --git a/po/fr.po b/po/fr.po
index c92c811e..5f4bcfeb 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -24,7 +24,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2008-02-27 08:45+0100\n"
"Last-Translator: Christophe Berthelé <cpjc@free.fr>\n"
"Language-Team: French <cooker-i18n@mandrivalinux.org>\n"
@@ -123,12 +123,7 @@ msgstr "_Annuler"
msgid "Choose location to save file"
msgstr "Choisissez un emplacement pour enregistrer le fichier."
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "Option « %s » inconnue"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "Pas de paquetage spécifié"
@@ -242,12 +237,12 @@ msgstr "Préparation ..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Installation du paquetage « %s » (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Veuillez insérer le média nommé « %s » dans le périphérique [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Téléchargement du paquetage %s ..."
@@ -441,6 +436,16 @@ msgstr "Trop d'arguments\n"
msgid "Copying failed"
msgstr "La copie a échoué"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, c-format
+msgid "medium \"%s\" is not available"
+msgstr "le média « %s » n'est pas disponible"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "impossible de lire le fichier rpm [%s] depuis le média « %s »"
+
#: ../urpm/cfg.pm:81
#, c-format
msgid "syntax error in config file at line %s"
@@ -751,7 +756,12 @@ msgstr "Essayer d'installer sans vérifier les dépendances ? (o/N) "
msgid "Try harder to install (--force)? (y/N) "
msgstr "Essayer de forcer l'installation (--force) ? (o/N) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -767,11 +777,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "%d transaction d'installation a échoué"
msgstr[1] "%d transactions d'installation ont échoué"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "L'installation est possible"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -797,6 +802,11 @@ msgstr "Le paquetage %s ne peut être installé"
msgid "Packages %s can not be installed"
msgstr "Les paquetages %s ne peuvent être installés"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "L'installation est possible"
+
#: ../urpm/md5sum.pm:20
#, c-format
msgid "examining %s file"
@@ -829,28 +839,8 @@ msgstr "tentative d'outrepasser un média existant « %s », non pris en compt
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "trop de points de montage pour le média amovible « %s »"
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "périphérique amovible pris en tant que « %s »"
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "Le média « %s » est une image ISO, elle va être montée à la volée"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "utilisation de différents périphériques amovibles [%s] pour « %s »"
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "impossible d'accéder au chemin du média amovible « %s »"
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -911,12 +901,7 @@ msgstr "ajout du média « %s » avant le média distant « %s »"
msgid "adding medium \"%s\""
msgstr "ajout du média « %s »"
-#: ../urpm/media.pm:750
-#, c-format
-msgid "unable to mount the distribution medium"
-msgstr "impossible de monter le média de distribution"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "cet emplacement ne semble pas contenir de distribution"
@@ -1033,18 +1018,7 @@ msgstr "échec de genhdlist2 sur [%s]"
msgid "comparing %s and %s"
msgstr "comparaison de %s et de %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"Impossible d'accéder au média « %s »,\n"
-"cela peut arriver si vous avez effectué un montage manuel lors de la "
-"création du média."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "fichier hdlist %s invalide pour le média « %s »"
@@ -1211,36 +1185,21 @@ msgstr "support distribué trouvé pour les noeuds : %s"
msgid "unable to use parallel option \"%s\""
msgstr "impossible d'utiliser l'option distribuée « %s »"
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "impossible d'accéder au média « %s »"
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "montage de %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "démontage de %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not available"
-msgstr "le média « %s » n'est pas disponible"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "impossible de lire le fichier rpm [%s] depuis le média « %s »"
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "média incohérent « %s », marqué amovible mais sans l'être réellement"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "impossible d'accéder au média « %s »"
-
#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
@@ -2404,19 +2363,19 @@ msgstr "un espace additionnel de %s sera utilisé."
msgid "%s of disk space will be freed."
msgstr "un espace de %s sera libéré."
-#: ../urpmi:603
+#: ../urpmi:604
+#, fuzzy, c-format
+msgid "%s of packages will be retrieved."
+msgstr "un espace de %s sera libéré."
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Procéder à l'installation d'un paquetage ?"
msgstr[1] "Procéder à l'installation des %d paquetages ?"
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Appuyez sur la touche Entrée quand vous êtes prêt..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Annuler"
@@ -2429,7 +2388,7 @@ msgstr "Redémarrage de urpmi"
#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
-#, c-format
+#, fuzzy, c-format
msgid ""
"usage: urpmi.addmedia [options] <name> <url>\n"
"where <url> is one of\n"
@@ -2437,7 +2396,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2575,12 +2534,7 @@ msgstr ""
" --raw - ajoute le média dans la configuration, mais sans le "
"mettre à jour.\n"
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - purger le répertoire cache des en-têtes.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - mode silencieux.\n"
@@ -3024,21 +2978,31 @@ msgid " --changelog - print changelog.\n"
msgstr " --changelog - afficher le changelog.\n"
#: ../urpmq:81
+#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - chercher dans le champ « conflicts »\n"
+
+#: ../urpmq:82
#, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - afficher le champ « provides »\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - chercher dans la liste des dépendances\n"
+
+#: ../urpmq:84
#, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - afficher le nom du paquetage source.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - afficher le résumé.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -3145,7 +3109,12 @@ msgstr ""
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes peut seulement être utilisé avec --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, c-format
+msgid "use -l to list files"
+msgstr ""
+
+#: ../urpmq:363
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3179,3 +3148,42 @@ msgstr ""
#, c-format
msgid "No changelog found\n"
msgstr "Aucun Changelog trouvé\n"
+
+#~ msgid "Unknown option %s"
+#~ msgstr "Option « %s » inconnue"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "trop de points de montage pour le média amovible « %s »"
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "périphérique amovible pris en tant que « %s »"
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "Le média « %s » est une image ISO, elle va être montée à la volée"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "utilisation de différents périphériques amovibles [%s] pour « %s »"
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "impossible d'accéder au chemin du média amovible « %s »"
+
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "impossible de monter le média de distribution"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "Impossible d'accéder au média « %s »,\n"
+#~ "cela peut arriver si vous avez effectué un montage manuel lors de la "
+#~ "création du média."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "média incohérent « %s », marqué amovible mais sans l'être réellement"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Appuyez sur la touche Entrée quand vous êtes prêt..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - purger le répertoire cache des en-têtes.\n"
diff --git a/po/fur.po b/po/fur.po
index 8abf5f07..c0110847 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-fur\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2004-05-21 14:55+0200\n"
"Last-Translator: Andrea Gracco <graccoandrea@tin.it>\n"
"Language-Team: Furlan <gft@freelists.org>\n"
@@ -105,14 +105,7 @@ msgstr "_Scancele"
msgid "Choose location to save file"
msgstr "Sielç un puest dulà salvâ il file"
-#: ../gurpmi.pm:80
-#, fuzzy, c-format
-msgid "Unknown option %s"
-msgstr ""
-"\n"
-"opzions no cogniossudis '%s'\n"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Nissun comant specificât"
@@ -223,12 +216,12 @@ msgstr "In preparazion..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Instalazion dal pachet `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Par plasè insede le font clamade \"%s\" te periferiche [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "O stoi scjariant il pachet '%s'..."
@@ -421,6 +414,16 @@ msgstr ""
msgid "Copying failed"
msgstr "Copie falade"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "le font \"%s\" no je selezionade"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "no rivi a lei il file rpm [%s] de font \"%s\""
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -731,7 +734,12 @@ msgstr ""
"Ajo di provâ le instalazion in maniere ancjimò plui sfuarçâde (--force)? (s/"
"N) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -745,11 +753,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "%d stramudis de instalazion faladis"
msgstr[1] "%d stramudis de instalazion faladis"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Le instalazion e je pussibil"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -775,6 +778,11 @@ msgstr "Al è dut dizà instalât"
msgid "Packages %s can not be installed"
msgstr "Al è dut dizà instalât"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Le instalazion e je pussibil"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -807,29 +815,9 @@ msgstr "o cîr di lassâ fûr le font esistint \"%s\", o eviti"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "e son masse ponts di mount pe font rimovibil \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "o consideri le font rimovibil sicu \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+msgid "failed to migrate removable device, ignoring media"
msgstr ""
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "o stoi doprant un diferent dispositîf rimovibil [%s] par \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "no rivi a recuperâ il percôrs pe font rimovibil \"%s\""
-
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
msgid "wrote config file [%s]"
@@ -889,12 +877,7 @@ msgstr "o stoi leint les intestaduris de font \"%s\""
msgid "adding medium \"%s\""
msgstr "o rimôf le font \"%s\""
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "no rivi a acedi a le prime font di instalazion"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -1011,18 +994,7 @@ msgstr "o esamini il file hdlist [%s]"
msgid "comparing %s and %s"
msgstr "instalazion di %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"no rivi a acedi ale font \"%s\",\n"
-"chest al po intravignî se tu âs montât manualmentri le cartele dilunc de "
-"creazion de font."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "nissun file hdlist cjatât pe font \"%s\""
@@ -1189,36 +1161,21 @@ msgstr "cjatât gjestôr paralêl par i grops: %s"
msgid "unable to use parallel option \"%s\""
msgstr "no rivi a doprâ le opzion paralêle \"%s\""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "no rivi a acedi a le font \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "o stoi montant %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "o stoi dismontant %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "le font \"%s\" no je selezionade"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "no rivi a lei il file rpm [%s] de font \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "font \"%s\" no coerente segnade come rimovibil ma no tâl"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "no rivi a acedi a le font \"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, fuzzy, c-format
msgid ""
@@ -2324,19 +2281,19 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Frache Enter cuant che tu sês pront..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Scancele"
@@ -2357,7 +2314,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2474,12 +2431,7 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - nete les intestaduris de cartele in cache.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - maniere cidine.\n"
@@ -2906,21 +2858,34 @@ msgstr " --changelog - stampe le liste des modifichis.\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr ""
+" --conflicts - stampe il tag conflicts: ducj i conflits rilevâts par il "
+"pachet.\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr ""
" --provides - stampe il tag provides: elements furnîts dal pachet.\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr ""
+" --requires - stampe il tag requires: dutis les pretesis dal pachet.\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - stampe il tag sourcerpm: pachets rpm sorzint.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - stampe il tag summary: sumari dal pachet.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -3013,7 +2978,12 @@ msgstr " i nons o file rpm scrits te rie di comant e vegnin interogâs.\n"
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes al po sedi doprât dome cun --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "no rivi a scrivi il file liste di \"%s\""
+
+#: ../urpmq:363
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3048,6 +3018,46 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Nissun changelog cjatât\n"
+#, fuzzy
+#~ msgid "Unknown option %s"
+#~ msgstr ""
+#~ "\n"
+#~ "opzions no cogniossudis '%s'\n"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "e son masse ponts di mount pe font rimovibil \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "o consideri le font rimovibil sicu \"%s\""
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "o stoi doprant un diferent dispositîf rimovibil [%s] par \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "no rivi a recuperâ il percôrs pe font rimovibil \"%s\""
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "no rivi a acedi a le prime font di instalazion"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "no rivi a acedi ale font \"%s\",\n"
+#~ "chest al po intravignî se tu âs montât manualmentri le cartele dilunc de "
+#~ "creazion de font."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "font \"%s\" no coerente segnade come rimovibil ma no tâl"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Frache Enter cuant che tu sês pront..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - nete les intestaduris de cartele in cache.\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "le font virtuâl e a di sedi locâl"
@@ -3312,9 +3322,6 @@ msgstr "Nissun changelog cjatât\n"
#~ msgid "file [%s] already used in the same medium \"%s\""
#~ msgstr "file [%s] dizà in vore te stesse font \"%s\""
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "no rivi a scrivi il file liste di \"%s\""
-
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "no l'è stât scrit nuie tal file list par \"%s\""
diff --git a/po/ga.po b/po/ga.po
index f5917400..94de58f1 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi 1.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\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"
@@ -85,12 +85,7 @@ msgstr "_Cealaigh"
msgid "Choose location to save file"
msgstr ""
-#: ../gurpmi.pm:80
-#, fuzzy, c-format
-msgid "Unknown option %s"
-msgstr "Cód earraidh gan aithne %d\n"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, fuzzy, c-format
msgid "No packages specified"
msgstr "pacáiste ar bith den ainm %s"
@@ -197,12 +192,12 @@ msgstr ""
"Ag feisteáil pacáiste %s\n"
"%d%%"
-#: ../gurpmi2:260 ../urpmi:620
+#: ../gurpmi2:264 ../urpmi:622
#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+msgid "Please insert the medium named \"%s\""
msgstr ""
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, fuzzy, c-format
msgid "Downloading package `%s'..."
msgstr "Ag feistiál pacáiste %s"
@@ -389,6 +384,16 @@ msgstr ""
msgid "Copying failed"
msgstr "theip ar feistiú"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "Tá an próifíl \"%s\" ann cheana!"
+
+#: ../urpm/cdrom.pm:206
+#, fuzzy, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "Tá droch ainmchomad rpm [%s]"
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -695,7 +700,12 @@ msgstr ""
msgid "Try harder to install (--force)? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -709,11 +719,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "Theip ag feistiú"
msgstr[1] "Theip ag feistiú"
-#: ../urpm/main_loop.pm:281
-#, fuzzy, c-format
-msgid "Installation is possible"
-msgstr "Theip ag feistiú"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -739,6 +744,11 @@ msgstr "tá gach rud ann cheana féin"
msgid "Packages %s can not be installed"
msgstr "tá gach rud ann cheana féin"
+#: ../urpm/main_loop.pm:307
+#, fuzzy, c-format
+msgid "Installation is possible"
+msgstr "Theip ag feistiú"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -771,29 +781,9 @@ msgstr "léamh depslist comhad [%s]"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
+msgid "failed to migrate removable device, ignoring media"
msgstr ""
-#: ../urpm/media.pm:410
-#, fuzzy, c-format
-msgid "taking removable device as \"%s\""
-msgstr "Gaireais inscortha"
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr ""
-
-#: ../urpm/media.pm:416
-#, fuzzy, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "Gaireais inscortha"
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "Téip ag oscailt comhad: %s\n"
-
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, fuzzy, c-format
msgid "wrote config file [%s]"
@@ -851,12 +841,7 @@ msgstr "léamh depslist comhad [%s]"
msgid "adding medium \"%s\""
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:750
-#, c-format
-msgid "unable to mount the distribution medium"
-msgstr ""
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -971,15 +956,7 @@ msgstr "léamh depslist comhad [%s]"
msgid "comparing %s and %s"
msgstr "ag feistiú %s\n"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "léamh depslist comhad [%s]"
@@ -1146,36 +1123,21 @@ msgstr "léamh depslist comhad [%s]"
msgid "unable to use parallel option \"%s\""
msgstr "Téip ag oscailt comhad: %s\n"
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "Téip ag oscailt comhad: %s\n"
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "ag feistiú %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, fuzzy, c-format
msgid "unmounting %s"
msgstr "ag feistiú %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "Tá an próifíl \"%s\" ann cheana!"
-
-#: ../urpm/removable.pm:143
-#, fuzzy, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "Tá droch ainmchomad rpm [%s]"
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr ""
-
-#: ../urpm/removable.pm:163
-#, fuzzy, c-format
-msgid "unable to access medium \"%s\""
-msgstr "Téip ag oscailt comhad: %s\n"
-
#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
@@ -2171,19 +2133,19 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:621
-#, fuzzy, c-format
-msgid "Press Enter when ready..."
-msgstr "Brú Enter nuair atá sin déanta agat..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Cealaigh"
@@ -2204,7 +2166,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2305,12 +2267,7 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr ""
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr ""
@@ -2704,21 +2661,31 @@ msgid " --changelog - print changelog.\n"
msgstr ""
#: ../urpmq:81
+#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr "Modúl Cumraíochta Konsole"
+
+#: ../urpmq:82
#, c-format
msgid " --provides - print provides.\n"
msgstr ""
-#: ../urpmq:82
+#: ../urpmq:83
+#, c-format
+msgid " --requires - print requires.\n"
+msgstr ""
+
+#: ../urpmq:84
#, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr ""
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr ""
-#: ../urpmq:85
+#: ../urpmq:87
#, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -2806,7 +2773,12 @@ msgstr ""
msgid "--list-nodes can only be used with --parallel"
msgstr ""
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "Téip ag oscailt comhad: %s\n"
+
+#: ../urpmq:363
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -2834,6 +2806,26 @@ msgid "No changelog found\n"
msgstr ""
#, fuzzy
+#~ msgid "Unknown option %s"
+#~ msgstr "Cód earraidh gan aithne %d\n"
+
+#, fuzzy
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "Gaireais inscortha"
+
+#, fuzzy
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "Gaireais inscortha"
+
+#, fuzzy
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "Téip ag oscailt comhad: %s\n"
+
+#, fuzzy
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Brú Enter nuair atá sin déanta agat..."
+
+#, fuzzy
#~ msgid "unable to parse synthesis file of \"%s\""
#~ msgstr "Téip ag oscailt comhad: %s\n"
@@ -2987,10 +2979,6 @@ msgstr ""
#~ msgstr "léamh depslist comhad [%s]"
#, fuzzy
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "Téip ag oscailt comhad: %s\n"
-
-#, fuzzy
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "léamh depslist comhad [%s]"
diff --git a/po/gl.po b/po/gl.po
index 5cd71213..f3a5c408 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-gl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2006-09-10 00:34+0100\n"
"Last-Translator: Leandro Regueiro <leandro.regueiro@gmail.com>\n"
"Language-Team: Galician <<gpul-traduccion@ceu.fi.udc.es>>\n"
@@ -108,12 +108,7 @@ msgstr "_Cancelar"
msgid "Choose location to save file"
msgstr "Escolla a localización onde se gardará o ficheiro"
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "Opción descoñecida %s"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "Non especificou ningún paquete"
@@ -224,12 +219,12 @@ msgstr "Preparando..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Instalando o paquete `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Insira o soporte que se chama \"%s\" no dispositivo [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Descargando o paquete `%s'..."
@@ -421,6 +416,16 @@ msgstr "Demasiados argumentos\n"
msgid "Copying failed"
msgstr "Fallo ó copiar"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "o soporte \"%s\" non está seleccionado"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "non foi posible ler o ficheiro rpm [%s] dende o soporte \"%s\""
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -729,7 +734,12 @@ msgstr "¿Probar a instalación sen comprobar as dependencias? (s/N) "
msgid "Try harder to install (--force)? (y/N) "
msgstr "¿Probar a instalación con menos comprobacións (--force)? (s/N) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -743,11 +753,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "fallaron %d transaccións de instalación"
msgstr[1] "fallaron %d transaccións de instalación"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "A instalación é viable"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -773,6 +778,11 @@ msgstr "Xa está todo instalado"
msgid "Packages %s can not be installed"
msgstr "Xa está todo instalado"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "A instalación é viable"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -806,28 +816,8 @@ msgstr "intentando seleccionar o soporte inexistente \"%s\""
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "demasiados puntos de montaxe para o soporte extraíble \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "tomando o dispositivo extraíble coma \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "O soporte \"%s\" é unha imaxe ISO, montarase ó vo (on-the-fly)"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "usando un dispositivo extraíble diferente [%s] para \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "non foi posible recuperar a ruta do soporte extraíble \"%s\""
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -888,12 +878,7 @@ msgstr "lendo as cabeceiras do soporte \"%s\""
msgid "adding medium \"%s\""
msgstr "eliminando o soporte \"%s\""
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "non foi posible acceder ó primeiro soporte de instalación"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -1010,17 +995,7 @@ msgstr "examinando o ficheiro hdlist [%s]"
msgid "comparing %s and %s"
msgstr "Instalando %s en %s..."
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"non foi posible acceder ó soporte \"%s\",\n"
-"isto pode ocorrer se montou a man o directorio cando creou o soporte."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "non se atopou o ficheiro hdlist para o soporte \"%s\""
@@ -1187,36 +1162,21 @@ msgstr ""
msgid "unable to use parallel option \"%s\""
msgstr "non foi posible actualizar o soporte \"%s\"\n"
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "non foi posible acceder ó soporte \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "montando %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "desmontando %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "o soporte \"%s\" non está seleccionado"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "non foi posible ler o ficheiro rpm [%s] dende o soporte \"%s\""
-
-#: ../urpm/removable.pm:151
-#, fuzzy, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "soporte inconsistente \"%s\" marcado coma extraíble pero non o é"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "non foi posible acceder ó soporte \"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
@@ -2317,19 +2277,19 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, fuzzy, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Continuar ca instalación dos %d paquetes? (%d MB)"
msgstr[1] "Continuar ca instalación dos %d paquetes? (%d MB)"
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Prema Enter cando estea preparado..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Cancelar"
@@ -2350,7 +2310,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2461,12 +2421,7 @@ msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
" --raw - engadir o soporte á configuración, pero non actualizalo.\n"
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, fuzzy, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - limpar o directorio de caché de cabeceiras.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -v - modo abreviado.\n"
@@ -2893,20 +2848,30 @@ msgstr " --changelog - amosa o changelog.\n"
#: ../urpmq:81
#, fuzzy, c-format
-msgid " --provides - print provides.\n"
+msgid " --conflicts - print conflicts.\n"
msgstr " -v - modo abreviado.\n"
#: ../urpmq:82
#, fuzzy, c-format
+msgid " --provides - print provides.\n"
+msgstr " -v - modo abreviado.\n"
+
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " -v - modo abreviado.\n"
+
+#: ../urpmq:84
+#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - nome do rpm fonte\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - amosar o resumo.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -2998,7 +2963,12 @@ msgstr ""
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes só se pode usar con --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "non foi posible escribir a lista de ficheiros de \"%s\""
+
+#: ../urpmq:363
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3033,6 +3003,47 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Non se atopou o changelog\n"
+#~ msgid "Unknown option %s"
+#~ msgstr "Opción descoñecida %s"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "demasiados puntos de montaxe para o soporte extraíble \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "tomando o dispositivo extraíble coma \"%s\""
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "O soporte \"%s\" é unha imaxe ISO, montarase ó vo (on-the-fly)"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "usando un dispositivo extraíble diferente [%s] para \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "non foi posible recuperar a ruta do soporte extraíble \"%s\""
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "non foi posible acceder ó primeiro soporte de instalación"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "non foi posible acceder ó soporte \"%s\",\n"
+#~ "isto pode ocorrer se montou a man o directorio cando creou o soporte."
+
+#, fuzzy
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "soporte inconsistente \"%s\" marcado coma extraíble pero non o é"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Prema Enter cando estea preparado..."
+
+#, fuzzy
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - limpar o directorio de caché de cabeceiras.\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "os soportes virtuais deben ser locais"
@@ -3330,9 +3341,6 @@ msgstr "Non se atopou o changelog\n"
#~ msgid "file [%s] already used in the same medium \"%s\""
#~ msgstr "o ficheiro [%s] xa se usou no mesmo soporte \"%s\""
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "non foi posible escribir a lista de ficheiros de \"%s\""
-
#~ msgid "found %d headers in cache"
#~ msgstr "atoparonse %d cabeceiras na caché"
diff --git a/po/he.po b/po/he.po
index f579b9ee..fd8324ed 100644
--- a/po/he.po
+++ b/po/he.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2008-03-01 14:30+0200\n"
"Last-Translator: Dotan Kamber <kamberd@yahoo.com>\n"
"Language-Team: Hebrew\n"
@@ -110,12 +110,7 @@ msgstr "_ביטול"
msgid "Choose location to save file"
msgstr "עליך לבחור מקום לשמירת הקובץ"
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "אפשרות לא מוכרת %s"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "לא צוינו חבילות"
@@ -189,12 +184,14 @@ msgstr ""
#: ../gurpmi2:215 ../urpmi:592
#, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
msgstr "כדי לספק את התלויות, החבילה הבאה הותקן:"
#: ../gurpmi2:216 ../urpmi:593
#, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
msgstr "כדי לספק את התלויות החבילות הבאות יותקנו:"
#: ../gurpmi2:218
@@ -224,12 +221,12 @@ msgstr "הכנה..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "מתקין חבילה `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "נא להכניס את המדיה הנקראת \"%s\" להתקן [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "מוריד חבילה `%s'..."
@@ -421,6 +418,16 @@ msgstr "יותר מדי משתנים\n"
msgid "Copying failed"
msgstr "ההעתקה נכשלה"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, c-format
+msgid "medium \"%s\" is not available"
+msgstr "המקור \"%s\" אינו זמין"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "אין אפשרות לקרוא את קובץ ה-RPM [%s] מ \"%s\""
+
#: ../urpm/cfg.pm:81
#, c-format
msgid "syntax error in config file at line %s"
@@ -588,7 +595,8 @@ msgstr "[אורז מחדש]"
#: ../urpm/install.pm:154
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr "יצר עסקה עבור התקנה על %s (הסרה=%d, התקנה=%d, עדכון=%d)"
#: ../urpm/install.pm:157
@@ -726,7 +734,12 @@ msgstr "האם לנסות להתקין ללא בדיקת תלויות? (כן/*ל
msgid "Try harder to install (--force)? (y/N) "
msgstr "האם לנסות להתקין תוך אילוץ תלויות (--force)? (כן/לא) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -740,11 +753,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "%d התקנה נכשלה"
msgstr[1] "%d התקנות נכשלו"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "ניתן לבצע את ההתקנה"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -770,6 +778,11 @@ msgstr "לא ניתן להתקין את החבילה %s"
msgid "Packages %s can not be installed"
msgstr "לא ניתן להתקין את החבילות %s"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "ניתן לבצע את ההתקנה"
+
#: ../urpm/md5sum.pm:20
#, c-format
msgid "examining %s file"
@@ -802,28 +815,8 @@ msgstr "מנסה לדלג על המקור \"%s\", מתחמק"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "יותר מדי נקודות חיבור עבור מאגר נייד \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "לוקח התקן נייד כ - \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "המקור \"%s\" הוא קובץ תמונת תקליטור, הוא ייעוגן לכשידרש"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "משתמש בהתקן נייד אחר [%s] עבור \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "אין אפשרות לאחזר את הנתיב עבור המקור הנשלף \"%s\""
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -884,12 +877,7 @@ msgstr "מוסיף את המקור \"%s\" לפני המקור המרוחק \"%s\
msgid "adding medium \"%s\""
msgstr "מוסיף את המקור \"%s\""
-#: ../urpm/media.pm:750
-#, c-format
-msgid "unable to mount the distribution medium"
-msgstr "אין אפשרות לעגן את מקור ההפצה"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -1004,17 +992,7 @@ msgstr "בודק את הקובץ hdlist [%s]"
msgid "comparing %s and %s"
msgstr "מנקה את %s ואת %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"אין אפשרות לגשת למאגר \"%s\",\n"
-"זה יכול לקרות אם היית מחובר ידנית לספרייה בזמן יצירת המאגר."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "קובץ hdlist %s לא תקף עבור מאגר \"%s\""
@@ -1181,36 +1159,21 @@ msgstr "נמצא parallel handler עבור ה-nodes: %s"
msgid "unable to use parallel option \"%s\""
msgstr "אין אפשרות להשתמש באפשרות המקבילה \"%s\""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "הגישה למדיה \"%s\" נכשלה"
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "מחבר את %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "מנתק את %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not available"
-msgstr "המקור \"%s\" אינו זמין"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "אין אפשרות לקרוא את קובץ ה-RPM [%s] מ \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "מאגר לא רציף \"%s\" מסומן כניתן למחיקה אבל לא באמת"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "הגישה למדיה \"%s\" נכשלה"
-
#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
@@ -1252,7 +1215,8 @@ msgstr " --excludemedia - do not use the given media, separated by comma.\n"
#: ../urpm/search.pm:39 ../urpmf:39
#, c-format
-msgid " --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
#: ../urpm/search.pm:40 ../urpme:52 ../urpmf:40 ../urpmi:111
@@ -1260,7 +1224,8 @@ msgstr ""
#: ../urpmi.update:46 ../urpmq:69
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
-msgstr " --urpmi-root - השתמש בשורש מערכת קבצים אחר ל-urpmi db והתקנת rpm\n"
+msgstr ""
+" --urpmi-root - השתמש בשורש מערכת קבצים אחר ל-urpmi db והתקנת rpm\n"
#: ../urpm/search.pm:41 ../urpmf:41 ../urpmi:75 ../urpmq:47
#, c-format
@@ -1269,7 +1234,8 @@ msgstr " --media - שימוש רק במקורות המסופקים, מו
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
-msgid " --sortmedia - sort media according to substrings separated by comma.\n"
+msgid ""
+" --sortmedia - sort media according to substrings separated by comma.\n"
msgstr " --sortmedia - מיון מדיה בהתאם לכותרות משנה המופרדים ע\"י פסיק.\n"
#: ../urpm/search.pm:43 ../urpmf:43
@@ -1521,7 +1487,8 @@ msgstr "urpmi אותחל ורשימת החבילות הדחופות לא השת
#: ../urpm/select.pm:23
#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr "urpmi אותחל ורשימת החבילות הדחופות השתנתה: %s לעומת %s"
#: ../urpm/select.pm:184
@@ -1628,7 +1595,8 @@ msgstr " --test - בדיקה האם הסרת החבילה יכולה ל
#: ../urpme:48 ../urpmi:104 ../urpmq:65
#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
msgstr " --force - אלץ הפעלה גם אם חלק מהחבילות חסרות.\n"
#: ../urpme:49 ../urpmi:109 ../urpmq:67
@@ -1703,7 +1671,8 @@ msgstr "בדיקה להסרת החבילות הבאות"
#: ../urpme:124
#, c-format
msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural "To satisfy dependencies, the following %d packages will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
msgstr[0] "בכדי לענות על התלויות החבילה הבאה תוסר"
msgstr[1] "כדי לענות על התלויות, %d החבילות הבאות ייוסרו"
@@ -1743,7 +1712,8 @@ msgstr ""
#: ../urpmi:78
#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
msgstr " --searchmedia - השתמש רק במקור הנתון לחיפוש החבילות המבוקשות.\n"
#: ../urpmi:81
@@ -1755,8 +1725,10 @@ msgstr ""
#: ../urpmi:82 ../urpmq:52
#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - automatically select packages to upgrade the system.\n"
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - automatically select packages to upgrade the system.\n"
#: ../urpmi:83
#, c-format
@@ -1783,7 +1755,8 @@ msgstr " --noscripts - אל תפעיל תסריטונים של החבילה.
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
"installation.\n"
-msgstr " --no-uninstall - לעולם אל תבקש להסיר התקנה של חבילה, בטל את ההתקנה.\n"
+msgstr ""
+" --no-uninstall - לעולם אל תבקש להסיר התקנה של חבילה, בטל את ההתקנה.\n"
#: ../urpmi:88
#, c-format
@@ -1823,7 +1796,8 @@ msgstr " --fuzzy, -y - מפעיל חיפוש מקורב.\n"
#: ../urpmi:98
#, fuzzy, c-format
msgid " --buildrequires - install the buildrequires of the packages\n"
-msgstr " --whaterquires - בצע חיפוש הפוך אחר חבילות הדורשות את החבילה המוגדרת.\n"
+msgstr ""
+" --whaterquires - בצע חיפוש הפוך אחר חבילות הדורשות את החבילה המוגדרת.\n"
#: ../urpmi:99
#, c-format
@@ -1847,7 +1821,8 @@ msgstr ""
#: ../urpmi:103
#, c-format
-msgid " --replacepkgs - force installing packages which are already installed.\n"
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
msgstr ""
#: ../urpmi:105
@@ -2074,7 +2049,8 @@ msgstr ""
#: ../urpmi:221
#, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
#: ../urpmi:241
@@ -2082,7 +2058,8 @@ msgstr ""
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
-msgstr "הספרייה [%s] כבר קיימת, עליך לבחור ספרייה אחרת לדיווח על תקלה או למחוק אותה"
+msgstr ""
+"הספרייה [%s] כבר קיימת, עליך לבחור ספרייה אחרת לדיווח על תקלה או למחוק אותה"
#: ../urpmi:242
#, c-format
@@ -2268,19 +2245,19 @@ msgstr "יעשה שימוש ב-%s שטח כונן נוסף."
msgid "%s of disk space will be freed."
msgstr "%s שטח בכונן יפונה."
-#: ../urpmi:603
+#: ../urpmi:604
+#, fuzzy, c-format
+msgid "%s of packages will be retrieved."
+msgstr "%s שטח בכונן יפונה."
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "להמשיך בהתקנת החבילה?"
msgstr[1] "להמשיך בהתקנת %d החבילות?"
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "נא להקיש Enter..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "ביטול"
@@ -2301,7 +2278,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2413,14 +2390,10 @@ msgstr " --nopubkey - אל תייבא את מפתח האימות של המ
#: ../urpmi.addmedia:79
#, c-format
msgid " --raw - add the media in config, but don't update it.\n"
-msgstr " --raw - הוסף את המקור לרשימה, אבל אל תעדכן את רשימת הקבצים.\n"
-
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - ניקוי ספריית מטמון כותרים.\n"
+msgstr ""
+" --raw - הוסף את המקור לרשימה, אבל אל תעדכן את רשימת הקבצים.\n"
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - מצב שקט.\n"
@@ -2518,7 +2491,8 @@ msgstr ""
#: ../urpmi.recover:37
#, c-format
-msgid " --list - list transactions since provided date/duration argument\n"
+msgid ""
+" --list - list transactions since provided date/duration argument\n"
msgstr ""
#: ../urpmi.recover:38
@@ -2803,7 +2777,8 @@ msgstr " --list-aliases - list available parallel aliases.\n"
#: ../urpmq:62
#, c-format
-msgid " --dump-config - dump the config in form of urpmi.addmedia argument.\n"
+msgid ""
+" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr " --dump-config - ייצא את ההגדרות במבנה של משתני urpmi.addmedia.\n"
#: ../urpmq:63
@@ -2813,7 +2788,8 @@ msgstr " --src - החבילה הבאה היא חבילת מקור (א
#: ../urpmq:64
#, 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 -נותן כל חבילות המקור לפני הורדה (רק מנהל מערכת).\n"
#: ../urpmq:66
@@ -2837,20 +2813,30 @@ msgstr " --changelog - הדפס דו\"ח שינויים.\n"
#: ../urpmq:81
#, fuzzy, c-format
-msgid " --provides - print provides.\n"
+msgid " --conflicts - print conflicts.\n"
msgstr " --quiet, -q - מצב שקט.\n"
#: ../urpmq:82
#, fuzzy, c-format
+msgid " --provides - print provides.\n"
+msgstr " --quiet, -q - מצב שקט.\n"
+
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --quiet, -q - מצב שקט.\n"
+
+#: ../urpmq:84
+#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --summary, -S - הצג מידע תמציתי.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - הצג מידע תמציתי.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -2860,7 +2846,8 @@ msgstr " -d - הרחב את השאילתה לתלויות החבי
#: ../urpmq:87
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
-msgstr " --whaterquires - בצע חיפוש הפוך אחר חבילות הדורשות את החבילה המוגדרת.\n"
+msgstr ""
+" --whaterquires - בצע חיפוש הפוך אחר חבילות הדורשות את החבילה המוגדרת.\n"
#: ../urpmq:88
#, c-format
@@ -2940,7 +2927,12 @@ msgstr " שמות או קובצי RPM שניתנו בשורת הפקודה נמ
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes ניתן לשימוש רק ביחד עם --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, c-format
+msgid "use -l to list files"
+msgstr ""
+
+#: ../urpmq:363
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr "לתשומת לבך: למקור \"%s\" אין hdlist, ל אניתן לספק תוצאות עבורו"
@@ -2952,12 +2944,14 @@ msgstr "לתשומת לבך: למקור \"%s\" אין hdlist, ל אניתן לס
#: ../urpmq:364
#, fuzzy, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr "לתשומת לבך: למקור \"%s\" אין hdlist, ל אניתן לספק תוצאות עבורו"
#: ../urpmq:365
#, fuzzy, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr "לתשומת לבך: למקור \"%s\" אין hdlist, ל אניתן לספק תוצאות עבורו"
#: ../urpmq:429
@@ -2965,3 +2959,40 @@ msgstr "לתשומת לבך: למקור \"%s\" אין hdlist, ל אניתן לס
msgid "No changelog found\n"
msgstr "לא נמצאה רשימת שינויים\n"
+#~ msgid "Unknown option %s"
+#~ msgstr "אפשרות לא מוכרת %s"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "יותר מדי נקודות חיבור עבור מאגר נייד \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "לוקח התקן נייד כ - \"%s\""
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "המקור \"%s\" הוא קובץ תמונת תקליטור, הוא ייעוגן לכשידרש"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "משתמש בהתקן נייד אחר [%s] עבור \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "אין אפשרות לאחזר את הנתיב עבור המקור הנשלף \"%s\""
+
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "אין אפשרות לעגן את מקור ההפצה"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "אין אפשרות לגשת למאגר \"%s\",\n"
+#~ "זה יכול לקרות אם היית מחובר ידנית לספרייה בזמן יצירת המאגר."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "מאגר לא רציף \"%s\" מסומן כניתן למחיקה אבל לא באמת"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "נא להקיש Enter..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - ניקוי ספריית מטמון כותרים.\n"
diff --git a/po/hi.po b/po/hi.po
index 61df88bd..21740138 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-hi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2005-08-23 20:11+0530\n"
"Last-Translator: धनञ्जय शर्मा (Dhananjaya Sharma)\n"
"Language-Team: Hindi, India\n"
@@ -104,14 +104,7 @@ msgstr "खत्म करें (_C)"
msgid "Choose location to save file"
msgstr "संचिका को सुरक्षित करने के स्थान का चयन करें"
-#: ../gurpmi.pm:80
-#, fuzzy, c-format
-msgid "Unknown option %s"
-msgstr ""
-"\n"
-"अज्ञात विकल्प '%s'\n"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, fuzzy, c-format
msgid "No packages specified"
msgstr "%s नाम का कोई पैकेज नहीं है"
@@ -223,12 +216,12 @@ msgstr "तैयारी की जा रही है..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "`%s' (%s/%s) पैकेज को संसाधित किया जा रहा है..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "कृपया \"%s\" नामक माध्यम को [%s] साधन पर प्रवेश करें"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "`%s' पैकेज को डॉउनलोड किया जा रहा है..."
@@ -420,6 +413,16 @@ msgstr ""
msgid "Copying failed"
msgstr "प्रतिलिपि बनना असफ़ल"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "माध्यम \"%s\" का चयन नहीं किया गया है"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "\"%s\" माध्यम से आर०पी०एम० संचिका [%s] को पढ़ने में असमर्थ"
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -728,7 +731,12 @@ msgstr "संसाधन का प्रयास बिना आधिन
msgid "Try harder to install (--force)? (y/N) "
msgstr "संसाधन का प्रयास और जोर से (बलपूर्वक) किया जाये (--force)? (हाँ/ना)(y/N) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -742,11 +750,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "%d संसाधन क्रिया-कलाप असफ़ल"
msgstr[1] "%d संसाधन क्रिया-कलाप असफ़ल"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "संसाधन संभव है"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -772,6 +775,11 @@ msgstr "सभी कुछ पहिले से ही संसाधित
msgid "Packages %s can not be installed"
msgstr "सभी कुछ पहिले से ही संसाधित है"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "संसाधन संभव है"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -805,28 +813,8 @@ msgstr "विद्यमान माध्यम \"%s\" से अलग ह
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "हटाने-योग्य माध्यम \"%s\" के लिए बहुत सारे आरोह बिंदु"
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "हटाने-योग्य साधनों को \"%s\" की भांति लिया जा रहा है"
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "\"%s\" माध्यम एक आईसो इमेज है, और देखते-देखते माउन्ट कर दिया जायेगा"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "विभिन्न हटाने-योग्य साधनों [%s] का उपयोग \"%s\" के लिए हो रहा है"
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "हटाने-योग्य माध्यम \"%s\" के लिए पथ-नाम को पुनः प्राप्त करने में असमर्थ"
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -887,12 +875,7 @@ msgstr "\"%s\" माध्यम से शीर्षक पढ़े जा र
msgid "adding medium \"%s\""
msgstr "\"%s\" माध्यम को हटाया जा रहा है"
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "प्रथम संसाधन माध्यम को पाने में असमर्थ"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -1009,17 +992,7 @@ msgstr "हार्डडिस्क-सूची संचिका [%s] क
msgid "comparing %s and %s"
msgstr "%s को %s से संसाधित किया जा रहा है"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"\"%s\" माध्यम की पहुँच में असमर्थ,\n"
-"यह सम्भव है जब आपने माध्यम का निर्माण करते समय, निर्देशिका कोस्वंम ही आरोहित किया हो।"
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "\"%s\" माध्यम के लिए कोई हार्डडिस्क सूची संचिका नहीं मिली"
@@ -1186,36 +1159,21 @@ msgstr "नोडों: %s के लिए समान्तर प्रब
msgid "unable to use parallel option \"%s\""
msgstr "समान्तर विकल्प \"%s\" का उपयोग करने में असमर्थ"
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "\"%s\" माध्यम को पाने में असमर्थ"
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "%s को आरोह (माउन्ट) किया जा रहा है"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "%s को अवरोह (अनमाउन्ट) किया जा रहा है"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "माध्यम \"%s\" का चयन नहीं किया गया है"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "\"%s\" माध्यम से आर०पी०एम० संचिका [%s] को पढ़ने में असमर्थ"
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "बेमेल माध्यम \"%s\" को हटानेयोग्य चिह्नित किया गया है परन्तु वास्तव में ऐसा नहीं है"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "\"%s\" माध्यम को पाने में असमर्थ"
-
#: ../urpm/search.pm:29 ../urpmf:29
#, fuzzy, c-format
msgid ""
@@ -2306,19 +2264,19 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "तैयार होने पर इन्टर (Enter) कुंजी को दबायें..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "निरस्त"
@@ -2339,7 +2297,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2460,12 +2418,7 @@ msgstr " --nopubkey - जोड़े गये माध्यम की स
msgid " --raw - add the media in config, but don't update it.\n"
msgstr " --raw - संरचना में माध्यम को जोड़ना, परन्तु इसे अपडेट ना करना । \n"
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - शीर्ष कैश निर्देशिका को स्वच्छ करें\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - शांत विधि\n"
@@ -2895,20 +2848,30 @@ msgstr " -changelog - परिवर्तन लॉग का मुद
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - टैग के विरोधाभासों को मुद्रित करें: सभी विरोधाभास\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - टैग की उपलब्धियां मुद्रित करें: सभी उपलब्धियां\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - टैग की आवश्यकताऐं मुद्रित करें: सभी आवश्यकताऐं (बहु-वाक्य)\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - टैग स्रोत्र आर०पी०एम० को मुद्रित करें: स्रोत्र आर०पी०एम०\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - सारांश को मुद्रित करना।\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -3000,7 +2963,12 @@ msgstr " निर्देश वाक्य पर दिये हुए
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes को सिर्फ़ --parallel के साथ उपयोग किया जा सकता है"
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "\"%s\" की सूची संचिका को लिखने में असमर्थ"
+
+#: ../urpmq:363
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3035,6 +3003,50 @@ msgstr ""
msgid "No changelog found\n"
msgstr "कोई परिवर्तनलॉग नहीं मिला\n"
+#, fuzzy
+#~ msgid "Unknown option %s"
+#~ msgstr ""
+#~ "\n"
+#~ "अज्ञात विकल्प '%s'\n"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "हटाने-योग्य माध्यम \"%s\" के लिए बहुत सारे आरोह बिंदु"
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "हटाने-योग्य साधनों को \"%s\" की भांति लिया जा रहा है"
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "\"%s\" माध्यम एक आईसो इमेज है, और देखते-देखते माउन्ट कर दिया जायेगा"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "विभिन्न हटाने-योग्य साधनों [%s] का उपयोग \"%s\" के लिए हो रहा है"
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "हटाने-योग्य माध्यम \"%s\" के लिए पथ-नाम को पुनः प्राप्त करने में असमर्थ"
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "प्रथम संसाधन माध्यम को पाने में असमर्थ"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "\"%s\" माध्यम की पहुँच में असमर्थ,\n"
+#~ "यह सम्भव है जब आपने माध्यम का निर्माण करते समय, निर्देशिका कोस्वंम ही आरोहित किया "
+#~ "हो।"
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr ""
+#~ "बेमेल माध्यम \"%s\" को हटानेयोग्य चिह्नित किया गया है परन्तु वास्तव में ऐसा नहीं है"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "तैयार होने पर इन्टर (Enter) कुंजी को दबायें..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - शीर्ष कैश निर्देशिका को स्वच्छ करें\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "काल्पनिक माध्यम को स्थानीय होने की आवश्यकता है"
@@ -3313,9 +3325,6 @@ msgstr "कोई परिवर्तनलॉग नहीं मिला\n"
#~ msgid "file [%s] already used in the same medium \"%s\""
#~ msgstr "[%s] संचिका \"%s\" समान माध्यम में पहिले से उपयोग में है"
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "\"%s\" की सूची संचिका को लिखने में असमर्थ"
-
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "\"%s\" के लिए संचिका-सूची में कुछ भी नहीं लिखा है"
diff --git a/po/hr.po b/po/hr.po
index 91607e5f..346eeff7 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi 0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2005-01-04 21:27+CET\n"
"Last-Translator: auto\n"
"Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -86,14 +86,7 @@ msgstr "_Odustani"
msgid "Choose location to save file"
msgstr "Izaberite datoteku"
-#: ../gurpmi.pm:80
-#, fuzzy, c-format
-msgid "Unknown option %s"
-msgstr ""
-"\n"
-"nepoznata opcija '%s'\n"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Naredba nije specificirana"
@@ -203,12 +196,12 @@ msgstr "Pripremam..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Instaliram paket `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Molim umetnite medij pod nazivom \"%s\" u uređaj [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, fuzzy, c-format
msgid "Downloading package `%s'..."
msgstr "Instaliram pakete..."
@@ -401,6 +394,16 @@ msgstr ""
msgid "Copying failed"
msgstr "...kopiranje neuspješno"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "medij \"%s\" nije izabran"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "ne mogu pročitati rpm datoteku [%s] sa medija \"%s\""
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -709,7 +712,12 @@ msgstr "Pokušati instalaciju bez provjere ovisnosti (d/N) "
msgid "Try harder to install (--force)? (y/N) "
msgstr "Pokušati instalaciju još snažnije (--force)? (d/N) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -724,11 +732,6 @@ msgstr[0] "instalacijske intrukcije"
msgstr[1] "instalacijske intrukcije"
msgstr[2] "instalacijske intrukcije"
-#: ../urpm/main_loop.pm:281
-#, fuzzy, c-format
-msgid "Installation is possible"
-msgstr "Problem u instalaciji"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -754,6 +757,11 @@ msgstr "sve je već instalirano"
msgid "Packages %s can not be installed"
msgstr "sve je već instalirano"
+#: ../urpm/main_loop.pm:307
+#, fuzzy, c-format
+msgid "Installation is possible"
+msgstr "Problem u instalaciji"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -786,29 +794,9 @@ msgstr "pokušavam zaobiči postojeći medij \"%s\", izbjegavam"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "previše točaka montiranja za prenosivi medij \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "uzimam prenosivi uređaj kao \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+msgid "failed to migrate removable device, ignoring media"
msgstr ""
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "koristim različite prenosive uređaje [%s] za \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ne mogu dohvatiti putanju za prenosivi medij \"%s\""
-
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
msgid "wrote config file [%s]"
@@ -866,12 +854,7 @@ msgstr "uklanjam medij \"%s\""
msgid "adding medium \"%s\""
msgstr "uklanjam medij \"%s\""
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "ne mogu pristupiti prvom instalacijskom mediju"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -986,17 +969,7 @@ msgstr "ispitujem hdlist datoteku [%s]"
msgid "comparing %s and %s"
msgstr "instaliram %s\n"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"nije moguće pristupiti mediju\"%s\",\n"
-"ovo se moglo desiti ako ste montirali ručno mapu kad ste kreirali medij."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "nije pronađena hdlist datoteka za medij \"%s\""
@@ -1163,36 +1136,21 @@ msgstr "pronašao sam ispitani hdlist (ili synthesis) kao %s"
msgid "unable to use parallel option \"%s\""
msgstr "ne mogu ažurirati medij \"%s\"\n"
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "ne mogu pristupiti mediju \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "montiram %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "odmontiravam %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "medij \"%s\" nije izabran"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "ne mogu pročitati rpm datoteku [%s] sa medija \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "nepotpun medij \"%s\" označen kao prenosiv ali nije zapravo"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "ne mogu pristupiti mediju \"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, fuzzy, c-format
msgid ""
@@ -2271,7 +2229,12 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2279,12 +2242,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../urpmi:621
-#, fuzzy, c-format
-msgid "Press Enter when ready..."
-msgstr "Pritisnite Enter kada ste gotovi..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Odustani"
@@ -2305,7 +2263,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2422,12 +2380,7 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - očisti keš direktorij zaglavlja.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - tihi mod.\n"
@@ -2849,21 +2802,33 @@ msgstr " --help - ispiši ovaj tekst s pomoći.\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr ""
+" --conflicts - ispisuje oznaku conflicts: sve konflikte (više linija)."
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr ""
" --provides - ispisuje oznaku provides: sve što pruža (više linija)."
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr ""
+" --requires - ispisuje oznaku requires: sve što zahtjeva (više linija)."
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --group -ispisuje oznaku group: grupu."
-#: ../urpmq:83
+#: ../urpmq:85
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - ispisuje oznaku summary: sažeto."
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -2957,7 +2922,12 @@ msgstr " imena ili rpm datoteke dane na komandnoj liniji se ispituju.\n"
msgid "--list-nodes can only be used with --parallel"
msgstr " --all - ispiši sve oznake."
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "ne mogu zapisati list datoteku za \"%s\""
+
+#: ../urpmq:363
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -2985,6 +2955,46 @@ msgid "No changelog found\n"
msgstr "Nije pronađena ni jedna slika"
#, fuzzy
+#~ msgid "Unknown option %s"
+#~ msgstr ""
+#~ "\n"
+#~ "nepoznata opcija '%s'\n"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "previše točaka montiranja za prenosivi medij \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "uzimam prenosivi uređaj kao \"%s\""
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "koristim različite prenosive uređaje [%s] za \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "ne mogu dohvatiti putanju za prenosivi medij \"%s\""
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "ne mogu pristupiti prvom instalacijskom mediju"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "nije moguće pristupiti mediju\"%s\",\n"
+#~ "ovo se moglo desiti ako ste montirali ručno mapu kad ste kreirali medij."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "nepotpun medij \"%s\" označen kao prenosiv ali nije zapravo"
+
+#, fuzzy
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Pritisnite Enter kada ste gotovi..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - očisti keš direktorij zaglavlja.\n"
+
+#, fuzzy
#~ msgid "virtual medium needs to be local"
#~ msgstr ""
#~ "medij \"%s\" pokušava koristiti već korišteni popis, medij ignoriran"
@@ -3225,9 +3235,6 @@ msgstr "Nije pronađena ni jedna slika"
#~ msgid "file [%s] already used in the same medium \"%s\""
#~ msgstr "datoteka [%s] se već koristi u istom mediju \"%s\""
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "ne mogu zapisati list datoteku za \"%s\""
-
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "nema ništa za zapisati u list datoteku za \"%s\""
diff --git a/po/hu.po b/po/hu.po
index 102e37c8..c8bfb77d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-2008.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2008-03-01 12:15+0100\n"
"Last-Translator: Lónyai Gergely <alephlg@gmail.com>\n"
"Language-Team: Hungarian <alephlg@gmail.com>\n"
@@ -24,8 +24,7 @@ msgstr ""
"X-Poedit-Country: HUNGARY\n"
"X-Poedit-SourceCharset: utf-8\n"
-#: ../gurpmi:30
-#: ../gurpmi2:65
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "RPM-telepítés"
@@ -35,9 +34,7 @@ msgstr "RPM-telepítés"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Hiba: %s nevű fájl nem található - a művelet megszakítva"
-#: ../gurpmi:45
-#: ../gurpmi2:152
-#: ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
#, c-format
msgid "_Ok"
msgstr "_OK"
@@ -49,7 +46,8 @@ msgid ""
"\n"
"%s\n"
"\n"
-"You probably didn't want to install it on your computer (installing it would allow you to make modifications to its sourcecode then compile it).\n"
+"You probably didn't want to install it on your computer (installing it would "
+"allow you to make modifications to its sourcecode then compile it).\n"
"\n"
"What would you like to do?"
msgstr ""
@@ -62,8 +60,7 @@ msgstr ""
"\n"
"Mit szeretne tenni?"
-#: ../gurpmi:73
-#: ../gurpmi:84
+#: ../gurpmi:73 ../gurpmi:84
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -103,8 +100,7 @@ msgstr "_Telepítés"
msgid "_Save"
msgstr "M_entés"
-#: ../gurpmi:99
-#: ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:152
#, c-format
msgid "_Cancel"
msgstr "_Mégsem"
@@ -114,12 +110,7 @@ msgstr "_Mégsem"
msgid "Choose location to save file"
msgstr "Válasszon helyet a fájlnak"
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "Ismeretlen opció: \"%s\""
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "Nincs megadva csomag"
@@ -150,8 +141,7 @@ msgstr ""
msgid "Warning"
msgstr "Figyelmeztetés"
-#: ../gurpmi2:114
-#: ../urpmi:626
+#: ../gurpmi2:114 ../urpmi:626
#, c-format
msgid "Ok"
msgstr "OK"
@@ -188,20 +178,21 @@ msgid ""
"%s\n"
"Continue installation anyway?"
msgstr ""
-"A következő csomagokat el kell távolítani, hogy más csomagok frissíthetők legyenek:\n"
+"A következő csomagokat el kell távolítani, hogy más csomagok frissíthetők "
+"legyenek:\n"
"%s\n"
"Kívánja folytatni a telepítést?"
-#: ../gurpmi2:215
-#: ../urpmi:592
+#: ../gurpmi2:215 ../urpmi:592
#, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
msgstr "A függőségek feloldásához a következő csomag telepítésre kerül:"
-#: ../gurpmi2:216
-#: ../urpmi:593
+#: ../gurpmi2:216 ../urpmi:593
#, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
msgstr "A függőségek feloldásához a következő csomagok telepítésre kerülnek:"
#: ../gurpmi2:218
@@ -216,14 +207,12 @@ msgstr[1] "(%d csomag, %d MB)"
msgid "Package installation..."
msgstr "Csomagtelepítés..."
-#: ../gurpmi2:226
-#: ../urpm/main_loop.pm:48
+#: ../gurpmi2:226 ../urpm/main_loop.pm:48
#, c-format
msgid "unable to get source packages, aborting"
msgstr "a forráscsomagok nem elérhetők, ezért a művelet félbeszakad"
-#: ../gurpmi2:240
-#: ../urpm/install.pm:81
+#: ../gurpmi2:240 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Előkészítés..."
@@ -233,13 +222,12 @@ msgstr "Előkészítés..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "A(z) '%s' (%s/%s) csomag telepítése..."
-#: ../gurpmi2:260
-#: ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Helyezze be a(z) \"%s\" nevű adathordozót a(z) \"%s\" meghajtóba"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "A(z) '%s' csomag letöltése folyik..."
@@ -249,8 +237,7 @@ msgstr "A(z) '%s' csomag letöltése folyik..."
msgid "_Done"
msgstr "_Kész"
-#: ../gurpmi2:296
-#: ../urpm/main_loop.pm:258
+#: ../gurpmi2:296 ../urpm/main_loop.pm:258
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -261,9 +248,7 @@ msgstr ""
"%s\n"
"Érdemes lehet frissíteni az urpmi adatbázist."
-#: ../gurpmi2:302
-#: ../urpm/main_loop.pm:196
-#: ../urpm/main_loop.pm:214
+#: ../gurpmi2:302 ../urpm/main_loop.pm:196 ../urpm/main_loop.pm:214
#: ../urpm/main_loop.pm:232
#, c-format
msgid "Installation failed:"
@@ -279,8 +264,7 @@ msgstr "A csomag(ok) már telepítve van(nak)"
msgid "Installation finished"
msgstr "A telepítés befejeződött"
-#: ../gurpmi2:310
-#: ../urpme:132
+#: ../gurpmi2:310 ../urpme:132
#, c-format
msgid "removing %s"
msgstr "\"%s\" eltávolítása"
@@ -321,8 +305,7 @@ msgstr " alapértelmezés: %s\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - az RPM-csomag teljes nevének kiírása (NVRA)\n"
-#: ../rurpmi:11
-#: ../urpmi:269
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Csomagok telepítéséhez rendszergazdai jogosultság szükséges"
@@ -357,18 +340,13 @@ msgstr "érvénytelen csomagfájlnév: \"%s\""
msgid "retrieving rpm file [%s] ..."
msgstr "RPM-fájl behozatala: \"%s\"..."
-#: ../urpm.pm:232
-#: ../urpm/get_pkgs.pm:160
+#: ../urpm.pm:232 ../urpm/get_pkgs.pm:160
#, c-format
msgid "...retrieving done"
msgstr "...behozatal megtörtént"
-#: ../urpm.pm:235
-#: ../urpm/download.pm:691
-#: ../urpm/get_pkgs.pm:162
-#: ../urpm/media.pm:771
-#: ../urpm/media.pm:1199
-#: ../urpm/media.pm:1375
+#: ../urpm.pm:235 ../urpm/download.pm:691 ../urpm/get_pkgs.pm:162
+#: ../urpm/media.pm:771 ../urpm/media.pm:1199 ../urpm/media.pm:1375
#, c-format
msgid "...retrieving failed: %s"
msgstr "...a behozatal sikertelen: %s"
@@ -403,8 +381,7 @@ msgstr "hiba a helyi csomagok regisztrálásakor"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Korlátozott mód esetén ez a művelet nem végezhető el"
-#: ../urpm/args.pm:130
-#: ../urpm/args.pm:139
+#: ../urpm/args.pm:130 ../urpm/args.pm:139
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "helytelen proxy-megadás a parancssorban\n"
@@ -417,7 +394,9 @@ msgstr "urpmq: egy RPM-fájl nem olvasható: \"%s\"\n"
#: ../urpm/args.pm:353
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
-msgstr "alapértelmezésben az urpmi egy regexpet vár, ezt megerősítheti a \"--literal\" opcióval"
+msgstr ""
+"alapértelmezésben az urpmi egy regexpet vár, ezt megerősítheti a \"--literal"
+"\" opcióval"
#: ../urpm/args.pm:419
#, c-format
@@ -429,8 +408,7 @@ msgstr "chroot-könyvtár nem létezik"
msgid "Can't use %s without %s"
msgstr "\"%s\" nem használható \"%s\" nélkül"
-#: ../urpm/args.pm:441
-#: ../urpm/args.pm:444
+#: ../urpm/args.pm:441 ../urpm/args.pm:444
#, c-format
msgid "Can't use %s with %s"
msgstr "\"%s\" nem használható ezzel: \"%s\""
@@ -440,12 +418,21 @@ msgstr "\"%s\" nem használható ezzel: \"%s\""
msgid "Too many arguments\n"
msgstr "Túl sok argumentum\n"
-#: ../urpm/bug_report.pm:48
-#: ../urpmi:247
+#: ../urpm/bug_report.pm:48 ../urpmi:247
#, c-format
msgid "Copying failed"
msgstr "A másolás sikertelen"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, c-format
+msgid "medium \"%s\" is not available"
+msgstr "a(z) \"%s\" adatforrás nem elérhető"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "a(z) \"%s\" csomagfájl (RPM) nem olvasható a(z) \"%s\" adatforrásból"
+
#: ../urpm/cfg.pm:81
#, c-format
msgid "syntax error in config file at line %s"
@@ -461,9 +448,7 @@ msgstr "nem sikerült olvasni a(z) \"%s\" beállítási fájlt"
msgid "medium `%s' is defined twice, aborting"
msgstr "\"%s\" adatforrás kétszer van megadva - megszakítás"
-#: ../urpm/cfg.pm:250
-#: ../urpm/media.pm:450
-#: ../urpm/media.pm:456
+#: ../urpm/cfg.pm:250 ../urpm/media.pm:450 ../urpm/media.pm:456
#, c-format
msgid "unable to write config file [%s]"
msgstr "a beállítások mentése nem sikerült: \"%s\""
@@ -615,8 +600,11 @@ msgstr "[újracsomagolás]"
#: ../urpm/install.pm:154
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "a telepítési műveletek elkezdődtek ide: %s (eltávolítás=%d, telepítés=%d, frissítés=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"a telepítési műveletek elkezdődtek ide: %s (eltávolítás=%d, telepítés=%d, "
+"frissítés=%d)"
#: ../urpm/install.pm:157
#, c-format
@@ -638,8 +626,7 @@ msgstr "a(z) \"%s\" csomag telepítése sikertelen"
msgid "removing bad rpm (%s) from %s"
msgstr "hibás RPM-csomagok (%s) eltávolítása innen: %s"
-#: ../urpm/install.pm:197
-#: ../urpm/install.pm:254
+#: ../urpm/install.pm:197 ../urpm/install.pm:254
#, c-format
msgid "removing %s failed: %s"
msgstr "%s eltávolítása sikertelen: %s"
@@ -684,8 +671,7 @@ msgstr "Nincs megadva kiszolgáló - hiányzó URI vagy gépnév"
msgid "No base defined"
msgstr "Nincs megadva alap"
-#: ../urpm/ldap.pm:172
-#: ../urpm/ldap.pm:175
+#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
#, c-format
msgid "Cannot connect to ldap uri:"
msgstr "Nem lehet kapcsolódni az LDAP-URI-hoz:"
@@ -720,9 +706,7 @@ msgstr "A következő csomagok helytelen aláírást tartalmaznak:"
msgid "Do you want to continue installation ?"
msgstr "Szeretné folytatni a telepítést?"
-#: ../urpm/main_loop.pm:125
-#: ../urpm/main_loop.pm:203
-#: ../urpm/main_loop.pm:221
+#: ../urpm/main_loop.pm:125 ../urpm/main_loop.pm:203 ../urpm/main_loop.pm:221
#, c-format
msgid "Installation failed"
msgstr "A telepítés nem sikerült"
@@ -757,7 +741,12 @@ msgstr "Próbáljam meg a telepítést a függőségek ellenőrzése nélkül? (
msgid "Try harder to install (--force)? (y/N) "
msgstr "Ha problémát okozhat, akkor is legyen telepítés (--force)? (i/N) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -773,11 +762,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "%d telepítési művelet nem sikerült"
msgstr[1] "%d telepítési művelet nem sikerült"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "A telepítés elvégezhető"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -803,6 +787,11 @@ msgstr "A(z) \"%s\" csomag nem telepíthető"
msgid "Packages %s can not be installed"
msgstr "A(z) \"%s\" csomagok nem telepíthetők"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "A telepítés elvégezhető"
+
#: ../urpm/md5sum.pm:20
#, c-format
msgid "examining %s file"
@@ -816,7 +805,9 @@ msgstr "figyelmeztetés: a(z) %s ellenőrzőösszege nincs benne az MD5SUM fájl
#: ../urpm/media.pm:187
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "a(z) \"%s\" virtuális adatforrás nem tiszta URL-lel rendelkezik, ezért az adatforrás nem kerül feldolgozásra"
+msgstr ""
+"a(z) \"%s\" virtuális adatforrás nem tiszta URL-lel rendelkezik, ezért az "
+"adatforrás nem kerül feldolgozásra"
#: ../urpm/media.pm:189
#, c-format
@@ -826,7 +817,8 @@ msgstr "\"%s\" listafájlja nem elérhető; az adatforrás nem kerül feldolgoz
#: ../urpm/media.pm:196
#, c-format
msgid "unable to access synthesis file of \"%s\", medium ignored"
-msgstr "\"%s\" fejléclistája nem elérhető; az adatforrás nem kerül feldolgozásra"
+msgstr ""
+"\"%s\" fejléclistája nem elérhető; az adatforrás nem kerül feldolgozásra"
#: ../urpm/media.pm:223
#, c-format
@@ -835,32 +827,10 @@ msgstr "a(z) \"%s\" néven létező adatforrás elkerülése - kihagyás"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "túl sok csatolási pont ehhez a cserélhető adatforráshoz: \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "a cserélhető eszköz a következőnek lesz véve: \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "A(z) \"%s\" adatforrás egy ISO-képmás - menet közben csatolásra kerül"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "eltérő cserélhető eszköz (\"%s\") használata ehhez: \"%s\""
-
-#: ../urpm/media.pm:421
-#: ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "a következő cserélhető adatforrás útvonala nem elérhető: \"%s\""
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
-#: ../urpm/media.pm:452
-#: ../urpm/media.pm:458
+#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
msgid "wrote config file [%s]"
msgstr "beállítások mentése: \"%s\""
@@ -877,8 +847,12 @@ msgstr "a hozzárendelt adatforrás használata párhuzamos módhoz: %s"
#: ../urpm/media.pm:525
#, c-format
-msgid "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --update, --use-distrib or --parallel"
-msgstr "a --synthesis nem használható ezekkel: --media, --excludemedia, --sortmedia, --update, --use-distrib, --parallel"
+msgid ""
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update, --use-distrib or --parallel"
+msgstr ""
+"a --synthesis nem használható ezekkel: --media, --excludemedia, --sortmedia, "
+"--update, --use-distrib, --parallel"
#: ../urpm/media.pm:612
#, c-format
@@ -915,12 +889,7 @@ msgstr "\"%s\" adatforrás hozzáadása a(z) \"%s\" távoli adatforrás előtt"
msgid "adding medium \"%s\""
msgstr "\"%s\" adatforrás hozzáadása"
-#: ../urpm/media.pm:750
-#, c-format
-msgid "unable to mount the distribution medium"
-msgstr "nem sikerült csatolni a disztribúciós adatforrást"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "úgy tűnik, ez a hely nem tartalmaz disztribúciót"
@@ -990,17 +959,15 @@ msgstr "kiterjesztett függőséglista vizsgálata: \"%s\""
#: ../urpm/media.pm:1075
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
-msgstr "probléma a(z) \"%s\" adatforrás kiterjesztett függőséglistájának olvasásakor"
+msgstr ""
+"probléma a(z) \"%s\" adatforrás kiterjesztett függőséglistájának olvasásakor"
-#: ../urpm/media.pm:1088
-#: ../urpm/media.pm:1171
+#: ../urpm/media.pm:1088 ../urpm/media.pm:1171
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "\"%s\" másolása a(z) \"%s\" adatforrás számára..."
-#: ../urpm/media.pm:1090
-#: ../urpm/media.pm:1145
-#: ../urpm/media.pm:1391
+#: ../urpm/media.pm:1090 ../urpm/media.pm:1145 ../urpm/media.pm:1391
#, c-format
msgid "...copying failed"
msgstr "...a másolás sikertelen"
@@ -1010,8 +977,7 @@ msgstr "...a másolás sikertelen"
msgid "copying description file of \"%s\"..."
msgstr "\"%s\" leírásfájljának másolása..."
-#: ../urpm/media.pm:1143
-#: ../urpm/media.pm:1175
+#: ../urpm/media.pm:1143 ../urpm/media.pm:1175
#, c-format
msgid "...copying done"
msgstr "...másolás megtörtént"
@@ -1024,10 +990,10 @@ msgstr "\"%s\" másolása sikertelen (a fájl túl kicsi)"
#: ../urpm/media.pm:1210
#, c-format
msgid "computing md5sum of retrieved source synthesis"
-msgstr "a letöltött kiterjesztett függőséglista MD5-ös összegének kiszámítása folyik"
+msgstr ""
+"a letöltött kiterjesztett függőséglista MD5-ös összegének kiszámítása folyik"
-#: ../urpm/media.pm:1212
-#: ../urpm/media.pm:1629
+#: ../urpm/media.pm:1212 ../urpm/media.pm:1629
#, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "\"%s\" megszerzése sikertelen (az MD5-ös összegek nem egyeznek)"
@@ -1042,16 +1008,7 @@ msgstr "genhdlist hiát jelzett a \"%s\"-ben"
msgid "comparing %s and %s"
msgstr "%s és %s összefésülése"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the medium."
-msgstr ""
-"A(z) \"%s\" adatforrás nem elérhető.\n"
-"Lehetséges, hogy az adatforrás létrehozásakor kézzel lett csatolva a megfelelő könyvtár."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "érvénytelen fejléclista-fájl (%s) a(z) \"%s\" adatforráshoz"
@@ -1064,15 +1021,17 @@ msgstr "\"%s\" leírásfájljának másolása..."
#: ../urpm/media.pm:1350
#, c-format
msgid "retrieving source synthesis of \"%s\"..."
-msgstr "\"%s\" forrás-fejléclistájának (illetve kiterjesztett függőséglistájának) behozatala..."
+msgstr ""
+"\"%s\" forrás-fejléclistájának (illetve kiterjesztett függőséglistájának) "
+"behozatala..."
#: ../urpm/media.pm:1367
#, c-format
msgid "found probed synthesis as %s"
-msgstr "a csomagkezelő fejléclistát (illetve kiterjesztett függőséglistát) talált: %s"
+msgstr ""
+"a csomagkezelő fejléclistát (illetve kiterjesztett függőséglistát) talált: %s"
-#: ../urpm/media.pm:1374
-#: ../urpm/media.pm:1482
+#: ../urpm/media.pm:1374 ../urpm/media.pm:1482
#, c-format
msgid "no synthesis file found for medium \"%s\""
msgstr "a(z) \"%s\" adatforráshoz nem található kiterjesztett függőséglista"
@@ -1115,31 +1074,22 @@ msgstr "Nem találok egy tükröt sem a %s tökürlistában."
#: ../urpm/mirrors.pm:133
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
-msgstr "%s %.2f %.2f földrajzi helyet állapítottam meg a(z) %s időzóna alapján."
+msgstr ""
+"%s %.2f %.2f földrajzi helyet állapítottam meg a(z) %s időzóna alapján."
#: ../urpm/mirrors.pm:178
#, c-format
msgid "getting mirror list from %s"
msgstr "tükörlista beolvasása innen: %s"
-#: ../urpm/msg.pm:62
-#: ../urpmi:506
-#: ../urpmi:522
-#: ../urpmi:611
+#: ../urpm/msg.pm:62 ../urpmi:506 ../urpmi:522 ../urpmi:611
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63
-#: ../urpme:37
-#: ../urpmi:507
-#: ../urpmi:523
-#: ../urpmi:562
-#: ../urpmi:612
-#: ../urpmi:642
-#: ../urpmi:648
-#: ../urpmi.addmedia:139
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:507 ../urpmi:523 ../urpmi:562
+#: ../urpmi:612 ../urpmi:642 ../urpmi:648 ../urpmi.addmedia:139
#, c-format
msgid "Yy"
msgstr "IiyY"
@@ -1204,8 +1154,7 @@ msgstr "MB"
msgid "GB"
msgstr "GB"
-#: ../urpm/msg.pm:189
-#: ../urpm/msg.pm:198
+#: ../urpm/msg.pm:189 ../urpm/msg.pm:198
#, c-format
msgid "TB"
msgstr "TB"
@@ -1230,45 +1179,28 @@ msgstr "párhuzamosság van definiálva a következő gépekre: %s"
msgid "unable to use parallel option \"%s\""
msgstr "\"%s\" párhuzamossági opció nem használható"
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "a(z) \"%s\" adatforrás nem elérhető"
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "%s csatolása"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "%s leválasztása"
-#: ../urpm/removable.pm:112
-#: ../urpm/removable.pm:117
-#: ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not available"
-msgstr "a(z) \"%s\" adatforrás nem elérhető"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "a(z) \"%s\" csomagfájl (RPM) nem olvasható a(z) \"%s\" adatforrásból"
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "a(z) \"%s\" hibás adatforrás cserélhetőnek van jelölve, pedig nem az"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "a(z) \"%s\" adatforrás nem elérhető"
-
-#: ../urpm/search.pm:29
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
"urpmf version %s\n"
"Copyright (C) 2002-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
"\n"
"usage: urpmf [options] pattern-expression\n"
msgstr ""
@@ -1278,385 +1210,310 @@ msgstr ""
"\n"
"Használat: urpmf [opciók] mintakifejezés\n"
-#: ../urpm/search.pm:35
-#: ../urpme:45
-#: ../urpmf:35
-#: ../urpmi:74
-#: ../urpmi.addmedia:54
-#: ../urpmi.recover:33
-#: ../urpmi.removemedia:40
-#: ../urpmi.update:32
-#: ../urpmq:45
+#: ../urpm/search.pm:35 ../urpme:45 ../urpmf:35 ../urpmi:74
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - jelen segítség megjelenítése\n"
-#: ../urpm/search.pm:36
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
msgstr " --version - jelen program verziószámának megjelenítése\n"
-#: ../urpm/search.pm:37
-#: ../urpmf:37
-#: ../urpmi:131
-#: ../urpmq:79
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:131 ../urpmq:79
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - megadott környezet használata (általában hibajelentés\n"
" esetében)\n"
-#: ../urpm/search.pm:38
-#: ../urpmf:38
-#: ../urpmi:76
-#: ../urpmq:49
+#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:76 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
" --excludemedia - a felsorolt (elválasztás: vessző) adatforrások\n"
" feldolgozásának mellőzése\n"
-#: ../urpm/search.pm:39
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
#, c-format
-msgid " --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-" --literal, -l - mintaillesztés mellőzése, az argumentum normál szövegként\n"
+" --literal, -l - mintaillesztés mellőzése, az argumentum normál "
+"szövegként\n"
" való kezelése\n"
-#: ../urpm/search.pm:40
-#: ../urpme:52
-#: ../urpmf:40
-#: ../urpmi:111
-#: ../urpmi.addmedia:69
-#: ../urpmi.recover:36
-#: ../urpmi.removemedia:46
-#: ../urpmi.update:46
-#: ../urpmq:69
+#: ../urpm/search.pm:40 ../urpme:52 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:69 ../urpmi.recover:36 ../urpmi.removemedia:46
+#: ../urpmi.update:46 ../urpmq:69
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
" --urpmi-root - másik gyökér használata az Urpmi-adatbázishoz és az\n"
" RPM-csomagtelepítéshez\n"
-#: ../urpm/search.pm:41
-#: ../urpmf:41
-#: ../urpmi:75
-#: ../urpmq:47
+#: ../urpm/search.pm:41 ../urpmf:41 ../urpmi:75 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - csak a felsorolt (elválasztás: vessző) adatforrások\n"
" használata\n"
-#: ../urpm/search.pm:42
-#: ../urpmf:42
-#: ../urpmi:79
-#: ../urpmq:50
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
-msgid " --sortmedia - sort media according to substrings separated by comma.\n"
+msgid ""
+" --sortmedia - sort media according to substrings separated by comma.\n"
msgstr ""
" --sortmedia - az adatforrások sorbarendezése vesszővel elválasztott\n"
" sztringek alapján\n"
-#: ../urpm/search.pm:43
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
#, c-format
msgid " --use-distrib - use the given path to access media\n"
-msgstr " --use-distrib - a megadott útvonal használata az adatforrások eléréséhez\n"
+msgstr ""
+" --use-distrib - a megadott útvonal használata az adatforrások eléréséhez\n"
-#: ../urpm/search.pm:44
-#: ../urpmf:44
-#: ../urpmi:80
-#: ../urpmq:51
+#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:80 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
" --synthesis - a megadott kiterjesztett függőséglista használata az\n"
" urpmi-adatbázis helyett\n"
-#: ../urpm/search.pm:45
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
#, c-format
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - az azonos sorok csak egyszer jelenjenek meg\n"
-#: ../urpm/search.pm:46
-#: ../urpmf:46
-#: ../urpmi:77
-#: ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:77 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - csak frissítési adatforrás legyen használva\n"
-#: ../urpm/search.pm:47
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
#, c-format
msgid " --verbose - verbose mode.\n"
msgstr " --verbose - részletes információ\n"
-#: ../urpm/search.pm:48
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
#, c-format
msgid " -i - ignore case distinctions in patterns.\n"
msgstr " -i - a minták feldolgozása nem nagybetűérzékeny\n"
-#: ../urpm/search.pm:49
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
#, c-format
msgid " -I - honor case distinctions in patterns (default).\n"
-msgstr " -I - a minták feldolgozása nagybetűérzékeny (alapértelmezés)\n"
+msgstr ""
+" -I - a minták feldolgozása nagybetűérzékeny (alapértelmezés)\n"
-#: ../urpm/search.pm:50
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
#, c-format
msgid " -F<str> - change field separator (defaults to ':').\n"
msgstr " -F<szöveg> - mezőelválasztó módosítása (alapértelmezés: \":\")\n"
-#: ../urpm/search.pm:51
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
#, c-format
msgid "Pattern expressions:\n"
msgstr "Mintakifejezések:\n"
-#: ../urpm/search.pm:52
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
#, c-format
msgid " text - any text is parsed as a regexp, unless -l is used.\n"
msgstr ""
-" szöveg - a szövegek reguláris kifejezésként vannak kezelve, ezt -l\n"
+" szöveg - a szövegek reguláris kifejezésként vannak kezelve, ezt -"
+"l\n"
" opcióval lehet felülbírálni\n"
-#: ../urpm/search.pm:53
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
#, c-format
msgid " -e - include perl code directly as perl -e.\n"
msgstr " -e - Perl kód közvetlen betevése (perl -e)\n"
-#: ../urpm/search.pm:54
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
#, c-format
msgid " -a - binary AND operator.\n"
msgstr " -a - bináris ÉS művelet.\n"
-#: ../urpm/search.pm:55
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
#, c-format
msgid " -o - binary OR operator.\n"
msgstr " -o - bináris VAGY művelet.\n"
-#: ../urpm/search.pm:56
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
#, c-format
msgid " ! - unary NOT.\n"
msgstr " ! - unáris NEM művelet.\n"
-#: ../urpm/search.pm:57
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
#, c-format
msgid " ( ) - left and right parentheses.\n"
msgstr " ( ) - bal illetve jobb oldali zárójel\n"
-#: ../urpm/search.pm:58
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
#, c-format
msgid "List of tags:\n"
msgstr "Címkék listája:\n"
-#: ../urpm/search.pm:59
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
#, c-format
msgid " --qf - specify a printf-like output format\n"
msgstr " --qf - printf-szerű kiírási formátum megadása\n"
-#: ../urpm/search.pm:60
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
#, c-format
msgid " example: '%%name:%%files'\n"
msgstr " példa: '%%name:%%files'\n"
-#: ../urpm/search.pm:61
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
#, c-format
msgid " --arch - architecture\n"
msgstr " --arch - architektúra\n"
-#: ../urpm/search.pm:62
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
#, c-format
msgid " --buildhost - build host\n"
msgstr " --buildhost - a csomagkészítéshez használt gép\n"
-#: ../urpm/search.pm:63
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
#, c-format
msgid " --buildtime - build time\n"
msgstr " --buildtime - a csomagkészítés időpontja\n"
-#: ../urpm/search.pm:64
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
#, c-format
msgid " --conffiles - configuration files\n"
msgstr " --conffiles - beállítási fájlok\n"
-#: ../urpm/search.pm:65
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
#, c-format
msgid " --conflicts - conflict tags\n"
msgstr " --conflicts - \"ütközés\" címkék\n"
-#: ../urpm/search.pm:66
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
#, c-format
msgid " --description - package description\n"
msgstr " --description - csomagleírás\n"
-#: ../urpm/search.pm:67
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
#, c-format
msgid " --distribution - distribution\n"
msgstr " --distribution - disztribúció\n"
-#: ../urpm/search.pm:68
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
#, c-format
msgid " --epoch - epoch\n"
msgstr " --epoch - generáció\n"
-#: ../urpm/search.pm:69
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
#, c-format
msgid " --filename - filename of the package\n"
msgstr " --filename - a csomag fájlneve\n"
-#: ../urpm/search.pm:70
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
#, c-format
msgid " --files - list of files contained in the package\n"
msgstr " --files - a csomagban levő fájlok listája\n"
-#: ../urpm/search.pm:71
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
#, c-format
msgid " --group - group\n"
msgstr " --group - csoport\n"
-#: ../urpm/search.pm:72
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
#, c-format
msgid " --license - license\n"
msgstr " --license - licenc\n"
-#: ../urpm/search.pm:73
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
#, c-format
msgid " --name - package name\n"
msgstr " --name - csomagnév\n"
-#: ../urpm/search.pm:74
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - \"elavulttá tesz\" címkék\n"
-#: ../urpm/search.pm:75
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
#, c-format
msgid " --packager - packager\n"
msgstr " --packager - csomagkészítő\n"
-#: ../urpm/search.pm:76
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - \"szolgáltatásjegyzék\" címkék\n"
-#: ../urpm/search.pm:77
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - \"követelmények\" címkék\n"
-#: ../urpm/search.pm:78
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
#, c-format
msgid " --size - installed size\n"
msgstr " --size - telepített méret\n"
-#: ../urpm/search.pm:79
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - a forráscsomag neve\n"
-#: ../urpm/search.pm:80
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
#, c-format
msgid " --suggests - suggests tags\n"
msgstr " --suggests - \"javasol\" címkék\n"
-#: ../urpm/search.pm:81
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr " --summary - összefoglaló\n"
-#: ../urpm/search.pm:82
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
#, c-format
msgid " --url - url\n"
msgstr " --url - URL\n"
-#: ../urpm/search.pm:83
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
#, c-format
msgid " --vendor - vendor\n"
msgstr " --vendor - terjesztő\n"
-#: ../urpm/search.pm:84
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
#, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -m - a csomagot tartalmazó adatforrás\n"
-#: ../urpm/search.pm:85
-#: ../urpmf:85
-#: ../urpmq:94
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:94
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - a névvel együtt a verzió, a kiadásszám és az\n"
" architektúra is jelenjen meg\n"
-#: ../urpm/search.pm:197
-#: ../urpmf:197
+#: ../urpm/search.pm:197 ../urpmf:197
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Helytelen formátum: csak egy darab többértékű címke használható"
-#: ../urpm/search.pm:247
-#: ../urpmf:247
-#: ../urpmi:254
-#: ../urpmq:136
+#: ../urpm/search.pm:247 ../urpmf:247 ../urpmi:254 ../urpmq:136
#, c-format
msgid "using specific environment on %s\n"
msgstr "a következő környezet használata: %s\n"
-#: ../urpm/search.pm:290
-#: ../urpmf:290
+#: ../urpm/search.pm:290 ../urpmf:290
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "a(z) \"%s\" adatforráshoz nem elérhető a fejléclista (hdlist)"
-#: ../urpm/search.pm:297
-#: ../urpmf:297
+#: ../urpm/search.pm:297 ../urpmf:297
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "a \"%s\" adatforrás kiterjesztett függőséglistája nem elérhető"
-#: ../urpm/search.pm:304
-#: ../urpmf:306
+#: ../urpm/search.pm:304 ../urpmf:306
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "a(z) \"%s\" adatforrás listafájlja nem elérhető"
@@ -1664,26 +1521,28 @@ msgstr "a(z) \"%s\" adatforrás listafájlja nem elérhető"
#: ../urpm/select.pm:21
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr "az Urpmi újra lett indítva; a prioritásos csomagok listája nem változott"
+msgstr ""
+"az Urpmi újra lett indítva; a prioritásos csomagok listája nem változott"
#: ../urpm/select.pm:23
#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr "az Urpmi újra lett indítva; a prioritásos csomagok listája változott: %s - %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"az Urpmi újra lett indítva; a prioritásos csomagok listája változott: %s - "
+"%s"
#: ../urpm/select.pm:184
#, c-format
msgid "No package named %s"
msgstr "Nincs ilyen nevű csomag: %s"
-#: ../urpm/select.pm:186
-#: ../urpme:107
+#: ../urpm/select.pm:186 ../urpme:107
#, c-format
msgid "The following packages contain %s: %s"
msgstr "A következő csomagok tartalmazzák a(z) %s komponenst: %s"
-#: ../urpm/select.pm:495
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:495 ../urpm/select.pm:538
#, c-format
msgid "due to missing %s"
msgstr "\"%s\" hiánya miatt"
@@ -1693,8 +1552,7 @@ msgstr "\"%s\" hiánya miatt"
msgid "due to already installed %s"
msgstr "mivel \"%s\" már telepítve van"
-#: ../urpm/select.pm:497
-#: ../urpm/select.pm:536
+#: ../urpm/select.pm:497 ../urpm/select.pm:536
#, c-format
msgid "due to unsatisfied %s"
msgstr "\"%s\" igényei miatt"
@@ -1754,7 +1612,8 @@ msgstr "%s nem mozgatható ide: %s"
msgid ""
"urpme version %s\n"
"Copyright (C) 1999-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
"\n"
"usage:\n"
msgstr ""
@@ -1767,29 +1626,28 @@ msgstr ""
#: ../urpme:46
#, c-format
msgid " --auto - automatically select a package in choices.\n"
-msgstr " --auto - választási lehetőségnél automatikusan választ csomagot\n"
+msgstr ""
+" --auto - választási lehetőségnél automatikusan választ csomagot\n"
#: ../urpme:47
#, c-format
msgid " --test - verify if the removal can be achieved correctly.\n"
-msgstr " --test - annak ellenőrzése, hogy az eltávolítás végrehajtható-e\n"
+msgstr ""
+" --test - annak ellenőrzése, hogy az eltávolítás végrehajtható-e\n"
-#: ../urpme:48
-#: ../urpmi:104
-#: ../urpmq:65
+#: ../urpme:48 ../urpmi:104 ../urpmq:65
#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - végrehajtás akkor is, ha néhány csomag nem elérhető\n"
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - végrehajtás akkor is, ha néhány csomag nem elérhető\n"
-#: ../urpme:49
-#: ../urpmi:109
-#: ../urpmq:67
+#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - elosztott urpmi több számítógép közt\n"
-#: ../urpme:50
-#: ../urpmi:140
+#: ../urpme:50 ../urpmi:140
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - a fájlok újracsomagolása törlés előtt\n"
@@ -1797,7 +1655,8 @@ msgstr " --repackage - a fájlok újracsomagolása törlés előtt\n"
#: ../urpme:51
#, c-format
msgid " --root - use another root for rpm removal.\n"
-msgstr " --root - másik gyökér használata az RPM-csomageltávolításhoz\n"
+msgstr ""
+" --root - másik gyökér használata az RPM-csomageltávolításhoz\n"
#: ../urpme:53
#, c-format
@@ -1814,9 +1673,7 @@ msgstr ""
" fából - például chroot telepítéséhez/eltávolításához\n"
" használható a --root opció esetén\n"
-#: ../urpme:56
-#: ../urpmi:151
-#: ../urpmq:84
+#: ../urpme:56 ../urpmi:151 ../urpmq:84
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - részletes információ\n"
@@ -1841,8 +1698,7 @@ msgstr "ismeretlen csomagok"
msgid "unknown package"
msgstr "ismeretlen csomag"
-#: ../urpme:113
-#: ../urpmi:536
+#: ../urpme:113 ../urpmi:536
#, c-format
msgid "removing package %s will break your system"
msgstr "a(z) \"%s\" csomag eltávolítása tönkreteheti a rendszert"
@@ -1860,7 +1716,8 @@ msgstr "Ellenőrzés a következő csomagok eltávolításához"
#: ../urpme:124
#, c-format
msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural "To satisfy dependencies, the following %d packages will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
msgstr[0] "A függőségek feloldásához a következő csomag el lesz távolítva"
msgstr[1] "A függőségek feloldásához a következő %d csomag el lesz távolítva"
@@ -1871,10 +1728,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "%d csomag eltávolítása?"
msgstr[1] "%d csomag eltávolítása?"
-#: ../urpme:128
-#: ../urpmi:563
-#: ../urpmi:643
-#: ../urpmi.addmedia:142
+#: ../urpme:128 ../urpmi:563 ../urpmi:643 ../urpmi.addmedia:142
#, c-format
msgid " (y/N) "
msgstr " (i/N) "
@@ -1889,7 +1743,8 @@ msgstr "Az eltávolítás sikertelen"
msgid ""
"urpmi version %s\n"
"Copyright (C) 1999-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
"\n"
"usage:\n"
msgstr ""
@@ -1901,28 +1756,33 @@ msgstr ""
#: ../urpmi:78
#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
" --searchmedia - csak a megadott adatforrások használata a kért csomagok\n"
" kereséséhez\n"
#: ../urpmi:81
#, c-format
-msgid " --auto - non-interactive mode, assume default answers to questions.\n"
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions.\n"
msgstr ""
" --auto - nem-interaktív mód, a kérdésekre az alapértelmezett\n"
" válaszok lesznek feltételezve\n"
-#: ../urpmi:82
-#: ../urpmq:52
+#: ../urpmi:82 ../urpmq:52
#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - automatikusan kiválasztja a frissíthető csomagokat\n"
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - automatikusan kiválasztja a frissíthető csomagokat\n"
#: ../urpmi:83
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
-msgstr " --auto-update - adatforrások frissítése, majd a rendszer frissítése\n"
+msgstr ""
+" --auto-update - adatforrások frissítése, majd a rendszer frissítése\n"
#: ../urpmi:84
#, c-format
@@ -1934,17 +1794,21 @@ msgstr " --no-md5sum - az MD5-ös összeg ellenőrzésének kikapcsolása\
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - a GPG-kulcs frissítésének kikényszerítése\n"
-#: ../urpmi:86
-#: ../urpmq:53
+#: ../urpmi:86 ../urpmq:53
#, c-format
msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
-msgstr " --suggests - ne legyenek automatikusan kijelölve a \"javasolt\" csomagok.\n"
+msgstr ""
+" --suggests - ne legyenek automatikusan kijelölve a \"javasolt\" "
+"csomagok.\n"
#: ../urpmi:87
#, c-format
-msgid " --no-uninstall - never ask to uninstall a package, abort the installation.\n"
+msgid ""
+" --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
msgstr ""
-" --no-uninstall - a program soha ne ajánlja fel csomag eltávolítását, inkább\n"
+" --no-uninstall - a program soha ne ajánlja fel csomag eltávolítását, "
+"inkább\n"
" szakadjon félbe a telepítés\n"
#: ../urpmi:88
@@ -1952,8 +1816,7 @@ msgstr ""
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - csomagok telepítésének mellőzése (csak letöltés)\n"
-#: ../urpmi:89
-#: ../urpmq:55
+#: ../urpmi:89 ../urpmq:55
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1969,14 +1832,17 @@ msgid ""
" are going to be installed or upgraded,\n"
" default is %d.\n"
msgstr ""
-" --split-level - a műveletek több részre bontása a megadottnál több csomag\n"
+" --split-level - a műveletek több részre bontása a megadottnál több "
+"csomag\n"
" telepítése vagy frissítése esetén,\n"
" az alapértelmezés szerinti érték: %d\n"
#: ../urpmi:95
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
-msgstr " --split-length - csökkentett művelethossz használata, az alapértelmezés: %d\n"
+msgstr ""
+" --split-length - csökkentett művelethossz használata, az alapértelmezés: %"
+"d\n"
#: ../urpmi:97
#, c-format
@@ -1991,12 +1857,14 @@ msgstr " --buildrequires - csomagkövetelmények telepítése\n"
#: ../urpmi:99
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
-msgstr " --install-src - csak a forráscsomag telepítése (a programok mellőzése)\n"
+msgstr ""
+" --install-src - csak a forráscsomag telepítése (a programok mellőzése)\n"
#: ../urpmi:100
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
-msgstr " --clean - RPM-fájl eltávolítása a gyorstárból a műveletek előtt\n"
+msgstr ""
+" --clean - RPM-fájl eltávolítása a gyorstárból a műveletek előtt\n"
#: ../urpmi:101
#, c-format
@@ -2006,12 +1874,16 @@ msgstr " --noclean - az RPM-fájlok ne törlődjenek a gyorstárból\n"
#: ../urpmi:102
#, c-format
msgid " --justdb - update only the rpm db, not the filesystem.\n"
-msgstr " --justdb - csak az RPM-adatbázis legyen frissítve, a fájlrendszer ne\n"
+msgstr ""
+" --justdb - csak az RPM-adatbázis legyen frissítve, a fájlrendszer "
+"ne\n"
#: ../urpmi:103
#, c-format
-msgid " --replacepkgs - force installing packages which are already installed.\n"
-msgstr " --replacepkgs - a már telepített csomagok telepítésének kikényszerítése\n"
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+" --replacepkgs - a már telepített csomagok telepítésének kikényszerítése\n"
#: ../urpmi:105
#, c-format
@@ -2020,7 +1892,8 @@ msgid ""
" dependencies checking.\n"
msgstr ""
" --allow-nodeps - lehetővé teszi a csomagok függőségellenőrzés nélküli\n"
-" telepítését (a felhasználótól érkező megerősítést követően)\n"
+" telepítését (a felhasználótól érkező megerősítést "
+"követően)\n"
#: ../urpmi:107
#, c-format
@@ -2028,12 +1901,13 @@ msgid ""
" --allow-force - allow asking user to install packages without\n"
" dependencies checking and integrity.\n"
msgstr ""
-" --allow-force - lehetővé teszi a csomagok függőség- és helyességellenőrzés\n"
-" nélküli telepítését (a felhasználótól érkező megerősítést\n"
+" --allow-force - lehetővé teszi a csomagok függőség- és "
+"helyességellenőrzés\n"
+" nélküli telepítését (a felhasználótól érkező "
+"megerősítést\n"
" követően)\n"
-#: ../urpmi:110
-#: ../urpmq:68
+#: ../urpmi:110 ../urpmq:68
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - másik gyökér használata az RPM-csomagtelepítéshez\n"
@@ -2045,7 +1919,8 @@ msgid ""
" to install a chroot with --root option.\n"
msgstr ""
" --use-distrib - az urpmi menet közben való beállítása egy disztribúciós\n"
-" fából - például chroot telepítéséhez használható a --root\n"
+" fából - például chroot telepítéséhez használható a --"
+"root\n"
" opció esetén\n"
#: ../urpmi:114
@@ -2082,9 +1957,7 @@ msgstr " --prozilla-options - további opciók a Prozilla program számára\n"
msgid " --aria2-options - additional options to pass to aria2\n"
msgstr " --aria2-options - további opciók az aria2 program számára\n"
-#: ../urpmi:122
-#: ../urpmi.addmedia:58
-#: ../urpmi.update:36
+#: ../urpmi:122 ../urpmi.addmedia:58 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - a letöltési sebesség korlátozása\n"
@@ -2096,24 +1969,20 @@ msgid ""
" (--no-resume disables it, default is disabled).\n"
msgstr ""
" --resume - részlegesen letöltött fájlok átvitelének folytatása\n"
-" (a --no-resume kikapcsolja; alapértelmezésben kikapcsolt)\n"
+" (a --no-resume kikapcsolja; alapértelmezésben "
+"kikapcsolt)\n"
-#: ../urpmi:125
-#: ../urpmi.addmedia:59
-#: ../urpmi.update:37
-#: ../urpmq:75
+#: ../urpmi:125 ../urpmi.addmedia:59 ../urpmi.update:37 ../urpmq:75
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
" to be 1080 by default (format is <proxyhost[:port]>).\n"
msgstr ""
-" --proxy - a megadott HTTP proxy használata; a portszám alapértelmezés\n"
+" --proxy - a megadott HTTP proxy használata; a portszám "
+"alapértelmezés\n"
" szerint 1080 (formátum: <proxygép[:port]>)\n"
-#: ../urpmi:127
-#: ../urpmi.addmedia:61
-#: ../urpmi.update:39
-#: ../urpmq:77
+#: ../urpmi:127 ../urpmi.addmedia:61 ../urpmi.update:39 ../urpmq:77
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -2142,13 +2011,16 @@ msgstr ""
#: ../urpmi:134
#, c-format
-msgid " --test - only verify if the installation can be achieved correctly.\n"
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
msgstr " --test - csak ellenőrzés, hogy a telepítés végrehajtható-e\n"
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
-msgstr " --excludepath - bizonyos útvonalak (elválasztás: vessző) kihagyása\n"
+msgstr ""
+" --excludepath - bizonyos útvonalak (elválasztás: vessző) kihagyása\n"
#: ../urpmi:136
#, c-format
@@ -2158,13 +2030,15 @@ msgstr " --excludedocs - dokumentációs fájlok kihagyása\n"
#: ../urpmi:137
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
-msgstr " --ignoresize - telepítés előtt ne legyen ellenőrizve az üres lemezhely\n"
+msgstr ""
+" --ignoresize - telepítés előtt ne legyen ellenőrizve az üres lemezhely\n"
#: ../urpmi:138
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr ""
-" --ignorearch - az RPM-csomagok telepítésének engedélyezése nem megfelelő\n"
+" --ignorearch - az RPM-csomagok telepítésének engedélyezése nem "
+"megfelelő\n"
" architektúra esetén is\n"
#: ../urpmi:139
@@ -2188,7 +2062,8 @@ msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-" --more-choices - ha nagyobb mennyiségű csomagot talált a rendszer, akkor az\n"
+" --more-choices - ha nagyobb mennyiségű csomagot talált a rendszer, akkor "
+"az\n"
" alapértelmezettnél több lehetőséget kínáljon fel\n"
#: ../urpmi:145
@@ -2201,8 +2076,7 @@ msgstr " --nolock - ne legyen zárolva az RPM-adatbázis\n"
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - csak az azonos architektúrájú csomagok frissítése\n"
-#: ../urpmi:147
-#: ../urpmq:92
+#: ../urpmi:147 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - kijelölés a parancssorban megadott minta szerint\n"
@@ -2215,7 +2089,8 @@ msgstr " -p - csomag keresése a szolgáltatásjegyzékben\n"
#: ../urpmi:149
#, c-format
msgid " -P - do not search in provides to find package.\n"
-msgstr " -P - a csomag ne legyen keresve a szolgáltatásjegyzékben\n"
+msgstr ""
+" -P - a csomag ne legyen keresve a szolgáltatásjegyzékben\n"
#: ../urpmi:150
#, c-format
@@ -2230,7 +2105,8 @@ msgstr " --debug - nagyon részletes információ.\n"
#: ../urpmi:153
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
-msgstr " a parancssorban megadott csomagok illetve RPM-fájlok lesznek telepítve\n"
+msgstr ""
+" a parancssorban megadott csomagok illetve RPM-fájlok lesznek telepítve\n"
#: ../urpmi:181
#, c-format
@@ -2243,7 +2119,8 @@ msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-"Hiba: hibajelentés készítéséhez adja meg a szokásos parancssori argumentumokat\n"
+"Hiba: hibajelentés készítéséhez adja meg a szokásos parancssori "
+"argumentumokat\n"
"a --bug opcióval együtt.\n"
#: ../urpmi:215
@@ -2253,18 +2130,27 @@ msgstr "Nem telepíthet bináris RPM-fájlokat, ha --install-src van megadva"
#: ../urpmi:221
#, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
-msgstr "Hérünk használja a --buildrequires vagy --install-src, alapértelmezés: --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgstr ""
+"Hérünk használja a --buildrequires vagy --install-src, alapértelmezés: --"
+"buildrequires"
#: ../urpmi:241
#, c-format
-msgid "Directory [%s] already exists, please use another directory for bug report or delete it"
-msgstr "\"%s\" nevű könyvtár már létezik. Használjon más könyvtárt a hibajelentéshez, vagy pedig törölje."
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"\"%s\" nevű könyvtár már létezik. Használjon más könyvtárt a "
+"hibajelentéshez, vagy pedig törölje."
#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
-msgstr "A következő könyvtárnak a hibajelentés céljából való létrehozása sikertelen: \"%s\""
+msgstr ""
+"A következő könyvtárnak a hibajelentés céljából való létrehozása sikertelen: "
+"\"%s\""
#: ../urpmi:253
#, c-format
@@ -2311,8 +2197,11 @@ msgstr "%s (telepítés)"
#: ../urpmi:455
#, c-format
-msgid "In order to satisfy the '%s' dependency, one of the following packages is needed:"
-msgstr "A(z) \"%s\" függőség feloldásához szükség van a következő csomagok egyikére:"
+msgid ""
+"In order to satisfy the '%s' dependency, one of the following packages is "
+"needed:"
+msgstr ""
+"A(z) \"%s\" függőség feloldásához szükség van a következő csomagok egyikére:"
#: ../urpmi:458
#, c-format
@@ -2341,8 +2230,7 @@ msgstr ""
"amelyek régebbiek a telepítetteknél:\n"
"%s"
-#: ../urpmi:508
-#: ../urpmi:524
+#: ../urpmi:508 ../urpmi:524
#, c-format
msgid ""
"\n"
@@ -2351,10 +2239,7 @@ msgstr ""
"\n"
"Kívánja folytatni a telepítést?"
-#: ../urpmi:509
-#: ../urpmi:525
-#: ../urpmi:613
-#: ../urpmi.addmedia:142
+#: ../urpmi:509 ../urpmi:525 ../urpmi:613 ../urpmi.addmedia:142
#, c-format
msgid " (Y/n) "
msgstr " (I/n) "
@@ -2405,7 +2290,8 @@ msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
msgstr ""
-"A következő csomagot el kell távolítani, hogy a szükséges csomagok frissíthetők legyenek:\n"
+"A következő csomagot el kell távolítani, hogy a szükséges csomagok "
+"frissíthetők legyenek:\n"
"%s"
#: ../urpmi:555
@@ -2414,7 +2300,8 @@ msgid ""
"The following packages have to be removed for others to be upgraded:\n"
"%s"
msgstr ""
-"A következő csomagokat el kell távolítani, hogy a szükséges csomagok frissíthetők legyenek:\n"
+"A következő csomagokat el kell távolítani, hogy a szükséges csomagok "
+"frissíthetők legyenek:\n"
"%s"
#: ../urpmi:557
@@ -2425,10 +2312,12 @@ msgstr "(csak teszt; az eltávolítás nem lesz ténylegesen végrehajtva)"
#: ../urpmi:578
#, c-format
msgid ""
-"You must first call urpmi with --buildrequires to install the following dependencies:\n"
+"You must first call urpmi with --buildrequires to install the following "
+"dependencies:\n"
"%s\n"
msgstr ""
-"Használja az urpmi-hoz a --buildrequires opciót az alábbi függőségek telepítéséhez:\n"
+"Használja az urpmi-hoz a --buildrequires opciót az alábbi függőségek "
+"telepítéséhez:\n"
"%s\n"
#: ../urpmi:595
@@ -2446,19 +2335,19 @@ msgstr "További %s lemezhely lesz használva."
msgid "%s of disk space will be freed."
msgstr "%s lemezhely fel lesz szabadítva."
-#: ../urpmi:603
+#: ../urpmi:604
+#, fuzzy, c-format
+msgid "%s of packages will be retrieved."
+msgstr "%s lemezhely fel lesz szabadítva."
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Kívánja folytatni a csomag telepítését?"
msgstr[1] "Kívánja folytatni a(z) %d csomag telepítését?"
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Amikor elkészült, nyomja le az Enter billentyűt..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Mégsem"
@@ -2471,7 +2360,7 @@ msgstr "az urpmi újraindítása"
#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
-#, c-format
+#, fuzzy, c-format
msgid ""
"usage: urpmi.addmedia [options] <name> <url>\n"
"where <url> is one of\n"
@@ -2479,7 +2368,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2501,7 +2390,8 @@ msgstr ""
" removable://<elérési út>\n"
"\n"
"használat: urpmi.addmedia [opciók] --distrib --mirrorlist <url>\n"
-"használat: urpmi.addmedia [opciók] --mirrorlist <url> <név> <relatív elérési út>\n"
+"használat: urpmi.addmedia [opciók] --mirrorlist <url> <név> <relatív elérési "
+"út>\n"
"\n"
"például:\n"
"\n"
@@ -2511,23 +2401,17 @@ msgstr ""
"\n"
"az [opciók] pedig a következők lehetnek:\n"
-#: ../urpmi.addmedia:55
-#: ../urpmi.update:33
-#: ../urpmq:72
+#: ../urpmi.addmedia:55 ../urpmi.update:33 ../urpmq:72
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - a Wget használata távoli fájlok letöltésére\n"
-#: ../urpmi.addmedia:56
-#: ../urpmi.update:34
-#: ../urpmq:73
+#: ../urpmi.addmedia:56 ../urpmi.update:34 ../urpmq:73
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - a Curl használata távoli fájlok letöltésére\n"
-#: ../urpmi.addmedia:57
-#: ../urpmi.update:35
-#: ../urpmq:74
+#: ../urpmi.addmedia:57 ../urpmi.update:35 ../urpmq:74
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --prozilla - a Prozilla használata távoli fájlok letöltésére\n"
@@ -2541,10 +2425,12 @@ msgstr " --update - frissítési adatforrás létrehozása\n"
#, c-format
msgid ""
" --xml-info - use the specific policy for downloading xml info files\n"
-" one of: never, on-demand, update-only, always. cf urpmi.cfg(5)\n"
+" one of: never, on-demand, update-only, always. cf urpmi."
+"cfg(5)\n"
msgstr ""
" --xml-info - egyedi irányelv a listafájlok letöltéséhez:\n"
-" never, on-demand, update-only, always. Lásd: urpmi.cfg(5)\n"
+" never, on-demand, update-only, always. Lásd: urpmi.cfg"
+"(5)\n"
#: ../urpmi.addmedia:66
#, c-format
@@ -2566,17 +2452,22 @@ msgstr " --no-probe - fejléclista keresésének mellőzése\n"
msgid ""
" --distrib - automatically create all media from an installation\n"
" medium.\n"
-msgstr " --distrib - az összes adatforrás létrehozása telepítési adatforrásból\n"
+msgstr ""
+" --distrib - az összes adatforrás létrehozása telepítési "
+"adatforrásból\n"
#: ../urpmi.addmedia:72
#, c-format
msgid " --interactive - with --distrib, ask confirmation for each media\n"
-msgstr " --interactive - --distrib esetén: megerősítés kérése minden adatforráshoz\n"
+msgstr ""
+" --interactive - --distrib esetén: megerősítés kérése minden "
+"adatforráshoz\n"
#: ../urpmi.addmedia:73
#, c-format
msgid " --all-media - with --distrib, add every listed media\n"
-msgstr " --all-media - --distrib esetén: minden listázott adatforrás felvétele\n"
+msgstr ""
+" --all-media - --distrib esetén: minden listázott adatforrás felvétele\n"
#: ../urpmi.addmedia:74
#, c-format
@@ -2591,10 +2482,10 @@ msgstr ""
#: ../urpmi.addmedia:76
#, c-format
msgid " --virtual - create virtual media wich are always up-to-date.\n"
-msgstr " --virtual - virtuális, mindig naprakész adatforrás létrehozása.\n"
+msgstr ""
+" --virtual - virtuális, mindig naprakész adatforrás létrehozása.\n"
-#: ../urpmi.addmedia:77
-#: ../urpmi.update:42
+#: ../urpmi.addmedia:77 ../urpmi.update:42
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - az MD5-ös összeg ellenőrzésének kikapcsolása\n"
@@ -2602,30 +2493,22 @@ msgstr " --no-md5sum - az MD5-ös összeg ellenőrzésének kikapcsolása\n"
#: ../urpmi.addmedia:78
#, c-format
msgid " --nopubkey - don't import pubkey of added media\n"
-msgstr " --nopubkey - a felvett adatforrás publikus kulcsa ne legyen importálva\n"
+msgstr ""
+" --nopubkey - a felvett adatforrás publikus kulcsa ne legyen "
+"importálva\n"
#: ../urpmi.addmedia:79
#, c-format
msgid " --raw - add the media in config, but don't update it.\n"
-msgstr " --raw - az adatforrás felvétele, de a frissítésének mellőzése\n"
-
-#: ../urpmi.addmedia:80
-#: ../urpmi.removemedia:42
-#: ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - a fejlécgyorstár könyvtárának kiürítése\n"
+msgstr ""
+" --raw - az adatforrás felvétele, de a frissítésének mellőzése\n"
-#: ../urpmi.addmedia:81
-#: ../urpmi.removemedia:44
-#: ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - néma üzemmód\n"
-#: ../urpmi.addmedia:82
-#: ../urpmi.removemedia:45
-#: ../urpmi.update:53
+#: ../urpmi.addmedia:82 ../urpmi.removemedia:45 ../urpmi.update:53
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - részletes információ\n"
@@ -2643,7 +2526,8 @@ msgstr "Hiányzik az argumentum: --distrib --mirrorlist <url>"
#: ../urpmi.addmedia:118
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
-msgstr "helytelen <url> (helyi könyvtár esetén az útvonalnak abszolútnak kell lennie)"
+msgstr ""
+"helytelen <url> (helyi könyvtár esetén az útvonalnak abszolútnak kell lennie)"
#: ../urpmi.addmedia:122
#, c-format
@@ -2694,7 +2578,8 @@ msgstr "az adatforrás nem hozzáadható"
msgid ""
"urpmi.recover version %s\n"
"Copyright (C) 2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
"\n"
"usage:\n"
msgstr ""
@@ -2718,7 +2603,8 @@ msgstr ""
#: ../urpmi.recover:37
#, c-format
-msgid " --list - list transactions since provided date/duration argument\n"
+msgid ""
+" --list - list transactions since provided date/duration argument\n"
msgstr ""
" --list - tranzakciók listázása a megadott dátum/időtartam\n"
" argumentumtól kezdődően\n"
@@ -2726,7 +2612,8 @@ msgstr ""
#: ../urpmi.recover:38
#, c-format
msgid " --list-all - list all transactions in rpmdb (long)\n"
-msgstr " --list-all - az RPM-adatbázisban levő tranzakciók listázása (hosszú)\n"
+msgstr ""
+" --list-all - az RPM-adatbázisban levő tranzakciók listázása (hosszú)\n"
#: ../urpmi.recover:39
#, c-format
@@ -2811,8 +2698,7 @@ msgstr "Nem található ez utáni tranzakció: %s\n"
msgid "You must be superuser to do this"
msgstr "Ehhez rendszergazdai jogosultság szükséges"
-#: ../urpmi.recover:143
-#: ../urpmi.recover:209
+#: ../urpmi.recover:143 ../urpmi.recover:209
#, c-format
msgid "Writing rpm macros file [%s]...\n"
msgstr "RPM-makrófájl írása [%s]...\n"
@@ -2859,7 +2745,9 @@ msgstr "Adatforrás eltávolításához rendszergazdai jogosultság szükséges"
#: ../urpmi.removemedia:73
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "nincs mit eltávolítani (használja az urpmi.addmedia parancsot adatforrás felvételéhez)\n"
+msgstr ""
+"nincs mit eltávolítani (használja az urpmi.addmedia parancsot adatforrás "
+"felvételéhez)\n"
#: ../urpmi.removemedia:79
#, c-format
@@ -2892,12 +2780,16 @@ msgstr " --force-key - a GPG-kulcs frissítésének kikényszerítése\n"
#: ../urpmi.update:44
#, c-format
msgid " --ignore - don't update, mark the media as ignored.\n"
-msgstr " --ignore - ne legyen frissítés; az adatforrások kihagyottnak jelölése\n"
+msgstr ""
+" --ignore - ne legyen frissítés; az adatforrások kihagyottnak "
+"jelölése\n"
#: ../urpmi.update:45
#, c-format
msgid " --no-ignore - don't update, mark the media as enabled.\n"
-msgstr " --no-ignore - ne legyen frissítés; az adatforrások bekapcsoltnak jelölése\n"
+msgstr ""
+" --no-ignore - ne legyen frissítés; az adatforrások bekapcsoltnak "
+"jelölése\n"
#: ../urpmi.update:47
#, c-format
@@ -2919,7 +2811,8 @@ msgstr " -f - fejléclista frissítésének kikényszerítése\n"
#: ../urpmi.update:51
#, c-format
msgid " -ff - really force updating synthesis\n"
-msgstr " -ff - fejléclista frissítésének kikényszerítése (mindenképpen)\n"
+msgstr ""
+" -ff - fejléclista frissítésének kikényszerítése (mindenképpen)\n"
#: ../urpmi.update:68
#, c-format
@@ -2929,7 +2822,9 @@ msgstr "Adatforrás frissítéséhez rendszergazdai jogosultság szükséges"
#: ../urpmi.update:76
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "nincs mit frissíteni (használja az urpmi.addmedia parancsot adatforrás felvételéhez)\n"
+msgstr ""
+"nincs mit frissíteni (használja az urpmi.addmedia parancsot adatforrás "
+"felvételéhez)\n"
#: ../urpmi.update:94
#, c-format
@@ -2960,7 +2855,8 @@ msgstr "\"%s\" adatforrás bekapcsolása"
msgid ""
"urpmq version %s\n"
"Copyright (C) 2000-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
"\n"
"usage:\n"
msgstr ""
@@ -2972,7 +2868,9 @@ msgstr ""
#: ../urpmq:48
#, c-format
-msgid " --searchmedia - use only the given media to search requested (or updated) packages.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested (or updated) "
+"packages.\n"
msgstr ""
" --searchmedia - csak a megadott adatforrások használata a kért (vagy\n"
" frissített) csomagok kereséséhez\n"
@@ -3000,7 +2898,8 @@ msgstr " --list-url - elérhető adatforrások és URL-jeik listázása\n"
#: ../urpmq:60
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
-msgstr " --list-nodes - az elérhető gépek listázása --parallel használata esetén\n"
+msgstr ""
+" --list-nodes - az elérhető gépek listázása --parallel használata esetén\n"
#: ../urpmq:61
#, c-format
@@ -3009,17 +2908,22 @@ msgstr " --list-aliases - az elérhető párhuzamos aliasok listázása\n"
#: ../urpmq:62
#, c-format
-msgid " --dump-config - dump the config in form of urpmi.addmedia argument.\n"
-msgstr " --dump-config - beállítások kiírása urpmi.addmedia-argumentumok formájában\n"
+msgid ""
+" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+" --dump-config - beállítások kiírása urpmi.addmedia-argumentumok "
+"formájában\n"
#: ../urpmq:63
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
-msgstr " --src - a következő csomag egy forráscsomag (-s opcióval azonos)\n"
+msgstr ""
+" --src - a következő csomag egy forráscsomag (-s opcióval azonos)\n"
#: ../urpmq:64
#, 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 - a csomagok elérési útjának listázása letöltés előtt\n"
" (rendszergazdai jogosultság szükséges)\n"
@@ -3028,7 +2932,8 @@ msgstr ""
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr ""
-" --ignorearch - a nem megfelelő architektúrájú RPM-csomagok lekérdezésének\n"
+" --ignorearch - a nem megfelelő architektúrájú RPM-csomagok "
+"lekérdezésének\n"
" engedélyezése\n"
#: ../urpmq:70
@@ -3046,21 +2951,31 @@ msgid " --changelog - print changelog.\n"
msgstr " --changelog - változások listájának megjelenítése\n"
#: ../urpmq:81
+#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - \"ütközés\" címkék\n"
+
+#: ../urpmq:82
#, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - \"szolgáltatásjegyzék\" címkék\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - \"követelmények\" címkék\n"
+
+#: ../urpmq:84
#, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - a forráscsomag neve\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - összefoglaló megjelenítése\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -3081,7 +2996,8 @@ msgid ""
" - extended reverse search (includes virtual packages).\n"
msgstr ""
" --whatrequires-recursive\n"
-" - kiterjesztett fordított keresés (virtuális csomagokban is)\n"
+" - kiterjesztett fordított keresés (virtuális csomagokban "
+"is)\n"
#: ../urpmq:90
#, c-format
@@ -3095,7 +3011,8 @@ msgstr ""
#: ../urpmq:93
#, c-format
msgid " -c - complete output with package to be removed.\n"
-msgstr " -c - teljes információ, az eltávolítandó csomaggal együtt\n"
+msgstr ""
+" -c - teljes információ, az eltávolítandó csomaggal együtt\n"
#: ../urpmq:95
#, c-format
@@ -3105,7 +3022,8 @@ msgstr " -g - a névvel együtt a csoportok is jelenjenek meg\n"
#: ../urpmq:96
#, c-format
msgid " -i - print useful information in human readable form.\n"
-msgstr " -i - hasznos információk kiírása könnyen olvasható formában\n"
+msgstr ""
+" -i - hasznos információk kiírása könnyen olvasható formában\n"
#: ../urpmq:97
#, c-format
@@ -3120,69 +3038,136 @@ msgstr " -m - egyenértékű a -du opcióval\n"
#: ../urpmq:99
#, c-format
msgid " -r - print version and release with name also.\n"
-msgstr " -r - a névvel együtt a verzió és a kiadásszám is jelenjen meg\n"
+msgstr ""
+" -r - a névvel együtt a verzió és a kiadásszám is jelenjen meg\n"
#: ../urpmq:100
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
-msgstr " -s - a következő csomag egy forráscsomag (--src opcióval azonos)\n"
+msgstr ""
+" -s - a következő csomag egy forráscsomag (--src opcióval "
+"azonos)\n"
#: ../urpmq:101
#, c-format
-msgid " -u - remove package if a more recent version is already installed.\n"
-msgstr " -u - csomag kihagyása, ha már van újabb verzió telepítve\n"
+msgid ""
+" -u - remove package if a more recent version is already "
+"installed.\n"
+msgstr ""
+" -u - csomag kihagyása, ha már van újabb verzió telepítve\n"
#: ../urpmq:102
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
-msgstr " -y - fuzzy keresés használata (--fuzzy opcióval azonos)\n"
+msgstr ""
+" -y - fuzzy keresés használata (--fuzzy opcióval azonos)\n"
#: ../urpmq:103
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
-msgstr " -Y - mint -y, de a kis- és nagybetűket nem különbözteti meg\n"
+msgstr ""
+" -Y - mint -y, de a kis- és nagybetűket nem különbözteti meg\n"
#: ../urpmq:104
#, c-format
msgid " names or rpm files given on command line are queried.\n"
-msgstr " a parancssorban megadott csomagok illetve RPM-fájlok lesznek lekérdezve\n"
+msgstr ""
+" a parancssorban megadott csomagok illetve RPM-fájlok lesznek lekérdezve\n"
#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "a --list-nodes csak a --parallel opcióval használható"
-#: ../urpmq:360
+#: ../urpmq:206
+#, c-format
+msgid "use -l to list files"
+msgstr ""
+
+#: ../urpmq:363
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
-msgstr "nincs listafájlja a(z) \"%s\" adatforrásnak, ezért csak részleges eredmény van a(z) \"%s\" csomaghoz"
+msgstr ""
+"nincs listafájlja a(z) \"%s\" adatforrásnak, ezért csak részleges eredmény "
+"van a(z) \"%s\" csomaghoz"
#: ../urpmq:361
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
-msgstr "nincs listafájlja a(z) \"%s\" adatforrásnak, ezért csak részleges eredmény van a(z) \"%s\" csomagokhoz"
+msgstr ""
+"nincs listafájlja a(z) \"%s\" adatforrásnak, ezért csak részleges eredmény "
+"van a(z) \"%s\" csomagokhoz"
#: ../urpmq:364
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
-msgstr "nincs listafájlja a(z) \"%s\" adatforrásnak, ezért nincs eredmény a(z) \"%s\" csomaghoz"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
+msgstr ""
+"nincs listafájlja a(z) \"%s\" adatforrásnak, ezért nincs eredmény a(z) \"%s"
+"\" csomaghoz"
#: ../urpmq:365
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
-msgstr "nincs listafájlja a(z) \"%s\" adatforrásnak, ezért nincs eredmény a(z) \"%s\" csomagokhoz"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"nincs listafájlja a(z) \"%s\" adatforrásnak, ezért nincs eredmény a(z) \"%s"
+"\" csomagokhoz"
#: ../urpmq:429
#, c-format
msgid "No changelog found\n"
msgstr "Változási lista nem található\n"
+#~ msgid "Unknown option %s"
+#~ msgstr "Ismeretlen opció: \"%s\""
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "túl sok csatolási pont ehhez a cserélhető adatforráshoz: \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "a cserélhető eszköz a következőnek lesz véve: \"%s\""
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr ""
+#~ "A(z) \"%s\" adatforrás egy ISO-képmás - menet közben csatolásra kerül"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "eltérő cserélhető eszköz (\"%s\") használata ehhez: \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "a következő cserélhető adatforrás útvonala nem elérhető: \"%s\""
+
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "nem sikerült csatolni a disztribúciós adatforrást"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "A(z) \"%s\" adatforrás nem elérhető.\n"
+#~ "Lehetséges, hogy az adatforrás létrehozásakor kézzel lett csatolva a "
+#~ "megfelelő könyvtár."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr ""
+#~ "a(z) \"%s\" hibás adatforrás cserélhetőnek van jelölve, pedig nem az"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Amikor elkészült, nyomja le az Enter billentyűt..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - a fejlécgyorstár könyvtárának kiürítése\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "minden virtuális adatforrásnak helyinek kell lennie"
+
#~ msgid "Error generating names file: dependency %d not found"
#~ msgstr ""
#~ "Nem sikerült elkészíteni a névfájlt - nem található a következő függőség: "
#~ "%d"
+
#~ msgid "Error generating names file: Can't write to file (%s)"
#~ msgstr ""
#~ "Nem sikerült elkészíteni a névfájlt - nem sikerült írni a fájlba (%s)"
@@ -3190,95 +3175,124 @@ msgstr "Változási lista nem található\n"
#, fuzzy
#~ msgid "unable to parse synthesis file of \"%s\""
#~ msgstr "fejléclista nem elemezhető: \"%s\""
+
#~ msgid "found %d rpm headers in cache, removing %d obsolete headers"
#~ msgstr ""
#~ "a gyorstárban %d RPM-fejléc található, %d elavult fejléc eltávolítása"
+
#~ msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
#~ msgstr ""
#~ "a meglevő forrás-fejléclista (vagy kiterjesztett függőséglista) MD5-ös "
#~ "összegének kiszámítása - %s"
+
#~ msgid ""
#~ "virtual medium \"%s\" should not have defined hdlist or list file, medium "
#~ "ignored"
#~ msgstr ""
#~ "a virtuális \"%s\" adatforráshoz nem tartozhat definiált fejléclista vagy "
#~ "listafájl, ezért az adatforrás nem lesz feldolgozva"
+
#~ msgid "invalid hdlist name"
#~ msgstr "érvénytelen fejléclista-név"
+
#~ msgid "unable to find list file for \"%s\", medium ignored"
#~ msgstr ""
#~ "\"%s\" listafájlja nem található; az adatforrás nem kerül feldolgozásra"
+
#~ msgid "\"synthesis\" should not be set (medium \"%s\")"
#~ msgstr ""
#~ "a \"kiterjesztett függőséglista\" opció itt nem állítható be (adatforrás: "
#~ "\"%s\")"
+
#~ msgid "\"synthesis\" should be set (medium \"%s\")"
#~ msgstr ""
#~ "a \"kiterjesztett függőséglista\" opció itt beállítandó (adatforrás: \"%s"
#~ "\")"
+
#~ msgid "unable to access list file of \"%s\""
#~ msgstr "\"%s\" listafájlja nem elérhető"
+
#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
#~ msgstr ""
#~ "a(z) \"%s\" adatforrás egy használatban levő fejléclistát próbált "
#~ "használni; az adatforrás nem kerül feldolgozásra"
+
#~ msgid "medium \"%s\" trying to use an already used list, medium ignored"
#~ msgstr ""
#~ "a(z) \"%s\" adatforrás egy használatban levő listát próbált használni; az "
#~ "adatforrás nem kerül feldolgozásra"
+
#~ msgid "wrote %s"
#~ msgstr "\"%s\" elkészítve"
+
#~ msgid ""
#~ "Note: no hdlist for medium \"%s\", unable to return any result for it"
#~ msgstr ""
#~ "Megjegyzés: nincs fejléclista a(z) \"%s\" adatforráshoz, ezért azt nem "
#~ "lehet feldolgozni"
+
#~ msgid "performing second pass to compute dependencies\n"
#~ msgstr "függőségek meghatározása - második lépés\n"
+
#~ msgid "building hdlist [%s]"
#~ msgstr "fejléclista készítése: \"%s\""
+
#~ msgid ""
#~ "Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
#~ "corrupted."
#~ msgstr ""
#~ "A(z) \"%s\" adatforráshoz nem készíthető kiterjesztett függőséglista. "
#~ "Lehetséges, hogy a fejléclista sérült."
+
#~ msgid "problem reading hdlist or synthesis file of medium \"%s\""
#~ msgstr ""
#~ "hiba történt a(z) \"%s\" adatforrás fejléclistájának vagy kiterjesztett "
#~ "függőséglistájának olvasásakor"
+
#~ msgid "computing md5sum of copied source hdlist (or synthesis)"
#~ msgstr ""
#~ "a lemásolt forrás-fejléclista (vagy kiterjesztett függőséglista) MD5-ös "
#~ "ellenőrzőösszegének kiszámítása"
+
#~ msgid "...retrieving failed: md5sum mismatch"
#~ msgstr "...a behozatal sikertelen: hibás MD5-ös ellenőrzőösszeg"
+
#~ msgid "no rpm files found from [%s]"
#~ msgstr "csomagfájlok (RPM) nem találhatók: \"%s\""
+
#~ msgid "unable to read rpm files from [%s]: %s"
#~ msgstr "csomagfájlok (RPM) nem olvashatók innen: \"%s\" - %s"
+
#~ msgid "no rpms read"
#~ msgstr "csomagfájlok (RPM) nem lettek beolvasva"
+
#~ msgid "reading headers from medium \"%s\""
#~ msgstr "\"%s\" adatforrás fejléceinek olvasása"
+
#~ msgid " --probe-synthesis - use synthesis file.\n"
#~ msgstr " --probe-synthesis - kiterjesztett függőséglista felhasználása\n"
+
#~ msgid " --probe-hdlist - use hdlist file.\n"
#~ msgstr " --probe-hdlist - fejléclista felhasználása\n"
+
#~ msgid ""
#~ "Note: since no media searched uses hdlists, urpmf was unable to return "
#~ "any result\n"
#~ msgstr ""
#~ "Megjegyzés: a feldolgozott adatforrások egyike sem használ fejléclistát, "
#~ "ezért az urpmf nem tudott eredményt adni\n"
+
#~ msgid "You may want to use --name to search for package names.\n"
#~ msgstr "Csomagnevek keresésére használható a --name opció.\n"
+
#~ msgid " --src, -s - next package is a source package.\n"
#~ msgstr " --src, -s - a következő csomag egy forráscsomag\n"
+
#~ msgid " --probe-hdlist - use hdlist file.\n"
#~ msgstr " --probe-hdlist - fejléclista felhasználása\n"
+
#~ msgid "unable to update medium \"%s\"\n"
#~ msgstr "a(z) \"%s\" adatforrás frissítése nem sikerült\n"
+
#~ msgid "unable to create medium \"%s\"\n"
#~ msgstr "a(z) \"%s\" adatforrás létrehozása nem sikerült\n"
-
diff --git a/po/id.po b/po/id.po
index 60aa4618..08d44584 100644
--- a/po/id.po
+++ b/po/id.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2007-03-22 08:14+0700\n"
"Last-Translator: Willy Sudiarto Raharjo <willysr@gmail.com>\n"
"Language-Team: Indonesia <mdk-id@yahoogroups.com>\n"
@@ -109,12 +109,7 @@ msgstr "_Batal"
msgid "Choose location to save file"
msgstr "Pilih lokasi penyimpanan file"
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "Opsi %s tidak diketahui"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "Tidak ada paket yang ditentukan"
@@ -225,12 +220,12 @@ msgstr "Persiapan..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Menginstall paket `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Harap masukkan media bernama \"%s\" ke perangkat [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Mendownload paket `%s'..."
@@ -422,6 +417,16 @@ msgstr "Terlalu banyak argumen\n"
msgid "Copying failed"
msgstr "Penyalinan gagal"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, c-format
+msgid "medium \"%s\" is not available"
+msgstr "media \"%s\" tidak tersedia"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "gagal membaca file rpm [%s] dari media \"%s\""
+
#: ../urpm/cfg.pm:81
#, c-format
msgid "syntax error in config file at line %s"
@@ -729,7 +734,12 @@ msgstr "Mencoba installasi tanpa menguji ketergantungan? (y/T) "
msgid "Try harder to install (--force)? (y/N) "
msgstr "Mencoba installasi lebih keras (--force)? (y/T) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -743,11 +753,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "transaksi installasi %d gagal"
msgstr[1] "transaksi installasi %d gagal"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Installasi dimungkinkan"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -773,6 +778,11 @@ msgstr "Paket %s tidak bisa diinstall"
msgid "Packages %s can not be installed"
msgstr "Paket-paket %s tidak bisa diinstall"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Installasi dimungkinkan"
+
#: ../urpm/md5sum.pm:20
#, c-format
msgid "examining %s file"
@@ -805,28 +815,8 @@ msgstr "mencoba menimpa media yang ada \"%s\", mengabaikan"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "terlalu banyak titik mount untuk media removable \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "menganggap divais removable sebagai \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "Media \"%s\" adalah image ISO, akan dimount secara langsung"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "menggunakan divais removable lain [%s] untuk \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "gagal mengambil nama path untuk media removable \"%s\""
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -887,12 +877,7 @@ msgstr "menambahkan media \"%s\" sebelum media remote \"%s\""
msgid "adding medium \"%s\""
msgstr "menambahkan media \"%s\""
-#: ../urpm/media.pm:750
-#, c-format
-msgid "unable to mount the distribution medium"
-msgstr "tidak dapat me-mount media distribusi"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "lokasi ini tampaknya tidak mengandung sembarang distribusi"
@@ -1009,18 +994,7 @@ msgstr "memeriksa file hdlist [%s]"
msgid "comparing %s and %s"
msgstr "membersihkan %s dan %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"gagal mengakses media \"%s\",\n"
-"ini bisa terjadi jika Anda me-mount direktori secara manual saat membuat "
-"media."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "file hdlist %s untuk media \"%s\" tidak valid"
@@ -1187,36 +1161,21 @@ msgstr "menemukan handler paralel untuk node: %s"
msgid "unable to use parallel option \"%s\""
msgstr "gagal menggunakan opsi paralel \"%s\""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "gagal mengakses media \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "me-mount %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "melepas mount %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not available"
-msgstr "media \"%s\" tidak tersedia"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "gagal membaca file rpm [%s] dari media \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "media \"%s\" tidak konsisten bertanda removable, seharusnya tidak"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "gagal mengakses media \"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
@@ -2322,19 +2281,19 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Lanjutkan dengan installasi satu paket?"
msgstr[1] "Lanjutkan dengan installasi paket-paket %d?"
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Tekan [Enter] jika siap.."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Batal"
@@ -2355,7 +2314,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2476,12 +2435,7 @@ msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
" --raw - tambahkan media pada konfigurasi, tetapi jangan update.\n"
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - bersihkan direktori cache header.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - mode diam.\n"
@@ -2916,20 +2870,30 @@ msgstr " --changelog - cetak changelog.\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - tag konflik tag\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - tag yang disediakan\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - tag kebutuhan\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - nama rpm sumber\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - cetak ringkasan.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -3028,7 +2992,12 @@ msgstr " nama atau file rpm yang diberikan pada perintah baris dikirimkan.\n"
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes hanya dapat dipakai dengan --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "gagal menulis file list \"%s\""
+
+#: ../urpmq:363
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3061,6 +3030,45 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Changelog tidak ditemukan\n"
+#~ msgid "Unknown option %s"
+#~ msgstr "Opsi %s tidak diketahui"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "terlalu banyak titik mount untuk media removable \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "menganggap divais removable sebagai \"%s\""
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "Media \"%s\" adalah image ISO, akan dimount secara langsung"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "menggunakan divais removable lain [%s] untuk \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "gagal mengambil nama path untuk media removable \"%s\""
+
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "tidak dapat me-mount media distribusi"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "gagal mengakses media \"%s\",\n"
+#~ "ini bisa terjadi jika Anda me-mount direktori secara manual saat membuat "
+#~ "media."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "media \"%s\" tidak konsisten bertanda removable, seharusnya tidak"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Tekan [Enter] jika siap.."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - bersihkan direktori cache header.\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "media maya (virtual) harus lokal"
@@ -3371,9 +3379,6 @@ msgstr "Changelog tidak ditemukan\n"
#~ msgid "file [%s] already used in the same medium \"%s\""
#~ msgstr "file [%s] telah dipakai dalam media yang sama \"%s\""
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "gagal menulis file list \"%s\""
-
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "tidak ada yang ditulis pada file list \"%s\""
diff --git a/po/is.po b/po/is.po
index c32e54f5..08b8d69f 100644
--- a/po/is.po
+++ b/po/is.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2007-11-29 14:14+0000\n"
"Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
"Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -105,12 +105,7 @@ msgstr "Hætta _við"
msgid "Choose location to save file"
msgstr "Veldu stað til að vista skrá"
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "óþekktur valkostur %s"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "Engir pakkar tilgreindir"
@@ -221,12 +216,12 @@ msgstr "Undirbý..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Set inn pakka `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Vinsamlega settu inn %s %s"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Sæki pakka `%s'..."
@@ -418,6 +413,16 @@ msgstr "Of mörg viðföng\n"
msgid "Copying failed"
msgstr "Afritun brást"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, c-format
+msgid "medium \"%s\" is not available"
+msgstr "miðill \"%s\" er ekki tiltækur"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "get ekki lesið rpm skrá [%s] frá miðli \"%s\""
+
#: ../urpm/cfg.pm:81
#, c-format
msgid "syntax error in config file at line %s"
@@ -727,7 +732,12 @@ msgstr "Prófa innsetningu án þess að athuga hvaða skrár þarf? (j/N) "
msgid "Try harder to install (--force)? (y/N) "
msgstr "Prófa sterkari innsetningu (--force)? (j/N) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -741,11 +751,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "%d Innsetningarfærsla brást"
msgstr[1] "%d Innsetningarfærslur brugðust"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Innsetning er möguleg"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -771,6 +776,11 @@ msgstr "Ekki er hægt að setja inn pakka %s"
msgid "Packages %s can not be installed"
msgstr "Ekki er hægt að setja inn pakka %s"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Innsetning er möguleg"
+
#: ../urpm/md5sum.pm:20
#, c-format
msgid "examining %s file"
@@ -803,28 +813,8 @@ msgstr "reyni að hunsa núverandi miðil \"%s\", forðast"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "of margir tengipunktar fyrir útskiptanlegan miðil \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "tek útskiptanleg tæki sem \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "Miðill \"%s\" er ISO ímynd, verður tengdur eftir þörfum"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "nota mismunandi útskiptanleg tæki [%s] fyrir \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "get ekki fundið slóð fyrir útskiptanlegan miðil \"%s\""
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -885,12 +875,7 @@ msgstr "bæti við miðli \"%s\" á undan fjartengdum miðli \"%s\""
msgid "adding medium \"%s\""
msgstr "bæti við miðli \"%s\""
-#: ../urpm/media.pm:750
-#, c-format
-msgid "unable to mount the distribution medium"
-msgstr "get ekki tengt uppsetningarmiðil"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "þessi staðsetning virðist ekki innihalda neina dreifingu"
@@ -1005,18 +990,7 @@ msgstr "athuga hdlist [%s]"
msgid "comparing %s and %s"
msgstr "hreinsa %s og %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"get ekki tengst miðli \"%s\",\n"
-"þetta getur verið vegna þess að þú tengdir möppuna handvirkt þegar þú bjóst "
-"miðilinn til."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ógild hdlist skrá %s fyrir miðil \"%s\""
@@ -1183,36 +1157,21 @@ msgstr "fann samhliða punt fyrir hnúta: %s"
msgid "unable to use parallel option \"%s\""
msgstr "get ekki notað samhliðavalkost \"%s\""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "get ekki lesið miðil \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "tengi %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "aftengi %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not available"
-msgstr "miðill \"%s\" er ekki tiltækur"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "get ekki lesið rpm skrá [%s] frá miðli \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "ósamræmi í miðli \"%s\" merktur útskiptanlegur en er það ekki í raun"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "get ekki lesið miðil \"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
@@ -2310,19 +2269,19 @@ msgstr "diskpláss minnkar um %s."
msgid "%s of disk space will be freed."
msgstr "diskpláss eykst um %s."
-#: ../urpmi:603
+#: ../urpmi:604
+#, fuzzy, c-format
+msgid "%s of packages will be retrieved."
+msgstr "diskpláss eykst um %s."
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Halda áfram með uppsetningu á einum pakka?"
msgstr[1] "Halda áfram með uppsetningu á %d pökkum?"
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Sláðu á ENTER þegar tilbúinn..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Hætta við"
@@ -2343,7 +2302,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2463,12 +2422,7 @@ msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
" --raw - bæta miðlinum við uppsetningu, en ekki uppfæra hann.\n"
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - hreinsa hausa í biðminnis-möppu.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - hljóður hamur.\n"
@@ -2897,20 +2851,30 @@ msgstr " --changelog - prenta breytingasögu.\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - ósamræmanleg tög\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - hvað er skaffað.\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - þarfnast\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - frumrpm.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - prenta samantekt.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -3005,7 +2969,12 @@ msgstr " leitað er að nöfnum eða rpm skrám sem skrifaðar eru á skipanal
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes er aðeins hægt að nota með --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, c-format
+msgid "use -l to list files"
+msgstr ""
+
+#: ../urpmq:363
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3036,6 +3005,46 @@ msgstr "engin hdlist skrá fyrir miðil \"%s\", engar upplýsingar fyrir pakka %
msgid "No changelog found\n"
msgstr "Enginn breytilisti fannst\n"
+#~ msgid "Unknown option %s"
+#~ msgstr "óþekktur valkostur %s"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "of margir tengipunktar fyrir útskiptanlegan miðil \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "tek útskiptanleg tæki sem \"%s\""
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "Miðill \"%s\" er ISO ímynd, verður tengdur eftir þörfum"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "nota mismunandi útskiptanleg tæki [%s] fyrir \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "get ekki fundið slóð fyrir útskiptanlegan miðil \"%s\""
+
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "get ekki tengt uppsetningarmiðil"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "get ekki tengst miðli \"%s\",\n"
+#~ "þetta getur verið vegna þess að þú tengdir möppuna handvirkt þegar þú "
+#~ "bjóst miðilinn til."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr ""
+#~ "ósamræmi í miðli \"%s\" merktur útskiptanlegur en er það ekki í raun"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Sláðu á ENTER þegar tilbúinn..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - hreinsa hausa í biðminnis-möppu.\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "sýndarmiðlar verða að vera staðbundnir"
diff --git a/po/it.po b/po/it.po
index b47337b2..7d128359 100644
--- a/po/it.po
+++ b/po/it.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: it\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2007-09-20 00:07+0200\n"
"Last-Translator: Andrea Celli <andrea.celli@libero.it>\n"
"Language-Team: Italian <timl@freelists.org>\n"
@@ -112,12 +112,7 @@ msgstr "_Cancella"
msgid "Choose location to save file"
msgstr "Scegli dove salvare i file"
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "Opzione sconosciuta %s"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "Nessun pacchetto selezionato"
@@ -228,12 +223,12 @@ msgstr "In preparazione..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Sto installando il pacchetto `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Bisogna inserire il supporto denominato \"%s\" nel dispositivo [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Download del pacchetto `%s'..."
@@ -425,6 +420,16 @@ msgstr "Troppi argomenti\n"
msgid "Copying failed"
msgstr "Copia fallita"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, c-format
+msgid "medium \"%s\" is not available"
+msgstr "il supporto \"%s\" non è disponibile"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "impossibile leggere il file rpm [%s] dal supporto \"%s\""
+
#: ../urpm/cfg.pm:81
#, c-format
msgid "syntax error in config file at line %s"
@@ -736,7 +741,12 @@ msgstr "Provo l'installazione senza controllare le dipendenze? (s/N) "
msgid "Try harder to install (--force)? (y/N) "
msgstr "Provo l'installazione in modo ancora più forzato (--force)? (s/N) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -750,11 +760,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "%d transazione di installazione fallita"
msgstr[1] "%d transazioni di installazione fallite"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "L'installazione è possibile"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -780,6 +785,11 @@ msgstr "Il pacchetto %s non può essere installato"
msgid "Packages %s can not be installed"
msgstr "I pacchetti %s non possono essere installati"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "L'installazione è possibile"
+
#: ../urpm/md5sum.pm:20
#, c-format
msgid "examining %s file"
@@ -814,28 +824,8 @@ msgstr "cerco di fare a meno del supporto esistente \"%s\", vado oltre"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "troppi punti di mount per il supporto rimovibile \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "considero il dispositivo rimovibile come \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "Il supporto \"%s\" è un'immagine ISO, sarà montata al volo"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "sto usando un diverso dispositivo rimovibile [%s] per \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "impossibile individuare il percorso per il supporto rimovibile \"%s\""
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -896,12 +886,7 @@ msgstr "viene aggiunto il supporto \"%s\" prima del supporto remoto \"%s\""
msgid "adding medium \"%s\""
msgstr "viene aggiunto il supporto \"%s\""
-#: ../urpm/media.pm:750
-#, c-format
-msgid "unable to mount the distribution medium"
-msgstr "impossibile montare il supporto di installazione"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "questo indirizzo non sembra contenere alcuna distribuzione"
@@ -1017,18 +1002,7 @@ msgstr "esamino il file hdlist [%s]"
msgid "comparing %s and %s"
msgstr "rimozione di %s e di %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"impossibile accedere al supporto \"%s\",\n"
-"questo può succedere se hai montato manualmente la directory durante la "
-"creazione del supporto"
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "il file hdlist %s per il supporto \"%s\" non è corretto"
@@ -1195,36 +1169,21 @@ msgstr "trovato handler parallelo per i nodi: %s"
msgid "unable to use parallel option \"%s\""
msgstr "impossibile utilizzare l'opzione parallel \"%s\" "
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "impossibile accedere al supporto \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "sto montando %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "sto smontando %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not available"
-msgstr "il supporto \"%s\" non è disponibile"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "impossibile leggere il file rpm [%s] dal supporto \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "supporto incoerente \"%s\", segnato come rimovibile ma non tale"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "impossibile accedere al supporto \"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
@@ -2352,19 +2311,19 @@ msgstr "Altri %s di spazio disco saranno utilizzati."
msgid "%s of disk space will be freed."
msgstr "%s di spazio disco saranno liberati."
-#: ../urpmi:603
+#: ../urpmi:604
+#, fuzzy, c-format
+msgid "%s of packages will be retrieved."
+msgstr "%s di spazio disco saranno liberati."
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Procedo con l'installazione di un pacchetto?"
msgstr[1] "Procedo con l'installazione di %d pacchetti?"
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Premi Invio quando sei pronto..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Annulla"
@@ -2385,7 +2344,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2504,12 +2463,7 @@ msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
"--raw - aggiunge il supporto alla configurazione ma non lo aggiorna.\n"
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - ripulisce le intestazioni dalla directory cache.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - modalità silenziosa.\n"
@@ -2947,20 +2901,30 @@ msgstr " --changelog - mostra la lista delle modifiche.\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - conflitti\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - elementi forniti dal pacchetto.\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - requisiti necessari per installare il pacchetto.\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - nome dei pacchetti rpm con sorgenti.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - stampa il sommario.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -3058,7 +3022,12 @@ msgstr ""
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes può essere usato solo con --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, c-format
+msgid "use -l to list files"
+msgstr ""
+
+#: ../urpmq:363
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3093,6 +3062,47 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Nessun changelog trovato\n"
+#~ msgid "Unknown option %s"
+#~ msgstr "Opzione sconosciuta %s"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "troppi punti di mount per il supporto rimovibile \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "considero il dispositivo rimovibile come \"%s\""
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "Il supporto \"%s\" è un'immagine ISO, sarà montata al volo"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "sto usando un diverso dispositivo rimovibile [%s] per \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr ""
+#~ "impossibile individuare il percorso per il supporto rimovibile \"%s\""
+
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "impossibile montare il supporto di installazione"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "impossibile accedere al supporto \"%s\",\n"
+#~ "questo può succedere se hai montato manualmente la directory durante la "
+#~ "creazione del supporto"
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "supporto incoerente \"%s\", segnato come rimovibile ma non tale"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Premi Invio quando sei pronto..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr ""
+#~ " -c - ripulisce le intestazioni dalla directory cache.\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "il supporto virtuale deve essere locale"
diff --git a/po/ja.po b/po/ja.po
index 86207ed9..e80d05ea 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-ja\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2008-02-26 19+0900\n"
"Last-Translator: BANDO Yukiko <ybando@k6.dion.ne.jp>\n"
"Language-Team: Japanese <cooker-i18n@mandrivalinux.org>\n"
@@ -108,12 +108,7 @@ msgstr "キャンセル(_C)"
msgid "Choose location to save file"
msgstr "ファイルを保存する場所を選んでください"
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "不明なオプション %s"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "パッケージが指定されていません"
@@ -223,12 +218,12 @@ msgstr "準備中..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "パッケージ %s (%s/%s) をインストール..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "メディア %s を デバイス [%s] に挿入してください"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "パッケージ %s をダウンロード..."
@@ -421,6 +416,16 @@ msgstr "引数が多すぎます\n"
msgid "Copying failed"
msgstr "コピーに失敗"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, c-format
+msgid "medium \"%s\" is not available"
+msgstr "メディア %s は利用できません"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "RPM ファイル [%s] をメディア %s から読み込めません"
+
#: ../urpm/cfg.pm:81
#, c-format
msgid "syntax error in config file at line %s"
@@ -729,7 +734,12 @@ msgstr "依存を確認せずにインストールしますか? (y/N)[デフ
msgid "Try harder to install (--force)? (y/N) "
msgstr "インストールを強行 (--force) してみますか?(y/N)[デフォルトはN]"
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -744,11 +754,6 @@ msgid "%d installation transaction failed"
msgid_plural "%d installation transactions failed"
msgstr[0] "%d 件のインストールトランザクションが失敗しました"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "インストール可能です"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -774,6 +779,11 @@ msgstr "パッケージ %s はインストールできません"
msgid "Packages %s can not be installed"
msgstr "パッケージ %s はインストールできません"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "インストール可能です"
+
#: ../urpm/md5sum.pm:20
#, c-format
msgid "examining %s file"
@@ -807,28 +817,8 @@ msgstr "既存のメディア %s を上書きしようとしています。ス
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "リムーバブルメディア %s にはマウントポイントが多すぎます"
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "リムーバブルデバイスを %s と認識します"
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "メディア %s は ISO イメージです。オンザフライでマウントされます。"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "%2$s に他のリムーバブルデバイス [%1$s] を使います"
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "リムーバブルメディア %s のパスを読み出せません"
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -889,12 +879,7 @@ msgstr "メディア %s をリモートメディア %s の前に追加"
msgid "adding medium \"%s\""
msgstr "メディア %s を追加"
-#: ../urpm/media.pm:750
-#, c-format
-msgid "unable to mount the distribution medium"
-msgstr "ディストリビューションのメディアをマウントできません"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "この場所にはディストリビューションが含まれていないようです"
@@ -1011,18 +996,7 @@ msgstr "genhdlist2 が %s で失敗しました"
msgid "comparing %s and %s"
msgstr "%s と %s を比較"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"メディア %s にアクセスできません。\n"
-"この現象は、メディアを追加するときに手動でディレクトリをマウントすると起こる"
-"ことがあります。"
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "メディア %2$s の hdlist ファイル %1$s が無効"
@@ -1189,36 +1163,21 @@ msgstr "ノードのパラレルハンドラを検出しました: %s"
msgid "unable to use parallel option \"%s\""
msgstr "パラレルオプション %s は使えません"
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "メディア %s にアクセスできません"
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "%s をマウント"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "%s をアンマウント"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not available"
-msgstr "メディア %s は利用できません"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "RPM ファイル [%s] をメディア %s から読み込めません"
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "メディア %s はリムーバブルだと判断しましたが、不確実です"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "メディア %s にアクセスできません"
-
#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
@@ -2293,18 +2252,18 @@ msgstr "ディスク容量を %s 使います。"
msgid "%s of disk space will be freed."
msgstr "ディスク容量が %s 空きます。"
-#: ../urpmi:603
+#: ../urpmi:604
+#, fuzzy, c-format
+msgid "%s of packages will be retrieved."
+msgstr "ディスク容量が %s 空きます。"
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "%d 個のパッケージのインストールを開始しますか?"
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "準備ができたら Enter を押してください"
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "キャンセル"
@@ -2317,7 +2276,7 @@ msgstr "urpmi を再スタートします"
#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
-#, c-format
+#, fuzzy, c-format
msgid ""
"usage: urpmi.addmedia [options] <name> <url>\n"
"where <url> is one of\n"
@@ -2325,7 +2284,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2455,12 +2414,7 @@ msgstr " --nopubkey - 追加したメディアの公開鍵をインポー
msgid " --raw - add the media in config, but don't update it.\n"
msgstr " --raw - 設定ファイルにメディアを追加、更新はしない\n"
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - キャッシュディレクトリのヘッダを削除\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - 詳細を表示しない\n"
@@ -2884,21 +2838,31 @@ msgid " --changelog - print changelog.\n"
msgstr " --changelog - 変更ログを表示\n"
#: ../urpmq:81
+#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - conflict (衝突) タグ\n"
+
+#: ../urpmq:82
#, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - provide (提供) を表示\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - require (要求) タグ\n"
+
+#: ../urpmq:84
#, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - ソース RPM を表示\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - 要約を表示\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -2993,7 +2957,12 @@ msgstr " 指定したパッケージ名/RPM ファイルがあるか調べる\n
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes は --parallel と一緒にしか使えません"
-#: ../urpmq:360
+#: ../urpmq:206
+#, c-format
+msgid "use -l to list files"
+msgstr ""
+
+#: ../urpmq:363
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3024,6 +2993,45 @@ msgstr ""
msgid "No changelog found\n"
msgstr "変更ログはありません\n"
+#~ msgid "Unknown option %s"
+#~ msgstr "不明なオプション %s"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "リムーバブルメディア %s にはマウントポイントが多すぎます"
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "リムーバブルデバイスを %s と認識します"
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "メディア %s は ISO イメージです。オンザフライでマウントされます。"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "%2$s に他のリムーバブルデバイス [%1$s] を使います"
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "リムーバブルメディア %s のパスを読み出せません"
+
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "ディストリビューションのメディアをマウントできません"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "メディア %s にアクセスできません。\n"
+#~ "この現象は、メディアを追加するときに手動でディレクトリをマウントすると起こ"
+#~ "ることがあります。"
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "メディア %s はリムーバブルだと判断しましたが、不確実です"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "準備ができたら Enter を押してください"
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - キャッシュディレクトリのヘッダを削除\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "仮想メディアはローカルでなければいけません"
diff --git a/po/ka.po b/po/ka.po
index 9e1a4780..bf8f7354 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2003-01-29 23:47+0400\n"
"Last-Translator: Aiet Kolkhi <aiet@gmx.net>\n"
"Language-Team: Georgian\n"
@@ -87,12 +87,7 @@ msgstr "_გაუქმება"
msgid "Choose location to save file"
msgstr ""
-#: ../gurpmi.pm:80
-#, fuzzy, c-format
-msgid "Unknown option %s"
-msgstr "უცნობი ტიპის ფაილი %s-სთვის"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, fuzzy, c-format
msgid "No packages specified"
msgstr "ბრძანება არ იქნა მითითებული"
@@ -196,12 +191,12 @@ msgstr ""
msgid "Installing package `%s' (%s/%s)..."
msgstr "პაკეტის ინსტალაცია: `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
+#: ../gurpmi2:264 ../urpmi:622
#, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+msgid "Please insert the medium named \"%s\""
msgstr "გთხოვთ ჩადოთ: %s სახელით: %s"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, fuzzy, c-format
msgid "Downloading package `%s'..."
msgstr "პაკეტის ინსტალაცია: `%s' (%s/%s)..."
@@ -390,6 +385,16 @@ msgstr ""
msgid "Copying failed"
msgstr "შესვლა ვერ განხორციელდა"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "მედიუმი \"%s\" უკვე არსებობს"
+
+#: ../urpm/cdrom.pm:206
+#, fuzzy, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "ვერ ვუკავშირდები მედიას \"%s\""
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -696,7 +701,12 @@ msgstr "გნებავთ ვცადე ჩაწერა დამოკ
msgid "Try harder to install (--force)? (y/N) "
msgstr "გნებავთ ვცადო ჩაწერა ძალით (--force)? (ხ/ა) [ა] "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -709,11 +719,6 @@ msgid "%d installation transaction failed"
msgid_plural "%d installation transactions failed"
msgstr[0] "ინსტალაციაშტან დაკავშირებული მითითებები"
-#: ../urpm/main_loop.pm:281
-#, fuzzy, c-format
-msgid "Installation is possible"
-msgstr "ინსტალაცია ჩაიშალა"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -739,6 +744,11 @@ msgstr "უკვე ყველაფერი ჩაწერილია"
msgid "Packages %s can not be installed"
msgstr "უკვე ყველაფერი ჩაწერილია"
+#: ../urpm/main_loop.pm:307
+#, fuzzy, c-format
+msgid "Installation is possible"
+msgstr "ინსტალაცია ჩაიშალა"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -772,29 +782,9 @@ msgstr "ვცდილობ გადავახტე არსებულ
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "ძალიან ბევრი mount სახელი შეცვლადი მედიუმისათვის \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "ვიღებ შეცვლად მოწყობილობას როგორც \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+msgid "failed to migrate removable device, ignoring media"
msgstr ""
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "ვიყენებ სხვანაირ შეცვლად მოწყობილობას [%s] \"%s\"-სთვის"
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ვერ ვიპოვე მდებარეობა შეცვლადი მედიუმისათვის \"%s\""
-
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
msgid "wrote config file [%s]"
@@ -856,12 +846,7 @@ msgstr "პრობლემა synthesis-ის ფაილის ან მ
msgid "adding medium \"%s\""
msgstr "ვაგდებ მედიას \"%s\""
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "ვერ ვიპოვე პირველი საინსტალაციო მედიუმი"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -976,15 +961,7 @@ msgstr "ვამოწმებ hdlist ფაილს [%s]"
msgid "comparing %s and %s"
msgstr "ვაინსტალირებ: %s\n"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
@@ -1151,36 +1128,21 @@ msgstr "ვიპოვე პარალელური სათაე (handl
msgid "unable to use parallel option \"%s\""
msgstr "ვერ ვიყენებ პარალელურ პარამეტრს \"%s\""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "ვერ ვუკავშირდები მედიას \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, fuzzy, c-format
msgid "mounting %s"
msgstr "ვაინსტალირებ: %s\n"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, fuzzy, c-format
msgid "unmounting %s"
msgstr "მოხსნა (unmount)"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "მედიუმი \"%s\" უკვე არსებობს"
-
-#: ../urpm/removable.pm:143
-#, fuzzy, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "ვერ ვუკავშირდები მედიას \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr ""
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "ვერ ვუკავშირდები მედიას \"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, fuzzy, c-format
msgid ""
@@ -2198,18 +2160,18 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
-#: ../urpmi:621
-#, fuzzy, c-format
-msgid "Press Enter when ready..."
-msgstr "გთხოვთ დაგვიდასტუროთ Enter ღილაკზე დაჭერით..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "გამოქცევა"
@@ -2230,7 +2192,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2331,12 +2293,7 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr ""
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr ""
@@ -2748,20 +2705,30 @@ msgstr " --help - აჩვენე ეს დამხმარე
#: ../urpmq:81
#, fuzzy, c-format
-msgid " --provides - print provides.\n"
+msgid " --conflicts - print conflicts.\n"
msgstr " --update - განახლების კვანძები\n"
#: ../urpmq:82
#, fuzzy, c-format
+msgid " --provides - print provides.\n"
+msgstr " --update - განახლების კვანძები\n"
+
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --update - განახლების კვანძები\n"
+
+#: ../urpmq:84
+#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --help - აჩვენე ეს დამხმარე ტექსტი.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr ""
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -2849,7 +2816,12 @@ msgstr ""
msgid "--list-nodes can only be used with --parallel"
msgstr ""
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
+
+#: ../urpmq:363
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -2877,6 +2849,30 @@ msgid "No changelog found\n"
msgstr "სურათები ვერ ვიპოვე"
#, fuzzy
+#~ msgid "Unknown option %s"
+#~ msgstr "უცნობი ტიპის ფაილი %s-სთვის"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "ძალიან ბევრი mount სახელი შეცვლადი მედიუმისათვის \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "ვიღებ შეცვლად მოწყობილობას როგორც \"%s\""
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "ვიყენებ სხვანაირ შეცვლად მოწყობილობას [%s] \"%s\"-სთვის"
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "ვერ ვიპოვე მდებარეობა შეცვლადი მედიუმისათვის \"%s\""
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "ვერ ვიპოვე პირველი საინსტალაციო მედიუმი"
+
+#, fuzzy
+#~ msgid "Press Enter when ready..."
+#~ msgstr "გთხოვთ დაგვიდასტუროთ Enter ღილაკზე დაჭერით..."
+
+#, fuzzy
#~ msgid "virtual medium needs to be local"
#~ msgstr ""
#~ "მედიუმი \"%s\" ცდილობს გამოიყენოს უკვე გამოყენებული list. შედეგად უარი "
@@ -3054,10 +3050,6 @@ msgstr "სურათები ვერ ვიპოვე"
#~ msgstr "source hdlist-ის (ან synthesis-ის) კოპირება o"
#, fuzzy
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
-
-#, fuzzy
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "არასწორი list ფაილის \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
diff --git a/po/ko.po b/po/ko.po
index fe92b6ba..2a342f37 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2007-09-26 20:03+0200\n"
"Last-Translator: Jaegeum Choe <baedaron@hananet.net>\n"
"Language-Team: Korean <baedaron@hananet.net>\n"
@@ -103,12 +103,7 @@ msgstr "취소 (_C)"
msgid "Choose location to save file"
msgstr "파일 선택"
-#: ../gurpmi.pm:80
-#, fuzzy, c-format
-msgid "Unknown option %s"
-msgstr "알 수 없는 연결 유형"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, fuzzy, c-format
msgid "No packages specified"
msgstr "선택된 패키지 목록 저장"
@@ -217,12 +212,12 @@ msgstr "부트 로더 준비중"
msgid "Installing package `%s' (%s/%s)..."
msgstr "패키지 설치 중: [%s] (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "장치 [%2$s]에 「%1$s」미디어를 넣으세요."
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, fuzzy, c-format
msgid "Downloading package `%s'..."
msgstr "패키지 내려받는 중: [%s] (%s/%s)..."
@@ -416,6 +411,16 @@ msgstr "너무 많은 인수.\n"
msgid "Copying failed"
msgstr "로그인에 실패했습니다"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "매체 [%s]는 사용할 수 없습니다.."
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "매체「%2$s」에서 RPM 파일「%1$s」를 읽을 수 없습니다."
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -726,7 +731,12 @@ msgstr "의존성 검사없이 설치합니까? (y/N) "
msgid "Try harder to install (--force)? (y/N) "
msgstr "설치를 강제 추진합니까? (y/N) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -739,11 +749,6 @@ msgid "%d installation transaction failed"
msgid_plural "%d installation transactions failed"
msgstr[0] "설치 실패."
-#: ../urpm/main_loop.pm:281
-#, fuzzy, c-format
-msgid "Installation is possible"
-msgstr "설치 문제"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -769,6 +774,11 @@ msgstr "[%s] 팩키지를 설치할 수 없습니다."
msgid "Packages %s can not be installed"
msgstr "[%s] 팩키지를 설치할 수 없습니다."
+#: ../urpm/main_loop.pm:307
+#, fuzzy, c-format
+msgid "Installation is possible"
+msgstr "설치 문제"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -800,29 +810,9 @@ msgid "trying to override existing medium \"%s\", skipping"
msgstr "존재하지 않는 매체「%s」 선택 시도"
#: ../urpm/media.pm:409
-#, fuzzy, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "「%s」매체를 생성할 수 없습니다.\n"
-
-#: ../urpm/media.pm:410
-#, fuzzy, c-format
-msgid "taking removable device as \"%s\""
-msgstr "탈착식 장치"
-
-#: ../urpm/media.pm:413
#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "「%s」매체는 ISO 이미지 입니다. on-the-fly 마운트 되어질 것입니다. "
-
-#: ../urpm/media.pm:416
-#, fuzzy, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "\"%s\"에 대해 다른 탈착식 장치 [%s]를 사용"
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "이동식 「%s」매체를 생성할 수 없습니다.\n"
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -881,12 +871,7 @@ msgstr "매체「%2$s」에서 RPM 파일「%1$s」를 읽을 수 없습니다."
msgid "adding medium \"%s\""
msgstr "%s 제거 중"
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "「%s」의 목록 파일에 접근할 수 없습니다. 매체 무시됨."
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "이 위치는 어느 제품에서 포함되어있지 않는 듯 합니다."
@@ -1001,17 +986,7 @@ msgstr "hdlist 파일 [%s] 생성 중"
msgid "comparing %s and %s"
msgstr "%s 삭제 중...\n"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"매체 \"%s\",에 접속할 수 없습니다, 매체를 생성할때 디렉토리가 \n"
-"수동으로 마운트 되었을 수도 있습니다."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "매체「%s」에 대한 목록 파일을 찾을 수 없습니다."
@@ -1178,36 +1153,21 @@ msgstr "nodes의 패러럴 핸들러 발견: %s"
msgid "unable to use parallel option \"%s\""
msgstr " 패러럴 옵션 \"%s\"를 사용할 수 없습니다.\n"
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "매체「%s」에 접근할 수 없습니다."
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "%s 마운트 중"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "%s 마운트 해제 중"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "매체 [%s]는 사용할 수 없습니다.."
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "매체「%2$s」에서 RPM 파일「%1$s」를 읽을 수 없습니다."
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "일치되지 않는 매체 \"%s\" 는 제거할 수 있지만 아닐 수도 있습니다."
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "매체「%s」에 접근할 수 없습니다."
-
#: ../urpm/search.pm:29 ../urpmf:29
#, fuzzy, c-format
msgid ""
@@ -2233,18 +2193,18 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
-#: ../urpmi:621
-#, fuzzy, c-format
-msgid "Press Enter when ready..."
-msgstr "다 되었으면 ENTER키를 누르세요..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "취소"
@@ -2265,7 +2225,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2376,12 +2336,7 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, fuzzy, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -v - 상세 정보 모드.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, fuzzy, c-format
msgid " -q - quiet mode.\n"
msgstr " -v - 상세 정보 모드.\n"
@@ -2799,20 +2754,30 @@ msgstr " --help - 이 도움말 출력.\n"
#: ../urpmq:81
#, fuzzy, c-format
-msgid " --provides - print provides.\n"
+msgid " --conflicts - print conflicts.\n"
msgstr " -v - 상세 정보 모드.\n"
#: ../urpmq:82
#, fuzzy, c-format
+msgid " --provides - print provides.\n"
+msgstr " -v - 상세 정보 모드.\n"
+
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " -v - 상세 정보 모드.\n"
+
+#: ../urpmq:84
+#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --help - 이 도움말 출력.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr ""
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -2900,7 +2865,12 @@ msgstr ""
msgid "--list-nodes can only be used with --parallel"
msgstr ""
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "「%s」의 목록 파일을 기록할 수 없습니다."
+
+#: ../urpmq:363
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -2936,6 +2906,52 @@ msgid "No changelog found\n"
msgstr "하드 디스크를 찾을 수 없습니다."
#, fuzzy
+#~ msgid "Unknown option %s"
+#~ msgstr "알 수 없는 연결 유형"
+
+#, fuzzy
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "「%s」매체를 생성할 수 없습니다.\n"
+
+#, fuzzy
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "탈착식 장치"
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "「%s」매체는 ISO 이미지 입니다. on-the-fly 마운트 되어질 것입니다. "
+
+#, fuzzy
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "\"%s\"에 대해 다른 탈착식 장치 [%s]를 사용"
+
+#, fuzzy
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "이동식 「%s」매체를 생성할 수 없습니다.\n"
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "「%s」의 목록 파일에 접근할 수 없습니다. 매체 무시됨."
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "매체 \"%s\",에 접속할 수 없습니다, 매체를 생성할때 디렉토리가 \n"
+#~ "수동으로 마운트 되었을 수도 있습니다."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "일치되지 않는 매체 \"%s\" 는 제거할 수 있지만 아닐 수도 있습니다."
+
+#, fuzzy
+#~ msgid "Press Enter when ready..."
+#~ msgstr "다 되었으면 ENTER키를 누르세요..."
+
+#, fuzzy
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -v - 상세 정보 모드.\n"
+
+#, fuzzy
#~ msgid "virtual medium needs to be local"
#~ msgstr "매체 「%s」가 이미 사용되는 목록을 사용하려 합니다. 매체 무시됨."
@@ -3150,9 +3166,6 @@ msgstr "하드 디스크를 찾을 수 없습니다."
#~ msgid "copying source hdlist (or synthesis) of \"%s\"..."
#~ msgstr "목록 파일에「%s」에 대한 기록이 없습니다."
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "「%s」의 목록 파일을 기록할 수 없습니다."
-
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "목록 파일에「%s」에 대한 기록이 없습니다."
diff --git a/po/ky.po b/po/ky.po
index 5c83c752..09660cd9 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-ky\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2005-07-13 13:23+0000\n"
"Last-Translator: Timur Jamakeev <ztimur@mail..ru>\n"
"Language-Team: Kyrgyz\n"
@@ -103,14 +103,7 @@ msgstr "_Калтыруу"
msgid "Choose location to save file"
msgstr "Сактоо үчүн орун тандаңыз"
-#: ../gurpmi.pm:80
-#, fuzzy, c-format
-msgid "Unknown option %s"
-msgstr ""
-"\n"
-"белгисиз опциялар: '%s'\n"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, fuzzy, c-format
msgid "No packages specified"
msgstr "%s аттуу пакет жок"
@@ -224,12 +217,12 @@ msgstr "Даярдоо ..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Пакет орнотулууда: `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "\"%s\" аттуу булагын [%s] түзүлүшүнө орнотуңуз"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "`%s' пакети жүктөлүүдө..."
@@ -421,6 +414,16 @@ msgstr ""
msgid "Copying failed"
msgstr "Көчүрүү ишке ашпады"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "\"%s\" булагы тандалган эмес"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "[%s] rpm файлын \"%s\" булагынан окуу мүмкүн эмес"
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -729,7 +732,12 @@ msgstr "Көз карадылыктарды эске албай орнотуп
msgid "Try harder to install (--force)? (y/N) "
msgstr "Мажбурлап орнотуп көрөйүнбү (--force)? (y/N) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -743,11 +751,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "%d орнотуу транзакциялары ишке ашпады"
msgstr[1] "%d орнотуу транзакциялары ишке ашпады"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Орнотууга мүмкүн"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -773,6 +776,11 @@ msgstr "Бардыгы алдагачан орнотулган"
msgid "Packages %s can not be installed"
msgstr "Бардыгы алдагачан орнотулган"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Орнотууга мүмкүн"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -806,31 +814,8 @@ msgstr "\"%s\" бар булагынан аттап өтүү аракети, к
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
+msgid "failed to migrate removable device, ignoring media"
msgstr ""
-" \"%s\" чыгарылып алынуучу булагы үчүн бириктирүү чекиттери өтө эле көп "
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "чыгарылып алынуучу түзүлүш \"%s\" катары каралууда"
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr ""
-"\"%s\" булагы ISO сүрөттөлүшү болуп эсептелет жана ал автоматтык түрдө "
-"туташылат"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "[%s] башка чыгарып алынуучу түзүлүш колдонулууда; \"%s\" үчүн"
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "\"%s\" чыгарып алынуучу булагынын жолун алуу мүмкүн эмес"
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -891,12 +876,7 @@ msgstr "\"%s\" булагынын башсаптары окулууда"
msgid "adding medium \"%s\""
msgstr "\"%s\" булагы алынып салынууда"
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "инсталляциянын биринчи булагына жетүү мүмкүн эмес"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -1011,18 +991,7 @@ msgstr "[%s] hdlist файлы текшерилүүдө"
msgid "comparing %s and %s"
msgstr "%2s булагынан %1s орнотулууда"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"\"%s\" булагына жетүүгө болбойт,\n"
-"бул ката сиз булакты түзүүдө аны өз алдыңызча бириктиргенде пайда болушу "
-"мүмкүн."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "\"%s\" булагы үчүн hdlist файлы табылбады"
@@ -1189,38 +1158,21 @@ msgstr "%s бутактары үчүн параллелдик аткаруучу
msgid "unable to use parallel option \"%s\""
msgstr "\"%s\" параллелдик опциясын колдонуу мүмкүн эмес"
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "\"%s\" булагына жетүүгө мүмкүн эмес"
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "%s бириктирилүүдө"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "%s ажыратылууда"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "\"%s\" булагы тандалган эмес"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "[%s] rpm файлын \"%s\" булагынан окуу мүмкүн эмес"
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr ""
-"түшүнүлбөгөн \"%s\" булагы чыкма түзүлүш катары көрсөтүлгөн, бирок ал андай "
-"эмес"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "\"%s\" булагына жетүүгө мүмкүн эмес"
-
#: ../urpm/search.pm:29 ../urpmf:29
#, fuzzy, c-format
msgid ""
@@ -2318,19 +2270,19 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Даяр болгон соң, Enter басыңыз..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Калтыруу"
@@ -2351,7 +2303,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2471,12 +2423,7 @@ msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
" --raw - конфигурацияга булакты кошуу, бирок аны жаңылабоо.\n"
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - башсаптар (headers) кэшинин каталогун тазалоо.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - кыскартылган режим (quiet).\n"
@@ -2910,20 +2857,30 @@ msgstr " --changelog - changelog чыгаруу.\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - conflicts: бардык конфликтер тэгин чыгаруу.\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - provides: бардык берилчү файлдар тэгин чыгаруу.\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - requires: бардык көз карандылыктар тэгин чыгаруу.\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - sourcerpm: баштапкы rpm тэгин чыгаруу.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - жалпы маалымат тэгин чыгаруу.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -3023,7 +2980,12 @@ msgstr " командалык сапта көрсөтүлгөн наамдар
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes опциясы --parallel менен чогуу гана колдонулат"
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "\"%s\" үчүн тизме файлын жазууга болбоду"
+
+#: ../urpmq:363
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3058,6 +3020,54 @@ msgstr ""
msgid "No changelog found\n"
msgstr "changelog табылбады\n"
+#, fuzzy
+#~ msgid "Unknown option %s"
+#~ msgstr ""
+#~ "\n"
+#~ "белгисиз опциялар: '%s'\n"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr ""
+#~ " \"%s\" чыгарылып алынуучу булагы үчүн бириктирүү чекиттери өтө эле көп "
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "чыгарылып алынуучу түзүлүш \"%s\" катары каралууда"
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr ""
+#~ "\"%s\" булагы ISO сүрөттөлүшү болуп эсептелет жана ал автоматтык түрдө "
+#~ "туташылат"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "[%s] башка чыгарып алынуучу түзүлүш колдонулууда; \"%s\" үчүн"
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "\"%s\" чыгарып алынуучу булагынын жолун алуу мүмкүн эмес"
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "инсталляциянын биринчи булагына жетүү мүмкүн эмес"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "\"%s\" булагына жетүүгө болбойт,\n"
+#~ "бул ката сиз булакты түзүүдө аны өз алдыңызча бириктиргенде пайда болушу "
+#~ "мүмкүн."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr ""
+#~ "түшүнүлбөгөн \"%s\" булагы чыкма түзүлүш катары көрсөтүлгөн, бирок ал "
+#~ "андай эмес"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Даяр болгон соң, Enter басыңыз..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - башсаптар (headers) кэшинин каталогун тазалоо.\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "виртуалдык булак локалдык болушу керек"
@@ -3301,9 +3311,6 @@ msgstr "changelog табылбады\n"
#~ msgid "file [%s] already used in the same medium \"%s\""
#~ msgstr "[%s] файлы окшош \"%s\" булагында алдагачан колдонулууда"
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "\"%s\" үчүн тизме файлын жазууга болбоду"
-
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "\"%s\" үчүн тизме файлына эч нерсе жазылган жок"
diff --git a/po/lt.po b/po/lt.po
index 44d0e703..4fd0c543 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2005-08-18 23:34+0200\n"
"Last-Translator: Arvydas Svirka <arvydas@arvis.lt>\n"
"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -106,12 +106,7 @@ msgstr "_Atšaukti"
msgid "Choose location to save file"
msgstr "Pasirinkite vietą bylos išsaugojimui"
-#: ../gurpmi.pm:80
-#, fuzzy, c-format
-msgid "Unknown option %s"
-msgstr "Nežinomas perspėjimas"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Išsaugoti paketų pasirinkimą"
@@ -223,12 +218,12 @@ msgstr "Ruošiamasi..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Įdiegiamas paketas `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Įdėkite laikmeną, pavadintą \"%s\", į įrenginį [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Parsiunčiamas paketas `%s'..."
@@ -420,6 +415,16 @@ msgstr ""
msgid "Copying failed"
msgstr "Kopijavimas nepavyko"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "laikmena \"%s\" neišrinkta"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "negaliu perskaityti \"%2$s\" laikmenos rpm bylos [%1$s]"
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -727,7 +732,12 @@ msgstr "Pabandyti įdiegimą be priklausomybių tikrinimo? (t/N) "
msgid "Try harder to install (--force)? (y/N) "
msgstr "Pabandyti įdiegimą priverstinai (--force)? (t/N) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -742,11 +752,6 @@ msgstr[0] "%d įdiegimo operacijos nepavyko"
msgstr[1] "%d įdiegimo operacijos nepavyko"
msgstr[2] "%d įdiegimo operacijos nepavyko"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Įdiegimas galimas"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -772,6 +777,11 @@ msgstr "Paketas(-ai) jau įdiegti"
msgid "Packages %s can not be installed"
msgstr "Paketas(-ai) jau įdiegti"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Įdiegimas galimas"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -805,28 +815,8 @@ msgstr "bandau praleisti esančią laikmeną \"%s\", vengiu"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "per daug išimamos laikmenos prijungimo taškų \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "išimamas įrenginys priimamas kaip \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "Laikmena \"%s\" yra ISO atvaizdas, bus prijungta on-the-fly metodu"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "naudojamas skirtingas išimamas įrenginys [%s] dėl \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "negaliu išgauti kelio vardo išimamai laikmenai\"%s\""
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -887,12 +877,7 @@ msgstr "iš laikmenos \"%s\" skaitomos antraštės"
msgid "adding medium \"%s\""
msgstr "pašalinama laikmena \"%s\""
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "negaliu prieiti prie pirmojo įdiegimo laikmenos"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -1007,18 +992,7 @@ msgstr "tikrinama hdlist byla [%s]"
msgid "comparing %s and %s"
msgstr "iš %2$s įdiegiamas %1$s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"negaliu prieiti prie laikmenos \"%s\",\n"
-"tai galėjo atsitikti, jei, kurdami laikmeną, rankiniu būdu prijungėte "
-"katalogą."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "laikmenai \"%s\" nerasta hdlist byla"
@@ -1185,36 +1159,21 @@ msgstr "rasta lygiagrečioji tvarkyklė mazgams: %s"
msgid "unable to use parallel option \"%s\""
msgstr "negaliu naudoti lygiagretumo parinkties \"%s\""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "negaliu prieiti prie laikmenos \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "prijungiama %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "atjungiama %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "laikmena \"%s\" neišrinkta"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "negaliu perskaityti \"%2$s\" laikmenos rpm bylos [%1$s]"
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "nesuderinama laikmena \"%s\" pažymėta kaip išimama, bet tokia nėra"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "negaliu prieiti prie laikmenos \"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, fuzzy, c-format
msgid ""
@@ -2316,7 +2275,12 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2324,12 +2288,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Kai būsite pasiruošę, paspauskite Enter..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Atšaukti"
@@ -2350,7 +2309,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2472,12 +2431,7 @@ msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
" --raw - įtraukti laikmenos konfigūraciją, bet jos neatnaujinti.\n"
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - išvalyti antraščių cache katalogą.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - paslėptoji veiksena.\n"
@@ -2906,20 +2860,31 @@ msgstr " --changelog - atspausdinti changelog.\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - spausdinti žymenų konfliktus: visi konfliktai.\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - spausdinti: all provides.\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr ""
+" --requires - spausdinti žymenų pareikalavimus: visi pareikalavimai.\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - spausdinti žymens pirminį rpm: pirminis rpm.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - spausdinti suvestinę.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -3017,7 +2982,12 @@ msgstr " apklausiami komandinėje eilutėje duoti pavadinimai arba rpm bylos.\n
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-mazgas gali būti naudojamas tik su --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "negaliu įrašyti \"%s\" sąrašo bylos"
+
+#: ../urpmq:363
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3052,6 +3022,47 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Nerastas changelog\n"
+#, fuzzy
+#~ msgid "Unknown option %s"
+#~ msgstr "Nežinomas perspėjimas"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "per daug išimamos laikmenos prijungimo taškų \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "išimamas įrenginys priimamas kaip \"%s\""
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "Laikmena \"%s\" yra ISO atvaizdas, bus prijungta on-the-fly metodu"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "naudojamas skirtingas išimamas įrenginys [%s] dėl \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "negaliu išgauti kelio vardo išimamai laikmenai\"%s\""
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "negaliu prieiti prie pirmojo įdiegimo laikmenos"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "negaliu prieiti prie laikmenos \"%s\",\n"
+#~ "tai galėjo atsitikti, jei, kurdami laikmeną, rankiniu būdu prijungėte "
+#~ "katalogą."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "nesuderinama laikmena \"%s\" pažymėta kaip išimama, bet tokia nėra"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Kai būsite pasiruošę, paspauskite Enter..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - išvalyti antraščių cache katalogą.\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "virtuali laikmena turi būti vietinė"
@@ -3307,9 +3318,6 @@ msgstr "Nerastas changelog\n"
#~ msgid "file [%s] already used in the same medium \"%s\""
#~ msgstr "byla [%s] jau naudota toje pačioje laikmenoje \"%s\""
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "negaliu įrašyti \"%s\" sąrašo bylos"
-
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "nieko neįrašyta į \"%s\" sąrašo bylą"
diff --git a/po/lv.po b/po/lv.po
index cc3f3ab9..64199444 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\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"
@@ -91,14 +91,7 @@ msgstr "At_celt"
msgid "Choose location to save file"
msgstr "Izvēlieties failu"
-#: ../gurpmi.pm:80
-#, fuzzy, c-format
-msgid "Unknown option %s"
-msgstr ""
-"\n"
-"nezināmas opcijas '%s'\n"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Saglabāt pakotņu izvēli"
@@ -207,12 +200,12 @@ msgstr "Sagatavoju..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Instalēju pakotnes..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Lūdzu ielieciet datu nesēju \"%s\" ierīcē [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, fuzzy, c-format
msgid "Downloading package `%s'..."
msgstr "Instalēju pakotnes..."
@@ -403,6 +396,16 @@ msgstr ""
msgid "Copying failed"
msgstr "Neveiksmīga Pieteikšanās"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "datu nesējs \"%s\" nav izvēlēts"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "nav iespējams nolasīt rpm failu [%s] no datu nesēja \"%s\""
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -709,7 +712,12 @@ msgstr "Vai mēģināt instalēt bez atkarību pārbaudes? (j/N) "
msgid "Try harder to install (--force)? (y/N) "
msgstr "Vai mēģināt instalēt vēl uzstājīgāk (--force)? (j/N) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -724,11 +732,6 @@ msgstr[0] "Instalēšana neizdevās"
msgstr[1] "Instalēšana neizdevās"
msgstr[2] "Instalēšana neizdevās"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Instalēšana ir iespējama"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -754,6 +757,11 @@ msgstr "viss jau ir instalēts"
msgid "Packages %s can not be installed"
msgstr "viss jau ir instalēts"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Instalēšana ir iespējama"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -788,29 +796,9 @@ msgstr "mēģināts izvēlēties neeksistējošu datu nesēju \"%s\""
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "pārāk daudz montēšanas punktu noņemamajam datu nesējam \"%s\""
-
-#: ../urpm/media.pm:410
-#, fuzzy, c-format
-msgid "taking removable device as \"%s\""
-msgstr "Atvienojama ierīce"
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+msgid "failed to migrate removable device, ignoring media"
msgstr ""
-#: ../urpm/media.pm:416
-#, fuzzy, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "lietoju citu noņemamo ierīci [%s] priekš \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "pārāk daudz montēšanas punktu noņemamajam datu nesējam \"%s\""
-
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
msgid "wrote config file [%s]"
@@ -868,12 +856,7 @@ msgstr "problēma nolasot datu nesēja \"%s\" synthesis failu"
msgid "adding medium \"%s\""
msgstr "noņemu datu nesēju \"%s\""
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "nav iespējams piekļūt pirmajam instalācijas datu nesējam"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -988,15 +971,7 @@ msgstr "eksaminēju hdlist failu [%s]"
msgid "comparing %s and %s"
msgstr "tiek instalēta %s\n"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "netika atrasts hdlist fails priekš datu nesēja \"%s\""
@@ -1163,36 +1138,21 @@ msgstr "eksaminēju hdlist failu [%s]"
msgid "unable to use parallel option \"%s\""
msgstr "nav iespējams lietot paralēlo opciju \"%s\""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "nav iespējams piekļūt datu nesējam \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "montēju %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "atmontēju %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "datu nesējs \"%s\" nav izvēlēts"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "nav iespējams nolasīt rpm failu [%s] no datu nesēja \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr ""
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "nav iespējams piekļūt datu nesējam \"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, fuzzy, c-format
msgid ""
@@ -2229,7 +2189,12 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2237,12 +2202,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Nospiediet Enter, kad gatavs..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Atcelt"
@@ -2263,7 +2223,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2379,12 +2339,7 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, fuzzy, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -v - runīgais režīms.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - klusais režīms.\n"
@@ -2800,20 +2755,30 @@ msgstr " --help - izvadīt šo palīdzības ziņojumu.\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - drukāt iezīmi: konflikti (vairākas rindiņas)."
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - drukāt iezīmi: nodrošina (vairākas rindiņas)."
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - drukāt iezīmi: nepieciešamas (vairākas rindiņas)."
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --group - drukāt iezīmi: grupa."
-#: ../urpmq:83
+#: ../urpmq:85
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - drukāt iezīmi: kopsavilkums."
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -2903,7 +2868,12 @@ msgstr ""
msgid "--list-nodes can only be used with --parallel"
msgstr "--synthesis nevar tikt lietots ar --media, --update vai --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "nevaru ierakstīt \"%s\" saraksta failu"
+
+#: ../urpmq:363
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -2931,6 +2901,38 @@ msgid "No changelog found\n"
msgstr "Cietņi netika atrasti"
#, fuzzy
+#~ msgid "Unknown option %s"
+#~ msgstr ""
+#~ "\n"
+#~ "nezināmas opcijas '%s'\n"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "pārāk daudz montēšanas punktu noņemamajam datu nesējam \"%s\""
+
+#, fuzzy
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "Atvienojama ierīce"
+
+#, fuzzy
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "lietoju citu noņemamo ierīci [%s] priekš \"%s\""
+
+#, fuzzy
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "pārāk daudz montēšanas punktu noņemamajam datu nesējam \"%s\""
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "nav iespējams piekļūt pirmajam instalācijas datu nesējam"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Nospiediet Enter, kad gatavs..."
+
+#, fuzzy
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -v - runīgais režīms.\n"
+
+#, fuzzy
#~ msgid "virtual medium needs to be local"
#~ msgstr ""
#~ "Datu nesējs \"%s\" mēģina lietot jau pielietotu sarakstu, datu nesējs "
@@ -3148,9 +3150,6 @@ msgstr "Cietņi netika atrasti"
#~ msgid "file [%s] already used in the same medium \"%s\""
#~ msgstr "fails [%s] jau tiek lietots tai pašā datu nesējā \"%s\""
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "nevaru ierakstīt \"%s\" saraksta failu"
-
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "saraksta fails priekš \"%s\" ir tukšs"
diff --git a/po/mk.po b/po/mk.po
index 70e7271d..0ca3fd3b 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-mk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2005-07-18 01:58+0200\n"
"Last-Translator: Зоран Димовски <decata@mt.net.mk>\n"
"Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
@@ -106,14 +106,7 @@ msgstr "_Откажи"
msgid "Choose location to save file"
msgstr "Изберете локација за зачувување на датотека"
-#: ../gurpmi.pm:80
-#, fuzzy, c-format
-msgid "Unknown option %s"
-msgstr ""
-"\n"
-"непознати опции '%s'\n"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, fuzzy, c-format
msgid "No packages specified"
msgstr "нема пакет именуван како %s"
@@ -227,12 +220,12 @@ msgstr "Се подготвувам..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Инсталирам пакет `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Ве молиме внесете го медиумот именуван како \"%s\" во уредот [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Го преземам пакетот `%s'..."
@@ -424,6 +417,16 @@ msgstr ""
msgid "Copying failed"
msgstr "Копирањето не успеа"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "не е избран медиумот \"%s\""
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "не можам да ја прочитам rpm датотеката [%s] од медиумот \"%s\""
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -732,7 +735,12 @@ msgstr "Обидете се со инсталација без проверка
msgid "Try harder to install (--force)? (y/N) "
msgstr "Обидете се инсталација дури уште посилно (--force)? (y/N) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -746,11 +754,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "%d неуспешни трансакциии на инсталацијата"
msgstr[1] "%d неуспешни трансакциии на инсталацијата"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Возможна е инсталација"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -776,6 +779,11 @@ msgstr "Се е веќе инсталирано"
msgid "Packages %s can not be installed"
msgstr "Се е веќе инсталирано"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Возможна е инсталација"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -811,29 +819,8 @@ msgstr "се обидувам да го заобиколам медиумот \"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "премногу монтирани точки за отстранливиот медиум \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "отстранливите уреди се земаат како \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "Медиумот \"%s\" е ISO слика, веднаш ќе се монтира"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "употребувам различни отстранливи уреди [%s] за \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+msgid "failed to migrate removable device, ignoring media"
msgstr ""
-"не можам да го преземам името на патеката за отстранливиот медиум \"%s\""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -895,12 +882,7 @@ msgstr "ги читам заглавјата од медиумот \"%s\""
msgid "adding medium \"%s\""
msgstr "го отстранувам медиумот \"%s\""
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "не можам да пристапам до првиот медиум за инсталација"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -1017,18 +999,7 @@ msgstr "ја испитувам датотеката hdlist [%s]"
msgid "comparing %s and %s"
msgstr "инсталирање на %s од %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"не можам да пристапам на медиумот \"%s\",\n"
-"ова може да се случи ако рачно сте го монтирале директориумот при создавање "
-"на медиумот."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "не е пронајдена hdlist датотека за медиумот \"%s\""
@@ -1195,36 +1166,21 @@ msgstr "пронајден е паралелен управувач за точ
msgid "unable to use parallel option \"%s\""
msgstr "не можам да ја употребам паралелната опција \"%s\""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "не можам да пристапам на медиумот \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "монтирам %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "одмонтирам %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "не е избран медиумот \"%s\""
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "не можам да ја прочитам rpm датотеката [%s] од медиумот \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "нејасен медиум \"%s\" означен како отстранлив но всушност не"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "не можам да пристапам на медиумот \"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, fuzzy, c-format
msgid ""
@@ -2347,19 +2303,19 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Притиснете Ентер кога сте подготвени..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Откажи"
@@ -2380,7 +2336,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2502,12 +2458,7 @@ msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
" --raw - додава медиум во конфигурацијата, но не го ажурира.\n"
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - исчисти го кеш директориумот за заглавја.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - тивок режим.\n"
@@ -2933,22 +2884,34 @@ msgstr " --changelog - испишува измени во евиденциј
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - го испишува тагот на конфликти: сите конфликти.\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr ""
" --provides - го испишува тагот што всушност инсталира пакетот: сите за "
"инсталирање.\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr ""
+" --requires - го испишува тагот што всушност му е потребно на пакетот "
+"што ќе се инсталира: сите што се потребни.\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - го испишува тагот на изворниот rpm: изворен rpm.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - испишува резиме.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -3048,7 +3011,12 @@ msgstr " потребни се имиња или rpm датотеки даде
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes може да се употребува само со --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "не можам да запишам датотека со листа на \"%s\""
+
+#: ../urpmq:363
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3083,6 +3051,50 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Не е пронајдена измена на евиденцијата\n"
+#, fuzzy
+#~ msgid "Unknown option %s"
+#~ msgstr ""
+#~ "\n"
+#~ "непознати опции '%s'\n"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "премногу монтирани точки за отстранливиот медиум \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "отстранливите уреди се земаат како \"%s\""
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "Медиумот \"%s\" е ISO слика, веднаш ќе се монтира"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "употребувам различни отстранливи уреди [%s] за \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr ""
+#~ "не можам да го преземам името на патеката за отстранливиот медиум \"%s\""
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "не можам да пристапам до првиот медиум за инсталација"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "не можам да пристапам на медиумот \"%s\",\n"
+#~ "ова може да се случи ако рачно сте го монтирале директориумот при "
+#~ "создавање на медиумот."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "нејасен медиум \"%s\" означен како отстранлив но всушност не"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Притиснете Ентер кога сте подготвени..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - исчисти го кеш директориумот за заглавја.\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "виртуелниот медиум мора да е локален"
@@ -3332,9 +3344,6 @@ msgstr "Не е пронајдена измена на евиденцијата\
#~ msgid "file [%s] already used in the same medium \"%s\""
#~ msgstr "датотеката [%s] веќе се користи во истиот медиум \"%s\""
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "не можам да запишам датотека со листа на \"%s\""
-
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "ништо не е запишано во датотеката со листа за \"%s\""
diff --git a/po/mn.po b/po/mn.po
index a1a8bb87..d9332223 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2003-08-22 19:38+0200\n"
"Last-Translator: Khurelbaatar Lkhagvasuren <hujii247@yahoo.com>\n"
"Language-Team: Mongolian <openmn-core@lists.sourceforge.net>\n"
@@ -86,14 +86,7 @@ msgstr "_Хүчингүй"
msgid "Choose location to save file"
msgstr ""
-#: ../gurpmi.pm:80
-#, fuzzy, c-format
-msgid "Unknown option %s"
-msgstr ""
-"\n"
-"үл мэдэгдэх сонголтууд '%s'\n"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Тухайлсан тушаал алга"
@@ -198,12 +191,12 @@ msgstr "Бэлдэж байна..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "`%s' (%s/%s) багцийг суулгаж байна..."
-#: ../gurpmi2:260 ../urpmi:620
+#: ../gurpmi2:264 ../urpmi:622
#, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+msgid "Please insert the medium named \"%s\""
msgstr "с с"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "`%s' багцыг татан авч байна..."
@@ -393,6 +386,16 @@ msgstr ""
msgid "Copying failed"
msgstr "Хуулалт бүтэлгүйтэв"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "с бол"
+
+#: ../urpm/cdrom.pm:206
+#, fuzzy, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "[%s] rpm файл руу хандаж болсонгүй"
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -699,7 +702,12 @@ msgstr "Хамаарлыг шалгахгүйгээр суулгахыг оро
msgid "Try harder to install (--force)? (y/N) "
msgstr "Reyna т N "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -713,11 +721,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "Суулгалт боломжтой"
msgstr[1] "Суулгалт боломжтой"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Суулгалт боломжтой"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -743,6 +746,11 @@ msgstr "Бүх зүйл хэдийн суусан байна"
msgid "Packages %s can not be installed"
msgstr "Бүх зүйл хэдийн суусан байна"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Суулгалт боломжтой"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -774,30 +782,10 @@ msgid "trying to override existing medium \"%s\", skipping"
msgstr "с"
#: ../urpm/media.pm:409
-#, fuzzy, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "Цэг с"
-
-#: ../urpm/media.pm:410
-#, fuzzy, c-format
-msgid "taking removable device as \"%s\""
-msgstr "с"
-
-#: ../urpm/media.pm:413
#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+msgid "failed to migrate removable device, ignoring media"
msgstr ""
-#: ../urpm/media.pm:416
-#, fuzzy, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "с с"
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "с"
-
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, fuzzy, c-format
msgid "wrote config file [%s]"
@@ -855,12 +843,7 @@ msgstr "с"
msgid "adding medium \"%s\""
msgstr "%s багцийг устгалт"
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "[%s] rpm файл руу хандаж болсонгүй"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -975,15 +958,7 @@ msgstr "hdlist [%s]-ийг байгуулж байна"
msgid "comparing %s and %s"
msgstr "%s-ийг суулгаж байна\n"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "[%s]-ээс ямар нэг rpm олдсонгүй"
@@ -1150,36 +1125,21 @@ msgstr "ямх с"
msgid "unable to use parallel option \"%s\""
msgstr "%s багцийг устгаж болсонгүй"
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "[%s] rpm файл руу хандаж болсонгүй"
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, fuzzy, c-format
msgid "mounting %s"
msgstr "%s-ийг салгаж байна"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "%s-ийг салгаж байна"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "с бол"
-
-#: ../urpm/removable.pm:143
-#, fuzzy, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "[%s] rpm файл руу хандаж болсонгүй"
-
-#: ../urpm/removable.pm:151
-#, fuzzy, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "с"
-
-#: ../urpm/removable.pm:163
-#, fuzzy, c-format
-msgid "unable to access medium \"%s\""
-msgstr "[%s] rpm файл руу хандаж болсонгүй"
-
#: ../urpm/search.pm:29 ../urpmf:29
#, fuzzy, c-format
msgid ""
@@ -2203,19 +2163,19 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Бэлэн болонгуут Enter товчоо дарна уу..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Хүчингүй"
@@ -2236,7 +2196,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2339,12 +2299,7 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - түр санах ойн хавтасын толгойг цэвэрлэх.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, fuzzy, c-format
msgid " -q - quiet mode.\n"
msgstr " --all - бүх тагуудыг хэвлэх.\n"
@@ -2753,21 +2708,31 @@ msgstr " --all - бүх тагуудыг хэвлэх.\n"
#: ../urpmq:81
#, fuzzy, c-format
-msgid " --provides - print provides.\n"
+msgid " --conflicts - print conflicts.\n"
msgstr " --all - бүх тагуудыг хэвлэх.\n"
#: ../urpmq:82
#, fuzzy, c-format
-msgid " --sourcerpm - print sourcerpm.\n"
+msgid " --provides - print provides.\n"
msgstr " --all - бүх тагуудыг хэвлэх.\n"
#: ../urpmq:83
#, fuzzy, c-format
-msgid " --summary, -S - print summary.\n"
+msgid " --requires - print requires.\n"
+msgstr " --all - бүх тагуудыг хэвлэх.\n"
+
+#: ../urpmq:84
+#, fuzzy, c-format
+msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --all - бүх тагуудыг хэвлэх.\n"
#: ../urpmq:85
#, fuzzy, c-format
+msgid " --summary, -S - print summary.\n"
+msgstr " --all - бүх тагуудыг хэвлэх.\n"
+
+#: ../urpmq:87
+#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
" - query package dependencies.\n"
@@ -2855,7 +2820,12 @@ msgstr "Нээх"
msgid "--list-nodes can only be used with --parallel"
msgstr "жигсаалт"
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "[%s] тохируулгын файлыг бичиж болсонгүй"
+
+#: ../urpmq:363
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -2883,6 +2853,42 @@ msgid "No changelog found\n"
msgstr "Зураг олдсонгүй"
#, fuzzy
+#~ msgid "Unknown option %s"
+#~ msgstr ""
+#~ "\n"
+#~ "үл мэдэгдэх сонголтууд '%s'\n"
+
+#, fuzzy
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "Цэг с"
+
+#, fuzzy
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "с"
+
+#, fuzzy
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "с с"
+
+#, fuzzy
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "с"
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "[%s] rpm файл руу хандаж болсонгүй"
+
+#, fuzzy
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "с"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Бэлэн болонгуут Enter товчоо дарна уу..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - түр санах ойн хавтасын толгойг цэвэрлэх.\n"
+
+#, fuzzy
#~ msgid "virtual medium needs to be local"
#~ msgstr "с жигсаалт"
@@ -3114,10 +3120,6 @@ msgstr "Зураг олдсонгүй"
#~ msgstr "с ямх с"
#, fuzzy
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "[%s] тохируулгын файлыг бичиж болсонгүй"
-
-#, fuzzy
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "юу ч үгүй ямх жигсаалт с"
diff --git a/po/ms.po b/po/ms.po
index 80d26a46..3ee7ff84 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2008-02-26 18:30+0800\n"
"Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
"Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -18,8 +18,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../gurpmi:30
-#: ../gurpmi2:65
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "Pemasangan RPM"
@@ -29,9 +28,7 @@ msgstr "Pemasangan RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45
-#: ../gurpmi2:152
-#: ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -43,13 +40,13 @@ msgid ""
"\n"
"%s\n"
"\n"
-"You probably didn't want to install it on your computer (installing it would allow you to make modifications to its sourcecode then compile it).\n"
+"You probably didn't want to install it on your computer (installing it would "
+"allow you to make modifications to its sourcecode then compile it).\n"
"\n"
"What would you like to do?"
msgstr ""
-#: ../gurpmi:73
-#: ../gurpmi:84
+#: ../gurpmi:73 ../gurpmi:84
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -84,8 +81,7 @@ msgstr "_Pasang"
msgid "_Save"
msgstr "_Simpan"
-#: ../gurpmi:99
-#: ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:152
#, c-format
msgid "_Cancel"
msgstr "_Batal"
@@ -95,12 +91,7 @@ msgstr "_Batal"
msgid "Choose location to save file"
msgstr "Pilih lokasi untuk menyimpan fail"
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "Pilihan tidak diketahui %s"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "Tiada pakej dinyatakan"
@@ -128,8 +119,7 @@ msgstr "semua telah diinstal"
msgid "Warning"
msgstr "Amaran"
-#: ../gurpmi2:114
-#: ../urpmi:626
+#: ../gurpmi2:114 ../urpmi:626
#, c-format
msgid "Ok"
msgstr "Ok"
@@ -170,16 +160,16 @@ msgstr ""
"%s\n"
"Teruskan?"
-#: ../gurpmi2:215
-#: ../urpmi:592
+#: ../gurpmi2:215 ../urpmi:592
#, fuzzy, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
msgstr "Pakej berikut akan dihapus agar syarat kebergantungan dipenuhi (%d MB)"
-#: ../gurpmi2:216
-#: ../urpmi:593
+#: ../gurpmi2:216 ../urpmi:593
#, fuzzy, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
"Untuk memenuhi kebergantungan, %d pakej berikut perlu dipasang:\n"
"%s\n"
@@ -196,14 +186,12 @@ msgstr[1] ""
msgid "Package installation..."
msgstr "Pemasangan pakej..."
-#: ../gurpmi2:226
-#: ../urpm/main_loop.pm:48
+#: ../gurpmi2:226 ../urpm/main_loop.pm:48
#, c-format
msgid "unable to get source packages, aborting"
msgstr "tidak dapat mengambil pakej asal, batal"
-#: ../gurpmi2:240
-#: ../urpm/install.pm:81
+#: ../gurpmi2:240 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Menyediakan..."
@@ -213,13 +201,12 @@ msgstr "Menyediakan..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Install pakej `%s' (%s/%s)..."
-#: ../gurpmi2:260
-#: ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Masukkan media \"%s\" ke peranti [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Memuatturun pakej `%s'..."
@@ -229,8 +216,7 @@ msgstr "Memuatturun pakej `%s'..."
msgid "_Done"
msgstr "_Selesai"
-#: ../gurpmi2:296
-#: ../urpm/main_loop.pm:258
+#: ../gurpmi2:296 ../urpm/main_loop.pm:258
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -238,9 +224,7 @@ msgid ""
"You may want to update your urpmi database"
msgstr ""
-#: ../gurpmi2:302
-#: ../urpm/main_loop.pm:196
-#: ../urpm/main_loop.pm:214
+#: ../gurpmi2:302 ../urpm/main_loop.pm:196 ../urpm/main_loop.pm:214
#: ../urpm/main_loop.pm:232
#, fuzzy, c-format
msgid "Installation failed:"
@@ -256,8 +240,7 @@ msgstr "semua telah diinstal"
msgid "Installation finished"
msgstr "Pemasangan selesai"
-#: ../gurpmi2:310
-#: ../urpme:132
+#: ../gurpmi2:310 ../urpme:132
#, c-format
msgid "removing %s"
msgstr "membuang %s"
@@ -282,7 +265,8 @@ msgstr " --root <path> - guna root yang diberi selain dari /\n"
#: ../rpm-find-leaves:18
#, c-format
msgid " -g [group] - restrict results to specified group.\n"
-msgstr " -g [kumpulan] - hadkan keputusan kepada kumpulan yang diberikan.\n"
+msgstr ""
+" -g [kumpulan] - hadkan keputusan kepada kumpulan yang diberikan.\n"
#: ../rpm-find-leaves:19
#, c-format
@@ -294,8 +278,7 @@ msgstr " default adalah %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - cetak versi, keluaran dan arch dgn nama.\n"
-#: ../rurpmi:11
-#: ../urpmi:269
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Hanya superuser yang boleh menginstal pakej"
@@ -330,18 +313,13 @@ msgstr "nama fail rpm [%s] tidak sah"
msgid "retrieving rpm file [%s] ..."
msgstr "mengambil fail rpm [%s] ..."
-#: ../urpm.pm:232
-#: ../urpm/get_pkgs.pm:160
+#: ../urpm.pm:232 ../urpm/get_pkgs.pm:160
#, c-format
msgid "...retrieving done"
msgstr "...capaian selesai"
-#: ../urpm.pm:235
-#: ../urpm/download.pm:691
-#: ../urpm/get_pkgs.pm:162
-#: ../urpm/media.pm:771
-#: ../urpm/media.pm:1199
-#: ../urpm/media.pm:1375
+#: ../urpm.pm:235 ../urpm/download.pm:691 ../urpm/get_pkgs.pm:162
+#: ../urpm/media.pm:771 ../urpm/media.pm:1199 ../urpm/media.pm:1375
#, c-format
msgid "...retrieving failed: %s"
msgstr "...gagal terambil: %s"
@@ -376,8 +354,7 @@ msgstr "ralat pendaftaran pakej setempat"
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:130
-#: ../urpm/args.pm:139
+#: ../urpm/args.pm:130 ../urpm/args.pm:139
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr ""
@@ -402,8 +379,7 @@ msgstr ""
msgid "Can't use %s without %s"
msgstr "Tutup Tanpa Simpan"
-#: ../urpm/args.pm:441
-#: ../urpm/args.pm:444
+#: ../urpm/args.pm:441 ../urpm/args.pm:444
#, fuzzy, c-format
msgid "Can't use %s with %s"
msgstr "Aksara (dengan ruang):"
@@ -413,12 +389,21 @@ msgstr "Aksara (dengan ruang):"
msgid "Too many arguments\n"
msgstr "Main pelbagai jenis permainan solitaire"
-#: ../urpm/bug_report.pm:48
-#: ../urpmi:247
+#: ../urpm/bug_report.pm:48 ../urpmi:247
#, fuzzy, c-format
msgid "Copying failed"
msgstr "Sambungan Gagal"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "Fail %s adalah jenis tidak disokong pada masa ini"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "gagal baca fail rpm [%s] dari media \"%s\""
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -434,9 +419,7 @@ msgstr "gagal tulis fail konfigurasi [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:250
-#: ../urpm/media.pm:450
-#: ../urpm/media.pm:456
+#: ../urpm/cfg.pm:250 ../urpm/media.pm:450 ../urpm/media.pm:456
#, c-format
msgid "unable to write config file [%s]"
msgstr "gagal tulis fail konfigurasi [%s]"
@@ -588,7 +571,8 @@ msgstr ""
#: ../urpm/install.pm:154
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
#: ../urpm/install.pm:157
@@ -611,8 +595,7 @@ msgstr "tidak dapat memasang pakej %s"
msgid "removing bad rpm (%s) from %s"
msgstr "Tapisan From:"
-#: ../urpm/install.pm:197
-#: ../urpm/install.pm:254
+#: ../urpm/install.pm:197 ../urpm/install.pm:254
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "Sambungan Gagal"
@@ -657,8 +640,7 @@ msgstr ""
msgid "No base defined"
msgstr "Gaya ditakrif pengguna"
-#: ../urpm/ldap.pm:172
-#: ../urpm/ldap.pm:175
+#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
#, c-format
msgid "Cannot connect to ldap uri:"
msgstr ""
@@ -699,9 +681,7 @@ msgstr ""
msgid "Do you want to continue installation ?"
msgstr "Adakah anda pasti untuk menggantung ke cakera?"
-#: ../urpm/main_loop.pm:125
-#: ../urpm/main_loop.pm:203
-#: ../urpm/main_loop.pm:221
+#: ../urpm/main_loop.pm:125 ../urpm/main_loop.pm:203 ../urpm/main_loop.pm:221
#, c-format
msgid "Installation failed"
msgstr "Instalasi gagal"
@@ -736,7 +716,12 @@ msgstr "Cuba instalasi tanpa periksa kebergantungan? (y/T) "
msgid "Try harder to install (--force)? (y/N) "
msgstr "Cuba instalasi lebih keras (--force)? (y/T) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -750,11 +735,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "Pemasangan sekecil mungkin"
msgstr[1] "Gagal menerima %s: %s"
-#: ../urpm/main_loop.pm:281
-#, fuzzy, c-format
-msgid "Installation is possible"
-msgstr "Pemasangan sekecil mungkin"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -780,6 +760,11 @@ msgstr "semua telah diinstal"
msgid "Packages %s can not be installed"
msgstr "semua telah diinstal"
+#: ../urpm/main_loop.pm:307
+#, fuzzy, c-format
+msgid "Installation is possible"
+msgstr "Pemasangan sekecil mungkin"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -812,32 +797,10 @@ msgstr "mencuba untuk mengatasi media sedia ada \"%s\", melangkau"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "terlalu banyak titik sambung utk media removable \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "ambil peranti removable sbg \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+msgid "failed to migrate removable device, ignoring media"
msgstr ""
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "pakai removable peranti lain [%s] untuk \"%s\""
-
-#: ../urpm/media.pm:421
-#: ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "tidak dapat mengambil nama path utk media removable \"%s\""
-
-#: ../urpm/media.pm:452
-#: ../urpm/media.pm:458
+#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
msgid "wrote config file [%s]"
msgstr "tulis fail konfigurasi [%s]"
@@ -854,7 +817,9 @@ msgstr ""
#: ../urpm/media.pm:525
#, c-format
-msgid "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --update, --use-distrib or --parallel"
+msgid ""
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update, --use-distrib or --parallel"
msgstr ""
#: ../urpm/media.pm:612
@@ -892,12 +857,7 @@ msgstr "membaca pengepala dari media \"%s\""
msgid "adding medium \"%s\""
msgstr "Medium Boleh Buang Terlekap"
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "gagal mengakses media instalasi pertama"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -967,15 +927,12 @@ msgstr "periksa file sintesis [%s]"
msgid "problem reading synthesis file of medium \"%s\""
msgstr "masalah membaca fail sintesis untuk media \"%s\""
-#: ../urpm/media.pm:1088
-#: ../urpm/media.pm:1171
+#: ../urpm/media.pm:1088 ../urpm/media.pm:1171
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "Medium Boleh Buang Terlekap"
-#: ../urpm/media.pm:1090
-#: ../urpm/media.pm:1145
-#: ../urpm/media.pm:1391
+#: ../urpm/media.pm:1090 ../urpm/media.pm:1145 ../urpm/media.pm:1391
#, c-format
msgid "...copying failed"
msgstr "...gagal menyalin"
@@ -985,8 +942,7 @@ msgstr "...gagal menyalin"
msgid "copying description file of \"%s\"..."
msgstr "fail deskripsi \"%s\" sedang disalin"
-#: ../urpm/media.pm:1143
-#: ../urpm/media.pm:1175
+#: ../urpm/media.pm:1143 ../urpm/media.pm:1175
#, c-format
msgid "...copying done"
msgstr "...salin selesai"
@@ -1001,8 +957,7 @@ msgstr "salinan [%s] gagal (md5sum tidak sepadan)"
msgid "computing md5sum of retrieved source synthesis"
msgstr "mengira md5sum salinan sumber hdlist (atau sintesis)"
-#: ../urpm/media.pm:1212
-#: ../urpm/media.pm:1629
+#: ../urpm/media.pm:1212 ../urpm/media.pm:1629
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "salinan [%s] gagal (md5sum tidak sepadan)"
@@ -1017,14 +972,7 @@ msgstr "dikemaskini pada %(date)s"
msgid "comparing %s and %s"
msgstr "&Pengepala dan Footer"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the medium."
-msgstr ""
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "fail hdlist utk media \"%s\" tak dijumpai"
@@ -1044,8 +992,7 @@ msgstr "Fail Sumber 'Ada' (nama perisian)"
msgid "found probed synthesis as %s"
msgstr "menjumpai hdlist dikesan (atau sintesis) seperti %s"
-#: ../urpm/media.pm:1374
-#: ../urpm/media.pm:1482
+#: ../urpm/media.pm:1374 ../urpm/media.pm:1482
#, fuzzy, c-format
msgid "no synthesis file found for medium \"%s\""
msgstr "fail hdlist utk media \"%s\" tak dijumpai"
@@ -1095,24 +1042,14 @@ msgstr ""
msgid "getting mirror list from %s"
msgstr "Pilih dokumen dari senarai:"
-#: ../urpm/msg.pm:62
-#: ../urpmi:506
-#: ../urpmi:522
-#: ../urpmi:611
+#: ../urpm/msg.pm:62 ../urpmi:506 ../urpmi:522 ../urpmi:611
#, c-format
msgid "Nn"
msgstr "NnTt"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63
-#: ../urpme:37
-#: ../urpmi:507
-#: ../urpmi:523
-#: ../urpmi:562
-#: ../urpmi:612
-#: ../urpmi:642
-#: ../urpmi:648
-#: ../urpmi.addmedia:139
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:507 ../urpmi:523 ../urpmi:562
+#: ../urpmi:612 ../urpmi:642 ../urpmi:648 ../urpmi.addmedia:139
#, c-format
msgid "Yy"
msgstr "Yy"
@@ -1177,8 +1114,7 @@ msgstr ""
msgid "GB"
msgstr ""
-#: ../urpm/msg.pm:189
-#: ../urpm/msg.pm:198
+#: ../urpm/msg.pm:189 ../urpm/msg.pm:198
#, c-format
msgid "TB"
msgstr ""
@@ -1203,45 +1139,28 @@ msgstr "memeriksa parallel handler dalam fail [%s]"
msgid "unable to use parallel option \"%s\""
msgstr "tidak dapat menggunakan pilihan parallel \"%s\""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "gagal akses media \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "mounting %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "unmount %s"
-#: ../urpm/removable.pm:112
-#: ../urpm/removable.pm:117
-#: ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "Fail %s adalah jenis tidak disokong pada masa ini"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "gagal baca fail rpm [%s] dari media \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "media ketidaksinambungan \"%s\" bertanda removable, seharusnya tidak"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "gagal akses media \"%s\""
-
-#: ../urpm/search.pm:29
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
#, fuzzy, c-format
msgid ""
"urpmf version %s\n"
"Copyright (C) 2002-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
"\n"
"usage: urpmf [options] pattern-expression\n"
msgstr ""
@@ -1251,367 +1170,288 @@ msgstr ""
"\n"
"penggunaan:\n"
-#: ../urpm/search.pm:35
-#: ../urpme:45
-#: ../urpmf:35
-#: ../urpmi:74
-#: ../urpmi.addmedia:54
-#: ../urpmi.recover:33
-#: ../urpmi.removemedia:40
-#: ../urpmi.update:32
-#: ../urpmq:45
+#: ../urpm/search.pm:35 ../urpme:45 ../urpmf:35 ../urpmi:74
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - cetak mesej bantuan ini.\n"
-#: ../urpm/search.pm:36
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
msgstr " --version - cetak nombor versi alatan ini.\n"
-#: ../urpm/search.pm:37
-#: ../urpmf:37
-#: ../urpmi:131
-#: ../urpmq:79
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:131 ../urpmq:79
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
-#: ../urpm/search.pm:38
-#: ../urpmf:38
-#: ../urpmi:76
-#: ../urpmq:49
+#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:76 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
-#: ../urpm/search.pm:39
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
#, c-format
-msgid " --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpm/search.pm:40
-#: ../urpme:52
-#: ../urpmf:40
-#: ../urpmi:111
-#: ../urpmi.addmedia:69
-#: ../urpmi.recover:36
-#: ../urpmi.removemedia:46
-#: ../urpmi.update:46
-#: ../urpmq:69
+#: ../urpm/search.pm:40 ../urpme:52 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:69 ../urpmi.recover:36 ../urpmi.removemedia:46
+#: ../urpmi.update:46 ../urpmq:69
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - guna root lain untuk membuang rpm.\n"
-#: ../urpm/search.pm:41
-#: ../urpmf:41
-#: ../urpmi:75
-#: ../urpmq:47
+#: ../urpm/search.pm:41 ../urpmf:41 ../urpmi:75 ../urpmq:47
#, fuzzy, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --update - guna hanya kemaskini media.\n"
-#: ../urpm/search.pm:42
-#: ../urpmf:42
-#: ../urpmi:79
-#: ../urpmq:50
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
-msgid " --sortmedia - sort media according to substrings separated by comma.\n"
+msgid ""
+" --sortmedia - sort media according to substrings separated by comma.\n"
msgstr ""
-#: ../urpm/search.pm:43
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
#, fuzzy, c-format
msgid " --use-distrib - use the given path to access media\n"
msgstr " --update - guna hanya kemaskini media.\n"
-#: ../urpm/search.pm:44
-#: ../urpmf:44
-#: ../urpmi:80
-#: ../urpmq:51
+#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:80 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
-#: ../urpm/search.pm:45
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
#, c-format
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - jangan cetak baris yang sama.\n"
-#: ../urpm/search.pm:46
-#: ../urpmf:46
-#: ../urpmi:77
-#: ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:77 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - guna hanya kemaskini media.\n"
-#: ../urpm/search.pm:47
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
#, c-format
msgid " --verbose - verbose mode.\n"
msgstr " --verbose - mod verbos.\n"
-#: ../urpm/search.pm:48
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
#, fuzzy, c-format
msgid " -i - ignore case distinctions in patterns.\n"
msgstr "-i --ignore-case Abai perbezaan case dalam kandungan fail."
-#: ../urpm/search.pm:49
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
#, fuzzy, c-format
msgid " -I - honor case distinctions in patterns (default).\n"
msgstr "-i --ignore-case Abai perbezaan case dalam kandungan fail."
-#: ../urpm/search.pm:50
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
#, c-format
msgid " -F<str> - change field separator (defaults to ':').\n"
msgstr ""
-#: ../urpm/search.pm:51
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
#, c-format
msgid "Pattern expressions:\n"
msgstr "Ungkapan corak:\n"
-#: ../urpm/search.pm:52
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
#, c-format
msgid " text - any text is parsed as a regexp, unless -l is used.\n"
msgstr ""
-#: ../urpm/search.pm:53
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
#, fuzzy, c-format
msgid " -e - include perl code directly as perl -e.\n"
msgstr " -c - bersihkan direktori kache header.\n"
-#: ../urpm/search.pm:54
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
#, c-format
msgid " -a - binary AND operator.\n"
msgstr " -a - operator binari AND.\n"
-#: ../urpm/search.pm:55
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
#, c-format
msgid " -o - binary OR operator.\n"
msgstr " -o - operator binari OR.\n"
-#: ../urpm/search.pm:56
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
#, c-format
msgid " ! - unary NOT.\n"
msgstr " ! - unari NOT.\n"
-#: ../urpm/search.pm:57
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
#, c-format
msgid " ( ) - left and right parentheses.\n"
msgstr " ( ) - kurungan kiri dan kanan.\n"
-#: ../urpm/search.pm:58
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
#, c-format
msgid "List of tags:\n"
msgstr "Senarai tag:\n"
-#: ../urpm/search.pm:59
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
#, c-format
msgid " --qf - specify a printf-like output format\n"
msgstr " --qf - nyatakan format keluaran seperti printf\n"
-#: ../urpm/search.pm:60
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
#, c-format
msgid " example: '%%name:%%files'\n"
msgstr " contoh: '%%name:%%files'\n"
-#: ../urpm/search.pm:61
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
#, fuzzy, c-format
msgid " --arch - architecture\n"
msgstr "Rekabentuk Sasaran:"
-#: ../urpm/search.pm:62
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
#, fuzzy, c-format
msgid " --buildhost - build host\n"
msgstr "%s %s pemasangan pada hos %s"
-#: ../urpm/search.pm:63
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
#, fuzzy, c-format
msgid " --buildtime - build time\n"
msgstr "Tarikh/masa bolehubah"
-#: ../urpm/search.pm:64
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
#, fuzzy, c-format
msgid " --conffiles - configuration files\n"
msgstr "Semua Fail Imej"
-#: ../urpm/search.pm:65
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
#, fuzzy, c-format
msgid " --conflicts - conflict tags\n"
msgstr "Lumpuhkan tag ID3V2"
-#: ../urpm/search.pm:66
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
#, fuzzy, c-format
msgid " --description - package description\n"
msgstr "Pelihat Pakej"
-#: ../urpm/search.pm:67
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
#, fuzzy, c-format
msgid " --distribution - distribution\n"
msgstr "Sumber edaran"
-#: ../urpm/search.pm:68
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
#, fuzzy, c-format
msgid " --epoch - epoch\n"
msgstr "Saat semenjak permulaan zaman"
-#: ../urpm/search.pm:69
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
#, fuzzy, c-format
msgid " --filename - filename of the package\n"
msgstr "Pelihat Pakej"
-#: ../urpm/search.pm:70
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
#, fuzzy, c-format
msgid " --files - list of files contained in the package\n"
msgstr "Cache Fail Pakej Jauh"
-#: ../urpm/search.pm:71
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
#, fuzzy, c-format
msgid " --group - group\n"
msgstr "Kumpulan"
-#: ../urpm/search.pm:72
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
#, fuzzy, c-format
msgid " --license - license\n"
msgstr "Nama Pakej"
-#: ../urpm/search.pm:73
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
#, fuzzy, c-format
msgid " --name - package name\n"
msgstr "Pelihat Pakej"
-#: ../urpm/search.pm:74
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
#, fuzzy, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr "Senarai tag:\n"
-#: ../urpm/search.pm:75
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
#, fuzzy, c-format
msgid " --packager - packager\n"
msgstr "Tidak dapat menulis tag!"
-#: ../urpm/search.pm:76
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
#, fuzzy, c-format
msgid " --provides - provides tags\n"
msgstr "Senarai tag:\n"
-#: ../urpm/search.pm:77
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
#, fuzzy, c-format
msgid " --requires - requires tags\n"
msgstr "Senarai tag:\n"
-#: ../urpm/search.pm:78
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr "% dari saiz normal"
-#: ../urpm/search.pm:79
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
#, fuzzy, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr "nama fail rpm [%s] tidak sah"
-#: ../urpm/search.pm:80
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
#, fuzzy, c-format
msgid " --suggests - suggests tags\n"
msgstr "Senarai tag:\n"
-#: ../urpm/search.pm:81
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
#, fuzzy, c-format
msgid " --summary - summary\n"
msgstr "Ringkasan"
-#: ../urpm/search.pm:82
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr "URL:"
-#: ../urpm/search.pm:83
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr "Vendor:"
-#: ../urpm/search.pm:84
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr "Cache Fail Pakej Jauh"
-#: ../urpm/search.pm:85
-#: ../urpmf:85
-#: ../urpmq:94
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:94
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - cetak versi, keluaran dan arch dgn nama.\n"
-#: ../urpm/search.pm:197
-#: ../urpmf:197
+#: ../urpm/search.pm:197 ../urpmf:197
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247
-#: ../urpmf:247
-#: ../urpmi:254
-#: ../urpmq:136
+#: ../urpm/search.pm:247 ../urpmf:247 ../urpmi:254 ../urpmq:136
#, fuzzy, c-format
msgid "using specific environment on %s\n"
msgstr "Buat partisyen pada pemacu spesifik (ondisk)"
-#: ../urpm/search.pm:290
-#: ../urpmf:290
+#: ../urpm/search.pm:290 ../urpmf:290
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "fail hdlist utk media \"%s\" tak dijumpai"
-#: ../urpm/search.pm:297
-#: ../urpmf:297
+#: ../urpm/search.pm:297 ../urpmf:297
#, fuzzy, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "bangunkan fail sintesis hdlist utk media \"%s\""
-#: ../urpm/search.pm:304
-#: ../urpmf:306
+#: ../urpm/search.pm:304 ../urpmf:306
#, fuzzy, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "menulis senarai fail untuk media \"%s\""
@@ -1623,7 +1463,8 @@ msgstr ""
#: ../urpm/select.pm:23
#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
#: ../urpm/select.pm:184
@@ -1631,14 +1472,12 @@ msgstr ""
msgid "No package named %s"
msgstr "Tiada pakej bernama %s"
-#: ../urpm/select.pm:186
-#: ../urpme:107
+#: ../urpm/select.pm:186 ../urpme:107
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Pakej berikut mengandungi %s: %s"
-#: ../urpm/select.pm:495
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:495 ../urpm/select.pm:538
#, c-format
msgid "due to missing %s"
msgstr "kerana kehilangan %s"
@@ -1648,8 +1487,7 @@ msgstr "kerana kehilangan %s"
msgid "due to already installed %s"
msgstr "semua telah diinstal"
-#: ../urpm/select.pm:497
-#: ../urpm/select.pm:536
+#: ../urpm/select.pm:497 ../urpm/select.pm:536
#, c-format
msgid "due to unsatisfied %s"
msgstr "kerana ketidakpuasan %s"
@@ -1709,7 +1547,8 @@ msgstr "Fail untuk menyimpan suntingan:"
msgid ""
"urpme version %s\n"
"Copyright (C) 1999-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
"\n"
"usage:\n"
msgstr ""
@@ -1729,22 +1568,18 @@ msgstr " -a - pilih semua yg sama dgn baris perintah.\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
-#: ../urpme:48
-#: ../urpmi:104
-#: ../urpmq:65
+#: ../urpme:48 ../urpmi:104 ../urpmq:65
#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
msgstr " --force - paksa instal meskipun beberapa pakej tiada.\n"
-#: ../urpme:49
-#: ../urpmi:109
-#: ../urpmq:67
+#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
-#: ../urpme:50
-#: ../urpmi:140
+#: ../urpme:50 ../urpmi:140
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr "Tidak dapat menulis tag!"
@@ -1766,9 +1601,7 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:56
-#: ../urpmi:151
-#: ../urpmq:84
+#: ../urpme:56 ../urpmi:151 ../urpmq:84
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr "M-x nxml-mode"
@@ -1793,8 +1626,7 @@ msgstr "pakej tidak diketahui"
msgid "unknown package"
msgstr "pakej tidak diketahui"
-#: ../urpme:113
-#: ../urpmi:536
+#: ../urpme:113 ../urpmi:536
#, c-format
msgid "removing package %s will break your system"
msgstr ""
@@ -1812,7 +1644,8 @@ msgstr "Memeriksa untuk membuang pakej berikut"
#: ../urpme:124
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural "To satisfy dependencies, the following %d packages will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
msgstr[0] ""
"Untuk memenuhi kebergantungan, %d pakej berikut perlu dipasang:\n"
"%s\n"
@@ -1827,10 +1660,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "Pelihat Pakej"
msgstr[1] "membuang pakej %s"
-#: ../urpme:128
-#: ../urpmi:563
-#: ../urpmi:643
-#: ../urpmi.addmedia:142
+#: ../urpme:128 ../urpmi:563 ../urpmi:643 ../urpmi.addmedia:142
#, c-format
msgid " (y/N) "
msgstr " (y/T) "
@@ -1845,7 +1675,8 @@ msgstr "Pembuangan gagal"
msgid ""
"urpmi version %s\n"
"Copyright (C) 1999-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
"\n"
"usage:\n"
msgstr ""
@@ -1857,18 +1688,21 @@ msgstr ""
#: ../urpmi:78
#, fuzzy, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
msgstr " --update - guna hanya kemaskini media.\n"
#: ../urpmi:81
#, c-format
-msgid " --auto - non-interactive mode, assume default answers to questions.\n"
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions.\n"
msgstr ""
-#: ../urpmi:82
-#: ../urpmq:52
+#: ../urpmi:82 ../urpmq:52
#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
msgstr ""
#: ../urpmi:83
@@ -1886,15 +1720,16 @@ msgstr ""
msgid " --force-key - force update of gpg key.\n"
msgstr ""
-#: ../urpmi:86
-#: ../urpmq:53
+#: ../urpmi:86 ../urpmq:53
#, fuzzy, c-format
msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
msgstr "Senarai tag:\n"
#: ../urpmi:87
#, c-format
-msgid " --no-uninstall - never ask to uninstall a package, abort the installation.\n"
+msgid ""
+" --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
msgstr ""
#: ../urpmi:88
@@ -1902,8 +1737,7 @@ msgstr ""
msgid " --no-install - don't install packages (only download)\n"
msgstr ""
-#: ../urpmi:89
-#: ../urpmq:55
+#: ../urpmi:89 ../urpmq:55
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1955,7 +1789,8 @@ msgstr " --update - guna hanya kemaskini media.\n"
#: ../urpmi:103
#, c-format
-msgid " --replacepkgs - force installing packages which are already installed.\n"
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
msgstr ""
#: ../urpmi:105
@@ -1972,8 +1807,7 @@ msgid ""
" dependencies checking and integrity.\n"
msgstr ""
-#: ../urpmi:110
-#: ../urpmq:68
+#: ../urpmi:110 ../urpmq:68
#, fuzzy, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - guna root lain untuk membuang rpm.\n"
@@ -2017,9 +1851,7 @@ msgstr ""
msgid " --aria2-options - additional options to pass to aria2\n"
msgstr ""
-#: ../urpmi:122
-#: ../urpmi.addmedia:58
-#: ../urpmi.update:36
+#: ../urpmi:122 ../urpmi.addmedia:58 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr ""
@@ -2031,20 +1863,14 @@ msgid ""
" (--no-resume disables it, default is disabled).\n"
msgstr ""
-#: ../urpmi:125
-#: ../urpmi.addmedia:59
-#: ../urpmi.update:37
-#: ../urpmq:75
+#: ../urpmi:125 ../urpmi.addmedia:59 ../urpmi.update:37 ../urpmq:75
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
" to be 1080 by default (format is <proxyhost[:port]>).\n"
msgstr ""
-#: ../urpmi:127
-#: ../urpmi.addmedia:61
-#: ../urpmi.update:39
-#: ../urpmq:77
+#: ../urpmi:127 ../urpmi.addmedia:61 ../urpmi.update:39 ../urpmq:77
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -2067,7 +1893,9 @@ msgstr ""
#: ../urpmi:134
#, c-format
-msgid " --test - only verify if the installation can be achieved correctly.\n"
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
msgstr ""
#: ../urpmi:135
@@ -2122,8 +1950,7 @@ msgstr " --noclean - jaga rpm tidak dipakai dalam kache.\n"
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:147
-#: ../urpmq:92
+#: ../urpmi:147 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - pilih semua yg sama dgn baris perintah.\n"
@@ -2172,12 +1999,15 @@ msgstr ""
#: ../urpmi:221
#, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
#: ../urpmi:241
#, c-format
-msgid "Directory [%s] already exists, please use another directory for bug report or delete it"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
msgstr ""
#: ../urpmi:242
@@ -2228,7 +2058,9 @@ msgstr "Akan Memasang"
#: ../urpmi:455
#, fuzzy, c-format
-msgid "In order to satisfy the '%s' dependency, one of the following packages is needed:"
+msgid ""
+"In order to satisfy the '%s' dependency, one of the following packages is "
+"needed:"
msgstr ""
"Untuk memenuhi kebergantungan, %d pakej berikut perlu dipasang:\n"
"%s\n"
@@ -2254,18 +2086,14 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:508
-#: ../urpmi:524
+#: ../urpmi:508 ../urpmi:524
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Pemasangan sekecil mungkin"
-#: ../urpmi:509
-#: ../urpmi:525
-#: ../urpmi:613
-#: ../urpmi.addmedia:142
+#: ../urpmi:509 ../urpmi:525 ../urpmi:613 ../urpmi.addmedia:142
#, c-format
msgid " (Y/n) "
msgstr " (Y/t) "
@@ -2334,7 +2162,8 @@ msgstr ""
#: ../urpmi:578
#, fuzzy, c-format
msgid ""
-"You must first call urpmi with --buildrequires to install the following dependencies:\n"
+"You must first call urpmi with --buildrequires to install the following "
+"dependencies:\n"
"%s\n"
msgstr ""
"Anda perlu menjadi root utk install kebergantungan berikutnya:\n"
@@ -2355,21 +2184,19 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:621
-#, fuzzy, c-format
-msgid "Press Enter when ready..."
-msgstr ""
-"Tekan <Enter> untuk mengulangbut sistem anda.\n"
-"\n"
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Batal"
@@ -2390,7 +2217,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2413,23 +2240,17 @@ msgstr ""
"\n"
"dan [pilihan] dari\n"
-#: ../urpmi.addmedia:55
-#: ../urpmi.update:33
-#: ../urpmq:72
+#: ../urpmi.addmedia:55 ../urpmi.update:33 ../urpmq:72
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - guna wget utk mengambil fail jauh.\n"
-#: ../urpmi.addmedia:56
-#: ../urpmi.update:34
-#: ../urpmq:73
+#: ../urpmi.addmedia:56 ../urpmi.update:34 ../urpmq:73
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - guna curl utk mengambil fail jauh.\n"
-#: ../urpmi.addmedia:57
-#: ../urpmi.update:35
-#: ../urpmq:74
+#: ../urpmi.addmedia:57 ../urpmi.update:35 ../urpmq:74
#, fuzzy, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --curl - guna curl utk mengambil fail jauh.\n"
@@ -2443,7 +2264,8 @@ msgstr " --update - buat media update.\n"
#, c-format
msgid ""
" --xml-info - use the specific policy for downloading xml info files\n"
-" one of: never, on-demand, update-only, always. cf urpmi.cfg(5)\n"
+" one of: never, on-demand, update-only, always. cf urpmi."
+"cfg(5)\n"
msgstr ""
#: ../urpmi.addmedia:66
@@ -2490,8 +2312,7 @@ msgstr ""
msgid " --virtual - create virtual media wich are always up-to-date.\n"
msgstr ""
-#: ../urpmi.addmedia:77
-#: ../urpmi.update:42
+#: ../urpmi.addmedia:77 ../urpmi.update:42
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr ""
@@ -2506,23 +2327,12 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:80
-#: ../urpmi.removemedia:42
-#: ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - bersihkan direktori kache header.\n"
-
-#: ../urpmi.addmedia:81
-#: ../urpmi.removemedia:44
-#: ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - mod diam.\n"
-#: ../urpmi.addmedia:82
-#: ../urpmi.removemedia:45
-#: ../urpmi.update:53
+#: ../urpmi.addmedia:82 ../urpmi.removemedia:45 ../urpmi.update:53
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - mod verbos.\n"
@@ -2589,7 +2399,8 @@ msgstr "Tambah sempadan dan legapan kepada pilihan"
msgid ""
"urpmi.recover version %s\n"
"Copyright (C) 2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
"\n"
"usage:\n"
msgstr ""
@@ -2611,7 +2422,8 @@ msgstr " --noclean - jaga rpm tidak dipakai dalam kache.\n"
#: ../urpmi.recover:37
#, c-format
-msgid " --list - list transactions since provided date/duration argument\n"
+msgid ""
+" --list - list transactions since provided date/duration argument\n"
msgstr ""
#: ../urpmi.recover:38
@@ -2698,8 +2510,7 @@ msgstr ""
msgid "You must be superuser to do this"
msgstr ""
-#: ../urpmi.recover:143
-#: ../urpmi.recover:209
+#: ../urpmi.recover:143 ../urpmi.recover:209
#, fuzzy, c-format
msgid "Writing rpm macros file [%s]...\n"
msgstr "Tak dapat membuka fail %s untuk menulis"
@@ -2814,7 +2625,8 @@ msgstr "Hanya superuser yang boleh menginstal pakej"
#: ../urpmi.update:76
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "tiada apa-apa yang perlu dikemaskini (guna urpmi.addmedia utk tambah media)\n"
+msgstr ""
+"tiada apa-apa yang perlu dikemaskini (guna urpmi.addmedia utk tambah media)\n"
#: ../urpmi.update:94
#, c-format
@@ -2845,7 +2657,8 @@ msgstr "Media Storan"
msgid ""
"urpmq version %s\n"
"Copyright (C) 2000-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
"\n"
"usage:\n"
msgstr ""
@@ -2857,7 +2670,9 @@ msgstr ""
#: ../urpmq:48
#, fuzzy, c-format
-msgid " --searchmedia - use only the given media to search requested (or updated) packages.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested (or updated) "
+"packages.\n"
msgstr " --update - guna hanya kemaskini media.\n"
#: ../urpmq:54
@@ -2892,7 +2707,8 @@ msgstr "Ralat mendapatkan senarai pakej yang ada"
#: ../urpmq:62
#, c-format
-msgid " --dump-config - dump the config in form of urpmi.addmedia argument.\n"
+msgid ""
+" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
#: ../urpmq:63
@@ -2902,8 +2718,10 @@ msgstr " --src - pakej berikut adalah pakej sumber (sama dgn -s).\n"
#: ../urpmq:64
#, c-format
-msgid " --sources - give all source packages before downloading (root only).\n"
-msgstr " --sources - beri semua pakej sumber sebelum muatturun (hanya root).\n"
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
+msgstr ""
+" --sources - beri semua pakej sumber sebelum muatturun (hanya root).\n"
#: ../urpmq:66
#, fuzzy, c-format
@@ -2924,20 +2742,30 @@ msgstr "&Susunatur Cetakan"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr "Lumpuhkan tag ID3V2"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr "&Susunatur Cetakan"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr "Senarai tag:\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr "&Susunatur Cetakan"
-#: ../urpmq:83
+#: ../urpmq:85
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr "&Susunatur Cetakan"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -2996,12 +2824,16 @@ msgstr " -r - cetak versi dan keluaran dengan nama juga.\n"
#: ../urpmq:100
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
-msgstr " -s - pakej berikut adalah pakej sumber (sama dgn --src).\n"
+msgstr ""
+" -s - pakej berikut adalah pakej sumber (sama dgn --src).\n"
#: ../urpmq:101
#, c-format
-msgid " -u - remove package if a more recent version is already installed.\n"
-msgstr " -u - buang pakej jika versi lebih terkini telah dipasang.\n"
+msgid ""
+" -u - remove package if a more recent version is already "
+"installed.\n"
+msgstr ""
+" -u - buang pakej jika versi lebih terkini telah dipasang.\n"
#: ../urpmq:102
#, c-format
@@ -3011,7 +2843,9 @@ msgstr " -y - lakukan pencarian fuzzy (sama dengan --fuzzy).\n"
#: ../urpmq:103
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
-msgstr " -Y - seperti -y, tetapi memaksa untuk memadan tidak kira huruf besar atau kecil.\n"
+msgstr ""
+" -Y - seperti -y, tetapi memaksa untuk memadan tidak kira huruf "
+"besar atau kecil.\n"
#: ../urpmq:104
#, c-format
@@ -3023,7 +2857,12 @@ msgstr " dicarikan nama atau fail rpm yg tertera pada baris perintah.\n"
msgid "--list-nodes can only be used with --parallel"
msgstr ""
-#: ../urpmq:360
+#: ../urpmq:206
+#, c-format
+msgid "use -l to list files"
+msgstr ""
+
+#: ../urpmq:363
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3035,12 +2874,14 @@ msgstr ""
#: ../urpmq:364
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
#: ../urpmq:365
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
#: ../urpmq:429
@@ -3048,3 +2889,34 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Tiada log perubahan dijumpai\n"
+#~ msgid "Unknown option %s"
+#~ msgstr "Pilihan tidak diketahui %s"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "terlalu banyak titik sambung utk media removable \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "ambil peranti removable sbg \"%s\""
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "pakai removable peranti lain [%s] untuk \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "tidak dapat mengambil nama path utk media removable \"%s\""
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "gagal mengakses media instalasi pertama"
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr ""
+#~ "media ketidaksinambungan \"%s\" bertanda removable, seharusnya tidak"
+
+#, fuzzy
+#~ msgid "Press Enter when ready..."
+#~ msgstr ""
+#~ "Tekan <Enter> untuk mengulangbut sistem anda.\n"
+#~ "\n"
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - bersihkan direktori kache header.\n"
diff --git a/po/mt.po b/po/mt.po
index 2cd1e4e7..4f1e8d8d 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2004-09-07 05:59+0200\n"
"Last-Translator: Ramon Casha <ramon.casha@linux.org.mt>\n"
"Language-Team: Maltese <mt@li.org>\n"
@@ -107,14 +107,7 @@ msgstr "I_kkanċella"
msgid "Choose location to save file"
msgstr "Agħżel fejn tikteb il-fajl"
-#: ../gurpmi.pm:80
-#, fuzzy, c-format
-msgid "Unknown option %s"
-msgstr ""
-"\n"
-"għażla \"%s\" mhux magħrufa\n"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Ebda kmand speċifikat"
@@ -226,12 +219,12 @@ msgstr "Qed nipprepara..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Qed jiġi nstallat \"%s\" (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Jekk jogħġbok daħħal id-diska mmarkata \"%s\" fl-apparat [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Qed jitniżżel il-pakkett \"%s\"..."
@@ -424,6 +417,16 @@ msgstr ""
msgid "Copying failed"
msgstr "Ikkupjar falla"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "sors \"%s\" mhuwiex magħżul"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "ma nistax naqra l-rpm [%s] mis-sors \"%s\""
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -730,7 +733,12 @@ msgstr "Trid tinstalla mingħajr ma niċċekkja d-dipendenzi? (i/L) "
msgid "Try harder to install (--force)? (y/N) "
msgstr "Trid tipprova b'iżjed qawwa (--force)? (i/L)"
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -744,11 +752,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "%d tranżazzjonijiet ta' installazzjoni fallew"
msgstr[1] "%d tranżazzjonijiet ta' installazzjoni fallew"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Installazzjoni possibbli"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -774,6 +777,11 @@ msgstr "kollox diġà installat"
msgid "Packages %s can not be installed"
msgstr "kollox diġà installat"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Installazzjoni possibbli"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -806,29 +814,9 @@ msgstr "qed nipprova naqbeż is-sors eżistenti \"%s\""
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "wisq punti ta' mmuntar għas-sors li jitneħħa \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "qed nieħu l-apparat li jitneħħa bħala \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+msgid "failed to migrate removable device, ignoring media"
msgstr ""
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "qed jintuża apparat [%s] għal \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ma nistax nikseb il-path għal sors li jitneħħa \"%s\""
-
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
msgid "wrote config file [%s]"
@@ -888,12 +876,7 @@ msgstr "qed naqra l-\"headers\" mis-sors \"%s\""
msgid "adding medium \"%s\""
msgstr "qed jitneħħa s-sors \"%s\""
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "ma nistax naċċessa l-ewwel sors ta' installazzjoni"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -1010,18 +993,7 @@ msgstr "qed jiġi eżaminat il-fajl hdlist [%s]"
msgid "comparing %s and %s"
msgstr "qed jiġi nstallat %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"ma nistax naċċessa s-sors \"%s\",\n"
-"dan jista' jiġri jekk timmonta d-direttorju manwalment waqt li qed jinħoloq "
-"is-sors."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ma nstabx fajl hdlists għas-sors \"%s\""
@@ -1188,36 +1160,21 @@ msgstr "instab \"parallel handler\" għal nodi: %s"
msgid "unable to use parallel option \"%s\""
msgstr "ma nistax nuża għażla parallela \"%s\""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "ma nistax naċċessa s-sors \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "qed jiġi mmuntat %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "qed niżmonta %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "sors \"%s\" mhuwiex magħżul"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "ma nistax naqra l-rpm [%s] mis-sors \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "sors \"%s\" immarkat li jista' jitneħħa, imma m'hux"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "ma nistax naċċessa s-sors \"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, fuzzy, c-format
msgid ""
@@ -2303,19 +2260,19 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Agħfas Enter meta tlesti..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Ikkanċella"
@@ -2336,7 +2293,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2454,12 +2411,7 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - naddaf id-direttorju tal-cache tal-headers.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - modalità kwieta.\n"
@@ -2883,20 +2835,30 @@ msgstr " --changelog - uri \"changelog\": lista ta' tibdiliet.\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - uri \"conflicts\": kull ma joħloq konflitt\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - uri \"provides\" - kull ma jipprovdi\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - uri \"requires\": kull ma jeħtieġ\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - print tag \"sourcerpm\": rpm tas-sors.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - uri t-tag \"summary\": sommarju.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -2995,7 +2957,12 @@ msgstr ""
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes tista' tintuża biss ma' --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "ma nistax nikteb il-fajl tal-lista \"%s\""
+
+#: ../urpmq:363
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3031,6 +2998,46 @@ msgid "No changelog found\n"
msgstr "Ma nstabx changelog\n"
#, fuzzy
+#~ msgid "Unknown option %s"
+#~ msgstr ""
+#~ "\n"
+#~ "għażla \"%s\" mhux magħrufa\n"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "wisq punti ta' mmuntar għas-sors li jitneħħa \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "qed nieħu l-apparat li jitneħħa bħala \"%s\""
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "qed jintuża apparat [%s] għal \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "ma nistax nikseb il-path għal sors li jitneħħa \"%s\""
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "ma nistax naċċessa l-ewwel sors ta' installazzjoni"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "ma nistax naċċessa s-sors \"%s\",\n"
+#~ "dan jista' jiġri jekk timmonta d-direttorju manwalment waqt li qed "
+#~ "jinħoloq is-sors."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "sors \"%s\" immarkat li jista' jitneħħa, imma m'hux"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Agħfas Enter meta tlesti..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - naddaf id-direttorju tal-cache tal-headers.\n"
+
+#, fuzzy
#~ msgid "virtual medium needs to be local"
#~ msgstr "sors virtwali \"%s\" mhux lokali; sors injorat"
@@ -3245,9 +3252,6 @@ msgstr "Ma nstabx changelog\n"
#~ msgid "file [%s] already used in the same medium \"%s\""
#~ msgstr "fajl [%s] diġà użat fl-istess sors \"%s\""
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "ma nistax nikteb il-fajl tal-lista \"%s\""
-
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "ma nkiteb xejn fil-lista għal \"%s\""
diff --git a/po/nb.po b/po/nb.po
index 2094ed5f..9dce4298 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: nb\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2007-09-17 14:07+0200\n"
"Last-Translator: Per Øyvind Karlsen <peroyvind@mandriva.org>\n"
"Language-Team: Norwegian Bokmål <i18n-no@lister.ping.uio.no>\n"
@@ -112,12 +112,7 @@ msgstr "_Avbryt"
msgid "Choose location to save file"
msgstr "Velg sted hvor fil skal lagres."
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "Ukjent valg «%s»."
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "Ingen pakker spesifisert"
@@ -228,12 +223,12 @@ msgstr "Forbereder ..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Installerer pakke «%s» (%s/%s) ..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Sett inn mediumet kalt «%s» på enhet [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Laster ned pakke «%s» ..."
@@ -425,6 +420,16 @@ msgstr "For mange argumenter\n"
msgid "Copying failed"
msgstr "Mislykket kopiering."
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, c-format
+msgid "medium \"%s\" is not available"
+msgstr "Medium «%s» er ikke tilgjengelig."
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "Klarte ikke lese rpm-fil [%s] fra medium «%s»."
+
#: ../urpm/cfg.pm:81
#, c-format
msgid "syntax error in config file at line %s"
@@ -736,7 +741,12 @@ msgstr "Prøv å installere uten å sjekke avhengigheter? (j/N) "
msgid "Try harder to install (--force)? (y/N) "
msgstr "Prøv enda hardere å installere («--force»)? (j/N) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -750,11 +760,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "%d mislykket installasjonstransaksjon."
msgstr[1] "%d mislykkede installasjonstransaksjoner."
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Installasjon er mulig"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -780,6 +785,11 @@ msgstr "Pakken «%s» kan ikke installeres."
msgid "Packages %s can not be installed"
msgstr "Pakkene «%s» kan ikke installeres."
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Installasjon er mulig"
+
#: ../urpm/md5sum.pm:20
#, c-format
msgid "examining %s file"
@@ -812,28 +822,8 @@ msgstr "Prøver å overstyre eksisterende medium «%s». Hopper over."
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "For mange monteringspunkter for det flyttbare medium «%s»."
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "Bruker flyttbar enhet som «%s»."
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "Mediu, «%s» er et ISO-avtrykk og vil bli montert direkte."
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "Bruker forskjellig flyttbare enheter [%s] for «%s»."
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "Kunne ikke motta sti for flyttbart medium «%s»"
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -894,12 +884,7 @@ msgstr "Legg til medium «%s» før det eksterne medium «%s»."
msgid "adding medium \"%s\""
msgstr "Legger til medium «%s»."
-#: ../urpm/media.pm:750
-#, c-format
-msgid "unable to mount the distribution medium"
-msgstr "Klarte ikke montere distribusjonsmedium."
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "Denne adressa ser ikke ut til å inneholde en distribusjon."
@@ -1014,17 +999,7 @@ msgstr "Sjekker hdlistefil [%s]."
msgid "comparing %s and %s"
msgstr "Rydder opp %s og %s."
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"Fikk ikke tilgang til medium «%s».\n"
-"Dette kan være fordi du manuelt monterte mappa når du oppretta mediumet."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "Ugyldig «hdlist»-fil [%s] for medium «%s»."
@@ -1191,36 +1166,21 @@ msgstr "Fant parallellhåndtering for noder: %s."
msgid "unable to use parallel option \"%s\""
msgstr "Klarte ikke bruke parallellvalget «%s»."
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "Klarte ikke nå medium «%s»."
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "Monterer «%s»."
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "Avmonterer «%s»"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not available"
-msgstr "Medium «%s» er ikke tilgjengelig."
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "Klarte ikke lese rpm-fil [%s] fra medium «%s»."
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "Usammenhengende medium «%s» merket flyttbart, men er det ikke."
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "Klarte ikke nå medium «%s»."
-
#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
@@ -2315,19 +2275,19 @@ msgstr "Det vil bli brukt %s mer diskplass."
msgid "%s of disk space will be freed."
msgstr "Det ble frigjort %s diskplass."
-#: ../urpmi:603
+#: ../urpmi:604
+#, fuzzy, c-format
+msgid "%s of packages will be retrieved."
+msgstr "Det ble frigjort %s diskplass."
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Vil du fortsette med installering av pakken?"
msgstr[1] "Vil du fortsette med installering av de %d pakkene?"
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Trykk Enter når det er klart..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Avbryt"
@@ -2348,7 +2308,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2466,12 +2426,7 @@ msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
" --raw – Legg til medie i oppsettet, men ikke oppdater det.\n"
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c – Tøm hodelinemellomlagerer.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q – Stillemodus.\n"
@@ -2900,20 +2855,30 @@ msgstr " --changelog – Vis endringslogg.\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts – Konfliktetiketter.\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr " --provides – Tilbudsetiketter.\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires – Avhengighetsetiketter.\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm – navn på kilde-rpm.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S – Vis sammendrag.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -3007,7 +2972,12 @@ msgstr " navn eller rpm-filer gitt på kommandolinjem er forespurt.\n"
msgid "--list-nodes can only be used with --parallel"
msgstr "Kan bare bruke «--list-nodes» med «--parallel»."
-#: ../urpmq:360
+#: ../urpmq:206
+#, c-format
+msgid "use -l to list files"
+msgstr ""
+
+#: ../urpmq:363
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr "Ingen «hdlist» for medium «%s». Bare delvis resultat for pakken «%s»."
@@ -3034,6 +3004,44 @@ msgstr "Inga «hdlist» for medium «%s». Kan ikke vise resultat for pakkene «
msgid "No changelog found\n"
msgstr "Fant ingen endringslogg\n"
+#~ msgid "Unknown option %s"
+#~ msgstr "Ukjent valg «%s»."
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "For mange monteringspunkter for det flyttbare medium «%s»."
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "Bruker flyttbar enhet som «%s»."
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "Mediu, «%s» er et ISO-avtrykk og vil bli montert direkte."
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "Bruker forskjellig flyttbare enheter [%s] for «%s»."
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "Kunne ikke motta sti for flyttbart medium «%s»"
+
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "Klarte ikke montere distribusjonsmedium."
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "Fikk ikke tilgang til medium «%s».\n"
+#~ "Dette kan være fordi du manuelt monterte mappa når du oppretta mediumet."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "Usammenhengende medium «%s» merket flyttbart, men er det ikke."
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Trykk Enter når det er klart..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c – Tøm hodelinemellomlagerer.\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "Virtuelle medium trenger å være lokalt."
diff --git a/po/nl.po b/po/nl.po
index 7ed0f459..42042658 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-nl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2007-09-13 23:55+0100\n"
"Last-Translator: Reinout van Schouwen <reinouts@gnome.org>\n"
"Language-Team: Nederlands <vertaling@vrijschrift.org>\n"
@@ -114,12 +114,7 @@ msgstr "_Annuleren"
msgid "Choose location to save file"
msgstr "Kies locatie om bestand in op te slaan"
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "Onbekende optie '%s'"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "Geen pakketten gespecificeerd"
@@ -235,12 +230,12 @@ msgstr "Voorbereiden..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Bezig met installeren van pakket `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Gelieve het medium genaamd \"%s\" in apparaat [%s] te plaatsen"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Downloaden van pakket `%s'..."
@@ -433,6 +428,16 @@ msgstr "Te veel argumenten\n"
msgid "Copying failed"
msgstr "Kopiëren mislukt"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, c-format
+msgid "medium \"%s\" is not available"
+msgstr "medium \"%s\" is niet beschikbaar."
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "kon rpm bestand [%s] niet lezen van medium \"%s\""
+
#: ../urpm/cfg.pm:81
#, c-format
msgid "syntax error in config file at line %s"
@@ -744,7 +749,12 @@ msgstr ""
msgid "Try harder to install (--force)? (y/N) "
msgstr "Installatie trachten te forceren (--force)? (j/N) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -758,11 +768,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "%d installatie-transactie mislukt"
msgstr[1] "%d installatie-transacties mislukt"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Installatie is mogelijk"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -788,6 +793,11 @@ msgstr "Pakket %s kan niet worden geïnstalleerd"
msgid "Packages %s can not be installed"
msgstr "Pakketten %s kunnen niet worden geïnstalleerd"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Installatie is mogelijk"
+
#: ../urpm/md5sum.pm:20
#, c-format
msgid "examining %s file"
@@ -820,28 +830,8 @@ msgstr "overslaan, vanwege poging om bestaand medium \"%s\" te omzeilen"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "teveel koppelpunten voor verwisselbaar medium \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "gebruikt verwisselbare schijf als \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "Medium \"%s\" is een ISO-beeldbestand, het wordt dynamisch gekoppeld"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "gebruikt andere verwisselbare schijf [%s] voor \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "kon de padnaam van verwisselbaar medium \"%s\" niet vinden"
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -902,12 +892,7 @@ msgstr "toevoegen medium \"%s\" voor medium op afstand \"%s\""
msgid "adding medium \"%s\""
msgstr "bezig met toevoegen van medium \"%s\""
-#: ../urpm/media.pm:750
-#, c-format
-msgid "unable to mount the distribution medium"
-msgstr "niet in staat het installatiemedium aan te koppelen"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "deze locatie lijkt geen distributie te bevatten"
@@ -1023,18 +1008,7 @@ msgstr "bezig met onderzoeken hdlist bestand [%s]"
msgid "comparing %s and %s"
msgstr "Opschonen van %s en %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"kan geen toegang tot medium \"%s\" verkrijgen,\n"
-"dit kan gebeuren wanneer u de map handmatig heeft gekoppeld bij het aanmaken "
-"van het medium."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ongeldig hdlist-bestand %s voor medium \"%s\""
@@ -1201,37 +1175,21 @@ msgstr "parallelle handler gevonden voor knooppunten: %s"
msgid "unable to use parallel option \"%s\""
msgstr "niet in staat parallelle optie \"%s\" te gebruiken"
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "kon medium \"%s\" niet benaderen"
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "%s koppelen..."
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "%s afkoppelen..."
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not available"
-msgstr "medium \"%s\" is niet beschikbaar."
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "kon rpm bestand [%s] niet lezen van medium \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr ""
-"onsamenhangend medium \"%s\" als verwisselbaar gemarkeerd, maar is dit niet"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "kon medium \"%s\" niet benaderen"
-
#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
@@ -2362,19 +2320,19 @@ msgstr "%s aan extra schijfruimte zal worden gebruikt."
msgid "%s of disk space will be freed."
msgstr "%s aan schijfruimte zal vrijkomen."
-#: ../urpmi:603
+#: ../urpmi:604
+#, fuzzy, c-format
+msgid "%s of packages will be retrieved."
+msgstr "%s aan schijfruimte zal vrijkomen."
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Verdergaan met de installatie van 1 pakket?"
msgstr[1] "Verdergaan met de installatie van de %d pakketten?"
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Druk op Enter wanneer u klaar bent..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Annuleren"
@@ -2395,7 +2353,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2520,12 +2478,7 @@ msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
" --raw - media toevoegen in configuratie, maar niet bijwerken.\n"
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - map met headers-buffer wissen.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - stille modus.\n"
@@ -2961,20 +2914,30 @@ msgstr " --changelog - geeft wijzigingslogboek weer.\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - conflict-tags\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - provides ('levert')-tags\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - requires ('vereisten')-tags\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - naam van de broncode-rpm.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - geeft de samenvatting.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -3073,7 +3036,12 @@ msgstr ""
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes kan alleen worden gebruikt met --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, c-format
+msgid "use -l to list files"
+msgstr ""
+
+#: ../urpmq:363
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3106,6 +3074,48 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Geen wijzigingslogboek gevonden\n"
+#~ msgid "Unknown option %s"
+#~ msgstr "Onbekende optie '%s'"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "teveel koppelpunten voor verwisselbaar medium \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "gebruikt verwisselbare schijf als \"%s\""
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr ""
+#~ "Medium \"%s\" is een ISO-beeldbestand, het wordt dynamisch gekoppeld"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "gebruikt andere verwisselbare schijf [%s] voor \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "kon de padnaam van verwisselbaar medium \"%s\" niet vinden"
+
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "niet in staat het installatiemedium aan te koppelen"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "kan geen toegang tot medium \"%s\" verkrijgen,\n"
+#~ "dit kan gebeuren wanneer u de map handmatig heeft gekoppeld bij het "
+#~ "aanmaken van het medium."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr ""
+#~ "onsamenhangend medium \"%s\" als verwisselbaar gemarkeerd, maar is dit "
+#~ "niet"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Druk op Enter wanneer u klaar bent..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - map met headers-buffer wissen.\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "Virtueel medium dient lokaal te zijn"
diff --git a/po/nn.po b/po/nn.po
index 4aace831..ba700ca0 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2008-02-25 19:07+0100\n"
"Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
"Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -104,12 +104,7 @@ msgstr "_Avbryt"
msgid "Choose location to save file"
msgstr "Vel plassering av lagra fil."
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "Ukjent val: «%s»."
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "Ingen pakkar valde"
@@ -183,12 +178,14 @@ msgstr ""
#: ../gurpmi2:215 ../urpmi:592
#, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
msgstr "Grunna avhengnader vert denne pakken installert:"
#: ../gurpmi2:216 ../urpmi:593
#, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Grunna avhengnader vert desse pakkane installerte:"
#: ../gurpmi2:218
@@ -218,12 +215,12 @@ msgstr "Førebur ... "
msgid "Installing package `%s' (%s/%s)..."
msgstr "Installerer pakken «%s» (%s/%s) ..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Set inn «%s» i eininga [%s]."
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Lastar ned pakken «%s» ..."
@@ -417,6 +414,16 @@ msgstr "For mange argument.\n"
msgid "Copying failed"
msgstr " mislukka kopiering."
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, c-format
+msgid "medium \"%s\" is not available"
+msgstr "Mediet «%s» er ikkje tilgjengeleg."
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "Klarte ikkje lesa rpm-fil [%s] frå mediet «%s»."
+
#: ../urpm/cfg.pm:81
#, c-format
msgid "syntax error in config file at line %s"
@@ -586,7 +593,8 @@ msgstr "[pakkar om att]"
#: ../urpm/install.pm:154
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
"Laga transaksjon for installering på «%s» (remove: %d – install: %d – "
"upgrade: %d)"
@@ -726,7 +734,12 @@ msgstr "Vil du installera utan å kontrollera avhengnader? (J/N) "
msgid "Try harder to install (--force)? (y/N) "
msgstr "Vil du prøva endå sterkare å installera («--force»)? (J/N) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -742,11 +755,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "%d mislykka installasjonstransaksjon."
msgstr[1] "%d mislykka installasjonstransaksjonar."
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Det går an å installera."
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -772,6 +780,11 @@ msgstr "Pakken «%s» kan ikkje installerast."
msgid "Packages %s can not be installed"
msgstr "Pakkane «%s» kan ikkje installerast."
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Det går an å installera."
+
#: ../urpm/md5sum.pm:20
#, c-format
msgid "examining %s file"
@@ -785,7 +798,8 @@ msgstr "Åtvaring: md5summen for «%s» er ikkje tilgjengeleg i MD5SUM-fila."
#: ../urpm/media.pm:187
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "Det virtuelle mediet «%s» må ha ei eintydig adresse. Hoppar over medium."
+msgstr ""
+"Det virtuelle mediet «%s» må ha ei eintydig adresse. Hoppar over medium."
#: ../urpm/media.pm:189
#, c-format
@@ -804,28 +818,8 @@ msgstr "Prøver å hoppa over eksisterande medium «%s». Hoppar over."
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "For mange monteringspunkt for det flyttbare mediet «%s»."
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "Brukar flyttbar eining som «%s»."
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "Mediet «%s» er eit ISO-bilete, og vert montert direkte."
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "Brukar forskjellig flyttbar eining [%s] for «%s»."
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "Fann ikkje adressa til det flyttbare mediet «%s»."
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -886,12 +880,7 @@ msgstr "Legg til mediet «%s» før fjernmediet «%s»."
msgid "adding medium \"%s\""
msgstr "Legg til mediet «%s»."
-#: ../urpm/media.pm:750
-#, c-format
-msgid "unable to mount the distribution medium"
-msgstr "Klarte ikkje montera distribusjonsmediet."
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "Denne adressa ser ikkje ut til å innehelda ein distribusjon."
@@ -1006,17 +995,7 @@ msgstr "Feil ved genhdlist2 på %s"
msgid "comparing %s and %s"
msgstr "Samanliknar %s og %s."
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"Fekk ikkje tilgang til mediet «%s».\n"
-"Dette kan vera fordi du manuelt monterte mappa når du oppretta mediet."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "Ugyldig «hdlist»-fil [%s] for mediet «%s»."
@@ -1183,36 +1162,21 @@ msgstr "Fann parallellhandtering for nodar: %s."
msgid "unable to use parallel option \"%s\""
msgstr "Klarte ikkje bruka parallellvalet «%s»."
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "Klarte ikkje lesa mediet «%s»."
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "Monterer «%s»."
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "Avmonterer «%s»."
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not available"
-msgstr "Mediet «%s» er ikkje tilgjengeleg."
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "Klarte ikkje lesa rpm-fil [%s] frå mediet «%s»."
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "Det inkonsistente mediet «%s» er merkja fjerna, men er ikkje fjerna."
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "Klarte ikkje lesa mediet «%s»."
-
#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
@@ -1245,7 +1209,8 @@ msgstr " --version – Vis versjonsnummeret til dette verktøyet.\n"
#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:131 ../urpmq:79
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
-msgstr " --env – Bruk eigedefinert miljø (vanlegvis ein feilrapport).\n"
+msgstr ""
+" --env – Bruk eigedefinert miljø (vanlegvis ein feilrapport).\n"
#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:76 ../urpmq:49
#, c-format
@@ -1254,15 +1219,18 @@ msgstr " --excludemedia – Ikkje bruk gitt medium (kommadelt liste).\n"
#: ../urpm/search.pm:39 ../urpmf:39
#, c-format
-msgid " --literal, -l - don't match patterns, use argument as a literal string.\n"
-msgstr " --literal, -l – Ingen treff på mønster; bruk berre argument som tekst.\n"
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+" --literal, -l – Ingen treff på mønster; bruk berre argument som tekst.\n"
#: ../urpm/search.pm:40 ../urpme:52 ../urpmf:40 ../urpmi:111
#: ../urpmi.addmedia:69 ../urpmi.recover:36 ../urpmi.removemedia:46
#: ../urpmi.update:46 ../urpmq:69
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
-msgstr " --urpmi-root – Bruk anna rot for urpmi-database og rpm-installering.\n"
+msgstr ""
+" --urpmi-root – Bruk anna rot for urpmi-database og rpm-installering.\n"
#: ../urpm/search.pm:41 ../urpmf:41 ../urpmi:75 ../urpmq:47
#, c-format
@@ -1271,8 +1239,10 @@ msgstr " --media – Bruk berre gitt medium (kommadelt liste).\n"
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
-msgid " --sortmedia - sort media according to substrings separated by comma.\n"
-msgstr " --sortmedia – Sorter medium etter delstrengar (kommadelt liste).\n"
+msgid ""
+" --sortmedia - sort media according to substrings separated by comma.\n"
+msgstr ""
+" --sortmedia – Sorter medium etter delstrengar (kommadelt liste).\n"
#: ../urpm/search.pm:43 ../urpmf:43
#, c-format
@@ -1525,7 +1495,8 @@ msgstr ""
#: ../urpm/select.pm:23
#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
"Installasjonsprogrammet urpmi vart starta på nytt, og programprioriteringane "
"vart endra: %s mot %s"
@@ -1634,8 +1605,10 @@ msgstr " --test – kontroller at fjerninga kan fungera.\n"
#: ../urpme:48 ../urpmi:104 ../urpmq:65
#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
-msgstr " --force – Tving gjennomføring sjølv om ikkje alle pakkar finst.\n"
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force – Tving gjennomføring sjølv om ikkje alle pakkar finst.\n"
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
@@ -1709,7 +1682,8 @@ msgstr "Kontrollerer fjerning av desse pakkane"
#: ../urpme:124
#, c-format
msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural "To satisfy dependencies, the following %d packages will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
msgstr[0] "På grunn av avhengnader vert denne pakken fjerna"
msgstr[1] "På grunn av avhengnader vert desse %d pakkane fjerna"
@@ -1749,7 +1723,8 @@ msgstr ""
#: ../urpmi:78
#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
msgstr " --searchmedia – Berre sjå etter pakkar i dette mediet.\n"
#: ../urpmi:81
@@ -1763,7 +1738,8 @@ msgstr ""
#: ../urpmi:82 ../urpmq:52
#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
msgstr " --auto-select – Vel automatisk alle pakkar som kan oppdaterast.\n"
#: ../urpmi:83
@@ -1854,11 +1830,13 @@ msgstr " --noclean – Behald rpm-filer i mellomlager.\n"
#: ../urpmi:102
#, c-format
msgid " --justdb - update only the rpm db, not the filesystem.\n"
-msgstr " --justdb – Berre oppdater rpm-databasen, og ikkje filsystemet.\n"
+msgstr ""
+" --justdb – Berre oppdater rpm-databasen, og ikkje filsystemet.\n"
#: ../urpmi:103
#, c-format
-msgid " --replacepkgs - force installing packages which are already installed.\n"
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
msgstr ""
" --replacepkgs – Tving gjennom installering av pakkar som alt er "
"installerte.\n"
@@ -2005,7 +1983,8 @@ msgstr ""
#: ../urpmi:138
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
-msgstr " --ignorearch – Tillèt å installera pakkar for andre arkitekturar.\n"
+msgstr ""
+" --ignorearch – Tillèt å installera pakkar for andre arkitekturar.\n"
#: ../urpmi:139
#, c-format
@@ -2027,7 +2006,8 @@ msgstr " --prefer – Pakkar som skal føretrekkast.\n"
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
-msgstr " --more-choices – Vis fleire val enn standard ved treff på fleire pakkar.\n"
+msgstr ""
+" --more-choices – Vis fleire val enn standard ved treff på fleire pakkar.\n"
#: ../urpmi:145
#, c-format
@@ -2090,8 +2070,10 @@ msgstr "Du kan ikkje installera binærpakkar med «--install-src»."
#: ../urpmi:221
#, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
-msgstr "Bruk «--buildrequires» eller «--install-src». Standard er «--buildrequires»."
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgstr ""
+"Bruk «--buildrequires» eller «--install-src». Standard er «--buildrequires»."
#: ../urpmi:241
#, c-format
@@ -2287,19 +2269,19 @@ msgstr "Det vert brukt %s meir diskplass."
msgid "%s of disk space will be freed."
msgstr "Det vert frigjort %s diskplass."
-#: ../urpmi:603
+#: ../urpmi:604
+#, fuzzy, c-format
+msgid "%s of packages will be retrieved."
+msgstr "Det vert frigjort %s diskplass."
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Vil du halda fram med installeringa av pakken?"
msgstr[1] "Vil du halda fram med installeringa av dei %d pakkane?"
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Trykk så «Enter» ..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Avbryt"
@@ -2312,7 +2294,7 @@ msgstr "Startar urpmi på nytt."
#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
-#, c-format
+#, fuzzy, c-format
msgid ""
"usage: urpmi.addmedia [options] <name> <url>\n"
"where <url> is one of\n"
@@ -2320,7 +2302,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2410,7 +2392,8 @@ msgstr ""
#: ../urpmi.addmedia:72
#, c-format
msgid " --interactive - with --distrib, ask confirmation for each media\n"
-msgstr " --interactive – med «--distrib»: Spør om stadfesting for kvart medium.\n"
+msgstr ""
+" --interactive – med «--distrib»: Spør om stadfesting for kvart medium.\n"
#: ../urpmi.addmedia:73
#, c-format
@@ -2444,14 +2427,10 @@ msgstr " --nopubkey – Ikkje importer offentlegnøkkel til nytt medium.\n"
#: ../urpmi.addmedia:79
#, c-format
msgid " --raw - add the media in config, but don't update it.\n"
-msgstr " --raw – Legg mediet til oppsettet, men ikkje oppdater det.\n"
-
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c – Tøm hovudlinjemellomlageret.\n"
+msgstr ""
+" --raw – Legg mediet til oppsettet, men ikkje oppdater det.\n"
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q – Stillemodus.\n"
@@ -2549,13 +2528,15 @@ msgstr " --noclean – Ikkje tøm ompakkingsmappe ved kontrollpunkt.\n"
#: ../urpmi.recover:37
#, c-format
-msgid " --list - list transactions since provided date/duration argument\n"
+msgid ""
+" --list - list transactions since provided date/duration argument\n"
msgstr " --list – Vis transaksjonar frå vald dato/lengd-argument.\n"
#: ../urpmi.recover:38
#, c-format
msgid " --list-all - list all transactions in rpmdb (long)\n"
-msgstr " --list-all – Vis oversikt over alle transaksjonar i rpmdb (lang).\n"
+msgstr ""
+" --list-all – Vis oversikt over alle transaksjonar i rpmdb (lang).\n"
#: ../urpmi.recover:39
#, c-format
@@ -2827,7 +2808,8 @@ msgstr " --list-media – Vis oversikt over tilgjengelege medium.\n"
#: ../urpmq:59
#, c-format
msgid " --list-url - list available media and their url.\n"
-msgstr " --list-url – Vis oversikt over tilgjengelge medium, med adresser.\n"
+msgstr ""
+" --list-url – Vis oversikt over tilgjengelge medium, med adresser.\n"
#: ../urpmq:60
#, c-format
@@ -2841,7 +2823,8 @@ msgstr " --list-aliases – Vis oversikt over tilgjengelege parallellalias.\n"
#: ../urpmq:62
#, c-format
-msgid " --dump-config - dump the config in form of urpmi.addmedia argument.\n"
+msgid ""
+" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
" --dump-config – Dump oppsettet på same form som «urpmi.addmedia»-"
"argument.\n"
@@ -2853,7 +2836,8 @@ msgstr " --src – Neste pakke er ein kjeldepakke (same som «-s»).\n
#: ../urpmq:64
#, 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 – Gi alle kjeldepakkar før nedlasting (berre for «root»-"
"brukar).\n"
@@ -2861,7 +2845,8 @@ msgstr ""
#: ../urpmq:66
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
-msgstr " --ignorearch – Tillèt førespurnad etter pakkar for andre arkitekturar.\n"
+msgstr ""
+" --ignorearch – Tillèt førespurnad etter pakkar for andre arkitekturar.\n"
#: ../urpmq:70
#, c-format
@@ -2878,21 +2863,31 @@ msgid " --changelog - print changelog.\n"
msgstr " --changelog – Vis endringslogg.\n"
#: ../urpmq:81
+#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts – Konfliktmerkelappar.\n"
+
+#: ../urpmq:82
#, c-format
msgid " --provides - print provides.\n"
msgstr " --provides – Vis tilbod.\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires – Krev-merkelappar.\n"
+
+#: ../urpmq:84
#, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm – Vis namn på kjelde-RPM.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S – Vis samandrag.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -2927,7 +2922,8 @@ msgstr ""
#: ../urpmq:93
#, c-format
msgid " -c - complete output with package to be removed.\n"
-msgstr " -c – Fullstendig oversikt over pakken som skal fjernast.\n"
+msgstr ""
+" -c – Fullstendig oversikt over pakken som skal fjernast.\n"
#: ../urpmq:95
#, c-format
@@ -2976,7 +2972,8 @@ msgstr " -y – Bruk òg ikkje-ordrett søk (same som «-fuzzy»).\
#: ../urpmq:103
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
-msgstr " -Y – som «-y», men ikkje skil mellom store og små bokstavar.\n"
+msgstr ""
+" -Y – som «-y», men ikkje skil mellom store og små bokstavar.\n"
#: ../urpmq:104
#, c-format
@@ -2988,7 +2985,12 @@ msgstr " namn og rpm-filer gitt på kommandolinja vert førespurd.\n"
msgid "--list-nodes can only be used with --parallel"
msgstr "Kan berre bruka «--list-nodes« saman med «--parallel»."
-#: ../urpmq:360
+#: ../urpmq:206
+#, c-format
+msgid "use -l to list files"
+msgstr ""
+
+#: ../urpmq:363
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr "Ingen xml-info for mediet «%s». Berre delvis resultat for pakken «%s»."
@@ -3000,16 +3002,56 @@ msgstr "Ingen xml-info for mediet «%s». Berre delvis resultat for pakkane «%s
#: ../urpmq:364
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr "Ingen xml-info for mediet «%s». Kan ikkje visa resultat for pakken «%s»."
#: ../urpmq:365
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
-msgstr "Ingen xml-info for mediet «%s». Kan ikkje visa resultat for pakkane «%s»."
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"Ingen xml-info for mediet «%s». Kan ikkje visa resultat for pakkane «%s»."
#: ../urpmq:429
#, c-format
msgid "No changelog found\n"
msgstr "Fann ikkje endringslogg.\n"
+#~ msgid "Unknown option %s"
+#~ msgstr "Ukjent val: «%s»."
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "For mange monteringspunkt for det flyttbare mediet «%s»."
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "Brukar flyttbar eining som «%s»."
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "Mediet «%s» er eit ISO-bilete, og vert montert direkte."
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "Brukar forskjellig flyttbar eining [%s] for «%s»."
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "Fann ikkje adressa til det flyttbare mediet «%s»."
+
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "Klarte ikkje montera distribusjonsmediet."
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "Fekk ikkje tilgang til mediet «%s».\n"
+#~ "Dette kan vera fordi du manuelt monterte mappa når du oppretta mediet."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "Det inkonsistente mediet «%s» er merkja fjerna, men er ikkje fjerna."
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Trykk så «Enter» ..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c – Tøm hovudlinjemellomlageret.\n"
diff --git a/po/pa_IN.po b/po/pa_IN.po
index a324b131..bfed6fb5 100644
--- a/po/pa_IN.po
+++ b/po/pa_IN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2005-03-23 21:55+0530\n"
"Last-Translator: Kanwaljeet Singh Brar <kanwaljeetbrar@yahoo.co.in>\n"
"Language-Team: Panjabi <fedora-trans-pa@redhat.com>\n"
@@ -103,14 +103,7 @@ msgstr "ਰੱਦ(_C)"
msgid "Choose location to save file"
msgstr "ਫਾਇਲ਼ ਸੰਭਾਲਣ ਲਈ ਟਿਕਾਣਾ ਦਿਓ"
-#: ../gurpmi.pm:80
-#, fuzzy, c-format
-msgid "Unknown option %s"
-msgstr ""
-"\n"
-"ਅਣਜਾਣ ਚੋਣ '%s' ਹੈ\n"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, fuzzy, c-format
msgid "No packages specified"
msgstr "ਕੋਈ ਪੈਕੇਜ %s ਨਾਂ ਨਾਲ ਨਹੀਂ"
@@ -223,12 +216,12 @@ msgstr "ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...."
msgid "Installing package `%s' (%s/%s)..."
msgstr "`%s' (%s/%s) ਪੈਕੇਜ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "ਕਿਪਾ ਕਰਕੇ \"%s\" ਨਾਂ ਮਾਧਿਅਮ [%s] ਜੰਤਰ ਵਿੱਚ ਪਾਓ"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "`%s' ਪੈਕੇਜ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
@@ -420,6 +413,16 @@ msgstr ""
msgid "Copying failed"
msgstr "ਨਕਲ ਕਰਨੀ ਅਸਫਲ"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "ਮਾਧਿਅਮ \"%s\" ਚੁਣਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "ਮਾਧਿਅਮ \"%s\" ਤੋਂ rpm ਫਾਇਲ਼ [%s] ਪੜਨ ਲਈ ਅਸਫਲ"
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -726,7 +729,12 @@ msgstr "ਬਿਨਾਂ ਨਿਰਭਰਤਾਂ ਦੇ ਇੰਸਟਾਲੇਸ਼
msgid "Try harder to install (--force)? (y/N) "
msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਨੂੰ ਧੱਕੇ ਨਾਲ ਵਰਤਣਾ ਹੈ (--force)? (y/N) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -740,11 +748,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "%d ਇੰਸਟਾਲੇਸ਼ਨ ਸੰਚਾਰ ਅਸਫਲ"
msgstr[1] "%d ਇੰਸਟਾਲੇਸ਼ਨ ਸੰਚਾਰ ਅਸਫਲ"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਸੰਭਵ ਹੈ"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -770,6 +773,11 @@ msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
msgid "Packages %s can not be installed"
msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਸੰਭਵ ਹੈ"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -802,28 +810,8 @@ msgstr "ਮੌਜੂਦ ਮਾਧਿਅਮ \"%s\" ਤੋਂ ਬਚਣ ਦੀ ਕ
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "ਹਟਾਉਣਯੋਗ ਮਾਧਿਅਮ \"%s\" ਲਈ ਕਈ ਮਾਊਟ ਥਾਂਵਾਂ ਹਨ"
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "\"%s\" ਨੂੰ ਹਟਾਉਣਯੋਗ ਜੰਤਰ ਵਾਂਗ ਲਵੋ"
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "ਮਾਧਿਅਮ \"%s\" ਇੱਕ ISO ਪ੍ਰਤੀਬਿੰਬ ਹੈ, ਮਾਊਟ on-the-fly ਦੇ ਤੌਰ ਤੇ ਕੀਤਾ ਜਾਵੇਗਾ"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "\"%s\" ਲਈ ਵੱਖਰੇ ਹਟਾਉਣਯੋਗ ਜੰਤਰ [%s] ਵਰਤ ਕੇ"
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ਹਟਾਉਣਯੋਗ ਮਾਧਿਅਮ \"%s\" ਲਈ ਮਾਰਗ-ਨਾਂ ਪ੍ਰਾਪਤ ਕਰਨ ਤੋਂ ਅਸਫਲ"
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -884,12 +872,7 @@ msgstr "ਮਾਧਿਅਮ \"%s\" ਤੋਂ ਸਿਰਲੇਖ ਵੇਖੇ ਜ
msgid "adding medium \"%s\""
msgstr "ਮਾਧਿਅਮ \"%s\" ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "ਪਹਿਲੇ ਇੰਸਟਾਲੇਸ਼ਨ ਮਾਧਿਅਮ ਖੋਲਣ ਲ਼ਈ ਅਸਫਲੇ"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -1004,17 +987,7 @@ msgstr "hdlist ਫਾਇਲ [%s] ਪੜਤਾਲ ਜਾਰੀ"
msgid "comparing %s and %s"
msgstr "%s ਨੂੰ %s ਤੋਂ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾਦਾ ਹੈ"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"ਮਾਧਿਅਮ \"%s\" ਲਈ ਪਹੁੰਚ ਆਯੋਗ,\n"
-"ਇਹ ਤਾਂ ਹੋ ਸਕਦਾ ਹੈ, ਜੇਕਰ ਤੁਸੀਂ ਮਾਧਿਅਮ ਬਣਾਉਣ ਦੌਰਾਨ ਡਾਇਰੈਕਟਰੀ ਖੁਦ ਮਾਊਟ ਕੀਤੀ ਹੈ।"
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ਮਾਧਿਅਮ \"%s\" ਲਈ hdlist ਫਾਇਲ ਨਹੀਂ ਮਿਲੀ"
@@ -1181,36 +1154,21 @@ msgstr "ਨੋਡਾਂ ਲਈ ਸਮਾਂਤਰ ਹੈਂਡਲਰ ਖੋਜ
msgid "unable to use parallel option \"%s\""
msgstr "ਸਮਾਂਤਰ ਚੋਣ \"%s\" ਦੀ ਵਰਤੋਂ ਕਰਨ ਲਈ ਅਸਫਲ"
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "ਮਾਧਿਅਮ \"%s\" ਨੂੰ ਵਰਤਣ ਲਈ ਅਸਫਲ"
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "%s ਮਾਊਟ ਕੀਤਾ ਜਾਦਾ ਹੈ"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "%s ਅਨਮਾਊਟ ਕੀਤਾ ਜਾਦਾ ਹੈ"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "ਮਾਧਿਅਮ \"%s\" ਚੁਣਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "ਮਾਧਿਅਮ \"%s\" ਤੋਂ rpm ਫਾਇਲ਼ [%s] ਪੜਨ ਲਈ ਅਸਫਲ"
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "ਨਾ-ਠੀਕ ਮਾਧਿਅਮ \"%s\" ਨੂੰ ਹਟਾਉਣਯੋਗ ਕਿਹਾ, ਪਰ ਇਹ ਹੈ ਨਹੀਂ"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "ਮਾਧਿਅਮ \"%s\" ਨੂੰ ਵਰਤਣ ਲਈ ਅਸਫਲ"
-
#: ../urpm/search.pm:29 ../urpmf:29
#, fuzzy, c-format
msgid ""
@@ -2289,19 +2247,19 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "ਕਿਰਪਾ ਕਰਕੇ ਤਿਆਰ ਹੋਣ ਤੇ Enter ਦਬਾਓ..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "ਰੱਦ ਕਰੋ"
@@ -2322,7 +2280,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2442,12 +2400,7 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - clean headers cache directory.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - quiet mode.\n"
@@ -2868,20 +2821,30 @@ msgstr " --changelog - print changelog.\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - print tag conflicts: all conflicts.\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - print tag provides: all provides.\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - print tag requires: all requires.\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - print tag sourcerpm: source rpm.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - print tag summary: summary.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -2971,7 +2934,12 @@ msgstr " ਕਮਾਂਡ ਸਤਰ ਤੇ ਦਿੱਤੇ ਨਾਂ ਜਾਂ r
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes ਨੂੰ --parallel ਨਾਲ ਹੀ ਵਰਤਿਆ ਜਾ ਸਕਦਾ"
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "\"%s\" ਦੀ list ਫਾਇਲ ਲਿਖਣ ਲਈ ਅਸਫਲ"
+
+#: ../urpmq:363
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3006,6 +2974,48 @@ msgstr ""
msgid "No changelog found\n"
msgstr "ਕੋਈ changelog ਨਹੀਂ\n"
+#, fuzzy
+#~ msgid "Unknown option %s"
+#~ msgstr ""
+#~ "\n"
+#~ "ਅਣਜਾਣ ਚੋਣ '%s' ਹੈ\n"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "ਹਟਾਉਣਯੋਗ ਮਾਧਿਅਮ \"%s\" ਲਈ ਕਈ ਮਾਊਟ ਥਾਂਵਾਂ ਹਨ"
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "\"%s\" ਨੂੰ ਹਟਾਉਣਯੋਗ ਜੰਤਰ ਵਾਂਗ ਲਵੋ"
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "ਮਾਧਿਅਮ \"%s\" ਇੱਕ ISO ਪ੍ਰਤੀਬਿੰਬ ਹੈ, ਮਾਊਟ on-the-fly ਦੇ ਤੌਰ ਤੇ ਕੀਤਾ ਜਾਵੇਗਾ"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "\"%s\" ਲਈ ਵੱਖਰੇ ਹਟਾਉਣਯੋਗ ਜੰਤਰ [%s] ਵਰਤ ਕੇ"
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "ਹਟਾਉਣਯੋਗ ਮਾਧਿਅਮ \"%s\" ਲਈ ਮਾਰਗ-ਨਾਂ ਪ੍ਰਾਪਤ ਕਰਨ ਤੋਂ ਅਸਫਲ"
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "ਪਹਿਲੇ ਇੰਸਟਾਲੇਸ਼ਨ ਮਾਧਿਅਮ ਖੋਲਣ ਲ਼ਈ ਅਸਫਲੇ"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "ਮਾਧਿਅਮ \"%s\" ਲਈ ਪਹੁੰਚ ਆਯੋਗ,\n"
+#~ "ਇਹ ਤਾਂ ਹੋ ਸਕਦਾ ਹੈ, ਜੇਕਰ ਤੁਸੀਂ ਮਾਧਿਅਮ ਬਣਾਉਣ ਦੌਰਾਨ ਡਾਇਰੈਕਟਰੀ ਖੁਦ ਮਾਊਟ ਕੀਤੀ ਹੈ।"
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "ਨਾ-ਠੀਕ ਮਾਧਿਅਮ \"%s\" ਨੂੰ ਹਟਾਉਣਯੋਗ ਕਿਹਾ, ਪਰ ਇਹ ਹੈ ਨਹੀਂ"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "ਕਿਰਪਾ ਕਰਕੇ ਤਿਆਰ ਹੋਣ ਤੇ Enter ਦਬਾਓ..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - clean headers cache directory.\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "ਵੁਰਚੁਅਲ ਮਾਧਿਅਮ ਸਥਾਨਕ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ"
@@ -3284,9 +3294,6 @@ msgstr "ਕੋਈ changelog ਨਹੀਂ\n"
#~ msgid "file [%s] already used in the same medium \"%s\""
#~ msgstr "ਇਸੇ ਮਾਧਿਅਣ \"%s\" ਵਿੱਚ ਫਾਇਲ [%s] ਪਹਿਲਾਂ ਵੀ ਵਰਤੀ ਗਈ"
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "\"%s\" ਦੀ list ਫਾਇਲ ਲਿਖਣ ਲਈ ਅਸਫਲ"
-
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "\"%s\" ਲਈ ਸੂਚੀ ਫਾਇਲ ਵਿੱਚ ਲਿਖਣ ਲਈ ਕੁਝ ਨਹੀਂ"
diff --git a/po/pl.po b/po/pl.po
index 69b31ffc..8026d3a8 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -17,15 +17,17 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2008-02-29 13:14+0100\n"
-"Last-Translator: Tomasz Bednarski - Amazis.net <tomasz.bednarski@mandriva.pl>\n"
+"Last-Translator: Tomasz Bednarski - Amazis.net <tomasz.bednarski@mandriva."
+"pl>\n"
"Language-Team: Polish <pl@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%"
+"100<10 || n%100>=20) ? 1 : 2);\n"
#: ../gurpmi:30 ../gurpmi2:65
#, c-format
@@ -35,7 +37,8 @@ msgstr "Instalacja pakietów RPM"
#: ../gurpmi:44
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
-msgstr "Błąd: odnalezienie pliku %s było niemożliwe, operacja zostanie anulowana"
+msgstr ""
+"Błąd: odnalezienie pliku %s było niemożliwe, operacja zostanie anulowana"
#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
#, c-format
@@ -113,12 +116,7 @@ msgstr "_Anuluj"
msgid "Choose location to save file"
msgstr "Wybierz miejsce zapisania pliku"
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "Nieznane opcja %s"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "Nie wybrano pakietów"
@@ -192,13 +190,17 @@ msgstr ""
#: ../gurpmi2:215 ../urpmi:592
#, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
-msgstr "W celu spełnienia zależności zostanie zainstalowany następujący pakiet:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
+msgstr ""
+"W celu spełnienia zależności zostanie zainstalowany następujący pakiet:"
#: ../gurpmi2:216 ../urpmi:593
#, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
-msgstr "W celu spełnienia zależności zostaną zainstalowane następujące pakiety:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr ""
+"W celu spełnienia zależności zostaną zainstalowane następujące pakiety:"
#: ../gurpmi2:218
#, c-format
@@ -228,12 +230,12 @@ msgstr "Przygotowywanie..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Instalowanie pakietu \"%s\" (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Włóż nośnik o nazwie \"%s\" do napędu [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Pobieranie pakietu \"%s\"..."
@@ -425,6 +427,16 @@ msgstr "Zbyt wiele argumentów\n"
msgid "Copying failed"
msgstr "Kopiowanie zakończone niepowodzeniem"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, c-format
+msgid "medium \"%s\" is not available"
+msgstr "nośnik %s jest niedostępny"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "nie można czytać pliku rpm [%s] z nośnika \"%s\""
+
#: ../urpm/cfg.pm:81
#, c-format
msgid "syntax error in config file at line %s"
@@ -594,7 +606,8 @@ msgstr "[ponowne tworzenie pakietu]"
#: ../urpm/install.pm:154
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
"utworzono transakcję dla instalacji na %s (usuwanie=%d, instalacja=%d, "
"aktualizacja=%d)"
@@ -734,7 +747,12 @@ msgstr "Próbować instalować bez sprawdzania zależności? (t/N) "
msgid "Try harder to install (--force)? (y/N) "
msgstr "Czy chcesz spróbować wymusić instalację (--force)? (t/N) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -751,11 +769,6 @@ msgstr[0] "transakcja instalacyjna zakończona niepowodzeniem"
msgstr[1] "%d transakcji instalacyjnych zakończonych niepowodzeniem"
msgstr[2] "%d transakcji instalacyjnych zakończonych niepowodzeniem"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Instalacja jest możliwa"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -781,6 +794,11 @@ msgstr "Pakiet %s nie może zostać zainstalowany"
msgid "Packages %s can not be installed"
msgstr "Pakiety %s nie mogą zostać zainstalowane"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Instalacja jest możliwa"
+
#: ../urpm/md5sum.pm:20
#, c-format
msgid "examining %s file"
@@ -794,7 +812,8 @@ msgstr "ostrzeżenie: md5sum dla %s jest niedostępna w pliku MD5SUM"
#: ../urpm/media.pm:187
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "wirtualny nośnik \"%s\" powinien posiadać jasny URL, zignorowano nośnik"
+msgstr ""
+"wirtualny nośnik \"%s\" powinien posiadać jasny URL, zignorowano nośnik"
#: ../urpm/media.pm:189
#, c-format
@@ -815,28 +834,8 @@ msgstr "próba przełączenia istniejącego nośnika \"%s\", anulowano"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "zbyt dużo punktów montowania dla wymiennego nośnika \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "traktowanie napędu wymiennego jako \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "Nośnik \"%s\" jest obrazem ISO. Zostanie zamontowany w locie"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "używanie innego urządzenia wymiennego [%s] dla \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "nie można pobrać ścieżki dla nośnika wymiennego \"%s\""
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -897,12 +896,7 @@ msgstr "dodawanie nośnika %s przed zdalnym nośnikiem %s"
msgid "adding medium \"%s\""
msgstr "dodawanie nośnika %s"
-#: ../urpm/media.pm:750
-#, c-format
-msgid "unable to mount the distribution medium"
-msgstr "zamontowanie nośnika dystrybucji było niemożliwe"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "wygląda na to, że we wskazanej lokalizacji nie ma dystrybucji"
@@ -1019,18 +1013,7 @@ msgstr "polecenie genhdlist2 spowodowało błąd w %s"
msgid "comparing %s and %s"
msgstr "porównywanie %s i %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"Nie można uzyskać dostępu do nośnika \"%s\",\n"
-"To może się zdarzyć jeśli podczas tworzenia nośnika katalog został "
-"zamontowany ręcznie."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "nieprawidłowy plik hdlist %s dla nośnika %s"
@@ -1093,7 +1076,9 @@ msgstr "Odnalezienie serwera na liście serwerów %s nie było możliwe"
#: ../urpm/mirrors.pm:133
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
-msgstr "odnaleziono lokalizację geograficzną %s %.2f %.2f na podstawie strefy czasowej %s"
+msgstr ""
+"odnaleziono lokalizację geograficzną %s %.2f %.2f na podstawie strefy "
+"czasowej %s"
#: ../urpm/mirrors.pm:178
#, c-format
@@ -1197,36 +1182,21 @@ msgstr "znaleziono równoległą funkcję obsługi dla węzłów: %s"
msgid "unable to use parallel option \"%s\""
msgstr "nie można użyć równoległej opcji \"%s\""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "nie można uzyskać dostępu do nośnika \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "montowanie %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "odmontowywanie %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not available"
-msgstr "nośnik %s jest niedostępny"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "nie można czytać pliku rpm [%s] z nośnika \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "niespójny nośnik \"%s\" zaznaczony jako wymienny ale niekoniecznie"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "nie można uzyskać dostępu do nośnika \"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
@@ -1259,7 +1229,8 @@ msgstr " --version - wyświetla numer wersji tego programu.\n"
#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:131 ../urpmq:79
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
-msgstr " --env - używa określonego środowiska (typowo raport błędów).\n"
+msgstr ""
+" --env - używa określonego środowiska (typowo raport błędów).\n"
#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:76 ../urpmq:49
#, c-format
@@ -1270,8 +1241,10 @@ msgstr ""
#: ../urpm/search.pm:39 ../urpmf:39
#, c-format
-msgid " --literal, -l - don't match patterns, use argument as a literal string.\n"
-msgstr " --literal, -l - nie porównuj wzorców, użyj argumentu ciągu dosłownie.\n"
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+" --literal, -l - nie porównuj wzorców, użyj argumentu ciągu dosłownie.\n"
#: ../urpm/search.pm:40 ../urpme:52 ../urpmf:40 ../urpmi:111
#: ../urpmi.addmedia:69 ../urpmi.recover:36 ../urpmi.removemedia:46
@@ -1291,7 +1264,8 @@ msgstr ""
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
-msgid " --sortmedia - sort media according to substrings separated by comma.\n"
+msgid ""
+" --sortmedia - sort media according to substrings separated by comma.\n"
msgstr ""
" --sortmedia - sortuje nośniki w zależności od podciągów rozdzielonych\n"
" przecinkami.\n"
@@ -1398,7 +1372,8 @@ msgstr " --arch - architektura\n"
#: ../urpm/search.pm:62 ../urpmf:62
#, c-format
msgid " --buildhost - build host\n"
-msgstr " --buildhost - wyświetla znacznik buildhost: komputer budujący pakiet.\n"
+msgstr ""
+" --buildhost - wyświetla znacznik buildhost: komputer budujący pakiet.\n"
#: ../urpm/search.pm:63 ../urpmf:63
#, c-format
@@ -1549,7 +1524,8 @@ msgstr ""
#: ../urpm/select.pm:23
#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
"urpmi zostało uruchomione ponownie. Lista preferowanych pakietów uległa "
"zmianie: %s vs %s"
@@ -1660,7 +1636,8 @@ msgstr ""
#: ../urpme:48 ../urpmi:104 ../urpmq:65
#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
msgstr ""
" --force - wymusza wywoływanie nawet przy braku niektórych "
"pakietów.\n"
@@ -1737,10 +1714,13 @@ msgstr "Zaznaczanie do usunięcia następujących pakietów"
#: ../urpme:124
#, c-format
msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural "To satisfy dependencies, the following %d packages will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
msgstr[0] "W celu spełnienia zależności zostanie usunięty następujący pakiet"
-msgstr[1] "W celu spełnienia zależności zostaną usunięte następujące pakiety %d"
-msgstr[2] "W celu spełnienia zależności zostaną usunięte następujące pakiety %d (%d MB)"
+msgstr[1] ""
+"W celu spełnienia zależności zostaną usunięte następujące pakiety %d"
+msgstr[2] ""
+"W celu spełnienia zależności zostaną usunięte następujące pakiety %d (%d MB)"
#: ../urpme:128
#, c-format
@@ -1779,7 +1759,8 @@ msgstr ""
#: ../urpmi:78
#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
" --searchmedia - używa tylko podanych nośników podczas wyszukiwania "
"wymaganych pakietów.\n"
@@ -1795,8 +1776,10 @@ msgstr ""
#: ../urpmi:82 ../urpmq:52
#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - automatycznie wybiera pakiety aktualizujące system.\n"
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - automatycznie wybiera pakiety aktualizujące system.\n"
#: ../urpmi:83
#, c-format
@@ -1806,7 +1789,8 @@ msgstr " --auto-update - aktualizuje nośniki i aktualizuje system.\n"
#: ../urpmi:84
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
-msgstr " --no-md5sum - wyłącza sprawdzanie sumy kontrolnej MD5 dla pliku.\n"
+msgstr ""
+" --no-md5sum - wyłącza sprawdzanie sumy kontrolnej MD5 dla pliku.\n"
#: ../urpmi:85
#, c-format
@@ -1832,7 +1816,8 @@ msgstr ""
#: ../urpmi:88
#, c-format
msgid " --no-install - don't install packages (only download)\n"
-msgstr " --install-src - instalacja tylko pakietów źródłowych (bez binariów).\n"
+msgstr ""
+" --install-src - instalacja tylko pakietów źródłowych (bez binariów).\n"
#: ../urpmi:89 ../urpmq:55
#, c-format
@@ -1877,7 +1862,8 @@ msgstr " --install-src - instaluje tylko pakiet źródłowy (bez binariów).\n
#: ../urpmi:100
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
-msgstr " --clean - zaczyna od usuwania plików rpm z pamięci podręcznej.\n"
+msgstr ""
+" --clean - zaczyna od usuwania plików rpm z pamięci podręcznej.\n"
#: ../urpmi:101
#, c-format
@@ -1891,7 +1877,8 @@ msgstr " --justdb - aktualizuj tylko bazę rpm, a nie system plików.\n"
#: ../urpmi:103
#, c-format
-msgid " --replacepkgs - force installing packages which are already installed.\n"
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
msgstr ""
" --replacepkgs - wymuś instalację pakietów, które znajdują się już w "
"systemie.\n"
@@ -2035,7 +2022,8 @@ msgstr " --excludedocs - wyłącza pliki dokumentacji.\n"
#: ../urpmi:137
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
-msgstr " --ignoresize - anuluje sprawdzania miejsca na dysku przed instalacją.\n"
+msgstr ""
+" --ignoresize - anuluje sprawdzania miejsca na dysku przed instalacją.\n"
#: ../urpmi:138
#, c-format
@@ -2088,12 +2076,14 @@ msgstr " -a - wybiera wszystkie dopasowania w wierszu poleceń.\n"
#: ../urpmi:148
#, c-format
msgid " -p - allow search in provides to find package.\n"
-msgstr " -p - umożliwia wyszukiwanie serwerów przy szukaniu pakietów.\n"
+msgstr ""
+" -p - umożliwia wyszukiwanie serwerów przy szukaniu pakietów.\n"
#: ../urpmi:149
#, c-format
msgid " -P - do not search in provides to find package.\n"
-msgstr " -P - nie przeszukuje serwerów przy wyszukiwaniu pakietów.\n"
+msgstr ""
+" -P - nie przeszukuje serwerów przy wyszukiwaniu pakietów.\n"
#: ../urpmi:150
#, c-format
@@ -2108,7 +2098,8 @@ msgstr " --debug - tryb bardzo komunikatywny..\n"
#: ../urpmi:153
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
-msgstr " nazwy lub pliki rpm podane w wierszu poleceń zostaną zainstalowane.\n"
+msgstr ""
+" nazwy lub pliki rpm podane w wierszu poleceń zostaną zainstalowane.\n"
#: ../urpmi:181
#, c-format
@@ -2127,11 +2118,13 @@ msgstr ""
#: ../urpmi:215
#, c-format
msgid "You can't install binary rpm files when using --install-src"
-msgstr "Nie można instalować pakietów binarnych przy włączonej opcji --install-src"
+msgstr ""
+"Nie można instalować pakietów binarnych przy włączonej opcji --install-src"
#: ../urpmi:221
#, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
"użyj opcji --buildrequires lub --install-src, domyślna opcja to --"
"buildrequires"
@@ -2198,7 +2191,8 @@ msgstr "%s (do zainstalowania)"
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
-msgstr "W celu spełnienia zależności '%s' niezbędny jest jeden z poniższych pakietów:"
+msgstr ""
+"W celu spełnienia zależności '%s' niezbędny jest jeden z poniższych pakietów:"
#: ../urpmi:458
#, c-format
@@ -2312,7 +2306,8 @@ msgid ""
"dependencies:\n"
"%s\n"
msgstr ""
-"Aby zainstalować poniższe pakiety zależne uruchom polecenie urpmi z opcją --buildrequires.\n"
+"Aby zainstalować poniższe pakiety zależne uruchom polecenie urpmi z opcją --"
+"buildrequires.\n"
"%s\n"
#: ../urpmi:595
@@ -2330,7 +2325,12 @@ msgstr "Zostanie wykorzystany dodatkowy obszar na dysku: %s"
msgid "%s of disk space will be freed."
msgstr "Zostanie zwolniony obszar na dysku: %s."
-#: ../urpmi:603
+#: ../urpmi:604
+#, fuzzy, c-format
+msgid "%s of packages will be retrieved."
+msgstr "Zostanie zwolniony obszar na dysku: %s."
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2338,12 +2338,7 @@ msgstr[0] "Rozpocząć instalację jednego pakietu? "
msgstr[1] "Rozpocząć instalację %d pakietów?"
msgstr[2] "Rozpocząć instalację 1 pakietu? (%d MB)"
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Naciśnij enter jeśli jesteś gotowy(-a)..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Anuluj"
@@ -2356,7 +2351,7 @@ msgstr "ponownie uruchamianie urpmi"
#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
-#, c-format
+#, fuzzy, c-format
msgid ""
"usage: urpmi.addmedia [options] <name> <url>\n"
"where <url> is one of\n"
@@ -2364,7 +2359,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2387,7 +2382,8 @@ msgstr ""
" removable://<ścieżka> <względna nazwa pliku hdlist>\n"
"\n"
"użycie: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
-"użycie: urpmi.addmedia [options] --mirrorlist <url> <name> <względna ścieżka>\n"
+"użycie: urpmi.addmedia [options] --mirrorlist <url> <name> <względna "
+"ścieżka>\n"
"\n"
"przykłady:\n"
"\n"
@@ -2427,8 +2423,8 @@ msgid ""
"cfg(5)\n"
msgstr ""
" --xml-info - użyj jedną z zasad pobierania plików informacyjnych xml.\n"
-" Do wyboru są opcje: never, on-demand, update-only, always. cf urpmi."
-"cfg(5)\n"
+" Do wyboru są opcje: never, on-demand, update-only, "
+"always. cf urpmi.cfg(5)\n"
#: ../urpmi.addmedia:66
#, c-format
@@ -2457,7 +2453,8 @@ msgstr ""
#: ../urpmi.addmedia:72
#, c-format
msgid " --interactive - with --distrib, ask confirmation for each media\n"
-msgstr " --interactive - z --distrib, prośba o potwierdzenie dla każdego nośnika\n"
+msgstr ""
+" --interactive - z --distrib, prośba o potwierdzenie dla każdego nośnika\n"
#: ../urpmi.addmedia:73
#, c-format
@@ -2481,7 +2478,8 @@ msgstr " --virtual - tworzy nośniki, które są zawsze aktualne,\n"
#: ../urpmi.addmedia:77 ../urpmi.update:42
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
-msgstr " --no-md5sum - wyłącza sprawdzanie sumy kontrolnej MD5 dla pliku.\n"
+msgstr ""
+" --no-md5sum - wyłącza sprawdzanie sumy kontrolnej MD5 dla pliku.\n"
#: ../urpmi.addmedia:78
#, c-format
@@ -2493,12 +2491,7 @@ msgstr " --nopubkey - bez importu klucza publicznego dodanego nośnika\n"
msgid " --raw - add the media in config, but don't update it.\n"
msgstr " --raw - dodaje nośnik, ale go nie aktualizuje.\n"
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - czyści katalog nagłówków pamięci podręcznej.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - tryb cichy.\n"
@@ -2543,7 +2536,8 @@ msgstr "Utworzenie pliku konfiguracyjnego było niemożliwe [%s]"
#: ../urpmi.addmedia:134
#, c-format
msgid "no need to give <relative path of synthesis> with --distrib"
-msgstr "nie ma potrzeby podawania <ścieżki względnej do syntezy> z opcją --distrib"
+msgstr ""
+"nie ma potrzeby podawania <ścieżki względnej do syntezy> z opcją --distrib"
#: ../urpmi.addmedia:142
#, c-format
@@ -2600,7 +2594,8 @@ msgstr ""
#: ../urpmi.recover:37
#, c-format
-msgid " --list - list transactions since provided date/duration argument\n"
+msgid ""
+" --list - list transactions since provided date/duration argument\n"
msgstr ""
" --list - pokazuje listę zdarzeń wykonanych od wskazanej daty/przez "
"określony okres\n"
@@ -2608,7 +2603,8 @@ msgstr ""
#: ../urpmi.recover:38
#, c-format
msgid " --list-all - list all transactions in rpmdb (long)\n"
-msgstr " --list-all - wyświetla listę wszystkich zdarzeń w rpmdb (długie)\n"
+msgstr ""
+" --list-all - wyświetla listę wszystkich zdarzeń w rpmdb (długie)\n"
#: ../urpmi.recover:39
#, c-format
@@ -2811,7 +2807,8 @@ msgstr "Tylko administrator ma prawo aktualizować nośniki"
#: ../urpmi.update:76
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "brak elementów do aktualizacji (użyj urpmi.addmedia aby dodać nośnik)\n"
+msgstr ""
+"brak elementów do aktualizacji (użyj urpmi.addmedia aby dodać nośnik)\n"
#: ../urpmi.update:94
#, c-format
@@ -2897,17 +2894,21 @@ msgstr " --list-aliases - wypisuje dostępne równoległe aliasy.\n"
#: ../urpmq:62
#, c-format
-msgid " --dump-config - dump the config in form of urpmi.addmedia argument.\n"
-msgstr " --dump-config - zrzuca konfigurację w postaci urpmi.addmedia argument.\n"
+msgid ""
+" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+" --dump-config - zrzuca konfigurację w postaci urpmi.addmedia argument.\n"
#: ../urpmq:63
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
-msgstr " --src - następny pakiet jest pakietem źródłowym (tak jak -s).\n"
+msgstr ""
+" --src - następny pakiet jest pakietem źródłowym (tak jak -s).\n"
#: ../urpmq:64
#, 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 - wypisuje wszystkie pakiety źródłowe przed pobraniem\n"
" (tylko root).\n"
@@ -2934,21 +2935,31 @@ msgid " --changelog - print changelog.\n"
msgstr " --changelog - wyświetla dziennik zmian.\n"
#: ../urpmq:81
+#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - znaczniki konfliktów.\n"
+
+#: ../urpmq:82
#, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - wyświetla listę dostarczanych pakietów.\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - wszystkie zależności.\n"
+
+#: ../urpmq:84
#, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - nazwa pakietu rpm ze źródłami\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - wyświetla podsumowanie.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -2994,7 +3005,8 @@ msgstr " -g - wyświetla grupy wraz z ich nazwami.\n"
#: ../urpmq:96
#, c-format
msgid " -i - print useful information in human readable form.\n"
-msgstr " -i - wyświetla użyteczne informacje w czytelnej formie.\n"
+msgstr ""
+" -i - wyświetla użyteczne informacje w czytelnej formie.\n"
#: ../urpmq:97
#, c-format
@@ -3014,19 +3026,22 @@ msgstr " -r - wyświetla wersję i wydanie wraz z nazwą.\n"
#: ../urpmq:100
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
-msgstr " -s - następny pakiet jest pakietem źródłowym (tak jak --src).\n"
+msgstr ""
+" -s - następny pakiet jest pakietem źródłowym (tak jak --src).\n"
#: ../urpmq:101
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
-msgstr " -u - usuwa pakiet jeśli jest już zainstalowana lepsza wersja.\n"
+msgstr ""
+" -u - usuwa pakiet jeśli jest już zainstalowana lepsza wersja.\n"
#: ../urpmq:102
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
-msgstr " -y - wymusza wyszukiwanie niespójności (tak jak --fuzzy).\n"
+msgstr ""
+" -y - wymusza wyszukiwanie niespójności (tak jak --fuzzy).\n"
#: ../urpmq:103
#, c-format
@@ -3045,26 +3060,37 @@ msgstr " żądanie dotyczące nazw lub plików podanych w wierszu poleceń.\n"
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes może być użyta tylko z opcją --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, c-format
+msgid "use -l to list files"
+msgstr ""
+
+#: ../urpmq:363
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
-msgstr "brak informacji xml dla nośnika \"%s\", uzyskano częściowe wyniki dla pakietu %s"
+msgstr ""
+"brak informacji xml dla nośnika \"%s\", uzyskano częściowe wyniki dla "
+"pakietu %s"
#: ../urpmq:361
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
-msgstr "brak informacji xml dla nośnika %s, uzyskano częściowe wyniki dla pakietów %s"
+msgstr ""
+"brak informacji xml dla nośnika %s, uzyskano częściowe wyniki dla pakietów "
+"%s"
#: ../urpmq:364
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
"brak informacji xml dla nośnika %s, uzyskanie wyników dla pakietu %s było "
"niemożliwe"
#: ../urpmq:365
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
"brak informacji xml dla nośnika %s, uzyskanie wyników dla pakietów %s było "
"niemożliwe"
@@ -3074,3 +3100,41 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Nie znaleziono dziennika zmian\n"
+#~ msgid "Unknown option %s"
+#~ msgstr "Nieznane opcja %s"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "zbyt dużo punktów montowania dla wymiennego nośnika \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "traktowanie napędu wymiennego jako \"%s\""
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "Nośnik \"%s\" jest obrazem ISO. Zostanie zamontowany w locie"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "używanie innego urządzenia wymiennego [%s] dla \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "nie można pobrać ścieżki dla nośnika wymiennego \"%s\""
+
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "zamontowanie nośnika dystrybucji było niemożliwe"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "Nie można uzyskać dostępu do nośnika \"%s\",\n"
+#~ "To może się zdarzyć jeśli podczas tworzenia nośnika katalog został "
+#~ "zamontowany ręcznie."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "niespójny nośnik \"%s\" zaznaczony jako wymienny ale niekoniecznie"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Naciśnij enter jeśli jesteś gotowy(-a)..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - czyści katalog nagłówków pamięci podręcznej.\n"
diff --git a/po/pt.po b/po/pt.po
index 2de41ce8..77b81f82 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -24,7 +24,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2008-02-29 19:43+0000\n"
"Last-Translator: Zé <mmodem00@gmail.com>\n"
"Language-Team: Português <pt@li.org>\n"
@@ -121,12 +121,7 @@ msgstr "_Cancelar"
msgid "Choose location to save file"
msgstr "Escolha a localização para gravar o ficheiro"
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "Opção desconhecida %s"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "Nenhum pacote indicado"
@@ -201,13 +196,16 @@ msgstr ""
#: ../gurpmi2:215 ../urpmi:592
#, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
msgstr "Para satisfazer as dependências, o seguinte pacote irá ser instalado:"
#: ../gurpmi2:216 ../urpmi:593
#, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
-msgstr "Para satisfazer as dependências, os seguintes pacotes irão ser instalados:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr ""
+"Para satisfazer as dependências, os seguintes pacotes irão ser instalados:"
#: ../gurpmi2:218
#, c-format
@@ -236,12 +234,12 @@ msgstr "A preparar..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "A instalar o pacote `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Por favor insira a média com o nome \"%s\" no dispositivo [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "A transferir o pacote `%s'..."
@@ -435,6 +433,16 @@ msgstr "Demasiados argumentos\n"
msgid "Copying failed"
msgstr "Cópia falhada"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, c-format
+msgid "medium \"%s\" is not available"
+msgstr "a média \"%s\" não está disponível"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "não é possível ler o ficheiro rpm [%s] da média \"%s\""
+
#: ../urpm/cfg.pm:81
#, c-format
msgid "syntax error in config file at line %s"
@@ -604,8 +612,10 @@ msgstr "[reempacotamento]"
#: ../urpm/install.pm:154
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "transacção criada para instalar em %s (remove=%d, instala=%d, actualiza=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"transacção criada para instalar em %s (remove=%d, instala=%d, actualiza=%d)"
#: ../urpm/install.pm:157
#, c-format
@@ -742,7 +752,12 @@ msgstr "Tentar instalação sem verificar dependências? (s/N) "
msgid "Try harder to install (--force)? (y/N) "
msgstr "Tentar forçar a instalação (--force)? (s/N) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -758,11 +773,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "%d transacção de instalação falhada"
msgstr[1] "%d transacções de instalações falhadas"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "A instalação é possível"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -788,6 +798,11 @@ msgstr "O pacote %s não pode ser instalado"
msgid "Packages %s can not be installed"
msgstr "Os pacotes %s não podem ser instalados"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "A instalação é possível"
+
#: ../urpm/md5sum.pm:20
#, c-format
msgid "examining %s file"
@@ -820,28 +835,8 @@ msgstr "a tentar sobrepor a média existente \"%s\", a ignorar"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "demasiados pontos de montagem da média removível \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "considerar o dispositivo removível como \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "A média \"%s\" é uma imagem ISO, irá ser agora montada"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "a usar um dispositivo removível diferente [%s] para \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "não é possível recuperar a localização da média removível \"%s\""
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -902,12 +897,7 @@ msgstr "a adicionar média \"%s\" antes da média remota \"%s\""
msgid "adding medium \"%s\""
msgstr "a adicionar média \"%s\""
-#: ../urpm/media.pm:750
-#, c-format
-msgid "unable to mount the distribution medium"
-msgstr "não é possível montar a média de distribuição"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "esta localização não parece conter uma distribuição"
@@ -1024,17 +1014,7 @@ msgstr "o genhdlist2 falhou em %s"
msgid "comparing %s and %s"
msgstr "a comprar %s e %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"não é possível aceder à média \"%s\",\n"
-"isto pode acontecer se montou manualmente o directório ao criar a média."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ficheiro hdlist %s inválido para a média \"%s\""
@@ -1072,7 +1052,8 @@ msgstr "...chave %s importada do ficheiro de chaves públicas de \"%s\""
#: ../urpm/media.pm:1441
#, c-format
msgid "unable to import pubkey file of \"%s\""
-msgstr "não é possível importar o ficheiro de chaves públicas (pubkey) de \"%s\""
+msgstr ""
+"não é possível importar o ficheiro de chaves públicas (pubkey) de \"%s\""
#: ../urpm/media.pm:1512
#, c-format
@@ -1201,36 +1182,21 @@ msgstr "uso paralelo encontrado para nós: %s"
msgid "unable to use parallel option \"%s\""
msgstr "não é possível usar a opção paralela \"%s\""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "não é possível aceder à média \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "a montar %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "a desmontar %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not available"
-msgstr "a média \"%s\" não está disponível"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "não é possível ler o ficheiro rpm [%s] da média \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "média incoerente \"%s\" marcada como removível mas de facto não é"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "não é possível aceder à média \"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
@@ -1273,7 +1239,8 @@ msgstr " --excludemedia - não usa a média indicada, separada por vírgula.\n"
#: ../urpm/search.pm:39 ../urpmf:39
#, c-format
-msgid " --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
" --literal, -l - não combina médias padrões, usa o argumento como uma "
"string literal.\n"
@@ -1290,11 +1257,13 @@ msgstr ""
#: ../urpm/search.pm:41 ../urpmf:41 ../urpmi:75 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
-msgstr " --media - usa apenas a média indicada, separada por vírgula.\n"
+msgstr ""
+" --media - usa apenas a média indicada, separada por vírgula.\n"
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
-msgid " --sortmedia - sort media according to substrings separated by comma.\n"
+msgid ""
+" --sortmedia - sort media according to substrings separated by comma.\n"
msgstr ""
" --sortmedia - organiza as médias de acordo com as substrings separadas "
"por vírgula.\n"
@@ -1520,7 +1489,8 @@ msgstr " -m - a média onde o pacote foi encontrado\n"
#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:94
#, c-format
msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - mostra a versão, a saída e a arquitectura com o nome.\n"
+msgstr ""
+" -f - mostra a versão, a saída e a arquitectura com o nome.\n"
#: ../urpm/search.pm:197 ../urpmf:197
#, c-format
@@ -1550,11 +1520,13 @@ msgstr "nenhuma informação xml disponível para a média \"%s\""
#: ../urpm/select.pm:21
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr "o urpmi foi reiniciado, e a lista de prioridade de pacotes não foi alterada"
+msgstr ""
+"o urpmi foi reiniciado, e a lista de prioridade de pacotes não foi alterada"
#: ../urpm/select.pm:23
#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
"o urpmi foi reiniciado, e a lista de prioridades de pacotes foi alterada: %s "
"vs %s"
@@ -1653,22 +1625,27 @@ msgstr ""
#: ../urpme:46
#, c-format
msgid " --auto - automatically select a package in choices.\n"
-msgstr " --auto - selecciona automaticamente um pacote nas escolhas.\n"
+msgstr ""
+" --auto - selecciona automaticamente um pacote nas escolhas.\n"
#: ../urpme:47
#, c-format
msgid " --test - verify if the removal can be achieved correctly.\n"
-msgstr " --test - verifica se a remoção pode ser conseguida correctamente.\n"
+msgstr ""
+" --test - verifica se a remoção pode ser conseguida correctamente.\n"
#: ../urpme:48 ../urpmi:104 ../urpmq:65
#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - força a execução mesmo que alguns pacotes não existam.\n"
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - força a execução mesmo que alguns pacotes não existam.\n"
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
-msgstr " --parallel - urpmi distribuído através das máquinas dos apelidos.\n"
+msgstr ""
+" --parallel - urpmi distribuído através das máquinas dos apelidos.\n"
#: ../urpme:50 ../urpmi:140
#, c-format
@@ -1703,7 +1680,8 @@ msgstr " --verbose, -v - modo detalhado.\n"
#: ../urpme:57
#, c-format
msgid " -a - select all packages matching expression.\n"
-msgstr " -a - selecciona todos os pacotes correspondentes à expressão.\n"
+msgstr ""
+" -a - selecciona todos os pacotes correspondentes à expressão.\n"
#: ../urpme:70
#, c-format
@@ -1738,9 +1716,11 @@ msgstr "A verificar para remover os seguintes pacotes"
#: ../urpme:124
#, c-format
msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural "To satisfy dependencies, the following %d packages will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
msgstr[0] "Para satisfazer as dependências, o seguinte pacote será removido"
-msgstr[1] "Para satisfazer as dependências, os seguintes %d pacotes serão removidos"
+msgstr[1] ""
+"Para satisfazer as dependências, os seguintes %d pacotes serão removidos"
#: ../urpme:128
#, c-format
@@ -1777,7 +1757,8 @@ msgstr ""
#: ../urpmi:78
#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
" --searchmedia - usa apenas a média dada para procurar os pacotes "
"pedidos.\n"
@@ -1793,7 +1774,8 @@ msgstr ""
#: ../urpmi:82 ../urpmq:52
#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
msgstr ""
" --auto-select - selecciona automaticamente os pacotes para actualizar o "
"sistema.\n"
@@ -1816,7 +1798,8 @@ msgstr " --force-key - força a actualização da chave gpg.\n"
#: ../urpmi:86 ../urpmq:53
#, c-format
msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
-msgstr " --no-suggests - não selecciona automaticamente os pacotes \"sugeridos\".\n"
+msgstr ""
+" --no-suggests - não selecciona automaticamente os pacotes \"sugeridos\".\n"
#: ../urpmi:87
#, c-format
@@ -1855,7 +1838,8 @@ msgstr ""
#: ../urpmi:95
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
-msgstr " --split-length - pequeno comprimento de transacção, predefinido é %d.\n"
+msgstr ""
+" --split-length - pequeno comprimento de transacção, predefinido é %d.\n"
#: ../urpmi:97
#, c-format
@@ -1891,7 +1875,8 @@ msgstr ""
#: ../urpmi:103
#, c-format
-msgid " --replacepkgs - force installing packages which are already installed.\n"
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
msgstr ""
" --replacepkgs - força a instalação de pacotes que já se encontram "
"instalados.\n"
@@ -2037,7 +2022,8 @@ msgstr " --excludedocs - exclui os ficheiros de documentação.\n"
#: ../urpmi:137
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
-msgstr " --ignoresize - não verifica o espaço em disco antes da instalação\n"
+msgstr ""
+" --ignoresize - não verifica o espaço em disco antes da instalação\n"
#: ../urpmi:138
#, c-format
@@ -2078,12 +2064,14 @@ msgstr " --nolock - não tranca a base de dados rpm.\n"
#: ../urpmi:146
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
-msgstr " --strict-arch - apenas actualiza os pacotes com a mesma arquitectura.\n"
+msgstr ""
+" --strict-arch - apenas actualiza os pacotes com a mesma arquitectura.\n"
#: ../urpmi:147 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
-msgstr " -a - escolhe todas as correspondências na linha de comando.\n"
+msgstr ""
+" -a - escolhe todas as correspondências na linha de comando.\n"
#: ../urpmi:148
#, c-format
@@ -2137,7 +2125,8 @@ msgstr "Não pode instalar ficheiros rpm binários quando usar --install-src"
#: ../urpmi:221
#, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
"por favor use --buildrequires ou --install-src, predefinição para --"
"buildrequires"
@@ -2204,7 +2193,8 @@ msgstr "%s (para instalar)"
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
-msgstr "Para satisfazer as '%s' dependências, é necessário um dos seguintes pacotes:"
+msgstr ""
+"Para satisfazer as '%s' dependências, é necessário um dos seguintes pacotes:"
#: ../urpmi:458
#, c-format
@@ -2337,19 +2327,19 @@ msgstr "%s adicionais do espaço do disco irão ser usados."
msgid "%s of disk space will be freed."
msgstr "%s do espaço do disco irão ser libertados"
-#: ../urpmi:603
+#: ../urpmi:604
+#, fuzzy, c-format
+msgid "%s of packages will be retrieved."
+msgstr "%s do espaço do disco irão ser libertados"
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Prosseguir com a instalação do pacote?"
msgstr[1] "Prosseguir com a instalação dos %d pacotes?"
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Prima Enter quando estiver pronto..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Cancelar"
@@ -2362,7 +2352,7 @@ msgstr "a reiniciar urpmi"
#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
-#, c-format
+#, fuzzy, c-format
msgid ""
"usage: urpmi.addmedia [options] <name> <url>\n"
"where <url> is one of\n"
@@ -2370,7 +2360,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2392,7 +2382,8 @@ msgstr ""
" removable://<localização>\n"
"\n"
"uso: urpmi.addmedia [opções] --distrib --mirrorlist <url>\n"
-"uso: urpmi.addmedia [opções] --mirrorlist <url> <nome> <localização relativa>\n"
+"uso: urpmi.addmedia [opções] --mirrorlist <url> <nome> <localização "
+"relativa>\n"
"\n"
"exemplos:\n"
"\n"
@@ -2415,7 +2406,8 @@ msgstr " --curl - usa curl para transferir ficheiros distantes.\n"
#: ../urpmi.addmedia:57 ../urpmi.update:35 ../urpmq:74
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
-msgstr " --prozilla - usa o prozilla para transferir ficheiros distantes.\n"
+msgstr ""
+" --prozilla - usa o prozilla para transferir ficheiros distantes.\n"
#: ../urpmi.addmedia:63
#, c-format
@@ -2480,7 +2472,8 @@ msgstr ""
#: ../urpmi.addmedia:76
#, c-format
msgid " --virtual - create virtual media wich are always up-to-date.\n"
-msgstr " --virtual - cria uma média virtual que está sempre actualizada.\n"
+msgstr ""
+" --virtual - cria uma média virtual que está sempre actualizada.\n"
#: ../urpmi.addmedia:77 ../urpmi.update:42
#, c-format
@@ -2495,14 +2488,10 @@ msgstr " --nopubkey - não importa a chave pública da média adicionada\n"
#: ../urpmi.addmedia:79
#, c-format
msgid " --raw - add the media in config, but don't update it.\n"
-msgstr " --raw - adiciona a média na configuração, mas não a actualiza.\n"
-
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - limpa os cabeçalhos do directório cache .\n"
+msgstr ""
+" --raw - adiciona a média na configuração, mas não a actualiza.\n"
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - modo silencioso.\n"
@@ -2525,7 +2514,8 @@ msgstr "não é necessário nenhum argumento para --distrib --mirrorlist <url>"
#: ../urpmi.addmedia:118
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
-msgstr "<url> inválido (para directórios locais, a localização tem que ser absoluta)"
+msgstr ""
+"<url> inválido (para directórios locais, a localização tem que ser absoluta)"
#: ../urpmi.addmedia:122
#, c-format
@@ -2545,7 +2535,8 @@ msgstr "Não pode criar o ficheiro de configuração [%s]"
#: ../urpmi.addmedia:134
#, c-format
msgid "no need to give <relative path of synthesis> with --distrib"
-msgstr "não é necessário indicar o <localização relativa do synthesis> com --distrib"
+msgstr ""
+"não é necessário indicar o <localização relativa do synthesis> com --distrib"
#: ../urpmi.addmedia:142
#, c-format
@@ -2601,7 +2592,8 @@ msgstr ""
#: ../urpmi.recover:37
#, c-format
-msgid " --list - list transactions since provided date/duration argument\n"
+msgid ""
+" --list - list transactions since provided date/duration argument\n"
msgstr ""
" --list - lista transacções desde que dado o argumento de data/"
"duração\n"
@@ -2801,7 +2793,8 @@ msgstr " -f - força a actualização dos ficheiros synthesis.\n"
#: ../urpmi.update:51
#, c-format
msgid " -ff - really force updating synthesis\n"
-msgstr " -f - força realmente a actualização dos ficheiros synthesis.\n"
+msgstr ""
+" -f - força realmente a actualização dos ficheiros synthesis.\n"
#: ../urpmi.update:68
#, c-format
@@ -2885,7 +2878,8 @@ msgstr " --list-url - lista as médias disponíveis e as suas url.\n"
#: ../urpmq:60
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
-msgstr " --list-nodes - lista os nós disponíveis quando a usar --parallel.\n"
+msgstr ""
+" --list-nodes - lista os nós disponíveis quando a usar --parallel.\n"
#: ../urpmq:61
#, c-format
@@ -2894,7 +2888,8 @@ msgstr " --list-aliases - lista as aliases paralelas disponíveis.\n"
#: ../urpmq:62
#, c-format
-msgid " --dump-config - dump the config in form of urpmi.addmedia argument.\n"
+msgid ""
+" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
" --dump-config - deixa a configuração na forma de argumento urpmi."
"addmedia.\n"
@@ -2902,11 +2897,13 @@ msgstr ""
#: ../urpmq:63
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
-msgstr " --src - o próximo pacote é um pacote fonte (o mesmo que -s).\n"
+msgstr ""
+" --src - o próximo pacote é um pacote fonte (o mesmo que -s).\n"
#: ../urpmq:64
#, 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 - indica todos os pacotes fonte antes de transferir (apenas "
"root).\n"
@@ -2934,21 +2931,31 @@ msgid " --changelog - print changelog.\n"
msgstr " --changelog - mostra o registo das mudanças (changelog).\n"
#: ../urpmq:81
+#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - marcas de conflitos\n"
+
+#: ../urpmq:82
#, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - mostra os fornecidos\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - marcas de requeridos.\n"
+
+#: ../urpmq:84
#, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - mostra o nome do rpm de código fonte\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - mostra o sumário.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -2967,7 +2974,8 @@ msgstr " --whatrequires - reverte a procura para o que o pacote requer.\n"
msgid ""
" --whatrequires-recursive\n"
" - extended reverse search (includes virtual packages).\n"
-msgstr " -R - procura revertida extendida (inclui pacotes virtuais).\n"
+msgstr ""
+" -R - procura revertida extendida (inclui pacotes virtuais).\n"
#: ../urpmq:90
#, c-format
@@ -3012,7 +3020,8 @@ msgstr " -r - mostra a versão e o lançamento com o nome também.\
#: ../urpmq:100
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
-msgstr " -s - o próximo pacote é um pacote fonte (o mesmo que --src).\n"
+msgstr ""
+" -s - o próximo pacote é um pacote fonte (o mesmo que --src).\n"
#: ../urpmq:101
#, c-format
@@ -3026,24 +3035,32 @@ msgstr ""
#: ../urpmq:102
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
-msgstr " -y - impõe uma procura aproximada (o mesmo que --fuzzy).\n"
+msgstr ""
+" -y - impõe uma procura aproximada (o mesmo que --fuzzy).\n"
#: ../urpmq:103
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
-msgstr " -Y - como -y, mas força para corresponder sem capitalização.\n"
+msgstr ""
+" -Y - como -y, mas força para corresponder sem capitalização.\n"
#: ../urpmq:104
#, c-format
msgid " names or rpm files given on command line are queried.\n"
-msgstr " os nomes ou os ficheiros rpm dados na linha de comando são verificados.\n"
+msgstr ""
+" os nomes ou os ficheiros rpm dados na linha de comando são verificados.\n"
#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes pode apenas ser usado com --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, c-format
+msgid "use -l to list files"
+msgstr ""
+
+#: ../urpmq:363
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3059,14 +3076,16 @@ msgstr ""
#: ../urpmq:364
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
"nenhuma informação xml da média \"%s\", não é possível devolver qualquer "
"resultado do pacote %s"
#: ../urpmq:365
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
"nenhuma informação xml da média \"%s\", não é possível devolver qualquer "
"resultado dos pacotes %s"
@@ -3076,3 +3095,40 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Nenhum registo de mudanças (changelog) encontrado\n"
+#~ msgid "Unknown option %s"
+#~ msgstr "Opção desconhecida %s"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "demasiados pontos de montagem da média removível \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "considerar o dispositivo removível como \"%s\""
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "A média \"%s\" é uma imagem ISO, irá ser agora montada"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "a usar um dispositivo removível diferente [%s] para \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "não é possível recuperar a localização da média removível \"%s\""
+
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "não é possível montar a média de distribuição"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "não é possível aceder à média \"%s\",\n"
+#~ "isto pode acontecer se montou manualmente o directório ao criar a média."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "média incoerente \"%s\" marcada como removível mas de facto não é"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Prima Enter quando estiver pronto..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - limpa os cabeçalhos do directório cache .\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 30c49ff9..172d5283 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -23,7 +23,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2008-02-14 14:13-0300\n"
"Last-Translator: \n"
"Language-Team: Brazilian Portuguese <pt@li.org>\n"
@@ -122,12 +122,7 @@ msgstr "_Cancelar"
msgid "Choose location to save file"
msgstr "Escolha o local para salvar o arquivo"
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "Opção desconhecida %s"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "Nenhum pacote especificado"
@@ -239,12 +234,12 @@ msgstr "Preparando..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Instalando pacote `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Insira a mídia chamada \"%s\" no dispositivo [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Baixando o pacote `%s'..."
@@ -437,6 +432,16 @@ msgstr "Muitos parâmetros\n"
msgid "Copying failed"
msgstr "Falha na cópia"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, c-format
+msgid "medium \"%s\" is not available"
+msgstr "mídia \"%s\" não está disponível"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "incapaz de ler o arquivo rpm [%s] para a mídia \"%s\""
+
#: ../urpm/cfg.pm:81
#, c-format
msgid "syntax error in config file at line %s"
@@ -745,7 +750,12 @@ msgstr "Tentar instalar sem checar as dependências? (s/N) "
msgid "Try harder to install (--force)? (y/N) "
msgstr "Forçar instalação (--force)? (s/N) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -761,11 +771,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "%d transação de instalação falhou"
msgstr[1] "%d transações de instalação falharam"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Instalação é possível"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -791,6 +796,11 @@ msgstr "Pacotes %s já estão instalados"
msgid "Packages %s can not be installed"
msgstr "Pacotes %s não podem ser instalados"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Instalação é possível"
+
#: ../urpm/md5sum.pm:20
#, c-format
msgid "examining %s file"
@@ -823,28 +833,8 @@ msgstr "tentando contornar mídia existente \"%s\", evitando"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "muitos pontos de montagem para a mídia removível \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "considerando dispositivos removíveis como \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "A mídia \"%s\" é uma imagem ISO e poderá ser montada automaticamente"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "usando diferentes dispositivos removíveis [%s] para \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "incapaz de buscar caminhos para mídia removível \"%s\""
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -905,12 +895,7 @@ msgstr "adicionando mídia \"%s\" antes da mídia remota \"%s\""
msgid "adding medium \"%s\""
msgstr "adicionando a mídia \"%s\""
-#: ../urpm/media.pm:750
-#, c-format
-msgid "unable to mount the distribution medium"
-msgstr "incapaz de montar a mídia da distribuição"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "não foi encontrada uma distribuinão nesta localização"
@@ -1026,18 +1011,7 @@ msgstr "genhdlist2 falhou em %s"
msgid "comparing %s and %s"
msgstr "comparando %s e %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"incapaz de acessar a mídia \"%s\",\n"
-"verifique se não é necessário montar manualmente o diretório no qual ela foi "
-"criada."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "hdlist inválido %s para a mídia \"%s\""
@@ -1204,36 +1178,21 @@ msgstr "encontrado manipulador paralelo para os nós: %s"
msgid "unable to use parallel option \"%s\""
msgstr "incapaz de usar a opção paralela \"%s\""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "incapaz de acessar a mídia \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "montando %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "desmontando %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not available"
-msgstr "mídia \"%s\" não está disponível"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "incapaz de ler o arquivo rpm [%s] para a mídia \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "mídia inconsistente \"%s\" marcada como removível, porém não é"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "incapaz de acessar a mídia \"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
@@ -2346,19 +2305,19 @@ msgstr "%s de espaço adicional em disco serão usados."
msgid "%s of disk space will be freed."
msgstr "%s de espaço em disco serão liberados."
-#: ../urpmi:603
+#: ../urpmi:604
+#, fuzzy, c-format
+msgid "%s of packages will be retrieved."
+msgstr "%s de espaço em disco serão liberados."
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Proceder a instalação de um pacote?"
msgstr[1] "Proceder a instalação de %d pacotes?"
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Tecle Enter quando estiver pronto..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Cancelar"
@@ -2371,7 +2330,7 @@ msgstr "reiniciando urpmi"
#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
-#, c-format
+#, fuzzy, c-format
msgid ""
"usage: urpmi.addmedia [options] <name> <url>\n"
"where <url> is one of\n"
@@ -2379,7 +2338,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2490,7 +2449,8 @@ msgstr ""
#: ../urpmi.addmedia:76
#, c-format
msgid " --virtual - create virtual media wich are always up-to-date.\n"
-msgstr " --virtual - cria mídias virtuais que estão sempre atualizadas.\n"
+msgstr ""
+" --virtual - cria mídias virtuais que estão sempre atualizadas.\n"
#: ../urpmi.addmedia:77 ../urpmi.update:42
#, c-format
@@ -2507,12 +2467,7 @@ msgstr " --nopubkey - não importa chave pública da mídia adicionada\n"
msgid " --raw - add the media in config, but don't update it.\n"
msgstr " --raw - adiciona a mídia à configuração, sem atualizá-la.\n"
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - limpa o diretório dos cabeçalhos de cache.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - modo silencioso (não informativo).\n"
@@ -2943,21 +2898,31 @@ msgid " --changelog - print changelog.\n"
msgstr " --changelog - imprime 'changelog'.\n"
#: ../urpmq:81
+#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - lista conflitos\n"
+
+#: ../urpmq:82
#, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - lista provides.\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - lista dos que requerem o pacote\n"
+
+#: ../urpmq:84
#, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - lista o pacote fonte do rpm\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - imprime sumário.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -3056,7 +3021,12 @@ msgstr " nomes ou arquivos rpm dados na linha de comando são consultados \n"
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes só pode ser usado com --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "incapaz de gravar lista de arquivos de \"%s\""
+
+#: ../urpmq:363
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr "sem xml info para a mídia \"%s\", resultado parcial para o pacote %s"
@@ -3087,6 +3057,46 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Arquivo com as alterações não foi encontrado \n"
+#~ msgid "Unknown option %s"
+#~ msgstr "Opção desconhecida %s"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "muitos pontos de montagem para a mídia removível \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "considerando dispositivos removíveis como \"%s\""
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr ""
+#~ "A mídia \"%s\" é uma imagem ISO e poderá ser montada automaticamente"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "usando diferentes dispositivos removíveis [%s] para \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "incapaz de buscar caminhos para mídia removível \"%s\""
+
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "incapaz de montar a mídia da distribuição"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "incapaz de acessar a mídia \"%s\",\n"
+#~ "verifique se não é necessário montar manualmente o diretório no qual ela "
+#~ "foi criada."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "mídia inconsistente \"%s\" marcada como removível, porém não é"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Tecle Enter quando estiver pronto..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - limpa o diretório dos cabeçalhos de cache.\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "mídia virtual precisar ser local"
@@ -3415,9 +3425,6 @@ msgstr "Arquivo com as alterações não foi encontrado \n"
#~ msgid "file [%s] already used in the same medium \"%s\""
#~ msgstr "arquivo [%s] já está em uso na mesma mídia \"%s\""
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "incapaz de gravar lista de arquivos de \"%s\""
-
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "Nada escrito na lista para \"%s\""
diff --git a/po/ro.po b/po/ro.po
index 00286650..748dcace 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-ro\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2004-10-17 14:38+0300\n"
"Last-Translator: Ovidiu Constantin <ovidiusoft@gmail.com>\n"
"Language-Team: Romanian <rtfs-project@lists.sourceforge.net>\n"
@@ -114,14 +114,7 @@ msgstr "_Renunţă"
msgid "Choose location to save file"
msgstr "Alegeţi locul unde salvez fişierul"
-#: ../gurpmi.pm:80
-#, fuzzy, c-format
-msgid "Unknown option %s"
-msgstr ""
-"\n"
-"opţiuni necunoscute '%s'\n"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Nu a fost specificată nici o comandă"
@@ -233,12 +226,12 @@ msgstr "Pregătire..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Instalarea pachetului `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Vă rog să introduceţi mediul numit \"%s\" în dispozitivul [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Descarc pachetul `%s'..."
@@ -430,6 +423,16 @@ msgstr ""
msgid "Copying failed"
msgstr "Copierea a eşuat"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "mediul \"%s\" nu este selectat"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "nu pot citi fişierul rpm [%s] de pe mediul \"%s\""
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -738,7 +741,12 @@ msgstr "Să încerc instalarea fără verificarea dependenţelor? (d/N) "
msgid "Try harder to install (--force)? (y/N) "
msgstr "Încearcă instalarea încă şi mai dur (--force)? (d/N) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -753,11 +761,6 @@ msgstr[0] "%d tranzacţii de instalarea eşuate"
msgstr[1] "%d tranzacţii de instalarea eşuate"
msgstr[2] "%d tranzacţii de instalarea eşuate"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Instalarea este posibilă"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -783,6 +786,11 @@ msgstr "totul este deja instalat"
msgid "Packages %s can not be installed"
msgstr "totul este deja instalat"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Instalarea este posibilă"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -816,29 +824,9 @@ msgstr "încerc să sar pentru mediul existent \"%s\", evitare"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "prea multe puncte de montare pentru mediul \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "consider dispozitivul mobil ca \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+msgid "failed to migrate removable device, ignoring media"
msgstr ""
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "folosesc dispozitive mobile diferite [%s] pentru \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "nu pot obţine calea pentru mediul \"%s\""
-
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
msgid "wrote config file [%s]"
@@ -898,12 +886,7 @@ msgstr "citest antetele de pe mediul \"%s\""
msgid "adding medium \"%s\""
msgstr "elimin mediul \"%s\""
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "nu pot accesa primul mediu de instalare"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -1018,18 +1001,7 @@ msgstr "examinez fişierul hdlist [%s]"
msgid "comparing %s and %s"
msgstr "instalez %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"nu pot accesa mediul \"%s\",\n"
-"asta se poate întampla dacă aţi montat manual directorul când aţi creat "
-"mediul."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "nu a fost găsit nici un fişier hdlist pentru mediul \"%s\""
@@ -1196,36 +1168,21 @@ msgstr "am găsit descriptorul paralel pentru nodurile: %s"
msgid "unable to use parallel option \"%s\""
msgstr "nu pot folosi opţiunea parallel \"%s\""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "nu pot accesa mediul \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "montez %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "demontare %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "mediul \"%s\" nu este selectat"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "nu pot citi fişierul rpm [%s] de pe mediul \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "mediu incoerent \"%s\" marcat ca mobil dar nu este aşa"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "nu pot accesa mediul \"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, fuzzy, c-format
msgid ""
@@ -2330,7 +2287,12 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2338,12 +2300,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Apăsaţi Enter când e gata..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Renunţă"
@@ -2364,7 +2321,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2491,12 +2448,7 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - curăţă directorul cache antete.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - mod silenţios.\n"
@@ -2925,21 +2877,33 @@ msgstr " --changelog - afişează jurnalul modificărilor\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr ""
+" --conflicts - afişează eticheta Conflicte: toate conflictele (linii "
+"multiple).\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr ""
" --provides - afişează eticheta Oferă: tot ce oferă (linii multiple).\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - afişează eticheta Necesită: toate necesităţile.\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - afişare etichetă sourcepm: sursa rpm.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - afişare etichetă Sumar: sumar.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -3036,7 +3000,12 @@ msgstr " numele sau fişierele rpm date în linia de comandă sunt interogate.\
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes poate fi folosit numai cu --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "nu pot scrie fişierul listă pentru \"%s\""
+
+#: ../urpmq:363
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3071,6 +3040,46 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Nu s-a gasit changelog\n"
+#, fuzzy
+#~ msgid "Unknown option %s"
+#~ msgstr ""
+#~ "\n"
+#~ "opţiuni necunoscute '%s'\n"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "prea multe puncte de montare pentru mediul \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "consider dispozitivul mobil ca \"%s\""
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "folosesc dispozitive mobile diferite [%s] pentru \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "nu pot obţine calea pentru mediul \"%s\""
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "nu pot accesa primul mediu de instalare"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "nu pot accesa mediul \"%s\",\n"
+#~ "asta se poate întampla dacă aţi montat manual directorul când aţi creat "
+#~ "mediul."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "mediu incoerent \"%s\" marcat ca mobil dar nu este aşa"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Apăsaţi Enter când e gata..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - curăţă directorul cache antete.\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "mediul virtual trebuie să fir local"
@@ -3351,9 +3360,6 @@ msgstr "Nu s-a gasit changelog\n"
#~ msgid "file [%s] already used in the same medium \"%s\""
#~ msgstr "fişierul [%s] este deja folosit în acelaşi mediu \"%s\""
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "nu pot scrie fişierul listă pentru \"%s\""
-
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "nu s-a scris nimic în fişierul listă pentru \"%s\""
diff --git a/po/ru.po b/po/ru.po
index f969b27f..c131518f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2008-02-26 15:54+0200\n"
"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
"Language-Team: Russian <gnu@mx.ru>\n"
@@ -19,8 +19,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30
-#: ../gurpmi2:65
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "Установка RPM"
@@ -30,9 +29,7 @@ msgstr "Установка RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Ошибка: невозможно найти файл %s, операция отменяется"
-#: ../gurpmi:45
-#: ../gurpmi2:152
-#: ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
#, c-format
msgid "_Ok"
msgstr "_ОК"
@@ -44,7 +41,8 @@ msgid ""
"\n"
"%s\n"
"\n"
-"You probably didn't want to install it on your computer (installing it would allow you to make modifications to its sourcecode then compile it).\n"
+"You probably didn't want to install it on your computer (installing it would "
+"allow you to make modifications to its sourcecode then compile it).\n"
"\n"
"What would you like to do?"
msgstr ""
@@ -57,8 +55,7 @@ msgstr ""
"\n"
"Что хотите сделать?"
-#: ../gurpmi:73
-#: ../gurpmi:84
+#: ../gurpmi:73 ../gurpmi:84
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -98,8 +95,7 @@ msgstr "_Установить"
msgid "_Save"
msgstr "_Сохранить"
-#: ../gurpmi:99
-#: ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:152
#, c-format
msgid "_Cancel"
msgstr "_Отмена"
@@ -109,12 +105,7 @@ msgstr "_Отмена"
msgid "Choose location to save file"
msgstr "Укажите местоположение, где сохранить файл"
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "Неизвестная опция %s"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "Пакеты не указаны"
@@ -145,8 +136,7 @@ msgstr ""
msgid "Warning"
msgstr "Внимание"
-#: ../gurpmi2:114
-#: ../urpmi:626
+#: ../gurpmi2:114 ../urpmi:626
#, c-format
msgid "Ok"
msgstr "ОК"
@@ -187,16 +177,16 @@ msgstr ""
"%s\n"
"Всё равно продолжить установку?"
-#: ../gurpmi2:215
-#: ../urpmi:592
+#: ../gurpmi2:215 ../urpmi:592
#, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
msgstr "Для удовлетворения зависимостей будет установлен следующий пакет:"
-#: ../gurpmi2:216
-#: ../urpmi:593
+#: ../gurpmi2:216 ../urpmi:593
#, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Для удовлетворения зависимостей будут установлены следующие пакеты:"
#: ../gurpmi2:218
@@ -211,14 +201,12 @@ msgstr[1] "(%d пакетов, %d МБ)"
msgid "Package installation..."
msgstr "Устанавливается пакет..."
-#: ../gurpmi2:226
-#: ../urpm/main_loop.pm:48
+#: ../gurpmi2:226 ../urpm/main_loop.pm:48
#, c-format
msgid "unable to get source packages, aborting"
msgstr "невозможно получить пакеты с исходными кодами, аварийное завершение"
-#: ../gurpmi2:240
-#: ../urpm/install.pm:81
+#: ../gurpmi2:240 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Подготовка..."
@@ -228,13 +216,12 @@ msgstr "Подготовка..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Устанавливается пакет `%s' (%s/%s)..."
-#: ../gurpmi2:260
-#: ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Пожалуйста, вставьте носитель с названием \"%s\" в устройство [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Загружается пакет `%s'..."
@@ -244,8 +231,7 @@ msgstr "Загружается пакет `%s'..."
msgid "_Done"
msgstr "_Готово"
-#: ../gurpmi2:296
-#: ../urpm/main_loop.pm:258
+#: ../gurpmi2:296 ../urpm/main_loop.pm:258
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -256,9 +242,7 @@ msgstr ""
"%s\n"
"Возможно вам необходимо обновить базу данных urpmi"
-#: ../gurpmi2:302
-#: ../urpm/main_loop.pm:196
-#: ../urpm/main_loop.pm:214
+#: ../gurpmi2:302 ../urpm/main_loop.pm:196 ../urpm/main_loop.pm:214
#: ../urpm/main_loop.pm:232
#, c-format
msgid "Installation failed:"
@@ -274,8 +258,7 @@ msgstr "Все уже установлено"
msgid "Installation finished"
msgstr "Установка завершена"
-#: ../gurpmi2:310
-#: ../urpme:132
+#: ../gurpmi2:310 ../urpme:132
#, c-format
msgid "removing %s"
msgstr "удаляется %s"
@@ -314,8 +297,7 @@ msgstr " по умолчанию %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - выводить полное имя rpm (NVRA)\n"
-#: ../rurpmi:11
-#: ../urpmi:269
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Только суперпользователю разрешается устанавливать пакеты"
@@ -350,18 +332,13 @@ msgstr "неверное имя rpm-файла [%s]"
msgid "retrieving rpm file [%s] ..."
msgstr "извлекается rpm-файл [%s] ..."
-#: ../urpm.pm:232
-#: ../urpm/get_pkgs.pm:160
+#: ../urpm.pm:232 ../urpm/get_pkgs.pm:160
#, c-format
msgid "...retrieving done"
msgstr "...извлечение выполнено"
-#: ../urpm.pm:235
-#: ../urpm/download.pm:691
-#: ../urpm/get_pkgs.pm:162
-#: ../urpm/media.pm:771
-#: ../urpm/media.pm:1199
-#: ../urpm/media.pm:1375
+#: ../urpm.pm:235 ../urpm/download.pm:691 ../urpm/get_pkgs.pm:162
+#: ../urpm/media.pm:771 ../urpm/media.pm:1199 ../urpm/media.pm:1375
#, c-format
msgid "...retrieving failed: %s"
msgstr "...извлечение не удалось: %s"
@@ -396,8 +373,7 @@ msgstr "ошибка регистрации локальных пакетов"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Эта операция запрещена при работе в ограниченном режиме"
-#: ../urpm/args.pm:130
-#: ../urpm/args.pm:139
+#: ../urpm/args.pm:130 ../urpm/args.pm:139
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "неверное объявление proxy в командной строке\n"
@@ -410,7 +386,9 @@ msgstr "urpmq: невозможно прочитать rpm-файл \"%s\"\n"
#: ../urpm/args.pm:353
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
-msgstr "по умолчанию urpmf ожидает регулярное выражение. Используйте параметр \"--literal\""
+msgstr ""
+"по умолчанию urpmf ожидает регулярное выражение. Используйте параметр \"--"
+"literal\""
#: ../urpm/args.pm:419
#, c-format
@@ -422,8 +400,7 @@ msgstr "Каталог chroot не существует"
msgid "Can't use %s without %s"
msgstr "%s нельзя использовать без %s"
-#: ../urpm/args.pm:441
-#: ../urpm/args.pm:444
+#: ../urpm/args.pm:441 ../urpm/args.pm:444
#, c-format
msgid "Can't use %s with %s"
msgstr "%s нельзя использовать без %s"
@@ -433,12 +410,21 @@ msgstr "%s нельзя использовать без %s"
msgid "Too many arguments\n"
msgstr "Слишком много аргументов\n"
-#: ../urpm/bug_report.pm:48
-#: ../urpmi:247
+#: ../urpm/bug_report.pm:48 ../urpmi:247
#, c-format
msgid "Copying failed"
msgstr "Копирование не удалось"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, c-format
+msgid "medium \"%s\" is not available"
+msgstr "источник \"%s\" недоступен"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "невозможно прочитать rpm-файл [%s] из источника \"%s\""
+
#: ../urpm/cfg.pm:81
#, c-format
msgid "syntax error in config file at line %s"
@@ -454,9 +440,7 @@ msgstr "невозможно прочитать конфигурационный
msgid "medium `%s' is defined twice, aborting"
msgstr "источник '%s' определён дважды; останов"
-#: ../urpm/cfg.pm:250
-#: ../urpm/media.pm:450
-#: ../urpm/media.pm:456
+#: ../urpm/cfg.pm:250 ../urpm/media.pm:450 ../urpm/media.pm:456
#, c-format
msgid "unable to write config file [%s]"
msgstr "невозможно записать конфигурационный файл [%s]"
@@ -594,7 +578,8 @@ msgstr "неверно сформированный URL: [%s]"
#: ../urpm/get_pkgs.pm:149
#, c-format
msgid "sorry, you can't use --install-src to install remote .src.rpm files"
-msgstr "параметр --install-src нельзя использовать для установки файлов .src.rpm"
+msgstr ""
+"параметр --install-src нельзя использовать для установки файлов .src.rpm"
#: ../urpm/get_pkgs.pm:156
#, c-format
@@ -608,8 +593,10 @@ msgstr "[повторная упаковка]"
#: ../urpm/install.pm:154
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "создана транзакция для установки на %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"создана транзакция для установки на %s (remove=%d, install=%d, upgrade=%d)"
#: ../urpm/install.pm:157
#, c-format
@@ -631,8 +618,7 @@ msgstr "невозможно установить пакет %s"
msgid "removing bad rpm (%s) from %s"
msgstr "удаляются неверные rpm-файлы (%s) из %s"
-#: ../urpm/install.pm:197
-#: ../urpm/install.pm:254
+#: ../urpm/install.pm:197 ../urpm/install.pm:254
#, c-format
msgid "removing %s failed: %s"
msgstr "не удалось удалить %s: %s"
@@ -677,8 +663,7 @@ msgstr "Сервер не определён; отсутствует URI или
msgid "No base defined"
msgstr "База не определена"
-#: ../urpm/ldap.pm:172
-#: ../urpm/ldap.pm:175
+#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
#, c-format
msgid "Cannot connect to ldap uri:"
msgstr "невозможно подключиться к ldap по URI:"
@@ -713,9 +698,7 @@ msgstr "Следующие пакеты имеют неверные подпис
msgid "Do you want to continue installation ?"
msgstr "Продолжить установку?"
-#: ../urpm/main_loop.pm:125
-#: ../urpm/main_loop.pm:203
-#: ../urpm/main_loop.pm:221
+#: ../urpm/main_loop.pm:125 ../urpm/main_loop.pm:203 ../urpm/main_loop.pm:221
#, c-format
msgid "Installation failed"
msgstr "Установка не удалась"
@@ -750,7 +733,12 @@ msgstr "Попробовать установить без проверки за
msgid "Try harder to install (--force)? (y/N) "
msgstr "Попробовать принудительную установку (--force)? (y/N)"
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -766,11 +754,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "%d установочная транзакция завершилась неудачей"
msgstr[1] "%d установочных транзакций завершились неудачей"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Установка возможна."
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -796,6 +779,11 @@ msgstr "Пакет %s невозможно установить"
msgid "Packages %s can not be installed"
msgstr "Пакеты %s невозможно установить"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Установка возможна."
+
#: ../urpm/md5sum.pm:20
#, c-format
msgid "examining %s file"
@@ -809,7 +797,9 @@ msgstr "предупреждение: в файле MD5SUM нет md5-суммы
#: ../urpm/media.pm:187
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "виртуальный источник \"%s\" должен содержать пустой url; источник проигнорирован"
+msgstr ""
+"виртуальный источник \"%s\" должен содержать пустой url; источник "
+"проигнорирован"
#: ../urpm/media.pm:189
#, c-format
@@ -828,32 +818,10 @@ msgstr "попытка переопределить существующий и
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "слишком много точек монтирования для съёмного источника \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "съёмное устройство принимается как \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "Источник \"%s\" является ISO образом, будет примонтирован на лету"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "используется другое съёмное устройство [%s] для \"%s\""
-
-#: ../urpm/media.pm:421
-#: ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "невозможно получить путь к съёмному источнику \"%s\""
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
-#: ../urpm/media.pm:452
-#: ../urpm/media.pm:458
+#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
msgid "wrote config file [%s]"
msgstr "записан конфигурационный файл [%s]"
@@ -870,8 +838,12 @@ msgstr "используется связанный источник для ре
#: ../urpm/media.pm:525
#, c-format
-msgid "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --update, --use-distrib or --parallel"
-msgstr "опцию --synthesis нельзя использовать с --media, --excludemedia, --sortmedia, --update или --parallel"
+msgid ""
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update, --use-distrib or --parallel"
+msgstr ""
+"опцию --synthesis нельзя использовать с --media, --excludemedia, --"
+"sortmedia, --update или --parallel"
#: ../urpm/media.pm:612
#, c-format
@@ -908,12 +880,7 @@ msgstr "добавляется источник \"%s\" (перед удалён
msgid "adding medium \"%s\""
msgstr "добавляется источник \"%s\""
-#: ../urpm/media.pm:750
-#, c-format
-msgid "unable to mount the distribution medium"
-msgstr "невозможно промонтировать источник с дистрибутивом"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "невозможно найти дистрибутив по этому адресу"
@@ -983,15 +950,12 @@ msgstr "изучается файл synthesis [%s]"
msgid "problem reading synthesis file of medium \"%s\""
msgstr "проблема чтения файла synthesis источника \"%s\""
-#: ../urpm/media.pm:1088
-#: ../urpm/media.pm:1171
+#: ../urpm/media.pm:1088 ../urpm/media.pm:1171
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "копируется [%s] для источника \"%s\"..."
-#: ../urpm/media.pm:1090
-#: ../urpm/media.pm:1145
-#: ../urpm/media.pm:1391
+#: ../urpm/media.pm:1090 ../urpm/media.pm:1145 ../urpm/media.pm:1391
#, c-format
msgid "...copying failed"
msgstr "...копирование не удалось"
@@ -1001,8 +965,7 @@ msgstr "...копирование не удалось"
msgid "copying description file of \"%s\"..."
msgstr "копируется файл описания для \"%s\"..."
-#: ../urpm/media.pm:1143
-#: ../urpm/media.pm:1175
+#: ../urpm/media.pm:1143 ../urpm/media.pm:1175
#, c-format
msgid "...copying done"
msgstr "...копирование выполнено"
@@ -1017,8 +980,7 @@ msgstr "копирование [%s] не удалось (файл подозри
msgid "computing md5sum of retrieved source synthesis"
msgstr "вычисляется md5-сумма для загруженного synthesis-файла источника"
-#: ../urpm/media.pm:1212
-#: ../urpm/media.pm:1629
+#: ../urpm/media.pm:1212 ../urpm/media.pm:1629
#, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "копирование [%s] не удалось (md5-суммы не совпадают)"
@@ -1033,16 +995,7 @@ msgstr "ошибка выполнения genhdlist2 для %s"
msgid "comparing %s and %s"
msgstr "сравниваются %s и %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the medium."
-msgstr ""
-"нет доступа к источнику \"%s\",\n"
-"это могло произойти потому, что при создании источника каталог был примонтирован вручную."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "неверный файл hdlist %s для источника \"%s\""
@@ -1062,8 +1015,7 @@ msgstr "загружается synthesis-файл источника из \"%s\"
msgid "found probed synthesis as %s"
msgstr "найден искомый synthesis-файл: %s"
-#: ../urpm/media.pm:1374
-#: ../urpm/media.pm:1482
+#: ../urpm/media.pm:1374 ../urpm/media.pm:1482
#, c-format
msgid "no synthesis file found for medium \"%s\""
msgstr "не найден synthesis-файл для источника \"%s\""
@@ -1113,24 +1065,14 @@ msgstr "найдено географическое расположение %s
msgid "getting mirror list from %s"
msgstr "загружается список зеркал из %s"
-#: ../urpm/msg.pm:62
-#: ../urpmi:506
-#: ../urpmi:522
-#: ../urpmi:611
+#: ../urpm/msg.pm:62 ../urpmi:506 ../urpmi:522 ../urpmi:611
#, c-format
msgid "Nn"
msgstr "NnНн"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63
-#: ../urpme:37
-#: ../urpmi:507
-#: ../urpmi:523
-#: ../urpmi:562
-#: ../urpmi:612
-#: ../urpmi:642
-#: ../urpmi:648
-#: ../urpmi.addmedia:139
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:507 ../urpmi:523 ../urpmi:562
+#: ../urpmi:612 ../urpmi:642 ../urpmi:648 ../urpmi.addmedia:139
#, c-format
msgid "Yy"
msgstr "YyДд"
@@ -1195,8 +1137,7 @@ msgstr "МБ"
msgid "GB"
msgstr "ГБ"
-#: ../urpm/msg.pm:189
-#: ../urpm/msg.pm:198
+#: ../urpm/msg.pm:189 ../urpm/msg.pm:198
#, c-format
msgid "TB"
msgstr "ТБ"
@@ -1221,427 +1162,336 @@ msgstr "найден обработчик parallel для узлов: %s"
msgid "unable to use parallel option \"%s\""
msgstr "невозможно использовать опцию parallel \"%s\""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "нет доступа к источнику \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "монтируется %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "отмонтируется %s"
-#: ../urpm/removable.pm:112
-#: ../urpm/removable.pm:117
-#: ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not available"
-msgstr "источник \"%s\" недоступен"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "невозможно прочитать rpm-файл [%s] из источника \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "непонятный источник \"%s\" отмечен как съёмный, но это не так"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "нет доступа к источнику \"%s\""
-
-#: ../urpm/search.pm:29
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
"urpmf version %s\n"
"Copyright (C) 2002-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
"\n"
"usage: urpmf [options] pattern-expression\n"
msgstr ""
"urpmf версия %s\n"
"Copyright (C) 2002-2006 Mandriva.\n"
-"Это свободное программное обеспечение и может распространяться согласно условиям GNU GPL.\n"
+"Это свободное программное обеспечение и может распространяться согласно "
+"условиям GNU GPL.\n"
"\n"
"использование: urpmf [опции] путь-выражение\n"
-#: ../urpm/search.pm:35
-#: ../urpme:45
-#: ../urpmf:35
-#: ../urpmi:74
-#: ../urpmi.addmedia:54
-#: ../urpmi.recover:33
-#: ../urpmi.removemedia:40
-#: ../urpmi.update:32
-#: ../urpmq:45
+#: ../urpm/search.pm:35 ../urpme:45 ../urpmf:35 ../urpmi:74
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - вывести это справочное сообщение\n"
-#: ../urpm/search.pm:36
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
msgstr " --version - вывести номер версии этой утилиты.\n"
-#: ../urpm/search.pm:37
-#: ../urpmf:37
-#: ../urpmi:131
-#: ../urpmq:79
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:131 ../urpmq:79
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - использовать особое окружение (обычно отчёт\n"
" об ошибке).\n"
-#: ../urpm/search.pm:38
-#: ../urpmf:38
-#: ../urpmi:76
-#: ../urpmq:49
+#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:76 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
" --excludemedia - не использовать указанные источники,\n"
" перечисленные через запятую.\n"
-#: ../urpm/search.pm:39
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
#, c-format
-msgid " --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
" --literal, -l - не искать соответствия шаблону, использовать аргумент\n"
" как буквенную строку.\n"
-#: ../urpm/search.pm:40
-#: ../urpme:52
-#: ../urpmf:40
-#: ../urpmi:111
-#: ../urpmi.addmedia:69
-#: ../urpmi.recover:36
-#: ../urpmi.removemedia:46
-#: ../urpmi.update:46
-#: ../urpmq:69
+#: ../urpm/search.pm:40 ../urpme:52 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:69 ../urpmi.recover:36 ../urpmi.removemedia:46
+#: ../urpmi.update:46 ../urpmq:69
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
-msgstr " --root-root - использовать другой корень для базы данных urpmi и установки пакетов.\n"
+msgstr ""
+" --root-root - использовать другой корень для базы данных urpmi и "
+"установки пакетов.\n"
-#: ../urpm/search.pm:41
-#: ../urpmf:41
-#: ../urpmi:75
-#: ../urpmq:47
+#: ../urpm/search.pm:41 ../urpmf:41 ../urpmi:75 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - использовать только указанные источники,\n"
" перечисленные через запятую.\n"
-#: ../urpm/search.pm:42
-#: ../urpmf:42
-#: ../urpmi:79
-#: ../urpmq:50
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
-msgid " --sortmedia - sort media according to substrings separated by comma.\n"
+msgid ""
+" --sortmedia - sort media according to substrings separated by comma.\n"
msgstr ""
" --sortmedia - сортировать источники по подстрокам, перечисленным\n"
" через запятую.\n"
-#: ../urpm/search.pm:43
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
#, c-format
msgid " --use-distrib - use the given path to access media\n"
msgstr " --use-distrib - использовать указанный путь к источнику.\n"
-#: ../urpm/search.pm:44
-#: ../urpmf:44
-#: ../urpmi:80
-#: ../urpmq:51
+#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:80 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - использовать указанный synthesis вместо БД urpmi.\n"
-#: ../urpm/search.pm:45
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
#, c-format
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - не выводить идентичные строки.\n"
-#: ../urpm/search.pm:46
-#: ../urpmf:46
-#: ../urpmi:77
-#: ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:77 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - использовать только источник обновления.\n"
-#: ../urpm/search.pm:47
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
#, c-format
msgid " --verbose - verbose mode.\n"
msgstr " --verbose - подробный режим.\n"
-#: ../urpm/search.pm:48
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
#, c-format
msgid " -i - ignore case distinctions in patterns.\n"
msgstr " -i - игнорировать учёт регистра в шаблонах.\n"
-#: ../urpm/search.pm:49
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
#, c-format
msgid " -I - honor case distinctions in patterns (default).\n"
msgstr " -I - учитывать регистра во шаблонах (по умолчанию).\n"
-#: ../urpm/search.pm:50
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
#, c-format
msgid " -F<str> - change field separator (defaults to ':').\n"
msgstr " -F<str> - изменение разделителя полей (по умолчанию - ':').\n"
-#: ../urpm/search.pm:51
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
#, c-format
msgid "Pattern expressions:\n"
msgstr "Выражения для шаблонов:\n"
-#: ../urpm/search.pm:52
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
#, c-format
msgid " text - any text is parsed as a regexp, unless -l is used.\n"
msgstr ""
" text - любой текст считается регулярным выражением,\n"
" если только не используется -l.\n"
-#: ../urpm/search.pm:53
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
#, c-format
msgid " -e - include perl code directly as perl -e.\n"
msgstr " -e - включение кода perl непосредственно как perl -e.\n"
-#: ../urpm/search.pm:54
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
#, c-format
msgid " -a - binary AND operator.\n"
msgstr " -a - двоичный оператор AND.\n"
-#: ../urpm/search.pm:55
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
#, c-format
msgid " -o - binary OR operator.\n"
msgstr " -o - бинарный оператор OR.\n"
-#: ../urpm/search.pm:56
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
#, c-format
msgid " ! - unary NOT.\n"
msgstr " ! - унарный NOT.\n"
-#: ../urpm/search.pm:57
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
#, c-format
msgid " ( ) - left and right parentheses.\n"
msgstr " ( ) - левая и правая скобки.\n"
-#: ../urpm/search.pm:58
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
#, c-format
msgid "List of tags:\n"
msgstr "Список тегов:\n"
-#: ../urpm/search.pm:59
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
#, c-format
msgid " --qf - specify a printf-like output format\n"
msgstr " --qf - указание выходного формата в стиле printf\n"
-#: ../urpm/search.pm:60
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
#, c-format
msgid " example: '%%name:%%files'\n"
msgstr " пример: '%%name:%%files'\n"
-#: ../urpm/search.pm:61
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
#, c-format
msgid " --arch - architecture\n"
msgstr " --arch - архитектура\n"
-#: ../urpm/search.pm:62
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
#, c-format
msgid " --buildhost - build host\n"
msgstr " --buildhost - хост, на котором собран.\n"
-#: ../urpm/search.pm:63
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
#, c-format
msgid " --buildtime - build time\n"
msgstr " --buildtime - время сборки\n"
-#: ../urpm/search.pm:64
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
#, c-format
msgid " --conffiles - configuration files\n"
msgstr " --conffiles - конфигурационные файлы\n"
-#: ../urpm/search.pm:65
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
#, c-format
msgid " --conflicts - conflict tags\n"
msgstr " --conflicts - конфликтующие теги\n"
-#: ../urpm/search.pm:66
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
#, c-format
msgid " --description - package description\n"
msgstr " --description - описание пакета\n"
-#: ../urpm/search.pm:67
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
#, c-format
msgid " --distribution - distribution\n"
msgstr " --distribution - дистрибутив\n"
-#: ../urpm/search.pm:68
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
#, c-format
msgid " --epoch - epoch\n"
msgstr " --epoch - epoch\n"
-#: ../urpm/search.pm:69
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
#, c-format
msgid " --filename - filename of the package\n"
msgstr " --filename - имя пакета\n"
-#: ../urpm/search.pm:70
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
#, c-format
msgid " --files - list of files contained in the package\n"
msgstr " --files - список файлов в пакете\n"
-#: ../urpm/search.pm:71
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
#, c-format
msgid " --group - group\n"
msgstr " --group - группа\n"
-#: ../urpm/search.pm:72
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
#, c-format
msgid " --license - license\n"
msgstr " --license - лицензия\n"
-#: ../urpm/search.pm:73
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
#, c-format
msgid " --name - package name\n"
msgstr " --name - имя пакета\n"
-#: ../urpm/search.pm:74
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - устаревшие теги\n"
-#: ../urpm/search.pm:75
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
#, c-format
msgid " --packager - packager\n"
msgstr " --packager - создатель пакета\n"
-#: ../urpm/search.pm:76
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - предоставляемые теги\n"
-#: ../urpm/search.pm:77
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - требуемые теги\n"
-#: ../urpm/search.pm:78
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
#, c-format
msgid " --size - installed size\n"
msgstr " --size - установленный размер\n"
-#: ../urpm/search.pm:79
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - rpm с исходными кодами\n"
-#: ../urpm/search.pm:80
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
#, c-format
msgid " --suggests - suggests tags\n"
msgstr " --suggests - рекомендуемые теги\n"
-#: ../urpm/search.pm:81
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr " --summary - сводка\n"
-#: ../urpm/search.pm:82
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
#, c-format
msgid " --url - url\n"
msgstr " --url - url\n"
-#: ../urpm/search.pm:83
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
#, c-format
msgid " --vendor - vendor\n"
msgstr " --vendor - поставщик\n"
-#: ../urpm/search.pm:84
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
#, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -m - источник, в котором был найден пакет\n"
-#: ../urpm/search.pm:85
-#: ../urpmf:85
-#: ../urpmq:94
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:94
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - вывод версии, релиза и архитектуры с названием.\n"
-#: ../urpm/search.pm:197
-#: ../urpmf:197
+#: ../urpm/search.pm:197 ../urpmf:197
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Неверный формат: вы можете использовать только один тег с несколькими значениями"
+msgstr ""
+"Неверный формат: вы можете использовать только один тег с несколькими "
+"значениями"
-#: ../urpm/search.pm:247
-#: ../urpmf:247
-#: ../urpmi:254
-#: ../urpmq:136
+#: ../urpm/search.pm:247 ../urpmf:247 ../urpmi:254 ../urpmq:136
#, c-format
msgid "using specific environment on %s\n"
msgstr "используется специфическое окружение для %s\n"
-#: ../urpm/search.pm:290
-#: ../urpmf:290
+#: ../urpm/search.pm:290 ../urpmf:290
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "не найден файл hdlist для источника \"%s\""
-#: ../urpm/search.pm:297
-#: ../urpmf:297
+#: ../urpm/search.pm:297 ../urpmf:297
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "не найден synthesis-файл для источника \"%s\""
-#: ../urpm/search.pm:304
-#: ../urpmf:306
+#: ../urpm/search.pm:304 ../urpmf:306
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "не найден файл xml-info для источника \"%s\""
@@ -1653,22 +1503,22 @@ msgstr "urpmi был перезапущен; список приоритетов
#: ../urpm/select.pm:23
#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr "urpmi был перезапущен; список приоритетов пакетов изменился: %s против %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"urpmi был перезапущен; список приоритетов пакетов изменился: %s против %s"
#: ../urpm/select.pm:184
#, c-format
msgid "No package named %s"
msgstr "Нет пакета с именем %s"
-#: ../urpm/select.pm:186
-#: ../urpme:107
+#: ../urpm/select.pm:186 ../urpme:107
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Следующие пакеты содержат %s: %s"
-#: ../urpm/select.pm:495
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:495 ../urpm/select.pm:538
#, c-format
msgid "due to missing %s"
msgstr "из-за отсутствия %s"
@@ -1678,8 +1528,7 @@ msgstr "из-за отсутствия %s"
msgid "due to already installed %s"
msgstr "из-за того, что %s уже установлен"
-#: ../urpm/select.pm:497
-#: ../urpm/select.pm:536
+#: ../urpm/select.pm:497 ../urpm/select.pm:536
#, c-format
msgid "due to unsatisfied %s"
msgstr "из-за неудовлетворённости %s"
@@ -1739,13 +1588,15 @@ msgstr "Невозможно переместить файл %s в %s"
msgid ""
"urpme version %s\n"
"Copyright (C) 1999-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
"\n"
"usage:\n"
msgstr ""
"urpme версия %s\n"
"Copyright (C) 1999-2006 Mandriva.\n"
-"Это свободное программное обеспечение и может распространяться согласно условиям GNU GPL.\n"
+"Это свободное программное обеспечение и может распространяться согласно "
+"условиям GNU GPL.\n"
"\n"
"использование:\n"
@@ -1759,24 +1610,20 @@ msgstr " --auto - автоматически выбрать пакет
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - проверить возможность корректного удаления\n"
-#: ../urpme:48
-#: ../urpmi:104
-#: ../urpmq:65
+#: ../urpme:48 ../urpmi:104 ../urpmq:65
#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
msgstr ""
" --force - принудительное выполнение, даже если некоторые пакеты\n"
" не существуют\n"
-#: ../urpme:49
-#: ../urpmi:109
-#: ../urpmq:67
+#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - распределённый urpmi через машины алиаса\n"
-#: ../urpme:50
-#: ../urpmi:140
+#: ../urpme:50 ../urpmi:140
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - повторно упаковывать файлы перед удалением\n"
@@ -1800,9 +1647,7 @@ msgstr ""
" --use-distrib - настроить urpme на лету из дерева distrib; полезно\n"
" для установки/удаления в/из chroot с параметром --root\n"
-#: ../urpme:56
-#: ../urpmi:151
-#: ../urpmq:84
+#: ../urpme:56 ../urpmi:151 ../urpmq:84
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - подробный режим.\n"
@@ -1827,8 +1672,7 @@ msgstr "неизвестные пакеты"
msgid "unknown package"
msgstr "неизвестный пакет"
-#: ../urpme:113
-#: ../urpmi:536
+#: ../urpme:113 ../urpmi:536
#, c-format
msgid "removing package %s will break your system"
msgstr "удаление пакета %s нарушит работу вашей системы"
@@ -1846,7 +1690,8 @@ msgstr "Проверяется возможность удаления след
#: ../urpme:124
#, c-format
msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural "To satisfy dependencies, the following %d packages will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
msgstr[0] "Для удовлетворения зависимостей будет удалён следующий пакет"
msgstr[1] "Для удовлетворения зависимостей будут удалены следующие %d пакетов"
@@ -1857,10 +1702,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "Удалить %d пакет?"
msgstr[1] "Удалить %d пакетов?"
-#: ../urpme:128
-#: ../urpmi:563
-#: ../urpmi:643
-#: ../urpmi.addmedia:142
+#: ../urpme:128 ../urpmi:563 ../urpmi:643 ../urpmi.addmedia:142
#, c-format
msgid " (y/N) "
msgstr " (y/N) "
@@ -1875,33 +1717,41 @@ msgstr "Удаление не удалось"
msgid ""
"urpmi version %s\n"
"Copyright (C) 1999-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
"\n"
"usage:\n"
msgstr ""
"urpmi версия %s\n"
"Copyright (C) 1999-2006 Mandriva.\n"
-"Это свободное программное обеспечение и может распространяться согласно условиям GNU GPL.\n"
+"Это свободное программное обеспечение и может распространяться согласно "
+"условиям GNU GPL.\n"
"\n"
"использование:\n"
#: ../urpmi:78
#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
" --searchmedia - использование только указанных источников для поиска\n"
" запрошенных пакетов.\n"
#: ../urpmi:81
#, c-format
-msgid " --auto - non-interactive mode, assume default answers to questions.\n"
-msgstr " --auto - неинтерактивный режим; на вопросы даются ответы по умолчанию.\n"
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions.\n"
+msgstr ""
+" --auto - неинтерактивный режим; на вопросы даются ответы по "
+"умолчанию.\n"
-#: ../urpmi:82
-#: ../urpmq:52
+#: ../urpmi:82 ../urpmq:52
#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - автоматический выбор пакетов для обновления системы.\n"
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - автоматический выбор пакетов для обновления системы.\n"
#: ../urpmi:83
#, c-format
@@ -1918,31 +1768,35 @@ msgstr " --no-md5sum - отключить проверку файла MD5S
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - принудительно обновить gpg-ключ.\n"
-#: ../urpmi:86
-#: ../urpmq:53
+#: ../urpmi:86 ../urpmq:53
#, c-format
msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
-msgstr " --no-suggests - не выбирать автоматически \"рекомендованные\" пакеты.\n"
+msgstr ""
+" --no-suggests - не выбирать автоматически \"рекомендованные\" пакеты.\n"
#: ../urpmi:87
#, c-format
-msgid " --no-uninstall - never ask to uninstall a package, abort the installation.\n"
-msgstr " --no-uninstall - никогда не предлагать удалять пакет, прерывать установку.\n"
+msgid ""
+" --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+" --no-uninstall - никогда не предлагать удалять пакет, прерывать "
+"установку.\n"
#: ../urpmi:88
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - не устанавливать пакеты (только загрузить)\n"
-#: ../urpmi:89
-#: ../urpmq:55
+#: ../urpmi:89 ../urpmq:55
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
" packages that lead to removals.\n"
msgstr ""
" --keep - по возможности сохранять существующие пакеты,\n"
-" отклонять запрошенные пакеты, которые приводят к удалению.\n"
+" отклонять запрошенные пакеты, которые приводят к "
+"удалению.\n"
#: ../urpmi:91
#, c-format
@@ -1990,12 +1844,15 @@ msgstr " --noclean - не удалять rpm из кэша.\n"
#: ../urpmi:102
#, c-format
msgid " --justdb - update only the rpm db, not the filesystem.\n"
-msgstr " --justdb - обновить базу данных, но не изменять файловую систему.\n"
+msgstr ""
+" --justdb - обновить базу данных, но не изменять файловую систему.\n"
#: ../urpmi:103
#, c-format
-msgid " --replacepkgs - force installing packages which are already installed.\n"
-msgstr " --replacepkgs - принудительная установка уже установленных пакетов.\n"
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+" --replacepkgs - принудительная установка уже установленных пакетов.\n"
#: ../urpmi:105
#, c-format
@@ -2015,8 +1872,7 @@ msgstr ""
" --allow-force - разрешить устанавливать пакеты без проверки зависимостей\n"
" и целостности после запроса у пользователя\n"
-#: ../urpmi:110
-#: ../urpmq:68
+#: ../urpmi:110 ../urpmq:68
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - использовать другой корень для установки rpm.\n"
@@ -2057,16 +1913,16 @@ msgstr " --wget-options - дополнительные параметры, пе
#: ../urpmi:120
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
-msgstr " --prozilla-options - дополнительные параметры, передаваемые в prozilla\n"
+msgstr ""
+" --prozilla-options - дополнительные параметры, передаваемые в prozilla\n"
#: ../urpmi:121
#, c-format
msgid " --aria2-options - additional options to pass to aria2\n"
-msgstr " --aria2-options- дополнительные параметры, передаваемые в программу aria2\n"
+msgstr ""
+" --aria2-options- дополнительные параметры, передаваемые в программу aria2\n"
-#: ../urpmi:122
-#: ../urpmi.addmedia:58
-#: ../urpmi.update:36
+#: ../urpmi:122 ../urpmi.addmedia:58 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - ограничение скорости загрузки\n"
@@ -2080,10 +1936,7 @@ msgstr ""
" --resume - возобновить загрузку частично загруженных файлов\n"
" (--no-resume отключает её; по умолчанию отключена).\n"
-#: ../urpmi:125
-#: ../urpmi.addmedia:59
-#: ../urpmi.update:37
-#: ../urpmq:75
+#: ../urpmi:125 ../urpmi.addmedia:59 ../urpmi.update:37 ../urpmq:75
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -2092,10 +1945,7 @@ msgstr ""
" --proxy - использовать указанный HTTP-прокси; по умолчанию\n"
" используется порт 1080 (формат - <хост_прокси[:порт]>).\n"
-#: ../urpmi:127
-#: ../urpmi.addmedia:61
-#: ../urpmi.update:39
-#: ../urpmq:77
+#: ../urpmi:127 ../urpmi.addmedia:61 ../urpmi.update:39 ../urpmq:77
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -2124,7 +1974,9 @@ msgstr ""
#: ../urpmi:134
#, c-format
-msgid " --test - only verify if the installation can be achieved correctly.\n"
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
msgstr " --test - проверить возможность корректной установки\n"
#: ../urpmi:135
@@ -2140,7 +1992,8 @@ msgstr " --excludedocs - исключить файлы документаци
#: ../urpmi:137
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
-msgstr " --ignoresize - не проверять дисковое пространство перед установкой\n"
+msgstr ""
+" --ignoresize - не проверять дисковое пространство перед установкой\n"
#: ../urpmi:138
#, c-format
@@ -2183,8 +2036,7 @@ msgstr " --nolock - не блокировать базу данных rpm
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - обновить пакеты только с такой же архитектурой\n"
-#: ../urpmi:147
-#: ../urpmq:92
+#: ../urpmi:147 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - выбрать все совпадения из командной строки\n"
@@ -2212,12 +2064,14 @@ msgstr " --debug - очень подробный режим.\n"
#: ../urpmi:153
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
-msgstr " будут установлены имена или rpm-файлы, указанные в командной строке.\n"
+msgstr ""
+" будут установлены имена или rpm-файлы, указанные в командной строке.\n"
#: ../urpmi:181
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
-msgstr "Ошибка: опцию --auto-select нельзя использовать вместе со списком пакетов.\n"
+msgstr ""
+"Ошибка: опцию --auto-select нельзя использовать вместе со списком пакетов.\n"
#: ../urpmi:188
#, c-format
@@ -2231,17 +2085,25 @@ msgstr ""
#: ../urpmi:215
#, c-format
msgid "You can't install binary rpm files when using --install-src"
-msgstr "При использовании опции --install-src нельзя устанавливать бинарные rpm-файлы"
+msgstr ""
+"При использовании опции --install-src нельзя устанавливать бинарные rpm-файлы"
#: ../urpmi:221
#, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
-msgstr "используйте параметр --buildrequires или --install-src (по умолчанию используется --buildrequires)"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgstr ""
+"используйте параметр --buildrequires или --install-src (по умолчанию "
+"используется --buildrequires)"
#: ../urpmi:241
#, c-format
-msgid "Directory [%s] already exists, please use another directory for bug report or delete it"
-msgstr "Каталог [%s] уже существует, используйте другой каталог для отчёта об ошибке или удалите его"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Каталог [%s] уже существует, используйте другой каталог для отчёта об ошибке "
+"или удалите его"
#: ../urpmi:242
#, c-format
@@ -2293,7 +2155,9 @@ msgstr "%s (для установки)"
#: ../urpmi:455
#, c-format
-msgid "In order to satisfy the '%s' dependency, one of the following packages is needed:"
+msgid ""
+"In order to satisfy the '%s' dependency, one of the following packages is "
+"needed:"
msgstr "Для удовлетворения зависимости '%s' нужен один из следующих пакетов:"
#: ../urpmi:458
@@ -2323,8 +2187,7 @@ msgstr ""
"более старых, чем установленные:\n"
"%s"
-#: ../urpmi:508
-#: ../urpmi:524
+#: ../urpmi:508 ../urpmi:524
#, c-format
msgid ""
"\n"
@@ -2333,10 +2196,7 @@ msgstr ""
"\n"
"Продолжить установку?"
-#: ../urpmi:509
-#: ../urpmi:525
-#: ../urpmi:613
-#: ../urpmi.addmedia:142
+#: ../urpmi:509 ../urpmi:525 ../urpmi:613 ../urpmi.addmedia:142
#, c-format
msgid " (Y/n) "
msgstr " (Y/n) "
@@ -2407,10 +2267,12 @@ msgstr "(только проверка; ничего удалено не буд
#: ../urpmi:578
#, c-format
msgid ""
-"You must first call urpmi with --buildrequires to install the following dependencies:\n"
+"You must first call urpmi with --buildrequires to install the following "
+"dependencies:\n"
"%s\n"
msgstr ""
-"Сначала нужно запустить urpmi с параметром --buildrequires, чтобы установить следующие зависимости:\n"
+"Сначала нужно запустить urpmi с параметром --buildrequires, чтобы установить "
+"следующие зависимости:\n"
"%s\n"
#: ../urpmi:595
@@ -2428,19 +2290,19 @@ msgstr "Будет использовано %s дополнительного д
msgid "%s of disk space will be freed."
msgstr "Будет особождено %s дискового пространства."
-#: ../urpmi:603
+#: ../urpmi:604
+#, fuzzy, c-format
+msgid "%s of packages will be retrieved."
+msgstr "Будет особождено %s дискового пространства."
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Установить 1 пакет?"
msgstr[1] "Установить %d пакетов?"
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Нажмите 'Enter', когда будете готовы..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Отмена"
@@ -2453,7 +2315,7 @@ msgstr "urpmi перезапускается"
#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
-#, c-format
+#, fuzzy, c-format
msgid ""
"usage: urpmi.addmedia [options] <name> <url>\n"
"where <url> is one of\n"
@@ -2461,7 +2323,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2483,7 +2345,8 @@ msgstr ""
" removable://<путь>\n"
"\n"
"Использование: urpmi.addmedia [параметры] --distrib --mirrorlist <url>\n"
-"Использование: urpmi.addmedia [параметры] --mirrorlist <url> <название> <относительный путь>\n"
+"Использование: urpmi.addmedia [параметры] --mirrorlist <url> <название> "
+"<относительный путь>\n"
"\n"
"Примеры:\n"
"\n"
@@ -2493,26 +2356,21 @@ msgstr ""
"\n"
"а [параметры] могут быть следующими\n"
-#: ../urpmi.addmedia:55
-#: ../urpmi.update:33
-#: ../urpmq:72
+#: ../urpmi.addmedia:55 ../urpmi.update:33 ../urpmq:72
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - использовать wget для загрузки удалённых файлов\n"
-#: ../urpmi.addmedia:56
-#: ../urpmi.update:34
-#: ../urpmq:73
+#: ../urpmi.addmedia:56 ../urpmi.update:34 ../urpmq:73
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - использовать curl для загрузки удалённых файлов.\n"
-#: ../urpmi.addmedia:57
-#: ../urpmi.update:35
-#: ../urpmq:74
+#: ../urpmi.addmedia:57 ../urpmi.update:35 ../urpmq:74
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
-msgstr " --prozilla - использовать prozilla для загрузки удалённых файлов\n"
+msgstr ""
+" --prozilla - использовать prozilla для загрузки удалённых файлов\n"
#: ../urpmi.addmedia:63
#, c-format
@@ -2523,10 +2381,13 @@ msgstr " --update - создать источник обновления\
#, c-format
msgid ""
" --xml-info - use the specific policy for downloading xml info files\n"
-" one of: never, on-demand, update-only, always. cf urpmi.cfg(5)\n"
+" one of: never, on-demand, update-only, always. cf urpmi."
+"cfg(5)\n"
msgstr ""
-" --xml-info - использовать определённую политику для загрузки xml-файлов\n"
-" варианты: never, on-demand, update-only, always. cf urpmi.cfg(5)\n"
+" --xml-info - использовать определённую политику для загрузки xml-"
+"файлов\n"
+" варианты: never, on-demand, update-only, always. cf urpmi."
+"cfg(5)\n"
#: ../urpmi.addmedia:66
#, c-format
@@ -2582,8 +2443,7 @@ msgstr ""
" --virtual - создать виртуальный источник, который всегда\n"
" является самым актульным.\n"
-#: ../urpmi.addmedia:77
-#: ../urpmi.update:42
+#: ../urpmi.addmedia:77 ../urpmi.update:42
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - отключить проверку файла MD5SUM\n"
@@ -2598,23 +2458,12 @@ msgstr " --nopubkey - не импортировать pubkey из доба
msgid " --raw - add the media in config, but don't update it.\n"
msgstr " --raw - добавить источник в config, но не обновлять его\n"
-#: ../urpmi.addmedia:80
-#: ../urpmi.removemedia:42
-#: ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - очистить каталог с кэшем заголовков\n"
-
-#: ../urpmi.addmedia:81
-#: ../urpmi.removemedia:44
-#: ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - тихий режим (quiet)\n"
-#: ../urpmi.addmedia:82
-#: ../urpmi.removemedia:45
-#: ../urpmi.update:53
+#: ../urpmi.addmedia:82 ../urpmi.removemedia:45 ../urpmi.update:53
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - подробный режим\n"
@@ -2652,7 +2501,9 @@ msgstr "Невозможно создать конфигурационный ф
#: ../urpmi.addmedia:134
#, c-format
msgid "no need to give <relative path of synthesis> with --distrib"
-msgstr "с параметром --distrib <относительный путь к synthesis-файлу> указывать не нужно"
+msgstr ""
+"с параметром --distrib <относительный путь к synthesis-файлу> указывать не "
+"нужно"
#: ../urpmi.addmedia:142
#, c-format
@@ -2683,13 +2534,15 @@ msgstr "невозможно добавить источник"
msgid ""
"urpmi.recover version %s\n"
"Copyright (C) 2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
"\n"
"usage:\n"
msgstr ""
"urpme.recover версия %s\n"
"Copyright (C) 2006 Mandriva.\n"
-"Это свободное программное обеспечение и может распространяться согласно условиям GNU GPL.\n"
+"Это свободное программное обеспечение и может распространяться согласно "
+"условиям GNU GPL.\n"
"\n"
"использование:\n"
@@ -2701,11 +2554,14 @@ msgstr " --checkpoint - установить точку для повторн
#: ../urpmi.recover:35
#, c-format
msgid " --noclean - don't clean repackage directory on checkpoint\n"
-msgstr " --noclean - не очищать каталог повторной упаковки в контрольной точке.\n"
+msgstr ""
+" --noclean - не очищать каталог повторной упаковки в контрольной "
+"точке.\n"
#: ../urpmi.recover:37
#, c-format
-msgid " --list - list transactions since provided date/duration argument\n"
+msgid ""
+" --list - list transactions since provided date/duration argument\n"
msgstr ""
" --list - список транзакций относительно указанной\n"
" даты/продолжительности\n"
@@ -2796,8 +2652,7 @@ msgstr "Не найдены транзакции от %s\n"
msgid "You must be superuser to do this"
msgstr "Для этого нужны права суперпользователя"
-#: ../urpmi.recover:143
-#: ../urpmi.recover:209
+#: ../urpmi.recover:143 ../urpmi.recover:209
#, c-format
msgid "Writing rpm macros file [%s]...\n"
msgstr "Записывается файл макроса rpm [%s]...\n"
@@ -2887,7 +2742,9 @@ msgstr " --no-ignore - не обновлять, пометить источ
#: ../urpmi.update:47
#, c-format
msgid " --probe-rpms - do not use synthesis, use rpm files directly\n"
-msgstr " --probe-rpms - не использовать synthesis-файл; использовать непосредственно rpm-файлы\n"
+msgstr ""
+" --probe-rpms - не использовать synthesis-файл; использовать "
+"непосредственно rpm-файлы\n"
#: ../urpmi.update:48
#, c-format
@@ -2943,19 +2800,23 @@ msgstr "включается источник %s"
msgid ""
"urpmq version %s\n"
"Copyright (C) 2000-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
"\n"
"usage:\n"
msgstr ""
"urpmq версия %s\n"
"Copyright (C) 2000-2006 Mandriva.\n"
-"Это свободное программное обеспечение и может распространяться согласно условиям GNU GPL.\n"
+"Это свободное программное обеспечение и может распространяться согласно "
+"условиям GNU GPL.\n"
"\n"
"использование:\n"
#: ../urpmq:48
#, c-format
-msgid " --searchmedia - use only the given media to search requested (or updated) packages.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested (or updated) "
+"packages.\n"
msgstr ""
" --searchmedia - использовать только указанные источники для поиска\n"
" запрошенных (или обновляемых) пакетов.\n"
@@ -2983,7 +2844,8 @@ msgstr " --list-url - список доступных источников
#: ../urpmq:60
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
-msgstr " --list-nodes - список доступных узлов при использовании --parallel.\n"
+msgstr ""
+" --list-nodes - список доступных узлов при использовании --parallel.\n"
#: ../urpmq:61
#, c-format
@@ -2992,17 +2854,21 @@ msgstr " --list-aliases - список доступных алиасов parall
#: ../urpmq:62
#, c-format
-msgid " --dump-config - dump the config in form of urpmi.addmedia argument.\n"
-msgstr " --dump-config - дамп config'а в виде аргумента для urpmi.addmedia.\n"
+msgid ""
+" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+" --dump-config - дамп config'а в виде аргумента для urpmi.addmedia.\n"
#: ../urpmq:63
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
-msgstr " --src - следующий пакет содержит исходные коды (эквивалент -s).\n"
+msgstr ""
+" --src - следующий пакет содержит исходные коды (эквивалент -s).\n"
#: ../urpmq:64
#, 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 - вывод всех пакетов с исходными кодами перед загрузкой\n"
" (только для root'a).\n"
@@ -3010,7 +2876,9 @@ msgstr ""
#: ../urpmq:66
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
-msgstr " --ignorearch - разрешить запрашивать rpm'ы для несоответствующих архитектур.\n"
+msgstr ""
+" --ignorearch - разрешить запрашивать rpm'ы для несоответствующих "
+"архитектур.\n"
#: ../urpmq:70
#, c-format
@@ -3027,21 +2895,31 @@ msgid " --changelog - print changelog.\n"
msgstr " --changelog - показать журнал изменений.\n"
#: ../urpmq:81
+#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - конфликтующие теги\n"
+
+#: ../urpmq:82
#, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - показать тег provides\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - требуемые теги\n"
+
+#: ../urpmq:84
#, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - показать тег sourcerpm.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - показать тег summary.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -3062,7 +2940,8 @@ msgid ""
" - extended reverse search (includes virtual packages).\n"
msgstr ""
" --whatrequires-recursive\n"
-" - расширенный реверсивный поиск (включая виртуальные пакеты).\n"
+" - расширенный реверсивный поиск (включая виртуальные "
+"пакеты).\n"
#: ../urpmq:90
#, c-format
@@ -3086,7 +2965,8 @@ msgstr " -g - вывод групп с именами.\n"
#: ../urpmq:96
#, c-format
msgid " -i - print useful information in human readable form.\n"
-msgstr " -i - вывод полезной информации в удобной для чтения форме.\n"
+msgstr ""
+" -i - вывод полезной информации в удобной для чтения форме.\n"
#: ../urpmq:97
#, c-format
@@ -3106,12 +2986,17 @@ msgstr " -r - показать версию и релиз с наз
#: ../urpmq:100
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
-msgstr " -s - следующий пакет содержит исходные коды (эквивалент --src).\n"
+msgstr ""
+" -s - следующий пакет содержит исходные коды (эквивалент --"
+"src).\n"
#: ../urpmq:101
#, c-format
-msgid " -u - remove package if a more recent version is already installed.\n"
-msgstr " -u - удалить пакет, если уже установлена более новая версия.\n"
+msgid ""
+" -u - remove package if a more recent version is already "
+"installed.\n"
+msgstr ""
+" -u - удалить пакет, если уже установлена более новая версия.\n"
#: ../urpmq:102
#, c-format
@@ -3135,127 +3020,218 @@ msgstr " запрошены имена или rpm-файлы, указанны
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes может использоваться только с --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, c-format
+msgid "use -l to list files"
+msgstr ""
+
+#: ../urpmq:363
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
-msgstr "для источника \"%s\" отсутствует xml-info; только частичный результат для пакета %s"
+msgstr ""
+"для источника \"%s\" отсутствует xml-info; только частичный результат для "
+"пакета %s"
#: ../urpmq:361
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
-msgstr "для источника \"%s\" отсутствует xml-info; только частичный результат для пакетов %s"
+msgstr ""
+"для источника \"%s\" отсутствует xml-info; только частичный результат для "
+"пакетов %s"
#: ../urpmq:364
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
-msgstr "для источника \"%s\" отсутствует xml-info; невозможно возвратить результат для пакета %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
+msgstr ""
+"для источника \"%s\" отсутствует xml-info; невозможно возвратить результат "
+"для пакета %s"
#: ../urpmq:365
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
-msgstr "для источника \"%s\" отсутствует xml-info; невозможно возвратить результат для пакетов %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"для источника \"%s\" отсутствует xml-info; невозможно возвратить результат "
+"для пакетов %s"
#: ../urpmq:429
#, c-format
msgid "No changelog found\n"
msgstr "Не найден журнал изменений\n"
+#~ msgid "Unknown option %s"
+#~ msgstr "Неизвестная опция %s"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "слишком много точек монтирования для съёмного источника \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "съёмное устройство принимается как \"%s\""
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "Источник \"%s\" является ISO образом, будет примонтирован на лету"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "используется другое съёмное устройство [%s] для \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "невозможно получить путь к съёмному источнику \"%s\""
+
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "невозможно промонтировать источник с дистрибутивом"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "нет доступа к источнику \"%s\",\n"
+#~ "это могло произойти потому, что при создании источника каталог был "
+#~ "примонтирован вручную."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "непонятный источник \"%s\" отмечен как съёмный, но это не так"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Нажмите 'Enter', когда будете готовы..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - очистить каталог с кэшем заголовков\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "виртуальный источник должен быть локальным"
+
#~ msgid "Error generating names file: dependency %d not found"
#~ msgstr "Ошибка создания файла имён: не найдена зависимость %d"
+
#~ msgid "Error generating names file: Can't write to file (%s)"
#~ msgstr "Ошибка создания файла имён: невозможно записать в файл (%s)"
+
#~ msgid "unable to parse synthesis file of \"%s\""
#~ msgstr "невозможно проанализировать synthesis-файл источника \"%s\""
+
#~ msgid "found %d rpm headers in cache, removing %d obsolete headers"
#~ msgstr ""
#~ "в кэше найдено %d заголовков rpm; удаляется %d устаревших заголовков"
+
#~ msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
#~ msgstr ""
#~ "вычисляется md5-сумма существующего hdlist (или synthesis) источника [%s]"
+
#~ msgid ""
#~ "virtual medium \"%s\" should not have defined hdlist or list file, medium "
#~ "ignored"
#~ msgstr ""
#~ "виртуальный источник \"%s\" не должен иметь определённый файл hdlist или "
#~ "файл списка; источник проигнорирован"
+
#~ msgid "invalid hdlist name"
#~ msgstr "неверное имя hdlist'а"
+
#~ msgid "unable to find list file for \"%s\", medium ignored"
#~ msgstr "невозможно найти файл списка для \"%s\"; источник проигнорирован"
+
#~ msgid "\"synthesis\" should not be set (medium \"%s\")"
#~ msgstr "не следует использовать \"synthesis\" (источник \"%s\")"
+
#~ msgid "\"synthesis\" should be set (medium \"%s\")"
#~ msgstr "следует использовать \"synthesis\" (источник \"%s\")"
+
#~ msgid "unable to access list file of \"%s\""
#~ msgstr "нет доступа к файлу list для \"%s\""
+
#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
#~ msgstr ""
#~ "источник \"%s\" пытается использовать уже используемый hdlist; источник "
#~ "проигнорирован"
+
#~ msgid "medium \"%s\" trying to use an already used list, medium ignored"
#~ msgstr ""
#~ "источник \"%s\" пытается использовать уже используемый список; источник "
#~ "проигнорирован"
+
#~ msgid "wrote %s"
#~ msgstr "записан %s"
+
#~ msgid ""
#~ "Note: no hdlist for medium \"%s\", unable to return any result for it"
#~ msgstr ""
#~ "Примечание: для источника \"%s\" отсутствует hdlist; невозможно "
#~ "возвратить какой-либо результат"
+
#~ msgid "performing second pass to compute dependencies\n"
#~ msgstr "выполняется второй проход для вычисления зависимостей\n"
+
#~ msgid "building hdlist [%s]"
#~ msgstr "создаётся hdlist [%s]"
+
#~ msgid ""
#~ "Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
#~ "corrupted."
#~ msgstr ""
#~ "невозможно создать файл synthesis для источника \"%s\". Возможно файл "
#~ "hdlist повреждён."
+
#~ msgid "problem reading hdlist or synthesis file of medium \"%s\""
#~ msgstr "проблема чтения файла hdlist или synthesis источника \"%s\""
+
#~ msgid "computing md5sum of copied source hdlist (or synthesis)"
#~ msgstr ""
#~ "вычисляется md5-сумма скопированного hdlist источника (или synthesis)"
+
#~ msgid "...retrieving failed: md5sum mismatch"
#~ msgstr "...извлечение не удалось: md5-суммы не совпадают"
+
#~ msgid "no rpm files found from [%s]"
#~ msgstr "в [%s] rpm-файлы не найдены "
+
#~ msgid "unable to read rpm files from [%s]: %s"
#~ msgstr "невозможно прочитать rpm-файлы из [%s]: %s"
+
#~ msgid "no rpms read"
#~ msgstr "rpm'ы не прочитаны"
+
#~ msgid "reading headers from medium \"%s\""
#~ msgstr "читаются заголовки из источника \"%s\""
+
#~ msgid " --probe-synthesis - use synthesis file.\n"
#~ msgstr " --probe-synthesis - использовать файл synthesis\n"
+
#~ msgid " --probe-hdlist - use hdlist file.\n"
#~ msgstr " --probe-hdlist - использовать файл hdlist\n"
+
#~ msgid ""
#~ "Note: since no media searched uses hdlists, urpmf was unable to return "
#~ "any result\n"
#~ msgstr ""
#~ "Примечание: т.к. исследуемый источник не использует hdlist'ы, urpmf был "
#~ "не в состоянии возвратить какой-либо результат\n"
+
#~ msgid "You may want to use --name to search for package names.\n"
#~ msgstr "Вы можете использовать --name для поиска пакетов по их именам.\n"
+
#~ msgid " --src, -s - next package is a source package.\n"
#~ msgstr " --src, -s - следующий пакет содержит исходные коды.\n"
+
#~ msgid " --probe-hdlist - use hdlist file.\n"
#~ msgstr " --probe-hdlist - использовать файл hdlist.\n"
+
#~ msgid "unable to update medium \"%s\"\n"
#~ msgstr "невозможно обновить источник \"%s\"\n"
+
#~ msgid "unable to create medium \"%s\"\n"
#~ msgstr "невозможно создать источник \"%s\"\n"
+
#~ msgid "there are multiple packages with the same rpm filename \"%s\""
#~ msgstr "существует несколько пакетов с одинаковым именем rpm-файла \"%s\""
+
#~ msgid "unable to correctly parse [%s] on value \"%s\""
#~ msgstr "невозможно корректно разобрать [%s] в \"%s\""
+
#~ msgid "(retry as root?)"
#~ msgstr "(попробуйте ещё раз под root'ом?)"
+
#~ msgid ""
#~ "medium \"%s\" uses an invalid list file:\n"
#~ " mirror is probably not up-to-date, trying to use alternate method"
@@ -3263,14 +3239,19 @@ msgstr "Не найден журнал изменений\n"
#~ "источник \"%s\" использует неверный файл списка:\n"
#~ " возможно зеркало устарело, выполняется попытка использовать "
#~ "альтернативный метод"
+
#~ msgid "medium \"%s\" does not define any location for rpm files"
#~ msgstr "источник \"%s\" не определяет никакого местоположения rpm-файлов"
+
#~ msgid "unrequested"
#~ msgstr "не запрошенный"
+
#~ msgid " (%d MB)"
#~ msgstr " (%d МБ)"
+
#~ msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
#~ msgstr "добавляется пакет %s (id=%d, eid=%d, update=%d, file=%s)"
+
#~ msgid ""
#~ "The following packages have bad signatures:\n"
#~ "%s\n"
@@ -3281,6 +3262,6 @@ msgstr "Не найден журнал изменений\n"
#~ "%s\n"
#~ "\n"
#~ "Хотите продолжить установку?"
+
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Чтобы использовать параметр --use-distrib, нужно иметь права root'а"
-
diff --git a/po/sc.po b/po/sc.po
index 3793ec2f..7c3b2bea 100644
--- a/po/sc.po
+++ b/po/sc.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-sc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2005-09-07 15:57+0100\n"
"Last-Translator: Antoni Pistis <antonio.pistis@virgilio.it>\n"
"Language-Team: Sardu\n"
@@ -105,14 +105,7 @@ msgstr "A_nnudda"
msgid "Choose location to save file"
msgstr "Sçobera anca sarvai su file"
-#: ../gurpmi.pm:80
-#, fuzzy, c-format
-msgid "Unknown option %s"
-msgstr ""
-"\n"
-"sceras '%s' disconnotas\n"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, fuzzy, c-format
msgid "No packages specified"
msgstr "nisçunu pakitu nominau %s"
@@ -226,12 +219,12 @@ msgstr "Apariçu..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Aposentu su pakitu `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Intra su mèdiu nominau \"%s\" in su trastu [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Scarrigamentu de su pakitu `%s'..."
@@ -423,6 +416,16 @@ msgstr ""
msgid "Copying failed"
msgstr "Còpia faddia"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "su mèdiu \"%s\" no d'as sçoberau"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "no potzu ligi su file rpm [%s] de su mèdiu \"%s\""
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -731,7 +734,12 @@ msgstr "Provu a aposentai sentza de controllai is dependèntzias? (y/N) "
msgid "Try harder to install (--force)? (y/N) "
msgstr "Provu a aposentai de manera finas prus forti (--force)? (y/N) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -745,11 +753,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "%d transatzionis de aposentadura faddias"
msgstr[1] "%d transatzionis de aposentadura faddias"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Fait a aposentai"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -775,6 +778,11 @@ msgstr "Pakitu(s) jai aposentau(s)"
msgid "Packages %s can not be installed"
msgstr "Pakitu(s) jai aposentau(s)"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Fait a aposentai"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -807,28 +815,8 @@ msgstr "provu a fai de mancu de su mèdiu \"%s\", du lassu"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "tropu puntus de càrrigu po su mèdiui arremoviditzu \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "pigu su mèdiu arremoviditzu ke \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "Su mèdiu \"%s\" est una màgini ISO, d'apu a carrigai a sa bolada"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "impreu un'atru mèdiu arremividitzu [%s] po \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "no potzu agatai su pathname po su mèdiu arremoviditzu \"%s\""
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -889,12 +877,7 @@ msgstr "liju is header de su mèdiu \"%s\""
msgid "adding medium \"%s\""
msgstr "burru su mèdiu \"%s\""
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "no potzu lompi a su primu mèdiu de aposentadura"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -1009,17 +992,7 @@ msgstr "controllu su file hdlist [%s]"
msgid "comparing %s and %s"
msgstr "aposentu %s de %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"no potzu lompi a su mèdiu \"%s\",\n"
-"podit essi ki apas carrigau a manu sa directory candu as creau su mèdiu."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "no apu agatau hdlist po su mèdiu \"%s\""
@@ -1186,36 +1159,21 @@ msgstr "apu agatau unu handler parallelu po is nuus: %s"
msgid "unable to use parallel option \"%s\""
msgstr "no potzu impreai sa scera parallela po \"%s\""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "no potzu lompi a su mèdiu \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "càrrigu %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "scàrrigu %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "su mèdiu \"%s\" no d'as sçoberau"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "no potzu ligi su file rpm [%s] de su mèdiu \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "mèdiu lòfiu \"%s\" marcau ke arremoviditzu ma no tali"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "no potzu lompi a su mèdiu \"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, fuzzy, c-format
msgid ""
@@ -2317,19 +2275,19 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, fuzzy, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "No fait a aposentai is pakitus (%s)!"
msgstr[1] "No fait a aposentai is pakitus (%s)!"
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Craca Enter candu ses prontu..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Annudda"
@@ -2350,7 +2308,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2470,12 +2428,7 @@ msgstr " --nopubkey - no importist pubkey de su mèdiu açuntu\n"
msgid " --raw - add the media in config, but don't update it.\n"
msgstr " --raw - açungi su mèdiu in s'assètiu, ma no d'ajorronist.\n"
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - lìmpia sa directory cache de is headers.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - modalidadi citia.\n"
@@ -2901,20 +2854,30 @@ msgstr " --changelog - amosta s'arrelata de is mudas.\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - amosta tag conflicts: totu su ki nci gherrat.\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - amosta su tag provides: totu su ki donat.\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - amosta su tag requires: totu su ki bolit.\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - amosta su tag sourcerpm: rpm mitza.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - amosta s'arresùmini.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -3010,7 +2973,12 @@ msgstr " preguntu is nòminis o is file rpm scritus in arraya de cumandu.\n"
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes fait a d'impreai feti cun --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "no potzu scriri sa list de \"%s\""
+
+#: ../urpmq:363
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3045,6 +3013,48 @@ msgstr ""
msgid "No changelog found\n"
msgstr "No apu agatau s'arrelata de is mudas\n"
+#, fuzzy
+#~ msgid "Unknown option %s"
+#~ msgstr ""
+#~ "\n"
+#~ "sceras '%s' disconnotas\n"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "tropu puntus de càrrigu po su mèdiui arremoviditzu \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "pigu su mèdiu arremoviditzu ke \"%s\""
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "Su mèdiu \"%s\" est una màgini ISO, d'apu a carrigai a sa bolada"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "impreu un'atru mèdiu arremividitzu [%s] po \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "no potzu agatai su pathname po su mèdiu arremoviditzu \"%s\""
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "no potzu lompi a su primu mèdiu de aposentadura"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "no potzu lompi a su mèdiu \"%s\",\n"
+#~ "podit essi ki apas carrigau a manu sa directory candu as creau su mèdiu."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "mèdiu lòfiu \"%s\" marcau ke arremoviditzu ma no tali"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Craca Enter candu ses prontu..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - lìmpia sa directory cache de is headers.\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "su mèdiu virtuali bolit locali"
@@ -3322,9 +3332,6 @@ msgstr "No apu agatau s'arrelata de is mudas\n"
#~ msgid "file [%s] already used in the same medium \"%s\""
#~ msgstr "su file [%s] jai in impreu in su pròpiu mèdiu \"%s\""
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "no potzu scriri sa list de \"%s\""
-
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "no apu scritu nudda in sa list de \"%s\""
diff --git a/po/sk.po b/po/sk.po
index c4ac9536..b6c4e804 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2005-09-07 16:34+0100\n"
"Last-Translator: Tibor Pittich <Tibor.Pittich@mandriva.org>\n"
"Language-Team: Slovak <i18n@mandrake.sk>\n"
@@ -103,14 +103,7 @@ msgstr "_Zrušiť"
msgid "Choose location to save file"
msgstr "Vyberte umiestnenie pre uloženie súboru"
-#: ../gurpmi.pm:80
-#, fuzzy, c-format
-msgid "Unknown option %s"
-msgstr ""
-"\n"
-"neznáma voľba '%s'\n"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, fuzzy, c-format
msgid "No packages specified"
msgstr "žiaden balík s menom %s"
@@ -226,12 +219,12 @@ msgstr "Príprava..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Inštalácia balíka `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Prosím vložte médium \"%s\" do zariadenia [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Získavanie balíka `%s'..."
@@ -424,6 +417,16 @@ msgstr ""
msgid "Copying failed"
msgstr "Kopírovanie zlyhalo"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "zdroj \"%s\" nebol zvolený"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "nie je možné prečítať rpm súbor [%s] zo zdroja \"%s\""
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -733,7 +736,12 @@ msgstr "Skúsiť inštaláciu bez kontroly závislostí? (á/N) "
msgid "Try harder to install (--force)? (y/N) "
msgstr "Skúsiť \"tvrdšiu\" inštaláciu (--force)? (á/N) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -748,11 +756,6 @@ msgstr[0] "%d inštalačná transakcia zlyhala"
msgstr[1] "%d inštalačná transakcia zlyhala"
msgstr[2] "%d inštalačná transakcia zlyhala"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Inštalácia je možná"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -778,6 +781,11 @@ msgstr "Všetko je už nainštalované"
msgid "Packages %s can not be installed"
msgstr "Všetko je už nainštalované"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Inštalácia je možná"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -813,28 +821,8 @@ msgstr "pokus o vynechanie existujúceho zdroja \"%s\", zrušené"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "príliš veľa bodov pripojenia pre vymeniteľný zdroj \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "výber vymeniteľného zariadenia ako \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "Zdroj \"%s\" je ISO obraz, je možné ho pripojiť za behu"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "použitie rôznych vymeniteľných zariadení [%s] pre \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "nie je možné zistiť cestu pre vymeniteľný zdroj \"%s\""
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -895,12 +883,7 @@ msgstr "načitávanie hlavičiek pre zdroj \"%s\""
msgid "adding medium \"%s\""
msgstr "odstránenie zdroja \"%s\""
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "nie je možné pristúpiť k prvému inštalačnému zdroju"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -1017,17 +1000,7 @@ msgstr "preverovanie hdlist súboru [%s]"
msgid "comparing %s and %s"
msgstr "inštalácia %s z %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"nie je možné pristúpiť k zdroju \"%s\",\n"
-"čo sa môže stať ak bol adresár pripojený počas vytvárania zdroja."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "nebol nájdený hdlist súbor pre zdroj \"%s\""
@@ -1194,37 +1167,21 @@ msgstr "nájdený paralélny ovládač pre uzly: %s"
msgid "unable to use parallel option \"%s\""
msgstr "nie je možné použiť voľbu parallel \"%s\""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "nie je možné pristúpiť k zdroju \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "pripájanie %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "odpája sa %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "zdroj \"%s\" nebol zvolený"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "nie je možné prečítať rpm súbor [%s] zo zdroja \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr ""
-"nekoherentný zdroj \"%s\" označený ako vymeniteľné, ale nie je tomu tak"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "nie je možné pristúpiť k zdroju \"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, fuzzy, c-format
msgid ""
@@ -2332,7 +2289,12 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2340,12 +2302,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Stlačte Enter ak je možné pokračovať..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Zrušiť"
@@ -2366,7 +2323,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2484,12 +2441,7 @@ msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
" --raw - pridať médium do konfigurácie, ale neaktualizovať.\n"
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - zmazať hlavičky v adresári dočasnej pamäte.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - zobrazovať minimum informácií.\n"
@@ -2914,20 +2866,30 @@ msgstr " --changelog - zobraziť históriu zmien.\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - zobraziť značku konflikty: conflicts.\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - zobraziť značku poskytované: provides.\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - zobraziť značku vyžadované: requires.\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - zobraziť značku zdrojové rpm: sourcerpm.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - zobraziť značku sumár: summary.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -3023,7 +2985,12 @@ msgstr " mená alebo rpm súbory zadané na príkazovom riadku budú dotazovan
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes nemôže byť použité len s --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "nie je možné zapísať súbor s zoznamom pre \"%s\""
+
+#: ../urpmq:363
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3058,6 +3025,49 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Nebol nájdený zoznam zmien\n"
+#, fuzzy
+#~ msgid "Unknown option %s"
+#~ msgstr ""
+#~ "\n"
+#~ "neznáma voľba '%s'\n"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "príliš veľa bodov pripojenia pre vymeniteľný zdroj \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "výber vymeniteľného zariadenia ako \"%s\""
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "Zdroj \"%s\" je ISO obraz, je možné ho pripojiť za behu"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "použitie rôznych vymeniteľných zariadení [%s] pre \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "nie je možné zistiť cestu pre vymeniteľný zdroj \"%s\""
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "nie je možné pristúpiť k prvému inštalačnému zdroju"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "nie je možné pristúpiť k zdroju \"%s\",\n"
+#~ "čo sa môže stať ak bol adresár pripojený počas vytvárania zdroja."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr ""
+#~ "nekoherentný zdroj \"%s\" označený ako vymeniteľné, ale nie je tomu tak"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Stlačte Enter ak je možné pokračovať..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - zmazať hlavičky v adresári dočasnej pamäte.\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "virtuálne médium musí byť lokálne"
@@ -3324,9 +3334,6 @@ msgstr "Nebol nájdený zoznam zmien\n"
#~ msgid "file [%s] already used in the same medium \"%s\""
#~ msgstr "súbor [%s] už je použitý pre ten istý zdroj \"%s\""
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "nie je možné zapísať súbor s zoznamom pre \"%s\""
-
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "nič nebolo zapísané do zoznamového súboru pre \"%s\""
diff --git a/po/sl.po b/po/sl.po
index d6b674a6..81f98a88 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2008-02-29 18:03+0100\n"
"Last-Translator: Jure Repinc <jlp@holodeck1.com>\n"
"Language-Team: Slovenian <lugos-slo@lugos.si>\n"
@@ -25,7 +25,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
+"n%100==4 ? 3 : 0);\n"
#: ../gurpmi:30 ../gurpmi2:65
#, c-format
@@ -113,12 +114,7 @@ msgstr "_Prekliči"
msgid "Choose location to save file"
msgstr "Izberite mesto za shranjevanje datoteke"
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "Neznana možnost %s"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "Določen ni bil noben paket"
@@ -192,12 +188,14 @@ msgstr ""
#: ../gurpmi2:215 ../urpmi:592
#, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
msgstr "Za zadovoljitev odvisnosti bo nameščen naslednji paket:"
#: ../gurpmi2:216 ../urpmi:593
#, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Za zadovoljitev odvisnosti bodo nameščeni naslednji paketi:"
#: ../gurpmi2:218
@@ -229,12 +227,12 @@ msgstr "Priprava ..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Nameščanje paketa `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Prosim vstavite \"%s\" v napravo [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Pobiranje paketa `%s'..."
@@ -401,8 +399,7 @@ msgstr "urpmq: ni mogoče brati datoteke rpm \"%s\"\n"
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-"Privzeto urpmf pričakuje regularni izraz. Uporabiti "
-"bi morali »--literal«"
+"Privzeto urpmf pričakuje regularni izraz. Uporabiti bi morali »--literal«"
#: ../urpm/args.pm:419
#, c-format
@@ -429,6 +426,16 @@ msgstr "Prveč argumentov\n"
msgid "Copying failed"
msgstr "Kopiranje je spodletelo"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, c-format
+msgid "medium \"%s\" is not available"
+msgstr "vir »%s« ni na voljo"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "ni mogoče brati datoteke rpm [%s] iz vira \"%s\""
+
#: ../urpm/cfg.pm:81
#, c-format
msgid "syntax error in config file at line %s"
@@ -582,7 +589,8 @@ msgstr "popačen URL: [%s]"
#: ../urpm/get_pkgs.pm:149
#, c-format
msgid "sorry, you can't use --install-src to install remote .src.rpm files"
-msgstr "za nameščanje oddaljenih datotek .src.rpm ne morete uporabiti --install-src"
+msgstr ""
+"za nameščanje oddaljenih datotek .src.rpm ne morete uporabiti --install-src"
#: ../urpm/get_pkgs.pm:156
#, c-format
@@ -596,7 +604,8 @@ msgstr "[ponovna gradnja paketa]"
#: ../urpm/install.pm:154
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
"določeno je bilo opravilo za nameščanje na %s (odstrani=%d, namesti=%d, "
"nadgradi=%d)"
@@ -736,7 +745,12 @@ msgstr "Poskusi z namestitvijo brez preverjanj odvisnosti? (d/N) "
msgid "Try harder to install (--force)? (y/N) "
msgstr "Poskusi s prisilno namestitvijo(--force)? (d/N) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -754,11 +768,6 @@ msgstr[1] "%d namestitveni prenos je spodletel"
msgstr[2] "%d namestitvena prenosa sta spodletela"
msgstr[3] "%d namestitveni prenosi so spodleteli"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Namestitev je mogoča"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -784,6 +793,11 @@ msgstr "Paketa %s ni moč namestiti"
msgid "Packages %s can not be installed"
msgstr "Paketov %s ni moč namestiti"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Namestitev je mogoča"
+
#: ../urpm/md5sum.pm:20
#, c-format
msgid "examining %s file"
@@ -802,7 +816,8 @@ msgstr "navidezni vir \"%s\" mora imeti jasen url, vir je bil zato prezrt"
#: ../urpm/media.pm:189
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "ni mogoče dostopati do seznama datotek od \"%s\", vir je bil zato prezrt"
+msgstr ""
+"ni mogoče dostopati do seznama datotek od \"%s\", vir je bil zato prezrt"
#: ../urpm/media.pm:196
#, c-format
@@ -816,28 +831,8 @@ msgstr "poskušam obiti obstoječi vir, izpuščanje \"%s\""
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "\"%s\" ima preveč priklopnih točk"
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "izmenljiva naprava vzeta kot \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "Vir \"%s\" je slika ISO, priklopljena bo sproti"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "uporaba druge izmenljive naprave [%s] za \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ni mogoče razrešiti poti za izmenljivi medij \"%s\""
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -900,12 +895,7 @@ msgstr "dodajanje vira »%s« pred oddaljen vir »%s«"
msgid "adding medium \"%s\""
msgstr "dodajanje vira »%s«"
-#: ../urpm/media.pm:750
-#, c-format
-msgid "unable to mount the distribution medium"
-msgstr "ni moč priklopiti vira distribucije"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "izgleda, da ta lokacija ne vsebuje nobene distribucije"
@@ -918,7 +908,8 @@ msgstr "ni mogoče razčleniti media.cfg"
#: ../urpm/media.pm:772
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
-msgstr "ni moč dostopati do vira distribucije (ni moč najti datoteke media.cfg)"
+msgstr ""
+"ni moč dostopati do vira distribucije (ni moč najti datoteke media.cfg)"
#: ../urpm/media.pm:790
#, c-format
@@ -1020,17 +1011,7 @@ msgstr "genhdlist2 na [%s] je spodletel"
msgid "comparing %s and %s"
msgstr "primerjanje %s in %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"Dostop do vira \"%s\" ni mogoč.\n"
-"Do tega lahko pride, če ste med ustvarjanjem vira ročno priklopili imenik"
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "neveljavna datoteka hdlist %s za vir »%s«"
@@ -1093,9 +1074,7 @@ msgstr "Ni bilo moč najti zrcalnega strežnika s seznama %s"
#: ../urpm/mirrors.pm:133
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
-msgstr ""
-"najdena geolokacija %s %.2f %.2f iz časovnega "
-"pasu %s"
+msgstr "najdena geolokacija %s %.2f %.2f iz časovnega pasu %s"
#: ../urpm/mirrors.pm:178
#, c-format
@@ -1200,36 +1179,21 @@ msgstr "najden je bil vzporedni upravljavec za vozlišča: %s"
msgid "unable to use parallel option \"%s\""
msgstr "ni mogoče uporabiti vzporedne izbire \"%s\""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "ni mogoče dostopati do vira \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "priklapljanje %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "odklapljanje %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not available"
-msgstr "vir »%s« ni na voljo"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "ni mogoče brati datoteke rpm [%s] iz vira \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "neurejen medij \"%s\" je označen kot izmenljiv, a to ne drži"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "ni mogoče dostopati do vira \"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
@@ -1262,7 +1226,8 @@ msgstr " --version - prikaži različico urpmf.\n"
#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:131 ../urpmq:79
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
-msgstr " --env - uporabi specifično okolje (ponavadi poročilo o napaki).\n"
+msgstr ""
+" --env - uporabi specifično okolje (ponavadi poročilo o napaki).\n"
#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:76 ../urpmq:49
#, c-format
@@ -1271,8 +1236,10 @@ msgstr " --excludemedia - ne uporabi podanih virov, ločenih z vejico.\n"
#: ../urpm/search.pm:39 ../urpmf:39
#, c-format
-msgid " --literal, -l - don't match patterns, use argument as a literal string.\n"
-msgstr " --literal, -l - vzemi argument kot dobeseden niz, ne regularni izraz.\n"
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+" --literal, -l - vzemi argument kot dobeseden niz, ne regularni izraz.\n"
#: ../urpm/search.pm:40 ../urpme:52 ../urpmf:40 ../urpmi:111
#: ../urpmi.addmedia:69 ../urpmi.recover:36 ../urpmi.removemedia:46
@@ -1290,7 +1257,8 @@ msgstr " --media - uporabi samo podane vire, ločene z vejico.\n"
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
-msgid " --sortmedia - sort media according to substrings separated by comma.\n"
+msgid ""
+" --sortmedia - sort media according to substrings separated by comma.\n"
msgstr " --sortmedia - vire razvrsti glede na podnize, ločene z vejico.\n"
#: ../urpm/search.pm:43 ../urpmf:43
@@ -1321,12 +1289,14 @@ msgstr " --verbose - zgovorni način.\n"
#: ../urpm/search.pm:48 ../urpmf:48
#, c-format
msgid " -i - ignore case distinctions in patterns.\n"
-msgstr " -i - ignoriraj razlike malih/velikih črk v vsakem vzorcu.\n"
+msgstr ""
+" -i - ignoriraj razlike malih/velikih črk v vsakem vzorcu.\n"
#: ../urpm/search.pm:49 ../urpmf:49
#, c-format
msgid " -I - honor case distinctions in patterns (default).\n"
-msgstr " -i - upoštevaj razlike malih/velikih črk v vsakem vzorcu.\n"
+msgstr ""
+" -i - upoštevaj razlike malih/velikih črk v vsakem vzorcu.\n"
#: ../urpm/search.pm:50 ../urpmf:50
#, c-format
@@ -1341,7 +1311,8 @@ msgstr "Regularni izrazi:\n"
#: ../urpm/search.pm:52 ../urpmf:52
#, c-format
msgid " text - any text is parsed as a regexp, unless -l is used.\n"
-msgstr " besedilo - brez -l se vsako besedilo razčleni kot regularni izraz.\n"
+msgstr ""
+" besedilo - brez -l se vsako besedilo razčleni kot regularni izraz.\n"
#: ../urpm/search.pm:53 ../urpmf:53
#, c-format
@@ -1509,7 +1480,8 @@ msgstr " -m - vir, kjer je bil paket najden\n"
#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:94
#, c-format
msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - izpiši različico, izdajo in arhitekturo z vsakim imenom.\n"
+msgstr ""
+" -f - izpiši različico, izdajo in arhitekturo z vsakim imenom.\n"
#: ../urpm/search.pm:197 ../urpmf:197
#, c-format
@@ -1539,11 +1511,13 @@ msgstr "ni bilo moč najti datoteke xml-info za vir »%s«"
#: ../urpm/select.pm:21
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr "urpmi se je ponovno zagnal in seznam prednostnih paketov se ni spremenil"
+msgstr ""
+"urpmi se je ponovno zagnal in seznam prednostnih paketov se ni spremenil"
#: ../urpm/select.pm:23
#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
"urpmi se je ponovno zagnal in seznam prednostnih paketov se je spremenil: %s "
"<-> %s"
@@ -1653,8 +1627,10 @@ msgstr " --test - preveri, če je možna pravilna odstranitev.\n"
#: ../urpme:48 ../urpmi:104 ../urpmq:65
#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - prisili v dejanje celo, če nekateri paketi ne obstajajo.\n"
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - prisili v dejanje celo, če nekateri paketi ne obstajajo.\n"
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
@@ -1669,7 +1645,8 @@ msgstr " --repackage - Pred izbrisom ponovno zgradi pakete\n"
#: ../urpme:51
#, c-format
msgid " --root - use another root for rpm removal.\n"
-msgstr " --root - uporabi drug korenski imenik za odstranitev paketov rpm.\n"
+msgstr ""
+" --root - uporabi drug korenski imenik za odstranitev paketov rpm.\n"
#: ../urpme:53
#, c-format
@@ -1729,7 +1706,8 @@ msgstr "Preverjanje za odstranitev sledečih paketov"
#: ../urpme:124
#, c-format
msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural "To satisfy dependencies, the following %d packages will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
msgstr[0] "Za zadovoljitev odvisnosti bo odstranjenih sledečih %d paketov"
msgstr[1] "Za zadovoljitev odvisnosti bo odstranjen sledeči %d paket"
msgstr[2] "Za zadovoljitev odvisnosti bosta odstranjena sledeča %d paketa"
@@ -1773,8 +1751,10 @@ msgstr ""
#: ../urpmi:78
#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
-msgstr " --searchmedia - uporabi samo podane vire za iskanje zahtevanih paketov.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - uporabi samo podane vire za iskanje zahtevanih paketov.\n"
#: ../urpmi:81
#, c-format
@@ -1787,7 +1767,8 @@ msgstr ""
#: ../urpmi:82 ../urpmq:52
#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
msgstr " --auto-select - samodejna izbira paketov za nadgraditev sistema.\n"
#: ../urpmi:83
@@ -1886,7 +1867,8 @@ msgstr ""
#: ../urpmi:103
#, c-format
-msgid " --replacepkgs - force installing packages which are already installed.\n"
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
msgstr " --replacepkgs - vsili namestitev paketov, ki so že nameščeni.\n"
#: ../urpmi:105
@@ -1911,7 +1893,8 @@ msgstr ""
#: ../urpmi:110 ../urpmq:68
#, c-format
msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - uporabi drug korenski imenik za namestitev paketov rpm.\n"
+msgstr ""
+" --root - uporabi drug korenski imenik za namestitev paketov rpm.\n"
#: ../urpmi:112
#, c-format
@@ -2011,7 +1994,8 @@ msgstr ""
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
-msgstr " --test - samo preveri, če je namestitev lahko pravilno izvedena.\n"
+msgstr ""
+" --test - samo preveri, če je namestitev lahko pravilno izvedena.\n"
#: ../urpmi:135
#, c-format
@@ -2031,7 +2015,8 @@ msgstr " --ignoresize - ne preverjaj količine praznega prostora.\n"
#: ../urpmi:138
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
-msgstr " --ignorearch - dovoli namestitev rpm paketov različnih arhitektur.\n"
+msgstr ""
+" --ignorearch - dovoli namestitev rpm paketov različnih arhitektur.\n"
#: ../urpmi:139
#, c-format
@@ -2118,10 +2103,10 @@ msgstr "Ob uporabi --install-src ne morete nameščati binarnih rpm paketov."
#: ../urpmi:221
#, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-"uporabite --buildrequires ali --install-src, ki "
-"privzema --buildrequires"
+"uporabite --buildrequires ali --install-src, ki privzema --buildrequires"
#: ../urpmi:241
#, c-format
@@ -2298,8 +2283,8 @@ msgid ""
"dependencies:\n"
"%s\n"
msgstr ""
-"Za namestitev sledečih odvisnosti morate najprej "
-"zagnati urpmi z možnostjo --buildrequires:\n"
+"Za namestitev sledečih odvisnosti morate najprej zagnati urpmi z možnostjo --"
+"buildrequires:\n"
"%s\n"
#: ../urpmi:595
@@ -2317,7 +2302,12 @@ msgstr "Uporabljenega bo %s dodatnega prostora na disku."
msgid "%s of disk space will be freed."
msgstr "Sproščenega bo %s prostora na disku."
-#: ../urpmi:603
+#: ../urpmi:604
+#, fuzzy, c-format
+msgid "%s of packages will be retrieved."
+msgstr "Sproščenega bo %s prostora na disku."
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2326,12 +2316,7 @@ msgstr[1] "Nadaljujem z namestitvijo %d paketa?"
msgstr[2] "Nadaljujem z namestitvijo %d paketov?"
msgstr[3] "Nadaljujem z namestitvijo %d paketov?"
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Pritisnite Enter ko boste pripravljeni ..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Prekliči"
@@ -2344,7 +2329,7 @@ msgstr "ponovno zaganjanje urpmi"
#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
-#, c-format
+#, fuzzy, c-format
msgid ""
"usage: urpmi.addmedia [options] <name> <url>\n"
"where <url> is one of\n"
@@ -2352,7 +2337,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2411,8 +2396,10 @@ msgid ""
" one of: never, on-demand, update-only, always. cf urpmi."
"cfg(5)\n"
msgstr ""
-" --xml-info - uporabi specifični način za prenašanje datotek XML s podatki\n"
-" eno izmed: never (nikoli), on-demand (na zahtevo), update-only (samo posodobitev), always (vedno). Nastavitvena datoteka urpmi.cfg(5)\n"
+" --xml-info - uporabi specifični način za prenašanje datotek XML s "
+"podatki\n"
+" eno izmed: never (nikoli), on-demand (na zahtevo), update-"
+"only (samo posodobitev), always (vedno). Nastavitvena datoteka urpmi.cfg(5)\n"
#: ../urpmi.addmedia:66
#, c-format
@@ -2477,12 +2464,7 @@ msgstr " --nopubkey - ne uvozi javnega ključa dodanih virov\n"
msgid " --raw - add the media in config, but don't update it.\n"
msgstr " --raw - dodaj vir v nastavitve, a ga ne posodobi.\n"
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - počisti imenik s predpomnilnikom zaglavij.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - tihi način.\n"
@@ -2580,13 +2562,15 @@ msgstr " --noclean - ne počisti mape za ponovno izgradnjo paketov.\n"
#: ../urpmi.recover:37
#, c-format
-msgid " --list - list transactions since provided date/duration argument\n"
+msgid ""
+" --list - list transactions since provided date/duration argument\n"
msgstr " --list - prikaži čas in trajanje vseh izvedenih opravil\n"
#: ../urpmi.recover:38
#, c-format
msgid " --list-all - list all transactions in rpmdb (long)\n"
-msgstr " --list-all - prikaži vsa izvedena opravila v rpmdb (dolga oblika)\n"
+msgstr ""
+" --list-all - prikaži vsa izvedena opravila v rpmdb (dolga oblika)\n"
#: ../urpmi.recover:39
#, c-format
@@ -2646,7 +2630,8 @@ msgstr "Napačni argumenti ukazne vrstice[%s]\n"
#: ../urpmi.recover:84
#, c-format
msgid "You can't specify --checkpoint and --rollback at the same time\n"
-msgstr "Ne morete hkrati izbrati --ponovne izgradnje paketov in --obnove sistema\n"
+msgstr ""
+"Ne morete hkrati izbrati --ponovne izgradnje paketov in --obnove sistema\n"
#: ../urpmi.recover:86
#, c-format
@@ -2765,7 +2750,8 @@ msgstr " --no-ignore - ne obnovi, označi vir kot omogočen.\n"
#: ../urpmi.update:47
#, c-format
msgid " --probe-rpms - do not use synthesis, use rpm files directly\n"
-msgstr " --probe-rpms - ne uporabi synthesis, uporabi datoteke rpm neposredno\n"
+msgstr ""
+" --probe-rpms - ne uporabi synthesis, uporabi datoteke rpm neposredno\n"
#: ../urpmi.update:48
#, c-format
@@ -2862,7 +2848,8 @@ msgstr " --list-media - izpiši seznam virov, ki so na voljo.\n"
#: ../urpmq:59
#, c-format
msgid " --list-url - list available media and their url.\n"
-msgstr " --list-url - izpiši seznam virov, ki so na voljo, in njihove url-je.\n"
+msgstr ""
+" --list-url - izpiši seznam virov, ki so na voljo, in njihove url-je.\n"
#: ../urpmq:60
#, c-format
@@ -2874,22 +2861,26 @@ msgstr ""
#: ../urpmq:61
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
-msgstr " --list-aliases - izpiši seznam vzporednih vzdevkov, ki so na voljo.\n"
+msgstr ""
+" --list-aliases - izpiši seznam vzporednih vzdevkov, ki so na voljo.\n"
#: ../urpmq:62
#, c-format
-msgid " --dump-config - dump the config in form of urpmi.addmedia argument.\n"
+msgid ""
+" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr " --dump-config - izvrži nastavitve v formatu za urpmi.addmedia.\n"
#: ../urpmq:63
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
-msgstr " --src - naslednji paket je paket z izvorno kodo (isto kot -s).\n"
+msgstr ""
+" --src - naslednji paket je paket z izvorno kodo (isto kot -s).\n"
# kaj? man pravi: Print source URLs (or file names) of all selected packages.
#: ../urpmq:64
#, 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 - prikaži izvorni url (ali imena datotek) vseh izbranih "
"paketov.\n"
@@ -2916,33 +2907,45 @@ msgid " --changelog - print changelog.\n"
msgstr " --changelog - izpiše zgodovino sprememb.\n"
#: ../urpmq:81
+#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - konfliktne oznake\n"
+
+#: ../urpmq:82
#, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - izpiše, kaj ponuja paket.\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - niz zahteva\n"
+
+#: ../urpmq:84
#, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - izpiše ime izvornega rpm paketa.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - izpiše povzetek.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, c-format
msgid ""
" --requires-recursive, -d\n"
" - query package dependencies.\n"
msgstr ""
" --requires-recursive, -d\n"
-" - poizvedba tudi pri paketih, od katerih je odvisen paket.\n"
+" - poizvedba tudi pri paketih, od katerih je odvisen "
+"paket.\n"
#: ../urpmq:87
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
-msgstr " --whatrequires - iskanje paketov, katerim je podan paket odvisnost.\n"
+msgstr ""
+" --whatrequires - iskanje paketov, katerim je podan paket odvisnost.\n"
#: ../urpmq:88
#, c-format
@@ -3011,7 +3014,8 @@ msgstr ""
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
-msgstr " -u - odstrani paket, če je že nameščena novejša verzija.\n"
+msgstr ""
+" -u - odstrani paket, če je že nameščena novejša verzija.\n"
#: ../urpmq:102
#, c-format
@@ -3035,7 +3039,12 @@ msgstr " imena ali datoteke rpm podane preko ukazne vrstice so obdelane.\n"
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes je lahko uporabljeno samo s --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, c-format
+msgid "use -l to list files"
+msgstr ""
+
+#: ../urpmq:363
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr "za vir »%s« ni podatkov v obliki XML, samo delni rezultat za paket %s"
@@ -3047,16 +3056,59 @@ msgstr "za vir »%s« ni podatkov v obliki XML, samo delni rezultat za pakete %s
#: ../urpmq:364
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
-msgstr "za vir »%s« ni podatkov v obliki XML, ni moč vrniti nobenega rezultata za paket %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
+msgstr ""
+"za vir »%s« ni podatkov v obliki XML, ni moč vrniti nobenega rezultata za "
+"paket %s"
#: ../urpmq:365
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
-msgstr "za vir »%s« ni podatkov v obliki XML, ni moč vrniti nobenega rezultata za pakete %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"za vir »%s« ni podatkov v obliki XML, ni moč vrniti nobenega rezultata za "
+"pakete %s"
#: ../urpmq:429
#, c-format
msgid "No changelog found\n"
msgstr "Dnevnik sprememb ni bil najden\n"
+#~ msgid "Unknown option %s"
+#~ msgstr "Neznana možnost %s"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "\"%s\" ima preveč priklopnih točk"
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "izmenljiva naprava vzeta kot \"%s\""
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "Vir \"%s\" je slika ISO, priklopljena bo sproti"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "uporaba druge izmenljive naprave [%s] za \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "ni mogoče razrešiti poti za izmenljivi medij \"%s\""
+
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "ni moč priklopiti vira distribucije"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "Dostop do vira \"%s\" ni mogoč.\n"
+#~ "Do tega lahko pride, če ste med ustvarjanjem vira ročno priklopili imenik"
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "neurejen medij \"%s\" je označen kot izmenljiv, a to ne drži"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Pritisnite Enter ko boste pripravljeni ..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - počisti imenik s predpomnilnikom zaglavij.\n"
diff --git a/po/sq.po b/po/sq.po
index 70620816..b9fca091 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2002-12-04 23:55+0200\n"
"Last-Translator: Naim Daka <naim70@freesurf.ch>\n"
"Language-Team: Albanian <LL@li.org>\n"
@@ -86,14 +86,7 @@ msgstr "_Anulo"
msgid "Choose location to save file"
msgstr "Zgjedhe një skedare"
-#: ../gurpmi.pm:80
-#, fuzzy, c-format
-msgid "Unknown option %s"
-msgstr ""
-"\n"
-"opcione të pa njoftura '%s'\n"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Asnjë urdhër i specifikuar"
@@ -205,12 +198,12 @@ msgstr "Përgatitje..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Instalimi i pakove `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Ju lutemi futni burimin e emruar \"%s\" në mjetin [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Shkarkimi i pakos `%s'..."
@@ -404,6 +397,16 @@ msgstr ""
msgid "Copying failed"
msgstr "Kopjimi dështoi"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "burimi \"%s\" nuk është i zgjedhur"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "i pa mundur leximi i skedares [%s] nga burimi \"%s\""
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -712,7 +715,12 @@ msgstr "Tento një instalim pa verifikimin e mvarësive? (p/J) "
msgid "Try harder to install (--force)? (y/N) "
msgstr "Tento një instalim më të forcuar (--force)? (p/J) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -726,11 +734,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "Instalimi i transmetimit të %d dështio"
msgstr[1] "Instalimi i transmetimit të %d dështio"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Instalimi është i mundur"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -756,6 +759,11 @@ msgstr "Gjdo gjë është veçse e instaluar"
msgid "Packages %s can not be installed"
msgstr "Gjdo gjë është veçse e instaluar"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Instalimi është i mundur"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -789,29 +797,9 @@ msgstr "tentim në kalimin e një burimit ekzistues \"%s\", ndërprerje"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "shumë pika montuese për burimin tërheqës \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "marrje e mjetit tërheqës si \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+msgid "failed to migrate removable device, ignoring media"
msgstr ""
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "përdorime të ndryshme të mjeteve tërheqëse [%s] për \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "e pa mundur hyrja në shtegun e burimit tërheqës \"%s\""
-
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
msgid "wrote config file [%s]"
@@ -871,12 +859,7 @@ msgstr "leximi i majës nga burimi \"%s\""
msgid "adding medium \"%s\""
msgstr "zhdukja e burimit \"%s\""
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "hyrja e pa mundur në burimin e parë instalues"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -993,18 +976,7 @@ msgstr "kontrollimi i skedares hdlist [%s]"
msgid "comparing %s and %s"
msgstr "instalimi i %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"blokon hyrjen në burimin \"%s\",\n"
-"kjo mund të ndodhë nëse ju e montoni manualisht repetorin kur e krijoni atë "
-"burim."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "asnjë skedare e gjetur hdlist për burimin \"%s\""
@@ -1171,37 +1143,21 @@ msgstr "gjetja e përkrahjes në nyjet paralele: %s"
msgid "unable to use parallel option \"%s\""
msgstr "i pa mundur përdorimi i opcionit paralel \"%s\""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "hyrje e pa mundur në burimin \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "montimi i %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "demontimi i %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "burimi \"%s\" nuk është i zgjedhur"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "i pa mundur leximi i skedares [%s] nga burimi \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr ""
-"burim i ngatërruar \"%s\" është i shënuar si levizës, në të vërtet nuk është"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "hyrje e pa mundur në burimin \"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, fuzzy, c-format
msgid ""
@@ -2286,19 +2242,19 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Shtypni mbi Enter kur jeni i gatshëm..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Anulo"
@@ -2319,7 +2275,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2443,12 +2399,7 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - pastrim i majave në repertort e fshehtë.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - model i qetë.\n"
@@ -2871,20 +2822,30 @@ msgstr " --all - çfaqi të gjitha etiketat.\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - çfaqe etiketën conflicts: gjitha konfliktet.\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - çfaqe etiketën provides: gjitha pajisjet.\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - çfaqe etiketën requires: gjitha dëshiratë.\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - çfaqe etiketën sourcerpm: burimi rpm.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - çfaqe etiketën summary: përmbledhje.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -2979,7 +2940,12 @@ msgstr ""
msgid "--list-nodes can only be used with --parallel"
msgstr "--liste-nodes mund të përdoret vetëm me --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "shkruarja në skedaren list është e pa mundur për \"%s\""
+
+#: ../urpmq:363
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3006,6 +2972,48 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Asnjë imazh i gjetur"
+#, fuzzy
+#~ msgid "Unknown option %s"
+#~ msgstr ""
+#~ "\n"
+#~ "opcione të pa njoftura '%s'\n"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "shumë pika montuese për burimin tërheqës \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "marrje e mjetit tërheqës si \"%s\""
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "përdorime të ndryshme të mjeteve tërheqëse [%s] për \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "e pa mundur hyrja në shtegun e burimit tërheqës \"%s\""
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "hyrja e pa mundur në burimin e parë instalues"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "blokon hyrjen në burimin \"%s\",\n"
+#~ "kjo mund të ndodhë nëse ju e montoni manualisht repetorin kur e krijoni "
+#~ "atë burim."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr ""
+#~ "burim i ngatërruar \"%s\" është i shënuar si levizës, në të vërtet nuk "
+#~ "është"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Shtypni mbi Enter kur jeni i gatshëm..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - pastrim i majave në repertort e fshehtë.\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "burimi virtuel duhet të jetë lokal"
@@ -3275,9 +3283,6 @@ msgstr "Asnjë imazh i gjetur"
#~ msgid "file [%s] already used in the same medium \"%s\""
#~ msgstr "skedarja [%s] është në përdorim nga i njëjti burim \"%s\""
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "shkruarja në skedaren list është e pa mundur për \"%s\""
-
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "asgjë s'është shkruar në skedaren list \"%s\""
diff --git a/po/sr.po b/po/sr.po
index d3039a61..6cc5de39 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-sr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2004-02-01 19:27+0100\n"
"Last-Translator: Toma Jankovic <webmaster@mandrake.co.yu>\n"
"Language-Team: serbian <mdk@linux.rs.sr>\n"
@@ -95,14 +95,7 @@ msgstr "_Поништи"
msgid "Choose location to save file"
msgstr "Изаберите фајл"
-#: ../gurpmi.pm:80
-#, fuzzy, c-format
-msgid "Unknown option %s"
-msgstr ""
-"\n"
-"непознате опције '%s'\n"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Није одређена команда"
@@ -212,12 +205,12 @@ msgstr "Припремам..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Инсталирам пакет `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Убаците медиј са именом %s у уређај [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Скидам пакет `%s'..."
@@ -408,6 +401,16 @@ msgstr ""
msgid "Copying failed"
msgstr "Копирање није успело"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "медиј \"%s\" није изабран"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "не могу да прочитам rpm датотеку [%s] са медија \"%s\""
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -716,7 +719,12 @@ msgstr "Инсталиација без провере зависности (д
msgid "Try harder to install (--force)? (y/N) "
msgstr "Присилна инсталација (--force)? (да/Не) ?"
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -731,11 +739,6 @@ msgstr[0] "%d инстлациона трансакција није успел
msgstr[1] "%d инстлациона трансакција није успела"
msgstr[2] "%d инстлациона трансакција није успела"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Инсталација је могућа"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -761,6 +764,11 @@ msgstr "све је већ инсталирано"
msgid "Packages %s can not be installed"
msgstr "све је већ инсталирано"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Инсталација је могућа"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -793,29 +801,9 @@ msgstr "покушавам да премостим постојећи медиј
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "превише тачака монтирања за преносни медиј \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "узимам преносни уређај као \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+msgid "failed to migrate removable device, ignoring media"
msgstr ""
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "користећи различит преносни уређај или [%s] за \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "не могу да добавим путању за преносни медиј \"%s\""
-
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
msgid "wrote config file [%s]"
@@ -875,12 +863,7 @@ msgstr "читам хедере са медија \"%s\""
msgid "adding medium \"%s\""
msgstr "уклањам медиј \"%s\""
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "не могу да приступим првом инсталационом медију"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -996,18 +979,7 @@ msgstr "испитујем hdlist фајл [%s]"
msgid "comparing %s and %s"
msgstr "Инсталирам %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"не могу да приступим медију \"%s\",\n"
-"ово се може десити уколико сте ручно монтирали директоријум приликом "
-"креирања медија."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "није пронађена hdlist датотека за медиј \"%s\""
@@ -1174,37 +1146,21 @@ msgstr "пронађен паралелни држач ѕа нодове: %s"
msgid "unable to use parallel option \"%s\""
msgstr "не могу да користим паралелну опцију \"%s\""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "не могу да приступим медију \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "монтирам %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "демонтирам %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "медиј \"%s\" није изабран"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "не могу да прочитам rpm датотеку [%s] са медија \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr ""
-"некохерентан медиј \"%s\" је означен као преносни али то није у стварности"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "не могу да приступим медију \"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, fuzzy, c-format
msgid ""
@@ -2285,7 +2241,12 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2293,12 +2254,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Притисните enter када будете спремни..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Одустани"
@@ -2319,7 +2275,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2437,12 +2393,7 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - чисти директоријум са кешом надглавља.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - тихи режим (мало порука).\n"
@@ -2864,20 +2815,30 @@ msgstr " --changelog - приказује лог са изменама.\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - приказује таг конфликата: сви конфликти.\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - приказује таг обезбеђује: све обезбеђује.\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - приказује таг захтева: сви захтеви\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - приказује таг sourcerpm: source rpm.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - приказује таг сажетка: сажетак.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -2971,7 +2932,12 @@ msgstr ""
msgid "--list-nodes can only be used with --parallel"
msgstr " --list-nodes се може користити само са опцијом --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "не могу да упишем датотеку листе за \"%s\""
+
+#: ../urpmq:363
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -2998,6 +2964,47 @@ msgstr ""
msgid "No changelog found\n"
msgstr "НИје пронађен image"
+#, fuzzy
+#~ msgid "Unknown option %s"
+#~ msgstr ""
+#~ "\n"
+#~ "непознате опције '%s'\n"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "превише тачака монтирања за преносни медиј \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "узимам преносни уређај као \"%s\""
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "користећи различит преносни уређај или [%s] за \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "не могу да добавим путању за преносни медиј \"%s\""
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "не могу да приступим првом инсталационом медију"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "не могу да приступим медију \"%s\",\n"
+#~ "ово се може десити уколико сте ручно монтирали директоријум приликом "
+#~ "креирања медија."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr ""
+#~ "некохерентан медиј \"%s\" је означен као преносни али то није у стварности"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Притисните enter када будете спремни..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - чисти директоријум са кешом надглавља.\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "виртуални медиј мора да буде локални"
@@ -3238,9 +3245,6 @@ msgstr "НИје пронађен image"
#~ msgid "file [%s] already used in the same medium \"%s\""
#~ msgstr "фајл [%s] је већ корисштен за исти медиј \"%s\""
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "не могу да упишем датотеку листе за \"%s\""
-
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "нема шта да се упише у датотеку листе за \"%s\""
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 031310ab..7fb7ac3a 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-sr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2004-02-01 19:27+0100\n"
"Last-Translator: Toma Jankovic <webmaster@mandrake.co.yu>\n"
"Language-Team: serbian <mdk@linux.rs.sr>\n"
@@ -95,14 +95,7 @@ msgstr "_Poništi"
msgid "Choose location to save file"
msgstr "Izaberite fajl"
-#: ../gurpmi.pm:80
-#, fuzzy, c-format
-msgid "Unknown option %s"
-msgstr ""
-"\n"
-"nepoznate opcije '%s'\n"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Nije određena komanda"
@@ -212,12 +205,12 @@ msgstr "Pripremam..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Instaliram paket `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Ubacite medij sa imenom %s u uređaj [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Skidam paket `%s'..."
@@ -408,6 +401,16 @@ msgstr ""
msgid "Copying failed"
msgstr "Kopiranje nije uspelo"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "medij \"%s\" nije izabran"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "ne mogu da pročitam rpm datoteku [%s] sa medija \"%s\""
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -716,7 +719,12 @@ msgstr "Instaliacija bez provere zavisnosti (da/Ne)? "
msgid "Try harder to install (--force)? (y/N) "
msgstr "Prisilna instalacija (--force)? (da/Ne) ?"
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -731,11 +739,6 @@ msgstr[0] "%d instlaciona transakcija nije uspela"
msgstr[1] "%d instlaciona transakcija nije uspela"
msgstr[2] "%d instlaciona transakcija nije uspela"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Instalacija je moguća"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -761,6 +764,11 @@ msgstr "sve je već instalirano"
msgid "Packages %s can not be installed"
msgstr "sve je već instalirano"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Instalacija je moguća"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -793,29 +801,9 @@ msgstr "pokušavam da premostim postojeći medij \"%s\", izbegavam"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "previše tačaka montiranja za prenosni medij \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "uzimam prenosni uređaj kao \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+msgid "failed to migrate removable device, ignoring media"
msgstr ""
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "koristeći različit prenosni uređaj ili [%s] za \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ne mogu da dobavim putanju za prenosni medij \"%s\""
-
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
msgid "wrote config file [%s]"
@@ -875,12 +863,7 @@ msgstr "čitam hedere sa medija \"%s\""
msgid "adding medium \"%s\""
msgstr "uklanjam medij \"%s\""
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "ne mogu da pristupim prvom instalacionom mediju"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -996,18 +979,7 @@ msgstr "ispitujem hdlist fajl [%s]"
msgid "comparing %s and %s"
msgstr "Instaliram %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"ne mogu da pristupim mediju \"%s\",\n"
-"ovo se može desiti ukoliko ste ručno montirali direktorijum prilikom "
-"kreiranja medija."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "nije pronađena hdlist datoteka za medij \"%s\""
@@ -1174,37 +1146,21 @@ msgstr "pronađen paralelni držač dza nodove: %s"
msgid "unable to use parallel option \"%s\""
msgstr "ne mogu da koristim paralelnu opciju \"%s\""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "ne mogu da pristupim mediju \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "montiram %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "demontiram %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "medij \"%s\" nije izabran"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "ne mogu da pročitam rpm datoteku [%s] sa medija \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr ""
-"nekoherentan medij \"%s\" je označen kao prenosni ali to nije u stvarnosti"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "ne mogu da pristupim mediju \"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, fuzzy, c-format
msgid ""
@@ -2290,7 +2246,12 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2298,12 +2259,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Pritisnite enter kada budete spremni..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Odustani"
@@ -2324,7 +2280,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2442,12 +2398,7 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - čisti direktorijum sa kešom nadglavlja.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - tihi režim (malo poruka).\n"
@@ -2870,20 +2821,30 @@ msgstr " --changelog - prikazuje log sa izmenama.\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - prikazuje tag konflikata: svi konflikti.\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - prikazuje tag obezbeđuje: sve obezbeđuje.\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - prikazuje tag zahteva: svi zahtevi\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - prikazuje tag sourcerpm: source rpm.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - prikazuje tag sažetka: sažetak.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -2979,7 +2940,12 @@ msgstr ""
msgid "--list-nodes can only be used with --parallel"
msgstr " --list-nodes se može koristiti samo sa opcijom --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "ne mogu da upišem datoteku liste za \"%s\""
+
+#: ../urpmq:363
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3006,6 +2972,47 @@ msgstr ""
msgid "No changelog found\n"
msgstr "NIje pronađen image"
+#, fuzzy
+#~ msgid "Unknown option %s"
+#~ msgstr ""
+#~ "\n"
+#~ "nepoznate opcije '%s'\n"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "previše tačaka montiranja za prenosni medij \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "uzimam prenosni uređaj kao \"%s\""
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "koristeći različit prenosni uređaj ili [%s] za \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "ne mogu da dobavim putanju za prenosni medij \"%s\""
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "ne mogu da pristupim prvom instalacionom mediju"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "ne mogu da pristupim mediju \"%s\",\n"
+#~ "ovo se može desiti ukoliko ste ručno montirali direktorijum prilikom "
+#~ "kreiranja medija."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr ""
+#~ "nekoherentan medij \"%s\" je označen kao prenosni ali to nije u stvarnosti"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Pritisnite enter kada budete spremni..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - čisti direktorijum sa kešom nadglavlja.\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "virtualni medij mora da bude lokalni"
@@ -3246,9 +3253,6 @@ msgstr "NIje pronađen image"
#~ msgid "file [%s] already used in the same medium \"%s\""
#~ msgstr "fajl [%s] je već korisšten za isti medij \"%s\""
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "ne mogu da upišem datoteku liste za \"%s\""
-
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "nema šta da se upiše u datoteku liste za \"%s\""
diff --git a/po/sv.po b/po/sv.po
index d1524db8..1c1e47f2 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -18,7 +18,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-sv\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2008-02-27 20:46+0200\n"
"Last-Translator: Thomas Backlund <tmb@mandriva.org>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -114,12 +114,7 @@ msgstr "Av_bryt"
msgid "Choose location to save file"
msgstr "Välj var filen ska sparas"
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "Okända flagga %s"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "Inga paket specifierade"
@@ -193,13 +188,17 @@ msgstr ""
#: ../gurpmi2:215 ../urpmi:592
#, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
-msgstr "För att tillfredsställa beroenden, kommer följande paket att installeras:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
+msgstr ""
+"För att tillfredsställa beroenden, kommer följande paket att installeras:"
#: ../gurpmi2:216 ../urpmi:593
#, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
-msgstr "För att tillfredsställa beroenden kommer följande paket att installeras:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr ""
+"För att tillfredsställa beroenden kommer följande paket att installeras:"
#: ../gurpmi2:218
#, c-format
@@ -228,12 +227,12 @@ msgstr "Förbereder..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Installerar paket \"%s\" (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Lägg i media med namnet \"%s\" i enhet [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Laddar ner paket \"%s\"..."
@@ -398,7 +397,9 @@ msgstr "urpmq: kan inte läsa rpm-fil \"%s\"\n"
#: ../urpm/args.pm:353
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
-msgstr "som standard väntar urpmf på en regexp. du borde använda alternativet \"--literal\""
+msgstr ""
+"som standard väntar urpmf på en regexp. du borde använda alternativet \"--"
+"literal\""
#: ../urpm/args.pm:419
#, c-format
@@ -425,6 +426,16 @@ msgstr "För många argument\n"
msgid "Copying failed"
msgstr "Kopiering misslyckades"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, c-format
+msgid "medium \"%s\" is not available"
+msgstr "mediat \"%s\" är inte tillgängligt"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "kunde inte läsa RPM-fil [%s] från media \"%s\""
+
#: ../urpm/cfg.pm:81
#, c-format
msgid "syntax error in config file at line %s"
@@ -578,7 +589,9 @@ msgstr "felaktig sökväg: [%s]"
#: ../urpm/get_pkgs.pm:149
#, c-format
msgid "sorry, you can't use --install-src to install remote .src.rpm files"
-msgstr "tyvärr, du kan inte använda --install-src för att installera fjärr src.rpm filer"
+msgstr ""
+"tyvärr, du kan inte använda --install-src för att installera fjärr src.rpm "
+"filer"
#: ../urpm/get_pkgs.pm:156
#, c-format
@@ -592,7 +605,8 @@ msgstr "[ompaketering]"
#: ../urpm/install.pm:154
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
"skapade transaktion för installation på %s (ta bort=%d, installera=%d, "
"uppdatera=%d)"
@@ -732,7 +746,12 @@ msgstr "Prova att installera utan att kontrollera behov av andra filer? (j/N) "
msgid "Try harder to install (--force)? (y/N) "
msgstr "Försök ännu hårdare att installera (--force)? (j/N) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -748,11 +767,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "%d installationstransaktion misslyckades"
msgstr[1] "%d installationstransaktioner misslyckades"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Installation är möjlig"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -778,6 +792,11 @@ msgstr "Paket %s kan inte installeras"
msgid "Packages %s can not be installed"
msgstr "Paketen %s kan inte installeras"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Installation är möjlig"
+
#: ../urpm/md5sum.pm:20
#, c-format
msgid "examining %s file"
@@ -810,28 +829,8 @@ msgstr "försöker gå förbi befintligt media \"%s\", hoppar över"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "för många monteringspunkter för flyttbar media \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "tar flyttbar enhet som \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "Meia \"%s\" är en ISO avbild, den kommer att monteras automatiskt vid behov."
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "använder annan flyttbar enhet [%s] för \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "Kunde inte hämta sökväg för flyttbart media \"%s\""
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -892,12 +891,7 @@ msgstr "lägger till media \"%s\" före fjärrmedia \"%s\""
msgid "adding medium \"%s\""
msgstr "lägger till media \"%s\""
-#: ../urpm/media.pm:750
-#, c-format
-msgid "unable to mount the distribution medium"
-msgstr "kan inte montera distributionsmediat"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "denna sökväg verkar inte innehålla någon distribution"
@@ -1012,18 +1006,7 @@ msgstr "genhdlist2 misslyckades på %s"
msgid "comparing %s and %s"
msgstr "jämför %s och %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"Kan inte läsa media \"%s\",\n"
-"detta kan hända om du manuellt monterade katalogen när du skapade detta "
-"media."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "felaktig hdlist-fil %s för media \"%s\""
@@ -1190,36 +1173,21 @@ msgstr "hittade parallella hanterare för noder: %s"
msgid "unable to use parallel option \"%s\""
msgstr "kan inte använda parallellalternativ \"%s\""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "kunde inte komma åt media \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "monterar %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "avmonterar %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not available"
-msgstr "mediat \"%s\" är inte tillgängligt"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "kunde inte läsa RPM-fil [%s] från media \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "Felkonfigurerat media \"%s\" är markerat som flyttbart men är inte det"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "kunde inte komma åt media \"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
@@ -1260,7 +1228,8 @@ msgstr " --excludemedia - använd inte givet media, separerat med komma.\n"
#: ../urpm/search.pm:39 ../urpmf:39
#, c-format
-msgid " --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr " --literal, -l - sök inte mönster, använd argument som söksträng.\n"
#: ../urpm/search.pm:40 ../urpme:52 ../urpmf:40 ../urpmi:111
@@ -1277,8 +1246,10 @@ msgstr " --media - använd endast givet media, separerat med komma.\n"
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
-msgid " --sortmedia - sort media according to substrings separated by comma.\n"
-msgstr " --sortmedia - sorterar media enligt kommaseparerade delsträngar.\n"
+msgid ""
+" --sortmedia - sort media according to substrings separated by comma.\n"
+msgstr ""
+" --sortmedia - sorterar media enligt kommaseparerade delsträngar.\n"
#: ../urpm/search.pm:43 ../urpmf:43
#, c-format
@@ -1308,12 +1279,14 @@ msgstr " --verbose - utförligt läge.\n"
#: ../urpm/search.pm:48 ../urpmf:48
#, c-format
msgid " -i - ignore case distinctions in patterns.\n"
-msgstr " -i - versaler och gemener jämförs lika i varje mönster.\n"
+msgstr ""
+" -i - versaler och gemener jämförs lika i varje mönster.\n"
#: ../urpm/search.pm:49 ../urpmf:49
#, c-format
msgid " -I - honor case distinctions in patterns (default).\n"
-msgstr " -I - versaler och gemener jämförs olika i varje mönster.\n"
+msgstr ""
+" -I - versaler och gemener jämförs olika i varje mönster.\n"
#: ../urpm/search.pm:50 ../urpmf:50
#, c-format
@@ -1531,8 +1504,10 @@ msgstr "urpmi startades om, och listan av prioriterade paket ändrades inte"
#: ../urpm/select.pm:23
#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr "urpmi startades om, och listan av prioriterade paket ändrades: %s mot %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"urpmi startades om, och listan av prioriterade paket ändrades: %s mot %s"
#: ../urpm/select.pm:184
#, c-format
@@ -1637,7 +1612,8 @@ msgstr " --test - verifiera om borttagningen kan utföras korrekt.\n"
#: ../urpme:48 ../urpmi:104 ../urpmq:65
#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
msgstr " --force - tvinga användning även om vissa paket inte finns.\n"
#: ../urpme:49 ../urpmi:109 ../urpmq:67
@@ -1713,9 +1689,12 @@ msgstr "Kontrollerar för att ta bort följande paket"
#: ../urpme:124
#, c-format
msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural "To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "För att tillfredsställa beroenden kommer följande paket att tas bort"
-msgstr[1] "För att tillfredsställa beroenden kommer följande %d paket att tas bort"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"För att tillfredsställa beroenden kommer följande paket att tas bort"
+msgstr[1] ""
+"För att tillfredsställa beroenden kommer följande %d paket att tas bort"
#: ../urpme:128
#, c-format
@@ -1752,7 +1731,8 @@ msgstr ""
#: ../urpmi:78
#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
" --searchmedia - använd endast givet media för att söka efter valda "
"paket.\n"
@@ -1762,12 +1742,15 @@ msgstr ""
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
-msgstr " --auto - ej interaktivt läge. väljer standardsvar på alla frågor.\n"
+msgstr ""
+" --auto - ej interaktivt läge. väljer standardsvar på alla frågor.\n"
#: ../urpmi:82 ../urpmq:52
#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - välj automatiskt paket för att uppdatera systemet.\n"
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - välj automatiskt paket för att uppdatera systemet.\n"
#: ../urpmi:83
#, c-format
@@ -1861,8 +1844,10 @@ msgstr " --justdb - updatera endast rpm db, inte filsystemet\n"
#: ../urpmi:103
#, c-format
-msgid " --replacepkgs - force installing packages which are already installed.\n"
-msgstr " --replacepkgs - tvinga installation av paket som redan är installerade.\n"
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+" --replacepkgs - tvinga installation av paket som redan är installerade.\n"
#: ../urpmi:105
#, c-format
@@ -1988,7 +1973,8 @@ msgstr ""
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
-msgstr " --test - verifiera endast om installationen kan utföras korrekt.\n"
+msgstr ""
+" --test - verifiera endast om installationen kan utföras korrekt.\n"
#: ../urpmi:135
#, c-format
@@ -2008,7 +1994,8 @@ msgstr " --ignoresize - kontrollera inte diskutrymme före installation.\n"
#: ../urpmi:138
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
-msgstr " --ignorearch - tillåt installation av rpm som inte matchar arkitektur.\n"
+msgstr ""
+" --ignorearch - tillåt installation av rpm som inte matchar arkitektur.\n"
#: ../urpmi:139
#, c-format
@@ -2052,7 +2039,8 @@ msgstr " -a - välj alla träffar på kommandoraden.\n"
#: ../urpmi:148
#, c-format
msgid " -p - allow search in provides to find package.\n"
-msgstr " -p - tillåt sökning i \"provides\" för att hitta paket.\n"
+msgstr ""
+" -p - tillåt sökning i \"provides\" för att hitta paket.\n"
#: ../urpmi:149
#, c-format
@@ -2095,8 +2083,11 @@ msgstr "Du kan inte installerabinära RPM-filer när -install-src används"
#: ../urpmi:221
#, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
-msgstr "vänligen använd --buildrequires eller --install-src, använder --buildrequires som standard"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgstr ""
+"vänligen använd --buildrequires eller --install-src, använder --"
+"buildrequires som standard"
#: ../urpmi:241
#, c-format
@@ -2273,7 +2264,8 @@ msgid ""
"dependencies:\n"
"%s\n"
msgstr ""
-"Du måste först använda urpmi --buildqequires för att installera följande beroenden:\n"
+"Du måste först använda urpmi --buildqequires för att installera följande "
+"beroenden:\n"
"%s\n"
#: ../urpmi:595
@@ -2291,19 +2283,19 @@ msgstr "%s mera disk-utrymme kommer att bli använt."
msgid "%s of disk space will be freed."
msgstr "%s disk-utrymme kommer att frigöras."
-#: ../urpmi:603
+#: ../urpmi:604
+#, fuzzy, c-format
+msgid "%s of packages will be retrieved."
+msgstr "%s disk-utrymme kommer att frigöras."
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Fortsätt installationen ett paket?"
msgstr[1] "Fortsätt installationen av %d paket?"
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Tryck \"Enter\" vid klart..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Avbryt"
@@ -2316,7 +2308,7 @@ msgstr "startar om urpmi"
#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
-#, c-format
+#, fuzzy, c-format
msgid ""
"usage: urpmi.addmedia [options] <name> <url>\n"
"where <url> is one of\n"
@@ -2324,7 +2316,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2346,7 +2338,8 @@ msgstr ""
" removable://<sökväg>\n"
"\n"
"usage: urpmi.addmedia [flaggor] --distrib --mirrorlist <address>\n"
-"usage: urpmi.addmedia [flaggor] --mirrorlist <address> <namn> <relativ sökväg>\n"
+"usage: urpmi.addmedia [flaggor] --mirrorlist <address> <namn> <relativ "
+"sökväg>\n"
"\n"
"exempel:\n"
"\n"
@@ -2384,7 +2377,8 @@ msgid ""
"cfg(5)\n"
msgstr ""
" --xml-info - använd specifik policy för hämtning av xml info-filer\n"
-" en av: never, on-demand, update-only, always. se urpmi.cfg(5)\n"
+" en av: never, on-demand, update-only, always. se urpmi.cfg"
+"(5)\n"
#: ../urpmi.addmedia:66
#, c-format
@@ -2448,14 +2442,10 @@ msgstr " --nopubkey - importera inte pubkey för adderat media\n"
#: ../urpmi.addmedia:79
#, c-format
msgid " --raw - add the media in config, but don't update it.\n"
-msgstr " --raw - lägg till mediat i config, men uppdatera inte det.\n"
-
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - rensa huvudcachekatalogen.\n"
+msgstr ""
+" --raw - lägg till mediat i config, men uppdatera inte det.\n"
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - tyst läge.\n"
@@ -2548,12 +2538,15 @@ msgstr " --checkpoint - sätt ompaketeringsstart nu\n"
#: ../urpmi.recover:35
#, c-format
msgid " --noclean - don't clean repackage directory on checkpoint\n"
-msgstr " --noclean - rensa inte ompaketeringskatalog vid kontrollpunkt.\n"
+msgstr ""
+" --noclean - rensa inte ompaketeringskatalog vid kontrollpunkt.\n"
#: ../urpmi.recover:37
#, c-format
-msgid " --list - list transactions since provided date/duration argument\n"
-msgstr " --list - lista transaktioner efter angivet datum/period argument\n"
+msgid ""
+" --list - list transactions since provided date/duration argument\n"
+msgstr ""
+" --list - lista transaktioner efter angivet datum/period argument\n"
#: ../urpmi.recover:38
#, c-format
@@ -2830,7 +2823,8 @@ msgstr " --list-url - lista tillgänglig media och dess sökväg.\n"
#: ../urpmq:60
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
-msgstr " --list-nodes - visa tillgängliga noder vid användning av --parallel.\n"
+msgstr ""
+" --list-nodes - visa tillgängliga noder vid användning av --parallel.\n"
#: ../urpmq:61
#, c-format
@@ -2839,8 +2833,10 @@ msgstr " --list-aliases - lista tillgängliga parallellalias.\n"
#: ../urpmq:62
#, c-format
-msgid " --dump-config - dump the config in form of urpmi.addmedia argument.\n"
-msgstr " --dump-config - dumpa konfigurationen i form av urpmi.addmedia argument.\n"
+msgid ""
+" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+" --dump-config - dumpa konfigurationen i form av urpmi.addmedia argument.\n"
#: ../urpmq:63
#, c-format
@@ -2849,7 +2845,8 @@ msgstr " --src - nästa paket är ett källpaket (samma som -s).\n"
#: ../urpmq:64
#, 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 - ge alla källpaket före nedladdning (endast root).\n"
#: ../urpmq:66
@@ -2875,21 +2872,31 @@ msgid " --changelog - print changelog.\n"
msgstr " --changelog - skriv ut ändringsloggen (changelog).\n"
#: ../urpmq:81
+#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - visa konflikter\n"
+
+#: ../urpmq:82
#, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - visa tillhandahåller.\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - visa krav\n"
+
+#: ../urpmq:84
#, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - visa källrpm-namn\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - skriv ut summering.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -2924,7 +2931,8 @@ msgstr ""
#: ../urpmq:93
#, c-format
msgid " -c - complete output with package to be removed.\n"
-msgstr " -c - fullständig utmatning med paketet som ska tas bort.\n"
+msgstr ""
+" -c - fullständig utmatning med paketet som ska tas bort.\n"
#: ../urpmq:95
#, c-format
@@ -2963,7 +2971,8 @@ msgstr " -s - nästa paket är ett källpaket (samma som --src).\n"
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
-msgstr " -u - ta bort paket om en nyare version redan är installerad.\n"
+msgstr ""
+" -u - ta bort paket om en nyare version redan är installerad.\n"
#: ../urpmq:102
#, c-format
@@ -2987,28 +2996,80 @@ msgstr " namn eller rpm-filer som anges på kommandoraden förfrågas.\n"
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes kan endast användas med --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, c-format
+msgid "use -l to list files"
+msgstr ""
+
+#: ../urpmq:363
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
-msgstr "ingen xml-info för media \"%s\", endast ofullständigt resultat för paketet %s"
+msgstr ""
+"ingen xml-info för media \"%s\", endast ofullständigt resultat för paketet %s"
#: ../urpmq:361
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
-msgstr "ingen xml-info för media \"%s\", endast ofullständigt resultat för paketen %s"
+msgstr ""
+"ingen xml-info för media \"%s\", endast ofullständigt resultat för paketen %s"
#: ../urpmq:364
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
-msgstr "ingen xml-info för media \"%s\", kan inte returnera resultat för paketet %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
+msgstr ""
+"ingen xml-info för media \"%s\", kan inte returnera resultat för paketet %s"
#: ../urpmq:365
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
-msgstr "ingen xml-info för media \"%s\", kan inte returnera resultat för paketen %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"ingen xml-info för media \"%s\", kan inte returnera resultat för paketen %s"
#: ../urpmq:429
#, c-format
msgid "No changelog found\n"
msgstr "Ingen ändringslogg hittades\n"
+#~ msgid "Unknown option %s"
+#~ msgstr "Okända flagga %s"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "för många monteringspunkter för flyttbar media \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "tar flyttbar enhet som \"%s\""
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr ""
+#~ "Meia \"%s\" är en ISO avbild, den kommer att monteras automatiskt vid "
+#~ "behov."
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "använder annan flyttbar enhet [%s] för \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "Kunde inte hämta sökväg för flyttbart media \"%s\""
+
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "kan inte montera distributionsmediat"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "Kan inte läsa media \"%s\",\n"
+#~ "detta kan hända om du manuellt monterade katalogen när du skapade detta "
+#~ "media."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr ""
+#~ "Felkonfigurerat media \"%s\" är markerat som flyttbart men är inte det"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Tryck \"Enter\" vid klart..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - rensa huvudcachekatalogen.\n"
diff --git a/po/tg.po b/po/tg.po
index 495da911..105f9096 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-tg\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2005-09-17 16:34+0500\n"
"Last-Translator: Victor Ibragimov <youth_opportunities@tajikngo.org>\n"
"Language-Team: Tajik\n"
@@ -114,14 +114,7 @@ msgstr "_Бекор кардан"
msgid "Choose location to save file"
msgstr "Барои захиракунии файл ҷойгиршавиро интихоб кунед"
-#: ../gurpmi.pm:80
-#, fuzzy, c-format
-msgid "Unknown option %s"
-msgstr ""
-"\n"
-"интихоби номуаяйн '%s'\n"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, fuzzy, c-format
msgid "No packages specified"
msgstr "қуттии бо номи %s нест"
@@ -233,12 +226,12 @@ msgstr "Тайёрӣ..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Барномаи коромодаи `%s' (%s/%s) коргузорӣ мешавад..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Лутфан муҳити бо номи \"%s\" ба дастгоҳи [%s] дароред"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Фаровири қуттии `%s'..."
@@ -430,6 +423,16 @@ msgstr ""
msgid "Copying failed"
msgstr "Нусхабардорӣ нагузашт"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "муҳити \"%s\" интихоб нашудааст"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "хондани файли rpm [%s] аз муҳити \"%s\" номумкин"
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -736,7 +739,12 @@ msgstr "Коргузориро бе тафтиши тобеиятҳо кӯшиш
msgid "Try harder to install (--force)? (y/N) "
msgstr "Коргузориро боз устувортар (--force) кӯшиш кунем? (Ҳ/Н) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -750,11 +758,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "%d коргузорӣ амалӣ нагардид"
msgstr[1] "%d коргузорӣ амалӣ нагардид"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Коргузорӣ мумкин аст"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -780,6 +783,11 @@ msgstr "Ҳамааш аллакай кор гузошта шудааст"
msgid "Packages %s can not be installed"
msgstr "Ҳамааш аллакай кор гузошта шудааст"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Коргузорӣ мумкин аст"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -813,29 +821,9 @@ msgstr "кӯшиши гузаштани муҳити вуҷуддоштаи \"%s
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "нуқтаи васлкунии хеле зиёд барои миёнаи хориҷшаванда \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "қабули дастгоҳи хориҷшаванда ҳамчун \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+msgid "failed to migrate removable device, ignoring media"
msgstr ""
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "истифодаи дигар дастгоҳи хориҷшавандаи [%s] барои \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "барқарори номироҳ барои миёнаи хориҷшаванда \"%s\""
-
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
msgid "wrote config file [%s]"
@@ -895,12 +883,7 @@ msgstr "хониши сарлавҳаҳо аз миёнаи \"%s\""
msgid "adding medium \"%s\""
msgstr "хориҷкунии миёнаи \"%s\""
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "дохилшавӣ ба миёнаи коргузориши аввала номумкин"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -1017,18 +1000,7 @@ msgstr "санҷидани файли hdlist [%s]"
msgid "comparing %s and %s"
msgstr "коргузории %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"роҳ ба сарчашма нест \"%s\",\n"
-"ин ҳангоми ба таври дастӣ насб намудани феҳрист дар ҳолати сохтанисарчашма "
-"ба амал меояд."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "файли hdlist барои муҳити \"%s\" ёфт нашуд"
@@ -1195,37 +1167,21 @@ msgstr "дастгузори параллел ёфт шуд барои гире
msgid "unable to use parallel option \"%s\""
msgstr "истифодабарии хосияти параллели \"%s\" номумкуин"
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "дохилшавии муҳити \"%s\" номумкин"
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "васлкунии %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "ҷудокунии %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "муҳити \"%s\" интихоб нашудааст"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "хондани файли rpm [%s] аз муҳити \"%s\" номумкин"
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr ""
-"муҳити бемуносибати \"%s\" ҳамчун ивазшаванда ишора шудааст, локиннодуруст"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "дохилшавии муҳити \"%s\" номумкин"
-
#: ../urpm/search.pm:29 ../urpmf:29
#, fuzzy, c-format
msgid ""
@@ -2350,19 +2306,19 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Вақте, ки тайёр Enter-ро пахш кунед..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Бекор кардан"
@@ -2383,7 +2339,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2508,12 +2464,7 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - феҳристи кэши сарлавҳаҳоро тоза намоед.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - усули ором.\n"
@@ -2943,22 +2894,32 @@ msgstr " --changelog - чопкунии changelog.\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - тэг conflicts-ро чоп намоед: ҳамаи мухолифатро.\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr ""
" --provides - тэг provides-ро чоп намоед: ҳамаи файлҳои "
"пешниҳодшаванда.\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - тэг requires-ро чоп намоед: ҳамаи вобастагиҳоро.\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - тэг sourcerpm-ро чоп намоед: rpm-и аввала.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - чопи ҷамъбасти тэг: ҷамъбаст.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -3055,7 +3016,12 @@ msgstr ""
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes танҳо истифода бурда мешавад бо --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "навиштани файли рӯйхатии \"%s\" номумкин"
+
+#: ../urpmq:363
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3090,6 +3056,47 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Ягон номнависи тағиротҳо пайдо нагардид\n"
+#, fuzzy
+#~ msgid "Unknown option %s"
+#~ msgstr ""
+#~ "\n"
+#~ "интихоби номуаяйн '%s'\n"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "нуқтаи васлкунии хеле зиёд барои миёнаи хориҷшаванда \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "қабули дастгоҳи хориҷшаванда ҳамчун \"%s\""
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "истифодаи дигар дастгоҳи хориҷшавандаи [%s] барои \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "барқарори номироҳ барои миёнаи хориҷшаванда \"%s\""
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "дохилшавӣ ба миёнаи коргузориши аввала номумкин"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "роҳ ба сарчашма нест \"%s\",\n"
+#~ "ин ҳангоми ба таври дастӣ насб намудани феҳрист дар ҳолати "
+#~ "сохтанисарчашма ба амал меояд."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr ""
+#~ "муҳити бемуносибати \"%s\" ҳамчун ивазшаванда ишора шудааст, локиннодуруст"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Вақте, ки тайёр Enter-ро пахш кунед..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - феҳристи кэши сарлавҳаҳоро тоза намоед.\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "сарчашмаи маҷозӣ бояд маҳаллӣ бошад"
@@ -3380,9 +3387,6 @@ msgstr "Ягон номнависи тағиротҳо пайдо нагарди
#~ msgid "file [%s] already used in the same medium \"%s\""
#~ msgstr "файли [%s] дар сарчашмаи монанд аллакай истифода мешавад \"%s\""
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "навиштани файли рӯйхатии \"%s\" номумкин"
-
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "дар файли рӯйхат барои \"%s\" чизе навишта нашудааст"
diff --git a/po/th.po b/po/th.po
index 1b1beafb..e267c697 100644
--- a/po/th.po
+++ b/po/th.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\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"
@@ -89,14 +89,7 @@ msgstr "_ยกเลิก"
msgid "Choose location to save file"
msgstr ""
-#: ../gurpmi.pm:80
-#, fuzzy, c-format
-msgid "Unknown option %s"
-msgstr ""
-"\n"
-"ทางเลือกไม่รู้จัก '%s'\n"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, fuzzy, c-format
msgid "No packages specified"
msgstr "ไม่มีการกำหนดคำสั่ง"
@@ -202,12 +195,12 @@ msgstr ""
"กำลังติดตั้งแพ็คเก็จ %s\n"
"%d%%"
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "กรุณาใส่อุปกรณ์ที่มีชื่อ \"%s\" ใน [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, fuzzy, c-format
msgid "Downloading package `%s'..."
msgstr "กำลังติดตั้งแพ็คเก็จ %s"
@@ -396,6 +389,16 @@ msgstr ""
msgid "Copying failed"
msgstr "ล็อกอินล้มเหลว"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "อุปกรณ์ \"%s\" ไม่ได้ถูกเลือก"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "ไม่สามารถอ่าน rpm file [%s] จาก \"%s\""
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -702,7 +705,12 @@ msgstr "ต้องการทดลองติดตั้งโดยที
msgid "Try harder to install (--force)? (y/N) "
msgstr "ต้องการทดลองบังคับติดตั้ง (--force)? (y/N)"
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -715,11 +723,6 @@ msgid "%d installation transaction failed"
msgid_plural "%d installation transactions failed"
msgstr[0] "การติดตั้งไม่สำเร็จ"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "การติดตั้งสามารถทำได้"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -745,6 +748,11 @@ msgstr "ทุกอย่างได้ถูกติดตั้งเรี
msgid "Packages %s can not be installed"
msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "การติดตั้งสามารถทำได้"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -777,29 +785,9 @@ msgstr "กำลังเลี่ยงการทำงานของอุ
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "จำนวนเม้าท์พ้อยท์มากเกินไปสำหรับอุปกรณ์แบบเคลื่อนย้ายได้\"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "กำลังนำอุปกรณ์ที่เคลื่อนย้ายได้จาก \"%s\" ออกมา"
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+msgid "failed to migrate removable device, ignoring media"
msgstr ""
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "ใช้อุปกรณ์แบบย้ายเข้าออกได้ที่แตกต่าง [%s] สำหรับ \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ไม่สามาถจะดึงส่วนของ pathname สำหรับอุปกรณ์แบบเคลื่อนย้ายได้\"%s\""
-
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
msgid "wrote config file [%s]"
@@ -857,12 +845,7 @@ msgstr "กำลังทำการอ่าน headers จากอุปก
msgid "adding medium \"%s\""
msgstr "กำลังทำการย้ายออกอุปกรณ์\"%s\""
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "ไม่สามารถเข้าถึงอุปกรณ์เพื่อใช้ในการติดตั้งอันแรก"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -977,15 +960,7 @@ msgstr "กำลังตรวจสอบไฟล์ hdlist [%s]"
msgid "comparing %s and %s"
msgstr "กำลังติดตั้ง %s\n"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ไม่พบ hdlist file สำหรับอุปกรณ์\"%s\""
@@ -1152,36 +1127,21 @@ msgstr "พบ parallel handler สำหรับ %s"
msgid "unable to use parallel option \"%s\""
msgstr "ไม่สามารถใช้ parallel option \"%s\""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "ไม่สามารถใช้อุปกรณ์\"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "กำลังติดตั้ง %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "กำลังถอดถอน %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "อุปกรณ์ \"%s\" ไม่ได้ถูกเลือก"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "ไม่สามารถอ่าน rpm file [%s] จาก \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "อุปกรณ์ที่ไม่เชื่อมกัน \"%s\" ถูกระบุว่าถอดเปลี่ยนได้แต่มันไม่ใช่"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "ไม่สามารถใช้อุปกรณ์\"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, fuzzy, c-format
msgid ""
@@ -2212,18 +2172,18 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "กรุณากด enter เมื่อพร้อม"
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "ยกเลิก"
@@ -2244,7 +2204,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2347,12 +2307,7 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - ทำความสะอาดส่วน headers ของไดเร็คตอรี่ cache \n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - โหมดเงียบ\n"
@@ -2762,20 +2717,30 @@ msgstr " --help - พิมพ์ข้อความช่วย\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts -พิมพ์ tag ที่เข้ากันไม่ได้:เข้ากันไม่ได้ทั้งหมด(หลายบรรทัด)."
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr " --provides -พิมพ์ tag provides: all provides (หลายบรรทัด). "
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - พิมพ์ tag ที่ต้องการ:ที่ต้องการทั้งหมด(หลายบรรทัด)."
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --group - พิมพ์ tag group: group."
-#: ../urpmq:83
+#: ../urpmq:85
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - พิมพ์ tag summary: summary"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -2864,7 +2829,12 @@ msgstr "ชื่อของไฟล์หรือของ rpm ที่ใ
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes can only be used with --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "ไม่สามารถเขียน list file ของ\"%s\""
+
+#: ../urpmq:363
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -2892,6 +2862,37 @@ msgid "No changelog found\n"
msgstr "ไม่พบรุปภาพ"
#, fuzzy
+#~ msgid "Unknown option %s"
+#~ msgstr ""
+#~ "\n"
+#~ "ทางเลือกไม่รู้จัก '%s'\n"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "จำนวนเม้าท์พ้อยท์มากเกินไปสำหรับอุปกรณ์แบบเคลื่อนย้ายได้\"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "กำลังนำอุปกรณ์ที่เคลื่อนย้ายได้จาก \"%s\" ออกมา"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "ใช้อุปกรณ์แบบย้ายเข้าออกได้ที่แตกต่าง [%s] สำหรับ \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "ไม่สามาถจะดึงส่วนของ pathname สำหรับอุปกรณ์แบบเคลื่อนย้ายได้\"%s\""
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "ไม่สามารถเข้าถึงอุปกรณ์เพื่อใช้ในการติดตั้งอันแรก"
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "อุปกรณ์ที่ไม่เชื่อมกัน \"%s\" ถูกระบุว่าถอดเปลี่ยนได้แต่มันไม่ใช่"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "กรุณากด enter เมื่อพร้อม"
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - ทำความสะอาดส่วน headers ของไดเร็คตอรี่ cache \n"
+
+#, fuzzy
#~ msgid "virtual medium needs to be local"
#~ msgstr "อุปกรณ์\"%s\"พยายามเลือกใช้อุปกรณ์ที่ใช้แล้ว, medium ignored"
@@ -3109,9 +3110,6 @@ msgstr "ไม่พบรุปภาพ"
#~ msgid "file [%s] already used in the same medium \"%s\""
#~ msgstr "ไฟล์ [%s] มีใช้งานอยู่ในที่เดียวกันอยู่แล้ว\"%s\""
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "ไม่สามารถเขียน list file ของ\"%s\""
-
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "ไม่มีการเขียนใน list file สำหรับ\"%s\""
diff --git a/po/tl.po b/po/tl.po
index 65b342ec..8a595b66 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-tl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2005-03-08 20:24+0800\n"
"Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
"Language-Team: Filipino <salinpinoy@comitus.net>\n"
@@ -106,14 +106,7 @@ msgstr "_Cancel"
msgid "Choose location to save file"
msgstr "Piliin ang lugar kung saan ise-save ang file"
-#: ../gurpmi.pm:80
-#, fuzzy, c-format
-msgid "Unknown option %s"
-msgstr ""
-"\n"
-"mga hindi kilalang option '%s'\n"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Walang command na nabanggit"
@@ -227,12 +220,12 @@ msgstr "Naghahanda..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Ini-install ang package na `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Pakisuksok ang medium na may pangalang \"%s\" sa device na [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Dina-download ang package na `%s'..."
@@ -426,6 +419,16 @@ msgstr ""
msgid "Copying failed"
msgstr "Pagkokopya nabigo"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "medium na \"%s\" ay hindi nakapili"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "hindi mabasa ang rpm file na [%s] mula sa medium na \"%s\""
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -734,7 +737,12 @@ msgstr "Subukan ang pag-i-install na hindi sinusuri ang mga dependency? (o/H) "
msgid "Try harder to install (--force)? (y/N) "
msgstr "Subukan ang pag-i-install nang mas malakas (--force)? (o/H) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -748,11 +756,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "%d transaksyong pag-i-install ay nabigo"
msgstr[1] "%d transaksyong pag-i-install ay nabigo"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Pag-i-install ay maaari"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -778,6 +781,11 @@ msgstr "Lahat ay naka-install na"
msgid "Packages %s can not be installed"
msgstr "Lahat ay naka-install na"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Pag-i-install ay maaari"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -811,28 +819,8 @@ msgstr "sinusubukang i-bypass ang mayroon nang medium na \"%s\", iniiwasan"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "sobrang daming mount point para sa naaalis na medium na \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "kinukuha ang naaalis na device bilang \"%s\""
-
-#: ../urpm/media.pm:413
-#, fuzzy, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "Ang \"%s\" ay ISO image at isasalang ng kusa"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "gumagamit ng iba't-ibang naaalis na device [%s] para sa \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "hindi makuha muli ang pathname para sa naaalis na medium \"%s\""
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -893,12 +881,7 @@ msgstr "binabasa ang mga header mula sa medium na \"%s\""
msgid "adding medium \"%s\""
msgstr "inaalis ang medium na \"%s\""
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "hindi ma-access ang unang installation medium"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -1013,18 +996,7 @@ msgstr "sinusuri ang hdlist file [%s]"
msgid "comparing %s and %s"
msgstr "ini-install ang %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"hindi ma-access ang medium na \"%s\",\n"
-"ito ay mangyayari kung mano-mano mong in-mount ang directory noong ginagawa "
-"ang medium."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "walang nahanap na hdlist file para sa medium na \"%s\""
@@ -1191,36 +1163,21 @@ msgstr "nakahanap ng parallel handler para sa mga node: %s"
msgid "unable to use parallel option \"%s\""
msgstr "hindi magamit ang parallel option na \"%s\""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "hindi ma-access ang medium na \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "mina-mount ang %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "ina-unmount ang %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "medium na \"%s\" ay hindi nakapili"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "hindi mabasa ang rpm file na [%s] mula sa medium na \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "incoherent na medium na \"%s\" may markang naaalis pero hindi naman"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "hindi ma-access ang medium na \"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, fuzzy, c-format
msgid ""
@@ -2350,19 +2307,19 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Pindutin ang Enter kung handa na..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "I-cancel"
@@ -2383,7 +2340,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2508,12 +2465,7 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - linisin ang headers cache directory.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - tahimik na paraan.\n"
@@ -2946,20 +2898,31 @@ msgstr " --changelog - i-print ang changelog.\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr ""
+" --conflicts - i-print ang tag conflicts: lahat ng pagkakasalungat.\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - i-print ang tag provides: lahat ng binibigay.\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - i-print ang tag requires: lahat ng kinakailangan.\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - i-print ang tag sourcerpm: source rpm.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - i-print ang tag summary: kabuuan.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -3063,7 +3026,12 @@ msgstr ""
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes ay magagamit lang kasama ang --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "hindi maisulat ang list file ng \"%s\""
+
+#: ../urpmq:363
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3098,6 +3066,50 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Walang nahanap na changelog\n"
+#, fuzzy
+#~ msgid "Unknown option %s"
+#~ msgstr ""
+#~ "\n"
+#~ "mga hindi kilalang option '%s'\n"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "sobrang daming mount point para sa naaalis na medium na \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "kinukuha ang naaalis na device bilang \"%s\""
+
+#, fuzzy
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "Ang \"%s\" ay ISO image at isasalang ng kusa"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "gumagamit ng iba't-ibang naaalis na device [%s] para sa \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "hindi makuha muli ang pathname para sa naaalis na medium \"%s\""
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "hindi ma-access ang unang installation medium"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "hindi ma-access ang medium na \"%s\",\n"
+#~ "ito ay mangyayari kung mano-mano mong in-mount ang directory noong "
+#~ "ginagawa ang medium."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "incoherent na medium na \"%s\" may markang naaalis pero hindi naman"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Pindutin ang Enter kung handa na..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - linisin ang headers cache directory.\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "virtual medium ay kailangang local"
@@ -3406,9 +3418,6 @@ msgstr "Walang nahanap na changelog\n"
#~ msgid "file [%s] already used in the same medium \"%s\""
#~ msgstr "file na [%s] ay ginagamit na sa parehong medium na \"%s\""
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "hindi maisulat ang list file ng \"%s\""
-
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "walang naisulat sa list file para sa \"%s\""
diff --git a/po/tr.po b/po/tr.po
index 41d1f449..06100dbb 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2007-09-25 00:20+0300\n"
"Last-Translator: Taha Özket <taha.ozket@obss.net>\n"
"Language-Team: Turkce <tr@li.org>\n"
@@ -110,14 +110,7 @@ msgstr "İp_tal"
msgid "Choose location to save file"
msgstr "Bir dosya seçin"
-#: ../gurpmi.pm:80
-#, fuzzy, c-format
-msgid "Unknown option %s"
-msgstr ""
-"\n"
-"bilinmeyen seçenek '%s'\n"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Komut belirtmemişsiniz"
@@ -228,12 +221,12 @@ msgstr "Hazırlanıyor..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "'%s' paketi kuruluyor ( %s/%s )..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Lütfen \"%s\" isimli ortamı [%s] aygıtına yerleştirin"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "'%s' paketi indiriliyor..."
@@ -428,6 +421,16 @@ msgstr "Çok fazla parametre\n"
msgid "Copying failed"
msgstr "Kopyalama başarısız"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "\"%s\" seçilmedi"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "rpm dosyası [%s] \"%s\" ortamından okunamıyor"
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -736,7 +739,12 @@ msgstr "Paket bağımlılıklarını denetlemeksizin kurulum denensin mi (e/H) "
msgid "Try harder to install (--force)? (y/N) "
msgstr "Belki daha zorlayıcı bir seçenek gerekebilir (--force)? (e/H) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -749,11 +757,6 @@ msgid "%d installation transaction failed"
msgid_plural "%d installation transactions failed"
msgstr[0] "kurulum yönergeleri"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Kurulum Başarılı"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -779,6 +782,11 @@ msgstr "%s paketi kurulamıyor"
msgid "Packages %s can not be installed"
msgstr "%s paketleri kurulamıyor"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Kurulum Başarılı"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -811,28 +819,8 @@ msgstr "varolan \"%s\" ortamı atlanmaya çalışılırken engelleniyor"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "\"%s\" çıkarılabilir ortam için çok bazla bağlantı noktası tanımlı"
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "\"%s\" çıkarılabilir aygıt olarak alındı."
-
-#: ../urpm/media.pm:413
-#, fuzzy, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "\"%s\" ortamı ISO imajı, salt okunur olarak bağlanacak"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "Farklı %s çıkarılabilir aygıtları %s için kullanılıyor"
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "\"%s\" ayrılabilir aygıtı için yolismi ele alınamadı"
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -893,12 +881,7 @@ msgstr "\"%s\" ortamından başlıklar okunuyor"
msgid "adding medium \"%s\""
msgstr "aygıt kaldırılıyor \"%s\""
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "İlk kurulum ortamına erişilemiyor"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "bu konum herhangi bir dağıtım içermiyor"
@@ -1013,17 +996,7 @@ msgstr "sabit disk listesi(hdlist) dosyası [%s] okunuyor"
msgid "comparing %s and %s"
msgstr "%s kuruluyor"
-#: ../urpm/media.pm:1257
-#, fuzzy, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"\"%s\"ortamına erişilemedi,\n"
-"eğer ortamı yaratırken dizini elle bağladıysanız bu sorun yaşanabilir"
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "\"%s\" için sabit disk listesi dosyası bulunamadı"
@@ -1190,37 +1163,21 @@ msgstr "düğümler için paralel işleyici bulundu: %s"
msgid "unable to use parallel option \"%s\""
msgstr "paralel seçenek \"%s\" kullanılamadı"
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "\"%s\" ortamına erişilemiyor"
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "%s bağlanıyor"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "%s ayrılıyor"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "\"%s\" seçilmedi"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "rpm dosyası [%s] \"%s\" ortamından okunamıyor"
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr ""
-"tutarsız ortam \"%s\" kaldırılabilir olarak imlenmiş ama bu doğru değil"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "\"%s\" ortamına erişilemiyor"
-
#: ../urpm/search.pm:29 ../urpmf:29
#, fuzzy, c-format
msgid ""
@@ -2293,18 +2250,18 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Hazır olduğunuzda Enter'a basın..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "İptal"
@@ -2325,7 +2282,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2442,13 +2399,7 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr ""
-" -c - 'başlıklar arabelleği'nin bulunduğu dizini temizle.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - Sessiz kipi.\n"
@@ -2872,20 +2823,30 @@ msgstr " --all - tüm etiketler yazır.\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --epoch - tarih etiketini yaz: tarih.\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr " --size - boyut etiketini yaz: boyut.\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --size - boyut etiketini yaz: boyut.\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --group - grup etiketini yaz: grup.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - özet etiketini yaz: özet..\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -2975,7 +2936,12 @@ msgstr ""
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes sadece --parallel ile kullanılabilir"
-#: ../urpmq:360
+#: ../urpmq:206
+#, c-format
+msgid "use -l to list files"
+msgstr ""
+
+#: ../urpmq:363
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3007,6 +2973,52 @@ msgid "No changelog found\n"
msgstr "Görüntü (imaj) bulunamadı!\n"
#, fuzzy
+#~ msgid "Unknown option %s"
+#~ msgstr ""
+#~ "\n"
+#~ "bilinmeyen seçenek '%s'\n"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "\"%s\" çıkarılabilir ortam için çok bazla bağlantı noktası tanımlı"
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "\"%s\" çıkarılabilir aygıt olarak alındı."
+
+#, fuzzy
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "\"%s\" ortamı ISO imajı, salt okunur olarak bağlanacak"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "Farklı %s çıkarılabilir aygıtları %s için kullanılıyor"
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "\"%s\" ayrılabilir aygıtı için yolismi ele alınamadı"
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "İlk kurulum ortamına erişilemiyor"
+
+#, fuzzy
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "\"%s\"ortamına erişilemedi,\n"
+#~ "eğer ortamı yaratırken dizini elle bağladıysanız bu sorun yaşanabilir"
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr ""
+#~ "tutarsız ortam \"%s\" kaldırılabilir olarak imlenmiş ama bu doğru değil"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Hazır olduğunuzda Enter'a basın..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr ""
+#~ " -c - 'başlıklar arabelleği'nin bulunduğu dizini temizle.\n"
+
+#, fuzzy
#~ msgid "virtual medium needs to be local"
#~ msgstr "\"%s\" kullanımda olan listeyi kullanmaya çalışıyor, yoksayıldı"
diff --git a/po/uk.po b/po/uk.po
index c7aa5681..b4e0635e 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-uk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2006-01-25 11:16+0200\n"
"Last-Translator: Taras Boychuk <btr1@mail.ru>\n"
"Language-Team: ukrainian <translation@linux.org.ua>\n"
@@ -107,12 +107,7 @@ msgstr "_C Скасувати"
msgid "Choose location to save file"
msgstr "Виберіть місце для збереження файла"
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "Невідомий параметр %s"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "Не вибрано пакунків"
@@ -224,12 +219,12 @@ msgstr "Підготовка..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Встановлюється пакунок `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Вставте, будь ласка, носія %s у пристрій %s"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Звантажується пакунок %s"
@@ -421,6 +416,16 @@ msgstr ""
msgid "Copying failed"
msgstr "Копіювання невдале"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "носія \"%s\" не вибрано"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "неможливо прочитати rpm-файл [%s] з носія \"%s\""
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -729,7 +734,12 @@ msgstr "Спробувати встановлення без перевірки
msgid "Try harder to install (--force)? (y/N) "
msgstr "Спробувати примусове встановлення (--force)? (y/N) (т/Н) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -744,11 +754,6 @@ msgstr[0] "%d запит на встановлення завершився не
msgstr[1] "%d запит на встановлення завершився неуспішно"
msgstr[2] "%d запит на встановлення завершився неуспішно"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Встановлення можливе"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -774,6 +779,11 @@ msgstr "Все вже встановлено"
msgid "Packages %s can not be installed"
msgstr "Все вже встановлено"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Встановлення можливе"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -808,28 +818,8 @@ msgstr "спроба знехтувати існуючим носієм \"%s\",
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "забагато точок монтування для змінного носія \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "отримується змінний пристрій як \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "Носій \"%s\" є ISO-відбитком, його буде змонтовано нальоту"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "використовується інший змінний пристрій [%s] для \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "неможливо відновити шлях до змінного носія \"%s\""
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -890,12 +880,7 @@ msgstr "читаються заголовки з носія \"%s\""
msgid "adding medium \"%s\""
msgstr "видаляється носій \"%s\""
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "немає доступу до першого носія встановлення"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -1011,17 +996,7 @@ msgstr "перевіряється файл hdlist [%s]"
msgid "comparing %s and %s"
msgstr "встановлюється %s з %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"неможливо отримати доступ до носія \"%s\",\n"
-"це може статися, якщо Ви змонтували теку вручну під час створення носія."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "немає файла hdlist для носія \"%s\""
@@ -1188,36 +1163,21 @@ msgstr "знайдено паралельний обробник для вузл
msgid "unable to use parallel option \"%s\""
msgstr "неможливо використати паралельну опцію \"%s\""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "немає доступу до носія \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "монтується %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "розмонтовується %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "носія \"%s\" не вибрано"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "неможливо прочитати rpm-файл [%s] з носія \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "невідомого носія \"%s\" позначено як змінного, але він не є таким"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "немає доступу до носія \"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, fuzzy, c-format
msgid ""
@@ -2317,7 +2277,12 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2325,12 +2290,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Натисніть Enter, коли будете готові..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Скасувати"
@@ -2351,7 +2311,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2475,12 +2435,7 @@ msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
" --raw - додати носія в конфігурацію, але не поновлювати його.\n"
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - очищувати теку заголовків кешу.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - режим мовчання.\n"
@@ -2909,20 +2864,30 @@ msgstr " --changelog - друкувати changelog.\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - виводити параметр conflicts: всі конфлікти.\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - виводити параметр provides: всі використання.\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - виводити параметр requires: всі вимоги.\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - виводити параметр sourcerpm: джерельний rpm.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - виводити короткий звіт.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -3018,7 +2983,12 @@ msgstr " назви або rpm-файли, задані в командному
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes може використовуватися тільки з --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "неможливо створити файл списку для \"%s\""
+
+#: ../urpmq:363
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3053,6 +3023,45 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Не знайдено журналу змін\n"
+#~ msgid "Unknown option %s"
+#~ msgstr "Невідомий параметр %s"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "забагато точок монтування для змінного носія \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "отримується змінний пристрій як \"%s\""
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "Носій \"%s\" є ISO-відбитком, його буде змонтовано нальоту"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "використовується інший змінний пристрій [%s] для \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "неможливо відновити шлях до змінного носія \"%s\""
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "немає доступу до першого носія встановлення"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "неможливо отримати доступ до носія \"%s\",\n"
+#~ "це може статися, якщо Ви змонтували теку вручну під час створення носія."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "невідомого носія \"%s\" позначено як змінного, але він не є таким"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Натисніть Enter, коли будете готові..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - очищувати теку заголовків кешу.\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "віртуальний носій повинен бути локальним"
@@ -3343,9 +3352,6 @@ msgstr "Не знайдено журналу змін\n"
#~ msgid "file [%s] already used in the same medium \"%s\""
#~ msgstr "файл [%s] вже використовується в тому ж носії \"%s\""
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "неможливо створити файл списку для \"%s\""
-
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "нічого не записано у файл списку для \"%s\""
diff --git a/po/urpmi.pot b/po/urpmi.pot
index d62efb37..5b78c24b 100644
--- a/po/urpmi.pot
+++ b/po/urpmi.pot
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -82,12 +82,7 @@ msgstr ""
msgid "Choose location to save file"
msgstr ""
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr ""
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr ""
@@ -192,12 +187,12 @@ msgstr ""
msgid "Installing package `%s' (%s/%s)..."
msgstr ""
-#: ../gurpmi2:260 ../urpmi:620
+#: ../gurpmi2:264 ../urpmi:622
#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+msgid "Please insert the medium named \"%s\""
msgstr ""
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr ""
@@ -384,6 +379,16 @@ msgstr ""
msgid "Copying failed"
msgstr ""
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, c-format
+msgid "medium \"%s\" is not available"
+msgstr ""
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr ""
+
#: ../urpm/cfg.pm:81
#, c-format
msgid "syntax error in config file at line %s"
@@ -690,7 +695,12 @@ msgstr ""
msgid "Try harder to install (--force)? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -704,11 +714,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] ""
msgstr[1] ""
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr ""
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -734,6 +739,11 @@ msgstr ""
msgid "Packages %s can not be installed"
msgstr ""
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr ""
+
#: ../urpm/md5sum.pm:20
#, c-format
msgid "examining %s file"
@@ -766,27 +776,7 @@ msgstr ""
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr ""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr ""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr ""
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr ""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+msgid "failed to migrate removable device, ignoring media"
msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
@@ -846,12 +836,7 @@ msgstr ""
msgid "adding medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:750
-#, c-format
-msgid "unable to mount the distribution medium"
-msgstr ""
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -966,15 +951,7 @@ msgstr ""
msgid "comparing %s and %s"
msgstr ""
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr ""
@@ -1141,34 +1118,19 @@ msgstr ""
msgid "unable to use parallel option \"%s\""
msgstr ""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
#, c-format
-msgid "mounting %s"
-msgstr ""
-
-#: ../urpm/removable.pm:56
-#, c-format
-msgid "unmounting %s"
-msgstr ""
-
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not available"
-msgstr ""
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
+msgid "unable to access medium \"%s\"."
msgstr ""
-#: ../urpm/removable.pm:151
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
+msgid "mounting %s"
msgstr ""
-#: ../urpm/removable.pm:163
+#: ../urpm/removable.pm:97
#, c-format
-msgid "unable to access medium \"%s\""
+msgid "unmounting %s"
msgstr ""
#: ../urpm/search.pm:29 ../urpmf:29
@@ -2166,19 +2128,19 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr ""
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr ""
@@ -2199,7 +2161,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2300,12 +2262,7 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr ""
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr ""
@@ -2700,21 +2657,31 @@ msgstr ""
#: ../urpmq:81
#, c-format
-msgid " --provides - print provides.\n"
+msgid " --conflicts - print conflicts.\n"
msgstr ""
#: ../urpmq:82
#, c-format
-msgid " --sourcerpm - print sourcerpm.\n"
+msgid " --provides - print provides.\n"
msgstr ""
#: ../urpmq:83
#, c-format
-msgid " --summary, -S - print summary.\n"
+msgid " --requires - print requires.\n"
+msgstr ""
+
+#: ../urpmq:84
+#, c-format
+msgid " --sourcerpm - print sourcerpm.\n"
msgstr ""
#: ../urpmq:85
#, c-format
+msgid " --summary, -S - print summary.\n"
+msgstr ""
+
+#: ../urpmq:87
+#, c-format
msgid ""
" --requires-recursive, -d\n"
" - query package dependencies.\n"
@@ -2801,7 +2768,12 @@ msgstr ""
msgid "--list-nodes can only be used with --parallel"
msgstr ""
-#: ../urpmq:360
+#: ../urpmq:206
+#, c-format
+msgid "use -l to list files"
+msgstr ""
+
+#: ../urpmq:363
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
diff --git a/po/uz.po b/po/uz.po
index 23374473..76759ae7 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: uz\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2007-09-13 16:43+0200\n"
"Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
"Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -96,12 +96,7 @@ msgstr "_Bekor qilish"
msgid "Choose location to save file"
msgstr "Faylni qaerga saqlash joyini tanlang"
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "Noma'lum parametr \"%s\""
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "Hech qanday paket ko'rsatilmagan"
@@ -211,12 +206,12 @@ msgstr "Tayyorlanmoqda..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "\"%s\" (%s/%s) paketi o'rnatilmoqda..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Iltimos \"%s\" nomli to'plamni [%s] uskunasiga qo'ying"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "\"%s\" paketi olinmoqda..."
@@ -410,6 +405,16 @@ msgstr ""
msgid "Copying failed"
msgstr "Nusxa ko'chirish muvaffaqiyatsiz tugadi"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, c-format
+msgid "medium \"%s\" is not available"
+msgstr ""
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "RPM-faylini (%s) \"%s\" to'plamidan o'qib bo'lmadi"
+
#: ../urpm/cfg.pm:81
#, c-format
msgid "syntax error in config file at line %s"
@@ -716,7 +721,12 @@ msgstr "Bog'liqliklarni tekshirmasdan o'rnatib ko'raymi? (h/Y) "
msgid "Try harder to install (--force)? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -729,11 +739,6 @@ msgid "%d installation transaction failed"
msgid_plural "%d installation transactions failed"
msgstr[0] "O'rnatish muvaffaqiyatsiz tugadi"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "O'rnatish mumkin"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -759,6 +764,11 @@ msgstr "%s paketini o'rnatib bo'lmaydi"
msgid "Packages %s can not be installed"
msgstr "%s paketlarini o'rnatib bo'lmaydi"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "O'rnatish mumkin"
+
#: ../urpm/md5sum.pm:20
#, c-format
msgid "examining %s file"
@@ -795,27 +805,7 @@ msgstr ""
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr ""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr ""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr ""
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr ""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+msgid "failed to migrate removable device, ignoring media"
msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
@@ -877,12 +867,7 @@ msgstr ""
msgid "adding medium \"%s\""
msgstr "to'plam qo'shilmoqda: %s"
-#: ../urpm/media.pm:750
-#, c-format
-msgid "unable to mount the distribution medium"
-msgstr ""
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -1000,15 +985,7 @@ msgstr "hdlist fayli (%s) tekshirilmoqda"
msgid "comparing %s and %s"
msgstr "%s va %s tozalanmoqda"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "to'plamning hdlist fayli %s xato: %s"
@@ -1175,36 +1152,21 @@ msgstr ""
msgid "unable to use parallel option \"%s\""
msgstr ""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "to'plamga murojaat qilib bo'lmadi: \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "%s ulanmoqda"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "%s uzilmoqda"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not available"
-msgstr ""
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "RPM-faylini (%s) \"%s\" to'plamidan o'qib bo'lmadi"
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr ""
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "to'plamga murojaat qilib bo'lmadi: \"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
@@ -2253,18 +2215,18 @@ msgstr "Diskda qo'shimcha %s joy ishlatiladi."
msgid "%s of disk space will be freed."
msgstr "Diskda %s joy bo'shatiladi."
-#: ../urpmi:603
+#: ../urpmi:604
+#, fuzzy, c-format
+msgid "%s of packages will be retrieved."
+msgstr "Diskda %s joy bo'shatiladi."
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "%d-ta paketni o'rnatish bilan davom etishni istaysizmi?"
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Tayyor bo'lganda ENTER tugmasini bosing..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Bekor qilish"
@@ -2285,7 +2247,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2401,12 +2363,7 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - sarlavhalarning kesh direktoriyasini tozalash.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - xabarsiz.\n"
@@ -2825,20 +2782,30 @@ msgstr ""
#: ../urpmq:81
#, fuzzy, c-format
-msgid " --provides - print provides.\n"
+msgid " --conflicts - print conflicts.\n"
msgstr " --verbose - ortiqcha xabarlar bilan.\n"
#: ../urpmq:82
#, fuzzy, c-format
+msgid " --provides - print provides.\n"
+msgstr " --verbose - ortiqcha xabarlar bilan.\n"
+
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --verbose - ortiqcha xabarlar bilan.\n"
+
+#: ../urpmq:84
+#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --help - shu yordam xabarini ko'rsatish.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr ""
-#: ../urpmq:85
+#: ../urpmq:87
#, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -2926,7 +2893,12 @@ msgstr ""
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes'dan faqat --parallel bilan birga foydalanib bo'ladi"
-#: ../urpmq:360
+#: ../urpmq:206
+#, c-format
+msgid "use -l to list files"
+msgstr ""
+
+#: ../urpmq:363
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -2953,6 +2925,15 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Changelog fayli topilmadi\n"
+#~ msgid "Unknown option %s"
+#~ msgstr "Noma'lum parametr \"%s\""
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Tayyor bo'lganda ENTER tugmasini bosing..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - sarlavhalarning kesh direktoriyasini tozalash.\n"
+
#, fuzzy
#~ msgid "unable to parse synthesis file of \"%s\""
#~ msgstr "\"%s\" uchun ro'yxat fayliga murojaat qilib bo'lmadi"
diff --git a/po/uz@cyrillic.po b/po/uz@cyrillic.po
index 05c6cad3..717fa2f2 100644
--- a/po/uz@cyrillic.po
+++ b/po/uz@cyrillic.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: uz\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2007-09-13 16:43+0200\n"
"Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
"Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -96,12 +96,7 @@ msgstr "_Бекор қилиш"
msgid "Choose location to save file"
msgstr "Файлни қаерга сақлаш жойини танланг"
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "Номаълум параметр \"%s\""
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "Ҳеч қандай пакет кўрсатилмаган"
@@ -211,12 +206,12 @@ msgstr "Тайёрланмоқда..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "\"%s\" (%s/%s) пакети ўрнатилмоқда..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Илтимос \"%s\" номли тўпламни [%s] ускунасига қўйинг"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "\"%s\" пакети олинмоқда..."
@@ -410,6 +405,16 @@ msgstr ""
msgid "Copying failed"
msgstr "Нусха кўчириш муваффақиятсиз тугади"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, c-format
+msgid "medium \"%s\" is not available"
+msgstr ""
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "RPM-файлини (%s) \"%s\" тўпламидан ўқиб бўлмади"
+
#: ../urpm/cfg.pm:81
#, c-format
msgid "syntax error in config file at line %s"
@@ -716,7 +721,12 @@ msgstr "Боғлиқликларни текширмасдан ўрнатиб к
msgid "Try harder to install (--force)? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -729,11 +739,6 @@ msgid "%d installation transaction failed"
msgid_plural "%d installation transactions failed"
msgstr[0] "Ўрнатиш муваффақиятсиз тугади"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Ўрнатиш мумкин"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -759,6 +764,11 @@ msgstr "%s пакетини ўрнатиб бўлмайди"
msgid "Packages %s can not be installed"
msgstr "%s пакетларини ўрнатиб бўлмайди"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Ўрнатиш мумкин"
+
#: ../urpm/md5sum.pm:20
#, c-format
msgid "examining %s file"
@@ -793,27 +803,7 @@ msgstr ""
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr ""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr ""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr ""
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr ""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+msgid "failed to migrate removable device, ignoring media"
msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
@@ -875,12 +865,7 @@ msgstr ""
msgid "adding medium \"%s\""
msgstr "тўплам қўшилмоқда: %s"
-#: ../urpm/media.pm:750
-#, c-format
-msgid "unable to mount the distribution medium"
-msgstr ""
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -996,15 +981,7 @@ msgstr "hdlist файли (%s) текширилмоқда"
msgid "comparing %s and %s"
msgstr "%s ва %s тозаланмоқда"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "тўпламнинг hdlist файли %s хато: %s"
@@ -1171,36 +1148,21 @@ msgstr ""
msgid "unable to use parallel option \"%s\""
msgstr ""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "тўпламга мурожаат қилиб бўлмади: \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "%s уланмоқда"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "%s узилмоқда"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not available"
-msgstr ""
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "RPM-файлини (%s) \"%s\" тўпламидан ўқиб бўлмади"
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr ""
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "тўпламга мурожаат қилиб бўлмади: \"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
@@ -2244,18 +2206,18 @@ msgstr "Дискда қўшимча %s жой ишлатилади."
msgid "%s of disk space will be freed."
msgstr "Дискда %s жой бўшатилади."
-#: ../urpmi:603
+#: ../urpmi:604
+#, fuzzy, c-format
+msgid "%s of packages will be retrieved."
+msgstr "Дискда %s жой бўшатилади."
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "%d-та пакетни ўрнатиш билан давом этишни истайсизми?"
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Тайёр бўлганда ENTER тугмасини босинг..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Бекор қилиш"
@@ -2276,7 +2238,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2390,12 +2352,7 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - сарлавҳаларнинг кэш директориясини тозалаш.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - хабарсиз.\n"
@@ -2813,20 +2770,30 @@ msgstr ""
#: ../urpmq:81
#, fuzzy, c-format
-msgid " --provides - print provides.\n"
+msgid " --conflicts - print conflicts.\n"
msgstr " --verbose - ортиқча хабарлар билан.\n"
#: ../urpmq:82
#, fuzzy, c-format
+msgid " --provides - print provides.\n"
+msgstr " --verbose - ортиқча хабарлар билан.\n"
+
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --verbose - ортиқча хабарлар билан.\n"
+
+#: ../urpmq:84
+#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --help - шу ёрдам хабарини кўрсатиш.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr ""
-#: ../urpmq:85
+#: ../urpmq:87
#, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -2914,7 +2881,12 @@ msgstr ""
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes'дан фақат --parallel билан бирга фойдаланиб бўлади"
-#: ../urpmq:360
+#: ../urpmq:206
+#, c-format
+msgid "use -l to list files"
+msgstr ""
+
+#: ../urpmq:363
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -2941,6 +2913,15 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Changelog файли топилмади\n"
+#~ msgid "Unknown option %s"
+#~ msgstr "Номаълум параметр \"%s\""
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Тайёр бўлганда ENTER тугмасини босинг..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - сарлавҳаларнинг кэш директориясини тозалаш.\n"
+
#, fuzzy
#~ msgid "unable to parse synthesis file of \"%s\""
#~ msgstr "\"%s\" учун рўйхат файлига мурожаат қилиб бўлмади"
diff --git a/po/vi.po b/po/vi.po
index 7b5df814..fc2d2774 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-vi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2005-06-08 15:13+0700\n"
"Last-Translator: Trinh Minh Thanh <tmthanh@yahoo.com>\n"
"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -101,14 +101,7 @@ msgstr "Bỏ _qua"
msgid "Choose location to save file"
msgstr "Chọn nơi lưu tập tin"
-#: ../gurpmi.pm:80
-#, fuzzy, c-format
-msgid "Unknown option %s"
-msgstr ""
-"\n"
-"tùy chọn không xác định '%s'\n"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, fuzzy, c-format
msgid "No packages specified"
msgstr "không có gói tin với tên %s"
@@ -218,12 +211,12 @@ msgstr "Đang chuẩn bị..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Đang cài đặt gói `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "Hãy nạp phương tiện có tên \"%s\" trên thiết bị [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Đang tải về gói `%s'..."
@@ -415,6 +408,16 @@ msgstr ""
msgid "Copying failed"
msgstr "Sao chép không được"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "phương tiện \"%s\" không được chọn"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "không thể đọc tập tin rpm [%s] từ phương tiện \"%s\""
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -723,7 +726,12 @@ msgstr "Thử cài đặt mà không cần kiểm tra các phụ thuộc? (Có/K
msgid "Try harder to install (--force)? (y/N) "
msgstr "Thử cố gắng cài đặt (--force)? (Có/[Không])"
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -736,11 +744,6 @@ msgid "%d installation transaction failed"
msgid_plural "%d installation transactions failed"
msgstr[0] "%d phiên giao dịch cài đặt lỗi"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Có khả năng cài đặt"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -766,6 +769,11 @@ msgstr "Mọi thứ đã được cài đặt rồi"
msgid "Packages %s can not be installed"
msgstr "Mọi thứ đã được cài đặt rồi"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Có khả năng cài đặt"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -798,28 +806,8 @@ msgstr "đang cố bỏ qua phương tiện đang tồn tại \"%s\", tránh"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "có quá nhiều điểm gắn kết cho phương tiện tháo lắp \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "coi phương tiện tháo lắp là \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "Phương tiện \"%s\" là ISO image, sẽ được mount nhanh (on-the-fly)"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "sử dụng thiết bị tháo lắp khác [%s] cho \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "không thể thu thập tên đường dẫn cho phương tiện tháo lắp \"%s\""
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -880,12 +868,7 @@ msgstr "đang đọc các header từ phương tiện \"%s\""
msgid "adding medium \"%s\""
msgstr "gỡ bỏ phương tiện \"%s\""
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "không thể truy cập phương tiện cài đặt đầu tiên"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -1001,17 +984,7 @@ msgstr "đang kiểm tra tập tin hdlist [%s]"
msgid "comparing %s and %s"
msgstr "cài đặt %s từ %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"không thể truy cập phương tiện \"%s\",\n"
-"Truy cập được nếu bạn tự gắn kết thư mục khi tạo phương tiện."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "không tìm thấy tập tin hdlist cho phương tiện \"%s\""
@@ -1182,38 +1155,21 @@ msgstr "tìm thấy trình quản lý song song (parallel) cho các node: %s"
msgid "unable to use parallel option \"%s\""
msgstr "không thể sử dụng tùy chọn song song (parallel) \"%s\""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "không thể truy cập phương tiện \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "gắn kết %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "thôi gắn kết %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "phương tiện \"%s\" không được chọn"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "không thể đọc tập tin rpm [%s] từ phương tiện \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr ""
-"phương tiện không rõ ràng \"%s\" được đánh dấu là tháo lắp nhưng không phải "
-"vậy"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "không thể truy cập phương tiện \"%s\""
-
#: ../urpm/search.pm:29 ../urpmf:29
#, fuzzy, c-format
msgid ""
@@ -2297,18 +2253,18 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Nhấn Enter khi sẵn sàng ..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Bỏ qua"
@@ -2329,7 +2285,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2450,12 +2406,7 @@ msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
" --raw - thêm phương tiện vào cấu hình, nhưng không cập nhật nó.\n"
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - xoá thư mục cache headers.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - chế độ yên lặng.\n"
@@ -2882,20 +2833,30 @@ msgstr " --changelog - in ra changelog.\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - in ra xung đột tag: toàn bộ các xung đột.\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - in ra cung cấp tag: toàn bộ các cung cấp.\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - in ra yêu cầu tag: toàn bộ các yêu cầu.\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - in ra tag sourcerpm: source rpm.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - in ra tóm tắt tag: tóm tắt.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -2987,7 +2948,12 @@ msgstr " tên hay tập tin rpm có trong dòng lệnh được yêu cầu.\n"
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes chỉ được dùng với --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "không thể ghi tập danh sách của \"%s\""
+
+#: ../urpmq:363
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3022,6 +2988,50 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Không thấy changelog\n"
+#, fuzzy
+#~ msgid "Unknown option %s"
+#~ msgstr ""
+#~ "\n"
+#~ "tùy chọn không xác định '%s'\n"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "có quá nhiều điểm gắn kết cho phương tiện tháo lắp \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "coi phương tiện tháo lắp là \"%s\""
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "Phương tiện \"%s\" là ISO image, sẽ được mount nhanh (on-the-fly)"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "sử dụng thiết bị tháo lắp khác [%s] cho \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "không thể thu thập tên đường dẫn cho phương tiện tháo lắp \"%s\""
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "không thể truy cập phương tiện cài đặt đầu tiên"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "không thể truy cập phương tiện \"%s\",\n"
+#~ "Truy cập được nếu bạn tự gắn kết thư mục khi tạo phương tiện."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr ""
+#~ "phương tiện không rõ ràng \"%s\" được đánh dấu là tháo lắp nhưng không "
+#~ "phải vậy"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Nhấn Enter khi sẵn sàng ..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - xoá thư mục cache headers.\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "phương tiện ảo phải là cục bộ"
@@ -3292,9 +3302,6 @@ msgstr "Không thấy changelog\n"
#~ msgid "file [%s] already used in the same medium \"%s\""
#~ msgstr "tập tin [%s] đang được dùng trong cùng phương tiện \"%s\" rồi"
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "không thể ghi tập danh sách của \"%s\""
-
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "không có gì được ghi trong tập tin danh sách cho \"%s\""
diff --git a/po/wa.po b/po/wa.po
index d0b35690..94080064 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2004-08-08 20:26+0200\n"
"Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
"Language-Team: Walloon <linux-wa@walon.org>\n"
@@ -108,12 +108,7 @@ msgstr "_Rinoncî"
msgid "Choose location to save file"
msgstr "Tchoezixhoz l' plaece wice schaper l' fitchî"
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "Tchuze nén cnoxhowe %s"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "Nou pacaedje di scpecifyî"
@@ -225,12 +220,12 @@ msgstr "Dj' aprestêye..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Dj' astale li pacaedje «%s» (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "S' i vs plait metoz li sopoirt lomé «%s» el éndjin [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "Dj' aberwetêye li pacaedje «%s»..."
@@ -423,6 +418,16 @@ msgstr "Pår trop d' årgumints\n"
msgid "Copying failed"
msgstr "Li copiaedje a fwait berwete"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, c-format
+msgid "medium \"%s\" is not available"
+msgstr "li sopoirt «%s» n' est nén disponibe"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "dji n' sai lére li fitchî rpm [%s] foû do sopoirt «%s»"
+
#: ../urpm/cfg.pm:81
#, c-format
msgid "syntax error in config file at line %s"
@@ -731,7 +736,12 @@ msgstr "Sayî d' astaler sin verifyî les aloyaedjes? (o/N) "
msgid "Try harder to install (--force)? (y/N) "
msgstr "Sayî d' astaler co pus foirt (--force)? (o/N) "
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -745,11 +755,6 @@ msgid_plural "%d installation transactions failed"
msgstr[0] "I gn a-st avou %d transaccions d' astalaedje k' ont fwait berwete"
msgstr[1] "I gn a-st avou %d transaccions d' astalaedje k' ont fwait berwete"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "L' astalaedje est possibe"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -775,6 +780,11 @@ msgstr "Li pacaedje %s èn pout nén esse astalé"
msgid "Packages %s can not be installed"
msgstr "Les pacaedjes %s èn polèt nén esse astalés"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "L' astalaedje est possibe"
+
#: ../urpm/md5sum.pm:20
#, c-format
msgid "examining %s file"
@@ -811,28 +821,8 @@ msgstr "dji saye di passer houte do sopoirt «%s», dji passe houte"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "trop di ponts di montaedje pol sopoirt bodjåve «%s»"
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "dji prind li bodjåve sopoirt come «%s»"
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "Li sopoirt «%s» est ene imådje ISO, i serè monté al volêye"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "eployant èn éndjin bodjåve diferin [%s] po «%s»"
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "dji n' sai aveur li tchmin pol sopoirt bodjåve «%s»"
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -893,12 +883,7 @@ msgstr "radjoutant l' sopoirt «%s» divant l' sopoirt då lon «%s»"
msgid "adding medium \"%s\""
msgstr "radjoutaedje do sopoirt «%s»"
-#: ../urpm/media.pm:750
-#, c-format
-msgid "unable to mount the distribution medium"
-msgstr "dji n' a savou monter l' sopoirt d' astalaedje del distribucion"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "i shonne ki cist eplaeçmint la n' a nole distribucion"
@@ -1019,18 +1004,7 @@ msgstr "corwaitaedje do fitchî hdlist [%s]"
msgid "comparing %s and %s"
msgstr "netiaedje di %s et %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"dji n' sai acceder å sopoirt «%s»,\n"
-"çoula pout ariver metans si vos avoz monté al mwin li ridant divant di "
-"radjouter l' sopoirt d' astalaedje."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "fitchî hdlist %s nén valide pol sopoirt «%s»"
@@ -1197,36 +1171,21 @@ msgstr "pougneye po môde paralele trovêye po les nuks: %s"
msgid "unable to use parallel option \"%s\""
msgstr "dji n' sai eployî l' tchuze «%s» do môde paralele"
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "dji n' sai aveur accès å sopoirt «%s»"
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "dji monte %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "dji dismonte %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not available"
-msgstr "li sopoirt «%s» n' est nén disponibe"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "dji n' sai lére li fitchî rpm [%s] foû do sopoirt «%s»"
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "sopoirt «%s» nén cowerant, metou come bodjåve mins nel est nén vormint"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "dji n' sai aveur accès å sopoirt «%s»"
-
#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
@@ -2356,19 +2315,19 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, fuzzy, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Continouwer avou l' astalaedje d' on pacaedje? (%d Mo)"
msgstr[1] "Continouwer avou l' astalaedje d' on pacaedje? (%d Mo)"
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Tapez so «enter» cwand c' est fwait..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "Rinoncî"
@@ -2389,7 +2348,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2506,12 +2465,7 @@ msgstr " --nopubkey - n' aberwete nén li clé publike pol sopoirt\n"
msgid " --raw - add the media in config, but don't update it.\n"
msgstr " --raw - radjouter l' sopoirt, mins nén l' mete a djoû.\n"
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - netyî l' ridant muchete des tiestires.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - môde taijheu.\n"
@@ -2950,20 +2904,30 @@ msgstr " --changelog - håyner li djournå des candjmints.\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - les conflits avou ds ôtes pacaedjes ou modêyes.\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - tot çou k' est ahessî på pacaedje.\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - tot çou k' i gn a mezåjhe po l' pacaedje.\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - no do fitchî src.rpm sourdant.\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - håyner l' rascourti.\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -3067,7 +3031,12 @@ msgstr " les nos ou fitchîs rpm dinés sol roye di comande sont rcwerous.\n"
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes pout esse eployî seulmint avou --parallel"
-#: ../urpmq:360
+#: ../urpmq:206
+#, c-format
+msgid "use -l to list files"
+msgstr ""
+
+#: ../urpmq:363
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -3101,6 +3070,46 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Nou djournå des candjmints di trové\n"
+#~ msgid "Unknown option %s"
+#~ msgstr "Tchuze nén cnoxhowe %s"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "trop di ponts di montaedje pol sopoirt bodjåve «%s»"
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "dji prind li bodjåve sopoirt come «%s»"
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "Li sopoirt «%s» est ene imådje ISO, i serè monté al volêye"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "eployant èn éndjin bodjåve diferin [%s] po «%s»"
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "dji n' sai aveur li tchmin pol sopoirt bodjåve «%s»"
+
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "dji n' a savou monter l' sopoirt d' astalaedje del distribucion"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "dji n' sai acceder å sopoirt «%s»,\n"
+#~ "çoula pout ariver metans si vos avoz monté al mwin li ridant divant di "
+#~ "radjouter l' sopoirt d' astalaedje."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr ""
+#~ "sopoirt «%s» nén cowerant, metou come bodjåve mins nel est nén vormint"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Tapez so «enter» cwand c' est fwait..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - netyî l' ridant muchete des tiestires.\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "les forveyous sopoirts divént esse locås"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 27aa5a8a..19cfedf0 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2007-08-22 16:02+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: Mandriva Linux Simplified Chinese <cooker-i18n@mandrivalinux."
@@ -109,12 +109,7 @@ msgstr "取消(_C)"
msgid "Choose location to save file"
msgstr "选择保存文件的位置"
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "未知的选项 %s"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "未指定软件包"
@@ -224,12 +219,12 @@ msgstr "正在准备..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "正在安装软件包“%s”(%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "请将标签为“%s”的介质插入到设备 [%s]"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "正在下载软件包“%s”..."
@@ -421,6 +416,16 @@ msgstr "参数太多\n"
msgid "Copying failed"
msgstr "复制失败"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, c-format
+msgid "medium \"%s\" is not available"
+msgstr "介质“%s”不可用"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "无法从介质“%2$s”读取 rpm 文件[%1$s]"
+
#: ../urpm/cfg.pm:81
#, c-format
msgid "syntax error in config file at line %s"
@@ -727,7 +732,12 @@ msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
msgid "Try harder to install (--force)? (y/N) "
msgstr "尝试强制安装吗(使用 --force)(是(y)/否(N))[否]?"
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -740,11 +750,6 @@ msgid "%d installation transaction failed"
msgid_plural "%d installation transactions failed"
msgstr[0] "%d 安装交易失败"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "可以安装"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -770,6 +775,11 @@ msgstr "软件包 %s 无法安装"
msgid "Packages %s can not be installed"
msgstr "软件包 %s 无法安装"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "可以安装"
+
#: ../urpm/md5sum.pm:20
#, c-format
msgid "examining %s file"
@@ -802,28 +812,8 @@ msgstr "试图覆盖已有介质“%s”,正跳过"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "可移动介质“%s”的挂载点太多"
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "将可移动设备认作“%s”"
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "介质“%s”是一个 ISO 映像,将会被实时挂载"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "为“%2$s”使用不同的可移动设备[%1$s]"
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "无法获取可移动介质“%s”的路径名称"
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -884,12 +874,7 @@ msgstr "在远程介质“%2$s”之前添加介质“%1$s”"
msgid "adding medium \"%s\""
msgstr "添加介质“%s”"
-#: ../urpm/media.pm:750
-#, c-format
-msgid "unable to mount the distribution medium"
-msgstr "无法挂载发行版介质"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "此位置似乎不包含任何发行版"
@@ -1004,17 +989,7 @@ msgstr "正在检查 hdlist 文件 [%s]"
msgid "comparing %s and %s"
msgstr "比较 %s 和 %s"
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"无法访问介质“%s”,\n"
-"这可能是因为您在创建介质时是手动装载的目录。"
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "介质“%2$s”的 hdlist 文件 %1$s 无效"
@@ -1181,36 +1156,21 @@ msgstr "找到结点的并行处理: %s"
msgid "unable to use parallel option \"%s\""
msgstr "无法使用并行选项“%s”"
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "无法访问介质“%s”"
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "正在装载 %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "正在拆卸 %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not available"
-msgstr "介质“%s”不可用"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "无法从介质“%2$s”读取 rpm 文件[%1$s]"
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "非连贯介质“%s”标为可移动但实际不是"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "无法访问介质“%s”"
-
#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
@@ -2257,18 +2217,18 @@ msgstr "将会使用 %s 的额外磁盘空间。"
msgid "%s of disk space will be freed."
msgstr "将会释放 %s 的磁盘空间。"
-#: ../urpmi:603
+#: ../urpmi:604
+#, fuzzy, c-format
+msgid "%s of packages will be retrieved."
+msgstr "将会释放 %s 的磁盘空间。"
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "继续安装 %d 个软件包吗?"
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "准备好后按 Enter 键..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "取消"
@@ -2289,7 +2249,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2399,12 +2359,7 @@ msgstr " --nopubkey - 不导入所添加介质的密钥\n"
msgid " --raw - add the media in config, but don't update it.\n"
msgstr " --raw - 在配置中添加介质,但不进行更新。\n"
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - 直接清除软件包头缓存。\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - 安静模式。\n"
@@ -2817,21 +2772,31 @@ msgid " --changelog - print changelog.\n"
msgstr " --changelog - 打印更新日志。\n"
#: ../urpmq:81
+#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - conflict 标签\n"
+
+#: ../urpmq:82
#, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - 打印 provides。\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - requires 标签\n"
+
+#: ../urpmq:84
#, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - 打印源 rpm 名称。\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - 打印摘要。\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -2925,7 +2890,12 @@ msgstr " 需要在命令行给出名称或 rpm 文件。\n"
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes 仅能和 --parallel 一起使用"
-#: ../urpmq:360
+#: ../urpmq:206
+#, c-format
+msgid "use -l to list files"
+msgstr ""
+
+#: ../urpmq:363
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr "由于介质“%s”没有 hdlist,软件包 %s 只返回部分结果"
@@ -2952,6 +2922,44 @@ msgstr "由于介质“%s”没有 hdlists,软件包 %s 无法返回任何结
msgid "No changelog found\n"
msgstr "没有找到更新日志\n"
+#~ msgid "Unknown option %s"
+#~ msgstr "未知的选项 %s"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "可移动介质“%s”的挂载点太多"
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "将可移动设备认作“%s”"
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "介质“%s”是一个 ISO 映像,将会被实时挂载"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "为“%2$s”使用不同的可移动设备[%1$s]"
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "无法获取可移动介质“%s”的路径名称"
+
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "无法挂载发行版介质"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "无法访问介质“%s”,\n"
+#~ "这可能是因为您在创建介质时是手动装载的目录。"
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "非连贯介质“%s”标为可移动但实际不是"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "准备好后按 Enter 键..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - 直接清除软件包头缓存。\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "虚拟介质必须是本地的"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 20311b2b..6c445299 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: zh_TW\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
"PO-Revision-Date: 2006-09-01 21:32+0800\n"
"Last-Translator: Shiva Huang <shivahuang@gmail.com>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -118,12 +118,7 @@ msgstr "取消 (_C)"
msgid "Choose location to save file"
msgstr "選擇存檔的位置"
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "未知的選項 %s"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
#, c-format
msgid "No packages specified"
msgstr "未指定套件"
@@ -233,12 +228,12 @@ msgstr "準備中..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "正在安裝套件 `%s' (%s/%s)..."
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
msgstr "請將名為 \"%s\" 的媒體置入裝置 [%s] 內"
-#: ../gurpmi2:271
+#: ../gurpmi2:275
#, c-format
msgid "Downloading package `%s'..."
msgstr "正在下載套件 `%s'..."
@@ -430,6 +425,16 @@ msgstr "參數太多\n"
msgid "Copying failed"
msgstr "複製失敗"
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "媒體 \"%s\" 沒有被選取"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "無法由媒體 \"%2$s\" 讀取 [%1$s] rpm 檔"
+
#: ../urpm/cfg.pm:81
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
@@ -736,7 +741,12 @@ msgstr "嘗試不檢查相依性直接安裝? (y/N)(是/否)"
msgid "Try harder to install (--force)? (y/N) "
msgstr "嘗試採用強制安裝的方式 (--force)? (y/N)(是/否)"
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -749,11 +759,6 @@ msgid "%d installation transaction failed"
msgid_plural "%d installation transactions failed"
msgstr[0] "%d 個安裝程序失敗"
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "可以安裝"
-
#: ../urpm/main_loop.pm:286
#, c-format
msgid "Packages are up to date"
@@ -779,6 +784,11 @@ msgstr "每個套件都已經安裝了"
msgid "Packages %s can not be installed"
msgstr "每個套件都已經安裝了"
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "可以安裝"
+
#: ../urpm/md5sum.pm:20
#, fuzzy, c-format
msgid "examining %s file"
@@ -811,28 +821,8 @@ msgstr "正在嘗試跳過已存在媒體 \"%s\",正在跳過"
#: ../urpm/media.pm:409
#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "可移除式媒體 \"%s\" 的掛載點過多"
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "將可移除式裝置當成 \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "媒體 \"%s\" 是一個光碟映像檔,將立即掛載起來"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "使用不同的可移除式裝置 [%s] 於 \"%s\" "
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "無法擷取可移除式媒體 \"%s\" 的路徑名稱"
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
@@ -893,12 +883,7 @@ msgstr "正在讀取媒體 \"%s\" 的標頭"
msgid "adding medium \"%s\""
msgstr "移除媒體 \"%s\""
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "無法存取第一個安裝媒體"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
#, fuzzy, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "這個 url 看起來並沒有包含任何散佈套件"
@@ -1013,17 +998,7 @@ msgstr "檢驗 hdlist 檔案 [%s]"
msgid "comparing %s and %s"
msgstr "正在 %2$s 上安装 %1$s..."
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"無法存取媒體 \"%s\",\n"
-"這可能是因為您建立媒體時是手動將這個目錄掛載到系統裡的。"
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "沒有找到媒體 \"%s\" 的 hdlist 檔案"
@@ -1190,36 +1165,21 @@ msgstr "找到屬於節點 %s 的同步管理處理器"
msgid "unable to use parallel option \"%s\""
msgstr "無法使用同步管理選項 \"%s\""
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "無法存取媒體 \"%s\" "
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "正在掛載 %s"
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
#, c-format
msgid "unmounting %s"
msgstr "正在卸載 %s"
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "媒體 \"%s\" 沒有被選取"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "無法由媒體 \"%2$s\" 讀取 [%1$s] rpm 檔"
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "自相矛盾的媒體 \"%s\" 標示為可移除但是事實上卻不是這麼一回事"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "無法存取媒體 \"%s\" "
-
#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
@@ -2276,18 +2236,18 @@ msgstr ""
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "繼續安裝這 %d 個套件?"
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "準備好時請按 Enter..."
-
-#: ../urpmi:626
+#: ../urpmi:627
#, c-format
msgid "Cancel"
msgstr "取消"
@@ -2308,7 +2268,7 @@ msgid ""
" ftp://<login>:<password>@<host>/<path>\n"
" ftp://<host>/<path>\n"
" http://<host>/<path>\n"
-" removable://<path>\n"
+" cdrom://<path>\n"
"\n"
"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2423,12 +2383,7 @@ msgstr " --nopubkey - 不匯入新增的媒體的公鑰\n"
msgid " --raw - add the media in config, but don't update it.\n"
msgstr " --raw - 加入這個媒介到設定檔中,但不更新它。\n"
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid " -c - clean headers cache directory.\n"
-msgstr " -c - 清除標頭快取目錄。\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - 安靜模式。\n"
@@ -2844,20 +2799,30 @@ msgstr " --changelog - 顯示更新紀錄。\n"
#: ../urpmq:81
#, fuzzy, c-format
+msgid " --conflicts - print conflicts.\n"
+msgstr " --conflicts - 衝突標籤\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
msgid " --provides - print provides.\n"
msgstr " --provides - 提供標籤\n"
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid " --requires - print requires.\n"
+msgstr " --requires - 需要標籤\n"
+
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --sourcerpm - print sourcerpm.\n"
msgstr " --sourcerpm - 原始碼套件名稱\n"
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - 顯示摘要。\n"
-#: ../urpmq:85
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --requires-recursive, -d\n"
@@ -2947,7 +2912,12 @@ msgstr " 查詢命令列給予的套件名稱或 RPM 檔案。\n"
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes 參數只能夠配合 --parallel 參數一起使用"
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "無法寫入 \"%s\" 的列表檔"
+
+#: ../urpmq:363
#, fuzzy, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
msgstr ""
@@ -2978,6 +2948,45 @@ msgstr ""
msgid "No changelog found\n"
msgstr "沒有找到更新紀錄\n"
+#~ msgid "Unknown option %s"
+#~ msgstr "未知的選項 %s"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "可移除式媒體 \"%s\" 的掛載點過多"
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "將可移除式裝置當成 \"%s\""
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "媒體 \"%s\" 是一個光碟映像檔,將立即掛載起來"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "使用不同的可移除式裝置 [%s] 於 \"%s\" "
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "無法擷取可移除式媒體 \"%s\" 的路徑名稱"
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "無法存取第一個安裝媒體"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "無法存取媒體 \"%s\",\n"
+#~ "這可能是因為您建立媒體時是手動將這個目錄掛載到系統裡的。"
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr "自相矛盾的媒體 \"%s\" 標示為可移除但是事實上卻不是這麼一回事"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "準備好時請按 Enter..."
+
+#~ msgid " -c - clean headers cache directory.\n"
+#~ msgstr " -c - 清除標頭快取目錄。\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "虛擬媒體必須在本地端"
@@ -3269,9 +3278,6 @@ msgstr "沒有找到更新紀錄\n"
#~ msgid "file [%s] already used in the same medium \"%s\""
#~ msgstr "檔案 [%s] 已經在相同的媒體 \"%s\" 中使用了"
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "無法寫入 \"%s\" 的列表檔"
-
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "沒有寫入資料到 \"%s\" 的列表檔"